diff -Nru gettext-0.19.3/aclocal.m4 gettext-0.18.1.1/aclocal.m4
--- gettext-0.19.3/aclocal.m4	2014-10-16 06:01:43.000000000 +0000
+++ gettext-0.18.1.1/aclocal.m4	2010-06-06 20:12:40.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  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.
@@ -11,16 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +26,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,22 +45,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -85,7 +79,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -109,40 +103,20 @@
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-# AM_EXTRA_RECURSIVE_TARGETS                                -*- Autoconf -*-
-
-# Copyright (C) 2012-2013 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.
-
-# AM_EXTRA_RECURSIVE_TARGETS
-# --------------------------
-# Define the list of user recursive targets.  This macro exists only to
-# be traced by Automake, which will ensure that a proper definition of
-# user-defined recursive targets (and associated rules) is propagated
-# into all the generated Makefiles.
-# TODO: We should really reject non-literal arguments here...
-AC_DEFUN([AM_EXTRA_RECURSIVE_TARGETS], [])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 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.
 
+# serial 16
+
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -155,7 +129,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -184,40 +158,31 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -228,78 +193,34 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
+
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -321,7 +242,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -340,14 +261,16 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST([install_sh])])
+AC_SUBST(install_sh)])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  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.
 
+# serial 2
+
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -363,12 +286,15 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
 
+# serial 6
+
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -376,10 +302,11 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
+
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -392,35 +319,63 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005, 2006  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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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.
 
+# serial 4
+
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -433,16 +388,22 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# 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.
 
+# serial 5
+
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -453,40 +414,32 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
    test "$[2]" = conftest.file
    )
 then
@@ -496,85 +449,36 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
+AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009  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.
 
+# serial 1
+
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -582,32 +486,34 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  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.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -615,22 +521,24 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  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.
 
+# serial 2
+
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -640,115 +548,77 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
-#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
 
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
 
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
+  # tar/untar a dummy directory, and stop if the command works
   rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
 
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/init-package-version.m4])
diff -Nru gettext-0.19.3/AUTHORS gettext-0.18.1.1/AUTHORS
--- gettext-0.19.3/AUTHORS	2013-04-22 03:00:56.000000000 +0000
+++ gettext-0.18.1.1/AUTHORS	2010-06-06 12:49:57.000000000 +0000
@@ -40,18 +40,3 @@
 
 GETTEXT         Noritada Kobayashi
 Assigns past and future changes.
-
-GETTEXT         KO Myung-Hun
-Assigns Past and Future Changes
-
-GETTEXT         Lubomir Remak
-Assigns Past and Future Changes
-
-GETTEXT         Daiki Ueno
-Assigns Past and Future Changes
-
-GETTEXT         Miguel Angel Arruga Vivas
-Assigns past and future Changes
-
-GETTEXT         FutreLAB, AG
-Assigns past and future changes
diff -Nru gettext-0.19.3/autogen.sh gettext-0.18.1.1/autogen.sh
--- gettext-0.19.3/autogen.sh	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/autogen.sh	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,22 @@
 #!/bin/sh
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Convenience script for regenerating all autogeneratable files that are
+# omitted from the version control repository. In particular, this script
+# also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
+# with new versions of autoconf or automake.
+#
+# This script requires autoconf-2.60..2.65 and automake-1.11.1 in the PATH.
+# It also requires either
+#   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
+#     in a gnulib checkout, or
+#   - the git program in the PATH and an internet connection.
+# It also requires
+#   - the bison program,
+#   - the gperf program,
+#   - the groff program,
+#   - the makeinfo program from the texinfo package,
+#   - perl.
+
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,116 +31,51 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This script populates the build infrastructure in the source tree
-# checked-out from VCS.
-#
-# This script requires:
-#   - Autoconf
-#   - Automake
-#   - Wget
-#   - Git
-#   - XZ Utils
-#
-# By default, it fetches Gnulib as a git submodule.  If you already
-# have a local copy of Gnulib, you can avoid extra network traffic by
-# setting the GNULIB_SRCDIR environment variable pointing to the path.
+# Usage: ./autogen.sh [--quick] [--skip-gnulib]
 #
-# In addition, it fetches the archive.dir.tar.gz file, which contains
-# data files used by the autopoint program.  If you already have the
-# file, place it under gettext-tools/misc, before running this script.
+# Usage after a first-time git clone / cvs checkout:   ./autogen.sh
+# Usage after a git clone / cvs update:                ./autogen.sh --quick
+# This uses an up-to-date gnulib checkout.
+# (The gettext-0.18.1 release was prepared using gnulib commit
+# 74d509383fe30bb5511a978b52e4f8ecae37826b from 2010-06-03.)
 #
-# Usage: ./autogen.sh [--skip-gnulib]
-#
-# Usage after a git clone:              ./autogen.sh
-# Usage from a released tarball:        ./autogen.sh --skip-gnulib
+# Usage from a released tarball:             ./autogen.sh --quick --skip-gnulib
 # This does not use a gnulib checkout.
 
-# Nuisances.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
+quick=false
 skip_gnulib=false
 while :; do
   case "$1" in
+    --quick) quick=true; shift;;
     --skip-gnulib) skip_gnulib=true; shift;;
     *) break ;;
   esac
 done
 
-cleanup_gnulib() {
-  status=$?
-  rm -fr "$gnulib_path"
-  exit $status
-}
-
-git_modules_config () {
-  test -f .gitmodules && git config --file .gitmodules "$@"
-}
-
-gnulib_path=$(git_modules_config submodule.gnulib.path)
-test -z "$gnulib_path" && gnulib_path=gnulib
-
 # The tests in gettext-tools/tests are not meant to be executable, because
 # they have a TESTS_ENVIRONMENT that specifies the shell explicitly.
 
 if ! $skip_gnulib; then
-  # Get gnulib files.
-  case ${GNULIB_SRCDIR--} in
-  -)
-    if git_modules_config submodule.gnulib.url >/dev/null; then
-      echo "$0: getting gnulib files..."
-      git submodule init || exit $?
-      git submodule update || exit $?
-
-    elif [ ! -d "$gnulib_path" ]; then
-      echo "$0: getting gnulib files..."
-
-      trap cleanup_gnulib 1 2 13 15
-
-      shallow=
-      git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
-      git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
-        cleanup_gnulib
-
-      trap - 1 2 13 15
+  if test -z "$GNULIB_TOOL"; then
+    # Check out gnulib in a subdirectory 'gnulib'.
+    if test -d gnulib; then
+      (cd gnulib && git pull)
+    else
+      git clone git://git.savannah.gnu.org/gnulib.git
     fi
-    GNULIB_SRCDIR=$gnulib_path
-    ;;
-  *)
-    # Use GNULIB_SRCDIR as a reference.
-    if 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
-        # Prefer the one-liner available in git 1.6.4 or newer.
-        git submodule update --init --reference "$GNULIB_SRCDIR" \
-          "$gnulib_path" || exit $?
-      else
-        # This fallback allows at least git 1.5.5.
-        if test -f "$gnulib_path"/gnulib-tool; then
-          # Since file already exists, assume submodule init already complete.
-          git submodule update || exit $?
-        else
-          # Older git can't clone into an empty directory.
-          rmdir "$gnulib_path" 2>/dev/null
-          git clone --reference "$GNULIB_SRCDIR" \
-            "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
-            && git submodule init && git submodule update \
-            || exit $?
-        fi
-      fi
-      GNULIB_SRCDIR=$gnulib_path
+    # Now it should contain a gnulib-tool.
+    if test -f gnulib/gnulib-tool; then
+      GNULIB_TOOL=`pwd`/gnulib/gnulib-tool
+    else
+      echo "** warning: gnulib-tool not found" 1>&2
     fi
-    ;;
-  esac
-  # Now it should contain a gnulib-tool.
-  if test -f "$GNULIB_SRCDIR"/gnulib-tool; then
-    GNULIB_TOOL="$GNULIB_SRCDIR"/gnulib-tool
-  else
-    echo "** warning: gnulib-tool not found" 1>&2
   fi
   # Skip the gnulib-tool step if gnulib-tool was not found.
   if test -n "$GNULIB_TOOL"; then
     # In gettext-runtime:
+    if test -f gettext-runtime/gnulib-m4/gnulib-cache.m4; then
+      mv -f gettext-runtime/gnulib-m4/gnulib-cache.m4 gettext-runtime/gnulib-m4/gnulib-cache.m4~
+    fi
     GNULIB_MODULES_RUNTIME_FOR_SRC='
       atexit
       basename
@@ -136,7 +88,6 @@
       progname
       propername
       relocatable-prog
-      setlocale
       sigpipe
       stdbool
       stdio
@@ -147,26 +98,28 @@
     '
     GNULIB_MODULES_RUNTIME_OTHER='
       gettext-runtime-misc
-      ansi-c++-opt
       csharpcomp-script
       java
       javacomp-script
     '
     $GNULIB_TOOL --dir=gettext-runtime --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --no-libtool --local-dir=gnulib-local --local-symlink \
-      --import $GNULIB_MODULES_RUNTIME_FOR_SRC $GNULIB_MODULES_RUNTIME_OTHER || exit $?
+      --import $GNULIB_MODULES_RUNTIME_FOR_SRC $GNULIB_MODULES_RUNTIME_OTHER
     # In gettext-runtime/libasprintf:
+    if test -f gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4; then
+      mv -f gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4 gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4~
+    fi
     GNULIB_MODULES_LIBASPRINTF='
       alloca
       errno
-      verify
-      xsize
     '
     GNULIB_MODULES_LIBASPRINTF_OTHER='
     '
     $GNULIB_TOOL --dir=gettext-runtime/libasprintf --source-base=. --m4-base=gnulib-m4 --lgpl=2 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
-      --import $GNULIB_MODULES_LIBASPRINTF $GNULIB_MODULES_LIBASPRINTF_OTHER || exit $?
-    $GNULIB_TOOL --copy-file m4/intmax_t.m4 gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 || exit $?
+      --import $GNULIB_MODULES_LIBASPRINTF $GNULIB_MODULES_LIBASPRINTF_OTHER
     # In gettext-tools:
+    if test -f gettext-tools/gnulib-m4/gnulib-cache.m4; then
+      mv -f gettext-tools/gnulib-m4/gnulib-cache.m4 gettext-tools/gnulib-m4/gnulib-cache.m4~
+    fi
     GNULIB_MODULES_TOOLS_FOR_SRC='
       alloca-opt
       atexit
@@ -180,7 +133,6 @@
       c-strcasestr
       c-strstr
       clean-temp
-      closedir
       closeout
       copy-file
       csharpcomp
@@ -216,20 +168,17 @@
       minmax
       obstack
       open
-      opendir
       openmp
       ostream
+      pipe
       pipe-filter-ii
       progname
       propername
-      readdir
       relocatable-prog
       relocatable-script
-      setlocale
       sh-quote
       sigpipe
       sigprocmask
-      spawn-pipe
       stdbool
       stdio
       stdlib
@@ -249,7 +198,6 @@
       uniname/uniname
       unistd
       unistr/u8-mbtouc
-      unistr/u8-mbtoucr
       unistr/u8-uctomb
       unistr/u16-mbtouc
       uniwidth/width
@@ -269,18 +217,16 @@
     # Common dependencies of GNULIB_MODULES_TOOLS_FOR_SRC and GNULIB_MODULES_TOOLS_FOR_LIBGREP.
     GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES='
       alloca-opt
+      arg-nonnull
+      c++defs
       extensions
       gettext-h
       include_next
-      locale
       localcharset
       malloc-posix
       mbrtowc
       mbsinit
       multiarch
-      snippet/arg-nonnull
-      snippet/c++defs
-      snippet/warn-on-use
       ssize_t
       stdbool
       stddef
@@ -289,12 +235,12 @@
       streq
       unistd
       verify
+      warn-on-use
       wchar
-      wctype-h
+      wctype
     '
     GNULIB_MODULES_TOOLS_OTHER='
       gettext-tools-misc
-      ansi-c++-opt
       csharpcomp-script
       csharpexec-script
       gcj
@@ -303,27 +249,24 @@
       javaexec-script
       stdint
     '
-    GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS='
-      unilbrk/u8-possible-linebreaks-tests
-      unilbrk/ulc-width-linebreaks-tests
-      unistr/u8-mbtouc-tests
-      unistr/u8-mbtouc-unsafe-tests
-      uniwidth/width-tests
-    '
     $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \
-      --import --avoid=hash-tests `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER || exit $?
+      --import --avoid=hash-tests $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER
     # In gettext-tools/libgrep:
+    if test -f gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4; then
+      mv -f gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4 gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4~
+    fi
     GNULIB_MODULES_TOOLS_FOR_LIBGREP='
-      mbrlen
       regex
     '
-    $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \
-      --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then echo --avoid=$m; fi; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP || exit $?
+    $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \
+      --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then echo --avoid=$m; fi; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP
     # In gettext-tools/libgettextpo:
+    if test -f gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4; then
+      mv -f gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4~
+    fi
     # This is a subset of the GNULIB_MODULES_FOR_SRC.
     GNULIB_MODULES_LIBGETTEXTPO='
       basename
-      close
       c-ctype
       c-strcase
       c-strstr
@@ -349,11 +292,9 @@
       stdbool
       stdio
       stdlib
-      strchrnul
       strerror
       unilbrk/ulc-width-linebreaks
       unistr/u8-mbtouc
-      unistr/u8-mbtoucr
       unistr/u8-uctomb
       unistr/u16-mbtouc
       uniwidth/width
@@ -369,91 +310,75 @@
     GNULIB_MODULES_LIBGETTEXTPO_OTHER='
     '
     $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
-      --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER || exit $?
-    # Import build tools.  We use --copy-file to avoid directory creation.
-    $GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $?
-    $GNULIB_TOOL --copy-file build-aux/git-version-gen || exit $?
+      --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER
   fi
 fi
 
 # Fetch config.guess, config.sub.
 if test -n "$GNULIB_TOOL"; then
   for file in config.guess config.sub; do
-    $GNULIB_TOOL --copy-file build-aux/$file; chmod a+x build-aux/$file || exit $?
+    $GNULIB_TOOL --copy-file build-aux/$file; chmod a+x build-aux/$file
   done
 else
   for file in config.guess config.sub; do
-    echo "$0: getting $file..."
     wget -q --timeout=5 -O build-aux/$file.tmp "http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/${file};hb=HEAD" \
       && mv build-aux/$file.tmp build-aux/$file \
       && chmod a+x build-aux/$file
-    retval=$?
-    rm -f build-aux/$file.tmp
-    test $retval -eq 0 || exit $retval
   done
 fi
 
-# Fetch gettext-tools/misc/archive.dir.tar.
-if ! test -f gettext-tools/misc/archive.dir.tar; then
-  if ! test -f gettext-tools/misc/archive.dir.tar.xz; then
-    echo "$0: getting gettext-tools/misc/archive.dir.tar..."
-    wget -q --timeout=5 -O gettext-tools/misc/archive.dir.tar.xz-t "ftp://alpha.gnu.org/gnu/gettext/archive.dir-latest.tar.xz" \
-      && mv gettext-tools/misc/archive.dir.tar.xz-t gettext-tools/misc/archive.dir.tar.xz
-    retval=$?
-    rm -f gettext-tools/misc/archive.dir.tar.xz-t
-    test $retval -eq 0 || exit $retval
-  fi
-  xz -d -c < gettext-tools/misc/archive.dir.tar.xz > gettext-tools/misc/archive.dir.tar-t \
-    && mv gettext-tools/misc/archive.dir.tar-t gettext-tools/misc/archive.dir.tar
-  retval=$?
-  rm -f gettext-tools/misc/archive.dir.tar-t
-  test $retval -eq 0 || exit $retval
-fi
-
-# 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
+ ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 -I gnulib-m4
  autoconf
  autoheader && touch config.h.in
  automake --add-missing --copy
 )
 
 (cd gettext-runtime
- echo "$0: geneating configure in gettext-runtime..."
- aclocal -I m4 -I ../m4 -I gnulib-m4
+ ../build-aux/fixaclocal aclocal -I m4 -I ../m4 -I gnulib-m4
  autoconf
  autoheader && touch config.h.in
  automake --add-missing --copy
+ # Rebuilding the PO files and manual pages is only rarely needed.
+ if ! $quick; then
+   ./configure --disable-java --disable-native-java --disable-csharp \
+     && (cd po && make update-po) \
+     && (cd intl && make) && (cd gnulib-lib && make) && (cd src && make) \
+     && (cd man && make update-man1 all) \
+     && make distclean
+ fi
 )
 
+cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
+
 (cd gettext-tools/examples
- echo "$0: geneating configure in gettext-tools/examples..."
- aclocal -I ../../gettext-runtime/m4 -I ../../m4
+ ../../build-aux/fixaclocal aclocal -I ../../gettext-runtime/m4 -I ../../m4
  autoconf
  automake --add-missing --copy
+ # Rebuilding the examples PO files is only rarely needed.
+ if ! $quick; then
+   ./configure && (cd po && make update-po) && make distclean
+ fi
 )
 
-echo "$0: copying common files from gettext-runtime to gettext-tools..."
-cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
-cp -p gettext-runtime/po/Makefile.in.in gettext-tools/po/Makefile.in.in
-cp -p gettext-runtime/po/Rules-quot gettext-tools/po/Rules-quot
-cp -p gettext-runtime/po/boldquot.sed gettext-tools/po/boldquot.sed
-cp -p gettext-runtime/po/quot.sed gettext-tools/po/quot.sed
-cp -p gettext-runtime/po/en@quot.header gettext-tools/po/en@quot.header
-cp -p gettext-runtime/po/en@boldquot.header gettext-tools/po/en@boldquot.header
-cp -p gettext-runtime/po/insert-header.sin gettext-tools/po/insert-header.sin
-cp -p gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin
-
 (cd gettext-tools
- echo "$0: geneating configure in gettext-tools..."
- aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+ ../build-aux/fixaclocal 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
+ # Rebuilding the PO files, manual pages, documentation, test files is only rarely needed.
+ if ! $quick; then
+   ./configure --disable-java --disable-native-java --disable-csharp --disable-openmp \
+     && (cd po && make update-po) \
+     && (cd intl && make) && (cd gnulib-lib && make) && (cd libgrep && make) && (cd src && make) \
+     && (cd man && make update-man1 all) \
+     && (cd doc && make all) \
+     && (cd tests && make update-expected) \
+     && make distclean
+ fi
 )
 
-aclocal -I m4
+build-aux/fixaclocal aclocal -I m4
 autoconf
 automake
diff -Nru gettext-0.19.3/build-aux/arg-nonnull.h gettext-0.18.1.1/build-aux/arg-nonnull.h
--- gettext-0.19.3/build-aux/arg-nonnull.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/build-aux/arg-nonnull.h	2010-05-24 09:59:53.000000000 +0000
@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This 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
+   Lesser 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/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
diff -Nru gettext-0.19.3/build-aux/c++defs.h gettext-0.18.1.1/build-aux/c++defs.h
--- gettext-0.19.3/build-aux/c++defs.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/build-aux/c++defs.h	2010-05-24 09:59:53.000000000 +0000
@@ -0,0 +1,271 @@
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This 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
+   Lesser 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 _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
diff -Nru gettext-0.19.3/build-aux/compile gettext-0.18.1.1/build-aux/compile
--- gettext-0.19.3/build-aux/compile	2014-10-16 06:01:20.000000000 +0000
+++ gettext-0.18.1.1/build-aux/compile	2009-08-15 15:28:59.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
+# Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -28,224 +29,21 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
+right script to run: please start by reading the file `INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -255,13 +53,11 @@
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
 esac
 
 ofile=
 cfile=
+eat=
 
 for arg
 do
@@ -270,8 +66,8 @@
   else
     case $1 in
       -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -298,10 +94,10 @@
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
+  # If no `-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
+  # `.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -310,7 +106,7 @@
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
@@ -328,9 +124,9 @@
 ret=$?
 
 if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+  mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
diff -Nru gettext-0.19.3/build-aux/config.guess gettext-0.18.1.1/build-aux/config.guess
--- gettext-0.19.3/build-aux/config.guess	2014-10-16 06:01:14.000000000 +0000
+++ gettext-0.18.1.1/build-aux/config.guess	2010-05-24 17:05:17.000000000 +0000
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2010-04-03'
 
 # 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
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,22 +17,26 @@
 # 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/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
-# Originally written by Per Bothner.
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
 #
 # 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
-#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -50,7 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -84,7 +92,7 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -98,7 +106,7 @@
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -132,33 +140,12 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -194,7 +181,7 @@
 		fi
 		;;
 	    *)
-		os=netbsd
+	        os=netbsd
 		;;
 	esac
 	# The OS release
@@ -215,10 +202,6 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -241,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -287,10 +270,7 @@
 	# 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'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -316,12 +296,12 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
+    arm:riscos:*:*|arm:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -415,23 +395,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -501,8 +481,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -515,7 +495,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-	exit ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -572,7 +552,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[4567])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -615,52 +595,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    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
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
+                    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
+                      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
-			esac ;;
-		    esac
+                        esac ;;
+                    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
+		    sed 's/^              //' << EOF >$dummy.c
 
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -751,22 +731,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -790,14 +770,14 @@
 	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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+        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/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        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:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -809,35 +789,30 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
     i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-	case ${UNAME_MACHINE} in
+    	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -874,22 +849,15 @@
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	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 '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -899,56 +867,52 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
+        esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -967,63 +931,51 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
+	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1032,11 +984,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1068,7 +1020,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1096,13 +1048,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-	exit ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1137,8 +1089,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1181,10 +1133,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1210,11 +1162,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1227,9 +1179,6 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1256,31 +1205,19 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; 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) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		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) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1294,10 +1231,7 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
+    NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1342,13 +1276,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1366,11 +1300,159 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
 esac
 
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff -Nru gettext-0.19.3/build-aux/config.libpath gettext-0.18.1.1/build-aux/config.libpath
--- gettext-0.19.3/build-aux/config.libpath	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/config.libpath	2010-02-16 21:31:27.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+#   Copyright 1996-2010 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2003
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -66,6 +66,8 @@
   dgux*)
     shlibpath_var=LD_LIBRARY_PATH
     ;;
+  freebsd1*)
+    ;;
   freebsd* | dragonfly*)
     shlibpath_var=LD_LIBRARY_PATH
     ;;
diff -Nru gettext-0.19.3/build-aux/config.rpath gettext-0.18.1.1/build-aux/config.rpath
--- gettext-0.19.3/build-aux/config.rpath	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/config.rpath	2010-04-02 16:29:39.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+#   Copyright 1996-2010 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -57,6 +57,13 @@
     aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -65,7 +72,9 @@
     irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
       case $cc_basename in
         ecc*)
           wl='-Wl,'
@@ -76,26 +85,17 @@
         lf95*)
           wl='-Wl,'
           ;;
-        nagfor*)
-          wl='-Wl,-Wl,,'
-          ;;
-        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        pgcc | pgf77 | pgf90)
           wl='-Wl,'
           ;;
         ccc*)
           wl='-Wl,'
           ;;
-        xl* | bgxl* | bgf* | mpixl*)
-          wl='-Wl,'
-          ;;
         como)
           wl='-lopt='
           ;;
         *)
           case `$CC -V 2>&1 | sed 5q` in
-            *Sun\ F* | *Sun*Fortran*)
-              wl=
-              ;;
             *Sun\ C*)
               wl='-Wl,'
               ;;
@@ -103,24 +103,13 @@
           ;;
       esac
       ;;
-    newsos6)
-      ;;
-    *nto* | *qnx*)
-      ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
     rdos*)
       ;;
     solaris*)
-      case $cc_basename in
-        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-          wl='-Qoption ld '
-          ;;
-        *)
-          wl='-Wl,'
-          ;;
-      esac
+      wl='-Wl,'
       ;;
     sunos4*)
       wl='-Qoption ld '
@@ -182,14 +171,15 @@
       fi
       ;;
     amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
       ;;
     beos*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -208,13 +198,11 @@
         ld_shlibs=no
       fi
       ;;
-    haiku*)
-      ;;
     interix[3-9]*)
       hardcode_direct=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
@@ -337,14 +325,10 @@
       fi
       ;;
     amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
       ;;
     bsdi[45]*)
       ;;
@@ -358,16 +342,29 @@
       ;;
     darwin* | rhapsody*)
       hardcode_direct=no
-      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+      if test "$GCC" = yes ; then
         :
       else
-        ld_shlibs=no
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
       fi
       ;;
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd2.[01]*)
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
@@ -423,8 +420,6 @@
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
-    *nto* | *qnx*)
-      ;;
     openbsd*)
       if test -f /usr/libexec/ld.so; then
         hardcode_direct=yes
@@ -520,12 +515,7 @@
     library_names_spec='$libname$shrext'
     ;;
   amigaos*)
-    case "$host_cpu" in
-      powerpc*)
-        library_names_spec='$libname$shrext' ;;
-      m68k)
-        library_names_spec='$libname.a' ;;
-    esac
+    library_names_spec='$libname.a'
     ;;
   beos*)
     library_names_spec='$libname$shrext'
@@ -544,18 +534,19 @@
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
-  freebsd[23].*)
-    library_names_spec='$libname$shrext$versuffix'
+  freebsd1*)
     ;;
   freebsd* | dragonfly*)
-    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
     ;;
   gnu*)
     library_names_spec='$libname$shrext'
     ;;
-  haiku*)
-    library_names_spec='$libname$shrext'
-    ;;
   hpux9* | hpux10* | hpux11*)
     case $host_cpu in
       ia64*)
@@ -591,7 +582,7 @@
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  linux* | k*bsd*-gnu)
     library_names_spec='$libname$shrext'
     ;;
   knetbsd*-gnu)
@@ -603,7 +594,7 @@
   newsos6)
     library_names_spec='$libname$shrext'
     ;;
-  *nto* | *qnx*)
+  nto-qnx*)
     library_names_spec='$libname$shrext'
     ;;
   openbsd*)
@@ -634,9 +625,6 @@
   sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
     library_names_spec='$libname$shrext'
     ;;
-  tpf*)
-    library_names_spec='$libname$shrext'
-    ;;
   uts4*)
     library_names_spec='$libname$shrext'
     ;;
diff -Nru gettext-0.19.3/build-aux/config.sub gettext-0.18.1.1/build-aux/config.sub
--- gettext-0.19.3/build-aux/config.sub	2014-10-16 06:01:14.000000000 +0000
+++ gettext-0.18.1.1/build-aux/config.sub	2010-05-24 17:05:17.000000000 +0000
@@ -1,31 +1,38 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-09-26'
-
-# 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
-# the Free Software Foundation; either version 3 of the License, or
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+
+timestamp='2010-05-21'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# 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
+# the Free Software Foundation; either version 2 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.
+# 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/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -116,17 +125,13 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -149,12 +154,12 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
-	-bluegene*)
-		os=-cnk
+        -bluegene*)
+	        os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -170,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
-	-chorusrdb)
-		os=-chorusrdb
+ 	-chorusrdb)
+ 		os=-chorusrdb
 		basic_machine=$1
-		;;
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -218,12 +223,6 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -248,28 +247,20 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -283,38 +274,33 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -327,10 +313,8 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -340,21 +324,6 @@
 		basic_machine=mt-unknown
 		;;
 
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -369,31 +338,25 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
-	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -407,41 +370,34 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -466,7 +422,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
+    	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -549,7 +505,7 @@
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-	cegcc)
+        cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -581,7 +537,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16 | cr16-*)
+	cr16)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -739,6 +695,7 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -777,9 +734,6 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -799,15 +753,11 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze*)
+        microblaze)
 		basic_machine=microblaze-xilinx
 		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
 	mingw32)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -835,10 +785,6 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -846,18 +792,10 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -922,12 +860,6 @@
 	np1)
 		basic_machine=np1-gould
 		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1010,10 +942,9 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+	ppc)	basic_machine=powerpc-unknown
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1038,11 +969,7 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
+	rdos)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1111,9 +1038,6 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1170,8 +1094,13 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
-		basic_machine=$basic_machine-unknown
+		basic_machine=tile-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1241,9 +1170,6 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1341,11 +1267,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+        -auroraux)
+	        os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1369,29 +1295,29 @@
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1430,7 +1356,7 @@
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
+        -os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1479,7 +1405,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
+        -tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1515,14 +1441,17 @@
 	-aros*)
 		os=-aros
 		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
-	-nacl*)
-		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1545,10 +1474,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-	score-*)
+        score-*)
 		os=-elf
 		;;
-	spu-*)
+        spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1560,14 +1489,8 @@
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
+        c4x-* | tic4x-*)
+        	os=-coff
 		;;
 	tic54x-*)
 		os=-coff
@@ -1596,11 +1519,14 @@
 		;;
 	m68000-sun)
 		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-	mep-*)
+        mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1627,7 +1553,7 @@
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
+    	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff -Nru gettext-0.19.3/build-aux/csharpcomp.sh.in gettext-0.18.1.1/build-aux/csharpcomp.sh.in
--- gettext-0.19.3/build-aux/csharpcomp.sh.in	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/csharpcomp.sh.in	2010-02-16 21:31:27.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a C# program.
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006, 2009-2010 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 -Nru gettext-0.19.3/build-aux/csharpexec.sh.in gettext-0.18.1.1/build-aux/csharpexec.sh.in
--- gettext-0.19.3/build-aux/csharpexec.sh.in	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/build-aux/csharpexec.sh.in	2010-02-16 21:32:16.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a C# program.
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2009, 2010 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 -Nru gettext-0.19.3/build-aux/depcomp gettext-0.18.1.1/build-aux/depcomp
--- gettext-0.19.3/build-aux/depcomp	2014-10-16 06:01:38.000000000 +0000
+++ gettext-0.18.1.1/build-aux/depcomp	2009-08-15 15:30:38.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,9 +28,9 @@
 
 case $1 in
   '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -39,11 +40,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
+  tmpdepfile  Temporary file to use when outputing dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -56,66 +57,6 @@
     ;;
 esac
 
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -128,9 +69,6 @@
 
 rm -f "$tmpdepfile"
 
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -142,32 +80,18 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
-  depmode=dashmstdout
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
 fi
 
 case "$depmode" in
@@ -190,7 +114,8 @@
   done
   "$@"
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -198,17 +123,13 @@
   ;;
 
 gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
+##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -216,31 +137,31 @@
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
-  # letters.
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
+## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-## Some versions of gcc put a space before the ':'.  On the theory
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
+## well.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -258,7 +179,8 @@
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -266,41 +188,43 @@
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
+
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
+    # the IRIX cc adds comments like `#:fec' to the end of the
     # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-      | tr "$nl" ' ' >> "$depfile"
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> "$depfile"
     echo >> "$depfile"
+
     # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> "$depfile"
   else
-    make_dummy_depfile
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile"
   ;;
 
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
-  set_base_from "$object"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -313,7 +237,9 @@
     "$@" -M
   fi
   stat=$?
-  if test $stat -ne 0; then
+
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -322,100 +248,44 @@
   do
     test -f "$tmpdepfile" && break
   done
-  aix_post_process_depfile
-  ;;
-
-tcc)
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-  # FIXME: That version still under development at the moment of writing.
-  #        Make that this statement remains true also for stable, released
-  #        versions.
-  # It will wrap lines (doesn't matter whether long or short) with a
-  # trailing '\', as in:
-  #
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
   fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
+  # and will wrap long lines using \ :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  set_dir_from "$object"
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  set_base_from "$source"
-  tmpdepfile=$base.d
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
 
-  if test $stat -ne 0; then
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -427,8 +297,8 @@
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-    | sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -439,8 +309,9 @@
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
-  set_base_from "$object"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -451,7 +322,8 @@
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -461,107 +333,77 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
     sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
-    make_dummy_depfile
+    echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
-  set_dir_from  "$object"
-  set_base_from "$object"
-
-  if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
-    # two compilations output dependencies in $dir.libs/$base.o.d and
-    # in $dir$base.o.d.  We have to check for both files, because
-    # one of the two compilations can be disabled.  We should prefer
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-    # automatically cleaned when .libs/ is deleted, while ignoring
-    # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
-    "$@" -Wc,-MD
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    tmpdepfile3=$dir$base.d
-    "$@" -MD
-  fi
-
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  # Same post-processing that is required for AIX mode.
-  aix_post_process_depfile
-  ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-  rm -f "$tmpdepfile"
-  ;;
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
 
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -580,7 +422,7 @@
     shift
   fi
 
-  # Remove '-o $object'.
+  # Remove `-o $object'.
   IFS=" "
   for arg
   do
@@ -600,18 +442,18 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
+  # Require at least two characters before searching for `:'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
   "$@" $dashmflag |
-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -661,15 +503,12 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
-    | tr ' ' "$nl" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -686,7 +525,7 @@
     shift
   fi
 
-  # Remove '-o $object'.
+  # Remove `-o $object'.
   IFS=" "
   for arg
   do
@@ -705,10 +544,10 @@
     esac
   done
 
-  "$@" -E \
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-    | sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -740,23 +579,23 @@
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
+	set fnord "$@"
+	shift
+	shift
+	;;
     *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
     esac
   done
   "$@" -E 2>/dev/null |
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff -Nru gettext-0.19.3/build-aux/elisp-comp gettext-0.18.1.1/build-aux/elisp-comp
--- gettext-0.19.3/build-aux/elisp-comp	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/build-aux/elisp-comp	2009-08-15 15:30:40.000000000 +0000
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1995.
+#
+# This 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 2, 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No files.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: elisp-comp [--help] [--version] FILES...
+
+This script byte-compiles all `.el' files listed as FILES using GNU
+Emacs, and put the resulting `.elc' files into the current directory,
+so disregarding the original directories used in `.el' arguments.
+
+This script manages in such a way that all Emacs LISP files to
+be compiled are made visible between themselves, in the event
+they require or load-library one another.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "elisp-comp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$EMACS" || test "$EMACS" = "t"; then
+  # Value of "t" means we are running in a shell under Emacs.
+  # Just assume Emacs is called "emacs".
+  EMACS=emacs
+fi
+
+tempdir=elc.$$
+
+# Cleanup the temporary directory on exit.
+trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0
+trap '(exit $?); exit' 1 2 13 15
+
+mkdir $tempdir
+cp "$@" $tempdir
+
+(
+  cd $tempdir
+  echo "(setq load-path (cons nil load-path))" > script
+  $EMACS -batch -q -l script -f batch-byte-compile *.el || exit $?
+  mv *.elc ..
+) || exit $?
+
+(exit 0); exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# 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-end: "; # UTC"
+# End:
diff -Nru gettext-0.19.3/build-aux/fixaclocal gettext-0.18.1.1/build-aux/fixaclocal
--- gettext-0.19.3/build-aux/fixaclocal	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/build-aux/fixaclocal	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,35 @@
+#!/bin/sh
+# Script for fixing aclocal.m4 files produced by 'aclocal' from automake 1.10.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+#
+# This 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/>.
+
+# Usage: fixaclocal aclocal [OPTIONS]
+
+"$@"
+result=$?
+if test $result = 0 && test -f aclocal.m4; then
+  # Remove the block of 4 lines starting with 'm4_if(m4_PACKAGE_VERSION'
+  # and the block of 5 lines starting with 'm4_if(AC_AUTOCONF_VERSION'
+  # (automake <= 1.10.1) or with 'm4_if(m4_defn([AC_AUTOCONF_VERSION])'
+  # (automake >= 1.10.2).
+  sed -e '/m4_if(m4_PACKAGE_VERSION/{N;N;N;d}' -e '/m4_if(AC_AUTOCONF_VERSION/{N;N;N;N;d}' -e '/m4_if(m4_defn(\[AC_AUTOCONF_VERSION\])/{N;N;N;N;d}' < aclocal.m4 > aclocal.m4.tmp
+  if cmp aclocal.m4 aclocal.m4.tmp > /dev/null; then
+    rm -f aclocal.m4.tmp
+  else
+    mv aclocal.m4.tmp aclocal.m4
+  fi
+else
+  exit $result
+fi
diff -Nru gettext-0.19.3/build-aux/install-reloc gettext-0.18.1.1/build-aux/install-reloc
--- gettext-0.19.3/build-aux/install-reloc	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/install-reloc	2010-02-16 21:31:27.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 # install-reloc - install a program including a relocating wrapper
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,11 +16,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/>.
 
-# Usage 1:
-#   install-reloc -- library_path_var library_path_value prefix destdir \
-#                    compile_command srcdir builddir config_h_dir exeext \
-#                    strip_command \
-#                    install_command... destprog
+# Usage:
+#   install-reloc library_path_var library_path_value prefix destdir \
+#                 compile_command srcdir builddir config_h_dir exeext \
+#                 strip_command \
+#                 install_command... destprog
 # where
 #   - library_path_var is the platform dependent runtime library path variable
 #   - library_path_value is a colon separated list of directories that contain
@@ -39,67 +39,51 @@
 #     stripping is desired
 #   - install_command is the install command line, excluding the final destprog
 #   - destprog is the destination program name
-# Usage 2:
-#   env RELOC_LIBRARY_PATH_VAR=library_path_var \
-#       RELOC_LIBRARY_PATH_VALUE=library_path_value \
-#       RELOC_PREFIX=prefix \
-#       RELOC_DESTDIR=destdir \
-#       RELOC_COMPILE_COMMAND=compile_command \
-#       RELOC_SRCDIR=srcdir \
-#       RELOC_BUILDDIR=builddir \
-#       RELOC_CONFIG_H_DIR=config_h_dir \
-#       RELOC_EXEEXT=exeext \
-#       RELOC_STRIP_PROG=strip_command \
-#       RELOC_INSTALL_PROG=install_command... \
-#   install-reloc prog1 ... destprog
-#   where destprog is either the destination program name (when only one program
-#   is specified) or the destination directory for all programs.
 # install-reloc renames destprog to destprog.bin and installs a relocating
 # wrapper in the place of destprog.
 
 progname=$0
 
-if test $# -ge 12 && test "x$1" = "x--"; then
-  # Get fixed position arguments.
-  shift
-  library_path_var=$1
-  library_path_value=$2
-  prefix=$3
-  destdir=$4
-  shift
-  shift
-  shift
-  shift
-  compile_command=$1
-  srcdir=$2
-  builddir=$3
-  config_h_dir=$4
-  exeext=$5
-  shift
-  shift
-  shift
-  shift
-  shift
-  strip_prog=$1
-  shift
-  install_prog=$1 # maybe not including the "-c" option
-  shift
+if test $# -eq 2; then
+  # Get arguments from environment variables.
+  library_path_var=$RELOC_LIBRARY_PATH_VAR
+  library_path_value=$RELOC_LIBRARY_PATH_VALUE
+  prefix=$RELOC_PREFIX
+  destdir=$RELOC_DESTDIR
+  compile_command=$RELOC_COMPILE_COMMAND
+  srcdir=$RELOC_SRCDIR
+  builddir=$RELOC_BUILDDIR
+  config_h_dir=$RELOC_CONFIG_H_DIR
+  exeext=$RELOC_EXEEXT
+  strip_prog=$RELOC_STRIP_PROG
+  install_prog=$RELOC_INSTALL_PROG # including the "-c" option
 else
-  if test $# -ge 2; then
-    # Get arguments from environment variables.
-    library_path_var=$RELOC_LIBRARY_PATH_VAR
-    library_path_value=$RELOC_LIBRARY_PATH_VALUE
-    prefix=$RELOC_PREFIX
-    destdir=$RELOC_DESTDIR
-    compile_command=$RELOC_COMPILE_COMMAND
-    srcdir=$RELOC_SRCDIR
-    builddir=$RELOC_BUILDDIR
-    config_h_dir=$RELOC_CONFIG_H_DIR
-    exeext=$RELOC_EXEEXT
-    strip_prog=$RELOC_STRIP_PROG
-    install_prog=$RELOC_INSTALL_PROG # including the "-c" option
+  if test $# -ge 11; then
+    # Get fixed position arguments.
+    library_path_var=$1
+    library_path_value=$2
+    prefix=$3
+    destdir=$4
+    shift
+    shift
+    shift
+    shift
+    compile_command=$1
+    srcdir=$2
+    builddir=$3
+    config_h_dir=$4
+    exeext=$5
+    shift
+    shift
+    shift
+    shift
+    shift
+    strip_prog=$1
+    shift
+    install_prog=$1 # maybe not including the "-c" option
+    shift
   else
-    echo "Usage: $0 -- library_path_var library_path_value prefix destdir" \
+    echo "Usage: $0 library_path_var library_path_value prefix destdir" \
          "compile_command srcdir builddir config_h_dir exeext" \
          "strip_command" \
          "install_command... destprog" 1>&2
@@ -113,26 +97,11 @@
 do
   destprog=$arg
 done
-# Determine whether destprog is a program name or a directory name.
-if test -d "$destprog"; then
-  sed_remove_trailing_slashes='s|//*$||'
-  destprog_directory=`echo "$destprog" | sed -e "$sed_remove_trailing_slashes"`
-  if test -z "$destprog_directory"; then
-    destprog_directory='/'
-  fi
-else
-  destprog_directory=
-fi
-# Prepare for remove trailing $exeext, if present.
+# Remove trailing $exeext, if present.
 if test -n "$exeext"; then
   sed_quote='s,\.,\\.,g'
   sed_remove_exeext='s|'`echo "$exeext" | sed -e "$sed_quote"`'$||'
-fi
-if test -z "$destprog_directory"; then
-  # Remove trailing $exeext, if present.
-  if test -n "$exeext"; then
-    destprog=`echo "$destprog" | sed -e "$sed_remove_exeext"`
-  fi
+  destprog=`echo "$destprog" | sed -e "$sed_remove_exeext"`
 fi
 
 # Outputs a command and runs it.
@@ -145,39 +114,8 @@
 # Run install_command.
 func_verbose $install_prog "$@" || exit $?
 
-# Iterate over all destination program names.
-# func_iterate f
-# applies f to each destination program names, after setting destprog.
-sed_basename_of_file='s|^.*/||'
-func_iterate ()
-{
-  if test -n "$destprog_directory"; then
-    prev_arg=
-    for arg
-    do
-      if test -n "prev_arg"; then
-        destprog="$destprog_directory"/`echo "$prev_arg" | sed -e "$sed_basename_of_file"`
-        $1
-      fi
-      prev_arg="$arg"
-    done
-  else
-    $1
-  fi
-}
-
 # Run strip_command.
-func_strip ()
-{
-  # Remove trailing $exeext, if present.
-  if test -n "$exeext"; then
-    destprog=`echo "$destprog" | sed -e "$sed_remove_exeext"`
-  fi
-  func_verbose "$strip_prog" "$destprog$exeext" || exit $?
-}
-if test "$strip_prog" != ':'; then
-  func_iterate func_strip
-fi
+test "$strip_prog" = ':' || func_verbose "$strip_prog" "$destprog$exeext" || exit $?
 
 # If the platform doesn't support LD_LIBRARY_PATH or similar, we cannot build
 # a wrapper.
@@ -200,80 +138,59 @@
 test -n "$libdirs" || exit 0
 
 # Determine installdir from destprog, removing a leading destdir if present.
-if test -n "$destprog_directory"; then
-  installdir="$destprog_directory"
-else
-  installdir=`echo "$destprog" | sed -e 's,/[^/]*$,,'`
-fi
+installdir=`echo "$destprog" | sed -e 's,/[^/]*$,,'`
 if test -n "$destdir"; then
   sed_quote='s,\([|.\*^$[]\),\\\1,g'
   sed_remove_destdir='s|^'`echo "$destdir" | sed -e "$sed_quote"`'||'
   installdir=`echo "$installdir" | sed -e "$sed_remove_destdir"`
 fi
 
-# Compile and install wrapper.
-func_create_wrapper ()
-{
-  # Remove trailing $exeext, if present.
-  if test -n "$exeext"; then
-    destprog=`echo "$destprog" | sed -e "$sed_remove_exeext"`
-  fi
-
-  # Compile wrapper.
-  func_verbose $compile_command \
-               -I"$builddir" -I"$srcdir" -I"$config_h_dir" \
-               -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC \
-               -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" \
-               -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" \
-               -D"EXEEXT=\"$exeext\"" \
-               "$srcdir"/relocwrapper.c \
-               "$srcdir"/progname.c \
-               "$srcdir"/progreloc.c \
-               "$srcdir"/areadlink.c \
-               "$srcdir"/careadlinkat.c \
-               "$srcdir"/allocator.c \
-               "$srcdir"/strerror-override.c \
-               "$srcdir"/stat.c \
-               "$srcdir"/lstat.c \
-               "$srcdir"/readlink.c \
-               "$srcdir"/canonicalize-lgpl.c \
-               "$srcdir"/malloca.c \
-               "$srcdir"/relocatable.c \
-               "$srcdir"/setenv.c \
-               "$srcdir"/strerror.c \
-               "$srcdir"/c-ctype.c \
-               -o "$destprog.wrapper$exeext"
-  rc=$?
-  # Clean up object files left over in the current directory by the native C
-  # compilers on Solaris, HP-UX, OSF/1, IRIX.
-  rm -f relocwrapper.o \
-        progname.o \
-        progreloc.o \
-        areadlink.o \
-        careadlinkat.o \
-        allocator.o \
-        readlink.o \
-        canonicalize-lgpl.o \
-        malloca.o \
-        relocatable.o \
-        setenv.o \
-        strerror.o \
-        c-ctype.o
-  test $rc = 0 || exit $?
-  # Clean up debugging information left over by the native C compiler on MacOS X.
-  rm -rf "$destprog.wrapper$exeext.dSYM"
-  test $rc = 0 || exit $?
-
-  # Strip wrapper.
-  test "$strip_prog" = ':' || func_verbose "$strip_prog" "$destprog.wrapper$exeext" || exit $?
-
-  # Rename $destprog.wrapper -> $destprog -> $destprog.bin.
-  ln -f "$destprog$exeext" "$destprog.bin$exeext" \
-    || { rm -f "$destprog.bin$exeext" \
-         && cp -p "$destprog$exeext" "$destprog.bin$exeext"; } \
-    || exit 1
-  mv "$destprog.wrapper$exeext" "$destprog$exeext" || exit 1
-}
-func_iterate func_create_wrapper
+# Compile wrapper.
+func_verbose $compile_command \
+             -I"$builddir" -I"$srcdir" -I"$config_h_dir" \
+             -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC \
+             -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" \
+             -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" \
+             -D"EXEEXT=\"$exeext\"" \
+             "$srcdir"/relocwrapper.c \
+             "$srcdir"/progname.c \
+             "$srcdir"/progreloc.c \
+             "$srcdir"/areadlink.c \
+             "$srcdir"/readlink.c \
+             "$srcdir"/canonicalize-lgpl.c \
+             "$srcdir"/malloca.c \
+             "$srcdir"/relocatable.c \
+             "$srcdir"/setenv.c \
+             "$srcdir"/strerror.c \
+             "$srcdir"/c-ctype.c \
+             -o "$destprog.wrapper$exeext"
+rc=$?
+# Clean up object files left over in the current directory by the native C
+# compilers on Solaris, HP-UX, OSF/1, IRIX.
+rm -f relocwrapper.o \
+      progname.o \
+      progreloc.o \
+      xreadlink.o \
+      areadlink.o \
+      canonicalize-lgpl.o \
+      malloca.o \
+      relocatable.o \
+      setenv.o \
+      strerror.o \
+      c-ctype.o
+test $rc = 0 || exit $?
+# Clean up debugging information left over by the native C compiler on MacOS X.
+rm -rf "$destprog.wrapper$exeext.dSYM"
+test $rc = 0 || exit $?
+
+# Strip wrapper.
+test "$strip_prog" = ':' || func_verbose "$strip_prog" "$destprog.wrapper$exeext" || exit $?
+
+# Rename $destprog.wrapper -> $destprog -> $destprog.bin.
+ln -f "$destprog$exeext" "$destprog.bin$exeext" \
+  || { rm -f "$destprog.bin$exeext" \
+       && cp -p "$destprog$exeext" "$destprog.bin$exeext"; } \
+  || exit 1
+mv "$destprog.wrapper$exeext" "$destprog$exeext" || exit 1
 
 exit 0
diff -Nru gettext-0.19.3/build-aux/install-sh gettext-0.18.1.1/build-aux/install-sh
--- gettext-0.19.3/build-aux/install-sh	2014-10-16 06:01:20.000000000 +0000
+++ gettext-0.18.1.1/build-aux/install-sh	2009-08-15 15:28:09.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,10 +156,6 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -190,10 +186,6 @@
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
   done
 fi
 
@@ -202,17 +194,13 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call 'install-sh -d' without argument.
+  # It's OK to call `install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
+  trap '(exit $?); exit' 1 2 13 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -240,9 +228,9 @@
 
 for src
 do
-  # Protect names problematic for 'test' and other utilities.
+  # Protect names starting with `-'.
   case $src in
-    -* | [=\(\)!]) src=./$src;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -264,7 +252,12 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
+
     dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -354,7 +347,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
+		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -392,7 +385,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
+	-*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -410,7 +403,7 @@
 
       for d
       do
-	test X"$d" = X && continue
+	test -z "$d" && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru gettext-0.19.3/build-aux/javacomp.sh.in gettext-0.18.1.1/build-aux/javacomp.sh.in
--- gettext-0.19.3/build-aux/javacomp.sh.in	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/javacomp.sh.in	2010-02-16 21:31:27.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a Java program.
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2006, 2009-2010 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 -Nru gettext-0.19.3/build-aux/javaexec.sh.in gettext-0.18.1.1/build-aux/javaexec.sh.in
--- gettext-0.19.3/build-aux/javaexec.sh.in	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/build-aux/javaexec.sh.in	2010-02-16 21:32:16.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a Java program.
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009, 2010 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 -Nru gettext-0.19.3/build-aux/ltmain.sh gettext-0.18.1.1/build-aux/ltmain.sh
--- gettext-0.19.3/build-aux/ltmain.sh	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/build-aux/ltmain.sh	2010-06-06 12:49:57.000000000 +0000
@@ -1,9 +1,9 @@
+# Generated from ltmain.m4sh.
 
-# libtool (GNU libtool) 2.4.2
+# ltmain.sh (GNU libtool) 2.2.6
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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.
 
@@ -32,57 +32,50 @@
 #
 # Provide generalized library-building support services.
 #
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
 #
 # MODE must be one of the following:
 #
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# MODE-ARGS vary depending on the MODE.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
+#       host-triplet:	$host
+#       shell:		$SHELL
+#       compiler:		$LTCC
+#       compiler flags:		$LTCFLAGS
+#       linker:		$LD (gnu? $with_gnu_ld)
+#       $progname:		(GNU libtool) 2.2.6
+#       automake:		$automake_version
+#       autoconf:		$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=libtool
+PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=2.4.2
+VERSION=2.2.6
 TIMESTAMP=""
-package_revision=1.3337
+package_revision=1.3012
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -98,15 +91,10 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
 # NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -119,28 +107,24 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
 
 
 
 : ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
+: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
+: ${SED="/opt/local/bin/gsed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -160,27 +144,6 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -195,183 +158,33 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 }
 
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
+# Generated shell functions inserted here.
 
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 # The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
 func_dirname_and_basename "$progpath"
 progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
 
 # Make sure we have an absolute path for reexecution:
 case $progpath in
@@ -383,7 +196,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
+     IFS=:
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -402,15 +215,6 @@
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -439,7 +243,7 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+    $ECHO "$progname${mode+: }$mode: $*"
 }
 
 # func_verbose arg...
@@ -454,25 +258,18 @@
     :
 }
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
 # func_error arg...
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -529,9 +326,9 @@
         case $my_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
       done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
 
       save_mkdir_p_IFS="$IFS"; IFS=':'
       for my_dir in $my_dir_list; do
@@ -581,7 +378,7 @@
         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $ECHO "$my_tmpdir"
+    $ECHO "X$my_tmpdir" | $Xsed
 }
 
 
@@ -595,7 +392,7 @@
 {
     case $1 in
       *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
       *)
         func_quote_for_eval_unquoted_result="$1" ;;
     esac
@@ -622,7 +419,7 @@
 {
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
+	my_arg=`$ECHO "X$1" | $Xsed \
 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
         my_arg="$1" ;;
@@ -691,39 +488,15 @@
     fi
 }
 
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
+
+
 
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
         s/^# //
 	s/^# *$//
         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -736,28 +509,22 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+    $SED -n '/^# Usage:/,/# -h/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
 	p
     }' < "$progpath"
-    echo
+    $ECHO
     $ECHO "run \`$progname --help | more' for full usage"
     exit $?
 }
 
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+# func_help
+# Echo long help message to standard output and exit.
 func_help ()
 {
-    $opt_debug
-
     $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -767,18 +534,11 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
+     }' < "$progpath"
+    exit $?
 }
 
 # func_missing_arg argname
@@ -786,106 +546,63 @@
 # exit_cmd.
 func_missing_arg ()
 {
-    $opt_debug
-
-    func_error "missing argument for $1."
+    func_error "missing argument for $1"
     exit_cmd=exit
 }
 
+exit_cmd=:
 
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
 
-exit_cmd=:
 
 
 
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
 
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
 
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
+# $mode is unset
 nonopt=
+execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -919,16 +636,16 @@
 # Display the features supported by this script.
 func_features ()
 {
-    echo "host: $host"
+    $ECHO "host: $host"
     if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
+      $ECHO "enable shared libraries"
     else
-      echo "disable shared libraries"
+      $ECHO "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
+      $ECHO "enable static libraries"
     else
-      echo "disable static libraries"
+      $ECHO "disable static libraries"
     fi
 
     exit $?
@@ -975,209 +692,117 @@
   esac
 }
 
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
 {
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
 
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
+    ;;
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
+    ;;
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
+    ;;
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
+    ;;
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
+    ;;
+  esac
 
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
     opt="$1"
     shift
+
     case $opt in
-      --debug|-x)	opt_debug='set -x'
+      --config)		func_config					;;
+
+      --debug)		preserve_args="$preserve_args $opt"
 			func_echo "enabling shell trace mode"
+			opt_debug='set -x'
 			$opt_debug
 			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
+
+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			execute_dlfiles="$execute_dlfiles $1"
 			shift
 			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
+
+      --dry-run | -n)	opt_dry_run=:					;;
+      --features)       func_features					;;
+      --finish)		mode="finish"					;;
+
+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			case $1 in
+			  # Valid mode arguments:
+			  clean)	;;
+			  compile)	;;
+			  execute)	;;
+			  finish)	;;
+			  install)	;;
+			  link)		;;
+			  relink)	;;
+			  uninstall)	;;
+
+			  # Catch anything else as an error
+			  *) func_error "invalid argument for $opt"
+			     exit_cmd=exit
+			     break
+			     ;;
+		        esac
+
+			mode="$1"
 			shift
 			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
+
+      --preserve-dup-deps)
+			opt_duplicate_deps=:				;;
+
+      --quiet|--silent)	preserve_args="$preserve_args $opt"
 			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
 			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
+
+      --verbose| -v)	preserve_args="$preserve_args $opt"
+			opt_silent=false
 			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
+
+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			preserve_args="$preserve_args $opt $1"
+			func_enable_tag "$1"	# tagname is set here
 			shift
 			;;
 
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
       # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+      -dlopen=*|--mode=*|--tag=*)
+			func_opt_split "$opt"
+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
 			shift
 			;;
 
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
+      -\?|-h)		func_usage					;;
+      --help)		opt_help=:					;;
+      --version)	func_version					;;
+
+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
 
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+      *)		nonopt="$opt"
+			break
+			;;
     esac
   done
 
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -1185,44 +810,82 @@
       opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
       ;;
   esac
 
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
 
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
     fi
 
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
+    exit $EXIT_MISMATCH
+  fi
+}
 
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
 
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
 
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
+  fi
 
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
 
 
+  # Darwin sucks
+  eval std_shrext=\"$shrext_cmds\"
+
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
 
-## ----------- ##
-##    Main.    ##
-## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1287,9 +950,12 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+	func_dirname_and_basename "$1" "" "."
+	func_stripname '' '.exe' "$func_basename_result"
+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
 }
 
 # func_ltwrapper_p file
@@ -1335,37 +1001,6 @@
 }
 
 
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1378,15 +1013,13 @@
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
+        func_quote_for_eval "$arg"
+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
       done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -1397,13 +1030,11 @@
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
+	      func_quote_for_eval "$arg"
+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
 	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1455,496 +1086,16 @@
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
+# Name of the PIC object.
+pic_object=$write_lobj
 
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
 
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
 
 # func_mode_compile arg...
 func_mode_compile ()
@@ -1986,12 +1137,12 @@
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
+          pie_flag="$pie_flag $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
+	  later="$later $arg"
 	  continue
 	  ;;
 
@@ -2012,14 +1163,15 @@
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
+	    func_quote_for_eval "$arg"
+	    lastarg="$lastarg $func_quote_for_eval_result"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
+	  base_compile="$base_compile $lastarg"
 	  continue
 	  ;;
 
@@ -2035,7 +1187,8 @@
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
     done # for arg
 
     case $arg_mode in
@@ -2060,7 +1213,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -2135,7 +1288,7 @@
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
     else
       output_obj=
@@ -2166,16 +1319,17 @@
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      func_append removelist " $output_obj"
+      removelist="$removelist $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
+    removelist="$removelist $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -2195,7 +1349,7 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
+	command="$command -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -2242,11 +1396,11 @@
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
+	command="$command -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
+      command="$command$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -2291,13 +1445,13 @@
 }
 
 $opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+test "$mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $opt_mode in
+    case $mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -2328,11 +1482,10 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
   -shared           do not build a \`.o' file suitable for static linking
   -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 from the given SOURCEFILE.
@@ -2385,7 +1538,7 @@
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -2405,8 +1558,6 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -2435,11 +1586,6 @@
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -2473,44 +1619,18 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
+        func_fatal_help "invalid operation mode \`$mode'"
         ;;
     esac
 
-    echo
+    $ECHO
     $ECHO "Try \`$progname --help' for more information about other modes."
+
+    exit $?
 }
 
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
 
 
 # func_mode_execute arg...
@@ -2523,16 +1643,13 @@
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
+    for file in $execute_dlfiles; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -2554,7 +1671,7 @@
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
+	  dir="$dir/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -2595,7 +1712,7 @@
     for file
     do
       case $file in
-      -* | *.la | *.lo ) ;;
+      -*) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
@@ -2611,7 +1728,8 @@
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -2636,66 +1754,29 @@
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
+	$ECHO "export $shlibpath_var"
       fi
       $ECHO "$cmd$args"
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test "$mode" = execute && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
     $opt_debug
-    libs=
-    libdirs=
+    libdirs="$nonopt"
     admincmds=
 
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -2705,7 +1786,7 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
        $cmds"
 	fi
       done
@@ -2714,55 +1795,53 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
 
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
+      $ECHO "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
     fi
+    $ECHO
+
+    $ECHO "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	$ECHO "pages."
+	;;
+      *)
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
 }
 
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test "$mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -2773,7 +1852,7 @@
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -2787,12 +1866,8 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
+    install_prog="$install_prog$func_quote_for_eval_result"
     install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -2807,7 +1882,7 @@
     do
       arg2=
       if test -n "$dest"; then
-	func_append files " $dest"
+	files="$files $dest"
 	dest=$arg
 	continue
       fi
@@ -2815,9 +1890,10 @@
       case $arg in
       -d) isdir=yes ;;
       -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
+	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -2845,11 +1921,11 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
+      install_prog="$install_prog $func_quote_for_eval_result"
       if test -n "$arg2"; then
 	func_quote_for_eval "$arg2"
       fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
+      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -2859,10 +1935,8 @@
       func_fatal_help "the \`$prev' option requires an argument"
 
     if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
+      func_quote_for_eval "$install_override_mode"
+      install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
     fi
 
     if test -z "$files"; then
@@ -2919,13 +1993,10 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	func_append staticlibs " $file"
+	staticlibs="$staticlibs $file"
 	;;
 
       *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2939,23 +2010,23 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	func_append dir "$objdir"
+	dir="$dir$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2968,9 +2039,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  func_warning "relinking \`$file'"
@@ -3028,7 +2099,7 @@
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
 	;;
 
       *.lo)
@@ -3128,7 +2199,7 @@
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
 	    if test -n "$libdir" && test ! -f "$libfile"; then
 	      func_warning "\`$lib' has not been installed in \`$libdir'"
 	      finalize=no
@@ -3147,7 +2218,7 @@
 		file="$func_basename_result"
 	        outputname="$tmpdir/$file"
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_silent || {
 	          func_quote_for_expand "$relink_command"
@@ -3166,7 +2237,7 @@
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -3202,13 +2273,11 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3227,7 +2296,7 @@
     fi
 }
 
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test "$mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -3270,22 +2339,6 @@
 extern \"C\" {
 #endif
 
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
 /* External symbol declarations for the compiler. */\
 "
 
@@ -3295,11 +2348,10 @@
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
 	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	    func_verbose "extracting global C symbols from \`$progfile'"
+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -3335,7 +2387,7 @@
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
+	        *cygwin | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -3348,52 +2400,10 @@
 	  func_verbose "extracting global C symbols from \`$dlprefile'"
 	  func_basename "$dlprefile"
 	  name="$func_basename_result"
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
+	  $opt_dry_run || {
+	    eval '$ECHO ": $name " >> "$nlist"'
+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	  }
 	done
 
 	$opt_dry_run || {
@@ -3421,19 +2431,36 @@
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
-	  echo >> "$output_objdir/$my_dlsyms" "\
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
 typedef struct {
   const char *name;
   void *address;
 } lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
+"
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* )
+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+	    lt_dlsym_const= ;;
+	  *osf5*)
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+	    lt_dlsym_const= ;;
+	  *)
+	    lt_dlsym_const=const ;;
+	  esac
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
+$lt_dlsym_const lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
 {\
   { \"$my_originator\", (void *) 0 },"
@@ -3446,7 +2473,7 @@
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -3473,7 +2500,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3489,7 +2516,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
+	  *) symtab_cflags="$symtab_cflags $arg" ;;
 	  esac
 	done
 
@@ -3504,16 +2531,16 @@
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
 	  fi
 	  ;;
 	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
@@ -3527,8 +2554,8 @@
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
     fi
 }
 
@@ -3538,7 +2565,6 @@
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
   $opt_debug
@@ -3549,11 +2575,9 @@
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 |
 	$SED -n -e '
 	    1,100{
 		/ I /{
@@ -3582,131 +2606,6 @@
   $ECHO "$win32_libid_type"
 }
 
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
 
 
 # func_extract_an_archive dir oldlib
@@ -3715,18 +2614,7 @@
     $opt_debug
     f_ex_an_ar_dir="$1"; shift
     f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -3797,7 +2685,7 @@
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -3812,30 +2700,25 @@
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
 }
 
 
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
+
+# func_emit_wrapper_part1 [arg=no]
 #
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+	func_emit_wrapper_part1_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part1_arg1=$1
+	fi
 
 	$ECHO "\
 #! $SHELL
@@ -3851,6 +2734,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # Be Bourne compatible
@@ -3881,135 +2765,31 @@
 else
   # When we are sourced in execute mode, \$file and \$ECHO are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  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/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which 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 $0 value, followed by "$@".
-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\" | $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\" | $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 \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 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 \"${outputname}:${output}:\${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 ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$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
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
       shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$ECHO "\
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -4019,13 +2799,30 @@
       esac
     fi
 
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -4033,7 +2830,7 @@
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -4088,18 +2885,6 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	# Export our shlibpath_var if we have one.
 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
@@ -4108,28 +2893,253 @@
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
 
     export $shlibpath_var
 "
 	fi
 
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 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 $PACKAGE documentation for more information.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
-fi\
-"
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
 }
+# end: func_to_host_path
 
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -4147,23 +3157,31 @@
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
 */
 EOF
 	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
 # include <io.h>
+# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -4175,44 +3193,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -4228,7 +3208,14 @@
 # define S_IXGRP 0
 #endif
 
-/* path handling portability macros */
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
@@ -4259,6 +3246,10 @@
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -4271,13 +3262,22 @@
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
 #else
-static int lt_debug = 0;
+# define LTWRAPPER_DEBUGPRINTF(args)
 #endif
 
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+const char *program_name = NULL;
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -4287,27 +3287,42 @@
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
+void lt_fatal (const char *message, ...);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
 char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
+
+static const char *script_text_part1 =
+EOF
+
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
 EOF
+	    func_emit_wrapper_part2 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
 
 	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
+              func_to_host_pathlist "$temp_rpath"
 	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -4316,10 +3331,10 @@
 	    fi
 
 	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
+              func_to_host_pathlist "$dllsearchpath:"
 	      cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -4342,10 +3357,24 @@
 	    cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
 
 int
 main (int argc, char *argv[])
@@ -4362,13 +3391,10 @@
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
 
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
+  /* very simple arg parsing; don't want to rely on getopt */
   for (i = 1; i < argc; i++)
     {
       if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -4382,57 +3408,25 @@
 	      esac
 
 	    cat <<"EOF"
-	  lt_dump_script (stdout);
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
 	  return 0;
 	}
-      if (strcmp (argv[i], debug_opt) == 0)
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
     }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
+  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
 
   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -4450,9 +3444,8 @@
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
 EOF
 
 	    cat <<EOF
@@ -4502,19 +3495,80 @@
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
   lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
 
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
   for (i = 0; i < newargc; i++)
     {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
     }
 
 EOF
@@ -4528,9 +3582,7 @@
   if (rval == -1)
     {
       /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
       return 127;
     }
   return rval;
@@ -4552,7 +3604,7 @@
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+    lt_fatal ("Memory exhausted");
 
   return p;
 }
@@ -4586,8 +3638,8 @@
 {
   struct stat st;
 
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
   if ((!path) || (!*path))
     return 0;
 
@@ -4604,8 +3656,8 @@
   int rval = 0;
   struct stat st;
 
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
   if ((!path) || (!*path))
     return 0;
 
@@ -4631,8 +3683,8 @@
   int tmp_len;
   char *concat_name;
 
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
@@ -4685,8 +3737,7 @@
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
+		    lt_fatal ("getcwd failed");
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -4711,8 +3762,7 @@
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
+    lt_fatal ("getcwd failed");
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -4738,9 +3788,8 @@
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -4762,9 +3811,8 @@
 	}
       else
 	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
 	}
     }
   XFREE (tmp_pathspec);
@@ -4777,8 +3825,7 @@
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -4804,25 +3851,11 @@
   return str;
 }
 
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
 static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
+lt_error_core (int exit_status, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  fprintf (stderr, "%s: %s: ", program_name, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -4831,32 +3864,20 @@
 }
 
 void
-lt_fatal (const char *file, int line, const char *message, ...)
+lt_fatal (const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
   va_end (ap);
 }
 
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
 void
 lt_setenv (const char *name, const char *value)
 {
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
@@ -4901,12 +3922,95 @@
   return new_value;
 }
 
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
 void
 lt_update_exe_path (const char *name, const char *value)
 {
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
 
   if (name && *name && value && *value)
     {
@@ -4925,9 +4029,9 @@
 void
 lt_update_lib_path (const char *name, const char *value)
 {
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
 
   if (name && *name && value && *value)
     {
@@ -5057,38 +4161,9 @@
 EOF
 		;;
 	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
 }
 # end: func_emit_cwrapperexe_src
 
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -5133,7 +4208,6 @@
     new_inherited_linker_flags=
 
     avoid_version=no
-    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -5226,11 +4300,6 @@
 	esac
 
 	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
@@ -5262,9 +4331,9 @@
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
+	      dlfiles="$dlfiles $arg"
 	    else
-	      func_append dlprefiles " $arg"
+	      dlprefiles="$dlprefiles $arg"
 	    fi
 	    prev=
 	    continue
@@ -5288,7 +4357,7 @@
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -5307,7 +4376,7 @@
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      func_append moreargs " $fil"
+#	      moreargs="$moreargs $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -5336,7 +4405,7 @@
 
 		  if test "$prev" = dlfiles; then
 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      func_append dlfiles " $pic_object"
+		      dlfiles="$dlfiles $pic_object"
 		      prev=
 		      continue
 		    else
@@ -5348,7 +4417,7 @@
 		  # CHECK ME:  I think I busted this.  -Ossama
 		  if test "$prev" = dlprefiles; then
 		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
+		    dlprefiles="$dlprefiles $pic_object"
 		    prev=
 		  fi
 
@@ -5418,12 +4487,12 @@
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
+	    *) rpath="$rpath $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
+	    *) xrpath="$xrpath $arg" ;;
 	    esac
 	  fi
 	  prev=
@@ -5435,28 +4504,28 @@
 	  continue
 	  ;;
 	weak)
-	  func_append weak_libs " $arg"
+	  weak_libs="$weak_libs $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  func_append compiler_flags " $qarg"
+	  compiler_flags="$compiler_flags $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -5492,11 +4561,6 @@
 	continue
 	;;
 
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
       -dlopen)
 	prev=dlfiles
 	continue
@@ -5547,16 +4611,15 @@
 	;;
 
       -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
+	func_stripname '-L' '' "$arg"
+	dir=$func_stripname_result
+	if test -z "$dir"; then
 	  if test "$#" -gt 0; then
 	    func_fatal_error "require no space between \`-L' and \`$1'"
 	  else
 	    func_fatal_error "need path for \`-L' option"
 	  fi
 	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -5568,30 +4631,24 @@
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
+	*" -L$dir "*) ;;
 	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
 	  ;;
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -5601,7 +4658,7 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -5615,7 +4672,7 @@
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
+	    deplibs="$deplibs System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -5635,7 +4692,7 @@
 	   ;;
 	 esac
 	fi
-	func_append deplibs " $arg"
+	deplibs="$deplibs $arg"
 	continue
 	;;
 
@@ -5647,22 +4704,21 @@
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
+      -model|-arch|-isysroot)
+	compiler_flags="$compiler_flags $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	compiler_flags="$compiler_flags $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	case "$new_inherited_linker_flags " in
 	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
 	esac
 	continue
 	;;
@@ -5729,17 +4785,13 @@
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
 	*)
 	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
+	*) xrpath="$xrpath $dir" ;;
 	esac
 	continue
 	;;
@@ -5792,8 +4844,8 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -5808,9 +4860,9 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+	  linker_flags="$linker_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -5838,27 +4890,23 @@
 	arg="$func_quote_for_eval_result"
 	;;
 
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
         func_quote_for_eval "$arg"
 	arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
+        compiler_flags="$compiler_flags $arg"
         continue
         ;;
 
@@ -5870,7 +4918,7 @@
 
       *.$objext)
 	# A standard object.
-	func_append objs " $arg"
+	objs="$objs $arg"
 	;;
 
       *.lo)
@@ -5901,7 +4949,7 @@
 
 	    if test "$prev" = dlfiles; then
 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		func_append dlfiles " $pic_object"
+		dlfiles="$dlfiles $pic_object"
 		prev=
 		continue
 	      else
@@ -5913,7 +4961,7 @@
 	    # CHECK ME:  I think I busted this.  -Ossama
 	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
+	      dlprefiles="$dlprefiles $pic_object"
 	      prev=
 	    fi
 
@@ -5958,25 +5006,24 @@
 
       *.$libext)
 	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
-	func_resolve_sysroot "$arg"
 	if test "$prev" = dlfiles; then
 	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
+	  dlfiles="$dlfiles $arg"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  dlprefiles="$dlprefiles $arg"
 	  prev=
 	else
-	  func_append deplibs " $func_resolve_sysroot_result"
+	  deplibs="$deplibs $arg"
 	fi
 	continue
 	;;
@@ -6014,7 +5061,7 @@
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
@@ -6023,8 +5070,6 @@
 
     func_dirname "$output" "/" ""
     output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
     func_mkdir_p "$output_objdir"
 
@@ -6045,12 +5090,12 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
+      if $opt_duplicate_deps ; then
 	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	esac
       fi
-      func_append libs " $deplib"
+      libs="$libs $deplib"
     done
 
     if test "$linkmode" = lib; then
@@ -6063,9 +5108,9 @@
       if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
 	  esac
-	  func_append pre_post_deps " $pre_post_dep"
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -6132,19 +5177,17 @@
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
 	  dependency_libs=
-	  func_resolve_sysroot "$lib"
 	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  *.la)	func_source "$lib" ;;
 	  esac
 
 	  # Collect preopened libtool deplibs, except any this library
 	  # has declared as weak libs
 	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
+	    *) deplibs="$deplibs $deplib" ;;
 	    esac
 	  done
 	done
@@ -6160,17 +5203,16 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    func_append compiler_flags " $deplib"
+	    compiler_flags="$compiler_flags $deplib"
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -6255,7 +5297,7 @@
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -6268,8 +5310,7 @@
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -6283,8 +5324,7 @@
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
 	    ;;
 	  *)
 	    func_warning "\`-L' is ignored for archives/objects"
@@ -6295,21 +5335,17 @@
 	-R*)
 	  if test "$pass" = link; then
 	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
+	    dir=$func_stripname_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
+	    *) xrpath="$xrpath $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
+	*.la) lib="$deplib" ;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -6327,7 +5363,7 @@
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
 		    valid_a_lib=yes
 		  fi
@@ -6337,15 +5373,15 @@
 		;;
 	      esac
 	      if test "$valid_a_lib" != yes; then
-		echo
+		$ECHO
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+		$ECHO "*** that it is just a static archive that I should not use here."
 	      else
-		echo
+		$ECHO
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
@@ -6372,11 +5408,11 @@
 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
+	      newdlprefiles="$newdlprefiles $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      func_append newdlfiles " $deplib"
+	      newdlfiles="$newdlfiles $deplib"
 	    fi
 	  fi
 	  continue
@@ -6418,20 +5454,20 @@
 
 	# Convert "-framework foo" to "foo.ltframework"
 	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -6442,20 +5478,20 @@
 	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
 	    fi
-	    func_append tmp_libs " $deplib"
+	    tmp_libs="$tmp_libs $deplib"
 	  done
 	  continue
 	fi # $pass = conv
@@ -6463,15 +5499,9 @@
 
 	# Get the name of the library we link against.
 	linklib=
-	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
 	if test -z "$linklib"; then
 	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
@@ -6488,9 +5518,9 @@
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
 	  else
-	    func_append newdlfiles " $lib"
+	    newdlfiles="$newdlfiles $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -6512,14 +5542,14 @@
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
 	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
+	    dir="$libdir"
+	    absdir="$libdir"
 	  fi
 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
@@ -6527,12 +5557,12 @@
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
+	    notinst_path="$notinst_path $abs_ladir"
 	  else
 	    dir="$ladir/$objdir"
 	    absdir="$abs_ladir/$objdir"
 	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
+	    notinst_path="$notinst_path $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
@@ -6543,46 +5573,20 @@
 	  if test -z "$libdir" && test "$linkmode" = prog; then
 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    # Keep a list of preopened convenience libraries to check
+	    # that they are being used correctly in the link pass.
+	    test -z "$libdir" && \
+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
@@ -6600,7 +5604,7 @@
 
 
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  func_append newlib_search_path " $ladir"
+	  newlib_search_path="$newlib_search_path $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -6613,8 +5617,7 @@
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
+	         newlib_search_path="$newlib_search_path $func_stripname_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
@@ -6625,12 +5628,12 @@
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
 	    fi
-	    func_append tmp_libs " $deplib"
+	    tmp_libs="$tmp_libs $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
@@ -6645,7 +5648,7 @@
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath:" in
 	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
+	      *) temp_rpath="$temp_rpath$absdir:" ;;
 	      esac
 	    fi
 
@@ -6657,7 +5660,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
+	      *) compile_rpath="$compile_rpath $absdir"
 	      esac
 	      ;;
 	    esac
@@ -6666,7 +5669,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
 	      esac
 	      ;;
 	    esac
@@ -6691,12 +5694,12 @@
 	  case $host in
 	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
+	      notinst_deplibs="$notinst_deplibs $lib"
 	      need_relink=no
 	    ;;
 	  *)
 	    if test "$installed" = no; then
-	      func_append notinst_deplibs " $lib"
+	      notinst_deplibs="$notinst_deplibs $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -6713,7 +5716,7 @@
 	    fi
 	  done
 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
+	    $ECHO
 	    if test "$linkmode" = prog; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
@@ -6731,7 +5734,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
+	      *) compile_rpath="$compile_rpath $absdir"
 	      esac
 	      ;;
 	    esac
@@ -6740,7 +5743,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
 	      esac
 	      ;;
 	    esac
@@ -6794,7 +5797,7 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	  if test "$linkmode" = prog || test "$mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -6816,9 +5819,9 @@
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
 			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
+			  $ECHO
+			  $ECHO "*** And there doesn't seem to be a static archive available"
+			  $ECHO "*** The link will probably fail, sorry"
 			else
 			  add="$dir/$old_library"
 			fi
@@ -6845,12 +5848,12 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
+		add_dir="-L$dir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -6872,7 +5875,7 @@
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -6886,13 +5889,13 @@
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	  if test "$linkmode" = prog || test "$mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -6906,7 +5909,7 @@
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
@@ -6923,7 +5926,7 @@
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -6958,21 +5961,21 @@
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    echo
+	    $ECHO
 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
+	    $ECHO "*** I have the capability to make that library automatically link in when"
+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+	    $ECHO "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      $ECHO "*** But as you try to build a module library, libtool will still create "
+	      $ECHO "*** a static module, that should work as long as the dlopening application"
+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		$ECHO
+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$ECHO "*** not find such a program.  So, this module is probably useless."
+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
 		build_libtool_libs=module
@@ -7000,46 +6003,37 @@
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
+		   *) xrpath="$xrpath $temp_xrpath";;
 		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  func_append newlib_search_path " $absdir"
+	  newlib_search_path="$newlib_search_path $absdir"
 	  # Link against this library
 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
 	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
+	    tmp_libs="$tmp_libs $deplib"
 	  done
 
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
-	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
 	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
+		dir="$func_dirname_result"
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -7066,8 +6060,8 @@
                       if test -z "$darwin_install_name"; then
                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
 		      path=
 		    fi
 		  fi
@@ -7100,7 +6094,7 @@
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"
@@ -7117,7 +6111,7 @@
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -7175,10 +6169,10 @@
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
 	      esac
 	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
@@ -7194,7 +6188,7 @@
 	  ;;
 	esac
 	if test -n "$i" ; then
-	  func_append tmp_libs " $i"
+	  tmp_libs="$tmp_libs $i"
 	fi
       done
       dependency_libs=$tmp_libs
@@ -7235,7 +6229,7 @@
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
-      func_append objs "$old_deplibs"
+      objs="$objs$old_deplibs"
       ;;
 
     lib)
@@ -7268,10 +6262,10 @@
 	if test "$deplibs_check_method" != pass_all; then
 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  echo
+	  $ECHO
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
+	  libobjs="$libobjs $objs"
 	fi
       fi
 
@@ -7330,14 +6324,13 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
+	  freebsd-aout|freebsd-elf|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
@@ -7447,7 +6440,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux) # correct to gnu/linux during the next big refactor
+	linux)
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -7470,7 +6463,7 @@
 	  done
 
 	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
+	  verstring="$verstring:${current}.0"
 	  ;;
 
 	qnx)
@@ -7538,10 +6531,10 @@
       fi
 
       func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
+      libobjs="$libobjs $symfileobj"
       test "X$libobjs" = "X " && libobjs=
 
-      if test "$opt_mode" != relink; then
+      if test "$mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -7557,7 +6550,7 @@
 		   continue
 		 fi
 	       fi
-	       func_append removelist " $p"
+	       removelist="$removelist $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -7568,28 +6561,27 @@
 
       # Now set the variables for building old libraries.
       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  temp_xrpath="$temp_xrpath -R$libdir"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
 	  esac
 	done
 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -7603,7 +6595,7 @@
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
+	*) dlfiles="$dlfiles $lib" ;;
 	esac
       done
 
@@ -7613,19 +6605,19 @@
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
 	esac
       done
 
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
+	    deplibs="$deplibs System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -7642,7 +6634,7 @@
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
-	      func_append deplibs " -lc"
+	      deplibs="$deplibs -lc"
 	    fi
 	    ;;
 	  esac
@@ -7691,7 +6683,7 @@
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    func_append newdeplibs " $i"
+		    newdeplibs="$newdeplibs $i"
 		    i=""
 		    ;;
 		  esac
@@ -7702,21 +6694,21 @@
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    func_append newdeplibs " $i"
+		    newdeplibs="$newdeplibs $i"
 		  else
 		    droppeddeps=yes
-		    echo
+		    $ECHO
 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		    $ECHO "*** I have the capability to make that library automatically link in when"
+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+		    $ECHO "*** shared version of the library, which I believe you do not have"
+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
 		;;
 	      *)
-		func_append newdeplibs " $i"
+		newdeplibs="$newdeplibs $i"
 		;;
 	      esac
 	    done
@@ -7734,7 +6726,7 @@
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      func_append newdeplibs " $i"
+		      newdeplibs="$newdeplibs $i"
 		      i=""
 		      ;;
 		    esac
@@ -7745,29 +6737,29 @@
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      func_append newdeplibs " $i"
+		      newdeplibs="$newdeplibs $i"
 		    else
 		      droppeddeps=yes
-		      echo
+		      $ECHO
 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      $ECHO "*** I have the capability to make that library automatically link in when"
+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+		      $ECHO "*** shared version of the library, which you do not appear to have"
+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  echo
+		  $ECHO
 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
+		  $ECHO "*** make it link in!  You will probably need to install it or some"
+		  $ECHO "*** library that it depends on before this library will be fully"
+		  $ECHO "*** functional.  Installing it before continuing would be even better."
 		fi
 		;;
 	      *)
-		func_append newdeplibs " $i"
+		newdeplibs="$newdeplibs $i"
 		;;
 	      esac
 	    done
@@ -7784,27 +6776,15 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
+		  newdeplibs="$newdeplibs $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7821,13 +6801,13 @@
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
+			newdeplibs="$newdeplibs $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -7836,12 +6816,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
+		$ECHO
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
@@ -7852,7 +6832,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
+	      newdeplibs="$newdeplibs $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -7868,7 +6848,7 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
+		  newdeplibs="$newdeplibs $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -7879,9 +6859,9 @@
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
+		      newdeplibs="$newdeplibs $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -7890,12 +6870,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
+		$ECHO
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
@@ -7906,32 +6886,32 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
+	      newdeplibs="$newdeplibs $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	    for i in $predeps $postdeps ; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
 	    done
 	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+	     $GREP . >/dev/null; then
+	    $ECHO
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
+	    $ECHO "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	    ;;
-	  esac
+	  fi
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -7943,23 +6923,23 @@
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
 	if test "$droppeddeps" = yes; then
 	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO
+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
+	    $ECHO "*** a static module, that should work as long as the dlopening"
+	    $ECHO "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      $ECHO
+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $ECHO "*** not find such a program.  So, this module is probably useless."
+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -7969,16 +6949,16 @@
 	      build_libtool_libs=no
 	    fi
 	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+	    $ECHO "*** automatically added whenever a program is linked with this library"
+	    $ECHO "*** or is declared to -dlopen it."
 
 	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
+	      $ECHO
+	      $ECHO "*** Since this library must not contain undefined symbols,"
+	      $ECHO "*** because either the platform does not support them or"
+	      $ECHO "*** it was explicitly requested with -no-undefined,"
+	      $ECHO "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -7995,9 +6975,9 @@
       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
       case $host in
 	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -8010,7 +6990,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
+	    new_libs="$new_libs -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -8020,10 +7000,10 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
+	  *) new_libs="$new_libs $deplib" ;;
 	  esac
 	  ;;
-	*) func_append new_libs " $deplib" ;;
+	*) new_libs="$new_libs $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -8035,22 +7015,15 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -8059,18 +7032,18 @@
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
+		dep_rpath="$dep_rpath $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8078,13 +7051,17 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
+	      rpath="$rpath$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -8092,7 +7069,7 @@
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -8118,18 +7095,18 @@
 	linknames=
 	for link
 	do
-	  func_append linknames " $link"
+	  linknames="$linknames $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 	test "X$libobjs" = "X " && libobjs=
 
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
-	  func_append delfiles " $export_symbols"
+	  delfiles="$delfiles $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -8160,45 +7137,13 @@
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
+	    for cmd in $cmds; do
 	      IFS="$save_ifs"
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=${output_objdir}/${output_la}.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
+	      eval cmd=\"$cmd\"
+	      func_len " $cmd"
+	      len=$func_len_result
+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -8220,7 +7165,7 @@
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  tmp_export_symbols="$export_symbols"
 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -8232,7 +7177,7 @@
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -8242,7 +7187,7 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    func_append tmp_deplibs " $test_deplib"
+	    tmp_deplibs="$tmp_deplibs $test_deplib"
 	    ;;
 	  esac
 	done
@@ -8262,21 +7207,21 @@
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    func_append generated " $gentop"
+	    generated="$generated $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
+	    libobjs="$libobjs $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
+	  linker_flags="$linker_flags $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
+	if test "$mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -8321,8 +7266,7 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -8335,16 +7279,13 @@
 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
 	    output=${output_objdir}/${output_la}.lnkscript
 	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
+	    $ECHO 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
+	      $ECHO "$obj" >> $output
 	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
+	    $ECHO ')' >> $output
+	    delfiles="$delfiles $output"
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -8358,12 +7299,10 @@
 	    fi
 	    for obj
 	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
+	      $ECHO "$obj" >> $output
 	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	    delfiles="$delfiles $output"
+	    output=$firstobj\"$file_list_spec$output\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
@@ -8387,19 +7326,17 @@
 		  # command to the queue.
 		  if test "$k" -eq 1 ; then
 		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
 		  else
 		    # All subsequent reloadable object files will link in
 		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
 		  fi
 		  last_robj=$output_objdir/$output_la-${k}.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
 		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
+		  objlist=$obj
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -8409,12 +7346,11 @@
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      func_append delfiles " $output"
+	      delfiles="$delfiles $output"
 
 	    else
 	      output=
@@ -8448,7 +7384,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
+		if test "$mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -8469,7 +7405,7 @@
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	      tmp_export_symbols="$export_symbols"
 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
@@ -8481,7 +7417,7 @@
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
@@ -8522,10 +7458,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
+	  generated="$generated $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
+	  libobjs="$libobjs $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -8541,7 +7477,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
+	    if test "$mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -8553,7 +7489,7 @@
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
+	if test "$mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -8634,21 +7570,18 @@
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  func_append generated " $gentop"
+	  generated="$generated $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
       func_execute_cmds "$reload_cmds" 'exit $?'
@@ -8708,8 +7641,8 @@
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -8720,14 +7653,14 @@
 	if test "$tagname" = CXX ; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
+	      compile_command="$compile_command ${wl}-bind_at_load"
+	      finalize_command="$finalize_command ${wl}-bind_at_load"
 	    ;;
 	  esac
 	fi
 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -8741,7 +7674,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
+	    new_libs="$new_libs -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -8751,17 +7684,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
+	  *) new_libs="$new_libs $deplib" ;;
 	  esac
 	  ;;
-	*) func_append new_libs " $deplib" ;;
+	*) new_libs="$new_libs $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -8769,7 +7702,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
 	  esac
 	done
       fi
@@ -8788,18 +7721,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
+	    rpath="$rpath $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -8808,12 +7741,12 @@
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -8839,18 +7772,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
+	    rpath="$rpath $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
 	  esac
 	fi
       done
@@ -8864,8 +7797,8 @@
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
 
       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -8877,15 +7810,15 @@
 
       wrappers_required=yes
       case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
       *cygwin* | *mingw* )
         if test "$build_libtool_libs" != yes; then
           wrappers_required=no
         fi
         ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -8894,19 +7827,13 @@
       esac
       if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8929,7 +7856,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
+	    rpath="$rpath$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -8937,7 +7864,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
+	    rpath="$rpath$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -8947,18 +7874,11 @@
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
 	exit $EXIT_SUCCESS
       fi
 
@@ -8973,7 +7893,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -8985,19 +7905,13 @@
       fi
 
       # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -9015,7 +7929,18 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -9095,7 +8020,7 @@
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
+	    oldobjs="$oldobjs $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -9103,10 +8028,10 @@
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	func_append generated " $gentop"
+	generated="$generated $gentop"
 
 	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
+	oldobjs="$oldobjs $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -9117,10 +8042,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
+	  generated="$generated $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
+	  oldobjs="$oldobjs $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -9136,9 +8061,9 @@
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  echo "copying selected object files to avoid basename conflicts..."
+	  $ECHO "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
+	  generated="$generated $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -9162,30 +8087,18 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
 	      ;;
-	    *) func_append oldobjs " $obj" ;;
+	    *) oldobjs="$oldobjs $obj" ;;
 	    esac
 	  done
 	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -9259,7 +8172,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -9279,23 +8192,12 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		newdependency_libs="$newdependency_libs $libdir/$name"
 		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -9309,9 +8211,9 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		newdlfiles="$newdlfiles $libdir/$name"
 		;;
-	      *) func_append newdlfiles " $lib" ;;
+	      *) newdlfiles="$newdlfiles $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -9328,7 +8230,7 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		newdlprefiles="$newdlprefiles $libdir/$name"
 		;;
 	      esac
 	    done
@@ -9340,7 +8242,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      func_append newdlfiles " $abs"
+	      newdlfiles="$newdlfiles $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -9349,33 +8251,15 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      func_append newdlprefiles " $abs"
+	      newdlprefiles="$newdlprefiles $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
@@ -9434,7 +8318,7 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+{ test "$mode" = link || test "$mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -9454,9 +8338,9 @@
     for arg
     do
       case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
+      *) files="$files $arg" ;;
       esac
     done
 
@@ -9465,23 +8349,24 @@
 
     rmdirs=
 
+    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	odir="$objdir"
+	objdir="$origobjdir"
       else
-	odir="$dir/$objdir"
+	objdir="$dir/$origobjdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
+      test "$mode" = uninstall && objdir="$dir"
 
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
 	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
 	esac
       fi
 
@@ -9507,17 +8392,18 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
+	    rmfiles="$rmfiles $objdir/$n"
 	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
 
-	  case "$opt_mode" in
+	  case "$mode" in
 	  clean)
-	    case " $library_names " in
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
 	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -9545,19 +8431,19 @@
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    func_append rmfiles " $dir/$pic_object"
+	    rmfiles="$rmfiles $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
 	  if test -n "$non_pic_object" &&
 	     test "$non_pic_object" != none; then
-	    func_append rmfiles " $dir/$non_pic_object"
+	    rmfiles="$rmfiles $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$opt_mode" = clean ; then
+	if test "$mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -9567,7 +8453,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    func_append rmfiles " $file"
+	    rmfiles="$rmfiles $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -9576,7 +8462,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -9584,12 +8470,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
+	      rmfiles="$rmfiles $objdir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -9597,6 +8483,7 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
+    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -9608,16 +8495,16 @@
     exit $exit_status
 }
 
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$opt_mode" && {
+test -z "$mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
+  func_fatal_help "invalid operation mode \`$mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff -Nru gettext-0.19.3/build-aux/mdate-sh gettext-0.18.1.1/build-aux/mdate-sh
--- gettext-0.19.3/build-aux/mdate-sh	2014-10-16 06:01:37.000000000 +0000
+++ gettext-0.18.1.1/build-aux/mdate-sh	2009-08-15 15:30:37.000000000 +0000
@@ -1,9 +1,10 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2010-08-21.06; # UTC
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
+# Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -28,26 +29,16 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-fi
-
 case $1 in
   '')
-     echo "$0: No file.  Try '$0 --help' for more information." 1>&2
+     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: mdate-sh [--help] [--version] FILE
 
-Pretty-print the modification day of FILE, in the format:
-1 January 1970
+Pretty-print the modification time of FILE.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -59,13 +50,6 @@
     ;;
 esac
 
-error ()
-{
-  echo "$0: $1" >&2
-  exit 1
-}
-
-
 # Prevent date giving response in another language.
 LANG=C
 export LANG
@@ -75,7 +59,7 @@
 export LC_TIME
 
 # GNU ls changes its time format in response to the TIME_STYLE
-# variable.  Since we cannot assume 'unset' works, revert this
+# variable.  Since we cannot assume `unset' works, revert this
 # variable to its documented default.
 if test "${TIME_STYLE+set}" = set; then
   TIME_STYLE=posix-long-iso
@@ -95,14 +79,14 @@
   ls_command="$ls_command -n"
 fi
 
-# A 'ls -l' line looks as follows on OS/2.
+# A `ls -l' line looks as follows on OS/2.
 #  drwxrwx---        0 Aug 11  2001 foo
 # This differs from Unix, which adds ownership information.
 #  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
 #
 # To find the date, we split the line on spaces and iterate on words
 # until we find a month.  This cannot work with files whose owner is a
-# user named "Jan", or "Feb", etc.  However, it's unlikely that '/'
+# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
 # will be owned by a user whose name is a month.  So we first look at
 # the extended ls output of the root directory to decide how many
 # words should be skipped to get the date.
@@ -115,7 +99,6 @@
 command=
 until test $month
 do
-  test $# -gt 0 || error "failed parsing '$ls_command /' output"
   shift
   # Add another shift to the command.
   command="$command shift;"
@@ -135,10 +118,8 @@
   esac
 done
 
-test -n "$month" || error "failed parsing '$ls_command /' output"
-
 # Get the extended ls output of the file or directory.
-set dummy x`eval "$ls_command \"\\\$save_arg1\""`
+set dummy x`eval "$ls_command \"\$save_arg1\""`
 
 # Remove all preceding arguments
 eval $command
diff -Nru gettext-0.19.3/build-aux/missing gettext-0.18.1.1/build-aux/missing
--- gettext-0.19.3/build-aux/missing	2014-10-16 06:01:20.000000000 +0000
+++ gettext-0.18.1.1/build-aux/missing	2009-08-15 15:28:09.000000000 +0000
@@ -1,10 +1,11 @@
 #! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common stub for a few missing GNU programs while installing.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 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
 # it under the terms of the GNU General Public License as published by
@@ -25,40 +26,69 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
+  echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
-case $1 in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
 
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
+msg="missing on your system"
 
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -70,141 +100,272 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# Run the given program, remember its exit status.
-"$@"; st=$?
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
 
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
+  tar*)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
 
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit $?
+    fi
+    ;;
+
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar*)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff -Nru gettext-0.19.3/build-aux/relocatable.sh.in gettext-0.18.1.1/build-aux/relocatable.sh.in
--- gettext-0.19.3/build-aux/relocatable.sh.in	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/build-aux/relocatable.sh.in	2010-02-16 21:32:16.000000000 +0000
@@ -6,7 +6,7 @@
 # package by hand; see doc/relocatable-maint.texi (in Gnulib) for
 # details.
 #
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +22,37 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+# func_tmpdir
+# creates a temporary directory.
+# Sets variable
+# - tmp             pathname of freshly created temporary directory
+func_tmpdir ()
+{
+  # Use the environment variable TMPDIR, falling back to /tmp. This allows
+  # users to specify a different temporary directory, for example, if their
+  # /tmp is filled up or too small.
+  : ${TMPDIR=/tmp}
+  {
+    # Use the mktemp program if available. If not available, hide the error
+    # message.
+    tmp=`(umask 077 && mktemp -d "$TMPDIR/glXXXXXX") 2>/dev/null` &&
+    test -n "$tmp" && test -d "$tmp"
+  } ||
+  {
+    # Use a simple mkdir command. It is guaranteed to fail if the directory
+    # already exists.  $RANDOM is bash specific and expands to empty in shells
+    # other than bash, ksh and zsh.  Its use does not increase security;
+    # rather, it minimizes the probability of failure in a very cluttered /tmp
+    # directory.
+    tmp=$TMPDIR/gl$$-$RANDOM
+    (umask 077 && mkdir "$tmp")
+  } ||
+  {
+    echo "$0: cannot create a temporary directory in $TMPDIR" >&2
+    { (exit 1); exit 1; }
+  }
+}
+
 # Support for relocatability.
 func_find_curr_installdir ()
 {
@@ -31,14 +62,15 @@
     */* | *\\*) ;;
     *) # Need to look in the PATH.
       if test "${PATH_SEPARATOR+set}" != set; then
-        # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-        # contains only /bin. Note that ksh looks also at the FPATH variable,
-        # so we have to set that as well for the test.
-        PATH_SEPARATOR=:
-        (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-          && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-                 || PATH_SEPARATOR=';'
-             }
+        func_tmpdir
+        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
+        chmod +x "$tmp"/conf.sh
+        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
+          PATH_SEPARATOR=';'
+        else
+          PATH_SEPARATOR=:
+        fi
+        rm -rf "$tmp"
       fi
       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
       for dir in $PATH; do
diff -Nru gettext-0.19.3/build-aux/reloc-ldflags gettext-0.18.1.1/build-aux/reloc-ldflags
--- gettext-0.19.3/build-aux/reloc-ldflags	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/reloc-ldflags	2010-02-16 21:31:27.000000000 +0000
@@ -2,7 +2,7 @@
 # Output a system dependent linker command for putting a relocatable library
 # search path into an executable.
 #
-#   Copyright 2003-2014 Free Software Foundation, Inc.
+#   Copyright 2003, 2009, 2010 Free Software Foundation, Inc.
 #   Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -54,7 +54,7 @@
 esac
 
 case "$host_os" in
-  linux* | kfreebsd*)
+  linux*) # Supported since Linux 2.1 and glibc 2.1.
     rpath=
     save_IFS="$IFS"; IFS=":"
     for dir in $library_path_value; do
diff -Nru gettext-0.19.3/build-aux/snippet/arg-nonnull.h gettext-0.18.1.1/build-aux/snippet/arg-nonnull.h
--- gettext-0.19.3/build-aux/snippet/arg-nonnull.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/snippet/arg-nonnull.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
-   that the values passed as arguments n, ..., m must be non-NULL pointers.
-   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
-#ifndef _GL_ARG_NONNULL
-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
-#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
-# else
-#  define _GL_ARG_NONNULL(params)
-# endif
-#endif
diff -Nru gettext-0.19.3/build-aux/snippet/c++defs.h gettext-0.18.1.1/build-aux/snippet/c++defs.h
--- gettext-0.19.3/build-aux/snippet/c++defs.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/snippet/c++defs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,271 +0,0 @@
-/* C++ compatible function declaration macros.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 _GL_CXXDEFS_H
-#define _GL_CXXDEFS_H
-
-/* The three most frequent use cases of these macros are:
-
-   * For providing a substitute for a function that is missing on some
-     platforms, but is declared and works fine on the platforms on which
-     it exists:
-
-       #if @GNULIB_FOO@
-       # if !@HAVE_FOO@
-       _GL_FUNCDECL_SYS (foo, ...);
-       # endif
-       _GL_CXXALIAS_SYS (foo, ...);
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-
-   * For providing a replacement for a function that exists on all platforms,
-     but is broken/insufficient and needs to be replaced on some platforms:
-
-       #if @GNULIB_FOO@
-       # if @REPLACE_FOO@
-       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-       #   undef foo
-       #   define foo rpl_foo
-       #  endif
-       _GL_FUNCDECL_RPL (foo, ...);
-       _GL_CXXALIAS_RPL (foo, ...);
-       # else
-       _GL_CXXALIAS_SYS (foo, ...);
-       # endif
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-
-   * For providing a replacement for a function that exists on some platforms
-     but is broken/insufficient and needs to be replaced on some of them and
-     is additionally either missing or undeclared on some other platforms:
-
-       #if @GNULIB_FOO@
-       # if @REPLACE_FOO@
-       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-       #   undef foo
-       #   define foo rpl_foo
-       #  endif
-       _GL_FUNCDECL_RPL (foo, ...);
-       _GL_CXXALIAS_RPL (foo, ...);
-       # else
-       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
-       _GL_FUNCDECL_SYS (foo, ...);
-       #  endif
-       _GL_CXXALIAS_SYS (foo, ...);
-       # endif
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-*/
-
-/* _GL_EXTERN_C declaration;
-   performs the declaration with C linkage.  */
-#if defined __cplusplus
-# define _GL_EXTERN_C extern "C"
-#else
-# define _GL_EXTERN_C extern
-#endif
-
-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
-   declares a replacement function, named rpl_func, with the given prototype,
-   consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
- */
-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
-  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
-
-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
-   declares the system function, named func, with the given prototype,
-   consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
- */
-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype func parameters_and_attributes
-
-/* _GL_CXXALIAS_RPL (func, rettype, parameters);
-   declares a C++ alias called GNULIB_NAMESPACE::func
-   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
-   Example:
-     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
- */
-#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
-  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                                \
-    {                                                         \
-      rettype (*const func) parameters = ::rpl_func;          \
-    }                                                         \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
-   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
-   except that the C function rpl_func may have a slightly different
-   declaration.  A cast is used to silence the "invalid conversion" error
-   that would otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                                     \
-    {                                                              \
-      rettype (*const func) parameters =                           \
-        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
-    }                                                              \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS (func, rettype, parameters);
-   declares a C++ alias called GNULIB_NAMESPACE::func
-   that redirects to the system provided function func, if GNULIB_NAMESPACE
-   is defined.
-   Example:
-     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
- */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-  /* If we were to write
-       rettype (*const func) parameters = ::func;
-     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
-     better (remove an indirection through a 'static' pointer variable),
-     but then the _GL_CXXALIASWARN macro below would cause a warning not only
-     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                     \
-    {                                              \
-      static rettype (*func) parameters = ::func;  \
-    }                                              \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
-   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-   except that the C function func may have a slightly different declaration.
-   A cast is used to silence the "invalid conversion" error that would
-   otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                          \
-    {                                                   \
-      static rettype (*func) parameters =               \
-        reinterpret_cast<rettype(*)parameters>(::func); \
-    }                                                   \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
-   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-   except that the C function is picked among a set of overloaded functions,
-   namely the one with rettype2 and parameters2.  Two consecutive casts
-   are used to silence the "cannot find a match" and "invalid conversion"
-   errors that would otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-  /* The outer cast must be a reinterpret_cast.
-     The inner cast: When the function is defined as a set of overloaded
-     functions, it works as a static_cast<>, choosing the designated variant.
-     When the function is defined as a single variant, it works as a
-     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-    namespace GNULIB_NAMESPACE                                                \
-    {                                                                         \
-      static rettype (*func) parameters =                                     \
-        reinterpret_cast<rettype(*)parameters>(                               \
-          (rettype2(*)parameters2)(::func));                                  \
-    }                                                                         \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIASWARN (func);
-   causes a warning to be emitted when ::func is used but not when
-   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
-   variants.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIASWARN(func) \
-   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN_1(func,namespace) \
-   _GL_CXXALIASWARN_2 (func, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-   we enable the warning only when not optimizing.  */
-# if !__OPTIMIZE__
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-    _GL_WARN_ON_USE (func, \
-                     "The symbol ::" #func " refers to the system function. " \
-                     "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-     extern __typeof__ (func) func
-# else
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-     _GL_EXTERN_C int _gl_cxxalias_dummy
-# endif
-#else
-# define _GL_CXXALIASWARN(func) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
-   causes a warning to be emitted when the given overloaded variant of ::func
-   is used but not when GNULIB_NAMESPACE::func is used.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
-                        GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
-   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-   we enable the warning only when not optimizing.  */
-# if !__OPTIMIZE__
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
-                         "The symbol ::" #func " refers to the system function. " \
-                         "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-     extern __typeof__ (func) func
-# else
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-     _GL_EXTERN_C int _gl_cxxalias_dummy
-# endif
-#else
-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-#endif /* _GL_CXXDEFS_H */
diff -Nru gettext-0.19.3/build-aux/snippet/_Noreturn.h gettext-0.18.1.1/build-aux/snippet/_Noreturn.h
--- gettext-0.19.3/build-aux/snippet/_Noreturn.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/snippet/_Noreturn.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#if !defined _Noreturn && __STDC_VERSION__ < 201112
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
diff -Nru gettext-0.19.3/build-aux/snippet/unused-parameter.h gettext-0.18.1.1/build-aux/snippet/unused-parameter.h
--- gettext-0.19.3/build-aux/snippet/unused-parameter.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/snippet/unused-parameter.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/* A C macro for declaring that specific function parameters are not used.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter
-   declarations for parameters that are not used.  This helps to reduce
-   warnings, such as from GCC -Wunused-parameter.  The syntax is as follows:
-       type param _GL_UNUSED_PARAMETER
-   or more generally
-       param_decl _GL_UNUSED_PARAMETER
-   For example:
-       int param _GL_UNUSED_PARAMETER
-       int *(*param)(void) _GL_UNUSED_PARAMETER
-   Other possible, but obscure and discouraged syntaxes:
-       int _GL_UNUSED_PARAMETER *(*param)(void)
-       _GL_UNUSED_PARAMETER int *(*param)(void)
- */
-#ifndef _GL_UNUSED_PARAMETER
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED_PARAMETER __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED_PARAMETER
-# endif
-#endif
diff -Nru gettext-0.19.3/build-aux/snippet/warn-on-use.h gettext-0.18.1.1/build-aux/snippet/warn-on-use.h
--- gettext-0.19.3/build-aux/snippet/warn-on-use.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/build-aux/snippet/warn-on-use.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-/* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
-   for FUNCTION which will then trigger a compiler warning containing
-   the text of "literal string" anywhere that function is called, if
-   supported by the compiler.  If the compiler does not support this
-   feature, the macro expands to an unused extern declaration.
-
-   This macro is useful for marking a function as a potential
-   portability trap, with the intent that "literal string" include
-   instructions on the replacement function that should be used
-   instead.  However, one of the reasons that a function is a
-   portability trap is if it has the wrong signature.  Declaring
-   FUNCTION with a different signature in C is a compilation error, so
-   this macro must use the same type as any existing declaration so
-   that programs that avoid the problematic FUNCTION do not fail to
-   compile merely because they included a header that poisoned the
-   function.  But this implies that _GL_WARN_ON_USE is only safe to
-   use if FUNCTION is known to already have a declaration.  Use of
-   this macro implies that there must not be any other macro hiding
-   the declaration of FUNCTION; but undefining FUNCTION first is part
-   of the poisoning process anyway (although for symbols that are
-   provided only via a macro, the result is a compilation error rather
-   than a warning containing "literal string").  Also note that in
-   C++, it is only safe to use if FUNCTION has no overloads.
-
-   For an example, it is possible to poison 'getline' by:
-   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
-     [getline]) in configure.ac, which potentially defines
-     HAVE_RAW_DECL_GETLINE
-   - adding this code to a header that wraps the system <stdio.h>:
-     #undef getline
-     #if HAVE_RAW_DECL_GETLINE
-     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
-       "not universally present; use the gnulib module getline");
-     #endif
-
-   It is not possible to directly poison global variables.  But it is
-   possible to write a wrapper accessor function, and poison that
-   (less common usage, like &environ, will cause a compilation error
-   rather than issue the nice warning, but the end result of informing
-   the developer about their portability problem is still achieved):
-   #if HAVE_RAW_DECL_ENVIRON
-   static char ***rpl_environ (void) { return &environ; }
-   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
-   # undef environ
-   # define environ (*rpl_environ ())
-   #endif
-   */
-#ifndef _GL_WARN_ON_USE
-
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
-#  define _GL_WARN_ON_USE(function, message) \
-extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-/* Verify the existence of the function.  */
-#  define _GL_WARN_ON_USE(function, message) \
-extern __typeof__ (function) function
-# else /* Unsupported.  */
-#  define _GL_WARN_ON_USE(function, message) \
-_GL_WARN_EXTERN_C int _gl_warn_on_use
-# endif
-#endif
-
-/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
-   is like _GL_WARN_ON_USE (function, "string"), except that the function is
-   declared with the given prototype, consisting of return type, parameters,
-   and attributes.
-   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
-   not work in this case.  */
-#ifndef _GL_WARN_ON_USE_CXX
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-extern rettype function parameters_and_attributes \
-     __attribute__ ((__warning__ (msg)))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-/* Verify the existence of the function.  */
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-extern rettype function parameters_and_attributes
-# else /* Unsupported.  */
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-_GL_WARN_EXTERN_C int _gl_warn_on_use
-# endif
-#endif
-
-/* _GL_WARN_EXTERN_C declaration;
-   performs the declaration with C linkage.  */
-#ifndef _GL_WARN_EXTERN_C
-# if defined __cplusplus
-#  define _GL_WARN_EXTERN_C extern "C"
-# else
-#  define _GL_WARN_EXTERN_C extern
-# endif
-#endif
diff -Nru gettext-0.19.3/build-aux/test-driver gettext-0.18.1.1/build-aux/test-driver
--- gettext-0.19.3/build-aux/test-driver	2014-10-16 06:01:26.000000000 +0000
+++ gettext-0.18.1.1/build-aux/test-driver	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2013-07-13.22; # UTC
-
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# This 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 2, 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/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
-  echo "$0: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <<END
-Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--]
-              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
-The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-END
-}
-
-test_name= # Used for reporting.
-log_file=  # Where to save the output of the test script.
-trs_file=  # Where to save the metadata of the test run.
-expect_failure=no
-color_tests=no
-enable_hard_errors=yes
-while test $# -gt 0; do
-  case $1 in
-  --help) print_usage; exit $?;;
-  --version) echo "test-driver $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) enable_hard_errors=$2; shift;;
-  --) shift; break;;
-  -*) usage_error "invalid option: '$1'";;
-   *) break;;
-  esac
-  shift
-done
-
-missing_opts=
-test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
-test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
-if test x"$missing_opts" != x; then
-  usage_error "the following mandatory options are missing:$missing_opts"
-fi
-
-if test $# -eq 0; then
-  usage_error "missing argument"
-fi
-
-if test $color_tests = yes; then
-  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
-  red='' # Red.
-  grn='' # Green.
-  lgn='' # Light green.
-  blu='' # Blue.
-  mgn='' # Magenta.
-  std=''     # No color.
-else
-  red= grn= lgn= blu= mgn= std=
-fi
-
-do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-trap "st=129; $do_exit" 1
-trap "st=130; $do_exit" 2
-trap "st=141; $do_exit" 13
-trap "st=143; $do_exit" 15
-
-# Test script is run here.
-"$@" >$log_file 2>&1
-estatus=$?
-if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
-fi
-
-case $estatus:$expect_failure in
-  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
-  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
-  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
-  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
-  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
-esac
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# 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-end: "; # UTC"
-# End:
diff -Nru gettext-0.19.3/build-aux/unused-parameter.h gettext-0.18.1.1/build-aux/unused-parameter.h
--- gettext-0.19.3/build-aux/unused-parameter.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/build-aux/unused-parameter.h	2010-02-16 21:32:16.000000000 +0000
@@ -0,0 +1,36 @@
+/* A C macro for declaring that specific function parameters are not used.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
+
+   This 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
+   Lesser 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/>.  */
+
+/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter
+   declarations for parameters that are not used.  This helps to reduce
+   warnings, such as from GCC -Wunused-parameter.  The syntax is as follows:
+       type param _GL_UNUSED_PARAMETER
+   or more generally
+       param_decl _GL_UNUSED_PARAMETER
+   For example:
+       int param _GL_UNUSED_PARAMETER
+       int *(*param)(void) _GL_UNUSED_PARAMETER
+   Other possible, but obscure and discouraged syntaxes:
+       int _GL_UNUSED_PARAMETER *(*param)(void)
+       _GL_UNUSED_PARAMETER int *(*param)(void)
+ */
+#ifndef _GL_UNUSED_PARAMETER
+# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+#  define _GL_UNUSED_PARAMETER __attribute__ ((__unused__))
+# else
+#  define _GL_UNUSED_PARAMETER
+# endif
+#endif
diff -Nru gettext-0.19.3/build-aux/warn-on-use.h gettext-0.18.1.1/build-aux/warn-on-use.h
--- gettext-0.19.3/build-aux/warn-on-use.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/build-aux/warn-on-use.h	2010-05-24 09:59:53.000000000 +0000
@@ -0,0 +1,109 @@
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This 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
+   Lesser 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/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   This macro is useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.  However, one of the reasons that a function is a
+   portability trap is if it has the wrong signature.  Declaring
+   FUNCTION with a different signature in C is a compilation error, so
+   this macro must use the same type as any existing declaration so
+   that programs that avoid the problematic FUNCTION do not fail to
+   compile merely because they included a header that poisoned the
+   function.  But this implies that _GL_WARN_ON_USE is only safe to
+   use if FUNCTION is known to already have a declaration.  Use of
+   this macro implies that there must not be any other macro hiding
+   the declaration of FUNCTION; but undefining FUNCTION first is part
+   of the poisoning process anyway (although for symbols that are
+   provided only via a macro, the result is a compilation error rather
+   than a warning containing "literal string").  Also note that in
+   C++, it is only safe to use if FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+   #if HAVE_RAW_DECL_ENVIRON
+   static inline char ***rpl_environ (void) { return &environ; }
+   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+   # undef environ
+   # define environ (*rpl_environ ())
+   #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
diff -Nru gettext-0.19.3/build-aux/ylwrap gettext-0.18.1.1/build-aux/ylwrap
--- gettext-0.19.3/build-aux/ylwrap	2014-10-16 06:01:39.000000000 +0000
+++ gettext-0.18.1.1/build-aux/ylwrap	2009-08-15 15:30:40.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2013-01-12.17; # UTC
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+# 2007, 2009 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -29,41 +30,9 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-get_dirname ()
-{
-  case $1 in
-    */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
-    # Otherwise,  we want the empty string (not ".").
-  esac
-}
-
-# guard FILE
-# ----------
-# The CPP macro used to guard inclusion of FILE.
-guard ()
-{
-  printf '%s\n' "$1"                                                    \
-    | sed                                                               \
-        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
-        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'                        \
-        -e 's/__*/_/g'
-}
-
-# quote_for_sed [STRING]
-# ----------------------
-# Return STRING (or stdin) quoted to be used as a sed pattern.
-quote_for_sed ()
-{
-  case $# in
-    0) cat;;
-    1) printf '%s\n' "$1";;
-  esac \
-    | sed -e 's|[][\\.*]|\\&|g'
-}
-
 case "$1" in
   '')
-    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
     ;;
   --basedir)
@@ -96,77 +65,41 @@
 
 
 # The input.
-input=$1
+input="$1"
 shift
-# We'll later need for a correct munging of "#line" directives.
-input_sub_rx=`get_dirname "$input" | quote_for_sed`
-case $input in
+case "$input" in
   [\\/]* | ?:[\\/]*)
     # Absolute path; do nothing.
     ;;
   *)
     # Relative path.  Make it absolute.
-    input=`pwd`/$input
+    input="`pwd`/$input"
     ;;
 esac
-input_rx=`get_dirname "$input" | quote_for_sed`
-
-# Since DOS filename conventions don't allow two dots,
-# the DOS version of Bison writes out y_tab.c instead of y.tab.c
-# and y_tab.h instead of y.tab.h. Test to see if this is the case.
-y_tab_nodot=false
-if test -f y_tab.c || test -f y_tab.h; then
-  y_tab_nodot=true
-fi
-
-# The parser itself, the first file, is the destination of the .y.c
-# rule in the Makefile.
-parser=$1
-
-# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
-# instance, we rename #include "y.tab.h" into #include "parse.h"
-# during the conversion from y.tab.c to parse.c.
-sed_fix_filenames=
-
-# Also rename header guards, as Bison 2.7 for instance uses its header
-# guard in its implementation file.
-sed_fix_header_guards=
 
-while test $# -ne 0; do
-  if test x"$1" = x"--"; then
+pairlist=
+while test "$#" -ne 0; do
+  if test "$1" = "--"; then
     shift
     break
   fi
-  from=$1
-  # Handle y_tab.c and y_tab.h output by DOS
-  if $y_tab_nodot; then
-    case $from in
-      "y.tab.c") from=y_tab.c;;
-      "y.tab.h") from=y_tab.h;;
-    esac
-  fi
-  shift
-  to=$1
+  pairlist="$pairlist $1"
   shift
-  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
-  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
 done
 
 # The program to run.
-prog=$1
+prog="$1"
 shift
 # Make any relative path in $prog absolute.
-case $prog in
+case "$prog" in
   [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog=`pwd`/$prog ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
 esac
 
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
-do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
-trap "ret=129; $do_exit" 1
-trap "ret=130; $do_exit" 2
-trap "ret=141; $do_exit" 13
-trap "ret=143; $do_exit" 15
+trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
@@ -178,56 +111,98 @@
 ret=$?
 
 if test $ret -eq 0; then
-  for from in *
-  do
-    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
+      else
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
+      fi
+    fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
-      # otherwise prepend '../'.
-      case $to in
-        [\\/]* | ?:[\\/]*) target=$to;;
-        *) target=../$to;;
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
       esac
 
-      # Do not overwrite unchanged header files to avoid useless
-      # recompilations.  Always update the parser itself: it is the
-      # destination of the .y.c rule in the Makefile.  Divert the
-      # output of all other files to a temporary file so we can
-      # compare them to existing versions.
-      if test $from != $parser; then
-        realtarget=$target
-        target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
       fi
-
-      # Munge "#line" or "#" directives.  Don't let the resulting
-      # debug information point at an absolute srcdir.  Use the real
-      # output file name, not yy.lex.c for instance.  Adjust the
-      # include guards too.
-      sed -e "/^#/!b"                           \
-          -e "s|$input_rx|$input_sub_rx|"       \
-          -e "$sed_fix_filenames"               \
-          -e "$sed_fix_header_guards"           \
-        "$from" >"$target" || ret=$?
-
-      # Check whether files must be updated.
-      if test "$from" != "$parser"; then
-        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-          echo "$to is unchanged"
-          rm -f "$target"
-        else
-          echo "updating $to"
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
           mv -f "$target" "$realtarget"
         fi
       fi
     else
-      # A missing file is only an error for the parser.  This is a
-      # blatant hack to let us support using "yacc -d".  If -d is not
-      # specified, don't fail when the header file is "missing".
-      if test "$from" = "$parser"; then
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
         ret=1
       fi
     fi
+    shift
+    shift
+    first=no
   done
+else
+  ret=$?
 fi
 
 # Remove the directory.
diff -Nru gettext-0.19.3/ChangeLog gettext-0.18.1.1/ChangeLog
--- gettext-0.19.3/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,404 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-16  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (distcheck-hook): Add back localename.c check.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	build: Work around undefined _GL_ATTRIBUTE_PURE in libintl
-	* Makefile.am (distcheck-hook): Ignore the difference between our
-	localename.c and the latest Gnulib's, which utilizes
-	_GL_ATTRIBUTE_PURE not available from libintl.  This is a
-	temporary fix for the 0.19.2 release and should be reverted once
-	it is fixed either in gettext or Gnulib.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-06  Daiki Ueno  <ueno@gnu.org>
-
-	autogen.sh: Use xz-compressed archive tarball
-	* autogen.sh: Fetch archive.dir-latest.tar.xz instead of .tar.gz.
-
-2014-06-04  Jim Meyering  <meyering@fb.com>  (tiny change)
-
-	configure: also distribute xz-compressed tarballs
-	* configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, so that xz-compressed
-	.tar.xz tarballs will be distributed alongside .tar.gz ones.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-04  Jehan  <jehan@girinstud.io>  (tiny change)
-
-	configure: require automake >= 1.13
-	Macro AM_EXTRA_RECURSIVE_TARGETS defined in Automake 1.13.
-	* configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.13 or later.
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	m4: Apply NM detection fix from Libtool
-	2013-04-28  Peter Rosin <peda@lysator.liu.se>
-		libtool: break all the way out when a good nm is found
-		* m4/libtool.m4 (LT_PATH_NM): Break all the way out on a good
-		match.
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	m4: Revert commit d6690cc7 to libtool.m4
-	Reported by Benjamin Gilbert at:
-	<https://savannah.gnu.org/bugs/?41203>
-	With recent libtool, this patch did nothing but fix the output
-	message of configure.
-	* m4/libtool.m4: Remove the special handling of NM detection when
-	cross-compiling mingw32 on cygwin.
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	build: Use git-version-gen intead of version.sh
-	* version.sh: Remove.
-	* autogen.sh: Import git-version-gen from Gnulib.
-	* Makefile.am (EXTRA_DIST): Remove version.sh and add
-	$(top_srcdir)/.version.
-	(BUILT_SOURCES): Add $(top_srcdir)/.version.
-	($(top_srcdir)/.version): New rule.
-	(dist-hook): New rule.
-	* configure.ac: Use git-version-gen in AC_INIT.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	autogen.sh: Split the regeneration of data files into update.sh
-	* autogen.sh: Separate out PO files update logic to...
-	* update-po.sh: ...here.
-	* Makefile.am (EXTRA_DIST): Add update-po.sh.
-
-2014-04-17  Daiki Ueno  <ueno@gnu.org>
-
-	* autogen.sh: Use included gettext-tools for bootstrap
-	To regenerate POT files, autogen.sh had an implicit dependency on
-	gettext-tools installed on system.  This prohibited to use any new
-	features in our examples.  Let autogen.sh use included version of
-	gettext-tools, by prepending $builddir to the PATH.
-
-2014-04-07  Daiki Ueno  <ueno@gnu.org>
-
-	* autogen.sh: Error out when gnulib-tool exit with non-zero.
-
-2013-12-17  Daiki Ueno  <ueno@gnu.org>
-
-	Add missing extern-inline.m4 into archive.
-	Problem reported by Reuben Thomas in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00010.html>.
-	* Makefile.am (distcheck-hook): Check extern-inline.m4.
-
-2013-08-13  Michele Locati <michele@locati.it>  (tiny change)
-
-	* windows/gettext.rc: Update copyright year.
-
-2013-08-08  Daiki Ueno  <ueno@gnu.org>
-
-	* .dir-locals.el: New file to force spaces instead of tabs in C
-	and shell-script files.
-
-2013-08-07  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Add entry for 0.18.4.  Mention GSettings schema file support.
-
-2013-07-10  Daiki Ueno  <ueno@gnu.org>
-
-	gettext-tools: convert tests to use init.sh from Gnulib
-	* autogen.sh: Copy tests/init.sh from Gnulib into gettext-tools/tests.
-
-2013-07-07  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Mention libasprintf change and Tcl bug fix.
-
-2013-06-26  Daiki Ueno  <ueno@gnu.org>
-
-	* autogen.sh: Mention GNULIB_TOOL again for off-line bootstrap.
-
-2013-06-17  Daiki Ueno  <ueno@gnu.org>
-
-	Embed Gnulib using git submodule.
-	* autogen.sh: Port git submodule update code from the 'bootstrap'
-	script in Gnulib and respect the GNULIB_SRCDIR envvar.
-	(cleanup_gnulib): New function borrowed from Gnulib.
-	(git_modules_config): Likewise.
-	(gnulib_path): New variable.
-
-2013-06-13  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Document more new features.  Mention Glade msgctxt support
-	and msginit portability fix, and note that JavaScript support is
-	only partial.
-
-2013-06-11  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Mention that future 'gettextize' will require Automake 1.10.
-	Suggested by Stefano Lattarini.
-
-2013-06-08  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
-
-	build: drop the 'fixacocal' auxiliary script
-	The comments in that script state that its use is only required to
-	work around issues in aclocal from Automake 1.10, while the rest
-	of the Gettext build infrastructure assumes Automake >= 1.11 anyway.
-	* autogen.sh: Drop invocations of 'fixaclocal', simply invoke the
-	'aclocal' program directly.
-	* build-aux/fixaclocal: Remove.
-	* Makefile.am (EXTRA_DIST): Stop distributing it.
-	(ACLOCAL): Drop redefinition in function of 'fixaclocal'.
-	* gettext-runtime/Makefile.am (ACLOCAL): Likewise.
-	* gettext-runtime/libasprintf/Makefile.am (ACLOCAL): Likewise.
-	* gettext-tools/Makefile.am (ACLOCAL): Likewise.
-	* gettext-tools/examples/Makefile.am (ACLOCAL): Likewise.
-
-2013-06-04  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Vala.
-	* NEWS: Mention Vala support.
-
-2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
-
-	* configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
-	Require Automake 1.11.1 or later, so that the 'parallel-tests'
-	will be certainly available.
-	(AC_INIT): Require Autoconf 2.62 or later; that is the minimal
-	version supported by Automake 1.11.1 or later.
-	* autogen.sh: Update version number requirement for Autoconf.
-
-2013-05-20  Pavel Kharitonov  <ineiev@gnu.org>  (tiny change)
-
-	Add --previous option to msgattrib.
-	* NEWS: Mention --previous msgattrib option.
-
-2013-05-13  Daiki Ueno  <ueno@gnu.org>
-
-	Fix bootstrap error on Mac OS X.
-	* autogen.sh (GNULIB_MODULES_LIBGETTEXTPO): Add strchrnul.
-
-2013-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	* autogen.sh: Retrieve archive.dir.tar from FTP when bootstrapping.
-	Reported by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00058.html>
-
-2013-04-26  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Mention Python brace format.
-
-2013-04-17  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Mention JavaScript support.
-
-2013-04-11  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Mention Lua support.
-
-2013-03-06  Daiki Ueno  <ueno@gnu.org>
-
-	* AUTHORS: Update from fencepost.gnu.org:/gd/gnuorg/copyright.list.
-
-2013-01-17  Daiki Ueno  <ueno@gnu.org>
-
-	Fix link errors related to C99-style extern inline.
-	Reported by Sam Thursfield <sam.thursfield@codethink.co.uk>.
-	* autogen.sh (GNULIB_MODULES_LIBASPRINTF): Add xsize.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* version.sh: Bump to 0.18.2.
-	* autogen.sh: Record the gnulib version that is being used.
-	* NEWS: Update the release date of 0.18.2.  Reformat "Autoconf
-	macros" change.
-
-2012-12-21  Daiki Ueno  <ueno@gnu.org>
-
-	Fix W64 build errors.
-	* autogen.sh (GNULIB_MODULES_LIBASPRINTF): Add extern-inline, for
-	the last xsize.h update.
-	(GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES): Add locale,
-	not to have copies of locale.h in both libgrep and gnulib-lib.
-	(GNULIB_MODULES_LIBGETTEXTPO): Add close.
-
-2012-12-08  Daiki Ueno  <ueno@unixuser.org>
-
-	* autogen.sh: Ignore libunistring tests which are known to fail.
-	(GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS): New variable.
-
-2012-12-08  Daiki Ueno  <ueno@unixuser.org>
-
-	* NEWS: Mention that autoconf 2.60 is required.
-	Suggested by Bruno Haible <bruno@clisp.org>.
-
-2012-04-29  Bruno Haible  <bruno@clisp.org>
-
-	Allow use of autoconf-2.69 and automake-1.12.
-	* autogen.sh: Update comments.
-
-2012-02-18  Bruno Haible  <bruno@clisp.org>
-
-	Improve ensurance that intmax_t gets defined in libasprintf.
-	* autogen.sh: Create gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4,
-	not gettext-runtime/m4/intmax_t.m4.
-	* Makefile.am (distcheck-hook): Update.
-
-2012-02-18  Bruno Haible  <bruno@clisp.org>
-
-	* Makefile.am (distcheck-hook): Update after gnulib changed.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* NEWS: Quote 'like this', not `like this', as per the recent change
-	to the GNU coding standards.
-	* INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g"
-
-2011-10-18  Bruno Haible  <bruno@clisp.org>
-
-	* m4/libtool.m4: Update from libtool-2.4.2, with modifications.
-	2009-04-23  Bruno Haible  <bruno@clisp.org>
-		Fix recognition of "nm" command.
-		* m4/libtool.m4 (LT_PATH_NM): Try "nm" program also when
-		compiling for mingw in a cygwin environment.
-	2008-04-06  Bruno Haible  <bruno@clisp.org>
-		* m4/libtool.m4 (LT_INIT): When setting LIBTOOL, use
-		CONFIG_SHELL; don't assume that the Makefile.in will set SHELL
-		to ${CONFIG_SHELL}.
-	* m4/ltoptions.m4: Likewise.
-	* m4/ltversion.m4: Likewise.
-	* build-aux/ltmain.sh: Likewise.
-
-2011-09-12  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add opendir, readdir,
-	closedir.
-
-2011-07-12  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES): Update
-	module names.
-
-2011-06-08  Bruno Haible  <bruno@clisp.org>
-
-	Fix a link error due to rpl_wcrtomb on Solaris 9.
-	* autogen.sh: Pass the option --witness-c-macro to the gnulib-tool
-	invocation for libgrep.
-
-2011-06-05  Bruno Haible  <bruno@clisp.org>
-
-	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_LIBGREP): Add mbrlen.
-
-2011-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Ensure intmax_t gets defined in libasprintf.
-	* autogen.sh: Create gettext-runtime/m4/intmax_t.m4, copied from
-	gnulib.
-	* Makefile.am (distcheck-hook): Check also intmax_t.m4.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	* autogen.sh (GNULIB_MODULES_LIBASPRINTF): Add verify.
-	* Makefile.am (distcheck-hook): Check also verify.h.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* os2/iconv/iconv.*: Update copyright header.
-	* Makefile.am (distcheck-hook): Update.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Use gnulib's setlocale in all the programs.
-	* autogen.sh (GNULIB_MODULES_RUNTIME_FOR_SRC,
-	GNULIB_MODULES_TOOLS_FOR_SRC): Add setlocale.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add wctype-h, remove
-	wctype.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Use u8_mbtoucr instead of u8_mbtouc in some places.
-	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC,
-	GNULIB_MODULES_LIBGETTEXTPO): Add unistr/u8-mbtoucr.
-
-2011-01-28  Bruno Haible  <bruno@clisp.org>
-
-	Add a comment.
-	* m4/woe32-dll.m4: Add a reference to the woe32dll writeup.
-
-2010-12-10  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add spawn-pipe, remove
-	pipe.
-
-2010-09-24  Bruno Haible  <bruno@clisp.org>
-
-	* m4/libtool.m4: Update from libtool-2.4, with modifications.
-	2009-04-23  Bruno Haible  <bruno@clisp.org>
-		Fix recognition of "nm" command.
-		* m4/libtool.m4 (LT_PATH_NM): Try "nm" program also when
-		compiling for mingw in a cygwin environment.
-	2008-04-06  Bruno Haible  <bruno@clisp.org>
-		* m4/libtool.m4 (LT_INIT): When setting LIBTOOL, use
-		CONFIG_SHELL; don't assume that the Makefile.in will set SHELL
-		to ${CONFIG_SHELL}.
-	* m4/ltversion.m4: Update from libtool-2.4.
-	* build-aux/ltmain.sh: Likewise.
-
-2010-09-04  Bruno Haible  <bruno@clisp.org>
-
-	Simplify use of gnulib-tool now that gnulib-tool --import works better.
-	* autogen.sh: Don't remove gnulib-cache.m4 before running gnulib-tool.
-
-2010-07-31  Bruno Haible  <bruno@clisp.org>
-
-	Use new ansi-c++.m4 from gnulib.
-	* autogen.sh (GNULIB_MODULES_RUNTIME_OTHER, GNULIB_MODULES_TOOLS_OTHER):
-	Add ansi-c++-opt.
-	Reported at <https://savannah.gnu.org/bugs/?30607>.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	New options --with-xz and --with-bzip2 for compressing the archive.
-	* DEPENDENCIES: Correct placement of entries for 'tar' and 'gzip'. Add
-	entries for 'bzip2' and 'xz'.
-
-2010-06-04  Bruno Haible  <bruno@clisp.org>
-
-	* m4/libtool.m4: Update from libtool-2.2.8, with modifications.
-	2009-04-23  Bruno Haible  <bruno@clisp.org>
-		Fix recognition of "nm" command.
-		* m4/libtool.m4 (LT_PATH_NM): Try "nm" program also when
-		compiling for mingw in a cygwin environment.
-	2008-04-06  Bruno Haible  <bruno@clisp.org>
-		* m4/libtool.m4 (LT_INIT): When setting LIBTOOL, use
-		CONFIG_SHELL; don't assume that the Makefile.in will set SHELL
-		to ${CONFIG_SHELL}.
-	* m4/ltoptions.m4: Update from libtool-2.2.8.
-	* m4/ltversion.m4: Likewise.
-	* m4/lt~obsolete.m4: Likewise.
-	* build-aux/ltmain.sh: Likewise.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/configure gettext-0.18.1.1/configure
--- gettext-0.19.3/configure	2014-10-16 06:01:44.000000000 +0000
+++ gettext-0.18.1.1/configure	2010-06-06 20:12:46.000000000 +0000
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext 0.19.3.
+# Generated by GNU Autoconf 2.65.
 #
-# Report bugs to <bug-gnu-gettext@gnu.org>.
 #
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,7 +89,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -134,31 +133,6 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -192,8 +166,7 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -237,25 +210,14 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -265,11 +227,10 @@
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: bug-gnu-gettext@gnu.org about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -354,18 +315,10 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -402,19 +355,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -487,10 +440,6 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -525,16 +474,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -546,8 +495,28 @@
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,7 +529,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -577,12 +546,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='gettext'
-PACKAGE_TARNAME='gettext'
-PACKAGE_VERSION='0.19.3'
-PACKAGE_STRING='gettext 0.19.3'
-PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
-PACKAGE_URL=''
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="gettext-tools/src/msgfmt.c"
 enable_option_checking=no
@@ -613,8 +582,6 @@
 subdirs
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -684,34 +651,32 @@
 enable_java
 enable_native_java
 enable_csharp
-enable_largefile
-enable_threads
 enable_shared
 enable_static
 with_pic
 enable_fast_install
 with_gnu_ld
-with_sysroot
 enable_libtool_lock
 enable_nls
+enable_threads
 enable_rpath
 with_libpth_prefix
 with_libiconv_prefix
 with_included_gettext
 with_libintl_prefix
-enable_c__
 enable_relocatable
 enable_libasprintf
+enable_acl
 with_included_glib
-with_libglib_2_0_prefix
+with_libglib_20_prefix
 with_included_libcroco
-with_libcroco_0_6_prefix
+with_libcroco_06_prefix
 with_included_libunistring
 with_libunistring_prefix
 with_included_libxml
 with_libxml2_prefix
 enable_openmp
-enable_acl
+enable_largefile
 enable_curses
 with_libncurses_prefix
 with_libtermcap_prefix
@@ -719,12 +684,10 @@
 with_libcurses_prefix
 with_included_regex
 with_libexpat_prefix
-with_emacs
 with_lispdir
+with_emacs
 with_git
 with_cvs
-with_bzip2
-with_xz
 '
       ac_precious_vars='build_alias
 host_alias
@@ -784,7 +747,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc/${PACKAGE}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -806,9 +769,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -853,9 +815,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -879,9 +841,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1083,9 +1045,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1099,9 +1061,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1129,8 +1091,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1138,7 +1100,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1148,7 +1110,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1156,13 +1118,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1185,7 +1147,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1199,6 +1161,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1213,9 +1177,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1254,11 +1218,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1284,7 +1248,7 @@
   # 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.3 to adapt to many kinds of systems.
+\`configure' configures this package to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1298,7 +1262,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1332,7 +1296,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/gettext]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1353,28 +1317,20 @@
 fi
 
 if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext 0.19.3:";;
-   esac
+
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-java          do not build Java sources
   --disable-native-java   do not compile Java to native executables
   --enable-csharp[=IMPL]  choose preferred C# implementation (pnet or mono)
-  --disable-largefile     omit support for large files
-  --enable-threads={posix|solaris|pth|windows}
-                          specify multithreading API
-  --disable-threads       build without multithread safety
   --enable-shared[=PKGS]  build shared libraries
                           [default=]_LT_ENABLE_SHARED_DEFAULT[]
   --enable-static[=PKGS]  build static libraries
@@ -1384,24 +1340,25 @@
                           [default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-nls           do not use Native Language Support
+  --enable-threads={posix|solaris|pth|win32}
+                          specify multithreading API
+  --disable-threads       build without multithread safety
   --disable-rpath         do not hardcode runtime library paths
-  --disable-c++           do not build C++ sources
   --enable-relocatable    install a package that can be moved in the file
                           system
   --disable-libasprintf   do not build libasprintf
-  --disable-openmp        do not use OpenMP
   --disable-acl           do not support ACLs
+  --disable-openmp        do not use OpenMP
+  --disable-largefile     omit support for large files
   --disable-curses        do not use libncurses, libtermcap even if they exist
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+  --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libpth-prefix[=DIR]  search for PACKLIBS in DIR/include and DIR/lib
   --without-libpth-prefix     don't search for PACKLIBS in includedir and libdir
   --with-libiconv-prefix[=DIR]  search for PACKLIBS in DIR/include and DIR/lib
@@ -1435,13 +1392,11 @@
                           (use with caution on other systems).
   --with-libexpat-prefix[=DIR]  search for PACKLIBS in DIR/include and DIR/lib
   --without-libexpat-prefix     don't search for PACKLIBS in includedir and libdir
-  --without-emacs         do not use Emacs, don't install po-mode
   --with-lispdir          override the default lisp directory
+  --without-emacs         do not use Emacs, don't install po-mode
   --without-git           don't use git to compress the infrastructure archive
   --with-cvs              use cvs to compress the infrastructure archive
                           (deprecated)
-  --without-bzip2         don't use bzip2 to compress the infrastructure archive
-  --without-xz            don't use xz to compress the infrastructure archive
 
 Some influential environment variables:
   CC          C compiler command
@@ -1451,9 +1406,8 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  YACC        The `Yet Another Compiler Compiler' implementation to use.
-              Defaults to the first program found out of: `bison -y', `byacc',
-              `yacc'.
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
@@ -1470,7 +1424,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <bug-gnu-gettext@gnu.org>.
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1533,10 +1487,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext configure 0.19.3
-generated by GNU Autoconf 2.69
+configure
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1550,8 +1504,8 @@
 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1661,9 +1615,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1697,9 +1653,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1712,9 +1670,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -1728,9 +1688,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -1785,12 +1747,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1805,11 +1762,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
@@ -1885,7 +1838,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -1901,22 +1854,16 @@
 
 ac_aux_dir=
 for ac_dir in build-aux "$srcdir"/build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1928,7 +1875,14 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+. $srcdir/version.sh
+
+
+
+
+
+
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1947,7 +1901,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1967,7 +1921,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2025,71 +1979,56 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2112,12 +2051,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2129,17 +2068,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2151,7 +2090,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2179,7 +2118,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2191,7 +2130,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2232,7 +2171,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2242,7 +2181,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2271,13 +2210,19 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2289,7 +2234,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2317,7 +2262,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2325,7 +2270,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2358,47 +2303,22 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
 AM_BACKSLASH='\'
 
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+
+
+  if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2413,19 +2333,10 @@
 
 
 # Define the identity of the package.
- PACKAGE='gettext'
- VERSION='0.19.3'
+ PACKAGE=''
+ VERSION=''
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
@@ -2442,70 +2353,35 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
 
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
+    PACKAGE=gettext
 
+     VERSION=$VERSION_NUMBER
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
 
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
 
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
 
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
 
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
 
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
 
 am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
 
@@ -2519,31 +2395,29 @@
 subdirs="$subdirs gettext-runtime gettext-tools"
 
 
-
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2561,14 +2435,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2576,7 +2450,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2626,16 +2500,6 @@
   enableval=$enable_csharp;
 fi
 
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads;
-fi
-
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared;
@@ -2663,12 +2527,6 @@
   withval=$with_gnu_ld;
 fi
 
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-fi
-
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
@@ -2679,6 +2537,11 @@
   enableval=$enable_nls;
 fi
 
+# Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads;
+fi
+
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
@@ -2714,13 +2577,6 @@
   withval=$with_libintl_prefix;
 fi
 
-# Check whether --enable-c++ was given.
-if test "${enable_c__+set}" = set; then :
-  enableval=$enable_c__;
-fi
-
-
-
 # Check whether --enable-java was given.
 if test "${enable_java+set}" = set; then :
   enableval=$enable_java;
@@ -2779,11 +2635,6 @@
   enableval=$enable_csharp;
 fi
 
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
 # Check whether --enable-threads was given.
 if test "${enable_threads+set}" = set; then :
   enableval=$enable_threads;
@@ -2816,12 +2667,6 @@
   withval=$with_gnu_ld;
 fi
 
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-fi
-
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
@@ -2867,15 +2712,13 @@
   withval=$with_libintl_prefix;
 fi
 
-# Check whether --enable-c++ was given.
-if test "${enable_c__+set}" = set; then :
-  enableval=$enable_c__;
+# Check whether --enable-acl was given.
+if test "${enable_acl+set}" = set; then :
+  enableval=$enable_acl;
 fi
 
 
 
-
-
 # Check whether --enable-java was given.
 if test "${enable_java+set}" = set; then :
   enableval=$enable_java;
@@ -2894,8 +2737,8 @@
 
 
 # Check whether --with-libglib-2.0-prefix was given.
-if test "${with_libglib_2_0_prefix+set}" = set; then :
-  withval=$with_libglib_2_0_prefix;
+if test "${with_libglib_20_prefix+set}" = set; then :
+  withval=$with_libglib_20_prefix;
 fi
 
 
@@ -2906,8 +2749,8 @@
 
 
 # Check whether --with-libcroco-0.6-prefix was given.
-if test "${with_libcroco_0_6_prefix+set}" = set; then :
-  withval=$with_libcroco_0_6_prefix;
+if test "${with_libcroco_06_prefix+set}" = set; then :
+  withval=$with_libcroco_06_prefix;
 fi
 
 
@@ -2918,8 +2761,8 @@
 
 
 # Check whether --with-libglib-2.0-prefix was given.
-if test "${with_libglib_2_0_prefix+set}" = set; then :
-  withval=$with_libglib_2_0_prefix;
+if test "${with_libglib_20_prefix+set}" = set; then :
+  withval=$with_libglib_20_prefix;
 fi
 
 
@@ -2963,16 +2806,16 @@
   enableval=$enable_openmp;
 fi
 
-# Check whether --enable-acl was given.
-if test "${enable_acl+set}" = set; then :
-  enableval=$enable_acl;
-fi
-
 # Check whether --enable-relocatable was given.
 if test "${enable_relocatable+set}" = set; then :
   enableval=$enable_relocatable;
 fi
 
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
 # Check whether --enable-curses was given.
 if test "${enable_curses+set}" = set; then :
   enableval=$enable_curses;
@@ -3015,12 +2858,6 @@
 fi
 
 
-# Check whether --with-emacs was given.
-if test "${with_emacs+set}" = set; then :
-  withval=$with_emacs;
-fi
-
-
 
 
 # Check whether --with-lispdir was given.
@@ -3029,6 +2866,12 @@
 fi
 
 
+# Check whether --with-emacs was given.
+if test "${with_emacs+set}" = set; then :
+  withval=$with_emacs;
+fi
+
+
 # Check whether --with-git was given.
 if test "${with_git+set}" = set; then :
   withval=$with_git;
@@ -3041,18 +2884,6 @@
 fi
 
 
-# Check whether --with-bzip2 was given.
-if test "${with_bzip2+set}" = set; then :
-  withval=$with_bzip2;
-fi
-
-
-# Check whether --with-xz was given.
-if test "${with_xz+set}" = set; then :
-  withval=$with_xz;
-fi
-
-
 
 
 
@@ -3139,21 +2970,10 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -3205,7 +3025,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -3220,17 +3039,9 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
 
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -3331,7 +3142,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3377,19 +3187,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -3527,16 +3337,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -3585,7 +3395,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -3596,16 +3406,28 @@
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3626,8 +3448,8 @@
 # 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by gettext $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3673,17 +3495,17 @@
 Configuration files:
 $config_files
 
-Report bugs to <bug-gnu-gettext@gnu.org>."
+Report bugs to the package provider."
 
 _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.3
-configured by $0, generated by GNU Autoconf 2.69,
+gettext config.status
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3701,16 +3523,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -3732,7 +3549,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -3743,7 +3559,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -3763,7 +3579,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -3795,7 +3611,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "gnulib-local/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib-local/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -3816,10 +3632,9 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -3827,13 +3642,12 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3850,12 +3664,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -3864,18 +3678,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3883,7 +3697,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -3931,7 +3745,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -3963,29 +3777,21 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -4003,7 +3809,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -4022,7 +3828,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -4031,7 +3837,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -4057,8 +3863,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -4194,24 +4000,23 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -4226,7 +4031,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -4247,7 +4052,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 
 #
@@ -4388,7 +4193,7 @@
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+	as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     fi
 
     cd "$ac_popdir"
diff -Nru gettext-0.19.3/configure.ac gettext-0.18.1.1/configure.ac
--- gettext-0.19.3/configure.ac	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -16,13 +16,13 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.62])
-AC_INIT([gettext],
-	m4_esyscmd([build-aux/git-version-gen .tarball-version]),
-	[bug-gnu-gettext@gnu.org])
+AC_PREREQ([2.59])
+AC_INIT
 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests dist-xz])
+. $srcdir/version.sh
+gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
+AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Override automake's tar command used for creating distributions.
 am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
@@ -39,8 +39,6 @@
 
 AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
 
-AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
-
 dnl Ensure that "configure --help" lists all the command line options that
 dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should
 dnl do it by itself.
diff -Nru gettext-0.19.3/debian/50gettext.el gettext-0.18.1.1/debian/50gettext.el
--- gettext-0.19.3/debian/50gettext.el	2014-10-23 12:03:00.000000000 +0000
+++ gettext-0.18.1.1/debian/50gettext.el	2010-08-01 21:50:09.000000000 +0000
@@ -1,10 +1,13 @@
 (if (not (file-exists-p "/usr/share/emacs/site-lisp/gettext"))
   (message "Package gettext-el removed but not purged. Skipping setup.")
-  (autoload 'po-mode "gettext/po-mode"
-    "Major mode for translators to edit PO files" t)
-  (add-to-list 'auto-mode-alist '("\\.po[tx]?\\'\\|\\.po\\." . po-mode))
-  (unless (fboundp 'po-find-file-coding-system)
-    (autoload 'po-find-file-coding-system "gettext/po-compat")
-    (if (fboundp 'modify-coding-system-alist)
-      (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
-        'po-find-file-coding-system))))
+(setq auto-mode-alist
+(cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode) auto-mode-alist))
+(autoload 'po-mode "gettext/po-mode"
+  "Major mode for translators to edit PO files" t)
+(autoload 'po-find-file-coding-system "gettext/po-mode")
+(unless (featurep 'po-find-file-coding-system)
+  (autoload 'po-find-file-coding-system "gettext/po-compat"))
+(if (fboundp 'modify-coding-system-alist)
+  (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
+    'po-find-file-coding-system))
+)
diff -Nru gettext-0.19.3/debian/changelog gettext-0.18.1.1/debian/changelog
--- gettext-0.19.3/debian/changelog	2015-03-28 17:04:15.000000000 +0000
+++ gettext-0.18.1.1/debian/changelog	2011-06-12 21:13:37.000000000 +0000
@@ -1,235 +1,28 @@
-gettext (0.19.3-2~bpo70+1~ubuntu10.04.1~ppa1) lucid; urgency=medium
+gettext (0.18.1.1-1ubuntu2~ppa1~lucid1) lucid; urgency=low
 
-  * No-change backport to lucid
+  * Backport to Lucidbleed ppa.
 
- -- Michael Rutter <marutter@gmail.com>  Sat, 28 Mar 2015 13:04:15 -0400
+ -- Nicola Ferralis <feranick@hotmail.com>  Sun, 12 Jun 2011 17:13:09 -0400
 
-gettext (0.19.3-2~bpo70+1) wheezy-backports; urgency=low
+gettext (0.18.1.1-1ubuntu2) maverick; urgency=low
 
-  * Rebuild for wheezy-backports. No changes. Closes: #776645.
+  * debian/control: Drop autopoint recommends of gettext. It pulls in git and
+    other sizable packages which make the CDs explode.
 
- -- Santiago Vila <sanvila@debian.org>  Fri, 30 Jan 2015 18:47:54 +0100
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 02 Aug 2010 15:45:46 +0200
 
-gettext (0.19.3-2) unstable; urgency=low
+gettext (0.18.1.1-1ubuntu1) maverick; urgency=low
 
-  * xgettext: Fix double-free in singular/plural argument extraction.
-    See http://lists.gnu.org/archive/html/bug-gettext/2014-10/msg00028.html
-    Patch extracted from upstream commits 8137d2b and 84044b5.
-  * msgunfmt: Fix segfault on certain (slightly corrupted) .mo files.
-    Patch extracted from upstream commit abf93d1. Closes: #769901.
-  * msgfilter: Fix read buffer allocation for empty input.
-    See http://lists.gnu.org/archive/html/bug-gettext/2014-11/msg00008.html
-    Patch extracted from upstream commit 06e206f.
+  * Resynchronise with Debian.  Remaining changes:
+    - Build Java components with gcj.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - Explicitly configure with --disable-csharp.
+    - Keep gettext.jar in /usr/share/gettext instead of moving it to
+      /usr/share/java.
+  * Bump Replaces on gettext and Conflicts on autopoint to (<< 0.18-1)
+    rather than (<= 0.17-11), to accommodate previous Ubuntu versions.
 
- -- Santiago Vila <sanvila@debian.org>  Sun, 30 Nov 2014 12:10:20 +0100
-
-gettext (0.19.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Updated /etc/emacs/site-start.d/50gettext.el to avoid error on .po
-    inside a tar file. Thanks a lot to Kevin Ryde. Closes: #628644.
-  * Report error on incomplete multibyte sequence. Closes: #763820.
-  * Dropped infinite recursion patch, renumber remaining patches.
-  * Dropped -I/usr/include/libxml2 hack in configure call introduced
-    in version 0.17-7 as it's no longer needed.
-
- -- Santiago Vila <sanvila@debian.org>  Thu, 23 Oct 2014 15:35:14 +0200
-
-gettext (0.19.2-3) unstable; urgency=medium
-
-  * Applied patch by Eric Blake to autopoint.in and gettextize.in
-    fixing an infinite recursion in m4 that prevented util-linux
-    to be build. Closes: #764580.
-  * Updated config.guess and config.sub.
-
- -- Santiago Vila <sanvila@debian.org>  Fri, 10 Oct 2014 00:24:52 +0200
-
-gettext (0.19.2-2) unstable; urgency=medium
-
-  * Added "Multi-Arch: foreign" to gettext-base. Closes: #760410.
-
- -- Santiago Vila <sanvila@debian.org>  Wed, 03 Sep 2014 22:08:00 +0200
-
-gettext (0.19.2-1) unstable; urgency=low
-
-  * New upstream release. Closes: #755221.
-  * Dropped unused lintian overrides.
-  * Dropped 05-quotes-around-pwd-in-project-id. Adopted upstream.
-  * Use upstream tar.xz which is a lot smaller than tar.gz.
-  * Added gettext-tools/src/msgfmt.c to the list of files
-    touched by debian/rules, as we don't modify it so much
-    that msgfmt.1 or msgfmt.1.html need to be regenerated.
-    This will avoid a build dependency on groff (for now).
-
- -- Santiago Vila <sanvila@debian.org>  Thu, 24 Jul 2014 15:38:00 +0200
-
-gettext (0.18.3.2-4) unstable; urgency=medium
-
-  * Made gettext-el to depend on emacs, not emacs23. Closes: #754014.
-  * Applied Ubuntu patch for little-endian powerpc. Closes: #754146.
-    This would result in extra build-dependencies (autoconf) because
-    of the timestamps, so we keep them in debian/rules before build.
-
- -- Santiago Vila <sanvila@debian.org>  Thu, 17 Jul 2014 11:17:00 +0200
-
-gettext (0.18.3.2-3) unstable; urgency=medium
-
-  * Added "Multi-Arch: foreign" to autopoint, to be used in cross-build
-    environments. Closes: #753003. Thanks to Helmut Grohne.
-  * Do not ship an empty usr/lib in gettext-base.
-
- -- Santiago Vila <sanvila@debian.org>  Mon, 30 Jun 2014 10:01:24 +0200
-
-gettext (0.18.3.2-2) unstable; urgency=low
-
-  * Updated build profile to use DEB_BUILD_PROFILES. Closes: #750044.
-    Thanks a lot to Wookey for the patch.
-
- -- Santiago Vila <sanvila@debian.org>  Sun, 01 Jun 2014 11:02:52 +0200
-
-gettext (0.18.3.2-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Dropped 07-disable-m4-include-when-tracing.
-
- -- Santiago Vila <sanvila@debian.org>  Thu, 16 Jan 2014 16:17:04 +0100
-
-gettext (0.18.3.1-2) unstable; urgency=medium
-
-  * Fixed autopoint problem that made coreutils build to fail.
-    Patch by Daiki Ueno. Closes: #730321.
-
- -- Santiago Vila <sanvila@debian.org>  Wed, 27 Nov 2013 19:03:16 +0100
-
-gettext (0.18.3.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Santiago Vila <sanvila@debian.org>  Sat, 17 Aug 2013 16:00:06 +0200
-
-gettext (0.18.3-1~bpo7+1) wheezy-backports; urgency=low
-
-  * Rebuild for wheezy-backports. No changes.
-
- -- Santiago Vila <sanvila@debian.org>  Tue, 16 Jul 2013 11:32:34 +0200
-
-gettext (0.18.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * xgettext now partially supports JavaScript. Closes: #590724.
-  * xgettext and msgfmt's format string checking now recognize Python
-    format string in braced syntax (PEP 3101). Closes: #668226.
-
- -- Santiago Vila <sanvila@debian.org>  Tue, 16 Jul 2013 11:32:34 +0200
-
-gettext (0.18.2.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Changed Depends on libasprintf-dev and libgettextpo-dev to Recommends.
-  * Drop libgettextlib.so and libgettextsrc.so, as those libraries are
-    for internal use only and not meant to be used by other packages.
-  * The infrastructure archive now uses xz compression. Closes: #660391.
-    Changed Depends and Build-Depends accordingly.
-  * Modified debian/rules to support bootstrapping. Closes: #709559.
-  * Deprecated macro AM_PROG_MKDIR_P not used anymore. Closes: #709740.
-  * Review of patches in debian/patches:
-  * 01-do-not-use-java-in-urlget. Kept.
-  * 02-no-usr-share-info-dir-gz. Dropped in favour of AM_UPDATE_INFO_DIR.
-  * 03-fix-xgettext-crash. Dropped. Now upstream.
-  * 04-new-scheme-syntax. Dropped. Now upstream.
-  * 05-quotes-around-pwd-in-project-id. Kept.
-  * 06-msgfmt-default-little-endian. Kept.
-  * 07-eglibc-21.6-ftbfs-nogets. Dropped. Obsolete.
-  * 99-config-guess-config-sub. Updated.
-
- -- Santiago Vila <sanvila@debian.org>  Thu, 30 May 2013 18:37:30 +0200
-
-gettext (0.18.1.1-10) unstable; urgency=low
-
-  * Split out libgettextpo-dev and libasprintf-dev for multiarch
-    dependencies. Thanks to P.J McDermott for core patch. Closes: #683751.
-  * Fix FTBFS on eglibc-2.16 (gets removal/outdated gnulib). Closes: #693361.
-  * Thanks a lot to Colin Watson and Wookey, as they did all the work.
-  * Keep autosprintf.info.gz in gettext for now, for safety.
-  * Note: This is a "conservative release" which tries to be nice with
-    autobuilders using unstable. After the release of wheezy, the following
-    changes will be made: a) Change gettext Depends on the new -dev packages
-    to just Recommends, and b) Drop libgettextsrc.so and libgettextlib.so,
-    as those libraries are for internal use only and not meant to be used
-    by other packages. Those changes will be made *regardless* of this release
-    entering wheezy or not. Debian derivatives (like Ubuntu) are welcome to
-    do them now, as it is what will eventually happen in Debian.
-
- -- Santiago Vila <sanvila@debian.org>  Wed, 28 Nov 2012 17:14:44 +0100
-
-gettext (0.18.1.1-9) unstable; urgency=low
-
-  * Build with hardened build flags.
-  * Use Breaks instead of Conflicts for autopoint (lintian warning).
-  * Use $(STRIP) on ELF binaries. not just on libraries.
-
- -- Santiago Vila <sanvila@debian.org>  Thu, 07 Jun 2012 12:08:00 +0200
-
-gettext (0.18.1.1-8) unstable; urgency=low
-
-  * Modified msgfmt to always create little endian .mo files.
-    Thanks a lot to Steve Langasek. Closes: #671257.
-  * Updated config.guess and config.sub.
-
- -- Santiago Vila <sanvila@debian.org>  Wed, 16 May 2012 13:54:32 +0200
-
-gettext (0.18.1.1-7) unstable; urgency=low
-
-  * Create symlinks required by new emacs policy using "ln -sf".
-    Thanks to Agustín Martín. Closes: #671353.
-
- -- Santiago Vila <sanvila@debian.org>  Fri, 04 May 2012 18:35:31 +0200
-
-gettext (0.18.1.1-6) unstable; urgency=low
-
-  * Run dpkg-shlibdeps on libraries, as it should be. Closes: #670588.
-    This makes --no-as-needed not required after all. Closes: #604778.
-  * Put symlinks to .el files where emacs can find them, following
-    the latest emacs policy. Closes: #664551.
-  * Changed project-id to use quotes around pwd. Closes: #654779.
-  * Split out libgettextpo0 for multiarch. Closes: #646034.
-    Thanks a lot to Steve Langasek.
-  * Split out libasprintf0c2 as well. For now, gettext-base depends
-    on libasprintf0c2 so that it's not missed on upgrades, for this reason
-    this library is Priority: standard as well. After the release of wheezy
-    we can think about this again.
-  * Dropped README.Debian, no longer needed.
-
- -- Santiago Vila <sanvila@debian.org>  Sat, 28 Apr 2012 18:40:40 +0200
-
-gettext (0.18.1.1-5) unstable; urgency=low
-
-  * Applied patch by Bruno Haible to teach xgettext about new scheme
-    syntax. Reported by David Pirotte. Closes: #641371.
-
- -- Santiago Vila <sanvila@debian.org>  Wed, 05 Oct 2011 15:19:00 +0200
-
-gettext (0.18.1.1-4) unstable; urgency=low
-
-  * Applied patch by Bruno Haible to fix xgettext crash when extracting
-    a message with plural that is excluded. Closes: #608181.
-  * Dropped obsolete -D_REENTRANT. Use --enable-threads instead.
-
- -- Santiago Vila <sanvila@debian.org>  Fri, 05 Aug 2011 15:47:34 +0200
-
-gettext (0.18.1.1-3) unstable; urgency=high
-
-  * Do not include /usr/share/info/dir.gz file in binary package if
-    install-info is present during the build. Closes: #597407.
-
- -- Santiago Vila <sanvila@debian.org>  Sun, 19 Sep 2010 17:09:36 +0200
-
-gettext (0.18.1.1-2) unstable; urgency=medium
-
-  * Changed lynx to lynx-cur in gettext Recommends, as lynx is a dummy
-    transitional package. Closes: #595741.
-
- -- Santiago Vila <sanvila@debian.org>  Sat, 11 Sep 2010 13:11:40 +0200
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 01 Aug 2010 16:50:03 -0500
 
 gettext (0.18.1.1-1) unstable; urgency=low
 
@@ -274,6 +67,21 @@
 
  -- Santiago Vila <sanvila@debian.org>  Tue, 18 May 2010 13:52:36 +0200
 
+gettext (0.17-11ubuntu1) maverick; urgency=low
+
+  * Resynchronise with Debian (LP: #577744). Remaining changes:
+    - Build Java components with gcj.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - gettext-tools/src/write-catalog.c:
+      - Add missing "mode" parameter to fix FTBFS.
+    - Use autoconf's preferred shell when invoking config.status.
+    - Explicitly configure with --disable-csharp.
+    - Keep gettext.jar in /usr/share/gettext instead of moving it to
+      /usr/share/java.
+  * Convert Ubuntu direct source changes to quilt patches (u01 and u02).
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Sun, 09 May 2010 10:05:58 +0200
+
 gettext (0.17-11) unstable; urgency=low
 
   * Enable java on all architectures, by using default-jdk.
@@ -305,6 +113,33 @@
 
  -- Santiago Vila <sanvila@debian.org>  Sun, 14 Feb 2010 16:48:00 +0100
 
+gettext (0.17-8ubuntu3) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 05 Mar 2010 04:34:20 +0100
+
+gettext (0.17-8ubuntu2) karmic; urgency=low
+
+  * No change rebuild to fix misbuilt binaries on armel.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Wed, 21 Oct 2009 14:42:47 +0200
+
+gettext (0.17-8ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Build Java components with gcj.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - gettext-tools/src/write-catalog.c: 
+      - add missing "mode" parameter to fix FTBFS (from upstream CVS)
+    - Build-depend on default-jre/-jdk.
+    - debian/rules: Configure with JAVAC pointing to default-jdk.
+    - Use autoconf's preferred shell when invoking config.status.
+  * Explicitly configure with --disable-csharp.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 06 Oct 2009 16:28:09 +0100
+
 gettext (0.17-8) unstable; urgency=low
 
   * Modified Makefile.in files to avoid /usr/share/info/dir.gz.
@@ -329,6 +164,29 @@
 
  -- Santiago Vila <sanvila@debian.org>  Mon, 17 Aug 2009 18:08:54 +0200
 
+gettext (0.17-6ubuntu2) jaunty; urgency=low
+
+  * Cherry-pick df8857c0472c33bd786a967569c4b3c9c4c177b2 from upstream to use
+    autoconf's preferred shell when invoking config.status; LP: #332840.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 03 Mar 2009 10:04:46 +0100
+
+gettext (0.17-6ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - add lpia to list of mono-using arches, adjust build-deps
+    - remove hppa from list of java-using arches, adjust build-deps
+    - gettext-tools/src/write-catalog.c: 
+      - add missing "mode" parameter to fix FTBFS (from upstream CVS)
+    - (Build-)depend on default-jre/-jdk.
+    - debian/rules: Configure with JAVAC pointing to default-jdk.
+    - debian/rules: Don't set GCJFLAGS.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 02 Dec 2008 01:43:19 +0000
+
 gettext (0.17-6) unstable; urgency=low
 
   * Added libncurses5-dev, libxml2-dev, libglib2.0-dev and libcroco3-dev
@@ -346,6 +204,22 @@
 
  -- Santiago Vila <sanvila@debian.org>  Fri, 28 Nov 2008 11:12:15 +0100
 
+gettext (0.17-4ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - add lpia to list of mono-using arches, adjust build-deps
+    - remove hppa from list of java-using arches, adjust build-deps
+    - gettext-tools/src/write-catalog.c: 
+      - add missing "mode" parameter to fix FTBFS (from upstream CVS)
+    - (Build-)depend on default-jre/-jdk.
+    - debian/rules: Configure with JAVAC pointing to default-jdk.
+    - debian/rules: Don't set GCJFLAGS.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 17 Nov 2008 09:28:48 +0000
+
 gettext (0.17-4) unstable; urgency=low
 
   * Fixed xgettext crash with some unicode chars. Closes: #493218.
@@ -354,6 +228,27 @@
 
  -- Santiago Vila <sanvila@debian.org>  Wed, 27 Aug 2008 18:42:00 +0200
 
+gettext (0.17-3ubuntu2) intrepid; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+  * debian/rules: Configure with JAVAC pointing to default-jdk.
+  * debian/rules: Don't set GCJFLAGS.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 31 Jul 2008 06:55:28 +0000
+
+gettext (0.17-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - add lpia to list of mono-using arches, adjust build-deps
+    - remove hppa from list of java-using arches, adjust build-deps
+  * gettext-tools/src/write-catalog.c: 
+    - add missing "mode" parameter to fix FTBFS (from upstream CVS)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 Jun 2008 10:02:11 +0200
+
 gettext (0.17-3) unstable; urgency=low
 
   * Added lpia to the list of supported mono archs. Closes: #455842.
@@ -367,6 +262,18 @@
 
  -- Santiago Vila <sanvila@debian.org>  Thu, 12 Jun 2008 18:48:44 +0200
 
+gettext (0.17-2ubuntu1) hardy; urgency=low
+
+  * Merge with Debian; remaining changes:
+  * Remaining Ubuntu changes:
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+    - add lpia to list of mono-using arches, adjust build-deps
+    - remove hppa from list of java-using arches, adjust build-deps
+
+ -- LaMont Jones <lamont@ubuntu.com>  Wed, 12 Dec 2007 21:12:04 -0700
+
 gettext (0.17-2) unstable; urgency=medium
 
   * Changed po-mode.el to use new-style backquotes. Closes: #453103.
@@ -387,6 +294,29 @@
 
  -- Santiago Vila <sanvila@debian.org>  Sun, 25 Nov 2007 11:35:30 +0100
 
+gettext (0.16.1-2ubuntu3) gutsy; urgency=low
+
+  * Drop hppa from the list of java-using archs
+
+ -- LaMont Jones <lamont@ubuntu.com>  Mon, 13 Aug 2007 15:35:45 -0600
+
+gettext (0.16.1-2ubuntu2) gutsy; urgency=low
+
+  * Add lpia to the list of mono-using arches, and adjust build-deps.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 31 Jul 2007 14:55:22 +1000
+
+gettext (0.16.1-2ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian; remaining changes:
+  * Remaining Ubuntu changes:
+    - Build-depend on file,
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  9 Jul 2007 16:22:21 +0200
+
 gettext (0.16.1-2) unstable; urgency=low
 
   * Fixed po-check-file-header bug in po-mode.el. Closes: #385005.
@@ -398,6 +328,27 @@
 
  -- Santiago Vila <sanvila@debian.org>  Mon,  2 Jul 2007 20:29:14 +0200
 
+gettext (0.16.1-1ubuntu2) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:16:25 +0000
+
+gettext (0.16.1-1ubuntu1) feisty; urgency=low
+
+  * Merge to Debian unstable to bring in 0.16.1. This version is compatible
+    with automake 1.10 and also fixes the segfaults with lisp files.
+  * Remaining Ubuntu changes:
+    - Build-depend on file,
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Install libintl.jar in /usr/share/java, keep a symlink in
+      /usr/share/gettext.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed,  6 Dec 2006 11:16:41 +0100
+
 gettext (0.16.1-1) unstable; urgency=low
 
   * New upstream release. See the NEWS file for details.
@@ -416,6 +367,28 @@
 	
  -- Santiago Vila <sanvila@debian.org>  Fri,  3 Nov 2006 17:19:02 +0100
 
+gettext (0.15-2ubuntu2) feisty; urgency=low
+
+  * Rebuild for ldbl128 change on powerpc and sparc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  2 Nov 2006 09:59:15 +0000
+
+gettext (0.15-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable, to fix #65063.  Remaining changes:
+    - Build-depend on file,
+    - Mono components built with mono-mcs instead of pnet,
+    - Java components built with gcj instead of jikes-classpath
+    - Set GCJFLAGS to -fjni -findirect-dispatch.
+    - Install libintl.jar in /usr/share/java, keep a symlink in
+      /usr/share/gettext.
+    - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+
+  * Build-depend on java-gcj-compat-dev instead of gcj to get around bad
+    gcj detection in configure script.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 12 Oct 2006 14:56:58 +0100
+
 gettext (0.15-2) unstable; urgency=low
 
   * Fixed xgettext segfault on certain scheme input (Closes: #384698).
@@ -438,6 +411,53 @@
 	
  -- Santiago Vila <sanvila@debian.org>  Mon, 21 Aug 2006 18:45:14 +0200
 
+gettext (0.14.6-1ubuntu6) edgy; urgency=low
+
+  * Re-add build-dependency on gcj.
+  * Do not compile the native java binaries directly from the sources,
+    but from the class files.
+  * Set GCJFLAGS to -fjni -findirect-dispatch.
+  * Install libintl.jar in /usr/share/java, keep a symlink in
+    /usr/share/gettext.
+  * Finally, throw away /usr/lib/gettext/gnu.gettext*; we don't need them.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 18 Aug 2006 11:38:31 +0000
+
+gettext (0.14.6-1ubuntu5) edgy; urgency=low
+
+  * Build-depend on file; the build dependency is mentioned in
+    0.12.1-3, but apparently missing.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 15 Aug 2006 07:21:57 +0000
+
+gettext (0.14.6-1ubuntu4) edgy; urgency=low
+
+  * Do not try to install libintl.jar.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 15 Aug 2006 01:47:47 +0000
+
+gettext (0.14.6-1ubuntu3) edgy; urgency=low
+
+  * Temporarily remove build-dependency on gcj.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 15 Aug 2006 00:35:23 +0000
+
+gettext (0.14.6-1ubuntu2) edgy; urgency=low
+
+  * debian/control:
+    - replace pnet build dependency with mono as we won't have pnet in main
+      at least for edgy
+  * debian/rules:
+    - build GNU.Gettext.dll with mono instead of pnet
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Mon, 10 Jul 2006 00:15:41 +0200
+
+gettext (0.14.6-1ubuntu1) edgy; urgency=low
+
+  * Resynchronize with Debian unstable.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue,  4 Jul 2006 11:53:33 +0000
+
 gettext (0.14.6-1) unstable; urgency=low
 
   * New upstream release. From the NEWS file:
@@ -467,6 +487,25 @@
 
  -- Santiago Vila <sanvila@debian.org>  Mon,  1 May 2006 19:11:56 +0200
 
+gettext (0.14.5-2ubuntu3) dapper; urgency=low
+
+  * Rebuild using gcj-4.1.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 22 Feb 2006 11:36:30 +0000
+
+gettext (0.14.5-2ubuntu2) breezy; urgency=low
+
+  * Build-depend on libgcj-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 18 Jul 2005 20:26:07 +0200
+
+gettext (0.14.5-2ubuntu1) breezy; urgency=low
+
+  * Resynchronize with Debian. Ubuntu 12479.
+  * Reenable building the java bits using gcj. Ubuntu 10940.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 18 Jul 2005 16:59:36 +0000
+
 gettext (0.14.5-2) unstable; urgency=low
 
   * New C++ ABI. gettext-base now Provides: libasprintf0c2.
@@ -474,12 +513,31 @@
 
  -- Santiago Vila <sanvila@debian.org>  Wed,  6 Jul 2005 17:30:10 +0200
 
+gettext (0.14.5-1ubuntu2) breezy; urgency=low
+
+  * No change build to cleanup erroneous /usr/share/info/dir.gz on hppa
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri,  8 Jul 2005 11:57:19 -0600
+
+gettext (0.14.5-1ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian, unscramble changelog.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  7 Jul 2005 08:55:35 +0000
+
 gettext (0.14.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Santiago Vila <sanvila@debian.org>  Mon,  6 Jun 2005 19:02:50 +0200
 
+gettext (0.14.4-2ubuntu1) breezy; urgency=low
+
+  * Disable jikes-classpath and gcj dependancies for now.  Will
+    reenable these when they're available in main.
+
+ -- Jeff Bailey <jbailey@ubuntu.com>  Wed, 18 May 2005 19:48:40 +0000
+
 gettext (0.14.4-2) unstable; urgency=medium
 
   * Moved libgettextpo from gettext-base to gettext, where it belongs.
diff -Nru gettext-0.19.3/debian/control gettext-0.18.1.1/debian/control
--- gettext-0.19.3/debian/control	2014-10-09 22:23:20.000000000 +0000
+++ gettext-0.18.1.1/debian/control	2010-08-02 13:45:39.000000000 +0000
@@ -1,28 +1,29 @@
 Source: gettext
 Section: devel
 Priority: optional
-Maintainer: Santiago Vila <sanvila@debian.org>
-Standards-Version: 3.9.6
-Build-Depends: libexpat1-dev, fastjar, default-jdk, file, libncurses5-dev, libxml2-dev, libglib2.0-dev, libcroco3-dev, xz-utils, libunistring-dev
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Santiago Vila <sanvila@debian.org>
+Standards-Version: 3.8.4
+Build-Depends: libexpat1-dev, fastjar, default-jdk, file, libncurses5-dev, libxml2-dev, libglib2.0-dev, libcroco3-dev, git (>= 1:1.7.0.5), libunistring-dev
 Homepage: http://www.gnu.org/software/gettext/
 
 Package: gettext-base
 Section: utils
 Priority: standard
 Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends}, libasprintf0c2 (>= 0.18.1.1-6)
+Depends: ${shlibs:Depends}
+Provides: libasprintf0c2
 Description: GNU Internationalization utilities for the base system
  This package includes the gettext and ngettext programs which allow
  other packages to internationalize the messages given by shell scripts.
 
 Package: gettext
 Architecture: any
-Multi-Arch: foreign
 Depends: ${shlibs:Depends}, gettext-base, dpkg (>= 1.15.4) | install-info
-Recommends: curl | wget | lynx-cur, autopoint, libasprintf-dev, libgettextpo-dev
-Breaks: autopoint (<= 0.17-11)
+Recommends: curl | wget | lynx
+Conflicts: autopoint (<< 0.18-1)
 Suggests: gettext-doc
+Provides: libgettextpo0, libasprintf-dev, libgettextpo-dev
 Description: GNU Internationalization utilities
  Interesting for authors or maintainers of other packages or programs
  which they want to see internationalized.
@@ -30,7 +31,7 @@
 Package: gettext-el
 Section: lisp
 Architecture: all
-Depends: gettext, emacs | emacsen
+Depends: gettext, emacs23 | emacsen
 Description: Emacs po-mode for editing gettext .po files
  This package contains po-mode.el for easy .po editing using emacs.
 
@@ -46,9 +47,8 @@
 Section: devel
 Priority: optional
 Architecture: all
-Multi-Arch: foreign
-Depends: xz-utils
-Replaces: gettext (<= 0.17-11)
+Depends: git (>= 1:1.7.0.5) | git-core
+Replaces: gettext (<< 0.18-1)
 Description: The autopoint program from GNU gettext
  The `autopoint' program copies standard gettext infrastructure files
  into a source package.  It extracts from a macro call of the form
@@ -56,52 +56,3 @@
  `configure.in' or `configure.ac' file, the gettext version used by the
  package, and copies the infrastructure files belonging to this version
  into the package.
-
-Package: libgettextpo0
-Section: libs
-Priority: optional
-Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Depends: ${shlibs:Depends}
-Breaks: gettext (<< 0.18.1.1-6)
-Replaces: gettext (<< 0.18.1.1-6)
-Description: GNU Internationalization library
- This package contains the libgettextpo shared library for interfacing
- programmatically with GNU gettext .po files.
-
-Package: libasprintf0c2
-Section: libs
-Priority: standard
-Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Depends: ${shlibs:Depends}
-Breaks: gettext-base (<< 0.18.1.1-6)
-Replaces: gettext-base (<< 0.18.1.1-6)
-Description: GNU library to use fprintf and friends in C++
- This package contains the libasprintf shared library which makes the
- C formatted output routines (fprintf et al.) usable in C++ programs,
- for use with the <string> strings and the <iostream> streams.
-
-Package: libgettextpo-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libgettextpo0 (= ${binary:Version})
-Suggests: gettext-doc
-Breaks: gettext (<< 0.18.1.1-10)
-Replaces: gettext (<< 0.18.1.1-10)
-Description: GNU Internationalization library development files
- This package contains development files for the libgettextpo library.
- 
-Package: libasprintf-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libasprintf0c2 (= ${binary:Version})
-Suggests: gettext-doc
-Breaks: gettext (<< 0.18.1.1-10)
-Replaces: gettext (<< 0.18.1.1-10)
-Description: GNU Internationalization library development files
- This package contains development files for the libasprintf library.
diff -Nru gettext-0.19.3/debian/copyright gettext-0.18.1.1/debian/copyright
--- gettext-0.19.3/debian/copyright	2014-10-16 18:56:45.000000000 +0000
+++ gettext-0.18.1.1/debian/copyright	2010-08-01 21:50:09.000000000 +0000
@@ -7,7 +7,7 @@
 
 This release has been built using the sources from:
 
-http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.3.tar.xz
+http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
 
 The changes were fairly minimal, and consisted solely of adding
 various debian/* files to the distribution.
@@ -15,7 +15,7 @@
 
 Copyright and license for the gettext tools:
 
-Copyright (C) 1995-2014 Free Software Foundation, Inc.
+Copyright (C) 1995-2010 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 
 Copyright and license for the libintl library:
 
-Copyright (C) 1995-2014 Free Software Foundation, Inc.
+Copyright (C) 1995-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU Library General Public License as published
@@ -43,7 +43,7 @@
 
 Copyright and license for gettext documentation:
 
-   Copyright (C) 1995-1998, 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2001-2007 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 -Nru gettext-0.19.3/debian/elf gettext-0.18.1.1/debian/elf
--- gettext-0.19.3/debian/elf	2012-06-07 10:00:00.000000000 +0000
+++ gettext-0.18.1.1/debian/elf	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-l=""
-for f in $@; do
-  case "`file $f`" in
-    *ELF*)
-      l="$l $f"
-      ;;
-  esac
-done
-echo $l
diff -Nru gettext-0.19.3/debian/gettext-base.lintian-overrides gettext-0.18.1.1/debian/gettext-base.lintian-overrides
--- gettext-0.19.3/debian/gettext-base.lintian-overrides	2012-04-28 13:52:56.000000000 +0000
+++ gettext-0.18.1.1/debian/gettext-base.lintian-overrides	2010-08-01 21:50:09.000000000 +0000
@@ -2,3 +2,8 @@
 # We would like to use just usr/bin/gettext but that's already taken.
 #
 gettext-base: script-with-language-extension usr/bin/gettext.sh
+#
+# gettext-base Provides libasprintf0c2, which is libasprintf0
+# after a C++ transition, so it's correct.
+#
+gettext-base: package-name-doesnt-match-sonames libasprintf0
diff -Nru gettext-0.19.3/debian/gettext-base.postinst gettext-0.18.1.1/debian/gettext-base.postinst
--- gettext-0.19.3/debian/gettext-base.postinst	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/debian/gettext-base.postinst	2010-08-01 21:50:09.000000000 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+if [ "$1" = "configure" ]; then
+  ldconfig
+fi
diff -Nru gettext-0.19.3/debian/gettext-base.shlibs gettext-0.18.1.1/debian/gettext-base.shlibs
--- gettext-0.19.3/debian/gettext-base.shlibs	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/debian/gettext-base.shlibs	2010-08-01 21:50:09.000000000 +0000
@@ -0,0 +1 @@
+libasprintf	0	libasprintf0c2
diff -Nru gettext-0.19.3/debian/gettext.lintian-overrides gettext-0.18.1.1/debian/gettext.lintian-overrides
--- gettext-0.19.3/debian/gettext.lintian-overrides	2014-10-16 18:57:34.000000000 +0000
+++ gettext-0.18.1.1/debian/gettext.lintian-overrides	2010-08-01 21:50:09.000000000 +0000
@@ -5,10 +5,17 @@
 gettext: ldconfig-symlink-missing-for-shlib usr/lib/libgnuintl.so.8 usr/lib/preloadable_libintl.so libgnuintl.so.8
 gettext: shlib-missing-in-control-file libgnuintl 8 for usr/lib/preloadable_libintl.so
 #
-# Not for use by other packages.
+# gettext Provides libgettextpo-dev, so yes, it is a dev-pkg.
 #
-gettext: package-name-doesnt-match-sonames libgettextlib-0.19.3 libgettextsrc-0.19.3 libgnuintl8
-gettext: no-shlibs-control-file usr/lib/preloadable_libintl.so
-gettext: no-shlibs-control-file usr/lib/libgettextsrc-0.19.3.so
-gettext: no-shlibs-control-file usr/lib/libgettextlib-0.19.3.so
-gettext: shlib-in-multi-arch-foreign-package usr/lib/preloadable_libintl.so
+gettext: non-dev-pkg-with-shlib-symlink usr/lib/libgettextpo.so.0.5.1 usr/lib/libgettextpo.so
+#
+# These libraries are for internal use only and should not be used by
+# other programs.
+#
+gettext: shlib-missing-in-control-file libgettextsrc 0.18.1 for usr/lib/libgettextsrc-0.18.1.so
+gettext: shlib-missing-in-control-file libgettextlib 0.18.1 for usr/lib/libgettextlib-0.18.1.so
+#
+# Only libgettextpo0 is to be used by other packages.
+# gettext Provides libgettextpo0, so yes, it's correct.
+#
+gettext: package-name-doesnt-match-sonames libgettextlib-0.18.1 libgettextpo0 libgettextsrc-0.18.1 libgnuintl8
diff -Nru gettext-0.19.3/debian/gettext.shlibs gettext-0.18.1.1/debian/gettext.shlibs
--- gettext-0.19.3/debian/gettext.shlibs	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/debian/gettext.shlibs	2010-08-01 21:50:09.000000000 +0000
@@ -0,0 +1 @@
+libgettextpo	0	libgettextpo0
diff -Nru gettext-0.19.3/debian/install gettext-0.18.1.1/debian/install
--- gettext-0.19.3/debian/install	2012-05-04 16:39:10.000000000 +0000
+++ gettext-0.18.1.1/debian/install	2010-08-01 21:50:09.000000000 +0000
@@ -13,13 +13,12 @@
   echo install/${PACKAGE}: Byte-compiling for ${FLAVOR}
 
   install -m 755 -d ${ELCDIR}
+  cd ${ELDIR}
+  cp ${files} ${ELCDIR}
   cd ${ELCDIR}
-  for f in ${files}; do
-    ln -sf ../../../emacs/site-lisp/${PACKAGE}/${f} .
-  done
   cat << EOF > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
   ${FLAVOR} ${flags} ${files}
-  rm -f path.el
+  rm -f *.el path.el
 fi
diff -Nru gettext-0.19.3/debian/keep-timestamps.txt gettext-0.18.1.1/debian/keep-timestamps.txt
--- gettext-0.19.3/debian/keep-timestamps.txt	2014-07-19 11:10:17.000000000 +0000
+++ gettext-0.18.1.1/debian/keep-timestamps.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-m4/libtool.m4
-gettext-runtime/configure
-gettext-runtime/libasprintf/configure
-gettext-tools/configure
-gettext-tools/src/msgfmt.c
diff -Nru gettext-0.19.3/debian/libasprintf0c2.postinst gettext-0.18.1.1/debian/libasprintf0c2.postinst
--- gettext-0.19.3/debian/libasprintf0c2.postinst	2012-04-28 13:53:17.000000000 +0000
+++ gettext-0.18.1.1/debian/libasprintf0c2.postinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = "configure" ]; then
-  ldconfig
-fi
diff -Nru gettext-0.19.3/debian/libasprintf0c2.shlibs gettext-0.18.1.1/debian/libasprintf0c2.shlibs
--- gettext-0.19.3/debian/libasprintf0c2.shlibs	2008-06-11 10:17:50.000000000 +0000
+++ gettext-0.18.1.1/debian/libasprintf0c2.shlibs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libasprintf	0	libasprintf0c2
diff -Nru gettext-0.19.3/debian/libgettextpo0.postinst gettext-0.18.1.1/debian/libgettextpo0.postinst
--- gettext-0.19.3/debian/libgettextpo0.postinst	2012-04-28 13:53:17.000000000 +0000
+++ gettext-0.18.1.1/debian/libgettextpo0.postinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = "configure" ]; then
-  ldconfig
-fi
diff -Nru gettext-0.19.3/debian/libgettextpo0.shlibs gettext-0.18.1.1/debian/libgettextpo0.shlibs
--- gettext-0.19.3/debian/libgettextpo0.shlibs	2012-04-28 12:43:53.000000000 +0000
+++ gettext-0.18.1.1/debian/libgettextpo0.shlibs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libgettextpo	0	libgettextpo0
diff -Nru gettext-0.19.3/debian/mk-touch gettext-0.18.1.1/debian/mk-touch
--- gettext-0.19.3/debian/mk-touch	2014-07-24 11:50:32.000000000 +0000
+++ gettext-0.18.1.1/debian/mk-touch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-package=gettext
-t=`tempfile`
-u=`tempfile`
-version=`head -n1 debian/changelog | awk '{ print $2 }' | sed -e 's/(//' -e 's/-.*//'`
-tar --utc --full-time -Jtvf ../${package}_${version}.orig.tar.xz > $t
-for file in `cat debian/keep-timestamps.txt`; do
-  timestamp=`awk -vfilename=${package}-${version}/${file} '$6 == filename { print $4 " " $5 " UTC" }' $t`
-  string="\"${timestamp}\" $file"
-  if ! grep -q "${string}" debian/rules; then
-    /bin/echo -e "\ttouch -d \"${timestamp}\" $file" >> ${u}
-  fi
-done
-if [ -s "${u}" ]; then
-  echo Warning: debian/rules is supposed to have these lines:
-  echo ""
-  cat $u
-  sleep 10
-fi
-rm -f ${t} ${u}
diff -Nru gettext-0.19.3/debian/my-shlibdeps gettext-0.18.1.1/debian/my-shlibdeps
--- gettext-0.19.3/debian/my-shlibdeps	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/debian/my-shlibdeps	2010-08-01 21:50:09.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+l=""
+for f in $@; do
+  case "`file $f`" in
+    *ELF*)
+      l="$l $f"
+      ;;
+  esac
+done
+dpkg-shlibdeps $l
diff -Nru gettext-0.19.3/debian/patches/02-msgfmt-default-little-endian gettext-0.18.1.1/debian/patches/02-msgfmt-default-little-endian
--- gettext-0.19.3/debian/patches/02-msgfmt-default-little-endian	2014-11-30 11:02:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/02-msgfmt-default-little-endian	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-From: Santiago Vila <sanvila@debian.org>
-Subject: Modified msgfmt to always create little endian .mo files
-Bug-Debian: http://bugs.debian.org/671257
-X-Debian-version: 0.18.1.1-8
-
---- a/gettext-tools/src/msgfmt.c
-+++ b/gettext-tools/src/msgfmt.c
-@@ -233,6 +233,9 @@
-   /* Set default value for global variables.  */
-   alignment = DEFAULT_OUTPUT_ALIGNMENT;
- 
-+  /* Changed by Debian: Default is little-endian, not native */
-+  byteswap = ENDIANNESS;
-+
-   /* Set program name for messages.  */
-   set_program_name (argv[0]);
-   error_print_progname = maybe_print_progname;
diff -Nru gettext-0.19.3/debian/patches/03-libtool-powerpc-le gettext-0.18.1.1/debian/patches/03-libtool-powerpc-le
--- gettext-0.19.3/debian/patches/03-libtool-powerpc-le	2014-11-30 11:03:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/03-libtool-powerpc-le	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-Description: Add support for little-endian powerpc Linux
- Derived from a libtool patch by Alan Modra.
-Author: Alan Modra <amodra@gmail.com>
-Author: Colin Watson <cjwatson@ubuntu.com>
-Forwarded: not-needed
-Last-Update: 2013-12-15
-
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1312,7 +1312,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -1326,7 +1326,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -1345,7 +1348,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -9313,7 +9313,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -9331,7 +9331,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -9350,7 +9353,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
---- a/gettext-runtime/libasprintf/configure
-+++ b/gettext-runtime/libasprintf/configure
-@@ -7524,7 +7524,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -7542,7 +7542,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -7561,7 +7564,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -11324,7 +11324,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -11342,7 +11342,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -11361,7 +11364,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
diff -Nru gettext-0.19.3/debian/patches/04-xgettext-fix-double-free gettext-0.18.1.1/debian/patches/04-xgettext-fix-double-free
--- gettext-0.19.3/debian/patches/04-xgettext-fix-double-free	2014-11-30 11:04:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/04-xgettext-fix-double-free	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-From: Daiki Ueno <ueno@gnu.org>
-Subject: Fix double-free in singular/plural argument extraction
-X-Debian-version: 0.19.3-2
-
---- a/gettext-tools/src/xgettext.c
-+++ b/gettext-tools/src/xgettext.c
-@@ -3099,9 +3099,9 @@
-                 char *msgid = parser->parse (best_cp->msgid,
-                                              &best_cp->msgid_pos,
-                                              best_cp->msgid_escape);
--                free (best_cp->msgid);
-                 if (best_cp->msgid_plural == best_cp->msgid)
-                   best_cp->msgid_plural = msgid;
-+                free (best_cp->msgid);
-                 best_cp->msgid = msgid;
-               }
-             else
-@@ -3110,26 +3110,7 @@
-                 CONVERT_STRING (best_cp->msgid, lc_string);
-               }
- 
--            if (best_cp->msgid_comment != NULL)
--              {
--                refcounted_string_list_ty *msgid_comment =
--                  savable_comment_convert_encoding (best_cp->msgid_comment,
--                                                    &best_cp->msgid_pos);
--                drop_reference (best_cp->msgid_comment);
--                best_cp->msgid_comment = msgid_comment;
--              }
--
--            /* best_cp->msgctxt and best_cp->msgid are already in
--               UTF-8.  Prevent further conversion in remember_a_message.  */
--            encoding = xgettext_current_source_encoding;
--            xgettext_current_source_encoding = po_charset_utf8;
--            mp = remember_a_message (ap->mlp, best_cp->msgctxt, best_cp->msgid,
--                                     msgid_context,
--                                     &best_cp->msgid_pos,
--                                     NULL, best_cp->msgid_comment);
--            xgettext_current_source_encoding = encoding;
--
--            if (mp != NULL && best_cp->msgid_plural != NULL)
-+            if (best_cp->msgid_plural)
-               {
-                 /* best_cp->msgid_plural may point to best_cp->msgid.
-                    In that case, it is already interpreted and converted.  */
-@@ -3152,14 +3133,41 @@
-                       }
-                   }
- 
--                encoding = xgettext_current_source_encoding;
--                xgettext_current_source_encoding = po_charset_utf8;
--                remember_a_message_plural (mp, best_cp->msgid_plural,
--                                           msgid_plural_context,
--                                           &best_cp->msgid_plural_pos,
--                                           NULL);
--                xgettext_current_source_encoding = encoding;
-+                /* If best_cp->msgid_plural equals to best_cp->msgid,
-+                   the ownership will be transferred to
-+                   remember_a_message before it is passed to
-+                   remember_a_message_plural.
-+
-+                   Make a copy of the string in that case.  */
-+                if (best_cp->msgid_plural == best_cp->msgid)
-+                  best_cp->msgid_plural = xstrdup (best_cp->msgid);
-+              }
-+
-+            if (best_cp->msgid_comment != NULL)
-+              {
-+                refcounted_string_list_ty *msgid_comment =
-+                  savable_comment_convert_encoding (best_cp->msgid_comment,
-+                                                    &best_cp->msgid_pos);
-+                drop_reference (best_cp->msgid_comment);
-+                best_cp->msgid_comment = msgid_comment;
-               }
-+
-+            /* best_cp->msgctxt, best_cp->msgid, and best_cp->msgid_plural
-+               are already in UTF-8.  Prevent further conversion in
-+               remember_a_message.  */
-+            encoding = xgettext_current_source_encoding;
-+            xgettext_current_source_encoding = po_charset_utf8;
-+            mp = remember_a_message (ap->mlp, best_cp->msgctxt, best_cp->msgid,
-+                                     msgid_context,
-+                                     &best_cp->msgid_pos,
-+                                     NULL, best_cp->msgid_comment);
-+            if (mp != NULL && best_cp->msgid_plural != NULL)
-+              remember_a_message_plural (mp,
-+                                         best_cp->msgid_plural,
-+                                         msgid_plural_context,
-+                                         &best_cp->msgid_plural_pos,
-+                                         NULL);
-+            xgettext_current_source_encoding = encoding;
-           }
- 
-           if (best_cp->xcomments.nitems > 0)
diff -Nru gettext-0.19.3/debian/patches/05-msgunfmt-fix-segfault gettext-0.18.1.1/debian/patches/05-msgunfmt-fix-segfault
--- gettext-0.19.3/debian/patches/05-msgunfmt-fix-segfault	2014-11-30 11:05:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/05-msgunfmt-fix-segfault	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-From: Daiki Ueno <ueno@gnu.org>
-Subject: Fix segfault on certain (slightly corrupted) .mo files
-Bug-Debian: http://bugs.debian.org/769901
-X-Debian-version: 0.19.3-2
-
---- a/gettext-tools/src/read-mo.c
-+++ b/gettext-tools/src/read-mo.c
-@@ -38,6 +38,7 @@
- #include "message.h"
- #include "format.h"
- #include "gettext.h"
-+#include "xsize.h"
- 
- #define _(str) gettext (str)
- 
-@@ -121,8 +122,9 @@
-   /* See 'struct string_desc'.  */
-   nls_uint32 s_length = get_uint32 (bfp, offset);
-   nls_uint32 s_offset = get_uint32 (bfp, offset + 4);
-+  size_t s_end = xsum3 (s_offset, s_length, 1);
- 
--  if (s_offset + s_length + 1 > bfp->size)
-+  if (size_overflow_p (s_end) || s_end > bfp->size)
-     error (EXIT_FAILURE, 0, _("file \"%s\" is truncated"), bfp->filename);
-   if (bfp->data[s_offset + s_length] != '\0')
-     error (EXIT_FAILURE, 0,
diff -Nru gettext-0.19.3/debian/patches/06-msgfilter-fix-read-buffer-allocation gettext-0.18.1.1/debian/patches/06-msgfilter-fix-read-buffer-allocation
--- gettext-0.19.3/debian/patches/06-msgfilter-fix-read-buffer-allocation	2014-11-30 11:06:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/06-msgfilter-fix-read-buffer-allocation	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-From: Daiki Ueno <ueno@gnu.org>
-Subject: Fix read buffer allocation for empty input
-X-Debian-version: 0.19.3-2
-
---- a/gettext-tools/src/msgfilter.c
-+++ b/gettext-tools/src/msgfilter.c
-@@ -554,7 +554,7 @@
- 
-   if (l->length == l->allocated)
-     {
--      l->allocated = l->allocated + (l->allocated >> 1);
-+      l->allocated = l->allocated + (l->allocated >> 1) + 1;
-       l->result = (char *) xrealloc (l->result, l->allocated);
-     }
-   *num_bytes_p = l->allocated - l->length;
diff -Nru gettext-0.19.3/debian/patches/99-config-guess-config-sub gettext-0.18.1.1/debian/patches/99-config-guess-config-sub
--- gettext-0.19.3/debian/patches/99-config-guess-config-sub	2014-11-30 11:09:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/99-config-guess-config-sub	2010-08-01 21:50:09.000000000 +0000
@@ -4,69 +4,64 @@
 
 --- a/gettext-tools/examples/hello-c++-kde/admin/config.guess
 +++ b/gettext-tools/examples/hello-c++-kde/admin/config.guess
-@@ -1,13 +1,12 @@
+@@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   Copyright 1992-2014 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
++#   Free Software Foundation, Inc.
  
 -timestamp='2002-10-21'
-+timestamp='2014-03-23'
++timestamp='2010-04-03'
  
  # 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
--# the Free Software Foundation; either version 2 of the License, or
-+# 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
-@@ -16,24 +15,22 @@
- # General Public License for more details.
+@@ -17,23 +18,25 @@
  #
  # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
+ # along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
+ # the same distribution terms that you use for the rest of that program.
+ 
 -# Originally written by Per Bothner <per@bothner.com>.
 -# Please send patches to <config-patches@gnu.org>.  Submit a context
 -# diff and a properly formatted ChangeLog entry.
-+# the same distribution terms that you use for the rest of that
-+# program.  This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-+#
-+# Originally written by Per Bothner.
++
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
  #
--# This script attempts to guess a canonical system name similar to
--# config.sub.  If it succeeds, it prints the system name on stdout, and
--# exits with 0.  Otherwise, it exits with 1.
-+# 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
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
  #
 -# The plan is that this can be called by configure scripts if you
 -# don't specify an explicit build system type.
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-+
++# 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
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
-@@ -53,8 +50,7 @@
+@@ -53,8 +56,9 @@
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
-+Copyright 1992-2014 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
-@@ -66,11 +62,11 @@
+@@ -66,11 +70,11 @@
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
@@ -81,7 +76,16 @@
      -- )     # Stop option processing
         shift; break ;;
      - )	# Use stdin as input.
-@@ -98,14 +94,18 @@
+@@ -88,7 +92,7 @@
+   exit 1
+ fi
+ 
+-trap 'exit 1' 1 2 15
++trap 'exit 1' HUP INT TERM
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+@@ -98,14 +102,18 @@
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
@@ -96,7 +100,7 @@
 -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
 +set_cc_for_build='
 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 +: ${TMPDIR=/tmp} ;
 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -107,7 +111,7 @@
  case $CC_FOR_BUILD,$HOST_CC,$CC in
   ,,)    echo "int x;" > $dummy.c ;
  	for c in cc gcc c89 c99 ; do
-@@ -113,15 +113,13 @@
+@@ -113,15 +121,13 @@
  	     CC_FOR_BUILD="$c"; break ;
  	  fi ;
  	done ;
@@ -124,42 +128,7 @@
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -134,12 +132,33 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
-+case "${UNAME_SYSTEM}" in
-+Linux|GNU|GNU/*)
-+	# If the system lacks a compiler, then just pick glibc.
-+	# We could probably try harder.
-+	LIBC=gnu
-+
-+	eval $set_cc_for_build
-+	cat <<-EOF > $dummy.c
-+	#include <features.h>
-+	#if defined(__UCLIBC__)
-+	LIBC=uclibc
-+	#elif defined(__dietlibc__)
-+	LIBC=dietlibc
-+	#else
-+	LIBC=gnu
-+	#endif
-+	EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-+	;;
-+esac
-+
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-     *:NetBSD:*:*)
- 	# NetBSD (nbsd) targets should (where applicable) match one or
--	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
- 	# switched to ELF, *-*-netbsd* would select the old
- 	# object file format.  This provides both forward
-@@ -156,6 +175,7 @@
+@@ -156,6 +162,7 @@
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
@@ -167,7 +136,7 @@
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -164,7 +184,7 @@
+@@ -164,7 +171,7 @@
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -176,12 +145,7 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -174,148 +194,139 @@
- 		fi
- 		;;
- 	    *)
--	        os=netbsd
-+		os=netbsd
+@@ -178,144 +185,128 @@
  		;;
  	esac
  	# The OS release
@@ -240,10 +204,6 @@
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
-+    *:Bitrig:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+	exit ;;
      *:OpenBSD:*:*)
 -	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
@@ -270,7 +230,7 @@
 -	fi
 +		;;
 +	*5.*)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 +		;;
 +	esac
 +	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -374,10 +334,7 @@
 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 -	exit 0 ;;
 +	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
-+	exit $exitcode ;;
++	exit ;;
      Alpha\ *:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -409,13 +366,13 @@
 +	echo s390-ibm-zvmoe
 +	exit ;;
 +    *:OS400:*:*)
-+	echo powerpc-ibm-os400
++        echo powerpc-ibm-os400
 +	exit ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
 -	exit 0;;
 +	exit ;;
-+    arm*:riscos:*:*|arm*:RISCOS:*:*)
++    arm:riscos:*:*|arm:RISCOS:*:*)
 +	echo arm-unknown-riscos
 +	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -425,7 +382,7 @@
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -323,29 +334,51 @@
+@@ -323,29 +314,51 @@
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -487,7 +444,7 @@
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -354,10 +387,10 @@
+@@ -354,10 +367,10 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -500,7 +457,7 @@
      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
-@@ -369,10 +402,10 @@
+@@ -369,10 +382,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -513,38 +470,32 @@
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -382,38 +415,41 @@
-     # MiNT.  But MiNT is downward compatible to TOS, so this should
+@@ -383,37 +396,40 @@
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
+         echo m68k-atari-mint${UNAME_RELEASE}
 -	exit 0 ;;
-+	echo m68k-atari-mint${UNAME_RELEASE}
 +	exit ;;
      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
  	echo m68k-atari-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
+         echo m68k-atari-mint${UNAME_RELEASE}
 -	exit 0 ;;
-+	echo m68k-atari-mint${UNAME_RELEASE}
 +	exit ;;
      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
--        echo m68k-milan-mint${UNAME_RELEASE}
+         echo m68k-milan-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+	echo m68k-milan-mint${UNAME_RELEASE}
-+	exit ;;
++        exit ;;
      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
--        echo m68k-hades-mint${UNAME_RELEASE}
+         echo m68k-hades-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+	echo m68k-hades-mint${UNAME_RELEASE}
-+	exit ;;
++        exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
--        echo m68k-unknown-mint${UNAME_RELEASE}
+         echo m68k-unknown-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+	echo m68k-unknown-mint${UNAME_RELEASE}
-+	exit ;;
++        exit ;;
 +    m68k:machten:*:*)
 +	echo m68k-apple-machten${UNAME_RELEASE}
 +	exit ;;
@@ -571,7 +522,7 @@
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -437,36 +473,36 @@
+@@ -437,33 +453,33 @@
  	  exit (-1);
  	}
  EOF
@@ -616,19 +567,14 @@
 -	exit 0 ;;
 +	exit ;;
      AViiON:dgux:*:*)
--        # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	# DG/UX returns AViiON for all architectures
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
- 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -479,29 +515,29 @@
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+@@ -479,29 +495,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
 - 	exit 0 ;;
-+	exit ;;
++ 	exit ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
 -	exit 0 ;;
@@ -662,7 +608,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -509,7 +545,7 @@
+@@ -509,7 +525,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -671,7 +617,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -524,16 +560,19 @@
+@@ -524,16 +540,19 @@
  			exit(0);
  			}
  EOF
@@ -692,11 +638,11 @@
 -	exit 0 ;;
 -    *:AIX:*:[45])
 +	exit ;;
-+    *:AIX:*:[4567])
++    *:AIX:*:[456])
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -546,28 +585,28 @@
+@@ -546,28 +565,28 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -733,97 +679,8 @@
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -576,64 +615,84 @@
- 	    9000/[678][0-9][0-9])
- 		if [ -x /usr/bin/getconf ]; then
- 		    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
--                      532)                      # CPU_PA_RISC2_0
--                        case "${sc_kernel_bits}" in
--                          32) HP_ARCH="hppa2.0n" ;;
--                          64) HP_ARCH="hppa2.0w" ;;
-+		    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
-+		      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
--                        esac ;;
--                    esac
-+			esac ;;
-+		    esac
- 		fi
- 		if [ "${HP_ARCH}" = "" ]; then
- 		    eval $set_cc_for_build
--		    sed 's/^              //' << EOF >$dummy.c
-+		    sed 's/^		//' << EOF >$dummy.c
-+
-+		#define _HPUX_SOURCE
-+		#include <stdlib.h>
-+		#include <unistd.h>
-+
-+		int main ()
-+		{
-+		#if defined(_SC_KERNEL_BITS)
-+		    long bits = sysconf(_SC_KERNEL_BITS);
-+		#endif
-+		    long cpu  = sysconf (_SC_CPU_VERSION);
- 
--              #define _HPUX_SOURCE
--              #include <stdlib.h>
--              #include <unistd.h>
--
--              int main ()
--              {
--              #if defined(_SC_KERNEL_BITS)
--                  long bits = sysconf(_SC_KERNEL_BITS);
--              #endif
--                  long cpu  = sysconf (_SC_CPU_VERSION);
--
--                  switch (cpu)
--              	{
--              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
--              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
--              	case CPU_PA_RISC2_0:
--              #if defined(_SC_KERNEL_BITS)
--              	    switch (bits)
--              		{
--              		case 64: puts ("hppa2.0w"); break;
--              		case 32: puts ("hppa2.0n"); break;
--              		default: puts ("hppa2.0"); break;
--              		} break;
--              #else  /* !defined(_SC_KERNEL_BITS) */
--              	    puts ("hppa2.0"); break;
--              #endif
--              	default: puts ("hppa1.0"); break;
--              	}
--                  exit (0);
--              }
-+		    switch (cpu)
-+			{
-+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+			case CPU_PA_RISC2_0:
-+		#if defined(_SC_KERNEL_BITS)
-+			    switch (bits)
-+				{
-+				case 64: puts ("hppa2.0w"); break;
-+				case 32: puts ("hppa2.0n"); break;
-+				default: puts ("hppa2.0"); break;
-+				} break;
-+		#else  /* !defined(_SC_KERNEL_BITS) */
-+			    puts ("hppa2.0"); break;
-+		#endif
-+			default: puts ("hppa1.0"); break;
-+			}
-+		    exit (0);
-+		}
+@@ -624,16 +643,36 @@
+               }
  EOF
  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 -		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
@@ -863,7 +720,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -661,277 +720,345 @@
+@@ -661,186 +700,248 @@
  	  exit (0);
  	}
  EOF
@@ -909,26 +766,26 @@
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
  	if getsysinfo -f scalar_acc
  	then echo c32-convex-bsd
  	else echo c2-convex-bsd
  	fi
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
  	echo c34-convex-bsd
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
  	echo c38-convex-bsd
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
  	echo c4-convex-bsd
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      CRAY*Y-MP:*:*:*)
  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 -	exit 0 ;;
@@ -960,18 +817,15 @@
 +	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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         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 0 ;;
-+	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 ;;
++        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/ /_/'`
-+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        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:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -1000,12 +854,13 @@
 -	rm -f $dummy.c && rmdir $tmpdir
 -	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 -	exit 0 ;;
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	case ${UNAME_PROCESSOR} in
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	    amd64)
 +		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	    *)
-+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	esac
 +	exit ;;
      i*:CYGWIN*:*)
@@ -1013,19 +868,13 @@
 -	exit 0 ;;
 -    i*:MINGW*:*)
 +	exit ;;
-+    *:MINGW64*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw64
-+	exit ;;
 +    *:MINGW*:*)
  	echo ${UNAME_MACHINE}-pc-mingw32
 -	exit 0 ;;
 +	exit ;;
-+    *:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
 +    i*:windows32*:*)
-+	# uname -m includes "-pc" on this system.
-+	echo ${UNAME_MACHINE}-mingw32
++    	# uname -m includes "-pc" on this system.
++    	echo ${UNAME_MACHINE}-mingw32
 +	exit ;;
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
@@ -1035,7 +884,7 @@
 -	exit 0 ;;
 +	exit ;;
 +    *:Interix*:*)
-+	case ${UNAME_MACHINE} in
++    	case ${UNAME_MACHINE} in
 +	    x86)
 +		echo i586-pc-interix${UNAME_RELEASE}
 +		exit ;;
@@ -1076,26 +925,18 @@
 -	exit 0 ;;
 +	exit ;;
      *:GNU:*:*)
--	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
 +	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+-	exit 0 ;;
 +	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 '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 +	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
 -	exit 0 ;;
 +	exit ;;
-+    aarch64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
 +    alpha:Linux:*:*)
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -1105,63 +946,56 @@
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+	esac
++        esac
 +	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-+    arc:Linux:*:* | arceb:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 +	exit ;;
      arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
 +	eval $set_cc_for_build
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +	    | grep -q __ARM_EABI__
 +	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	else
-+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+		| grep -q __ARM_PCS_VFP
-+	    then
-+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-+	    else
-+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-+	    fi
++	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 +	fi
 +	exit ;;
 +    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
 +	exit ;;
 +    cris:Linux:*:*)
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo cris-axis-linux-gnu
 +	exit ;;
 +    crisv32:Linux:*:*)
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo crisv32-axis-linux-gnu
 +	exit ;;
 +    frv:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-+    hexagon:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    	echo frv-unknown-linux-gnu
 +	exit ;;
 +    i*86:Linux:*:*)
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 +	exit ;;
      ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 -    mips:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
@@ -1187,7 +1021,7 @@
 -	rm -f $dummy.c && rmdir $tmpdir
 -	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
 -    ppc:Linux:*:*)
 -	echo powerpc-unknown-linux-gnu
@@ -1209,27 +1043,21 @@
 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
-+    openrisc*:Linux:*:*)
-+	echo or1k-unknown-linux-${LIBC}
-+	exit ;;
-+    or32:Linux:*:* | or1k*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
 +	exit ;;
 +    padre:Linux:*:*)
-+	echo sparc-unknown-linux-${LIBC}
++	echo sparc-unknown-linux-gnu
 +	exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-${LIBC}
++	echo hppa64-unknown-linux-gnu
 +	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
-+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+@@ -848,82 +949,40 @@
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
 -	exit 0 ;;
 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
@@ -1237,43 +1065,31 @@
 -	exit 0 ;;
 +	exit ;;
 +    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-gnu
 +	exit ;;
 +    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-${LIBC}
-+	exit ;;
-+    ppc64le:Linux:*:*)
-+	echo powerpc64le-unknown-linux-${LIBC}
-+	exit ;;
-+    ppcle:Linux:*:*)
-+	echo powerpcle-unknown-linux-${LIBC}
++	echo powerpc-unknown-linux-gnu
 +	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
--	echo ${UNAME_MACHINE}-ibm-linux
+ 	echo ${UNAME_MACHINE}-ibm-linux
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 +	exit ;;
 +    sh64*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-+    tile*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++	echo ${UNAME_MACHINE}-dec-linux-gnu
 +	exit ;;
      x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
+ 	echo x86_64-unknown-linux-gnu
 -	exit 0 ;;
 -    i*86:Linux:*:*)
 -	# The BFD linker knows what the default object file format is, so
@@ -1329,10 +1145,9 @@
 -	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 -	;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    xtensa*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1342,15 +1157,11 @@
 -	exit 0 ;;
 +	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
--        # Unixware is an offshoot of SVR4, but it has its own version
--        # number series starting with 2...
--        # I am not positive that other SVR4 systems won't match this,
-+	# Unixware is an offshoot of SVR4, but it has its own version
-+	# number series starting with 2...
-+	# I am not positive that other SVR4 systems won't match this,
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+@@ -931,7 +990,27 @@
  	# I just have to hope.  -- rms.
--        # Use sysv4.2uw... so that sysv4* matches it.
-+	# Use sysv4.2uw... so that sysv4* matches it.
+         # Use sysv4.2uw... so that sysv4* matches it.
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 -	exit 0 ;;
 +	exit ;;
@@ -1377,7 +1188,7 @@
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -939,15 +1066,16 @@
+@@ -939,15 +1018,16 @@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
@@ -1385,7 +1196,7 @@
 -    i*86:*:5:[78]*)
 +	exit ;;
 +    i*86:*:5:[678]*)
-+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
  	case `/bin/uname -X | grep "^Machine"` in
  	    *486*)	     UNAME_MACHINE=i486 ;;
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1397,7 +1208,7 @@
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -965,76 +1093,86 @@
+@@ -965,76 +1045,86 @@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
@@ -1408,17 +1219,16 @@
 +	exit ;;
      pc:*:*:*)
  	# Left here for compatibility:
--        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
 -        # the processor, so we play safe by assuming i386.
 -	echo i386-pc-msdosdjgpp
 -        exit 0 ;;
-+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-+	# the processor, so we play safe by assuming i586.
++        # the processor, so we play safe by assuming i586.
 +	# Note: whatever this is, it MUST be the same as what config.sub
 +	# prints for the "djgpp" host, or else GDB configury will decide that
 +	# this is a cross-build.
 +	echo i586-pc-msdosdjgpp
-+	exit ;;
++        exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
 -	exit 0 ;;
@@ -1463,10 +1273,9 @@
 -	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
 +	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 -          && echo i486-ncr-sysv4 && exit 0 ;;
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4; exit; } ;;
++          && { echo i486-ncr-sysv4; exit; } ;;
 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 +	OS_REL='.3'
 +	test -r /etc/.relid \
@@ -1516,20 +1325,17 @@
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1042,64 +1180,109 @@
+@@ -1042,64 +1132,94 @@
  	else
  		echo ns32k-sni-sysv
  	fi
 -	exit 0 ;;
--    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                      # says <Richard.M.Bartel@ccMail.Census.GOV>
--        echo i586-unisys-sysv4
--        exit 0 ;;
-+	exit ;;
-+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+			# says <Richard.M.Bartel@ccMail.Census.GOV>
-+	echo i586-unisys-sysv4
 +	exit ;;
+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                       # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+-        exit 0 ;;
++        exit ;;
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes@openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
@@ -1560,14 +1366,12 @@
 +	exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
--	        echo mips-nec-sysv${UNAME_RELEASE}
-+		echo mips-nec-sysv${UNAME_RELEASE}
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
  	else
--	        echo mips-unknown-sysv${UNAME_RELEASE}
-+		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
 -        exit 0 ;;
-+	exit ;;
++        exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
 -	exit 0 ;;
@@ -1583,9 +1387,6 @@
 +    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 +	echo i586-pc-haiku
 +	exit ;;
-+    x86_64:Haiku:*:*)
-+	echo x86_64-unknown-haiku
-+	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
 -	exit 0 ;;
@@ -1619,37 +1420,25 @@
 -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 -	exit 0 ;;
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	eval $set_cc_for_build
-+	if test "$UNAME_PROCESSOR" = unknown ; then
-+	    UNAME_PROCESSOR=powerpc
-+	fi
-+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; 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) | \
-+		    grep IS_64BIT_ARCH >/dev/null
-+		then
-+		    case $UNAME_PROCESSOR in
-+			i386) UNAME_PROCESSOR=x86_64 ;;
-+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+		    esac
-+		fi
-+	    fi
-+	elif test "$UNAME_PROCESSOR" = i386 ; then
-+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-+	    # that puts up a graphical alert prompting to install
-+	    # developer tools.  Any system running Mac OS X 10.7 or
-+	    # later (Darwin 11 and later) is required to have a 64-bit
-+	    # processor. This is not true of the ARM version of Darwin
-+	    # that Apple uses in portable devices.
-+	    UNAME_PROCESSOR=x86_64
-+	fi
++	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		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) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
++	    unknown) UNAME_PROCESSOR=powerpc ;;
++	esac
 +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 +	exit ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
  	UNAME_PROCESSOR=`uname -p`
  	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1107,22 +1290,28 @@
+@@ -1107,22 +1227,25 @@
  		UNAME_MACHINE=pc
  	fi
  	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
@@ -1660,10 +1449,7 @@
 -	exit 0 ;;
 -    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 +	exit ;;
-+    NEO-?:NONSTOP_KERNEL:*:*)
-+	echo neo-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSE-*:NONSTOP_KERNEL:*:*)
++    NSE-?:NONSTOP_KERNEL:*:*)
 +	echo nse-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    NSR-?:NONSTOP_KERNEL:*:*)
@@ -1685,7 +1471,7 @@
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
-@@ -1133,189 +1322,55 @@
+@@ -1133,36 +1256,50 @@
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
@@ -1727,13 +1513,13 @@
 -	exit 0 ;;
 +	exit ;;
 +    SEI:*:*:SEIUX)
-+	echo mips-sei-seiux${UNAME_RELEASE}
++        echo mips-sei-seiux${UNAME_RELEASE}
 +	exit ;;
 +    *:DragonFly:*:*)
 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit ;;
 +    *:*VMS:*:*)
-+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
 +	    A*) echo alpha-dec-vms ; exit ;;
 +	    I*) echo ia64-dec-vms ; exit ;;
@@ -1751,166 +1537,63 @@
 +    i*86:AROS:*:*)
 +	echo ${UNAME_MACHINE}-pc-aros
 +	exit ;;
-+    x86_64:VMkernel:*:*)
-+	echo ${UNAME_MACHINE}-unknown-esx
-+	exit ;;
  esac
  
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
--eval $set_cc_for_build
--cat >$dummy.c <<EOF
--#ifdef _SEQUENT_
--# include <sys/types.h>
--# include <sys/utsname.h>
--#endif
--main ()
--{
--#if defined (sony)
--#if defined (MIPSEB)
--  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
--     I don't know....  */
--  printf ("mips-sony-bsd\n"); exit (0);
--#else
--#include <sys/param.h>
--  printf ("m68k-sony-newsos%s\n",
--#ifdef NEWSOS4
--          "4"
--#else
--	  ""
--#endif
--         ); exit (0);
--#endif
--#endif
--
--#if defined (__arm) && defined (__acorn) && defined (__unix)
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1194,7 +1331,7 @@
+ #endif
+ 
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
 -  printf ("arm-acorn-riscix"); exit (0);
--#endif
--
--#if defined (hp300) && !defined (hpux)
--  printf ("m68k-hp-bsd\n"); exit (0);
--#endif
--
--#if defined (NeXT)
--#if !defined (__ARCHITECTURE__)
--#define __ARCHITECTURE__ "m68k"
--#endif
--  int version;
--  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
--  if (version < 4)
--    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
--  else
--    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
--  exit (0);
--#endif
--
--#if defined (MULTIMAX) || defined (n16)
--#if defined (UMAXV)
--  printf ("ns32k-encore-sysv\n"); exit (0);
--#else
--#if defined (CMU)
--  printf ("ns32k-encore-mach\n"); exit (0);
--#else
--  printf ("ns32k-encore-bsd\n"); exit (0);
--#endif
--#endif
--#endif
--
--#if defined (__386BSD__)
--  printf ("i386-pc-bsd\n"); exit (0);
--#endif
--
--#if defined (sequent)
--#if defined (i386)
--  printf ("i386-sequent-dynix\n"); exit (0);
--#endif
--#if defined (ns32000)
--  printf ("ns32k-sequent-dynix\n"); exit (0);
--#endif
--#endif
--
--#if defined (_SEQUENT_)
--    struct utsname un;
--
--    uname(&un);
--
--    if (strncmp(un.version, "V2", 2) == 0) {
--	printf ("i386-sequent-ptx2\n"); exit (0);
--    }
--    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
--	printf ("i386-sequent-ptx1\n"); exit (0);
--    }
--    printf ("i386-sequent-ptx\n"); exit (0);
--
--#endif
--
--#if defined (vax)
--# if !defined (ultrix)
--#  include <sys/param.h>
--#  if defined (BSD)
--#   if BSD == 43
--      printf ("vax-dec-bsd4.3\n"); exit (0);
--#   else
--#    if BSD == 199006
--      printf ("vax-dec-bsd4.3reno\n"); exit (0);
--#    else
--      printf ("vax-dec-bsd\n"); exit (0);
--#    endif
--#   endif
--#  else
--    printf ("vax-dec-bsd\n"); exit (0);
--#  endif
--# else
--    printf ("vax-dec-ultrix\n"); exit (0);
--# endif
--#endif
--
--#if defined (alliant) && defined (i860)
--  printf ("i860-alliant-bsd\n"); exit (0);
--#endif
--
--  exit (1);
--}
--EOF
--
++  printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
+ 
+ #if defined (hp300) && !defined (hpux)
+@@ -1283,12 +1420,12 @@
+ }
+ EOF
+ 
 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
 -rm -f $dummy.c $dummy && rmdir $tmpdir
--
--# Apollos put the system type in the environment.
--
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
+ 
+ # Apollos put the system type in the environment.
+ 
 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
--
--# Convex versions that predate uname can use getsysinfo(1)
--
--if [ -x /usr/convex/getsysinfo ]
--then
--    case `getsysinfo -f cpu_type` in
--    c1*)
--	echo c1-convex-bsd
--	exit 0 ;;
--    c2*)
--	if getsysinfo -f scalar_acc
--	then echo c32-convex-bsd
--	else echo c2-convex-bsd
--	fi
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+@@ -1297,22 +1434,22 @@
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
 -	exit 0 ;;
--    c34*)
--	echo c34-convex-bsd
++	exit ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
 -	exit 0 ;;
--    c38*)
--	echo c38-convex-bsd
++	exit ;;
+     c34*)
+ 	echo c34-convex-bsd
 -	exit 0 ;;
--    c4*)
--	echo c4-convex-bsd
++	exit ;;
+     c38*)
+ 	echo c38-convex-bsd
 -	exit 0 ;;
--    esac
--fi
--
- cat >&2 <<EOF
- $0: unable to guess system type
++	exit ;;
+     c4*)
+ 	echo c4-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     esac
+ fi
  
-@@ -1323,7 +1378,9 @@
+@@ -1323,7 +1460,9 @@
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -1923,56 +1606,38 @@
  send the following data and any information you think might be
 --- a/gettext-tools/examples/hello-c++-kde/admin/config.sub
 +++ b/gettext-tools/examples/hello-c++-kde/admin/config.sub
-@@ -1,42 +1,40 @@
+@@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   Copyright 1992-2014 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
++#   Free Software Foundation, Inc.
  
 -timestamp='2002-09-05'
-+timestamp='2014-09-26'
++timestamp='2010-05-21'
  
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine.  It does not imply ALL GNU software can.
--#
--# 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
--# the Free Software Foundation; either version 2 of the License, or
-+# 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
-+# 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.
-+# 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.
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,22 +22,26 @@
  #
  # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
+ # along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place - Suite 330,
 -# Boston, MA 02111-1307, USA.
 -
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
 +#
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# the same distribution terms that you use for the rest of that
-+# program.  This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
+ # the same distribution terms that you use for the rest of that program.
  
--# Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
 +
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
@@ -1985,17 +1650,19 @@
  # This file is supposed to be the same for all GNU packages
  # and recognize all the CPU types, system types and aliases
  # that are meaningful with *any* GNU software.
-@@ -70,8 +68,7 @@
+@@ -70,8 +75,9 @@
  version="\
  GNU config.sub ($timestamp)
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
-+Copyright 1992-2014 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
-@@ -83,11 +80,11 @@
+@@ -83,11 +89,11 @@
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
@@ -2010,7 +1677,7 @@
      -- )     # Stop option processing
         shift; break ;;
      - )	# Use stdin as input.
-@@ -99,7 +96,7 @@
+@@ -99,7 +105,7 @@
      *local*)
         # First pass through any local machine types.
         echo $1
@@ -2019,52 +1686,35 @@
  
      * )
         break ;;
-@@ -118,10 +115,18 @@
+@@ -118,7 +124,11 @@
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
 -  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
 +  knetbsd*-gnu* | netbsd*-gnu* | \
 +  kopensolaris*-gnu* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
-+  android-linux)
-+    os=-linux-android
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-+    ;;
-   *)
-     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-     if [ $basic_machine != $1 ]
-@@ -144,10 +149,13 @@
+@@ -144,10 +154,13 @@
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
 -	-apple | -axis)
-+	-apple | -axis | -knuth | -cray | -microblaze*)
++	-apple | -axis | -knuth | -cray | -microblaze)
  		os=
  		basic_machine=$1
  		;;
-+	-bluegene*)
-+		os=-cnk
++        -bluegene*)
++	        os=-cnk
 +		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -162,13 +170,17 @@
- 		os=-chorusos
- 		basic_machine=$1
- 		;;
-- 	-chorusrdb)
-- 		os=-chorusrdb
-+	-chorusrdb)
-+		os=-chorusrdb
- 		basic_machine=$1
-- 		;;
-+		;;
+@@ -169,6 +182,10 @@
  	-hiux*)
  		os=-hiuxwe2
  		;;
@@ -2075,7 +1725,7 @@
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -185,6 +197,10 @@
+@@ -185,6 +202,10 @@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -2086,50 +1736,27 @@
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -202,6 +218,12 @@
- 	-isc*)
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-lynx*178)
-+		os=-lynxos178
-+		;;
-+	-lynx*5)
-+		os=-lynxos5
-+		;;
- 	-lynx*)
- 		os=-lynxos
- 		;;
-@@ -226,53 +248,112 @@
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
+@@ -228,51 +249,80 @@
  	| a29k \
-+	| aarch64 | aarch64_be \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 -	| clipper \
 +	| am33_2.0 \
-+	| arc | arceb \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| avr | avr32 \
-+	| be32 | be64 \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 +	| bfin \
-+	| c4x | c8051 | clipper \
++	| c4x | clipper \
  	| d10v | d30v | dlx | dsp16xx \
 -	| fr30 | frv \
-+	| epiphany \
 +	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| hexagon \
  	| i370 | i860 | i960 | ia64 \
 -	| ip2k \
 -	| m32r | m68000 | m68k | m88k | mcore \
 +	| ip2k | iq2000 \
-+	| k1om \
-+	| le32 | le64 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
++	| maxq | mb | microblaze | mcore | mep | metag \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
@@ -2144,52 +1771,44 @@
 +	| mips64vr5900 | mips64vr5900el \
  	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa32r6 | mipsisa32r6el \
  	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64r6 | mipsisa64r6el \
  	| mipsisa64sb1 | mipsisa64sb1el \
  	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipsr5900 | mipsr5900el \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
 +	| moxie \
 +	| mt \
 +	| msp430 \
-+	| nds32 | nds32le | nds32be \
-+	| nios | nios2 | nios2eb | nios2el \
++	| nios | nios2 \
  	| ns16k | ns32k \
 -	| openrisc | or32 \
-+	| open8 | or1k | or1knd | or32 \
++	| or32 \
  	| pdp10 | pdp11 | pj | pjl \
--	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
 -	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| riscv32 | riscv64 \
-+	| rl78 | rx \
++	| rx \
 +	| score \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
 -	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 -	| strongarm \
 -	| tahoe | thumb | tic80 | tron \
--	| v850 | v850e \
 +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu \
-+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++	| spu | strongarm \
++	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
-+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ 	| v850 | v850e \
  	| we32k \
 -	| x86 | xscale | xstormy16 | xtensa \
 -	| z8k)
-+	| x86 | xc16x | xstormy16 | xtensa \
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 +	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
 -	m6811 | m68hc11 | m6812 | m68hc12)
--		# Motorola 68HC11/12.
 +	c54x)
 +		basic_machine=tic54x-unknown
 +		;;
@@ -2199,10 +1818,8 @@
 +	c6x)
 +		basic_machine=tic6x-unknown
 +		;;
-+	leon|leon[3-9])
-+		basic_machine=sparc-$basic_machine
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
++	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ 		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
@@ -2211,62 +1828,36 @@
 +	ms1)
 +		basic_machine=mt-unknown
 +		;;
-+
-+	strongarm | thumb | xscale)
-+		basic_machine=arm-unknown
-+		;;
-+	xgate)
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	xscaleeb)
-+		basic_machine=armeb-unknown
-+		;;
-+
-+	xscaleel)
-+		basic_machine=armel-unknown
-+		;;
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -288,54 +369,86 @@
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
-+	| aarch64-* | aarch64_be-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+@@ -292,50 +342,69 @@
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
--	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 -	| avr-* \
 -	| bs2000-* \
 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
 -	| clipper-* | cydra-* \
 +	| avr-* | avr32-* \
-+	| be32-* | be64-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-+	| c8051-* | clipper-* | craynv-* | cydra-* \
++	| clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
 -	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| hexagon-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
 -	| ip2k-* \
 -	| m32r-* \
 +	| ip2k-* | iq2000-* \
-+	| k1om-* \
-+	| le32-* | le64-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 -	| m88110-* | m88k-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| microblaze-* | microblazeel-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
@@ -2281,51 +1872,42 @@
 +	| mips64vr5900-* | mips64vr5900el-* \
  	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa32r6-* | mipsisa32r6el-* \
  	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64r6-* | mipsisa64r6el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 -	| mipstx39 | mipstx39el \
-+	| mipsr5900-* | mipsr5900el-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
 +	| mt-* \
 +	| msp430-* \
-+	| nds32-* | nds32le-* | nds32be-* \
-+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
++	| nios-* | nios2-* \
  	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| open8-* \
-+	| or1k*-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
 -	| romp-* | rs6000-* \
 -	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+	| rl78-* | romp-* | rs6000-* | rx-* \
++	| romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 -	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 -	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 -	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
--	| v850-* | v850e-* | vax-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+	| tahoe-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tile*-* \
++	| tile-* | tilegx-* \
 +	| tron-* \
 +	| ubicom32-* \
-+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+	| vax-* \
+ 	| v850-* | v850e-* | vax-* \
  	| we32k-* \
 -	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
 -	| xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 +	| xstormy16-* | xtensa*-* \
  	| ymp-* \
 -	| z8k-*)
@@ -2337,17 +1919,17 @@
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -353,6 +466,9 @@
+@@ -353,6 +422,9 @@
  		basic_machine=a29k-amd
  		os=-udi
  		;;
-+	abacus)
++    	abacus)
 +		basic_machine=abacus-unknown
 +		;;
  	adobe68k)
  		basic_machine=m68010-adobe
  		os=-scout
-@@ -367,6 +483,12 @@
+@@ -367,6 +439,12 @@
  		basic_machine=a29k-none
  		os=-bsd
  		;;
@@ -2360,7 +1942,7 @@
  	amdahl)
  		basic_machine=580-amdahl
  		os=-sysv
-@@ -390,6 +512,10 @@
+@@ -390,6 +468,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -2371,7 +1953,7 @@
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -398,10 +524,35 @@
+@@ -398,10 +480,35 @@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -2400,14 +1982,14 @@
  		basic_machine=c90-cray
  		os=-unicos
  		;;
-+	cegcc)
++        cegcc)
 +		basic_machine=arm-unknown
 +		os=-cegcc
 +		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -426,12 +577,27 @@
+@@ -426,12 +533,27 @@
  		basic_machine=j90-cray
  		os=-unicos
  		;;
@@ -2415,7 +1997,7 @@
 +		basic_machine=craynv-cray
 +		os=-unicosmp
 +		;;
-+	cr16 | cr16-*)
++	cr16)
 +		basic_machine=cr16-unknown
 +		os=-elf
 +		;;
@@ -2435,7 +2017,7 @@
  	da30 | da30-*)
  		basic_machine=m68k-da30
  		;;
-@@ -454,6 +620,14 @@
+@@ -454,6 +576,14 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -2450,21 +2032,10 @@
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
  		os=-bosx
-@@ -565,7 +739,6 @@
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
- 		;;
--# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
- 	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
-@@ -604,6 +777,17 @@
+@@ -604,6 +734,14 @@
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
-+	leon-*|leon[3-9]-*)
-+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-+		;;
 +	m68knommu)
 +		basic_machine=m68k-unknown
 +		os=-linux
@@ -2476,20 +2047,15 @@
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -615,10 +799,21 @@
+@@ -615,10 +753,17 @@
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
-+	microblaze*)
++        microblaze)
 +		basic_machine=microblaze-xilinx
 +		;;
-+	mingw64)
-+		basic_machine=x86_64-pc
-+		os=-mingw64
-+		;;
  	mingw32)
--		basic_machine=i386-pc
-+		basic_machine=i686-pc
+ 		basic_machine=i386-pc
  		os=-mingw32
  		;;
 +	mingw32ce)
@@ -2499,7 +2065,7 @@
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -632,10 +827,6 @@
+@@ -632,10 +777,6 @@
  	mips3*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
@@ -2510,50 +2076,17 @@
  	monitor)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -644,14 +835,29 @@
- 		basic_machine=powerpc-unknown
- 		os=-morphos
- 		;;
-+	moxiebox)
-+		basic_machine=moxie-unknown
-+		os=-moxiebox
-+		;;
- 	msdos)
+@@ -648,6 +789,9 @@
  		basic_machine=i386-pc
  		os=-msdos
  		;;
 +	ms1-*)
 +		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 +		;;
-+	msys)
-+		basic_machine=i686-pc
-+		os=-msys
-+		;;
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
- 		;;
-+	nacl)
-+		basic_machine=le32-unknown
-+		os=-nacl
-+		;;
- 	ncr3000)
- 		basic_machine=i486-ncr
- 		os=-sysv4
-@@ -716,6 +922,12 @@
- 	np1)
- 		basic_machine=np1-gould
- 		;;
-+	neo-tandem)
-+		basic_machine=neo-tandem
-+		;;
-+	nse-tandem)
-+		basic_machine=nse-tandem
-+		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -723,9 +935,12 @@
+@@ -723,9 +867,12 @@
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
@@ -2568,7 +2101,7 @@
  		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
-@@ -743,6 +958,14 @@
+@@ -743,6 +890,14 @@
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -2583,7 +2116,7 @@
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -752,32 +975,45 @@
+@@ -752,24 +907,36 @@
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -2622,33 +2155,18 @@
  	pn)
  		basic_machine=pn-gould
  		;;
- 	power)	basic_machine=power-ibm
- 		;;
--	ppc)	basic_machine=powerpc-unknown
-+	ppc | ppcbe)	basic_machine=powerpc-unknown
- 		;;
--	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc-* | ppcbe-*)
-+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
-@@ -802,6 +1038,14 @@
+@@ -802,6 +969,10 @@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
-+	rdos | rdos64)
-+		basic_machine=x86_64-pc
-+		os=-rdos
-+		;;
-+	rdos32)
++	rdos)
 +		basic_machine=i386-pc
 +		os=-rdos
 +		;;
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -828,6 +1072,14 @@
+@@ -828,6 +999,14 @@
  	sb1el)
  		basic_machine=mipsisa64sb1el-unknown
  		;;
@@ -2663,7 +2181,7 @@
  	sequent)
  		basic_machine=i386-sequent
  		;;
-@@ -835,6 +1087,12 @@
+@@ -835,6 +1014,12 @@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -2676,17 +2194,7 @@
  	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
-@@ -853,6 +1111,9 @@
- 		basic_machine=i860-stratus
- 		os=-sysv4
- 		;;
-+	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -901,10 +1162,6 @@
+@@ -901,10 +1086,6 @@
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
@@ -2697,7 +2205,7 @@
  	t3e)
  		basic_machine=alphaev5-cray
  		os=-unicos
-@@ -913,13 +1170,9 @@
+@@ -913,13 +1094,14 @@
  		basic_machine=t90-cray
  		os=-unicos
  		;;
@@ -2708,13 +2216,18 @@
 -	tic54x | c54x*)
 -		basic_machine=tic54x-unknown
 -		os=-coff
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
 +	tile*)
-+		basic_machine=$basic_machine-unknown
++		basic_machine=tile-unknown
 +		os=-linux-gnu
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
-@@ -934,6 +1187,10 @@
+@@ -934,6 +1116,10 @@
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
@@ -2725,7 +2238,7 @@
  	udi29k)
  		basic_machine=a29k-amd
  		os=-udi
-@@ -977,13 +1234,16 @@
+@@ -977,9 +1163,9 @@
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
@@ -2738,14 +2251,7 @@
  		;;
  	xps | xps100)
  		basic_machine=xps100-honeywell
- 		;;
-+	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+		;;
- 	ymp)
- 		basic_machine=ymp-cray
- 		os=-unicos
-@@ -992,6 +1252,10 @@
+@@ -992,6 +1178,10 @@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -2756,7 +2262,7 @@
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1011,6 +1275,9 @@
+@@ -1011,6 +1201,9 @@
  	romp)
  		basic_machine=romp-ibm
  		;;
@@ -2766,7 +2272,7 @@
  	rs6000)
  		basic_machine=rs6000-ibm
  		;;
-@@ -1027,13 +1294,10 @@
+@@ -1027,13 +1220,10 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -2782,22 +2288,17 @@
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1077,9 +1341,12 @@
- if [ x"$os" != x"" ]
- then
- case $os in
--        # First match some system type aliases
--        # that might get confused with valid system types.
-+	# First match some system type aliases
-+	# that might get confused with valid system types.
+@@ -1080,6 +1270,9 @@
+         # First match some system type aliases
+         # that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
-+	-auroraux)
-+		os=-auroraux
++        -auroraux)
++	        os=-auroraux
 +		;;
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1100,24 +1367,31 @@
+@@ -1100,24 +1293,31 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -2805,7 +2306,7 @@
 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* | -plan9* \
++	      | -sym* | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 -	      | -aos* \
 +	      | -aos* | -aros* \
@@ -2814,20 +2315,19 @@
 -	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 -	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -bitrig* | -openbsd* | -solidbsd* \
++	      | -openbsd* | -solidbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 -	      | -chorusos* | -chorusrdb* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 -	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
++	      | -mingw32* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -2835,11 +2335,11 @@
 -	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1129,16 +1403,21 @@
+@@ -1129,16 +1329,21 @@
  			;;
  		esac
  		;;
@@ -2863,17 +2363,17 @@
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
-@@ -1151,6 +1430,9 @@
+@@ -1151,6 +1356,9 @@
  	-opened*)
  		os=-openedition
  		;;
-+	-os400*)
++        -os400*)
 +		os=-os400
 +		;;
  	-wince*)
  		os=-wince
  		;;
-@@ -1172,6 +1454,9 @@
+@@ -1172,6 +1380,9 @@
  	-atheos*)
  		os=-atheos
  		;;
@@ -2883,59 +2383,56 @@
  	-386bsd)
  		os=-bsd
  		;;
-@@ -1194,6 +1479,9 @@
+@@ -1194,6 +1405,9 @@
  	-sinix*)
  		os=-sysv4
  		;;
-+	-tpf*)
++        -tpf*)
 +		os=-tpf
 +		;;
  	-triton*)
  		os=-sysv3
  		;;
-@@ -1224,6 +1512,17 @@
+@@ -1224,6 +1438,20 @@
  	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  		os=-mint
  		;;
 +	-aros*)
 +		os=-aros
 +		;;
++	-kaos*)
++		os=-kaos
++		;;
 +	-zvmoe)
 +		os=-zvmoe
 +		;;
 +	-dicos*)
 +		os=-dicos
 +		;;
-+	-nacl*)
-+		;;
++        -nacl*)
++	        ;;
  	-none)
  		;;
  	*)
-@@ -1246,6 +1545,12 @@
+@@ -1246,6 +1474,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
-+	score-*)
++        score-*)
 +		os=-elf
 +		;;
-+	spu-*)
++        spu-*)
 +		os=-elf
 +		;;
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1255,6 +1560,24 @@
+@@ -1255,6 +1489,18 @@
  	arm*-semi)
  		os=-aout
  		;;
-+	c4x-* | tic4x-*)
-+		os=-coff
-+		;;
-+	c8051-*)
-+		os=-elf
-+		;;
-+	hexagon-*)
-+		os=-elf
++        c4x-* | tic4x-*)
++        	os=-coff
 +		;;
 +	tic54x-*)
 +		os=-coff
@@ -2949,24 +2446,17 @@
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-@@ -1273,13 +1596,13 @@
- 		;;
- 	m68000-sun)
- 		os=-sunos3
--		# This also exists in the configure program, but was not the
--		# default.
--		# os=-sunos4
- 		;;
+@@ -1280,6 +1526,9 @@
  	m68*-cisco)
  		os=-aout
  		;;
-+	mep-*)
++        mep-*)
 +		os=-elf
 +		;;
  	mips*-cisco)
  		os=-elf
  		;;
-@@ -1298,9 +1621,15 @@
+@@ -1298,9 +1547,15 @@
  	*-be)
  		os=-beos
  		;;
@@ -2976,13 +2466,13 @@
  	*-ibm)
  		os=-aix
  		;;
-+	*-knuth)
++    	*-knuth)
 +		os=-mmixware
 +		;;
  	*-wec)
  		os=-proelf
  		;;
-@@ -1403,7 +1732,7 @@
+@@ -1403,7 +1658,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -2991,7 +2481,7 @@
  				vendor=ibm
  				;;
  			-beos*)
-@@ -1433,9 +1762,15 @@
+@@ -1433,9 +1688,15 @@
  			-mvs* | -opened*)
  				vendor=ibm
  				;;
@@ -3007,7 +2497,7 @@
  			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs
  				;;
-@@ -1460,7 +1795,7 @@
+@@ -1460,7 +1721,7 @@
  esac
  
  echo $basic_machine$os
diff -Nru gettext-0.19.3/debian/patches/series gettext-0.18.1.1/debian/patches/series
--- gettext-0.19.3/debian/patches/series	2014-11-30 11:10:00.000000000 +0000
+++ gettext-0.18.1.1/debian/patches/series	2010-08-01 21:50:09.000000000 +0000
@@ -1,7 +1,2 @@
 01-do-not-use-java-in-urlget
-02-msgfmt-default-little-endian
-03-libtool-powerpc-le
-04-xgettext-fix-double-free
-05-msgunfmt-fix-segfault
-06-msgfilter-fix-read-buffer-allocation
 99-config-guess-config-sub
diff -Nru gettext-0.19.3/debian/README.Debian gettext-0.18.1.1/debian/README.Debian
--- gettext-0.19.3/debian/README.Debian	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/debian/README.Debian	2010-08-01 21:50:09.000000000 +0000
@@ -0,0 +1,11 @@
+Notes about the Debian gettext package
+======================================
+
+The autopoint script and related stuff is now in a separate package
+called "autopoint".
+
+Packages using autopoint in their build process should now build-depend
+on autopoint.
+
+
+Santiago Vila <sanvila@debian.org>
diff -Nru gettext-0.19.3/debian/rules gettext-0.18.1.1/debian/rules
--- gettext-0.19.3/debian/rules	2014-10-23 13:35:00.000000000 +0000
+++ gettext-0.18.1.1/debian/rules	2010-08-01 21:50:09.000000000 +0000
@@ -2,19 +2,17 @@
 
 package = gettext
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=-format
-
 CC = gcc
-CFLAGS := `dpkg-buildflags --get CFLAGS` -Wall
-CXXFLAGS := `dpkg-buildflags --get CXXFLAGS` -Wall
-LDFLAGS := `dpkg-buildflags --get LDFLAGS`
-CPPFLAGS := `dpkg-buildflags --get CPPFLAGS`
+CFLAGS = -g -Wall -D_REENTRANT
 INSTALL_PROGRAM = install
 INSTALL_SCRIPT = install
 
 STRIP = true
 ATRIP = true
 
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O2
+endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
  INSTALL_PROGRAM += -s
  STRIP=strip --strip-unneeded --remove-section=.comment --remove-section=.note
@@ -22,9 +20,6 @@
 endif
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-export AM_UPDATE_INFO_DIR = no
 
 # PNET_ARCHS = %alpha%amd64%hppa%i386%ia64%mips%mipsel%powerpc%s390%sparc%
 # ifneq (,$(findstring %$(DEB_HOST_ARCH)%,$(PNET_ARCHS)))
@@ -36,23 +31,17 @@
 #   CSHARP = --enable-csharp=mono
 # endif
 
+CSHARP = --disable-csharp
+
 NOJAVA_ARCHS = %none%
 
 build:
 	cd debian && $(CC) glibc-test.c
 	debian/a.out
-	sh debian/mk-touch || true
-	touch -d "2014-08-27 02:44:02 UTC" m4/libtool.m4
-	touch -d "2014-10-16 06:01:24 UTC" gettext-runtime/configure
-	touch -d "2014-10-16 06:01:19 UTC" gettext-runtime/libasprintf/configure
-	touch -d "2014-10-16 06:01:34 UTC" gettext-tools/configure
-	touch -d "2014-06-10 06:30:01 UTC" gettext-tools/src/msgfmt.c
-	./configure --prefix=/usr --enable-threads $(CSHARP) \
-		--disable-native-java CC="$(CC)" CFLAGS="$(CFLAGS)" \
+	./configure --prefix=/usr $(CSHARP) \
+		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		JAVAC=/usr/lib/jvm/default-java/bin/javac \
-		CPPFLAGS="$(CPPFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS)" \
-		LDFLAGS="$(LDFLAGS)"
+		CPPFLAGS=-I/usr/include/libxml2
 	$(MAKE)
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp \
 		INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
@@ -65,15 +54,11 @@
 	rm -f `find . -name "*~"`
 	rm -rf debian/tmp debian/files* core debian/substvars debian/a.out
 	cd debian && rm -rf gettext-base gettext gettext-el gettext-doc \
-		autopoint libgettextpo0 libasprintf0c2 libgettextpo-dev libasprintf-dev
+		autopoint
 
 binary-arch: build
 	debian/rules gettext-base
 	debian/rules gettext
-	debian/rules libgettextpo0
-	debian/rules libasprintf0c2
-	debian/rules libgettextpo-dev
-	debian/rules libasprintf-dev
 
 binary-indep: build
 	debian/rules gettext-el
@@ -104,32 +89,33 @@
 	if [ -f debian/tmp/usr/lib/GNU.Gettext.dll ]; then \
 		cp -p debian/tmp/usr/lib/GNU.Gettext.dll debian/$@/usr/lib; \
 	fi
+	cp -a debian/tmp/usr/lib/libasprintf.so.0* debian/$@/usr/lib
+	cd debian/$@/usr/lib && chmod 644 libasprintf.so.*
+	$(STRIP) debian/$@/usr/lib/libasprintf.so.*
 	find debian/$@/usr/share/locale | grep gettext-tools | xargs rm
 ifeq (,$(findstring %$(DEB_HOST_ARCH)%,$(NOJAVA_ARCHS)))
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	install -d debian/$@/usr/share/java
 	cp -p debian/tmp/usr/share/gettext/libintl.jar \
 		debian/$@/usr/share/java
 endif
-endif
 	cp -p gettext-tools/ABOUT-NLS debian/$@/usr/share/doc/$@
 	cp -p debian/copyright debian/$@/usr/share/doc/$@
+	install -m 644 debian/$@.shlibs debian/$@/DEBIAN/shlibs
+	install -m 755 debian/$@.postinst debian/$@/DEBIAN/postinst
 	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
 	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
-	gzip -r9n debian/$@/usr/share/man
+	cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian
+	gzip -r9 debian/$@/usr/share/man
 	ln -s gettext.3.gz debian/$@/usr/share/man/man3/dcgettext.3.gz
 	ln -s gettext.3.gz debian/$@/usr/share/man/man3/dgettext.3.gz
 	ln -s ngettext.3.gz debian/$@/usr/share/man/man3/dcngettext.3.gz
 	ln -s ngettext.3.gz debian/$@/usr/share/man/man3/dngettext.3.gz
-	$(STRIP) `sh debian/elf debian/$@/usr/bin/*`
-	dpkg-shlibdeps `sh debian/elf debian/$@/usr/bin/* debian/$@/usr/lib/*`
+	sh debian/my-shlibdeps debian/$@/usr/bin/* debian/$@/usr/lib/*
 	dpkg-gencontrol -p$@ -Pdebian/$@
 	cd debian/$@ && \
 		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
 	find debian/$@/usr/share/locale -type d -empty | xargs -r rmdir
 	find debian/$@/usr/share/locale -type d -empty | xargs -r rmdir
-	find debian/$@/usr/lib -type d -empty | xargs -r rmdir
 	chown -R 0:0 debian/$@
 	chmod -R u+w,go=rX debian/$@
 	dpkg --build debian/$@ ..
@@ -139,47 +125,47 @@
 	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
 	cd debian/$@ && install -d usr/share/man usr/share/java \
 		usr/share/lintian/overrides
+	cd debian && install -m 644 $@.shlibs $@/DEBIAN/shlibs
 	cd debian && install -m 755 postinst $@/DEBIAN
 	cp -p debian/$@.lintian-overrides \
 		debian/$@/usr/share/lintian/overrides/$@
 	cp -p gettext-runtime/BUGS gettext-tools/misc/DISCLAIM NEWS README \
 		debian/copyright debian/$@/usr/share/doc/$@
+	cp -p debian/README.Debian debian/$@/usr/share/doc/$@
 	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
 	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
 	cd debian/$@/usr/share/doc/$@ && ln -s ../../$(package)/ABOUT-NLS
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
+	cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian
 	cp -a debian/tmp/usr/bin debian/$@/usr
 	cp -a debian/tmp/usr/lib debian/$@/usr
+	cp -a debian/tmp/usr/include debian/$@/usr
 	cp -a debian/tmp/usr/share/info debian/$@/usr/share
 	cp -a debian/tmp/usr/share/aclocal debian/$@/usr/share
 	cp -a debian/tmp/usr/share/gettext debian/$@/usr/share
+	rm -f debian/$@/usr/lib/gettext/gnu.gettext*
 	rm -f debian/$@/usr/share/gettext/libintl.jar
-ifeq (,$(findstring %$(DEB_HOST_ARCH)%,$(NOJAVA_ARCHS)))
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
-	mv debian/$@/usr/share/gettext/gettext.jar debian/$@/usr/share/java
-endif
-endif
 	rm -f debian/$@/usr/lib/GNU.Gettext.dll
 	cp -a debian/tmp/usr/share/man/man1 debian/$@/usr/share/man
 	cp -a debian/tmp/usr/share/locale debian/$@/usr/share
 	find debian/$@/usr/share/locale | grep gettext-runtime | xargs rm
 	cd debian/$@/usr/bin && rm -f gettext ngettext envsubst gettext.sh
-	cd debian/$@/usr/lib && rm -f libasprintf* libgettextpo* *.la
+	cd debian/$@/usr/lib && rm -f libasprintf.so.* *.la
 	cd debian/$@/usr/share/man/man1 && \
 		rm -f gettext.1 ngettext.1 envsubst.1
-	cd debian/$@/usr/lib && chmod 644 libgettextlib* libgettextsrc*
+	cd debian/$@/usr/lib && chmod 644 libgettextlib* libgettextsrc* \
+		libgettextpo*
 	$(STRIP) debian/$@/usr/lib/preloadable_libintl.so
 	$(STRIP) debian/$@/usr/lib/libgettextlib*.so
 	$(STRIP) debian/$@/usr/lib/libgettextsrc*.so
+	$(STRIP) debian/$@/usr/lib/libgettextpo.so.*
+	$(ATRIP) debian/$@/usr/lib/libasprintf.a
+	$(ATRIP) debian/$@/usr/lib/libgettextpo.a
 	rm -f debian/$@/usr/bin/autopoint
 	rm -f debian/$@/usr/share/man/man1/autopoint.1
-	rm -f debian/$@/usr/share/gettext/archive.dir.tar.xz
-	rm -f debian/$@/usr/lib/libgettextlib.so
-	rm -f debian/$@/usr/lib/libgettextsrc.so
-	gzip -9n debian/$@/usr/share/info/*
-	gzip -r9n debian/$@/usr/share/man
-	$(STRIP) `sh debian/elf debian/$@/usr/bin/* debian/$@/usr/lib/gettext/*`
-	dpkg-shlibdeps `sh debian/elf debian/$@/usr/bin/* debian/$@/usr/lib/gettext/* debian/$@/usr/lib/*`
+	rm -f debian/$@/usr/share/gettext/archive.git.tar.gz
+	gzip -9 debian/$@/usr/share/info/*
+	gzip -r9 debian/$@/usr/share/man
+	sh debian/my-shlibdeps debian/$@/usr/bin/* debian/$@/usr/lib/gettext/*
 	dpkg-gencontrol -p$@ -Pdebian/$@
 	cd debian/$@ && \
 		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
@@ -189,88 +175,6 @@
 	chmod -R u+w,go=rX debian/$@
 	dpkg --build debian/$@ ..
 
-libgettextpo0: build
-	rm -rf debian/$@
-	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
-	cd debian/$@ && install -d usr/lib/$(DEB_HOST_MULTIARCH)
-	cd debian && install -m 644 $@.shlibs $@/DEBIAN/shlibs
-	install -m 755 debian/$@.postinst debian/$@/DEBIAN/postinst
-	cp -p debian/copyright debian/$@/usr/share/doc/$@
-	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
-	cp -a debian/tmp/usr/lib/libgettextpo.so.* debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	cd debian/$@/usr/lib/$(DEB_HOST_MULTIARCH) && chmod 644 libgettextpo*
-	$(STRIP) debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)/libgettextpo.so.*
-	dpkg-shlibdeps `sh debian/elf debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)/*`
-	dpkg-gencontrol -p$@ -Pdebian/$@
-	cd debian/$@ && \
-		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
-	chown -R 0:0 debian/$@
-	chmod -R u+w,go=rX debian/$@
-	dpkg --build debian/$@ ..
-
-libasprintf0c2: build
-	rm -rf debian/$@
-	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
-	cd debian/$@ && install -d usr/lib/$(DEB_HOST_MULTIARCH)
-	cd debian && install -m 644 $@.shlibs $@/DEBIAN/shlibs
-	install -m 755 debian/$@.postinst debian/$@/DEBIAN/postinst
-	cp -p debian/copyright debian/$@/usr/share/doc/$@
-	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
-	cp -a debian/tmp/usr/lib/libasprintf.so.* debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	cd debian/$@/usr/lib/$(DEB_HOST_MULTIARCH) && chmod 644 libasprintf*
-	$(STRIP) debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)/libasprintf.so.*
-	dpkg-shlibdeps `sh debian/elf debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)/*`
-	dpkg-gencontrol -p$@ -Pdebian/$@
-	cd debian/$@ && \
-		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
-	chown -R 0:0 debian/$@
-	chmod -R u+w,go=rX debian/$@
-	dpkg --build debian/$@ ..
-
-libgettextpo-dev: build
-	rm -rf debian/$@
-	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
-	cp -p debian/copyright debian/$@/usr/share/doc/$@
-	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
-	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
-	install -d debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	cp -a debian/tmp/usr/lib/libgettextpo.a debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	cp -a debian/tmp/usr/lib/libgettextpo.so debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	install -d debian/$@/usr/include
-	cp -a debian/tmp/usr/include/gettext-po.h debian/$@/usr/include
-	$(ATRIP) debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)/libgettextpo.a
-	dpkg-gencontrol -p$@ -Pdebian/$@
-	cd debian/$@ && \
-		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
-	chown -R 0:0 debian/$@
-	chmod -R u+w,go=rX debian/$@
-	dpkg --build debian/$@ ..
-
-libasprintf-dev: build
-	rm -rf debian/$@
-	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
-	cp -p debian/copyright debian/$@/usr/share/doc/$@
-	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
-	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
-	install -d debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	cp -a debian/tmp/usr/lib/libasprintf.a debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	cp -a debian/tmp/usr/lib/libasprintf.so debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)
-	install -d debian/$@/usr/include
-	cp -a debian/tmp/usr/include/autosprintf.h debian/$@/usr/include
-	$(ATRIP) debian/$@/usr/lib/$(DEB_HOST_MULTIARCH)/libasprintf.a
-	dpkg-gencontrol -p$@ -Pdebian/$@
-	cd debian/$@ && \
-		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
-	chown -R 0:0 debian/$@
-	chmod -R u+w,go=rX debian/$@
-	dpkg --build debian/$@ ..
-
 gettext-el: build
 	rm -rf debian/$@
 	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
@@ -294,7 +198,7 @@
 	cp -p debian/copyright debian/$@/usr/share/doc/$@
 	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
 	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
+	cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian
 	dpkg-gencontrol -p$@ -Pdebian/$@
 	cd debian/$@ && \
 		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
@@ -314,7 +218,7 @@
 	cp -p debian/copyright debian/$@/usr/share/doc/$@
 	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
 	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
+	cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian
 	dpkg-gencontrol -p$@ -Pdebian/$@
 	cd debian/$@ && \
 		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
@@ -327,15 +231,15 @@
 	install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@
 	cd debian/$@ && install -d usr/bin usr/share/gettext usr/share/man/man1
 	cp -p debian/tmp/usr/bin/autopoint debian/$@/usr/bin
-	cp -p debian/tmp/usr/share/gettext/archive.dir.tar.xz \
+	cp -p debian/tmp/usr/share/gettext/archive.git.tar.gz \
 		debian/$@/usr/share/gettext
 	cp -p debian/tmp/usr/share/man/man1/autopoint.1 \
 		debian/$@/usr/share/man/man1
-	gzip -r9n debian/$@/usr/share/man
-	cp -p debian/copyright debian/$@/usr/share/doc/$@
+	gzip -r9 debian/$@/usr/share/man
+	cp -p debian/copyright debian/README.Debian debian/$@/usr/share/doc/$@
 	cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog
 	cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian
-	cd debian/$@/usr/share/doc/$@ && gzip -9n changelog changelog.Debian
+	cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian
 	dpkg-gencontrol -p$@ -Pdebian/$@
 	cd debian/$@ && \
 		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
@@ -345,9 +249,5 @@
 
 binary: binary-indep binary-arch
 
-build-arch: build
-
-build-indep: build
-
-.PHONY: binary binary-arch binary-indep build-arch build-indep clean
-.PHONY: gettext-base gettext gettext-el gettext-doc autopoint libgettextpo0 libasprintf0c2 libgettextpo-dev libasprintf-dev
+.PHONY: binary binary-arch binary-indep clean
+.PHONY: gettext-base gettext gettext-el gettext-doc autopoint
diff -Nru gettext-0.19.3/DEPENDENCIES gettext-0.18.1.1/DEPENDENCIES
--- gettext-0.19.3/DEPENDENCIES	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/DEPENDENCIES	2010-06-06 12:49:57.000000000 +0000
@@ -70,41 +70,6 @@
   + Download:
     http://www.kernel.org/pub/software/scm/git/
 
-* The archiving utility 'tar'.
-  + Recommended.
-    Needed for the 'autopoint' program.
-    Either the platform's native tar, or GNU tar.
-  + Homepage:
-    http://www.gnu.org/software/tar/
-  + Download:
-    http://ftp.gnu.org/gnu/tar/
-    ftp://ftp.gnu.org/gnu/tar/
-
-* The GNU compression utility 'gzip'.
-  + Recommended.
-    Needed for the 'autopoint' program.
-  + Homepage:
-    http://www.gnu.org/software/gzip/
-  + Download:
-    http://ftp.gnu.org/gnu/gzip/
-    ftp://ftp.gnu.org/gnu/gzip/
-
-* The compression utility 'bzip2'.
-  + Recommended.
-    Needed for the 'autopoint' program, if not configured with --without-bzip2.
-  + Homepage:
-    http://www.bzip.org/
-  + Download:
-    http://www.bzip.org/downloads.html
-
-* The compression utility 'xz'.
-  + Recommended.
-    Needed for the 'autopoint' program, if not configured with --without-xz.
-  + Homepage:
-    http://tukaani.org/xz/
-  + Download:
-    http://tukaani.org/xz/
-
 * libxml2
   + Optional.
     Needed for the --color option of the various programs.
@@ -226,3 +191,24 @@
   + Download:
     http://ftp.gnu.org/gnu/grep/
     ftp://ftp.gnu.org/gnu/grep/
+
+* The archiving utility 'tar'.
+  + Optional.
+    Needed for the 'autopoint' program, if not configured with --without-git
+    and --without-cvs.
+    Either the platform's native tar, or GNU tar.
+  + Homepage:
+    http://www.gnu.org/software/tar/
+  + Download:
+    http://ftp.gnu.org/gnu/tar/
+    ftp://ftp.gnu.org/gnu/tar/
+
+* The GNU compression utility 'gzip'.
+  + Optional.
+    Needed for the 'autopoint' program, if not configured with --without-git
+    and --without-cvs.
+  + Homepage:
+    http://www.gnu.org/software/gzip/
+  + Download:
+    http://ftp.gnu.org/gnu/gzip/
+    ftp://ftp.gnu.org/gnu/gzip/
diff -Nru gettext-0.19.3/gettext-runtime/aclocal.m4 gettext-0.18.1.1/gettext-runtime/aclocal.m4
--- gettext-0.19.3/gettext-runtime/aclocal.m4	2014-10-16 06:01:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/aclocal.m4	2010-06-06 20:11:30.000000000 +0000
@@ -1,26 +1,6656 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 52 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+_LT_REQUIRED_DARWIN_CHECKS
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# 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
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+    ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix[[4-9]]*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  :
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	fi
+	;;
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
+      output_verbose_link_cmd='echo'
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+      fi
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  freebsd[[12]]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  interix[[3-9]]*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc*)
+	# Intel C++
+	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      pgCC* | pgcpp*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	    ;;
+	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+	output_verbose_link_cmd='echo'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx*)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
+	fi
+	;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+      program t
+      end
+"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
+
+# 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
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc* | ecpc*)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
 
-# 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.
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
+      ;;
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +6662,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,22 +6681,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -85,7 +6715,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -111,19 +6741,22 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# 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.
 
+# serial 9
+
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -142,14 +6775,16 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# 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.
 
+# serial 10
 
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -159,7 +6794,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -172,13 +6807,12 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -186,9 +6820,8 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -227,16 +6860,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -245,16 +6878,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -302,7 +6935,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -312,39 +6945,34 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# 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.
 
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -357,7 +6985,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -369,19 +6997,21 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -399,7 +7029,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
+# is enabled.  FIXME.  This creates each `.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -407,23 +7037,32 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# 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.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 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.
 
+# serial 16
+
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -436,7 +7075,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -465,40 +7104,31 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -509,78 +7139,34 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
+
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -602,7 +7188,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -621,14 +7207,16 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST([install_sh])])
+AC_SUBST(install_sh)])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  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.
 
+# serial 2
+
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -644,12 +7232,14 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  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.
 
+# serial 4
+
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -667,7 +7257,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -692,14 +7282,52 @@
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
+
+# serial 6
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
 
+# serial 6
+
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -707,10 +7335,11 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
+
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -723,35 +7352,63 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005, 2006  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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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.
 
+# serial 4
+
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -762,82 +7419,24 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 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.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2013 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.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# 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.
 
+# serial 5
+
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -848,40 +7447,32 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
    test "$[2]" = conftest.file
    )
 then
@@ -891,85 +7482,36 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
+AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009  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.
 
+# serial 1
+
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -977,32 +7519,34 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  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.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1010,22 +7554,24 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  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.
 
+# serial 2
+
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1035,128 +7581,87 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
-#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
 m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
 
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
 
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
+  # tar/untar a dummy directory, and stop if the command works
   rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
 
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([gnulib-m4/00gnulib.m4])
-m4_include([gnulib-m4/absolute-header.m4])
 m4_include([gnulib-m4/alloca.m4])
-m4_include([gnulib-m4/ansi-c++.m4])
 m4_include([gnulib-m4/asm-underscore.m4])
 m4_include([gnulib-m4/atexit.m4])
 m4_include([gnulib-m4/canonicalize.m4])
-m4_include([gnulib-m4/configmake.m4])
 m4_include([gnulib-m4/csharp.m4])
 m4_include([gnulib-m4/csharpcomp.m4])
+m4_include([gnulib-m4/dos.m4])
 m4_include([gnulib-m4/double-slash-root.m4])
 m4_include([gnulib-m4/eealloc.m4])
 m4_include([gnulib-m4/environ.m4])
@@ -1164,17 +7669,13 @@
 m4_include([gnulib-m4/error.m4])
 m4_include([gnulib-m4/extensions.m4])
 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/iconv_h.m4])
 m4_include([gnulib-m4/iconv_open.m4])
 m4_include([gnulib-m4/include_next.m4])
-m4_include([gnulib-m4/inline.m4])
-m4_include([gnulib-m4/iswblank.m4])
 m4_include([gnulib-m4/java.m4])
 m4_include([gnulib-m4/javacomp.m4])
-m4_include([gnulib-m4/largefile.m4])
 m4_include([gnulib-m4/lib-ld.m4])
 m4_include([gnulib-m4/lib-link.m4])
 m4_include([gnulib-m4/lib-prefix.m4])
@@ -1183,9 +7684,8 @@
 m4_include([gnulib-m4/locale-fr.m4])
 m4_include([gnulib-m4/locale-ja.m4])
 m4_include([gnulib-m4/locale-zh.m4])
-m4_include([gnulib-m4/locale_h.m4])
-m4_include([gnulib-m4/localename.m4])
 m4_include([gnulib-m4/lstat.m4])
+m4_include([gnulib-m4/malloc.m4])
 m4_include([gnulib-m4/malloca.m4])
 m4_include([gnulib-m4/mbchar.m4])
 m4_include([gnulib-m4/mbiter.m4])
@@ -1196,18 +7696,13 @@
 m4_include([gnulib-m4/memchr.m4])
 m4_include([gnulib-m4/memmove.m4])
 m4_include([gnulib-m4/mmap-anon.m4])
-m4_include([gnulib-m4/msvc-inval.m4])
-m4_include([gnulib-m4/msvc-nothrow.m4])
 m4_include([gnulib-m4/multiarch.m4])
-m4_include([gnulib-m4/nocrash.m4])
-m4_include([gnulib-m4/off_t.m4])
+m4_include([gnulib-m4/onceonly.m4])
 m4_include([gnulib-m4/pathmax.m4])
-m4_include([gnulib-m4/raise.m4])
 m4_include([gnulib-m4/readlink.m4])
 m4_include([gnulib-m4/relocatable-lib.m4])
 m4_include([gnulib-m4/relocatable.m4])
 m4_include([gnulib-m4/setenv.m4])
-m4_include([gnulib-m4/setlocale.m4])
 m4_include([gnulib-m4/signal_h.m4])
 m4_include([gnulib-m4/signalblocking.m4])
 m4_include([gnulib-m4/sigpipe.m4])
@@ -1221,11 +7716,9 @@
 m4_include([gnulib-m4/strerror.m4])
 m4_include([gnulib-m4/string_h.m4])
 m4_include([gnulib-m4/strnlen.m4])
+m4_include([gnulib-m4/strtol.m4])
 m4_include([gnulib-m4/strtoul.m4])
-m4_include([gnulib-m4/sys_socket_h.m4])
 m4_include([gnulib-m4/sys_stat_h.m4])
-m4_include([gnulib-m4/sys_time_h.m4])
-m4_include([gnulib-m4/sys_types_h.m4])
 m4_include([gnulib-m4/time_h.m4])
 m4_include([gnulib-m4/unistd_h.m4])
 m4_include([gnulib-m4/unlocked-io.m4])
@@ -1234,14 +7727,15 @@
 m4_include([gnulib-m4/wctype_h.m4])
 m4_include([gnulib-m4/wcwidth.m4])
 m4_include([../m4/fixautomake.m4])
+m4_include([../m4/init-package-version.m4])
 m4_include([../m4/libtool.m4])
 m4_include([../m4/ltoptions.m4])
 m4_include([../m4/ltsugar.m4])
 m4_include([../m4/ltversion.m4])
 m4_include([../m4/lt~obsolete.m4])
 m4_include([../m4/woe32-dll.m4])
+m4_include([m4/ansi-c++.m4])
 m4_include([m4/codeset.m4])
-m4_include([m4/extern-inline.m4])
 m4_include([m4/fcntl-o.m4])
 m4_include([m4/gettext.m4])
 m4_include([m4/glibc2.m4])
diff -Nru gettext-0.19.3/gettext-runtime/ChangeLog gettext-0.18.1.1/gettext-runtime/ChangeLog
--- gettext-0.19.3/gettext-runtime/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,86 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-02  Daiki Ueno  <ueno@gnu.org>
-
-	* configure.ac: To automatically disable building libasprintf when
-	no C++ is found, check if CXX is "no", not ":".  This seems to be
-	a left over of commit 09963c23.  Reported by Assaf Gordon in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-10/msg00003.html>.
-
-2014-09-30  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* configure.ac: Invoke AM_PROG_CC_C_O so that the system stdbool.h
-	will be used on Solaris.  Suggested by Paul Eggert in:
-	<https://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00053.html>.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	* configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is
-	set.
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	build: Use git-version-gen intead of version.sh
-	* configure.ac: Use git-version-gen in AC_INIT.
-
-2013-07-07  Daiki Ueno  <ueno@gnu.org>
-
-	* NEWS: Mention setlocale() change on Mac OS X.
-
-2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
-
-	* configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
-	Require Automake 1.11.1 or later, so that the 'parallel-tests'
-	will be certainly available.
-	(AC_INIT): Require Autoconf 2.62 or later; that is the minimal
-	version supported by Automake 1.11.1 or later.
-
-2012-12-27  Daiki Ueno  <ueno@gnu.org>
-
-	* configure.ac (WOE32DLL): New conditional.
-	(INTL_EXPORTS_FLAGS): New substituted variable.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-17  Daiki Ueno  <ueno@unixuser.org>
-
-	* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
-	Suggested by Stefano Lattarini <stefano.lattarini@gmail.com>.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g"
-	* Makefile.am (ABOUT-NLS): Likewise. Use --plaintext instead of
-	--no-header.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* COPYING: Update file references.
-
-2010-07-31  Bruno Haible  <bruno@clisp.org>
-
-	Use new ansi-c++.m4 from gnulib.
-	* configure.ac: Invoke gl_PROG_ANSI_CXX instead of gt_PROG_ANSI_CXX.
-	Reported at <https://savannah.gnu.org/bugs/?30607>.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/config.h.in gettext-0.18.1.1/gettext-runtime/config.h.in
--- gettext-0.19.3/gettext-runtime/config.h.in	2014-10-16 06:01:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/config.h.in	2010-06-06 20:11:34.000000000 +0000
@@ -1,5 +1,9 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if the compiler is building for multiple architectures of Apple
+   platforms at once. */
+#undef AA_APPLE_UNIVERSAL_BUILD
+
 /* Define to the number of bits in type 'ptrdiff_t'. */
 #undef BITSIZEOF_PTRDIFF_T
 
@@ -39,45 +43,35 @@
 /* Define to 1 if the package shall run at any location in the file system. */
 #undef ENABLE_RELOCATABLE
 
+/* Define on systems for which file names may have a so-called `drive letter'
+   prefix, define this to compute the length of that prefix, including the
+   colon. */
+#undef FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+
+/* Define if the backslash character may also serve as a file name component
+   separator. */
+#undef FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+
+/* Define if a drive letter prefix denotes a relative path if it is not
+   followed by a file name component separator. */
+#undef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+
 /* Define to 1 if realpath() can malloc memory, always gives an absolute path,
    and handles trailing slash correctly. */
 #undef FUNC_REALPATH_WORKS
 
-/* Define if gettimeofday clobbers the localtime buffer. */
-#undef GETTIMEOFDAY_CLOBBERS_LOCALTIME
-
-/* Define this to 'void' or 'struct timezone' to match the system's
-   declaration of the second argument to gettimeofday. */
-#undef GETTIMEOFDAY_TIMEZONE
-
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module canonicalize-lgpl shall be considered present. */
 #undef GNULIB_CANONICALIZE_LGPL
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module fscanf shall be considered present. */
-#undef GNULIB_FSCANF
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module fwriteerror shall be considered present. */
 #undef GNULIB_FWRITEERROR
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module lock shall be considered present. */
-#undef GNULIB_LOCK
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module scanf shall be considered present. */
-#undef GNULIB_SCANF
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module sigpipe shall be considered present. */
 #undef GNULIB_SIGPIPE
 
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module strerror shall be considered present. */
-#undef GNULIB_STRERROR
-
 /* Define to 1 when the gnulib module canonicalize_file_name should be tested.
    */
 #undef GNULIB_TEST_CANONICALIZE_FILE_NAME
@@ -88,15 +82,12 @@
 /* Define to 1 when the gnulib module getopt-gnu should be tested. */
 #undef GNULIB_TEST_GETOPT_GNU
 
-/* Define to 1 when the gnulib module gettimeofday should be tested. */
-#undef GNULIB_TEST_GETTIMEOFDAY
-
-/* Define to 1 when the gnulib module iswblank should be tested. */
-#undef GNULIB_TEST_ISWBLANK
-
 /* Define to 1 when the gnulib module lstat should be tested. */
 #undef GNULIB_TEST_LSTAT
 
+/* Define to 1 when the gnulib module malloc-posix should be tested. */
+#undef GNULIB_TEST_MALLOC_POSIX
+
 /* Define to 1 when the gnulib module mbrtowc should be tested. */
 #undef GNULIB_TEST_MBRTOWC
 
@@ -112,18 +103,12 @@
 /* Define to 1 when the gnulib module memchr should be tested. */
 #undef GNULIB_TEST_MEMCHR
 
-/* Define to 1 when the gnulib module raise should be tested. */
-#undef GNULIB_TEST_RAISE
-
 /* Define to 1 when the gnulib module readlink should be tested. */
 #undef GNULIB_TEST_READLINK
 
 /* Define to 1 when the gnulib module realpath should be tested. */
 #undef GNULIB_TEST_REALPATH
 
-/* Define to 1 when the gnulib module setlocale should be tested. */
-#undef GNULIB_TEST_SETLOCALE
-
 /* Define to 1 when the gnulib module sigprocmask should be tested. */
 #undef GNULIB_TEST_SIGPROCMASK
 
@@ -139,14 +124,6 @@
 /* Define to 1 when the gnulib module wcwidth should be tested. */
 #undef GNULIB_TEST_WCWIDTH
 
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module unistr/u8-mbtoucr shall be considered present. */
-#undef GNULIB_UNISTR_U8_MBTOUCR
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module unistr/u8-uctomb shall be considered present. */
-#undef GNULIB_UNISTR_U8_UCTOMB
-
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -181,11 +158,11 @@
 /* Define to 1 if you have the `canonicalize_file_name' function. */
 #undef HAVE_CANONICALIZE_FILE_NAME
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
@@ -241,17 +218,13 @@
    */
 #undef HAVE_DECL_GETENV
 
-/* Define to 1 if you have the declaration of `iswblank', and to 0 if you
+/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you
    don't. */
-#undef HAVE_DECL_ISWBLANK
+#undef HAVE_DECL_GETOPT_CLIP
 
-/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
+/* Define to 1 if you have the declaration of `optreset', and to 0 if you
    don't. */
-#undef HAVE_DECL_MBRTOWC
-
-/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you
-   don't. */
-#undef HAVE_DECL_MBSINIT
+#undef HAVE_DECL_OPTRESET
 
 /* Define to 1 if you have the declaration of `program_invocation_name', and
    to 0 if you don't. */
@@ -269,9 +242,9 @@
    don't. */
 #undef HAVE_DECL_PUTC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `setenv', and to 0 if you don't.
-   */
-#undef HAVE_DECL_SETENV
+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRERROR
 
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
@@ -281,10 +254,6 @@
    don't. */
 #undef HAVE_DECL_STRNLEN
 
-/* Define to 1 if you have the declaration of `towlower', and to 0 if you
-   don't. */
-#undef HAVE_DECL_TOWLOWER
-
 /* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
    don't. */
 #undef HAVE_DECL_WCWIDTH
@@ -303,8 +272,8 @@
 /* Define if you have the declaration of environ. */
 #undef HAVE_ENVIRON_DECL
 
-/* Define to 1 if you have the <features.h> header file. */
-#undef HAVE_FEATURES_H
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
 
 /* Define to 1 if you have the `fwprintf' function. */
 #undef HAVE_FWPRINTF
@@ -333,9 +302,6 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
 /* Define to 1 if you have the `getuid' function. */
 #undef HAVE_GETUID
 
@@ -345,11 +311,6 @@
 /* Define to 1 if you have the <iconv.h> header file. */
 #undef HAVE_ICONV_H
 
-/* Define to 1 if the compiler supports one of the keywords 'inline',
-   '__inline__', '__inline' and effectively inlines functions marked as such.
-   */
-#undef HAVE_INLINE
-
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_INTMAX_T
 
@@ -375,7 +336,7 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if the system has the type 'long long int'. */
+/* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
 /* Define to 1 if you have the `lstat' function. */
@@ -384,6 +345,9 @@
 /* Define to 1 if you have the <mach-o/dyld.h> header file. */
 #undef HAVE_MACH_O_DYLD_H
 
+/* Define if the 'malloc' function is POSIX compliant. */
+#undef HAVE_MALLOC_POSIX
+
 /* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
    config.h and <sys/mman.h>. */
 #undef HAVE_MAP_ANONYMOUS
@@ -400,6 +364,9 @@
 /* Define to 1 if <wchar.h> declares mbstate_t. */
 #undef HAVE_MBSTATE_T
 
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
+
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
@@ -415,16 +382,15 @@
 /* Define to 1 if you have the `mprotect' function. */
 #undef HAVE_MPROTECT
 
-/* Define to 1 on MSVC platforms that have the "invalid parameter handler"
-   concept. */
-#undef HAVE_MSVC_INVALID_PARAMETER_HANDLER
-
 /* Define to 1 if you have the `munmap' function. */
 #undef HAVE_MUNMAP
 
 /* Define to 1 if you have the `newlocale' function. */
 #undef HAVE_NEWLOCALE
 
+/* Define to 1 if you have the `pathconf' function. */
+#undef HAVE_PATHCONF
+
 /* Define if your printf() function supports format strings with positions. */
 #undef HAVE_POSIX_PRINTF
 
@@ -437,8 +403,8 @@
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
-/* Define to 1 if you have the `raise' function. */
-#undef HAVE_RAISE
+/* Define to 1 if you have the <random.h> header file. */
+#undef HAVE_RANDOM_H
 
 /* Define to 1 if atoll is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_ATOLL
@@ -450,27 +416,18 @@
    macros. */
 #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
 
-/* Define to 1 if chdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_CHDIR
-
 /* Define to 1 if chown is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_CHOWN
 
 /* Define to 1 if dprintf is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_DPRINTF
 
-/* Define to 1 if dup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUP
-
 /* Define to 1 if dup2 is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_DUP2
 
 /* Define to 1 if dup3 is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_DUP3
 
-/* Define to 1 if duplocale is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUPLOCALE
-
 /* Define to 1 if endusershell is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_ENDUSERSHELL
 
@@ -492,24 +449,12 @@
 /* Define to 1 if fchownat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FCHOWNAT
 
-/* Define to 1 if fdatasync is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FDATASYNC
-
-/* Define to 1 if ffsl is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFSL
-
-/* Define to 1 if ffsll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFSLL
-
 /* Define to 1 if fpurge is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FPURGE
 
 /* Define to 1 if fseeko is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FSEEKO
 
-/* Define to 1 if fstat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FSTAT
-
 /* Define to 1 if fstatat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FSTATAT
 
@@ -558,35 +503,17 @@
 /* Define to 1 if getpagesize is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GETPAGESIZE
 
-/* Define to 1 if gets is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETS
-
 /* Define to 1 if getsubopt is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GETSUBOPT
 
-/* Define to 1 if gettimeofday is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETTIMEOFDAY
-
 /* Define to 1 if getusershell is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GETUSERSHELL
 
 /* Define to 1 if grantpt is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GRANTPT
 
-/* Define to 1 if group_member is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GROUP_MEMBER
-
-/* Define to 1 if initstate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_INITSTATE
-
-/* Define to 1 if initstate_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_INITSTATE_R
-
-/* Define to 1 if isatty is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ISATTY
-
-/* Define to 1 if iswctype is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ISWCTYPE
+/* Define to 1 if initstat_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_INITSTAT_R
 
 /* Define to 1 if lchmod is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_LCHMOD
@@ -660,39 +587,21 @@
 /* Define to 1 if mkstemps is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_MKSTEMPS
 
-/* Define to 1 if pclose is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PCLOSE
-
-/* Define to 1 if pipe is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PIPE
-
 /* Define to 1 if pipe2 is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PIPE2
 
 /* Define to 1 if popen is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_POPEN
 
-/* Define to 1 if posix_openpt is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_POSIX_OPENPT
-
 /* Define to 1 if pread is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PREAD
 
-/* Define to 1 if pthread_sigmask is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTHREAD_SIGMASK
-
 /* Define to 1 if ptsname is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PTSNAME
 
-/* Define to 1 if ptsname_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTSNAME_R
-
 /* Define to 1 if pwrite is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PWRITE
 
-/* Define to 1 if random is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RANDOM
-
 /* Define to 1 if random_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RANDOM_R
 
@@ -717,21 +626,9 @@
 /* Define to 1 if rpmatch is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RPMATCH
 
-/* Define to 1 if secure_getenv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SECURE_GETENV
-
 /* Define to 1 if setenv is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SETENV
 
-/* Define to 1 if sethostname is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETHOSTNAME
-
-/* Define to 1 if setlocale is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETLOCALE
-
-/* Define to 1 if setstate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETSTATE
-
 /* Define to 1 if setstate_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SETSTATE_R
 
@@ -768,9 +665,6 @@
 /* Define to 1 if snprintf is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SNPRINTF
 
-/* Define to 1 if srandom is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SRANDOM
-
 /* Define to 1 if srandom_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SRANDOM_R
 
@@ -792,9 +686,6 @@
 /* Define to 1 if strdup is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRDUP
 
-/* Define to 1 if strerror_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRERROR_R
-
 /* Define to 1 if strncat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRNCAT
 
@@ -837,9 +728,6 @@
 /* Define to 1 if tmpfile is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_TMPFILE
 
-/* Define to 1 if towctrans is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_TOWCTRANS
-
 /* Define to 1 if ttyname_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_TTYNAME_R
 
@@ -867,120 +755,24 @@
 /* Define to 1 if vsnprintf is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_VSNPRINTF
 
-/* Define to 1 if wcpcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCPCPY
-
-/* Define to 1 if wcpncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCPNCPY
-
 /* Define to 1 if wcrtomb is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCRTOMB
 
-/* Define to 1 if wcscasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCASECMP
-
-/* Define to 1 if wcscat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCAT
-
-/* Define to 1 if wcschr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCHR
-
-/* Define to 1 if wcscmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCMP
-
-/* Define to 1 if wcscoll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCOLL
-
-/* Define to 1 if wcscpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCPY
-
-/* Define to 1 if wcscspn is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCSPN
-
-/* Define to 1 if wcsdup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSDUP
-
-/* Define to 1 if wcslen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSLEN
-
-/* Define to 1 if wcsncasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCASECMP
-
-/* Define to 1 if wcsncat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCAT
-
-/* Define to 1 if wcsncmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCMP
-
-/* Define to 1 if wcsncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCPY
-
-/* Define to 1 if wcsnlen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNLEN
-
 /* Define to 1 if wcsnrtombs is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCSNRTOMBS
 
-/* Define to 1 if wcspbrk is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSPBRK
-
-/* Define to 1 if wcsrchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSRCHR
-
 /* Define to 1 if wcsrtombs is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCSRTOMBS
 
-/* Define to 1 if wcsspn is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSSPN
-
-/* Define to 1 if wcsstr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSSTR
-
-/* Define to 1 if wcstok is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSTOK
-
-/* Define to 1 if wcswidth is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSWIDTH
-
-/* Define to 1 if wcsxfrm is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSXFRM
-
 /* Define to 1 if wctob is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCTOB
 
-/* Define to 1 if wctrans is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTRANS
-
-/* Define to 1 if wctype is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTYPE
-
 /* Define to 1 if wcwidth is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCWIDTH
 
-/* Define to 1 if wmemchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCHR
-
-/* Define to 1 if wmemcmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCMP
-
-/* Define to 1 if wmemcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCPY
-
-/* Define to 1 if wmemmove is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMMOVE
-
-/* Define to 1 if wmemset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMSET
-
-/* Define to 1 if _Exit is declared even after undefining macros. */
-#undef HAVE_RAW_DECL__EXIT
-
 /* Define to 1 if you have the `readlink' function. */
 #undef HAVE_READLINK
 
-/* Define to 1 if you have the `readlinkat' function. */
-#undef HAVE_READLINKAT
-
 /* Define to 1 if you have the `realpath' function. */
 #undef HAVE_REALPATH
 
@@ -993,6 +785,9 @@
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
+/* Define to 1 if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
+
 /* Define to 1 if 'sig_atomic_t' is a signed integer type. */
 #undef HAVE_SIGNED_SIG_ATOMIC_T
 
@@ -1008,6 +803,9 @@
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
+/* Define to 1 if stdbool.h conforms to C99. */
+#undef HAVE_STDBOOL_H
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
@@ -1018,6 +816,9 @@
    uintmax_t. */
 #undef HAVE_STDINT_H_WITH_UINTMAX
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -1042,11 +843,14 @@
 /* Define to 1 if you have the `strnlen' function. */
 #undef HAVE_STRNLEN
 
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if you have the `symlink' function. */
-#undef HAVE_SYMLINK
+/* Define to 1 if the system has the type `struct random_data'. */
+#undef HAVE_STRUCT_RANDOM_DATA
 
 /* Define to 1 if you have the <sys/bitypes.h> header file. */
 #undef HAVE_SYS_BITYPES_H
@@ -1066,17 +870,14 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#undef HAVE_SYS_TIMEB_H
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the `towlower' function. */
-#undef HAVE_TOWLOWER
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
 
 /* Define to 1 if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
@@ -1087,7 +888,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if the system has the type 'unsigned long long int'. */
+/* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
 /* Define to 1 if you have the `uselocale' function. */
@@ -1130,21 +931,12 @@
 /* Define to 1 if O_NOFOLLOW works. */
 #undef HAVE_WORKING_O_NOFOLLOW
 
-/* Define to 1 if you have the <xlocale.h> header file. */
-#undef HAVE_XLOCALE_H
-
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
-/* Define to 1 if you have the `_ftime' function. */
-#undef HAVE__FTIME
-
 /* Define to 1 if you have the `_NSGetExecutablePath' function. */
 #undef HAVE__NSGETEXECUTABLEPATH
 
-/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */
-#undef HAVE__SET_INVALID_PARAMETER_HANDLER
-
 /* Define to 1 if you have the `__fsetlocking' function. */
 #undef HAVE___FSETLOCKING
 
@@ -1161,7 +953,13 @@
 /* Define if integer division by zero raises signal SIGFPE. */
 #undef INTDIV0_RAISES_SIGFPE
 
-/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing
+#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
@@ -1175,15 +973,8 @@
 /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
 #undef MAP_ANONYMOUS
 
-/* Define if the mbrtowc function does not return (size_t) -2 for empty input.
-   */
-#undef MBRTOWC_EMPTY_INPUT_BUG
-
-/* Define if the mbrtowc function has the NULL pwc argument bug. */
-#undef MBRTOWC_NULL_ARG1_BUG
-
 /* Define if the mbrtowc function has the NULL string argument bug. */
-#undef MBRTOWC_NULL_ARG2_BUG
+#undef MBRTOWC_NULL_ARG_BUG
 
 /* Define if the mbrtowc function does not return 0 for a NUL character. */
 #undef MBRTOWC_NUL_RETVAL_BUG
@@ -1191,6 +982,9 @@
 /* Define if the mbrtowc function returns a wrong return value. */
 #undef MBRTOWC_RETVAL_BUG
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
@@ -1233,8 +1027,8 @@
    slash */
 #undef REPLACE_FUNC_STAT_FILE
 
-/* Define to 1 if strerror(0) does not return a message implying success. */
-#undef REPLACE_STRERROR_0
+/* Define this to 1 if strerror is broken. */
+#undef REPLACE_STRERROR
 
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'sig_atomic_t'. */
@@ -1292,45 +1086,13 @@
    made weak. */
 #undef USE_SOLARIS_THREADS_WEAK
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable general extensions on OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
-   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
-   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to 1 if you want getc etc. to use unlocked I/O if available.
    Unlocked I/O can improve performance in unithreaded apps, but it is not
    safe for multithreaded apps. */
 #undef USE_UNLOCKED_IO
 
-/* Define if the native Windows multithreading API can be used. */
-#undef USE_WINDOWS_THREADS
+/* Define if the Win32 multithreading API can be used. */
+#undef USE_WIN32_THREADS
 
 /* Version number of package */
 #undef VERSION
@@ -1343,169 +1105,48 @@
    'wint_t'. */
 #undef WINT_T_SUFFIX
 
-/* Define when --enable-shared is used on mingw or Cygwin. */
-#undef WOE32DLL
-
-/* Enable large inode numbers on Mac OS X 10.5. */
-#undef _DARWIN_USE_64_BIT_INODE
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
-   stat.st_size becomes 64-bit. */
-#undef _GL_WINDOWS_64_BIT_ST_SIZE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 on Solaris. */
-#undef _LCONV_C99
-
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
-/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
-#undef _NETBSD_SOURCE
-
-/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-
-
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */
 #undef _POSIX_1_SOURCE
 
-/* Define to 1 if you need to in order for 'stat' and other things to work. */
+/* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Define to rpl_ if the getopt replacement functions and variables should be
-   used. */
-#undef __GETOPT_PREFIX
-
-/* 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
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+/* Define to 500 only on HP-UX. */
+#undef _XOPEN_SOURCE
 
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-
-   Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
-   on configurations that mistakenly use 'static inline' to implement
-   functions or macros in standard C headers like <ctype.h>.  For example,
-   if isdigit is mistakenly implemented via a static inline function,
-   a program containing an extern inline function that calls isdigit
-   may not work since the C standard prohibits extern inline functions
-   from calling static functions.  This bug is known to occur on:
-
-     OS X 10.8 and earlier; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
-
-     DragonFly; see
-     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
-
-     FreeBSD; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
-
-   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
-   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
-   Assume DragonFly and FreeBSD will be similar.  */
-#if (((defined __APPLE__ && defined __MACH__) \
-      || defined __DragonFly__ || defined __FreeBSD__) \
-     && (defined __header_inline \
-         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
-            && ! defined __clang__) \
-         : ((! defined _DONT_USE_CTYPE_INLINE_ \
-             && (defined __GNUC__ || defined __cplusplus)) \
-            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
-                && defined __GNUC__ && ! defined __cplusplus))))
-# define _GL_EXTERN_INLINE_STDHEADER_BUG
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
 #endif
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-# define _GL_EXTERN_INLINE_IN_USE
-#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
-       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-# define _GL_EXTERN_INLINE_IN_USE
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
 #endif
-
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
 #endif
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#ifndef _GL_UNUSED
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED
-# endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
 #endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#ifndef _GL_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _GL_ATTRIBUTE_PURE /* empty */
-# endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
 #endif
 
 
+/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+#undef __GETOPT_PREFIX
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
@@ -1515,7 +1156,7 @@
 /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE__ && __MACH__ test for MacOS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
@@ -1525,15 +1166,9 @@
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-
 /* Define to the type of st_nlink in struct stat, or a supertype. */
 #undef nlink_t
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
 /* Define as the type of the result of subtracting two pointers, if the system
    doesn't define it. */
 #undef ptrdiff_t
@@ -1577,30 +1212,6 @@
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
 
-/* gcc supports the "unused" attribute on possibly unused labels, and
-   g++ has since version 4.5.  Note to support C++ as well as C,
-   _GL_UNUSED_LABEL should be used with a trailing ;  */
-#if !defined __cplusplus || __GNUC__ > 4 \
-    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-# define _GL_UNUSED_LABEL _GL_UNUSED
-#else
-# define _GL_UNUSED_LABEL
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
-
 
 
 #define __libc_lock_t                   gl_lock_t
diff -Nru gettext-0.19.3/gettext-runtime/configure gettext-0.18.1.1/gettext-runtime/configure
--- gettext-0.19.3/gettext-runtime/configure	2014-10-16 06:01:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/configure	2010-06-06 20:11:32.000000000 +0000
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext-runtime 0.19.3.
+# Generated by GNU Autoconf 2.65.
 #
-# Report bugs to <bug-gnu-gettext@gnu.org>.
 #
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,7 +89,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -134,31 +133,6 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -192,21 +166,12 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -246,25 +211,14 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -274,11 +228,10 @@
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: bug-gnu-gettext@gnu.org about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -363,18 +316,10 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -411,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -496,10 +441,6 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -534,16 +475,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -555,8 +496,28 @@
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -564,14 +525,161 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+
+
+# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+$*
+_LT_EOF
+  exit 0
+fi
+
+# 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
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -588,12 +696,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='gettext-runtime'
-PACKAGE_TARNAME='gettext-runtime'
-PACKAGE_VERSION='0.19.3'
-PACKAGE_STRING='gettext-runtime 0.19.3'
-PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
-PACKAGE_URL=''
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="intl/dcigettext.c"
 # Factoring default headers for most tests.
@@ -632,10 +740,10 @@
 # include <unistd.h>
 #endif"
 
-gl_use_threads_default=
 gt_needs=
-ac_header_list=
-ac_func_list=
+gl_header_list=
+gl_use_threads_default=
+gl_func_list=
 gl_getopt_required=POSIX
 gl_getopt_required=POSIX
 enable_option_checking=no
@@ -651,26 +759,27 @@
 ENABLE_LIBASPRINTF_FALSE
 ENABLE_LIBASPRINTF_TRUE
 LIBSCHED
+CXXFLAGS
+CXX
 CROSS_COMPILING
 PERL
-INTL_EXPORTS_FLAGS
-WOE32DLL_FALSE
-WOE32DLL_TRUE
 LIBGRT_LTLIBDEPS
 LIBGRT_LIBDEPS
 gltests_WITNESS
-HAVE_FEATURES_H
+REPLACE_ISWCNTRL
+HAVE_WCTYPE_H
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
+NEXT_WCTYPE_H
+HAVE_ISWBLANK
+HAVE_ISWCNTRL
+HAVE_WINT_T
+HAVE_WCHAR_H
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
 NEXT_WCHAR_H
 LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE
 LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE
 LIBUNISTRING_UNIWIDTH_H
 LIBUNISTRING_UNITYPES_H
-LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE
-LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE
-LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_FALSE
-LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE
-LIBUNISTRING_UNISTR_H
 HAVE_UNISTD_H
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H
 NEXT_UNISTD_H
@@ -679,8 +788,6 @@
 TIME_H_DEFINES_STRUCT_TIMESPEC
 NEXT_AS_FIRST_DIRECTIVE_TIME_H
 NEXT_TIME_H
-REPLACE_LOCALTIME
-REPLACE_GMTIME
 REPLACE_TIMEGM
 REPLACE_NANOSLEEP
 REPLACE_MKTIME
@@ -688,26 +795,22 @@
 HAVE_TIMEGM
 HAVE_STRPTIME
 HAVE_NANOSLEEP
-HAVE_DECL_LOCALTIME_R
+HAVE_LOCALTIME_R
 GNULIB_TIME_R
 GNULIB_TIMEGM
 GNULIB_STRPTIME
 GNULIB_NANOSLEEP
 GNULIB_MKTIME
-WINDOWS_64_BIT_OFF_T
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H
-NEXT_SYS_TYPES_H
-WINDOWS_64_BIT_ST_SIZE
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H
 NEXT_SYS_STAT_H
 NEXT_AS_FIRST_DIRECTIVE_STRING_H
 NEXT_STRING_H
+HAVE_RANDOM_H
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
 NEXT_STDLIB_H
 NEXT_AS_FIRST_DIRECTIVE_STDIO_H
 NEXT_STDIO_H
-GL_GENERATE_STDINT_H_FALSE
-GL_GENERATE_STDINT_H_TRUE
+ASM_SYMBOL_PREFIX
 STDINT_H
 WINT_T_SUFFIX
 WCHAR_T_SUFFIX
@@ -729,14 +832,15 @@
 NEXT_STDINT_H
 HAVE_SYS_TYPES_H
 HAVE_INTTYPES_H
-HAVE_WCHAR_H
 HAVE_UNSIGNED_LONG_LONG_INT
 HAVE_LONG_LONG_INT
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
+NEXT_STDDEF_H
+STDDEF_H
+HAVE_WCHAR_T
+REPLACE_NULL
 HAVE__BOOL
-GL_GENERATE_STDBOOL_H_FALSE
-GL_GENERATE_STDBOOL_H_TRUE
 STDBOOL_H
-ASM_SYMBOL_PREFIX
 REPLACE_VSPRINTF
 REPLACE_VSNPRINTF
 REPLACE_VPRINTF
@@ -745,7 +849,6 @@
 REPLACE_VASPRINTF
 REPLACE_TMPFILE
 REPLACE_STDIO_WRITE_FUNCS
-REPLACE_STDIO_READ_FUNCS
 REPLACE_SPRINTF
 REPLACE_SNPRINTF
 REPLACE_RENAMEAT
@@ -766,14 +869,11 @@
 REPLACE_FPRINTF
 REPLACE_FOPEN
 REPLACE_FFLUSH
-REPLACE_FDOPEN
 REPLACE_FCLOSE
 REPLACE_DPRINTF
 HAVE_VDPRINTF
 HAVE_VASPRINTF
 HAVE_RENAMEAT
-HAVE_POPEN
-HAVE_PCLOSE
 HAVE_FTELLO
 HAVE_FSEEKO
 HAVE_DPRINTF
@@ -782,8 +882,6 @@
 HAVE_DECL_OBSTACK_PRINTF
 HAVE_DECL_GETLINE
 HAVE_DECL_GETDELIM
-HAVE_DECL_FTELLO
-HAVE_DECL_FSEEKO
 HAVE_DECL_FPURGE
 GNULIB_VSPRINTF_POSIX
 GNULIB_VSNPRINTF
@@ -792,15 +890,11 @@
 GNULIB_VFPRINTF_POSIX
 GNULIB_VFPRINTF
 GNULIB_VDPRINTF
-GNULIB_VSCANF
-GNULIB_VFSCANF
 GNULIB_VASPRINTF
 GNULIB_TMPFILE
 GNULIB_STDIO_H_SIGPIPE
-GNULIB_STDIO_H_NONBLOCKING
 GNULIB_SPRINTF_POSIX
 GNULIB_SNPRINTF
-GNULIB_SCANF
 GNULIB_RENAMEAT
 GNULIB_RENAME
 GNULIB_REMOVE
@@ -811,74 +905,54 @@
 GNULIB_PRINTF
 GNULIB_POPEN
 GNULIB_PERROR
-GNULIB_PCLOSE
 GNULIB_OBSTACK_PRINTF_POSIX
 GNULIB_OBSTACK_PRINTF
 GNULIB_GETLINE
 GNULIB_GETDELIM
-GNULIB_GETCHAR
-GNULIB_GETC
 GNULIB_FWRITE
 GNULIB_FTELLO
 GNULIB_FTELL
 GNULIB_FSEEKO
 GNULIB_FSEEK
-GNULIB_FSCANF
 GNULIB_FREOPEN
-GNULIB_FREAD
 GNULIB_FPUTS
 GNULIB_FPUTC
 GNULIB_FPURGE
 GNULIB_FPRINTF_POSIX
 GNULIB_FPRINTF
 GNULIB_FOPEN
-GNULIB_FGETS
-GNULIB_FGETC
 GNULIB_FFLUSH
-GNULIB_FDOPEN
 GNULIB_FCLOSE
 GNULIB_DPRINTF
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H
 NEXT_SIGNAL_H
+HAVE_TYPE_VOLATILE_SIG_ATOMIC_T
+HAVE_STRUCT_SIGACTION_SA_SIGACTION
+HAVE_SIGACTION
+HAVE_SIGINFO_T
+HAVE_SIGSET_T
+HAVE_POSIX_SIGNALBLOCKING
+GNULIB_SIGACTION
+GNULIB_SIGPROCMASK
+GNULIB_SIGNAL_H_SIGPIPE
 RELOCATABLE_STRIP
 RELOCATABLE_BUILD_DIR
 RELOCATABLE_SRC_DIR
 RELOCATABLE_CONFIG_H_DIR
 RELOCATABLE_LIBRARY_PATH
-RELOCATABLE_VIA_WRAPPER_FALSE
-RELOCATABLE_VIA_WRAPPER_TRUE
 RELOCATABLE_VIA_LD_FALSE
 RELOCATABLE_VIA_LD_TRUE
 INSTALL_PROGRAM_ENV
 RELOCATABLE_LDFLAGS
 RELOCATABLE
-REPLACE_RAISE
-REPLACE_PTHREAD_SIGMASK
-HAVE_SIGHANDLER_T
-HAVE_TYPE_VOLATILE_SIG_ATOMIC_T
-HAVE_STRUCT_SIGACTION_SA_SIGACTION
-HAVE_SIGACTION
-HAVE_SIGINFO_T
-HAVE_SIGSET_T
-HAVE_RAISE
-HAVE_PTHREAD_SIGMASK
-HAVE_POSIX_SIGNALBLOCKING
-GNULIB_SIGACTION
-GNULIB_SIGPROCMASK
-GNULIB_SIGNAL_H_SIGPIPE
-GNULIB_RAISE
-GNULIB_PTHREAD_SIGMASK
 APPLE_UNIVERSAL_BUILD
-HAVE_MSVC_INVALID_PARAMETER_HANDLER
 UNDEFINE_STRTOK_R
 REPLACE_STRTOK_R
 REPLACE_STRSIGNAL
 REPLACE_STRNLEN
 REPLACE_STRNDUP
 REPLACE_STRNCAT
-REPLACE_STRERROR_R
 REPLACE_STRERROR
-REPLACE_STRCHRNUL
 REPLACE_STRCASESTR
 REPLACE_STRSTR
 REPLACE_STRDUP
@@ -887,7 +961,6 @@
 REPLACE_MEMCHR
 HAVE_STRVERSCMP
 HAVE_DECL_STRSIGNAL
-HAVE_DECL_STRERROR_R
 HAVE_DECL_STRTOK_R
 HAVE_STRCASESTR
 HAVE_STRSEP
@@ -903,12 +976,9 @@
 HAVE_MEMPCPY
 HAVE_DECL_MEMMEM
 HAVE_MEMCHR
-HAVE_FFSLL
-HAVE_FFSL
 HAVE_MBSLEN
 GNULIB_STRVERSCMP
 GNULIB_STRSIGNAL
-GNULIB_STRERROR_R
 GNULIB_STRERROR
 GNULIB_MBSTOK_R
 GNULIB_MBSSEP
@@ -941,12 +1011,9 @@
 GNULIB_MEMPCPY
 GNULIB_MEMMEM
 GNULIB_MEMCHR
-GNULIB_FFSLL
-GNULIB_FFSL
 LOCALE_FR_UTF8
 LOCALE_ZH_CN
 LOCALE_JA
-REPLACE_WCSWIDTH
 REPLACE_WCWIDTH
 REPLACE_WCSNRTOMBS
 REPLACE_WCSRTOMBS
@@ -961,34 +1028,6 @@
 REPLACE_MBSTATE_T
 HAVE_DECL_WCWIDTH
 HAVE_DECL_WCTOB
-HAVE_WCSWIDTH
-HAVE_WCSTOK
-HAVE_WCSSTR
-HAVE_WCSPBRK
-HAVE_WCSSPN
-HAVE_WCSCSPN
-HAVE_WCSRCHR
-HAVE_WCSCHR
-HAVE_WCSDUP
-HAVE_WCSXFRM
-HAVE_WCSCOLL
-HAVE_WCSNCASECMP
-HAVE_WCSCASECMP
-HAVE_WCSNCMP
-HAVE_WCSCMP
-HAVE_WCSNCAT
-HAVE_WCSCAT
-HAVE_WCPNCPY
-HAVE_WCSNCPY
-HAVE_WCPCPY
-HAVE_WCSCPY
-HAVE_WCSNLEN
-HAVE_WCSLEN
-HAVE_WMEMSET
-HAVE_WMEMMOVE
-HAVE_WMEMCPY
-HAVE_WMEMCMP
-HAVE_WMEMCHR
 HAVE_WCSNRTOMBS
 HAVE_WCSRTOMBS
 HAVE_WCRTOMB
@@ -998,34 +1037,6 @@
 HAVE_MBRTOWC
 HAVE_MBSINIT
 HAVE_BTOWC
-GNULIB_WCSWIDTH
-GNULIB_WCSTOK
-GNULIB_WCSSTR
-GNULIB_WCSPBRK
-GNULIB_WCSSPN
-GNULIB_WCSCSPN
-GNULIB_WCSRCHR
-GNULIB_WCSCHR
-GNULIB_WCSDUP
-GNULIB_WCSXFRM
-GNULIB_WCSCOLL
-GNULIB_WCSNCASECMP
-GNULIB_WCSCASECMP
-GNULIB_WCSNCMP
-GNULIB_WCSCMP
-GNULIB_WCSNCAT
-GNULIB_WCSCAT
-GNULIB_WCPNCPY
-GNULIB_WCSNCPY
-GNULIB_WCPCPY
-GNULIB_WCSCPY
-GNULIB_WCSNLEN
-GNULIB_WCSLEN
-GNULIB_WMEMSET
-GNULIB_WMEMMOVE
-GNULIB_WMEMCPY
-GNULIB_WMEMCMP
-GNULIB_WMEMCHR
 GNULIB_WCWIDTH
 GNULIB_WCSNRTOMBS
 GNULIB_WCSRTOMBS
@@ -1068,55 +1079,14 @@
 GNULIB_LCHMOD
 GNULIB_FUTIMENS
 GNULIB_FSTATAT
-GNULIB_FSTAT
 GNULIB_FCHMODAT
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H
-NEXT_LOCALE_H
-HAVE_XLOCALE_H
-NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
-NEXT_STDDEF_H
-GL_GENERATE_STDDEF_H_FALSE
-GL_GENERATE_STDDEF_H_TRUE
-STDDEF_H
-HAVE_WCHAR_T
-REPLACE_NULL
-REPLACE_STRUCT_LCONV
-REPLACE_DUPLOCALE
-REPLACE_SETLOCALE
-REPLACE_LOCALECONV
-HAVE_DUPLOCALE
-GNULIB_DUPLOCALE
-GNULIB_SETLOCALE
-GNULIB_LOCALECONV
 LOCALCHARSET_TESTS_ENVIRONMENT
-REPLACE_TOWLOWER
-REPLACE_ISWCNTRL
-HAVE_WCTYPE_H
-NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
-NEXT_WCTYPE_H
-HAVE_WINT_T
-HAVE_ISWCNTRL
-REPLACE_ISWBLANK
-HAVE_WCTRANS_T
-HAVE_WCTYPE_T
-HAVE_ISWBLANK
-GNULIB_TOWCTRANS
-GNULIB_WCTRANS
-GNULIB_ISWCTYPE
-GNULIB_WCTYPE
-GNULIB_ISWBLANK
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H
 NEXT_ICONV_H
-HAVE_WINSOCK2_H
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H
-NEXT_SYS_TIME_H
-REPLACE_STRUCT_TIMEVAL
-REPLACE_GETTIMEOFDAY
-HAVE_SYS_TIME_H
-HAVE_STRUCT_TIMEVAL
-HAVE_GETTIMEOFDAY
-GNULIB_GETTIMEOFDAY
-GNULIB_GL_UNISTD_H_GETOPT
+ICONV_H
+REPLACE_ICONV_UTF
+REPLACE_ICONV_OPEN
+REPLACE_ICONV
 GETOPT_H
 HAVE_GETOPT_H
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H
@@ -1127,12 +1097,9 @@
 ENOLINK_HIDDEN
 EMULTIHOP_VALUE
 EMULTIHOP_HIDDEN
-GL_GENERATE_ERRNO_H_FALSE
-GL_GENERATE_ERRNO_H_TRUE
 ERRNO_H
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H
 NEXT_ERRNO_H
-PRAGMA_COLUMNS
 PRAGMA_SYSTEM_HEADER
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE
 INCLUDE_NEXT
@@ -1147,21 +1114,15 @@
 REPLACE_SLEEP
 REPLACE_RMDIR
 REPLACE_READLINK
-REPLACE_READ
 REPLACE_PWRITE
 REPLACE_PREAD
 REPLACE_LSEEK
 REPLACE_LINKAT
 REPLACE_LINK
 REPLACE_LCHOWN
-REPLACE_ISATTY
 REPLACE_GETPAGESIZE
 REPLACE_GETGROUPS
-REPLACE_GETLOGIN_R
-REPLACE_GETDTABLESIZE
-REPLACE_GETDOMAINNAME
 REPLACE_GETCWD
-REPLACE_FTRUNCATE
 REPLACE_FCHOWNAT
 REPLACE_DUP2
 REPLACE_DUP
@@ -1169,39 +1130,32 @@
 REPLACE_CHOWN
 HAVE_SYS_PARAM_H
 HAVE_OS_H
-HAVE_DECL_TTYNAME_R
-HAVE_DECL_SETHOSTNAME
 HAVE_DECL_GETUSERSHELL
 HAVE_DECL_GETPAGESIZE
 HAVE_DECL_GETLOGIN_R
-HAVE_DECL_GETDOMAINNAME
-HAVE_DECL_FDATASYNC
-HAVE_DECL_FCHDIR
 HAVE_DECL_ENVIRON
 HAVE_USLEEP
 HAVE_UNLINKAT
+HAVE_TTYNAME_R
 HAVE_SYMLINKAT
 HAVE_SYMLINK
 HAVE_SLEEP
-HAVE_SETHOSTNAME
 HAVE_READLINKAT
 HAVE_READLINK
 HAVE_PWRITE
 HAVE_PREAD
 HAVE_PIPE2
-HAVE_PIPE
 HAVE_LINKAT
 HAVE_LINK
 HAVE_LCHOWN
-HAVE_GROUP_MEMBER
 HAVE_GETPAGESIZE
 HAVE_GETLOGIN
 HAVE_GETHOSTNAME
 HAVE_GETGROUPS
 HAVE_GETDTABLESIZE
+HAVE_GETDOMAINNAME
 HAVE_FTRUNCATE
 HAVE_FSYNC
-HAVE_FDATASYNC
 HAVE_FCHOWNAT
 HAVE_FCHDIR
 HAVE_FACCESSAT
@@ -1214,26 +1168,21 @@
 GNULIB_UNLINKAT
 GNULIB_UNLINK
 GNULIB_UNISTD_H_SIGPIPE
-GNULIB_UNISTD_H_NONBLOCKING
+GNULIB_UNISTD_H_GETOPT
 GNULIB_TTYNAME_R
 GNULIB_SYMLINKAT
 GNULIB_SYMLINK
 GNULIB_SLEEP
-GNULIB_SETHOSTNAME
 GNULIB_RMDIR
 GNULIB_READLINKAT
 GNULIB_READLINK
-GNULIB_READ
 GNULIB_PWRITE
 GNULIB_PREAD
 GNULIB_PIPE2
-GNULIB_PIPE
 GNULIB_LSEEK
 GNULIB_LINKAT
 GNULIB_LINK
 GNULIB_LCHOWN
-GNULIB_ISATTY
-GNULIB_GROUP_MEMBER
 GNULIB_GETUSERSHELL
 GNULIB_GETPAGESIZE
 GNULIB_GETLOGIN_R
@@ -1245,7 +1194,6 @@
 GNULIB_GETCWD
 GNULIB_FTRUNCATE
 GNULIB_FSYNC
-GNULIB_FDATASYNC
 GNULIB_FCHOWNAT
 GNULIB_FCHDIR
 GNULIB_FACCESSAT
@@ -1253,83 +1201,57 @@
 GNULIB_ENVIRON
 GNULIB_DUP3
 GNULIB_DUP2
-GNULIB_DUP
 GNULIB_CLOSE
 GNULIB_CHOWN
-GNULIB_CHDIR
-pkglibexecdir
-runstatedir
-lispdir
-REPLACE_WCTOMB
 REPLACE_UNSETENV
 REPLACE_STRTOD
 REPLACE_SETENV
 REPLACE_REALPATH
-REPLACE_REALLOC
-REPLACE_RANDOM_R
-REPLACE_QSORT_R
 REPLACE_PUTENV
-REPLACE_PTSNAME_R
-REPLACE_PTSNAME
 REPLACE_MKSTEMP
-REPLACE_MBTOWC
-REPLACE_MALLOC
 REPLACE_CANONICALIZE_FILE_NAME
-REPLACE_CALLOC
-HAVE_DECL_UNSETENV
+HAVE_UNSETENV
 HAVE_UNLOCKPT
 HAVE_SYS_LOADAVG_H
 HAVE_STRUCT_RANDOM_DATA
 HAVE_STRTOULL
 HAVE_STRTOLL
 HAVE_STRTOD
-HAVE_DECL_SETENV
 HAVE_SETENV
-HAVE_SECURE_GETENV
 HAVE_RPMATCH
 HAVE_REALPATH
+HAVE_REALLOC_POSIX
 HAVE_RANDOM_R
-HAVE_RANDOM_H
-HAVE_RANDOM
-HAVE_PTSNAME_R
 HAVE_PTSNAME
-HAVE_POSIX_OPENPT
 HAVE_MKSTEMPS
 HAVE_MKSTEMP
 HAVE_MKOSTEMPS
 HAVE_MKOSTEMP
 HAVE_MKDTEMP
+HAVE_MALLOC_POSIX
 HAVE_GRANTPT
 HAVE_GETSUBOPT
 HAVE_DECL_GETLOADAVG
 HAVE_CANONICALIZE_FILE_NAME
+HAVE_CALLOC_POSIX
 HAVE_ATOLL
-HAVE__EXIT
-GNULIB_WCTOMB
 GNULIB_UNSETENV
 GNULIB_UNLOCKPT
-GNULIB_SYSTEM_POSIX
 GNULIB_STRTOULL
 GNULIB_STRTOLL
 GNULIB_STRTOD
 GNULIB_SETENV
-GNULIB_SECURE_GETENV
 GNULIB_RPMATCH
 GNULIB_REALPATH
 GNULIB_REALLOC_POSIX
 GNULIB_RANDOM_R
-GNULIB_RANDOM
-GNULIB_QSORT_R
 GNULIB_PUTENV
-GNULIB_PTSNAME_R
 GNULIB_PTSNAME
-GNULIB_POSIX_OPENPT
 GNULIB_MKSTEMPS
 GNULIB_MKSTEMP
 GNULIB_MKOSTEMPS
 GNULIB_MKOSTEMP
 GNULIB_MKDTEMP
-GNULIB_MBTOWC
 GNULIB_MALLOC_POSIX
 GNULIB_GRANTPT
 GNULIB_GETSUBOPT
@@ -1337,18 +1259,6 @@
 GNULIB_CANONICALIZE_FILE_NAME
 GNULIB_CALLOC_POSIX
 GNULIB_ATOLL
-GNULIB__EXIT
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ANSICXX_FALSE
-ANSICXX_TRUE
-CXXFLAGS
-ac_ct_CXX
-CXX
-CXX_CHOICE
-GL_GENERATE_ALLOCA_H_FALSE
-GL_GENERATE_ALLOCA_H_TRUE
 ALLOCA_H
 GL_COND_LIBTOOL_FALSE
 GL_COND_LIBTOOL_TRUE
@@ -1377,14 +1287,6 @@
 INTL_MACOSX_LIBS
 GLIBC21
 INTLBISON
-GL_GENERATE_ICONV_H_FALSE
-GL_GENERATE_ICONV_H_TRUE
-ICONV_H
-REPLACE_ICONV_UTF
-REPLACE_ICONV_OPEN
-REPLACE_ICONV
-ICONV_CONST
-GNULIB_ICONV
 LTLIBICONV
 LIBICONV
 LTLIBMULTITHREAD
@@ -1417,8 +1319,8 @@
 LIPO
 NMEDIT
 DSYMUTIL
-MANIFEST_TOOL
-ac_ct_AR
+lt_ECHO
+AR
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -1431,8 +1333,6 @@
 DLLTOOL
 AS
 RANLIB
-ARFLAGS
-AR
 host_os
 host_vendor
 host_cpu
@@ -1471,7 +1371,6 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
-am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1487,8 +1386,6 @@
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -1558,22 +1455,19 @@
 enable_java
 enable_native_java
 enable_csharp
-enable_largefile
-enable_threads
 enable_shared
 enable_static
 with_pic
 enable_fast_install
 with_gnu_ld
-with_sysroot
 enable_libtool_lock
 enable_nls
+enable_threads
 enable_rpath
 with_libpth_prefix
 with_libiconv_prefix
 with_included_gettext
 with_libintl_prefix
-enable_c__
 enable_relocatable
 enable_libasprintf
 '
@@ -1630,7 +1524,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc/${PACKAGE}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1652,9 +1546,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1699,9 +1592,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1725,9 +1618,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1929,9 +1822,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1945,9 +1838,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1975,8 +1868,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1984,7 +1877,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1994,7 +1887,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -2002,13 +1895,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -2031,7 +1924,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -2045,6 +1938,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -2059,9 +1954,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -2100,11 +1995,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2130,7 +2025,7 @@
   # 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.3 to adapt to many kinds of systems.
+\`configure' configures this package to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2144,7 +2039,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -2178,7 +2073,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/gettext-runtime]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -2199,36 +2094,30 @@
 fi
 
 if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext-runtime 0.19.3:";;
-   esac
+
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-java          do not build Java sources
   --disable-native-java   do not compile Java to native executables
   --enable-csharp[=IMPL]  choose preferred C# implementation (pnet or mono)
-  --disable-largefile     omit support for large files
-  --enable-threads={posix|solaris|pth|windows}
-                          specify multithreading API
-  --disable-threads       build without multithread safety
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-nls           do not use Native Language Support
+  --enable-threads={posix|solaris|pth|win32}
+                          specify multithreading API
+  --disable-threads       build without multithread safety
   --disable-rpath         do not hardcode runtime library paths
-  --disable-c++           do not build C++ sources
   --enable-relocatable    install a package that can be moved in the file
                           system
   --disable-libasprintf   do not build libasprintf
@@ -2236,12 +2125,10 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+  --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libpth-prefix[=DIR]  search for libpth in DIR/include and DIR/lib
   --without-libpth-prefix     don't search for libpth in includedir and libdir
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
@@ -2258,9 +2145,8 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  YACC        The `Yet Another Compiler Compiler' implementation to use.
-              Defaults to the first program found out of: `bison -y', `byacc',
-              `yacc'.
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
@@ -2271,7 +2157,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <bug-gnu-gettext@gnu.org>.
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -2334,10 +2220,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext-runtime configure 0.19.3
-generated by GNU Autoconf 2.69
+configure
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2381,7 +2267,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -2407,7 +2293,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2418,7 +2304,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -2431,10 +2317,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2470,7 +2356,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2493,15 +2379,11 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
-## Report this to bug-gnu-gettext@gnu.org ##
-## -------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2510,7 +2392,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_mongrel
 
@@ -2551,7 +2433,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2565,7 +2447,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2583,7 +2465,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_compile
 
@@ -2614,7 +2496,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2628,7 +2510,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2641,7 +2523,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2696,7 +2578,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
 
@@ -2709,7 +2591,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2750,56 +2632,10 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -2817,8 +2653,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2834,8 +2669,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2861,8 +2695,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2878,8 +2711,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2913,8 +2745,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2978,16 +2809,55 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -3097,9 +2967,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -3133,9 +3005,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -3148,9 +3022,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -3164,9 +3040,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -3221,12 +3099,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -3241,11 +3114,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
@@ -3267,39 +3136,40 @@
 fi
 
 gt_needs="$gt_needs need-ngettext"
-as_fn_append ac_header_list " stdlib.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_header_list " sys/param.h"
-as_fn_append ac_func_list " symlink"
-as_fn_append ac_header_list " string.h"
-as_fn_append ac_func_list " canonicalize_file_name"
-as_fn_append ac_func_list " getcwd"
-as_fn_append ac_func_list " readlink"
-as_fn_append ac_func_list " realpath"
-as_fn_append ac_func_list " readlinkat"
+gl_header_list="$gl_header_list stdlib.h"
+gl_header_list="$gl_header_list unistd.h"
+gl_header_list="$gl_header_list sys/param.h"
+gl_header_list="$gl_header_list string.h"
+gl_func_list="$gl_func_list canonicalize_file_name"
+gl_func_list="$gl_func_list getcwd"
+gl_func_list="$gl_func_list readlink"
+gl_func_list="$gl_func_list realpath"
+gl_header_list="$gl_header_list errno.h"
 gl_getopt_required=GNU
-as_fn_append ac_header_list " getopt.h"
-as_fn_append ac_header_list " sys/time.h"
-as_fn_append ac_header_list " sys/socket.h"
-as_fn_append ac_func_list " gettimeofday"
-as_fn_append ac_header_list " iconv.h"
-as_fn_append ac_func_list " iswcntrl"
-as_fn_append ac_header_list " wctype.h"
-as_fn_append ac_func_list " iswblank"
-as_fn_append ac_header_list " xlocale.h"
-as_fn_append ac_func_list " lstat"
-as_fn_append ac_func_list " mbsinit"
-as_fn_append ac_func_list " mbrtowc"
-as_fn_append ac_func_list " mbslen"
-as_fn_append ac_header_list " sys/mman.h"
-as_fn_append ac_func_list " mprotect"
-as_fn_append ac_func_list " _set_invalid_parameter_handler"
-as_fn_append ac_func_list " setenv"
-as_fn_append ac_header_list " wchar.h"
-as_fn_append ac_header_list " stdint.h"
-as_fn_append ac_header_list " sys/stat.h"
-as_fn_append ac_header_list " features.h"
-as_fn_append ac_func_list " wcwidth"
+gl_header_list="$gl_header_list getopt.h"
+gl_header_list="$gl_header_list iconv.h"
+gl_func_list="$gl_func_list lstat"
+gl_func_list="$gl_func_list mbsinit"
+gl_func_list="$gl_func_list mbrtowc"
+gl_func_list="$gl_func_list mbslen"
+gl_header_list="$gl_header_list sys/mman.h"
+gl_func_list="$gl_func_list mprotect"
+gl_func_list="$gl_func_list memchr"
+gl_func_list="$gl_func_list pathconf"
+gl_func_list="$gl_func_list setenv"
+gl_header_list="$gl_header_list sys/socket.h"
+gl_header_list="$gl_header_list signal.h"
+gl_header_list="$gl_header_list stddef.h"
+gl_header_list="$gl_header_list stdint.h"
+gl_header_list="$gl_header_list wchar.h"
+gl_header_list="$gl_header_list stdio.h"
+gl_header_list="$gl_header_list sys/stat.h"
+gl_header_list="$gl_header_list time.h"
+gl_header_list="$gl_header_list sys/time.h"
+gl_func_list="$gl_func_list iswcntrl"
+gl_func_list="$gl_func_list iswblank"
+gl_header_list="$gl_header_list wctype.h"
+gl_func_list="$gl_func_list wcwidth"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -3355,7 +3225,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3371,22 +3241,16 @@
 
 ac_aux_dir=
 for ac_dir in ../build-aux "$srcdir"/../build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../build-aux \"$srcdir\"/../build-aux" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in ../build-aux \"$srcdir\"/../build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3398,7 +3262,14 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+. $srcdir/../version.sh
+
+
+
+
+
+
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3417,7 +3288,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3437,7 +3308,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3495,71 +3366,56 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -3582,12 +3438,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -3599,17 +3455,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -3621,7 +3477,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3649,7 +3505,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -3661,7 +3517,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3702,7 +3558,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3712,7 +3568,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -3741,13 +3597,20 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3759,7 +3622,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3787,7 +3650,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3795,7 +3658,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3828,47 +3691,22 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
 AM_BACKSLASH='\'
 
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+
+
+  if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3883,22 +3721,13 @@
 
 
 # Define the identity of the package.
- PACKAGE='gettext-runtime'
- VERSION='0.19.3'
+ PACKAGE=''
+ VERSION=''
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+# Some tools Automake needs.
 
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
 
 
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
@@ -3912,74 +3741,39 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
 
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
+    PACKAGE=gettext-runtime
 
+     VERSION=$VERSION_NUMBER
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
 
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
 
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
 
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3991,7 +3785,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4003,7 +3797,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4031,7 +3825,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4043,7 +3837,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4084,7 +3878,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4096,7 +3890,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4124,7 +3918,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4137,7 +3931,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4183,7 +3977,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4195,7 +3989,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4227,7 +4021,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4239,7 +4033,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4281,8 +4075,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4396,8 +4190,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -4439,8 +4234,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4497,9 +4292,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -4510,7 +4305,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4550,8 +4345,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4561,7 +4356,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4598,7 +4393,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4676,7 +4471,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4685,7 +4480,8 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4769,65 +4565,6 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4847,7 +4584,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -4880,7 +4617,6 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4896,16 +4632,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4939,16 +4674,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4957,16 +4692,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5027,7 +4762,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
+if test "${ac_cv_prog_YACC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -5039,7 +4774,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5100,7 +4835,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5130,7 +4865,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5146,11 +4881,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -5189,7 +4924,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5205,18 +4940,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5228,7 +4963,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5242,7 +4977,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -5277,7 +5012,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -5291,7 +5026,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5308,7 +5043,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5343,7 +5078,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5376,7 +5111,7 @@
 
   source_version=1.3
   test -n "$source_version" || {
-    as_fn_error $? "missing source-version argument to gt_JAVACOMP" "$LINENO" 5
+    as_fn_error "missing source-version argument to gt_JAVACOMP" "$LINENO" 5
   }
   target_version=1.1
   case "$source_version" in
@@ -5386,7 +5121,7 @@
          failcode='class conftestfail<T> { T foo() { return null; } }' ;;
     1.5) goodcode='class conftest<T>     { T foo() { return null; } }'
          failcode='class conftestfail syntax error' ;;
-    *) as_fn_error $? "invalid source-version argument to gt_JAVACOMP: $source_version" "$LINENO" 5 ;;
+    *) as_fn_error "invalid source-version argument to gt_JAVACOMP: $source_version" "$LINENO" 5 ;;
   esac
   case "$target_version" in
     1.1) cfversion=45 ;;
@@ -5395,7 +5130,7 @@
     1.4) cfversion=48 ;;
     1.5) cfversion=49 ;;
     1.6) cfversion=50 ;;
-    *) as_fn_error $? "invalid target-version argument to gt_JAVACOMP: $target_version" "$LINENO" 5 ;;
+    *) as_fn_error "invalid target-version argument to gt_JAVACOMP: $target_version" "$LINENO" 5 ;;
   esac
   # Function to output the classfile version of a file (8th byte) in decimal.
   if od -A x < /dev/null >/dev/null 2>/dev/null; then
@@ -5432,23 +5167,23 @@
         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:5435: $JAVAC -d . conftest.java" >&5
+        if { echo "$as_me:5170: $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:5442: $JAVAC -fsource=$source_version -d . conftest.java" >&5
+          if { echo "$as_me:5177: $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:5447: $JAVAC -d . conftestfail.java" >&5
+             && { echo "$as_me:5182: $JAVAC -d . conftestfail.java" >&5
                   $JAVAC -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:5451: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:5186: $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"
@@ -5462,7 +5197,7 @@
         else
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:5465: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+          if { echo "$as_me:5200: $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 \
@@ -5475,7 +5210,7 @@
       else
                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
                     rm -f conftest.class
-          if { echo "$as_me:5478: $JAVAC -d . conftest.java" >&5
+          if { echo "$as_me:5213: $JAVAC -d . conftest.java" >&5
                $JAVAC -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class; then
@@ -5487,7 +5222,7 @@
           if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                     javac_works=
             rm -f conftest.class
-            if { echo "$as_me:5490: $JAVAC -d . conftest.java" >&5
+            if { echo "$as_me:5225: $JAVAC -d . conftest.java" >&5
                  $JAVAC -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -5495,7 +5230,7 @@
             fi
             javac_noassert_works=
             rm -f conftest.class
-            if { echo "$as_me:5498: $JAVAC -fno-assert -d . conftest.java" >&5
+            if { echo "$as_me:5233: $JAVAC -fno-assert -d . conftest.java" >&5
                  $JAVAC -fno-assert -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -5503,11 +5238,11 @@
             fi
             if test -n "$javac_works" && test -n "$javac_noassert_works"; then
               rm -f conftestfail.class
-              if { echo "$as_me:5506: $JAVAC -d . conftestfail.java" >&5
+              if { echo "$as_me:5241: $JAVAC -d . conftestfail.java" >&5
                    $JAVAC -d . conftestfail.java >&5 2>&1
                  } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:5510: $JAVAC -fno-assert -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:5245: $JAVAC -fno-assert -d . conftestfail.java" >&5
                         $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
                       }; then
                                 javac_works=
@@ -5529,23 +5264,23 @@
       fi
     else
                   rm -f conftest.class
-      if { echo "$as_me:5532: $JAVAC -d . conftest.java" >&5
+      if { echo "$as_me:5267: $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:5539: $JAVAC -source $source_version -d . conftest.java" >&5
+        if { echo "$as_me:5274: $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:5544: $JAVAC -d . conftestfail.java" >&5
+           && { echo "$as_me:5279: $JAVAC -d . conftestfail.java" >&5
                 $JAVAC -d . conftestfail.java >&5 2>&1
               } \
            && test -f conftestfail.class \
-           && ! { echo "$as_me:5548: $JAVAC -source $source_version -d . conftestfail.java" >&5
+           && ! { echo "$as_me:5283: $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"
@@ -5558,23 +5293,23 @@
         fi
       else
                         rm -f conftest.class
-        if { echo "$as_me:5561: $JAVAC -target $target_version -d . conftest.java" >&5
+        if { echo "$as_me:5296: $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:5568: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:5303: $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:5573: $JAVAC -target $target_version -d . conftestfail.java" >&5
+             && { echo "$as_me:5308: $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:5577: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:5312: $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"
@@ -5587,7 +5322,7 @@
           fi
         else
                                         rm -f conftest.class
-          if { echo "$as_me:5590: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:5325: $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 \
@@ -5604,7 +5339,7 @@
                 # Extract the first word of "gcj", so it can be a program name with args.
 set dummy gcj; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_GCJ_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_GCJ_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_GCJ_IN_PATH"; then
@@ -5616,7 +5351,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_GCJ_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5638,7 +5373,7 @@
     # Extract the first word of "javac", so it can be a program name with args.
 set dummy javac; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JAVAC_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JAVAC_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JAVAC_IN_PATH"; then
@@ -5650,7 +5385,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JAVAC_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5672,7 +5407,7 @@
     # Extract the first word of "jikes", so it can be a program name with args.
 set dummy jikes; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JIKES_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JIKES_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JIKES_IN_PATH"; then
@@ -5684,7 +5419,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JIKES_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5705,28 +5440,28 @@
 
                 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:5708: gcj -C -d . conftestlib.java" >&5
+                if { echo "$as_me:5443: 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:5713: gcj -C -d . conftest.java" >&5
+            if { echo "$as_me:5448: 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:5720: gcj -C -fsource=$source_version -d . conftest.java" >&5
+              if { echo "$as_me:5455: 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:5725: gcj -C -d . conftestfail.java" >&5
+                 && { echo "$as_me:5460: gcj -C -d . conftestfail.java" >&5
                       gcj -C -d . conftestfail.java >&5 2>&1
                     } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:5729: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:5464: 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"
@@ -5740,7 +5475,7 @@
             else
                             rm -f conftest.class
               rm -f conftestfail.class
-              if { echo "$as_me:5743: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+              if { echo "$as_me:5478: 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 \
@@ -5753,7 +5488,7 @@
           else
                                                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
               rm -f conftest.class
-              if { echo "$as_me:5756: gcj -C -d . conftest.java" >&5
+              if { echo "$as_me:5491: gcj -C -d . conftest.java" >&5
                    gcj -C -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class; then
@@ -5764,7 +5499,7 @@
             else
               if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                                 rm -f conftest.class
-                if { echo "$as_me:5767: gcj -C -fno-assert -d . conftest.java" >&5
+                if { echo "$as_me:5502: gcj -C -fno-assert -d . conftest.java" >&5
                      gcj -C -fno-assert -d . conftest.java >&5 2>&1
                    } \
                    && test -f conftest.class; then
@@ -5773,7 +5508,7 @@
                   HAVE_JAVACOMP=1
                 else
                   rm -f conftest.class
-                  if { echo "$as_me:5776: gcj -C -d . conftest.java" >&5
+                  if { echo "$as_me:5511: gcj -C -d . conftest.java" >&5
                        gcj -C -d . conftest.java >&5 2>&1
                      } \
                      && test -f conftest.class; then
@@ -5792,23 +5527,23 @@
             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:5795: javac -d . conftest.java" >&5
+        if { echo "$as_me:5530: 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:5802: javac -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:5537: 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:5807: javac -d . conftestfail.java" >&5
+             && { echo "$as_me:5542: javac -d . conftestfail.java" >&5
                   javac -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:5811: javac -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:5546: 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"
@@ -5821,23 +5556,23 @@
           fi
         else
                               rm -f conftest.class
-          if { echo "$as_me:5824: javac -target $target_version -d . conftest.java" >&5
+          if { echo "$as_me:5559: 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:5831: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:5566: 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:5836: javac -target $target_version -d . conftestfail.java" >&5
+               && { echo "$as_me:5571: 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:5840: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
+               && ! { echo "$as_me:5575: 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"
@@ -5850,7 +5585,7 @@
             fi
           else
                                                 rm -f conftest.class
-            if { echo "$as_me:5853: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:5588: 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 \
@@ -5901,7 +5636,7 @@
 set dummy jar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_JAR+:} false; then :
+if test "${ac_cv_prog_JAR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$JAR"; then
@@ -5913,7 +5648,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_JAR="jar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5975,7 +5710,7 @@
         # Extract the first word of "cscc", so it can be a program name with args.
 set dummy cscc; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_CSCC_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_CSCC_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_CSCC_IN_PATH"; then
@@ -5987,7 +5722,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_CSCC_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6009,7 +5744,7 @@
   # Extract the first word of "mcs", so it can be a program name with args.
 set dummy mcs; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_MCS_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_MCS_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_MCS_IN_PATH"; then
@@ -6021,7 +5756,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_MCS_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6043,7 +5778,7 @@
   # Extract the first word of "csc", so it can be a program name with args.
 set dummy csc; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_CSC_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_CSC_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_CSC_IN_PATH"; then
@@ -6055,7 +5790,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_CSC_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6136,27 +5871,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -6174,14 +5909,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -6189,7 +5924,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6209,154 +5944,12 @@
 
 
 
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
-$as_echo_n "checking for Minix Amsterdam compiler... " >&6; }
-if ${gl_cv_c_amsterdam_compiler+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef __ACK__
-Amsterdam
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Amsterdam" >/dev/null 2>&1; then :
-  gl_cv_c_amsterdam_compiler=yes
-else
-  gl_cv_c_amsterdam_compiler=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-$as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
-  if test -z "$AR"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      AR='cc -c.a'
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='-o'
-      fi
-    else
-                  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="ar"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
-      fi
-    fi
-  else
-    if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
-    fi
-  fi
-
-
-  if test -z "$RANLIB"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      RANLIB=':'
-    else
-            if test -n "$ac_tool_prefix"; then
+if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -6368,7 +5961,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6396,7 +5989,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -6408,7 +6001,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6443,14 +6036,135 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
     fi
   fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
+fi
 
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6567,7 +6281,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6578,8 +6293,10 @@
 
 
 
+
+
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
   MINIX=yes
 else
   MINIX=
@@ -6596,15 +6313,20 @@
 
 $as_echo "#define _MINIX 1" >>confdefs.h
 
+  fi
+
+        case "$host_os" in
+    hpux*)
 
-$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
 
-  fi
+      ;;
+  esac
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6634,368 +6356,57 @@
 
   $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-  $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
-
   $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
   $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
-$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if ${ac_cv_should_define__xopen_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_should_define__xopen_source=no
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #include <wchar.h>
-          mbstate_t x;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #define _XOPEN_SOURCE 500
-             #include <wchar.h>
-             mbstate_t x;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_should_define__xopen_source=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-$as_echo "$ac_cv_should_define__xopen_source" >&6; }
-  test $ac_cv_should_define__xopen_source = yes &&
-    $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-
-
-
-
-
-
-
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-         if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-         CC="$CC -n32"
-         if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-
-
-$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h
-
-fi
-
 
 
 
 
 
-  # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads; gl_use_threads=$enableval
-else
-  if test -n "$gl_use_threads_default"; then
-       gl_use_threads="$gl_use_threads_default"
-     else
-       case "$host_os" in
-                                                               osf*) gl_use_threads=no ;;
-         cygwin*)
-               case `uname -r` in
-                 1.[0-5].*) gl_use_threads=no ;;
-                 *)         gl_use_threads=yes ;;
-               esac
-               ;;
-         *)    gl_use_threads=yes ;;
-       esac
-     fi
-
-fi
 
-  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-    # For using <pthread.h>:
-    case "$host_os" in
-      osf*)
-        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
-        # groks <pthread.h>. cc also understands the flag -pthread, but
-        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
-        # 2. putting a flag into CPPFLAGS that has an effect on the linker
-        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
-        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
-        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-        ;;
-    esac
-    # Some systems optimize for single-threaded programs by default, and
-    # need special flags to disable these optimizations. For example, the
-    # definition of 'errno' in <errno.h>.
-    case "$host_os" in
-      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
-      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
-    esac
-  fi
 
 
 
 
-  # Code from module absolute-header:
   # Code from module alloca-opt:
-  # Code from module allocator:
-  # Code from module ansi-c++-opt:
   # Code from module areadlink:
+  # Code from module arg-nonnull:
   # Code from module atexit:
   # Code from module basename:
+  # Code from module c++defs:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module canonicalize-lgpl:
-  # Code from module careadlinkat:
   # Code from module closeout:
   # Code from module configmake:
   # Code from module csharpcomp-script:
-  # Code from module dosname:
   # Code from module double-slash-root:
   # Code from module environ:
   # Code from module errno:
   # Code from module error:
   # Code from module extensions:
 
-  # Code from module extern-inline:
   # Code from module fwriteerror:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
   # Code from module gettext-h:
   # Code from module gettext-runtime-misc:
-  # Code from module gettimeofday:
   # Code from module gperf:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
   # Code from module iconv_open:
   # Code from module include_next:
-  # Code from module inline:
   # Code from module intprops:
-  # Code from module iswblank:
   # Code from module java:
   # Code from module javacomp-script:
-  # Code from module largefile:
-
   # Code from module localcharset:
-  # Code from module locale:
-  # Code from module localename:
-  # Code from module lock:
   # Code from module lstat:
+  # Code from module malloc-posix:
   # Code from module malloca:
   # Code from module mbchar:
   # Code from module mbiter:
@@ -7006,26 +6417,16 @@
   # Code from module mbuiter:
   # Code from module memchr:
   # Code from module memmove:
-  # Code from module msvc-inval:
-  # Code from module msvc-nothrow:
   # Code from module multiarch:
-  # Code from module nocrash:
   # Code from module pathmax:
   # Code from module progname:
   # Code from module propername:
-  # Code from module raise:
   # Code from module readlink:
   # Code from module relocatable-prog:
   # Code from module relocatable-prog-wrapper:
-  # Code from module setlocale:
-  # Code from module signal-h:
+  # Code from module signal:
   # Code from module sigpipe:
   # Code from module sigprocmask:
-  # Code from module snippet/_Noreturn:
-  # Code from module snippet/arg-nonnull:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/unused-parameter:
-  # Code from module snippet/warn-on-use:
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stdbool:
@@ -7035,32 +6436,24 @@
   # Code from module stdlib:
   # Code from module streq:
   # Code from module strerror:
-  # Code from module strerror-override:
   # Code from module striconv:
   # Code from module string:
   # Code from module strnlen:
   # Code from module strnlen1:
+  # Code from module strtol:
   # Code from module strtoul:
   # Code from module sys_stat:
-  # Code from module sys_time:
-  # Code from module sys_types:
-  # Code from module threadlib:
-
-
-
   # Code from module time:
   # Code from module trim:
   # Code from module unistd:
-  # Code from module unistr/base:
-  # Code from module unistr/u8-mbtoucr:
-  # Code from module unistr/u8-uctomb:
   # Code from module unitypes:
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
   # Code from module unlocked-io:
   # Code from module verify:
+  # Code from module warn-on-use:
   # Code from module wchar:
-  # Code from module wctype-h:
+  # Code from module wctype:
   # Code from module wcwidth:
   # Code from module xalloc:
   # Code from module xreadlink:
@@ -7070,12 +6463,11 @@
 
 
 
-
   case "$host_os" in
     mingw* | cygwin*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
 $as_echo_n "checking for auto-import of symbols... " >&6; }
-      if ${gl_cv_ld_autoimport+:} false; then :
+      if test "${gl_cv_ld_autoimport+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7119,8 +6511,8 @@
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.2.6'
+macro_revision='1.3012'
 
 
 
@@ -7136,78 +6528,9 @@
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -7227,7 +6550,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -7262,7 +6585,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -7289,7 +6612,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -7306,7 +6629,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -7341,7 +6664,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -7420,7 +6743,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -7457,10 +6780,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -7487,7 +6810,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -7495,7 +6818,10 @@
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+  if test -n "$ac_tool_prefix" \
+     && { test "$build" = "$host" \
+          || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
+        }; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -7512,13 +6838,13 @@
 	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 	*/dev/null* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
+	  break
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
+	    break
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -7550,7 +6876,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -7562,7 +6888,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7594,7 +6920,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -7606,7 +6932,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7666,18 +6992,18 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7000: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7003: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  (eval echo "\"\$as_me:7006: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7701,7 +7027,7 @@
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -7734,11 +7060,6 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -7764,11 +7085,6 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -7808,8 +7124,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -7851,8 +7167,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7901,83 +7217,9 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
@@ -7991,11 +7233,6 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -8018,7 +7255,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -8030,7 +7267,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8058,7 +7295,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -8070,7 +7307,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8114,7 +7351,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -8156,18 +7393,16 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc*)
+cegcc)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -8197,10 +7432,6 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -8209,11 +7440,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -8234,8 +7465,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -8316,21 +7547,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -8346,162 +7562,12 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -8513,8 +7579,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8534,18 +7600,14 @@
 fi
 
 
-    test -n "$AR" && break
-  done
 fi
-if test -z "$AR"; then
+if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -8557,8 +7619,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8577,10 +7639,6 @@
 $as_echo "no" >&6; }
 fi
 
-
-  test -n "$ac_ct_AR" && break
-done
-
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -8592,72 +7650,16 @@
 esac
     AR=$ac_ct_AR
   fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  AR="$ac_cv_prog_AR"
+fi
 
-int
-main ()
-{
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
 
 
 
@@ -8670,7 +7672,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -8682,7 +7684,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8710,7 +7712,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -8722,7 +7724,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8769,7 +7771,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -8781,7 +7783,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8809,7 +7811,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -8821,7 +7823,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8871,27 +7873,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
 
 
 
@@ -8938,7 +7928,7 @@
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8999,8 +7989,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -9024,7 +8014,6 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -9037,7 +8026,6 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -9063,8 +8051,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -9079,18 +8067,6 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -9102,7 +8078,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
+const struct {
   const char *name;
   void       *address;
 }
@@ -9128,8 +8104,8 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -9139,8 +8115,8 @@
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -9177,15 +8153,6 @@
 $as_echo "ok" >&6; }
 fi
 
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
 
 
 
@@ -9207,52 +8174,12 @@
 
 
 
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
 
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
@@ -9278,7 +8205,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  echo '#line 8208 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9372,7 +8299,7 @@
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -9413,7 +8340,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-*-*solaris*)
+sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -9424,20 +8351,7 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -9453,123 +8367,6 @@
 
 need_locks="$enable_libtool_lock"
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
 
   case $host_os in
     rhapsody* | darwin*)
@@ -9578,7 +8375,7 @@
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -9590,7 +8387,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9618,7 +8415,7 @@
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -9630,7 +8427,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9670,7 +8467,7 @@
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -9682,7 +8479,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9710,7 +8507,7 @@
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -9722,7 +8519,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9762,7 +8559,7 @@
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -9774,7 +8571,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9802,7 +8599,7 @@
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -9814,7 +8611,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9854,7 +8651,7 @@
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -9866,7 +8663,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9894,7 +8691,7 @@
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -9906,7 +8703,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9946,7 +8743,7 @@
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -9958,7 +8755,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9986,7 +8783,7 @@
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -9998,7 +8795,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10061,7 +8858,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -10077,13 +8874,7 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -10094,10 +8885,9 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
@@ -10127,41 +8917,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -10189,7 +8944,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test "$DSYMUTIL" != ":"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -10201,7 +8956,7 @@
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -10212,19 +8967,17 @@
 
 
 
-
-
 # Set options
 enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
+if test "${ac_cv_prog_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -10236,7 +8989,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10264,7 +9017,7 @@
 set dummy as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
@@ -10276,7 +9029,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10316,7 +9069,7 @@
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
@@ -10328,7 +9081,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10356,7 +9109,7 @@
 set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
@@ -10368,7 +9121,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10408,7 +9161,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -10420,7 +9173,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10448,7 +9201,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -10460,7 +9213,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10587,22 +9340,7 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+  withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
 fi
@@ -10679,11 +9417,6 @@
 
 
 
-
-
-
-
-
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -10705,7 +9438,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -10733,6 +9466,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -10745,6 +9491,23 @@
   ;;
 esac
 
+# 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'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -10773,7 +9536,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -10783,7 +9546,7 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -10849,7 +9612,7 @@
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -10982,16 +9745,11 @@
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -11007,15 +9765,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9768: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:9772: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -11044,6 +9802,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -11091,12 +9851,6 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -11139,15 +9893,6 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -11189,7 +9934,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -11210,13 +9955,7 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+      pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -11228,40 +9967,25 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -11293,7 +10017,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+      f77* | f90* | f95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -11350,17 +10074,13 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -11368,7 +10088,7 @@
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -11384,15 +10104,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10107: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:10111: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -11421,18 +10141,13 @@
 
 
 
-
-
-
-
-
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -11445,7 +10160,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -11475,7 +10190,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -11494,16 +10209,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10212: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:10216: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -11530,7 +10245,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -11549,16 +10264,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10267: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:10271: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -11624,6 +10339,7 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -11670,33 +10386,7 @@
   esac
 
   ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -11714,7 +10404,6 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11730,12 +10419,11 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
 _LT_EOF
       fi
@@ -11771,12 +10459,10 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -11794,11 +10480,6 @@
       fi
       ;;
 
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -11814,7 +10495,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -11824,16 +10505,15 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=' $pic_flag'
+	tmp_addflag=
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -11844,17 +10524,13 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -11870,16 +10546,17 @@
         fi
 
 	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
+	xlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -11893,8 +10570,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -11912,8 +10589,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -11959,8 +10636,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -12000,10 +10677,8 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -12090,13 +10765,7 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12109,32 +10778,25 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -12143,13 +10805,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12162,42 +10818,30 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -12229,64 +10873,20 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     darwin* | rhapsody*)
@@ -12296,12 +10896,7 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
+  whole_archive_flag_spec=''
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -12309,7 +10904,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -12327,6 +10922,10 @@
       hardcode_shlibpath_var=no
       ;;
 
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -12339,7 +10938,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -12348,7 +10947,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -12356,7 +10955,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -12371,13 +10970,14 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -12389,16 +10989,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -12410,46 +11010,7 @@
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
@@ -12477,39 +11038,26 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo (void) { return 0; }
+int foo(void) {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
+        LDFLAGS="$save_LDFLAGS"
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -12571,17 +11119,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -12591,13 +11139,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -12610,9 +11158,9 @@
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -12800,50 +11348,44 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
@@ -13001,6 +11543,11 @@
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -13009,23 +11556,16 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -13038,7 +11578,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -13058,13 +11598,7 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -13090,7 +11624,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -13099,7 +11633,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -13152,7 +11686,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -13164,7 +11698,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -13183,9 +11717,8 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -13206,83 +11739,36 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
     ;;
   esac
+  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -13303,7 +11789,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -13311,6 +11797,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -13318,7 +11808,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -13336,7 +11826,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -13356,26 +11846,12 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -13428,7 +11904,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -13444,7 +11920,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -13481,9 +11957,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -13491,17 +11967,12 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13514,17 +11985,13 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -13533,7 +12000,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -13565,7 +12032,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -13634,7 +12101,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -13659,7 +12126,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -13683,7 +12150,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -13714,7 +12181,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -13724,7 +12191,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -13913,7 +12380,7 @@
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13947,7 +12414,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -13961,12 +12428,12 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14000,16 +12467,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14043,12 +12510,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14082,12 +12549,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14121,7 +12588,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -14162,7 +12629,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -14171,7 +12638,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 12641 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14212,13 +12679,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -14227,11 +12688,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -14268,7 +12725,7 @@
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -14277,7 +12734,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 12737 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14318,13 +12775,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -14333,11 +12784,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -14506,8 +12953,6 @@
 
 
 
-
-
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -14522,7 +12967,7 @@
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RC+:} false; then :
+if test "${ac_cv_prog_RC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RC"; then
@@ -14534,7 +12979,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14562,7 +13007,7 @@
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RC+:} false; then :
+if test "${ac_cv_prog_ac_ct_RC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RC"; then
@@ -14574,7 +13019,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RC="windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14658,11 +13103,9 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
-CFLAGS=
 compiler=$CC
 compiler_RC=$CC
 for cc_temp in $compiler""; do
@@ -14673,7 +13116,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 lt_cv_prog_compiler_c_o_RC=yes
 
@@ -14691,8 +13134,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
 
 
 case "$host_os" in
@@ -14725,7 +13167,7 @@
 
 
 
-      GETTEXT_MACRO_VERSION=0.19
+      GETTEXT_MACRO_VERSION=0.18
 
 
 
@@ -14733,14 +13175,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -14761,7 +13204,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -14802,7 +13245,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -14816,7 +13259,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14855,14 +13298,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -14883,7 +13327,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -14932,14 +13376,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -14960,7 +13405,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -15009,7 +13454,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2 or newer" >&5
 $as_echo_n "checking whether we are using the GNU C Library 2 or newer... " >&6; }
-if ${ac_cv_gnu_library_2+:} false; then :
+if test "${ac_cv_gnu_library_2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15017,7 +13462,7 @@
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
@@ -15047,7 +13492,7 @@
   if test -n "$GCC"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 $as_echo_n "checking whether the -Werror option is usable... " >&6; }
-    if ${gl_cv_cc_vis_werror+:} false; then :
+    if test "${gl_cv_cc_vis_werror+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15077,7 +13522,7 @@
 $as_echo "$gl_cv_cc_vis_werror" >&6; }
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 $as_echo_n "checking for simple visibility declarations... " >&6; }
-    if ${gl_cv_cc_visibility+:} false; then :
+    if test "${gl_cv_cc_visibility+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15089,11 +13534,10 @@
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-             void dummyfunc (void) {}
-
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+         void dummyfunc (void) {}
 int
 main ()
 {
@@ -15128,7 +13572,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
+if test "${ac_cv_c_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -15169,7 +13613,7 @@
 esac
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
 else
 
@@ -15182,13 +13626,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
 $as_echo_n "checking for stdint.h... " >&6; }
-if ${gl_cv_header_stdint_h+:} false; then :
+if test "${gl_cv_header_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-            #include <stdint.h>
+#include <stdint.h>
 int
 main ()
 {
@@ -15218,7 +13662,7 @@
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
+if test "${ac_cv_working_alloca_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15251,7 +13695,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+if test "${ac_cv_func_alloca_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15270,7 +13714,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
+char *alloca ();
 #    endif
 #   endif
 #  endif
@@ -15314,7 +13758,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
+if test "${ac_cv_os_cray+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15341,7 +13785,8 @@
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -15355,7 +13800,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -15365,20 +13810,23 @@
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction (int *addr, int depth)
+find_stack_direction ()
 {
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
 }
 
 int
-main (int argc, char **argv)
+main ()
 {
-  return find_stack_direction (0, argc + !argv + 20) < 0;
+  return find_stack_direction () < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -15403,12 +13851,13 @@
 
 
 
-  for ac_header in $ac_header_list
+
+  for ac_header in $gl_header_list
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15424,10 +13873,30 @@
 
 
 
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
 for ac_func in getpagesize
 do :
   ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPAGESIZE 1
 _ACEOF
@@ -15437,7 +13906,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -15514,7 +13983,6 @@
 main ()
 {
   char *data, *data2, *data3;
-  const char *cdata2;
   int i, pagesize;
   int fd, fd2;
 
@@ -15539,10 +14007,10 @@
   fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
   if (fd2 < 0)
     return 4;
-  cdata2 = "";
-  if (write (fd2, cdata2, 1) != 1)
+  data2 = "";
+  if (write (fd2, data2, 1) != 1)
     return 5;
-  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
   if (data2 == MAP_FAILED)
     return 6;
   for (i = 0; i < pagesize; ++i)
@@ -15605,14 +14073,14 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5
 $as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
-if ${gt_cv_int_divbyzero_sigfpe+:} false; then :
+if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
       gt_cv_int_divbyzero_sigfpe=
       case "$host_os" in
         macos* | darwin[6-9]* | darwin[1-9][0-9]*)
-          # On Mac OS X 10.2 or newer, just assume the same as when cross-
+          # On MacOS X 10.2 or newer, just assume the same as when cross-
           # compiling. If we were to perform the real test, 1 Crash Report
           # dialog window would pop up.
           case "$host_cpu" in
@@ -15665,7 +14133,7 @@
 
   z = x / y;
   nan = y / y;
-  exit (2);
+  exit (1);
 }
 
 _ACEOF
@@ -15696,15 +14164,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
 $as_echo_n "checking for inttypes.h... " >&6; }
-if ${gl_cv_header_inttypes_h+:} false; then :
+if test "${gl_cv_header_inttypes_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <sys/types.h>
 #include <inttypes.h>
-
 int
 main ()
 {
@@ -15733,12 +14199,10 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
 $as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   /* For now, do not test the preprocessor; as of 2007 there are too many
@@ -15771,13 +14235,12 @@
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-
+  ac_cv_type_unsigned_long_long_int=yes
 else
   ac_cv_type_unsigned_long_long_int=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
@@ -15810,7 +14273,7 @@
   for ac_header in inttypes.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_inttypes_h" = xyes; then :
+if test "x$ac_cv_header_inttypes_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INTTYPES_H 1
 _ACEOF
@@ -15822,13 +14285,12 @@
   if test $ac_cv_header_inttypes_h = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
 $as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
-if ${gt_cv_inttypes_pri_broken+:} false; then :
+if test "${gt_cv_inttypes_pri_broken+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <inttypes.h>
 #ifdef PRId32
 char *p = PRId32;
@@ -15866,6 +14328,57 @@
 
 
 
+
+
+
+
+  # Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads; gl_use_threads=$enableval
+else
+  if test -n "$gl_use_threads_default"; then
+       gl_use_threads="$gl_use_threads_default"
+     else
+       case "$host_os" in
+                                                               osf*) gl_use_threads=no ;;
+         cygwin*)
+               case `uname -r` in
+                 1.[0-5].*) gl_use_threads=no ;;
+                 *)         gl_use_threads=yes ;;
+               esac
+               ;;
+         *)    gl_use_threads=yes ;;
+       esac
+     fi
+
+fi
+
+  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+    # For using <pthread.h>:
+    case "$host_os" in
+      osf*)
+        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+        # groks <pthread.h>. cc also understands the flag -pthread, but
+        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # 2. putting a flag into CPPFLAGS that has an effect on the linker
+        # causes the AC_TRY_LINK test below to succeed unexpectedly,
+        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+        ;;
+    esac
+    # Some systems optimize for single-threaded programs by default, and
+    # need special flags to disable these optimizations. For example, the
+    # definition of 'errno' in <errno.h>.
+    case "$host_os" in
+      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+    esac
+  fi
+
+
+
+
+
       if test "X$prefix" = "XNONE"; then
     acl_final_prefix="$ac_default_prefix"
   else
@@ -15882,7 +14395,6 @@
   prefix="$acl_save_prefix"
 
 
-
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -15893,21 +14405,21 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -15917,11 +14429,11 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
+    [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -15942,30 +14454,27 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
+if test "${acl_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
+        test "$with_gnu_ld" != no && break ;;
       *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+        test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
-  IFS="$acl_save_ifs"
+  IFS="$ac_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -15979,20 +14488,18 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
+  acl_cv_prog_gnu_ld=yes ;;
 *)
-  acl_cv_prog_gnu_ld=no
-  ;;
+  acl_cv_prog_gnu_ld=no ;;
 esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -16004,7 +14511,7 @@
 
                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
+if test "${acl_cv_rpath+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -16042,7 +14549,7 @@
     solaris*)
                                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
 $as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
+if test "${gl_cv_solaris_64bit+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16107,7 +14614,7 @@
   if test "$gl_use_threads" != no; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 $as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
-if ${gl_cv_have_weak+:} false; then :
+if test "${gl_cv_have_weak+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gl_cv_have_weak=no
@@ -16175,7 +14682,7 @@
       # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
       # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
       ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
   gl_have_pthread_h=yes
 else
   gl_have_pthread_h=no
@@ -16190,47 +14697,31 @@
         # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
         # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
         # the second one only in libpthread, and lock.c needs it.
-        #
-        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
-        # needs -pthread for some reason.  See:
-        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
-        save_LIBS=$LIBS
-        for gl_pthread in '' '-pthread'; do
-          LIBS="$LIBS $gl_pthread"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
-                 pthread_mutex_t m;
-                 pthread_mutexattr_t ma;
-
 int
 main ()
 {
-pthread_mutex_lock (&m);
-                 pthread_mutexattr_init (&ma);
+pthread_mutex_lock((pthread_mutex_t*)0);
+           pthread_mutexattr_init((pthread_mutexattr_t*)0);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   gl_have_pthread=yes
-             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
-             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-          LIBS=$save_LIBS
-          test -n "$gl_have_pthread" && break
-        done
-
         # Test for libpthread by looking for pthread_kill. (Not pthread_self,
         # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
+        if test -n "$gl_have_pthread"; then
           # The program links fine without libpthread. But it may actually
           # need to link with libpthread in order to create multiple threads.
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16264,7 +14755,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
   LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
              # On Solaris and HP-UX, most pthread functions exist also in libc.
              # Therefore pthread_in_use() needs to actually try to create a
@@ -16279,11 +14770,11 @@
 
 fi
 
-        elif test -z "$gl_have_pthread"; then
+        else
           # Some library is needed. Try libpthread and libc_r.
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16317,7 +14808,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
   gl_have_pthread=yes
              LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
              LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
@@ -16327,7 +14818,7 @@
             # For FreeBSD 4.
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
 $as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_pthread_kill+:} false; then :
+if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16361,7 +14852,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
 $as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then :
   gl_have_pthread=yes
                LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
                LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
@@ -16393,10 +14884,8 @@
         LIBS="$LIBS -lthread"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <thread.h>
 #include <synch.h>
-
 int
 main ()
 {
@@ -16439,7 +14928,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
 $as_echo_n "checking how to link with libpth... " >&6; }
-if ${ac_cv_libpth_libs+:} false; then :
+if test "${ac_cv_libpth_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -16517,7 +15006,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -16948,7 +15437,7 @@
 
       gl_have_pth=
       gl_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBPTH"
+      LIBS="$LIBS -lpth"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pth.h>
@@ -16989,20 +15478,18 @@
       fi
     fi
     if test -z "$gl_have_pthread"; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
+        if { case "$host_os" in
+               mingw*) true;;
+               *) false;;
+             esac
+           }; then
+          gl_threads_api=win32
 
-$as_echo "#define USE_WINDOWS_THREADS 1" >>confdefs.h
+$as_echo "#define USE_WIN32_THREADS 1" >>confdefs.h
 
-          fi
-          ;;
-      esac
+        fi
+      fi
     fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
@@ -17021,11 +15508,11 @@
 
 
   if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
+    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
     ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
 "
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then :
 
 $as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
@@ -17034,22 +15521,16 @@
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-      #include <pthread.h>
+#include <pthread.h>
 int
 main ()
 {
-
 #if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
 #endif
-
   ;
   return 0;
 }
@@ -17061,7 +15542,9 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
-  :
+
+
+
 
 
 
@@ -17141,7 +15624,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -17530,22 +16013,6 @@
 
 
 
-  GNULIB_ICONV=0;
-    ICONV_CONST=;
-  REPLACE_ICONV=0;
-  REPLACE_ICONV_OPEN=0;
-  REPLACE_ICONV_UTF=0;
-  ICONV_H='';
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
-
-
 
 
 
@@ -17577,7 +16044,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
+if test "${am_cv_func_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17585,16 +16052,14 @@
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <stdlib.h>
 #include <iconv.h>
-
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
   ;
   return 0;
 }
@@ -17609,16 +16074,14 @@
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <stdlib.h>
 #include <iconv.h>
-
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
   ;
   return 0;
 }
@@ -17638,21 +16101,19 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
+if test "${am_cv_func_iconv_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-                  am_save_LIBS="$LIBS"
+            am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
+  case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
-
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17661,7 +16122,6 @@
 #include <string.h>
 int main ()
 {
-  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -17678,8 +16138,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
+          return 1;
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -17698,27 +16157,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        const char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
+          return 1;
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -17737,8 +16176,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
+          return 1;
       }
   }
 #endif
@@ -17752,8 +16190,8 @@
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
+    return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -17798,7 +16236,7 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
 $as_echo_n "checking for iconv declaration... " >&6; }
-    if ${am_cv_proto_iconv+:} false; then :
+    if test "${am_cv_proto_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17811,7 +16249,7 @@
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
+#if defined(__STDC__) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
@@ -17844,11 +16282,6 @@
 #define ICONV_CONST $am_cv_proto_iconv_arg1
 _ACEOF
 
-
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
-
   fi
 
 
@@ -17877,7 +16310,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17892,7 +16326,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17901,39 +16336,98 @@
 done
 
 
-          ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl_feof_unlocked" = xyes; then :
-  ac_have_decl=1
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
+$as_echo_n "checking whether feof_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef feof_unlocked
+  char *p = (char *) feof_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_feof_unlocked=yes
+else
+  ac_cv_have_decl_feof_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
+$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
+  if test $ac_cv_have_decl_feof_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl
+#define HAVE_DECL_FEOF_UNLOCKED $gt_value
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl_fgets_unlocked" = xyes; then :
-  ac_have_decl=1
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
+$as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef fgets_unlocked
+  char *p = (char *) fgets_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_fgets_unlocked=yes
+else
+  ac_cv_have_decl_fgets_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
+$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
+  if test $ac_cv_have_decl_fgets_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl
+#define HAVE_DECL_FGETS_UNLOCKED $gt_value
 _ACEOF
 
 
 
 
-                    for ac_prog in bison
+
+                      for ac_prog in bison
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_INTLBISON+:} false; then :
+if test "${ac_cv_prog_INTLBISON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$INTLBISON"; then
@@ -17945,7 +16439,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_INTLBISON="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17977,7 +16471,7 @@
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      2.[7-9]* | [3-9].*)
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
     esac
@@ -17989,47 +16483,75 @@
   fi
 
 
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
 $as_echo_n "checking for long long int... " >&6; }
-if ${ac_cv_type_long_long_int+:} false; then :
+if test "${ac_cv_type_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* For now, do not test the preprocessor; as of 2007 there are too many
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+                          if test "$cross_compiling" = yes; then :
   ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-                                        if test "$cross_compiling" = yes; then :
-  :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
-                 #ifndef LLONG_MAX
-                 # define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 # define LLONG_MAX (HALF - 1 + HALF)
-                 #endif
+               #ifndef LLONG_MAX
+               # define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               # define LLONG_MAX (HALF - 1 + HALF)
+               #endif
 int
 main ()
 {
 long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-
+  ac_cv_type_long_long_int=yes
 else
   ac_cv_type_long_long_int=no
 fi
@@ -18037,8 +16559,11 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-        fi
-      fi
+else
+  ac_cv_type_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
 $as_echo "$ac_cv_type_long_long_int" >&6; }
@@ -18051,13 +16576,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 $as_echo_n "checking for wchar_t... " >&6; }
-if ${gt_cv_c_wchar_t+:} false; then :
+if test "${gt_cv_c_wchar_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';
+       wchar_t foo = (wchar_t)'\0';
 int
 main ()
 {
@@ -18084,7 +16609,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 $as_echo_n "checking for wint_t... " >&6; }
-if ${gt_cv_c_wint_t+:} false; then :
+if test "${gt_cv_c_wint_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18098,7 +16623,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-            wint_t foo = (wchar_t)'\0';
+       wint_t foo = (wchar_t)'\0';
 int
 main ()
 {
@@ -18127,7 +16652,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
 $as_echo_n "checking for intmax_t... " >&6; }
-if ${gt_cv_c_intmax_t+:} false; then :
+if test "${gt_cv_c_intmax_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18146,7 +16671,7 @@
 main ()
 {
 intmax_t x = -1;
-            return !x;
+        return !x;
   ;
   return 0;
 }
@@ -18170,13 +16695,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5
 $as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; }
-if ${gt_cv_func_printf_posix+:} false; then :
+if test "${gt_cv_func_printf_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
       if test "$cross_compiling" = yes; then :
 
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
@@ -18231,9 +16756,9 @@
   esac
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if ${ac_cv_gnu_library_2_1+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18245,13 +16770,10 @@
   Lucky GNU user
  #endif
 #endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky" >/dev/null 2>&1; then :
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2_1=yes
 else
   ac_cv_gnu_library_2_1=no
@@ -18271,7 +16793,7 @@
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -18282,7 +16804,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 $as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
+if test "${gl_cv_size_max+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -18324,8 +16846,8 @@
                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
+            extern size_t foo;
+            extern unsigned long foo;
 
 int
 main ()
@@ -18364,10 +16886,11 @@
 
 
 
+
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -18379,29 +16902,9 @@
 
 
 
-
-  for ac_func in $ac_func_list
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 $as_echo_n "checking for working fcntl.h... " >&6; }
-if ${gl_cv_header_working_fcntl_h+:} false; then :
+if test "${gl_cv_header_working_fcntl_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -18411,13 +16914,7 @@
 /* end confdefs.h.  */
 #include <sys/types.h>
            #include <sys/stat.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <io.h>
-           # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
-           #endif
+           #include <unistd.h>
            #include <fcntl.h>
            #ifndef O_NOATIME
             #define O_NOATIME 0
@@ -18435,69 +16932,29 @@
 main ()
 {
 
-            int result = !constants;
-            #if HAVE_SYMLINK
+            int status = !constants;
             {
               static char const sym[] = "conftest.sym";
-              if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
+              if (symlink (".", sym) != 0
+                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
+                status |= 32;
               unlink (sym);
             }
-            #endif
             {
               static char const file[] = "confdefs.h";
               int fd = open (file, O_RDONLY | O_NOATIME);
-              if (fd < 0)
-                result |= 8;
-              else
-                {
-                  struct stat st0;
-                  if (fstat (fd, &st0) != 0)
-                    result |= 16;
-                  else
-                    {
-                      char c;
-                      sleep (1);
-                      if (read (fd, &c, 1) != 1)
-                        result |= 24;
-                      else
-                        {
-                          if (close (fd) != 0)
-                            result |= 32;
-                          else
-                            {
-                              struct stat st1;
-                              if (stat (file, &st1) != 0)
-                                result |= 40;
-                              else
-                                if (st0.st_atime != st1.st_atime)
-                                  result |= 64;
-                            }
-                        }
-                    }
-                }
+              char c;
+              struct stat st0, st1;
+              if (fd < 0
+                  || fstat (fd, &st0) != 0
+                  || sleep (1) != 0
+                  || read (fd, &c, 1) != 1
+                  || close (fd) != 0
+                  || stat (file, &st1) != 0
+                  || st0.st_atime != st1.st_atime)
+                status |= 64;
             }
-            return result;
+            return status;
   ;
   return 0;
 }
@@ -18506,9 +16963,9 @@
   gl_cv_header_working_fcntl_h=yes
 else
   case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
         64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
          *) gl_cv_header_working_fcntl_h='no';;
         esac
 fi
@@ -18543,7 +17000,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -18577,7 +17034,7 @@
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -18620,11 +17077,6 @@
 
 
 
-
-
-
-
-
     case "$enable_silent_rules" in
     yes) INTL_DEFAULT_VERBOSITY=0;;
     no)  INTL_DEFAULT_VERBOSITY=1;;
@@ -18633,7 +17085,7 @@
 
 
   ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 else
 
@@ -18642,11 +17094,12 @@
 
 fi
 
-  for ac_header in features.h stddef.h stdlib.h string.h
+  for ac_header in stddef.h stdlib.h string.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -18660,7 +17113,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18669,59 +17123,147 @@
 done
 
 
-      ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl__snprintf" = xyes; then :
-  ac_have_decl=1
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snprintf is declared" >&5
+$as_echo_n "checking whether _snprintf is declared... " >&6; }
+if test "${ac_cv_have_decl__snprintf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNPRINTF $ac_have_decl
+#ifndef _snprintf
+  char *p = (char *) _snprintf;
+#endif
+
+  ;
+  return 0;
+}
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "_snwprintf" "ac_cv_have_decl__snwprintf" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl__snwprintf" = xyes; then :
-  ac_have_decl=1
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl__snprintf=yes
 else
-  ac_have_decl=0
+  ac_cv_have_decl__snprintf=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5
+$as_echo "$ac_cv_have_decl__snprintf" >&6; }
+  if test $ac_cv_have_decl__snprintf = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNWPRINTF $ac_have_decl
+#define HAVE_DECL__SNPRINTF $gt_value
 _ACEOF
 
 
-          ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
-  ac_have_decl=1
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5
+$as_echo_n "checking whether _snwprintf is declared... " >&6; }
+if test "${ac_cv_have_decl__snwprintf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef _snwprintf
+  char *p = (char *) _snwprintf;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl__snwprintf=yes
+else
+  ac_cv_have_decl__snwprintf=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5
+$as_echo "$ac_cv_have_decl__snwprintf" >&6; }
+  if test $ac_cv_have_decl__snwprintf = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+#define HAVE_DECL__SNWPRINTF $gt_value
 _ACEOF
 
 
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
 
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5
+$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef getc_unlocked
+  char *p = (char *) getc_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_getc_unlocked=yes
+else
+  ac_cv_have_decl_getc_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5
+$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
+  if test $ac_cv_have_decl_getc_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $gt_value
+_ACEOF
+
+
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
 
   if test "$ac_cv_func_newlocale" = yes; then
     HAVE_NEWLOCALE=1
@@ -18739,7 +17281,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if ${am_cv_langinfo_codeset+:} false; then :
+if test "${am_cv_langinfo_codeset+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18773,7 +17315,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if ${gt_cv_val_LC_MESSAGES+:} false; then :
+if test "${gt_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18827,7 +17369,7 @@
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINDRES+:} false; then :
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$WINDRES"; then
@@ -18839,7 +17381,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18867,7 +17409,7 @@
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_WINDRES"; then
@@ -18879,7 +17421,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_WINDRES="windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18949,7 +17491,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -18983,7 +17525,7 @@
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -19078,24 +17620,20 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
-
 int
 main ()
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-
   ;
   return 0;
 }
@@ -19188,7 +17726,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -19577,7 +18115,7 @@
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -19586,7 +18124,6 @@
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -19595,14 +18132,11 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-
 int
 main ()
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
   ;
   return 0;
 }
@@ -19618,7 +18152,6 @@
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -19627,22 +18160,19 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-
 int
 main ()
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -19813,105 +18343,38 @@
 
 
 
-
           LIBC_FATAL_STDERR_=1
   export LIBC_FATAL_STDERR_
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use C++" >&5
-$as_echo_n "checking whether to use C++... " >&6; }
-    # Check whether --enable-c++ was given.
-if test "${enable_c__+set}" = set; then :
-  enableval=$enable_c__; CXX_CHOICE="$enableval"
-else
-  CXX_CHOICE=yes
+
+
+
+
+
+
+  for ac_func in $gl_func_list
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
 fi
+done
+
+
+
+
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX_CHOICE" >&5
-$as_echo "$CXX_CHOICE" >&6; }
 
 
 
-  GNULIB__EXIT=0;
-  GNULIB_ATOLL=0;
-  GNULIB_CALLOC_POSIX=0;
-  GNULIB_CANONICALIZE_FILE_NAME=0;
-  GNULIB_GETLOADAVG=0;
-  GNULIB_GETSUBOPT=0;
-  GNULIB_GRANTPT=0;
-  GNULIB_MALLOC_POSIX=0;
-  GNULIB_MBTOWC=0;
-  GNULIB_MKDTEMP=0;
-  GNULIB_MKOSTEMP=0;
-  GNULIB_MKOSTEMPS=0;
-  GNULIB_MKSTEMP=0;
-  GNULIB_MKSTEMPS=0;
-  GNULIB_POSIX_OPENPT=0;
-  GNULIB_PTSNAME=0;
-  GNULIB_PTSNAME_R=0;
-  GNULIB_PUTENV=0;
-  GNULIB_QSORT_R=0;
-  GNULIB_RANDOM=0;
-  GNULIB_RANDOM_R=0;
-  GNULIB_REALLOC_POSIX=0;
-  GNULIB_REALPATH=0;
-  GNULIB_RPMATCH=0;
-  GNULIB_SECURE_GETENV=0;
-  GNULIB_SETENV=0;
-  GNULIB_STRTOD=0;
-  GNULIB_STRTOLL=0;
-  GNULIB_STRTOULL=0;
-  GNULIB_SYSTEM_POSIX=0;
-  GNULIB_UNLOCKPT=0;
-  GNULIB_UNSETENV=0;
-  GNULIB_WCTOMB=0;
-    HAVE__EXIT=1;
-  HAVE_ATOLL=1;
-  HAVE_CANONICALIZE_FILE_NAME=1;
-  HAVE_DECL_GETLOADAVG=1;
-  HAVE_GETSUBOPT=1;
-  HAVE_GRANTPT=1;
-  HAVE_MKDTEMP=1;
-  HAVE_MKOSTEMP=1;
-  HAVE_MKOSTEMPS=1;
-  HAVE_MKSTEMP=1;
-  HAVE_MKSTEMPS=1;
-  HAVE_POSIX_OPENPT=1;
-  HAVE_PTSNAME=1;
-  HAVE_PTSNAME_R=1;
-  HAVE_RANDOM=1;
-  HAVE_RANDOM_H=1;
-  HAVE_RANDOM_R=1;
-  HAVE_REALPATH=1;
-  HAVE_RPMATCH=1;
-  HAVE_SECURE_GETENV=1;
-  HAVE_SETENV=1;
-  HAVE_DECL_SETENV=1;
-  HAVE_STRTOD=1;
-  HAVE_STRTOLL=1;
-  HAVE_STRTOULL=1;
-  HAVE_STRUCT_RANDOM_DATA=1;
-  HAVE_SYS_LOADAVG_H=0;
-  HAVE_UNLOCKPT=1;
-  HAVE_DECL_UNSETENV=1;
-  REPLACE_CALLOC=0;
-  REPLACE_CANONICALIZE_FILE_NAME=0;
-  REPLACE_MALLOC=0;
-  REPLACE_MBTOWC=0;
-  REPLACE_MKSTEMP=0;
-  REPLACE_PTSNAME=0;
-  REPLACE_PTSNAME_R=0;
-  REPLACE_PUTENV=0;
-  REPLACE_QSORT_R=0;
-  REPLACE_RANDOM_R=0;
-  REPLACE_REALLOC=0;
-  REPLACE_REALPATH=0;
-  REPLACE_SETENV=0;
-  REPLACE_STRTOD=0;
-  REPLACE_UNSETENV=0;
-  REPLACE_WCTOMB=0;
 
 
 
@@ -19923,7 +18386,7 @@
 
   { $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 :
+if test "${gl_cv_double_slash_root+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
    if test x"$cross_compiling" = xyes ; then
@@ -19962,170 +18425,39 @@
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+
+
+
+  :
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 $as_echo_n "checking whether realpath works... " >&6; }
-if ${gl_cv_func_realpath_works+:} false; then :
+if test "${gl_cv_func_realpath_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
     touch conftest.a
-    mkdir conftest.d
     if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                       # Guess yes on glibc systems.
-        *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-                       # If we don't know, assume the worst.
-        *)             gl_cv_func_realpath_works="guessing no" ;;
-      esac
-
+  gl_cv_func_realpath_works="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
-
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-
         #include <stdlib.h>
-        #include <string.h>
 
 int
 main ()
 {
 
-        int result = 0;
-        {
-          char *name = realpath ("conftest.a", NULL);
-          if (!(name && *name == '/'))
-            result |= 1;
-        }
-        {
-          char *name = realpath ("conftest.b/../conftest.a", NULL);
-          if (name != NULL)
-            result |= 2;
-        }
-        {
-          char *name = realpath ("conftest.a/", NULL);
-          if (name != NULL)
-            result |= 4;
-        }
-        {
-          char *name1 = realpath (".", NULL);
-          char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
-            result |= 8;
-        }
-        return result;
+        char *name1 = realpath ("conftest.a", NULL);
+        char *name2 = realpath ("conftest.b/../conftest.a", NULL);
+        char *name3 = realpath ("conftest.a/", NULL);
+        return !(name1 && *name1 == '/' && !name2 && !name3);
 
   ;
   return 0;
@@ -20141,18 +18473,24 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-    rm -rf conftest.a conftest.d
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
 $as_echo "$gl_cv_func_realpath_works" >&6; }
-  case "$gl_cv_func_realpath_works" in
-    *yes)
+  if test "$gl_cv_func_realpath_works" = yes; then
 
 $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
-      ;;
-  esac
+  fi
+
+
+
+
+  :
+
+
+
+
 
 
 
@@ -20163,11 +18501,74 @@
 
 
 
+  :
+
+
+
+
+
+
+
+  GNULIB_ATOLL=0;
+  GNULIB_CALLOC_POSIX=0;
+  GNULIB_CANONICALIZE_FILE_NAME=0;
+  GNULIB_GETLOADAVG=0;
+  GNULIB_GETSUBOPT=0;
+  GNULIB_GRANTPT=0;
+  GNULIB_MALLOC_POSIX=0;
+  GNULIB_MKDTEMP=0;
+  GNULIB_MKOSTEMP=0;
+  GNULIB_MKOSTEMPS=0;
+  GNULIB_MKSTEMP=0;
+  GNULIB_MKSTEMPS=0;
+  GNULIB_PTSNAME=0;
+  GNULIB_PUTENV=0;
+  GNULIB_RANDOM_R=0;
+  GNULIB_REALLOC_POSIX=0;
+  GNULIB_REALPATH=0;
+  GNULIB_RPMATCH=0;
+  GNULIB_SETENV=0;
+  GNULIB_STRTOD=0;
+  GNULIB_STRTOLL=0;
+  GNULIB_STRTOULL=0;
+  GNULIB_UNLOCKPT=0;
+  GNULIB_UNSETENV=0;
+    HAVE_ATOLL=1;
+  HAVE_CALLOC_POSIX=1;
+  HAVE_CANONICALIZE_FILE_NAME=1;
+  HAVE_DECL_GETLOADAVG=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_GRANTPT=1;
+  HAVE_MALLOC_POSIX=1;
+  HAVE_MKDTEMP=1;
+  HAVE_MKOSTEMP=1;
+  HAVE_MKOSTEMPS=1;
+  HAVE_MKSTEMP=1;
+  HAVE_MKSTEMPS=1;
+  HAVE_PTSNAME=1;
+  HAVE_RANDOM_R=1;
+  HAVE_REALLOC_POSIX=1;
+  HAVE_REALPATH=1;
+  HAVE_RPMATCH=1;
+  HAVE_SETENV=1;
+  HAVE_STRTOD=1;
+  HAVE_STRTOLL=1;
+  HAVE_STRTOULL=1;
+  HAVE_STRUCT_RANDOM_DATA=1;
+  HAVE_SYS_LOADAVG_H=0;
+  HAVE_UNLOCKPT=1;
+  HAVE_UNSETENV=1;
+  REPLACE_CANONICALIZE_FILE_NAME=0;
+  REPLACE_MKSTEMP=0;
+  REPLACE_PUTENV=0;
+  REPLACE_REALPATH=0;
+  REPLACE_SETENV=0;
+  REPLACE_STRTOD=0;
+  REPLACE_UNSETENV=0;
+
 
-  GNULIB_CHDIR=0;
   GNULIB_CHOWN=0;
   GNULIB_CLOSE=0;
-  GNULIB_DUP=0;
   GNULIB_DUP2=0;
   GNULIB_DUP3=0;
   GNULIB_ENVIRON=0;
@@ -20175,7 +18576,6 @@
   GNULIB_FACCESSAT=0;
   GNULIB_FCHDIR=0;
   GNULIB_FCHOWNAT=0;
-  GNULIB_FDATASYNC=0;
   GNULIB_FSYNC=0;
   GNULIB_FTRUNCATE=0;
   GNULIB_GETCWD=0;
@@ -20187,26 +18587,21 @@
   GNULIB_GETLOGIN_R=0;
   GNULIB_GETPAGESIZE=0;
   GNULIB_GETUSERSHELL=0;
-  GNULIB_GROUP_MEMBER=0;
-  GNULIB_ISATTY=0;
   GNULIB_LCHOWN=0;
   GNULIB_LINK=0;
   GNULIB_LINKAT=0;
   GNULIB_LSEEK=0;
-  GNULIB_PIPE=0;
   GNULIB_PIPE2=0;
   GNULIB_PREAD=0;
   GNULIB_PWRITE=0;
-  GNULIB_READ=0;
   GNULIB_READLINK=0;
   GNULIB_READLINKAT=0;
   GNULIB_RMDIR=0;
-  GNULIB_SETHOSTNAME=0;
   GNULIB_SLEEP=0;
   GNULIB_SYMLINK=0;
   GNULIB_SYMLINKAT=0;
   GNULIB_TTYNAME_R=0;
-  GNULIB_UNISTD_H_NONBLOCKING=0;
+  GNULIB_UNISTD_H_GETOPT=0;
   GNULIB_UNISTD_H_SIGPIPE=0;
   GNULIB_UNLINK=0;
   GNULIB_UNLINKAT=0;
@@ -20219,39 +18614,32 @@
   HAVE_FACCESSAT=1;
   HAVE_FCHDIR=1;
   HAVE_FCHOWNAT=1;
-  HAVE_FDATASYNC=1;
   HAVE_FSYNC=1;
   HAVE_FTRUNCATE=1;
+  HAVE_GETDOMAINNAME=1;
   HAVE_GETDTABLESIZE=1;
   HAVE_GETGROUPS=1;
   HAVE_GETHOSTNAME=1;
   HAVE_GETLOGIN=1;
   HAVE_GETPAGESIZE=1;
-  HAVE_GROUP_MEMBER=1;
   HAVE_LCHOWN=1;
   HAVE_LINK=1;
   HAVE_LINKAT=1;
-  HAVE_PIPE=1;
   HAVE_PIPE2=1;
   HAVE_PREAD=1;
   HAVE_PWRITE=1;
   HAVE_READLINK=1;
   HAVE_READLINKAT=1;
-  HAVE_SETHOSTNAME=1;
   HAVE_SLEEP=1;
   HAVE_SYMLINK=1;
   HAVE_SYMLINKAT=1;
+  HAVE_TTYNAME_R=1;
   HAVE_UNLINKAT=1;
   HAVE_USLEEP=1;
   HAVE_DECL_ENVIRON=1;
-  HAVE_DECL_FCHDIR=1;
-  HAVE_DECL_FDATASYNC=1;
-  HAVE_DECL_GETDOMAINNAME=1;
   HAVE_DECL_GETLOGIN_R=1;
   HAVE_DECL_GETPAGESIZE=1;
   HAVE_DECL_GETUSERSHELL=1;
-  HAVE_DECL_SETHOSTNAME=1;
-  HAVE_DECL_TTYNAME_R=1;
   HAVE_OS_H=0;
   HAVE_SYS_PARAM_H=0;
   REPLACE_CHOWN=0;
@@ -20259,21 +18647,15 @@
   REPLACE_DUP=0;
   REPLACE_DUP2=0;
   REPLACE_FCHOWNAT=0;
-  REPLACE_FTRUNCATE=0;
   REPLACE_GETCWD=0;
-  REPLACE_GETDOMAINNAME=0;
-  REPLACE_GETDTABLESIZE=0;
-  REPLACE_GETLOGIN_R=0;
   REPLACE_GETGROUPS=0;
   REPLACE_GETPAGESIZE=0;
-  REPLACE_ISATTY=0;
   REPLACE_LCHOWN=0;
   REPLACE_LINK=0;
   REPLACE_LINKAT=0;
   REPLACE_LSEEK=0;
   REPLACE_PREAD=0;
   REPLACE_PWRITE=0;
-  REPLACE_READ=0;
   REPLACE_READLINK=0;
   REPLACE_RMDIR=0;
   REPLACE_SLEEP=0;
@@ -20292,23 +18674,16 @@
 
 
 
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 $as_echo_n "checking if environ is properly declared... " >&6; }
-  if ${gt_cv_var_environ_declaration+:} false; then :
+  if test "${gt_cv_var_environ_declaration+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if HAVE_UNISTD_H
-     #include <unistd.h>
-     #endif
-     /* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
-     #include <stdlib.h>
-
-           extern struct { int foo; } environ;
+#include <unistd.h>
+      extern struct { int foo; } environ;
 int
 main ()
 {
@@ -20342,7 +18717,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 $as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if ${gl_cv_have_include_next+:} false; then :
+if test "${gl_cv_have_include_next+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -rf conftestd1a conftestd1b conftestd2
@@ -20420,43 +18795,17 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
-$as_echo_n "checking whether system header files limit the line length... " >&6; }
-if ${gl_cv_pragma_columns+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#ifdef __TANDEM
-choke me
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "choke me" >/dev/null 2>&1; then :
-  gl_cv_pragma_columns=yes
-else
-  gl_cv_pragma_columns=no
-fi
-rm -f conftest*
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
-$as_echo "$gl_cv_pragma_columns" >&6; }
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 $as_echo_n "checking for complete errno.h... " >&6; }
-if ${gl_cv_header_errno_h_complete+:} false; then :
+if test "${gl_cv_header_errno_h_complete+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20464,9 +18813,6 @@
 /* end confdefs.h.  */
 
 #include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
 #if !defined ENOMSG
 booboo
 #endif
@@ -20491,30 +18837,12 @@
 #if !defined ENOTSUP
 booboo
 #endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
 #if !defined ESTALE
 booboo
 #endif
-#if !defined EDQUOT
-booboo
-#endif
 #if !defined ECANCELED
 booboo
 #endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -20536,6 +18864,10 @@
 
 
 
+  :
+
+
+
 
 
 
@@ -20545,45 +18877,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 $as_echo_n "checking absolute name of <errno.h>... " >&6; }
-if ${gl_cv_next_errno_h+:} false; then :
+if test "${gl_cv_next_errno_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_errno_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'errno.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_errno_h
-           gl_cv_next_errno_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/errno.h#{
+                 s#.*"\(.*/errno.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_errno_h='<'errno.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
@@ -20602,23 +18919,14 @@
 
 
 
-
     ERRNO_H='errno.h'
   fi
 
-   if test -n "$ERRNO_H"; then
-  GL_GENERATE_ERRNO_H_TRUE=
-  GL_GENERATE_ERRNO_H_FALSE='#'
-else
-  GL_GENERATE_ERRNO_H_TRUE='#'
-  GL_GENERATE_ERRNO_H_FALSE=
-fi
-
 
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 $as_echo_n "checking for EMULTIHOP value... " >&6; }
-if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then :
+if test "${gl_cv_header_errno_h_EMULTIHOP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20689,7 +18997,7 @@
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 $as_echo_n "checking for ENOLINK value... " >&6; }
-if ${gl_cv_header_errno_h_ENOLINK+:} false; then :
+if test "${gl_cv_header_errno_h_ENOLINK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20760,7 +19068,7 @@
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 $as_echo_n "checking for EOVERFLOW value... " >&6; }
-if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then :
+if test "${gl_cv_header_errno_h_EOVERFLOW+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20829,7 +19137,7 @@
 
 
 ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
+if test "x$ac_cv_have_decl_strerror_r" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -20842,7 +19150,7 @@
 for ac_func in strerror_r
 do :
   ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
-if test "x$ac_cv_func_strerror_r" = xyes; then :
+if test "x$ac_cv_func_strerror_r" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRERROR_R 1
 _ACEOF
@@ -20852,7 +19160,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 $as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if ${ac_cv_func_strerror_r_char_p+:} false; then :
+if test "${ac_cv_func_strerror_r_char_p+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20936,6 +19244,12 @@
 
 
 
+  :
+
+
+
+
+
 
 
      if test $gl_cv_have_include_next = yes; then
@@ -20943,51 +19257,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
 $as_echo_n "checking absolute name of <getopt.h>... " >&6; }
-if ${gl_cv_next_getopt_h+:} false; then :
+if test "${gl_cv_next_getopt_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_getopt_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_getopt_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <getopt.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'getopt.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_getopt_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_getopt_h
-           gl_cv_next_getopt_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/getopt.h#{
+                 s#.*"\(.*/getopt.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_getopt_h='<'getopt.h'>'
-             fi
-
+            gl_cv_next_getopt_h='<'getopt.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
@@ -21007,6 +19300,12 @@
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_getopt_h = yes; then
     HAVE_GETOPT_H=1
   else
@@ -21020,7 +19319,7 @@
     for ac_header in getopt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = xyes; then :
+if test "x$ac_cv_header_getopt_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_H 1
 _ACEOF
@@ -21037,7 +19336,7 @@
     for ac_func in getopt_long_only
 do :
   ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
-if test "x$ac_cv_func_getopt_long_only" = xyes; then :
+if test "x$ac_cv_func_getopt_long_only" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_LONG_ONLY 1
 _ACEOF
@@ -21049,124 +19348,52 @@
 
   fi
 
-          if test -z "$gl_replace_getopt"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
-$as_echo_n "checking whether getopt is POSIX compatible... " >&6; }
-if ${gl_cv_func_getopt_posix+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                                                if test $cross_compiling = no; then
-                              if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+              if test -z "$gl_replace_getopt"; then
+    ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include <getopt.h>
+"
+if test "x$ac_cv_have_decl_optreset" = x""yes; then :
+  ac_have_decl=1
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-main ()
-{
-  static char program[] = "program";
-  static char a[] = "-a";
-  static char foo[] = "foo";
-  static char bar[] = "bar";
-  char *argv[] = { program, a, foo, bar, NULL };
-  int c;
-
-  c = getopt (4, argv, "ab");
-  if (!(c == 'a'))
-    return 1;
-  c = getopt (4, argv, "ab");
-  if (!(c == -1))
-    return 2;
-  if (!(optind == 2))
-    return 3;
-  return 0;
-}
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_OPTRESET $ac_have_decl
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getopt_posix=maybe
+if test $ac_have_decl = 1; then :
+
 else
-  gl_cv_func_getopt_posix=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  ac_fn_c_check_decl "$LINENO" "getopt_clip" "ac_cv_have_decl_getopt_clip" "#include <getopt.h>
+"
+if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
 fi
 
-          if test $gl_cv_func_getopt_posix = maybe; then
-                                    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETOPT_CLIP $ac_have_decl
+_ACEOF
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 
-int
-main ()
-{
-  static char program[] = "program";
-  static char donald[] = "donald";
-  static char p[] = "-p";
-  static char billy[] = "billy";
-  static char duck[] = "duck";
-  static char a[] = "-a";
-  static char bar[] = "bar";
-  char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
-  int c;
+fi
 
-  c = getopt (7, argv, "+abp:q:");
-  if (!(c == -1))
-    return 4;
-  if (!(strcmp (argv[0], "program") == 0))
-    return 5;
-  if (!(strcmp (argv[1], "donald") == 0))
-    return 6;
-  if (!(strcmp (argv[2], "-p") == 0))
-    return 7;
-  if (!(strcmp (argv[3], "billy") == 0))
-    return 8;
-  if (!(strcmp (argv[4], "duck") == 0))
-    return 9;
-  if (!(strcmp (argv[5], "-a") == 0))
-    return 10;
-  if (!(strcmp (argv[6], "bar") == 0))
-    return 11;
-  if (!(optind == 1))
-    return 12;
-  return 0;
-}
+  fi
 
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getopt_posix=maybe
+                    if test -z "$gl_replace_getopt"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
+$as_echo_n "checking whether getopt is POSIX compatible... " >&6; }
+if test "${gl_cv_func_getopt_posix+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  gl_cv_func_getopt_posix=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
-          if test $gl_cv_func_getopt_posix = maybe; then
-                        if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+                if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+             mingw*) gl_cv_func_getopt_posix="guessing no";;
+             darwin*) gl_cv_func_getopt_posix="guessing no";;
+             *)      gl_cv_func_getopt_posix="guessing yes";;
+           esac
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21175,20 +19402,89 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP
+# define OPTIND_MIN 0
+#else
+# define OPTIND_MIN 1
+#endif
+
 int
 main ()
 {
-  static char program[] = "program";
-  static char ab[] = "-ab";
-  char *argv[3] = { program, ab, NULL };
-  if (getopt (2, argv, "ab:") != 'a')
-    return 13;
-  if (getopt (2, argv, "ab:") != '?')
-    return 14;
-  if (optopt != 'b')
-    return 15;
-  if (optind != 2)
-    return 16;
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "-a";
+    argv[argc++] = "foo";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
+
+    c = getopt (argc, argv, "ab");
+    if (!(c == 'a'))
+      return 1;
+    c = getopt (argc, argv, "ab");
+    if (!(c == -1))
+      return 2;
+    if (!(optind == 2))
+      return 3;
+  }
+  /* Some internal state exists at this point.  */
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "donald";
+    argv[argc++] = "-p";
+    argv[argc++] = "billy";
+    argv[argc++] = "duck";
+    argv[argc++] = "-a";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
+
+    c = getopt (argc, argv, "+abp:q:");
+    if (!(c == -1))
+      return 4;
+    if (!(strcmp (argv[0], "program") == 0))
+      return 5;
+    if (!(strcmp (argv[1], "donald") == 0))
+      return 6;
+    if (!(strcmp (argv[2], "-p") == 0))
+      return 7;
+    if (!(strcmp (argv[3], "billy") == 0))
+      return 8;
+    if (!(strcmp (argv[4], "duck") == 0))
+      return 9;
+    if (!(strcmp (argv[5], "-a") == 0))
+      return 10;
+    if (!(strcmp (argv[6], "bar") == 0))
+      return 11;
+    if (!(optind == 1))
+      return 12;
+  }
+  /* Detect MacOS 10.5 bug.  */
+  {
+    char *argv[3] = { "program", "-ab", NULL };
+    optind = OPTIND_MIN;
+    opterr = 0;
+    if (getopt (2, argv, "ab:") != 'a')
+      return 13;
+    if (getopt (2, argv, "ab:") != '?')
+      return 14;
+    if (optopt != 'b')
+      return 15;
+    if (optind != 2)
+      return 16;
+  }
+
   return 0;
 }
 
@@ -21202,13 +19498,6 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-          fi
-        else
-          case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
-          esac
-        fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5
@@ -21221,25 +19510,22 @@
   if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5
 $as_echo_n "checking for working GNU getopt function... " >&6; }
-if ${gl_cv_func_getopt_gnu+:} false; then :
+if test "${gl_cv_func_getopt_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
        # optstring is necessary for programs like m4 that have POSIX-mandated
        # semantics for supporting options interspersed with files.
        # Also, since getopt_long is a GNU extension, we require optind=0.
-       # Bash ties 'set -o posix' to a non-exported POSIXLY_CORRECT;
-       # so take care to revert to the correct (non-)export state.
-       gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
-       case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
-         xx) gl_had_POSIXLY_CORRECT=exported ;;
-         x)  gl_had_POSIXLY_CORRECT=yes      ;;
-         *)  gl_had_POSIXLY_CORRECT=         ;;
-       esac
+       gl_had_POSIXLY_CORRECT=${POSIXLY_CORRECT:+yes}
        POSIXLY_CORRECT=1
        export POSIXLY_CORRECT
        if test "$cross_compiling" = yes; then :
-           gl_cv_func_getopt_gnu="guessing no"
+           case $host_os:$ac_cv_have_decl_optreset in
+           *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
+           *:yes)               gl_cv_func_getopt_gnu=no;;
+           *)                   gl_cv_func_getopt_gnu=yes;;
+         esac
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21248,193 +19534,57 @@
                            #include <stddef.h>
                            #include <string.h>
 
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-
-
 int
 main ()
 {
 
-             int result = 0;
-
-             nocrash_init();
-
              /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
-                and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
+                and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
                 OSF/1 5.1, Solaris 10.  */
              {
-               static char conftest[] = "conftest";
-               static char plus[] = "-+";
-               char *argv[3] = { conftest, plus, NULL };
+               char *myargv[3];
+               myargv[0] = "conftest";
+               myargv[1] = "-+";
+               myargv[2] = 0;
                opterr = 0;
-               if (getopt (2, argv, "+a") != '?')
-                 result |= 1;
+               if (getopt (2, myargv, "+a") != '?')
+                 return 1;
              }
              /* This code succeeds on glibc 2.8, mingw,
-                and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
+                and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
                 IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x.  */
              {
-               static char program[] = "program";
-               static char p[] = "-p";
-               static char foo[] = "foo";
-               static char bar[] = "bar";
-               char *argv[] = { program, p, foo, bar, NULL };
+               char *argv[] = { "program", "-p", "foo", "bar", NULL };
 
                optind = 1;
                if (getopt (4, argv, "p::") != 'p')
-                 result |= 2;
-               else if (optarg != NULL)
-                 result |= 4;
-               else if (getopt (4, argv, "p::") != -1)
-                 result |= 6;
-               else if (optind != 2)
-                 result |= 8;
+                 return 2;
+               if (optarg != NULL)
+                 return 3;
+               if (getopt (4, argv, "p::") != -1)
+                 return 4;
+               if (optind != 2)
+                 return 5;
              }
              /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0.  */
              {
-               static char program[] = "program";
-               static char foo[] = "foo";
-               static char p[] = "-p";
-               char *argv[] = { program, foo, p, NULL };
+               char *argv[] = { "program", "foo", "-p", NULL };
                optind = 0;
                if (getopt (3, argv, "-p") != 1)
-                 result |= 16;
-               else if (getopt (3, argv, "-p") != 'p')
-                 result |= 16;
+                 return 6;
+               if (getopt (3, argv, "-p") != 'p')
+                 return 7;
              }
              /* This code fails on glibc 2.11.  */
              {
-               static char program[] = "program";
-               static char b[] = "-b";
-               static char a[] = "-a";
-               char *argv[] = { program, b, a, NULL };
+               char *argv[] = { "program", "-b", "-a", NULL };
                optind = opterr = 0;
                if (getopt (3, argv, "+:a:b") != 'b')
-                 result |= 32;
-               else if (getopt (3, argv, "+:a:b") != ':')
-                 result |= 32;
-             }
-             /* This code dumps core on glibc 2.14.  */
-             {
-               static char program[] = "program";
-               static char w[] = "-W";
-               static char dummy[] = "dummy";
-               char *argv[] = { program, w, dummy, NULL };
-               optind = opterr = 1;
-               if (getopt (3, argv, "W;") != 'W')
-                 result |= 64;
+                 return 8;
+               if (getopt (3, argv, "+:a:b") != ':')
+                 return 9;
              }
-             return result;
+             return 0;
 
   ;
   return 0;
@@ -21449,94 +19599,39 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-       case $gl_had_POSIXLY_CORRECT in
-         exported) ;;
-         yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;;
-         *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;;
-       esac
+       if test "$gl_had_POSIXLY_CORRECT" != yes; then
+         { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}
+       fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5
 $as_echo "$gl_cv_func_getopt_gnu" >&6; }
-    if test "$gl_cv_func_getopt_gnu" != yes; then
+    if test "$gl_cv_func_getopt_gnu" = "no"; then
       gl_replace_getopt=yes
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5
-$as_echo_n "checking for working GNU getopt_long function... " >&6; }
-if ${gl_cv_func_getopt_long_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-              case "$host_os" in
-              openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
-              *)        gl_cv_func_getopt_long_gnu="guessing yes";;
-            esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <getopt.h>
-                #include <stddef.h>
-                #include <string.h>
+    fi
+  fi
 
-int
-main ()
-{
-static const struct option long_options[] =
-                  {
-                    { "xtremely-",no_argument,       NULL, 1003 },
-                    { "xtra",     no_argument,       NULL, 1001 },
-                    { "xtreme",   no_argument,       NULL, 1002 },
-                    { "xtremely", no_argument,       NULL, 1003 },
-                    { NULL,       0,                 NULL, 0 }
-                  };
-                /* This code fails on OpenBSD 5.0.  */
-                {
-                  static char program[] = "program";
-                  static char xtremel[] = "--xtremel";
-                  char *argv[] = { program, xtremel, NULL };
-                  int option_index;
-                  optind = 1; opterr = 0;
-                  if (getopt_long (2, argv, "", long_options, &option_index) != 1003)
-                    return 1;
-                }
-                return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getopt_long_gnu=yes
+      ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
+  ac_have_decl=1
 else
-  gl_cv_func_getopt_long_gnu=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  ac_have_decl=0
 fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV $ac_have_decl
+_ACEOF
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5
-$as_echo "$gl_cv_func_getopt_long_gnu" >&6; }
-      case "$gl_cv_func_getopt_long_gnu" in
-        *yes) ;;
-        *) gl_replace_getopt=yes ;;
-      esac
-    fi
-  fi
 
 
 
 
 
 
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
+  if test -n "$gl_replace_getopt"; then :
+
 
-  if test $REPLACE_GETOPT = 1; then
 
   GETOPT_H=getopt.h
 
@@ -21544,74 +19639,17 @@
 
 
 
-  fi
+    GNULIB_UNISTD_H_GETOPT=1
 
-ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getenv" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETENV $ac_have_decl
-_ACEOF
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
-$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if ${ac_cv_c_restrict+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_restrict=no
-   # The order here caters to the fact that C++ does not require restrict.
-   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-typedef int *int_ptr;
-	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
-	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
-	   int bar (int ip[$ac_kw]) { return ip[0]; }
 
-int
-main ()
-{
-int s[1];
-	   int *$ac_kw t = s;
-	   t[0] = 0;
-	   return foo (t) + bar (t);
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_restrict=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     test "$ac_cv_c_restrict" != no && break
-   done
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-$as_echo "$ac_cv_c_restrict" >&6; }
 
- case $ac_cv_c_restrict in
-   restrict) ;;
-   no) $as_echo "#define restrict /**/" >>confdefs.h
- ;;
-   *)  cat >>confdefs.h <<_ACEOF
-#define restrict $ac_cv_c_restrict
-_ACEOF
- ;;
- esac
 
+  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
 
-  GNULIB_GETTIMEOFDAY=0;
-    HAVE_GETTIMEOFDAY=1;
-  HAVE_STRUCT_TIMEVAL=1;
-  HAVE_SYS_TIME_H=1;
-  REPLACE_GETTIMEOFDAY=0;
-  REPLACE_STRUCT_TIMEVAL=0;
 
 
 
@@ -21620,9 +19658,11 @@
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
 
 
 
+  :
 
 
 
@@ -21630,248 +19670,342 @@
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_time_h='<'sys/time.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/time.h>" >&5
-$as_echo_n "checking absolute name of <sys/time.h>... " >&6; }
-if ${gl_cv_next_sys_time_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-             if test $ac_cv_header_sys_time_h = yes; then
+fi
 
 
 
+    REPLACE_ICONV=0;
+  REPLACE_ICONV_OPEN=0;
+  REPLACE_ICONV_UTF=0;
+  ICONV_H='';
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/time.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/time.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_sys_time_h
-           gl_cv_next_sys_time_h='"'$gl_header'"'
-          else
-               gl_cv_next_sys_time_h='<'sys/time.h'>'
-             fi
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5
-$as_echo "$gl_cv_next_sys_time_h" >&6; }
-     fi
-     NEXT_SYS_TIME_H=$gl_cv_next_sys_time_h
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/time.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_time_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H=$gl_next_as_first_directive
+      ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+_ACEOF
 
 
 
+     GNULIB_FCHMODAT=0;
+  GNULIB_FSTATAT=0;
+  GNULIB_FUTIMENS=0;
+  GNULIB_LCHMOD=0;
+  GNULIB_LSTAT=0;
+  GNULIB_MKDIRAT=0;
+  GNULIB_MKFIFO=0;
+  GNULIB_MKFIFOAT=0;
+  GNULIB_MKNOD=0;
+  GNULIB_MKNODAT=0;
+  GNULIB_STAT=0;
+  GNULIB_UTIMENSAT=0;
+    HAVE_FCHMODAT=1;
+  HAVE_FSTATAT=1;
+  HAVE_FUTIMENS=1;
+  HAVE_LCHMOD=1;
+  HAVE_LSTAT=1;
+  HAVE_MKDIRAT=1;
+  HAVE_MKFIFO=1;
+  HAVE_MKFIFOAT=1;
+  HAVE_MKNOD=1;
+  HAVE_MKNODAT=1;
+  HAVE_UTIMENSAT=1;
+  REPLACE_FSTAT=0;
+  REPLACE_FSTATAT=0;
+  REPLACE_FUTIMENS=0;
+  REPLACE_LSTAT=0;
+  REPLACE_MKDIR=0;
+  REPLACE_MKFIFO=0;
+  REPLACE_MKNOD=0;
+  REPLACE_STAT=0;
+  REPLACE_UTIMENSAT=0;
 
-  if test $ac_cv_header_sys_time_h != yes; then
-    HAVE_SYS_TIME_H=0
-  fi
 
 
 
 
 
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest.sym conftest.file
+echo >conftest.file
+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+struct stat sbuf;
+     /* Linux will dereference the symlink and fail, as required by POSIX.
+	That is better in the sense that it means we will not
+	have to compile and use the lstat wrapper.  */
+     return lstat ("conftest.sym/", &sbuf) == 0;
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=yes
+else
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
+else
+  # If the `ln -s' command failed, then we probably don't even
+  # have an lstat function.
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
+rm -f conftest.sym conftest.file
 
-done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
 
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+
+cat >>confdefs.h <<_ACEOF
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+_ACEOF
+
+
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
-$as_echo_n "checking for struct timeval... " >&6; }
-if ${gl_cv_sys_struct_timeval+:} false; then :
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
+
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc are POSIX compliant" >&5
+$as_echo_n "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; }
+if test "${gl_cv_func_malloc_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if HAVE_SYS_TIME_H
-             #include <sys/time.h>
-            #endif
-            #include <time.h>
-            #if HAVE_WINSOCK2_H
-            # include <winsock2.h>
-            #endif
 
 int
 main ()
 {
-static struct timeval x; x.tv_sec = x.tv_usec;
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+         choke me
+         #endif
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_timeval=yes
+  gl_cv_func_malloc_posix=yes
 else
-  gl_cv_sys_struct_timeval=no
+  gl_cv_func_malloc_posix=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5
-$as_echo "$gl_cv_sys_struct_timeval" >&6; }
-  if test $gl_cv_sys_struct_timeval != yes; then
-    HAVE_STRUCT_TIMEVAL=0
-  else
-                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5
-$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; }
-if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
+$as_echo "$gl_cv_func_malloc_posix" >&6; }
+
+
+  for ac_header in stdlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDLIB_H 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_malloc_0_nonnull=no
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if HAVE_SYS_TIME_H
-               #include <sys/time.h>
-              #endif
-              #include <time.h>
-              #if HAVE_WINSOCK2_H
-              # include <winsock2.h>
-              #endif
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
 
 int
 main ()
 {
-static struct timeval x;
-              typedef int verify_tv_sec_type[
-                sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
-              ];
-
+return ! malloc (0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_timeval_tv_sec=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_malloc_0_nonnull=yes
 else
-  gl_cv_sys_struct_timeval_tv_sec=no
+  ac_cv_func_malloc_0_nonnull=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5
-$as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; }
-    if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
-      REPLACE_STRUCT_TIMEVAL=1
-    fi
-  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
+  gl_cv_func_malloc_0_nonnull=1
+else
+  gl_cv_func_malloc_0_nonnull=0
+fi
 
 
-    for gl_func in gettimeofday; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+cat >>confdefs.h <<_ACEOF
+#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
+_ACEOF
+
+
+
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+$as_echo_n "checking for mbstate_t... " >&6; }
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#if HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#include <time.h>
-
+$ac_includes_default
+#           include <wchar.h>
 int
 main ()
 {
-#undef $gl_func
-  (void) $gl_func;
+mbstate_t x; return sizeof x;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
+  ac_cv_type_mbstate_t=yes
 else
-  eval "$as_gl_Symbol=no"
+  ac_cv_type_mbstate_t=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+$as_echo "$ac_cv_type_mbstate_t" >&6; }
+   if test $ac_cv_type_mbstate_t = yes; then
 
+$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h
 
+   else
 
+$as_echo "#define mbstate_t int" >>confdefs.h
 
+   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
+$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if test "${ac_cv_func_mbrtowc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wchar.h>
+int
+main ()
+{
+wchar_t wc;
+	      char const s[] = "";
+	      size_t n = 1;
+	      mbstate_t state;
+	      return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_mbrtowc=yes
+else
+  ac_cv_func_mbrtowc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
+$as_echo "$ac_cv_func_mbrtowc" >&6; }
+  if test $ac_cv_func_mbrtowc = yes; then
 
+$as_echo "#define HAVE_MBRTOWC 1" >>confdefs.h
 
+  fi
 
-  GNULIB_ISWBLANK=0;
-  GNULIB_WCTYPE=0;
-  GNULIB_ISWCTYPE=0;
-  GNULIB_WCTRANS=0;
-  GNULIB_TOWCTRANS=0;
-    HAVE_ISWBLANK=1;
-  HAVE_WCTYPE_T=1;
-  HAVE_WCTRANS_T=1;
-  REPLACE_ISWBLANK=0;
 
+  GNULIB_BTOWC=0;
+  GNULIB_WCTOB=0;
+  GNULIB_MBSINIT=0;
+  GNULIB_MBRTOWC=0;
+  GNULIB_MBRLEN=0;
+  GNULIB_MBSRTOWCS=0;
+  GNULIB_MBSNRTOWCS=0;
+  GNULIB_WCRTOMB=0;
+  GNULIB_WCSRTOMBS=0;
+  GNULIB_WCSNRTOMBS=0;
+  GNULIB_WCWIDTH=0;
+    HAVE_BTOWC=1;
+  HAVE_MBSINIT=1;
+  HAVE_MBRTOWC=1;
+  HAVE_MBRLEN=1;
+  HAVE_MBSRTOWCS=1;
+  HAVE_MBSNRTOWCS=1;
+  HAVE_WCRTOMB=1;
+  HAVE_WCSRTOMBS=1;
+  HAVE_WCSNRTOMBS=1;
+  HAVE_DECL_WCTOB=1;
+  HAVE_DECL_WCWIDTH=1;
+  REPLACE_MBSTATE_T=0;
+  REPLACE_BTOWC=0;
+  REPLACE_WCTOB=0;
+  REPLACE_MBSINIT=0;
+  REPLACE_MBRTOWC=0;
+  REPLACE_MBRLEN=0;
+  REPLACE_MBSRTOWCS=0;
+  REPLACE_MBSNRTOWCS=0;
+  REPLACE_WCRTOMB=0;
+  REPLACE_WCSRTOMBS=0;
+  REPLACE_WCSNRTOMBS=0;
+  REPLACE_WCWIDTH=0;
 
 
 
@@ -21881,483 +20015,575 @@
 
 
 
-  if test $ac_cv_func_iswcntrl = yes; then
-    HAVE_ISWCNTRL=1
-  else
-    HAVE_ISWCNTRL=0
-  fi
 
 
 
-  if test $gt_cv_c_wint_t = yes; then
-    HAVE_WINT_T=1
-  else
-    HAVE_WINT_T=0
-  fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+$as_echo_n "checking for a traditional japanese locale... " >&6; }
+if test "${gt_cv_locale_ja+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
+     on Cygwin 1.5.x.  */
+  if (MB_CUR_MAX == 1)
+    return 1;
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  return 0;
+}
 
+_ACEOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
+          else
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
+            else
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
+              else
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
+                else
+                  # None found.
+                  gt_cv_locale_ja=none
+                fi
+              fi
+            fi
+          fi
+        fi
+      fi
+    fi
+    rm -fr conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
+$as_echo "$gt_cv_locale_ja" >&6; }
+  LOCALE_JA=$gt_cv_locale_ja
 
 
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_wctype_h='<'wctype.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
-$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if ${gl_cv_next_wctype_h+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+$as_echo_n "checking for a transitional chinese locale... " >&6; }
+if test "${gt_cv_locale_zh_CN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_wctype_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <wctype.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wctype.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_wctype_h
-           gl_cv_next_wctype_h='"'$gl_header'"'
-          else
-               gl_cv_next_wctype_h='<'wctype.h'>'
-             fi
+#include <locale.h>
+#include <stdlib.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  /* Check whether a typical GB18030 multibyte sequence is recognized as a
+     single wide character.  This excludes the GB2312 and GBK encodings.  */
+  if (mblen ("\203\062\332\066", 5) != 4)
+    return 1;
+  return 0;
+}
 
+_ACEOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
+          gt_cv_locale_zh_CN=none
+        fi
+      fi
+    else
+      # If there was a link error, due to mblen(), the system is so old that
+      # it certainly doesn't have a chinese locale.
+      gt_cv_locale_zh_CN=none
+    fi
+    rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-$as_echo "$gl_cv_next_wctype_h" >&6; }
-     fi
-     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'wctype.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_wctype_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
+$as_echo "$gt_cv_locale_zh_CN" >&6; }
+  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
 
 
-  if test $ac_cv_header_wctype_h = yes; then
-    if test $ac_cv_func_iswcntrl = yes; then
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
-$as_echo_n "checking whether iswcntrl works... " >&6; }
-if ${gl_cv_func_iswcntrl_works+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+$as_echo_n "checking for a french Unicode locale... " >&6; }
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-          if test "$cross_compiling" = yes; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-                          #if __GNU_LIBRARY__ == 1
-                          Linux libc5 i18n is broken.
-                          #endif
-int
-main ()
-{
 
-  ;
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
+    return 1;
+#endif
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
   return 0;
 }
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_iswcntrl_works="guessing yes"
-else
-  gl_cv_func_iswcntrl_works="guessing no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_iswcntrl_works=yes
-else
-  gl_cv_func_iswcntrl_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
-
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
+          else
+            # None found.
+            gt_cv_locale_fr_utf8=none
+          fi
+        fi
+      fi
+    fi
+    rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
-$as_echo "$gl_cv_func_iswcntrl_works" >&6; }
-    fi
-    HAVE_WCTYPE_H=1
-  else
-    HAVE_WCTYPE_H=0
-  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
 
 
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
 
+  GNULIB_MEMCHR=0;
+  GNULIB_MEMMEM=0;
+  GNULIB_MEMPCPY=0;
+  GNULIB_MEMRCHR=0;
+  GNULIB_RAWMEMCHR=0;
+  GNULIB_STPCPY=0;
+  GNULIB_STPNCPY=0;
+  GNULIB_STRCHRNUL=0;
+  GNULIB_STRDUP=0;
+  GNULIB_STRNCAT=0;
+  GNULIB_STRNDUP=0;
+  GNULIB_STRNLEN=0;
+  GNULIB_STRPBRK=0;
+  GNULIB_STRSEP=0;
+  GNULIB_STRSTR=0;
+  GNULIB_STRCASESTR=0;
+  GNULIB_STRTOK_R=0;
+  GNULIB_MBSLEN=0;
+  GNULIB_MBSNLEN=0;
+  GNULIB_MBSCHR=0;
+  GNULIB_MBSRCHR=0;
+  GNULIB_MBSSTR=0;
+  GNULIB_MBSCASECMP=0;
+  GNULIB_MBSNCASECMP=0;
+  GNULIB_MBSPCASECMP=0;
+  GNULIB_MBSCASESTR=0;
+  GNULIB_MBSCSPN=0;
+  GNULIB_MBSPBRK=0;
+  GNULIB_MBSSPN=0;
+  GNULIB_MBSSEP=0;
+  GNULIB_MBSTOK_R=0;
+  GNULIB_STRERROR=0;
+  GNULIB_STRSIGNAL=0;
+  GNULIB_STRVERSCMP=0;
+  HAVE_MBSLEN=0;
+    HAVE_MEMCHR=1;
+  HAVE_DECL_MEMMEM=1;
+  HAVE_MEMPCPY=1;
+  HAVE_DECL_MEMRCHR=1;
+  HAVE_RAWMEMCHR=1;
+  HAVE_STPCPY=1;
+  HAVE_STPNCPY=1;
+  HAVE_STRCHRNUL=1;
+  HAVE_DECL_STRDUP=1;
+  HAVE_DECL_STRNDUP=1;
+  HAVE_DECL_STRNLEN=1;
+  HAVE_STRPBRK=1;
+  HAVE_STRSEP=1;
+  HAVE_STRCASESTR=1;
+  HAVE_DECL_STRTOK_R=1;
+  HAVE_DECL_STRSIGNAL=1;
+  HAVE_STRVERSCMP=1;
+  REPLACE_MEMCHR=0;
+  REPLACE_MEMMEM=0;
+  REPLACE_STPNCPY=0;
+  REPLACE_STRDUP=0;
+  REPLACE_STRSTR=0;
+  REPLACE_STRCASESTR=0;
+  REPLACE_STRERROR=0;
+  REPLACE_STRNCAT=0;
+  REPLACE_STRNDUP=0;
+  REPLACE_STRNLEN=0;
+  REPLACE_STRSIGNAL=0;
+  REPLACE_STRTOK_R=0;
+  UNDEFINE_STRTOK_R=0;
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  fi
 
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
-  else
-    for ac_func in towlower
-do :
-  ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
-if test "x$ac_cv_func_towlower" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TOWLOWER 1
-_ACEOF
 
-fi
-done
 
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
 
-"
-if test "x$ac_cv_have_decl_towlower" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER $ac_have_decl
-_ACEOF
 
-      if test $ac_cv_have_decl_towlower = yes; then
-                                REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
 
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-        :
-  fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
-$as_echo_n "checking for wctype_t... " >&6; }
-if ${gl_cv_type_wctype_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctype_t=yes
-else
-  gl_cv_type_wctype_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
-$as_echo "$gl_cv_type_wctype_t" >&6; }
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
-  fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
-$as_echo_n "checking for wctrans_t... " >&6; }
-if ${gl_cv_type_wctrans_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctrans_t=yes
-else
-  gl_cv_type_wctrans_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
-$as_echo "$gl_cv_type_wctrans_t" >&6; }
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
-  fi
 
 
-    for gl_func in wctype iswctype wctrans towctrans     ; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
 
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
 
 
 
 
 
 
-  case "$host_os" in
-    mingw*)
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
-$as_echo_n "checking for 64-bit off_t... " >&6; }
-if ${gl_cv_type_off_t_64+:} false; then :
-  $as_echo_n "(cached) " >&6
+  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
+  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+  # irrelevant for anonymous mappings.
+  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = x""yes; then :
+  gl_have_mmap=yes
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gl_have_mmap=no
+fi
+
+
+  # Try to allow MAP_ANONYMOUS.
+  gl_have_mmap_anonymous=no
+  if test $gl_have_mmap = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
+$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/types.h>
-                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
 
-int
-main ()
-{
+#include <sys/mman.h>
+#ifdef MAP_ANONYMOUS
+    I cant identify this map.
+#endif
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_off_t_64=yes
-else
-  gl_cv_type_off_t_64=no
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
+  gl_have_mmap_anonymous=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-$as_echo "$gl_cv_type_off_t_64" >&6; }
-      if test $gl_cv_type_off_t_64 = no; then
-        WINDOWS_64_BIT_OFF_T=1
-      else
-        WINDOWS_64_BIT_OFF_T=0
-      fi
-                  WINDOWS_64_BIT_ST_SIZE=1
-      ;;
-    *)
-                                                      WINDOWS_64_BIT_OFF_T=0
-      WINDOWS_64_BIT_ST_SIZE=0
-      ;;
-  esac
+    if test $gl_have_mmap_anonymous != yes; then
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+#include <sys/mman.h>
+#ifdef MAP_ANON
+    I cant identify this map.
+#endif
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
 _ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
 
+$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
-  GNULIB_LOCALECONV=0;
-  GNULIB_SETLOCALE=0;
-  GNULIB_DUPLOCALE=0;
-    HAVE_DUPLOCALE=1;
-  REPLACE_LOCALECONV=0;
-  REPLACE_SETLOCALE=0;
-  REPLACE_DUPLOCALE=0;
-  REPLACE_STRUCT_LCONV=0;
+         gl_have_mmap_anonymous=yes
+fi
+rm -f conftest*
 
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
+$as_echo "$gl_have_mmap_anonymous" >&6; }
+    if test $gl_have_mmap_anonymous = yes; then
 
-    REPLACE_NULL=0;
-  HAVE_WCHAR_T=1;
+$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
 
+    fi
+  fi
 
 
+  :
 
-  STDDEF_H=
-  if test $gt_cv_c_wchar_t = no; then
-    HAVE_WCHAR_T=0
-    STDDEF_H=stddef.h
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
-$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_memchr = yes; then
+    # Detect platform-specific bugs in some versions of glibc:
+    # memchr should not dereference anything with length 0
+    #   http://bugzilla.redhat.com/499689
+    # memchr should not dereference overestimated length after a match
+    #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
+    #   http://sourceware.org/bugzilla/show_bug.cgi?id=10162
+    # Assume that memchr works on platforms that lack mprotect.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
+$as_echo_n "checking whether memchr works... " >&6; }
+if test "${gl_cv_func_memchr_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then :
+         gl_cv_func_memchr_works="guessing no"
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stddef.h>
-      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+
+#include <string.h>
+#if HAVE_SYS_MMAN_H
+# include <fcntl.h>
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/mman.h>
+# ifndef MAP_FILE
+#  define MAP_FILE 0
+# endif
+#endif
 
 int
 main ()
 {
 
+  char *fence = NULL;
+#if HAVE_SYS_MMAN_H && HAVE_MPROTECT
+# if HAVE_MAP_ANONYMOUS
+  const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
+  const int fd = -1;
+# else /* !HAVE_MAP_ANONYMOUS */
+  const int flags = MAP_FILE | MAP_PRIVATE;
+  int fd = open ("/dev/zero", O_RDONLY, 0666);
+  if (fd >= 0)
+# endif
+    {
+      int pagesize = getpagesize ();
+      char *two_pages =
+        (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
+                       flags, fd, 0);
+      if (two_pages != (char *)(-1)
+          && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
+        fence = two_pages + pagesize;
+    }
+#endif
+  if (fence)
+    {
+      if (memchr (fence, 0, 0))
+        return 1;
+      strcpy (fence - 9, "12345678");
+      if (memchr (fence - 9, 0, 79) != fence - 1)
+        return 2;
+    }
+  return 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_decl_null_works=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_memchr_works=yes
 else
-  gl_cv_decl_null_works=no
+  gl_cv_func_memchr_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-$as_echo "$gl_cv_decl_null_works" >&6; }
-  if test $gl_cv_decl_null_works = no; then
-    REPLACE_NULL=1
-    STDDEF_H=stddef.h
-  fi
 
-   if test -n "$STDDEF_H"; then
-  GL_GENERATE_STDDEF_H_TRUE=
-  GL_GENERATE_STDDEF_H_FALSE='#'
-else
-  GL_GENERATE_STDDEF_H_TRUE='#'
-  GL_GENERATE_STDDEF_H_FALSE=
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5
+$as_echo "$gl_cv_func_memchr_works" >&6; }
+    if test "$gl_cv_func_memchr_works" != yes; then
+      REPLACE_MEMCHR=1
+    fi
+  else
+    HAVE_MEMCHR=0
+  fi
+  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
 
-  if test -n "$STDDEF_H"; then
 
 
 
@@ -22365,372 +20591,207 @@
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext"
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stddef_h='<'stddef.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
-$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+  for ac_header in bp-sym.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
+if test "x$ac_cv_header_bp_sym_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BP_SYM_H 1
+_ACEOF
+
+fi
+
+done
 
 
+  fi
+
 
+    gl_cv_c_multiarch=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stddef.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
+#ifndef __APPLE_CC__
+         not a universal capable compiler
+        #endif
+        typedef int dummy;
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stddef.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
 
-        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+               arch=
+     prev=
+     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+       if test -n "$prev"; then
+         case $word in
+           i?86 | x86_64 | ppc | ppc64)
+             if test -z "$arch" || test "$arch" = "$word"; then
+               arch="$word"
+             else
+               gl_cv_c_multiarch=yes
+             fi
+             ;;
+         esac
+         prev=
+       else
+         if test "x$word" = "x-arch"; then
+           prev=arch
+         fi
+       fi
+     done
 
-           gl_header=$gl_cv_absolute_stddef_h
-           gl_cv_next_stddef_h='"'$gl_header'"'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test $gl_cv_c_multiarch = yes; then
 
+$as_echo "#define AA_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-$as_echo "$gl_cv_next_stddef_h" >&6; }
-     fi
-     NEXT_STDDEF_H=$gl_cv_next_stddef_h
+    APPLE_UNIVERSAL_BUILD=1
+  else
+    APPLE_UNIVERSAL_BUILD=0
+  fi
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stddef.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stddef_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
 
 
 
 
-  fi
 
 
 
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+$as_echo_n "checking for shared library path variable... " >&6; }
+if test "${acl_cv_libpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-     GNULIB_FCHMODAT=0;
-  GNULIB_FSTAT=0;
-  GNULIB_FSTATAT=0;
-  GNULIB_FUTIMENS=0;
-  GNULIB_LCHMOD=0;
-  GNULIB_LSTAT=0;
-  GNULIB_MKDIRAT=0;
-  GNULIB_MKFIFO=0;
-  GNULIB_MKFIFOAT=0;
-  GNULIB_MKNOD=0;
-  GNULIB_MKNODAT=0;
-  GNULIB_STAT=0;
-  GNULIB_UTIMENSAT=0;
-    HAVE_FCHMODAT=1;
-  HAVE_FSTATAT=1;
-  HAVE_FUTIMENS=1;
-  HAVE_LCHMOD=1;
-  HAVE_LSTAT=1;
-  HAVE_MKDIRAT=1;
-  HAVE_MKFIFO=1;
-  HAVE_MKFIFOAT=1;
-  HAVE_MKNOD=1;
-  HAVE_MKNODAT=1;
-  HAVE_UTIMENSAT=1;
-  REPLACE_FSTAT=0;
-  REPLACE_FSTATAT=0;
-  REPLACE_FUTIMENS=0;
-  REPLACE_LSTAT=0;
-  REPLACE_MKDIR=0;
-  REPLACE_MKFIFO=0;
-  REPLACE_MKNOD=0;
-  REPLACE_STAT=0;
-  REPLACE_UTIMENSAT=0;
+    LD="$LD" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_libpath=${acl_cv_shlibpath_var:-none}
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+$as_echo "$acl_cv_libpath" >&6; }
+  shlibpath_var="$acl_cv_shlibpath_var"
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+$as_echo_n "checking whether to activate relocatable installation... " >&6; }
+  # Check whether --enable-relocatable was given.
+if test "${enable_relocatable+set}" = set; then :
+  enableval=$enable_relocatable; if test "$enableval" != no; then
+       RELOCATABLE=yes
+     else
+       RELOCATABLE=no
+     fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if ${gl_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  rm -f conftest.sym conftest.file
-     echo >conftest.file
-     if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
-          esac
+  RELOCATABLE=no
+fi
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-struct stat sbuf;
-              /* Linux will dereference the symlink and fail, as required by
-                 POSIX.  That is better in the sense that it means we will not
-                 have to compile and use the lstat wrapper.  */
-              return lstat ("conftest.sym/", &sbuf) == 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_lstat_dereferences_slashed_symlink=yes
-else
-  gl_cv_func_lstat_dereferences_slashed_symlink=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+$as_echo "$RELOCATABLE" >&6; }
 
-     else
-       # If the 'ln -s' command failed, then we probably don't even
-       # have an lstat function.
-       gl_cv_func_lstat_dereferences_slashed_symlink="guessing no"
-     fi
-     rm -f conftest.sym conftest.file
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-$as_echo "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
-  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-    *yes)
+
+    if test "X$prefix" = "XNONE"; then
+    reloc_final_prefix="$ac_default_prefix"
+  else
+    reloc_final_prefix="$prefix"
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+#define INSTALLPREFIX "${reloc_final_prefix}"
 _ACEOF
 
-      ;;
-  esac
+  if test $RELOCATABLE = yes; then
 
+$as_echo "#define ENABLE_RELOCATABLE 1" >>confdefs.h
 
-  for ac_header in stdlib.h
+  fi
+
+
+
+
+
+
+  is_noop=no
+  use_elf_origin_trick=no
+  if test $RELOCATABLE = yes; then
+    # --enable-relocatable implies --disable-rpath
+    enable_rpath=no
+    for ac_header in mach-o/dyld.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
+if test "x$ac_cv_header_mach_o_dyld_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
+#define HAVE_MACH_O_DYLD_H 1
 _ACEOF
 
 fi
 
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
+    for ac_func in _NSGetExecutablePath
+do :
+  ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
+if test "x$ac_cv_func__NSGetExecutablePath" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__NSGETEXECUTABLEPATH 1
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=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: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-  gl_cv_func_malloc_0_nonnull=1
+done
+
+    case "$host_os" in
+      mingw*) is_noop=yes ;;
+      linux*) use_elf_origin_trick=yes ;;
+    esac
+    if test $is_noop = yes; then
+      RELOCATABLE_LDFLAGS=:
+
+    else
+      if test $use_elf_origin_trick = yes; then
+                case "$ac_aux_dir" in
+          /*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
+          *) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
+        esac
+        RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
+
+      else
+                                        INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
+
+        case "$ac_aux_dir" in
+          /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
+          *) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
+        esac
+      fi
+    fi
+  fi
+   if test $is_noop = yes || test $use_elf_origin_trick = yes; then
+  RELOCATABLE_VIA_LD_TRUE=
+  RELOCATABLE_VIA_LD_FALSE='#'
 else
-  gl_cv_func_malloc_0_nonnull=0
+  RELOCATABLE_VIA_LD_TRUE='#'
+  RELOCATABLE_VIA_LD_FALSE=
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
-_ACEOF
 
 
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
-$as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int
-main ()
-{
-mbstate_t x; return sizeof x;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_mbstate_t=yes
-else
-  ac_cv_type_mbstate_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-$as_echo "$ac_cv_type_mbstate_t" >&6; }
-   if test $ac_cv_type_mbstate_t = yes; then
 
-$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h
 
-   else
+      RELOCATABLE_STRIP=':'
 
-$as_echo "#define mbstate_t int" >>confdefs.h
 
-   fi
 
 
-  GNULIB_BTOWC=0;
-  GNULIB_WCTOB=0;
-  GNULIB_MBSINIT=0;
-  GNULIB_MBRTOWC=0;
-  GNULIB_MBRLEN=0;
-  GNULIB_MBSRTOWCS=0;
-  GNULIB_MBSNRTOWCS=0;
-  GNULIB_WCRTOMB=0;
-  GNULIB_WCSRTOMBS=0;
-  GNULIB_WCSNRTOMBS=0;
-  GNULIB_WCWIDTH=0;
-  GNULIB_WMEMCHR=0;
-  GNULIB_WMEMCMP=0;
-  GNULIB_WMEMCPY=0;
-  GNULIB_WMEMMOVE=0;
-  GNULIB_WMEMSET=0;
-  GNULIB_WCSLEN=0;
-  GNULIB_WCSNLEN=0;
-  GNULIB_WCSCPY=0;
-  GNULIB_WCPCPY=0;
-  GNULIB_WCSNCPY=0;
-  GNULIB_WCPNCPY=0;
-  GNULIB_WCSCAT=0;
-  GNULIB_WCSNCAT=0;
-  GNULIB_WCSCMP=0;
-  GNULIB_WCSNCMP=0;
-  GNULIB_WCSCASECMP=0;
-  GNULIB_WCSNCASECMP=0;
-  GNULIB_WCSCOLL=0;
-  GNULIB_WCSXFRM=0;
-  GNULIB_WCSDUP=0;
-  GNULIB_WCSCHR=0;
-  GNULIB_WCSRCHR=0;
-  GNULIB_WCSCSPN=0;
-  GNULIB_WCSSPN=0;
-  GNULIB_WCSPBRK=0;
-  GNULIB_WCSSTR=0;
-  GNULIB_WCSTOK=0;
-  GNULIB_WCSWIDTH=0;
-    HAVE_BTOWC=1;
-  HAVE_MBSINIT=1;
-  HAVE_MBRTOWC=1;
-  HAVE_MBRLEN=1;
-  HAVE_MBSRTOWCS=1;
-  HAVE_MBSNRTOWCS=1;
-  HAVE_WCRTOMB=1;
-  HAVE_WCSRTOMBS=1;
-  HAVE_WCSNRTOMBS=1;
-  HAVE_WMEMCHR=1;
-  HAVE_WMEMCMP=1;
-  HAVE_WMEMCPY=1;
-  HAVE_WMEMMOVE=1;
-  HAVE_WMEMSET=1;
-  HAVE_WCSLEN=1;
-  HAVE_WCSNLEN=1;
-  HAVE_WCSCPY=1;
-  HAVE_WCPCPY=1;
-  HAVE_WCSNCPY=1;
-  HAVE_WCPNCPY=1;
-  HAVE_WCSCAT=1;
-  HAVE_WCSNCAT=1;
-  HAVE_WCSCMP=1;
-  HAVE_WCSNCMP=1;
-  HAVE_WCSCASECMP=1;
-  HAVE_WCSNCASECMP=1;
-  HAVE_WCSCOLL=1;
-  HAVE_WCSXFRM=1;
-  HAVE_WCSDUP=1;
-  HAVE_WCSCHR=1;
-  HAVE_WCSRCHR=1;
-  HAVE_WCSCSPN=1;
-  HAVE_WCSSPN=1;
-  HAVE_WCSPBRK=1;
-  HAVE_WCSSTR=1;
-  HAVE_WCSTOK=1;
-  HAVE_WCSWIDTH=1;
-  HAVE_DECL_WCTOB=1;
-  HAVE_DECL_WCWIDTH=1;
-  REPLACE_MBSTATE_T=0;
-  REPLACE_BTOWC=0;
-  REPLACE_WCTOB=0;
-  REPLACE_MBSINIT=0;
-  REPLACE_MBRTOWC=0;
-  REPLACE_MBRLEN=0;
-  REPLACE_MBSRTOWCS=0;
-  REPLACE_MBSNRTOWCS=0;
-  REPLACE_WCRTOMB=0;
-  REPLACE_WCSRTOMBS=0;
-  REPLACE_WCSNRTOMBS=0;
-  REPLACE_WCWIDTH=0;
-  REPLACE_WCSWIDTH=0;
 
 
 
@@ -22739,2392 +20800,17 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
-     on Cygwin 1.5.x.  */
-  if (MB_CUR_MAX == 1)
-    return 1;
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
-            else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
-              else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
-  LOCALE_JA=$gt_cv_locale_ja
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  /* Check whether a typical GB18030 multibyte sequence is recognized as a
-     single wide character.  This excludes the GB2312 and GBK encodings.  */
-  if (mblen ("\203\062\332\066", 5) != 4)
-    return 1;
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
-          gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
-    else
-      # If there was a link error, due to mblen(), the system is so old that
-      # it certainly doesn't have a chinese locale.
-      gt_cv_locale_zh_CN=none
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
-  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
-
-
-  GNULIB_FFSL=0;
-  GNULIB_FFSLL=0;
-  GNULIB_MEMCHR=0;
-  GNULIB_MEMMEM=0;
-  GNULIB_MEMPCPY=0;
-  GNULIB_MEMRCHR=0;
-  GNULIB_RAWMEMCHR=0;
-  GNULIB_STPCPY=0;
-  GNULIB_STPNCPY=0;
-  GNULIB_STRCHRNUL=0;
-  GNULIB_STRDUP=0;
-  GNULIB_STRNCAT=0;
-  GNULIB_STRNDUP=0;
-  GNULIB_STRNLEN=0;
-  GNULIB_STRPBRK=0;
-  GNULIB_STRSEP=0;
-  GNULIB_STRSTR=0;
-  GNULIB_STRCASESTR=0;
-  GNULIB_STRTOK_R=0;
-  GNULIB_MBSLEN=0;
-  GNULIB_MBSNLEN=0;
-  GNULIB_MBSCHR=0;
-  GNULIB_MBSRCHR=0;
-  GNULIB_MBSSTR=0;
-  GNULIB_MBSCASECMP=0;
-  GNULIB_MBSNCASECMP=0;
-  GNULIB_MBSPCASECMP=0;
-  GNULIB_MBSCASESTR=0;
-  GNULIB_MBSCSPN=0;
-  GNULIB_MBSPBRK=0;
-  GNULIB_MBSSPN=0;
-  GNULIB_MBSSEP=0;
-  GNULIB_MBSTOK_R=0;
-  GNULIB_STRERROR=0;
-  GNULIB_STRERROR_R=0;
-  GNULIB_STRSIGNAL=0;
-  GNULIB_STRVERSCMP=0;
-  HAVE_MBSLEN=0;
-    HAVE_FFSL=1;
-  HAVE_FFSLL=1;
-  HAVE_MEMCHR=1;
-  HAVE_DECL_MEMMEM=1;
-  HAVE_MEMPCPY=1;
-  HAVE_DECL_MEMRCHR=1;
-  HAVE_RAWMEMCHR=1;
-  HAVE_STPCPY=1;
-  HAVE_STPNCPY=1;
-  HAVE_STRCHRNUL=1;
-  HAVE_DECL_STRDUP=1;
-  HAVE_DECL_STRNDUP=1;
-  HAVE_DECL_STRNLEN=1;
-  HAVE_STRPBRK=1;
-  HAVE_STRSEP=1;
-  HAVE_STRCASESTR=1;
-  HAVE_DECL_STRTOK_R=1;
-  HAVE_DECL_STRERROR_R=1;
-  HAVE_DECL_STRSIGNAL=1;
-  HAVE_STRVERSCMP=1;
-  REPLACE_MEMCHR=0;
-  REPLACE_MEMMEM=0;
-  REPLACE_STPNCPY=0;
-  REPLACE_STRDUP=0;
-  REPLACE_STRSTR=0;
-  REPLACE_STRCASESTR=0;
-  REPLACE_STRCHRNUL=0;
-  REPLACE_STRERROR=0;
-  REPLACE_STRERROR_R=0;
-  REPLACE_STRNCAT=0;
-  REPLACE_STRNDUP=0;
-  REPLACE_STRNLEN=0;
-  REPLACE_STRSIGNAL=0;
-  REPLACE_STRTOK_R=0;
-  UNDEFINE_STRTOK_R=0;
-
-
-
-
-
-
-
-
-
-
-
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
-else
-  gl_have_mmap=no
-fi
-
-
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
-
-         gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
-
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
-
-    fi
-  fi
-
-
-
-
-
-
-  if test $HAVE_MEMCHR = 1; then
-    # Detect platform-specific bugs in some versions of glibc:
-    # memchr should not dereference anything with length 0
-    #   http://bugzilla.redhat.com/499689
-    # memchr should not dereference overestimated length after a match
-    #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
-    #   http://sourceware.org/bugzilla/show_bug.cgi?id=10162
-    # Assume that memchr works on platforms that lack mprotect.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
-$as_echo_n "checking whether memchr works... " >&6; }
-if ${gl_cv_func_memchr_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-         gl_cv_func_memchr_works="guessing no"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <string.h>
-#if HAVE_SYS_MMAN_H
-# include <fcntl.h>
-# include <unistd.h>
-# include <sys/types.h>
-# include <sys/mman.h>
-# ifndef MAP_FILE
-#  define MAP_FILE 0
-# endif
-#endif
-
-int
-main ()
-{
-
-  int result = 0;
-  char *fence = NULL;
-#if HAVE_SYS_MMAN_H && HAVE_MPROTECT
-# if HAVE_MAP_ANONYMOUS
-  const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
-  const int fd = -1;
-# else /* !HAVE_MAP_ANONYMOUS */
-  const int flags = MAP_FILE | MAP_PRIVATE;
-  int fd = open ("/dev/zero", O_RDONLY, 0666);
-  if (fd >= 0)
-# endif
-    {
-      int pagesize = getpagesize ();
-      char *two_pages =
-        (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
-                       flags, fd, 0);
-      if (two_pages != (char *)(-1)
-          && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
-        fence = two_pages + pagesize;
-    }
-#endif
-  if (fence)
-    {
-      if (memchr (fence, 0, 0))
-        result |= 1;
-      strcpy (fence - 9, "12345678");
-      if (memchr (fence - 9, 0, 79) != fence - 1)
-        result |= 2;
-      if (memchr (fence - 1, 0, 3) != fence - 1)
-        result |= 4;
-    }
-  return result;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_memchr_works=yes
-else
-  gl_cv_func_memchr_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_memchr_works" >&5
-$as_echo "$gl_cv_func_memchr_works" >&6; }
-    if test "$gl_cv_func_memchr_works" != yes; then
-      REPLACE_MEMCHR=1
-    fi
-  fi
-
-
-
-
-    gl_cv_c_multiarch=no
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-         not a universal capable compiler
-        #endif
-        typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-               arch=
-     prev=
-     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-       if test -n "$prev"; then
-         case $word in
-           i?86 | x86_64 | ppc | ppc64)
-             if test -z "$arch" || test "$arch" = "$word"; then
-               arch="$word"
-             else
-               gl_cv_c_multiarch=yes
-             fi
-             ;;
-         esac
-         prev=
-       else
-         if test "x$word" = "x-arch"; then
-           prev=arch
-         fi
-       fi
-     done
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $gl_cv_c_multiarch = yes; then
-    APPLE_UNIVERSAL_BUILD=1
-  else
-    APPLE_UNIVERSAL_BUILD=0
-  fi
-
-
-
-  GNULIB_PTHREAD_SIGMASK=0;
-  GNULIB_RAISE=0;
-  GNULIB_SIGNAL_H_SIGPIPE=0;
-  GNULIB_SIGPROCMASK=0;
-  GNULIB_SIGACTION=0;
-    HAVE_POSIX_SIGNALBLOCKING=1;
-  HAVE_PTHREAD_SIGMASK=1;
-  HAVE_RAISE=1;
-  HAVE_SIGSET_T=1;
-  HAVE_SIGINFO_T=1;
-  HAVE_SIGACTION=1;
-  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
-
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
-
-  HAVE_SIGHANDLER_T=1;
-  REPLACE_PTHREAD_SIGMASK=0;
-  REPLACE_RAISE=0;
-
-
-  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "
-      #include <signal.h>
-      /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-      #include <sys/types.h>
-
-"
-if test "x$ac_cv_type_sigset_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGSET_T 1
-_ACEOF
-
-gl_cv_type_sigset_t=yes
-else
-  gl_cv_type_sigset_t=no
-fi
-
-  if test $gl_cv_type_sigset_t != yes; then
-    HAVE_SIGSET_T=0
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
-$as_echo_n "checking for SIGPIPE... " >&6; }
-if ${gl_cv_header_signal_h_SIGPIPE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <signal.h>
-#if !defined SIGPIPE
-booboo
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "booboo" >/dev/null 2>&1; then :
-  gl_cv_header_signal_h_SIGPIPE=no
-else
-  gl_cv_header_signal_h_SIGPIPE=yes
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
-$as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
-
-
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
-$as_echo_n "checking for shared library path variable... " >&6; }
-if ${acl_cv_libpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    LD="$LD" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_libpath=${acl_cv_shlibpath_var:-none}
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-$as_echo "$acl_cv_libpath" >&6; }
-  shlibpath_var="$acl_cv_shlibpath_var"
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
-$as_echo_n "checking whether to activate relocatable installation... " >&6; }
-  # Check whether --enable-relocatable was given.
-if test "${enable_relocatable+set}" = set; then :
-  enableval=$enable_relocatable; if test "$enableval" != no; then
-       RELOCATABLE=yes
-     else
-       RELOCATABLE=no
-     fi
-
-else
-  RELOCATABLE=no
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-$as_echo "$RELOCATABLE" >&6; }
-
-
-
-    if test "X$prefix" = "XNONE"; then
-    reloc_final_prefix="$ac_default_prefix"
-  else
-    reloc_final_prefix="$prefix"
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define INSTALLPREFIX "${reloc_final_prefix}"
-_ACEOF
-
-  if test $RELOCATABLE = yes; then
-
-$as_echo "#define ENABLE_RELOCATABLE 1" >>confdefs.h
-
-  fi
-
-
-
-
-
-
-  is_noop=no
-  use_elf_origin_trick=no
-  use_wrapper=no
-  if test $RELOCATABLE = yes; then
-    # --enable-relocatable implies --disable-rpath
-    enable_rpath=no
-    for ac_header in mach-o/dyld.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_o_dyld_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MACH_O_DYLD_H 1
-_ACEOF
-
-fi
-
-done
-
-    for ac_func in _NSGetExecutablePath
-do :
-  ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
-if test "x$ac_cv_func__NSGetExecutablePath" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__NSGETEXECUTABLEPATH 1
-_ACEOF
-
-fi
-done
-
-    case "$host_os" in
-      mingw*) is_noop=yes ;;
-      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
-    esac
-    if test $is_noop = yes; then
-      RELOCATABLE_LDFLAGS=:
-
-    else
-      if test $use_elf_origin_trick = yes; then
-                case "$ac_aux_dir" in
-          /*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
-          *) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
-        esac
-        RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
-
-      else
-        use_wrapper=yes
-                                        INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
-
-        case "$ac_aux_dir" in
-          /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
-          *) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
-        esac
-      fi
-    fi
-  fi
-   if test $is_noop = yes || test $use_elf_origin_trick = yes; then
-  RELOCATABLE_VIA_LD_TRUE=
-  RELOCATABLE_VIA_LD_FALSE='#'
-else
-  RELOCATABLE_VIA_LD_TRUE='#'
-  RELOCATABLE_VIA_LD_FALSE=
-fi
-
-   if test $use_wrapper = yes; then
-  RELOCATABLE_VIA_WRAPPER_TRUE=
-  RELOCATABLE_VIA_WRAPPER_FALSE='#'
-else
-  RELOCATABLE_VIA_WRAPPER_TRUE='#'
-  RELOCATABLE_VIA_WRAPPER_FALSE=
-fi
-
-
-
-
-
-
-
-
-      RELOCATABLE_STRIP=':'
-
-
-ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_setenv" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SETENV $ac_have_decl
-_ACEOF
-
-
-
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-$as_echo "#define uid_t int" >>confdefs.h
-
-
-$as_echo "#define gid_t int" >>confdefs.h
-
-fi
-
-
-  GNULIB_DPRINTF=0;
-  GNULIB_FCLOSE=0;
-  GNULIB_FDOPEN=0;
-  GNULIB_FFLUSH=0;
-  GNULIB_FGETC=0;
-  GNULIB_FGETS=0;
-  GNULIB_FOPEN=0;
-  GNULIB_FPRINTF=0;
-  GNULIB_FPRINTF_POSIX=0;
-  GNULIB_FPURGE=0;
-  GNULIB_FPUTC=0;
-  GNULIB_FPUTS=0;
-  GNULIB_FREAD=0;
-  GNULIB_FREOPEN=0;
-  GNULIB_FSCANF=0;
-  GNULIB_FSEEK=0;
-  GNULIB_FSEEKO=0;
-  GNULIB_FTELL=0;
-  GNULIB_FTELLO=0;
-  GNULIB_FWRITE=0;
-  GNULIB_GETC=0;
-  GNULIB_GETCHAR=0;
-  GNULIB_GETDELIM=0;
-  GNULIB_GETLINE=0;
-  GNULIB_OBSTACK_PRINTF=0;
-  GNULIB_OBSTACK_PRINTF_POSIX=0;
-  GNULIB_PCLOSE=0;
-  GNULIB_PERROR=0;
-  GNULIB_POPEN=0;
-  GNULIB_PRINTF=0;
-  GNULIB_PRINTF_POSIX=0;
-  GNULIB_PUTC=0;
-  GNULIB_PUTCHAR=0;
-  GNULIB_PUTS=0;
-  GNULIB_REMOVE=0;
-  GNULIB_RENAME=0;
-  GNULIB_RENAMEAT=0;
-  GNULIB_SCANF=0;
-  GNULIB_SNPRINTF=0;
-  GNULIB_SPRINTF_POSIX=0;
-  GNULIB_STDIO_H_NONBLOCKING=0;
-  GNULIB_STDIO_H_SIGPIPE=0;
-  GNULIB_TMPFILE=0;
-  GNULIB_VASPRINTF=0;
-  GNULIB_VFSCANF=0;
-  GNULIB_VSCANF=0;
-  GNULIB_VDPRINTF=0;
-  GNULIB_VFPRINTF=0;
-  GNULIB_VFPRINTF_POSIX=0;
-  GNULIB_VPRINTF=0;
-  GNULIB_VPRINTF_POSIX=0;
-  GNULIB_VSNPRINTF=0;
-  GNULIB_VSPRINTF_POSIX=0;
-    HAVE_DECL_FPURGE=1;
-  HAVE_DECL_FSEEKO=1;
-  HAVE_DECL_FTELLO=1;
-  HAVE_DECL_GETDELIM=1;
-  HAVE_DECL_GETLINE=1;
-  HAVE_DECL_OBSTACK_PRINTF=1;
-  HAVE_DECL_SNPRINTF=1;
-  HAVE_DECL_VSNPRINTF=1;
-  HAVE_DPRINTF=1;
-  HAVE_FSEEKO=1;
-  HAVE_FTELLO=1;
-  HAVE_PCLOSE=1;
-  HAVE_POPEN=1;
-  HAVE_RENAMEAT=1;
-  HAVE_VASPRINTF=1;
-  HAVE_VDPRINTF=1;
-  REPLACE_DPRINTF=0;
-  REPLACE_FCLOSE=0;
-  REPLACE_FDOPEN=0;
-  REPLACE_FFLUSH=0;
-  REPLACE_FOPEN=0;
-  REPLACE_FPRINTF=0;
-  REPLACE_FPURGE=0;
-  REPLACE_FREOPEN=0;
-  REPLACE_FSEEK=0;
-  REPLACE_FSEEKO=0;
-  REPLACE_FTELL=0;
-  REPLACE_FTELLO=0;
-  REPLACE_GETDELIM=0;
-  REPLACE_GETLINE=0;
-  REPLACE_OBSTACK_PRINTF=0;
-  REPLACE_PERROR=0;
-  REPLACE_POPEN=0;
-  REPLACE_PRINTF=0;
-  REPLACE_REMOVE=0;
-  REPLACE_RENAME=0;
-  REPLACE_RENAMEAT=0;
-  REPLACE_SNPRINTF=0;
-  REPLACE_SPRINTF=0;
-  REPLACE_STDIO_READ_FUNCS=0;
-  REPLACE_STDIO_WRITE_FUNCS=0;
-  REPLACE_TMPFILE=0;
-  REPLACE_VASPRINTF=0;
-  REPLACE_VDPRINTF=0;
-  REPLACE_VFPRINTF=0;
-  REPLACE_VPRINTF=0;
-  REPLACE_VSNPRINTF=0;
-  REPLACE_VSPRINTF=0;
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef _MSC_VER
-MicrosoftCompiler
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "MicrosoftCompiler" >/dev/null 2>&1; then :
-  gl_asmext='asm'
-     gl_c_asm_opt='-c -Fa'
-
-else
-  gl_asmext='s'
-     gl_c_asm_opt='-S'
-
-fi
-rm -f conftest*
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
-$as_echo_n "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
-if ${gl_cv_prog_as_underscore+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" int foo (void);
-#endif
-int foo(void) { return 0; }
-EOF
-     # Look for the assembly language name in the .s file.
-     { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c'
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-  (eval $ac_try) 2>&5
-  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
-       gl_cv_prog_as_underscore=yes
-     else
-       gl_cv_prog_as_underscore=no
-     fi
-     rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-$as_echo "$gl_cv_prog_as_underscore" >&6; }
-  if test $gl_cv_prog_as_underscore = yes; then
-    USER_LABEL_PREFIX=_
-  else
-    USER_LABEL_PREFIX=
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define USER_LABEL_PREFIX $USER_LABEL_PREFIX
-_ACEOF
-
-  ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { _Bool s: 1; _Bool t; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
-
-int
-main ()
-{
-
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdbool_h=yes
-else
-  ac_cv_header_stdbool_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
-   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
-
-
-fi
-
-
-
-
-
-
-
-
-
-  if test $ac_cv_type_long_long_int = yes; then
-    HAVE_LONG_LONG_INT=1
-  else
-    HAVE_LONG_LONG_INT=0
-  fi
-
-
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    HAVE_UNSIGNED_LONG_LONG_INT=1
-  else
-    HAVE_UNSIGNED_LONG_LONG_INT=0
-  fi
-
-
-
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
-
-
-      if test $ac_cv_header_inttypes_h = yes; then
-    HAVE_INTTYPES_H=1
-  else
-    HAVE_INTTYPES_H=0
-  fi
-
-
-      if test $ac_cv_header_sys_types_h = yes; then
-    HAVE_SYS_TYPES_H=1
-  else
-    HAVE_SYS_TYPES_H=0
-  fi
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdint_h='<'stdint.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
-$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
-if ${gl_cv_next_stdint_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-             if test $ac_cv_header_stdint_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdint.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdint_h
-           gl_cv_next_stdint_h='"'$gl_header'"'
-          else
-               gl_cv_next_stdint_h='<'stdint.h'>'
-             fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-$as_echo "$gl_cv_next_stdint_h" >&6; }
-     fi
-     NEXT_STDINT_H=$gl_cv_next_stdint_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdint.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdint_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
-
-
-
-
-  if test $ac_cv_header_stdint_h = yes; then
-    HAVE_STDINT_H=1
-  else
-    HAVE_STDINT_H=0
-  fi
-
-
-    if test $ac_cv_header_stdint_h = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
-$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
-if ${gl_cv_header_working_stdint_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gl_cv_header_working_stdint_h=no
-       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>
-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
-#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
-#endif
-
-
-  /* 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
-
-
-#ifdef INT8_MAX
-int8_t a1 = INT8_MAX;
-int8_t a1min = INT8_MIN;
-#endif
-#ifdef INT16_MAX
-int16_t a2 = INT16_MAX;
-int16_t a2min = INT16_MIN;
-#endif
-#ifdef INT32_MAX
-int32_t a3 = INT32_MAX;
-int32_t a3min = INT32_MIN;
-#endif
-#ifdef INT64_MAX
-int64_t a4 = INT64_MAX;
-int64_t a4min = INT64_MIN;
-#endif
-#ifdef UINT8_MAX
-uint8_t b1 = UINT8_MAX;
-#else
-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-#endif
-#ifdef UINT16_MAX
-uint16_t b2 = UINT16_MAX;
-#endif
-#ifdef UINT32_MAX
-uint32_t b3 = UINT32_MAX;
-#endif
-#ifdef UINT64_MAX
-uint64_t b4 = UINT64_MAX;
-#endif
-int_least8_t c1 = INT8_C (0x7f);
-int_least8_t c1max = INT_LEAST8_MAX;
-int_least8_t c1min = INT_LEAST8_MIN;
-int_least16_t c2 = INT16_C (0x7fff);
-int_least16_t c2max = INT_LEAST16_MAX;
-int_least16_t c2min = INT_LEAST16_MIN;
-int_least32_t c3 = INT32_C (0x7fffffff);
-int_least32_t c3max = INT_LEAST32_MAX;
-int_least32_t c3min = INT_LEAST32_MIN;
-int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-int_least64_t c4max = INT_LEAST64_MAX;
-int_least64_t c4min = INT_LEAST64_MIN;
-uint_least8_t d1 = UINT8_C (0xff);
-uint_least8_t d1max = UINT_LEAST8_MAX;
-uint_least16_t d2 = UINT16_C (0xffff);
-uint_least16_t d2max = UINT_LEAST16_MAX;
-uint_least32_t d3 = UINT32_C (0xffffffff);
-uint_least32_t d3max = UINT_LEAST32_MAX;
-uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-uint_least64_t d4max = UINT_LEAST64_MAX;
-int_fast8_t e1 = INT_FAST8_MAX;
-int_fast8_t e1min = INT_FAST8_MIN;
-int_fast16_t e2 = INT_FAST16_MAX;
-int_fast16_t e2min = INT_FAST16_MIN;
-int_fast32_t e3 = INT_FAST32_MAX;
-int_fast32_t e3min = INT_FAST32_MIN;
-int_fast64_t e4 = INT_FAST64_MAX;
-int_fast64_t e4min = INT_FAST64_MIN;
-uint_fast8_t f1 = UINT_FAST8_MAX;
-uint_fast16_t f2 = UINT_FAST16_MAX;
-uint_fast32_t f3 = UINT_FAST32_MAX;
-uint_fast64_t f4 = UINT_FAST64_MAX;
-#ifdef INTPTR_MAX
-intptr_t g = INTPTR_MAX;
-intptr_t gmin = INTPTR_MIN;
-#endif
-#ifdef UINTPTR_MAX
-uintptr_t h = UINTPTR_MAX;
-#endif
-intmax_t i = INTMAX_MAX;
-uintmax_t j = UINTMAX_MAX;
-
-#include <limits.h> /* for CHAR_BIT */
-#define TYPE_MINIMUM(t) \
-  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t) \
-  ((t) ((t) 0 < (t) -1 \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-struct s {
-  int check_PTRDIFF:
-      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
-      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
-      ? 1 : -1;
-  /* Detect bug in FreeBSD 6.0 / ia64.  */
-  int check_SIG_ATOMIC:
-      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
-      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
-      ? 1 : -1;
-  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
-  int check_WCHAR:
-      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
-      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
-      ? 1 : -1;
-  /* Detect bug in mingw.  */
-  int check_WINT:
-      WINT_MIN == TYPE_MINIMUM (wint_t)
-      && WINT_MAX == TYPE_MAXIMUM (wint_t)
-      ? 1 : -1;
-
-  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
-  int check_UINT8_C:
-        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
-  int check_UINT16_C:
-        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
-
-  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
-#ifdef UINT8_MAX
-  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
-#endif
-#ifdef UINT16_MAX
-  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
-#endif
-#ifdef UINT32_MAX
-  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
-#endif
-#ifdef UINT64_MAX
-  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
-#endif
-  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
-  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
-  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
-  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
-  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
-  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
-  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
-  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
-  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
-  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
-  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-};
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-                                                    if test "$cross_compiling" = yes; then :
-                 gl_cv_header_working_stdint_h=yes
-
-else
-  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
-
-
-#include <stdio.h>
-#include <string.h>
-#define MVAL(macro) MVAL1(macro)
-#define MVAL1(expression) #expression
-static const char *macro_values[] =
-  {
-#ifdef INT8_MAX
-    MVAL (INT8_MAX),
-#endif
-#ifdef INT16_MAX
-    MVAL (INT16_MAX),
-#endif
-#ifdef INT32_MAX
-    MVAL (INT32_MAX),
-#endif
-#ifdef INT64_MAX
-    MVAL (INT64_MAX),
-#endif
-#ifdef UINT8_MAX
-    MVAL (UINT8_MAX),
-#endif
-#ifdef UINT16_MAX
-    MVAL (UINT16_MAX),
-#endif
-#ifdef UINT32_MAX
-    MVAL (UINT32_MAX),
-#endif
-#ifdef UINT64_MAX
-    MVAL (UINT64_MAX),
-#endif
-    NULL
-  };
-
-int
-main ()
-{
-
-  const char **mv;
-  for (mv = macro_values; *mv != NULL; mv++)
-    {
-      const char *value = *mv;
-      /* Test whether it looks like a cast expression.  */
-      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
-          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
-          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
-          || strncmp (value, "((int)"/*)*/, 6) == 0
-          || strncmp (value, "((signed short)"/*)*/, 15) == 0
-          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-        return mv - macro_values + 1;
-    }
-  return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_header_working_stdint_h=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-$as_echo "$gl_cv_header_working_stdint_h" >&6; }
-  fi
-  if test "$gl_cv_header_working_stdint_h" = yes; then
-    STDINT_H=
-  else
-            for ac_header in sys/inttypes.h sys/bitypes.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    if test $ac_cv_header_sys_inttypes_h = yes; then
-      HAVE_SYS_INTTYPES_H=1
-    else
-      HAVE_SYS_INTTYPES_H=0
-    fi
-
-    if test $ac_cv_header_sys_bitypes_h = yes; then
-      HAVE_SYS_BITYPES_H=1
-    else
-      HAVE_SYS_BITYPES_H=0
-    fi
-
-
-
-
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-
-
-  for gltype in ptrdiff_t size_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
-  /* 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
-
-#include <limits.h>"; then :
-
-else
-  result=unknown
-fi
-
-       eval gl_cv_bitsizeof_${gltype}=\$result
-
-fi
-eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_bitsizeof_${gltype}
-    if test $result = unknown; then
-                                                result=0
-    fi
-    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    cat >>confdefs.h <<_ACEOF
-#define BITSIZEOF_${GLTYPE} $result
-_ACEOF
-
-    eval BITSIZEOF_${GLTYPE}=\$result
-  done
-
-
-  fi
-
-
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
-  /* 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
-
-#include <limits.h>"; then :
-
-else
-  result=unknown
-fi
-
-       eval gl_cv_bitsizeof_${gltype}=\$result
-
-fi
-eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_bitsizeof_${gltype}
-    if test $result = unknown; then
-                                                result=0
-    fi
-    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    cat >>confdefs.h <<_ACEOF
-#define BITSIZEOF_${GLTYPE} $result
-_ACEOF
-
-    eval BITSIZEOF_${GLTYPE}=\$result
-  done
-
-
-
-
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
-$as_echo_n "checking whether $gltype is signed... " >&6; }
-if eval \${gl_cv_type_${gltype}_signed+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.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
-
-            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  result=yes
-else
-  result=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       eval gl_cv_type_${gltype}_signed=\$result
-
-fi
-eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_type_${gltype}_signed
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    if test "$result" = yes; then
-      cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGNED_${GLTYPE} 1
-_ACEOF
-
-      eval HAVE_SIGNED_${GLTYPE}=1
-    else
-      eval HAVE_SIGNED_${GLTYPE}=0
-    fi
-  done
-
-
-  gl_cv_type_ptrdiff_t_signed=yes
-  gl_cv_type_size_t_signed=no
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-
-
-  for gltype in ptrdiff_t size_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
-$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval gl_cv_type_${gltype}_suffix=no
-       eval result=\$gl_cv_type_${gltype}_signed
-       if test "$result" = yes; then
-         glsufu=
-       else
-         glsufu=u
-       fi
-       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-         case $glsuf in
-           '')  gltype1='int';;
-           l)   gltype1='long int';;
-           ll)  gltype1='long long int';;
-           i64) gltype1='__int64';;
-           u)   gltype1='unsigned int';;
-           ul)  gltype1='unsigned long int';;
-           ull) gltype1='unsigned long long int';;
-           ui64)gltype1='unsigned __int64';;
-         esac
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.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
-
-              extern $gltype foo;
-              extern $gltype1 foo;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval gl_cv_type_${gltype}_suffix=\$glsuf
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         eval result=\$gl_cv_type_${gltype}_suffix
-         test "$result" != no && break
-       done
-fi
-eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    eval result=\$gl_cv_type_${gltype}_suffix
-    test "$result" = no && result=
-    eval ${GLTYPE}_SUFFIX=\$result
-    cat >>confdefs.h <<_ACEOF
-#define ${GLTYPE}_SUFFIX $result
-_ACEOF
-
-  done
-
-
-  fi
-
-
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
-$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval gl_cv_type_${gltype}_suffix=no
-       eval result=\$gl_cv_type_${gltype}_signed
-       if test "$result" = yes; then
-         glsufu=
-       else
-         glsufu=u
-       fi
-       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-         case $glsuf in
-           '')  gltype1='int';;
-           l)   gltype1='long int';;
-           ll)  gltype1='long long int';;
-           i64) gltype1='__int64';;
-           u)   gltype1='unsigned int';;
-           ul)  gltype1='unsigned long int';;
-           ull) gltype1='unsigned long long int';;
-           ui64)gltype1='unsigned __int64';;
-         esac
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.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
-
-              extern $gltype foo;
-              extern $gltype1 foo;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval gl_cv_type_${gltype}_suffix=\$glsuf
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         eval result=\$gl_cv_type_${gltype}_suffix
-         test "$result" != no && break
-       done
-fi
-eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    eval result=\$gl_cv_type_${gltype}_suffix
-    test "$result" = no && result=
-    eval ${GLTYPE}_SUFFIX=\$result
-    cat >>confdefs.h <<_ACEOF
-#define ${GLTYPE}_SUFFIX $result
-_ACEOF
-
-  done
-
-
-
-          if test $BITSIZEOF_WINT_T -lt 32; then
-    BITSIZEOF_WINT_T=32
-  fi
-
-    STDINT_H=stdint.h
-  fi
-
-   if test -n "$STDINT_H"; then
-  GL_GENERATE_STDINT_H_TRUE=
-  GL_GENERATE_STDINT_H_FALSE='#'
-else
-  GL_GENERATE_STDINT_H_TRUE='#'
-  GL_GENERATE_STDINT_H_FALSE=
-fi
-
-
-
-     REPLACE_STRERROR_0=0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
-$as_echo_n "checking whether strerror(0) succeeds... " >&6; }
-if ${gl_cv_func_strerror_0_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_strerror_0_works="guessing no" ;;
-       esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-           #include <errno.h>
-
-int
-main ()
-{
-int result = 0;
-           char *str;
-           errno = 0;
-           str = strerror (0);
-           if (!*str) result |= 1;
-           if (errno) result |= 2;
-           if (strstr (str, "nknown") || strstr (str, "ndefined"))
-             result |= 4;
-           return result;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strerror_0_works=yes
-else
-  gl_cv_func_strerror_0_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_strerror_0_works" >&5
-$as_echo "$gl_cv_func_strerror_0_works" >&6; }
-  case "$gl_cv_func_strerror_0_works" in
-    *yes) ;;
-    *)
-      REPLACE_STRERROR_0=1
-
-$as_echo "#define REPLACE_STRERROR_0 1" >>confdefs.h
-
-      ;;
-  esac
-
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_string_h='<'string.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
-$as_echo_n "checking absolute name of <string.h>... " >&6; }
-if ${gl_cv_next_string_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'string.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_string_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_string_h
-           gl_cv_next_string_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-$as_echo "$gl_cv_next_string_h" >&6; }
-     fi
-     NEXT_STRING_H=$gl_cv_next_string_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'string.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_string_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STRING_H=$gl_next_as_first_directive
-
-
-
-
-
-
-    for gl_func in ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul      strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r      strerror_r strsignal strverscmp; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
-
-ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strnlen" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRNLEN $ac_have_decl
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
-
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
-
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
-
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stat_broken=no
-else
-  ac_cv_header_stat_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
-
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
-
-fi
-
-
-
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_types_h='<'sys/types.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
-$as_echo_n "checking absolute name of <sys/types.h>... " >&6; }
-if ${gl_cv_next_sys_types_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/types.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_sys_types_h
-           gl_cv_next_sys_types_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-$as_echo "$gl_cv_next_sys_types_h" >&6; }
-     fi
-     NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/types.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_types_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H=$gl_next_as_first_directive
-
-
-
-
-
-
-
-
-
-
-
-
-  GNULIB_MKTIME=0;
-  GNULIB_NANOSLEEP=0;
-  GNULIB_STRPTIME=0;
-  GNULIB_TIMEGM=0;
-  GNULIB_TIME_R=0;
-    HAVE_DECL_LOCALTIME_R=1;
-  HAVE_NANOSLEEP=1;
-  HAVE_STRPTIME=1;
-  HAVE_TIMEGM=1;
-        REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;
-  REPLACE_MKTIME=GNULIB_PORTCHECK;
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;
-
-      : ${GNULIB_GETTIMEOFDAY=0};
-        REPLACE_GMTIME=0;
-  REPLACE_LOCALTIME=0;
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
-$as_echo_n "checking for struct timespec in <time.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <time.h>
-
-int
-main ()
-{
-static struct timespec x; x.tv_sec = x.tv_nsec;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_timespec_in_time_h=yes
-else
-  gl_cv_sys_struct_timespec_in_time_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_sys_struct_timespec_in_time_h" >&5
-$as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
-
-  TIME_H_DEFINES_STRUCT_TIMESPEC=0
-  SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
-  PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
-  if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
-    TIME_H_DEFINES_STRUCT_TIMESPEC=1
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
-$as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/time.h>
-
-int
-main ()
-{
-static struct timespec x; x.tv_sec = x.tv_nsec;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_timespec_in_sys_time_h=yes
-else
-  gl_cv_sys_struct_timespec_in_sys_time_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_sys_struct_timespec_in_sys_time_h" >&5
-$as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
-    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
-      SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
-$as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-
-int
-main ()
-{
-static struct timespec x; x.tv_sec = x.tv_nsec;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_timespec_in_pthread_h=yes
-else
-  gl_cv_sys_struct_timespec_in_pthread_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_sys_struct_timespec_in_pthread_h" >&5
-$as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
-      if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
-        PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
-      fi
-    fi
-  fi
-
-
-
-
-
-
 
+  GNULIB_SIGNAL_H_SIGPIPE=0;
+  GNULIB_SIGPROCMASK=0;
+  GNULIB_SIGACTION=0;
+    HAVE_POSIX_SIGNALBLOCKING=1;
+  HAVE_SIGSET_T=1;
+  HAVE_SIGINFO_T=1;
+  HAVE_SIGACTION=1;
+  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
 
+  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
 
 
 
@@ -25132,775 +20818,648 @@
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_time_h='<'time.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
-$as_echo_n "checking absolute name of <time.h>... " >&6; }
-if ${gl_cv_next_time_h+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if test "${ac_cv_type_uid_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-
-
-
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <time.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'time.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_time_h
-           gl_cv_next_time_h='"'$gl_header'"'
-
+#include <sys/types.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "uid_t" >/dev/null 2>&1; then :
+  ac_cv_type_uid_t=yes
+else
+  ac_cv_type_uid_t=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
-$as_echo "$gl_cv_next_time_h" >&6; }
-     fi
-     NEXT_TIME_H=$gl_cv_next_time_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'time.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_time_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_TIME_H=$gl_next_as_first_directive
-
-
-
-
-
-
-
+rm -f conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
 
+$as_echo "#define uid_t int" >>confdefs.h
 
 
+$as_echo "#define gid_t int" >>confdefs.h
 
-gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
-i\
-0
-q
-'
-gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
-i\
-0
-q
-'
-gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
-i\
-0
-q
-'
+fi
 
 
-  if test "$HAVE_LIBUNISTRING" = yes; then
-    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
-    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
-    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
-  fi
 
-ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes; then :
-  ac_have_decl=1
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+$as_echo_n "checking for SIGPIPE... " >&6; }
+if test "${gl_cv_header_signal_h_SIGPIPE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl
-_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_feof_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+#include <signal.h>
+#if !defined SIGPIPE
+booboo
+#endif
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl
 _ACEOF
-
-ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_ferror_unlocked" = xyes; then :
-  ac_have_decl=1
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "booboo" >/dev/null 2>&1; then :
+  gl_cv_header_signal_h_SIGPIPE=no
 else
-  ac_have_decl=0
+  gl_cv_header_signal_h_SIGPIPE=yes
 fi
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl
-_ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fflush_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+$as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl
-_ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fgets_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+  GNULIB_DPRINTF=0;
+  GNULIB_FCLOSE=0;
+  GNULIB_FFLUSH=0;
+  GNULIB_FOPEN=0;
+  GNULIB_FPRINTF=0;
+  GNULIB_FPRINTF_POSIX=0;
+  GNULIB_FPURGE=0;
+  GNULIB_FPUTC=0;
+  GNULIB_FPUTS=0;
+  GNULIB_FREOPEN=0;
+  GNULIB_FSEEK=0;
+  GNULIB_FSEEKO=0;
+  GNULIB_FTELL=0;
+  GNULIB_FTELLO=0;
+  GNULIB_FWRITE=0;
+  GNULIB_GETDELIM=0;
+  GNULIB_GETLINE=0;
+  GNULIB_OBSTACK_PRINTF=0;
+  GNULIB_OBSTACK_PRINTF_POSIX=0;
+  GNULIB_PERROR=0;
+  GNULIB_POPEN=0;
+  GNULIB_PRINTF=0;
+  GNULIB_PRINTF_POSIX=0;
+  GNULIB_PUTC=0;
+  GNULIB_PUTCHAR=0;
+  GNULIB_PUTS=0;
+  GNULIB_REMOVE=0;
+  GNULIB_RENAME=0;
+  GNULIB_RENAMEAT=0;
+  GNULIB_SNPRINTF=0;
+  GNULIB_SPRINTF_POSIX=0;
+  GNULIB_STDIO_H_SIGPIPE=0;
+  GNULIB_TMPFILE=0;
+  GNULIB_VASPRINTF=0;
+  GNULIB_VDPRINTF=0;
+  GNULIB_VFPRINTF=0;
+  GNULIB_VFPRINTF_POSIX=0;
+  GNULIB_VPRINTF=0;
+  GNULIB_VPRINTF_POSIX=0;
+  GNULIB_VSNPRINTF=0;
+  GNULIB_VSPRINTF_POSIX=0;
+    HAVE_DECL_FPURGE=1;
+  HAVE_DECL_GETDELIM=1;
+  HAVE_DECL_GETLINE=1;
+  HAVE_DECL_OBSTACK_PRINTF=1;
+  HAVE_DECL_SNPRINTF=1;
+  HAVE_DECL_VSNPRINTF=1;
+  HAVE_DPRINTF=1;
+  HAVE_FSEEKO=1;
+  HAVE_FTELLO=1;
+  HAVE_RENAMEAT=1;
+  HAVE_VASPRINTF=1;
+  HAVE_VDPRINTF=1;
+  REPLACE_DPRINTF=0;
+  REPLACE_FCLOSE=0;
+  REPLACE_FFLUSH=0;
+  REPLACE_FOPEN=0;
+  REPLACE_FPRINTF=0;
+  REPLACE_FPURGE=0;
+  REPLACE_FREOPEN=0;
+  REPLACE_FSEEK=0;
+  REPLACE_FSEEKO=0;
+  REPLACE_FTELL=0;
+  REPLACE_FTELLO=0;
+  REPLACE_GETDELIM=0;
+  REPLACE_GETLINE=0;
+  REPLACE_OBSTACK_PRINTF=0;
+  REPLACE_PERROR=0;
+  REPLACE_POPEN=0;
+  REPLACE_PRINTF=0;
+  REPLACE_REMOVE=0;
+  REPLACE_RENAME=0;
+  REPLACE_RENAMEAT=0;
+  REPLACE_SNPRINTF=0;
+  REPLACE_SPRINTF=0;
+  REPLACE_STDIO_WRITE_FUNCS=0;
+  REPLACE_TMPFILE=0;
+  REPLACE_VASPRINTF=0;
+  REPLACE_VDPRINTF=0;
+  REPLACE_VFPRINTF=0;
+  REPLACE_VPRINTF=0;
+  REPLACE_VSNPRINTF=0;
+  REPLACE_VSPRINTF=0;
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl
-_ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fputc_unlocked" = xyes; then :
-  ac_have_decl=1
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system is Windows or MSDOS" >&5
+$as_echo_n "checking whether system is Windows or MSDOS... " >&6; }
+if test "${ac_cv_win_or_dos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl
-_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fputs_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+int
+main ()
+{
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl
+#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
+neither MSDOS nor Windows
+#endif
+  ;
+  return 0;
+}
 _ACEOF
-
-ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fread_unlocked" = xyes; then :
-  ac_have_decl=1
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_win_or_dos=yes
 else
-  ac_have_decl=0
+  ac_cv_win_or_dos=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl
-_ACEOF
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_win_or_dos" >&5
+$as_echo "$ac_cv_win_or_dos" >&6; }
 
-ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes; then :
-  ac_have_decl=1
+    if test x"$ac_cv_win_or_dos" = xyes; then
+      ac_fs_accepts_drive_letter_prefix=1
+      ac_fs_backslash_is_file_name_separator=1
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether drive letter can start relative path" >&5
+$as_echo_n "checking whether drive letter can start relative path... " >&6; }
+if test "${ac_cv_drive_letter_can_be_relative+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl
-_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getchar_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+int
+main ()
+{
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl
+#if defined __CYGWIN__
+drive letters are always absolute
+#endif
+  ;
+  return 0;
+}
 _ACEOF
-
-ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_putc_unlocked" = xyes; then :
-  ac_have_decl=1
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_drive_letter_can_be_relative=yes
 else
-  ac_have_decl=0
+  ac_cv_drive_letter_can_be_relative=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl
-_ACEOF
-
-ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_putchar_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_drive_letter_can_be_relative" >&5
+$as_echo "$ac_cv_drive_letter_can_be_relative" >&6; }
+      if test x"$ac_cv_drive_letter_can_be_relative" = xyes; then
+        ac_fs_drive_letter_can_be_relative=1
+      else
+        ac_fs_drive_letter_can_be_relative=0
+      fi
+    else
+      ac_fs_accepts_drive_letter_prefix=0
+      ac_fs_backslash_is_file_name_separator=0
+      ac_fs_drive_letter_can_be_relative=0
+    fi
+
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl
+#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX $ac_fs_accepts_drive_letter_prefix
 _ACEOF
 
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
-$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
-if ${gl_cv_header_wchar_h_correct_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gl_cv_header_wchar_h_correct_inline=yes
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-       #define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-extern int zero (void);
-int main () { return zero(); }
 
+
+cat >>confdefs.h <<_ACEOF
+#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR $ac_fs_backslash_is_file_name_separator
 _ACEOF
-     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-       mv conftest.$ac_objext conftest1.$ac_objext
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-         #define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int zero (void) { return 0; }
 
+
+cat >>confdefs.h <<_ACEOF
+#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE $ac_fs_drive_letter_can_be_relative
 _ACEOF
-       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-         mv conftest.$ac_objext conftest2.$ac_objext
-         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
-           :
-         else
-           gl_cv_header_wchar_h_correct_inline=no
-         fi
-       fi
-     fi
-     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
-  if test $gl_cv_header_wchar_h_correct_inline = no; then
-    as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-C99 mode. You have four options:
-  - Add the flag -fgnu89-inline to CC and reconfigure, or
-  - Fix your include files, using parts of
-    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
-  - Use a gcc version older than 4.3, or
-  - Don't use the flags -std=c99 or -std=gnu99.
-Configuration aborted." "$LINENO" 5
-  fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+          #include <stdbool.h>
+          #ifndef bool
+           "error: bool is not defined"
+          #endif
+          #ifndef false
+           "error: false is not defined"
+          #endif
+          #if false
+           "error: false is not 0"
+          #endif
+          #ifndef true
+           "error: true is not defined"
+          #endif
+          #if true != 1
+           "error: true is not 1"
+          #endif
+          #ifndef __bool_true_false_are_defined
+           "error: __bool_true_false_are_defined is not defined"
+          #endif
 
+          struct s { _Bool s: 1; _Bool t; } s;
 
+          char a[true == 1 ? 1 : -1];
+          char b[false == 0 ? 1 : -1];
+          char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+          char d[(bool) 0.5 == true ? 1 : -1];
+          bool e = &s;
+          char f[(_Bool) 0.0 == false ? 1 : -1];
+          char g[true];
+          char h[sizeof (_Bool)];
+          char i[sizeof s.t];
+          enum { j = false, k = true, l = false * true, m = true * 256 };
+          _Bool n[m];
+          char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+          #if defined __xlc__ || defined __GNUC__
+           /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+              reported by James Lemley on 2005-10-05; see
+              http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+              This test is not quite right, since xlc is allowed to
+              reject this program, as the initializer for xlcbug is
+              not one of the forms that C requires support for.
+              However, doing the test right would require a run-time
+              test, and that would make cross-compilation harder.
+              Let us hope that IBM fixes the xlc bug, and also adds
+              support for this kind of constant expression.  In the
+              meantime, this test will reject xlc, which is OK, since
+              our stdbool.h substitute should suffice.  We also test
+              this with GCC, where it should work, to detect more
+              quickly whether someone messes up the test in the
+              future.  */
+           char digs[] = "0123456789";
+           int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+          #endif
+          /* Catch a bug in an HP-UX C compiler.  See
+             http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+             http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+           */
+          _Bool q = true;
+          _Bool *pq = &q;
 
-  if test $ac_cv_header_features_h = yes; then
-    HAVE_FEATURES_H=1
-  else
-    HAVE_FEATURES_H=0
-  fi
+int
+main ()
+{
 
+          *pq |= q;
+          *pq |= ! q;
+          /* Refer to every declared value, to avoid compiler optimizations.  */
+          return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                  + !m + !n + !o + !p + !q + !pq);
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdbool_h=yes
+else
+  ac_cv_header_stdbool_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = x""yes; then :
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
+_ACEOF
 
 
-   if false; then
-  GL_COND_LIBTOOL_TRUE=
-  GL_COND_LIBTOOL_FALSE='#'
-else
-  GL_COND_LIBTOOL_TRUE='#'
-  GL_COND_LIBTOOL_FALSE=
 fi
 
-  gl_cond_libtool=false
-  gl_libdeps=
-  gl_ltlibdeps=
-  gl_m4_base='gnulib-m4'
+   if test $ac_cv_header_stdbool_h = yes; then
 
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
+   fi
 
+    REPLACE_NULL=0;
+  HAVE_WCHAR_T=1;
+  STDDEF_H='';
 
 
 
 
 
 
-  gl_source_base='gnulib-lib'
 
 
 
 
 
-  if test $ac_cv_func_alloca_works = no; then
 
 
-  :
 
-  fi
 
-  # Define an additional variable used in the Makefile substitution.
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#if defined __GNUC__ || defined _MSC_VER || !HAVE_ALLOCA_H
-  Need own alloca
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+$as_echo_n "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
+if test "${gl_cv_prog_as_underscore+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat > conftest.c <<EOF
+#ifdef __cplusplus
+extern "C" int foo (void);
 #endif
+int foo(void) { return 0; }
+EOF
+     # Look for the assembly language name in the .s file.
+     { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } >/dev/null 2>&1
+     if grep _foo conftest.s >/dev/null ; then
+       gl_cv_prog_as_underscore=yes
+     else
+       gl_cv_prog_as_underscore=no
+     fi
+     rm -f conftest*
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Need own alloca" >/dev/null 2>&1; then :
-  ALLOCA_H=alloca.h
-else
-  ALLOCA_H=
 fi
-rm -f conftest*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+$as_echo "$gl_cv_prog_as_underscore" >&6; }
+  if test $gl_cv_prog_as_underscore = yes; then
+    USER_LABEL_PREFIX=_
+  else
+    USER_LABEL_PREFIX=
+  fi
+
+cat >>confdefs.h <<_ACEOF
+#define USER_LABEL_PREFIX $USER_LABEL_PREFIX
+_ACEOF
 
+  ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
 
-   if test -n "$ALLOCA_H"; then
-  GL_GENERATE_ALLOCA_H_TRUE=
-  GL_GENERATE_ALLOCA_H_FALSE='#'
-else
-  GL_GENERATE_ALLOCA_H_TRUE='#'
-  GL_GENERATE_ALLOCA_H_FALSE=
-fi
 
 
 
 
 
-  if test "$CXX_CHOICE" = no; then
-    CXX=no
-  fi
-  if test -z "$CXX"; then
-    if test -n "$CCC"; then
-      CXX="$CCC"
-    else
-      if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if test "${ac_cv_c_restrict+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+typedef int * int_ptr;
+	int foo (int_ptr $ac_kw ip) {
+	return ip[0];
+       }
+int
+main ()
+{
+int s[1];
+	int * $ac_kw t = s;
+	t[0] = 0;
+	return foo(t)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_restrict=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
+   done
 
 fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
 
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) $as_echo "#define restrict /**/" >>confdefs.h
+ ;;
+   *)  cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-  test -n "$ac_ct_CXX" && break
-done
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
 
-    fi
-  fi
-  if test "$CXX" != no; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-$as_echo_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... " >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
+  :
 
-    echo 'int main () { return 0; }' > conftest.$ac_ext
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      gl_cv_prog_ansicxx_works=yes
-      if (./conftest; exit) 2>/dev/null; then
-        gl_cv_prog_ansicxx_cross=no
-      else
-        gl_cv_prog_ansicxx_cross=yes
-      fi
-    else
-      gl_cv_prog_ansicxx_works=no
-    fi
-    rm -fr conftest*
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_works" >&5
-$as_echo "$gl_cv_prog_ansicxx_works" >&6; }
-    if test $gl_cv_prog_ansicxx_works = no; then
-      CXX=no
-    else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports namespaces" >&5
-$as_echo_n "checking whether the C++ compiler supports namespaces... " >&6; }
-      ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-      cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-        gl_cv_prog_ansicxx_namespaces=yes
-      else
-        gl_cv_prog_ansicxx_namespaces=no
-      fi
-      rm -fr conftest*
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_namespaces" >&5
-$as_echo "$gl_cv_prog_ansicxx_namespaces" >&6; }
-      if test $gl_cv_prog_ansicxx_namespaces = no; then
-        CXX=no
-      fi
-    fi
-  fi
 
 
 
-   if test "$CXX" != no; then
-  ANSICXX_TRUE=
-  ANSICXX_FALSE='#'
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_string_h='<'string.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+$as_echo_n "checking absolute name of <string.h>... " >&6; }
+if test "${gl_cv_next_string_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ANSICXX_TRUE='#'
-  ANSICXX_FALSE=
-fi
 
+          if test $ac_cv_header_string_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
 
-  if test "$CXX" != no; then
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/string.h#{
+                 s#.*"\(.*/string.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_string_h='<'string.h'>'
+          fi
 
-depcc="$CXX"  am_compiler_list=
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+$as_echo "$gl_cv_next_string_h" >&6; }
+     fi
+     NEXT_STRING_H=$gl_cv_next_string_h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'string.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_string_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STRING_H=$gl_next_as_first_directive
 
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
 
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
+
+    for gl_func in memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup      strncat strndup strnlen strpbrk strsep strcasestr strtok_r strsignal      strverscmp; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
 
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
+                     eval ac_cv_have_decl_$gl_func=yes
 fi
+      done
 
 
-  else
-     if false; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
+
+      ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strnlen" = x""yes; then :
+  ac_have_decl=1
 else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
+  ac_have_decl=0
 fi
 
-  fi
-
-
-  for ac_func in atexit
-do :
-  ac_fn_c_check_func "$LINENO" "atexit" "ac_cv_func_atexit"
-if test "x$ac_cv_func_atexit" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ATEXIT 1
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRNLEN $ac_have_decl
 _ACEOF
 
-fi
-done
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if test "${ac_cv_header_stat_broken+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/stat.h>
 
-  if test $ac_cv_func_atexit = no; then
+#if defined S_ISBLK && defined S_IFDIR
+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
+#endif
 
+#if defined S_ISBLK && defined S_IFCHR
+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
+#endif
 
+#if defined S_ISLNK && defined S_IFREG
+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
+#endif
 
+#if defined S_ISSOCK && defined S_IFREG
+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
+#endif
 
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stat_broken=no
+else
+  ac_cv_header_stat_broken=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
+if test $ac_cv_header_stat_broken = yes; then
 
+$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
 
+fi
 
 
-  gl_LIBOBJS="$gl_LIBOBJS atexit.$ac_objext"
 
 
-  :
 
-  fi
 
 
+  GNULIB_MKTIME=0;
+  GNULIB_NANOSLEEP=0;
+  GNULIB_STRPTIME=0;
+  GNULIB_TIMEGM=0;
+  GNULIB_TIME_R=0;
+    HAVE_LOCALTIME_R=1;
+  HAVE_NANOSLEEP=1;
+  HAVE_STRPTIME=1;
+  HAVE_TIMEGM=1;
+        REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;
+  REPLACE_MKTIME=GNULIB_PORTCHECK;
+  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
+  REPLACE_TIMEGM=GNULIB_PORTCHECK;
 
-  if test $ac_cv_func_canonicalize_file_name = no; then
-    HAVE_CANONICALIZE_FILE_NAME=0
-    if test $ac_cv_func_realpath = no; then
-      HAVE_REALPATH=0
-    else
-      case "$gl_cv_func_realpath_works" in
-	*yes) ;;
-	*)    REPLACE_REALPATH=1 ;;
-      esac
-    fi
-  else
-    case "$gl_cv_func_realpath_works" in
-      *yes)
-        ;;
-      *)
-        REPLACE_CANONICALIZE_FILE_NAME=1
-        REPLACE_REALPATH=1
-        ;;
-    esac
-  fi
 
-  if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
 
 
 
@@ -25909,28 +21468,111 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
 
-  fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_CANONICALIZE_LGPL 1
-_ACEOF
+  :
 
 
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+$as_echo_n "checking for struct timespec in <time.h>... " >&6; }
+if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
 
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_time_h=yes
+else
+  gl_cv_sys_struct_timespec_in_time_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_sys_struct_timespec_in_time_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
 
-          GNULIB_CANONICALIZE_FILE_NAME=1
+  TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
+  if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    TIME_H_DEFINES_STRUCT_TIMESPEC=1
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+$as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
+if test "${gl_cv_sys_struct_timespec_in_sys_time_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/time.h>
 
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_sys_time_h=yes
+else
+  gl_cv_sys_struct_timespec_in_sys_time_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_sys_struct_timespec_in_sys_time_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
+      SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+$as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
+if test "${gl_cv_sys_struct_timespec_in_pthread_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
 
+int
+main ()
+{
+static struct timespec x; x.tv_sec = x.tv_nsec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_sys_struct_timespec_in_pthread_h=yes
+else
+  gl_cv_sys_struct_timespec_in_pthread_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_sys_struct_timespec_in_pthread_h" >&5
+$as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+      if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
+        PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
+      fi
+    fi
+  fi
 
 
 
-$as_echo "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -25939,183 +21581,311 @@
 
 
 
-          GNULIB_REALPATH=1
+  :
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_time_h='<'time.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+$as_echo_n "checking absolute name of <time.h>... " >&6; }
+if test "${gl_cv_next_time_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+          if test $ac_cv_header_time_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/time.h#{
+                 s#.*"\(.*/time.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_time_h='<'time.h'>'
+          fi
 
-          if test "x$datarootdir" = x; then
-    datarootdir='${datadir}'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+$as_echo "$gl_cv_next_time_h" >&6; }
+     fi
+     NEXT_TIME_H=$gl_cv_next_time_h
 
-  fi
-    if test "x$docdir" = x; then
-    docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'time.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_time_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_TIME_H=$gl_next_as_first_directive
 
-  fi
-    if test "x$htmldir" = x; then
-    htmldir='${docdir}'
 
-  fi
-  if test "x$dvidir" = x; then
-    dvidir='${docdir}'
 
-  fi
-  if test "x$pdfdir" = x; then
-    pdfdir='${docdir}'
 
-  fi
-  if test "x$psdir" = x; then
-    psdir='${docdir}'
 
-  fi
-  if test "x$lispdir" = x; then
-    lispdir='${datarootdir}/emacs/site-lisp'
 
-  fi
-  if test "x$localedir" = x; then
-    localedir='${datarootdir}/locale'
 
-  fi
-    if test "x$runstatedir" = x; then
-    runstatedir='${localstatedir}/run'
 
-  fi
 
-      pkglibexecdir='${libexecdir}/${PACKAGE}'
 
 
+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
 
-  ac_config_files="$ac_config_files csharpcomp.sh:../build-aux/csharpcomp.sh.in"
 
+  if test "$HAVE_LIBUNISTRING" = yes; then
+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+  fi
 
 
-  { $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 :
-  $as_echo_n "(cached) " >&6
-else
-   if test x"$cross_compiling" = xyes ; then
-        # When cross-compiling, there is no way to tell whether // is special
-        # short of a list of hosts.  However, the only known hosts to date
-        # that have a distinct // are Apollo DomainOS (too old to port to),
-        # Cygwin, and z/OS.  If anyone knows of another system for which // has
-        # special semantics and is distinct from /, please report it to
-        # <bug-gnulib@gnu.org>.
-        case $host in
-          *-cygwin | i370-ibm-openedition)
-            gl_cv_double_slash_root=yes ;;
-          *)
-            # Be optimistic and assume that / and // are the same when we
-            # don't know.
-            gl_cv_double_slash_root='unknown, assuming no' ;;
-        esac
-      else
-        set x `ls -di / // 2>/dev/null`
-        if test "$2" = "$4" && wc //dev/null >/dev/null 2>&1; then
-          gl_cv_double_slash_root=no
-        else
-          gl_cv_double_slash_root=yes
-        fi
-      fi
+      ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_clearerr_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-$as_echo "$gl_cv_double_slash_root" >&6; }
-  if test "$gl_cv_double_slash_root" = yes; then
 
-$as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl
+_ACEOF
+
 
-  fi
 
+      ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_feof_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl
+_ACEOF
 
 
 
+      ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ferror_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl
+_ACEOF
 
-          GNULIB_ENVIRON=1
 
 
+      ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fflush_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl
+_ACEOF
 
 
-$as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
+      ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fgets_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl
+_ACEOF
 
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
-$as_echo_n "checking for error_at_line... " >&6; }
-if ${ac_cv_lib_error_at_line+:} false; then :
-  $as_echo_n "(cached) " >&6
+      ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fputc_unlocked" = x""yes; then :
+  ac_have_decl=1
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <error.h>
-int
-main ()
-{
-error_at_line (0, 0, "", 0, "an error occurred");
-  ;
-  return 0;
-}
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_error_at_line=yes
+
+
+
+      ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fputs_unlocked" = x""yes; then :
+  ac_have_decl=1
 else
-  ac_cv_lib_error_at_line=no
+  ac_have_decl=0
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl
+_ACEOF
+
+
+
+      ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fread_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-$as_echo "$ac_cv_lib_error_at_line" >&6; }
 
-  if test $ac_cv_lib_error_at_line = no; then
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl
+_ACEOF
 
 
 
+      ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fwrite_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl
+_ACEOF
 
 
 
+      ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getchar_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-  gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext"
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl
+_ACEOF
 
 
 
-  :
+      ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_putc_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-  fi
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl
+_ACEOF
 
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
 
+      ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_putchar_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl
+_ACEOF
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
 
 
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
+if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_wchar_h_correct_inline=yes
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+       #define wcstod renamed_wcstod
+#include <wchar.h>
+extern int zero (void);
+int main () { return zero(); }
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_FWRITEERROR 1
 _ACEOF
+     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+       mv conftest.$ac_objext conftest1.$ac_objext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+         #define wcstod renamed_wcstod
+#include <wchar.h>
+int zero (void) { return 0; }
 
+_ACEOF
+       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+         mv conftest.$ac_objext conftest2.$ac_objext
+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
+           :
+         else
+           gl_cv_header_wchar_h_correct_inline=no
+         fi
+       fi
+     fi
+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
+  if test $gl_cv_header_wchar_h_correct_inline = no; then
+    as_fn_error "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+  - Add the flag -fgnu89-inline to CC and reconfigure, or
+  - Fix your include files, using parts of
+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+  - Use a gcc version older than 4.3, or
+  - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted." "$LINENO" 5
+  fi
 
 
 
 
-  if test $REPLACE_GETOPT = 1; then
 
 
 
@@ -26124,7 +21894,6 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
 
 
 
@@ -26134,279 +21903,235 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
 
+   if false; then
+  GL_COND_LIBTOOL_TRUE=
+  GL_COND_LIBTOOL_FALSE='#'
+else
+  GL_COND_LIBTOOL_TRUE='#'
+  GL_COND_LIBTOOL_FALSE=
+fi
 
+  gl_cond_libtool=false
+  gl_libdeps=
+  gl_ltlibdeps=
+  gl_m4_base='gnulib-m4'
 
 
-        GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
 
 
 
-$as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
 
 
 
 
+  gl_source_base='gnulib-lib'
+  # Code from module alloca-opt:
 
 
 
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
 
-  if test $REPLACE_GETOPT = 1; then
 
-  GETOPT_H=getopt.h
+  if test $ac_cv_func_alloca_works = no; then
 
-$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
+  :
 
 
-  fi
 
-  if test $REPLACE_GETOPT = 1; then
 
 
 
 
 
+  :
 
+  fi
 
+  # Define an additional variable used in the Makefile substitution.
 
-  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if defined __GNUC__ || defined _MSC_VER || !HAVE_ALLOCA_H
+  Need own alloca
+#endif
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Need own alloca" >/dev/null 2>&1; then :
+  ALLOCA_H=alloca.h
+else
+  ALLOCA_H=
+fi
+rm -f conftest*
 
 
 
+  # Code from module areadlink:
+  # Code from module arg-nonnull:
+  # Code from module atexit:
 
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
 
 
 
 
-        GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
+  for ac_func in atexit
+do :
+  ac_fn_c_check_func "$LINENO" "atexit" "ac_cv_func_atexit"
+if test "x$ac_cv_func_atexit" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ATEXIT 1
+_ACEOF
 
+else
 
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
+fi
+done
 
 
+  if test $ac_cv_func_atexit = no; then
 
+  :
 
+  fi
 
+  # Code from module basename:
+  # Code from module c++defs:
+  # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module canonicalize-lgpl:
 
-  gl_gettimeofday_timezone=void
-  if test $ac_cv_func_gettimeofday != yes; then
-    HAVE_GETTIMEOFDAY=0
-  else
 
+  if test $ac_cv_func_canonicalize_file_name = no; then
+    HAVE_CANONICALIZE_FILE_NAME=0
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
-$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
-if ${gl_cv_func_gettimeofday_clobber+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # When cross-compiling:
-      case "$host_os" in
-                # Guess all is fine on glibc systems.
-        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                # If we don't know, assume the worst.
-        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-      esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-          #include <sys/time.h>
-          #include <time.h>
-          #include <stdlib.h>
 
-int
-main ()
-{
 
-          time_t t = 0;
-          struct tm *lt;
-          struct tm saved_lt;
-          struct timeval tv;
-          lt = localtime (&t);
-          saved_lt = *lt;
-          gettimeofday (&tv, NULL);
-          return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_gettimeofday_clobber=no
-else
-  gl_cv_func_gettimeofday_clobber=yes
-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_gettimeofday_clobber" >&5
-$as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
 
- case "$gl_cv_func_gettimeofday_clobber" in
-   *yes)
-     REPLACE_GETTIMEOFDAY=1
+  gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
 
-  REPLACE_GMTIME=1
-  REPLACE_LOCALTIME=1
+    if test $ac_cv_func_realpath = no; then
+      HAVE_REALPATH=0
+    elif test "$gl_cv_func_realpath_works" != yes; then
+      REPLACE_REALPATH=1
+    fi
+  elif test "$gl_cv_func_realpath_works" != yes; then
 
 
-$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
 
-     ;;
- esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
-$as_echo_n "checking for gettimeofday with POSIX signature... " >&6; }
-if ${gl_cv_func_gettimeofday_posix_signature+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/time.h>
-              struct timeval c;
-              int gettimeofday (struct timeval *restrict, void *restrict);
 
-int
-main ()
-{
-/* glibc uses struct timezone * rather than the POSIX void *
-                 if _GNU_SOURCE is defined.  However, since the only portable
-                 use of gettimeofday uses NULL as the second parameter, and
-                 since the glibc definition is actually more typesafe, it is
-                 not worth wrapping this to get a compliant signature.  */
-              int (*f) (struct timeval *restrict, void *restrict)
-                = gettimeofday;
-              int x = f (&c, 0);
-              return !(x | c.tv_sec | c.tv_usec);
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_gettimeofday_posix_signature=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/time.h>
-int gettimeofday (struct timeval *restrict, struct timezone *restrict);
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_gettimeofday_posix_signature=almost
-else
-  gl_cv_func_gettimeofday_posix_signature=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5
-$as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; }
-    if test $gl_cv_func_gettimeofday_posix_signature = almost; then
-      gl_gettimeofday_timezone='struct timezone'
-    elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
-        if test $REPLACE_STRUCT_TIMEVAL = 1; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
+  gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
 
+    REPLACE_REALPATH=1
+    REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 
-cat >>confdefs.h <<_ACEOF
-#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone
-_ACEOF
 
 
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_CANONICALIZE_LGPL 1
+_ACEOF
 
 
 
 
 
+  GNULIB_CANONICALIZE_FILE_NAME=1
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
+$as_echo "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
-  for ac_header in sys/timeb.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_timeb_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_TIMEB_H 1
-_ACEOF
 
-fi
 
-done
 
-  for ac_func in _ftime
-do :
-  ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
-if test "x$ac_cv_func__ftime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__FTIME 1
-_ACEOF
 
-fi
-done
+  GNULIB_REALPATH=1
 
 
-  fi
 
+$as_echo "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
 
+  # Code from module closeout:
+  # Code from module configmake:
+  # Code from module csharpcomp-script:
 
-          GNULIB_GETTIMEOFDAY=1
+  ac_config_files="$ac_config_files csharpcomp.sh:../build-aux/csharpcomp.sh.in"
 
+  # Code from module double-slash-root:
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+$as_echo_n "checking whether // is distinct from /... " >&6; }
+if test "${gl_cv_double_slash_root+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+   if test x"$cross_compiling" = xyes ; then
+        # When cross-compiling, there is no way to tell whether // is special
+        # short of a list of hosts.  However, the only known hosts to date
+        # that have a distinct // are Apollo DomainOS (too old to port to),
+        # Cygwin, and z/OS.  If anyone knows of another system for which // has
+        # special semantics and is distinct from /, please report it to
+        # <bug-gnulib@gnu.org>.
+        case $host in
+          *-cygwin | i370-ibm-openedition)
+            gl_cv_double_slash_root=yes ;;
+          *)
+            # Be optimistic and assume that / and // are the same when we
+            # don't know.
+            gl_cv_double_slash_root='unknown, assuming no' ;;
+        esac
+      else
+        set x `ls -di / // 2>/dev/null`
+        if test "$2" = "$4" && wc //dev/null >/dev/null 2>&1; then
+          gl_cv_double_slash_root=no
+        else
+          gl_cv_double_slash_root=yes
+        fi
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+$as_echo "$gl_cv_double_slash_root" >&6; }
+  if test "$gl_cv_double_slash_root" = yes; then
 
+$as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
-$as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
+  fi
 
+  # Code from module environ:
 
 
 
 
+  GNULIB_ENVIRON=1
 
 
 
+$as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
-          GNULIB_ICONV=1
 
 
+  # Code from module errno:
 
+  # Code from module error:
 
 
 
@@ -26420,167 +22145,96 @@
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_iconv_h='<'iconv.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <iconv.h>" >&5
-$as_echo_n "checking absolute name of <iconv.h>... " >&6; }
-if ${gl_cv_next_iconv_h+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+$as_echo_n "checking for error_at_line... " >&6; }
+if test "${ac_cv_lib_error_at_line+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-
-             if test $ac_cv_header_iconv_h = yes; then
-
-
-
-
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <iconv.h>
+#include <error.h>
+int
+main ()
+{
+error_at_line (0, 0, "", 0, "an error occurred");
+  ;
+  return 0;
+}
 _ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_error_at_line=yes
+else
+  ac_cv_lib_error_at_line=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+$as_echo "$ac_cv_lib_error_at_line" >&6; }
+if test $ac_cv_lib_error_at_line = no; then
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'iconv.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_iconv_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_iconv_h
-           gl_cv_next_iconv_h='"'$gl_header'"'
-          else
-               gl_cv_next_iconv_h='<'iconv.h'>'
-             fi
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
-$as_echo "$gl_cv_next_iconv_h" >&6; }
-     fi
-     NEXT_ICONV_H=$gl_cv_next_iconv_h
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'iconv.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_iconv_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive
 
 
+  gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext"
 
+fi
 
 
 
 
+  :
 
 
-  if test "$am_cv_func_iconv" = yes; then
 
 
-  ICONV_H='iconv.h'
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
 
 
-            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-      #include <iconv.h>
-      #if defined _LIBICONV_VERSION || (defined __GLIBC__ && !defined __UCLIBC__)
-       gnu_iconv
-      #endif
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "gnu_iconv" >/dev/null 2>&1; then :
-  gl_func_iconv_gnu=yes
-else
-  gl_func_iconv_gnu=no
-fi
-rm -f conftest*
+  # Code from module extensions:
+  # Code from module fwriteerror:
 
-    if test $gl_func_iconv_gnu = no; then
-      iconv_flavor=
-      case "$host_os" in
-        aix*)     iconv_flavor=ICONV_FLAVOR_AIX ;;
-        irix*)    iconv_flavor=ICONV_FLAVOR_IRIX ;;
-        hpux*)    iconv_flavor=ICONV_FLAVOR_HPUX ;;
-        osf*)     iconv_flavor=ICONV_FLAVOR_OSF ;;
-        solaris*) iconv_flavor=ICONV_FLAVOR_SOLARIS ;;
-      esac
-      if test -n "$iconv_flavor"; then
 
 cat >>confdefs.h <<_ACEOF
-#define ICONV_FLAVOR $iconv_flavor
+#define GNULIB_FWRITEERROR 1
 _ACEOF
 
 
+  # Code from module getopt-gnu:
 
 
-  ICONV_H='iconv.h'
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
-
-  REPLACE_ICONV_OPEN=1
-
-      fi
-    fi
 
-  fi
 
-  if test $REPLACE_ICONV_OPEN = 1; then
 
 
 
+$as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
 
 
+  # Code from module getopt-posix:
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS iconv_open.$ac_objext"
 
-  fi
-  if test $REPLACE_ICONV = 1; then
 
+  if test -n "$gl_replace_getopt"; then :
 
 
 
+  GETOPT_H=getopt.h
 
+$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS iconv.$ac_objext"
+    GNULIB_UNISTD_H_GETOPT=1
 
 
 
@@ -26589,503 +22243,296 @@
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
 
-  gl_LIBOBJS="$gl_LIBOBJS iconv_close.$ac_objext"
 
-  fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5
-$as_echo_n "checking whether the compiler generally respects inline... " >&6; }
-if ${gl_cv_c_inline_effective+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test $ac_cv_c_inline = no; then
-       gl_cv_c_inline_effective=no
-     else
-                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
-#ifdef __NO_INLINE__
-               #error "inline is not effective"
-             #endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_c_inline_effective=yes
-else
-  gl_cv_c_inline_effective=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5
-$as_echo "$gl_cv_c_inline_effective" >&6; }
-  if test $gl_cv_c_inline_effective = yes; then
 
-$as_echo "#define HAVE_INLINE 1" >>confdefs.h
 
-  fi
 
+  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
 
 
 
+  :
 
 
-  ac_fn_c_check_decl "$LINENO" "iswblank" "ac_cv_have_decl_iswblank" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
 
-"
-if test "x$ac_cv_have_decl_iswblank" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISWBLANK $ac_have_decl
-_ACEOF
 
-  if test $ac_cv_func_iswblank = no; then
-    HAVE_ISWBLANK=0
-    if test $ac_cv_have_decl_iswblank = yes; then
-      REPLACE_ISWBLANK=1
-    fi
-  fi
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-            :
-    fi
-  fi
 
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
 
+fi
 
 
+  # Code from module gettext-h:
 
 
+  # Code from module gettext-runtime-misc:
+  # Code from module gperf:
+  # Code from module havelib:
+  # Code from module iconv:
 
+  # Code from module iconv-h:
 
 
-  gl_LIBOBJS="$gl_LIBOBJS iswblank.$ac_objext"
 
-    fi
-  fi
 
 
 
 
+  :
 
-          GNULIB_ISWBLANK=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_ISWBLANK 1" >>confdefs.h
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_iconv_h='<'iconv.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <iconv.h>" >&5
+$as_echo_n "checking absolute name of <iconv.h>... " >&6; }
+if test "${gl_cv_next_iconv_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+          if test $ac_cv_header_iconv_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <iconv.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_iconv_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/iconv.h#{
+                 s#.*"\(.*/iconv.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_iconv_h='<'iconv.h'>'
+          fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Java" >&5
-$as_echo_n "checking whether to use Java... " >&6; }
-  # Check whether --enable-java was given.
-if test "${enable_java+set}" = set; then :
-  enableval=$enable_java; JAVA_CHOICE="$enableval"
-else
-  JAVA_CHOICE=yes
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
+$as_echo "$gl_cv_next_iconv_h" >&6; }
+     fi
+     NEXT_ICONV_H=$gl_cv_next_iconv_h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_CHOICE" >&5
-$as_echo "$JAVA_CHOICE" >&6; }
-  if test "$JAVA_CHOICE" = yes; then
-    # Check whether --enable-native-java was given.
-if test "${enable_native_java+set}" = set; then :
-  enableval=$enable_native_java; test "$enableval" != no || JAVA_CHOICE=bytecode
-fi
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'iconv.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_iconv_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive
 
-  fi
 
 
-  # You need to invoke gt_JAVACOMP yourself, possibly with arguments.
-  ac_config_files="$ac_config_files javacomp.sh:../build-aux/javacomp.sh.in"
 
+  # Code from module iconv_open:
 
 
 
 
+  if test "$am_cv_func_iconv" = yes; then
 
 
+  ICONV_H='iconv.h'
 
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+      #include <iconv.h>
+      #if defined _LIBICONV_VERSION || defined __GLIBC__
+       gnu_iconv
+      #endif
 
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "gnu_iconv" >/dev/null 2>&1; then :
+  gl_func_iconv_gnu=yes
+else
+  gl_func_iconv_gnu=no
+fi
+rm -f conftest*
 
+    if test $gl_func_iconv_gnu = no; then
+      iconv_flavor=
+      case "$host_os" in
+        aix*)     iconv_flavor=ICONV_FLAVOR_AIX ;;
+        irix*)    iconv_flavor=ICONV_FLAVOR_IRIX ;;
+        hpux*)    iconv_flavor=ICONV_FLAVOR_HPUX ;;
+        osf*)     iconv_flavor=ICONV_FLAVOR_OSF ;;
+        solaris*) iconv_flavor=ICONV_FLAVOR_SOLARIS ;;
+      esac
+      if test -n "$iconv_flavor"; then
 
+cat >>confdefs.h <<_ACEOF
+#define ICONV_FLAVOR $iconv_flavor
+_ACEOF
 
 
 
 
+  ICONV_H='iconv.h'
 
+  REPLACE_ICONV_OPEN=1
 
 
-  case "$host_os" in
-    solaris*)
 
-$as_echo "#define _LCONV_C99 1" >>confdefs.h
 
-      ;;
-  esac
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
-$as_echo_n "checking whether locale.h conforms to POSIX:2001... " >&6; }
-if ${gl_cv_header_locale_h_posix2001+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-            int x = LC_MESSAGES;
-            int y = sizeof (((struct lconv *) 0)->decimal_point);
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_header_locale_h_posix2001=yes
-else
-  gl_cv_header_locale_h_posix2001=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_locale_h_posix2001" >&5
-$as_echo "$gl_cv_header_locale_h_posix2001" >&6; }
 
 
-  if test $ac_cv_header_xlocale_h = yes; then
-    HAVE_XLOCALE_H=1
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
-$as_echo_n "checking whether locale.h defines locale_t... " >&6; }
-if ${gl_cv_header_locale_has_locale_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-              locale_t x;
-int
-main ()
-{
+  gl_LIBOBJS="$gl_LIBOBJS iconv_open.$ac_objext"
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_header_locale_has_locale_t=yes
-else
-  gl_cv_header_locale_has_locale_t=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_locale_has_locale_t" >&5
-$as_echo "$gl_cv_header_locale_has_locale_t" >&6; }
-    if test $gl_cv_header_locale_has_locale_t = yes; then
-      gl_cv_header_locale_h_needs_xlocale_h=no
-    else
-      gl_cv_header_locale_h_needs_xlocale_h=yes
+      fi
     fi
-  else
-    HAVE_XLOCALE_H=0
-    gl_cv_header_locale_h_needs_xlocale_h=no
   fi
 
+  # Code from module include_next:
+  # Code from module intprops:
+  # Code from module java:
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5
-$as_echo_n "checking whether struct lconv is properly defined... " >&6; }
-if ${gl_cv_sys_struct_lconv_ok+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-            struct lconv l;
-            int x = sizeof (l.decimal_point);
-            int y = sizeof (l.int_p_cs_precedes);
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_lconv_ok=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Java" >&5
+$as_echo_n "checking whether to use Java... " >&6; }
+  # Check whether --enable-java was given.
+if test "${enable_java+set}" = set; then :
+  enableval=$enable_java; JAVA_CHOICE="$enableval"
 else
-  gl_cv_sys_struct_lconv_ok=no
+  JAVA_CHOICE=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_CHOICE" >&5
+$as_echo "$JAVA_CHOICE" >&6; }
+  if test "$JAVA_CHOICE" = yes; then
+    # Check whether --enable-native-java was given.
+if test "${enable_native_java+set}" = set; then :
+  enableval=$enable_native_java; test "$enableval" != no || JAVA_CHOICE=bytecode
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5
-$as_echo "$gl_cv_sys_struct_lconv_ok" >&6; }
-  if test $gl_cv_sys_struct_lconv_ok = no; then
-    REPLACE_STRUCT_LCONV=1
-  fi
-
-
-
 
+  fi
 
 
+  # Code from module javacomp-script:
+  # You need to invoke gt_JAVACOMP yourself, possibly with arguments.
+  ac_config_files="$ac_config_files javacomp.sh:../build-aux/javacomp.sh.in"
 
+  # Code from module localcharset:
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_locale_h='<'locale.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
-$as_echo_n "checking absolute name of <locale.h>... " >&6; }
-if ${gl_cv_next_locale_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
 
+  :
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'locale.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_locale_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_locale_h
-           gl_cv_next_locale_h='"'$gl_header'"'
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5
-$as_echo "$gl_cv_next_locale_h" >&6; }
-     fi
-     NEXT_LOCALE_H=$gl_cv_next_locale_h
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'locale.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_locale_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_LOCALE_H=$gl_next_as_first_directive
 
 
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
 
+  # Code from module lstat:
 
 
 
-    for gl_func in setlocale duplocale; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-/* Some systems provide declarations in a non-standard header.  */
-#if HAVE_XLOCALE_H
-# include <xlocale.h>
-#endif
+  :
 
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
 
 
 
+  if test $ac_cv_func_lstat = yes; then
 
+    if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+            REPLACE_LSTAT=1
+    fi
+    # Prerequisites of lib/lstat.c.
 
-  for ac_func in setlocale uselocale
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  else
+    HAVE_LSTAT=0
+  fi
 
-fi
-done
 
 
 
+  GNULIB_LSTAT=1
 
-  if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
-    ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
-"
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
 
-$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
-fi
+$as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
-    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-      #include <pthread.h>
-int
-main ()
-{
 
-#if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif
+  # Code from module malloc-posix:
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
 
-$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
-  :
+$as_echo "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
+  else
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_LOCK 1
-_ACEOF
 
 
 
 
 
-  if test $ac_cv_func_lstat = yes; then
 
-    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-      *no)
-        REPLACE_LSTAT=1
-        ;;
-    esac
-  else
-    HAVE_LSTAT=0
+  gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext"
+
+    HAVE_MALLOC_POSIX=0
   fi
 
-  if test $REPLACE_LSTAT = 1; then
 
 
 
 
+  GNULIB_MALLOC_POSIX=1
 
 
 
+$as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
-  gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
 
-    :
-  fi
+
+  # Code from module malloca:
 
 
 
 
+  # Code from module mbchar:
 
-          GNULIB_LSTAT=1
 
 
 
+  # Code from module mbiter:
 
 
-$as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
 
+  :
 
+  # Code from module mbrtowc:
 
 
 
@@ -27102,6 +22549,7 @@
 
 
 
+  :
 
 
 
@@ -27113,15 +22561,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -27132,13 +22580,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -27176,7 +22617,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -27196,13 +22637,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -27250,35 +22684,22 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
+  fi
 
-  if test $ac_cv_func_mbrtowc = no; then
-    HAVE_MBRTOWC=0
-    ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbrtowc" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRTOWC $ac_have_decl
-_ACEOF
+  :
 
-    if test $ac_cv_have_decl_mbrtowc = yes; then
-                        REPLACE_MBRTOWC=1
-    fi
+
+
+
+
+  if test $ac_cv_func_mbrtowc = no; then
+    HAVE_MBRTOWC=0
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBRTOWC=1
@@ -27286,17 +22707,17 @@
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
-$as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg1+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
+$as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
+if test "${gl_cv_func_mbrtowc_null_arg+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                  # Guess no on Solaris.
-        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
-                  # Guess yes otherwise.
-        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
+              # Guess no on OSF/1.
+        osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
       esac
       if test $LOCALE_FR_UTF8 != none; then
         if test "$cross_compiling" = yes; then :
@@ -27306,49 +22727,106 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
-#include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
-      char input[] = "\303\237er";
       mbstate_t state;
       wchar_t wc;
-      size_t ret;
+      int ret;
 
       memset (&state, '\0', sizeof (mbstate_t));
       wc = (wchar_t) 0xBADFACE;
-      ret = mbrtowc (&wc, input, 5, &state);
-      if (ret != 2)
-        result |= 1;
-      if (!mbsinit (&state))
-        result |= 2;
+      mbrtowc (&wc, NULL, 5, &state);
+      /* Check that wc was not modified.  */
+      if (wc != (wchar_t) 0xBADFACE)
+        return 1;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_null_arg=yes
+else
+  gl_cv_func_mbrtowc_null_arg=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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg" >&5
+$as_echo "$gl_cv_func_mbrtowc_null_arg" >&6; }
+
+
+
+
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
+$as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
+if test "${gl_cv_func_mbrtowc_retval+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbrtowc_retval="guessing yes" ;;
+      esac
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.h>
+#include <wchar.h>
+int main ()
+{
+  /* This fails on Solaris.  */
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      char input[] = "B\303\274\303\237er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 1)
+            return 1;
+        }
+    }
+  /* This fails on HP-UX 11.11.  */
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
 
       memset (&state, '\0', sizeof (mbstate_t));
-      ret = mbrtowc (NULL, input, 5, &state);
-      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
-        result |= 4;
-      if (!mbsinit (&state))
-        result |= 8;
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 2)
+            return 1;
+        }
     }
-  return result;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_null_arg1=yes
+  gl_cv_func_mbrtowc_retval=yes
 else
-  gl_cv_func_mbrtowc_null_arg1=no
+  gl_cv_func_mbrtowc_retval=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27357,93 +22835,160 @@
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
-$as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5
+$as_echo "$gl_cv_func_mbrtowc_retval" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
-$as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
+$as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
+if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-              # Guess no on OSF/1.
-        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
-              # Guess yes otherwise.
-        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+                       # Guess no on Solaris 8 and 9.
+        solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
+                       # Guess yes otherwise.
+        *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
       esac
-      if test $LOCALE_FR_UTF8 != none; then
+      if test $LOCALE_ZH_CN != none; then
         if test "$cross_compiling" = yes; then :
   :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      mbstate_t state;
-      wchar_t wc;
-      int ret;
+#include <locale.h>
+#include <string.h>
+#include <wchar.h>
+int main ()
+{
+  /* This fails on Solaris 8 and 9.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, "", 1, &state) != 0)
+        return 1;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_nul_retval=yes
+else
+  gl_cv_func_mbrtowc_nul_retval=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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
+$as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
+
+      case "$gl_cv_func_mbrtowc_null_arg" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_NULL_ARG_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_retval" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtowc_nul_retval" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+    fi
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+
+    :
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+  GNULIB_MBRTOWC=1
+
+
+
+$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
+
+
+
+  # Code from module mbsinit:
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
 
-      memset (&state, '\0', sizeof (mbstate_t));
-      wc = (wchar_t) 0xBADFACE;
-      mbrtowc (&wc, NULL, 5, &state);
-      /* Check that wc was not modified.  */
-      if (wc != (wchar_t) 0xBADFACE)
-        return 1;
-    }
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_null_arg2=yes
-else
-  gl_cv_func_mbrtowc_null_arg2=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
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
-$as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
 
 
 
+  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
-$as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
-if ${gl_cv_func_mbrtowc_retval+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
+      if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
   :
 else
@@ -27452,106 +22997,27 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-  int found_some_locale = 0;
-  /* This fails on Solaris.  */
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      char input[] = "B\303\274\303\237er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        {
-          input[1] = '\0';
-          if (mbrtowc (&wc, input + 2, 5, &state) != 1)
-            result |= 1;
-        }
-      found_some_locale = 1;
-    }
-  /* This fails on HP-UX 11.11.  */
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
     {
-      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
       mbstate_t state;
       wchar_t wc;
 
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        {
-          input[1] = '\0';
-          if (mbrtowc (&wc, input + 2, 5, &state) != 2)
-            result |= 2;
-        }
-      found_some_locale = 1;
-    }
-  /* This fails on native Windows.  */
-  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
-    {
-      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 4;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
-    {
-      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 8;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
-    {
-      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 16;
-        }
-      found_some_locale = 1;
+        if (mbsinit (&state))
+          return 1;
     }
-  return (found_some_locale ? result : 77);
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_retval=yes
+  gl_cv_func_mbrtowc_incomplete_state=yes
 else
-  if test $? != 77; then
-             gl_cv_func_mbrtowc_retval=no
-           fi
-
+  gl_cv_func_mbrtowc_incomplete_state=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27560,23 +23026,23 @@
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5
-$as_echo "$gl_cv_func_mbrtowc_retval" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
-$as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
-if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                       # Guess no on Solaris 8 and 9.
-        solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
-                       # Guess yes otherwise.
-        *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
+                    # Guess no on Solaris 8.
+        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
+                    # Guess yes otherwise.
+        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
       esac
       if test $LOCALE_ZH_CN != none; then
         if test "$cross_compiling" = yes; then :
@@ -27586,34 +23052,32 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
+#include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  /* This fails on Solaris 8 and 9.  */
+  /* This fails on Solaris 8:
+     mbrtowc returns 2, and sets wc to 0x00F0.
+     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
   if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
     {
+      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
       mbstate_t state;
       wchar_t wc;
 
       memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, "", 1, &state) != 0)
+      if (mbrtowc (&wc, input + 3, 6, &state) != 4
+          && mbtowc (&wc, input + 3, 6) == 4)
         return 1;
     }
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_nul_retval=yes
+  gl_cv_func_mbrtowc_sanitycheck=yes
 else
-  gl_cv_func_mbrtowc_nul_retval=no
+  gl_cv_func_mbrtowc_sanitycheck=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27622,706 +23086,967 @@
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
-$as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+
+    REPLACE_MBSTATE_T=0
+    case "$gl_cv_func_mbrtowc_incomplete_state" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+    case "$gl_cv_func_mbrtowc_sanitycheck" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+  else
+    REPLACE_MBSTATE_T=1
+  fi
+  if test $REPLACE_MBSTATE_T = 1; then
+
+    :
+
+  fi
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_mbsinit = no; then
+    HAVE_MBSINIT=0
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSINIT=1
+    fi
+  fi
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+
+    :
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbsinit.$ac_objext"
+
+
+  :
+
+  fi
+
+
+
+
+  GNULIB_MBSINIT=1
+
+
+
+$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+
+
+
+  # Code from module mbslen:
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_mbslen = yes; then
+    HAVE_MBSLEN=1
+  else
+    HAVE_MBSLEN=0
+  fi
+
+
+
+
+  GNULIB_MBSLEN=1
+
+
+
+$as_echo "#define GNULIB_TEST_MBSLEN 1" >>confdefs.h
+
+
+
+  # Code from module mbsstr:
+
+
+
+  GNULIB_MBSSTR=1
+
+
+
+$as_echo "#define GNULIB_TEST_MBSSTR 1" >>confdefs.h
+
+
+
+  # Code from module mbuiter:
+
+
+
+
+  :
+
+  # Code from module memchr:
+
+
+
+
+  GNULIB_MEMCHR=1
+
+
+
+$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
+
+
+
+  # Code from module memmove:
+
+
+
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
-$as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
-if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-                  case "$host_os" in
-                     # Guess no on AIX and glibc systems.
-        aix* | *-gnu*)
-                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
-        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-      esac
-      if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-           #include <wchar.h>
-           static wchar_t wc;
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-           }
+
+  for ac_func in memmove
+do :
+  ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
+if test "x$ac_cv_func_memmove" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MEMMOVE 1
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_empty_input=no
+
 else
-  gl_cv_func_mbrtowc_empty_input=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
 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; }
+done
 
-      case "$gl_cv_func_mbrtowc_null_arg1" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
 
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_null_arg2" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
+  if test $ac_cv_func_memmove = no; then
 
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_retval" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
+  :
 
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_nul_retval" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
+  fi
 
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_empty_input" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
+  # Code from module multiarch:
 
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-    fi
-  fi
+  # Code from module pathmax:
 
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
 
+  :
 
 
 
 
 
 
+  :
 
-  gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext"
 
 
-  :
 
-  fi
 
 
+  # Code from module progname:
+  ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
+"
+if test "x$ac_cv_have_decl_program_invocation_name" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl
+_ACEOF
 
+  ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
+"
+if test "x$ac_cv_have_decl_program_invocation_short_name" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-          GNULIB_MBRTOWC=1
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl
+_ACEOF
 
+  # Code from module propername:
 
 
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'"
 
 
-$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'"
 
+  # Code from module readlink:
 
 
 
+  :
 
 
 
 
 
+  if test $ac_cv_func_readlink = no; then
+    HAVE_READLINK=0
 
 
 
 
-  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
-$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-                  case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
-      esac
-      if test $LOCALE_JA != none; then
-        if test "$cross_compiling" = yes; then :
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
+
   :
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+$as_echo_n "checking whether readlink signature is correct... " >&6; }
+if test "${gl_cv_decl_readlink_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
+#include <unistd.h>
+      /* Cause compilation failure if original declaration has wrong type.  */
+      ssize_t readlink (const char *, char *, size_t);
+int
+main ()
 {
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
 
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        if (mbsinit (&state))
-          return 1;
-    }
+  ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_incomplete_state=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_decl_readlink_works=yes
 else
-  gl_cv_func_mbrtowc_incomplete_state=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  gl_cv_decl_readlink_works=no
 fi
-
-      fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
-$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
-
-
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
-$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+$as_echo "$gl_cv_decl_readlink_works" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+$as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
+if test "${gl_cv_func_readlink_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-
-                  case "$host_os" in
-                    # Guess no on Solaris 8.
-        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
-                    # Guess yes otherwise.
-        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
-      esac
-      if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
-  :
+  # We have readlink, so assume ln -s works.
+       ln -s conftest.no-such conftest.link
+       ln -s conftest.link conftest.lnk2
+       if test "$cross_compiling" = yes; then :
+  gl_cv_func_readlink_works="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <unistd.h>
 
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
+int
+main ()
 {
-  /* This fails on Solaris 8:
-     mbrtowc returns 2, and sets wc to 0x00F0.
-     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
-    {
-      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 6, &state) != 4
-          && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
-    }
+char buf[20];
+      return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;
+  ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_sanitycheck=yes
+  gl_cv_func_readlink_works=yes
 else
-  gl_cv_func_mbrtowc_sanitycheck=no
+  gl_cv_func_readlink_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
+      rm -f conftest.link conftest.lnk2
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_works" >&5
+$as_echo "$gl_cv_func_readlink_works" >&6; }
+    if test "$gl_cv_func_readlink_works" != yes; then
+
+$as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+
+      REPLACE_READLINK=1
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
+    elif test "$gl_cv_decl_readlink_works" != yes; then
+      REPLACE_READLINK=1
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
+    fi
+  fi
+
+
+
+
+  GNULIB_READLINK=1
+
+
+
+$as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h
+
+
+
+  # Code from module relocatable-prog:
+
+
+
+
+  if test $RELOCATABLE = yes; then
+
+
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
-$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
-    REPLACE_MBSTATE_T=0
-    case "$gl_cv_func_mbrtowc_incomplete_state" in
-      *yes) ;;
-      *) REPLACE_MBSTATE_T=1 ;;
-    esac
-    case "$gl_cv_func_mbrtowc_sanitycheck" in
-      *yes) ;;
-      *) REPLACE_MBSTATE_T=1 ;;
-    esac
-  else
-    REPLACE_MBSTATE_T=1
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS relocatable.$ac_objext"
+
   fi
 
+  if test $RELOCATABLE = yes; then
 
 
-  if test $ac_cv_func_mbsinit = no; then
-    HAVE_MBSINIT=0
-    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT $ac_have_decl
-_ACEOF
 
-    if test $ac_cv_have_decl_mbsinit = yes; then
-                        REPLACE_MBSINIT=1
-    fi
-  else
-    if test $REPLACE_MBSTATE_T = 1; then
-      REPLACE_MBSINIT=1
-    else
-                        case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
-      esac
-    fi
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext"
+
   fi
+  : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
+  RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
+  RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
 
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+  # Code from module relocatable-prog-wrapper:
 
 
+  :
 
 
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS mbsinit.$ac_objext"
+  :
+
+
+
 
 
   :
 
-  fi
 
 
 
 
 
-          GNULIB_MBSINIT=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
+  :
 
 
 
-  if test $ac_cv_func_mbslen = yes; then
-    HAVE_MBSLEN=1
-  else
-    HAVE_MBSLEN=0
-  fi
 
 
 
 
 
 
-          GNULIB_MBSLEN=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_MBSLEN 1" >>confdefs.h
 
 
+  :
 
 
 
 
 
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv validates arguments" >&5
+$as_echo_n "checking whether setenv validates arguments... " >&6; }
+if test "${gl_cv_func_setenv_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  gl_cv_func_setenv_works="guessing no"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-          GNULIB_MBSSTR=1
+       #include <stdlib.h>
+       #include <errno.h>
+       #include <string.h>
 
+int
+main ()
+{
 
+       if (setenv ("", "", 0) != -1) return 1;
+       if (errno != EINVAL) return 2;
+       if (setenv ("a", "=", 1) != 0) return 3;
+       if (strcmp (getenv ("a"), "=") != 0) return 4;
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_setenv_works=yes
+else
+  gl_cv_func_setenv_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_setenv_works" >&5
+$as_echo "$gl_cv_func_setenv_works" >&6; }
+    if test "$gl_cv_func_setenv_works" != yes; then
+      REPLACE_SETENV=1
 
-$as_echo "#define GNULIB_TEST_MBSSTR 1" >>confdefs.h
 
 
 
 
 
-  :
 
 
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+  gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext"
 
+    fi
+  fi
 
 
 
 
+  :
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext"
 
 
-  for ac_header in bp-sym.h
+  for ac_header in search.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
-if test "x$ac_cv_header_bp_sym_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
+if test "x$ac_cv_header_search_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_BP_SYM_H 1
+#define HAVE_SEARCH_H 1
 _ACEOF
 
 fi
 
 done
 
+  for ac_func in tsearch
+do :
+  ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
+if test "x$ac_cv_func_tsearch" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TSEARCH 1
+_ACEOF
 
-  fi
+fi
+done
+
+
+
+
+
+
+  if test -z "$ERRNO_H"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+$as_echo_n "checking for working strerror function... " >&6; }
+if test "${gl_cv_func_working_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
 
+int
+main ()
+{
+return !*strerror (-2);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func_working_strerror=yes
+else
+  gl_cv_func_working_strerror=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
 
+int
+main ()
+{
+return !*strerror (-2);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_working_strerror=yes
+else
+  gl_cv_func_working_strerror=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
 
-          GNULIB_MEMCHR=1
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+$as_echo "$gl_cv_func_working_strerror" >&6; }
+    if test $gl_cv_func_working_strerror = no; then
+                  REPLACE_STRERROR=1
+    fi
+  else
+            REPLACE_STRERROR=1
+  fi
+  if test $REPLACE_STRERROR = 1; then
 
+  ac_fn_c_check_decl "$LINENO" "strerror" "ac_cv_have_decl_strerror" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strerror" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR $ac_have_decl
+_ACEOF
 
 
+  :
 
-$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
 
 
 
 
-  for ac_func in memmove
+  if test $ac_cv_header_sys_socket_h != yes; then
+                    for ac_header in winsock2.h
 do :
-  ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_MEMMOVE 1
+#define HAVE_WINSOCK2_H 1
 _ACEOF
 
 fi
+
 done
 
+  fi
 
-  if test $ac_cv_func_memmove = no; then
+  fi
 
+  # Code from module signal:
 
 
 
 
 
 
+  :
 
-  gl_LIBOBJS="$gl_LIBOBJS memmove.$ac_objext"
 
 
-  :
 
-  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
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_signal_h='<'signal.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+$as_echo_n "checking absolute name of <signal.h>... " >&6; }
+if test "${gl_cv_next_signal_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_signal_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
 
-  else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-  fi
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/signal.h#{
+                 s#.*"\(.*/signal.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_signal_h='<'signal.h'>'
+          fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+$as_echo "$gl_cv_next_signal_h" >&6; }
+     fi
+     NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'signal.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_signal_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive
 
 
 
+# AIX declares sig_atomic_t to already include volatile, and C89 compilers
+# then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
+  ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" "
+#include <signal.h>
 
+"
+if test "x$ac_cv_type_volatile_sig_atomic_t" = x""yes; then :
 
+else
+  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
+fi
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS msvc-inval.$ac_objext"
 
-  fi
+    for gl_func in sigaction sigaddset sigdelset sigemptyset sigfillset sigismember     sigpending sigprocmask; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
 
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
 
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+      done
 
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
+  # Code from module sigpipe:
 
 
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_SIGPIPE 1
+_ACEOF
 
 
-  gl_LIBOBJS="$gl_LIBOBJS msvc-nothrow.$ac_objext"
 
-  fi
+  GNULIB_SIGNAL_H_SIGPIPE=1
 
+  GNULIB_STDIO_H_SIGPIPE=1
 
+  GNULIB_UNISTD_H_SIGPIPE=1
+  # Code from module sigprocmask:
 
 
-  ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-"
-if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+  signals_not_posix=
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl
 _ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sigset_t" >/dev/null 2>&1; then :
 
-  ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-"
-if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then :
-  ac_have_decl=1
 else
-  ac_have_decl=0
+  signals_not_posix=1
 fi
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl
-_ACEOF
-
-
-
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'"
+  if test -z "$signals_not_posix"; then
+    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+if test "x$ac_cv_func_sigprocmask" = x""yes; then :
+  gl_cv_func_sigprocmask=1
+fi
 
+  fi
+  if test -z "$gl_cv_func_sigprocmask"; then
+    HAVE_POSIX_SIGNALBLOCKING=0
 
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'"
 
 
 
 
 
-  for ac_func in raise
-do :
-  ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
-if test "x$ac_cv_func_raise" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RAISE 1
-_ACEOF
 
-fi
-done
+  gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext"
 
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
-  else
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_RAISE=1
-    fi
 
 
+  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>
+"
+if test "x$ac_cv_type_sigset_t" = x""yes; then :
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGSET_T 1
+_ACEOF
 
-  if test $gl_cv_type_sigset_t = yes; then
-    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  gl_cv_func_sigprocmask=1
+gl_cv_type_sigset_t=yes
+else
+  gl_cv_type_sigset_t=no
 fi
 
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
   fi
-  if test -z "$gl_cv_func_sigprocmask"; then
-    HAVE_POSIX_SIGNALBLOCKING=0
-  fi
-
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-
-
-
-
-          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-            REPLACE_RAISE=1
-          fi
 
-      fi
 
   fi
 
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
-
-
 
 
 
+  GNULIB_SIGPROCMASK=1
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS raise.$ac_objext"
-
-    :
-  fi
+$as_echo "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
 
+  # Code from module ssize_t:
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+$as_echo_n "checking for ssize_t... " >&6; }
+if test "${gt_cv_ssize_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+int
+main ()
+{
+int x = sizeof (ssize_t *) + sizeof (ssize_t);
+        return !x;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_ssize_t=yes
+else
+  gt_cv_ssize_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+$as_echo "$gt_cv_ssize_t" >&6; }
+  if test $gt_cv_ssize_t = no; then
 
-          GNULIB_RAISE=1
+$as_echo "#define ssize_t int" >>confdefs.h
 
+  fi
 
+  # Code from module stat:
 
 
 
-$as_echo "#define GNULIB_TEST_RAISE 1" >>confdefs.h
 
+  :
 
 
 
 
 
-  if test $ac_cv_func_readlink = no; then
-    HAVE_READLINK=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
-$as_echo_n "checking whether readlink signature is correct... " >&6; }
-if ${gl_cv_decl_readlink_works+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
+$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
+if test "${gl_cv_func_stat_dir_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then :
+  case $host_os in
+            mingw*) gl_cv_func_stat_dir_slash="guessing no";;
+            *) gl_cv_func_stat_dir_slash="guessing yes";;
+          esac
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <unistd.h>
-      /* Cause compilation failure if original declaration has wrong type.  */
-      ssize_t readlink (const char *, char *, size_t);
+#include <sys/stat.h>
+
 int
 main ()
 {
-
+struct stat st; return stat (".", &st) != stat ("./", &st);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_decl_readlink_works=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_stat_dir_slash=yes
 else
-  gl_cv_decl_readlink_works=no
+  gl_cv_func_stat_dir_slash=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-$as_echo "$gl_cv_decl_readlink_works" >&6; }
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
-$as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
-if ${gl_cv_func_readlink_works+:} false; then :
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_dir_slash" >&5
+$as_echo "$gl_cv_func_stat_dir_slash" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
+if test "${gl_cv_func_stat_file_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  # We have readlink, so assume ln -s works.
-       ln -s conftest.no-such conftest.link
-       ln -s conftest.link conftest.lnk2
+  touch conftest.tmp
+       # Assume that if we have lstat, we can also check symlinks.
+       if test $ac_cv_func_lstat = yes; then
+         ln -s conftest.tmp conftest.lnk
+       fi
        if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_readlink_works="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_readlink_works="guessing no" ;;
-          esac
-
+  gl_cv_func_stat_file_slash="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <unistd.h>
+#include <sys/stat.h>
 
 int
 main ()
 {
-char buf[20];
-      return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;
+struct stat st;
+      if (!stat ("conftest.tmp/", &st)) return 1;
+#if HAVE_LSTAT
+      if (!stat ("conftest.lnk/", &st)) return 2;
+#endif
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_readlink_works=yes
+  gl_cv_func_stat_file_slash=yes
 else
-  gl_cv_func_readlink_works=no
+  gl_cv_func_stat_file_slash=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-      rm -f conftest.link conftest.lnk2
+       rm -f conftest.tmp conftest.lnk
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_works" >&5
-$as_echo "$gl_cv_func_readlink_works" >&6; }
-    case "$gl_cv_func_readlink_works" in
-      *yes)
-        if test "$gl_cv_decl_readlink_works" != yes; then
-          REPLACE_READLINK=1
-        fi
-        ;;
-      *)
-
-$as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
-
-        REPLACE_READLINK=1
-        ;;
-    esac
-  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+$as_echo "$gl_cv_func_stat_file_slash" >&6; }
+  case $gl_cv_func_stat_dir_slash in
+    *no) REPLACE_STAT=1
 
-  if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
+$as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h
+;;
+  esac
+  case $gl_cv_func_stat_file_slash in
+    *no) REPLACE_STAT=1
 
+$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+;;
+  esac
+  if test $REPLACE_STAT = 1; then
 
 
 
@@ -28329,160 +24054,181 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
 
+  gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext"
 
-  :
 
   fi
 
 
 
 
-
-          GNULIB_READLINK=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h
-
-
-
-
-
-
-
-
-  : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
-  RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
-  RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
-
-  if test $RELOCATABLE = yes; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext"
+  GNULIB_STAT=1
 
 
 
+$as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
 
+  # Code from module stdbool:
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS relocatable.$ac_objext"
+  # Define two additional variables used in the Makefile substitution.
 
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
   fi
 
 
-
-  :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
 
 
+  # Code from module stddef:
 
 
 
-  if test $ac_cv_have_decl_setenv = no; then
-    HAVE_DECL_SETENV=0
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    STDDEF_H=stddef.h
   fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
+if test "${gl_cv_decl_null_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
 
+int
+main ()
+{
 
-
-
-
-  for ac_header in search.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
-if test "x$ac_cv_header_search_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SEARCH_H 1
+  ;
+  return 0;
+}
 _ACEOF
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_decl_null_works=yes
+else
+  gl_cv_decl_null_works=no
 fi
-
-done
-
-  for ac_func in tsearch
-do :
-  ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
-if test "x$ac_cv_func_tsearch" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TSEARCH 1
-_ACEOF
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+$as_echo "$gl_cv_decl_null_works" >&6; }
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    STDDEF_H=stddef.h
+  fi
+  if test -n "$STDDEF_H"; then
 
 
 
 
+  :
 
 
-  case "$host_os" in
-            mingw*) REPLACE_SETLOCALE=1 ;;
-            cygwin*)
-      case `uname -r` in
-        1.5.*) REPLACE_SETLOCALE=1 ;;
-      esac
-      ;;
-  esac
 
-  if test $REPLACE_SETLOCALE = 1; then
 
 
 
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stddef_h='<'stddef.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
+if test "${gl_cv_next_stddef_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+          if test $ac_cv_header_stddef_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stddef.h#{
+                 s#.*"\(.*/stddef.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stddef_h='<'stddef.h'>'
+          fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+$as_echo "$gl_cv_next_stddef_h" >&6; }
+     fi
+     NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
-  gl_LIBOBJS="$gl_LIBOBJS setlocale.$ac_objext"
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stddef.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stddef_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
 
 
-  :
 
   fi
 
+  # Code from module stdint:
 
 
 
-
-          GNULIB_SETLOCALE=1
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
 
 
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
+  fi
 
 
+      if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
 
-$as_echo "#define GNULIB_TEST_SETLOCALE 1" >>confdefs.h
 
+      if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
 
 
 
 
 
 
+  :
 
 
 
@@ -28491,408 +24237,628 @@
 
 
      if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_signal_h='<'signal.h'>'
+       gl_cv_next_stdint_h='<'stdint.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
-$as_echo_n "checking absolute name of <signal.h>... " >&6; }
-if ${gl_cv_next_signal_h+:} false; then :
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if test "${gl_cv_next_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdint_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <signal.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'signal.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_signal_h
-           gl_cv_next_signal_h='"'$gl_header'"'
+#include <stdint.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdint.h#{
+                 s#.*"\(.*/stdint.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdint_h='<'stdint.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-$as_echo "$gl_cv_next_signal_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
      fi
-     NEXT_SIGNAL_H=$gl_cv_next_signal_h
+     NEXT_STDINT_H=$gl_cv_next_stdint_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'signal.h'>'
+       gl_next_as_first_directive='<'stdint.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_signal_h
+       gl_next_as_first_directive=$gl_cv_next_stdint_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive
+     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
 
 
 
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
 
 
-# AIX declares sig_atomic_t to already include volatile, and C89 compilers
-# then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
-  ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" "
-#include <signal.h>
+    if test $ac_cv_header_stdint_h = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if test "${gl_cv_header_working_stdint_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_working_stdint_h=no
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-"
-if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes; then :
 
-else
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
-fi
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+
+
+  /* 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
+
+
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
 
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
 
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
 
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+                                                    if test "$cross_compiling" = yes; then :
+                 gl_cv_header_working_stdint_h=yes
 
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" "
-#include <signal.h>
 
-"
-if test "x$ac_cv_type_sighandler_t" = xyes; then :
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
 
-else
-  HAVE_SIGHANDLER_T=0
-fi
 
+  /* 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
 
 
-    for gl_func in pthread_sigmask sigaction     sigaddset sigdelset sigemptyset sigfillset sigismember     sigpending sigprocmask; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
 
 int
 main ()
 {
-#undef $gl_func
-  (void) $gl_func;
+
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return 1;
+    }
+  return 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_header_working_stdint_h=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
+  fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
+            for ac_header in sys/inttypes.h sys/bitypes.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
 fi
-      done
-
-
-
-
 
+done
 
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_SIGPIPE 1
-_ACEOF
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
 
 
 
-  GNULIB_SIGNAL_H_SIGPIPE=1
+  :
 
 
-  GNULIB_STDIO_H_SIGPIPE=1
 
-  GNULIB_UNISTD_H_SIGPIPE=1
 
 
 
-  if test $gl_cv_type_sigset_t = yes; then
-    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  gl_cv_func_sigprocmask=1
-fi
 
-  fi
-  if test -z "$gl_cv_func_sigprocmask"; then
-    HAVE_POSIX_SIGNALBLOCKING=0
-  fi
 
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* 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
 
+#include <limits.h>"; then :
 
+else
+  result=unknown
+fi
 
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
-  gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext"
 
-    :
   fi
 
 
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* 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
 
+#include <limits.h>"; then :
 
+else
+  result=unknown
+fi
 
-          GNULIB_SIGPROCMASK=1
-
-
-
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
-$as_echo "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
-$as_echo_n "checking for ssize_t... " >&6; }
-if ${gt_cv_ssize_t+:} false; then :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+$as_echo_n "checking whether $gltype is signed... " >&6; }
+if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/types.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
+
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
 int
 main ()
 {
-int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gt_cv_ssize_t=yes
+  result=yes
 else
-  gt_cv_ssize_t=no
+  result=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-$as_echo "$gt_cv_ssize_t" >&6; }
-  if test $gt_cv_ssize_t = no; then
-
-$as_echo "#define ssize_t int" >>confdefs.h
-
-  fi
+       eval gl_cv_type_${gltype}_signed=\$result
 
+fi
+eval ac_res=\$gl_cv_type_${gltype}_signed
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
-$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
-if ${gl_cv_func_stat_dir_slash+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case $host_os in
-            mingw*) gl_cv_func_stat_dir_slash="guessing no";;
-            *) gl_cv_func_stat_dir_slash="guessing yes";;
-          esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
-int
-main ()
-{
-struct stat st; return stat (".", &st) != stat ("./", &st);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_stat_dir_slash=yes
-else
-  gl_cv_func_stat_dir_slash=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_stat_dir_slash" >&5
-$as_echo "$gl_cv_func_stat_dir_slash" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
-$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
-if ${gl_cv_func_stat_file_slash+:} false; then :
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  touch conftest.tmp
-       # Assume that if we have lstat, we can also check symlinks.
-       if test $ac_cv_func_lstat = yes; then
-         ln -s conftest.tmp conftest.lnk
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
        fi
-       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_stat_file_slash="guessing no" ;;
-          esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/stat.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
+
+              extern $gltype foo;
+              extern $gltype1 foo;
 int
 main ()
 {
-int result = 0;
-      struct stat st;
-      if (!stat ("conftest.tmp/", &st))
-        result |= 1;
-#if HAVE_LSTAT
-      if (!stat ("conftest.lnk/", &st))
-        result |= 2;
-#endif
-      return result;
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_stat_file_slash=yes
-else
-  gl_cv_func_stat_file_slash=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
 fi
-
-       rm -f conftest.tmp conftest.lnk
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-$as_echo "$gl_cv_func_stat_file_slash" >&6; }
-  case $gl_cv_func_stat_dir_slash in
-    *no) REPLACE_STAT=1
-
-$as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h
-;;
-  esac
-  case $gl_cv_func_stat_file_slash in
-    *no) REPLACE_STAT=1
-
-$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
-;;
-  esac
-
-  if test $REPLACE_STAT = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext"
-
-    :
-  fi
-
-
-
-
-
-          GNULIB_STAT=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h
-
-
-
-
-
-
-  # Define two additional variables used in the Makefile substitution.
-
-  if test "$ac_cv_header_stdbool_h" = yes; then
-    STDBOOL_H=''
-  else
-    STDBOOL_H='stdbool.h'
-  fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
-   if test -n "$STDBOOL_H"; then
-  GL_GENERATE_STDBOOL_H_TRUE=
-  GL_GENERATE_STDBOOL_H_FALSE='#'
-else
-  GL_GENERATE_STDBOOL_H_TRUE='#'
-  GL_GENERATE_STDBOOL_H_FALSE=
-fi
+  done
 
 
-  if test "$ac_cv_type__Bool" = yes; then
-    HAVE__BOOL=1
-  else
-    HAVE__BOOL=0
   fi
 
 
-
-
-
-  STDDEF_H=
-  if test $gt_cv_c_wchar_t = no; then
-    HAVE_WCHAR_T=0
-    STDDEF_H=stddef.h
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
-$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stddef.h>
-      int test[2 * (sizeof NULL == sizeof (void *)) -1];
 
+  /* 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
+
+              extern $gltype foo;
+              extern $gltype1 foo;
 int
 main ()
 {
@@ -28902,105 +24868,42 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_decl_null_works=yes
-else
-  gl_cv_decl_null_works=no
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-$as_echo "$gl_cv_decl_null_works" >&6; }
-  if test $gl_cv_decl_null_works = no; then
-    REPLACE_NULL=1
-    STDDEF_H=stddef.h
-  fi
-
-   if test -n "$STDDEF_H"; then
-  GL_GENERATE_STDDEF_H_TRUE=
-  GL_GENERATE_STDDEF_H_FALSE='#'
-else
-  GL_GENERATE_STDDEF_H_TRUE='#'
-  GL_GENERATE_STDDEF_H_FALSE=
-fi
-
-  if test -n "$STDDEF_H"; then
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stddef_h='<'stddef.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
-$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stddef.h>
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
 _ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stddef.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+  done
 
-           gl_header=$gl_cv_absolute_stddef_h
-           gl_cv_next_stddef_h='"'$gl_header'"'
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-$as_echo "$gl_cv_next_stddef_h" >&6; }
-     fi
-     NEXT_STDDEF_H=$gl_cv_next_stddef_h
+    STDINT_H=stdint.h
+  fi
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stddef.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stddef_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
 
+  # Code from module stdio:
 
 
 
-  fi
 
 
 
 
 
+  :
 
 
 
@@ -29013,45 +24916,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 $as_echo_n "checking absolute name of <stdio.h>... " >&6; }
-if ${gl_cv_next_stdio_h+:} false; then :
+if test "${gl_cv_next_stdio_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdio_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdio.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdio_h
-           gl_cv_next_stdio_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdio.h#{
+                 s#.*"\(.*/stdio.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdio_h='<'stdio.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
@@ -29070,31 +24958,6 @@
 
 
 
-
-
-      GNULIB_FSCANF=1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_FSCANF 1
-_ACEOF
-
-
-  GNULIB_SCANF=1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_SCANF 1
-_ACEOF
-
-
-  GNULIB_FGETC=1
-  GNULIB_GETC=1
-  GNULIB_GETCHAR=1
-  GNULIB_FGETS=1
-  GNULIB_FREAD=1
-
-
       GNULIB_FPRINTF=1
   GNULIB_PRINTF=1
   GNULIB_VFPRINTF=1
@@ -29125,12 +24988,11 @@
 
 
 
-
-    for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen     renameat snprintf tmpfile vdprintf vsnprintf; do
+    for gl_func in dprintf fpurge fseeko ftello getdelim getline popen renameat     snprintf tmpfile vdprintf vsnprintf; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29156,7 +25018,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -29166,10 +25029,15 @@
       done
 
 
+  # Code from module stdlib:
+
+
 
 
 
 
+  :
+
 
 
 
@@ -29181,45 +25049,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 $as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if ${gl_cv_next_stdlib_h+:} false; then :
+if test "${gl_cv_next_stdlib_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdlib_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdlib.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdlib_h
-           gl_cv_next_stdlib_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdlib.h#{
+                 s#.*"\(.*/stdlib.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdlib_h='<'stdlib.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
@@ -29238,14 +25091,49 @@
 
 
 
+  for ac_header in random.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "random.h" "ac_cv_header_random_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_random_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RANDOM_H 1
+_ACEOF
+
+fi
+
+done
+
+  if test $ac_cv_header_random_h = yes; then
+    HAVE_RANDOM_H=1
+  else
+    HAVE_RANDOM_H=0
+  fi
+
+  ac_fn_c_check_type "$LINENO" "struct random_data" "ac_cv_type_struct_random_data" "#include <stdlib.h>
+      #if HAVE_RANDOM_H
+      # include <random.h>
+      #endif
+
+"
+if test "x$ac_cv_type_struct_random_data" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RANDOM_DATA 1
+_ACEOF
+
+
+else
+  HAVE_STRUCT_RANDOM_DATA=0
+fi
 
 
 
-    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
+    for gl_func in atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp     mkostemp mkostemps mkstemp mkstemps ptsname random_r initstat_r srandom_r     setstate_r realpath rpmatch setenv strtod strtoll strtoull unlockpt     unsetenv; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29277,7 +25165,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -29287,145 +25176,56 @@
       done
 
 
+  # Code from module streq:
+  # Code from module strerror:
 
 
+  if test $REPLACE_STRERROR = 1; then
 
 
 
-  if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
-$as_echo_n "checking for working strerror function... " >&6; }
-if ${gl_cv_func_working_strerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_working_strerror="guessing no" ;;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-int
-main ()
-{
-if (!*strerror (-2)) return 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_working_strerror=yes
-else
-  gl_cv_func_working_strerror=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_working_strerror" >&5
-$as_echo "$gl_cv_func_working_strerror" >&6; }
-    case "$gl_cv_func_working_strerror" in
-      *yes) ;;
-      *)
-                        REPLACE_STRERROR=1
-        ;;
-    esac
-
-  else
-            REPLACE_STRERROR=1
-  fi
-
-  if test $REPLACE_STRERROR = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext"
-
-  fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_STRERROR 1
-_ACEOF
-
-
-
-
-
-
-
-          GNULIB_STRERROR=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
-
-
-
-
-
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
 
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext"
 
 
+cat >>confdefs.h <<_ACEOF
+#define REPLACE_STRERROR $REPLACE_STRERROR
+_ACEOF
 
-  gl_LIBOBJS="$gl_LIBOBJS strerror-override.$ac_objext"
+  fi
 
 
 
 
+  GNULIB_STRERROR=1
 
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
 
-fi
 
-done
+$as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
 
 
-  fi
+  # Code from module striconv:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module string:
+
+
+
+  # Code from module strnlen:
+
+
 
 
 
 
+  :
 
 
 
@@ -29434,18 +25234,13 @@
   if test $ac_cv_have_decl_strnlen = no; then
     HAVE_DECL_STRNLEN=0
   else
-
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
 $as_echo_n "checking for working strnlen... " >&6; }
-if ${ac_cv_func_strnlen_working+:} false; then :
+if test "${ac_cv_func_strnlen_working+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  # Guess no on AIX systems, yes otherwise.
-		case "$host_os" in
-		  aix*) ac_cv_func_strnlen_working=no;;
-		  *)    ac_cv_func_strnlen_working=yes;;
-		esac
+  ac_cv_func_strnlen_working=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -29485,14 +25280,21 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
 $as_echo "$ac_cv_func_strnlen_working" >&6; }
-test $ac_cv_func_strnlen_working = no && :
+test $ac_cv_func_strnlen_working = no &&
+
 
 
-    if test $ac_cv_func_strnlen_working = no; then
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext"
+
+
+        if test $ac_cv_func_strnlen_working = no; then
       REPLACE_STRNLEN=1
     fi
   fi
-
   if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
 
 
@@ -29510,32 +25312,43 @@
 
 
 
+  GNULIB_STRNLEN=1
 
-          GNULIB_STRNLEN=1
 
 
+$as_echo "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
+  # Code from module strnlen1:
+  # Code from module strtol:
 
 
 
 
-  for ac_func in strtoul
+
+
+
+
+
+  for ac_func in strtol
 do :
-  ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
-if test "x$ac_cv_func_strtoul" = xyes; then :
+  ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
+if test "x$ac_cv_func_strtol" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STRTOUL 1
+#define HAVE_STRTOL 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
 
-  if test $ac_cv_func_strtoul = no; then
 
+  # Code from module strtoul:
 
 
 
@@ -29543,9 +25356,29 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strtoul.$ac_objext"
 
-  fi
+
+  for ac_func in strtoul
+do :
+  ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
+if test "x$ac_cv_func_strtoul" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRTOUL 1
+_ACEOF
+
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+fi
+done
+
+
+
+  # Code from module sys_stat:
+
+
+
 
 
 
@@ -29554,6 +25387,8 @@
 
 
 
+  :
+
 
 
 
@@ -29565,51 +25400,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 $as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
-if ${gl_cv_next_sys_stat_h+:} false; then :
+if test "${gl_cv_next_sys_stat_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_sys_stat_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_sys_stat_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/stat.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_sys_stat_h
-           gl_cv_next_sys_stat_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/stat.h#{
+                 s#.*"\(.*/sys/stat.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sys_stat_h='<'sys/stat.h'>'
-             fi
-
+            gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
@@ -29629,23 +25443,10 @@
 
 
 
-
-
-
-
-
-
-
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-
-$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h
-
-  fi
-
       ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
      #include <sys/stat.h>
 "
-if test "x$ac_cv_type_nlink_t" = xyes; then :
+if test "x$ac_cv_type_nlink_t" = x""yes; then :
 
 else
 
@@ -29655,11 +25456,11 @@
 
 
 
-    for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
+    for gl_func in fchmodat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29685,7 +25486,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -29696,9 +25498,12 @@
 
 
 
+  # Code from module time:
 
 
 
+  # Code from module trim:
+  # Code from module unistd:
 
 
 
@@ -29707,13 +25512,7 @@
 
 
 
-
-
-
-
-
-
-
+  :
 
 
 
@@ -29726,51 +25525,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
-if ${gl_cv_next_unistd_h+:} false; then :
+if test "${gl_cv_next_unistd_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_unistd_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_unistd_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'unistd.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_unistd_h
-           gl_cv_next_unistd_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/unistd.h#{
+                 s#.*"\(.*/unistd.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_unistd_h='<'unistd.h'>'
-             fi
-
+            gl_cv_next_unistd_h='<'unistd.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
@@ -29790,6 +25568,13 @@
 
 
 
+
+  :
+
+
+
+
+
   if test $ac_cv_header_unistd_h = yes; then
     HAVE_UNISTD_H=1
   else
@@ -29798,25 +25583,18 @@
 
 
 
-
-
-
-
-    for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
+    for gl_func in chown dup2 dup3 environ euidaccess faccessat fchdir fchownat     fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize getusershell setusershell     endusershell lchown link linkat lseek pipe2 pread pwrite readlink     readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat     usleep; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 /* Some systems declare various items in the wrong headers.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#ifndef __GLIBC__
 # include <fcntl.h>
 # include <stdio.h>
 # include <stdlib.h>
@@ -29844,7 +25622,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -29854,6 +25633,7 @@
       done
 
 
+  # Code from module unitypes:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -29865,7 +25645,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 2
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -29875,22 +25655,16 @@
 
        }
   }; then
-    LIBUNISTRING_UNISTR_H='unistr.h'
+    LIBUNISTRING_UNITYPES_H='unitypes.h'
   else
-    LIBUNISTRING_UNISTR_H=
+    LIBUNISTRING_UNITYPES_H=
   fi
 
 
+  # Code from module uniwidth/base:
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_UNISTR_U8_MBTOUCR 1
-_ACEOF
-
-
-
-
-       if  { test "$HAVE_LIBUNISTRING" != yes \
+      if  { test "$HAVE_LIBUNISTRING" != yes \
     || {
 
 
@@ -29909,21 +25683,13 @@
 
        }
   }; then
-  LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE=
-  LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_FALSE='#'
-else
-  LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE='#'
-  LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_FALSE=
-fi
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_UNISTR_U8_UCTOMB 1
-_ACEOF
+    LIBUNISTRING_UNIWIDTH_H='uniwidth.h'
+  else
+    LIBUNISTRING_UNIWIDTH_H=
+  fi
 
 
+  # Code from module uniwidth/width:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -29945,114 +25711,122 @@
 
        }
   }; then
-  LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE=
-  LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE='#'
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE=
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE='#'
 else
-  LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE='#'
-  LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE=
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE='#'
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE=
 fi
 
 
+  # Code from module unlocked-io:
 
 
-      if  { test "$HAVE_LIBUNISTRING" != yes \
-    || {
+$as_echo "#define USE_UNLOCKED_IO 1" >>confdefs.h
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-                         }
-                    }
-               }
 
 
+  :
 
 
-       }
-  }; then
-    LIBUNISTRING_UNITYPES_H='unitypes.h'
-  else
-    LIBUNISTRING_UNITYPES_H=
-  fi
 
 
 
 
-      if  { test "$HAVE_LIBUNISTRING" != yes \
-    || {
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-                         }
-                    }
-               }
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
 
 
 
 
-       }
-  }; then
-    LIBUNISTRING_UNIWIDTH_H='uniwidth.h'
-  else
-    LIBUNISTRING_UNIWIDTH_H=
-  fi
 
+  :
 
 
 
-       if  { test "$HAVE_LIBUNISTRING" != yes \
-    || {
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
-                         }
-                    }
-               }
+  :
 
 
 
 
-       }
-  }; then
-  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE=
-  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE='#'
-else
-  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE='#'
-  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE=
-fi
 
 
+  :
 
 
-$as_echo "#define USE_UNLOCKED_IO 1" >>confdefs.h
 
 
 
 
+  :
 
 
 
 
 
 
+  # Code from module verify:
+  # Code from module warn-on-use:
+  # Code from module wchar:
 
 
 
 
+  :
 
 
 
@@ -30062,6 +25836,7 @@
 
 
 
+  :
 
 
 
@@ -30074,51 +25849,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 $as_echo_n "checking absolute name of <wchar.h>... " >&6; }
-if ${gl_cv_next_wchar_h+:} false; then :
+if test "${gl_cv_next_wchar_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_wchar_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_wchar_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wchar.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_wchar_h
-           gl_cv_next_wchar_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wchar.h#{
+                 s#.*"\(.*/wchar.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_wchar_h='<'wchar.h'>'
-             fi
-
+            gl_cv_next_wchar_h='<'wchar.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
@@ -30137,7 +25891,6 @@
 
 
 
-
   if test $ac_cv_header_wchar_h = yes; then
     HAVE_WCHAR_H=1
   else
@@ -30146,8 +25899,6 @@
 
 
 
-
-
   if test $gt_cv_c_wint_t = yes; then
     HAVE_WINT_T=1
   else
@@ -30156,21 +25907,18 @@
 
 
 
-    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth     ; do
+    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb     wcsrtombs wcsnrtombs wcwidth; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+/* Some systems require additional headers.  */
+#ifndef __GLIBC__
 # include <stddef.h>
 # include <stdio.h>
 # include <time.h>
@@ -30196,7 +25944,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -30206,109 +25955,58 @@
       done
 
 
+  # Code from module wctype:
 
 
 
 
+  :
 
-  if test $ac_cv_func_iswcntrl = yes; then
-    HAVE_ISWCNTRL=1
-  else
-    HAVE_ISWCNTRL=0
-  fi
 
 
 
-  if test $gt_cv_c_wint_t = yes; then
-    HAVE_WINT_T=1
+
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
   else
-    HAVE_WINT_T=0
+    HAVE_ISWCNTRL=0
   fi
 
 
+  :
 
 
 
 
 
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+  else
+    HAVE_ISWBLANK=0
+  fi
 
 
+  :
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_wctype_h='<'wctype.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
-$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if ${gl_cv_next_wctype_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-             if test $ac_cv_header_wctype_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <wctype.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wctype.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_wctype_h
-           gl_cv_next_wctype_h='"'$gl_header'"'
-          else
-               gl_cv_next_wctype_h='<'wctype.h'>'
-             fi
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-$as_echo "$gl_cv_next_wctype_h" >&6; }
-     fi
-     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'wctype.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_wctype_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
 
 
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
 
 
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
 $as_echo_n "checking whether iswcntrl works... " >&6; }
-if ${gl_cv_func_iswcntrl_works+:} false; then :
+if test "${gl_cv_func_iswcntrl_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30328,9 +26026,9 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_iswcntrl_works="guessing yes"
+  gl_cv_func_iswcntrl_works=yes
 else
-  gl_cv_func_iswcntrl_works="guessing no"
+  gl_cv_func_iswcntrl_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -30338,17 +26036,12 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
-
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   gl_cv_func_iswcntrl_works=yes
@@ -30364,214 +26057,96 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
 $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
     fi
-    HAVE_WCTYPE_H=1
-  else
-    HAVE_WCTYPE_H=0
-  fi
 
 
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
-
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  fi
 
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
-  else
-    for ac_func in towlower
-do :
-  ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
-if test "x$ac_cv_func_towlower" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TOWLOWER 1
-_ACEOF
 
-fi
-done
+  :
 
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
 
-"
-if test "x$ac_cv_have_decl_towlower" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER $ac_have_decl
-_ACEOF
 
-      if test $ac_cv_have_decl_towlower = yes; then
-                                REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
 
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-        :
-  fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
-$as_echo_n "checking for wctype_t... " >&6; }
-if ${gl_cv_type_wctype_t+:} false; then :
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wctype_h='<'wctype.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
+if test "${gl_cv_next_wctype_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctype_t=yes
-else
-  gl_cv_type_wctype_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
-$as_echo "$gl_cv_type_wctype_t" >&6; }
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
-  fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
-$as_echo_n "checking for wctrans_t... " >&6; }
-if ${gl_cv_type_wctrans_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_wctype_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
-
-int
-main ()
-{
+#include <wctype.h>
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctrans_t=yes
-else
-  gl_cv_type_wctrans_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wctype.h#{
+                 s#.*"\(.*/wctype.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_wctype_h='<'wctype.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
-$as_echo "$gl_cv_type_wctrans_t" >&6; }
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
-  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
+$as_echo "$gl_cv_next_wctype_h" >&6; }
+     fi
+     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'wctype.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wctype_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
+
+
+
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+
+
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
+  else
+    REPLACE_ISWCNTRL=0
+  fi
+
+
+  # Code from module wcwidth:
+
+
 
 
-    for gl_func in wctype iswctype wctrans towctrans     ; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
 
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
 
 
+  :
+
 
 
 
 
 
+  :
 
 
 
@@ -30591,7 +26166,7 @@
 #include <wchar.h>
 
 "
-if test "x$ac_cv_have_decl_wcwidth" = xyes; then :
+if test "x$ac_cv_have_decl_wcwidth" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -30606,19 +26181,18 @@
   fi
 
   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 :
+if test "${gl_cv_func_wcwidth_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
         if test "$cross_compiling" = yes; then :
 
            case "$host_os" in
-                     # Guess yes on glibc and AIX 7 systems.
-             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-             *)                  gl_cv_func_wcwidth_works="guessing no";;
+                     # Guess yes on glibc systems.
+             *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)      gl_cv_func_wcwidth_works="guessing no";;
            esac
 
 else
@@ -30645,17 +26219,10 @@
 #endif
 int main ()
 {
-  int result = 0;
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    {
-      if (wcwidth (0x0301) > 0)
-        result |= 1;
-      if (wcwidth (0x05B0) > 0)
-        result |= 2;
-      if (wcwidth (0x200B) > 0)
-        result |= 4;
-    }
-  return result;
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -30675,11 +26242,8 @@
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  else
-    HAVE_WCWIDTH=0
   fi
-
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
 
 
 
@@ -30691,14 +26255,17 @@
   gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
 
   fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
 
+    :
 
+  fi
 
 
 
-          GNULIB_WCWIDTH=1
-
 
+  GNULIB_WCWIDTH=1
 
 
 
@@ -30706,6 +26273,9 @@
 
 
 
+  # Code from module xalloc:
+  # Code from module xreadlink:
+  # Code from module xstriconv:
   # End of code from modules
 
 
@@ -30746,7 +26316,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
 else
 
@@ -30759,7 +26329,7 @@
 for ac_func in setlocale
 do :
   ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
-if test "x$ac_cv_func_setlocale" = xyes; then :
+if test "x$ac_cv_func_setlocale" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SETLOCALE 1
 _ACEOF
@@ -30770,40 +26340,12 @@
 
 
 
-if test "$enable_shared" = yes; then
-  case "$host_os" in
-    mingw* | cygwin*) is_woe32dll=yes ;;
-    *) is_woe32dll=no ;;
-  esac
-else
-  is_woe32dll=no
-fi
- if test $is_woe32dll = yes; then
-  WOE32DLL_TRUE=
-  WOE32DLL_FALSE='#'
-else
-  WOE32DLL_TRUE='#'
-  WOE32DLL_FALSE=
-fi
-
-if test $is_woe32dll = yes; then
-
-$as_echo "#define WOE32DLL 1" >>confdefs.h
-
-fi
-
-INTL_EXPORTS_FLAGS=
-if test "$USER_LABEL_PREFIX" = _; then
-  INTL_EXPORTS_FLAGS="-DUSER_LABEL_PREFIX_UNDERSCORE $INTL_EXPORTS_FLAGS"
-fi
-
-
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -30817,7 +26359,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -30845,23 +26387,13 @@
 
 
 
-
-
-  if test "$CXX_CHOICE" = no; then
-    CXX=no
-  fi
-  if test -z "$CXX"; then
-    if test -n "$CCC"; then
-      CXX="$CCC"
-    else
-      if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -30873,8 +26405,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -30890,306 +26422,96 @@
 $as_echo "$CXX" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-    fi
-  fi
-  if test "$CXX" != no; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-$as_echo_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... " >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-    echo 'int main () { return 0; }' > conftest.$ac_ext
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      gl_cv_prog_ansicxx_works=yes
-      if (./conftest; exit) 2>/dev/null; then
-        gl_cv_prog_ansicxx_cross=no
-      else
-        gl_cv_prog_ansicxx_cross=yes
-      fi
-    else
-      gl_cv_prog_ansicxx_works=no
-    fi
-    rm -fr conftest*
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_works" >&5
-$as_echo "$gl_cv_prog_ansicxx_works" >&6; }
-    if test $gl_cv_prog_ansicxx_works = no; then
-      CXX=no
-    else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports namespaces" >&5
-$as_echo_n "checking whether the C++ compiler supports namespaces... " >&6; }
-      ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-      cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-        gl_cv_prog_ansicxx_namespaces=yes
-      else
-        gl_cv_prog_ansicxx_namespaces=no
-      fi
-      rm -fr conftest*
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_namespaces" >&5
-$as_echo "$gl_cv_prog_ansicxx_namespaces" >&6; }
-      if test $gl_cv_prog_ansicxx_namespaces = no; then
-        CXX=no
-      fi
-    fi
-  fi
-
-
-
-   if test "$CXX" != no; then
-  ANSICXX_TRUE=
-  ANSICXX_FALSE='#'
-else
-  ANSICXX_TRUE='#'
-  ANSICXX_FALSE=
-fi
-
-
-  if test "$CXX" != no; then
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
+$as_echo "no" >&6; }
 fi
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
+  test -n "$CXX" && break
+done
+test -n "$CXX" || CXX=":"
+
+if test "$CXX" != ":"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+$as_echo_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... " >&6; }
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+    ac_cv_prog_cxx_works=yes
+    if (./conftest; exit) 2>/dev/null; then
+      ac_cv_prog_cxx_cross=no
+    else
+      ac_cv_prog_cxx_cross=yes
+    fi
+  else
+    ac_cv_prog_cxx_works=no
+  fi
+  rm -fr conftest*
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_works" >&5
+$as_echo "$ac_cv_prog_cxx_works" >&6; }
+  if test $ac_cv_prog_cxx_works = no; then
+    CXX=:
   else
-     if false; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports namespaces" >&5
+$as_echo_n "checking whether the C++ compiler supports namespaces... " >&6; }
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    cat <<EOF > conftest.$ac_ext
+#include <iostream>
+namespace test { using namespace std; }
+std::ostream* ptr;
+int main () { return 0; }
+EOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      gt_cv_prog_cxx_namespaces=yes
+    else
+      gt_cv_prog_cxx_namespaces=no
+    fi
+    rm -fr conftest*
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_prog_cxx_namespaces" >&5
+$as_echo "$gt_cv_prog_cxx_namespaces" >&6; }
+    if test $gt_cv_prog_cxx_namespaces = no; then
+      CXX=:
+    fi
   fi
+fi
 
 
 LIBSCHED=
 if test $gl_threads_api = posix; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
 $as_echo_n "checking for sched_yield in -lrt... " >&6; }
-if ${ac_cv_lib_rt_sched_yield+:} false; then :
+if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -31223,12 +26545,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
 $as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
-if test "x$ac_cv_lib_rt_sched_yield" = xyes; then :
+if test "x$ac_cv_lib_rt_sched_yield" = x""yes; then :
   LIBSCHED=-lrt
 else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
 $as_echo_n "checking for sched_yield in -lposix4... " >&6; }
-if ${ac_cv_lib_posix4_sched_yield+:} false; then :
+if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -31262,7 +26584,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
 $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; }
-if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then :
+if test "x$ac_cv_lib_posix4_sched_yield" = x""yes; then :
   LIBSCHED=-lposix4
 fi
 
@@ -31283,7 +26605,7 @@
   SUBDIR_libasprintf=libasprintf
 fi
 
-if test "$CXX" = "no"; then
+if test "$CXX" = ":"; then
   SUBDIR_libasprintf=
 fi
  if test -n "$SUBDIR_libasprintf"; then
@@ -31401,21 +26723,10 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -31431,7 +26742,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -31446,14 +26756,6 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -31463,87 +26765,27 @@
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
+  as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 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 "${GL_GENERATE_ICONV_H_TRUE}" && test -z "${GL_GENERATE_ICONV_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ICONV_H\" was never defined.
+  as_fn_error "conditional \"WOE32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ANSICXX_TRUE}" && test -z "${ANSICXX_FALSE}"; then
-  as_fn_error $? "conditional \"ANSICXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ERRNO_H\" 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
-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
-fi
-if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+  as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${RELOCATABLE_VIA_LD_TRUE}" && test -z "${RELOCATABLE_VIA_LD_FALSE}"; then
-  as_fn_error $? "conditional \"RELOCATABLE_VIA_LD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${RELOCATABLE_VIA_WRAPPER_TRUE}" && test -z "${RELOCATABLE_VIA_WRAPPER_FALSE}"; then
-  as_fn_error $? "conditional \"RELOCATABLE_VIA_WRAPPER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB\" was never defined.
+  as_fn_error "conditional \"RELOCATABLE_VIA_LD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -31578,28 +26820,12 @@
     gltests_LTLIBOBJS=$gltests_ltlibobjs
 
 
-if test -z "${WOE32DLL_TRUE}" && test -z "${WOE32DLL_FALSE}"; then
-  as_fn_error $? "conditional \"WOE32DLL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ANSICXX_TRUE}" && test -z "${ANSICXX_FALSE}"; then
-  as_fn_error $? "conditional \"ANSICXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_LIBASPRINTF_TRUE}" && test -z "${ENABLE_LIBASPRINTF_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_LIBASPRINTF\" was never defined.
+  as_fn_error "conditional \"ENABLE_LIBASPRINTF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -31700,7 +26926,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -31746,19 +26971,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -31896,16 +27121,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -31954,7 +27179,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -31965,16 +27190,28 @@
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -31995,8 +27232,8 @@
 # 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by gettext-runtime $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -32055,17 +27292,17 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-gnu-gettext@gnu.org>."
+Report bugs to the package provider."
 
 _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.3
-configured by $0, generated by GNU Autoconf 2.69,
+gettext-runtime config.status
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -32083,16 +27320,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -32114,7 +27346,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -32127,7 +27358,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -32136,7 +27367,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -32156,7 +27387,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -32190,200 +27421,175 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`'
-reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`'
-reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
-compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`'
-GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
-module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`'
-include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`'
-file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "X$install_override_mode" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+LD_RC='`$ECHO "X$LD_RC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_RC='`$ECHO "X$old_archive_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_RC='`$ECHO "X$compiler_RC" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_RC='`$ECHO "X$GCC_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_RC='`$ECHO "X$lt_prog_compiler_no_builtin_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_RC='`$ECHO "X$lt_prog_compiler_wl_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_RC='`$ECHO "X$lt_prog_compiler_pic_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_RC='`$ECHO "X$lt_prog_compiler_static_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_RC='`$ECHO "X$lt_cv_prog_compiler_c_o_RC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_RC='`$ECHO "X$archive_cmds_need_lc_RC" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_RC='`$ECHO "X$enable_shared_with_static_runtimes_RC" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_RC='`$ECHO "X$export_dynamic_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_RC='`$ECHO "X$whole_archive_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_RC='`$ECHO "X$compiler_needs_object_RC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_RC='`$ECHO "X$old_archive_from_new_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_RC='`$ECHO "X$old_archive_from_expsyms_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_RC='`$ECHO "X$archive_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_RC='`$ECHO "X$archive_expsym_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_RC='`$ECHO "X$module_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_RC='`$ECHO "X$module_expsym_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_RC='`$ECHO "X$with_gnu_ld_RC" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_RC='`$ECHO "X$allow_undefined_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_RC='`$ECHO "X$no_undefined_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_RC='`$ECHO "X$hardcode_libdir_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_RC='`$ECHO "X$hardcode_libdir_flag_spec_ld_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_RC='`$ECHO "X$hardcode_libdir_separator_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_RC='`$ECHO "X$hardcode_direct_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_RC='`$ECHO "X$hardcode_direct_absolute_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_RC='`$ECHO "X$hardcode_minus_L_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_RC='`$ECHO "X$hardcode_shlibpath_var_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_RC='`$ECHO "X$hardcode_automatic_RC" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_RC='`$ECHO "X$inherit_rpath_RC" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_RC='`$ECHO "X$link_all_deplibs_RC" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_RC='`$ECHO "X$fix_srcfile_path_RC" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_RC='`$ECHO "X$always_export_symbols_RC" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_RC='`$ECHO "X$export_symbols_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_RC='`$ECHO "X$exclude_expsyms_RC" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_RC='`$ECHO "X$include_expsyms_RC" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_RC='`$ECHO "X$prelink_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_RC='`$ECHO "X$file_list_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_RC='`$ECHO "X$hardcode_action_RC" | $Xsed -e "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
 # Quote evaled strings.
-for var in AS \
-DLLTOOL \
-OBJDUMP \
-SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
+for var in SED \
 GREP \
 EGREP \
 FGREP \
@@ -32395,12 +27601,8 @@
 reload_flag \
 deplibs_check_method \
 file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
-archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -32410,14 +27612,14 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
+SHELL \
+ECHO \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
 lt_prog_compiler_wl \
+lt_prog_compiler_pic \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
-MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -32431,7 +27633,9 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
+fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -32444,11 +27648,10 @@
 old_striplib \
 striplib \
 LD_RC \
-reload_flag_RC \
 compiler_RC \
 lt_prog_compiler_no_builtin_flag_RC \
-lt_prog_compiler_pic_RC \
 lt_prog_compiler_wl_RC \
+lt_prog_compiler_pic_RC \
 lt_prog_compiler_static_RC \
 lt_cv_prog_compiler_c_o_RC \
 export_dynamic_flag_spec_RC \
@@ -32458,13 +27661,15 @@
 allow_undefined_flag_RC \
 no_undefined_flag_RC \
 hardcode_libdir_flag_spec_RC \
+hardcode_libdir_flag_spec_ld_RC \
 hardcode_libdir_separator_RC \
+fix_srcfile_path_RC \
 exclude_expsyms_RC \
 include_expsyms_RC \
 file_list_spec_RC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -32486,13 +27691,11 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
-postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec \
-reload_cmds_RC \
 old_archive_cmds_RC \
 old_archive_from_new_cmds_RC \
 old_archive_from_expsyms_cmds_RC \
@@ -32501,11 +27704,10 @@
 module_cmds_RC \
 module_expsym_cmds_RC \
 export_symbols_cmds_RC \
-prelink_cmds_RC \
-postlink_cmds_RC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+prelink_cmds_RC; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -32513,6 +27715,12 @@
     esac
 done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -32570,7 +27778,7 @@
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -32593,10 +27801,9 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -32604,13 +27811,12 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -32627,12 +27833,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -32641,18 +27847,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -32660,7 +27866,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -32708,7 +27914,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -32740,29 +27946,21 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -32774,7 +27972,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -32786,11 +27984,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -32875,7 +28073,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -32888,7 +28086,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -32907,7 +28105,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -32916,7 +28114,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -32942,8 +28140,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -33079,24 +28277,23 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -33105,21 +28302,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -33165,7 +28362,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -33178,7 +28375,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -33212,19 +28409,21 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -33278,8 +28477,7 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -33316,13 +28514,13 @@
 macro_revision=$macro_revision
 
 # Assembler program.
-AS=$lt_AS
+AS=$AS
 
 # DLL creation program.
-DLLTOOL=$lt_DLLTOOL
+DLLTOOL=$DLLTOOL
 
 # Object dumper program.
-OBJDUMP=$lt_OBJDUMP
+OBJDUMP=$OBJDUMP
 
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
@@ -33336,15 +28534,6 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -33394,36 +28583,20 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method = "file_magic".
+# Command to use when deplibs_check_method == "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
 # The archiver.
 AR=$lt_AR
-
-# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -33432,9 +28605,6 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
 # A C compiler.
 LTCC=$lt_CC
 
@@ -33453,24 +28623,21 @@
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
 
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -33569,10 +28736,6 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -33585,12 +28748,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -33640,6 +28803,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -33673,6 +28840,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -33688,9 +28858,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -33723,169 +28890,212 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
 
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
 
 
-   mv -f "$cfgfile" "$ofile" ||
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -33897,10 +29107,6 @@
 # The linker used to build libraries.
 LD=$lt_LD_RC
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_RC
-reload_cmds=$lt_reload_cmds_RC
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_RC
 
@@ -33913,12 +29119,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl_RC
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_RC
 
@@ -33968,6 +29174,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
 
@@ -34001,6 +29211,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_RC
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_RC
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
 
@@ -34016,9 +29229,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_RC
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_RC
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_RC
 
@@ -34039,7 +29249,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -34055,8 +29265,7 @@
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -34067,12 +29276,12 @@
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -34158,7 +29367,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -34179,7 +29388,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 
 #
@@ -34320,7 +29529,7 @@
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+	as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     fi
 
     cd "$ac_popdir"
diff -Nru gettext-0.19.3/gettext-runtime/configure.ac gettext-0.18.1.1/gettext-runtime/configure.ac
--- gettext-0.19.3/gettext-runtime/configure.ac	2014-10-02 08:49:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2009 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
@@ -16,17 +16,17 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.62])
-AC_INIT([gettext-runtime],
-	m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]),
-	[bug-gnu-gettext@gnu.org])
+AC_PREREQ([2.59])
+AC_INIT
 AC_CONFIG_SRCDIR([intl/dcigettext.c])
 AC_CONFIG_AUX_DIR([../build-aux])
-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
-AC_CONFIG_HEADERS([config.h])
+. $srcdir/../version.sh
+gl_INIT_PACKAGE([gettext-runtime], [$VERSION_NUMBER])
+AM_INIT_AUTOMAKE([silent-rules])
+AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -61,7 +61,6 @@
 
 dnl Make sure we see all GNU and Solaris extensions.
 gl_EARLY
-AM_PROG_CC_C_O
 
 dnl Check for build configuration.
 
@@ -107,35 +106,6 @@
 #endif
 ])
 
-dnl Compilation on mingw and Cygwin needs special Makefile rules, because
-dnl 1. when we install a shared library, we must arrange to export
-dnl    auxiliary pointer variables for every exported variable,
-dnl 2. when we install a shared library and a static library simultaneously,
-dnl    the include file specifies __declspec(dllimport) and therefore we
-dnl    must arrange to define the auxiliary pointer variables for the
-dnl    exported variables _also_ in the static library.
-if test "$enable_shared" = yes; then
-  case "$host_os" in
-    mingw* | cygwin*) is_woe32dll=yes ;;
-    *) is_woe32dll=no ;;
-  esac
-else
-  is_woe32dll=no
-fi
-AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes])
-if test $is_woe32dll = yes; then
-  AC_DEFINE([WOE32DLL], [1],
-    [Define when --enable-shared is used on mingw or Cygwin.])
-fi
-
-INTL_EXPORTS_FLAGS=
-dnl 64-bit mingw does not prepend an underscore to C symbols.
-dnl USER_LABEL_PREFIX is set by gl_ASM_SYMBOL_PREFIX, inside gl_INIT.
-if test "$USER_LABEL_PREFIX" = _; then
-  INTL_EXPORTS_FLAGS="-DUSER_LABEL_PREFIX_UNDERSCORE $INTL_EXPORTS_FLAGS"
-fi
-AC_SUBST([INTL_EXPORTS_FLAGS])
-
 dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl])
@@ -145,7 +115,7 @@
 AC_SUBST([CROSS_COMPILING])
 
 dnl Checks for optional programs for the tests/lang-* tests.
-gl_PROG_ANSI_CXX([CXX], [ANSICXX])
+gt_PROG_ANSI_CXX
 
 dnl Checks for special libraries for the tests/test-lock test.
 dnl On some systems, sched_yield is in librt, rather than in libpthread.
@@ -167,7 +137,7 @@
      SUBDIR_libasprintf=
    fi
   ], [SUBDIR_libasprintf=libasprintf])
-if test "$CXX" = "no"; then
+if test "$CXX" = ":"; then
   SUBDIR_libasprintf=
 fi
 AM_CONDITIONAL([ENABLE_LIBASPRINTF], [test -n "$SUBDIR_libasprintf"])
diff -Nru gettext-0.19.3/gettext-runtime/COPYING gettext-0.18.1.1/gettext-runtime/COPYING
--- gettext-0.19.3/gettext-runtime/COPYING	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/COPYING	2010-06-06 12:49:57.000000000 +0000
@@ -1,7 +1,8 @@
 The gettext-runtime package is partially under the LGPL and partially under
 the GPL.
 
-The following parts are under the LGPL, see file intl/COPYING.LIB:
+The following parts are under the LGPL, see files intl/COPYING.LIB-2.0 and
+intl/COPYING.LIB-2.1:
   - the libintl and libasprintf libraries and their header files,
   - the libintl.jar Java library,
   - the GNU.Gettext.dll C# library,
diff -Nru gettext-0.19.3/gettext-runtime/doc/ChangeLog gettext-0.18.1.1/gettext-runtime/doc/ChangeLog
--- gettext-0.19.3/gettext-runtime/doc/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/doc/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,40 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-06  Daiki Ueno  <ueno@gnu.org>
-
-	doc: Update the matrix
-	* matrix.texi: Update.
-	* nls.texi (STATUS): Likewise.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-08  Daiki Ueno  <ueno@unixuser.org>
-
-	* matrix.texi: Update.
-	* nls.texi (STATUS): Likewise.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* nls.texi (Using gettext in own code): Write "GNU Lesser General
-	Public License".
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/doc/Makefile.in gettext-0.18.1.1/gettext-runtime/doc/Makefile.in
--- gettext-0.19.3/gettext-runtime/doc/Makefile.in	2014-10-16 06:01:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/doc/Makefile.in	2010-06-06 20:11:37.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,54 +15,10 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,19 +34,16 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -97,17 +51,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -116,9 +66,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -129,18 +78,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -154,11 +98,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -167,13 +109,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -194,28 +137,15 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -223,7 +153,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -252,9 +181,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -286,14 +213,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -301,25 +225,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -327,8 +242,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -341,20 +254,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -377,7 +282,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -396,29 +300,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -428,11 +323,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -440,7 +331,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -448,7 +338,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -464,13 +353,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -482,54 +369,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -537,49 +391,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -588,6 +426,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -595,9 +434,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -610,8 +447,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -632,37 +471,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -683,7 +511,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -691,13 +518,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -706,47 +534,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -761,7 +555,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -780,7 +573,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -797,7 +589,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -805,7 +596,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -813,8 +603,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -822,7 +610,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -830,8 +617,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -852,7 +637,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -867,17 +651,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -889,40 +670,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -937,36 +706,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -974,12 +731,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -995,9 +749,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1018,8 +770,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1033,9 +783,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1070,9 +818,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1080,7 +828,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1132,11 +879,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1183,15 +930,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1272,16 +1014,15 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru gettext-0.19.3/gettext-runtime/doc/matrix.texi gettext-0.18.1.1/gettext-runtime/doc/matrix.texi
--- gettext-0.19.3/gettext-runtime/doc/matrix.texi	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/doc/matrix.texi	2010-06-06 12:49:57.000000000 +0000
@@ -1,1123 +1,1117 @@
 @example
 @group
-Ready PO files       af am an ar as ast az be be@@latin bg bn bn_IN bs ca
-                   +-----------------------------------------------------+
-a2ps               |                       []                         [] |
-aegis              |                                                     |
-anubis             |                                                     |
-aspell             |                []                                [] |
-bash               |                                   []                |
-bfd                |                                                     |
-bibshelf           |                []                                   |
-binutils           |                                                  [] |
-bison              |                                                     |
-bison-runtime      |                []                                   |
-bombono-dvd        |                                                     |
-buzztrax           |                                                     |
-ccide              |                                                     |
-cflow              |                                                     |
-clisp              |                                                     |
-coreutils          |                                                  [] |
-cpio               |                                                     |
-cppi               |                                                     |
-cpplib             |                                                  [] |
-cryptsetup         |                                                     |
-denemo             |                                                     |
-dfarc              |                                                  [] |
-dialog             |       []                    []                   [] |
-dico               |                                                     |
-diffutils          |                                                     |
-dink               |                                                  [] |
-doodle             |                                                     |
-dos2unix           |                                                     |
-dos2unix-man       |                                                     |
-e2fsprogs          |                                                     |
-enscript           |                                                  [] |
-exif               |                                                     |
-fetchmail          |                                                  [] |
-findutils          |                                                     |
-flex               |                                                  [] |
-freedink           |                                                  [] |
-fusionforge        |                                                     |
-gas                |                                                     |
-gawk               |                                                  [] |
-gcal               |                                                  [] |
-gcc                |                                                     |
-gdbm               |                                                     |
-gettext-examples   | []             []                 []             [] |
-gettext-runtime    |                                   []             [] |
-gettext-tools      |                                   []             [] |
-gip                |                                   []                |
-gjay               |                                                     |
-gliv               |                                   []                |
-glunarclock        |                []                 []                |
-gnome-manual-du... |                                                     |
-gnubiff            |                                                     |
-gnubik             |                                                     |
-gnucash            |                                                  [] |
-gnuchess           |                                                     |
-gnuedu             |                                                     |
-gnulib             |                                                     |
-gnunet             |                                                     |
-gnunet-gtk         |                                                     |
-gold               |                                                     |
-gphoto2            |                                                     |
-gprof              |                                   []                |
-gpsdrive           |                                                     |
-gramadoir          |                                                     |
-grep               |                                                  [] |
-grub               |                                                  [] |
-gsasl              |                                                     |
-gss                |                                                     |
-gst-plugins-bad    |                                                     |
-gst-plugins-base   |                                   []             [] |
-gst-plugins-good   |                                   []             [] |
-gst-plugins-ugly   |                                   []             [] |
-gstreamer          |                []                 []             [] |
-gtick              |                                                     |
-gtkam              |                       []                            |
-gtkorphan          |                                   []                |
-gtkspell           | []             []     []                         [] |
-guix               |                                                     |
-gutenprint         |                                                  [] |
-hello              |                                                  [] |
-help2man           |                                                     |
-hylafax            |                                                     |
-idutils            |                                                     |
-indent             |                                   []             [] |
-iso_15924          |                                                     |
-iso_3166           | []          []        []          [] []  []   [] [] |
-iso_3166_2         |                                                     |
-iso_4217           |                                                     |
-iso_639            |             [] []     []          [] []  []      [] |
-iso_639_3          |                []                                   |
-iso_639_5          |                                                     |
-iwhd               |                                                     |
-jwhois             |                                                     |
-kbd                |                                                     |
-keytouch           |                                                  [] |
-keytouch-editor    |                                                     |
-keytouch-keyboa... |                                                  [] |
-klavaro            |          []                       [] []             |
-latrine            |                                                     |
-ld                 |                                   []                |
-leafpad            |                       []          []             [] |
-libc               |                                   []             [] |
-libexif            |                       ()                            |
-libextractor       |                                                     |
-libgnutls          |                                                     |
-libgpg-error       |                                                     |
-libgphoto2         |                                                     |
-libgphoto2_port    |                                                     |
-libgsasl           |                                                     |
-libiconv           |                                   []                |
-libidn             |                                                     |
-lifelines          |                                                     |
-liferea            |          []    []           []                   [] |
-lilypond           |                                                  [] |
-linkdr             |          []                                         |
-lordsawar          |                                                  [] |
-lprng              |                                                     |
-lynx               |                                                  [] |
-m4                 |                                                     |
-mailfromd          |                                                     |
-mailutils          |                                                     |
-make               |                                                     |
-man-db             |                                                  [] |
-man-db-manpages    |                                                     |
-midi-instruments   |          []                                      [] |
-minicom            |                                                     |
-mkisofs            |                                                     |
-myserver           |                                                     |
-nano               |                                   []             [] |
-opcodes            |                                                     |
-parted             |                                                     |
-pies               |                                                     |
-popt               |                                                     |
-procps-ng          |                                                     |
-psmisc             |                                                     |
-pspp               |                                                  [] |
-pushover           |                                                     |
-pwdutils           |                                                     |
-pyspread           |                                                     |
-radius             |                                                  [] |
-recode             |                       []                         [] |
-recutils           |                                                     |
-rpm                |                                                     |
-rush               |                                                     |
-sarg               |                                                     |
-sed                |                []                                [] |
-sharutils          |                                                     |
-shishi             |                                                     |
-skencil            |                                                     |
-solfege            |                                                     |
-solfege-manual     |                                                     |
-sp                 |                                                     |
-spotmachine        |                                                     |
-sudo               |                                                  [] |
-sudoers            |                                                  [] |
-sysstat            |                                                     |
-tar                |                                   []             [] |
-texinfo            |                                                     |
-texinfo_document   |                                                     |
-tin                |                                                     |
-tin-man            |                                                     |
-tracgoogleappsa... |                                                     |
-trader             |                                                     |
-unicode-han-tra... |                                                     |
-unicode-transla... |                                                     |
-util-linux         |                                                     |
-ve                 |                                                     |
-vice               |                                                     |
-vmm                |                                                     |
-vorbis-tools       |                                                     |
-wastesedge         |                                                     |
-wcd                |                                                     |
-wcd-man            |                                                     |
-wdiff              |                                                  [] |
-wget               |                                                  [] |
-wyslij-po          |                                                     |
-xboard             |                                                     |
-xchat              |                []     []          []             [] |
-xdg-user-dirs      | []    []    [] []     []    []    []     []      [] |
-xkeyboard-config   |                                   []             [] |
-                   +-----------------------------------------------------+
-                     af am an ar as ast az be be@@latin bg bn bn_IN bs ca
-                      4  0  2  4  3 13   0  9     3    26  3   3    1 53
-@end group
-
-@group
-                     crh cs da  de  el en en_GB en_ZA eo  es et eu fa fi 
-                   +------------------------------------------------------+
-a2ps               |     [] []  []  []     []         []  [] []       []  |
-aegis              |        []  []                        []              |
-anubis             |        []  []                        []          []  |
-aspell             |     [] []  []         []         []  []          []  |
-bash               |     [] []                        []  []          []  |
-bfd                |        []                            []          []  |
-bibshelf           |     [] []  []                    []  []          []  |
-binutils           |                                      []          []  |
-bison              |            []  []                []  [] []       []  |
-bison-runtime      |        []  []  []                []  [] []       []  |
-bombono-dvd        |     [] []  []                    []              []  |
-buzztrax           |     [] []  []                                    []  |
-ccide              |        []  []                    []  []          []  |
-cflow              |        []  []                    []              []  |
-clisp              |        []  []     []                 []              |
-coreutils          |     [] []  []                    []  [] []           |
-cpio               |        []  []                                    []  |
-cppi               |            []                    []              []  |
-cpplib             |        []  []                    []  []          []  |
-cryptsetup         |     []     []                        []          []  |
-denemo             |     []                                               |
-dfarc              |        []  []                    []  []          []  |
-dialog             |     [] []  []  []                []  []    [] [] []  |
-dico               |            []                                    []  |
-diffutils          |     [] []  []  []                []  []              |
-dink               |        []  []                    []  []          []  |
-doodle             |     [] []  []                    []              []  |
-dos2unix           |        []  []                    []  []              |
-dos2unix-man       |            []                        []              |
-e2fsprogs          |     []     []                                        |
-enscript           |        []  []         []         []              []  |
-exif               |     [] []  []                    []  []          []  |
-fetchmail          |     [] []  ()  []     []         []  []              |
-findutils          |     [] []  []  []                []     []       []  |
-flex               |        []  []                    []  []          []  |
-freedink           |     [] []  []  []                []  []    []    []  |
-fusionforge        |            []                        []              |
-gas                |                                      []          []  |
-gawk               |        []  []                        []          []  |
-gcal               |        []                            []              |
-gcc                |            []                        []              |
-gdbm               |            []                    []              []  |
-gettext-examples   |     [] []  []  []                []  []          []  |
-gettext-runtime    |     [] []  []                    []  []          []  |
-gettext-tools      |        []  []                        []          []  |
-gip                |     [] []  []                    []  []    []    []  |
-gjay               |            []                    []              []  |
-gliv               |     [] []  []                                    []  |
-glunarclock        |     [] []  []                    []              []  |
-gnome-manual-du... |        []  []                    []              []  |
-gnubiff            |     []     ()                    []              []  |
-gnubik             |        []  []                    []              []  |
-gnucash            |            ()  ()     ()             ()          ()  |
-gnuchess           |            []                    []  []              |
-gnuedu             |        []  []                        []              |
-gnulib             |     [] []  []                    []  [] []       []  |
-gnunet             |                                      []              |
-gnunet-gtk         |            []                                        |
-gold               |                                      []          []  |
-gphoto2            |     [] []  ()                              []        |
-gprof              |        []  []                    []  []          []  |
-gpsdrive           |        []  []                        [] []           |
-gramadoir          |        []  []                    []              []  |
-grep               |     [] []  []                    []  [] []       []  |
-grub               |        []  []                        []          []  |
-gsasl              |            []                    []              []  |
-gss                |            []                    []              []  |
-gst-plugins-bad    |     [] []  []                                        |
-gst-plugins-base   |     [] []  []  []                    []    []    []  |
-gst-plugins-good   |     [] []  []  []                    []    []    []  |
-gst-plugins-ugly   |     [] []  []  []                []  []    []    []  |
-gstreamer          |     [] []  []  []                    []    []    []  |
-gtick              |     [] []  ()                    []              []  |
-gtkam              |     [] []  ()                    []  []          []  |
-gtkorphan          |     [] []  []                    []              []  |
-gtkspell           |     [] []  []  []                []  []    []    []  |
-guix               |                                  []                  |
-gutenprint         |        []  []                                    []  |
-hello              |        []  []  []                []  [] []       []  |
-help2man           |            []  []                []              []  |
-hylafax            |            []                        []              |
-idutils            |        []  []                    []              []  |
-indent             |     [] []  []  []                []  [] [] []    []  |
-iso_15924          |     [] []  ()                    []  []    ()    []  |
-iso_3166           | []  [] []  ()  []                []  [] [] ()    []  |
-iso_3166_2         |        []  ()                              ()        |
-iso_4217           |     [] []  ()                        [] [] ()    []  |
-iso_639            | []  [] []  ()                    []  []    ()    []  |
-iso_639_3          | []         ()                              ()        |
-iso_639_5          |            ()                              ()        |
-iwhd               |            []                        []          []  |
-jwhois             |            []                    []  []          []  |
-kbd                |     [] []  []  []                []  []              |
-keytouch           |     [] []  []                    []              []  |
-keytouch-editor    |     [] []  []                    []              []  |
-keytouch-keyboa... |     [] []  []                    []              []  |
-klavaro            |     [] []  []  []                []  []    []        |
-latrine            |     [] []  ()                    []              []  |
-ld                 |        []                            []          []  |
-leafpad            |     [] []  []  []                []  []    []    []  |
-libc               |     [] []  []                        []          []  |
-libexif            |        []  []         ()             []              |
-libextractor       |            []                                        |
-libgnutls          |     []     []                    []              []  |
-libgpg-error       |     []     []                    []                  |
-libgphoto2         |     [] []  ()                                        |
-libgphoto2_port    |     [] []  ()                                    []  |
-libgsasl           |            []                    []              []  |
-libiconv           |     [] []  []                    []     []       []  |
-libidn             |     [] []  []                    []              []  |
-lifelines          |        []  ()                    []                  |
-liferea            |     [] []  ()  []                    []    []    []  |
-lilypond           |     []     []  []                []  []              |
-linkdr             |        []  []                        []          []  |
-lordsawar          |        []  []                                        |
-lprng              |                                                      |
-lynx               |     [] []  []                    []     []       []  |
-m4                 |     [] []  []  []                []              []  |
-mailfromd          |                                                      |
-mailutils          |            []                        []          []  |
-make               |     [] []  []                        []              |
-man-db             |     [] []  []                    []                  |
-man-db-manpages    |            []                                        |
-midi-instruments   |     [] []  []  []                []  [] []    []     |
-minicom            |     [] []  []                        []          []  |
-mkisofs            |     []                           []              []  |
-myserver           |     []     []                    []              []  |
-nano               |     [] []  []                    []  []    []    []  |
-opcodes            |        []  []                        []          []  |
-parted             |     [] []  []                                        |
-pies               |            []                                        |
-popt               |     [] []  []                    []  []          []  |
-procps-ng          |            []                                        |
-psmisc             |     [] []  []  []                []        []    []  |
-pspp               |                                      []              |
-pushover           |     []     ()                    []  []              |
-pwdutils           |        []  []                                        |
-pyspread           |        []  []                                        |
-radius             |                                      []              |
-recode             |     [] []  []  []                []  []          []  |
-recutils           |            []                                    []  |
-rpm                |        []  []                    []              []  |
-rush               |            []                                    []  |
-sarg               |        []                                            |
-sed                |     [] []  []  []                []  [] []       []  |
-sharutils          |     []     []                    []     []           |
-shishi             |            []                                    []  |
-skencil            |        []  ()                        []              |
-solfege            |     [] []  []                    []  [] []    [] []  |
-solfege-manual     |            []                    []  [] []           |
-sp                 |            []                                        |
-spotmachine        |        []  []                    []                  |
-sudo               |     [] []  []                    []  []          []  |
-sudoers            |     [] []  []  []                []              []  |
-sysstat            |     [] []  []                    []  []    []    []  |
-tar                |     [] []  []                    []     [] []        |
-texinfo            |            []                    []  []              |
-texinfo_document   |            []                    []                  |
-tin                |            []                           []           |
-tin-man            |                       []                             |
-tracgoogleappsa... |        []  []                    []              []  |
-trader             |        []  []         []         []              []  |
-unicode-han-tra... |                                                      |
-unicode-transla... |                                                      |
-util-linux         |     [] []  []                                        |
-ve                 |            []                    []  []          []  |
-vice               |        ()  ()                                        |
-vmm                |            []                                    []  |
-vorbis-tools       |     [] []  []                    []                  |
-wastesedge         |        []                                            |
-wcd                |            []                    []  []          []  |
-wcd-man            |            []                                        |
-wdiff              |     [] []  []                    []  [] []       []  |
-wget               |     [] []  []                    []  [] []       []  |
-wyslij-po          |            []                    []              []  |
-xboard             |        []  []                        []              |
-xchat              |     [] []  []  []     []             [] []       []  |
-xdg-user-dirs      | []  [] []  []  []                []  [] [] [] [] []  |
-xkeyboard-config   |     [] []  []  []                []  []              |
-                   +------------------------------------------------------+
-                     crh cs da  de  el en en_GB en_ZA eo  es et eu fa fi 
-                      4  84 117 145 32  1   7     0   101 93 25 18  4 111
-@end group
-
-@group
-                     fr  ga gd gl gu he hi hr hu hy ia id is it  ja ka kk
-                   +------------------------------------------------------+
-a2ps               | []                    []          []    []  []       |
-aegis              | []                                      []           |
-anubis             | []                    [] []       []    []           |
-aspell             | []  []                []          []    []  []       |
-bash               | []                       []       []    []  []       |
-bfd                | []                                []        []       |
-bibshelf           | []  []    []          []          []    []           |
-binutils           | []                                []    []  []       |
-bison              | []                    []                             |
-bison-runtime      | []  []    []          [] []    [] []    []  []       |
-bombono-dvd        | []                                      []           |
-buzztrax           | []                                                   |
-ccide              | []                    [] []                          |
-cflow              | []  []                []          []                 |
-clisp              | []                                                   |
-coreutils          | []                       []       []    []  []       |
-cpio               | []  []                []          []    []  []       |
-cppi               | []        []          []                []  []       |
-cpplib             | []                                []        []       |
-cryptsetup         | []                                      []           |
-denemo             | []                                      []           |
-dfarc              | []                    [] []             []           |
-dialog             | []  [] [] []          [] []    [] [] [] []  []       |
-dico               | []                                                   |
-diffutils          | []                                      []  []       |
-dink               | []                                                   |
-doodle             |     []                                  []           |
-dos2unix           | []                       []                          |
-dos2unix-man       | []                                                   |
-e2fsprogs          | []                                []                 |
-enscript           | []  []                []          []                 |
-exif               | []        []          []          [] [] []  []       |
-fetchmail          | []                                []    []  []       |
-findutils          | []  []    []          [] []       []    []  []       |
-flex               | []  []                                               |
-freedink           | []                    [] []       []    []           |
-fusionforge        | []                                                   |
-gas                | []                                []                 |
-gawk               | []                                      ()  []       |
-gcal               | []                                                   |
-gcc                |                                   []                 |
-gdbm               |                                                      |
-gettext-examples   | []  []    []          [] []       []    []  []       |
-gettext-runtime    | []  []    []          [] []       []    []  []       |
-gettext-tools      | []                                []    []  []       |
-gip                | []  []    []          [] []       []        []       |
-gjay               |           []                                         |
-gliv               | ()                                                   |
-glunarclock        |     []    []          [] []       []    []           |
-gnome-manual-du... | []                    [] []             []           |
-gnubiff            | ()                       []       []    ()           |
-gnubik             |           []          []                []           |
-gnucash            | ()              ()       ()             ()  []       |
-gnuchess           |                                                      |
-gnuedu             | []                                      []           |
-gnulib             | []  []    []             []             []  []       |
-gnunet             |                                                      |
-gnunet-gtk         |                                                      |
-gold               |                                   []    []           |
-gphoto2            | []                                []    []  []       |
-gprof              | []  []                            []    []           |
-gpsdrive           |           []                      []    []           |
-gramadoir          | []  []                            []                 |
-grep               | []  []    []          [] []             []  []       |
-grub               | []        []                            []           |
-gsasl              | []  []                []          []    []           |
-gss                | []  []                []          []    []           |
-gst-plugins-bad    |                          []       []                 |
-gst-plugins-base   | []        []          [] []       []    []  []       |
-gst-plugins-good   | []        []          [] []       []    []  []       |
-gst-plugins-ugly   | []        []          [] []       []    []  []       |
-gstreamer          | []        []          [] []       []    []           |
-gtick              | []  []    []                      []    []           |
-gtkam              | []                       []       [] [] []  []       |
-gtkorphan          | []                    [] []       []    []           |
-gtkspell           | []  []    []    []    [] [] []    [] [] []  []       |
-guix               |                                                      |
-gutenprint         |           []             []             []           |
-hello              | []        []          [] []       []                 |
-help2man           | []                    []                []  []       |
-hylafax            |                                   []                 |
-idutils            | []                                []                 |
-indent             | []  []    []          [] []       []    []  []       |
-iso_15924          | ()        []             []    [] [] [] []           |
-iso_3166           | ()  []    [] [] [] [] [] []    [] [] [] []  []    [] |
-iso_3166_2         | ()                                []    []           |
-iso_4217           | ()                    [] []       [] [] []  []       |
-iso_639            | ()  []    [] []       [] []       [] [] []  []       |
-iso_639_3          | ()        []                            []           |
-iso_639_5          | ()                                                   |
-iwhd               |                                             []       |
-jwhois             | []        []             []       []    []           |
-kbd                | []                                []    []           |
-keytouch           | []  []                [] []       []    []           |
-keytouch-editor    |     []                [] []       []    []           |
-keytouch-keyboa... |     []                [] []       []    []           |
-klavaro            | []        []             []             []        [] |
-latrine            |                       []          []    []  []       |
-ld                 | []  []                            []    []  []       |
-leafpad            | []  []    []    []    [] []       []    []  ()       |
-libc               | []        []          []          []    []  []       |
-libexif            | []                                      []           |
-libextractor       |                                                      |
-libgnutls          | []                                      []           |
-libgpg-error       | []                                      []  []       |
-libgphoto2         | []                                          []       |
-libgphoto2_port    | []                                      []  []       |
-libgsasl           | []  []                            []    []           |
-libiconv           | []  []    []          [] []       []    []  []       |
-libidn             | []                    []          []    []           |
-lifelines          | ()                                                   |
-liferea            | []        []    []       []             []  []       |
-lilypond           | []                                      []           |
-linkdr             |                 []    [] []             []           |
-lordsawar          |                                                      |
-lprng              |                                   []                 |
-lynx               | []                       []       []    []  []       |
-m4                 | []  []    []          []          []        []       |
-mailfromd          |                                                      |
-mailutils          | []                                                   |
-make               | []                    []                []  []       |
-man-db             | []                                []        []       |
-man-db-manpages    | []                                []        []       |
-midi-instruments   | []        []    []    [] [] []    [] [] []  []       |
-minicom            | []                       []       []        []       |
-mkisofs            | []                                []    []           |
-myserver           | []                                      []           |
-nano               | []  []    []             []             []  []       |
-opcodes            | []  []                            []    []           |
-parted             | []        []                      []    []  []       |
-pies               |                                                      |
-popt               | []  []    [] []       [] []    [] [] [] []  []       |
-procps-ng          |                                                      |
-psmisc             | []                    [] []       []    []           |
-pspp               | []                                          []       |
-pushover           | []                                      []           |
-pwdutils           | []                                []                 |
-pyspread           |                                                      |
-radius             | []                                []                 |
-recode             | []  []    []    []    [] []       []    []           |
-recutils           | []                                                   |
-rpm                |                                   []                 |
-rush               |           []                                         |
-sarg               | []                                                   |
-sed                | []  []    []          [] []       []    []  []       |
-sharutils          | []                                                   |
-shishi             | []                                                   |
-skencil            | []                                                   |
-solfege            | []        []                            []           |
-solfege-manual     | []                                                   |
-sp                 | []                                          ()       |
-spotmachine        |                                                      |
-sudo               | []        []          []                []  []       |
-sudoers            |                       []                []  []       |
-sysstat            | []                    [] []       []    []  []       |
-tar                | []  []                [] []       []    []  []       |
-texinfo            | []                    []                []  []       |
-texinfo_document   | []                                      []           |
-tin                | []                                                   |
-tin-man            |                                                      |
-tracgoogleappsa... |           []    []    [] []                          |
-trader             | []                    []                             |
-unicode-han-tra... |                                                      |
-unicode-transla... | []  []                                               |
-util-linux         | []                                          []       |
-ve                 |                                                      |
-vice               | ()                       ()             ()           |
-vmm                |                                                      |
-vorbis-tools       | []                    []          []                 |
-wastesedge         | ()                                      ()           |
-wcd                |                                                      |
-wcd-man            |                                                      |
-wdiff              | []        []                            []           |
-wget               | []  []                [] []       []    []  []       |
-wyslij-po          | []        []          []          []                 |
-xboard             |                                                      |
-xchat              | []           []    []    []       []    []  []       |
-xdg-user-dirs      | []  [] [] [] [] [] [] [] []    [] [] [] []  []    [] |
-xkeyboard-config   | []        []             []       []    []  []       |
-                   +------------------------------------------------------+
-                     fr  ga gd gl gu he hi hr hu hy ia id is it  ja ka kk
-                     128 42  2 50  5  9  3 64 57  2  6 89 11 100 65  0  3
-@end group
-
-@group
-                     kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
+Ready PO files       af am an ar as ast az be be@@latin bg bn_IN bs ca
                    +--------------------------------------------------+
-a2ps               |                                  []          []  |
-aegis              |                                              []  |
-anubis             |                                  []    []    []  |
-aspell             |                            []                []  |
-bash               |                                              []  |
+a2ps               |                       []                      [] |
+aegis              |                                                  |
+ant-phone          |                                                  |
+anubis             |                                                  |
+aspell             |                []                             [] |
+bash               |                                                  |
 bfd                |                                                  |
-bibshelf           |                   []             []          []  |
+bibshelf           |                []                                |
 binutils           |                                                  |
-bison              |                                              []  |
-bison-runtime      |          []    [] []             []    []    []  |
+bison              |                                                  |
+bison-runtime      |                []                                |
+bluez-pin          | []             []                                |
 bombono-dvd        |                                                  |
-buzztrax           |                                                  |
-ccide              |                   []                         []  |
-cflow              |                                              []  |
-clisp              |                                              []  |
-coreutils          |             []                               []  |
-cpio               |                                              []  |
+buzztard           |                                                  |
+cflow              |                                                  |
+clisp              |                                                  |
+coreutils          |                                   []          [] |
+cpio               |                                                  |
 cppi               |                                                  |
-cpplib             |                                              []  |
-cryptsetup         |                                              []  |
-denemo             |                                                  |
-dfarc              |                      []                      []  |
-dialog             |       []       [] []             []    []    []  |
+cpplib             |                                               [] |
+cryptsetup         |                                                  |
+dfarc              |                                                  |
+dialog             |                             []                [] |
 dico               |                                                  |
-diffutils          |                   []                         []  |
-dink               |                                              []  |
-doodle             |                                              []  |
-dos2unix           |                                        []    []  |
-dos2unix-man       |                                              []  |
-e2fsprogs          |                                              []  |
-enscript           |                                              []  |
-exif               |                   []                         []  |
-fetchmail          |                                              []  |
-findutils          |                                              []  |
-flex               |                                              []  |
-freedink           |                                        []    []  |
-fusionforge        |                                                  |
+diffutils          |                                               [] |
+dink               |                                                  |
+doodle             |                                                  |
+e2fsprogs          |                                               [] |
+enscript           |                                               [] |
+exif               |                                                  |
+fetchmail          |                                               [] |
+findutils          |                                   []             |
+flex               |                                               [] |
+freedink           |                                                  |
 gas                |                                                  |
-gawk               |                                              []  |
-gcal               |                                                  |
+gawk               |                []                             [] |
+gcal               |                                               [] |
 gcc                |                                                  |
-gdbm               |                                                  |
-gettext-examples   |          []       []             [] [] []    []  |
-gettext-runtime    |    []                                        []  |
-gettext-tools      |    []                                            |
-gip                |                   []             []          []  |
+gettext-examples   | []             []                 []          [] |
+gettext-runtime    |                                   []          [] |
+gettext-tools      |                                   []          [] |
+gip                |                                   []             |
 gjay               |                                                  |
-gliv               |                                              []  |
-glunarclock        |                   []                         []  |
-gnome-manual-du... |                                                  |
-gnubiff            |                                              []  |
-gnubik             |                                        []    []  |
-gnucash            |    ()          () []                   () () []  |
-gnuchess           |                                              []  |
-gnuedu             |                                              []  |
-gnulib             |                                              []  |
+gliv               |                                   []             |
+glunarclock        |                []                 []             |
+gnubiff            |                                                  |
+gnucash            |                                               [] |
+gnuedu             |                                                  |
+gnulib             |                                                  |
 gnunet             |                                                  |
 gnunet-gtk         |                                                  |
+gnutls             |                                                  |
 gold               |                                                  |
-gphoto2            |                                              []  |
-gprof              |                                  []          []  |
-gpsdrive           |                                              []  |
-gramadoir          |                                              []  |
-grep               |                                              []  |
-grub               |                                              []  |
-gsasl              |                                              []  |
+gpe-aerial         |                                                  |
+gpe-beam           |                                                  |
+gpe-bluetooth      |                                                  |
+gpe-calendar       |                                                  |
+gpe-clock          |                []                                |
+gpe-conf           |                                                  |
+gpe-contacts       |                                                  |
+gpe-edit           |                                                  |
+gpe-filemanager    |                                                  |
+gpe-go             |                                                  |
+gpe-login          |                                                  |
+gpe-ownerinfo      |                []                                |
+gpe-package        |                                                  |
+gpe-sketchbook     |                                                  |
+gpe-su             |                []                                |
+gpe-taskmanager    |                []                                |
+gpe-timesheet      |                []                                |
+gpe-today          |                []                                |
+gpe-todo           |                                                  |
+gphoto2            |                                                  |
+gprof              |                                   []             |
+gpsdrive           |                                                  |
+gramadoir          |                                                  |
+grep               |                                                  |
+grub               |                []                             [] |
+gsasl              |                                                  |
 gss                |                                                  |
-gst-plugins-bad    |                   []                   []    []  |
-gst-plugins-base   |                   []                   []    []  |
-gst-plugins-good   |                [] []                   []    []  |
-gst-plugins-ugly   |                   []             [] [] []    []  |
-gstreamer          |                []                            []  |
-gtick              |                                              []  |
-gtkam              |                                        []    []  |
-gtkorphan          |                   []                         []  |
-gtkspell           |          []    [] []       []    []    []    []  |
-guix               |                                                  |
-gutenprint         |                                              []  |
-hello              |                   []                         []  |
+gst-plugins-bad    |                                   []             |
+gst-plugins-base   |                                   []             |
+gst-plugins-good   |                                   []             |
+gst-plugins-ugly   |                                   []             |
+gstreamer          | []                                []          [] |
+gtick              |                                                  |
+gtkam              |                       []                         |
+gtkorphan          |                                   []             |
+gtkspell           | []             []     []                         |
+gutenprint         |                                                  |
+hello              |                                   []             |
 help2man           |                                                  |
-hylafax            |                                              []  |
-idutils            |                                              []  |
-indent             |                                              []  |
-iso_15924          |                () []                         []  |
-iso_3166           | [] [] []       () [] [] []    []       []    []  |
-iso_3166_2         |                ()                            []  |
-iso_4217           |                () []                   []    []  |
-iso_639            | [] []          () []    []    []             []  |
-iso_639_3          | []             ()             []                 |
-iso_639_5          |                ()                                |
-iwhd               |                                                  |
-jwhois             |                   []                         []  |
-kbd                |                                              []  |
-keytouch           |                   []                         []  |
-keytouch-editor    |                   []                         []  |
-keytouch-keyboa... |                   []                         []  |
-klavaro            |                                        []    []  |
-latrine            |                   []                         []  |
-ld                 |                                                  |
-leafpad            |    []    []    [] []                         []  |
-libc               |    []                                        []  |
-libexif            |                                              []  |
-libextractor       |                                              []  |
-libgnutls          |                                  []          []  |
-libgpg-error       |                                              []  |
-libgphoto2         |                                              []  |
-libgphoto2_port    |                                              []  |
-libgsasl           |                                              []  |
-libiconv           |                []                            []  |
-libidn             |                                              []  |
-lifelines          |                                              []  |
-liferea            |                [] []                         []  |
+hylafax            |                                                  |
+idutils            |                                                  |
+indent             |                                   []          [] |
+iso_15924          |                                                  |
+iso_3166           | []          []        []          []  []   [] [] |
+iso_3166_2         |                                                  |
+iso_4217           |                                                  |
+iso_639            |             [] []     []              []         |
+iso_639_3          |                                                  |
+jwhois             |                                                  |
+kbd                |                                                  |
+keytouch           |                                               [] |
+keytouch-editor    |                                                  |
+keytouch-keyboa... |                                               [] |
+klavaro            |          []                                      |
+latrine            |                                                  |
+ld                 |                                   []             |
+leafpad            |                                   []          [] |
+libc               |                                   []          [] |
+libexif            |                       ()                         |
+libextractor       |                                                  |
+libgnutls          |                                                  |
+libgpewidget       |                                                  |
+libgpg-error       |                                                  |
+libgphoto2         |                                                  |
+libgphoto2_port    |                                                  |
+libgsasl           |                                                  |
+libiconv           |                                   []             |
+libidn             |                                                  |
+lifelines          |                                                  |
+liferea            |                             []                [] |
 lilypond           |                                                  |
-linkdr             |                                              []  |
+linkdr             |          []                                      |
 lordsawar          |                                                  |
 lprng              |                                                  |
-lynx               |                                              []  |
-m4                 |                                              []  |
+lynx               |                                               [] |
+m4                 |                                                  |
 mailfromd          |                                                  |
 mailutils          |                                                  |
-make               |    []                                        []  |
-man-db             |                                              []  |
-man-db-manpages    |                                              []  |
-midi-instruments   |    [] []       []          []    []       [] []  |
-minicom            |                                        []        |
-mkisofs            |                                              []  |
+make               |                                                  |
+man-db             |                                                  |
+man-db-manpages    |                                                  |
+minicom            |                                                  |
+mkisofs            |                                                  |
 myserver           |                                                  |
-nano               |                                  []    []    []  |
-opcodes            |                                              []  |
-parted             |                                              []  |
+nano               |                                   []          [] |
+opcodes            |                                                  |
+parted             |                                                  |
 pies               |                                                  |
-popt               | [] []             []                   []    []  |
-procps-ng          |                                                  |
-psmisc             |                                              []  |
-pspp               |                []                            []  |
-pushover           |                                                  |
-pwdutils           |                                              []  |
-pyspread           |                                                  |
-radius             |                                              []  |
-recode             |                                        []    []  |
-recutils           |                                              []  |
-rpm                |                                              []  |
-rush               |                                              []  |
+popt               |                                                  |
+psmisc             |                                                  |
+pspp               |                                               [] |
+pwdutils           |                                                  |
+radius             |                                               [] |
+recode             |                       []                      [] |
+rosegarden         |                                                  |
+rpm                |                                                  |
+rush               |                                                  |
 sarg               |                                                  |
-sed                |                                        []    []  |
-sharutils          |                                              []  |
+screem             |                                                  |
+scrollkeeper       |                    [] []                      [] |
+sed                |                []                             [] |
+sharutils          |                                   []          [] |
 shishi             |                                                  |
 skencil            |                                                  |
-solfege            |                                        []    []  |
-solfege-manual     |                                              []  |
+solfege            |                                                  |
+solfege-manual     |                                                  |
+soundtracker       |                                                  |
 sp                 |                                                  |
-spotmachine        |                                              []  |
-sudo               |                                        []    []  |
-sudoers            |                                        []    []  |
-sysstat            |                   []                   []    []  |
-tar                |          []                                  []  |
-texinfo            |                                              []  |
-texinfo_document   |                                              []  |
+sysstat            |                                                  |
+tar                |                                   []             |
+texinfo            |                                                  |
 tin                |                                                  |
-tin-man            |                                                  |
-tracgoogleappsa... |                   []                   []    []  |
-trader             |                                        []        |
 unicode-han-tra... |                                                  |
 unicode-transla... |                                                  |
-util-linux         |                                              []  |
-ve                 |                                              []  |
-vice               |                                              []  |
-vmm                |                                              []  |
-vorbis-tools       |                                              []  |
-wastesedge         |                                              []  |
-wcd                |                                              []  |
-wcd-man            |                                              []  |
-wdiff              |                                              []  |
-wget               |                []                            []  |
-wyslij-po          |                                              []  |
-xboard             |                                              []  |
-xchat              | [] []             [] []                []    []  |
-xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
-xkeyboard-config   |    []          []                            []  |
+util-linux-ng      |                                               [] |
+vice               |                                                  |
+vmm                |                                                  |
+vorbis-tools       |                                                  |
+wastesedge         |                                                  |
+wdiff              |                                                  |
+wget               |                       []                      [] |
+wyslij-po          |                                                  |
+xchat              |                []     []          []          [] |
+xdg-user-dirs      | []    []    [] []     []    []    []  []      [] |
+xkeyboard-config   |                                   []          [] |
                    +--------------------------------------------------+
-                     kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
-                      6 12  4  6  1 15 33  4  3  3  4 13  2 29  1 135
+                     af am an ar as ast az be be@@latin bg bn_IN bs ca
+                      6  0  1  2  3 19   1 10     3    28   3    1 38
+@end group
+
+@group
+                     crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                   +-------------------------------------------------+
+a2ps               |     [] []  []  []     []            [] []       |
+aegis              |        []  []                       []          |
+ant-phone          |        []  ()                                   |
+anubis             |        []  []                                   |
+aspell             |     [] []  []         []            []          |
+bash               |     []                           [] []          |
+bfd                |                                     []          |
+bibshelf           |        []  []                       []          |
+binutils           |                                     []          |
+bison              |            []  []                               |
+bison-runtime      |        []  []  []                      []       |
+bluez-pin          |     [] []  []  []                [] []          |
+bombono-dvd        |        []                                       |
+buzztard           |     [] []  []                                   |
+cflow              |        []  []                                   |
+clisp              |        []  []     []                []          |
+coreutils          |     [] []  []                          []       |
+cpio               |                                                 |
+cppi               |                                                 |
+cpplib             |        []  []                       []          |
+cryptsetup         |            []                                   |
+dfarc              |        []  []                       []          |
+dialog             |        []  []                    [] []    []    |
+dico               |                                                 |
+diffutils          |     [] []  []  []                [] []          |
+dink               |        []  []                       []          |
+doodle             |            []                                   |
+e2fsprogs          |     []     []                       []          |
+enscript           |        []  []         []                        |
+exif               |     () []  []                                   |
+fetchmail          |     [] []  ()  []     []            []          |
+findutils          |     [] []  []                                   |
+flex               |            []                       []          |
+freedink           |        []  []                       []          |
+gas                |                                     []          |
+gawk               |        []  []                       []          |
+gcal               |                                     []          |
+gcc                |            []                       []          |
+gettext-examples   |            []  []                [] []          |
+gettext-runtime    |        []  []                    [] []          |
+gettext-tools      |            []                       []    []    |
+gip                |        []  []                       []    []    |
+gjay               |            []                                   |
+gliv               |     [] []  []                                   |
+glunarclock        |        []  []                                   |
+gnubiff            |            ()                                   |
+gnucash            |     []     ()  ()     ()            ()          |
+gnuedu             |        []                           []          |
+gnulib             |            []                       []          |
+gnunet             |                                                 |
+gnunet-gtk         |        []                                       |
+gnutls             |     []     []                                   |
+gold               |                                     []          |
+gpe-aerial         |     [] []  []                       []          |
+gpe-beam           |     [] []  []                       []          |
+gpe-bluetooth      |        []  []                                   |
+gpe-calendar       |        []                                       |
+gpe-clock          |     [] []  []                       []          |
+gpe-conf           |     [] []  []                                   |
+gpe-contacts       |        []  []                       []          |
+gpe-edit           |        []  []                                   |
+gpe-filemanager    |        []  []                       []          |
+gpe-go             |     [] []  []                       []          |
+gpe-login          |        []  []                                   |
+gpe-ownerinfo      |     [] []  []                       []          |
+gpe-package        |        []  []                       []          |
+gpe-sketchbook     |     [] []  []                       []          |
+gpe-su             |     [] []  []                       []          |
+gpe-taskmanager    |     [] []  []                       []          |
+gpe-timesheet      |     [] []  []                       []          |
+gpe-today          |     [] []  []                       []          |
+gpe-todo           |        []  []                       []          |
+gphoto2            |     [] []  ()         []            []    []    |
+gprof              |        []  []                       []          |
+gpsdrive           |        []                           [] []       |
+gramadoir          |        []  []                    []             |
+grep               |     []                                          |
+grub               |        []  []                                   |
+gsasl              |            []                                   |
+gss                |                                                 |
+gst-plugins-bad    |     [] []  []                       []    []    |
+gst-plugins-base   |     [] []  []                       []    []    |
+gst-plugins-good   |     [] []  []  []                   []    []    |
+gst-plugins-ugly   |     [] []  []  []                   []    []    |
+gstreamer          |     [] []  []                       []    []    |
+gtick              |        []  ()                    []             |
+gtkam              |     [] []  ()                    [] []          |
+gtkorphan          |     [] []  []                    []             |
+gtkspell           |     [] []  []  []                [] []    []    |
+gutenprint         |        []  []         []                        |
+hello              |        []  []                    [] []          |
+help2man           |            []                                   |
+hylafax            |            []                       []          |
+idutils            |        []  []                                   |
+indent             |     [] []  []                    [] [] [] []    |
+iso_15924          |        []      ()                [] []          |
+iso_3166           | []  [] []  []  ()                [] [] [] ()    |
+iso_3166_2         |                ()                               |
+iso_4217           |     [] []  []  ()                   [] []       |
+iso_639            | []  [] []  []  ()                [] []          |
+iso_639_3          | []                                              |
+jwhois             |                                     []          |
+kbd                |     [] []  []  []                   []          |
+keytouch           |        []  []                                   |
+keytouch-editor    |        []  []                                   |
+keytouch-keyboa... |        []                                       |
+klavaro            |     [] []  []                    []             |
+latrine            |        []  ()                                   |
+ld                 |        []                           []          |
+leafpad            |     [] []  []  []                   []    []    |
+libc               |     [] []  []                       []          |
+libexif            |        []  []         ()                        |
+libextractor       |                                                 |
+libgnutls          |     []                                          |
+libgpewidget       |        []  []                                   |
+libgpg-error       |     []     []                                   |
+libgphoto2         |        []  ()                                   |
+libgphoto2_port    |        []  ()                             []    |
+libgsasl           |                                                 |
+libiconv           |     [] []  []                    []    []       |
+libidn             |     []     []                    []             |
+lifelines          |        []  ()                                   |
+liferea            |     []     []  []                   []    []    |
+lilypond           |     []     []                       []          |
+linkdr             |        []  []                       []          |
+lordsawar          |        []                                       |
+lprng              |                                                 |
+lynx               |     [] []  []                          []       |
+m4                 |     [] []  []  []                               |
+mailfromd          |                                                 |
+mailutils          |                                     []          |
+make               |        []  []                       []          |
+man-db             |                                                 |
+man-db-manpages    |                                                 |
+minicom            |     [] []  []                       []          |
+mkisofs            |                                                 |
+myserver           |                                                 |
+nano               |            []                       []    []    |
+opcodes            |            []                       []          |
+parted             |     []     []                                   |
+pies               |                                                 |
+popt               |     [] []  []                    [] []          |
+psmisc             |     []     []                             []    |
+pspp               |                                     []          |
+pwdutils           |        []                                       |
+radius             |                                     []          |
+recode             |     [] []  []  []                [] []          |
+rosegarden         |     ()     ()                       ()          |
+rpm                |        []  []                       []          |
+rush               |                                                 |
+sarg               |                                                 |
+screem             |                                                 |
+scrollkeeper       |     [] []  []         []            []          |
+sed                |     []     []  []                [] [] []       |
+sharutils          |        []  []                       [] []       |
+shishi             |                                                 |
+skencil            |        []  ()                       []          |
+solfege            |            []                    []    []       |
+solfege-manual     |                                  []    []       |
+soundtracker       |        []  []                       []          |
+sp                 |            []                                   |
+sysstat            |        []  []                             []    |
+tar                |     []     []                          [] []    |
+texinfo            |            []                    [] []          |
+tin                |            []                          []       |
+unicode-han-tra... |                                                 |
+unicode-transla... |                                                 |
+util-linux-ng      |     [] []  []                       []          |
+vice               |        ()  ()                                   |
+vmm                |            []                                   |
+vorbis-tools       |     []                           []             |
+wastesedge         |        []                                       |
+wdiff              |            []                       []          |
+wget               |     []     []                          []       |
+wyslij-po          |                                                 |
+xchat              |     []     []  []                   [] []       |
+xdg-user-dirs      | []  [] []  []  []                [] [] [] []    |
+xkeyboard-config   | []  [] []  []                    [] []          |
+                   +-------------------------------------------------+
+                     crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                      5  64 105 117 18  1   8     0   28 89 18 19  0
+@end group
+
+@group
+                     fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                   +----------------------------------------------------+
+a2ps               | []  []                          []        []       |
+aegis              |     []                                 []          |
+ant-phone          |     []                                 []          |
+anubis             | []  []                          []     []          |
+aspell             |     []  []                      []     []          |
+bash               | []  []                          []        []       |
+bfd                | []  []                          []                 |
+bibshelf           | []  []  []                      []     []          |
+binutils           | []  []                          []                 |
+bison              | []  []  []                      []                 |
+bison-runtime      | []  []  []                      []     [] []       |
+bluez-pin          | []  []  []                [] [] []  []    []       |
+bombono-dvd        | []                                                 |
+buzztard           |                                 []                 |
+cflow              | []      []                      []                 |
+clisp              |     []                                             |
+coreutils          |     []  []                []    []     []          |
+cpio               | []  []  []                      []                 |
+cppi               | []  []                                             |
+cpplib             | []  []                          []                 |
+cryptsetup         |     []                          []     []          |
+dfarc              | []  []                                 []          |
+dialog             |     []  [] []                   []  [] [] []       |
+dico               |                                                    |
+diffutils          | []  []  [] []    []       []    []     [] []       |
+dink               |     []                                             |
+doodle             |         []                             []          |
+e2fsprogs          |     []                          []                 |
+enscript           |     []  []             []       []                 |
+exif               | []  []                          []  [] [] []       |
+fetchmail          |     []                          []     [] []       |
+findutils          | []  []  []                []    []     []          |
+flex               | []  []  []                                         |
+freedink           | []  []                          []                 |
+gas                |     []                          []                 |
+gawk               |     []  []       []             []     () []       |
+gcal               |     []                                             |
+gcc                |                                 []                 |
+gettext-examples   | []  []  []                []    []     [] []       |
+gettext-runtime    | []  []  []                      []     [] []       |
+gettext-tools      |     []                          []     [] []       |
+gip                | []  []  [] []                   []        []       |
+gjay               | []                                                 |
+gliv               | []  ()                                             |
+glunarclock        | []      []                []    []                 |
+gnubiff            |     ()                          []     ()          |
+gnucash            | ()  ()           ()       ()           () []       |
+gnuedu             |     []                                 []          |
+gnulib             | []  []  []                []           [] []       |
+gnunet             |                                                    |
+gnunet-gtk         |     []                                             |
+gnutls             |     []                                 []          |
+gold               | []                              []                 |
+gpe-aerial         | []  []                          []                 |
+gpe-beam           | []  []                          []        []       |
+gpe-bluetooth      | []                              []     [] []       |
+gpe-calendar       | []                                        []       |
+gpe-clock          | []  []                    []    []        []       |
+gpe-conf           | []  []                          []        []       |
+gpe-contacts       | []  []                          []        []       |
+gpe-edit           | []                              []        []       |
+gpe-filemanager    | []                        []    []        []       |
+gpe-go             | []  []                    []    []        []       |
+gpe-login          | []                              []        []       |
+gpe-ownerinfo      | []  []                    []    []        []       |
+gpe-package        | []                              []        []       |
+gpe-sketchbook     | []  []                          []        []       |
+gpe-su             | []  []     []             []    []        []       |
+gpe-taskmanager    | []  []                    []    []        []       |
+gpe-timesheet      | []  []  []                      []        []       |
+gpe-today          | []  []  [] []             []    []        []       |
+gpe-todo           | []                              []        []       |
+gphoto2            | []  []                    []    []     [] []       |
+gprof              | []  []  []                      []                 |
+gpsdrive           |            []                   []     []          |
+gramadoir          |     []  []                      []                 |
+grep               | []                                     []          |
+grub               | []                        []    []     []          |
+gsasl              | []  []  []                      []     []          |
+gss                | []  []  []                      []     []          |
+gst-plugins-bad    | []  []                    []    []     [] []       |
+gst-plugins-base   | []  []                    []    []     [] []       |
+gst-plugins-good   | []  []                    []    []     [] []       |
+gst-plugins-ugly   | []  []                    []    []     [] []       |
+gstreamer          | []  []                    []    []     []          |
+gtick              | []  []  []                      []     []          |
+gtkam              |     []                    []    []     [] []       |
+gtkorphan          |     []                          []     []          |
+gtkspell           | []  []  [] []             [] [] []     [] []       |
+gutenprint         | []  []                    []           []          |
+hello              | []      []                      []                 |
+help2man           | []  []                                             |
+hylafax            |                                 []                 |
+idutils            | []  []  []                []    []     []          |
+indent             | []  []  [] []             []    []     [] []       |
+iso_15924          | []  ()                          []     []          |
+iso_3166           | []  ()  [] [] [] [] [] [] []    []     [] []       |
+iso_3166_2         |     ()                    []    []     []          |
+iso_4217           | []  ()                    []    []     [] []       |
+iso_639            | []  ()  []    []          []    []     [] []    [] |
+iso_639_3          |     ()                                 []       [] |
+jwhois             | []  []                    []    []     []          |
+kbd                |     []                          []                 |
+keytouch           | []  []  []                []    []     []          |
+keytouch-editor    | []      []                []    []     []          |
+keytouch-keyboa... | []      []                []    []     []          |
+klavaro            |            []             []                       |
+latrine            | []                              []     []          |
+ld                 | []  []  []                      []                 |
+leafpad            | []  []  []       []       []    []     [] ()       |
+libc               | []  []     []                   []        []       |
+libexif            |                                        []          |
+libextractor       |                                                    |
+libgnutls          |     []                                 []          |
+libgpewidget       | []      []                      []        []       |
+libgpg-error       |     []                                 []          |
+libgphoto2         |     []                                 [] []       |
+libgphoto2_port    |     []                                 [] []       |
+libgsasl           | []  []  []                      []     []          |
+libiconv           | []  []  []                      []     [] []       |
+libidn             | []  []                          []     []          |
+lifelines          |     ()                                             |
+liferea            |     []                    []           [] []       |
+lilypond           | []  []                                             |
+linkdr             | []               []    [] []           []          |
+lordsawar          |                                                    |
+lprng              |                                 []                 |
+lynx               |     []                    []    []     [] []       |
+m4                 | []  []  [] []                   []        []       |
+mailfromd          |                                                    |
+mailutils          |     []                          []                 |
+make               | []  []  [] []    []    []       []     [] []       |
+man-db             |                                 []     []          |
+man-db-manpages    |                                 []                 |
+minicom            | []  []                    []    []        []       |
+mkisofs            | []  []                          []     []          |
+myserver           |                                                    |
+nano               | []  []  [] []             []           []          |
+opcodes            | []  []  []                      []                 |
+parted             |     []                          []     [] []       |
+pies               |                                                    |
+popt               | []  []  [] []             []    []  [] [] []       |
+psmisc             | []  []                          []                 |
+pspp               |                                                    |
+pwdutils           |     []                          []                 |
+radius             |     []                          []                 |
+recode             | []  []  [] []    []       []    []     []          |
+rosegarden         | ()  ()                          ()     () ()       |
+rpm                |                                 []        []       |
+rush               |                                                    |
+sarg               |     []                                             |
+screem             |                                        [] []       |
+scrollkeeper       | []                        []    []     []          |
+sed                | []  []  [] []             []    []     [] []       |
+sharutils          | []  []  []                []    []     [] []       |
+shishi             |     []                                             |
+skencil            |     []                                             |
+solfege            | []  []     []                          []          |
+solfege-manual     |     []     []                                      |
+soundtracker       |     []                                 []          |
+sp                 |     []                                    ()       |
+sysstat            | []  []                          []     [] []       |
+tar                | []  []  []                []    []     [] []       |
+texinfo            |     []                          []     [] []       |
+tin                |     []                                             |
+unicode-han-tra... |                                                    |
+unicode-transla... |     []  []                                         |
+util-linux-ng      | []  []                    []    []     [] []       |
+vice               |     ()                    ()           ()          |
+vmm                |     []                                             |
+vorbis-tools       |                                 []                 |
+wastesedge         |     ()                                 ()          |
+wdiff              | []                                                 |
+wget               | []  []  []             [] []    []     [] []       |
+wyslij-po          | []  []                          []                 |
+xchat              | []  []        []    []    []    []     [] []    [] |
+xdg-user-dirs      | []  []  [] [] [] [] []    []    []  [] [] []    [] |
+xkeyboard-config   | []  []                    []    []     []          |
+                   +----------------------------------------------------+
+                     fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                     105 121 53 20  4  8  3  5 53  2 120  5 84 67  0  4
+@end group
+
+@group
+                     ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                   +-----------------------------------------------+
+a2ps               |                               []              |
+aegis              |                                               |
+ant-phone          |                                               |
+anubis             |                               []    []        |
+aspell             |                         []                    |
+bash               |                                               |
+bfd                |                                               |
+bibshelf           |                []             []              |
+binutils           |                                               |
+bison              |                               []              |
+bison-runtime      |       []    [] []             []    []        |
+bluez-pin          |    [] []    [] []             []              |
+bombono-dvd        |                                               |
+buzztard           |                                               |
+cflow              |                                               |
+clisp              |                                               |
+coreutils          |          []                                   |
+cpio               |                                               |
+cppi               |                                               |
+cpplib             |                                               |
+cryptsetup         |                                               |
+dfarc              |                   []                          |
+dialog             |    []       [] []             []    []        |
+dico               |                                               |
+diffutils          |                []             []              |
+dink               |                                               |
+doodle             |                                               |
+e2fsprogs          |                                               |
+enscript           |                                               |
+exif               |                []                             |
+fetchmail          |                                               |
+findutils          |                                               |
+flex               |                                               |
+freedink           |                                     []        |
+gas                |                                               |
+gawk               |                                               |
+gcal               |                                               |
+gcc                |                                               |
+gettext-examples   |       []       []             [] []           |
+gettext-runtime    | []                                            |
+gettext-tools      | []                                            |
+gip                |                []             []              |
+gjay               |                                               |
+gliv               |                                               |
+glunarclock        |                []                             |
+gnubiff            |                                               |
+gnucash            | ()          ()                      ()     () |
+gnuedu             |                                               |
+gnulib             |                                               |
+gnunet             |                                               |
+gnunet-gtk         |                                               |
+gnutls             |                               []              |
+gold               |                                               |
+gpe-aerial         |                []                             |
+gpe-beam           |                []                             |
+gpe-bluetooth      |                []                []           |
+gpe-calendar       |                []                             |
+gpe-clock          | []    []       []             [] []           |
+gpe-conf           | []             []                             |
+gpe-contacts       | []             []                             |
+gpe-edit           |                []                             |
+gpe-filemanager    | []             []                             |
+gpe-go             | []             []                []           |
+gpe-login          |                []                             |
+gpe-ownerinfo      |                []             []              |
+gpe-package        | []             []                             |
+gpe-sketchbook     | []             []                             |
+gpe-su             | []    []       []             [] [] []        |
+gpe-taskmanager    | [] [] []       []             [] []           |
+gpe-timesheet      |                []             []              |
+gpe-today          |       []       []             [] []           |
+gpe-todo           |                []                   []        |
+gphoto2            |                                               |
+gprof              |                               []              |
+gpsdrive           |                                               |
+gramadoir          |                                               |
+grep               |                                               |
+grub               |                                               |
+gsasl              |                                               |
+gss                |                                               |
+gst-plugins-bad    |             [] []                [] []        |
+gst-plugins-base   |             [] []                             |
+gst-plugins-good   |                []                []           |
+gst-plugins-ugly   |             [] []             [] [] []        |
+gstreamer          |                                               |
+gtick              |                                               |
+gtkam              |                                     []        |
+gtkorphan          |                []                      []     |
+gtkspell           |       []    [] []       []    []    [] []     |
+gutenprint         |                                               |
+hello              | []             []             []              |
+help2man           |                                               |
+hylafax            |                                               |
+idutils            |                                               |
+indent             |                                               |
+iso_15924          |             [] []                             |
+iso_3166           | [] []       () [] [] []    []       []        |
+iso_3166_2         |                                               |
+iso_4217           |             []                      []        |
+iso_639            |                      []    []                 |
+iso_639_3          |                            []                 |
+jwhois             |                []                             |
+kbd                |                                               |
+keytouch           |                []                             |
+keytouch-editor    |                []                             |
+keytouch-keyboa... |                []                             |
+klavaro            |                                     []        |
+latrine            |                []                             |
+ld                 |                                               |
+leafpad            | []          [] []                             |
+libc               | []                                            |
+libexif            |                                               |
+libextractor       |                                               |
+libgnutls          |                               []              |
+libgpewidget       |                []             []              |
+libgpg-error       |                                               |
+libgphoto2         |                                               |
+libgphoto2_port    |                                               |
+libgsasl           |                                               |
+libiconv           |                                               |
+libidn             |                                               |
+lifelines          |                                               |
+liferea            |                                               |
+lilypond           |                                               |
+linkdr             |                                               |
+lordsawar          |                                               |
+lprng              |                                               |
+lynx               |                                               |
+m4                 |                                               |
+mailfromd          |                                               |
+mailutils          |                                               |
+make               | []                                            |
+man-db             |                                               |
+man-db-manpages    |                                               |
+minicom            |                                     []        |
+mkisofs            |                                               |
+myserver           |                                               |
+nano               |                               []    []        |
+opcodes            |                                               |
+parted             |                                               |
+pies               |                                               |
+popt               | []             []                   []        |
+psmisc             |                                               |
+pspp               |                                               |
+pwdutils           |                                               |
+radius             |                                               |
+recode             |                                               |
+rosegarden         |                                               |
+rpm                |                                               |
+rush               |                                               |
+sarg               |                                               |
+screem             |                                               |
+scrollkeeper       |                                     []     [] |
+sed                |                                               |
+sharutils          |                                               |
+shishi             |                                               |
+skencil            |                                               |
+solfege            |                                     []        |
+solfege-manual     |                                               |
+soundtracker       |                                               |
+sp                 |                                               |
+sysstat            |                []                             |
+tar                |       []                                      |
+texinfo            |                                     []        |
+tin                |                                               |
+unicode-han-tra... |                                               |
+unicode-transla... |                                               |
+util-linux-ng      |                                               |
+vice               |                                               |
+vmm                |                                               |
+vorbis-tools       |                                               |
+wastesedge         |                                               |
+wdiff              |                                               |
+wget               |             []                                |
+wyslij-po          |                                               |
+xchat              | []             [] []                          |
+xdg-user-dirs      | [] []       [] [] []       []       [] []     |
+xkeyboard-config   | []    []    []                                |
+                   +-----------------------------------------------+
+                     ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                     20  5 10  1 13 48  4  2  2  4 24 10 20  3   1
 @end group
 
 @group
-                     nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr  sv
-                   +------------------------------------------------------+
-a2ps               |             []     []  []   [] []       []    []  [] |
-aegis              |                        []      []                    |
-anubis             |             []                 []             []  [] |
-aspell             |             []         []   [] []    [] []    []     |
-bash               |             []                       [] []    []  [] |
-bfd                |                                []                    |
-bibshelf           | []          []         []      []       []    []  [] |
-binutils           |                                []    []       []  [] |
-bison              |             []         []                     []  [] |
-bison-runtime      |             []     []  []   [] []       [] [] []  [] |
-bombono-dvd        | []          []                 ()             []     |
-buzztrax           |                                                      |
-ccide              |             []                 []             []     |
-cflow              |             []                                []  [] |
-clisp              |                                []                    |
-coreutils          |             []                 []       []        [] |
-cpio               |             []                 []             []  [] |
-cppi               |             []         []                     []  [] |
-cpplib             |                        []      []             []  [] |
-cryptsetup         |             []                                       |
-denemo             |                                                      |
-dfarc              |             []         []                     []     |
-dialog             |             []         []      []    [] []    []  [] |
-dico               |             []                                       |
-diffutils          |             []                                []  [] |
-dink               |                                                      |
-doodle             |                                            [] []  [] |
-dos2unix           |             []         []      []             []     |
-dos2unix-man       |             []         []                            |
-e2fsprogs          |             []                                    [] |
-enscript           |             []         []   [] []       []    []  [] |
-exif               |             []         []   []       []       []  [] |
-fetchmail          |             []                 []          []     [] |
-findutils          |             []         []      []       []    []  [] |
-flex               |             []         []   [] []             []  [] |
-freedink           |             []         []      []       []    []     |
-fusionforge        |                                                      |
-gas                |                                                      |
-gawk               |             []                                    [] |
-gcal               |                                                   [] |
-gcc                |                                                   [] |
-gdbm               |             []         []                     []     |
-gettext-examples   |             []     []  []   [] []    [] []    []  [] |
-gettext-runtime    | []          []     []  []   [] []    [] []    []  [] |
-gettext-tools      |             []         []   [] []    [] []    []  [] |
-gip                |             []         []      []    []       []  [] |
-gjay               |                                               []     |
-gliv               |             []         []   [] []    []       []  [] |
-glunarclock        |             []         []   []       [] []    []  [] |
-gnome-manual-du... |             []         []      []             []  [] |
-gnubiff            |                                               []  [] |
-gnubik             |             []         []               []    []     |
-gnucash            |             ()         ()      ()                    |
-gnuchess           |                        []                     []     |
-gnuedu             |                        []      []                    |
-gnulib             |             []         []      []       []    []  [] |
-gnunet             |                                                      |
-gnunet-gtk         |                                                      |
-gold               |                                                      |
-gphoto2            |             []         []   [] []    []       []  [] |
-gprof              |                        []   [] []             []  [] |
-gpsdrive           |                                []                 [] |
-gramadoir          |                                      []       []  [] |
-grep               |             []         []      []    [] []    []  [] |
-grub               |             []                 []       []           |
-gsasl              |             []                       []       []  [] |
-gss                |             []              []       []       []  [] |
-gst-plugins-bad    |             []         []      []    []       []     |
-gst-plugins-base   |             []         []      []    [] []    []  [] |
-gst-plugins-good   |             []         []   [] []    [] []    []  [] |
-gst-plugins-ugly   |             []         []   [] []    [] []    []  [] |
-gstreamer          |             []         []   [] []    [] []    []  [] |
-gtick              |             []         []      []    []       []     |
-gtkam              |          [] []         []      []    []       []  [] |
-gtkorphan          |             []         []      []             []  [] |
-gtkspell           |             []     []  []   [] []    [] [] [] []  [] |
-guix               |                        []                     []     |
-gutenprint         |                                         []           |
-hello              |             []         []      []    [] []    []     |
-help2man           |             []         []      []             []     |
-hylafax            |                                                      |
-idutils            |             []                 []             []     |
-indent             |             []         []   [] []    []       []  [] |
-iso_15924          |             []     ()       [] []       []    []     |
-iso_3166           | [] []    [] []     ()  []   [] [] [] [] [] [] []  [] |
-iso_3166_2         |             []     ()                         []     |
-iso_4217           | []          []     ()       [] [] []    []    []  [] |
-iso_639            |    []    [] []     ()       [] [] [] [] []    []  [] |
-iso_639_3          |          []        ()                                |
-iso_639_5          |                    ()                         []     |
-iwhd               |                                               []     |
-jwhois             |             []         []   []                []  [] |
-kbd                |             []              [] []                 [] |
-keytouch           |             []         []            [] []    []  [] |
-keytouch-editor    |             []         []            [] []    []  [] |
-keytouch-keyboa... |             []         []            [] []    []  [] |
-klavaro            |             []         []      []                 [] |
-latrine            |             []                 []             []     |
-ld                 |                                                   [] |
-leafpad            | []    []    []     []  []      []    [] []    []  [] |
-libc               |             []                 []    []           [] |
-libexif            |             []         ()            []              |
-libextractor       |             []                                       |
-libgnutls          |             []                                    [] |
-libgpg-error       |             []              []                    [] |
-libgphoto2         |             []                                       |
-libgphoto2_port    |             []         []      []    []       []  [] |
-libgsasl           |             []              []       []       []  [] |
-libiconv           |             []                       [] []    []  [] |
-libidn             |             []         []                     []  () |
-lifelines          |             []                                    [] |
-liferea            |             []     []  []   [] ()    []    []     [] |
-lilypond           |                                                      |
-linkdr             |                    []          []             []  [] |
-lordsawar          |                                                      |
-lprng              |             []                                       |
-lynx               |                        []      []                 [] |
-m4                 |             []         []   [] []             []  [] |
-mailfromd          |             []                                       |
-mailutils          |             []                                       |
-make               |             []         []      []                 [] |
-man-db             |             []                 []             []     |
-man-db-manpages    |             []                 []             []     |
-midi-instruments   |             []     []  []   [] []    [] []    []  [] |
-minicom            |             []         []   [] []                 [] |
-mkisofs            |             []                 []             []     |
-myserver           |                                         []    []     |
-nano               |             []         []      []       []    []  [] |
-opcodes            |                                                      |
-parted             |             []         []      []    [] []    []  [] |
-pies               |             []                                       |
-popt               |             []     []  []      []       []    []  [] |
-procps-ng          |                                                      |
-psmisc             |             []         []      []             []  [] |
-pspp               |                                                      |
-pushover           |                                                   [] |
-pwdutils           |             []                                    [] |
-pyspread           | []                     []                            |
-radius             |             []                 []                    |
-recode             |             []     []  []   [] []    [] []    []  [] |
-recutils           |                                               []  [] |
-rpm                |             []                                    [] |
-rush               |             []                                []     |
-sarg               |                                                      |
-sed                |             []     []  []   [] []    [] []    []  [] |
-sharutils          |             []         []                     []     |
-shishi             |             []                                []     |
-skencil            |                    []  []                         [] |
-solfege            |             []         []      []                    |
-solfege-manual     |             []         []                            |
-sp                 |                                                      |
-spotmachine        |                        []                     []     |
-sudo               |             []         []      []       []    []     |
-sudoers            |             []         []               []    []     |
-sysstat            |             []         []      []    []       []     |
-tar                |             []         []      []       []    []  [] |
-texinfo            |             []         []      []                    |
-texinfo_document   |             []                                       |
-tin                |                                []                    |
-tin-man            |                                                      |
-tracgoogleappsa... |             []         []      []             []     |
-trader             |                                []                    |
-unicode-han-tra... |                                                      |
-unicode-transla... |                                                      |
-util-linux         |             []         []                            |
-ve                 |             []         []                     []     |
-vice               |                                                   () |
-vmm                |                                                      |
-vorbis-tools       |             []                          []    []  [] |
-wastesedge         |                                                      |
-wcd                |                                                      |
-wcd-man            |                                                      |
-wdiff              |             []         []      []       []    []  [] |
-wget               |             []     []  []      []    [] []    []  [] |
-wyslij-po          | []          []         []                     []     |
-xboard             |             []                                       |
-xchat              |          [] []     []          []    [] [] [] []  [] |
-xdg-user-dirs      | [] []    [] []  [] []  []   [] []    [] [] [] []  [] |
-xkeyboard-config   |             []         []      []       []        [] |
-                   +------------------------------------------------------+
-                     nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr  sv
-                      9  3  1  6 123  1 17  85   34 86  3 46 50  8 104 91
+                     nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                   +---------------------------------------------------+
+a2ps               | []           []     []  []   [] []       []    [] |
+aegis              | []                      []      []                |
+ant-phone          |                         []   []                   |
+anubis             | []           []                 []                |
+aspell             | []                           [] []    [] []       |
+bash               | []                                    []          |
+bfd                |                                 []                |
+bibshelf           | []  []                                            |
+binutils           |                                 []    []          |
+bison              | []           []                 []                |
+bison-runtime      | []           []     []  []   [] []       []       |
+bluez-pin          | []           []         []   [] []    [] []    [] |
+bombono-dvd        |     []                          ()                |
+buzztard           | []  []                                            |
+cflow              |              []                                   |
+clisp              | []                              []                |
+coreutils          | []           []     []  []      []       []       |
+cpio               | []           []                 []                |
+cppi               |              []                                   |
+cpplib             | []                                                |
+cryptsetup         | []                                                |
+dfarc              |              []                                   |
+dialog             | []           []         []      []                |
+dico               |              []                                   |
+diffutils          | []           []         []   [] []             [] |
+dink               | ()                                                |
+doodle             | []                                          []    |
+e2fsprogs          | []           []                                   |
+enscript           | []                      []   [] []       []       |
+exif               | []           []              [] ()    []          |
+fetchmail          | []           []                 []          []    |
+findutils          | []           []     []          []       []       |
+flex               | []           []         []   [] []                |
+freedink           | []           []                                   |
+gas                |                                                   |
+gawk               | []           []         []   []                   |
+gcal               |                                                   |
+gcc                |                                                [] |
+gettext-examples   | []           []     []       [] []    [] []    [] |
+gettext-runtime    | []  []       []     []       [] []    [] []    [] |
+gettext-tools      |              []              [] []    [] []    [] |
+gip                | []           []                 []    []       [] |
+gjay               |                                                   |
+gliv               | []           []         []   [] []    []          |
+glunarclock        | []                      []   []       []       [] |
+gnubiff            | []                           ()                   |
+gnucash            | []           ()         ()      ()                |
+gnuedu             | []                                                |
+gnulib             | []           []                 []       []       |
+gnunet             |                                                   |
+gnunet-gtk         |                                                   |
+gnutls             | []           []                                   |
+gold               |                                                   |
+gpe-aerial         | []                  []  []   [] []       []    [] |
+gpe-beam           | []                  []  []   [] []       []    [] |
+gpe-bluetooth      | []                      []                        |
+gpe-calendar       |                         []      []       []    [] |
+gpe-clock          | []                  []  []   [] []    [] []    [] |
+gpe-conf           | []                  []  []   [] []    [] []       |
+gpe-contacts       |                         []   [] []       []    [] |
+gpe-edit           | []           []                          []       |
+gpe-filemanager    | []                              []       []       |
+gpe-go             | []           []         []   [] []    [] []    [] |
+gpe-login          | []                      []                        |
+gpe-ownerinfo      | []                  []  []   [] []    [] []    [] |
+gpe-package        | []                                       []       |
+gpe-sketchbook     | []                  []  []   [] []       []    [] |
+gpe-su             | []                  []  []   [] []    [] []    [] |
+gpe-taskmanager    | []                  []  []   [] []    [] []    [] |
+gpe-timesheet      | []                  []  []   [] []    [] []    [] |
+gpe-today          | []                  []  []   [] []    [] []    [] |
+gpe-todo           | []                      []      []       []    [] |
+gphoto2            | []        [] []         []   [] []    []       [] |
+gprof              | []                      []   []                   |
+gpsdrive           | []                              []                |
+gramadoir          | []                                    []          |
+grep               | []           []                 []    []          |
+grub               | []           []                 []                |
+gsasl              | []           []                       []       [] |
+gss                |              []              []       []          |
+gst-plugins-bad    | []           []         []      []    []    []    |
+gst-plugins-base   | []           []         []      []    []          |
+gst-plugins-good   | []           []         []      []    []          |
+gst-plugins-ugly   | []           []         []      []    [] []       |
+gstreamer          | []           []         []      []    []          |
+gtick              | []                              []    []          |
+gtkam              | []        [] []         []      []    []          |
+gtkorphan          | []                                                |
+gtkspell           | []           []     []  []   [] []    [] [] [] [] |
+gutenprint         | []                              []                |
+hello              | []           []                       [] []       |
+help2man           |              []                 []                |
+hylafax            | []                                                |
+idutils            | []           []         []   [] []                |
+indent             | []           []         []   [] []    []       [] |
+iso_15924          | []           []                 []       []       |
+iso_3166           | []  [] [] [] []     ()  []   [] [] [] [] [] [] [] |
+iso_3166_2         | []           []                          []       |
+iso_4217           | []  []       []     []          [] []    []    [] |
+iso_639            | []     [] [] []                 [] [] [] []    [] |
+iso_639_3          |        [] []                                      |
+jwhois             | []           []         []   []                   |
+kbd                | []           []              []                   |
+keytouch           | []           []                       []          |
+keytouch-editor    | []           []                       []          |
+keytouch-keyboa... | []           []                       []          |
+klavaro            | []                      []                        |
+latrine            |              []                 []                |
+ld                 |                                                   |
+leafpad            | []  []       []     []  []      []    [] []    [] |
+libc               | []           []                 []    []          |
+libexif            | []           []         ()            []          |
+libextractor       |                                                   |
+libgnutls          | []           []                                   |
+libgpewidget       | []           []                          []       |
+libgpg-error       |              []              []                   |
+libgphoto2         | []           []                                   |
+libgphoto2_port    | []           []         []      []    []          |
+libgsasl           | []           []              []       []       [] |
+libiconv           | []           []                       [] []    [] |
+libidn             | []           []                                   |
+lifelines          | []           []                                   |
+liferea            | []           []     []  []   [] ()    ()    []    |
+lilypond           | []                                                |
+linkdr             | []                  []          []                |
+lordsawar          |                                                   |
+lprng              |              []                                   |
+lynx               | []                      []      []                |
+m4                 | []           []         []   [] []                |
+mailfromd          |              []                                   |
+mailutils          |              []                                   |
+make               | []           []         []      []                |
+man-db             | []           []                 []                |
+man-db-manpages    | []           []                 []                |
+minicom            |              []         []   [] []                |
+mkisofs            | []           []                 []                |
+myserver           |                                                   |
+nano               | []           []         []      []                |
+opcodes            | []                           []                   |
+parted             | []           []                 []    []          |
+pies               |              []                                   |
+popt               | []           []     []          []                |
+psmisc             | []           []                 []                |
+pspp               | []                      []                        |
+pwdutils           |              []                                   |
+radius             | []           []                 []                |
+recode             | []           []     []  []   [] []    [] []       |
+rosegarden         |              ()                 ()                |
+rpm                | []           []     []                            |
+rush               | []           []                                   |
+sarg               |                                                   |
+screem             |                                                   |
+scrollkeeper       | []  []       []              [] []    []    [] [] |
+sed                | []           []     []  []   [] []    [] []    [] |
+sharutils          | []           []                 []             [] |
+shishi             |              []                                   |
+skencil            |                     []  []                        |
+solfege            | []           []         []      []                |
+solfege-manual     | []           []         []                        |
+soundtracker       |                                       []          |
+sp                 |                                                   |
+sysstat            | []           []         []      []                |
+tar                | []           []                 []       []       |
+texinfo            | []           []              [] []                |
+tin                |                                 []                |
+unicode-han-tra... |                                                   |
+unicode-transla... |                                                   |
+util-linux-ng      | []           []         []      []       []       |
+vice               | []                                                |
+vmm                | []                                                |
+vorbis-tools       | []           []                                   |
+wastesedge         | []                                                |
+wdiff              | []           []                                   |
+wget               | []           []     []  []      []    [] []       |
+wyslij-po          | []  []       []                                   |
+xchat              | []        [] []     []          []    [] [] [] [] |
+xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
+xkeyboard-config   | []           []                 []                |
+                   +---------------------------------------------------+
+                     nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                     135 10  4  7 105  1 29  62   47 91  3 54 46  9 37
 @end group
 
 @group
-                     sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK zh_TW
-                   +------------------------------------------------------+
-a2ps               |             [] [] []     []                          | 30
-aegis              |                          []                          |  9
-anubis             |                [] []     []                          | 19
-aspell             |                   []     []  []     []               | 28
-bash               |                [] []     []         []               | 21
-bfd                |                   []     []                          |  9
-bibshelf           |                          []         []               | 25
-binutils           |                   []     []                          | 13
-bison              |                   []     []                     []   | 16
-bison-runtime      |             [] [] []     []         []          []   | 38
-bombono-dvd        |                [] []     []         []               | 14
-buzztrax           |                          []                          |  6
-ccide              |                   []     []                          | 15
-cflow              |                   []     []         []               | 15
-clisp              |                                                      | 10
-coreutils          |                   []     []         []               | 21
-cpio               |                [] []     []         []          []   | 19
-cppi               |                   []     []                          | 14
-cpplib             |                [] []     []         []          []   | 19
-cryptsetup         |                   []     []                          | 10
-denemo             |                                                      |  3
-dfarc              |                          []                          | 16
-dialog             | []          []           []  []     []          []   | 42
-dico               |                   []                                 |  5
-diffutils          |                [] []     []         []               | 18
-dink               |                                                      |  8
-doodle             |                          []                          | 12
-dos2unix           |                   []     []                     []   | 15
-dos2unix-man       |                   []                                 |  7
-e2fsprogs          |                   []     []                          |  9
-enscript           |                [] []     []                          | 21
-exif               |                [] []     []         []               | 25
-fetchmail          |                []        []         []               | 19
-findutils          |                [] []     []         []               | 26
-flex               |                []        []                     []   | 18
-freedink           |             []           []                          | 23
-fusionforge        |                                                      |  3
-gas                |                   []                                 |  5
-gawk               |                          []                          | 11
-gcal               |                []                                    |  6
-gcc                |                                     []               |  5
-gdbm               |                   []     []                          |  8
-gettext-examples   |                [] []     []         []    []    []   | 40
-gettext-runtime    |                [] []     []         []    []    []   | 34
-gettext-tools      |                [] []     []         []          []   | 24
-gip                |             []           []         []          []   | 28
-gjay               |                          []                          |  6
-gliv               |                []        []                          | 15
-glunarclock        |                          []  []     []          []   | 26
-gnome-manual-du... |                [] []                                 | 15
-gnubiff            |                          []                          |  9
-gnubik             |                   []     []                          | 15
-gnucash            |                          ()         []          ()   |  5
-gnuchess           |                   []                                 |  7
-gnuedu             |                          []                     []   | 10
-gnulib             |                   []     []         []               | 23
-gnunet             |                                                      |  1
-gnunet-gtk         |                                                      |  1
-gold               |                   []     []                          |  6
-gphoto2            |                   []     []         []          []   | 19
-gprof              |                [] []     []                          | 20
-gpsdrive           |                          []         []               | 12
-gramadoir          |                          []         []               | 13
-grep               |             []    []     []         []          []   | 28
-grub               |                   []     []                          | 14
-gsasl              |                   []     []         []          []   | 17
-gss                |                          []         []               | 15
-gst-plugins-bad    |                   []     []                          | 15
-gst-plugins-base   |                [] []     []                          | 29
-gst-plugins-good   |                [] []     []         []               | 32
-gst-plugins-ugly   |                [] []     []         []               | 34
-gstreamer          |                   []     []         []               | 29
-gtick              |                   []     []         []               | 18
-gtkam              |                   []     []         []               | 24
-gtkorphan          |                          []         []               | 20
-gtkspell           |             [] [] []     []  []     []    []    []   | 48
-guix               |                                                      |  3
-gutenprint         |                [] []     []                          | 12
-hello              |             [] [] []     []         []          []   | 27
-help2man           |                   []     []                          | 14
-hylafax            |                          []                          |  5
-idutils            |                   []     []         []               | 13
-indent             |                [] []     []         []          []   | 32
-iso_15924          |             () [] []     ()         []          []   | 25
-iso_3166           |       []    () [] []     ()  []     []    []    []   | 60
-iso_3166_2         |             () [] []     ()         []               | 11
-iso_4217           |             () [] []     ()         []    []    []   | 31
-iso_639            |    [] []    () [] []     ()  []     []    []    []   | 48
-iso_639_3          |    []       () [] []     ()                          | 11
-iso_639_5          |             ()    []     ()                          |  2
-iwhd               |                   []     []                          |  7
-jwhois             |                []        []         []          []   | 20
-kbd                |                [] []     []         []               | 18
-keytouch           |                          []         []               | 22
-keytouch-editor    |                          []         []               | 20
-keytouch-keyboa... |                          []         []               | 21
-klavaro            |                   []  [] []     []  []               | 26
-latrine            |                []        []         []               | 16
-ld                 |                [] []     []                     []   | 14
-leafpad            |                [] []     []         []          []   | 39
-libc               |                [] []     []         []          []   | 24
-libexif            |                          []         ()               |  9
-libextractor       |                   []     []                          |  5
-libgnutls          |                   []     []         []               | 13
-libgpg-error       |                   []     []         []               | 13
-libgphoto2         |                   []     []                          |  8
-libgphoto2_port    |                   []     []                     []   | 16
-libgsasl           |                   []     []         []               | 16
-libiconv           |                   []     []  []     []          []   | 27
-libidn             |                   []     []         []               | 16
-lifelines          |                                                      |  5
-liferea            |                [] []     []         []               | 31
-lilypond           |                          []                          |  9
-linkdr             |                []        []         []          []   | 18
-lordsawar          |                                                      |  3
-lprng              |                          []                          |  3
-lynx               |                [] []     []                          | 19
-m4                 |                          []         []          []   | 22
-mailfromd          |                   []     []                          |  3
-mailutils          |                          []                          |  6
-make               |                   []     []                          | 16
-man-db             |                          []         []               | 14
-man-db-manpages    |                                     []               |  9
-midi-instruments   |             [] [] []     []         []          []   | 42
-minicom            |                          []                     []   | 17
-mkisofs            |                   []     []         []               | 13
-myserver           |                          []                          |  9
-nano               |                   []     []         []          []   | 28
-opcodes            |                   []     []                          | 11
-parted             |                [] []     []                     []   | 20
-pies               |                   []     []                          |  4
-popt               |    []       [] []        []         []          []   | 35
-procps-ng          |                   []     []                          |  3
-psmisc             |                   []     []                     []   | 21
-pspp               |                   []                                 |  7
-pushover           |                                                      |  6
-pwdutils           |                          []                          |  8
-pyspread           |                   []                                 |  5
-radius             |                   []     []                          |  9
-recode             |                []        []         []               | 31
-recutils           |                   []     []                          |  8
-rpm                |                          []                     []   | 10
-rush               |                   []     []                          |  8
-sarg               |                                                      |  2
-sed                |                [] []     []         []          []   | 34
-sharutils          |                   []     []                          | 11
-shishi             |                          []                          |  6
-skencil            |                          []                     []   |  8
-solfege            |                []        []         []               | 19
-solfege-manual     |                []                                    |  9
-sp                 |                []                                    |  3
-spotmachine        |                   []     []                          |  8
-sudo               |                [] []     []         []               | 23
-sudoers            |                   []     []         []               | 19
-sysstat            |                [] []     []         []               | 25
-tar                |                [] []     []         []          []   | 28
-texinfo            |                [] []     []                          | 14
-texinfo_document   |                                                      |  6
-tin                |                                                 []   |  5
-tin-man            |                                                      |  1
-tracgoogleappsa... |             []    []     []         []          []   | 20
-trader             |                                                      |  9
-unicode-han-tra... |                                                      |  0
-unicode-transla... |                                                      |  2
-util-linux         |                   []     []         []               | 11
-ve                 |                   []     []                          | 10
-vice               |                ()                                    |  1
-vmm                |                                                      |  3
-vorbis-tools       |                          []                          | 13
-wastesedge         |                                                      |  2
-wcd                |                   []     []                          |  7
-wcd-man            |                   []                                 |  3
-wdiff              |                   []     []                     []   | 21
-wget               |                [] []     []         []               | 29
-wyslij-po          |                   []     []                          | 14
-xboard             |                   []                                 |  6
-xchat              |             []    []     []         []    []    []   | 40
-xdg-user-dirs      |    [] []    [] [] []     []         []    []    []   | 69
-xkeyboard-config   |                   []                            []   | 24
-                   +------------------------------------------------------+
-  91 teams           sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK zh_TW
- 179 domains          1  4  3  0 13 56 110  1 141  7  1  78     8    47    2910
+                     sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+                   +---------------------------------------------------+
+a2ps               | []              [] [] [] []                       | 27
+aegis              |                          []                       |  9
+ant-phone          | []                 []    []      []               |  9
+anubis             | []                 [] [] []                       | 15
+aspell             |                       [] []  []                   | 20
+bash               | []                    [] []                       | 12
+bfd                |                          []                       |  6
+bibshelf           | []                       []      []               | 16
+binutils           |                       [] []                       |  8
+bison              | []                       []                       | 12
+bison-runtime      | []              []    [] []      []          []   | 29
+bluez-pin          | []              [] [] [] []  []  []          []   | 37
+bombono-dvd        |                          []                       |  4
+buzztard           |                          []                       |  7
+cflow              |                       [] []      []               |  9
+clisp              |                                                   | 10
+coreutils          | []                    [] []      []               | 22
+cpio               | []                 [] [] []      []          []   | 13
+cppi               |                       [] []                       |  5
+cpplib             | []                 [] [] []      []          []   | 14
+cryptsetup         | []                       []                       |  7
+dfarc              |                          []                       |  9
+dialog             | []  []          []       []  []  []          []   | 30
+dico               |                       []                          |  2
+diffutils          | []                 [] [] []      []          []   | 30
+dink               |                                                   |  4
+doodle             | []                       []                       |  7
+e2fsprogs          | []                 []    []                       | 11
+enscript           | []                 [] [] []                       | 17
+exif               | []                       []      []               | 16
+fetchmail          |                    []    []      []               | 17
+findutils          | []                 [] [] []      []               | 20
+flex               | []                 []    []                  []   | 15
+freedink           |                          []                       | 10
+gas                |                    []                             |  4
+gawk               | []                 []    []      []               | 18
+gcal               | []                 []                             |  5
+gcc                | []                 []            []               |  7
+gettext-examples   | []                 [] [] []      []    []    []   | 34
+gettext-runtime    | []                 [] [] []      []    []    []   | 29
+gettext-tools      | []                 [] [] []      []          []   | 22
+gip                | []                       []      []          []   | 22
+gjay               |                          []                       |  3
+gliv               | []                 []    []                       | 14
+glunarclock        | []                       []  []  []          []   | 19
+gnubiff            | []                       []                       |  4
+gnucash            |                    () [] ()      []          ()   | 10
+gnuedu             |                          []                  []   |  7
+gnulib             | []                    [] []      []               | 16
+gnunet             |                          []                       |  1
+gnunet-gtk         | []                 []    []                       |  5
+gnutls             | []                       []      []               | 10
+gold               |                          []                       |  4
+gpe-aerial         | []                       []      []               | 18
+gpe-beam           | []                       []      []               | 19
+gpe-bluetooth      | []                       []      []               | 13
+gpe-calendar       | []                       []  []  []               | 12
+gpe-clock          | []                 []    []  []  []               | 28
+gpe-conf           | []                       []  []  []               | 20
+gpe-contacts       | []                       []      []               | 17
+gpe-edit           | []                       []      []               | 12
+gpe-filemanager    | []                       []  []  []               | 16
+gpe-go             | []                 []    []  []  []               | 25
+gpe-login          | []                       []      []               | 11
+gpe-ownerinfo      | []                 []    []      []          []   | 25
+gpe-package        | []                       []      []               | 13
+gpe-sketchbook     | []                       []      []               | 20
+gpe-su             | []                 []    []  []  []               | 30
+gpe-taskmanager    | []                 []    []  []  []               | 29
+gpe-timesheet      | []                 []    []      []          []   | 25
+gpe-today          | []                 []    []  []  []          []   | 30
+gpe-todo           | []                       []  []  []               | 17
+gphoto2            | []                    [] []      []          []   | 24
+gprof              | []                 []    []                       | 15
+gpsdrive           | []                       []      []               | 11
+gramadoir          | []                       []      []               | 11
+grep               |                 []       []      []               | 10
+grub               | []                       []      []               | 14
+gsasl              | []                       []      []          []   | 14
+gss                | []                       []      []               | 11
+gst-plugins-bad    | []                 []    []      []               | 26
+gst-plugins-base   | []                 [] [] []      []               | 24
+gst-plugins-good   | []                 []    []      []               | 24
+gst-plugins-ugly   | []                 [] [] []      []               | 29
+gstreamer          | []                    [] []      []               | 22
+gtick              |                       [] []      []               | 13
+gtkam              | []                       []      []               | 20
+gtkorphan          | []                       []      []               | 14
+gtkspell           | []              [] [] [] []  []  []    []    []   | 45
+gutenprint         | []                                                | 10
+hello              | []              [] []    []      []          []   | 21
+help2man           | []                       []                       |  7
+hylafax            |                          []                       |  5
+idutils            | []                 []    []      []               | 17
+indent             | []                 [] [] []      []          []   | 30
+iso_15924          |                 ()    [] ()      []          []   | 16
+iso_3166           | []        []    () [] [] ()  []  []    []    ()   | 53
+iso_3166_2         |                 ()    [] ()      []               |  9
+iso_4217           | []              () [] [] ()      []    []         | 26
+iso_639            | []     [] []    ()    [] ()  []  []    []    []   | 38
+iso_639_3          |        []                ()                       |  8
+jwhois             | []                 []    []      []          []   | 16
+kbd                | []                 [] [] []      []               | 15
+keytouch           | []                       []      []               | 16
+keytouch-editor    | []                       []      []               | 14
+keytouch-keyboa... | []                       []      []               | 14
+klavaro            |                          []                       | 11
+latrine            |                    []    []      []               | 10
+ld                 | []                 []    []                  []   | 11
+leafpad            | []                 [] [] []      []          []   | 33
+libc               | []                 []    []      []          []   | 21
+libexif            |                          []      ()               |  7
+libextractor       |                          []                       |  1
+libgnutls          | []                       []      []               |  9
+libgpewidget       | []                       []      []               | 14
+libgpg-error       | []                       []      []               |  9
+libgphoto2         |                       [] []                       |  8
+libgphoto2_port    | []                    [] []                  []   | 14
+libgsasl           | []                       []      []               | 13
+libiconv           | []                       []  []  []               | 21
+libidn             | ()                       []      []               | 11
+lifelines          | []                                                |  4
+liferea            | []                 []            []               | 21
+lilypond           |                          []                       |  7
+linkdr             | []                 []    []      []          []   | 17
+lordsawar          |                                                   |  1
+lprng              |                          []                       |  3
+lynx               | []                 [] [] []                       | 17
+m4                 | []                       []      []          []   | 19
+mailfromd          |                       [] []                       |  3
+mailutils          |                          []                       |  5
+make               | []                 []    []      []               | 21
+man-db             | []                       []      []               |  8
+man-db-manpages    |                                                   |  4
+minicom            | []                       []                       | 16
+mkisofs            |                          []      []               |  9
+myserver           |                                                   |  0
+nano               | []                       []      []          []   | 21
+opcodes            | []                 []    []                       | 11
+parted             | []                 [] [] []                  []   | 15
+pies               |                       [] []                       |  3
+popt               | []              [] []    []      []          []   | 27
+psmisc             | []                       []                       | 11
+pspp               |                                                   |  4
+pwdutils           | []                       []                       |  6
+radius             |                       [] []                       |  9
+recode             | []                 []    []      []               | 28
+rosegarden         | ()                                                |  0
+rpm                | []                       []                  []   | 11
+rush               |                       [] []                       |  4
+sarg               |                                                   |  1
+screem             |                          []                       |  3
+scrollkeeper       | []                 [] [] []                  []   | 27
+sed                | []                 []    []      []          []   | 30
+sharutils          | []                 []    []      []          []   | 22
+shishi             |                          []                       |  3
+skencil            | []                       []                       |  7
+solfege            | []                 []    []      []               | 16
+solfege-manual     |                    []                             |  8
+soundtracker       | []                 []    []                       |  9
+sp                 |                    []                             |  3
+sysstat            |                          []      []               | 15
+tar                | []                 [] [] []      []          []   | 23
+texinfo            | []                 [] [] []      []               | 17
+tin                |                                                   |  4
+unicode-han-tra... |                                                   |  0
+unicode-transla... |                                                   |  2
+util-linux-ng      | []                 [] [] []                       | 20
+vice               | ()                 ()                             |  1
+vmm                |                          []                       |  4
+vorbis-tools       |                          []                       |  6
+wastesedge         |                                                   |  2
+wdiff              | []                       []                       |  7
+wget               | []                 []    []      []          []   | 26
+wyslij-po          |                       [] []                       |  8
+xchat              | []              []    [] []      []          []   | 36
+xdg-user-dirs      | []     [] []    [] [] [] []      []    []    []   | 63
+xkeyboard-config   | []                    [] []                       | 22
+                   +---------------------------------------------------+
+  85 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+ 178 domains         119  1  3  3  0 10 65 51 155 17  98     7    41    2618
 @end group
 @end example
diff -Nru gettext-0.19.3/gettext-runtime/doc/nls.texi gettext-0.18.1.1/gettext-runtime/doc/nls.texi
--- gettext-0.19.3/gettext-runtime/doc/nls.texi	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/doc/nls.texi	2010-06-06 12:49:57.000000000 +0000
@@ -1,7 +1,7 @@
 @node Translation Intro
 @chapter Notes on the Free Translation Project
 
-@set STATUS Jun 2014
+@set STATUS June 2010
 
 Free software is going international!  The Free Translation Project is
 a way to get maintainers of free software, translators, and users all
@@ -197,7 +197,7 @@
 
 If you are writing a freely available program and want to internationalize
 it you are welcome to use GNU @file{gettext} in your package.  Of course
-you have to respect the GNU Lesser General Public License which covers
+you have to respect the GNU Library General Public License which covers
 the use of the GNU @file{gettext} library.  This means in particular that
 even non-free programs can use @code{libintl} as a shared library, whereas
 only free software can use @code{libintl} as a static library or use
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/allocator.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/allocator.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/allocator.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/allocator.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#define _GL_USE_STDLIB_ALLOC 1
-#include <config.h>
-#include "allocator.h"
-#include <stdlib.h>
-struct allocator const stdlib_allocator = { malloc, realloc, free, NULL };
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/allocator.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/allocator.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/allocator.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/allocator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/* Memory allocators such as malloc+free.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert.  */
-
-#ifndef _GL_ALLOCATOR_H
-#define _GL_ALLOCATOR_H
-
-#include <stddef.h>
-
-/* An object describing a memory allocator family.  */
-
-struct allocator
-{
-  /* Do not use GCC attributes such as __attribute__ ((malloc)) with
-     the function types pointed at by these members, because these
-     attributes do not work with pointers to functions.  See
-     <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00007.html>.  */
-
-  /* Call ALLOCATE to allocate memory, like 'malloc'.  On failure ALLOCATE
-     should return NULL, though not necessarily set errno.  When given
-     a zero size it may return NULL even if successful.  */
-  void *(*allocate) (size_t);
-
-  /* If nonnull, call REALLOCATE to reallocate memory, like 'realloc'.
-     On failure REALLOCATE should return NULL, though not necessarily set
-     errno.  When given a zero size it may return NULL even if
-     successful.  */
-  void *(*reallocate) (void *, size_t);
-
-  /* Call FREE to free memory, like 'free'.  */
-  void (*free) (void *);
-
-  /* If nonnull, call DIE (SIZE) if MALLOC (SIZE) or REALLOC (...,
-     SIZE) fails.  DIE should not return.  SIZE should equal SIZE_MAX
-     if size_t overflow was detected while calculating sizes to be
-     passed to MALLOC or REALLOC.  */
-  void (*die) (size_t);
-};
-
-/* An allocator using the stdlib functions and a null DIE function.  */
-extern struct allocator const stdlib_allocator;
-
-#endif /* _GL_ALLOCATOR_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/areadlink.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/areadlink.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/areadlink.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/areadlink.c	2010-02-16 21:31:27.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,33 +24,96 @@
 /* Specification.  */
 #include "areadlink.h"
 
-#include "careadlinkat.h"
-
+#include <errno.h>
+#include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-/* Get the symbolic link value of FILENAME and put it into BUFFER, with
-   size BUFFER_SIZE.  This function acts like readlink but has
-   readlinkat's signature.  */
-static ssize_t
-careadlinkatcwd (int fd, char const *filename, char *buffer,
-                 size_t buffer_size)
-{
-  /* FD must be AT_FDCWD here, otherwise the caller is using this
-     function in contexts it was not meant for.  */
-  if (fd != AT_FDCWD)
-    abort ();
-  return readlink (filename, buffer, buffer_size);
-}
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
+
+/* The initial buffer size for the link value.  A power of 2
+   detects arithmetic overflow earlier, but is not required.  */
+enum {
+  INITIAL_BUF_SIZE = 1024
+};
 
 /* Call readlink to get the symbolic link value of FILENAME.
    Return a pointer to that NUL-terminated string in malloc'd storage.
    If readlink fails, return NULL and set errno.
-   If allocation fails, or if the link value is longer than SIZE_MAX :-),
+   If realloc fails, or if the link value is longer than SIZE_MAX :-),
    return NULL and set errno to ENOMEM.  */
 
 char *
 areadlink (char const *filename)
 {
-  return careadlinkat (AT_FDCWD, filename, NULL, 0, NULL, careadlinkatcwd);
+  /* Allocate the initial buffer on the stack.  This way, in the common
+     case of a symlink of small size, we get away with a single small malloc()
+     instead of a big malloc() followed by a shrinking realloc().  */
+  char initial_buf[INITIAL_BUF_SIZE];
+
+  char *buffer = initial_buf;
+  size_t buf_size = sizeof initial_buf;
+
+  while (1)
+    {
+      /* Attempt to read the link into the current buffer.  */
+      ssize_t link_length = readlink (filename, buffer, buf_size);
+
+      /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1
+         with errno == ERANGE if the buffer is too small.  */
+      if (link_length < 0 && errno != ERANGE)
+        {
+          if (buffer != initial_buf)
+            {
+              int saved_errno = errno;
+              free (buffer);
+              errno = saved_errno;
+            }
+          return NULL;
+        }
+
+      if ((size_t) link_length < buf_size)
+        {
+          buffer[link_length++] = '\0';
+
+          /* Return it in a chunk of memory as small as possible.  */
+          if (buffer == initial_buf)
+            {
+              buffer = (char *) malloc (link_length);
+              if (buffer == NULL)
+                /* errno is ENOMEM.  */
+                return NULL;
+              memcpy (buffer, initial_buf, link_length);
+            }
+          else
+            {
+              /* Shrink buffer before returning it.  */
+              if ((size_t) link_length < buf_size)
+                {
+                  char *smaller_buffer = (char *) realloc (buffer, link_length);
+
+                  if (smaller_buffer != NULL)
+                    buffer = smaller_buffer;
+                }
+            }
+          return buffer;
+        }
+
+      if (buffer != initial_buf)
+        free (buffer);
+      buf_size *= 2;
+      if (SSIZE_MAX < buf_size || (SIZE_MAX / 2 < SSIZE_MAX && buf_size == 0))
+        {
+          errno = ENOMEM;
+          return NULL;
+        }
+      buffer = (char *) malloc (buf_size);
+      if (buffer == NULL)
+        /* errno is ENOMEM.  */
+        return NULL;
+    }
 }
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/areadlink.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/areadlink.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/areadlink.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/areadlink.h	2010-02-16 21:31:27.000000000 +0000
@@ -1,6 +1,6 @@
 /* Read symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/basename.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/basename.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/basename.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/basename.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000-2002, 2004, 2006, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002, 2004, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -22,7 +22,7 @@
 /* Specification.  */
 #include "basename.h"
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 
 #include <stdio.h>
 #include <assert.h>
@@ -45,16 +45,16 @@
 #endif
 
 #ifndef _LIBC
-/* We cannot generally use the name 'basename' since XPG defines an unusable
+/* We cannot generally use the name `basename' since XPG defines an unusable
    variant of the function but we cannot use it.  */
 # undef basename
 # define basename gnu_basename
 #endif
 
-/* In general, we can't use the builtin 'basename' function if available,
+/* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
-   In some environments the builtin 'basename' modifies its argument.
-   If NAME is all slashes, be sure to return '/'.  */
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
 basename (char const *name)
@@ -71,7 +71,7 @@
         all_slashes = 0;
     }
 
-  /* If NAME is all slashes, arrange to return '/'.  */
+  /* If NAME is all slashes, arrange to return `/'.  */
   if (*base == '\0' && ISSLASH (*name) && all_slashes)
     --base;
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/basename.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/basename.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/basename.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/basename.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -27,7 +27,7 @@
 #endif
 
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 /* When not using the GNU libc we use the basename implementation we
    provide here.  */
 extern char *gnu_basename (const char *);
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/canonicalize-lgpl.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/canonicalize-lgpl.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/canonicalize-lgpl.c	2010-05-09 01:36:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2014 Free Software Foundation, Inc.
+   Copyright (C) 1996-2010 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
@@ -16,16 +16,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
-/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
-   optimizes away the name == NULL test below.  */
-# define _GL_ARG_NONNULL(params)
-
-# define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
 #if !HAVE_CANONICALIZE_FILE_NAME || !FUNC_REALPATH_WORKS || defined _LIBC
 
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the name == NULL test below.  */
+#define _GL_ARG_NONNULL(params)
+
 /* Specification.  */
 #include <stdlib.h>
 
@@ -51,14 +50,7 @@
 # define __realpath realpath
 # include "pathmax.h"
 # include "malloca.h"
-# include "dosname.h"
 # if HAVE_GETCWD
-#  if IN_RELOCWRAPPER
-    /* When building the relocatable program wrapper, use the system's getcwd
-       function, not the gnulib override, otherwise we would get a link error.
-     */
-#   undef getcwd
-#  endif
 #  ifdef VMS
     /* We want the directory in Unix syntax, not in VMS syntax.  */
 #   define __getcwd(buf, max) getcwd (buf, max, 0)
@@ -85,10 +77,10 @@
 
 #if !FUNC_REALPATH_WORKS || defined _LIBC
 /* Return the canonical absolute name of file NAME.  A canonical name
-   does not contain any ".", ".." components nor any repeated path
+   does not contain any `.', `..' components nor any repeated path
    separators ('/') or symlinks.  All path components must exist.  If
    RESOLVED is null, the result is malloc'd; otherwise, if the
-   canonical name is PATH_MAX chars or more, returns null with 'errno'
+   canonical name is PATH_MAX chars or more, returns null with `errno'
    set to ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars,
    returns the name in RESOLVED.  If the name cannot be resolved and
    RESOLVED is non-NULL, it contains the path of the first component
@@ -102,7 +94,6 @@
   const char *start, *end, *rpath_limit;
   long int path_max;
   int num_links = 0;
-  size_t prefix_len;
 
   if (name == NULL)
     {
@@ -127,7 +118,7 @@
 #else
   path_max = pathconf (name, _PC_PATH_MAX);
   if (path_max <= 0)
-    path_max = 8192;
+    path_max = 1024;
 #endif
 
   if (resolved == NULL)
@@ -145,11 +136,7 @@
     rpath = resolved;
   rpath_limit = rpath + path_max;
 
-  /* This is always zero for Posix hosts, but can be 2 for MS-Windows
-     and MS-DOS X:/foo/bar file names.  */
-  prefix_len = FILE_SYSTEM_PREFIX_LEN (name);
-
-  if (!IS_ABSOLUTE_FILE_NAME (name))
+  if (name[0] != '/')
     {
       if (!__getcwd (rpath, path_max))
         {
@@ -157,28 +144,16 @@
           goto error;
         }
       dest = strchr (rpath, '\0');
-      start = name;
-      prefix_len = FILE_SYSTEM_PREFIX_LEN (rpath);
     }
   else
     {
-      dest = rpath;
-      if (prefix_len)
-        {
-          memcpy (rpath, name, prefix_len);
-          dest += prefix_len;
-        }
-      *dest++ = '/';
-      if (DOUBLE_SLASH_IS_DISTINCT_ROOT)
-        {
-          if (ISSLASH (name[1]) && !ISSLASH (name[2]) && !prefix_len)
-            *dest++ = '/';
-          *dest = '\0';
-        }
-      start = name + prefix_len;
+      rpath[0] = '/';
+      dest = rpath + 1;
+      if (DOUBLE_SLASH_IS_DISTINCT_ROOT && name[1] == '/')
+        *dest++ = '/';
     }
 
-  for (end = start; *start; start = end)
+  for (start = end = name; *start; start = end)
     {
 #ifdef _LIBC
       struct stat64 st;
@@ -188,11 +163,11 @@
       int n;
 
       /* Skip sequence of multiple path-separators.  */
-      while (ISSLASH (*start))
+      while (*start == '/')
         ++start;
 
       /* Find end of path component.  */
-      for (end = start; *end && !ISSLASH (*end); ++end)
+      for (end = start; *end && *end != '/'; ++end)
         /* Nothing.  */;
 
       if (end - start == 0)
@@ -202,19 +177,17 @@
       else if (end - start == 2 && start[0] == '.' && start[1] == '.')
         {
           /* Back up to previous component, ignore if at root already.  */
-          if (dest > rpath + prefix_len + 1)
-            for (--dest; dest > rpath && !ISSLASH (dest[-1]); --dest)
-              continue;
-          if (DOUBLE_SLASH_IS_DISTINCT_ROOT
-              && dest == rpath + 1 && !prefix_len
-              && ISSLASH (*dest) && !ISSLASH (dest[1]))
+          if (dest > rpath + 1)
+            while ((--dest)[-1] != '/');
+          if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
+              && *dest == '/')
             dest++;
         }
       else
         {
           size_t new_size;
 
-          if (!ISSLASH (dest[-1]))
+          if (dest[-1] != '/')
             *dest++ = '/';
 
           if (dest + (end - start) >= rpath_limit)
@@ -225,7 +198,7 @@
               if (resolved)
                 {
                   __set_errno (ENAMETOOLONG);
-                  if (dest > rpath + prefix_len + 1)
+                  if (dest > rpath + 1)
                     dest--;
                   *dest = '\0';
                   goto error;
@@ -315,32 +288,20 @@
               memmove (&extra_buf[n], end, len + 1);
               name = end = memcpy (extra_buf, buf, n);
 
-              if (IS_ABSOLUTE_FILE_NAME (buf))
+              if (buf[0] == '/')
                 {
-                  size_t pfxlen = FILE_SYSTEM_PREFIX_LEN (buf);
-
-                  if (pfxlen)
-                    memcpy (rpath, buf, pfxlen);
-                  dest = rpath + pfxlen;
-                  *dest++ = '/'; /* It's an absolute symlink */
-                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT)
-                    {
-                      if (ISSLASH (buf[1]) && !ISSLASH (buf[2]) && !pfxlen)
-                        *dest++ = '/';
-                      *dest = '\0';
-                    }
-                  /* Install the new prefix to be in effect hereafter.  */
-                  prefix_len = pfxlen;
+                  dest = rpath + 1;     /* It's an absolute symlink */
+                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && buf[1] == '/')
+                    *dest++ = '/';
                 }
               else
                 {
                   /* Back up to previous component, ignore if at root
                      already: */
-                  if (dest > rpath + prefix_len + 1)
-                    for (--dest; dest > rpath && !ISSLASH (dest[-1]); --dest)
-                      continue;
+                  if (dest > rpath + 1)
+                    while ((--dest)[-1] != '/');
                   if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
-                      && ISSLASH (*dest) && !ISSLASH (dest[1]) && !prefix_len)
+                      && *dest == '/')
                     dest++;
                 }
             }
@@ -351,10 +312,9 @@
             }
         }
     }
-  if (dest > rpath + prefix_len + 1 && ISSLASH (dest[-1]))
+  if (dest > rpath + 1 && dest[-1] == '/')
     --dest;
-  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && !prefix_len
-      && ISSLASH (*dest) && !ISSLASH (dest[1]))
+  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && *dest == '/')
     dest++;
   *dest = '\0';
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/careadlinkat.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/careadlinkat.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/careadlinkat.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/careadlinkat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-/* Read symbolic links into a buffer without size limitation, relative to fd.
-
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
-   Inc.
-
-   This 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 Paul Eggert, Bruno Haible, and Jim Meyering.  */
-
-#include <config.h>
-
-#include "careadlinkat.h"
-
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Define this independently so that stdint.h is not a prerequisite.  */
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-
-#ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
-#endif
-
-#include "allocator.h"
-
-/* Assuming the current directory is FD, get the symbolic link value
-   of FILENAME as a null-terminated string and put it into a buffer.
-   If FD is AT_FDCWD, FILENAME is interpreted relative to the current
-   working directory, as in openat.
-
-   If the link is small enough to fit into BUFFER put it there.
-   BUFFER's size is BUFFER_SIZE, and BUFFER can be null
-   if BUFFER_SIZE is zero.
-
-   If the link is not small, put it into a dynamically allocated
-   buffer managed by ALLOC.  It is the caller's responsibility to free
-   the returned value if it is nonnull and is not BUFFER.  A null
-   ALLOC stands for the standard allocator.
-
-   The PREADLINKAT function specifies how to read links.  It operates
-   like POSIX readlinkat()
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
-   but can assume that its first argument is the same as FD.
-
-   If successful, return the buffer address; otherwise return NULL and
-   set errno.  */
-
-char *
-careadlinkat (int fd, char const *filename,
-              char *buffer, size_t buffer_size,
-              struct allocator const *alloc,
-              ssize_t (*preadlinkat) (int, char const *, char *, size_t))
-{
-  char *buf;
-  size_t buf_size;
-  size_t buf_size_max =
-    SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-  char stack_buf[1024];
-
-  if (! alloc)
-    alloc = &stdlib_allocator;
-
-  if (! buffer_size)
-    {
-      /* Allocate the initial buffer on the stack.  This way, in the
-         common case of a symlink of small size, we get away with a
-         single small malloc() instead of a big malloc() followed by a
-         shrinking realloc().  */
-      buffer = stack_buf;
-      buffer_size = sizeof stack_buf;
-    }
-
-  buf = buffer;
-  buf_size = buffer_size;
-
-  do
-    {
-      /* Attempt to read the link into the current buffer.  */
-      ssize_t link_length = preadlinkat (fd, filename, buf, buf_size);
-      size_t link_size;
-      if (link_length < 0)
-        {
-          /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1
-             with errno == ERANGE if the buffer is too small.  */
-          int readlinkat_errno = errno;
-          if (readlinkat_errno != ERANGE)
-            {
-              if (buf != buffer)
-                {
-                  alloc->free (buf);
-                  errno = readlinkat_errno;
-                }
-              return NULL;
-            }
-        }
-
-      link_size = link_length;
-
-      if (link_size < buf_size)
-        {
-          buf[link_size++] = '\0';
-
-          if (buf == stack_buf)
-            {
-              char *b = (char *) alloc->allocate (link_size);
-              buf_size = link_size;
-              if (! b)
-                break;
-              memcpy (b, buf, link_size);
-              buf = b;
-            }
-          else if (link_size < buf_size && buf != buffer && alloc->reallocate)
-            {
-              /* Shrink BUF before returning it.  */
-              char *b = (char *) alloc->reallocate (buf, link_size);
-              if (b)
-                buf = b;
-            }
-
-          return buf;
-        }
-
-      if (buf != buffer)
-        alloc->free (buf);
-
-      if (buf_size <= buf_size_max / 2)
-        buf_size *= 2;
-      else if (buf_size < buf_size_max)
-        buf_size = buf_size_max;
-      else if (buf_size_max < SIZE_MAX)
-        {
-          errno = ENAMETOOLONG;
-          return NULL;
-        }
-      else
-        break;
-      buf = (char *) alloc->allocate (buf_size);
-    }
-  while (buf);
-
-  if (alloc->die)
-    alloc->die (buf_size);
-  errno = ENOMEM;
-  return NULL;
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/careadlinkat.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/careadlinkat.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/careadlinkat.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/careadlinkat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/* Read symbolic links into a buffer without size limitation, relative to fd.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert, Bruno Haible, and Jim Meyering.  */
-
-#ifndef _GL_CAREADLINKAT_H
-#define _GL_CAREADLINKAT_H
-
-#include <fcntl.h>
-#include <unistd.h>
-
-struct allocator;
-
-/* Assuming the current directory is FD, get the symbolic link value
-   of FILENAME as a null-terminated string and put it into a buffer.
-   If FD is AT_FDCWD, FILENAME is interpreted relative to the current
-   working directory, as in openat.
-
-   If the link is small enough to fit into BUFFER put it there.
-   BUFFER's size is BUFFER_SIZE, and BUFFER can be null
-   if BUFFER_SIZE is zero.
-
-   If the link is not small, put it into a dynamically allocated
-   buffer managed by ALLOC.  It is the caller's responsibility to free
-   the returned value if it is nonnull and is not BUFFER.
-
-   The PREADLINKAT function specifies how to read links.  It operates
-   like POSIX readlinkat()
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
-   but can assume that its first argument is the same as FD.
-
-   If successful, return the buffer address; otherwise return NULL and
-   set errno.  */
-
-char *careadlinkat (int fd, char const *filename,
-                    char *buffer, size_t buffer_size,
-                    struct allocator const *alloc,
-                    ssize_t (*preadlinkat) (int, char const *,
-                                            char *, size_t));
-
-/* Suitable value for careadlinkat's FD argument.  */
-#if HAVE_READLINKAT
-/* AT_FDCWD is declared in <fcntl.h>.  */
-#else
-/* Define AT_FDCWD independently, so that the careadlinkat module does
-   not depend on the fcntl-h module.  We might as well use the same value
-   as fcntl-h.  */
-# ifndef AT_FDCWD
-#  define AT_FDCWD (-3041965)
-# endif
-#endif
-
-#endif /* _GL_CAREADLINKAT_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/c-ctype.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-ctype.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/c-ctype.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-ctype.c	2010-02-16 21:31:27.000000000 +0000
@@ -1,6 +1,6 @@
 /* Character handling in C locale.
 
-   Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright 2000-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 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/>.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/c-ctype.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-ctype.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/c-ctype.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-ctype.h	2010-02-16 21:31:27.000000000 +0000
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,7 +18,8 @@
 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/>.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef C_CTYPE_H
 #define C_CTYPE_H
@@ -117,27 +118,26 @@
          if (c_isalpha (*s)) ...
  */
 
-extern bool c_isascii (int c) _GL_ATTRIBUTE_CONST; /* not locale dependent */
+extern bool c_isascii (int c); /* not locale dependent */
 
-extern bool c_isalnum (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isalpha (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isblank (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_iscntrl (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isdigit (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_islower (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isgraph (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isprint (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_ispunct (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isspace (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isupper (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isxdigit (int c) _GL_ATTRIBUTE_CONST;
+extern bool c_isalnum (int c);
+extern bool c_isalpha (int c);
+extern bool c_isblank (int c);
+extern bool c_iscntrl (int c);
+extern bool c_isdigit (int c);
+extern bool c_islower (int c);
+extern bool c_isgraph (int c);
+extern bool c_isprint (int c);
+extern bool c_ispunct (int c);
+extern bool c_isspace (int c);
+extern bool c_isupper (int c);
+extern bool c_isxdigit (int c);
 
-extern int c_tolower (int c) _GL_ATTRIBUTE_CONST;
-extern int c_toupper (int c) _GL_ATTRIBUTE_CONST;
+extern int c_tolower (int c);
+extern int c_toupper (int c);
 
 
-#if (defined __GNUC__ && !defined __STRICT_ANSI__ && defined __OPTIMIZE__ \
-     && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS)
+#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS
 
 /* ASCII optimizations. */
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/closeout.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/closeout.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/closeout.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/closeout.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
    Likewise for standard error.
 
    It's important to detect such failures and exit nonzero because many
-   tools (most notably 'make' and other build-management systems) depend
+   tools (most notably `make' and other build-management systems) depend
    on being able to detect failure in other tools via their exit status.  */
 
 /* Close standard output and standard error, exiting with status EXIT_FAILURE
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/config.charset gettext-0.18.1.1/gettext-runtime/gnulib-lib/config.charset
--- gettext-0.19.3/gettext-runtime/gnulib-lib/config.charset	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/config.charset	2010-05-09 01:36:15.000000000 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
@@ -29,8 +30,6 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name              MIME?             used by which systems
-#                                    (darwin = Mac OS X, woe32 = native Windows)
-#
 #   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
 #   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
 #   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/c-strcasecmp.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-strcasecmp.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/c-strcasecmp.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-strcasecmp.c	2010-02-16 21:31:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/c-strcase.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-strcase.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/c-strcase.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-strcase.h	2010-02-16 21:31:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef C_STRCASE_H
 #define C_STRCASE_H
@@ -39,13 +40,12 @@
 /* Compare strings S1 and S2, ignoring case, returning less than, equal to or
    greater than zero if S1 is lexicographically less than, equal to or greater
    than S2.  */
-extern int c_strcasecmp (const char *s1, const char *s2) _GL_ATTRIBUTE_PURE;
+extern int c_strcasecmp (const char *s1, const char *s2);
 
 /* Compare no more than N characters of strings S1 and S2, ignoring case,
    returning less than, equal to or greater than zero if S1 is
    lexicographically less than, equal to or greater than S2.  */
-extern int c_strncasecmp (const char *s1, const char *s2, size_t n)
-  _GL_ATTRIBUTE_PURE;
+extern int c_strncasecmp (const char *s1, const char *s2, size_t n);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/c-strncasecmp.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-strncasecmp.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/c-strncasecmp.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/c-strncasecmp.c	2010-02-16 21:31:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/dosname.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/dosname.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/dosname.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/dosname.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* File names on MS-DOS/Windows systems.
-
-   Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.
-
-   From Paul Eggert and Jim Meyering.  */
-
-#ifndef _DOSNAME_H
-#define _DOSNAME_H
-
-#if (defined _WIN32 || defined __WIN32__ ||     \
-     defined __MSDOS__ || defined __CYGWIN__ || \
-     defined __EMX__ || defined __DJGPP__)
-   /* This internal macro assumes ASCII, but all hosts that support drive
-      letters use ASCII.  */
-# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a'  \
-                              <= 'z' - 'a')
-# define FILE_SYSTEM_PREFIX_LEN(Filename) \
-          (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
-# ifndef __CYGWIN__
-#  define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
-# endif
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#else
-# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
-# define ISSLASH(C) ((C) == '/')
-#endif
-
-#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
-# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
-#endif
-
-#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
-#  define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
-# else
-#  define IS_ABSOLUTE_FILE_NAME(F)                              \
-     (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0)
-#endif
-#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
-
-#endif /* DOSNAME_H_ */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/errno.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/errno.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/errno.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/errno.in.h	2010-04-25 09:20:41.000000000 +0000
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,137 +13,69 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
-#define _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
+#define _GL_ERRNO_H
 
 
 /* On native Windows platforms, many macros are not defined.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* These are the same values as defined by MSVC 10, for interoperability.  */
+/* POSIX says that EAGAIN and EWOULDBLOCK may have the same value.  */
+#  define EWOULDBLOCK     EAGAIN
 
-#  ifndef ENOMSG
-#   define ENOMSG    122
-#   define GNULIB_defined_ENOMSG 1
-#  endif
-
-#  ifndef EIDRM
-#   define EIDRM     111
-#   define GNULIB_defined_EIDRM 1
-#  endif
-
-#  ifndef ENOLINK
-#   define ENOLINK   121
-#   define GNULIB_defined_ENOLINK 1
-#  endif
-
-#  ifndef EPROTO
-#   define EPROTO    134
-#   define GNULIB_defined_EPROTO 1
-#  endif
-
-#  ifndef EBADMSG
-#   define EBADMSG   104
-#   define GNULIB_defined_EBADMSG 1
-#  endif
-
-#  ifndef EOVERFLOW
-#   define EOVERFLOW 132
-#   define GNULIB_defined_EOVERFLOW 1
-#  endif
-
-#  ifndef ENOTSUP
-#   define ENOTSUP   129
-#   define GNULIB_defined_ENOTSUP 1
-#  endif
-
-#  ifndef ENETRESET
-#   define ENETRESET 117
-#   define GNULIB_defined_ENETRESET 1
-#  endif
-
-#  ifndef ECONNABORTED
-#   define ECONNABORTED 106
-#   define GNULIB_defined_ECONNABORTED 1
-#  endif
-
-#  ifndef ECANCELED
-#   define ECANCELED 105
-#   define GNULIB_defined_ECANCELED 1
-#  endif
-
-#  ifndef EOWNERDEAD
-#   define EOWNERDEAD 133
-#   define GNULIB_defined_EOWNERDEAD 1
-#  endif
-
-#  ifndef ENOTRECOVERABLE
-#   define ENOTRECOVERABLE 127
-#   define GNULIB_defined_ENOTRECOVERABLE 1
-#  endif
-
-#  ifndef EINPROGRESS
-#   define EINPROGRESS     112
-#   define EALREADY        103
-#   define ENOTSOCK        128
-#   define EDESTADDRREQ    109
-#   define EMSGSIZE        115
-#   define EPROTOTYPE      136
-#   define ENOPROTOOPT     123
-#   define EPROTONOSUPPORT 135
-#   define EOPNOTSUPP      130
-#   define EAFNOSUPPORT    102
-#   define EADDRINUSE      100
-#   define EADDRNOTAVAIL   101
-#   define ENETDOWN        116
-#   define ENETUNREACH     118
-#   define ECONNRESET      108
-#   define ENOBUFS         119
-#   define EISCONN         113
-#   define ENOTCONN        126
-#   define ETIMEDOUT       138
-#   define ECONNREFUSED    107
-#   define ELOOP           114
-#   define EHOSTUNREACH    110
-#   define EWOULDBLOCK     140
-#   define GNULIB_defined_ESOCK 1
-#  endif
-
-#  ifndef ETXTBSY
-#   define ETXTBSY         139
-#   define ENODATA         120  /* not required by POSIX */
-#   define ENOSR           124  /* not required by POSIX */
-#   define ENOSTR          125  /* not required by POSIX */
-#   define ETIME           137  /* not required by POSIX */
-#   define EOTHER          131  /* not required by POSIX */
-#   define GNULIB_defined_ESTREAMS 1
-#  endif
+/* Values >= 100 seem safe to use.  */
+#  define ETXTBSY   100
+#  define GNULIB_defined_ETXTBSY 1
 
 /* These are intentionally the same values as the WSA* error numbers, defined
    in <winsock2.h>.  */
+#  define EINPROGRESS     10036
+#  define EALREADY        10037
+#  define ENOTSOCK        10038
+#  define EDESTADDRREQ    10039
+#  define EMSGSIZE        10040
+#  define EPROTOTYPE      10041
+#  define ENOPROTOOPT     10042
+#  define EPROTONOSUPPORT 10043
 #  define ESOCKTNOSUPPORT 10044  /* not required by POSIX */
+#  define EOPNOTSUPP      10045
 #  define EPFNOSUPPORT    10046  /* not required by POSIX */
+#  define EAFNOSUPPORT    10047
+#  define EADDRINUSE      10048
+#  define EADDRNOTAVAIL   10049
+#  define ENETDOWN        10050
+#  define ENETUNREACH     10051
+#  define ENETRESET       10052
+#  define ECONNABORTED    10053
+#  define ECONNRESET      10054
+#  define ENOBUFS         10055
+#  define EISCONN         10056
+#  define ENOTCONN        10057
 #  define ESHUTDOWN       10058  /* not required by POSIX */
 #  define ETOOMANYREFS    10059  /* not required by POSIX */
+#  define ETIMEDOUT       10060
+#  define ECONNREFUSED    10061
+#  define ELOOP           10062
 #  define EHOSTDOWN       10064  /* not required by POSIX */
+#  define EHOSTUNREACH    10065
 #  define EPROCLIM        10067  /* not required by POSIX */
 #  define EUSERS          10068  /* not required by POSIX */
 #  define EDQUOT          10069
 #  define ESTALE          10070
 #  define EREMOTE         10071  /* not required by POSIX */
-#  define GNULIB_defined_EWINSOCK 1
+#  define GNULIB_defined_ESOCK 1
 
 # endif
 
@@ -166,7 +98,6 @@
 
 /* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK,
    EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined.
-   Likewise, on NonStop Kernel, EDQUOT is not defined.
    Define them here.  Values >= 2000 seem safe to use: Solaris ESTALE = 151,
    HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133.
 
@@ -214,66 +145,16 @@
 #  define GNULIB_defined_ENOTSUP 1
 # endif
 
-# ifndef ENETRESET
-#  define ENETRESET 2011
-#  define GNULIB_defined_ENETRESET 1
-# endif
-
-# ifndef ECONNABORTED
-#  define ECONNABORTED 2012
-#  define GNULIB_defined_ECONNABORTED 1
-# endif
-
 # ifndef ESTALE
 #  define ESTALE    2009
 #  define GNULIB_defined_ESTALE 1
 # endif
 
-# ifndef EDQUOT
-#  define EDQUOT 2010
-#  define GNULIB_defined_EDQUOT 1
-# endif
-
 # ifndef ECANCELED
 #  define ECANCELED 2008
 #  define GNULIB_defined_ECANCELED 1
 # endif
 
-/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not
-   defined.  */
-
-# ifndef EOWNERDEAD
-#  if defined __sun
-    /* Use the same values as defined for Solaris >= 8, for
-       interoperability.  */
-#   define EOWNERDEAD      58
-#   define ENOTRECOVERABLE 59
-#  elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-    /* We have a conflict here: pthreads-win32 defines these values
-       differently than MSVC 10.  It's hairy to decide which one to use.  */
-#   if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
-     /* Use the same values as defined by pthreads-win32, for
-        interoperability.  */
-#    define EOWNERDEAD      43
-#    define ENOTRECOVERABLE 44
-#   else
-     /* Use the same values as defined by MSVC 10, for
-        interoperability.  */
-#    define EOWNERDEAD      133
-#    define ENOTRECOVERABLE 127
-#   endif
-#  else
-#   define EOWNERDEAD      2013
-#   define ENOTRECOVERABLE 2014
-#  endif
-#  define GNULIB_defined_EOWNERDEAD 1
-#  define GNULIB_defined_ENOTRECOVERABLE 1
-# endif
-
-# ifndef EILSEQ
-#  define EILSEQ 2015
-#  define GNULIB_defined_EILSEQ 1
-# endif
 
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
+#endif /* _GL_ERRNO_H */
+#endif /* _GL_ERRNO_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/error.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/error.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/error.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/error.c	2010-05-09 11:03:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2010 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
@@ -39,9 +39,6 @@
 # include <stdint.h>
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs
-# define USE_UNLOCKED_IO 0
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
-# define _GL_ARG_NONNULL(a)
 #endif
 
 #if USE_UNLOCKED_IO
@@ -57,7 +54,7 @@
    function without parameters instead.  */
 void (*error_print_progname) (void);
 
-/* This variable is incremented each time 'error' is called.  */
+/* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count;
 
 #ifdef _LIBC
@@ -68,21 +65,21 @@
 # include <limits.h>
 # include <libio/libioP.h>
 
-/* In GNU libc we want do not want to use the common name 'error' directly.
+/* In GNU libc we want do not want to use the common name `error' directly.
    Instead make it a weak alias.  */
 extern void __error (int status, int errnum, const char *message, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __error_at_line (int status, int errnum, const char *file_name,
                              unsigned int line_number, const char *message,
                              ...)
-     __attribute__ ((__format__ (__printf__, 5, 6)));
+     __attribute__ ((__format__ (__printf__, 5, 6)));;
 # define error __error
 # define error_at_line __error_at_line
 
 # include <libio/iolibio.h>
-# define fflush(s) _IO_fflush (s)
+# define fflush(s) INTUSE(_IO_fflush) (s)
 # undef putc
-# define putc(c, fp) _IO_putc (c, fp)
+# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
 
 # include <bits/libc-lock.h>
 
@@ -92,25 +89,19 @@
 # include <unistd.h>
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-/* Get _get_osfhandle.  */
-#  include "msvc-nothrow.h"
 # endif
 
 /* The gnulib override of fcntl is not needed in this file.  */
 # undef fcntl
 
-# if !HAVE_DECL_STRERROR_R
+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
 #  endif
-#  if STRERROR_R_CHAR_P
 char *strerror_r ();
-#  else
-int strerror_r ();
-#  endif
 # endif
 
 /* The calling program should define program_name and set it to the
@@ -124,14 +115,13 @@
 
 #if !_LIBC
 /* Return non-zero if FD is open.  */
-static int
+static inline int
 is_open (int fd)
 {
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows: The initial state of unassigned standard file
-     descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
-     There is no fcntl, and the gnulib replacement fcntl does not support
-     F_GETFL.  */
+  /* On Win32: The initial state of unassigned standard file descriptors is
+     that they are open but point to an INVALID_HANDLE_VALUE.  There is no
+     fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
 # else
 #  ifndef F_GETFL
@@ -142,7 +132,7 @@
 }
 #endif
 
-static void
+static inline void
 flush_stdout (void)
 {
 #if !_LIBC
@@ -174,7 +164,7 @@
 
 #if defined HAVE_STRERROR_R || _LIBC
   char errbuf[1024];
-# if _LIBC || STRERROR_R_CHAR_P
+# if STRERROR_R_CHAR_P || _LIBC
   s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else
   if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
@@ -198,12 +188,13 @@
 #endif
 }
 
-static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
+static void
 error_tail (int status, int errnum, const char *message, va_list args)
 {
 #if _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     {
+# define ALLOCA_LIMIT 2000
       size_t len = strlen (message) + 1;
       wchar_t *wmessage = NULL;
       mbstate_t st;
@@ -239,7 +230,7 @@
           if (res != len)
             break;
 
-          if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
+          if (__builtin_expect (len >= SIZE_MAX / 2, 0))
             {
               /* This really should not happen if everything is fine.  */
               res = (size_t) -1;
@@ -344,10 +335,7 @@
 
       if (old_line_number == line_number
           && (file_name == old_file_name
-              || (old_file_name != NULL
-                  && file_name != NULL
-                  && strcmp (old_file_name, file_name) == 0)))
-
+              || strcmp (old_file_name, file_name) == 0))
         /* Simply return and print nothing.  */
         return;
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/error.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/error.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/error.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/error.h	2010-02-16 21:31:27.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 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
@@ -19,48 +19,39 @@
 #ifndef _ERROR_H
 #define _ERROR_H 1
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-#if GNULIB_REPLACE_ERROR
-# undef error_print_progname
-# undef error_message_count
-# undef error_one_per_line
-# define error_print_progname rpl_error_print_progname
-# define error_message_count rpl_error_message_count
-# define error_one_per_line rpl_error_one_per_line
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Print a message with 'fprintf (stderr, FORMAT, ...)';
+/* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
 
 extern void error (int __status, int __errnum, const char *__format, ...)
-     _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
+     __attribute__ ((__format__ (__printf__, 3, 4)));
 
 extern void error_at_line (int __status, int __errnum, const char *__fname,
                            unsigned int __lineno, const char *__format, ...)
-     _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6));
+     __attribute__ ((__format__ (__printf__, 5, 6)));
 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
 extern DLL_VARIABLE void (*error_print_progname) (void);
 
-/* This variable is incremented each time 'error' is called.  */
+/* This variable is incremented each time `error' is called.  */
 extern DLL_VARIABLE unsigned int error_message_count;
 
 /* Sometimes we want to have at most one error per line.  This
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/fwriteerror.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/fwriteerror.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/fwriteerror.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/fwriteerror.c	2010-02-16 21:31:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@
      or if fclose failed, with two exceptions:
        - Ignore an fclose failure if there was no previous error, no data
          remains to be flushed, and fclose failed with EBADF.  That can
-         happen when a program like cp is invoked like this 'cp a b >&-'
+         happen when a program like cp is invoked like this `cp a b >&-'
          (i.e., with standard output closed) and doesn't generate any
          output (hence no previous error and nothing to be flushed).
        - Ignore an fclose failure due to EPIPE.  That can happen when a
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/fwriteerror.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/fwriteerror.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/fwriteerror.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/fwriteerror.h	2010-02-16 21:31:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/getopt1.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt1.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/getopt1.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt1.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
+   1998, 2004, 2006, 2009, 2010 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
@@ -141,11 +141,11 @@
           break;
 
         case 'c':
-          printf ("option c with value '%s'\n", optarg);
+          printf ("option c with value `%s'\n", optarg);
           break;
 
         case 'd':
-          printf ("option d with value '%s'\n", optarg);
+          printf ("option d with value `%s'\n", optarg);
           break;
 
         case '?':
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/getopt.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/getopt.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt.c	2010-04-25 09:20:41.000000000 +0000
@@ -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-2014 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -41,15 +41,15 @@
 # include <wchar.h>
 #endif
 
-/* This version of 'getopt' appears to the caller like standard Unix 'getopt'
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
 
-   As 'getopt_long' works, it permutes the elements of ARGV so that,
+   As `getopt_long' works, it permutes the elements of ARGV so that,
    when it is done, all the options precede everything else.  Thus
    all application programs are extended to handle flexible argument order.
 
-   Using 'getopt' or setting the environment variable POSIXLY_CORRECT
+   Using `getopt' or setting the environment variable POSIXLY_CORRECT
    disables permutation.
    Then the behavior is completely standard.
 
@@ -58,24 +58,24 @@
 
 #include "getopt_int.h"
 
-/* For communication from 'getopt' to the caller.
-   When 'getopt' finds an option that takes an argument,
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
    the argument value is returned here.
-   Also, when 'ordering' is RETURN_IN_ORDER,
+   Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
 char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to 'getopt'.
+   and for communication between successive calls to `getopt'.
 
-   On entry to 'getopt', zero means this is the first call; initialize.
+   On entry to `getopt', zero means this is the first call; initialize.
 
-   When 'getopt' returns -1, this is the index of the first of the
+   When `getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, 'optind' communicates from one call to the next
+   Otherwise, `optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 /* 1003.2 says this must be 1 before any call.  */
@@ -137,7 +137,7 @@
    The other is elements [last_nonopt,optind), which contains all
    the options processed since those non-options were skipped.
 
-   'first_nonopt' and 'last_nonopt' are relocated so that they describe
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
    the new indices of the non-options in ARGV after they are moved.  */
 
 static void
@@ -154,7 +154,7 @@
      but it consists of two parts that need to be swapped next.  */
 
 #if defined _LIBC && defined USE_NONOPTION_FLAGS
-  /* First make sure the handling of the '__getopt_nonoption_flags'
+  /* First make sure the handling of the `__getopt_nonoption_flags'
      string can work normally.  Our top argument must be in the range
      of the string.  */
   if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
@@ -291,48 +291,48 @@
 
    If an element of ARGV starts with '-', and is not exactly "-" or "--",
    then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If 'getopt'
+   (aside from the initial '-') are option characters.  If `getopt'
    is called repeatedly, it returns successively each of the option characters
    from each of the option elements.
 
-   If 'getopt' finds another option character, it returns that character,
-   updating 'optind' and 'nextchar' so that the next call to 'getopt' can
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
    resume the scan with the following option character or ARGV-element.
 
-   If there are no more option characters, 'getopt' returns -1.
-   Then 'optind' is the index in ARGV of the first ARGV-element
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
    that is not an option.  (The ARGV-elements have been permuted
    so that those that are not options now come last.)
 
    OPTSTRING is a string containing the legitimate option characters.
    If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set 'opterr' to
+   return '?' after printing an error message.  If you set `opterr' to
    zero, the error message is suppressed but we still return '?'.
 
    If a char in OPTSTRING is followed by a colon, that means it wants an arg,
    so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in 'optarg'.  Two colons mean an option that
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
    wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in 'optarg', otherwise 'optarg' is set to zero.
+   it is returned in `optarg', otherwise `optarg' is set to zero.
 
-   If OPTSTRING starts with '-' or '+', it requests different methods of
+   If OPTSTRING starts with `-' or `+', it requests different methods of
    handling the non-option ARGV-elements.
    See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
 
-   Long-named options begin with '--' instead of '-'.
+   Long-named options begin with `--' instead of `-'.
    Their names may be abbreviated as long as the abbreviation is unique
    or is an exact match for some defined option.  If they have an
    argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a '=', or else the in next ARGV-element.
-   When 'getopt' finds a long-named option, it returns 0 if that option's
-   'flag' field is nonzero, the value of the option's 'val' field
-   if the 'flag' field is zero.
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
 
    The elements of ARGV aren't really const, because we permute them.
    But we pretend they're const in the prototype to be compatible
    with other systems.
 
-   LONGOPTS is a vector of 'struct option' terminated by an
+   LONGOPTS is a vector of `struct option' terminated by an
    element containing a name which is zero.
 
    LONGIND returns the index in LONGOPT of the long-named option found.
@@ -409,7 +409,7 @@
           d->__last_nonopt = d->optind;
         }
 
-      /* The special ARGV-element '--' means premature end of options.
+      /* The special ARGV-element `--' means premature end of options.
          Skip it like a null option,
          then exchange with previous non-options as if it were an option,
          then skip everything else like a non-option.  */
@@ -479,28 +479,23 @@
                             || !strchr (optstring, argv[d->optind][1])))))
     {
       char *nameend;
-      unsigned int namelen;
       const struct option *p;
       const struct option *pfound = NULL;
-      struct option_list
-      {
-        const struct option *p;
-        struct option_list *next;
-      } *ambig_list = NULL;
       int exact = 0;
+      int ambig = 0;
       int indfound = -1;
       int option_index;
 
       for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
         /* Do nothing.  */ ;
-      namelen = nameend - d->__nextchar;
 
       /* Test all long options for either exact match
          or abbreviated matches.  */
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
-        if (!strncmp (p->name, d->__nextchar, namelen))
+        if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
           {
-            if (namelen == (unsigned int) strlen (p->name))
+            if ((unsigned int) (nameend - d->__nextchar)
+                == (unsigned int) strlen (p->name))
               {
                 /* Exact match found.  */
                 pfound = p;
@@ -518,71 +513,35 @@
                      || pfound->has_arg != p->has_arg
                      || pfound->flag != p->flag
                      || pfound->val != p->val)
-              {
-                /* Second or later nonexact match found.  */
-                struct option_list *newp = malloc (sizeof (*newp));
-                newp->p = p;
-                newp->next = ambig_list;
-                ambig_list = newp;
-              }
+              /* Second or later nonexact match found.  */
+              ambig = 1;
           }
 
-      if (ambig_list != NULL && !exact)
+      if (ambig && !exact)
         {
           if (print_errors)
             {
-              struct option_list first;
-              first.p = pfound;
-              first.next = ambig_list;
-              ambig_list = &first;
-
 #if defined _LIBC && defined USE_IN_LIBIO
-              char *buf = NULL;
-              size_t buflen = 0;
+              char *buf;
 
-              FILE *fp = open_memstream (&buf, &buflen);
-              if (fp != NULL)
+              if (__asprintf (&buf, _("%s: option '%s' is ambiguous\n"),
+                              argv[0], argv[d->optind]) >= 0)
                 {
-                  fprintf (fp,
-                           _("%s: option '%s' is ambiguous; possibilities:"),
-                           argv[0], argv[d->optind]);
-
-                  do
-                    {
-                      fprintf (fp, " '--%s'", ambig_list->p->name);
-                      ambig_list = ambig_list->next;
-                    }
-                  while (ambig_list != NULL);
-
-                  fputc_unlocked ('\n', fp);
-
-                  if (__builtin_expect (fclose (fp) != EOF, 1))
-                    {
-                      _IO_flockfile (stderr);
+                  _IO_flockfile (stderr);
 
-                      int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                      ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-                      __fxprintf (NULL, "%s", buf);
+                  __fxprintf (NULL, "%s", buf);
 
-                      ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                      _IO_funlockfile (stderr);
+                  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                  _IO_funlockfile (stderr);
 
-                      free (buf);
-                    }
+                  free (buf);
                 }
 #else
-              fprintf (stderr,
-                       _("%s: option '%s' is ambiguous; possibilities:"),
+              fprintf (stderr, _("%s: option '%s' is ambiguous\n"),
                        argv[0], argv[d->optind]);
-              do
-                {
-                  fprintf (stderr, " '--%s'", ambig_list->p->name);
-                  ambig_list = ambig_list->next;
-                }
-              while (ambig_list != NULL);
-
-              fputc ('\n', stderr);
 #endif
             }
           d->__nextchar += strlen (d->__nextchar);
@@ -591,13 +550,6 @@
           return '?';
         }
 
-      while (ambig_list != NULL)
-        {
-          struct option_list *pn = ambig_list->next;
-          free (ambig_list);
-          ambig_list = pn;
-        }
-
       if (pfound != NULL)
         {
           option_index = indfound;
@@ -788,7 +740,7 @@
     char c = *d->__nextchar++;
     const char *temp = strchr (optstring, c);
 
-    /* Increment 'optind' when we start to process its last character.  */
+    /* Increment `optind' when we start to process its last character.  */
     if (*d->__nextchar == '\0')
       ++d->optind;
 
@@ -839,9 +791,6 @@
         int indfound = 0;
         int option_index;
 
-        if (longopts == NULL)
-          goto no_longs;
-
         /* This is an option that requires an argument.  */
         if (*d->__nextchar != '\0')
           {
@@ -887,7 +836,7 @@
             return c;
           }
         else
-          /* We already incremented 'd->optind' once;
+          /* We already incremented `d->optind' once;
              increment it again when taking next ARGV-elt as argument.  */
           d->optarg = argv[d->optind++];
 
@@ -1049,10 +998,8 @@
               }
             return pfound->val;
           }
-
-      no_longs:
-        d->__nextchar = NULL;
-        return 'W';   /* Let the application handle it.   */
+          d->__nextchar = NULL;
+          return 'W';   /* Let the application handle it.   */
       }
     if (temp[1] == ':')
       {
@@ -1114,7 +1061,7 @@
                   c = '?';
               }
             else
-              /* We already incremented 'optind' once;
+              /* We already incremented `optind' once;
                  increment it again when taking next ARGV-elt as argument.  */
               d->optarg = argv[d->optind++];
             d->__nextchar = NULL;
@@ -1177,7 +1124,7 @@
 #ifdef TEST
 
 /* Compile with -DTEST to make an executable for use in testing
-   the above definition of 'getopt'.  */
+   the above definition of `getopt'.  */
 
 int
 main (int argc, char **argv)
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/getopt.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/getopt.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt.in.h	2010-04-25 09:20:41.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,12 +16,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 _@GUARD_PREFIX@_GETOPT_H
+#ifndef _GL_GETOPT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  We must
    also inform the replacement unistd.h to not recursively use
@@ -32,10 +31,10 @@
 # undef _GL_SYSTEM_GETOPT
 #endif
 
-#ifndef _@GUARD_PREFIX@_GETOPT_H
+#ifndef _GL_GETOPT_H
 
 #ifndef __need_getopt
-# define _@GUARD_PREFIX@_GETOPT_H 1
+# define _GL_GETOPT_H 1
 #endif
 
 /* Ensure that DLL_VARIABLE is defined.  Since on OSF/1 4.0 and Irix 6.5
@@ -57,9 +56,7 @@
    linkers.  */
 #if defined __GETOPT_PREFIX && !defined __need_getopt
 # if !@HAVE_GETOPT_H@
-#  define __need_system_stdlib_h
 #  include <stdlib.h>
-#  undef __need_system_stdlib_h
 #  include <stdio.h>
 #  include <unistd.h>
 # endif
@@ -92,7 +89,7 @@
    getopt_long_only can permute argv; this is required for backward
    compatibility (e.g., for LSB 2.0.1).
 
-   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',
+   This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt',
    but it caused redefinition warnings if both unistd.h and getopt.h were
    included, since unistd.h includes getopt.h having previously defined
    __need_getopt.
@@ -138,29 +135,29 @@
 extern "C" {
 #endif
 
-/* For communication from 'getopt' to the caller.
-   When 'getopt' finds an option that takes an argument,
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
    the argument value is returned here.
-   Also, when 'ordering' is RETURN_IN_ORDER,
+   Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
 extern DLL_VARIABLE char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to 'getopt'.
+   and for communication between successive calls to `getopt'.
 
-   On entry to 'getopt', zero means this is the first call; initialize.
+   On entry to `getopt', zero means this is the first call; initialize.
 
-   When 'getopt' returns -1, this is the index of the first of the
+   When `getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, 'optind' communicates from one call to the next
+   Otherwise, `optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 extern DLL_VARIABLE int optind;
 
-/* Callers store zero here to inhibit the error message 'getopt' prints
+/* Callers store zero here to inhibit the error message `getopt' prints
    for unrecognized options.  */
 
 extern DLL_VARIABLE int opterr;
@@ -172,26 +169,25 @@
 #ifndef __need_getopt
 /* Describe the long-named options requested by the application.
    The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of 'struct option' terminated by an element containing a name which is
+   of `struct option' terminated by an element containing a name which is
    zero.
 
-   The field 'has_arg' is:
+   The field `has_arg' is:
    no_argument          (or 0) if the option does not take an argument,
    required_argument    (or 1) if the option requires an argument,
    optional_argument    (or 2) if the option takes an optional argument.
 
-   If the field 'flag' is not NULL, it points to a variable that is set
-   to the value given in the field 'val' when the option is found, but
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
    left unchanged if the option is not found.
 
-   To have a long-named option do something other than set an 'int' to
-   a compiled-in constant, such as set a value from 'optarg', set the
-   option's 'flag' field to zero and its 'val' field to a nonzero
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
    value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero 'flag' field, 'getopt'
-   returns the contents of the 'val' field.  */
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
 
-# if !GNULIB_defined_struct_option
 struct option
 {
   const char *name;
@@ -201,10 +197,8 @@
   int *flag;
   int val;
 };
-#  define GNULIB_defined_struct_option 1
-# endif
 
-/* Names for the values of the 'has_arg' field of 'struct option'.  */
+/* Names for the values of the `has_arg' field of `struct option'.  */
 
 # define no_argument            0
 # define required_argument      1
@@ -218,23 +212,23 @@
 
    Return the option character from OPTS just read.  Return -1 when
    there are no more options.  For unrecognized options, or options
-   missing arguments, 'optopt' is set to the option letter, and '?' is
+   missing arguments, `optopt' is set to the option letter, and '?' is
    returned.
 
    The OPTS string is a list of characters which are recognized option
    letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in 'optarg'.
+   takes an argument, to be placed in `optarg'.
 
    If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU 'getopt'.
+   optional.  This behavior is specific to the GNU `getopt'.
 
-   The argument '--' causes premature termination of argument
-   scanning, explicitly telling 'getopt' that there are no more
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
    options.
 
-   If OPTS begins with '-', then non-option arguments are treated as
+   If OPTS begins with `-', then non-option arguments are treated as
    arguments to the option '\1'.  This behavior is specific to the GNU
-   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
+   `getopt'.  If OPTS begins with `+', or POSIXLY_CORRECT is set in
    the environment, then do not permute arguments.  */
 
 extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
@@ -259,5 +253,5 @@
 /* Make sure we later can get all the definitions and declarations.  */
 #undef __need_getopt
 
-#endif /* _@GUARD_PREFIX@_GETOPT_H */
-#endif /* _@GUARD_PREFIX@_GETOPT_H */
+#endif /* getopt.h */
+#endif /* getopt.h */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/getopt_int.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt_int.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/getopt_int.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/getopt_int.h	2010-04-25 09:20:41.000000000 +0000
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -40,7 +40,7 @@
    stop option processing when the first non-option is seen.
    This is what Unix does.
    This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using '+' as the first character
+   variable POSIXLY_CORRECT, or using `+' as the first character
    of the list of option characters, or by calling getopt.
 
    PERMUTE is the default.  We permute the contents of ARGV as we
@@ -52,12 +52,12 @@
    written to expect options and other ARGV-elements in any order
    and that care about the ordering of the two.  We describe each
    non-option ARGV-element as if it were the argument of an option
-   with character code 1.  Using '-' as the first character of the
+   with character code 1.  Using `-' as the first character of the
    list of option characters selects this mode of operation.
 
-   The special argument '--' forces an end of option-scanning regardless
-   of the value of 'ordering'.  In the case of RETURN_IN_ORDER, only
-   '--' can cause 'getopt' to return -1 with 'optind' != ARGC.  */
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
 
 enum __ord
   {
@@ -99,8 +99,8 @@
   /* Handle permutation of arguments.  */
 
   /* Describe the part of ARGV that contains non-options that have
-     been skipped.  'first_nonopt' is the index in ARGV of the first
-     of them; 'last_nonopt' is the index after the last of them.  */
+     been skipped.  `first_nonopt' is the index in ARGV of the first
+     of them; `last_nonopt' is the index after the last of them.  */
 
   int __first_nonopt;
   int __last_nonopt;
@@ -108,7 +108,7 @@
 #if defined _LIBC && defined USE_NONOPTION_FLAGS
   int __nonoption_flags_max_len;
   int __nonoption_flags_len;
-#endif
+# endif
 };
 
 /* The initializer is necessary to set OPTIND and OPTERR to their
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/gettext.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/gettext.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/gettext.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/gettext.h	2009-12-12 11:36:49.000000000 +0000
@@ -1,18 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -52,7 +54,7 @@
    it now, to make later inclusions of <libintl.h> a NOP.  */
 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
 # include <cstdlib>
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
 #  include <libintl.h>
 # endif
 #endif
@@ -79,7 +81,7 @@
     ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
 # undef dcngettext
 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N))
+    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
 # undef textdomain
 # define textdomain(Domainname) ((const char *) (Domainname))
 # undef bindtextdomain
@@ -91,12 +93,6 @@
 
 #endif
 
-/* Prefer gnulib's setlocale override over libintl's setlocale override.  */
-#ifdef GNULIB_defined_setlocale
-# undef setlocale
-# define setlocale rpl_setlocale
-#endif
-
 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
    translation is done at a different place in the code.
@@ -182,12 +178,9 @@
 
 #include <string.h>
 
-#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
-     /* || __STDC_VERSION__ >= 199901L */ )
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
-#else
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
-#endif
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+  (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
+   /* || __STDC_VERSION__ >= 199901L */ )
 
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
 #include <stdlib.h>
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/gettimeofday.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/gettimeofday.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/gettimeofday.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/gettimeofday.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-/* Provide gettimeofday for systems that don't have it or for which it's broken.
-
-   Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 Jim Meyering */
-
-#include <config.h>
-
-/* Specification.  */
-#include <sys/time.h>
-
-#include <time.h>
-
-#if HAVE_SYS_TIMEB_H
-# include <sys/timeb.h>
-#endif
-
-#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
-
-/* Work around the bug in some systems whereby gettimeofday clobbers
-   the static buffer that localtime uses for its return value.  The
-   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
-   this problem.  The tzset replacement is necessary for at least
-   Solaris 2.5, 2.5.1, and 2.6.  */
-
-static struct tm tm_zero_buffer;
-static struct tm *localtime_buffer_addr = &tm_zero_buffer;
-
-# undef localtime
-extern struct tm *localtime (time_t const *);
-
-# undef gmtime
-extern struct tm *gmtime (time_t const *);
-
-/* This is a wrapper for localtime.  It is used only on systems for which
-   gettimeofday clobbers the static buffer used for localtime's result.
-
-   On the first call, record the address of the static buffer that
-   localtime uses for its result.  */
-
-struct tm *
-rpl_localtime (time_t const *timep)
-{
-  struct tm *tm = localtime (timep);
-
-  if (localtime_buffer_addr == &tm_zero_buffer)
-    localtime_buffer_addr = tm;
-
-  return tm;
-}
-
-/* Same as above, since gmtime and localtime use the same buffer.  */
-struct tm *
-rpl_gmtime (time_t const *timep)
-{
-  struct tm *tm = gmtime (timep);
-
-  if (localtime_buffer_addr == &tm_zero_buffer)
-    localtime_buffer_addr = tm;
-
-  return tm;
-}
-
-#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
-
-#if TZSET_CLOBBERS_LOCALTIME
-
-# undef tzset
-extern void tzset (void);
-
-/* This is a wrapper for tzset, for systems on which tzset may clobber
-   the static buffer used for localtime's result.  */
-void
-rpl_tzset (void)
-{
-  /* Save and restore the contents of the buffer used for localtime's
-     result around the call to tzset.  */
-  struct tm save = *localtime_buffer_addr;
-  tzset ();
-  *localtime_buffer_addr = save;
-}
-#endif
-
-/* This is a wrapper for gettimeofday.  It is used only on systems
-   that lack this function, or whose implementation of this function
-   causes problems.  */
-
-int
-gettimeofday (struct timeval *restrict tv, void *restrict tz)
-{
-#undef gettimeofday
-#if HAVE_GETTIMEOFDAY
-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
-  /* Save and restore the contents of the buffer used for localtime's
-     result around the call to gettimeofday.  */
-  struct tm save = *localtime_buffer_addr;
-# endif
-
-# if defined timeval /* 'struct timeval' overridden by gnulib?  */
-#  undef timeval
-  struct timeval otv;
-  int result = gettimeofday (&otv, (struct timezone *) tz);
-  if (result == 0)
-    {
-      tv->tv_sec = otv.tv_sec;
-      tv->tv_usec = otv.tv_usec;
-    }
-# else
-  int result = gettimeofday (tv, (struct timezone *) tz);
-# endif
-
-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
-  *localtime_buffer_addr = save;
-# endif
-
-  return result;
-
-#else
-
-# if HAVE__FTIME
-
-  struct _timeb timebuf;
-  _ftime (&timebuf);
-  tv->tv_sec = timebuf.time;
-  tv->tv_usec = timebuf.millitm * 1000;
-
-# else
-
-#  if !defined OK_TO_USE_1S_CLOCK
-#   error "Only 1-second nominal clock resolution found.  Is that intended?" \
-          "If so, compile with the -DOK_TO_USE_1S_CLOCK option."
-#  endif
-  tv->tv_sec = time (NULL);
-  tv->tv_usec = 0;
-
-# endif
-
-  return 0;
-
-#endif
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/glthread/lock.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/glthread/lock.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/glthread/lock.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/glthread/lock.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1057 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-#include <config.h>
-
-#include "glthread/lock.h"
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  if !defined PTHREAD_RWLOCK_INITIALIZER
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_rwlock_init (&lock->rwlock, NULL);
-  if (err != 0)
-    return err;
-  lock->initialized = 1;
-  return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_rwlock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_rwlock_rdlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_rwlock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_rwlock_wrlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    return EINVAL;
-  return pthread_rwlock_unlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  if (!lock->initialized)
-    return EINVAL;
-  err = pthread_rwlock_destroy (&lock->rwlock);
-  if (err != 0)
-    return err;
-  lock->initialized = 0;
-  return 0;
-}
-
-#  endif
-
-# else
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_init (&lock->lock, NULL);
-  if (err != 0)
-    return err;
-  err = pthread_cond_init (&lock->waiting_readers, NULL);
-  if (err != 0)
-    return err;
-  err = pthread_cond_init (&lock->waiting_writers, NULL);
-  if (err != 0)
-    return err;
-  lock->waiting_writers_count = 0;
-  lock->runcount = 0;
-  return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  /* POSIX says: "It is implementation-defined whether the calling thread
-     acquires the lock when a writer does not hold the lock and there are
-     writers blocked on the lock."  Let's say, no: give the writers a higher
-     priority.  */
-  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_readers.  */
-      err = pthread_cond_wait (&lock->waiting_readers, &lock->lock);
-      if (err != 0)
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return err;
-        }
-    }
-  lock->runcount++;
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  /* Test whether no readers or writers are currently running.  */
-  while (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_writers.  */
-      lock->waiting_writers_count++;
-      err = pthread_cond_wait (&lock->waiting_writers, &lock->lock);
-      if (err != 0)
-        {
-          lock->waiting_writers_count--;
-          pthread_mutex_unlock (&lock->lock);
-          return err;
-        }
-      lock->waiting_writers_count--;
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return EINVAL;
-        }
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return EINVAL;
-        }
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-         locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers_count > 0)
-        {
-          /* Wake up one of the waiting writers.  */
-          err = pthread_cond_signal (&lock->waiting_writers);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->lock);
-              return err;
-            }
-        }
-      else
-        {
-          /* Wake up all waiting readers.  */
-          err = pthread_cond_broadcast (&lock->waiting_readers);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->lock);
-              return err;
-            }
-        }
-    }
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_destroy (&lock->lock);
-  if (err != 0)
-    return err;
-  err = pthread_cond_destroy (&lock->waiting_readers);
-  if (err != 0)
-    return err;
-  err = pthread_cond_destroy (&lock->waiting_writers);
-  if (err != 0)
-    return err;
-  return 0;
-}
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-  int err;
-
-  err = pthread_mutexattr_init (&attributes);
-  if (err != 0)
-    return err;
-  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutex_init (lock, &attributes);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutexattr_destroy (&attributes);
-  if (err != 0)
-    return err;
-  return 0;
-}
-
-#  else
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-  int err;
-
-  err = pthread_mutexattr_init (&attributes);
-  if (err != 0)
-    return err;
-  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutex_init (&lock->recmutex, &attributes);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutexattr_destroy (&attributes);
-  if (err != 0)
-    return err;
-  lock->initialized = 1;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_recursive_lock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_mutex_lock (&lock->recmutex);
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    return EINVAL;
-  return pthread_mutex_unlock (&lock->recmutex);
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  if (!lock->initialized)
-    return EINVAL;
-  err = pthread_mutex_destroy (&lock->recmutex);
-  if (err != 0)
-    return err;
-  lock->initialized = 0;
-  return 0;
-}
-
-#  endif
-
-# else
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_init (&lock->mutex, NULL);
-  if (err != 0)
-    return err;
-  lock->owner = (pthread_t) 0;
-  lock->depth = 0;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_t self = pthread_self ();
-  if (lock->owner != self)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->mutex);
-      if (err != 0)
-        return err;
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    {
-      lock->depth--;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != pthread_self ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (pthread_t) 0;
-      return pthread_mutex_unlock (&lock->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (pthread_t) 0)
-    return EBUSY;
-  return pthread_mutex_destroy (&lock->mutex);
-}
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
-
-int
-glthread_once_singlethreaded (pthread_once_t *once_control)
-{
-  /* We don't know whether pthread_once_t is an integer type, a floating-point
-     type, a pointer type, or a structure type.  */
-  char *firstbyte = (char *)once_control;
-  if (*firstbyte == *(const char *)&fresh_once)
-    {
-      /* First time use of once_control.  Invert the first byte.  */
-      *firstbyte = ~ *(const char *)&fresh_once;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static void
-glthread_once_call (void *arg)
-{
-  void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
-  void (*initfunction) (void) = *gl_once_temp_addr;
-  initfunction ();
-}
-
-int
-glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void))
-{
-  void (*temp) (void) = initfunction;
-  return (!pth_once (once_control, glthread_once_call, &temp) ? errno : 0);
-}
-
-int
-glthread_once_singlethreaded (pth_once_t *once_control)
-{
-  /* We know that pth_once_t is an integer type.  */
-  if (*once_control == PTH_ONCE_INIT)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      *once_control = ~ PTH_ONCE_INIT;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  err = mutex_init (&lock->mutex, USYNC_THREAD, NULL);
-  if (err != 0)
-    return err;
-  lock->owner = (thread_t) 0;
-  lock->depth = 0;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  thread_t self = thr_self ();
-  if (lock->owner != self)
-    {
-      int err;
-
-      err = mutex_lock (&lock->mutex);
-      if (err != 0)
-        return err;
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    {
-      lock->depth--;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != thr_self ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (thread_t) 0;
-      return mutex_unlock (&lock->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (thread_t) 0)
-    return EBUSY;
-  return mutex_destroy (&lock->mutex);
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-int
-glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (!once_control->inited)
-    {
-      int err;
-
-      /* Use the mutex to guarantee that if another thread is already calling
-         the initfunction, this thread waits until it's finished.  */
-      err = mutex_lock (&once_control->mutex);
-      if (err != 0)
-        return err;
-      if (!once_control->inited)
-        {
-          once_control->inited = 1;
-          initfunction ();
-        }
-      return mutex_unlock (&once_control->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_once_singlethreaded (gl_once_t *once_control)
-{
-  /* We know that gl_once_t contains an integer type.  */
-  if (!once_control->inited)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      once_control->inited = ~ 0;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-void
-glthread_lock_init_func (gl_lock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-int
-glthread_lock_lock_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_lock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_lock_unlock_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_lock_destroy_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* In this file, the waitqueues are implemented as circular arrays.  */
-#define gl_waitqueue_t gl_carray_waitqueue_t
-
-static void
-gl_waitqueue_init (gl_waitqueue_t *wq)
-{
-  wq->array = NULL;
-  wq->count = 0;
-  wq->alloc = 0;
-  wq->offset = 0;
-}
-
-/* Enqueues the current thread, represented by an event, in a wait queue.
-   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
-static HANDLE
-gl_waitqueue_add (gl_waitqueue_t *wq)
-{
-  HANDLE event;
-  unsigned int index;
-
-  if (wq->count == wq->alloc)
-    {
-      unsigned int new_alloc = 2 * wq->alloc + 1;
-      HANDLE *new_array =
-        (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
-      if (new_array == NULL)
-        /* No more memory.  */
-        return INVALID_HANDLE_VALUE;
-      /* Now is a good opportunity to rotate the array so that its contents
-         starts at offset 0.  */
-      if (wq->offset > 0)
-        {
-          unsigned int old_count = wq->count;
-          unsigned int old_alloc = wq->alloc;
-          unsigned int old_offset = wq->offset;
-          unsigned int i;
-          if (old_offset + old_count > old_alloc)
-            {
-              unsigned int limit = old_offset + old_count - old_alloc;
-              for (i = 0; i < limit; i++)
-                new_array[old_alloc + i] = new_array[i];
-            }
-          for (i = 0; i < old_count; i++)
-            new_array[i] = new_array[old_offset + i];
-          wq->offset = 0;
-        }
-      wq->array = new_array;
-      wq->alloc = new_alloc;
-    }
-  /* Whether the created event is a manual-reset one or an auto-reset one,
-     does not matter, since we will wait on it only once.  */
-  event = CreateEvent (NULL, TRUE, FALSE, NULL);
-  if (event == INVALID_HANDLE_VALUE)
-    /* No way to allocate an event.  */
-    return INVALID_HANDLE_VALUE;
-  index = wq->offset + wq->count;
-  if (index >= wq->alloc)
-    index -= wq->alloc;
-  wq->array[index] = event;
-  wq->count++;
-  return event;
-}
-
-/* Notifies the first thread from a wait queue and dequeues it.  */
-static void
-gl_waitqueue_notify_first (gl_waitqueue_t *wq)
-{
-  SetEvent (wq->array[wq->offset + 0]);
-  wq->offset++;
-  wq->count--;
-  if (wq->count == 0 || wq->offset == wq->alloc)
-    wq->offset = 0;
-}
-
-/* Notifies all threads from a wait queue and dequeues them all.  */
-static void
-gl_waitqueue_notify_all (gl_waitqueue_t *wq)
-{
-  unsigned int i;
-
-  for (i = 0; i < wq->count; i++)
-    {
-      unsigned int index = wq->offset + i;
-      if (index >= wq->alloc)
-        index -= wq->alloc;
-      SetEvent (wq->array[index]);
-    }
-  wq->count = 0;
-  wq->offset = 0;
-}
-
-void
-glthread_rwlock_init_func (gl_rwlock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  gl_waitqueue_init (&lock->waiting_readers);
-  gl_waitqueue_init (&lock->waiting_writers);
-  lock->runcount = 0;
-  lock->guard.done = 1;
-}
-
-int
-glthread_rwlock_rdlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_rwlock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  if (!(lock->runcount + 1 > 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_readers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
-      if (event != INVALID_HANDLE_VALUE)
-        {
-          DWORD result;
-          LeaveCriticalSection (&lock->lock);
-          /* Wait until another thread signals this event.  */
-          result = WaitForSingleObject (event, INFINITE);
-          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-            abort ();
-          CloseHandle (event);
-          /* The thread which signalled the event already did the bookkeeping:
-             removed us from the waiting_readers, incremented lock->runcount.  */
-          if (!(lock->runcount > 0))
-            abort ();
-          return 0;
-        }
-      else
-        {
-          /* Allocation failure.  Weird.  */
-          do
-            {
-              LeaveCriticalSection (&lock->lock);
-              Sleep (1);
-              EnterCriticalSection (&lock->lock);
-            }
-          while (!(lock->runcount + 1 > 0));
-        }
-    }
-  lock->runcount++;
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_wrlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_rwlock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether no readers or writers are currently running.  */
-  if (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_writers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
-      if (event != INVALID_HANDLE_VALUE)
-        {
-          DWORD result;
-          LeaveCriticalSection (&lock->lock);
-          /* Wait until another thread signals this event.  */
-          result = WaitForSingleObject (event, INFINITE);
-          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-            abort ();
-          CloseHandle (event);
-          /* The thread which signalled the event already did the bookkeeping:
-             removed us from the waiting_writers, set lock->runcount = -1.  */
-          if (!(lock->runcount == -1))
-            abort ();
-          return 0;
-        }
-      else
-        {
-          /* Allocation failure.  Weird.  */
-          do
-            {
-              LeaveCriticalSection (&lock->lock);
-              Sleep (1);
-              EnterCriticalSection (&lock->lock);
-            }
-          while (!(lock->runcount == 0));
-        }
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_unlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  EnterCriticalSection (&lock->lock);
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-        abort ();
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-        {
-          LeaveCriticalSection (&lock->lock);
-          return EPERM;
-        }
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-         locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers.count > 0)
-        {
-          /* Wake up one of the waiting writers.  */
-          lock->runcount--;
-          gl_waitqueue_notify_first (&lock->waiting_writers);
-        }
-      else
-        {
-          /* Wake up all waiting readers.  */
-          lock->runcount += lock->waiting_readers.count;
-          gl_waitqueue_notify_all (&lock->waiting_readers);
-        }
-    }
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_destroy_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  if (lock->runcount != 0)
-    return EBUSY;
-  DeleteCriticalSection (&lock->lock);
-  if (lock->waiting_readers.array != NULL)
-    free (lock->waiting_readers.array);
-  if (lock->waiting_writers.array != NULL)
-    free (lock->waiting_writers.array);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-void
-glthread_recursive_lock_init_func (gl_recursive_lock_t *lock)
-{
-  lock->owner = 0;
-  lock->depth = 0;
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-int
-glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_recursive_lock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  {
-    DWORD self = GetCurrentThreadId ();
-    if (lock->owner != self)
-      {
-        EnterCriticalSection (&lock->lock);
-        lock->owner = self;
-      }
-    if (++(lock->depth) == 0) /* wraparound? */
-      {
-        lock->depth--;
-        return EAGAIN;
-      }
-  }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != GetCurrentThreadId ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = 0;
-      LeaveCriticalSection (&lock->lock);
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != 0)
-    return EBUSY;
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once_func (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (once_control->inited <= 0)
-    {
-      if (InterlockedIncrement (&once_control->started) == 0)
-        {
-          /* This thread is the first one to come to this once_control.  */
-          InitializeCriticalSection (&once_control->lock);
-          EnterCriticalSection (&once_control->lock);
-          once_control->inited = 0;
-          initfunction ();
-          once_control->inited = 1;
-          LeaveCriticalSection (&once_control->lock);
-        }
-      else
-        {
-          /* Undo last operation.  */
-          InterlockedDecrement (&once_control->started);
-          /* Some other thread has already started the initialization.
-             Yield the CPU while waiting for the other thread to finish
-             initializing and taking the lock.  */
-          while (once_control->inited < 0)
-            Sleep (0);
-          if (once_control->inited <= 0)
-            {
-              /* Take the lock.  This blocks until the other thread has
-                 finished calling the initfunction.  */
-              EnterCriticalSection (&once_control->lock);
-              LeaveCriticalSection (&once_control->lock);
-              if (!(once_control->inited > 0))
-                abort ();
-            }
-        }
-    }
-}
-
-#endif
-
-/* ========================================================================= */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/glthread/lock.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/glthread/lock.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/glthread/lock.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/glthread/lock.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,927 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-/* This file contains locking primitives for use with a given thread library.
-   It does not contain primitives for creating threads or for other
-   synchronization primitives.
-
-   Normal (non-recursive) locks:
-     Type:                gl_lock_t
-     Declaration:         gl_lock_define(extern, name)
-     Initializer:         gl_lock_define_initialized(, name)
-     Initialization:      gl_lock_init (name);
-     Taking the lock:     gl_lock_lock (name);
-     Releasing the lock:  gl_lock_unlock (name);
-     De-initialization:   gl_lock_destroy (name);
-   Equivalent functions with control of error handling:
-     Initialization:      err = glthread_lock_init (&name);
-     Taking the lock:     err = glthread_lock_lock (&name);
-     Releasing the lock:  err = glthread_lock_unlock (&name);
-     De-initialization:   err = glthread_lock_destroy (&name);
-
-   Read-Write (non-recursive) locks:
-     Type:                gl_rwlock_t
-     Declaration:         gl_rwlock_define(extern, name)
-     Initializer:         gl_rwlock_define_initialized(, name)
-     Initialization:      gl_rwlock_init (name);
-     Taking the lock:     gl_rwlock_rdlock (name);
-                          gl_rwlock_wrlock (name);
-     Releasing the lock:  gl_rwlock_unlock (name);
-     De-initialization:   gl_rwlock_destroy (name);
-   Equivalent functions with control of error handling:
-     Initialization:      err = glthread_rwlock_init (&name);
-     Taking the lock:     err = glthread_rwlock_rdlock (&name);
-                          err = glthread_rwlock_wrlock (&name);
-     Releasing the lock:  err = glthread_rwlock_unlock (&name);
-     De-initialization:   err = glthread_rwlock_destroy (&name);
-
-   Recursive locks:
-     Type:                gl_recursive_lock_t
-     Declaration:         gl_recursive_lock_define(extern, name)
-     Initializer:         gl_recursive_lock_define_initialized(, name)
-     Initialization:      gl_recursive_lock_init (name);
-     Taking the lock:     gl_recursive_lock_lock (name);
-     Releasing the lock:  gl_recursive_lock_unlock (name);
-     De-initialization:   gl_recursive_lock_destroy (name);
-   Equivalent functions with control of error handling:
-     Initialization:      err = glthread_recursive_lock_init (&name);
-     Taking the lock:     err = glthread_recursive_lock_lock (&name);
-     Releasing the lock:  err = glthread_recursive_lock_unlock (&name);
-     De-initialization:   err = glthread_recursive_lock_destroy (&name);
-
-  Once-only execution:
-     Type:                gl_once_t
-     Initializer:         gl_once_define(extern, name)
-     Execution:           gl_once (name, initfunction);
-   Equivalent functions with control of error handling:
-     Execution:           err = glthread_once (&name, initfunction);
-*/
-
-
-#ifndef _LOCK_H
-#define _LOCK_H
-
-#include <errno.h>
-#include <stdlib.h>
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# include <pthread.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The pthread_in_use() detection needs to be done at runtime.  */
-#  define pthread_in_use() \
-     glthread_in_use ()
-extern int glthread_in_use (void);
-
-# endif
-
-# if USE_POSIX_THREADS_WEAK
-
-/* Use weak references to the POSIX threads library.  */
-
-/* Weak references avoid dragging in external libraries if the other parts
-   of the program don't use them.  Here we use them, because we don't want
-   every program that uses libintl to depend on libpthread.  This assumes
-   that libpthread would not be loaded after libintl; i.e. if libintl is
-   loaded first, by an executable that does not depend on libpthread, and
-   then a module is dynamically loaded that depends on libpthread, libintl
-   will not be multithread-safe.  */
-
-/* The way to test at runtime whether libpthread is present is to test
-   whether a function pointer's value, such as &pthread_mutex_init, is
-   non-NULL.  However, some versions of GCC have a bug through which, in
-   PIC mode, &foo != NULL always evaluates to true if there is a direct
-   call to foo(...) in the same function.  To avoid this, we test the
-   address of a function in libpthread that we don't use.  */
-
-#  pragma weak pthread_mutex_init
-#  pragma weak pthread_mutex_lock
-#  pragma weak pthread_mutex_unlock
-#  pragma weak pthread_mutex_destroy
-#  pragma weak pthread_rwlock_init
-#  pragma weak pthread_rwlock_rdlock
-#  pragma weak pthread_rwlock_wrlock
-#  pragma weak pthread_rwlock_unlock
-#  pragma weak pthread_rwlock_destroy
-#  pragma weak pthread_once
-#  pragma weak pthread_cond_init
-#  pragma weak pthread_cond_wait
-#  pragma weak pthread_cond_signal
-#  pragma weak pthread_cond_broadcast
-#  pragma weak pthread_cond_destroy
-#  pragma weak pthread_mutexattr_init
-#  pragma weak pthread_mutexattr_settype
-#  pragma weak pthread_mutexattr_destroy
-#  ifndef pthread_self
-#   pragma weak pthread_self
-#  endif
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   pragma weak pthread_cancel
-#   define pthread_in_use() (pthread_cancel != NULL)
-#  endif
-
-# else
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   define pthread_in_use() 1
-#  endif
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pthread_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    PTHREAD_MUTEX_INITIALIZER
-# define glthread_lock_init(LOCK) \
-    (pthread_in_use () ? pthread_mutex_init (LOCK, NULL) : 0)
-# define glthread_lock_lock(LOCK) \
-    (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
-# define glthread_lock_unlock(LOCK) \
-    (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
-# define glthread_lock_destroy(LOCK) \
-    (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  ifdef PTHREAD_RWLOCK_INITIALIZER
-
-typedef pthread_rwlock_t gl_rwlock_t;
-#   define gl_rwlock_define(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_rwlock_t NAME;
-#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer;
-#   define gl_rwlock_initializer \
-      PTHREAD_RWLOCK_INITIALIZER
-#   define glthread_rwlock_init(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0)
-#   define glthread_rwlock_rdlock(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_rdlock (LOCK) : 0)
-#   define glthread_rwlock_wrlock(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_wrlock (LOCK) : 0)
-#   define glthread_rwlock_unlock(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_unlock (LOCK) : 0)
-#   define glthread_rwlock_destroy(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_destroy (LOCK) : 0)
-
-#  else
-
-typedef struct
-        {
-          int initialized;
-          pthread_mutex_t guard;   /* protects the initialization */
-          pthread_rwlock_t rwlock; /* read-write lock */
-        }
-        gl_rwlock_t;
-#   define gl_rwlock_define(STORAGECLASS, NAME) \
-      STORAGECLASS gl_rwlock_t NAME;
-#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-#   define gl_rwlock_initializer \
-      { 0, PTHREAD_MUTEX_INITIALIZER }
-#   define glthread_rwlock_init(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_rdlock(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_wrlock(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_unlock(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_destroy(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
-
-#  endif
-
-# else
-
-typedef struct
-        {
-          pthread_mutex_t lock; /* protects the remaining fields */
-          pthread_cond_t waiting_readers; /* waiting readers */
-          pthread_cond_t waiting_writers; /* waiting writers */
-          unsigned int waiting_writers_count; /* number of waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
-# define glthread_rwlock_init(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
-# define glthread_rwlock_rdlock(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_wrlock(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_unlock(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_destroy(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-
-typedef pthread_mutex_t gl_recursive_lock_t;
-#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_mutex_t NAME;
-#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer;
-#   ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#    define gl_recursive_lock_initializer \
-       PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#   else
-#    define gl_recursive_lock_initializer \
-       PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#   endif
-#   define glthread_recursive_lock_init(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_lock(LOCK) \
-      (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
-#   define glthread_recursive_lock_unlock(LOCK) \
-      (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
-#   define glthread_recursive_lock_destroy(LOCK) \
-      (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-
-#  else
-
-typedef struct
-        {
-          pthread_mutex_t recmutex; /* recursive mutex */
-          pthread_mutex_t guard;    /* protects the initialization */
-          int initialized;
-        }
-        gl_recursive_lock_t;
-#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
-      STORAGECLASS gl_recursive_lock_t NAME;
-#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-#   define gl_recursive_lock_initializer \
-      { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 }
-#   define glthread_recursive_lock_init(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_lock(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_unlock(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_destroy(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-#  endif
-
-# else
-
-/* Old versions of POSIX threads on Solaris did not have recursive locks.
-   We have to implement them ourselves.  */
-
-typedef struct
-        {
-          pthread_mutex_t mutex;
-          pthread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
-#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
-     STORAGECLASS gl_recursive_lock_t NAME;
-#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-#  define gl_recursive_lock_initializer \
-     { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 }
-#  define glthread_recursive_lock_init(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-#  define glthread_recursive_lock_lock(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-#  define glthread_recursive_lock_unlock(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-#  define glthread_recursive_lock_destroy(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pthread_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (pthread_in_use ()                                                         \
-     ? pthread_once (ONCE_CONTROL, INITFUNCTION)                               \
-     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_singlethreaded (pthread_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-# include <pth.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_PTH_THREADS_WEAK
-
-/* Use weak references to the GNU Pth threads library.  */
-
-#  pragma weak pth_mutex_init
-#  pragma weak pth_mutex_acquire
-#  pragma weak pth_mutex_release
-#  pragma weak pth_rwlock_init
-#  pragma weak pth_rwlock_acquire
-#  pragma weak pth_rwlock_release
-#  pragma weak pth_once
-
-#  pragma weak pth_cancel
-#  define pth_in_use() (pth_cancel != NULL)
-
-# else
-
-#  define pth_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pth_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS pth_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS pth_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    PTH_MUTEX_INIT
-# define glthread_lock_init(LOCK) \
-    (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
-# define glthread_lock_lock(LOCK) \
-    (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
-# define glthread_lock_unlock(LOCK) \
-    (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
-# define glthread_lock_destroy(LOCK) \
-    ((void)(LOCK), 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef pth_rwlock_t gl_rwlock_t;
-#  define gl_rwlock_define(STORAGECLASS, NAME) \
-     STORAGECLASS pth_rwlock_t NAME;
-#  define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer;
-#  define gl_rwlock_initializer \
-     PTH_RWLOCK_INIT
-#  define glthread_rwlock_init(LOCK) \
-     (pth_in_use () && !pth_rwlock_init (LOCK) ? errno : 0)
-#  define glthread_rwlock_rdlock(LOCK) \
-     (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RD, 0, NULL) ? errno : 0)
-#  define glthread_rwlock_wrlock(LOCK) \
-     (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RW, 0, NULL) ? errno : 0)
-#  define glthread_rwlock_unlock(LOCK) \
-     (pth_in_use () && !pth_rwlock_release (LOCK) ? errno : 0)
-#  define glthread_rwlock_destroy(LOCK) \
-     ((void)(LOCK), 0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* In Pth, mutexes are recursive by default.  */
-typedef pth_mutex_t gl_recursive_lock_t;
-#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
-     STORAGECLASS pth_mutex_t NAME;
-#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer;
-#  define gl_recursive_lock_initializer \
-     PTH_MUTEX_INIT
-#  define glthread_recursive_lock_init(LOCK) \
-     (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
-#  define glthread_recursive_lock_lock(LOCK) \
-     (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
-#  define glthread_recursive_lock_unlock(LOCK) \
-     (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
-#  define glthread_recursive_lock_destroy(LOCK) \
-     ((void)(LOCK), 0)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pth_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (pth_in_use ()                                                             \
-     ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)                \
-     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (pth_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-# include <thread.h>
-# include <synch.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_SOLARIS_THREADS_WEAK
-
-/* Use weak references to the old Solaris threads library.  */
-
-#  pragma weak mutex_init
-#  pragma weak mutex_lock
-#  pragma weak mutex_unlock
-#  pragma weak mutex_destroy
-#  pragma weak rwlock_init
-#  pragma weak rw_rdlock
-#  pragma weak rw_wrlock
-#  pragma weak rw_unlock
-#  pragma weak rwlock_destroy
-#  pragma weak thr_self
-
-#  pragma weak thr_suspend
-#  define thread_in_use() (thr_suspend != NULL)
-
-# else
-
-#  define thread_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    DEFAULTMUTEX
-# define glthread_lock_init(LOCK) \
-    (thread_in_use () ? mutex_init (LOCK, USYNC_THREAD, NULL) : 0)
-# define glthread_lock_lock(LOCK) \
-    (thread_in_use () ? mutex_lock (LOCK) : 0)
-# define glthread_lock_unlock(LOCK) \
-    (thread_in_use () ? mutex_unlock (LOCK) : 0)
-# define glthread_lock_destroy(LOCK) \
-    (thread_in_use () ? mutex_destroy (LOCK) : 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef rwlock_t gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    DEFAULTRWLOCK
-# define glthread_rwlock_init(LOCK) \
-    (thread_in_use () ? rwlock_init (LOCK, USYNC_THREAD, NULL) : 0)
-# define glthread_rwlock_rdlock(LOCK) \
-    (thread_in_use () ? rw_rdlock (LOCK) : 0)
-# define glthread_rwlock_wrlock(LOCK) \
-    (thread_in_use () ? rw_wrlock (LOCK) : 0)
-# define glthread_rwlock_unlock(LOCK) \
-    (thread_in_use () ? rw_unlock (LOCK) : 0)
-# define glthread_rwlock_destroy(LOCK) \
-    (thread_in_use () ? rwlock_destroy (LOCK) : 0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* Old Solaris threads did not have recursive locks.
-   We have to implement them ourselves.  */
-
-typedef struct
-        {
-          mutex_t mutex;
-          thread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
-    { DEFAULTMUTEX, (thread_t) 0, 0 }
-# define glthread_recursive_lock_init(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_lock(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_unlock(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_destroy(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
-        {
-          volatile int inited;
-          mutex_t mutex;
-        }
-        gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX };
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (thread_in_use ()                                                          \
-     ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)                \
-     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (gl_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
-
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
-   Mutex, Semaphore types, because
-     - we need only to synchronize inside a single process (address space),
-       not inter-process locking,
-     - we don't need to support trylock operations.  (TryEnterCriticalSection
-       does not work on Windows 95/98/ME.  Packages that need trylock usually
-       define their own mutex type.)  */
-
-/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
-   to be done lazily, once only.  For this we need spinlocks.  */
-
-typedef struct { volatile int done; volatile long started; } gl_spinlock_t;
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          CRITICAL_SECTION lock;
-        }
-        gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_lock_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    { { 0, -1 } }
-# define glthread_lock_init(LOCK) \
-    (glthread_lock_init_func (LOCK), 0)
-# define glthread_lock_lock(LOCK) \
-    glthread_lock_lock_func (LOCK)
-# define glthread_lock_unlock(LOCK) \
-    glthread_lock_unlock_func (LOCK)
-# define glthread_lock_destroy(LOCK) \
-    glthread_lock_destroy_func (LOCK)
-extern void glthread_lock_init_func (gl_lock_t *lock);
-extern int glthread_lock_lock_func (gl_lock_t *lock);
-extern int glthread_lock_unlock_func (gl_lock_t *lock);
-extern int glthread_lock_destroy_func (gl_lock_t *lock);
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* It is impossible to implement read-write locks using plain locks, without
-   introducing an extra thread dedicated to managing read-write locks.
-   Therefore here we need to use the low-level Event type.  */
-
-typedef struct
-        {
-          HANDLE *array; /* array of waiting threads, each represented by an event */
-          unsigned int count; /* number of waiting threads */
-          unsigned int alloc; /* length of allocated array */
-          unsigned int offset; /* index of first waiting thread in array */
-        }
-        gl_carray_waitqueue_t;
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          CRITICAL_SECTION lock; /* protects the remaining fields */
-          gl_carray_waitqueue_t waiting_readers; /* waiting readers */
-          gl_carray_waitqueue_t waiting_writers; /* waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    { { 0, -1 } }
-# define glthread_rwlock_init(LOCK) \
-    (glthread_rwlock_init_func (LOCK), 0)
-# define glthread_rwlock_rdlock(LOCK) \
-    glthread_rwlock_rdlock_func (LOCK)
-# define glthread_rwlock_wrlock(LOCK) \
-    glthread_rwlock_wrlock_func (LOCK)
-# define glthread_rwlock_unlock(LOCK) \
-    glthread_rwlock_unlock_func (LOCK)
-# define glthread_rwlock_destroy(LOCK) \
-    glthread_rwlock_destroy_func (LOCK)
-extern void glthread_rwlock_init_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock);
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* The native Windows documentation says that CRITICAL_SECTION already
-   implements a recursive lock.  But we need not rely on it: It's easy to
-   implement a recursive lock without this assumption.  */
-
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          DWORD owner;
-          unsigned long depth;
-          CRITICAL_SECTION lock;
-        }
-        gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
-    { { 0, -1 }, 0, 0 }
-# define glthread_recursive_lock_init(LOCK) \
-    (glthread_recursive_lock_init_func (LOCK), 0)
-# define glthread_recursive_lock_lock(LOCK) \
-    glthread_recursive_lock_lock_func (LOCK)
-# define glthread_recursive_lock_unlock(LOCK) \
-    glthread_recursive_lock_unlock_func (LOCK)
-# define glthread_recursive_lock_destroy(LOCK) \
-    glthread_recursive_lock_destroy_func (LOCK)
-extern void glthread_recursive_lock_init_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
-        {
-          volatile int inited;
-          volatile long started;
-          CRITICAL_SECTION lock;
-        }
-        gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = { -1, -1 };
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (glthread_once_func (ONCE_CONTROL, INITFUNCTION), 0)
-extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (void));
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
-
-/* Provide dummy implementation if threads are not supported.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef int gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME)
-# define gl_lock_define_initialized(STORAGECLASS, NAME)
-# define glthread_lock_init(NAME) 0
-# define glthread_lock_lock(NAME) 0
-# define glthread_lock_unlock(NAME) 0
-# define glthread_lock_destroy(NAME) 0
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef int gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME)
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME)
-# define glthread_rwlock_init(NAME) 0
-# define glthread_rwlock_rdlock(NAME) 0
-# define glthread_rwlock_wrlock(NAME) 0
-# define glthread_rwlock_unlock(NAME) 0
-# define glthread_rwlock_destroy(NAME) 0
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-typedef int gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME)
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME)
-# define glthread_recursive_lock_init(NAME) 0
-# define glthread_recursive_lock_lock(NAME) 0
-# define glthread_recursive_lock_unlock(NAME) 0
-# define glthread_recursive_lock_destroy(NAME) 0
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef int gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = 0;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (*(ONCE_CONTROL) == 0 ? (*(ONCE_CONTROL) = ~ 0, INITFUNCTION (), 0) : 0)
-
-#endif
-
-/* ========================================================================= */
-
-/* Macros with built-in error handling.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-#define gl_lock_init(NAME) \
-   do                                  \
-     {                                 \
-       if (glthread_lock_init (&NAME)) \
-         abort ();                     \
-     }                                 \
-   while (0)
-#define gl_lock_lock(NAME) \
-   do                                  \
-     {                                 \
-       if (glthread_lock_lock (&NAME)) \
-         abort ();                     \
-     }                                 \
-   while (0)
-#define gl_lock_unlock(NAME) \
-   do                                    \
-     {                                   \
-       if (glthread_lock_unlock (&NAME)) \
-         abort ();                       \
-     }                                   \
-   while (0)
-#define gl_lock_destroy(NAME) \
-   do                                     \
-     {                                    \
-       if (glthread_lock_destroy (&NAME)) \
-         abort ();                        \
-     }                                    \
-   while (0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-#define gl_rwlock_init(NAME) \
-   do                                    \
-     {                                   \
-       if (glthread_rwlock_init (&NAME)) \
-         abort ();                       \
-     }                                   \
-   while (0)
-#define gl_rwlock_rdlock(NAME) \
-   do                                      \
-     {                                     \
-       if (glthread_rwlock_rdlock (&NAME)) \
-         abort ();                         \
-     }                                     \
-   while (0)
-#define gl_rwlock_wrlock(NAME) \
-   do                                      \
-     {                                     \
-       if (glthread_rwlock_wrlock (&NAME)) \
-         abort ();                         \
-     }                                     \
-   while (0)
-#define gl_rwlock_unlock(NAME) \
-   do                                      \
-     {                                     \
-       if (glthread_rwlock_unlock (&NAME)) \
-         abort ();                         \
-     }                                     \
-   while (0)
-#define gl_rwlock_destroy(NAME) \
-   do                                       \
-     {                                      \
-       if (glthread_rwlock_destroy (&NAME)) \
-         abort ();                          \
-     }                                      \
-   while (0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-#define gl_recursive_lock_init(NAME) \
-   do                                            \
-     {                                           \
-       if (glthread_recursive_lock_init (&NAME)) \
-         abort ();                               \
-     }                                           \
-   while (0)
-#define gl_recursive_lock_lock(NAME) \
-   do                                            \
-     {                                           \
-       if (glthread_recursive_lock_lock (&NAME)) \
-         abort ();                               \
-     }                                           \
-   while (0)
-#define gl_recursive_lock_unlock(NAME) \
-   do                                              \
-     {                                             \
-       if (glthread_recursive_lock_unlock (&NAME)) \
-         abort ();                                 \
-     }                                             \
-   while (0)
-#define gl_recursive_lock_destroy(NAME) \
-   do                                               \
-     {                                              \
-       if (glthread_recursive_lock_destroy (&NAME)) \
-         abort ();                                  \
-     }                                              \
-   while (0)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-#define gl_once(NAME, INITFUNCTION) \
-   do                                           \
-     {                                          \
-       if (glthread_once (&NAME, INITFUNCTION)) \
-         abort ();                              \
-     }                                          \
-   while (0)
-
-/* ========================================================================= */
-
-#endif /* _LOCK_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/glthread/threadlib.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/glthread/threadlib.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/glthread/threadlib.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/glthread/threadlib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/* Multithreading primitives.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2005.  */
-
-#include <config.h>
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# include <pthread.h>
-# include <stdlib.h>
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
-{
-  return arg;
-}
-
-int
-glthread_in_use (void)
-{
-  static int tested;
-  static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-  if (!tested)
-    {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-        /* Thread creation failed.  */
-        result = 0;
-      else
-        {
-          /* Thread creation works.  */
-          void *retval;
-          if (pthread_join (thread, &retval) != 0)
-            abort ();
-          result = 1;
-        }
-      tested = 1;
-    }
-  return result;
-}
-
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/iconv.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/iconv.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <iconv.h>
-
-#include <stddef.h>
-
-#if REPLACE_ICONV_UTF
-# include <errno.h>
-# include <stdint.h>
-# include <stdlib.h>
-# include "unistr.h"
-# ifndef uintptr_t
-#  define uintptr_t unsigned long
-# endif
-#endif
-
-#if REPLACE_ICONV_UTF
-
-/* UTF-{16,32}{BE,LE} converters taken from GNU libiconv 1.11.  */
-
-/* Return code if invalid. (xxx_mbtowc) */
-# define RET_ILSEQ      -1
-/* Return code if no bytes were read. (xxx_mbtowc) */
-# define RET_TOOFEW     -2
-
-/* Return code if invalid. (xxx_wctomb) */
-# define RET_ILUNI      -1
-/* Return code if output buffer is too small. (xxx_wctomb, xxx_reset) */
-# define RET_TOOSMALL   -2
-
-/*
- * UTF-16BE
- */
-
-/* Specification: RFC 2781 */
-
-static int
-utf16be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 2)
-    {
-      ucs4_t wc = (s[0] << 8) + s[1];
-      if (wc >= 0xd800 && wc < 0xdc00)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc2 = (s[2] << 8) + s[3];
-              if (!(wc2 >= 0xdc00 && wc2 < 0xe000))
-                return RET_ILSEQ;
-              *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00);
-              return 4;
-            }
-        }
-      else if (wc >= 0xdc00 && wc < 0xe000)
-        {
-          return RET_ILSEQ;
-        }
-      else
-        {
-          *pwc = wc;
-          return 2;
-        }
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf16be_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (!(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (wc < 0x10000)
-        {
-          if (n >= 2)
-            {
-              r[0] = (unsigned char) (wc >> 8);
-              r[1] = (unsigned char) wc;
-              return 2;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-      else if (wc < 0x110000)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10);
-              ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff);
-              r[0] = (unsigned char) (wc1 >> 8);
-              r[1] = (unsigned char) wc1;
-              r[2] = (unsigned char) (wc2 >> 8);
-              r[3] = (unsigned char) wc2;
-              return 4;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-16LE
- */
-
-/* Specification: RFC 2781 */
-
-static int
-utf16le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 2)
-    {
-      ucs4_t wc = s[0] + (s[1] << 8);
-      if (wc >= 0xd800 && wc < 0xdc00)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc2 = s[2] + (s[3] << 8);
-              if (!(wc2 >= 0xdc00 && wc2 < 0xe000))
-                return RET_ILSEQ;
-              *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00);
-              return 4;
-            }
-        }
-      else if (wc >= 0xdc00 && wc < 0xe000)
-        {
-          return RET_ILSEQ;
-        }
-      else
-        {
-          *pwc = wc;
-          return 2;
-        }
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf16le_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (!(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (wc < 0x10000)
-        {
-          if (n >= 2)
-            {
-              r[0] = (unsigned char) wc;
-              r[1] = (unsigned char) (wc >> 8);
-              return 2;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-      else if (wc < 0x110000)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10);
-              ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff);
-              r[0] = (unsigned char) wc1;
-              r[1] = (unsigned char) (wc1 >> 8);
-              r[2] = (unsigned char) wc2;
-              r[3] = (unsigned char) (wc2 >> 8);
-              return 4;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-32BE
- */
-
-/* Specification: Unicode 3.1 Standard Annex #19 */
-
-static int
-utf32be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 4)
-    {
-      ucs4_t wc = (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3];
-      if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-        {
-          *pwc = wc;
-          return 4;
-        }
-      else
-        return RET_ILSEQ;
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf32be_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (n >= 4)
-        {
-          r[0] = 0;
-          r[1] = (unsigned char) (wc >> 16);
-          r[2] = (unsigned char) (wc >> 8);
-          r[3] = (unsigned char) wc;
-          return 4;
-        }
-      else
-        return RET_TOOSMALL;
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-32LE
- */
-
-/* Specification: Unicode 3.1 Standard Annex #19 */
-
-static int
-utf32le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 4)
-    {
-      ucs4_t wc = s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24);
-      if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-        {
-          *pwc = wc;
-          return 4;
-        }
-      else
-        return RET_ILSEQ;
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf32le_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (n >= 4)
-        {
-          r[0] = (unsigned char) wc;
-          r[1] = (unsigned char) (wc >> 8);
-          r[2] = (unsigned char) (wc >> 16);
-          r[3] = 0;
-          return 4;
-        }
-      else
-        return RET_TOOSMALL;
-    }
-  return RET_ILUNI;
-}
-
-#endif
-
-size_t
-rpl_iconv (iconv_t cd,
-           ICONV_CONST char **inbuf, size_t *inbytesleft,
-           char **outbuf, size_t *outbytesleft)
-#undef iconv
-{
-#if REPLACE_ICONV_UTF
-  switch ((uintptr_t) cd)
-    {
-      {
-        int (*xxx_wctomb) (unsigned char *, ucs4_t, size_t);
-
-        case (uintptr_t) _ICONV_UTF8_UTF16BE:
-          xxx_wctomb = utf16be_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF16LE:
-          xxx_wctomb = utf16le_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF32BE:
-          xxx_wctomb = utf32be_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF32LE:
-          xxx_wctomb = utf32le_wctomb;
-          goto loop_from_utf8;
-
-       loop_from_utf8:
-        if (inbuf == NULL || *inbuf == NULL)
-          return 0;
-        {
-          ICONV_CONST char *inptr = *inbuf;
-          size_t inleft = *inbytesleft;
-          char *outptr = *outbuf;
-          size_t outleft = *outbytesleft;
-          size_t res = 0;
-          while (inleft > 0)
-            {
-              ucs4_t uc;
-              int m = u8_mbtoucr (&uc, (const uint8_t *) inptr, inleft);
-              if (m <= 0)
-                {
-                  if (m == -1)
-                    {
-                      errno = EILSEQ;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  if (m == -2)
-                    {
-                      errno = EINVAL;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  abort ();
-                }
-              else
-                {
-                  int n = xxx_wctomb ((uint8_t *) outptr, uc, outleft);
-                  if (n < 0)
-                    {
-                      if (n == RET_ILUNI)
-                        {
-                          errno = EILSEQ;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      if (n == RET_TOOSMALL)
-                        {
-                          errno = E2BIG;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      abort ();
-                    }
-                  else
-                    {
-                      inptr += m;
-                      inleft -= m;
-                      outptr += n;
-                      outleft -= n;
-                    }
-                }
-            }
-          *inbuf = inptr;
-          *inbytesleft = inleft;
-          *outbuf = outptr;
-          *outbytesleft = outleft;
-          return res;
-        }
-      }
-
-      {
-        int (*xxx_mbtowc) (ucs4_t *, const unsigned char *, size_t);
-
-        case (uintptr_t) _ICONV_UTF16BE_UTF8:
-          xxx_mbtowc = utf16be_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF16LE_UTF8:
-          xxx_mbtowc = utf16le_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF32BE_UTF8:
-          xxx_mbtowc = utf32be_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF32LE_UTF8:
-          xxx_mbtowc = utf32le_mbtowc;
-          goto loop_to_utf8;
-
-       loop_to_utf8:
-        if (inbuf == NULL || *inbuf == NULL)
-          return 0;
-        {
-          ICONV_CONST char *inptr = *inbuf;
-          size_t inleft = *inbytesleft;
-          char *outptr = *outbuf;
-          size_t outleft = *outbytesleft;
-          size_t res = 0;
-          while (inleft > 0)
-            {
-              ucs4_t uc;
-              int m = xxx_mbtowc (&uc, (const uint8_t *) inptr, inleft);
-              if (m <= 0)
-                {
-                  if (m == RET_ILSEQ)
-                    {
-                      errno = EILSEQ;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  if (m == RET_TOOFEW)
-                    {
-                      errno = EINVAL;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  abort ();
-                }
-              else
-                {
-                  int n = u8_uctomb ((uint8_t *) outptr, uc, outleft);
-                  if (n < 0)
-                    {
-                      if (n == -1)
-                        {
-                          errno = EILSEQ;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      if (n == -2)
-                        {
-                          errno = E2BIG;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      abort ();
-                    }
-                  else
-                    {
-                      inptr += m;
-                      inleft -= m;
-                      outptr += n;
-                      outleft -= n;
-                    }
-                }
-            }
-          *inbuf = inptr;
-          *inbytesleft = inleft;
-          *outbuf = outptr;
-          *outbytesleft = outleft;
-          return res;
-        }
-      }
-    }
-#endif
-  return iconv (cd, inbuf, inbytesleft, outbuf, outbytesleft);
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/iconv_close.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv_close.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/iconv_close.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv_close.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <iconv.h>
-
-#include <stdint.h>
-#ifndef uintptr_t
-# define uintptr_t unsigned long
-#endif
-
-int
-rpl_iconv_close (iconv_t cd)
-#undef iconv_close
-{
-#if REPLACE_ICONV_UTF
-  switch ((uintptr_t) cd)
-    {
-    case (uintptr_t) _ICONV_UTF8_UTF16BE:
-    case (uintptr_t) _ICONV_UTF8_UTF16LE:
-    case (uintptr_t) _ICONV_UTF8_UTF32BE:
-    case (uintptr_t) _ICONV_UTF8_UTF32LE:
-    case (uintptr_t) _ICONV_UTF16BE_UTF8:
-    case (uintptr_t) _ICONV_UTF16LE_UTF8:
-    case (uintptr_t) _ICONV_UTF32BE_UTF8:
-    case (uintptr_t) _ICONV_UTF32LE_UTF8:
-      return 0;
-    }
-#endif
-  return iconv_close (cd);
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/iconv.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/iconv.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv.in.h	2010-04-25 09:20:41.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,20 +13,20 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ICONV_H
+#ifndef _GL_ICONV_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ICONV_H@
 
-#ifndef _@GUARD_PREFIX@_ICONV_H
-#define _@GUARD_PREFIX@_ICONV_H
+#ifndef _GL_ICONV_H
+#define _GL_ICONV_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -35,24 +35,22 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV_OPEN@
+#if @REPLACE_ICONV_OPEN@
 /* An iconv_open wrapper that supports the IANA standardized encoding names
    ("ISO-8859-1" etc.) as far as possible.  */
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv_open rpl_iconv_open
-#  endif
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv_open rpl_iconv_open
+# endif
 _GL_FUNCDECL_RPL (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode));
-# endif
-_GL_CXXALIASWARN (iconv_open);
 #endif
+_GL_CXXALIASWARN (iconv_open);
 
 #if @REPLACE_ICONV_UTF@
 /* Special constants for supporting UTF-{16,32}{BE,LE} encodings.
@@ -67,11 +65,10 @@
 # define _ICONV_UTF32LE_UTF8 (iconv_t)(-168)
 #endif
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv rpl_iconv
-#  endif
+#if @REPLACE_ICONV@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv rpl_iconv
+# endif
 _GL_FUNCDECL_RPL (iconv, size_t,
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
@@ -80,31 +77,25 @@
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv, size_t,
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
-# endif
-_GL_CXXALIASWARN (iconv);
-# ifndef ICONV_CONST
-#  define ICONV_CONST @ICONV_CONST@
-# endif
 #endif
+_GL_CXXALIASWARN (iconv);
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv_close rpl_iconv_close
-#  endif
+#if @REPLACE_ICONV@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv_close rpl_iconv_close
+# endif
 _GL_FUNCDECL_RPL (iconv_close, int, (iconv_t cd));
 _GL_CXXALIAS_RPL (iconv_close, int, (iconv_t cd));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv_close, int, (iconv_t cd));
-# endif
-_GL_CXXALIASWARN (iconv_close);
 #endif
+_GL_CXXALIASWARN (iconv_close);
 
 
-#endif /* _@GUARD_PREFIX@_ICONV_H */
-#endif /* _@GUARD_PREFIX@_ICONV_H */
+#endif /* _GL_ICONV_H */
+#endif /* _GL_ICONV_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/iconv_open.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv_open.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/iconv_open.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/iconv_open.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -56,7 +57,7 @@
      iconv() to these encoding inserts a BOM, which is wrong.
      We do not need to handle conversion between arbitrary encodings and
      UTF-{16,32}{BE,LE}, because the 'striconveh' module implements two-step
-     conversion through UTF-8.
+     conversion throough UTF-8.
      The _ICONV_* constants are chosen to be disjoint from any iconv_t
      returned by the system's iconv_open() functions.  Recall that iconv_t
      is a scalar type.  */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/intprops.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/intprops.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/intprops.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/intprops.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,7 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,304 +18,66 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _GL_INTPROPS_H
-#define _GL_INTPROPS_H
+#ifndef GL_INTPROPS_H
+# define GL_INTPROPS_H
 
-#include <limits.h>
-
-/* Return an integer value, converted to the same type as the integer
-   expression E after integer type promotion.  V is the unconverted value.  */
-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
-
-/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>.  */
-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
+# include <limits.h>
 
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
 
 /* True if the arithmetic type T is an integer type.  bool counts as
    an integer.  */
-#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
+# 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)
+# 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))
-
-/* Return 1 if the integer expression E, after integer promotion, has
-   a signed type.  */
-#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
+# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-
-/* Minimum and maximum values for integer types and expressions.  These
+/* 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.  */
-
-/* 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_MAXIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) -1                                                        \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-/* The maximum and minimum values for the type of the expression E,
-   after integer promotion.  E should not have side effects.  */
-#define _GL_INT_MINIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
-   : _GL_INT_CONVERT (e, 0))
-#define _GL_INT_MAXIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-   : _GL_INT_NEGATE_CONVERT (e, 1))
-#define _GL_SIGNED_INT_MAXIMUM(e)                                       \
-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-
-
-/* Return 1 if the __typeof__ keyword works.  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__))
-# define _GL_HAVE___TYPEOF__ 1
-#else
-# define _GL_HAVE___TYPEOF__ 0
-#endif
-
-/* Return 1 if the integer type or expression T might be signed.  Return 0
-   if it is definitely unsigned.  This macro does not evaluate its argument,
-   and expands to an integer constant expression.  */
-#if _GL_HAVE___TYPEOF__
-# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
-#else
-# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
-#endif
-
-/* Bound on length of the string representing an unsigned integer
-   value representable in B bits.  log10 (2.0) < 146/485.  The
-   smallest value of B where this bound is not tight is 2621.  */
-#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
+# define TYPE_MINIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+        ? (t) 0 \
+        : TYPE_SIGNED_MAGNITUDE (t) \
+        ? ~ (t) 0 \
+        : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+# define TYPE_MAXIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+        ? (t) -1 \
+        : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+
+/* Return zero if T can be determined to be an unsigned type.
+   Otherwise, return 1.
+   When compiling with GCC, INT_STRLEN_BOUND uses this macro to obtain a
+   tighter bound.  Otherwise, it overestimates the true bound by one byte
+   when applied to unsigned types of size 2, 4, 16, ... bytes.
+   The symbol signed_type_or_expr__ is private to this header file.  */
+# if __GNUC__ >= 2
+#  define signed_type_or_expr__(t) TYPE_SIGNED (__typeof__ (t))
+# else
+#  define signed_type_or_expr__(t) 1
+# endif
 
 /* Bound on length of the string representing an integer type or expression T.
-   Subtract 1 for the sign bit if T is signed, and then add 1 more for
-   a minus sign if needed.
-
-   Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is
-   signed, this macro may overestimate the true bound by one byte when
-   applied to unsigned types of size 2, 4, 16, ... bytes.  */
-#define INT_STRLEN_BOUND(t)                                     \
-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
-   + _GL_SIGNED_TYPE_OR_EXPR (t))
+   Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485;
+   add 1 for integer division truncation; add 1 more for a minus sign
+   if needed.  */
+# define INT_STRLEN_BOUND(t) \
+  ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \
+   + signed_type_or_expr__ (t) + 1)
 
 /* Bound on buffer size needed to represent an integer type or expression T,
    including the terminating null.  */
-#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
-
-
-/* Range overflow checks.
-
-   The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
-   operators might not yield numerically correct answers due to
-   arithmetic overflow.  They do not rely on undefined or
-   implementation-defined behavior.  Their implementations are simple
-   and straightforward, but they are a bit harder to use than the
-   INT_<op>_OVERFLOW macros described below.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   Restrictions on *_RANGE_OVERFLOW macros:
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times,
-   so the arguments should not have side effects.  The arithmetic
-   arguments (including the MIN and MAX arguments) must be of the same
-   integer type after the usual arithmetic conversions, and the type
-   must have minimum value MIN and maximum MAX.  Unsigned types should
-   use a zero MIN of the proper type.
-
-   These macros are tuned for constant MIN and MAX.  For commutative
-   operations such as A + B, they are also tuned for constant B.  */
-
-/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_ADD_RANGE_OVERFLOW(a, b, min, max)          \
-  ((b) < 0                                              \
-   ? (a) < (min) - (b)                                  \
-   : (max) - (b) < (a))
-
-/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? (max) + (b) < (a)                                  \
-   : (a) < (min) + (b))
-
-/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_NEGATE_RANGE_OVERFLOW(a, min, max)          \
-  ((min) < 0                                            \
-   ? (a) < - (max)                                      \
-   : 0 < (a))
-
-/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Avoid && and || as they tickle
-   bugs in Sun C 5.11 2010/08/13 and other compilers; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>.  */
-#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? ((a) < 0                                           \
-      ? (a) < (max) / (b)                               \
-      : (b) == -1                                       \
-      ? 0                                               \
-      : (min) / (b) < (a))                              \
-   : (b) == 0                                           \
-   ? 0                                                  \
-   : ((a) < 0                                           \
-      ? (a) < (min) / (b)                               \
-      : (max) / (b) < (a)))
-
-/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.  */
-#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max)       \
-  ((min) < 0 && (b) == -1 && (a) < - (max))
-
-/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.
-   Mathematically, % should never overflow, but on x86-like hosts
-   INT_MIN % -1 traps, and the C standard permits this, so treat this
-   as an overflow too.  */
-#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max)    \
-  INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
-
-/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Here, MIN and MAX are for A only, and B need
-   not be of the same type as the other arguments.  The C standard says that
-   behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
-   A is negative then A << B has undefined behavior and A >> B has
-   implementation-defined behavior, but do not check these other
-   restrictions.  */
-#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max)   \
-  ((a) < 0                                              \
-   ? (a) < (min) >> (b)                                 \
-   : (max) >> (b) < (a))
-
-
-/* The _GL*_OVERFLOW macros have the same restrictions as the
-   *_RANGE_OVERFLOW macros, except that they do not assume that operands
-   (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-   that the result (e.g., A + B) has that type.  */
-#define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-  ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-   : (a) < 0 ? (b) <= (a) + (b)                                         \
-   : (b) < 0 ? (a) <= (a) + (b)                                         \
-   : (a) + (b) < (b))
-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
-  ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
-   : (a) < 0 ? 1                                                        \
-   : (b) < 0 ? (a) - (b) <= (a)                                         \
-   : (a) < (b))
-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
-  (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
-   || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
-#define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
-   : (b) < 0 && (a) + (b) <= (a))
-#define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
-   : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
-
-/* Return a nonzero value if A is a mathematical multiple of B, where
-   A is unsigned, B is negative, and MAX is the maximum value of A's
-   type.  A's type must be the same as (A % B)'s type.  Normally (A %
-   -B == 0) suffices, but things get tricky if -B would overflow.  */
-#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max)                            \
-  (((b) < -_GL_SIGNED_INT_MAXIMUM (b)                                   \
-    ? (_GL_SIGNED_INT_MAXIMUM (b) == (max)                              \
-       ? (a)                                                            \
-       : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1))   \
-    : (a) % - (b))                                                      \
-   == 0)
-
-
-/* Integer overflow checks.
-
-   The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
-   might not yield numerically correct answers due to arithmetic overflow.
-   They work correctly on all known practical hosts, and do not rely
-   on undefined behavior due to signed arithmetic overflow.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_OVERFLOW (i, j))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times, so the
-   arguments should not have side effects.
-
-   These macros are tuned for their last argument being a constant.
-
-   Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
-   A % B, and A << B would overflow, respectively.  */
-
-#define INT_ADD_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
-#define INT_SUBTRACT_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
-#define INT_NEGATE_OVERFLOW(a) \
-  INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-#define INT_MULTIPLY_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
-#define INT_DIVIDE_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
-#define INT_REMAINDER_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
-#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
-  INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
-                                 _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-
-/* Return 1 if the expression A <op> B would overflow,
-   where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
-   assuming MIN and MAX are the minimum and maximum for the result type.
-   Arguments should be free of side effects.  */
-#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
-  op_result_overflow (a, b,                                     \
-                      _GL_INT_MINIMUM (0 * (b) + (a)),          \
-                      _GL_INT_MAXIMUM (0 * (b) + (a)))
+# define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
 
-#endif /* _GL_INTPROPS_H */
+#endif /* GL_INTPROPS_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/iswblank.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/iswblank.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/iswblank.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/iswblank.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* Test wide character for being blank.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <wctype.h>
-
-int
-iswblank (wint_t wc)
-{
-  return wc == ' ' || wc == '\t';
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/localcharset.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/localcharset.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/localcharset.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/localcharset.c	2010-05-09 01:36:15.000000000 +0000
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
@@ -29,12 +30,11 @@
 #include <stdlib.h>
 
 #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
+# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# include <locale.h>
+# define WIN32_NATIVE
 #endif
 
 #if defined __EMX__
@@ -44,7 +44,7 @@
 # endif
 #endif
 
-#if !defined WINDOWS_NATIVE
+#if !defined WIN32_NATIVE
 # include <unistd.h>
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
@@ -57,7 +57,7 @@
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 # endif
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -66,11 +66,6 @@
 # include <os2.h>
 #endif
 
-/* For MB_CUR_MAX_L */
-#if defined DARWIN7
-# include <xlocale.h>
-#endif
-
 #if ENABLE_RELOCATABLE
 # include "relocatable.h"
 #else
@@ -88,7 +83,7 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #endif
 
@@ -128,7 +123,7 @@
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
       const char *dir;
       const char *base = "charset.alias";
       char *file_name;
@@ -233,7 +228,8 @@
                         {
                           /* Out of memory. */
                           res_size = 0;
-                          free (old_res_ptr);
+                          if (old_res_ptr != NULL)
+                            free (old_res_ptr);
                           break;
                         }
                       strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
@@ -313,7 +309,7 @@
            "DECKOREAN" "\0" "EUC-KR" "\0";
 # endif
 
-# if defined WINDOWS_NATIVE || defined __CYGWIN__
+# if defined WIN32_NATIVE || defined __CYGWIN__
       /* To avoid the troubles of installing a separate file in the same
          directory as the DLL and of retrieving the DLL's directory at
          runtime, simply inline the aliases here.  */
@@ -365,7 +361,7 @@
   const char *codeset;
   const char *aliases;
 
-#if !(defined WINDOWS_NATIVE || defined OS2)
+#if !(defined WIN32_NATIVE || defined OS2)
 
 # if HAVE_LANGINFO_CODESET
 
@@ -412,10 +408,10 @@
             }
         }
 
-      /* The Windows API has a function returning the locale's codepage as a
-         number: GetACP().  This encoding is used by Cygwin, unless the user
-         has set the environment variable CYGWIN=codepage:oem (which very few
-         people do).
+      /* Woe32 has a function returning the locale's codepage as a number:
+         GetACP().  This encoding is used by Cygwin, unless the user has set
+         the environment variable CYGWIN=codepage:oem (which very few people
+         do).
          Output directed to console windows needs to be converted (to
          GetOEMCP() if the console is using a raster font, or to
          GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
@@ -458,38 +454,18 @@
 
 # endif
 
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 
   static char buf[2 + 10 + 1];
 
-  /* The Windows API has a function returning the locale's codepage as
-     a number, but the value doesn't change according to what the
-     'setlocale' call specified.  So we use it as a last resort, in
-     case the string returned by 'setlocale' doesn't specify the
-     codepage.  */
-  char *current_locale = setlocale (LC_ALL, NULL);
-  char *pdot;
-
-  /* If they set different locales for different categories,
-     'setlocale' will return a semi-colon separated list of locale
-     values.  To make sure we use the correct one, we choose LC_CTYPE.  */
-  if (strchr (current_locale, ';'))
-    current_locale = setlocale (LC_CTYPE, NULL);
-
-  pdot = strrchr (current_locale, '.');
-  if (pdot)
-    sprintf (buf, "CP%s", pdot + 1);
-  else
-    {
-      /* The Windows API has a function returning the locale's codepage as a
-        number: GetACP().
-        When the output goes to a console window, it needs to be provided in
-        GetOEMCP() encoding if the console is using a raster font, or in
-        GetConsoleOutputCP() encoding if it is using a TrueType font.
-        But in GUI programs and for output sent to files and pipes, GetACP()
-        encoding is the best bet.  */
-      sprintf (buf, "CP%u", GetACP ());
-    }
+  /* Woe32 has a function returning the locale's codepage as a number:
+     GetACP().
+     When the output goes to a console window, it needs to be provided in
+     GetOEMCP() encoding if the console is using a raster font, or in
+     GetConsoleOutputCP() encoding if it is using a TrueType font.
+     But in GUI programs and for output sent to files and pipes, GetACP()
+     encoding is the best bet.  */
+  sprintf (buf, "CP%u", GetACP ());
   codeset = buf;
 
 #elif defined OS2
@@ -568,12 +544,5 @@
   if (codeset[0] == '\0')
     codeset = "ASCII";
 
-#ifdef DARWIN7
-  /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
-     (the default codeset) does not work when MB_CUR_MAX is 1.  */
-  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
-    codeset = "ASCII";
-#endif
-
   return codeset;
 }
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/localcharset.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/localcharset.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/localcharset.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/localcharset.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2010 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
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/locale.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/locale.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/locale.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/locale.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,216 +0,0 @@
-/* A POSIX <locale.h>.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-#ifdef _GL_ALREADY_INCLUDING_LOCALE_H
-
-/* Special invocation conventions to handle Solaris header files
-   (through Solaris 10) when combined with gettext's libintl.h.  */
-
-#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
-
-#else
-/* Normal invocation convention.  */
-
-#ifndef _@GUARD_PREFIX@_LOCALE_H
-
-#define _GL_ALREADY_INCLUDING_LOCALE_H
-
-/* The include_next requires a split double-inclusion guard.  */
-#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
-
-#undef _GL_ALREADY_INCLUDING_LOCALE_H
-
-#ifndef _@GUARD_PREFIX@_LOCALE_H
-#define _@GUARD_PREFIX@_LOCALE_H
-
-/* NetBSD 5.0 mis-defines NULL.  */
-#include <stddef.h>
-
-/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */
-#if @HAVE_XLOCALE_H@
-# include <xlocale.h>
-#endif
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-/* The LC_MESSAGES locale category is specified in POSIX, but not in ISO C.
-   On systems that don't define it, use the same value as GNU libintl.  */
-#if !defined LC_MESSAGES
-# define LC_MESSAGES 1729
-#endif
-
-/* Bionic libc's 'struct lconv' is just a dummy.  */
-#if @REPLACE_STRUCT_LCONV@
-# define lconv rpl_lconv
-struct lconv
-{
-  /* All 'char *' are actually 'const char *'.  */
-
-  /* Members that depend on the LC_NUMERIC category of the locale.  See
-     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap07.html#tag_07_03_04> */
-
-  /* Symbol used as decimal point.  */
-  char *decimal_point;
-  /* Symbol used to separate groups of digits to the left of the decimal
-     point.  */
-  char *thousands_sep;
-  /* Definition of the size of groups of digits to the left of the decimal
-     point.  */
-  char *grouping;
-
-  /* Members that depend on the LC_MONETARY category of the locale.  See
-     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap07.html#tag_07_03_03> */
-
-  /* Symbol used as decimal point.  */
-  char *mon_decimal_point;
-  /* Symbol used to separate groups of digits to the left of the decimal
-     point.  */
-  char *mon_thousands_sep;
-  /* Definition of the size of groups of digits to the left of the decimal
-     point.  */
-  char *mon_grouping;
-  /* Sign used to indicate a value >= 0.  */
-  char *positive_sign;
-  /* Sign used to indicate a value < 0.  */
-  char *negative_sign;
-
-  /* For formatting local currency.  */
-  /* Currency symbol (3 characters) followed by separator (1 character).  */
-  char *currency_symbol;
-  /* Number of digits after the decimal point.  */
-  char frac_digits;
-  /* For values >= 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char p_cs_precedes;
-  /* For values >= 0: Position of the sign.  */
-  char p_sign_posn;
-  /* For values >= 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char p_sep_by_space;
-  /* For values < 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char n_cs_precedes;
-  /* For values < 0: Position of the sign.  */
-  char n_sign_posn;
-  /* For values < 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char n_sep_by_space;
-
-  /* For formatting international currency.  */
-  /* Currency symbol (3 characters) followed by separator (1 character).  */
-  char *int_curr_symbol;
-  /* Number of digits after the decimal point.  */
-  char int_frac_digits;
-  /* For values >= 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char int_p_cs_precedes;
-  /* For values >= 0: Position of the sign.  */
-  char int_p_sign_posn;
-  /* For values >= 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char int_p_sep_by_space;
-  /* For values < 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char int_n_cs_precedes;
-  /* For values < 0: Position of the sign.  */
-  char int_n_sign_posn;
-  /* For values < 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char int_n_sep_by_space;
-};
-#endif
-
-#if @GNULIB_LOCALECONV@
-# if @REPLACE_LOCALECONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef localeconv
-#   define localeconv rpl_localeconv
-#  endif
-_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void));
-_GL_CXXALIAS_RPL (localeconv, struct lconv *, (void));
-# else
-_GL_CXXALIAS_SYS (localeconv, struct lconv *, (void));
-# endif
-_GL_CXXALIASWARN (localeconv);
-#elif @REPLACE_STRUCT_LCONV@
-# undef localeconv
-# define localeconv localeconv_used_without_requesting_gnulib_module_localeconv
-#elif defined GNULIB_POSIXCHECK
-# undef localeconv
-# if HAVE_RAW_DECL_LOCALECONV
-_GL_WARN_ON_USE (localeconv,
-                 "localeconv returns too few information on some platforms - "
-                 "use gnulib module localeconv for portability");
-# endif
-#endif
-
-#if @GNULIB_SETLOCALE@
-# if @REPLACE_SETLOCALE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef setlocale
-#   define setlocale rpl_setlocale
-#   define GNULIB_defined_setlocale 1
-#  endif
-_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale));
-_GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale));
-# else
-_GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale));
-# endif
-_GL_CXXALIASWARN (setlocale);
-#elif defined GNULIB_POSIXCHECK
-# undef setlocale
-# if HAVE_RAW_DECL_SETLOCALE
-_GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
-                 "use gnulib module setlocale for portability");
-# endif
-#endif
-
-#if @GNULIB_DUPLOCALE@
-# if @REPLACE_DUPLOCALE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef duplocale
-#   define duplocale rpl_duplocale
-#  endif
-_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale));
-# else
-#  if @HAVE_DUPLOCALE@
-_GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale));
-#  endif
-# endif
-# if @HAVE_DUPLOCALE@
-_GL_CXXALIASWARN (duplocale);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef duplocale
-# if HAVE_RAW_DECL_DUPLOCALE
-_GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - "
-                 "use gnulib module duplocale for portability");
-# endif
-#endif
-
-#endif /* _@GUARD_PREFIX@_LOCALE_H */
-#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */
-#endif /* _@GUARD_PREFIX@_LOCALE_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/localename.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/localename.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/localename.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/localename.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2958 +0,0 @@
-/* Determine name of the currently selected locale.
-   Copyright (C) 1995-2014 Free Software Foundation, Inc.
-
-   This 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 Ulrich Drepper <drepper@gnu.org>, 1995.  */
-/* Native Windows code written by Tor Lillqvist <tml@iki.fi>.  */
-/* Mac OS X code written by Bruno Haible <bruno@clisp.org>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#ifdef IN_LIBINTL
-# include "gettextP.h"
-#else
-# include "localename.h"
-#endif
-
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <string.h>
-
-#if HAVE_USELOCALE
-/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */
-# if defined __APPLE__ && defined __MACH__
-#  include <xlocale.h>
-# endif
-# include <langinfo.h>
-# if !defined IN_LIBINTL
-#  include "glthread/lock.h"
-# endif
-#endif
-
-#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-# include <CoreFoundation/CFString.h>
-# if HAVE_CFLOCALECOPYCURRENT
-#  include <CoreFoundation/CFLocale.h>
-# elif HAVE_CFPREFERENCESCOPYAPPVALUE
-#  include <CoreFoundation/CFPreferences.h>
-# endif
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# if !defined IN_LIBINTL
-#  include "glthread/lock.h"
-# endif
-#endif
-
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# include <winnls.h>
-/* List of language codes, sorted by value:
-   0x01 LANG_ARABIC
-   0x02 LANG_BULGARIAN
-   0x03 LANG_CATALAN
-   0x04 LANG_CHINESE
-   0x05 LANG_CZECH
-   0x06 LANG_DANISH
-   0x07 LANG_GERMAN
-   0x08 LANG_GREEK
-   0x09 LANG_ENGLISH
-   0x0a LANG_SPANISH
-   0x0b LANG_FINNISH
-   0x0c LANG_FRENCH
-   0x0d LANG_HEBREW
-   0x0e LANG_HUNGARIAN
-   0x0f LANG_ICELANDIC
-   0x10 LANG_ITALIAN
-   0x11 LANG_JAPANESE
-   0x12 LANG_KOREAN
-   0x13 LANG_DUTCH
-   0x14 LANG_NORWEGIAN
-   0x15 LANG_POLISH
-   0x16 LANG_PORTUGUESE
-   0x17 LANG_ROMANSH
-   0x18 LANG_ROMANIAN
-   0x19 LANG_RUSSIAN
-   0x1a LANG_CROATIAN == LANG_SERBIAN
-   0x1b LANG_SLOVAK
-   0x1c LANG_ALBANIAN
-   0x1d LANG_SWEDISH
-   0x1e LANG_THAI
-   0x1f LANG_TURKISH
-   0x20 LANG_URDU
-   0x21 LANG_INDONESIAN
-   0x22 LANG_UKRAINIAN
-   0x23 LANG_BELARUSIAN
-   0x24 LANG_SLOVENIAN
-   0x25 LANG_ESTONIAN
-   0x26 LANG_LATVIAN
-   0x27 LANG_LITHUANIAN
-   0x28 LANG_TAJIK
-   0x29 LANG_FARSI
-   0x2a LANG_VIETNAMESE
-   0x2b LANG_ARMENIAN
-   0x2c LANG_AZERI
-   0x2d LANG_BASQUE
-   0x2e LANG_SORBIAN
-   0x2f LANG_MACEDONIAN
-   0x30 LANG_SUTU
-   0x31 LANG_TSONGA
-   0x32 LANG_TSWANA
-   0x33 LANG_VENDA
-   0x34 LANG_XHOSA
-   0x35 LANG_ZULU
-   0x36 LANG_AFRIKAANS
-   0x37 LANG_GEORGIAN
-   0x38 LANG_FAEROESE
-   0x39 LANG_HINDI
-   0x3a LANG_MALTESE
-   0x3b LANG_SAMI
-   0x3c LANG_GAELIC
-   0x3d LANG_YIDDISH
-   0x3e LANG_MALAY
-   0x3f LANG_KAZAK
-   0x40 LANG_KYRGYZ
-   0x41 LANG_SWAHILI
-   0x42 LANG_TURKMEN
-   0x43 LANG_UZBEK
-   0x44 LANG_TATAR
-   0x45 LANG_BENGALI
-   0x46 LANG_PUNJABI
-   0x47 LANG_GUJARATI
-   0x48 LANG_ORIYA
-   0x49 LANG_TAMIL
-   0x4a LANG_TELUGU
-   0x4b LANG_KANNADA
-   0x4c LANG_MALAYALAM
-   0x4d LANG_ASSAMESE
-   0x4e LANG_MARATHI
-   0x4f LANG_SANSKRIT
-   0x50 LANG_MONGOLIAN
-   0x51 LANG_TIBETAN
-   0x52 LANG_WELSH
-   0x53 LANG_CAMBODIAN
-   0x54 LANG_LAO
-   0x55 LANG_BURMESE
-   0x56 LANG_GALICIAN
-   0x57 LANG_KONKANI
-   0x58 LANG_MANIPURI
-   0x59 LANG_SINDHI
-   0x5a LANG_SYRIAC
-   0x5b LANG_SINHALESE
-   0x5c LANG_CHEROKEE
-   0x5d LANG_INUKTITUT
-   0x5e LANG_AMHARIC
-   0x5f LANG_TAMAZIGHT
-   0x60 LANG_KASHMIRI
-   0x61 LANG_NEPALI
-   0x62 LANG_FRISIAN
-   0x63 LANG_PASHTO
-   0x64 LANG_TAGALOG
-   0x65 LANG_DIVEHI
-   0x66 LANG_EDO
-   0x67 LANG_FULFULDE
-   0x68 LANG_HAUSA
-   0x69 LANG_IBIBIO
-   0x6a LANG_YORUBA
-   0x6d LANG_BASHKIR
-   0x6e LANG_LUXEMBOURGISH
-   0x6f LANG_GREENLANDIC
-   0x70 LANG_IGBO
-   0x71 LANG_KANURI
-   0x72 LANG_OROMO
-   0x73 LANG_TIGRINYA
-   0x74 LANG_GUARANI
-   0x75 LANG_HAWAIIAN
-   0x76 LANG_LATIN
-   0x77 LANG_SOMALI
-   0x78 LANG_YI
-   0x79 LANG_PAPIAMENTU
-   0x7a LANG_MAPUDUNGUN
-   0x7c LANG_MOHAWK
-   0x7e LANG_BRETON
-   0x82 LANG_OCCITAN
-   0x83 LANG_CORSICAN
-   0x84 LANG_ALSATIAN
-   0x85 LANG_YAKUT
-   0x86 LANG_KICHE
-   0x87 LANG_KINYARWANDA
-   0x88 LANG_WOLOF
-   0x8c LANG_DARI
-   0x91 LANG_SCOTTISH_GAELIC
-*/
-/* Mingw headers don't have latest language and sublanguage codes.  */
-# ifndef LANG_AFRIKAANS
-# define LANG_AFRIKAANS 0x36
-# endif
-# ifndef LANG_ALBANIAN
-# define LANG_ALBANIAN 0x1c
-# endif
-# ifndef LANG_ALSATIAN
-# define LANG_ALSATIAN 0x84
-# endif
-# ifndef LANG_AMHARIC
-# define LANG_AMHARIC 0x5e
-# endif
-# ifndef LANG_ARABIC
-# define LANG_ARABIC 0x01
-# endif
-# ifndef LANG_ARMENIAN
-# define LANG_ARMENIAN 0x2b
-# endif
-# ifndef LANG_ASSAMESE
-# define LANG_ASSAMESE 0x4d
-# endif
-# ifndef LANG_AZERI
-# define LANG_AZERI 0x2c
-# endif
-# ifndef LANG_BASHKIR
-# define LANG_BASHKIR 0x6d
-# endif
-# ifndef LANG_BASQUE
-# define LANG_BASQUE 0x2d
-# endif
-# ifndef LANG_BELARUSIAN
-# define LANG_BELARUSIAN 0x23
-# endif
-# ifndef LANG_BENGALI
-# define LANG_BENGALI 0x45
-# endif
-# ifndef LANG_BRETON
-# define LANG_BRETON 0x7e
-# endif
-# ifndef LANG_BURMESE
-# define LANG_BURMESE 0x55
-# endif
-# ifndef LANG_CAMBODIAN
-# define LANG_CAMBODIAN 0x53
-# endif
-# ifndef LANG_CATALAN
-# define LANG_CATALAN 0x03
-# endif
-# ifndef LANG_CHEROKEE
-# define LANG_CHEROKEE 0x5c
-# endif
-# ifndef LANG_CORSICAN
-# define LANG_CORSICAN 0x83
-# endif
-# ifndef LANG_DARI
-# define LANG_DARI 0x8c
-# endif
-# ifndef LANG_DIVEHI
-# define LANG_DIVEHI 0x65
-# endif
-# ifndef LANG_EDO
-# define LANG_EDO 0x66
-# endif
-# ifndef LANG_ESTONIAN
-# define LANG_ESTONIAN 0x25
-# endif
-# ifndef LANG_FAEROESE
-# define LANG_FAEROESE 0x38
-# endif
-# ifndef LANG_FARSI
-# define LANG_FARSI 0x29
-# endif
-# ifndef LANG_FRISIAN
-# define LANG_FRISIAN 0x62
-# endif
-# ifndef LANG_FULFULDE
-# define LANG_FULFULDE 0x67
-# endif
-# ifndef LANG_GAELIC
-# define LANG_GAELIC 0x3c
-# endif
-# ifndef LANG_GALICIAN
-# define LANG_GALICIAN 0x56
-# endif
-# ifndef LANG_GEORGIAN
-# define LANG_GEORGIAN 0x37
-# endif
-# ifndef LANG_GREENLANDIC
-# define LANG_GREENLANDIC 0x6f
-# endif
-# ifndef LANG_GUARANI
-# define LANG_GUARANI 0x74
-# endif
-# ifndef LANG_GUJARATI
-# define LANG_GUJARATI 0x47
-# endif
-# ifndef LANG_HAUSA
-# define LANG_HAUSA 0x68
-# endif
-# ifndef LANG_HAWAIIAN
-# define LANG_HAWAIIAN 0x75
-# endif
-# ifndef LANG_HEBREW
-# define LANG_HEBREW 0x0d
-# endif
-# ifndef LANG_HINDI
-# define LANG_HINDI 0x39
-# endif
-# ifndef LANG_IBIBIO
-# define LANG_IBIBIO 0x69
-# endif
-# ifndef LANG_IGBO
-# define LANG_IGBO 0x70
-# endif
-# ifndef LANG_INDONESIAN
-# define LANG_INDONESIAN 0x21
-# endif
-# ifndef LANG_INUKTITUT
-# define LANG_INUKTITUT 0x5d
-# endif
-# ifndef LANG_KANNADA
-# define LANG_KANNADA 0x4b
-# endif
-# ifndef LANG_KANURI
-# define LANG_KANURI 0x71
-# endif
-# ifndef LANG_KASHMIRI
-# define LANG_KASHMIRI 0x60
-# endif
-# ifndef LANG_KAZAK
-# define LANG_KAZAK 0x3f
-# endif
-# ifndef LANG_KICHE
-# define LANG_KICHE 0x86
-# endif
-# ifndef LANG_KINYARWANDA
-# define LANG_KINYARWANDA 0x87
-# endif
-# ifndef LANG_KONKANI
-# define LANG_KONKANI 0x57
-# endif
-# ifndef LANG_KYRGYZ
-# define LANG_KYRGYZ 0x40
-# endif
-# ifndef LANG_LAO
-# define LANG_LAO 0x54
-# endif
-# ifndef LANG_LATIN
-# define LANG_LATIN 0x76
-# endif
-# ifndef LANG_LATVIAN
-# define LANG_LATVIAN 0x26
-# endif
-# ifndef LANG_LITHUANIAN
-# define LANG_LITHUANIAN 0x27
-# endif
-# ifndef LANG_LUXEMBOURGISH
-# define LANG_LUXEMBOURGISH 0x6e
-# endif
-# ifndef LANG_MACEDONIAN
-# define LANG_MACEDONIAN 0x2f
-# endif
-# ifndef LANG_MALAY
-# define LANG_MALAY 0x3e
-# endif
-# ifndef LANG_MALAYALAM
-# define LANG_MALAYALAM 0x4c
-# endif
-# ifndef LANG_MALTESE
-# define LANG_MALTESE 0x3a
-# endif
-# ifndef LANG_MANIPURI
-# define LANG_MANIPURI 0x58
-# endif
-# ifndef LANG_MAORI
-# define LANG_MAORI 0x81
-# endif
-# ifndef LANG_MAPUDUNGUN
-# define LANG_MAPUDUNGUN 0x7a
-# endif
-# ifndef LANG_MARATHI
-# define LANG_MARATHI 0x4e
-# endif
-# ifndef LANG_MOHAWK
-# define LANG_MOHAWK 0x7c
-# endif
-# ifndef LANG_MONGOLIAN
-# define LANG_MONGOLIAN 0x50
-# endif
-# ifndef LANG_NEPALI
-# define LANG_NEPALI 0x61
-# endif
-# ifndef LANG_OCCITAN
-# define LANG_OCCITAN 0x82
-# endif
-# ifndef LANG_ORIYA
-# define LANG_ORIYA 0x48
-# endif
-# ifndef LANG_OROMO
-# define LANG_OROMO 0x72
-# endif
-# ifndef LANG_PAPIAMENTU
-# define LANG_PAPIAMENTU 0x79
-# endif
-# ifndef LANG_PASHTO
-# define LANG_PASHTO 0x63
-# endif
-# ifndef LANG_PUNJABI
-# define LANG_PUNJABI 0x46
-# endif
-# ifndef LANG_QUECHUA
-# define LANG_QUECHUA 0x6b
-# endif
-# ifndef LANG_ROMANSH
-# define LANG_ROMANSH 0x17
-# endif
-# ifndef LANG_SAMI
-# define LANG_SAMI 0x3b
-# endif
-# ifndef LANG_SANSKRIT
-# define LANG_SANSKRIT 0x4f
-# endif
-# ifndef LANG_SCOTTISH_GAELIC
-# define LANG_SCOTTISH_GAELIC 0x91
-# endif
-# ifndef LANG_SERBIAN
-# define LANG_SERBIAN 0x1a
-# endif
-# ifndef LANG_SINDHI
-# define LANG_SINDHI 0x59
-# endif
-# ifndef LANG_SINHALESE
-# define LANG_SINHALESE 0x5b
-# endif
-# ifndef LANG_SLOVAK
-# define LANG_SLOVAK 0x1b
-# endif
-# ifndef LANG_SOMALI
-# define LANG_SOMALI 0x77
-# endif
-# ifndef LANG_SORBIAN
-# define LANG_SORBIAN 0x2e
-# endif
-# ifndef LANG_SOTHO
-# define LANG_SOTHO 0x6c
-# endif
-# ifndef LANG_SUTU
-# define LANG_SUTU 0x30
-# endif
-# ifndef LANG_SWAHILI
-# define LANG_SWAHILI 0x41
-# endif
-# ifndef LANG_SYRIAC
-# define LANG_SYRIAC 0x5a
-# endif
-# ifndef LANG_TAGALOG
-# define LANG_TAGALOG 0x64
-# endif
-# ifndef LANG_TAJIK
-# define LANG_TAJIK 0x28
-# endif
-# ifndef LANG_TAMAZIGHT
-# define LANG_TAMAZIGHT 0x5f
-# endif
-# ifndef LANG_TAMIL
-# define LANG_TAMIL 0x49
-# endif
-# ifndef LANG_TATAR
-# define LANG_TATAR 0x44
-# endif
-# ifndef LANG_TELUGU
-# define LANG_TELUGU 0x4a
-# endif
-# ifndef LANG_THAI
-# define LANG_THAI 0x1e
-# endif
-# ifndef LANG_TIBETAN
-# define LANG_TIBETAN 0x51
-# endif
-# ifndef LANG_TIGRINYA
-# define LANG_TIGRINYA 0x73
-# endif
-# ifndef LANG_TSONGA
-# define LANG_TSONGA 0x31
-# endif
-# ifndef LANG_TSWANA
-# define LANG_TSWANA 0x32
-# endif
-# ifndef LANG_TURKMEN
-# define LANG_TURKMEN 0x42
-# endif
-# ifndef LANG_UIGHUR
-# define LANG_UIGHUR 0x80
-# endif
-# ifndef LANG_UKRAINIAN
-# define LANG_UKRAINIAN 0x22
-# endif
-# ifndef LANG_URDU
-# define LANG_URDU 0x20
-# endif
-# ifndef LANG_UZBEK
-# define LANG_UZBEK 0x43
-# endif
-# ifndef LANG_VENDA
-# define LANG_VENDA 0x33
-# endif
-# ifndef LANG_VIETNAMESE
-# define LANG_VIETNAMESE 0x2a
-# endif
-# ifndef LANG_WELSH
-# define LANG_WELSH 0x52
-# endif
-# ifndef LANG_WOLOF
-# define LANG_WOLOF 0x88
-# endif
-# ifndef LANG_XHOSA
-# define LANG_XHOSA 0x34
-# endif
-# ifndef LANG_YAKUT
-# define LANG_YAKUT 0x85
-# endif
-# ifndef LANG_YI
-# define LANG_YI 0x78
-# endif
-# ifndef LANG_YIDDISH
-# define LANG_YIDDISH 0x3d
-# endif
-# ifndef LANG_YORUBA
-# define LANG_YORUBA 0x6a
-# endif
-# ifndef LANG_ZULU
-# define LANG_ZULU 0x35
-# endif
-# ifndef SUBLANG_AFRIKAANS_SOUTH_AFRICA
-# define SUBLANG_AFRIKAANS_SOUTH_AFRICA 0x01
-# endif
-# ifndef SUBLANG_ALBANIAN_ALBANIA
-# define SUBLANG_ALBANIAN_ALBANIA 0x01
-# endif
-# ifndef SUBLANG_ALSATIAN_FRANCE
-# define SUBLANG_ALSATIAN_FRANCE 0x01
-# endif
-# ifndef SUBLANG_AMHARIC_ETHIOPIA
-# define SUBLANG_AMHARIC_ETHIOPIA 0x01
-# endif
-# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
-# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
-# endif
-# ifndef SUBLANG_ARABIC_IRAQ
-# define SUBLANG_ARABIC_IRAQ 0x02
-# endif
-# ifndef SUBLANG_ARABIC_EGYPT
-# define SUBLANG_ARABIC_EGYPT 0x03
-# endif
-# ifndef SUBLANG_ARABIC_LIBYA
-# define SUBLANG_ARABIC_LIBYA 0x04
-# endif
-# ifndef SUBLANG_ARABIC_ALGERIA
-# define SUBLANG_ARABIC_ALGERIA 0x05
-# endif
-# ifndef SUBLANG_ARABIC_MOROCCO
-# define SUBLANG_ARABIC_MOROCCO 0x06
-# endif
-# ifndef SUBLANG_ARABIC_TUNISIA
-# define SUBLANG_ARABIC_TUNISIA 0x07
-# endif
-# ifndef SUBLANG_ARABIC_OMAN
-# define SUBLANG_ARABIC_OMAN 0x08
-# endif
-# ifndef SUBLANG_ARABIC_YEMEN
-# define SUBLANG_ARABIC_YEMEN 0x09
-# endif
-# ifndef SUBLANG_ARABIC_SYRIA
-# define SUBLANG_ARABIC_SYRIA 0x0a
-# endif
-# ifndef SUBLANG_ARABIC_JORDAN
-# define SUBLANG_ARABIC_JORDAN 0x0b
-# endif
-# ifndef SUBLANG_ARABIC_LEBANON
-# define SUBLANG_ARABIC_LEBANON 0x0c
-# endif
-# ifndef SUBLANG_ARABIC_KUWAIT
-# define SUBLANG_ARABIC_KUWAIT 0x0d
-# endif
-# ifndef SUBLANG_ARABIC_UAE
-# define SUBLANG_ARABIC_UAE 0x0e
-# endif
-# ifndef SUBLANG_ARABIC_BAHRAIN
-# define SUBLANG_ARABIC_BAHRAIN 0x0f
-# endif
-# ifndef SUBLANG_ARABIC_QATAR
-# define SUBLANG_ARABIC_QATAR 0x10
-# endif
-# ifndef SUBLANG_ARMENIAN_ARMENIA
-# define SUBLANG_ARMENIAN_ARMENIA 0x01
-# endif
-# ifndef SUBLANG_ASSAMESE_INDIA
-# define SUBLANG_ASSAMESE_INDIA 0x01
-# endif
-# ifndef SUBLANG_AZERI_LATIN
-# define SUBLANG_AZERI_LATIN 0x01
-# endif
-# ifndef SUBLANG_AZERI_CYRILLIC
-# define SUBLANG_AZERI_CYRILLIC 0x02
-# endif
-# ifndef SUBLANG_BASHKIR_RUSSIA
-# define SUBLANG_BASHKIR_RUSSIA 0x01
-# endif
-# ifndef SUBLANG_BASQUE_BASQUE
-# define SUBLANG_BASQUE_BASQUE 0x01
-# endif
-# ifndef SUBLANG_BELARUSIAN_BELARUS
-# define SUBLANG_BELARUSIAN_BELARUS 0x01
-# endif
-# ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x01
-# endif
-# ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x02
-# endif
-# ifndef SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN
-# define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN 0x05
-# endif
-# ifndef SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC
-# define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x08
-# endif
-# ifndef SUBLANG_BRETON_FRANCE
-# define SUBLANG_BRETON_FRANCE 0x01
-# endif
-# ifndef SUBLANG_BULGARIAN_BULGARIA
-# define SUBLANG_BULGARIAN_BULGARIA 0x01
-# endif
-# ifndef SUBLANG_CAMBODIAN_CAMBODIA
-# define SUBLANG_CAMBODIAN_CAMBODIA 0x01
-# endif
-# ifndef SUBLANG_CATALAN_SPAIN
-# define SUBLANG_CATALAN_SPAIN 0x01
-# endif
-# ifndef SUBLANG_CORSICAN_FRANCE
-# define SUBLANG_CORSICAN_FRANCE 0x01
-# endif
-# ifndef SUBLANG_CROATIAN_CROATIA
-# define SUBLANG_CROATIAN_CROATIA 0x01
-# endif
-# ifndef SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN
-# define SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN 0x04
-# endif
-# ifndef SUBLANG_CHINESE_MACAU
-# define SUBLANG_CHINESE_MACAU 0x05
-# endif
-# ifndef SUBLANG_CZECH_CZECH_REPUBLIC
-# define SUBLANG_CZECH_CZECH_REPUBLIC 0x01
-# endif
-# ifndef SUBLANG_DANISH_DENMARK
-# define SUBLANG_DANISH_DENMARK 0x01
-# endif
-# ifndef SUBLANG_DARI_AFGHANISTAN
-# define SUBLANG_DARI_AFGHANISTAN 0x01
-# endif
-# ifndef SUBLANG_DIVEHI_MALDIVES
-# define SUBLANG_DIVEHI_MALDIVES 0x01
-# endif
-# ifndef SUBLANG_DUTCH_SURINAM
-# define SUBLANG_DUTCH_SURINAM 0x03
-# endif
-# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
-# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
-# endif
-# ifndef SUBLANG_ENGLISH_JAMAICA
-# define SUBLANG_ENGLISH_JAMAICA 0x08
-# endif
-# ifndef SUBLANG_ENGLISH_CARIBBEAN
-# define SUBLANG_ENGLISH_CARIBBEAN 0x09
-# endif
-# ifndef SUBLANG_ENGLISH_BELIZE
-# define SUBLANG_ENGLISH_BELIZE 0x0a
-# endif
-# ifndef SUBLANG_ENGLISH_TRINIDAD
-# define SUBLANG_ENGLISH_TRINIDAD 0x0b
-# endif
-# ifndef SUBLANG_ENGLISH_ZIMBABWE
-# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
-# endif
-# ifndef SUBLANG_ENGLISH_PHILIPPINES
-# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
-# endif
-# ifndef SUBLANG_ENGLISH_INDONESIA
-# define SUBLANG_ENGLISH_INDONESIA 0x0e
-# endif
-# ifndef SUBLANG_ENGLISH_HONGKONG
-# define SUBLANG_ENGLISH_HONGKONG 0x0f
-# endif
-# ifndef SUBLANG_ENGLISH_INDIA
-# define SUBLANG_ENGLISH_INDIA 0x10
-# endif
-# ifndef SUBLANG_ENGLISH_MALAYSIA
-# define SUBLANG_ENGLISH_MALAYSIA 0x11
-# endif
-# ifndef SUBLANG_ENGLISH_SINGAPORE
-# define SUBLANG_ENGLISH_SINGAPORE 0x12
-# endif
-# ifndef SUBLANG_ESTONIAN_ESTONIA
-# define SUBLANG_ESTONIAN_ESTONIA 0x01
-# endif
-# ifndef SUBLANG_FAEROESE_FAROE_ISLANDS
-# define SUBLANG_FAEROESE_FAROE_ISLANDS 0x01
-# endif
-# ifndef SUBLANG_FARSI_IRAN
-# define SUBLANG_FARSI_IRAN 0x01
-# endif
-# ifndef SUBLANG_FINNISH_FINLAND
-# define SUBLANG_FINNISH_FINLAND 0x01
-# endif
-# ifndef SUBLANG_FRENCH_LUXEMBOURG
-# define SUBLANG_FRENCH_LUXEMBOURG 0x05
-# endif
-# ifndef SUBLANG_FRENCH_MONACO
-# define SUBLANG_FRENCH_MONACO 0x06
-# endif
-# ifndef SUBLANG_FRENCH_WESTINDIES
-# define SUBLANG_FRENCH_WESTINDIES 0x07
-# endif
-# ifndef SUBLANG_FRENCH_REUNION
-# define SUBLANG_FRENCH_REUNION 0x08
-# endif
-# ifndef SUBLANG_FRENCH_CONGO
-# define SUBLANG_FRENCH_CONGO 0x09
-# endif
-# ifndef SUBLANG_FRENCH_SENEGAL
-# define SUBLANG_FRENCH_SENEGAL 0x0a
-# endif
-# ifndef SUBLANG_FRENCH_CAMEROON
-# define SUBLANG_FRENCH_CAMEROON 0x0b
-# endif
-# ifndef SUBLANG_FRENCH_COTEDIVOIRE
-# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
-# endif
-# ifndef SUBLANG_FRENCH_MALI
-# define SUBLANG_FRENCH_MALI 0x0d
-# endif
-# ifndef SUBLANG_FRENCH_MOROCCO
-# define SUBLANG_FRENCH_MOROCCO 0x0e
-# endif
-# ifndef SUBLANG_FRENCH_HAITI
-# define SUBLANG_FRENCH_HAITI 0x0f
-# endif
-# ifndef SUBLANG_FRISIAN_NETHERLANDS
-# define SUBLANG_FRISIAN_NETHERLANDS 0x01
-# endif
-# ifndef SUBLANG_GALICIAN_SPAIN
-# define SUBLANG_GALICIAN_SPAIN 0x01
-# endif
-# ifndef SUBLANG_GEORGIAN_GEORGIA
-# define SUBLANG_GEORGIAN_GEORGIA 0x01
-# endif
-# ifndef SUBLANG_GERMAN_LUXEMBOURG
-# define SUBLANG_GERMAN_LUXEMBOURG 0x04
-# endif
-# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
-# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
-# endif
-# ifndef SUBLANG_GREEK_GREECE
-# define SUBLANG_GREEK_GREECE 0x01
-# endif
-# ifndef SUBLANG_GREENLANDIC_GREENLAND
-# define SUBLANG_GREENLANDIC_GREENLAND 0x01
-# endif
-# ifndef SUBLANG_GUJARATI_INDIA
-# define SUBLANG_GUJARATI_INDIA 0x01
-# endif
-# ifndef SUBLANG_HAUSA_NIGERIA_LATIN
-# define SUBLANG_HAUSA_NIGERIA_LATIN 0x01
-# endif
-# ifndef SUBLANG_HEBREW_ISRAEL
-# define SUBLANG_HEBREW_ISRAEL 0x01
-# endif
-# ifndef SUBLANG_HINDI_INDIA
-# define SUBLANG_HINDI_INDIA 0x01
-# endif
-# ifndef SUBLANG_HUNGARIAN_HUNGARY
-# define SUBLANG_HUNGARIAN_HUNGARY 0x01
-# endif
-# ifndef SUBLANG_ICELANDIC_ICELAND
-# define SUBLANG_ICELANDIC_ICELAND 0x01
-# endif
-# ifndef SUBLANG_IGBO_NIGERIA
-# define SUBLANG_IGBO_NIGERIA 0x01
-# endif
-# ifndef SUBLANG_INDONESIAN_INDONESIA
-# define SUBLANG_INDONESIAN_INDONESIA 0x01
-# endif
-# ifndef SUBLANG_INUKTITUT_CANADA
-# define SUBLANG_INUKTITUT_CANADA 0x01
-# endif
-# undef SUBLANG_INUKTITUT_CANADA_LATIN
-# define SUBLANG_INUKTITUT_CANADA_LATIN 0x02
-# undef SUBLANG_IRISH_IRELAND
-# define SUBLANG_IRISH_IRELAND 0x02
-# ifndef SUBLANG_JAPANESE_JAPAN
-# define SUBLANG_JAPANESE_JAPAN 0x01
-# endif
-# ifndef SUBLANG_KANNADA_INDIA
-# define SUBLANG_KANNADA_INDIA 0x01
-# endif
-# ifndef SUBLANG_KASHMIRI_INDIA
-# define SUBLANG_KASHMIRI_INDIA 0x02
-# endif
-# ifndef SUBLANG_KAZAK_KAZAKHSTAN
-# define SUBLANG_KAZAK_KAZAKHSTAN 0x01
-# endif
-# ifndef SUBLANG_KICHE_GUATEMALA
-# define SUBLANG_KICHE_GUATEMALA 0x01
-# endif
-# ifndef SUBLANG_KINYARWANDA_RWANDA
-# define SUBLANG_KINYARWANDA_RWANDA 0x01
-# endif
-# ifndef SUBLANG_KONKANI_INDIA
-# define SUBLANG_KONKANI_INDIA 0x01
-# endif
-# ifndef SUBLANG_KYRGYZ_KYRGYZSTAN
-# define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01
-# endif
-# ifndef SUBLANG_LAO_LAOS
-# define SUBLANG_LAO_LAOS 0x01
-# endif
-# ifndef SUBLANG_LATVIAN_LATVIA
-# define SUBLANG_LATVIAN_LATVIA 0x01
-# endif
-# ifndef SUBLANG_LITHUANIAN_LITHUANIA
-# define SUBLANG_LITHUANIAN_LITHUANIA 0x01
-# endif
-# undef SUBLANG_LOWER_SORBIAN_GERMANY
-# define SUBLANG_LOWER_SORBIAN_GERMANY 0x02
-# ifndef SUBLANG_LUXEMBOURGISH_LUXEMBOURG
-# define SUBLANG_LUXEMBOURGISH_LUXEMBOURG 0x01
-# endif
-# ifndef SUBLANG_MACEDONIAN_MACEDONIA
-# define SUBLANG_MACEDONIAN_MACEDONIA 0x01
-# endif
-# ifndef SUBLANG_MALAY_MALAYSIA
-# define SUBLANG_MALAY_MALAYSIA 0x01
-# endif
-# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
-# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
-# endif
-# ifndef SUBLANG_MALAYALAM_INDIA
-# define SUBLANG_MALAYALAM_INDIA 0x01
-# endif
-# ifndef SUBLANG_MALTESE_MALTA
-# define SUBLANG_MALTESE_MALTA 0x01
-# endif
-# ifndef SUBLANG_MAORI_NEW_ZEALAND
-# define SUBLANG_MAORI_NEW_ZEALAND 0x01
-# endif
-# ifndef SUBLANG_MAPUDUNGUN_CHILE
-# define SUBLANG_MAPUDUNGUN_CHILE 0x01
-# endif
-# ifndef SUBLANG_MARATHI_INDIA
-# define SUBLANG_MARATHI_INDIA 0x01
-# endif
-# ifndef SUBLANG_MOHAWK_CANADA
-# define SUBLANG_MOHAWK_CANADA 0x01
-# endif
-# ifndef SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA
-# define SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA 0x01
-# endif
-# ifndef SUBLANG_MONGOLIAN_PRC
-# define SUBLANG_MONGOLIAN_PRC 0x02
-# endif
-# ifndef SUBLANG_NEPALI_NEPAL
-# define SUBLANG_NEPALI_NEPAL 0x01
-# endif
-# ifndef SUBLANG_NEPALI_INDIA
-# define SUBLANG_NEPALI_INDIA 0x02
-# endif
-# ifndef SUBLANG_OCCITAN_FRANCE
-# define SUBLANG_OCCITAN_FRANCE 0x01
-# endif
-# ifndef SUBLANG_ORIYA_INDIA
-# define SUBLANG_ORIYA_INDIA 0x01
-# endif
-# ifndef SUBLANG_PASHTO_AFGHANISTAN
-# define SUBLANG_PASHTO_AFGHANISTAN 0x01
-# endif
-# ifndef SUBLANG_POLISH_POLAND
-# define SUBLANG_POLISH_POLAND 0x01
-# endif
-# ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x01
-# endif
-# ifndef SUBLANG_PUNJABI_PAKISTAN
-# define SUBLANG_PUNJABI_PAKISTAN 0x02
-# endif
-# ifndef SUBLANG_QUECHUA_BOLIVIA
-# define SUBLANG_QUECHUA_BOLIVIA 0x01
-# endif
-# ifndef SUBLANG_QUECHUA_ECUADOR
-# define SUBLANG_QUECHUA_ECUADOR 0x02
-# endif
-# ifndef SUBLANG_QUECHUA_PERU
-# define SUBLANG_QUECHUA_PERU 0x03
-# endif
-# ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x01
-# endif
-# ifndef SUBLANG_ROMANIAN_MOLDOVA
-# define SUBLANG_ROMANIAN_MOLDOVA 0x02
-# endif
-# ifndef SUBLANG_ROMANSH_SWITZERLAND
-# define SUBLANG_ROMANSH_SWITZERLAND 0x01
-# endif
-# ifndef SUBLANG_RUSSIAN_RUSSIA
-# define SUBLANG_RUSSIAN_RUSSIA 0x01
-# endif
-# ifndef SUBLANG_RUSSIAN_MOLDAVIA
-# define SUBLANG_RUSSIAN_MOLDAVIA 0x02
-# endif
-# ifndef SUBLANG_SAMI_NORTHERN_NORWAY
-# define SUBLANG_SAMI_NORTHERN_NORWAY 0x01
-# endif
-# ifndef SUBLANG_SAMI_NORTHERN_SWEDEN
-# define SUBLANG_SAMI_NORTHERN_SWEDEN 0x02
-# endif
-# ifndef SUBLANG_SAMI_NORTHERN_FINLAND
-# define SUBLANG_SAMI_NORTHERN_FINLAND 0x03
-# endif
-# ifndef SUBLANG_SAMI_LULE_NORWAY
-# define SUBLANG_SAMI_LULE_NORWAY 0x04
-# endif
-# ifndef SUBLANG_SAMI_LULE_SWEDEN
-# define SUBLANG_SAMI_LULE_SWEDEN 0x05
-# endif
-# ifndef SUBLANG_SAMI_SOUTHERN_NORWAY
-# define SUBLANG_SAMI_SOUTHERN_NORWAY 0x06
-# endif
-# ifndef SUBLANG_SAMI_SOUTHERN_SWEDEN
-# define SUBLANG_SAMI_SOUTHERN_SWEDEN 0x07
-# endif
-# undef SUBLANG_SAMI_SKOLT_FINLAND
-# define SUBLANG_SAMI_SKOLT_FINLAND 0x08
-# undef SUBLANG_SAMI_INARI_FINLAND
-# define SUBLANG_SAMI_INARI_FINLAND 0x09
-# ifndef SUBLANG_SANSKRIT_INDIA
-# define SUBLANG_SANSKRIT_INDIA 0x01
-# endif
-# ifndef SUBLANG_SERBIAN_LATIN
-# define SUBLANG_SERBIAN_LATIN 0x02
-# endif
-# ifndef SUBLANG_SERBIAN_CYRILLIC
-# define SUBLANG_SERBIAN_CYRILLIC 0x03
-# endif
-# ifndef SUBLANG_SINDHI_INDIA
-# define SUBLANG_SINDHI_INDIA 0x01
-# endif
-# undef SUBLANG_SINDHI_PAKISTAN
-# define SUBLANG_SINDHI_PAKISTAN 0x02
-# ifndef SUBLANG_SINDHI_AFGHANISTAN
-# define SUBLANG_SINDHI_AFGHANISTAN 0x02
-# endif
-# ifndef SUBLANG_SINHALESE_SRI_LANKA
-# define SUBLANG_SINHALESE_SRI_LANKA 0x01
-# endif
-# ifndef SUBLANG_SLOVAK_SLOVAKIA
-# define SUBLANG_SLOVAK_SLOVAKIA 0x01
-# endif
-# ifndef SUBLANG_SLOVENIAN_SLOVENIA
-# define SUBLANG_SLOVENIAN_SLOVENIA 0x01
-# endif
-# ifndef SUBLANG_SOTHO_SOUTH_AFRICA
-# define SUBLANG_SOTHO_SOUTH_AFRICA 0x01
-# endif
-# ifndef SUBLANG_SPANISH_GUATEMALA
-# define SUBLANG_SPANISH_GUATEMALA 0x04
-# endif
-# ifndef SUBLANG_SPANISH_COSTA_RICA
-# define SUBLANG_SPANISH_COSTA_RICA 0x05
-# endif
-# ifndef SUBLANG_SPANISH_PANAMA
-# define SUBLANG_SPANISH_PANAMA 0x06
-# endif
-# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
-# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
-# endif
-# ifndef SUBLANG_SPANISH_VENEZUELA
-# define SUBLANG_SPANISH_VENEZUELA 0x08
-# endif
-# ifndef SUBLANG_SPANISH_COLOMBIA
-# define SUBLANG_SPANISH_COLOMBIA 0x09
-# endif
-# ifndef SUBLANG_SPANISH_PERU
-# define SUBLANG_SPANISH_PERU 0x0a
-# endif
-# ifndef SUBLANG_SPANISH_ARGENTINA
-# define SUBLANG_SPANISH_ARGENTINA 0x0b
-# endif
-# ifndef SUBLANG_SPANISH_ECUADOR
-# define SUBLANG_SPANISH_ECUADOR 0x0c
-# endif
-# ifndef SUBLANG_SPANISH_CHILE
-# define SUBLANG_SPANISH_CHILE 0x0d
-# endif
-# ifndef SUBLANG_SPANISH_URUGUAY
-# define SUBLANG_SPANISH_URUGUAY 0x0e
-# endif
-# ifndef SUBLANG_SPANISH_PARAGUAY
-# define SUBLANG_SPANISH_PARAGUAY 0x0f
-# endif
-# ifndef SUBLANG_SPANISH_BOLIVIA
-# define SUBLANG_SPANISH_BOLIVIA 0x10
-# endif
-# ifndef SUBLANG_SPANISH_EL_SALVADOR
-# define SUBLANG_SPANISH_EL_SALVADOR 0x11
-# endif
-# ifndef SUBLANG_SPANISH_HONDURAS
-# define SUBLANG_SPANISH_HONDURAS 0x12
-# endif
-# ifndef SUBLANG_SPANISH_NICARAGUA
-# define SUBLANG_SPANISH_NICARAGUA 0x13
-# endif
-# ifndef SUBLANG_SPANISH_PUERTO_RICO
-# define SUBLANG_SPANISH_PUERTO_RICO 0x14
-# endif
-# ifndef SUBLANG_SPANISH_US
-# define SUBLANG_SPANISH_US 0x15
-# endif
-# ifndef SUBLANG_SWAHILI_KENYA
-# define SUBLANG_SWAHILI_KENYA 0x01
-# endif
-# ifndef SUBLANG_SWEDISH_SWEDEN
-# define SUBLANG_SWEDISH_SWEDEN 0x01
-# endif
-# ifndef SUBLANG_SWEDISH_FINLAND
-# define SUBLANG_SWEDISH_FINLAND 0x02
-# endif
-# ifndef SUBLANG_SYRIAC_SYRIA
-# define SUBLANG_SYRIAC_SYRIA 0x01
-# endif
-# ifndef SUBLANG_TAGALOG_PHILIPPINES
-# define SUBLANG_TAGALOG_PHILIPPINES 0x01
-# endif
-# ifndef SUBLANG_TAJIK_TAJIKISTAN
-# define SUBLANG_TAJIK_TAJIKISTAN 0x01
-# endif
-# ifndef SUBLANG_TAMAZIGHT_ARABIC
-# define SUBLANG_TAMAZIGHT_ARABIC 0x01
-# endif
-# ifndef SUBLANG_TAMAZIGHT_ALGERIA_LATIN
-# define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02
-# endif
-# ifndef SUBLANG_TAMIL_INDIA
-# define SUBLANG_TAMIL_INDIA 0x01
-# endif
-# ifndef SUBLANG_TATAR_RUSSIA
-# define SUBLANG_TATAR_RUSSIA 0x01
-# endif
-# ifndef SUBLANG_TELUGU_INDIA
-# define SUBLANG_TELUGU_INDIA 0x01
-# endif
-# ifndef SUBLANG_THAI_THAILAND
-# define SUBLANG_THAI_THAILAND 0x01
-# endif
-# ifndef SUBLANG_TIBETAN_PRC
-# define SUBLANG_TIBETAN_PRC 0x01
-# endif
-# undef SUBLANG_TIBETAN_BHUTAN
-# define SUBLANG_TIBETAN_BHUTAN 0x02
-# ifndef SUBLANG_TIGRINYA_ETHIOPIA
-# define SUBLANG_TIGRINYA_ETHIOPIA 0x01
-# endif
-# ifndef SUBLANG_TIGRINYA_ERITREA
-# define SUBLANG_TIGRINYA_ERITREA 0x02
-# endif
-# ifndef SUBLANG_TSWANA_SOUTH_AFRICA
-# define SUBLANG_TSWANA_SOUTH_AFRICA 0x01
-# endif
-# ifndef SUBLANG_TURKISH_TURKEY
-# define SUBLANG_TURKISH_TURKEY 0x01
-# endif
-# ifndef SUBLANG_TURKMEN_TURKMENISTAN
-# define SUBLANG_TURKMEN_TURKMENISTAN 0x01
-# endif
-# ifndef SUBLANG_UIGHUR_PRC
-# define SUBLANG_UIGHUR_PRC 0x01
-# endif
-# ifndef SUBLANG_UKRAINIAN_UKRAINE
-# define SUBLANG_UKRAINIAN_UKRAINE 0x01
-# endif
-# ifndef SUBLANG_UPPER_SORBIAN_GERMANY
-# define SUBLANG_UPPER_SORBIAN_GERMANY 0x01
-# endif
-# ifndef SUBLANG_URDU_PAKISTAN
-# define SUBLANG_URDU_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_URDU_INDIA
-# define SUBLANG_URDU_INDIA 0x02
-# endif
-# ifndef SUBLANG_UZBEK_LATIN
-# define SUBLANG_UZBEK_LATIN 0x01
-# endif
-# ifndef SUBLANG_UZBEK_CYRILLIC
-# define SUBLANG_UZBEK_CYRILLIC 0x02
-# endif
-# ifndef SUBLANG_VIETNAMESE_VIETNAM
-# define SUBLANG_VIETNAMESE_VIETNAM 0x01
-# endif
-# ifndef SUBLANG_WELSH_UNITED_KINGDOM
-# define SUBLANG_WELSH_UNITED_KINGDOM 0x01
-# endif
-# ifndef SUBLANG_WOLOF_SENEGAL
-# define SUBLANG_WOLOF_SENEGAL 0x01
-# endif
-# ifndef SUBLANG_XHOSA_SOUTH_AFRICA
-# define SUBLANG_XHOSA_SOUTH_AFRICA 0x01
-# endif
-# ifndef SUBLANG_YAKUT_RUSSIA
-# define SUBLANG_YAKUT_RUSSIA 0x01
-# endif
-# ifndef SUBLANG_YI_PRC
-# define SUBLANG_YI_PRC 0x01
-# endif
-# ifndef SUBLANG_YORUBA_NIGERIA
-# define SUBLANG_YORUBA_NIGERIA 0x01
-# endif
-# ifndef SUBLANG_ZULU_SOUTH_AFRICA
-# define SUBLANG_ZULU_SOUTH_AFRICA 0x01
-# endif
-/* GetLocaleInfoA operations.  */
-# ifndef LOCALE_SNAME
-# define LOCALE_SNAME 0x5c
-# endif
-# ifndef LOCALE_NAME_MAX_LENGTH
-# define LOCALE_NAME_MAX_LENGTH 85
-# endif
-#endif
-
-
-#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-/* Mac OS X 10.2 or newer */
-
-/* Canonicalize a Mac OS X locale name to a Unix locale name.
-   NAME is a sufficiently large buffer.
-   On input, it contains the Mac OS X locale name.
-   On output, it contains the Unix locale name.  */
-# if !defined IN_LIBINTL
-static
-# endif
-void
-gl_locale_name_canonicalize (char *name)
-{
-  /* This conversion is based on a posting by
-     Deborah GoldSmith <goldsmit@apple.com> on 2005-03-08,
-     http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
-
-  /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
-     ISO 3166) names.  Prior to Mac OS X 10.3, there is no API for doing this.
-     Therefore we do it ourselves, using a table based on the results of the
-     Mac OS X 10.3.8 function
-     CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
-  typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
-          legacy_entry;
-  static const legacy_entry legacy_table[] = {
-    { "Afrikaans",             "af" },
-    { "Albanian",              "sq" },
-    { "Amharic",               "am" },
-    { "Arabic",                "ar" },
-    { "Armenian",              "hy" },
-    { "Assamese",              "as" },
-    { "Aymara",                "ay" },
-    { "Azerbaijani",           "az" },
-    { "Basque",                "eu" },
-    { "Belarusian",            "be" },
-    { "Belorussian",           "be" },
-    { "Bengali",               "bn" },
-    { "Brazilian Portugese",   "pt_BR" },
-    { "Brazilian Portuguese",  "pt_BR" },
-    { "Breton",                "br" },
-    { "Bulgarian",             "bg" },
-    { "Burmese",               "my" },
-    { "Byelorussian",          "be" },
-    { "Catalan",               "ca" },
-    { "Chewa",                 "ny" },
-    { "Chichewa",              "ny" },
-    { "Chinese",               "zh" },
-    { "Chinese, Simplified",   "zh_CN" },
-    { "Chinese, Traditional",  "zh_TW" },
-    { "Chinese, Tradtional",   "zh_TW" },
-    { "Croatian",              "hr" },
-    { "Czech",                 "cs" },
-    { "Danish",                "da" },
-    { "Dutch",                 "nl" },
-    { "Dzongkha",              "dz" },
-    { "English",               "en" },
-    { "Esperanto",             "eo" },
-    { "Estonian",              "et" },
-    { "Faroese",               "fo" },
-    { "Farsi",                 "fa" },
-    { "Finnish",               "fi" },
-    { "Flemish",               "nl_BE" },
-    { "French",                "fr" },
-    { "Galician",              "gl" },
-    { "Gallegan",              "gl" },
-    { "Georgian",              "ka" },
-    { "German",                "de" },
-    { "Greek",                 "el" },
-    { "Greenlandic",           "kl" },
-    { "Guarani",               "gn" },
-    { "Gujarati",              "gu" },
-    { "Hawaiian",              "haw" }, /* Yes, "haw", not "cpe".  */
-    { "Hebrew",                "he" },
-    { "Hindi",                 "hi" },
-    { "Hungarian",             "hu" },
-    { "Icelandic",             "is" },
-    { "Indonesian",            "id" },
-    { "Inuktitut",             "iu" },
-    { "Irish",                 "ga" },
-    { "Italian",               "it" },
-    { "Japanese",              "ja" },
-    { "Javanese",              "jv" },
-    { "Kalaallisut",           "kl" },
-    { "Kannada",               "kn" },
-    { "Kashmiri",              "ks" },
-    { "Kazakh",                "kk" },
-    { "Khmer",                 "km" },
-    { "Kinyarwanda",           "rw" },
-    { "Kirghiz",               "ky" },
-    { "Korean",                "ko" },
-    { "Kurdish",               "ku" },
-    { "Latin",                 "la" },
-    { "Latvian",               "lv" },
-    { "Lithuanian",            "lt" },
-    { "Macedonian",            "mk" },
-    { "Malagasy",              "mg" },
-    { "Malay",                 "ms" },
-    { "Malayalam",             "ml" },
-    { "Maltese",               "mt" },
-    { "Manx",                  "gv" },
-    { "Marathi",               "mr" },
-    { "Moldavian",             "mo" },
-    { "Mongolian",             "mn" },
-    { "Nepali",                "ne" },
-    { "Norwegian",             "nb" }, /* Yes, "nb", not the obsolete "no".  */
-    { "Nyanja",                "ny" },
-    { "Nynorsk",               "nn" },
-    { "Oriya",                 "or" },
-    { "Oromo",                 "om" },
-    { "Panjabi",               "pa" },
-    { "Pashto",                "ps" },
-    { "Persian",               "fa" },
-    { "Polish",                "pl" },
-    { "Portuguese",            "pt" },
-    { "Portuguese, Brazilian", "pt_BR" },
-    { "Punjabi",               "pa" },
-    { "Pushto",                "ps" },
-    { "Quechua",               "qu" },
-    { "Romanian",              "ro" },
-    { "Ruanda",                "rw" },
-    { "Rundi",                 "rn" },
-    { "Russian",               "ru" },
-    { "Sami",                  "se_NO" }, /* Not just "se".  */
-    { "Sanskrit",              "sa" },
-    { "Scottish",              "gd" },
-    { "Serbian",               "sr" },
-    { "Simplified Chinese",    "zh_CN" },
-    { "Sindhi",                "sd" },
-    { "Sinhalese",             "si" },
-    { "Slovak",                "sk" },
-    { "Slovenian",             "sl" },
-    { "Somali",                "so" },
-    { "Spanish",               "es" },
-    { "Sundanese",             "su" },
-    { "Swahili",               "sw" },
-    { "Swedish",               "sv" },
-    { "Tagalog",               "tl" },
-    { "Tajik",                 "tg" },
-    { "Tajiki",                "tg" },
-    { "Tamil",                 "ta" },
-    { "Tatar",                 "tt" },
-    { "Telugu",                "te" },
-    { "Thai",                  "th" },
-    { "Tibetan",               "bo" },
-    { "Tigrinya",              "ti" },
-    { "Tongan",                "to" },
-    { "Traditional Chinese",   "zh_TW" },
-    { "Turkish",               "tr" },
-    { "Turkmen",               "tk" },
-    { "Uighur",                "ug" },
-    { "Ukrainian",             "uk" },
-    { "Urdu",                  "ur" },
-    { "Uzbek",                 "uz" },
-    { "Vietnamese",            "vi" },
-    { "Welsh",                 "cy" },
-    { "Yiddish",               "yi" }
-  };
-
-  /* Convert new-style locale names with language tags (ISO 639 and ISO 15924)
-     to Unix (ISO 639 and ISO 3166) names.  */
-  typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
-          langtag_entry;
-  static const langtag_entry langtag_table[] = {
-    /* Mac OS X has "az-Arab", "az-Cyrl", "az-Latn".
-       The default script for az on Unix is Latin.  */
-    { "az-Latn", "az" },
-    /* Mac OS X has "ga-dots".  Does not yet exist on Unix.  */
-    { "ga-dots", "ga" },
-    /* Mac OS X has "kk-Cyrl".  Does not yet exist on Unix.  */
-    /* Mac OS X has "mn-Cyrl", "mn-Mong".
-       The default script for mn on Unix is Cyrillic.  */
-    { "mn-Cyrl", "mn" },
-    /* Mac OS X has "ms-Arab", "ms-Latn".
-       The default script for ms on Unix is Latin.  */
-    { "ms-Latn", "ms" },
-    /* Mac OS X has "tg-Cyrl".
-       The default script for tg on Unix is Cyrillic.  */
-    { "tg-Cyrl", "tg" },
-    /* Mac OS X has "tk-Cyrl".  Does not yet exist on Unix.  */
-    /* Mac OS X has "tt-Cyrl".
-       The default script for tt on Unix is Cyrillic.  */
-    { "tt-Cyrl", "tt" },
-    /* Mac OS X has "zh-Hans", "zh-Hant".
-       Country codes are used to distinguish these on Unix.  */
-    { "zh-Hans", "zh_CN" },
-    { "zh-Hant", "zh_TW" }
-  };
-
-  /* Convert script names (ISO 15924) to Unix conventions.
-     See http://www.unicode.org/iso15924/iso15924-codes.html  */
-  typedef struct { const char script[4+1]; const char unixy[9+1]; }
-          script_entry;
-  static const script_entry script_table[] = {
-    { "Arab", "arabic" },
-    { "Cyrl", "cyrillic" },
-    { "Mong", "mongolian" }
-  };
-
-  /* Step 1: Convert using legacy_table.  */
-  if (name[0] >= 'A' && name[0] <= 'Z')
-    {
-      unsigned int i1, i2;
-      i1 = 0;
-      i2 = sizeof (legacy_table) / sizeof (legacy_entry);
-      while (i2 - i1 > 1)
-        {
-          /* At this point we know that if name occurs in legacy_table,
-             its index must be >= i1 and < i2.  */
-          unsigned int i = (i1 + i2) >> 1;
-          const legacy_entry *p = &legacy_table[i];
-          if (strcmp (name, p->legacy) < 0)
-            i2 = i;
-          else
-            i1 = i;
-        }
-      if (strcmp (name, legacy_table[i1].legacy) == 0)
-        {
-          strcpy (name, legacy_table[i1].unixy);
-          return;
-        }
-    }
-
-  /* Step 2: Convert using langtag_table and script_table.  */
-  if (strlen (name) == 7 && name[2] == '-')
-    {
-      unsigned int i1, i2;
-      i1 = 0;
-      i2 = sizeof (langtag_table) / sizeof (langtag_entry);
-      while (i2 - i1 > 1)
-        {
-          /* At this point we know that if name occurs in langtag_table,
-             its index must be >= i1 and < i2.  */
-          unsigned int i = (i1 + i2) >> 1;
-          const langtag_entry *p = &langtag_table[i];
-          if (strcmp (name, p->langtag) < 0)
-            i2 = i;
-          else
-            i1 = i;
-        }
-      if (strcmp (name, langtag_table[i1].langtag) == 0)
-        {
-          strcpy (name, langtag_table[i1].unixy);
-          return;
-        }
-
-      i1 = 0;
-      i2 = sizeof (script_table) / sizeof (script_entry);
-      while (i2 - i1 > 1)
-        {
-          /* At this point we know that if (name + 3) occurs in script_table,
-             its index must be >= i1 and < i2.  */
-          unsigned int i = (i1 + i2) >> 1;
-          const script_entry *p = &script_table[i];
-          if (strcmp (name + 3, p->script) < 0)
-            i2 = i;
-          else
-            i1 = i;
-        }
-      if (strcmp (name + 3, script_table[i1].script) == 0)
-        {
-          name[2] = '@';
-          strcpy (name + 3, script_table[i1].unixy);
-          return;
-        }
-    }
-
-  /* Step 3: Convert new-style dash to Unix underscore. */
-  {
-    char *p;
-    for (p = name; *p != '\0'; p++)
-      if (*p == '-')
-        *p = '_';
-  }
-}
-
-#endif
-
-
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-
-/* Canonicalize a Windows native locale name to a Unix locale name.
-   NAME is a sufficiently large buffer.
-   On input, it contains the Windows locale name.
-   On output, it contains the Unix locale name.  */
-# if !defined IN_LIBINTL
-static
-# endif
-void
-gl_locale_name_canonicalize (char *name)
-{
-  /* FIXME: This is probably incomplete: it does not handle "zh-Hans" and
-     "zh-Hant".  */
-  char *p;
-
-  for (p = name; *p != '\0'; p++)
-    if (*p == '-')
-      {
-        *p = '_';
-        p++;
-        for (; *p != '\0'; p++)
-          {
-            if (*p >= 'a' && *p <= 'z')
-              *p += 'A' - 'a';
-            if (*p == '-')
-              {
-                *p = '\0';
-                return;
-              }
-          }
-        return;
-      }
-}
-
-# if !defined IN_LIBINTL
-static
-# endif
-const char *
-gl_locale_name_from_win32_LANGID (LANGID langid)
-{
-  /* Activate the new code only when the GETTEXT_MUI environment variable is
-     set, for the time being, since the new code is not well tested.  */
-  if (getenv ("GETTEXT_MUI") != NULL)
-    {
-      static char namebuf[256];
-
-      /* Query the system's notion of locale name.
-         On Windows95/98/ME, GetLocaleInfoA returns some incorrect results.
-         But we don't need to support systems that are so old.  */
-      if (GetLocaleInfoA (MAKELCID (langid, SORT_DEFAULT), LOCALE_SNAME,
-                          namebuf, sizeof (namebuf) - 1))
-        {
-          /* Convert it to a Unix locale name.  */
-          gl_locale_name_canonicalize (namebuf);
-          return namebuf;
-        }
-    }
-  /* Internet Explorer has an LCID to RFC3066 name mapping stored in
-     HKEY_CLASSES_ROOT\Mime\Database\Rfc1766.  But we better don't use that
-     since IE's i18n subsystem is known to be inconsistent with the native
-     Windows base (e.g. they have different character conversion facilities
-     that produce different results).  */
-  /* Use our own table.  */
-  {
-    int primary, sub;
-
-    /* Split into language and territory part.  */
-    primary = PRIMARYLANGID (langid);
-    sub = SUBLANGID (langid);
-
-    /* Dispatch on language.
-       See also http://www.unicode.org/unicode/onlinedat/languages.html .
-       For details about languages, see http://www.ethnologue.com/ .  */
-    switch (primary)
-      {
-      case LANG_AFRIKAANS:
-        switch (sub)
-          {
-          case SUBLANG_AFRIKAANS_SOUTH_AFRICA: return "af_ZA";
-          }
-        return "af";
-      case LANG_ALBANIAN:
-        switch (sub)
-          {
-          case SUBLANG_ALBANIAN_ALBANIA: return "sq_AL";
-          }
-        return "sq";
-      case LANG_ALSATIAN:
-        switch (sub)
-          {
-          case SUBLANG_ALSATIAN_FRANCE: return "gsw_FR";
-          }
-        return "gsw";
-      case LANG_AMHARIC:
-        switch (sub)
-          {
-          case SUBLANG_AMHARIC_ETHIOPIA: return "am_ET";
-          }
-        return "am";
-      case LANG_ARABIC:
-        switch (sub)
-          {
-          case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
-          case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
-          case SUBLANG_ARABIC_EGYPT: return "ar_EG";
-          case SUBLANG_ARABIC_LIBYA: return "ar_LY";
-          case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
-          case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
-          case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
-          case SUBLANG_ARABIC_OMAN: return "ar_OM";
-          case SUBLANG_ARABIC_YEMEN: return "ar_YE";
-          case SUBLANG_ARABIC_SYRIA: return "ar_SY";
-          case SUBLANG_ARABIC_JORDAN: return "ar_JO";
-          case SUBLANG_ARABIC_LEBANON: return "ar_LB";
-          case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
-          case SUBLANG_ARABIC_UAE: return "ar_AE";
-          case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
-          case SUBLANG_ARABIC_QATAR: return "ar_QA";
-          }
-        return "ar";
-      case LANG_ARMENIAN:
-        switch (sub)
-          {
-          case SUBLANG_ARMENIAN_ARMENIA: return "hy_AM";
-          }
-        return "hy";
-      case LANG_ASSAMESE:
-        switch (sub)
-          {
-          case SUBLANG_ASSAMESE_INDIA: return "as_IN";
-          }
-        return "as";
-      case LANG_AZERI:
-        switch (sub)
-          {
-          /* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
-          case 0x1e: return "az@latin";
-          case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
-          case 0x1d: return "az@cyrillic";
-          case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
-          }
-        return "az";
-      case LANG_BASHKIR:
-        switch (sub)
-          {
-          case SUBLANG_BASHKIR_RUSSIA: return "ba_RU";
-          }
-        return "ba";
-      case LANG_BASQUE:
-        switch (sub)
-          {
-          case SUBLANG_BASQUE_BASQUE: return "eu_ES";
-          }
-        return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
-      case LANG_BELARUSIAN:
-        switch (sub)
-          {
-          case SUBLANG_BELARUSIAN_BELARUS: return "be_BY";
-          }
-        return "be";
-      case LANG_BENGALI:
-        switch (sub)
-          {
-          case SUBLANG_BENGALI_INDIA: return "bn_IN";
-          case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
-          }
-        return "bn";
-      case LANG_BRETON:
-        switch (sub)
-          {
-          case SUBLANG_BRETON_FRANCE: return "br_FR";
-          }
-        return "br";
-      case LANG_BULGARIAN:
-        switch (sub)
-          {
-          case SUBLANG_BULGARIAN_BULGARIA: return "bg_BG";
-          }
-        return "bg";
-      case LANG_BURMESE:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "my_MM";
-          }
-        return "my";
-      case LANG_CAMBODIAN:
-        switch (sub)
-          {
-          case SUBLANG_CAMBODIAN_CAMBODIA: return "km_KH";
-          }
-        return "km";
-      case LANG_CATALAN:
-        switch (sub)
-          {
-          case SUBLANG_CATALAN_SPAIN: return "ca_ES";
-          }
-        return "ca";
-      case LANG_CHEROKEE:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "chr_US";
-          }
-        return "chr";
-      case LANG_CHINESE:
-        switch (sub)
-          {
-          case SUBLANG_CHINESE_TRADITIONAL: case 0x1f: return "zh_TW";
-          case SUBLANG_CHINESE_SIMPLIFIED: case 0x00: return "zh_CN";
-          case SUBLANG_CHINESE_HONGKONG: return "zh_HK"; /* traditional */
-          case SUBLANG_CHINESE_SINGAPORE: return "zh_SG"; /* simplified */
-          case SUBLANG_CHINESE_MACAU: return "zh_MO"; /* traditional */
-          }
-        return "zh";
-      case LANG_CORSICAN:
-        switch (sub)
-          {
-          case SUBLANG_CORSICAN_FRANCE: return "co_FR";
-          }
-        return "co";
-      case LANG_CROATIAN:      /* LANG_CROATIAN == LANG_SERBIAN == LANG_BOSNIAN
-                                * What used to be called Serbo-Croatian
-                                * should really now be two separate
-                                * languages because of political reasons.
-                                * (Says tml, who knows nothing about Serbian
-                                * or Croatian.)
-                                * (I can feel those flames coming already.)
-                                */
-        switch (sub)
-          {
-          /* Croatian */
-          case 0x00: return "hr";
-          case SUBLANG_CROATIAN_CROATIA: return "hr_HR";
-          case SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN: return "hr_BA";
-          /* Serbian */
-          case 0x1f: return "sr";
-          case 0x1c: return "sr"; /* latin */
-          case SUBLANG_SERBIAN_LATIN: return "sr_CS"; /* latin */
-          case 0x09: return "sr_RS"; /* latin */
-          case 0x0b: return "sr_ME"; /* latin */
-          case 0x06: return "sr_BA"; /* latin */
-          case 0x1b: return "sr@cyrillic";
-          case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
-          case 0x0a: return "sr_RS@cyrillic";
-          case 0x0c: return "sr_ME@cyrillic";
-          case 0x07: return "sr_BA@cyrillic";
-          /* Bosnian */
-          case 0x1e: return "bs";
-          case 0x1a: return "bs"; /* latin */
-          case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN: return "bs_BA"; /* latin */
-          case 0x19: return "bs@cyrillic";
-          case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC: return "bs_BA@cyrillic";
-          }
-        return "hr";
-      case LANG_CZECH:
-        switch (sub)
-          {
-          case SUBLANG_CZECH_CZECH_REPUBLIC: return "cs_CZ";
-          }
-        return "cs";
-      case LANG_DANISH:
-        switch (sub)
-          {
-          case SUBLANG_DANISH_DENMARK: return "da_DK";
-          }
-        return "da";
-      case LANG_DARI:
-        /* FIXME: Adjust this when such locales appear on Unix.  */
-        switch (sub)
-          {
-          case SUBLANG_DARI_AFGHANISTAN: return "prs_AF";
-          }
-        return "prs";
-      case LANG_DIVEHI:
-        switch (sub)
-          {
-          case SUBLANG_DIVEHI_MALDIVES: return "dv_MV";
-          }
-        return "dv";
-      case LANG_DUTCH:
-        switch (sub)
-          {
-          case SUBLANG_DUTCH: return "nl_NL";
-          case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
-          case SUBLANG_DUTCH_SURINAM: return "nl_SR";
-          }
-        return "nl";
-      case LANG_EDO:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "bin_NG";
-          }
-        return "bin";
-      case LANG_ENGLISH:
-        switch (sub)
-          {
-          /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
-           * English was the language spoken in England.
-           * Oh well.
-           */
-          case SUBLANG_ENGLISH_US: return "en_US";
-          case SUBLANG_ENGLISH_UK: return "en_GB";
-          case SUBLANG_ENGLISH_AUS: return "en_AU";
-          case SUBLANG_ENGLISH_CAN: return "en_CA";
-          case SUBLANG_ENGLISH_NZ: return "en_NZ";
-          case SUBLANG_ENGLISH_EIRE: return "en_IE";
-          case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
-          case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
-          case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
-          case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
-          case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
-          case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
-          case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
-          case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
-          case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
-          case SUBLANG_ENGLISH_INDIA: return "en_IN";
-          case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
-          case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
-          }
-        return "en";
-      case LANG_ESTONIAN:
-        switch (sub)
-          {
-          case SUBLANG_ESTONIAN_ESTONIA: return "et_EE";
-          }
-        return "et";
-      case LANG_FAEROESE:
-        switch (sub)
-          {
-          case SUBLANG_FAEROESE_FAROE_ISLANDS: return "fo_FO";
-          }
-        return "fo";
-      case LANG_FARSI:
-        switch (sub)
-          {
-          case SUBLANG_FARSI_IRAN: return "fa_IR";
-          }
-        return "fa";
-      case LANG_FINNISH:
-        switch (sub)
-          {
-          case SUBLANG_FINNISH_FINLAND: return "fi_FI";
-          }
-        return "fi";
-      case LANG_FRENCH:
-        switch (sub)
-          {
-          case SUBLANG_FRENCH: return "fr_FR";
-          case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
-          case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
-          case SUBLANG_FRENCH_SWISS: return "fr_CH";
-          case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
-          case SUBLANG_FRENCH_MONACO: return "fr_MC";
-          case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
-          case SUBLANG_FRENCH_REUNION: return "fr_RE";
-          case SUBLANG_FRENCH_CONGO: return "fr_CG";
-          case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
-          case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
-          case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
-          case SUBLANG_FRENCH_MALI: return "fr_ML";
-          case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
-          case SUBLANG_FRENCH_HAITI: return "fr_HT";
-          }
-        return "fr";
-      case LANG_FRISIAN:
-        switch (sub)
-          {
-          case SUBLANG_FRISIAN_NETHERLANDS: return "fy_NL";
-          }
-        return "fy";
-      case LANG_FULFULDE:
-        /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin.  */
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "ff_NG";
-          }
-        return "ff";
-      case LANG_GAELIC:
-        switch (sub)
-          {
-          case 0x01: /* SCOTTISH */
-            /* old, superseded by LANG_SCOTTISH_GAELIC */
-            return "gd_GB";
-          case SUBLANG_IRISH_IRELAND: return "ga_IE";
-          }
-        return "ga";
-      case LANG_GALICIAN:
-        switch (sub)
-          {
-          case SUBLANG_GALICIAN_SPAIN: return "gl_ES";
-          }
-        return "gl";
-      case LANG_GEORGIAN:
-        switch (sub)
-          {
-          case SUBLANG_GEORGIAN_GEORGIA: return "ka_GE";
-          }
-        return "ka";
-      case LANG_GERMAN:
-        switch (sub)
-          {
-          case SUBLANG_GERMAN: return "de_DE";
-          case SUBLANG_GERMAN_SWISS: return "de_CH";
-          case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
-          case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
-          case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
-          }
-        return "de";
-      case LANG_GREEK:
-        switch (sub)
-          {
-          case SUBLANG_GREEK_GREECE: return "el_GR";
-          }
-        return "el";
-      case LANG_GREENLANDIC:
-        switch (sub)
-          {
-          case SUBLANG_GREENLANDIC_GREENLAND: return "kl_GL";
-          }
-        return "kl";
-      case LANG_GUARANI:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "gn_PY";
-          }
-        return "gn";
-      case LANG_GUJARATI:
-        switch (sub)
-          {
-          case SUBLANG_GUJARATI_INDIA: return "gu_IN";
-          }
-        return "gu";
-      case LANG_HAUSA:
-        switch (sub)
-          {
-          case 0x1f: return "ha";
-          case SUBLANG_HAUSA_NIGERIA_LATIN: return "ha_NG";
-          }
-        return "ha";
-      case LANG_HAWAIIAN:
-        /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
-           or Hawaii Creole English ("cpe_US", 600000 speakers)?  */
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "cpe_US";
-          }
-        return "cpe";
-      case LANG_HEBREW:
-        switch (sub)
-          {
-          case SUBLANG_HEBREW_ISRAEL: return "he_IL";
-          }
-        return "he";
-      case LANG_HINDI:
-        switch (sub)
-          {
-          case SUBLANG_HINDI_INDIA: return "hi_IN";
-          }
-        return "hi";
-      case LANG_HUNGARIAN:
-        switch (sub)
-          {
-          case SUBLANG_HUNGARIAN_HUNGARY: return "hu_HU";
-          }
-        return "hu";
-      case LANG_IBIBIO:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "nic_NG";
-          }
-        return "nic";
-      case LANG_ICELANDIC:
-        switch (sub)
-          {
-          case SUBLANG_ICELANDIC_ICELAND: return "is_IS";
-          }
-        return "is";
-      case LANG_IGBO:
-        switch (sub)
-          {
-          case SUBLANG_IGBO_NIGERIA: return "ig_NG";
-          }
-        return "ig";
-      case LANG_INDONESIAN:
-        switch (sub)
-          {
-          case SUBLANG_INDONESIAN_INDONESIA: return "id_ID";
-          }
-        return "id";
-      case LANG_INUKTITUT:
-        switch (sub)
-          {
-          case 0x1e: return "iu"; /* syllabic */
-          case SUBLANG_INUKTITUT_CANADA: return "iu_CA"; /* syllabic */
-          case 0x1f: return "iu@latin";
-          case SUBLANG_INUKTITUT_CANADA_LATIN: return "iu_CA@latin";
-          }
-        return "iu";
-      case LANG_ITALIAN:
-        switch (sub)
-          {
-          case SUBLANG_ITALIAN: return "it_IT";
-          case SUBLANG_ITALIAN_SWISS: return "it_CH";
-          }
-        return "it";
-      case LANG_JAPANESE:
-        switch (sub)
-          {
-          case SUBLANG_JAPANESE_JAPAN: return "ja_JP";
-          }
-        return "ja";
-      case LANG_KANNADA:
-        switch (sub)
-          {
-          case SUBLANG_KANNADA_INDIA: return "kn_IN";
-          }
-        return "kn";
-      case LANG_KANURI:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "kr_NG";
-          }
-        return "kr";
-      case LANG_KASHMIRI:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "ks_PK";
-          case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
-          }
-        return "ks";
-      case LANG_KAZAK:
-        switch (sub)
-          {
-          case SUBLANG_KAZAK_KAZAKHSTAN: return "kk_KZ";
-          }
-        return "kk";
-      case LANG_KICHE:
-        /* FIXME: Adjust this when such locales appear on Unix.  */
-        switch (sub)
-          {
-          case SUBLANG_KICHE_GUATEMALA: return "qut_GT";
-          }
-        return "qut";
-      case LANG_KINYARWANDA:
-        switch (sub)
-          {
-          case SUBLANG_KINYARWANDA_RWANDA: return "rw_RW";
-          }
-        return "rw";
-      case LANG_KONKANI:
-        /* FIXME: Adjust this when such locales appear on Unix.  */
-        switch (sub)
-          {
-          case SUBLANG_KONKANI_INDIA: return "kok_IN";
-          }
-        return "kok";
-      case LANG_KOREAN:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "ko_KR";
-          }
-        return "ko";
-      case LANG_KYRGYZ:
-        switch (sub)
-          {
-          case SUBLANG_KYRGYZ_KYRGYZSTAN: return "ky_KG";
-          }
-        return "ky";
-      case LANG_LAO:
-        switch (sub)
-          {
-          case SUBLANG_LAO_LAOS: return "lo_LA";
-          }
-        return "lo";
-      case LANG_LATIN:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "la_VA";
-          }
-        return "la";
-      case LANG_LATVIAN:
-        switch (sub)
-          {
-          case SUBLANG_LATVIAN_LATVIA: return "lv_LV";
-          }
-        return "lv";
-      case LANG_LITHUANIAN:
-        switch (sub)
-          {
-          case SUBLANG_LITHUANIAN_LITHUANIA: return "lt_LT";
-          }
-        return "lt";
-      case LANG_LUXEMBOURGISH:
-        switch (sub)
-          {
-          case SUBLANG_LUXEMBOURGISH_LUXEMBOURG: return "lb_LU";
-          }
-        return "lb";
-      case LANG_MACEDONIAN:
-        switch (sub)
-          {
-          case SUBLANG_MACEDONIAN_MACEDONIA: return "mk_MK";
-          }
-        return "mk";
-      case LANG_MALAY:
-        switch (sub)
-          {
-          case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
-          case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
-          }
-        return "ms";
-      case LANG_MALAYALAM:
-        switch (sub)
-          {
-          case SUBLANG_MALAYALAM_INDIA: return "ml_IN";
-          }
-        return "ml";
-      case LANG_MALTESE:
-        switch (sub)
-          {
-          case SUBLANG_MALTESE_MALTA: return "mt_MT";
-          }
-        return "mt";
-      case LANG_MANIPURI:
-        /* FIXME: Adjust this when such locales appear on Unix.  */
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "mni_IN";
-          }
-        return "mni";
-      case LANG_MAORI:
-        switch (sub)
-          {
-          case SUBLANG_MAORI_NEW_ZEALAND: return "mi_NZ";
-          }
-        return "mi";
-      case LANG_MAPUDUNGUN:
-        switch (sub)
-          {
-          case SUBLANG_MAPUDUNGUN_CHILE: return "arn_CL";
-          }
-        return "arn";
-      case LANG_MARATHI:
-        switch (sub)
-          {
-          case SUBLANG_MARATHI_INDIA: return "mr_IN";
-          }
-        return "mr";
-      case LANG_MOHAWK:
-        switch (sub)
-          {
-          case SUBLANG_MOHAWK_CANADA: return "moh_CA";
-          }
-        return "moh";
-      case LANG_MONGOLIAN:
-        switch (sub)
-          {
-          case SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA: case 0x1e: return "mn_MN";
-          case SUBLANG_MONGOLIAN_PRC: case 0x1f: return "mn_CN";
-          }
-        return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
-      case LANG_NEPALI:
-        switch (sub)
-          {
-          case SUBLANG_NEPALI_NEPAL: return "ne_NP";
-          case SUBLANG_NEPALI_INDIA: return "ne_IN";
-          }
-        return "ne";
-      case LANG_NORWEGIAN:
-        switch (sub)
-          {
-          case 0x1f: return "nb";
-          case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
-          case 0x1e: return "nn";
-          case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
-          }
-        return "no";
-      case LANG_OCCITAN:
-        switch (sub)
-          {
-          case SUBLANG_OCCITAN_FRANCE: return "oc_FR";
-          }
-        return "oc";
-      case LANG_ORIYA:
-        switch (sub)
-          {
-          case SUBLANG_ORIYA_INDIA: return "or_IN";
-          }
-        return "or";
-      case LANG_OROMO:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "om_ET";
-          }
-        return "om";
-      case LANG_PAPIAMENTU:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "pap_AN";
-          }
-        return "pap";
-      case LANG_PASHTO:
-        switch (sub)
-          {
-          case SUBLANG_PASHTO_AFGHANISTAN: return "ps_AF";
-          }
-        return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF".  */
-      case LANG_POLISH:
-        switch (sub)
-          {
-          case SUBLANG_POLISH_POLAND: return "pl_PL";
-          }
-        return "pl";
-      case LANG_PORTUGUESE:
-        switch (sub)
-          {
-          /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
-             Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
-          case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
-          case SUBLANG_PORTUGUESE: return "pt_PT";
-          }
-        return "pt";
-      case LANG_PUNJABI:
-        switch (sub)
-          {
-          case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
-          case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
-          }
-        return "pa";
-      case LANG_QUECHUA:
-        /* Note: Microsoft uses the non-ISO language code "quz".  */
-        switch (sub)
-          {
-          case SUBLANG_QUECHUA_BOLIVIA: return "qu_BO";
-          case SUBLANG_QUECHUA_ECUADOR: return "qu_EC";
-          case SUBLANG_QUECHUA_PERU: return "qu_PE";
-          }
-        return "qu";
-      case LANG_ROMANIAN:
-        switch (sub)
-          {
-          case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
-          case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
-          }
-        return "ro";
-      case LANG_ROMANSH:
-        switch (sub)
-          {
-          case SUBLANG_ROMANSH_SWITZERLAND: return "rm_CH";
-          }
-        return "rm";
-      case LANG_RUSSIAN:
-        switch (sub)
-          {
-          case SUBLANG_RUSSIAN_RUSSIA: return "ru_RU";
-          case SUBLANG_RUSSIAN_MOLDAVIA: return "ru_MD";
-          }
-        return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
-      case LANG_SAMI:
-        switch (sub)
-          {
-          /* Northern Sami */
-          case 0x00: return "se";
-          case SUBLANG_SAMI_NORTHERN_NORWAY: return "se_NO";
-          case SUBLANG_SAMI_NORTHERN_SWEDEN: return "se_SE";
-          case SUBLANG_SAMI_NORTHERN_FINLAND: return "se_FI";
-          /* Lule Sami */
-          case 0x1f: return "smj";
-          case SUBLANG_SAMI_LULE_NORWAY: return "smj_NO";
-          case SUBLANG_SAMI_LULE_SWEDEN: return "smj_SE";
-          /* Southern Sami */
-          case 0x1e: return "sma";
-          case SUBLANG_SAMI_SOUTHERN_NORWAY: return "sma_NO";
-          case SUBLANG_SAMI_SOUTHERN_SWEDEN: return "sma_SE";
-          /* Skolt Sami */
-          case 0x1d: return "sms";
-          case SUBLANG_SAMI_SKOLT_FINLAND: return "sms_FI";
-          /* Inari Sami */
-          case 0x1c: return "smn";
-          case SUBLANG_SAMI_INARI_FINLAND: return "smn_FI";
-          }
-        return "se"; /* or "smi"? */
-      case LANG_SANSKRIT:
-        switch (sub)
-          {
-          case SUBLANG_SANSKRIT_INDIA: return "sa_IN";
-          }
-        return "sa";
-      case LANG_SCOTTISH_GAELIC:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "gd_GB";
-          }
-        return "gd";
-      case LANG_SINDHI:
-        switch (sub)
-          {
-          case SUBLANG_SINDHI_INDIA: return "sd_IN";
-          case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
-          /*case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";*/
-          }
-        return "sd";
-      case LANG_SINHALESE:
-        switch (sub)
-          {
-          case SUBLANG_SINHALESE_SRI_LANKA: return "si_LK";
-          }
-        return "si";
-      case LANG_SLOVAK:
-        switch (sub)
-          {
-          case SUBLANG_SLOVAK_SLOVAKIA: return "sk_SK";
-          }
-        return "sk";
-      case LANG_SLOVENIAN:
-        switch (sub)
-          {
-          case SUBLANG_SLOVENIAN_SLOVENIA: return "sl_SI";
-          }
-        return "sl";
-      case LANG_SOMALI:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "so_SO";
-          }
-        return "so";
-      case LANG_SORBIAN:
-        /* FIXME: Adjust this when such locales appear on Unix.  */
-        switch (sub)
-          {
-          /* Upper Sorbian */
-          case 0x00: return "hsb";
-          case SUBLANG_UPPER_SORBIAN_GERMANY: return "hsb_DE";
-          /* Lower Sorbian */
-          case 0x1f: return "dsb";
-          case SUBLANG_LOWER_SORBIAN_GERMANY: return "dsb_DE";
-          }
-        return "wen";
-      case LANG_SOTHO:
-        /* <http://www.microsoft.com/globaldev/reference/lcid-all.mspx> calls
-           it "Sepedi"; according to
-           <http://www.ethnologue.com/show_language.asp?code=nso>
-           <http://www.ethnologue.com/show_language.asp?code=sot>
-           it's the same as Northern Sotho.  */
-        switch (sub)
-          {
-          case SUBLANG_SOTHO_SOUTH_AFRICA: return "nso_ZA";
-          }
-        return "nso";
-      case LANG_SPANISH:
-        switch (sub)
-          {
-          case SUBLANG_SPANISH: return "es_ES";
-          case SUBLANG_SPANISH_MEXICAN: return "es_MX";
-          case SUBLANG_SPANISH_MODERN:
-            return "es_ES@modern";      /* not seen on Unix */
-          case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
-          case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
-          case SUBLANG_SPANISH_PANAMA: return "es_PA";
-          case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
-          case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
-          case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
-          case SUBLANG_SPANISH_PERU: return "es_PE";
-          case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
-          case SUBLANG_SPANISH_ECUADOR: return "es_EC";
-          case SUBLANG_SPANISH_CHILE: return "es_CL";
-          case SUBLANG_SPANISH_URUGUAY: return "es_UY";
-          case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
-          case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
-          case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
-          case SUBLANG_SPANISH_HONDURAS: return "es_HN";
-          case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
-          case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
-          case SUBLANG_SPANISH_US: return "es_US";
-          }
-        return "es";
-      case LANG_SUTU:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
-          }
-        return "bnt";
-      case LANG_SWAHILI:
-        switch (sub)
-          {
-          case SUBLANG_SWAHILI_KENYA: return "sw_KE";
-          }
-        return "sw";
-      case LANG_SWEDISH:
-        switch (sub)
-          {
-          case SUBLANG_SWEDISH_SWEDEN: return "sv_SE";
-          case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
-          }
-        return "sv";
-      case LANG_SYRIAC:
-        switch (sub)
-          {
-          case SUBLANG_SYRIAC_SYRIA: return "syr_SY"; /* An extinct language.  */
-          }
-        return "syr";
-      case LANG_TAGALOG:
-        switch (sub)
-          {
-          case SUBLANG_TAGALOG_PHILIPPINES: return "tl_PH"; /* or "fil_PH"? */
-          }
-        return "tl"; /* or "fil"? */
-      case LANG_TAJIK:
-        switch (sub)
-          {
-          case 0x1f: return "tg";
-          case SUBLANG_TAJIK_TAJIKISTAN: return "tg_TJ";
-          }
-        return "tg";
-      case LANG_TAMAZIGHT:
-        /* Note: Microsoft uses the non-ISO language code "tmz".  */
-        switch (sub)
-          {
-          /* FIXME: Adjust this when Tamazight locales appear on Unix.  */
-          case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
-          case 0x1f: return "ber@latin";
-          case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ@latin";
-          }
-        return "ber";
-      case LANG_TAMIL:
-        switch (sub)
-          {
-          case SUBLANG_TAMIL_INDIA: return "ta_IN";
-          }
-        return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
-      case LANG_TATAR:
-        switch (sub)
-          {
-          case SUBLANG_TATAR_RUSSIA: return "tt_RU";
-          }
-        return "tt";
-      case LANG_TELUGU:
-        switch (sub)
-          {
-          case SUBLANG_TELUGU_INDIA: return "te_IN";
-          }
-        return "te";
-      case LANG_THAI:
-        switch (sub)
-          {
-          case SUBLANG_THAI_THAILAND: return "th_TH";
-          }
-        return "th";
-      case LANG_TIBETAN:
-        switch (sub)
-          {
-          case SUBLANG_TIBETAN_PRC:
-            /* Most Tibetans would not like "bo_CN".  But Tibet does not yet
-               have a country code of its own.  */
-            return "bo";
-          case SUBLANG_TIBETAN_BHUTAN: return "bo_BT";
-          }
-        return "bo";
-      case LANG_TIGRINYA:
-        switch (sub)
-          {
-          case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
-          case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
-          }
-        return "ti";
-      case LANG_TSONGA:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "ts_ZA";
-          }
-        return "ts";
-      case LANG_TSWANA:
-        /* Spoken in South Africa, Botswana.  */
-        switch (sub)
-          {
-          case SUBLANG_TSWANA_SOUTH_AFRICA: return "tn_ZA";
-          }
-        return "tn";
-      case LANG_TURKISH:
-        switch (sub)
-          {
-          case SUBLANG_TURKISH_TURKEY: return "tr_TR";
-          }
-        return "tr";
-      case LANG_TURKMEN:
-        switch (sub)
-          {
-          case SUBLANG_TURKMEN_TURKMENISTAN: return "tk_TM";
-          }
-        return "tk";
-      case LANG_UIGHUR:
-        switch (sub)
-          {
-          case SUBLANG_UIGHUR_PRC: return "ug_CN";
-          }
-        return "ug";
-      case LANG_UKRAINIAN:
-        switch (sub)
-          {
-          case SUBLANG_UKRAINIAN_UKRAINE: return "uk_UA";
-          }
-        return "uk";
-      case LANG_URDU:
-        switch (sub)
-          {
-          case SUBLANG_URDU_PAKISTAN: return "ur_PK";
-          case SUBLANG_URDU_INDIA: return "ur_IN";
-          }
-        return "ur";
-      case LANG_UZBEK:
-        switch (sub)
-          {
-          case 0x1f: return "uz";
-          case SUBLANG_UZBEK_LATIN: return "uz_UZ";
-          case 0x1e: return "uz@cyrillic";
-          case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
-          }
-        return "uz";
-      case LANG_VENDA:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "ve_ZA";
-          }
-        return "ve";
-      case LANG_VIETNAMESE:
-        switch (sub)
-          {
-          case SUBLANG_VIETNAMESE_VIETNAM: return "vi_VN";
-          }
-        return "vi";
-      case LANG_WELSH:
-        switch (sub)
-          {
-          case SUBLANG_WELSH_UNITED_KINGDOM: return "cy_GB";
-          }
-        return "cy";
-      case LANG_WOLOF:
-        switch (sub)
-          {
-          case SUBLANG_WOLOF_SENEGAL: return "wo_SN";
-          }
-        return "wo";
-      case LANG_XHOSA:
-        switch (sub)
-          {
-          case SUBLANG_XHOSA_SOUTH_AFRICA: return "xh_ZA";
-          }
-        return "xh";
-      case LANG_YAKUT:
-        switch (sub)
-          {
-          case SUBLANG_YAKUT_RUSSIA: return "sah_RU";
-          }
-        return "sah";
-      case LANG_YI:
-        switch (sub)
-          {
-          case SUBLANG_YI_PRC: return "ii_CN";
-          }
-        return "ii";
-      case LANG_YIDDISH:
-        switch (sub)
-          {
-          case SUBLANG_DEFAULT: return "yi_IL";
-          }
-        return "yi";
-      case LANG_YORUBA:
-        switch (sub)
-          {
-          case SUBLANG_YORUBA_NIGERIA: return "yo_NG";
-          }
-        return "yo";
-      case LANG_ZULU:
-        switch (sub)
-          {
-          case SUBLANG_ZULU_SOUTH_AFRICA: return "zu_ZA";
-          }
-        return "zu";
-      default: return "C";
-      }
-  }
-}
-
-# if !defined IN_LIBINTL
-static
-# endif
-const char *
-gl_locale_name_from_win32_LCID (LCID lcid)
-{
-  LANGID langid;
-
-  /* Strip off the sorting rules, keep only the language part.  */
-  langid = LANGIDFROMLCID (lcid);
-
-  return gl_locale_name_from_win32_LANGID (langid);
-}
-
-# ifdef WINDOWS_NATIVE
-
-/* Two variables to interface between get_lcid and the EnumLocales
-   callback function below.  */
-static LCID found_lcid;
-static char lname[LC_MAX * (LOCALE_NAME_MAX_LENGTH + 1) + 1];
-
-/* Callback function for EnumLocales.  */
-static BOOL CALLBACK
-enum_locales_fn (LPTSTR locale_num_str)
-{
-  char *endp;
-  char locval[2 * LOCALE_NAME_MAX_LENGTH + 1 + 1];
-  LCID try_lcid = strtoul (locale_num_str, &endp, 16);
-
-  if (GetLocaleInfo (try_lcid, LOCALE_SENGLANGUAGE,
-                    locval, LOCALE_NAME_MAX_LENGTH))
-    {
-      strcat (locval, "_");
-      if (GetLocaleInfo (try_lcid, LOCALE_SENGCOUNTRY,
-                        locval + strlen (locval), LOCALE_NAME_MAX_LENGTH))
-       {
-         size_t locval_len = strlen (locval);
-
-         if (strncmp (locval, lname, locval_len) == 0
-             && (lname[locval_len] == '.'
-                 || lname[locval_len] == '\0'))
-           {
-             found_lcid = try_lcid;
-             return FALSE;
-           }
-       }
-    }
-  return TRUE;
-}
-
-/* This lock protects the get_lcid against multiple simultaneous calls.  */
-gl_lock_define_initialized(static, get_lcid_lock)
-
-/* Return the Locale ID (LCID) number given the locale's name, a
-   string, in LOCALE_NAME.  This works by enumerating all the locales
-   supported by the system, until we find one whose name matches
-   LOCALE_NAME.  */
-static LCID
-get_lcid (const char *locale_name)
-{
-  /* A simple cache.  */
-  static LCID last_lcid;
-  static char last_locale[1000];
-
-  /* Lock while looking for an LCID, to protect access to static
-     variables: last_lcid, last_locale, found_lcid, and lname.  */
-  gl_lock_lock (get_lcid_lock);
-  if (last_lcid > 0 && strcmp (locale_name, last_locale) == 0)
-    {
-      gl_lock_unlock (get_lcid_lock);
-      return last_lcid;
-    }
-  strncpy (lname, locale_name, sizeof (lname) - 1);
-  lname[sizeof (lname) - 1] = '\0';
-  found_lcid = 0;
-  EnumSystemLocales (enum_locales_fn, LCID_SUPPORTED);
-  if (found_lcid > 0)
-    {
-      last_lcid = found_lcid;
-      strcpy (last_locale, locale_name);
-    }
-  gl_lock_unlock (get_lcid_lock);
-  return found_lcid;
-}
-
-# endif
-#endif
-
-
-#if HAVE_USELOCALE /* glibc or Mac OS X */
-
-/* Simple hash set of strings.  We don't want to drag in lots of hash table
-   code here.  */
-
-# define SIZE_BITS (sizeof (size_t) * CHAR_BIT)
-
-/* A hash function for NUL-terminated char* strings using
-   the method described by Bruno Haible.
-   See http://www.haible.de/bruno/hashfunc.html.  */
-static size_t _GL_ATTRIBUTE_PURE
-string_hash (const void *x)
-{
-  const char *s = (const char *) x;
-  size_t h = 0;
-
-  for (; *s; s++)
-    h = *s + ((h << 9) | (h >> (SIZE_BITS - 9)));
-
-  return h;
-}
-
-/* A hash table of fixed size.  Multiple threads can access it read-only
-   simultaneously, but only one thread can insert into it at the same time.  */
-
-/* A node in a hash bucket collision list.  */
-struct hash_node
-  {
-    struct hash_node * volatile next;
-    char contents[100]; /* has variable size */
-  };
-
-# define HASH_TABLE_SIZE 257
-static struct hash_node * volatile struniq_hash_table[HASH_TABLE_SIZE]
-  /* = { NULL, ..., NULL } */;
-
-/* This lock protects the struniq_hash_table against multiple simultaneous
-   insertions.  */
-gl_lock_define_initialized(static, struniq_lock)
-
-/* Store a copy of the given string in a string pool with indefinite extent.
-   Return a pointer to this copy.  */
-static const char *
-struniq (const char *string)
-{
-  size_t hashcode = string_hash (string);
-  size_t slot = hashcode % HASH_TABLE_SIZE;
-  size_t size;
-  struct hash_node *new_node;
-  struct hash_node *p;
-  for (p = struniq_hash_table[slot]; p != NULL; p = p->next)
-    if (strcmp (p->contents, string) == 0)
-      return p->contents;
-  size = strlen (string) + 1;
-  new_node =
-    (struct hash_node *)
-    malloc (offsetof (struct hash_node, contents[0]) + size);
-  if (new_node == NULL)
-    /* Out of memory.  Return a statically allocated string.  */
-    return "C";
-  memcpy (new_node->contents, string, size);
-  /* Lock while inserting new_node.  */
-  gl_lock_lock (struniq_lock);
-  /* Check whether another thread already added the string while we were
-     waiting on the lock.  */
-  for (p = struniq_hash_table[slot]; p != NULL; p = p->next)
-    if (strcmp (p->contents, string) == 0)
-      {
-        free (new_node);
-        new_node = p;
-        goto done;
-      }
-  /* Really insert new_node into the hash table.  Fill new_node entirely first,
-     because other threads may be iterating over the linked list.  */
-  new_node->next = struniq_hash_table[slot];
-  struniq_hash_table[slot] = new_node;
- done:
-  /* Unlock after new_node is inserted.  */
-  gl_lock_unlock (struniq_lock);
-  return new_node->contents;
-}
-
-#endif
-
-
-#if defined IN_LIBINTL || HAVE_USELOCALE
-
-/* Like gl_locale_name_thread, except that the result is not in storage of
-   indefinite extent.  */
-# if !defined IN_LIBINTL
-static
-# endif
-const char *
-gl_locale_name_thread_unsafe (int category, const char *categoryname)
-{
-# if HAVE_USELOCALE
-  {
-    locale_t thread_locale = uselocale (NULL);
-    if (thread_locale != LC_GLOBAL_LOCALE)
-      {
-#  if __GLIBC__ >= 2 && !defined __UCLIBC__
-        /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-           glibc < 2.12.
-           See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
-        const char *name =
-          nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-        if (name[0] == '\0')
-          /* Fallback code for glibc < 2.4, which did not implement
-             nl_langinfo (_NL_LOCALE_NAME (category)).  */
-          name = thread_locale->__names[category];
-        return name;
-#  elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__)
-        /* FreeBSD, Mac OS X */
-        int mask;
-
-        switch (category)
-          {
-          case LC_CTYPE:
-            mask = LC_CTYPE_MASK;
-            break;
-          case LC_NUMERIC:
-            mask = LC_NUMERIC_MASK;
-            break;
-          case LC_TIME:
-            mask = LC_TIME_MASK;
-            break;
-          case LC_COLLATE:
-            mask = LC_COLLATE_MASK;
-            break;
-          case LC_MONETARY:
-            mask = LC_MONETARY_MASK;
-            break;
-          case LC_MESSAGES:
-            mask = LC_MESSAGES_MASK;
-            break;
-          default: /* We shouldn't get here.  */
-            return "";
-          }
-        return querylocale (mask, thread_locale);
-#  endif
-      }
-  }
-# endif
-  return NULL;
-}
-
-#endif
-
-const char *
-gl_locale_name_thread (int category, const char *categoryname)
-{
-#if HAVE_USELOCALE
-  const char *name = gl_locale_name_thread_unsafe (category, categoryname);
-  if (name != NULL)
-    return struniq (name);
-#elif defined WINDOWS_NATIVE
-  if (LC_MIN <= category && category <= LC_MAX)
-    {
-      char *locname = setlocale (category, NULL);
-      LCID lcid = 0;
-
-      /* If CATEGORY is LC_ALL, the result might be a semi-colon
-        separated list of locales.  We need only one, so we take the
-        one corresponding to LC_CTYPE, as the most important for
-        character translations.  */
-      if (strchr (locname, ';'))
-       locname = setlocale (LC_CTYPE, NULL);
-
-      /* Convert locale name to LCID.  We don't want to use
-         LocaleNameToLCID because (a) it is only available since Vista,
-         and (b) it doesn't accept locale names returned by 'setlocale'.  */
-      lcid = get_lcid (locname);
-
-      if (lcid > 0)
-        return gl_locale_name_from_win32_LCID (lcid);
-    }
-#endif
-  return NULL;
-}
-
-/* XPG3 defines the result of 'setlocale (category, NULL)' as:
-   "Directs 'setlocale()' to query 'category' and return the current
-    setting of 'local'."
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
-# define HAVE_LOCALE_NULL
-#endif
-
-const char *
-gl_locale_name_posix (int category, const char *categoryname)
-{
-  /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
-     On some systems this can be done by the 'setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  /* On other systems we ignore what setlocale reports and instead look at the
-     environment variables directly.  This is necessary
-       1. on systems which have a facility for customizing the default locale
-          (Mac OS X, native Windows, Cygwin) and where the system's setlocale()
-          function ignores this default locale (Mac OS X, Cygwin), in two cases:
-          a. when the user missed to use the setlocale() override from libintl
-             (for example by not including <libintl.h>),
-          b. when setlocale supports only the "C" locale, such as on Cygwin
-             1.5.x.  In this case even the override from libintl cannot help.
-       2. on all systems where setlocale supports only the "C" locale.  */
-  /* Strictly speaking, it is a POSIX violation to look at the environment
-     variables regardless whether setlocale has been called or not.  POSIX
-     says:
-         "For C-language programs, the POSIX locale shall be the
-          default locale when the setlocale() function is not called."
-     But we assume that all programs that use internationalized APIs call
-     setlocale (LC_ALL, "").  */
-  return gl_locale_name_environ (category, categoryname);
-#endif
-}
-
-const char *
-gl_locale_name_environ (int category, const char *categoryname)
-{
-  const char *retval;
-
-  /* Setting of LC_ALL overrides all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    {
-#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-      /* Mac OS X 10.2 or newer.
-         Ignore invalid LANG value set by the Terminal application.  */
-      if (strcmp (retval, "UTF-8") != 0)
-#endif
-#if defined __CYGWIN__
-      /* Cygwin.
-         Ignore dummy LANG value set by ~/.profile.  */
-      if (strcmp (retval, "C.UTF-8") != 0)
-#endif
-        return retval;
-    }
-
-  return NULL;
-}
-
-const char *
-gl_locale_name_default (void)
-{
-  /* POSIX:2001 says:
-     "All implementations shall define a locale as the default locale, to be
-      invoked when no environment variables are set, or set to the empty
-      string.  This default locale can be the POSIX locale or any other
-      implementation-defined locale.  Some implementations may provide
-      facilities for local installation administrators to set the default
-      locale, customizing it for each location.  POSIX:2001 does not require
-      such a facility.
-
-     The systems with such a facility are Mac OS X and Windows: They provide a
-     GUI that allows the user to choose a locale.
-       - On Mac OS X, by default, none of LC_* or LANG are set.  Starting with
-         Mac OS X 10.4 or 10.5, LANG is set for processes launched by the
-         'Terminal' application (but sometimes to an incorrect value "UTF-8").
-         When no environment variable is set, setlocale (LC_ALL, "") uses the
-         "C" locale.
-       - On native Windows, by default, none of LC_* or LANG are set.
-         When no environment variable is set, setlocale (LC_ALL, "") uses the
-         locale chosen by the user.
-       - On Cygwin 1.5.x, by default, none of LC_* or LANG are set.
-         When no environment variable is set, setlocale (LC_ALL, "") uses the
-         "C" locale.
-       - On Cygwin 1.7, by default, LANG is set to "C.UTF-8" when the default
-         ~/.profile is executed.
-         When no environment variable is set, setlocale (LC_ALL, "") uses the
-         "C.UTF-8" locale, which operates in the same way as the "C" locale.
-  */
-
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
-
-  /* The system does not have a way of setting the locale, other than the
-     POSIX specified environment variables.  We use C as default locale.  */
-  return "C";
-
-#else
-
-  /* Return an XPG style locale name language[_territory][@modifier].
-     Don't even bother determining the codeset; it's not useful in this
-     context, because message catalogs are not specific to a single
-     codeset.  */
-
-# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-  /* Mac OS X 10.2 or newer */
-  {
-    /* Cache the locale name, since CoreFoundation calls are expensive.  */
-    static const char *cached_localename;
-
-    if (cached_localename == NULL)
-      {
-        char namebuf[256];
-#  if HAVE_CFLOCALECOPYCURRENT /* Mac OS X 10.3 or newer */
-        CFLocaleRef locale = CFLocaleCopyCurrent ();
-        CFStringRef name = CFLocaleGetIdentifier (locale);
-
-        if (CFStringGetCString (name, namebuf, sizeof (namebuf),
-                                kCFStringEncodingASCII))
-          {
-            gl_locale_name_canonicalize (namebuf);
-            cached_localename = strdup (namebuf);
-          }
-        CFRelease (locale);
-#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* Mac OS X 10.2 or newer */
-        CFTypeRef value =
-          CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
-                                     kCFPreferencesCurrentApplication);
-        if (value != NULL
-            && CFGetTypeID (value) == CFStringGetTypeID ()
-            && CFStringGetCString ((CFStringRef)value,
-                                   namebuf, sizeof (namebuf),
-                                   kCFStringEncodingASCII))
-          {
-            gl_locale_name_canonicalize (namebuf);
-            cached_localename = strdup (namebuf);
-          }
-#  endif
-        if (cached_localename == NULL)
-          cached_localename = "C";
-      }
-    return cached_localename;
-  }
-
-# endif
-
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-  {
-    LCID lcid;
-
-    /* Use native Windows API locale ID.  */
-    lcid = GetThreadLocale ();
-
-    return gl_locale_name_from_win32_LCID (lcid);
-  }
-# endif
-#endif
-}
-
-/* Determine the current locale's name, and canonicalize it into XPG syntax
-     language[_territory][.codeset][@modifier]
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-
-const char *
-gl_locale_name (int category, const char *categoryname)
-{
-  const char *retval;
-
-  retval = gl_locale_name_thread (category, categoryname);
-  if (retval != NULL)
-    return retval;
-
-  retval = gl_locale_name_posix (category, categoryname);
-  if (retval != NULL)
-    return retval;
-
-  return gl_locale_name_default ();
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/localename.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/localename.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/localename.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/localename.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-/* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 _GL_LOCALENAME_H
-#define _GL_LOCALENAME_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Determine the current locale's name.
-   It considers both the POSIX notion of locale name (see functions
-   gl_locale_name_thread and gl_locale_name_posix) and the system notion
-   of locale name (see function gl_locale_name_default).
-   CATEGORY is a locale category abbreviation, as defined in <locale.h>,
-   but not LC_ALL. E.g. LC_MESSAGES.
-   CATEGORYNAME is the name of CATEGORY as a string, e.g. "LC_MESSAGES".
-   Return the locale category's name, canonicalized into XPG syntax
-     language[_territory][.codeset][@modifier]
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name (int category, const char *categoryname);
-
-/* Determine the current per-thread locale's name, as specified by uselocale()
-   calls.
-   CATEGORY is a locale category abbreviation, as defined in <locale.h>,
-   but not LC_ALL. E.g. LC_MESSAGES.
-   CATEGORYNAME is the name of CATEGORY as a string, e.g. "LC_MESSAGES".
-   Return the locale category's name, canonicalized into XPG syntax
-     language[_territory][.codeset][@modifier]
-   or NULL if no locale has been specified for the current thread.
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name_thread (int category, const char *categoryname);
-
-/* Determine the thread-independent current locale's name, as specified by
-   setlocale() calls or by environment variables.
-   CATEGORY is a locale category abbreviation, as defined in <locale.h>,
-   but not LC_ALL. E.g. LC_MESSAGES.
-   CATEGORYNAME is the name of CATEGORY as a string, e.g. "LC_MESSAGES".
-   Return the locale category's name, canonicalized into XPG syntax
-     language[_territory][.codeset][@modifier]
-   or NULL if no locale has been specified to setlocale() or by environment
-   variables.
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name_posix (int category, const char *categoryname);
-
-/* Determine the default locale's name, as specified by environment
-   variables.
-   Return the locale category's name, or NULL if no locale has been specified
-   by environment variables.
-   The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name_environ (int category, const char *categoryname);
-
-/* Determine the default locale's name.  This is the current locale's name,
-   if not specified by uselocale() calls, by setlocale() calls, or by
-   environment variables.  This locale name is usually determined by systems
-   settings that the user can manipulate through a GUI.
-
-   Quoting POSIX:2001:
-     "All implementations shall define a locale as the default locale,
-      to be invoked when no environment variables are set, or set to the
-      empty string.  This default locale can be the C locale or any other
-      implementation-defined locale.  Some implementations may provide
-      facilities for local installation administrators to set the default
-      locale, customizing it for each location.  IEEE Std 1003.1-2001 does
-      not require such a facility."
-
-   The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name_default (void)
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE \
-      || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
-  _GL_ATTRIBUTE_CONST
-#endif
-  ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GL_LOCALENAME_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/lstat.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/lstat.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/lstat.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/lstat.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,10 +17,6 @@
 
 /* written by Jim Meyering */
 
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
-   rpl_lstat.  */
-#define __need_system_sys_stat_h
 #include <config.h>
 
 #if !HAVE_LSTAT
@@ -31,31 +27,29 @@
 #else /* HAVE_LSTAT */
 
 /* Get the original definition of lstat.  It might be defined as a macro.  */
+# define __need_system_sys_stat_h
 # include <sys/types.h>
 # include <sys/stat.h>
 # undef __need_system_sys_stat_h
 
-static int
+static inline int
 orig_lstat (const char *filename, struct stat *buf)
 {
   return lstat (filename, buf);
 }
 
 /* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-# include "sys/stat.h"
+# include <sys/stat.h>
 
 # include <string.h>
 # include <errno.h>
 
 /* lstat works differently on Linux and Solaris systems.  POSIX (see
-   "pathname resolution" in the glossary) requires that programs like
-   'ls' take into consideration the fact that FILE has a trailing slash
+   `pathname resolution' in the glossary) requires that programs like
+   `ls' take into consideration the fact that FILE has a trailing slash
    when FILE is a symbolic link.  On Linux and Solaris 10 systems, the
    lstat function already has the desired semantics (in treating
-   'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)',
+   `lstat ("symlink/", sbuf)' just like `lstat ("symlink/.", sbuf)',
    but on Solaris 9 and earlier it does not.
 
    If FILE has a trailing slash and specifies a symbolic link,
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/Makefile.am gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.am
--- gettext-0.19.3/gettext-runtime/gnulib-lib/Makefile.am	2014-10-16 06:00:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.am	2010-06-03 21:35:21.000000000 +0000
@@ -1,29 +1,17 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-runtime --local-dir=gnulib-local --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl ansi-c++-opt atexit basename closeout csharpcomp-script error getopt-gnu gettext-h gettext-runtime-misc havelib java javacomp-script memmove progname propername relocatable-prog setlocale sigpipe stdbool stdio stdlib strtoul unlocked-io xalloc
+# Reproduce by: gnulib-tool --import --dir=gettext-runtime --local-dir=gnulib-local --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --no-libtool --macro-prefix=gl atexit basename closeout csharpcomp-script error getopt-gnu gettext-h gettext-runtime-misc havelib java javacomp-script memmove progname propername relocatable-prog sigpipe stdbool stdio stdlib strtoul unlocked-io xalloc
 
-AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 
 SUBDIRS =
 noinst_HEADERS =
@@ -48,46 +36,24 @@
 libgrt_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgrt_a_SOURCES =
 
-## begin gnulib module absolute-header
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-
-## end   gnulib module absolute-header
-
 ## begin gnulib module alloca-opt
 
 BUILT_SOURCES += $(ALLOCA_H)
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ALLOCA_H
-alloca.h: alloca.in.h $(top_builddir)/config.status
+alloca.h: alloca.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/alloca.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-else
-alloca.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
-## begin gnulib module allocator
-
-libgrt_a_SOURCES += allocator.c
-
-EXTRA_DIST += allocator.h
-
-## end   gnulib module allocator
-
 ## begin gnulib module areadlink
 
 libgrt_a_SOURCES += areadlink.c
@@ -96,6 +62,30 @@
 
 ## end   gnulib module areadlink
 
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/arg-nonnull.h
+
+## end   gnulib module arg-nonnull
+
 ## begin gnulib module atexit
 
 
@@ -111,6 +101,30 @@
 
 ## end   gnulib module basename
 
+## begin gnulib module c++defs
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/c++defs.h
+
+## end   gnulib module c++defs
+
 ## begin gnulib module c-ctype
 
 libgrt_a_SOURCES += c-ctype.h c-ctype.c
@@ -132,14 +146,6 @@
 
 ## end   gnulib module canonicalize-lgpl
 
-## begin gnulib module careadlinkat
-
-libgrt_a_SOURCES += careadlinkat.c
-
-EXTRA_DIST += careadlinkat.h
-
-## end   gnulib module careadlinkat
-
 ## begin gnulib module closeout
 
 libgrt_a_SOURCES += closeout.h closeout.c
@@ -148,8 +154,21 @@
 
 ## begin gnulib module configmake
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
@@ -165,7 +184,6 @@
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -184,7 +202,11 @@
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
 
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
@@ -198,27 +220,17 @@
 
 ## end   gnulib module csharpcomp-script
 
-## begin gnulib module dosname
-
-
-EXTRA_DIST += dosname.h
-
-## end   gnulib module dosname
-
 ## begin gnulib module errno
 
 BUILT_SOURCES += $(ERRNO_H)
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-if GL_GENERATE_ERRNO_H
-errno.h: errno.in.h $(top_builddir)/config.status
+errno.h: errno.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
 	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
 	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
@@ -229,10 +241,6 @@
 	      < $(srcdir)/errno.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-errno.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += errno.h errno.h-t
 
 EXTRA_DIST += errno.in.h
@@ -260,14 +268,12 @@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+	  sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      < $(srcdir)/getopt.in.h; \
@@ -297,22 +303,8 @@
 # Parametrization of the 'relocatable' module.
 AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 
-# Tell the mingw or Cygwin linker which symbols to export.
-if WOE32DLL
-AM_CPPFLAGS += @INTL_EXPORTS_FLAGS@
-endif
-
 ## end   gnulib module gettext-runtime-misc
 
-## begin gnulib module gettimeofday
-
-
-EXTRA_DIST += gettimeofday.c
-
-EXTRA_libgrt_a_SOURCES += gettimeofday.c
-
-## end   gnulib module gettimeofday
-
 ## begin gnulib module gperf
 
 GPERF = gperf
@@ -332,16 +324,12 @@
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ICONV_H
-iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-	      -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
 	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
 	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
 	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
@@ -352,10 +340,6 @@
 	      < $(srcdir)/iconv.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-iconv.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += iconv.h iconv.h-t
 
 EXTRA_DIST += iconv.in.h
@@ -384,9 +368,9 @@
 MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 
-EXTRA_DIST += 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
+EXTRA_DIST += iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c
 
-EXTRA_libgrt_a_SOURCES += iconv.c iconv_close.c iconv_open.c
+EXTRA_libgrt_a_SOURCES += iconv_open.c
 
 ## end   gnulib module iconv_open
 
@@ -397,15 +381,6 @@
 
 ## end   gnulib module intprops
 
-## begin gnulib module iswblank
-
-
-EXTRA_DIST += iswblank.c
-
-EXTRA_libgrt_a_SOURCES += iswblank.c
-
-## end   gnulib module iswblank
-
 ## begin gnulib module javacomp-script
 
 
@@ -487,63 +462,23 @@
 
 ## end   gnulib module localcharset
 
-## begin gnulib module locale
-
-BUILT_SOURCES += locale.h
-
-# We need the following in order to create <locale.h> when the system
-# doesn't have one that provides all definitions.
-locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
-	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
-	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
-	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
-	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/locale.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += locale.h locale.h-t
-
-EXTRA_DIST += locale.in.h
-
-## end   gnulib module locale
-
-## begin gnulib module localename
-
-libgrt_a_SOURCES += localename.c
-
-EXTRA_DIST += localename.h
+## begin gnulib module lstat
 
-## end   gnulib module localename
 
-## begin gnulib module lock
+EXTRA_DIST += lstat.c
 
-libgrt_a_SOURCES += glthread/lock.h glthread/lock.c
+EXTRA_libgrt_a_SOURCES += lstat.c
 
-## end   gnulib module lock
+## end   gnulib module lstat
 
-## begin gnulib module lstat
+## begin gnulib module malloc-posix
 
 
-EXTRA_DIST += lstat.c
+EXTRA_DIST += malloc.c
 
-EXTRA_libgrt_a_SOURCES += lstat.c
+EXTRA_libgrt_a_SOURCES += malloc.c
 
-## end   gnulib module lstat
+## end   gnulib module malloc-posix
 
 ## begin gnulib module malloca
 
@@ -563,7 +498,7 @@
 
 ## begin gnulib module mbiter
 
-libgrt_a_SOURCES += mbiter.h mbiter.c
+libgrt_a_SOURCES += mbiter.h
 
 ## end   gnulib module mbiter
 
@@ -601,7 +536,7 @@
 
 ## begin gnulib module mbuiter
 
-libgrt_a_SOURCES += mbuiter.h mbuiter.c
+libgrt_a_SOURCES += mbuiter.h
 
 ## end   gnulib module mbuiter
 
@@ -623,24 +558,6 @@
 
 ## end   gnulib module memmove
 
-## begin gnulib module msvc-inval
-
-
-EXTRA_DIST += msvc-inval.c msvc-inval.h
-
-EXTRA_libgrt_a_SOURCES += msvc-inval.c
-
-## end   gnulib module msvc-inval
-
-## begin gnulib module msvc-nothrow
-
-
-EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
-
-EXTRA_libgrt_a_SOURCES += msvc-nothrow.c
-
-## end   gnulib module msvc-nothrow
-
 ## begin gnulib module pathmax
 
 
@@ -660,15 +577,6 @@
 
 ## end   gnulib module propername
 
-## begin gnulib module raise
-
-
-EXTRA_DIST += raise.c
-
-EXTRA_libgrt_a_SOURCES += raise.c
-
-## end   gnulib module raise
-
 ## begin gnulib module readlink
 
 
@@ -681,20 +589,6 @@
 ## begin gnulib module relocatable-prog
 
 DEFS += -DEXEEXT=\"@EXEEXT@\"
-if RELOCATABLE_VIA_WRAPPER
-uninstall-hook: uninstall-relocwrapper
-uninstall-relocwrapper:
-	if test $(RELOCATABLE) = yes; then \
-	  case '$(EXEEXT)' in \
-	    .bin*) ;; \
-	    *) cd $(top_builddir) && \
-	       $(MAKE) $(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT) \
-		       AM_MAKEFLAGS='$(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT)' \
-		       uninstall ;; \
-	  esac; \
-	fi
-.PHONY: uninstall-relocwrapper
-endif
 
 EXTRA_DIST += progreloc.c relocatable.c relocatable.h
 
@@ -707,51 +601,33 @@
 ## begin gnulib module relocatable-prog-wrapper
 
 
-EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c
+EXTRA_DIST += areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c
 
 EXTRA_DIST += $(top_srcdir)/../build-aux/install-reloc
 
 ## end   gnulib module relocatable-prog-wrapper
 
-## begin gnulib module setlocale
-
-
-EXTRA_DIST += setlocale.c
-
-EXTRA_libgrt_a_SOURCES += setlocale.c
-
-## end   gnulib module setlocale
-
-## begin gnulib module signal-h
+## begin gnulib module signal
 
 BUILT_SOURCES += signal.h
 
 # We need the following in order to create <signal.h> when the system
 # doesn't have a complete one.
-signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
-	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
+	      -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
+	      -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
 	      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
-	      -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
 	      -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
 	      -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
 	      -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
 	      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
 	      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-	      -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
-	      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -762,16 +638,7 @@
 
 EXTRA_DIST += signal.in.h
 
-## end   gnulib module signal-h
-
-## begin gnulib module sigpipe
-
-
-EXTRA_DIST += stdio-write.c
-
-EXTRA_libgrt_a_SOURCES += stdio-write.c
-
-## end   gnulib module sigpipe
+## end   gnulib module signal
 
 ## begin gnulib module sigprocmask
 
@@ -782,112 +649,6 @@
 
 ## end   gnulib module sigprocmask
 
-## begin gnulib module snippet/_Noreturn
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-
-_NORETURN_H=$(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-## end   gnulib module snippet/_Noreturn
-
-## begin gnulib module snippet/arg-nonnull
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-
-ARG_NONNULL_H=arg-nonnull.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-
-## end   gnulib module snippet/arg-nonnull
-
-## begin gnulib module snippet/c++defs
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/c++defs.h
-
-## end   gnulib module snippet/c++defs
-
-## begin gnulib module snippet/unused-parameter
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += unused-parameter.h
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
-
-UNUSED_PARAMETER_H=unused-parameter.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-
-## end   gnulib module snippet/unused-parameter
-
-## begin gnulib module snippet/warn-on-use
-
-BUILT_SOURCES += warn-on-use.h
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
-
-WARN_ON_USE_H=warn-on-use.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-
-## end   gnulib module snippet/warn-on-use
-
 ## begin gnulib module stat
 
 
@@ -903,17 +664,12 @@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-if GL_GENERATE_STDBOOL_H
-stdbool.h: stdbool.in.h $(top_builddir)/config.status
+stdbool.h: stdbool.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdbool.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
 EXTRA_DIST += stdbool.in.h
@@ -926,24 +682,17 @@
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDDEF_H
-stddef.h: stddef.in.h $(top_builddir)/config.status
+stddef.h: stddef.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
 	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
 	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
 	      < $(srcdir)/stddef.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stddef.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stddef.h stddef.h-t
 
 EXTRA_DIST += stddef.in.h
@@ -956,21 +705,17 @@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDINT_H
-stdint.h: stdint.in.h $(top_builddir)/config.status
+stdint.h: stdint.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
 	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
 	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
 	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
 	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
@@ -990,10 +735,6 @@
 	      < $(srcdir)/stdint.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdint.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
 EXTRA_DIST += stdint.in.h
@@ -1006,71 +747,55 @@
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
-	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
-	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
-	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
-	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
-	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
-	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
-	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
-	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
-	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
-	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
-	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
-	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
-	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
-	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
-	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
-	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
-	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
-	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
-	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
-	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
-	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
-	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
-	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
-	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
-	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
-	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
-	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
-	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
-	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
-	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
-	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
-	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
-	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
-	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
-	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
-	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+	      -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+	      -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+	      -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+	      -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+	      -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      < $(srcdir)/stdio.in.h | \
 	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
-	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -1079,14 +804,11 @@
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
 	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
-	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
-	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -1107,7 +829,6 @@
 	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
 	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
@@ -1124,7 +845,9 @@
 	mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
-EXTRA_DIST += stdio.in.h
+EXTRA_DIST += stdio-write.c stdio.in.h
+
+EXTRA_libgrt_a_SOURCES += stdio-write.c
 
 ## end   gnulib module stdio
 
@@ -1134,97 +857,73 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+	      -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+	      -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
 	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
 	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
@@ -1249,15 +948,6 @@
 
 ## end   gnulib module strerror
 
-## begin gnulib module strerror-override
-
-
-EXTRA_DIST += strerror-override.c strerror-override.h
-
-EXTRA_libgrt_a_SOURCES += strerror-override.c
-
-## end   gnulib module strerror-override
-
 ## begin gnulib module striconv
 
 libgrt_a_SOURCES += striconv.h striconv.c
@@ -1272,55 +962,48 @@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-	      -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-	      -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-	      -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-	      -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-	      -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-	      -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-	      -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-	      -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-	      -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-	      -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-	      -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-	      -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-	      -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-	      -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-	      -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-	      -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-	      -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-	      -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-	      -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-	      -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-	      -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-	      -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-	      -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-	      -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-	      -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-	      -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-	      -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-	      -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-	      -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-	      -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-	      -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-	      -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-	      -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+	  sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -1336,18 +1019,15 @@
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-	      -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
 	      -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
 	      -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -1381,12 +1061,21 @@
 
 ## end   gnulib module strnlen1
 
+## begin gnulib module strtol
+
+
+EXTRA_DIST += strtol.c
+
+EXTRA_libgrt_a_SOURCES += strtol.c
+
+## end   gnulib module strtol
+
 ## begin gnulib module strtoul
 
 
-EXTRA_DIST += strtol.c strtoul.c
+EXTRA_DIST += strtoul.c
 
-EXTRA_libgrt_a_SOURCES += strtol.c strtoul.c
+EXTRA_libgrt_a_SOURCES += strtoul.c
 
 ## end   gnulib module strtoul
 
@@ -1396,29 +1085,25 @@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+	      -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+	      -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+	      -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+	      -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+	      -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+	      -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+	      -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+	      -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+	      -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+	      -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+	      -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -1452,99 +1137,27 @@
 
 ## end   gnulib module sys_stat
 
-## begin gnulib module sys_time
-
-BUILT_SOURCES += sys/time.h
-
-# We need the following in order to create <sys/time.h> when the system
-# doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
-	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/sys_time.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += sys/time.h sys/time.h-t
-
-EXTRA_DIST += sys_time.in.h
-
-## end   gnulib module sys_time
-
-## begin gnulib module sys_types
-
-BUILT_SOURCES += sys/types.h
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      < $(srcdir)/sys_types.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += sys/types.h sys/types.h-t
-
-EXTRA_DIST += sys_types.in.h
-
-## end   gnulib module sys_types
-
-## begin gnulib module threadlib
-
-libgrt_a_SOURCES += glthread/threadlib.c
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/config.rpath
-
-## end   gnulib module threadlib
-
 ## begin gnulib module time
 
 BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
-	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
-	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
-	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
-	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+	      -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+	      -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+	      -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+	      -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+	      -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
-	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
-	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -1575,69 +1188,56 @@
 ## begin gnulib module unistd
 
 BUILT_SOURCES += unistd.h
-libgrt_a_SOURCES += unistd.c
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
-	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
-	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
-	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
-	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
-	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
-	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
-	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
-	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
-	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
-	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
-	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
-	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
-	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
-	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
-	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
-	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
-	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
-	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
-	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
-	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
-	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
-	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
-	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
-	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+	      -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+	      -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+	      -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+	      -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+	      -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+	      -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+	      -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+	      -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+	      -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+	      -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+	      -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      < $(srcdir)/unistd.in.h | \
 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -1646,62 +1246,48 @@
 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
-	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
-	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
-	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
-	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
-	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
-	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
@@ -1724,38 +1310,6 @@
 
 ## end   gnulib module unistd
 
-## begin gnulib module unistr/base
-
-BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H)
-
-unistr.h: unistr.in.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/unistr.in.h; \
-	} > $@-t && \
-	mv -f $@-t $@
-MOSTLYCLEANFILES += unistr.h unistr.h-t
-
-EXTRA_DIST += unistr.in.h
-
-## end   gnulib module unistr/base
-
-## begin gnulib module unistr/u8-mbtoucr
-
-if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR
-libgrt_a_SOURCES += unistr/u8-mbtoucr.c
-endif
-
-## end   gnulib module unistr/u8-mbtoucr
-
-## begin gnulib module unistr/u8-uctomb
-
-if LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB
-libgrt_a_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
-endif
-
-## end   gnulib module unistr/u8-uctomb
-
 ## begin gnulib module unitypes
 
 BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
@@ -1807,68 +1361,54 @@
 
 ## begin gnulib module verify
 
-
-EXTRA_DIST += verify.h
+libgrt_a_SOURCES += verify.h
 
 ## end   gnulib module verify
 
+## begin gnulib module warn-on-use
+
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
+
+WARN_ON_USE_H=warn-on-use.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/warn-on-use.h
+
+## end   gnulib module warn-on-use
+
 ## begin gnulib module wchar
 
 BUILT_SOURCES += wchar.h
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -1878,38 +1418,9 @@
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -1921,10 +1432,10 @@
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
@@ -1933,35 +1444,23 @@
 
 ## end   gnulib module wchar
 
-## begin gnulib module wctype-h
+## begin gnulib module wctype
 
 BUILT_SOURCES += wctype.h
-libgrt_a_SOURCES += wctype-h.c
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
-	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
 	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
-	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/wctype.in.h; \
@@ -1971,7 +1470,7 @@
 
 EXTRA_DIST += wctype.in.h
 
-## end   gnulib module wctype-h
+## end   gnulib module wctype
 
 ## begin gnulib module wcwidth
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/Makefile.in gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.in
--- gettext-0.19.3/gettext-runtime/gnulib-lib/Makefile.in	2014-10-16 06:01:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.in	2010-06-06 20:11:37.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,80 +15,24 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
-# You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-runtime --local-dir=gnulib-local --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl ansi-c++-opt atexit basename closeout csharpcomp-script error getopt-gnu gettext-h gettext-runtime-misc havelib java javacomp-script memmove progname propername relocatable-prog setlocale sigpipe stdbool stdio stdlib strtoul unlocked-io xalloc
+# Reproduce by: gnulib-tool --import --dir=gettext-runtime --local-dir=gnulib-local --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --no-libtool --macro-prefix=gl atexit basename closeout csharpcomp-script error getopt-gnu gettext-h gettext-runtime-misc havelib java javacomp-script memmove progname propername relocatable-prog sigpipe stdbool stdio stdlib strtoul unlocked-io xalloc
 
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -102,26 +47,19 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-
-# Tell the mingw or Cygwin linker which symbols to export.
-@WOE32DLL_TRUE@am__append_1 = @INTL_EXPORTS_FLAGS@
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_2 = unistr/u8-mbtoucr.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_3 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_4 = uniwidth/width.c
+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_1 = uniwidth/width.c
 subdir = gnulib-lib
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs $(noinst_HEADERS)
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -129,17 +67,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -148,9 +82,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -161,18 +94,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -186,11 +114,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -199,13 +125,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -227,122 +154,76 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR      " $@;
-am__v_AR_1 = 
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libgrt_a_AR = $(AR) $(ARFLAGS)
 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 \
+am__libgrt_a_SOURCES_DIST = areadlink.c basename.h basename.c \
+	c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \
+	closeout.h closeout.c fwriteerror.h fwriteerror.c gettext.h \
+	localcharset.h localcharset.c malloca.c mbchar.c mbiter.h \
+	mbslen.c mbsstr.c mbuiter.h 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
+	trim.c uniwidth/width.c verify.h 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) \
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	unistr/u8-uctomb-aux.$(OBJEXT)
-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_3 = uniwidth/width.$(OBJEXT)
-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) \
-	localcharset.$(OBJEXT) localename.$(OBJEXT) \
-	glthread/lock.$(OBJEXT) malloca.$(OBJEXT) mbchar.$(OBJEXT) \
-	mbiter.$(OBJEXT) mbslen.$(OBJEXT) mbsstr.$(OBJEXT) \
-	mbuiter.$(OBJEXT) progname.$(OBJEXT) propername.$(OBJEXT) \
-	striconv.$(OBJEXT) strnlen1.$(OBJEXT) \
-	glthread/threadlib.$(OBJEXT) trim.$(OBJEXT) unistd.$(OBJEXT) \
-	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) \
-	xreadlink.$(OBJEXT) xstriconv.$(OBJEXT)
+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT)
+am_libgrt_a_OBJECTS = areadlink.$(OBJEXT) basename.$(OBJEXT) \
+	c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \
+	c-strncasecmp.$(OBJEXT) closeout.$(OBJEXT) \
+	fwriteerror.$(OBJEXT) localcharset.$(OBJEXT) malloca.$(OBJEXT) \
+	mbchar.$(OBJEXT) mbslen.$(OBJEXT) mbsstr.$(OBJEXT) \
+	progname.$(OBJEXT) propername.$(OBJEXT) striconv.$(OBJEXT) \
+	strnlen1.$(OBJEXT) trim.$(OBJEXT) $(am__objects_1) \
+	xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) xreadlink.$(OBJEXT) \
+	xstriconv.$(OBJEXT)
 libgrt_a_OBJECTS = $(am_libgrt_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgrt_a_SOURCES) $(EXTRA_libgrt_a_SOURCES)
 DIST_SOURCES = $(am__libgrt_a_SOURCES_DIST) $(EXTRA_libgrt_a_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 	distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -372,7 +253,6 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -380,7 +260,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -409,9 +288,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@ -DEXEEXT=\"@EXEEXT@\"
@@ -443,14 +320,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -458,25 +332,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -484,8 +349,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -498,20 +361,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -534,7 +389,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -553,29 +407,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -585,11 +430,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -597,7 +438,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -605,7 +445,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -621,13 +460,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -639,54 +476,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -694,49 +498,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -745,6 +533,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -752,9 +541,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -767,8 +554,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -789,37 +578,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -840,7 +618,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -848,13 +625,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -863,47 +641,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -918,7 +662,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -937,7 +680,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -954,7 +696,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -962,7 +703,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -970,8 +710,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -979,7 +717,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -987,8 +724,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -1009,7 +744,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -1024,17 +758,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1046,40 +777,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1094,36 +813,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -1131,12 +838,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1152,9 +856,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1175,8 +877,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1190,9 +890,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1227,9 +925,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1237,7 +935,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1247,48 +944,38 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects no-dependencies
+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects no-dependencies
 SUBDIRS = 
 noinst_HEADERS = 
 noinst_LIBRARIES = libgrt.a
 noinst_LTLIBRARIES = 
-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 \
+EXTRA_DIST = alloca.in.h areadlink.h \
+	$(top_srcdir)/../build-aux/arg-nonnull.h atexit.c \
+	$(top_srcdir)/../build-aux/c++defs.h canonicalize-lgpl.c \
+	$(top_srcdir)/../build-aux/csharpcomp.sh.in errno.in.h error.c \
+	error.h getopt.c getopt.in.h getopt1.c getopt_int.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 \
-	iconv_open-aix.gperf iconv_open-hpux.gperf \
-	iconv_open-irix.gperf iconv_open-osf.gperf \
-	iconv_open-solaris.gperf iconv_open.c intprops.h iswblank.c \
-	$(top_srcdir)/../build-aux/javacomp.sh.in config.charset \
-	ref-add.sin ref-del.sin locale.in.h localename.h lstat.c \
+	iconv_open-osf.h iconv_open-solaris.h iconv_open-aix.gperf \
+	iconv_open-hpux.gperf iconv_open-irix.gperf \
+	iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c \
+	intprops.h $(top_srcdir)/../build-aux/javacomp.sh.in \
+	config.charset ref-add.sin ref-del.sin lstat.c malloc.c \
 	malloca.h malloca.valgrind mbchar.h mbrtowc.c mbsinit.c \
-	str-kmp.h memchr.c memchr.valgrind memmove.c msvc-inval.c \
-	msvc-inval.h msvc-nothrow.c msvc-nothrow.h pathmax.h raise.c \
+	str-kmp.h memchr.c memchr.valgrind memmove.c pathmax.h \
 	readlink.c progreloc.c relocatable.c relocatable.h \
 	$(top_srcdir)/../build-aux/config.libpath \
-	$(top_srcdir)/../build-aux/reloc-ldflags allocator.c \
-	allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h \
-	canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c \
+	$(top_srcdir)/../build-aux/reloc-ldflags areadlink.c \
+	areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c malloca.c \
 	malloca.h progname.c progname.h progreloc.c readlink.c \
-	relocatable.c relocatable.h relocwrapper.c setenv.c \
-	$(top_srcdir)/../build-aux/install-reloc setlocale.c \
-	signal.in.h stdio-write.c sigprocmask.c \
-	$(top_srcdir)/../build-aux/snippet/_Noreturn.h \
-	$(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	$(top_srcdir)/../build-aux/snippet/c++defs.h \
-	$(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	$(top_srcdir)/../build-aux/snippet/warn-on-use.h stat.c \
-	stdbool.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \
-	streq.h strerror.c strerror-override.c strerror-override.h \
+	relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c \
+	$(top_srcdir)/../build-aux/install-reloc signal.in.h \
+	sigprocmask.c stat.c stdbool.in.h stddef.in.h stdint.in.h \
+	stdio-write.c stdio.in.h stdlib.in.h streq.h strerror.c \
 	string.in.h strnlen.c strtol.c strtoul.c sys_stat.in.h \
-	sys_time.in.h sys_types.in.h \
-	$(top_srcdir)/../build-aux/config.rpath time.in.h trim.h \
-	unistd.in.h unistr.in.h unitypes.in.h localcharset.h \
-	uniwidth.in.h uniwidth/cjk.h unlocked-io.h verify.h wchar.in.h \
+	time.in.h trim.h unistd.in.h unitypes.in.h localcharset.h \
+	uniwidth.in.h uniwidth/cjk.h unlocked-io.h \
+	$(top_srcdir)/../build-aux/warn-on-use.h wchar.in.h \
 	wctype.in.h wcwidth.c xreadlink.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
@@ -1300,33 +987,24 @@
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-BUILT_SOURCES = $(ALLOCA_H) configmake.h $(ERRNO_H) $(GETOPT_H) \
-	$(ICONV_H) iconv_open-aix.h iconv_open-hpux.h \
-	iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \
-	locale.h signal.h arg-nonnull.h c++defs.h unused-parameter.h \
-	warn-on-use.h $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \
-	stdlib.h string.h sys/stat.h sys/time.h sys/types.h time.h \
-	unistd.h $(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \
-	$(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h
+BUILT_SOURCES = $(ALLOCA_H) arg-nonnull.h c++defs.h configmake.h \
+	$(ERRNO_H) $(GETOPT_H) $(ICONV_H) iconv_open-aix.h \
+	iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h \
+	iconv_open-solaris.h signal.h $(STDBOOL_H) $(STDDEF_H) \
+	$(STDINT_H) stdio.h stdlib.h string.h sys/stat.h time.h \
+	unistd.h $(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) \
+	warn-on-use.h wchar.h wctype.h
 SUFFIXES = .sed .sin
-MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t errno.h \
-	errno.h-t getopt.h getopt.h-t iconv.h iconv.h-t \
-	iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t \
-	iconv_open-osf.h-t iconv_open-solaris.h-t locale.h locale.h-t \
-	signal.h signal.h-t 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 stdbool.h stdbool.h-t stddef.h \
-	stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h \
-	stdlib.h-t string.h string.h-t sys/stat.h sys/stat.h-t \
-	sys/time.h sys/time.h-t sys/types.h sys/types.h-t time.h \
-	time.h-t unistd.h unistd.h-t unistr.h unistr.h-t unitypes.h \
-	unitypes.h-t uniwidth.h uniwidth.h-t wchar.h wchar.h-t \
-	wctype.h wctype.h-t
+MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arg-nonnull.h \
+	arg-nonnull.h-t c++defs.h c++defs.h-t errno.h errno.h-t \
+	getopt.h getopt.h-t iconv.h iconv.h-t iconv_open-aix.h-t \
+	iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t \
+	iconv_open-solaris.h-t signal.h signal.h-t stdbool.h \
+	stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \
+	stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h \
+	sys/stat.h-t time.h time.h-t unistd.h unistd.h-t unitypes.h \
+	unitypes.h-t uniwidth.h uniwidth.h-t warn-on-use.h \
+	warn-on-use.h-t wchar.h wchar.h-t wctype.h wctype.h-t
 MOSTLYCLEANDIRS = sys
 CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
 	ref-del.sed
@@ -1338,44 +1016,28 @@
 
 # Parametrization of the 'relocatable' module.
 AM_CPPFLAGS = -I$(top_builddir)/intl -I$(top_srcdir)/intl \
-	-DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 $(am__append_1)
+	-DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 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 \
-	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
+libgrt_a_SOURCES = areadlink.c basename.h basename.c c-ctype.h \
+	c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \
+	closeout.h closeout.c fwriteerror.h fwriteerror.c gettext.h \
+	localcharset.h localcharset.c malloca.c mbchar.c mbiter.h \
+	mbslen.c mbsstr.c mbuiter.h progname.h progname.c propername.h \
+	propername.c striconv.h striconv.c strnlen1.h strnlen1.c \
+	trim.c $(am__append_1) verify.h xalloc.h xmalloc.c xstrdup.c \
+	xreadlink.c xstriconv.h xstriconv.c
 libgrt_a_LIBADD = $(gl_LIBOBJS)
 libgrt_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgrt_a_SOURCES = atexit.c canonicalize-lgpl.c error.c getopt.c \
-	getopt1.c gettimeofday.c iconv.c iconv_close.c iconv_open.c \
-	iswblank.c lstat.c mbrtowc.c mbsinit.c memchr.c memmove.c \
-	msvc-inval.c msvc-nothrow.c raise.c readlink.c progreloc.c \
-	relocatable.c setlocale.c stdio-write.c sigprocmask.c stat.c \
-	strerror.c strerror-override.c strnlen.c strtol.c strtoul.c \
-	wcwidth.c
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+	getopt1.c iconv_open.c lstat.c malloc.c mbrtowc.c mbsinit.c \
+	memchr.c memmove.c readlink.c progreloc.c relocatable.c \
+	sigprocmask.c stat.c stdio-write.c strerror.c strnlen.c \
+	strtol.c strtoul.c wcwidth.c
+ARG_NONNULL_H = arg-nonnull.h
+CXXDEFS_H = c++defs.h
 GPERF = gperf
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-_NORETURN_H = $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-ARG_NONNULL_H = arg-nonnull.h
-CXXDEFS_H = c++defs.h
-UNUSED_PARAMETER_H = unused-parameter.h
 WARN_ON_USE_H = warn-on-use.h
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1415,55 +1077,42 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-glthread/$(am__dirstamp):
-	@$(MKDIR_P) glthread
-	@: > glthread/$(am__dirstamp)
-glthread/lock.$(OBJEXT): glthread/$(am__dirstamp)
-glthread/threadlib.$(OBJEXT): glthread/$(am__dirstamp)
-unistr/$(am__dirstamp):
-	@$(MKDIR_P) unistr
-	@: > unistr/$(am__dirstamp)
-unistr/u8-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp)
-unistr/u8-uctomb.$(OBJEXT): unistr/$(am__dirstamp)
-unistr/u8-uctomb-aux.$(OBJEXT): unistr/$(am__dirstamp)
 uniwidth/$(am__dirstamp):
 	@$(MKDIR_P) uniwidth
 	@: > uniwidth/$(am__dirstamp)
 uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp)
-
-libgrt.a: $(libgrt_a_OBJECTS) $(libgrt_a_DEPENDENCIES) $(EXTRA_libgrt_a_DEPENDENCIES) 
+libgrt.a: $(libgrt_a_OBJECTS) $(libgrt_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libgrt.a
 	$(AM_V_AR)$(libgrt_a_AR) libgrt.a $(libgrt_a_OBJECTS) $(libgrt_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libgrt.a
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f glthread/*.$(OBJEXT)
-	-rm -f unistr/*.$(OBJEXT)
-	-rm -f uniwidth/*.$(OBJEXT)
+	-rm -f uniwidth/width.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c -o $@ $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1472,25 +1121,22 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -1505,12 +1151,57 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1526,7 +1217,12 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1538,11 +1234,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1551,21 +1251,6 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1602,10 +1287,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1642,15 +1330,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -1660,8 +1343,6 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f glthread/$(am__dirstamp)
-	-rm -f unistr/$(am__dirstamp)
 	-rm -f uniwidth/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
@@ -1670,7 +1351,6 @@
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-@RELOCATABLE_VIA_WRAPPER_FALSE@uninstall-hook:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
@@ -1739,41 +1419,68 @@
 ps-am:
 
 uninstall-am: uninstall-local
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-.MAKE: $(am__recursive_targets) all check install install-am \
-	install-strip uninstall-am
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-am clean clean-generic clean-libtool \
-	clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	ctags-recursive install install-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am uninstall-hook uninstall-local
+	tags-recursive uninstall uninstall-am uninstall-local
 
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ALLOCA_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_ALLOCA_H_TRUE@	  cat $(srcdir)/alloca.in.h; \
-@GL_GENERATE_ALLOCA_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ALLOCA_H_TRUE@	mv -f $@-t $@
-@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_FALSE@	rm -f $@
+alloca.h: alloca.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
@@ -1789,7 +1496,6 @@
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -1808,40 +1514,38 @@
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ERRNO_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ERRNO_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      < $(srcdir)/errno.in.h; \
-@GL_GENERATE_ERRNO_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ERRNO_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_FALSE@	rm -f $@
+errno.h: errno.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
+	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
+	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
+	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
+	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
+	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
+	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
+	      < $(srcdir)/errno.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+	  sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      < $(srcdir)/getopt.in.h; \
@@ -1850,27 +1554,22 @@
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@GL_GENERATE_ICONV_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ICONV_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ICONV_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      < $(srcdir)/iconv.in.h; \
-@GL_GENERATE_ICONV_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ICONV_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ICONV_H_FALSE@iconv.h: $(top_builddir)/config.status
-@GL_GENERATE_ICONV_H_FALSE@	rm -f $@
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
+	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
+	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
+	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
+	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/iconv.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
@@ -1947,246 +1646,137 @@
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
 	mv t-$@ $@
 
-# We need the following in order to create <locale.h> when the system
-# doesn't have one that provides all definitions.
-locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
-	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
-	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
-	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
-	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/locale.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-@RELOCATABLE_VIA_WRAPPER_TRUE@uninstall-hook: uninstall-relocwrapper
-@RELOCATABLE_VIA_WRAPPER_TRUE@uninstall-relocwrapper:
-@RELOCATABLE_VIA_WRAPPER_TRUE@	if test $(RELOCATABLE) = yes; then \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	  case '$(EXEEXT)' in \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	    .bin*) ;; \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	    *) cd $(top_builddir) && \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	       $(MAKE) $(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT) \
-@RELOCATABLE_VIA_WRAPPER_TRUE@		       AM_MAKEFLAGS='$(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT)' \
-@RELOCATABLE_VIA_WRAPPER_TRUE@		       uninstall ;; \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	  esac; \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	fi
-@RELOCATABLE_VIA_WRAPPER_TRUE@.PHONY: uninstall-relocwrapper
-
 # We need the following in order to create <signal.h> when the system
 # doesn't have a complete one.
-signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
-	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
+	      -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
+	      -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
 	      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
-	      -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
 	      -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
 	      -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
 	      -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
 	      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
 	      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-	      -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
-	      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/signal.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDBOOL_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDBOOL_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_STDBOOL_H_TRUE@	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
-@GL_GENERATE_STDBOOL_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDBOOL_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status
-@GL_GENERATE_STDBOOL_H_FALSE@	rm -f $@
+stdbool.h: stdbool.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDDEF_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDDEF_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_STDDEF_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      < $(srcdir)/stddef.in.h; \
-@GL_GENERATE_STDDEF_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDDEF_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status
-@GL_GENERATE_STDDEF_H_FALSE@	rm -f $@
+stddef.h: stddef.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+	      < $(srcdir)/stddef.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDINT_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDINT_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_STDINT_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      < $(srcdir)/stdint.in.h; \
-@GL_GENERATE_STDINT_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDINT_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status
-@GL_GENERATE_STDINT_H_FALSE@	rm -f $@
+stdint.h: stdint.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
-	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
-	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
-	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
-	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
-	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
-	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
-	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
-	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
-	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
-	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
-	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
-	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
-	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
-	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
-	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
-	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
-	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
-	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
-	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
-	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
-	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
-	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
-	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
-	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
-	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
-	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
-	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
-	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
-	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
-	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
-	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
-	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
-	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
-	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
-	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
-	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+	      -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+	      -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+	      -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+	      -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+	      -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      < $(srcdir)/stdio.in.h | \
 	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
-	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -2195,14 +1785,11 @@
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
 	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
-	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
-	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -2223,7 +1810,6 @@
 	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
 	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
@@ -2241,151 +1827,120 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+	      -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+	      -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
 	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
 	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-	      -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-	      -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-	      -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-	      -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-	      -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-	      -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-	      -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-	      -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-	      -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-	      -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-	      -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-	      -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-	      -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-	      -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-	      -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-	      -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-	      -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-	      -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-	      -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-	      -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-	      -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-	      -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-	      -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-	      -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-	      -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-	      -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-	      -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-	      -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-	      -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-	      -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-	      -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-	      -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-	      -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+	  sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -2401,18 +1956,15 @@
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-	      -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
 	      -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
 	      -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -2428,29 +1980,25 @@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+	      -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+	      -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+	      -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+	      -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+	      -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+	      -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+	      -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+	      -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+	      -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+	      -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+	      -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -2478,69 +2026,23 @@
 	} > $@-t && \
 	mv $@-t $@
 
-# We need the following in order to create <sys/time.h> when the system
-# doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
-	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/sys_time.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      < $(srcdir)/sys_types.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
-	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
-	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
-	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
-	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+	      -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+	      -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+	      -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+	      -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+	      -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
-	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
-	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -2557,65 +2059,53 @@
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
-	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
-	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
-	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
-	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
-	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
-	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
-	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
-	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
-	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
-	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
-	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
-	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
-	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
-	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
-	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
-	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
-	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
-	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
-	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
-	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
-	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
-	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
-	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
-	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+	      -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+	      -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+	      -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+	      -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+	      -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+	      -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+	      -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+	      -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+	      -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+	      -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+	      -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      < $(srcdir)/unistd.in.h | \
 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -2624,62 +2114,48 @@
 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
-	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
-	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
-	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
-	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
-	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
-	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
@@ -2697,13 +2173,6 @@
 	} > $@-t && \
 	mv $@-t $@
 
-unistr.h: unistr.in.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/unistr.in.h; \
-	} > $@-t && \
-	mv -f $@-t $@
-
 unitypes.h: unitypes.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -2717,60 +2186,36 @@
 	  cat $(srcdir)/uniwidth.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -2780,38 +2225,9 @@
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -2823,37 +2239,26 @@
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
-	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
 	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
-	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/wctype.in.h; \
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/malloca.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/malloca.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/malloca.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/malloca.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,18 +13,14 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
 #include "malloca.h"
 
-#include <stdint.h>
-
-#include "verify.h"
-
 /* The speed critical point in this file is freea() applied to an alloca()
    result: it must be fast, to match the speed of alloca().  The speed of
    mmalloca() and freea() in the other case are not critical, because they
@@ -49,18 +45,13 @@
 #define MAGIC_SIZE sizeof (int)
 /* This is how the header info would look like without any alignment
    considerations.  */
-struct preliminary_header { void *next; int magic; };
+struct preliminary_header { void *next; char room[MAGIC_SIZE]; };
 /* But the header's size must be a multiple of sa_alignment_max.  */
 #define HEADER_SIZE \
   (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
-union header {
-  void *next;
-  struct {
-    char room[HEADER_SIZE - MAGIC_SIZE];
-    int word;
-  } magic;
-};
-verify (HEADER_SIZE == sizeof (union header));
+struct header { void *next; char room[HEADER_SIZE - sizeof (struct preliminary_header) + MAGIC_SIZE]; };
+/* Verify that HEADER_SIZE == sizeof (struct header).  */
+typedef int verify1[2 * (HEADER_SIZE == sizeof (struct header)) - 1];
 /* We make the hash table quite big, so that during lookups the probability
    of empty hash buckets is quite high.  There is no need to make the hash
    table resizable, because when the hash table gets filled so much that the
@@ -80,21 +71,20 @@
 
   if (nplus >= n)
     {
-      void *p = malloc (nplus);
+      char *p = (char *) malloc (nplus);
 
       if (p != NULL)
         {
           size_t slot;
-          union header *h = p;
 
-          p = h + 1;
+          p += HEADER_SIZE;
 
           /* Put a magic number into the indicator word.  */
-          h->magic.word = MAGIC_NUMBER;
+          ((int *) p)[-1] = MAGIC_NUMBER;
 
           /* Enter p into the hash table.  */
-          slot = (uintptr_t) p % HASH_TABLE_SIZE;
-          h->next = mmalloca_results[slot];
+          slot = (unsigned long) p % HASH_TABLE_SIZE;
+          ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
           mmalloca_results[slot] = p;
 
           return p;
@@ -126,21 +116,19 @@
         {
           /* Looks like a mmalloca() result.  To see whether it really is one,
              perform a lookup in the hash table.  */
-          size_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
+          size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
           void **chain = &mmalloca_results[slot];
           for (; *chain != NULL;)
             {
-              union header *h = p;
               if (*chain == p)
                 {
                   /* Found it.  Remove it from the hash table and free it.  */
-                  union header *p_begin = h - 1;
-                  *chain = p_begin->next;
+                  char *p_begin = (char *) p - HEADER_SIZE;
+                  *chain = ((struct header *) p_begin)->next;
                   free (p_begin);
                   return;
                 }
-              h = *chain;
-              chain = &h[-1].next;
+              chain = &((struct header *) ((char *) *chain - HEADER_SIZE))->next;
             }
         }
       /* At this point, we know it was not a mmalloca() result.  */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/malloca.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/malloca.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/malloca.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/malloca.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MALLOCA_H
 #define _MALLOCA_H
@@ -42,7 +43,7 @@
    and a page size can be as small as 4096 bytes.  So we cannot safely
    allocate anything larger than 4096 bytes.  Also care for the possibility
    of a few compiler-allocated temporary stack slots.
-   This must be a macro, not a function.  */
+   This must be a macro, not an inline function.  */
 # define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
 #else
 # define safe_alloca(N) ((void) (N), NULL)
@@ -92,7 +93,7 @@
 /* ------------------- Auxiliary, non-public definitions ------------------- */
 
 /* Determine the alignment of a type at compile time.  */
-#if defined __GNUC__ || defined __IBM__ALIGNOF__
+#if defined __GNUC__
 # define sa_alignof __alignof__
 #elif defined __cplusplus
   template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/malloc.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/malloc.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/malloc.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/malloc.c	2010-02-16 21:31:28.000000000 +0000
@@ -0,0 +1,57 @@
+/* malloc() function that is glibc compatible.
+
+   Copyright (C) 1997-1998, 2006-2007, 2009-2010 Free Software Foundation, Inc.
+
+   This 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering and Bruno Haible */
+
+#include <config.h>
+/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
+#ifdef malloc
+# define NEED_MALLOC_GNU
+# undef malloc
+#endif
+
+/* Specification.  */
+#include <stdlib.h>
+
+#include <errno.h>
+
+/* Call the system's malloc below.  */
+#undef malloc
+
+/* Allocate an N-byte block of memory from the heap.
+   If N is zero, allocate a 1-byte block.  */
+
+void *
+rpl_malloc (size_t n)
+{
+  void *result;
+
+#ifdef NEED_MALLOC_GNU
+  if (n == 0)
+    n = 1;
+#endif
+
+  result = malloc (n);
+
+#if !HAVE_MALLOC_POSIX
+  if (result == NULL)
+    errno = ENOMEM;
+#endif
+
+  return result;
+}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbchar.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbchar.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbchar.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbchar.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,8 +16,6 @@
 
 #include <config.h>
 
-#define MBCHAR_INLINE _GL_EXTERN_INLINE
-
 #include <limits.h>
 
 #include "mbchar.h"
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbchar.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbchar.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbchar.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbchar.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Multibyte character data type.
-   Copyright (C) 2001, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -156,14 +156,6 @@
 #include <wchar.h>
 #include <wctype.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBCHAR_INLINE
-# define MBCHAR_INLINE _GL_INLINE
-#endif
-
 #define MBCHAR_BUF_SIZE 24
 
 struct mbchar
@@ -243,7 +235,7 @@
 /* Unprintable characters appear as a small box of width 1.  */
 #define MB_UNPRINTABLE_WIDTH 1
 
-MBCHAR_INLINE int
+static inline int
 mb_width_aux (wint_t wc)
 {
   int w = wcwidth (wc);
@@ -264,7 +256,7 @@
    (mbc)->wc = (mbc)->buf[0] = (sc))
 
 /* Copying a character.  */
-MBCHAR_INLINE void
+static inline void
 mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
 {
   if (old_mbc->ptr == &old_mbc->buf[0])
@@ -312,7 +304,7 @@
 
 extern const unsigned int is_basic_table[];
 
-MBCHAR_INLINE bool
+static inline bool
 is_basic (char c)
 {
   return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
@@ -321,7 +313,7 @@
 
 #else
 
-MBCHAR_INLINE bool
+static inline bool
 is_basic (char c)
 {
   switch (c)
@@ -355,6 +347,4 @@
 
 #endif
 
-_GL_INLINE_HEADER_END
-
 #endif /* _MBCHAR_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbiter.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbiter.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbiter.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbiter.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define MBITER_INLINE _GL_EXTERN_INLINE
-#include "mbiter.h"
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbiter.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbiter.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbiter.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbiter.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,9 +47,9 @@
      initializes the iterator, starting at startptr and crossing length bytes.
 
    mbi_avail (iter)
-     returns true if there are more multibyte characters available before
+     returns true if there are more multibyte chracters available before
      the end of string is reached. In this case, mbi_cur (iter) is
-     initialized to the next multibyte character.
+     initialized to the next multibyte chracter.
 
    mbi_advance (iter)
      advances the iterator by one multibyte character.
@@ -97,14 +97,6 @@
 
 #include "mbchar.h"
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBITER_INLINE
-# define MBITER_INLINE _GL_INLINE
-#endif
-
 struct mbiter_multi
 {
   const char *limit;    /* pointer to end of string */
@@ -120,7 +112,7 @@
         */
 };
 
-MBITER_INLINE void
+static inline void
 mbiter_multi_next (struct mbiter_multi *iter)
 {
   if (iter->next_done)
@@ -180,14 +172,14 @@
   iter->next_done = true;
 }
 
-MBITER_INLINE void
+static inline void
 mbiter_multi_reloc (struct mbiter_multi *iter, ptrdiff_t ptrdiff)
 {
   iter->cur.ptr += ptrdiff;
   iter->limit += ptrdiff;
 }
 
-MBITER_INLINE void
+static inline void
 mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter)
 {
   new_iter->limit = old_iter->limit;
@@ -220,6 +212,4 @@
 /* Copying an iterator.  */
 #define mbi_copy mbiter_multi_copy
 
-_GL_INLINE_HEADER_END
-
 #endif /* _MBITER_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbrtowc.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbrtowc.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbrtowc.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbrtowc.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -40,6 +40,9 @@
 {
   char *pstate = (char *)ps;
 
+  if (pstate == NULL)
+    pstate = internal_state;
+
   if (s == NULL)
     {
       pwc = NULL;
@@ -51,10 +54,6 @@
     return (size_t)(-2);
 
   /* Here n > 0.  */
-
-  if (pstate == NULL)
-    pstate = internal_state;
-
   {
     size_t nstate = pstate[0];
     char buf[4];
@@ -92,7 +91,7 @@
 
     /* Here m > 0.  */
 
-# if __GLIBC__ || defined __UCLIBC__
+# if __GLIBC__
     /* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
     mbtowc (NULL, NULL, 0);
 # endif
@@ -128,7 +127,7 @@
       {
         const char *encoding = locale_charset ();
 
-        if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+        if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
           {
             /* Cf. unistr/u8-mblen.c.  */
             unsigned char c = (unsigned char) p[0];
@@ -185,8 +184,7 @@
         /* As a reference for this code, you can use the GNU libiconv
            implementation.  Look for uses of the RET_TOOFEW macro.  */
 
-        if (STREQ_OPT (encoding,
-                       "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
+        if (STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
           {
             if (m == 1)
               {
@@ -209,12 +207,9 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-            || STREQ_OPT (encoding,
-                          "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-            || STREQ_OPT (encoding,
-                          "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
+        if (STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+            || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+            || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
           {
             if (m == 1)
               {
@@ -225,8 +220,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
+        if (STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
           {
             if (m == 1)
               {
@@ -244,8 +238,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
+        if (STREQ (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
           {
             if (m == 1)
               {
@@ -278,7 +271,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
+        if (STREQ (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
           {
             if (m == 1)
               {
@@ -328,7 +321,7 @@
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
-# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
+# if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG
   if (s == NULL)
     {
       pwc = NULL;
@@ -337,16 +330,11 @@
     }
 # endif
 
-# if MBRTOWC_EMPTY_INPUT_BUG
-  if (n == 0)
-    return (size_t) -2;
-# endif
-
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
 
-    /* Override mbrtowc's internal state.  We cannot call mbsinit() on the
+    /* Override mbrtowc's internal state.  We can not call mbsinit() on the
        hidden internal state, but we can call it on our variable.  */
     if (ps == NULL)
       ps = &internal_state;
@@ -391,16 +379,7 @@
     return ret;
   }
 # else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
-
-    return mbrtowc (pwc, s, n, ps);
-  }
+  return mbrtowc (pwc, s, n, ps);
 # endif
 }
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbsinit.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbsinit.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbsinit.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbsinit.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,18 +22,6 @@
 
 #include "verify.h"
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-
-/* On native Windows, 'mbstate_t' is defined as 'int'.  */
-
-int
-mbsinit (const mbstate_t *ps)
-{
-  return ps == NULL || *ps == 0;
-}
-
-#else
-
 /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
    and wcrtomb(), wcsrtombs().
    We assume that
@@ -55,7 +43,5 @@
 {
   const char *pstate = (const char *)ps;
 
-  return pstate == NULL || pstate[0] == 0;
+  return pstate[0] == 0;
 }
-
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbslen.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbslen.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbslen.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbslen.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbsstr.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbsstr.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbsstr.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbsstr.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #include "mbuiter.h"
 
 /* Knuth-Morris-Pratt algorithm.  */
-#define UNIT unsigned char
 #define CANON_ELEMENT(c) c
 #include "str-kmp.h"
 
@@ -45,13 +44,11 @@
   size_t *table;
 
   /* Allocate room for needle_mbchars and the table.  */
-  void *memory = nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
-  void *table_memory;
+  char *memory = (char *) nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
   if (memory == NULL)
     return false;
-  needle_mbchars = memory;
-  table_memory = needle_mbchars + m;
-  table = table_memory;
+  needle_mbchars = (mbchar_t *) memory;
+  table = (size_t *) (memory + m * sizeof (mbchar_t));
 
   /* Fill needle_mbchars.  */
   {
@@ -342,12 +339,10 @@
                   if (needle_last_ccount == NULL)
                     {
                       /* Try the Knuth-Morris-Pratt algorithm.  */
-                      const unsigned char *result;
+                      const char *result;
                       bool success =
-                        knuth_morris_pratt ((const unsigned char *) haystack,
-                                            (const unsigned char *) (needle - 1),
-                                            strlen (needle - 1),
-                                            &result);
+                        knuth_morris_pratt_unibyte (haystack, needle - 1,
+                                                    &result);
                       if (success)
                         return (char *) result;
                       try_kmp = false;
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbuiter.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbuiter.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbuiter.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbuiter.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define MBUITER_INLINE _GL_EXTERN_INLINE
-#include "mbuiter.h"
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/mbuiter.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbuiter.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/mbuiter.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/mbuiter.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -55,9 +55,9 @@
      initializes the iterator, starting at startptr.
 
    mbui_avail (iter)
-     returns true if there are more multibyte characters available before
+     returns true if there are more multibyte chracters available before
      the end of string is reached. In this case, mbui_cur (iter) is
-     initialized to the next multibyte character.
+     initialized to the next multibyte chracter.
 
    mbui_advance (iter)
      advances the iterator by one multibyte character.
@@ -106,14 +106,6 @@
 #include "mbchar.h"
 #include "strnlen1.h"
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBUITER_INLINE
-# define MBUITER_INLINE _GL_INLINE
-#endif
-
 struct mbuiter_multi
 {
   bool in_shift;        /* true if next byte may not be interpreted as ASCII */
@@ -128,7 +120,7 @@
         */
 };
 
-MBUITER_INLINE void
+static inline void
 mbuiter_multi_next (struct mbuiter_multi *iter)
 {
   if (iter->next_done)
@@ -189,13 +181,13 @@
   iter->next_done = true;
 }
 
-MBUITER_INLINE void
+static inline void
 mbuiter_multi_reloc (struct mbuiter_multi *iter, ptrdiff_t ptrdiff)
 {
   iter->cur.ptr += ptrdiff;
 }
 
-MBUITER_INLINE void
+static inline void
 mbuiter_multi_copy (struct mbuiter_multi *new_iter, const struct mbuiter_multi *old_iter)
 {
   if ((new_iter->in_shift = old_iter->in_shift))
@@ -227,6 +219,4 @@
 /* Copying an iterator.  */
 #define mbui_copy mbuiter_multi_copy
 
-_GL_INLINE_HEADER_END
-
 #endif /* _MBUITER_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/memchr.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/memchr.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/memchr.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/memchr.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2010
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-inval.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-inval.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-inval.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-inval.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "msvc-inval.h"
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && !(MSVC_INVALID_PARAMETER_HANDLING == SANE_LIBRARY_HANDLING)
-
-/* Get _invalid_parameter_handler type and _set_invalid_parameter_handler
-   declaration.  */
-# include <stdlib.h>
-
-# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-}
-
-# else
-
-/* Get declarations of the native Windows API functions.  */
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-
-#  if defined _MSC_VER
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-  RaiseException (STATUS_GNULIB_INVALID_PARAMETER, 0, 0, NULL);
-}
-
-#  else
-
-/* An index to thread-local storage.  */
-static DWORD tls_index;
-static int tls_initialized /* = 0 */;
-
-/* Used as a fallback only.  */
-static struct gl_msvc_inval_per_thread not_per_thread;
-
-struct gl_msvc_inval_per_thread *
-gl_msvc_inval_current (void)
-{
-  if (!tls_initialized)
-    {
-      tls_index = TlsAlloc ();
-      tls_initialized = 1;
-    }
-  if (tls_index == TLS_OUT_OF_INDEXES)
-    /* TlsAlloc had failed.  */
-    return &not_per_thread;
-  else
-    {
-      struct gl_msvc_inval_per_thread *pointer =
-        (struct gl_msvc_inval_per_thread *) TlsGetValue (tls_index);
-      if (pointer == NULL)
-        {
-          /* First call.  Allocate a new 'struct gl_msvc_inval_per_thread'.  */
-          pointer =
-            (struct gl_msvc_inval_per_thread *)
-            malloc (sizeof (struct gl_msvc_inval_per_thread));
-          if (pointer == NULL)
-            /* Could not allocate memory.  Use the global storage.  */
-            pointer = &not_per_thread;
-          TlsSetValue (tls_index, pointer);
-        }
-      return pointer;
-    }
-}
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-  struct gl_msvc_inval_per_thread *current = gl_msvc_inval_current ();
-  if (current->restart_valid)
-    longjmp (current->restart, 1);
-  else
-    /* An invalid parameter notification from outside the gnulib code.
-       Give the caller a chance to intervene.  */
-    RaiseException (STATUS_GNULIB_INVALID_PARAMETER, 0, 0, NULL);
-}
-
-#  endif
-
-# endif
-
-static int gl_msvc_inval_initialized /* = 0 */;
-
-void
-gl_msvc_inval_ensure_handler (void)
-{
-  if (gl_msvc_inval_initialized == 0)
-    {
-      _set_invalid_parameter_handler (gl_msvc_invalid_parameter_handler);
-      gl_msvc_inval_initialized = 1;
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-inval.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-inval.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-inval.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-inval.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +0,0 @@
-/* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _MSVC_INVAL_H
-#define _MSVC_INVAL_H
-
-/* With MSVC runtime libraries with the "invalid parameter handler" concept,
-   functions like fprintf(), dup2(), or close() crash when the caller passes
-   an invalid argument.  But POSIX wants error codes (such as EINVAL or EBADF)
-   instead.
-   This file defines macros that turn such an invalid parameter notification
-   into a non-local exit.  An error code can then be produced at the target
-   of this exit.  You can thus write code like
-
-     TRY_MSVC_INVAL
-       {
-         <Code that can trigger an invalid parameter notification
-          but does not do 'return', 'break', 'continue', nor 'goto'.>
-       }
-     CATCH_MSVC_INVAL
-       {
-         <Code that handles an invalid parameter notification
-          but does not do 'return', 'break', 'continue', nor 'goto'.>
-       }
-     DONE_MSVC_INVAL;
-
-   This entire block expands to a single statement.
-
-   The handling of invalid parameters can be done in three ways:
-
-     * The default way, which is reasonable for programs (not libraries):
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [DEFAULT_HANDLING])
-
-     * The way for libraries that make "hairy" calls (like close(-1), or
-       fclose(fp) where fileno(fp) is closed, or simply getdtablesize()):
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [HAIRY_LIBRARY_HANDLING])
-
-     * The way for libraries that make no "hairy" calls:
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [SANE_LIBRARY_HANDLING])
- */
-
-#define DEFAULT_HANDLING       0
-#define HAIRY_LIBRARY_HANDLING 1
-#define SANE_LIBRARY_HANDLING  2
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && !(MSVC_INVALID_PARAMETER_HANDLING == SANE_LIBRARY_HANDLING)
-/* A native Windows platform with the "invalid parameter handler" concept,
-   and either DEFAULT_HANDLING or HAIRY_LIBRARY_HANDLING.  */
-
-# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-/* Default handling.  */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-/* Ensure that the invalid parameter handler in installed that just returns.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-#  ifdef __cplusplus
-}
-#  endif
-
-#  define TRY_MSVC_INVAL \
-     do                                                                        \
-       {                                                                       \
-         gl_msvc_inval_ensure_handler ();                                      \
-         if (1)
-#  define CATCH_MSVC_INVAL \
-         else
-#  define DONE_MSVC_INVAL \
-       }                                                                       \
-     while (0)
-
-# else
-/* Handling for hairy libraries.  */
-
-#  include <excpt.h>
-
-/* Gnulib can define its own status codes, as described in the page
-   "Raising Software Exceptions" on microsoft.com
-   <http://msdn.microsoft.com/en-us/library/het71c37.aspx>.
-   Our status codes are composed of
-     - 0xE0000000, mandatory for all user-defined status codes,
-     - 0x474E550, a API identifier ("GNU"),
-     - 0, 1, 2, ..., used to distinguish different status codes from the
-       same API.  */
-#  define STATUS_GNULIB_INVALID_PARAMETER (0xE0000000 + 0x474E550 + 0)
-
-#  if defined _MSC_VER
-/* A compiler that supports __try/__except, as described in the page
-   "try-except statement" on microsoft.com
-   <http://msdn.microsoft.com/en-us/library/s58ftw19.aspx>.
-   With __try/__except, we can use the multithread-safe exception handling.  */
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-/* Ensure that the invalid parameter handler in installed that raises a
-   software exception with code STATUS_GNULIB_INVALID_PARAMETER.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#   define TRY_MSVC_INVAL \
-      do                                                                       \
-        {                                                                      \
-          gl_msvc_inval_ensure_handler ();                                     \
-          __try
-#   define CATCH_MSVC_INVAL \
-          __except (GetExceptionCode () == STATUS_GNULIB_INVALID_PARAMETER     \
-                    ? EXCEPTION_EXECUTE_HANDLER                                \
-                    : EXCEPTION_CONTINUE_SEARCH)
-#   define DONE_MSVC_INVAL \
-        }                                                                      \
-      while (0)
-
-#  else
-/* Any compiler.
-   We can only use setjmp/longjmp.  */
-
-#   include <setjmp.h>
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-struct gl_msvc_inval_per_thread
-{
-  /* The restart that will resume execution at the code between
-     CATCH_MSVC_INVAL and DONE_MSVC_INVAL.  It is enabled only between
-     TRY_MSVC_INVAL and CATCH_MSVC_INVAL.  */
-  jmp_buf restart;
-
-  /* Tells whether the contents of restart is valid.  */
-  int restart_valid;
-};
-
-/* Ensure that the invalid parameter handler in installed that passes
-   control to the gl_msvc_inval_restart if it is valid, or raises a
-   software exception with code STATUS_GNULIB_INVALID_PARAMETER otherwise.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-/* Return a pointer to the per-thread data for the current thread.  */
-extern struct gl_msvc_inval_per_thread *gl_msvc_inval_current (void);
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#   define TRY_MSVC_INVAL \
-      do                                                                       \
-        {                                                                      \
-          struct gl_msvc_inval_per_thread *msvc_inval_current;                 \
-          gl_msvc_inval_ensure_handler ();                                     \
-          msvc_inval_current = gl_msvc_inval_current ();                       \
-          /* First, initialize gl_msvc_inval_restart.  */                      \
-          if (setjmp (msvc_inval_current->restart) == 0)                       \
-            {                                                                  \
-              /* Then, mark it as valid.  */                                   \
-              msvc_inval_current->restart_valid = 1;
-#   define CATCH_MSVC_INVAL \
-              /* Execution completed.                                          \
-                 Mark gl_msvc_inval_restart as invalid.  */                    \
-              msvc_inval_current->restart_valid = 0;                           \
-            }                                                                  \
-          else                                                                 \
-            {                                                                  \
-              /* Execution triggered an invalid parameter notification.        \
-                 Mark gl_msvc_inval_restart as invalid.  */                    \
-              msvc_inval_current->restart_valid = 0;
-#   define DONE_MSVC_INVAL \
-            }                                                                  \
-        }                                                                      \
-      while (0)
-
-#  endif
-
-# endif
-
-#else
-/* A platform that does not need to the invalid parameter handler,
-   or when SANE_LIBRARY_HANDLING is desired.  */
-
-/* The braces here avoid GCC warnings like
-   "warning: suggest explicit braces to avoid ambiguous 'else'".  */
-# define TRY_MSVC_INVAL \
-    do                                                                         \
-      {                                                                        \
-        if (1)
-# define CATCH_MSVC_INVAL \
-        else
-# define DONE_MSVC_INVAL \
-      }                                                                        \
-    while (0)
-
-#endif
-
-#endif /* _MSVC_INVAL_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-nothrow.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-nothrow.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-nothrow.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-nothrow.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* Wrappers that don't throw invalid parameter notifications
-   with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "msvc-nothrow.h"
-
-/* Get declarations of the native Windows API functions.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "msvc-inval.h"
-
-#undef _get_osfhandle
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-intptr_t
-_gl_nothrow_get_osfhandle (int fd)
-{
-  intptr_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = _get_osfhandle (fd);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = (intptr_t) INVALID_HANDLE_VALUE;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-nothrow.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-nothrow.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/msvc-nothrow.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/msvc-nothrow.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* Wrappers that don't throw invalid parameter notifications
-   with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _MSVC_NOTHROW_H
-#define _MSVC_NOTHROW_H
-
-/* With MSVC runtime libraries with the "invalid parameter handler" concept,
-   functions like fprintf(), dup2(), or close() crash when the caller passes
-   an invalid argument.  But POSIX wants error codes (such as EINVAL or EBADF)
-   instead.
-   This file defines wrappers that turn such an invalid parameter notification
-   into an error code.  */
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Get original declaration of _get_osfhandle.  */
-# include <io.h>
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-
-/* Override _get_osfhandle.  */
-extern intptr_t _gl_nothrow_get_osfhandle (int fd);
-#  define _get_osfhandle _gl_nothrow_get_osfhandle
-
-# endif
-
-#endif
-
-#endif /* _MSVC_NOTHROW_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/pathmax.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/pathmax.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/pathmax.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/pathmax.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,32 +13,12 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PATHMAX_H
 # define _PATHMAX_H
 
-/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,
-   including the terminating NUL byte.
-   <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>
-   PATH_MAX is not defined on systems which have no limit on filename length,
-   such as GNU/Hurd.
-
-   This file does *not* define PATH_MAX always.  Programs that use this file
-   can handle the GNU/Hurd case in several ways:
-     - Either with a package-wide handling, or with a per-file handling,
-     - Either through a
-         #ifdef PATH_MAX
-       or through a fallback like
-         #ifndef PATH_MAX
-         # define PATH_MAX 8192
-         #endif
-       or through a fallback like
-         #ifndef PATH_MAX
-         # define PATH_MAX pathconf ("/", _PC_PATH_MAX)
-         #endif
- */
-
 # include <unistd.h>
 
 # include <limits.h>
@@ -47,6 +27,11 @@
 #  define _POSIX_PATH_MAX 256
 # endif
 
+# if !defined PATH_MAX && defined _PC_PATH_MAX && defined HAVE_PATHCONF
+#  define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \
+                    : pathconf ("/", _PC_PATH_MAX))
+# endif
+
 /* Don't include sys/param.h if it already has been.  */
 # if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
 #  include <sys/param.h>
@@ -56,28 +41,8 @@
 #  define PATH_MAX MAXPATHLEN
 # endif
 
-# ifdef __hpux
-/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,
-   *not* including the terminating NUL byte, and is set to 1023.
-   Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is
-   not defined at all any more.  */
-#  undef PATH_MAX
-#  define PATH_MAX 1024
-# endif
-
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,
-   section "Maximum Path Length Limitation",
-   <http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx#maxpath>
-   explains that the maximum size of a filename, including the terminating
-   NUL byte, is 260 = 3 + 256 + 1.
-   This is the same value as
-     - FILENAME_MAX in <stdio.h>,
-     - _MAX_PATH in <stdlib.h>,
-     - MAX_PATH in <windef.h>.
-   Undefine the original value, because mingw's <limits.h> gets it wrong.  */
-#  undef PATH_MAX
-#  define PATH_MAX 260
+# ifndef PATH_MAX
+#  define PATH_MAX _POSIX_PATH_MAX
 # endif
 
 #endif /* _PATHMAX_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/progname.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/progname.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/progname.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/progname.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/progname.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/progname.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/progname.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/progname.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/progreloc.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/progreloc.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/progreloc.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/progreloc.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Provide relocatable programs.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -30,16 +29,16 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-/* Get declaration of _NSGetExecutablePath on Mac OS X 10.2 or newer.  */
+/* Get declaration of _NSGetExecutablePath on MacOS X 10.2 or newer.  */
 #if HAVE_MACH_O_DYLD_H
 # include <mach-o/dyld.h>
 #endif
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-# define WINDOWS_NATIVE
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_NATIVE
 #endif
 
-#ifdef WINDOWS_NATIVE
+#if defined WIN32_NATIVE || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -60,10 +59,6 @@
 # include "xalloc.h"
 #endif
 
-#ifndef O_EXEC
-# define O_EXEC O_RDONLY /* This is often close enough in older systems.  */
-#endif
-
 /* Declare canonicalize_file_name.
    The <stdlib.h> included above may be the system's one, not the gnulib
    one.  */
@@ -73,8 +68,8 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -89,15 +84,17 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef sprintf
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
 
 #undef set_program_name
 
 
 #if ENABLE_RELOCATABLE
 
-#if defined __linux__ || defined __CYGWIN__
+#ifdef __linux__
 /* File descriptor of the executable.
    (Only used to verify that we find the correct executable.)  */
 static int executable_fd = -1;
@@ -107,13 +104,12 @@
 static bool
 maybe_executable (const char *filename)
 {
-  /* The native Windows API lacks the access() function.  */
-#if !defined WINDOWS_NATIVE
+  /* Woe32 lacks the access() function, but Cygwin doesn't.  */
+#if !(defined WIN32_NATIVE && !defined __CYGWIN__)
   if (access (filename, X_OK) < 0)
     return false;
-#endif
 
-#if defined __linux__ || defined __CYGWIN__
+#ifdef __linux__
   if (executable_fd >= 0)
     {
       /* If we already have an executable_fd, check that filename points to
@@ -132,23 +128,19 @@
         }
     }
 #endif
+#endif
 
   return true;
 }
 
 /* Determine the full pathname of the current executable, freshly allocated.
    Return NULL if unknown.
-   Guaranteed to work on Linux and native Windows.  Likely to work on the
-   other Unixes (maybe except BeOS), under most conditions.  */
+   Guaranteed to work on Linux and Woe32.  Likely to work on the other
+   Unixes (maybe except BeOS), under most conditions.  */
 static char *
 find_executable (const char *argv0)
 {
-#if defined WINDOWS_NATIVE
-  /* Native Windows only.
-     On Cygwin, it is better to use the Cygwin provided /proc interface, than
-     to use native Windows API and cygwin_conv_to_posix_path, because it
-     supports longer file names
-     (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
+#if defined WIN32_NATIVE || defined __CYGWIN__
   char location[MAX_PATH];
   int length = GetModuleFileName (NULL, location, sizeof (location));
   if (length < 0)
@@ -156,9 +148,32 @@
   if (!IS_PATH_WITH_DIR (location))
     /* Shouldn't happen.  */
     return NULL;
-  return xstrdup (location);
-#else /* Unix */
-# ifdef __linux__
+  {
+#if defined __CYGWIN__
+    /* cygwin-1.5.13 (2005-03-01) or newer would also allow a Linux-like
+       implementation: readlink of "/proc/self/exe".  But using the
+       result of the Win32 system call is simpler and is consistent with the
+       code in relocatable.c.  */
+    /* On Cygwin, we need to convert paths coming from Win32 system calls
+       to the Unix-like slashified notation.  */
+    static char location_as_posix_path[2 * MAX_PATH];
+    /* There's no error return defined for cygwin_conv_to_posix_path.
+       See cygwin-api/func-cygwin-conv-to-posix-path.html.
+       Does it overflow the buffer of expected size MAX_PATH or does it
+       truncate the path?  I don't know.  Let's catch both.  */
+    cygwin_conv_to_posix_path (location, location_as_posix_path);
+    location_as_posix_path[MAX_PATH - 1] = '\0';
+    if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+      /* A sign of buffer overflow or path truncation.  */
+      return NULL;
+    /* Call canonicalize_file_name, because Cygwin supports symbolic links.  */
+    return canonicalize_file_name (location_as_posix_path);
+#else
+    return xstrdup (location);
+#endif
+  }
+#else /* Unix && !Cygwin */
+#ifdef __linux__
   /* The executable is accessible as /proc/<pid>/exe.  In newer Linux
      versions, also as /proc/self/exe.  Linux >= 2.1 provides a symlink
      to the true pathname; older Linux versions give only device and ino,
@@ -170,7 +185,7 @@
     if (link != NULL && link[0] != '[')
       return link;
     if (executable_fd < 0)
-      executable_fd = open ("/proc/self/exe", O_EXEC, 0);
+      executable_fd = open ("/proc/self/exe", O_RDONLY, 0);
 
     {
       char buf[6+10+5];
@@ -179,25 +194,12 @@
       if (link != NULL && link[0] != '[')
         return link;
       if (executable_fd < 0)
-        executable_fd = open (buf, O_EXEC, 0);
+        executable_fd = open (buf, O_RDONLY, 0);
     }
   }
-# endif
-# ifdef __CYGWIN__
-  /* The executable is accessible as /proc/<pid>/exe, at least in
-     Cygwin >= 1.5.  */
-  {
-    char *link;
-
-    link = xreadlink ("/proc/self/exe");
-    if (link != NULL)
-      return link;
-    if (executable_fd < 0)
-      executable_fd = open ("/proc/self/exe", O_EXEC, 0);
-  }
-# endif
-# if HAVE_MACH_O_DYLD_H && HAVE__NSGETEXECUTABLEPATH
-  /* On Mac OS X 10.2 or newer, the function
+#endif
+#if HAVE_MACH_O_DYLD_H && HAVE__NSGETEXECUTABLEPATH
+  /* On MacOS X 10.2 or newer, the function
        int _NSGetExecutablePath (char *buf, uint32_t *bufsize);
      can be used to retrieve the executable's full path.  */
   char location[4096];
@@ -205,7 +207,7 @@
   if (_NSGetExecutablePath (location, &length) == 0
       && location[0] == '/')
     return canonicalize_file_name (location);
-# endif
+#endif
   /* Guess the executable's full path.  We assume the executable has been
      called via execlp() or execvp() with properly set up argv[0].  The
      login(1) convention to add a '-' prefix to argv[0] is not supported.  */
@@ -246,10 +248,10 @@
                 /* We have a path item at p, of length p_len.
                    Now concatenate the path item and argv0.  */
                 concat_name = (char *) xmalloc (p_len + strlen (argv0) + 2);
-# ifdef NO_XMALLOC
+#ifdef NO_XMALLOC
                 if (concat_name == NULL)
                   return NULL;
-# endif
+#endif
                 if (p_len == 0)
                   /* An empty PATH element designates the current directory.  */
                   strcpy (concat_name, argv0);
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/propername.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/propername.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/propername.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/propername.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -15,12 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Without this pragma, gcc 4.7.0 20111124 mistakenly suggests that
-   the proper_name function might be candidate for attribute 'const'  */
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-# pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
-#endif
-
 #include <config.h>
 
 /* Specification.  */
@@ -204,8 +198,7 @@
       name_converted = alloc_name_converted =
         xstr_iconv (name_utf8, "UTF-8", locale_code);
 
-# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-      && !defined __UCLIBC__) \
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
      || _LIBICONV_VERSION >= 0x0105
       {
         char *converted_translit;
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/propername.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/propername.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/propername.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/propername.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -89,7 +89,7 @@
 #endif
 
 /* Return the localization of NAME.  NAME is written in ASCII.  */
-extern const char * proper_name (const char *name) /* NOT attribute const */;
+extern const char * proper_name (const char *name);
 
 /* Return the localization of a name whose original writing is not ASCII.
    NAME_UTF8 is the real name, written in UTF-8 with octal or hexadecimal
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/raise.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/raise.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/raise.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/raise.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/* Provide a non-threads replacement for the POSIX raise function.
-
-   Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 and Bruno Haible */
-
-#include <config.h>
-
-/* Specification.  */
-#include <signal.h>
-
-#if HAVE_RAISE
-/* Native Windows platform.  */
-
-# include <errno.h>
-
-# include "msvc-inval.h"
-
-# undef raise
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-raise_nothrow (int sig)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = raise (sig);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EINVAL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# else
-#  define raise_nothrow raise
-# endif
-
-#else
-/* An old Unix platform.  */
-
-# include <unistd.h>
-
-# define rpl_raise raise
-
-#endif
-
-int
-rpl_raise (int sig)
-{
-#if GNULIB_defined_signal_blocking && GNULIB_defined_SIGPIPE
-  if (sig == SIGPIPE)
-    return _gl_raise_SIGPIPE ();
-#endif
-
-#if HAVE_RAISE
-  return raise_nothrow (sig);
-#else
-  return kill (getpid (), sig);
-#endif
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/readlink.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/readlink.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/readlink.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/readlink.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/ref-add.sin gettext-0.18.1.1/gettext-runtime/gnulib-lib/ref-add.sin
--- gettext-0.19.3/gettext-runtime/gnulib-lib/ref-add.sin	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/ref-add.sin	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/ref-del.sin gettext-0.18.1.1/gettext-runtime/gnulib-lib/ref-del.sin
--- gettext-0.19.3/gettext-runtime/gnulib-lib/ref-del.sin	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/ref-del.sin	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/relocatable.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/relocatable.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/relocatable.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/relocatable.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 
 /* Tell glibc's <stdio.h> to provide a prototype for getline().
@@ -23,7 +25,6 @@
 # define _GNU_SOURCE 1
 #endif
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -42,7 +43,7 @@
 # include "xalloc.h"
 #endif
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -69,8 +70,8 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -85,19 +86,6 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Whether to enable the more costly support for relocatable libraries.
-   It allows libraries to be have been installed with a different original
-   prefix than the program.  But it is quite costly, especially on Cygwin
-   platforms, see below.  Therefore we enable it by default only on native
-   Windows platforms.  */
-#ifndef ENABLE_COSTLY_RELOCATABLE
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-#  define ENABLE_COSTLY_RELOCATABLE 1
-# else
-#  define ENABLE_COSTLY_RELOCATABLE 0
-# endif
-#endif
-
 /* Original installation prefix.  */
 static char *orig_prefix;
 static size_t orig_prefix_len;
@@ -167,7 +155,7 @@
 #endif
 }
 
-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
 
 /* Convenience function:
    Computes the current installation prefix, based on the original
@@ -249,7 +237,7 @@
                often case-insensitive.  It's better to accept the comparison
                if the difference is only in case, rather than to fail.  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-            /* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
+            /* Win32, Cygwin, OS/2, DOS - case insignificant file system */
             if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
                 != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
               break;
@@ -297,17 +285,12 @@
 
 #endif /* !IN_LIBRARY || PIC */
 
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
 
 /* Full pathname of shared library, or NULL.  */
 static char *shared_library_fullname;
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-/* Native Windows only.
-   On Cygwin, it is better to use the Cygwin provided /proc interface, than
-   to use native Windows API and cygwin_conv_to_posix_path, because it
-   supports longer file names
-   (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 
 /* Determine the full pathname of the shared library when it is loaded.  */
 
@@ -329,23 +312,37 @@
         /* Shouldn't happen.  */
         return FALSE;
 
-      shared_library_fullname = strdup (location);
+      {
+#if defined __CYGWIN__
+        /* On Cygwin, we need to convert paths coming from Win32 system calls
+           to the Unix-like slashified notation.  */
+        static char location_as_posix_path[2 * MAX_PATH];
+        /* There's no error return defined for cygwin_conv_to_posix_path.
+           See cygwin-api/func-cygwin-conv-to-posix-path.html.
+           Does it overflow the buffer of expected size MAX_PATH or does it
+           truncate the path?  I don't know.  Let's catch both.  */
+        cygwin_conv_to_posix_path (location, location_as_posix_path);
+        location_as_posix_path[MAX_PATH - 1] = '\0';
+        if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+          /* A sign of buffer overflow or path truncation.  */
+          return FALSE;
+        shared_library_fullname = strdup (location_as_posix_path);
+#else
+        shared_library_fullname = strdup (location);
+#endif
+      }
     }
 
   return TRUE;
 }
 
-#else /* Unix */
+#else /* Unix except Cygwin */
 
 static void
 find_shared_library_fullname ()
 {
-#if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
-  /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
-     function.
-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
-     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
-     Cygwin 1.7.  */
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */
@@ -390,15 +387,15 @@
 #endif
 }
 
-#endif /* Native Windows / Unix */
+#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin, and native Windows.  */
+   Guaranteed to work only on Linux, Cygwin and Woe32.  */
 static char *
 get_shared_library_fullname ()
 {
-#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
   static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)
     {
@@ -418,7 +415,7 @@
 const char *
 relocate (const char *pathname)
 {
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
   static int initialized;
 
   /* Initialization code for a shared library.  */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/relocatable.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/relocatable.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/relocatable.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/relocatable.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _RELOCATABLE_H
 #define _RELOCATABLE_H
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/relocwrapper.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/relocwrapper.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/relocwrapper.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/relocwrapper.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
     -> progname
     -> progreloc
         -> areadlink
-           -> careadlinkat
-             -> allocator
            -> readlink
         -> canonicalize-lgpl
            -> malloca
@@ -29,6 +27,7 @@
     -> relocatable
     -> setenv
        -> malloca
+    -> strerror
     -> c-ctype
 
    Macros that need to be set while compiling this file:
@@ -44,7 +43,6 @@
    libc functions, no gettext(), no error(), no xmalloc(), no xsetenv().
  */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 #include <stdio.h>
@@ -56,10 +54,6 @@
 #include "progname.h"
 #include "relocatable.h"
 #include "c-ctype.h"
-#include "verify.h"
-
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef fprintf
 
 /* Return a copy of the filename, with an extra ".bin" at the end.
    More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}".  */
@@ -116,7 +110,7 @@
 /* List of directories that contain the libraries.  */
 static const char *libdirs[] = { LIBDIRS NULL };
 /* Verify that at least one directory is given.  */
-verify (sizeof (libdirs) / sizeof (libdirs[0]) > 1);
+typedef int verify1[2 * (sizeof (libdirs) / sizeof (libdirs[0]) > 1) - 1];
 
 /* Relocate the list of directories that contain the libraries.  */
 static void
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/setenv.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/setenv.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/setenv.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/setenv.c	2010-04-25 09:20:42.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2010 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
@@ -15,14 +15,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
-/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
-   optimizes away the name == NULL test below.  */
-# define _GL_ARG_NONNULL(params)
-
-# define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the name == NULL test below.  */
+#define _GL_ARG_NONNULL(params)
+
 #include <alloca.h>
 
 /* Specification.  */
@@ -49,7 +48,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of 'environ'.  */
+/* This lock protects against simultaneous modifications of `environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -103,11 +102,11 @@
 static char **last_environ;
 
 
-/* This function is used by 'setenv' and 'putenv'.  The difference between
+/* This function is used by `setenv' and `putenv'.  The difference between
    the two functions is that for the former must create a new string which
-   is then placed in the environment, while the argument of 'putenv'
+   is then placed in the environment, while the argument of `putenv'
    must be used directly.  This is all complicated by the fact that we try
-   to reuse values once generated for a 'setenv' call since we can never
+   to reuse values once generated for a `setenv' call since we can never
    free the strings.  */
 int
 __add_to_environ (const char *name, const char *value, const char *combined,
@@ -148,9 +147,6 @@
                    : realloc (last_environ, (size + 2) * sizeof (char *)));
       if (new_environ == NULL)
         {
-          /* It's easier to set errno to ENOMEM than to rely on the
-             'malloc-posix' and 'realloc-posix' gnulib modules.  */
-          __set_errno (ENOMEM);
           UNLOCK;
           return -1;
         }
@@ -299,7 +295,7 @@
   return __add_to_environ (name, value, NULL, replace);
 }
 
-/* The 'clearenv' was planned to be added to POSIX.1 but probably
+/* The `clearenv' was planned to be added to POSIX.1 but probably
    never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
    for Fortran 77) requires this function.  */
 int
@@ -350,9 +346,6 @@
 #if HAVE_SETENV
 
 # undef setenv
-# if !HAVE_DECL_SETENV
-extern int setenv (const char *, const char *, int);
-# endif
 # define STREQ(a, b) (strcmp (a, b) == 0)
 
 int
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/setlocale.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/setlocale.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/setlocale.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/setlocale.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,938 +0,0 @@
-/* Set the current locale.
-   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2009.  */
-
-#include <config.h>
-
-/* Override setlocale() so that when the default locale is requested
-   (locale = ""), the environment variables LC_ALL, LC_*, and LANG are
-   considered.
-   Also include all the functionality from libintl's setlocale() override.  */
-
-/* Please keep this file in sync with
-   gettext/gettext-runtime/intl/setlocale.c !  */
-
-/* Specification.  */
-#include <locale.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "localename.h"
-
-#if 1
-
-# undef setlocale
-
-/* Return string representation of locale category CATEGORY.  */
-static const char *
-category_to_name (int category)
-{
-  const char *retval;
-
-  switch (category)
-  {
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* The native Windows setlocale() function expects locale names of the form
-   "German" or "German_Germany" or "DEU", but not "de" or "de_DE".  We need
-   to convert the names from the form with ISO 639 language code and ISO 3166
-   country code to the form with English names or with three-letter identifier.
-   The three-letter identifiers known by a Windows XP SP2 or SP3 are:
-     AFK  Afrikaans_South Africa.1252
-     ARA  Arabic_Saudi Arabia.1256
-     ARB  Arabic_Lebanon.1256
-     ARE  Arabic_Egypt.1256
-     ARG  Arabic_Algeria.1256
-     ARH  Arabic_Bahrain.1256
-     ARI  Arabic_Iraq.1256
-     ARJ  Arabic_Jordan.1256
-     ARK  Arabic_Kuwait.1256
-     ARL  Arabic_Libya.1256
-     ARM  Arabic_Morocco.1256
-     ARO  Arabic_Oman.1256
-     ARQ  Arabic_Qatar.1256
-     ARS  Arabic_Syria.1256
-     ART  Arabic_Tunisia.1256
-     ARU  Arabic_U.A.E..1256
-     ARY  Arabic_Yemen.1256
-     AZE  Azeri (Latin)_Azerbaijan.1254
-     BEL  Belarusian_Belarus.1251
-     BGR  Bulgarian_Bulgaria.1251
-     BSB  Bosnian_Bosnia and Herzegovina.1250
-     BSC  Bosnian (Cyrillic)_Bosnia and Herzegovina.1250  (wrong encoding!)
-     CAT  Catalan_Spain.1252
-     CHH  Chinese_Hong Kong S.A.R..950
-     CHI  Chinese_Singapore.936
-     CHS  Chinese_People's Republic of China.936
-     CHT  Chinese_Taiwan.950
-     CSY  Czech_Czech Republic.1250
-     CYM  Welsh_United Kingdom.1252
-     DAN  Danish_Denmark.1252
-     DEA  German_Austria.1252
-     DEC  German_Liechtenstein.1252
-     DEL  German_Luxembourg.1252
-     DES  German_Switzerland.1252
-     DEU  German_Germany.1252
-     ELL  Greek_Greece.1253
-     ENA  English_Australia.1252
-     ENB  English_Caribbean.1252
-     ENC  English_Canada.1252
-     ENG  English_United Kingdom.1252
-     ENI  English_Ireland.1252
-     ENJ  English_Jamaica.1252
-     ENL  English_Belize.1252
-     ENP  English_Republic of the Philippines.1252
-     ENS  English_South Africa.1252
-     ENT  English_Trinidad and Tobago.1252
-     ENU  English_United States.1252
-     ENW  English_Zimbabwe.1252
-     ENZ  English_New Zealand.1252
-     ESA  Spanish_Panama.1252
-     ESB  Spanish_Bolivia.1252
-     ESC  Spanish_Costa Rica.1252
-     ESD  Spanish_Dominican Republic.1252
-     ESE  Spanish_El Salvador.1252
-     ESF  Spanish_Ecuador.1252
-     ESG  Spanish_Guatemala.1252
-     ESH  Spanish_Honduras.1252
-     ESI  Spanish_Nicaragua.1252
-     ESL  Spanish_Chile.1252
-     ESM  Spanish_Mexico.1252
-     ESN  Spanish_Spain.1252
-     ESO  Spanish_Colombia.1252
-     ESP  Spanish_Spain.1252
-     ESR  Spanish_Peru.1252
-     ESS  Spanish_Argentina.1252
-     ESU  Spanish_Puerto Rico.1252
-     ESV  Spanish_Venezuela.1252
-     ESY  Spanish_Uruguay.1252
-     ESZ  Spanish_Paraguay.1252
-     ETI  Estonian_Estonia.1257
-     EUQ  Basque_Spain.1252
-     FAR  Farsi_Iran.1256
-     FIN  Finnish_Finland.1252
-     FOS  Faroese_Faroe Islands.1252
-     FPO  Filipino_Philippines.1252
-     FRA  French_France.1252
-     FRB  French_Belgium.1252
-     FRC  French_Canada.1252
-     FRL  French_Luxembourg.1252
-     FRM  French_Principality of Monaco.1252
-     FRS  French_Switzerland.1252
-     FYN  Frisian_Netherlands.1252
-     GLC  Galician_Spain.1252
-     HEB  Hebrew_Israel.1255
-     HRB  Croatian_Bosnia and Herzegovina.1250
-     HRV  Croatian_Croatia.1250
-     HUN  Hungarian_Hungary.1250
-     IND  Indonesian_Indonesia.1252
-     IRE  Irish_Ireland.1252
-     ISL  Icelandic_Iceland.1252
-     ITA  Italian_Italy.1252
-     ITS  Italian_Switzerland.1252
-     IUK  Inuktitut (Latin)_Canada.1252
-     JPN  Japanese_Japan.932
-     KKZ  Kazakh_Kazakhstan.1251
-     KOR  Korean_Korea.949
-     KYR  Kyrgyz_Kyrgyzstan.1251
-     LBX  Luxembourgish_Luxembourg.1252
-     LTH  Lithuanian_Lithuania.1257
-     LVI  Latvian_Latvia.1257
-     MKI  FYRO Macedonian_Former Yugoslav Republic of Macedonia.1251
-     MON  Mongolian_Mongolia.1251
-     MPD  Mapudungun_Chile.1252
-     MSB  Malay_Brunei Darussalam.1252
-     MSL  Malay_Malaysia.1252
-     MWK  Mohawk_Canada.1252
-     NLB  Dutch_Belgium.1252
-     NLD  Dutch_Netherlands.1252
-     NON  Norwegian-Nynorsk_Norway.1252
-     NOR  Norwegian (Bokmål)_Norway.1252
-     NSO  Northern Sotho_South Africa.1252
-     PLK  Polish_Poland.1250
-     PTB  Portuguese_Brazil.1252
-     PTG  Portuguese_Portugal.1252
-     QUB  Quechua_Bolivia.1252
-     QUE  Quechua_Ecuador.1252
-     QUP  Quechua_Peru.1252
-     RMC  Romansh_Switzerland.1252
-     ROM  Romanian_Romania.1250
-     RUS  Russian_Russia.1251
-     SKY  Slovak_Slovakia.1250
-     SLV  Slovenian_Slovenia.1250
-     SMA  Sami (Southern)_Norway.1252
-     SMB  Sami (Southern)_Sweden.1252
-     SME  Sami (Northern)_Norway.1252
-     SMF  Sami (Northern)_Sweden.1252
-     SMG  Sami (Northern)_Finland.1252
-     SMJ  Sami (Lule)_Norway.1252
-     SMK  Sami (Lule)_Sweden.1252
-     SMN  Sami (Inari)_Finland.1252
-     SMS  Sami (Skolt)_Finland.1252
-     SQI  Albanian_Albania.1250
-     SRB  Serbian (Cyrillic)_Serbia and Montenegro.1251
-     SRL  Serbian (Latin)_Serbia and Montenegro.1250
-     SRN  Serbian (Cyrillic)_Bosnia and Herzegovina.1251
-     SRS  Serbian (Latin)_Bosnia and Herzegovina.1250
-     SVE  Swedish_Sweden.1252
-     SVF  Swedish_Finland.1252
-     SWK  Swahili_Kenya.1252
-     THA  Thai_Thailand.874
-     TRK  Turkish_Turkey.1254
-     TSN  Tswana_South Africa.1252
-     TTT  Tatar_Russia.1251
-     UKR  Ukrainian_Ukraine.1251
-     URD  Urdu_Islamic Republic of Pakistan.1256
-     USA  English_United States.1252
-     UZB  Uzbek (Latin)_Uzbekistan.1254
-     VIT  Vietnamese_Viet Nam.1258
-     XHO  Xhosa_South Africa.1252
-     ZHH  Chinese_Hong Kong S.A.R..950
-     ZHI  Chinese_Singapore.936
-     ZHM  Chinese_Macau S.A.R..950
-     ZUL  Zulu_South Africa.1252
- */
-
-/* Table from ISO 639 language code, optionally with country or script suffix,
-   to English name.
-   Keep in sync with the gl_locale_name_from_win32_LANGID function in
-   localename.c!  */
-struct table_entry
-{
-  const char *code;
-  const char *english;
-};
-static const struct table_entry language_table[] =
-  {
-    { "af", "Afrikaans" },
-    { "am", "Amharic" },
-    { "ar", "Arabic" },
-    { "arn", "Mapudungun" },
-    { "as", "Assamese" },
-    { "az@cyrillic", "Azeri (Cyrillic)" },
-    { "az@latin", "Azeri (Latin)" },
-    { "ba", "Bashkir" },
-    { "be", "Belarusian" },
-    { "ber", "Tamazight" },
-    { "ber@arabic", "Tamazight (Arabic)" },
-    { "ber@latin", "Tamazight (Latin)" },
-    { "bg", "Bulgarian" },
-    { "bin", "Edo" },
-    { "bn", "Bengali" },
-    { "bn_BD", "Bengali (Bangladesh)" },
-    { "bn_IN", "Bengali (India)" },
-    { "bnt", "Sutu" },
-    { "bo", "Tibetan" },
-    { "br", "Breton" },
-    { "bs", "BSB" }, /* "Bosnian (Latin)" */
-    { "bs@cyrillic", "BSC" }, /* Bosnian (Cyrillic) */
-    { "ca", "Catalan" },
-    { "chr", "Cherokee" },
-    { "co", "Corsican" },
-    { "cpe", "Hawaiian" },
-    { "cs", "Czech" },
-    { "cy", "Welsh" },
-    { "da", "Danish" },
-    { "de", "German" },
-    { "dsb", "Lower Sorbian" },
-    { "dv", "Divehi" },
-    { "el", "Greek" },
-    { "en", "English" },
-    { "es", "Spanish" },
-    { "et", "Estonian" },
-    { "eu", "Basque" },
-    { "fa", "Farsi" },
-    { "ff", "Fulfulde" },
-    { "fi", "Finnish" },
-    { "fo", "Faroese" }, /* "Faeroese" does not work */
-    { "fr", "French" },
-    { "fy", "Frisian" },
-    { "ga", "IRE" }, /* Gaelic (Ireland) */
-    { "gd", "Gaelic (Scotland)" },
-    { "gd", "Scottish Gaelic" },
-    { "gl", "Galician" },
-    { "gn", "Guarani" },
-    { "gsw", "Alsatian" },
-    { "gu", "Gujarati" },
-    { "ha", "Hausa" },
-    { "he", "Hebrew" },
-    { "hi", "Hindi" },
-    { "hr", "Croatian" },
-    { "hsb", "Upper Sorbian" },
-    { "hu", "Hungarian" },
-    { "hy", "Armenian" },
-    { "id", "Indonesian" },
-    { "ig", "Igbo" },
-    { "ii", "Yi" },
-    { "is", "Icelandic" },
-    { "it", "Italian" },
-    { "iu", "IUK" }, /* Inuktitut */
-    { "ja", "Japanese" },
-    { "ka", "Georgian" },
-    { "kk", "Kazakh" },
-    { "kl", "Greenlandic" },
-    { "km", "Cambodian" },
-    { "km", "Khmer" },
-    { "kn", "Kannada" },
-    { "ko", "Korean" },
-    { "kok", "Konkani" },
-    { "kr", "Kanuri" },
-    { "ks", "Kashmiri" },
-    { "ks_IN", "Kashmiri_India" },
-    { "ks_PK", "Kashmiri (Arabic)_Pakistan" },
-    { "ky", "Kyrgyz" },
-    { "la", "Latin" },
-    { "lb", "Luxembourgish" },
-    { "lo", "Lao" },
-    { "lt", "Lithuanian" },
-    { "lv", "Latvian" },
-    { "mi", "Maori" },
-    { "mk", "FYRO Macedonian" },
-    { "mk", "Macedonian" },
-    { "ml", "Malayalam" },
-    { "mn", "Mongolian" },
-    { "mni", "Manipuri" },
-    { "moh", "Mohawk" },
-    { "mr", "Marathi" },
-    { "ms", "Malay" },
-    { "mt", "Maltese" },
-    { "my", "Burmese" },
-    { "nb", "NOR" }, /* Norwegian Bokmål */
-    { "ne", "Nepali" },
-    { "nic", "Ibibio" },
-    { "nl", "Dutch" },
-    { "nn", "NON" }, /* Norwegian Nynorsk */
-    { "no", "Norwegian" },
-    { "nso", "Northern Sotho" },
-    { "nso", "Sepedi" },
-    { "oc", "Occitan" },
-    { "om", "Oromo" },
-    { "or", "Oriya" },
-    { "pa", "Punjabi" },
-    { "pap", "Papiamentu" },
-    { "pl", "Polish" },
-    { "prs", "Dari" },
-    { "ps", "Pashto" },
-    { "pt", "Portuguese" },
-    { "qu", "Quechua" },
-    { "qut", "K'iche'" },
-    { "rm", "Romansh" },
-    { "ro", "Romanian" },
-    { "ru", "Russian" },
-    { "rw", "Kinyarwanda" },
-    { "sa", "Sanskrit" },
-    { "sah", "Yakut" },
-    { "sd", "Sindhi" },
-    { "se", "Sami (Northern)" },
-    { "se", "Northern Sami" },
-    { "si", "Sinhalese" },
-    { "sk", "Slovak" },
-    { "sl", "Slovenian" },
-    { "sma", "Sami (Southern)" },
-    { "sma", "Southern Sami" },
-    { "smj", "Sami (Lule)" },
-    { "smj", "Lule Sami" },
-    { "smn", "Sami (Inari)" },
-    { "smn", "Inari Sami" },
-    { "sms", "Sami (Skolt)" },
-    { "sms", "Skolt Sami" },
-    { "so", "Somali" },
-    { "sq", "Albanian" },
-    { "sr", "Serbian (Latin)" },
-    { "sr@cyrillic", "SRB" }, /* Serbian (Cyrillic) */
-    { "sw", "Swahili" },
-    { "syr", "Syriac" },
-    { "ta", "Tamil" },
-    { "te", "Telugu" },
-    { "tg", "Tajik" },
-    { "th", "Thai" },
-    { "ti", "Tigrinya" },
-    { "tk", "Turkmen" },
-    { "tl", "Filipino" },
-    { "tn", "Tswana" },
-    { "tr", "Turkish" },
-    { "ts", "Tsonga" },
-    { "tt", "Tatar" },
-    { "ug", "Uighur" },
-    { "uk", "Ukrainian" },
-    { "ur", "Urdu" },
-    { "uz", "Uzbek" },
-    { "uz", "Uzbek (Latin)" },
-    { "uz@cyrillic", "Uzbek (Cyrillic)" },
-    { "ve", "Venda" },
-    { "vi", "Vietnamese" },
-    { "wen", "Sorbian" },
-    { "wo", "Wolof" },
-    { "xh", "Xhosa" },
-    { "yi", "Yiddish" },
-    { "yo", "Yoruba" },
-    { "zh", "Chinese" },
-    { "zu", "Zulu" }
-  };
-
-/* Table from ISO 3166 country code to English name.
-   Keep in sync with the gl_locale_name_from_win32_LANGID function in
-   localename.c!  */
-static const struct table_entry country_table[] =
-  {
-    { "AE", "U.A.E." },
-    { "AF", "Afghanistan" },
-    { "AL", "Albania" },
-    { "AM", "Armenia" },
-    { "AN", "Netherlands Antilles" },
-    { "AR", "Argentina" },
-    { "AT", "Austria" },
-    { "AU", "Australia" },
-    { "AZ", "Azerbaijan" },
-    { "BA", "Bosnia and Herzegovina" },
-    { "BD", "Bangladesh" },
-    { "BE", "Belgium" },
-    { "BG", "Bulgaria" },
-    { "BH", "Bahrain" },
-    { "BN", "Brunei Darussalam" },
-    { "BO", "Bolivia" },
-    { "BR", "Brazil" },
-    { "BT", "Bhutan" },
-    { "BY", "Belarus" },
-    { "BZ", "Belize" },
-    { "CA", "Canada" },
-    { "CG", "Congo" },
-    { "CH", "Switzerland" },
-    { "CI", "Cote d'Ivoire" },
-    { "CL", "Chile" },
-    { "CM", "Cameroon" },
-    { "CN", "People's Republic of China" },
-    { "CO", "Colombia" },
-    { "CR", "Costa Rica" },
-    { "CS", "Serbia and Montenegro" },
-    { "CZ", "Czech Republic" },
-    { "DE", "Germany" },
-    { "DK", "Denmark" },
-    { "DO", "Dominican Republic" },
-    { "DZ", "Algeria" },
-    { "EC", "Ecuador" },
-    { "EE", "Estonia" },
-    { "EG", "Egypt" },
-    { "ER", "Eritrea" },
-    { "ES", "Spain" },
-    { "ET", "Ethiopia" },
-    { "FI", "Finland" },
-    { "FO", "Faroe Islands" },
-    { "FR", "France" },
-    { "GB", "United Kingdom" },
-    { "GD", "Caribbean" },
-    { "GE", "Georgia" },
-    { "GL", "Greenland" },
-    { "GR", "Greece" },
-    { "GT", "Guatemala" },
-    { "HK", "Hong Kong" },
-    { "HK", "Hong Kong S.A.R." },
-    { "HN", "Honduras" },
-    { "HR", "Croatia" },
-    { "HT", "Haiti" },
-    { "HU", "Hungary" },
-    { "ID", "Indonesia" },
-    { "IE", "Ireland" },
-    { "IL", "Israel" },
-    { "IN", "India" },
-    { "IQ", "Iraq" },
-    { "IR", "Iran" },
-    { "IS", "Iceland" },
-    { "IT", "Italy" },
-    { "JM", "Jamaica" },
-    { "JO", "Jordan" },
-    { "JP", "Japan" },
-    { "KE", "Kenya" },
-    { "KG", "Kyrgyzstan" },
-    { "KH", "Cambodia" },
-    { "KR", "South Korea" },
-    { "KW", "Kuwait" },
-    { "KZ", "Kazakhstan" },
-    { "LA", "Laos" },
-    { "LB", "Lebanon" },
-    { "LI", "Liechtenstein" },
-    { "LK", "Sri Lanka" },
-    { "LT", "Lithuania" },
-    { "LU", "Luxembourg" },
-    { "LV", "Latvia" },
-    { "LY", "Libya" },
-    { "MA", "Morocco" },
-    { "MC", "Principality of Monaco" },
-    { "MD", "Moldava" },
-    { "MD", "Moldova" },
-    { "ME", "Montenegro" },
-    { "MK", "Former Yugoslav Republic of Macedonia" },
-    { "ML", "Mali" },
-    { "MM", "Myanmar" },
-    { "MN", "Mongolia" },
-    { "MO", "Macau S.A.R." },
-    { "MT", "Malta" },
-    { "MV", "Maldives" },
-    { "MX", "Mexico" },
-    { "MY", "Malaysia" },
-    { "NG", "Nigeria" },
-    { "NI", "Nicaragua" },
-    { "NL", "Netherlands" },
-    { "NO", "Norway" },
-    { "NP", "Nepal" },
-    { "NZ", "New Zealand" },
-    { "OM", "Oman" },
-    { "PA", "Panama" },
-    { "PE", "Peru" },
-    { "PH", "Philippines" },
-    { "PK", "Islamic Republic of Pakistan" },
-    { "PL", "Poland" },
-    { "PR", "Puerto Rico" },
-    { "PT", "Portugal" },
-    { "PY", "Paraguay" },
-    { "QA", "Qatar" },
-    { "RE", "Reunion" },
-    { "RO", "Romania" },
-    { "RS", "Serbia" },
-    { "RU", "Russia" },
-    { "RW", "Rwanda" },
-    { "SA", "Saudi Arabia" },
-    { "SE", "Sweden" },
-    { "SG", "Singapore" },
-    { "SI", "Slovenia" },
-    { "SK", "Slovak" },
-    { "SN", "Senegal" },
-    { "SO", "Somalia" },
-    { "SR", "Suriname" },
-    { "SV", "El Salvador" },
-    { "SY", "Syria" },
-    { "TH", "Thailand" },
-    { "TJ", "Tajikistan" },
-    { "TM", "Turkmenistan" },
-    { "TN", "Tunisia" },
-    { "TR", "Turkey" },
-    { "TT", "Trinidad and Tobago" },
-    { "TW", "Taiwan" },
-    { "TZ", "Tanzania" },
-    { "UA", "Ukraine" },
-    { "US", "United States" },
-    { "UY", "Uruguay" },
-    { "VA", "Vatican" },
-    { "VE", "Venezuela" },
-    { "VN", "Viet Nam" },
-    { "YE", "Yemen" },
-    { "ZA", "South Africa" },
-    { "ZW", "Zimbabwe" }
-  };
-
-/* Given a string STRING, find the set of indices i such that TABLE[i].code is
-   the given STRING.  It is a range [lo,hi-1].  */
-typedef struct { size_t lo; size_t hi; } range_t;
-static void
-search (const struct table_entry *table, size_t table_size, const char *string,
-        range_t *result)
-{
-  /* The table is sorted.  Perform a binary search.  */
-  size_t hi = table_size;
-  size_t lo = 0;
-  while (lo < hi)
-    {
-      /* Invariant:
-         for i < lo, strcmp (table[i].code, string) < 0,
-         for i >= hi, strcmp (table[i].code, string) > 0.  */
-      size_t mid = (hi + lo) >> 1; /* >= lo, < hi */
-      int cmp = strcmp (table[mid].code, string);
-      if (cmp < 0)
-        lo = mid + 1;
-      else if (cmp > 0)
-        hi = mid;
-      else
-        {
-          /* Found an i with
-               strcmp (language_table[i].code, string) == 0.
-             Find the entire interval of such i.  */
-          {
-            size_t i;
-
-            for (i = mid; i > lo; )
-              {
-                i--;
-                if (strcmp (table[i].code, string) < 0)
-                  {
-                    lo = i + 1;
-                    break;
-                  }
-              }
-          }
-          {
-            size_t i;
-
-            for (i = mid; i < hi; i++)
-              {
-                if (strcmp (table[i].code, string) > 0)
-                  {
-                    hi = i;
-                    break;
-                  }
-              }
-          }
-          /* The set of i with
-               strcmp (language_table[i].code, string) == 0
-             is the interval [lo, hi-1].  */
-          break;
-        }
-    }
-  result->lo = lo;
-  result->hi = hi;
-}
-
-/* Like setlocale, but accept also locale names in the form ll or ll_CC,
-   where ll is an ISO 639 language code and CC is an ISO 3166 country code.  */
-static char *
-setlocale_unixlike (int category, const char *locale)
-{
-  char *result;
-  char llCC_buf[64];
-  char ll_buf[64];
-  char CC_buf[64];
-
-  /* First, try setlocale with the original argument unchanged.  */
-  result = setlocale (category, locale);
-  if (result != NULL)
-    return result;
-
-  /* Otherwise, assume the argument is in the form
-       language[_territory][.codeset][@modifier]
-     and try to map it using the tables.  */
-  if (strlen (locale) < sizeof (llCC_buf))
-    {
-      /* Second try: Remove the codeset part.  */
-      {
-        const char *p = locale;
-        char *q = llCC_buf;
-
-        /* Copy the part before the dot.  */
-        for (; *p != '\0' && *p != '.'; p++, q++)
-          *q = *p;
-        if (*p == '.')
-          /* Skip the part up to the '@', if any.  */
-          for (; *p != '\0' && *p != '@'; p++)
-            ;
-        /* Copy the part starting with '@', if any.  */
-        for (; *p != '\0'; p++, q++)
-          *q = *p;
-        *q = '\0';
-      }
-      /* llCC_buf now contains
-           language[_territory][@modifier]
-       */
-      if (strcmp (llCC_buf, locale) != 0)
-        {
-          result = setlocale (category, llCC_buf);
-          if (result != NULL)
-            return result;
-        }
-      /* Look it up in language_table.  */
-      {
-        range_t range;
-        size_t i;
-
-        search (language_table,
-                sizeof (language_table) / sizeof (language_table[0]),
-                llCC_buf,
-                &range);
-
-        for (i = range.lo; i < range.hi; i++)
-          {
-            /* Try the replacement in language_table[i].  */
-            result = setlocale (category, language_table[i].english);
-            if (result != NULL)
-              return result;
-          }
-      }
-      /* Split language[_territory][@modifier]
-         into  ll_buf = language[@modifier]
-         and   CC_buf = territory
-       */
-      {
-        const char *underscore = strchr (llCC_buf, '_');
-        if (underscore != NULL)
-          {
-            const char *territory_start = underscore + 1;
-            const char *territory_end = strchr (territory_start, '@');
-            if (territory_end == NULL)
-              territory_end = territory_start + strlen (territory_start);
-
-            memcpy (ll_buf, llCC_buf, underscore - llCC_buf);
-            strcpy (ll_buf + (underscore - llCC_buf), territory_end);
-
-            memcpy (CC_buf, territory_start, territory_end - territory_start);
-            CC_buf[territory_end - territory_start] = '\0';
-
-            {
-              /* Look up ll_buf in language_table
-                 and CC_buf in country_table.  */
-              range_t language_range;
-
-              search (language_table,
-                      sizeof (language_table) / sizeof (language_table[0]),
-                      ll_buf,
-                      &language_range);
-              if (language_range.lo < language_range.hi)
-                {
-                  range_t country_range;
-
-                  search (country_table,
-                          sizeof (country_table) / sizeof (country_table[0]),
-                          CC_buf,
-                          &country_range);
-                  if (country_range.lo < country_range.hi)
-                    {
-                      size_t i;
-                      size_t j;
-
-                      for (i = language_range.lo; i < language_range.hi; i++)
-                        for (j = country_range.lo; j < country_range.hi; j++)
-                          {
-                            /* Concatenate the replacements.  */
-                            const char *part1 = language_table[i].english;
-                            size_t part1_len = strlen (part1);
-                            const char *part2 = country_table[j].english;
-                            size_t part2_len = strlen (part2) + 1;
-                            char buf[64+64];
-
-                            if (!(part1_len + 1 + part2_len <= sizeof (buf)))
-                              abort ();
-                            memcpy (buf, part1, part1_len);
-                            buf[part1_len] = '_';
-                            memcpy (buf + part1_len + 1, part2, part2_len);
-
-                            /* Try the concatenated replacements.  */
-                            result = setlocale (category, buf);
-                            if (result != NULL)
-                              return result;
-                          }
-                    }
-
-                  /* Try omitting the country entirely.  This may set a locale
-                     corresponding to the wrong country, but is better than
-                     failing entirely.  */
-                  {
-                    size_t i;
-
-                    for (i = language_range.lo; i < language_range.hi; i++)
-                      {
-                        /* Try only the language replacement.  */
-                        result =
-                          setlocale (category, language_table[i].english);
-                        if (result != NULL)
-                          return result;
-                      }
-                  }
-                }
-            }
-          }
-      }
-    }
-
-  /* Failed.  */
-  return NULL;
-}
-
-# else
-#  define setlocale_unixlike setlocale
-# endif
-
-# if LC_MESSAGES == 1729
-
-/* The system does not store an LC_MESSAGES locale category.  Do it here.  */
-static char lc_messages_name[64] = "C";
-
-/* Like setlocale, but support also LC_MESSAGES.  */
-static char *
-setlocale_single (int category, const char *locale)
-{
-  if (category == LC_MESSAGES)
-    {
-      if (locale != NULL)
-        {
-          lc_messages_name[sizeof (lc_messages_name) - 1] = '\0';
-          strncpy (lc_messages_name, locale, sizeof (lc_messages_name) - 1);
-        }
-      return lc_messages_name;
-    }
-  else
-    return setlocale_unixlike (category, locale);
-}
-
-# else
-#  define setlocale_single setlocale_unixlike
-# endif
-
-char *
-rpl_setlocale (int category, const char *locale)
-{
-  if (locale != NULL && locale[0] == '\0')
-    {
-      /* A request to the set the current locale to the default locale.  */
-      if (category == LC_ALL)
-        {
-          /* Set LC_CTYPE first.  Then the other categories.  */
-          static int const categories[] =
-            {
-              LC_NUMERIC,
-              LC_TIME,
-              LC_COLLATE,
-              LC_MONETARY,
-              LC_MESSAGES
-            };
-          char *saved_locale;
-          const char *base_name;
-          unsigned int i;
-
-          /* Back up the old locale, in case one of the steps fails.  */
-          saved_locale = setlocale (LC_ALL, NULL);
-          if (saved_locale == NULL)
-            return NULL;
-          saved_locale = strdup (saved_locale);
-          if (saved_locale == NULL)
-            return NULL;
-
-          /* Set LC_CTYPE category.  Set all other categories (except possibly
-             LC_MESSAGES) to the same value in the same call; this is likely to
-             save calls.  */
-          base_name =
-            gl_locale_name_environ (LC_CTYPE, category_to_name (LC_CTYPE));
-          if (base_name == NULL)
-            base_name = gl_locale_name_default ();
-
-          if (setlocale_unixlike (LC_ALL, base_name) == NULL)
-            goto fail;
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-          /* On native Windows, setlocale(LC_ALL,...) may succeed but set the
-             LC_CTYPE category to an invalid value ("C") when it does not
-             support the specified encoding.  Report a failure instead.  */
-          if (strchr (base_name, '.') != NULL
-              && strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-            goto fail;
-# endif
-
-          for (i = 0; i < sizeof (categories) / sizeof (categories[0]); i++)
-            {
-              int cat = categories[i];
-              const char *name;
-
-              name = gl_locale_name_environ (cat, category_to_name (cat));
-              if (name == NULL)
-                name = gl_locale_name_default ();
-
-              /* If name is the same as base_name, it has already been set
-                 through the setlocale call before the loop.  */
-              if (strcmp (name, base_name) != 0
-# if LC_MESSAGES == 1729
-                  || cat == LC_MESSAGES
-# endif
-                 )
-                if (setlocale_single (cat, name) == NULL)
-                  goto fail;
-            }
-
-          /* All steps were successful.  */
-          free (saved_locale);
-          return setlocale (LC_ALL, NULL);
-
-        fail:
-          if (saved_locale[0] != '\0') /* don't risk an endless recursion */
-            setlocale (LC_ALL, saved_locale);
-          free (saved_locale);
-          return NULL;
-        }
-      else
-        {
-          const char *name =
-            gl_locale_name_environ (category, category_to_name (category));
-          if (name == NULL)
-            name = gl_locale_name_default ();
-
-          return setlocale_single (category, name);
-        }
-    }
-  else
-    {
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-      if (category == LC_ALL && locale != NULL && strchr (locale, '.') != NULL)
-        {
-          char *saved_locale;
-
-          /* Back up the old locale.  */
-          saved_locale = setlocale (LC_ALL, NULL);
-          if (saved_locale == NULL)
-            return NULL;
-          saved_locale = strdup (saved_locale);
-          if (saved_locale == NULL)
-            return NULL;
-
-          if (setlocale_unixlike (LC_ALL, locale) == NULL)
-            {
-              free (saved_locale);
-              return NULL;
-            }
-
-          /* On native Windows, setlocale(LC_ALL,...) may succeed but set the
-             LC_CTYPE category to an invalid value ("C") when it does not
-             support the specified encoding.  Report a failure instead.  */
-          if (strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-            {
-              if (saved_locale[0] != '\0') /* don't risk an endless recursion */
-                setlocale (LC_ALL, saved_locale);
-              free (saved_locale);
-              return NULL;
-            }
-
-          /* It was really successful.  */
-          free (saved_locale);
-          return setlocale (LC_ALL, NULL);
-        }
-      else
-# endif
-        return setlocale_single (category, locale);
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/signal.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/signal.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/signal.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/signal.in.h	2010-03-28 18:31:26.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,51 +18,22 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
-/* Special invocation convention:
-   - Inside glibc header files.
-   - On glibc systems we have a sequence of nested includes
-     <signal.h> -> <ucontext.h> -> <signal.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.
-   - On glibc systems with GCC 4.3 we have a sequence of nested includes
-     <csignal> -> </usr/include/signal.h> -> <sys/ucontext.h> -> <signal.h>.
-     In this situation, some of the functions are not yet declared, therefore
-     we cannot provide the C++ aliases.  */
+#if defined __need_sig_atomic_t || defined __need_sigset_t
+/* Special invocation convention inside glibc header files.  */
 
 # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_SIGNAL_H
-
-#define _GL_ALREADY_INCLUDING_SIGNAL_H
-
-/* Define pid_t, uid_t.
-   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.
-   On Solaris 10, <signal.h> includes <sys/types.h>, which eventually includes
-   us; so include <sys/types.h> now, before the second inclusion guard.  */
-#include <sys/types.h>
+#ifndef _GL_SIGNAL_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
-#undef _GL_ALREADY_INCLUDING_SIGNAL_H
-
-#ifndef _@GUARD_PREFIX@_SIGNAL_H
-#define _@GUARD_PREFIX@_SIGNAL_H
-
-/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
-   pthread_sigmask in <pthread.h>, not in <signal.h>.
-   But avoid namespace pollution on glibc systems.*/
-#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
-    && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
-    && ! defined __GLIBC__
-# include <pthread.h>
-#endif
+#ifndef _GL_SIGNAL_H
+#define _GL_SIGNAL_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -70,38 +41,22 @@
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
+/* Define pid_t, uid_t.
+   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>
+
 /* On AIX, sig_atomic_t already includes volatile.  C99 requires that
    'volatile sig_atomic_t' ignore the extra modifier, but C89 did not.
    Hence, redefine this to a non-volatile type as needed.  */
 #if ! @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
-# if !GNULIB_defined_sig_atomic_t
 typedef int rpl_sig_atomic_t;
-#  undef sig_atomic_t
-#  define sig_atomic_t rpl_sig_atomic_t
-#  define GNULIB_defined_sig_atomic_t 1
-# endif
+# undef sig_atomic_t
+# define sig_atomic_t rpl_sig_atomic_t
 #endif
 
 /* A set or mask of signals.  */
 #if !@HAVE_SIGSET_T@
-# if !GNULIB_defined_sigset_t
 typedef unsigned int sigset_t;
-#  define GNULIB_defined_sigset_t 1
-# endif
-#endif
-
-/* Define sighandler_t, the type of signal handlers.  A GNU extension.  */
-#if !@HAVE_SIGHANDLER_T@
-# ifdef __cplusplus
-extern "C" {
-# endif
-# if !GNULIB_defined_sighandler_t
-typedef void (*sighandler_t) (int);
-#  define GNULIB_defined_sighandler_t 1
-# endif
-# ifdef __cplusplus
-}
-# endif
 #endif
 
 
@@ -116,102 +71,22 @@
 #endif
 
 
-/* Maximum signal number + 1.  */
-#ifndef NSIG
-# if defined __TANDEM
-#  define NSIG 32
-# endif
-#endif
-
-
-#if @GNULIB_PTHREAD_SIGMASK@
-# if @REPLACE_PTHREAD_SIGMASK@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pthread_sigmask
-#   define pthread_sigmask rpl_pthread_sigmask
-#  endif
-_GL_FUNCDECL_RPL (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-_GL_CXXALIAS_RPL (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-# else
-#  if !@HAVE_PTHREAD_SIGMASK@
-_GL_FUNCDECL_SYS (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-#  endif
-_GL_CXXALIAS_SYS (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-# endif
-_GL_CXXALIASWARN (pthread_sigmask);
-#elif defined GNULIB_POSIXCHECK
-# undef pthread_sigmask
-# if HAVE_RAW_DECL_PTHREAD_SIGMASK
-_GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - "
-                 "use gnulib module pthread_sigmask for portability");
-# endif
-#endif
-
-
-#if @GNULIB_RAISE@
-# if @REPLACE_RAISE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef raise
-#   define raise rpl_raise
-#  endif
-_GL_FUNCDECL_RPL (raise, int, (int sig));
-_GL_CXXALIAS_RPL (raise, int, (int sig));
-# else
-#  if !@HAVE_RAISE@
-_GL_FUNCDECL_SYS (raise, int, (int sig));
-#  endif
-_GL_CXXALIAS_SYS (raise, int, (int sig));
-# endif
-_GL_CXXALIASWARN (raise);
-#elif defined GNULIB_POSIXCHECK
-# undef raise
-/* Assume raise is always declared.  */
-_GL_WARN_ON_USE (raise, "raise can crash on native Windows - "
-                 "use gnulib module raise for portability");
-#endif
-
-
 #if @GNULIB_SIGPROCMASK@
 # if !@HAVE_POSIX_SIGNALBLOCKING@
 
-#  ifndef GNULIB_defined_signal_blocking
-#   define GNULIB_defined_signal_blocking 1
-#  endif
-
 /* Maximum signal number + 1.  */
 #  ifndef NSIG
 #   define NSIG 32
 #  endif
 
 /* This code supports only 32 signals.  */
-#  if !GNULIB_defined_verify_NSIG_constraint
-typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1];
-#   define GNULIB_defined_verify_NSIG_constraint 1
-#  endif
+typedef int verify_NSIG_constraint[2 * (NSIG <= 32) - 1];
 
 # endif
 
-/* When also using extern inline, suppress the use of static inline in
-   standard headers of problematic Apple configurations, as Libc at
-   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
-     && (defined __i386__ || defined __x86_64__))
-# undef sigaddset
-# undef sigdelset
-# undef sigemptyset
-# undef sigfillset
-# undef sigismember
-#endif
-
 /* Test whether a given signal is contained in a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigismember
 #  endif
@@ -224,7 +99,7 @@
 
 /* Initialize a signal set to the empty set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigemptyset
 #  endif
@@ -236,7 +111,7 @@
 
 /* Add a signal to a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigaddset
 #  endif
@@ -249,7 +124,7 @@
 
 /* Remove a signal from a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigdelset
 #  endif
@@ -262,7 +137,7 @@
 
 /* Fill a signal set with all possible signals.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigfillset
 #  endif
@@ -300,10 +175,7 @@
 # ifdef __cplusplus
 extern "C" {
 # endif
-# if !GNULIB_defined_function_taking_int_returning_void_t
 typedef void (*_gl_function_taking_int_returning_void_t) (int);
-#  define GNULIB_defined_function_taking_int_returning_void_t 1
-# endif
 # ifdef __cplusplus
 }
 # endif
@@ -321,10 +193,18 @@
 # endif
 _GL_CXXALIASWARN (signal);
 
+/* Raise signal SIG.  */
 # if !@HAVE_POSIX_SIGNALBLOCKING@ && GNULIB_defined_SIGPIPE
-/* Raise signal SIGPIPE.  */
-_GL_EXTERN_C int _gl_raise_SIGPIPE (void);
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef raise
+#   define raise rpl_raise
+#  endif
+_GL_FUNCDECL_RPL (raise, int, (int sig));
+_GL_CXXALIAS_RPL (raise, int, (int sig));
+# else
+_GL_CXXALIAS_SYS (raise, int, (int sig));
 # endif
+_GL_CXXALIASWARN (raise);
 
 #elif defined GNULIB_POSIXCHECK
 # undef sigaddset
@@ -369,9 +249,6 @@
 # if !@HAVE_SIGACTION@
 
 #  if !@HAVE_SIGINFO_T@
-
-#   if !GNULIB_defined_siginfo_types
-
 /* Present to allow compilation, but unsupported by gnulib.  */
 union sigval
 {
@@ -393,17 +270,11 @@
   union sigval si_value;
 };
 typedef struct siginfo_t siginfo_t;
-
-#    define GNULIB_defined_siginfo_types 1
-#   endif
-
 #  endif /* !@HAVE_SIGINFO_T@ */
 
 /* We assume that platforms which lack the sigaction() function also lack
    the 'struct sigaction' type, and vice versa.  */
 
-#  if !GNULIB_defined_struct_sigaction
-
 struct sigaction
 {
   union
@@ -419,15 +290,12 @@
   /* Not all POSIX flags are supported.  */
   int sa_flags;
 };
-#   define sa_handler _sa_func._sa_handler
-#   define sa_sigaction _sa_func._sa_sigaction
+#  define sa_handler _sa_func._sa_handler
+#  define sa_sigaction _sa_func._sa_sigaction
 /* Unsupported flags are not present.  */
-#   define SA_RESETHAND 1
-#   define SA_NODEFER 2
-#   define SA_RESTART 4
-
-#   define GNULIB_defined_struct_sigaction 1
-#  endif
+#  define SA_RESETHAND 1
+#  define SA_NODEFER 2
+#  define SA_RESTART 4
 
 _GL_FUNCDECL_SYS (sigaction, int, (int, const struct sigaction *restrict,
                                    struct sigaction *restrict));
@@ -456,6 +324,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/sigprocmask.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/sigprocmask.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/sigprocmask.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/sigprocmask.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,15 +24,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-# include "msvc-inval.h"
-#endif
-
 /* We assume that a platform without POSIX signal blocking functions
    also does not have the POSIX sigaction() function, only the
    signal() function.  We also assume signal() has SysV semantics,
    where any handler is uninstalled prior to being invoked.  This is
-   true for native Windows platforms.  */
+   true for Woe32 platforms.  */
 
 /* We use raw signal(), but also provide a wrapper rpl_signal() so
    that applications can query or change a blocked signal.  */
@@ -62,28 +58,6 @@
 
 typedef void (*handler_t) (int);
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static handler_t
-signal_nothrow (int sig, handler_t handler)
-{
-  handler_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = signal (sig, handler);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = SIG_ERR;
-      errno = EINVAL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# define signal signal_nothrow
-#endif
-
 /* Handling of gnulib defined signals.  */
 
 #if GNULIB_defined_SIGPIPE
@@ -106,7 +80,6 @@
       return signal (sig, handler);
     }
 }
-# undef signal
 # define signal ext_signal
 #endif
 
@@ -330,20 +303,27 @@
 }
 
 #if GNULIB_defined_SIGPIPE
-/* Raise the signal SIGPIPE.  */
+/* Raise the signal SIG.  */
 int
-_gl_raise_SIGPIPE (void)
+rpl_raise (int sig)
+# undef raise
 {
-  if (blocked_set & (1U << SIGPIPE))
-    pending_array[SIGPIPE] = 1;
-  else
+  switch (sig)
     {
-      handler_t handler = SIGPIPE_handler;
-      if (handler == SIG_DFL)
-        exit (128 + SIGPIPE);
-      else if (handler != SIG_IGN)
-        (*handler) (SIGPIPE);
+    case SIGPIPE:
+      if (blocked_set & (1U << sig))
+        pending_array[sig] = 1;
+      else
+        {
+          handler_t handler = SIGPIPE_handler;
+          if (handler == SIG_DFL)
+            exit (128 + SIGPIPE);
+          else if (handler != SIG_IGN)
+            (*handler) (sig);
+        }
+      return 0;
+    default: /* System defined signal */
+      return raise (sig);
     }
-  return 0;
 }
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stat.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/stat.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stat.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stat.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,59 +16,27 @@
 
 /* written by Eric Blake */
 
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
-   rpl_stat.  */
-#define __need_system_sys_stat_h
 #include <config.h>
 
 /* Get the original definition of stat.  It might be defined as a macro.  */
+#define __need_system_sys_stat_h
 #include <sys/types.h>
 #include <sys/stat.h>
 #undef __need_system_sys_stat_h
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# if _GL_WINDOWS_64_BIT_ST_SIZE
-#  undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-#  define stat _stati64
-#  define REPLACE_FUNC_STAT_DIR 1
-#  undef REPLACE_FUNC_STAT_FILE
-# elif REPLACE_FUNC_STAT_FILE
-/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a.
-   Bypass it.  */
-#  define stat _stat
-#  define REPLACE_FUNC_STAT_DIR 1
-#  undef REPLACE_FUNC_STAT_FILE
-# endif
-#endif
-
-static int
+static inline int
 orig_stat (const char *filename, struct stat *buf)
 {
   return stat (filename, buf);
 }
 
 /* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-#include "sys/stat.h"
+#include <sys/stat.h>
 
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
-#include "dosname.h"
-#include "verify.h"
-
-#if REPLACE_FUNC_STAT_DIR
-# include "pathmax.h"
-  /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
-     have a constant PATH_MAX.  */
-# ifndef PATH_MAX
-#  error "Please port this replacement to your platform"
-# endif
-#endif
 
 /* Store information about NAME into ST.  Work around bugs with
    trailing slashes.  Mingw has other bugs (such as st_ino always
@@ -94,7 +62,6 @@
     }
 #endif /* REPLACE_FUNC_STAT_FILE */
 #if REPLACE_FUNC_STAT_DIR
-
   if (result == -1 && errno == ENOENT)
     {
       /* Due to mingw's oddities, there are some directories (like
@@ -109,7 +76,6 @@
       char fixed_name[PATH_MAX + 1] = {0};
       size_t len = strlen (name);
       bool check_dir = false;
-      verify (PATH_MAX <= 4096);
       if (PATH_MAX <= len)
         errno = ENAMETOOLONG;
       else if (len)
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stdbool.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdbool.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stdbool.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdbool.in.h	2010-04-25 09:20:42.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2010 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
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GL_STDBOOL_H
 #define _GL_STDBOOL_H
@@ -66,19 +67,24 @@
 # undef true
 #endif
 
-#ifdef __cplusplus
-# define _Bool bool
-# define bool bool
-#else
-# if defined __BEOS__ && !defined __HAIKU__
+/* For the sake of symbolic names in gdb, we define true and false as
+   enum constants, not only as macros.
+   It is tempting to write
+      typedef enum { false = 0, true = 1 } _Bool;
+   so that gdb prints values of type 'bool' symbolically. But if we do
+   this, values of type '_Bool' may promote to 'int' or 'unsigned int'
+   (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+   (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+   enum; this ensures that '_Bool' promotes to 'int'.  */
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
   /* A compiler known to have 'bool'.  */
   /* If the compiler already has both 'bool' and '_Bool', we can assume they
      are the same types.  */
-#  if !@HAVE__BOOL@
+# if !@HAVE__BOOL@
 typedef bool _Bool;
-#  endif
-# else
-#  if !defined __GNUC__
+# endif
+#else
+# if !defined __GNUC__
    /* If @HAVE__BOOL@:
         Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
         the built-in _Bool type is used.  See
@@ -98,35 +104,19 @@
           "Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
         The only benefit of the enum, debuggability, is not important
         with these compilers.  So use 'signed char' and no enum.  */
-#   define _Bool signed char
-#  else
+#  define _Bool signed char
+# else
    /* With this compiler, trust the _Bool type if the compiler has it.  */
-#   if !@HAVE__BOOL@
-   /* For the sake of symbolic names in gdb, define true and false as
-      enum constants, not only as macros.
-      It is tempting to write
-         typedef enum { false = 0, true = 1 } _Bool;
-      so that gdb prints values of type 'bool' symbolically.  But then
-      values of type '_Bool' might promote to 'int' or 'unsigned int'
-      (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
-      (see ISO C 99 6.3.1.1.(2)).  So add a negative value to the
-      enum; this ensures that '_Bool' promotes to 'int'.  */
+#  if !@HAVE__BOOL@
 typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
-#   endif
 #  endif
 # endif
-# define bool _Bool
 #endif
+#define bool _Bool
 
 /* The other macros must be usable in preprocessor directives.  */
-#ifdef __cplusplus
-# define false false
-# define true true
-#else
-# define false 0
-# define true 1
-#endif
-
+#define false 0
+#define true 1
 #define __bool_true_false_are_defined 1
 
 #endif /* _GL_STDBOOL_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stddef.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stddef.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stddef.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stddef.in.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake.  */
 
@@ -25,7 +26,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_wchar_t || defined __need_size_t  \
   || defined __need_ptrdiff_t || defined __need_NULL \
@@ -37,9 +37,9 @@
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   undef _@GUARD_PREFIX@_STDDEF_H
+#   undef _GL_STDDEF_H
 #   define _GL_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -48,14 +48,14 @@
 #else
 /* Normal invocation convention.  */
 
-# ifndef _@GUARD_PREFIX@_STDDEF_H
+# ifndef _GL_STDDEF_H
 
 /* The include_next requires a split double-inclusion guard.  */
 
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
 
-#  ifndef _@GUARD_PREFIX@_STDDEF_H
-#   define _@GUARD_PREFIX@_STDDEF_H
+#  ifndef _GL_STDDEF_H
+#   define _GL_STDDEF_H
 
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
 #if @REPLACE_NULL@
@@ -81,6 +81,6 @@
 # define wchar_t int
 #endif
 
-#  endif /* _@GUARD_PREFIX@_STDDEF_H */
-# endif /* _@GUARD_PREFIX@_STDDEF_H */
+#  endif /* _GL_STDDEF_H */
+# endif /* _GL_STDDEF_H */
 #endif /* __need_XXX */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stdint.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stdint.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h	2010-04-25 09:20:42.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -13,19 +13,19 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
  * ISO C 99 <stdint.h> for platforms that lack it.
  * <http://www.opengroup.org/susv3xbd/stdint.h.html>
  */
 
-#ifndef _@GUARD_PREFIX@_STDINT_H
+#ifndef _GL_STDINT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* When including a system file that in turn includes <inttypes.h>,
    use the system <inttypes.h>, not our substitute.  This avoids
@@ -33,15 +33,6 @@
    <inttypes.h>.  */
 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
-/* On Android (Bionic libc), <sys/types.h> includes this file before
-   having defined 'time_t'.  Therefore in this case avoid including
-   other system header files; just include the system's <stdint.h>.
-   Ideally we should test __BIONIC__ here, but it is only defined after
-   <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
-#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H
-# @INCLUDE_NEXT@ @NEXT_STDINT_H@
-#else
-
 /* Get those types that are already defined in other system include
    files, so that we can "#define int8_t signed char" below without
    worrying about a later system include file containing a "typedef
@@ -57,40 +48,28 @@
       diagnostics.  */
 #  define __STDINT_H__
 # endif
-
-  /* Some pre-C++11 <stdint.h> implementations need this.  */
-# ifdef __cplusplus
-#  ifndef __STDC_CONSTANT_MACROS
-#   define __STDC_CONSTANT_MACROS 1
-#  endif
-#  ifndef __STDC_LIMIT_MACROS
-#   define __STDC_LIMIT_MACROS 1
-#  endif
-# endif
-
   /* Other systems may have an incomplete or buggy <stdint.h>.
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
-     _@GUARD_PREFIX@_STDINT_H is defined.
+     _GL_STDINT_H is defined.
      The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #endif
 
-#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-#define _@GUARD_PREFIX@_STDINT_H
+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_STDINT_H
 
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
    AIX 5.2 <sys/types.h> isn't needed and causes troubles.
-   Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @NEXT_STDINT_H@.  */
 #if @HAVE_SYS_TYPES_H@ && ! defined _AIX
 # include <sys/types.h>
 #endif
 
-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
-   LONG_MIN, LONG_MAX, ULONG_MAX.  */
+/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 
 #if @HAVE_INTTYPES_H@
@@ -113,7 +92,7 @@
 
 #undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
-/* Minimum and maximum values for an integer type under the usual assumption.
+/* Minimum and maximum values for a integer type under the usual assumption.
    Return an unspecified value if BITS == 0, adding a check to pacify
    picky compilers.  */
 
@@ -128,8 +107,6 @@
         warnings in the signed case.  */ \
      ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
-#if !GNULIB_defined_stdint_types
-
 /* 7.18.1.1. Exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -156,54 +133,40 @@
 #define int32_t gl_int32_t
 #define uint32_t gl_uint32_t
 
-/* If the system defines INT64_MAX, assume int64_t works.  That way,
-   if the underlying platform defines int64_t to be a 64-bit long long
-   int, the code below won't mistakenly define it to be a 64-bit long
-   int, which would mess up C++ name mangling.  We must use #ifdef
-   rather than #if, to avoid an error with HP-UX 10.20 cc.  */
-
-#ifdef INT64_MAX
-# define GL_INT64_T
-#else
 /* Do not undefine int64_t if gnulib is not being used with 64-bit
    types, since otherwise it breaks platforms like Tandem/NSK.  */
-# if LONG_MAX >> 31 >> 31 == 1
-#  undef int64_t
+#if LONG_MAX >> 31 >> 31 == 1
+# undef int64_t
 typedef long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif defined _MSC_VER
-#  undef int64_t
+# define int64_t gl_int64_t
+# define GL_INT64_T
+#elif defined _MSC_VER
+# undef int64_t
 typedef __int64 gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif @HAVE_LONG_LONG_INT@
-#  undef int64_t
+# define int64_t gl_int64_t
+# define GL_INT64_T
+#elif @HAVE_LONG_LONG_INT@
+# undef int64_t
 typedef long long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# endif
+# define int64_t gl_int64_t
+# define GL_INT64_T
 #endif
 
-#ifdef UINT64_MAX
-# define GL_UINT64_T
-#else
-# if ULONG_MAX >> 31 >> 31 >> 1 == 1
-#  undef uint64_t
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# undef uint64_t
 typedef unsigned long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif defined _MSC_VER
-#  undef uint64_t
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+#elif defined _MSC_VER
+# undef uint64_t
 typedef unsigned __int64 gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@
-#  undef uint64_t
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# undef uint64_t
 typedef unsigned long long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# endif
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
 #endif
 
 /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
@@ -246,9 +209,8 @@
 
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-   are taken from the same list of types.  The following code normally
-   uses types consistent with glibc, as that lessens the chance of
-   incompatibility with older GNU hosts.  */
+   are taken from the same list of types.  Assume that 'long int'
+   is fast enough for all narrower integers.  */
 
 #undef int_fast8_t
 #undef uint_fast8_t
@@ -258,21 +220,12 @@
 #undef uint_fast32_t
 #undef int_fast64_t
 #undef uint_fast64_t
-typedef signed char gl_int_fast8_t;
-typedef unsigned char gl_uint_fast8_t;
-
-#ifdef __sun
-/* Define types compatible with SunOS 5.10, so that code compiled under
-   earlier SunOS versions works with code compiled under SunOS 5.10.  */
-typedef int gl_int_fast32_t;
-typedef unsigned int gl_uint_fast32_t;
-#else
+typedef long int gl_int_fast8_t;
+typedef unsigned long int gl_uint_fast8_t;
+typedef long int gl_int_fast16_t;
+typedef unsigned long int gl_uint_fast16_t;
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
-#endif
-typedef gl_int_fast32_t gl_int_fast16_t;
-typedef gl_uint_fast32_t gl_uint_fast16_t;
-
 #define int_fast8_t gl_int_fast8_t
 #define uint_fast8_t gl_uint_fast8_t
 #define int_fast16_t gl_int_fast16_t
@@ -300,49 +253,37 @@
 /* Note: These types are compiler dependent. It may be unwise to use them in
    public header files. */
 
-/* If the system defines INTMAX_MAX, assume that intmax_t works, and
-   similarly for UINTMAX_MAX and uintmax_t.  This avoids problems with
-   assuming one type where another is used by the system.  */
-
-#ifndef INTMAX_MAX
-# undef INTMAX_C
-# undef intmax_t
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#undef intmax_t
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 typedef long long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# elif defined GL_INT64_T
-#  define intmax_t int64_t
-# else
+# define intmax_t gl_intmax_t
+#elif defined GL_INT64_T
+# define intmax_t int64_t
+#else
 typedef long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# endif
+# define intmax_t gl_intmax_t
 #endif
 
-#ifndef UINTMAX_MAX
-# undef UINTMAX_C
-# undef uintmax_t
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#undef uintmax_t
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 typedef unsigned long long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# elif defined GL_UINT64_T
-#  define uintmax_t uint64_t
-# else
+# define uintmax_t gl_uintmax_t
+#elif defined GL_UINT64_T
+# define uintmax_t uint64_t
+#else
 typedef unsigned long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# endif
+# define uintmax_t gl_uintmax_t
 #endif
 
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
    breaks if this is not the case.  If this check fails, the reason is likely
    to be found in the autoconf macros.  */
-typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
-                                ? 1 : -1];
-
-#define GNULIB_defined_stdint_types 1
-#endif /* !GNULIB_defined_stdint_types */
+typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
 
 /* 7.18.2. Limits of specified-width integer types */
 
+#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
+
 /* 7.18.2.1. Limits of exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -369,14 +310,17 @@
 #define INT32_MAX  2147483647
 #define UINT32_MAX  4294967295U
 
-#if defined GL_INT64_T && ! defined INT64_MAX
+#undef INT64_MIN
+#undef INT64_MAX
+#ifdef GL_INT64_T
 /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
    evaluates the latter incorrectly in preprocessor expressions.  */
 # define INT64_MIN  (- INTMAX_C (1) << 63)
 # define INT64_MAX  INTMAX_C (9223372036854775807)
 #endif
 
-#if defined GL_UINT64_T && ! defined UINT64_MAX
+#undef UINT64_MAX
+#ifdef GL_UINT64_T
 # define UINT64_MAX  UINTMAX_C (18446744073709551615)
 #endif
 
@@ -428,29 +372,23 @@
 #undef INT_FAST8_MIN
 #undef INT_FAST8_MAX
 #undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  SCHAR_MIN
-#define INT_FAST8_MAX  SCHAR_MAX
-#define UINT_FAST8_MAX  UCHAR_MAX
+#define INT_FAST8_MIN  LONG_MIN
+#define INT_FAST8_MAX  LONG_MAX
+#define UINT_FAST8_MAX  ULONG_MAX
 
 #undef INT_FAST16_MIN
 #undef INT_FAST16_MAX
 #undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  INT_FAST32_MIN
-#define INT_FAST16_MAX  INT_FAST32_MAX
-#define UINT_FAST16_MAX  UINT_FAST32_MAX
+#define INT_FAST16_MIN  LONG_MIN
+#define INT_FAST16_MAX  LONG_MAX
+#define UINT_FAST16_MAX  ULONG_MAX
 
 #undef INT_FAST32_MIN
 #undef INT_FAST32_MAX
 #undef UINT_FAST32_MAX
-#ifdef __sun
-# define INT_FAST32_MIN  INT_MIN
-# define INT_FAST32_MAX  INT_MAX
-# define UINT_FAST32_MAX  UINT_MAX
-#else
-# define INT_FAST32_MIN  LONG_MIN
-# define INT_FAST32_MAX  LONG_MAX
-# define UINT_FAST32_MAX  ULONG_MAX
-#endif
+#define INT_FAST32_MIN  LONG_MIN
+#define INT_FAST32_MAX  LONG_MAX
+#define UINT_FAST32_MAX  ULONG_MAX
 
 #undef INT_FAST64_MIN
 #undef INT_FAST64_MAX
@@ -475,23 +413,21 @@
 
 /* 7.18.2.5. Limits of greatest-width integer types */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_MIN
-# ifdef INT64_MAX
-#  define INTMAX_MIN  INT64_MIN
-#  define INTMAX_MAX  INT64_MAX
-# else
-#  define INTMAX_MIN  INT32_MIN
-#  define INTMAX_MAX  INT32_MAX
-# endif
+#undef INTMAX_MIN
+#undef INTMAX_MAX
+#ifdef INT64_MAX
+# define INTMAX_MIN  INT64_MIN
+# define INTMAX_MAX  INT64_MAX
+#else
+# define INTMAX_MIN  INT32_MIN
+# define INTMAX_MAX  INT32_MAX
 #endif
 
-#ifndef UINTMAX_MAX
-# ifdef UINT64_MAX
-#  define UINTMAX_MAX  UINT64_MAX
-# else
-#  define UINTMAX_MAX  UINT32_MAX
-# endif
+#undef UINTMAX_MAX
+#ifdef UINT64_MAX
+# define UINTMAX_MAX  UINT64_MAX
+#else
+# define UINTMAX_MAX  UINT32_MAX
 #endif
 
 /* 7.18.3. Limits of other integer types */
@@ -539,16 +475,10 @@
 
 /* wchar_t limits */
 /* Get WCHAR_MIN, WCHAR_MAX.
-   This include is not on the top, above, because on OSF/1 4.0 we have a
-   sequence of nested includes
-   <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+   This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested
+   includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
    <stdint.h> and assumes its types are already defined.  */
-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
-  /* 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 <stdio.h>
-# include <time.h>
+#if ! (defined WCHAR_MIN && defined WCHAR_MAX)
 # define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
 # include <wchar.h>
 # undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
@@ -568,8 +498,12 @@
 #define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
+#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
+
 /* 7.18.4. Macros for integer constants */
 
+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+
 /* 7.18.4.1. Macros for minimum-width integer constants */
 /* According to ISO C 99 Technical Corrigendum 1 */
 
@@ -610,26 +544,25 @@
 
 /* 7.18.4.2. Macros for greatest-width integer constants */
 
-#ifndef INTMAX_C
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define INTMAX_C(x)   x##LL
-# elif defined GL_INT64_T
-#  define INTMAX_C(x)   INT64_C(x)
-# else
-#  define INTMAX_C(x)   x##L
-# endif
+#undef INTMAX_C
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# define INTMAX_C(x)   x##LL
+#elif defined GL_INT64_T
+# define INTMAX_C(x)   INT64_C(x)
+#else
+# define INTMAX_C(x)   x##L
 #endif
 
-#ifndef UINTMAX_C
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define UINTMAX_C(x)  x##ULL
-# elif defined GL_UINT64_T
-#  define UINTMAX_C(x)  UINT64_C(x)
-# else
-#  define UINTMAX_C(x)  x##UL
-# endif
+#undef UINTMAX_C
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# define UINTMAX_C(x)  x##ULL
+#elif defined GL_UINT64_T
+# define UINTMAX_C(x)  UINT64_C(x)
+#else
+# define UINTMAX_C(x)  x##UL
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDINT_H */
-#endif /* !(defined __ANDROID__ && ...) */
-#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
+#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
+
+#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stdio.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2010-05-17 19:56:12.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,104 +13,47 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_FILE || defined __need___FILE || defined _GL_ALREADY_INCLUDING_STDIO_H
-/* Special invocation convention:
-   - Inside glibc header files.
-   - On OSF/1 5.1 we have a sequence of nested includes
-     <stdio.h> -> <getopt.h> -> <ctype.h> -> <sys/localedef.h> ->
-     <sys/lc_core.h> -> <nl_types.h> -> <mesg.h> -> <stdio.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
+#if defined __need_FILE || defined __need___FILE
+/* Special invocation convention inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_STDIO_H
-
-#define _GL_ALREADY_INCLUDING_STDIO_H
+#ifndef _GL_STDIO_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
-#undef _GL_ALREADY_INCLUDING_STDIO_H
-
-#ifndef _@GUARD_PREFIX@_STDIO_H
-#define _@GUARD_PREFIX@_STDIO_H
+#ifndef _GL_STDIO_H
+#define _GL_STDIO_H
 
 /* Get va_list.  Needed on many systems, including glibc 2.8.  */
 #include <stdarg.h>
 
 #include <stddef.h>
 
-/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
-   and eglibc 2.11.2.
-   May also define off_t to a 64-bit type on native Windows.  */
+/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8.  */
 #include <sys/types.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_PRINTF
-   indicates to GCC that the function takes a format string and arguments,
-   where the format string directives are the ones standardized by ISO C99
-   and POSIX.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
-#else
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF,
-   except that it indicates to GCC that the supported format string directives
-   are the ones of the system printf(), rather than the ones standardized by
-   ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \
-  _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-
-/* _GL_ATTRIBUTE_FORMAT_SCANF
-   indicates to GCC that the function takes a format string and arguments,
-   where the format string directives are the ones standardized by ISO C99
-   and POSIX.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__gnu_scanf__, formatstring_parameter, first_argument))
-#else
-# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_SCANF,
-   except that it indicates to GCC that the supported format string directives
-   are the ones of the system scanf(), rather than the ones standardized by
-   ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter, first_argument) \
-  _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
-
-/* Solaris 10 declares renameat in <unistd.h>, not in <stdio.h>.  */
-/* But in any case avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \
-    && ! defined __GLIBC__
-# include <unistd.h>
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 
@@ -124,15 +67,6 @@
 #define _GL_STDIO_STRINGIZE(token) #token
 #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token)
 
-/* When also using extern inline, suppress the use of static inline in
-   standard headers of problematic Apple configurations, as Libc at
-   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
-     && defined __GNUC__ && defined __STDC__)
-# undef putc_unlocked
-#endif
 
 #if @GNULIB_DPRINTF@
 # if @REPLACE_DPRINTF@
@@ -140,13 +74,13 @@
 #   define dprintf rpl_dprintf
 #  endif
 _GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...));
 # else
 #  if !@HAVE_DPRINTF@
 _GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...));
@@ -179,26 +113,6 @@
                  "use gnulib module fclose for portable POSIX compliance");
 #endif
 
-#if @GNULIB_FDOPEN@
-# if @REPLACE_FDOPEN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fdopen
-#   define fdopen rpl_fdopen
-#  endif
-_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode)
-                                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
-# else
-_GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
-# endif
-_GL_CXXALIASWARN (fdopen);
-#elif defined GNULIB_POSIXCHECK
-# undef fdopen
-/* Assume fdopen is always declared.  */
-_GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - "
-                 "use gnulib module fdopen for portability");
-#endif
-
 #if @GNULIB_FFLUSH@
 /* Flush all pending data on STREAM according to POSIX rules.  Both
    output and seekable input streams are supported.
@@ -223,34 +137,11 @@
                  "use gnulib module fflush for portable POSIX compliance");
 #endif
 
-#if @GNULIB_FGETC@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fgetc
-#   define fgetc rpl_fgetc
-#  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (fgetc, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fgetc, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (fgetc);
-#endif
-
-#if @GNULIB_FGETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fgets
-#   define fgets rpl_fgets
-#  endif
-_GL_FUNCDECL_RPL (fgets, char *, (char *s, int n, FILE *stream)
-                                 _GL_ARG_NONNULL ((1, 3)));
-_GL_CXXALIAS_RPL (fgets, char *, (char *s, int n, FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fgets, char *, (char *s, int n, FILE *stream));
-# endif
-_GL_CXXALIASWARN (fgets);
-#endif
+/* It is very rare that the developer ever has full control of stdin,
+   so any use of gets warrants an unconditional warning.  Assume it is
+   always declared, since it is required by C89.  */
+#undef gets
+_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 
 #if @GNULIB_FOPEN@
 # if @REPLACE_FOPEN@
@@ -268,26 +159,20 @@
 #elif defined GNULIB_POSIXCHECK
 # undef fopen
 /* Assume fopen is always declared.  */
-_GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - "
+_GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - "
                  "use gnulib module fopen for portability");
 #endif
 
 #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@
 # if (@GNULIB_FPRINTF_POSIX@ && @REPLACE_FPRINTF@) \
-     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fprintf rpl_fprintf
 #  endif
 #  define GNULIB_overrides_fprintf 1
-#  if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((1, 2)));
-#  else
-_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3)
-                                _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...));
 # else
 _GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...));
@@ -333,7 +218,7 @@
 #endif
 
 #if @GNULIB_FPUTC@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fputc
 #   define fputc rpl_fputc
@@ -347,7 +232,7 @@
 #endif
 
 #if @GNULIB_FPUTS@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fputs
 #   define fputs rpl_fputs
@@ -361,21 +246,6 @@
 _GL_CXXALIASWARN (fputs);
 #endif
 
-#if @GNULIB_FREAD@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fread
-#   define fread rpl_fread
-#  endif
-_GL_FUNCDECL_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream)
-                                 _GL_ARG_NONNULL ((4)));
-_GL_CXXALIAS_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream));
-# endif
-_GL_CXXALIASWARN (fread);
-#endif
-
 #if @GNULIB_FREOPEN@
 # if @REPLACE_FREOPEN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -395,27 +265,10 @@
 #elif defined GNULIB_POSIXCHECK
 # undef freopen
 /* Assume freopen is always declared.  */
-_GL_WARN_ON_USE (freopen,
-                 "freopen on native Windows platforms is not POSIX compliant - "
+_GL_WARN_ON_USE (freopen, "freopen on Win32 platforms is not POSIX compatible - "
                  "use gnulib module freopen for portability");
 #endif
 
-#if @GNULIB_FSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fscanf
-#   define fscanf rpl_fscanf
-#  endif
-_GL_FUNCDECL_RPL (fscanf, int, (FILE *stream, const char *format, ...)
-                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3)
-                               _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (fscanf, int, (FILE *stream, const char *format, ...));
-# else
-_GL_CXXALIAS_SYS (fscanf, int, (FILE *stream, const char *format, ...));
-# endif
-_GL_CXXALIASWARN (fscanf);
-#endif
-
 
 /* Set up the following warnings, based on which modules are in use.
    GNU Coding Standards discourage the use of fseek, since it imposes
@@ -483,13 +336,29 @@
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
 # else
-#  if ! @HAVE_DECL_FSEEKO@
+#  if ! @HAVE_FSEEKO@
 _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
                                _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
 # endif
 _GL_CXXALIASWARN (fseeko);
+# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@
+   /* Provide an fseek function that is consistent with fseeko.  */
+   /* In order to avoid that fseek gets defined as a macro here, the
+      developer can request the 'fseek' module.  */
+#  undef fseek
+#  define fseek rpl_fseek
+static inline int _GL_ARG_NONNULL ((1))
+rpl_fseek (FILE *fp, long offset, int whence)
+{
+#  if @REPLACE_FSEEKO@
+  return rpl_fseeko (fp, offset, whence);
+#  else
+  return fseeko (fp, offset, whence);
+#  endif
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FSEEK_WARN /* Category 1, above.  */
 # undef fseek
@@ -543,12 +412,28 @@
 _GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp));
 # else
-#  if ! @HAVE_DECL_FTELLO@
+#  if ! @HAVE_FTELLO@
 _GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
 # endif
 _GL_CXXALIASWARN (ftello);
+# if (@REPLACE_FTELLO@ || !@HAVE_FTELLO@) && !@GNULIB_FTELL@
+   /* Provide an ftell function that is consistent with ftello.  */
+   /* In order to avoid that ftell gets defined as a macro here, the
+      developer can request the 'ftell' module.  */
+#  undef ftell
+#  define ftell rpl_ftell
+static inline long _GL_ARG_NONNULL ((1))
+rpl_ftell (FILE *f)
+{
+#  if @REPLACE_FTELLO@
+  return rpl_ftello (f);
+#  else
+  return ftello (f);
+#  endif
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FTELL_WARN /* Category 1, above.  */
 # undef ftell
@@ -570,7 +455,7 @@
 
 
 #if @GNULIB_FWRITE@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fwrite
 #   define fwrite rpl_fwrite
@@ -583,61 +468,10 @@
 # else
 _GL_CXXALIAS_SYS (fwrite, size_t,
                   (const void *ptr, size_t s, size_t n, FILE *stream));
-
-/* Work around bug 11959 when fortifying glibc 2.4 through 2.15
-   <http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
-   which sometimes causes an unwanted diagnostic for fwrite calls.
-   This affects only function declaration attributes under certain
-   versions of gcc and clang, and is not needed for C++.  */
-#  if (0 < __USE_FORTIFY_LEVEL                                          \
-       && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
-       && 3 < __GNUC__ + (4 <= __GNUC_MINOR__)                          \
-       && !defined __cplusplus)
-#   undef fwrite
-#   undef fwrite_unlocked
-extern size_t __REDIRECT (rpl_fwrite,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite);
-extern size_t __REDIRECT (rpl_fwrite_unlocked,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite_unlocked);
-#   define fwrite rpl_fwrite
-#   define fwrite_unlocked rpl_fwrite_unlocked
-#  endif
 # endif
 _GL_CXXALIASWARN (fwrite);
 #endif
 
-#if @GNULIB_GETC@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getc
-#   define getc rpl_fgetc
-#  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (getc, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (getc);
-#endif
-
-#if @GNULIB_GETCHAR@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getchar
-#   define getchar rpl_getchar
-#  endif
-_GL_FUNCDECL_RPL (getchar, int, (void));
-_GL_CXXALIAS_RPL (getchar, int, (void));
-# else
-_GL_CXXALIAS_SYS (getchar, int, (void));
-# endif
-_GL_CXXALIASWARN (getchar);
-#endif
-
 #if @GNULIB_GETDELIM@
 /* Read input, up to (and including) the next occurrence of DELIMITER, from
    STREAM, store it in *LINEPTR (and NUL-terminate it).
@@ -714,15 +548,6 @@
 # endif
 #endif
 
-/* It is very rare that the developer ever has full control of stdin,
-   so any use of gets warrants an unconditional warning; besides, C11
-   removed it.  */
-#undef gets
-#if HAVE_RAW_DECL_GETS
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-#endif
-
-
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
 struct obstack;
 /* Grow an obstack with formatted output.  Return the number of
@@ -736,7 +561,7 @@
 #  endif
 _GL_FUNCDECL_RPL (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...));
@@ -744,7 +569,7 @@
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (obstack_printf, int,
@@ -757,7 +582,7 @@
 #  endif
 _GL_FUNCDECL_RPL (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args));
@@ -765,7 +590,7 @@
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (obstack_vprintf, int,
@@ -774,20 +599,6 @@
 _GL_CXXALIASWARN (obstack_vprintf);
 #endif
 
-#if @GNULIB_PCLOSE@
-# if !@HAVE_PCLOSE@
-_GL_FUNCDECL_SYS (pclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (pclose, int, (FILE *stream));
-_GL_CXXALIASWARN (pclose);
-#elif defined GNULIB_POSIXCHECK
-# undef pclose
-# if HAVE_RAW_DECL_PCLOSE
-_GL_WARN_ON_USE (pclose, "pclose is unportable - "
-                 "use gnulib module pclose for more portability");
-# endif
-#endif
-
 #if @GNULIB_PERROR@
 /* Print a message to standard error, describing the value of ERRNO,
    (if STRING is not NULL and not empty) prefixed with STRING and ": ",
@@ -819,10 +630,6 @@
                                  _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
 # else
-#  if !@HAVE_POPEN@
-_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode)
-                                 _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
 # endif
 _GL_CXXALIASWARN (popen);
@@ -836,37 +643,25 @@
 
 #if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@
 # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
-     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if defined __GNUC__
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 /* Don't break __attribute__((format(printf,M,N))).  */
 #    define printf __printf__
 #   endif
-#   if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL_1 (__printf__, int,
-                    (const char *format, ...)
-                    __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
-                    _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
-                    _GL_ARG_NONNULL ((1)));
-#   else
 _GL_FUNCDECL_RPL_1 (__printf__, int,
                     (const char *format, ...)
                     __asm__ (@ASM_SYMBOL_PREFIX@
                              _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
-                    _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2)
+                    __attribute__ ((__format__ (__printf__, 1, 2)))
                     _GL_ARG_NONNULL ((1)));
-#   endif
 _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...));
 #  else
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define printf rpl_printf
-#   endif
 _GL_FUNCDECL_RPL (printf, int,
                   (const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+                  __attribute__ ((__format__ (__printf__, 1, 2)))
                   _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (printf, int, (const char *format, ...));
+_GL_CXXALIAS_RPL (printf, printf, int, (const char *format, ...));
 #  endif
 #  define GNULIB_overrides_printf 1
 # else
@@ -885,7 +680,7 @@
 #endif
 
 #if @GNULIB_PUTC@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef putc
 #   define putc rpl_fputc
@@ -899,7 +694,7 @@
 #endif
 
 #if @GNULIB_PUTCHAR@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef putchar
 #   define putchar rpl_putchar
@@ -913,7 +708,7 @@
 #endif
 
 #if @GNULIB_PUTS@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef puts
 #   define puts rpl_puts
@@ -997,37 +792,6 @@
 # endif
 #endif
 
-#if @GNULIB_SCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if defined __GNUC__
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef scanf
-/* Don't break __attribute__((format(scanf,M,N))).  */
-#    define scanf __scanf__
-#   endif
-_GL_FUNCDECL_RPL_1 (__scanf__, int,
-                    (const char *format, ...)
-                    __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf))
-                    _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *format, ...));
-#  else
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef scanf
-#    define scanf rpl_scanf
-#   endif
-_GL_FUNCDECL_RPL (scanf, int, (const char *format, ...)
-                              _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                              _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (scanf, int, (const char *format, ...));
-#  endif
-# else
-_GL_CXXALIAS_SYS (scanf, int, (const char *format, ...));
-# endif
-_GL_CXXALIASWARN (scanf);
-#endif
-
 #if @GNULIB_SNPRINTF@
 # if @REPLACE_SNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1035,7 +799,7 @@
 #  endif
 _GL_FUNCDECL_RPL (snprintf, int,
                   (char *str, size_t size, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  __attribute__ ((__format__ (__printf__, 3, 4)))
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (snprintf, int,
                   (char *str, size_t size, const char *format, ...));
@@ -1043,7 +807,7 @@
 #  if !@HAVE_DECL_SNPRINTF@
 _GL_FUNCDECL_SYS (snprintf, int,
                   (char *str, size_t size, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  __attribute__ ((__format__ (__printf__, 3, 4)))
                   _GL_ARG_NONNULL ((3)));
 #  endif
 _GL_CXXALIAS_SYS (snprintf, int,
@@ -1058,9 +822,9 @@
 # endif
 #endif
 
-/* Some people would argue that all sprintf uses should be warned about
-   (for example, OpenBSD issues a link warning for it),
-   since it can cause security holes due to buffer overruns.
+/* Some people would argue that sprintf should be handled like gets
+   (for example, OpenBSD issues a link warning for both functions),
+   since both can cause security holes due to buffer overruns.
    However, we believe that sprintf can be used safely, and is more
    efficient than snprintf in those safe cases; and as proof of our
    belief, we use sprintf in several gnulib modules.  So this header
@@ -1073,7 +837,7 @@
 #   define sprintf rpl_sprintf
 #  endif
 _GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...));
 # else
@@ -1118,7 +882,7 @@
 #  endif
 _GL_FUNCDECL_RPL (asprintf, int,
                   (char **result, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (asprintf, int,
                   (char **result, const char *format, ...));
@@ -1126,7 +890,7 @@
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (asprintf, int,
                   (char **result, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (asprintf, int,
@@ -1139,7 +903,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args));
@@ -1147,7 +911,7 @@
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (vasprintf, int,
                   (char **result, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (vasprintf, int,
@@ -1162,13 +926,13 @@
 #   define vdprintf rpl_vdprintf
 #  endif
 _GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args));
 # else
 #  if !@HAVE_VDPRINTF@
 _GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((2)));
 #  endif
 /* Need to cast, because on Solaris, the third parameter will likely be
@@ -1187,20 +951,14 @@
 
 #if @GNULIB_VFPRINTF_POSIX@ || @GNULIB_VFPRINTF@
 # if (@GNULIB_VFPRINTF_POSIX@ && @REPLACE_VFPRINTF@) \
-     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vfprintf rpl_vfprintf
 #  endif
 #  define GNULIB_overrides_vfprintf 1
-#  if @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
-                                 _GL_ARG_NONNULL ((1, 2)));
-#  else
 _GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args));
 # else
 /* Need to cast, because on Solaris, the third parameter is
@@ -1221,41 +979,16 @@
                       "POSIX compliance");
 #endif
 
-#if @GNULIB_VFSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef vfscanf
-#   define vfscanf rpl_vfscanf
-#  endif
-_GL_FUNCDECL_RPL (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0)
-                  _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args));
-# else
-_GL_CXXALIAS_SYS (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args));
-# endif
-_GL_CXXALIASWARN (vfscanf);
-#endif
-
 #if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@
 # if (@GNULIB_VPRINTF_POSIX@ && @REPLACE_VPRINTF@) \
-     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vprintf rpl_vprintf
 #  endif
 #  define GNULIB_overrides_vprintf 1
-#  if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0)
+                                __attribute__ ((__format__ (__printf__, 1, 0)))
                                 _GL_ARG_NONNULL ((1)));
-#  else
-_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0)
-                                _GL_ARG_NONNULL ((1)));
-#  endif
 _GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args));
 # else
 /* Need to cast, because on Solaris, the second parameter is
@@ -1275,22 +1008,6 @@
                  "POSIX compliance");
 #endif
 
-#if @GNULIB_VSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef vscanf
-#   define vscanf rpl_vscanf
-#  endif
-_GL_FUNCDECL_RPL (vscanf, int, (const char *format, va_list args)
-                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0)
-                               _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (vscanf, int, (const char *format, va_list args));
-# else
-_GL_CXXALIAS_SYS (vscanf, int, (const char *format, va_list args));
-# endif
-_GL_CXXALIASWARN (vscanf);
-#endif
-
 #if @GNULIB_VSNPRINTF@
 # if @REPLACE_VSNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1298,7 +1015,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  __attribute__ ((__format__ (__printf__, 3, 0)))
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args));
@@ -1306,7 +1023,7 @@
 #  if !@HAVE_DECL_VSNPRINTF@
 _GL_FUNCDECL_SYS (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  __attribute__ ((__format__ (__printf__, 3, 0)))
                   _GL_ARG_NONNULL ((3)));
 #  endif
 _GL_CXXALIAS_SYS (vsnprintf, int,
@@ -1328,7 +1045,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vsprintf, int,
                   (char *str, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vsprintf, int,
                   (char *str, const char *format, va_list args));
@@ -1348,6 +1065,7 @@
                       "POSIX compliance");
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDIO_H */
-#endif /* _@GUARD_PREFIX@_STDIO_H */
+
+#endif /* _GL_STDIO_H */
+#endif /* _GL_STDIO_H */
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stdio-write.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio-write.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stdio-write.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio-write.c	2010-05-17 19:56:12.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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,9 +20,8 @@
 /* Specification.  */
 #include <stdio.h>
 
-/* Replace these functions only if module 'nonblocking' or module 'sigpipe' is
-   requested.  */
-#if GNULIB_NONBLOCKING || GNULIB_SIGPIPE
+/* Replace these functions only if module 'sigpipe' is requested.  */
+#if GNULIB_SIGPIPE
 
 /* On native Windows platforms, SIGPIPE does not exist.  When write() is
    called on a pipe with no readers, WriteFile() fails with error
@@ -39,75 +38,26 @@
 #  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 #  include <windows.h>
 
-#  include "msvc-nothrow.h"
-
-#  if GNULIB_NONBLOCKING
-#   define CLEAR_ERRNO \
-      errno = 0;
-#   define HANDLE_ENOSPC \
-          if (errno == ENOSPC && ferror (stream))                             \
-            {                                                                 \
-              int fd = fileno (stream);                                       \
-              if (fd >= 0)                                                    \
-                {                                                             \
-                  HANDLE h = (HANDLE) _get_osfhandle (fd);                    \
-                  if (GetFileType (h) == FILE_TYPE_PIPE)                      \
-                    {                                                         \
-                      /* h is a pipe or socket.  */                           \
-                      DWORD state;                                            \
-                      if (GetNamedPipeHandleState (h, &state, NULL, NULL,     \
-                                                   NULL, NULL, 0)             \
-                          && (state & PIPE_NOWAIT) != 0)                      \
-                        /* h is a pipe in non-blocking mode.                  \
-                           Change errno from ENOSPC to EAGAIN.  */            \
-                        errno = EAGAIN;                                       \
-                    }                                                         \
-                }                                                             \
-            }                                                                 \
-          else
-#  else
-#   define CLEAR_ERRNO
-#   define HANDLE_ENOSPC
-#  endif
-
-#  if GNULIB_SIGPIPE
-#   define CLEAR_LastError \
-      SetLastError (0);
-#   define HANDLE_ERROR_NO_DATA \
-          if (GetLastError () == ERROR_NO_DATA && ferror (stream))            \
-            {                                                                 \
-              int fd = fileno (stream);                                       \
-              if (fd >= 0                                                     \
-                  && GetFileType ((HANDLE) _get_osfhandle (fd))               \
-                     == FILE_TYPE_PIPE)                                       \
-                {                                                             \
-                  /* Try to raise signal SIGPIPE.  */                         \
-                  raise (SIGPIPE);                                            \
-                  /* If it is currently blocked or ignored, change errno from \
-                     EINVAL to EPIPE.  */                                     \
-                  errno = EPIPE;                                              \
-                }                                                             \
-            }                                                                 \
-          else
-#  else
-#   define CLEAR_LastError
-#   define HANDLE_ERROR_NO_DATA
-#  endif
-
 #  define CALL_WITH_SIGPIPE_EMULATION(RETTYPE, EXPRESSION, FAILED) \
   if (ferror (stream))                                                        \
     return (EXPRESSION);                                                      \
   else                                                                        \
     {                                                                         \
       RETTYPE ret;                                                            \
-      CLEAR_ERRNO                                                             \
-      CLEAR_LastError                                                         \
+      SetLastError (0);                                                       \
       ret = (EXPRESSION);                                                     \
-      if (FAILED)                                                             \
+      if (FAILED && GetLastError () == ERROR_NO_DATA && ferror (stream))      \
         {                                                                     \
-          HANDLE_ENOSPC                                                       \
-          HANDLE_ERROR_NO_DATA                                                \
-          ;                                                                   \
+          int fd = fileno (stream);                                           \
+          if (fd >= 0                                                         \
+              && GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_PIPE)\
+            {                                                                 \
+              /* Try to raise signal SIGPIPE.  */                             \
+              raise (SIGPIPE);                                                \
+              /* If it is currently blocked or ignored, change errno from     \
+                 EINVAL to EPIPE.  */                                         \
+              errno = EPIPE;                                                  \
+            }                                                                 \
         }                                                                     \
       return ret;                                                             \
     }
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/stdlib.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdlib.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/stdlib.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdlib.in.h	2010-04-25 09:20:42.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,60 +18,43 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
-/* Special invocation conventions inside some gnulib header files,
-   and inside some glibc header files, respectively.  */
+#if defined __need_malloc_and_calloc
+/* Special invocation convention inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_STDLIB_H
+#ifndef _GL_STDLIB_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
-#ifndef _@GUARD_PREFIX@_STDLIB_H
-#define _@GUARD_PREFIX@_STDLIB_H
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
-/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.  */
-#if @GNULIB_SYSTEM_POSIX@ && !defined WEXITSTATUS
-# include <sys/wait.h>
-#endif
-
 /* Solaris declares getloadavg() in <sys/loadavg.h>.  */
 #if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@
 # include <sys/loadavg.h>
 #endif
 
-/* Native Windows platforms declare mktemp() in <io.h>.  */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-#if @GNULIB_RANDOM_R@
-
 /* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
-   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
-   'struct random_data'.  */
-# if @HAVE_RANDOM_H@
-#  include <random.h>
-# endif
+   from <stdlib.h> if _REENTRANT is defined.  Include it always.  */
+#if @HAVE_RANDOM_H@
+# include <random.h>
+#endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
-#  include <stdint.h>
-# endif
+#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@) \
+    || defined GNULIB_POSIXCHECK
+# include <stdint.h>
+#endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@
-/* Define 'struct random_data'.
-   But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
-#  if !GNULIB_defined_struct_random_data
+#if !@HAVE_STRUCT_RANDOM_DATA@
 struct random_data
 {
   int32_t *fptr;                /* Front pointer.  */
@@ -82,29 +65,15 @@
   int rand_sep;                 /* Distance between front and rear.  */
   int32_t *end_ptr;             /* Pointer behind state table.  */
 };
-#   define GNULIB_defined_struct_random_data 1
-#  endif
-# endif
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-/* On Mac OS X 10.3, only <unistd.h> declares mkstemp.  */
-/* On Mac OS X 10.5, only <unistd.h> declares mkstemps.  */
+#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+/* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>
 #endif
 
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The definition of _Noreturn is copied here.  */
-
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -126,30 +95,11 @@
 #endif
 
 
-#if @GNULIB__EXIT@
-/* Terminate the current process with the given return code, without running
-   the 'atexit' handlers.  */
-# if !@HAVE__EXIT@
-_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
-# endif
-_GL_CXXALIAS_SYS (_Exit, void, (int status));
-_GL_CXXALIASWARN (_Exit);
-#elif defined GNULIB_POSIXCHECK
-# undef _Exit
-# if HAVE_RAW_DECL__EXIT
-_GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
-                 "use gnulib module _Exit for portability");
-# endif
-#endif
-
-
 #if @GNULIB_ATOLL@
 /* Parse a signed decimal integer.
    Returns the value of the integer.  Errors are not detected.  */
 # if !@HAVE_ATOLL@
-_GL_FUNCDECL_SYS (atoll, long long, (const char *string)
-                                    _GL_ATTRIBUTE_PURE
-                                    _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (atoll, long long, (const char *string) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (atoll, long long, (const char *string));
 _GL_CXXALIASWARN (atoll);
@@ -162,7 +112,7 @@
 #endif
 
 #if @GNULIB_CALLOC_POSIX@
-# if @REPLACE_CALLOC@
+# if !@HAVE_CALLOC_POSIX@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef calloc
 #   define calloc rpl_calloc
@@ -199,8 +149,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef canonicalize_file_name
 # if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
-_GL_WARN_ON_USE (canonicalize_file_name,
-                 "canonicalize_file_name is unportable - "
+_GL_WARN_ON_USE (canonicalize_file_name, "canonicalize_file_name is unportable - "
                  "use gnulib module canonicalize-lgpl for portability");
 # endif
 #endif
@@ -263,19 +212,14 @@
 #elif defined GNULIB_POSIXCHECK
 # undef grantpt
 # if HAVE_RAW_DECL_GRANTPT
-_GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
+_GL_WARN_ON_USE (ptsname, "grantpt is not portable - "
                  "use gnulib module grantpt for portability");
 # endif
 #endif
 
-/* If _GL_USE_STDLIB_ALLOC is nonzero, the including module does not
-   rely on GNU or POSIX semantics for malloc and realloc (for example,
-   by never specifying a zero size), so it does not need malloc or
-   realloc to be redefined.  */
 #if @GNULIB_MALLOC_POSIX@
-# if @REPLACE_MALLOC@
-#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-        || _GL_USE_STDLIB_ALLOC)
+# if !@HAVE_MALLOC_POSIX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef malloc
 #   define malloc rpl_malloc
 #  endif
@@ -285,28 +229,13 @@
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 # endif
 _GL_CXXALIASWARN (malloc);
-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+#elif defined GNULIB_POSIXCHECK
 # undef malloc
 /* Assume malloc is always declared.  */
 _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
                  "use gnulib module malloc-posix for portability");
 #endif
 
-/* Convert a multibyte character to a wide character.  */
-#if @GNULIB_MBTOWC@
-# if @REPLACE_MBTOWC@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef mbtowc
-#   define mbtowc rpl_mbtowc
-#  endif
-_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-# else
-_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-# endif
-_GL_CXXALIASWARN (mbtowc);
-#endif
-
 #if @GNULIB_MKDTEMP@
 /* Create a unique temporary directory from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
@@ -439,38 +368,13 @@
 # endif
 #endif
 
-#if @GNULIB_POSIX_OPENPT@
-/* Return an FD open to the master side of a pseudo-terminal.  Flags should
-   include O_RDWR, and may also include O_NOCTTY.  */
-# if !@HAVE_POSIX_OPENPT@
-_GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
-# endif
-_GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
-_GL_CXXALIASWARN (posix_openpt);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_openpt
-# if HAVE_RAW_DECL_POSIX_OPENPT
-_GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
-                 "use gnulib module posix_openpt for portability");
-# endif
-#endif
-
 #if @GNULIB_PTSNAME@
 /* Return the pathname of the pseudo-terminal slave associated with
    the master FD is open on, or NULL on errors.  */
-# if @REPLACE_PTSNAME@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ptsname
-#   define ptsname rpl_ptsname
-#  endif
-_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
-_GL_CXXALIAS_RPL (ptsname, char *, (int fd));
-# else
-#  if !@HAVE_PTSNAME@
+# if !@HAVE_PTSNAME@
 _GL_FUNCDECL_SYS (ptsname, char *, (int fd));
-#  endif
-_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 # endif
+_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 _GL_CXXALIASWARN (ptsname);
 #elif defined GNULIB_POSIXCHECK
 # undef ptsname
@@ -480,32 +384,6 @@
 # endif
 #endif
 
-#if @GNULIB_PTSNAME_R@
-/* Set the pathname of the pseudo-terminal slave associated with
-   the master FD is open on and return 0, or set errno and return
-   non-zero on errors.  */
-# if @REPLACE_PTSNAME_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ptsname_r
-#   define ptsname_r rpl_ptsname_r
-#  endif
-_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
-_GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
-# else
-#  if !@HAVE_PTSNAME_R@
-_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
-#  endif
-_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
-# endif
-_GL_CXXALIASWARN (ptsname_r);
-#elif defined GNULIB_POSIXCHECK
-# undef ptsname_r
-# if HAVE_RAW_DECL_PTSNAME_R
-_GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - "
-                 "use gnulib module ptsname_r for portability");
-# endif
-#endif
-
 #if @GNULIB_PUTENV@
 # if @REPLACE_PUTENV@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -520,29 +398,6 @@
 _GL_CXXALIASWARN (putenv);
 #endif
 
-#if @GNULIB_QSORT_R@
-# if @REPLACE_QSORT_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef qsort_r
-#   define qsort_r rpl_qsort_r
-#  endif
-_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
-_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg));
-# else
-_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg));
-# endif
-_GL_CXXALIASWARN (qsort_r);
-#endif
-
 
 #if @GNULIB_RANDOM_R@
 # if !@HAVE_RANDOM_R@
@@ -552,83 +407,12 @@
 # endif
 #endif
 
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (random, long, (void));
-# endif
-_GL_CXXALIAS_SYS (random, long, (void));
-_GL_CXXALIASWARN (random);
-#elif defined GNULIB_POSIXCHECK
-# undef random
-# if HAVE_RAW_DECL_RANDOM
-_GL_WARN_ON_USE (random, "random is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
-# endif
-_GL_CXXALIAS_SYS (srandom, void, (unsigned int seed));
-_GL_CXXALIASWARN (srandom);
-#elif defined GNULIB_POSIXCHECK
-# undef srandom
-# if HAVE_RAW_DECL_SRANDOM
-_GL_WARN_ON_USE (srandom, "srandom is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size)
-                  _GL_ARG_NONNULL ((2)));
-# endif
-_GL_CXXALIAS_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size));
-_GL_CXXALIASWARN (initstate);
-#elif defined GNULIB_POSIXCHECK
-# undef initstate
-# if HAVE_RAW_DECL_INITSTATE_R
-_GL_WARN_ON_USE (initstate, "initstate is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));
-_GL_CXXALIASWARN (setstate);
-#elif defined GNULIB_POSIXCHECK
-# undef setstate
-# if HAVE_RAW_DECL_SETSTATE_R
-_GL_WARN_ON_USE (setstate, "setstate is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef random_r
-#   define random_r rpl_random_r
-#  endif
-_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result)
-                                 _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result)
                                  _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
 # endif
+_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
 _GL_CXXALIASWARN (random_r);
 #elif defined GNULIB_POSIXCHECK
 # undef random_r
@@ -639,25 +423,13 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef srandom_r
-#   define srandom_r rpl_srandom_r
-#  endif
-_GL_FUNCDECL_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state)
                   _GL_ARG_NONNULL ((2)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (srandom_r);
 #elif defined GNULIB_POSIXCHECK
 # undef srandom_r
@@ -668,29 +440,15 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef initstate_r
-#   define initstate_r rpl_initstate_r
-#  endif
-_GL_FUNCDECL_RPL (initstate_r, int,
-                  (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((2, 4)));
-_GL_CXXALIAS_RPL (initstate_r, int,
-                  (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
                    struct random_data *rand_state)
                   _GL_ARG_NONNULL ((2, 4)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
                    struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (initstate_r);
 #elif defined GNULIB_POSIXCHECK
 # undef initstate_r
@@ -701,25 +459,13 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef setstate_r
-#   define setstate_r rpl_setstate_r
-#  endif
-_GL_FUNCDECL_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state)
                   _GL_ARG_NONNULL ((1, 2)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (setstate_r);
 #elif defined GNULIB_POSIXCHECK
 # undef setstate_r
@@ -731,9 +477,8 @@
 
 
 #if @GNULIB_REALLOC_POSIX@
-# if @REPLACE_REALLOC@
-#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-        || _GL_USE_STDLIB_ALLOC)
+# if !@HAVE_REALLOC_POSIX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef realloc
 #   define realloc rpl_realloc
 #  endif
@@ -743,7 +488,7 @@
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 # endif
 _GL_CXXALIASWARN (realloc);
-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+#elif defined GNULIB_POSIXCHECK
 # undef realloc
 /* Assume realloc is always declared.  */
 _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
@@ -790,22 +535,6 @@
 # endif
 #endif
 
-#if @GNULIB_SECURE_GETENV@
-/* Look up NAME in the environment, returning 0 in insecure situations.  */
-# if !@HAVE_SECURE_GETENV@
-_GL_FUNCDECL_SYS (secure_getenv, char *,
-                  (char const *name) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
-_GL_CXXALIASWARN (secure_getenv);
-#elif defined GNULIB_POSIXCHECK
-# undef secure_getenv
-# if HAVE_RAW_DECL_SECURE_GETENV
-_GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
-                 "use gnulib module secure_getenv for portability");
-# endif
-#endif
-
 #if @GNULIB_SETENV@
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
@@ -820,7 +549,7 @@
 _GL_CXXALIAS_RPL (setenv, int,
                   (const char *name, const char *value, int replace));
 # else
-#  if !@HAVE_DECL_SETENV@
+#  if !@HAVE_SETENV@
 _GL_FUNCDECL_SYS (setenv, int,
                   (const char *name, const char *value, int replace)
                   _GL_ARG_NONNULL ((1)));
@@ -828,9 +557,7 @@
 _GL_CXXALIAS_SYS (setenv, int,
                   (const char *name, const char *value, int replace));
 # endif
-# if !(@REPLACE_SETENV@ && !@HAVE_DECL_SETENV@)
 _GL_CXXALIASWARN (setenv);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setenv
 # if HAVE_RAW_DECL_SETENV
@@ -925,7 +652,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef unlockpt
 # if HAVE_RAW_DECL_UNLOCKPT
-_GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - "
+_GL_WARN_ON_USE (ptsname, "unlockpt is not portable - "
                  "use gnulib module unlockpt for portability");
 # endif
 #endif
@@ -940,14 +667,12 @@
 _GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (unsetenv, int, (const char *name));
 # else
-#  if !@HAVE_DECL_UNSETENV@
+#  if !@HAVE_UNSETENV@
 _GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (unsetenv, int, (const char *name));
 # endif
-# if !(@REPLACE_UNSETENV@ && !@HAVE_DECL_UNSETENV@)
 _GL_CXXALIASWARN (unsetenv);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef unsetenv
 # if HAVE_RAW_DECL_UNSETENV
@@ -956,22 +681,7 @@
 # endif
 #endif
 
-/* Convert a wide character to a multibyte character.  */
-#if @GNULIB_WCTOMB@
-# if @REPLACE_WCTOMB@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef wctomb
-#   define wctomb rpl_wctomb
-#  endif
-_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
-_GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
-# else
-_GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
-# endif
-_GL_CXXALIASWARN (wctomb);
-#endif
-
 
-#endif /* _@GUARD_PREFIX@_STDLIB_H */
-#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif /* _GL_STDLIB_H */
+#endif /* _GL_STDLIB_H */
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/streq.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/streq.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/streq.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/streq.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -21,8 +21,8 @@
 
 #include <string.h>
 
-/* STREQ_OPT allows to optimize string comparison with a small literal string.
-     STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+/* STREQ allows to optimize string comparison with a small literal string.
+     STREQ (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
    is semantically equivalent to
      strcmp (s, "EUC-KR") == 0
    just faster.  */
@@ -163,12 +163,12 @@
     return 0;
 }
 
-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
   streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
 
 #else
 
-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
   (strcmp (s1, s2) == 0)
 
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strerror.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/strerror.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strerror.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strerror.c	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,54 +17,331 @@
 
 #include <config.h>
 
-/* Specification.  */
 #include <string.h>
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if REPLACE_STRERROR
 
-#include "intprops.h"
-#include "strerror-override.h"
-#include "verify.h"
+# include <errno.h>
+# include <stdio.h>
 
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef sprintf
+# if GNULIB_defined_ESOCK /* native Windows platforms */
+#  if HAVE_WINSOCK2_H
+#   include <winsock2.h>
+#  endif
+# endif
+
+# include "intprops.h"
+
+# undef strerror
+# if ! HAVE_DECL_STRERROR
+#  define strerror(n) NULL
+# endif
 
 char *
-strerror (int n)
-#undef strerror
+rpl_strerror (int n)
 {
-  static char buf[STACKBUF_LEN];
-  size_t len;
+  char const *msg = NULL;
+  /* These error messages are taken from glibc/sysdeps/gnu/errlist.c.  */
+  switch (n)
+    {
+# if GNULIB_defined_ETXTBSY
+    case ETXTBSY:
+      msg = "Text file busy";
+      break;
+# endif
+
+# if GNULIB_defined_ESOCK /* native Windows platforms */
+    /* EWOULDBLOCK is the same as EAGAIN.  */
+    case EINPROGRESS:
+      msg = "Operation now in progress";
+      break;
+    case EALREADY:
+      msg = "Operation already in progress";
+      break;
+    case ENOTSOCK:
+      msg = "Socket operation on non-socket";
+      break;
+    case EDESTADDRREQ:
+      msg = "Destination address required";
+      break;
+    case EMSGSIZE:
+      msg = "Message too long";
+      break;
+    case EPROTOTYPE:
+      msg = "Protocol wrong type for socket";
+      break;
+    case ENOPROTOOPT:
+      msg = "Protocol not available";
+      break;
+    case EPROTONOSUPPORT:
+      msg = "Protocol not supported";
+      break;
+    case ESOCKTNOSUPPORT:
+      msg = "Socket type not supported";
+      break;
+    case EOPNOTSUPP:
+      msg = "Operation not supported";
+      break;
+    case EPFNOSUPPORT:
+      msg = "Protocol family not supported";
+      break;
+    case EAFNOSUPPORT:
+      msg = "Address family not supported by protocol";
+      break;
+    case EADDRINUSE:
+      msg = "Address already in use";
+      break;
+    case EADDRNOTAVAIL:
+      msg = "Cannot assign requested address";
+      break;
+    case ENETDOWN:
+      msg = "Network is down";
+      break;
+    case ENETUNREACH:
+      msg = "Network is unreachable";
+      break;
+    case ENETRESET:
+      msg = "Network dropped connection on reset";
+      break;
+    case ECONNABORTED:
+      msg = "Software caused connection abort";
+      break;
+    case ECONNRESET:
+      msg = "Connection reset by peer";
+      break;
+    case ENOBUFS:
+      msg = "No buffer space available";
+      break;
+    case EISCONN:
+      msg = "Transport endpoint is already connected";
+      break;
+    case ENOTCONN:
+      msg = "Transport endpoint is not connected";
+      break;
+    case ESHUTDOWN:
+      msg = "Cannot send after transport endpoint shutdown";
+      break;
+    case ETOOMANYREFS:
+      msg = "Too many references: cannot splice";
+      break;
+    case ETIMEDOUT:
+      msg = "Connection timed out";
+      break;
+    case ECONNREFUSED:
+      msg = "Connection refused";
+      break;
+    case ELOOP:
+      msg = "Too many levels of symbolic links";
+      break;
+    case EHOSTDOWN:
+      msg = "Host is down";
+      break;
+    case EHOSTUNREACH:
+      msg = "No route to host";
+      break;
+    case EPROCLIM:
+      msg = "Too many processes";
+      break;
+    case EUSERS:
+      msg = "Too many users";
+      break;
+    case EDQUOT:
+      msg = "Disk quota exceeded";
+      break;
+    case ESTALE:
+      msg = "Stale NFS file handle";
+      break;
+    case EREMOTE:
+      msg = "Object is remote";
+      break;
+#  if HAVE_WINSOCK2_H
+    /* WSA_INVALID_HANDLE maps to EBADF */
+    /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
+    /* WSA_INVALID_PARAMETER maps to EINVAL */
+    case WSA_OPERATION_ABORTED:
+      msg = "Overlapped operation aborted";
+      break;
+    case WSA_IO_INCOMPLETE:
+      msg = "Overlapped I/O event object not in signaled state";
+      break;
+    case WSA_IO_PENDING:
+      msg = "Overlapped operations will complete later";
+      break;
+    /* WSAEINTR maps to EINTR */
+    /* WSAEBADF maps to EBADF */
+    /* WSAEACCES maps to EACCES */
+    /* WSAEFAULT maps to EFAULT */
+    /* WSAEINVAL maps to EINVAL */
+    /* WSAEMFILE maps to EMFILE */
+    /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
+    /* WSAEINPROGRESS is EINPROGRESS */
+    /* WSAEALREADY is EALREADY */
+    /* WSAENOTSOCK is ENOTSOCK */
+    /* WSAEDESTADDRREQ is EDESTADDRREQ */
+    /* WSAEMSGSIZE is EMSGSIZE */
+    /* WSAEPROTOTYPE is EPROTOTYPE */
+    /* WSAENOPROTOOPT is ENOPROTOOPT */
+    /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */
+    /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
+    /* WSAEOPNOTSUPP is EOPNOTSUPP */
+    /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
+    /* WSAEAFNOSUPPORT is EAFNOSUPPORT */
+    /* WSAEADDRINUSE is EADDRINUSE */
+    /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */
+    /* WSAENETDOWN is ENETDOWN */
+    /* WSAENETUNREACH is ENETUNREACH */
+    /* WSAENETRESET is ENETRESET */
+    /* WSAECONNABORTED is ECONNABORTED */
+    /* WSAECONNRESET is ECONNRESET */
+    /* WSAENOBUFS is ENOBUFS */
+    /* WSAEISCONN is EISCONN */
+    /* WSAENOTCONN is ENOTCONN */
+    /* WSAESHUTDOWN is ESHUTDOWN */
+    /* WSAETOOMANYREFS is ETOOMANYREFS */
+    /* WSAETIMEDOUT is ETIMEDOUT */
+    /* WSAECONNREFUSED is ECONNREFUSED */
+    /* WSAELOOP is ELOOP */
+    /* WSAENAMETOOLONG maps to ENAMETOOLONG */
+    /* WSAEHOSTDOWN is EHOSTDOWN */
+    /* WSAEHOSTUNREACH is EHOSTUNREACH */
+    /* WSAENOTEMPTY maps to ENOTEMPTY */
+    /* WSAEPROCLIM is EPROCLIM */
+    /* WSAEUSERS is EUSERS */
+    /* WSAEDQUOT is EDQUOT */
+    /* WSAESTALE is ESTALE */
+    /* WSAEREMOTE is EREMOTE */
+    case WSASYSNOTREADY:
+      msg = "Network subsystem is unavailable";
+      break;
+    case WSAVERNOTSUPPORTED:
+      msg = "Winsock.dll version out of range";
+      break;
+    case WSANOTINITIALISED:
+      msg = "Successful WSAStartup not yet performed";
+      break;
+    case WSAEDISCON:
+      msg = "Graceful shutdown in progress";
+      break;
+    case WSAENOMORE: case WSA_E_NO_MORE:
+      msg = "No more results";
+      break;
+    case WSAECANCELLED: case WSA_E_CANCELLED:
+      msg = "Call was canceled";
+      break;
+    case WSAEINVALIDPROCTABLE:
+      msg = "Procedure call table is invalid";
+      break;
+    case WSAEINVALIDPROVIDER:
+      msg = "Service provider is invalid";
+      break;
+    case WSAEPROVIDERFAILEDINIT:
+      msg = "Service provider failed to initialize";
+      break;
+    case WSASYSCALLFAILURE:
+      msg = "System call failure";
+      break;
+    case WSASERVICE_NOT_FOUND:
+      msg = "Service not found";
+      break;
+    case WSATYPE_NOT_FOUND:
+      msg = "Class type not found";
+      break;
+    case WSAEREFUSED:
+      msg = "Database query was refused";
+      break;
+    case WSAHOST_NOT_FOUND:
+      msg = "Host not found";
+      break;
+    case WSATRY_AGAIN:
+      msg = "Nonauthoritative host not found";
+      break;
+    case WSANO_RECOVERY:
+      msg = "Nonrecoverable error";
+      break;
+    case WSANO_DATA:
+      msg = "Valid name, no data record of requested type";
+      break;
+    /* WSA_QOS_* omitted */
+#  endif
+# endif
+
+# if GNULIB_defined_ENOMSG
+    case ENOMSG:
+      msg = "No message of desired type";
+      break;
+# endif
+
+# if GNULIB_defined_EIDRM
+    case EIDRM:
+      msg = "Identifier removed";
+      break;
+# endif
+
+# if GNULIB_defined_ENOLINK
+    case ENOLINK:
+      msg = "Link has been severed";
+      break;
+# endif
+
+# if GNULIB_defined_EPROTO
+    case EPROTO:
+      msg = "Protocol error";
+      break;
+# endif
+
+# if GNULIB_defined_EMULTIHOP
+    case EMULTIHOP:
+      msg = "Multihop attempted";
+      break;
+# endif
+
+# if GNULIB_defined_EBADMSG
+    case EBADMSG:
+      msg = "Bad message";
+      break;
+# endif
+
+# if GNULIB_defined_EOVERFLOW
+    case EOVERFLOW:
+      msg = "Value too large for defined data type";
+      break;
+# endif
+
+# if GNULIB_defined_ENOTSUP
+    case ENOTSUP:
+      msg = "Not supported";
+      break;
+# endif
+
+# if GNULIB_defined_ESTALE
+    case ESTALE:
+      msg = "Stale NFS file handle";
+      break;
+# endif
+
+# if GNULIB_defined_ECANCELED
+    case ECANCELED:
+      msg = "Operation canceled";
+      break;
+# endif
+    }
 
-  /* Cast away const, due to the historical signature of strerror;
-     callers should not be modifying the string.  */
-  const char *msg = strerror_override (n);
   if (msg)
     return (char *) msg;
 
-  msg = strerror (n);
+  {
+    char *result = strerror (n);
 
-  /* Our strerror_r implementation might use the system's strerror
-     buffer, so all other clients of strerror have to see the error
-     copied into a buffer that we manage.  This is not thread-safe,
-     even if the system strerror is, but portable programs shouldn't
-     be using strerror if they care about thread-safety.  */
-  if (!msg || !*msg)
-    {
-      static char const fmt[] = "Unknown error %d";
-      verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
-      sprintf (buf, fmt, n);
-      errno = EINVAL;
-      return buf;
-    }
-
-  /* Fix STACKBUF_LEN if this ever aborts.  */
-  len = strlen (msg);
-  if (sizeof buf <= len)
-    abort ();
+    if (result == NULL || result[0] == '\0')
+      {
+        static char const fmt[] = "Unknown error (%d)";
+        static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)];
+        sprintf (msg_buf, fmt, n);
+        return msg_buf;
+      }
 
-  return memcpy (buf, msg, len + 1);
+    return result;
+  }
 }
+
+#endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strerror-override.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/strerror-override.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strerror-override.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strerror-override.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-/* strerror-override.c --- POSIX compatible system error routine
-
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2010.  */
-
-#include <config.h>
-
-#include "strerror-override.h"
-
-#include <errno.h>
-
-#if GNULIB_defined_EWINSOCK /* native Windows platforms */
-# if HAVE_WINSOCK2_H
-#  include <winsock2.h>
-# endif
-#endif
-
-/* If ERRNUM maps to an errno value defined by gnulib, return a string
-   describing the error.  Otherwise return NULL.  */
-const char *
-strerror_override (int errnum)
-{
-  /* These error messages are taken from glibc/sysdeps/gnu/errlist.c.  */
-  switch (errnum)
-    {
-#if REPLACE_STRERROR_0
-    case 0:
-      return "Success";
-#endif
-
-#if GNULIB_defined_ESOCK /* native Windows platforms with older <errno.h> */
-    case EINPROGRESS:
-      return "Operation now in progress";
-    case EALREADY:
-      return "Operation already in progress";
-    case ENOTSOCK:
-      return "Socket operation on non-socket";
-    case EDESTADDRREQ:
-      return "Destination address required";
-    case EMSGSIZE:
-      return "Message too long";
-    case EPROTOTYPE:
-      return "Protocol wrong type for socket";
-    case ENOPROTOOPT:
-      return "Protocol not available";
-    case EPROTONOSUPPORT:
-      return "Protocol not supported";
-    case EOPNOTSUPP:
-      return "Operation not supported";
-    case EAFNOSUPPORT:
-      return "Address family not supported by protocol";
-    case EADDRINUSE:
-      return "Address already in use";
-    case EADDRNOTAVAIL:
-      return "Cannot assign requested address";
-    case ENETDOWN:
-      return "Network is down";
-    case ENETUNREACH:
-      return "Network is unreachable";
-    case ECONNRESET:
-      return "Connection reset by peer";
-    case ENOBUFS:
-      return "No buffer space available";
-    case EISCONN:
-      return "Transport endpoint is already connected";
-    case ENOTCONN:
-      return "Transport endpoint is not connected";
-    case ETIMEDOUT:
-      return "Connection timed out";
-    case ECONNREFUSED:
-      return "Connection refused";
-    case ELOOP:
-      return "Too many levels of symbolic links";
-    case EHOSTUNREACH:
-      return "No route to host";
-    case EWOULDBLOCK:
-      return "Operation would block";
-#endif
-#if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */
-    case ETXTBSY:
-      return "Text file busy";
-    case ENODATA:
-      return "No data available";
-    case ENOSR:
-      return "Out of streams resources";
-    case ENOSTR:
-      return "Device not a stream";
-    case ETIME:
-      return "Timer expired";
-    case EOTHER:
-      return "Other error";
-#endif
-#if GNULIB_defined_EWINSOCK /* native Windows platforms */
-    case ESOCKTNOSUPPORT:
-      return "Socket type not supported";
-    case EPFNOSUPPORT:
-      return "Protocol family not supported";
-    case ESHUTDOWN:
-      return "Cannot send after transport endpoint shutdown";
-    case ETOOMANYREFS:
-      return "Too many references: cannot splice";
-    case EHOSTDOWN:
-      return "Host is down";
-    case EPROCLIM:
-      return "Too many processes";
-    case EUSERS:
-      return "Too many users";
-    case EDQUOT:
-      return "Disk quota exceeded";
-    case ESTALE:
-      return "Stale NFS file handle";
-    case EREMOTE:
-      return "Object is remote";
-# if HAVE_WINSOCK2_H
-      /* WSA_INVALID_HANDLE maps to EBADF */
-      /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
-      /* WSA_INVALID_PARAMETER maps to EINVAL */
-    case WSA_OPERATION_ABORTED:
-      return "Overlapped operation aborted";
-    case WSA_IO_INCOMPLETE:
-      return "Overlapped I/O event object not in signaled state";
-    case WSA_IO_PENDING:
-      return "Overlapped operations will complete later";
-      /* WSAEINTR maps to EINTR */
-      /* WSAEBADF maps to EBADF */
-      /* WSAEACCES maps to EACCES */
-      /* WSAEFAULT maps to EFAULT */
-      /* WSAEINVAL maps to EINVAL */
-      /* WSAEMFILE maps to EMFILE */
-      /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
-      /* WSAEINPROGRESS maps to EINPROGRESS */
-      /* WSAEALREADY maps to EALREADY */
-      /* WSAENOTSOCK maps to ENOTSOCK */
-      /* WSAEDESTADDRREQ maps to EDESTADDRREQ */
-      /* WSAEMSGSIZE maps to EMSGSIZE */
-      /* WSAEPROTOTYPE maps to EPROTOTYPE */
-      /* WSAENOPROTOOPT maps to ENOPROTOOPT */
-      /* WSAEPROTONOSUPPORT maps to EPROTONOSUPPORT */
-      /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
-      /* WSAEOPNOTSUPP maps to EOPNOTSUPP */
-      /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
-      /* WSAEAFNOSUPPORT maps to EAFNOSUPPORT */
-      /* WSAEADDRINUSE maps to EADDRINUSE */
-      /* WSAEADDRNOTAVAIL maps to EADDRNOTAVAIL */
-      /* WSAENETDOWN maps to ENETDOWN */
-      /* WSAENETUNREACH maps to ENETUNREACH */
-      /* WSAENETRESET maps to ENETRESET */
-      /* WSAECONNABORTED maps to ECONNABORTED */
-      /* WSAECONNRESET maps to ECONNRESET */
-      /* WSAENOBUFS maps to ENOBUFS */
-      /* WSAEISCONN maps to EISCONN */
-      /* WSAENOTCONN maps to ENOTCONN */
-      /* WSAESHUTDOWN is ESHUTDOWN */
-      /* WSAETOOMANYREFS is ETOOMANYREFS */
-      /* WSAETIMEDOUT maps to ETIMEDOUT */
-      /* WSAECONNREFUSED maps to ECONNREFUSED */
-      /* WSAELOOP maps to ELOOP */
-      /* WSAENAMETOOLONG maps to ENAMETOOLONG */
-      /* WSAEHOSTDOWN is EHOSTDOWN */
-      /* WSAEHOSTUNREACH maps to EHOSTUNREACH */
-      /* WSAENOTEMPTY maps to ENOTEMPTY */
-      /* WSAEPROCLIM is EPROCLIM */
-      /* WSAEUSERS is EUSERS */
-      /* WSAEDQUOT is EDQUOT */
-      /* WSAESTALE is ESTALE */
-      /* WSAEREMOTE is EREMOTE */
-    case WSASYSNOTREADY:
-      return "Network subsystem is unavailable";
-    case WSAVERNOTSUPPORTED:
-      return "Winsock.dll version out of range";
-    case WSANOTINITIALISED:
-      return "Successful WSAStartup not yet performed";
-    case WSAEDISCON:
-      return "Graceful shutdown in progress";
-    case WSAENOMORE: case WSA_E_NO_MORE:
-      return "No more results";
-    case WSAECANCELLED: case WSA_E_CANCELLED:
-      return "Call was canceled";
-    case WSAEINVALIDPROCTABLE:
-      return "Procedure call table is invalid";
-    case WSAEINVALIDPROVIDER:
-      return "Service provider is invalid";
-    case WSAEPROVIDERFAILEDINIT:
-      return "Service provider failed to initialize";
-    case WSASYSCALLFAILURE:
-      return "System call failure";
-    case WSASERVICE_NOT_FOUND:
-      return "Service not found";
-    case WSATYPE_NOT_FOUND:
-      return "Class type not found";
-    case WSAEREFUSED:
-      return "Database query was refused";
-    case WSAHOST_NOT_FOUND:
-      return "Host not found";
-    case WSATRY_AGAIN:
-      return "Nonauthoritative host not found";
-    case WSANO_RECOVERY:
-      return "Nonrecoverable error";
-    case WSANO_DATA:
-      return "Valid name, no data record of requested type";
-      /* WSA_QOS_* omitted */
-# endif
-#endif
-
-#if GNULIB_defined_ENOMSG
-    case ENOMSG:
-      return "No message of desired type";
-#endif
-
-#if GNULIB_defined_EIDRM
-    case EIDRM:
-      return "Identifier removed";
-#endif
-
-#if GNULIB_defined_ENOLINK
-    case ENOLINK:
-      return "Link has been severed";
-#endif
-
-#if GNULIB_defined_EPROTO
-    case EPROTO:
-      return "Protocol error";
-#endif
-
-#if GNULIB_defined_EMULTIHOP
-    case EMULTIHOP:
-      return "Multihop attempted";
-#endif
-
-#if GNULIB_defined_EBADMSG
-    case EBADMSG:
-      return "Bad message";
-#endif
-
-#if GNULIB_defined_EOVERFLOW
-    case EOVERFLOW:
-      return "Value too large for defined data type";
-#endif
-
-#if GNULIB_defined_ENOTSUP
-    case ENOTSUP:
-      return "Not supported";
-#endif
-
-#if GNULIB_defined_ENETRESET
-    case ENETRESET:
-      return "Network dropped connection on reset";
-#endif
-
-#if GNULIB_defined_ECONNABORTED
-    case ECONNABORTED:
-      return "Software caused connection abort";
-#endif
-
-#if GNULIB_defined_ESTALE
-    case ESTALE:
-      return "Stale NFS file handle";
-#endif
-
-#if GNULIB_defined_EDQUOT
-    case EDQUOT:
-      return "Disk quota exceeded";
-#endif
-
-#if GNULIB_defined_ECANCELED
-    case ECANCELED:
-      return "Operation canceled";
-#endif
-
-#if GNULIB_defined_EOWNERDEAD
-    case EOWNERDEAD:
-      return "Owner died";
-#endif
-
-#if GNULIB_defined_ENOTRECOVERABLE
-    case ENOTRECOVERABLE:
-      return "State not recoverable";
-#endif
-
-#if GNULIB_defined_EILSEQ
-    case EILSEQ:
-      return "Invalid or incomplete multibyte or wide character";
-#endif
-
-    default:
-      return NULL;
-    }
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strerror-override.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/strerror-override.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strerror-override.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strerror-override.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* strerror-override.h --- POSIX compatible system error routine
-
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 _GL_STRERROR_OVERRIDE_H
-# define _GL_STRERROR_OVERRIDE_H
-
-# include <errno.h>
-# include <stddef.h>
-
-/* Reasonable buffer size that should never trigger ERANGE; if this
-   proves too small, we intentionally abort(), to remind us to fix
-   this value.  */
-# define STACKBUF_LEN 256
-
-/* If ERRNUM maps to an errno value defined by gnulib, return a string
-   describing the error.  Otherwise return NULL.  */
-# if REPLACE_STRERROR_0 \
-     || GNULIB_defined_ESOCK \
-     || GNULIB_defined_ESTREAMS \
-     || GNULIB_defined_EWINSOCK \
-     || GNULIB_defined_ENOMSG \
-     || GNULIB_defined_EIDRM \
-     || GNULIB_defined_ENOLINK \
-     || GNULIB_defined_EPROTO \
-     || GNULIB_defined_EMULTIHOP \
-     || GNULIB_defined_EBADMSG \
-     || GNULIB_defined_EOVERFLOW \
-     || GNULIB_defined_ENOTSUP \
-     || GNULIB_defined_ENETRESET \
-     || GNULIB_defined_ECONNABORTED \
-     || GNULIB_defined_ESTALE \
-     || GNULIB_defined_EDQUOT \
-     || GNULIB_defined_ECANCELED \
-     || GNULIB_defined_EOWNERDEAD \
-     || GNULIB_defined_ENOTRECOVERABLE \
-     || GNULIB_defined_EILSEQ
-extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
-# else
-#  define strerror_override(ignored) NULL
-# endif
-
-#endif /* _GL_STRERROR_OVERRIDE_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/striconv.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/striconv.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/striconv.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/striconv.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -49,8 +50,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Set to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -82,7 +82,7 @@
             else
               return -1;
           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
         /* Irix iconv() inserts a NUL byte if it cannot convert.
            NetBSD iconv() inserts a question mark if it cannot convert.
            Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -97,8 +97,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     {
       char *outptr = tmpbuf;
       size_t outsize = tmpbufsize;
@@ -132,8 +131,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Return to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -158,7 +156,7 @@
             else
               goto fail;
           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
         /* Irix iconv() inserts a NUL byte if it cannot convert.
            NetBSD iconv() inserts a question mark if it cannot convert.
            Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -172,8 +170,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     {
       size_t res = iconv (cd, NULL, NULL, &outptr, &outsize);
 
@@ -210,7 +207,7 @@
      to a trailing NUL byte in the output.  But not for UTF-7.  So that this
      function is usable for UTF-7, we have to exclude the NUL byte from the
      conversion and add it by hand afterwards.  */
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
   /* Irix iconv() inserts a NUL byte if it cannot convert.
      NetBSD iconv() inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -275,8 +272,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Set to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -328,8 +324,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     for (;;)
       {
         /* Here outptr + outbytes_remaining = result + result_size - 1.  */
@@ -415,8 +410,7 @@
       char *result;
 
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (c_strcasecmp (from_codeset, "EUC-KR") == 0
           || c_strcasecmp (to_codeset, "EUC-KR") == 0)
         {
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/striconv.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/striconv.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/striconv.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/striconv.h	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _STRICONV_H
 #define _STRICONV_H
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/string.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/string.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/string.in.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/string.in.h	2010-04-25 09:20:42.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,20 +13,20 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_STRING_H
+#ifndef _GL_STRING_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STRING_H@
 
-#ifndef _@GUARD_PREFIX@_STRING_H
-#define _@GUARD_PREFIX@_STRING_H
+#ifndef _GL_STRING_H
+#define _GL_STRING_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
@@ -36,20 +36,17 @@
 # include <wchar.h>
 #endif
 
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The attribute __pure__ was added in gcc 2.96.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#  define __pure__ /* empty */
+# endif
 #endif
 
-/* NetBSD 5.0 declares strsignal in <unistd.h>, not in <string.h>.  */
-/* But in any case avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \
-    && ! defined __GLIBC__
-# include <unistd.h>
-#endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -58,36 +55,6 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Find the index of the least-significant set bit.  */
-#if @GNULIB_FFSL@
-# if !@HAVE_FFSL@
-_GL_FUNCDECL_SYS (ffsl, int, (long int i));
-# endif
-_GL_CXXALIAS_SYS (ffsl, int, (long int i));
-_GL_CXXALIASWARN (ffsl);
-#elif defined GNULIB_POSIXCHECK
-# undef ffsl
-# if HAVE_RAW_DECL_FFSL
-_GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module");
-# endif
-#endif
-
-
-/* Find the index of the least-significant set bit.  */
-#if @GNULIB_FFSLL@
-# if !@HAVE_FFSLL@
-_GL_FUNCDECL_SYS (ffsll, int, (long long int i));
-# endif
-_GL_CXXALIAS_SYS (ffsll, int, (long long int i));
-_GL_CXXALIASWARN (ffsll);
-#elif defined GNULIB_POSIXCHECK
-# undef ffsll
-# if HAVE_RAW_DECL_FFSLL
-_GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module");
-# endif
-#endif
-
-
 /* Return the first instance of C within N bytes of S, or NULL.  */
 #if @GNULIB_MEMCHR@
 # if @REPLACE_MEMCHR@
@@ -95,13 +62,13 @@
 #   define memchr rpl_memchr
 #  endif
 _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
 # else
 #  if ! @HAVE_MEMCHR@
 _GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1)));
 #  endif
   /* On some systems, this function is defined as an overloaded function:
@@ -111,7 +78,7 @@
                         void *, (void const *__s, int __c, size_t __n),
                         void const *, (void const *__s, int __c, size_t __n));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
 _GL_CXXALIASWARN1 (memchr, void const *,
@@ -135,8 +102,7 @@
 _GL_FUNCDECL_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 3)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
 _GL_CXXALIAS_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len));
@@ -145,8 +111,7 @@
 _GL_FUNCDECL_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 3)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
 #  endif
 _GL_CXXALIAS_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
@@ -187,7 +152,7 @@
 #if @GNULIB_MEMRCHR@
 # if ! @HAVE_DECL_MEMRCHR@
 _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -196,7 +161,7 @@
 _GL_CXXALIAS_SYS_CAST2 (memrchr,
                         void *, (void const *, int, size_t),
                         void const *, (void const *, int, size_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
 _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
@@ -217,7 +182,7 @@
 #if @GNULIB_RAWMEMCHR@
 # if ! @HAVE_RAWMEMCHR@
 _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
+                                     __attribute__ ((__pure__))
                                      _GL_ARG_NONNULL ((1)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -226,7 +191,7 @@
 _GL_CXXALIAS_SYS_CAST2 (rawmemchr,
                         void *, (void const *__s, int __c_in),
                         void const *, (void const *__s, int __c_in));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
 _GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
@@ -264,7 +229,6 @@
 #if @GNULIB_STPNCPY@
 # if @REPLACE_STPNCPY@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef stpncpy
 #   define stpncpy rpl_stpncpy
 #  endif
 _GL_FUNCDECL_RPL (stpncpy, char *,
@@ -306,29 +270,18 @@
 
 /* Find the first occurrence of C in S or the final NUL byte.  */
 #if @GNULIB_STRCHRNUL@
-# if @REPLACE_STRCHRNUL@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define strchrnul rpl_strchrnul
-#  endif
-_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
-                                     _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strchrnul, char *,
-                  (const char *str, int ch));
-# else
-#  if ! @HAVE_STRCHRNUL@
+# if ! @HAVE_STRCHRNUL@
 _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
+                                     __attribute__ ((__pure__))
                                      _GL_ARG_NONNULL ((1)));
-#  endif
+# endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const char * std::strchrnul (const char *, int); }
        extern "C++" { char * std::strchrnul (char *, int); }  */
 _GL_CXXALIAS_SYS_CAST2 (strchrnul,
                         char *, (char const *__s, int __c_in),
                         char const *, (char const *__s, int __c_in));
-# endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
 _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
@@ -353,10 +306,6 @@
 _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strdup, char *, (char const *__s));
 # else
-#  if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup
-    /* strdup exists as a function and as a macro.  Get rid of the macro.  */
-#   undef strdup
-#  endif
 #  if !(@HAVE_DECL_STRDUP@ || defined strdup)
 _GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)));
 #  endif
@@ -429,13 +378,13 @@
 #   define strnlen rpl_strnlen
 #  endif
 _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
 _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
@@ -465,7 +414,7 @@
 #if @GNULIB_STRPBRK@
 # if ! @HAVE_STRPBRK@
 _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -474,7 +423,7 @@
 _GL_CXXALIAS_SYS_CAST2 (strpbrk,
                         char *, (char const *__s, char const *__accept),
                         const char *, (char const *__s, char const *__accept));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
 _GL_CXXALIASWARN1 (strpbrk, char const *,
@@ -565,7 +514,7 @@
 #   define strstr rpl_strstr
 #  endif
 _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
 # else
@@ -576,7 +525,7 @@
                         char *, (const char *haystack, const char *needle),
                         const char *, (const char *haystack, const char *needle));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
 _GL_CXXALIASWARN1 (strstr, const char *,
@@ -607,16 +556,14 @@
 #  endif
 _GL_FUNCDECL_RPL (strcasestr, char *,
                   (const char *haystack, const char *needle)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strcasestr, char *,
                   (const char *haystack, const char *needle));
 # else
 #  if ! @HAVE_STRCASESTR@
 _GL_FUNCDECL_SYS (strcasestr, char *,
                   (const char *haystack, const char *needle)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
 #  endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const char * strcasestr (const char *, const char *); }
@@ -625,7 +572,7 @@
                         char *, (const char *haystack, const char *needle),
                         const char *, (const char *haystack, const char *needle));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
 _GL_CXXALIASWARN1 (strcasestr, const char *,
@@ -724,14 +671,10 @@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbslen rpl_mbslen
 #  endif
-_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string)
-                                  _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string));
 # else
-_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string)
-                                  _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string));
 # endif
 _GL_CXXALIASWARN (mbslen);
@@ -741,7 +684,6 @@
 /* Return the number of multibyte characters in the character string starting
    at STRING and ending at STRING + LEN.  */
 _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1));
 #endif
 
@@ -755,12 +697,10 @@
 #   define mbschr rpl_mbschr /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c)
-                                  _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c));
 # else
 _GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c)
-                                  _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c));
 # endif
@@ -772,17 +712,15 @@
    and return a pointer to it.  Return NULL if C is not found in STRING.
    Unlike strrchr(), this function works correctly in multibyte locales with
    encodings such as GB18030.  */
-# if defined __hpux || defined __INTERIX
+# if defined __hpux
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define mbsrchr rpl_mbsrchr /* avoid collision with system function */
+#   define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c));
 # else
 _GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c));
 # endif
@@ -795,7 +733,6 @@
    Unlike strstr(), this function works correctly in multibyte locales with
    encodings different from UTF-8.  */
 _GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -807,7 +744,6 @@
    different lengths!
    Unlike strcasecmp(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C int mbscasecmp (const char *s1, const char *s2)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -822,21 +758,20 @@
    Unlike strncasecmp(), this function works correctly in multibyte locales.
    But beware that N is not a byte count but a character count!  */
 _GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
 #if @GNULIB_MBSPCASECMP@
 /* Compare the initial segment of the character string STRING consisting of
    at most mbslen (PREFIX) characters with the character string PREFIX,
-   ignoring case.  If the two match, return a pointer to the first byte
-   after this prefix in STRING.  Otherwise, return NULL.
-   Note: This function may, in multibyte locales, return non-NULL if STRING
-   is of smaller length than PREFIX!
+   ignoring case, returning less than, equal to or greater than zero if this
+   initial segment is lexicographically less than, equal to or greater than
+   PREFIX.
+   Note: This function may, in multibyte locales, return 0 if STRING is of
+   smaller length than PREFIX!
    Unlike strncasecmp(), this function works correctly in multibyte
    locales.  */
 _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -847,7 +782,6 @@
    strlen (haystack) < strlen (needle) !
    Unlike strcasestr(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -858,7 +792,6 @@
    if none exists.
    Unlike strcspn(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -872,12 +805,10 @@
 #   define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept));
 # else
 _GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept));
 # endif
@@ -891,7 +822,6 @@
    if none exists.
    Unlike strspn(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C size_t mbsspn (const char *string, const char *reject)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -955,35 +885,6 @@
                  "use gnulib module strerror to guarantee non-NULL result");
 #endif
 
-/* Map any int, typically from errno, into an error message.  Multithread-safe.
-   Uses the POSIX declaration, not the glibc declaration.  */
-#if @GNULIB_STRERROR_R@
-# if @REPLACE_STRERROR_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef strerror_r
-#   define strerror_r rpl_strerror_r
-#  endif
-_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)
-                                   _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen));
-# else
-#  if !@HAVE_DECL_STRERROR_R@
-_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
-                                   _GL_ARG_NONNULL ((2)));
-#  endif
-_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
-# endif
-# if @HAVE_DECL_STRERROR_R@
-_GL_CXXALIASWARN (strerror_r);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef strerror_r
-# if HAVE_RAW_DECL_STRERROR_R
-_GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
-                 "use gnulib module strerror_r-posix for portability");
-# endif
-#endif
-
 #if @GNULIB_STRSIGNAL@
 # if @REPLACE_STRSIGNAL@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1011,7 +912,6 @@
 #if @GNULIB_STRVERSCMP@
 # if !@HAVE_STRVERSCMP@
 _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
 _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
@@ -1025,5 +925,5 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_STRING_H */
-#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _GL_STRING_H */
+#endif /* _GL_STRING_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/str-kmp.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/str-kmp.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/str-kmp.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/str-kmp.h	2010-02-16 21:31:28.000000000 +0000
@@ -1,6 +1,6 @@
-/* Substring search in a NUL terminated string of UNIT elements,
+/* Substring search in a NUL terminated string of 'char' elements,
    using the Knuth-Morris-Pratt algorithm.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -14,29 +14,25 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Before including this file, you need to define:
-     UNIT                    The element type of the needle and haystack.
      CANON_ELEMENT(c)        A macro that canonicalizes an element right after
-                             it has been fetched from needle or haystack.
-                             The argument is of type UNIT; the result must be
-                             of type UNIT as well.  */
+                             it has been fetched from one of the two strings.
+                             The argument is an 'unsigned char'; the result
+                             must be an 'unsigned char' as well.  */
 
 /* Knuth-Morris-Pratt algorithm.
    See http://en.wikipedia.org/wiki/Knuth-Morris-Pratt_algorithm
-   HAYSTACK is the NUL terminated string in which to search for.
-   NEEDLE is the string to search for in HAYSTACK, consisting of NEEDLE_LEN
-   units.
    Return a boolean indicating success:
    Return true and set *RESULTP if the search was completed.
    Return false if it was aborted because not enough memory was available.  */
 static bool
-knuth_morris_pratt (const UNIT *haystack,
-                    const UNIT *needle, size_t needle_len,
-                    const UNIT **resultp)
+knuth_morris_pratt_unibyte (const char *haystack, const char *needle,
+                            const char **resultp)
 {
-  size_t m = needle_len;
+  size_t m = strlen (needle);
 
   /* Allocate the table.  */
   size_t *table = (size_t *) nmalloca (m, sizeof (size_t));
@@ -70,14 +66,14 @@
            The inequality needle[x..i-1] != needle[0..i-1-x] is known to hold
            for x < table[i-1], by induction.
            Furthermore, if j>0: needle[i-1-j..i-2] = needle[0..j-1].  */
-        UNIT b = CANON_ELEMENT (needle[i - 1]);
+        unsigned char b = CANON_ELEMENT ((unsigned char) needle[i - 1]);
 
         for (;;)
           {
             /* Invariants: The inequality needle[x..i-1] != needle[0..i-1-x]
                is known to hold for x < i-1-j.
                Furthermore, if j>0: needle[i-1-j..i-2] = needle[0..j-1].  */
-            if (b == CANON_ELEMENT (needle[j]))
+            if (b == CANON_ELEMENT ((unsigned char) needle[j]))
               {
                 /* Set table[i] := i-1-j.  */
                 table[i] = i - ++j;
@@ -112,16 +108,17 @@
   /* Search, using the table to accelerate the processing.  */
   {
     size_t j;
-    const UNIT *rhaystack;
-    const UNIT *phaystack;
+    const char *rhaystack;
+    const char *phaystack;
 
     *resultp = NULL;
     j = 0;
     rhaystack = haystack;
     phaystack = haystack;
     /* Invariant: phaystack = rhaystack + j.  */
-    while (*phaystack != 0)
-      if (CANON_ELEMENT (needle[j]) == CANON_ELEMENT (*phaystack))
+    while (*phaystack != '\0')
+      if (CANON_ELEMENT ((unsigned char) needle[j])
+          == CANON_ELEMENT ((unsigned char) *phaystack))
         {
           j++;
           phaystack++;
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strnlen1.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/strnlen1.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strnlen1.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strnlen1.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strnlen1.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/strnlen1.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strnlen1.h	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strnlen1.h	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,8 +28,7 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
    If no '\0' terminator is found in that many characters, return MAXLEN.  */
 /* This is the same as strnlen (string, maxlen - 1) + 1.  */
-extern size_t strnlen1 (const char *string, size_t maxlen)
-  _GL_ATTRIBUTE_PURE;
+extern size_t strnlen1 (const char *string, size_t maxlen);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strnlen.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/strnlen.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strnlen.c	2014-10-16 06:00:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strnlen.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strtol.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/strtol.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strtol.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strtol.c	2010-03-28 18:31:26.000000000 +0000
@@ -1,7 +1,7 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005,
+   2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
@@ -40,7 +40,7 @@
 # include "../locale/localeinfo.h"
 #endif
 
-/* Nonzero if we are defining 'strtoul' or 'strtoull', operating on
+/* Nonzero if we are defining `strtoul' or `strtoull', operating on
    unsigned integers.  */
 #ifndef UNSIGNED
 # define UNSIGNED 0
@@ -110,8 +110,8 @@
 # endif
 #endif
 
-/* If QUAD is defined, we are defining 'strtoll' or 'strtoull',
-   operating on 'long long int's.  */
+/* If QUAD is defined, we are defining `strtoll' or `strtoull',
+   operating on `long long int's.  */
 #ifdef QUAD
 # define LONG long long
 # define STRTOL_LONG_MIN LLONG_MIN
@@ -141,11 +141,11 @@
          ? (t) 0 \
          : TYPE_SIGNED_MAGNITUDE (t) \
          ? ~ (t) 0 \
-         : ~ TYPE_MAXIMUM (t)))
+         : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
 # define TYPE_MAXIMUM(t) \
    ((t) (! TYPE_SIGNED (t) \
          ? (t) -1 \
-         : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+         : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 
 # ifndef ULLONG_MAX
 #  define ULLONG_MAX TYPE_MAXIMUM (unsigned long long)
@@ -186,8 +186,9 @@
 # define LOCALE_PARAM_PROTO
 #endif
 
+#include <wchar.h>
+
 #ifdef USE_WIDE_CHAR
-# include <wchar.h>
 # include <wctype.h>
 # define L_(Ch) L##Ch
 # define UCHAR_TYPE wint_t
@@ -227,7 +228,7 @@
 
 
 
-/* Convert NPTR to an 'unsigned long int' or 'long int' in base BASE.
+/* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
    If BASE is 0 the base is determined by the presence of a leading
    zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
    If BASE is < 2 or > 36, it is reset to 10.
@@ -380,7 +381,7 @@
 
 #if !UNSIGNED
   /* Check for a value that is within the range of
-     'unsigned LONG int', but outside the range of 'LONG int'.  */
+     `unsigned LONG int', but outside the range of `LONG int'.  */
   if (overflow == 0
       && i > (negative
               ? -((unsigned LONG int) (STRTOL_LONG_MIN + 1)) + 1
@@ -405,7 +406,7 @@
   /* We must handle a special case here: the base is 0 or 16 and the
      first two characters are '0' and 'x', but the rest are no
      hexadecimal digits.  This is no error case.  We return 0 and
-     ENDPTR points to the 'x'.  */
+     ENDPTR points to the `x`.  */
   if (endptr != NULL)
     {
       if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/strtoul.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/strtoul.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/strtoul.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/strtoul.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009, 2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/sys_stat.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/sys_stat.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/sys_stat.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/sys_stat.in.h	2010-04-25 09:20:42.000000000 +0000
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
 
@@ -23,7 +24,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_system_sys_stat_h
 /* Special invocation convention.  */
@@ -33,10 +33,9 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
 
-/* Get nlink_t.
-   May also define off_t to a 64-bit type on native Windows.  */
+/* Get nlink_t.  */
 #include <sys/types.h>
 
 /* Get struct timespec.  */
@@ -45,8 +44,8 @@
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
 
-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
-#define _@GUARD_PREFIX@_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
+#define _GL_SYS_STAT_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -55,27 +54,10 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 /* Before doing "#define mkdir rpl_mkdir" below, we need to include all
-   headers that may declare mkdir().  Native Windows platforms declare mkdir
-   in <io.h> and/or <direct.h>, not in <unistd.h>.  */
+   headers that may declare mkdir().  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # include <io.h>     /* mingw32, mingw64 */
-# include <direct.h> /* mingw64, MSVC 9 */
-#endif
-
-/* Native Windows platforms declare umask() in <io.h>.  */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-/* Large File Support on native Windows.  */
-#if @WINDOWS_64_BIT_ST_SIZE@
-# define stat _stati64
-#endif
-
-#ifndef S_IFIFO
-# ifdef _S_IFIFO
-#  define S_IFIFO _S_IFIFO
-# endif
+# include <direct.h> /* mingw64 */
 #endif
 
 #ifndef S_IFMT
@@ -150,10 +132,6 @@
 # endif
 #endif
 
-#ifndef S_ISMPX /* AIX */
-# define S_ISMPX(m) 0
-#endif
-
 #ifndef S_ISNAM /* Xenix */
 # ifdef S_IFNAM
 #  define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM)
@@ -333,28 +311,16 @@
 #endif
 
 
-#if @GNULIB_FSTAT@
-# if @REPLACE_FSTAT@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fstat
-#   define fstat rpl_fstat
-#  endif
+#if @REPLACE_FSTAT@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define fstat rpl_fstat
+# endif
 _GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
-# else
+#else
 _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
-# endif
-_GL_CXXALIASWARN (fstat);
-#elif @WINDOWS_64_BIT_ST_SIZE@
-/* Above, we define stat to _stati64.  */
-# define fstat _fstati64
-#elif defined GNULIB_POSIXCHECK
-# undef fstat
-# if HAVE_RAW_DECL_FSTAT
-_GL_WARN_ON_USE (fstat, "fstat has portability problems - "
-                 "use gnulib module fstat for portability");
-# endif
 #endif
+_GL_CXXALIASWARN (fstat);
 
 
 #if @GNULIB_FSTATAT@
@@ -388,11 +354,7 @@
 
 
 #if @GNULIB_FUTIMENS@
-/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens
-   implementation relies on futimesat, which on Solaris 10 makes an invocation
-   to futimens that is meant to invoke the libc's futimens(), not gnulib's
-   futimens().  */
-# if @REPLACE_FUTIMENS@ || (!@HAVE_FUTIMENS@ && defined __sun)
+# if @REPLACE_FUTIMENS@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef futimens
 #   define futimens rpl_futimens
@@ -405,9 +367,7 @@
 #  endif
 _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
 # endif
-# if @HAVE_FUTIMENS@
 _GL_CXXALIASWARN (futimens);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef futimens
 # if HAVE_RAW_DECL_FUTIMENS
@@ -500,14 +460,11 @@
    which are included above.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-#  if !GNULIB_defined_rpl_mkdir
-static int
+static inline int
 rpl_mkdir (char const *name, mode_t mode)
 {
   return _mkdir (name);
 }
-#   define GNULIB_defined_rpl_mkdir 1
-#  endif
 
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mkdir rpl_mkdir
@@ -592,8 +549,7 @@
 _GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev)
                               _GL_ARG_NONNULL ((1)));
 #  endif
-/* Need to cast, because on OSF/1 5.1, the third parameter is '...'.  */
-_GL_CXXALIAS_SYS_CAST (mknod, int, (char const *file, mode_t mode, dev_t dev));
+_GL_CXXALIAS_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev));
 # endif
 _GL_CXXALIASWARN (mknod);
 #elif defined GNULIB_POSIXCHECK
@@ -628,59 +584,17 @@
 /* We can't use the object-like #define stat rpl_stat, because of
    struct stat.  This means that rpl_stat will not be used if the user
    does (stat)(a,b).  Oh well.  */
-#  if defined _AIX && defined stat && defined _LARGE_FILES
+#  undef stat
+#  ifdef _LARGE_FILES
     /* With _LARGE_FILES defined, AIX (only) defines stat to stat64,
        so we have to replace stat64() instead of stat(). */
+#   define stat stat64
 #   undef stat64
 #   define stat64(name, st) rpl_stat (name, st)
-#  elif @WINDOWS_64_BIT_ST_SIZE@
-    /* Above, we define stat to _stati64.  */
-#   if defined __MINGW32__ && defined _stati64
-#    ifndef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
-#    endif
-#   elif defined _MSC_VER && defined _stati64
-#    ifdef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat32i64.  */
-#     undef _stat32i64
-#     define _stat32i64(name, st) rpl_stat (name, st)
-#    else
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
-#    endif
-#   else
-#    undef _stati64
-#    define _stati64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined __MINGW32__ && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32i64.  */
-#    undef _stat32i64
-#    define _stat32i64(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64.  */
-#    undef _stat64
-#    define _stat64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined _MSC_VER && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32.  */
-#    undef _stat32
-#    define _stat32(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64i32.  */
-#    undef _stat64i32
-#    define _stat64i32(name, st) rpl_stat (name, st)
-#   endif
-#  else /* !(_AIX ||__MINGW32__ ||  _MSC_VER) */
-#   undef stat
+#  else /* !_LARGE_FILES */
 #   define stat(name, st) rpl_stat (name, st)
 #  endif /* !_LARGE_FILES */
-_GL_EXTERN_C int stat (const char *name, struct stat *buf)
-                      _GL_ARG_NONNULL ((1, 2));
+_GL_EXTERN_C int stat (const char *name, struct stat *buf) _GL_ARG_NONNULL ((1, 2));
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef stat
@@ -692,11 +606,7 @@
 
 
 #if @GNULIB_UTIMENSAT@
-/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat
-   implementation relies on futimesat, which on Solaris 10 makes an invocation
-   to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
-   utimensat().  */
-# if @REPLACE_UTIMENSAT@ || (!@HAVE_UTIMENSAT@ && defined __sun)
+# if @REPLACE_UTIMENSAT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef utimensat
 #   define utimensat rpl_utimensat
@@ -715,9 +625,7 @@
 _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
                                    struct timespec const times[2], int flag));
 # endif
-# if @HAVE_UTIMENSAT@
 _GL_CXXALIASWARN (utimensat);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef utimensat
 # if HAVE_RAW_DECL_UTIMENSAT
@@ -727,6 +635,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/sys_time.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/sys_time.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/sys_time.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/sys_time.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,213 +0,0 @@
-/* Provide a more complete sys/time.h.
-
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert.  */
-
-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
-   recursively via <sys/select.h>.
-   Simply delegate to the system's header in this case; it is a no-op.
-   Without this extra ifdef, the C++ gettimeofday declaration below
-   would be a forward declaration in gnulib's nested <sys/time.h>.  */
-#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-#else
-
-/* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_SYS_TIME_H@
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-#endif
-
-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
-#define _@GUARD_PREFIX@_SYS_TIME_H
-
-#if ! @HAVE_SYS_TIME_H@
-# include <time.h>
-#endif
-
-/* On native Windows with MSVC, get the 'struct timeval' type.
-   Also, on native Windows with a 64-bit time_t, where we are overriding the
-   'struct timeval' type, get all declarations of system functions whose
-   signature contains 'struct timeval'.  */
-#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
-# define _GL_INCLUDING_WINSOCK2_H
-# include <winsock2.h>
-# undef _GL_INCLUDING_WINSOCK2_H
-#endif
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
-
-# if @REPLACE_STRUCT_TIMEVAL@
-#  define timeval rpl_timeval
-# endif
-
-# if !GNULIB_defined_struct_timeval
-struct timeval
-{
-  time_t tv_sec;
-  long int tv_usec;
-};
-#  define GNULIB_defined_struct_timeval 1
-# endif
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#if @GNULIB_GETTIMEOFDAY@
-# if @REPLACE_GETTIMEOFDAY@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gettimeofday
-#   define gettimeofday rpl_gettimeofday
-#  endif
-_GL_FUNCDECL_RPL (gettimeofday, int,
-                  (struct timeval *restrict, void *restrict)
-                  _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gettimeofday, int,
-                  (struct timeval *restrict, void *restrict));
-# else
-#  if !@HAVE_GETTIMEOFDAY@
-_GL_FUNCDECL_SYS (gettimeofday, int,
-                  (struct timeval *restrict, void *restrict)
-                  _GL_ARG_NONNULL ((1)));
-#  endif
-/* Need to cast, because on glibc systems, by default, the second argument is
-                                                  struct timezone *.  */
-_GL_CXXALIAS_SYS_CAST (gettimeofday, int,
-                       (struct timeval *restrict, void *restrict));
-# endif
-_GL_CXXALIASWARN (gettimeofday);
-#elif defined GNULIB_POSIXCHECK
-# undef gettimeofday
-# if HAVE_RAW_DECL_GETTIMEOFDAY
-_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
-                 "use gnulib module gettimeofday for portability");
-# endif
-#endif
-
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if defined _MSC_VER && @HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_UNISTD_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef close
-#   define close close_used_without_including_unistd_h
-#  else
-     _GL_WARN_ON_USE (close,
-                      "close() used without including <unistd.h>");
-#  endif
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gethostname
-#   define gethostname gethostname_used_without_including_unistd_h
-#  else
-     _GL_WARN_ON_USE (gethostname,
-                      "gethostname() used without including <unistd.h>");
-#  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-     _GL_WARN_ON_USE (socket,
-                      "socket() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (connect,
-                      "connect() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (accept,
-                      "accept() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (bind,
-                      "bind() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getpeername,
-                      "getpeername() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockname,
-                      "getsockname() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockopt,
-                      "getsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (listen,
-                      "listen() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recv,
-                      "recv() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (send,
-                      "send() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recvfrom,
-                      "recvfrom() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (sendto,
-                      "sendto() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (setsockopt,
-                      "setsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (shutdown,
-                      "shutdown() used without including <sys/socket.h>");
-#  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef select
-#   define select select_used_without_including_sys_select_h
-#  else
-     _GL_WARN_ON_USE (select,
-                      "select() used without including <sys/select.h>");
-#  endif
-# endif
-#endif
-
-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
-#endif /* _CYGWIN_SYS_TIME_H */
-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/sys_types.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/sys_types.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/sys_types.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/sys_types.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Provide a more complete sys/types.h.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
-
-/* The include_next requires a split double-inclusion guard.  */
-# define _GL_INCLUDING_SYS_TYPES_H
-#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@
-# undef _GL_INCLUDING_SYS_TYPES_H
-
-#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
-#define _@GUARD_PREFIX@_SYS_TYPES_H
-
-/* Override off_t if Large File Support is requested on native Windows.  */
-#if @WINDOWS_64_BIT_OFF_T@
-/* Same as int64_t in <stdint.h>.  */
-# if defined _MSC_VER
-#  define off_t __int64
-# else
-#  define off_t long long int
-# endif
-/* Indicator, for gnulib internal purposes.  */
-# define _GL_WINDOWS_64_BIT_OFF_T 1
-#endif
-
-/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>.  */
-/* But avoid namespace pollution on glibc systems.  */
-#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
-    && ! defined __GLIBC__
-# include <stddef.h>
-#endif
-
-#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
-#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/time.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/time.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/time.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/time.in.h	2010-06-03 21:35:16.000000000 +0000
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,12 +13,12 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
@@ -27,13 +27,13 @@
    without adding our own declarations.  */
 #if (defined __need_time_t || defined __need_clock_t \
      || defined __need_timespec \
-     || defined _@GUARD_PREFIX@_TIME_H)
+     || defined _GL_TIME_H)
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
 #else
 
-# define _@GUARD_PREFIX@_TIME_H
+# define _GL_TIME_H
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
@@ -48,29 +48,33 @@
 
 /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
    Or they define it with the wrong member names or define it in <sys/time.h>
-   (e.g., FreeBSD circa 1997).  Stock Mingw prior to 3.0 does not define it,
-   but the pthreads-win32 library defines it in <pthread.h>.  */
+   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
+   pthreads-win32 library defines it in <pthread.h>.  */
 # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
 #  if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
+/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
+#   undef asctime_r
+#   undef ctime_r
+#   undef gmtime_r
+#   undef localtime_r
+#   undef rand_r
+#   undef strtok_r
 #  else
 
 #   ifdef __cplusplus
 extern "C" {
 #   endif
 
-#   if !GNULIB_defined_struct_timespec
-#    undef timespec
-#    define timespec rpl_timespec
+#   undef timespec
+#   define timespec rpl_timespec
 struct timespec
 {
   time_t tv_sec;
   long int tv_nsec;
 };
-#    define GNULIB_defined_struct_timespec 1
-#   endif
 
 #   ifdef __cplusplus
 }
@@ -79,18 +83,6 @@
 #  endif
 # endif
 
-# if !GNULIB_defined_struct_time_t_must_be_integral
-/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
-   time_t to be an integer type, even though C99 permits floating
-   point.  We don't know of any implementation that uses floating
-   point, and it is much easier to write code that doesn't have to
-   worry about that corner case, so we force the issue.  */
-struct __time_t_must_be_integral {
-  unsigned int __floating_time_t_unsupported : (time_t) 1;
-};
-#  define GNULIB_defined_struct_time_t_must_be_integral 1
-# endif
-
 /* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
    return -1 and store the remaining time into RMTP.  See
    <http://www.opengroup.org/susv3xsh/nanosleep.html>.  */
@@ -145,7 +137,7 @@
 _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  else
-#   if ! @HAVE_DECL_LOCALTIME_R@
+#   if ! @HAVE_LOCALTIME_R@
 _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result)
                                             _GL_ARG_NONNULL ((1, 2)));
@@ -153,9 +145,7 @@
 _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  endif
-#  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (localtime_r);
-#  endif
 #  if @REPLACE_LOCALTIME_R@
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef gmtime_r
@@ -167,7 +157,7 @@
 _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  else
-#   if ! @HAVE_DECL_LOCALTIME_R@
+#   if ! @HAVE_LOCALTIME_R@
 _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result)
                                          _GL_ARG_NONNULL ((1, 2)));
@@ -175,42 +165,7 @@
 _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  endif
-#  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (gmtime_r);
-#  endif
-# endif
-
-/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
-   <http://www.opengroup.org/susv3xsh/localtime.html> and
-   <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
-# if @GNULIB_GETTIMEOFDAY@
-#  if @REPLACE_LOCALTIME@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef localtime
-#    define localtime rpl_localtime
-#   endif
-_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
-		                          _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
-#  else
-_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
-#  endif
-_GL_CXXALIASWARN (localtime);
-# endif
-
-# if @GNULIB_GETTIMEOFDAY@
-#  if @REPLACE_GMTIME@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef gmtime
-#    define gmtime rpl_gmtime
-#   endif
-_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer)
-                                       _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer));
-#  else
-_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer));
-#  endif
-_GL_CXXALIASWARN (gmtime);
 # endif
 
 /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/trim.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/trim.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/trim.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/trim.c	2010-03-28 18:31:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This 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,7 +30,7 @@
 #include "mbiter.h"
 #include "xalloc.h"
 
-/* Use this to suppress gcc's "...may be used before initialized" warnings. */
+/* Use this to suppress gcc's `...may be used before initialized' warnings. */
 #ifdef lint
 # define IF_LINT(Code) Code
 #else
@@ -65,7 +65,7 @@
       /* Trim trailing whitespaces. */
       if (how != TRIM_LEADING)
         {
-          unsigned int state = 0;
+          int state = 0;
           char *r IF_LINT (= NULL); /* used only while state = 2 */
 
           mbi_init (i, d, strlen (d));
@@ -73,7 +73,10 @@
           for (; mbi_avail (i); mbi_advance (i))
             {
               if (state == 0 && mb_isspace (mbi_cur (i)))
-                continue;
+                {
+                  state = 0;
+                  continue;
+                }
 
               if (state == 0 && !mb_isspace (mbi_cur (i)))
                 {
@@ -82,7 +85,10 @@
                 }
 
               if (state == 1 && !mb_isspace (mbi_cur (i)))
-                continue;
+                {
+                  state = 1;
+                  continue;
+                }
 
               if (state == 1 && mb_isspace (mbi_cur (i)))
                 {
@@ -91,7 +97,7 @@
                 }
               else if (state == 2 && mb_isspace (mbi_cur (i)))
                 {
-                  /* empty */
+                  state = 2;
                 }
               else
                 {
@@ -108,22 +114,20 @@
       char *p;
 
       /* Trim leading whitespaces. */
-      if (how != TRIM_TRAILING)
-        {
-          for (p = d; *p && isspace ((unsigned char) *p); p++)
-            ;
+      if (how != TRIM_TRAILING) {
+        for (p = d; *p && isspace ((unsigned char) *p); p++)
+          ;
 
-          memmove (d, p, strlen (p) + 1);
-        }
+        memmove (d, p, strlen (p) + 1);
+      }
 
       /* Trim trailing whitespaces. */
-      if (how != TRIM_LEADING)
-        {
-          for (p = d + strlen (d) - 1;
-               p >= d && isspace ((unsigned char) *p); p--)
-            *p = '\0';
-        }
+      if (how != TRIM_LEADING) {
+        for (p = d + strlen (d) - 1; p >= d && isspace ((unsigned char) *p); p--)
+          *p = '\0';
+      }
     }
 
   return d;
 }
+
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/trim.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/trim.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/trim.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/trim.h	2010-03-28 18:31:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unistd.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistd.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unistd.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
-#include "unistd.h"
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unistd.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistd.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unistd.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistd.in.h	2010-05-09 11:03:17.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,32 +12,34 @@
    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 _@GUARD_PREFIX@_UNISTD_H
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#ifdef _GL_INCLUDING_UNISTD_H
 /* Special invocation convention:
-   - On Mac OS X 10.3.9 we have a sequence of nested includes
-     <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
-
-#@INCLUDE_NEXT@ @NEXT_UNISTD_H@
+   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
+     but we need to ensure that both the system <unistd.h> and <winsock2.h>
+     are completely included before we replace gethostname.  */
+#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
+/* <unistd.h> is being indirectly included for the first time from
+   <winsock2.h>; avoid declaring any overrides.  */
+# if @HAVE_UNISTD_H@
+#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# else
+#  error unexpected; report this to bug-gnulib@gnu.org
+# endif
+# define _GL_WINSOCK2_H_WITNESS
 
-#else
-/* Normal invocation convention.  */
+/* Normal invocation.  */
+#elif !defined _GL_UNISTD_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
-# define _GL_INCLUDING_UNISTD_H
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
-# undef _GL_INCLUDING_UNISTD_H
 #endif
 
 /* Get all possible declarations of gethostname().  */
@@ -48,8 +50,8 @@
 # undef _GL_INCLUDING_WINSOCK2_H
 #endif
 
-#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
-#define _@GUARD_PREFIX@_UNISTD_H
+#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
+#define _GL_UNISTD_H
 
 /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
 #include <stddef.h>
@@ -58,66 +60,32 @@
 /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
-     || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
-         && defined __CYGWIN__)) \
+     || (@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK)) \
     && ! defined __GLIBC__
 # include <stdio.h>
 #endif
 
 /* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
-    && ! defined __GLIBC__
+#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__
 # include <fcntl.h>
 #endif
 
 /* mingw fails to declare _exit in <unistd.h>.  */
-/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
-   <unistd.h>.  */
+/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
 /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
-/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
-   included here.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if !defined __GLIBC__ && !defined __osf__
-# define __need_system_stdlib_h
+#ifndef __GLIBC__
 # include <stdlib.h>
-# undef __need_system_stdlib_h
 #endif
 
-/* Native Windows platforms declare chdir, getcwd, rmdir in
-   <io.h> and/or <direct.h>, not in <unistd.h>.
-   They also declare access(), chmod(), close(), dup(), dup2(), isatty(),
-   lseek(), read(), unlink(), write() in <io.h>.  */
-#if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \
-      || defined GNULIB_POSIXCHECK) \
+/* mingw declares getcwd in <io.h>, not in <unistd.h>.  */
+#if ((@GNULIB_GETCWD@ || defined GNULIB_POSIXCHECK) \
      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-# include <io.h>     /* mingw32, mingw64 */
-# include <direct.h> /* mingw64, MSVC 9 */
-#elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \
-       || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \
-       || defined GNULIB_POSIXCHECK) \
-      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 # include <io.h>
 #endif
 
-/* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
-   NonStop Kernel declares gethostname in <netdb.h>, not in <unistd.h>.  */
-/* But avoid namespace pollution on glibc systems.  */
-#if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \
-     || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \
-    && !defined __GLIBC__
-# include <netdb.h>
-#endif
-
-/* MSVC defines off_t in <sys/types.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
-#if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@
-/* Get off_t.  */
-# include <sys/types.h>
-#endif
-
-#if (@GNULIB_READ@ || @GNULIB_WRITE@ \
-     || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
+#if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
      || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
 /* Get ssize_t.  */
 # include <sys/types.h>
@@ -130,18 +98,9 @@
    gettext-tools/libgettextpo/, but there is only a single
    GNULIB_UNISTD_H_GETOPT variable for both.  */
 #if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
-# define __need_getopt
 # include <getopt.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GL_UNISTD_INLINE
-# define _GL_UNISTD_INLINE _GL_INLINE
-#endif
-
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -149,77 +108,78 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-    _GL_WARN_ON_USE (socket,
-                     "socket() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (connect,
-                     "connect() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (accept,
-                     "accept() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (bind,
-                     "bind() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getpeername,
-                     "getpeername() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockname,
-                     "getsockname() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockopt,
-                     "getsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (listen,
-                     "listen() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recv,
-                     "recv() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (send,
-                     "send() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recvfrom,
-                     "recvfrom() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (sendto,
-                     "sendto() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (setsockopt,
-                     "setsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (shutdown,
-                     "shutdown() used without including <sys/socket.h>");
+#if @GNULIB_GETHOSTNAME@
+/* Get all possible declarations of gethostname().  */
+# if @UNISTD_H_HAVE_WINSOCK2_H@
+#  if !defined _GL_SYS_SOCKET_H
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef socket
+#    define socket              socket_used_without_including_sys_socket_h
+#    undef connect
+#    define connect             connect_used_without_including_sys_socket_h
+#    undef accept
+#    define accept              accept_used_without_including_sys_socket_h
+#    undef bind
+#    define bind                bind_used_without_including_sys_socket_h
+#    undef getpeername
+#    define getpeername         getpeername_used_without_including_sys_socket_h
+#    undef getsockname
+#    define getsockname         getsockname_used_without_including_sys_socket_h
+#    undef getsockopt
+#    define getsockopt          getsockopt_used_without_including_sys_socket_h
+#    undef listen
+#    define listen              listen_used_without_including_sys_socket_h
+#    undef recv
+#    define recv                recv_used_without_including_sys_socket_h
+#    undef send
+#    define send                send_used_without_including_sys_socket_h
+#    undef recvfrom
+#    define recvfrom            recvfrom_used_without_including_sys_socket_h
+#    undef sendto
+#    define sendto              sendto_used_without_including_sys_socket_h
+#    undef setsockopt
+#    define setsockopt          setsockopt_used_without_including_sys_socket_h
+#    undef shutdown
+#    define shutdown            shutdown_used_without_including_sys_socket_h
+#   else
+     _GL_WARN_ON_USE (socket,
+                      "socket() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (connect,
+                      "connect() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (accept,
+                      "accept() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (bind,
+                      "bind() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getpeername,
+                      "getpeername() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockname,
+                      "getsockname() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockopt,
+                      "getsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (listen,
+                      "listen() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recv,
+                      "recv() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (send,
+                      "send() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recvfrom,
+                      "recvfrom() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (sendto,
+                      "sendto() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (setsockopt,
+                      "setsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (shutdown,
+                      "shutdown() used without including <sys/socket.h>");
+#   endif
 #  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef select
-#   define select              select_used_without_including_sys_select_h
-#  else
-    _GL_WARN_ON_USE (select,
-                     "select() used without including <sys/select.h>");
+#  if !defined _GL_SYS_SELECT_H
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef select
+#    define select              select_used_without_including_sys_select_h
+#   else
+     _GL_WARN_ON_USE (select,
+                      "select() used without including <sys/select.h>");
+#   endif
 #  endif
 # endif
 #endif
@@ -255,24 +215,12 @@
 #endif
 
 
-#if @GNULIB_CHDIR@
-_GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIASWARN (chdir);
-#elif defined GNULIB_POSIXCHECK
-# undef chdir
-# if HAVE_RAW_DECL_CHDIR
-_GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - "
-                 "use gnulib module chdir for portability");
-# endif
-#endif
-
-
 #if @GNULIB_CHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/chown.html.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/chown.html>.  */
 # if @REPLACE_CHOWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef chown
@@ -323,32 +271,24 @@
 #endif
 
 
-#if @GNULIB_DUP@
-# if @REPLACE_DUP@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define dup rpl_dup
-#  endif
+#if @REPLACE_DUP@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define dup rpl_dup
+# endif
 _GL_FUNCDECL_RPL (dup, int, (int oldfd));
 _GL_CXXALIAS_RPL (dup, int, (int oldfd));
-# else
+#else
 _GL_CXXALIAS_SYS (dup, int, (int oldfd));
-# endif
-_GL_CXXALIASWARN (dup);
-#elif defined GNULIB_POSIXCHECK
-# undef dup
-# if HAVE_RAW_DECL_DUP
-_GL_WARN_ON_USE (dup, "dup is unportable - "
-                 "use gnulib module dup for portability");
-# endif
 #endif
+_GL_CXXALIASWARN (dup);
 
 
 #if @GNULIB_DUP2@
 /* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
    NEWFD = OLDFD, otherwise close NEWFD first if it is open.
    Return newfd if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup2.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/dup2.html>.  */
 # if @REPLACE_DUP2@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup2 rpl_dup2
@@ -419,7 +359,7 @@
 # endif
 #elif defined GNULIB_POSIXCHECK
 # if HAVE_RAW_DECL_ENVIRON
-_GL_UNISTD_INLINE char ***
+static inline char ***
 rpl_environ (void)
 {
   return &environ;
@@ -477,8 +417,8 @@
 /* Change the process' current working directory to the directory on which
    the given file descriptor is open.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fchdir.html>.  */
 # if ! @HAVE_FCHDIR@
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
 
@@ -489,10 +429,6 @@
 _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
 
-# else
-#  if !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-#  endif
 # endif
 _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
 _GL_CXXALIASWARN (fchdir);
@@ -535,30 +471,11 @@
 #endif
 
 
-#if @GNULIB_FDATASYNC@
-/* Synchronize changes to a file.
-   Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
-# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
-_GL_FUNCDECL_SYS (fdatasync, int, (int fd));
-# endif
-_GL_CXXALIAS_SYS (fdatasync, int, (int fd));
-_GL_CXXALIASWARN (fdatasync);
-#elif defined GNULIB_POSIXCHECK
-# undef fdatasync
-# if HAVE_RAW_DECL_FDATASYNC
-_GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
-                 "use gnulib module fdatasync for portability");
-# endif
-#endif
-
-
 #if @GNULIB_FSYNC@
-/* Synchronize changes, including metadata, to a file.
+/* Synchronize changes to a file.
    Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
+   See POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fsync.html>.  */
 # if !@HAVE_FSYNC@
 _GL_FUNCDECL_SYS (fsync, int, (int fd));
 # endif
@@ -576,21 +493,12 @@
 #if @GNULIB_FTRUNCATE@
 /* Change the size of the file to which FD is opened to become equal to LENGTH.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ftruncate.html>.  */
-# if @REPLACE_FTRUNCATE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ftruncate
-#   define ftruncate rpl_ftruncate
-#  endif
-_GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length));
-_GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length));
-# else
-#  if !@HAVE_FTRUNCATE@
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/ftruncate.html>.  */
+# if !@HAVE_FTRUNCATE@
 _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
-#  endif
-_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 # endif
+_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 _GL_CXXALIASWARN (ftruncate);
 #elif defined GNULIB_POSIXCHECK
 # undef ftruncate
@@ -606,8 +514,8 @@
    of BUF.
    Return BUF if successful, or NULL if the directory couldn't be determined
    or SIZE was too small.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getcwd.html>.
    Additionally, the gnulib module 'getcwd' guarantees the following GNU
    extension: If BUF is NULL, an array is allocated with 'malloc'; the array
    is SIZE bytes long, unless SIZE == 0, in which case it is as big as
@@ -644,21 +552,13 @@
    Null terminate it if the name is shorter than LEN.
    If the NIS domain name is longer than LEN, set errno = EINVAL and return -1.
    Return 0 if successful, otherwise set errno and return -1.  */
-# if @REPLACE_GETDOMAINNAME@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getdomainname
-#   define getdomainname rpl_getdomainname
-#  endif
-_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len)
-                                      _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
-# else
-#  if !@HAVE_DECL_GETDOMAINNAME@
+# if !@HAVE_GETDOMAINNAME@
 _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
                                       _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len));
 # endif
+/* Need to cast, because on MacOS X 10.5 systems, the second parameter is
+                                                        int len.  */
+_GL_CXXALIAS_SYS_CAST (getdomainname, int, (char *name, size_t len));
 _GL_CXXALIASWARN (getdomainname);
 #elif defined GNULIB_POSIXCHECK
 # undef getdomainname
@@ -672,19 +572,10 @@
 #if @GNULIB_GETDTABLESIZE@
 /* Return the maximum number of file descriptors in the current process.
    In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
-# if @REPLACE_GETDTABLESIZE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getdtablesize
-#   define getdtablesize rpl_getdtablesize
-#  endif
-_GL_FUNCDECL_RPL (getdtablesize, int, (void));
-_GL_CXXALIAS_RPL (getdtablesize, int, (void));
-# else
-#  if !@HAVE_GETDTABLESIZE@
+# if !@HAVE_GETDTABLESIZE@
 _GL_FUNCDECL_SYS (getdtablesize, int, (void));
-#  endif
-_GL_CXXALIAS_SYS (getdtablesize, int, (void));
 # endif
+_GL_CXXALIAS_SYS (getdtablesize, int, (void));
 _GL_CXXALIASWARN (getdtablesize);
 #elif defined GNULIB_POSIXCHECK
 # undef getdtablesize
@@ -745,8 +636,7 @@
 _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
 #  endif
-/* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second
-   parameter is
+/* Need to cast, because on Solaris 10 systems, the second parameter is
                                                       int len.  */
 _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
 # endif
@@ -803,22 +693,13 @@
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if @REPLACE_GETLOGIN_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define getlogin_r rpl_getlogin_r
-#  endif
-_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size)
-                                   _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
-# else
-#  if !@HAVE_DECL_GETLOGIN_R@
+# if !@HAVE_DECL_GETLOGIN_R@
 _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
                                    _GL_ARG_NONNULL ((1)));
-#  endif
+# endif
 /* Need to cast, because on Solaris 10 systems, the second argument is
                                                      int size.  */
 _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
-# endif
 _GL_CXXALIASWARN (getlogin_r);
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin_r
@@ -885,14 +766,11 @@
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #     define getpagesize() _gl_getpagesize ()
 #    else
-#     if !GNULIB_defined_getpagesize_function
-_GL_UNISTD_INLINE int
+static inline int
 getpagesize ()
 {
   return _gl_getpagesize ();
 }
-#      define GNULIB_defined_getpagesize_function 1
-#     endif
 #    endif
 #   endif
 #  endif
@@ -959,49 +837,12 @@
 #endif
 
 
-#if @GNULIB_GROUP_MEMBER@
-/* Determine whether group id is in calling user's group list.  */
-# if !@HAVE_GROUP_MEMBER@
-_GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
-# endif
-_GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
-_GL_CXXALIASWARN (group_member);
-#elif defined GNULIB_POSIXCHECK
-# undef group_member
-# if HAVE_RAW_DECL_GROUP_MEMBER
-_GL_WARN_ON_USE (group_member, "group_member is unportable - "
-                 "use gnulib module group-member for portability");
-# endif
-#endif
-
-
-#if @GNULIB_ISATTY@
-# if @REPLACE_ISATTY@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef isatty
-#   define isatty rpl_isatty
-#  endif
-_GL_FUNCDECL_RPL (isatty, int, (int fd));
-_GL_CXXALIAS_RPL (isatty, int, (int fd));
-# else
-_GL_CXXALIAS_SYS (isatty, int, (int fd));
-# endif
-_GL_CXXALIASWARN (isatty);
-#elif defined GNULIB_POSIXCHECK
-# undef isatty
-# if HAVE_RAW_DECL_ISATTY
-_GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
-                 "use gnulib module isatty for portability");
-# endif
-#endif
-
-
 #if @GNULIB_LCHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Do not follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lchown.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lchown.html>.  */
 # if @REPLACE_LCHOWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef lchown
@@ -1030,8 +871,8 @@
 #if @GNULIB_LINK@
 /* Create a new hard link for an existing file.
    Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/link.html>.  */
+   See POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/link.html>.  */
 # if @REPLACE_LINK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define link rpl_link
@@ -1096,8 +937,8 @@
 #if @GNULIB_LSEEK@
 /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
    Return the new offset if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lseek.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lseek.html>.  */
 # if @REPLACE_LSEEK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define lseek rpl_lseek
@@ -1117,24 +958,6 @@
 #endif
 
 
-#if @GNULIB_PIPE@
-/* Create a pipe, defaulting to O_BINARY mode.
-   Store the read-end as fd[0] and the write-end as fd[1].
-   Return 0 upon success, or -1 with errno set upon failure.  */
-# if !@HAVE_PIPE@
-_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
-_GL_CXXALIASWARN (pipe);
-#elif defined GNULIB_POSIXCHECK
-# undef pipe
-# if HAVE_RAW_DECL_PIPE
-_GL_WARN_ON_USE (pipe, "pipe is unportable - "
-                 "use gnulib module pipe-posix for portability");
-# endif
-#endif
-
-
 #if @GNULIB_PIPE2@
 /* Create a pipe, applying the given flags when opening the read-end of the
    pipe and the write-end of the pipe.
@@ -1167,12 +990,10 @@
 #if @GNULIB_PREAD@
 /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET.
    Return the number of bytes placed into BUF if successful, otherwise
-   set errno and return -1.  0 indicates EOF.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pread.html>.  */
+   set errno and return -1.  0 indicates EOF.  See the POSIX:2001
+   specification <http://www.opengroup.org/susv3xsh/pread.html>.  */
 # if @REPLACE_PREAD@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pread
 #   define pread rpl_pread
 #  endif
 _GL_FUNCDECL_RPL (pread, ssize_t,
@@ -1203,11 +1024,10 @@
 /* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET.
    Return the number of bytes written if successful, otherwise
    set errno and return -1.  0 indicates nothing written.  See the
-   POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pwrite.html>.  */
+   POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/pwrite.html>.  */
 # if @REPLACE_PWRITE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pwrite
 #   define pwrite rpl_pwrite
 #  endif
 _GL_FUNCDECL_RPL (pwrite, ssize_t,
@@ -1234,34 +1054,12 @@
 #endif
 
 
-#if @GNULIB_READ@
-/* Read up to COUNT bytes from file descriptor FD into the buffer starting
-   at BUF.  See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/read.html>.  */
-# if @REPLACE_READ@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef read
-#   define read rpl_read
-#  endif
-_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count)
-                                 _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count));
-# else
-/* Need to cast, because on mingw, the third parameter is
-                                                          unsigned int count
-   and the return type is 'int'.  */
-_GL_CXXALIAS_SYS_CAST (read, ssize_t, (int fd, void *buf, size_t count));
-# endif
-_GL_CXXALIASWARN (read);
-#endif
-
-
 #if @GNULIB_READLINK@
 /* Read the contents of the symbolic link FILE and place the first BUFSIZE
    bytes of it into BUF.  Return the number of bytes placed into BUF if
    successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/readlink.html>.  */
 # if @REPLACE_READLINK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define readlink rpl_readlink
@@ -1303,7 +1101,7 @@
 # undef readlinkat
 # if HAVE_RAW_DECL_READLINKAT
 _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - "
-                 "use gnulib module readlinkat for portability");
+                 "use gnulib module symlinkat for portability");
 # endif
 #endif
 
@@ -1329,38 +1127,11 @@
 #endif
 
 
-#if @GNULIB_SETHOSTNAME@
-/* Set the host name of the machine.
-   The host name may or may not be fully qualified.
-
-   Put LEN bytes of NAME into the host name.
-   Return 0 if successful, otherwise, set errno and return -1.
-
-   Platforms with no ability to set the hostname return -1 and set
-   errno = ENOSYS.  */
-# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
-_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
-                                    _GL_ARG_NONNULL ((1)));
-# endif
-/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
-   and FreeBSD 6.4 the second parameter is int.  On Solaris 11
-   2011-10, the first parameter is not const.  */
-_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
-_GL_CXXALIASWARN (sethostname);
-#elif defined GNULIB_POSIXCHECK
-# undef sethostname
-# if HAVE_RAW_DECL_SETHOSTNAME
-_GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
-                 "use gnulib module sethostname for portability");
-# endif
-#endif
-
-
 #if @GNULIB_SLEEP@
 /* Pause the execution of the current thread for N seconds.
    Returns the number of seconds left to sleep.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sleep.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
 # if @REPLACE_SLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef sleep
@@ -1441,7 +1212,7 @@
 _GL_CXXALIAS_RPL (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # else
-#  if !@HAVE_DECL_TTYNAME_R@
+#  if !@HAVE_TTYNAME_R@
 _GL_FUNCDECL_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
 #  endif
@@ -1509,7 +1280,7 @@
 /* Pause the execution of the current thread for N microseconds.
    Returns 0 on completion, or -1 on range error.
    See the POSIX:2001 specification
-   <http://www.opengroup.org/susv3xsh/usleep.html>.  */
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
 # if @REPLACE_USLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef usleep
@@ -1535,9 +1306,9 @@
 
 #if @GNULIB_WRITE@
 /* Write up to COUNT bytes starting at BUF to file descriptor FD.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html>.  */
-# if @REPLACE_WRITE@
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/write.html>.  */
+# if @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef write
 #   define write rpl_write
@@ -1554,8 +1325,6 @@
 _GL_CXXALIASWARN (write);
 #endif
 
-_GL_INLINE_HEADER_END
 
-#endif /* _@GUARD_PREFIX@_UNISTD_H */
-#endif /* _GL_INCLUDING_UNISTD_H */
-#endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _GL_UNISTD_H */
+#endif /* _GL_UNISTD_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,285 +0,0 @@
-/* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 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
-   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>
-
-/* Specification.  */
-#include "unistr.h"
-
-int
-u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n)
-{
-  uint8_t c = *s;
-
-  if (c < 0x80)
-    {
-      *puc = c;
-      return 1;
-    }
-  else if (c >= 0xc2)
-    {
-      if (c < 0xe0)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  *puc = ((unsigned int) (c & 0x1f) << 6)
-                         | (unsigned int) (s[1] ^ 0x80);
-                  return 2;
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-      else if (c < 0xf0)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xe1 || s[1] >= 0xa0)
-                  && (c != 0xed || s[1] < 0xa0))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-      else if (c < 0xf8)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xf1 || s[1] >= 0x90)
-#if 1
-                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
-#endif
-                 )
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  *puc = ((unsigned int) (c & 0x07) << 18)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                         | (unsigned int) (s[3] ^ 0x80);
-                                  return 4;
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-#if 0
-      else if (c < 0xfc)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xf9 || s[1] >= 0x88))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  if (n >= 5)
-                                    {
-                                      if ((s[4] ^ 0x80) < 0x40)
-                                        {
-                                          *puc = ((unsigned int) (c & 0x03) << 24)
-                                                 | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                                 | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                                 | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                                 | (unsigned int) (s[4] ^ 0x80);
-                                          return 5;
-                                        }
-                                      /* invalid multibyte character */
-                                    }
-                                  else
-                                    {
-                                      /* incomplete multibyte character */
-                                      *puc = 0xfffd;
-                                      return -2;
-                                    }
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-      else if (c < 0xfe)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xfd || s[1] >= 0x84))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  if (n >= 5)
-                                    {
-                                      if ((s[4] ^ 0x80) < 0x40)
-                                        {
-                                          if (n >= 6)
-                                            {
-                                              if ((s[5] ^ 0x80) < 0x40)
-                                                {
-                                                  *puc = ((unsigned int) (c & 0x01) << 30)
-                                                         | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                                         | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                                         | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                                         | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                                         | (unsigned int) (s[5] ^ 0x80);
-                                                  return 6;
-                                                }
-                                              /* invalid multibyte character */
-                                            }
-                                          else
-                                            {
-                                              /* incomplete multibyte character */
-                                              *puc = 0xfffd;
-                                              return -2;
-                                            }
-                                        }
-                                      /* invalid multibyte character */
-                                    }
-                                  else
-                                    {
-                                      /* incomplete multibyte character */
-                                      *puc = 0xfffd;
-                                      return -2;
-                                    }
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-#endif
-    }
-  /* invalid multibyte character */
-  *puc = 0xfffd;
-  return -1;
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2014 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
-   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>
-
-/* Specification.  */
-#include "unistr.h"
-
-int
-u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n)
-{
-  int count;
-
-  if (uc < 0x80)
-    /* The case n >= 1 is already handled by the caller.  */
-    return -2;
-  else if (uc < 0x800)
-    count = 2;
-  else if (uc < 0x10000)
-    {
-      if (uc < 0xd800 || uc >= 0xe000)
-        count = 3;
-      else
-        return -1;
-    }
-#if 0
-  else if (uc < 0x200000)
-    count = 4;
-  else if (uc < 0x4000000)
-    count = 5;
-  else if (uc <= 0x7fffffff)
-    count = 6;
-#else
-  else if (uc < 0x110000)
-    count = 4;
-#endif
-  else
-    return -1;
-
-  if (n < count)
-    return -2;
-
-  switch (count) /* note: code falls through cases! */
-    {
-#if 0
-    case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000;
-    case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000;
-#endif
-    case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000;
-    case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800;
-    case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0;
-  /*case 1:*/ s[0] = uc;
-    }
-  return count;
-}
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2014 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
-   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>
-
-#if defined IN_LIBUNISTRING
-/* Tell unistr.h to declare u8_uctomb as 'extern', not 'static inline'.  */
-# include "unistring-notinline.h"
-#endif
-
-/* Specification.  */
-#include "unistr.h"
-
-#if !HAVE_INLINE
-
-int
-u8_uctomb (uint8_t *s, ucs4_t uc, int n)
-{
-  if (uc < 0x80)
-    {
-      if (n > 0)
-        {
-          s[0] = uc;
-          return 1;
-        }
-      /* else return -2, below.  */
-    }
-  else
-    {
-      int count;
-
-      if (uc < 0x800)
-        count = 2;
-      else if (uc < 0x10000)
-        {
-          if (uc < 0xd800 || uc >= 0xe000)
-            count = 3;
-          else
-            return -1;
-        }
-#if 0
-      else if (uc < 0x200000)
-        count = 4;
-      else if (uc < 0x4000000)
-        count = 5;
-      else if (uc <= 0x7fffffff)
-        count = 6;
-#else
-      else if (uc < 0x110000)
-        count = 4;
-#endif
-      else
-        return -1;
-
-      if (n >= count)
-        {
-          switch (count) /* note: code falls through cases! */
-            {
-#if 0
-            case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000;
-            case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000;
-#endif
-            case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000;
-            case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800;
-            case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0;
-          /*case 1:*/ s[0] = uc;
-            }
-          return count;
-        }
-    }
-  return -2;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unistr.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unistr.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unistr.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,750 +0,0 @@
-/* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc.
-
-   This 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 _UNISTR_H
-#define _UNISTR_H
-
-#include "unitypes.h"
-
-/* Get common macros for C.  */
-#include "unused-parameter.h"
-
-/* Get bool.  */
-#include <stdbool.h>
-
-/* Get size_t.  */
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Conventions:
-
-   All functions prefixed with u8_ operate on UTF-8 encoded strings.
-   Their unit is an uint8_t (1 byte).
-
-   All functions prefixed with u16_ operate on UTF-16 encoded strings.
-   Their unit is an uint16_t (a 2-byte word).
-
-   All functions prefixed with u32_ operate on UCS-4 encoded strings.
-   Their unit is an uint32_t (a 4-byte word).
-
-   All argument pairs (s, n) denote a Unicode string s[0..n-1] with exactly
-   n units.
-
-   All arguments starting with "str" and the arguments of functions starting
-   with u8_str/u16_str/u32_str denote a NUL terminated string, i.e. a string
-   which terminates at the first NUL unit.  This termination unit is
-   considered part of the string for all memory allocation purposes, but
-   is not considered part of the string for all other logical purposes.
-
-   Functions returning a string result take a (resultbuf, lengthp) argument
-   pair.  If resultbuf is not NULL and the result fits into *lengthp units,
-   it is put in resultbuf, and resultbuf is returned.  Otherwise, a freshly
-   allocated string is returned.  In both cases, *lengthp is set to the
-   length (number of units) of the returned string.  In case of error,
-   NULL is returned and errno is set.  */
-
-
-/* Elementary string checks.  */
-
-/* Check whether an UTF-8 string is well-formed.
-   Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
-extern const uint8_t *
-       u8_check (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-/* Check whether an UTF-16 string is well-formed.
-   Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
-extern const uint16_t *
-       u16_check (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-/* Check whether an UCS-4 string is well-formed.
-   Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
-extern const uint32_t *
-       u32_check (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-
-/* Elementary string conversions.  */
-
-/* Convert an UTF-8 string to an UTF-16 string.  */
-extern uint16_t *
-       u8_to_u16 (const uint8_t *s, size_t n, uint16_t *resultbuf,
-                  size_t *lengthp);
-
-/* Convert an UTF-8 string to an UCS-4 string.  */
-extern uint32_t *
-       u8_to_u32 (const uint8_t *s, size_t n, uint32_t *resultbuf,
-                  size_t *lengthp);
-
-/* Convert an UTF-16 string to an UTF-8 string.  */
-extern uint8_t *
-       u16_to_u8 (const uint16_t *s, size_t n, uint8_t *resultbuf,
-                  size_t *lengthp);
-
-/* Convert an UTF-16 string to an UCS-4 string.  */
-extern uint32_t *
-       u16_to_u32 (const uint16_t *s, size_t n, uint32_t *resultbuf,
-                   size_t *lengthp);
-
-/* Convert an UCS-4 string to an UTF-8 string.  */
-extern uint8_t *
-       u32_to_u8 (const uint32_t *s, size_t n, uint8_t *resultbuf,
-                  size_t *lengthp);
-
-/* Convert an UCS-4 string to an UTF-16 string.  */
-extern uint16_t *
-       u32_to_u16 (const uint32_t *s, size_t n, uint16_t *resultbuf,
-                   size_t *lengthp);
-
-
-/* Elementary string functions.  */
-
-/* Return the length (number of units) of the first character in S, which is
-   no longer than N.  Return 0 if it is the NUL character.  Return -1 upon
-   failure.  */
-/* Similar to mblen(), except that s must not be NULL.  */
-extern int
-       u8_mblen (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u16_mblen (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u32_mblen (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-/* Return the length (number of units) of the first character in S, putting
-   its 'ucs4_t' representation in *PUC.  Upon failure, *PUC is set to 0xfffd,
-   and an appropriate number of units is returned.
-   The number of available units, N, must be > 0.  */
-/* Similar to mbtowc(), except that puc and s must not be NULL, n must be > 0,
-   and the NUL character is not treated specially.  */
-/* The variants with _safe suffix are safe, even if the library is compiled
-   without --enable-safety.  */
-
-#if GNULIB_UNISTR_U8_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n);
-# else
-extern int
-       u8_mbtouc_unsafe_aux (ucs4_t *puc, const uint8_t *s, size_t n);
-static inline int
-u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n)
-{
-  uint8_t c = *s;
-
-  if (c < 0x80)
-    {
-      *puc = c;
-      return 1;
-    }
-  else
-    return u8_mbtouc_unsafe_aux (puc, s, n);
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U16_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n);
-# else
-extern int
-       u16_mbtouc_unsafe_aux (ucs4_t *puc, const uint16_t *s, size_t n);
-static inline int
-u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n)
-{
-  uint16_t c = *s;
-
-  if (c < 0xd800 || c >= 0xe000)
-    {
-      *puc = c;
-      return 1;
-    }
-  else
-    return u16_mbtouc_unsafe_aux (puc, s, n);
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U32_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n);
-# else
-static inline int
-u32_mbtouc_unsafe (ucs4_t *puc,
-                   const uint32_t *s, size_t n _GL_UNUSED_PARAMETER)
-{
-  uint32_t c = *s;
-
-#  if CONFIG_UNICODE_SAFETY
-  if (c < 0xd800 || (c >= 0xe000 && c < 0x110000))
-#  endif
-    *puc = c;
-#  if CONFIG_UNICODE_SAFETY
-  else
-    /* invalid multibyte character */
-    *puc = 0xfffd;
-#  endif
-  return 1;
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U8_MBTOUC || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n);
-# else
-extern int
-       u8_mbtouc_aux (ucs4_t *puc, const uint8_t *s, size_t n);
-static inline int
-u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
-{
-  uint8_t c = *s;
-
-  if (c < 0x80)
-    {
-      *puc = c;
-      return 1;
-    }
-  else
-    return u8_mbtouc_aux (puc, s, n);
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U16_MBTOUC || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
-# else
-extern int
-       u16_mbtouc_aux (ucs4_t *puc, const uint16_t *s, size_t n);
-static inline int
-u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n)
-{
-  uint16_t c = *s;
-
-  if (c < 0xd800 || c >= 0xe000)
-    {
-      *puc = c;
-      return 1;
-    }
-  else
-    return u16_mbtouc_aux (puc, s, n);
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U32_MBTOUC || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
-# else
-static inline int
-u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n _GL_UNUSED_PARAMETER)
-{
-  uint32_t c = *s;
-
-  if (c < 0xd800 || (c >= 0xe000 && c < 0x110000))
-    *puc = c;
-  else
-    /* invalid multibyte character */
-    *puc = 0xfffd;
-  return 1;
-}
-# endif
-#endif
-
-/* Return the length (number of units) of the first character in S, putting
-   its 'ucs4_t' representation in *PUC.  Upon failure, *PUC is set to 0xfffd,
-   and -1 is returned for an invalid sequence of units, -2 is returned for an
-   incomplete sequence of units.
-   The number of available units, N, must be > 0.  */
-/* Similar to u*_mbtouc(), except that the return value gives more details
-   about the failure, similar to mbrtowc().  */
-
-#if GNULIB_UNISTR_U8_MBTOUCR || HAVE_LIBUNISTRING
-extern int
-       u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n);
-#endif
-
-#if GNULIB_UNISTR_U16_MBTOUCR || HAVE_LIBUNISTRING
-extern int
-       u16_mbtoucr (ucs4_t *puc, const uint16_t *s, size_t n);
-#endif
-
-#if GNULIB_UNISTR_U32_MBTOUCR || HAVE_LIBUNISTRING
-extern int
-       u32_mbtoucr (ucs4_t *puc, const uint32_t *s, size_t n);
-#endif
-
-/* Put the multibyte character represented by UC in S, returning its
-   length.  Return -1 upon failure, -2 if the number of available units, N,
-   is too small.  The latter case cannot occur if N >= 6/2/1, respectively.  */
-/* Similar to wctomb(), except that s must not be NULL, and the argument n
-   must be specified.  */
-
-#if GNULIB_UNISTR_U8_UCTOMB || HAVE_LIBUNISTRING
-/* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr.  */
-extern int
-       u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
-# if !HAVE_INLINE
-extern int
-       u8_uctomb (uint8_t *s, ucs4_t uc, int n);
-# else
-static inline int
-u8_uctomb (uint8_t *s, ucs4_t uc, int n)
-{
-  if (uc < 0x80 && n > 0)
-    {
-      s[0] = uc;
-      return 1;
-    }
-  else
-    return u8_uctomb_aux (s, uc, n);
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U16_UCTOMB || HAVE_LIBUNISTRING
-/* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr.  */
-extern int
-       u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
-# if !HAVE_INLINE
-extern int
-       u16_uctomb (uint16_t *s, ucs4_t uc, int n);
-# else
-static inline int
-u16_uctomb (uint16_t *s, ucs4_t uc, int n)
-{
-  if (uc < 0xd800 && n > 0)
-    {
-      s[0] = uc;
-      return 1;
-    }
-  else
-    return u16_uctomb_aux (s, uc, n);
-}
-# endif
-#endif
-
-#if GNULIB_UNISTR_U32_UCTOMB || HAVE_LIBUNISTRING
-# if !HAVE_INLINE
-extern int
-       u32_uctomb (uint32_t *s, ucs4_t uc, int n);
-# else
-static inline int
-u32_uctomb (uint32_t *s, ucs4_t uc, int n)
-{
-  if (uc < 0xd800 || (uc >= 0xe000 && uc < 0x110000))
-    {
-      if (n > 0)
-        {
-          *s = uc;
-          return 1;
-        }
-      else
-        return -2;
-    }
-  else
-    return -1;
-}
-# endif
-#endif
-
-/* Copy N units from SRC to DEST.  */
-/* Similar to memcpy().  */
-extern uint8_t *
-       u8_cpy (uint8_t *dest, const uint8_t *src, size_t n);
-extern uint16_t *
-       u16_cpy (uint16_t *dest, const uint16_t *src, size_t n);
-extern uint32_t *
-       u32_cpy (uint32_t *dest, const uint32_t *src, size_t n);
-
-/* Copy N units from SRC to DEST, guaranteeing correct behavior for
-   overlapping memory areas.  */
-/* Similar to memmove().  */
-extern uint8_t *
-       u8_move (uint8_t *dest, const uint8_t *src, size_t n);
-extern uint16_t *
-       u16_move (uint16_t *dest, const uint16_t *src, size_t n);
-extern uint32_t *
-       u32_move (uint32_t *dest, const uint32_t *src, size_t n);
-
-/* Set the first N characters of S to UC.  UC should be a character that
-   occupies only 1 unit.  */
-/* Similar to memset().  */
-extern uint8_t *
-       u8_set (uint8_t *s, ucs4_t uc, size_t n);
-extern uint16_t *
-       u16_set (uint16_t *s, ucs4_t uc, size_t n);
-extern uint32_t *
-       u32_set (uint32_t *s, ucs4_t uc, size_t n);
-
-/* Compare S1 and S2, each of length N.  */
-/* Similar to memcmp().  */
-extern int
-       u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u32_cmp (const uint32_t *s1, const uint32_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-/* Compare S1 and S2.  */
-/* Similar to the gnulib function memcmp2().  */
-extern int
-       u8_cmp2 (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u16_cmp2 (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u32_cmp2 (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
-
-/* Search the string at S for UC.  */
-/* Similar to memchr().  */
-extern uint8_t *
-       u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-extern uint16_t *
-       u16_chr (const uint16_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-extern uint32_t *
-       u32_chr (const uint32_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-
-/* Count the number of Unicode characters in the N units from S.  */
-/* Similar to mbsnlen().  */
-extern size_t
-       u8_mbsnlen (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u16_mbsnlen (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u32_mbsnlen (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-/* Elementary string functions with memory allocation.  */
-
-/* Make a freshly allocated copy of S, of length N.  */
-extern uint8_t *
-       u8_cpy_alloc (const uint8_t *s, size_t n);
-extern uint16_t *
-       u16_cpy_alloc (const uint16_t *s, size_t n);
-extern uint32_t *
-       u32_cpy_alloc (const uint32_t *s, size_t n);
-
-/* Elementary string functions on NUL terminated strings.  */
-
-/* Return the length (number of units) of the first character in S.
-   Return 0 if it is the NUL character.  Return -1 upon failure.  */
-extern int
-       u8_strmblen (const uint8_t *s)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u16_strmblen (const uint16_t *s)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u32_strmblen (const uint32_t *s)
-       _UC_ATTRIBUTE_PURE;
-
-/* Return the length (number of units) of the first character in S, putting
-   its 'ucs4_t' representation in *PUC.  Return 0 if it is the NUL
-   character.  Return -1 upon failure.  */
-extern int
-       u8_strmbtouc (ucs4_t *puc, const uint8_t *s);
-extern int
-       u16_strmbtouc (ucs4_t *puc, const uint16_t *s);
-extern int
-       u32_strmbtouc (ucs4_t *puc, const uint32_t *s);
-
-/* Forward iteration step.  Advances the pointer past the next character,
-   or returns NULL if the end of the string has been reached.  Puts the
-   character's 'ucs4_t' representation in *PUC.  */
-extern const uint8_t *
-       u8_next (ucs4_t *puc, const uint8_t *s);
-extern const uint16_t *
-       u16_next (ucs4_t *puc, const uint16_t *s);
-extern const uint32_t *
-       u32_next (ucs4_t *puc, const uint32_t *s);
-
-/* Backward iteration step.  Advances the pointer to point to the previous
-   character, or returns NULL if the beginning of the string had been reached.
-   Puts the character's 'ucs4_t' representation in *PUC.  */
-extern const uint8_t *
-       u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start);
-extern const uint16_t *
-       u16_prev (ucs4_t *puc, const uint16_t *s, const uint16_t *start);
-extern const uint32_t *
-       u32_prev (ucs4_t *puc, const uint32_t *s, const uint32_t *start);
-
-/* Return the number of units in S.  */
-/* Similar to strlen(), wcslen().  */
-extern size_t
-       u8_strlen (const uint8_t *s)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u16_strlen (const uint16_t *s)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u32_strlen (const uint32_t *s)
-       _UC_ATTRIBUTE_PURE;
-
-/* Return the number of units in S, but at most MAXLEN.  */
-/* Similar to strnlen(), wcsnlen().  */
-extern size_t
-       u8_strnlen (const uint8_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u16_strnlen (const uint16_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u32_strnlen (const uint32_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
-
-/* Copy SRC to DEST.  */
-/* Similar to strcpy(), wcscpy().  */
-extern uint8_t *
-       u8_strcpy (uint8_t *dest, const uint8_t *src);
-extern uint16_t *
-       u16_strcpy (uint16_t *dest, const uint16_t *src);
-extern uint32_t *
-       u32_strcpy (uint32_t *dest, const uint32_t *src);
-
-/* Copy SRC to DEST, returning the address of the terminating NUL in DEST.  */
-/* Similar to stpcpy().  */
-extern uint8_t *
-       u8_stpcpy (uint8_t *dest, const uint8_t *src);
-extern uint16_t *
-       u16_stpcpy (uint16_t *dest, const uint16_t *src);
-extern uint32_t *
-       u32_stpcpy (uint32_t *dest, const uint32_t *src);
-
-/* Copy no more than N units of SRC to DEST.  */
-/* Similar to strncpy(), wcsncpy().  */
-extern uint8_t *
-       u8_strncpy (uint8_t *dest, const uint8_t *src, size_t n);
-extern uint16_t *
-       u16_strncpy (uint16_t *dest, const uint16_t *src, size_t n);
-extern uint32_t *
-       u32_strncpy (uint32_t *dest, const uint32_t *src, size_t n);
-
-/* Copy no more than N units of SRC to DEST.  Return a pointer past the last
-   non-NUL unit written into DEST.  */
-/* Similar to stpncpy().  */
-extern uint8_t *
-       u8_stpncpy (uint8_t *dest, const uint8_t *src, size_t n);
-extern uint16_t *
-       u16_stpncpy (uint16_t *dest, const uint16_t *src, size_t n);
-extern uint32_t *
-       u32_stpncpy (uint32_t *dest, const uint32_t *src, size_t n);
-
-/* Append SRC onto DEST.  */
-/* Similar to strcat(), wcscat().  */
-extern uint8_t *
-       u8_strcat (uint8_t *dest, const uint8_t *src);
-extern uint16_t *
-       u16_strcat (uint16_t *dest, const uint16_t *src);
-extern uint32_t *
-       u32_strcat (uint32_t *dest, const uint32_t *src);
-
-/* Append no more than N units of SRC onto DEST.  */
-/* Similar to strncat(), wcsncat().  */
-extern uint8_t *
-       u8_strncat (uint8_t *dest, const uint8_t *src, size_t n);
-extern uint16_t *
-       u16_strncat (uint16_t *dest, const uint16_t *src, size_t n);
-extern uint32_t *
-       u32_strncat (uint32_t *dest, const uint32_t *src, size_t n);
-
-/* Compare S1 and S2.  */
-/* Similar to strcmp(), wcscmp().  */
-#ifdef __sun
-/* Avoid a collision with the u8_strcmp() function in Solaris 11 libc.  */
-extern int
-       u8_strcmp_gnu (const uint8_t *s1, const uint8_t *s2)
-       _UC_ATTRIBUTE_PURE;
-# define u8_strcmp u8_strcmp_gnu
-#else
-extern int
-       u8_strcmp (const uint8_t *s1, const uint8_t *s2)
-       _UC_ATTRIBUTE_PURE;
-#endif
-extern int
-       u16_strcmp (const uint16_t *s1, const uint16_t *s2)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u32_strcmp (const uint32_t *s1, const uint32_t *s2)
-       _UC_ATTRIBUTE_PURE;
-
-/* Compare S1 and S2 using the collation rules of the current locale.
-   Return -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2.
-   Upon failure, set errno and return any value.  */
-/* Similar to strcoll(), wcscoll().  */
-extern int
-       u8_strcoll (const uint8_t *s1, const uint8_t *s2);
-extern int
-       u16_strcoll (const uint16_t *s1, const uint16_t *s2);
-extern int
-       u32_strcoll (const uint32_t *s1, const uint32_t *s2);
-
-/* Compare no more than N units of S1 and S2.  */
-/* Similar to strncmp(), wcsncmp().  */
-extern int
-       u8_strncmp (const uint8_t *s1, const uint8_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u16_strncmp (const uint16_t *s1, const uint16_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
-extern int
-       u32_strncmp (const uint32_t *s1, const uint32_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
-
-/* Duplicate S, returning an identical malloc'd string.  */
-/* Similar to strdup(), wcsdup().  */
-extern uint8_t *
-       u8_strdup (const uint8_t *s);
-extern uint16_t *
-       u16_strdup (const uint16_t *s);
-extern uint32_t *
-       u32_strdup (const uint32_t *s);
-
-/* Find the first occurrence of UC in STR.  */
-/* Similar to strchr(), wcschr().  */
-extern uint8_t *
-       u8_strchr (const uint8_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-extern uint16_t *
-       u16_strchr (const uint16_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-extern uint32_t *
-       u32_strchr (const uint32_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-
-/* Find the last occurrence of UC in STR.  */
-/* Similar to strrchr(), wcsrchr().  */
-extern uint8_t *
-       u8_strrchr (const uint8_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-extern uint16_t *
-       u16_strrchr (const uint16_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-extern uint32_t *
-       u32_strrchr (const uint32_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
-
-/* Return the length of the initial segment of STR which consists entirely
-   of Unicode characters not in REJECT.  */
-/* Similar to strcspn(), wcscspn().  */
-extern size_t
-       u8_strcspn (const uint8_t *str, const uint8_t *reject)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u16_strcspn (const uint16_t *str, const uint16_t *reject)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u32_strcspn (const uint32_t *str, const uint32_t *reject)
-       _UC_ATTRIBUTE_PURE;
-
-/* Return the length of the initial segment of STR which consists entirely
-   of Unicode characters in ACCEPT.  */
-/* Similar to strspn(), wcsspn().  */
-extern size_t
-       u8_strspn (const uint8_t *str, const uint8_t *accept)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u16_strspn (const uint16_t *str, const uint16_t *accept)
-       _UC_ATTRIBUTE_PURE;
-extern size_t
-       u32_strspn (const uint32_t *str, const uint32_t *accept)
-       _UC_ATTRIBUTE_PURE;
-
-/* Find the first occurrence in STR of any character in ACCEPT.  */
-/* Similar to strpbrk(), wcspbrk().  */
-extern uint8_t *
-       u8_strpbrk (const uint8_t *str, const uint8_t *accept)
-       _UC_ATTRIBUTE_PURE;
-extern uint16_t *
-       u16_strpbrk (const uint16_t *str, const uint16_t *accept)
-       _UC_ATTRIBUTE_PURE;
-extern uint32_t *
-       u32_strpbrk (const uint32_t *str, const uint32_t *accept)
-       _UC_ATTRIBUTE_PURE;
-
-/* Find the first occurrence of NEEDLE in HAYSTACK.  */
-/* Similar to strstr(), wcsstr().  */
-extern uint8_t *
-       u8_strstr (const uint8_t *haystack, const uint8_t *needle)
-       _UC_ATTRIBUTE_PURE;
-extern uint16_t *
-       u16_strstr (const uint16_t *haystack, const uint16_t *needle)
-       _UC_ATTRIBUTE_PURE;
-extern uint32_t *
-       u32_strstr (const uint32_t *haystack, const uint32_t *needle)
-       _UC_ATTRIBUTE_PURE;
-
-/* Test whether STR starts with PREFIX.  */
-extern bool
-       u8_startswith (const uint8_t *str, const uint8_t *prefix)
-       _UC_ATTRIBUTE_PURE;
-extern bool
-       u16_startswith (const uint16_t *str, const uint16_t *prefix)
-       _UC_ATTRIBUTE_PURE;
-extern bool
-       u32_startswith (const uint32_t *str, const uint32_t *prefix)
-       _UC_ATTRIBUTE_PURE;
-
-/* Test whether STR ends with SUFFIX.  */
-extern bool
-       u8_endswith (const uint8_t *str, const uint8_t *suffix)
-       _UC_ATTRIBUTE_PURE;
-extern bool
-       u16_endswith (const uint16_t *str, const uint16_t *suffix)
-       _UC_ATTRIBUTE_PURE;
-extern bool
-       u32_endswith (const uint32_t *str, const uint32_t *suffix)
-       _UC_ATTRIBUTE_PURE;
-
-/* Divide STR into tokens separated by characters in DELIM.
-   This interface is actually more similar to wcstok than to strtok.  */
-/* Similar to strtok_r(), wcstok().  */
-extern uint8_t *
-       u8_strtok (uint8_t *str, const uint8_t *delim, uint8_t **ptr);
-extern uint16_t *
-       u16_strtok (uint16_t *str, const uint16_t *delim, uint16_t **ptr);
-extern uint32_t *
-       u32_strtok (uint32_t *str, const uint32_t *delim, uint32_t **ptr);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UNISTR_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unitypes.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/unitypes.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unitypes.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unitypes.in.h	2010-05-17 19:56:12.000000000 +0000
@@ -1,5 +1,5 @@
-/* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+/* Elementary types for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,24 +23,4 @@
 /* Type representing a Unicode character.  */
 typedef uint32_t ucs4_t;
 
-/* Attribute of a function whose result depends only on the arguments
-   (not pointers!) and which has no side effects.  */
-#ifndef _UC_ATTRIBUTE_CONST
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#  define _UC_ATTRIBUTE_CONST __attribute__ ((__const__))
-# else
-#  define _UC_ATTRIBUTE_CONST
-# endif
-#endif
-
-/* Attribute of a function whose result depends only on the arguments
-   (possibly pointers) and global memory, and which has no side effects.  */
-#ifndef _UC_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _UC_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _UC_ATTRIBUTE_PURE
-# endif
-#endif
-
 #endif /* _UNITYPES_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/uniwidth/cjk.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/uniwidth/cjk.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/uniwidth/cjk.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/uniwidth/cjk.h	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -22,16 +22,16 @@
 {
   if (0
       /* Legacy Japanese encodings */
-      || STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
+      || STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
       /* Legacy Chinese encodings */
-      || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-      || STREQ_OPT (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
-      || STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
-      || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
+      || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+      || STREQ (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
+      || STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
+      || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
       /* Legacy Korean encodings */
-      || STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-      || STREQ_OPT (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
-      || STREQ_OPT (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
+      || STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+      || STREQ (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
+      || STREQ (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
     return 1;
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/uniwidth/width.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/uniwidth/width.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/uniwidth/width.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/uniwidth/width.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -32,7 +32,7 @@
  * - Zero width characters; generated from
  *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
  */
-static const unsigned char nonspacing_table_data[27*64] = {
+static const unsigned char nonspacing_table_data[26*64] = {
   /* 0x0000-0x01ff */
   0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
@@ -62,20 +62,20 @@
   0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
   /* 0x0600-0x07ff */
   0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
-  0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
+  0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
-  0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
+  0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
   0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
   0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */
   /* 0x0800-0x09ff */
-  0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */
-  0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */
-  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */
-  0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */
+  0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
   0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */
   /* 0x0a00-0x0bff */
@@ -103,12 +103,12 @@
   0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
   0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
-  0xdf, 0xe0, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
+  0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
   0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
   /* 0x1000-0x11ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */
   0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */
-  0x64, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
+  0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */
@@ -120,7 +120,7 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
-  0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
+  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
   /* 0x1600-0x17ff */
@@ -143,22 +143,22 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
   /* 0x1a00-0x1bff */
   0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
-  0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
   0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
   0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
   0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */
-  0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */
   /* 0x1c00-0x1dff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
-  0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x00, 0x00, /* 0x1cc0-0x1cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
-  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xf0, /* 0x1dc0-0x1dff */
+  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */
   /* 0x2000-0x21ff */
   0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
   0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */
@@ -172,9 +172,9 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, /* 0x2cc0-0x2cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x2d40-0x2d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */
   /* 0x3000-0x31ff */
@@ -190,7 +190,7 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */
@@ -199,20 +199,20 @@
   0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
-  0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */
   0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
   0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
-  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
   /* 0xaa00-0xabff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */
   0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x00, /* 0xabc0-0xabff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */
   /* 0xfa00-0xfbff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
@@ -249,22 +249,13 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
-  /* 0x11000-0x111ff */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */
-  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11040-0x1107f */
-  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11100-0x1113f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11140-0x1117f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11180-0x111bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */
   /* 0x1d000-0x1d1ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
-  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xf8, 0xff, /* 0x1d140-0x1d17f */
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */
   0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
   /* 0x1d200-0x1d3ff */
@@ -295,7 +286,7 @@
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
   -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
   22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */
-  24, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
@@ -307,7 +298,7 @@
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
-  25, 26, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
+  24, 25, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
 };
 
 /* Determine number of column positions required for UC.  */
@@ -341,8 +332,8 @@
         }
     }
   /* Test for double-width character.
-   * Generated from "grep '^[^;]\{4,5\};[WF]' EastAsianWidth.txt"
-   * and            "grep '^[^;]\{4,5\};[^WF]' EastAsianWidth.txt"
+   * Generated from "grep '^....;[WF]' EastAsianWidth.txt"
+   * and            "grep '^....;[^WF]' EastAsianWidth.txt"
    */
   if (uc >= 0x1100
       && ((uc < 0x1160) /* Hangul Jamo */
@@ -355,8 +346,8 @@
           || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
           || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
           || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
-          || (uc >= 0x20000 && uc <= 0x2ffff) /* Supplementary Ideographic Plane */
-          || (uc >= 0x30000 && uc <= 0x3ffff) /* Tertiary Ideographic Plane */
+          || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
+          || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
      )   )
     return 2;
   /* In ancient CJK encodings, Cyrillic and most other characters are
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/uniwidth.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/uniwidth.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/uniwidth.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/uniwidth.in.h	2010-05-17 19:56:12.000000000 +0000
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -38,31 +38,24 @@
 
 /* Determine number of column positions required for UC.  */
 extern int
-       uc_width (ucs4_t uc, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       uc_width (ucs4_t uc, const char *encoding);
 
 /* Determine number of column positions required for first N units
    (or fewer if S ends before this) in S.  */
 extern int
-       u8_width (const uint8_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u8_width (const uint8_t *s, size_t n, const char *encoding);
 extern int
-       u16_width (const uint16_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u16_width (const uint16_t *s, size_t n, const char *encoding);
 extern int
-       u32_width (const uint32_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u32_width (const uint32_t *s, size_t n, const char *encoding);
 
 /* Determine number of column positions required for S.  */
 extern int
-       u8_strwidth (const uint8_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u8_strwidth (const uint8_t *s, const char *encoding);
 extern int
-       u16_strwidth (const uint16_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u16_strwidth (const uint16_t *s, const char *encoding);
 extern int
-       u32_strwidth (const uint32_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u32_strwidth (const uint32_t *s, const char *encoding);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/unlocked-io.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/unlocked-io.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/unlocked-io.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/unlocked-io.h	2010-02-16 21:31:29.000000000 +0000
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/verify.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/verify.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/verify.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/verify.h	2010-05-09 11:03:17.000000000 +0000
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,49 +17,21 @@
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
-#ifndef _GL_VERIFY_H
-#define _GL_VERIFY_H
-
-
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
-   This is supported by GCC 4.6.0 and later, in C mode, and its use
-   here generates easier-to-read diagnostics when verify (R) fails.
-
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
-   This will likely be supported by future GCC versions, in C++ mode.
-
-   Use this only with GCC.  If we were willing to slow 'configure'
-   down we could also use it with other compilers, but since this
-   affects only the quality of diagnostics, why bother?  */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
-     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
-     && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
-   first G++ release that supports static_assert.  */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
-#endif
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   system headers, defines a conflicting _Static_assert that is no
-   better than ours; override it.  */
-#ifndef _GL_HAVE_STATIC_ASSERT
-# include <stddef.h>
-# undef _Static_assert
-#endif
+#ifndef VERIFY_H
+# define VERIFY_H 1
 
 /* Each of these macros verifies that its argument R is nonzero.  To
    be portable, R should be an integer constant expression.  Unlike
    assert (R), there is no run-time overhead.
 
-   If _Static_assert works, verify (R) uses it directly.  Similarly,
-   _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct
-   that is an operand of sizeof.
+   There are two macros, since no single macro can be used in all
+   contexts in C.  verify_true (R) is for scalar contexts, including
+   integer constant expression contexts.  verify (R) is for declaration
+   contexts, e.g., the top level.
 
-   The code below uses several ideas for C++ compilers, and for C
-   compilers that do not support _Static_assert:
+   Symbols ending in "__" are private to this header.
+
+   The code below uses several ideas.
 
    * The first step is ((R) ? 1 : -1).  Given an expression R, of
      integral or boolean or floating-point type, this yields an
@@ -67,9 +39,7 @@
      constant and nonnegative.
 
    * Next this expression W is wrapped in a type
-     struct _gl_verify_type {
-       unsigned int _gl_verify_error_if_negative: W;
-     }.
+     struct verify_type__ { unsigned int verify_error_if_negative_size__: W; }.
      If W is negative, this yields a compile-time error.  No compiler can
      deal with a bit-field of negative size.
 
@@ -83,7 +53,7 @@
 
        void function (int n) { verify (n < 0); }
 
-   * For the verify macro, the struct _gl_verify_type will need to
+   * For the verify macro, the struct verify_type__ will need to
      somehow be embedded into a declaration.  To be portable, this
      declaration must declare an object, a constant, a function, or a
      typedef name.  If the declared entity uses the type directly,
@@ -121,11 +91,11 @@
      Which of the following alternatives can be used?
 
        extern int dummy [sizeof (struct {...})];
-       extern int dummy [sizeof (struct _gl_verify_type {...})];
+       extern int dummy [sizeof (struct verify_type__ {...})];
        extern void dummy (int [sizeof (struct {...})]);
-       extern void dummy (int [sizeof (struct _gl_verify_type {...})]);
+       extern void dummy (int [sizeof (struct verify_type__ {...})]);
        extern int (*dummy (void)) [sizeof (struct {...})];
-       extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})];
+       extern int (*dummy (void)) [sizeof (struct verify_type__ {...})];
 
      In the second and sixth case, the struct type is exported to the
      outer scope; two such declarations therefore collide.  GCC warns
@@ -135,145 +105,59 @@
        extern int (*dummy (void)) [sizeof (struct {...})];
 
    * GCC warns about duplicate declarations of the dummy function if
-     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
+     -Wredundant_decls is used.  GCC 4.3 and later have a builtin
      __COUNTER__ macro that can let us generate unique identifiers for
      each dummy function, to suppress this warning.
 
-   * This implementation exploits the fact that older versions of GCC,
-     which do not support _Static_assert, also do not warn about the
-     last declaration mentioned above.
-
-   * GCC warns if -Wnested-externs is enabled and verify() is used
-     within a function body; but inside a function, you can always
-     arrange to use verify_expr() instead.
+   * This implementation exploits the fact that GCC does not warn about
+     the last declaration mentioned above.  If a future version of GCC
+     introduces a warning for this, the problem could be worked around
+     by using code specialized to GCC, just as __COUNTER__ is already
+     being used if available.
+
+       #if 4 <= __GNUC__
+       # define verify(R) [another version to keep GCC happy]
+       #endif
 
    * In C++, any struct definition inside sizeof is invalid.
      Use a template type to work around the problem.  */
 
 /* Concatenate two preprocessor tokens.  */
-#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-#define _GL_CONCAT0(x, y) x##y
+# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+# define _GL_CONCAT0(x, y) x##y
 
 /* _GL_COUNTER is an integer, preferably one that changes each time we
    use it.  Use __COUNTER__ if it works, falling back on __LINE__
    otherwise.  __LINE__ isn't perfect, but it's better than a
    constant.  */
-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-# define _GL_COUNTER __COUNTER__
-#else
-# define _GL_COUNTER __LINE__
-#endif
+# if defined __COUNTER__ && __COUNTER__ != __COUNTER__
+#  define _GL_COUNTER __COUNTER__
+# else
+#  define _GL_COUNTER __LINE__
+# endif
 
 /* Generate a symbol with the given prefix, making it unique if
    possible.  */
-#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
-
-/* Verify requirement R at compile-time, as an integer constant expression
-   that returns 1.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.  */
+# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
 
-#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
-   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
+/* Verify requirement R at compile-time, as an integer constant expression.
+   Return 1.  */
 
-#ifdef __cplusplus
-# if !GNULIB_defined_struct__gl_verify_type
+# ifdef __cplusplus
 template <int w>
-  struct _gl_verify_type {
-    unsigned int _gl_verify_error_if_negative: w;
-  };
-#  define GNULIB_defined_struct__gl_verify_type 1
-# endif
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    _gl_verify_type<(R) ? 1 : -1>
-#elif defined _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
-    }
-#else
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
-#endif
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.
-
-   Unfortunately, unlike C11, this implementation must appear as an
-   ordinary declaration, and cannot appear inside struct { ... }.  */
-
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
-#else
-# define _GL_VERIFY(R, DIAGNOSTIC)				       \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
-      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-#endif
-
-/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
-#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+  struct verify_type__ { unsigned int verify_error_if_negative_size__: w; };
+#  define verify_true(R) \
+     (!!sizeof (verify_type__<(R) ? 1 : -1>))
+# else
+#  define verify_true(R) \
+     (!!sizeof \
+      (struct { unsigned int verify_error_if_negative_size__: (R) ? 1 : -1; }))
 # endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#  define static_assert _Static_assert /* C11 requires this #define.  */
-# endif
-#endif
-
-/* @assert.h omit start@  */
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   There are two macros, since no single macro can be used in all
-   contexts in C.  verify_true (R) is for scalar contexts, including
-   integer constant expression contexts.  verify (R) is for declaration
-   contexts, e.g., the top level.  */
-
-/* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  This is equivalent to verify_expr (R, 1).
-
-   verify_true is obsolescent; please use verify_expr instead.  */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
-/* Verify requirement R at compile-time.  Return the value of the
-   expression E.  */
-
-#define verify_expr(R, E) \
-   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
 
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  */
 
-#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-/* Assume that R always holds.  This lets the compiler optimize
-   accordingly.  R should not have side-effects; it may or may not be
-   evaluated.  Behavior is undefined if R is false.  */
-
-#if (__has_builtin (__builtin_unreachable) \
-     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
-# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
-#elif 1200 <= _MSC_VER
-# define assume(R) __assume (R)
-#elif (defined lint \
-       && (__has_builtin (__builtin_trap) \
-           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
-  /* Doing it this way helps various packages when configured with
-     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
-     when 'assume' silences warnings even with older GCCs.  */
-# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
-#else
-# define assume(R) ((void) (0 && (R)))
-#endif
-
-/* @assert.h omit end@  */
+# define verify(R) \
+    extern int (* _GL_GENSYM (verify_function) (void)) [verify_true (R)]
 
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/wchar.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/wchar.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h	2010-05-09 01:36:16.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake.  */
 
@@ -28,7 +29,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
 /* Special invocation convention:
@@ -48,25 +48,17 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_WCHAR_H
+#ifndef _GL_WCHAR_H
 
 #define _GL_ALREADY_INCLUDING_WCHAR_H
 
-#if @HAVE_FEATURES_H@
-# include <features.h> /* for __GLIBC__ */
-#endif
-
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
    included before <wchar.h>.
-   In some builds of uClibc, <wchar.h> is nonexistent and wchar_t is defined
-   by <stddef.h>.
    But avoid namespace pollution on glibc systems.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-#endif
 #ifndef __GLIBC__
+# include <stddef.h>
 # include <stdio.h>
 # include <time.h>
 #endif
@@ -80,16 +72,8 @@
 
 #undef _GL_ALREADY_INCLUDING_WCHAR_H
 
-#ifndef _@GUARD_PREFIX@_WCHAR_H
-#define _@GUARD_PREFIX@_WCHAR_H
-
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -105,18 +89,6 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
-#  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
-typedef unsigned int rpl_wint_t;
-#   undef wint_t
-#   define wint_t rpl_wint_t
-#   define GNULIB_defined_wint_t 1
-#  endif
-# endif
 # ifndef WEOF
 #  define WEOF ((wint_t) -1)
 # endif
@@ -127,12 +99,10 @@
    On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
    implementing mbrtowc for encodings like UTF-8.  */
 #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
-# if !GNULIB_defined_mbstate_t
 typedef int rpl_mbstate_t;
-#  undef mbstate_t
-#  define mbstate_t rpl_mbstate_t
-#  define GNULIB_defined_mbstate_t 1
-# endif
+# undef mbstate_t
+# define mbstate_t rpl_mbstate_t
+# define GNULIB_defined_mbstate_t 1
 #endif
 
 
@@ -143,11 +113,11 @@
 #   undef btowc
 #   define btowc rpl_btowc
 #  endif
-_GL_FUNCDECL_RPL (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (btowc, wint_t, (int c));
 _GL_CXXALIAS_RPL (btowc, wint_t, (int c));
 # else
 #  if !@HAVE_BTOWC@
-_GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (btowc, wint_t, (int c));
 #  endif
 _GL_CXXALIAS_SYS (btowc, wint_t, (int c));
 # endif
@@ -168,12 +138,12 @@
 #   undef wctob
 #   define wctob rpl_wctob
 #  endif
-_GL_FUNCDECL_RPL (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc));
 _GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
 # else
 #  if !defined wctob && !@HAVE_DECL_WCTOB@
 /* wctob is provided by gnulib, or wctob exists but is not declared.  */
-_GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc));
 #  endif
 _GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
 # endif
@@ -434,12 +404,12 @@
 #   undef wcwidth
 #   define wcwidth rpl_wcwidth
 #  endif
-_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
 _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 # else
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
-_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
@@ -453,576 +423,6 @@
 #endif
 
 
-/* Search N wide characters of S for C.  */
-#if @GNULIB_WMEMCHR@
-# if !@HAVE_WMEMCHR@
-_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)
-                                      _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wmemchr (const wchar_t *, wchar_t, size_t);
-         wchar_t * std::wmemchr (wchar_t *, wchar_t, size_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wmemchr,
-                        wchar_t *, (const wchar_t *, wchar_t, size_t),
-                        const wchar_t *, (const wchar_t *, wchar_t, size_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-_GL_CXXALIASWARN1 (wmemchr, const wchar_t *,
-                   (const wchar_t *s, wchar_t c, size_t n));
-# else
-_GL_CXXALIASWARN (wmemchr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wmemchr
-# if HAVE_RAW_DECL_WMEMCHR
-_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
-                 "use gnulib module wmemchr for portability");
-# endif
-#endif
-
-
-/* Compare N wide characters of S1 and S2.  */
-#if @GNULIB_WMEMCMP@
-# if !@HAVE_WMEMCMP@
-_GL_FUNCDECL_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wmemcmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemcmp
-# if HAVE_RAW_DECL_WMEMCMP
-_GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
-                 "use gnulib module wmemcmp for portability");
-# endif
-#endif
-
-
-/* Copy N wide characters of SRC to DEST.  */
-#if @GNULIB_WMEMCPY@
-# if !@HAVE_WMEMCPY@
-_GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemcpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wmemcpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemcpy
-# if HAVE_RAW_DECL_WMEMCPY
-_GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
-                 "use gnulib module wmemcpy for portability");
-# endif
-#endif
-
-
-/* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for
-   overlapping memory areas.  */
-#if @GNULIB_WMEMMOVE@
-# if !@HAVE_WMEMMOVE@
-_GL_FUNCDECL_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wmemmove);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemmove
-# if HAVE_RAW_DECL_WMEMMOVE
-_GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
-                 "use gnulib module wmemmove for portability");
-# endif
-#endif
-
-
-/* Set N wide characters of S to C.  */
-#if @GNULIB_WMEMSET@
-# if !@HAVE_WMEMSET@
-_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-_GL_CXXALIASWARN (wmemset);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemset
-# if HAVE_RAW_DECL_WMEMSET
-_GL_WARN_ON_USE (wmemset, "wmemset is unportable - "
-                 "use gnulib module wmemset for portability");
-# endif
-#endif
-
-
-/* Return the number of wide characters in S.  */
-#if @GNULIB_WCSLEN@
-# if !@HAVE_WCSLEN@
-_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s));
-_GL_CXXALIASWARN (wcslen);
-#elif defined GNULIB_POSIXCHECK
-# undef wcslen
-# if HAVE_RAW_DECL_WCSLEN
-_GL_WARN_ON_USE (wcslen, "wcslen is unportable - "
-                 "use gnulib module wcslen for portability");
-# endif
-#endif
-
-
-/* Return the number of wide characters in S, but at most MAXLEN.  */
-#if @GNULIB_WCSNLEN@
-# if !@HAVE_WCSNLEN@
-_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
-_GL_CXXALIASWARN (wcsnlen);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsnlen
-# if HAVE_RAW_DECL_WCSNLEN
-_GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
-                 "use gnulib module wcsnlen for portability");
-# endif
-#endif
-
-
-/* Copy SRC to DEST.  */
-#if @GNULIB_WCSCPY@
-# if !@HAVE_WCSCPY@
-_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcscpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscpy
-# if HAVE_RAW_DECL_WCSCPY
-_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
-                 "use gnulib module wcscpy for portability");
-# endif
-#endif
-
-
-/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST.  */
-#if @GNULIB_WCPCPY@
-# if !@HAVE_WCPCPY@
-_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcpcpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcpcpy
-# if HAVE_RAW_DECL_WCPCPY
-_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
-                 "use gnulib module wcpcpy for portability");
-# endif
-#endif
-
-
-/* Copy no more than N wide characters of SRC to DEST.  */
-#if @GNULIB_WCSNCPY@
-# if !@HAVE_WCSNCPY@
-_GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcsncpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncpy
-# if HAVE_RAW_DECL_WCSNCPY
-_GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
-                 "use gnulib module wcsncpy for portability");
-# endif
-#endif
-
-
-/* Copy no more than N characters of SRC to DEST, returning the address of
-   the last character written into DEST.  */
-#if @GNULIB_WCPNCPY@
-# if !@HAVE_WCPNCPY@
-_GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcpncpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcpncpy
-# if HAVE_RAW_DECL_WCPNCPY
-_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
-                 "use gnulib module wcpncpy for portability");
-# endif
-#endif
-
-
-/* Append SRC onto DEST.  */
-#if @GNULIB_WCSCAT@
-# if !@HAVE_WCSCAT@
-_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcscat);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscat
-# if HAVE_RAW_DECL_WCSCAT
-_GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
-                 "use gnulib module wcscat for portability");
-# endif
-#endif
-
-
-/* Append no more than N wide characters of SRC onto DEST.  */
-#if @GNULIB_WCSNCAT@
-# if !@HAVE_WCSNCAT@
-_GL_FUNCDECL_SYS (wcsncat, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsncat, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcsncat);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncat
-# if HAVE_RAW_DECL_WCSNCAT
-_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
-                 "use gnulib module wcsncat for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2.  */
-#if @GNULIB_WCSCMP@
-# if !@HAVE_WCSCMP@
-_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
-                               _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscmp
-# if HAVE_RAW_DECL_WCSCMP
-_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
-                 "use gnulib module wcscmp for portability");
-# endif
-#endif
-
-
-/* Compare no more than N wide characters of S1 and S2.  */
-#if @GNULIB_WCSNCMP@
-# if !@HAVE_WCSNCMP@
-_GL_FUNCDECL_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsncmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncmp
-# if HAVE_RAW_DECL_WCSNCMP
-_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
-                 "use gnulib module wcsncmp for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2, ignoring case.  */
-#if @GNULIB_WCSCASECMP@
-# if !@HAVE_WCSCASECMP@
-_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscasecmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscasecmp
-# if HAVE_RAW_DECL_WCSCASECMP
-_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - "
-                 "use gnulib module wcscasecmp for portability");
-# endif
-#endif
-
-
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-#if @GNULIB_WCSNCASECMP@
-# if !@HAVE_WCSNCASECMP@
-_GL_FUNCDECL_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsncasecmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncasecmp
-# if HAVE_RAW_DECL_WCSNCASECMP
-_GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - "
-                 "use gnulib module wcsncasecmp for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE
-   category of the current locale.  */
-#if @GNULIB_WCSCOLL@
-# if !@HAVE_WCSCOLL@
-_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
-# endif
-_GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscoll);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscoll
-# if HAVE_RAW_DECL_WCSCOLL
-_GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
-                 "use gnulib module wcscoll for portability");
-# endif
-#endif
-
-
-/* Transform S2 into array pointed to by S1 such that if wcscmp is applied
-   to two transformed strings the result is the as applying 'wcscoll' to the
-   original strings.  */
-#if @GNULIB_WCSXFRM@
-# if !@HAVE_WCSXFRM@
-_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsxfrm);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsxfrm
-# if HAVE_RAW_DECL_WCSXFRM
-_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - "
-                 "use gnulib module wcsxfrm for portability");
-# endif
-#endif
-
-
-/* Duplicate S, returning an identical malloc'd string.  */
-#if @GNULIB_WCSDUP@
-# if !@HAVE_WCSDUP@
-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s));
-# endif
-_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
-_GL_CXXALIASWARN (wcsdup);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsdup
-# if HAVE_RAW_DECL_WCSDUP
-_GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - "
-                 "use gnulib module wcsdup for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence of WC in WCS.  */
-#if @GNULIB_WCSCHR@
-# if !@HAVE_WCSCHR@
-_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
-                                     _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcschr (const wchar_t *, wchar_t);
-         wchar_t * std::wcschr (wchar_t *, wchar_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcschr,
-                        wchar_t *, (const wchar_t *, wchar_t),
-                        const wchar_t *, (const wchar_t *, wchar_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc));
-_GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# else
-_GL_CXXALIASWARN (wcschr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcschr
-# if HAVE_RAW_DECL_WCSCHR
-_GL_WARN_ON_USE (wcschr, "wcschr is unportable - "
-                 "use gnulib module wcschr for portability");
-# endif
-#endif
-
-
-/* Find the last occurrence of WC in WCS.  */
-#if @GNULIB_WCSRCHR@
-# if !@HAVE_WCSRCHR@
-_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
-                                      _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcsrchr (const wchar_t *, wchar_t);
-         wchar_t * std::wcsrchr (wchar_t *, wchar_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcsrchr,
-                        wchar_t *, (const wchar_t *, wchar_t),
-                        const wchar_t *, (const wchar_t *, wchar_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc));
-_GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# else
-_GL_CXXALIASWARN (wcsrchr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcsrchr
-# if HAVE_RAW_DECL_WCSRCHR
-_GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
-                 "use gnulib module wcsrchr for portability");
-# endif
-#endif
-
-
-/* Return the length of the initial segmet of WCS which consists entirely
-   of wide characters not in REJECT.  */
-#if @GNULIB_WCSCSPN@
-# if !@HAVE_WCSCSPN@
-_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject));
-_GL_CXXALIASWARN (wcscspn);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscspn
-# if HAVE_RAW_DECL_WCSCSPN
-_GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
-                 "use gnulib module wcscspn for portability");
-# endif
-#endif
-
-
-/* Return the length of the initial segmet of WCS which consists entirely
-   of wide characters in ACCEPT.  */
-#if @GNULIB_WCSSPN@
-# if !@HAVE_WCSSPN@
-_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)
-                                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
-_GL_CXXALIASWARN (wcsspn);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsspn
-# if HAVE_RAW_DECL_WCSSPN
-_GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - "
-                 "use gnulib module wcsspn for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence in WCS of any character in ACCEPT.  */
-#if @GNULIB_WCSPBRK@
-# if !@HAVE_WCSPBRK@
-_GL_FUNCDECL_SYS (wcspbrk, wchar_t *,
-                  (const wchar_t *wcs, const wchar_t *accept)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcspbrk (const wchar_t *, const wchar_t *);
-         wchar_t * std::wcspbrk (wchar_t *, const wchar_t *);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcspbrk,
-                        wchar_t *, (const wchar_t *, const wchar_t *),
-                        const wchar_t *, (const wchar_t *, const wchar_t *));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcspbrk, wchar_t *,
-                   (wchar_t *wcs, const wchar_t *accept));
-_GL_CXXALIASWARN1 (wcspbrk, const wchar_t *,
-                   (const wchar_t *wcs, const wchar_t *accept));
-# else
-_GL_CXXALIASWARN (wcspbrk);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcspbrk
-# if HAVE_RAW_DECL_WCSPBRK
-_GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
-                 "use gnulib module wcspbrk for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence of NEEDLE in HAYSTACK.  */
-#if @GNULIB_WCSSTR@
-# if !@HAVE_WCSSTR@
-_GL_FUNCDECL_SYS (wcsstr, wchar_t *,
-                  (const wchar_t *haystack, const wchar_t *needle)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *);
-         wchar_t * std::wcsstr (wchar_t *, const wchar_t *);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcsstr,
-                        wchar_t *, (const wchar_t *, const wchar_t *),
-                        const wchar_t *, (const wchar_t *, const wchar_t *));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcsstr, wchar_t *,
-                   (wchar_t *haystack, const wchar_t *needle));
-_GL_CXXALIASWARN1 (wcsstr, const wchar_t *,
-                   (const wchar_t *haystack, const wchar_t *needle));
-# else
-_GL_CXXALIASWARN (wcsstr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcsstr
-# if HAVE_RAW_DECL_WCSSTR
-_GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
-                 "use gnulib module wcsstr for portability");
-# endif
-#endif
-
-
-/* Divide WCS into tokens separated by characters in DELIM.  */
-#if @GNULIB_WCSTOK@
-# if !@HAVE_WCSTOK@
-_GL_FUNCDECL_SYS (wcstok, wchar_t *,
-                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
-# endif
-_GL_CXXALIAS_SYS (wcstok, wchar_t *,
-                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
-_GL_CXXALIASWARN (wcstok);
-#elif defined GNULIB_POSIXCHECK
-# undef wcstok
-# if HAVE_RAW_DECL_WCSTOK
-_GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
-                 "use gnulib module wcstok for portability");
-# endif
-#endif
-
-
-/* Determine number of column positions required for first N wide
-   characters (or fewer if S ends before this) in S.  */
-#if @GNULIB_WCSWIDTH@
-# if @REPLACE_WCSWIDTH@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef wcswidth
-#   define wcswidth rpl_wcswidth
-#  endif
-_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)
-                                 _GL_ATTRIBUTE_PURE);
-_GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n));
-# else
-#  if !@HAVE_WCSWIDTH@
-_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)
-                                 _GL_ATTRIBUTE_PURE);
-#  endif
-_GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n));
-# endif
-_GL_CXXALIASWARN (wcswidth);
-#elif defined GNULIB_POSIXCHECK
-# undef wcswidth
-# if HAVE_RAW_DECL_WCSWIDTH
-_GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
-                 "use gnulib module wcswidth for portability");
-# endif
-#endif
-
-
-#endif /* _@GUARD_PREFIX@_WCHAR_H */
-#endif /* _@GUARD_PREFIX@_WCHAR_H */
+#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/wctype-h.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/wctype-h.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/wctype-h.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wctype-h.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-/* Normally this would be wctype.c, but that name's already taken.  */
-#include <config.h>
-#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
-#include "wctype.h"
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/wctype.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/wctype.in.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/wctype.in.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wctype.in.h	2010-04-25 09:20:42.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible and Paul Eggert.  */
 
@@ -25,12 +26,11 @@
  * wctrans_t, and wctype_t are not yet implemented.
  */
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
+#ifndef _GL_WCTYPE_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
@@ -44,13 +44,6 @@
 # include <wchar.h>
 #endif
 
-/* mingw has declarations of towupper and towlower in <ctype.h> as
-   well <wctype.h>.  Include <ctype.h> in advance to avoid rpl_ prefix
-   being added to the declarations.  */
-#ifdef __MINGW32__
-# include <ctype.h>
-#endif
-
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
 /* The include_next requires a split double-inclusion guard.  */
@@ -58,34 +51,13 @@
 # @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
-#define _@GUARD_PREFIX@_WCTYPE_H
-
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GL_WCTYPE_INLINE
-# define _GL_WCTYPE_INLINE _GL_INLINE
-#endif
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
-/* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which
-   #defines a number of identifiers in the application namespace.  Revert
-   these #defines.  */
-#ifdef __sun
-# undef multibyte
-# undef eucw1
-# undef eucw2
-# undef eucw3
-# undef scrw1
-# undef scrw2
-# undef scrw3
-#endif
-
 /* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
 #if !@HAVE_WINT_T@ && !defined wint_t
 # define wint_t int
@@ -93,171 +65,153 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
-#  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
-typedef unsigned int rpl_wint_t;
-#   undef wint_t
-#   define wint_t rpl_wint_t
-#   define GNULIB_defined_wint_t 1
-#  endif
-# endif
 # ifndef WEOF
 #  define WEOF ((wint_t) -1)
 # endif
 #endif
 
 
-#if !GNULIB_defined_wctype_functions
-
 /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
    Linux libc5 has <wctype.h> and the functions but they are broken.
    Assume all 11 functions (all isw* except iswblank) are implemented the
    same way, or not at all.  */
-# if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
+#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
 
 /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
    undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
    refer to system functions like _iswctype that are not in the
    standard C library.  Rather than try to get ancient buggy
    implementations like this to work, just disable them.  */
-#  undef iswalnum
-#  undef iswalpha
-#  undef iswblank
-#  undef iswcntrl
-#  undef iswdigit
-#  undef iswgraph
-#  undef iswlower
-#  undef iswprint
-#  undef iswpunct
-#  undef iswspace
-#  undef iswupper
-#  undef iswxdigit
-#  undef towlower
-#  undef towupper
+# undef iswalnum
+# undef iswalpha
+# undef iswblank
+# undef iswcntrl
+# undef iswdigit
+# undef iswgraph
+# undef iswlower
+# undef iswprint
+# undef iswpunct
+# undef iswspace
+# undef iswupper
+# undef iswxdigit
+# undef towlower
+# undef towupper
 
 /* Linux libc5 has <wctype.h> and the functions but they are broken.  */
-#  if @REPLACE_ISWCNTRL@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define iswalnum rpl_iswalnum
-#    define iswalpha rpl_iswalpha
-#    define iswblank rpl_iswblank
-#    define iswcntrl rpl_iswcntrl
-#    define iswdigit rpl_iswdigit
-#    define iswgraph rpl_iswgraph
-#    define iswlower rpl_iswlower
-#    define iswprint rpl_iswprint
-#    define iswpunct rpl_iswpunct
-#    define iswspace rpl_iswspace
-#    define iswupper rpl_iswupper
-#    define iswxdigit rpl_iswxdigit
-#   endif
-#  endif
-#  if @REPLACE_TOWLOWER@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define towlower rpl_towlower
-#    define towupper rpl_towupper
-#   endif
+# if @REPLACE_ISWCNTRL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define iswalnum rpl_iswalnum
+#   define iswalpha rpl_iswalpha
+#   define iswblank rpl_iswblank
+#   define iswcntrl rpl_iswcntrl
+#   define iswdigit rpl_iswdigit
+#   define iswgraph rpl_iswgraph
+#   define iswlower rpl_iswlower
+#   define iswprint rpl_iswprint
+#   define iswpunct rpl_iswpunct
+#   define iswspace rpl_iswspace
+#   define iswupper rpl_iswupper
+#   define iswxdigit rpl_iswxdigit
+#   define towlower rpl_towlower
+#   define towupper rpl_towupper
 #  endif
+# endif
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswalnum
-#  else
+# else
 iswalnum
-#  endif
+# endif
          (wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
           || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswalpha
-#  else
+# else
 iswalpha
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswblank
-#  else
+# else
 iswblank
-#  endif
+# endif
          (wint_t wc)
 {
   return wc == ' ' || wc == '\t';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswcntrl
-#  else
+# else
 iswcntrl
-#  endif
+# endif
         (wint_t wc)
 {
   return (wc & ~0x1f) == 0 || wc == 0x7f;
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswdigit
-#  else
+# else
 iswdigit
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= '0' && wc <= '9';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswgraph
-#  else
+# else
 iswgraph
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= '!' && wc <= '~';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswlower
-#  else
+# else
 iswlower
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= 'a' && wc <= 'z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswprint
-#  else
+# else
 iswprint
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= ' ' && wc <= '~';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswpunct
-#  else
+# else
 iswpunct
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= '!' && wc <= '~'
@@ -265,78 +219,75 @@
                || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswspace
-#  else
+# else
 iswspace
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc == ' ' || wc == '\t'
           || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswupper
-#  else
+# else
 iswupper
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= 'A' && wc <= 'Z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswxdigit
-#  else
+# else
 iswxdigit
-#  endif
+# endif
           (wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
           || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
 }
 
-_GL_WCTYPE_INLINE wint_t
-#  if @REPLACE_TOWLOWER@
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
 rpl_towlower
-#  else
+# else
 towlower
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
 }
 
-_GL_WCTYPE_INLINE wint_t
-#  if @REPLACE_TOWLOWER@
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
 rpl_towupper
-#  else
+# else
 towupper
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
 }
 
-# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@)
+#elif ! @HAVE_ISWBLANK@
 /* Only the iswblank function is missing.  */
 
-#  if @REPLACE_ISWBLANK@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define iswblank rpl_iswblank
-#   endif
-_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc));
-#  else
-_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
-#  endif
+static inline int
+iswblank (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
 
-# endif
+#endif
 
-# if defined __MINGW32__
+#if defined __MINGW32__
 
 /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t.
    The functions towlower and towupper are implemented in the MSVCRT library
@@ -351,32 +302,30 @@
       result register.  We need to fix this by adding a zero-extend from
       wchar_t to wint_t after the call.  */
 
-_GL_WCTYPE_INLINE wint_t
+static inline wint_t
 rpl_towlower (wint_t wc)
 {
   return (wint_t) (wchar_t) towlower (wc);
 }
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define towlower rpl_towlower
-#  endif
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towlower rpl_towlower
+# endif
 
-_GL_WCTYPE_INLINE wint_t
+static inline wint_t
 rpl_towupper (wint_t wc)
 {
   return (wint_t) (wchar_t) towupper (wc);
 }
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define towupper rpl_towupper
-#  endif
-
-# endif /* __MINGW32__ */
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towupper rpl_towupper
+# endif
 
-# define GNULIB_defined_wctype_functions 1
-#endif
+#endif /* __MINGW32__ */
 
 #if @REPLACE_ISWCNTRL@
 _GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc));
@@ -389,6 +338,7 @@
 #else
 _GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc));
@@ -401,6 +351,7 @@
 #endif
 _GL_CXXALIASWARN (iswalnum);
 _GL_CXXALIASWARN (iswalpha);
+_GL_CXXALIASWARN (iswblank);
 _GL_CXXALIASWARN (iswcntrl);
 _GL_CXXALIASWARN (iswdigit);
 _GL_CXXALIASWARN (iswgraph);
@@ -411,55 +362,7 @@
 _GL_CXXALIASWARN (iswupper);
 _GL_CXXALIASWARN (iswxdigit);
 
-#if @GNULIB_ISWBLANK@
-# if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@
-_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
-# else
-_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
-# endif
-_GL_CXXALIASWARN (iswblank);
-#endif
-
-#if !@HAVE_WCTYPE_T@
-# if !GNULIB_defined_wctype_t
-typedef void * wctype_t;
-#  define GNULIB_defined_wctype_t 1
-# endif
-#endif
-
-/* Get a descriptor for a wide character property.  */
-#if @GNULIB_WCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name));
-# endif
-_GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name));
-_GL_CXXALIASWARN (wctype);
-#elif defined GNULIB_POSIXCHECK
-# undef wctype
-# if HAVE_RAW_DECL_WCTYPE
-_GL_WARN_ON_USE (wctype, "wctype is unportable - "
-                 "use gnulib module wctype for portability");
-# endif
-#endif
-
-/* Test whether a wide character has a given property.
-   The argument WC must be either a wchar_t value or WEOF.
-   The argument DESC must have been returned by the wctype() function.  */
-#if @GNULIB_ISWCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
-# endif
-_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
-_GL_CXXALIASWARN (iswctype);
-#elif defined GNULIB_POSIXCHECK
-# undef iswctype
-# if HAVE_RAW_DECL_ISWCTYPE
-_GL_WARN_ON_USE (iswctype, "iswctype is unportable - "
-                 "use gnulib module iswctype for portability");
-# endif
-#endif
-
-#if @REPLACE_TOWLOWER@ || defined __MINGW32__
+#if @REPLACE_ISWCNTRL@ || defined __MINGW32__
 _GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
 _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));
 #else
@@ -469,46 +372,6 @@
 _GL_CXXALIASWARN (towlower);
 _GL_CXXALIASWARN (towupper);
 
-#if !@HAVE_WCTRANS_T@
-# if !GNULIB_defined_wctrans_t
-typedef void * wctrans_t;
-#  define GNULIB_defined_wctrans_t 1
-# endif
-#endif
-
-/* Get a descriptor for a wide character case conversion.  */
-#if @GNULIB_WCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name));
-# endif
-_GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name));
-_GL_CXXALIASWARN (wctrans);
-#elif defined GNULIB_POSIXCHECK
-# undef wctrans
-# if HAVE_RAW_DECL_WCTRANS
-_GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
-                 "use gnulib module wctrans for portability");
-# endif
-#endif
-
-/* Perform a given case conversion on a wide character.
-   The argument WC must be either a wchar_t value or WEOF.
-   The argument DESC must have been returned by the wctrans() function.  */
-#if @GNULIB_TOWCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
-# endif
-_GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
-_GL_CXXALIASWARN (towctrans);
-#elif defined GNULIB_POSIXCHECK
-# undef towctrans
-# if HAVE_RAW_DECL_TOWCTRANS
-_GL_WARN_ON_USE (towctrans, "towctrans is unportable - "
-                 "use gnulib module towctrans for portability");
-# endif
-#endif
-
-_GL_INLINE_HEADER_END
 
-#endif /* _@GUARD_PREFIX@_WCTYPE_H */
-#endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/wcwidth.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/wcwidth.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/wcwidth.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wcwidth.c	2010-04-25 09:20:42.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc.
 
    This 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 @@
 {
   /* In UTF-8 locales, use a Unicode aware width function.  */
   const char *encoding = locale_charset ();
-  if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
+  if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
     {
       /* We assume that in a UTF-8 locale, a wide character is the same as a
          Unicode character.  */
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/xmalloc.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/xmalloc.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/xmalloc.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/xmalloc.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007 Free Software Foundation, Inc.
 
    This program 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 @@
 xalloc_die ()
 {
   error (xmalloc_exit_failure, 0, _("memory exhausted"));
-  /* _Noreturn cannot be given to error, since it may return if
+  /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the
      xalloc_die does terminate, call exit. */
   exit (EXIT_FAILURE);
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/xreadlink.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/xreadlink.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/xreadlink.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/xreadlink.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/xreadlink.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/xreadlink.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/xreadlink.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/xreadlink.h	2010-02-16 21:31:29.000000000 +0000
@@ -1,6 +1,6 @@
 /* Reading symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -18,6 +18,8 @@
 
 /* Written by Jim Meyering <jim@meyering.net>  */
 
+#include <stddef.h>
+
 extern char *xreadlink (char const *filename);
 
 #if GNULIB_XREADLINKAT
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/xstriconv.c gettext-0.18.1.1/gettext-runtime/gnulib-lib/xstriconv.c
--- gettext-0.19.3/gettext-runtime/gnulib-lib/xstriconv.c	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/xstriconv.c	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-lib/xstriconv.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/xstriconv.h
--- gettext-0.19.3/gettext-runtime/gnulib-lib/xstriconv.h	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/xstriconv.h	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/00gnulib.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/00gnulib.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/00gnulib.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/00gnulib.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,28 +1,12 @@
-# 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 2
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
-dnl m4_divert semantics.
-
-# Until autoconf 2.63, handling of the diversion stack required m4_init
-# to be called first; but this does not happen with aclocal.  Wrapping
-# the entire execution in another layer of the diversion stack fixes this.
-# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
-# for whether it was FIFO or LIFO; in order to properly balance with
-# m4_init, we need to undo our push just before anything wrapped within
-# the m4_init body.  The way to ensure this is to wrap both sides of
-# m4_init with a one-shot macro that does the pop at the right time.
-m4_ifndef([_m4_divert_diversion],
-[m4_divert_push([KILL])
-m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
-m4_define([m4_init],
-  [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
-
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
 
 # AC_DEFUN_ONCE([NAME], VALUE)
 # ----------------------------
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/absolute-header.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/absolute-header.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/absolute-header.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/absolute-header.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-# absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 From Derek Price.
-
-# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
-# ---------------------------------------
-# Find the absolute name of a header file, testing first if the header exists.
-# If the header were sys/inttypes.h, this macro would define
-# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
-# in config.h
-# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
-# The three "///" are to pacify Sun C 5.8, which otherwise would say
-# "warning: #include of /usr/include/... may be non-portable".
-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
-# Note: This macro assumes that the header file is not empty after
-# preprocessing, i.e. it does not only define preprocessor macros but also
-# provides some type/enum definitions or function/variable declarations.
-AC_DEFUN([gl_ABSOLUTE_HEADER],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PREPROC_REQUIRE()dnl
-dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
-dnl until we can assume autoconf 2.64 or newer.
-m4_foreach_w([gl_HEADER_NAME], [$1],
-  [AS_VAR_PUSHDEF([gl_absolute_header],
-                  [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
-  AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
-    m4_defn([gl_absolute_header]),
-    [AS_VAR_PUSHDEF([ac_header_exists],
-                    [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
-    AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
-    if test AS_VAR_GET(ac_header_exists) = yes; then
-      gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
-    fi
-    AS_VAR_POPDEF([ac_header_exists])dnl
-    ])dnl
-  AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
-                     ["AS_VAR_GET(gl_absolute_header)"],
-                     [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.])
-  AS_VAR_POPDEF([gl_absolute_header])dnl
-])dnl
-])# gl_ABSOLUTE_HEADER
-
-# gl_ABSOLUTE_HEADER_ONE(HEADER)
-# ------------------------------
-# Like gl_ABSOLUTE_HEADER, except that:
-#   - it assumes that the header exists,
-#   - it uses the current CPPFLAGS,
-#   - it does not cache the result,
-#   - it is silent.
-AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
-  dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
-  dnl that contain only a #include of other header files and no
-  dnl non-comment tokens of their own. This leads to a failure to
-  dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
-  dnl and others. The workaround is to force preservation of comments
-  dnl through option -C. This ensures all necessary #line directives
-  dnl are present. GCC supports option -C as well.
-  case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-changequote(,)
-  case "$host_os" in
-    mingw*)
-      dnl For the sake of native Windows compilers (excluding gcc),
-      dnl treat backslash as a directory separator, like /.
-      dnl Actually, these compilers use a double-backslash as
-      dnl directory separator, inside the
-      dnl   # line "filename"
-      dnl directives.
-      gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-  dnl A sed expression that turns a string into a basic regular
-  dnl expression, for use within "/.../".
-  gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo '$1' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-changequote([,])
-  dnl eval is necessary to expand gl_absname_cpp.
-  dnl Ultrix and Pyramid sh refuse to redirect output of eval,
-  dnl so use subshell.
-  AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
-[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-  sed -n "$gl_absolute_header_sed"`])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/alloca.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/alloca.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/alloca.m4	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/alloca.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
-# alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011 Free Software Foundation, Inc.
+# alloca.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,7 +25,6 @@
     ALLOCA_H=alloca.h,
     ALLOCA_H=)
   AC_SUBST([ALLOCA_H])
-  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
 ])
 
 # Prerequisites of lib/alloca.c.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/ansi-c++.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/ansi-c++.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/ansi-c++.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/ansi-c++.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-# ansi-c++.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 From Bruno Haible.
-
-# Sets CXX_CHOICE to 'yes' or 'no', depending on the preferred use of C++.
-# The default is 'yes'. If the configure.ac contains a definition of the
-# macro gl_CXX_CHOICE_DEFAULT_NO, then the default is 'no'. In both cases,
-# the user can change the value by passing the option --disable-cxx or
-# --enable-cxx, respectively.
-
-AC_DEFUN([gl_CXX_CHOICE],
-[
-  AC_MSG_CHECKING([whether to use C++])
-  dnl Plus signs are supported in AC_ARG_ENABLE starting with autoconf-2.66.
-  m4_version_prereq([2.66],
-    [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
-       [AC_ARG_ENABLE([c++],
-          [  --enable-c++            also build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=no])],
-       [AC_ARG_ENABLE([c++],
-          [  --disable-c++           do not build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=yes])])],
-    [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
-       [AC_ARG_ENABLE([cxx],
-          [  --enable-cxx            also build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=no])],
-       [AC_ARG_ENABLE([cxx],
-          [  --disable-cxx           do not build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=yes])])])
-  AC_MSG_RESULT([$CXX_CHOICE])
-  AC_SUBST([CXX_CHOICE])
-])
-
-# gl_PROG_ANSI_CXX([ANSICXX_VARIABLE], [ANSICXX_CONDITIONAL])
-# Sets ANSICXX_VARIABLE to the name of a sufficiently ANSI C++ compliant
-# compiler, or to "no" if none is found.
-# Defines the Automake condition ANSICXX_CONDITIONAL to true if such a compiler
-# was found, or to false if not.
-
-AC_DEFUN([gl_PROG_ANSI_CXX],
-[
-  AC_REQUIRE([gl_CXX_CHOICE])
-  m4_if([$1], [CXX], [],
-    [gl_save_CXX="$CXX"])
-  if test "$CXX_CHOICE" = no; then
-    CXX=no
-  fi
-  if test -z "$CXX"; then
-    if test -n "$CCC"; then
-      CXX="$CCC"
-    else
-      AC_CHECK_TOOLS([CXX],
-                     [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],
-                     [:])
-    fi
-  fi
-  if test "$CXX" != no; then
-    dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit
-    dnl upon failure.
-    AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
-    AC_LANG_PUSH([C++])
-    AC_ARG_VAR([CXX], [C++ compiler command])
-    AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
-    echo 'int main () { return 0; }' > conftest.$ac_ext
-    if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      gl_cv_prog_ansicxx_works=yes
-      if (./conftest; exit) 2>/dev/null; then
-        gl_cv_prog_ansicxx_cross=no
-      else
-        gl_cv_prog_ansicxx_cross=yes
-      fi
-    else
-      gl_cv_prog_ansicxx_works=no
-    fi
-    rm -fr conftest*
-    AC_LANG_POP([C++])
-    AC_MSG_RESULT([$gl_cv_prog_ansicxx_works])
-    if test $gl_cv_prog_ansicxx_works = no; then
-      CXX=no
-    else
-      dnl Test for namespaces.
-      dnl We don't bother supporting pre-ANSI-C++ compilers.
-      AC_MSG_CHECKING([whether the C++ compiler supports namespaces])
-      AC_LANG_PUSH([C++])
-      cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
-      if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-        gl_cv_prog_ansicxx_namespaces=yes
-      else
-        gl_cv_prog_ansicxx_namespaces=no
-      fi
-      rm -fr conftest*
-      AC_LANG_POP([C++])
-      AC_MSG_RESULT([$gl_cv_prog_ansicxx_namespaces])
-      if test $gl_cv_prog_ansicxx_namespaces = no; then
-        CXX=no
-      fi
-    fi
-  fi
-  m4_if([$1], [CXX], [],
-    [$1="$CXX"
-     CXX="$gl_save_CXX"])
-  AC_SUBST([$1])
-
-  AM_CONDITIONAL([$2], [test "$$1" != no])
-
-  if test "$$1" != no; then
-    dnl This macro invocation resolves an automake error:
-    dnl /usr/local/share/automake-1.11/am/depend2.am: am__fastdepCXX does not appear in AM_CONDITIONAL
-    dnl /usr/local/share/automake-1.11/am/depend2.am:   The usual way to define 'am__fastdepCXX' is to add 'AC_PROG_CXX'
-    dnl /usr/local/share/automake-1.11/am/depend2.am:   to 'configure.ac' and run 'aclocal' and 'autoconf' again.
-    _AM_DEPENDENCIES([CXX])
-  else
-    AM_CONDITIONAL([am__fastdepCXX], [false])
-  fi
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/asm-underscore.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/asm-underscore.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/asm-underscore.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/asm-underscore.m4	2010-05-17 19:56:13.000000000 +0000
@@ -1,5 +1,5 @@
-# asm-underscore.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# asm-underscore.m4 serial 1
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,6 @@
   dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because
   dnl 1. It works only for GCC.
   dnl 2. It is incorrectly defined on some platforms, in some GCC versions.
-  AC_REQUIRE([gl_C_ASM])
   AC_CACHE_CHECK(
     [whether C symbols are prefixed with underscore at the linker level],
     [gl_cv_prog_as_underscore],
@@ -28,8 +27,8 @@
 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
+     AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c) >/dev/null 2>&1
+     if grep _foo conftest.s >/dev/null ; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
@@ -47,25 +46,3 @@
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   AC_SUBST([ASM_SYMBOL_PREFIX])
 ])
-
-# gl_C_ASM
-# Determines how to produce an assembly language file from C source code.
-# Sets the variables:
-#   gl_asmext - the extension of assembly language output,
-#   gl_c_asm_opt - the C compiler option that produces assembly language output.
-
-AC_DEFUN([gl_C_ASM],
-[
-  AC_EGREP_CPP([MicrosoftCompiler],
-    [
-#ifdef _MSC_VER
-MicrosoftCompiler
-#endif
-    ],
-    [gl_asmext='asm'
-     gl_c_asm_opt='-c -Fa'
-    ],
-    [gl_asmext='s'
-     gl_c_asm_opt='-S'
-    ])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/atexit.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/atexit.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/atexit.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/atexit.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,12 +1,15 @@
-# atexit.m4 serial 4
-dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+# atexit.m4 serial 3
+dnl Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_ATEXIT],
 [
-  AC_CHECK_FUNCS([atexit])
+  AC_REPLACE_FUNCS([atexit])
+  if test $ac_cv_func_atexit = no; then
+    gl_PREREQ_ATEXIT
+  fi
 ])
 
 # Prerequisites of lib/atexit.c.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/canonicalize.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/canonicalize.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/canonicalize.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/canonicalize.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,6 +1,6 @@
-# canonicalize.m4 serial 26
+# canonicalize.m4 serial 16
 
-dnl Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,49 +10,40 @@
 # not provide or fix realpath.
 AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
 [
+  AC_LIBOBJ([canonicalize])
+
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
   AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
-  else
-    case "$gl_cv_func_realpath_works" in
-      *yes) ;;
-      *)    REPLACE_CANONICALIZE_FILE_NAME=1 ;;
-    esac
+  elif test "$gl_cv_func_realpath_works" != yes; then
+    REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 ])
 
 # Provides canonicalize_file_name and realpath.
 AC_DEFUN([gl_CANONICALIZE_LGPL],
 [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
+    AC_LIBOBJ([canonicalize-lgpl])
     if test $ac_cv_func_realpath = no; then
       HAVE_REALPATH=0
-    else
-      case "$gl_cv_func_realpath_works" in
-	*yes) ;;
-	*)    REPLACE_REALPATH=1 ;;
-      esac
+    elif test "$gl_cv_func_realpath_works" != yes; then
+      REPLACE_REALPATH=1
     fi
-  else
-    case "$gl_cv_func_realpath_works" in
-      *yes)
-        ;;
-      *)
-        REPLACE_CANONICALIZE_FILE_NAME=1
-        REPLACE_REALPATH=1
-        ;;
-    esac
+  elif test "$gl_cv_func_realpath_works" != yes; then
+    AC_LIBOBJ([canonicalize-lgpl])
+    REPLACE_REALPATH=1
+    REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 ])
 
 # Like gl_CANONICALIZE_LGPL, except prepare for separate compilation
-# (no REPLACE_CANONICALIZE_FILE_NAME, no REPLACE_REALPATH, no AC_LIBOBJ).
+# (no AC_LIBOBJ).
 AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE],
 [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -68,57 +59,23 @@
 AC_DEFUN([gl_FUNC_REALPATH_WORKS],
 [
   AC_CHECK_FUNCS_ONCE([realpath])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether realpath works], [gl_cv_func_realpath_works], [
     touch conftest.a
-    mkdir conftest.d
     AC_RUN_IFELSE([
       AC_LANG_PROGRAM([[
-        ]GL_NOCRASH[
         #include <stdlib.h>
-        #include <string.h>
       ]], [[
-        int result = 0;
-        {
-          char *name = realpath ("conftest.a", NULL);
-          if (!(name && *name == '/'))
-            result |= 1;
-        }
-        {
-          char *name = realpath ("conftest.b/../conftest.a", NULL);
-          if (name != NULL)
-            result |= 2;
-        }
-        {
-          char *name = realpath ("conftest.a/", NULL);
-          if (name != NULL)
-            result |= 4;
-        }
-        {
-          char *name1 = realpath (".", NULL);
-          char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
-            result |= 8;
-        }
-        return result;
+        char *name1 = realpath ("conftest.a", NULL);
+        char *name2 = realpath ("conftest.b/../conftest.a", NULL);
+        char *name3 = realpath ("conftest.a/", NULL);
+        return !(name1 && *name1 == '/' && !name2 && !name3);
       ]])
-     ],
-     [gl_cv_func_realpath_works=yes],
-     [gl_cv_func_realpath_works=no],
-     [case "$host_os" in
-                       # Guess yes on glibc systems.
-        *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-                       # If we don't know, assume the worst.
-        *)             gl_cv_func_realpath_works="guessing no" ;;
-      esac
-     ])
-    rm -rf conftest.a conftest.d
+    ], [gl_cv_func_realpath_works=yes], [gl_cv_func_realpath_works=no],
+       [gl_cv_func_realpath_works="guessing no"])
   ])
-  case "$gl_cv_func_realpath_works" in
-    *yes)
-      AC_DEFINE([FUNC_REALPATH_WORKS], [1], [Define to 1 if realpath()
-        can malloc memory, always gives an absolute path, and handles
-        trailing slash correctly.])
-      ;;
-  esac
+  if test "$gl_cv_func_realpath_works" = yes; then
+    AC_DEFINE([FUNC_REALPATH_WORKS], [1], [Define to 1 if realpath()
+      can malloc memory, always gives an absolute path, and handles
+      trailing slash correctly.])
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/configmake.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/configmake.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/configmake.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/configmake.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-# configmake.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# gl_CONFIGMAKE_PREP
-# ------------------
-# Guarantee all of the standard directory variables, even when used with
-# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir
-# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b,
-# and runstatedir in 1.14.1).
-AC_DEFUN([gl_CONFIGMAKE_PREP],
-[
-  dnl Technically, datadir should default to datarootdir.  But if
-  dnl autoconf is too old to provide datarootdir, then reversing the
-  dnl definition is a reasonable compromise.  Only AC_SUBST a variable
-  dnl if it was not already defined earlier by autoconf.
-  if test "x$datarootdir" = x; then
-    AC_SUBST([datarootdir], ['${datadir}'])
-  fi
-  dnl Copy the approach used in autoconf 2.60.
-  if test "x$docdir" = x; then
-    AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-      ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-      ['${datarootdir}/doc/${PACKAGE}'])])
-  fi
-  dnl The remaining variables missing from autoconf 2.59 are easier.
-  if test "x$htmldir" = x; then
-    AC_SUBST([htmldir], ['${docdir}'])
-  fi
-  if test "x$dvidir" = x; then
-    AC_SUBST([dvidir], ['${docdir}'])
-  fi
-  if test "x$pdfdir" = x; then
-    AC_SUBST([pdfdir], ['${docdir}'])
-  fi
-  if test "x$psdir" = x; then
-    AC_SUBST([psdir], ['${docdir}'])
-  fi
-  if test "x$lispdir" = x; then
-    AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp'])
-  fi
-  if test "x$localedir" = x; then
-    AC_SUBST([localedir], ['${datarootdir}/locale'])
-  fi
-  dnl Added in autoconf 2.70
-  if test "x$runstatedir" = x; then
-    AC_SUBST([runstatedir], ['${localstatedir}/run'])
-  fi
-
-  dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely
-  dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe.
-  AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}'])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/csharpcomp.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/csharpcomp.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/csharpcomp.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/csharpcomp.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/csharp.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/csharp.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/csharp.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/csharp.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/dos.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/dos.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/dos.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/dos.m4	2010-02-16 21:31:29.000000000 +0000
@@ -0,0 +1,71 @@
+#serial 11   -*- autoconf -*-
+
+# Define some macros required for proper operation of code in lib/*.c
+# on MSDOS/Windows systems.
+
+# Copyright (C) 2000-2001, 2004-2006, 2009-2010 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.
+
+# From Jim Meyering.
+
+AC_DEFUN([gl_AC_DOS],
+  [
+    AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
+      [
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
+neither MSDOS nor Windows
+#endif]])],
+        [ac_cv_win_or_dos=yes],
+        [ac_cv_win_or_dos=no])
+      ])
+
+    if test x"$ac_cv_win_or_dos" = xyes; then
+      ac_fs_accepts_drive_letter_prefix=1
+      ac_fs_backslash_is_file_name_separator=1
+      AC_CACHE_CHECK([whether drive letter can start relative path],
+                     [ac_cv_drive_letter_can_be_relative],
+        [
+          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+#if defined __CYGWIN__
+drive letters are always absolute
+#endif]])],
+          [ac_cv_drive_letter_can_be_relative=yes],
+          [ac_cv_drive_letter_can_be_relative=no])
+        ])
+      if test x"$ac_cv_drive_letter_can_be_relative" = xyes; then
+        ac_fs_drive_letter_can_be_relative=1
+      else
+        ac_fs_drive_letter_can_be_relative=0
+      fi
+    else
+      ac_fs_accepts_drive_letter_prefix=0
+      ac_fs_backslash_is_file_name_separator=0
+      ac_fs_drive_letter_can_be_relative=0
+    fi
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
+      $ac_fs_accepts_drive_letter_prefix,
+      [Define on systems for which file names may have a so-called
+       `drive letter' prefix, define this to compute the length of that
+       prefix, including the colon.])
+
+    AH_VERBATIM(ISSLASH,
+    [#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif])
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
+      $ac_fs_backslash_is_file_name_separator,
+      [Define if the backslash character may also serve as a file name
+       component separator.])
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE],
+      $ac_fs_drive_letter_can_be_relative,
+      [Define if a drive letter prefix denotes a relative path if it is
+       not followed by a file name component separator.])
+  ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/double-slash-root.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/double-slash-root.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/double-slash-root.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/double-slash-root.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/eealloc.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/eealloc.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/eealloc.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/eealloc.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+# eealloc.m4 serial 2
+dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,7 @@
 [
   AC_REQUIRE([gl_EEMALLOC])
   AC_REQUIRE([gl_EEREALLOC])
+  AC_REQUIRE([AC_C_INLINE])
 ])
 
 AC_DEFUN([gl_EEMALLOC],
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/environ.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/environ.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/environ.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/environ.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+# environ.m4 serial 3
+dnl Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,16 +9,7 @@
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   dnl Persuade glibc <unistd.h> to declare environ.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  gt_CHECK_VAR_DECL(
-    [#if HAVE_UNISTD_H
-     #include <unistd.h>
-     #endif
-     /* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
-     #include <stdlib.h>
-    ],
-    [environ])
+  gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
   if test $gt_cv_var_environ_declaration != yes; then
     HAVE_DECL_ENVIRON=0
   fi
@@ -31,16 +22,14 @@
   define([gt_cv_var], [gt_cv_var_]$2[_declaration])
   AC_MSG_CHECKING([if $2 is properly declared])
   AC_CACHE_VAL([gt_cv_var], [
-    AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[$1
-           extern struct { int foo; } $2;]],
-         [[$2.foo = 1;]])],
-      [gt_cv_var=no],
-      [gt_cv_var=yes])])
+    AC_TRY_COMPILE([$1
+      extern struct { int foo; } $2;],
+      [$2.foo = 1;],
+      gt_cv_var=no,
+      gt_cv_var=yes)])
   AC_MSG_RESULT([$gt_cv_var])
   if test $gt_cv_var = yes; then
-    AC_DEFINE([HAVE_]m4_translit($2, [a-z], [A-Z])[_DECL], 1,
+    AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1,
               [Define if you have the declaration of $2.])
   fi
   undefine([gt_cv_var])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/errno_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/errno_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/errno_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/errno_h.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc.
+# errno_h.m4 serial 6
+dnl Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,9 +10,6 @@
   AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
     AC_EGREP_CPP([booboo],[
 #include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
 #if !defined ENOMSG
 booboo
 #endif
@@ -37,30 +34,12 @@
 #if !defined ENOTSUP
 booboo
 #endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
 #if !defined ESTALE
 booboo
 #endif
-#if !defined EDQUOT
-booboo
-#endif
 #if !defined ECANCELED
 booboo
 #endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
       ],
       [gl_cv_header_errno_h_complete=no],
       [gl_cv_header_errno_h_complete=yes])
@@ -68,11 +47,10 @@
   if test $gl_cv_header_errno_h_complete = yes; then
     ERRNO_H=''
   else
-    gl_NEXT_HEADERS([errno.h])
+    gl_CHECK_NEXT_HEADERS([errno.h])
     ERRNO_H='errno.h'
   fi
   AC_SUBST([ERRNO_H])
-  AM_CONDITIONAL([GL_GENERATE_ERRNO_H], [test -n "$ERRNO_H"])
   gl_REPLACE_ERRNO_VALUE([EMULTIHOP])
   gl_REPLACE_ERRNO_VALUE([ENOLINK])
   gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/error.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/error.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/error.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/error.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,6 +1,6 @@
-#serial 14
+#serial 12
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8,20 +8,15 @@
 
 AC_DEFUN([gl_ERROR],
 [
-  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
-  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
-  AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <error.h>]],
-          [[error_at_line (0, 0, "", 0, "an error occurred");]])],
-       [ac_cv_lib_error_at_line=yes],
-       [ac_cv_lib_error_at_line=no])])
+  AC_FUNC_ERROR_AT_LINE
+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  gl_PREREQ_ERROR
 ])
 
 # Prerequisites of lib/error.c.
 AC_DEFUN([gl_PREREQ_ERROR],
 [
   AC_REQUIRE([AC_FUNC_STRERROR_R])
+  AC_REQUIRE([AC_C_INLINE])
   :
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/extensions.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/extensions.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/extensions.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/extensions.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,14 +1,14 @@
-# serial 13  -*- Autoconf -*-
+# serial 9  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2010 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.
 
-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
 # Autoconf.  Perhaps we can remove this once we can assume Autoconf
-# 2.70 or later everywhere, but since Autoconf mutates rapidly
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
 # enough in this area it's likely we'll need to redefine
 # AC_USE_SYSTEM_EXTENSIONS for quite some time.
 
@@ -30,7 +30,6 @@
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
-#
 # Remember that #undef in AH_VERBATIM gets replaced with #define by
 # AC_DEFINE.  The goal here is to define all known feature-enabling
 # macros, then, if reports of conflicts are made, disable macros that
@@ -39,31 +38,35 @@
 [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
   AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
   if test "$MINIX" = yes; then
     AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for 'stat' and other
+      [Define to 1 if you need to in order for `stat' and other
        things to work.])
     AC_DEFINE([_POSIX_1_SOURCE], [2],
       [Define to 2 if the system does not provide POSIX.1 features
        except with this defined.])
     AC_DEFINE([_MINIX], [1],
       [Define to 1 if on MINIX.])
-    AC_DEFINE([_NETBSD_SOURCE], [1],
-      [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
   fi
 
-dnl Use a different key than __EXTENSIONS__, as that name broke existing
-dnl configure.ac when using autoheader 2.62.
-  AH_VERBATIM([USE_SYSTEM_EXTENSIONS],
+  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
+  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
+  dnl provided.
+  case "$host_os" in
+    hpux*)
+      AC_DEFINE([_XOPEN_SOURCE], [500],
+        [Define to 500 only on HP-UX.])
+      ;;
+  esac
+
+  AH_VERBATIM([__EXTENSIONS__],
 [/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
@@ -76,12 +79,6 @@
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
-   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
-   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
-#endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
@@ -98,26 +95,9 @@
   test $ac_cv_safe_to_define___extensions__ = yes &&
     AC_DEFINE([__EXTENSIONS__])
   AC_DEFINE([_ALL_SOURCE])
-  AC_DEFINE([_DARWIN_C_SOURCE])
   AC_DEFINE([_GNU_SOURCE])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
-  AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
-    [ac_cv_should_define__xopen_source],
-    [ac_cv_should_define__xopen_source=no
-     AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[
-          #include <wchar.h>
-          mbstate_t x;]])],
-       [],
-       [AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([[
-             #define _XOPEN_SOURCE 500
-             #include <wchar.h>
-             mbstate_t x;]])],
-          [ac_cv_should_define__xopen_source=yes])])])
-  test $ac_cv_should_define__xopen_source = yes &&
-    AC_DEFINE([_XOPEN_SOURCE], [500])
 ])# AC_USE_SYSTEM_EXTENSIONS
 
 # gl_USE_SYSTEM_EXTENSIONS
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/getopt.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/getopt.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/getopt.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/getopt.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
+# getopt.m4 serial 28
+dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,22 +9,10 @@
 [
   m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX])
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
-  dnl Other modules can request the gnulib implementation of the getopt
-  dnl functions unconditionally, by defining gl_REPLACE_GETOPT_ALWAYS.
-  dnl argp.m4 does this.
-  m4_ifdef([gl_REPLACE_GETOPT_ALWAYS], [
-    REPLACE_GETOPT=1
-  ], [
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
-  ])
-  if test $REPLACE_GETOPT = 1; then
-    dnl Arrange for getopt.h to be created.
-    gl_GETOPT_SUBSTITUTE_HEADER
-  fi
+  gl_GETOPT_IFELSE([
+    gl_REPLACE_GETOPT
+  ],
+  [])
 ])
 
 # Request a POSIX compliant getopt function with GNU extensions (such as
@@ -37,16 +25,37 @@
   AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
 ])
 
+# Request the gnulib implementation of the getopt functions unconditionally.
+# argp.m4 uses this.
+AC_DEFUN([gl_REPLACE_GETOPT],
+[
+  dnl Arrange for getopt.h to be created.
+  gl_GETOPT_SUBSTITUTE_HEADER
+  dnl Arrange for unistd.h to include getopt.h.
+  GNULIB_UNISTD_H_GETOPT=1
+  dnl Arrange to compile the getopt implementation.
+  AC_LIBOBJ([getopt])
+  AC_LIBOBJ([getopt1])
+  gl_PREREQ_GETOPT
+])
+
+# emacs' configure.in uses this.
+AC_DEFUN([gl_GETOPT_IFELSE],
+[
+  AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
+  AS_IF([test -n "$gl_replace_getopt"], [$1], [$2])
+])
+
 # Determine whether to replace the entire getopt facility.
 AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([AC_PROG_AWK]) dnl for awk that supports ENVIRON
 
   dnl Persuade Solaris <unistd.h> to declare optarg, optind, opterr, optopt.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   gl_CHECK_NEXT_HEADERS([getopt.h])
+  AC_CHECK_HEADERS_ONCE([getopt.h])
   if test $ac_cv_header_getopt_h = yes; then
     HAVE_GETOPT_H=1
   else
@@ -66,6 +75,25 @@
     AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes])
   fi
 
+  dnl BSD getopt_long uses an incompatible method to reset option processing.
+  dnl Existence of the variable, in and of itself, is not a reason to replace
+  dnl getopt, but knowledge of the variable is needed to determine how to
+  dnl reset and whether a reset reparses the environment.
+  dnl Solaris supports neither optreset nor optind=0, but keeps no state that
+  dnl needs a reset beyond setting optind=1; detect Solaris by getopt_clip.
+  if test -z "$gl_replace_getopt"; then
+    AC_CHECK_DECLS([optreset], [],
+      [AC_CHECK_DECLS([getopt_clip], [], [],
+        [[#include <getopt.h>]])
+      ],
+      [[#include <getopt.h>]])
+  fi
+
+  dnl mingw's getopt (in libmingwex.a) does weird things when the options
+  dnl strings starts with '+' and it's not the first call.  Some internal state
+  dnl is left over from earlier calls, and neither setting optind = 0 nor
+  dnl setting optreset = 1 get rid of this internal state.
+  dnl POSIX is silent on optind vs. optreset, so we allow either behavior.
   dnl POSIX 2008 does not specify leading '+' behavior, but see
   dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on
   dnl the next version of POSIX.  For now, we only guarantee leading '+'
@@ -74,124 +102,105 @@
     AC_CACHE_CHECK([whether getopt is POSIX compatible],
       [gl_cv_func_getopt_posix],
       [
-        dnl Merging these three different test programs into a single one
-        dnl would require a reset mechanism. On BSD systems, it can be done
-        dnl through 'optreset'; on some others (glibc), it can be done by
-        dnl setting 'optind' to 0; on others again (HP-UX, IRIX, OSF/1,
-        dnl Solaris 9, musl libc), there is no such mechanism.
-        if test $cross_compiling = no; then
-          dnl Sanity check. Succeeds everywhere (except on MSVC,
-          dnl which lacks <unistd.h> and getopt() entirely).
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
+        dnl This test fails on mingw and succeeds on all other platforms.
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 
-int
-main ()
-{
-  static char program[] = "program";
-  static char a[] = "-a";
-  static char foo[] = "foo";
-  static char bar[] = "bar";
-  char *argv[] = { program, a, foo, bar, NULL };
-  int c;
-
-  c = getopt (4, argv, "ab");
-  if (!(c == 'a'))
-    return 1;
-  c = getopt (4, argv, "ab");
-  if (!(c == -1))
-    return 2;
-  if (!(optind == 2))
-    return 3;
-  return 0;
-}
-]])],
-            [gl_cv_func_getopt_posix=maybe],
-            [gl_cv_func_getopt_posix=no])
-          if test $gl_cv_func_getopt_posix = maybe; then
-            dnl Sanity check with '+'. Succeeds everywhere (except on MSVC,
-            dnl which lacks <unistd.h> and getopt() entirely).
-            AC_RUN_IFELSE(
-              [AC_LANG_SOURCE([[
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP
+# define OPTIND_MIN 0
+#else
+# define OPTIND_MIN 1
+#endif
 
 int
 main ()
 {
-  static char program[] = "program";
-  static char donald[] = "donald";
-  static char p[] = "-p";
-  static char billy[] = "billy";
-  static char duck[] = "duck";
-  static char a[] = "-a";
-  static char bar[] = "bar";
-  char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
-  int c;
-
-  c = getopt (7, argv, "+abp:q:");
-  if (!(c == -1))
-    return 4;
-  if (!(strcmp (argv[0], "program") == 0))
-    return 5;
-  if (!(strcmp (argv[1], "donald") == 0))
-    return 6;
-  if (!(strcmp (argv[2], "-p") == 0))
-    return 7;
-  if (!(strcmp (argv[3], "billy") == 0))
-    return 8;
-  if (!(strcmp (argv[4], "duck") == 0))
-    return 9;
-  if (!(strcmp (argv[5], "-a") == 0))
-    return 10;
-  if (!(strcmp (argv[6], "bar") == 0))
-    return 11;
-  if (!(optind == 1))
-    return 12;
-  return 0;
-}
-]])],
-              [gl_cv_func_getopt_posix=maybe],
-              [gl_cv_func_getopt_posix=no])
-          fi
-          if test $gl_cv_func_getopt_posix = maybe; then
-            dnl Detect Mac OS X 10.5, AIX 7.1, mingw bug.
-            AC_RUN_IFELSE(
-              [AC_LANG_SOURCE([[
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "-a";
+    argv[argc++] = "foo";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
+
+    c = getopt (argc, argv, "ab");
+    if (!(c == 'a'))
+      return 1;
+    c = getopt (argc, argv, "ab");
+    if (!(c == -1))
+      return 2;
+    if (!(optind == 2))
+      return 3;
+  }
+  /* Some internal state exists at this point.  */
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "donald";
+    argv[argc++] = "-p";
+    argv[argc++] = "billy";
+    argv[argc++] = "duck";
+    argv[argc++] = "-a";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
+
+    c = getopt (argc, argv, "+abp:q:");
+    if (!(c == -1))
+      return 4;
+    if (!(strcmp (argv[0], "program") == 0))
+      return 5;
+    if (!(strcmp (argv[1], "donald") == 0))
+      return 6;
+    if (!(strcmp (argv[2], "-p") == 0))
+      return 7;
+    if (!(strcmp (argv[3], "billy") == 0))
+      return 8;
+    if (!(strcmp (argv[4], "duck") == 0))
+      return 9;
+    if (!(strcmp (argv[5], "-a") == 0))
+      return 10;
+    if (!(strcmp (argv[6], "bar") == 0))
+      return 11;
+    if (!(optind == 1))
+      return 12;
+  }
+  /* Detect MacOS 10.5 bug.  */
+  {
+    char *argv[3] = { "program", "-ab", NULL };
+    optind = OPTIND_MIN;
+    opterr = 0;
+    if (getopt (2, argv, "ab:") != 'a')
+      return 13;
+    if (getopt (2, argv, "ab:") != '?')
+      return 14;
+    if (optopt != 'b')
+      return 15;
+    if (optind != 2)
+      return 16;
+  }
 
-int
-main ()
-{
-  static char program[] = "program";
-  static char ab[] = "-ab";
-  char *argv[3] = { program, ab, NULL };
-  if (getopt (2, argv, "ab:") != 'a')
-    return 13;
-  if (getopt (2, argv, "ab:") != '?')
-    return 14;
-  if (optopt != 'b')
-    return 15;
-  if (optind != 2)
-    return 16;
   return 0;
 }
 ]])],
-              [gl_cv_func_getopt_posix=yes],
-              [gl_cv_func_getopt_posix=no])
-          fi
-        else
-          case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
-          esac
-        fi
+          [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no],
+          [case "$host_os" in
+             mingw*) gl_cv_func_getopt_posix="guessing no";;
+             darwin*) gl_cv_func_getopt_posix="guessing no";;
+             *)      gl_cv_func_getopt_posix="guessing yes";;
+           esac
+          ])
       ])
     case "$gl_cv_func_getopt_posix" in
       *no) gl_replace_getopt=yes ;;
@@ -204,154 +213,82 @@
        # optstring is necessary for programs like m4 that have POSIX-mandated
        # semantics for supporting options interspersed with files.
        # Also, since getopt_long is a GNU extension, we require optind=0.
-       # Bash ties 'set -o posix' to a non-exported POSIXLY_CORRECT;
-       # so take care to revert to the correct (non-)export state.
-dnl GNU Coding Standards currently allow awk but not env; besides, env
-dnl is ambiguous with environment values that contain newlines.
-       gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
-       case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
-         xx) gl_had_POSIXLY_CORRECT=exported ;;
-         x)  gl_had_POSIXLY_CORRECT=yes      ;;
-         *)  gl_had_POSIXLY_CORRECT=         ;;
-       esac
+       gl_had_POSIXLY_CORRECT=${POSIXLY_CORRECT:+yes}
        POSIXLY_CORRECT=1
        export POSIXLY_CORRECT
        AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([[#include <getopt.h>
                            #include <stddef.h>
                            #include <string.h>
-           ]GL_NOCRASH[
            ]], [[
-             int result = 0;
-
-             nocrash_init();
-
              /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
-                and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
+                and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
                 OSF/1 5.1, Solaris 10.  */
              {
-               static char conftest[] = "conftest";
-               static char plus[] = "-+";
-               char *argv[3] = { conftest, plus, NULL };
+               char *myargv[3];
+               myargv[0] = "conftest";
+               myargv[1] = "-+";
+               myargv[2] = 0;
                opterr = 0;
-               if (getopt (2, argv, "+a") != '?')
-                 result |= 1;
+               if (getopt (2, myargv, "+a") != '?')
+                 return 1;
              }
              /* This code succeeds on glibc 2.8, mingw,
-                and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
+                and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
                 IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x.  */
              {
-               static char program[] = "program";
-               static char p[] = "-p";
-               static char foo[] = "foo";
-               static char bar[] = "bar";
-               char *argv[] = { program, p, foo, bar, NULL };
+               char *argv[] = { "program", "-p", "foo", "bar", NULL };
 
                optind = 1;
                if (getopt (4, argv, "p::") != 'p')
-                 result |= 2;
-               else if (optarg != NULL)
-                 result |= 4;
-               else if (getopt (4, argv, "p::") != -1)
-                 result |= 6;
-               else if (optind != 2)
-                 result |= 8;
+                 return 2;
+               if (optarg != NULL)
+                 return 3;
+               if (getopt (4, argv, "p::") != -1)
+                 return 4;
+               if (optind != 2)
+                 return 5;
              }
              /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0.  */
              {
-               static char program[] = "program";
-               static char foo[] = "foo";
-               static char p[] = "-p";
-               char *argv[] = { program, foo, p, NULL };
+               char *argv[] = { "program", "foo", "-p", NULL };
                optind = 0;
                if (getopt (3, argv, "-p") != 1)
-                 result |= 16;
-               else if (getopt (3, argv, "-p") != 'p')
-                 result |= 16;
+                 return 6;
+               if (getopt (3, argv, "-p") != 'p')
+                 return 7;
              }
              /* This code fails on glibc 2.11.  */
              {
-               static char program[] = "program";
-               static char b[] = "-b";
-               static char a[] = "-a";
-               char *argv[] = { program, b, a, NULL };
+               char *argv[] = { "program", "-b", "-a", NULL };
                optind = opterr = 0;
                if (getopt (3, argv, "+:a:b") != 'b')
-                 result |= 32;
-               else if (getopt (3, argv, "+:a:b") != ':')
-                 result |= 32;
-             }
-             /* This code dumps core on glibc 2.14.  */
-             {
-               static char program[] = "program";
-               static char w[] = "-W";
-               static char dummy[] = "dummy";
-               char *argv[] = { program, w, dummy, NULL };
-               optind = opterr = 1;
-               if (getopt (3, argv, "W;") != 'W')
-                 result |= 64;
+                 return 8;
+               if (getopt (3, argv, "+:a:b") != ':')
+                 return 9;
              }
-             return result;
+             return 0;
            ]])],
         [gl_cv_func_getopt_gnu=yes],
         [gl_cv_func_getopt_gnu=no],
-        [dnl Cross compiling. Assume the worst, even on glibc platforms.
-         gl_cv_func_getopt_gnu="guessing no"
+        [dnl Cross compiling. Guess based on host and declarations.
+         case $host_os:$ac_cv_have_decl_optreset in
+           *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
+           *:yes)               gl_cv_func_getopt_gnu=no;;
+           *)                   gl_cv_func_getopt_gnu=yes;;
+         esac
         ])
-       case $gl_had_POSIXLY_CORRECT in
-         exported) ;;
-         yes) AS_UNSET([POSIXLY_CORRECT]); POSIXLY_CORRECT=1 ;;
-         *) AS_UNSET([POSIXLY_CORRECT]) ;;
-       esac
+       if test "$gl_had_POSIXLY_CORRECT" != yes; then
+         AS_UNSET([POSIXLY_CORRECT])
+       fi
       ])
-    if test "$gl_cv_func_getopt_gnu" != yes; then
+    if test "$gl_cv_func_getopt_gnu" = "no"; then
       gl_replace_getopt=yes
-    else
-      AC_CACHE_CHECK([for working GNU getopt_long function],
-        [gl_cv_func_getopt_long_gnu],
-        [AC_RUN_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <getopt.h>
-                #include <stddef.h>
-                #include <string.h>
-              ]],
-              [[static const struct option long_options[] =
-                  {
-                    { "xtremely-",no_argument,       NULL, 1003 },
-                    { "xtra",     no_argument,       NULL, 1001 },
-                    { "xtreme",   no_argument,       NULL, 1002 },
-                    { "xtremely", no_argument,       NULL, 1003 },
-                    { NULL,       0,                 NULL, 0 }
-                  };
-                /* This code fails on OpenBSD 5.0.  */
-                {
-                  static char program[] = "program";
-                  static char xtremel[] = "--xtremel";
-                  char *argv[] = { program, xtremel, NULL };
-                  int option_index;
-                  optind = 1; opterr = 0;
-                  if (getopt_long (2, argv, "", long_options, &option_index) != 1003)
-                    return 1;
-                }
-                return 0;
-              ]])],
-           [gl_cv_func_getopt_long_gnu=yes],
-           [gl_cv_func_getopt_long_gnu=no],
-           [dnl Cross compiling. Guess no on OpenBSD, yes otherwise.
-            case "$host_os" in
-              openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
-              *)        gl_cv_func_getopt_long_gnu="guessing yes";;
-            esac
-           ])
-        ])
-      case "$gl_cv_func_getopt_long_gnu" in
-        *yes) ;;
-        *) gl_replace_getopt=yes ;;
-      esac
     fi
   fi
 ])
 
+# emacs' configure.in uses this.
 AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
 [
   GETOPT_H=getopt.h
@@ -362,6 +299,7 @@
 ])
 
 # Prerequisites of lib/getopt*.
+# emacs' configure.in uses this.
 AC_DEFUN([gl_PREREQ_GETOPT],
 [
   AC_CHECK_DECLS_ONCE([getenv])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/gettimeofday.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/gettimeofday.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/gettimeofday.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/gettimeofday.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-# serial 21
-
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 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_GETTIMEOFDAY],
-[
-  AC_REQUIRE([AC_C_RESTRICT])
-  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
-  AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([gettimeofday])
-
-  gl_gettimeofday_timezone=void
-  if test $ac_cv_func_gettimeofday != yes; then
-    HAVE_GETTIMEOFDAY=0
-  else
-    gl_FUNC_GETTIMEOFDAY_CLOBBER
-    AC_CACHE_CHECK([for gettimeofday with POSIX signature],
-      [gl_cv_func_gettimeofday_posix_signature],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <sys/time.h>
-              struct timeval c;
-              int gettimeofday (struct timeval *restrict, void *restrict);
-            ]],
-            [[/* glibc uses struct timezone * rather than the POSIX void *
-                 if _GNU_SOURCE is defined.  However, since the only portable
-                 use of gettimeofday uses NULL as the second parameter, and
-                 since the glibc definition is actually more typesafe, it is
-                 not worth wrapping this to get a compliant signature.  */
-              int (*f) (struct timeval *restrict, void *restrict)
-                = gettimeofday;
-              int x = f (&c, 0);
-              return !(x | c.tv_sec | c.tv_usec);
-            ]])],
-          [gl_cv_func_gettimeofday_posix_signature=yes],
-          [AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM(
-              [[#include <sys/time.h>
-int gettimeofday (struct timeval *restrict, struct timezone *restrict);
-              ]])],
-            [gl_cv_func_gettimeofday_posix_signature=almost],
-            [gl_cv_func_gettimeofday_posix_signature=no])])])
-    if test $gl_cv_func_gettimeofday_posix_signature = almost; then
-      gl_gettimeofday_timezone='struct timezone'
-    elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
-    dnl If we override 'struct timeval', we also have to override gettimeofday.
-    if test $REPLACE_STRUCT_TIMEVAL = 1; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
-    m4_ifdef([gl_FUNC_TZSET_CLOBBER], [
-      gl_FUNC_TZSET_CLOBBER
-      case "$gl_cv_func_tzset_clobber" in
-        *yes)
-          REPLACE_GETTIMEOFDAY=1
-          gl_GETTIMEOFDAY_REPLACE_LOCALTIME
-          AC_DEFINE([tzset], [rpl_tzset],
-            [Define to rpl_tzset if the wrapper function should be used.])
-          AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1],
-            [Define if tzset clobbers localtime's static buffer.])
-          ;;
-      esac
-    ])
-  fi
-  AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
-    [Define this to 'void' or 'struct timezone' to match the system's
-     declaration of the second argument to gettimeofday.])
-])
-
-
-dnl See if gettimeofday clobbers the static buffer that localtime uses
-dnl for its return value.  The gettimeofday function from Mac OS X 10.0.4
-dnl (i.e., Darwin 1.3.7) has this problem.
-dnl
-dnl If it does, then arrange to use gettimeofday and localtime only via
-dnl the wrapper functions that work around the problem.
-
-AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
-[
- AC_REQUIRE([gl_HEADER_SYS_TIME_H])
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer],
-  [gl_cv_func_gettimeofday_clobber],
-  [AC_RUN_IFELSE(
-     [AC_LANG_PROGRAM(
-        [[#include <string.h>
-          #include <sys/time.h>
-          #include <time.h>
-          #include <stdlib.h>
-        ]],
-        [[
-          time_t t = 0;
-          struct tm *lt;
-          struct tm saved_lt;
-          struct timeval tv;
-          lt = localtime (&t);
-          saved_lt = *lt;
-          gettimeofday (&tv, NULL);
-          return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
-        ]])],
-     [gl_cv_func_gettimeofday_clobber=no],
-     [gl_cv_func_gettimeofday_clobber=yes],
-     [# When cross-compiling:
-      case "$host_os" in
-                # Guess all is fine on glibc systems.
-        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                # If we don't know, assume the worst.
-        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-      esac
-     ])])
-
- case "$gl_cv_func_gettimeofday_clobber" in
-   *yes)
-     REPLACE_GETTIMEOFDAY=1
-     gl_GETTIMEOFDAY_REPLACE_LOCALTIME
-     AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1],
-       [Define if gettimeofday clobbers the localtime buffer.])
-     ;;
- esac
-])
-
-AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
-  REPLACE_GMTIME=1
-  REPLACE_LOCALTIME=1
-])
-
-# Prerequisites of lib/gettimeofday.c.
-AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [
-  AC_CHECK_HEADERS([sys/timeb.h])
-  AC_CHECK_FUNCS([_ftime])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/gnulib-cache.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/gnulib-cache.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/gnulib-cache.m4	2014-10-16 06:00:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/gnulib-cache.m4	2010-06-06 20:09:03.000000000 +0000
@@ -1,38 +1,25 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
-# In projects that use version control, this file is meant to be put under
-# version control, like the configure.ac and various Makefile.am files.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=gettext-runtime --local-dir=gnulib-local --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl ansi-c++-opt atexit basename closeout csharpcomp-script error getopt-gnu gettext-h gettext-runtime-misc havelib java javacomp-script memmove progname propername relocatable-prog setlocale sigpipe stdbool stdio stdlib strtoul unlocked-io xalloc
+#   gnulib-tool --import --dir=gettext-runtime --local-dir=gnulib-local --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --no-libtool --macro-prefix=gl atexit basename closeout csharpcomp-script error getopt-gnu gettext-h gettext-runtime-misc havelib java javacomp-script memmove progname propername relocatable-prog sigpipe stdbool stdio stdlib strtoul unlocked-io xalloc
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([../gnulib-local])
 gl_MODULES([
-  ansi-c++-opt
   atexit
   basename
   closeout
@@ -48,7 +35,6 @@
   progname
   propername
   relocatable-prog
-  setlocale
   sigpipe
   stdbool
   stdio
@@ -67,4 +53,3 @@
 gl_MAKEFILE_NAME([])
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_MACRO([])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/gnulib-common.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/gnulib-common.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/gnulib-common.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/gnulib-common.m4	2010-05-09 01:36:17.000000000 +0000
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 20
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,25 +12,11 @@
   AC_REQUIRE([gl_COMMON_BODY])
 ])
 AC_DEFUN([gl_COMMON_BODY], [
-  AH_VERBATIM([_Noreturn],
-[/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-])
   AH_VERBATIM([isoc99_inline],
 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE__ && __MACH__ test for MacOS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
@@ -48,30 +34,6 @@
 /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
-
-/* gcc supports the "unused" attribute on possibly unused labels, and
-   g++ has since version 4.5.  Note to support C++ as well as C,
-   _GL_UNUSED_LABEL should be used with a trailing ;  */
-#if !defined __cplusplus || __GNUC__ > 4 \
-    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-# define _GL_UNUSED_LABEL _GL_UNUSED
-#else
-# define _GL_UNUSED_LABEL
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
 ])
   dnl Preparation for running test programs:
   dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
@@ -85,49 +47,16 @@
 # expands to a C preprocessor expression that evaluates to 1 or 0, depending
 # whether a gnulib module that has been requested shall be considered present
 # or not.
-m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
 
 # gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
 # sets the shell variable that indicates the presence of the given module to
 # a C preprocessor expression that will evaluate to 1.
 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
 [
-  gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
-    [GNULIB_[]m4_translit([[$1]],
-                          [abcdefghijklmnopqrstuvwxyz./-],
-                          [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
-    [gl_MODULE_INDICATOR_CONDITION])
-])
-
-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
-# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
-# The shell variable's value is a C preprocessor expression that evaluates
-# to 0 or 1.
-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
-[
-  m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
-    [
-     dnl Simplify the expression VALUE || 1 to 1.
-     $1=1
-    ],
-    [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
-                                             [gl_MODULE_INDICATOR_CONDITION])])
-])
-
-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
-# modifies the shell variable to include the given condition.  The shell
-# variable's value is a C preprocessor expression that evaluates to 0 or 1.
-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
-[
-  dnl Simplify the expression 1 || CONDITION to 1.
-  if test "$[]$1" != 1; then
-    dnl Simplify the expression 0 || CONDITION to CONDITION.
-    if test "$[]$1" = 0; then
-      $1=$2
-    else
-      $1="($[]$1 || $2)"
-    fi
-  fi
+  GNULIB_[]m4_translit([[$1]],
+    [abcdefghijklmnopqrstuvwxyz./-],
+    [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
 ])
 
 # gl_MODULE_INDICATOR([modulename])
@@ -173,40 +102,6 @@
     [Define to 1 when the gnulib module $1 should be tested.])
 ])
 
-# gl_ASSERT_NO_GNULIB_POSIXCHECK
-# asserts that there will never be a need to #define GNULIB_POSIXCHECK.
-# and thereby enables an optimization of configure and config.h.
-# Used by Emacs.
-AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK],
-[
-  dnl Override gl_WARN_ON_USE_PREPARE.
-  dnl But hide this definition from 'aclocal'.
-  AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
-])
-
-# gl_ASSERT_NO_GNULIB_TESTS
-# asserts that there will be no gnulib tests in the scope of the configure.ac
-# and thereby enables an optimization of config.h.
-# Used by Emacs.
-AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS],
-[
-  dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
-  AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
-])
-
-# Test whether <features.h> exists.
-# Set HAVE_FEATURES_H.
-AC_DEFUN([gl_FEATURES_H],
-[
-  AC_CHECK_HEADERS_ONCE([features.h])
-  if test $ac_cv_header_features_h = yes; then
-    HAVE_FEATURES_H=1
-  else
-    HAVE_FEATURES_H=0
-  fi
-  AC_SUBST([HAVE_FEATURES_H])
-])
-
 # m4_foreach_w
 # is a backport of autoconf-2.59c's m4_foreach_w.
 # Remove this macro when we can assume autoconf >= 2.60.
@@ -222,90 +117,11 @@
 [m4_define([AS_VAR_IF],
 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
 
-# gl_PROG_CC_C99
-# Modifies the value of the shell variable CC in an attempt to make $CC
-# understand ISO C99 source code.
-# This is like AC_PROG_CC_C99, except that
-# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
-# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
-#   but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
-# Remaining problems:
-# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
-#   to CC twice
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
-# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
-AC_DEFUN([gl_PROG_CC_C99],
-[
-  dnl Change that version number to the minimum Autoconf version that supports
-  dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
-  m4_version_prereq([9.0],
-    [AC_REQUIRE([AC_PROG_CC_C99])],
-    [AC_REQUIRE([AC_PROG_CC_STDC])])
-])
-
-# gl_PROG_AR_RANLIB
-# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
-# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
-# the values.
-AC_DEFUN([gl_PROG_AR_RANLIB],
-[
-  dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
-  dnl as "cc", and GCC as "gcc". They have different object file formats and
-  dnl library formats. In particular, the GNU binutils programs ar, ranlib
-  dnl produce libraries that work only with gcc, not with cc.
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
-    [
-      AC_EGREP_CPP([Amsterdam],
-        [
-#ifdef __ACK__
-Amsterdam
-#endif
-        ],
-        [gl_cv_c_amsterdam_compiler=yes],
-        [gl_cv_c_amsterdam_compiler=no])
-    ])
-  if test -z "$AR"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      AR='cc -c.a'
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='-o'
-      fi
-    else
-      dnl Use the Automake-documented default values for AR and ARFLAGS,
-      dnl but prefer ${host}-ar over ar (useful for cross-compiling).
-      AC_CHECK_TOOL([AR], [ar], [ar])
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
-      fi
-    fi
-  else
-    if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
-    fi
-  fi
-  AC_SUBST([AR])
-  AC_SUBST([ARFLAGS])
-  if test -z "$RANLIB"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      RANLIB=':'
-    else
-      dnl Use the ranlib program if it is available.
-      AC_PROG_RANLIB
-    fi
-  fi
-  AC_SUBST([RANLIB])
-])
-
 # AC_PROG_MKDIR_P
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
 # for interoperability with automake-1.9.6 from autoconf-2.62.
 # Remove this macro when we can assume autoconf >= 2.62 or
 # autoconf >= 2.60 && automake >= 1.10.
-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
-m4_ifndef([AC_AUTOCONF_VERSION],[
 m4_ifdef([AC_PROG_MKDIR_P], [
   dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
   m4_define([AC_PROG_MKDIR_P],
@@ -316,31 +132,27 @@
     [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
      MKDIR_P='$(mkdir_p)'
      AC_SUBST([MKDIR_P])])])
-])
 
 # AC_C_RESTRICT
-# This definition is copied from post-2.69 Autoconf and overrides the
-# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
-# once autoconf >= 2.70 can be assumed.  It's painful to check version
-# numbers, and in practice this macro is more up-to-date than Autoconf
-# is, so override Autoconf unconditionally.
+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
+# works.
+# This definition can be removed once autoconf >= 2.62 can be assumed.
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
 AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-	 [[typedef int *int_ptr;
-	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
-	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
-	   int bar (int ip[$ac_kw]) { return ip[0]; }
-	 ]],
-	 [[int s[1];
-	   int *$ac_kw t = s;
-	   t[0] = 0;
-	   return foo (t) + bar (t);
-	 ]])],
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[typedef int * int_ptr;
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
+       }]],
+      [[int s[1];
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)]])],
       [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break
    done
@@ -350,21 +162,21 @@
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
-# define __restrict__
 #endif])
  case $ac_cv_c_restrict in
    restrict) ;;
    no) AC_DEFINE([restrict], []) ;;
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac
-])# AC_C_RESTRICT
+])
+])
 
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
@@ -387,63 +199,3 @@
   AC_CACHE_VAL([$1], [$2])
   as_echo_n="$saved_as_echo_n"
 ])
-
-# AS_VAR_COPY was added in autoconf 2.63b
-m4_define_default([AS_VAR_COPY],
-[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
-
-# AC_PROG_SED was added in autoconf 2.59b
-m4_ifndef([AC_PROG_SED],
-[AC_DEFUN([AC_PROG_SED],
-[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
-    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
-     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
-     ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     AS_UNSET([ac_script])
-     if test -z "$SED"; then
-       ac_path_SED_found=false
-       _AS_PATH_WALK([], [
-         for ac_prog in sed gsed; do
-           for ac_exec_ext in '' $ac_executable_extensions; do
-             ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-             AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
-             case `"$ac_path_SED" --version 2>&1` in
-               *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
-               *)
-                 ac_count=0
-                 _AS_ECHO_N([0123456789]) >conftest.in
-                 while :
-                 do
-                   cat conftest.in conftest.in >conftest.tmp
-                   mv conftest.tmp conftest.in
-                   cp conftest.in conftest.nl
-                   echo >> conftest.nl
-                   "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-                   diff conftest.out conftest.nl >/dev/null 2>&1 || break
-                   ac_count=`expr $ac_count + 1`
-                   if test $ac_count -gt ${ac_path_SED_max-0}; then
-                     # Best so far, but keep looking for better
-                     ac_cv_path_SED=$ac_path_SED
-                     ac_path_SED_max=$ac_count
-                   fi
-                   test $ac_count -gt 10 && break
-                 done
-                 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-             esac
-             $ac_path_SED_found && break 3
-           done
-         done])
-       if test -z "$ac_cv_path_SED"; then
-         AC_ERROR([no acceptable sed could be found in \$PATH])
-       fi
-     else
-       ac_cv_path_SED=$SED
-     fi
- SED="$ac_cv_path_SED"
- AC_SUBST([SED])dnl
- rm -f conftest.sed
-])])])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/gnulib-comp.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/gnulib-comp.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/gnulib-comp.m4	2014-10-16 06:00:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/gnulib-comp.m4	2010-06-03 21:35:23.000000000 +0000
@@ -1,22 +1,10 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -24,8 +12,7 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects that use version control, this file can be treated like
-# other built files.
+# In projects using CVS, this file can be treated like other built files.
 
 
 # This macro should be invoked from gettext-runtime/configure.ac, in the section
@@ -37,54 +24,43 @@
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([gl_PROG_AR_RANLIB])
+  AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
-  # Code from module absolute-header:
   # Code from module alloca-opt:
-  # Code from module allocator:
-  # Code from module ansi-c++-opt:
   # Code from module areadlink:
+  # Code from module arg-nonnull:
   # Code from module atexit:
   # Code from module basename:
+  # Code from module c++defs:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module canonicalize-lgpl:
-  # Code from module careadlinkat:
   # Code from module closeout:
   # Code from module configmake:
   # Code from module csharpcomp-script:
-  # Code from module dosname:
   # Code from module double-slash-root:
   # Code from module environ:
   # Code from module errno:
   # Code from module error:
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  # Code from module extern-inline:
   # Code from module fwriteerror:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
   # Code from module gettext-h:
   # Code from module gettext-runtime-misc:
-  # Code from module gettimeofday:
   # Code from module gperf:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
   # Code from module iconv_open:
   # Code from module include_next:
-  # Code from module inline:
   # Code from module intprops:
-  # Code from module iswblank:
   # Code from module java:
   # Code from module javacomp-script:
-  # Code from module largefile:
-  AC_REQUIRE([AC_SYS_LARGEFILE])
   # Code from module localcharset:
-  # Code from module locale:
-  # Code from module localename:
-  # Code from module lock:
   # Code from module lstat:
+  # Code from module malloc-posix:
   # Code from module malloca:
   # Code from module mbchar:
   # Code from module mbiter:
@@ -95,26 +71,16 @@
   # Code from module mbuiter:
   # Code from module memchr:
   # Code from module memmove:
-  # Code from module msvc-inval:
-  # Code from module msvc-nothrow:
   # Code from module multiarch:
-  # Code from module nocrash:
   # Code from module pathmax:
   # Code from module progname:
   # Code from module propername:
-  # Code from module raise:
   # Code from module readlink:
   # Code from module relocatable-prog:
   # Code from module relocatable-prog-wrapper:
-  # Code from module setlocale:
-  # Code from module signal-h:
+  # Code from module signal:
   # Code from module sigpipe:
   # Code from module sigprocmask:
-  # Code from module snippet/_Noreturn:
-  # Code from module snippet/arg-nonnull:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/unused-parameter:
-  # Code from module snippet/warn-on-use:
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stdbool:
@@ -124,30 +90,24 @@
   # Code from module stdlib:
   # Code from module streq:
   # Code from module strerror:
-  # Code from module strerror-override:
   # Code from module striconv:
   # Code from module string:
   # Code from module strnlen:
   # Code from module strnlen1:
+  # Code from module strtol:
   # Code from module strtoul:
   # Code from module sys_stat:
-  # Code from module sys_time:
-  # Code from module sys_types:
-  # Code from module threadlib:
-  gl_THREADLIB_EARLY
   # Code from module time:
   # Code from module trim:
   # Code from module unistd:
-  # Code from module unistr/base:
-  # Code from module unistr/u8-mbtoucr:
-  # Code from module unistr/u8-uctomb:
   # Code from module unitypes:
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
   # Code from module unlocked-io:
   # Code from module verify:
+  # Code from module warn-on-use:
   # Code from module wchar:
-  # Code from module wctype-h:
+  # Code from module wctype:
   # Code from module wcwidth:
   # Code from module xalloc:
   # Code from module xreadlink:
@@ -170,178 +130,125 @@
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='gnulib-lib'
+  # Code from module alloca-opt:
   gl_FUNC_ALLOCA
-  gl_PROG_ANSI_CXX([CXX], [ANSICXX])
+  # Code from module areadlink:
+  # Code from module arg-nonnull:
+  # Code from module atexit:
   gl_FUNC_ATEXIT
-  if test $ac_cv_func_atexit = no; then
-    AC_LIBOBJ([atexit])
-    gl_PREREQ_ATEXIT
-  fi
+  # Code from module basename:
+  # Code from module c++defs:
+  # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module canonicalize-lgpl:
   gl_CANONICALIZE_LGPL
-  if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
-    AC_LIBOBJ([canonicalize-lgpl])
-  fi
   gl_MODULE_INDICATOR([canonicalize-lgpl])
   gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
   gl_STDLIB_MODULE_INDICATOR([realpath])
-  AC_CHECK_FUNCS_ONCE([readlinkat])
-  gl_CONFIGMAKE_PREP
+  # Code from module closeout:
+  # Code from module configmake:
+  # Code from module csharpcomp-script:
   AC_REQUIRE([gt_CSHARPCOMP])
   AC_CONFIG_FILES([csharpcomp.sh:../build-aux/csharpcomp.sh.in])
+  # Code from module double-slash-root:
   gl_DOUBLE_SLASH_ROOT
+  # Code from module environ:
   gl_ENVIRON
   gl_UNISTD_MODULE_INDICATOR([environ])
+  # Code from module errno:
   gl_HEADER_ERRNO_H
+  # Code from module error:
   gl_ERROR
-  if test $ac_cv_lib_error_at_line = no; then
-    AC_LIBOBJ([error])
-    gl_PREREQ_ERROR
-  fi
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
-  AC_REQUIRE([gl_EXTERN_INLINE])
+  # Code from module extensions:
+  # Code from module fwriteerror:
   gl_MODULE_INDICATOR([fwriteerror])
+  # Code from module getopt-gnu:
   gl_FUNC_GETOPT_GNU
-  if test $REPLACE_GETOPT = 1; then
-    AC_LIBOBJ([getopt])
-    AC_LIBOBJ([getopt1])
-    gl_PREREQ_GETOPT
-    dnl Arrange for unistd.h to include getopt.h.
-    GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
-  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
   gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
+  # Code from module getopt-posix:
   gl_FUNC_GETOPT_POSIX
-  if test $REPLACE_GETOPT = 1; then
-    AC_LIBOBJ([getopt])
-    AC_LIBOBJ([getopt1])
-    gl_PREREQ_GETOPT
-    dnl Arrange for unistd.h to include getopt.h.
-    GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
-  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
+  # Code from module gettext-h:
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
-  gl_FUNC_GETTIMEOFDAY
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
-    AC_LIBOBJ([gettimeofday])
-    gl_PREREQ_GETTIMEOFDAY
-  fi
-  gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  # Code from module gettext-runtime-misc:
+  # Code from module gperf:
+  # Code from module havelib:
+  # Code from module iconv:
   AM_ICONV
-  m4_ifdef([gl_ICONV_MODULE_INDICATOR],
-    [gl_ICONV_MODULE_INDICATOR([iconv])])
+  # Code from module iconv-h:
   gl_ICONV_H
+  # Code from module iconv_open:
   gl_FUNC_ICONV_OPEN
-  if test $REPLACE_ICONV_OPEN = 1; then
-    AC_LIBOBJ([iconv_open])
-  fi
-  if test $REPLACE_ICONV = 1; then
-    AC_LIBOBJ([iconv])
-    AC_LIBOBJ([iconv_close])
-  fi
-  gl_INLINE
-  gl_FUNC_ISWBLANK
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-      AC_LIBOBJ([iswblank])
-    fi
-  fi
-  gl_WCTYPE_MODULE_INDICATOR([iswblank])
+  # Code from module include_next:
+  # Code from module intprops:
+  # Code from module java:
   gt_JAVA_CHOICE
+  # Code from module javacomp-script:
   # You need to invoke gt_JAVACOMP yourself, possibly with arguments.
   AC_CONFIG_FILES([javacomp.sh:../build-aux/javacomp.sh.in])
-  AC_REQUIRE([gl_LARGEFILE])
+  # Code from module localcharset:
   gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-  gl_LOCALE_H
-  gl_LOCALENAME
-  gl_LOCK
-  gl_MODULE_INDICATOR([lock])
+  # Code from module lstat:
   gl_FUNC_LSTAT
-  if test $REPLACE_LSTAT = 1; then
-    AC_LIBOBJ([lstat])
-    gl_PREREQ_LSTAT
-  fi
   gl_SYS_STAT_MODULE_INDICATOR([lstat])
+  # Code from module malloc-posix:
+  gl_FUNC_MALLOC_POSIX
+  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+  # Code from module malloca:
   gl_MALLOCA
+  # Code from module mbchar:
   gl_MBCHAR
+  # Code from module mbiter:
   gl_MBITER
+  # Code from module mbrtowc:
   gl_FUNC_MBRTOWC
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-    AC_LIBOBJ([mbrtowc])
-    gl_PREREQ_MBRTOWC
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
+  # Code from module mbsinit:
   gl_FUNC_MBSINIT
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-    AC_LIBOBJ([mbsinit])
-    gl_PREREQ_MBSINIT
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
+  # Code from module mbslen:
   gl_FUNC_MBSLEN
   gl_STRING_MODULE_INDICATOR([mbslen])
+  # Code from module mbsstr:
   gl_STRING_MODULE_INDICATOR([mbsstr])
+  # Code from module mbuiter:
   gl_MBITER
+  # Code from module memchr:
   gl_FUNC_MEMCHR
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-    AC_LIBOBJ([memchr])
-    gl_PREREQ_MEMCHR
-  fi
   gl_STRING_MODULE_INDICATOR([memchr])
+  # Code from module memmove:
   gl_FUNC_MEMMOVE
-  if test $ac_cv_func_memmove = no; then
-    AC_LIBOBJ([memmove])
-    gl_PREREQ_MEMMOVE
-  fi
-  gl_MSVC_INVAL
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-inval])
-  fi
-  gl_MSVC_NOTHROW
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-nothrow])
-  fi
+  # Code from module multiarch:
   gl_MULTIARCH
+  # Code from module pathmax:
   gl_PATHMAX
+  # Code from module progname:
   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+  # Code from module propername:
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'])
      AM_][XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])])
-  gl_FUNC_RAISE
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
-    AC_LIBOBJ([raise])
-    gl_PREREQ_RAISE
-  fi
-  gl_SIGNAL_MODULE_INDICATOR([raise])
+  # Code from module readlink:
   gl_FUNC_READLINK
-  if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
-    AC_LIBOBJ([readlink])
-    gl_PREREQ_READLINK
-  fi
   gl_UNISTD_MODULE_INDICATOR([readlink])
+  # Code from module relocatable-prog:
   gl_RELOCATABLE([$gl_source_base])
-  if test $RELOCATABLE = yes; then
-    AC_LIBOBJ([progreloc])
-    AC_LIBOBJ([relocatable])
-  fi
+  # Code from module relocatable-prog-wrapper:
   gl_FUNC_READLINK_SEPARATE
   gl_CANONICALIZE_LGPL_SEPARATE
   gl_MALLOCA
-  gl_RELOCATABLE_LIBRARY
+  gl_RELOCATABLE_LIBRARY_SEPARATE
   gl_FUNC_SETENV_SEPARATE
-  gl_FUNC_SETLOCALE
-  if test $REPLACE_SETLOCALE = 1; then
-    AC_LIBOBJ([setlocale])
-    gl_PREREQ_SETLOCALE
-  fi
-  gl_LOCALE_MODULE_INDICATOR([setlocale])
+  gl_FUNC_STRERROR_SEPARATE
+  # Code from module signal:
   gl_SIGNAL_H
+  # Code from module sigpipe:
   gl_SIGNAL_SIGPIPE
   dnl Define the C macro GNULIB_SIGPIPE to 1.
   gl_MODULE_INDICATOR([sigpipe])
@@ -350,81 +257,75 @@
   GNULIB_SIGNAL_H_SIGPIPE=1
   dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1.
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
   GNULIB_STDIO_H_SIGPIPE=1
   dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   GNULIB_UNISTD_H_SIGPIPE=1
+  # Code from module sigprocmask:
   gl_SIGNALBLOCKING
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-    AC_LIBOBJ([sigprocmask])
-    gl_PREREQ_SIGPROCMASK
-  fi
   gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
+  # Code from module ssize_t:
   gt_TYPE_SSIZE_T
+  # Code from module stat:
   gl_FUNC_STAT
-  if test $REPLACE_STAT = 1; then
-    AC_LIBOBJ([stat])
-    gl_PREREQ_STAT
-  fi
   gl_SYS_STAT_MODULE_INDICATOR([stat])
+  # Code from module stdbool:
   AM_STDBOOL_H
+  # Code from module stddef:
   gl_STDDEF_H
+  # Code from module stdint:
   gl_STDINT_H
+  # Code from module stdio:
   gl_STDIO_H
+  # Code from module stdlib:
   gl_STDLIB_H
+  # Code from module streq:
+  # Code from module strerror:
   gl_FUNC_STRERROR
-  if test $REPLACE_STRERROR = 1; then
-    AC_LIBOBJ([strerror])
-  fi
-  gl_MODULE_INDICATOR([strerror])
   gl_STRING_MODULE_INDICATOR([strerror])
-  AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
-    AC_LIBOBJ([strerror-override])
-    gl_PREREQ_SYS_H_WINSOCK2
-  fi
+  # Code from module striconv:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module string:
   gl_HEADER_STRING_H
+  # Code from module strnlen:
   gl_FUNC_STRNLEN
-  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
-    AC_LIBOBJ([strnlen])
-    gl_PREREQ_STRNLEN
-  fi
   gl_STRING_MODULE_INDICATOR([strnlen])
+  # Code from module strnlen1:
+  # Code from module strtol:
+  gl_FUNC_STRTOL
+  # Code from module strtoul:
   gl_FUNC_STRTOUL
-  if test $ac_cv_func_strtoul = no; then
-    AC_LIBOBJ([strtoul])
-  fi
+  # Code from module sys_stat:
   gl_HEADER_SYS_STAT_H
   AC_PROG_MKDIR_P
-  gl_HEADER_SYS_TIME_H
-  AC_PROG_MKDIR_P
-  gl_SYS_TYPES_H
-  AC_PROG_MKDIR_P
-  gl_THREADLIB
+  # Code from module time:
   gl_HEADER_TIME_H
+  # Code from module trim:
+  # Code from module unistd:
   gl_UNISTD_H
-  gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
-  gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
-  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
-  gl_MODULE_INDICATOR([unistr/u8-uctomb])
-  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
+  # Code from module unitypes:
   gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+  # Code from module uniwidth/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
-  gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width])
+  # Code from module uniwidth/width:
+  gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width])
+  # Code from module unlocked-io:
   gl_FUNC_GLIBC_UNLOCKED_IO
+  # Code from module verify:
+  # Code from module warn-on-use:
+  # Code from module wchar:
   gl_WCHAR_H
+  # Code from module wctype:
   gl_WCTYPE_H
+  # Code from module wcwidth:
   gl_FUNC_WCWIDTH
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
-    AC_LIBOBJ([wcwidth])
-  fi
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
+  # Code from module xalloc:
+  # Code from module xreadlink:
+  # Code from module xstriconv:
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -565,21 +466,17 @@
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
+  build-aux/arg-nonnull.h
+  build-aux/c++defs.h
   build-aux/config.libpath
   build-aux/config.rpath
   build-aux/csharpcomp.sh.in
   build-aux/install-reloc
   build-aux/javacomp.sh.in
   build-aux/reloc-ldflags
-  build-aux/snippet/_Noreturn.h
-  build-aux/snippet/arg-nonnull.h
-  build-aux/snippet/c++defs.h
-  build-aux/snippet/unused-parameter.h
-  build-aux/snippet/warn-on-use.h
+  build-aux/warn-on-use.h
   doc/relocatable.texi
   lib/alloca.in.h
-  lib/allocator.c
-  lib/allocator.h
   lib/areadlink.c
   lib/areadlink.h
   lib/atexit.c
@@ -591,12 +488,9 @@
   lib/c-strcasecmp.c
   lib/c-strncasecmp.c
   lib/canonicalize-lgpl.c
-  lib/careadlinkat.c
-  lib/careadlinkat.h
   lib/closeout.c
   lib/closeout.h
   lib/config.charset
-  lib/dosname.h
   lib/errno.in.h
   lib/error.c
   lib/error.h
@@ -607,13 +501,7 @@
   lib/getopt1.c
   lib/getopt_int.h
   lib/gettext.h
-  lib/gettimeofday.c
-  lib/glthread/lock.c
-  lib/glthread/lock.h
-  lib/glthread/threadlib.c
-  lib/iconv.c
   lib/iconv.in.h
-  lib/iconv_close.c
   lib/iconv_open-aix.gperf
   lib/iconv_open-hpux.gperf
   lib/iconv_open-irix.gperf
@@ -621,40 +509,30 @@
   lib/iconv_open-solaris.gperf
   lib/iconv_open.c
   lib/intprops.h
-  lib/iswblank.c
   lib/localcharset.c
   lib/localcharset.h
-  lib/locale.in.h
-  lib/localename.c
-  lib/localename.h
   lib/lstat.c
+  lib/malloc.c
   lib/malloca.c
   lib/malloca.h
   lib/malloca.valgrind
   lib/mbchar.c
   lib/mbchar.h
-  lib/mbiter.c
   lib/mbiter.h
   lib/mbrtowc.c
   lib/mbsinit.c
   lib/mbslen.c
   lib/mbsstr.c
-  lib/mbuiter.c
   lib/mbuiter.h
   lib/memchr.c
   lib/memchr.valgrind
   lib/memmove.c
-  lib/msvc-inval.c
-  lib/msvc-inval.h
-  lib/msvc-nothrow.c
-  lib/msvc-nothrow.h
   lib/pathmax.h
   lib/progname.c
   lib/progname.h
   lib/progreloc.c
   lib/propername.c
   lib/propername.h
-  lib/raise.c
   lib/readlink.c
   lib/ref-add.sin
   lib/ref-del.sin
@@ -662,7 +540,6 @@
   lib/relocatable.h
   lib/relocwrapper.c
   lib/setenv.c
-  lib/setlocale.c
   lib/signal.in.h
   lib/sigprocmask.c
   lib/stat.c
@@ -674,8 +551,6 @@
   lib/stdlib.in.h
   lib/str-kmp.h
   lib/streq.h
-  lib/strerror-override.c
-  lib/strerror-override.h
   lib/strerror.c
   lib/striconv.c
   lib/striconv.h
@@ -686,17 +561,10 @@
   lib/strtol.c
   lib/strtoul.c
   lib/sys_stat.in.h
-  lib/sys_time.in.h
-  lib/sys_types.in.h
   lib/time.in.h
   lib/trim.c
   lib/trim.h
-  lib/unistd.c
   lib/unistd.in.h
-  lib/unistr.in.h
-  lib/unistr/u8-mbtoucr.c
-  lib/unistr/u8-uctomb-aux.c
-  lib/unistr/u8-uctomb.c
   lib/unitypes.in.h
   lib/uniwidth.in.h
   lib/uniwidth/cjk.h
@@ -704,7 +572,6 @@
   lib/unlocked-io.h
   lib/verify.h
   lib/wchar.in.h
-  lib/wctype-h.c
   lib/wctype.in.h
   lib/wcwidth.c
   lib/xalloc.h
@@ -715,39 +582,30 @@
   lib/xstriconv.c
   lib/xstriconv.h
   m4/00gnulib.m4
-  m4/absolute-header.m4
   m4/alloca.m4
-  m4/ansi-c++.m4
   m4/asm-underscore.m4
   m4/atexit.m4
   m4/canonicalize.m4
   m4/codeset.m4
-  m4/configmake.m4
   m4/csharp.m4
   m4/csharpcomp.m4
+  m4/dos.m4
   m4/double-slash-root.m4
   m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
   m4/error.m4
   m4/extensions.m4
-  m4/extern-inline.m4
   m4/fcntl-o.m4
   m4/getopt.m4
-  m4/gettimeofday.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
   m4/include_next.m4
-  m4/inline.m4
-  m4/intlmacosx.m4
-  m4/iswblank.m4
   m4/java.m4
   m4/javacomp.m4
-  m4/largefile.m4
-  m4/lcmessage.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
@@ -756,11 +614,9 @@
   m4/locale-fr.m4
   m4/locale-ja.m4
   m4/locale-zh.m4
-  m4/locale_h.m4
-  m4/localename.m4
-  m4/lock.m4
   m4/longlong.m4
   m4/lstat.m4
+  m4/malloc.m4
   m4/malloca.m4
   m4/mbchar.m4
   m4/mbiter.m4
@@ -771,18 +627,13 @@
   m4/memchr.m4
   m4/memmove.m4
   m4/mmap-anon.m4
-  m4/msvc-inval.m4
-  m4/msvc-nothrow.m4
   m4/multiarch.m4
-  m4/nocrash.m4
-  m4/off_t.m4
+  m4/onceonly.m4
   m4/pathmax.m4
-  m4/raise.m4
   m4/readlink.m4
   m4/relocatable-lib.m4
   m4/relocatable.m4
   m4/setenv.m4
-  m4/setlocale.m4
   m4/signal_h.m4
   m4/signalblocking.m4
   m4/sigpipe.m4
@@ -796,12 +647,9 @@
   m4/strerror.m4
   m4/string_h.m4
   m4/strnlen.m4
+  m4/strtol.m4
   m4/strtoul.m4
-  m4/sys_socket_h.m4
   m4/sys_stat_h.m4
-  m4/sys_time_h.m4
-  m4/sys_types_h.m4
-  m4/threadlib.m4
   m4/time_h.m4
   m4/unistd_h.m4
   m4/unlocked-io.m4
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/iconv_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/iconv_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/iconv_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/iconv_h.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
-# iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# iconv_h.m4 serial 6
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,6 @@
 [
   AC_REQUIRE([gl_ICONV_H_DEFAULTS])
   ICONV_H='iconv.h'
-  AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"])
 ])
 
 AC_DEFUN([gl_ICONV_MODULE_INDICATOR],
@@ -30,12 +29,9 @@
 
 AC_DEFUN([gl_ICONV_H_DEFAULTS],
 [
-  GNULIB_ICONV=0;       AC_SUBST([GNULIB_ICONV])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  ICONV_CONST=;         AC_SUBST([ICONV_CONST])
   REPLACE_ICONV=0;      AC_SUBST([REPLACE_ICONV])
   REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN])
   REPLACE_ICONV_UTF=0;  AC_SUBST([REPLACE_ICONV_UTF])
   ICONV_H='';           AC_SUBST([ICONV_H])
-  AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/iconv_open.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/iconv_open.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/iconv_open.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/iconv_open.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
-# iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# iconv_open.m4 serial 7
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@
     dnl We know that GNU libiconv and GNU libc do.
     AC_EGREP_CPP([gnu_iconv], [
       #include <iconv.h>
-      #if defined _LIBICONV_VERSION || (defined __GLIBC__ && !defined __UCLIBC__)
+      #if defined _LIBICONV_VERSION || defined __GLIBC__
        gnu_iconv
       #endif
       ], [gl_func_iconv_gnu=yes], [gl_func_iconv_gnu=no])
@@ -36,16 +36,6 @@
         gl_REPLACE_ICONV_OPEN
       fi
     fi
-    m4_ifdef([gl_FUNC_ICONV_OPEN_UTF_SUPPORT], [
-      gl_FUNC_ICONV_OPEN_UTF_SUPPORT
-      if test $gl_cv_func_iconv_supports_utf = no; then
-        REPLACE_ICONV_UTF=1
-        AC_DEFINE([REPLACE_ICONV_UTF], [1],
-          [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])
-        REPLACE_ICONV=1
-        gl_REPLACE_ICONV_OPEN
-      fi
-    ])
   fi
 ])
 
@@ -53,4 +43,198 @@
 [
   gl_REPLACE_ICONV_H
   REPLACE_ICONV_OPEN=1
+  AC_LIBOBJ([iconv_open])
+])
+
+AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF],
+[
+  AC_REQUIRE([gl_FUNC_ICONV_OPEN])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+  if test "$am_cv_func_iconv" = yes; then
+    if test -n "$am_cv_proto_iconv_arg1"; then
+      ICONV_CONST="const"
+    else
+      ICONV_CONST=
+    fi
+    AC_SUBST([ICONV_CONST])
+    AC_CACHE_CHECK([whether iconv supports conversion between UTF-8 and UTF-{16,32}{BE,LE}],
+      [gl_cv_func_iconv_supports_utf],
+      [
+        save_LIBS="$LIBS"
+        LIBS="$LIBS $LIBICONV"
+        AC_TRY_RUN([
+#include <iconv.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define ASSERT(expr) if (!(expr)) return 1;
+int main ()
+{
+  /* Test conversion from UTF-8 to UTF-16BE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "\000J\000a\000p\000a\000n\000e\000s\000e\000 \000(\145\345\147\054\212\236\000)\000 \000[\330\065\335\015\330\065\335\036\330\065\335\055\000]";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-16BE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-8 to UTF-16LE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "J\000a\000p\000a\000n\000e\000s\000e\000 \000(\000\345\145\054\147\236\212)\000 \000[\000\065\330\015\335\065\330\036\335\065\330\055\335]\000";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-16LE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-8 to UTF-32BE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "\000\000\000J\000\000\000a\000\000\000p\000\000\000a\000\000\000n\000\000\000e\000\000\000s\000\000\000e\000\000\000 \000\000\000(\000\000\145\345\000\000\147\054\000\000\212\236\000\000\000)\000\000\000 \000\000\000[\000\001\325\015\000\001\325\036\000\001\325\055\000\000\000]";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-32BE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-8 to UTF-32LE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "J\000\000\000a\000\000\000p\000\000\000a\000\000\000n\000\000\000e\000\000\000s\000\000\000e\000\000\000 \000\000\000(\000\000\000\345\145\000\000\054\147\000\000\236\212\000\000)\000\000\000 \000\000\000[\000\000\000\015\325\001\000\036\325\001\000\055\325\001\000]\000\000\000";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-32LE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-16BE to UTF-8 with no errors.
+     This test fails on NetBSD 3.0.  */
+  {
+    static const char input[] =
+      "\000J\000a\000p\000a\000n\000e\000s\000e\000 \000(\145\345\147\054\212\236\000)\000 \000[\330\065\335\015\330\065\335\036\330\065\335\055\000]";
+    static const char expected[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-8", "UTF-16BE");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  return 0;
+}], [gl_cv_func_iconv_supports_utf=yes], [gl_cv_func_iconv_supports_utf=no],
+          [
+           dnl We know that GNU libiconv, GNU libc, and Solaris >= 9 do.
+           dnl OSF/1 5.1 has these encodings, but inserts a BOM in the "to"
+           dnl direction.
+           gl_cv_func_iconv_supports_utf=no
+           if test $gl_func_iconv_gnu = yes; then
+             gl_cv_func_iconv_supports_utf=yes
+           else
+changequote(,)dnl
+             case "$host_os" in
+               solaris2.9 | solaris2.1[0-9]) gl_cv_func_iconv_supports_utf=yes ;;
+             esac
+changequote([,])dnl
+           fi
+          ])
+        LIBS="$save_LIBS"
+      ])
+    if test $gl_cv_func_iconv_supports_utf = no; then
+      REPLACE_ICONV_UTF=1
+      AC_DEFINE([REPLACE_ICONV_UTF], [1],
+        [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])
+      REPLACE_ICONV=1
+      gl_REPLACE_ICONV_OPEN
+      AC_LIBOBJ([iconv])
+      AC_LIBOBJ([iconv_close])
+    fi
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/include_next.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/include_next.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/include_next.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/include_next.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# include_next.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# include_next.m4 serial 14
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -24,13 +24,6 @@
 dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
 dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
 dnl of plain '__STDC__'.
-dnl
-dnl PRAGMA_COLUMNS can be used in files that override system header files, so
-dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
-dnl is included by a system header file that does a "#pragma COLUMNS 80" (which
-dnl has the effect of truncating the lines of that file and all files that it
-dnl includes to 80 columns) and the gnulib file has lines longer than 80
-dnl columns.
 
 AC_DEFUN([gl_INCLUDE_NEXT],
 [
@@ -75,11 +68,10 @@
 EOF
      gl_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-dnl We intentionally avoid using AC_LANG_SOURCE here.
-     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+     AC_COMPILE_IFELSE([#include <conftest.h>],
        [gl_cv_have_include_next=yes],
        [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+        AC_COMPILE_IFELSE([#include <conftest.h>],
           [gl_cv_have_include_next=buggy],
           [gl_cv_have_include_next=no])
        ])
@@ -105,24 +97,6 @@
   AC_SUBST([INCLUDE_NEXT])
   AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
   AC_SUBST([PRAGMA_SYSTEM_HEADER])
-  AC_CACHE_CHECK([whether system header files limit the line length],
-    [gl_cv_pragma_columns],
-    [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
-     AC_EGREP_CPP([choke me],
-       [
-#ifdef __TANDEM
-choke me
-#endif
-       ],
-       [gl_cv_pragma_columns=yes],
-       [gl_cv_pragma_columns=no])
-    ])
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
-  AC_SUBST([PRAGMA_COLUMNS])
 ])
 
 # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
@@ -143,81 +117,71 @@
 # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
 # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.
-#
-# This macro also checks whether each header exists, by invoking
-# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument.
 AC_DEFUN([gl_CHECK_NEXT_HEADERS],
 [
-  gl_NEXT_HEADERS_INTERNAL([$1], [check])
-])
-
-# gl_NEXT_HEADERS(HEADER1 HEADER2 ...)
-# ------------------------------------
-# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist.
-# This is suitable for headers like <stddef.h> that are standardized by C89
-# and therefore can be assumed to exist.
-AC_DEFUN([gl_NEXT_HEADERS],
-[
-  gl_NEXT_HEADERS_INTERNAL([$1], [assume])
-])
-
-# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS.
-AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
-[
   AC_REQUIRE([gl_INCLUDE_NEXT])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_HEADERS_ONCE([$1])
 
-  m4_if([$2], [check],
-    [AC_CHECK_HEADERS_ONCE([$1])
-    ])
-
-dnl FIXME: gl_next_header and gl_header_exists must be used unquoted
-dnl until we can assume autoconf 2.64 or newer.
   m4_foreach_w([gl_HEADER_NAME], [$1],
     [AS_VAR_PUSHDEF([gl_next_header],
                     [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
      if test $gl_cv_have_include_next = yes; then
-       AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
      else
        AC_CACHE_CHECK(
          [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
          m4_defn([gl_next_header]),
-         [m4_if([$2], [check],
-            [AS_VAR_PUSHDEF([gl_header_exists],
-                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
-             if test AS_VAR_GET(gl_header_exists) = yes; then
-             AS_VAR_POPDEF([gl_header_exists])
-            ])
-           gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
-           AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
-           AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
-          m4_if([$2], [check],
-            [else
-               AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
-             fi
-            ])
-         ])
+         [AS_VAR_PUSHDEF([gl_header_exists],
+                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+          if test AS_VAR_GET(gl_header_exists) = yes; then
+            AC_LANG_CONFTEST(
+              [AC_LANG_SOURCE(
+                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
+               )])
+            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+            dnl that contain only a #include of other header files and no
+            dnl non-comment tokens of their own. This leads to a failure to
+            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+            dnl and others. The workaround is to force preservation of comments
+            dnl through option -C. This ensures all necessary #line directives
+            dnl are present. GCC supports option -C as well.
+            case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+            dnl eval is necessary to expand gl_absname_cpp.
+            dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+            dnl so use subshell.
+            AS_VAR_SET([gl_next_header],
+              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
+                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'])
+          else
+            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+          fi
+          AS_VAR_POPDEF([gl_header_exists])])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
-       [AS_VAR_GET(gl_next_header)])
+       [AS_VAR_GET([gl_next_header])])
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
        gl_next_as_first_directive='<'gl_HEADER_NAME'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=AS_VAR_GET(gl_next_header)
+       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
        [$gl_next_as_first_directive])
      AS_VAR_POPDEF([gl_next_header])])
 ])
-
-# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
-# this fallback is safe for all earlier autoconf versions.
-m4_define_default([AC_LANG_DEFINES_PROVIDED])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/inline.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/inline.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/inline.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/inline.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 Test for the 'inline' keyword or equivalent.
-dnl Define 'inline' to a supported equivalent, or to nothing if not supported,
-dnl like AC_C_INLINE does.  Also, define HAVE_INLINE if 'inline' or an
-dnl equivalent is effectively supported, i.e. if the compiler is likely to
-dnl drop unused 'static inline' functions.
-AC_DEFUN([gl_INLINE],
-[
-  AC_REQUIRE([AC_C_INLINE])
-  AC_CACHE_CHECK([whether the compiler generally respects inline],
-    [gl_cv_c_inline_effective],
-    [if test $ac_cv_c_inline = no; then
-       gl_cv_c_inline_effective=no
-     else
-       dnl GCC defines __NO_INLINE__ if not optimizing or if -fno-inline is
-       dnl specified.
-       dnl Use AC_COMPILE_IFELSE here, not AC_EGREP_CPP, because the result
-       dnl depends on optimization flags, which can be in CFLAGS.
-       dnl (AC_EGREP_CPP looks only at the CPPFLAGS.)
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([[]],
-           [[#ifdef __NO_INLINE__
-               #error "inline is not effective"
-             #endif]])],
-         [gl_cv_c_inline_effective=yes],
-         [gl_cv_c_inline_effective=no])
-     fi
-    ])
-  if test $gl_cv_c_inline_effective = yes; then
-    AC_DEFINE([HAVE_INLINE], [1],
-      [Define to 1 if the compiler supports one of the keywords
-       'inline', '__inline__', '__inline' and effectively inlines
-       functions marked as such.])
-  fi
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/iswblank.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/iswblank.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/iswblank.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/iswblank.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# iswblank.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_ISWBLANK],
-[
-  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
-  AC_REQUIRE([gl_WCTYPE_H])
-  dnl Persuade glibc <wctype.h> to declare iswblank().
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_FUNCS_ONCE([iswblank])
-  AC_CHECK_DECLS([iswblank], , , [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
-]])
-  if test $ac_cv_func_iswblank = no; then
-    HAVE_ISWBLANK=0
-    if test $ac_cv_have_decl_iswblank = yes; then
-      REPLACE_ISWBLANK=1
-    fi
-  fi
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    dnl Redefine all of iswcntrl, ..., towupper in <wctype.h>.
-    :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-      dnl Redefine only iswblank.
-      :
-    fi
-  fi
-
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/javacomp.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/javacomp.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/javacomp.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/javacomp.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # javacomp.m4 serial 12
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/largefile.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/largefile.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/largefile.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/largefile.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-# Enable large files on systems where this is not the default.
-
-# Copyright 1992-1996, 1998-2014 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.
-
-# The following implementation works around a problem in autoconf <= 2.69;
-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
-# or configures them incorrectly in some cases.
-m4_version_prereq([2.70], [] ,[
-
-# _AC_SYS_LARGEFILE_TEST_INCLUDES
-# -------------------------------
-m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
-[@%:@include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1]];[]dnl
-])
-
-
-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
-#                               CACHE-VAR,
-#                               DESCRIPTION,
-#                               PROLOGUE, [FUNCTION-BODY])
-# --------------------------------------------------------
-m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
-[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
-[while :; do
-  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
-    [AC_LANG_PROGRAM([$5], [$6])],
-    [$3=no; break])
-  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
-    [AC_LANG_PROGRAM([@%:@define $1 $2
-$5], [$6])],
-    [$3=$2; break])
-  $3=unknown
-  break
-done])
-case $$3 in #(
-  no | unknown) ;;
-  *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
-esac
-rm -rf conftest*[]dnl
-])# _AC_SYS_LARGEFILE_MACRO_VALUE
-
-
-# AC_SYS_LARGEFILE
-# ----------------
-# By default, many hosts won't let programs access large files;
-# one must use special compiler options to get large-file access to work.
-# For more details about this brain damage please see:
-# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html
-AC_DEFUN([AC_SYS_LARGEFILE],
-[AC_ARG_ENABLE(largefile,
-               [  --disable-largefile     omit support for large files])
-if test "$enable_largefile" != no; then
-
-  AC_CACHE_CHECK([for special C compiler options needed for large files],
-    ac_cv_sys_largefile_CC,
-    [ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
-         AC_COMPILE_IFELSE([], [break])
-         CC="$CC -n32"
-         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi])
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-    ac_cv_sys_file_offset_bits,
-    [Number of bits in a file offset, on hosts where this is settable.],
-    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
-      ac_cv_sys_large_files,
-      [Define for large files, on AIX-style hosts.],
-      [_AC_SYS_LARGEFILE_TEST_INCLUDES])
-  fi
-
-  AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1],
-    [Enable large inode numbers on Mac OS X 10.5.])
-fi
-])# AC_SYS_LARGEFILE
-])# m4_version_prereq 2.70
-
-# Enable large files on systems where this is implemented by Gnulib, not by the
-# system headers.
-# Set the variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE if Gnulib
-# overrides ensure that off_t or 'struct size.st_size' are 64-bit, respectively.
-AC_DEFUN([gl_LARGEFILE],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      dnl Native Windows.
-      dnl mingw64 defines off_t to a 64-bit type already, if
-      dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
-      AC_CACHE_CHECK([for 64-bit off_t], [gl_cv_type_off_t_64],
-        [AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <sys/types.h>
-                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
-              ]],
-              [[]])],
-           [gl_cv_type_off_t_64=yes], [gl_cv_type_off_t_64=no])
-        ])
-      if test $gl_cv_type_off_t_64 = no; then
-        WINDOWS_64_BIT_OFF_T=1
-      else
-        WINDOWS_64_BIT_OFF_T=0
-      fi
-      dnl But all native Windows platforms (including mingw64) have a 32-bit
-      dnl st_size member in 'struct stat'.
-      WINDOWS_64_BIT_ST_SIZE=1
-      ;;
-    *)
-      dnl Nothing to do on gnulib's side.
-      dnl A 64-bit off_t is
-      dnl   - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
-      dnl     OSF/1, Cygwin,
-      dnl   - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
-      dnl     glibc, HP-UX, Solaris,
-      dnl   - enabled by _LARGE_FILES=1 (ensured by AC_SYS_LARGEFILE) on AIX,
-      dnl   - impossible to achieve on Minix 3.1.8.
-      WINDOWS_64_BIT_OFF_T=0
-      WINDOWS_64_BIT_ST_SIZE=0
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/lib-ld.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/lib-ld.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/lib-ld.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/lib-ld.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,56 +1,50 @@
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
 
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
+  acl_cv_prog_gnu_ld=yes ;;
 *)
-  acl_cv_prog_gnu_ld=no
-  ;;
+  acl_cv_prog_gnu_ld=no ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-2.4. Sets the variable LD.
+dnl From libtool-1.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
+[AC_ARG_WITH([gnu-ld],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
+  AC_MSG_CHECKING([for ld used by GCC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -60,11 +54,11 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -85,26 +79,23 @@
 fi
 AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
+        test "$with_gnu_ld" != no && break ;;
       *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+        test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
-  IFS="$acl_save_ifs"
+  IFS="$ac_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/lib-link.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/lib-link.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/lib-link.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/lib-link.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,9 +18,9 @@
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
     AC_LIB_LINKFLAGS_BODY([$1], [$2])
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -58,9 +58,9 @@
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
   dnl accordingly.
@@ -85,8 +85,7 @@
       *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
       *)       LIBS="$LIB[]NAME $LIBS" ;;
     esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
+    AC_TRY_LINK([$3], [$4],
       [ac_cv_lib[]Name=yes],
       [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
     LIBS="$ac_save_LIBS"
@@ -116,8 +115,6 @@
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl   acl_libext,
 dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
 dnl   acl_hardcode_libdir_flag_spec,
 dnl   acl_hardcode_libdir_separator,
 dnl   acl_hardcode_direct,
@@ -160,15 +157,15 @@
 dnl macro call that searches for libname.
 AC_DEFUN([AC_LIB_FROMPACKAGE],
 [
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   define([acl_frompackage_]NAME, [$2])
   popdef([NAME])
   pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
   popdef([PACKUP])
   popdef([PACK])
 ])
@@ -181,14 +178,14 @@
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
   dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
@@ -245,7 +242,7 @@
         names_already_handled="$names_already_handled $name"
         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
         dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/lib-prefix.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/lib-prefix.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/lib-prefix.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/lib-prefix.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/libunistring-base.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/libunistring-base.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/libunistring-base.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/libunistring-base.m4	2010-06-04 10:01:46.000000000 +0000
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/localcharset.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/localcharset.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/localcharset.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/localcharset.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/locale-fr.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale-fr.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/locale-fr.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale-fr.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-fr.m4 serial 11
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,30 +25,17 @@
 char buf[16];
 int main () {
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -63,67 +50,46 @@
      one byte long. This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr=fr_FR.ISO-8859-1
+        else
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR.ISO8859-1
           else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
+            # Test for the HP-UX locale name.
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.iso88591
             else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
               else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
+                # None found.
+                gt_cv_locale_fr=none
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
   ])
@@ -153,19 +119,9 @@
      variables, and all locales use the UTF-8 encoding.  */
 #if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -191,57 +147,36 @@
       || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
     return 1;
 #endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
           else
             # None found.
             gt_cv_locale_fr_utf8=none
           fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
   ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/locale_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/locale_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale_h.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-# locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_LOCALE_H],
-[
-  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
-  dnl once only, before all statements that occur in other macros.
-  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-
-  dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_*
-  dnl members of 'struct lconv'.
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
-  dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.
-  AC_REQUIRE([gl_STDDEF_H])
-
-  dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lconv'
-  dnl only if _LCONV_C99 is defined.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    solaris*)
-      AC_DEFINE([_LCONV_C99], [1], [Define to 1 on Solaris.])
-      ;;
-  esac
-
-  AC_CACHE_CHECK([whether locale.h conforms to POSIX:2001],
-    [gl_cv_header_locale_h_posix2001],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>
-            int x = LC_MESSAGES;
-            int y = sizeof (((struct lconv *) 0)->decimal_point);]],
-          [[]])],
-       [gl_cv_header_locale_h_posix2001=yes],
-       [gl_cv_header_locale_h_posix2001=no])])
-
-  dnl Check for <xlocale.h>.
-  AC_CHECK_HEADERS_ONCE([xlocale.h])
-  if test $ac_cv_header_xlocale_h = yes; then
-    HAVE_XLOCALE_H=1
-    dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
-    dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
-    dnl itself, we assume that <xlocale.h> will do so.
-    AC_CACHE_CHECK([whether locale.h defines locale_t],
-      [gl_cv_header_locale_has_locale_t],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <locale.h>
-              locale_t x;]],
-            [[]])],
-         [gl_cv_header_locale_has_locale_t=yes],
-         [gl_cv_header_locale_has_locale_t=no])
-      ])
-    if test $gl_cv_header_locale_has_locale_t = yes; then
-      gl_cv_header_locale_h_needs_xlocale_h=no
-    else
-      gl_cv_header_locale_h_needs_xlocale_h=yes
-    fi
-  else
-    HAVE_XLOCALE_H=0
-    gl_cv_header_locale_h_needs_xlocale_h=no
-  fi
-  AC_SUBST([HAVE_XLOCALE_H])
-
-  dnl Check whether 'struct lconv' is complete.
-  dnl Bionic libc's 'struct lconv' is just a dummy.
-  dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin 1.5.x,
-  dnl mingw, MSVC 9, it lacks the int_p_* and int_n_* members.
-  AC_CACHE_CHECK([whether struct lconv is properly defined],
-    [gl_cv_sys_struct_lconv_ok],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>
-            struct lconv l;
-            int x = sizeof (l.decimal_point);
-            int y = sizeof (l.int_p_cs_precedes);]],
-          [[]])],
-       [gl_cv_sys_struct_lconv_ok=yes],
-       [gl_cv_sys_struct_lconv_ok=no])
-    ])
-  if test $gl_cv_sys_struct_lconv_ok = no; then
-    REPLACE_STRUCT_LCONV=1
-  fi
-
-  dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.
-  gl_NEXT_HEADERS([locale.h])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <locale.h>
-/* Some systems provide declarations in a non-standard header.  */
-#if HAVE_XLOCALE_H
-# include <xlocale.h>
-#endif
-    ]],
-    [setlocale duplocale])
-])
-
-AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_LOCALE_H_DEFAULTS],
-[
-  GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV])
-  GNULIB_SETLOCALE=0;  AC_SUBST([GNULIB_SETLOCALE])
-  GNULIB_DUPLOCALE=0;  AC_SUBST([GNULIB_DUPLOCALE])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DUPLOCALE=1;       AC_SUBST([HAVE_DUPLOCALE])
-  REPLACE_LOCALECONV=0;   AC_SUBST([REPLACE_LOCALECONV])
-  REPLACE_SETLOCALE=0;    AC_SUBST([REPLACE_SETLOCALE])
-  REPLACE_DUPLOCALE=0;    AC_SUBST([REPLACE_DUPLOCALE])
-  REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/locale-ja.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale-ja.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/locale-ja.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale-ja.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-ja.m4 serial 7
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -27,30 +27,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -65,7 +52,7 @@
   if (MB_CUR_MAX == 1)
     return 1;
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -76,58 +63,42 @@
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
           else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
             else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
               else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
                 else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
+                  # None found.
+                  gt_cv_locale_ja=none
                 fi
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
   ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/localename.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/localename.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/localename.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/localename.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_LOCALENAME],
-[
-  AC_REQUIRE([gt_LC_MESSAGES])
-  AC_REQUIRE([gt_INTL_MACOSX])
-  AC_CHECK_FUNCS([setlocale uselocale])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/locale-zh.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale-zh.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/locale-zh.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/locale-zh.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-zh.m4 serial 6
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -28,30 +28,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -62,7 +49,7 @@
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -77,47 +64,22 @@
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
           gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     else
       # If there was a link error, due to mblen(), the system is so old that
       # it certainly doesn't have a chinese locale.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/lstat.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/lstat.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/lstat.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/lstat.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,6 +1,6 @@
-# serial 26
+# serial 20
 
-# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,59 +15,14 @@
   dnl "#define lstat stat", and lstat.c is a no-op.
   AC_CHECK_FUNCS_ONCE([lstat])
   if test $ac_cv_func_lstat = yes; then
-    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
-    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-      *no)
-        REPLACE_LSTAT=1
-        ;;
-    esac
+    AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+    if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+      dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]).
+      REPLACE_LSTAT=1
+    fi
+    # Prerequisites of lib/lstat.c.
+    AC_REQUIRE([AC_C_INLINE])
   else
     HAVE_LSTAT=0
   fi
 ])
-
-# Prerequisites of lib/lstat.c.
-AC_DEFUN([gl_PREREQ_LSTAT], [:])
-
-AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
-[
-  dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
-  dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
-  AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
-    [gl_cv_func_lstat_dereferences_slashed_symlink],
-    [rm -f conftest.sym conftest.file
-     echo >conftest.file
-     if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-       AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-            [AC_INCLUDES_DEFAULT],
-            [[struct stat sbuf;
-              /* Linux will dereference the symlink and fail, as required by
-                 POSIX.  That is better in the sense that it means we will not
-                 have to compile and use the lstat wrapper.  */
-              return lstat ("conftest.sym/", &sbuf) == 0;
-            ]])],
-         [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
-         [gl_cv_func_lstat_dereferences_slashed_symlink=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
-          esac
-         ])
-     else
-       # If the 'ln -s' command failed, then we probably don't even
-       # have an lstat function.
-       gl_cv_func_lstat_dereferences_slashed_symlink="guessing no"
-     fi
-     rm -f conftest.sym conftest.file
-    ])
-  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-    *yes)
-      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
-        [Define to 1 if 'lstat' dereferences a symlink specified
-         with a trailing slash.])
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/malloca.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/malloca.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/malloca.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/malloca.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/malloc.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/malloc.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/malloc.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/malloc.m4	2010-02-16 21:31:29.000000000 +0000
@@ -0,0 +1,41 @@
+# malloc.m4 serial 9
+dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_FUNC_MALLOC_POSIX
+# --------------------
+# Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
+# fails), and replace malloc if it is not.
+AC_DEFUN([gl_FUNC_MALLOC_POSIX],
+[
+  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
+    AC_DEFINE([HAVE_MALLOC_POSIX], [1],
+      [Define if the 'malloc' function is POSIX compliant.])
+  else
+    AC_LIBOBJ([malloc])
+    HAVE_MALLOC_POSIX=0
+  fi
+  AC_SUBST([HAVE_MALLOC_POSIX])
+])
+
+# Test whether malloc, realloc, calloc are POSIX compliant,
+# Set gl_cv_func_malloc_posix to yes or no accordingly.
+AC_DEFUN([gl_CHECK_MALLOC_POSIX],
+[
+  AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant],
+    [gl_cv_func_malloc_posix],
+    [
+      dnl It is too dangerous to try to allocate a large amount of memory:
+      dnl some systems go to their knees when you do that. So assume that
+      dnl all Unix implementations of the function are POSIX compliant.
+      AC_TRY_COMPILE([],
+        [#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+         choke me
+         #endif
+        ], [gl_cv_func_malloc_posix=yes], [gl_cv_func_malloc_posix=no])
+    ])
+])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mbchar.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbchar.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mbchar.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbchar.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+# mbchar.m4 serial 8
+dnl Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,4 +10,5 @@
 AC_DEFUN([gl_MBCHAR],
 [
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([AC_C_INLINE])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mbiter.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbiter.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mbiter.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbiter.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
+# mbiter.m4 serial 5
+dnl Copyright (C) 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,10 @@
 
 AC_DEFUN([gl_MBITER],
 [
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  dnl The following line is that so the user can test HAVE_MBRTOWC before
+  dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010.
+  AC_REQUIRE([AC_FUNC_MBRTOWC])
   :
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mbrtowc.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbrtowc.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mbrtowc.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbrtowc.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 26
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation,
+# mbrtowc.m4 serial 17
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2010 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,
@@ -15,41 +15,16 @@
   AC_CHECK_FUNCS_ONCE([mbrtowc])
   if test $ac_cv_func_mbrtowc = no; then
     HAVE_MBRTOWC=0
-    AC_CHECK_DECLS([mbrtowc],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_mbrtowc = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares mbrtowc() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_MBRTOWC=1
-    fi
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBRTOWC=1
     else
-      gl_MBRTOWC_NULL_ARG1
-      gl_MBRTOWC_NULL_ARG2
+      gl_MBRTOWC_NULL_ARG
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
-      gl_MBRTOWC_EMPTY_INPUT
-      case "$gl_cv_func_mbrtowc_null_arg1" in
-        *yes) ;;
-        *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
-             [Define if the mbrtowc function has the NULL pwc argument bug.])
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_null_arg2" in
+      case "$gl_cv_func_mbrtowc_null_arg" in
         *yes) ;;
-        *) AC_DEFINE([MBRTOWC_NULL_ARG2_BUG], [1],
+        *) AC_DEFINE([MBRTOWC_NULL_ARG_BUG], [1],
              [Define if the mbrtowc function has the NULL string argument bug.])
            REPLACE_MBRTOWC=1
            ;;
@@ -68,16 +43,13 @@
            REPLACE_MBRTOWC=1
            ;;
       esac
-      case "$gl_cv_func_mbrtowc_empty_input" in
-        *yes) ;;
-        *) AC_DEFINE([MBRTOWC_EMPTY_INPUT_BUG], [1],
-             [Define if the mbrtowc function does not return (size_t) -2
-              for empty input.])
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
     fi
   fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([mbrtowc])
+    gl_PREREQ_MBRTOWC
+  fi
 ])
 
 dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that
@@ -108,6 +80,9 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
+    gl_REPLACE_WCHAR_H
+  fi
 ])
 
 dnl Test whether mbrtowc puts the state into non-initial state when parsing an
@@ -126,24 +101,16 @@
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_JA != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -159,7 +126,7 @@
           return 1;
     }
   return 0;
-}]])],
+}],
           [gl_cv_func_mbrtowc_incomplete_state=yes],
           [gl_cv_func_mbrtowc_incomplete_state=no],
           [:])
@@ -189,18 +156,10 @@
       esac
 changequote([,])dnl
       if test $LOCALE_ZH_CN != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -219,7 +178,7 @@
         return 1;
     }
   return 0;
-}]])],
+}],
           [gl_cv_func_mbrtowc_sanitycheck=yes],
           [gl_cv_func_mbrtowc_sanitycheck=no],
           [:])
@@ -227,109 +186,31 @@
     ])
 ])
 
-dnl Test whether mbrtowc supports a NULL pwc argument correctly.
-dnl Result is gl_cv_func_mbrtowc_null_arg1.
-
-AC_DEFUN([gl_MBRTOWC_NULL_ARG1],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument],
-    [gl_cv_func_mbrtowc_null_arg1],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                  # Guess no on Solaris.
-        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
-                  # Guess yes otherwise.
-        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
-      esac
-changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  int result = 0;
-
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      char input[] = "\303\237er";
-      mbstate_t state;
-      wchar_t wc;
-      size_t ret;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      wc = (wchar_t) 0xBADFACE;
-      ret = mbrtowc (&wc, input, 5, &state);
-      if (ret != 2)
-        result |= 1;
-      if (!mbsinit (&state))
-        result |= 2;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      ret = mbrtowc (NULL, input, 5, &state);
-      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
-        result |= 4;
-      if (!mbsinit (&state))
-        result |= 8;
-    }
-  return result;
-}]])],
-          [gl_cv_func_mbrtowc_null_arg1=yes],
-          [gl_cv_func_mbrtowc_null_arg1=no],
-          [:])
-      fi
-    ])
-])
-
 dnl Test whether mbrtowc supports a NULL string argument correctly.
-dnl Result is gl_cv_func_mbrtowc_null_arg2.
+dnl Result is gl_cv_func_mbrtowc_null_arg.
 
-AC_DEFUN([gl_MBRTOWC_NULL_ARG2],
+AC_DEFUN([gl_MBRTOWC_NULL_ARG],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([gt_LOCALE_FR_UTF8])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument],
-    [gl_cv_func_mbrtowc_null_arg2],
+    [gl_cv_func_mbrtowc_null_arg],
     [
       dnl Initial guess, used when cross-compiling or when no suitable locale
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
               # Guess no on OSF/1.
-        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
+        osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;;
               # Guess yes otherwise.
-        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+        *)    gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR_UTF8 != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -347,10 +228,7 @@
         return 1;
     }
   return 0;
-}]])],
-          [gl_cv_func_mbrtowc_null_arg2=yes],
-          [gl_cv_func_mbrtowc_null_arg2=no],
-          [:])
+}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [:])
       fi
     ])
 ])
@@ -365,7 +243,7 @@
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([gt_LOCALE_FR_UTF8])
   AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc has a correct return value],
     [gl_cv_func_mbrtowc_retval],
     [
@@ -373,30 +251,19 @@
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-  int found_some_locale = 0;
   /* This fails on Solaris.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
@@ -409,9 +276,8 @@
         {
           input[1] = '\0';
           if (mbrtowc (&wc, input + 2, 5, &state) != 1)
-            result |= 1;
+            return 1;
         }
-      found_some_locale = 1;
     }
   /* This fails on HP-UX 11.11.  */
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
@@ -425,63 +291,13 @@
         {
           input[1] = '\0';
           if (mbrtowc (&wc, input + 2, 5, &state) != 2)
-            result |= 2;
+            return 1;
         }
-      found_some_locale = 1;
     }
-  /* This fails on native Windows.  */
-  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
-    {
-      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 4;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
-    {
-      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 8;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
-    {
-      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 16;
-        }
-      found_some_locale = 1;
-    }
-  return (found_some_locale ? result : 77);
-}]])],
+  return 0;
+}],
           [gl_cv_func_mbrtowc_retval=yes],
-          [if test $? != 77; then
-             gl_cv_func_mbrtowc_retval=no
-           fi
-          ],
+          [gl_cv_func_mbrtowc_retval=no],
           [:])
       fi
     ])
@@ -509,17 +325,9 @@
       esac
 changequote([,])dnl
       if test $LOCALE_ZH_CN != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -534,7 +342,7 @@
         return 1;
     }
   return 0;
-}]])],
+}],
           [gl_cv_func_mbrtowc_nul_retval=yes],
           [gl_cv_func_mbrtowc_nul_retval=no],
           [:])
@@ -542,41 +350,6 @@
     ])
 ])
 
-dnl Test whether mbrtowc returns the correct value on empty input.
-
-AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrtowc works on empty input],
-    [gl_cv_func_mbrtowc_empty_input],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                     # Guess no on AIX and glibc systems.
-        aix* | *-gnu*)
-                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
-        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-      esac
-changequote([,])dnl
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-           #include <wchar.h>
-           static wchar_t wc;
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-           }]])],
-        [gl_cv_func_mbrtowc_empty_input=no],
-        [gl_cv_func_mbrtowc_empty_input=yes],
-        [:])
-    ])
-])
-
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
@@ -585,8 +358,10 @@
 
 dnl From Paul Eggert
 
-dnl This is an override of an autoconf macro.
+dnl This override of an autoconf macro can be removed when autoconf 2.60 or
+dnl newer can be assumed everywhere.
 
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.60]),[-1],[
 AC_DEFUN([AC_FUNC_MBRTOWC],
 [
   dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
@@ -594,14 +369,7 @@
     gl_cv_func_mbrtowc,
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-            [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                 included before <wchar.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 <stdio.h>
-              #include <time.h>
-              #include <wchar.h>]],
+            [[#include <wchar.h>]],
             [[wchar_t wc;
               char const s[] = "";
               size_t n = 1;
@@ -614,3 +382,4 @@
       [Define to 1 if mbrtowc and mbstate_t are properly declared.])
   fi
 ])
+])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mbsinit.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbsinit.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mbsinit.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbsinit.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
+# mbsinit.m4 serial 4
+dnl Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,6 @@
 AC_DEFUN([gl_FUNC_MBSINIT],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   gl_MBSTATE_T_BROKEN
@@ -15,34 +14,16 @@
   AC_CHECK_FUNCS_ONCE([mbsinit])
   if test $ac_cv_func_mbsinit = no; then
     HAVE_MBSINIT=0
-    AC_CHECK_DECLS([mbsinit],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_mbsinit = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares mbsinit() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_MBSINIT=1
-    fi
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBSINIT=1
-    else
-      dnl On mingw, mbsinit() always returns 1, which is inappropriate for
-      dnl states produced by mbrtowc() for an incomplete multibyte character
-      dnl in multibyte locales.
-      case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
-      esac
     fi
   fi
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([mbsinit])
+    gl_PREREQ_MBSINIT
+  fi
 ])
 
 # Prerequisites of lib/mbsinit.c.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mbslen.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbslen.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mbslen.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbslen.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
 # mbslen.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mbstate_t.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbstate_t.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mbstate_t.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mbstate_t.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2014 Free Software Foundation, Inc.
+# mbstate_t.m4 serial 12
+dnl Copyright (C) 2000-2002, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -20,14 +20,7 @@
      [AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM(
            [AC_INCLUDES_DEFAULT[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>]],
+#           include <wchar.h>]],
            [[mbstate_t x; return sizeof x;]])],
         [ac_cv_type_mbstate_t=yes],
         [ac_cv_type_mbstate_t=no])])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/memchr.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/memchr.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/memchr.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/memchr.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc.
+# memchr.m4 serial 8
+dnl Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,16 +11,10 @@
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
 
+  dnl These days, we assume memchr is present.  But just in case...
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  m4_ifdef([gl_FUNC_MEMCHR_OBSOLETE], [
-    dnl These days, we assume memchr is present.  But if support for old
-    dnl platforms is desired:
-    AC_CHECK_FUNCS_ONCE([memchr])
-    if test $ac_cv_func_memchr = no; then
-      HAVE_MEMCHR=0
-    fi
-  ])
-  if test $HAVE_MEMCHR = 1; then
+  AC_CHECK_FUNCS_ONCE([memchr])
+  if test $ac_cv_func_memchr = yes; then
     # Detect platform-specific bugs in some versions of glibc:
     # memchr should not dereference anything with length 0
     #   http://bugzilla.redhat.com/499689
@@ -41,7 +35,6 @@
 # endif
 #endif
 ]], [[
-  int result = 0;
   char *fence = NULL;
 #if HAVE_SYS_MMAN_H && HAVE_MPROTECT
 # if HAVE_MAP_ANONYMOUS
@@ -65,20 +58,24 @@
   if (fence)
     {
       if (memchr (fence, 0, 0))
-        result |= 1;
+        return 1;
       strcpy (fence - 9, "12345678");
       if (memchr (fence - 9, 0, 79) != fence - 1)
-        result |= 2;
-      if (memchr (fence - 1, 0, 3) != fence - 1)
-        result |= 4;
+        return 2;
     }
-  return result;
+  return 0;
 ]])], [gl_cv_func_memchr_works=yes], [gl_cv_func_memchr_works=no],
       [dnl Be pessimistic for now.
        gl_cv_func_memchr_works="guessing no"])])
     if test "$gl_cv_func_memchr_works" != yes; then
       REPLACE_MEMCHR=1
     fi
+  else
+    HAVE_MEMCHR=0
+  fi
+  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+    AC_LIBOBJ([memchr])
+    gl_PREREQ_MEMCHR
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/memmove.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/memmove.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/memmove.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/memmove.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,12 +1,15 @@
-# memmove.m4 serial 4
-dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+# memmove.m4 serial 3
+dnl Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMMOVE],
 [
-  AC_CHECK_FUNCS([memmove])
+  AC_REPLACE_FUNCS([memmove])
+  if test $ac_cv_func_memmove = no; then
+    gl_PREREQ_MEMMOVE
+  fi
 ])
 
 # Prerequisites of lib/memmove.c.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/mmap-anon.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/mmap-anon.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/mmap-anon.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/mmap-anon.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+# mmap-anon.m4 serial 8
+dnl Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,12 +9,16 @@
 # - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
 #   and MAP_ANON exist and have the same value.
 # - On HP-UX, only MAP_ANONYMOUS exists.
-# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
+# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
 # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
 #   used.
 
 AC_DEFUN([gl_FUNC_MMAP_ANON],
 [
+  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_EGREP])
+
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -27,18 +31,18 @@
   gl_have_mmap_anonymous=no
   if test $gl_have_mmap = yes; then
     AC_MSG_CHECKING([for MAP_ANONYMOUS])
-    AC_EGREP_CPP([I cannot identify this map], [
+    AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>
 #ifdef MAP_ANONYMOUS
-    I cannot identify this map
+    I cant identify this map.
 #endif
 ],
       [gl_have_mmap_anonymous=yes])
     if test $gl_have_mmap_anonymous != yes; then
-      AC_EGREP_CPP([I cannot identify this map], [
+      AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>
 #ifdef MAP_ANON
-    I cannot identify this map
+    I cant identify this map.
 #endif
 ],
         [AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON],
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/msvc-inval.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/msvc-inval.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/msvc-inval.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/msvc-inval.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MSVC_INVAL],
-[
-  AC_CHECK_FUNCS_ONCE([_set_invalid_parameter_handler])
-  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
-    AC_DEFINE([HAVE_MSVC_INVALID_PARAMETER_HANDLER], [1],
-      [Define to 1 on MSVC platforms that have the "invalid parameter handler"
-       concept.])
-  else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-  fi
-  AC_SUBST([HAVE_MSVC_INVALID_PARAMETER_HANDLER])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/msvc-nothrow.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/msvc-nothrow.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/msvc-nothrow.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/msvc-nothrow.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MSVC_NOTHROW],
-[
-  AC_REQUIRE([gl_MSVC_INVAL])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/multiarch.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/multiarch.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/multiarch.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/multiarch.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,12 +1,12 @@
-# multiarch.m4 serial 7
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# multiarch.m4 serial 5
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 # Determine whether the compiler is or may be producing universal binaries.
 #
-# On Mac OS X 10.5 and later systems, the user can create libraries and
+# On MacOS X 10.5 and later systems, the user can create libraries and
 # executables that work on multiple system types--known as "fat" or
 # "universal" binaries--by specifying multiple '-arch' options to the
 # compiler but only a single '-arch' option to the preprocessor.  Like
@@ -16,7 +16,8 @@
 #                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 #                 CPP="gcc -E" CXXCPP="g++ -E"
 #
-# Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly.
+# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
+# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
 
 AC_DEFUN_ONCE([gl_MULTIARCH],
 [
@@ -54,6 +55,8 @@
      done
     ])
   if test $gl_cv_c_multiarch = yes; then
+    AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1],
+      [Define if the compiler is building for multiple architectures of Apple platforms at once.])
     APPLE_UNIVERSAL_BUILD=1
   else
     APPLE_UNIVERSAL_BUILD=0
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/nocrash.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/nocrash.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/nocrash.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/nocrash.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-# nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 Based on libsigsegv, from Bruno Haible and Paolo Bonzini.
-
-AC_PREREQ([2.13])
-
-dnl Expands to some code for use in .c programs that will cause the configure
-dnl test to exit instead of crashing. This is useful to avoid triggering
-dnl action from a background debugger and to avoid core dumps.
-dnl Usage:   ...
-dnl          ]GL_NOCRASH[
-dnl          ...
-dnl          int main() { nocrash_init(); ... }
-AC_DEFUN([GL_NOCRASH],[[
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-]])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/off_t.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/off_t.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/off_t.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/off_t.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# off_t.m4 serial 1
-dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 Check whether to override the 'off_t' type.
-dnl Set WINDOWS_64_BIT_OFF_T.
-
-AC_DEFUN([gl_TYPE_OFF_T],
-[
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_OFF_T=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_OFF_T])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/onceonly.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/onceonly.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/onceonly.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/onceonly.m4	2010-02-16 21:31:29.000000000 +0000
@@ -0,0 +1,91 @@
+# onceonly.m4 serial 6
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 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
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE          like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE            like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE            like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_FUNC_STRCOLL])  like  AC_FUNC_STRCOLL
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl The original code implemented AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE
+dnl in terms of AC_DEFUN and AC_REQUIRE. This implementation uses diversions to
+dnl named sections DEFAULTS and INIT_PREPARE in order to check all requested
+dnl headers at once, thus reducing the size of 'configure'. It is known to work
+dnl with autoconf 2.57..2.62 at least . The size reduction is ca. 9%.
+
+dnl Autoconf version 2.59 plus gnulib is required; this file is not needed
+dnl with Autoconf 2.60 or greater. But note that autoconf's implementation of
+dnl AC_CHECK_DECLS_ONCE expects a comma-separated list of symbols as first
+dnl argument!
+AC_PREREQ([2.59])
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  m4_foreach_w([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                 [./-], [___])), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
+      gl_HEADERS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [./-], [___])))
+  ])
+])
+m4_define([gl_HEADERS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_header_list=])
+  AC_CHECK_HEADERS([$gl_header_list])
+  m4_define([gl_HEADERS_EXPANSION], [])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  m4_foreach_w([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
+      gl_FUNCS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
+  ])
+])
+m4_define([gl_FUNCS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_func_list=])
+  AC_CHECK_FUNCS([$gl_func_list])
+  m4_define([gl_FUNCS_EXPANSION], [])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  m4_foreach_w([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
+  ])
+])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/pathmax.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/pathmax.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/pathmax.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/pathmax.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
+# pathmax.m4 serial 8
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 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,
@@ -8,35 +8,6 @@
 AC_DEFUN([gl_PATHMAX],
 [
   dnl Prerequisites of lib/pathmax.h.
+  AC_CHECK_FUNCS_ONCE([pathconf])
   AC_CHECK_HEADERS_ONCE([sys/param.h])
 ])
-
-# Expands to a piece of C program that defines PATH_MAX in the same way as
-# "pathmax.h" will do.
-AC_DEFUN([gl_PATHMAX_SNIPPET], [[
-/* Arrange to define PATH_MAX, like "pathmax.h" does. */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <limits.h>
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-#ifdef __hpux
-# undef PATH_MAX
-# define PATH_MAX 1024
-#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# undef PATH_MAX
-# define PATH_MAX 260
-#endif
-]])
-
-# Prerequisites of gl_PATHMAX_SNIPPET.
-AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ],
-[
-  AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/raise.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/raise.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/raise.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/raise.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# raise.m4 serial 3
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_RAISE],
-[
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_MSVC_INVAL])
-  AC_CHECK_FUNCS([raise])
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
-  else
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_RAISE=1
-    fi
-    m4_ifdef([gl_SIGNALBLOCKING], [
-      gl_SIGNALBLOCKING
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-        m4_ifdef([gl_SIGNAL_SIGPIPE], [
-          gl_SIGNAL_SIGPIPE
-          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-            REPLACE_RAISE=1
-          fi
-        ], [:])
-      fi
-    ])
-  fi
-])
-
-# Prerequisites of lib/raise.c.
-AC_DEFUN([gl_PREREQ_RAISE], [:])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/readlink.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/readlink.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/readlink.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/readlink.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
+# readlink.m4 serial 9
+dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,10 +7,11 @@
 AC_DEFUN([gl_FUNC_READLINK],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_FUNCS_ONCE([readlink])
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
+    AC_LIBOBJ([readlink])
+    gl_PREREQ_READLINK
   else
     AC_CACHE_CHECK([whether readlink signature is correct],
       [gl_cv_decl_readlink_works],
@@ -33,31 +34,21 @@
 ]], [[char buf[20];
       return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;]])],
          [gl_cv_func_readlink_works=yes], [gl_cv_func_readlink_works=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_readlink_works="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_readlink_works="guessing no" ;;
-          esac
-         ])
+         [gl_cv_func_readlink_works="guessing no"])
       rm -f conftest.link conftest.lnk2])
-    case "$gl_cv_func_readlink_works" in
-      *yes)
-        if test "$gl_cv_decl_readlink_works" != yes; then
-          REPLACE_READLINK=1
-        fi
-        ;;
-      *)
-        AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
-          fails to recognize a trailing slash.])
-        REPLACE_READLINK=1
-        ;;
-    esac
+    if test "$gl_cv_func_readlink_works" != yes; then
+      AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
+        fails to recognize a trailing slash.])
+      REPLACE_READLINK=1
+      AC_LIBOBJ([readlink])
+    elif test "$gl_cv_decl_readlink_works" != yes; then
+      REPLACE_READLINK=1
+      AC_LIBOBJ([readlink])
+    fi
   fi
 ])
 
-# Like gl_FUNC_READLINK, except prepare for separate compilation
-# (no REPLACE_READLINK, no AC_LIBOBJ).
+# Like gl_FUNC_READLINK, except prepare for separate compilation (no AC_LIBOBJ).
 AC_DEFUN([gl_FUNC_READLINK_SEPARATE],
 [
   AC_CHECK_FUNCS_ONCE([readlink])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/relocatable-lib.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/relocatable-lib.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/relocatable-lib.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/relocatable-lib.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# relocatable-lib.m4 serial 6
-dnl Copyright (C) 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+# relocatable-lib.m4 serial 5
+dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,9 @@
 AC_DEFUN([gl_RELOCATABLE_LIBRARY],
 [
   AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
+  if test $RELOCATABLE = yes; then
+    AC_LIBOBJ([relocatable])
+  fi
 ])
 AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
 [
@@ -29,6 +32,13 @@
   fi
 ])
 
+dnl Like gl_RELOCATABLE_LIBRARY, except prepare for separate compilation
+dnl (no AC_LIBOBJ).
+AC_DEFUN([gl_RELOCATABLE_LIBRARY_SEPARATE],
+[
+  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
+])
+
 dnl Support for relocatable packages for which it is a nop.
 AC_DEFUN([gl_RELOCATABLE_NOP],
 [
@@ -45,3 +55,4 @@
   AC_SUBST([RELOCATABLE])
   AC_MSG_RESULT([$RELOCATABLE])
 ])
+
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/relocatable.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/relocatable.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/relocatable.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/relocatable.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# relocatable.m4 serial 18
-dnl Copyright (C) 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+# relocatable.m4 serial 15
+dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -14,6 +14,9 @@
 [
   AC_REQUIRE([gl_RELOCATABLE_BODY])
   gl_RELOCATABLE_LIBRARY
+  if test $RELOCATABLE = yes; then
+    AC_LIBOBJ([progreloc])
+  fi
   : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
   RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
   RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
@@ -33,7 +36,6 @@
   AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
   is_noop=no
   use_elf_origin_trick=no
-  use_wrapper=no
   if test $RELOCATABLE = yes; then
     # --enable-relocatable implies --disable-rpath
     enable_rpath=no
@@ -41,7 +43,7 @@
     AC_CHECK_FUNCS([_NSGetExecutablePath])
     case "$host_os" in
       mingw*) is_noop=yes ;;
-      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
+      linux*) use_elf_origin_trick=yes ;;
     esac
     if test $is_noop = yes; then
       RELOCATABLE_LDFLAGS=:
@@ -56,7 +58,6 @@
         RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
         AC_SUBST([RELOCATABLE_LDFLAGS])
       else
-        use_wrapper=yes
         dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
         dnl consisting of more than one word - libtool doesn't support this.
         dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
@@ -72,7 +73,6 @@
   fi
   AM_CONDITIONAL([RELOCATABLE_VIA_LD],
     [test $is_noop = yes || test $use_elf_origin_trick = yes])
-  AM_CONDITIONAL([RELOCATABLE_VIA_WRAPPER], [test $use_wrapper = yes])
 
   dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty.
   AC_SUBST([RELOCATABLE_LIBRARY_PATH])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/setenv.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/setenv.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/setenv.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/setenv.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
-# setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+# setenv.m4 serial 16
+dnl Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,16 @@
 AC_DEFUN([gl_FUNC_SETENV],
 [
   AC_REQUIRE([gl_FUNC_SETENV_SEPARATE])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  if test $HAVE_SETENV$REPLACE_SETENV != 10; then
+    AC_LIBOBJ([setenv])
+  fi
+])
+
+# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([setenv])
   if test $ac_cv_func_setenv = no; then
     HAVE_SETENV=0
   else
@@ -18,127 +27,69 @@
        #include <errno.h>
        #include <string.h>
       ]], [[
-       int result = 0;
-       {
-         if (setenv ("", "", 0) != -1)
-           result |= 1;
-         else if (errno != EINVAL)
-           result |= 2;
-       }
-       {
-         if (setenv ("a", "=", 1) != 0)
-           result |= 4;
-         else if (strcmp (getenv ("a"), "=") != 0)
-           result |= 8;
-       }
-       return result;
+       if (setenv ("", "", 0) != -1) return 1;
+       if (errno != EINVAL) return 2;
+       if (setenv ("a", "=", 1) != 0) return 3;
+       if (strcmp (getenv ("a"), "=") != 0) return 4;
       ]])],
       [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_setenv_works="guessing no" ;;
-       esac
-      ])])
-    case "$gl_cv_func_setenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_SETENV=1
-        ;;
-    esac
-  fi
-])
-
-# Like gl_FUNC_SETENV, except prepare for separate compilation
-# (no REPLACE_SETENV, no AC_LIBOBJ).
-AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_CHECK_DECLS_ONCE([setenv])
-  if test $ac_cv_have_decl_setenv = no; then
-    HAVE_DECL_SETENV=0
+      [gl_cv_func_setenv_works="guessing no"])])
+    if test "$gl_cv_func_setenv_works" != yes; then
+      REPLACE_SETENV=1
+      AC_LIBOBJ([setenv])
+    fi
   fi
-  AC_CHECK_FUNCS_ONCE([setenv])
   gl_PREREQ_SETENV
 ])
 
 AC_DEFUN([gl_FUNC_UNSETENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CHECK_DECLS_ONCE([unsetenv])
-  if test $ac_cv_have_decl_unsetenv = no; then
-    HAVE_DECL_UNSETENV=0
-  fi
   AC_CHECK_FUNCS([unsetenv])
   if test $ac_cv_func_unsetenv = no; then
     HAVE_UNSETENV=0
+    AC_LIBOBJ([unsetenv])
+    gl_PREREQ_UNSETENV
   else
-    HAVE_UNSETENV=1
     dnl Some BSDs return void, failing to do error checking.
     AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[
-#undef _BSD
-#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 <stdlib.h> */
-#include <stdlib.h>
+      [AC_TRY_COMPILE([#include <stdlib.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
+#if defined(__STDC__) || defined(__cplusplus)
 int unsetenv (const char *name);
-            ]],
-            [[]])],
-         [gt_cv_func_unsetenv_ret='int'],
-         [gt_cv_func_unsetenv_ret='void'])])
+#else
+int unsetenv();
+#endif
+], , gt_cv_func_unsetenv_ret='int', gt_cv_func_unsetenv_ret='void')])
     if test $gt_cv_func_unsetenv_ret = 'void'; then
       AC_DEFINE([VOID_UNSETENV], [1], [Define to 1 if unsetenv returns void
        instead of int.])
       REPLACE_UNSETENV=1
+      AC_LIBOBJ([unsetenv])
     fi
 
     dnl Solaris 10 unsetenv does not remove all copies of a name.
-    dnl Haiku alpha 2 unsetenv gets confused by assignment to environ.
-    dnl OpenBSD 4.7 unsetenv("") does not fail.
-    AC_CACHE_CHECK([whether unsetenv obeys POSIX],
+    AC_CACHE_CHECK([whether unsetenv works on duplicates],
       [gl_cv_func_unsetenv_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
        #include <stdlib.h>
-       #include <errno.h>
-       extern char **environ;
       ]], [[
-       char entry1[] = "a=1";
-       char entry2[] = "b=2";
-       char *env[] = { entry1, entry2, NULL };
+       char entry[] = "b=2";
        if (putenv ((char *) "a=1")) return 1;
-       if (putenv (entry2)) return 2;
-       entry2[0] = 'a';
+       if (putenv (entry)) return 2;
+       entry[0] = 'a';
        unsetenv ("a");
        if (getenv ("a")) return 3;
-       if (!unsetenv ("") || errno != EINVAL) return 4;
-       entry2[0] = 'b';
-       environ = env;
-       if (!getenv ("a")) return 5;
-       entry2[0] = 'a';
-       unsetenv ("a");
-       if (getenv ("a")) return 6;
       ]])],
       [gl_cv_func_unsetenv_works=yes], [gl_cv_func_unsetenv_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_unsetenv_works="guessing no" ;;
-       esac
-      ])])
-    case "$gl_cv_func_unsetenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_UNSETENV=1
-        ;;
-    esac
+      [gl_cv_func_unsetenv_works="guessing no"])])
+    if test "$gl_cv_func_unsetenv_works" != yes; then
+      REPLACE_UNSETENV=1
+      AC_LIBOBJ([unsetenv])
+    fi
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/setlocale.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/setlocale.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/setlocale.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/setlocale.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# setlocale.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_SETLOCALE],
-[
-  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    dnl On native Windows systems, setlocale(category,NULL) does not look at
-    dnl the environment variables LC_ALL, category, and LANG.
-    mingw*) REPLACE_SETLOCALE=1 ;;
-    dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
-    dnl is then still "C".
-    cygwin*)
-      case `uname -r` in
-        1.5.*) REPLACE_SETLOCALE=1 ;;
-      esac
-      ;;
-  esac
-])
-
-# Prerequisites of lib/setlocale.c.
-AC_DEFUN([gl_PREREQ_SETLOCALE],
-[
-  :
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/signalblocking.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/signalblocking.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/signalblocking.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/signalblocking.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 14
-dnl Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
+# signalblocking.m4 serial 10
+dnl Copyright (C) 2001-2002, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,14 +12,31 @@
 AC_DEFUN([gl_SIGNALBLOCKING],
 [
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
-  if test $gl_cv_type_sigset_t = yes; then
+  signals_not_posix=
+  AC_EGREP_HEADER([sigset_t], [signal.h], , [signals_not_posix=1])
+  if test -z "$signals_not_posix"; then
     AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1])
   fi
   if test -z "$gl_cv_func_sigprocmask"; then
     HAVE_POSIX_SIGNALBLOCKING=0
+    AC_LIBOBJ([sigprocmask])
+    gl_PREREQ_SIGPROCMASK
   fi
 ])
 
-# Prerequisites of lib/sigprocmask.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])
+# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c.
+AC_DEFUN([gl_PREREQ_SIGPROCMASK],
+[
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+  AC_CHECK_TYPES([sigset_t],
+    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
+    [#include <signal.h>
+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>])
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
+  fi
+  dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has
+  dnl the sigset_t type.
+  AC_SUBST([HAVE_SIGSET_T])
+])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/signal_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/signal_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/signal_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/signal_h.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
-# signal_h.m4 serial 18
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# signal_h.m4 serial 11
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,49 +7,22 @@
 AC_DEFUN([gl_SIGNAL_H],
 [
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
-  gl_NEXT_HEADERS([signal.h])
-
+  gl_CHECK_NEXT_HEADERS([signal.h])
 # AIX declares sig_atomic_t to already include volatile, and C89 compilers
 # then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
   AC_CHECK_TYPE([volatile sig_atomic_t], [],
     [HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0], [[
 #include <signal.h>
     ]])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
   AC_REQUIRE([AC_TYPE_UID_T])
 
-  dnl Persuade glibc <signal.h> to define sighandler_t.
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_TYPE([sighandler_t], [], [HAVE_SIGHANDLER_T=0], [[
-#include <signal.h>
-    ]])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <signal.h>
-    ]], [pthread_sigmask sigaction
-    sigaddset sigdelset sigemptyset sigfillset sigismember
+    ]], [sigaction sigaddset sigdelset sigemptyset sigfillset sigismember
     sigpending sigprocmask])
 ])
 
-AC_DEFUN([gl_CHECK_TYPE_SIGSET_T],
-[
-  AC_CHECK_TYPES([sigset_t],
-    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
-    [[
-      #include <signal.h>
-      /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-      #include <sys/types.h>
-    ]])
-  if test $gl_cv_type_sigset_t != yes; then
-    HAVE_SIGSET_T=0
-  fi
-])
-
 AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
@@ -61,15 +34,11 @@
 
 AC_DEFUN([gl_SIGNAL_H_DEFAULTS],
 [
-  GNULIB_PTHREAD_SIGMASK=0;    AC_SUBST([GNULIB_PTHREAD_SIGMASK])
-  GNULIB_RAISE=0;              AC_SUBST([GNULIB_RAISE])
   GNULIB_SIGNAL_H_SIGPIPE=0;   AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE])
   GNULIB_SIGPROCMASK=0;        AC_SUBST([GNULIB_SIGPROCMASK])
   GNULIB_SIGACTION=0;          AC_SUBST([GNULIB_SIGACTION])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING])
-  HAVE_PTHREAD_SIGMASK=1;      AC_SUBST([HAVE_PTHREAD_SIGMASK])
-  HAVE_RAISE=1;                AC_SUBST([HAVE_RAISE])
   HAVE_SIGSET_T=1;             AC_SUBST([HAVE_SIGSET_T])
   HAVE_SIGINFO_T=1;            AC_SUBST([HAVE_SIGINFO_T])
   HAVE_SIGACTION=1;            AC_SUBST([HAVE_SIGACTION])
@@ -77,7 +46,4 @@
                                AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
   HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
                                AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T])
-  HAVE_SIGHANDLER_T=1;         AC_SUBST([HAVE_SIGHANDLER_T])
-  REPLACE_PTHREAD_SIGMASK=0;   AC_SUBST([REPLACE_PTHREAD_SIGMASK])
-  REPLACE_RAISE=0;             AC_SUBST([REPLACE_RAISE])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/sigpipe.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/sigpipe.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/sigpipe.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/sigpipe.m4	2010-02-16 21:31:29.000000000 +0000
@@ -1,5 +1,5 @@
 # sigpipe.m4 serial 2
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/ssize_t.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/ssize_t.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/ssize_t.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/ssize_t.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,5 +1,5 @@
-# ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc.
+# ssize_t.m4 serial 4 (gettext-0.15)
+dnl Copyright (C) 2001-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,11 +10,9 @@
 AC_DEFUN([gt_TYPE_SSIZE_T],
 [
   AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>]],
-          [[int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;]])],
+    [AC_TRY_COMPILE([#include <sys/types.h>],
+       [int x = sizeof (ssize_t *) + sizeof (ssize_t);
+        return !x;],
        [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
   if test $gt_cv_ssize_t = no; then
     AC_DEFINE([ssize_t], [int],
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/stat.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/stat.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/stat.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/stat.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,6 +1,6 @@
-# serial 11
+# serial 4
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,7 @@
 AC_DEFUN([gl_FUNC_STAT],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([lstat])
   dnl mingw is the only known platform where stat(".") and stat("./") differ
@@ -23,9 +24,8 @@
             mingw*) gl_cv_func_stat_dir_slash="guessing no";;
             *) gl_cv_func_stat_dir_slash="guessing yes";;
           esac])])
-  dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
-  dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
-  dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
+  dnl Solaris 9 mistakenly succeeds on stat("file/")
+  dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/")
   AC_CACHE_CHECK([whether stat handles trailing slashes on files],
       [gl_cv_func_stat_file_slash],
       [touch conftest.tmp
@@ -36,24 +36,14 @@
        AC_RUN_IFELSE(
          [AC_LANG_PROGRAM(
            [[#include <sys/stat.h>
-]], [[int result = 0;
-      struct stat st;
-      if (!stat ("conftest.tmp/", &st))
-        result |= 1;
+]], [[struct stat st;
+      if (!stat ("conftest.tmp/", &st)) return 1;
 #if HAVE_LSTAT
-      if (!stat ("conftest.lnk/", &st))
-        result |= 2;
+      if (!stat ("conftest.lnk/", &st)) return 2;
 #endif
-      return result;
            ]])],
          [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_stat_file_slash="guessing no" ;;
-          esac
-         ])
+         [gl_cv_func_stat_file_slash="guessing no"])
        rm -f conftest.tmp conftest.lnk])
   case $gl_cv_func_stat_dir_slash in
     *no) REPLACE_STAT=1
@@ -65,7 +55,9 @@
       AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
         help when passed a file name with a trailing slash]);;
   esac
+  if test $REPLACE_STAT = 1; then
+    AC_LIBOBJ([stat])
+    dnl Prerequisites of lib/stat.c.
+    AC_REQUIRE([AC_C_INLINE])
+  fi
 ])
-
-# Prerequisites of lib/stat.c.
-AC_DEFUN([gl_PREREQ_STAT], [:])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/stdbool.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdbool.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/stdbool.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdbool.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,17 +1,15 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-#serial 5
-
 # Prepare for substituting <stdbool.h> if it is not supported.
 
 AC_DEFUN([AM_STDBOOL_H],
 [
-  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
+  AC_REQUIRE([AC_HEADER_STDBOOL])
 
   # Define two additional variables used in the Makefile substitution.
 
@@ -21,7 +19,6 @@
     STDBOOL_H='stdbool.h'
   fi
   AC_SUBST([STDBOOL_H])
-  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
 
   if test "$ac_cv_type__Bool" = yes; then
     HAVE__BOOL=1
@@ -34,67 +31,85 @@
 # AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
 AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
 
-# This version of the macro is needed in autoconf <= 2.68.
+# This macro is only needed in autoconf <= 2.59.  Newer versions of autoconf
+# have this macro built-in.
 
-AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
+AC_DEFUN([AC_HEADER_STDBOOL],
   [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
      [ac_cv_header_stdbool_h],
-     [AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { _Bool s: 1; _Bool t; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
-           ]],
-           [[
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
-           ]])],
+     [AC_TRY_COMPILE(
+        [
+          #include <stdbool.h>
+          #ifndef bool
+           "error: bool is not defined"
+          #endif
+          #ifndef false
+           "error: false is not defined"
+          #endif
+          #if false
+           "error: false is not 0"
+          #endif
+          #ifndef true
+           "error: true is not defined"
+          #endif
+          #if true != 1
+           "error: true is not 1"
+          #endif
+          #ifndef __bool_true_false_are_defined
+           "error: __bool_true_false_are_defined is not defined"
+          #endif
+
+          struct s { _Bool s: 1; _Bool t; } s;
+
+          char a[true == 1 ? 1 : -1];
+          char b[false == 0 ? 1 : -1];
+          char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+          char d[(bool) 0.5 == true ? 1 : -1];
+          bool e = &s;
+          char f[(_Bool) 0.0 == false ? 1 : -1];
+          char g[true];
+          char h[sizeof (_Bool)];
+          char i[sizeof s.t];
+          enum { j = false, k = true, l = false * true, m = true * 256 };
+          _Bool n[m];
+          char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+          #if defined __xlc__ || defined __GNUC__
+           /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+              reported by James Lemley on 2005-10-05; see
+              http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+              This test is not quite right, since xlc is allowed to
+              reject this program, as the initializer for xlcbug is
+              not one of the forms that C requires support for.
+              However, doing the test right would require a run-time
+              test, and that would make cross-compilation harder.
+              Let us hope that IBM fixes the xlc bug, and also adds
+              support for this kind of constant expression.  In the
+              meantime, this test will reject xlc, which is OK, since
+              our stdbool.h substitute should suffice.  We also test
+              this with GCC, where it should work, to detect more
+              quickly whether someone messes up the test in the
+              future.  */
+           char digs[] = "0123456789";
+           int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+          #endif
+          /* Catch a bug in an HP-UX C compiler.  See
+             http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+             http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+           */
+          _Bool q = true;
+          _Bool *pq = &q;
+        ],
+        [
+          *pq |= q;
+          *pq |= ! q;
+          /* Refer to every declared value, to avoid compiler optimizations.  */
+          return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                  + !m + !n + !o + !p + !q + !pq);
+        ],
         [ac_cv_header_stdbool_h=yes],
         [ac_cv_header_stdbool_h=no])])
    AC_CHECK_TYPES([_Bool])
-])
+   if test $ac_cv_header_stdbool_h = yes; then
+     AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.])
+   fi])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/stddef_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/stddef_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/stddef_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/stddef_h.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,6 +1,6 @@
 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# stddef_h.m4 serial 2
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,6 @@
 [
   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
-  STDDEF_H=
   if test $gt_cv_c_wchar_t = no; then
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
@@ -25,10 +24,8 @@
     REPLACE_NULL=1
     STDDEF_H=stddef.h
   fi
-  AC_SUBST([STDDEF_H])
-  AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
   if test -n "$STDDEF_H"; then
-    gl_NEXT_HEADERS([stddef.h])
+    gl_CHECK_NEXT_HEADERS([stddef.h])
   fi
 ])
 
@@ -44,4 +41,5 @@
   dnl Assume proper GNU behavior unless another module says otherwise.
   REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
   HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
+  STDDEF_H='';                   AC_SUBST([STDDEF_H])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/stdint.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdint.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/stdint.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdint.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,5 +1,5 @@
-# stdint.m4 serial 43
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# stdint.m4 serial 34
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,7 @@
 dnl From Paul Eggert and Bruno Haible.
 dnl Test whether <stdint.h> is supported or must be substituted.
 
-AC_DEFUN_ONCE([gl_STDINT_H],
+AC_DEFUN([gl_STDINT_H],
 [
   AC_PREREQ([2.59])dnl
 
@@ -27,15 +27,6 @@
   fi
   AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
 
-  dnl Check for <wchar.h>, in the same way as gl_WCHAR_H does.
-  AC_CHECK_HEADERS_ONCE([wchar.h])
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
-  AC_SUBST([HAVE_WCHAR_H])
-
   dnl Check for <inttypes.h>.
   dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
   if test $ac_cv_header_inttypes_h = yes; then
@@ -69,6 +60,8 @@
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
@@ -152,11 +145,9 @@
 
 #include <limits.h> /* for CHAR_BIT */
 #define TYPE_MINIMUM(t) \
-  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
 #define TYPE_MAXIMUM(t) \
-  ((t) ((t) 0 < (t) -1 \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 struct s {
   int check_PTRDIFF:
       PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
@@ -217,6 +208,8 @@
           dnl This detects a bug on HP-UX 11.23/ia64.
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 ]
@@ -266,7 +259,7 @@
           || strncmp (value, "((int)"/*)*/, 6) == 0
           || strncmp (value, "((signed short)"/*)*/, 15) == 0
           || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-        return mv - macro_values + 1;
+        return 1;
     }
   return 0;
 ]])],
@@ -297,11 +290,14 @@
     fi
     AC_SUBST([HAVE_SYS_BITYPES_H])
 
+    dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+    dnl character support).
+    AC_CHECK_HEADERS_ONCE([wchar.h])
+
     gl_STDINT_TYPE_PROPERTIES
     STDINT_H=stdint.h
   fi
   AC_SUBST([STDINT_H])
-  AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
 ])
 
 dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
@@ -313,7 +309,7 @@
   dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+    [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
        [Define to the number of bits in type ']gltype['.])])
   for gltype in $1 ; do
     AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
@@ -338,7 +334,7 @@
     eval BITSIZEOF_${GLTYPE}=\$result
   done
   m4_foreach_w([gltype], [$1],
-    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+    [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])
 
 dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
@@ -351,7 +347,7 @@
   dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+    [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
        [Define to 1 if ']gltype[' is a signed integer type.])])
   for gltype in $1 ; do
     AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
@@ -371,7 +367,7 @@
     fi
   done
   m4_foreach_w([gltype], [$1],
-    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+    [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])
 
 dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
@@ -384,7 +380,7 @@
   dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
+    [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
        [Define to l, ll, u, ul, ull, etc., as suitable for
         constants of type ']gltype['.])])
   for gltype in $1 ; do
@@ -423,7 +419,7 @@
     AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
   done
   m4_foreach_w([gltype], [$1],
-    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
+    [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
 ])
 
 dnl gl_STDINT_INCLUDES
@@ -462,14 +458,6 @@
   fi
   gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
     [gl_STDINT_INCLUDES])
-
-  dnl If wint_t is smaller than 'int', it cannot satisfy the ISO C 99
-  dnl requirement that wint_t is "unchanged by default argument promotions".
-  dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t.
-  dnl Set the variable BITSIZEOF_WINT_T accordingly.
-  if test $BITSIZEOF_WINT_T -lt 32; then
-    BITSIZEOF_WINT_T=32
-  fi
 ])
 
 dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/stdio_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdio_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/stdio_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdio_h.m4	2010-05-17 19:56:13.000000000 +0000
@@ -1,5 +1,5 @@
-# stdio_h.m4 serial 43
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# stdio_h.m4 serial 31
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,32 +7,9 @@
 AC_DEFUN([gl_STDIO_H],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  gl_NEXT_HEADERS([stdio.h])
-
-  dnl No need to create extra modules for these functions. Everyone who uses
-  dnl <stdio.h> likely needs them.
-  GNULIB_FSCANF=1
-  gl_MODULE_INDICATOR([fscanf])
-  GNULIB_SCANF=1
-  gl_MODULE_INDICATOR([scanf])
-  GNULIB_FGETC=1
-  GNULIB_GETC=1
-  GNULIB_GETCHAR=1
-  GNULIB_FGETS=1
-  GNULIB_FREAD=1
-  dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
-  dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-  dnl also an optimization, to avoid performing a configure check whose result
-  dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING
-  dnl or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_STDIO_READ_FUNCS=1
-      AC_LIBOBJ([stdio-read])
-    fi
-  ])
-
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
+  gl_CHECK_NEXT_HEADERS([stdio.h])
   dnl No need to create extra modules for these functions. Everyone who uses
   dnl <stdio.h> likely needs them.
   GNULIB_FPRINTF=1
@@ -45,11 +22,9 @@
   GNULIB_FPUTS=1
   GNULIB_PUTS=1
   GNULIB_FWRITE=1
-  dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c"
-  dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-  dnl also an optimization, to avoid performing a configure check whose result
-  dnl is not used. But it does not make the test of GNULIB_STDIO_H_SIGPIPE or
-  dnl GNULIB_SIGPIPE redundant.
+  dnl This ifdef is just an optimization, to avoid performing a configure
+  dnl check whose result is not used. It does not make the test of
+  dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
   m4_ifdef([gl_SIGNAL_SIGPIPE], [
     gl_SIGNAL_SIGPIPE
     if test $gl_cv_header_signal_h_SIGPIPE != yes; then
@@ -57,25 +32,13 @@
       AC_LIBOBJ([stdio-write])
     fi
   ])
-  dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c"
-  dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-  dnl also an optimization, to avoid performing a configure check whose result
-  dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING
-  dnl or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_STDIO_WRITE_FUNCS=1
-      AC_LIBOBJ([stdio-write])
-    fi
-  ])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
-  dnl guaranteed by both C89 and C11.
+  dnl guaranteed by C89.
   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
-    ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
-    renameat snprintf tmpfile vdprintf vsnprintf])
+    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
+    snprintf tmpfile vdprintf vsnprintf])
 ])
 
 AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
@@ -91,31 +54,23 @@
 [
   GNULIB_DPRINTF=0;              AC_SUBST([GNULIB_DPRINTF])
   GNULIB_FCLOSE=0;               AC_SUBST([GNULIB_FCLOSE])
-  GNULIB_FDOPEN=0;               AC_SUBST([GNULIB_FDOPEN])
   GNULIB_FFLUSH=0;               AC_SUBST([GNULIB_FFLUSH])
-  GNULIB_FGETC=0;                AC_SUBST([GNULIB_FGETC])
-  GNULIB_FGETS=0;                AC_SUBST([GNULIB_FGETS])
   GNULIB_FOPEN=0;                AC_SUBST([GNULIB_FOPEN])
   GNULIB_FPRINTF=0;              AC_SUBST([GNULIB_FPRINTF])
   GNULIB_FPRINTF_POSIX=0;        AC_SUBST([GNULIB_FPRINTF_POSIX])
   GNULIB_FPURGE=0;               AC_SUBST([GNULIB_FPURGE])
   GNULIB_FPUTC=0;                AC_SUBST([GNULIB_FPUTC])
   GNULIB_FPUTS=0;                AC_SUBST([GNULIB_FPUTS])
-  GNULIB_FREAD=0;                AC_SUBST([GNULIB_FREAD])
   GNULIB_FREOPEN=0;              AC_SUBST([GNULIB_FREOPEN])
-  GNULIB_FSCANF=0;               AC_SUBST([GNULIB_FSCANF])
   GNULIB_FSEEK=0;                AC_SUBST([GNULIB_FSEEK])
   GNULIB_FSEEKO=0;               AC_SUBST([GNULIB_FSEEKO])
   GNULIB_FTELL=0;                AC_SUBST([GNULIB_FTELL])
   GNULIB_FTELLO=0;               AC_SUBST([GNULIB_FTELLO])
   GNULIB_FWRITE=0;               AC_SUBST([GNULIB_FWRITE])
-  GNULIB_GETC=0;                 AC_SUBST([GNULIB_GETC])
-  GNULIB_GETCHAR=0;              AC_SUBST([GNULIB_GETCHAR])
   GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
   GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
   GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
   GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
-  GNULIB_PCLOSE=0;               AC_SUBST([GNULIB_PCLOSE])
   GNULIB_PERROR=0;               AC_SUBST([GNULIB_PERROR])
   GNULIB_POPEN=0;                AC_SUBST([GNULIB_POPEN])
   GNULIB_PRINTF=0;               AC_SUBST([GNULIB_PRINTF])
@@ -126,15 +81,11 @@
   GNULIB_REMOVE=0;               AC_SUBST([GNULIB_REMOVE])
   GNULIB_RENAME=0;               AC_SUBST([GNULIB_RENAME])
   GNULIB_RENAMEAT=0;             AC_SUBST([GNULIB_RENAMEAT])
-  GNULIB_SCANF=0;                AC_SUBST([GNULIB_SCANF])
   GNULIB_SNPRINTF=0;             AC_SUBST([GNULIB_SNPRINTF])
   GNULIB_SPRINTF_POSIX=0;        AC_SUBST([GNULIB_SPRINTF_POSIX])
-  GNULIB_STDIO_H_NONBLOCKING=0;  AC_SUBST([GNULIB_STDIO_H_NONBLOCKING])
   GNULIB_STDIO_H_SIGPIPE=0;      AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
   GNULIB_TMPFILE=0;              AC_SUBST([GNULIB_TMPFILE])
   GNULIB_VASPRINTF=0;            AC_SUBST([GNULIB_VASPRINTF])
-  GNULIB_VFSCANF=0;              AC_SUBST([GNULIB_VFSCANF])
-  GNULIB_VSCANF=0;               AC_SUBST([GNULIB_VSCANF])
   GNULIB_VDPRINTF=0;             AC_SUBST([GNULIB_VDPRINTF])
   GNULIB_VFPRINTF=0;             AC_SUBST([GNULIB_VFPRINTF])
   GNULIB_VFPRINTF_POSIX=0;       AC_SUBST([GNULIB_VFPRINTF_POSIX])
@@ -144,8 +95,6 @@
   GNULIB_VSPRINTF_POSIX=0;       AC_SUBST([GNULIB_VSPRINTF_POSIX])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
-  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
-  HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
   HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
   HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
   HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
@@ -154,14 +103,11 @@
   HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
   HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
   HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
-  HAVE_PCLOSE=1;                 AC_SUBST([HAVE_PCLOSE])
-  HAVE_POPEN=1;                  AC_SUBST([HAVE_POPEN])
   HAVE_RENAMEAT=1;               AC_SUBST([HAVE_RENAMEAT])
   HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
   HAVE_VDPRINTF=1;               AC_SUBST([HAVE_VDPRINTF])
   REPLACE_DPRINTF=0;             AC_SUBST([REPLACE_DPRINTF])
   REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
-  REPLACE_FDOPEN=0;              AC_SUBST([REPLACE_FDOPEN])
   REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
   REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
   REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
@@ -182,7 +128,6 @@
   REPLACE_RENAMEAT=0;            AC_SUBST([REPLACE_RENAMEAT])
   REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
   REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
-  REPLACE_STDIO_READ_FUNCS=0;    AC_SUBST([REPLACE_STDIO_READ_FUNCS])
   REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
   REPLACE_TMPFILE=0;             AC_SUBST([REPLACE_TMPFILE])
   REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
@@ -192,3 +137,23 @@
   REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
   REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
 ])
+
+dnl Code shared by fseeko and ftello.  Determine if large files are supported,
+dnl but stdin does not start as a large file by default.
+AC_DEFUN([gl_STDIN_LARGE_OFFSET],
+  [
+    AC_CACHE_CHECK([whether stdin defaults to large file offsets],
+      [gl_cv_var_stdin_large_offset],
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
+[[#if defined __SL64 && defined __SCLE /* cygwin */
+  /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making
+     fseeko/ftello needlessly fail.  This bug was fixed in 1.5.25, and
+     it is easier to do a version check than building a runtime test.  */
+# include <cygwin/version.h>
+# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)
+  choke me
+# endif
+#endif]])],
+        [gl_cv_var_stdin_large_offset=yes],
+        [gl_cv_var_stdin_large_offset=no])])
+])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/stdlib_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdlib_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/stdlib_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/stdlib_h.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,5 +1,5 @@
-# stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# stdlib_h.m4 serial 28
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,21 @@
 AC_DEFUN([gl_STDLIB_H],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  gl_NEXT_HEADERS([stdlib.h])
+  gl_CHECK_NEXT_HEADERS([stdlib.h])
+  AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
+  if test $ac_cv_header_random_h = yes; then
+    HAVE_RANDOM_H=1
+  else
+    HAVE_RANDOM_H=0
+  fi
+  AC_SUBST([HAVE_RANDOM_H])
+  AC_CHECK_TYPES([struct random_data],
+    [], [HAVE_STRUCT_RANDOM_DATA=0],
+    [[#include <stdlib.h>
+      #if HAVE_RANDOM_H
+      # include <random.h>
+      #endif
+    ]])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
@@ -19,11 +33,10 @@
 #if HAVE_RANDOM_H
 # include <random.h>
 #endif
-    ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
-    initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
-    posix_openpt ptsname ptsname_r random random_r realpath rpmatch
-    secure_getenv setenv setstate setstate_r srandom srandom_r
-    strtod strtoll strtoull unlockpt unsetenv])
+    ]], [atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp
+    mkostemp mkostemps mkstemp mkstemps ptsname random_r initstat_r srandom_r
+    setstate_r realpath rpmatch setenv strtod strtoll strtoull unlockpt
+    unsetenv])
 ])
 
 AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
@@ -37,7 +50,6 @@
 
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
-  GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
   GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
   GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
   GNULIB_CANONICALIZE_FILE_NAME=0;  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME])
@@ -45,75 +57,54 @@
   GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
   GNULIB_GRANTPT=0;       AC_SUBST([GNULIB_GRANTPT])
   GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
-  GNULIB_MBTOWC=0;        AC_SUBST([GNULIB_MBTOWC])
   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
   GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
   GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
   GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
-  GNULIB_POSIX_OPENPT=0;  AC_SUBST([GNULIB_POSIX_OPENPT])
   GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
-  GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
-  GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
-  GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
   GNULIB_REALPATH=0;      AC_SUBST([GNULIB_REALPATH])
   GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
-  GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
   GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
   GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
   GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
   GNULIB_STRTOULL=0;      AC_SUBST([GNULIB_STRTOULL])
-  GNULIB_SYSTEM_POSIX=0;  AC_SUBST([GNULIB_SYSTEM_POSIX])
   GNULIB_UNLOCKPT=0;      AC_SUBST([GNULIB_UNLOCKPT])
   GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
-  GNULIB_WCTOMB=0;        AC_SUBST([GNULIB_WCTOMB])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
   HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
+  HAVE_CALLOC_POSIX=1;       AC_SUBST([HAVE_CALLOC_POSIX])
   HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
   HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
   HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
   HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
+  HAVE_MALLOC_POSIX=1;       AC_SUBST([HAVE_MALLOC_POSIX])
   HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
   HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
   HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
   HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
   HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
-  HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
   HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
-  HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
-  HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
-  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
+  HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
-  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
   HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
-  HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
   HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
   HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
   HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
   HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
   HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
-  HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
-  REPLACE_CALLOC=0;          AC_SUBST([REPLACE_CALLOC])
+  HAVE_UNSETENV=1;           AC_SUBST([HAVE_UNSETENV])
   REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
-  REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
-  REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
   REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
-  REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
-  REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
   REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
-  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
-  REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
-  REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
   REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
   REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
   REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
   REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
-  REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/strerror.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/strerror.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/strerror.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/strerror.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,96 +1,68 @@
-# strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc.
+# strerror.m4 serial 9
+dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRERROR],
 [
+  AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
+  if test $REPLACE_STRERROR = 1; then
+    AC_LIBOBJ([strerror])
+    AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
+      [Define this to 1 if strerror is broken.])
+  fi
+])
+
+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
+[
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
-    AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS])
-  ])
-  if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
+  if test -z "$ERRNO_H"; then
     AC_CACHE_CHECK([for working strerror function],
      [gl_cv_func_working_strerror],
      [AC_RUN_IFELSE(
         [AC_LANG_PROGRAM(
            [[#include <string.h>
            ]],
-           [[if (!*strerror (-2)) return 1;]])],
+           [[return !*strerror (-2);]])],
         [gl_cv_func_working_strerror=yes],
         [gl_cv_func_working_strerror=no],
-        [case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_working_strerror="guessing no" ;;
-         esac
-        ])
-    ])
-    case "$gl_cv_func_working_strerror" in
-      *yes) ;;
-      *)
-        dnl The system's strerror() fails to return a string for out-of-range
-        dnl integers. Replace it.
-        REPLACE_STRERROR=1
-        ;;
-    esac
-    m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
-      dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's
-      dnl buffer, we must replace strerror.
-      case "$gl_cv_func_strerror_r_works" in
-        *no) REPLACE_STRERROR=1 ;;
-      esac
+        [dnl Assume crossbuild works if it compiles.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <string.h>
+              ]],
+              [[return !*strerror (-2);]])],
+           [gl_cv_func_working_strerror=yes],
+           [gl_cv_func_working_strerror=no])
+      ])
     ])
+    if test $gl_cv_func_working_strerror = no; then
+      dnl The system's strerror() fails to return a string for out-of-range
+      dnl integers. Replace it.
+      REPLACE_STRERROR=1
+    fi
   else
     dnl The system's strerror() cannot know about the new errno values we add
-    dnl to <errno.h>, or any fix for strerror(0). Replace it.
+    dnl to <errno.h>. Replace it.
     REPLACE_STRERROR=1
   fi
+  if test $REPLACE_STRERROR = 1; then
+    gl_PREREQ_STRERROR
+  fi
 ])
 
-dnl Detect if strerror(0) passes (that is, does not set errno, and does not
-dnl return a string that matches strerror(-1)).
-AC_DEFUN([gl_FUNC_STRERROR_0],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  REPLACE_STRERROR_0=0
-  AC_CACHE_CHECK([whether strerror(0) succeeds],
-   [gl_cv_func_strerror_0_works],
-   [AC_RUN_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[#include <string.h>
-           #include <errno.h>
-         ]],
-         [[int result = 0;
-           char *str;
-           errno = 0;
-           str = strerror (0);
-           if (!*str) result |= 1;
-           if (errno) result |= 2;
-           if (strstr (str, "nknown") || strstr (str, "ndefined"))
-             result |= 4;
-           return result;]])],
-      [gl_cv_func_strerror_0_works=yes],
-      [gl_cv_func_strerror_0_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_strerror_0_works="guessing no" ;;
-       esac
-      ])
-  ])
-  case "$gl_cv_func_strerror_0_works" in
-    *yes) ;;
-    *)
-      REPLACE_STRERROR_0=1
-      AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
-        does not return a message implying success.])
-      ;;
-  esac
+# Prerequisites of lib/strerror.c.
+AC_DEFUN([gl_PREREQ_STRERROR], [
+  AC_CHECK_DECLS([strerror])
+  AC_CHECK_HEADERS_ONCE([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h != yes; then
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([winsock2.h])
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/string_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/string_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/string_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/string_h.m4	2010-04-25 09:20:43.000000000 +0000
@@ -1,11 +1,11 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 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.
 
-# serial 21
+# serial 17
 
 # Written by Paul Eggert.
 
@@ -20,16 +20,16 @@
 [
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  gl_NEXT_HEADERS([string.h])
+  gl_CHECK_NEXT_HEADERS([string.h])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
   dnl guaranteed by C89.
   gl_WARN_ON_USE_PREPARE([[#include <string.h>
     ]],
-    [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul
-     strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
-     strerror_r strsignal strverscmp])
+    [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup
+     strncat strndup strnlen strpbrk strsep strcasestr strtok_r strsignal
+     strverscmp])
 ])
 
 AC_DEFUN([gl_STRING_MODULE_INDICATOR],
@@ -43,8 +43,6 @@
 
 AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
 [
-  GNULIB_FFSL=0;        AC_SUBST([GNULIB_FFSL])
-  GNULIB_FFSLL=0;       AC_SUBST([GNULIB_FFSLL])
   GNULIB_MEMCHR=0;      AC_SUBST([GNULIB_MEMCHR])
   GNULIB_MEMMEM=0;      AC_SUBST([GNULIB_MEMMEM])
   GNULIB_MEMPCPY=0;     AC_SUBST([GNULIB_MEMPCPY])
@@ -77,13 +75,10 @@
   GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
   GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
   GNULIB_STRERROR=0;    AC_SUBST([GNULIB_STRERROR])
-  GNULIB_STRERROR_R=0;  AC_SUBST([GNULIB_STRERROR_R])
   GNULIB_STRSIGNAL=0;   AC_SUBST([GNULIB_STRSIGNAL])
   GNULIB_STRVERSCMP=0;  AC_SUBST([GNULIB_STRVERSCMP])
   HAVE_MBSLEN=0;        AC_SUBST([HAVE_MBSLEN])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_FFSL=1;                  AC_SUBST([HAVE_FFSL])
-  HAVE_FFSLL=1;                 AC_SUBST([HAVE_FFSLL])
   HAVE_MEMCHR=1;                AC_SUBST([HAVE_MEMCHR])
   HAVE_DECL_MEMMEM=1;           AC_SUBST([HAVE_DECL_MEMMEM])
   HAVE_MEMPCPY=1;               AC_SUBST([HAVE_MEMPCPY])
@@ -99,7 +94,6 @@
   HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
   HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
   HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
-  HAVE_DECL_STRERROR_R=1;       AC_SUBST([HAVE_DECL_STRERROR_R])
   HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
   HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
   REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
@@ -108,9 +102,7 @@
   REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
   REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
   REPLACE_STRCASESTR=0;         AC_SUBST([REPLACE_STRCASESTR])
-  REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
   REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
-  REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
   REPLACE_STRNCAT=0;            AC_SUBST([REPLACE_STRNCAT])
   REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
   REPLACE_STRNLEN=0;            AC_SUBST([REPLACE_STRNLEN])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/strnlen.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/strnlen.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/strnlen.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/strnlen.m4	2010-05-09 01:36:17.000000000 +0000
@@ -1,5 +1,5 @@
-# strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
+# strnlen.m4 serial 12
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 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,
@@ -16,14 +16,16 @@
   if test $ac_cv_have_decl_strnlen = no; then
     HAVE_DECL_STRNLEN=0
   else
-    m4_pushdef([AC_LIBOBJ], [:])
-    dnl Note: AC_FUNC_STRNLEN does AC_LIBOBJ([strnlen]).
     AC_FUNC_STRNLEN
-    m4_popdef([AC_LIBOBJ])
+    dnl Note: AC_FUNC_STRNLEN does AC_LIBOBJ([strnlen]).
     if test $ac_cv_func_strnlen_working = no; then
       REPLACE_STRNLEN=1
     fi
   fi
+  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
+    AC_LIBOBJ([strnlen])
+    gl_PREREQ_STRNLEN
+  fi
 ])
 
 # Prerequisites of lib/strnlen.c.
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/strtol.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/strtol.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/strtol.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/strtol.m4	2010-02-16 21:31:30.000000000 +0000
@@ -0,0 +1,10 @@
+# strtol.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_STRTOL],
+[
+  AC_REPLACE_FUNCS([strtol])
+])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/strtoul.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/strtoul.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/strtoul.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/strtoul.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,10 +1,10 @@
-# strtoul.m4 serial 5
-dnl Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+# strtoul.m4 serial 4
+dnl Copyright (C) 2002, 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOUL],
 [
-  AC_CHECK_FUNCS([strtoul])
+  AC_REPLACE_FUNCS([strtoul])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/sys_socket_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_socket_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/sys_socket_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_socket_h.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-# sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 From Simon Josefsson.
-
-AC_DEFUN([gl_HEADER_SYS_SOCKET],
-[
-  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
-  dnl old-style declarations (with return type 'int' instead of 'ssize_t')
-  dnl unless _POSIX_PII_SOCKET is defined.
-  case "$host_os" in
-    osf*)
-      AC_DEFINE([_POSIX_PII_SOCKET], [1],
-        [Define to 1 in order to get the POSIX compatible declarations
-         of socket functions.])
-      ;;
-  esac
-
-  AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
-    [gl_cv_header_sys_socket_h_selfcontained],
-    [
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[]])],
-        [gl_cv_header_sys_socket_h_selfcontained=yes],
-        [gl_cv_header_sys_socket_h_selfcontained=no])
-    ])
-  if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
-    dnl If the shutdown function exists, <sys/socket.h> should define
-    dnl SHUT_RD, SHUT_WR, SHUT_RDWR.
-    AC_CHECK_FUNCS([shutdown])
-    if test $ac_cv_func_shutdown = yes; then
-      AC_CACHE_CHECK([whether <sys/socket.h> defines the SHUT_* macros],
-        [gl_cv_header_sys_socket_h_shut],
-        [
-          AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM([[#include <sys/socket.h>]],
-               [[int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };]])],
-            [gl_cv_header_sys_socket_h_shut=yes],
-            [gl_cv_header_sys_socket_h_shut=no])
-        ])
-      if test $gl_cv_header_sys_socket_h_shut = no; then
-        SYS_SOCKET_H='sys/socket.h'
-      fi
-    fi
-  fi
-  # We need to check for ws2tcpip.h now.
-  gl_PREREQ_SYS_H_SOCKET
-  AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
-  /* sys/types.h is not needed according to POSIX, but the
-     sys/socket.h in i386-unknown-freebsd4.10 and
-     powerpc-apple-darwin5.5 required it. */
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-])
-  if test $ac_cv_type_struct_sockaddr_storage = no; then
-    HAVE_STRUCT_SOCKADDR_STORAGE=0
-  fi
-  if test $ac_cv_type_sa_family_t = no; then
-    HAVE_SA_FAMILY_T=0
-  fi
-  if test $ac_cv_type_struct_sockaddr_storage != no; then
-    AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
-      [],
-      [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0],
-      [#include <sys/types.h>
-       #ifdef HAVE_SYS_SOCKET_H
-       #include <sys/socket.h>
-       #endif
-       #ifdef HAVE_WS2TCPIP_H
-       #include <ws2tcpip.h>
-       #endif
-      ])
-  fi
-  if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
-     || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
-    SYS_SOCKET_H='sys/socket.h'
-  fi
-  gl_PREREQ_SYS_H_WINSOCK2
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-/* Some systems require prerequisite headers.  */
-#include <sys/types.h>
-#include <sys/socket.h>
-    ]], [socket connect accept bind getpeername getsockname getsockopt
-    listen recv send recvfrom sendto setsockopt shutdown accept4])
-])
-
-AC_DEFUN([gl_PREREQ_SYS_H_SOCKET],
-[
-  dnl Check prerequisites of the <sys/socket.h> replacement.
-  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
-  gl_CHECK_NEXT_HEADERS([sys/socket.h])
-  if test $ac_cv_header_sys_socket_h = yes; then
-    HAVE_SYS_SOCKET_H=1
-    HAVE_WS2TCPIP_H=0
-  else
-    HAVE_SYS_SOCKET_H=0
-    if test $ac_cv_header_ws2tcpip_h = yes; then
-      HAVE_WS2TCPIP_H=1
-    else
-      HAVE_WS2TCPIP_H=0
-    fi
-  fi
-  AC_SUBST([HAVE_SYS_SOCKET_H])
-  AC_SUBST([HAVE_WS2TCPIP_H])
-])
-
-# Common prerequisites of the <sys/socket.h> replacement and of the
-# <sys/select.h> replacement.
-# Sets and substitutes HAVE_WINSOCK2_H.
-AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2],
-[
-  m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
-  m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
-  AC_CHECK_HEADERS_ONCE([sys/socket.h])
-  if test $ac_cv_header_sys_socket_h != yes; then
-    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
-    dnl the check for those headers unconditional; yet cygwin reports
-    dnl that the headers are present but cannot be compiled (since on
-    dnl cygwin, all socket information should come from sys/socket.h).
-    AC_CHECK_HEADERS([winsock2.h])
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-  AC_SUBST([HAVE_WINSOCK2_H])
-])
-
-AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS],
-[
-  GNULIB_SOCKET=0;      AC_SUBST([GNULIB_SOCKET])
-  GNULIB_CONNECT=0;     AC_SUBST([GNULIB_CONNECT])
-  GNULIB_ACCEPT=0;      AC_SUBST([GNULIB_ACCEPT])
-  GNULIB_BIND=0;        AC_SUBST([GNULIB_BIND])
-  GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME])
-  GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME])
-  GNULIB_GETSOCKOPT=0;  AC_SUBST([GNULIB_GETSOCKOPT])
-  GNULIB_LISTEN=0;      AC_SUBST([GNULIB_LISTEN])
-  GNULIB_RECV=0;        AC_SUBST([GNULIB_RECV])
-  GNULIB_SEND=0;        AC_SUBST([GNULIB_SEND])
-  GNULIB_RECVFROM=0;    AC_SUBST([GNULIB_RECVFROM])
-  GNULIB_SENDTO=0;      AC_SUBST([GNULIB_SENDTO])
-  GNULIB_SETSOCKOPT=0;  AC_SUBST([GNULIB_SETSOCKOPT])
-  GNULIB_SHUTDOWN=0;    AC_SUBST([GNULIB_SHUTDOWN])
-  GNULIB_ACCEPT4=0;     AC_SUBST([GNULIB_ACCEPT4])
-  HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
-  HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
-                        AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
-  HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
-  HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/sys_stat_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_stat_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/sys_stat_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_stat_h.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
-# sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# sys_stat_h.m4 serial 24   -*- Autoconf -*-
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,27 +11,14 @@
 [
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
 
+  dnl For the mkdir substitute.
+  AC_REQUIRE([AC_C_INLINE])
+
   dnl Check for broken stat macros.
   AC_REQUIRE([AC_HEADER_STAT])
 
   gl_CHECK_NEXT_HEADERS([sys/stat.h])
 
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  dnl Whether to override 'struct stat'.
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_ST_SIZE=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_ST_SIZE])
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-    AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1],
-      [Define to 1 if Gnulib overrides 'struct stat' on Windows so that
-       struct stat.st_size becomes 64-bit.])
-  fi
-
   dnl Define types that are supposed to be defined in <sys/types.h> or
   dnl <sys/stat.h>.
   AC_CHECK_TYPE([nlink_t], [],
@@ -43,7 +30,7 @@
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h>
-    ]], [fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat
+    ]], [fchmodat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat
     mknod mknodat stat utimensat])
 ]) # gl_HEADER_SYS_STAT_H
 
@@ -60,7 +47,6 @@
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
   GNULIB_FCHMODAT=0;    AC_SUBST([GNULIB_FCHMODAT])
-  GNULIB_FSTAT=0;       AC_SUBST([GNULIB_FSTAT])
   GNULIB_FSTATAT=0;     AC_SUBST([GNULIB_FSTATAT])
   GNULIB_FUTIMENS=0;    AC_SUBST([GNULIB_FUTIMENS])
   GNULIB_LCHMOD=0;      AC_SUBST([GNULIB_LCHMOD])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/sys_time_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_time_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/sys_time_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_time_h.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-# Configure a replacement for <sys/time.h>.
-# serial 8
-
-# Copyright (C) 2007, 2009-2014 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 and Martin Lambers.
-
-AC_DEFUN([gl_HEADER_SYS_TIME_H],
-[
-  dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
-  dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
-  dnl statements that occur in other macros.
-  AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY])
-])
-
-AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
-[
-  AC_REQUIRE([AC_C_RESTRICT])
-  AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
-  AC_CHECK_HEADERS_ONCE([sys/time.h])
-  gl_CHECK_NEXT_HEADERS([sys/time.h])
-
-  if test $ac_cv_header_sys_time_h != yes; then
-    HAVE_SYS_TIME_H=0
-  fi
-
-  dnl On native Windows with MSVC, 'struct timeval' is defined in <winsock2.h>
-  dnl only. So include that header in the list.
-  gl_PREREQ_SYS_H_WINSOCK2
-  AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#if HAVE_SYS_TIME_H
-             #include <sys/time.h>
-            #endif
-            #include <time.h>
-            #if HAVE_WINSOCK2_H
-            # include <winsock2.h>
-            #endif
-          ]],
-          [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
-       [gl_cv_sys_struct_timeval=yes],
-       [gl_cv_sys_struct_timeval=no])
-    ])
-  if test $gl_cv_sys_struct_timeval != yes; then
-    HAVE_STRUCT_TIMEVAL=0
-  else
-    dnl On native Windows with a 64-bit 'time_t', 'struct timeval' is defined
-    dnl (in <sys/time.h> and <winsock2.h> for mingw64, in <winsock2.h> only
-    dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is
-    dnl smaller than the 'time_t' type mandated by POSIX.
-    dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but
-    dnl that is good enough.
-    AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member],
-      [gl_cv_sys_struct_timeval_tv_sec],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#if HAVE_SYS_TIME_H
-               #include <sys/time.h>
-              #endif
-              #include <time.h>
-              #if HAVE_WINSOCK2_H
-              # include <winsock2.h>
-              #endif
-            ]],
-            [[static struct timeval x;
-              typedef int verify_tv_sec_type[
-                sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
-              ];
-            ]])],
-         [gl_cv_sys_struct_timeval_tv_sec=yes],
-         [gl_cv_sys_struct_timeval_tv_sec=no])
-      ])
-    if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
-      REPLACE_STRUCT_TIMEVAL=1
-    fi
-  fi
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-#if HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#include <time.h>
-    ]], [gettimeofday])
-])
-
-AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],
-[
-  GNULIB_GETTIMEOFDAY=0;     AC_SUBST([GNULIB_GETTIMEOFDAY])
-  dnl Assume POSIX behavior unless another module says otherwise.
-  HAVE_GETTIMEOFDAY=1;       AC_SUBST([HAVE_GETTIMEOFDAY])
-  HAVE_STRUCT_TIMEVAL=1;     AC_SUBST([HAVE_STRUCT_TIMEVAL])
-  HAVE_SYS_TIME_H=1;         AC_SUBST([HAVE_SYS_TIME_H])
-  REPLACE_GETTIMEOFDAY=0;    AC_SUBST([REPLACE_GETTIMEOFDAY])
-  REPLACE_STRUCT_TIMEVAL=0;  AC_SUBST([REPLACE_STRUCT_TIMEVAL])
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/sys_types_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_types_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/sys_types_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/sys_types_h.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN_ONCE([gl_SYS_TYPES_H],
-[
-  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
-  gl_NEXT_HEADERS([sys/types.h])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  dnl Whether to override the 'off_t' type.
-  AC_REQUIRE([gl_TYPE_OFF_T])
-])
-
-AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
-[
-])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/time_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/time_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/time_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/time_h.m4	2010-06-03 21:35:16.000000000 +0000
@@ -1,8 +1,8 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
-# serial 8
+# serial 2
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,11 +21,11 @@
 [
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
-  gl_NEXT_HEADERS([time.h])
+  gl_CHECK_NEXT_HEADERS([time.h])
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
 ])
 
-dnl Check whether 'struct timespec' is declared
+dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
 dnl in time.h, sys/time.h, or pthread.h.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
@@ -95,7 +95,7 @@
   GNULIB_TIMEGM=0;                       AC_SUBST([GNULIB_TIMEGM])
   GNULIB_TIME_R=0;                       AC_SUBST([GNULIB_TIME_R])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
+  HAVE_LOCALTIME_R=1;                    AC_SUBST([HAVE_LOCALTIME_R])
   HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
   HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
   HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
@@ -106,13 +106,4 @@
   REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
   REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
-
-  dnl Hack so that the time module doesn't depend on the sys_time module.
-  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
-  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
-  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
-  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
-  dnl is no longer a big deal.
-  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
-  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/unistd_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/unistd_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/unistd_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/unistd_h.m4	2010-05-09 01:36:17.000000000 +0000
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 67
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# unistd_h.m4 serial 46
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,8 +11,11 @@
   dnl Use AC_REQUIRE here, so that the default behavior below is expanded
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([AC_C_INLINE])
 
   gl_CHECK_NEXT_HEADERS([unistd.h])
+
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   if test $ac_cv_header_unistd_h = yes; then
     HAVE_UNISTD_H=1
   else
@@ -20,20 +23,11 @@
   fi
   AC_SUBST([HAVE_UNISTD_H])
 
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Determine WINDOWS_64_BIT_OFF_T.
-  AC_REQUIRE([gl_TYPE_OFF_T])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+  gl_WARN_ON_USE_PREPARE([[#include <unistd.h>
 /* Some systems declare various items in the wrong headers.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#ifndef __GLIBC__
 # include <fcntl.h>
 # include <stdio.h>
 # include <stdlib.h>
@@ -41,13 +35,12 @@
 #  include <io.h>
 # endif
 #endif
-    ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
-    fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
-    gethostname getlogin getlogin_r getpagesize
-    getusershell setusershell endusershell
-    group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
-    readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r
-    unlink unlinkat usleep])
+    ]], [chown dup2 dup3 environ euidaccess faccessat fchdir fchownat
+    fsync ftruncate getcwd getdomainname getdtablesize getgroups
+    gethostname getlogin getlogin_r getpagesize getusershell setusershell
+    endusershell lchown link linkat lseek pipe2 pread pwrite readlink
+    readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat
+    usleep])
 ])
 
 AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -61,54 +54,46 @@
 
 AC_DEFUN([gl_UNISTD_H_DEFAULTS],
 [
-  GNULIB_CHDIR=0;                AC_SUBST([GNULIB_CHDIR])
-  GNULIB_CHOWN=0;                AC_SUBST([GNULIB_CHOWN])
-  GNULIB_CLOSE=0;                AC_SUBST([GNULIB_CLOSE])
-  GNULIB_DUP=0;                  AC_SUBST([GNULIB_DUP])
-  GNULIB_DUP2=0;                 AC_SUBST([GNULIB_DUP2])
-  GNULIB_DUP3=0;                 AC_SUBST([GNULIB_DUP3])
-  GNULIB_ENVIRON=0;              AC_SUBST([GNULIB_ENVIRON])
-  GNULIB_EUIDACCESS=0;           AC_SUBST([GNULIB_EUIDACCESS])
-  GNULIB_FACCESSAT=0;            AC_SUBST([GNULIB_FACCESSAT])
-  GNULIB_FCHDIR=0;               AC_SUBST([GNULIB_FCHDIR])
-  GNULIB_FCHOWNAT=0;             AC_SUBST([GNULIB_FCHOWNAT])
-  GNULIB_FDATASYNC=0;            AC_SUBST([GNULIB_FDATASYNC])
-  GNULIB_FSYNC=0;                AC_SUBST([GNULIB_FSYNC])
-  GNULIB_FTRUNCATE=0;            AC_SUBST([GNULIB_FTRUNCATE])
-  GNULIB_GETCWD=0;               AC_SUBST([GNULIB_GETCWD])
-  GNULIB_GETDOMAINNAME=0;        AC_SUBST([GNULIB_GETDOMAINNAME])
-  GNULIB_GETDTABLESIZE=0;        AC_SUBST([GNULIB_GETDTABLESIZE])
-  GNULIB_GETGROUPS=0;            AC_SUBST([GNULIB_GETGROUPS])
-  GNULIB_GETHOSTNAME=0;          AC_SUBST([GNULIB_GETHOSTNAME])
-  GNULIB_GETLOGIN=0;             AC_SUBST([GNULIB_GETLOGIN])
-  GNULIB_GETLOGIN_R=0;           AC_SUBST([GNULIB_GETLOGIN_R])
-  GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
-  GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
-  GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
-  GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
-  GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
-  GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
-  GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
-  GNULIB_LSEEK=0;                AC_SUBST([GNULIB_LSEEK])
-  GNULIB_PIPE=0;                 AC_SUBST([GNULIB_PIPE])
-  GNULIB_PIPE2=0;                AC_SUBST([GNULIB_PIPE2])
-  GNULIB_PREAD=0;                AC_SUBST([GNULIB_PREAD])
-  GNULIB_PWRITE=0;               AC_SUBST([GNULIB_PWRITE])
-  GNULIB_READ=0;                 AC_SUBST([GNULIB_READ])
-  GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
-  GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
-  GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
-  GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
-  GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
-  GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
-  GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
-  GNULIB_TTYNAME_R=0;            AC_SUBST([GNULIB_TTYNAME_R])
-  GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING])
-  GNULIB_UNISTD_H_SIGPIPE=0;     AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
-  GNULIB_UNLINK=0;               AC_SUBST([GNULIB_UNLINK])
-  GNULIB_UNLINKAT=0;             AC_SUBST([GNULIB_UNLINKAT])
-  GNULIB_USLEEP=0;               AC_SUBST([GNULIB_USLEEP])
-  GNULIB_WRITE=0;                AC_SUBST([GNULIB_WRITE])
+  GNULIB_CHOWN=0;            AC_SUBST([GNULIB_CHOWN])
+  GNULIB_CLOSE=0;            AC_SUBST([GNULIB_CLOSE])
+  GNULIB_DUP2=0;             AC_SUBST([GNULIB_DUP2])
+  GNULIB_DUP3=0;             AC_SUBST([GNULIB_DUP3])
+  GNULIB_ENVIRON=0;          AC_SUBST([GNULIB_ENVIRON])
+  GNULIB_EUIDACCESS=0;       AC_SUBST([GNULIB_EUIDACCESS])
+  GNULIB_FACCESSAT=0;        AC_SUBST([GNULIB_FACCESSAT])
+  GNULIB_FCHDIR=0;           AC_SUBST([GNULIB_FCHDIR])
+  GNULIB_FCHOWNAT=0;         AC_SUBST([GNULIB_FCHOWNAT])
+  GNULIB_FSYNC=0;            AC_SUBST([GNULIB_FSYNC])
+  GNULIB_FTRUNCATE=0;        AC_SUBST([GNULIB_FTRUNCATE])
+  GNULIB_GETCWD=0;           AC_SUBST([GNULIB_GETCWD])
+  GNULIB_GETDOMAINNAME=0;    AC_SUBST([GNULIB_GETDOMAINNAME])
+  GNULIB_GETDTABLESIZE=0;    AC_SUBST([GNULIB_GETDTABLESIZE])
+  GNULIB_GETGROUPS=0;        AC_SUBST([GNULIB_GETGROUPS])
+  GNULIB_GETHOSTNAME=0;      AC_SUBST([GNULIB_GETHOSTNAME])
+  GNULIB_GETLOGIN=0;         AC_SUBST([GNULIB_GETLOGIN])
+  GNULIB_GETLOGIN_R=0;       AC_SUBST([GNULIB_GETLOGIN_R])
+  GNULIB_GETPAGESIZE=0;      AC_SUBST([GNULIB_GETPAGESIZE])
+  GNULIB_GETUSERSHELL=0;     AC_SUBST([GNULIB_GETUSERSHELL])
+  GNULIB_LCHOWN=0;           AC_SUBST([GNULIB_LCHOWN])
+  GNULIB_LINK=0;             AC_SUBST([GNULIB_LINK])
+  GNULIB_LINKAT=0;           AC_SUBST([GNULIB_LINKAT])
+  GNULIB_LSEEK=0;            AC_SUBST([GNULIB_LSEEK])
+  GNULIB_PIPE2=0;            AC_SUBST([GNULIB_PIPE2])
+  GNULIB_PREAD=0;            AC_SUBST([GNULIB_PREAD])
+  GNULIB_PWRITE=0;           AC_SUBST([GNULIB_PWRITE])
+  GNULIB_READLINK=0;         AC_SUBST([GNULIB_READLINK])
+  GNULIB_READLINKAT=0;       AC_SUBST([GNULIB_READLINKAT])
+  GNULIB_RMDIR=0;            AC_SUBST([GNULIB_RMDIR])
+  GNULIB_SLEEP=0;            AC_SUBST([GNULIB_SLEEP])
+  GNULIB_SYMLINK=0;          AC_SUBST([GNULIB_SYMLINK])
+  GNULIB_SYMLINKAT=0;        AC_SUBST([GNULIB_SYMLINKAT])
+  GNULIB_TTYNAME_R=0;        AC_SUBST([GNULIB_TTYNAME_R])
+  GNULIB_UNISTD_H_GETOPT=0;  AC_SUBST([GNULIB_UNISTD_H_GETOPT])
+  GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
+  GNULIB_UNLINK=0;           AC_SUBST([GNULIB_UNLINK])
+  GNULIB_UNLINKAT=0;         AC_SUBST([GNULIB_UNLINKAT])
+  GNULIB_USLEEP=0;           AC_SUBST([GNULIB_USLEEP])
+  GNULIB_WRITE=0;            AC_SUBST([GNULIB_WRITE])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_CHOWN=1;           AC_SUBST([HAVE_CHOWN])
   HAVE_DUP2=1;            AC_SUBST([HAVE_DUP2])
@@ -117,39 +102,32 @@
   HAVE_FACCESSAT=1;       AC_SUBST([HAVE_FACCESSAT])
   HAVE_FCHDIR=1;          AC_SUBST([HAVE_FCHDIR])
   HAVE_FCHOWNAT=1;        AC_SUBST([HAVE_FCHOWNAT])
-  HAVE_FDATASYNC=1;       AC_SUBST([HAVE_FDATASYNC])
   HAVE_FSYNC=1;           AC_SUBST([HAVE_FSYNC])
   HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
+  HAVE_GETDOMAINNAME=1;   AC_SUBST([HAVE_GETDOMAINNAME])
   HAVE_GETDTABLESIZE=1;   AC_SUBST([HAVE_GETDTABLESIZE])
   HAVE_GETGROUPS=1;       AC_SUBST([HAVE_GETGROUPS])
   HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
   HAVE_GETLOGIN=1;        AC_SUBST([HAVE_GETLOGIN])
   HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
-  HAVE_GROUP_MEMBER=1;    AC_SUBST([HAVE_GROUP_MEMBER])
   HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
   HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
   HAVE_LINKAT=1;          AC_SUBST([HAVE_LINKAT])
-  HAVE_PIPE=1;            AC_SUBST([HAVE_PIPE])
   HAVE_PIPE2=1;           AC_SUBST([HAVE_PIPE2])
   HAVE_PREAD=1;           AC_SUBST([HAVE_PREAD])
   HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
   HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
-  HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
   HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
   HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
+  HAVE_TTYNAME_R=1;       AC_SUBST([HAVE_TTYNAME_R])
   HAVE_UNLINKAT=1;        AC_SUBST([HAVE_UNLINKAT])
   HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
   HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
-  HAVE_DECL_FCHDIR=1;     AC_SUBST([HAVE_DECL_FCHDIR])
-  HAVE_DECL_FDATASYNC=1;  AC_SUBST([HAVE_DECL_FDATASYNC])
-  HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME])
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
   HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
-  HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
-  HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
   REPLACE_CHOWN=0;        AC_SUBST([REPLACE_CHOWN])
@@ -157,21 +135,15 @@
   REPLACE_DUP=0;          AC_SUBST([REPLACE_DUP])
   REPLACE_DUP2=0;         AC_SUBST([REPLACE_DUP2])
   REPLACE_FCHOWNAT=0;     AC_SUBST([REPLACE_FCHOWNAT])
-  REPLACE_FTRUNCATE=0;    AC_SUBST([REPLACE_FTRUNCATE])
   REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
-  REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
-  REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
-  REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
-  REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
   REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
   REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
   REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
   REPLACE_LSEEK=0;        AC_SUBST([REPLACE_LSEEK])
   REPLACE_PREAD=0;        AC_SUBST([REPLACE_PREAD])
   REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
-  REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
   REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
   REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
   REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/unlocked-io.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/unlocked-io.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/unlocked-io.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/unlocked-io.m4	2010-02-16 21:31:30.000000000 +0000
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/warn-on-use.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/warn-on-use.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/warn-on-use.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/warn-on-use.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,5 +1,5 @@
-# warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# warn-on-use.m4 serial 2
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,8 +18,8 @@
 # some systems declare functions in the wrong header, then INCLUDES
 # should do likewise.
 #
-# It is generally safe to assume declarations for functions declared
-# in the intersection of C89 and C11 (such as printf) without
+# If you assume C89, then it is generally safe to assume declarations
+# for functions declared in that standard (such as gets) without
 # needing gl_WARN_ON_USE_PREPARE.
 AC_DEFUN([gl_WARN_ON_USE_PREPARE],
 [
@@ -27,8 +27,6 @@
     [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
       [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
        undefining macros.])])dnl
-dnl FIXME: gl_Symbol must be used unquoted until we can assume
-dnl autoconf 2.64 or newer.
   for gl_func in m4_flatten([$2]); do
     AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
     AC_CACHE_CHECK([whether $gl_func is declared without a macro],
@@ -37,8 +35,8 @@
 [@%:@undef $gl_func
   (void) $gl_func;])],
         [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
-    AS_VAR_IF(gl_Symbol, [yes],
-      [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
+     AS_VAR_IF(gl_Symbol, [yes],
+       [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
        dnl shortcut - if the raw declaration exists, then set a cache
        dnl variable to allow skipping any later AC_CHECK_DECL efforts
        eval ac_cv_have_decl_$gl_func=yes])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/wchar_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/wchar_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/wchar_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/wchar_h.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,13 +1,13 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Written by Eric Blake.
 
-# wchar_h.m4 serial 39
+# wchar_h.m4 serial 33
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -17,6 +17,7 @@
   dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
   dnl character support).
   dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
+  AC_CHECK_HEADERS_ONCE([wchar.h])
   gl_CHECK_NEXT_HEADERS([wchar.h])
   if test $ac_cv_header_wchar_h = yes; then
     HAVE_WCHAR_H=1
@@ -25,8 +26,6 @@
   fi
   AC_SUBST([HAVE_WCHAR_H])
 
-  AC_REQUIRE([gl_FEATURES_H])
-
   AC_REQUIRE([gt_TYPE_WINT_T])
   if test $gt_cv_c_wint_t = yes; then
     HAVE_WINT_T=1
@@ -38,23 +37,15 @@
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+/* Some systems require additional headers.  */
+#ifndef __GLIBC__
 # include <stddef.h>
 # include <stdio.h>
 # include <time.h>
 #endif
 #include <wchar.h>
-    ]],
-    [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
-     wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset
-     wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp
-     wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr
-     wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth
-    ])
+    ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
+    wcsrtombs wcsnrtombs wcwidth])
 ])
 
 dnl Check whether <wchar.h> is usable at all.
@@ -70,13 +61,6 @@
     [gl_cv_header_wchar_h_correct_inline=yes
      AC_LANG_CONFTEST([
        AC_LANG_SOURCE([[#define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 extern int zero (void);
 int main () { return zero(); }
@@ -85,13 +69,6 @@
        mv conftest.$ac_objext conftest1.$ac_objext
        AC_LANG_CONFTEST([
          AC_LANG_SOURCE([[#define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int zero (void) { return 0; }
 ]])])
@@ -119,6 +96,13 @@
   fi
 ])
 
+dnl Unconditionally enables the replacement of <wchar.h>.
+AC_DEFUN([gl_REPLACE_WCHAR_H],
+[
+  dnl This is a no-op, because <wchar.h> is always overridden.
+  :
+])
+
 AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
@@ -130,45 +114,17 @@
 
 AC_DEFUN([gl_WCHAR_H_DEFAULTS],
 [
-  GNULIB_BTOWC=0;       AC_SUBST([GNULIB_BTOWC])
-  GNULIB_WCTOB=0;       AC_SUBST([GNULIB_WCTOB])
-  GNULIB_MBSINIT=0;     AC_SUBST([GNULIB_MBSINIT])
-  GNULIB_MBRTOWC=0;     AC_SUBST([GNULIB_MBRTOWC])
-  GNULIB_MBRLEN=0;      AC_SUBST([GNULIB_MBRLEN])
-  GNULIB_MBSRTOWCS=0;   AC_SUBST([GNULIB_MBSRTOWCS])
-  GNULIB_MBSNRTOWCS=0;  AC_SUBST([GNULIB_MBSNRTOWCS])
-  GNULIB_WCRTOMB=0;     AC_SUBST([GNULIB_WCRTOMB])
-  GNULIB_WCSRTOMBS=0;   AC_SUBST([GNULIB_WCSRTOMBS])
-  GNULIB_WCSNRTOMBS=0;  AC_SUBST([GNULIB_WCSNRTOMBS])
-  GNULIB_WCWIDTH=0;     AC_SUBST([GNULIB_WCWIDTH])
-  GNULIB_WMEMCHR=0;     AC_SUBST([GNULIB_WMEMCHR])
-  GNULIB_WMEMCMP=0;     AC_SUBST([GNULIB_WMEMCMP])
-  GNULIB_WMEMCPY=0;     AC_SUBST([GNULIB_WMEMCPY])
-  GNULIB_WMEMMOVE=0;    AC_SUBST([GNULIB_WMEMMOVE])
-  GNULIB_WMEMSET=0;     AC_SUBST([GNULIB_WMEMSET])
-  GNULIB_WCSLEN=0;      AC_SUBST([GNULIB_WCSLEN])
-  GNULIB_WCSNLEN=0;     AC_SUBST([GNULIB_WCSNLEN])
-  GNULIB_WCSCPY=0;      AC_SUBST([GNULIB_WCSCPY])
-  GNULIB_WCPCPY=0;      AC_SUBST([GNULIB_WCPCPY])
-  GNULIB_WCSNCPY=0;     AC_SUBST([GNULIB_WCSNCPY])
-  GNULIB_WCPNCPY=0;     AC_SUBST([GNULIB_WCPNCPY])
-  GNULIB_WCSCAT=0;      AC_SUBST([GNULIB_WCSCAT])
-  GNULIB_WCSNCAT=0;     AC_SUBST([GNULIB_WCSNCAT])
-  GNULIB_WCSCMP=0;      AC_SUBST([GNULIB_WCSCMP])
-  GNULIB_WCSNCMP=0;     AC_SUBST([GNULIB_WCSNCMP])
-  GNULIB_WCSCASECMP=0;  AC_SUBST([GNULIB_WCSCASECMP])
-  GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP])
-  GNULIB_WCSCOLL=0;     AC_SUBST([GNULIB_WCSCOLL])
-  GNULIB_WCSXFRM=0;     AC_SUBST([GNULIB_WCSXFRM])
-  GNULIB_WCSDUP=0;      AC_SUBST([GNULIB_WCSDUP])
-  GNULIB_WCSCHR=0;      AC_SUBST([GNULIB_WCSCHR])
-  GNULIB_WCSRCHR=0;     AC_SUBST([GNULIB_WCSRCHR])
-  GNULIB_WCSCSPN=0;     AC_SUBST([GNULIB_WCSCSPN])
-  GNULIB_WCSSPN=0;      AC_SUBST([GNULIB_WCSSPN])
-  GNULIB_WCSPBRK=0;     AC_SUBST([GNULIB_WCSPBRK])
-  GNULIB_WCSSTR=0;      AC_SUBST([GNULIB_WCSSTR])
-  GNULIB_WCSTOK=0;      AC_SUBST([GNULIB_WCSTOK])
-  GNULIB_WCSWIDTH=0;    AC_SUBST([GNULIB_WCSWIDTH])
+  GNULIB_BTOWC=0;      AC_SUBST([GNULIB_BTOWC])
+  GNULIB_WCTOB=0;      AC_SUBST([GNULIB_WCTOB])
+  GNULIB_MBSINIT=0;    AC_SUBST([GNULIB_MBSINIT])
+  GNULIB_MBRTOWC=0;    AC_SUBST([GNULIB_MBRTOWC])
+  GNULIB_MBRLEN=0;     AC_SUBST([GNULIB_MBRLEN])
+  GNULIB_MBSRTOWCS=0;  AC_SUBST([GNULIB_MBSRTOWCS])
+  GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS])
+  GNULIB_WCRTOMB=0;    AC_SUBST([GNULIB_WCRTOMB])
+  GNULIB_WCSRTOMBS=0;  AC_SUBST([GNULIB_WCSRTOMBS])
+  GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS])
+  GNULIB_WCWIDTH=0;    AC_SUBST([GNULIB_WCWIDTH])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
@@ -179,34 +135,6 @@
   HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
   HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
   HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
-  HAVE_WMEMCHR=1;       AC_SUBST([HAVE_WMEMCHR])
-  HAVE_WMEMCMP=1;       AC_SUBST([HAVE_WMEMCMP])
-  HAVE_WMEMCPY=1;       AC_SUBST([HAVE_WMEMCPY])
-  HAVE_WMEMMOVE=1;      AC_SUBST([HAVE_WMEMMOVE])
-  HAVE_WMEMSET=1;       AC_SUBST([HAVE_WMEMSET])
-  HAVE_WCSLEN=1;        AC_SUBST([HAVE_WCSLEN])
-  HAVE_WCSNLEN=1;       AC_SUBST([HAVE_WCSNLEN])
-  HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
-  HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
-  HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
-  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
-  HAVE_WCSCAT=1;        AC_SUBST([HAVE_WCSCAT])
-  HAVE_WCSNCAT=1;       AC_SUBST([HAVE_WCSNCAT])
-  HAVE_WCSCMP=1;        AC_SUBST([HAVE_WCSCMP])
-  HAVE_WCSNCMP=1;       AC_SUBST([HAVE_WCSNCMP])
-  HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
-  HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
-  HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
-  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
-  HAVE_WCSDUP=1;        AC_SUBST([HAVE_WCSDUP])
-  HAVE_WCSCHR=1;        AC_SUBST([HAVE_WCSCHR])
-  HAVE_WCSRCHR=1;       AC_SUBST([HAVE_WCSRCHR])
-  HAVE_WCSCSPN=1;       AC_SUBST([HAVE_WCSCSPN])
-  HAVE_WCSSPN=1;        AC_SUBST([HAVE_WCSSPN])
-  HAVE_WCSPBRK=1;       AC_SUBST([HAVE_WCSPBRK])
-  HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
-  HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
-  HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
   HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
   HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
   REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
@@ -221,5 +149,4 @@
   REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
   REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
   REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
-  REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/wctype_h.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/wctype_h.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/wctype_h.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/wctype_h.m4	2010-03-28 18:31:27.000000000 +0000
@@ -1,8 +1,8 @@
-# wctype_h.m4 serial 18
+# wctype_h.m4 serial 6
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,6 @@
 
 AC_DEFUN([gl_WCTYPE_H],
 [
-  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([iswcntrl])
@@ -21,6 +20,15 @@
     HAVE_ISWCNTRL=0
   fi
   AC_SUBST([HAVE_ISWCNTRL])
+  AC_CHECK_FUNCS_ONCE([iswblank])
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+  else
+    HAVE_ISWBLANK=0
+  fi
+  AC_SUBST([HAVE_ISWBLANK])
+  AC_CHECK_HEADERS_ONCE([wctype.h])
+  AC_REQUIRE([AC_C_INLINE])
 
   AC_REQUIRE([gt_TYPE_WINT_T])
   if test $gt_cv_c_wint_t = yes; then
@@ -30,180 +38,39 @@
   fi
   AC_SUBST([HAVE_WINT_T])
 
-  gl_CHECK_NEXT_HEADERS([wctype.h])
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
       dnl Linux libc5 has an iswprint function that returns 0 for all arguments.
       dnl The other functions are likely broken in the same way.
       AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works],
         [
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
-            ]])],
+          AC_RUN_IFELSE([AC_LANG_SOURCE([[
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }]])],
             [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no],
             [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
                           #if __GNU_LIBRARY__ == 1
                           Linux libc5 i18n is broken.
                           #endif]], [])],
-              [gl_cv_func_iswcntrl_works="guessing yes"],
-              [gl_cv_func_iswcntrl_works="guessing no"])
+              [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
             ])
         ])
     fi
+    gl_CHECK_NEXT_HEADERS([wctype.h])
     HAVE_WCTYPE_H=1
   else
     HAVE_WCTYPE_H=0
   fi
   AC_SUBST([HAVE_WCTYPE_H])
 
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
-  AC_SUBST([REPLACE_ISWCNTRL])
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    dnl Redefine all of iswcntrl, ..., iswxdigit in <wctype.h>.
-    :
-  fi
-
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
   else
-    AC_CHECK_FUNCS([towlower])
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      AC_CHECK_DECLS([towlower],,,
-        [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
-        ]])
-      if test $ac_cv_have_decl_towlower = yes; then
-        dnl On Minix 3.1.8, the system's <wctype.h> declares towlower() and
-        dnl towupper() although it does not have the functions. Avoid a
-        dnl collision with gnulib's replacement.
-        REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
-  AC_SUBST([REPLACE_TOWLOWER])
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-    dnl Redefine towlower, towupper in <wctype.h>.
-    :
-  fi
-
-  dnl We assume that the wctype() and iswctype() functions exist if and only
-  dnl if the type wctype_t is defined in <wchar.h> or in <wctype.h> if that
-  dnl exists.
-  dnl HP-UX 11.00 declares all these in <wchar.h> and lacks <wctype.h>.
-  AC_CACHE_CHECK([for wctype_t], [gl_cv_type_wctype_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
-          ]],
-          [[]])],
-       [gl_cv_type_wctype_t=yes],
-       [gl_cv_type_wctype_t=no])
-    ])
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
+    REPLACE_ISWCNTRL=0
   fi
-
-  dnl We assume that the wctrans() and towctrans() functions exist if and only
-  dnl if the type wctrans_t is defined in <wctype.h>.
-  AC_CACHE_CHECK([for wctrans_t], [gl_cv_type_wctrans_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
-          ]],
-          [[]])],
-       [gl_cv_type_wctrans_t=yes],
-       [gl_cv_type_wctrans_t=no])
-    ])
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
-  fi
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
-    ]],
-    [wctype iswctype wctrans towctrans
-    ])
-])
-
-AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_WCTYPE_H_DEFAULTS],
-[
-  GNULIB_ISWBLANK=0;    AC_SUBST([GNULIB_ISWBLANK])
-  GNULIB_WCTYPE=0;      AC_SUBST([GNULIB_WCTYPE])
-  GNULIB_ISWCTYPE=0;    AC_SUBST([GNULIB_ISWCTYPE])
-  GNULIB_WCTRANS=0;     AC_SUBST([GNULIB_WCTRANS])
-  GNULIB_TOWCTRANS=0;   AC_SUBST([GNULIB_TOWCTRANS])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_ISWBLANK=1;      AC_SUBST([HAVE_ISWBLANK])
-  HAVE_WCTYPE_T=1;      AC_SUBST([HAVE_WCTYPE_T])
-  HAVE_WCTRANS_T=1;     AC_SUBST([HAVE_WCTRANS_T])
-  REPLACE_ISWBLANK=0;   AC_SUBST([REPLACE_ISWBLANK])
+  AC_SUBST([REPLACE_ISWCNTRL])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/gnulib-m4/wcwidth.m4 gettext-0.18.1.1/gettext-runtime/gnulib-m4/wcwidth.m4
--- gettext-0.19.3/gettext-runtime/gnulib-m4/wcwidth.m4	2014-10-16 06:00:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/gnulib-m4/wcwidth.m4	2010-04-25 09:20:44.000000000 +0000
@@ -1,5 +1,5 @@
-# wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# wcwidth.m4 serial 16
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,7 @@
   AC_CHECK_HEADERS_ONCE([wchar.h])
   AC_CHECK_FUNCS_ONCE([wcwidth])
 
-  AC_CHECK_DECLS([wcwidth], [], [], [[
+  AC_CHECK_DECLS([wcwidth], [], [], [
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
 #include <string.h>
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -29,22 +29,19 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-]])
+])
   if test $ac_cv_have_decl_wcwidth != yes; then
     HAVE_DECL_WCWIDTH=0
   fi
 
   if test $ac_cv_func_wcwidth = yes; then
-    HAVE_WCWIDTH=1
-    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 MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
       [
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
 #include <string.h>
@@ -65,26 +62,17 @@
 #endif
 int main ()
 {
-  int result = 0;
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    {
-      if (wcwidth (0x0301) > 0)
-        result |= 1;
-      if (wcwidth (0x05B0) > 0)
-        result |= 2;
-      if (wcwidth (0x200B) > 0)
-        result |= 4;
-    }
-  return result;
-}]])],
-          [gl_cv_func_wcwidth_works=yes],
-          [gl_cv_func_wcwidth_works=no],
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
+}], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
           [
 changequote(,)dnl
            case "$host_os" in
-                     # Guess yes on glibc and AIX 7 systems.
-             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-             *)                  gl_cv_func_wcwidth_works="guessing no";;
+                     # Guess yes on glibc systems.
+             *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)      gl_cv_func_wcwidth_works="guessing no";;
            esac
 changequote([,])dnl
           ])
@@ -93,8 +81,13 @@
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  else
-    HAVE_WCWIDTH=0
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
+    gl_REPLACE_WCHAR_H
   fi
   dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
   dnl have the wcwidth function, then it does not declare it.
diff -Nru gettext-0.19.3/gettext-runtime/INSTALL gettext-0.18.1.1/gettext-runtime/INSTALL
--- gettext-0.19.3/gettext-runtime/INSTALL	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/INSTALL	2010-06-06 12:49:57.000000000 +0000
@@ -4,56 +4,56 @@
 =============
 
    This package depends on a few other packages.  They are listed in
-the file ‘DEPENDENCIES’.  It is recommended to install the listed
+the file `DEPENDENCIES'.  It is recommended to install the listed
 packages before installing this package.
 
 Basic Installation
 ==================
 
-   The ‘configure’ shell script attempts to guess correct values for
+   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a ‘Makefile’ in each directory of the package.
-It may also create one or more ‘.h’ files containing system-dependent
-definitions.  Finally, it creates a shell script ‘config.status’ that
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, a file
-‘config.cache’ that saves the results of its tests to speed up
-reconfiguring, and a file ‘config.log’ containing compiler output
-(useful mainly for debugging ‘configure’).
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
 
    If you need to do unusual things to compile the package, please try
-to figure out how ‘configure’ could check whether to do them, and mail
-diffs or instructions to the address given in the ‘README’ so they can
-be considered for the next release.  If at some point ‘config.cache’
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file ‘configure.ac’ is used to create ‘configure’ by a program
-called ‘autoconf’.  You only need ‘configure.ac’ if you want to change
-it or regenerate ‘configure’ using a newer version of ‘autoconf’.
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
-  1. ‘cd’ to the directory containing the package's source code and type
-     ‘./configure’ to configure the package for your system.  If you're
-     using ‘csh’ on an old version of System V, you might need to type
-     ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-     ‘configure’ itself.
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
 
-     Running ‘configure’ takes awhile.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
-  2. Type ‘make’ to compile the package.
+  2. Type `make' to compile the package.
 
-  3. Optionally, type ‘make check’ to run any self-tests that come with
+  3. Optionally, type `make check' to run any self-tests that come with
      the package.
 
-  4. Type ‘make install’ to install the programs and any data files and
+  4. Type `make install' to install the programs and any data files and
      documentation.
 
   5. You can remove the program binaries and object files from the
-     source code directory by typing ‘make clean’.  To also remove the
-     files that ‘configure’ created (so you can compile the package for
-     a different kind of computer), type ‘make distclean’.  There is
-     also a ‘make maintainer-clean’ target, but that is intended mainly
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
@@ -62,7 +62,7 @@
 =====================
 
    Some systems require unusual options for compilation or linking that
-the ‘configure’ script does not know about.  You can give ‘configure’
+the `configure' script does not know about.  You can give `configure'
 initial values for variables as arguments.  You can do it like this:
      ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
@@ -71,16 +71,16 @@
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of ‘make’ that
-supports the ‘VPATH’ variable, such as GNU ‘make’.  ‘cd’ to the
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
-the ‘configure’ script.  ‘configure’ automatically checks for the
-source code in the directory that ‘configure’ is in and in ‘..’.
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a ‘make’ that does not supports the ‘VPATH’
+   If you have to use a `make' that does not supports the `VPATH'
 variable, you have to compile the package for one architecture at a time
 in the source code directory.  After you have installed the package for
-one architecture, use ‘make distclean’ before reconfiguring for another
+one architecture, use `make distclean' before reconfiguring for another
 architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
@@ -100,25 +100,25 @@
 Installation Names
 ==================
 
-   By default, ‘make install’ will install the package's files in
-‘/usr/local/bin’, ‘/usr/local/man’, etc.  You can specify an
-installation prefix other than ‘/usr/local’ by giving ‘configure’ the
-option ‘--prefix=PATH’.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
+give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like ‘--bindir=PATH’ to specify different values for particular
-kinds of files.  Run ‘configure --help’ for a list of the directories
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving ‘configure’ the
-option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
 Enabling Relocatability
 =======================
@@ -127,12 +127,12 @@
 that packages are not relocatable.  It means a user cannot copy a
 program, installed by another user on the same machine, to his home
 directory, and have it work correctly (including i18n).  So many users
-need to go through ‘configure; make; make install’ with all its
+need to go through `configure; make; make install' with all its
 dependencies, options, and hurdles.
 
    Red Hat, Debian, and similar package systems solve the "ease of
-installation" problem, but they hardwire path names, usually to ‘/usr’
-or ‘/usr/local’.  This means that users need root privileges to install
+installation" problem, but they hardwire path names, usually to `/usr'
+or `/usr/local'.  This means that users need root privileges to install
 a binary package, and prevents installing two different versions of the
 same binary package.
 
@@ -142,24 +142,24 @@
 to do the same thing with a hard link _only_ if the hard link file is
 in the same directory as the real program.
 
-   To configure a program to be relocatable, add ‘--enable-relocatable’
-to the ‘configure’ command line.
+   To configure a program to be relocatable, add `--enable-relocatable'
+to the `configure' command line.
 
    On some OSes the executables remember the location of shared
 libraries and prefer them over any other search path.  Therefore, such
 an executable will look for its shared libraries first in the original
 installation directory and only then in the current installation
-directory.  Thus, for reliability, it is best to also give a ‘--prefix’
+directory.  Thus, for reliability, it is best to also give a `--prefix'
 option pointing to a directory that does not exist now and which never
-will be created, e.g.  ‘--prefix=/nonexistent’.  You may use
-‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
+will be created, e.g.  `--prefix=/nonexistent'.  You may use
+`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into
 that directory.
 
    We do not recommend using a prefix writable by unprivileged users
-(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
+(e.g. `/tmp/inst$$') because such a directory can be recreated by an
 unprivileged user after the original directory has been removed.  We
 also do not recommend prefixes that might be behind an automounter
-(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
+(e.g. `$HOME/inst$$') because of the performance impact of directory
 searching.
 
    Here's a sample installation run that takes into account all these
@@ -169,10 +169,10 @@
      make
      make install DESTDIR=/tmp/inst$$
 
-   Installation with ‘--enable-relocatable’ will not work for setuid or
+   Installation with `--enable-relocatable' will not work for setuid or
 setgid executables, because such executables search only system library
 paths for security reasons.  Also, installation with
-‘--enable-relocatable’ might not work on OpenBSD, when the package
+`--enable-relocatable' might not work on OpenBSD, when the package
 contains shared libraries and libtool versions 1.5.xx are used.
 
    The runtime penalty and size penalty are negligible on GNU/Linux
@@ -183,25 +183,25 @@
 Optional Features
 =================
 
-   Some packages pay attention to ‘--enable-FEATURE’ options to
-‘configure’, where FEATURE indicates an optional part of the package.
-They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
-is something like ‘gnu-as’ or ‘x’ (for the X Window System).  The
-‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, ‘configure’ can usually
+   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the ‘configure’ options ‘--x-includes=DIR’ and
-‘--x-libraries=DIR’ to specify their locations.
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
 
    For packages that use the GNU libiconv library, you can use the
-‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
+`configure' option `--with-libiconv-prefix' to specify the prefix you
 used while installing GNU libiconv.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
    For packages that use the GNU libintl library, you can use the
-‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
+`configure' option `--with-libintl-prefix' to specify the prefix you
 used while installing GNU gettext-runtime.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
@@ -217,7 +217,7 @@
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its ‘<wchar.h>’ header file.  The option ‘-nodtk’ can be used as
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
 to try
 
@@ -246,62 +246,62 @@
 Specifying the System Type
 ==========================
 
-   There may be some features ‘configure’ can not figure out
+   There may be some features `configure' can not figure out
 automatically, but needs to determine by the type of host the package
-will run on.  Usually ‘configure’ can figure that out, but if it prints
+will run on.  Usually `configure' can figure that out, but if it prints
 a message saying it can not guess the host type, give it the
-‘--host=TYPE’ option.  TYPE can either be a short name for the system
-type, such as ‘sun4’, or a canonical name with three fields:
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
      CPU-COMPANY-SYSTEM
 
-See the file ‘config.sub’ for the possible values of each field.  If
-‘config.sub’ isn't included in this package, then this package doesn't
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
 need to know the host type.
 
    If you are building compiler tools for cross-compiling, you can also
-use the ‘--target=TYPE’ option to select the type of system they will
-produce code for and the ‘--build=TYPE’ option to select the type of
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
 system on which you are compiling the package.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for ‘configure’ scripts to share,
-you can create a site shell script called ‘config.site’ that gives
-default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
-‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
-‘PREFIX/etc/config.site’ if it exists.  Or, you can set the
-‘CONFIG_SITE’ environment variable to the location of the site script.
-A warning: not all ‘configure’ scripts look for a site script.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
 
 Operation Controls
 ==================
 
-   ‘configure’ recognizes the following options to control how it
+   `configure' recognizes the following options to control how it
 operates.
 
-‘--cache-file=FILE’
+`--cache-file=FILE'
      Use and save the results of the tests in FILE instead of
-     ‘./config.cache’.  Set FILE to ‘/dev/null’ to disable caching, for
-     debugging ‘configure’.
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
 
-‘--help’
-     Print a summary of the options to ‘configure’, and exit.
+`--help'
+     Print a summary of the options to `configure', and exit.
 
-‘--quiet’
-‘--silent’
-‘-q’
+`--quiet'
+`--silent'
+`-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to ‘/dev/null’ (any error
+     suppress all normal output, redirect it to `/dev/null' (any error
      messages will still be shown).
 
-‘--srcdir=DIR’
+`--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     ‘configure’ can determine that directory automatically.
+     `configure' can determine that directory automatically.
 
-‘--version’
-     Print the version of Autoconf used to generate the ‘configure’
+`--version'
+     Print the version of Autoconf used to generate the `configure'
      script, and exit.
 
-‘configure’ also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/bindtextdom.c gettext-0.18.1.1/gettext-runtime/intl/bindtextdom.c
--- gettext-0.19.3/gettext-runtime/intl/bindtextdom.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/bindtextdom.c	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/ChangeLog gettext-0.18.1.1/gettext-runtime/intl/ChangeLog
--- gettext-0.19.3/gettext-runtime/intl/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,460 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* libgnuintl.in.h (LIBINTL_VERSION): Bump to 0.19.3.
-
-2014-09-30  Daiki Ueno  <ueno@gnu.org>
-
-	* localcharset.c, localename.c, vasnprintf.c: Update from Gnulib.
-
-2014-07-16  Daiki Ueno  <ueno@gnu.org>
-
-	* localename.c: Update from Gnulib.
-	2014-07-10  Assaf Gordon  <assafgordon@gmail.com>
-            localename: avoid -Wsuggest-attribute={const,pure} warnings
-            * lib/localename.c (string_hash): Tag internal function as pure.
-	* xsize.c (XSIZE_INLINE): Remove _GL_UNUSED definition.  It will
-	be set through intl.m4.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.in (distclean): Remove intl/VERSION for gettext-runtime
-	and gettext-tools packages.
-
-2014-07-03  Siddhesh Poyarekar  <siddhesh@redhat.com>
-
-	intl: Sync up loadmsgcat.c with glibc
-	* loadmsgcat.c [_LIBC]: Define PRI_MACROS_BROKEN unconditionally.
-
-2014-07-03  Siddhesh Poyarekar  <siddhesh@redhat.com>
-
-	intl: Sync up loadmsgcat.c with glibc
-	* loadmsgcat.c: Include assert.h.
-	(_nl_load_domain): Add semicolon to end of line.
-	(_nl_load_domain)[HAVE_MMAP]: Use MAP_FAILED and assert that
-	it is (void *) -1.
-	(_nl_load_domain)[_LIBC]: Call __libc_rwlock_init instead of
-	gl_rwlock_init.
-	(_nl_unload_domain): Cast convd->encoding to non-const.
-
-2014-06-17  Daiki Ueno  <ueno@gnu.org>
-
-	intl: Add back ChangeLog to gettext-runtime distribution
-	* Makefile.in (DISTFILES.gettext): Add ChangeLog.
-
-2014-06-16  Daiki Ueno  <ueno@gnu.org>
-
-	intl: Stop installing ChangeLog.inst
-	After the git-version-gen migration (commit fbf4e276), the
-	creation of gettext-tools/intl/ChangeLog.inst in configure.ac was
-	removed because we lost access to $RELEASE_DATE.  Given that
-	intl/VERSION provides enough information, simply drop the
-	ChangeLog file.
-	Problem reported by Bruce Korb in
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00022.html>.
-	* Makefile.in (install-data): Don't install ChangeLog.inst.
-	(distclean): Don't remove ChangeLog.inst.
-	(uninstall): Don't remove ChangeLog under $(gettextsrcdir)/intl.
-	(dist): Don't include ChangeLog in the distribution.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-11  Daiki Ueno  <ueno@gnu.org>
-
-	* xsize.c (_GL_UNUSED): Define, if undefined.
-
-2014-04-30  Steve Ellcey  <sellcey@mips.com>  (tiny change)
-
-	* loadmsgcat.c (PRI_MACROS_BROKEN) [_LIBC]: Define to 0, if
-	undefined.
-
-2014-04-23  Daiki Ueno  <ueno@gnu.org>
-
-	intl: Port to Bison 3.0
-	* plural.y: Don't use removed YYLEX_PARAM and YYPARSE_PARAM
-	macros; replace deprecated %pure_parser with '%define api.pure
-	full'; adjust yylex/yyerror arglist.
-	* plural-exp.h (PLURAL_PARSE): Use explicit type 'struct
-	parse_args *arg' for ARG.
-
-2013-05-07  Carlos O'Donell  <carlos@redhat.com>
-            Jeff Law  <law@redhat.com>
-
-	* dcigettext.c (DCIGETTEXT): Skip translating if _nl_find_msg
-	returns -1.
-	(_nl_find_msg): Return -1 if recursive call returned -1. If
-	newmem is null return -1.
-	* loadmsgcat.c (_nl_load_domain): If _nl_find_msg returns -1
-	abort loading the domain.
-
-	* dcigettext.c (_nl_find_msg): Avoid use after potential
-	free.  Simplify list management for _LIBC case.
-
-2013-03-07  Daiki Ueno  <ueno@gnu.org>
-
-	* setlocale.c (libintl_setlocale): Signal a change of the loaded
-	catalogs by incrementing _nl_msg_cat_cntr.
-	Reported by Guido Flohr at <https://savannah.gnu.org/bugs/?38162>.
-
-2013-05-30  Thomas Petazzoni <thomas.petazzoni@free-electrons.com>  (tiny change)
-
-	* Makefile.in (SHELL): Use @SHELL@ instead of /bin/sh.
-
-2013-03-05  Daiki Ueno  <ueno@gnu.org>
-
-	* verify.h: Update copyright year.
-	* xsize.h: Likewise.
-
-2013-02-25  Daiki Ueno  <ueno@gnu.org>
-
-	Determine imported C symbol prefix at configure time.
-	Suggested by Evgeny Grin in <http://savannah.gnu.org/bugs/?29946>.
-	* intl-exports.c (IMP): Define depending on the result of the
-	configure run.
-
-2013-01-21  Daiki Ueno  <ueno@gnu.org>
-
-	Remove references to non-existing COPYING.LIB-2.*.
-	Reported by Christian Weisgerber <naddy@mips.inka.de>.
-	* Makefile.in (DISTFILES.obsolete): Add COPYING.LIB-2.*.
-	(install-data): Install COPYING.LIB instead of no longer existing
-	COPYING.LIB-2.*.
-	(uninstall): Remove COPYING.LIB instead of no longer existing
-	COPYING.LIB-2.*.
-
-2013-01-17  Daiki Ueno  <ueno@gnu.org>
-
-	Fix link errors related to C99-style extern inline.
-	Reported by Sam Thursfield <sam.thursfield@codethink.co.uk>.
-	* Makefile.in (SOURCES): Add xsize.c.
-	(OBJECTS): Add xsize.$lo.
-	(xsize.lo): New rule.
-	(printf.$lo): Add xsize.c to dependencies.
-	* xsize.c: New file, imported from gnulib.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* libgnuintl.in.h (LIBINTL_VERSION): Bump to 0.18.2.
-	* Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 9:2:1.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* intl-exports.c (IMP): Check __MINGW32__ as well as _WIN64.
-
-2012-12-20  Daiki Ueno  <ueno@gnu.org>
-
-	localecharset: respect the thread-specific locale on Mac OS X
-	* lib/localcharset.c (locale_charset) [DARWIN7]: Use MB_CUR_MAX_L
-	instead of MB_CUR_MAX.
-
-2012-12-21  Daiki Ueno  <ueno@gnu.org>
-
-	Fix W64 build errors.
-	* intl-exports.c (IMP) [_WIN64]: Prefix "__imp_" instead of
-	"_imp__".
-	* osdep.c: Include intl-exports.c on mingw as well as Cygwin.
-
-2012-12-10  Daiki Ueno  <ueno@unixuser.org>
-
-	* intl-compat.c: Fix typo in the copyright header.
-
-2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* vasnprintf.c (MAX_ROOM_NEEDED): Now static, not static
-	inline.
-
-2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* lock.c (gl_waitqueue_init)
-	(gl_waitqueue_notify_first, gl_waitqueue_notify_all):
-	Change 'static inline' to 'inline'.
-
-2012-09-24  Paul Eggert  <eggert@cs.ucla.edu>
-
-	localename: port gl_locale_name_thread_unsafe to FreeBSD
-	* localename.c (gl_locale_name_thread_unsafe): Port to FreeBSD,
-	and use the simpler FreeBSD implementation on Mac OS X as well.
-	Original idea suggested by Ed Maste in
-	<http://lists.gnu.org/archive/html/bug-gnulib/2012-09/msg00094.html>.
-
-2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* xsize.h (XSIZE_INLINE): New macro.  Replace all uses of
-	'static inline' with them.  Use _GL_INLINE_HEADER_BEGIN,
-	_GL_INLINE_HEADER_END.
-
-2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
-
-	misc: don't limit commentary to inline functions
-	* xsize.h: Contrast macros to functions in general, not just
-	to inline functions, when the commentary does not apply only to
-	inline functions.
-
-2012-09-16  Paul Eggert  <eggert@cs.ucla.edu>
-
-	localcharset: work around Mac OS X bug with UTF-8 and MB_CUR_MAX
-	* localcharset.c (locale_charset) [DARWIN7]:
-	Return "ASCII" if the system reports "UTF-8" and MB_CUR_MAX <= 1,
-	as these two values are incompatible.  Problem reported by Max Horn.
-	For more discussion, please see
-	<http://lists.gnu.org/archive/html/bug-gnulib/2012-09/msg00061.html>.
-
-2012-07-20  Eric Blake  <eblake@redhat.com>
-
-	verify: document conflict with -Wnested-externs
-	* verify.h: Give hint about usage when gcc warnings are enabled.
-
-2012-06-22  Bruno Haible  <bruno@clisp.org>
-
-	Write "Mac OS X" instead of "MacOS X".
-	* config.charset: Write "Mac OS X" instead of "MacOS X".
-	* localcharset.c: Likewise.
-	* localename.c: Likewise.
-	* vasnprintf.c: Likewise.
-
-2012-06-03  Jim Meyering  <jim@meyering.net>
-
-	* dcigettext.c: Spelling fixes.
-
-2012-02-05  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* vasnprintf.c: Spelling fixes.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* Makefile.in: Quote 'like this', not `like this', as per the recent
-	change to the GNU coding standards.
-	* libgnuintl.in.h: Likewise.
-	* vasnprintf.h: Likewise.
-
-2012-01-06  Paul Eggert  <eggert@cs.ucla.edu>
-
-	doc: C11 and C++11 are now official
-	* verify.h: Replace references to draft C1X to C11, and to draft C++0X
-	to C++11.
-
-2012-01-06  Bruno Haible  <bruno@clisp.org>
-
-	Talk about "native Windows API", not "Woe32".
-	* localcharset.c: Update comments to mention native Windows.
-	* relocatable.c: Likewise.
-	* config.charset: More comments.
-
-2012-01-04  Bruno Haible  <bruno@clisp.org>
-
-	Talk about "native Windows API", not "Win32".
-	* vasnprintf.c: Update comments to mention native Windows.
-	* localcharset.c: Update comments to mention native Windows.
-	(WINDOWS_NATIVE): Renamed from WIN32_NATIVE.
-	* localename.c: Likewise.
-	* relocatable.c: Likewise.
-	* lock.h: Update comments to mention native Windows.
-	(USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS.
-	* lock.c (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS.
-
-2011-10-15  Bruno Haible  <bruno@clisp.org>
-
-	Avoid crash in *printf functions for invalid format string with dollar.
-	* printf.c (libintl_vsnprintf, libintl_vswprintf): Don't crash in
-	mempy if libintl_vasnprintf returned NULL.
-	Reported by Jeong, Heon <bimarket@gmail.com>
-	in <https://savannah.gnu.org/bugs/?34555>.
-
-2011-10-15  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Optimize bit search operation.
-	* vasnprintf.c (divide): Use optimizations from gnulib's
-	integer_length.c.
-
-2011-10-15  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Fix comments.
-	* vasnprintf.c (decode_long_double, decode_double): Fix comments.
-
-2011-10-03  Bruno Haible  <bruno@clisp.org>
-
-	* relocatable.c (ENABLE_COSTLY_RELOCATABLE): New macro.
-	(compute_curr_prefix, shared_library_fullname,
-	find_shared_library_fullname, get_shared_library_fullname, relocate):
-	Use it together with PIC && INSTALLDIR.
-	Reported by <jojelino@gmail.com>
-	via Charles Wilson <cygwin@cwilson.fastmail.fm>.
-
-2011-07-07  Bruno Haible  <bruno@clisp.org>
-
-	Complete the change in vasnprintf.c from 2010-04-10.
-	* printf.c (system_vsnprintf) [mingw]: Prefer vsnprintf over
-	_vsnprintf.
-
-2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* verify.h (verify_true): Deprecate.
-	(verify_expr): New macro.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	* verify.h: New file, from gnulib.
-	* Makefile.in (HEADERS): Add it.
-
-2010-10-10  Paul Eggert  <eggert@cs.ucla.edu>
-
-	rewrite int foo[2*X-1] to verify(X) or to int foo[X?1:-1]
-	* vasnprintf.c: Include "verify.h".
-	(mp_limb_verify, mp_twolimb_verify, TCHAR_T_verify): Remove, replacing
-	with a verify call.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* COPYING.LIB: Renamed from COPYING.LIB-2.1.
-	* COPYING.LIB-2.0: Remove file.
-	* *.h, *.c, *.y, *.sin, config.charset, locale.alias, Makefile.in:
-	Update copyright header.
-	* libintl.rc: Update comments field.
-
-2011-04-08  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* relocatable.c (_GL_USE_STDLIB_ALLOC): Define.
-	(malloc): Don't #undef; no longer needed.
-
-2011-02-28  Bruno Haible  <bruno@clisp.org>
-
-	Assume ANSI C behaviour of free().
-	* localcharset.c (get_charset_aliases): Remove NULL test before calling
-	free().
-	Suggested by Simon Josefsson <simon@josefsson.org>.
-
-2011-02-28  Corinna Vinschen  <vinschen@redhat.com>  (tiny change)
-            Charles Wilson  <cygwin@cwilson.fastmail.fm>  (tiny change)
-            Bruno Haible  <bruno@clisp.org>  (tiny change)
-
-	On Cygwin, use /proc file system instead of win32 API.
-	* relocatable.c: On Cygwin, use file names from /proc, rather than
-	Win32 file names.
-	(DllMain): Simplify by removing Cygwin specific code.
-	(find_shared_library_fullname): Use Linux specific implementation also
-	for Cygwin.
-	(get_shared_library_fullname): Update accordingly.
-
-2011-02-23  Bruno Haible  <bruno@clisp.org>
-
-	Fix misindentation of preprocessor directives.
-	* vasnprintf.c (decode_long_double): Reindent preprocessor directives.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Workaround native Windows bug.
-	* setlocale.c (rpl_setlocale): On native Windows, when setlocale
-	succeeds but sets LC_CTYPE to "C", report a failure.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Avoid clashing overrides for setlocale.
-	* libgnuintl.in.h (setlocale): Don't override if the gnulib override is
-	already enabled.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	* wprintf-parse.h: Apply same changes as to printf-parse.h.
-
-2011-02-04  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Reduce use of malloc for small format strings.
-	* printf-args.h (N_DIRECT_ALLOC_ARGUMENTS): New macro.
-	(arguments): Add room for the first 7 arguments.
-	* printf-parse.h (N_DIRECT_ALLOC_DIRECTIVES): New macro.
-	(char_directives, u8_directives, u16_directives, u32_directives): Add
-	room for the first 7 directives.
-	* printf-parse.c: Include <string.h>.
-	(PRINTF_PARSE): Change memory handling code so that it uses the first
-	7 preallocated elements in an 'arguments' or 'DIRECTIVES' struct.
-	* vasnprintf.c (VASNPRINTF): Update memory handling code.
-	Reported by Pádraig Brady <P@draigbrady.com>.
-
-2011-01-01  Jim Meyering  <meyering@redhat.com>
-
-	maint: update almost all copyright ranges to include 2011
-	Run the new "make update-copyright" rule.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* dcigettext.c (_nl_find_msg): Treat uClibc like a non-glibc platform.
-	* loadmsgcat.c (get_sysdep_segment_value): Likewise.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Ensure that <features.h> is included before __GLIBC__ is tested.
-	* printf-parse.h: Include <features.h>.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* localename.c (gl_locale_name_thread_unsafe, HAVE_LOCALE_NULL): Treat
-	uClibc like a non-glibc platform.
-	* printf-parse.h (FLAG_LOCALIZED): Likewise.
-	* printf-parse.c (PRINTF_PARSE): Likewise.
-	* relocatable.c (find_shared_library_fullname): Treat uClibc like
-	glibc.
-	* vasnprintf.c (decimal_point_char): Treat uClibc like glibc.
-	(VASNPRINTF): Treat uClibc like a non-glibc platform.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Fix a comment.
-	* vasnprintf.c (VASNPRINTF): Fix comment.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	* loadmsgcat.c (get_sysdep_segment_value): Update comment.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Support I flag on glibc systems.
-	* printf-parse.h (FLAG_LOCALIZED): New macro.
-	* printf-parse.c (PRINTF_PARSE): Handle the 'I' flag.
-	* vasnprintf.c (VASNPRINTF): Pass the 'I' flag on to the system's
-	snprintf function.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	Rename libgnuintl.h.in to libgnuintl.in.h.
-	* libgnuintl.in.h: New file, renamed from libgnuintl.h.in.
-	* Makefile.in (HEADERS, libgnuintl.h, libintl.h): Update.
-	* printf.c: Update.
-
-2010-10-14  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Don't set errno to 0.
-	* vasnprintf.c (VASNPRINTF): Save and restore errno around the block
-	that sets it to 0.
-	Reported by Gianluigi Tiesi <sherpya@netfarm.it>.
-
-2010-06-09  Bruno Haible  <bruno@clisp.org>
-
-	Avoid relocwrapper link errors due to gnulib replacement functions.
-	* lib/relocatable.c: Use the system's malloc function.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
@@ -1612,7 +1155,7 @@
 2007-03-24  Bruno Haible  <bruno@clisp.org>
 
 	* vasnprintf.c: Include float+.h.
-	(VASNPRINTF): When comparing against +0.0L or +0.0, compare only
+	(VASNPRINTF): When comparing agains +0.0L or +0.0, compare only
 	SIZEOF_LDBL or SIZEOF_DBL bytes.
 
 2007-03-24  Bruno Haible  <bruno@clisp.org>
@@ -4418,7 +3961,7 @@
 	* intl/localealias.c (read_alias_file): Use unsigned char for
 	local variables.  Remove unused variable tp.
 	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
-	for type of codeset.  For losing Solaris systems.
+	for type of codeset.  For loosing Solaris systems.
 	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
 	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
 	len if not needed.
diff -Nru gettext-0.19.3/gettext-runtime/intl/config.charset gettext-0.18.1.1/gettext-runtime/intl/config.charset
--- gettext-0.19.3/gettext-runtime/intl/config.charset	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/config.charset	2010-06-06 12:49:57.000000000 +0000
@@ -3,18 +3,20 @@
 #
 #   Copyright (C) 2000-2004, 2006-2010 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
-#   the Free Software Foundation; either version 2.1 of the License, or
-#   (at your option) any later version.
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
 #
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+#   USA.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
@@ -29,8 +31,6 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name              MIME?             used by which systems
-#                                    (darwin = Mac OS X, woe32 = native Windows)
-#
 #   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
 #   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
 #   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
diff -Nru gettext-0.19.3/gettext-runtime/intl/COPYING.LIB gettext-0.18.1.1/gettext-runtime/intl/COPYING.LIB
--- gettext-0.19.3/gettext-runtime/intl/COPYING.LIB	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/COPYING.LIB	1970-01-01 00:00:00.000000000 +0000
@@ -1,516 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it
-does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301, USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff -Nru gettext-0.19.3/gettext-runtime/intl/COPYING.LIB-2.0 gettext-0.18.1.1/gettext-runtime/intl/COPYING.LIB-2.0
--- gettext-0.19.3/gettext-runtime/intl/COPYING.LIB-2.0	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/COPYING.LIB-2.0	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,482 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff -Nru gettext-0.19.3/gettext-runtime/intl/COPYING.LIB-2.1 gettext-0.18.1.1/gettext-runtime/intl/COPYING.LIB-2.1
--- gettext-0.19.3/gettext-runtime/intl/COPYING.LIB-2.1	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/COPYING.LIB-2.1	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,516 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+^L
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+^L
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+^L
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+^L
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+^L
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+^L
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+^L
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+^L
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it
+does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA 02110-1301, USA
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+You should also get your employer (if you work as a programmer) or
+your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff -Nru gettext-0.19.3/gettext-runtime/intl/dcgettext.c gettext-0.18.1.1/gettext-runtime/intl/dcgettext.c
--- gettext-0.19.3/gettext-runtime/intl/dcgettext.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/dcgettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of the dcgettext(3) function.
    Copyright (C) 1995-1999, 2000-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/dcigettext.c gettext-0.18.1.1/gettext-runtime/intl/dcigettext.c
--- gettext-0.19.3/gettext-runtime/intl/dcigettext.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/dcigettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2009 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
@@ -372,7 +374,7 @@
 #endif
 
 
-/* For those losing systems which don't have `alloca' we have to add
+/* For those loosing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
 /* Nothing has to be done.  */
@@ -743,11 +745,6 @@
 					 msgid1, 1, &retlen);
 #endif
 
-		  /* Resource problems are not fatal, instead we return no
-		     translation.  */
-		  if (__builtin_expect (retval == (char *) -1, 0))
-		    goto return_untranslated;
-
 		  if (retval != NULL)
 		    {
 		      domain = domain->successor[cnt];
@@ -1108,11 +1105,6 @@
 		_nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
 # endif
 
-	      /* Resource problems are fatal.  If we continue onwards we will
-	         only attempt to calloc a new conv_tab and fail later.  */
-	      if (__builtin_expect (nullentry == (char *) -1, 0))
-	        return (char *) -1;
-
 	      if (nullentry != NULL)
 		{
 		  const char *charsetstr;
@@ -1161,8 +1153,7 @@
 #  if HAVE_ICONV
 		      /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
 			 we want to use transliteration.  */
-#   if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-	&& !defined __UCLIBC__) \
+#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
        || _LIBICONV_VERSION >= 0x0105
 		      if (strchr (outcharset, '/') == NULL)
 			{
@@ -1338,7 +1329,7 @@
 							     freemem_size);
 # ifdef _LIBC
 		      if (newmem != NULL)
-			transmem_list = newmem;
+			transmem_list = transmem_list->next;
 		      else
 			{
 			  struct transmem_list *old = transmem_list;
@@ -1353,16 +1344,6 @@
 		      malloc_count = 1;
 		      freemem_size = INITIAL_BLOCK_SIZE;
 		      newmem = (transmem_block_t *) malloc (freemem_size);
-# ifdef _LIBC
-		      if (newmem != NULL)
-			{
-			  /* Add the block to the list of blocks we have to free
-			     at some point.  */
-			  newmem->next = transmem_list;
-			  transmem_list = newmem;
-			}
-		      /* Fall through and return -1.  */
-# endif
 		    }
 		  if (__builtin_expect (newmem == NULL, 0))
 		    {
@@ -1373,6 +1354,11 @@
 		    }
 
 # ifdef _LIBC
+		  /* Add the block to the list of blocks we have to free
+		     at some point.  */
+		  newmem->next = transmem_list;
+		  transmem_list = newmem;
+
 		  freemem = (unsigned char *) newmem->data;
 		  freemem_size -= offsetof (struct transmem_list, data);
 # else
diff -Nru gettext-0.19.3/gettext-runtime/intl/dcngettext.c gettext-0.18.1.1/gettext-runtime/intl/dcngettext.c
--- gettext-0.19.3/gettext-runtime/intl/dcngettext.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/dcngettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of the dcngettext(3) function.
    Copyright (C) 1995-1999, 2000-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/dgettext.c gettext-0.18.1.1/gettext-runtime/intl/dgettext.c
--- gettext-0.19.3/gettext-runtime/intl/dgettext.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/dgettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of the dgettext(3) function.
    Copyright (C) 1995-1997, 2000-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/dngettext.c gettext-0.18.1.1/gettext-runtime/intl/dngettext.c
--- gettext-0.19.3/gettext-runtime/intl/dngettext.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/dngettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of the dngettext(3) function.
    Copyright (C) 1995-1997, 2000-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/eval-plural.h gettext-0.18.1.1/gettext-runtime/intl/eval-plural.h
--- gettext-0.19.3/gettext-runtime/intl/eval-plural.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/eval-plural.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Plural expression evaluation.
    Copyright (C) 2000-2003, 2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef STATIC
 #define STATIC static
diff -Nru gettext-0.19.3/gettext-runtime/intl/explodename.c gettext-0.18.1.1/gettext-runtime/intl/explodename.c
--- gettext-0.19.3/gettext-runtime/intl/explodename.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/explodename.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Copyright (C) 1995-1998, 2000-2001, 2003, 2005, 2007 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
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/finddomain.c gettext-0.18.1.1/gettext-runtime/intl/finddomain.c
--- gettext-0.19.3/gettext-runtime/intl/finddomain.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/finddomain.c	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 1995-1999, 2000-2001, 2003-2007 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/gettext.c gettext-0.18.1.1/gettext-runtime/intl/gettext.c
--- gettext-0.19.3/gettext-runtime/intl/gettext.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/gettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of gettext(3) function.
    Copyright (C) 1995, 1997, 2000-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/gettextP.h gettext-0.18.1.1/gettext-runtime/intl/gettextP.h
--- gettext-0.19.3/gettext-runtime/intl/gettextP.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/gettextP.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 1995-1999, 2000-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
diff -Nru gettext-0.19.3/gettext-runtime/intl/gmo.h gettext-0.18.1.1/gettext-runtime/intl/gmo.h
--- gettext-0.19.3/gettext-runtime/intl/gmo.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/gmo.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Description of GNU message catalog format: general file layout.
    Copyright (C) 1995, 1997, 2000-2002, 2004, 2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
diff -Nru gettext-0.19.3/gettext-runtime/intl/hash-string.c gettext-0.18.1.1/gettext-runtime/intl/hash-string.c
--- gettext-0.19.3/gettext-runtime/intl/hash-string.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/hash-string.c	2010-06-06 12:49:57.000000000 +0000
@@ -13,8 +13,9 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/hash-string.h gettext-0.18.1.1/gettext-runtime/intl/hash-string.h
--- gettext-0.19.3/gettext-runtime/intl/hash-string.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/hash-string.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Description of GNU message catalog format: string hashing function.
    Copyright (C) 1995, 1997-1998, 2000-2003, 2005 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* @@ end of prolog @@ */
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/intl-compat.c gettext-0.18.1.1/gettext-runtime/intl/intl-compat.c
--- gettext-0.19.3/gettext-runtime/intl/intl-compat.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/intl-compat.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
    Library.
-   Copyright (C) 1995, 2000-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2000-2003, 2005 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/intl-exports.c gettext-0.18.1.1/gettext-runtime/intl/intl-exports.c
--- gettext-0.19.3/gettext-runtime/intl/intl-exports.c	2013-04-15 02:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/intl-exports.c	2010-06-06 12:49:57.000000000 +0000
@@ -2,25 +2,23 @@
    Copyright (C) 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
  /* IMP(x) is a symbol that contains the address of x.  */
-#if USER_LABEL_PREFIX_UNDERSCORE
-# define IMP(x) _imp__##x
-#else
-# define IMP(x) __imp_##x
-#endif
+#define IMP(x) _imp__##x
 
  /* Ensure that the variable x is exported from the library, and that a
     pseudo-variable IMP(x) is available.  */
diff -Nru gettext-0.19.3/gettext-runtime/intl/l10nflist.c gettext-0.18.1.1/gettext-runtime/intl/l10nflist.c
--- gettext-0.19.3/gettext-runtime/intl/l10nflist.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/l10nflist.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Copyright (C) 1995-1999, 2000-2007 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
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
    This must come before <config.h> because <config.h> may include
diff -Nru gettext-0.19.3/gettext-runtime/intl/langprefs.c gettext-0.18.1.1/gettext-runtime/intl/langprefs.c
--- gettext-0.19.3/gettext-runtime/intl/langprefs.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/langprefs.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Determine the user's language preferences.
    Copyright (C) 2004-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.
    Win32 code originally by Michele Cicciotti <hackbunny@reactos.com>.  */
diff -Nru gettext-0.19.3/gettext-runtime/intl/libgnuintl.h.in gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h.in
--- gettext-0.19.3/gettext-runtime/intl/libgnuintl.h.in	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h.in	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,466 @@
+/* Message catalogs for internationalization.
+   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _LIBINTL_H
+#define _LIBINTL_H 1
+
+#include <locale.h>
+#if (defined __APPLE__ && defined __MACH__) && @HAVE_NEWLOCALE@
+# include <xlocale.h>
+#endif
+
+/* The LC_MESSAGES locale category is the category used by the functions
+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
+   On systems that don't define it, use an arbitrary value instead.
+   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+   then includes <libintl.h> (i.e. this file!) and then only defines
+   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
+   in this case.  */
+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+/* Provide information about the supported file formats.  Returns the
+   maximum minor revision number supported for a given major revision.  */
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
+  ((major) == 0 || (major) == 1 ? 1 : -1)
+
+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
+   precedence over _conio_gettext.  */
+#ifdef __DJGPP__
+# undef gettext
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Version number: (major<<16) + (minor<<8) + subminor */
+#define LIBINTL_VERSION 0x001201
+extern int libintl_version;
+
+
+/* We redirect the functions to those prefixed with "libintl_".  This is
+   necessary, because some systems define gettext/textdomain/... in the C
+   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
+   If we used the unprefixed names, there would be cases where the
+   definition in the C library would override the one in the libintl.so
+   shared library.  Recall that on ELF systems, the symbols are looked
+   up in the following order:
+     1. in the executable,
+     2. in the shared libraries specified on the link command line, in order,
+     3. in the dependencies of the shared libraries specified on the link
+        command line,
+     4. in the dlopen()ed shared libraries, in the order in which they were
+        dlopen()ed.
+   The definition in the C library would override the one in libintl.so if
+   either
+     * -lc is given on the link command line and -lintl isn't, or
+     * -lc is given on the link command line before -lintl, or
+     * libintl.so is a dependency of a dlopen()ed shared library but not
+       linked to the executable at link time.
+   Since Solaris gettext() behaves differently than GNU gettext(), this
+   would be unacceptable.
+
+   The redirection happens by default through macros in C, so that &gettext
+   is independent of the compilation unit, but through inline functions in
+   C++, in order not to interfere with the name mangling of class fields or
+   class methods called 'gettext'.  */
+
+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
+   If he doesn't, we choose the method.  A third possible method is
+   _INTL_REDIRECT_ASM, supported only by GCC.  */
+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+#  define _INTL_REDIRECT_ASM
+# else
+#  ifdef __cplusplus
+#   define _INTL_REDIRECT_INLINE
+#  else
+#   define _INTL_REDIRECT_MACROS
+#  endif
+# endif
+#endif
+/* Auxiliary macros.  */
+#ifdef _INTL_REDIRECT_ASM
+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
+# define _INTL_STRINGIFY(prefix) #prefix
+#else
+# define _INTL_ASM(cname)
+#endif
+
+/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
+   its n-th argument literally.  This enables GCC to warn for example about
+   printf (gettext ("foo %y")).  */
+#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
+# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
+#else
+# define _INTL_MAY_RETURN_STRING_ARG(n)
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_gettext (const char *__msgid)
+       _INTL_MAY_RETURN_STRING_ARG (1);
+static inline char *gettext (const char *__msgid)
+{
+  return libintl_gettext (__msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define gettext libintl_gettext
+#endif
+extern char *gettext (const char *__msgid)
+       _INTL_ASM (libintl_gettext)
+       _INTL_MAY_RETURN_STRING_ARG (1);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
+       _INTL_MAY_RETURN_STRING_ARG (2);
+static inline char *dgettext (const char *__domainname, const char *__msgid)
+{
+  return libintl_dgettext (__domainname, __msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dgettext libintl_dgettext
+#endif
+extern char *dgettext (const char *__domainname, const char *__msgid)
+       _INTL_ASM (libintl_dgettext)
+       _INTL_MAY_RETURN_STRING_ARG (2);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
+                                int __category)
+       _INTL_MAY_RETURN_STRING_ARG (2);
+static inline char *dcgettext (const char *__domainname, const char *__msgid,
+                               int __category)
+{
+  return libintl_dcgettext (__domainname, __msgid, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcgettext libintl_dcgettext
+#endif
+extern char *dcgettext (const char *__domainname, const char *__msgid,
+                        int __category)
+       _INTL_ASM (libintl_dcgettext)
+       _INTL_MAY_RETURN_STRING_ARG (2);
+#endif
+
+
+/* Similar to `gettext' but select the plural form corresponding to the
+   number N.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
+                               unsigned long int __n)
+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
+                              unsigned long int __n)
+{
+  return libintl_ngettext (__msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define ngettext libintl_ngettext
+#endif
+extern char *ngettext (const char *__msgid1, const char *__msgid2,
+                       unsigned long int __n)
+       _INTL_ASM (libintl_ngettext)
+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
+#endif
+
+/* Similar to `dgettext' but select the plural form corresponding to the
+   number N.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
+                                const char *__msgid2, unsigned long int __n)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
+static inline char *dngettext (const char *__domainname, const char *__msgid1,
+                               const char *__msgid2, unsigned long int __n)
+{
+  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dngettext libintl_dngettext
+#endif
+extern char *dngettext (const char *__domainname,
+                        const char *__msgid1, const char *__msgid2,
+                        unsigned long int __n)
+       _INTL_ASM (libintl_dngettext)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
+#endif
+
+/* Similar to `dcgettext' but select the plural form corresponding to the
+   number N.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcngettext (const char *__domainname,
+                                 const char *__msgid1, const char *__msgid2,
+                                 unsigned long int __n, int __category)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
+static inline char *dcngettext (const char *__domainname,
+                                const char *__msgid1, const char *__msgid2,
+                                unsigned long int __n, int __category)
+{
+  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcngettext libintl_dcngettext
+#endif
+extern char *dcngettext (const char *__domainname,
+                         const char *__msgid1, const char *__msgid2,
+                         unsigned long int __n, int __category)
+       _INTL_ASM (libintl_dcngettext)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
+#endif
+
+
+#ifndef IN_LIBGLOCALE
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_textdomain (const char *__domainname);
+static inline char *textdomain (const char *__domainname)
+{
+  return libintl_textdomain (__domainname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define textdomain libintl_textdomain
+#endif
+extern char *textdomain (const char *__domainname)
+       _INTL_ASM (libintl_textdomain);
+#endif
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bindtextdomain (const char *__domainname,
+                                     const char *__dirname);
+static inline char *bindtextdomain (const char *__domainname,
+                                    const char *__dirname)
+{
+  return libintl_bindtextdomain (__domainname, __dirname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bindtextdomain libintl_bindtextdomain
+#endif
+extern char *bindtextdomain (const char *__domainname, const char *__dirname)
+       _INTL_ASM (libintl_bindtextdomain);
+#endif
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bind_textdomain_codeset (const char *__domainname,
+                                              const char *__codeset);
+static inline char *bind_textdomain_codeset (const char *__domainname,
+                                             const char *__codeset)
+{
+  return libintl_bind_textdomain_codeset (__domainname, __codeset);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
+#endif
+extern char *bind_textdomain_codeset (const char *__domainname,
+                                      const char *__codeset)
+       _INTL_ASM (libintl_bind_textdomain_codeset);
+#endif
+
+#endif /* IN_LIBGLOCALE */
+
+
+/* Support for format strings with positions in *printf(), following the
+   POSIX/XSI specification.
+   Note: These replacements for the *printf() functions are visible only
+   in source files that #include <libintl.h> or #include "gettext.h".
+   Packages that use *printf() in source files that don't refer to _()
+   or gettext() but for which the format string could be the return value
+   of _() or gettext() need to add this #include.  Oh well.  */
+
+#if !@HAVE_POSIX_PRINTF@
+
+#include <stdio.h>
+#include <stddef.h>
+
+/* Get va_list.  */
+#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+
+#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef fprintf
+#define fprintf libintl_fprintf
+extern int fprintf (FILE *, const char *, ...);
+#endif
+#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef vfprintf
+#define vfprintf libintl_vfprintf
+extern int vfprintf (FILE *, const char *, va_list);
+#endif
+
+#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef printf
+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
+/* Don't break __attribute__((format(printf,M,N))).
+   This redefinition is only possible because the libc in NetBSD, Cygwin,
+   mingw does not have a function __printf__.
+   Alternatively, we could have done this redirection only when compiling with
+   __GNUC__, together with a symbol redirection:
+       extern int printf (const char *, ...)
+              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
+   But doing it now would introduce a binary incompatibility with already
+   distributed versions of libintl on these systems.  */
+# define libintl_printf __printf__
+#endif
+#define printf libintl_printf
+extern int printf (const char *, ...);
+#endif
+#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef vprintf
+#define vprintf libintl_vprintf
+extern int vprintf (const char *, va_list);
+#endif
+
+#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef sprintf
+#define sprintf libintl_sprintf
+extern int sprintf (char *, const char *, ...);
+#endif
+#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef vsprintf
+#define vsprintf libintl_vsprintf
+extern int vsprintf (char *, const char *, va_list);
+#endif
+
+#if @HAVE_SNPRINTF@
+
+#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef snprintf
+#define snprintf libintl_snprintf
+extern int snprintf (char *, size_t, const char *, ...);
+#endif
+#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef vsnprintf
+#define vsnprintf libintl_vsnprintf
+extern int vsnprintf (char *, size_t, const char *, va_list);
+#endif
+
+#endif
+
+#if @HAVE_ASPRINTF@
+
+#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef asprintf
+#define asprintf libintl_asprintf
+extern int asprintf (char **, const char *, ...);
+#endif
+#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
+#undef vasprintf
+#define vasprintf libintl_vasprintf
+extern int vasprintf (char **, const char *, va_list);
+#endif
+
+#endif
+
+#if @HAVE_WPRINTF@
+
+#undef fwprintf
+#define fwprintf libintl_fwprintf
+extern int fwprintf (FILE *, const wchar_t *, ...);
+#undef vfwprintf
+#define vfwprintf libintl_vfwprintf
+extern int vfwprintf (FILE *, const wchar_t *, va_list);
+
+#undef wprintf
+#define wprintf libintl_wprintf
+extern int wprintf (const wchar_t *, ...);
+#undef vwprintf
+#define vwprintf libintl_vwprintf
+extern int vwprintf (const wchar_t *, va_list);
+
+#undef swprintf
+#define swprintf libintl_swprintf
+extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
+#undef vswprintf
+#define vswprintf libintl_vswprintf
+extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
+
+#endif
+
+#endif
+
+
+/* Support for the locale chosen by the user.  */
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+
+#undef setlocale
+#define setlocale libintl_setlocale
+extern char *setlocale (int, const char *);
+
+#if @HAVE_NEWLOCALE@
+
+#undef newlocale
+#define newlocale libintl_newlocale
+extern locale_t newlocale (int, const char *, locale_t);
+
+#endif
+
+#endif
+
+
+/* Support for relocatable packages.  */
+
+/* Sets the original and the current installation prefix of the package.
+   Relocation simply replaces a pathname starting with the original prefix
+   by the corresponding pathname with the current prefix instead.  Both
+   prefixes should be directory names without trailing slash (i.e. use ""
+   instead of "/").  */
+#define libintl_set_relocation_prefix libintl_set_relocation_prefix
+extern void
+       libintl_set_relocation_prefix (const char *orig_prefix,
+                                      const char *curr_prefix);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libintl.h */
diff -Nru gettext-0.19.3/gettext-runtime/intl/libgnuintl.in.h gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.in.h
--- gettext-0.19.3/gettext-runtime/intl/libgnuintl.in.h	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,466 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2012 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
-   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H 1
-
-#include <locale.h>
-#if (defined __APPLE__ && defined __MACH__) && @HAVE_NEWLOCALE@
-# include <xlocale.h>
-#endif
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-   then includes <libintl.h> (i.e. this file!) and then only defines
-   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-   in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 || (major) == 1 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001303
-extern int libintl_version;
-
-
-/* We redirect the functions to those prefixed with "libintl_".  This is
-   necessary, because some systems define gettext/textdomain/... in the C
-   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-   If we used the unprefixed names, there would be cases where the
-   definition in the C library would override the one in the libintl.so
-   shared library.  Recall that on ELF systems, the symbols are looked
-   up in the following order:
-     1. in the executable,
-     2. in the shared libraries specified on the link command line, in order,
-     3. in the dependencies of the shared libraries specified on the link
-        command line,
-     4. in the dlopen()ed shared libraries, in the order in which they were
-        dlopen()ed.
-   The definition in the C library would override the one in libintl.so if
-   either
-     * -lc is given on the link command line and -lintl isn't, or
-     * -lc is given on the link command line before -lintl, or
-     * libintl.so is a dependency of a dlopen()ed shared library but not
-       linked to the executable at link time.
-   Since Solaris gettext() behaves differently than GNU gettext(), this
-   would be unacceptable.
-
-   The redirection happens by default through macros in C, so that &gettext
-   is independent of the compilation unit, but through inline functions in
-   C++, in order not to interfere with the name mangling of class fields or
-   class methods called 'gettext'.  */
-
-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-   If he doesn't, we choose the method.  A third possible method is
-   _INTL_REDIRECT_ASM, supported only by GCC.  */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-#  define _INTL_REDIRECT_ASM
-# else
-#  ifdef __cplusplus
-#   define _INTL_REDIRECT_INLINE
-#  else
-#   define _INTL_REDIRECT_MACROS
-#  endif
-# endif
-#endif
-/* Auxiliary macros.  */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-   its n-th argument literally.  This enables GCC to warn for example about
-   printf (gettext ("foo %y")).  */
-#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
-# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-#else
-# define _INTL_MAY_RETURN_STRING_ARG(n)
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-static inline char *gettext (const char *__msgid)
-{
-  return libintl_gettext (__msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-extern char *gettext (const char *__msgid)
-       _INTL_ASM (libintl_gettext)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dgettext (const char *__domainname, const char *__msgid)
-{
-  return libintl_dgettext (__domainname, __msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-extern char *dgettext (const char *__domainname, const char *__msgid)
-       _INTL_ASM (libintl_dgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-                                int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dcgettext (const char *__domainname, const char *__msgid,
-                               int __category)
-{
-  return libintl_dcgettext (__domainname, __msgid, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-extern char *dcgettext (const char *__domainname, const char *__msgid,
-                        int __category)
-       _INTL_ASM (libintl_dcgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-
-/* Similar to 'gettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-                               unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-                              unsigned long int __n)
-{
-  return libintl_ngettext (__msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
-                       unsigned long int __n)
-       _INTL_ASM (libintl_ngettext)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Similar to 'dgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-                                const char *__msgid2, unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dngettext (const char *__domainname, const char *__msgid1,
-                               const char *__msgid2, unsigned long int __n)
-{
-  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-extern char *dngettext (const char *__domainname,
-                        const char *__msgid1, const char *__msgid2,
-                        unsigned long int __n)
-       _INTL_ASM (libintl_dngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-/* Similar to 'dcgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcngettext (const char *__domainname,
-                                 const char *__msgid1, const char *__msgid2,
-                                 unsigned long int __n, int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dcngettext (const char *__domainname,
-                                const char *__msgid1, const char *__msgid2,
-                                unsigned long int __n, int __category)
-{
-  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-extern char *dcngettext (const char *__domainname,
-                         const char *__msgid1, const char *__msgid2,
-                         unsigned long int __n, int __category)
-       _INTL_ASM (libintl_dcngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-
-#ifndef IN_LIBGLOCALE
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_textdomain (const char *__domainname);
-static inline char *textdomain (const char *__domainname)
-{
-  return libintl_textdomain (__domainname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-extern char *textdomain (const char *__domainname)
-       _INTL_ASM (libintl_textdomain);
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bindtextdomain (const char *__domainname,
-                                     const char *__dirname);
-static inline char *bindtextdomain (const char *__domainname,
-                                    const char *__dirname)
-{
-  return libintl_bindtextdomain (__domainname, __dirname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-extern char *bindtextdomain (const char *__domainname, const char *__dirname)
-       _INTL_ASM (libintl_bindtextdomain);
-#endif
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
-                                              const char *__codeset);
-static inline char *bind_textdomain_codeset (const char *__domainname,
-                                             const char *__codeset)
-{
-  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-extern char *bind_textdomain_codeset (const char *__domainname,
-                                      const char *__codeset)
-       _INTL_ASM (libintl_bind_textdomain_codeset);
-#endif
-
-#endif /* IN_LIBGLOCALE */
-
-
-/* Support for format strings with positions in *printf(), following the
-   POSIX/XSI specification.
-   Note: These replacements for the *printf() functions are visible only
-   in source files that #include <libintl.h> or #include "gettext.h".
-   Packages that use *printf() in source files that don't refer to _()
-   or gettext() but for which the format string could be the return value
-   of _() or gettext() need to add this #include.  Oh well.  */
-
-#if !@HAVE_POSIX_PRINTF@
-
-#include <stdio.h>
-#include <stddef.h>
-
-/* Get va_list.  */
-#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef fprintf
-#define fprintf libintl_fprintf
-extern int fprintf (FILE *, const char *, ...);
-#endif
-#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vfprintf
-#define vfprintf libintl_vfprintf
-extern int vfprintf (FILE *, const char *, va_list);
-#endif
-
-#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef printf
-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-/* Don't break __attribute__((format(printf,M,N))).
-   This redefinition is only possible because the libc in NetBSD, Cygwin,
-   mingw does not have a function __printf__.
-   Alternatively, we could have done this redirection only when compiling with
-   __GNUC__, together with a symbol redirection:
-       extern int printf (const char *, ...)
-              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
-   But doing it now would introduce a binary incompatibility with already
-   distributed versions of libintl on these systems.  */
-# define libintl_printf __printf__
-#endif
-#define printf libintl_printf
-extern int printf (const char *, ...);
-#endif
-#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vprintf
-#define vprintf libintl_vprintf
-extern int vprintf (const char *, va_list);
-#endif
-
-#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef sprintf
-#define sprintf libintl_sprintf
-extern int sprintf (char *, const char *, ...);
-#endif
-#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vsprintf
-#define vsprintf libintl_vsprintf
-extern int vsprintf (char *, const char *, va_list);
-#endif
-
-#if @HAVE_SNPRINTF@
-
-#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef snprintf
-#define snprintf libintl_snprintf
-extern int snprintf (char *, size_t, const char *, ...);
-#endif
-#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vsnprintf
-#define vsnprintf libintl_vsnprintf
-extern int vsnprintf (char *, size_t, const char *, va_list);
-#endif
-
-#endif
-
-#if @HAVE_ASPRINTF@
-
-#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef asprintf
-#define asprintf libintl_asprintf
-extern int asprintf (char **, const char *, ...);
-#endif
-#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vasprintf
-#define vasprintf libintl_vasprintf
-extern int vasprintf (char **, const char *, va_list);
-#endif
-
-#endif
-
-#if @HAVE_WPRINTF@
-
-#undef fwprintf
-#define fwprintf libintl_fwprintf
-extern int fwprintf (FILE *, const wchar_t *, ...);
-#undef vfwprintf
-#define vfwprintf libintl_vfwprintf
-extern int vfwprintf (FILE *, const wchar_t *, va_list);
-
-#undef wprintf
-#define wprintf libintl_wprintf
-extern int wprintf (const wchar_t *, ...);
-#undef vwprintf
-#define vwprintf libintl_vwprintf
-extern int vwprintf (const wchar_t *, va_list);
-
-#undef swprintf
-#define swprintf libintl_swprintf
-extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-#undef vswprintf
-#define vswprintf libintl_vswprintf
-extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-
-#endif
-
-#endif
-
-
-/* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-
-#ifndef GNULIB_defined_setlocale /* don't override gnulib */
-#undef setlocale
-#define setlocale libintl_setlocale
-extern char *setlocale (int, const char *);
-#endif
-
-#if @HAVE_NEWLOCALE@
-
-#undef newlocale
-#define newlocale libintl_newlocale
-extern locale_t newlocale (int, const char *, locale_t);
-
-#endif
-
-#endif
-
-
-/* Support for relocatable packages.  */
-
-/* Sets the original and the current installation prefix of the package.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-extern void
-       libintl_set_relocation_prefix (const char *orig_prefix,
-                                      const char *curr_prefix);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff -Nru gettext-0.19.3/gettext-runtime/intl/libintl.glibc gettext-0.18.1.1/gettext-runtime/intl/libintl.glibc
--- gettext-0.19.3/gettext-runtime/intl/libintl.glibc	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/libintl.glibc	2010-06-06 12:49:57.000000000 +0000
@@ -14,8 +14,9 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
diff -Nru gettext-0.19.3/gettext-runtime/intl/libintl.rc gettext-0.18.1.1/gettext-runtime/intl/libintl.rc
--- gettext-0.19.3/gettext-runtime/intl/libintl.rc	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/libintl.rc	2010-06-06 12:49:57.000000000 +0000
@@ -19,7 +19,7 @@
     BEGIN
         BLOCK "04090000"  /* Lang = US English, Charset = ASCII */
         BEGIN
-            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License. You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>.\0"
+            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0"
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "LGPLed libintl for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0"
             VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
diff -Nru gettext-0.19.3/gettext-runtime/intl/loadinfo.h gettext-0.18.1.1/gettext-runtime/intl/loadinfo.h
--- gettext-0.19.3/gettext-runtime/intl/loadinfo.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/loadinfo.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1
diff -Nru gettext-0.19.3/gettext-runtime/intl/loadmsgcat.c gettext-0.18.1.1/gettext-runtime/intl/loadmsgcat.c
--- gettext-0.19.3/gettext-runtime/intl/loadmsgcat.c	2014-07-14 02:26:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/loadmsgcat.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000-2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2008 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
@@ -25,7 +27,6 @@
 # include <config.h>
 #endif
 
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -100,10 +101,6 @@
 # include "lock.h"
 #endif
 
-#ifdef _LIBC
-# define PRI_MACROS_BROKEN 0
-#endif
-
 /* Provide fallback values for macros that ought to be defined in <inttypes.h>.
    Note that our fallback values need not be literal strings, because we don't
    use them with preprocessor string concatenation.  */
@@ -763,12 +760,10 @@
   /* Test for a glibc specific printf() format directive flag.  */
   if (name[0] == 'I' && name[1] == '\0')
     {
-#if defined _LIBC \
-    || ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) \
-        && !defined __UCLIBC__)
+#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
       /* The 'I' flag, in numeric format directives, replaces ASCII digits
 	 with the 'outdigits' defined in the LC_CTYPE locale facet.  This is
-	 used for Farsi (Persian), some Indic languages, and maybe Arabic.  */
+	 used for Farsi (Persian) and maybe Arabic.  */
       return "I";
 #else
       return "";
@@ -785,7 +780,7 @@
 _nl_load_domain (struct loaded_l10nfile *domain_file,
 		 struct binding *domainbinding)
 {
-  __libc_lock_define_initialized_recursive (static, lock);
+  __libc_lock_define_initialized_recursive (static, lock)
   int fd = -1;
   size_t size;
 #ifdef _LIBC
@@ -852,15 +847,13 @@
   data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
 					 MAP_PRIVATE, fd, 0);
 
-  if (__builtin_expect (data != MAP_FAILED, 1))
+  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
     {
       /* mmap() call was successful.  */
       close (fd);
       fd = -1;
       use_mmap = 1;
     }
-
-  assert (MAP_FAILED == (void *) -1);
 #endif
 
   /* If the data is not yet available (i.e. mmap'ed) we try to load
@@ -1265,7 +1258,7 @@
     default:
       /* This is an invalid revision.  */
     invalid:
-      /* This is an invalid .mo file or we ran out of resources.  */
+      /* This is an invalid .mo file.  */
       free (domain->malloced);
 #ifdef HAVE_MMAP
       if (use_mmap)
@@ -1281,11 +1274,7 @@
   /* No caches of converted translations so far.  */
   domain->conversions = NULL;
   domain->nconversions = 0;
-#ifdef _LIBC
-  __libc_rwlock_init (domain->conversions_lock);
-#else
   gl_rwlock_init (domain->conversions_lock);
-#endif
 
   /* Get the header entry and look for a plural specification.  */
 #ifdef IN_LIBGLOCALE
@@ -1294,13 +1283,6 @@
 #else
   nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
 #endif
-  if (__builtin_expect (nullentry == (char *) -1, 0))
-    {
-#ifdef _LIBC
-      __libc_rwlock_fini (domain->conversions_lock);
-#endif
-      goto invalid;
-    }
   EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
 
  out:
@@ -1328,7 +1310,7 @@
     {
       struct converted_domain *convd = &domain->conversions[i];
 
-      free ((char *) convd->encoding);
+      free (convd->encoding);
       if (convd->conv_tab != NULL && convd->conv_tab != (char **) -1)
 	free (convd->conv_tab);
       if (convd->conv != (__gconv_t) -1)
diff -Nru gettext-0.19.3/gettext-runtime/intl/localcharset.c gettext-0.18.1.1/gettext-runtime/intl/localcharset.c
--- gettext-0.19.3/gettext-runtime/intl/localcharset.c	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/localcharset.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2010 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
@@ -29,12 +31,11 @@
 #include <stdlib.h>
 
 #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
+# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# include <locale.h>
+# define WIN32_NATIVE
 #endif
 
 #if defined __EMX__
@@ -44,7 +45,7 @@
 # endif
 #endif
 
-#if !defined WINDOWS_NATIVE
+#if !defined WIN32_NATIVE
 # include <unistd.h>
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
@@ -57,7 +58,7 @@
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 # endif
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -66,11 +67,6 @@
 # include <os2.h>
 #endif
 
-/* For MB_CUR_MAX_L */
-#if defined DARWIN7
-# include <xlocale.h>
-#endif
-
 #if ENABLE_RELOCATABLE
 # include "relocatable.h"
 #else
@@ -88,7 +84,7 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #endif
 
@@ -128,7 +124,7 @@
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
       const char *dir;
       const char *base = "charset.alias";
       char *file_name;
@@ -233,7 +229,8 @@
                         {
                           /* Out of memory. */
                           res_size = 0;
-                          free (old_res_ptr);
+                          if (old_res_ptr != NULL)
+                            free (old_res_ptr);
                           break;
                         }
                       strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
@@ -313,7 +310,7 @@
            "DECKOREAN" "\0" "EUC-KR" "\0";
 # endif
 
-# if defined WINDOWS_NATIVE || defined __CYGWIN__
+# if defined WIN32_NATIVE || defined __CYGWIN__
       /* To avoid the troubles of installing a separate file in the same
          directory as the DLL and of retrieving the DLL's directory at
          runtime, simply inline the aliases here.  */
@@ -365,7 +362,7 @@
   const char *codeset;
   const char *aliases;
 
-#if !(defined WINDOWS_NATIVE || defined OS2)
+#if !(defined WIN32_NATIVE || defined OS2)
 
 # if HAVE_LANGINFO_CODESET
 
@@ -412,10 +409,10 @@
             }
         }
 
-      /* The Windows API has a function returning the locale's codepage as a
-         number: GetACP().  This encoding is used by Cygwin, unless the user
-         has set the environment variable CYGWIN=codepage:oem (which very few
-         people do).
+      /* Woe32 has a function returning the locale's codepage as a number:
+         GetACP().  This encoding is used by Cygwin, unless the user has set
+         the environment variable CYGWIN=codepage:oem (which very few people
+         do).
          Output directed to console windows needs to be converted (to
          GetOEMCP() if the console is using a raster font, or to
          GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
@@ -458,38 +455,18 @@
 
 # endif
 
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 
   static char buf[2 + 10 + 1];
 
-  /* The Windows API has a function returning the locale's codepage as
-     a number, but the value doesn't change according to what the
-     'setlocale' call specified.  So we use it as a last resort, in
-     case the string returned by 'setlocale' doesn't specify the
-     codepage.  */
-  char *current_locale = setlocale (LC_ALL, NULL);
-  char *pdot;
-
-  /* If they set different locales for different categories,
-     'setlocale' will return a semi-colon separated list of locale
-     values.  To make sure we use the correct one, we choose LC_CTYPE.  */
-  if (strchr (current_locale, ';'))
-    current_locale = setlocale (LC_CTYPE, NULL);
-
-  pdot = strrchr (current_locale, '.');
-  if (pdot)
-    sprintf (buf, "CP%s", pdot + 1);
-  else
-    {
-      /* The Windows API has a function returning the locale's codepage as a
-        number: GetACP().
-        When the output goes to a console window, it needs to be provided in
-        GetOEMCP() encoding if the console is using a raster font, or in
-        GetConsoleOutputCP() encoding if it is using a TrueType font.
-        But in GUI programs and for output sent to files and pipes, GetACP()
-        encoding is the best bet.  */
-      sprintf (buf, "CP%u", GetACP ());
-    }
+  /* Woe32 has a function returning the locale's codepage as a number:
+     GetACP().
+     When the output goes to a console window, it needs to be provided in
+     GetOEMCP() encoding if the console is using a raster font, or in
+     GetConsoleOutputCP() encoding if it is using a TrueType font.
+     But in GUI programs and for output sent to files and pipes, GetACP()
+     encoding is the best bet.  */
+  sprintf (buf, "CP%u", GetACP ());
   codeset = buf;
 
 #elif defined OS2
@@ -568,12 +545,5 @@
   if (codeset[0] == '\0')
     codeset = "ASCII";
 
-#ifdef DARWIN7
-  /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
-     (the default codeset) does not work when MB_CUR_MAX is 1.  */
-  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
-    codeset = "ASCII";
-#endif
-
   return codeset;
 }
diff -Nru gettext-0.19.3/gettext-runtime/intl/localcharset.h gettext-0.18.1.1/gettext-runtime/intl/localcharset.h
--- gettext-0.19.3/gettext-runtime/intl/localcharset.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/localcharset.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2000-2003 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
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
diff -Nru gettext-0.19.3/gettext-runtime/intl/locale.alias gettext-0.18.1.1/gettext-runtime/intl/locale.alias
--- gettext-0.19.3/gettext-runtime/intl/locale.alias	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/locale.alias	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 # Locale name alias data base.
 # Copyright (C) 1996-2001,2003,2007 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
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 # The format of this file is the same as for the corresponding file of
 # the X Window System, which normally can be found in
@@ -27,7 +29,7 @@
 # Packages using this file: 
 
 bokmal		nb_NO.ISO-8859-1
-bokm�l		nb_NO.ISO-8859-1
+bokm�l		nb_NO.ISO-8859-1
 catalan		ca_ES.ISO-8859-1
 croatian	hr_HR.ISO-8859-2
 czech		cs_CZ.ISO-8859-2
@@ -38,7 +40,7 @@
 eesti		et_EE.ISO-8859-1
 estonian	et_EE.ISO-8859-1
 finnish         fi_FI.ISO-8859-1
-fran�ais	fr_FR.ISO-8859-1
+fran�ais	fr_FR.ISO-8859-1
 french		fr_FR.ISO-8859-1
 galego		gl_ES.ISO-8859-1
 galician	gl_ES.ISO-8859-1
diff -Nru gettext-0.19.3/gettext-runtime/intl/localealias.c gettext-0.18.1.1/gettext-runtime/intl/localealias.c
--- gettext-0.19.3/gettext-runtime/intl/localealias.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/localealias.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Handle aliases for locale names.
    Copyright (C) 1995-1999, 2000-2001, 2003, 2005-2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
diff -Nru gettext-0.19.3/gettext-runtime/intl/localename.c gettext-0.18.1.1/gettext-runtime/intl/localename.c
--- gettext-0.19.3/gettext-runtime/intl/localename.c	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/localename.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,22 +1,24 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2010 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
-/* Native Windows code written by Tor Lillqvist <tml@iki.fi>.  */
-/* Mac OS X code written by Bruno Haible <bruno@clisp.org>.  */
+/* Win32 code written by Tor Lillqvist <tml@iki.fi>.  */
+/* MacOS X code written by Bruno Haible <bruno@clisp.org>.  */
 
 #include <config.h>
 
@@ -34,7 +36,7 @@
 #include <string.h>
 
 #if HAVE_USELOCALE
-/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */
+/* MacOS X 10.5 defines the locale_t type in <xlocale.h>.  */
 # if defined __APPLE__ && defined __MACH__
 #  include <xlocale.h>
 # endif
@@ -54,16 +56,12 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# if !defined IN_LIBINTL
-#  include "glthread/lock.h"
-# endif
+# define WIN32_NATIVE
 #endif
 
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-# include <winnls.h>
 /* List of language codes, sorted by value:
    0x01 LANG_ARABIC
    0x02 LANG_BULGARIAN
@@ -1128,18 +1126,15 @@
 # ifndef LOCALE_SNAME
 # define LOCALE_SNAME 0x5c
 # endif
-# ifndef LOCALE_NAME_MAX_LENGTH
-# define LOCALE_NAME_MAX_LENGTH 85
-# endif
 #endif
 
 
 #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-/* Mac OS X 10.2 or newer */
+/* MacOS X 10.2 or newer */
 
-/* Canonicalize a Mac OS X locale name to a Unix locale name.
+/* Canonicalize a MacOS X locale name to a Unix locale name.
    NAME is a sufficiently large buffer.
-   On input, it contains the Mac OS X locale name.
+   On input, it contains the MacOS X locale name.
    On output, it contains the Unix locale name.  */
 # if !defined IN_LIBINTL
 static
@@ -1152,9 +1147,9 @@
      http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
 
   /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
-     ISO 3166) names.  Prior to Mac OS X 10.3, there is no API for doing this.
+     ISO 3166) names.  Prior to MacOS X 10.3, there is no API for doing this.
      Therefore we do it ourselves, using a table based on the results of the
-     Mac OS X 10.3.8 function
+     MacOS X 10.3.8 function
      CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
   typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
           legacy_entry;
@@ -1297,26 +1292,26 @@
   typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
           langtag_entry;
   static const langtag_entry langtag_table[] = {
-    /* Mac OS X has "az-Arab", "az-Cyrl", "az-Latn".
+    /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
        The default script for az on Unix is Latin.  */
     { "az-Latn", "az" },
-    /* Mac OS X has "ga-dots".  Does not yet exist on Unix.  */
+    /* MacOS X has "ga-dots".  Does not yet exist on Unix.  */
     { "ga-dots", "ga" },
-    /* Mac OS X has "kk-Cyrl".  Does not yet exist on Unix.  */
-    /* Mac OS X has "mn-Cyrl", "mn-Mong".
+    /* MacOS X has "kk-Cyrl".  Does not yet exist on Unix.  */
+    /* MacOS X has "mn-Cyrl", "mn-Mong".
        The default script for mn on Unix is Cyrillic.  */
     { "mn-Cyrl", "mn" },
-    /* Mac OS X has "ms-Arab", "ms-Latn".
+    /* MacOS X has "ms-Arab", "ms-Latn".
        The default script for ms on Unix is Latin.  */
     { "ms-Latn", "ms" },
-    /* Mac OS X has "tg-Cyrl".
+    /* MacOS X has "tg-Cyrl".
        The default script for tg on Unix is Cyrillic.  */
     { "tg-Cyrl", "tg" },
-    /* Mac OS X has "tk-Cyrl".  Does not yet exist on Unix.  */
-    /* Mac OS X has "tt-Cyrl".
+    /* MacOS X has "tk-Cyrl".  Does not yet exist on Unix.  */
+    /* MacOS X has "tt-Cyrl".
        The default script for tt on Unix is Cyrillic.  */
     { "tt-Cyrl", "tt" },
-    /* Mac OS X has "zh-Hans", "zh-Hant".
+    /* MacOS X has "zh-Hans", "zh-Hant".
        Country codes are used to distinguish these on Unix.  */
     { "zh-Hans", "zh_CN" },
     { "zh-Hant", "zh_TW" }
@@ -1412,11 +1407,11 @@
 #endif
 
 
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
 
-/* Canonicalize a Windows native locale name to a Unix locale name.
+/* Canonicalize a Win32 native locale name to a Unix locale name.
    NAME is a sufficiently large buffer.
-   On input, it contains the Windows locale name.
+   On input, it contains the Win32 locale name.
    On output, it contains the Unix locale name.  */
 # if !defined IN_LIBINTL
 static
@@ -1472,9 +1467,9 @@
     }
   /* Internet Explorer has an LCID to RFC3066 name mapping stored in
      HKEY_CLASSES_ROOT\Mime\Database\Rfc1766.  But we better don't use that
-     since IE's i18n subsystem is known to be inconsistent with the native
-     Windows base (e.g. they have different character conversion facilities
-     that produce different results).  */
+     since IE's i18n subsystem is known to be inconsistent with the Win32 base
+     (e.g. they have different character conversion facilities that produce
+     different results).  */
   /* Use our own table.  */
   {
     int primary, sub;
@@ -2509,82 +2504,10 @@
   return gl_locale_name_from_win32_LANGID (langid);
 }
 
-# ifdef WINDOWS_NATIVE
-
-/* Two variables to interface between get_lcid and the EnumLocales
-   callback function below.  */
-static LCID found_lcid;
-static char lname[LC_MAX * (LOCALE_NAME_MAX_LENGTH + 1) + 1];
-
-/* Callback function for EnumLocales.  */
-static BOOL CALLBACK
-enum_locales_fn (LPTSTR locale_num_str)
-{
-  char *endp;
-  char locval[2 * LOCALE_NAME_MAX_LENGTH + 1 + 1];
-  LCID try_lcid = strtoul (locale_num_str, &endp, 16);
-
-  if (GetLocaleInfo (try_lcid, LOCALE_SENGLANGUAGE,
-                    locval, LOCALE_NAME_MAX_LENGTH))
-    {
-      strcat (locval, "_");
-      if (GetLocaleInfo (try_lcid, LOCALE_SENGCOUNTRY,
-                        locval + strlen (locval), LOCALE_NAME_MAX_LENGTH))
-       {
-         size_t locval_len = strlen (locval);
-
-         if (strncmp (locval, lname, locval_len) == 0
-             && (lname[locval_len] == '.'
-                 || lname[locval_len] == '\0'))
-           {
-             found_lcid = try_lcid;
-             return FALSE;
-           }
-       }
-    }
-  return TRUE;
-}
-
-/* This lock protects the get_lcid against multiple simultaneous calls.  */
-gl_lock_define_initialized(static, get_lcid_lock)
-
-/* Return the Locale ID (LCID) number given the locale's name, a
-   string, in LOCALE_NAME.  This works by enumerating all the locales
-   supported by the system, until we find one whose name matches
-   LOCALE_NAME.  */
-static LCID
-get_lcid (const char *locale_name)
-{
-  /* A simple cache.  */
-  static LCID last_lcid;
-  static char last_locale[1000];
-
-  /* Lock while looking for an LCID, to protect access to static
-     variables: last_lcid, last_locale, found_lcid, and lname.  */
-  gl_lock_lock (get_lcid_lock);
-  if (last_lcid > 0 && strcmp (locale_name, last_locale) == 0)
-    {
-      gl_lock_unlock (get_lcid_lock);
-      return last_lcid;
-    }
-  strncpy (lname, locale_name, sizeof (lname) - 1);
-  lname[sizeof (lname) - 1] = '\0';
-  found_lcid = 0;
-  EnumSystemLocales (enum_locales_fn, LCID_SUPPORTED);
-  if (found_lcid > 0)
-    {
-      last_lcid = found_lcid;
-      strcpy (last_locale, locale_name);
-    }
-  gl_lock_unlock (get_lcid_lock);
-  return found_lcid;
-}
-
-# endif
 #endif
 
 
-#if HAVE_USELOCALE /* glibc or Mac OS X */
+#if HAVE_USELOCALE /* glibc or MacOS X */
 
 /* Simple hash set of strings.  We don't want to drag in lots of hash table
    code here.  */
@@ -2594,7 +2517,7 @@
 /* A hash function for NUL-terminated char* strings using
    the method described by Bruno Haible.
    See http://www.haible.de/bruno/hashfunc.html.  */
-static size_t _GL_ATTRIBUTE_PURE
+static size_t
 string_hash (const void *x)
 {
   const char *s = (const char *) x;
@@ -2684,7 +2607,7 @@
     locale_t thread_locale = uselocale (NULL);
     if (thread_locale != LC_GLOBAL_LOCALE)
       {
-#  if __GLIBC__ >= 2 && !defined __UCLIBC__
+#  if __GLIBC__ >= 2
         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
            glibc < 2.12.
            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
@@ -2695,34 +2618,133 @@
              nl_langinfo (_NL_LOCALE_NAME (category)).  */
           name = thread_locale->__names[category];
         return name;
-#  elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__)
-        /* FreeBSD, Mac OS X */
-        int mask;
-
+#  endif
+#  if defined __APPLE__ && defined __MACH__ /* MacOS X */
+        /* The locale name is found deep in an undocumented data structure.
+           Since it's stored in a buffer of size 32 and newlocale() rejects
+           locale names of length > 31, we can assume that it is NUL terminated
+           in this buffer. But we need to make a copy of the locale name, of
+           indefinite extent.  */
+        struct _xlocale_part1_v0 /* used in MacOS X 10.5 */
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            __darwin_mbstate_t __mbs[10];
+            int64_t __magic;
+          };
+        struct _xlocale_part1_v1 /* used in MacOS X >= 10.6.0 */
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            __darwin_mbstate_t __mbs[10];
+            /*pthread_lock_t*/ int __lock;
+            int64_t __magic;
+          };
+        struct _xlocale_part2
+          {
+            int64_t __magic;
+            unsigned char __collate_load_error;
+            unsigned char __collate_substitute_nontrivial;
+            unsigned char _messages_using_locale;
+            unsigned char _monetary_using_locale;
+            unsigned char _numeric_using_locale;
+            unsigned char _time_using_locale;
+            unsigned char __mlocale_changed;
+            unsigned char __nlocale_changed;
+            unsigned char __numeric_fp_cvt;
+            struct __xlocale_st_collate *__lc_collate;
+            struct __xlocale_st_runelocale *__lc_ctype;
+            struct __xlocale_st_messages *__lc_messages;
+            struct __xlocale_st_monetary *__lc_monetary;
+            struct __xlocale_st_numeric *__lc_numeric;
+            struct _xlocale *__lc_numeric_loc;
+            struct __xlocale_st_time *__lc_time;
+            /* more */
+          };
+        struct __xlocale_st_collate
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char __encoding[32];
+            /* more */
+          };
+        struct __xlocale_st_runelocale
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char __ctype_encoding[32];
+            /* more */
+          };
+        struct __xlocale_st_messages
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_messages_locale_buf;
+            /* more */
+          };
+        struct __xlocale_st_monetary
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_monetary_locale_buf;
+            /* more */
+          };
+        struct __xlocale_st_numeric {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_numeric_locale_buf;
+            /* more */
+          };
+        struct __xlocale_st_time {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_time_locale_buf;
+            /* more */
+          };
+        struct _xlocale_part2 *tlp;
+        if (((struct _xlocale_part1_v0 *) thread_locale)->__magic
+            == 0x786C6F63616C6530LL)
+          /* MacOS X 10.5 */
+          tlp =
+            (struct _xlocale_part2 *)
+            &((struct _xlocale_part1_v0 *) thread_locale)->__magic;
+        else if (((struct _xlocale_part1_v1 *) thread_locale)->__magic
+                 == 0x786C6F63616C6530LL)
+          /* MacOS X >= 10.6.0 */
+          tlp =
+            (struct _xlocale_part2 *)
+            &((struct _xlocale_part1_v1 *) thread_locale)->__magic;
+        else
+          /* Unsupported version of MacOS X: The internals of 'struct _xlocale'
+             have changed again.  */
+          return "";
         switch (category)
           {
           case LC_CTYPE:
-            mask = LC_CTYPE_MASK;
-            break;
+            return tlp->__lc_ctype->__ctype_encoding;
           case LC_NUMERIC:
-            mask = LC_NUMERIC_MASK;
-            break;
+            return tlp->_numeric_using_locale
+                   ? tlp->__lc_numeric->_numeric_locale_buf
+                   : "C";
           case LC_TIME:
-            mask = LC_TIME_MASK;
-            break;
+            return tlp->_time_using_locale
+                   ? tlp->__lc_time->_time_locale_buf
+                   : "C";
           case LC_COLLATE:
-            mask = LC_COLLATE_MASK;
-            break;
+            return !tlp->__collate_load_error
+                   ? tlp->__lc_collate->__encoding
+                   : "C";
           case LC_MONETARY:
-            mask = LC_MONETARY_MASK;
-            break;
+            return tlp->_monetary_using_locale
+                   ? tlp->__lc_monetary->_monetary_locale_buf
+                   : "C";
           case LC_MESSAGES:
-            mask = LC_MESSAGES_MASK;
-            break;
+            return tlp->_messages_using_locale
+                   ? tlp->__lc_messages->_messages_locale_buf
+                   : "C";
           default: /* We shouldn't get here.  */
             return "";
           }
-        return querylocale (mask, thread_locale);
 #  endif
       }
   }
@@ -2739,27 +2761,6 @@
   const char *name = gl_locale_name_thread_unsafe (category, categoryname);
   if (name != NULL)
     return struniq (name);
-#elif defined WINDOWS_NATIVE
-  if (LC_MIN <= category && category <= LC_MAX)
-    {
-      char *locname = setlocale (category, NULL);
-      LCID lcid = 0;
-
-      /* If CATEGORY is LC_ALL, the result might be a semi-colon
-        separated list of locales.  We need only one, so we take the
-        one corresponding to LC_CTYPE, as the most important for
-        character translations.  */
-      if (strchr (locname, ';'))
-       locname = setlocale (LC_CTYPE, NULL);
-
-      /* Convert locale name to LCID.  We don't want to use
-         LocaleNameToLCID because (a) it is only available since Vista,
-         and (b) it doesn't accept locale names returned by 'setlocale'.  */
-      lcid = get_lcid (locname);
-
-      if (lcid > 0)
-        return gl_locale_name_from_win32_LCID (lcid);
-    }
 #endif
   return NULL;
 }
@@ -2770,7 +2771,7 @@
    However it does not specify the exact format.  Neither do SUSV2 and
    ISO C 99.  So we can use this feature only on selected systems (e.g.
    those using GNU C Library).  */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
+#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
 # define HAVE_LOCALE_NULL
 #endif
 
@@ -2785,8 +2786,8 @@
   /* On other systems we ignore what setlocale reports and instead look at the
      environment variables directly.  This is necessary
        1. on systems which have a facility for customizing the default locale
-          (Mac OS X, native Windows, Cygwin) and where the system's setlocale()
-          function ignores this default locale (Mac OS X, Cygwin), in two cases:
+          (MacOS X, native Windows, Cygwin) and where the system's setlocale()
+          function ignores this default locale (MacOS X, Cygwin), in two cases:
           a. when the user missed to use the setlocale() override from libintl
              (for example by not including <libintl.h>),
           b. when setlocale supports only the "C" locale, such as on Cygwin
@@ -2821,7 +2822,7 @@
   if (retval != NULL && retval[0] != '\0')
     {
 #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-      /* Mac OS X 10.2 or newer.
+      /* MacOS X 10.2 or newer.
          Ignore invalid LANG value set by the Terminal application.  */
       if (strcmp (retval, "UTF-8") != 0)
 #endif
@@ -2848,10 +2849,10 @@
       locale, customizing it for each location.  POSIX:2001 does not require
       such a facility.
 
-     The systems with such a facility are Mac OS X and Windows: They provide a
+     The systems with such a facility are MacOS X and Windows: They provide a
      GUI that allows the user to choose a locale.
-       - On Mac OS X, by default, none of LC_* or LANG are set.  Starting with
-         Mac OS X 10.4 or 10.5, LANG is set for processes launched by the
+       - On MacOS X, by default, none of LC_* or LANG are set.  Starting with
+         MacOS X 10.4 or 10.5, LANG is set for processes launched by the
          'Terminal' application (but sometimes to an incorrect value "UTF-8").
          When no environment variable is set, setlocale (LC_ALL, "") uses the
          "C" locale.
@@ -2867,7 +2868,7 @@
          "C.UTF-8" locale, which operates in the same way as the "C" locale.
   */
 
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WIN32_NATIVE || defined __CYGWIN__)
 
   /* The system does not have a way of setting the locale, other than the
      POSIX specified environment variables.  We use C as default locale.  */
@@ -2881,7 +2882,7 @@
      codeset.  */
 
 # if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-  /* Mac OS X 10.2 or newer */
+  /* MacOS X 10.2 or newer */
   {
     /* Cache the locale name, since CoreFoundation calls are expensive.  */
     static const char *cached_localename;
@@ -2889,7 +2890,7 @@
     if (cached_localename == NULL)
       {
         char namebuf[256];
-#  if HAVE_CFLOCALECOPYCURRENT /* Mac OS X 10.3 or newer */
+#  if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
         CFLocaleRef locale = CFLocaleCopyCurrent ();
         CFStringRef name = CFLocaleGetIdentifier (locale);
 
@@ -2900,7 +2901,7 @@
             cached_localename = strdup (namebuf);
           }
         CFRelease (locale);
-#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* Mac OS X 10.2 or newer */
+#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
         CFTypeRef value =
           CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
                                      kCFPreferencesCurrentApplication);
@@ -2922,11 +2923,11 @@
 
 # endif
 
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
   {
     LCID lcid;
 
-    /* Use native Windows API locale ID.  */
+    /* Use native Win32 API locale ID.  */
     lcid = GetThreadLocale ();
 
     return gl_locale_name_from_win32_LCID (lcid);
diff -Nru gettext-0.19.3/gettext-runtime/intl/lock.c gettext-0.18.1.1/gettext-runtime/intl/lock.c
--- gettext-0.19.3/gettext-runtime/intl/lock.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/lock.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Locking in multithreaded situations.
    Copyright (C) 2005-2008 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -629,7 +631,7 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
 /* -------------------------- gl_lock_t datatype -------------------------- */
 
@@ -682,7 +684,7 @@
 /* In this file, the waitqueues are implemented as circular arrays.  */
 #define gl_waitqueue_t gl_carray_waitqueue_t
 
-static void
+static inline void
 gl_waitqueue_init (gl_waitqueue_t *wq)
 {
   wq->array = NULL;
@@ -743,7 +745,7 @@
 }
 
 /* Notifies the first thread from a wait queue and dequeues it.  */
-static void
+static inline void
 gl_waitqueue_notify_first (gl_waitqueue_t *wq)
 {
   SetEvent (wq->array[wq->offset + 0]);
@@ -754,7 +756,7 @@
 }
 
 /* Notifies all threads from a wait queue and dequeues them all.  */
-static void
+static inline void
 gl_waitqueue_notify_all (gl_waitqueue_t *wq)
 {
   unsigned int i;
diff -Nru gettext-0.19.3/gettext-runtime/intl/lock.h gettext-0.18.1.1/gettext-runtime/intl/lock.h
--- gettext-0.19.3/gettext-runtime/intl/lock.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/lock.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Locking in multithreaded situations.
    Copyright (C) 2005-2008 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -613,17 +615,16 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 # ifdef __cplusplus
 extern "C" {
 # endif
 
-/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
-   Mutex, Semaphore types, because
+/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex,
+   Semaphore types, because
      - we need only to synchronize inside a single process (address space),
        not inter-process locking,
      - we don't need to support trylock operations.  (TryEnterCriticalSection
@@ -709,9 +710,9 @@
 
 /* --------------------- gl_recursive_lock_t datatype --------------------- */
 
-/* The native Windows documentation says that CRITICAL_SECTION already
-   implements a recursive lock.  But we need not rely on it: It's easy to
-   implement a recursive lock without this assumption.  */
+/* The Win32 documentation says that CRITICAL_SECTION already implements a
+   recursive lock.  But we need not rely on it: It's easy to implement a
+   recursive lock without this assumption.  */
 
 typedef struct
         {
@@ -763,7 +764,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/log.c gettext-0.18.1.1/gettext-runtime/intl/log.c
--- gettext-0.19.3/gettext-runtime/intl/log.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/log.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Log file output.
    Copyright (C) 2003, 2005, 2009 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/Makefile.in gettext-0.18.1.1/gettext-runtime/intl/Makefile.in
--- gettext-0.19.3/gettext-runtime/intl/Makefile.in	2014-07-14 09:30:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/Makefile.in	2010-06-06 12:49:57.000000000 +0000
@@ -1,23 +1,25 @@
 # Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2007, 2009-2010 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
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = @SHELL@
+SHELL = /bin/sh
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -123,13 +125,12 @@
   lock.h \
   relocatable.h \
   tsearch.h tsearch.c \
-  verify.h \
   xsize.h \
   printf-args.h printf-args.c \
   printf-parse.h wprintf-parse.h printf-parse.c \
   vasnprintf.h vasnwprintf.h vasnprintf.c \
   os2compat.h \
-  libgnuintl.in.h
+  libgnuintl.h.in
 SOURCES = \
   bindtextdom.c \
   dcgettext.c \
@@ -158,7 +159,6 @@
   printf.c \
   setlocale.c \
   version.c \
-  xsize.c \
   osdep.c \
   os2compat.c \
   intl-exports.c \
@@ -191,7 +191,6 @@
   printf.$lo \
   setlocale.$lo \
   version.$lo \
-  xsize.$lo \
   osdep.$lo \
   intl-compat.$lo
 OBJECTS_RES_yes = libintl.res.$lo
@@ -201,10 +200,9 @@
 $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = ChangeLog COPYING.LIB libintl.glibc README.woe32
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 COPYING.LIB-2.0 COPYING.LIB-2.1 \
-gettext.h libgettext.h plural-eval.c libgnuintl.h \
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
 libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
 libgnuintl.h.msvc-shared Makefile.msvc
 
@@ -234,7 +232,7 @@
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
 LTV_CURRENT=9
-LTV_REVISION=2
+LTV_REVISION=1
 LTV_AGE=1
 
 .SUFFIXES:
@@ -301,8 +299,6 @@
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/setlocale.c
 version.lo: $(srcdir)/version.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/version.c
-xsize.lo: $(srcdir)/xsize.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/xsize.c
 osdep.lo: $(srcdir)/osdep.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/osdep.c
 intl-compat.lo: $(srcdir)/intl-compat.c
@@ -345,14 +341,14 @@
 
 INCLUDES = -I. -I$(srcdir) -I..
 
-libgnuintl.h: $(srcdir)/libgnuintl.in.h
+libgnuintl.h: $(srcdir)/libgnuintl.h.in
 	sed -e '/IN_LIBGLOCALE/d' \
 	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.in.h \
+	  < $(srcdir)/libgnuintl.h.in \
 	| if test '@WOE32DLL@' = yes; then \
 	    sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
 	  else \
@@ -363,14 +359,14 @@
 	| sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \
 	  > libgnuintl.h
 
-libintl.h: $(srcdir)/libgnuintl.in.h
+libintl.h: $(srcdir)/libgnuintl.h.in
 	sed -e '/IN_LIBGLOCALE/d' \
 	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.in.h > libintl.h
+	  < $(srcdir)/libgnuintl.h.in > libintl.h
 
 charset.alias: $(srcdir)/config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
@@ -382,7 +378,7 @@
 # system which has the GNU gettext() function in its C library or in a
 # separate library.
 # If you want to use the one which comes with this version of the
-# package, you have to use "configure --with-included-gettext".
+# package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
 	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
@@ -460,7 +456,8 @@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  dists="COPYING.LIB $(DISTFILES.common)"; \
+	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -570,7 +567,7 @@
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in VERSION COPYING.LIB $(DISTFILES.common) $(DISTFILES.generated); do \
+	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
@@ -589,7 +586,7 @@
 localcharset.$lo: $(srcdir)/localcharset.h
 bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h
 localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/xsize.c $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
+printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
 
 # A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
 PLURAL_DEPS_yes = libintl.h
@@ -622,7 +619,7 @@
 distclean: clean
 	rm -f Makefile ID TAGS
 	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
-	  rm -f $(DISTFILES.normal); \
+	  rm -f ChangeLog.inst $(DISTFILES.normal); \
 	else \
 	  : ; \
 	fi
@@ -632,7 +629,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 
 
-# GNU gettext needs not contain the file 'VERSION' but contains some
+# GNU gettext needs not contain the file `VERSION' but contains some
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: Makefile
@@ -645,7 +642,7 @@
 	    additional="$(DISTFILES.normal)"; \
 	  fi; \
 	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	  for file in $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
 	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
 	    cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
 	  done; \
diff -Nru gettext-0.19.3/gettext-runtime/intl/ngettext.c gettext-0.18.1.1/gettext-runtime/intl/ngettext.c
--- gettext-0.19.3/gettext-runtime/intl/ngettext.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/ngettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of ngettext(3) function.
    Copyright (C) 1995, 1997, 2000-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/os2compat.c gettext-0.18.1.1/gettext-runtime/intl/os2compat.c
--- gettext-0.19.3/gettext-runtime/intl/os2compat.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/os2compat.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* OS/2 compatibility functions.
    Copyright (C) 2001-2002 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #define OS2_AWARE
 #ifdef HAVE_CONFIG_H
diff -Nru gettext-0.19.3/gettext-runtime/intl/os2compat.h gettext-0.18.1.1/gettext-runtime/intl/os2compat.h
--- gettext-0.19.3/gettext-runtime/intl/os2compat.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/os2compat.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    This file is intended to be included from config.h
    Copyright (C) 2001-2002 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* When included from os2compat.h we need all the original definitions */
 #ifndef OS2_AWARE
diff -Nru gettext-0.19.3/gettext-runtime/intl/osdep.c gettext-0.18.1.1/gettext-runtime/intl/osdep.c
--- gettext-0.19.3/gettext-runtime/intl/osdep.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/osdep.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,20 +1,22 @@
 /* OS dependent parts of libintl.
    Copyright (C) 2001-2002, 2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
-#if defined __CYGWIN__ || defined __MINGW32__
+#if defined __CYGWIN__
 # include "intl-exports.c"
 #elif defined __EMX__
 # include "os2compat.c"
diff -Nru gettext-0.19.3/gettext-runtime/intl/plural.c gettext-0.18.1.1/gettext-runtime/intl/plural.c
--- gettext-0.19.3/gettext-runtime/intl/plural.c	2014-10-16 06:02:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/plural.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,21 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
+/* A Bison parser, made by GNU Bison 2.3a.  */
 
-/* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This 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.
-   
+   the Free Software Foundation; either version 2, 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/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -26,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,50 +47,49 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7"
+#define YYBISON_VERSION "2.3a"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Pure parsers.  */
-#define YYPURE 2
-
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
+#define YYPURE 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         __gettextparse
-#define yylex           __gettextlex
-#define yyerror         __gettexterror
-#define yylval          __gettextlval
-#define yychar          __gettextchar
-#define yydebug         __gettextdebug
-#define yynerrs         __gettextnerrs
+#define yyparse __gettextparse
+#define yylex   __gettextlex
+#define yyerror __gettexterror
+#define yylval  __gettextlval
+#define yychar  __gettextchar
+#define yydebug __gettextdebug
+#define yynerrs __gettextnerrs
+
 
 /* Copy the first part of user declarations.  */
-/* Line 371 of yacc.c  */
+/* Line 164 of yacc.c.  */
 #line 1 "plural.y"
 
 /* Expression parsing for plural form selection.
    Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* For bison < 2.0, the bison generated parser uses alloca.  AIX 3 forces us
    to put this declaration at the beginning of the file.  The declaration in
@@ -113,17 +115,14 @@
 # define __gettextparse PLURAL_PARSE
 #endif
 
+#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM	arg
 
-/* Line 371 of yacc.c  */
-#line 119 "plural.c"
 
-# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -133,18 +132,12 @@
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "plural.h".  */
-#ifndef YY__GETTEXT_PLURAL_H_INCLUDED
-# define YY__GETTEXT_PLURAL_H_INCLUDED
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int __gettextdebug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -167,49 +160,34 @@
 
 
 
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-/* Line 387 of yacc.c  */
-#line 49 "plural.y"
+{/* Line 191 of yacc.c.  */
+#line 51 "plural.y"
 
   unsigned long int num;
   enum expression_operator op;
   struct expression *exp;
-
-
-/* Line 387 of yacc.c  */
-#line 183 "plural.c"
-} YYSTYPE;
+}
+/* Line 191 of yacc.c.  */
+#line 175 "plural.c"
+	YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int __gettextparse (void *YYPARSE_PARAM);
-#else
-int __gettextparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int __gettextparse (struct parse_args *arg);
-#else
-int __gettextparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY__GETTEXT_PLURAL_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
-/* Line 390 of yacc.c  */
-#line 55 "plural.y"
+/* Line 221 of yacc.c.  */
+#line 57 "plural.y"
 
 /* Prototypes for local functions.  */
-static int yylex (YYSTYPE *lval, struct parse_args *arg);
-static void yyerror (struct parse_args *arg, const char *str);
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
 
 /* Allocation of expressions.  */
 
@@ -282,8 +260,8 @@
 }
 
 
-/* Line 390 of yacc.c  */
-#line 287 "plural.c"
+/* Line 221 of yacc.c.  */
+#line 265 "plural.c"
 
 #ifdef short
 # undef short
@@ -333,27 +311,27 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(Msgid) Msgid
+#  define YY_(msgid) msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+# define YYUSE(e) ((void) (e))
 #else
-# define YYUSE(E) /* empty */
+# define YYUSE(e) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(N) (N)
+# define YYID(n) (n)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
@@ -386,12 +364,11 @@
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -414,24 +391,24 @@
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -447,9 +424,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -460,19 +437,35 @@
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -480,26 +473,6 @@
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  9
 /* YYLAST -- Last index in YYTABLE.  */
@@ -575,19 +548,19 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,   152,   152,   160,   164,   168,   172,   176,   180,   184,
-     188,   192,   196,   201
+       0,   154,   154,   162,   166,   170,   174,   178,   182,   186,
+     190,   194,   198,   203
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
   "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
-  "$accept", "start", "exp", YY_NULL
+  "$accept", "start", "exp", 0
 };
 #endif
 
@@ -615,8 +588,8 @@
        2,     1,     1,     3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -649,7 +622,8 @@
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -661,12 +635,6 @@
       16,    13,    14,    15,    16
 };
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-10)))
-
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-
 static const yytype_int8 yycheck[] =
 {
        1,    10,    11,     4,    13,    14,     8,     9,     0,    10,
@@ -698,54 +666,82 @@
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (arg, YY_("syntax error: cannot back up")); \
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
 
-/* Error token number */
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* This macro is provided for backward compatibility. */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex (&yylval, arg)
+# define YYLEX yylex (&yylval)
 #endif
 
 /* Enable debugging if requested.  */
@@ -768,7 +764,7 @@
     {									  \
       YYFPRINTF (stderr, "%s ", Title);					  \
       yy_symbol_print (stderr,						  \
-		  Type, Value, arg); \
+		  Type, Value); \
       YYFPRINTF (stderr, "\n");						  \
     }									  \
 } while (YYID (0))
@@ -782,21 +778,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parse_args *arg)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 #else
 static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg)
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
     FILE *yyoutput;
     int yytype;
     YYSTYPE const * const yyvaluep;
-    struct parse_args *arg;
 #endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
-  YYUSE (arg);
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
@@ -806,7 +798,7 @@
   switch (yytype)
     {
       default:
-        break;
+	break;
     }
 }
 
@@ -818,14 +810,13 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parse_args *arg)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 #else
 static void
-yy_symbol_print (yyoutput, yytype, yyvaluep, arg)
+yy_symbol_print (yyoutput, yytype, yyvaluep)
     FILE *yyoutput;
     int yytype;
     YYSTYPE const * const yyvaluep;
-    struct parse_args *arg;
 #endif
 {
   if (yytype < YYNTOKENS)
@@ -833,7 +824,7 @@
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg);
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
 }
 
@@ -876,13 +867,12 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule, struct parse_args *arg)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyvsp, yyrule, arg)
+yy_reduce_print (yyvsp, yyrule)
     YYSTYPE *yyvsp;
     int yyrule;
-    struct parse_args *arg;
 #endif
 {
   int yynrhs = yyr2[yyrule];
@@ -893,18 +883,18 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       , arg);
-      YYFPRINTF (stderr, "\n");
+		       		       );
+      fprintf (stderr, "\n");
     }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule, arg); \
+    yy_reduce_print (yyvsp, Rule); \
 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -934,6 +924,7 @@
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1036,145 +1027,115 @@
 }
 # endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
+  int yyn = yypact[yystate];
 
-  switch (yycount)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
 
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
 
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
 #endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1184,18 +1145,16 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct parse_args *arg)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep, arg)
+yydestruct (yymsg, yytype, yyvaluep)
     const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
-    struct parse_args *arg;
 #endif
 {
   YYUSE (yyvaluep);
-  YYUSE (arg);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -1205,9 +1164,28 @@
     {
 
       default:
-        break;
+	break;
     }
 }
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
 
 
 
@@ -1230,77 +1208,30 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (struct parse_args *arg)
+yyparse (void)
 #else
 int
-yyparse (arg)
-    struct parse_args *arg;
+yyparse ()
+
 #endif
 #endif
 {
-/* The lookahead symbol.  */
+  /* The lookahead symbol.  */
 int yychar;
 
-
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-/* Default value used for initialization, for pacifying older GCCs
-   or non-GCC compilers.  */
-static YYSTYPE yyval_default;
-# define YY_INITIAL_VALUE(Value) = Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-
-    /* Number of syntax errors so far.  */
-    int yynerrs;
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
+YYSTYPE yylval;
 
-    YYSIZE_T yystacksize;
+/* Number of syntax errors so far.  */
+int yynerrs;
 
+  int yystate;
   int yyn;
   int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1308,22 +1239,54 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1350,6 +1313,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1357,6 +1321,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1379,8 +1344,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1391,6 +1357,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1415,7 +1382,7 @@
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1446,8 +1413,8 @@
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1464,9 +1431,7 @@
   yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1503,90 +1468,90 @@
   switch (yyn)
     {
         case 2:
-/* Line 1792 of yacc.c  */
-#line 153 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 155 "plural.y"
     {
 	    if ((yyvsp[(1) - (1)].exp) == NULL)
 	      YYABORT;
-	    arg->res = (yyvsp[(1) - (1)].exp);
+	    ((struct parse_args *) arg)->res = (yyvsp[(1) - (1)].exp);
 	  }
     break;
 
   case 3:
-/* Line 1792 of yacc.c  */
-#line 161 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 163 "plural.y"
     {
 	    (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp));
 	  }
     break;
 
   case 4:
-/* Line 1792 of yacc.c  */
-#line 165 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 167 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 5:
-/* Line 1792 of yacc.c  */
-#line 169 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 171 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 6:
-/* Line 1792 of yacc.c  */
-#line 173 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 175 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 7:
-/* Line 1792 of yacc.c  */
-#line 177 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 179 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 8:
-/* Line 1792 of yacc.c  */
-#line 181 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 183 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 9:
-/* Line 1792 of yacc.c  */
-#line 185 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 187 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
 	  }
     break;
 
   case 10:
-/* Line 1792 of yacc.c  */
-#line 189 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 191 "plural.y"
     {
 	    (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp));
 	  }
     break;
 
   case 11:
-/* Line 1792 of yacc.c  */
-#line 193 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 195 "plural.y"
     {
 	    (yyval.exp) = new_exp_0 (var);
 	  }
     break;
 
   case 12:
-/* Line 1792 of yacc.c  */
-#line 197 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 199 "plural.y"
     {
 	    if (((yyval.exp) = new_exp_0 (num)) != NULL)
 	      (yyval.exp)->val.num = (yyvsp[(1) - (1)].num);
@@ -1594,29 +1559,18 @@
     break;
 
   case 13:
-/* Line 1792 of yacc.c  */
-#line 202 "plural.y"
+/* Line 1269 of yacc.c.  */
+#line 204 "plural.y"
     {
 	    (yyval.exp) = (yyvsp[(2) - (3)].exp);
 	  }
     break;
 
 
-/* Line 1792 of yacc.c  */
-#line 1607 "plural.c"
+/* Line 1269 of yacc.c.  */
+#line 1572 "plural.c"
       default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -1625,6 +1579,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1644,47 +1599,44 @@
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
-      yyerror (arg, YY_("syntax error"));
+      yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (arg, yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1704,7 +1656,7 @@
       else
 	{
 	  yydestruct ("Error: discarding",
-		      yytoken, &yylval, arg);
+		      yytoken, &yylval);
 	  yychar = YYEMPTY;
 	}
     }
@@ -1743,7 +1695,7 @@
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -1760,15 +1712,13 @@
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp, arg);
+		  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -1792,25 +1742,20 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (arg, YY_("memory exhausted"));
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
   if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval, arg);
-    }
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -1818,7 +1763,7 @@
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp, arg);
+		  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1834,8 +1779,8 @@
 }
 
 
-/* Line 2055 of yacc.c  */
-#line 207 "plural.y"
+/* Line 1486 of yacc.c.  */
+#line 209 "plural.y"
 
 
 void
@@ -1866,16 +1811,16 @@
 
 
 static int
-yylex (YYSTYPE *lval, struct parse_args *arg)
+yylex (YYSTYPE *lval, const char **pexp)
 {
-  const char *exp = arg->cp;
+  const char *exp = *pexp;
   int result;
 
   while (1)
     {
       if (exp[0] == '\0')
 	{
-	  arg->cp = exp;
+	  *pexp = exp;
 	  return YYEOF;
 	}
 
@@ -2002,14 +1947,15 @@
       break;
     }
 
-  arg->cp = exp;
+  *pexp = exp;
 
   return result;
 }
 
 
 static void
-yyerror (struct parse_args *arg, const char *str)
+yyerror (const char *str)
 {
   /* Do nothing.  We don't print error messages here.  */
 }
+
diff -Nru gettext-0.19.3/gettext-runtime/intl/plural-exp.c gettext-0.18.1.1/gettext-runtime/intl/plural-exp.c
--- gettext-0.19.3/gettext-runtime/intl/plural-exp.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/plural-exp.c	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2000-2001, 2003, 2005-2007 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/plural-exp.h gettext-0.18.1.1/gettext-runtime/intl/plural-exp.h
--- gettext-0.19.3/gettext-runtime/intl/plural-exp.h	2014-04-23 08:55:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/plural-exp.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2000-2003, 2005-2007 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _PLURAL_EXP_H
 #define _PLURAL_EXP_H
@@ -107,7 +109,7 @@
 
 extern void FREE_EXPRESSION (struct expression *exp)
      internal_function;
-extern int PLURAL_PARSE (struct parse_args *arg);
+extern int PLURAL_PARSE (void *arg);
 extern struct expression GERMANIC_PLURAL attribute_hidden;
 extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
 				       const struct expression **pluralp,
diff -Nru gettext-0.19.3/gettext-runtime/intl/plural.y gettext-0.18.1.1/gettext-runtime/intl/plural.y
--- gettext-0.19.3/gettext-runtime/intl/plural.y	2014-04-24 03:41:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/plural.y	2010-06-06 12:49:57.000000000 +0000
@@ -3,18 +3,20 @@
    Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* For bison < 2.0, the bison generated parser uses alloca.  AIX 3 forces us
    to put this declaration at the beginning of the file.  The declaration in
@@ -40,10 +42,10 @@
 # define __gettextparse PLURAL_PARSE
 #endif
 
+#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM	arg
 %}
-%parse-param {struct parse_args *arg}
-%lex-param {struct parse_args *arg}
-%define api.pure full
+%pure_parser
 %expect 7
 
 %union {
@@ -54,8 +56,8 @@
 
 %{
 /* Prototypes for local functions.  */
-static int yylex (YYSTYPE *lval, struct parse_args *arg);
-static void yyerror (struct parse_args *arg, const char *str);
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
 
 /* Allocation of expressions.  */
 
@@ -153,7 +155,7 @@
 	  {
 	    if ($1 == NULL)
 	      YYABORT;
-	    arg->res = $1;
+	    ((struct parse_args *) arg)->res = $1;
 	  }
 	;
 
@@ -234,16 +236,16 @@
 
 
 static int
-yylex (YYSTYPE *lval, struct parse_args *arg)
+yylex (YYSTYPE *lval, const char **pexp)
 {
-  const char *exp = arg->cp;
+  const char *exp = *pexp;
   int result;
 
   while (1)
     {
       if (exp[0] == '\0')
 	{
-	  arg->cp = exp;
+	  *pexp = exp;
 	  return YYEOF;
 	}
 
@@ -370,14 +372,14 @@
       break;
     }
 
-  arg->cp = exp;
+  *pexp = exp;
 
   return result;
 }
 
 
 static void
-yyerror (struct parse_args *arg, const char *str)
+yyerror (const char *str)
 {
   /* Do nothing.  We don't print error messages here.  */
 }
diff -Nru gettext-0.19.3/gettext-runtime/intl/printf-args.c gettext-0.18.1.1/gettext-runtime/intl/printf-args.c
--- gettext-0.19.3/gettext-runtime/intl/printf-args.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/printf-args.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Decomposed printf argument list.
    Copyright (C) 1999, 2002-2003, 2005-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file can be parametrized with the following macros:
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.
diff -Nru gettext-0.19.3/gettext-runtime/intl/printf-args.h gettext-0.18.1.1/gettext-runtime/intl/printf-args.h
--- gettext-0.19.3/gettext-runtime/intl/printf-args.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/printf-args.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003, 2006-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
@@ -134,14 +136,10 @@
 }
 argument;
 
-/* Number of directly allocated arguments (no malloc() needed).  */
-#define N_DIRECT_ALLOC_ARGUMENTS 7
-
 typedef struct
 {
   size_t count;
   argument *arg;
-  argument direct_alloc_arg[N_DIRECT_ALLOC_ARGUMENTS];
 }
 arguments;
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/printf.c gettext-0.18.1.1/gettext-runtime/intl/printf.c
--- gettext-0.19.3/gettext-runtime/intl/printf.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/printf.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* Formatted output to strings, using POSIX/XSI format strings with positions.
-   Copyright (C) 2003, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -68,7 +70,7 @@
 
 #define STATIC static
 
-/* This needs to be consistent with libgnuintl.in.h.  */
+/* This needs to be consistent with libgnuintl.h.in.  */
 #if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
 /* Don't break __attribute__((format(printf,M,N))).
    This redefinition is only possible because the libc in NetBSD, Cygwin,
@@ -191,13 +193,8 @@
 #if HAVE_SNPRINTF
 
 # if HAVE_DECL__SNPRINTF
-   /* Windows.  The mingw function vsnprintf() has fewer bugs than the MSVCRT
-      function _vsnprintf(), so prefer that.  */
-#  if defined __MINGW32__
-#   define system_vsnprintf vsnprintf
-#  else
-#   define system_vsnprintf _vsnprintf
-#  endif
+   /* Windows.  */
+#  define system_vsnprintf _vsnprintf
 # else
    /* Unix.  */
 #  define system_vsnprintf vsnprintf
@@ -213,8 +210,6 @@
     {
       size_t maxlength = length;
       char *result = libintl_vasnprintf (resultbuf, &length, format, args);
-      if (result == NULL)
-        return -1;
       if (result != resultbuf)
         {
           if (maxlength > 0)
@@ -309,8 +304,7 @@
 #endif
 
 # if HAVE_DECL__SNWPRINTF
-   /* Windows.  The function vswprintf() has a different signature than
-      on Unix; we use the function _vsnwprintf() instead.  */
+   /* Windows.  */
 #  define system_vswprintf _vsnwprintf
 # else
    /* Unix.  */
@@ -390,8 +384,6 @@
     {
       size_t maxlength = length;
       wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
-      if (result == NULL)
-        return -1;
       if (result != resultbuf)
         {
           if (maxlength > 0)
diff -Nru gettext-0.19.3/gettext-runtime/intl/printf-parse.c gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c
--- gettext-0.19.3/gettext-runtime/intl/printf-parse.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2008 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file can be parametrized with the following macros:
      CHAR_T             The element type of the format string.
@@ -62,9 +64,6 @@
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
 
-/* memcpy().  */
-#include <string.h>
-
 /* errno.  */
 #include <errno.h>
 
@@ -82,20 +81,23 @@
 int
 PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 {
-  const CHAR_T *cp = format;    /* pointer into format */
+  const CHAR_T *cp = format;            /* pointer into format */
   size_t arg_posn = 0;          /* number of regular arguments consumed */
-  size_t d_allocated;           /* allocated elements of d->dir */
-  size_t a_allocated;           /* allocated elements of a->arg */
+  size_t d_allocated;                   /* allocated elements of d->dir */
+  size_t a_allocated;                   /* allocated elements of a->arg */
   size_t max_width_length = 0;
   size_t max_precision_length = 0;
 
   d->count = 0;
-  d_allocated = N_DIRECT_ALLOC_DIRECTIVES;
-  d->dir = d->direct_alloc_dir;
+  d_allocated = 1;
+  d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE));
+  if (d->dir == NULL)
+    /* Out of memory.  */
+    goto out_of_memory_1;
 
   a->count = 0;
-  a_allocated = N_DIRECT_ALLOC_ARGUMENTS;
-  a->arg = a->direct_alloc_arg;
+  a_allocated = 0;
+  a->arg = NULL;
 
 #define REGISTER_ARG(_index_,_type_) \
   {                                                                     \
@@ -112,14 +114,12 @@
         if (size_overflow_p (memory_size))                              \
           /* Overflow, would lead to out of memory.  */                 \
           goto out_of_memory;                                           \
-        memory = (argument *) (a->arg != a->direct_alloc_arg            \
+        memory = (argument *) (a->arg                                   \
                                ? realloc (a->arg, memory_size)          \
                                : malloc (memory_size));                 \
         if (memory == NULL)                                             \
           /* Out of memory.  */                                         \
           goto out_of_memory;                                           \
-        if (a->arg == a->direct_alloc_arg)                              \
-          memcpy (memory, a->arg, a->count * sizeof (argument));        \
         a->arg = memory;                                                \
       }                                                                 \
     while (a->count <= n)                                               \
@@ -207,13 +207,6 @@
                   dp->flags |= FLAG_ZERO;
                   cp++;
                 }
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-              else if (*cp == 'I')
-                {
-                  dp->flags |= FLAG_LOCALIZED;
-                  cp++;
-                }
-#endif
               else
                 break;
             }
@@ -589,14 +582,10 @@
               if (size_overflow_p (memory_size))
                 /* Overflow, would lead to out of memory.  */
                 goto out_of_memory;
-              memory = (DIRECTIVE *) (d->dir != d->direct_alloc_dir
-                                      ? realloc (d->dir, memory_size)
-                                      : malloc (memory_size));
+              memory = (DIRECTIVE *) realloc (d->dir, memory_size);
               if (memory == NULL)
                 /* Out of memory.  */
                 goto out_of_memory;
-              if (d->dir == d->direct_alloc_dir)
-                memcpy (memory, d->dir, d->count * sizeof (DIRECTIVE));
               d->dir = memory;
             }
         }
@@ -615,18 +604,19 @@
   return 0;
 
 error:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
   errno = EINVAL;
   return -1;
 
 out_of_memory:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
+out_of_memory_1:
   errno = ENOMEM;
   return -1;
 }
diff -Nru gettext-0.19.3/gettext-runtime/intl/printf-parse.h gettext-0.18.1.1/gettext-runtime/intl/printf-parse.h
--- gettext-0.19.3/gettext-runtime/intl/printf-parse.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/printf-parse.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,26 +1,24 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _PRINTF_PARSE_H
 #define _PRINTF_PARSE_H
 
-#if HAVE_FEATURES_H
-# include <features.h> /* for __GLIBC__, __UCLIBC__ */
-#endif
-
 #include "printf-args.h"
 
 
@@ -31,16 +29,10 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
-#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)
 
-/* Number of directly allocated directives (no malloc() needed).  */
-#define N_DIRECT_ALLOC_DIRECTIVES 7
-
 /* A parsed directive.  */
 typedef struct
 {
@@ -65,7 +57,6 @@
   char_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  char_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 char_directives;
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/ref-add.sin gettext-0.18.1.1/gettext-runtime/intl/ref-add.sin
--- gettext-0.19.3/gettext-runtime/intl/ref-add.sin	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/ref-add.sin	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
 #
 #   Copyright (C) 2000 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
-#   the Free Software Foundation; either version 2.1 of the License, or
-#   (at your option) any later version.
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
 #
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+#   USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-runtime/intl/ref-del.sin gettext-0.18.1.1/gettext-runtime/intl/ref-del.sin
--- gettext-0.19.3/gettext-runtime/intl/ref-del.sin	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/ref-del.sin	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
 #
 #   Copyright (C) 2000 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
-#   the Free Software Foundation; either version 2.1 of the License, or
-#   (at your option) any later version.
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
 #
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+#   USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-runtime/intl/relocatable.c gettext-0.18.1.1/gettext-runtime/intl/relocatable.c
--- gettext-0.19.3/gettext-runtime/intl/relocatable.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/relocatable.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 
 /* Tell glibc's <stdio.h> to provide a prototype for getline().
@@ -23,7 +25,6 @@
 # define _GNU_SOURCE 1
 #endif
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -42,7 +43,7 @@
 # include "xalloc.h"
 #endif
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -69,8 +70,8 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -85,19 +86,6 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Whether to enable the more costly support for relocatable libraries.
-   It allows libraries to be have been installed with a different original
-   prefix than the program.  But it is quite costly, especially on Cygwin
-   platforms, see below.  Therefore we enable it by default only on native
-   Windows platforms.  */
-#ifndef ENABLE_COSTLY_RELOCATABLE
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-#  define ENABLE_COSTLY_RELOCATABLE 1
-# else
-#  define ENABLE_COSTLY_RELOCATABLE 0
-# endif
-#endif
-
 /* Original installation prefix.  */
 static char *orig_prefix;
 static size_t orig_prefix_len;
@@ -167,7 +155,7 @@
 #endif
 }
 
-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
 
 /* Convenience function:
    Computes the current installation prefix, based on the original
@@ -249,7 +237,7 @@
                often case-insensitive.  It's better to accept the comparison
                if the difference is only in case, rather than to fail.  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-            /* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
+            /* Win32, Cygwin, OS/2, DOS - case insignificant file system */
             if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
                 != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
               break;
@@ -297,17 +285,12 @@
 
 #endif /* !IN_LIBRARY || PIC */
 
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
 
 /* Full pathname of shared library, or NULL.  */
 static char *shared_library_fullname;
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-/* Native Windows only.
-   On Cygwin, it is better to use the Cygwin provided /proc interface, than
-   to use native Windows API and cygwin_conv_to_posix_path, because it
-   supports longer file names
-   (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 
 /* Determine the full pathname of the shared library when it is loaded.  */
 
@@ -329,23 +312,37 @@
         /* Shouldn't happen.  */
         return FALSE;
 
-      shared_library_fullname = strdup (location);
+      {
+#if defined __CYGWIN__
+        /* On Cygwin, we need to convert paths coming from Win32 system calls
+           to the Unix-like slashified notation.  */
+        static char location_as_posix_path[2 * MAX_PATH];
+        /* There's no error return defined for cygwin_conv_to_posix_path.
+           See cygwin-api/func-cygwin-conv-to-posix-path.html.
+           Does it overflow the buffer of expected size MAX_PATH or does it
+           truncate the path?  I don't know.  Let's catch both.  */
+        cygwin_conv_to_posix_path (location, location_as_posix_path);
+        location_as_posix_path[MAX_PATH - 1] = '\0';
+        if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+          /* A sign of buffer overflow or path truncation.  */
+          return FALSE;
+        shared_library_fullname = strdup (location_as_posix_path);
+#else
+        shared_library_fullname = strdup (location);
+#endif
+      }
     }
 
   return TRUE;
 }
 
-#else /* Unix */
+#else /* Unix except Cygwin */
 
 static void
 find_shared_library_fullname ()
 {
-#if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
-  /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
-     function.
-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
-     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
-     Cygwin 1.7.  */
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */
@@ -390,15 +387,15 @@
 #endif
 }
 
-#endif /* Native Windows / Unix */
+#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin, and native Windows.  */
+   Guaranteed to work only on Linux, Cygwin and Woe32.  */
 static char *
 get_shared_library_fullname ()
 {
-#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
   static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)
     {
@@ -418,7 +415,7 @@
 const char *
 relocate (const char *pathname)
 {
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
   static int initialized;
 
   /* Initialization code for a shared library.  */
diff -Nru gettext-0.19.3/gettext-runtime/intl/relocatable.h gettext-0.18.1.1/gettext-runtime/intl/relocatable.h
--- gettext-0.19.3/gettext-runtime/intl/relocatable.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/relocatable.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2003, 2005, 2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _RELOCATABLE_H
 #define _RELOCATABLE_H
diff -Nru gettext-0.19.3/gettext-runtime/intl/setlocale.c gettext-0.18.1.1/gettext-runtime/intl/setlocale.c
--- gettext-0.19.3/gettext-runtime/intl/setlocale.c	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/setlocale.c	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2009 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 under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -854,14 +856,6 @@
 
           if (setlocale_unixlike (LC_ALL, base_name) == NULL)
             goto fail;
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-          /* On native Windows, setlocale(LC_ALL,...) may succeed but set the
-             LC_CTYPE category to an invalid value ("C") when it does not
-             support the specified encoding.  Report a failure instead.  */
-          if (strchr (base_name, '.') != NULL
-              && strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-            goto fail;
-# endif
 
           for (i = 0; i < sizeof (categories) / sizeof (categories[0]); i++)
             {
@@ -884,7 +878,6 @@
             }
 
           /* All steps were successful.  */
-          ++_nl_msg_cat_cntr;
           free (saved_locale);
           return setlocale (LC_ALL, NULL);
 
@@ -896,64 +889,16 @@
         }
       else
         {
-          char *result;
           const char *name =
             gl_locale_name_environ (category, category_to_name (category));
           if (name == NULL)
             name = gl_locale_name_default ();
 
-          result = setlocale_single (category, name);
-          if (result != NULL)
-            ++_nl_msg_cat_cntr;
-          return result;
+          return setlocale_single (category, name);
         }
     }
   else
-    {
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-      if (category == LC_ALL && locale != NULL && strchr (locale, '.') != NULL)
-        {
-          char *saved_locale;
-
-          /* Back up the old locale.  */
-          saved_locale = setlocale (LC_ALL, NULL);
-          if (saved_locale == NULL)
-            return NULL;
-          saved_locale = strdup (saved_locale);
-          if (saved_locale == NULL)
-            return NULL;
-
-          if (setlocale_unixlike (LC_ALL, locale) == NULL)
-            {
-              free (saved_locale);
-              return NULL;
-            }
-
-          /* On native Windows, setlocale(LC_ALL,...) may succeed but set the
-             LC_CTYPE category to an invalid value ("C") when it does not
-             support the specified encoding.  Report a failure instead.  */
-          if (strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-            {
-              if (saved_locale[0] != '\0') /* don't risk an endless recursion */
-                setlocale (LC_ALL, saved_locale);
-              free (saved_locale);
-              return NULL;
-            }
-
-          /* It was really successful.  */
-          ++_nl_msg_cat_cntr;
-          free (saved_locale);
-          return setlocale (LC_ALL, NULL);
-        }
-      else
-# endif
-        {
-          char *result = setlocale_single (category, locale);
-          if (result != NULL)
-            ++_nl_msg_cat_cntr;
-          return result;
-        }
-    }
+    return setlocale_single (category, locale);
 }
 
 # if HAVE_NEWLOCALE
diff -Nru gettext-0.19.3/gettext-runtime/intl/textdomain.c gettext-0.18.1.1/gettext-runtime/intl/textdomain.c
--- gettext-0.19.3/gettext-runtime/intl/textdomain.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/textdomain.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Implementation of the textdomain(3) function.
    Copyright (C) 1995-1998, 2000-2003, 2005-2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/threadlib.c gettext-0.18.1.1/gettext-runtime/intl/threadlib.c
--- gettext-0.19.3/gettext-runtime/intl/threadlib.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/threadlib.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Multithreading primitives.
    Copyright (C) 2005-2009 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/tsearch.c gettext-0.18.1.1/gettext-runtime/intl/tsearch.c
--- gettext-0.19.3/gettext-runtime/intl/tsearch.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/tsearch.c	2010-06-06 12:49:57.000000000 +0000
@@ -4,18 +4,20 @@
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Tree search for red/black trees.
    The algorithm for adding nodes is taken from one of the many "Algorithms"
diff -Nru gettext-0.19.3/gettext-runtime/intl/tsearch.h gettext-0.18.1.1/gettext-runtime/intl/tsearch.h
--- gettext-0.19.3/gettext-runtime/intl/tsearch.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/tsearch.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Binary tree data structure.
    Copyright (C) 2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _TSEARCH_H
 #define _TSEARCH_H
diff -Nru gettext-0.19.3/gettext-runtime/intl/vasnprintf.c gettext-0.18.1.1/gettext-runtime/intl/vasnprintf.c
--- gettext-0.19.3/gettext-runtime/intl/vasnprintf.c	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/vasnprintf.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2010 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file can be parametrized with the following macros:
      VASNPRINTF         The name of the function being defined.
@@ -87,8 +89,6 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-#include "verify.h"
-
 #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
 # include "float+.h"
@@ -275,10 +275,10 @@
 {
   const char *point;
   /* Determine it in a multithread-safe way.  We know nl_langinfo is
-     multithread-safe on glibc systems and Mac OS X systems, but is not required
+     multithread-safe on glibc systems and MacOS X systems, but is not required
      to be multithread-safe by POSIX.  sprintf(), however, is multithread-safe.
      localeconv() is rarely multithread-safe.  */
-#  if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__))
+#  if HAVE_NL_LANGINFO && (__GLIBC__ || (defined __APPLE__ && defined __MACH__))
   point = nl_langinfo (RADIXCHAR);
 #  elif 1
   char pointbuf[5];
@@ -323,11 +323,11 @@
 
 typedef unsigned int mp_limb_t;
 # define GMP_LIMB_BITS 32
-verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
+typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1];
 
 typedef unsigned long long mp_twolimb_t;
 # define GMP_TWOLIMB_BITS 64
-verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
+typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1];
 
 /* Representation of a bignum >= 0.  */
 typedef struct
@@ -552,61 +552,32 @@
       size_t s;
       {
         mp_limb_t msd = b_ptr[b_len - 1]; /* = b[n-1], > 0 */
-        /* Determine s = GMP_LIMB_BITS - integer_length (msd).
-           Code copied from gnulib's integer_length.c.  */
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-        s = __builtin_clz (msd);
-# else
-#  if defined DBL_EXPBIT0_WORD && defined DBL_EXPBIT0_BIT
-        if (GMP_LIMB_BITS <= DBL_MANT_BIT)
+        s = 31;
+        if (msd >= 0x10000)
           {
-            /* Use 'double' operations.
-               Assumes an IEEE 754 'double' implementation.  */
-#   define DBL_EXP_MASK ((DBL_MAX_EXP - DBL_MIN_EXP) | 7)
-#   define DBL_EXP_BIAS (DBL_EXP_MASK / 2 - 1)
-#   define NWORDS \
-     ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-            union { double value; unsigned int word[NWORDS]; } m;
-
-            /* Use a single integer to floating-point conversion.  */
-            m.value = msd;
-
-            s = GMP_LIMB_BITS
-                - (((m.word[DBL_EXPBIT0_WORD] >> DBL_EXPBIT0_BIT) & DBL_EXP_MASK)
-                   - DBL_EXP_BIAS);
+            msd = msd >> 16;
+            s -= 16;
           }
-        else
-#   undef NWORDS
-#  endif
+        if (msd >= 0x100)
           {
-            s = 31;
-            if (msd >= 0x10000)
-              {
-                msd = msd >> 16;
-                s -= 16;
-              }
-            if (msd >= 0x100)
-              {
-                msd = msd >> 8;
-                s -= 8;
-              }
-            if (msd >= 0x10)
-              {
-                msd = msd >> 4;
-                s -= 4;
-              }
-            if (msd >= 0x4)
-              {
-                msd = msd >> 2;
-                s -= 2;
-              }
-            if (msd >= 0x2)
-              {
-                msd = msd >> 1;
-                s -= 1;
-              }
+            msd = msd >> 8;
+            s -= 8;
+          }
+        if (msd >= 0x10)
+          {
+            msd = msd >> 4;
+            s -= 4;
+          }
+        if (msd >= 0x4)
+          {
+            msd = msd >> 2;
+            s -= 2;
+          }
+        if (msd >= 0x2)
+          {
+            msd = msd >> 1;
+            s -= 1;
           }
-# endif
       }
       /* 0 <= s < GMP_LIMB_BITS.
          Copy b, shifting it left by s bits.  */
@@ -913,9 +884,9 @@
   y = frexpl (x, &exp);
   if (!(y >= 0.0L && y < 1.0L))
     abort ();
-  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * 2^LDBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * LDBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^LDBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * LDBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'long double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'long double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -963,11 +934,11 @@
         abort ();
       m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo;
     }
-#  if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
-           precision.  */
+#if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
+         precision.  */
   if (!(y == 0.0L))
     abort ();
-#  endif
+#endif
   /* Normalise.  */
   while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0)
     m.nlimbs--;
@@ -1001,9 +972,9 @@
   y = frexp (x, &exp);
   if (!(y >= 0.0 && y < 1.0))
     abort ();
-  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * 2^DBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * DBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^DBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * DBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -1530,7 +1501,7 @@
 
 /* Returns the number of TCHAR_T units needed as temporary space for the result
    of sprintf or SNPRINTF of a single conversion directive.  */
-static size_t
+static inline size_t
 MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
                  arg_type type, int flags, size_t width, int has_precision,
                  size_t precision, int pad_ourselves)
@@ -1781,9 +1752,8 @@
     return NULL;
 
 #define CLEANUP() \
-  if (d.dir != d.direct_alloc_dir)                                      \
-    free (d.dir);                                                       \
-  if (a.arg != a.direct_alloc_arg)                                      \
+  free (d.dir);                                                         \
+  if (a.arg)                                                            \
     free (a.arg);
 
   if (PRINTF_FETCHARGS (args, &a) < 0)
@@ -1957,14 +1927,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2072,7 +2043,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2125,7 +2097,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2198,7 +2171,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2251,7 +2225,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2324,7 +2299,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2377,7 +2353,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2428,14 +2405,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2565,7 +2543,8 @@
                       characters = 0;
                     }
 
-                  if (characters < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2626,7 +2605,8 @@
                         }
                     }
 
-                  if (characters < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2642,7 +2622,7 @@
                   size_t characters;
 #  if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
-                  verify (sizeof (TCHAR_T) == 1);
+                  typedef int TCHAR_T_verify[2 * (sizeof (TCHAR_T) == 1) - 1];
                   TCHAR_T *tmpsrc;
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
@@ -2803,7 +2783,7 @@
                   if (has_width)
                     {
 #  if ENABLE_UNISTDIO
-                      /* Outside POSIX, it's preferable to compare the width
+                      /* Outside POSIX, it's preferrable to compare the width
                          against the number of _characters_ of the converted
                          value.  */
                       w = DCHAR_MBSNLEN (result + length, characters);
@@ -2817,7 +2797,8 @@
                     /* w doesn't matter.  */
                     w = 0;
 
-                  if (w < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2900,7 +2881,8 @@
                   length += tmpdst_len;
 #  endif
 
-                  if (w < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2927,16 +2909,17 @@
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
-                size_t count;
                 DCHAR_T tmpbuf[700];
                 DCHAR_T *tmp;
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -2947,14 +2930,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2964,6 +2948,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3339,14 +3324,11 @@
                     abort ();
 # endif
                   }
-
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -3379,26 +3361,28 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
 #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
@@ -3432,8 +3416,8 @@
                 arg_type type = a.arg[dp->arg_index].type;
 # endif
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
-                size_t count;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
@@ -3442,6 +3426,7 @@
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -3452,14 +3437,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -3469,6 +3455,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3908,9 +3895,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
+                                            size_t count = exponent + 1;
                                             /* Note: count <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -3924,10 +3911,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4378,9 +4365,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
-                                            /* Note: ecount <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            size_t count = exponent + 1;
+                                            /* Note: count <= precision = ndigits.  */
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -4394,10 +4381,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4525,11 +4512,9 @@
 
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -4562,36 +4547,36 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
             else
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                int has_width;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                int has_width;
                 size_t width;
 #endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION
@@ -4613,17 +4598,14 @@
                 TCHAR_T *fbp;
                 unsigned int prefix_count;
                 int prefixes[2] IF_LINT (= { 0 });
-                int orig_errno;
 #if !USE_SNPRINTF
                 size_t tmp_length;
                 TCHAR_T tmpbuf[700];
                 TCHAR_T *tmp;
 #endif
 
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                has_width = 0;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -4634,14 +4616,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -4651,9 +4634,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                     has_width = 1;
-#endif
                   }
 #endif
 
@@ -4771,10 +4752,6 @@
                   *fbp++ = ' ';
                 if (flags & FLAG_ALT)
                   *fbp++ = '#';
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-                if (flags & FLAG_LOCALIZED)
-                  *fbp++ = 'I';
-#endif
                 if (!pad_ourselves)
                   {
                     if (flags & FLAG_ZERO)
@@ -4858,21 +4835,20 @@
 #endif
                   *fbp = dp->conversion;
 #if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
                 fbp[1] = '%';
                 fbp[2] = 'n';
                 fbp[3] = '\0';
 # else
                 /* On glibc2 systems from glibc >= 2.3 - probably also older
-                   ones - we know that snprintf's return value conforms to
-                   ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and
-                   gl_SNPRINTF_TRUNCATION_C99 pass.
+                   ones - we know that snprintf's returns value conforms to
+                   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
                    Therefore we can avoid using %n in this situation.
                    On glibc2 systems from 2004-10-18 or newer, the use of %n
                    in format strings in writable memory may crash the program
                    (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
                    in this situation.  */
-                /* On native Windows systems (such as mingw), we can avoid using
+                /* On native Win32 systems (such as mingw), we can avoid using
                    %n because:
                      - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
                        snprintf does not write more than the specified number
@@ -4881,7 +4857,7 @@
                      - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf
                        allows us to recognize the case of an insufficient
                        buffer size: it returns -1 in this case.
-                   On native Windows systems (such as mingw) where the OS is
+                   On native Win32 systems (such as mingw) where the OS is
                    Windows Vista, the use of %n in format strings by default
                    crashes the program. See
                      <http://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
@@ -4925,8 +4901,6 @@
                 *(TCHAR_T *) (result + length) = '\0';
 #endif
 
-                orig_errno = errno;
-
                 for (;;)
                   {
                     int count = -1;
@@ -5141,8 +5115,7 @@
                                 size_t tmp_length =
                                   MAX_ROOM_NEEDED (&a, dp->arg_index,
                                                    dp->conversion, type, flags,
-                                                   width,
-                                                   has_precision,
+                                                   width, has_precision,
                                                    precision, pad_ourselves);
 
                                 if (maxlen < tmp_length)
@@ -5312,7 +5285,8 @@
                         DCHAR_T *tmpdst;
                         size_t tmpdst_len;
                         /* This code assumes that TCHAR_T is 'char'.  */
-                        verify (sizeof (TCHAR_T) == 1);
+                        typedef int TCHAR_T_verify
+                                    [2 * (sizeof (TCHAR_T) == 1) - 1];
 # if USE_SNPRINTF
                         tmpsrc = (TCHAR_T *) (result + length);
 # else
@@ -5405,7 +5379,7 @@
                       {
                         size_t w;
 # if ENABLE_UNISTDIO
-                        /* Outside POSIX, it's preferable to compare the width
+                        /* Outside POSIX, it's preferrable to compare the width
                            against the number of _characters_ of the converted
                            value.  */
                         w = DCHAR_MBSNLEN (result + length, count);
@@ -5525,7 +5499,6 @@
                     length += count;
                     break;
                   }
-                errno = orig_errno;
 #undef pad_ourselves
 #undef prec_ourselves
               }
diff -Nru gettext-0.19.3/gettext-runtime/intl/vasnprintf.h gettext-0.18.1.1/gettext-runtime/intl/vasnprintf.h
--- gettext-0.19.3/gettext-runtime/intl/vasnprintf.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/vasnprintf.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
@@ -28,7 +30,7 @@
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
-/* The __-protected variants of 'format' and 'printf' attributes
+/* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format
diff -Nru gettext-0.19.3/gettext-runtime/intl/vasnwprintf.h gettext-0.18.1.1/gettext-runtime/intl/vasnwprintf.h
--- gettext-0.19.3/gettext-runtime/intl/vasnwprintf.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/vasnwprintf.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* vswprintf with automatic memory allocation.
    Copyright (C) 2002-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _VASNWPRINTF_H
 #define _VASNWPRINTF_H
diff -Nru gettext-0.19.3/gettext-runtime/intl/verify.h gettext-0.18.1.1/gettext-runtime/intl/verify.h
--- gettext-0.19.3/gettext-runtime/intl/verify.h	2014-05-13 06:27:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/verify.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-/* Compile-time assert-like macros.
-
-   Copyright (C) 2005-2006, 2009-2014 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
-   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
-
-#ifndef _GL_VERIFY_H
-#define _GL_VERIFY_H
-
-
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
-   This is supported by GCC 4.6.0 and later, in C mode, and its use
-   here generates easier-to-read diagnostics when verify (R) fails.
-
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
-   This will likely be supported by future GCC versions, in C++ mode.
-
-   Use this only with GCC.  If we were willing to slow 'configure'
-   down we could also use it with other compilers, but since this
-   affects only the quality of diagnostics, why bother?  */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
-     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
-     && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
-   first G++ release that supports static_assert.  */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
-#endif
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   system headers, defines a conflicting _Static_assert that is no
-   better than ours; override it.  */
-#ifndef _GL_HAVE_STATIC_ASSERT
-# include <stddef.h>
-# undef _Static_assert
-#endif
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   If _Static_assert works, verify (R) uses it directly.  Similarly,
-   _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct
-   that is an operand of sizeof.
-
-   The code below uses several ideas for C++ compilers, and for C
-   compilers that do not support _Static_assert:
-
-   * The first step is ((R) ? 1 : -1).  Given an expression R, of
-     integral or boolean or floating-point type, this yields an
-     expression of integral type, whose value is later verified to be
-     constant and nonnegative.
-
-   * Next this expression W is wrapped in a type
-     struct _gl_verify_type {
-       unsigned int _gl_verify_error_if_negative: W;
-     }.
-     If W is negative, this yields a compile-time error.  No compiler can
-     deal with a bit-field of negative size.
-
-     One might think that an array size check would have the same
-     effect, that is, that the type struct { unsigned int dummy[W]; }
-     would work as well.  However, inside a function, some compilers
-     (such as C++ compilers and GNU C) allow local parameters and
-     variables inside array size expressions.  With these compilers,
-     an array size check would not properly diagnose this misuse of
-     the verify macro:
-
-       void function (int n) { verify (n < 0); }
-
-   * For the verify macro, the struct _gl_verify_type will need to
-     somehow be embedded into a declaration.  To be portable, this
-     declaration must declare an object, a constant, a function, or a
-     typedef name.  If the declared entity uses the type directly,
-     such as in
-
-       struct dummy {...};
-       typedef struct {...} dummy;
-       extern struct {...} *dummy;
-       extern void dummy (struct {...} *);
-       extern struct {...} *dummy (void);
-
-     two uses of the verify macro would yield colliding declarations
-     if the entity names are not disambiguated.  A workaround is to
-     attach the current line number to the entity name:
-
-       #define _GL_CONCAT0(x, y) x##y
-       #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-       extern struct {...} * _GL_CONCAT (dummy, __LINE__);
-
-     But this has the problem that two invocations of verify from
-     within the same macro would collide, since the __LINE__ value
-     would be the same for both invocations.  (The GCC __COUNTER__
-     macro solves this problem, but is not portable.)
-
-     A solution is to use the sizeof operator.  It yields a number,
-     getting rid of the identity of the type.  Declarations like
-
-       extern int dummy [sizeof (struct {...})];
-       extern void dummy (int [sizeof (struct {...})]);
-       extern int (*dummy (void)) [sizeof (struct {...})];
-
-     can be repeated.
-
-   * Should the implementation use a named struct or an unnamed struct?
-     Which of the following alternatives can be used?
-
-       extern int dummy [sizeof (struct {...})];
-       extern int dummy [sizeof (struct _gl_verify_type {...})];
-       extern void dummy (int [sizeof (struct {...})]);
-       extern void dummy (int [sizeof (struct _gl_verify_type {...})]);
-       extern int (*dummy (void)) [sizeof (struct {...})];
-       extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})];
-
-     In the second and sixth case, the struct type is exported to the
-     outer scope; two such declarations therefore collide.  GCC warns
-     about the first, third, and fourth cases.  So the only remaining
-     possibility is the fifth case:
-
-       extern int (*dummy (void)) [sizeof (struct {...})];
-
-   * GCC warns about duplicate declarations of the dummy function if
-     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
-     __COUNTER__ macro that can let us generate unique identifiers for
-     each dummy function, to suppress this warning.
-
-   * This implementation exploits the fact that older versions of GCC,
-     which do not support _Static_assert, also do not warn about the
-     last declaration mentioned above.
-
-   * GCC warns if -Wnested-externs is enabled and verify() is used
-     within a function body; but inside a function, you can always
-     arrange to use verify_expr() instead.
-
-   * In C++, any struct definition inside sizeof is invalid.
-     Use a template type to work around the problem.  */
-
-/* Concatenate two preprocessor tokens.  */
-#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-#define _GL_CONCAT0(x, y) x##y
-
-/* _GL_COUNTER is an integer, preferably one that changes each time we
-   use it.  Use __COUNTER__ if it works, falling back on __LINE__
-   otherwise.  __LINE__ isn't perfect, but it's better than a
-   constant.  */
-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-# define _GL_COUNTER __COUNTER__
-#else
-# define _GL_COUNTER __LINE__
-#endif
-
-/* Generate a symbol with the given prefix, making it unique if
-   possible.  */
-#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
-
-/* Verify requirement R at compile-time, as an integer constant expression
-   that returns 1.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.  */
-
-#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
-   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
-
-#ifdef __cplusplus
-# if !GNULIB_defined_struct__gl_verify_type
-template <int w>
-  struct _gl_verify_type {
-    unsigned int _gl_verify_error_if_negative: w;
-  };
-#  define GNULIB_defined_struct__gl_verify_type 1
-# endif
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    _gl_verify_type<(R) ? 1 : -1>
-#elif defined _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
-    }
-#else
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
-#endif
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.
-
-   Unfortunately, unlike C11, this implementation must appear as an
-   ordinary declaration, and cannot appear inside struct { ... }.  */
-
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
-#else
-# define _GL_VERIFY(R, DIAGNOSTIC)				       \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
-      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-#endif
-
-/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
-#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
-# endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#  define static_assert _Static_assert /* C11 requires this #define.  */
-# endif
-#endif
-
-/* @assert.h omit start@  */
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   There are two macros, since no single macro can be used in all
-   contexts in C.  verify_true (R) is for scalar contexts, including
-   integer constant expression contexts.  verify (R) is for declaration
-   contexts, e.g., the top level.  */
-
-/* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  This is equivalent to verify_expr (R, 1).
-
-   verify_true is obsolescent; please use verify_expr instead.  */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
-/* Verify requirement R at compile-time.  Return the value of the
-   expression E.  */
-
-#define verify_expr(R, E) \
-   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  */
-
-#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-/* Assume that R always holds.  This lets the compiler optimize
-   accordingly.  R should not have side-effects; it may or may not be
-   evaluated.  Behavior is undefined if R is false.  */
-
-#if (__has_builtin (__builtin_unreachable) \
-     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
-# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
-#elif 1200 <= _MSC_VER
-# define assume(R) __assume (R)
-#elif (defined lint \
-       && (__has_builtin (__builtin_trap) \
-           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
-  /* Doing it this way helps various packages when configured with
-     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
-     when 'assume' silences warnings even with older GCCs.  */
-# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
-#else
-# define assume(R) ((void) (0 && (R)))
-#endif
-
-/* @assert.h omit end@  */
-
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/intl/version.c gettext-0.18.1.1/gettext-runtime/intl/version.c
--- gettext-0.19.3/gettext-runtime/intl/version.c	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/version.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* libintl library version.
    Copyright (C) 2005 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/intl/wprintf-parse.h gettext-0.18.1.1/gettext-runtime/intl/wprintf-parse.h
--- gettext-0.19.3/gettext-runtime/intl/wprintf-parse.h	2013-03-07 08:44:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/wprintf-parse.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,26 +1,24 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _WPRINTF_PARSE_H
 #define _WPRINTF_PARSE_H
 
-#if HAVE_FEATURES_H
-# include <features.h> /* for __GLIBC__, __UCLIBC__ */
-#endif
-
 #include "printf-args.h"
 
 
@@ -31,16 +29,10 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
-#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)
 
-/* Number of directly allocated directives (no malloc() needed).  */
-#define N_DIRECT_ALLOC_DIRECTIVES 7
-
 /* A parsed directive.  */
 typedef struct
 {
@@ -53,7 +45,7 @@
   const wchar_t* precision_start;
   const wchar_t* precision_end;
   size_t precision_arg_index;
-  wchar_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */
+  wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
   size_t arg_index;
 }
 wchar_t_directive;
@@ -65,7 +57,6 @@
   wchar_t_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  wchar_t_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 wchar_t_directives;
 
diff -Nru gettext-0.19.3/gettext-runtime/intl/xsize.c gettext-0.18.1.1/gettext-runtime/intl/xsize.c
--- gettext-0.19.3/gettext-runtime/intl/xsize.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/xsize.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define XSIZE_INLINE _GL_EXTERN_INLINE
-#include "xsize.h"
diff -Nru gettext-0.19.3/gettext-runtime/intl/xsize.h gettext-0.18.1.1/gettext-runtime/intl/xsize.h
--- gettext-0.19.3/gettext-runtime/intl/xsize.h	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl/xsize.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008 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
-   the Free Software Foundation; either version 2.1, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _XSIZE_H
 #define _XSIZE_H
@@ -27,14 +29,6 @@
 # include <stdint.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef XSIZE_INLINE
-# define XSIZE_INLINE _GL_INLINE
-#endif
-
 /* The size of memory objects is often computed through expressions of
    type size_t. Example:
       void* p = malloc (header_size + n * element_size).
@@ -56,7 +50,7 @@
   ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
 
 /* Sum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -67,7 +61,7 @@
 }
 
 /* Sum of three sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -77,7 +71,7 @@
 }
 
 /* Sum of four sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -87,7 +81,7 @@
 }
 
 /* Maximum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -100,7 +94,7 @@
 
 /* Multiplication of a count with an element size, with overflow check.
    The count must be >= 0 and the element size must be > 0.
-   This is a macro, not a function, so that it works correctly even
+   This is a macro, not an inline function, so that it works correctly even
    when N is of a wider type and N > SIZE_MAX.  */
 #define xtimes(N, ELSIZE) \
   ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
@@ -112,6 +106,4 @@
 #define size_in_bounds_p(SIZE) \
   ((SIZE) != SIZE_MAX)
 
-_GL_INLINE_HEADER_END
-
 #endif /* _XSIZE_H */
diff -Nru gettext-0.19.3/gettext-runtime/intl-csharp/ChangeLog gettext-0.18.1.1/gettext-runtime/intl-csharp/ChangeLog
--- gettext-0.19.3/gettext-runtime/intl-csharp/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-csharp/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,34 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* intl.cs: Update copyright header.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/intl-csharp/intl.cs gettext-0.18.1.1/gettext-runtime/intl-csharp/intl.cs
--- gettext-0.19.3/gettext-runtime/intl-csharp/intl.cs	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-csharp/intl.cs	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
  * Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
  * Written by Bruno Haible <bruno@clisp.org>, 2003.
  *
- * 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /*
diff -Nru gettext-0.19.3/gettext-runtime/intl-csharp/Makefile.am gettext-0.18.1.1/gettext-runtime/intl-csharp/Makefile.am
--- gettext-0.19.3/gettext-runtime/intl-csharp/Makefile.am	2014-04-24 08:57:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-csharp/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -47,13 +47,13 @@
 
 install-dll: install-dll-@BUILDCSHARP@
 install-dll-no:
-	$(MKDIR_P) $(DESTDIR)$(libdir)
+	$(mkdir_p) $(DESTDIR)$(libdir)
 install-dll-yes: all-dll-yes
-	$(MKDIR_P) $(DESTDIR)$(libdir)
+	$(mkdir_p) $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) GNU.Gettext.dll $(DESTDIR)$(libdir)/GNU.Gettext.dll
 
 installdirs-dll:
-	$(MKDIR_P) $(DESTDIR)$(libdir)
+	$(mkdir_p) $(DESTDIR)$(libdir)
 
 uninstall-dll:
 	$(RM) $(DESTDIR)$(libdir)/GNU.Gettext.dll
@@ -83,14 +83,14 @@
 EXTRA_DIST += $(DOC_FILES)
 
 install-doc: all-doc
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/csharpdoc
+	$(mkdir_p) $(DESTDIR)$(htmldir)/csharpdoc
 	@for f in $(DOC_FILES); do \
 	  echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
 	done
 
 installdirs-doc:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/csharpdoc
+	$(mkdir_p) $(DESTDIR)$(htmldir)/csharpdoc
 
 uninstall-doc:
 	@for f in $(DOC_FILES); do \
diff -Nru gettext-0.19.3/gettext-runtime/intl-csharp/Makefile.in gettext-0.18.1.1/gettext-runtime/intl-csharp/Makefile.in
--- gettext-0.19.3/gettext-runtime/intl-csharp/Makefile.in	2014-10-16 06:01:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-csharp/Makefile.in	2010-06-06 20:11:37.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,54 +15,10 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,19 +34,16 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = intl-csharp
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -97,17 +51,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -116,9 +66,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -129,18 +78,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -154,11 +98,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -167,13 +109,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -194,28 +137,15 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -223,7 +153,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -252,9 +181,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -286,14 +213,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -301,25 +225,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -327,8 +242,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -341,20 +254,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -377,7 +282,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -396,29 +300,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -428,11 +323,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -440,7 +331,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -448,7 +338,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -464,13 +353,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -482,54 +369,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -537,49 +391,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -588,6 +426,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -595,9 +434,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -610,8 +447,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -632,37 +471,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -683,7 +511,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -691,13 +518,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -706,47 +534,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -761,7 +555,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -780,7 +573,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -797,7 +589,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -805,7 +596,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -813,8 +603,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -822,7 +610,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -830,8 +617,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -852,7 +637,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -867,17 +651,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -889,40 +670,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -937,36 +706,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -974,12 +731,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -995,9 +749,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1018,8 +770,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1033,9 +783,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1070,9 +818,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1080,7 +828,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1142,11 +889,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1193,15 +940,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1283,17 +1025,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-local \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-local
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-local maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local
 
 
 all-local: all-dll all-doc
@@ -1312,13 +1054,13 @@
 
 install-dll: install-dll-@BUILDCSHARP@
 install-dll-no:
-	$(MKDIR_P) $(DESTDIR)$(libdir)
+	$(mkdir_p) $(DESTDIR)$(libdir)
 install-dll-yes: all-dll-yes
-	$(MKDIR_P) $(DESTDIR)$(libdir)
+	$(mkdir_p) $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) GNU.Gettext.dll $(DESTDIR)$(libdir)/GNU.Gettext.dll
 
 installdirs-dll:
-	$(MKDIR_P) $(DESTDIR)$(libdir)
+	$(mkdir_p) $(DESTDIR)$(libdir)
 
 uninstall-dll:
 	$(RM) $(DESTDIR)$(libdir)/GNU.Gettext.dll
@@ -1337,14 +1079,14 @@
 all-doc: $(srcdir)/csharpdoc/index.html
 
 install-doc: all-doc
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/csharpdoc
+	$(mkdir_p) $(DESTDIR)$(htmldir)/csharpdoc
 	@for f in $(DOC_FILES); do \
 	  echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
 	done
 
 installdirs-doc:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/csharpdoc
+	$(mkdir_p) $(DESTDIR)$(htmldir)/csharpdoc
 
 uninstall-doc:
 	@for f in $(DOC_FILES); do \
diff -Nru gettext-0.19.3/gettext-runtime/intl-java/ChangeLog gettext-0.18.1.1/gettext-runtime/intl-java/ChangeLog
--- gettext-0.19.3/gettext-runtime/intl-java/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-java/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,34 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* gnu/gettext/GettextResource.java: Update copyright header.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/intl-java/gnu/gettext/GettextResource.java gettext-0.18.1.1/gettext-runtime/intl-java/gnu/gettext/GettextResource.java
--- gettext-0.19.3/gettext-runtime/intl-java/gnu/gettext/GettextResource.java	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-java/gnu/gettext/GettextResource.java	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* GNU gettext for Java
  * Copyright (C) 2001, 2007 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 package gnu.gettext;
diff -Nru gettext-0.19.3/gettext-runtime/intl-java/Makefile.am gettext-0.18.1.1/gettext-runtime/intl-java/Makefile.am
--- gettext-0.19.3/gettext-runtime/intl-java/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-java/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -53,13 +53,13 @@
 
 install-classes: install-classes-@BUILDJAVA@
 install-classes-no:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 install-classes-yes: all-classes-yes
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) libintl.jar $(DESTDIR)$(jardir)/libintl.jar
 
 installdirs-classes:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-classes:
 	$(RM) $(DESTDIR)$(jardir)/libintl.jar
@@ -91,16 +91,16 @@
 EXTRA_DIST += $(JAVADOC2_FILES)
 
 install-javadoc2: all-javadoc2
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
 	@for f in $(JAVADOC2_FILES); do \
 	  echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
 	done
 
 installdirs-javadoc2:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
 
 uninstall-javadoc2:
 	@for f in $(JAVADOC2_FILES); do \
diff -Nru gettext-0.19.3/gettext-runtime/intl-java/Makefile.in gettext-0.18.1.1/gettext-runtime/intl-java/Makefile.in
--- gettext-0.19.3/gettext-runtime/intl-java/Makefile.in	2014-10-16 06:01:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/intl-java/Makefile.in	2010-06-06 20:11:37.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,54 +15,10 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,19 +34,16 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = intl-java
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -97,17 +51,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -116,9 +66,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -129,18 +78,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -154,11 +98,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -167,13 +109,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -194,28 +137,15 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -223,7 +153,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -252,9 +181,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -286,14 +213,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -301,25 +225,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -327,8 +242,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -341,20 +254,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -377,7 +282,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -396,29 +300,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -428,11 +323,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -440,7 +331,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -448,7 +338,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -464,13 +353,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -482,54 +369,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -537,49 +391,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -588,6 +426,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -595,9 +434,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -610,8 +447,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -632,37 +471,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -683,7 +511,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -691,13 +518,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -706,47 +534,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -761,7 +555,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -780,7 +573,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -797,7 +589,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -805,7 +596,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -813,8 +603,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -822,7 +610,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -830,8 +617,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -852,7 +637,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -867,17 +651,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -889,40 +670,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -937,36 +706,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -974,12 +731,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -995,9 +749,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1018,8 +770,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1033,9 +783,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1070,9 +818,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1080,7 +828,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1152,11 +899,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1203,15 +950,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1293,17 +1035,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-local \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-local
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-local maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local
 
 
 all-local: all-classes all-javadoc2
@@ -1325,13 +1067,13 @@
 
 install-classes: install-classes-@BUILDJAVA@
 install-classes-no:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 install-classes-yes: all-classes-yes
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) libintl.jar $(DESTDIR)$(jardir)/libintl.jar
 
 installdirs-classes:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-classes:
 	$(RM) $(DESTDIR)$(jardir)/libintl.jar
@@ -1344,16 +1086,16 @@
 	cd $(srcdir) && $(JAVADOC2) -d javadoc2 gnu.gettext gnu/gettext/*.java
 
 install-javadoc2: all-javadoc2
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
 	@for f in $(JAVADOC2_FILES); do \
 	  echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
 	done
 
 installdirs-javadoc2:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2
-	$(MKDIR_P) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2
+	$(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
 
 uninstall-javadoc2:
 	@for f in $(JAVADOC2_FILES); do \
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/aclocal.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/aclocal.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/aclocal.m4	2014-10-16 06:01:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/aclocal.m4	2010-06-06 20:11:09.000000000 +0000
@@ -1,26 +1,6656 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 52 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+_LT_REQUIRED_DARWIN_CHECKS
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# 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
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+    ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix[[4-9]]*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  :
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	fi
+	;;
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
+      output_verbose_link_cmd='echo'
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+      fi
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  freebsd[[12]]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  interix[[3-9]]*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc*)
+	# Intel C++
+	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      pgCC* | pgcpp*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	    ;;
+	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+	output_verbose_link_cmd='echo'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx*)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
+	fi
+	;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+      program t
+      end
+"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
+
+# 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
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc* | ecpc*)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
 
-# 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.
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
+      ;;
+
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +6662,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,22 +6681,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -85,7 +6715,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -111,19 +6741,22 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# 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.
 
+# serial 9
+
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -142,14 +6775,16 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# 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.
 
+# serial 10
 
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -159,7 +6794,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -172,13 +6807,12 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -186,9 +6820,8 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -227,16 +6860,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -245,16 +6878,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -302,7 +6935,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -312,39 +6945,34 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# 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.
 
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -357,7 +6985,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -369,19 +6997,21 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -399,7 +7029,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
+# is enabled.  FIXME.  This creates each `.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -407,23 +7037,32 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# 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.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 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.
 
+# serial 16
+
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -436,7 +7075,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -465,40 +7104,31 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -509,78 +7139,34 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
+
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -602,7 +7188,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -621,14 +7207,16 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST([install_sh])])
+AC_SUBST(install_sh)])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  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.
 
+# serial 2
+
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -644,12 +7232,14 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  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.
 
+# serial 4
+
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -667,7 +7257,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -694,12 +7284,15 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
 
+# serial 6
+
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -707,10 +7300,11 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
+
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -723,35 +7317,63 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005, 2006  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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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.
 
+# serial 4
+
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -762,82 +7384,24 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 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.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2013 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.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# 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.
 
+# serial 5
+
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -848,40 +7412,32 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
    test "$[2]" = conftest.file
    )
 then
@@ -891,85 +7447,36 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
+AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009  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.
 
+# serial 1
+
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -977,32 +7484,34 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  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.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1010,22 +7519,24 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  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.
 
+# serial 2
+
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1035,128 +7546,87 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
-#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
 m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
 
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
 
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
+  # tar/untar a dummy directory, and stop if the command works
   rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
 
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([gnulib-m4/00gnulib.m4])
-m4_include([gnulib-m4/absolute-header.m4])
 m4_include([gnulib-m4/alloca.m4])
 m4_include([gnulib-m4/errno_h.m4])
 m4_include([gnulib-m4/gnulib-common.m4])
 m4_include([gnulib-m4/gnulib-comp.m4])
 m4_include([gnulib-m4/include_next.m4])
-m4_include([gnulib-m4/intmax_t.m4])
 m4_include([gnulib-m4/onceonly.m4])
-m4_include([../m4/extern-inline.m4])
+m4_include([../m4/intmax.m4])
 m4_include([../m4/inttypes_h.m4])
 m4_include([../m4/longlong.m4])
 m4_include([../m4/printf-posix.m4])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/alloca.c gettext-0.18.1.1/gettext-runtime/libasprintf/alloca.c
--- gettext-0.19.3/gettext-runtime/libasprintf/alloca.c	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/alloca.c	2009-12-11 16:44:57.000000000 +0000
@@ -93,15 +93,26 @@
 static int stack_dir;           /* 1 or -1 once known.  */
 #   define STACK_DIR    stack_dir
 
-static int
-find_stack_direction (int *addr, int depth)
+static void
+find_stack_direction (void)
 {
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
+  static char *addr = NULL;     /* Address of first `dummy', once known.  */
+  auto char dummy;              /* To get stack address.  */
+
+  if (addr == NULL)
+    {                           /* Initial entry.  */
+      addr = ADDRESS_FUNCTION (dummy);
+
+      find_stack_direction ();  /* Recurse once.  */
+    }
+  else
+    {
+      /* Second entry.  */
+      if (ADDRESS_FUNCTION (dummy) > addr)
+        stack_dir = 1;          /* Stack grew upward.  */
+      else
+        stack_dir = -1;         /* Stack grew downward.  */
+    }
 }
 
 #  endif /* STACK_DIRECTION == 0 */
@@ -144,7 +155,7 @@
 
 #  if STACK_DIRECTION == 0
   if (STACK_DIR == 0)           /* Unknown growth direction.  */
-    STACK_DIR = find_stack_direction (NULL, (size & 1) + 20);
+    find_stack_direction ();
 #  endif
 
   /* Reclaim garbage, defined as all alloca'd storage that
@@ -475,4 +486,4 @@
 #  endif /* CRAY */
 
 # endif /* no alloca */
-#endif /* not GCC 2 */
+#endif /* not GCC version 2.1 */
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/asnprintf.c gettext-0.18.1.1/gettext-runtime/libasprintf/asnprintf.c
--- gettext-0.19.3/gettext-runtime/libasprintf/asnprintf.c	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/asnprintf.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Formatted output to strings.
    Copyright (C) 1999, 2002, 2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/asprintf.c gettext-0.18.1.1/gettext-runtime/libasprintf/asprintf.c
--- gettext-0.19.3/gettext-runtime/libasprintf/asprintf.c	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/asprintf.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Formatted output to strings.
    Copyright (C) 1999, 2002, 2006-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.cc gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.cc
--- gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.cc	2013-04-15 02:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.cc	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2002 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 under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Tell glibc's <stdio.h> to provide a prototype for vasprintf().
    This must come before <config.h> because <config.h> may include
@@ -30,13 +32,6 @@
 #include <string.h>
 #include "lib-asprintf.h"
 
-/* std::swap() is in <utility> since C++11.  */
-#if __cplusplus >= 201103L
-# include <utility>
-#else
-# include <algorithm>
-#endif
-
 namespace gnu
 {
 
@@ -56,13 +51,6 @@
     str = (src.str != NULL ? strdup (src.str) : NULL);
   }
 
-  /* Copy constructor.  Necessary because the destructor is nontrivial.  */
-  autosprintf& autosprintf::operator = (autosprintf copy)
-  {
-    std::swap (copy.str, this->str);
-    return *this;
-  }
-
   /* Destructor: frees the temporarily allocated string.  */
   autosprintf::~autosprintf ()
   {
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.h.in gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.h.in
--- gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.h.in	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.h.in	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,66 @@
+/* Class autosprintf - formatted output to an ostream.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _AUTOSPRINTF_H
+#define _AUTOSPRINTF_H
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __format__ format
+#  define __printf__ printf
+# endif
+#endif
+
+#include <string>
+#include <iostream>
+
+namespace gnu
+{
+  /* A temporary object, usually allocated on the stack, representing
+     the result of an asprintf() call.  */
+  class autosprintf
+  {
+  public:
+    /* Constructor: takes a format string and the printf arguments.  */
+    autosprintf (const char *format, ...)
+                __attribute__ ((__format__ (__printf__, 2, 3)));
+    /* Copy constructor.  */
+    autosprintf (const autosprintf& src);
+    /* Destructor: frees the temporarily allocated string.  */
+    ~autosprintf ();
+    /* Conversion to string.  */
+    operator char * () const;
+    operator std::string () const;
+    /* Output to an ostream.  */
+    friend inline std::ostream& operator<< (std::ostream& stream, const autosprintf& tmp)
+    {
+      stream << (tmp.str ? tmp.str : "(error in autosprintf)");
+      return stream;
+    }
+  private:
+    char *str;
+  };
+}
+
+#endif /* _AUTOSPRINTF_H */
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.info gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.info
--- gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.info	2014-10-16 06:02:41.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.info	2010-06-06 18:36:23.000000000 +0000
@@ -1,31 +1,32 @@
-This is autosprintf.info, produced by makeinfo version 5.1 from
+This is autosprintf.info, produced by makeinfo version 4.13 from
 autosprintf.texi.
 
-Copyright (C) 2002-2003, 2006-2007 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
-manual under either of these two licenses, at your choice.
-
-   This manual is covered by the GNU FDL. Permission is granted to copy,
-distribute and/or modify this document under the terms of the GNU Free
-Documentation License (FDL), either version 1.2 of the License, or (at
-your option) any later version published by the Free Software Foundation
-(FSF); with no Invariant Sections, with no Front-Cover Text, and with no
-Back-Cover Texts.  A copy of the license is at
-<http://www.gnu.org/licenses/fdl.html>.
-
-   This manual is covered by the GNU GPL. You can redistribute it and/or
-modify it under the terms of the GNU General Public License (GPL),
-either version 2 of the License, or (at your option) any later version
-published by the Free Software Foundation (FSF). A copy of the license
-is at <http://www.gnu.org/licenses/gpl.html>.
 INFO-DIR-SECTION C++ libraries
 START-INFO-DIR-ENTRY
 * autosprintf: (autosprintf).   Support for printf format strings in C++.
 END-INFO-DIR-ENTRY
 
-   This file provides documentation for GNU 'autosprintf' library.
+   This file provides documentation for GNU `autosprintf' library.
+
+   Copyright (C) 2002-2003, 2006-2007 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
+manual under either of these two licenses, at your choice.
+
+   This manual is covered by the GNU FDL.  Permission is granted to
+copy, distribute and/or modify this document under the terms of the GNU
+Free Documentation License (FDL), either version 1.2 of the License, or
+(at your option) any later version published by the Free Software
+Foundation (FSF); with no Invariant Sections, with no Front-Cover Text,
+and with no Back-Cover Texts.  A copy of the license is at
+`http://www.gnu.org/licenses/fdl.html'.
+
+   This manual is covered by the GNU GPL.  You can redistribute it
+and/or modify it under the terms of the GNU General Public License
+(GPL), either version 2 of the License, or (at your option) any later
+version published by the Free Software Foundation (FSF).  A copy of the
+license is at `http://www.gnu.org/licenses/gpl.html'.
 
 
 File: autosprintf.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
@@ -38,8 +39,8 @@
 * Menu:
 
 * Introduction::                Introduction
-* Class autosprintf::           The 'autosprintf' class
-* Using autosprintf::           Using 'autosprintf' in own programs
+* Class autosprintf::           The `autosprintf' class
+* Using autosprintf::           Using `autosprintf' in own programs
 
 
 File: autosprintf.info,  Node: Introduction,  Next: Class autosprintf,  Prev: Top,  Up: Top
@@ -47,9 +48,9 @@
 1 Introduction
 **************
 
-This package makes the C formatted output routines ('fprintf' et al.)
-usable in C++ programs, for use with the '<string>' strings and the
-'<iostream>' streams.
+This package makes the C formatted output routines (`fprintf' et al.)
+usable in C++ programs, for use with the `<string>' strings and the
+`<iostream>' streams.
 
    It allows to write code like
 
@@ -61,73 +62,73 @@
 
    The benefits of the autosprintf syntax are:
 
-   * It reuses the standard POSIX printf facility.  Easy migration from
+   * It reuses the standard POSIX printf facility. Easy migration from
      C to C++.
 
    * English sentences are kept together.
 
-   * It makes internationalization possible.  Internationalization
-     requires format strings, because in some cases the translator needs
-     to change the order of a sentence, and more generally it is easier
-     for the translator to work with a single string for a sentence than
-     with multiple string pieces.
+   * It makes internationalization possible. Internationalization
+     requires format strings, because in some cases the translator
+     needs to change the order of a sentence, and more generally it is
+     easier for the translator to work with a single string for a
+     sentence than with multiple string pieces.
 
-   * It reduces the risk of programming errors due to forgotten state in
-     the output stream (e.g. 'cout << hex;' not followed by 'cout <<
+   * It reduces the risk of programming errors due to forgotten state
+     in the output stream (e.g. `cout << hex;' not followed by `cout <<
      dec;').
 
 
 File: autosprintf.info,  Node: Class autosprintf,  Next: Using autosprintf,  Prev: Introduction,  Up: Top
 
-2 The 'autosprintf' class
+2 The `autosprintf' class
 *************************
 
-An instance of class 'autosprintf' just contains a string with the
-formatted output result.  Such an instance is usually allocated as an
-automatic storage variable, i.e. on the stack, not with 'new' on the
+An instance of class `autosprintf' just contains a string with the
+formatted output result. Such an instance is usually allocated as an
+automatic storage variable, i.e. on the stack, not with `new' on the
 heap.
 
-   The constructor 'autosprintf (const char *format, ...)' takes a
-format string and additional arguments, like the C function 'printf'.
+   The constructor `autosprintf (const char *format, ...)' takes a
+format string and additional arguments, like the C function `printf'.
 
-   Conversions to 'char *' and 'std::string' are defined that return the
-encapsulated string.  The conversion to 'char *' returns a freshly
+   Conversions to `char *' and `std::string' are defined that return
+the encapsulated string.  The conversion to `char *' returns a freshly
 allocated copy of the encapsulated string; it needs to be freed using
-'delete[]'.  The conversion to 'std::string' returns a copy of the
+`delete[]'.  The conversion to `std::string' returns a copy of the
 encapsulated string, with automatic memory management.
 
-   The destructor '~autosprintf ()' destroys the encapsulated string.
+   The destructor `~autosprintf ()' destroys the encapsulated string.
 
-   An 'operator <<' is provided that outputs the encapsulated string to
-the given 'ostream'.
+   An `operator <<' is provided that outputs the encapsulated string to
+the given `ostream'.
 
 
 File: autosprintf.info,  Node: Using autosprintf,  Prev: Class autosprintf,  Up: Top
 
-3 Using 'autosprintf' in own programs
+3 Using `autosprintf' in own programs
 *************************************
 
-To use the 'autosprintf' class in your programs, you need to add
+To use the `autosprintf' class in your programs, you need to add
 
      #include "autosprintf.h"
      using gnu::autosprintf;
 
-to your source code.  The include file defines the class 'autosprintf',
-in a namespace called 'gnu'.  The 'using' statement makes it possible to
-use the class without the (otherwise natural) 'gnu::' prefix.
-
-   When linking your program, you need to link with 'libasprintf',
-because that's where the class is defined.  In projects using GNU
-'autoconf', this means adding 'AC_LIB_LINKFLAGS([asprintf])' to
-'configure.in' or 'configure.ac', and using the @LIBASPRINTF@ Makefile
+to your source code.  The include file defines the class `autosprintf',
+in a namespace called `gnu'. The `using' statement makes it possible to
+use the class without the (otherwise natural) `gnu::' prefix.
+
+   When linking your program, you need to link with `libasprintf',
+because that's where the class is defined. In projects using GNU
+`autoconf', this means adding `AC_LIB_LINKFLAGS([asprintf])' to
+`configure.in' or `configure.ac', and using the @LIBASPRINTF@ Makefile
 variable that it provides.
 
 
 
 Tag Table:
-Node: Top1339
-Node: Introduction1699
-Node: Class autosprintf2852
-Node: Using autosprintf3863
+Node: Top1348
+Node: Introduction1708
+Node: Class autosprintf2859
+Node: Using autosprintf3869
 
 End Tag Table
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.in.h gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.in.h
--- gettext-0.19.3/gettext-runtime/libasprintf/autosprintf.in.h	2013-04-15 02:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/autosprintf.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2012, 2013 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
-   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _AUTOSPRINTF_H
-#define _AUTOSPRINTF_H
-
-/* This feature is available in gcc versions 2.5 and later.  */
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-# define _AUTOSPRINTF_ATTRIBUTE_FORMAT() /* empty */
-#else
-/* The __-protected variants of 'format' and 'printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define _AUTOSPRINTF_ATTRIBUTE_FORMAT() \
-  __attribute__ ((__format__ (__printf__, 2, 3)))
-# else
-#  define _AUTOSPRINTF_ATTRIBUTE_FORMAT() \
-  __attribute__ ((format (printf, 2, 3)))
-# endif
-#endif
-
-#include <string>
-#include <iostream>
-
-namespace gnu
-{
-  /* A temporary object, usually allocated on the stack, representing
-     the result of an asprintf() call.  */
-  class autosprintf
-  {
-  public:
-    /* Constructor: takes a format string and the printf arguments.  */
-    autosprintf (const char *format, ...)
-                _AUTOSPRINTF_ATTRIBUTE_FORMAT();
-    /* Copy constructor.  */
-    autosprintf (const autosprintf& src);
-    autosprintf& operator = (autosprintf copy);
-    /* Destructor: frees the temporarily allocated string.  */
-    ~autosprintf ();
-    /* Conversion to string.  */
-    operator char * () const;
-    operator std::string () const;
-    /* Output to an ostream.  */
-    friend inline std::ostream& operator<< (std::ostream& stream, const autosprintf& tmp)
-    {
-      stream << (tmp.str ? tmp.str : "(error in autosprintf)");
-      return stream;
-    }
-  private:
-    char *str;
-  };
-}
-
-#endif /* _AUTOSPRINTF_H */
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/ChangeLog gettext-0.18.1.1/gettext-runtime/libasprintf/ChangeLog
--- gettext-0.19.3/gettext-runtime/libasprintf/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,198 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-09-30  Daiki Ueno  <ueno@gnu.org>
-
-	* vasnprintf.c: Update from Gnulib.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2013-03-07  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>  (tiny change)
-
-	Fix '__attribute__' definition.
-	Reported at <https://savannah.gnu.org/bugs/?35313>
-	* autosprintf.in.h (_AUTOSPRINTF_ATTRIBUTE_FORMAT): New macro
-	instead of redefine __attribute__.
-
-2013-03-04  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>  (tiny change)
-
-	Add 'autosprintf::operator='. Needed because destructor
-	is not trivial.
-	Reported at <https://savannah.gnu.org/bugs/?33102>
-	* autosprintf.in.h (autosprintf::operator=): New function.
-	Thanks to Daiki Ueno for pointing a better copy-and-swap
-	idiom use.
-	* autosprintf.cc (autosprintf::operator=): Likewise.
-
-2013-01-17  Daiki Ueno  <ueno@gnu.org>
-
-	Fix link errors related to C99-style extern inline.
-	Reported by Sam Thursfield <sam.thursfield@codethink.co.uk>.
-	* Makefile.am (libasprintf_la_SOURCES): Add xsize.h and xsize.c.
-	(lib_asprintf_EXTRASOURCES): Remove xsize.h.
-	* xsize.h: Remove, replacing with the one from gnulib when
-	bootstrapping.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-17  Daiki Ueno  <ueno@unixuser.org>
-
-	* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
-	Suggested by Stefano Lattarini <stefano.lattarini@gmail.com>.
-
-2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* vasnprintf.c (MAX_ROOM_NEEDED): Now static, not static
-	inline.
-
-2012-06-22  Bruno Haible  <bruno@clisp.org>
-
-	* vasnprintf.c: Write "Mac OS X" instead of "MacOS X".
-
-2012-02-09  Paul Eggert  <eggert@cs.ucla.edu>
-
-	maint: replace FSF snail-mail addresses with URLs
-	* vasnprintf.c, xsize.h:
-	Replace FSF snail mail addresses with URLs, as per GNU coding
-	standards.  See glibc bug
-	<http://sourceware.org/bugzilla/show_bug.cgi?id=13673>.
-
-2012-02-05  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* vasnprintf.c: Spelling fixes.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* autosprintf.in.h: Quote 'like this', not `like this', as per the
-	recent change to the GNU coding standards.
-	* vasnprintf.h: Likewise.
-	* vasprintf.h: Likewise.
-	* INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g"
-
-2012-01-04  Bruno Haible  <bruno@clisp.org>
-
-	Talk about "native Windows API", not "Win32".
-	* vasnprintf.c: Update comments to mention native Windows.
-
-2011-10-15  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Optimize bit search operation.
-	* vasnprintf.c (divide): Use optimizations from gnulib's
-	integer_length.c.
-
-2011-10-15  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Fix comments.
-	* vasnprintf.c (decode_long_double, decode_double): Fix comments.
-
-2011-06-06  Bruno Haible  <bruno@clisp.org>
-
-	Ensure mbstate_t gets defined in libasprintf.
-	* configure.ac: Invoke AC_TYPE_MBSTATE_T. Needed on HP-UX 11.31.
-
-2011-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Ensure intmax_t gets defined in libasprintf.
-	* configure.ac: Invoke gl_AC_TYPE_INTMAX_T instead of gt_TYPE_INTMAX_T.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	* Makefile.am (lib_asprintf_EXTRASOURCES): Add verify.h.
-
-2010-10-10  Paul Eggert  <eggert@cs.ucla.edu>
-
-	rewrite int foo[2*X-1] to verify(X) or to int foo[X?1:-1]
-	* vasnprintf.c: Include "verify.h".
-	(mp_limb_verify, mp_twolimb_verify, TCHAR_T_verify): Remove, replacing
-	with a verify call.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* COPYING.LIB: Replace with text of LGPL 2.1.
-	* *.h, *.c, *.cc, Makefile.am: Update copyright header.
-
-2011-02-23  Bruno Haible  <bruno@clisp.org>
-
-	Fix misindentation of preprocessor directives.
-	* vasnprintf.c (decode_long_double): Reindent preprocessor directives.
-
-2011-02-04  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Reduce use of malloc for small format strings.
-	* printf-args.h (N_DIRECT_ALLOC_ARGUMENTS): New macro.
-	(arguments): Add room for the first 7 arguments.
-	* printf-parse.h (N_DIRECT_ALLOC_DIRECTIVES): New macro.
-	(char_directives, u8_directives, u16_directives, u32_directives): Add
-	room for the first 7 directives.
-	* printf-parse.c: Include <string.h>.
-	(PRINTF_PARSE): Change memory handling code so that it uses the first
-	7 preallocated elements in an 'arguments' or 'DIRECTIVES' struct.
-	* vasnprintf.c (VASNPRINTF): Update memory handling code.
-	Reported by Pádraig Brady <P@draigbrady.com>.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Ensure that <features.h> is included before __GLIBC__ is tested.
-	* printf-parse.h: Include <features.h>.
-	* configure.ac: Test for <features.h>.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* printf-parse.h (FLAG_LOCALIZED): Treat uClibc like a non-glibc platform.
-	* printf-parse.c (PRINTF_PARSE): Likewise.
-	* vasnprintf.c (decimal_point_char): Treat uClibc like glibc.
-	(VASNPRINTF): Treat uClibc like a non-glibc platform.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Fix a comment.
-	* vasnprintf.c (VASNPRINTF): Fix comment.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Support I flag on glibc systems.
-	* printf-parse.h (FLAG_LOCALIZED): New macro.
-	* printf-parse.c (PRINTF_PARSE): Handle the 'I' flag.
-	* vasnprintf.c (VASNPRINTF): Pass the 'I' flag on to the system's
-	snprintf function.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	Rename autosprintf.h.in to autosprintf.in.h.
-	* autosprintf.in.h: New file, renamed from autosprintf.h.in.
-	* Makefile.am (autosprintf.h, EXTRA_DIST): Update.
-
-2010-10-14  Bruno Haible  <bruno@clisp.org>
-
-	vasnprintf: Don't set errno to 0.
-	* vasnprintf.c (VASNPRINTF): Save and restore errno around the block
-	that sets it to 0.
-	Reported by Gianluigi Tiesi <sherpya@netfarm.it>.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
@@ -751,7 +556,7 @@
 2007-03-24  Bruno Haible  <bruno@clisp.org>
 
 	* vasnprintf.c: Include float+.h.
-	(VASNPRINTF): When comparing against +0.0L or +0.0, compare only
+	(VASNPRINTF): When comparing agains +0.0L or +0.0, compare only
 	SIZEOF_LDBL or SIZEOF_DBL bytes.
 
 2007-03-24  Bruno Haible  <bruno@clisp.org>
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/config.h.in gettext-0.18.1.1/gettext-runtime/libasprintf/config.h.in
--- gettext-0.19.3/gettext-runtime/libasprintf/config.h.in	2014-10-16 06:01:19.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/config.h.in	2010-06-06 20:11:11.000000000 +0000
@@ -22,8 +22,8 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <features.h> header file. */
-#undef HAVE_FEATURES_H
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
 
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_INTMAX_T
@@ -35,15 +35,12 @@
    declares uintmax_t. */
 #undef HAVE_INTTYPES_H_WITH_UINTMAX
 
-/* Define to 1 if the system has the type 'long long int'. */
+/* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
 /* Define to 1 if you have the `mbrtowc' function. */
 #undef HAVE_MBRTOWC
 
-/* Define to 1 if <wchar.h> declares mbstate_t. */
-#undef HAVE_MBSTATE_T
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -81,9 +78,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if the system has the type 'unsigned long long int'. */
-#undef HAVE_UNSIGNED_LONG_LONG_INT
-
 /* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 
@@ -147,131 +141,22 @@
 /* Version number of package */
 #undef VERSION
 
-/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-
-
-/* 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
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
-
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-
-   Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
-   on configurations that mistakenly use 'static inline' to implement
-   functions or macros in standard C headers like <ctype.h>.  For example,
-   if isdigit is mistakenly implemented via a static inline function,
-   a program containing an extern inline function that calls isdigit
-   may not work since the C standard prohibits extern inline functions
-   from calling static functions.  This bug is known to occur on:
-
-     OS X 10.8 and earlier; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
-
-     DragonFly; see
-     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
-
-     FreeBSD; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
-
-   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
-   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
-   Assume DragonFly and FreeBSD will be similar.  */
-#if (((defined __APPLE__ && defined __MACH__) \
-      || defined __DragonFly__ || defined __FreeBSD__) \
-     && (defined __header_inline \
-         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
-            && ! defined __clang__) \
-         : ((! defined _DONT_USE_CTYPE_INLINE_ \
-             && (defined __GNUC__ || defined __cplusplus)) \
-            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
-                && defined __GNUC__ && ! defined __cplusplus))))
-# define _GL_EXTERN_INLINE_STDHEADER_BUG
-#endif
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-# define _GL_EXTERN_INLINE_IN_USE
-#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
-       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-# define _GL_EXTERN_INLINE_IN_USE
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
-#endif
-
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-#endif
-
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
-/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
-#undef intmax_t
-
 /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE__ && __MACH__ test for MacOS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
 # define __GNUC_STDC_INLINE__ 1
 #endif
 
-/* Define to a type if <wchar.h> does not define. */
-#undef mbstate_t
-
 /* Define as the type of the result of subtracting two pointers, if the system
    doesn't define it. */
 #undef ptrdiff_t
@@ -291,27 +176,3 @@
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
 
-/* gcc supports the "unused" attribute on possibly unused labels, and
-   g++ has since version 4.5.  Note to support C++ as well as C,
-   _GL_UNUSED_LABEL should be used with a trailing ;  */
-#if !defined __cplusplus || __GNUC__ > 4 \
-    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-# define _GL_UNUSED_LABEL _GL_UNUSED
-#else
-# define _GL_UNUSED_LABEL
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
-
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/configure gettext-0.18.1.1/gettext-runtime/libasprintf/configure
--- gettext-0.19.3/gettext-runtime/libasprintf/configure	2014-10-16 06:01:19.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/configure	2010-06-06 20:11:10.000000000 +0000
@@ -1,9 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libasprintf 1.0.
+# Generated by GNU Autoconf 2.65 for libasprintf 1.0.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -87,7 +89,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -132,31 +133,6 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -190,21 +166,12 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -244,25 +211,14 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -360,18 +316,10 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -408,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -493,10 +441,6 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -531,16 +475,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -552,8 +496,28 @@
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -561,14 +525,161 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+
+
+# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+$*
+_LT_EOF
+  exit 0
+fi
+
+# 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
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -648,17 +759,12 @@
 ENOLINK_HIDDEN
 EMULTIHOP_VALUE
 EMULTIHOP_HIDDEN
-GL_GENERATE_ERRNO_H_FALSE
-GL_GENERATE_ERRNO_H_TRUE
 ERRNO_H
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H
 NEXT_ERRNO_H
-PRAGMA_COLUMNS
 PRAGMA_SYSTEM_HEADER
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE
 INCLUDE_NEXT
-GL_GENERATE_ALLOCA_H_FALSE
-GL_GENERATE_ALLOCA_H_TRUE
 ALLOCA_H
 ALLOCA
 LTALLOCA
@@ -666,30 +772,28 @@
 GL_COND_LIBTOOL_TRUE
 LTNOUNDEF
 CXXCPP
+CPP
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-MANIFEST_TOOL
-ac_ct_AR
+lt_ECHO
+AR
 LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
+EGREP
+GREP
 SED
 LIBTOOL
 OBJDUMP
 DLLTOOL
 AS
 RANLIB
-ARFLAGS
-AR
-EGREP
-GREP
-CPP
 host_os
 host_vendor
 host_cpu
@@ -707,7 +811,6 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
-am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -723,8 +826,6 @@
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -796,7 +897,6 @@
 with_pic
 enable_fast_install
 with_gnu_ld
-with_sysroot
 enable_libtool_lock
 '
       ac_precious_vars='build_alias
@@ -874,9 +974,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -921,9 +1020,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -947,9 +1046,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1151,9 +1250,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1167,9 +1266,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1197,8 +1296,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1206,7 +1305,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1216,7 +1315,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1224,13 +1323,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1253,7 +1352,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1267,6 +1366,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1281,9 +1382,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1322,11 +1423,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1366,7 +1467,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1430,12 +1531,10 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1445,11 +1544,9 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+  --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
 
 Some influential environment variables:
   CC          C compiler command
@@ -1531,9 +1628,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 libasprintf configure 1.0
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1577,7 +1674,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1615,48 +1712,11 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1684,7 +1744,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1698,7 +1758,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1712,7 +1772,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1730,10 +1790,47 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -1771,7 +1868,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1784,7 +1881,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1839,7 +1936,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
 
@@ -1864,7 +1961,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1875,7 +1972,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -1907,7 +2004,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1921,11 +2018,65 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
 
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1934,10 +2085,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1973,7 +2124,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2000,7 +2151,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2009,64 +2160,10 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_mongrel
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -2084,8 +2181,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2101,8 +2197,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2128,8 +2223,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2145,8 +2239,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2180,8 +2273,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -2245,23 +2337,20 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2270,12 +2359,8 @@
 int
 main ()
 {
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
+#ifndef $2
+  (void) $2;
 #endif
 
   ;
@@ -2292,7 +2377,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
@@ -2300,7 +2385,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libasprintf $as_me 1.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2410,9 +2495,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2446,9 +2533,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2461,9 +2550,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -2477,9 +2568,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -2534,12 +2627,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2554,11 +2642,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
@@ -2581,6 +2665,7 @@
 
 gl_header_list="$gl_header_list stdlib.h"
 gl_header_list="$gl_header_list string.h"
+gl_header_list="$gl_header_list errno.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2636,7 +2721,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2652,22 +2737,16 @@
 
 ac_aux_dir=
 for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../build-aux \"$srcdir\"/../../build-aux" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in ../../build-aux \"$srcdir\"/../../build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2679,7 +2758,7 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2698,7 +2777,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2718,7 +2797,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2776,71 +2855,56 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2863,12 +2927,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2880,17 +2944,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2902,7 +2966,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2930,7 +2994,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2942,7 +3006,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2983,7 +3047,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2993,7 +3057,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -3022,13 +3086,20 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3040,7 +3111,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3068,7 +3139,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3076,7 +3147,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3109,38 +3180,11 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
 AM_BACKSLASH='\'
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
@@ -3149,7 +3193,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3193,70 +3237,18 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
 
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -3270,7 +3262,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3282,7 +3274,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3310,7 +3302,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3322,7 +3314,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3363,7 +3355,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3375,7 +3367,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3403,7 +3395,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3416,7 +3408,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3462,7 +3454,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3474,7 +3466,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3506,7 +3498,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3518,7 +3510,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3560,8 +3552,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3675,8 +3667,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3718,8 +3711,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3776,9 +3769,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -3789,7 +3782,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3829,8 +3822,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3840,7 +3833,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3877,7 +3870,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3955,7 +3948,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3964,7 +3957,8 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4048,65 +4042,6 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4126,7 +4061,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -4159,7 +4094,6 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4175,16 +4109,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4218,16 +4151,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4236,16 +4169,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4315,7 +4248,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -4327,7 +4260,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4359,7 +4292,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -4371,7 +4304,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4437,7 +4370,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4474,7 +4407,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -4560,16 +4493,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4603,16 +4535,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4621,16 +4553,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4688,27 +4620,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4726,14 +4658,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -4741,7 +4673,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4761,149 +4693,259 @@
 
 
 
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-else
-  # Broken: fails on valid input.
-continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-    done
-    ac_cv_prog_CPP=$CPP
 
 fi
-  CPP=$ac_cv_prog_CPP
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-else
-  # Broken: fails on valid input.
-continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  # Passes both tests.
-ac_preproc_ok=:
-break
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
 
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+  # Code from module alloca:
+  # Code from module alloca-opt:
+  # Code from module errno:
+  # Code from module include_next:
+
+
+
+
+
+  case "$host_os" in
+    mingw* | cygwin*)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+$as_echo_n "checking for auto-import of symbols... " >&6; }
+      if test "${gl_cv_ld_autoimport+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        gl_save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_ld_autoimport=yes
+else
+  gl_cv_ld_autoimport=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$gl_save_LDFLAGS"
+fi
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ld_autoimport" >&5
+$as_echo "$gl_cv_ld_autoimport" >&6; }
+      if test $gl_cv_ld_autoimport = yes; then
+        LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
+      fi
+      ;;
+  esac
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6'
+macro_revision='1.3012'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
   ac_path_GREP_found=false
@@ -4916,7 +4958,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4951,7 +4993,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4965,7 +5007,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4982,7 +5024,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5017,7 +5059,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5030,158 +5072,277 @@
  EGREP="$ac_cv_path_EGREP"
 
 
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
-$as_echo_n "checking for Minix Amsterdam compiler... " >&6; }
-if ${gl_cv_c_amsterdam_compiler+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef __ACK__
-Amsterdam
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Amsterdam" >/dev/null 2>&1; then :
-  gl_cv_c_amsterdam_compiler=yes
-else
-  gl_cv_c_amsterdam_compiler=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-$as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
-  if test -z "$AR"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      AR='cc -c.a'
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='-o'
-      fi
-    else
-                  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
   done
-IFS=$as_save_IFS
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_path_FGREP=$FGREP
 fi
 
-
+   fi
 fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="ar"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  AR="$ac_cv_prog_AR"
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
-      fi
-    fi
-  else
-    if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
-    fi
-  fi
 
 
-  if test -z "$RANLIB"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      RANLIB=':'
-    else
-            if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" \
+     && { test "$build" = "$host" \
+          || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
+        }; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5189,8 +5350,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5200,28 +5361,32 @@
 
 fi
 fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$DUMPBIN" && break
+  done
 fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5229,8 +5394,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5240,17 +5405,21 @@
 
 fi
 fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -5258,235 +5427,283 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    RANLIB=$ac_ct_RANLIB
+    DUMPBIN=$ac_ct_DUMPBIN
   fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-    fi
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
   fi
 
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
 
 
 
-  # Code from module absolute-header:
-  # Code from module alloca:
-  # Code from module alloca-opt:
-  # Code from module errno:
-  # Code from module extern-inline:
-  # Code from module include_next:
-  # Code from module size_max:
-  # Code from module verify:
-  # Code from module xsize:
-
 
 
 
-  case "$host_os" in
-    mingw* | cygwin*)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
-$as_echo_n "checking for auto-import of symbols... " >&6; }
-      if ${gl_cv_ld_autoimport+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:5462: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:5465: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:5468: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
-        gl_save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv_ld_autoimport=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  gl_cv_ld_autoimport=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$gl_save_LDFLAGS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ld_autoimport" >&5
-$as_echo "$gl_cv_ld_autoimport" >&6; }
-      if test $gl_cv_ld_autoimport = yes; then
-        LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
-      fi
-      ;;
-  esac
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
 
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
 
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
 
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
 
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
 
+fi
 
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
 
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
 
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
 
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
 
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
 
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
 
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
 else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
+  lt_unset=false
 fi
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
 
 
 
 
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+    ;;
 esac
 
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
 
 
 
@@ -5495,890 +5712,159 @@
 
 
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  ac_cv_path_FGREP=$FGREP
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-   fi
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
 
+test -z "$OBJDUMP" && OBJDUMP=objdump
 
-test -z "$GREP" && GREP=grep
 
 
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
 
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
 
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc*)
+cegcc)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -6408,10 +5894,6 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -6420,11 +5902,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -6445,8 +5927,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6477,227 +5959,64 @@
   ;;
 
 osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
     ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
     ;;
   esac
   ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
 
 
 
@@ -6706,13 +6025,11 @@
 
 
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -6724,8 +6041,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6745,18 +6062,14 @@
 fi
 
 
-    test -n "$AR" && break
-  done
 fi
-if test -z "$AR"; then
+if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -6768,8 +6081,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6788,10 +6101,6 @@
 $as_echo "no" >&6; }
 fi
 
-
-  test -n "$ac_ct_AR" && break
-done
-
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -6803,72 +6112,16 @@
 esac
     AR=$ac_ct_AR
   fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  AR="$ac_cv_prog_AR"
+fi
 
-int
-main ()
-{
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
 
 
 
@@ -6881,7 +6134,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -6893,7 +6146,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6921,7 +6174,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -6933,7 +6186,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6980,7 +6233,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -6992,7 +6245,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7020,7 +6273,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -7032,7 +6285,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7082,27 +6335,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
 
 
 
@@ -7149,7 +6390,7 @@
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7210,8 +6451,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -7235,7 +6476,6 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7248,7 +6488,6 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -7274,8 +6513,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -7290,18 +6529,6 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -7313,7 +6540,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
+const struct {
   const char *name;
   void       *address;
 }
@@ -7339,8 +6566,8 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -7350,8 +6577,8 @@
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -7388,18 +6615,6 @@
 $as_echo "ok" >&6; }
 fi
 
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
 
 
 
@@ -7421,43 +6636,6 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
@@ -7489,7 +6667,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  echo '#line 6670 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7583,7 +6761,7 @@
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -7606,74 +6784,156 @@
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
-  lt_cv_cc_needs_belf=no
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
 esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
 
-need_locks="$enable_libtool_lock"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7681,8 +6941,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7692,10 +6952,10 @@
 
 fi
 fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -7703,17 +6963,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7721,8 +6981,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7732,17 +6992,17 @@
 
 fi
 fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7750,50 +7010,114 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+    NMEDIT=$ac_ct_NMEDIT
   fi
 else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+  NMEDIT="$ac_cv_prog_NMEDIT"
 fi
 
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  rm -f conftest*
+done
+  done
+IFS=$as_save_IFS
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
 
-
-  case $host_os in
-    rhapsody* | darwin*)
     if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7801,8 +7125,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7812,10 +7136,10 @@
 
 fi
 fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -7823,17 +7147,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7841,8 +7165,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7852,17 +7176,17 @@
 
 fi
 fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7870,22 +7194,62 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
+    OTOOL=$ac_ct_OTOOL
   fi
 else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+  OTOOL="$ac_cv_prog_OTOOL"
 fi
 
     if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7893,8 +7257,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7904,264 +7268,456 @@
 
 fi
 fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
 fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
 done
-  done
-IFS=$as_save_IFS
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
 
 fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
 fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  # Broken: fails on valid input.
+continue
 fi
+rm -f conftest.err conftest.$ac_ext
 
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
 else
-  NMEDIT="$ac_cv_prog_NMEDIT"
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.$ac_ext
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
 done
-  done
-IFS=$as_save_IFS
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
 
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
 
+else
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
+
 fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
 
+else
+  ac_cv_header_stdc=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
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
 fi
 
+done
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
     if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -8169,8 +7725,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8180,28 +7736,32 @@
 
 fi
 fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$CXX" && break
+  done
 fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -8209,8 +7769,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8220,17 +7780,21 @@
 
 fi
 fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -8238,84 +7802,115 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    OTOOL64=$ac_ct_OTOOL64
+    CXX=$ac_ct_CXX
   fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
 fi
 
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8326,240 +7921,304 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
 else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
+  cd ..
+  rm -rf conftest.dir
 else
-  ac_cv_header_stdc=no
+  am_cv_CXX_dependencies_compiler_type=none
 fi
-rm -f conftest*
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
 else
-  ac_cv_header_stdc=no
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
 fi
-rm -f conftest*
 
-fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#ifdef __STDC__
+# include <limits.h>
 #else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+# include <assert.h>
 #endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
+		     Syntax error
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
 else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  # Broken: fails on valid input.
+continue
 fi
+rm -f conftest.err conftest.$ac_ext
 
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
 
 fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
 _ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
+  # Broken: fails on valid input.
+continue
 fi
+rm -f conftest.err conftest.$ac_ext
 
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
 _ACEOF
-
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.$ac_ext
 
 done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
 
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
+fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
+else
+  _lt_caught_CXX_error=yes
+fi
 
 
 
@@ -8569,13 +8228,13 @@
 enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
+if test "${ac_cv_prog_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -8587,7 +8246,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8615,7 +8274,7 @@
 set dummy as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
@@ -8627,7 +8286,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8667,7 +8326,7 @@
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
@@ -8679,7 +8338,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8707,7 +8366,7 @@
 set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
@@ -8719,7 +8378,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8759,7 +8418,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -8771,7 +8430,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8799,7 +8458,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -8811,7 +8470,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8938,22 +8597,7 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+  withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
 fi
@@ -9030,11 +8674,6 @@
 
 
 
-
-
-
-
-
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9056,7 +8695,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -9084,6 +8723,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -9096,6 +8748,23 @@
   ;;
 esac
 
+# 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'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -9124,7 +8793,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -9134,7 +8803,7 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -9200,7 +8869,7 @@
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -9333,16 +9002,11 @@
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -9358,15 +9022,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9025: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:9029: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -9395,6 +9059,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -9442,12 +9108,6 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -9490,15 +9150,6 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -9540,7 +9191,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -9561,13 +9212,7 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+      pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -9579,40 +9224,25 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -9644,7 +9274,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+      f77* | f90* | f95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -9701,17 +9331,13 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -9719,7 +9345,7 @@
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -9735,15 +9361,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9364: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:9368: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -9772,18 +9398,13 @@
 
 
 
-
-
-
-
-
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -9796,7 +9417,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -9826,7 +9447,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9845,16 +9466,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:9473: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9881,7 +9502,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9900,16 +9521,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9524: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:9528: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9975,6 +9596,7 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10021,33 +9643,7 @@
   esac
 
   ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -10065,7 +9661,6 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -10081,12 +9676,11 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
 _LT_EOF
       fi
@@ -10122,12 +9716,10 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -10145,11 +9737,6 @@
       fi
       ;;
 
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -10165,7 +9752,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -10175,16 +9762,15 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=' $pic_flag'
+	tmp_addflag=
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -10195,17 +9781,13 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -10221,16 +9803,17 @@
         fi
 
 	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
+	xlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -10244,8 +9827,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -10263,8 +9846,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -10310,8 +9893,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -10351,10 +9934,8 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -10441,13 +10022,7 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10460,32 +10035,25 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -10494,13 +10062,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10513,42 +10075,30 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-
-  aix_libpath=$lt_cv_aix_libpath_
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -10580,64 +10130,20 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     darwin* | rhapsody*)
@@ -10647,12 +10153,7 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
+  whole_archive_flag_spec=''
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -10660,7 +10161,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -10678,6 +10179,10 @@
       hardcode_shlibpath_var=no
       ;;
 
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10690,7 +10195,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10699,7 +10204,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -10707,7 +10212,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -10722,13 +10227,14 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10740,16 +10246,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -10761,46 +10267,7 @@
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
@@ -10828,39 +10295,26 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo (void) { return 0; }
+int foo(void) {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
+        LDFLAGS="$save_LDFLAGS"
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10922,17 +10376,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10942,13 +10396,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10961,9 +10415,9 @@
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -11151,50 +10605,44 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
@@ -11352,6 +10800,11 @@
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11360,23 +10813,16 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -11389,7 +10835,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -11409,13 +10855,7 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -11441,7 +10881,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11450,7 +10890,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11503,7 +10943,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -11515,7 +10955,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11534,9 +10974,8 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -11557,83 +10996,36 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
     ;;
   esac
+  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -11654,7 +11046,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11662,6 +11054,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11669,7 +11065,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11687,7 +11083,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11707,26 +11103,12 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -11779,7 +11161,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11795,7 +11177,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -11832,9 +11214,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11842,17 +11224,12 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11865,17 +11242,13 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -11884,7 +11257,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -11916,7 +11289,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11985,7 +11358,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12010,7 +11383,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12034,7 +11407,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -12065,7 +11438,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12075,7 +11448,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12264,7 +11637,7 @@
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12298,7 +11671,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -12312,12 +11685,12 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12351,16 +11724,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12394,12 +11767,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12433,12 +11806,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12472,7 +11845,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -12513,7 +11886,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -12522,7 +11895,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 11898 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12563,13 +11936,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12578,11 +11945,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -12619,7 +11982,7 @@
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -12628,7 +11991,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 11994 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12669,13 +12032,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12684,11 +12041,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -12796,194 +12149,55 @@
 
 
 
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
 
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-else
-  _lt_caught_CXX_error=yes
-fi
+CC="$lt_save_CC"
+
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -13000,6 +12214,7 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -13009,8 +12224,6 @@
 module_expsym_cmds_CXX=
 link_all_deplibs_CXX=unknown
 old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
 no_undefined_flag_CXX=
 whole_archive_flag_spec_CXX=
 enable_shared_with_static_runtimes_CXX=no
@@ -13066,7 +12279,6 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -13084,7 +12296,6 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
   compiler=$CC
   compiler_CXX=$CC
   for cc_temp in $compiler""; do
@@ -13095,7 +12306,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
   if test -n "$compiler"; then
@@ -13158,7 +12369,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -13195,10 +12406,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -13224,8 +12435,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -13257,7 +12468,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
     else
       GXX=no
@@ -13367,13 +12578,7 @@
           allow_undefined_flag_CXX='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13386,33 +12591,26 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
@@ -13421,13 +12619,7 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13440,42 +12632,30 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    no_undefined_flag_CXX=' ${wl}-bernotok'
 	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_CXX='$convenience'
 	    archive_cmds_need_lc_CXX=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -13505,75 +12685,28 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+        # as there is no search path for DLLs.
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        allow_undefined_flag_CXX=unsupported
+        always_export_symbols_CXX=no
+        enable_shared_with_static_runtimes_CXX=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
       darwin* | rhapsody*)
 
 
@@ -13581,12 +12714,7 @@
   hardcode_direct_CXX=no
   hardcode_automatic_CXX=yes
   hardcode_shlibpath_var_CXX=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
+  whole_archive_flag_spec_CXX=''
   link_all_deplibs_CXX=yes
   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -13594,7 +12722,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -13628,7 +12756,7 @@
         esac
         ;;
 
-      freebsd2.*)
+      freebsd[12]*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -13647,11 +12775,6 @@
       gnu*)
         ;;
 
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
       hpux9*)
         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
         hardcode_libdir_separator_CXX=:
@@ -13676,11 +12799,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
             ;;
           *)
             if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               ld_shlibs_CXX=no
@@ -13741,7 +12864,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -13751,10 +12874,10 @@
 	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -13784,7 +12907,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -13795,9 +12918,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
 	      fi
 	    fi
 	    link_all_deplibs_CXX=yes
@@ -13808,7 +12931,7 @@
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -13826,7 +12949,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -13863,26 +12986,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
 	      prelink_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
 	      old_archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
 		$RANLIB $oldlib'
 	      archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 and above use weak symbols
+	    *) # Version 6 will use weak symbols
 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -13890,7 +13013,7 @@
 
 	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -13909,9 +13032,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
-	  xl* | mpixl* | bgxl*)
+	  xl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -13931,13 +13054,13 @@
 	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	      compiler_needs_object_CXX=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
+	      output_verbose_link_cmd='echo'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -14006,7 +13129,7 @@
 	    export_dynamic_flag_spec_CXX='${wl}-E'
 	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=func_echo_all
+	  output_verbose_link_cmd=echo
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -14041,15 +13164,15 @@
 	    case $host in
 	      osf3*)
 	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 		;;
@@ -14065,17 +13188,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -14085,7 +13208,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -14121,7 +13244,7 @@
 
       solaris*)
         case $cc_basename in
-          CC* | sunCC*)
+          CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             archive_cmds_need_lc_CXX=yes
 	    no_undefined_flag_CXX=' -zdefs'
@@ -14142,7 +13265,7 @@
 	    esac
 	    link_all_deplibs_CXX=yes
 
-	    output_verbose_link_cmd='func_echo_all'
+	    output_verbose_link_cmd='echo'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -14162,14 +13285,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -14180,7 +13303,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      fi
 
 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -14234,10 +13357,6 @@
           CC*)
 	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	      '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
 	    ;;
 	  *)
 	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -14299,14 +13418,6 @@
 };
 _LT_EOF
 
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14320,7 +13431,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
+    case $p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -14329,22 +13440,13 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
+       else
+	 prev=
        fi
 
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
+	 case $p in
+	 -L* | -R*)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -14364,10 +13466,8 @@
 	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
 	 fi
        fi
-       prev=
        ;;
 
-    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -14403,7 +13503,6 @@
 fi
 
 $RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
@@ -14439,7 +13538,7 @@
 
 solaris*)
   case $cc_basename in
-  CC* | sunCC*)
+  CC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -14504,6 +13603,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -14553,11 +13654,6 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -14607,11 +13703,6 @@
 	  ;;
 	esac
 	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -14668,7 +13759,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -14701,8 +13792,8 @@
 	    lt_prog_compiler_pic_CXX=
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-qpic'
 	    lt_prog_compiler_static_CXX='-qstaticlink'
@@ -14764,7 +13855,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC* | sunCC*)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
@@ -14829,17 +13920,10 @@
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
@@ -14847,7 +13931,7 @@
 if test -n "$lt_prog_compiler_pic_CXX"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
@@ -14863,15 +13947,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13950: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:13954: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_CXX=yes
@@ -14897,15 +13981,13 @@
 
 
 
-
-
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
@@ -14918,7 +14000,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_CXX=yes
@@ -14945,7 +14027,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -14964,16 +14046,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14049: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:14053: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -14997,7 +14079,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -15016,16 +14098,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14101: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:14105: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -15076,37 +14158,27 @@
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   case $host_os in
   aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     export_symbols_cmds_CXX="$ltdll_cmds"
-    ;;
+  ;;
   cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
+  ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
@@ -15138,50 +14210,44 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+        then
+	  archive_cmds_need_lc_CXX=no
+        else
+	  archive_cmds_need_lc_CXX=yes
+        fi
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
@@ -15249,6 +14315,8 @@
 
 
 
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15274,7 +14342,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15283,7 +14351,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15336,7 +14404,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -15348,7 +14416,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15363,109 +14431,62 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
 
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $RM \$dlpath'
     shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
     ;;
 
   *)
-    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
     ;;
   esac
+  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -15485,7 +14506,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -15493,6 +14514,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -15500,7 +14525,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -15518,7 +14543,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -15538,26 +14563,12 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -15610,7 +14621,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -15626,7 +14637,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -15663,9 +14674,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15673,17 +14684,12 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15696,17 +14702,13 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -15715,7 +14717,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15747,7 +14749,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -15816,7 +14818,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15841,7 +14843,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15865,7 +14867,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -15896,7 +14898,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15906,7 +14908,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16016,7 +15018,6 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -16045,8 +15046,6 @@
 
 
 
-
-
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -16064,22 +15063,10 @@
 
 
 
-for ac_header in features.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "features.h" "ac_cv_header_features_h" "$ac_includes_default"
-if test "x$ac_cv_header_features_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FEATURES_H 1
-_ACEOF
-
-fi
-
-done
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
+if test "${ac_cv_c_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -16120,7 +15107,7 @@
 esac
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
 else
 
@@ -16131,14 +15118,12 @@
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
-$as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if test "${ac_cv_type_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   /* For now, do not test the preprocessor; as of 2007 there are too many
@@ -16171,64 +15156,37 @@
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-
-else
-  ac_cv_type_unsigned_long_long_int=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-
-$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
-
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
-$as_echo_n "checking for long long int... " >&6; }
-if ${ac_cv_type_long_long_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+                          if test "$cross_compiling" = yes; then :
   ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-                                        if test "$cross_compiling" = yes; then :
-  :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
-                 #ifndef LLONG_MAX
-                 # define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 # define LLONG_MAX (HALF - 1 + HALF)
-                 #endif
+               #ifndef LLONG_MAX
+               # define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               # define LLONG_MAX (HALF - 1 + HALF)
+               #endif
 int
 main ()
 {
 long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-
+  ac_cv_type_long_long_int=yes
 else
   ac_cv_type_long_long_int=no
 fi
@@ -16236,8 +15194,11 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-        fi
-      fi
+else
+  ac_cv_type_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
 $as_echo "$ac_cv_type_long_long_int" >&6; }
@@ -16250,13 +15211,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 $as_echo_n "checking for wchar_t... " >&6; }
-if ${gt_cv_c_wchar_t+:} false; then :
+if test "${gt_cv_c_wchar_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';
+       wchar_t foo = (wchar_t)'\0';
 int
 main ()
 {
@@ -16283,7 +15244,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 $as_echo_n "checking for wint_t... " >&6; }
-if ${gt_cv_c_wint_t+:} false; then :
+if test "${gt_cv_c_wint_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16297,7 +15258,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-            wint_t foo = (wchar_t)'\0';
+       wint_t foo = (wchar_t)'\0';
 int
 main ()
 {
@@ -16321,43 +15282,8 @@
 
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
-$as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-#	    include <wchar.h>
-int
-main ()
-{
-mbstate_t x; return sizeof x;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_mbstate_t=yes
-else
-  ac_cv_type_mbstate_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-$as_echo "$ac_cv_type_mbstate_t" >&6; }
-   if test $ac_cv_type_mbstate_t = yes; then
-
-$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h
-
-   else
-
-$as_echo "#define mbstate_t int" >>confdefs.h
-
-   fi
 ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 else
 
@@ -16369,15 +15295,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
 $as_echo_n "checking for inttypes.h... " >&6; }
-if ${gl_cv_header_inttypes_h+:} false; then :
+if test "${gl_cv_header_inttypes_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <sys/types.h>
 #include <inttypes.h>
-
 int
 main ()
 {
@@ -16406,13 +15330,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
 $as_echo_n "checking for stdint.h... " >&6; }
-if ${gl_cv_header_stdint_h+:} false; then :
+if test "${gl_cv_header_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-            #include <stdint.h>
+#include <stdint.h>
 int
 main ()
 {
@@ -16441,17 +15365,42 @@
 
 
 
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
+$as_echo_n "checking for intmax_t... " >&6; }
+if test "${gt_cv_c_intmax_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-    test $ac_cv_type_long_long_int = yes \
-      && ac_type='long long' \
-      || ac_type='long'
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
 
-cat >>confdefs.h <<_ACEOF
-#define intmax_t $ac_type
+int
+main ()
+{
+intmax_t x = -1;
+        return !x;
+  ;
+  return 0;
+}
 _ACEOF
-
-  else
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_intmax_t=yes
+else
+  gt_cv_c_intmax_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5
+$as_echo "$gt_cv_c_intmax_t" >&6; }
+  if test $gt_cv_c_intmax_t = yes; then
 
 $as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h
 
@@ -16461,7 +15410,7 @@
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -16472,7 +15421,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 $as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
+if test "${gl_cv_size_max+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -16514,8 +15463,8 @@
                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
+            extern size_t foo;
+            extern unsigned long foo;
 
 int
 main ()
@@ -16554,10 +15503,11 @@
 
 
 
+
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -16573,7 +15523,6 @@
 
 
 
-
           LIBC_FATAL_STDERR_=1
   export LIBC_FATAL_STDERR_
 
@@ -16581,7 +15530,7 @@
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
+if test "${ac_cv_working_alloca_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16614,7 +15563,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+if test "${ac_cv_func_alloca_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16633,7 +15582,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
+char *alloca ();
 #    endif
 #   endif
 #  endif
@@ -16681,7 +15630,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
+if test "${ac_cv_os_cray+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16708,7 +15657,8 @@
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -16722,7 +15672,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -16732,20 +15682,23 @@
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction (int *addr, int depth)
+find_stack_direction ()
 {
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
 }
 
 int
-main (int argc, char **argv)
+main ()
 {
-  return find_stack_direction (0, argc + !argv + 20) < 0;
+  return find_stack_direction () < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -16775,7 +15728,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -16797,7 +15751,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 $as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if ${gl_cv_have_include_next+:} false; then :
+if test "${gl_cv_have_include_next+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -rf conftestd1a conftestd1b conftestd2
@@ -16875,43 +15829,17 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
-$as_echo_n "checking whether system header files limit the line length... " >&6; }
-if ${gl_cv_pragma_columns+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#ifdef __TANDEM
-choke me
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "choke me" >/dev/null 2>&1; then :
-  gl_cv_pragma_columns=yes
-else
-  gl_cv_pragma_columns=no
-fi
-rm -f conftest*
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
-$as_echo "$gl_cv_pragma_columns" >&6; }
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 $as_echo_n "checking for complete errno.h... " >&6; }
-if ${gl_cv_header_errno_h_complete+:} false; then :
+if test "${gl_cv_header_errno_h_complete+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -16919,9 +15847,6 @@
 /* end confdefs.h.  */
 
 #include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
 #if !defined ENOMSG
 booboo
 #endif
@@ -16946,30 +15871,12 @@
 #if !defined ENOTSUP
 booboo
 #endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
 #if !defined ESTALE
 booboo
 #endif
-#if !defined EDQUOT
-booboo
-#endif
 #if !defined ECANCELED
 booboo
 #endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -16991,6 +15898,10 @@
 
 
 
+  :
+
+
+
 
 
 
@@ -17000,45 +15911,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 $as_echo_n "checking absolute name of <errno.h>... " >&6; }
-if ${gl_cv_next_errno_h+:} false; then :
+if test "${gl_cv_next_errno_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_errno_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'errno.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_errno_h
-           gl_cv_next_errno_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/errno.h#{
+                 s#.*"\(.*/errno.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_errno_h='<'errno.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
@@ -17057,23 +15953,14 @@
 
 
 
-
     ERRNO_H='errno.h'
   fi
 
-   if test -n "$ERRNO_H"; then
-  GL_GENERATE_ERRNO_H_TRUE=
-  GL_GENERATE_ERRNO_H_FALSE='#'
-else
-  GL_GENERATE_ERRNO_H_TRUE='#'
-  GL_GENERATE_ERRNO_H_FALSE=
-fi
-
 
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 $as_echo_n "checking for EMULTIHOP value... " >&6; }
-if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then :
+if test "${gl_cv_header_errno_h_EMULTIHOP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17144,7 +16031,7 @@
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 $as_echo_n "checking for ENOLINK value... " >&6; }
-if ${gl_cv_header_errno_h_ENOLINK+:} false; then :
+if test "${gl_cv_header_errno_h_ENOLINK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17215,7 +16102,7 @@
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 $as_echo_n "checking for EOVERFLOW value... " >&6; }
-if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then :
+if test "${gl_cv_header_errno_h_EOVERFLOW+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17284,9 +16171,6 @@
 
 
 
-
-
-
    if true; then
   GL_COND_LIBTOOL_TRUE=
   GL_COND_LIBTOOL_FALSE='#'
@@ -17307,169 +16191,55 @@
 
 
   gl_source_base='.'
-LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
-
-
-
-
-
-
-  if test $ac_cv_func_alloca_works = no; then
-
-
-  :
-
-
-
-
-
-
-
-
-  :
-
-  fi
-
-  # Define an additional variable used in the Makefile substitution.
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#if defined __GNUC__ || defined _MSC_VER || !HAVE_ALLOCA_H
-  Need own alloca
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Need own alloca" >/dev/null 2>&1; then :
-  ALLOCA_H=alloca.h
-else
-  ALLOCA_H=
-fi
-rm -f conftest*
-
-
-   if test -n "$ALLOCA_H"; then
-  GL_GENERATE_ALLOCA_H_TRUE=
-  GL_GENERATE_ALLOCA_H_FALSE='#'
-else
-  GL_GENERATE_ALLOCA_H_TRUE='#'
-  GL_GENERATE_ALLOCA_H_FALSE=
-fi
-
-
-
-
-
-  for ac_header in stdint.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H 1
-_ACEOF
+  # Code from module alloca:
+LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
 
-fi
+  # Code from module alloca-opt:
 
-done
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
-$as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-    gl_cv_size_max=
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Found it" >/dev/null 2>&1; then :
-  gl_cv_size_max=yes
-fi
-rm -f conftest*
+  if test $ac_cv_func_alloca_works = no; then
 
-    if test -z "$gl_cv_size_max"; then
-                        if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) * CHAR_BIT - 1" "size_t_bits_minus_1"        "#include <stddef.h>
-#include <limits.h>"; then :
 
-else
-  size_t_bits_minus_1=
-fi
+  :
 
-      if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint"        "#include <stddef.h>"; then :
 
-else
-  fits_in_uint=
-fi
 
-      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-        if test $fits_in_uint = 1; then
-                              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  fits_in_uint=0
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-        fi
-                                if test $fits_in_uint = 1; then
-          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        else
-          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        fi
-      else
-                gl_cv_size_max='((size_t)~(size_t)0)'
-      fi
-    fi
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
-$as_echo "$gl_cv_size_max" >&6; }
-  if test "$gl_cv_size_max" != yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define SIZE_MAX $gl_cv_size_max
-_ACEOF
+
+  :
 
   fi
 
+  # Define an additional variable used in the Makefile substitution.
 
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#if defined __GNUC__ || defined _MSC_VER || !HAVE_ALLOCA_H
+  Need own alloca
+#endif
 
-  for ac_header in stdint.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H 1
 _ACEOF
-
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Need own alloca" >/dev/null 2>&1; then :
+  ALLOCA_H=alloca.h
+else
+  ALLOCA_H=
 fi
+rm -f conftest*
+
 
-done
 
+  # Code from module errno:
 
+  # Code from module include_next:
+  # Code from module dummy:
   # End of code from modules
 
 
@@ -17507,7 +16277,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17517,7 +16288,7 @@
 
 ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h>
 "
-if test "x$ac_cv_have_decl__snprintf" = xyes; then :
+if test "x$ac_cv_have_decl__snprintf" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -17531,13 +16302,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5
 $as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; }
-if ${gt_cv_func_printf_posix+:} false; then :
+if test "${gt_cv_func_printf_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
       if test "$cross_compiling" = yes; then :
 
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
@@ -17597,7 +16368,7 @@
 set dummy dvips; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DVIPS+:} false; then :
+if test "${ac_cv_path_DVIPS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $DVIPS in
@@ -17611,7 +16382,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17638,7 +16409,7 @@
 set dummy texi2pdf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TEXI2PDF+:} false; then :
+if test "${ac_cv_path_TEXI2PDF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $TEXI2PDF in
@@ -17652,7 +16423,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TEXI2PDF="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17679,7 +16450,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -17693,7 +16464,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17784,21 +16555,10 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -17814,7 +16574,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -17829,14 +16588,6 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -17846,27 +16597,23 @@
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
+  as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ERRNO_H\" was never defined.
+if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
+  as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -17902,7 +16649,7 @@
 
 
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -18003,7 +16750,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -18049,19 +16795,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -18199,16 +16945,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -18257,7 +17003,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -18268,16 +17014,28 @@
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -18299,7 +17057,7 @@
 # values after options handling.
 ac_log="
 This file was extended by libasprintf $as_me 1.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18365,10 +17123,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 libasprintf config.status 1.0
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18386,16 +17144,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -18417,7 +17170,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -18430,7 +17182,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -18439,7 +17191,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -18459,7 +17211,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -18493,212 +17245,187 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "X$install_override_mode" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
 # Quote evaled strings.
-for var in AS \
-DLLTOOL \
-OBJDUMP \
-SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
+for var in SED \
 GREP \
 EGREP \
 FGREP \
@@ -18710,12 +17437,8 @@
 reload_flag \
 deplibs_check_method \
 file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
-archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -18725,14 +17448,14 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
+SHELL \
+ECHO \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
 lt_prog_compiler_wl \
+lt_prog_compiler_pic \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
-MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -18746,7 +17469,9 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
+fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -18765,11 +17490,10 @@
 postdeps \
 compiler_lib_search_path \
 LD_CXX \
-reload_flag_CXX \
 compiler_CXX \
 lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_pic_CXX \
 lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_CXX \
 lt_prog_compiler_static_CXX \
 lt_cv_prog_compiler_c_o_CXX \
 export_dynamic_flag_spec_CXX \
@@ -18779,7 +17503,9 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
+fix_srcfile_path_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
 file_list_spec_CXX \
@@ -18789,9 +17515,9 @@
 predeps_CXX \
 postdeps_CXX \
 compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -18813,13 +17539,11 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
-postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec \
-reload_cmds_CXX \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_CXX \
 old_archive_from_expsyms_cmds_CXX \
@@ -18828,11 +17552,10 @@
 module_cmds_CXX \
 module_expsym_cmds_CXX \
 export_symbols_cmds_CXX \
-prelink_cmds_CXX \
-postlink_cmds_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+prelink_cmds_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -18840,6 +17563,12 @@
     esac
 done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -18875,7 +17604,7 @@
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -18898,10 +17627,9 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -18909,13 +17637,12 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -18932,12 +17659,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -18946,18 +17673,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -18965,7 +17692,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -19013,7 +17740,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -19045,29 +17772,21 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -19079,7 +17798,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -19091,11 +17810,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -19180,7 +17899,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -19193,7 +17912,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -19212,7 +17931,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -19221,7 +17940,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -19247,8 +17966,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -19384,24 +18103,23 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -19410,21 +18128,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -19470,7 +18188,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -19483,7 +18201,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -19517,19 +18235,21 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -19583,8 +18303,7 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -19621,13 +18340,13 @@
 macro_revision=$macro_revision
 
 # Assembler program.
-AS=$lt_AS
+AS=$AS
 
 # DLL creation program.
-DLLTOOL=$lt_DLLTOOL
+DLLTOOL=$DLLTOOL
 
 # Object dumper program.
-OBJDUMP=$lt_OBJDUMP
+OBJDUMP=$OBJDUMP
 
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
@@ -19641,15 +18360,6 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -19699,36 +18409,20 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method = "file_magic".
+# Command to use when deplibs_check_method == "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
 # The archiver.
 AR=$lt_AR
-
-# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -19737,9 +18431,6 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
 # A C compiler.
 LTCC=$lt_CC
 
@@ -19758,24 +18449,21 @@
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
 
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -19874,10 +18562,6 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -19890,12 +18574,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -19945,6 +18629,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -19978,6 +18666,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -19993,9 +18684,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -20042,169 +18730,212 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
 
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
 
 
-   mv -f "$cfgfile" "$ofile" ||
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -20216,10 +18947,6 @@
 # The linker used to build libraries.
 LD=$lt_LD_CXX
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_CXX
 
@@ -20232,12 +18959,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl_CXX
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_CXX
 
@@ -20287,6 +19014,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
@@ -20320,6 +19051,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_CXX
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
 
@@ -20335,9 +19069,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_CXX
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_CXX
 
@@ -20372,7 +19103,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -20393,7 +19124,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/configure.ac gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac
--- gettext-0.19.3/gettext-runtime/libasprintf/configure.ac	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 dnl Configuration for the GNU libasprintf library
-dnl Copyright (C) 2002-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2009 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
@@ -21,7 +21,7 @@
 AC_CONFIG_SRCDIR([vasprintf.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AM_INIT_AUTOMAKE([silent-rules])
-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER([config.h])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -52,7 +52,6 @@
 dnl Checks for libraries.
 
 dnl Checks for header files.
-AC_CHECK_HEADERS([features.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -60,12 +59,11 @@
 AC_TYPE_LONG_LONG_INT
 gt_TYPE_WCHAR_T
 gt_TYPE_WINT_T
-AC_TYPE_MBSTATE_T
 AC_CHECK_TYPE([ptrdiff_t], ,
   [AC_DEFINE([ptrdiff_t], [long],
      [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
   ])
-gl_AC_TYPE_INTMAX_T
+gt_TYPE_INTMAX_T
 gl_XSIZE
 
 dnl Checks for library functions.
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/COPYING.LIB gettext-0.18.1.1/gettext-runtime/libasprintf/COPYING.LIB
--- gettext-0.19.3/gettext-runtime/libasprintf/COPYING.LIB	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/COPYING.LIB	2010-06-06 12:49:57.000000000 +0000
@@ -1,128 +1,112 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 Licenses are intended to guarantee your freedom to share and change
 free software--to make sure the software is free for all its users.
 
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
   To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
 
   For example, if you distribute copies of the library, whether gratis
 or for a fee, you must give the recipients all the rights that we gave
 you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
 it.  And you must show them these terms so they know their rights.
 
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
 permission to copy, distribute and/or modify the library.
 
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
 
   The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
 
   A "library" means a collection of software functions and/or data
 prepared so as to be conveniently linked with application programs
@@ -139,8 +123,7 @@
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
+interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
   Activities other than copying, distribution and modification are not
@@ -150,7 +133,7 @@
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-
+  
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -220,7 +203,7 @@
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-^L
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -271,8 +254,8 @@
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
+
+  6. As an exception to the Sections above, you may also compile or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
 under terms of your choice, provided that the terms permit
@@ -299,31 +282,23 @@
     Library will not necessarily be able to recompile the application
     to use the modified definitions.)
 
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
+    b) Accompany the work with a written offer, valid for at
     least three years, to give the same user the materials
     specified in Subsection 6a, above, for a charge no more
     than the cost of performing this distribution.
 
-    d) If distribution of the work is made by offering access to copy
+    c) If distribution of the work is made by offering access to copy
     from a designated place, offer equivalent access to copy the above
     specified materials from the same place.
 
-    e) Verify that the user has already received a copy of these
+    d) Verify that the user has already received a copy of these
     materials or that you have already sent this user a copy.
 
   For an executable, the required form of the "work that uses the
 Library" must include any data and utility programs needed for
 reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
 components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
@@ -333,7 +308,7 @@
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-^L
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -372,9 +347,9 @@
 original licensor to copy, distribute, link with or modify the Library
 subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
+You are not responsible for enforcing compliance by third parties to
 this License.
-^L
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -388,10 +363,9 @@
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
@@ -409,14 +383,14 @@
 
   12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
+versions of the Library General Public License from time to time.
 Such new versions will be similar in spirit to the present version,
 but may differ in detail to address new problems or concerns.
 
@@ -427,7 +401,7 @@
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-^L
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -437,7 +411,7 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -460,57 +434,49 @@
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
+		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
 everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
 
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
 
-
-    <one line to give the library's name and a brief idea of what it
-does.>
+    <one line to give the library's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
+    modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
-    Lesser General Public License for more details.
+    Library General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301, USA
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA
 
-Also add information on how to contact you by electronic and paper
-mail.
+Also add information on how to contact you by electronic and paper mail.
 
-You should also get your employer (if you work as a programmer) or
-your
+You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the library, if
 necessary.  Here is a sample; alter the names:
 
   Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/dummy.c gettext-0.18.1.1/gettext-runtime/libasprintf/dummy.c
--- gettext-0.19.3/gettext-runtime/libasprintf/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/dummy.c	2010-02-16 21:31:38.000000000 +0000
@@ -0,0 +1,42 @@
+/* A dummy file, to prevent empty libraries from breaking builds.
+   Copyright (C) 2004, 2007, 2009, 2010 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
+   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
+   libraries without any object files.  You might get an error like:
+
+   > ar cru .libs/libgl.a
+   > ar: no archive members specified
+
+   Compiling this file, and adding its object file to the library, will
+   prevent the library from being empty.  */
+
+/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries
+   that don't export any symbol.  You might get an error like:
+
+   > cc ... libgnu.a
+   > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a
+
+   Compiling this file, and adding its object file to the library, will
+   prevent the library from exporting no symbols.  */
+
+#ifdef __sun
+/* This declaration ensures that the library will export at least 1 symbol.  */
+int gl_dummy_symbol;
+#else
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;
+#endif
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/errno.in.h gettext-0.18.1.1/gettext-runtime/libasprintf/errno.in.h
--- gettext-0.19.3/gettext-runtime/libasprintf/errno.in.h	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/errno.in.h	2010-04-25 09:20:53.000000000 +0000
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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
@@ -13,137 +13,69 @@
    GNU Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
-#define _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
+#define _GL_ERRNO_H
 
 
 /* On native Windows platforms, many macros are not defined.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* These are the same values as defined by MSVC 10, for interoperability.  */
+/* POSIX says that EAGAIN and EWOULDBLOCK may have the same value.  */
+#  define EWOULDBLOCK     EAGAIN
 
-#  ifndef ENOMSG
-#   define ENOMSG    122
-#   define GNULIB_defined_ENOMSG 1
-#  endif
-
-#  ifndef EIDRM
-#   define EIDRM     111
-#   define GNULIB_defined_EIDRM 1
-#  endif
-
-#  ifndef ENOLINK
-#   define ENOLINK   121
-#   define GNULIB_defined_ENOLINK 1
-#  endif
-
-#  ifndef EPROTO
-#   define EPROTO    134
-#   define GNULIB_defined_EPROTO 1
-#  endif
-
-#  ifndef EBADMSG
-#   define EBADMSG   104
-#   define GNULIB_defined_EBADMSG 1
-#  endif
-
-#  ifndef EOVERFLOW
-#   define EOVERFLOW 132
-#   define GNULIB_defined_EOVERFLOW 1
-#  endif
-
-#  ifndef ENOTSUP
-#   define ENOTSUP   129
-#   define GNULIB_defined_ENOTSUP 1
-#  endif
-
-#  ifndef ENETRESET
-#   define ENETRESET 117
-#   define GNULIB_defined_ENETRESET 1
-#  endif
-
-#  ifndef ECONNABORTED
-#   define ECONNABORTED 106
-#   define GNULIB_defined_ECONNABORTED 1
-#  endif
-
-#  ifndef ECANCELED
-#   define ECANCELED 105
-#   define GNULIB_defined_ECANCELED 1
-#  endif
-
-#  ifndef EOWNERDEAD
-#   define EOWNERDEAD 133
-#   define GNULIB_defined_EOWNERDEAD 1
-#  endif
-
-#  ifndef ENOTRECOVERABLE
-#   define ENOTRECOVERABLE 127
-#   define GNULIB_defined_ENOTRECOVERABLE 1
-#  endif
-
-#  ifndef EINPROGRESS
-#   define EINPROGRESS     112
-#   define EALREADY        103
-#   define ENOTSOCK        128
-#   define EDESTADDRREQ    109
-#   define EMSGSIZE        115
-#   define EPROTOTYPE      136
-#   define ENOPROTOOPT     123
-#   define EPROTONOSUPPORT 135
-#   define EOPNOTSUPP      130
-#   define EAFNOSUPPORT    102
-#   define EADDRINUSE      100
-#   define EADDRNOTAVAIL   101
-#   define ENETDOWN        116
-#   define ENETUNREACH     118
-#   define ECONNRESET      108
-#   define ENOBUFS         119
-#   define EISCONN         113
-#   define ENOTCONN        126
-#   define ETIMEDOUT       138
-#   define ECONNREFUSED    107
-#   define ELOOP           114
-#   define EHOSTUNREACH    110
-#   define EWOULDBLOCK     140
-#   define GNULIB_defined_ESOCK 1
-#  endif
-
-#  ifndef ETXTBSY
-#   define ETXTBSY         139
-#   define ENODATA         120  /* not required by POSIX */
-#   define ENOSR           124  /* not required by POSIX */
-#   define ENOSTR          125  /* not required by POSIX */
-#   define ETIME           137  /* not required by POSIX */
-#   define EOTHER          131  /* not required by POSIX */
-#   define GNULIB_defined_ESTREAMS 1
-#  endif
+/* Values >= 100 seem safe to use.  */
+#  define ETXTBSY   100
+#  define GNULIB_defined_ETXTBSY 1
 
 /* These are intentionally the same values as the WSA* error numbers, defined
    in <winsock2.h>.  */
+#  define EINPROGRESS     10036
+#  define EALREADY        10037
+#  define ENOTSOCK        10038
+#  define EDESTADDRREQ    10039
+#  define EMSGSIZE        10040
+#  define EPROTOTYPE      10041
+#  define ENOPROTOOPT     10042
+#  define EPROTONOSUPPORT 10043
 #  define ESOCKTNOSUPPORT 10044  /* not required by POSIX */
+#  define EOPNOTSUPP      10045
 #  define EPFNOSUPPORT    10046  /* not required by POSIX */
+#  define EAFNOSUPPORT    10047
+#  define EADDRINUSE      10048
+#  define EADDRNOTAVAIL   10049
+#  define ENETDOWN        10050
+#  define ENETUNREACH     10051
+#  define ENETRESET       10052
+#  define ECONNABORTED    10053
+#  define ECONNRESET      10054
+#  define ENOBUFS         10055
+#  define EISCONN         10056
+#  define ENOTCONN        10057
 #  define ESHUTDOWN       10058  /* not required by POSIX */
 #  define ETOOMANYREFS    10059  /* not required by POSIX */
+#  define ETIMEDOUT       10060
+#  define ECONNREFUSED    10061
+#  define ELOOP           10062
 #  define EHOSTDOWN       10064  /* not required by POSIX */
+#  define EHOSTUNREACH    10065
 #  define EPROCLIM        10067  /* not required by POSIX */
 #  define EUSERS          10068  /* not required by POSIX */
 #  define EDQUOT          10069
 #  define ESTALE          10070
 #  define EREMOTE         10071  /* not required by POSIX */
-#  define GNULIB_defined_EWINSOCK 1
+#  define GNULIB_defined_ESOCK 1
 
 # endif
 
@@ -166,7 +98,6 @@
 
 /* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK,
    EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined.
-   Likewise, on NonStop Kernel, EDQUOT is not defined.
    Define them here.  Values >= 2000 seem safe to use: Solaris ESTALE = 151,
    HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133.
 
@@ -214,66 +145,16 @@
 #  define GNULIB_defined_ENOTSUP 1
 # endif
 
-# ifndef ENETRESET
-#  define ENETRESET 2011
-#  define GNULIB_defined_ENETRESET 1
-# endif
-
-# ifndef ECONNABORTED
-#  define ECONNABORTED 2012
-#  define GNULIB_defined_ECONNABORTED 1
-# endif
-
 # ifndef ESTALE
 #  define ESTALE    2009
 #  define GNULIB_defined_ESTALE 1
 # endif
 
-# ifndef EDQUOT
-#  define EDQUOT 2010
-#  define GNULIB_defined_EDQUOT 1
-# endif
-
 # ifndef ECANCELED
 #  define ECANCELED 2008
 #  define GNULIB_defined_ECANCELED 1
 # endif
 
-/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not
-   defined.  */
-
-# ifndef EOWNERDEAD
-#  if defined __sun
-    /* Use the same values as defined for Solaris >= 8, for
-       interoperability.  */
-#   define EOWNERDEAD      58
-#   define ENOTRECOVERABLE 59
-#  elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-    /* We have a conflict here: pthreads-win32 defines these values
-       differently than MSVC 10.  It's hairy to decide which one to use.  */
-#   if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
-     /* Use the same values as defined by pthreads-win32, for
-        interoperability.  */
-#    define EOWNERDEAD      43
-#    define ENOTRECOVERABLE 44
-#   else
-     /* Use the same values as defined by MSVC 10, for
-        interoperability.  */
-#    define EOWNERDEAD      133
-#    define ENOTRECOVERABLE 127
-#   endif
-#  else
-#   define EOWNERDEAD      2013
-#   define ENOTRECOVERABLE 2014
-#  endif
-#  define GNULIB_defined_EOWNERDEAD 1
-#  define GNULIB_defined_ENOTRECOVERABLE 1
-# endif
-
-# ifndef EILSEQ
-#  define EILSEQ 2015
-#  define GNULIB_defined_EILSEQ 1
-# endif
 
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
+#endif /* _GL_ERRNO_H */
+#endif /* _GL_ERRNO_H */
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4	2010-02-16 21:31:38.000000000 +0000
@@ -1,28 +1,12 @@
-# 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 2
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
-dnl m4_divert semantics.
-
-# Until autoconf 2.63, handling of the diversion stack required m4_init
-# to be called first; but this does not happen with aclocal.  Wrapping
-# the entire execution in another layer of the diversion stack fixes this.
-# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
-# for whether it was FIFO or LIFO; in order to properly balance with
-# m4_init, we need to undo our push just before anything wrapped within
-# the m4_init body.  The way to ensure this is to wrap both sides of
-# m4_init with a one-shot macro that does the pop at the right time.
-m4_ifndef([_m4_divert_diversion],
-[m4_divert_push([KILL])
-m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
-m4_define([m4_init],
-  [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
-
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
 
 # AC_DEFUN_ONCE([NAME], VALUE)
 # ----------------------------
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-# absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 From Derek Price.
-
-# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
-# ---------------------------------------
-# Find the absolute name of a header file, testing first if the header exists.
-# If the header were sys/inttypes.h, this macro would define
-# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
-# in config.h
-# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
-# The three "///" are to pacify Sun C 5.8, which otherwise would say
-# "warning: #include of /usr/include/... may be non-portable".
-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
-# Note: This macro assumes that the header file is not empty after
-# preprocessing, i.e. it does not only define preprocessor macros but also
-# provides some type/enum definitions or function/variable declarations.
-AC_DEFUN([gl_ABSOLUTE_HEADER],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PREPROC_REQUIRE()dnl
-dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
-dnl until we can assume autoconf 2.64 or newer.
-m4_foreach_w([gl_HEADER_NAME], [$1],
-  [AS_VAR_PUSHDEF([gl_absolute_header],
-                  [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
-  AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
-    m4_defn([gl_absolute_header]),
-    [AS_VAR_PUSHDEF([ac_header_exists],
-                    [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
-    AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
-    if test AS_VAR_GET(ac_header_exists) = yes; then
-      gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
-    fi
-    AS_VAR_POPDEF([ac_header_exists])dnl
-    ])dnl
-  AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
-                     ["AS_VAR_GET(gl_absolute_header)"],
-                     [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.])
-  AS_VAR_POPDEF([gl_absolute_header])dnl
-])dnl
-])# gl_ABSOLUTE_HEADER
-
-# gl_ABSOLUTE_HEADER_ONE(HEADER)
-# ------------------------------
-# Like gl_ABSOLUTE_HEADER, except that:
-#   - it assumes that the header exists,
-#   - it uses the current CPPFLAGS,
-#   - it does not cache the result,
-#   - it is silent.
-AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
-  dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
-  dnl that contain only a #include of other header files and no
-  dnl non-comment tokens of their own. This leads to a failure to
-  dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
-  dnl and others. The workaround is to force preservation of comments
-  dnl through option -C. This ensures all necessary #line directives
-  dnl are present. GCC supports option -C as well.
-  case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-changequote(,)
-  case "$host_os" in
-    mingw*)
-      dnl For the sake of native Windows compilers (excluding gcc),
-      dnl treat backslash as a directory separator, like /.
-      dnl Actually, these compilers use a double-backslash as
-      dnl directory separator, inside the
-      dnl   # line "filename"
-      dnl directives.
-      gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-  dnl A sed expression that turns a string into a basic regular
-  dnl expression, for use within "/.../".
-  gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo '$1' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-changequote([,])
-  dnl eval is necessary to expand gl_absname_cpp.
-  dnl Ultrix and Pyramid sh refuse to redirect output of eval,
-  dnl so use subshell.
-  AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
-[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-  sed -n "$gl_absolute_header_sed"`])
-])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/alloca.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/alloca.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/alloca.m4	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/alloca.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
-# alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011 Free Software Foundation, Inc.
+# alloca.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,7 +25,6 @@
     ALLOCA_H=alloca.h,
     ALLOCA_H=)
   AC_SUBST([ALLOCA_H])
-  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
 ])
 
 # Prerequisites of lib/alloca.c.
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4	2010-02-16 21:31:38.000000000 +0000
@@ -1,5 +1,5 @@
-# errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc.
+# errno_h.m4 serial 6
+dnl Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,9 +10,6 @@
   AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
     AC_EGREP_CPP([booboo],[
 #include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
 #if !defined ENOMSG
 booboo
 #endif
@@ -37,30 +34,12 @@
 #if !defined ENOTSUP
 booboo
 #endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
 #if !defined ESTALE
 booboo
 #endif
-#if !defined EDQUOT
-booboo
-#endif
 #if !defined ECANCELED
 booboo
 #endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
       ],
       [gl_cv_header_errno_h_complete=no],
       [gl_cv_header_errno_h_complete=yes])
@@ -68,11 +47,10 @@
   if test $gl_cv_header_errno_h_complete = yes; then
     ERRNO_H=''
   else
-    gl_NEXT_HEADERS([errno.h])
+    gl_CHECK_NEXT_HEADERS([errno.h])
     ERRNO_H='errno.h'
   fi
   AC_SUBST([ERRNO_H])
-  AM_CONDITIONAL([GL_GENERATE_ERRNO_H], [test -n "$ERRNO_H"])
   gl_REPLACE_ERRNO_VALUE([EMULTIHOP])
   gl_REPLACE_ERRNO_VALUE([ENOLINK])
   gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4	2014-10-16 06:00:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4	2010-06-06 20:09:07.000000000 +0000
@@ -1,41 +1,27 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
-# In projects that use version control, this file is meant to be put under
-# version control, like the configure.ac and various Makefile.am files.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=gettext-runtime/libasprintf --local-dir=gnulib-local --lib=libgnu --source-base=. --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../../build-aux --lgpl=2 --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca errno verify xsize
+#   gnulib-tool --import --dir=gettext-runtime/libasprintf --local-dir=gnulib-local --lib=libgnu --source-base=. --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../../build-aux --lgpl=2 --makefile-name=Makefile.gnulib --libtool --macro-prefix=gl alloca errno
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([../../gnulib-local])
 gl_MODULES([
   alloca
   errno
-  verify
-  xsize
 ])
 gl_AVOID([])
 gl_SOURCE_BASE([.])
@@ -49,4 +35,3 @@
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_MACRO([])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4	2010-05-09 01:36:25.000000000 +0000
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 20
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,25 +12,11 @@
   AC_REQUIRE([gl_COMMON_BODY])
 ])
 AC_DEFUN([gl_COMMON_BODY], [
-  AH_VERBATIM([_Noreturn],
-[/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-])
   AH_VERBATIM([isoc99_inline],
 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE__ && __MACH__ test for MacOS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
@@ -48,30 +34,6 @@
 /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
-
-/* gcc supports the "unused" attribute on possibly unused labels, and
-   g++ has since version 4.5.  Note to support C++ as well as C,
-   _GL_UNUSED_LABEL should be used with a trailing ;  */
-#if !defined __cplusplus || __GNUC__ > 4 \
-    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-# define _GL_UNUSED_LABEL _GL_UNUSED
-#else
-# define _GL_UNUSED_LABEL
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
 ])
   dnl Preparation for running test programs:
   dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
@@ -85,49 +47,16 @@
 # expands to a C preprocessor expression that evaluates to 1 or 0, depending
 # whether a gnulib module that has been requested shall be considered present
 # or not.
-m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
 
 # gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
 # sets the shell variable that indicates the presence of the given module to
 # a C preprocessor expression that will evaluate to 1.
 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
 [
-  gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
-    [GNULIB_[]m4_translit([[$1]],
-                          [abcdefghijklmnopqrstuvwxyz./-],
-                          [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
-    [gl_MODULE_INDICATOR_CONDITION])
-])
-
-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
-# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
-# The shell variable's value is a C preprocessor expression that evaluates
-# to 0 or 1.
-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
-[
-  m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
-    [
-     dnl Simplify the expression VALUE || 1 to 1.
-     $1=1
-    ],
-    [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
-                                             [gl_MODULE_INDICATOR_CONDITION])])
-])
-
-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
-# modifies the shell variable to include the given condition.  The shell
-# variable's value is a C preprocessor expression that evaluates to 0 or 1.
-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
-[
-  dnl Simplify the expression 1 || CONDITION to 1.
-  if test "$[]$1" != 1; then
-    dnl Simplify the expression 0 || CONDITION to CONDITION.
-    if test "$[]$1" = 0; then
-      $1=$2
-    else
-      $1="($[]$1 || $2)"
-    fi
-  fi
+  GNULIB_[]m4_translit([[$1]],
+    [abcdefghijklmnopqrstuvwxyz./-],
+    [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
 ])
 
 # gl_MODULE_INDICATOR([modulename])
@@ -173,40 +102,6 @@
     [Define to 1 when the gnulib module $1 should be tested.])
 ])
 
-# gl_ASSERT_NO_GNULIB_POSIXCHECK
-# asserts that there will never be a need to #define GNULIB_POSIXCHECK.
-# and thereby enables an optimization of configure and config.h.
-# Used by Emacs.
-AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK],
-[
-  dnl Override gl_WARN_ON_USE_PREPARE.
-  dnl But hide this definition from 'aclocal'.
-  AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
-])
-
-# gl_ASSERT_NO_GNULIB_TESTS
-# asserts that there will be no gnulib tests in the scope of the configure.ac
-# and thereby enables an optimization of config.h.
-# Used by Emacs.
-AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS],
-[
-  dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
-  AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
-])
-
-# Test whether <features.h> exists.
-# Set HAVE_FEATURES_H.
-AC_DEFUN([gl_FEATURES_H],
-[
-  AC_CHECK_HEADERS_ONCE([features.h])
-  if test $ac_cv_header_features_h = yes; then
-    HAVE_FEATURES_H=1
-  else
-    HAVE_FEATURES_H=0
-  fi
-  AC_SUBST([HAVE_FEATURES_H])
-])
-
 # m4_foreach_w
 # is a backport of autoconf-2.59c's m4_foreach_w.
 # Remove this macro when we can assume autoconf >= 2.60.
@@ -222,90 +117,11 @@
 [m4_define([AS_VAR_IF],
 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
 
-# gl_PROG_CC_C99
-# Modifies the value of the shell variable CC in an attempt to make $CC
-# understand ISO C99 source code.
-# This is like AC_PROG_CC_C99, except that
-# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
-# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
-#   but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
-# Remaining problems:
-# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
-#   to CC twice
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
-# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
-AC_DEFUN([gl_PROG_CC_C99],
-[
-  dnl Change that version number to the minimum Autoconf version that supports
-  dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
-  m4_version_prereq([9.0],
-    [AC_REQUIRE([AC_PROG_CC_C99])],
-    [AC_REQUIRE([AC_PROG_CC_STDC])])
-])
-
-# gl_PROG_AR_RANLIB
-# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
-# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
-# the values.
-AC_DEFUN([gl_PROG_AR_RANLIB],
-[
-  dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
-  dnl as "cc", and GCC as "gcc". They have different object file formats and
-  dnl library formats. In particular, the GNU binutils programs ar, ranlib
-  dnl produce libraries that work only with gcc, not with cc.
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
-    [
-      AC_EGREP_CPP([Amsterdam],
-        [
-#ifdef __ACK__
-Amsterdam
-#endif
-        ],
-        [gl_cv_c_amsterdam_compiler=yes],
-        [gl_cv_c_amsterdam_compiler=no])
-    ])
-  if test -z "$AR"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      AR='cc -c.a'
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='-o'
-      fi
-    else
-      dnl Use the Automake-documented default values for AR and ARFLAGS,
-      dnl but prefer ${host}-ar over ar (useful for cross-compiling).
-      AC_CHECK_TOOL([AR], [ar], [ar])
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
-      fi
-    fi
-  else
-    if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
-    fi
-  fi
-  AC_SUBST([AR])
-  AC_SUBST([ARFLAGS])
-  if test -z "$RANLIB"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      RANLIB=':'
-    else
-      dnl Use the ranlib program if it is available.
-      AC_PROG_RANLIB
-    fi
-  fi
-  AC_SUBST([RANLIB])
-])
-
 # AC_PROG_MKDIR_P
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
 # for interoperability with automake-1.9.6 from autoconf-2.62.
 # Remove this macro when we can assume autoconf >= 2.62 or
 # autoconf >= 2.60 && automake >= 1.10.
-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
-m4_ifndef([AC_AUTOCONF_VERSION],[
 m4_ifdef([AC_PROG_MKDIR_P], [
   dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
   m4_define([AC_PROG_MKDIR_P],
@@ -316,31 +132,27 @@
     [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
      MKDIR_P='$(mkdir_p)'
      AC_SUBST([MKDIR_P])])])
-])
 
 # AC_C_RESTRICT
-# This definition is copied from post-2.69 Autoconf and overrides the
-# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
-# once autoconf >= 2.70 can be assumed.  It's painful to check version
-# numbers, and in practice this macro is more up-to-date than Autoconf
-# is, so override Autoconf unconditionally.
+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
+# works.
+# This definition can be removed once autoconf >= 2.62 can be assumed.
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
 AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-	 [[typedef int *int_ptr;
-	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
-	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
-	   int bar (int ip[$ac_kw]) { return ip[0]; }
-	 ]],
-	 [[int s[1];
-	   int *$ac_kw t = s;
-	   t[0] = 0;
-	   return foo (t) + bar (t);
-	 ]])],
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[typedef int * int_ptr;
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
+       }]],
+      [[int s[1];
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)]])],
       [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break
    done
@@ -350,21 +162,21 @@
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
-# define __restrict__
 #endif])
  case $ac_cv_c_restrict in
    restrict) ;;
    no) AC_DEFINE([restrict], []) ;;
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac
-])# AC_C_RESTRICT
+])
+])
 
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
@@ -387,63 +199,3 @@
   AC_CACHE_VAL([$1], [$2])
   as_echo_n="$saved_as_echo_n"
 ])
-
-# AS_VAR_COPY was added in autoconf 2.63b
-m4_define_default([AS_VAR_COPY],
-[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
-
-# AC_PROG_SED was added in autoconf 2.59b
-m4_ifndef([AC_PROG_SED],
-[AC_DEFUN([AC_PROG_SED],
-[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
-    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
-     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
-     ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     AS_UNSET([ac_script])
-     if test -z "$SED"; then
-       ac_path_SED_found=false
-       _AS_PATH_WALK([], [
-         for ac_prog in sed gsed; do
-           for ac_exec_ext in '' $ac_executable_extensions; do
-             ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-             AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
-             case `"$ac_path_SED" --version 2>&1` in
-               *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
-               *)
-                 ac_count=0
-                 _AS_ECHO_N([0123456789]) >conftest.in
-                 while :
-                 do
-                   cat conftest.in conftest.in >conftest.tmp
-                   mv conftest.tmp conftest.in
-                   cp conftest.in conftest.nl
-                   echo >> conftest.nl
-                   "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-                   diff conftest.out conftest.nl >/dev/null 2>&1 || break
-                   ac_count=`expr $ac_count + 1`
-                   if test $ac_count -gt ${ac_path_SED_max-0}; then
-                     # Best so far, but keep looking for better
-                     ac_cv_path_SED=$ac_path_SED
-                     ac_path_SED_max=$ac_count
-                   fi
-                   test $ac_count -gt 10 && break
-                 done
-                 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-             esac
-             $ac_path_SED_found && break 3
-           done
-         done])
-       if test -z "$ac_cv_path_SED"; then
-         AC_ERROR([no acceptable sed could be found in \$PATH])
-       fi
-     else
-       ac_cv_path_SED=$SED
-     fi
- SED="$ac_cv_path_SED"
- AC_SUBST([SED])dnl
- rm -f conftest.sed
-])])])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4	2014-10-16 06:00:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4	2010-04-25 09:20:53.000000000 +0000
@@ -1,22 +1,10 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -24,8 +12,7 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects that use version control, this file can be treated like
-# other built files.
+# In projects using CVS, this file can be treated like other built files.
 
 
 # This macro should be invoked from gettext-runtime/libasprintf/configure.ac, in the section
@@ -37,16 +24,11 @@
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([gl_PROG_AR_RANLIB])
-  # Code from module absolute-header:
+  AC_REQUIRE([AC_PROG_RANLIB])
   # Code from module alloca:
   # Code from module alloca-opt:
   # Code from module errno:
-  # Code from module extern-inline:
   # Code from module include_next:
-  # Code from module size_max:
-  # Code from module verify:
-  # Code from module xsize:
 ])
 
 # This macro should be invoked from gettext-runtime/libasprintf/configure.ac, in the section
@@ -63,15 +45,17 @@
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='.'
+  # Code from module alloca:
 changequote(,)dnl
 LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
 changequote([, ])dnl
 AC_SUBST([LTALLOCA])
+  # Code from module alloca-opt:
   gl_FUNC_ALLOCA
+  # Code from module errno:
   gl_HEADER_ERRNO_H
-  AC_REQUIRE([gl_EXTERN_INLINE])
-  gl_SIZE_MAX
-  gl_XSIZE
+  # Code from module include_next:
+  # Code from module dummy:
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -210,19 +194,12 @@
 AC_DEFUN([gl_FILE_LIST], [
   lib/alloca.c
   lib/alloca.in.h
+  lib/dummy.c
   lib/errno.in.h
-  lib/size_max.h
-  lib/verify.h
-  lib/xsize.c
-  lib/xsize.h
   m4/00gnulib.m4
-  m4/absolute-header.m4
   m4/alloca.m4
   m4/errno_h.m4
-  m4/extern-inline.m4
   m4/gnulib-common.m4
   m4/include_next.m4
   m4/onceonly.m4
-  m4/size_max.m4
-  m4/xsize.m4
 ])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/include_next.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/include_next.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/include_next.m4	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/include_next.m4	2010-02-16 21:31:38.000000000 +0000
@@ -1,5 +1,5 @@
-# include_next.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# include_next.m4 serial 14
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -24,13 +24,6 @@
 dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
 dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
 dnl of plain '__STDC__'.
-dnl
-dnl PRAGMA_COLUMNS can be used in files that override system header files, so
-dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
-dnl is included by a system header file that does a "#pragma COLUMNS 80" (which
-dnl has the effect of truncating the lines of that file and all files that it
-dnl includes to 80 columns) and the gnulib file has lines longer than 80
-dnl columns.
 
 AC_DEFUN([gl_INCLUDE_NEXT],
 [
@@ -75,11 +68,10 @@
 EOF
      gl_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-dnl We intentionally avoid using AC_LANG_SOURCE here.
-     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+     AC_COMPILE_IFELSE([#include <conftest.h>],
        [gl_cv_have_include_next=yes],
        [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+        AC_COMPILE_IFELSE([#include <conftest.h>],
           [gl_cv_have_include_next=buggy],
           [gl_cv_have_include_next=no])
        ])
@@ -105,24 +97,6 @@
   AC_SUBST([INCLUDE_NEXT])
   AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
   AC_SUBST([PRAGMA_SYSTEM_HEADER])
-  AC_CACHE_CHECK([whether system header files limit the line length],
-    [gl_cv_pragma_columns],
-    [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
-     AC_EGREP_CPP([choke me],
-       [
-#ifdef __TANDEM
-choke me
-#endif
-       ],
-       [gl_cv_pragma_columns=yes],
-       [gl_cv_pragma_columns=no])
-    ])
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
-  AC_SUBST([PRAGMA_COLUMNS])
 ])
 
 # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
@@ -143,81 +117,71 @@
 # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
 # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.
-#
-# This macro also checks whether each header exists, by invoking
-# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument.
 AC_DEFUN([gl_CHECK_NEXT_HEADERS],
 [
-  gl_NEXT_HEADERS_INTERNAL([$1], [check])
-])
-
-# gl_NEXT_HEADERS(HEADER1 HEADER2 ...)
-# ------------------------------------
-# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist.
-# This is suitable for headers like <stddef.h> that are standardized by C89
-# and therefore can be assumed to exist.
-AC_DEFUN([gl_NEXT_HEADERS],
-[
-  gl_NEXT_HEADERS_INTERNAL([$1], [assume])
-])
-
-# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS.
-AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
-[
   AC_REQUIRE([gl_INCLUDE_NEXT])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_HEADERS_ONCE([$1])
 
-  m4_if([$2], [check],
-    [AC_CHECK_HEADERS_ONCE([$1])
-    ])
-
-dnl FIXME: gl_next_header and gl_header_exists must be used unquoted
-dnl until we can assume autoconf 2.64 or newer.
   m4_foreach_w([gl_HEADER_NAME], [$1],
     [AS_VAR_PUSHDEF([gl_next_header],
                     [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
      if test $gl_cv_have_include_next = yes; then
-       AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
      else
        AC_CACHE_CHECK(
          [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
          m4_defn([gl_next_header]),
-         [m4_if([$2], [check],
-            [AS_VAR_PUSHDEF([gl_header_exists],
-                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
-             if test AS_VAR_GET(gl_header_exists) = yes; then
-             AS_VAR_POPDEF([gl_header_exists])
-            ])
-           gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
-           AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
-           AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
-          m4_if([$2], [check],
-            [else
-               AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
-             fi
-            ])
-         ])
+         [AS_VAR_PUSHDEF([gl_header_exists],
+                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+          if test AS_VAR_GET(gl_header_exists) = yes; then
+            AC_LANG_CONFTEST(
+              [AC_LANG_SOURCE(
+                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
+               )])
+            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+            dnl that contain only a #include of other header files and no
+            dnl non-comment tokens of their own. This leads to a failure to
+            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+            dnl and others. The workaround is to force preservation of comments
+            dnl through option -C. This ensures all necessary #line directives
+            dnl are present. GCC supports option -C as well.
+            case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+            dnl eval is necessary to expand gl_absname_cpp.
+            dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+            dnl so use subshell.
+            AS_VAR_SET([gl_next_header],
+              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
+                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'])
+          else
+            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+          fi
+          AS_VAR_POPDEF([gl_header_exists])])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
-       [AS_VAR_GET(gl_next_header)])
+       [AS_VAR_GET([gl_next_header])])
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
        gl_next_as_first_directive='<'gl_HEADER_NAME'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=AS_VAR_GET(gl_next_header)
+       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
        [$gl_next_as_first_directive])
      AS_VAR_POPDEF([gl_next_header])])
 ])
-
-# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
-# this fallback is safe for all earlier autoconf versions.
-m4_define_default([AC_LANG_DEFINES_PROVIDED])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4	2014-10-16 06:00:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-# intmax_t.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2014 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.
-
-dnl From Paul Eggert.
-
-AC_PREREQ([2.53])
-
-# Define intmax_t to 'long' or 'long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([gl_AC_TYPE_INTMAX_T],
-[
-  dnl For simplicity, we assume that a header file defines 'intmax_t' if and
-  dnl only if it defines 'uintmax_t'.
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-    AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-    test $ac_cv_type_long_long_int = yes \
-      && ac_type='long long' \
-      || ac_type='long'
-    AC_DEFINE_UNQUOTED([intmax_t], [$ac_type],
-     [Define to long or long long if <inttypes.h> and <stdint.h> don't define.])
-  else
-    AC_DEFINE([HAVE_INTMAX_T], [1],
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
-
-dnl An alternative would be to explicitly test for 'intmax_t'.
-
-AC_DEFUN([gt_AC_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-          ]],
-          [[intmax_t x = -1; return !x;]])],
-       [gt_cv_c_intmax_t=yes],
-       [gt_cv_c_intmax_t=no])])
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE([HAVE_INTMAX_T], [1],
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  else
-    AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-    test $ac_cv_type_long_long_int = yes \
-      && ac_type='long long' \
-      || ac_type='long'
-    AC_DEFINE_UNQUOTED([intmax_t], [$ac_type],
-     [Define to long or long long if <stdint.h> and <inttypes.h> don't define.])
-  fi
-])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4 gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4
--- gettext-0.19.3/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4	2010-02-16 21:31:38.000000000 +0000
@@ -1,22 +1,9 @@
-# onceonly.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005-2006, 2008-2014 Free Software Foundation,
+# onceonly.m4 serial 6
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 Free Software Foundation,
 dnl Inc.
-dnl
-dnl This file is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This file is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this file.  If not, see <http://www.gnu.org/licenses/>.
-dnl
-dnl As a special exception to the GNU General Public License,
-dnl this file may be distributed as part of a program
+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
+dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 
@@ -52,16 +39,16 @@
 AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
   :
   m4_foreach_w([gl_HEADER_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME,
-                                                    [./-], [___])), [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                 [./-], [___])), [
       m4_divert_text([INIT_PREPARE],
         [gl_header_list="$gl_header_list gl_HEADER_NAME"])
       gl_HEADERS_EXPANSION
       AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
         [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
     ])
-    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME,
-                                                      [./-], [___])))
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [./-], [___])))
   ])
 ])
 m4_define([gl_HEADERS_EXPANSION], [
@@ -80,7 +67,7 @@
         [gl_func_list="$gl_func_list gl_FUNC_NAME"])
       gl_FUNCS_EXPANSION
       AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
-        [Define to 1 if you have the ']m4_defn([gl_FUNC_NAME])[' function.])
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
     ])
     AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
   ])
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/INSTALL gettext-0.18.1.1/gettext-runtime/libasprintf/INSTALL
--- gettext-0.19.3/gettext-runtime/libasprintf/INSTALL	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/INSTALL	2010-06-06 12:49:57.000000000 +0000
@@ -4,56 +4,56 @@
 =============
 
    This package depends on a few other packages.  They are listed in
-the file ‘DEPENDENCIES’.  It is recommended to install the listed
+the file `DEPENDENCIES'.  It is recommended to install the listed
 packages before installing this package.
 
 Basic Installation
 ==================
 
-   The ‘configure’ shell script attempts to guess correct values for
+   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a ‘Makefile’ in each directory of the package.
-It may also create one or more ‘.h’ files containing system-dependent
-definitions.  Finally, it creates a shell script ‘config.status’ that
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, a file
-‘config.cache’ that saves the results of its tests to speed up
-reconfiguring, and a file ‘config.log’ containing compiler output
-(useful mainly for debugging ‘configure’).
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
 
    If you need to do unusual things to compile the package, please try
-to figure out how ‘configure’ could check whether to do them, and mail
-diffs or instructions to the address given in the ‘README’ so they can
-be considered for the next release.  If at some point ‘config.cache’
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file ‘configure.ac’ is used to create ‘configure’ by a program
-called ‘autoconf’.  You only need ‘configure.ac’ if you want to change
-it or regenerate ‘configure’ using a newer version of ‘autoconf’.
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
-  1. ‘cd’ to the directory containing the package's source code and type
-     ‘./configure’ to configure the package for your system.  If you're
-     using ‘csh’ on an old version of System V, you might need to type
-     ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-     ‘configure’ itself.
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
 
-     Running ‘configure’ takes awhile.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
-  2. Type ‘make’ to compile the package.
+  2. Type `make' to compile the package.
 
-  3. Optionally, type ‘make check’ to run any self-tests that come with
+  3. Optionally, type `make check' to run any self-tests that come with
      the package.
 
-  4. Type ‘make install’ to install the programs and any data files and
+  4. Type `make install' to install the programs and any data files and
      documentation.
 
   5. You can remove the program binaries and object files from the
-     source code directory by typing ‘make clean’.  To also remove the
-     files that ‘configure’ created (so you can compile the package for
-     a different kind of computer), type ‘make distclean’.  There is
-     also a ‘make maintainer-clean’ target, but that is intended mainly
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
@@ -62,7 +62,7 @@
 =====================
 
    Some systems require unusual options for compilation or linking that
-the ‘configure’ script does not know about.  You can give ‘configure’
+the `configure' script does not know about.  You can give `configure'
 initial values for variables as arguments.  You can do it like this:
      ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
@@ -71,16 +71,16 @@
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of ‘make’ that
-supports the ‘VPATH’ variable, such as GNU ‘make’.  ‘cd’ to the
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
-the ‘configure’ script.  ‘configure’ automatically checks for the
-source code in the directory that ‘configure’ is in and in ‘..’.
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a ‘make’ that does not supports the ‘VPATH’
+   If you have to use a `make' that does not supports the `VPATH'
 variable, you have to compile the package for one architecture at a time
 in the source code directory.  After you have installed the package for
-one architecture, use ‘make distclean’ before reconfiguring for another
+one architecture, use `make distclean' before reconfiguring for another
 architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
@@ -100,25 +100,25 @@
 Installation Names
 ==================
 
-   By default, ‘make install’ will install the package's files in
-‘/usr/local/bin’, ‘/usr/local/man’, etc.  You can specify an
-installation prefix other than ‘/usr/local’ by giving ‘configure’ the
-option ‘--prefix=PATH’.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
+give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like ‘--bindir=PATH’ to specify different values for particular
-kinds of files.  Run ‘configure --help’ for a list of the directories
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving ‘configure’ the
-option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
 Enabling Relocatability
 =======================
@@ -127,12 +127,12 @@
 that packages are not relocatable.  It means a user cannot copy a
 program, installed by another user on the same machine, to his home
 directory, and have it work correctly (including i18n).  So many users
-need to go through ‘configure; make; make install’ with all its
+need to go through `configure; make; make install' with all its
 dependencies, options, and hurdles.
 
    Red Hat, Debian, and similar package systems solve the "ease of
-installation" problem, but they hardwire path names, usually to ‘/usr’
-or ‘/usr/local’.  This means that users need root privileges to install
+installation" problem, but they hardwire path names, usually to `/usr'
+or `/usr/local'.  This means that users need root privileges to install
 a binary package, and prevents installing two different versions of the
 same binary package.
 
@@ -142,24 +142,24 @@
 to do the same thing with a hard link _only_ if the hard link file is
 in the same directory as the real program.
 
-   To configure a program to be relocatable, add ‘--enable-relocatable’
-to the ‘configure’ command line.
+   To configure a program to be relocatable, add `--enable-relocatable'
+to the `configure' command line.
 
    On some OSes the executables remember the location of shared
 libraries and prefer them over any other search path.  Therefore, such
 an executable will look for its shared libraries first in the original
 installation directory and only then in the current installation
-directory.  Thus, for reliability, it is best to also give a ‘--prefix’
+directory.  Thus, for reliability, it is best to also give a `--prefix'
 option pointing to a directory that does not exist now and which never
-will be created, e.g.  ‘--prefix=/nonexistent’.  You may use
-‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
+will be created, e.g.  `--prefix=/nonexistent'.  You may use
+`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into
 that directory.
 
    We do not recommend using a prefix writable by unprivileged users
-(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
+(e.g. `/tmp/inst$$') because such a directory can be recreated by an
 unprivileged user after the original directory has been removed.  We
 also do not recommend prefixes that might be behind an automounter
-(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
+(e.g. `$HOME/inst$$') because of the performance impact of directory
 searching.
 
    Here's a sample installation run that takes into account all these
@@ -169,10 +169,10 @@
      make
      make install DESTDIR=/tmp/inst$$
 
-   Installation with ‘--enable-relocatable’ will not work for setuid or
+   Installation with `--enable-relocatable' will not work for setuid or
 setgid executables, because such executables search only system library
 paths for security reasons.  Also, installation with
-‘--enable-relocatable’ might not work on OpenBSD, when the package
+`--enable-relocatable' might not work on OpenBSD, when the package
 contains shared libraries and libtool versions 1.5.xx are used.
 
    The runtime penalty and size penalty are negligible on GNU/Linux
@@ -183,25 +183,25 @@
 Optional Features
 =================
 
-   Some packages pay attention to ‘--enable-FEATURE’ options to
-‘configure’, where FEATURE indicates an optional part of the package.
-They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
-is something like ‘gnu-as’ or ‘x’ (for the X Window System).  The
-‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, ‘configure’ can usually
+   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the ‘configure’ options ‘--x-includes=DIR’ and
-‘--x-libraries=DIR’ to specify their locations.
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
 
    For packages that use the GNU libiconv library, you can use the
-‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
+`configure' option `--with-libiconv-prefix' to specify the prefix you
 used while installing GNU libiconv.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
    For packages that use the GNU libintl library, you can use the
-‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
+`configure' option `--with-libintl-prefix' to specify the prefix you
 used while installing GNU gettext-runtime.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
@@ -217,7 +217,7 @@
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its ‘<wchar.h>’ header file.  The option ‘-nodtk’ can be used as
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
 to try
 
@@ -246,62 +246,62 @@
 Specifying the System Type
 ==========================
 
-   There may be some features ‘configure’ can not figure out
+   There may be some features `configure' can not figure out
 automatically, but needs to determine by the type of host the package
-will run on.  Usually ‘configure’ can figure that out, but if it prints
+will run on.  Usually `configure' can figure that out, but if it prints
 a message saying it can not guess the host type, give it the
-‘--host=TYPE’ option.  TYPE can either be a short name for the system
-type, such as ‘sun4’, or a canonical name with three fields:
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
      CPU-COMPANY-SYSTEM
 
-See the file ‘config.sub’ for the possible values of each field.  If
-‘config.sub’ isn't included in this package, then this package doesn't
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
 need to know the host type.
 
    If you are building compiler tools for cross-compiling, you can also
-use the ‘--target=TYPE’ option to select the type of system they will
-produce code for and the ‘--build=TYPE’ option to select the type of
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
 system on which you are compiling the package.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for ‘configure’ scripts to share,
-you can create a site shell script called ‘config.site’ that gives
-default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
-‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
-‘PREFIX/etc/config.site’ if it exists.  Or, you can set the
-‘CONFIG_SITE’ environment variable to the location of the site script.
-A warning: not all ‘configure’ scripts look for a site script.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
 
 Operation Controls
 ==================
 
-   ‘configure’ recognizes the following options to control how it
+   `configure' recognizes the following options to control how it
 operates.
 
-‘--cache-file=FILE’
+`--cache-file=FILE'
      Use and save the results of the tests in FILE instead of
-     ‘./config.cache’.  Set FILE to ‘/dev/null’ to disable caching, for
-     debugging ‘configure’.
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
 
-‘--help’
-     Print a summary of the options to ‘configure’, and exit.
+`--help'
+     Print a summary of the options to `configure', and exit.
 
-‘--quiet’
-‘--silent’
-‘-q’
+`--quiet'
+`--silent'
+`-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to ‘/dev/null’ (any error
+     suppress all normal output, redirect it to `/dev/null' (any error
      messages will still be shown).
 
-‘--srcdir=DIR’
+`--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     ‘configure’ can determine that directory automatically.
+     `configure' can determine that directory automatically.
 
-‘--version’
-     Print the version of Autoconf used to generate the ‘configure’
+`--version'
+     Print the version of Autoconf used to generate the `configure'
      script, and exit.
 
-‘configure’ also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/lib-asprintf.c gettext-0.18.1.1/gettext-runtime/libasprintf/lib-asprintf.c
--- gettext-0.19.3/gettext-runtime/libasprintf/lib-asprintf.c	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/lib-asprintf.c	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2002-2003, 2006 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 under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/lib-asprintf.h gettext-0.18.1.1/gettext-runtime/libasprintf/lib-asprintf.h
--- gettext-0.19.3/gettext-runtime/libasprintf/lib-asprintf.h	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/lib-asprintf.h	2010-06-06 12:49:57.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2002-2003 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 under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/Makefile.am gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.am
--- gettext-0.19.3/gettext-runtime/libasprintf/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -1,22 +1,25 @@
 ## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext
-## Copyright (C) 2002-2007, 2009-2010 Free Software Foundation, Inc.
+## Copyright (C) 2002-2007, 2009 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
-## the Free Software Foundation; either version 2.1 of the License, or
-## (at your option) any later version.
+## This program is free software; you can redistribute it and/or modify it
+## under the terms of the GNU Library General Public License as published
+## by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Library General Public License for more details.
 ##
-## You should have received a copy of the GNU Lesser General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU Library General Public
+## License along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+## USA.
 
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@
 ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 -I gnulib-m4
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -32,10 +35,10 @@
 include_HEADERS = autosprintf.h
 
 all-local $(libasprintf_la_OBJECTS): autosprintf.h
-autosprintf.h: autosprintf.in.h
-	cp $(srcdir)/autosprintf.in.h autosprintf.h
+autosprintf.h: autosprintf.h.in
+	cp $(srcdir)/autosprintf.h.in autosprintf.h
 MOSTLYCLEANFILES += autosprintf.h
-EXTRA_DIST += autosprintf.in.h
+EXTRA_DIST += autosprintf.h.in
 
 dist-hook:
 	rm -f $(distdir)/autosprintf.h
@@ -48,13 +51,12 @@
 noinst_LTLIBRARIES =
 
 libasprintf_la_SOURCES = \
-  xsize.h xsize.c \
   lib-asprintf.h lib-asprintf.c \
   autosprintf.h autosprintf.cc
 
 # Sources used only on platforms lacking vasprintf().
 lib_asprintf_EXTRASOURCES = \
-  verify.h \
+  xsize.h \
   printf-args.h printf-args.c \
   printf-parse.h printf-parse.c \
   vasnprintf.h vasnprintf.c asnprintf.c \
@@ -109,7 +111,7 @@
 # The install-dvi target is already defined by automake.
 
 installdirs-dvi:
-	$(MKDIR_P) $(DESTDIR)$(dvidir)
+	$(mkdir_p) $(DESTDIR)$(dvidir)
 
 uninstall-dvi:
 	$(RM) $(DESTDIR)$(dvidir)/autosprintf.dvi
@@ -130,7 +132,7 @@
 # The install-ps target is already defined by automake.
 
 installdirs-ps:
-	$(MKDIR_P) $(DESTDIR)$(psdir)
+	$(mkdir_p) $(DESTDIR)$(psdir)
 
 uninstall-ps:
 	$(RM) $(DESTDIR)$(psdir)/autosprintf.ps
@@ -141,7 +143,7 @@
 # The install-pdf target is already defined by automake.
 
 installdirs-pdf:
-	$(MKDIR_P) $(DESTDIR)$(pdfdir)
+	$(mkdir_p) $(DESTDIR)$(pdfdir)
 
 uninstall-pdf:
 	$(RM) $(DESTDIR)$(pdfdir)/autosprintf.pdf
@@ -164,7 +166,7 @@
 # The install-html target is already defined by automake.
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html:
 	$(RM) $(DESTDIR)$(htmldir)/autosprintf.html
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/Makefile.gnulib gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.gnulib
--- gettext-0.19.3/gettext-runtime/libasprintf/Makefile.gnulib	2014-10-16 06:00:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.gnulib	2010-02-16 21:31:39.000000000 +0000
@@ -1,27 +1,15 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-runtime/libasprintf --local-dir=gnulib-local --lib=libgnu --source-base=. --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../../build-aux --lgpl=2 --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca errno verify xsize
+# Reproduce by: gnulib-tool --import --dir=gettext-runtime/libasprintf --local-dir=gnulib-local --lib=libgnu --source-base=. --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../../build-aux --lgpl=2 --makefile-name=Makefile.gnulib --libtool --macro-prefix=gl alloca errno
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -33,26 +21,16 @@
 libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
 EXTRA_libgnu_la_SOURCES =
 libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-libgnu_la_LDFLAGS += -no-undefined
-
-## begin gnulib module absolute-header
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-
-## end   gnulib module absolute-header
 
 ## begin gnulib module alloca
 
 
-libgnu_la_LIBADD += @LTALLOCA@
-libgnu_la_DEPENDENCIES += @LTALLOCA@
 EXTRA_DIST += alloca.c
 
 EXTRA_libgnu_la_SOURCES += alloca.c
 
+libgnu_la_LIBADD += @LTALLOCA@
+libgnu_la_DEPENDENCIES += @LTALLOCA@
 ## end   gnulib module alloca
 
 ## begin gnulib module alloca-opt
@@ -61,17 +39,12 @@
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ALLOCA_H
-alloca.h: alloca.in.h $(top_builddir)/config.status
+alloca.h: alloca.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/alloca.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-else
-alloca.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 EXTRA_DIST += alloca.in.h
@@ -84,14 +57,11 @@
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-if GL_GENERATE_ERRNO_H
-errno.h: errno.in.h $(top_builddir)/config.status
+errno.h: errno.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
 	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
 	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
@@ -102,34 +72,17 @@
 	      < $(srcdir)/errno.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-errno.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += errno.h errno.h-t
 
 EXTRA_DIST += errno.in.h
 
 ## end   gnulib module errno
 
-## begin gnulib module size_max
-
-libgnu_la_SOURCES += size_max.h
-
-## end   gnulib module size_max
-
-## begin gnulib module verify
-
-
-EXTRA_DIST += verify.h
-
-## end   gnulib module verify
-
-## begin gnulib module xsize
+## begin gnulib module dummy
 
-libgnu_la_SOURCES += xsize.h xsize.c
+libgnu_la_SOURCES += dummy.c
 
-## end   gnulib module xsize
+## end   gnulib module dummy
 
 
 mostlyclean-local: mostlyclean-generic
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/Makefile.in gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.in
--- gettext-0.19.3/gettext-runtime/libasprintf/Makefile.in	2014-10-16 06:01:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.in	2010-06-06 20:11:13.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,76 +15,19 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
-# You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-runtime/libasprintf --local-dir=gnulib-local --lib=libgnu --source-base=. --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../../build-aux --lgpl=2 --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca errno verify xsize
+# Reproduce by: gnulib-tool --import --dir=gettext-runtime/libasprintf --local-dir=gnulib-local --lib=libgnu --source-base=. --m4-base=gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../../build-aux --lgpl=2 --makefile-name=Makefile.gnulib --libtool --macro-prefix=gl alloca errno
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -102,35 +46,34 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.gnulib INSTALL NEWS README AUTHORS \
-	ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in \
-	$(top_srcdir)/../../build-aux/mkinstalldirs alloca.c \
-	$(top_srcdir)/../../build-aux/texinfo.tex $(include_HEADERS) \
-	COPYING COPYING.LIB ../../build-aux/compile \
-	../../build-aux/config.guess ../../build-aux/config.rpath \
-	../../build-aux/config.sub ../../build-aux/install-sh \
-	../../build-aux/missing ../../build-aux/mkinstalldirs \
-	../../build-aux/texinfo.tex ../../build-aux/ltmain.sh \
-	$(top_srcdir)/../../build-aux/compile \
-	$(top_srcdir)/../../build-aux/config.guess \
-	$(top_srcdir)/../../build-aux/config.sub \
-	$(top_srcdir)/../../build-aux/install-sh \
-	$(top_srcdir)/../../build-aux/ltmain.sh \
-	$(top_srcdir)/../../build-aux/missing
+DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
+	$(srcdir)/../../build-aux/config.guess \
+	$(srcdir)/../../build-aux/config.sub \
+	$(srcdir)/../../build-aux/install-sh \
+	$(srcdir)/../../build-aux/ltmain.sh \
+	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../build-aux/mkinstalldirs \
+	$(srcdir)/../../build-aux/texinfo.tex $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure \
+	../../build-aux/compile ../../build-aux/config.guess \
+	../../build-aux/config.rpath ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/elisp-comp \
+	../../build-aux/install-sh ../../build-aux/ltmain.sh \
+	../../build-aux/mdate-sh ../../build-aux/missing \
+	../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
+	../../build-aux/ylwrap AUTHORS COPYING COPYING.LIB ChangeLog \
+	INSTALL NEWS alloca.c
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
 	$(top_srcdir)/gnulib-m4/onceonly.m4 \
-	$(top_srcdir)/../m4/extern-inline.m4 \
+	$(top_srcdir)/../m4/intmax.m4 \
 	$(top_srcdir)/../m4/inttypes_h.m4 \
 	$(top_srcdir)/../m4/longlong.m4 \
 	$(top_srcdir)/../m4/printf-posix.m4 \
@@ -172,44 +115,25 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" \
 	"$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 libasprintf_la_LIBADD =
-am_libasprintf_la_OBJECTS = xsize.lo lib-asprintf.lo autosprintf.lo
+am_libasprintf_la_OBJECTS = lib-asprintf.lo autosprintf.lo
 libasprintf_la_OBJECTS = $(am_libasprintf_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 libasprintf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libasprintf_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
-am_libgnu_la_OBJECTS = xsize.lo
+am_libgnu_la_OBJECTS = dummy.lo
 libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
 libgnu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgnu_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
 am__depfiles_maybe =
@@ -219,68 +143,42 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libasprintf_la_SOURCES) $(libgnu_la_SOURCES) \
 	$(EXTRA_libgnu_la_SOURCES)
 DIST_SOURCES = $(libasprintf_la_SOURCES) $(libgnu_la_SOURCES) \
 	$(EXTRA_libgnu_la_SOURCES)
-AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
-am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
-am__v_DVIPS_0 = @echo "  DVIPS   " $@;
-am__v_DVIPS_1 = 
-AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
-am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
-am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
-am__v_MAKEINFO_1 = 
-AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
-am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
-am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
-am__v_INFOHTML_1 = 
-AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
-am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
-am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
-am__v_TEXI2DVI_1 = 
-AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
-am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
-am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
-am__v_TEXI2PDF_1 = 
-AM_V_texinfo = $(am__v_texinfo_@AM_V@)
-am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
-am__v_texinfo_0 = -q
-am__v_texinfo_1 = 
-AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
-am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
-am__v_texidevnull_0 = > /dev/null
-am__v_texidevnull_1 = 
 INFO_DEPS = $(srcdir)/autosprintf.info
 TEXINFO_TEX = $(top_srcdir)/../../build-aux/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/../../build-aux
@@ -291,58 +189,26 @@
 TEXI2DVI = texi2dvi
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 HEADERS = $(include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
-AM_RECURSIVE_TARGETS = cscope
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
+ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -403,7 +269,6 @@
 
 # Documentation.
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
@@ -422,7 +287,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -435,7 +299,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -474,6 +337,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -497,9 +361,9 @@
 # Allow users to use "gnulib-tool --update".
 
 # Woe32 support.
-EXTRA_DIST = autosprintf.in.h $(lib_asprintf_EXTRASOURCES) alloca.c \
-	alloca.in.h errno.in.h verify.h gnulib-m4/gnulib-cache.m4 \
-	texi2html autosprintf_all.html README.woe32
+EXTRA_DIST = autosprintf.h.in $(lib_asprintf_EXTRASOURCES) alloca.c \
+	alloca.in.h errno.in.h gnulib-m4/gnulib-cache.m4 texi2html \
+	autosprintf_all.html README.woe32
 BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H)
 
 # Temporary index files. automake removes only the predefined ones by itself.
@@ -514,14 +378,13 @@
 lib_LTLIBRARIES = libasprintf.la
 noinst_LTLIBRARIES = libgnu.la
 libasprintf_la_SOURCES = \
-  xsize.h xsize.c \
   lib-asprintf.h lib-asprintf.c \
   autosprintf.h autosprintf.cc
 
 
 # Sources used only on platforms lacking vasprintf().
 lib_asprintf_EXTRASOURCES = \
-  verify.h \
+  xsize.h \
   printf-args.h printf-args.c \
   printf-parse.h printf-parse.c \
   vasnprintf.h vasnprintf.c asnprintf.c \
@@ -532,16 +395,11 @@
 # With libtool 1.5.14, on some platforms, like BeOS, "libtool --tag=CXX" fails
 # to create a shared library, however "libtool --tag=CC" succeeds.
 libasprintf_la_LDFLAGS = @LTNOUNDEF@
-libgnu_la_SOURCES = size_max.h xsize.h xsize.c
+libgnu_la_SOURCES = dummy.c
 libgnu_la_LIBADD = $(gl_LTLIBOBJS) @LTALLOCA@
 libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) @LTALLOCA@
 EXTRA_libgnu_la_SOURCES = alloca.c
-libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+libgnu_la_LDFLAGS = $(AM_LDFLAGS)
 MAKEINFOFLAGS = --no-split
 info_TEXINFOS = autosprintf.texi
 
@@ -553,7 +411,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .dvi .html .info .lo .o .obj .pdf .ps .texi
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib $(am__configure_deps)
 	@for dep in $?; do \
@@ -578,7 +436,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.gnulib:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -590,8 +447,10 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -603,9 +462,9 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -613,8 +472,6 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -630,27 +487,22 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES) 
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgnu_la_LINK)  $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -660,22 +512,28 @@
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
 .cc.o:
-	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -687,7 +545,7 @@
 	-rm -f libtool config.lt
 
 .texi.info:
-	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -709,33 +567,35 @@
 	rm -rf $$backupdir; exit $$rc
 
 .texi.dvi:
-	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
-	$<
+	$(TEXI2DVI) $<
 
 .texi.pdf:
-	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
-	$<
+	$(TEXI2PDF) $<
 
 .texi.html:
-	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
-	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	rm -rf $(@:.html=.htp)
+	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@ && mv $(@:.html=.htp) $@; \
+	  rm -rf $@; \
+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
 	else \
-	  rm -rf $(@:.html=.htp); exit 1; \
+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+	  exit 1; \
 	fi
 $(srcdir)/autosprintf.info: autosprintf.texi 
 autosprintf.dvi: autosprintf.texi 
 autosprintf.pdf: autosprintf.texi 
 autosprintf.html: autosprintf.texi 
 .dvi.ps:
-	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) $(AM_V_texinfo) -o $@ $<
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) -o $@ $<
 
 uninstall-dvi-am:
 	@$(NORMAL_UNINSTALL)
@@ -757,7 +617,9 @@
 
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
+	@if test -d '$(DESTDIR)$(infodir)' && \
+	    (install-info --version && \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -814,7 +676,11 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -rf autosprintf.t2d autosprintf.t2p
+	-rm -rf autosprintf.aux autosprintf.cp autosprintf.cps autosprintf.fn \
+	  autosprintf.fns autosprintf.ky autosprintf.kys \
+	  autosprintf.log autosprintf.pg autosprintf.pgs \
+	  autosprintf.tmp autosprintf.toc autosprintf.tp \
+	  autosprintf.tps autosprintf.vr autosprintf.vrs
 
 clean-aminfo:
 	-test -z "autosprintf.dvi autosprintf.pdf autosprintf.ps autosprintf.html" \
@@ -828,11 +694,8 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -846,17 +709,30 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -868,11 +744,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -881,31 +761,9 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -951,42 +809,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -997,8 +849,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1008,19 +860,17 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1043,21 +893,13 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1093,15 +935,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -1146,11 +983,8 @@
 
 install-dvi-am: $(DVIS)
 	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1165,22 +999,18 @@
 
 install-html-am: $(HTMLS)
 	@$(NORMAL_INSTALL)
+	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  d2=$$d$$p; \
-	  if test -d "$$d2"; then \
+	  if test -d "$$d$$p"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d2"; \
+	    list2="$$list2 $$d$$p"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -1192,12 +1022,9 @@
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
+	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
-	fi; \
 	for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -1215,7 +1042,8 @@
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@if $(am__can_run_installinfo); then \
+	@if (install-info --version && \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -1229,11 +1057,8 @@
 
 install-pdf-am: $(PDFS)
 	@$(NORMAL_INSTALL)
+	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
 	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1245,11 +1070,8 @@
 
 install-ps-am: $(PSS)
 	@$(NORMAL_INSTALL)
+	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
 	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1286,13 +1108,12 @@
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
-	check-am clean clean-aminfo clean-cscope clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-local \
-	clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
-	dist dist-all dist-bzip2 dist-gzip dist-hook dist-info \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
+	clean clean-aminfo clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-local clean-noinstLTLIBRARIES ctags dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-info dist-lzma \
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am html-local info \
 	info-am install install-am install-data install-data-am \
@@ -1305,15 +1126,15 @@
 	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
 	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am uninstall-dvi-am \
-	uninstall-html-am uninstall-includeHEADERS uninstall-info-am \
+	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
+	uninstall-includeHEADERS uninstall-info-am \
 	uninstall-libLTLIBRARIES uninstall-local uninstall-pdf-am \
 	uninstall-ps-am
 
 
 all-local $(libasprintf_la_OBJECTS): autosprintf.h
-autosprintf.h: autosprintf.in.h
-	cp $(srcdir)/autosprintf.in.h autosprintf.h
+autosprintf.h: autosprintf.h.in
+	cp $(srcdir)/autosprintf.h.in autosprintf.h
 
 dist-hook:
 	rm -f $(distdir)/autosprintf.h
@@ -1324,36 +1145,30 @@
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ALLOCA_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_ALLOCA_H_TRUE@	  cat $(srcdir)/alloca.in.h; \
-@GL_GENERATE_ALLOCA_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ALLOCA_H_TRUE@	mv -f $@-t $@
-@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_FALSE@	rm -f $@
+alloca.h: alloca.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ERRNO_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ERRNO_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      < $(srcdir)/errno.in.h; \
-@GL_GENERATE_ERRNO_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ERRNO_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_FALSE@	rm -f $@
+errno.h: errno.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
+	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
+	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
+	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
+	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
+	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
+	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
+	      < $(srcdir)/errno.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 mostlyclean-local: mostlyclean-generic
 	@for dir in '' $(MOSTLYCLEANDIRS); do \
@@ -1384,7 +1199,7 @@
 # The install-dvi target is already defined by automake.
 
 installdirs-dvi:
-	$(MKDIR_P) $(DESTDIR)$(dvidir)
+	$(mkdir_p) $(DESTDIR)$(dvidir)
 
 uninstall-dvi:
 	$(RM) $(DESTDIR)$(dvidir)/autosprintf.dvi
@@ -1395,7 +1210,7 @@
 # The install-ps target is already defined by automake.
 
 installdirs-ps:
-	$(MKDIR_P) $(DESTDIR)$(psdir)
+	$(mkdir_p) $(DESTDIR)$(psdir)
 
 uninstall-ps:
 	$(RM) $(DESTDIR)$(psdir)/autosprintf.ps
@@ -1405,7 +1220,7 @@
 # The install-pdf target is already defined by automake.
 
 installdirs-pdf:
-	$(MKDIR_P) $(DESTDIR)$(pdfdir)
+	$(mkdir_p) $(DESTDIR)$(pdfdir)
 
 uninstall-pdf:
 	$(RM) $(DESTDIR)$(pdfdir)/autosprintf.pdf
@@ -1421,7 +1236,7 @@
 # The install-html target is already defined by automake.
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html:
 	$(RM) $(DESTDIR)$(htmldir)/autosprintf.html
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/printf-args.c gettext-0.18.1.1/gettext-runtime/libasprintf/printf-args.c
--- gettext-0.19.3/gettext-runtime/libasprintf/printf-args.c	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/printf-args.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Decomposed printf argument list.
    Copyright (C) 1999, 2002-2003, 2005-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file can be parametrized with the following macros:
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/printf-args.h gettext-0.18.1.1/gettext-runtime/libasprintf/printf-args.h
--- gettext-0.19.3/gettext-runtime/libasprintf/printf-args.h	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/printf-args.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003, 2006-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
@@ -134,14 +136,10 @@
 }
 argument;
 
-/* Number of directly allocated arguments (no malloc() needed).  */
-#define N_DIRECT_ALLOC_ARGUMENTS 7
-
 typedef struct
 {
   size_t count;
   argument *arg;
-  argument direct_alloc_arg[N_DIRECT_ALLOC_ARGUMENTS];
 }
 arguments;
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/printf-parse.c gettext-0.18.1.1/gettext-runtime/libasprintf/printf-parse.c
--- gettext-0.19.3/gettext-runtime/libasprintf/printf-parse.c	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/printf-parse.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2008 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file can be parametrized with the following macros:
      CHAR_T             The element type of the format string.
@@ -62,9 +64,6 @@
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
 
-/* memcpy().  */
-#include <string.h>
-
 /* errno.  */
 #include <errno.h>
 
@@ -82,20 +81,23 @@
 int
 PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 {
-  const CHAR_T *cp = format;    /* pointer into format */
+  const CHAR_T *cp = format;            /* pointer into format */
   size_t arg_posn = 0;          /* number of regular arguments consumed */
-  size_t d_allocated;           /* allocated elements of d->dir */
-  size_t a_allocated;           /* allocated elements of a->arg */
+  size_t d_allocated;                   /* allocated elements of d->dir */
+  size_t a_allocated;                   /* allocated elements of a->arg */
   size_t max_width_length = 0;
   size_t max_precision_length = 0;
 
   d->count = 0;
-  d_allocated = N_DIRECT_ALLOC_DIRECTIVES;
-  d->dir = d->direct_alloc_dir;
+  d_allocated = 1;
+  d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE));
+  if (d->dir == NULL)
+    /* Out of memory.  */
+    goto out_of_memory_1;
 
   a->count = 0;
-  a_allocated = N_DIRECT_ALLOC_ARGUMENTS;
-  a->arg = a->direct_alloc_arg;
+  a_allocated = 0;
+  a->arg = NULL;
 
 #define REGISTER_ARG(_index_,_type_) \
   {                                                                     \
@@ -112,14 +114,12 @@
         if (size_overflow_p (memory_size))                              \
           /* Overflow, would lead to out of memory.  */                 \
           goto out_of_memory;                                           \
-        memory = (argument *) (a->arg != a->direct_alloc_arg            \
+        memory = (argument *) (a->arg                                   \
                                ? realloc (a->arg, memory_size)          \
                                : malloc (memory_size));                 \
         if (memory == NULL)                                             \
           /* Out of memory.  */                                         \
           goto out_of_memory;                                           \
-        if (a->arg == a->direct_alloc_arg)                              \
-          memcpy (memory, a->arg, a->count * sizeof (argument));        \
         a->arg = memory;                                                \
       }                                                                 \
     while (a->count <= n)                                               \
@@ -207,13 +207,6 @@
                   dp->flags |= FLAG_ZERO;
                   cp++;
                 }
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-              else if (*cp == 'I')
-                {
-                  dp->flags |= FLAG_LOCALIZED;
-                  cp++;
-                }
-#endif
               else
                 break;
             }
@@ -589,14 +582,10 @@
               if (size_overflow_p (memory_size))
                 /* Overflow, would lead to out of memory.  */
                 goto out_of_memory;
-              memory = (DIRECTIVE *) (d->dir != d->direct_alloc_dir
-                                      ? realloc (d->dir, memory_size)
-                                      : malloc (memory_size));
+              memory = (DIRECTIVE *) realloc (d->dir, memory_size);
               if (memory == NULL)
                 /* Out of memory.  */
                 goto out_of_memory;
-              if (d->dir == d->direct_alloc_dir)
-                memcpy (memory, d->dir, d->count * sizeof (DIRECTIVE));
               d->dir = memory;
             }
         }
@@ -615,18 +604,19 @@
   return 0;
 
 error:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
   errno = EINVAL;
   return -1;
 
 out_of_memory:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
+out_of_memory_1:
   errno = ENOMEM;
   return -1;
 }
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/printf-parse.h gettext-0.18.1.1/gettext-runtime/libasprintf/printf-parse.h
--- gettext-0.19.3/gettext-runtime/libasprintf/printf-parse.h	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/printf-parse.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,26 +1,24 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _PRINTF_PARSE_H
 #define _PRINTF_PARSE_H
 
-#if HAVE_FEATURES_H
-# include <features.h> /* for __GLIBC__, __UCLIBC__ */
-#endif
-
 #include "printf-args.h"
 
 
@@ -31,16 +29,10 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
-#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)
 
-/* Number of directly allocated directives (no malloc() needed).  */
-#define N_DIRECT_ALLOC_DIRECTIVES 7
-
 /* A parsed directive.  */
 typedef struct
 {
@@ -65,7 +57,6 @@
   char_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  char_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 char_directives;
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/size_max.h gettext-0.18.1.1/gettext-runtime/libasprintf/size_max.h
--- gettext-0.19.3/gettext-runtime/libasprintf/size_max.h	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/size_max.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
-   Written by Simon Josefsson.
-
-   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
-   the Free Software Foundation; either version 2.1, 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 Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef GNULIB_SIZE_MAX_H
-#define GNULIB_SIZE_MAX_H
-
-/* Get SIZE_MAX declaration on systems like Solaris 7/8/9.  */
-# include <limits.h>
-/* Get SIZE_MAX declaration on systems like glibc 2.  */
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-/* On systems where these include files don't define it, SIZE_MAX is defined
-   in config.h.  */
-
-#endif /* GNULIB_SIZE_MAX_H */
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/vasnprintf.c gettext-0.18.1.1/gettext-runtime/libasprintf/vasnprintf.c
--- gettext-0.19.3/gettext-runtime/libasprintf/vasnprintf.c	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/vasnprintf.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2010 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file can be parametrized with the following macros:
      VASNPRINTF         The name of the function being defined.
@@ -87,8 +89,6 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-#include "verify.h"
-
 #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
 # include "float+.h"
@@ -275,10 +275,10 @@
 {
   const char *point;
   /* Determine it in a multithread-safe way.  We know nl_langinfo is
-     multithread-safe on glibc systems and Mac OS X systems, but is not required
+     multithread-safe on glibc systems and MacOS X systems, but is not required
      to be multithread-safe by POSIX.  sprintf(), however, is multithread-safe.
      localeconv() is rarely multithread-safe.  */
-#  if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__))
+#  if HAVE_NL_LANGINFO && (__GLIBC__ || (defined __APPLE__ && defined __MACH__))
   point = nl_langinfo (RADIXCHAR);
 #  elif 1
   char pointbuf[5];
@@ -323,11 +323,11 @@
 
 typedef unsigned int mp_limb_t;
 # define GMP_LIMB_BITS 32
-verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
+typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1];
 
 typedef unsigned long long mp_twolimb_t;
 # define GMP_TWOLIMB_BITS 64
-verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
+typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1];
 
 /* Representation of a bignum >= 0.  */
 typedef struct
@@ -552,61 +552,32 @@
       size_t s;
       {
         mp_limb_t msd = b_ptr[b_len - 1]; /* = b[n-1], > 0 */
-        /* Determine s = GMP_LIMB_BITS - integer_length (msd).
-           Code copied from gnulib's integer_length.c.  */
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-        s = __builtin_clz (msd);
-# else
-#  if defined DBL_EXPBIT0_WORD && defined DBL_EXPBIT0_BIT
-        if (GMP_LIMB_BITS <= DBL_MANT_BIT)
+        s = 31;
+        if (msd >= 0x10000)
           {
-            /* Use 'double' operations.
-               Assumes an IEEE 754 'double' implementation.  */
-#   define DBL_EXP_MASK ((DBL_MAX_EXP - DBL_MIN_EXP) | 7)
-#   define DBL_EXP_BIAS (DBL_EXP_MASK / 2 - 1)
-#   define NWORDS \
-     ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-            union { double value; unsigned int word[NWORDS]; } m;
-
-            /* Use a single integer to floating-point conversion.  */
-            m.value = msd;
-
-            s = GMP_LIMB_BITS
-                - (((m.word[DBL_EXPBIT0_WORD] >> DBL_EXPBIT0_BIT) & DBL_EXP_MASK)
-                   - DBL_EXP_BIAS);
+            msd = msd >> 16;
+            s -= 16;
           }
-        else
-#   undef NWORDS
-#  endif
+        if (msd >= 0x100)
           {
-            s = 31;
-            if (msd >= 0x10000)
-              {
-                msd = msd >> 16;
-                s -= 16;
-              }
-            if (msd >= 0x100)
-              {
-                msd = msd >> 8;
-                s -= 8;
-              }
-            if (msd >= 0x10)
-              {
-                msd = msd >> 4;
-                s -= 4;
-              }
-            if (msd >= 0x4)
-              {
-                msd = msd >> 2;
-                s -= 2;
-              }
-            if (msd >= 0x2)
-              {
-                msd = msd >> 1;
-                s -= 1;
-              }
+            msd = msd >> 8;
+            s -= 8;
+          }
+        if (msd >= 0x10)
+          {
+            msd = msd >> 4;
+            s -= 4;
+          }
+        if (msd >= 0x4)
+          {
+            msd = msd >> 2;
+            s -= 2;
+          }
+        if (msd >= 0x2)
+          {
+            msd = msd >> 1;
+            s -= 1;
           }
-# endif
       }
       /* 0 <= s < GMP_LIMB_BITS.
          Copy b, shifting it left by s bits.  */
@@ -913,9 +884,9 @@
   y = frexpl (x, &exp);
   if (!(y >= 0.0L && y < 1.0L))
     abort ();
-  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * 2^LDBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * LDBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^LDBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * LDBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'long double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'long double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -963,11 +934,11 @@
         abort ();
       m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo;
     }
-#  if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
-           precision.  */
+#if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
+         precision.  */
   if (!(y == 0.0L))
     abort ();
-#  endif
+#endif
   /* Normalise.  */
   while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0)
     m.nlimbs--;
@@ -1001,9 +972,9 @@
   y = frexp (x, &exp);
   if (!(y >= 0.0 && y < 1.0))
     abort ();
-  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * 2^DBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * DBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^DBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * DBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -1530,7 +1501,7 @@
 
 /* Returns the number of TCHAR_T units needed as temporary space for the result
    of sprintf or SNPRINTF of a single conversion directive.  */
-static size_t
+static inline size_t
 MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
                  arg_type type, int flags, size_t width, int has_precision,
                  size_t precision, int pad_ourselves)
@@ -1781,9 +1752,8 @@
     return NULL;
 
 #define CLEANUP() \
-  if (d.dir != d.direct_alloc_dir)                                      \
-    free (d.dir);                                                       \
-  if (a.arg != a.direct_alloc_arg)                                      \
+  free (d.dir);                                                         \
+  if (a.arg)                                                            \
     free (a.arg);
 
   if (PRINTF_FETCHARGS (args, &a) < 0)
@@ -1957,14 +1927,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2072,7 +2043,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2125,7 +2097,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2198,7 +2171,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2251,7 +2225,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2324,7 +2299,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2377,7 +2353,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2428,14 +2405,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2565,7 +2543,8 @@
                       characters = 0;
                     }
 
-                  if (characters < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2626,7 +2605,8 @@
                         }
                     }
 
-                  if (characters < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2642,7 +2622,7 @@
                   size_t characters;
 #  if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
-                  verify (sizeof (TCHAR_T) == 1);
+                  typedef int TCHAR_T_verify[2 * (sizeof (TCHAR_T) == 1) - 1];
                   TCHAR_T *tmpsrc;
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
@@ -2803,7 +2783,7 @@
                   if (has_width)
                     {
 #  if ENABLE_UNISTDIO
-                      /* Outside POSIX, it's preferable to compare the width
+                      /* Outside POSIX, it's preferrable to compare the width
                          against the number of _characters_ of the converted
                          value.  */
                       w = DCHAR_MBSNLEN (result + length, characters);
@@ -2817,7 +2797,8 @@
                     /* w doesn't matter.  */
                     w = 0;
 
-                  if (w < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2900,7 +2881,8 @@
                   length += tmpdst_len;
 #  endif
 
-                  if (w < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2927,16 +2909,17 @@
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
-                size_t count;
                 DCHAR_T tmpbuf[700];
                 DCHAR_T *tmp;
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -2947,14 +2930,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2964,6 +2948,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3339,14 +3324,11 @@
                     abort ();
 # endif
                   }
-
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -3379,26 +3361,28 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
 #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
@@ -3432,8 +3416,8 @@
                 arg_type type = a.arg[dp->arg_index].type;
 # endif
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
-                size_t count;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
@@ -3442,6 +3426,7 @@
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -3452,14 +3437,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -3469,6 +3455,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3908,9 +3895,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
+                                            size_t count = exponent + 1;
                                             /* Note: count <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -3924,10 +3911,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4378,9 +4365,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
-                                            /* Note: ecount <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            size_t count = exponent + 1;
+                                            /* Note: count <= precision = ndigits.  */
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -4394,10 +4381,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4525,11 +4512,9 @@
 
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -4562,36 +4547,36 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
             else
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                int has_width;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                int has_width;
                 size_t width;
 #endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION
@@ -4613,17 +4598,14 @@
                 TCHAR_T *fbp;
                 unsigned int prefix_count;
                 int prefixes[2] IF_LINT (= { 0 });
-                int orig_errno;
 #if !USE_SNPRINTF
                 size_t tmp_length;
                 TCHAR_T tmpbuf[700];
                 TCHAR_T *tmp;
 #endif
 
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                has_width = 0;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -4634,14 +4616,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -4651,9 +4634,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                     has_width = 1;
-#endif
                   }
 #endif
 
@@ -4771,10 +4752,6 @@
                   *fbp++ = ' ';
                 if (flags & FLAG_ALT)
                   *fbp++ = '#';
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-                if (flags & FLAG_LOCALIZED)
-                  *fbp++ = 'I';
-#endif
                 if (!pad_ourselves)
                   {
                     if (flags & FLAG_ZERO)
@@ -4858,21 +4835,20 @@
 #endif
                   *fbp = dp->conversion;
 #if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
                 fbp[1] = '%';
                 fbp[2] = 'n';
                 fbp[3] = '\0';
 # else
                 /* On glibc2 systems from glibc >= 2.3 - probably also older
-                   ones - we know that snprintf's return value conforms to
-                   ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and
-                   gl_SNPRINTF_TRUNCATION_C99 pass.
+                   ones - we know that snprintf's returns value conforms to
+                   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
                    Therefore we can avoid using %n in this situation.
                    On glibc2 systems from 2004-10-18 or newer, the use of %n
                    in format strings in writable memory may crash the program
                    (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
                    in this situation.  */
-                /* On native Windows systems (such as mingw), we can avoid using
+                /* On native Win32 systems (such as mingw), we can avoid using
                    %n because:
                      - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
                        snprintf does not write more than the specified number
@@ -4881,7 +4857,7 @@
                      - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf
                        allows us to recognize the case of an insufficient
                        buffer size: it returns -1 in this case.
-                   On native Windows systems (such as mingw) where the OS is
+                   On native Win32 systems (such as mingw) where the OS is
                    Windows Vista, the use of %n in format strings by default
                    crashes the program. See
                      <http://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
@@ -4925,8 +4901,6 @@
                 *(TCHAR_T *) (result + length) = '\0';
 #endif
 
-                orig_errno = errno;
-
                 for (;;)
                   {
                     int count = -1;
@@ -5141,8 +5115,7 @@
                                 size_t tmp_length =
                                   MAX_ROOM_NEEDED (&a, dp->arg_index,
                                                    dp->conversion, type, flags,
-                                                   width,
-                                                   has_precision,
+                                                   width, has_precision,
                                                    precision, pad_ourselves);
 
                                 if (maxlen < tmp_length)
@@ -5312,7 +5285,8 @@
                         DCHAR_T *tmpdst;
                         size_t tmpdst_len;
                         /* This code assumes that TCHAR_T is 'char'.  */
-                        verify (sizeof (TCHAR_T) == 1);
+                        typedef int TCHAR_T_verify
+                                    [2 * (sizeof (TCHAR_T) == 1) - 1];
 # if USE_SNPRINTF
                         tmpsrc = (TCHAR_T *) (result + length);
 # else
@@ -5405,7 +5379,7 @@
                       {
                         size_t w;
 # if ENABLE_UNISTDIO
-                        /* Outside POSIX, it's preferable to compare the width
+                        /* Outside POSIX, it's preferrable to compare the width
                            against the number of _characters_ of the converted
                            value.  */
                         w = DCHAR_MBSNLEN (result + length, count);
@@ -5525,7 +5499,6 @@
                     length += count;
                     break;
                   }
-                errno = orig_errno;
 #undef pad_ourselves
 #undef prec_ourselves
               }
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/vasnprintf.h gettext-0.18.1.1/gettext-runtime/libasprintf/vasnprintf.h
--- gettext-0.19.3/gettext-runtime/libasprintf/vasnprintf.h	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/vasnprintf.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
@@ -28,7 +30,7 @@
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
-/* The __-protected variants of 'format' and 'printf' attributes
+/* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/vasprintf.c gettext-0.18.1.1/gettext-runtime/libasprintf/vasprintf.c
--- gettext-0.19.3/gettext-runtime/libasprintf/vasprintf.c	2013-01-17 05:09:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/vasprintf.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* Formatted output to strings.
    Copyright (C) 1999, 2002, 2006-2007 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/vasprintf.h gettext-0.18.1.1/gettext-runtime/libasprintf/vasprintf.h
--- gettext-0.19.3/gettext-runtime/libasprintf/vasprintf.h	2013-01-17 05:08:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/vasprintf.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,20 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2003, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _VASPRINTF_H
 #define _VASPRINTF_H
@@ -25,7 +27,7 @@
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
-/* The __-protected variants of 'format' and 'printf' attributes
+/* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/verify.h gettext-0.18.1.1/gettext-runtime/libasprintf/verify.h
--- gettext-0.19.3/gettext-runtime/libasprintf/verify.h	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/verify.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-/* Compile-time assert-like macros.
-
-   Copyright (C) 2005-2006, 2009-2014 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
-   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
-
-#ifndef _GL_VERIFY_H
-#define _GL_VERIFY_H
-
-
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
-   This is supported by GCC 4.6.0 and later, in C mode, and its use
-   here generates easier-to-read diagnostics when verify (R) fails.
-
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
-   This will likely be supported by future GCC versions, in C++ mode.
-
-   Use this only with GCC.  If we were willing to slow 'configure'
-   down we could also use it with other compilers, but since this
-   affects only the quality of diagnostics, why bother?  */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
-     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
-     && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
-   first G++ release that supports static_assert.  */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
-#endif
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   system headers, defines a conflicting _Static_assert that is no
-   better than ours; override it.  */
-#ifndef _GL_HAVE_STATIC_ASSERT
-# include <stddef.h>
-# undef _Static_assert
-#endif
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   If _Static_assert works, verify (R) uses it directly.  Similarly,
-   _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct
-   that is an operand of sizeof.
-
-   The code below uses several ideas for C++ compilers, and for C
-   compilers that do not support _Static_assert:
-
-   * The first step is ((R) ? 1 : -1).  Given an expression R, of
-     integral or boolean or floating-point type, this yields an
-     expression of integral type, whose value is later verified to be
-     constant and nonnegative.
-
-   * Next this expression W is wrapped in a type
-     struct _gl_verify_type {
-       unsigned int _gl_verify_error_if_negative: W;
-     }.
-     If W is negative, this yields a compile-time error.  No compiler can
-     deal with a bit-field of negative size.
-
-     One might think that an array size check would have the same
-     effect, that is, that the type struct { unsigned int dummy[W]; }
-     would work as well.  However, inside a function, some compilers
-     (such as C++ compilers and GNU C) allow local parameters and
-     variables inside array size expressions.  With these compilers,
-     an array size check would not properly diagnose this misuse of
-     the verify macro:
-
-       void function (int n) { verify (n < 0); }
-
-   * For the verify macro, the struct _gl_verify_type will need to
-     somehow be embedded into a declaration.  To be portable, this
-     declaration must declare an object, a constant, a function, or a
-     typedef name.  If the declared entity uses the type directly,
-     such as in
-
-       struct dummy {...};
-       typedef struct {...} dummy;
-       extern struct {...} *dummy;
-       extern void dummy (struct {...} *);
-       extern struct {...} *dummy (void);
-
-     two uses of the verify macro would yield colliding declarations
-     if the entity names are not disambiguated.  A workaround is to
-     attach the current line number to the entity name:
-
-       #define _GL_CONCAT0(x, y) x##y
-       #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-       extern struct {...} * _GL_CONCAT (dummy, __LINE__);
-
-     But this has the problem that two invocations of verify from
-     within the same macro would collide, since the __LINE__ value
-     would be the same for both invocations.  (The GCC __COUNTER__
-     macro solves this problem, but is not portable.)
-
-     A solution is to use the sizeof operator.  It yields a number,
-     getting rid of the identity of the type.  Declarations like
-
-       extern int dummy [sizeof (struct {...})];
-       extern void dummy (int [sizeof (struct {...})]);
-       extern int (*dummy (void)) [sizeof (struct {...})];
-
-     can be repeated.
-
-   * Should the implementation use a named struct or an unnamed struct?
-     Which of the following alternatives can be used?
-
-       extern int dummy [sizeof (struct {...})];
-       extern int dummy [sizeof (struct _gl_verify_type {...})];
-       extern void dummy (int [sizeof (struct {...})]);
-       extern void dummy (int [sizeof (struct _gl_verify_type {...})]);
-       extern int (*dummy (void)) [sizeof (struct {...})];
-       extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})];
-
-     In the second and sixth case, the struct type is exported to the
-     outer scope; two such declarations therefore collide.  GCC warns
-     about the first, third, and fourth cases.  So the only remaining
-     possibility is the fifth case:
-
-       extern int (*dummy (void)) [sizeof (struct {...})];
-
-   * GCC warns about duplicate declarations of the dummy function if
-     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
-     __COUNTER__ macro that can let us generate unique identifiers for
-     each dummy function, to suppress this warning.
-
-   * This implementation exploits the fact that older versions of GCC,
-     which do not support _Static_assert, also do not warn about the
-     last declaration mentioned above.
-
-   * GCC warns if -Wnested-externs is enabled and verify() is used
-     within a function body; but inside a function, you can always
-     arrange to use verify_expr() instead.
-
-   * In C++, any struct definition inside sizeof is invalid.
-     Use a template type to work around the problem.  */
-
-/* Concatenate two preprocessor tokens.  */
-#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-#define _GL_CONCAT0(x, y) x##y
-
-/* _GL_COUNTER is an integer, preferably one that changes each time we
-   use it.  Use __COUNTER__ if it works, falling back on __LINE__
-   otherwise.  __LINE__ isn't perfect, but it's better than a
-   constant.  */
-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-# define _GL_COUNTER __COUNTER__
-#else
-# define _GL_COUNTER __LINE__
-#endif
-
-/* Generate a symbol with the given prefix, making it unique if
-   possible.  */
-#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
-
-/* Verify requirement R at compile-time, as an integer constant expression
-   that returns 1.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.  */
-
-#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
-   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
-
-#ifdef __cplusplus
-# if !GNULIB_defined_struct__gl_verify_type
-template <int w>
-  struct _gl_verify_type {
-    unsigned int _gl_verify_error_if_negative: w;
-  };
-#  define GNULIB_defined_struct__gl_verify_type 1
-# endif
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    _gl_verify_type<(R) ? 1 : -1>
-#elif defined _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
-    }
-#else
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
-#endif
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.
-
-   Unfortunately, unlike C11, this implementation must appear as an
-   ordinary declaration, and cannot appear inside struct { ... }.  */
-
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
-#else
-# define _GL_VERIFY(R, DIAGNOSTIC)				       \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
-      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-#endif
-
-/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
-#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
-# endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#  define static_assert _Static_assert /* C11 requires this #define.  */
-# endif
-#endif
-
-/* @assert.h omit start@  */
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   There are two macros, since no single macro can be used in all
-   contexts in C.  verify_true (R) is for scalar contexts, including
-   integer constant expression contexts.  verify (R) is for declaration
-   contexts, e.g., the top level.  */
-
-/* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  This is equivalent to verify_expr (R, 1).
-
-   verify_true is obsolescent; please use verify_expr instead.  */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
-/* Verify requirement R at compile-time.  Return the value of the
-   expression E.  */
-
-#define verify_expr(R, E) \
-   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  */
-
-#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-/* Assume that R always holds.  This lets the compiler optimize
-   accordingly.  R should not have side-effects; it may or may not be
-   evaluated.  Behavior is undefined if R is false.  */
-
-#if (__has_builtin (__builtin_unreachable) \
-     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
-# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
-#elif 1200 <= _MSC_VER
-# define assume(R) __assume (R)
-#elif (defined lint \
-       && (__has_builtin (__builtin_trap) \
-           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
-  /* Doing it this way helps various packages when configured with
-     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
-     when 'assume' silences warnings even with older GCCs.  */
-# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
-#else
-# define assume(R) ((void) (0 && (R)))
-#endif
-
-/* @assert.h omit end@  */
-
-#endif
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/xsize.c gettext-0.18.1.1/gettext-runtime/libasprintf/xsize.c
--- gettext-0.19.3/gettext-runtime/libasprintf/xsize.c	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/xsize.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define XSIZE_INLINE _GL_EXTERN_INLINE
-#include "xsize.h"
diff -Nru gettext-0.19.3/gettext-runtime/libasprintf/xsize.h gettext-0.18.1.1/gettext-runtime/libasprintf/xsize.h
--- gettext-0.19.3/gettext-runtime/libasprintf/xsize.h	2014-10-16 06:00:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/xsize.h	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008 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
-   the Free Software Foundation; either version 2.1, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _XSIZE_H
 #define _XSIZE_H
@@ -27,14 +29,6 @@
 # include <stdint.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef XSIZE_INLINE
-# define XSIZE_INLINE _GL_INLINE
-#endif
-
 /* The size of memory objects is often computed through expressions of
    type size_t. Example:
       void* p = malloc (header_size + n * element_size).
@@ -56,7 +50,7 @@
   ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
 
 /* Sum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -67,7 +61,7 @@
 }
 
 /* Sum of three sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -77,7 +71,7 @@
 }
 
 /* Sum of four sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -87,7 +81,7 @@
 }
 
 /* Maximum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -100,7 +94,7 @@
 
 /* Multiplication of a count with an element size, with overflow check.
    The count must be >= 0 and the element size must be > 0.
-   This is a macro, not a function, so that it works correctly even
+   This is a macro, not an inline function, so that it works correctly even
    when N is of a wider type and N > SIZE_MAX.  */
 #define xtimes(N, ELSIZE) \
   ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
@@ -112,6 +106,4 @@
 #define size_in_bounds_p(SIZE) \
   ((SIZE) != SIZE_MAX)
 
-_GL_INLINE_HEADER_END
-
 #endif /* _XSIZE_H */
diff -Nru gettext-0.19.3/gettext-runtime/m4/ansi-c++.m4 gettext-0.18.1.1/gettext-runtime/m4/ansi-c++.m4
--- gettext-0.19.3/gettext-runtime/m4/ansi-c++.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/ansi-c++.m4	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,62 @@
+# ansi-c++.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free 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 From Bruno Haible.
+
+# Sets CXX to the name of a sufficiently ANSI C++ compliant compiler,
+# or to ":" if none is found.
+
+AC_DEFUN([gt_PROG_ANSI_CXX],
+[
+AC_CHECK_PROGS(CXX, $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC, :)
+if test "$CXX" != ":"; then
+  dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit
+  dnl upon failure.
+  AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+  AC_LANG_PUSH(C++)
+  AC_ARG_VAR([CXX], [C++ compiler command])
+  AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+    ac_cv_prog_cxx_works=yes
+    if (./conftest; exit) 2>/dev/null; then
+      ac_cv_prog_cxx_cross=no
+    else
+      ac_cv_prog_cxx_cross=yes
+    fi
+  else
+    ac_cv_prog_cxx_works=no
+  fi
+  rm -fr conftest*
+  AC_LANG_POP(C++)
+  AC_MSG_RESULT($ac_cv_prog_cxx_works)
+  if test $ac_cv_prog_cxx_works = no; then
+    CXX=:
+  else
+    dnl Test for namespaces. Both libasprintf and tests/lang-c++ need it.
+    dnl We don't bother supporting pre-ANSI-C++ compilers.
+    AC_MSG_CHECKING([whether the C++ compiler supports namespaces])
+    AC_LANG_PUSH(C++)
+    cat <<EOF > conftest.$ac_ext
+#include <iostream>
+namespace test { using namespace std; }
+std::ostream* ptr;
+int main () { return 0; }
+EOF
+    if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+      gt_cv_prog_cxx_namespaces=yes
+    else
+      gt_cv_prog_cxx_namespaces=no
+    fi
+    rm -fr conftest*
+    AC_LANG_POP(C++)
+    AC_MSG_RESULT($gt_cv_prog_cxx_namespaces)
+    if test $gt_cv_prog_cxx_namespaces = no; then
+      CXX=:
+    fi
+  fi
+fi
+])
diff -Nru gettext-0.19.3/gettext-runtime/m4/ChangeLog gettext-0.18.1.1/gettext-runtime/m4/ChangeLog
--- gettext-0.19.3/gettext-runtime/m4/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,349 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-09-30  Daiki Ueno  <ueno@gnu.org>
-
-	* extern-inline.m4, threadlib.m4: Update from Gnulib.
-
-2014-07-16  Daiki Ueno  <ueno@gnu.org>
-
-	* intl.m4 (gt_GL_ATTRIBUTE): New macro.
-	(AM_INTL_SUBDIR): Require gt_GL_ATTRIBUTE.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2013-12-17  Daiki Ueno  <ueno@gnu.org>
-
-	Add missing extern-inline.m4 into archive.
-	Problem reported by Reuben Thomas in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00010.html>.
-	* extern-inline.m4: New file, from gnulib.
-	* intl.m4 (AM_INTL_SUBDIR): Require gl_EXTERN_INLINE.
-	* Makefile.am (EXTRA_DIST): Update.
-
-2013-08-09  Daiki Ueno  <ueno@gnu.org>
-
-	* intl.m4 (AM_INTL_SUBDIR): Fix AC_CHECK_DECLS usage.
-	(gt_INTL_SUBDIR_CORE): Likewise.
-
-2013-06-25  Daiki Ueno  <ueno@gnu.org>
-
-	Allow user to supply custom sed command when generating en@quot.po.
-	* po.m4 (AM_PO_SUBDIRS): Require AC_PROG_SED.
-
-2013-04-23  Daiki Ueno  <ueno@gnu.org>
-
-	Obsolete gt_CHECK_DECL in favor of AC_CHECK_DECLS.
-	Now that macros installed by 'gettextize' require Autoconf 2.60,
-	gt_CHECK_DECL can be safely replaced with AC_CHECK_DECLS.
-	* intl.m4 (gt_CHECK_DECL): Remove.
-	(AM_INTL_SUBDIR): Use AC_CHECK_DECLS instead of gt_CHECK_DECL.
-	(gt_INTL_SUBDIR_CORE): Likewise.
-
-2013-03-05  Daiki Ueno  <ueno@gnu.org>
-
-	* fcntl-o.m4: Update copyright year.
-	* gettext.m4: Likewise.
-	* glibc2.m4: Likewise.
-	* glibc21.m4: Likewise.
-	* iconv.m4: Likewise.
-	* intdiv0.m4: Likewise.
-	* intl.m4: Likewise.
-	* intldir.m4: Likewise.
-	* intlmacosx.m4: Likewise.
-	* intmax.m4: Likewise.
-	* inttypes-pri.m4: Likewise.
-	* inttypes_h.m4: Likewise.
-	* lcmessage.m4: Likewise.
-	* lock.m4: Likewise.
-	* longlong.m4: Likewise.
-	* nls.m4: Likewise.
-	* po.m4: Likewise.
-	* printf-posix.m4: Likewise.
-	* progtest.m4: Likewise.
-	* size_max.m4: Likewise.
-	* stdint_h.m4: Likewise.
-	* threadlib.m4: Likewise.
-	* uintmax_t.m4: Likewise.
-	* visibility.m4: Likewise.
-	* wchar_t.m4: Likewise.
-	* wint_t.m4: Likewise.
-	* xsize.m4: Likewise.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-07  Stefano Lattarini  <stefano.lattarini@gmailcom>  (tiny change)
-
-	m4: use AC_PROG_MKDIR_P, not the deprecated AM_PROG_MKDIR_P
-	* gettext.m4 (AM_INTL_SUBDIR): Require AC_PROG_MKDIR_P instead
-	of AM_PROG_MKDIR_P, as this latter macro is deprecated since
-	Automake 1.12.1, and will be removed in Automake 1.14.
-	Accordingly, bump requirement in AC_PREREQ to 2.60.
-	* po.m4 (AM_PO_SUBDIRS): Likewise.
-
-2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* lock.m4 (gl_PREREQ_LOCK): Do not require AC_C_INLINE.
-
-2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* xsize.m4 (gl_XSIZE): Do not require AC_C_INLINE.
-
-2012-09-10  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* fcntl-o.m4 (gl_FCNTL_O_FLAGS): Check for AIX 7.1 bug
-	that caused a GNU tar test failure.  Problem reported by Jez Wain; see
-	<http://lists.gnu.org/archive/html/bug-tar/2012-07/msg00018.html>.
-
-2012-06-22  Bruno Haible  <bruno@clisp.org>
-
-	* gettext.m4: Write "Mac OS X" instead of "MacOS X".
-	* intdiv0.m4: Likewise.
-	* intlmacosx.m4: Likewise.
-	* lock.m4: Likewise.
-	* threadlib.m4: Likewise.
-	* visibility.m4: Likewise.
-
-2012-02-18  Bruno Haible  <bruno@clisp.org>
-
-	* Makefile.am (EXTRA_DIST): Remove intmax_t.m4.
-
-2012-02-05  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* po.m4: Spelling fixes.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	* gettext.m4: Update copyright year.
-	* codeset.m4: Likewise.
-	* glibc2.m4: Likewise.
-	* glibc21.m4: Likewise.
-	* iconv.m4: Likewise.
-	* intdiv0.m4: Likewise.
-	* intl.m4: Likewise.
-	* intldir.m4: Likewise.
-	* intlmacosx.m4: Likewise.
-	* intmax.m4: Likewise.
-	* inttypes-pri.m4: Likewise.
-	* inttypes_h.m4: Likewise.
-	* lcmessage.m4: Likewise.
-	* lock.m4: Likewise.
-	* longlong.m4: Likewise.
-	* nls.m4: Likewise.
-	* printf-posix.m4: Likewise.
-	* progtest.m4: Likewise.
-	* size_max.m4: Likewise.
-	* stdint_h.m4: Likewise.
-	* uintmax_t.m4: Likewise.
-	* visibility.m4: Likewise.
-	* wchar_t.m4: Likewise.
-	* wint_t.m4: Likewise.
-	* xsize.m4: Likewise.
-
-2011-09-11  Bruno Haible  <bruno@clisp.org>
-
-	Don't assume <unistd.h> exists.
-	* fcntl-o.m4 (gl_FCNTL_O_FLAGS): If <unistd.h> does not exist,
-	include <io.h> and <stdlib.h> instead. Don't test symbolink links if
-	symlink() does not exist.
-
-2012-01-04  Bruno Haible  <bruno@clisp.org>
-
-	Talk about "native Windows API", not "Win32".
-	* threadlib.m4: Update comments to mention native Windows.
-	(gl_THREADLIB_EARLY_BODY, gl_THREADLIB_BODY): Expect
-	--enable-threads=windows instead of --enable-threads=win32. Set
-	USE_WINDOWS_THREADS, not USE_WIN32_THREADS.
-
-2012-01-06  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* m4/gettext.m4: In commentary, do not use ` to quote.
-
-2012-01-06  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Use ', not `, for quoting output.
-	* m4/intl.m4 (gt_CHECK_DECL): Quote 'like this', not `like this', as
-	per the recent change to the GNU coding standards.
-	* m4/longlong.m4 (AC_TYPE_LONG_LONG_INT,
-	AC_TYPE_UNSIGNED_LONG_LONG_INT): Likewise.
-
-2011-09-10  Bruno Haible  <bruno@clisp.org>
-
-	iconv.m4: Add support for MSVC compiler.
-	* iconv.m4 (AM_ICONV): Use ISO C declaration syntax on MSVC.
-
-2011-07-07  Bruno Haible  <bruno@clisp.org>
-
-	Avoid literal tabs.
-	* po,m4 (AM_PO_SUBDIRS, AM_POSTPROCESS_PO_MAKEFILE): Use a shell
-	variable containing a tab instead of a literal tab.
-	Reported by Jim Meyering.
-
-2011-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Ensure intmax_t gets defined in libasprintf.
-	* Makefile.am (EXTRA_DIST): Add intmax_t.m4.
-
-2011-02-18  Eric Blake  <eblake@redhat.com>
-
-	longlong: skip, rather than fail, on cross-compilation
-	* longlong.m4 (AC_TYPE_LONG_LONG_INT): Avoid aborting configure
-	when cross-compiling; regression from 2011-02-16.
-
-2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
-
-	longlong: tune, particularly for common case of c99
-	* longlong.m4 (AC_TYPE_LONG_LONG_INT): Don't bother compiling
-	or running anything if c99, or if unsigned long long int does not
-	work.  In either case, we know the answer without further tests.
-	Do not compile _AC_TYPE_LONG_LONG_SNIPPET twice.  Instead, compile
-	it at most once, and use its results for both long long int and
-	unsigned long long int.  This is more likely to be efficient in
-	the common case where the program wants to check for both long
-	long int and unsigned long long int.
-	(AC_TYPE_UNSIGNED_LONG_LONG_INT): Don't bother compiling if c99,
-	since the answer is already known.
-
-2010-12-04  Bruno Haible  <bruno@clisp.org>
-
-	Put more information about failed tests into the test return codes.
-	* intdiv0.m4 (gt_INTDIV0): Change test program so that it returns an
-	enumerated value (0, 1, 2, 3, 4, ...).
-	* fcntl-o.m4 (gl_FCNTL_O_FLAGS): Change test program so that it returns
-	a bit mask.
-	* iconv.m4 (AM_ICONV_LINK): Likewise.
-
-2010-11-26  Bruno Haible  <bruno@clisp.org>
-
-	* iconv.m4 (AM_ICONV): If the gnulib module 'iconv-h' is present, set
-	ICONV_CONST.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Ensure that <features.h> is included before __GLIBC__ is tested.
-	* intl.m4 (AM_INTL_SUBDIR): Test for <features.h>.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* glibc21.m4 (gl_GLIBC21): Treat uClibc like glibc.
-	* glibc2.m4 (gt_GLIBC2): Treat uClibc like a non-glibc platform.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-10-04  Bruno Haible  <bruno@clisp.org>
-
-	Make option --with-libpth-prefix work.
-	* threadlib.m4 (gl_THREADLIB_BODY): When testing whether pth works, use
-	$LIBPTH, not just -lpth.
-
-2010-09-22  Bruno Haible  <bruno@clisp.org>
-
-	* threadlib.m4 (gl_THREADLIB_EARLY_BODY): When gl_THREADLIB_DEFAULT_NO
-	is defined, change the default to 'no'.
-	Reported by Paul Eggert.
-
-2010-09-04  Bruno Haible  <bruno@clisp.org>
-
-	Set PATH_SEPARATOR the same way autoconf does.
-	* progtest.m4 (AM_PATH_PROG_WITH_TEST): Determine the value of
-	PATH_SEPARATOR the same way autoconf-generated configure scripts do.
-
-2010-08-28  Bruno Haible  <bruno@clisp.org>
-
-	Prefer using AC_DEFUN_ONCE over AC_DEFUN in projects with gnulib.
-	* iconv.m4 (gl_iconv_AC_DEFUN): Use AC_DEFUN_ONCE if gl_00GNULIB is
-	defined.
-	Suggested by Eric Blake.
-
-2010-07-31  Bruno Haible  <bruno@clisp.org>
-
-	Use new ansi-c++.m4 from gnulib.
-	* ansi-c++.m4: Remove file.
-	* Makefile.am (EXTRA_DIST): Remove it.
-	Reported at <https://savannah.gnu.org/bugs/?30607>.
-
-2010-07-31  Bruno Haible  <bruno@clisp.org>
-
-	iconv: Work around AIX 6.1..7.1 bug.
-	* iconv.m4 (AM_ICONV_LINK): Test against AIX 6.1, 7.1 bug. When
-	cross-compiling, guess no on all versions of AIX.
-	Reported by Rainer Tammer.
-
-2010-07-30  Bruno Haible  <bruno@clisp.org>
-
-	iconv: Update regarding AIX.
-	* iconv.m4 (AM_ICONV_LINK): When cross-compiling, guess yes on AIX 7.
-	Reported by Rainer Tammer.
-
-2010-07-19  Bruno Haible  <bruno@clisp.org>
-
-	Modernize AC_TRY_RUN invocations.
-	* iconv.m4 (AM_ICONV_LINK): Use AC_RUN_IFELSE instead of AC_TRY_RUN.
-	* intdiv0.m4 (gt_INTDIV0): Likewise.
-	* printf-posix.m4 (gt_PRINTF_POSIX): Likewise.
-	* threadlib.m4 (gl_THREADLIB_BODY): Likewise.
-
-2010-07-19  Bruno Haible  <bruno@clisp.org>
-
-	Modernize AC_TRY_LINK invocations.
-	* codeset.m4 (AM_LANGINFO_CODESET): Use AC_LINK_IFELSE instead of
-	AC_TRY_LINK.
-	* gettext.m4 (AM_GNU_GETTEXT): Likewise.
-	* iconv.m4 (AM_ICONV_LINK): Likewise.
-	* intl.m4 (gt_INTL_SUBDIR_CORE): Likewise.
-	* intlmacosx.m4 (gt_INTL_MACOSX): Likewise.
-	* lcmessage.m4 (gt_LC_MESSAGES): Likewise.
-	* threadlib.m4 (gl_THREADLIB_BODY): Likewise.
-
-2010-07-18  Bruno Haible  <bruno@clisp.org>
-
-	Modernize AC_TRY_COMPILE invocations.
-	* iconv.m4 (gl_iconv_AC_DEFUN): Use AC_COMPILE_IFELSE instead of
-	AC_TRY_COMPILE.
-	* intl.m4 (gt_CHECK_DECL): Likewise.
-	* intmax.m4 (gt_TYPE_INTMAX_T): Likewise.
-	* inttypes-pri.m4 (gt_INTTYPES_PRI): Likewise.
-	* inttypes_h.m4 (gl_AC_HEADER_INTTYPES_H): Likewise.
-	* lock.m4 (gl_LOCK): Likewise.
-	* size_max.m4 (gl_SIZE_MAX): Likewise.
-	* stdint_h.m4 (gl_AC_HEADER_STDINT_H): Likewise.
-	* visibility.m4 (gl_VISIBILITY): Likewise.
-	* wchar_t.m4 (gt_TYPE_WCHAR_T): Likewise.
-	* wint_t.m4 (gt_TYPE_WINT_T): Likewise.
-
-2010-07-01  Christian Weisgerber  <naddy@mips.inka.de>  (tiny change)
-
-	Use AC_GNU_SOURCE as a fallback for AC_USE_SYSTEM_EXTENSIONS.
-	* fcntl-o.m4 (gl_FCNTL_O_FLAGS): When AC_USE_SYSTEM_EXTENSIONS is
-	not present (i.e. with autoconf 2.59 and when using gettextize, not
-	gnulib), require AC_GNU_SOURCE instead.
-
-2010-06-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	Avoid double-quotes inside backquote inside double-quote.
-	* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS, AM_POSTPROCESS_PO_MAKEFILE):
-	Remove unneeded outermost double-quotes around backquote that contains
-	double-quoted strings. Avoids an idiom that nearly triggers a ksh bug.
-
-2010-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Prefer documented low-level autoconf macro names.
-	* intl.m4 (gt_CHECK_DECL): Use m4_translit instead of translit.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/m4/codeset.m4 gettext-0.18.1.1/gettext-runtime/m4/codeset.m4
--- gettext-0.19.3/gettext-runtime/m4/codeset.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/codeset.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+# codeset.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,12 +9,10 @@
 AC_DEFUN([AM_LANGINFO_CODESET],
 [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <langinfo.h>]],
-          [[char* cs = nl_langinfo(CODESET); return !cs;]])],
-       [am_cv_langinfo_codeset=yes],
-       [am_cv_langinfo_codeset=no])
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      [am_cv_langinfo_codeset=yes],
+      [am_cv_langinfo_codeset=no])
     ])
   if test $am_cv_langinfo_codeset = yes; then
     AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
diff -Nru gettext-0.19.3/gettext-runtime/m4/extern-inline.m4 gettext-0.18.1.1/gettext-runtime/m4/extern-inline.m4
--- gettext-0.19.3/gettext-runtime/m4/extern-inline.m4	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/extern-inline.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-dnl 'extern inline' a la ISO C99.
-
-dnl Copyright 2012-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_EXTERN_INLINE],
-[
-  AH_VERBATIM([extern_inline],
-[/* 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
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
-
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-
-   Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
-   on configurations that mistakenly use 'static inline' to implement
-   functions or macros in standard C headers like <ctype.h>.  For example,
-   if isdigit is mistakenly implemented via a static inline function,
-   a program containing an extern inline function that calls isdigit
-   may not work since the C standard prohibits extern inline functions
-   from calling static functions.  This bug is known to occur on:
-
-     OS X 10.8 and earlier; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
-
-     DragonFly; see
-     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
-
-     FreeBSD; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
-
-   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
-   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
-   Assume DragonFly and FreeBSD will be similar.  */
-#if (((defined __APPLE__ && defined __MACH__) \
-      || defined __DragonFly__ || defined __FreeBSD__) \
-     && (defined __header_inline \
-         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
-            && ! defined __clang__) \
-         : ((! defined _DONT_USE_CTYPE_INLINE_ \
-             && (defined __GNUC__ || defined __cplusplus)) \
-            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
-                && defined __GNUC__ && ! defined __cplusplus))))
-# define _GL_EXTERN_INLINE_STDHEADER_BUG
-#endif
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-# define _GL_EXTERN_INLINE_IN_USE
-#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
-       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-# define _GL_EXTERN_INLINE_IN_USE
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
-#endif
-
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-#endif])
-])
diff -Nru gettext-0.19.3/gettext-runtime/m4/fcntl-o.m4 gettext-0.18.1.1/gettext-runtime/m4/fcntl-o.m4
--- gettext-0.19.3/gettext-runtime/m4/fcntl-o.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/fcntl-o.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+# fcntl-o.m4 serial 1
+dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,26 +12,13 @@
 AC_DEFUN([gl_FCNTL_O_FLAGS],
 [
   dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
-  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
-  dnl AC_GNU_SOURCE.
-  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
-    [AC_REQUIRE([AC_GNU_SOURCE])])
-
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_CHECK_FUNCS_ONCE([symlink])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
   AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
     [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <sys/types.h>
            #include <sys/stat.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <io.h>
-           # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
-           #endif
+           #include <unistd.h>
            #include <fcntl.h>
            #ifndef O_NOATIME
             #define O_NOATIME 0
@@ -46,74 +33,34 @@
             };
           ]],
           [[
-            int result = !constants;
-            #if HAVE_SYMLINK
+            int status = !constants;
             {
               static char const sym[] = "conftest.sym";
-              if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
+              if (symlink (".", sym) != 0
+                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
+                status |= 32;
               unlink (sym);
             }
-            #endif
             {
               static char const file[] = "confdefs.h";
               int fd = open (file, O_RDONLY | O_NOATIME);
-              if (fd < 0)
-                result |= 8;
-              else
-                {
-                  struct stat st0;
-                  if (fstat (fd, &st0) != 0)
-                    result |= 16;
-                  else
-                    {
-                      char c;
-                      sleep (1);
-                      if (read (fd, &c, 1) != 1)
-                        result |= 24;
-                      else
-                        {
-                          if (close (fd) != 0)
-                            result |= 32;
-                          else
-                            {
-                              struct stat st1;
-                              if (stat (file, &st1) != 0)
-                                result |= 40;
-                              else
-                                if (st0.st_atime != st1.st_atime)
-                                  result |= 64;
-                            }
-                        }
-                    }
-                }
+              char c;
+              struct stat st0, st1;
+              if (fd < 0
+                  || fstat (fd, &st0) != 0
+                  || sleep (1) != 0
+                  || read (fd, &c, 1) != 1
+                  || close (fd) != 0
+                  || stat (file, &st1) != 0
+                  || st0.st_atime != st1.st_atime)
+                status |= 64;
             }
-            return result;]])],
+            return status;]])],
        [gl_cv_header_working_fcntl_h=yes],
        [case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
         64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
          *) gl_cv_header_working_fcntl_h='no';;
         esac],
        [gl_cv_header_working_fcntl_h=cross-compiling])])
diff -Nru gettext-0.19.3/gettext-runtime/m4/gettext.m4 gettext-0.18.1.1/gettext-runtime/m4/gettext.m4
--- gettext-0.19.3/gettext-runtime/m4/gettext.m4	2014-07-10 02:23:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/gettext.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# gettext.m4 serial 63 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -35,7 +35,7 @@
 dnl    'need-formatstring-macros', then GNU gettext implementations that don't
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value '$(top_builddir)/intl/' is used.
+dnl    the value `$(top_builddir)/intl/' is used.
 dnl
 dnl The result of the configuration is one of three cases:
 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -97,7 +97,7 @@
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX
 
   dnl Set USE_NLS.
@@ -157,18 +157,12 @@
         fi
 
         AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
+         [AC_TRY_LINK([#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-               ]])],
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
             [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])
 
@@ -189,47 +183,35 @@
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
+            AC_TRY_LINK([#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-                 ]])],
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
             if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
+              AC_TRY_LINK([#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+               ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"])
diff -Nru gettext-0.19.3/gettext-runtime/m4/glibc21.m4 gettext-0.18.1.1/gettext-runtime/m4/glibc21.m4
--- gettext-0.19.3/gettext-runtime/m4/glibc21.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/glibc21.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,17 @@
-# glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
-dnl Inc.
+# glibc21.m4 serial 4
+dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-# Test for the GNU C Library, version 2.1 or newer, or uClibc.
+# Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
 
 AC_DEFUN([gl_GLIBC21],
   [
-    AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
+    AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
       [ac_cv_gnu_library_2_1],
-      [AC_EGREP_CPP([Lucky],
+      [AC_EGREP_CPP([Lucky GNU user],
         [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
@@ -20,9 +19,6 @@
   Lucky GNU user
  #endif
 #endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
         ],
         [ac_cv_gnu_library_2_1=yes],
         [ac_cv_gnu_library_2_1=no])
diff -Nru gettext-0.19.3/gettext-runtime/m4/glibc2.m4 gettext-0.18.1.1/gettext-runtime/m4/glibc2.m4
--- gettext-0.19.3/gettext-runtime/m4/glibc2.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/glibc2.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,6 +1,5 @@
-# glibc2.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
-dnl Inc.
+# glibc2.m4 serial 2
+dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +15,7 @@
         [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
diff -Nru gettext-0.19.3/gettext-runtime/m4/iconv.m4 gettext-0.18.1.1/gettext-runtime/m4/iconv.m4
--- gettext-0.19.3/gettext-runtime/m4/iconv.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/iconv.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+# iconv.m4 serial 11 (gettext-0.18.1)
+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -30,35 +30,27 @@
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
   AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[
-#include <stdlib.h>
-#include <iconv.h>
-         ]],
-         [[iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);]])],
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
       [am_cv_func_iconv=yes])
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-           ]],
-           [[iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);]])],
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
         [am_cv_lib_iconv=yes]
         [am_cv_func_iconv=yes])
       LIBS="$am_save_LIBS"
@@ -66,19 +58,16 @@
   ])
   if test "$am_cv_func_iconv" = yes; then
     AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
+      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
       am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <iconv.h>
 #include <string.h>
 int main ()
 {
-  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -95,8 +84,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
+          return 1;
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -115,27 +103,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        const char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
+          return 1;
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -154,8 +122,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
+          return 1;
       }
   }
 #endif
@@ -169,19 +136,13 @@
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
-}]])],
-        [am_cv_func_iconv_works=yes],
-        [am_cv_func_iconv_works=no],
-        [
-changequote(,)dnl
-         case "$host_os" in
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
-changequote([,])dnl
-        ])
+         esac])
       LIBS="$am_save_LIBS"
     ])
     case "$am_cv_func_iconv_works" in
@@ -222,47 +183,32 @@
   m4_version_prereq([2.64],
     [[AC_DEFUN_ONCE(
         [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
+    [[AC_DEFUN(
+        [$1], [$2])]]))
 gl_iconv_AC_DEFUN([AM_ICONV],
 [
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
+      AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
+#if defined(__STDC__) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
-           ]],
-           [[]])],
-        [am_cv_proto_iconv_arg1=""],
-        [am_cv_proto_iconv_arg1="const"])
+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
     AC_MSG_RESULT([
          $am_cv_proto_iconv])
     AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
       [Define as const if the declaration of iconv() needs const.])
-    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-    m4_ifdef([gl_ICONV_H_DEFAULTS],
-      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
-      ])
   fi
 ])
diff -Nru gettext-0.19.3/gettext-runtime/m4/intdiv0.m4 gettext-0.18.1.1/gettext-runtime/m4/intdiv0.m4
--- gettext-0.19.3/gettext-runtime/m4/intdiv0.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/intdiv0.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2014 Free Software Foundation, Inc.
+# intdiv0.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,7 @@
 changequote(,)dnl
       case "$host_os" in
         macos* | darwin[6-9]* | darwin[1-9][0-9]*)
-          # On Mac OS X 10.2 or newer, just assume the same as when cross-
+          # On MacOS X 10.2 or newer, just assume the same as when cross-
           # compiling. If we were to perform the real test, 1 Crash Report
           # dialog window would pop up.
           case "$host_cpu" in
@@ -29,8 +29,7 @@
       esac
 changequote([,])dnl
       if test -z "$gt_cv_int_divbyzero_sigfpe"; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <stdlib.h>
 #include <signal.h>
 
@@ -60,11 +59,9 @@
 
   z = x / y;
   nan = y / y;
-  exit (2);
+  exit (1);
 }
-]])],
-          [gt_cv_int_divbyzero_sigfpe=yes],
-          [gt_cv_int_divbyzero_sigfpe=no],
+], [gt_cv_int_divbyzero_sigfpe=yes], [gt_cv_int_divbyzero_sigfpe=no],
           [
             # Guess based on the CPU.
 changequote(,)dnl
diff -Nru gettext-0.19.3/gettext-runtime/m4/intldir.m4 gettext-0.18.1.1/gettext-runtime/m4/intldir.m4
--- gettext-0.19.3/gettext-runtime/m4/intldir.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/intldir.m4	2010-06-06 12:49:57.000000000 +0000
@@ -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-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/m4/intl.m4 gettext-0.18.1.1/gettext-runtime/m4/intl.m4
--- gettext-0.19.3/gettext-runtime/m4/intl.m4	2014-09-29 02:46:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/intl.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# intl.m4 serial 27 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# intl.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2009.
 
-AC_PREREQ([2.60])
+AC_PREREQ([2.52])
 
 dnl Checks for all prerequisites of the intl subdirectory,
 dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
@@ -25,7 +25,7 @@
 AC_DEFUN([AM_INTL_SUBDIR],
 [
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AC_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([gt_GLIBC2])dnl
@@ -42,8 +42,6 @@
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
   AC_REQUIRE([gt_INTL_MACOSX])dnl
-  AC_REQUIRE([gl_EXTERN_INLINE])dnl
-  AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
 
   dnl Support for automake's --enable-silent-rules.
   case "$enable_silent_rules" in
@@ -57,19 +55,21 @@
     [AC_DEFINE([ptrdiff_t], [long],
        [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
     ])
-  AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h])
+  AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
   AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
     snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
 
   dnl Use the _snprintf function only if it is declared (because on NetBSD it
   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
 
   dnl Use the *_unlocked functions only if they are declared.
   dnl (because some of them were defined without being declared in Solaris
   dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
   dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>])
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
 
   case $gt_cv_func_printf_posix in
     *yes) HAVE_POSIX_PRINTF=1 ;;
@@ -220,10 +220,9 @@
   AC_REQUIRE([gt_INTTYPES_PRI])dnl
   AC_REQUIRE([gl_LOCK])dnl
 
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM(
-       [[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }]],
-       [[]])],
+  AC_TRY_LINK(
+    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
+    [],
     [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
        [Define to 1 if the compiler understands __builtin_expect.])])
 
@@ -236,13 +235,16 @@
   dnl (because some of them were defined without being declared in Solaris
   dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
   dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>])
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL([feof_unlocked], [#include <stdio.h>])
+  gt_CHECK_DECL([fgets_unlocked], [#include <stdio.h>])
 
   AM_ICONV
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-2.7 for %define api.pure.
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
   dnl bison is only needed for the maintainer (who touches plural.y). But in
   dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
   dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -259,7 +261,7 @@
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      2.[7-9]* | [3-9].*)
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
 changequote([,])dnl
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -271,28 +273,22 @@
   fi
 ])
 
-dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
-dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
-AC_DEFUN([gt_GL_ATTRIBUTE], [
-  m4_ifndef([gl_[]COMMON],
-    AH_VERBATIM([gt_gl_attribute],
-[/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#ifndef _GL_UNUSED
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED
-# endif
-#endif
 
-/* The __pure__ attribute was added in gcc 2.96.  */
-#ifndef _GL_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _GL_ATTRIBUTE_PURE /* empty */
-# endif
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], [ac_cv_have_decl_$1],
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
 #endif
-]))])
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
diff -Nru gettext-0.19.3/gettext-runtime/m4/intlmacosx.m4 gettext-0.18.1.1/gettext-runtime/m4/intlmacosx.m4
--- gettext-0.19.3/gettext-runtime/m4/intlmacosx.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/intlmacosx.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,40 +13,35 @@
 dnl gettext package package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Checks for special options needed on Mac OS X.
+dnl Checks for special options needed on MacOS X.
 dnl Defines INTL_MACOSX_LIBS.
 AC_DEFUN([gt_INTL_MACOSX],
 [
-  dnl Check for API introduced in Mac OS X 10.2.
+  dnl Check for API introduced in MacOS X 10.2.
   AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
     [gt_cv_func_CFPreferencesCopyAppValue],
     [gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFPreferences.h>]],
-          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
        [gt_cv_func_CFPreferencesCopyAppValue=yes],
        [gt_cv_func_CFPreferencesCopyAppValue=no])
      LIBS="$gt_save_LIBS"])
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
   fi
-  dnl Check for API introduced in Mac OS X 10.3.
+  dnl Check for API introduced in MacOS X 10.3.
   AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
     [gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyCurrent();]])],
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
        [gt_cv_func_CFLocaleCopyCurrent=yes],
        [gt_cv_func_CFLocaleCopyCurrent=no])
      LIBS="$gt_save_LIBS"])
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
     AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
diff -Nru gettext-0.19.3/gettext-runtime/m4/intmax.m4 gettext-0.18.1.1/gettext-runtime/m4/intmax.m4
--- gettext-0.19.3/gettext-runtime/m4/intmax.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/intmax.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# intmax.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002-2005, 2008-2014 Free Software Foundation, Inc.
+# intmax.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 2002-2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,9 +13,7 @@
   AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
+    [AC_TRY_COMPILE([
 #include <stddef.h>
 #include <stdlib.h>
 #if HAVE_STDINT_H_WITH_UINTMAX
@@ -24,9 +22,8 @@
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-          ]],
-          [[intmax_t x = -1;
-            return !x;]])],
+],     [intmax_t x = -1;
+        return !x;],
        [gt_cv_c_intmax_t=yes],
        [gt_cv_c_intmax_t=no])])
   if test $gt_cv_c_intmax_t = yes; then
diff -Nru gettext-0.19.3/gettext-runtime/m4/inttypes_h.m4 gettext-0.18.1.1/gettext-runtime/m4/inttypes_h.m4
--- gettext-0.19.3/gettext-runtime/m4/inttypes_h.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/inttypes_h.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
+# inttypes_h.m4 serial 9
+dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,15 +12,12 @@
 AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
 [
   AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-#include <sys/types.h>
-#include <inttypes.h>
-          ]],
-          [[uintmax_t i = (uintmax_t) -1; return !i;]])],
-       [gl_cv_header_inttypes_h=yes],
-       [gl_cv_header_inttypes_h=no])])
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    [gl_cv_header_inttypes_h=yes],
+    [gl_cv_header_inttypes_h=no])])
   if test $gl_cv_header_inttypes_h = yes; then
     AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
       [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
diff -Nru gettext-0.19.3/gettext-runtime/m4/inttypes-pri.m4 gettext-0.18.1.1/gettext-runtime/m4/inttypes-pri.m4
--- gettext-0.19.3/gettext-runtime/m4/inttypes-pri.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/inttypes-pri.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,12 +1,12 @@
-# inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+# inttypes-pri.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 From Bruno Haible.
 
-AC_PREREQ([2.53])
+AC_PREREQ([2.52])
 
 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
 # macros to non-string values.  This is the case on AIX 4.3.3.
@@ -18,17 +18,11 @@
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       [gt_cv_inttypes_pri_broken],
       [
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <inttypes.h>
+        AC_TRY_COMPILE([#include <inttypes.h>
 #ifdef PRId32
 char *p = PRId32;
 #endif
-             ]],
-             [[]])],
-          [gt_cv_inttypes_pri_broken=no],
-          [gt_cv_inttypes_pri_broken=yes])
+], [], [gt_cv_inttypes_pri_broken=no], [gt_cv_inttypes_pri_broken=yes])
       ])
   fi
   if test "$gt_cv_inttypes_pri_broken" = yes; then
diff -Nru gettext-0.19.3/gettext-runtime/m4/lcmessage.m4 gettext-0.18.1.1/gettext-runtime/m4/lcmessage.m4
--- gettext-0.19.3/gettext-runtime/m4/lcmessage.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/lcmessage.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
+# lcmessage.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2010 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,
@@ -22,12 +22,8 @@
 AC_DEFUN([gt_LC_MESSAGES],
 [
   AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>]],
-          [[return LC_MESSAGES]])],
-       [gt_cv_val_LC_MESSAGES=yes],
-       [gt_cv_val_LC_MESSAGES=no])])
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       [gt_cv_val_LC_MESSAGES=yes], [gt_cv_val_LC_MESSAGES=no])])
   if test $gt_cv_val_LC_MESSAGES = yes; then
     AC_DEFINE([HAVE_LC_MESSAGES], [1],
       [Define if your <locale.h> file defines LC_MESSAGES.])
diff -Nru gettext-0.19.3/gettext-runtime/m4/lock.m4 gettext-0.18.1.1/gettext-runtime/m4/lock.m4
--- gettext-0.19.3/gettext-runtime/m4/lock.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/lock.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+# lock.m4 serial 10 (gettext-0.18)
+dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@
 [
   AC_REQUIRE([gl_THREADLIB])
   if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
+    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
     AC_CHECK_TYPE([pthread_rwlock_t],
       [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
@@ -18,25 +18,20 @@
       [],
       [#include <pthread.h>])
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM(
-        [[#include <pthread.h>]],
-        [[
-#if __FreeBSD__ == 4
+    AC_TRY_COMPILE([#include <pthread.h>],
+      [#if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
-#endif
-        ]])],
+#endif],
       [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
          [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
   fi
   gl_PREREQ_LOCK
 ])
 
-# Prerequisites of lib/glthread/lock.c.
-AC_DEFUN([gl_PREREQ_LOCK], [:])
+# Prerequisites of lib/lock.c.
+AC_DEFUN([gl_PREREQ_LOCK], [
+  AC_REQUIRE([AC_C_INLINE])
+])
diff -Nru gettext-0.19.3/gettext-runtime/m4/longlong.m4 gettext-0.18.1.1/gettext-runtime/m4/longlong.m4
--- gettext-0.19.3/gettext-runtime/m4/longlong.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/longlong.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
+# longlong.m4 serial 14
+dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,8 +7,8 @@
 dnl From Paul Eggert.
 
 # Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.61, and can be faster
-# than what's in Autoconf 2.62 through 2.68.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'long long int' exists but is only 32 bits large
 # (as on some very old compilers), HAVE_LONG_LONG_INT will not be
@@ -16,48 +16,44 @@
 
 AC_DEFUN([AC_TYPE_LONG_LONG_INT],
 [
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
   AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
-     [ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-          dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
-          dnl If cross compiling, assume the bug is not important, since
-          dnl nobody cross compiles for this platform as far as we know.
-          AC_RUN_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[@%:@include <limits.h>
-                 @%:@ifndef LLONG_MAX
-                 @%:@ define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 @%:@ define LLONG_MAX (HALF - 1 + HALF)
-                 @%:@endif]],
-               [[long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;]])],
-            [],
-            [ac_cv_type_long_long_int=no],
-            [:])
-        fi
-      fi])
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+        dnl If cross compiling, assume the bug isn't important, since
+        dnl nobody cross compiles for this platform as far as we know.
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[@%:@include <limits.h>
+               @%:@ifndef LLONG_MAX
+               @%:@ define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               @%:@ define LLONG_MAX (HALF - 1 + HALF)
+               @%:@endif]],
+             [[long long int n = 1;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;]])],
+          [ac_cv_type_long_long_int=yes],
+          [ac_cv_type_long_long_int=no],
+          [ac_cv_type_long_long_int=yes])],
+       [ac_cv_type_long_long_int=no])])
   if test $ac_cv_type_long_long_int = yes; then
     AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type 'long long int'.])
+      [Define to 1 if the system has the type `long long int'.])
   fi
 ])
 
 # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.61, and can be faster
-# than what's in Autoconf 2.62 through 2.68.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'unsigned long long int' exists but is only 32 bits
 # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
@@ -68,16 +64,13 @@
 [
   AC_CACHE_CHECK([for unsigned long long int],
     [ac_cv_type_unsigned_long_long_int],
-    [ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       AC_LINK_IFELSE(
-         [_AC_TYPE_LONG_LONG_SNIPPET],
-         [],
-         [ac_cv_type_unsigned_long_long_int=no])
-     fi])
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
   if test $ac_cv_type_unsigned_long_long_int = yes; then
     AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type 'unsigned long long int'.])
+      [Define to 1 if the system has the type `unsigned long long int'.])
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-runtime/m4/Makefile.am gettext-0.18.1.1/gettext-runtime/m4/Makefile.am
--- gettext-0.19.3/gettext-runtime/m4/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -3,8 +3,8 @@
 # Generate this list with
 # find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = README \
+ansi-c++.m4 \
 codeset.m4 \
-extern-inline.m4 \
 fcntl-o.m4 \
 gettext.m4 \
 glibc2.m4 \
diff -Nru gettext-0.19.3/gettext-runtime/m4/Makefile.in gettext-0.18.1.1/gettext-runtime/m4/Makefile.in
--- gettext-0.19.3/gettext-runtime/m4/Makefile.in	2014-10-16 06:01:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/Makefile.in	2010-06-06 20:11:38.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,54 +15,10 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,19 +34,17 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog README
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -97,17 +52,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -116,9 +67,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -129,18 +79,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -154,11 +99,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -167,13 +110,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -194,28 +138,15 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -223,7 +154,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -252,9 +182,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -286,14 +214,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -301,25 +226,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -327,8 +243,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -341,20 +255,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -377,7 +283,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -396,29 +301,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -428,11 +324,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -440,7 +332,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -448,7 +339,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -464,13 +354,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -482,54 +370,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -537,49 +392,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -588,6 +427,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -595,9 +435,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -610,8 +448,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -632,37 +472,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -683,7 +512,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -691,13 +519,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -706,47 +535,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -761,7 +556,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -780,7 +574,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -797,7 +590,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -805,7 +597,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -813,8 +604,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -822,7 +611,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -830,8 +618,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -852,7 +638,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -867,17 +652,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -889,40 +671,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -937,36 +707,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -974,12 +732,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -995,9 +750,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1018,8 +771,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1033,9 +784,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1070,9 +819,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1080,7 +829,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1094,8 +842,8 @@
 # Generate this list with
 # find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = README \
+ansi-c++.m4 \
 codeset.m4 \
-extern-inline.m4 \
 fcntl-o.m4 \
 gettext.m4 \
 glibc2.m4 \
@@ -1163,11 +911,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1214,15 +962,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1303,16 +1046,15 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru gettext-0.19.3/gettext-runtime/m4/nls.m4 gettext-0.18.1.1/gettext-runtime/m4/nls.m4
--- gettext-0.19.3/gettext-runtime/m4/nls.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/nls.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 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 -Nru gettext-0.19.3/gettext-runtime/m4/po.m4 gettext-0.18.1.1/gettext-runtime/m4/po.m4
--- gettext-0.19.3/gettext-runtime/m4/po.m4	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/po.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# po.m4 serial 22 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,20 +17,19 @@
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.60])
+AC_PREREQ([2.50])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_SED])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
@@ -103,7 +102,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -119,8 +118,7 @@
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -131,12 +129,12 @@
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -228,7 +226,7 @@
 changequote(,)dnl
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
@@ -256,7 +254,6 @@
   fi
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
   sed_x_variable='
 # Test if the hold space is empty.
 x
@@ -264,9 +261,9 @@
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+/^[	 ]*VARIABLE[	 ]*=/{
   # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  s/^[	 ]*VARIABLE[	 ]*=//
   ba
 }
 bd
@@ -318,7 +315,7 @@
     sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assignment from automake < 1.5.
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -408,15 +405,14 @@
   fi
 
   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -426,8 +422,8 @@
       frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
diff -Nru gettext-0.19.3/gettext-runtime/m4/printf-posix.m4 gettext-0.18.1.1/gettext-runtime/m4/printf-posix.m4
--- gettext-0.19.3/gettext-runtime/m4/printf-posix.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/printf-posix.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# printf-posix.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
+# printf-posix.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 2003, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,7 @@
   AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
     gt_cv_func_printf_posix,
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 /* The string "%2$d %1$d", with dollar characters protected from the shell's
@@ -26,18 +25,16 @@
 {
   sprintf (buf, format, 33, 55);
   return (strcmp (buf, "55 33") != 0);
-}]])],
-        [gt_cv_func_printf_posix=yes],
-        [gt_cv_func_printf_posix=no],
-        [
-          AC_EGREP_CPP([notposix], [
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP([notposix], [
 #if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
   notposix
 #endif
-            ],
-            [gt_cv_func_printf_posix="guessing no"],
-            [gt_cv_func_printf_posix="guessing yes"])
-        ])
+          ],
+          [gt_cv_func_printf_posix="guessing no"],
+          [gt_cv_func_printf_posix="guessing yes"])
+      ])
     ])
   case $gt_cv_func_printf_posix in
     *yes)
diff -Nru gettext-0.19.3/gettext-runtime/m4/progtest.m4 gettext-0.18.1.1/gettext-runtime/m4/progtest.m4
--- gettext-0.19.3/gettext-runtime/m4/progtest.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/progtest.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+# progtest.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -27,14 +27,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
diff -Nru gettext-0.19.3/gettext-runtime/m4/size_max.m4 gettext-0.18.1.1/gettext-runtime/m4/size_max.m4
--- gettext-0.19.3/gettext-runtime/m4/size_max.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/size_max.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc.
+# size_max.m4 serial 9
+dnl Copyright (C) 2003, 2005-2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,14 +34,10 @@
         if test $fits_in_uint = 1; then
           dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
           dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-          AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[#include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
-               ]],
-               [[]])],
-            [fits_in_uint=0])
+          AC_TRY_COMPILE([#include <stddef.h>
+            extern size_t foo;
+            extern unsigned long foo;
+            ], [], [fits_in_uint=0])
         fi
         dnl We cannot use 'expr' to simplify this expression, because 'expr'
         dnl works only with 'long' integers in the host environment, while we
diff -Nru gettext-0.19.3/gettext-runtime/m4/stdint_h.m4 gettext-0.18.1.1/gettext-runtime/m4/stdint_h.m4
--- gettext-0.19.3/gettext-runtime/m4/stdint_h.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/stdint_h.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
+# stdint_h.m4 serial 8
+dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,13 +12,12 @@
 AC_DEFUN([gl_AC_HEADER_STDINT_H],
 [
   AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>
-            #include <stdint.h>]],
-          [[uintmax_t i = (uintmax_t) -1; return !i;]])],
-       [gl_cv_header_stdint_h=yes],
-       [gl_cv_header_stdint_h=no])])
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    [gl_cv_header_stdint_h=yes],
+    [gl_cv_header_stdint_h=no])])
   if test $gl_cv_header_stdint_h = yes; then
     AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
       [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
diff -Nru gettext-0.19.3/gettext-runtime/m4/threadlib.m4 gettext-0.18.1.1/gettext-runtime/m4/threadlib.m4
--- gettext-0.19.3/gettext-runtime/m4/threadlib.m4	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/threadlib.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# threadlib.m4 serial 11 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+# threadlib.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,20 +9,15 @@
 dnl gl_THREADLIB
 dnl ------------
 dnl Tests for a multithreading library to be used.
-dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
-dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
-dnl default is 'no', otherwise it is system dependent. In both cases, the user
-dnl can change the choice through the options --enable-threads=choice or
-dnl --disable-threads.
 dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
-dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
+dnl USE_PTH_THREADS, USE_WIN32_THREADS
 dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
 dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
 dnl libtool).
 dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
 dnl programs that really need multithread functionality. The difference
 dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
-dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
+dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
 dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
 dnl multithread-safe programs.
 
@@ -49,12 +44,10 @@
     [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
     [AC_REQUIRE([AC_GNU_SOURCE])])
   dnl Check for multithreading.
-  m4_ifdef([gl_THREADLIB_DEFAULT_NO],
-    [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
-    [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
+  m4_divert_text([DEFAULTS], [gl_use_threads_default=])
   AC_ARG_ENABLE([threads],
-AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
-AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
+AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
+AC_HELP_STRING([--disable-threads], [build without multithread safety]),
     [gl_use_threads=$enableval],
     [if test -n "$gl_use_threads_default"; then
        gl_use_threads="$gl_use_threads_default"
@@ -87,7 +80,7 @@
         # groks <pthread.h>. cc also understands the flag -pthread, but
         # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
         # 2. putting a flag into CPPFLAGS that has an effect on the linker
-        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
+        # causes the AC_TRY_LINK test below to succeed unexpectedly,
         # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
         CPPFLAGS="$CPPFLAGS -D_REENTRANT"
         ;;
@@ -118,25 +111,18 @@
       [gl_cv_have_weak],
       [gl_cv_have_weak=no
        dnl First, test whether the compiler accepts it syntactically.
-       AC_LINK_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[extern void xyzzy ();
-#pragma weak xyzzy]],
-            [[xyzzy();]])],
-         [gl_cv_have_weak=maybe])
+       AC_TRY_LINK([extern void xyzzy ();
+#pragma weak xyzzy], [xyzzy();], [gl_cv_have_weak=maybe])
        if test $gl_cv_have_weak = maybe; then
          dnl Second, test whether it actually works. On Cygwin 1.7.2, with
          dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
-         AC_RUN_IFELSE(
-           [AC_LANG_SOURCE([[
+         AC_TRY_RUN([
 #include <stdio.h>
 #pragma weak fputs
 int main ()
 {
   return (fputs == NULL);
-}]])],
-           [gl_cv_have_weak=yes],
-           [gl_cv_have_weak=no],
+}], [gl_cv_have_weak=yes], [gl_cv_have_weak=no],
            [dnl When cross-compiling, assume that only ELF platforms support
             dnl weak symbols.
             AC_EGREP_CPP([Extensible Linking Format],
@@ -162,31 +148,13 @@
         # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
         # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
         # the second one only in libpthread, and lock.c needs it.
-        #
-        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
-        # needs -pthread for some reason.  See:
-        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
-        save_LIBS=$LIBS
-        for gl_pthread in '' '-pthread'; do
-          LIBS="$LIBS $gl_pthread"
-          AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[#include <pthread.h>
-                 pthread_mutex_t m;
-                 pthread_mutexattr_t ma;
-               ]],
-               [[pthread_mutex_lock (&m);
-                 pthread_mutexattr_init (&ma);]])],
-            [gl_have_pthread=yes
-             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
-             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
-          LIBS=$save_LIBS
-          test -n "$gl_have_pthread" && break
-        done
-
+        AC_TRY_LINK([#include <pthread.h>],
+          [pthread_mutex_lock((pthread_mutex_t*)0);
+           pthread_mutexattr_init((pthread_mutexattr_t*)0);],
+          [gl_have_pthread=yes])
         # Test for libpthread by looking for pthread_kill. (Not pthread_self,
         # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
+        if test -n "$gl_have_pthread"; then
           # The program links fine without libpthread. But it may actually
           # need to link with libpthread in order to create multiple threads.
           AC_CHECK_LIB([pthread], [pthread_kill],
@@ -201,7 +169,7 @@
                    [Define if the pthread_in_use() detection is hard.])
              esac
             ])
-        elif test -z "$gl_have_pthread"; then
+        else
           # Some library is needed. Try libpthread and libc_r.
           AC_CHECK_LIB([pthread], [pthread_kill],
             [gl_have_pthread=yes
@@ -235,13 +203,9 @@
         gl_have_solaristhread=
         gl_save_LIBS="$LIBS"
         LIBS="$LIBS -lthread"
-        AC_LINK_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <thread.h>
-#include <synch.h>
-             ]],
-             [[thr_self();]])],
+        AC_TRY_LINK([#include <thread.h>
+#include <synch.h>],
+          [thr_self();],
           [gl_have_solaristhread=yes])
         LIBS="$gl_save_LIBS"
         if test -n "$gl_have_solaristhread"; then
@@ -266,10 +230,8 @@
       AC_LIB_LINKFLAGS([pth])
       gl_have_pth=
       gl_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBPTH"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
-        [gl_have_pth=yes])
+      LIBS="$LIBS -lpth"
+      AC_TRY_LINK([#include <pth.h>], [pth_self();], [gl_have_pth=yes])
       LIBS="$gl_save_LIBS"
       if test -n "$gl_have_pth"; then
         gl_threads_api=pth
@@ -292,19 +254,17 @@
       fi
     fi
     if test -z "$gl_have_pthread"; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
-            AC_DEFINE([USE_WINDOWS_THREADS], [1],
-              [Define if the native Windows multithreading API can be used.])
-          fi
-          ;;
-      esac
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
+        if { case "$host_os" in
+               mingw*) true;;
+               *) false;;
+             esac
+           }; then
+          gl_threads_api=win32
+          AC_DEFINE([USE_WIN32_THREADS], [1],
+            [Define if the Win32 multithreading API can be used.])
+        fi
+      fi
     fi
   fi
   AC_MSG_CHECKING([for multithread API to use])
@@ -335,52 +295,50 @@
 
 dnl Survey of platforms:
 dnl
-dnl Platform           Available  Compiler    Supports   test-lock
-dnl                    flavours   option      weak       result
-dnl ---------------    ---------  ---------   --------   ---------
-dnl Linux 2.4/glibc    posix      -lpthread       Y      OK
-dnl
-dnl GNU Hurd/glibc     posix
+dnl Platform          Available   Compiler    Supports   test-lock
+dnl                   flavours    option      weak       result
+dnl ---------------   ---------   ---------   --------   ---------
+dnl Linux 2.4/glibc   posix       -lpthread       Y      OK
 dnl
-dnl Ubuntu 14.04       posix      -pthread        Y      OK
+dnl GNU Hurd/glibc    posix
 dnl
-dnl FreeBSD 5.3        posix      -lc_r           Y
-dnl                    posix      -lkse ?         Y
-dnl                    posix      -lpthread ?     Y
-dnl                    posix      -lthr           Y
+dnl FreeBSD 5.3       posix       -lc_r           Y
+dnl                   posix       -lkse ?         Y
+dnl                   posix       -lpthread ?     Y
+dnl                   posix       -lthr           Y
 dnl
-dnl FreeBSD 5.2        posix      -lc_r           Y
-dnl                    posix      -lkse           Y
-dnl                    posix      -lthr           Y
+dnl FreeBSD 5.2       posix       -lc_r           Y
+dnl                   posix       -lkse           Y
+dnl                   posix       -lthr           Y
 dnl
-dnl FreeBSD 4.0,4.10   posix      -lc_r           Y      OK
+dnl FreeBSD 4.0,4.10  posix       -lc_r           Y      OK
 dnl
-dnl NetBSD 1.6         --
+dnl NetBSD 1.6        --
 dnl
-dnl OpenBSD 3.4        posix      -lpthread       Y      OK
+dnl OpenBSD 3.4       posix       -lpthread       Y      OK
 dnl
-dnl Mac OS X 10.[123]  posix      -lpthread       Y      OK
+dnl MacOS X 10.[123]  posix       -lpthread       Y      OK
 dnl
-dnl Solaris 7,8,9      posix      -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
-dnl                    solaris    -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
+dnl Solaris 7,8,9     posix       -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
+dnl                   solaris     -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
 dnl
-dnl HP-UX 11           posix      -lpthread       N (cc) OK
+dnl HP-UX 11          posix       -lpthread       N (cc) OK
 dnl                                               Y (gcc)
 dnl
-dnl IRIX 6.5           posix      -lpthread       Y      0.5
+dnl IRIX 6.5          posix       -lpthread       Y      0.5
 dnl
-dnl AIX 4.3,5.1        posix      -lpthread       N      AIX 4: 0.5; AIX 5: OK
+dnl AIX 4.3,5.1       posix       -lpthread       N      AIX 4: 0.5; AIX 5: OK
 dnl
-dnl OSF/1 4.0,5.1      posix      -pthread (cc)   N      OK
+dnl OSF/1 4.0,5.1     posix       -pthread (cc)   N      OK
 dnl                               -lpthread (gcc) Y
 dnl
-dnl Cygwin             posix      -lpthread       Y      OK
+dnl Cygwin            posix       -lpthread       Y      OK
 dnl
-dnl Any of the above   pth        -lpth                  0.0
+dnl Any of the above  pth         -lpth                  0.0
 dnl
-dnl Mingw              windows                    N      OK
+dnl Mingw             win32                       N      OK
 dnl
-dnl BeOS 5             --
+dnl BeOS 5            --
 dnl
 dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
 dnl turned off:
diff -Nru gettext-0.19.3/gettext-runtime/m4/uintmax_t.m4 gettext-0.18.1.1/gettext-runtime/m4/uintmax_t.m4
--- gettext-0.19.3/gettext-runtime/m4/uintmax_t.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/uintmax_t.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 # uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-runtime/m4/visibility.m4 gettext-0.18.1.1/gettext-runtime/m4/visibility.m4
--- gettext-0.19.3/gettext-runtime/m4/visibility.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/visibility.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
+# visibility.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,7 +12,7 @@
 dnl __attribute__((__visibility__("default"))).
 dnl Does *not* test for __visibility__("protected") - which has tricky
 dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl Mac OS X.
+dnl MacOS X.
 dnl Does *not* test for __visibility__("internal") - which has processor
 dnl dependent semantics.
 dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
@@ -33,8 +33,7 @@
     AC_CACHE_VAL([gl_cv_cc_vis_werror], [
       gl_save_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS -Werror"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
+      AC_TRY_COMPILE([], [],
         [gl_cv_cc_vis_werror=yes],
         [gl_cv_cc_vis_werror=no])
       CFLAGS="$gl_save_CFLAGS"])
@@ -52,15 +51,13 @@
       if test $gl_cv_cc_vis_werror = yes; then
         CFLAGS="$CFLAGS -Werror"
       fi
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-             void dummyfunc (void) {}
-           ]],
-           [[]])],
+      AC_TRY_COMPILE(
+        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+         void dummyfunc (void) {}],
+        [],
         [gl_cv_cc_visibility=yes],
         [gl_cv_cc_visibility=no])
       CFLAGS="$gl_save_CFLAGS"])
diff -Nru gettext-0.19.3/gettext-runtime/m4/wchar_t.m4 gettext-0.18.1.1/gettext-runtime/m4/wchar_t.m4
--- gettext-0.19.3/gettext-runtime/m4/wchar_t.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/wchar_t.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc.
+# wchar_t.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,9 @@
 AC_DEFUN([gt_TYPE_WCHAR_T],
 [
   AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';]],
-          [[]])],
-       [gt_cv_c_wchar_t=yes],
-       [gt_cv_c_wchar_t=no])])
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
   if test $gt_cv_c_wchar_t = yes; then
     AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
   fi
diff -Nru gettext-0.19.3/gettext-runtime/m4/wint_t.m4 gettext-0.18.1.1/gettext-runtime/m4/wint_t.m4
--- gettext-0.19.3/gettext-runtime/m4/wint_t.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/wint_t.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+# wint_t.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,9 +11,7 @@
 AC_DEFUN([gt_TYPE_WINT_T],
 [
   AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
+    [AC_TRY_COMPILE([
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
@@ -22,10 +20,8 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-            wint_t foo = (wchar_t)'\0';]],
-          [[]])],
-       [gt_cv_c_wint_t=yes],
-       [gt_cv_c_wint_t=no])])
+       wint_t foo = (wchar_t)'\0';], ,
+       [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])])
   if test $gt_cv_c_wint_t = yes; then
     AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
   fi
diff -Nru gettext-0.19.3/gettext-runtime/m4/xsize.m4 gettext-0.18.1.1/gettext-runtime/m4/xsize.m4
--- gettext-0.19.3/gettext-runtime/m4/xsize.m4	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/m4/xsize.m4	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
-# xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc.
+# xsize.m4 serial 4
+dnl Copyright (C) 2003-2004, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,5 +8,6 @@
 [
   dnl Prerequisites of lib/xsize.h.
   AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_HEADERS([stdint.h])
 ])
diff -Nru gettext-0.19.3/gettext-runtime/Makefile.am gettext-0.18.1.1/gettext-runtime/Makefile.am
--- gettext-0.19.3/gettext-runtime/Makefile.am	2014-05-01 09:37:33.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime directory of GNU gettext
-## Copyright (C) 1995-1999, 2000-2006, 2010, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1995-1999, 2000-2006, 2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4
 
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
@@ -43,8 +44,8 @@
 
 ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi
 	rm -f $(srcdir)/ABOUT-NLS \
-	  && $(MAKEINFO) --plaintext --no-validate -I $(srcdir)/doc nls.texi \
-	     | sed -e "s/\`\([^']*\)'/‘\1’/g" > $(srcdir)/ABOUT-NLS
+	  && $(MAKEINFO) --output=$(srcdir)/ABOUT-NLS --no-header \
+	    -I $(srcdir)/doc --no-validate nls.texi
 
 
 # Allow users to use "gnulib-tool --update".
@@ -54,8 +55,3 @@
 # Woe32 support.
 
 EXTRA_DIST += README.woe32
-
-maintainer-update-po: $(top_builddir)/config.status
-	$(SHELL) ./config.status --recheck
-	$(SHELL) ./config.status po/Makefile.in po-directories
-	cd po && $(MAKE) update-po
diff -Nru gettext-0.19.3/gettext-runtime/Makefile.in gettext-0.18.1.1/gettext-runtime/Makefile.in
--- gettext-0.19.3/gettext-runtime/Makefile.in	2014-10-16 06:01:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/Makefile.in	2010-06-06 20:11:38.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,54 +16,10 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -78,35 +35,36 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/../build-aux/mkinstalldirs \
+DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../build-aux/compile \
+	$(srcdir)/../build-aux/config.guess \
+	$(srcdir)/../build-aux/config.rpath \
+	$(srcdir)/../build-aux/config.sub \
+	$(srcdir)/../build-aux/install-sh \
+	$(srcdir)/../build-aux/ltmain.sh \
+	$(srcdir)/../build-aux/missing \
+	$(srcdir)/../build-aux/mkinstalldirs $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/../build-aux/csharpcomp.sh.in \
 	$(top_srcdir)/../build-aux/javacomp.sh.in \
-	$(top_srcdir)/intl/Makefile.in ABOUT-NLS COPYING \
+	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
 	../build-aux/compile ../build-aux/config.guess \
 	../build-aux/config.rpath ../build-aux/config.sub \
-	../build-aux/install-sh ../build-aux/missing \
+	../build-aux/depcomp ../build-aux/elisp-comp \
+	../build-aux/install-sh ../build-aux/ltmain.sh \
+	../build-aux/mdate-sh ../build-aux/missing \
 	../build-aux/mkinstalldirs ../build-aux/texinfo.tex \
-	../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
-	$(top_srcdir)/../build-aux/config.guess \
-	$(top_srcdir)/../build-aux/config.rpath \
-	$(top_srcdir)/../build-aux/config.sub \
-	$(top_srcdir)/../build-aux/install-sh \
-	$(top_srcdir)/../build-aux/ltmain.sh \
-	$(top_srcdir)/../build-aux/missing
+	../build-aux/ylwrap ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -114,17 +72,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -133,9 +87,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -146,18 +99,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -171,11 +119,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -184,13 +130,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -213,35 +160,23 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = csharpcomp.sh javacomp.sh intl/Makefile
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 depcomp =
 am__depfiles_maybe =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -263,55 +198,24 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(gettextsrcdir)"
 DATA = $(gettextsrc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = doc intl intl-java intl-csharp gnulib-lib libasprintf \
 	src po man m4 tests
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -339,20 +243,15 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-pkglibexecdir = @pkglibexecdir@
-ACLOCAL = @ACLOCAL@
+ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -381,9 +280,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -415,14 +312,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -430,25 +324,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -456,8 +341,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -470,20 +353,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -506,7 +381,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -525,29 +399,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -557,11 +422,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -569,7 +430,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -577,7 +437,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -593,13 +452,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -611,54 +468,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -666,49 +490,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -717,6 +525,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -724,9 +533,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -739,8 +546,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -761,37 +570,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -812,7 +610,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -820,13 +617,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -835,47 +633,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -890,7 +654,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -909,7 +672,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -926,7 +688,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -934,7 +695,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -942,8 +702,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -951,7 +709,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -959,8 +716,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -981,7 +736,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -996,17 +750,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1018,40 +769,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1066,36 +805,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -1103,12 +830,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1124,9 +848,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1147,8 +869,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1162,9 +882,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1199,9 +917,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1209,7 +927,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1240,7 +957,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -1276,8 +993,10 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -1306,11 +1025,8 @@
 	-rm -f libtool config.lt
 install-gettextsrcDATA: $(gettextsrc_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(gettextsrcdir)" || $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)"
 	@list='$(gettextsrc_DATA)'; test -n "$(gettextsrcdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gettextsrcdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1324,28 +1040,27 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gettextsrc_DATA)'; test -n "$(gettextsrcdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(gettextsrcdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gettextsrcdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gettextsrcdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -1360,12 +1075,57 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1381,7 +1141,12 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1393,11 +1158,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1406,31 +1175,9 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -1466,10 +1213,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1498,42 +1248,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -1544,8 +1288,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1555,20 +1299,18 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    --with-included-gettext \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1591,21 +1333,13 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1639,15 +1373,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1729,12 +1458,13 @@
 
 uninstall-am: uninstall-gettextsrcDATA
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local am--refresh check check-am clean \
+	clean-generic clean-libtool ctags ctags-recursive dist \
+	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
 	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
@@ -1746,20 +1476,16 @@
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-gettextsrcDATA
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-gettextsrcDATA
 
 
 all-local: ABOUT-NLS
 
 ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi
 	rm -f $(srcdir)/ABOUT-NLS \
-	  && $(MAKEINFO) --plaintext --no-validate -I $(srcdir)/doc nls.texi \
-	     | sed -e "s/\`\([^']*\)'/‘\1’/g" > $(srcdir)/ABOUT-NLS
-
-maintainer-update-po: $(top_builddir)/config.status
-	$(SHELL) ./config.status --recheck
-	$(SHELL) ./config.status po/Makefile.in po-directories
-	cd po && $(MAKE) update-po
+	  && $(MAKEINFO) --output=$(srcdir)/ABOUT-NLS --no-header \
+	    -I $(srcdir)/doc --no-validate nls.texi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru gettext-0.19.3/gettext-runtime/man/bindtextdomain.3 gettext-0.18.1.1/gettext-runtime/man/bindtextdomain.3
--- gettext-0.19.3/gettext-runtime/man/bindtextdomain.3	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/bindtextdomain.3	2010-06-06 18:36:26.000000000 +0000
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.19.3"
+.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.18.1"
 .SH NAME
 bindtextdomain \- set directory containing message catalogs
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/bindtextdomain.3.html gettext-0.18.1.1/gettext-runtime/man/bindtextdomain.3.html
--- gettext-0.19.3/gettext-runtime/man/bindtextdomain.3.html	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/bindtextdomain.3.html	2010-06-06 18:36:27.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>BINDTEXTDOMAIN</title>
-
 </head>
 <body>
 
-<h1 align="center">BINDTEXTDOMAIN</h1>
-
+<h1 align=center>BINDTEXTDOMAIN</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,127 +17,144 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">bindtextdomain
-&minus; set directory containing message catalogs</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>bindtextdomain &minus; set directory containing message
+catalogs</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>#include
-&lt;libintl.h&gt;</b></p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>char *
-bindtextdomain (const char *</b> <i>domainname</i><b>, const
-char *</b> <i>dirname</i><b>);</b></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<pre><b>#include &lt;libintl.h&gt;
+
+char * bindtextdomain (const char *</b> <i>domainname</i><b>, const char *</b> <i>dirname</i><b>);
+</b></pre>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
 
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>bindtextdomain</b> function sets the base directory of
-the hierarchy containing message catalogs for a given
-message domain.</p>
-
-<p style="margin-left:11%; margin-top: 1em">A message
-domain is a set of translatable <i>msgid</i> messages.
-Usually, every software package has its own message domain.
-The need for calling <b>bindtextdomain</b> arises because
-packages are not always installed with the same prefix as
-the &lt;libintl.h&gt; header and the libc/libintl
-libraries.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Message
-catalogs will be expected at the pathnames
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>bindtextdomain</b> function sets the base
+directory of the hierarchy containing message catalogs for a
+given message domain.</p>
+<!-- INDENTATION -->
+<p>A message domain is a set of translatable <i>msgid</i>
+messages. Usually, every software package has its own
+message domain. The need for calling <b>bindtextdomain</b>
+arises because packages are not always installed with the
+same prefix as the &lt;libintl.h&gt; header and the
+libc/libintl libraries.</p>
+<!-- INDENTATION -->
+<p>Message catalogs will be expected at the pathnames
 <i>dirname</i>/<i>locale</i>/<i>category</i>/<i>domainname</i>.mo,
 where <i>locale</i> is a locale name and <i>category</i> is
 a locale facet such as <b>LC_MESSAGES</b>.</p>
-
-
-<p style="margin-left:11%; margin-top: 1em"><i>domainname</i>
-must be a non-empty string.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If
-<i>dirname</i> is not NULL, the base directory for message
-catalogs belonging to domain <i>domainname</i> is set to
-<i>dirname</i>. The function makes copies of the argument
-strings as needed. If the program wishes to call the
-<b>chdir</b> function, it is important that <i>dirname</i>
-be an absolute pathname; otherwise it cannot be guaranteed
-that the message catalogs will be found.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If
-<i>dirname</i> is NULL, the function returns the previously
-set base directory for domain <i>domainname</i>.</p>
-
-<h2>RETURN VALUE
+<!-- INDENTATION -->
+<p><i>domainname</i> must be a non-empty string.</p>
+<!-- INDENTATION -->
+<p>If <i>dirname</i> is not NULL, the base directory for
+message catalogs belonging to domain <i>domainname</i> is
+set to <i>dirname</i>. The function makes copies of the
+argument strings as needed. If the program wishes to call
+the <b>chdir</b> function, it is important that
+<i>dirname</i> be an absolute pathname; otherwise it cannot
+be guaranteed that the message catalogs will be found.</p>
+<!-- INDENTATION -->
+<p>If <i>dirname</i> is NULL, the function returns the
+previously set base directory for domain
+<i>domainname</i>.</p>
+</td>
+</table>
 <a name="RETURN VALUE"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">If successful,
-the <b>bindtextdomain</b> function returns the current base
-directory for domain <i>domainname</i>, after possibly
-changing it. The resulting string is valid until the next
-<b>bindtextdomain</b> call for the same <i>domainname</i>
-and must not be modified or freed. If a memory allocation
-failure occurs, it sets <b>errno</b> to <b>ENOMEM</b> and
-returns NULL.</p>
-
-<h2>ERRORS
+<h2>RETURN VALUE</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If successful, the <b>bindtextdomain</b> function returns
+the current base directory for domain <i>domainname</i>,
+after possibly changing it. The resulting string is valid
+until the next <b>bindtextdomain</b> call for the same
+<i>domainname</i> and must not be modified or freed. If a
+memory allocation failure occurs, it sets <b>errno</b> to
+<b>ENOMEM</b> and returns NULL.</p>
+</td>
+</table>
 <a name="ERRORS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The following
-error can occur, among others:</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>ERRORS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The following error can occur, among others:</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
-
-<p><b>ENOMEM</b></p></td>
-<td width="2%"></td>
-<td width="43%">
-
+<td width="8%">
 
-<p>Not enough memory available.</p></td>
-<td width="35%">
-</td></tr>
+<p><b>ENOMEM</b></p>
+</td>
+<td width="13%"></td>
+<td width="41%">
+
+<p>Not enough memory available.</p>
+</td>
+<td width="24%">
+</td>
 </table>
-
-<h2>BUGS
 <a name="BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The return type
-ought to be <b>const char *</b>, but is <b>char *</b> to
-avoid warnings in C code predating ANSI C.</p>
-
-<h2>SEE ALSO
+<h2>BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The return type ought to be <b>const char *</b>, but is
+<b>char *</b> to avoid warnings in C code predating ANSI
+C.</p>
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>gettext</b>(3),
-<b>dgettext</b>(3), <b>dcgettext</b>(3), <b>ngettext</b>(3),
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>gettext</b>(3), <b>dgettext</b>(3),
+<b>dcgettext</b>(3), <b>ngettext</b>(3),
 <b>dngettext</b>(3), <b>dcngettext</b>(3),
 <b>textdomain</b>(3), <b>realpath</b>(3)</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/bind_textdomain_codeset.3 gettext-0.18.1.1/gettext-runtime/man/bind_textdomain_codeset.3
--- gettext-0.19.3/gettext-runtime/man/bind_textdomain_codeset.3	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/bind_textdomain_codeset.3	2010-06-06 18:36:26.000000000 +0000
@@ -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.3"
+.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.18.1"
 .SH NAME
 bind_textdomain_codeset \- set encoding of message translations
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/bind_textdomain_codeset.3.html gettext-0.18.1.1/gettext-runtime/man/bind_textdomain_codeset.3.html
--- gettext-0.19.3/gettext-runtime/man/bind_textdomain_codeset.3.html	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/bind_textdomain_codeset.3.html	2010-06-06 18:36:27.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>BIND_TEXTDOMAIN_CODESET</title>
-
 </head>
 <body>
 
-<h1 align="center">BIND_TEXTDOMAIN_CODESET</h1>
-
+<h1 align=center>BIND_TEXTDOMAIN_CODESET</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,131 +17,149 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em">bind_textdomain_codeset
-&minus; set encoding of message translations</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>bind_textdomain_codeset &minus; set encoding of message
+translations</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>#include
-&lt;libintl.h&gt;</b></p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>char *
-bind_textdomain_codeset (const char *</b>
-<i>domainname</i><b>, <br>
-const char *</b> <i>codeset</i><b>);</b></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<pre><b>#include &lt;libintl.h&gt;
+
+char * bind_textdomain_codeset (const char *</b> <i>domainname</i><b>,
+                                const char *</b> <i>codeset</i><b>);
+</b></pre>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
 
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>bind_textdomain_codeset</b> function sets the output
-codeset for message catalogs for domain
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>bind_textdomain_codeset</b> function sets the
+output codeset for message catalogs for domain
 <i>domainname</i>.</p>
-
-<p style="margin-left:11%; margin-top: 1em">A message
-domain is a set of translatable <i>msgid</i> messages.
-Usually, every software package has its own message
-domain.</p>
-
-<p style="margin-left:11%; margin-top: 1em">By default, the
-<b>gettext</b> family of functions returns translated
-messages in the locale&rsquo;s character encoding, which can
-be retrieved as <b>nl_langinfo(CODESET)</b>. The need for
-calling <b>bind_textdomain_codeset</b> arises for programs
-which store strings in a locale independent way (e.g. UTF-8)
-and want to avoid an extra character set conversion on the
+<!-- INDENTATION -->
+<p>A message domain is a set of translatable <i>msgid</i>
+messages. Usually, every software package has its own
+message domain.</p>
+<!-- INDENTATION -->
+<p>By default, the <b>gettext</b> family of functions
+returns translated messages in the locale&rsquo;s character
+encoding, which can be retrieved as
+<b>nl_langinfo(CODESET)</b>. The need for calling
+<b>bind_textdomain_codeset</b> arises for programs which
+store strings in a locale independent way (e.g. UTF-8) and
+want to avoid an extra character set conversion on the
 returned translated messages.</p>
-
-
-<p style="margin-left:11%; margin-top: 1em"><i>domainname</i>
-must be a non-empty string.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If
-<i>codeset</i> is not NULL, it must be a valid encoding name
-which can be used for the <b>iconv_open</b> function. The
-<b>bind_textdomain_codeset</b> function sets the output
-codeset for message catalogs belonging to domain
+<!-- INDENTATION -->
+<p><i>domainname</i> must be a non-empty string.</p>
+<!-- INDENTATION -->
+<p>If <i>codeset</i> is not NULL, it must be a valid
+encoding name which can be used for the <b>iconv_open</b>
+function. The <b>bind_textdomain_codeset</b> function sets
+the output codeset for message catalogs belonging to domain
 <i>domainname</i> to <i>codeset</i>. The function makes
 copies of the argument strings as needed.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If
-<i>codeset</i> is NULL, the function returns the previously
-set codeset for domain <i>domainname</i>. The default is
-NULL, denoting the locale&rsquo;s character encoding.</p>
-
-<h2>RETURN VALUE
+<!-- INDENTATION -->
+<p>If <i>codeset</i> is NULL, the function returns the
+previously set codeset for domain <i>domainname</i>. The
+default is NULL, denoting the locale&rsquo;s character
+encoding.</p>
+</td>
+</table>
 <a name="RETURN VALUE"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">If successful,
-the <b>bind_textdomain_codeset</b> function returns the
-current codeset for domain <i>domainname</i>, after possibly
-changing it. The resulting string is valid until the next
+<h2>RETURN VALUE</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If successful, the <b>bind_textdomain_codeset</b>
+function returns the current codeset for domain
+<i>domainname</i>, after possibly changing it. The resulting
+string is valid until the next
 <b>bind_textdomain_codeset</b> call for the same
 <i>domainname</i> and must not be modified or freed. If a
 memory allocation failure occurs, it sets <b>errno</b> to
 <b>ENOMEM</b> and returns NULL. If no codeset has been set
 for domain <i>domainname</i>, it returns NULL.</p>
-
-<h2>ERRORS
+</td>
+</table>
 <a name="ERRORS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The following
-error can occur, among others:</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>ERRORS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The following error can occur, among others:</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
-
-<p><b>ENOMEM</b></p></td>
-<td width="2%"></td>
-<td width="43%">
+<td width="8%">
 
-
-<p>Not enough memory available.</p></td>
-<td width="35%">
-</td></tr>
+<p><b>ENOMEM</b></p>
+</td>
+<td width="13%"></td>
+<td width="41%">
+
+<p>Not enough memory available.</p>
+</td>
+<td width="24%">
+</td>
 </table>
-
-<h2>BUGS
 <a name="BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The return type
-ought to be <b>const char *</b>, but is <b>char *</b> to
-avoid warnings in C code predating ANSI C.</p>
-
-<h2>SEE ALSO
+<h2>BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The return type ought to be <b>const char *</b>, but is
+<b>char *</b> to avoid warnings in C code predating ANSI
+C.</p>
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>gettext</b>(3),
-<b>dgettext</b>(3), <b>dcgettext</b>(3), <b>ngettext</b>(3),
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>gettext</b>(3), <b>dgettext</b>(3),
+<b>dcgettext</b>(3), <b>ngettext</b>(3),
 <b>dngettext</b>(3), <b>dcngettext</b>(3),
 <b>textdomain</b>(3), <b>nl_langinfo</b>(3),
 <b>iconv_open</b>(3)</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/ChangeLog gettext-0.18.1.1/gettext-runtime/man/ChangeLog
--- gettext-0.19.3/gettext-runtime/man/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,61 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-06-01  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): Add $(man_HTML3) so not to regenerate
-	them on make distcheck.
-
-2014-05-19  Daiki Ueno  <ueno@gnu.org>
-
-	build: Simplify man and HTML documentation generation
-	Problem reported by Santiago Vila in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00024.html>.
-	* Makefile.am (man_HTML1GEN): Rename from man_HTMLGEN.
-	(man_HTML1IN): Rename from man_HTMLIN.
-	(man_HTML1OTHER): Rename from man_HTMLOTHER.
-	(man_HTML1): New variable.
-	(man_HTML3): New variable split from man_HTMLOTHER.
-	(gt_man2html): New variable; don't overwrite output if groff fails.
-	($(man_HTML1GEN)): Don't overwrite output if sed fails.
-	($(man_HTML1IN)): Rewrite using $(gt_man2html).
-	($(man_HTML1OTHER)): Rewrite using $(gt_man2html).
-	($(man_HTML3)): Rewrite using $(gt_man2html).
-
-2014-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (gettext.1 ngettext.1): Don't try to replace
-	@localedir@ in .1.in if x-to-1 fails; rewrite the target using the
-	snippet in the Autoconf manual.
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	build: Use git-version-gen intead of version.sh
-	* Makefile.am: Refer to .version instead of version.sh.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/man/envsubst.1 gettext-0.18.1.1/gettext-runtime/man/envsubst.1
--- gettext-0.19.3/gettext-runtime/man/envsubst.1	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/envsubst.1	2010-06-06 18:36:26.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH ENVSUBST "1" "October 2014" "GNU gettext-runtime 0.19.3" GNU
+.TH ENVSUBST "1" "June 2010" "GNU gettext-runtime 0.18.1" GNU
 .SH NAME
 envsubst \- substitutes environment variables in shell format strings
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/envsubst.1.html gettext-0.18.1.1/gettext-runtime/man/envsubst.1.html
--- gettext-0.19.3/gettext-runtime/man/envsubst.1.html	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/envsubst.1.html	2010-06-06 18:36:27.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>ENVSUBST</title>
-
 </head>
 <body>
 
-<h1 align="center">ENVSUBST</h1>
-
+<h1 align=center>ENVSUBST</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,112 +17,197 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">envsubst
-&minus; substitutes environment variables in shell format
-strings</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>envsubst &minus; substitutes environment variables in
+shell format strings</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>envsubst</b>
-[<i>OPTION</i>] [<i>SHELL-FORMAT</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>envsubst</b> [<i>OPTION</i>] [<i>SHELL-FORMAT</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Substitutes the
-values of environment variables.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-mode: <br>
-&minus;v</b>, <b>&minus;&minus;variables</b></p>
-
-<p style="margin-left:22%;">output the variables occurring
-in SHELL-FORMAT</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<p style="margin-left:11%; margin-top: 1em">In normal
-operation mode, standard input is copied to standard output,
-with references to environment variables of the form
-$VARIABLE or ${VARIABLE} being replaced with the
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Substitutes the values of environment variables.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;v</b>, <b>&minus;&minus;variables</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output the variables occurring in SHELL-FORMAT</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>In normal operation mode, standard input is copied to
+standard output, with references to environment variables of
+the form $VARIABLE or ${VARIABLE} being replaced with the
 corresponding values. If a SHELL-FORMAT is given, only those
 environment variables that are referenced in SHELL-FORMAT
 are substituted; otherwise all environment variables
 references occurring in standard input are substituted.</p>
-
-<p style="margin-left:11%; margin-top: 1em">When
-<b>&minus;&minus;variables</b> is used, standard input is
-ignored, and the output consists of the environment
+<!-- INDENTATION -->
+<p>When <b>&minus;&minus;variables</b> is used, standard
+input is ignored, and the output consists of the environment
 variables that are referenced in SHELL-FORMAT, one per
 line.</p>
-
-<h2>AUTHOR
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2003-2007 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2003-2007 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>envsubst</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>envsubst</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-envsubst</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>envsubst</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>envsubst</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info envsubst</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/gettext.1.html.in gettext-0.18.1.1/gettext-runtime/man/gettext.1.html.in
--- gettext-0.19.3/gettext-runtime/man/gettext.1.html.in	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/gettext.1.html.in	2010-06-06 18:36:26.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>GETTEXT</title>
-
 </head>
 <body>
 
-<h1 align="center">GETTEXT</h1>
-
+<h1 align=center>GETTEXT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,161 +17,250 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">gettext &minus;
-translate message</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>gettext &minus; translate message</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>gettext</b>
-[<i>OPTION</i>] [[<i>TEXTDOMAIN</i>] <i>MSGID</i>] <b><br>
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>gettext</b> [<i>OPTION</i>] [[<i>TEXTDOMAIN</i>]
+<i>MSGID</i>]<b><br>
 gettext</b> [<i>OPTION</i>] <i>-s</i> [<i>MSGID</i>]...</p>
-
-<h2>DESCRIPTION
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>gettext</b> program translates a natural language message
-into the user&rsquo;s language, by looking up the
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>gettext</b> program translates a natural language
+message into the user&rsquo;s language, by looking up the
 translation in a message catalog.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Display native
-language translation of a textual message. <b><br>
-&minus;d</b>,
-<b>&minus;&minus;domain</b>=<i>TEXTDOMAIN</i></p>
-
-<p style="margin-left:22%;">retrieve translated messages
-from TEXTDOMAIN</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<!-- INDENTATION -->
+<p>Display native language translation of a textual
+message.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b>,
+<b>&minus;&minus;domain</b>=<i>TEXTDOMAIN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>retrieve translated messages from TEXTDOMAIN</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="3%">
-
+<td width="2%">
 
-<p><b>&minus;e</b></p></td>
-<td width="8%"></td>
-<td width="63%">
-
-
-<p>enable expansion of some escape sequences</p></td>
-<td width="15%">
-</td></tr>
+<p><b>&minus;e</b></p>
+</td>
+<td width="13%"></td>
+<td width="60%">
+
+<p>enable expansion of some escape sequences</p>
+</td>
+<td width="11%">
+</td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="3%">
-
-
-<p><b>&minus;E</b></p></td>
-<td width="8%"></td>
-<td width="63%">
-
+<td width="2%">
 
-<p>(ignored for compatibility)</p></td>
-<td width="15%">
-</td></tr>
+<p><b>&minus;E</b></p>
+</td>
+<td width="13%"></td>
+<td width="60%">
+
+<p>(ignored for compatibility)</p>
+</td>
+<td width="11%">
+</td>
 </table>
-
-<p style="margin-left:11%;"><b>&minus;h</b>,
-<b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="3%">
-
-
-<p><b>&minus;n</b></p></td>
-<td width="8%"></td>
-<td width="38%">
-
+<td width="2%">
 
-<p>suppress trailing newline</p></td>
-<td width="40%">
-</td></tr>
+<p><b>&minus;n</b></p>
+</td>
+<td width="13%"></td>
+<td width="36%">
+
+<p>suppress trailing newline</p>
+</td>
+<td width="35%">
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>[TEXTDOMAIN] MSGID</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>retrieve translated message corresponding to MSGID from
+TEXTDOMAIN</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If the TEXTDOMAIN parameter is not given, the domain is
+determined from the environment variable TEXTDOMAIN. If the
+message catalog is not found in the regular directory,
+another location can be specified with the environment
+variable TEXTDOMAINDIR. When used with the <b>&minus;s</b>
+option the program behaves like the &lsquo;echo&rsquo;
+command. But it does not simply copy its arguments to
+stdout. Instead those messages found in the selected catalog
+are translated. Standard search directory: @localedir@</p>
+</td>
 </table>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">display version information and
-exit</p>
-
-<p style="margin-left:11%;">[TEXTDOMAIN] MSGID</p>
-
-<p style="margin-left:22%;">retrieve translated message
-corresponding to MSGID from TEXTDOMAIN</p>
-
-<p style="margin-left:11%; margin-top: 1em">If the
-TEXTDOMAIN parameter is not given, the domain is determined
-from the environment variable TEXTDOMAIN. If the message
-catalog is not found in the regular directory, another
-location can be specified with the environment variable
-TEXTDOMAINDIR. When used with the <b>&minus;s</b> option the
-program behaves like the &rsquo;echo&rsquo; command. But it
-does not simply copy its arguments to stdout. Instead those
-messages found in the selected catalog are translated.
-Standard search directory: @localedir@</p>
-
-<h2>AUTHOR
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Ulrich Drepper.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Ulrich Drepper.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1997, 2000-2007 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1997, 2000-2007 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>gettext</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>gettext</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-gettext</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>gettext</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>gettext</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info gettext</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/gettext.1.in gettext-0.18.1.1/gettext-runtime/man/gettext.1.in
--- gettext-0.19.3/gettext-runtime/man/gettext.1.in	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/gettext.1.in	2010-06-06 18:36:26.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXT "1" "October 2014" "GNU gettext-runtime 0.19.3" GNU
+.TH GETTEXT "1" "June 2010" "GNU gettext-runtime 0.18.1" GNU
 .SH NAME
 gettext \- translate message
 .SH SYNOPSIS
@@ -41,7 +41,7 @@
 environment variable TEXTDOMAIN.  If the message catalog is not found in the
 regular directory, another location can be specified with the environment
 variable TEXTDOMAINDIR.
-When used with the \fB\-s\fR option the program behaves like the 'echo' command.
+When used with the \fB\-s\fR option the program behaves like the `echo' command.
 But it does not simply copy its arguments to stdout.  Instead those messages
 found in the selected catalog are translated.
 Standard search directory: @localedir@
diff -Nru gettext-0.19.3/gettext-runtime/man/gettext.3 gettext-0.18.1.1/gettext-runtime/man/gettext.3
--- gettext-0.19.3/gettext-runtime/man/gettext.3	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/gettext.3	2010-06-06 18:36:26.000000000 +0000
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH GETTEXT 3 "May 2001" "GNU gettext 0.19.3"
+.TH GETTEXT 3 "May 2001" "GNU gettext 0.18.1"
 .SH NAME
 gettext, dgettext, dcgettext \- translate message
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/gettext.3.html gettext-0.18.1.1/gettext-runtime/man/gettext.3.html
--- gettext-0.19.3/gettext-runtime/man/gettext.3.html	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/gettext.3.html	2010-06-06 18:36:27.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>GETTEXT</title>
-
 </head>
 <body>
 
-<h1 align="center">GETTEXT</h1>
-
+<h1 align=center>GETTEXT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,72 +17,75 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">gettext,
-dgettext, dcgettext &minus; translate message</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>gettext, dgettext, dcgettext &minus; translate
+message</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>#include
-&lt;libintl.h&gt;</b></p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>char *
-gettext (const char *</b> <i>msgid</i><b>); <br>
-char * dgettext (const char *</b> <i>domainname</i><b>,
-const char *</b> <i>msgid</i><b>); <br>
-char * dcgettext (const char *</b> <i>domainname</i><b>,
-const char *</b> <i>msgid</i><b>, <br>
-int</b> <i>category</i><b>);</b></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<pre><b>#include &lt;libintl.h&gt;
+
+char * gettext (const char *</b> <i>msgid</i><b>);
+char * dgettext (const char *</b> <i>domainname</i><b>, const char *</b> <i>msgid</i><b>);
+char * dcgettext (const char *</b> <i>domainname</i><b>, const char *</b> <i>msgid</i><b>,
+                  int</b> <i>category</i><b>);
+</b></pre>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
 
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>gettext</b>, <b>dgettext</b> and <b>dcgettext</b>
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>gettext</b>, <b>dgettext</b> and <b>dcgettext</b>
 functions attempt to translate a text string into the
 user&rsquo;s native language, by looking up the translation
 in a message catalog.</p>
-
-<p style="margin-left:11%; margin-top: 1em">The
-<i>msgid</i> argument identifies the message to be
+<!-- INDENTATION -->
+<p>The <i>msgid</i> argument identifies the message to be
 translated. By convention, it is the English version of the
 message, with non-ASCII characters replaced by ASCII
 approximations. This choice allows the translators to work
 with message catalogs, called PO files, that contain both
 the English and the translated versions of each message, and
 can be installed using the <b>msgfmt</b> utility.</p>
-
-<p style="margin-left:11%; margin-top: 1em">A message
-domain is a set of translatable <i>msgid</i> messages.
-Usually, every software package has its own message domain.
-The domain name is used to determine the message catalog
-where the translation is looked up; it must be a non-empty
-string. For the <b>gettext</b> function, it is specified
-through a preceding <b>textdomain</b> call. For the
-<b>dgettext</b> and <b>dcgettext</b> functions, it is passed
-as the <i>domainname</i> argument; if this argument is NULL,
-the domain name specified through a preceding
+<!-- INDENTATION -->
+<p>A message domain is a set of translatable <i>msgid</i>
+messages. Usually, every software package has its own
+message domain. The domain name is used to determine the
+message catalog where the translation is looked up; it must
+be a non-empty string. For the <b>gettext</b> function, it
+is specified through a preceding <b>textdomain</b> call. For
+the <b>dgettext</b> and <b>dcgettext</b> functions, it is
+passed as the <i>domainname</i> argument; if this argument
+is NULL, the domain name specified through a preceding
 <b>textdomain</b> call is used instead.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Translation
-lookup operates in the context of the current locale. For
-the <b>gettext</b> and <b>dgettext</b> functions, the
-<b>LC_MESSAGES</b> locale facet is used. It is determined by
-a preceding call to the <b>setlocale</b> function.
-<b>setlocale(LC_ALL,&quot;&quot;)</b> initializes the
-<b>LC_MESSAGES</b> locale based on the first nonempty value
-of the three environment variables <b>LC_ALL</b>,
+<!-- INDENTATION -->
+<p>Translation lookup operates in the context of the current
+locale. For the <b>gettext</b> and <b>dgettext</b>
+functions, the <b>LC_MESSAGES</b> locale facet is used. It
+is determined by a preceding call to the <b>setlocale</b>
+function. <b>setlocale(LC_ALL,&quot;&quot;)</b> initializes
+the <b>LC_MESSAGES</b> locale based on the first nonempty
+value of the three environment variables <b>LC_ALL</b>,
 <b>LC_MESSAGES</b>, <b>LANG</b>; see <b>setlocale</b>(3).
 For the <b>dcgettext</b> function, the locale facet is
 determined by the <i>category</i> argument, which should be
@@ -104,9 +96,9 @@
 translator&rsquo;s codeset to the current locale&rsquo;s
 codeset, unless overridden by a prior call to the
 <b>bind_textdomain_codeset</b> function.</p>
-
-<p style="margin-left:11%; margin-top: 1em">The message
-catalog used by the functions is at the pathname
+<!-- INDENTATION -->
+<p>The message catalog used by the functions is at the
+pathname
 <i>dirname</i>/<i>locale</i>/<i>category</i>/<i>domainname</i>.mo.
 Here <i>dirname</i> is the directory specified through
 <b>bindtextdomain</b>. Its default is system and
@@ -119,64 +111,76 @@
 <b>LC_MESSAGES</b> for the <b>gettext</b> and
 <b>dgettext</b> functions, or the argument passed to the
 <b>dcgettext</b> function.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If the
-<b>LANGUAGE</b> environment variable is set to a nonempty
-value, and the locale is not the &quot;C&quot; locale, the
-value of <b>LANGUAGE</b> is assumed to contain a colon
-separated list of locale names. The functions will attempt
-to look up a translation of <i>msgid</i> in each of the
-locales in turn. This is a GNU extension.</p>
-
-<p style="margin-left:11%; margin-top: 1em">In the
-&quot;C&quot; locale, or if none of the used catalogs
-contain a translation for <i>msgid</i>, the <b>gettext</b>,
-<b>dgettext</b> and <b>dcgettext</b> functions return
-<i>msgid</i>.</p>
-
-<h2>RETURN VALUE
+<!-- INDENTATION -->
+<p>If the <b>LANGUAGE</b> environment variable is set to a
+nonempty value, and the locale is not the &quot;C&quot;
+locale, the value of <b>LANGUAGE</b> is assumed to contain a
+colon separated list of locale names. The functions will
+attempt to look up a translation of <i>msgid</i> in each of
+the locales in turn. This is a GNU extension.</p>
+<!-- INDENTATION -->
+<p>In the &quot;C&quot; locale, or if none of the used
+catalogs contain a translation for <i>msgid</i>, the
+<b>gettext</b>, <b>dgettext</b> and <b>dcgettext</b>
+functions return <i>msgid</i>.</p>
+</td>
+</table>
 <a name="RETURN VALUE"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">If a
-translation was found in one of the specified catalogs, it
-is converted to the locale&rsquo;s codeset and returned. The
-resulting string is statically allocated and must not be
-modified or freed. Otherwise <i>msgid</i> is returned.</p>
-
-<h2>ERRORS
+<h2>RETURN VALUE</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If a translation was found in one of the specified
+catalogs, it is converted to the locale&rsquo;s codeset and
+returned. The resulting string is statically allocated and
+must not be modified or freed. Otherwise <i>msgid</i> is
+returned.</p>
+</td>
+</table>
 <a name="ERRORS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>errno</b> is
-not modified.</p>
-
-<h2>BUGS
+<h2>ERRORS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>errno</b> is not modified.</p>
+</td>
+</table>
 <a name="BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The return type
-ought to be <b>const char *</b>, but is <b>char *</b> to
-avoid warnings in C code predating ANSI C.</p>
-
-<p style="margin-left:11%; margin-top: 1em">When an empty
-string is used for <i>msgid</i>, the functions may return a
-nonempty string.</p>
-
-<h2>SEE ALSO
+<h2>BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The return type ought to be <b>const char *</b>, but is
+<b>char *</b> to avoid warnings in C code predating ANSI
+C.</p>
+<!-- INDENTATION -->
+<p>When an empty string is used for <i>msgid</i>, the
+functions may return a nonempty string.</p>
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>ngettext</b>(3),
-<b>dngettext</b>(3), <b>dcngettext</b>(3),
-<b>setlocale</b>(3), <b>textdomain</b>(3),
-<b>bindtextdomain</b>(3), <b>bind_textdomain_codeset</b>(3),
-<b>msgfmt</b>(1)</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>ngettext</b>(3), <b>dngettext</b>(3),
+<b>dcngettext</b>(3), <b>setlocale</b>(3),
+<b>textdomain</b>(3), <b>bindtextdomain</b>(3),
+<b>bind_textdomain_codeset</b>(3), <b>msgfmt</b>(1)</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/Makefile.am gettext-0.18.1.1/gettext-runtime/man/Makefile.am
--- gettext-0.19.3/gettext-runtime/man/Makefile.am	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -39,20 +39,17 @@
 man_MANS = $(man_MAN1)
 notrans_man_MANS = $(man_MAN3) $(man_MAN3LINK)
 
-man_HTML1GEN = gettext.1.html ngettext.1.html
-man_HTML1IN = gettext.1.html.in ngettext.1.html.in
-man_HTML1OTHER = envsubst.1.html
-man_HTML1 = $(man_HTML1GEN) $(man_HTML1OTHER)
-man_HTML3 = gettext.3.html ngettext.3.html \
+man_HTMLGEN = gettext.1.html ngettext.1.html
+man_HTMLIN = gettext.1.html.in ngettext.1.html.in
+man_HTMLOTHER = \
+envsubst.1.html \
+gettext.3.html ngettext.3.html \
 textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
-man_HTML = $(man_HTML1) $(man_HTML3)
+man_HTML = $(man_HTMLGEN) $(man_HTMLOTHER)
 
-EXTRA_DIST += help2man $(man_aux) $(man_MAN1IN) $(man_MAN1OTHER) \
-$(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) \
-$(man_HTML1IN) $(man_HTML1OTHER) $(man_HTML3)
-CLEANFILES = $(man_MAN1GEN) $(man_HTML1GEN)
-MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) \
-$(man_HTML1IN) $(man_HTML1OTHER) $(man_HTML3)
+EXTRA_DIST += help2man $(man_aux) $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) $(man_HTMLIN) $(man_HTMLOTHER)
+CLEANFILES = $(man_MAN1GEN) $(man_HTMLGEN)
+MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) $(man_HTMLIN) $(man_HTMLOTHER)
 
 PERL = @PERL@
 RM = rm -f
@@ -63,17 +60,6 @@
 # groff 1.17 or newer.
 MAN2HTML = groff -mandoc -Thtml
 
-UPDATEMODE =
-
-
-gt_man2html = \
-	if test -f $${srcdir}$$m; then \
-	  $(MAN2HTML) $${srcdir}$$m > t-$@ && \
-	  sed -e '/CreationDate:/d' < t-$@ > t2-$@ && \
-	  mv t2-$@ $@; \
-	  rm -f t-$@ t2-$@; \
-	fi
-
 
 # We distribute both the man pages and their HTML equivalent.
 # The user can generate the parts, via
@@ -89,97 +75,99 @@
 # Man pages.
 
 # The progname.x files contain some extra information not found in the
-# "progname --help" output.  Each progname.1 depends on the source,
-# not the binary; we don't need to regenerate the binary when any
-# source file changes, only the main one.
-
-$(man_MAN1GEN): Makefile
-	srcdir=''; \
-	test -f ./$@.in || srcdir=$(srcdir)/; \
-	if test -f $${srcdir}$@.in; then \
-	  sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@ && \
-	  mv t-$@ $@; \
-        fi
-
-gettext.1: gettext.1.in
-ngettext.1: ngettext.1.in
-
-$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
-	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
-	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
-	  ../src/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
-
-gettext.1.in: gettext.x ../src/gettext.c
-ngettext.1.in: ngettext.x ../src/ngettext.c
-envsubst.1: envsubst.x ../src/envsubst.c
-
-$(man_MAN3): $(top_srcdir)/../.version
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/$@.in > t-$@ && \
-	mv t-$@ $@
-
-gettext.3: gettext.3.in
-ngettext.3: ngettext.3.in
-textdomain.3: textdomain.3.in
-bindtextdomain.3: bindtextdomain.3.in
-bind_textdomain_codeset.3: bind_textdomain_codeset.3.in
+# "progname --help" output.
+
+gettext.1: gettext.1.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f gettext.1.in; then echo .; else echo $(srcdir); fi`/gettext.1.in > t-$@
+	mv t-$@ $@
+ngettext.1: ngettext.1.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f ngettext.1.in; then echo .; else echo $(srcdir); fi`/ngettext.1.in > t-$@
+	mv t-$@ $@
+
+gettext.1.in: gettext.x
+	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/gettext$(EXEEXT) $(srcdir)/gettext.x gettext.1.in
+ngettext.1.in: ngettext.x
+	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/ngettext$(EXEEXT) $(srcdir)/ngettext.x ngettext.1.in
+
+envsubst.1: envsubst.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1
+
+# Depend on version.sh to get version number changes.
+$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../version.sh
+
+# Update them also during "make dist", in order to propagate added command
+# line options that were added, even if version.sh didn't change.
+UPDATEMODE =
+update-man1:
+	$(MAKE) $(man_MAN1IN) $(man_MAN1OTHER) UPDATEMODE=--update
+	$(MAKE)
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: update-man1
+
+gettext.3: gettext.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
+	mv t-$@ $@
+ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
+	mv t-$@ $@
+textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
+	mv t-$@ $@
+bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
+	mv t-$@ $@
+bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
+	mv t-$@ $@
 
 
 # Man pages in HTML format.
 
 html-local: $(man_HTML)
 
-$(man_HTML1GEN): Makefile
-	srcdir=''; \
-	test -f ./$@.in || srcdir=$(srcdir)/; \
-	if test -f $${srcdir}$@.in; then \
-	  sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@ && \
-	  mv t-$@ $@; \
-        fi
-
-gettext.1.html: gettext.1.html.in
-ngettext.1.html: ngettext.1.html.in
-
-$(man_HTML1IN):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.1\.html\.in$$//'`; \
-	m=$${progname}.1.in; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
+gettext.1.html: gettext.1.html.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f gettext.1.html.in; then echo .; else echo $(srcdir); fi`/gettext.1.html.in > t-$@
+	mv t-$@ $@
+ngettext.1.html: ngettext.1.html.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f ngettext.1.html.in; then echo .; else echo $(srcdir); fi`/ngettext.1.html.in > t-$@
+	mv t-$@ $@
 
 gettext.1.html.in: gettext.1.in
+	$(MAN2HTML) `if test -f gettext.1.in; then echo .; else echo $(srcdir); fi`/gettext.1.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 ngettext.1.html.in: ngettext.1.in
-
-$(man_HTML1OTHER):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.1\.html$$//'`; \
-	m=$${progname}.1; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
+	$(MAN2HTML) `if test -f ngettext.1.in; then echo .; else echo $(srcdir); fi`/ngettext.1.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 envsubst.1.html: envsubst.1
-
-$(man_HTML3):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.3\.html$$//'`; \
-	m=$${progname}.3.in; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
+	$(MAN2HTML) `if test -f envsubst.1; then echo .; else echo $(srcdir); fi`/envsubst.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 gettext.3.html: gettext.3.in
+	$(MAN2HTML) $(srcdir)/gettext.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 ngettext.3.html: ngettext.3.in
+	$(MAN2HTML) $(srcdir)/ngettext.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 textdomain.3.html: textdomain.3.in
+	$(MAN2HTML) $(srcdir)/textdomain.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 bindtextdomain.3.html: bindtextdomain.3.in
+	$(MAN2HTML) $(srcdir)/bindtextdomain.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
+	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 install-html-local:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	for file in $(man_HTML); do \
 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
 	done
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html:
 	for file in $(man_HTML); do \
diff -Nru gettext-0.19.3/gettext-runtime/man/Makefile.in gettext-0.18.1.1/gettext-runtime/man/Makefile.in
--- gettext-0.19.3/gettext-runtime/man/Makefile.in	2014-10-16 06:01:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/Makefile.in	2010-06-06 20:11:38.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,54 +15,10 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,20 +34,17 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = man
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs $(srcdir)/x-to-1.in \
-	ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/x-to-1.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -98,17 +52,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -117,9 +67,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -130,18 +79,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -155,11 +99,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -168,13 +110,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -195,25 +138,14 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = x-to-1
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -235,20 +167,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)"
 man3dir = $(mandir)/man3
 NROFF = nroff
 MANS = $(man_MANS) $(notrans_man_MANS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -256,7 +180,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -285,9 +208,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -319,14 +240,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -334,25 +252,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -360,8 +269,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -374,20 +281,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -410,7 +309,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -429,29 +327,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -461,11 +350,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -473,7 +358,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -481,7 +365,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -497,13 +380,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -515,54 +396,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -570,49 +418,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -621,6 +453,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -628,9 +461,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -643,8 +474,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -665,37 +498,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -716,7 +538,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -724,13 +545,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -739,47 +561,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -794,7 +582,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -813,7 +600,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -830,7 +616,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -838,7 +623,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -846,8 +630,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -855,7 +637,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -863,8 +644,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -885,7 +664,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -900,17 +678,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -922,40 +697,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -970,36 +733,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -1007,12 +758,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1028,9 +776,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1051,8 +797,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1066,9 +810,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1103,9 +845,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1113,7 +855,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1125,8 +866,8 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.11 gnits
 EXTRA_DIST = help2man $(man_aux) $(man_MAN1IN) $(man_MAN1OTHER) \
-	$(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) $(man_HTML1IN) \
-	$(man_HTML1OTHER) $(man_HTML3)
+	$(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) $(man_HTMLIN) \
+	$(man_HTMLOTHER)
 
 # A manual page for each of the bin_PROGRAMS in src/Makefile.am.
 man_aux = gettext.x ngettext.x envsubst.x
@@ -1145,18 +886,16 @@
 man_MAN3LINK = dgettext.3 dcgettext.3 dngettext.3 dcngettext.3
 man_MANS = $(man_MAN1)
 notrans_man_MANS = $(man_MAN3) $(man_MAN3LINK)
-man_HTML1GEN = gettext.1.html ngettext.1.html
-man_HTML1IN = gettext.1.html.in ngettext.1.html.in
-man_HTML1OTHER = envsubst.1.html
-man_HTML1 = $(man_HTML1GEN) $(man_HTML1OTHER)
-man_HTML3 = gettext.3.html ngettext.3.html \
+man_HTMLGEN = gettext.1.html ngettext.1.html
+man_HTMLIN = gettext.1.html.in ngettext.1.html.in
+man_HTMLOTHER = \
+envsubst.1.html \
+gettext.3.html ngettext.3.html \
 textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
 
-man_HTML = $(man_HTML1) $(man_HTML3)
-CLEANFILES = $(man_MAN1GEN) $(man_HTML1GEN)
-MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) \
-$(man_HTML1IN) $(man_HTML1OTHER) $(man_HTML3)
-
+man_HTML = $(man_HTMLGEN) $(man_HTMLOTHER)
+CLEANFILES = $(man_MAN1GEN) $(man_HTMLGEN)
+MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) $(man_HTMLIN) $(man_HTMLOTHER)
 RM = rm -f
 
 # help2man 1.24 or newer.
@@ -1164,15 +903,10 @@
 
 # groff 1.17 or newer.
 MAN2HTML = groff -mandoc -Thtml
-UPDATEMODE = 
-gt_man2html = \
-	if test -f $${srcdir}$$m; then \
-	  $(MAN2HTML) $${srcdir}$$m > t-$@ && \
-	  sed -e '/CreationDate:/d' < t-$@ > t2-$@ && \
-	  mv t2-$@ $@; \
-	  rm -f t-$@ t2-$@; \
-	fi
 
+# Update them also during "make dist", in order to propagate added command
+# line options that were added, even if version.sh didn't change.
+UPDATEMODE = 
 all: all-am
 
 .SUFFIXES:
@@ -1216,18 +950,11 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS) $(notrans_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(notrans_man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done;  \
+	l2='$(notrans_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -1246,18 +973,10 @@
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
 	done; }
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -1285,28 +1004,25 @@
 	l2='$(notrans_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed 's,.*/,,;s,\.[^1][0-9a-z]*$$,.1,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 	@list=''; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 install-man3: $(man_MANS) $(notrans_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(notrans_man_MANS)'; \
-	test -n "$(man3dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.3[a-z]*$$/p'; \
-	fi; \
+	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
+	@list=''; test -n "$(man3dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done;  \
+	l2='$(notrans_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.3[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -1325,18 +1041,10 @@
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
 	done; }
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man3dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.3[a-z]*$$/p'; \
-	fi; \
+	@list=''; test -n "$(man3dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.3[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -1364,22 +1072,39 @@
 	l2='$(notrans_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.3[a-z]*$$/p'; \
 	} | sed 's,.*/,,;s,\.[^3][0-9a-z]*$$,.3,'`; \
-	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man3dir)" && rm -f $$files; }
 	@list=''; test -n "$(man3dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.3[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man3dir)" && rm -f $$files; }
+tags: TAGS
+TAGS:
 
-ctags CTAGS:
-
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1426,15 +1151,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1519,19 +1239,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am html-local info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-html-local install-info \
-	install-info-am install-man install-man1 install-man3 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-local maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-am uninstall-local \
-	uninstall-man uninstall-man1 uninstall-man3
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am html-local info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-html-local install-info install-info-am install-man \
+	install-man1 install-man3 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-local maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local uninstall-man uninstall-man1 uninstall-man3
 
 
 # We distribute both the man pages and their HTML equivalent.
@@ -1547,96 +1266,94 @@
 # Man pages.
 
 # The progname.x files contain some extra information not found in the
-# "progname --help" output.  Each progname.1 depends on the source,
-# not the binary; we don't need to regenerate the binary when any
-# source file changes, only the main one.
-
-$(man_MAN1GEN): Makefile
-	srcdir=''; \
-	test -f ./$@.in || srcdir=$(srcdir)/; \
-	if test -f $${srcdir}$@.in; then \
-	  sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@ && \
-	  mv t-$@ $@; \
-        fi
-
-gettext.1: gettext.1.in
-ngettext.1: ngettext.1.in
-
-$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
-	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
-	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
-	  ../src/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
-
-gettext.1.in: gettext.x ../src/gettext.c
-ngettext.1.in: ngettext.x ../src/ngettext.c
-envsubst.1: envsubst.x ../src/envsubst.c
+# "progname --help" output.
 
-$(man_MAN3): $(top_srcdir)/../.version
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/$@.in > t-$@ && \
+gettext.1: gettext.1.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f gettext.1.in; then echo .; else echo $(srcdir); fi`/gettext.1.in > t-$@
+	mv t-$@ $@
+ngettext.1: ngettext.1.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f ngettext.1.in; then echo .; else echo $(srcdir); fi`/ngettext.1.in > t-$@
 	mv t-$@ $@
 
-gettext.3: gettext.3.in
-ngettext.3: ngettext.3.in
-textdomain.3: textdomain.3.in
-bindtextdomain.3: bindtextdomain.3.in
-bind_textdomain_codeset.3: bind_textdomain_codeset.3.in
+gettext.1.in: gettext.x
+	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/gettext$(EXEEXT) $(srcdir)/gettext.x gettext.1.in
+ngettext.1.in: ngettext.x
+	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/ngettext$(EXEEXT) $(srcdir)/ngettext.x ngettext.1.in
+
+envsubst.1: envsubst.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1
+
+# Depend on version.sh to get version number changes.
+$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../version.sh
+update-man1:
+	$(MAKE) $(man_MAN1IN) $(man_MAN1OTHER) UPDATEMODE=--update
+	$(MAKE)
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: update-man1
+
+gettext.3: gettext.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
+	mv t-$@ $@
+ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
+	mv t-$@ $@
+textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
+	mv t-$@ $@
+bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
+	mv t-$@ $@
+bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
+	mv t-$@ $@
 
 # Man pages in HTML format.
 
 html-local: $(man_HTML)
 
-$(man_HTML1GEN): Makefile
-	srcdir=''; \
-	test -f ./$@.in || srcdir=$(srcdir)/; \
-	if test -f $${srcdir}$@.in; then \
-	  sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@ && \
-	  mv t-$@ $@; \
-        fi
-
-gettext.1.html: gettext.1.html.in
-ngettext.1.html: ngettext.1.html.in
-
-$(man_HTML1IN):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.1\.html\.in$$//'`; \
-	m=$${progname}.1.in; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
+gettext.1.html: gettext.1.html.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f gettext.1.html.in; then echo .; else echo $(srcdir); fi`/gettext.1.html.in > t-$@
+	mv t-$@ $@
+ngettext.1.html: ngettext.1.html.in Makefile
+	sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f ngettext.1.html.in; then echo .; else echo $(srcdir); fi`/ngettext.1.html.in > t-$@
+	mv t-$@ $@
 
 gettext.1.html.in: gettext.1.in
+	$(MAN2HTML) `if test -f gettext.1.in; then echo .; else echo $(srcdir); fi`/gettext.1.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 ngettext.1.html.in: ngettext.1.in
-
-$(man_HTML1OTHER):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.1\.html$$//'`; \
-	m=$${progname}.1; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
+	$(MAN2HTML) `if test -f ngettext.1.in; then echo .; else echo $(srcdir); fi`/ngettext.1.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 envsubst.1.html: envsubst.1
-
-$(man_HTML3):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.3\.html$$//'`; \
-	m=$${progname}.3.in; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
+	$(MAN2HTML) `if test -f envsubst.1; then echo .; else echo $(srcdir); fi`/envsubst.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 gettext.3.html: gettext.3.in
+	$(MAN2HTML) $(srcdir)/gettext.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 ngettext.3.html: ngettext.3.in
+	$(MAN2HTML) $(srcdir)/ngettext.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 textdomain.3.html: textdomain.3.in
+	$(MAN2HTML) $(srcdir)/textdomain.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 bindtextdomain.3.html: bindtextdomain.3.in
+	$(MAN2HTML) $(srcdir)/bindtextdomain.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
+	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 install-html-local:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	for file in $(man_HTML); do \
 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
 	done
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html:
 	for file in $(man_HTML); do \
diff -Nru gettext-0.19.3/gettext-runtime/man/ngettext.1.html.in gettext-0.18.1.1/gettext-runtime/man/ngettext.1.html.in
--- gettext-0.19.3/gettext-runtime/man/ngettext.1.html.in	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/ngettext.1.html.in	2010-06-06 18:36:26.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>NGETTEXT</title>
-
 </head>
 <body>
 
-<h1 align="center">NGETTEXT</h1>
-
+<h1 align=center>NGETTEXT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,167 +17,264 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">ngettext
-&minus; translate message and choose plural form</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>ngettext &minus; translate message and choose plural
+form</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>ngettext</b>
-[<i>OPTION</i>] [<i>TEXTDOMAIN</i>] <i>MSGID MSGID-PLURAL
-COUNT</i></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>ngettext</b> [<i>OPTION</i>] [<i>TEXTDOMAIN</i>]
+<i>MSGID MSGID-PLURAL COUNT</i></p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>ngettext</b> program translates a natural language
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>ngettext</b> program translates a natural language
 message into the user&rsquo;s language, by looking up the
 translation in a message catalog, and chooses the
 appropriate plural form, which depends on the number
 <i>COUNT</i> and the language of the message catalog where
 the translation was found.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Display native
-language translation of a textual message whose grammatical
-form depends on a number. <b><br>
-&minus;d</b>,
-<b>&minus;&minus;domain</b>=<i>TEXTDOMAIN</i></p>
-
-<p style="margin-left:22%;">retrieve translated message
-from TEXTDOMAIN</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<!-- INDENTATION -->
+<p>Display native language translation of a textual message
+whose grammatical form depends on a number.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b>,
+<b>&minus;&minus;domain</b>=<i>TEXTDOMAIN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>retrieve translated message from TEXTDOMAIN</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="3%">
-
-
-<p><b>&minus;e</b></p></td>
-<td width="8%"></td>
-<td width="63%">
+<td width="2%">
 
-
-<p>enable expansion of some escape sequences</p></td>
-<td width="15%">
-</td></tr>
+<p><b>&minus;e</b></p>
+</td>
+<td width="13%"></td>
+<td width="60%">
+
+<p>enable expansion of some escape sequences</p>
+</td>
+<td width="11%">
+</td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="3%">
-
-
-<p><b>&minus;E</b></p></td>
-<td width="8%"></td>
-<td width="63%">
+<td width="2%">
 
-
-<p>(ignored for compatibility)</p></td>
-<td width="15%">
-</td></tr>
+<p><b>&minus;E</b></p>
+</td>
+<td width="13%"></td>
+<td width="60%">
+
+<p>(ignored for compatibility)</p>
+</td>
+<td width="11%">
+</td>
 </table>
-
-<p style="margin-left:11%;"><b>&minus;h</b>,
-<b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">display version information and
-exit</p>
-
-<p style="margin-left:11%;">[TEXTDOMAIN]</p>
-
-<p style="margin-left:22%;">retrieve translated message
-from TEXTDOMAIN</p>
-
-<p style="margin-left:11%;">MSGID MSGID-PLURAL</p>
-
-<p style="margin-left:22%;">translate MSGID (singular) /
-MSGID-PLURAL (plural)</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>[TEXTDOMAIN]</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>retrieve translated message from TEXTDOMAIN</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>MSGID MSGID-PLURAL</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>translate MSGID (singular) / MSGID-PLURAL (plural)</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="7%">
 
+<p>COUNT</p>
+</td>
+<td width="13%"></td>
+<td width="67%">
 
-<p>COUNT</p></td>
-<td width="4%"></td>
-<td width="72%">
-
-
-<p>choose singular/plural form based on this value</p></td>
-<td width="6%">
-</td></tr>
+<p>choose singular/plural form based on this value</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If the TEXTDOMAIN parameter is not given, the domain is
+determined from the environment variable TEXTDOMAIN. If the
+message catalog is not found in the regular directory,
+another location can be specified with the environment
+variable TEXTDOMAINDIR. Standard search directory:
+@localedir@</p>
+</td>
 </table>
-
-<p style="margin-left:11%; margin-top: 1em">If the
-TEXTDOMAIN parameter is not given, the domain is determined
-from the environment variable TEXTDOMAIN. If the message
-catalog is not found in the regular directory, another
-location can be specified with the environment variable
-TEXTDOMAINDIR. Standard search directory: @localedir@</p>
-
-<h2>AUTHOR
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Ulrich Drepper.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Ulrich Drepper.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1997, 2000-2007 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1997, 2000-2007 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>ngettext</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>ngettext</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-ngettext</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>ngettext</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>ngettext</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info ngettext</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/ngettext.1.in gettext-0.18.1.1/gettext-runtime/man/ngettext.1.in
--- gettext-0.19.3/gettext-runtime/man/ngettext.1.in	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/ngettext.1.in	2010-06-06 18:36:26.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH NGETTEXT "1" "October 2014" "GNU gettext-runtime 0.19.3" GNU
+.TH NGETTEXT "1" "June 2010" "GNU gettext-runtime 0.18.1" GNU
 .SH NAME
 ngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/ngettext.3 gettext-0.18.1.1/gettext-runtime/man/ngettext.3
--- gettext-0.19.3/gettext-runtime/man/ngettext.3	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/ngettext.3	2010-06-06 18:36:26.000000000 +0000
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH NGETTEXT 3 "May 2001" "GNU gettext 0.19.3"
+.TH NGETTEXT 3 "May 2001" "GNU gettext 0.18.1"
 .SH NAME
 ngettext, dngettext, dcngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/ngettext.3.html gettext-0.18.1.1/gettext-runtime/man/ngettext.3.html
--- gettext-0.19.3/gettext-runtime/man/ngettext.3.html	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/ngettext.3.html	2010-06-06 18:36:27.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>NGETTEXT</title>
-
 </head>
 <body>
 
-<h1 align="center">NGETTEXT</h1>
-
+<h1 align=center>NGETTEXT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,111 +17,127 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">ngettext,
-dngettext, dcngettext &minus; translate message and choose
-plural form</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>ngettext, dngettext, dcngettext &minus; translate message
+and choose plural form</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<pre><b>#include &lt;libintl.h&gt;
 
-
-<p style="margin-left:11%; margin-top: 1em"><b>#include
-&lt;libintl.h&gt;</b></p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>char *
-ngettext (const char *</b> <i>msgid</i><b>, const char *</b>
-<i>msgid_plural</i><b>, <br>
-unsigned long int</b> <i>n</i><b>); <br>
+char * ngettext (const char *</b> <i>msgid</i><b>, const char *</b> <i>msgid_plural</i><b>,
+                 unsigned long int</b> <i>n</i><b>);
 char * dngettext (const char *</b> <i>domainname</i><b>,
-<br>
-const char *</b> <i>msgid</i><b>, const char *</b>
-<i>msgid_plural</i><b>, <br>
-unsigned long int</b> <i>n</i><b>); <br>
+                  const char *</b> <i>msgid</i><b>, const char *</b> <i>msgid_plural</i><b>,
+                  unsigned long int</b> <i>n</i><b>);
 char * dcngettext (const char *</b> <i>domainname</i><b>,
-<br>
-const char *</b> <i>msgid</i><b>, const char *</b>
-<i>msgid_plural</i><b>, <br>
-unsigned long int</b> <i>n</i><b>, int</b>
-<i>category</i><b>);</b></p>
-
-<h2>DESCRIPTION
+                   const char *</b> <i>msgid</i><b>, const char *</b> <i>msgid_plural</i><b>,
+                   unsigned long int</b> <i>n</i><b>, int</b> <i>category</i><b>);
+</b></pre>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>ngettext</b>, <b>dngettext</b> and <b>dcngettext</b>
-functions attempt to translate a text string into the
-user&rsquo;s native language, by looking up the appropriate
-plural form of the translation in a message catalog.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Plural forms
-are grammatical variants depending on the a number. Some
-languages have two forms, called singular and plural. Other
-languages have three forms, called singular, dual and
-plural. There are also languages with four forms.</p>
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
 
-<p style="margin-left:11%; margin-top: 1em">The
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>ngettext</b>, <b>dngettext</b> and
+<b>dcngettext</b> functions attempt to translate a text
+string into the user&rsquo;s native language, by looking up
+the appropriate plural form of the translation in a message
+catalog.</p>
+<!-- INDENTATION -->
+<p>Plural forms are grammatical variants depending on the a
+number. Some languages have two forms, called singular and
+plural. Other languages have three forms, called singular,
+dual and plural. There are also languages with four
+forms.</p>
+<!-- INDENTATION -->
+<p>The <b>ngettext</b>, <b>dngettext</b> and
+<b>dcngettext</b> functions work like the <b>gettext</b>,
+<b>dgettext</b> and <b>dcgettext</b> functions,
+respectively. Additionally, they choose the appropriate
+plural form, which depends on the number <i>n</i> and the
+language of the message catalog where the translation was
+found.</p>
+<!-- INDENTATION -->
+<p>In the &quot;C&quot; locale, or if none of the used
+catalogs contain a translation for <i>msgid</i>, the
 <b>ngettext</b>, <b>dngettext</b> and <b>dcngettext</b>
-functions work like the <b>gettext</b>, <b>dgettext</b> and
-<b>dcgettext</b> functions, respectively. Additionally, they
-choose the appropriate plural form, which depends on the
-number <i>n</i> and the language of the message catalog
-where the translation was found.</p>
-
-<p style="margin-left:11%; margin-top: 1em">In the
-&quot;C&quot; locale, or if none of the used catalogs
-contain a translation for <i>msgid</i>, the <b>ngettext</b>,
-<b>dngettext</b> and <b>dcngettext</b> functions return
-<i>msgid</i> if <i>n</i> == 1, or <i>msgid_plural</i> if
-<i>n</i> != 1.</p>
-
-<h2>RETURN VALUE
+functions return <i>msgid</i> if <i>n</i> == 1, or
+<i>msgid_plural</i> if <i>n</i> != 1.</p>
+</td>
+</table>
 <a name="RETURN VALUE"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">If a
-translation was found in one of the specified catalogs, the
-appropriate plural form is converted to the locale&rsquo;s
-codeset and returned. The resulting string is statically
-allocated and must not be modified or freed. Otherwise
-<i>msgid</i> or <i>msgid_plural</i> is returned, as
-described above.</p>
-
-<h2>ERRORS
+<h2>RETURN VALUE</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If a translation was found in one of the specified
+catalogs, the appropriate plural form is converted to the
+locale&rsquo;s codeset and returned. The resulting string is
+statically allocated and must not be modified or freed.
+Otherwise <i>msgid</i> or <i>msgid_plural</i> is returned,
+as described above.</p>
+</td>
+</table>
 <a name="ERRORS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>errno</b> is
-not modified.</p>
-
-<h2>BUGS
+<h2>ERRORS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>errno</b> is not modified.</p>
+</td>
+</table>
 <a name="BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The return type
-ought to be <b>const char *</b>, but is <b>char *</b> to
-avoid warnings in C code predating ANSI C.</p>
-
-<h2>SEE ALSO
+<h2>BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The return type ought to be <b>const char *</b>, but is
+<b>char *</b> to avoid warnings in C code predating ANSI
+C.</p>
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>gettext</b>(3),
-<b>dgettext</b>(3), <b>dcgettext</b>(3)</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>gettext</b>(3), <b>dgettext</b>(3),
+<b>dcgettext</b>(3)</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/man/textdomain.3 gettext-0.18.1.1/gettext-runtime/man/textdomain.3
--- gettext-0.19.3/gettext-runtime/man/textdomain.3	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/textdomain.3	2010-06-06 18:36:26.000000000 +0000
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.19.3"
+.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.18.1"
 .SH NAME
 textdomain \- set domain for future gettext() calls
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-runtime/man/textdomain.3.html gettext-0.18.1.1/gettext-runtime/man/textdomain.3.html
--- gettext-0.19.3/gettext-runtime/man/textdomain.3.html	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/man/textdomain.3.html	2010-06-06 18:36:27.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>TEXTDOMAIN</title>
-
 </head>
 <body>
 
-<h1 align="center">TEXTDOMAIN</h1>
-
+<h1 align=center>TEXTDOMAIN</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,113 +17,134 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">textdomain
-&minus; set domain for future gettext() calls</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>textdomain &minus; set domain for future gettext()
+calls</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>#include
-&lt;libintl.h&gt;</b></p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>char *
-textdomain (const char *</b> <i>domainname</i><b>);</b></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<pre><b>#include &lt;libintl.h&gt;
+
+char * textdomain (const char *</b> <i>domainname</i><b>);
+</b></pre>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
 
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>textdomain</b> function sets or retrieves the current
-message domain.</p>
-
-<p style="margin-left:11%; margin-top: 1em">A message
-domain is a set of translatable <i>msgid</i> messages.
-Usually, every software package has its own message domain.
-The domain name is used to determine the message catalog
-where a translation is looked up; it must be a non-empty
-string.</p>
-
-<p style="margin-left:11%; margin-top: 1em">The current
-message domain is used by the <b>gettext</b>,
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>textdomain</b> function sets or retrieves the
+current message domain.</p>
+<!-- INDENTATION -->
+<p>A message domain is a set of translatable <i>msgid</i>
+messages. Usually, every software package has its own
+message domain. The domain name is used to determine the
+message catalog where a translation is looked up; it must be
+a non-empty string.</p>
+<!-- INDENTATION -->
+<p>The current message domain is used by the <b>gettext</b>,
 <b>ngettext</b> functions, and by the <b>dgettext</b>,
 <b>dcgettext</b>, <b>dngettext</b> and <b>dcngettext</b>
 functions when called with a NULL domainname argument.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If
-<i>domainname</i> is not NULL, the current message domain is
-set to <i>domainname</i>. The string the function stores
-internally is a copy of the <i>domainname</i> argument.</p>
-
-<p style="margin-left:11%; margin-top: 1em">If
-<i>domainname</i> is NULL, the function returns the current
-message domain.</p>
-
-<h2>RETURN VALUE
+<!-- INDENTATION -->
+<p>If <i>domainname</i> is not NULL, the current message
+domain is set to <i>domainname</i>. The string the function
+stores internally is a copy of the <i>domainname</i>
+argument.</p>
+<!-- INDENTATION -->
+<p>If <i>domainname</i> is NULL, the function returns the
+current message domain.</p>
+</td>
+</table>
 <a name="RETURN VALUE"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">If successful,
-the <b>textdomain</b> function returns the current message
-domain, after possibly changing it. The resulting string is
-valid until the next <b>textdomain</b> call and must not be
-modified or freed. If a memory allocation failure occurs, it
-sets <b>errno</b> to <b>ENOMEM</b> and returns NULL.</p>
-
-<h2>ERRORS
+<h2>RETURN VALUE</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If successful, the <b>textdomain</b> function returns the
+current message domain, after possibly changing it. The
+resulting string is valid until the next <b>textdomain</b>
+call and must not be modified or freed. If a memory
+allocation failure occurs, it sets <b>errno</b> to
+<b>ENOMEM</b> and returns NULL.</p>
+</td>
+</table>
 <a name="ERRORS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The following
-error can occur, among others:</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>ERRORS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The following error can occur, among others:</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
-
-<p><b>ENOMEM</b></p></td>
-<td width="2%"></td>
-<td width="43%">
-
+<td width="8%">
 
-<p>Not enough memory available.</p></td>
-<td width="35%">
-</td></tr>
+<p><b>ENOMEM</b></p>
+</td>
+<td width="13%"></td>
+<td width="41%">
+
+<p>Not enough memory available.</p>
+</td>
+<td width="24%">
+</td>
 </table>
-
-<h2>BUGS
 <a name="BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The return type
-ought to be <b>const char *</b>, but is <b>char *</b> to
-avoid warnings in C code predating ANSI C.</p>
-
-<h2>SEE ALSO
+<h2>BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The return type ought to be <b>const char *</b>, but is
+<b>char *</b> to avoid warnings in C code predating ANSI
+C.</p>
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>gettext</b>(3),
-<b>ngettext</b>(3), <b>bindtextdomain</b>(3),
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>gettext</b>(3), <b>ngettext</b>(3),
+<b>bindtextdomain</b>(3),
 <b>bind_textdomain_codeset</b>(3)</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-runtime/NEWS gettext-0.18.1.1/gettext-runtime/NEWS
--- gettext-0.19.3/gettext-runtime/NEWS	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/NEWS	2010-06-06 12:49:57.000000000 +0000
@@ -1,9 +1,3 @@
-Version 0.18.3 - July 2013
-
-* On Mac OS X systems, the setlocale() function now properly
-  invalidates loaded message catalogs when a locale has been set.
-
-
 Version 0.18 - May 2010
 
 * On MacOS X and Windows systems, <libintl.h> now extends setlocale() and
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/be.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/be.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/be.po gettext-0.18.1.1/gettext-runtime/po/be.po
--- gettext-0.19.3/gettext-runtime/po/be.po	2014-10-16 06:10:21.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/be.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -21,62 +21,62 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
@@ -116,8 +116,8 @@
 msgstr "прапушчаны аргумэнты"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
 
 #: src/envsubst.c:176
@@ -234,13 +234,13 @@
 "                            MSGID з TEXTDOMAIN\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -269,7 +269,7 @@
 "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
 
 #: src/ngettext.c:222
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -280,6 +280,14 @@
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
+"  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з TEXTDOMAIN\n"
+"  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
+"  -E                        (ігнаруецца для сумяшчальнасьці)\n"
+"  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
+"  -n                        стрымлівае цягнучыеся новыя радкі\n"
+"  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
+"  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
+"                            MSGID з TEXTDOMAIN\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -296,6 +304,21 @@
 "асяроддзя TEXTDOMAINDIR.\n"
 "Стандартная дырэкторыя для пошуку: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: несапраўдны выбар -- %c\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
+#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
+#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
+
 #~ msgid "invalid argument `%s' for `%s'"
 #~ msgstr "нерэчаісны аргумэнт `%s' для `%s'"
 
@@ -323,9 +346,6 @@
 #~ msgid "%s subprocess failed"
 #~ msgstr "%s падпрацэс спынены з-за памылкі"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: несапраўдны выбар -- %c\n"
-
 #~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
 #~ msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
@@ -397,18 +417,6 @@
 #~ msgstr ""
 #~ "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
-#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
-#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
-
 #~ msgid "Usage: %s [OPTION]\n"
 #~ msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
@@ -777,12 +785,6 @@
 #~ msgstr[1] "знойдзена %d фатальныя памылкі"
 #~ msgstr[2] "знойдзена %d фатальных памылак"
 
-#~ msgid "duplicate message definition"
-#~ msgstr "двайное вызначэньне паведамленьня"
-
-#~ msgid "...this is the location of the first definition"
-#~ msgstr "...гэта месцазнаходжаньне першага вызначэньня"
-
 #~ msgid "at least two files must be specified"
 #~ msgstr "неабходна задаць не менш двух файлаў"
 
@@ -1338,7 +1340,7 @@
 #~ msgid "...but some messages have only one plural form"
 #~ msgid_plural "...but some messages have only %lu plural forms"
 #~ msgstr[0] ""
-#~ "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
+#~ "...але некаторыя паведамленьні маюць толькі адну форму множнага ліку"
 #~ msgstr[1] ""
 #~ "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
 #~ msgstr[2] ""
@@ -1346,7 +1348,7 @@
 
 #~ msgid "...but some messages have one plural form"
 #~ msgid_plural "...but some messages have %lu plural forms"
-#~ msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
+#~ msgstr[0] "...але некаторыя паведамленьні маюць адну форму множнага ліку"
 #~ msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
 #~ msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
 
@@ -1409,6 +1411,12 @@
 #~ msgid "`domain %s' directive ignored"
 #~ msgstr "дырэктыва `domain %s' ігнаруецца"
 
+#~ msgid "duplicate message definition"
+#~ msgstr "двайное вызначэньне паведамленьня"
+
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...гэта месцазнаходжаньне першага вызначэньня"
+
 #~ msgid "empty `msgstr' entry ignored"
 #~ msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/bg.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/bg.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/bg.po gettext-0.18.1.1/gettext-runtime/po/bg.po
--- gettext-0.19.3/gettext-runtime/po/bg.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/bg.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,16 +1,16 @@
 # Bulgarian translations for gettext-runtime 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.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 13:30+0300\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,62 +20,62 @@
 msgid "write error"
 msgstr "грешка при запис"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Неизвестна системна грешка"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмислена опция '%s', възможности:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: двусмислена опция '%s'\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опцията '--%s' е без аргументи\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опцията '%c%s' е без аргумент\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опцията '--%s' изисква аргумент\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непозната опция '--%s'\n"
+msgstr "%s: неразпозната опция '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непозната опция '%c%s'\n"
+msgstr "%s: неразпозната опция '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправилна опция -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: двусмислена опция '-W %s'\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опцията '-W %s' е без аргументи\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: опцията '-W %s' изисква аргумент\n"
@@ -120,8 +120,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "За повече сведения, опитайте '%s --help'.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "За повече информация, опитайте '%s --help'\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -156,7 +156,7 @@
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               извеждане на сведение за версия и изход\n"
+msgstr "  -V, --version               извеждане на информация за версия и изход\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -236,10 +236,10 @@
 msgstr ""
 "  -d, --domain=ОБЛАСТТЕКСТ  намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
 "  -e                        разрешава разгъване на някой \"заместващи последователности\"\n"
-"  -E                        (пренебрегва се, за съвместимост)\n"
+"  -E                        (игнорира се за съвместимост)\n"
 "  -h, --help                извеждане на тази помощ и изход\n"
-"  -n                        потискане на завършващ \"нов ред\"\n"
-"  -V, --version             извеждане на сведение за версия и изход\n"
+"  -n                        потискам на завършващ \"нов ред\"\n"
+"  -V, --version             извеждане на информация за версия и изход\n"
 "  [ОБЛАСТТЕКСТ] КЛЮЧ        намиране на преведените съобщения съответни\n"
 "                            на КЛЮЧ от ОБЛАСТТЕКСТ\n"
 
@@ -250,17 +250,17 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
 "Ако не е зададен параметър ОБЛАСТТЕКСТ, областта се определя от променливата\n"
-"от обкръжението TEXTDOMAIN.  Ако каталога със съобщенията не е намерен в\n"
+"от обкръжението TEXTDOMAIN.  Ако каталога със съобщенията не е намерен в \n"
 "обичайната директория, друго местоположение може да се зададе с променливата\n"
 "от обкръжението TEXTDOMAINDIR.\n"
-"Ако се използва заедно с опцията -s, програмата се държи като командата 'echo',\n"
-"но не без просто да копира аргументите си на стандартния изход.  Вместо това, \n"
+"Ако се използва заедно с опцията -s програмата се държи като командата 'echo',\n"
+"но без просто да копира аргументите си на стандартния изход.  Вместо това\n"
 "съобщенията, намерените в избрания каталог, се превеждат.\n"
 "Директория за търсене: %s\n"
 
@@ -290,9 +290,9 @@
 msgstr ""
 "  -d, --domain=ОБЛАСТТЕКСТ  намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
 "  -e                        разрешава разгъване на някой \"заместващи последователности\"\n"
-"  -E                        (пренебрегва се, за съвместимост)\n"
+"  -E                        (игнорира се за съвместимост)\n"
 "  -h, --help                извеждане на тази помощ и изход\n"
-"  -V, --version             извеждане на сведение за версия и изход\n"
+"  -V, --version             извеждане на информация за версия и изход\n"
 "  [ОБЛАСТТЕКСТ]             намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
 "  КЛЮЧ КЛЮЧ-МН.Ч.           превежда КЛЮЧ (ед.ч.) / КЛЮЧ-МН.Ч (мн.ч.)\n"
 "  БРОЙ                      на базата на тази стойност избира формата за ед/мн.ч.\n"
@@ -307,7 +307,7 @@
 "Standard search directory: %s\n"
 msgstr ""
 "Ако не е зададен параметър ОБЛАСТТЕКСТ, областта се определя от променливата\n"
-"от обкръжението TEXTDOMAIN.  Ако каталога със съобщенията не е намерен в\n"
+"от обкръжението TEXTDOMAIN.  Ако каталога със съобщенията не е намерен в \n"
 "обичайната директория, друго местоположение може да се зададе с променливата\n"
 "от обкръжението TEXTDOMAINDIR.\n"
 "Директория за търсене: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/ca.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/ca.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/ca.po gettext-0.18.1.1/gettext-runtime/po/ca.po
--- gettext-0.19.3/gettext-runtime/po/ca.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ca.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,59 +1,57 @@
 # Catalan messages for GNU gettext-runtime.
-# Copyright (C) 2001, 2002, 2003, 2007, 2014 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
 #
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2013, 2014.
+# Sóc Ivan, aquestes són les convencions que adopte per a la 0.15-pre5:
+#   * Sempre que es puga s’usaran els caràcters adequats per al text en català:
+#     l’apòstrof (’), ela geminada (ŀ, Ŀ), cometes («, », “, ”, ‘, ’, en aquest
+#     ordre de d’aparició), guionet (‐), guionet dur (‑), guió (—) i punts
+#     suspensius (…).  Compte, perquè *cap*, repetesc, *CAP* dels anteriors és
+#     el caràcter que s’obté teclejant directament; vegeu
+#     http://www.selidor.net/~ivan/blog/bits/20060304T0023-ortotipografia.html.
+#   * Use 2 espais després d’un punt.
+#   * Missatges d’ajuda:
+#       * Forma d’ús: …
+#               o bé: …
+#       * ARGUMENT_COMPOST, però ARGCOMP
+#       * FILE(s) -> cada FITXER (si és possible)
+#       * Cada línia de descripció d’una opció comença en la columna 24, i
+#         sempre es manté com a mínim a 4 espais del nom de l’opció.  Quan
+#         l’opció arriba a la columna 24, la descripció comença en la línia
+#         inferior.  Les descripcions que no caben en una línia es parteixen i
+#         continuen en la columna 24 de la línia següent.
+#       * Les descripcions d’ítems que no són opcions es mantenen alineades a
+#         4 espais de l’ítem més llarg del bloc.  Les que no caben en una línia
+#         es parteixen i continuen en la mateixa columna on comencen.
+#       o Excepció: ajudes de «pr», quin format vos agrada més?
+#   * Errors i avisos:
+#       * no és igual «no es pot obrir» que «no s’ha pogut obrir»
+#       * no és igual «s’està obrint X» que «en obrir X» (error)
+#       * «avís:» comença amb minúscula, la cadena següent també
+#       * sempre van en una sola línia, a no ser que els retorns importen; en
+#         aquest cas, les noves línies comencen amb un caràcter de tabulació
+#   * VARIABLE_ENTORN, però «valor de variable»
+#   * Noms de funció: printf()
+#   * Noms de fitxer: «fitxer»
+#   * Noms d’opcions: «--opció=ARGUMENT»
+#   * El text com a molt arriba a la columna 78, amb el caràcter de nova línia
+#     en la 79.  Les línies es parteixen de forma automàtica (no per a que quede
+#     bonic, excepte quan quede realment horrend o porte a confusió).
+#   * Els missatges marcats com a multilínia només arriben fins a la columna
+#     70.  A sovint contenen marques de format; en aquest cas s’hi inserta una
+#     nova línia perquè no hi ha forma de saber com serà de llarga la línia.
 #
-# Sóc Ivan, aquestes són les convencions que adopte per a la 0.19-rc1:
-#
-# - Sempre que es puga s’usaran els caràcters adequats per al text en català:
-#   l’apòstrof (’), ela geminada (l·l, L·L), cometes («, », “, ”, ‘, ’, en
-#   aquest ordre de d’aparició), guionet (‐), guionet dur (‑), guió (—) i punts
-#   suspensius (…).  Compte, perquè alguns dels caràcters anteriors no són els
-#   que s’obtenen teclejant directament; vegeu
-#   https://elvil.net/blog/ca/ortotipografia
-# - Use 2 espais després d’un punt.
-# - Missatges d’ajuda:
-#   - Forma d’ús: …
-#           o bé: …
-#   - ARGUMENT_COMPOST, però ARGCOMP
-#   - FILE(s) -> cada FITXER (si és possible)
-#   - Cada línia de descripció d’una opció comença en la columna 24, i sempre es
-#     manté com a mínim a 4 espais del nom de l’opció.  Quan l’opció arriba a la
-#     columna 24, la descripció comença en la línia inferior.  Les descripcions
-#     que no caben en una línia es parteixen i continuen en la columna 24 de la
-#     línia següent.
-#   - Les descripcions d’ítems que no són opcions es mantenen alineades a 4
-#     espais de l’ítem més llarg del bloc.  Les que no caben en una línia es
-#     parteixen i continuen en la mateixa columna on comencen.
-#     - Excepció: ajudes de «pr», quin format vos agrada més?
-# - Errors i avisos:
-#   - no és igual «no es pot obrir» que «no s’ha pogut obrir»
-#   - no és igual «s’està obrint X» que «en obrir X» (error)
-#   - «avís:» comença amb minúscula, la cadena següent també
-#   - sempre van en una sola línia, a no ser que els retorns importen; en
-#     aquest cas, les noves línies comencen amb un caràcter de tabulació
-# - VARIABLE_ENTORN, però «valor de variable»
-# - Noms de funció: printf()
-# - Noms de fitxer: «fitxer»
-# - Noms d’opcions: «--opció=ARGUMENT»
-# - El text com a molt arriba a la columna 78, amb el caràcter de nova línia en
-#   la 79.  Les línies es parteixen de forma automàtica (no per a que quede
-#   bonic, excepte quan quede realment horrend o porte a confusió).
-# - Els missatges marcats com a multilínia només arriben fins a la columna 70.
-#   A sovint contenen marques de format; en aquest cas s’hi inserta una nova
-#   línia perquè no hi ha forma de saber com serà de llarga la línia.
-#
-# FIXME: Lots of strings should be marked «no-wrap», not only those which are
-# split between lines in English, but also those which would need to be splitted
-# in its translation into other languages (this includes lines describing single
-# options).  Also strings used in multiline error and warning messages.  ivb
+# FIXME: Lots of strings should be marked «no-wrap», not only those which
+#   are split between lines in English, but also those which would need to
+#   be splitted in its translation into other languages (this includes lines
+#   describing single options).  Also strings used in multiline error and
+#   warning messages.  ivb
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.19-rc1\n"
+"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 20:59+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-28 18:06+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -67,65 +65,65 @@
 msgstr "error d’escriptura"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: l’opció «%s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l’opció «--%s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l’opció «%c%s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: l’opció «--%s» necessita un argument\n"
+msgstr "%s: l’opció «%s» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: l’opció «--%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: l’opció «%c%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l’opció «%c» no és vàlida\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l’opció «%c» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l’opció «-W %s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l’opció «-W %s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l’opció «-W %s» necessita un argument\n"
+msgstr "%s: l’opció «%s» necessita un argument\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -167,7 +165,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
 
 # Molt més clar que l’original…  ivb
@@ -300,7 +298,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -365,3 +363,6 @@
 "troba al directori habitual, es pot especificar una altra ubicació amb la\n"
 "variable d’entorn TEXTDOMAINDIR.\n"
 "Directori estàndard de cerca: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: no es permet l’opció «%c»\n"
diff -Nru gettext-0.19.3/gettext-runtime/po/ChangeLog gettext-0.18.1.1/gettext-runtime/po/ChangeLog
--- gettext-0.19.3/gettext-runtime/po/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,166 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-08  Daiki Ueno  <ueno@gnu.org>
-
-	* Makevars (MSGINIT_OPTIONS): New variable.
-	* Rules-quot: Use it when invoking msginit.
-	If one wants to use '--no-wrap' in MSGMERGE_OPTIONS and
-	XGETTEXT_OPTIONS, there should be a way to pass the option to
-	msginit.  Reported by Ludovic Courtès in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00004.html>.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	Makefile.in.in: Turn {POFILES,DISTFILES}DEPS into yes/no options
-	Preserve the previous behavior even if a user forgot to update
-	Makevars, after calling autopoint.
-	* Makevars (PO_DEPENDS_ON_POT): Rename from POFILESDEPS and turn
-	it into a yes/no option.
-	(DIST_DEPENDS_ON_UPDATE_PO): Rename from DISTFILESDEPS and turn it
-	into a yes/no option.
-
-2014-05-01  Daiki Ueno  <ueno@gnu.org>
-
-	Makefile.in.in: Add an option to claim the package as GNU/non-GNU
-	Reporeted by David Shea at:
-	<https://savannah.gnu.org/bugs/?40520>.
-	* Makevars (PACKAGE_GNU): New variable.
-	* Makefile.in.in ($(DOMAIN).pot-update): Don't search for "GNU
-	packagename" if $(PACKAGE_GNU) is set.
-
-2014-05-01  Daiki Ueno  <ueno@gnu.org>
-
-	Makefile.in.in: Make dependencies of a PO file and 'dist' customizable
-	* Makevars (POFILESDEPS): New variable.
-	(DISTFILESDEPS): New variable.
-	* Makefile.in.in ($(POFILES)): Depend on $(POFILESDEPS) instead of
-	$(srcdir)/$(DOMAIN).pot.
-	(dist distdir): Run $(DISTFILEDEPS) instead of 'update-po'.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	* Rules-quot: Use built-in filter if possible.
-
-2014-04-02  Daiki Ueno  <ueno@gnu.org>
-
-	* Rules-quot: Add a license notice.
-
-2013-07-07  Daiki Ueno  <ueno@gnu.org>
-
-	* cs.po: Update from Marek Černocký <marek@manet.cz>.
-	* de.po: Update from Jakob Kramer <jakob.kramer@gmx.de>.
-	* fi.po: Update from Jorma Karvonen <karvonen.jorma@gmail.com>.
-	* it.po: Update from Marco Colombo <m.colombo@ed.ac.uk>.
-	* ko.po: Update from Changwoo Ryu <cwryu@debian.org>.
-	* pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>.
-	* pt_BR.po: Update from Rafael Ferreira <rafael.f.f1@gmail.com>.
-	* sl.po: Update from Primoz PETERLIN <primozz.peterlin@gmail.com>.
-	* sv.po: Update from Jan Djärv <jan.h.d@swipnet.se>.
-	* uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
-	* vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-
-2013-06-25  Daiki Ueno  <ueno@gnu.org>
-
-	Allow user to supply custom sed command when generating en@quot.po.
-	This is necessary because BSD Sed is known not to work well with
-	an input not ending with a newline.
-	* Makefile.in.in (SED): Define using @SED@.
-	* Rules-quot: Use '$(SED)' instead of 'sed' as the FILTER argument
-	of msgfilter.
-	Reported by Mats Erik Andersson in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00028.html>.
-
-2013-03-02  Bruno Haible  <bruno@clisp.org>
-
-	* bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
-	* gl.po: Update from Leandro Regueiro <leandro.regueiro@gmail.com>.
-	* ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
-	* nl.po: Update from Benno Schulenberg <benno@vertaalt.nl>.
-	* pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>.
-	* pt_BR.po: Update from Rafael Ferreira <rafael.f.f1@gmail.com>.
-	* uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
-	* vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-07  Bruno Haible  <bruno@clisp.org>
-
-	* cs.po: Update from Marek Černocký <marek@manet.cz>.
-	* gl.po: Update from Leandro Regueiro <leandro.regueiro@gmail.com>.
-	* hr.po: Update from Tomislav Krznar <tomislav.krznar@gmail.com>.
-	* sr.po: Update from Мирослав Николић <miroslavnikolic@rocketmail.com>.
-	* uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
-	* vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-	* LINGUAS: Add hr.
-
-2012-07-08  Bruno Haible  <bruno@clisp.org>
-
-	* hr.po: New file, from Tomislav Krznar <tomislav.krznar@gmail.com>.
-
-2012-02-19  Bruno Haible  <bruno@clisp.org>
-
-	Rules.quot: Reenable use of build gettext tools in gettext package.
-	* Rules-quot (.insert-header.po-update-en): Augment PATH in the
-	gettext-tools package.
-
-2011-08-11  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Makefile.in.in: fix make -q problem
-	* build-aux/po/Makefile.in.in (check-macro-version): Remove this
-	rule, since there's no file named 'check-macro-version' and its
-	use as a file breaks make -q.
-	(all): Don't depend on check-macro-version.
-	(CHECK_MACRO_VERSION): New macro.
-	(stamp-po): Use it.
-
-2011-01-18  Bruno Haible  <bruno@clisp.org>
-
-	* da.po: Update from Keld Simonsen <keld@keldix.com>.
-	* it.po: Update from Marco Colombo <m.colombo@ed.ac.uk>.
-	* sl.po: Update from Primoz Peterlin <primozz.peterlin@gmail.com>.
-
-2010-10-10  Bruno Haible  <bruno@clisp.org>
-
-	* bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
-
-2010-08-15  Bruno Haible  <bruno@clisp.org>
-
-	* fi.po: Update from Jorma Karvonen <karvonen.jorma@gmail.com>.
-
-2010-07-27  Bruno Haible  <bruno@clisp.org>
-
-	* fr.po: Update from Christophe Combelles <ccomb@free.fr>.
-
-2010-07-11  Bruno Haible  <bruno@clisp.org>
-
-	* zh_CN.po: Update from Aron Xu <happyaron.xu@gmail.com>.
-
-2010-07-02  Bruno Haible  <bruno@clisp.org>
-
-	* nl.po: Update from Benno Schulenberg <benno@vertaalt.nl>.
-
-2010-06-12  Bruno Haible  <bruno@clisp.org>
-
-	* Makefile.in.in ($(DOMAIN).pot-update): When GNU find is available,
-	avoid grepping through monster files.
-	Reported by Jim Meyering <jim@meyering.net>.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/cs.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/cs.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/cs.po gettext-0.18.1.1/gettext-runtime/po/cs.po
--- gettext-0.19.3/gettext-runtime/po/cs.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/cs.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,106 +1,110 @@
 # Czech translations for GNU gettext package.
 # Copyright (C) 1998 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
 # Jaroslav Fojtik <fojtik@cmp.felk.cvut.cz>, 1998.
+#
 # Vladimir Michl <Vladimir.Michl@seznam.cz>, 1998.
-# Marek Černocký <marek@manet.cz>, 2011, 2013.
+#
+# Note: Indexes for plurals (on file example):
+# 0 - 1,21,31,101,... soubor
+# 1 - 2-4,22-24,...,102-104,122-124,... soubory
+# 2 - 0,5-10,11-19,20,25-30,35-40,...,100,105-110,... souboru
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-06-07 12:59+0200\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "chyba při zápisu"
+msgstr ""
 
 # lib/error.c:91
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Neznámá systémová chyba"
+msgstr "Nezn�m� syst�mov� chyba"
 
 # lib/getopt.c:628
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: přepínač „%s“ není jednoznačný; možnosti:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: p�ep�na� `%s' nen� jednozna�n�\n"
 
 # lib/getopt.c:652
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: přepínač „--%s“ musí být zadán bez argumentu\n"
+msgstr "%s: p�ep�na� `--%s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:657
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n"
+msgstr "%s: p�ep�na� `%c%s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: přepínač „%s“ vyžaduje argument\n"
+msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
 
 # lib/getopt.c:703
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neznámý přepínač „--%s“\n"
+msgstr "%s: nezn�m� p�ep�na� `--%s'\n"
 
 # lib/getopt.c:707
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neznámý přepínač „%c%s“\n"
+msgstr "%s: nezn�m� p�ep�na� `%c%s'\n"
 
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neznámý přepínač -- „%c“\n"
+msgstr "%s: nezn�m� p�ep�na� -- %c\n"
 
 # lib/getopt.c:766 lib/getopt.c:896
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: přepínač vyžaduje argument -- „%c“\n"
+msgstr "%s: p�ep�na� vy�aduje argument -- %c\n"
 
 # lib/getopt.c:813
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: přepínač „-W %s“ není jednoznačný\n"
+msgstr "%s: p�ep�na� `-W %s' nen� jednozna�n�\n"
 
 # lib/getopt.c:831
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n"
+msgstr "%s: p�ep�na� ` -W %s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: přepínač „-W %s“ vyžaduje argument\n"
+msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
 
 # lib/xmalloc.c:82
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "paměť vyčerpána"
+msgstr "pam� vy�erp�na"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -110,76 +114,72 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Licence GPLv3+: GNU GPL verze 3 nebo novější <http://gnu.org/licenses/gpl.html>\n"
-"Jedná se o svobodný software: můžete jej svobodně měnit a šířit.\n"
-"Nejsou poskytovány ŽÁDNÉ ZÁRUKY, mimo těch daných zákonem.\n"
 
 # 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:139 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Napsal %s.\n"
+msgstr "Autor: %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
 # src/gettextp.c:164
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
-msgstr "příliš mnoho argumentů"
+msgstr "p��li� mnoho argument�"
 
 # src/gettextp.c:154
 #: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
-msgstr "chybí argumenty"
+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:238 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"
+msgid "Try `%s --help' for more information.\n"
+msgstr "V�ce informac� z�sk�te p��kazem `%s --help'.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Použití: %s [PŘEPÍNAČE] [FORMÁT_SHELLU]\n"
+msgstr ""
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Dosadí hodnoty proměnných prostředí.\n"
+msgstr ""
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "Operační režim:\n"
+msgstr ""
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             vypsat proměnné vyskytující se ve FORMÁTU_SHELLU\n"
+msgstr ""
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Informační výstup:\n"
+msgstr ""
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  zobrazit tuto nápovědu a skončit\n"
+msgstr ""
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               vypsat informace o verzi a skončit\n"
+msgstr ""
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -191,12 +191,6 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"V normálním operačním režimu je standardní vstup kopírován na standardní\n"
-"výstup s tím, že odkazy na proměnné prostředí ve formě $PROMĚNNÁ nebo\n"
-"${PROMĚNNÁ} jsou nahrazeny odpovídajícími hodnotami. Pokud je zadán\n"
-"FORMÁT-SHELLU, jsou dosazovány jen ty proměnné, na které odkazuje;\n"
-"v opačném případě jsou dosazovány všechny odkazy na proměnné prostředí,\n"
-"které se objeví na standardním vstupu.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -204,9 +198,6 @@
 "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 ""
-"Když je použit přepínač --variables, je standardní vstup ignorován a výpis\n"
-"sestává z proměnných prostředí, které jsou odkazovány z FORMÁTU-SHELLU, jedna\n"
-"proměnná co řádek.\n"
 
 # src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
 # src/msgunfmt.c:234 src/xgettext.c:582
@@ -215,24 +206,28 @@
 #. "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:279 src/ngettext.c:245
+#, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Chyby hlaste na <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"  Chyby v programu oznamujte na adrese <bug-gnu-utils@prep.ai.mit.edu> "
+"(pouze\n"
+"anglicky), p�ipom�nky k p�ekladu zas�lejte na adresu <cs@li.org> (�esky).\n"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "chyba při čtení „%s“"
+msgstr "chyba p�i �ten� \"%s\""
 
 # src/xget-lex.c:150
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr "standardní vstup"
+msgstr "standardn� vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
+msgstr ""
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -240,17 +235,15 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Použití: %s [PŘEPÍNAČE] [[TEXTOVÁ_DOMÉNA] ID_ZPRÁVY]\n"
-"nebo:    %s [PŘEPÍNAČE] -s [ID_ZPRÁVY]…\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Zobrazí v národním jazyce překlad textové zprávy.\n"
+msgstr ""
 
 # src/gettextp.c:233
 #: src/gettext.c:253
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -261,52 +254,55 @@
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTOVÁ_DOMÉNA   získat přeložené zprávy z TEXTOVÉ_DOMÉNY\n"
-"  -e                            umožnit rozvoj některých sekvencí escape\n"
-"  -E                            (kvůli kompatibilitě, ignorován)\n"
-"  -h, --help                    vypsat tuto nápovědu a skončit\n"
-"  -n                            potlačit nové řádky na konci\n"
-"  -V, --version                 vypsat informace o verzi a skončit\n"
-"  [TEXTOVÁ_DOMÉNA] ID_ZPRÁVY    vypsat přeloženou zprávu odpovídající\n"
-"                                ID_ZPRÁVY z TEXTOVÉ_DOMÉNY\n"
+"Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID ] | [-s [MSGID]...]]\n"
+"  -d, --domain=TEXTOV�DOM�NA nastav� textovou dom�nu, ze kter� je MSGID\n"
+"  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
+"  -E                         (ignorov�n - kv�li kompatibilit�)\n"
+"  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
+"  -n                         potla�� nov� ��dky na konci zpr�vy\n"
+"  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
+"  [TEXTOV�DOM�NA] MSGID      vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
+"                             MSGID z TEXTOV�DOM�NY\n"
 
 # src/gettextp.c:245
 #: src/gettext.c:264
-#, c-format, no-wrap
+#, fuzzy, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Není-li zadán argument TEXTOVÁ_DOMÉNA, je doména určena z proměnné\n"
-"prostředí TEXTDOMAIN. Jestliže katalog se zprávami není nalezen\n"
-"v předpokládané složce, hledán se ve složce, zadané v proměnné prostředí\n"
-"TEXTDOMAINDIR.\n"
-"Je-li použit argument -s, chová se program podobně jako příkaz „echo“. Ale\n"
-"namísto toto, aby pouze zkopíroval svoje argumenty na standardní výstup,\n"
-"zprávy nalezené ve vybraném katalogu napřed přeloží. \n"
-"Standardní prohledávaná složka: %s\n"
+"\n"
+"  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
+"prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
+"v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, zadan�m\n"
+"v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
+"  Je-li pou�it argument -s, program se chov� jako p��kaz `echo'. M�sto toto,\n"
+"aby pouze kop�roval svoje argumenty do stdout, vyp��e p�eklad zpr�v ze\n"
+"zvolen�ho katalogu. \n"
+"\n"
+"  Standardn� prohled�van� adres��: %s\n"
 
 #: 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"
+msgstr ""
 
 #: 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 "Zobrazí v národním jazyce překlad textové zprávy, která gramaticky závisí na počtu.\n"
+msgstr ""
 
 # src/gettextp.c:233
 #: src/ngettext.c:222
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -317,20 +313,22 @@
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTOVÁ_DOMÉNA   získat přeložené zprávy z TEXTOVÉ_DOMÉNY\n"
-"  -e                            umožnit rozvoj některých sekvencí escape\n"
-"  -E                            (kvůli kompatibilitě, ignorován)\n"
-"  -h, --help                    vypsat tuto nápovědu a skončit\n"
-"  -n                            potlačit nové řádky na konci\n"
-"  -V, --version                 vypsat informace o verzi a skončit\n"
-"  [TEXTOVÁ_DOMÉNA]              překlady získat z TEXTOVÉ_DOMÉNY\n"
-"  ID_ZPRÁVY ID_PLURÁLU_ZPRÁVY   přeložit ID_ZPRÁVY (jednotné číslo) /\n"
-"                                ID_PLURÁLU_ZPRÁVY (množné číslo)\n"
-"  POČET                         zvolit jednotné/množné číslo podle této hodnoty\n"
+"Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID MSGID-PLURAL PO�ET\n"
+"  -d, --domain=TEXTOV�DOM�NA p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
+"  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
+"  -E                         (ignorov�n - kv�li kompatibilit�)\n"
+"  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
+"  -n                         potla�� nov� ��dky na konci zpr�vy\n"
+"  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
+"  [TEXTOV�DOM�NA]            p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
+"  MSGID MSGID-PLURAL         vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
+"                             MSGID / MSGID-PLURAL\n"
+"  PO�ET                      na z�klad� t�to hodnoty vybere odpov�daj�c�\n"
+"                             p�eklad\n"
 
 # src/gettextp.c:245
 #: src/ngettext.c:233
-#, c-format, no-wrap
+#, fuzzy, 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"
@@ -338,8 +336,1480 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Není-li zadán argument TEXTOVÁ_DOMÉNA, je doména určena z proměnné\n"
-"prostředí TEXTDOMAIN. Jestliže katalog se zprávami není nalezen\n"
-"v předpokládané složce, hledán se ve složce, zadané v proměnné prostředí\n"
-"TEXTDOMAINDIR.\n"
-"Standardní prohledávaná složka: %s\n"
+"\n"
+"  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
+"prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
+"v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, zadan�m\n"
+"v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
+"  Adres��, ve kter�m se hled�: %s\n"
+
+# lib/getopt.c:733
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nezn�m� p�ep�na� -- %c\n"
+
+# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
+# src/msgunfmt.c:175 src/xgettext.c:394
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "  Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "  Toto je voln� programov� vybaven�; podm�nky pro kop�rov�n� a "
+#~ "roz�i�ov�n�\n"
+#~ "naleznete ve zdrojov�ch textech. Toto programov� vybaven� je zcela BEZ "
+#~ "Z�RUKY,\n"
+#~ "a to i bez z�ruky PRODEJNOSTI nebo VHODNOSTI PRO N�JAK� KONKR�TN� ��EL.\n"
+
+# 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
+#~ msgid "error while opening \"%s\" for reading"
+#~ msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
+
+# src/msgfmt.c:321
+#, fuzzy
+#~ msgid "cannot open backup file \"%s\" for writing"
+#~ msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
+
+# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#, fuzzy
+#~ msgid "error reading \"%s\""
+#~ msgstr "chyba p�i �ten� \"%s\""
+
+# src/message.c:1182
+#, fuzzy
+#~ msgid "error writing \"%s\""
+#~ msgstr "chyba p�i z�pisu do souboru \"%s\""
+
+# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#, fuzzy
+#~ msgid "error after reading \"%s\""
+#~ msgstr "chyba p�i �ten� \"%s\""
+
+# src/message.c:1115
+#, fuzzy
+#~ msgid "cannot create pipe"
+#~ msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+# src/msgfmt.c:892
+#, fuzzy
+#~ msgid "number of format specifications in 'msgid' and '%s' does not match"
+#~ msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in '%s'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:892
+#, fuzzy
+#~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#~ msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:892
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#~ "tuple"
+#~ msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
+
+# src/msgfmt.c:892
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#~ "mapping"
+#~ msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/xgettext.c:378 src/xgettext.c:382
+#~ msgid "%s and %s are mutually exclusive"
+#~ msgstr "%s a %s se vz�jemn� vylu�uj�"
+
+# src/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                write the .po file using indented style\n"
+#~ "      --no-location           do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+#~ msgid "impossible selection criteria specified (%d < n < %d)"
+#~ msgstr "zad�no nemo�n� v�b�rov� krit�rium (%d < n < %d)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Concatenates and merges the specified PO files.\n"
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
+#~ "is specified, they will be taken from the first PO file to define them.\n"
+#~ "File positions from all PO files will be cumulated.\n"
+#~ msgstr ""
+#~ "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
+#~ "  -<, --less-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "m�n� ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno nekone�no\n"
+#~ "  ->, --more-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "v�ce ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno na 1\n"
+#~ "\n"
+#~ "  Nalezne zpr�vy, kter� jsou spole�n� pro dva nebo v�ce zadan�ch .po "
+#~ "soubor�.\n"
+#~ "Pou�it�m p�ep�na�e --more-than, lze dos�hnout zv�t�en� po�tu soubor�, "
+#~ "kter�m\n"
+#~ "mus� b�t zpr�va spole�n�. Naproti tomu p�ep�na� --less-than m��e b�t "
+#~ "pou�it\n"
+#~ "k v�pisu zpr�v, kter� jsou spole�n� m�n� ne� zadan�mu po�tu soubor� \n"
+#~ "(--less-then=2 zp�sob� v�pis zpr�v, kter� jsou obsa�eny pouze v jednom\n"
+#~ "souboru). P�eklady, koment��e a koment��e ze zdrojov�ch soubor� budou\n"
+#~ "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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 0 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
+#~ "  -<, --less-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "m�n� ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno nekone�no\n"
+#~ "  ->, --more-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "v�ce ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno na 1\n"
+#~ "\n"
+#~ "  Nalezne zpr�vy, kter� jsou spole�n� pro dva nebo v�ce zadan�ch .po "
+#~ "soubor�.\n"
+#~ "Pou�it�m p�ep�na�e --more-than, lze dos�hnout zv�t�en� po�tu soubor�, "
+#~ "kter�m\n"
+#~ "mus� b�t zpr�va spole�n�. Naproti tomu p�ep�na� --less-than m��e b�t "
+#~ "pou�it\n"
+#~ "k v�pisu zpr�v, kter� jsou spole�n� m�n� ne� zadan�mu po�tu soubor� \n"
+#~ "(--less-then=2 zp�sob� v�pis zpr�v, kter� jsou obsa�eny pouze v jednom\n"
+#~ "souboru). P�eklady, koment��e a koment��e ze zdrojov�ch soubor� budou\n"
+#~ "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/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -t, --to-code=NAME             encoding for output\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/msgcmp.c:160 src/msgmerge.c:267
+#~ msgid "no input files given"
+#~ msgstr "vstupn� soubory nejsou zad�ny"
+
+# src/msgcmp.c:165 src/msgmerge.c:272
+#~ msgid "exactly 2 input files required"
+#~ msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
+
+# src/msgcmp.c:186
+#, fuzzy
+#~ msgid ""
+#~ "Compare two Uniforum style .po files to check that both contain the same\n"
+#~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
+#~ "file (generally created by xgettext).  This is useful for checking that\n"
+#~ "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 ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty po�adovan� dlouh�mi p�ep�na�i, jsou tak� po�adov�ny jejich\n"
+#~ "kr�tk�mi formami.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu pro hled�n� "
+#~ "vstupn�ch\n"
+#~ "                           soubor�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "\n"
+#~ "  Porovn� dva .po soubory stylu Uniforum a zkontroluje, zda oba obsahuj�\n"
+#~ "stejnou mno�inu msgid �et�zc�. Soubor def.po je existuj�c� PO soubor se "
+#~ "star�m\n"
+#~ "p�ekladem. Soubor ref.po je naposledy vytvo�en� PO soubor (obvykle "
+#~ "programem\n"
+#~ "xgettext). To je u�ite�n� pro kontrolu, �e m�te p�elo�enu ka�dou zpr�vu "
+#~ "ve\n"
+#~ "va�em programu. Pokud p�i porovn�v�n� nejsou zpr�vy p�esn� shodn�, zkoum� "
+#~ "se,\n"
+#~ "zda si nejsou podobn�.\n"
+
+# src/msgcmp.c:259 src/msgmerge.c:711
+#~ msgid "this message is used but not defined..."
+#~ msgstr "tato zpr�va je pou�ita, ale nikoli definov�na..."
+
+# src/msgcmp.c:261 src/msgmerge.c:713
+#~ msgid "...but this definition is similar"
+#~ msgstr "...ale tato definice je podobn�"
+
+# src/msgcmp.c:267 src/msgmerge.c:740
+#~ msgid "this message is used but not defined in %s"
+#~ msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+
+# src/msgcmp.c:281
+#~ msgid "warning: this message is not used"
+#~ msgstr "upozorn�n�: tato zpr�va nen� pou�ita"
+
+# src/po-lex.c:84
+#~ msgid "found %d fatal error"
+#~ msgid_plural "found %d fatal errors"
+#~ 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"
+
+#~ msgid "at least two files must be specified"
+#~ msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
+
+#, fuzzy
+#~ msgid ""
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be preserved, but only from the first\n"
+#~ "PO file to define them.  File positions from all PO files will be\n"
+#~ "cumulated.\n"
+#~ msgstr ""
+#~ "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
+#~ "  -<, --less-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "m�n� ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno nekone�no\n"
+#~ "  ->, --more-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "v�ce ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno na 1\n"
+#~ "\n"
+#~ "  Nalezne zpr�vy, kter� jsou spole�n� pro dva nebo v�ce zadan�ch .po "
+#~ "soubor�.\n"
+#~ "Pou�it�m p�ep�na�e --more-than, lze dos�hnout zv�t�en� po�tu soubor�, "
+#~ "kter�m\n"
+#~ "mus� b�t zpr�va spole�n�. Naproti tomu p�ep�na� --less-than m��e b�t "
+#~ "pou�it\n"
+#~ "k v�pisu zpr�v, kter� jsou spole�n� m�n� ne� zadan�mu po�tu soubor� \n"
+#~ "(--less-then=2 zp�sob� v�pis zpr�v, kter� jsou obsa�eny pouze v jednom\n"
+#~ "souboru). P�eklady, koment��e a koment��e ze zdrojov�ch soubor� budou\n"
+#~ "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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 1 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
+#~ "  -<, --less-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "m�n� ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno nekone�no\n"
+#~ "  ->, --more-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� "
+#~ "v�ce ne�\n"
+#~ "                              ��SLO kr�t, implicitn� nastaveno na 1\n"
+#~ "\n"
+#~ "  Nalezne zpr�vy, kter� jsou spole�n� pro dva nebo v�ce zadan�ch .po "
+#~ "soubor�.\n"
+#~ "Pou�it�m p�ep�na�e --more-than, lze dos�hnout zv�t�en� po�tu soubor�, "
+#~ "kter�m\n"
+#~ "mus� b�t zpr�va spole�n�. Naproti tomu p�ep�na� --less-than m��e b�t "
+#~ "pou�it\n"
+#~ "k v�pisu zpr�v, kter� jsou spole�n� m�n� ne� zadan�mu po�tu soubor� \n"
+#~ "(--less-then=2 zp�sob� v�pis zpr�v, kter� jsou obsa�eny pouze v jednom\n"
+#~ "souboru). P�eklady, koment��e a koment��e ze zdrojov�ch soubor� budou\n"
+#~ "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/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/msgfmt.c:273 src/xgettext.c:410
+#~ msgid "no input file given"
+#~ msgstr "vstupn� soubor nen� zad�n"
+
+# src/msgcmp.c:165 src/msgmerge.c:272
+#, fuzzy
+#~ msgid "exactly one input file required"
+#~ msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
+
+# src/gettextp.c:154
+#, fuzzy
+#~ msgid "missing command name"
+#~ msgstr "chyb� argumenty"
+
+# src/gettextp.c:154
+#, fuzzy
+#~ msgid "missing filter name"
+#~ msgstr "chyb� argumenty"
+
+#, fuzzy
+#~ msgid "at least one sed script must be specified"
+#~ msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
+
+# src/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/msgfmt.c:343
+#~ msgid "%d translated message"
+#~ msgid_plural "%d translated messages"
+#~ msgstr[0] "%d p�elo�en� zpr�va"
+#~ msgstr[1] "%d p�elo�en� zpr�vy"
+#~ msgstr[2] "%d p�elo�en�ch zpr�v"
+
+# src/msgfmt.c:345
+#~ msgid ", %d fuzzy translation"
+#~ msgid_plural ", %d fuzzy translations"
+#~ msgstr[0] ", %d ne�pln� p�eklad"
+#~ msgstr[1] ", %d ne�pln� p�eklady"
+#~ msgstr[2] ", %d ne�pln�ch p�eklad�"
+
+# src/msgfmt.c:347
+#~ msgid ", %d untranslated message"
+#~ msgid_plural ", %d untranslated messages"
+#~ 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/po-lex.c:332
+#, fuzzy
+#~ msgid "invalid nplurals value"
+#~ msgstr "neplatn� ��d�c� sekvence"
+
+# src/msgcmp.c:267 src/msgmerge.c:740
+#, fuzzy
+#~ msgid "...but some messages have only one plural form"
+#~ msgid_plural "...but some messages have only %lu plural forms"
+#~ msgstr[0] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+#~ msgstr[1] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+#~ msgstr[2] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+
+# src/msgcmp.c:267 src/msgmerge.c:740
+#, fuzzy
+#~ msgid "...but some messages have one plural form"
+#~ msgid_plural "...but some messages have %lu plural forms"
+#~ msgstr[0] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+#~ msgstr[1] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+#~ msgstr[2] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+
+# src/msgfmt.c:870
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#~ msgstr "ob� polo�ky `msgid' a `msgstr' nekon�� '\\n'"
+
+# src/msgfmt.c:561
+#, fuzzy
+#~ msgid "headerfield `%s' missing in header\n"
+#~ msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
+
+# src/msgfmt.c:564
+#, fuzzy
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
+
+# src/msgfmt.c:573
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "n�kter� polo�ky hlavi�ky maj� st�le po��te�n� implicitn� hodnotu"
+
+# src/msgfmt.c:583
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
+
+#, fuzzy
+#~ msgid "warning: PO file header missing or invalid\n"
+#~ msgstr ""
+#~ "%s: upozorn�n�: chyb� hlavi�ka PO souboru (ne�pln� nebo neplatn�)\n"
+#~ "%*s  upozorn�n�: p�evod znakov� sady nebude fungovat"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr ""
+#~ "%s: upozorn�n�: chyb� hlavi�ka PO souboru (ne�pln� nebo neplatn�)\n"
+#~ "%*s  upozorn�n�: p�evod znakov� sady nebude fungovat"
+
+# src/msgfmt.c:471
+#~ 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
+#~ msgid "domain name \"%s\" not suitable as file name: will use prefix"
+#~ msgstr ""
+#~ "jm�no dom�ny \"%s\" nen� vhodn� jako jm�no souboru: bude pou�ito jako "
+#~ "p�edpona"
+
+# src/msgfmt.c:489
+#~ msgid "`domain %s' directive ignored"
+#~ msgstr "p��kaz `domain %s' ignorov�n"
+
+# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
+#~ msgid "duplicate message definition"
+#~ msgstr "dvojn�sobn� definice zpr�vy"
+
+# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...toto je um�st�n� prvn� definice"
+
+# src/msgfmt.c:517
+#~ msgid "empty `msgstr' entry ignored"
+#~ msgstr "pr�zdn� polo�ka `msgstr' ignorov�na"
+
+# src/msgfmt.c:518
+#~ msgid "fuzzy `msgstr' entry ignored"
+#~ msgstr "ne�pln� polo�ka `msgstr' ignorov�na"
+
+# src/msgfmt.c:668
+#~ msgid "%s: warning: source file contains fuzzy translation"
+#~ msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
+
+# src/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "      --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "      --sort-output           generate sorted output\n"
+#~ "      --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+#, fuzzy
+#~ msgid "warning: "
+#~ msgstr "%s: upozorn�n�: "
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
+#~ "does not support this conversion."
+#~ msgstr ""
+#~ "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv()\n"
+#~ "a iconv() \"%s\" nepodporuje.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
+#~ "was built without iconv()."
+#~ msgstr ""
+#~ "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
+#~ "Tato verze byla kompilov�na bez iconv().\n"
+
+# src/msgmerge.c:321
+#, fuzzy
+#~ msgid ""
+#~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
+#~ "existing PO file with translations which will be taken over to the newly\n"
+#~ "created file as long as they still match; comments will be preserved,\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
+#~ "file is the last created PO file with up-to-date source references but\n"
+#~ "old translations, or a PO Template file (generally created by xgettext);\n"
+#~ "any translations or comments in the file will be discarded, however dot\n"
+#~ "comments and file positions will be preserved.  Where an exact match\n"
+#~ "cannot be found, fuzzy matching is used to produce better results.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  Slije dva .po soubory stylu Uniforum dohromady. Soubor def.po je "
+#~ "existuj�c�\n"
+#~ ".po soubor se star�mi p�eklady, kter� budou p�evzaty do nov� vytvo�en�ho\n"
+#~ "souboru, tak jak jsou, a k odpov�daj�c�m vzor�m. Koment��e budou "
+#~ "zachov�ny,\n"
+#~ "ale koment��e ze zdrojov�ch text� a pozice v souborech budou zahozeny.\n"
+#~ "  Soubor ref.po je posledn� vytvo�en� PO soubor (obvykle programem "
+#~ "xgettext).\n"
+#~ "V�echny p�eklady nebo koment��e z tohoto souboru budou zahozeny, av�ak \n"
+#~ "koment��e ze zdrojov�ch text� a pozice v souborech budou zachov�ny. "
+#~ "P�eklady,\n"
+#~ "kter� se nepoda�� p�i�adit na z�klad� p�esn� shody vzor�, budou p�i�azeny "
+#~ "na\n"
+#~ "z�klad� podobnosti vzor�. T�m je dosa�eno lep��ho slit� obou katalog�.\n"
+#~ "  Nen�-li v�stupn� soubor ur�en, v�sledek bude vypisov�n na standardn� "
+#~ "v�stup.\n"
+
+# src/msgcmp.c:267 src/msgmerge.c:740
+#, fuzzy
+#~ msgid "this message should define plural forms"
+#~ msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+
+# src/msgcmp.c:267 src/msgmerge.c:740
+#, fuzzy
+#~ msgid "this message should not define plural forms"
+#~ msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+
+# src/msgmerge.c:769
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%sP�e�teno %ld p�vodn�ch + %ld referen�n�ch, slito %ld, podobn�ch %ld,\n"
+#~ "chyb� %ld, zastaral�ch %ld.\n"
+
+# src/msgmerge.c:775
+#~ msgid " done.\n"
+#~ msgstr " dokon�eno.\n"
+
+# src/xgettext.c:378 src/xgettext.c:382
+#, fuzzy
+#~ msgid "%s and explicit file names are mutually exclusive"
+#~ msgstr "%s a %s se vz�jemn� vylu�uj�"
+
+# src/msgunfmt.c:215
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] [SOUBOR]...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -e, --no-escape          nepou��v� C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou��v� C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+#~ msgid "<stdin>"
+#~ msgstr "<standardn� vstup>"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: upozorn�n�: "
+
+#~ msgid ""
+#~ "Charset \"%s\" is not a portable encoding name.\n"
+#~ "Message conversion to user's charset might not work.\n"
+#~ msgstr ""
+#~ "Ozna�en� znakov� sady \"%s\" nen� portabiln� n�zev k�dov�n�. \n"
+#~ "P�evod znak� do u�ivatelsk� znakov� sady nebude fungovat.\n"
+
+#~ msgid "Continuing anyway, expect parse errors."
+#~ msgstr "Pokra�uji, p�edpokl�d�na chyba parsingu."
+
+#~ msgid "Continuing anyway."
+#~ msgstr "Pokra�uji."
+
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv(),\n"
+#~ "and iconv() does not support \"%s\".\n"
+#~ msgstr ""
+#~ "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv()\n"
+#~ "a iconv() \"%s\" nepodporuje.\n"
+
+#~ msgid ""
+#~ "Installing GNU libiconv and then reinstalling GNU gettext\n"
+#~ "would fix this problem.\n"
+#~ msgstr ""
+#~ "Instalace GNU libiconv a n�sledn� reinstalace GNU gettextu\n"
+#~ "m��e napravit tento probl�m.\n"
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv().\n"
+#~ "This version was built without iconv().\n"
+#~ msgstr ""
+#~ "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
+#~ "Tato verze byla kompilov�na bez iconv().\n"
+
+#~ msgid ""
+#~ "Charset missing in header.\n"
+#~ "Message conversion to user's charset 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"
+
+#~ msgid "inconsistent use of #~"
+#~ msgstr "nekonzistentn� pou�it� #~"
+
+# ../../src/po-gram.y:83
+#~ msgid "missing `msgstr[]' section"
+#~ msgstr "chyb� sekce `msgstr[]'"
+
+# ../../src/po-gram.y:83
+#~ msgid "missing `msgid_plural' section"
+#~ msgstr "chyb� sekce `msgid_plural'"
+
+# ../../src/po-gram.y:83
+#~ msgid "missing `msgstr' section"
+#~ msgstr "chyb� sekce `msgstr'"
+
+#~ msgid "first plural form has nonzero index"
+#~ msgstr "prvn� mno�n� ��slo m� nenulov� index"
+
+#~ msgid "plural form has wrong index"
+#~ msgstr "mno�n� ��slo m� chybn� index"
+
+# src/po-lex.c:129 src/po-lex.c:168
+#~ msgid "too many errors, aborting"
+#~ msgstr "p��li� mnoho chyb, kon��m"
+
+#~ msgid "invalid multibyte sequence"
+#~ msgstr "neplatn� v�ceznakov� sekvence"
+
+#, fuzzy
+#~ msgid "incomplete multibyte sequence at end of file"
+#~ msgstr "neplatn� v�ceznakov� sekvence"
+
+#, fuzzy
+#~ msgid "incomplete multibyte sequence at end of line"
+#~ msgstr "neplatn� v�ceznakov� sekvence"
+
+# src/po-lex.c:241
+#~ msgid "keyword \"%s\" unknown"
+#~ msgstr "kl��ov� slovo \"%s\" nen� zn�mo"
+
+# src/po-lex.c:332
+#~ msgid "invalid control sequence"
+#~ msgstr "neplatn� ��d�c� sekvence"
+
+# src/po-lex.c:420
+#~ msgid "end-of-file within string"
+#~ msgstr "konec souboru uprost�ed �et�zce"
+
+# src/po-lex.c:415
+#~ msgid "end-of-line within string"
+#~ msgstr "konec ��dku uprost�ed �et�zce"
+
+# src/msgunfmt.c:267 src/msgunfmt.c:331
+#, fuzzy
+#~ msgid "file \"%s\" is truncated"
+#~ msgstr "soubor \"%s\" je useknut�"
+
+# src/msgunfmt.c:373
+#~ msgid "file \"%s\" contains a not NUL terminated string"
+#~ msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+# src/msgunfmt.c:373
+#~ msgid "file \"%s\" is not in GNU .mo format"
+#~ msgstr "soubor \"%s\" nen� v GNU .mo form�tu"
+
+# src/msgunfmt.c:373
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
+#~ msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+# src/gettextp.c:164
+#, fuzzy
+#~ msgid "expected two arguments"
+#~ msgstr "p��li� mnoho argument�"
+
+# src/message.c:1182
+#, fuzzy
+#~ msgid "error writing stdout"
+#~ msgstr "chyba p�i z�pisu do souboru \"%s\""
+
+# src/message.c:1115
+#, fuzzy
+#~ msgid "cannot create a temporary directory using template \"%s\""
+#~ msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+# src/message.c:1182
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "chyba p�i z�pisu do souboru \"%s\""
+
+# src/msgfmt.c:321
+#~ msgid "error while opening \"%s\" for writing"
+#~ msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
+
+# src/message.c:784
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "zpr�vy katalogu nesm� obsahovat escape sekvenci `\\%c'"
+
+# src/message.c:1115
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+# src/message.c:1122
+#~ msgid "standard output"
+#~ msgstr "standardn� v�stup"
+
+# src/xget-lex.c:892
+#~ msgid "%s:%d: warning: unterminated character constant"
+#~ msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
+
+# src/xget-lex.c:914
+#~ msgid "%s:%d: warning: unterminated string literal"
+#~ msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+# src/xgettext.c:658 src/xgettext.c:968
+#~ msgid "this file may not contain domain directives"
+#~ msgstr "tento soubor nem��e obsahovat p��kazy pro dom�nu"
+
+# src/xgettext.c:386
+#~ 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"
+
+#~ 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:501
+#~ 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/msgmerge.c:303
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/xgettext.c:1342
+#~ msgid "language `%s' unknown"
+#~ msgstr "jazyk `%s' nen� zn�m"
+
+# src/msgunfmt.c:373
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+#~ msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+# src/msgunfmt.c:298
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:407
+#~ msgid "while creating hash table"
+#~ msgstr "p�i tvorb� ha�ovac� tabulky"
+
+# src/xget-lex.c:914
+#, fuzzy
+#~ msgid "%s:%lu: warning: keyword nested in keyword arg"
+#~ msgstr ""
+#~ "%s:%d: upozorn�n�: kl��ov� slovo uhn�zd�no v argumentu kl��ov�ho slova"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: keyword between outer keyword and its arg"
+#~ msgstr ""
+#~ "%s:%d: upozorn�n�: kl��ov� slovo mezi krajn�m kl��ov�m slovem\n"
+#~ "a jeho argumentem"
+
+# src/xgettext.c:340 src/xgettext.c:1256
+#~ msgid "while preparing output"
+#~ msgstr "p�i p��prav� v�stupu"
+
+# src/msgcmp.c:396 src/msgmerge.c:539
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "tato zpr�va nem� ��dnou definici v dom�n� \"%s\""
+
+# src/xgettext.c:537
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -d, --default-domain=JM�NO  zap��e v�stup do JM�NO.po (m�sto do "
+#~ "messages.po)\n"
+#~ "  -D, --directory=ADRES��     p�id� ADRES�� do seznamu adres��� pro "
+#~ "hled�n�\n"
+#~ "                              vstupn�ch soubor�\n"
+#~ "  -e, --no-escape             nepou��v� escape sekvence z C ve v�stupu\n"
+#~ "                              (implicitn�)\n"
+#~ "  -E, --escape                pou��v� C escape sekvence ve v�stupu, bez\n"
+#~ "                              roz���en�ch znak�\n"
+#~ "  -f, --files-from=SOUBOR     vezme seznam vstupn�ch soubor� ze SOUBORu\n"
+#~ "      --force-po              vyp��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -F, --sort-by-file          se�ad� v�stup podle um�st�n� zpr�v ve "
+#~ "zdrojov�ch\n"
+#~ "                              souborech\n"
+#~ "  -h, --help                  vyp��e tuto n�pov�du a ukon�� se\n"
+
+# src/xgettext.c:569
+#~ msgid ""
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "  -i, --indent                vyp��e .po soubor odsazovac�m stylem\n"
+#~ "      --no-location           nevytv��� ��dky '#: filename:line'\n"
+#~ "  -n, --add-location          vytv��� ��dky '#: jm�no_souboru:��dka' "
+#~ "��dky\n"
+#~ "                              (implicitn�)\n"
+#~ "      --omit-header           nevypisuje hlavi�ku s `msgid \"\"' "
+#~ "polo�kou\n"
+#~ "  -o, --output=SOUBOR         zap��e v�stup do ur�en�ho souboru\n"
+#~ "  -p, --output-dir=ADRES��    v�stupn� soubory budou um�st�ny do tohoto\n"
+#~ "                              adres��e\n"
+#~ "  -s, --sort-output           generuje se�azen� v�stup bez duplicitn�ch "
+#~ "zpr�v\n"
+#~ "      --strict                vytvo�� v�stupn� soubor ve stylu Uniforum\n"
+#~ "  -T, --trigraphs             rozum� ANSI C `trigraphs' na vstupu\n"
+#~ "  -u, --unique                zkratka pro --less-than=2, v�stupem budou "
+#~ "pouze\n"
+#~ "                              zpr�vy obsa�en� v katalog�ch pouze jednou\n"
+
+# src/msgfmt.c:366
+#~ msgid ""
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "Generate binary message catalog from textual translation description.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ "  -c, --check                 perform language dependent checks on "
+#~ "strings\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
+#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "  -v, --verbose               list input file anomalies\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
+#~ "\n"
+#~ "If input file is -, standard input is read.  If output file is -,\n"
+#~ "output is written to standard output.\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] soubor.po ...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro "
+#~ "odpov�daj�c�\n"
+#~ "kr�tk� formy.\n"
+#~ "\n"
+#~ "  -a, --alignment=��SLO    zarovn� �et�zce do ��SLO bajt� (implicitn�: "
+#~ "%d)\n"
+#~ "  -c, --check              vykon� jazykov� z�visl� kontroly �et�zc�\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -f, --use-fuzzy          ve v�stupu pou�ije i ne�pln� p�eklady\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "      --no-hash            bin�rn� soubor nebude obsahovat ha�ovac� "
+#~ "tabulku\n"
+#~ "  -o, --output-file=SOUBOR zap��e v�stup do souboru SOUBOR\n"
+#~ "      --statistics         vyp��e statistiky o p�ekladech\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            vyp��e seznam neobvyklost� ve vstupn�m "
+#~ "souboru\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "\n"
+#~ "  Zad�n�m p�ep�na�e -v v�ce ne� jednou, zv���te podrobnost v�pis�.\n"
+#~ "\n"
+#~ "  Bude-li vstupn� soubor -, bude �ten standardn� vstup. Jestli�e "
+#~ "v�stupn�\n"
+#~ "soubor bude -, v�stup bude vypisov�n do standardn�ho v�stupu.\n"
+
+# src/msgunfmt.c:229
+#~ msgid ""
+#~ "\n"
+#~ "Convert binary .mo files to Uniforum style .po files.\n"
+#~ "Both little-endian and big-endian .mo files are handled.\n"
+#~ "If no input file is given or it is -, standard input is read.\n"
+#~ "By default the output is written to standard output.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  P�ev�d� bin�rn� .mo soubory do .po soubor� stylu Uniforum. Oba typy ."
+#~ "mo\n"
+#~ "soubor� little-endian a big-endian jsou akceptov�ny.\n"
+#~ "  Nebude-li vstupn� soubor zad�n, nebo bude-li -, bude �ten standardn� "
+#~ "vstup.\n"
+#~ "Implicitn� je v�stup zapisov�n do standardn�ho v�stupu.\n"
+
+# src/xgettext.c:537
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Extract translatable string from given input files.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
+#~ "                                 preceding keyword lines) in output file\n"
+#~ "  -C, --c++                      shorthand for --language=C++\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -a, --extract-all             extrahuje v�echny �et�zce\n"
+#~ "  -c, --add-comments[=JMENOVKA] um�st� blok koment��e se JMENOVKOU (nebo "
+#~ "ty,\n"
+#~ "                                kter� p�edch�zej� ��dku s kl��ov�m "
+#~ "slovem)\n"
+#~ "                                do v�stupn�ho souboru\n"
+#~ "  -C, --c++                     zkratka pro --language=C++\n"
+#~ "      --debug                   detailn�j�� informace o rozpozn�v�n�\n"
+#~ "                                form�tovac�ch �et�zc�\n"
+#~ "  -d, --default-domain=JM�NO    pou�ije JM�NO.po pro v�stup (m�sto "
+#~ "messages.po)\n"
+#~ "  -D, --directory=ADRES��       p�id� ADRES�� do seznamu adres���, ve "
+#~ "kter�ch\n"
+#~ "                                se hledaj� vstupn� soubory\n"
+#~ "  -e, --no-escape               nepou��v� C escape sekvence ve v�stupu\n"
+#~ "                                (implicitn�)\n"
+#~ "  -E, --escape                  pou��v� C escape sekvence ve v�stupu, "
+#~ "bez\n"
+#~ "                                roz���en�ch znak�\n"
+#~ "  -f, --files-from=SOUBOR       seznam vstupn�ch soubor� bude �ten ze "
+#~ "SOUBORu\n"
+#~ "      --force-po                zap��e .po soubor, i kdy� bude pr�zdn�\n"
+#~ "      --foreign-user            vynech� copyright FSF ve v�stupu \n"
+#~ "  -F, --sort-by-file            se�ad� v�stup podle um�st�n� zpr�v\n"
+#~ "                                ve zdrojov�ch souborech\n"
+
+# src/xgettext.c:555
+#~ msgid ""
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "  -j, --join-existing            join messages with existing file\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ msgstr ""
+#~ "  -h, --help                    vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent                  ve v�stupn�m .po souboru pou�ije odsazen� "
+#~ "styl\n"
+#~ "  -j, --join-existing           spoj� zpr�vy z existuj�c�ch soubor�\n"
+#~ "  -k, --keyword[=SLOVO]         dodate�n� kl��ov� slovo, kter� bude "
+#~ "hled�no\n"
+#~ "                                (bez SLOVA, znamen� nepou�it� "
+#~ "implicitn�ch\n"
+#~ "                                kl��ov�ch slov)\n"
+#~ "  -L, --language=N�ZEV          zad�n� jazyka (C, C++)           \n"
+#~ "  -m, --msgstr-prefix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p�edponu "
+#~ "pro\n"
+#~ "                                polo�ky msgstr\n"
+#~ "  -M, --msgstr-suffix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p��ponu "
+#~ "pro\n"
+#~ "                                polo�ky msgstr\n"
+#~ "      --no-location             potla�� ��dky '#: jm�no_souboru:��dek'\n"
+
+# src/xgettext.c:569
+#~ msgid ""
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
+#~ "\n"
+#~ "If INPUTFILE is -, standard input is read.\n"
+#~ msgstr ""
+#~ "  -n, --add-location            vytv��� ��dky '#: jm�no_souboru:"
+#~ "��dek' (impl.)\n"
+#~ "      --omit-header             nezapisuje hlavi�ku s `msgid \"\"' "
+#~ "polo�kou\n"
+#~ "  -o, --output=SOUBOR           zap��e v�stup do ur�en�ho souboru\n"
+#~ "  -p, --output-dir=ADRES��      v�stupn� soubory budou um�st�ny do "
+#~ "adres��e\n"
+#~ "                                ADRES��\n"
+#~ "  -s, --sort-output             generuje se�azen� v�stup bez duplicitn�ch "
+#~ "zpr�v\n"
+#~ "      --strict                  v�stupn� soubor bude stylu Uniforum\n"
+#~ "  -T, --trigraphs               zapne podporu ANSI C `trigraphs' na "
+#~ "vstupu\n"
+#~ "  -V, --version                 vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO             nastav� v�stupn� ���ku str�nky\n"
+#~ "  -x, --exclude-file=SOUBOR     soubory ze SOUBORu nebudou zpracov�ny \n"
+#~ "\n"
+#~ "  Bude-li VSTUPN�SOUBOR -, bude �ten standardn� vstup.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/da.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/da.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/da.po gettext-0.18.1.1/gettext-runtime/po/da.po
--- gettext-0.19.3/gettext-runtime/po/da.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/da.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,88 +1,85 @@
 # gettext-0.10/po/da.po - initial revision  -*- po -*-
 # Copyright (C) 1996 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Keld Simonsen <keld@dkuug.dk>, 2001-2002.
+# Thorbj�rn Ravn Andersen <ravn@unixsnedkeren.dk>, 1996.
 #
 # Reviewed: 2001-08-31 olau@hardworking.dk
 #
-# Keld Simonsen <keld@dkuug.dk>, 2001-2002.
-# Thorbj�rn Ravn Andersen <ravn@unixsnedkeren.dk>, 1996.
-# Keld Simonsen <keld@keldix.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18\n"
+"Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2011-01-08 01:45+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2002-09-07 19:32+0200\n"
+"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "skrivefejl"
+msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tilvalget `--%s' kr�ver et argument\n"
+msgstr "%s: tilvalget `%s' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukendt tilvalg `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget '%c' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tilvalget `%s' kr�ver et argument\n"
 
@@ -99,10 +96,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Ophavsret � %s Free Software Foundation, Inc.\n"
-"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>\n"
-"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:139 src/ngettext.c:129
 #, c-format
@@ -112,7 +105,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
@@ -125,44 +118,47 @@
 msgstr "argumenter mangler"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
 
 #: src/envsubst.c:176
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Brug: %s [TILVALG] [SKAL-FORMAT]...\n"
+msgstr "Brug: %s [TILVALG] [FIL]...\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Erstatter v�rdierne af milj�variable.\n"
+msgstr ""
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "K�rselstilstand:\n"
+msgstr ""
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             vis variablene der optr�der i SKAL-FORMAT\n"
+msgstr ""
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Informativt uddata:\n"
+msgstr ""
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                     vis denne hj�lp og afslut\n"
+msgstr ""
 
 #: src/envsubst.c:198
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               vis versionsinformation og afslut\n"
+msgstr ""
+"Informativt uddata:\n"
+"  -h, --help                  vis denne hj�lp og afslut\n"
+"  -V, --version               vis versionsinformation og afslut\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -174,12 +170,6 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"I normal k�rselstilstand kopieres standard-inddata til standard-uddata,\n"
-"med referencer til milj�variable p� formen $VARIABLE eller ${VARIABLE}\n"
-"erstattet med den tilsvarende v�rdi. Hvis et SKAL-FORMAT er angivet,\n"
-"bliver kun de milj�variable som refereres i SKAL-FORMAT erstattet;\n"
-"ellers erstates alle milj�variabelreferencer der optr�der i\n"
-"standard-inddata.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -187,8 +177,6 @@
 "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 ""
-"N�r --variables bruges, ignores inddata, og uddata best�r af\n"
-"milj�variablene der optr�der i SKAL-FORMAT, �n per linje.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -210,7 +198,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
+msgstr ""
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -247,13 +235,13 @@
 "                            TEKSTID fra TEKSTDOM�NE\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -316,3 +304,2061 @@
 "s�dvanlige filkatalog, kan en anden placering angives vha milj�variablen\n"
 "TEXTDOMAINDIR.\n"
 "Standard-filkataloget for s�gning er: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovligt tilvalg -- %c\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright � %s Free Software Foundation, Inc.\n"
+#~ "Dette er frit programmel; se kildekoden for kopieringsbetingelser.  Der "
+#~ "er\n"
+#~ "INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET "
+#~ "S�RLIGT\n"
+#~ "FORM�L.\n"
+
+#~ msgid "invalid argument `%s' for `%s'"
+#~ msgstr "Ugyldigt argument '%s' for '%s'"
+
+#~ msgid "ambiguous argument `%s' for `%s'"
+#~ msgstr "flertydigt argument '%s' for '%s'"
+
+#~ msgid "Valid arguments are:"
+#~ msgstr "Gyldige argumenter er:"
+
+#~ msgid "error while opening \"%s\" for reading"
+#~ msgstr "fejl ved l�se-�bning af '%s'"
+
+#~ msgid "cannot open backup file \"%s\" for writing"
+#~ msgstr "Kan ikke �bne sikkerhedskopi-fil '%s' for skrivning"
+
+#~ msgid "error reading \"%s\""
+#~ msgstr "fejl ved l�sning af '%s'"
+
+#~ msgid "error writing \"%s\""
+#~ msgstr "fejl ved skrivning til filen '%s'"
+
+#~ msgid "error after reading \"%s\""
+#~ msgstr "fejl efter l�sning af '%s'"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s-underproces mislykkedes"
+
+#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
+#~ msgstr ""
+#~ "Javakompilator ikke fundet, fors�g at installere gcj eller s�t $JAVAC"
+
+#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
+#~ msgstr ""
+#~ "Virtuel Javamaskine ikke fundet, fors�g at installere gij eller s�t $JAVA"
+
+#~ msgid "cannot create pipe"
+#~ msgstr "kan ikke oprette datakanal '%s'"
+
+#~ msgid "%s subprocess"
+#~ msgstr "%s underproces"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "%s underproces fik et d�deligt signal %d"
+
+#~ msgid "number of format specifications in 'msgid' and '%s' does not match"
+#~ msgstr ""
+#~ "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
+
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens"
+
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i "
+#~ "\"msgid\""
+
+#~ msgid "a format specification for argument %u doesn't exist in '%s'"
+#~ msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
+
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i "
+#~ "\"msgid\""
+
+#~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
+#~ msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\""
+
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
+#~ msgstr ""
+#~ "formatangivelser i 'msgid' og '%s' for argument {%u} er ikke det samme"
+
+#~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#~ msgstr "formatangivelser i 'msgid' og '%s' er ikke de samme"
+
+#~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#~ msgstr ""
+#~ "formateringsdirektiv i \"%s\" er ikke en delm�ngde af dem i \"msgid\""
+
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#~ "tuple"
+#~ msgstr ""
+#~ "formateringsdirektiv i \"msgid\" tager en afbildning, dem i \"%s\" tager "
+#~ "en tuppel"
+
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#~ "mapping"
+#~ msgstr ""
+#~ "formateringsdirektiv i \"msgid\" tager en tuppel, de i \"%s\" tager en "
+#~ "afbildning"
+
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "formateringsdirektiv for argument \"%s\", som i \"%s\", findes ikke i "
+#~ "\"msgid\""
+
+#~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
+#~ msgstr "formateringsdirektiv for argument \"%s\" findes ikke i \"%s\""
+
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
+#~ msgstr ""
+#~ "formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens"
+
+#~ msgid "Usage: %s [OPTION]\n"
+#~ msgstr "Brug: %s [TILVALG]\n"
+
+#~ msgid "Print the machine's hostname.\n"
+#~ msgstr "Skriv maskinens v�rtsnavn.\n"
+
+#~ msgid ""
+#~ "Output format:\n"
+#~ "  -s, --short           short host name\n"
+#~ "  -f, --fqdn, --long    long host name, includes fully qualified domain "
+#~ "name,\n"
+#~ "                          and aliases\n"
+#~ "  -i, --ip-address      addresses for the hostname\n"
+#~ msgstr ""
+#~ "Resultatformat:\n"
+#~ "  -s, --short           kort v�rtsnavn\n"
+#~ "  -f, --fqdn, --long    langt v�rtsnavn, indholder hele dom�nenavnet og "
+#~ "alias\n"
+#~ "  -i, --ip-address      adresser for v�rtsnavnet\n"
+
+#~ msgid "could not get host name"
+#~ msgstr "kunne ikke hente v�rtsnavn"
+
+#~ msgid "at most one input file allowed"
+#~ msgstr "H�jst �n inddatalinje tilladt"
+
+#~ msgid "%s and %s are mutually exclusive"
+#~ msgstr "%s og %s udelukker hinanden"
+
+#~ msgid "Usage: %s [OPTION] [INPUTFILE]\n"
+#~ msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
+
+#~ msgid ""
+#~ "Filters the messages of a translation catalog according to their "
+#~ "attributes,\n"
+#~ "and manipulates the attributes.\n"
+#~ msgstr ""
+#~ "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
+#~ "manipulerer attributterne.\n"
+
+#~ msgid ""
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ msgstr ""
+#~ "Hvis et langt tilvalg kr�ver et argument, g�lder det ogs� for det "
+#~ "tilsvarende\n"
+#~ "korte tilvalg.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  INDDATAFIL                   PO inddatafil\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis ingen inddatafil er angivet eller den er -, l�ses fra standard-"
+#~ "inddata.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL       uddata skrives til FIL\n"
+#~ "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er "
+#~ "angivet,\n"
+#~ "eller hvis den er angivet som - .\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "      --translated            keep translated, remove untranslated "
+#~ "messages\n"
+#~ "      --untranslated          keep untranslated, remove translated "
+#~ "messages\n"
+#~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+#~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+#~ "      --no-obsolete           remove obsolete #~ messages\n"
+#~ "      --only-obsolete         keep obsolete #~ messages\n"
+#~ msgstr ""
+#~ "Beskedsvalg:\n"
+#~ "      --translated            behold oversatte, fjern uoversatte "
+#~ "beskeder\n"
+#~ "      --untranslated          behold uoversatte, fjern oversatte "
+#~ "beskeder\n"
+#~ "      --no-fuzzy              fjern beskeder markerede som \"fuzzy\"\n"
+#~ "      --only-fuzzy            behold beskeder markerede som \"fuzzy\"\n"
+#~ "      --no-obsolete           fjern for�ldede #~ beskeder\n"
+#~ "      --only-obsolete         behold for�ldede #~ beskeder\n"
+
+#~ msgid ""
+#~ "Attribute manipulation:\n"
+#~ "      --set-fuzzy             set all messages 'fuzzy'\n"
+#~ "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+#~ "      --set-obsolete          set all messages obsolete\n"
+#~ "      --clear-obsolete        set all messages non-obsolete\n"
+#~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-"
+#~ "obsolete\n"
+#~ msgstr ""
+#~ "Attributmanipulation:\n"
+#~ "      --set-fuzzy             mark�r alle beskeder som \"fuzzy\"\n"
+#~ "      --clear-fuzzy           fjern \"fuzzy\"-markering fra alle "
+#~ "beskeder\n"
+#~ "      --set-obsolete          mark�r alle beskeder som for�ldede\n"
+#~ "      --clear-obsolete        fjern for�ldet-markering fra alle beskeder\n"
+#~ "      --fuzzy                 samme som --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              samme som --only-obsolete --clear-obsolete\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                write the .po file using indented style\n"
+#~ "      --no-location           do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Detaljer om uddata:\n"
+#~ "  -e, --no-escape             brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                brug C-escapesekvenser i uddata. Ingen "
+#~ "specialtegn\n"
+#~ "      --force-po              skriv PO-fil selv om den er tom\n"
+#~ "  -i, --indent                benyt indrykket stil for uddata\n"
+#~ "      --no-location           undlad skrivning af '#: filnavn:linje' "
+#~ "linjer\n"
+#~ "  -n, --add-location          skriv '#: filenavn:linje' linjer "
+#~ "(standard)\n"
+#~ "      --strict                benyt 'streng Uniforum'-st�l for uddata\n"
+#~ "  -w, --width=TAL             angiv udskrivningsbredde\n"
+#~ "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                              uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output           gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file          sort�r uddata efter filplacering\n"
+
+#~ msgid "impossible selection criteria specified (%d < n < %d)"
+#~ msgstr "Umuligt udv�lgelseskriterium angivet (%d < n < %d)"
+
+#~ msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
+#~ msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
+
+#~ msgid ""
+#~ "Concatenates and merges the specified PO files.\n"
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
+#~ "is specified, they will be taken from the first PO file to define them.\n"
+#~ "File positions from all PO files will be cumulated.\n"
+#~ msgstr ""
+#~ "Sammenl�gger og fletter de angivne PO-filer.\n"
+#~ "Find beskeder som er f�lles for to eller flere af de angivne PO-filer.\n"
+#~ "Ved brug af --more-than-tilvalget kan en st�rre ensartethed anmodes om\n"
+#~ "f�r beskeder udskrives. Modsat kan --less-than-tilvalget bruges til at "
+#~ "angive\n"
+#~ "mindre ensartethed f�r beskeder udskrives (dvs --less-than=2 vil kun "
+#~ "udskrive\n"
+#~ "de unikke beskeder). Overs�ttelser, kommentarer og ekstrakt-kommentarer "
+#~ "sammenbringes,\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE ...                  input files\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  INDDATAFIL ...                 inddatafiler\n"
+#~ "  -f, --files-from=FIL           hent inddatafilliste fra FIL\n"
+#~ "  -D, --directory=FILKATALOG     gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis inddatafilen er -, l�ses fra standard-inddata.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE         write output to specified file\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL          uddata skrives til FIL\n"
+#~ "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er "
+#~ "angivet\n"
+#~ "eller hvis den er angivet som - .\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 0 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Udv�lgelse af tekster:\n"
+#~ "  -<, --less-than=TAL            udskriv beskeder med mindre end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er uendelig hvis ikke sat\n"
+#~ "  ->, --more-than=TAL            udskriv beskeder med flere end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er 0 hvis ikke sat\n"
+#~ "  -u, --unique                   kort skrivem�de for --less-than=2, "
+#~ "foranlediger\n"
+#~ "                                 at kun unikke beskeder udskrives\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -t, --to-code=NAME             encoding for output\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -t, --to-code=NAME             kodning for uddata\n"
+#~ "      --use-first                brug f�rst tilg�ngelige overs�ttelse for "
+#~ "hver\n"
+#~ "                                 besked, flet ikke flere overs�ttelser\n"
+#~ "  -e, --no-escape                brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                   brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po                 skriv PO-filen selv om den er tom\n"
+#~ "  -i, --indent                   benyt indrykket stil for uddata\n"
+#~ "      --no-location              undertryk '#: filnavn:linje' linjer\n"
+#~ "  -n, --add-location             gener�r '#: filnavn:linje' linjer "
+#~ "(standard)\n"
+#~ "      --strict                   benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL                s�t udskrivningsbredde\n"
+#~ "      --no-wrap                  ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                                 uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output              gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file             sort�r uddata efter filplacering\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                     vis denne hj�lp og afslut\n"
+#~ "  -V, --version                  vis versionsinformation og afslut\n"
+
+#~ msgid "no input files given"
+#~ msgstr "ingen filer angivet som inddata"
+
+#~ msgid "exactly 2 input files required"
+#~ msgstr "der kr�ves netop to inddatafiler"
+
+#~ msgid "Usage: %s [OPTION] def.po ref.pot\n"
+#~ msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
+
+#~ msgid ""
+#~ "Compare two Uniforum style .po files to check that both contain the same\n"
+#~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
+#~ "file (generally created by xgettext).  This is useful for checking that\n"
+#~ "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 ""
+#~ "Sammenlign to .po-filer i Uniforum-format for at kontrollere at de begge\n"
+#~ "indeholder det samme s�t af msgid-tekststrenge. PO-filen 'gammel.po' "
+#~ "indeholder\n"
+#~ "de gamle overs�ttelser. PO-filen 'ny.pot' er den seneste PO-udgave eller "
+#~ "en\n"
+#~ "PO skabelon (s�dvanligvis oprettet af xgettext).\n"
+#~ "Dette er en praktisk m�de at kontrollere at hver\n"
+#~ "eneste tekst i programmet er oversat. Hvis der ikke er n�jagtigt "
+#~ "sammenfald\n"
+#~ "mellem msgid-tekststrengene, benyttes en upr�cis sammenligningsmetode til "
+#~ "at\n"
+#~ "give bedre fejlretningsinformation.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  def.po                      translations\n"
+#~ "  ref.pot                     references to the sources\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  def.po                      overs�ttelser\n"
+#~ "  ref.pot                     referencer til kildeteksterne\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+
+#~ msgid ""
+#~ "Operation modifiers:\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#~ "po\n"
+#~ msgstr ""
+#~ "Bearbejdningsvarianter:\n"
+#~ "  -m, --multi-domain          brug ref.pot til hvert dom�ne i def.po\n"
+
+#~ msgid "this message is used but not defined..."
+#~ msgstr "denne tekst bruges, men er ikke erkl�ret..."
+
+#~ msgid "...but this definition is similar"
+#~ msgstr "...men denne tekst ligner"
+
+#~ msgid "this message is used but not defined in %s"
+#~ 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"
+
+#~ msgid "found %d fatal error"
+#~ msgid_plural "found %d fatal errors"
+#~ msgstr[0] "fandt %d fatal fejl"
+#~ msgstr[1] "fandt %d fatale fejl"
+
+#~ msgid "at least two files must be specified"
+#~ msgstr "Mindst to filer skal angives"
+
+#~ msgid ""
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be preserved, but only from the first\n"
+#~ "PO file to define them.  File positions from all PO files will be\n"
+#~ "cumulated.\n"
+#~ msgstr ""
+#~ "Find beskeder som er f�lles for to eller flere af de angivne PO-filer.\n"
+#~ "Ved brug af --more-than-tilvalget kan en st�rre ensartethed anmodes om\n"
+#~ "f�r beskeder udskrives. Modsat kan --less-than tilvalget bruges til at "
+#~ "angive\n"
+#~ "mindre ensartethed f�r beskeder udskrives (dvs --less-than=2 vil kun "
+#~ "udskrive\n"
+#~ "de unikke beskeder). Overs�ttelser, kommentarer og ekstrakt-kommentarer "
+#~ "beholdes,\n"
+#~ "men kun fra den f�rste PO-fil, der definerer dem. Filpositioner fra alle "
+#~ "PO-filer\n"
+#~ "vil blive sammenbragt.\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 1 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Udv�lgelse af tekster:\n"
+#~ "  -<, --less-than=TAL            udskriv beskeder med mindre end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er uendelig hvis ikke sat\n"
+#~ "  ->, --more-than=TAL            udskriv beskeder med flere end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er 1 hvis ikke sat\n"
+#~ "  -u, --unique                   kort skrivem�de for --less-than=2, "
+#~ "foranlediger\n"
+#~ "                                 at kun unikke beskeder udskrives\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape                brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                   brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po                 skriv PO-filen selv om den er tom\n"
+#~ "  -i, --indent                   benyt indrykket stil for uddata\n"
+#~ "      --no-location              undertryk '#: filnavn:linje' linjer\n"
+#~ "  -n, --add-location             gener�r '#: filnavn:linje' linjer "
+#~ "(standard)\n"
+#~ "      --strict                   benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL                s�t udskrivningsbredde\n"
+#~ "      --no-wrap                  ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                                 uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output              gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file             sort�r uddata efter filplacering\n"
+#~ "      --omit-header              udskriv ikke header med 'msgid \"\"' "
+#~ "indgang\n"
+
+#~ msgid "Converts a translation catalog to a different character encoding.\n"
+#~ msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
+
+#~ msgid ""
+#~ "Conversion target:\n"
+#~ "  -t, --to-code=NAME          encoding for output\n"
+#~ "The default encoding is the current locale's encoding.\n"
+#~ msgstr ""
+#~ "Konverteringsm�l:\n"
+#~ "  -t, --to-code=NAVN          Kodning for uddata\n"
+#~ "Standardv�rdi er nuv�rende locales kodning.\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape             brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po              skriv PO-filen selv om den er tom\n"
+#~ "  -i, --indent                benyt indrykket stil for uddata\n"
+#~ "      --no-location           undertryk '#: filnavn:linje' linjer\n"
+#~ "      --add-location          bevar '#: filnavn:linje' linjer (standard)\n"
+#~ "      --strict                benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL             s�t udskrivningsbredde\n"
+#~ "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                              uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output           gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file          sort�r uddata efter filplacering\n"
+
+#~ msgid "no input file given"
+#~ msgstr "ingen inddatafil angivet"
+
+#~ msgid "exactly one input file required"
+#~ msgstr "der kr�ves pr�cist �n inddatafil"
+
+#~ msgid "Usage: %s [OPTION] INPUTFILE\n"
+#~ msgstr "Brug: %s [FLAG] INDFIL\n"
+
+#~ msgid ""
+#~ "Creates an English translation catalog.  The input file is the last\n"
+#~ "created English PO file, or a PO Template file (generally created by\n"
+#~ "xgettext).  Untranslated entries are assigned a translation that is\n"
+#~ "identical to the msgid, and are marked fuzzy.\n"
+#~ msgstr ""
+#~ "Opretter et engelsk beskedskatalog. Indfilen er den senest oprettede\n"
+#~ "engelske PO-fil eller en PO-skabelonsfil (normalt lavet med xgettext).\n"
+#~ "Uoversatte poster gives en overs�ttelse som er identisk med msgid og\n"
+#~ "markeres som uafklaret.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO or POT file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddata:\n"
+#~ "  INDDATAFIL                  PO- eller POT-inddatafil\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis inddatafilen er -, l�ses fra standard-input.\n"
+
+#~ msgid "missing command name"
+#~ msgstr "kommandonavn mangler"
+
+#~ msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+#~ msgstr "Brug: %s [TILVALG] KOMMANDO [KOMMANDOTILVALG]\n"
+
+#~ msgid ""
+#~ "Applies a command to all translations of a translation catalog.\n"
+#~ "The COMMAND can be any program that reads a translation from standard\n"
+#~ "input.  It is invoked once for each translation.  Its output becomes\n"
+#~ "msgexec's output.  msgexec's return code is the maximum return code\n"
+#~ "across all invocations.\n"
+#~ msgstr ""
+#~ "Udf�rer en kommando p� alle overs�ttelser i et beskedskatalog.\n"
+#~ "KOMMANDO kan v�re hvilket som helst program som l�ser en besked fra\n"
+#~ "standard-ind. Det k�res en gang for hver besked. Uddata fra KOMMANDO\n"
+#~ "bliver uddata fra msgexec.  Slutstatusv�rdien for msgexec er den st�rste\n"
+#~ "slutstatusv�rdi fra alle kommandok�rslerne.\n"
+
+#~ msgid ""
+#~ "A special builtin command called '0' outputs the translation, followed by "
+#~ "a\n"
+#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs "
+#~ "-0\".\n"
+#~ msgstr ""
+#~ "En speciel indbygget kommando som heder \"0\" skriver ud beskeden fulgt\n"
+#~ "af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n"
+#~ "\"xargs -O\"\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  -i, --input=INPUTFILE       input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddata:\n"
+#~ "  -i, --input=INDDATAFIL      PO-inddatafil\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis ingen inddatafil  er angivet, eller er -, l�ses fra standard-input.\n"
+
+#~ msgid "write to stdout failed"
+#~ msgstr "skrivning til standard ud mislykkedes"
+
+#~ msgid "write to %s subprocess failed"
+#~ msgstr "skrivning til %s-underproces mislykkedes"
+
+#~ msgid "missing filter name"
+#~ msgstr "filternavn mangler"
+
+#~ msgid "at least one sed script must be specified"
+#~ msgstr "mindst et sed-skript skal angives"
+
+#~ msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+#~ msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
+
+#~ msgid "Applies a filter to all translations of a translation catalog.\n"
+#~ msgstr "Udf�rer et filter p� alle overs�ttelser i et beskedskatalog.\n"
+
+#~ msgid ""
+#~ "The FILTER can be any program that reads a translation from standard "
+#~ "input\n"
+#~ "and writes a modified translation to standard output.\n"
+#~ msgstr ""
+#~ "FILTER kan v�re hvilket som helst program som l�ser en overs�ttelse fra\n"
+#~ "standard ind og skriver den �ndrede overs�ttelse til standard ud.\n"
+
+#~ msgid ""
+#~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+#~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+#~ "commands\n"
+#~ "                                to be executed\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern "
+#~ "space\n"
+#~ msgstr ""
+#~ "Nyttige FILTERFLAG n�r FILTER er \"sed\":\n"
+#~ "  -e, --expression=SKRIPT     tilf�j SKRIPT til kommandoen der skal "
+#~ "udf�res\n"
+#~ "  -f, --file=SKRIPTFIL        tilf�j indholdet i SKRIPTFIL til "
+#~ "kommandoen\n"
+#~ "                                der skal udf�res\n"
+#~ "  -n, --quiet, --silent       undertryk automatisk udskrift af resultat\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "      --no-escape             brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po              skriv PO-filen selv om den er tom\n"
+#~ "      --indent                benyt indrykket stil for uddata\n"
+#~ "      --keep-header           behold header-indgang u�ndret, filtr�r det "
+#~ "ikke\n"
+#~ "      --no-location           undertryk '#: filnavn:linje' linjer\n"
+#~ "      --add-location          bevar '#: filnavn:linje' linjer (standard)\n"
+#~ "      --strict                benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL             s�t udskrivningsbredde\n"
+#~ "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                              uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output           gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file          sort�r uddata efter filplacering\n"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "kan ikke ops�tte ikke-blokerende I/O til %s-underproces"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "kommunikation med %s-underproces mislykkedes"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "l�sning fra %s-underproces mislykkedes"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s-underproces afsluttede med slutstatus %d"
+
+#~ msgid "the argument to %s should be a single punctuation character"
+#~ msgstr "argumentet til %s b�r v�re et enkelt skilletegn"
+
+#~ msgid "%s requires a \"-d directory\" specification"
+#~ msgstr "%s kr�ver at \"-d katalog\" angives"
+
+#~ msgid "%s requires a \"-l locale\" specification"
+#~ msgstr "%s kr�ver en \"-l lokale\"-angivelse"
+
+#~ msgid "%s is only valid with %s"
+#~ msgstr "%s er kun gyldig med %s"
+
+#~ msgid "%s is only valid with %s or %s"
+#~ msgstr "%s er kun gyldig med %s eller %s"
+
+#~ msgid "%d translated message"
+#~ msgid_plural "%d translated messages"
+#~ msgstr[0] "%d oversat tekst"
+#~ msgstr[1] "%d oversatte tekster"
+
+#~ msgid ", %d fuzzy translation"
+#~ msgid_plural ", %d fuzzy translations"
+#~ msgstr[0] ", %d uafklaret overs�ttelse"
+#~ msgstr[1] ", %d uafklarede overs�ttelser"
+
+#~ msgid ", %d untranslated message"
+#~ msgid_plural ", %d untranslated messages"
+#~ msgstr[0] ", %d uoversat tekst"
+#~ msgstr[1] ", %d uoversatte tekster"
+
+#~ msgid "Usage: %s [OPTION] filename.po ...\n"
+#~ msgstr "Brug: %s [FLAG] filnavn.po ...\n"
+
+#~ msgid ""
+#~ "Generate binary message catalog from textual translation description.\n"
+#~ msgstr ""
+#~ "Gener�r bin�rt tekstkatalog fra overs�ttelsebeskrivelse i kildetekst.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  filename.po ...             input files\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddata:\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis inddatafilen er -, l�ses fra standard-input.\n"
+
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle "
+#~ "class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+#~ "higher)\n"
+#~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+#~ msgstr ""
+#~ "K�rselstilstand:\n"
+#~ "  -j, --java                  Javatilstand: gener�r en Java "
+#~ "ResourceBundle-klasse\n"
+#~ "      --java2                 som --java, og antag Java2 (JDK 1.2 eller "
+#~ "h�jere)\n"
+#~ "      --tcl                   Tcl-tilstand: gener�r en tcl/msgcat .msg-"
+#~ "fil\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "If output file is -, output is written to standard output.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL       uddata skrives til FIL\n"
+#~ "Hvis uddatafilen er -, skrives uddata til standard-ud.\n"
+
+#~ msgid ""
+#~ "Output file location in Java mode:\n"
+#~ "  -r, --resource=RESOURCE     resource name\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of classes directory "
+#~ "hierarchy\n"
+#~ "The class name is determined by appending the locale name to the resource "
+#~ "name,\n"
+#~ "separated with an underscore.  The -d option is mandatory.  The class is\n"
+#~ "written under the specified directory.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil i Javatilstand:\n"
+#~ "  -r, --resource=RESSOURCE    ressourcenavn\n"
+#~ "  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
+#~ "  -d KATALOG                  startkatalog for klassers katalogtr�\n"
+#~ "Klassenavnet bestemmes ved at tilf�je localenavnet til ressourcenavnet\n"
+#~ "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
+#~ "i det opgivne katalog.\n"
+
+#~ msgid ""
+#~ "Output file location in Tcl mode:\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
+#~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
+#~ "specified directory.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil i Tcl-tilstand:\n"
+#~ "  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
+#~ "  -d KATALOG                  startkatalog for .msg-beskedskataloger\n"
+#~ "Flagene -l og -d er obligatoriske. .msg-filen skrives\n"
+#~ "i det opgivne katalog.\n"
+
+#~ msgid ""
+#~ "Input file interpretation:\n"
+#~ "  -c, --check                 perform all the checks implied by\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
+#~ "      --check-format          check language dependent format strings\n"
+#~ "      --check-header          verify presence and contents of the header "
+#~ "entry\n"
+#~ "      --check-domain          check for conflicts between domain "
+#~ "directives\n"
+#~ "                                and the --output-file option\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+#~ "msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard "
+#~ "accelerators for\n"
+#~ "                                menu items\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ msgstr ""
+#~ "Tolkning af indfil:\n"
+#~ "  -c, --check                 udf�r alle kontroller som foranlediges af\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
+#~ "      --check-format          kontroll�r sprogafh�ngige formatstrenge\n"
+#~ "      --check-header          verific�r tilstedev�relse og indhold af "
+#~ "headerindgange\n"
+#~ "      --check-domain          kontroll�r for konflikter mellem\n"
+#~ "                                dom�nedirektiv og flaget --output-file\n"
+#~ "  -C, --check-compatibility   kontroll�r at GNU msgfmt opf�rer sig som\n"
+#~ "                                X/Open msgfmt\n"
+#~ "      --check-accelerators[=TKN]   kontroll�r tilstedev�relse af "
+#~ "tastaturgenveje\n"
+#~ "                                for menuer\n"
+#~ "  -f, --use-fuzzy             brug uafklarede poster i resultatet\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
+#~ msgstr ""
+#~ "Uddatadetaljer:\n"
+#~ "  -a, --alignment=TAL         l�g strenge p� lige TAL byte (normalt: %d)\n"
+#~ "      --no-hash               bin�rfil indholder ikke hashtabellen\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                  vis denne hj�lp og afslut\n"
+#~ "  -V, --version               vis versionsinformation og afslut\n"
+#~ "      --statistics            udskriv statistik over overs�ttelser\n"
+#~ "  -v, --verbose               for�g udskreven information\n"
+
+#~ msgid "plural expression can produce negative values"
+#~ msgstr "flertalsudtryk kan give negative v�rdier"
+
+#~ 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"
+
+#~ msgid "plural expression can produce division by zero"
+#~ msgstr "flertalsudtryk kan give division med nul"
+
+#~ msgid "plural expression can produce integer overflow"
+#~ msgstr "flertalsudtryk kan give heltalsoverl�b"
+
+#~ msgid ""
+#~ "plural expression can produce arithmetic exceptions, possibly division by "
+#~ "zero"
+#~ msgstr "flertalsudtryk kan give aritmetiske fejl, m�ske division med nul"
+
+#~ msgid "message catalog has plural form translations..."
+#~ msgstr "tekstkatalog har overs�ttelser med flertalsform..."
+
+#~ msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
+#~ msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\""
+
+#~ msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
+#~ msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\""
+
+#~ msgid "invalid nplurals value"
+#~ msgstr "ugyldig nplurals-v�rdi"
+
+#~ msgid "invalid plural expression"
+#~ msgstr "ugyldigt flertalsudtryk"
+
+#~ msgid "nplurals = %lu..."
+#~ msgstr "nplurals = %lu..."
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Try using the following, valid for %s:\n"
+#~ msgstr "Pr�v at bruge det f�lgende, g�ldende for %s:\n"
+
+#~ msgid ""
+#~ "message catalog has plural form translations, but lacks a header entry "
+#~ "with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#~ msgstr ""
+#~ "beskedkatalog har overs�ttelser med flertalsformer, men mangler en "
+#~ "headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\""
+
+#~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#~ msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
+
+#~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#~ msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
+
+#~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#~ msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
+
+#~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#~ msgstr "`msgid' og `msgid_plural'-teksterne slutter ikke begge med '\\n'"
+
+#~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#~ msgstr "`msgid' og `msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
+
+#~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#~ msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
+
+#~ msgid "plural handling is a GNU gettext extension"
+#~ msgstr "flertalsbehandling er en GNU gettext-udvidelse"
+
+#~ msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+#~ msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
+
+#~ msgid "msgstr lacks the keyboard accelerator mark '%c'"
+#~ msgstr "msgstr mangler m�rket \"%c\" for tastaturgenvej"
+
+#~ msgid "msgstr has too many keyboard accelerator marks '%c'"
+#~ msgstr "msgstr har for mange m�rker \"%c\" for tastaturgenveje"
+
+#~ msgid "headerfield `%s' missing in header\n"
+#~ msgstr "feltet `%s' mangler i hovedet\n"
+
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "feltet '%s' i hovedet b�r starte ved linjens begyndelse\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "nogle felter i hovedet har stadig den oprindelige standardv�rdi\n"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet `%s' har stadig den oprindelige standardv�rdi\n"
+
+#~ msgid "warning: PO file header missing or invalid\n"
+#~ msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
+
+#~ msgid "warning: charset conversion will not work\n"
+#~ msgstr "advarsel: tegns�tskonvertering vil ikke virke\n"
+
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "advarsel: PO-filhoved er uafklaret\n"
+
+#~ 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"
+
+#~ msgid "domain name \"%s\" not suitable as file name"
+#~ msgstr "dom�net '%s' kan ikke bruges som filnavn"
+
+#~ 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"
+
+#~ msgid "`domain %s' directive ignored"
+#~ msgstr "`domain %s'-kommando ignoreres"
+
+#~ msgid "duplicate message definition"
+#~ msgstr "tekst erkl�ret mere end en gang"
+
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "... her er den f�rste erkl�ring"
+
+#~ msgid "empty `msgstr' entry ignored"
+#~ msgstr "tom `msgstr'-kommando ignoreret"
+
+#~ msgid "fuzzy `msgstr' entry ignored"
+#~ msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
+
+#~ msgid "%s: warning: source file contains fuzzy translation"
+#~ msgstr ""
+#~ "%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (fuzzy)"
+
+#~ msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
+#~ msgstr ""
+#~ "flaget \"%c\" kan ikke bruges f�rend \"K\" eller \"T\" er blevet angivet"
+
+#~ msgid ""
+#~ "Extracts all messages of a translation catalog that match a given "
+#~ "pattern\n"
+#~ "or belong to some given source files.\n"
+#~ msgstr ""
+#~ "Udtr�kker alle beskeder i et beskedskatalog som matcher et vist\n"
+#~ "m�nster eller h�rer til en given kildetekstfil.\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
+#~ "  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
+#~ "A message is selected if it comes from one of the specified source "
+#~ "files,\n"
+#~ "or if it comes from one of the specified domains,\n"
+#~ "or if -K is given and its key (msgid or msgid_plural) matches MSGID-"
+#~ "PATTERN,\n"
+#~ "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
+#~ "or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
+#~ "\n"
+#~ "When more than one selection criterion is specified, the set of selected\n"
+#~ "messages is the union of the selected messages of each criterion.\n"
+#~ "\n"
+#~ "MSGID-PATTERN or MSGSTR-PATTERN syntax:\n"
+#~ "  [-E | -F] [-e PATTERN | -f FILE]...\n"
+#~ "PATTERNs are basic regular expressions by default, or extended regular\n"
+#~ "expressions if -E is given, or fixed strings if -F is given.\n"
+#~ "\n"
+#~ "  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
+#~ "  -M, --domain=DOMAINNAME     select messages belonging to domain "
+#~ "DOMAINNAME\n"
+#~ "  -K, --msgid                 start of patterns for the msgid\n"
+#~ "  -T, --msgstr                start of patterns for the msgstr\n"
+#~ "  -E, --extended-regexp       PATTERN is an extended regular expression\n"
+#~ "  -F, --fixed-strings         PATTERN is a set of newline-separated "
+#~ "strings\n"
+#~ "  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
+#~ "  -f, --file=FILE             obtain PATTERN from FILE\n"
+#~ "  -i, --ignore-case           ignore case distinctions\n"
+#~ msgstr ""
+#~ "Udv�lgelse af besked:\n"
+#~ "  [-N KILDETEKSTFIL]... [-M DOM�NENAVN]...\n"
+#~ "  [-K MSGID-M�NSTER] [-T MSGSTR-M�NSTER] [-C KOMMENTAR-M�NSTER]\n"
+#~ "En besked v�lges hvis den kommer fra en af de angivne kildetekstfiler\n"
+#~ "eller hvis den kommer fra en af de angivne dom�ner,\n"
+#~ "eller hvis -K angives og n�glen (msgid eller msgid_plural) matcher MSGID-"
+#~ "M�NSTER,\n"
+#~ "eller hvis -T angives og overs�ttelsen (msgstr) matcher MSGSTR-M�NSTER,\n"
+#~ "eller hvis -C angives og overs�tterens kommentar matcher KOMMENTAR-"
+#~ "M�NSTER.\n"
+#~ "\n"
+#~ "N�r mere end et udv�lgelseskriterium angives er m�ngden af valgte "
+#~ "beskeder\n"
+#~ "foreningsm�ngden af udvalgte beskeder for hvert enkelt kriterium.\n"
+#~ "\n"
+#~ "Syntaks for MSGID-M�NSTER eller MSGSTR-M�NSTER:\n"
+#~ "  [-E | -F] [-e M�NSTER | -f FIL]...\n"
+#~ "M�NSTER er normale regul�re udtryk,\n"
+#~ "eller udvidede regul�re udtryk hvis -E angives,\n"
+#~ "eller almindelige strenge hvis -F angives.\n"
+#~ "\n"
+#~ "  -N, --location=KILDETEKSTFIL v�lg beskeder udtrukket fra KILDETEKSTFIL\n"
+#~ "  -M, --domain=DOM�NENAVN     v�lg beskeder som h�rer til dom�net "
+#~ "DOM�NENAVN\n"
+#~ "  -K, --msgid                 start af m�nster for id (msgid)\n"
+#~ "  -T, --msgstr                start af m�nster for overs�ttelse (msgstr)\n"
+#~ "  -E, --extended-regexp       M�NSTER er et udvidet regul�rt udtryk\n"
+#~ "  -F, --fixed-strings         M�NSTER er en m�ngde af nylinjeseparerede "
+#~ "strenge\n"
+#~ "  -e, --regexp=M�NSTER        brug M�NSTER som et regul�rt udtryk\n"
+#~ "  -f, --file=FIL              hent M�NSTER fra FIL\n"
+#~ "  -i, --ignore-case           versaluf�lsomt\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "      --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "      --sort-output           generate sorted output\n"
+#~ "      --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "      --no-escape             brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "      --escape                brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po              skriv PO-filen selv om den er tom\n"
+#~ "      --indent                benyt indrykket stil for uddata\n"
+#~ "      --no-location           undertryk '#: filnavn:linje' linjer\n"
+#~ "      --add-location          bevar '#: filnavn:linje' linjer (standard)\n"
+#~ "      --strict                benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL             s�t udskrivningsbredde\n"
+#~ "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                              uddatasidens bredde, til flere linjer\n"
+#~ "      --sort-output           gener�r sorteret uddata\n"
+#~ "      --sort-by-file          sort�r uddata efter filplacering\n"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "skrivning til grep-underproces mislykkedes"
+
+#~ msgid ""
+#~ "You are in a language indifferent environment.  Please set\n"
+#~ "your LANG environment variable, as described in the ABOUT-NLS\n"
+#~ "file.  This is necessary so you can test your translations.\n"
+#~ msgstr ""
+#~ "Du befinder dig i et sproguafh�ngigt milj�. S�t din milj�variabel\n"
+#~ "LANG som beskrevet i filen ABOUT-NLS. Dette er n�dvendigt for at\n"
+#~ "du kan teste dine overs�ttelser.\n"
+
+#~ msgid ""
+#~ "Output file %s already exists.\n"
+#~ "Please specify the locale through the --locale option or\n"
+#~ "the output .po file through the --output-file option.\n"
+#~ msgstr ""
+#~ "Udfil %s findes allerede.\n"
+#~ "Angiv locale med flaget --locale eller\n"
+#~ ".po-udfilen med flaget --output-file.\n"
+
+#~ msgid "Created %s.\n"
+#~ msgstr "Oprettede %s.\n"
+
+#~ msgid ""
+#~ "Creates a new PO file, initializing the meta information with values from "
+#~ "the\n"
+#~ "user's environment.\n"
+#~ msgstr ""
+#~ "Opretter en ny PO-fil og initierer metainformation med v�rdier fra\n"
+#~ "brugerens milj�variabler.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  -i, --input=INPUTFILE       input POT file\n"
+#~ "If no input file is given, the current directory is searched for the POT "
+#~ "file.\n"
+#~ "If it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  -i, --input=INDFIL          POT-indfil\n"
+#~ "Hvis ingen indfil angives, s�ges efter POT-filen i aktuelt katalog.\n"
+#~ "Hvis den er - l�ses standard ind.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified PO file\n"
+#~ "If no output file is given, it depends on the --locale option or the "
+#~ "user's\n"
+#~ "locale setting.  If it is -, the results are written to standard output.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL       uddata skrives til FIL\n"
+#~ "Hvis ingen udfil er angivet, afh�nger det af --locale tilvalget eller "
+#~ "brugerens\n"
+#~ "indstilling af locale. Hvis den er - skrives resultaterne p� standard "
+#~ "ud.\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -l, --locale=LL_CC          set target locale\n"
+#~ "      --no-translator         assume the PO file is automatically "
+#~ "generated\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ msgstr ""
+#~ "Uddatadetaljer:\n"
+#~ "  -l, --locale=LL_CC          s�t m�llocale\n"
+#~ "      --no-translator         antag at PO-filen er automatgenereret\n"
+#~ "  -w, --width=ANTAL           s�t sidebredde for uddata\n"
+#~ "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                              uddatasidens bredde, til flere linjer\n"
+
+#~ msgid ""
+#~ "Found more than one .pot file.\n"
+#~ "Please specify the input .pot file through the --input option.\n"
+#~ msgstr ""
+#~ "Fandt mere end en .pot-fil.\n"
+#~ "Angiv .pot-indfil med flaget --input.\n"
+
+#~ msgid "error reading current directory"
+#~ msgstr "fejl ved l�sning af aktuelt katalog"
+
+#~ msgid ""
+#~ "Found no .pot file in the current directory.\n"
+#~ "Please specify the input .pot file through the --input option.\n"
+#~ msgstr ""
+#~ "Fandt ingen .pot-fil i aktuelt katalog.\n"
+#~ "Angiv .pot-indfil med flaget --input.\n"
+
+#~ msgid "fdopen() failed"
+#~ msgstr "fdopen() mislykkedes"
+
+#~ msgid "%s subprocess I/O error"
+#~ msgstr "I/O-fejl i %s-underproces"
+
+#~ msgid "%s subprocess failed with exit code %d"
+#~ msgstr "%s-underproces fejlede med slutstatus %d"
+
+#~ msgid ""
+#~ "The new message catalog should contain your email address, so that users "
+#~ "can\n"
+#~ "give you feedback about the translations, and so that maintainers can "
+#~ "contact\n"
+#~ "you in case of unexpected technical problems.\n"
+#~ msgstr ""
+#~ "Det nye beskedkatalog b�r indeholde din e-postadresse s�\n"
+#~ "brugeren kan komme med kommentarer om overs�ttelserne og vedligeholdere "
+#~ "kan\n"
+#~ "kontakte dig i fald der er uventede tekniske problemer.\n"
+
+#~ msgid "English translations for %s package"
+#~ msgstr "Danske overs�ttelser for pakke %s"
+
+#~ msgid "present charset \"%s\" is not a portable encoding name"
+#~ msgstr "nuv�rende tegns�t \"%s\" er ikke et portabelt kodningsnavn"
+
+#~ msgid "two different charsets \"%s\" and \"%s\" in input file"
+#~ msgstr "to forskellige tegns�t \"%s\" og \"%s\" i indfilen"
+
+#~ msgid ""
+#~ "input file `%s' doesn't contain a header entry with a charset "
+#~ "specification"
+#~ msgstr ""
+#~ "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegns�t"
+
+#~ msgid ""
+#~ "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
+#~ "charset specification"
+#~ msgstr ""
+#~ "dom�ne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse "
+#~ "af tegns�t"
+
+#~ msgid "target charset \"%s\" is not a portable encoding name."
+#~ msgstr "m�ltegns�t \"%s\" er ikke et portabelt kodningsnavn"
+
+#~ msgid "warning: "
+#~ msgstr "advarsel: "
+
+#~ msgid ""
+#~ "Input files contain messages in different encodings, UTF-8 among others.\n"
+#~ "Converting the output to UTF-8.\n"
+#~ msgstr ""
+#~ "Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n"
+#~ "Konverterer resultatet til UTF-8.\n"
+
+#~ msgid ""
+#~ "Input files contain messages in different encodings, %s and %s among "
+#~ "others.\n"
+#~ "Converting the output to UTF-8.\n"
+#~ "To select a different output encoding, use the --to-code option.\n"
+#~ msgstr ""
+#~ "Indfiler har beskeder med flere kodninger, deriblandt %s og %s.\n"
+#~ "Konverterer resultatet til UTF-8.\n"
+#~ "Brug flaget --to-code for at v�lge en anden kodning.\n"
+
+#~ msgid ""
+#~ "Locale charset \"%s\" is different from\n"
+#~ "input file charset \"%s\".\n"
+#~ "Output of '%s' might be incorrect.\n"
+#~ "Possible workarounds are:\n"
+#~ msgstr ""
+#~ "Localetegns�ttet \"%s\" er forskelligt fra\n"
+#~ "indfilens tegns�t \"%s\".\n"
+#~ "Resultatet for \"%s\" kan blive forkert.\n"
+#~ "Mulige m�der at omg� problemet er:\n"
+
+#~ msgid "- Set LC_ALL to a locale with encoding %s.\n"
+#~ msgstr "- S�t LC_ALL til et locale med kodning %s.\n"
+
+#~ msgid ""
+#~ "- Convert the translation catalog to %s using 'msgconv',\n"
+#~ "  then apply '%s',\n"
+#~ "  then convert back to %s using 'msgconv'.\n"
+#~ msgstr ""
+#~ "- Konvert�r beskedskataloget til %s med \"msgconv\",\n"
+#~ "  udf�r derefter \"%s\",\n"
+#~ "  konvert�r s� tilbage til %s med \"msgconv\".\n"
+
+#~ msgid ""
+#~ "- Set LC_ALL to a locale with encoding %s,\n"
+#~ "  convert the translation catalog to %s using 'msgconv',\n"
+#~ "  then apply '%s',\n"
+#~ "  then convert back to %s using 'msgconv'.\n"
+#~ msgstr ""
+#~ "- S�t LC_ALL til et locale med kodning %s,\n"
+#~ "  konvert�r beskedskataloget til %s med \"msgconv\",\n"
+#~ "  udf�r derefter \"%s\"\n"
+#~ "  konvert�r s� tilbage til %s med \"msgconv\".\n"
+
+#~ msgid ""
+#~ "Locale charset \"%s\" is not a portable encoding name.\n"
+#~ "Output of '%s' might be incorrect.\n"
+#~ "A possible workaround is to set LC_ALL=C.\n"
+#~ msgstr ""
+#~ "Localetegns�t \"%s\" er ikke et portabelt kodningsnavn.\n"
+#~ "Resultatet for \"%s\" kan blive forkert.\n"
+#~ "En mulig m�de at omg� problemet er at s�tte LC_ALL=C.\n"
+
+#~ msgid "conversion failure"
+#~ msgstr "konverteringsfejl"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
+#~ "does not support this conversion."
+#~ msgstr ""
+#~ "Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(), og iconv() "
+#~ "underst�tter ikke denne konvertering."
+
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
+#~ "was built without iconv()."
+#~ msgstr ""
+#~ "Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(). Denne "
+#~ "version er bygget uden iconv()."
+
+#~ msgid "backup type"
+#~ msgstr "sikkerhedskopitype"
+
+#~ msgid ""
+#~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
+#~ "existing PO file with translations which will be taken over to the newly\n"
+#~ "created file as long as they still match; comments will be preserved,\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
+#~ "file is the last created PO file with up-to-date source references but\n"
+#~ "old translations, or a PO Template file (generally created by xgettext);\n"
+#~ "any translations or comments in the file will be discarded, however dot\n"
+#~ "comments and file positions will be preserved.  Where an exact match\n"
+#~ "cannot be found, fuzzy matching is used to produce better results.\n"
+#~ msgstr ""
+#~ "Kombinerer to .po filer i Uniforum-stil. `gammel.po' filen (som allerede "
+#~ "findes)\n"
+#~ "indholder gamle overs�ttelser som vil blive overf�rt til den nye PO-fil "
+#~ "under\n"
+#~ "foruds�tning af at de stadig passer; kommentarer vil blive bevaret, mens\n"
+#~ "fil-udtr�kskommentarer og filpositioner fjernes. 'ref.pot' filen er den\n"
+#~ "sidst producerede PO-fil med up-to-date kildereferencer, eller en PO-"
+#~ "skabelonsfil\n"
+#~ "(s�dvanligvis lavet af xgettext); alle overs�ttelser\n"
+#~ "og kommentarer vil blive bortkastet, men 'punktum'-kommentarer og\n"
+#~ "filpositioner vil blive bevaret. N�r der ikke kan findes en n�jagtig\n"
+#~ "overensstemmelse, vil 'l�s s�gning' (fuzzy matching) blive brugt til at "
+#~ "give\n"
+#~ "bedre resultater.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  def.po                      translations referring to old sources\n"
+#~ "  ref.pot                     references to new sources\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
+#~ "                              may be specified more than once\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  def.po                      overs�ttelser svarende til gamle "
+#~ "kildetekster\n"
+#~ "  ref.pot                     referencer til nye kildetekster\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "  -C, --compendium=FIL        yderligere bibliotek af tekst-"
+#~ "overs�ttelser,\n"
+#~ "                              kan angives mere end �n gang\n"
+
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -U, --update                update def.po,\n"
+#~ "                              do nothing if def.po already up to date\n"
+#~ msgstr ""
+#~ "K�rselstilstand:\n"
+#~ "  -U, --update                opdat�r def.po,\n"
+#~ "                              g�r ingenting hvis def.po allerede er "
+#~ "opdateret\n"
+
+#~ msgid ""
+#~ "Output file location in update mode:\n"
+#~ "The result is written back to def.po.\n"
+#~ "      --backup=CONTROL        make a backup of def.po\n"
+#~ "      --suffix=SUFFIX         override the usual backup suffix\n"
+#~ "The version control method may be selected via the --backup option or "
+#~ "through\n"
+#~ "the VERSION_CONTROL environment variable.  Here are the values:\n"
+#~ "  none, off       never make backups (even if --backup is given)\n"
+#~ "  numbered, t     make numbered backups\n"
+#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
+#~ "  simple, never   always make simple backups\n"
+#~ "The backup suffix is `~', unless set with --suffix or the "
+#~ "SIMPLE_BACKUP_SUFFIX\n"
+#~ "environment variable.\n"
+#~ msgstr ""
+#~ "Placering af udfil i opdateringstilstand:\n"
+#~ "Resultatet skrives tilbage til def.po.\n"
+#~ "      --backup=KONTROL        lav en sikkerhedskopi af def.po\n"
+#~ "      --suffix=ENDELSE        brug en anden endelse end den normale\n"
+#~ "Versionsh�ndteringen kan styres med --backup eller milj�variablen\n"
+#~ "VERSION_CONTROL.  Her er v�rdierne:\n"
+#~ "  none, off       lav aldrig sikkerhedskopier (selv hvis --backup "
+#~ "angives)\n"
+#~ "  numbered, t     lav nummererede sikkerhedskopier\n"
+#~ "  existing, nil   nummererede sikkerhedskopier hvis der findes s�danne, "
+#~ "ellers simple\n"
+#~ "  simple, never   lav altid simple sikkerhedskopier\n"
+#~ "Endelse for sikkerhedskopier er \"~\", hvis den ikke s�ttes med --suffix "
+#~ "eller\n"
+#~ "milj�variablen SIMPLE_BACKUP_SUFFIX.\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ "  -q, --quiet, --silent       suppress progress indicators\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                  vis denne hj�lp og afslut\n"
+#~ "  -V, --version               vis versionsinformation og afslut\n"
+#~ "  -v, --verbose               for�g udskreven information\n"
+#~ "  -q, --quiet, --silent       undertryk indikatorer for fremgang\n"
+
+#~ msgid "this message should define plural forms"
+#~ msgstr "denne tekst burde definere flertalsformer"
+
+#~ msgid "this message should not define plural forms"
+#~ msgstr "denne tekst burde ikke definere flertalsformer"
+
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%sL�ste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler "
+#~ "%ld, for�ldede %ld.\n"
+
+#~ msgid " done.\n"
+#~ msgstr " afsluttet.\n"
+
+#~ msgid "%s and explicit file names are mutually exclusive"
+#~ msgstr "%s og udtrykkelige filnavne udelukker hinanden"
+
+#~ msgid "Convert binary message catalog to Uniforum style .po file.\n"
+#~ msgstr "Konvert�r et bin�r beskedskatalog til en .po-fil af Uniforum-type\n"
+
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java               Java mode: input is a Java ResourceBundle "
+#~ "class\n"
+#~ "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
+#~ msgstr ""
+#~ "K�rselstilstand:\n"
+#~ "  -j, --java                  Javatilstand: inddata er en Java "
+#~ "ResourceBundle-klasse\n"
+#~ "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+#~ "fil\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  FILE ...                 input .mo files\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering for indfil:\n"
+#~ "  FIL ...                  .mo-infiler\n"
+#~ "Hvis ingen indfil er givet eller hvis den er - l�ses standard-ind.\n"
+
+#~ msgid ""
+#~ "Input file location in Java mode:\n"
+#~ "  -r, --resource=RESOURCE  resource name\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "The class name is determined by appending the locale name to the resource "
+#~ "name,\n"
+#~ "separated with an underscore.  The class is located using the CLASSPATH.\n"
+#~ msgstr ""
+#~ "Placering for indfil i Javatilstand:\n"
+#~ "  -r, --resource=RESSOURCE    ressourcenavn\n"
+#~ "  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
+#~ "Klassenavnet bestemmes ved at tilf�je localenavnet til ressourcenavnet\n"
+#~ "adskilt med en understreg. Klassen findes med hj�lp af CLASSPATH.\n"
+
+#~ msgid ""
+#~ "Input file location in Tcl mode:\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY             base directory of .msg message catalogs\n"
+#~ "The -l and -d options are mandatory.  The .msg file is located in the\n"
+#~ "specified directory.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil i Tcl-tilstand:\n"
+#~ "  -l, --locale=LOCALE      localenavn, enten sprog eller sprog_LAND\n"
+#~ "  -d KATALOG               startkatalog for .msg-beskedskataloger\n"
+#~ "Flagene -l og -d er obligatoriske. .msg-filen skrives\n"
+#~ "i det opgivne katalog.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE   write output to specified file\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL    uddata skrives til FIL\n"
+#~ "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er "
+#~ "angivet,\n"
+#~ "eller hvis den er angivet til - .\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape          brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape             brug C-escapesekvenser i uddata. Ingen "
+#~ "specialtegn\n"
+#~ "      --force-po           skriv PO-fil selv om den er tom\n"
+#~ "  -i, --indent             benyt indrykket stil for uddata\n"
+#~ "      --strict             benyt 'streng Uniforum'-st�l for uddata\n"
+#~ "  -w, --width=TAL          angiv udskrivningsbredde\n"
+#~ "      --no-wrap            ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                           uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output        gener�r sorteret uddata\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help               display this help and exit\n"
+#~ "  -V, --version            output version information and exit\n"
+#~ "  -v, --verbose            increase verbosity level\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                  vis denne hj�lp og afslut\n"
+#~ "  -V, --version               vis versionsinformation og afslut\n"
+#~ "  -v, --verbose               for�g udskreven information\n"
+
+#~ msgid ""
+#~ "Unifies duplicate translations in a translation catalog.\n"
+#~ "Finds duplicate translations of the same message ID.  Such duplicates "
+#~ "are\n"
+#~ "invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
+#~ "default, duplicates are merged together.  When using the --repeated "
+#~ "option,\n"
+#~ "only duplicates are output, and all other messages are discarded.  "
+#~ "Comments\n"
+#~ "and extracted comments will be cumulated, except that if --use-first is\n"
+#~ "specified, they will be taken from the first translation.  File "
+#~ "positions\n"
+#~ "will be cumulated.  When using the --unique option, duplicates are "
+#~ "discarded.\n"
+#~ msgstr ""
+#~ "Sammensl�r gentagede overs�ttelser i et beskedskatalog.\n"
+#~ "Finder gentagede overs�ttelser med samme besked-id (msgid). S�danne\n"
+#~ "gentagelser er ugyldigt inddata for andre programmer s�som msgfmt, "
+#~ "msgmerge\n"
+#~ "eller msgcat. I normaltilstand sl�s gentagelser sammen.\n"
+#~ "N�r flaget --repeated bruges skrives kun gentagede og alle andre\n"
+#~ "beskeder fjernes. Kommentarer og udtrukne kommentarer\n"
+#~ "samles sammen, undtagen n�r --use-first angives. Da tages de kun fra den "
+#~ "f�rste\n"
+#~ "overs�ttelse. Filpositioner samles sammen.\n"
+#~ "N�r flaget --unique angives fjernes alle gentagede.\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -d, --repeated                 print only duplicates\n"
+#~ "  -u, --unique                   print only unique messages, discard "
+#~ "duplicates\n"
+#~ msgstr ""
+#~ "Beskedsvalg:\n"
+#~ "  -d, --repeated                 skriv kun gentagede beskeder\n"
+#~ "  -u, --unique                   skriv kun unikke beskeder, gentagede "
+#~ "fjernes\n"
+
+#~ msgid "<stdin>"
+#~ msgstr "<stdind>"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: advarsel: "
+
+#~ msgid ""
+#~ "Charset \"%s\" is not a portable encoding name.\n"
+#~ "Message conversion to user's charset might not work.\n"
+#~ msgstr ""
+#~ "Tegns�t '%s' er ikke et flytbart kodningsnavn.\n"
+#~ "Tekstkonvertering til brugers tegns�t virker muligvis ikke.\n"
+
+#~ msgid "Continuing anyway, expect parse errors."
+#~ msgstr "Forts�tter alligevel, forvent fortolkningsfejl."
+
+#~ msgid "Continuing anyway."
+#~ msgstr "Forts�tter alligevel."
+
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv(),\n"
+#~ "and iconv() does not support \"%s\".\n"
+#~ msgstr ""
+#~ "Tegns�t '%s' er ikke underst�ttet. %s bygger p� iconv(),\n"
+#~ "og iconv() underst�tter ikke '%s'.\n"
+
+#~ msgid ""
+#~ "Installing GNU libiconv and then reinstalling GNU gettext\n"
+#~ "would fix this problem.\n"
+#~ msgstr ""
+#~ "Installering af GNU libiconv og geninstallering af GNU gettext\n"
+#~ "vil l�se dette problem.\n"
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv().\n"
+#~ "This version was built without iconv().\n"
+#~ msgstr ""
+#~ "Tegns�t '%s' er ikke underst�ttet. %s bygger p� iconv(),\n"
+#~ "Denne version er bygget uden iconv().\n"
+
+#~ msgid ""
+#~ "Charset missing in header.\n"
+#~ "Message conversion to user's charset will not work.\n"
+#~ msgstr ""
+#~ "Tegns�t mangler i hoved.\n"
+#~ "Tekstkonvertering til brugers tegns�t vil ikke virke.\n"
+
+#~ msgid "inconsistent use of #~"
+#~ msgstr "inkonsistent brug af #~"
+
+#~ msgid "missing `msgstr[]' section"
+#~ msgstr "'msgstr[]'-afsnit mangler"
+
+#~ msgid "missing `msgid_plural' section"
+#~ msgstr "'msgstr_plural'-afsnit mangler"
+
+#~ msgid "missing `msgstr' section"
+#~ msgstr "'msgstr'-afsnit mangler"
+
+#~ msgid "first plural form has nonzero index"
+#~ msgstr "f�rste flertalsform har indeks, der ikke er nul"
+
+#~ msgid "plural form has wrong index"
+#~ msgstr "flertalsform har forkert indeks"
+
+#~ msgid "too many errors, aborting"
+#~ msgstr "afbryder k�rslen p� grund af for mange fejl"
+
+#~ msgid "invalid multibyte sequence"
+#~ msgstr "Ugyldig multibytesekvens"
+
+#~ msgid "incomplete multibyte sequence at end of file"
+#~ msgstr "Ugyldig multibytesekvens ved slutning p� fil"
+
+#~ msgid "incomplete multibyte sequence at end of line"
+#~ msgstr "Ugyldig multibytesekvens ved slutning p� linje"
+
+#~ msgid "iconv failure"
+#~ msgstr "iconv-fejl"
+
+#~ msgid "keyword \"%s\" unknown"
+#~ msgstr "ukendt n�gleord '%s'"
+
+#~ msgid "invalid control sequence"
+#~ msgstr "ugyldig kontrolsekvens"
+
+#~ msgid "end-of-file within string"
+#~ msgstr "tekststreng ikke afsluttet da filens slutning blev n�et"
+
+#~ msgid "end-of-line within string"
+#~ msgstr "tekststreng var ikke afsluttet ved linjeskift"
+
+#~ msgid "file \"%s\" is truncated"
+#~ msgstr "filen '%s' er afkortet"
+
+#~ msgid "file \"%s\" contains a not NUL terminated string"
+#~ msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
+
+#~ msgid "file \"%s\" is not in GNU .mo format"
+#~ msgstr "filen '%s' er ikke i GNU .mo-format"
+
+#~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
+#~ msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s"
+
+#~ msgid "expected two arguments"
+#~ msgstr "forventede to argumenter"
+
+#~ msgid "Usage: %s [OPTION] URL FILE\n"
+#~ msgstr "Brug: %s [TILVALG] URL FIL\n"
+
+#~ msgid ""
+#~ "Fetches and outputs the contents of an URL.  If the URL cannot be "
+#~ "accessed,\n"
+#~ "the locally accessible FILE is used instead.\n"
+#~ msgstr ""
+#~ "Henter og udskriver indholdet af en URL. Hvis URL'en ikke kan hentes "
+#~ "bruges\n"
+#~ "den lokale fil FIL i stedet.\n"
+
+#~ msgid "error writing stdout"
+#~ msgstr "fejl ved skrivning af standard-uddata"
+
+#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
+#~ msgstr "kan ikke finde et midlertidigt katalog, pr�v at s�tte $TMPDIR"
+
+#~ msgid "cannot create a temporary directory using template \"%s\""
+#~ msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
+
+#~ msgid "not a valid Java class name: %s"
+#~ msgstr "ikke et gyldigt Java-klassenavn: %s"
+
+#~ msgid "failed to create \"%s\""
+#~ msgstr "kunne ikke oprette '%s'"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "fejl ved skrivning til filen '%s'"
+
+#~ 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"
+
+#~ msgid "error while opening \"%s\" for writing"
+#~ msgstr "fejl opst�et ved skrive-�bning af '%s'"
+
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "overs�ttelige tekster m� ikke indeholde `\\%c'-escapesekvensen"
+
+#~ msgid ""
+#~ "The following msgid contains non-ASCII characters.\n"
+#~ "This will cause problems to translators who use a character encoding\n"
+#~ "different from yours. Consider using a pure ASCII msgid instead.\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "F�lgende besked-id (msgid) indholder tegn som ikke er ASCII.\n"
+#~ "Dette bevirker problemer for overs�ttere som bruger et tegns�t\n"
+#~ "som er et andet end dit. Fors�g at bruge en ren ASCII-msgid i stedet.\n"
+#~ "%s\n"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "kan ikke oprette uddatafil '%s'"
+
+#~ msgid "standard output"
+#~ msgstr "standard-uddata"
+
+#~ msgid "%s:%d: warning: unterminated character constant"
+#~ msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
+
+#~ msgid "%s:%d: warning: unterminated string literal"
+#~ msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+
+#~ msgid "this file may not contain domain directives"
+#~ msgstr "denne fil m� ikke indeholde 'domain'-kommandoer"
+
+#~ msgid "%s:%d: invalid string definition"
+#~ msgstr "%s:%d: ugyldig streng-definition"
+
+#~ msgid "%s:%d: missing number after #"
+#~ msgstr "%s:%d: mangler tal efter #"
+
+#~ msgid "%s:%d: invalid string expression"
+#~ msgstr "%s:%d: ugyldigt streng-udtryk"
+
+#~ 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"
+
+#~ msgid "xgettext cannot work without keywords to look for"
+#~ msgstr "xgettext kan ikke arbejde uden nogen n�gleord at kigge efter"
+
+#~ 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"
+
+#~ msgid "Extract translatable strings from given input files.\n"
+#~ msgstr "Udtr�k overs�ttelige strenge fra givne indfiler.\n"
+
+#~ msgid ""
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "Similarly for optional arguments.\n"
+#~ msgstr ""
+#~ "Hvis et langt tilvalg kr�ver et argument, g�lder det ogs� for det "
+#~ "tilsvarende\n"
+#~ "korte tilvalg.\n"
+#~ "Tilvarende g�lder for valgfri argumenter.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "If output file is -, output is written to standard output.\n"
+#~ msgstr ""
+#~ "Placering af udfil:\n"
+#~ "  -d, --default-domain=NAVN      send uddata til NAVN.po (i stedet for "
+#~ "messages.po)\n"
+#~ "  -o, --output=FIL               uddata skrives til FIL\n"
+#~ "  -p, --output-dir=FILKATALOG    uddatafiler placeres i FILKATALOG\n"
+#~ "Hvis uddatafilen er -, skrives uddata til standard-ud.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Choice of input file language:\n"
+#~ "  -L, --language=NAME            recognise the specified language\n"
+#~ "                                   (C, C++, ObjectiveC, PO, Python, "
+#~ "Lisp,\n"
+#~ "                                   EmacsLisp, librep, Smalltalk, Java, "
+#~ "awk,\n"
+#~ "                                   YCP, Tcl, PHP, RST, Glade)\n"
+#~ "  -C, --c++                      shorthand for --language=C++\n"
+#~ "By default the language is guessed depending on the input file name "
+#~ "extension.\n"
+#~ msgstr ""
+#~ "Valg af sprog for indfil:\n"
+#~ "  -L, --language=NAVN            genkend det angivne sprog\n"
+#~ "                                   (C, C++, ObjectiveC, PO, Python, "
+#~ "Lisp,\n"
+#~ "                                   EmacsLisp, librep, Java, awk, YCP, "
+#~ "Tcl,\n"
+#~ "                                   RST, Glade)\n"
+#~ "  -C, --c++                      kort skrivem�de for --language=C++\n"
+
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --join-existing            join messages with existing file\n"
+#~ "  -x, --exclude-file=FILE.po     entries from FILE.po are not extracted\n"
+#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
+#~ "                                 preceding keyword lines) in output file\n"
+#~ msgstr ""
+#~ "  -j, --join-existing            kombiner tekster med eksisterende fil\n"
+#~ "  -x, --exclude-file=FIL.po      tekster i FIL.po benyttes ikke\n"
+#~ "  -c, --add-comments[=M�RKE]     plac�r kommentarafsnit for M�RKE "
+#~ "(eller \n"
+#~ "                                 de foreg�ende n�gleordslinjer) i uddata\n"
+
+#~ msgid ""
+#~ "Language=C/C++ specific options:\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for "
+#~ "(without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "      --debug                    more detailed formatstring recognition "
+#~ "result\n"
+#~ msgstr ""
+#~ "Language=C/C++ specifikke tilvalg:\n"
+#~ "  -a, --extract-all              udtr�k alle tekster\n"
+#~ "  -k, --keyword[=ORD]            s�g efter yderligere n�gleord (hvis ORD "
+#~ "ikke \n"
+#~ "                                 angives, bruges standard-n�gleord "
+#~ "ikke).\n"
+#~ "  -T, --trigraphs                forst� ISO C-trigrafer i inddata\n"
+#~ "      --debug                    mere detaljeret resultat af "
+#~ "strenggenkendelse\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape                brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                   brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po                 skriv PO-filen selv om den er tom\n"
+#~ "  -i, --indent                   benyt indrykket stil for uddata\n"
+#~ "      --no-location              undertryk '#: filnavn:linje' linjer\n"
+#~ "  -n, --add-location             gener�r '#: filnavn:linje' linjer "
+#~ "(standard)\n"
+#~ "      --strict                   benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL                s�t udskrivningsbredde\n"
+#~ "      --no-wrap                  ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                                 uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output              gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file             sort�r uddata efter filplacering\n"
+#~ "      --omit-header              skriv ikke header med 'msgid \"\"' "
+#~ "indgang\n"
+#~ "      --copyright-holder=STRENG  s�t ophavsrettighedsindehaver i uddata\n"
+#~ "      --foreign-user             undlad FSF-ophavsret i uddata for "
+#~ "fremmed bruger\n"
+#~ "  -m, --msgstr-prefix[=STRENG]   brug STRING eller \"\" som forstavelse "
+#~ "for msgstr-indgange\n"
+#~ "  -M, --msgstr-suffix[=STRENG]   brug STRING eller \"\" som endelse for "
+#~ "msgstr-indgange\n"
+
+#~ 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 ""
+#~ "Tom msgid. Dette er reserveret af GNU gettext:\n"
+#~ "gettext(\"\") returnerer hovedet med metainformation,\n"
+#~ "ikke den tomme streng.\n"
+
+#~ msgid "language `%s' unknown"
+#~ msgstr "ukendt sprog `%s'"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek '%s' offset %ld mislykkedes"
+
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java               Java mode: generate a Java ResourceBundle "
+#~ "class\n"
+#~ msgstr ""
+#~ "K�rselstilstand:\n"
+#~ "  -j, --java               Javatilstand: gener�r en Java ResourceBundle-"
+#~ "klasse\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/de.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/de.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/de.po gettext-0.18.1.1/gettext-runtime/po/de.po
--- gettext-0.19.3/gettext-runtime/po/de.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/de.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,9 +1,8 @@
 # German translations for GNU gettext-runtime package.
-# Copyright © 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2012, 2013 Free Software Foundation, Inc.
+# Copyright © 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Karl Eichwalder <ke@suse.de>, 2001, 2002, 2003, 2004, 2005, 2006, 2009.
 # Ulrich Drepper <drepper@gnu.org>, 1995-1997.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2012, 2013.
 #
 # Wörterbuch:
 # message catalog     - Katalog (mit Meldungen)
@@ -76,11 +75,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-04-09 22:17+0200\n"
-"Last-Translator: Jakob Kramer <jakob.kramer@gmx.de>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2009-07-24 10:30+0200\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -92,65 +91,65 @@
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Option »--%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: Option »--%s« erwartet ein Argument\n"
+msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ungültige Option -- »%c«\n"
+msgstr "%s: ungültige Option -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: Option erwartet ein Argument -- »%c«\n"
+msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option »-W %s« erwartet ein Argument\n"
+msgstr "%s: Option »%s« erwartet ein Argument\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -194,7 +193,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
 #: src/envsubst.c:176
@@ -328,7 +327,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/el.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/el.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/el.po gettext-0.18.1.1/gettext-runtime/po/el.po
--- gettext-0.19.3/gettext-runtime/po/el.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/el.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -21,73 +21,73 @@
 msgstr ""
 
 #
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "������� ������ ����������"
 
 #
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: � ������� `%s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: � ������� `--%s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: � ������� `%c%s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: � ������� `%s' ������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: �� ������������ ������� `--%s'\n"
 
 #
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: �� ������������ ������� `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: �� ������ ������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: � ������� ������� ��������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: � ������� `-W %s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: � ������� `-W %s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: � ������� `%s' ������� ���������\n"
@@ -132,8 +132,8 @@
 
 #
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "��������� `%s --help' ��� ������������ �����������.\n"
 
 #: src/envsubst.c:176
@@ -259,7 +259,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/en@boldquot.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/en@boldquot.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/en@boldquot.po gettext-0.18.1.1/gettext-runtime/po/en@boldquot.po
--- gettext-0.19.3/gettext-runtime/po/en@boldquot.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/en@boldquot.po	2010-06-03 23:57:18.000000000 +0000
@@ -1,7 +1,7 @@
 # English translations for GNU gettext-runtime package.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gettext-runtime package.
-# Automatically generated, 2014.
+# Automatically generated, 2010.
 #
 # 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.3\n"
+"Project-Id-Version: GNU gettext-runtime 0.18.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-06-04 01:57+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@boldquot\n"
@@ -46,62 +46,62 @@
 msgid "write error"
 msgstr "write error"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: option ‘--%s’ requires an argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: option ‘-W %s’ requires an argument\n"
@@ -146,7 +146,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
 #: src/envsubst.c:176
@@ -274,7 +274,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/en@quot.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/en@quot.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/en@quot.po gettext-0.18.1.1/gettext-runtime/po/en@quot.po
--- gettext-0.19.3/gettext-runtime/po/en@quot.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/en@quot.po	2010-06-03 23:57:18.000000000 +0000
@@ -1,7 +1,7 @@
 # English translations for GNU gettext-runtime package.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gettext-runtime package.
-# Automatically generated, 2014.
+# Automatically generated, 2010.
 #
 # 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.3\n"
+"Project-Id-Version: GNU gettext-runtime 0.18.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-06-04 01:57+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -43,62 +43,62 @@
 msgid "write error"
 msgstr "write error"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: option ‘--%s’ requires an argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: option ‘-W %s’ requires an argument\n"
@@ -143,7 +143,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
 #: src/envsubst.c:176
@@ -271,7 +271,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/eo.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/eo.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/eo.po gettext-0.18.1.1/gettext-runtime/po/eo.po
--- gettext-0.19.3/gettext-runtime/po/eo.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/eo.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,87 +1,85 @@
 # La teksto por la mesaĝoj de la programo "gettext".
-# Copyright (C) 2006, 2007, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2006 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.
+# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006-2007.
+# D. Dale Gulledge <dsplat@rochester.rr.com>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-10-30 16:17-0300\n"
-"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-16 10:18+0100\n"
+"Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "skriberaro"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la modifilo '%s' estas plursenca; ebloj:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: la opcio '%s' estas dubasenca\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '--%s' ne prenas argumenton\n"
+msgstr "%s: la opcio '--%s' ne prenas argumenton\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '%c%s' ne prenas argumenton\n"
+msgstr "%s: la opcio '%c%s' ne prenas argumenton\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la modifilo '%s' bezonas argumenton\n"
+msgstr "%s: la opcio '%s' bezonas argumenton\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nerekonata modifilo '--%s'\n"
+msgstr "%s: nerekonata opcio '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nerekonata modifilo '%c%s'\n"
+msgstr "%s: nerekonata opcio '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: nevalida modifilo -- '%c'\n"
+msgstr "%s: nevalida opcio -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: la modifilo bezonas argumenton -- '%c'\n"
+msgstr "%s: opcio bezonas argumenton -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la modifilo '-W %s' estas plursenca\n"
+msgstr "%s: la opcio '-W %s' estas dubasenca\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '-W %s' ne prenas argumenton\n"
+msgstr "%s: la opcio '-W %s' ne prenas argumenton\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la modifilo '-W %s' bezonas argumenton\n"
+msgstr "%s: la opcio '%s' bezonas argumenton\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -96,7 +94,7 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Kopirajto © %s Free Software Foundation, Inc.\n"
+"Kopirajto (C) %s Free Software Foundation, Inc.\n"
 "Rajtigilo GPLv3+: GNU GPL, versio 3 aŭ posta <http://gnu.org/licenses/gpl.html>\n"
 "Ĉi tio estas libera programo; vi estas libera ŝanĝi kaj redistribui ĝin.\n"
 "Estas NENIA GARANTIO, ĝis la grado leĝe permesata.\n"
@@ -123,13 +121,13 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Provu '%s --help' por pli da informoj.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Uzado: %s [MODIFILO] [ŜEL-FORMATO]\n"
+msgstr "Uzado: %s [OPCIO] [ŜEL-FORMATO]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
@@ -216,8 +214,8 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Uzado: %s [MODIFILO] [[TEXTDOMAIN] MSGID]\n"
-"aŭ:    %s [MODIFILO] -s [MSGID]...\n"
+"Uzado: %s [OPCIO] [[TEXTDOMAIN] MSGID]\n"
+"aŭ:    %s [OPCIO] -s [MSGID]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
@@ -252,7 +250,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -260,7 +258,7 @@
 "Se la parametro TEXTDOMAIN ne estas donita, la media variable TEXTDOMAIN\n"
 "estas uzata. Se la mesaĝkatalogo ne estas trovita en la kutima dosierujo,\n"
 "alia dosierujo povas esti specifita per la media variablo TEXTDOMAINDIR.\n"
-"Uzate kun la modifilo -s, la programo kondutas kiel la komando 'echo'.\n"
+"Uzate kun la opcio -s, la programo kondutas kiel la komando 'echo'.\n"
 "Tamen, ĝi ne simple kopias siajn argumentojn al la normala eligo;\n"
 "anstataŭe, tiuj mesaĝoj trovitaj en la elektita katalogo estas tradukataj.\n"
 "Normala serĉdosierujo: %s\n"
@@ -268,7 +266,7 @@
 #: 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"
+msgstr "Uzado: %s [OPCIO] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -315,4 +313,16 @@
 "Normala serĉdosierujo: %s\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: nepermesata modifilo -- %c\n"
+#~ msgstr "%s: nepermesata opcio -- %c\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Kopirajto (C) %s Free Software Foundation, Inc.\n"
+#~ "Ĉi tio estas libera programo; vidu la fonton por kopi-kondiĉoj. Estas\n"
+#~ "NENIA GARANTIO; eĉ ne por KOMERCA KVALITO aŭ ADEKVATECO POR DIFINITA "
+#~ "CELO.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/es.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/es.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/es.po gettext-0.18.1.1/gettext-runtime/po/es.po
--- gettext-0.19.3/gettext-runtime/po/es.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/es.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,93 +1,91 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2013
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 2001, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext-runtime 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-11-25 19:54+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2005-06-22 19:36-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "error de escritura"
 
-# Nota: El error es del sistema, pero no se sabe cuál es el error,
-# por eso es (además) desconocido.
-#: gnulib-lib/error.c:191
+# Nota: El error es del sistema, pero no se sabe cu�l es el error,
+# por eso es (adem�s) desconocido.
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Hay un error desconocido del sistema"
+msgstr "Hay un error del sistema desconocido"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la opción '%s' es ambigua; posibilidades:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: la opci�n `%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la opción '--%s' no admite ningún argumento\n"
+msgstr "%s: la opci�n `--%s' no admite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
+msgstr "%s: la opci�n `%c%s' no admite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la opción '%s' requiere un argumento\n"
+msgstr "%s: la opci�n `%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
+msgstr "%s: opci�n no reconocida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
+msgstr "%s: opci�n no reconocida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opción no válida -- '%c'\n"
+msgstr "%s: opci�n inv�lida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: la opción requiere un argumento -- '%c'\n"
+msgstr "%s: la opci�n requiere un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
+msgstr "%s: la opci�n `-W %s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
+msgstr "%s: la opci�n `-W %s' no admite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la opción '-W %s' requiere un argumento\n"
+msgstr "%s: la opci�n `%s' requiere un argumento\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "memoria agotada"
+msgstr "Memoria agotada"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -97,10 +95,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licencia GPLv3+: GNU GPL versión 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
-"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:139 src/ngettext.c:129
 #, c-format
@@ -110,7 +104,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
@@ -124,13 +118,13 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Pruebe '%s --help' para más información.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pruebe `%s --help' para m�s informaci�n.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Modo de empleo: %s [OPCIÓN] [FORMATO-DEL-INTÉRPRETE-DE-COMANDOS]\n"
+msgstr "Modo de empleo: %s [OPCI�N] [FORMATO-DEL-INT�RPRETE-DE-COMANDOS]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
@@ -140,14 +134,14 @@
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "Modo de operación:\n"
+msgstr "Modo de operaci�n:\n"
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr ""
-" -v, --variables                    muestra las variables que aparecen en el\n"
-"                                    FORMATO-DE-INTÉRPRETE-DE-COMANDOS\n"
+" -v, --variables                    muestra las variables que aparecen en el \n"
+"                                    FORMATO-DE-INT�RPRETE-DE-COMANDOS\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
@@ -162,7 +156,7 @@
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               muestra la versión y finaliza\n"
+msgstr "  -V, --version               muestra la versi�n y finaliza\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -174,14 +168,14 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"En modo de operación normal, se copia la entrada estándar a la salida\n"
-"estándar con las referencias a las variables de entorno de la forma\n"
+"En modo de operaci�n normal, se copia la entrada est�ndar a la salida\n"
+"est�ndar con las referencias a las variables de entorno de la forma\n"
 "$VARIABLE o ${VARIABLE} sustituidas por sus valores\n"
-"correspondientes. Si se da un FORMATO-DEL-INTÉRPRETE-DE-COMANDOS, sólo\n"
-"aquellas variables de entorno que estén referenciadas en el\n"
-"FORMATO-DEL-INTÉRPRETE-DE-COMANDOS son sustituidas; de otra forma,\n"
+"correspondientes. Si se da un FORMATO-DEL-INT�RPRETE-DE-COMANDOS, s�lo\n"
+"aquellas variables de entorno que est�n referenciadas en el\n"
+"FORMATO-DEL-INT�RPRETE-DE-COMANDOS son sustituidas; de otra forma,\n"
 "todas las referencias a las variables de entorno existentes en la\n"
-"entrada estándar, son sustituidas.\n"
+"entrada est�ndar, son sustituidas.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -189,9 +183,9 @@
 "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 ""
-"Cuando se utiliza --variables, se ignora la entrada estándar, y la salida\n"
+"Cuando se utiliza --variables, se ignora la entrada est�ndar, y la salida\n"
 "contiene las variables de entorno que referidas en el FORMATO-DEL-\n"
-"INTÉRPRETE-DE-COMANDOS, una por línea.\n"
+"INT�RPRETE-DE-COMANDOS, una por l�nea.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -199,7 +193,7 @@
 #. bugs (typically your translation team's web or email address).
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Comunicar defectos a <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
@@ -208,12 +202,12 @@
 
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr "entrada estándar"
+msgstr "entrada est�ndar"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
+msgstr ""
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -221,26 +215,26 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Modo de empleo: %s [OPCIÓN] [[DOMINIOTEXTO] MSGID]\n"
-"             o: %s [OPCIÓN] -s [MSGID]...\n"
+"Modo de empleo: %s [OPCI�N] [[DOMINIOTEXTO] MSGID]\n"
+"             o: %s [OPCI�N] -s [MSGID]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Mostrar la traducción a idioma nativo de un mensaje textual.\n"
+msgstr "Mostrar la traducci�n a idioma nativo de un mensaje textual.\n"
 
-# ¿ Y qué te parece informa de la versión y finaliza ?
-# así es cómo lo estoy haciendo en todas las textutils. em
+# � Y qu� te parece informa de la versi�n y finaliza ?
+# as� es c�mo lo estoy haciendo en todas las textutils. em
 # No he movido nada porque dudo un poco. Creo que en un
-# msdos de IBM en español decía muestra la versión y por
-# eso lo traduje así. Si encuentro la referencia te informo
-# pero por ahora no me convence eso de `informa de la versión'
+# msdos de IBM en espa�ol dec�a muestra la versi�n y por
+# eso lo traduje as�. Si encuentro la referencia te informo
+# pero por ahora no me convence eso de `informa de la versi�n'
 # suena demasiado pomposo. mm
 #
-# Ok, como te parezca, es más que nada por no repetir 'muestra' em+
+# Ok, como te parezca, es m�s que nada por no repetir 'muestra' em+
 #
-# Prefiero que se quede como está, pues aunque se repite muestra,
-# es en otra opción en donde aparece. mm
+# Prefiero que se quede como est�, pues aunque se repite muestra,
+# es en otra opci�n en donde aparece. mm
 #
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -255,17 +249,17 @@
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
 "  -d, --domain=DOMINIOTEXTO obtiene los mensajes traducidos de DOMINIOTEXTO\n"
-"  -e                        habilita la expansión de algunas secuencias\n"
+"  -e                        habilita la expansi�n de algunas secuencias\n"
 "                            de escape\n"
 "  -E                        (existe por compatibilidad, no tiene efecto)\n"
 "  -h, --help                muestra este texto de ayuda y finaliza\n"
-"  -n                        suprime el carácter de nueva línea\n"
-"  -V, --version             informa de la versión y finaliza\n"
+"  -n                        suprime el car�cter de nueva l�nea\n"
+"  -V, --version             informa de la versi�n y finaliza\n"
 "  [DOMINIOTEXTO] MSGID      obtiene el mensaje traducido correspondiente\n"
 "                            al MSGID del DOMINIOTEXTO\n"
 
 # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
-# no se pueden traducir (cuando se refieren a las variables, claro está).
+# no se pueden traducir (cuando se refieren a las variables, claro est�).
 #: src/gettext.c:264
 #, c-format, no-wrap
 msgid ""
@@ -273,25 +267,25 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Si no se escribe el parámetro DOMINIOTEXTO, el dominio se determina por\n"
-"la variable de entorno TEXTDOMAIN. Si el catálogo de mensajes no está en\n"
-"el directorio predeterminado, con la variable de entorno TEXTDOMAINDIR se\n"
+"Si no se escribe el par�metro DOMINIOTEXTO, el dominio se determina por\n"
+"la variable de entorno TEXTDOMAIN. Si el cat�logo de mensajes no est� en\n"
+"el directorio por defecto, con la variable de entorno TEXTDOMAINDIR se\n"
 "puede especificar otro lugar.\n"
-"Cuando se utiliza con la opción -s, el programa se comporta como la\n"
-"instrucción 'echo', pero no se reduce a hacer simplemente una copia en\n"
-"la salida estándar (stdout), sino que además traduce los mensajes que\n"
-"encuentre dentro del catálogo seleccionado.\n"
-"Directorio de búsqueda estándar: %s\n"
+"Cuando se utiliza con la opci�n -s, el programa se comporta como la\n"
+"instrucci�n `echo', pero no se reduce a hacer simplemente una copia en\n"
+"la salida est�ndar (stdout) sino que adem�s traduce los mensajes que\n"
+"encuentre dentro del cat�logo seleccionado.\n"
+"Directorio de b�squeda est�ndar: %s\n"
 
 #: 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"
+msgstr "Modo de empleo: %s [OPCI�N] [DOMINIODETEXTO] MSGID MSG-PLURAL CUENTA\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -299,21 +293,21 @@
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Muestra la traducción del idioma nativo de un mensaje textual cuya forma\n"
-"gramatical depende de un número.\n"
+"Muestra la traducci�n del idioma nativo de un mensaje textual cuya forma\n"
+"gramatical depende de un n�mero.\n"
 
-# ¿ Y qué te parece informa de la versión y finaliza ?
-# así es cómo lo estoy haciendo en todas las textutils. em
+# � Y qu� te parece informa de la versi�n y finaliza ?
+# as� es c�mo lo estoy haciendo en todas las textutils. em
 # No he movido nada porque dudo un poco. Creo que en un
-# msdos de IBM en español decía muestra la versión y por
-# eso lo traduje así. Si encuentro la referencia te informo
-# pero por ahora no me convence eso de `informa de la versión'
+# msdos de IBM en espa�ol dec�a muestra la versi�n y por
+# eso lo traduje as�. Si encuentro la referencia te informo
+# pero por ahora no me convence eso de `informa de la versi�n'
 # suena demasiado pomposo. mm
 #
-# Ok, como te parezca, es más que nada por no repetir 'muestra' em+
+# Ok, como te parezca, es m�s que nada por no repetir 'muestra' em+
 #
-# Prefiero que se quede como está, pues aunque se repite muestra,
-# es en otra opción en donde aparece. mm
+# Prefiero que se quede como est�, pues aunque se repite muestra,
+# es en otra opci�n en donde aparece. mm
 #
 #: src/ngettext.c:222
 #, c-format, no-wrap
@@ -328,18 +322,18 @@
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
 "  -d, --domain=DOMINIOTEXTO obtiene los mensajes traducidos de DOMINIOTEXTO\n"
-"  -e                        habilita la expansión de algunas secuencias\n"
+"  -e                        habilita la expansi�n de algunas secuencias\n"
 "                            de escape\n"
 "  -E                        (existe por compatibilidad, no tiene efecto)\n"
 "  -h, --help                muestra este texto de ayuda y finaliza\n"
-"  -V, --version             informa de la versión y finaliza\n"
+"  -V, --version             informa de la versi�n y finaliza\n"
 "  [DOMINIOTEXTO]            obtiene el mensaje traducido del DOMINIOTEXTO\n"
 "  MSGID MSGID-PLURAL        traduce el MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  CUENTA                    selecciona la forma singular/plural con base\n"
 "                            en este valor\n"
 
 # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
-# no se pueden traducir (cuando se refieren a las variables, claro está).
+# no se pueden traducir (cuando se refieren a las variables, claro est�).
 #: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
@@ -349,8 +343,27 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Si no se escribe el parámetro DOMINIOTEXTO, el dominio se determina por\n"
-"la variable de entorno TEXTDOMAIN. Si el catálogo de mensajes no está en\n"
-"el directorio predeterminado, con la variable de entorno TEXTDOMAINDIR se\n"
+"Si no se escribe el par�metro DOMINIOTEXTO, el dominio se determina por\n"
+"la variable de entorno TEXTDOMAIN. Si el cat�logo de mensajes no est� en\n"
+"el directorio por defecto, con la variable de entorno TEXTDOMAINDIR se\n"
 "puede especificar otro lugar.\n"
-"Directorio de búsqueda estándar: %s\n"
+"Directorio de b�squeda est�ndar: %s\n"
+
+# acepto la sugerencia de em en cuanto a que inv�lida parece c�rcel
+# o in�til pero mejor puse inv�lida
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opci�n inv�lida -- %c\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Esto es software libre; vea el c�digo fuente para las condiciones de "
+#~ "copia.\n"
+#~ "No hay NINGUNA garant�a; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
+#~ "UN\n"
+#~ "FIN DETERMINADO.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/et.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/et.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/et.po gettext-0.18.1.1/gettext-runtime/po/et.po
--- gettext-0.19.3/gettext-runtime/po/et.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/et.po	2010-06-06 12:49:57.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -19,62 +19,62 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tundmatu s�steemne viga"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: v�ti `%s' on mitmet�henduslik\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `--%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: v�tme `%s' j�rel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tundmatu v�ti `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tundmatu v�ti `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: vigane v�ti -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: v�tme j�rel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: v�ti `-W %s' on mitmet�henduslik\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `-W %s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: v�tme `%s' j�rel peab olema argument\n"
@@ -114,8 +114,8 @@
 msgstr "argumendid on puudu"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "T�iendava info saamiseks proovi `%s --help'.\n"
 
 #: src/envsubst.c:176
@@ -238,7 +238,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/fi.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/fi.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/fi.po gettext-0.18.1.1/gettext-runtime/po/fi.po
--- gettext-0.19.3/gettext-runtime/po/fi.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/fi.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,92 +1,89 @@
 # Finnish translations for GNU Gettext package.
-# Copyright © 2007, 2010, 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2007 Free Software Foundation, Inc.
 # Sami J. Laine <sami.laine@iki.fi>, 2002.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-03-03 11:37+0200\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-21 00:28+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "virhe kirjoitettaessa"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valitsin ’%s’ on moniselitteinen; mahdollisuudet:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: valitsin ”%s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
+msgstr "%s: valitsin ”%c%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tunnistamaton valitsin ’--%s’\n"
+msgstr "%s: tuntematon valitsin ”--%s”\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
+msgstr "%s: tuntematon valitsin ”%c%s”\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: virheellinen valitsin -- ’%c’\n"
+msgstr "%s: virheellinen valitsin -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
+msgstr "%s: valitsin vaatii argumentin -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valitsin ’-W %s’ on moniselitteinen\n"
+msgstr "%s: valitsin ”-W %s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
+msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "muisti loppui"
+msgstr "muisti loppu"
 
 # Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
@@ -97,7 +94,7 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
+"Tekijänoikeudet © %s Free Software Foundation, Inc.\n"
 "Lisenssi GPLv3+: GNU GPL versio 3 tai myöhempi <http://gnu.org/licenses/gpl.html>\n"
 "Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
 "Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
@@ -124,8 +121,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Yritä ’%s --help’ saadaksesi lisää tietoja.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Yritä ”%s --help” saadaksesi lisää tietoja.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -196,10 +193,9 @@
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
-"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
-"org>.\n"
-"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists."
-"sourceforge.net>.\n"
+"Ilmoita ohjelmiston vioista osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
+"Ilmoita suomennoksen vioista listalle <translation-team-fi@lists.sourceforge."
+"net>.\n"
 
 # ainoa mahdollinen %s tällä hetkellä on alla oleva "standard input"
 #: src/envsubst.c:442
@@ -260,7 +256,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -269,7 +265,7 @@
 "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
 "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä ympäristömuuttu-\n"
 "jalla TEXTDOMAINDIR.\n"
-"Valitsimen -s kanssa ohjelma toimii kuten ’echo’-komento.\n"
+"Valitsimen -s kanssa ohjelma toimii kuten ”echo”-komento.\n"
 "Ohjelma ei kuitenkaan vain kopioi argumenttejaan vakiotulosteeseen, vaan\n"
 "valitusta viestiluettelosta löydetyt viestit näytetään käännettyinä.\n"
 "Perushakemisto, josta haku suoritetaan: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/fr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/fr.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/fr.po gettext-0.18.1.1/gettext-runtime/po/fr.po
--- gettext-0.19.3/gettext-runtime/po/fr.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/fr.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,17 +1,17 @@
 # Messages français pour GNU gettext.
-# Copyright © 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright © 2006 Free Software Foundation, Inc.
 # François Pinard <pinard  @iro.umontreal.ca>, 1996.
 # Il a été le traducteur jusqu'en 2001.
 # Michel Robitaille <robitail@iro.umontreal.ca>, traducteur depuis/since 1996.
-# Christophe Combelles <ccomb@free.fr>, 2006, 2007, 2008, 2009, 2010
+# Christophe Combelles <ccomb@free.fr>, 2006, 2007
+#
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18\n"
+"Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2010-07-23 01:20+0100\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-27 13:43+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -24,65 +24,65 @@
 msgid "write error"
 msgstr "erreur d'écriture"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s : l'option « --%s » exige un argument\n"
+msgstr "%s : l'option « %s » exige un argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : l'option « --%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : l'option « %c%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s : option non valable -- '%c'\n"
+msgstr "%s : l'option « --%c » n'est pas valide\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s : l'option exige un argument -- '%c'\n"
+msgstr "%s : l'option « --%c » exige un argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s : l'option « -W %s » exige un argument\n"
+msgstr "%s : l'option « %s » exige un argument\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -123,8 +123,8 @@
 msgstr "arguments manquants"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
 #: src/envsubst.c:176
@@ -245,13 +245,13 @@
 "  [DOMAINE] MSGID        récupère la traduction de MSGID, depuis le DOMAINE\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/ga.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/ga.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/ga.po gettext-0.18.1.1/gettext-runtime/po/ga.po
--- gettext-0.19.3/gettext-runtime/po/ga.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ga.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -19,62 +19,62 @@
 msgid "write error"
 msgstr "earr�id sa scr�obh"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Earr�id ch�rais anaithnid"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: T� an rogha `%s' d�bhr�och\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `--%s'\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `%c%s'\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: rogha anaithnid `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: rogha anaithnid `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: rogha neamhbhail� -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: T� an rogha `-W %s' d�bhr�och\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `-W %s'\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
@@ -118,8 +118,8 @@
 msgstr "arg�int� ar iarraidh"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fh�il.\n"
 
 #: src/envsubst.c:176
@@ -241,13 +241,13 @@
 "                            leis an MSGID �n FHEARANN\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
diff -Nru gettext-0.19.3/gettext-runtime/po/gettext-runtime.pot gettext-0.18.1.1/gettext-runtime/po/gettext-runtime.pot
--- gettext-0.19.3/gettext-runtime/po/gettext-runtime.pot	2014-10-16 06:04:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/gettext-runtime.pot	2010-06-06 12:49:57.000000000 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19.3\n"
+"Project-Id-Version: GNU gettext-runtime 0.18.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -21,62 +21,62 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
@@ -117,7 +117,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #: src/envsubst.c:176
@@ -227,7 +227,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/gl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/gl.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/gl.po gettext-0.18.1.1/gettext-runtime/po/gl.po
--- gettext-0.19.3/gettext-runtime/po/gl.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/gl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,91 +1,89 @@
-# Galician translation of gettext-runtime.
-# This file is distributed under the same license as the gettext package.
+# Galician translation of gettext.
 # Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-# Copyright (C) 2012, 2013 Leandro Regueiro.
+# Jes�s Bravo �lvarez <jba@pobox.com>, 1999-2001.
 #
-# Jesús Bravo Álvarez <jba@pobox.com>, 1999-2001.
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2012, 2013, 2014.
+# Proxecto Trasno - Adaptaci�n do software libre � lingua galega:  Se desexas
+# colaborar connosco, podes atopar m�is informaci�n en http://trasno.gpul.org
 #
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en http://www.trasno.net
+# First Version: 1999-09-05 20:58+0200
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.19-rc1\n"
+"Project-Id-Version: gettext 0.10.39\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-10 16:37+0100\n"
-"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2001-07-28 17:00+0200\n"
+"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
+"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "erro de escritura"
+msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Erro de sistema descoñecido"
+msgstr "Erro de sistema desco�ecido"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opción «%s» é ambigua; as posibilidades son:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: a opci�n `%s' � ambigua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a opción «--%s» non permite ningún argumento\n"
+msgstr "%s: a opci�n `--%s' non permite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a opción «%c%s» non permite un argumento\n"
+msgstr "%s: a opci�n `%c%s' non permite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a opción «--%s» require un argumento\n"
+msgstr "%s: a opci�n `%s' require un argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción «--%s» non recoñecida\n"
+msgstr "%s: opci�n `--%s' desco�ecida\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción «%c%s» non recoñecida\n"
+msgstr "%s: opci�n `%c%s' desco�ecida\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opción incorrecta -- «%c»\n"
+msgstr "%s: opci�n non v�lida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: a opción require un argumento -- «%c»\n"
+msgstr "%s: a opci�n require un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a opción «-W %s» é ambigua\n"
+msgstr "%s: a opci�n `-W %s' � ambigua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a opción «-W %s» non permite un argumento\n"
+msgstr "%s: a opci�n `-W %s' non permite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a opción «-W %s» require un argumento\n"
+msgstr "%s: a opci�n `%s' require un argumento\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -100,10 +98,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licenza GPLv3+: GNU GPL versión 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
-"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:139 src/ngettext.c:129
 #, c-format
@@ -113,7 +107,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
@@ -127,43 +121,43 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 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"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Use `%s --help' para m�is informaci�n.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Modo de uso: %s [OPCIÓN] [FORMATO-SHELL]\n"
+msgstr ""
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Substitúe os valores das variábeis de ambiente.\n"
+msgstr ""
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "Modo de funcionamento:\n"
+msgstr ""
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             escribe na saída as variábeis atopadas en FORMATO-SHELL\n"
+msgstr ""
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Saída informativa:\n"
+msgstr ""
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+msgstr ""
 
 #: src/envsubst.c:198
 #, 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"
+msgstr ""
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -175,12 +169,6 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"No modo de operación normal, a entrada estándar cópiase á saída estándar,\n"
-"con referencias ás variábeis de ambiente da forma $VARIABLE ou ${VARIABLE}\n"
-"substituíndoas cos valores correspondentes. se se fornece un FORMATO-SHELL,\n"
-"só se substitúen aquelas variábeis referidas en FORMATO-SHELL; senón\n"
-"substitúense todas as referencias a variábeis que se atopen na entrada\n"
-"estándar.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -188,16 +176,15 @@
 "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 ""
-"Cando se emprega --variables, ignórase a entrada estándar, e a saída consiste\n"
-"nas variábeis de ambiente que se referencian en FORMATO-SHELL, unha por liña.\n"
 
 #. 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:279 src/ngettext.c:245
+#, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Comunique os erros a <bug-gnu-utils@gnu.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
@@ -206,12 +193,12 @@
 
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr "entrada estándar"
+msgstr "entrada est�ndar"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
+msgstr ""
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -219,16 +206,14 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Uso:   %s [OPCIÓN] [[DOMINIO] MSGID]\n"
-"ou:    %s [OPCIÓN] -s [MSGID]...]\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Mostra a tradución nun idioma dunha mensaxe de texto.\n"
+msgstr ""
 
 #: src/gettext.c:253
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -239,51 +224,51 @@
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMINIO      obter as mensaxes traducidas do DOMINIO\n"
-"  -e                        permitir a expansión de algunhas secuencias\n"
-"                            de escape\n"
+"Uso: %s [OPCI�N] [[DOMINIO] MSGID | [-s [MSGID]...]]\n"
+"  -d, --domain=DOMINIO      obte-las mensaxes traducidas do DOMINIO\n"
+"  -e                        permiti-la expansi�n dalgunhas secuencias de escape\n"
 "  -E                        (ignorado por compatibilidade)\n"
-"  -h, --help                mostrar esta axuda e saír\n"
-"  -n                        suprimir o carácter final de nova liña\n"
-"  -V, --version             mostrar a información da versión e saír\n"
-"  [DOMINIO] MSGID           obter a mensaxe traducida correspondente a\n"
+"  -h, --help                mostrar esta axuda e sa�r\n"
+"  -n                        suprimi-lo car�cter de nova li�a\n"
+"  -V, --version             amosa-la informaci�n da versi�n e sa�r\n"
+"  [DOMINIO] MSGID           obte-la mensaxe traducida correspondente a\n"
 "                            MSGID do DOMINIO\n"
 
 #: src/gettext.c:264
-#, c-format, no-wrap
+#, fuzzy, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Se non se indica o parámetro DOMINIO, o dominio determínase a partir da\n"
-"variábel de ambiente TEXTDOMAIN. Se o catálogo de mensaxes non está no\n"
-"directorio habitual, pódese especificar outro mediante a variábel\n"
-"TEXTDOMAINDIR.\n"
-"Cando se usa a opción -s, o programa compórtase como a orde «echo». Pero\n"
-"non só copia os argumentos á saída, senón que traduce as mensaxes que atopa\n"
-"no catálogo escollido.\n"
-"Directorio estándar de busca: %s\n"
+"\n"
+"Se non se indica o par�metro DOMINIO, o dominio obt�nse da variable de ambiente\n"
+"TEXTDOMAIN.  Se o cat�logo de mensaxes non est� no directorio habitual,\n"
+"p�dese especificar outro mediante a variable TEXTDOMAINDIR.\n"
+"Cando se usa a opci�n -s, o programa comp�rtase como o comando `echo'.\n"
+"Pero non s� copia os argumentos � sa�da, sen�n que traduce as mensaxes\n"
+"que atopa no cat�logo escollido.\n"
+"Directorio est�ndar de busca: %s\n"
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: src/ngettext.c:222
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -294,17 +279,18 @@
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMINIO      obter a mensaxe traducida do DOMINIO\n"
-"  -e                        permitir a expansión de algunhas secuencias de escape\n"
+"Uso: %s [OPCI�N] [DOMINIO] MSGID MSGID-PLURAL CONTADOR\n"
+"  -d, --domain=DOMINIO      obte-la mensaxe traducida do DOMINIO\n"
+"  -e                        permiti-la expansi�n dalgunhas secuencias de escape\n"
 "  -E                        (ignorada por compatibilidade)\n"
-"  -h, --help                mostrar esta axuda e saír\n"
-"  -V, --version             mostrar a información da versión e saír\n"
-"  [DOMINIO]                 obter a mensaxe traducida do DOMINIO\n"
+"  -h, --help                amosar esta axuda e sa�r\n"
+"  -V, --version             amosa-la informaci�n da versi�n e sa�r\n"
+"  [DOMINIO]                 obte-la mensaxe traducida do DOMINIO\n"
 "  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  NÚMERO                    escoller a forma singular/plural segundo este valor\n"
+"  CONTADOR                  escoller a forma singular/plural segundo este valor\n"
 
 #: src/ngettext.c:233
-#, c-format, no-wrap
+#, fuzzy, 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"
@@ -312,14 +298,14 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Se non se indica o parámetro DOMINIO, o dominio determínase a partir da\n"
-"variábel de ambiente TEXTDOMAIN. Se o catálogo de mensaxes non está no\n"
-"directorio habitual, pódese especificar outro mediante a variábel de\n"
-"ambiente TEXTDOMAINDIR.\n"
-"Directorio estándar de busca: %s\n"
+"\n"
+"Se non se indica o par�metro DOMINIO, o dominio obtense da variable de ambiente\n"
+"TEXTDOMAIN.  Se o cat�logo de mensaxes non est� no directorio habitual,\n"
+"p�dese especificar outro mediante a variable TEXTDOMAINDIR.\n"
+"Directorio est�ndar de busca: %s\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opción ilegal -- %c\n"
+#~ msgstr "%s: opci�n ilegal -- %c\n"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -329,62 +315,334 @@
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Isto é software libre; vexa o código para as condicións de copia.  NON "
+#~ "Isto � software libre; vexa o c�digo para as condici�ns de copia.  NON "
 #~ "hai\n"
-#~ "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
+#~ "ningunha garant�a; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
 #~ "FIN DETERMINADO.\n"
 
+#~ msgid "error while opening \"%s\" for reading"
+#~ msgstr "erro ao abrir \"%s\" para lectura"
+
+#, fuzzy
+#~ msgid "cannot open backup file \"%s\" for writing"
+#~ msgstr "erro ao abrir \"%s\" para escribir"
+
+#, fuzzy
+#~ msgid "error reading \"%s\""
+#~ msgstr "erro ao ler \"%s\""
+
+#, fuzzy
+#~ msgid "error writing \"%s\""
+#~ msgstr "erro ao escribi-lo ficheiro \"%s\""
+
+#, fuzzy
+#~ msgid "error after reading \"%s\""
+#~ msgstr "erro ao ler \"%s\""
+
+#, fuzzy
+#~ msgid "cannot create pipe"
+#~ msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
+
+#, fuzzy
+#~ msgid "number of format specifications in 'msgid' and '%s' does not match"
+#~ msgstr ""
+#~ "o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
+
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in '%s'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#~ msgstr ""
+#~ "o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
+
+#, fuzzy
+#~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#~ "tuple"
+#~ msgstr ""
+#~ "o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
+
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#~ "mapping"
+#~ msgstr ""
+#~ "o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
+
+#, fuzzy
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#~ msgid "%s and %s are mutually exclusive"
+#~ msgstr "%s e %s son mutuamente exclu�ntes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                write the .po file using indented style\n"
+#~ "      --no-location           do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
+
+#~ msgid "impossible selection criteria specified (%d < n < %d)"
+#~ msgstr "o criterio de selecci�n indicado � imposible (%d < n < %d)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Concatenates and merges the specified PO files.\n"
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
+#~ "is specified, they will be taken from the first PO file to define them.\n"
+#~ "File positions from all PO files will be cumulated.\n"
+#~ msgstr ""
+#~ "  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         escribi-las mensaxes que te�an menos\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � infinito\n"
+#~ "  ->, --more-than=N�MERO         escribi-las mensaxes que te�an m�is\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � 1\n"
+#~ "\n"
+#~ "Atopar mensaxes que son com�ns a dous ou m�is dos ficheiros PO "
+#~ "indicados.\n"
+#~ "Usando a opci�n --more-than, p�dese requiri-la concorrencia en m�is "
+#~ "ficheiros\n"
+#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opci�n --less-than "
+#~ "p�dese\n"
+#~ "requiri-la concorrencia en menos ficheiros antes de escribir-las "
+#~ "mensaxes\n"
+#~ "(i.e. --less-than=2 s� escribe as mensaxes �nicas).  As traducci�ns,\n"
+#~ "comentarios e comentarios de extracci�n mant��ense, pero s� do primeiro\n"
+#~ "ficheiro para definilos.  Mant��ense as posici�ns de t�dolos ficheiros "
+#~ "PO.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 0 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         escribi-las mensaxes que te�an menos\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � infinito\n"
+#~ "  ->, --more-than=N�MERO         escribi-las mensaxes que te�an m�is\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � 1\n"
+#~ "\n"
+#~ "Atopar mensaxes que son com�ns a dous ou m�is dos ficheiros PO "
+#~ "indicados.\n"
+#~ "Usando a opci�n --more-than, p�dese requiri-la concorrencia en m�is "
+#~ "ficheiros\n"
+#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opci�n --less-than "
+#~ "p�dese\n"
+#~ "requiri-la concorrencia en menos ficheiros antes de escribir-las "
+#~ "mensaxes\n"
+#~ "(i.e. --less-than=2 s� escribe as mensaxes �nicas).  As traducci�ns,\n"
+#~ "comentarios e comentarios de extracci�n mant��ense, pero s� do primeiro\n"
+#~ "ficheiro para definilos.  Mant��ense as posici�ns de t�dolos ficheiros "
+#~ "PO.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -t, --to-code=NAME             encoding for output\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
+
 #~ msgid "no input files given"
-#~ msgstr "non se indicou ningún ficheiro de entrada"
+#~ msgstr "non se indicou ning�n ficheiro de entrada"
 
 #~ msgid "exactly 2 input files required"
-#~ msgstr "precísanse exactamente dous ficheiros de entrada"
+#~ msgstr "prec�sanse exactamente dous ficheiros de entrada"
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] def.po ref.po\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "\n"
 #~ "Compare two Uniforum style .po files to check that both contain the same\n"
 #~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
-#~ "old translations.  The ref.po file is the last created PO file\n"
-#~ "(generally by xgettext).  This is useful for checking that you have\n"
-#~ "translated each and every message in your program.  Where an exact match\n"
-#~ "cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
+#~ "file (generally created by xgettext).  This is useful for checking that\n"
+#~ "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 ""
-#~ "Uso: %s [OPCIÓN] def.po ref.po\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obligatorios "
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obligatorios "
 #~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "as opci�ns curtas.\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
 #~ "ficheiros\n"
 #~ "                              de entrada\n"
-#~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "  -V, --version               amosa-la información da versión e saír\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
 #~ "\n"
 #~ "Compara dous ficheiros .po de estilo Uniforum para verificar que os dous\n"
-#~ "conteñen o mesmo conxunto de cadeas msgid.  O ficheiro def.po é un "
+#~ "conte�en o mesmo conxunto de cadeas msgid.  O ficheiro def.po � un "
 #~ "ficheiro\n"
-#~ "PO existente, coas traduccións antigas.  O ficheiro ref.po é o último\n"
-#~ "ficheiro PO creado (xeralmente por xgettext).  Isto é útil para "
+#~ "PO existente, coas traducci�ns antigas.  O ficheiro ref.po � o �ltimo\n"
+#~ "ficheiro PO creado (xeralmente por xgettext).  Isto � �til para "
 #~ "verificar\n"
-#~ "que tódalas mensaxes do programa están traducidas.  Cando non se pode "
+#~ "que t�dalas mensaxes do programa est�n traducidas.  Cando non se pode "
 #~ "atopar\n"
-#~ "un emparellamento exacto, úsase coincidencia difusa, de xeito que se "
+#~ "un emparellamento exacto, �sase coincidencia difusa, de xeito que se "
 #~ "produza\n"
-#~ "un mellor diagnóstico.\n"
+#~ "un mellor diagn�stico.\n"
 
 #~ msgid "this message is used but not defined..."
-#~ msgstr "esta mensaxe úsase mais non está definida..."
+#~ msgstr "esta mensaxe �sase mais non est� definida..."
 
 #~ msgid "...but this definition is similar"
-#~ msgstr "...mais esta definición é semellante"
+#~ msgstr "...mais esta definici�n � semellante"
 
 #~ msgid "this message is used but not defined in %s"
-#~ msgstr "esta mensaxe úsase mais non está definida en %s"
+#~ msgstr "esta mensaxe �sase mais non est� definida en %s"
 
 #~ msgid "warning: this message is not used"
 #~ msgstr "aviso: esta mensaxe non se usa"
@@ -392,348 +650,1039 @@
 #~ msgid "found %d fatal error"
 #~ msgid_plural "found %d fatal errors"
 #~ msgstr[0] "atopouse %d erro grave"
-#~ msgstr[1] "atopáronse %d erros graves"
-
-#~ msgid "duplicate message definition"
-#~ msgstr "definición de mensaxe duplicada"
-
-#~ msgid "...this is the location of the first definition"
-#~ msgstr "...este é o lugar da primeira definición"
-
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "esta mensaxe non ten definición no dominio \"%s\""
-
-#~ msgid "while preparing output"
-#~ msgstr "ao preparar a saída"
-
-#~ msgid "%s and %s are mutually exclusive"
-#~ msgstr "%s e %s son mutuamente excluíntes"
+#~ msgstr[1] "atop�ronse %d erros graves"
 
 #~ msgid "at least two files must be specified"
-#~ msgstr "téñense que indicar polo menos dous ficheiros"
-
-#~ msgid "impossible selection criteria specified (%d < n < %d)"
-#~ msgstr "o criterio de selección indicado é imposible (%d < n < %d)"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] INPUTFILE ...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "  -h, --help                     display this help and exit\n"
-#~ msgstr ""
-#~ "Uso: %s [OPCIÓN] FICHEIRO ...\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
-#~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -d, --default-domain=NOME      usar NOME.po para a saída (en vez de\n"
-#~ "                                 messages.po)\n"
-#~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO á lista de busca de\n"
-#~ "                                 ficheiros de entrada\n"
-#~ "  -e, --no-escape                non usar secuencias de escape de C na "
-#~ "saída\n"
-#~ "                                 (opción por defecto)\n"
-#~ "  -E, --escape                   usar secuencias de escape de C na "
-#~ "saída,\n"
-#~ "                                 sen caracteres estendidos\n"
-#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
-#~ "do\n"
-#~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea "
-#~ "baleiro\n"
-#~ "  -F, --sort-by-file             ordena-la saída pola posición do "
-#~ "ficheiro\n"
-#~ "  -h, --help                     amosar esta axuda e saír\n"
+#~ msgstr "t��ense que indicar polo menos dous ficheiros"
 
+#, fuzzy
 #~ msgid ""
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
-#~ "                                 that only unique messages be printed\n"
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be preserved, but only from the first\n"
+#~ "PO file to define them.  File positions from all PO files will be\n"
+#~ "cumulated.\n"
 #~ msgstr ""
-#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
-#~ "indentado\n"
-#~ "      --no-location              non escribi-las liñas '#: ficheiro:"
-#~ "liña'\n"
-#~ "  -n, --add-location             xera-las liñas '#: ficheiro:"
-#~ "liña' (defecto)\n"
-#~ "      --omit-header              non escribi-la entrada `msgid \"\"' na\n"
-#~ "                                 cabeceira\n"
-#~ "  -o, --output=FICHEIRO          escribi-la saída ao ficheiro indicado\n"
-#~ "  -p, --output-dir=DIRECTORIO    pó-los ficheiros de saída no DIRECTORIO\n"
-#~ "  -s, --sort-output              ordena-la saída e quita-los duplicados\n"
-#~ "      --strict                   escribi-lo ficheiro .po de tipo "
-#~ "Uniforum\n"
-#~ "                                 estricto\n"
-#~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
-#~ "  -u, --unique                   atallo para --less-than=2, só escribi-"
-#~ "las\n"
-#~ "                                 mensaxes únicas\n"
+#~ "  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         escribi-las mensaxes que te�an menos\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � infinito\n"
+#~ "  ->, --more-than=N�MERO         escribi-las mensaxes que te�an m�is\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � 1\n"
+#~ "\n"
+#~ "Atopar mensaxes que son com�ns a dous ou m�is dos ficheiros PO "
+#~ "indicados.\n"
+#~ "Usando a opci�n --more-than, p�dese requiri-la concorrencia en m�is "
+#~ "ficheiros\n"
+#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opci�n --less-than "
+#~ "p�dese\n"
+#~ "requiri-la concorrencia en menos ficheiros antes de escribir-las "
+#~ "mensaxes\n"
+#~ "(i.e. --less-than=2 s� escribe as mensaxes �nicas).  As traducci�ns,\n"
+#~ "comentarios e comentarios de extracci�n mant��ense, pero s� do primeiro\n"
+#~ "ficheiro para definilos.  Mant��ense as posici�ns de t�dolos ficheiros "
+#~ "PO.\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "  -V, --version                  output version information and exit\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
 #~ "                                 definitions, defaults to infinite if "
 #~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
-#~ "\n"
-#~ "Find messages which are common to two or more of the specified PO files.\n"
-#~ "By using the --more-than option, greater commonality may be requested\n"
-#~ "before messages are printed.  Conversely, the --less-than option may be\n"
-#~ "used to specify less commonality before messages are printed (i.e.\n"
-#~ "--less-than=2 will only print the unique messages).  Translations,\n"
-#~ "comments and extract comments will be preserved, but only from the first\n"
-#~ "PO file to define them.  File positions from all PO files will be\n"
-#~ "preserved.\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -V, --version                  amosa-la información da versión e saír\n"
-#~ "  -w, --width=NÚMERO             establece-la anchura da páxina de saída\n"
-#~ "  -<, --less-than=NÚMERO         escribi-las mensaxes que teñan menos\n"
-#~ "                                 deste número de definicións.  Se non se\n"
-#~ "                                 indica, é infinito\n"
-#~ "  ->, --more-than=NÚMERO         escribi-las mensaxes que teñan máis\n"
-#~ "                                 deste número de definicións.  Se non se\n"
-#~ "                                 indica, é 1\n"
+#~ "  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         escribi-las mensaxes que te�an menos\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � infinito\n"
+#~ "  ->, --more-than=N�MERO         escribi-las mensaxes que te�an m�is\n"
+#~ "                                 deste n�mero de definici�ns.  Se non se\n"
+#~ "                                 indica, � 1\n"
 #~ "\n"
-#~ "Atopar mensaxes que son comúns a dous ou máis dos ficheiros PO "
+#~ "Atopar mensaxes que son com�ns a dous ou m�is dos ficheiros PO "
 #~ "indicados.\n"
-#~ "Usando a opción --more-than, pódese requiri-la concorrencia en máis "
+#~ "Usando a opci�n --more-than, p�dese requiri-la concorrencia en m�is "
 #~ "ficheiros\n"
-#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opción --less-than "
-#~ "pódese\n"
+#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opci�n --less-than "
+#~ "p�dese\n"
 #~ "requiri-la concorrencia en menos ficheiros antes de escribir-las "
 #~ "mensaxes\n"
-#~ "(i.e. --less-than=2 só escribe as mensaxes únicas).  As traduccións,\n"
-#~ "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
-#~ "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros "
+#~ "(i.e. --less-than=2 s� escribe as mensaxes �nicas).  As traducci�ns,\n"
+#~ "comentarios e comentarios de extracci�n mant��ense, pero s� do primeiro\n"
+#~ "ficheiro para definilos.  Mant��ense as posici�ns de t�dolos ficheiros "
 #~ "PO.\n"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "erro ao abrir \"%s\" para lectura"
-
-#~ msgid "this file may not contain domain directives"
-#~ msgstr "este ficheiro non pode conter directivas de dominio"
-
-#~ msgid "no input file given"
-#~ msgstr "non se indicou ningún ficheiro de entrada"
-
-#~ msgid "error while opening \"%s\" for writing"
-#~ msgstr "erro ao abrir \"%s\" para escribir"
-
-#~ msgid "%d translated message"
-#~ msgid_plural "%d translated messages"
-#~ msgstr[0] "%d mensaxe traducida"
-#~ msgstr[1] "%d mensaxes traducidas"
-
-#~ msgid ", %d fuzzy translation"
-#~ msgid_plural ", %d fuzzy translations"
-#~ msgstr[0] ", %d traducción difusa"
-#~ msgstr[1] ", %d traduccións difusas"
-
-#~ msgid ", %d untranslated message"
-#~ msgid_plural ", %d untranslated messages"
-#~ msgstr[0] ", %d mensaxe sen traducir"
-#~ msgstr[1] ", %d mensaxes sen traducir"
-
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] filename.po ...\n"
-#~ "Generate binary message catalog from textual translation description.\n"
-#~ "\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
-#~ "%d)\n"
-#~ "  -c, --check                 perform language dependent checks on "
-#~ "strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash "
-#~ "table\n"
-#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
-#~ "      --statistics            print statistics about translations\n"
-#~ "      --strict                enable strict Uniforum mode\n"
-#~ "  -v, --verbose               list input file anomalies\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "\n"
-#~ "Giving the -v option more than once increases the verbosity level.\n"
-#~ "\n"
-#~ "If input file is -, standard input is read.  If output file is -,\n"
-#~ "output is written to standard output.\n"
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] ficheiro.po ...\n"
-#~ "Xera un catálogo de mensaxes binario a partir da descripción textual da\n"
-#~ "traducción.\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
-#~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -a, --alignment=NÚMERO      aliña-las cadeas a NÚMERO bytes (defecto: "
-#~ "%d)\n"
-#~ "  -c, --check                 facer comprobacións dependentes da "
-#~ "linguaxe\n"
-#~ "                              nas cadeas\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
 #~ "ficheiros\n"
 #~ "                              de entrada\n"
-#~ "  -f, --use-fuzzy             utiliza-las entradas fuzzy na saída\n"
-#~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "      --no-hash               non incluí-la tabla \"hash\" no ficheiro "
-#~ "binario\n"
-#~ "  -o, --output-file=FICHEIRO  especifica-lo nome do ficheiro de saída\n"
-#~ "      --statictics            escribi-las estatísticas das traduccións\n"
-#~ "      --strict                emprega-lo modo Uniforum estricto\n"
-#~ "  -v, --verbose               amosa-las anomalías do ficheiro de entrada\n"
-#~ "  -V, --version               amosa-la información da versión e saír\n"
-#~ "\n"
-#~ "Empregando a opción -v máis dunha vez, o nivel de detalle increméntase.\n"
-#~ "\n"
-#~ "Se o ficheiro de entrada é -, lese da entrada estándar.  Se o ficheiro de "
-#~ "saída\n"
-#~ "é -, o resultado escríbese na saída estándar.\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
 
-#~ msgid "while creating hash table"
-#~ msgstr "ao crea-la táboa `hash'"
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
+
+#~ msgid "no input file given"
+#~ msgstr "non se indicou ning�n ficheiro de entrada"
+
+#, fuzzy
+#~ msgid "exactly one input file required"
+#~ msgstr "prec�sanse exactamente dous ficheiros de entrada"
+
+#, fuzzy
+#~ msgid "missing command name"
+#~ msgstr "faltan argumentos"
+
+#, fuzzy
+#~ msgid "missing filter name"
+#~ msgstr "faltan argumentos"
+
+#, fuzzy
+#~ msgid "at least one sed script must be specified"
+#~ msgstr "t��ense que indicar polo menos dous ficheiros"
 
+#, fuzzy
 #~ msgid ""
-#~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
-#~ "%*s  warning: charset conversion will not work"
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é "
-#~ "inválida\n"
-#~ "%*s  aviso: a conversión de código de caracteres non vai funcionar"
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
+
+#~ msgid "%d translated message"
+#~ msgid_plural "%d translated messages"
+#~ msgstr[0] "%d mensaxe traducida"
+#~ msgstr[1] "%d mensaxes traducidas"
+
+#~ msgid ", %d fuzzy translation"
+#~ msgid_plural ", %d fuzzy translations"
+#~ msgstr[0] ", %d traducci�n difusa"
+#~ msgstr[1] ", %d traducci�ns difusas"
+
+#~ msgid ", %d untranslated message"
+#~ msgid_plural ", %d untranslated messages"
+#~ msgstr[0] ", %d mensaxe sen traducir"
+#~ msgstr[1] ", %d mensaxes sen traducir"
+
+#, fuzzy
+#~ msgid "invalid nplurals value"
+#~ msgstr "secuencia de control ilegal"
+
+#, fuzzy
+#~ msgid "...but some messages have only one plural form"
+#~ msgid_plural "...but some messages have only %lu plural forms"
+#~ msgstr[0] "esta mensaxe �sase mais non est� definida en %s"
+#~ msgstr[1] "esta mensaxe �sase mais non est� definida en %s"
+
+#, fuzzy
+#~ msgid "...but some messages have one plural form"
+#~ msgid_plural "...but some messages have %lu plural forms"
+#~ msgstr[0] "esta mensaxe �sase mais non est� definida en %s"
+#~ msgstr[1] "esta mensaxe �sase mais non est� definida en %s"
+
+#~ 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'"
+
+#~ 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'"
+
+#~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#~ msgstr "as entradas `msgid' e `msgstr' non comezan �mbalas d�as con '\\n'"
+
+#~ 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'"
+
+#~ 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'"
+
+#~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#~ msgstr "as entradas `msgid' e `msgstr' non rematan �mbalas d�as con '\\n'"
+
+#, fuzzy
+#~ msgid "headerfield `%s' missing in header\n"
+#~ msgstr "falta o campo `%s' na cabeceira"
+
+#, fuzzy
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "o campo `%s' da cabeceira ter�a que comezar ao principio da li�a"
+
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "alg�ns campos da cabeceira a�nda te�en o valor inicial por defecto"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "o campo `%s' a�nda ten o valor inicial por defecto"
+
+#, fuzzy
+#~ msgid "warning: PO file header missing or invalid\n"
+#~ msgstr ""
+#~ "%s: aviso: a cabeceira do ficheiro PO non existe, � 'fuzzy' ou � "
+#~ "inv�lida\n"
+#~ "%*s  aviso: a conversi�n de c�digo de caracteres non vai funcionar"
+
+#, fuzzy
+#~ msgid "warning: charset conversion will not work\n"
+#~ msgstr ""
+#~ "Falta o c�digo de caracteres na cabeceira.\n"
+#~ "A conversi�n da mensaxe ao c�digo do usuario non vai funcionar.\n"
+
+#, fuzzy
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr ""
+#~ "%s: aviso: a cabeceira do ficheiro PO non existe, � 'fuzzy' ou � "
+#~ "inv�lida\n"
+#~ "%*s  aviso: a conversi�n de c�digo de caracteres non vai funcionar"
 
 #~ msgid "domain name \"%s\" not suitable as file name"
-#~ msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro"
+#~ msgstr "o nome de dominio \"%s\" non � axeitado para nome de ficheiro"
 
 #~ 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"
+#~ "o nome de dominio \"%s\" non � axeitado como nome de ficheiro:\n"
 #~ "empregarase un prefixo"
 
 #~ msgid "`domain %s' directive ignored"
 #~ msgstr "directiva `domain %s' ignorada"
 
+#~ msgid "duplicate message definition"
+#~ msgstr "definici�n de mensaxe duplicada"
+
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...este � o lugar da primeira definici�n"
+
 #~ msgid "empty `msgstr' entry ignored"
 #~ msgstr "entrada `msgstr' baleira ignorada"
 
 #~ msgid "fuzzy `msgstr' entry ignored"
 #~ msgstr "entrada `msgstr' difusa ignorada"
 
-#~ msgid "headerfield `%s' missing in header"
-#~ msgstr "falta o campo `%s' na cabeceira"
+#~ msgid "%s: warning: source file contains fuzzy translation"
+#~ msgstr "%s: aviso: o ficheiro fonte cont�n traducci�ns difusas"
 
-#~ msgid "header field `%s' should start at beginning of line"
-#~ msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña"
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "      --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "      --sort-output           generate sorted output\n"
+#~ "      --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
 
-#~ msgid "some header fields still have the initial default value"
-#~ msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
+#, fuzzy
+#~ msgid "warning: "
+#~ msgstr "%s: aviso: "
 
-#~ msgid "field `%s' still has initial default value"
-#~ msgstr "o campo `%s' aínda ten o valor inicial por defecto"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
+#~ "does not support this conversion."
+#~ msgstr ""
+#~ "O c�digo de caracteres \"%s\" non est� soportado. %s depende de\n"
+#~ "iconv(), e iconv() non soporta \"%s\".\n"
 
-#~ msgid "%s: warning: source file contains fuzzy translation"
-#~ msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
+#~ "was built without iconv()."
+#~ msgstr ""
+#~ "O c�digo de caracteres \"%s\" non est� soportado. %s depende de iconv().\n"
+#~ "Esta versi�n foi compilada sen iconv().\n"
 
-#~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+# src/msgmerge.c:324
+#, fuzzy
+#~ msgid ""
+#~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
+#~ "existing PO file with translations which will be taken over to the newly\n"
+#~ "created file as long as they still match; comments will be preserved,\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
+#~ "file is the last created PO file with up-to-date source references but\n"
+#~ "old translations, or a PO Template file (generally created by xgettext);\n"
+#~ "any translations or comments in the file will be discarded, however dot\n"
+#~ "comments and file positions will be preserved.  Where an exact match\n"
+#~ "cannot be found, fuzzy matching is used to produce better results.\n"
 #~ msgstr ""
-#~ "as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
+#~ "\n"
+#~ "Mestura dous ficheiros .po de estilo Uniforum nun s�.  O ficheiro def.po "
+#~ "�\n"
+#~ "un ficheiro PO existente coas traducci�ns antigas, que se manter�n no "
+#~ "novo\n"
+#~ "ficheiro se coinciden; os comentarios manter�nse, mais os comentarios e "
+#~ "as\n"
+#~ "posici�ns nos ficheiros ser�n eliminados.  O ficheiro ref.po � o �ltimo\n"
+#~ "ficheiro PO creado (xeralmente polo xgettext), calquera traducci�n ou\n"
+#~ "comentario no ficheiro ser� eliminado, mentres os comentarios de punto e\n"
+#~ "as posici�ns nos ficheiros manter�nse.  Onde non se atope ning�n\n"
+#~ "emparellamento exacto, empregarase o m�todo de comparaci�n difusa,\n"
+#~ "para producir mellores resultados.  Os resultados escr�bense na sa�da\n"
+#~ "est�ndar a menos que se indique un ficheiro de sa�da.\n"
+
+#, fuzzy
+#~ msgid "this message should define plural forms"
+#~ msgstr "esta mensaxe �sase mais non est� definida en %s"
+
+#, fuzzy
+#~ msgid "this message should not define plural forms"
+#~ msgstr "esta mensaxe �sase mais non est� definida en %s"
 
-#~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
 #~ msgstr ""
-#~ "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
+#~ "%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, "
+#~ "faltan %ld, obsoletas %ld.\n"
 
-#~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-#~ msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
+#~ msgid " done.\n"
+#~ msgstr " rematado.\n"
 
-#~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#, fuzzy
+#~ msgid "%s and explicit file names are mutually exclusive"
+#~ msgstr "%s e %s son mutuamente exclu�ntes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
-#~ "as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
+#~ "Uso: %s [OPCI�N] [FICHEIRO]...\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
+#~ "para\n"
+#~ "as opci�ns curtas.\n"
+#~ "  -e, --no-escape          non usar secuencias de escape de C na sa�da "
+#~ "(por\n"
+#~ "                           defecto)\n"
+#~ "  -E, --escape             usar secuencias de escape de C na sa�da, sen\n"
+#~ "                           caracteres estendidos\n"
+#~ "      --force-po           escribi-lo ficheiro PO a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help               amosar esta axuda e sa�r\n"
+#~ "  -i, --indent             escribi-la sa�da cun estilo indentado\n"
+#~ "  -o, --output-file=FICH   escribi-la sa�da en FICH en vez da sa�da "
+#~ "est�ndar\n"
+#~ "  -V, --version            amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO       establece-la anchura da p�xina de sa�da\n"
 
-#~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#~ msgid "<stdin>"
+#~ msgstr "<stdin>"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: aviso: "
+
+#~ msgid ""
+#~ "Charset \"%s\" is not a portable encoding name.\n"
+#~ "Message conversion to user's charset might not work.\n"
 #~ msgstr ""
-#~ "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
+#~ "O c�digo de caracteres \"%s\" non ten un nome portable.\n"
+#~ "A conversi�n da mensaxe ao c�digo do usuario poder�a non funcionar.\n"
 
-#~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-#~ msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
+#~ msgid "Continuing anyway, expect parse errors."
+#~ msgstr "Continuando de calquera xeito, espere atopar erros de an�lise."
+
+#~ msgid "Continuing anyway."
+#~ msgstr "Continuando de calquera xeito."
+
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv(),\n"
+#~ "and iconv() does not support \"%s\".\n"
+#~ msgstr ""
+#~ "O c�digo de caracteres \"%s\" non est� soportado. %s depende de\n"
+#~ "iconv(), e iconv() non soporta \"%s\".\n"
 
 #~ msgid ""
-#~ "number of format specifications in `msgid' and `msgstr' does not match"
+#~ "Installing GNU libiconv and then reinstalling GNU gettext\n"
+#~ "would fix this problem.\n"
 #~ msgstr ""
-#~ "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
+#~ "Se instala GNU libiconv e logo reinstala o GNU gettext\n"
+#~ "poder�a arranxarse o problema.\n"
 
-#~ msgid "format specifications for argument %lu are not the same"
-#~ msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
 
 #~ msgid ""
-#~ "Usage: %s [OPTION] def.po ref.po\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -C, --compendium=FILE       additional library of message "
-#~ "translations,\n"
-#~ "                              may be specified more than once\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "  -i, --indent                indented output style\n"
-#~ "  -o, --output-file=FILE      result will be written to FILE\n"
-#~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "Charset \"%s\" is not supported. %s relies on iconv().\n"
+#~ "This version was built without iconv().\n"
+#~ msgstr ""
+#~ "O c�digo de caracteres \"%s\" non est� soportado. %s depende de iconv().\n"
+#~ "Esta versi�n foi compilada sen iconv().\n"
+
+#~ msgid ""
+#~ "Charset missing in header.\n"
+#~ "Message conversion to user's charset will not work.\n"
+#~ msgstr ""
+#~ "Falta o c�digo de caracteres na cabeceira.\n"
+#~ "A conversi�n da mensaxe ao c�digo do usuario non vai funcionar.\n"
+
+#~ msgid "inconsistent use of #~"
+#~ msgstr "uso inconsistente de #~"
+
+#~ msgid "missing `msgstr[]' section"
+#~ msgstr "falta a secci�n `msgstr[]'"
+
+#~ msgid "missing `msgid_plural' section"
+#~ msgstr "falta a secci�n `msgid_plural'"
+
+#~ msgid "missing `msgstr' section"
+#~ msgstr "falta a secci�n `msgstr'"
+
+#~ msgid "first plural form has nonzero index"
+#~ msgstr "a primera forma do plural ten un �ndice distinto a cero"
+
+#~ msgid "plural form has wrong index"
+#~ msgstr "a forma do plural ten un �ndice err�neo"
+
+#~ msgid "too many errors, aborting"
+#~ msgstr "demasiados erros, interrompendo"
+
+#~ msgid "invalid multibyte sequence"
+#~ msgstr "secuencia multibyte non v�lida"
+
+#, fuzzy
+#~ msgid "incomplete multibyte sequence at end of file"
+#~ msgstr "secuencia multibyte non v�lida"
+
+#, fuzzy
+#~ msgid "incomplete multibyte sequence at end of line"
+#~ msgstr "secuencia multibyte non v�lida"
+
+#~ msgid "keyword \"%s\" unknown"
+#~ msgstr "palabra chave \"%s\" desco�ecida"
+
+#~ msgid "invalid control sequence"
+#~ msgstr "secuencia de control ilegal"
+
+#~ msgid "end-of-file within string"
+#~ msgstr "fin de ficheiro nunha cadea"
+
+#~ msgid "end-of-line within string"
+#~ msgstr "fin de li�a nunha cadea"
+
+#, fuzzy
+#~ msgid "file \"%s\" is truncated"
+#~ msgstr "ficheiro \"%s\" truncado"
+
+#~ msgid "file \"%s\" contains a not NUL terminated string"
+#~ msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
+
+#~ msgid "file \"%s\" is not in GNU .mo format"
+#~ msgstr "o ficheiro \"%s\" non est� no formato .mo de GNU"
+
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
+#~ msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
+
+#, fuzzy
+#~ msgid "expected two arguments"
+#~ msgstr "demasiados argumentos"
+
+#, fuzzy
+#~ msgid "error writing stdout"
+#~ msgstr "erro ao escribi-lo ficheiro \"%s\""
+
+#, fuzzy
+#~ msgid "cannot create a temporary directory using template \"%s\""
+#~ msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "erro ao escribi-lo ficheiro \"%s\""
+
+#~ msgid "error while opening \"%s\" for writing"
+#~ msgstr "erro ao abrir \"%s\" para escribir"
+
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\"
+#~ "%c'"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
+
+#~ msgid "standard output"
+#~ msgstr "sa�da est�ndar"
+
+#~ msgid "%s:%d: warning: unterminated character constant"
+#~ 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"
+
+#~ msgid "this file may not contain domain directives"
+#~ msgstr "este ficheiro non pode conter directivas de dominio"
+
+#~ msgid "--join-existing cannot be used when output is written to stdout"
+#~ msgstr "non se pode usar --join-existing cando a sa�da se escribe en stdout"
+
+#~ msgid "xgettext cannot work without keywords to look for"
+#~ msgstr "xgettext non funciona sen palabras chave polas que buscar"
+
+#~ msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#~ msgstr ""
+#~ "aviso: o ficheiro `%s' coa extensi�n `%s' � desco�ecido; tentar�se C"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
 #~ "(default)\n"
-#~ "      --strict                strict Uniforum output style\n"
-#~ "  -v, --verbose               increase verbosity level\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] def.po ref.po\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios\n"
-#~ "para as opcións curtas.\n"
-#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traduccións de "
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
 #~ "mensaxes,\n"
-#~ "                              pode ser indicada máis dunha vez\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
 #~ "ficheiros\n"
 #~ "                              de entrada\n"
 #~ "  -e, --no-escape             non usar secuencias de escape de C na "
-#~ "saída\n"
-#~ "                              (opción por defecto)\n"
-#~ "  -E, --escape                usar secuencias de escape de C na saída, "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
 #~ "sen\n"
 #~ "                              caracteres estendidos\n"
-#~ "      --force-po              escribi-lo ficheiro po aínda que estea "
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
 #~ "baleiro\n"
-#~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "  -i, --indent                estilo de saída indentado\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
 #~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
-#~ "      --no-location           suprimi-las liñas '#: ficheiro:liña'\n"
-#~ "      --add-location          mante-las liñas '#: ficheiro:liña' (por "
-#~ "omisión)\n"
-#~ "      --strict                estilo de saída Uniforum estricto\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
 #~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
-#~ "  -V, --version               amosa-la información da versión e saír\n"
-#~ "  -w, --width=NÚMERO          establece-la anchura da páxina de saída\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
+
+#~ msgid "language `%s' unknown"
+#~ msgstr "linguaxe `%s' desco�ecida"
+
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+#~ msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "fallo ao desprazarse � posici�n %2$ld de \"%1$s\""
+
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#~ msgid "while creating hash table"
+#~ msgstr "ao crea-la t�boa `hash'"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: keyword nested in keyword arg"
+#~ msgstr "%s:%d: aviso: palabra chave ani�ada no argumento de palabra chave"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: keyword between outer keyword and its arg"
+#~ msgstr ""
+#~ "%s:%d: aviso: palabra chave entre a palabra externa e o seu argumento"
+
+#~ msgid "while preparing output"
+#~ msgstr "ao preparar a sa�da"
+
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "esta mensaxe non ten definici�n no dominio \"%s\""
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] FICHEIRO ...\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
+#~ "para\n"
+#~ "as opci�ns curtas.\n"
+#~ "  -d, --default-domain=NOME      usar NOME.po para a sa�da (en vez de\n"
+#~ "                                 messages.po)\n"
+#~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO � lista de busca de\n"
+#~ "                                 ficheiros de entrada\n"
+#~ "  -e, --no-escape                non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                                 (opci�n por defecto)\n"
+#~ "  -E, --escape                   usar secuencias de escape de C na "
+#~ "sa�da,\n"
+#~ "                                 sen caracteres estendidos\n"
+#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
+#~ "do\n"
+#~ "                                 FICHEIRO\n"
+#~ "      --force-po                 escribi-lo ficheiro PO a�nda que estea "
+#~ "baleiro\n"
+#~ "  -F, --sort-by-file             ordena-la sa�da pola posici�n do "
+#~ "ficheiro\n"
+#~ "  -h, --help                     amosar esta axuda e sa�r\n"
+
+#~ msgid ""
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
+#~ "indentado\n"
+#~ "      --no-location              non escribi-las li�as '#: ficheiro:"
+#~ "li�a'\n"
+#~ "  -n, --add-location             xera-las li�as '#: ficheiro:"
+#~ "li�a' (defecto)\n"
+#~ "      --omit-header              non escribi-la entrada `msgid \"\"' na\n"
+#~ "                                 cabeceira\n"
+#~ "  -o, --output=FICHEIRO          escribi-la sa�da ao ficheiro indicado\n"
+#~ "  -p, --output-dir=DIRECTORIO    p�-los ficheiros de sa�da no DIRECTORIO\n"
+#~ "  -s, --sort-output              ordena-la sa�da e quita-los duplicados\n"
+#~ "      --strict                   escribi-lo ficheiro .po de tipo "
+#~ "Uniforum\n"
+#~ "                                 estricto\n"
+#~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
+#~ "  -u, --unique                   atallo para --less-than=2, s� escribi-"
+#~ "las\n"
+#~ "                                 mensaxes �nicas\n"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "Generate binary message catalog from textual translation description.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ "  -c, --check                 perform language dependent checks on "
+#~ "strings\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
+#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "  -v, --verbose               list input file anomalies\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
+#~ "\n"
+#~ "If input file is -, standard input is read.  If output file is -,\n"
+#~ "output is written to standard output.\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] ficheiro.po ...\n"
+#~ "Xera un cat�logo de mensaxes binario a partir da descripci�n textual da\n"
+#~ "traducci�n.\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
+#~ "para\n"
+#~ "as opci�ns curtas.\n"
+#~ "  -a, --alignment=N�MERO      ali�a-las cadeas a N�MERO bytes (defecto: "
+#~ "%d)\n"
+#~ "  -c, --check                 facer comprobaci�ns dependentes da "
+#~ "linguaxe\n"
+#~ "                              nas cadeas\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -f, --use-fuzzy             utiliza-las entradas fuzzy na sa�da\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "      --no-hash               non inclu�-la tabla \"hash\" no ficheiro "
+#~ "binario\n"
+#~ "  -o, --output-file=FICHEIRO  especifica-lo nome do ficheiro de sa�da\n"
+#~ "      --statictics            escribi-las estat�sticas das traducci�ns\n"
+#~ "      --strict                emprega-lo modo Uniforum estricto\n"
+#~ "  -v, --verbose               amosa-las anomal�as do ficheiro de entrada\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "\n"
+#~ "Empregando a opci�n -v m�is dunha vez, o nivel de detalle increm�ntase.\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada � -, lese da entrada est�ndar.  Se o ficheiro de "
+#~ "sa�da\n"
+#~ "� -, o resultado escr�bese na sa�da est�ndar.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Convert binary .mo files to Uniforum style .po files.\n"
+#~ "Both little-endian and big-endian .mo files are handled.\n"
+#~ "If no input file is given or it is -, standard input is read.\n"
+#~ "By default the output is written to standard output.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Converte ficheiros .mo binarios en ficheiros .po de estilo Uniforum.\n"
+#~ "Man�xanse ficheiros .po little-endian e big-endian.\n"
+#~ "Se non se indicou un ficheiro de entrada, ou � -, lese a entrada "
+#~ "est�ndar\n"
+#~ "Por defecto a sa�da escr�bese na sa�da est�ndar.\n"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Extract translatable string from given input files.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
+#~ "                                 preceding keyword lines) in output file\n"
+#~ "  -C, --c++                      shorthand for --language=C++\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Uso: %s [OPCI�N] FICHEIRO_ENTRADA ...\n"
+#~ "Extrae as cadeas traducibles dos ficheiros de entrada indicados.\n"
+#~ "\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
+#~ "para\n"
+#~ "as opci�ns curtas.\n"
+#~ "  -a, --extract-all              extraer t�dalas cadeas\n"
+#~ "  -c, --add-comments[=ETIQUETA]  po�e-los bloques de comentarios con\n"
+#~ "                                 ETIQUETA (ou os que preceden �s li�as "
+#~ "de\n"
+#~ "                                 palabras chave) no ficheiro de sa�da\n"
+#~ "  -C, --c++                      atallo para --language=C++\n"
+#~ "      --debug                    producir resultados m�is detallados do\n"
+#~ "                                 reco�ecemento das cadeas de formato\n"
+#~ "  -d, --default-domain=NOME      usar NOME.po para a sa�da (en vez de\n"
+#~ "                                 messages.po)\n"
+#~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO � lista de busca de\n"
+#~ "                                 ficheiros de entrada\n"
+#~ "  -e, --no-escape                non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                                 (opci�n por defecto)\n"
+#~ "  -E, --escape                   usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                                 caracteres estendidos\n"
+#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
+#~ "de\n"
+#~ "                                 FICHEIRO\n"
+#~ "      --force-po                 escribi-lo ficheiro PO a�nda que estea "
+#~ "baleiro\n"
+#~ "      --foreign-user             non amosa-lo copyright da FSF para os\n"
+#~ "                                 usuarios non ingleses\n"
+#~ "  -F, --sort-by-file             ordena-la sa�da pola localizaci�n do "
+#~ "ficheiro\n"
+
+#~ msgid ""
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "  -j, --join-existing            join messages with existing file\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ msgstr ""
+#~ "  -h, --help                     amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
+#~ "indentado\n"
+#~ "  -j, --join-existing            mestura-las mensaxes co ficheiro "
+#~ "existente\n"
+#~ "  -k, --keyword[=PALABRA]        buscar palabra chave adicional (sen "
+#~ "PALABRA\n"
+#~ "                                 indica que non se usen as palabras "
+#~ "chave\n"
+#~ "                                 por defecto)\n"
+#~ "  -L, --language=NOME            reco�ece-la linguaxe indicada (C, C++, "
+#~ "PO),\n"
+#~ "                                 doutro xeito adiv��ase a partir da "
+#~ "extensi�n\n"
+#~ "                                 do ficheiro\n"
+#~ "  -m, --msgstr-prefix[=CADEA]    usar CADEA ou \"\" como prefixo para as\n"
+#~ "                                 entradas msgstr\n"
+#~ "  -M, --msgstr-suffix[=CADEA]    usar CADEA ou \"\" como sufixo para as\n"
+#~ "                                 entradas msgstr\n"
+#~ "      --no-location              non escribi-las li�as '#: ficheiro:"
+#~ "li�a'\n"
+
+#~ msgid ""
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
+#~ "\n"
+#~ "If INPUTFILE is -, standard input is read.\n"
+#~ msgstr ""
+#~ "  -n, --add-location             xera-las li�as '#: ficheiro:"
+#~ "li�a' (defecto)\n"
+#~ "      --omit-header              non escribi-la cabeceira coa entrada\n"
+#~ "                                 `msgid \"\"'\n"
+#~ "  -o, --output=FICHEIRO          escribi-la sa�da no ficheiro indicado\n"
+#~ "  -p, --output-dir=DIRECTORIO    p�-los ficheiros de sa�da no DIRECTORIO\n"
+#~ "  -s, --sort-output              ordena-la sa�da e quita-los duplicados\n"
+#~ "      --strict                   escribi-lo ficheiro .po de tipo "
+#~ "Uniforum\n"
+#~ "                                 estricto\n"
+#~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
+#~ "  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+#~ "  -x, --exclude-file=FICHEIRO    non extrae-las entradas indicadas en "
+#~ "FICHEIRO\n"
+#~ "\n"
+#~ "Se o FICHEIRO_ENTRADA � -, lese a entrada est�ndar.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/hr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/hr.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/hr.po gettext-0.18.1.1/gettext-runtime/po/hr.po
--- gettext-0.19.3/gettext-runtime/po/hr.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,318 +0,0 @@
-# Translation of gettext-runtime to Croatian.
-# Copyright © 2012 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2012-11-02 14:40+0100\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.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"
-"X-Generator: Lokalize 1.4\n"
-
-# Provjeriti koje nazive parametara i varijabli okoline treba prevesti... (TK)
-#: gnulib-lib/closeout.c:66
-msgid "write error"
-msgstr "greška pisanja"
-
-#: gnulib-lib/error.c:191
-msgid "Unknown system error"
-msgstr "Nepoznata greška sustava"
-
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcija „%s” je višeznačna\n"
-
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcija „--%s” ne dozvoljava argument\n"
-
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija „%c%s” ne dozvoljava argument\n"
-
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcija „--%s” zahtijeva argument\n"
-
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neprepoznata opcija „--%s”\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neprepoznata opcija „%c%s”\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neispravna opcija -- „%c”\n"
-
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcija zahtijeva argument -- „%c”\n"
-
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcija „-W %s” je višeznačna\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija „-W %s” ne dozvoljava argument\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcija „-W %s” zahtijeva argument\n"
-
-#: gnulib-lib/xmalloc.c:37
-#, c-format
-msgid "memory exhausted"
-msgstr "memorija iscrpljena"
-
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
-msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"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"
-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"
-
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Napisao %s.\n"
-
-#. This is a proper name. See the gettext manual, section Names.
-#: src/envsubst.c:118
-msgid "Bruno Haible"
-msgstr "Bruno Haible"
-
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
-#, c-format
-msgid "too many arguments"
-msgstr "previše argumenata"
-
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
-#, c-format
-msgid "missing arguments"
-msgstr "nedostaju argumenti"
-
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Pokušajte „%s --help” za više informacija.\n"
-
-#: src/envsubst.c:176
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Uporaba: %s [OPCIJA] [OBLIK-LJUSKE]\n"
-
-#: src/envsubst.c:181
-#, c-format, no-wrap
-msgid "Substitutes the values of environment variables.\n"
-msgstr "Zamjenjuje vrijednosti varijabli okoline.\n"
-
-#: src/envsubst.c:185
-#, c-format, no-wrap
-msgid "Operation mode:\n"
-msgstr "Način rada:\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"
-
-#: src/envsubst.c:192
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr "Informativni izlaz:\n"
-
-#: 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"
-
-#: 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"
-
-#: src/envsubst.c:202
-#, c-format, no-wrap
-msgid ""
-"In normal operation mode, standard input is copied to standard output,\n"
-"with references to environment variables of the form $VARIABLE or ${VARIABLE}\n"
-"being replaced with the corresponding values.  If a SHELL-FORMAT is given,\n"
-"only those environment variables that are referenced in SHELL-FORMAT are\n"
-"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"
-
-#: src/envsubst.c:211
-#, c-format, no-wrap
-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"
-
-#. 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:279 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"
-
-#: src/envsubst.c:442
-#, c-format
-msgid "error while reading \"%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:139 src/ngettext.c:129
-msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
-
-#: src/gettext.c:243
-#, 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"
-
-#: src/gettext.c:249
-#, c-format, no-wrap
-msgid "Display native language translation of a textual message.\n"
-msgstr "Prikaži prijevod tekstualne poruke na materinji jezik.\n"
-
-#: src/gettext.c:253
-#, c-format, no-wrap
-msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
-"  [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"
-
-#: src/gettext.c:264
-#, fuzzy, 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"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"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"
-"Uobičajeni direktorij za pretragu: %s\n"
-
-#: 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"
-
-#: 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:222
-#, c-format, no-wrap
-msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  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:233
-#, 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"
-"regular directory, another location can be specified with the environment\n"
-"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"
-"Uobičajeni direktorij za pretragu: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/hu.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/hu.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/hu.po gettext-0.18.1.1/gettext-runtime/po/hu.po
--- gettext-0.19.3/gettext-runtime/po/hu.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/hu.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,318 +0,0 @@
-# Hungarian translation for gettext-runtime.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Free Software Foundation, Inc.
-#
-# Balázs Úr <urbalazs@gmail.com>, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 17:49+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
-"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
-"Language: hu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
-
-#: gnulib-lib/closeout.c:66
-msgid "write error"
-msgstr "írási hiba"
-
-#: gnulib-lib/error.c:191
-msgid "Unknown system error"
-msgstr "Ismeretlen rendszerhiba"
-
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:"
-
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „--%s” kapcsoló nem fogad el argumentumot\n"
-
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „%c%s” kapcsoló nem fogad el argumentumot\n"
-
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n"
-
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ismeretlen „--%s” kapcsoló\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: érvénytelen -- „%c” kapcsoló\n"
-
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: a kapcsolóhoz egy -- „%c” argumentum szükséges\n"
-
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a „-W %s” kapcsoló nem fogad el argumentumot\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n"
-
-#: gnulib-lib/xmalloc.c:37
-#, c-format
-msgid "memory exhausted"
-msgstr "elfogyott a memória"
-
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
-msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"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"
-msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Licenc GPLv3+: GNU GPL 3. vagy későbbi verzió <http://gnu.org/licenses/gpl.html>\n"
-"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:139 src/ngettext.c:129
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Írta: %s.\n"
-
-#. This is a proper name. See the gettext manual, section Names.
-#: src/envsubst.c:118
-msgid "Bruno Haible"
-msgstr "Bruno Haible"
-
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
-#, c-format
-msgid "too many arguments"
-msgstr "túl sok argumentum"
-
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
-#, c-format
-msgid "missing arguments"
-msgstr "hiányzó argumentumok"
-
-#: src/envsubst.c:171 src/gettext.c:238 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"
-
-#: src/envsubst.c:176
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Használat: %s [KAPCSOLÓ] [SHELL-FORMÁTUM]\n"
-
-#: src/envsubst.c:181
-#, c-format, no-wrap
-msgid "Substitutes the values of environment variables.\n"
-msgstr "A környezeti változók értékeit helyettesíti.\n"
-
-#: src/envsubst.c:185
-#, c-format, no-wrap
-msgid "Operation mode:\n"
-msgstr "Működési mód:\n"
-
-#: src/envsubst.c:188
-#, c-format, no-wrap
-msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             kiírja a SHELL-FORMÁTUMBAN előforduló változókat\n"
-
-#: src/envsubst.c:192
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr "Tájékoztató kimenet:\n"
-
-#: src/envsubst.c:195
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  ezen súgó megjelenítése és kilépés\n"
-
-#: src/envsubst.c:198
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               verzióinformációk kiírása és kilépés\n"
-
-#: src/envsubst.c:202
-#, c-format, no-wrap
-msgid ""
-"In normal operation mode, standard input is copied to standard output,\n"
-"with references to environment variables of the form $VARIABLE or ${VARIABLE}\n"
-"being replaced with the corresponding values.  If a SHELL-FORMAT is given,\n"
-"only those environment variables that are referenced in SHELL-FORMAT are\n"
-"substituted; otherwise all environment variables references occurring in\n"
-"standard input are substituted.\n"
-msgstr ""
-"Normál működési módban a szabványos bemenet a szabványos kimenetre van\n"
-"másolva az űrlapnak a megfelelő változókkal helyettesített $VÁLTOZÓ vagy\n"
-"${VÁLTOZÓ} értékeinek környezeti változóira mutató hivatkozással. Ha meg\n"
-"van adva a SHELL-FORMÁTUM, akkor csak a SHELL-FORMÁTUM értékében hivatkozott\n"
-"környezeti változók lesznek helyettesítve. Egyébként a szabványos bemeneten\n"
-"előforduló összes környezeti változó hivatkozás helyettesítve lesz.\n"
-
-#: src/envsubst.c:211
-#, c-format, no-wrap
-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 ""
-"A --variables használatakor a szabványos bemenet mellőzve lesz, és a kimenet\n"
-"a SHELL-FORMÁTUMBAN hivatkozott környezeti változókból áll, soronként egy.\n"
-
-#. 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:279 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"
-
-#: src/envsubst.c:442
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "hiba a(z) „%s” olvasása közben"
-
-#: src/envsubst.c:443
-msgid "standard input"
-msgstr "szabványos bemenet"
-
-#. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
-msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
-
-#: src/gettext.c:243
-#, c-format, no-wrap
-msgid ""
-"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
-"or:    %s [OPTION] -s [MSGID]...\n"
-msgstr ""
-"Használat: %s [KAPCSOLÓ] [[SZÖVEGTARTOMÁNY] MSGID]\n"
-"vagy:    %s [KAPCSOLÓ] -s [MSGID]...\n"
-
-#: src/gettext.c:249
-#, c-format, no-wrap
-msgid "Display native language translation of a textual message.\n"
-msgstr "A szöveges üzenet natív nyelvi fordításának megjelenítése.\n"
-
-#: src/gettext.c:253
-#, c-format, no-wrap
-msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-"                            to MSGID from TEXTDOMAIN\n"
-msgstr ""
-"  -d, --domain=SZÖVEGTARTOMÁNY   lefordított üzenetek lekérése a\n"
-"                            SZÖVEGTARTOMÁNYBÓL\n"
-"  -e                        néhány fedéssorozat kifejtésének engedélyezése\n"
-"  -E                        (mellőzve a kompatibilitás miatt)\n"
-"  -h, --help                ezen súgó megjelenítése és kilépés\n"
-"  -n                        a záró új sorok elnyomása\n"
-"  -V, --version             verzióinformációk kiírása és kilépés\n"
-"  [SZÖVEGTARTOMÁNY] MSGID        az MSGID-nak megfelelő lefordított üzenet\n"
-"                            lekérése a SZÖVEGTARTOMÁNYBÓL\n"
-
-#: src/gettext.c:264
-#, 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"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"found in the selected catalog are translated.\n"
-"Standard search directory: %s\n"
-msgstr ""
-"Ha a SZÖVEGTARTOMÁNY paraméter nincs megadva, a tartomány a SZÖVEGTARTOMÁNY\n"
-"környezeti változóból lesz meghatározva. Ha az üzenetkatalógus nem található\n"
-"a szabályos könyvtárban, megadható egy másik hely a SZÖVEGTARTOMÁNYKÖNYVTÁR\n"
-"környezeti változóval.\n"
-"A -s kapcsoló használata esetén a program úgy viselkedik mint az „echo”\n"
-"parancs. De nem csak egyszerűen átmásolja az argumentumokat a szabványos\n"
-"kimenetre. Ehelyett a kiválasztott katalógusban található üzenetek le vannak\n"
-"fordítva.\n"
-"Szabványos keresési könyvtár: %s\n"
-
-#: 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:217
-#, c-format, no-wrap
-msgid ""
-"Display native language translation of a textual message whose grammatical\n"
-"form depends on a number.\n"
-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:222
-#, c-format, no-wrap
-msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  COUNT                     choose singular/plural form based on this value\n"
-msgstr ""
-"  -d, --domain=SZÖVEGTARTOMÁNY   lefordított üzenet lekérése a\n"
-"                            SZÖVEGTARTOMÁNYBÓL\n"
-"  -e                        néhány fedéssorozat kifejtésének engedélyezése\n"
-"  -E                        (mellőzve a kompatibilitás miatt)\n"
-"  -h, --help                ezen súgó megjelenítése és kilépés\n"
-"  -V, --version             verzióinformációk kiírása és kilépés\n"
-"  [SZÖVEGTARTOMÁNY]         lefordított üzenet lekérése a SZÖVEGTARTOMÁNYBÓL\n"
-"  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:233
-#, 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"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"Standard search directory: %s\n"
-msgstr ""
-"Ha a SZÖVEGTARTOMÁNY paraméter nincs megadva, a tartomány a SZÖVEGTARTOMÁNY\n"
-"környezeti változóból lesz meghatározva. Ha az üzenetkatalógus nem található\n"
-"a szabályos könyvtárban, megadható egy másik hely a SZÖVEGTARTOMÁNYKÖNYVTÁR\n"
-"környezeti változóval.\n"
-"Szabványos keresési könyvtár: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/id.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/id.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/id.po gettext-0.18.1.1/gettext-runtime/po/id.po
--- gettext-0.19.3/gettext-runtime/po/id.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/id.po	2010-06-06 12:49:57.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -23,62 +23,62 @@
 msgid "write error"
 msgstr "kesalahan penulisan"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tak dikenal"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pilihan '--%s' memerlukan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tak dikenal '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tak dikenal '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan '-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: pilihan '-W %s' memerlukan sebuah argumen\n"
@@ -122,8 +122,8 @@
 msgstr "Argumen hilang"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
 #: src/envsubst.c:176
@@ -246,13 +246,13 @@
 "                            untuk ID-PESAN dari TEXTDOMAIN\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/it.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/it.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/it.po gettext-0.18.1.1/gettext-runtime/po/it.po
--- gettext-0.19.3/gettext-runtime/po/it.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/it.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,15 +1,15 @@
 # Italian messages for gettext-runtime.
-# Copyright (C) 1997, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Marco Colombo <m.colombo@ed.ac.uk>, 2005, 2006, 2007, 2010, 2013.
+# Marco Colombo <m.colombo@ed.ac.uk>, 2005, 2006, 2007.
 # Giovanni Bortolozzo <borto@pluto.linux.it>, 1997.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-07-01 10:46+0100\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-30 17:39+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,65 +21,65 @@
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione '%s' è ambigua; scelte:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: l'opzione '%s' è ambigua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '--%s' non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '%c%s' non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l'opzione '%s' richiede un argomento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opzione '--%s' non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opzione '%c%s' non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opzione non valida -- '%c'\n"
+msgstr "%s: opzione non valida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'opzione richiede un argomento -- '%c'\n"
+msgstr "%s: l'opzione richiede un argomento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l'opzione '-W %s' è ambigua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '-W %s' non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l'opzione '-W %s' richiede un argomento\n"
+msgstr "%s: l'opzione '%s' richiede un argomento\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -122,7 +122,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Usare '%s --help' per maggiori informazioni.\n"
 
 #: src/envsubst.c:176
@@ -251,7 +251,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -316,3 +316,6 @@
 "nella directory solita, può essere specificata un'altra posizione con la\n"
 "variabile d'ambiente TEXTDOMAINDIR.\n"
 "Directory di ricerca standard: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opzione illecita -- %c\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/ja.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/ja.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/ja.po gettext-0.18.1.1/gettext-runtime/po/ja.po
--- gettext-0.19.3/gettext-runtime/po/ja.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ja.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,14 +1,14 @@
 # Translation of `gettext-runtime' messages to Japanese.
-# Copyright (C) 1999, 2002, 2003, 2006, 2007, 2010, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003, 2006, 2007, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2013.
+# Masahito Yamaga <ma@yama-ga.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-02-27 06:08+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-10 19:02+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -21,62 +21,62 @@
 msgid "write error"
 msgstr "�񤭹��ߥ��顼"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "̤�ΤΥ����ƥ२�顼"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: ���ץ���� '%s' ��ۣ��. �����ǽ�ʤ��:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: ���ץ���� '%s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '--%s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '%c%s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ���ץ���� '--%s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ���ץ���� '--%s' ���Բ�\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ���ץ���� '%c%s' ���Բ�\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ̵���ʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ������ɬ�פʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ���ץ���� '-W %s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '-W %s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: ���ץ���� '-W %s' �ˤϰ�����ɬ�פǤ�\n"
@@ -126,8 +126,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "���¿���ξ�������뤿��ˤ� '%s --help' �����Ϥ��Ƥ�������.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "���¿���ξ�������뤿��ˤ� `%s --help' �����Ϥ��Ƥ�������.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -252,7 +252,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -260,7 +260,7 @@
 "�⤷ TEXTDOMAIN �ѥ�᡼�������ꤵ��ʤ����, �Ķ��ѿ� TEXTDOMAIN ����\n"
 "�ɥᥤ�󤬷�ޤ�ޤ�. �⤷ɸ��Υǥ��쥯�ȥ�˥�å���������������\n"
 "���Ĥ���ʤ����, �Ķ��ѿ� TEXTDOMAINDIR �ǻ��ꤵ�줿��꤫��õ���ޤ�.\n"
-"-s ���ץ�����Ĥ��ƻȤ��ȥץ������� 'echo' ���ޥ�ɤΤ褦��ư��ޤ�.\n"
+"-s ���ץ�����Ĥ��ƻȤ��ȥץ������� `echo' ���ޥ�ɤΤ褦��ư��ޤ�.\n"
 "���������ΰ�����ñ�ˤ��Τޤ�ɸ����Ϥ˥��ԡ�����櫓�ǤϤ���ޤ���.\n"
 "���򤵤줿����������˻��ꤵ�줿��å������������, ���Υ�å������������\n"
 "�������줿��Τ�ɽ�����ޤ�.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/ko.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/ko.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/ko.po gettext-0.18.1.1/gettext-runtime/po/ko.po
--- gettext-0.19.3/gettext-runtime/po/ko.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ko.po	2010-06-06 12:49:57.000000000 +0000
@@ -3,82 +3,82 @@
 # 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-2006, 2009, 2010, 2013.
+# Changwoo Ryu <cwryu@debian.org>, 2001-2006, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-03-12 03:38+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-15 23:27+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: '%s' 옵션은 모호한 옵션입니다. 가능한 옵션은:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: '%s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: '--%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: '%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: '--%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 잘못된 옵션 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 이 옵션은 인수가 필요합니다 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: '-W %s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
@@ -123,8 +123,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -249,7 +249,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -258,7 +258,7 @@
 "환경 변수로 결정됩니다.  메시지 목록이 일반적인 디렉터리에 \n"
 "없다면, 환경 변수 TEXTDOMAINDIR로 다른 위치를 지정할 수 \n"
 "있습니다.\n"
-"-s 옵션이 쓰이면 프로그램은 'echo' 명령처럼 동작합니다. 그러나 \n"
+"-s 옵션이 쓰이면 프로그램은 `echo' 명령처럼 동작합니다. 그러나 \n"
 "단순히 인수를 표준출력에 복사하지는 않습니다.  대신에 지정한 \n"
 "목록에서 번역되어 있는 메시지만이 출력됩니다.\n"
 "기본 탐색 디렉터리: %s\n"
diff -Nru gettext-0.19.3/gettext-runtime/po/LINGUAS gettext-0.18.1.1/gettext-runtime/po/LINGUAS
--- gettext-0.19.3/gettext-runtime/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -1,2 +1,2 @@
 # Set of available languages.
-be bg ca cs da de el en@quot en@boldquot eo es et fi fr ga gl hr hu id it ja ko nb nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+be bg ca cs da de el en@quot en@boldquot eo es et fi fr ga gl id it ja ko nb nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-runtime/po/Makefile.in.in gettext-0.18.1.1/gettext-runtime/po/Makefile.in.in
--- gettext-0.19.3/gettext-runtime/po/Makefile.in.in	2014-09-29 01:43:44.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/Makefile.in.in	2010-06-06 12:49:57.000000000 +0000
@@ -8,14 +8,13 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.19
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
-SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -77,16 +76,6 @@
 
 CATALOGS = @CATALOGS@
 
-POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
-POFILESDEPS_yes = $(POFILESDEPS_)
-POFILESDEPS_no =
-POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
-DISTFILESDEPS_ = update-po
-DISTFILESDEPS_yes = $(DISTFILESDEPS_)
-DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
-
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -107,14 +96,14 @@
 	mv t-$@ $@
 
 
-all: all-@USE_NLS@
+all: check-macro-version all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-CHECK_MACRO_VERSION = \
-	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
 	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
 	       exit 1; \
 	     }
@@ -134,7 +123,6 @@
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -149,29 +137,11 @@
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-# The determination of whether the package xyz is a GNU one is based on the
-# heuristic whether some file in the top level directory mentions "GNU xyz".
-# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	package_gnu="$(PACKAGE_GNU)"; \
-	test -n "$$package_gnu" || { \
-	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
-			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
-			       /dev/null '{}' ';' 2>/dev/null; \
-	       else \
-		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-	       fi; \
-	     } | grep -v 'libtool:' >/dev/null; then \
-	     package_gnu=yes; \
-	   else \
-	     package_gnu=no; \
-	   fi; \
-	}; \
-	if test "$$package_gnu" = "yes"; then \
-	  package_prefix='GNU '; \
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
 	else \
-	  package_prefix=''; \
+	  package_gnu=''; \
 	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -191,7 +161,7 @@
 	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_prefix}@PACKAGE@" \
+	      --package-name="$${package_gnu}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
 	    ;; \
@@ -219,10 +189,9 @@
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(POFILESDEPS)
+$(POFILES): $(srcdir)/$(DOMAIN).pot
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
@@ -383,7 +352,7 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)
diff -Nru gettext-0.19.3/gettext-runtime/po/Makevars gettext-0.18.1.1/gettext-runtime/po/Makevars
--- gettext-0.19.3/gettext-runtime/po/Makevars	2014-10-08 07:17:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/Makevars	2010-06-06 12:49:57.000000000 +0000
@@ -23,13 +23,6 @@
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU =
-
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -61,21 +54,3 @@
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = yes
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/nb.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/nb.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/nb.po gettext-0.18.1.1/gettext-runtime/po/nb.po
--- gettext-0.19.3/gettext-runtime/po/nb.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/nb.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -20,62 +20,62 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: flagget �%s� er flertydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flagget �--%s� tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget �%c%s� tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flagget �%s� krever et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukjent flagg �--%s�\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukjent flagg �%c%s�\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flagg krever et argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flagg �-W %s� er flertydig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg �-W %s� tillater ikke et argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flagget �%s� krever et argument\n"
@@ -115,8 +115,8 @@
 msgstr "mangler argumenter"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v �%s --help� for mer informasjon.\n"
 
 #: src/envsubst.c:176
@@ -236,7 +236,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/nl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/nl.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/nl.po gettext-0.18.1.1/gettext-runtime/po/nl.po
--- gettext-0.19.3/gettext-runtime/po/nl.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/nl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,89 +1,86 @@
-# Dutch translations for GNU gettext-runtime.
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Translation of gettext-runtime-0.16.2-pre5 to Dutch.
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext-runtime package.
 #
-# "Scheten in een netje."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2010, 2013, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime-0.19-rc1\n"
+"Project-Id-Version: gettext-runtime-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 12:10+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: optie '--%s' vereist een argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ongeldige optie -- '%c'\n"
+msgstr "%s: ongeldige optie -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: optie vereist een argument -- '%c'\n"
+msgstr "%s: optie vereist een argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: optie '-W %s' vereist een argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -99,8 +96,9 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licentie GPLv3+: GNU GPL versie 3 of nieuwer <http://gnu.org/licenses/gpl.html>\n"
 "Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
+"De precieze licentie is GPLv3+: GNU GPL versie 3 of later;\n"
+"zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
 #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
@@ -125,7 +123,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
 #: src/envsubst.c:176
@@ -161,7 +159,7 @@
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version       programmaversie tonen en stoppen\n"
+msgstr "  -V, --version       versie-informatie tonen en stoppen\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -198,7 +196,7 @@
 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"
+"meldt fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
@@ -226,7 +224,7 @@
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Toont de vertaling van een tekstbericht.\n"
+msgstr "De vertaling van een tekstbericht weergeven.\n"
 
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -245,7 +243,7 @@
 "  -E                        (genegeerd, maar herkend wegens compatibiliteit)\n"
 "  -h, --help                deze hulptekst tonen en stoppen\n"
 "  -n                        afsluitend regeleindeteken onderdrukken\n"
-"  -V, --version             programmaversie tonen en stoppen\n"
+"  -V, --version             versie-informatie tonen en stoppen\n"
 "  [TEKSTDOMEIN] MSGID       vertaling van MSGID opzoeken (in TEKSTDOMEIN)\n"
 
 #: src/gettext.c:264
@@ -255,7 +253,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -266,8 +264,8 @@
 "de omgevingsvariabele TEXTDOMAINDIR.\n"
 "Wanneer optie '-s' gebruikt wordt, gedraagt het programma zich als de\n"
 "opdracht 'echo'.  Het kopieert echter niet eenvoudigweg de argumenten\n"
-"naar standaarduitvoer, maar geeft de vertaling van de berichten die\n"
-"in de gekozen catalogus gevonden worden.\n"
+"naar standaarduitvoer, maar vertaalt de berichten die in de gekozen\n"
+"catalogus gevonden worden.\n"
 "De standaard zoekmap is: %s\n"
 
 #: src/ngettext.c:212
@@ -281,8 +279,8 @@
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Toont de vertaling van een tekstbericht waarvan de grammaticale vorm\n"
-"afhangt van een getal.\n"
+"De vertaling van een tekstbericht weergeven waarvan de\n"
+"grammaticale vorm afhangt van een getal.\n"
 
 #: src/ngettext.c:222
 #, c-format, no-wrap
@@ -300,8 +298,8 @@
 "  -e                        sommige stuurcodereeksen interpreteren\n"
 "  -E                        (genegeerd, maar herkend wegens compatibiliteit)\n"
 "  -h, --help                deze hulptekst tonen en stoppen\n"
-"  -V, --version             programmaversie tonen en stoppen\n"
-"  [TEKSTDOMEIN]             vertaald bericht opzoeken in TEKSTDOMEIN\n"
+"  -V, --version             versie-informatie tonen en stoppen\n"
+"  [TEKSTDOMEIN]             vertaalde bericht opzoeken in TEKSTDOMEIN\n"
 "  MSGID MSGID-MEERVOUD      MSGID (enkelvoud) en MSGID-MEERVOUD vertalen\n"
 "  AANTAL                    enkel- of meervoud kiezen gebaseerd op deze waarde\n"
 
@@ -318,4 +316,7 @@
 "de omgevingsvariabele TEXTDOMAIN.  Als de berichtencatalogus niet gevonden\n"
 "wordt in de gewone map, kan een andere locatie worden opgegeven via de\n"
 "omgevingsvariabele TEXTDOMAINDIR.\n"
-"De standaard zoekmap is: %s\n"
+"Standaard zoekmap: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ongeldige optie -- %c\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/nn.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/nn.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/nn.po gettext-0.18.1.1/gettext-runtime/po/nn.po
--- gettext-0.19.3/gettext-runtime/po/nn.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/nn.po	2010-06-06 12:49:57.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -23,62 +23,62 @@
 msgid "write error"
 msgstr "skrivefeil"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Valet «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Valet «--%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Valet «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Valet «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: Ukjent val – «--%s»\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: Ukjent val – «%c%s»\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: Ugyldig val – %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Valet treng eit argument – %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Valet «-W %s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Valet «-W %s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: Valet «%s» treng eit argument\n"
@@ -122,8 +122,8 @@
 msgstr "manglar argument"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
 
 #: src/envsubst.c:176
@@ -244,13 +244,13 @@
 "                            MSGID frå «TEXTDOMAIN»\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/pl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/pl.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/pl.po gettext-0.18.1.1/gettext-runtime/po/pl.po
--- gettext-0.19.3/gettext-runtime/po/pl.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/pl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,20 +1,20 @@
 # Polish translations for the GNU gettext messages, gettext-runtime domain
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2006, 2007, 2010, 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2006, 2007, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003, 2006, 2007, 2010, 2013, 2014
+# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003, 2006, 2007, 2010	„”
 # Piotr Pogorzelski <ppogorze@ippt.gov.pl>, 1995
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-06-03 13:00+0100\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-13 22:00+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -22,65 +22,65 @@
 msgid "write error"
 msgstr "błąd zapisu"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcja „%s” jest niejednoznaczna; możliwości:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: opcja '%s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcja „--%s” nie może mieć argumentu\n"
+msgstr "%s: opcja '--%s' nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opcja „%c%s” nie może mieć argumentu\n"
+msgstr "%s: opcja '%c%s' nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcja „--%s” wymaga argumentu\n"
+msgstr "%s: opcja '--%s' wymaga argumentu\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nierozpoznana opcja „--%s”\n"
+msgstr "%s: nierozpoznana opcja '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nierozpoznana opcja „%c%s”\n"
+msgstr "%s: nierozpoznana opcja '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: błędna opcja -- „%c”\n"
+msgstr "%s: błędna opcja -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcja wymaga argumentu -- „%c'\n"
+msgstr "%s: opcja wymaga argumentu -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
+msgstr "%s: opcja '-W %s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcja „-W %s” nie może mieć argumentu\n"
+msgstr "%s: opcja '-W %s' nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcja „-W %s” wymaga argumentu\n"
+msgstr "%s: opcja '-W %s' wymaga argumentu\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -122,8 +122,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Napisz „%s --help” żeby otrzymać więcej informacji.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Spróbuj `%s --help' żeby otrzymać więcej informacji.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -143,7 +143,7 @@
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             wypisanie zmiennych z FORMATU-POWŁOKI\n"
+msgstr "  -v, --variables             wypisanie zmiennich z FORMATU-POWŁOKI\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
@@ -250,7 +250,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -259,9 +259,9 @@
 "ze zmiennej środowiskowej TEXTDOMAIN. Jeżeli katalog komunikatów nie zostanie\n"
 "znaleziony w domyślnym katalogu, inna lokalizacja może być podana przez\n"
 "zmienną środowiskową TEXTDOMAINDIR.\n"
-"Jeżeli użyty z opcją -s, program zachowuje się jak polecenie „echo”, ale\n"
-"zamiast kopiować argumenty na standardowe wyjście tłumaczy komunikaty\n"
-"znalezione w wybranym katalogu.\n"
+"Jeżeli użyty z opcją -s, program zachowuje się jak komenda `echo', ale zamiast\n"
+"kopiować argumenty na standardowe wyjście tłumaczy komunikaty znalezione w\n"
+"wybranym katalogu.\n"
 "Domyślnie przeszukiwany katalog: %s\n"
 
 #: src/ngettext.c:212
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/pt_BR.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/pt_BR.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/pt_BR.po gettext-0.18.1.1/gettext-runtime/po/pt_BR.po
--- gettext-0.19.3/gettext-runtime/po/pt_BR.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/pt_BR.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,95 +1,91 @@
-# Brazilian Portuguese translation of gettext-runtime
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Brazilian Portuguese translation of the "gettext" messages
+# Copyright (C) 2001 Free Software Foundation, Inc.
 # Sandro Nunes Henrique <sandro@conectiva.com.br>, 1998
 # Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
-# Flávio Bruno Leitner <flavio@conectiva.com.br>, 2001.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
+# Fl�vio Bruno Leitner <flavio@conectiva.com.br>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext 0.10.36\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-03-01 06:03-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2001-04-03 08:25+02:00\n"
+"Last-Translator: Fl�vio Bruno Leitner <flavio@conectiva.com.br>\n"
+"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "erro de escrita"
+msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opção \"%s\" é ambígua; possibilidades:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: op��o `%s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opção \"--%s\" não aceita um argumento\n"
+msgstr "%s: op��o `--%s' n�o aceita par�metros\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opção \"%c%s\" não aceita um argumento\n"
+msgstr "%s: op��o `%c%s' n�o aceita par�metros\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opção \"--%s\" requer um argumento\n"
+msgstr "%s: op��o `%s' requer um argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opção não reconhecida \"--%s\"\n"
+msgstr "%s: op��o n�o reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opção não reconhecida \"%c%s\"\n"
+msgstr "%s: op��o n�o reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opção inválida -- \"%c\"\n"
+msgstr "%s: op��o inv�lida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opção requer um argumento -- \"%c\"\n"
+msgstr "%s: op��o requer um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opção \"-W %s\" é ambígua\n"
+msgstr "%s: op��o `-W %s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opção \"-W %s\" não aceita um argumento\n"
+msgstr "%s: op��o `-W %s' n�o aceita par�metros\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opção \"-W %s\" requer um argumento\n"
+msgstr "%s: op��o `%s' requer um argumento\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "Memória insuficiente"
+msgstr "Mem�ria insuficiente"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -99,10 +95,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
-"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:139 src/ngettext.c:129
 #, c-format
@@ -112,57 +104,57 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
-msgstr "excesso de parâmetros"
+msgstr "excesso de par�metros"
 
 #: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
-msgstr "parâmetros não informados"
+msgstr "par�metros n�o informados"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Tente \"%s --help\" para mais informações.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Tente `%s --help' para maiores informa��es\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Uso: %s [OPÇÃO] [FORMATO SHELL]\n"
+msgstr ""
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Substitui os valores das variáveis de ambiente.\n"
+msgstr ""
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "Modo de operação:\n"
+msgstr ""
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             exibe as variáveis ocorrentes em SHELL-FORMAT\n"
+msgstr ""
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Saída informativa:\n"
+msgstr ""
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  exibe essa ajuda e sai\n"
+msgstr ""
 
 #: src/envsubst.c:198
 #, 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"
+msgstr ""
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -174,12 +166,6 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"Em modo de operação normal, a entrada padrão é copiada para a saída padrão,\n"
-"com referências a variáveis de ambiente da forma de $VARIABLE ou ${VARIABLE}\n"
-"sendo substituída com os valores correspondentes. Se um FORMATO-SHELL é dado,\n"
-"apenas aquelas variáveis de ambiente que forem referenciadas no FORMATO-SHELL\n"
-"são substituídas. Do contrário, todas as referências variáveis de ambiente\n"
-"ocorrentes na entrada padrão são substituídas.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -187,19 +173,15 @@
 "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 ""
-"Quando --variables é usado, a entrada padrão é ignorada e a saída conste nas\n"
-"variáveis de ambiente que são referenciadas em FORMATO-SHELL, um por linha.\n"
 
-# Outra linha adicionada com email da equipe de tradução, seguindo requisição do desenvolvedor.
 #. 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:279 src/ngettext.c:245
+#, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr ""
-"Relate erros para <bug-gnu-gettext@gnu.org>.\n"
-"Relate erros de tradução para <ldpbr-translation@lists.sourceforge.net>.\n"
+msgstr "Reporte bugs para <bug-gnu-utils@gnu.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
@@ -208,12 +190,12 @@
 
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr "entrada padrão"
+msgstr "entrada padr�o"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
+msgstr ""
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -221,16 +203,14 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Uso: %s [OPÇÃO] [[DOMÍNIO] MSGID]\n"
-"ou:  %s [OPÇÃO] -s [MSGID]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Exibe tradução do idioma nativo de uma mensagem textual.\n"
+msgstr ""
 
 #: src/gettext.c:253
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -241,40 +221,42 @@
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-"  -e                        habilita expansão de alguns caracteres de escape\n"
+"Uso: %s [OP��O] [[[DOM�NIO] MSGID] | [-s [MSGID]...]]\n"
+"  -d, --domain=DOM�NIO      recupera mensagens traduzidas em DOM�NIO\n"
+"  -e                        permite a expans�o de alguns caracteres de escape\n"
 "  -E                        (ignorado para compatibilidade)\n"
-"  -h, --help                exibe esta ajuda e sai\n"
+"  -h, --help                apresenta esta ajuda e finaliza\n"
 "  -n                        suprime caractere de nova linha\n"
-"  -v, --version             exibe a versão e sai\n"
-"  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
-"                            a MSGID no DOMÍNIO\n"
+"  -v, --version             apresenta vers�o e finaliza\n"
+"  [DOM�NIO] MSGID           recupera mensagens traduzidas correspondentes\n"
+"                            para MSGID no DOM�NIO\n"
 
 #: src/gettext.c:264
-#, c-format, no-wrap
+#, fuzzy, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Se o parâmetro DOMÍNIO não for informado, este será determinado através da\n"
-"variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens não for encontrado\n"
-"no diretório padrão, outra localização pode ser especificada na variável\n"
+"\n"
+"Caso o par�metro DOM�NIO n�o seja informado este ser� determinado atrav�s da\n"
+"vari�vel de ambiente TEXTDOMAIN. Se o cat�logo de mensagens n�o for encontrado\n"
+"no diret�rio padr�o, outra localiza��o pode ser especificada na vari�vel\n"
 "TEXTDOMAINDIR.\n"
-"Quando utilizado com a opção -s o programa comporta-se como o comando \"echo\".\n"
-"Mas não somente copiando seus parâmetros para stdout, e sim traduzindo as\n"
-"mensagens encontradas no catálogo selecionado\n"
-"Diretório de pesquisa padrão: %s\n"
+"Quando utilizado com a op��o -s o programa comporta-se como um comando echo.\n"
+"Mas n�o somente copiando seus par�metros para stdout, e sim traduzindo as\n"
+"mensagens encontradas no cat�logo selecionado\n"
+"Diret�rio de pesquisa padr�o: %s\n"
 
 #: 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"
+msgstr ""
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -282,11 +264,9 @@
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Exibe tradução de idioma nativo de uma mensagem textual cuja forma\n"
-"gramatical depende de um número.\n"
 
 #: src/ngettext.c:222
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -297,17 +277,18 @@
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-"  -e                        habilita expansão de alguns caracteres de escape\n"
+"Uso: %s [OP��O] [[[DOM�NIO] MSGID] | [-s [MSGID]...]]\n"
+"  -d, --domain=DOM�NIO      recupera mensagens traduzidas em DOM�NIO\n"
+"  -e                        permite a expans�o de alguns caracteres de escape\n"
 "  -E                        (ignorado para compatibilidade)\n"
-"  -h, --help                exibe esta ajuda e sai\n"
+"  -h, --help                apresenta esta ajuda e finaliza\n"
 "  -n                        suprime caractere de nova linha\n"
-"  -v, --version             exibe a versão e sai\n"
-"  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
-"                            para MSGID no DOMÍNIO\n"
+"  -v, --version             apresenta vers�o e finaliza\n"
+"  [DOM�NIO] MSGID           recupera mensagens traduzidas correspondentes\n"
+"                            para MSGID no DOM�NIO\n"
 
 #: src/ngettext.c:233
-#, c-format, no-wrap
+#, fuzzy, 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"
@@ -315,17 +296,18 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Caso o parâmetro DOMÍNIO não seja informado este será determinado através da\n"
-"variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens não for encontrado\n"
-"no diretório padrão, outra localização pode ser especificada na variável\n"
+"\n"
+"Caso o par�metro DOM�NIO n�o seja informado este ser� determinado atrav�s da\n"
+"vari�vel de ambiente TEXTDOMAIN. Se o cat�logo de mensagens n�o for encontrado\n"
+"no diret�rio padr�o, outra localiza��o pode ser especificada na vari�vel\n"
 "TEXTDOMAINDIR.\n"
-"Quando utilizado com a opção -s o programa comporta-se como um comando echo.\n"
-"Mas não somente copiando seus parâmetros para stdout, e sim traduzindo as\n"
-"mensagens encontradas no catálogo selecionado\n"
-"Diretório de pesquisa padrão: %s\n"
+"Quando utilizado com a op��o -s o programa comporta-se como um comando echo.\n"
+"Mas n�o somente copiando seus par�metros para stdout, e sim traduzindo as\n"
+"mensagens encontradas no cat�logo selecionado\n"
+"Diret�rio de pesquisa padr�o: %s\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opção ilegal -- %c\n"
+#~ msgstr "%s: op��o ilegal -- %c\n"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -335,7 +317,7 @@
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não "
+#~ "Este � um sofware livre; veja os fontes para condi��es de c�pia.  N�o "
 #~ "existe\n"
 #~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA "
 #~ "FINALIDADE.\n"
@@ -345,7 +327,7 @@
 
 #, fuzzy
 #~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "erro ao abrir o arquivo \"%s\" para gravação"
+#~ msgstr "erro ao abrir o arquivo \"%s\" para grava��o"
 
 #, fuzzy
 #~ msgid "error reading \"%s\""
@@ -361,85 +343,85 @@
 
 #, fuzzy
 #~ msgid "cannot create pipe"
-#~ msgstr "não foi possível criar o arquivo de saída \"%s\""
+#~ msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #, fuzzy
 #~ msgid "number of format specifications in 'msgid' and '%s' does not match"
 #~ msgstr ""
-#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ "n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #, fuzzy
 #~ msgid ""
 #~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid ""
 #~ "a format specification for argument %u, as in '%s', doesn't exist in "
 #~ "'msgid'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument %u doesn't exist in '%s'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid ""
 #~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
 #~ "'msgid'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid ""
 #~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
 #~ "same"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
 #~ msgstr ""
-#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ "n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #, fuzzy
 #~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid ""
 #~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 #~ "tuple"
 #~ msgstr ""
-#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ "n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #, fuzzy
 #~ msgid ""
 #~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 #~ "mapping"
 #~ msgstr ""
-#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ "n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #, fuzzy
 #~ msgid ""
 #~ "a format specification for argument '%s', as in '%s', doesn't exist in "
 #~ "'msgid'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid ""
 #~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
 #~ "same"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #~ msgid "%s and %s are mutually exclusive"
-#~ msgstr "%s e %s são mutuamente exclusivos"
+#~ msgstr "%s e %s s�o mutuamente exclusivos"
 
 #, fuzzy
 #~ msgid ""
@@ -460,26 +442,26 @@
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #~ msgid "impossible selection criteria specified (%d < n < %d)"
-#~ msgstr "critério de seleção especificado impossível (%d < n < %d)"
+#~ msgstr "crit�rio de sele��o especificado imposs�vel (%d < n < %d)"
 
 #, fuzzy
 #~ msgid ""
@@ -494,24 +476,24 @@
 #~ "is specified, they will be taken from the first PO file to define them.\n"
 #~ "File positions from all PO files will be cumulated.\n"
 #~ msgstr ""
-#~ "  -V, --version                  mostra informações de versão e sai\n"
-#~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
+#~ "  -V, --version                  mostra informa��es de vers�o e sai\n"
+#~ "  -w, --width=NUMBER             configura a largura de p�gina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         mostra mensagens menores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
+#~ "  ->, --more-than=N�MERO         mostra mensagens maiores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
 #~ "\n"
-#~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
-#~ "especificados. Usando a opção --more-than, a maior parte das\n"
-#~ "ocorrências podem ser solicitadas antes das mensagens serem impressas.\n"
-#~ "De modo contrário, a opção --less-than pode ser usada para especificar\n"
-#~ "menos ocorrências antes das mensagens serem exibidas (i.e., \n"
-#~ "--less-than=2 irá exibir apenas as mensagens exclusivas). Traduções,\n"
-#~ "comentários e comentários de extração serão preservados, mas apenas do\n"
-#~ "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
-#~ "os arquivos PO serão preservados.\n"
+#~ "Descobre mensagens que s�o comuns a dois ou mais do arquivos PO\n"
+#~ "especificados. Usando a op��o --more-than, a maior parte das\n"
+#~ "ocorr�ncias podem ser solicitadas antes das mensagens serem impressas.\n"
+#~ "De modo contr�rio, a op��o --less-than pode ser usada para especificar\n"
+#~ "menos ocorr�ncias antes das mensagens serem exibidas (i.e., \n"
+#~ "--less-than=2 ir� exibir apenas as mensagens exclusivas). Tradu��es,\n"
+#~ "coment�rios e coment�rios de extra��o ser�o preservados, mas apenas do\n"
+#~ "primeiro arquivo PO que os definirem. As posi��es de arquivo de todos\n"
+#~ "os arquivos PO ser�o preservados.\n"
 
 #, fuzzy
 #~ msgid ""
@@ -525,24 +507,24 @@
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -V, --version                  mostra informações de versão e sai\n"
-#~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
+#~ "  -V, --version                  mostra informa��es de vers�o e sai\n"
+#~ "  -w, --width=NUMBER             configura a largura de p�gina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         mostra mensagens menores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
+#~ "  ->, --more-than=N�MERO         mostra mensagens maiores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
 #~ "\n"
-#~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
-#~ "especificados. Usando a opção --more-than, a maior parte das\n"
-#~ "ocorrências podem ser solicitadas antes das mensagens serem impressas.\n"
-#~ "De modo contrário, a opção --less-than pode ser usada para especificar\n"
-#~ "menos ocorrências antes das mensagens serem exibidas (i.e., \n"
-#~ "--less-than=2 irá exibir apenas as mensagens exclusivas). Traduções,\n"
-#~ "comentários e comentários de extração serão preservados, mas apenas do\n"
-#~ "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
-#~ "os arquivos PO serão preservados.\n"
+#~ "Descobre mensagens que s�o comuns a dois ou mais do arquivos PO\n"
+#~ "especificados. Usando a op��o --more-than, a maior parte das\n"
+#~ "ocorr�ncias podem ser solicitadas antes das mensagens serem impressas.\n"
+#~ "De modo contr�rio, a op��o --less-than pode ser usada para especificar\n"
+#~ "menos ocorr�ncias antes das mensagens serem exibidas (i.e., \n"
+#~ "--less-than=2 ir� exibir apenas as mensagens exclusivas). Tradu��es,\n"
+#~ "coment�rios e coment�rios de extra��o ser�o preservados, mas apenas do\n"
+#~ "primeiro arquivo PO que os definirem. As posi��es de arquivo de todos\n"
+#~ "os arquivos PO ser�o preservados.\n"
 
 #, fuzzy
 #~ msgid ""
@@ -571,29 +553,29 @@
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #~ msgid "no input files given"
-#~ msgstr "arquivos de entrada não informados"
+#~ msgstr "arquivos de entrada n�o informados"
 
 #~ msgid "exactly 2 input files required"
-#~ msgstr "são necessários 2 arquivos de entrada"
+#~ msgstr "s�o necess�rios 2 arquivos de entrada"
 
 #, fuzzy
 #~ msgid ""
@@ -607,36 +589,36 @@
 #~ "match cannot be found, fuzzy matching is used to produce better "
 #~ "diagnostics.\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
-#~ "  -D, --directory=DIRETÓRIO  adiciona DIRETÓRIO na lista de pesquisa "
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
+#~ "  -D, --directory=DIRET�RIO  adiciona DIRET�RIO na lista de pesquisa "
 #~ "dos \n"
 #~ "                             arquivos de entrada\n"
 #~ "  -h, --help                 apresenta esta ajuda e finaliza\n"
-#~ "  -V, --version              apresenta informações da versão e finaliza\n"
+#~ "  -V, --version              apresenta informa��es da vers�o e finaliza\n"
 #~ "\n"
-#~ "Compara dois arquivos .po de estilo Uniforum para checar se ambos contém "
+#~ "Compara dois arquivos .po de estilo Uniforum para checar se ambos cont�m "
 #~ "o\n"
 #~ "mesmo conjunto de strings msgid. O arquivo def.po deve ser um arquivo PO\n"
-#~ "existente com as traduções antigas. O arquivo ref.po é o último arquivo "
+#~ "existente com as tradu��es antigas. O arquivo ref.po � o �ltimo arquivo "
 #~ "PO\n"
-#~ "criado (geralmente pelo xgettext). Isto é útil para comparar se todas as\n"
-#~ "mensagens do programa foram traduzidas. Onde uma igualdade não puder ser\n"
-#~ "encontrada uma aproximação é utilizada para produzir um melhor "
-#~ "diagnóstico.\n"
+#~ "criado (geralmente pelo xgettext). Isto � �til para comparar se todas as\n"
+#~ "mensagens do programa foram traduzidas. Onde uma igualdade n�o puder ser\n"
+#~ "encontrada uma aproxima��o � utilizada para produzir um melhor "
+#~ "diagn�stico.\n"
 
 #~ msgid "this message is used but not defined..."
-#~ msgstr "esta mensagem é utilizada, mas não foi definida..."
+#~ msgstr "esta mensagem � utilizada, mas n�o foi definida..."
 
 #~ msgid "...but this definition is similar"
-#~ msgstr "...mas esta definição é similar"
+#~ msgstr "...mas esta defini��o � similar"
 
 #~ msgid "this message is used but not defined in %s"
-#~ msgstr "esta mensagem é utilizada mas não definida em %s"
+#~ 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"
+#~ msgstr "aten��o: esta mensagem n�o � utilizada"
 
 #~ msgid "found %d fatal error"
 #~ msgid_plural "found %d fatal errors"
@@ -657,24 +639,24 @@
 #~ "PO file to define them.  File positions from all PO files will be\n"
 #~ "cumulated.\n"
 #~ msgstr ""
-#~ "  -V, --version                  mostra informações de versão e sai\n"
-#~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
+#~ "  -V, --version                  mostra informa��es de vers�o e sai\n"
+#~ "  -w, --width=NUMBER             configura a largura de p�gina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         mostra mensagens menores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
+#~ "  ->, --more-than=N�MERO         mostra mensagens maiores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
 #~ "\n"
-#~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
-#~ "especificados. Usando a opção --more-than, a maior parte das\n"
-#~ "ocorrências podem ser solicitadas antes das mensagens serem impressas.\n"
-#~ "De modo contrário, a opção --less-than pode ser usada para especificar\n"
-#~ "menos ocorrências antes das mensagens serem exibidas (i.e., \n"
-#~ "--less-than=2 irá exibir apenas as mensagens exclusivas). Traduções,\n"
-#~ "comentários e comentários de extração serão preservados, mas apenas do\n"
-#~ "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
-#~ "os arquivos PO serão preservados.\n"
+#~ "Descobre mensagens que s�o comuns a dois ou mais do arquivos PO\n"
+#~ "especificados. Usando a op��o --more-than, a maior parte das\n"
+#~ "ocorr�ncias podem ser solicitadas antes das mensagens serem impressas.\n"
+#~ "De modo contr�rio, a op��o --less-than pode ser usada para especificar\n"
+#~ "menos ocorr�ncias antes das mensagens serem exibidas (i.e., \n"
+#~ "--less-than=2 ir� exibir apenas as mensagens exclusivas). Tradu��es,\n"
+#~ "coment�rios e coment�rios de extra��o ser�o preservados, mas apenas do\n"
+#~ "primeiro arquivo PO que os definirem. As posi��es de arquivo de todos\n"
+#~ "os arquivos PO ser�o preservados.\n"
 
 #, fuzzy
 #~ msgid ""
@@ -688,24 +670,24 @@
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -V, --version                  mostra informações de versão e sai\n"
-#~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
-#~ "número\n"
-#~ "                                 o padrão é infinito\n"
+#~ "  -V, --version                  mostra informa��es de vers�o e sai\n"
+#~ "  -w, --width=NUMBER             configura a largura de p�gina de sa�da\n"
+#~ "  -<, --less-than=N�MERO         mostra mensagens menores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
+#~ "  ->, --more-than=N�MERO         mostra mensagens maiores que este "
+#~ "n�mero\n"
+#~ "                                 o padr�o � infinito\n"
 #~ "\n"
-#~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
-#~ "especificados. Usando a opção --more-than, a maior parte das\n"
-#~ "ocorrências podem ser solicitadas antes das mensagens serem impressas.\n"
-#~ "De modo contrário, a opção --less-than pode ser usada para especificar\n"
-#~ "menos ocorrências antes das mensagens serem exibidas (i.e., \n"
-#~ "--less-than=2 irá exibir apenas as mensagens exclusivas). Traduções,\n"
-#~ "comentários e comentários de extração serão preservados, mas apenas do\n"
-#~ "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
-#~ "os arquivos PO serão preservados.\n"
+#~ "Descobre mensagens que s�o comuns a dois ou mais do arquivos PO\n"
+#~ "especificados. Usando a op��o --more-than, a maior parte das\n"
+#~ "ocorr�ncias podem ser solicitadas antes das mensagens serem impressas.\n"
+#~ "De modo contr�rio, a op��o --less-than pode ser usada para especificar\n"
+#~ "menos ocorr�ncias antes das mensagens serem exibidas (i.e., \n"
+#~ "--less-than=2 ir� exibir apenas as mensagens exclusivas). Tradu��es,\n"
+#~ "coment�rios e coment�rios de extra��o ser�o preservados, mas apenas do\n"
+#~ "primeiro arquivo PO que os definirem. As posi��es de arquivo de todos\n"
+#~ "os arquivos PO ser�o preservados.\n"
 
 #, fuzzy
 #~ msgid ""
@@ -731,23 +713,23 @@
 #~ "      --omit-header              don't write header with `msgid \"\"' "
 #~ "entry\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #, fuzzy
 #~ msgid ""
@@ -767,38 +749,38 @@
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #~ msgid "no input file given"
-#~ msgstr "não foi informado o arquivo de entrada"
+#~ msgstr "n�o foi informado o arquivo de entrada"
 
 #, fuzzy
 #~ msgid "exactly one input file required"
-#~ msgstr "são necessários 2 arquivos de entrada"
+#~ msgstr "s�o necess�rios 2 arquivos de entrada"
 
 #, fuzzy
 #~ msgid "missing command name"
-#~ msgstr "parâmetros não informados"
+#~ msgstr "par�metros n�o informados"
 
 #, fuzzy
 #~ msgid "missing filter name"
-#~ msgstr "parâmetros não informados"
+#~ msgstr "par�metros n�o informados"
 
 #, fuzzy
 #~ msgid "at least one sed script must be specified"
@@ -824,23 +806,23 @@
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #~ msgid "%d translated message"
 #~ msgid_plural "%d translated messages"
@@ -849,60 +831,60 @@
 
 #~ msgid ", %d fuzzy translation"
 #~ msgid_plural ", %d fuzzy translations"
-#~ msgstr[0] ", %d tradução aproximada (fuzzy)"
-#~ msgstr[1] ", %d traduções aproximadas (fuzzy)"
+#~ msgstr[0] ", %d tradu��o aproximada (fuzzy)"
+#~ msgstr[1] ", %d tradu��es aproximadas (fuzzy)"
 
 #~ msgid ", %d untranslated message"
 #~ msgid_plural ", %d untranslated messages"
-#~ msgstr[0] ", %d mensagem não traduzida"
-#~ msgstr[1] ", %d mensagens não traduzidas"
+#~ msgstr[0] ", %d mensagem n�o traduzida"
+#~ msgstr[1] ", %d mensagens n�o traduzidas"
 
 #, fuzzy
 #~ msgid "invalid nplurals value"
-#~ msgstr "seqüência de controle ilegal"
+#~ msgstr "seq��ncia de controle ilegal"
 
 #, fuzzy
 #~ msgid "...but some messages have only one plural form"
 #~ msgid_plural "...but some messages have only %lu plural forms"
-#~ msgstr[0] "esta mensagem é utilizada mas não definida em %s"
-#~ msgstr[1] "esta mensagem é utilizada mas não definida em %s"
+#~ msgstr[0] "esta mensagem � utilizada mas n�o definida em %s"
+#~ msgstr[1] "esta mensagem � utilizada mas n�o definida em %s"
 
 #, fuzzy
 #~ msgid "...but some messages have one plural form"
 #~ msgid_plural "...but some messages have %lu plural forms"
-#~ msgstr[0] "esta mensagem é utilizada mas não definida em %s"
-#~ msgstr[1] "esta mensagem é utilizada mas não definida em %s"
+#~ msgstr[0] "esta mensagem � utilizada mas n�o definida em %s"
+#~ msgstr[1] "esta mensagem � utilizada mas n�o definida em %s"
 
 #~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-#~ msgstr "`msgid' e `msgstr' não começam com '\\n'"
+#~ msgstr "`msgid' e `msgstr' n�o come�am com '\\n'"
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-#~ msgstr "`msgid' e `msgstr[%u]' não começam com '\\n'"
+#~ msgstr "`msgid' e `msgstr[%u]' n�o come�am com '\\n'"
 
 #~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-#~ msgstr "`msgid' e `msgstr' não começam com '\\n'"
+#~ msgstr "`msgid' e `msgstr' n�o come�am com '\\n'"
 
 #~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-#~ msgstr "`msgid' e `msgstr' não terminam com '\\n'"
+#~ msgstr "`msgid' e `msgstr' n�o terminam com '\\n'"
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-#~ msgstr "`msgid' e `msgstr[%u]' não terminam com '\\n'"
+#~ msgstr "`msgid' e `msgstr[%u]' n�o terminam com '\\n'"
 
 #~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-#~ msgstr "`msgid' e `msgstr' não terminam com '\\n'"
+#~ msgstr "`msgid' e `msgstr' n�o terminam com '\\n'"
 
 #, fuzzy
 #~ msgid "headerfield `%s' missing in header\n"
-#~ msgstr "campo `%s' faltando no cabeçalho"
+#~ msgstr "campo `%s' faltando no cabe�alho"
 
 #, fuzzy
 #~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "campo `%s' deve iniciar no começo da linha"
+#~ msgstr "campo `%s' deve iniciar no come�o da linha"
 
 #, fuzzy
 #~ msgid "some header fields still have the initial default value\n"
 #~ msgstr ""
-#~ "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
+#~ "alguns campos do cabe�alho ainda possuem os valores iniciais padr�es"
 
 #, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
@@ -911,37 +893,37 @@
 #, fuzzy
 #~ msgid "warning: PO file header missing or invalid\n"
 #~ msgstr ""
-#~ "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
-#~ "%*s aviso: conversão de charset não vai funcionar"
+#~ "%s: aviso: Cabe�alho do arquivo PO esquecido, aproximado ou inv�lido\n"
+#~ "%*s aviso: convers�o de charset n�o vai funcionar"
 
 #, fuzzy
 #~ msgid "warning: charset conversion will not work\n"
 #~ msgstr ""
-#~ "%s: aviso: falta o cabeçalho relativo ao charset\n"
-#~ "%*s aviso: conversão de charset não vai funcionar"
+#~ "%s: aviso: falta o cabe�alho relativo ao charset\n"
+#~ "%*s aviso: convers�o de charset n�o vai funcionar"
 
 #, fuzzy
 #~ msgid "warning: PO file header fuzzy\n"
 #~ msgstr ""
-#~ "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
-#~ "%*s aviso: conversão de charset não vai funcionar"
+#~ "%s: aviso: Cabe�alho do arquivo PO esquecido, aproximado ou inv�lido\n"
+#~ "%*s aviso: convers�o de charset n�o vai funcionar"
 
 #~ msgid "domain name \"%s\" not suitable as file name"
-#~ msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
+#~ msgstr "nome do dom�nio \"%s\" n�o � v�lido como nome de arquivo"
 
 #~ 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 "
+#~ "nome do dom�nio \"%s\" n�o � v�lido como nome de arquivo: ser� usado um "
 #~ "prefixo"
 
 #~ msgid "`domain %s' directive ignored"
 #~ msgstr "`domain %s': diretiva ignorada"
 
 #~ msgid "duplicate message definition"
-#~ msgstr "definição duplicada de mensagem"
+#~ msgstr "defini��o duplicada de mensagem"
 
 #~ msgid "...this is the location of the first definition"
-#~ msgstr "...esta é a localização da primeira definição"
+#~ msgstr "...esta � a localiza��o da primeira defini��o"
 
 #~ msgid "empty `msgstr' entry ignored"
 #~ msgstr "`msgstr' vazia: mensagem ignorada"
@@ -950,7 +932,7 @@
 #~ msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
 
 #~ msgid "%s: warning: source file contains fuzzy translation"
-#~ msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
+#~ msgstr "%s: aviso: arquivo fonte cont�m tradu��es aproximadas"
 
 #, fuzzy
 #~ msgid ""
@@ -970,31 +952,31 @@
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #, fuzzy
 #~ msgid "present charset \"%s\" is not a portable encoding name"
-#~ msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
+#~ msgstr "%s: aviso: charset \"%s\" n�o � suportado pelo iconv%s"
 
 #, fuzzy
 #~ msgid "target charset \"%s\" is not a portable encoding name."
-#~ msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
+#~ msgstr "%s: aviso: charset \"%s\" n�o � suportado pelo iconv%s"
 
 #, fuzzy
 #~ msgid ""
@@ -1010,33 +992,33 @@
 #~ "cannot be found, fuzzy matching is used to produce better results.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Unifica dois arquivos .po de estilo Uniforum. O arquivo def.po é um\n"
-#~ "arquivo PO existente com as traduções antigas que serão utilizadas no "
+#~ "Unifica dois arquivos .po de estilo Uniforum. O arquivo def.po � um\n"
+#~ "arquivo PO existente com as tradu��es antigas que ser�o utilizadas no "
 #~ "novo\n"
-#~ "arquivo, enquanto elas coincidirem; comentários são preservados, porém\n"
-#~ "comentários extraídos e posições de arquivos serão descartados.\n"
-#~ "O arquivo ref.po é o último arquivo PO criado (geralmente pelo "
+#~ "arquivo, enquanto elas coincidirem; coment�rios s�o preservados, por�m\n"
+#~ "coment�rios extra�dos e posi��es de arquivos ser�o descartados.\n"
+#~ "O arquivo ref.po � o �ltimo arquivo PO criado (geralmente pelo "
 #~ "xgettext),\n"
-#~ "em que qualquer tradução ou comentário são descartados, exceto "
-#~ "comentários\n"
-#~ "\"ponto\" e posições de arquivo. Onde as igualdades não forem exatas,\n"
-#~ "aproximações podem ser utilizadas para produzirem melhores resultados.\n"
-#~ "Os resultados serão gravados na saída padrão, a menos que um arquivo de\n"
-#~ "saída seja especificado.\n"
+#~ "em que qualquer tradu��o ou coment�rio s�o descartados, exceto "
+#~ "coment�rios\n"
+#~ "\"ponto\" e posi��es de arquivo. Onde as igualdades n�o forem exatas,\n"
+#~ "aproxima��es podem ser utilizadas para produzirem melhores resultados.\n"
+#~ "Os resultados ser�o gravados na sa�da padr�o, a menos que um arquivo de\n"
+#~ "sa�da seja especificado.\n"
 
 #, fuzzy
 #~ msgid "this message should define plural forms"
-#~ msgstr "esta mensagem é utilizada mas não definida em %s"
+#~ msgstr "esta mensagem � utilizada mas n�o definida em %s"
 
 #, fuzzy
 #~ msgid "this message should not define plural forms"
-#~ msgstr "esta mensagem é utilizada mas não definida em %s"
+#~ msgstr "esta mensagem � utilizada mas n�o definida em %s"
 
 #~ msgid ""
 #~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 #~ "obsolete %ld.\n"
 #~ msgstr ""
-#~ "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, "
+#~ "%sLido %ld antigas + %ld refer�ncia, concatenadas %ld, aproximadas %ld, "
 #~ "perdidas %ld, obsoletas %ld.\n"
 
 #~ msgid " done.\n"
@@ -1044,7 +1026,7 @@
 
 #, fuzzy
 #~ msgid "%s and explicit file names are mutually exclusive"
-#~ msgstr "%s e %s são mutuamente exclusivos"
+#~ msgstr "%s e %s s�o mutuamente exclusivos"
 
 #, fuzzy
 #~ msgid ""
@@ -1059,19 +1041,19 @@
 #~ "                           the output page width, into several lines\n"
 #~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] [ARQUIVO]...\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios para\n"
-#~ "as opções curtas\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "Uso: %s [OP��O] [ARQUIVO]...\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios para\n"
+#~ "as op��es curtas\n"
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
-#~ "  -w, --width=NÚMERO       configura largura da página de saída\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
+#~ "  -w, --width=N�MERO       configura largura da p�gina de sa�da\n"
 
 #~ msgid "<stdin>"
 #~ msgstr "<stdin>"
@@ -1081,54 +1063,54 @@
 #~ "Charset \"%s\" is not a portable encoding name.\n"
 #~ "Message conversion to user's charset might not work.\n"
 #~ msgstr ""
-#~ "%s: aviso: charset \"%s\" não é um encoding portável\n"
-#~ "%*s aviso: conversão de charset pode não funcionar"
+#~ "%s: aviso: charset \"%s\" n�o � um encoding port�vel\n"
+#~ "%*s aviso: convers�o de charset pode n�o funcionar"
 
 #, fuzzy
 #~ msgid ""
 #~ "Charset missing in header.\n"
 #~ "Message conversion to user's charset will not work.\n"
 #~ msgstr ""
-#~ "%s: aviso: falta o cabeçalho relativo ao charset\n"
-#~ "%*s aviso: conversão de charset não vai funcionar"
+#~ "%s: aviso: falta o cabe�alho relativo ao charset\n"
+#~ "%*s aviso: convers�o de charset n�o vai funcionar"
 
 #~ msgid "inconsistent use of #~"
 #~ msgstr "uso inconsistente de #~"
 
 #~ msgid "missing `msgstr[]' section"
-#~ msgstr "seção `msgstr[]' não localizada"
+#~ msgstr "se��o `msgstr[]' n�o localizada"
 
 #~ msgid "missing `msgid_plural' section"
-#~ msgstr "seção `msgid_plural' não localizada"
+#~ msgstr "se��o `msgid_plural' n�o localizada"
 
 #~ msgid "missing `msgstr' section"
-#~ msgstr "seção `msgstr' não localizada"
+#~ msgstr "se��o `msgstr' n�o localizada"
 
 #~ msgid "first plural form has nonzero index"
-#~ msgstr "primeira forma em plural tem o índice diferente de zero"
+#~ msgstr "primeira forma em plural tem o �ndice diferente de zero"
 
 #~ msgid "plural form has wrong index"
-#~ msgstr "forma plural tem o índice errado"
+#~ msgstr "forma plural tem o �ndice errado"
 
 #~ msgid "too many errors, aborting"
 #~ msgstr "excesso de erros - finalizando"
 
 #~ msgid "invalid multibyte sequence"
-#~ msgstr "sequência multibyte inválido"
+#~ msgstr "sequ�ncia multibyte inv�lido"
 
 #, fuzzy
 #~ msgid "incomplete multibyte sequence at end of file"
-#~ msgstr "sequência multibyte inválido"
+#~ msgstr "sequ�ncia multibyte inv�lido"
 
 #, fuzzy
 #~ msgid "incomplete multibyte sequence at end of line"
-#~ msgstr "sequência multibyte inválido"
+#~ msgstr "sequ�ncia multibyte inv�lido"
 
 #~ msgid "keyword \"%s\" unknown"
 #~ msgstr "palavra chave \"%s\" desconhecida"
 
 #~ msgid "invalid control sequence"
-#~ msgstr "seqüência de controle ilegal"
+#~ msgstr "seq��ncia de controle ilegal"
 
 #~ msgid "end-of-file within string"
 #~ msgstr "fim de arquivo sem string"
@@ -1141,18 +1123,18 @@
 #~ msgstr "arquivo \"%s\" truncado"
 
 #~ msgid "file \"%s\" contains a not NUL terminated string"
-#~ msgstr "arquivo \"%s\" contém string não terminada em NULL"
+#~ msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
 #~ msgid "file \"%s\" is not in GNU .mo format"
-#~ msgstr "arquivo \"%s\" não está no formato GNU .mo"
+#~ msgstr "arquivo \"%s\" n�o est� no formato GNU .mo"
 
 #, fuzzy
 #~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
-#~ msgstr "arquivo \"%s\" contém string não terminada em NULL"
+#~ msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
 #, fuzzy
 #~ msgid "expected two arguments"
-#~ msgstr "excesso de parâmetros"
+#~ msgstr "excesso de par�metros"
 
 #, fuzzy
 #~ msgid "error writing stdout"
@@ -1160,25 +1142,25 @@
 
 #, fuzzy
 #~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "não foi possível criar o arquivo de saída \"%s\""
+#~ msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #~ msgid "error while writing \"%s\" file"
 #~ msgstr "erro ao gravar o arquivo \"%s\""
 
 #~ msgid "error while opening \"%s\" for writing"
-#~ msgstr "erro ao abrir o arquivo \"%s\" para gravação"
+#~ msgstr "erro ao abrir o arquivo \"%s\" para grava��o"
 
 #~ msgid ""
 #~ "internationalized messages should not contain the `\\%c' escape sequence"
 #~ msgstr ""
-#~ "mensagens internacionalizadas não devem conter o caractere de escape `\\"
+#~ "mensagens internacionalizadas n�o devem conter o caractere de escape `\\"
 #~ "%c'"
 
 #~ msgid "cannot create output file \"%s\""
-#~ msgstr "não foi possível criar o arquivo de saída \"%s\""
+#~ msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #~ msgid "standard output"
-#~ msgstr "saída padrão"
+#~ msgstr "sa�da padr�o"
 
 #~ msgid "%s:%d: warning: unterminated character constant"
 #~ msgstr "%s:%d: aviso: caractere constante indeterminado"
@@ -1187,18 +1169,18 @@
 #~ msgstr "%s:%d: aviso: string literal indeterminada"
 
 #~ msgid "this file may not contain domain directives"
-#~ msgstr "este arquivo parece não conter diretivas de domínio"
+#~ msgstr "este arquivo parece n�o conter diretivas de dom�nio"
 
 #~ msgid "--join-existing cannot be used when output is written to stdout"
 #~ msgstr ""
-#~ "--join-existing não pode ser usado enquanto a saída é escrita na saída "
-#~ "padrão"
+#~ "--join-existing n�o pode ser usado enquanto a sa�da � escrita na sa�da "
+#~ "padr�o"
 
 #~ msgid "xgettext cannot work without keywords to look for"
-#~ msgstr "xgettext não pode funcionar sem as teclas para procurar"
+#~ msgstr "xgettext n�o pode funcionar sem as teclas para procurar"
 
 #~ msgid "warning: file `%s' extension `%s' is unknown; will try C"
-#~ msgstr "aviso: arquivo `%s' extensão `%s' é desconhecida; tentarei C"
+#~ msgstr "aviso: arquivo `%s' extens�o `%s' � desconhecida; tentarei C"
 
 #, fuzzy
 #~ msgid ""
@@ -1231,45 +1213,45 @@
 #~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
 #~ "entries\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #~ msgid "language `%s' unknown"
 #~ msgstr "idioma `%s' desconhecido"
 
 #, fuzzy
 #~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "arquivo \"%s\" contém string não terminada em NULL"
+#~ msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "falha na pesquisa \"%s\" offset %ld"
 
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #~ msgid "while creating hash table"
 #~ msgstr "enquanto criando tabela hash"
@@ -1279,10 +1261,10 @@
 #~ msgstr "%s:%d: aviso: string literal indeterminada"
 
 #~ msgid "while preparing output"
-#~ msgstr "enquanto preparando a saída"
+#~ msgstr "enquanto preparando a sa�da"
 
 #~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "esta mensagem não tem definição no domínio \"%s\""
+#~ msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -1300,19 +1282,19 @@
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] ARQUIVO DE ENTRADA ...\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
-#~ "  -d, --default-domain=NOME      utiliza NOME.po para a saída, ao invés\n"
+#~ "Uso: %s [OP��O] ARQUIVO DE ENTRADA ...\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
+#~ "  -d, --default-domain=NOME      utiliza NOME.po para a sa�da, ao inv�s\n"
 #~ "                                 de messages.po\n"
-#~ "  -D, --directory=DIRETÓRIO      muda para DIRETÓRIO antes de começar\n"
-#~ "  -e, --no-escape                não utiliza escapes C na saída "
+#~ "  -D, --directory=DIRET�RIO      muda para DIRET�RIO antes de come�ar\n"
+#~ "  -e, --no-escape                n�o utiliza escapes C na sa�da "
 #~ "(default)\n"
-#~ "  -E, --escape                   usa escapes C na saída, sem caracteres\n"
+#~ "  -E, --escape                   usa escapes C na sa�da, sem caracteres\n"
 #~ "                                 estendidos\n"
-#~ "  -f, --files-from=ARQ           lê ARQ como uma lista dos arquivos de "
+#~ "  -f, --files-from=ARQ           l� ARQ como uma lista dos arquivos de "
 #~ "entrada\n"
-#~ "  -F, --sort-by-file             ordena a saída pela localização dos "
+#~ "  -F, --sort-by-file             ordena a sa�da pela localiza��o dos "
 #~ "arquivos\n"
 #~ "  -h, --help                     apresenta esta ajuda e finaliza\n"
 
@@ -1336,19 +1318,19 @@
 #~ msgstr ""
 #~ "  -i, --indent                   grava o arquivo .po usando o estilo "
 #~ "indentado\n"
-#~ "      --no-location              não grava linhas '#: arquivo:linha'\n"
+#~ "      --no-location              n�o grava linhas '#: arquivo:linha'\n"
 #~ "  -n, --add-location             adiciona linhas '#: arquivo:"
-#~ "linha'(padrão)\n"
-#~ "      --omit-header              não grava cabeçalho com `msgid \"\"' \n"
-#~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
-#~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "linha'(padr�o)\n"
+#~ "      --omit-header              n�o grava cabe�alho com `msgid \"\"' \n"
+#~ "  -o, --output=ARQ               grava sa�da para o arquivo especificado\n"
+#~ "  -p, --output-dir=DIR           arquivos de sa�da ser�o gravados em DIR\n"
+#~ "  -s, --sort-output              gera sa�da ordenada, removendo "
 #~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
-#~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
+#~ "  -T, --trigraphs                entende tr�grafos ANSI C na entrada\n"
 #~ "  -u, --unique                   atalho para --less-than=2, somente "
 #~ "mensagens\n"
-#~ "                                 únicas serão mostradas\n"
+#~ "                                 �nicas ser�o mostradas\n"
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] filename.po ...\n"
@@ -1376,34 +1358,34 @@
 #~ "If input file is -, standard input is read.  If output file is -,\n"
 #~ "output is written to standard output.\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO]  arquivo.po ...\n"
-#~ "Gera catálogo de mensagens binárias a partir da descrição de tradução de "
+#~ "Uso: %s [OP��O]  arquivo.po ...\n"
+#~ "Gera cat�logo de mensagens bin�rias a partir da descri��o de tradu��o de "
 #~ "texto.\n"
 #~ "\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
-#~ "  -a, --alignment=NÚMERO   alinha strings em um NÚMERO de bytes (padrão: "
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
+#~ "  -a, --alignment=N�MERO   alinha strings em um N�MERO de bytes (padr�o: "
 #~ "%d)\n"
-#~ "  -c, --check              executa conferências dependentes de linguagem "
+#~ "  -c, --check              executa confer�ncias dependentes de linguagem "
 #~ "em strings\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -f, --use-fuzzy          use entradas aproximadas (fuzzy) na saída\n"
+#~ "  -f, --use-fuzzy          use entradas aproximadas (fuzzy) na sa�da\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "      --no-hash            arquivos binários não serão incluídos na "
+#~ "      --no-hash            arquivos bin�rios n�o ser�o inclu�dos na "
 #~ "tabela hash\n"
-#~ "  -o, --output-file=ARQ    especifica o nome do arquivo de saída ARQ\n"
-#~ "      --statistics         mostra estatísticas das traduções\n"
+#~ "  -o, --output-file=ARQ    especifica o nome do arquivo de sa�da ARQ\n"
+#~ "      --statistics         mostra estat�sticas das tradu��es\n"
 #~ "      --strict             habilita o modo Uniforum estrito\n"
 #~ "  -v, --verbose            lista problemas do arquivo de entrada\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 #~ "\n"
-#~ "Informando a opção -v mais que uma vez as mensagens de saída são "
+#~ "Informando a op��o -v mais que uma vez as mensagens de sa�da s�o "
 #~ "incrementadas\n"
 #~ "\n"
-#~ "Se o arquivo de entrada é -, a entrada padrão é lida. Caso o arquivo de "
-#~ "saída\n"
-#~ "seja - as mensagens serão geradas na saída padrão\n"
+#~ "Se o arquivo de entrada � -, a entrada padr�o � lida. Caso o arquivo de "
+#~ "sa�da\n"
+#~ "seja - as mensagens ser�o geradas na sa�da padr�o\n"
 
 #~ msgid ""
 #~ "\n"
@@ -1413,10 +1395,10 @@
 #~ "By default the output is written to standard output.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Converte arquivos binários .mo em arquivos .po de estilo Uniforum.\n"
-#~ "São tratados tanto arquivos .mo little-endian e big-endian.\n"
+#~ "Converte arquivos bin�rios .mo em arquivos .po de estilo Uniforum.\n"
+#~ "S�o tratados tanto arquivos .mo little-endian e big-endian.\n"
 #~ "Se nenhum arquivo de entrada for fornecido ou for -, a entrada\n"
-#~ "padrão é lida. Por padrão, a saída é gravada para a saída padrão.\n"
+#~ "padr�o � lida. Por padr�o, a sa�da � gravada para a sa�da padr�o.\n"
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -1443,30 +1425,30 @@
 #~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] ARQUIVO DE ENTRADA ...\n"
+#~ "Uso: %s [OP��O] ARQUIVO DE ENTRADA ...\n"
 #~ "Extrai strings a traduzir dos arquivos de entrada\n"
 #~ "\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -a, --extract-all              extrai todas as strings\n"
-#~ "  -c, --add-comments[=TAG]       adiciona blocos de comentários com TAG\n"
+#~ "  -c, --add-comments[=TAG]       adiciona blocos de coment�rios com TAG\n"
 #~ "                                 precedendo as linhas do arquivo de "
-#~ "saída\n"
-#~ "  -C, --c++                      reconhece estilo C++ de comentários\n"
-#~ "      --debug                    formato de saída mais detalhado\n"
-#~ "  -d, --default-domain=NOME      utiliza NOME.po para a saída, ao invés\n"
+#~ "sa�da\n"
+#~ "  -C, --c++                      reconhece estilo C++ de coment�rios\n"
+#~ "      --debug                    formato de sa�da mais detalhado\n"
+#~ "  -d, --default-domain=NOME      utiliza NOME.po para a sa�da, ao inv�s\n"
 #~ "                                 de messages.po\n"
-#~ "  -D, --directory=DIRETÓRIO      muda para DIRETÓRIO antes de começar\n"
-#~ "  -e, --no-escape                não utiliza escapes C na saída "
+#~ "  -D, --directory=DIRET�RIO      muda para DIRET�RIO antes de come�ar\n"
+#~ "  -e, --no-escape                n�o utiliza escapes C na sa�da "
 #~ "(default)\n"
-#~ "  -E, --escape                   usa escapes C na saída, sem caracteres\n"
+#~ "  -E, --escape                   usa escapes C na sa�da, sem caracteres\n"
 #~ "                                 estendidos\n"
-#~ "  -f, --files-from=ARQ           lê ARQ como uma lista dos arquivos de "
+#~ "  -f, --files-from=ARQ           l� ARQ como uma lista dos arquivos de "
 #~ "entrada\n"
 #~ "      --force-po                 escreve o arquivo .po mesmo que vazio\n"
-#~ "      --foreign-user             omite o  copyright da FSF na saída para "
+#~ "      --foreign-user             omite o  copyright da FSF na sa�da para "
 #~ "estrangeiros\n"
-#~ "  -F, --sort-by-file             ordena a saída pela localização dos "
+#~ "  -F, --sort-by-file             ordena a sa�da pela localiza��o dos "
 #~ "arquivos\n"
 
 #~ msgid ""
@@ -1489,22 +1471,22 @@
 #~ "  -h, --help                     mostra a ajuda e sai\n"
 #~ "  -i, --indent                   grava o arquivo .po usando estilo "
 #~ "indentado\n"
-#~ "  -j, --join-existing            adiciona mensagens a um arquivo já "
+#~ "  -j, --join-existing            adiciona mensagens a um arquivo j� "
 #~ "existente\n"
 #~ "  -k, --keyword[=PALAVRA]        palavra chave adicional a ser "
 #~ "pesquisada\n"
-#~ "                                 (sem PALAVRA significa não usar as "
+#~ "                                 (sem PALAVRA significa n�o usar as "
 #~ "palavras\n"
-#~ "                                 chaves padrões)\n"
+#~ "                                 chaves padr�es)\n"
 #~ "  -L, --language=NOME            reconhece a linguagem especificada (C, C+"
 #~ "+, PO), caso \n"
-#~ "                                 contrário é escolhida através da "
-#~ "extensão do arquivo\n"
+#~ "                                 contr�rio � escolhida atrav�s da "
+#~ "extens�o do arquivo\n"
 #~ "  -m, --msgstr-prefix[=STRING]   usa STRING ou \"\" como prefixo para as\n"
 #~ "                                 entradas msgstr\n"
 #~ "  -M, --msgstr-suffix[=STRING]   usa STRING ou \"\" como sufixo para as\n"
 #~ "                                 entradas msgstr\n"
-#~ "      --no-location              não gravar linhas '#: arquivo:linha'\n"
+#~ "      --no-location              n�o gravar linhas '#: arquivo:linha'\n"
 
 #~ msgid ""
 #~ "  -n, --add-location             generate '#: filename:line' lines "
@@ -1527,36 +1509,36 @@
 #~ msgstr ""
 #~ "  -n, --add-location             adicionar linhas '#: arquivo:"
 #~ "linha' (default)\n"
-#~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
-#~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
-#~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "      --omit-header              n�o gravar cabe�alho com `msgid \"\"' \n"
+#~ "  -o, --output=ARQ               grava sa�da para o arquivo especificado\n"
+#~ "  -p, --output-dir=DIR           arquivos de sa�da ser�o gravados em DIR\n"
+#~ "  -s, --sort-output              gera sa�da ordenada, removendo "
 #~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
-#~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
-#~ "  -V, --version                  apresenta informação de versão e sai\n"
+#~ "  -T, --trigraphs                entende tr�grafos ANSI C na entrada\n"
+#~ "  -V, --version                  apresenta informa��o de vers�o e sai\n"
 #~ "  -n, --add-location             adicionar linhas '#: arquivo:"
 #~ "linha' (default)\n"
-#~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
-#~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
-#~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "      --omit-header              n�o gravar cabe�alho com `msgid \"\"' \n"
+#~ "  -o, --output=ARQ               grava sa�da para o arquivo especificado\n"
+#~ "  -p, --output-dir=DIR           arquivos de sa�da ser�o gravados em DIR\n"
+#~ "  -s, --sort-output              gera sa�da ordenada, removendo "
 #~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
-#~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
-#~ "  -V, --version                  apresenta informação de versão e sai\n"
-#~ "  -w, width=NÚMERO               configura a largura da página de saída\n"
-#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ não são "
-#~ "extraídas\n"
+#~ "  -T, --trigraphs                entende tr�grafos ANSI C na entrada\n"
+#~ "  -V, --version                  apresenta informa��o de vers�o e sai\n"
+#~ "  -w, width=N�MERO               configura a largura da p�gina de sa�da\n"
+#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ n�o s�o "
+#~ "extra�das\n"
 #~ "\n"
-#~ "Se ARQUIVO DE ENTRADA é -, a entrada padrão é lida.\n"
+#~ "Se ARQUIVO DE ENTRADA � -, a entrada padr�o � lida.\n"
 
 #~ msgid ""
 #~ "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 #~ "%*s  warning: consider installing GNU libiconv and then\n"
 #~ "%*s           reinstalling GNU gettext"
 #~ msgstr ""
-#~ "%s: aviso: charset \"%s\" não é suportado pelo iconv%s\n"
+#~ "%s: aviso: charset \"%s\" n�o � suportado pelo iconv%s\n"
 #~ "%*s aviso: Instale a biblioteca GNU libiconv e depois\n"
 #~ "%*s        reinstale o GNU gettext"
 
@@ -1565,6 +1547,6 @@
 #~ "%*s  warning: consider installing GNU libiconv and then\n"
 #~ "%*s           reinstalling GNU gettext"
 #~ msgstr ""
-#~ "%s: aviso: charset \"%s\" não é suportado sem o iconv%s\n"
+#~ "%s: aviso: charset \"%s\" n�o � suportado sem o iconv%s\n"
 #~ "%*s aviso: considere instalar a biblioteca GNU libiconv e depois\n"
 #~ "%*s        reinstale o GNU gettext"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/pt.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/pt.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/pt.po gettext-0.18.1.1/gettext-runtime/po/pt.po
--- gettext-0.19.3/gettext-runtime/po/pt.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/pt.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -20,62 +20,62 @@
 msgid "write error"
 msgstr "erro de escrita"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: a opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a opção `%c%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a opção `%s' requere um argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requere um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a opção '-W %s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: a opção '-W %s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: a opção `%s' requere um argumento\n"
@@ -119,8 +119,8 @@
 msgstr "argumentos insuficientes"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Tente '%s --help' para mais informação.\n"
 
 #: src/envsubst.c:176
@@ -242,13 +242,13 @@
 "                            MSGID do DIALECTO\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/ro.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/ro.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/ro.po gettext-0.18.1.1/gettext-runtime/po/ro.po
--- gettext-0.19.3/gettext-runtime/po/ro.po	2014-10-16 06:10:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ro.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -20,62 +20,62 @@
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscut�"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `--%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: op�iune necunoscut� `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: op�iune necunoscut� `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: op�iune invalid� -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: op�iunea necesit� un parametru -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: op�iunea `-W %s' este ambigu�\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
@@ -115,8 +115,8 @@
 msgstr "parametri lips�"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
 
 #: src/envsubst.c:176
@@ -240,13 +240,13 @@
 "                            lui MSGID din DOMENIU_TEXT\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/ru.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/ru.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/Rules-quot gettext-0.18.1.1/gettext-runtime/po/Rules-quot
--- gettext-0.19.3/gettext-runtime/po/Rules-quot	2014-10-08 07:17:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/Rules-quot	2010-06-06 12:49:57.000000000 +0000
@@ -1,4 +1,3 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -15,23 +14,13 @@
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
-	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
-	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
-	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
-	       ;; \
-	     *) \
-	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
-	       ;; \
-	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
-	     ; then \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
diff -Nru gettext-0.19.3/gettext-runtime/po/ru.po gettext-0.18.1.1/gettext-runtime/po/ru.po
--- gettext-0.19.3/gettext-runtime/po/ru.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/ru.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,93 +1,90 @@
-# Локализация для gettext
-# This file is distributed under the same license as the gettext package.
+# ����������� ��� gettext
 # Copyright (C) 1998 Free Software Foundation, Inc.
-#
 # Oleg S. Tihonov <oleg.tihonov@gmail.com>, 1998, 2001, 2002, 2003, 2005, 2006, 2007.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.19-rc1\n"
+"Project-Id-Version: gettext-runtime 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 07:59+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-06-14 09:43+0400\n"
+"Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=koi8-r\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "ошибка записи"
+msgstr "������ ������"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Неизвестная системная ошибка"
+msgstr "����������� ��������� ������"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмысленный параметр ?%s?; возможные варианты:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: ������������� ���� `%s'\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: у параметра ?--%s? не может быть аргумента\n"
+msgstr "%s: ���� `--%s' ������ �������������� ��� ���������\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: у параметра ?%c%s? не может быть аргумента\n"
+msgstr "%s: ���� `%c%s' ������ �������������� ��� ���������\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: для параметра ?--%s? требуется аргумент\n"
+msgstr "%s: ���� `%s' ������ �������������� c ����������\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: неизвестный параметр ?--%s?\n"
+msgstr "%s: ����������� ���� `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: неизвестный параметр ?%c%s?\n"
+msgstr "%s: ����������� ���� `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: недопустимый параметр ? ?%c?\n"
+msgstr "%s: �������� ���� -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: для параметра требуется аргумент ? ?%c?\n"
+msgstr "%s: ���� %c ������ �� �������������� c ����������\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмысленный параметр ?-W %s?\n"
+msgstr "%s: ������������� ���� `-W %s'\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: у параметра ?-W %s? не может быть аргумента\n"
+msgstr "%s: ���� `-W %s' ������ �������������� ��� ���������\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: для параметра ?-W %s? требуется аргумент\n"
+msgstr "%s: ���� `%s' ������ �������������� c ����������\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "память исчерпана"
+msgstr "����������� ������ ���������"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -97,70 +94,66 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>\n"
-"Это свободное ПО: вы можете продавать и распространять его.\n"
-"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
 
 #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Автор программы ? %s.\n"
+msgstr "����� ��������� -- %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Бруно Хайбл"
+msgstr "����� �����"
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
-msgstr "слишком много аргументов"
+msgstr "������� ����� ����������"
 
 #: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
-msgstr "необходимо задать аргументы"
+msgstr "���������� ������ ���������"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "По команде ?%s --help? можно получить дополнительную информацию.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "���������� `%s --help' ��� ��������� ����� ���������� ��������.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Использование: %s [ПАРАМЕТР] [ФОРМАТ-ОБОЛОЧКИ]\n"
+msgstr "�������������: %s [����] [������-��������]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Подставляет значения переменных окружения.\n"
+msgstr "����������� �������� ���������� �����.\n"
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "Режим работы:\n"
+msgstr "����� ������:\n"
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             вывести переменные, найденные в ФОРМАТЕ-ОБОЛОЧКИ\n"
+msgstr "  -v, --variables             ������� ����������, ��������� � �������-��������\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Информационный вывод:\n"
+msgstr "�������������� �����:\n"
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  напечатать эту справку и выйти\n"
+msgstr "  -h, --help                  ���������� ��� ������� � �����\n"
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               напечатать информацию о версии и выйти\n"
+msgstr "  -V, --version               ���������� ���������� � ������ � �����\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -172,12 +165,12 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"В обычном режиме работы стандартный ввод копируется на стандартный\n"
-"вывод, а ссылки на переменные окружения вида $ПЕРЕМЕННАЯ или ${ПЕРЕМЕННАЯ}\n"
-"заменяются на соответствующие значения. Если задан ФОРМАТ-ОБОЛОЧКИ,\n"
-"подставляются только те переменные, на которые есть ссылки в\n"
-"ФОРМАТЕ-ОБОЛОЧКИ; в противном случае подставляются все ссылки на\n"
-"переменные окружения, встречающиеся на стандартном вводе.\n"
+"� ������� ������ ������ ����������� ���� ���������� �� �����������\n"
+"�����, � ������ �� ���������� ����� ���� $���������� ��� ${����������}\n"
+"���������� �� ��������������� ��������.  ���� ����� ������-��������,\n"
+"������������� ������ �� ����������, �� ������� ���� ������ �\n"
+"�������-��������; � ��������� ������ ������������� ��� ������ ��\n"
+"���������� �����, ������������� �� ����������� �����.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -185,9 +178,9 @@
 "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 ""
-"Если задан параметр --variables, стандартный ввод игнорируется, и вывод\n"
-"состоит из переменных окружения, на которые есть ссылки в\n"
-"ФОРМАТЕ-ОБОЛОЧКИ, по одной на строку.\n"
+"���� ����� ���� --variables, ����������� ���� ������������, � �����\n"
+"������� �� ���������� �����, �� ������� ���� ������ �\n"
+"�������-��������, �� ����� �� ������.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -195,21 +188,21 @@
 #. bugs (typically your translation team's web or email address).
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
+msgstr "�� ������� ��������� �� ������ <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "ошибка при чтении ?%s?"
+msgstr "������ ��� ������ \"%s\""
 
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr "стандартный ввод"
+msgstr "����������� ����"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Ульрих Дреппер"
+msgstr "������ �������"
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -217,13 +210,13 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Использование: %s [ПАРАМЕТР] [[ДОМЕН] MSGID]\n"
-"      или:     %s [ПАРАМЕТР] -s [MSGID]?\n"
+"�������������: %s [����] [[�����] MSGID]\n"
+"      ���:     %s [����] -s [MSGID]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Отображает перевод текстового сообщения.\n"
+msgstr "���������� ������� �������� ���������.\n"
 
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -237,14 +230,14 @@
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=ДОМЕН        использовать переведённые сообщения из ДОМЕНА\n"
-"  -e                        разрешить использование некоторых экранирующих\n"
-"                            последовательностей\n"
-"  -E                        (игнорируется для совместимости)\n"
-"  -h, --help                показать эту справку и выйти\n"
-"  -n                        не выводить завершающий перевод строки\n"
-"  -V, --version             показать информацию о версии и выйти\n"
-"  [ДОМЕН] MSGID             найти перевод сообщения MSGID в ДОМЕНЕ\n"
+"  -d, --domain=�����        ������������ ������������ ��������� �� ������\n"
+"  -e                        ��������� ������������� ��������� escape-\n"
+"                            -�������������������\n"
+"  -E                        (������������ ��� �������������)\n"
+"  -h, --help                �������� ��� ������� � �����\n"
+"  -n                        �� �������� ����������� ������� ������ \n"
+"  -V, --version             �������� ���������� � ������ � �����\n"
+"  [�����] MSGID             ����� ������� ��������� MSGID � ������\n"
 
 #: src/gettext.c:264
 #, c-format, no-wrap
@@ -253,24 +246,24 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Если не задан параметр ДОМЕН, то домен определяется из\n"
-"переменной окружения TEXTDOMAIN. Если каталог сообщений не\n"
-"найден в стандартном каталоге, можно указать другой каталог с помощью\n"
-"переменной окружения TEXTDOMAINDIR.\n"
-"При использовании с параметром -s, поведение программы похоже на поведение\n"
-"команды ?echo?. Но вместо простого копирования аргументов в\n"
-"стандартный вывод, выводятся их переводы из указанного домена.\n"
-"Стандартный каталог поиска: %s\n"
+"���� �� ����� �������� �����, ������������ �����, ������������� �\n"
+"���������� ����� TEXTDOMAIN.  ���� ���� � ������������� ����������� ��\n"
+"������ � ����������� ��������, ����� ������� ������ ������� � �������\n"
+"���������� ����� TEXTDOMAINDIR.\n"
+"��� ������������� � ������ -s, ��������� ��������� ������ �� ���������\n"
+"������� `echo'.  �� ������ �������� ����������� ���������� �\n"
+"����������� �����, ��������� �� �������� �� ���������� ������.\n"
+"����������� ������� ������: %s\n"
 
 #: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Использование: %s [ПАРАМЕТР] [ДОМЕН] MSGID MSGID-PLURAL ЧИСЛО\n"
+msgstr "�������������: %s [����] [�����] MSGID MSGID-PLURAL �����\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -278,8 +271,8 @@
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Отображает перевод текстового сообщения, грамматическая форма которого\n"
-"зависит от некоторого числа.\n"
+"���������� ������� ���������� ���������, �������������� ����� ��������\n"
+"������� �� ���������� �����.\n"
 
 #: src/ngettext.c:222
 #, c-format, no-wrap
@@ -293,15 +286,15 @@
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=ДОМЕН     использовать переведенные сообщения из ДОМЕНА\n"
-"  -e                     разрешить использование некоторых экранирующих\n"
-"                         последовательностей\n"
-"  -E                     (игнорируется для совместимости)\n"
-"  -h, --help             показать эту справку и выйти\n"
-"  -V, --version          показать информацию о версии и выйти\n"
-"  [ДОМЕН]                найти перевод сообщения в указанном ДОМЕНЕ\n"
-"  MSGID MSGID-PLURAL     перевести MSGID (ед. число) / MSGID-PLURAL (мн. число)\n"
-"  ЧИСЛО                  выбрать ед./мн. число на основе этого значения\n"
+"  -d, --domain=�����     ������������ ������������ ��������� �� ������\n"
+"  -e                     ��������� ������������� ��������� escape-\n"
+"                         -�������������������\n"
+"  -E                     (������������ ��� �������������)\n"
+"  -h, --help             �������� ��� ������� � �����\n"
+"  -V, --version          �������� ���������� � ������ � �����\n"
+"  [�����]                ����� ������� ��������� � ��������� ������\n"
+"  MSGID MSGID-PLURAL     ��������� MSGID (��. �����) / MSGID-PLURAL (��. �����)\n"
+"  �����                  ������� ��./��. ����� �� ������ ����� ��������\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -312,14 +305,14 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Если не задан параметр ДОМЕН, то домен определяется из\n"
-"переменной окружения TEXTDOMAIN. Если каталог сообщений не\n"
-"найден в стандартном каталоге, можно указать другой каталог с помощью\n"
-"переменной окружения TEXTDOMAINDIR.\n"
-"Стандартный каталог поиска: %s\n"
+"���� �� ����� �������� �����, ������������ �����, ������������� �\n"
+"���������� ����� TEXTDOMAIN.  ���� ���� � ������������� ����������� ��\n"
+"������ � ����������� ��������, ����� ������� ������ ������� � �������\n"
+"���������� ����� TEXTDOMAINDIR.\n"
+"����������� ������� ������: %s\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: недопустимый ключ -- %c\n"
+#~ msgstr "%s: ������������ ���� -- %c\n"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -329,7 +322,7 @@
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Это свободная программа; подробности об условиях распространения "
-#~ "смотрите\n"
-#~ "в исходном тексте.  Мы НЕ предоставляем гарантий; даже гарантий\n"
-#~ "КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ.\n"
+#~ "��� ��������� ���������; ����������� �� �������� ��������������� "
+#~ "��������\n"
+#~ "� �������� ������.  �� �� ������������� ��������; ���� ��������\n"
+#~ "������������ �������� ��� ����������� ��� ���������� ����.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/sk.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/sk.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/sk.po gettext-0.18.1.1/gettext-runtime/po/sk.po
--- gettext-0.19.3/gettext-runtime/po/sk.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/sk.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,15 +1,15 @@
 # Slovak translations for GNU gettext-runtime package.
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2007, 2008, 2010, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2007, 2008, 2010 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, 2007, 2008, 2010, 2013.
+# Marcel Telka <marcel@telka.sk>, 2001, 2002, 2003, 2004, 2007, 2008, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-10-02 06:40+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-10 14:03+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
@@ -22,62 +22,62 @@
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: voľba '%s' nie je jednoznačná; možnosti:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: voľba '%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: voľba '--%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba '%c%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: voľba '--%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznáma voľba '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznáma voľba '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje parameter -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: voľba '-W %s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
@@ -122,8 +122,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 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"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -255,7 +255,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -263,7 +263,7 @@
 "Ak nie je zadaný parameter DOMÉNA, doména bude prevzatá z premennej prostredia\n"
 "TEXTDOMAIN. Ak sa katalóg správ nenachádza v obvyklom adresári, iný adresár\n"
 "môže byť určený obsahom premennej prostredia TEXTDOMAINDIR.\n"
-"Ak je program použitý s voľbou -s, bude sa správať ako príkaz 'echo'.\n"
+"Ak je program použitý s voľbou -s, bude sa správať ako príkaz `echo'.\n"
 "Nevypíše však svoje parametre na štandardný výstup. Namiesto toho správy,\n"
 "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"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/sl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/sl.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/sl.po gettext-0.18.1.1/gettext-runtime/po/sl.po
--- gettext-0.19.3/gettext-runtime/po/sl.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/sl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,17 +1,16 @@
-# -*- mode:po; coding:utf-8; -*- Slovenian messages for GNU gettext-runtime
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2005, 2006, 2007, 2011, 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2002, 2005-2007, 2011, 2013.
+# -*- mode:po; coding:utf-8; -*- Slovenian messages for GNU gettext package
+# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999-2002, 2005-2007.
 #
-# $Id: gettext-runtime-0.18.2.sl.po,v 1.2 2013/03/07 22:03:55 peterlin Exp $
+# $Id: gettext-runtime-0.16.2-pre5.sl.po,v 1.2 2007/10/16 07:39:06 peterlin Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-03-07 23:03+0100\n"
-"Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-16 09:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
@@ -24,65 +23,65 @@
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: izbira '%s ni enopomenska; možnosti so:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: izbira »%s« je dvoumna\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: izbira '--%s' ne dovoljuje argumenta\n"
+msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: izbira '%c%s' ne dovoljuje argumenta\n"
+msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: izbira '--%s' zahteva argument\n"
+msgstr "%s: izbira »%s« zahteva argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neprepoznana izbira '--%s'\n"
+msgstr "%s: neprepoznana izbira »--%s«\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neprepoznana izbira '%c%s'\n"
+msgstr "%s: neprepoznana izbira »%c%s«\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neveljavna izbira -- '%c'\n"
+msgstr "%s: neveljavna izbira -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: izbira zahteva argument -- '%c'\n"
+msgstr "%s: izbira zahteva argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: izbira '-W %s' ni enopomenska\n"
+msgstr "%s: izbira »-W %s« je dvoumna\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: izbira '-W %s' ne dovoljuje argumenta\n"
+msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: izbira '-W %s' zahteva argument\n"
+msgstr "%s: izbira »%s« zahteva argument\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -124,7 +123,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
 
 #: src/envsubst.c:176
@@ -250,7 +249,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/sr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/sr.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/sr.po gettext-0.18.1.1/gettext-runtime/po/sr.po
--- gettext-0.19.3/gettext-runtime/po/sr.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/sr.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,91 +1,90 @@
 # Serbian translation of gettext-runtime
-# Copyright (C) 2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # Danilo Segan <dsegan@gmx.net>, 2003.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2013.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-10-03 09:12+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <gnu@prevod.org>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2003-11-18 23:48+0100\n"
+"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
+"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"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "грешка при упису"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опција „%s“ је нејасна; могућности:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: опција „%s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+msgstr "%s: опција „--%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
+msgstr "%s: опција „%c%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: опција „--%s“ захтева аргумент\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непрепознатљива опција „--%s“\n"
+msgstr "%s: непозната опција „--%s“\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непрепознатљива опција „%c%s“\n"
+msgstr "%s: непозната опција „%c%s“\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: неисправна опција —— „%c“\n"
+msgstr "%s: неисправна опција -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: опција захтева аргумент —— „%c“\n"
+msgstr "%s: опција захтева аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ је нејасна\n"
+msgstr "%s: опција „-W %s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опција „-W %s“ захтева аргумент\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "меморија је потрошена"
+msgstr "меморија исцрпљена"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -95,10 +94,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Ауторска права (C) %s Задужбина слободног софтвера, Инк.\n"
-"Лиценца ОЈЛв3+: ГНУ ОЈЛ издање 3 или касније <http://gnu.org/licenses/gpl.html>.\n"
-"Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
-"Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
 
 #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
 #, c-format
@@ -108,7 +103,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Бруно Хејбл"
+msgstr ""
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
@@ -122,7 +117,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
 
 #: src/envsubst.c:176
@@ -143,7 +138,7 @@
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             исписује променљиве из ФОРМАТА-ЉУСКЕ\n"
+msgstr "  -v, --variables             исписује променљиве из ФОРМАТ-ЉУСКЕ\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
@@ -153,12 +148,12 @@
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  приказује ову помоћ и излази\n"
+msgstr "  -h, --help                  прикажи ову помоћ и изађи\n"
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               исписује податке о издању и излази\n"
+msgstr "  -V, --version               испиши податке о издању и изађи\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -170,7 +165,7 @@
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"При обичном раду, стандардни улаз се умножава на стандардни излаз, уз замену\n"
+"При обичном раду, стандардни улаз се копира на стандардни излаз, уз замену\n"
 "променљивих из окружења облика $ПРОМЕНЉИВА или ${ПРОМЕНЉИВА} одговарајућим\n"
 "вредностима. Ако је дат ФОРМАТ-ЉУСКЕ, само оне променљиве које су у њему\n"
 "наведене се замењују; иначе, све променљиве окружења наведене у стандардном\n"
@@ -182,8 +177,8 @@
 "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 ""
-"Када се користи „--variables“, занемарује се стандардни улаз, а излаз се састоји \n"
-"из променљивих окружења које се помињу у ФОРМАТУ-ЉУСКЕ, једна променљива по реду.\n"
+"Када се користи --variables, занемарује се стандардни улаз, а излаз се састоји \n"
+"из променљивих окружења које се помињу у ФОРМАТ-ЉУСКЕ, једна променљива по реду.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -191,7 +186,7 @@
 #. bugs (typically your translation team's web or email address).
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Пријавите грешке на <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
@@ -205,7 +200,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr "Улрих Дрепер"
+msgstr ""
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -213,13 +208,13 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Употреба: %s [ОПЦИЈА] [[ДОМЕН ТЕКСТА] МСГИД]\n"
-"или:      %s [ОПЦИЈА] -s [МСГИД]...\n"
+"Употреба: %s [ОПЦИЈА] [[ДОМЕН ТЕКСТА] MSGID]\n"
+"или:      %s [ОПЦИЈА] -s [MSGID]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Приказује превод текстуалне поруке на матерњем језику.\n"
+msgstr "Прикажи превод текстуалне поруке у природном језику.\n"
 
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -234,12 +229,12 @@
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
 "  -d, --domain=ДОМЕНТЕКСТА  користи преведене поруке из ДОМЕНТЕКСТА\n"
-"  -e                        укључује употребу неких нарочитих низова\n"
+"  -e                        укључи употребу неких нарочитих низова\n"
 "  -E                        (занемарено ради сагласности)\n"
-"  -h, --help                приказује ову помоћ и излази\n"
-"  -n                        одбацује пратећи знак за нови ред\n"
-"  -V, --version             приказује податке о издању и излази\n"
-"  [ДОМЕНТЕКСТА] МСГИД       користи преведену поруку за МСГИД из \n"
+"  -h, --help                прикажи ову помоћ па изађи\n"
+"  -n                        одбаци пратећи знак за нови ред\n"
+"  -V, --version             прикажи податке о издању па изађи\n"
+"  [ДОМЕНТЕКСТА] MSGID       користи преведену поруку за MSGID из \n"
 "                            ДОМЕНТЕКСТА\n"
 
 #: src/gettext.c:264
@@ -249,24 +244,24 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
 "Уколико није дат параметар ДОМЕНТЕКСТА, домен се одређује на основу \n"
-"променљиве окружења ДОМЕНТЕКСТА.  Уколико не може да нађе каталог порука \n"
+"променљиве окружења TEXTDOMAIN.  Уколико не може да нађе каталог порука \n"
 "у обичном директоријуму, други директоријум се може навести помоћу \n"
-"променљиве окружења ДИРДОМЕНТЕКСТА.\n"
+"променљиве окружења TEXTDOMAINDIR.\n"
 "Када се користи уз опцију -s, програм се понаша као „echo“ наредба.\n"
 "Међутим, он не пребацује само своје аргументе на излаз. Уместо тога, поруке \n"
 "које постоје у изабраном каталогу се преводе.\n"
-"Уобичајени директоријум за тражење је: %s\n"
+"Уобичајени директоријум за тражење: %s\n"
 
 #: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Употреба: %s [ОПЦИЈА] [ДОМЕНТЕКСТА] МСГИД БРОЈ МСГИД-МНОЖИНА\n"
+msgstr "Употреба: %s [ОПЦИЈА] [ДОМЕНТЕКСТА] MSGID MSGID-МНОЖИНА БРОЈ\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -274,7 +269,7 @@
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Приказује превод на матерњем језику за текстуалну поруку чији \n"
+"Прикажи превод у природном језику за текстуалну поруку чији \n"
 "облик зависи од броја.\n"
 
 #: src/ngettext.c:222
@@ -290,14 +285,14 @@
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
 "  -d, --domain=ДОМЕНТЕКСТА  користи преведене поруке из ДОМЕНТЕКСТА\n"
-"  -e                        укључује употребу неких нарочитих низова\n"
+"  -e                        укључи употребу неких нарочитих низова\n"
 "  -E                        (занемарено ради сагласности)\n"
-"  -h, --help                приказује ову помоћ и излази\n"
-"  -n                        одбацује пратећи знак за нови ред\n"
-"  -V, --version             приказује податке о издању и излази\n"
-"  [ДОМЕНТЕКСТА]             довлачи преведену поруку из ДОМЕНТЕКСТА\n"
-"  МСГИД МСГИД-МНОЖИНА       преводи облик једнине/множине\n"
-"  БРОЈ                      бира облик једнине/множине према овој вредности\n"
+"  -h, --help                прикажи ову помоћ па изађи\n"
+"  -n                        одбаци пратећи знак за нови ред\n"
+"  -V, --version             прикажи податке о издању па изађи\n"
+"  [ДОМЕНТЕКСТА]             користи преведену поруку из ДОМЕНТЕКСТА\n"
+"  MSGID MSGID-МНОЖИНА       преведи облик једнине/множине\n"
+"  БРОЈ                      изабери облик једнине/множине према овој вредности\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -309,7 +304,22 @@
 "Standard search directory: %s\n"
 msgstr ""
 "Уколико није дат параметар ДОМЕНТЕКСТА, домен се одређује на основу \n"
-"променљиве окружења ДОМЕНТЕКСТА.  Уколико не може да нађе каталог порука \n"
+"променљиве окружења TEXTDOMAIN.  Уколико не може да нађе каталог порука \n"
 "у обичном директоријуму, други директоријум се може навести помоћу \n"
-"променљиве окружења ДИРДОМЕНТЕКСТА.\n"
-"Уобичајени директоријум за тражење је: %s\n"
+"променљиве окружења TEXTDOMAINDIR.\n"
+"Уобичајени директоријум за тражење: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неисправна опција %c\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Сва права задржана © %s Free Software Foundation, Inc.\n"
+#~ "Ово је слободан софтвер; погледајте изворни код за услове умножавања. "
+#~ "НЕМА\n"
+#~ "гаранције; чак ни за употребљивост или одређену намену.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/sv.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/sv.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/sv.po gettext-0.18.1.1/gettext-runtime/po/sv.po
--- gettext-0.19.3/gettext-runtime/po/sv.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/sv.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,14 +1,15 @@
 # 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 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
+# Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010
+# Revision: 1.14
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-03-10 16:05+0100\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-14 12:44+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -21,62 +22,62 @@
 msgid "write error"
 msgstr "skrivfel"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan \"%s\" är tvetydig; alternativ:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: flaggan \"%s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flaggan \"%s\" kräver ett argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
@@ -121,7 +122,7 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
 #: src/envsubst.c:176
@@ -251,7 +252,7 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/tr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/tr.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/tr.po gettext-0.18.1.1/gettext-runtime/po/tr.po
--- gettext-0.19.3/gettext-runtime/po/tr.po	2014-10-16 06:10:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/tr.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
 "PO-Revision-Date: 2006-07-01 08:58+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -21,62 +21,62 @@
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
@@ -116,8 +116,8 @@
 msgstr "argümanlar eksik"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
 
 #: src/envsubst.c:176
@@ -241,13 +241,13 @@
 "  [PAKET] MSGID         PAKET.mo dosyasından MSGID ile ilişkili çeviriyi alır\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/uk.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/uk.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/uk.po gettext-0.18.1.1/gettext-runtime/po/uk.po
--- gettext-0.19.3/gettext-runtime/po/uk.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/uk.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,87 +1,84 @@
 # Ukrainian translation to gettext-runtime
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
+# This file is distributed under the same license as the gettext-runtime package.
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-02-26 22:34+0200\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-07-05 17:30+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: параметр «%s» не є однозначним. Можливі варіанти:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: неоднозначний параметр `%s'\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n"
+msgstr "%s: параметр `--%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «%c%s» не передбачено\n"
+msgstr "%s: параметр `%c%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: до параметра «--%s» слід додати аргумент\n"
+msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: невідомий параметр «--%s»\n"
+msgstr "%s: нерозпізнаний параметр `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: невідомий параметр «%c%s»\n"
+msgstr "%s: нерозпізнаний параметр `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: некоректний параметр — «%c»\n"
+msgstr "%s: неправильний параметр -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: до параметра слід додати аргумент — «%c»\n"
+msgstr "%s: параметр %c має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: параметр «-W %s» не є однозначним\n"
+msgstr "%s: неоднозначний параметр `-W %s'\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n"
+msgstr "%s: параметр `-W %s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
+msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -96,10 +93,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Авторські права належать Free Software Foundation, Inc., %s\n"
-"Умови ліцензування викладено у GPLv3+: GNU GPL версії 3 або новішій, <http://gnuorg/licenses/gpl.html>\n"
-"Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати його.\n"
-"Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
 
 #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
 #, c-format
@@ -123,8 +116,8 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Віддайте команду «%s --help», щоб дізнатися більше.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Спробуйте `%s --help' для отримання докладнішого опису.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -134,7 +127,7 @@
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Замінює значення змінних середовища.\n"
+msgstr "Замінює значення змінних оточення.\n"
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
@@ -172,10 +165,10 @@
 "standard input are substituted.\n"
 msgstr ""
 "У звичайному режимі роботи, стандартний ввід копіюється на стандартний вивід,\n"
-"де посилання на змінні середовища у формі $VARIABLE або ${VARIABLE}, \n"
+"де посилання на змінні оточення у формі $VARIABLE або ${VARIABLE}, \n"
 "замінюються відповідними значеннями. Якщо вказано SHELL-FORMAT,\n"
 "будуть замінюватись лише змінні, що вказані у SHELL-FORMAT; у іншому\n"
-"випадку будуть замінюватись усі змінні середовища, що зустрічаються у\n"
+"випадку будуть замінюватись усі змінні оточення, що зустрічаються у\n"
 "стандартному вводі.\n"
 
 #: src/envsubst.c:211
@@ -185,7 +178,7 @@
 "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
 "При використанні --variables, стандартний ввід ігнорується, а вивід\n"
-"складається зі змінних середовища, які вказані у SHELL-FORMAT, по одній на рядок.\n"
+"складається зі змінних оточення, які вказані у SHELL-FORMAT, по одній на рядок.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -251,17 +244,17 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
 "Якщо не вказаний параметр ДОМЕН_ТЕКСТУ, використовується домен, встановлений\n"
-"у змінній середовища TEXTDOMAIN. Якщо файл з перекладеними повідомленнями\n"
+"у змінній оточення TEXTDOMAIN. Якщо файл з перекладеними повідомленнями\n"
 "відсутній у типовому каталозі, можна вказати інший каталог за допомогою\n"
-"змінної середовища TEXTDOMAINDIR.\n"
+"змінної оточення TEXTDOMAINDIR.\n"
 "При використанні з ключем -s, поведінка програми схожа на поведінку програми\n"
-"«echo». Але замість простого копіювання аргументів у стандартний вивід,\n"
+"`echo'. Але замість простого копіювання аргументів у стандартний вивід,\n"
 "виводяться їх переклади з вказаного домену.\n"
 "Стандартний каталог пошуку: %s\n"
 
@@ -311,9 +304,9 @@
 "Standard search directory: %s\n"
 msgstr ""
 "Якщо параметр ДОМЕН_ТЕКСТУ не вказаний, використовується домен, визначений у\n"
-"змінній середовища TEXTDOMAIN. Якщо файл з перекладеними повідомленнями\n"
+"змінній оточення TEXTDOMAIN. Якщо файл з перекладеними повідомленнями\n"
 "відсутній у стандартному каталозі, можна вказати інший каталог за допомогою\n"
-"змінної середовища TEXTDOMAINDIR.\n"
+"змінної оточення TEXTDOMAINDIR.\n"
 "Стандартний каталог пошуку: %s\n"
 
 #~ msgid "%s: illegal option -- %c\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/vi.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/vi.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/vi.po gettext-0.18.1.1/gettext-runtime/po/vi.po
--- gettext-0.19.3/gettext-runtime/po/vi.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/vi.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,94 +1,91 @@
 # Vietnamese Translation for Gettext Runtime.
-# Copyright © 2013 Free Software Foundation, Inc.
+# Copyright © 2010 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-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-04-15 08:11+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-13 18:48+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: tùy chọn « %s » còn mơ hồ\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “--%s” không cho phép đối số\n"
+msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “%c%s” không cho phép có đối số\n"
+msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tùy chọn “--%s” yêu cầu một đối số\n"
+msgstr "%s: tùy chọn « --%s » yêu cầu một đối số\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: không nhận ra tùy chọn “--%s”\n"
+msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
+msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: tùy chọn không hợp lệ -- “%c”\n"
+msgstr "%s: tùy chọn không hợp lệ -- « %c »\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: tùy chọn yêu cầu một đối số -- “%c”\n"
+msgstr "%s: tùy chọn yêu cầu một đối số -- « %c »\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n"
+msgstr "%s: tùy chọn « -W %s » còn mơ hồ\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “-W %s” không cho phép đối số\n"
+msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
+msgstr "%s: tùy chọn « -W %s » yêu cầu một đối số\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "hết bộ nhớ"
+msgstr "cạn bộ nhớ"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -100,13 +97,13 @@
 msgstr ""
 "Tác quyền © %s Tổ chức Phần mềm Tự do.\n"
 "Giấy Phép Công Cộng GNU (GPL), phiên bản 3 hay sau <http://gnu.org/licenses/gpl.html>\n"
-"Đây là phần mềm tự do: bạn có quyền thay đổi và phát hành lại nó.\n"
+"Đâ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:139 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Viết bởi %s.\n"
+msgstr "Tác giả: %s.\n"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
@@ -126,13 +123,13 @@
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Hãy thử lệnh “%s --help” (trợ giúp) để xem thông tin thêm.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Hãy thử chạy câu lệnh « %s --help » để xem thêm thông tin.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Cách dùng: %s [TÙY-CHỌN] [ĐỊNH-DẠNG-HỆ-VỎ]\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN] [ĐỊNH_DẠNG_TRÌNH_BAO)]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
@@ -147,7 +144,7 @@
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr " -v, --variables              hiển thị những biến phát sinh theo ĐỊNH-DẠNG-HỆ-VỎ\n"
+msgstr " -v, --variables    xuất những biến xảy ra theo ĐỊNH DẠNG TRÌNH BAO\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
@@ -157,12 +154,12 @@
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  hiển thị trợ giúp này rồi thoát\n"
+msgstr "  -h, --help                  hiện trợ giúp này, sau đó thoát\n"
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               hiển thị các thông tin về phiên bản rồi thoát\n"
+msgstr "  -V, --version               xuất thông tin về phiên bản, sau đó thoát\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -176,8 +173,8 @@
 msgstr ""
 "Trong chế độ thao tác bình thường, đầu vào tiêu chuẩn được sao chép\n"
 "vào đầu ra tiêu chuẩn, với tham chiếu đến biến môi trường\n"
-"có dạng “$BIẾN” hay “${BIẾN}” được thay thế bằng giá trị tương ứng.\n"
-"Nếu đưa ra ĐỊNH-DẠNG-HỆ-VỎ thì chỉ thay thế những biến môi trường\n"
+"có dạng « $BIẾN » hay « ${BIẾN} » được thay thế bằng giá trị tương ứng.\n"
+"Nếu đưa ra ĐỊNH DẠNG TRÌNH BAO thì chỉ thay thế những biến môi trường\n"
 "được tham chiếu theo định dạng trình bao đó, không thì thay thế tất cả các\n"
 "tham chiếu biến môi trường xảy ra trong đầu vào tiêu chuẩn.\n"
 
@@ -187,8 +184,8 @@
 "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 ""
-"Khi chọn “--variables” (biến) được dùng thì bỏ qua đầu vào tiêu chuẩn,\n"
-"và kết xuất là những biến môi trường được tham chiếu theo ĐỊNH-DẠNG-HỆ-VỎ\n"
+"Lập tuỳ chọn « --variables » (biến) thì bỏ qua đầu vào tiêu chuẩn,\n"
+"và kết xuất là những biến môi trường được tham chiếu theo ĐỊNH DẠNG TRÌNH BAO\n"
 "(mỗi dòng một biến).\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
@@ -197,15 +194,12 @@
 #. bugs (typically your translation team's web or email address).
 #: src/envsubst.c:219 src/gettext.c:279 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"
-"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi."
-"html>.\n"
+msgstr "Hãy thông báo lỗi nào cho <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "gặp lỗi khi đọc “%s”"
+msgstr "gặp lỗi khi đọc « %s »"
 
 #: src/envsubst.c:443
 msgid "standard input"
@@ -223,14 +217,14 @@
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Cách dùng: %s [TÙY_CHỌN] [[MIỀN_VĂN_BẢN] MSGID]\n"
-"      hay: %s [TÙY_CHỌN] -s [MSGID]...\n"
+"Sử dụng: %s [TÙY_CHỌN] [[MIỀN_VĂN_BẢN] MSGID]\n"
+"hay:    %s [TÙY_CHỌN] -s [MSGID]...\n"
 
 # Trong văn cảnh này, ngôn ngữ "native" của ai?
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Hiển thị bản dịch ngôn ngữ mẹ đẻ của một chuỗi kiểu văn bản.\n"
+msgstr "Hiển thị bản dịch ngôn ngữ mẹ đẻ của một thông điệp thuộc văn bản.\n"
 
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -244,14 +238,14 @@
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=MIỀN_VĂN_BẢN lấy các chuỗi đã dịch từ miền này\n"
-"  -e                        cho phép mở rộng một số kiểu thoát chuỗi\n"
+"  -d, --domain=MIỀN_VAN_BẢN   lấy các thông điệp đã dịch từ miền này\n"
+"  -e                        bật mở rộng một số dãy thoát\n"
 "  -E                        (bị bỏ qua để tương thích)\n"
-"  -h, --help                hiện trợ giúp này rồi thoát\n"
-"  -n                        thu hồi ký tự dòng mới theo sau\n"
-"  -V, --version             hiện thông tin phiên bản rồi thoát\n"
-"  [MIỀN_VĂN_BẢN] MSGID      lấy chuỗi đã dịch tương ứng với MSGID\n"
-"                            từ MIỀN_VĂN_BẢN\n"
+"  -h, --help           \thiện _trợ giúp_ này rồi thoát\n"
+"  -n                        thu hồi ký tự dòng _mới_ theo sau\n"
+"  -V, --version     \thiện thông tin _phiên bản_ rồi thoát\n"
+"  [MIỀN_VAN_BẢN] MSGID        lấy thông điệp đã dịch tương ứng với MSGID\n"
+"\ttừ MIỀN_VAN_BẢN\n"
 
 #: src/gettext.c:264
 #, c-format, no-wrap
@@ -260,25 +254,25 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Tham số MIỀN_VĂN_BẢN không đưa ra thì nó được sẽ được lấy\n"
+"Tham số MIỀN_VAN_BẢN không đưa ra thì miền được quyết định\n"
 "từ biến môi trường TEXTDOMAIN (miền văn bản). Nếu không tìm thấy\n"
-"dữ liệu bản dịch trong thư mục bình thường, vị trí đặt khác đi có thể được\n"
-"chỉ định bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
-"Khi dùng với tùy chọn “-s”, chương trình này ứng xử giống như\n"
-"lệnh “echo”. Nhưng nó không đơn giản sao chép các đối số của nó\n"
-"sang đầu ra tiêu chuẩn. Nó thay thế những chuỗi đã tìm trong bản dịch\n"
-"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"
+"phân loại thông điệp trong thư mục bình thường, vị trí khác có thể được\n"
+"xác định bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
+"Khi dùng với tùy chọn « -s », chương trình này ứng xử giống như\n"
+"lệnh « echo ». Nhưng mà nó không phải đơn giản sao chép các đối số của nó\n"
+"sang đầu ra tiêu chuẩn. Thay thế những thông điệp đã tìm trong phân loại\n"
+"được chọn có được dịch.\n"
+"Thư mục tìm kiếm chuẩn: %s\n"
 
 #: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Sử dụng: %s [TÙY_CHỌN] [MIỀN_VĂN_BẢN] MSGID MSGID-NHIỀU SỐ_ĐẾM\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN] [MIỀN_VAN_BẢN] MSGID MSGID-NHIỀU SỐ_ĐẾM\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -286,7 +280,7 @@
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 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"
+"Hiển thị bản dịch ngôn ngữ mẹ đẻ của thông điệp thuộc văn bản có dạng\n"
 "ngữ pháp phụ thuộc vào con số.\n"
 
 #: src/ngettext.c:222
@@ -301,14 +295,14 @@
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=MIỀN_VĂN_BẢN lấy chuỗi đã dịch từ “miền” này\n"
-"  -e                        cho phép mở rộng một số kiểu thoát chuỗi\n"
+"  -d, --domain=MIỀN_VĂN_BẢN   lấy thông điệp đã dịch từ _miền_ này\n"
+"  -e                        bật _mở rộng_ một số dãy thoát\n"
 "  -E                        (bị bỏ qua để không tương thích)\n"
-"  -h, --help                hiện trợ giúp này rồi thoát\n"
-"  -V, --version             hiện thông tin phiên bản rồi thoát\n"
-"  [MIỀN_VĂN_BẢN]            lấy chuỗi đã dịch từ miền văn bản này\n"
-"  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"
+"  -h, --help          \thiện _trợ giúp_ này rồi thoát\n"
+"  -V, --version     \thiện thông tin _phiên bản_ rồi thoát\n"
+"  [MIỀN_VĂN_BẢN]    \tlấy thông điệp đã dịch từ miền văn bản này\n"
+"  MSGID MSGID-NHIỀU        dịch MSGID (số ít) / MSGID-NHIỀU (số nhiều)\n"
+"  SỐ_ĐẾM            \tchọn dạng số ít/số nhiều dựa vào giá trị này\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -319,8 +313,8 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Tham số MIỀN-VĂN-BẢN không đưa ra thì miền được quyết định\n"
+"Tham số MIỀN VĂN BẢN không đưa ra thì miền được quyết định\n"
 "từ biến môi trường TEXTDOMAIN (miền văn bản). Nếu không tìm thấy\n"
-"bản dịch trong thư mục bình thường, vị trí khác có thể được\n"
-"chỉ ra bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
-"Thư mục tìm quét tiêu chuẩn: %s\n"
+"phân loại thông điệp trong thư mục bình thường, vị trí khác có thể được\n"
+"xác định bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
+"Thư mục tìm kiếm chuẩn: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/zh_CN.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/zh_CN.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/zh_CN.po gettext-0.18.1.1/gettext-runtime/po/zh_CN.po
--- gettext-0.19.3/gettext-runtime/po/zh_CN.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/zh_CN.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,21 +1,21 @@
 # Simplified Chinese translation for gettext.
-# Copyright (C) 1998, 2001, 2002, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>, 1998.
 # Pofeng Lee <pofeng@linux.org.tw>, 2001-2002.
 # Abel Cheung <maddog@linux.org.hk>, 2002.
 # Liu Songhe <jackliu9999@263.net>, 2003.
 # LI Daobing <lidaobing@gmail.com>, 2008.
-# Aron Xu <happyaron.xu@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18\n"
+"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2010-07-11 15:29+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2008-08-09 20:25+0800\n"
+"Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -26,63 +26,63 @@
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：选项“%s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：选项“%s”需要一个参数\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：无效选项 ─ %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：选项需要一个参数 ─ %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：选项“-W %s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s：选项“%s”需要一个参数\n"
 
@@ -125,8 +125,8 @@
 msgstr "缺少了参数"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "试试“%s --help”来获取更多信息。\n"
 
 #: src/envsubst.c:176
@@ -244,13 +244,13 @@
 "  [文本域] MSGID            由<文本域>读取相应于 MSGID 的翻译消息\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/zh_HK.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/zh_HK.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/zh_HK.po gettext-0.18.1.1/gettext-runtime/po/zh_HK.po
--- gettext-0.19.3/gettext-runtime/po/zh_HK.po	2014-10-16 06:10:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/zh_HK.po	2010-06-06 12:49:57.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -24,62 +24,62 @@
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：選項「%s」不明確\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：選項「--%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：選項「%c%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：選項「%s」需要參數\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：無法識別選項「--%s」\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：無法識別選項「%c%s」\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：選項「-W %s」不明確\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：選項「-W %s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s：選項「%s」需要參數\n"
@@ -119,8 +119,8 @@
 msgstr "缺少了參數"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "如果想獲取額外資訊，請嘗試執行「%s --help」。\n"
 
 #: src/envsubst.c:176
@@ -238,13 +238,13 @@
 "  [文字領域] MSGID          由<文字領域>讀取相應於 MSGID 的翻譯訊息\n"
 
 #: src/gettext.c:264
-#, 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"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-runtime/po/zh_TW.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-runtime/po/zh_TW.gmo differ
diff -Nru gettext-0.19.3/gettext-runtime/po/zh_TW.po gettext-0.18.1.1/gettext-runtime/po/zh_TW.po
--- gettext-0.19.3/gettext-runtime/po/zh_TW.po	2014-10-16 06:04:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/po/zh_TW.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,18 +1,18 @@
 # Chinese (traditional) translation for gettext-runtime.
 # Copyright (C) 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Abel Cheung <abelcheung@gmail.com>, 2002, 2005.
+#
+# Based on gettext translation:
 # Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>, 1998.
 # Pofeng Lee <pofeng@linux.org.tw>, 2001-2002.
-# Abel Cheung <abelcheung@gmail.com>, 2002, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2006-07-05 17:21+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -24,65 +24,65 @@
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s：選項 %s 不明確；可能選項包括："
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s：選項「%s」不明確\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s：選項 --%s 不允許有引數\n"
+msgstr "%s：選項「--%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s：選項 %c%s 不允許有引數\n"
+msgstr "%s：選項「%c%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s：選項 %s 需要一個引數\n"
+msgstr "%s：選項「%s」需要參數\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s：無法識別選項 --%s\n"
+msgstr "%s：無法識別選項「--%s」\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s：無法識別選項 %c%s\n"
+msgstr "%s：無法識別選項「%c%s」\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s：選項需要一個引數 -- %c\n"
+msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s：選項 -W %s 不明確\n"
+msgstr "%s：選項「-W %s」不明確\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s：選項 -W %s 不允許有引數\n"
+msgstr "%s：選項「-W %s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項 -W %s 需要一個引數\n"
+msgstr "%s：選項「%s」需要參數\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -97,10 +97,6 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"著作權 (C) %s Free Software Foundation, Inc.\n"
-"使用授權 GPLv3+：GNU GPL 第三或之後版本 <http://gnu.org/licenses/gpl.html>\n"
-"這是自由軟體；請參考原始碼的著作權聲明。本軟體不提供任何保證，甚至不會包括\n"
-"可售性和適用於任何特定目的的保證。\n"
 
 #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
 #, c-format
@@ -115,17 +111,17 @@
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
-msgstr "引數過多"
+msgstr "參數過多"
 
 #: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
-msgstr "缺少引數"
+msgstr "缺少了參數"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "如果想獲取額外資訊，請嘗試執行 %s --help。\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "如果想獲取額外資訊，請嘗試執行「%s --help」。\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -248,22 +244,22 @@
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the 'echo' command.\n"
+"When used with the -s option the program behaves like the `echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"假如沒有指定 <文字領域> 參數，程式會根據 TEXTDOMAIN 環境變數來設定 <文字領域>。\n"
+"假如沒有指定<文字領域>參數，程式會根據 TEXTDOMAIN 環境變數來設定<文字領域>。\n"
 "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n"
 "的所在的位置。\n"
-"使用選項 -s 時本程式和 echo 指令類似。但不是直接顯示引數，\n"
+"使用選項「-s」時本程式和「echo」指令類似。但不是直接顯示參數，\n"
 "而是尋找訊息資料檔裡翻譯過的訊息。\n"
 "標準的搜尋目錄為：%s\n"
 
 #: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數量\n"
+msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數字\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -291,7 +287,7 @@
 "  -V, --version             顯示版本資訊並結束\n"
 "  [文字領域]                由<文字領域>讀取翻譯訊息\n"
 "  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
-"  數量                      根據 <數量> 來選擇單數或複數型態\n"
+"  數字                      根據<數字>來選擇單數或複數型態\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -302,7 +298,21 @@
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"假如沒有指定 <文字領域> 參數，程式會根據 TEXTDOMAIN 環境變數來設定文字領域。\n"
+"假如沒有指定<文字領域>參數，程式會根據 TEXTDOMAIN 環境變數來設定文字領域。\n"
 "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n"
 "的所在的位置。\n"
 "標準的搜尋目錄為：%s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：選項不合法 -- %c\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "版權所有 (C) %s Free Software Foundation, Inc.\n"
+#~ "這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n"
+#~ "可售性和適用於任何特定目的的保證。\n"
diff -Nru gettext-0.19.3/gettext-runtime/src/ChangeLog gettext-0.18.1.1/gettext-runtime/src/ChangeLog
--- gettext-0.19.3/gettext-runtime/src/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/src/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,41 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* envsubst.c (usage): Quote 'like this', not `like this', as per the
-	recent change to the GNU coding standards.
-	* gettext.c (usage): Likewise.
-	* ngettext.c (usage): Likewise.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* gettext.sh.in: Update copyright header.
-
-2011-05-12  Bruno Haible  <bruno@clisp.org>
-
-	* gettext.sh.in: Avoid reference to unset shell variable ZSH_VERSION.
-	Reported by Thorsten Kampe <thorsten@thorstenkampe.de>.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/src/envsubst.c gettext-0.18.1.1/gettext-runtime/src/envsubst.c
--- gettext-0.19.3/gettext-runtime/src/envsubst.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/src/envsubst.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitution of environment variables in shell format strings.
-   Copyright (C) 2003-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -168,7 +168,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-runtime/src/gettext.c gettext-0.18.1.1/gettext-runtime/src/gettext.c
--- gettext-0.19.3/gettext-runtime/src/gettext.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/src/gettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 #define _(str) gettext (str)
 
 /* If true, add newline after last string.  This makes only sense in
-   the 'echo' emulation mode.  */
+   the `echo' emulation mode.  */
 static bool add_newline;
 
 /* If true, expand escape sequences in strings before looking in the
@@ -145,7 +145,7 @@
     usage (EXIT_SUCCESS);
 
   /* We have two major modes: use following Uniforum spec and as
-     internationalized 'echo' program.  */
+     internationalized `echo' program.  */
   if (!do_shell)
     {
       /* We have to write a single strings translation to stdout.  */
@@ -201,7 +201,7 @@
             if (domaindir != NULL && domaindir[0] != '\0')
               bindtextdomain (domain, domaindir);
 
-          /* We have to simulate 'echo'.  All arguments are strings.  */
+          /* We have to simulate `echo'.  All arguments are strings.  */
           do
             {
               msgid = argv[optind++];
@@ -235,7 +235,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -266,7 +266,7 @@
 environment variable TEXTDOMAIN.  If the message catalog is not found in the\n\
 regular directory, another location can be specified with the environment\n\
 variable TEXTDOMAINDIR.\n\
-When used with the -s option the program behaves like the 'echo' command.\n\
+When used with the -s option the program behaves like the `echo' command.\n\
 But it does not simply copy its arguments to stdout.  Instead those messages\n\
 found in the selected catalog are translated.\n\
 Standard search directory: %s\n"),
diff -Nru gettext-0.19.3/gettext-runtime/src/gettext.sh.in gettext-0.18.1.1/gettext-runtime/src/gettext.sh.in
--- gettext-0.19.3/gettext-runtime/src/gettext.sh.in	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/src/gettext.sh.in	2010-06-06 12:49:57.000000000 +0000
@@ -1,19 +1,21 @@
 #! /bin/sh
 #
-# Copyright (C) 2003, 2005-2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2007 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
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 #
 
 # Find a way to echo strings without interpreting backslash.
@@ -38,7 +40,7 @@
 # $PREFIX/share/sh-scripts or $PREFIX/share/gettext. In order to not violate
 # the Filesystem Hierarchy Standard when doing so, this script is executable.
 # Therefore it needs to support the standard --help and --version.
-if test -z "${ZSH_VERSION+set}"; then
+if test -z "$ZSH_VERSION"; then
   # zsh is not POSIX compliant: By default, while ". gettext.sh" is executed,
   # it sets $0 to "gettext.sh", defeating the purpose of this test. But
   # fortunately we know that when running under zsh, this script is always
diff -Nru gettext-0.19.3/gettext-runtime/src/Makefile.in gettext-0.18.1.1/gettext-runtime/src/Makefile.in
--- gettext-0.19.3/gettext-runtime/src/Makefile.in	2014-10-16 06:01:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/src/Makefile.in	2010-06-06 20:11:38.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -16,54 +17,10 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -81,20 +38,17 @@
 bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) envsubst$(EXEEXT)
 @WOE32_TRUE@am__append_1 = gettext.res
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs \
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/gettext.sh.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -102,17 +56,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -121,9 +71,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -134,18 +83,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -159,11 +103,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -172,13 +114,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -206,10 +149,9 @@
 envsubst_LDADD = $(LDADD)
 @WOE32_TRUE@am__DEPENDENCIES_1 = gettext.res
 envsubst_DEPENDENCIES = ../gnulib-lib/libgrt.a $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 envsubst_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(envsubst_CFLAGS) \
 	$(CFLAGS) $(envsubst_LDFLAGS) $(LDFLAGS) -o $@
@@ -248,25 +190,7 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -276,47 +200,28 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(envsubst_SOURCES) $(gettext_SOURCES) $(ngettext_SOURCES)
 DIST_SOURCES = $(envsubst_SOURCES) $(gettext_SOURCES) \
 	$(ngettext_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -324,7 +229,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -353,9 +257,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -387,14 +289,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -402,25 +301,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -428,8 +318,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -442,20 +330,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -478,7 +358,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -497,29 +376,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -529,11 +399,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -541,7 +407,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -549,7 +414,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -565,13 +429,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -583,54 +445,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -638,49 +467,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -689,6 +502,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -696,9 +510,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -711,8 +523,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -733,37 +547,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -784,7 +587,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -792,13 +594,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -807,47 +610,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -862,7 +631,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -881,7 +649,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -898,7 +665,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -906,7 +672,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -914,8 +679,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -923,7 +686,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -931,8 +693,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -953,7 +713,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -970,17 +729,14 @@
 RELOCATABLE_SRC_DIR = $(top_srcdir)/gnulib-lib
 RELOCATABLE_STRIP = :
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -992,40 +748,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1040,36 +784,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -1077,12 +809,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1098,9 +827,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1121,8 +848,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1136,9 +861,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1173,9 +896,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1183,7 +906,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1267,19 +989,14 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -1300,8 +1017,7 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
+	      -e 's/$$/$(EXEEXT)/' `; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -1330,25 +1046,19 @@
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
 	  done; \
 	done; rm -f c$${pid}_.???; exit $$bad
-
-envsubst$(EXEEXT): $(envsubst_OBJECTS) $(envsubst_DEPENDENCIES) $(EXTRA_envsubst_DEPENDENCIES) 
+envsubst$(EXEEXT): $(envsubst_OBJECTS) $(envsubst_DEPENDENCIES) 
 	@rm -f envsubst$(EXEEXT)
 	$(AM_V_CCLD)$(envsubst_LINK) $(envsubst_OBJECTS) $(envsubst_LDADD) $(LIBS)
-
-gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) $(EXTRA_gettext_DEPENDENCIES) 
+gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) 
 	@rm -f gettext$(EXEEXT)
 	$(AM_V_CCLD)$(gettext_LINK) $(gettext_OBJECTS) $(gettext_LDADD) $(LIBS)
-
-ngettext$(EXEEXT): $(ngettext_OBJECTS) $(ngettext_DEPENDENCIES) $(EXTRA_ngettext_DEPENDENCIES) 
+ngettext$(EXEEXT): $(ngettext_OBJECTS) $(ngettext_DEPENDENCIES) 
 	@rm -f ngettext$(EXEEXT)
 	$(AM_V_CCLD)$(ngettext_LINK) $(ngettext_OBJECTS) $(ngettext_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -1376,7 +1086,9 @@
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 installcheck-binSCRIPTS: $(bin_SCRIPTS)
 	bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \
@@ -1400,31 +1112,40 @@
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
 envsubst-envsubst.o: envsubst.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(envsubst_CFLAGS) $(CFLAGS) -c -o envsubst-envsubst.o `test -f 'envsubst.c' || echo '$(srcdir)/'`envsubst.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(envsubst_CFLAGS) $(CFLAGS) -c -o envsubst-envsubst.o `test -f 'envsubst.c' || echo '$(srcdir)/'`envsubst.c
 
 envsubst-envsubst.obj: envsubst.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(envsubst_CFLAGS) $(CFLAGS) -c -o envsubst-envsubst.obj `if test -f 'envsubst.c'; then $(CYGPATH_W) 'envsubst.c'; else $(CYGPATH_W) '$(srcdir)/envsubst.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(envsubst_CFLAGS) $(CFLAGS) -c -o envsubst-envsubst.obj `if test -f 'envsubst.c'; then $(CYGPATH_W) 'envsubst.c'; else $(CYGPATH_W) '$(srcdir)/envsubst.c'; fi`
 
 gettext-gettext.o: gettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_CFLAGS) $(CFLAGS) -c -o gettext-gettext.o `test -f 'gettext.c' || echo '$(srcdir)/'`gettext.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_CFLAGS) $(CFLAGS) -c -o gettext-gettext.o `test -f 'gettext.c' || echo '$(srcdir)/'`gettext.c
 
 gettext-gettext.obj: gettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_CFLAGS) $(CFLAGS) -c -o gettext-gettext.obj `if test -f 'gettext.c'; then $(CYGPATH_W) 'gettext.c'; else $(CYGPATH_W) '$(srcdir)/gettext.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_CFLAGS) $(CFLAGS) -c -o gettext-gettext.obj `if test -f 'gettext.c'; then $(CYGPATH_W) 'gettext.c'; else $(CYGPATH_W) '$(srcdir)/gettext.c'; fi`
 
 ngettext-ngettext.o: ngettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ngettext_CFLAGS) $(CFLAGS) -c -o ngettext-ngettext.o `test -f 'ngettext.c' || echo '$(srcdir)/'`ngettext.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ngettext_CFLAGS) $(CFLAGS) -c -o ngettext-ngettext.o `test -f 'ngettext.c' || echo '$(srcdir)/'`ngettext.c
 
 ngettext-ngettext.obj: ngettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ngettext_CFLAGS) $(CFLAGS) -c -o ngettext-ngettext.obj `if test -f 'ngettext.c'; then $(CYGPATH_W) 'ngettext.c'; else $(CYGPATH_W) '$(srcdir)/ngettext.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ngettext_CFLAGS) $(CFLAGS) -c -o ngettext-ngettext.obj `if test -f 'ngettext.c'; then $(CYGPATH_W) 'ngettext.c'; else $(CYGPATH_W) '$(srcdir)/ngettext.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1432,15 +1153,26 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1452,11 +1184,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1465,21 +1201,6 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1531,15 +1252,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -1624,21 +1340,21 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am \
-	installcheck-binPROGRAMS installcheck-binSCRIPTS installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installcheck-binPROGRAMS \
+	installcheck-binSCRIPTS installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS
 
 @WOE32_TRUE@gettext.res : $(top_srcdir)/../windows/gettext.rc
 @WOE32_TRUE@	$(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff
diff -Nru gettext-0.19.3/gettext-runtime/src/ngettext.c gettext-0.18.1.1/gettext-runtime/src/ngettext.c
--- gettext-0.19.3/gettext-runtime/src/ngettext.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/src/ngettext.c	2010-06-06 12:49:57.000000000 +0000
@@ -204,7 +204,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-runtime/tests/ChangeLog gettext-0.18.1.1/gettext-runtime/tests/ChangeLog
--- gettext-0.19.3/gettext-runtime/tests/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/tests/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,80 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-04-22  Roumen Petrov  <bugtrack@roumenpetrov.info>  (tiny change)
-
-	build: Use Automake 'subdir-objects' option
-	* Makefile.am (AUTOMAKE_OPTIONS): Add 'subdir-objects'.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-17  Daiki Ueno  <ueno@unixuser.org>
-
-	test-lock: work around pthread-win32
-	* test-lock.c (gl_thread_self_pointer): Renamed from
-	gl_thread_self; all callers changed.  Work around pthread-win32.
-	(gl_thread_join): Add extra RETVALP argument; all callers changed.
-
-	test-lock: merge gnulib changes
-	2011-06-09  Bruno Haible  <bruno@clisp.org>
-	* test-lock.c: Use gl_thread_self_pointer instead of
-	gl_thread_self.
-
-	2010-03-25  Bruno Haible  <bruno@clisp.org>
-	Minor formatting changes.
-	* test-lock.c: Insert space before function argument list.
-	Reported by Jim Meyering.
-
-	2008-12-07  Bruno Haible  <bruno@clisp.org>
-	* test-lock.c (test_lock, test_rwlock, test_recursive_lock)
-	(test_once): Mark functions as static.
-
-	2008-09-30  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>
-		    Bruno Haible  <bruno@clisp.org>
-	* test-lock.c (test_lock, test_rwlock, test_recursive_lock)
-	(test_once): Pass an additional NULL argument to gl_thread_join.
-
-	2008-09-21  Bruno Haible  <bruno@clisp.org>
-	* test-lock.c (main): Tweak skip message.
-
-	2008-08-22  Eric Blake  <ebb9@byu.net>
-	test-lock: mention why a test is skipped
-	* test-lock.c (main) [!USE_*_THREADS]: Print why test is skipped.
-
-	2007-05-28  Eric Blake  <ebb9@byu.net>
-	Unconditionally include <config.h> in unit tests.
-	test-lock.c: Remove #ifdef HAVE_CONFIG_H.
-
-2012-02-05  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* test-lock.c: Spelling fixes.
-
-2012-01-06  Bruno Haible  <bruno@clisp.org>
-
-	Talk about "native Windows API", not "Woe32".
-	* test-lock.c (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS.
-	(TEST_WINDOWS_THREADS): Renamed from TEST_WIN32_THREADS.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* test-lock.c: Update copyright header.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-runtime/tests/Makefile.am gettext-0.18.1.1/gettext-runtime/tests/Makefile.am
--- gettext-0.19.3/gettext-runtime/tests/Makefile.am	2014-05-12 03:39:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/tests/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -16,7 +16,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
+AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests
 EXTRA_DIST =
 
 TESTS = test-lock
diff -Nru gettext-0.19.3/gettext-runtime/tests/Makefile.in gettext-0.18.1.1/gettext-runtime/tests/Makefile.in
--- gettext-0.19.3/gettext-runtime/tests/Makefile.in	2014-10-16 06:01:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/tests/Makefile.in	2010-06-06 20:11:38.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,54 +16,10 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -80,20 +37,16 @@
 TESTS = test-lock$(EXEEXT)
 noinst_PROGRAMS = test-lock$(EXEEXT)
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs \
-	$(top_srcdir)/../build-aux/test-driver ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
+	$(top_srcdir)/gnulib-m4/dos.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
@@ -101,17 +54,13 @@
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.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/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
-	$(top_srcdir)/gnulib-m4/inline.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -120,9 +69,8 @@
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
-	$(top_srcdir)/gnulib-m4/locale_h.m4 \
-	$(top_srcdir)/gnulib-m4/localename.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
+	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
@@ -133,18 +81,13 @@
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
@@ -158,11 +101,9 @@
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strnlen.m4 \
+	$(top_srcdir)/gnulib-m4/strtol.m4 \
 	$(top_srcdir)/gnulib-m4/strtoul.m4 \
-	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/unlocked-io.m4 \
@@ -171,13 +112,14 @@
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
-	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/ansi-c++.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
@@ -199,27 +141,13 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_test_lock_OBJECTS = test-lock.$(OBJEXT) ../intl/lock.$(OBJEXT) \
-	../intl/threadlib.$(OBJEXT)
+am_test_lock_OBJECTS = test-lock.$(OBJEXT) lock.$(OBJEXT) \
+	threadlib.$(OBJEXT)
 test_lock_OBJECTS = $(am_test_lock_OBJECTS)
 test_lock_DEPENDENCIES =
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -229,250 +157,42 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_lock_SOURCES)
 DIST_SOURCES = $(test_lock_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
+# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
+# then this fails; a conservative approach.  Of course do not redirect
+# stdout here, just stderr.
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=; \
+test "X$(AM_COLOR_TESTS)" != Xno \
+&& test "X$$TERM" != Xdumb \
+&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
+&& { \
+  red=''; \
+  grn=''; \
+  lgn=''; \
+  blu=''; \
+  std=''; \
 }
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../build-aux/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -480,7 +200,6 @@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -509,9 +228,7 @@
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -543,14 +260,11 @@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
-GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
@@ -558,25 +272,16 @@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -584,8 +289,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -598,20 +301,12 @@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -634,7 +329,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -653,29 +347,20 @@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@@ -685,11 +370,7 @@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@@ -697,7 +378,6 @@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -705,7 +385,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -721,13 +400,11 @@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -739,54 +416,21 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CSC = @HAVE_CSC@
@@ -794,49 +438,33 @@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
-HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -845,6 +473,7 @@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -852,9 +481,7 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -867,8 +494,10 @@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -889,37 +518,26 @@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -940,7 +558,6 @@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
-HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
@@ -948,13 +565,14 @@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
-HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -963,47 +581,13 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
-HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -1018,7 +602,6 @@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_EXPORTS_FLAGS = @INTL_EXPORTS_FLAGS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
@@ -1037,7 +620,6 @@
 LIBSCHED = @LIBSCHED@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
-LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
@@ -1054,7 +636,6 @@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -1062,7 +643,6 @@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -1070,8 +650,6 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
@@ -1079,7 +657,6 @@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -1087,8 +664,6 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
-NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
@@ -1109,7 +684,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
@@ -1124,17 +698,14 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1146,40 +717,28 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
-REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1194,36 +753,24 @@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -1231,12 +778,9 @@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1252,9 +796,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -1275,8 +817,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1290,9 +830,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1327,9 +865,9 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1337,7 +875,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1347,7 +884,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
+AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests
 EXTRA_DIST = 
 AM_CPPFLAGS = \
   -I.. \
@@ -1358,7 +895,7 @@
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -1398,31 +935,43 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-../intl/$(am__dirstamp):
-	@$(MKDIR_P) ../intl
-	@: > ../intl/$(am__dirstamp)
-../intl/lock.$(OBJEXT): ../intl/$(am__dirstamp)
-../intl/threadlib.$(OBJEXT): ../intl/$(am__dirstamp)
-
-test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) $(EXTRA_test_lock_DEPENDENCIES) 
+test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) 
 	@rm -f test-lock$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../intl/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
+
+lock.o: ../intl/lock.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lock.o `test -f '../intl/lock.c' || echo '$(srcdir)/'`../intl/lock.c
+
+lock.obj: ../intl/lock.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lock.obj `if test -f '../intl/lock.c'; then $(CYGPATH_W) '../intl/lock.c'; else $(CYGPATH_W) '$(srcdir)/../intl/lock.c'; fi`
+
+threadlib.o: ../intl/threadlib.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o threadlib.o `test -f '../intl/threadlib.c' || echo '$(srcdir)/'`../intl/threadlib.c
+
+threadlib.obj: ../intl/threadlib.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o threadlib.obj `if test -f '../intl/threadlib.c'; then $(CYGPATH_W) '../intl/threadlib.c'; else $(CYGPATH_W) '$(srcdir)/../intl/threadlib.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1430,15 +979,26 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1450,11 +1010,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1463,187 +1027,101 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
 	    else \
-	      color_start= color_end=; \
+	      skipped="($$skip tests were not run)"; \
 	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS:
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-test-lock.log: test-lock$(EXEEXT)
-	@p='test-lock$(EXEEXT)'; \
-	b='test-lock'; \
-	$(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.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1690,26 +1168,17 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../intl/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1785,19 +1254,19 @@
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	recheck tags tags-am uninstall uninstall-am
+	tags uninstall uninstall-am
 
 
 # Clean up after Solaris cc.
diff -Nru gettext-0.19.3/gettext-runtime/tests/test-lock.c gettext-0.18.1.1/gettext-runtime/tests/test-lock.c
--- gettext-0.19.3/gettext-runtime/tests/test-lock.c	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-runtime/tests/test-lock.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,24 +1,28 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2005 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
+#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
 
 #if USE_POSIX_THREADS
 # define TEST_POSIX_THREADS 1
@@ -29,8 +33,8 @@
 #if USE_PTH_THREADS
 # define TEST_PTH_THREADS 1
 #endif
-#if USE_WINDOWS_THREADS
-# define TEST_WINDOWS_THREADS 1
+#if USE_WIN32_THREADS
+# define TEST_WIN32_THREADS 1
 #endif
 
 /* Whether to enable locking.
@@ -69,7 +73,7 @@
 # undef USE_POSIX_THREADS
 # undef USE_SOLARIS_THREADS
 # undef USE_PTH_THREADS
-# undef USE_WINDOWS_THREADS
+# undef USE_WIN32_THREADS
 #endif
 #include "lock.h"
 
@@ -90,22 +94,19 @@
     abort ();
   return thread;
 }
-static inline void gl_thread_join (gl_thread_t thread, void **retvalp)
+static inline void gl_thread_join (gl_thread_t thread)
 {
-  if (pthread_join (thread, retvalp) != 0)
+  void *retval;
+  if (pthread_join (thread, &retval) != 0)
     abort ();
 }
 static inline void gl_thread_yield (void)
 {
   sched_yield ();
 }
-static inline void * gl_thread_self_pointer (void)
+static inline void * gl_thread_self (void)
 {
-# ifdef PTW32_VERSION
-  return pthread_self ().p;
-# else
   return (void *) pthread_self ();
-# endif
 }
 #endif
 #if TEST_PTH_THREADS
@@ -118,16 +119,16 @@
     abort ();
   return thread;
 }
-static inline void gl_thread_join (gl_thread_t thread, void **retvalp)
+static inline void gl_thread_join (gl_thread_t thread)
 {
-  if (!pth_join (thread, retvalp))
+  if (!pth_join (thread, NULL))
     abort ();
 }
 static inline void gl_thread_yield (void)
 {
   pth_yield (NULL);
 }
-static inline void * gl_thread_self_pointer (void)
+static inline void * gl_thread_self (void)
 {
   return pth_self ();
 }
@@ -142,21 +143,22 @@
     abort ();
   return thread;
 }
-static inline void gl_thread_join (gl_thread_t thread, void **retvalp)
+static inline void gl_thread_join (gl_thread_t thread)
 {
-  if (thr_join (thread, NULL, retvalp) != 0)
+  void *retval;
+  if (thr_join (thread, NULL, &retval) != 0)
     abort ();
 }
 static inline void gl_thread_yield (void)
 {
   thr_yield ();
 }
-static inline void * gl_thread_self_pointer (void)
+static inline void * gl_thread_self (void)
 {
   return (void *) thr_self ();
 }
 #endif
-#if TEST_WINDOWS_THREADS
+#if TEST_WIN32_THREADS
 # include <windows.h>
 typedef HANDLE gl_thread_t;
 /* Use a wrapper function, instead of adding WINAPI through a cast.  */
@@ -187,9 +189,8 @@
     return thread;
   }
 }
-static inline void gl_thread_join (gl_thread_t thread, void **retvalp)
+static inline void gl_thread_join (gl_thread_t thread)
 {
-  (void) retvalp;
   if (WaitForSingleObject (thread, INFINITE) == WAIT_FAILED)
     abort ();
   if (!CloseHandle (thread))
@@ -199,7 +200,7 @@
 {
   Sleep (0);
 }
-static inline void * gl_thread_self_pointer (void)
+static inline void * gl_thread_self (void)
 {
   return (void *) GetCurrentThreadId ();
 }
@@ -217,7 +218,7 @@
 static int
 random_account (void)
 {
-  return ((unsigned int) rand () >> 3) % ACCOUNT_COUNT;
+  return ((unsigned int) rand() >> 3) % ACCOUNT_COUNT;
 }
 
 static void
@@ -232,9 +233,6 @@
     abort ();
 }
 
-
-/* ------------------- Test normal (non-recursive) locks ------------------- */
-
 /* Test normal locks by having several bank accounts and several threads
    which shuffle around money between the accounts and another thread
    checking that all the money is still there.  */
@@ -250,30 +248,30 @@
     {
       int i1, i2, value;
 
-      dbgprintf ("Mutator %p before lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before lock\n", gl_thread_self ());
       gl_lock_lock (my_lock);
-      dbgprintf ("Mutator %p after  lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  lock\n", gl_thread_self ());
 
       i1 = random_account ();
       i2 = random_account ();
-      value = ((unsigned int) rand () >> 3) % 10;
+      value = ((unsigned int) rand() >> 3) % 10;
       account[i1] += value;
       account[i2] -= value;
 
-      dbgprintf ("Mutator %p before unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before unlock\n", gl_thread_self ());
       gl_lock_unlock (my_lock);
-      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self ());
 
-      dbgprintf ("Mutator %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before check lock\n", gl_thread_self ());
       gl_lock_lock (my_lock);
       check_accounts ();
       gl_lock_unlock (my_lock);
-      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Mutator %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -284,20 +282,20 @@
 {
   while (!lock_checker_done)
     {
-      dbgprintf ("Checker %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p before check lock\n", gl_thread_self ());
       gl_lock_lock (my_lock);
       check_accounts ();
       gl_lock_unlock (my_lock);
-      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Checker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Checker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
-static void
+void
 test_lock (void)
 {
   int i;
@@ -316,15 +314,12 @@
 
   /* Wait for the threads to terminate.  */
   for (i = 0; i < THREAD_COUNT; i++)
-    gl_thread_join (threads[i], NULL);
+    gl_thread_join (threads[i]);
   lock_checker_done = 1;
-  gl_thread_join (checkerthread, NULL);
+  gl_thread_join (checkerthread);
   check_accounts ();
 }
 
-
-/* ----------------- Test read-write (non-recursive) locks ----------------- */
-
 /* Test read-write locks by having several bank accounts and several threads
    which shuffle around money between the accounts and several other threads
    that check that all the money is still there.  */
@@ -340,24 +335,24 @@
     {
       int i1, i2, value;
 
-      dbgprintf ("Mutator %p before wrlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before wrlock\n", gl_thread_self ());
       gl_rwlock_wrlock (my_rwlock);
-      dbgprintf ("Mutator %p after  wrlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  wrlock\n", gl_thread_self ());
 
       i1 = random_account ();
       i2 = random_account ();
-      value = ((unsigned int) rand () >> 3) % 10;
+      value = ((unsigned int) rand() >> 3) % 10;
       account[i1] += value;
       account[i2] -= value;
 
-      dbgprintf ("Mutator %p before unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before unlock\n", gl_thread_self ());
       gl_rwlock_unlock (my_rwlock);
-      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Mutator %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -368,20 +363,20 @@
 {
   while (!rwlock_checker_done)
     {
-      dbgprintf ("Checker %p before check rdlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p before check rdlock\n", gl_thread_self ());
       gl_rwlock_rdlock (my_rwlock);
       check_accounts ();
       gl_rwlock_unlock (my_rwlock);
-      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Checker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Checker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
-static void
+void
 test_rwlock (void)
 {
   int i;
@@ -401,16 +396,13 @@
 
   /* Wait for the threads to terminate.  */
   for (i = 0; i < THREAD_COUNT; i++)
-    gl_thread_join (threads[i], NULL);
+    gl_thread_join (threads[i]);
   rwlock_checker_done = 1;
   for (i = 0; i < THREAD_COUNT; i++)
-    gl_thread_join (checkerthreads[i], NULL);
+    gl_thread_join (checkerthreads[i]);
   check_accounts ();
 }
 
-
-/* -------------------------- Test recursive locks -------------------------- */
-
 /* Test recursive locks by having several bank accounts and several threads
    which shuffle around money between the accounts (recursively) and another
    thread checking that all the money is still there.  */
@@ -422,23 +414,23 @@
 {
   int i1, i2, value;
 
-  dbgprintf ("Mutator %p before lock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p before lock\n", gl_thread_self ());
   gl_recursive_lock_lock (my_reclock);
-  dbgprintf ("Mutator %p after  lock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p after  lock\n", gl_thread_self ());
 
   i1 = random_account ();
   i2 = random_account ();
-  value = ((unsigned int) rand () >> 3) % 10;
+  value = ((unsigned int) rand() >> 3) % 10;
   account[i1] += value;
   account[i2] -= value;
 
   /* Recursive with probability 0.5.  */
-  if (((unsigned int) rand () >> 3) % 2)
+  if (((unsigned int) rand() >> 3) % 2)
     recshuffle ();
 
-  dbgprintf ("Mutator %p before unlock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p before unlock\n", gl_thread_self ());
   gl_recursive_lock_unlock (my_reclock);
-  dbgprintf ("Mutator %p after  unlock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p after  unlock\n", gl_thread_self ());
 }
 
 static void *
@@ -450,16 +442,16 @@
     {
       recshuffle ();
 
-      dbgprintf ("Mutator %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before check lock\n", gl_thread_self ());
       gl_recursive_lock_lock (my_reclock);
       check_accounts ();
       gl_recursive_lock_unlock (my_reclock);
-      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Mutator %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -470,20 +462,20 @@
 {
   while (!reclock_checker_done)
     {
-      dbgprintf ("Checker %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p before check lock\n", gl_thread_self ());
       gl_recursive_lock_lock (my_reclock);
       check_accounts ();
       gl_recursive_lock_unlock (my_reclock);
-      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Checker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Checker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
-static void
+void
 test_recursive_lock (void)
 {
   int i;
@@ -502,15 +494,12 @@
 
   /* Wait for the threads to terminate.  */
   for (i = 0; i < THREAD_COUNT; i++)
-    gl_thread_join (threads[i], NULL);
+    gl_thread_join (threads[i]);
   reclock_checker_done = 1;
-  gl_thread_join (checkerthread, NULL);
+  gl_thread_join (checkerthread);
   check_accounts ();
 }
 
-
-/* ------------------------ Test once-only execution ------------------------ */
-
 /* Test once-only execution by having several threads attempt to grab a
    once-only task simultaneously (triggered by releasing a read-write lock).  */
 
@@ -551,7 +540,7 @@
         break;
 
       dbgprintf ("Contender %p waiting for signal for round %d\n",
-                 gl_thread_self_pointer (), repeat);
+                 gl_thread_self (), repeat);
 #if ENABLE_LOCKING
       /* Wait for the signal to go.  */
       gl_rwlock_rdlock (fire_signal[repeat]);
@@ -563,7 +552,7 @@
         yield ();
 #endif
       dbgprintf ("Contender %p got the     signal for round %d\n",
-                 gl_thread_self_pointer (), repeat);
+                 gl_thread_self (), repeat);
 
       /* Contend for execution.  */
       gl_once (once_control, once_execute);
@@ -572,7 +561,7 @@
   return NULL;
 }
 
-static void
+void
 test_once (void)
 {
   int i, repeat;
@@ -602,7 +591,7 @@
   for (repeat = 0; repeat <= REPEAT_COUNT; repeat++)
     {
       /* Wait until every thread is ready.  */
-      dbgprintf ("Main thread before synchronizing for round %d\n", repeat);
+      dbgprintf ("Main thread before synchonizing for round %d\n", repeat);
       for (;;)
         {
           int ready_count = 0;
@@ -616,7 +605,7 @@
             break;
           yield ();
         }
-      dbgprintf ("Main thread after  synchronizing for round %d\n", repeat);
+      dbgprintf ("Main thread after  synchonizing for round %d\n", repeat);
 
       if (repeat > 0)
         {
@@ -654,12 +643,9 @@
 
   /* Wait for the threads to terminate.  */
   for (i = 0; i < THREAD_COUNT; i++)
-    gl_thread_join (threads[i], NULL);
+    gl_thread_join (threads[i]);
 }
 
-
-/* -------------------------------------------------------------------------- */
-
 int
 main ()
 {
@@ -696,12 +682,9 @@
 
 /* No multithreading available.  */
 
-#include <stdio.h>
-
 int
 main ()
 {
-  fputs ("Skipping test: multithreading not enabled\n", stderr);
   return 77;
 }
 
diff -Nru gettext-0.19.3/gettext-tools/aclocal.m4 gettext-0.18.1.1/gettext-tools/aclocal.m4
--- gettext-0.19.3/gettext-tools/aclocal.m4	2014-10-16 06:01:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/aclocal.m4	2010-06-06 20:12:15.000000000 +0000
@@ -1,26 +1,6656 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 52 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+_LT_REQUIRED_DARWIN_CHECKS
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# 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
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+    ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix[[4-9]]*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  :
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	fi
+	;;
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
+      output_verbose_link_cmd='echo'
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+      fi
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  freebsd[[12]]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  interix[[3-9]]*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc*)
+	# Intel C++
+	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      pgCC* | pgcpp*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	    ;;
+	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+	output_verbose_link_cmd='echo'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx*)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
+	fi
+	;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+      program t
+      end
+"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
+
+# 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
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc* | ecpc*)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
+      ;;
 
-# 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.
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +6662,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,22 +6681,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -85,7 +6715,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -111,19 +6741,22 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# 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.
 
+# serial 9
+
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -142,14 +6775,16 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# 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.
 
+# serial 10
 
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -159,7 +6794,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -172,13 +6807,12 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -186,9 +6820,8 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -227,16 +6860,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -245,16 +6878,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -302,7 +6935,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -312,39 +6945,34 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# 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.
 
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -357,7 +6985,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -369,19 +6997,21 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -399,7 +7029,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
+# is enabled.  FIXME.  This creates each `.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -407,23 +7037,32 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# 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.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 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.
 
+# serial 16
+
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -436,7 +7075,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -465,40 +7104,31 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -509,78 +7139,34 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
+
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -602,7 +7188,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -621,14 +7207,16 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST([install_sh])])
+AC_SUBST(install_sh)])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  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.
 
+# serial 2
+
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -642,12 +7230,15 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006  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.
 
+# serial 10
+
 # AM_PATH_LISPDIR
 # ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
@@ -659,8 +7250,7 @@
  AC_ARG_VAR([EMACS], [the Emacs editor command])
  AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path])
  AC_ARG_WITH([lispdir],
- [AS_HELP_STRING([--with-lispdir],
-                 [override the default lisp directory])],
+ [  --with-lispdir          override the default lisp directory],
  [ lispdir="$withval"
    AC_MSG_CHECKING([where .elc files should go])
    AC_MSG_RESULT([$lispdir])],
@@ -689,14 +7279,18 @@
 AC_SUBST([lispdir])
 ])# AM_PATH_LISPDIR
 
+AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR])
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  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.
 
+# serial 4
+
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -714,7 +7308,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -739,14 +7333,52 @@
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
+
+# serial 6
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
 
+# serial 6
+
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -754,10 +7386,11 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
+
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -770,35 +7403,63 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005, 2006  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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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.
 
+# serial 4
+
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -809,82 +7470,24 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 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.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2013 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.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# 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.
 
+# serial 5
+
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -895,40 +7498,32 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
    test "$[2]" = conftest.file
    )
 then
@@ -938,85 +7533,36 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
+AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009  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.
 
+# serial 1
+
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1024,32 +7570,34 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  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.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1057,22 +7605,24 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  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.
 
+# serial 2
+
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1082,148 +7632,105 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
-#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
 m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
 
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
 
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
+  # tar/untar a dummy directory, and stop if the command works
   rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
 
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([libgettextpo/gnulib-m4/gnulib-comp.m4])
+m4_include([libgrep/gnulib-m4/btowc.m4])
 m4_include([libgrep/gnulib-m4/gnulib-comp.m4])
 m4_include([libgrep/gnulib-m4/langinfo_h.m4])
-m4_include([libgrep/gnulib-m4/localeconv.m4])
-m4_include([libgrep/gnulib-m4/mbrlen.m4])
 m4_include([libgrep/gnulib-m4/nl_langinfo.m4])
 m4_include([libgrep/gnulib-m4/regex.m4])
+m4_include([libgrep/gnulib-m4/wcrtomb.m4])
 m4_include([gnulib-m4/00gnulib.m4])
 m4_include([gnulib-m4/absolute-header.m4])
 m4_include([gnulib-m4/acl.m4])
 m4_include([gnulib-m4/alloca.m4])
-m4_include([gnulib-m4/ansi-c++.m4])
+m4_include([gnulib-m4/argmatch.m4])
 m4_include([gnulib-m4/asm-underscore.m4])
 m4_include([gnulib-m4/atexit.m4])
 m4_include([gnulib-m4/backupfile.m4])
 m4_include([gnulib-m4/bison-i18n.m4])
-m4_include([gnulib-m4/btowc.m4])
 m4_include([gnulib-m4/byteswap.m4])
 m4_include([gnulib-m4/canonicalize.m4])
-m4_include([gnulib-m4/close.m4])
-m4_include([gnulib-m4/closedir.m4])
-m4_include([gnulib-m4/configmake.m4])
+m4_include([gnulib-m4/cloexec.m4])
 m4_include([gnulib-m4/copy-file.m4])
 m4_include([gnulib-m4/csharp.m4])
 m4_include([gnulib-m4/csharpcomp.m4])
 m4_include([gnulib-m4/csharpexec.m4])
 m4_include([gnulib-m4/curses.m4])
-m4_include([gnulib-m4/dirent_h.m4])
+m4_include([gnulib-m4/dos.m4])
 m4_include([gnulib-m4/double-slash-root.m4])
-m4_include([gnulib-m4/dup.m4])
 m4_include([gnulib-m4/dup2.m4])
 m4_include([gnulib-m4/eaccess.m4])
 m4_include([gnulib-m4/eealloc.m4])
@@ -1231,29 +7738,22 @@
 m4_include([gnulib-m4/errno_h.m4])
 m4_include([gnulib-m4/error.m4])
 m4_include([gnulib-m4/execute.m4])
-m4_include([gnulib-m4/exponentd.m4])
 m4_include([gnulib-m4/extensions.m4])
 m4_include([gnulib-m4/fatal-signal.m4])
 m4_include([gnulib-m4/fcntl.m4])
 m4_include([gnulib-m4/fcntl_h.m4])
-m4_include([gnulib-m4/fdopen.m4])
 m4_include([gnulib-m4/findprog.m4])
 m4_include([gnulib-m4/float_h.m4])
 m4_include([gnulib-m4/fnmatch.m4])
 m4_include([gnulib-m4/fopen.m4])
-m4_include([gnulib-m4/fpieee.m4])
-m4_include([gnulib-m4/fseeko.m4])
-m4_include([gnulib-m4/fstat.m4])
-m4_include([gnulib-m4/ftell.m4])
-m4_include([gnulib-m4/ftello.m4])
 m4_include([gnulib-m4/gcj.m4])
-m4_include([gnulib-m4/getcwd.m4])
 m4_include([gnulib-m4/getdelim.m4])
 m4_include([gnulib-m4/getdtablesize.m4])
 m4_include([gnulib-m4/getline.m4])
 m4_include([gnulib-m4/getopt.m4])
 m4_include([gnulib-m4/getpagesize.m4])
 m4_include([gnulib-m4/gettimeofday.m4])
+m4_include([gnulib-m4/gl_list.m4])
 m4_include([gnulib-m4/gnulib-common.m4])
 m4_include([gnulib-m4/gnulib-comp.m4])
 m4_include([gnulib-m4/iconv_h.m4])
@@ -1261,12 +7761,9 @@
 m4_include([gnulib-m4/include_next.m4])
 m4_include([gnulib-m4/inline.m4])
 m4_include([gnulib-m4/intmax_t.m4])
-m4_include([gnulib-m4/inttypes.m4])
-m4_include([gnulib-m4/iswblank.m4])
 m4_include([gnulib-m4/java.m4])
 m4_include([gnulib-m4/javacomp.m4])
 m4_include([gnulib-m4/javaexec.m4])
-m4_include([gnulib-m4/largefile.m4])
 m4_include([gnulib-m4/lib-ld.m4])
 m4_include([gnulib-m4/lib-link.m4])
 m4_include([gnulib-m4/lib-prefix.m4])
@@ -1283,7 +7780,6 @@
 m4_include([gnulib-m4/locale-zh.m4])
 m4_include([gnulib-m4/locale_h.m4])
 m4_include([gnulib-m4/localename.m4])
-m4_include([gnulib-m4/lseek.m4])
 m4_include([gnulib-m4/lstat.m4])
 m4_include([gnulib-m4/malloc.m4])
 m4_include([gnulib-m4/malloca.m4])
@@ -1295,7 +7791,6 @@
 m4_include([gnulib-m4/mbsrtowcs.m4])
 m4_include([gnulib-m4/mbstate_t.m4])
 m4_include([gnulib-m4/mbswidth.m4])
-m4_include([gnulib-m4/mbtowc.m4])
 m4_include([gnulib-m4/memchr.m4])
 m4_include([gnulib-m4/memmove.m4])
 m4_include([gnulib-m4/memset.m4])
@@ -1304,26 +7799,20 @@
 m4_include([gnulib-m4/mmap-anon.m4])
 m4_include([gnulib-m4/mode_t.m4])
 m4_include([gnulib-m4/moo.m4])
-m4_include([gnulib-m4/msvc-inval.m4])
-m4_include([gnulib-m4/msvc-nothrow.m4])
 m4_include([gnulib-m4/multiarch.m4])
 m4_include([gnulib-m4/no-c++.m4])
-m4_include([gnulib-m4/nocrash.m4])
-m4_include([gnulib-m4/off_t.m4])
+m4_include([gnulib-m4/onceonly.m4])
 m4_include([gnulib-m4/open.m4])
-m4_include([gnulib-m4/opendir.m4])
 m4_include([gnulib-m4/pathmax.m4])
+m4_include([gnulib-m4/pipe.m4])
 m4_include([gnulib-m4/pipe2.m4])
 m4_include([gnulib-m4/posix_spawn.m4])
 m4_include([gnulib-m4/printf.m4])
 m4_include([gnulib-m4/putenv.m4])
 m4_include([gnulib-m4/quote.m4])
 m4_include([gnulib-m4/quotearg.m4])
-m4_include([gnulib-m4/raise.m4])
 m4_include([gnulib-m4/rawmemchr.m4])
 m4_include([gnulib-m4/read-file.m4])
-m4_include([gnulib-m4/read.m4])
-m4_include([gnulib-m4/readdir.m4])
 m4_include([gnulib-m4/readlink.m4])
 m4_include([gnulib-m4/realloc.m4])
 m4_include([gnulib-m4/relocatable-lib.m4])
@@ -1332,17 +7821,13 @@
 m4_include([gnulib-m4/safe-read.m4])
 m4_include([gnulib-m4/safe-write.m4])
 m4_include([gnulib-m4/sched_h.m4])
-m4_include([gnulib-m4/secure_getenv.m4])
 m4_include([gnulib-m4/setenv.m4])
-m4_include([gnulib-m4/setlocale.m4])
 m4_include([gnulib-m4/sig_atomic_t.m4])
 m4_include([gnulib-m4/sigaction.m4])
 m4_include([gnulib-m4/signal_h.m4])
 m4_include([gnulib-m4/signalblocking.m4])
 m4_include([gnulib-m4/sigpipe.m4])
-m4_include([gnulib-m4/sleep.m4])
 m4_include([gnulib-m4/snprintf.m4])
-m4_include([gnulib-m4/spawn-pipe.m4])
 m4_include([gnulib-m4/spawn_h.m4])
 m4_include([gnulib-m4/ssize_t.m4])
 m4_include([gnulib-m4/stat.m4])
@@ -1368,7 +7853,6 @@
 m4_include([gnulib-m4/sys_socket_h.m4])
 m4_include([gnulib-m4/sys_stat_h.m4])
 m4_include([gnulib-m4/sys_time_h.m4])
-m4_include([gnulib-m4/sys_types_h.m4])
 m4_include([gnulib-m4/sys_wait_h.m4])
 m4_include([gnulib-m4/tempname.m4])
 m4_include([gnulib-m4/term-ostream.m4])
@@ -1377,7 +7861,6 @@
 m4_include([gnulib-m4/time_h.m4])
 m4_include([gnulib-m4/tls.m4])
 m4_include([gnulib-m4/tmpdir.m4])
-m4_include([gnulib-m4/ungetc.m4])
 m4_include([gnulib-m4/unionwait.m4])
 m4_include([gnulib-m4/unistd-safer.m4])
 m4_include([gnulib-m4/unistd_h.m4])
@@ -1386,26 +7869,24 @@
 m4_include([gnulib-m4/vasprintf.m4])
 m4_include([gnulib-m4/vsnprintf.m4])
 m4_include([gnulib-m4/wait-process.m4])
-m4_include([gnulib-m4/waitpid.m4])
 m4_include([gnulib-m4/warn-on-use.m4])
 m4_include([gnulib-m4/wchar_h.m4])
-m4_include([gnulib-m4/wcrtomb.m4])
 m4_include([gnulib-m4/wctob.m4])
-m4_include([gnulib-m4/wctomb.m4])
 m4_include([gnulib-m4/wctype_h.m4])
 m4_include([gnulib-m4/wcwidth.m4])
 m4_include([gnulib-m4/write.m4])
 m4_include([gnulib-m4/xvasprintf.m4])
 m4_include([gnulib-m4/yield.m4])
 m4_include([../m4/fixautomake.m4])
+m4_include([../m4/init-package-version.m4])
 m4_include([../m4/libtool.m4])
 m4_include([../m4/ltoptions.m4])
 m4_include([../m4/ltsugar.m4])
 m4_include([../m4/ltversion.m4])
 m4_include([../m4/lt~obsolete.m4])
 m4_include([../m4/woe32-dll.m4])
+m4_include([../gettext-runtime/m4/ansi-c++.m4])
 m4_include([../gettext-runtime/m4/codeset.m4])
-m4_include([../gettext-runtime/m4/extern-inline.m4])
 m4_include([../gettext-runtime/m4/fcntl-o.m4])
 m4_include([../gettext-runtime/m4/gettext.m4])
 m4_include([../gettext-runtime/m4/glibc2.m4])
diff -Nru gettext-0.19.3/gettext-tools/ChangeLog gettext-0.18.1.1/gettext-tools/ChangeLog
--- gettext-0.19.3/gettext-tools/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/ChangeLog	2010-06-06 12:56:52.000000000 +0000
@@ -1,172 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	* configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is
-	set.
-
-2014-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	build: Fix Woe32 cross build
-	* woe32dll/gettextsrc-exports.c: Don't export line_comment and
-	po_lex_iconv if undefined.
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	build: Use git-version-gen intead of version.sh
-	* configure.ac: Use git-version-gen in AC_INIT.
-
-2014-03-11  Daiki Ueno  <ueno@gnu.org>
-
-	* configure.ac: Remove unnecessary make-variable expansion,
-	previously needed for LIBTOOL.
-
-2014-01-28  Roumen Petrov <bugtrack@roumenpetrov.info>  (tiny change)
-
-	tests: fix "make check" under VPATH builds
-	Reported at:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-01/msg00012.html>.
-	* configure.ac: Output init-env instead of init.cfg.
-
-2013-07-25  Daiki Ueno  <ueno@gnu.org>
-
-	tests: allow each test to run individually without 'make'
-	* configure.ac: Replace occurrences of make variables in
-	tests/init.cfg with shell variables so they can be adjusted in
-	test scripts.
-
-2013-07-25  Daiki Ueno  <ueno@gnu.org>
-
-	tests: fix path adjustment for LTLIBINTL
-	* configure.ac: Output tests/init.cfg.
-
-2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
-
-	* configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
-	Require Automake 1.11.1 or later, so that the 'parallel-tests'
-	will be certainly available.
-	(AC_INIT): Require Autoconf 2.62 or later; that is the minimal
-	version supported by Automake 1.11.1 or later.
-
-2013-04-26  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Python brace format.
-	* woe32dll/gettextsrc-exports.c: Export formatstring_python_brace.
-
-2013-04-17  Andreas Stricker  <astricker@futurelab.ch>
-
-	Support for JavaScript.
-	* woe32dll/gettextsrc-exports.c: Export formatstring_javascript.
-
-2013-04-15  Daiki Ueno  <ueno@gnu.org>
-
-	* woe32dll/gettextsrc-exports.c: Export formatstring_lua.
-
-2012-12-27  Daiki Ueno  <ueno@gnu.org>
-
-	Determine imported C symbol prefix at configure time.
-	Suggested by Evgeny Grin in <http://savannah.gnu.org/bugs/?29946>.
-	* woe32dll/export.h (IMP): Define depending on the result of the
-	configure run.
-	* configure.ac (GETTEXTLIB_EXPORTS_FLAGS): Add
-	-DUSER_LABEL_PREFIX_UNDERSCORE if imported C symbol has
-	underscore prefix.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* woe32dll/export.h (IMP): Check __MINGW32__ as well as _WIN64.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	Work around error_* symbol conflict with Cygwin 1.7 DLL.
-	* configure.ac: Reset ac_cv_lib_error_at_line on Cygwin.
-	(GETTEXTLIB_EXPORTS_FLAGS): Add -DGNULIB_DEFINED_ERROR if the
-	error facility is replaced by gnulib.
-	(GNULIB_REPLACE_ERROR): Define if the error facility is replaced
-	by gnulib.
-	* woe32dll/gettextlib-exports.c (rpl_error_message_count)
-	(rpl_error_one_per_line, rpl_error_print_progname): Export only
-	if GNULIB_DEFINED_ERROR is set.
-
-2012-12-21  Daiki Ueno  <ueno@gnu.org>
-
-	Fix W64 build errors.
-	* woe32dll/export.h (IMP) [_WIN64]: Prefix "__imp_" instead of
-	"_imp__".
-
-2012-12-17  Daiki Ueno  <ueno@unixuser.org>
-
-	* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
-	Suggested by Stefano Lattarini <stefano.lattarini@gmail.com>.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g"
-
-2012-01-15  Bruno Haible  <bruno@clisp.org>
-
-	Support for MSVC 9.
-	* woe32dll/export.h (VARIABLE): Define to empty if not using GCC.
-
-2011-11-27  Bruno Haible  <bruno@clisp.org>
-
-	Speed up configure a bit.
-	* configure.ac: Don't invoke AM_PATH_LISPDIR if the user specified
-	--without-emacs.
-	Based on a patch by DJ Lucas <dj@linuxfromscratch.org>.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Update after gl_PROG_ANSI_CXX changed in gnulib.
-	* configure.ac: Test whether CXX is "no", not ":".
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Fix link error on Cygwin 1.5.x.
-	* woe32dll/gettextsrc-exports.c: Add color_test_mode.
-
-2011-01-28  Bruno Haible  <bruno@clisp.org>
-
-	Add a comment.
-	* woe32dll/export.h: Add a reference to the woe32dll writeup.
-
-2010-10-10  Bruno Haible  <bruno@clisp.org>
-
-	Rely more on libtool.
-	* configure.ac (LTNOUNDEF): Remove variable.
-
-2010-07-31  Bruno Haible  <bruno@clisp.org>
-
-	Use new ansi-c++.m4 from gnulib.
-	* configure.ac: Invoke gl_PROG_ANSI_CXX instead of gt_PROG_ANSI_CXX.
-	Reported at <https://savannah.gnu.org/bugs/?30607>.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	New options --with-xz and --with-bzip2 for compressing the archive.
-	* configure.ac: New options --without-bzip2, --without-xz.
-	(ARCHIVE_FORMAT): Rename value 'dir' to 'dirgz'. Recognize also values
-	'dirxz' or 'dirbz2', depending on options.
-
 2010-06-06  Bruno Haible  <bruno@clisp.org>
 
 	* configure.ac (ARCHIVE_FORMAT): If neither --with-git nor --with-cvs
diff -Nru gettext-0.19.3/gettext-tools/config.h.in gettext-0.18.1.1/gettext-tools/config.h.in
--- gettext-0.19.3/gettext-tools/config.h.in	2014-10-16 06:01:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/config.h.in	2010-06-06 20:12:24.000000000 +0000
@@ -5,6 +5,10 @@
 #define DEFAULT_OUTPUT_ALIGNMENT 1
 
 
+/* Define if the compiler is building for multiple architectures of Apple
+   platforms at once. */
+#undef AA_APPLE_UNIVERSAL_BUILD
+
 /* Define this to an absolute name of
    <libcroco-0.6/libcroco/libcroco-config.h>. */
 #undef ABSOLUTE_LIBCROCO_0_6_LIBCROCO_LIBCROCO_CONFIG_H
@@ -15,9 +19,6 @@
 /* Define this to an absolute name of <libxml2/libxml/xmlversion.h>. */
 #undef ABSOLUTE_LIBXML2_LIBXML_XMLVERSION_H
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* Define to the number of bits in type 'ptrdiff_t'. */
 #undef BITSIZEOF_PTRDIFF_T
 
@@ -47,13 +48,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Define as the bit index in the word where to find bit 0 of the exponent of
-   'double'. */
-#undef DBL_EXPBIT0_BIT
-
-/* Define as the word index where to find the exponent of 'double'. */
-#undef DBL_EXPBIT0_WORD
-
 /* Define to 1 if // is a file system root distinct from /. */
 #undef DOUBLE_SLASH_IS_DISTINCT_ROOT
 
@@ -74,22 +68,26 @@
 /* Define this to 1 if F_DUPFD behavior does not match POSIX */
 #undef FCNTL_DUPFD_BUGGY
 
+/* Define on systems for which file names may have a so-called `drive letter'
+   prefix, define this to compute the length of that prefix, including the
+   colon. */
+#undef FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+
+/* Define if the backslash character may also serve as a file name component
+   separator. */
+#undef FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+
+/* Define if a drive letter prefix denotes a relative path if it is not
+   followed by a file name component separator. */
+#undef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+
 /* Define to 1 if fopen() fails to recognize a trailing slash. */
 #undef FOPEN_TRAILING_SLASH_BUG
 
-/* Define to 1 if the system's ftello function has the Solaris bug. */
-#undef FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE
-
-/* Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string. */
-#undef FUNC_NL_LANGINFO_YESEXPR_WORKS
-
 /* Define to 1 if realpath() can malloc memory, always gives an absolute path,
    and handles trailing slash correctly. */
 #undef FUNC_REALPATH_WORKS
 
-/* Define to 1 if ungetc is broken when used on arbitrary bytes. */
-#undef FUNC_UNGETC_BROKEN
-
 /* Define if gettimeofday clobbers the localtime buffer. */
 #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME
 
@@ -106,40 +104,17 @@
 #undef GNULIB_FD_SAFER_FLAG
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module fscanf shall be considered present. */
-#undef GNULIB_FSCANF
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module fwriteerror shall be considered present. */
 #undef GNULIB_FWRITEERROR
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module lock shall be considered present. */
-#undef GNULIB_LOCK
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module pipe2-safer shall be considered present. */
 #undef GNULIB_PIPE2_SAFER
 
-/* Define when the error facility is replaced by gnulib. */
-#undef GNULIB_REPLACE_ERROR
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module scanf shall be considered present. */
-#undef GNULIB_SCANF
-
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module sigpipe shall be considered present. */
 #undef GNULIB_SIGPIPE
 
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module snprintf shall be considered present. */
-#undef GNULIB_SNPRINTF
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module strerror shall be considered present. */
-#undef GNULIB_STRERROR
-
 /* Define to 1 when the gnulib module btowc should be tested. */
 #undef GNULIB_TEST_BTOWC
 
@@ -150,15 +125,6 @@
 /* Define to 1 when the gnulib module cloexec should be tested. */
 #undef GNULIB_TEST_CLOEXEC
 
-/* Define to 1 when the gnulib module close should be tested. */
-#undef GNULIB_TEST_CLOSE
-
-/* Define to 1 when the gnulib module closedir should be tested. */
-#undef GNULIB_TEST_CLOSEDIR
-
-/* Define to 1 when the gnulib module dup should be tested. */
-#undef GNULIB_TEST_DUP
-
 /* Define to 1 when the gnulib module dup2 should be tested. */
 #undef GNULIB_TEST_DUP2
 
@@ -168,24 +134,9 @@
 /* Define to 1 when the gnulib module fcntl should be tested. */
 #undef GNULIB_TEST_FCNTL
 
-/* Define to 1 when the gnulib module fdopen should be tested. */
-#undef GNULIB_TEST_FDOPEN
-
 /* Define to 1 when the gnulib module fopen should be tested. */
 #undef GNULIB_TEST_FOPEN
 
-/* Define to 1 when the gnulib module fstat should be tested. */
-#undef GNULIB_TEST_FSTAT
-
-/* Define to 1 when the gnulib module ftell should be tested. */
-#undef GNULIB_TEST_FTELL
-
-/* Define to 1 when the gnulib module ftello should be tested. */
-#undef GNULIB_TEST_FTELLO
-
-/* Define to 1 when the gnulib module getcwd should be tested. */
-#undef GNULIB_TEST_GETCWD
-
 /* Define to 1 when the gnulib module getdelim should be tested. */
 #undef GNULIB_TEST_GETDELIM
 
@@ -204,24 +155,12 @@
 /* Define to 1 when the gnulib module gettimeofday should be tested. */
 #undef GNULIB_TEST_GETTIMEOFDAY
 
-/* Define to 1 when the gnulib module iswblank should be tested. */
-#undef GNULIB_TEST_ISWBLANK
-
-/* Define to 1 when the gnulib module localeconv should be tested. */
-#undef GNULIB_TEST_LOCALECONV
-
-/* Define to 1 when the gnulib module lseek should be tested. */
-#undef GNULIB_TEST_LSEEK
-
 /* Define to 1 when the gnulib module lstat should be tested. */
 #undef GNULIB_TEST_LSTAT
 
 /* Define to 1 when the gnulib module malloc-posix should be tested. */
 #undef GNULIB_TEST_MALLOC_POSIX
 
-/* Define to 1 when the gnulib module mbrlen should be tested. */
-#undef GNULIB_TEST_MBRLEN
-
 /* Define to 1 when the gnulib module mbrtowc should be tested. */
 #undef GNULIB_TEST_MBRTOWC
 
@@ -237,9 +176,6 @@
 /* Define to 1 when the gnulib module mbsstr should be tested. */
 #undef GNULIB_TEST_MBSSTR
 
-/* Define to 1 when the gnulib module mbtowc should be tested. */
-#undef GNULIB_TEST_MBTOWC
-
 /* Define to 1 when the gnulib module memchr should be tested. */
 #undef GNULIB_TEST_MEMCHR
 
@@ -252,9 +188,6 @@
 /* Define to 1 when the gnulib module open should be tested. */
 #undef GNULIB_TEST_OPEN
 
-/* Define to 1 when the gnulib module opendir should be tested. */
-#undef GNULIB_TEST_OPENDIR
-
 /* Define to 1 when the gnulib module pipe2 should be tested. */
 #undef GNULIB_TEST_PIPE2
 
@@ -300,18 +233,9 @@
 /* Define to 1 when the gnulib module putenv should be tested. */
 #undef GNULIB_TEST_PUTENV
 
-/* Define to 1 when the gnulib module raise should be tested. */
-#undef GNULIB_TEST_RAISE
-
 /* Define to 1 when the gnulib module rawmemchr should be tested. */
 #undef GNULIB_TEST_RAWMEMCHR
 
-/* Define to 1 when the gnulib module read should be tested. */
-#undef GNULIB_TEST_READ
-
-/* Define to 1 when the gnulib module readdir should be tested. */
-#undef GNULIB_TEST_READDIR
-
 /* Define to 1 when the gnulib module readlink should be tested. */
 #undef GNULIB_TEST_READLINK
 
@@ -324,24 +248,15 @@
 /* Define to 1 when the gnulib module rmdir should be tested. */
 #undef GNULIB_TEST_RMDIR
 
-/* Define to 1 when the gnulib module secure_getenv should be tested. */
-#undef GNULIB_TEST_SECURE_GETENV
-
 /* Define to 1 when the gnulib module setenv should be tested. */
 #undef GNULIB_TEST_SETENV
 
-/* Define to 1 when the gnulib module setlocale should be tested. */
-#undef GNULIB_TEST_SETLOCALE
-
 /* Define to 1 when the gnulib module sigaction should be tested. */
 #undef GNULIB_TEST_SIGACTION
 
 /* Define to 1 when the gnulib module sigprocmask should be tested. */
 #undef GNULIB_TEST_SIGPROCMASK
 
-/* Define to 1 when the gnulib module sleep should be tested. */
-#undef GNULIB_TEST_SLEEP
-
 /* Define to 1 when the gnulib module snprintf should be tested. */
 #undef GNULIB_TEST_SNPRINTF
 
@@ -381,18 +296,12 @@
 /* Define to 1 when the gnulib module vsnprintf should be tested. */
 #undef GNULIB_TEST_VSNPRINTF
 
-/* Define to 1 when the gnulib module waitpid should be tested. */
-#undef GNULIB_TEST_WAITPID
-
 /* Define to 1 when the gnulib module wcrtomb should be tested. */
 #undef GNULIB_TEST_WCRTOMB
 
 /* Define to 1 when the gnulib module wctob should be tested. */
 #undef GNULIB_TEST_WCTOB
 
-/* Define to 1 when the gnulib module wctomb should be tested. */
-#undef GNULIB_TEST_WCTOMB
-
 /* Define to 1 when the gnulib module wcwidth should be tested. */
 #undef GNULIB_TEST_WCWIDTH
 
@@ -420,11 +329,8 @@
    whether the gnulib module unistr/u8-uctomb shall be considered present. */
 #undef GNULIB_UNISTR_U8_UCTOMB
 
-/* Define to 1 if you have the `aclsort' function. */
-#undef HAVE_ACLSORT
-
-/* Define to 1 if you have the <aclv.h> header file. */
-#undef HAVE_ACLV_H
+/* Define to 1 if you have the `acl' function. */
+#undef HAVE_ACL
 
 /* Define to 1 if you have the `aclx_get' function. */
 #undef HAVE_ACLX_GET
@@ -535,20 +441,17 @@
 /* Define to 1 if you have the `canonicalize_file_name' function. */
 #undef HAVE_CANONICALIZE_FILE_NAME
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
 /* Define to 1 if you have the `chown' function. */
 #undef HAVE_CHOWN
 
-/* Define to 1 if you have the `closedir' function. */
-#undef HAVE_CLOSEDIR
-
 /* Define to 1 if you have the `confstr' function. */
 #undef HAVE_CONFSTR
 
@@ -595,10 +498,6 @@
    you don't. */
 #undef HAVE_DECL_FREAD_UNLOCKED
 
-/* Define to 1 if you have the declaration of `ftello', and to 0 if you don't.
-   */
-#undef HAVE_DECL_FTELLO
-
 /* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FWRITE_UNLOCKED
@@ -623,34 +522,22 @@
    don't. */
 #undef HAVE_DECL_GETLINE
 
-/* Define to 1 if you have the declaration of `isblank', and to 0 if you
-   don't. */
-#undef HAVE_DECL_ISBLANK
-
-/* Define to 1 if you have the declaration of `iswblank', and to 0 if you
+/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you
    don't. */
-#undef HAVE_DECL_ISWBLANK
-
-/* Define to 1 if you have the declaration of `mbrlen', and to 0 if you don't.
-   */
-#undef HAVE_DECL_MBRLEN
+#undef HAVE_DECL_GETOPT_CLIP
 
-/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
-   don't. */
-#undef HAVE_DECL_MBRTOWC
-
-/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you
-   don't. */
-#undef HAVE_DECL_MBSINIT
-
-/* Define to 1 if you have the declaration of `mbsrtowcs', and to 0 if you
+/* Define to 1 if you have the declaration of `isblank', and to 0 if you
    don't. */
-#undef HAVE_DECL_MBSRTOWCS
+#undef HAVE_DECL_ISBLANK
 
 /* Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 0
    otherwise. */
 #undef HAVE_DECL_MBSWIDTH_IN_WCHAR_H
 
+/* Define to 1 if you have the declaration of `optreset', and to 0 if you
+   don't. */
+#undef HAVE_DECL_OPTRESET
+
 /* Define to 1 if you have the declaration of `program_invocation_name', and
    to 0 if you don't. */
 #undef HAVE_DECL_PROGRAM_INVOCATION_NAME
@@ -667,21 +554,13 @@
    don't. */
 #undef HAVE_DECL_PUTC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `setenv', and to 0 if you don't.
-   */
-#undef HAVE_DECL_SETENV
-
-/* Define to 1 if you have the declaration of `sleep', and to 0 if you don't.
-   */
-#undef HAVE_DECL_SLEEP
-
 /* Define to 1 if you have the declaration of `snprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL_SNPRINTF
 
-/* Define to 1 if you have the declaration of `stpncpy', and to 0 if you
+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
    don't. */
-#undef HAVE_DECL_STPNCPY
+#undef HAVE_DECL_STRERROR
 
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
@@ -691,22 +570,10 @@
    don't. */
 #undef HAVE_DECL_STRNLEN
 
-/* Define to 1 if you have the declaration of `towlower', and to 0 if you
-   don't. */
-#undef HAVE_DECL_TOWLOWER
-
-/* Define to 1 if you have the declaration of `unsetenv', and to 0 if you
-   don't. */
-#undef HAVE_DECL_UNSETENV
-
 /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL_VSNPRINTF
 
-/* Define to 1 if you have the declaration of `wcrtomb', and to 0 if you
-   don't. */
-#undef HAVE_DECL_WCRTOMB
-
 /* Define to 1 if you have the declaration of `wctob', and to 0 if you don't.
    */
 #undef HAVE_DECL_WCTOB
@@ -715,10 +582,6 @@
    don't. */
 #undef HAVE_DECL_WCWIDTH
 
-/* Define to 1 if you have the declaration of `_putenv', and to 0 if you
-   don't. */
-#undef HAVE_DECL__PUTENV
-
 /* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL__SNPRINTF
@@ -739,7 +602,7 @@
 /* Define to 1 if you have the <dl.h> header file. */
 #undef HAVE_DL_H
 
-/* Define to 1 if you have the 'dup2' function. */
+/* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
 /* Define if you have the declaration of environ. */
@@ -748,21 +611,12 @@
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H
 
-/* Define to 1 if you have the `facl' function. */
-#undef HAVE_FACL
-
-/* Define to 1 if you have the `fchmod' function. */
-#undef HAVE_FCHMOD
-
 /* Define to 1 if you have the `fcntl' function. */
 #undef HAVE_FCNTL
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if you have the <features.h> header file. */
-#undef HAVE_FEATURES_H
-
 /* Define to 1 if you have the <float.h> header file. */
 #undef HAVE_FLOAT_H
 
@@ -772,9 +626,6 @@
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#undef HAVE_FSEEKO
-
 /* Define to 1 if you have the `funlockfile' function. */
 #undef HAVE_FUNLOCKFILE
 
@@ -865,9 +716,6 @@
 /* Define to 1 if you have the `isblank' function. */
 #undef HAVE_ISBLANK
 
-/* Define to 1 if you have the `issetugid' function. */
-#undef HAVE_ISSETUGID
-
 /* Define to 1 if you have the `iswblank' function. */
 #undef HAVE_ISWBLANK
 
@@ -908,13 +756,16 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
 /* Define to 1 if you have the `localtime' function. */
 #undef HAVE_LOCALTIME
 
 /* Define to 1 if you support file names longer than 14 characters. */
 #undef HAVE_LONG_FILE_NAMES
 
-/* Define to 1 if the system has the type 'long long int'. */
+/* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
 /* Define to 1 if you have the `lstat' function. */
@@ -936,9 +787,6 @@
 /* Define to 1 if you have the <math.h> header file. */
 #undef HAVE_MATH_H
 
-/* Define to 1 if you have the `mbrlen' function. */
-#undef HAVE_MBRLEN
-
 /* Define to 1 if you have the `mbrtowc' function. */
 #undef HAVE_MBRTOWC
 
@@ -954,6 +802,9 @@
 /* Define to 1 if <wchar.h> declares mbstate_t. */
 #undef HAVE_MBSTATE_T
 
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
+
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
@@ -981,10 +832,6 @@
 /* Define to 1 if you have the `mprotect' function. */
 #undef HAVE_MPROTECT
 
-/* Define to 1 on MSVC platforms that have the "invalid parameter handler"
-   concept. */
-#undef HAVE_MSVC_INVALID_PARAMETER_HANDLER
-
 /* Define to 1 if you have the `munmap' function. */
 #undef HAVE_MUNMAP
 
@@ -1003,9 +850,6 @@
 /* Define to 1 if libc includes obstacks. */
 #undef HAVE_OBSTACK
 
-/* Define to 1 if you have the `opendir' function. */
-#undef HAVE_OPENDIR
-
 /* Define to 1 if you have the <OS.h> header file. */
 #undef HAVE_OS_H
 
@@ -1051,18 +895,24 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 
-/* Define to 1 if you have the `raise' function. */
-#undef HAVE_RAISE
+/* Define to 1 if you have the <random.h> header file. */
+#undef HAVE_RANDOM_H
 
 /* Define to 1 if you have the `rawmemchr' function. */
 #undef HAVE_RAWMEMCHR
 
-/* Define to 1 if alphasort is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ALPHASORT
+/* Define to 1 if accept is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ACCEPT
+
+/* Define to 1 if accept4 is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_ACCEPT4
 
 /* Define to 1 if atoll is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_ATOLL
 
+/* Define to 1 if bind is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_BIND
+
 /* Define to 1 if btowc is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_BTOWC
 
@@ -1070,24 +920,15 @@
    macros. */
 #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
 
-/* Define to 1 if chdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_CHDIR
-
 /* Define to 1 if chown is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_CHOWN
 
-/* Define to 1 if closedir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_CLOSEDIR
-
-/* Define to 1 if dirfd is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DIRFD
+/* Define to 1 if connect is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_CONNECT
 
 /* Define to 1 if dprintf is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_DPRINTF
 
-/* Define to 1 if dup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUP
-
 /* Define to 1 if dup2 is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_DUP2
 
@@ -1121,27 +962,12 @@
 /* Define to 1 if fcntl is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FCNTL
 
-/* Define to 1 if fdatasync is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FDATASYNC
-
-/* Define to 1 if fdopendir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FDOPENDIR
-
-/* Define to 1 if ffsl is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFSL
-
-/* Define to 1 if ffsll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFSLL
-
 /* Define to 1 if fpurge is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FPURGE
 
 /* Define to 1 if fseeko is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FSEEKO
 
-/* Define to 1 if fstat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FSTAT
-
 /* Define to 1 if fstatat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_FSTATAT
 
@@ -1190,8 +1016,14 @@
 /* Define to 1 if getpagesize is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GETPAGESIZE
 
-/* Define to 1 if gets is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETS
+/* Define to 1 if getpeername is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETPEERNAME
+
+/* Define to 1 if getsockname is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETSOCKNAME
+
+/* Define to 1 if getsockopt is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_GETSOCKOPT
 
 /* Define to 1 if getsubopt is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GETSUBOPT
@@ -1205,26 +1037,8 @@
 /* Define to 1 if grantpt is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_GRANTPT
 
-/* Define to 1 if group_member is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GROUP_MEMBER
-
-/* Define to 1 if imaxabs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_IMAXABS
-
-/* Define to 1 if imaxdiv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_IMAXDIV
-
-/* Define to 1 if initstate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_INITSTATE
-
-/* Define to 1 if initstate_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_INITSTATE_R
-
-/* Define to 1 if isatty is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ISATTY
-
-/* Define to 1 if iswctype is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ISWCTYPE
+/* Define to 1 if initstat_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_INITSTAT_R
 
 /* Define to 1 if lchmod is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_LCHMOD
@@ -1238,6 +1052,9 @@
 /* Define to 1 if linkat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_LINKAT
 
+/* Define to 1 if listen is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_LISTEN
+
 /* Define to 1 if lseek is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_LSEEK
 
@@ -1304,24 +1121,12 @@
 /* Define to 1 if openat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_OPENAT
 
-/* Define to 1 if opendir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_OPENDIR
-
-/* Define to 1 if pclose is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PCLOSE
-
-/* Define to 1 if pipe is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PIPE
-
 /* Define to 1 if pipe2 is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PIPE2
 
 /* Define to 1 if popen is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_POPEN
 
-/* Define to 1 if posix_openpt is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_POSIX_OPENPT
-
 /* Define to 1 if posix_spawn is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_POSIX_SPAWN
 
@@ -1407,33 +1212,18 @@
 /* Define to 1 if pread is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PREAD
 
-/* Define to 1 if pselect is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PSELECT
-
-/* Define to 1 if pthread_sigmask is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTHREAD_SIGMASK
-
 /* Define to 1 if ptsname is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PTSNAME
 
-/* Define to 1 if ptsname_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTSNAME_R
-
 /* Define to 1 if pwrite is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PWRITE
 
-/* Define to 1 if random is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RANDOM
-
 /* Define to 1 if random_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RANDOM_R
 
 /* Define to 1 if rawmemchr is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RAWMEMCHR
 
-/* Define to 1 if readdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_READDIR
-
 /* Define to 1 if readlink is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_READLINK
 
@@ -1443,38 +1233,35 @@
 /* Define to 1 if realpath is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_REALPATH
 
+/* Define to 1 if recv is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_RECV
+
+/* Define to 1 if recvfrom is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_RECVFROM
+
 /* Define to 1 if renameat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RENAMEAT
 
-/* Define to 1 if rewinddir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_REWINDDIR
-
 /* Define to 1 if rmdir is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RMDIR
 
 /* Define to 1 if rpmatch is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RPMATCH
 
-/* Define to 1 if scandir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SCANDIR
-
-/* Define to 1 if secure_getenv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SECURE_GETENV
-
 /* Define to 1 if select is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SELECT
 
-/* Define to 1 if setenv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETENV
+/* Define to 1 if send is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SEND
 
-/* Define to 1 if sethostname is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETHOSTNAME
+/* Define to 1 if sendto is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SENDTO
 
-/* Define to 1 if setlocale is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETLOCALE
+/* Define to 1 if setenv is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETENV
 
-/* Define to 1 if setstate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETSTATE
+/* Define to 1 if setsockopt is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SETSOCKOPT
 
 /* Define to 1 if setstate_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SETSTATE_R
@@ -1482,6 +1269,9 @@
 /* Define to 1 if setusershell is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SETUSERSHELL
 
+/* Define to 1 if shutdown is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SHUTDOWN
+
 /* Define to 1 if sigaction is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SIGACTION
 
@@ -1512,8 +1302,8 @@
 /* Define to 1 if snprintf is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SNPRINTF
 
-/* Define to 1 if srandom is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SRANDOM
+/* Define to 1 if socket is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_SOCKET
 
 /* Define to 1 if srandom_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_SRANDOM_R
@@ -1536,9 +1326,6 @@
 /* Define to 1 if strdup is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRDUP
 
-/* Define to 1 if strerror_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRERROR_R
-
 /* Define to 1 if strncat is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRNCAT
 
@@ -1560,9 +1347,6 @@
 /* Define to 1 if strtod is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRTOD
 
-/* Define to 1 if strtoimax is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOIMAX
-
 /* Define to 1 if strtok_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRTOK_R
 
@@ -1572,9 +1356,6 @@
 /* Define to 1 if strtoull is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRTOULL
 
-/* Define to 1 if strtoumax is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOUMAX
-
 /* Define to 1 if strverscmp is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_STRVERSCMP
 
@@ -1587,9 +1368,6 @@
 /* Define to 1 if tmpfile is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_TMPFILE
 
-/* Define to 1 if towctrans is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_TOWCTRANS
-
 /* Define to 1 if ttyname_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_TTYNAME_R
 
@@ -1617,126 +1395,24 @@
 /* Define to 1 if vsnprintf is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_VSNPRINTF
 
-/* Define to 1 if waitpid is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WAITPID
-
-/* Define to 1 if wcpcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCPCPY
-
-/* Define to 1 if wcpncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCPNCPY
-
 /* Define to 1 if wcrtomb is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCRTOMB
 
-/* Define to 1 if wcscasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCASECMP
-
-/* Define to 1 if wcscat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCAT
-
-/* Define to 1 if wcschr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCHR
-
-/* Define to 1 if wcscmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCMP
-
-/* Define to 1 if wcscoll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCOLL
-
-/* Define to 1 if wcscpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCPY
-
-/* Define to 1 if wcscspn is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCSPN
-
-/* Define to 1 if wcsdup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSDUP
-
-/* Define to 1 if wcslen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSLEN
-
-/* Define to 1 if wcsncasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCASECMP
-
-/* Define to 1 if wcsncat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCAT
-
-/* Define to 1 if wcsncmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCMP
-
-/* Define to 1 if wcsncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCPY
-
-/* Define to 1 if wcsnlen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNLEN
-
 /* Define to 1 if wcsnrtombs is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCSNRTOMBS
 
-/* Define to 1 if wcspbrk is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSPBRK
-
-/* Define to 1 if wcsrchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSRCHR
-
 /* Define to 1 if wcsrtombs is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCSRTOMBS
 
-/* Define to 1 if wcsspn is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSSPN
-
-/* Define to 1 if wcsstr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSSTR
-
-/* Define to 1 if wcstok is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSTOK
-
-/* Define to 1 if wcswidth is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSWIDTH
-
-/* Define to 1 if wcsxfrm is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSXFRM
-
 /* Define to 1 if wctob is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCTOB
 
-/* Define to 1 if wctrans is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTRANS
-
-/* Define to 1 if wctype is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTYPE
-
 /* Define to 1 if wcwidth is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCWIDTH
 
-/* Define to 1 if wmemchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCHR
-
-/* Define to 1 if wmemcmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCMP
-
-/* Define to 1 if wmemcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCPY
-
-/* Define to 1 if wmemmove is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMMOVE
-
-/* Define to 1 if wmemset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMSET
-
-/* Define to 1 if _Exit is declared even after undefining macros. */
-#undef HAVE_RAW_DECL__EXIT
-
-/* Define to 1 if you have the `readdir' function. */
-#undef HAVE_READDIR
-
 /* Define to 1 if you have the `readlink' function. */
 #undef HAVE_READLINK
 
-/* Define to 1 if you have the `readlinkat' function. */
-#undef HAVE_READLINKAT
-
 /* Define if the 'realloc' function is POSIX compliant. */
 #undef HAVE_REALLOC_POSIX
 
@@ -1746,6 +1422,9 @@
 /* Define to 1 if you have the <resolv.h> header file. */
 #undef HAVE_RESOLV_H
 
+/* Define to 1 if the system has the type `sa_family_t'. */
+#undef HAVE_SA_FAMILY_T
+
 /* Define to 1 if you have the <sched.h> header file. */
 #undef HAVE_SCHED_H
 
@@ -1758,15 +1437,9 @@
 /* Define to 1 if you have the <search.h> header file. */
 #undef HAVE_SEARCH_H
 
-/* Define to 1 if you have the `secure_getenv' function. */
-#undef HAVE_SECURE_GETENV
-
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
-/* Define to 1 if you have the `setdtablesize' function. */
-#undef HAVE_SETDTABLESIZE
-
 /* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 
@@ -1785,6 +1458,9 @@
 /* Define to 1 if you have the `shlload' function. */
 #undef HAVE_SHLLOAD
 
+/* Define to 1 if you have the `shutdown' function. */
+#undef HAVE_SHUTDOWN
+
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
@@ -1819,9 +1495,6 @@
 /* Define to 1 if the system has the type `sig_atomic_t'. */
 #undef HAVE_SIG_ATOMIC_T
 
-/* Define to 1 if you have the `sleep' function. */
-#undef HAVE_SLEEP
-
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
@@ -1839,6 +1512,12 @@
 /* Define to 1 if you have the `statacl' function. */
 #undef HAVE_STATACL
 
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#undef HAVE_STDBOOL_H
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
@@ -1849,6 +1528,9 @@
    uintmax_t. */
 #undef HAVE_STDINT_H_WITH_UINTMAX
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -1894,12 +1576,15 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if `decimal_point' is a member of `struct lconv'. */
-#undef HAVE_STRUCT_LCONV_DECIMAL_POINT
+/* Define to 1 if the system has the type `struct random_data'. */
+#undef HAVE_STRUCT_RANDOM_DATA
 
 /* Define to 1 if `sa_sigaction' is a member of `struct sigaction'. */
 #undef HAVE_STRUCT_SIGACTION_SA_SIGACTION
 
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+
 /* Define to 1 if `__names' is a member of `struct __locale_struct'. */
 #undef HAVE_STRUCT___LOCALE_STRUCT___NAMES
 
@@ -1953,9 +1638,6 @@
 /* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define to 1 if you have the `towlower' function. */
-#undef HAVE_TOWLOWER
-
 /* Define if tparam() is among the termcap library functions. */
 #undef HAVE_TPARAM
 
@@ -1974,7 +1656,7 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to 1 if the system has the type 'unsigned long long int'. */
+/* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
 /* Define to 1 if you have the `uselocale' function. */
@@ -2023,6 +1705,9 @@
 /* Define to 1 if you have the `wcrtomb' function. */
 #undef HAVE_WCRTOMB
 
+/* Define to 1 if you have the `wcscoll' function. */
+#undef HAVE_WCSCOLL
+
 /* Define to 1 if you have the `wcslen' function. */
 #undef HAVE_WCSLEN
 
@@ -2062,31 +1747,24 @@
 /* Define to 1 if O_NOFOLLOW works. */
 #undef HAVE_WORKING_O_NOFOLLOW
 
-/* Define if you have the posix_spawn and posix_spawnp functions and they
-   work. */
-#undef HAVE_WORKING_POSIX_SPAWN
-
 /* Define to 1 if `vfork' works. */
 #undef HAVE_WORKING_VFORK
 
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#undef HAVE_WS2TCPIP_H
+
 /* Define to 1 if you have the <xlocale.h> header file. */
 #undef HAVE_XLOCALE_H
 
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
-/* Define to 1 if you have the `_ftelli64' function. */
-#undef HAVE__FTELLI64
-
 /* Define to 1 if you have the `_ftime' function. */
 #undef HAVE__FTIME
 
 /* Define to 1 if you have the `_NSGetExecutablePath' function. */
 #undef HAVE__NSGETEXECUTABLEPATH
 
-/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */
-#undef HAVE__SET_INVALID_PARAMETER_HANDLER
-
 /* Define to 1 if you have the `_stat' function. */
 #undef HAVE__STAT
 
@@ -2109,13 +1787,16 @@
 /* Define if integer division by zero raises signal SIGFPE. */
 #undef INTDIV0_RAISES_SIGFPE
 
+#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif
+
 /* Define to 1 if the C compiler is actually a C++ compiler. */
 #undef IS_CPLUSPLUS
 
-/* Define to 1 if lseek does not detect pipes. */
-#undef LSEEK_PIPE_BROKEN
-
-/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
@@ -2129,15 +1810,8 @@
 /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
 #undef MAP_ANONYMOUS
 
-/* Define if the mbrtowc function does not return (size_t) -2 for empty input.
-   */
-#undef MBRTOWC_EMPTY_INPUT_BUG
-
-/* Define if the mbrtowc function has the NULL pwc argument bug. */
-#undef MBRTOWC_NULL_ARG1_BUG
-
 /* Define if the mbrtowc function has the NULL string argument bug. */
-#undef MBRTOWC_NULL_ARG2_BUG
+#undef MBRTOWC_NULL_ARG_BUG
 
 /* Define if the mbrtowc function does not return 0 for a NUL character. */
 #undef MBRTOWC_NUL_RETVAL_BUG
@@ -2145,6 +1819,9 @@
 /* Define if the mbrtowc function returns a wrong return value. */
 #undef MBRTOWC_RETVAL_BUG
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Define to 1 if open() fails to recognize a trailing slash. */
 #undef OPEN_TRAILING_SLASH_BUG
 
@@ -2197,8 +1874,8 @@
 /* Define if nl_langinfo exists but is overridden by gnulib. */
 #undef REPLACE_NL_LANGINFO
 
-/* Define to 1 if strerror(0) does not return a message implying success. */
-#undef REPLACE_STRERROR_0
+/* Define this to 1 if strerror is broken. */
+#undef REPLACE_STRERROR
 
 /* Define if vasnprintf exists but is overridden by gnulib. */
 #undef REPLACE_VASNPRINTF
@@ -2268,45 +1945,13 @@
    made weak. */
 #undef USE_SOLARIS_THREADS_WEAK
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable general extensions on OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
-   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
-   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to 1 if you want getc etc. to use unlocked I/O if available.
    Unlocked I/O can improve performance in unithreaded apps, but it is not
    safe for multithreaded apps. */
 #undef USE_UNLOCKED_IO
 
-/* Define if the native Windows multithreading API can be used. */
-#undef USE_WINDOWS_THREADS
+/* Define if the Win32 multithreading API can be used. */
+#undef USE_WIN32_THREADS
 
 /* Define to a working va_copy macro or replacement. */
 #undef VA_COPY
@@ -2343,59 +1988,50 @@
 /* Define to 1 to internationalize bison runtime messages. */
 #undef YYENABLE_NLS
 
-/* Enable large inode numbers on Mac OS X 10.5. */
-#undef _DARWIN_USE_64_BIT_INODE
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
-   stat.st_size becomes 64-bit. */
-#undef _GL_WINDOWS_64_BIT_ST_SIZE
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define to 1 on Solaris. */
-#undef _LCONV_C99
-
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
-/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
-#undef _NETBSD_SOURCE
-
-/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-
-
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */
 #undef _POSIX_1_SOURCE
 
-/* Define to 1 if you need to in order for 'stat' and other things to work. */
+/* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Define if you want <regex.h> to include <limits.h>, so that it consistently
-   overrides <limits.h>'s RE_DUP_MAX. */
-#undef _REGEX_INCLUDE_LIMITS_H
-
 /* Define if you want regoff_t to be at least as wide POSIX requires. */
 #undef _REGEX_LARGE_OFFSETS
 
+/* Define to 500 only on HP-UX. */
+#undef _XOPEN_SOURCE
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
@@ -2403,95 +2039,6 @@
 /* Define as 'access' if you don't have the eaccess() function. */
 #undef eaccess
 
-/* 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
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
-
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-
-   Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
-   on configurations that mistakenly use 'static inline' to implement
-   functions or macros in standard C headers like <ctype.h>.  For example,
-   if isdigit is mistakenly implemented via a static inline function,
-   a program containing an extern inline function that calls isdigit
-   may not work since the C standard prohibits extern inline functions
-   from calling static functions.  This bug is known to occur on:
-
-     OS X 10.8 and earlier; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
-
-     DragonFly; see
-     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
-
-     FreeBSD; see:
-     http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
-
-   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
-   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
-   Assume DragonFly and FreeBSD will be similar.  */
-#if (((defined __APPLE__ && defined __MACH__) \
-      || defined __DragonFly__ || defined __FreeBSD__) \
-     && (defined __header_inline \
-         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
-            && ! defined __clang__) \
-         : ((! defined _DONT_USE_CTYPE_INLINE_ \
-             && (defined __GNUC__ || defined __cplusplus)) \
-            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
-                && defined __GNUC__ && ! defined __cplusplus))))
-# define _GL_EXTERN_INLINE_STDHEADER_BUG
-#endif
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-# define _GL_EXTERN_INLINE_IN_USE
-#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
-       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
-# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-# define _GL_EXTERN_INLINE_IN_USE
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
-#endif
-
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-#endif
-
 /* Define to a replacement function name for fnmatch(). */
 #undef fnmatch
 
@@ -2501,26 +2048,8 @@
 /* A replacement for va_copy, if needed.  */
 #define gl_va_copy(a,b) ((a) = (b))
 
-/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#ifndef _GL_UNUSED
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED
-# endif
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#ifndef _GL_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _GL_ATTRIBUTE_PURE /* empty */
-# endif
-#endif
-
+/* Define to rpl_gmtime if the replacement function should be used. */
+#undef gmtime
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
@@ -2534,13 +2063,16 @@
 /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE__ && __MACH__ test for MacOS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
 # define __GNUC_STDC_INLINE__ 1
 #endif
 
+/* Define to rpl_localtime if the replacement function should be used. */
+#undef localtime
+
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 
@@ -2617,7 +2149,7 @@
 #endif
 
 /* Define as an integer type suitable for memory locations that can be
-   accessed atomically even in the presence of asynchronous signals. */
+   accessed atomically even in the presence of asynchnonous signals. */
 #undef sig_atomic_t
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
@@ -2645,30 +2177,6 @@
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
 
-/* gcc supports the "unused" attribute on possibly unused labels, and
-   g++ has since version 4.5.  Note to support C++ as well as C,
-   _GL_UNUSED_LABEL should be used with a trailing ;  */
-#if !defined __cplusplus || __GNUC__ > 4 \
-    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-# define _GL_UNUSED_LABEL _GL_UNUSED
-#else
-# define _GL_UNUSED_LABEL
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
-
 
 /* Define as a macro for copying va_list variables. */
 #undef va_copy
diff -Nru gettext-0.19.3/gettext-tools/configure gettext-0.18.1.1/gettext-tools/configure
--- gettext-0.19.3/gettext-tools/configure	2014-10-16 06:01:34.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/configure	2010-06-06 20:12:20.000000000 +0000
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext-tools 0.19.3.
+# Generated by GNU Autoconf 2.65.
 #
-# Report bugs to <bug-gnu-gettext@gnu.org>.
 #
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,7 +89,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -134,31 +133,6 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -192,21 +166,12 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -246,25 +211,14 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -274,11 +228,10 @@
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: bug-gnu-gettext@gnu.org about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -363,18 +316,10 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -411,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -496,10 +441,6 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -534,16 +475,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -555,8 +496,28 @@
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -564,14 +525,161 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+
+
+# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+$*
+_LT_EOF
+  exit 0
+fi
+
+# 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
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -588,12 +696,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='gettext-tools'
-PACKAGE_TARNAME='gettext-tools'
-PACKAGE_VERSION='0.19.3'
-PACKAGE_STRING='gettext-tools 0.19.3'
-PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
-PACKAGE_URL=''
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="src/msgfmt.c"
 # Factoring default headers for most tests.
@@ -634,8 +742,8 @@
 
 gl_use_threads_default=
 gt_needs=
-ac_header_list=
-ac_func_list=
+gl_header_list=
+gl_func_list=
 gl_fnmatch_required=POSIX
 gl_getopt_required=POSIX
 gl_getopt_required=POSIX
@@ -659,12 +767,19 @@
 subdirs
 TESTLIBASPRINTF
 CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
 CROSS_COMPILING
 PERL
 TEXI2PDF
 DVIPS
 ARCHIVE_FORMAT
 aclocaldir
+lispdir
 EMACSLOADPATH
 EMACS
 HAVE_GLOBAL_SYMBOL_PIPE
@@ -680,9 +795,7 @@
 LIBGREP_LTLIBDEPS
 LIBGREP_LIBDEPS
 grgltests_WITNESS
-HAVE_LANGINFO_YESEXPR
 HAVE_LANGINFO_ERA
-HAVE_LANGINFO_T_FMT_AMPM
 HAVE_LANGINFO_CODESET
 HAVE_LANGINFO_H
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H
@@ -698,28 +811,19 @@
 LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE
 POSIX_SPAWN_PORTED_FALSE
 POSIX_SPAWN_PORTED_TRUE
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H
-NEXT_INTTYPES_H
-UINT64_MAX_EQ_ULONG_MAX
-UINT32_MAX_LT_UINTMAX_MAX
-PRIPTR_PREFIX
-INT64_MAX_EQ_LONG_MAX
-INT32_MAX_LT_INTMAX_MAX
-REPLACE_STRTOUMAX
-REPLACE_STRTOIMAX
-HAVE_DECL_STRTOUMAX
-HAVE_DECL_STRTOIMAX
-HAVE_DECL_IMAXDIV
-HAVE_DECL_IMAXABS
-GNULIB_STRTOUMAX
-GNULIB_STRTOIMAX
-GNULIB_IMAXDIV
-GNULIB_IMAXABS
 LOCALE_TR_UTF8
+LOCALE_FR
 gltests_WITNESS
+REPLACE_ISWCNTRL
+HAVE_WCTYPE_H
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
+NEXT_WCTYPE_H
+HAVE_ISWBLANK
+HAVE_ISWCNTRL
+HAVE_WINT_T
+HAVE_WCHAR_H
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
 NEXT_WCHAR_H
-HAVE_FEATURES_H
 LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE
 LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE
 LIBUNISTRING_UNIWIDTH_H
@@ -762,8 +866,6 @@
 TIME_H_DEFINES_STRUCT_TIMESPEC
 NEXT_AS_FIRST_DIRECTIVE_TIME_H
 NEXT_TIME_H
-REPLACE_LOCALTIME
-REPLACE_GMTIME
 REPLACE_TIMEGM
 REPLACE_NANOSLEEP
 REPLACE_MKTIME
@@ -771,7 +873,7 @@
 HAVE_TIMEGM
 HAVE_STRPTIME
 HAVE_NANOSLEEP
-HAVE_DECL_LOCALTIME_R
+HAVE_LOCALTIME_R
 GNULIB_TIME_R
 GNULIB_TIMEGM
 GNULIB_STRPTIME
@@ -782,26 +884,44 @@
 LIBTERMINFO
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H
 NEXT_SYS_WAIT_H
-GNULIB_WAITPID
-WINDOWS_64_BIT_OFF_T
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H
-NEXT_SYS_TYPES_H
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H
+NEXT_SYS_STAT_H
 HAVE_SYS_SELECT_H
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H
 NEXT_SYS_SELECT_H
 REPLACE_SELECT
-REPLACE_PSELECT
-HAVE_PSELECT
 GNULIB_SELECT
-GNULIB_PSELECT
+HAVE_WINSOCK2_H
+HAVE_WS2TCPIP_H
+HAVE_SYS_SOCKET_H
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H
+NEXT_SYS_SOCKET_H
+HAVE_ACCEPT4
+HAVE_SA_FAMILY_T
+HAVE_STRUCT_SOCKADDR_STORAGE
+GNULIB_ACCEPT4
+GNULIB_SHUTDOWN
+GNULIB_SETSOCKOPT
+GNULIB_SENDTO
+GNULIB_RECVFROM
+GNULIB_SEND
+GNULIB_RECV
+GNULIB_LISTEN
+GNULIB_GETSOCKOPT
+GNULIB_GETSOCKNAME
+GNULIB_GETPEERNAME
+GNULIB_BIND
+GNULIB_ACCEPT
+GNULIB_CONNECT
+GNULIB_SOCKET
 NEXT_AS_FIRST_DIRECTIVE_STRING_H
 NEXT_STRING_H
+HAVE_RANDOM_H
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
 NEXT_STDLIB_H
 NEXT_AS_FIRST_DIRECTIVE_STDIO_H
 NEXT_STDIO_H
-GL_GENERATE_STDINT_H_FALSE
-GL_GENERATE_STDINT_H_TRUE
+ASM_SYMBOL_PREFIX
 STDINT_H
 WINT_T_SUFFIX
 WCHAR_T_SUFFIX
@@ -823,26 +943,27 @@
 NEXT_STDINT_H
 HAVE_SYS_TYPES_H
 HAVE_INTTYPES_H
-HAVE_WCHAR_H
 HAVE_UNSIGNED_LONG_LONG_INT
 HAVE_LONG_LONG_INT
 HAVE__BOOL
-GL_GENERATE_STDBOOL_H_FALSE
-GL_GENERATE_STDBOOL_H_TRUE
 STDBOOL_H
-GL_GENERATE_STDARG_H_FALSE
-GL_GENERATE_STDARG_H_TRUE
-STDARG_H
 NEXT_AS_FIRST_DIRECTIVE_STDARG_H
 NEXT_STDARG_H
+STDARG_H
 HAVE_SPAWN_H
 NEXT_AS_FIRST_DIRECTIVE_SPAWN_H
 NEXT_SPAWN_H
-ASM_SYMBOL_PREFIX
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H
 NEXT_SIGNAL_H
-GL_GENERATE_SCHED_H_FALSE
-GL_GENERATE_SCHED_H_TRUE
+HAVE_TYPE_VOLATILE_SIG_ATOMIC_T
+HAVE_STRUCT_SIGACTION_SA_SIGACTION
+HAVE_SIGACTION
+HAVE_SIGINFO_T
+HAVE_SIGSET_T
+HAVE_POSIX_SIGNALBLOCKING
+GNULIB_SIGACTION
+GNULIB_SIGPROCMASK
+GNULIB_SIGNAL_H_SIGPIPE
 SCHED_H
 HAVE_STRUCT_SCHED_PARAM
 HAVE_SCHED_H
@@ -853,35 +974,11 @@
 RELOCATABLE_SRC_DIR
 RELOCATABLE_CONFIG_H_DIR
 RELOCATABLE_LIBRARY_PATH
-RELOCATABLE_VIA_WRAPPER_FALSE
-RELOCATABLE_VIA_WRAPPER_TRUE
 RELOCATABLE_VIA_LD_FALSE
 RELOCATABLE_VIA_LD_TRUE
 INSTALL_PROGRAM_ENV
 RELOCATABLE_LDFLAGS
 RELOCATABLE
-REPLACE_RAISE
-REPLACE_PTHREAD_SIGMASK
-HAVE_SIGHANDLER_T
-HAVE_TYPE_VOLATILE_SIG_ATOMIC_T
-HAVE_STRUCT_SIGACTION_SA_SIGACTION
-HAVE_SIGACTION
-HAVE_SIGINFO_T
-HAVE_SIGSET_T
-HAVE_RAISE
-HAVE_PTHREAD_SIGMASK
-HAVE_POSIX_SIGNALBLOCKING
-GNULIB_SIGACTION
-GNULIB_SIGPROCMASK
-GNULIB_SIGNAL_H_SIGPIPE
-GNULIB_RAISE
-GNULIB_PTHREAD_SIGMASK
-USE_ACL
-LIB_ACL
-LIB_POSIX_SPAWN
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
 REPLACE_POSIX_SPAWN
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T
 HAVE_POSIX_SPAWNATTR_T
@@ -910,16 +1007,13 @@
 OPENMP_CFLAGS
 NO_CXX
 APPLE_UNIVERSAL_BUILD
-LOCALE_FR
 UNDEFINE_STRTOK_R
 REPLACE_STRTOK_R
 REPLACE_STRSIGNAL
 REPLACE_STRNLEN
 REPLACE_STRNDUP
 REPLACE_STRNCAT
-REPLACE_STRERROR_R
 REPLACE_STRERROR
-REPLACE_STRCHRNUL
 REPLACE_STRCASESTR
 REPLACE_STRSTR
 REPLACE_STRDUP
@@ -928,7 +1022,6 @@
 REPLACE_MEMCHR
 HAVE_STRVERSCMP
 HAVE_DECL_STRSIGNAL
-HAVE_DECL_STRERROR_R
 HAVE_DECL_STRTOK_R
 HAVE_STRCASESTR
 HAVE_STRSEP
@@ -944,12 +1037,9 @@
 HAVE_MEMPCPY
 HAVE_DECL_MEMMEM
 HAVE_MEMCHR
-HAVE_FFSLL
-HAVE_FFSL
 HAVE_MBSLEN
 GNULIB_STRVERSCMP
 GNULIB_STRSIGNAL
-GNULIB_STRERROR_R
 GNULIB_STRERROR
 GNULIB_MBSTOK_R
 GNULIB_MBSSEP
@@ -982,12 +1072,9 @@
 GNULIB_MEMPCPY
 GNULIB_MEMMEM
 GNULIB_MEMCHR
-GNULIB_FFSLL
-GNULIB_FFSL
 LOCALE_FR_UTF8
 LOCALE_ZH_CN
 LOCALE_JA
-REPLACE_WCSWIDTH
 REPLACE_WCWIDTH
 REPLACE_WCSNRTOMBS
 REPLACE_WCSRTOMBS
@@ -1002,34 +1089,6 @@
 REPLACE_MBSTATE_T
 HAVE_DECL_WCWIDTH
 HAVE_DECL_WCTOB
-HAVE_WCSWIDTH
-HAVE_WCSTOK
-HAVE_WCSSTR
-HAVE_WCSPBRK
-HAVE_WCSSPN
-HAVE_WCSCSPN
-HAVE_WCSRCHR
-HAVE_WCSCHR
-HAVE_WCSDUP
-HAVE_WCSXFRM
-HAVE_WCSCOLL
-HAVE_WCSNCASECMP
-HAVE_WCSCASECMP
-HAVE_WCSNCMP
-HAVE_WCSCMP
-HAVE_WCSNCAT
-HAVE_WCSCAT
-HAVE_WCPNCPY
-HAVE_WCSNCPY
-HAVE_WCPCPY
-HAVE_WCSCPY
-HAVE_WCSNLEN
-HAVE_WCSLEN
-HAVE_WMEMSET
-HAVE_WMEMMOVE
-HAVE_WMEMCPY
-HAVE_WMEMCMP
-HAVE_WMEMCHR
 HAVE_WCSNRTOMBS
 HAVE_WCSRTOMBS
 HAVE_WCRTOMB
@@ -1039,34 +1098,6 @@
 HAVE_MBRTOWC
 HAVE_MBSINIT
 HAVE_BTOWC
-GNULIB_WCSWIDTH
-GNULIB_WCSTOK
-GNULIB_WCSSTR
-GNULIB_WCSPBRK
-GNULIB_WCSSPN
-GNULIB_WCSCSPN
-GNULIB_WCSRCHR
-GNULIB_WCSCHR
-GNULIB_WCSDUP
-GNULIB_WCSXFRM
-GNULIB_WCSCOLL
-GNULIB_WCSNCASECMP
-GNULIB_WCSCASECMP
-GNULIB_WCSNCMP
-GNULIB_WCSCMP
-GNULIB_WCSNCAT
-GNULIB_WCSCAT
-GNULIB_WCPNCPY
-GNULIB_WCSNCPY
-GNULIB_WCPCPY
-GNULIB_WCSCPY
-GNULIB_WCSNLEN
-GNULIB_WCSLEN
-GNULIB_WMEMSET
-GNULIB_WMEMMOVE
-GNULIB_WMEMCPY
-GNULIB_WMEMCMP
-GNULIB_WMEMCHR
 GNULIB_WCWIDTH
 GNULIB_WCSNRTOMBS
 GNULIB_WCSRTOMBS
@@ -1078,24 +1109,49 @@
 GNULIB_MBSINIT
 GNULIB_WCTOB
 GNULIB_BTOWC
+REPLACE_UTIMENSAT
+REPLACE_STAT
+REPLACE_MKNOD
+REPLACE_MKFIFO
+REPLACE_MKDIR
+REPLACE_LSTAT
+REPLACE_FUTIMENS
+REPLACE_FSTATAT
+REPLACE_FSTAT
+HAVE_UTIMENSAT
+HAVE_MKNODAT
+HAVE_MKNOD
+HAVE_MKFIFOAT
+HAVE_MKFIFO
+HAVE_MKDIRAT
+HAVE_LSTAT
+HAVE_LCHMOD
+HAVE_FUTIMENS
+HAVE_FSTATAT
+HAVE_FCHMODAT
+GNULIB_UTIMENSAT
+GNULIB_STAT
+GNULIB_MKNODAT
+GNULIB_MKNOD
+GNULIB_MKFIFOAT
+GNULIB_MKFIFO
+GNULIB_MKDIRAT
+GNULIB_LSTAT
+GNULIB_LCHMOD
+GNULIB_FUTIMENS
+GNULIB_FSTATAT
+GNULIB_FCHMODAT
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H
 NEXT_LOCALE_H
 HAVE_XLOCALE_H
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
 NEXT_STDDEF_H
-GL_GENERATE_STDDEF_H_FALSE
-GL_GENERATE_STDDEF_H_TRUE
 STDDEF_H
 HAVE_WCHAR_T
 REPLACE_NULL
-REPLACE_STRUCT_LCONV
 REPLACE_DUPLOCALE
-REPLACE_SETLOCALE
-REPLACE_LOCALECONV
 HAVE_DUPLOCALE
 GNULIB_DUPLOCALE
-GNULIB_SETLOCALE
-GNULIB_LOCALECONV
 LOCALCHARSET_TESTS_ENVIRONMENT
 INCLUDED_LIBXML_FALSE
 INCLUDED_LIBXML_TRUE
@@ -1118,73 +1174,23 @@
 INCGLIB
 LTLIBGLIB
 LIBGLIB
-REPLACE_TOWLOWER
-REPLACE_ISWCNTRL
-HAVE_WCTYPE_H
-NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
-NEXT_WCTYPE_H
-HAVE_WINT_T
-HAVE_ISWCNTRL
-REPLACE_ISWBLANK
-HAVE_WCTRANS_T
-HAVE_WCTYPE_T
-HAVE_ISWBLANK
-GNULIB_TOWCTRANS
-GNULIB_WCTRANS
-GNULIB_ISWCTYPE
-GNULIB_WCTYPE
-GNULIB_ISWBLANK
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H
 NEXT_ICONV_H
+ICONV_H
+REPLACE_ICONV_UTF
+REPLACE_ICONV_OPEN
+REPLACE_ICONV
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H
 NEXT_SYS_TIME_H
-REPLACE_STRUCT_TIMEVAL
 REPLACE_GETTIMEOFDAY
 HAVE_SYS_TIME_H
 HAVE_STRUCT_TIMEVAL
 HAVE_GETTIMEOFDAY
 GNULIB_GETTIMEOFDAY
-GNULIB_GL_UNISTD_H_GETOPT
 GETOPT_H
 HAVE_GETOPT_H
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H
 NEXT_GETOPT_H
-WINDOWS_64_BIT_ST_SIZE
-NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H
-NEXT_SYS_STAT_H
-REPLACE_UTIMENSAT
-REPLACE_STAT
-REPLACE_MKNOD
-REPLACE_MKFIFO
-REPLACE_MKDIR
-REPLACE_LSTAT
-REPLACE_FUTIMENS
-REPLACE_FSTATAT
-REPLACE_FSTAT
-HAVE_UTIMENSAT
-HAVE_MKNODAT
-HAVE_MKNOD
-HAVE_MKFIFOAT
-HAVE_MKFIFO
-HAVE_MKDIRAT
-HAVE_LSTAT
-HAVE_LCHMOD
-HAVE_FUTIMENS
-HAVE_FSTATAT
-HAVE_FCHMODAT
-GNULIB_UTIMENSAT
-GNULIB_STAT
-GNULIB_MKNODAT
-GNULIB_MKNOD
-GNULIB_MKFIFOAT
-GNULIB_MKFIFO
-GNULIB_MKDIRAT
-GNULIB_LSTAT
-GNULIB_LCHMOD
-GNULIB_FUTIMENS
-GNULIB_FSTATAT
-GNULIB_FSTAT
-GNULIB_FCHMODAT
 REPLACE_VSPRINTF
 REPLACE_VSNPRINTF
 REPLACE_VPRINTF
@@ -1193,7 +1199,6 @@
 REPLACE_VASPRINTF
 REPLACE_TMPFILE
 REPLACE_STDIO_WRITE_FUNCS
-REPLACE_STDIO_READ_FUNCS
 REPLACE_SPRINTF
 REPLACE_SNPRINTF
 REPLACE_RENAMEAT
@@ -1214,14 +1219,11 @@
 REPLACE_FPRINTF
 REPLACE_FOPEN
 REPLACE_FFLUSH
-REPLACE_FDOPEN
 REPLACE_FCLOSE
 REPLACE_DPRINTF
 HAVE_VDPRINTF
 HAVE_VASPRINTF
 HAVE_RENAMEAT
-HAVE_POPEN
-HAVE_PCLOSE
 HAVE_FTELLO
 HAVE_FSEEKO
 HAVE_DPRINTF
@@ -1230,8 +1232,6 @@
 HAVE_DECL_OBSTACK_PRINTF
 HAVE_DECL_GETLINE
 HAVE_DECL_GETDELIM
-HAVE_DECL_FTELLO
-HAVE_DECL_FSEEKO
 HAVE_DECL_FPURGE
 GNULIB_VSPRINTF_POSIX
 GNULIB_VSNPRINTF
@@ -1240,15 +1240,11 @@
 GNULIB_VFPRINTF_POSIX
 GNULIB_VFPRINTF
 GNULIB_VDPRINTF
-GNULIB_VSCANF
-GNULIB_VFSCANF
 GNULIB_VASPRINTF
 GNULIB_TMPFILE
 GNULIB_STDIO_H_SIGPIPE
-GNULIB_STDIO_H_NONBLOCKING
 GNULIB_SPRINTF_POSIX
 GNULIB_SNPRINTF
-GNULIB_SCANF
 GNULIB_RENAMEAT
 GNULIB_RENAME
 GNULIB_REMOVE
@@ -1259,39 +1255,26 @@
 GNULIB_PRINTF
 GNULIB_POPEN
 GNULIB_PERROR
-GNULIB_PCLOSE
 GNULIB_OBSTACK_PRINTF_POSIX
 GNULIB_OBSTACK_PRINTF
 GNULIB_GETLINE
 GNULIB_GETDELIM
-GNULIB_GETCHAR
-GNULIB_GETC
 GNULIB_FWRITE
 GNULIB_FTELLO
 GNULIB_FTELL
 GNULIB_FSEEKO
 GNULIB_FSEEK
-GNULIB_FSCANF
 GNULIB_FREOPEN
-GNULIB_FREAD
 GNULIB_FPUTS
 GNULIB_FPUTC
 GNULIB_FPURGE
 GNULIB_FPRINTF_POSIX
 GNULIB_FPRINTF
 GNULIB_FOPEN
-GNULIB_FGETS
-GNULIB_FGETC
 GNULIB_FFLUSH
-GNULIB_FDOPEN
 GNULIB_FCLOSE
 GNULIB_DPRINTF
-GL_GENERATE_FNMATCH_H_FALSE
-GL_GENERATE_FNMATCH_H_TRUE
 FNMATCH_H
-REPLACE_ITOLD
-GL_GENERATE_FLOAT_H_FALSE
-GL_GENERATE_FLOAT_H_TRUE
 FLOAT_H
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H
 NEXT_FLOAT_H
@@ -1304,7 +1287,6 @@
 HAVE_FCNTL
 GNULIB_OPENAT
 GNULIB_OPEN
-GNULIB_NONBLOCKING
 GNULIB_FCNTL
 EOVERFLOW_VALUE
 EOVERFLOW_HIDDEN
@@ -1312,44 +1294,12 @@
 ENOLINK_HIDDEN
 EMULTIHOP_VALUE
 EMULTIHOP_HIDDEN
-GL_GENERATE_ERRNO_H_FALSE
-GL_GENERATE_ERRNO_H_TRUE
 ERRNO_H
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H
 NEXT_ERRNO_H
-HAVE_DIRENT_H
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H
-NEXT_DIRENT_H
-PRAGMA_COLUMNS
 PRAGMA_SYSTEM_HEADER
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE
 INCLUDE_NEXT
-pkglibexecdir
-runstatedir
-lispdir
-REPLACE_FDOPENDIR
-REPLACE_DIRFD
-REPLACE_CLOSEDIR
-REPLACE_OPENDIR
-HAVE_ALPHASORT
-HAVE_SCANDIR
-HAVE_FDOPENDIR
-HAVE_DECL_FDOPENDIR
-HAVE_DECL_DIRFD
-HAVE_CLOSEDIR
-HAVE_REWINDDIR
-HAVE_READDIR
-HAVE_OPENDIR
-GNULIB_ALPHASORT
-GNULIB_SCANDIR
-GNULIB_FDOPENDIR
-GNULIB_DIRFD
-GNULIB_CLOSEDIR
-GNULIB_REWINDDIR
-GNULIB_READDIR
-GNULIB_OPENDIR
-HAVE_WINSOCK2_H
-HAVE_MSVC_INVALID_PARAMETER_HANDLER
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS
 UNISTD_H_HAVE_WINSOCK2_H
 REPLACE_WRITE
@@ -1361,21 +1311,15 @@
 REPLACE_SLEEP
 REPLACE_RMDIR
 REPLACE_READLINK
-REPLACE_READ
 REPLACE_PWRITE
 REPLACE_PREAD
 REPLACE_LSEEK
 REPLACE_LINKAT
 REPLACE_LINK
 REPLACE_LCHOWN
-REPLACE_ISATTY
 REPLACE_GETPAGESIZE
 REPLACE_GETGROUPS
-REPLACE_GETLOGIN_R
-REPLACE_GETDTABLESIZE
-REPLACE_GETDOMAINNAME
 REPLACE_GETCWD
-REPLACE_FTRUNCATE
 REPLACE_FCHOWNAT
 REPLACE_DUP2
 REPLACE_DUP
@@ -1383,39 +1327,32 @@
 REPLACE_CHOWN
 HAVE_SYS_PARAM_H
 HAVE_OS_H
-HAVE_DECL_TTYNAME_R
-HAVE_DECL_SETHOSTNAME
 HAVE_DECL_GETUSERSHELL
 HAVE_DECL_GETPAGESIZE
 HAVE_DECL_GETLOGIN_R
-HAVE_DECL_GETDOMAINNAME
-HAVE_DECL_FDATASYNC
-HAVE_DECL_FCHDIR
 HAVE_DECL_ENVIRON
 HAVE_USLEEP
 HAVE_UNLINKAT
+HAVE_TTYNAME_R
 HAVE_SYMLINKAT
 HAVE_SYMLINK
 HAVE_SLEEP
-HAVE_SETHOSTNAME
 HAVE_READLINKAT
 HAVE_READLINK
 HAVE_PWRITE
 HAVE_PREAD
 HAVE_PIPE2
-HAVE_PIPE
 HAVE_LINKAT
 HAVE_LINK
 HAVE_LCHOWN
-HAVE_GROUP_MEMBER
 HAVE_GETPAGESIZE
 HAVE_GETLOGIN
 HAVE_GETHOSTNAME
 HAVE_GETGROUPS
 HAVE_GETDTABLESIZE
+HAVE_GETDOMAINNAME
 HAVE_FTRUNCATE
 HAVE_FSYNC
-HAVE_FDATASYNC
 HAVE_FCHOWNAT
 HAVE_FCHDIR
 HAVE_FACCESSAT
@@ -1428,26 +1365,21 @@
 GNULIB_UNLINKAT
 GNULIB_UNLINK
 GNULIB_UNISTD_H_SIGPIPE
-GNULIB_UNISTD_H_NONBLOCKING
+GNULIB_UNISTD_H_GETOPT
 GNULIB_TTYNAME_R
 GNULIB_SYMLINKAT
 GNULIB_SYMLINK
 GNULIB_SLEEP
-GNULIB_SETHOSTNAME
 GNULIB_RMDIR
 GNULIB_READLINKAT
 GNULIB_READLINK
-GNULIB_READ
 GNULIB_PWRITE
 GNULIB_PREAD
 GNULIB_PIPE2
-GNULIB_PIPE
 GNULIB_LSEEK
 GNULIB_LINKAT
 GNULIB_LINK
 GNULIB_LCHOWN
-GNULIB_ISATTY
-GNULIB_GROUP_MEMBER
 GNULIB_GETUSERSHELL
 GNULIB_GETPAGESIZE
 GNULIB_GETLOGIN_R
@@ -1459,7 +1391,6 @@
 GNULIB_GETCWD
 GNULIB_FTRUNCATE
 GNULIB_FSYNC
-GNULIB_FDATASYNC
 GNULIB_FCHOWNAT
 GNULIB_FCHDIR
 GNULIB_FACCESSAT
@@ -1467,80 +1398,57 @@
 GNULIB_ENVIRON
 GNULIB_DUP3
 GNULIB_DUP2
-GNULIB_DUP
 GNULIB_CLOSE
 GNULIB_CHOWN
-GNULIB_CHDIR
-REPLACE_WCTOMB
 REPLACE_UNSETENV
 REPLACE_STRTOD
 REPLACE_SETENV
 REPLACE_REALPATH
-REPLACE_REALLOC
-REPLACE_RANDOM_R
-REPLACE_QSORT_R
 REPLACE_PUTENV
-REPLACE_PTSNAME_R
-REPLACE_PTSNAME
 REPLACE_MKSTEMP
-REPLACE_MBTOWC
-REPLACE_MALLOC
 REPLACE_CANONICALIZE_FILE_NAME
-REPLACE_CALLOC
-HAVE_DECL_UNSETENV
+HAVE_UNSETENV
 HAVE_UNLOCKPT
 HAVE_SYS_LOADAVG_H
 HAVE_STRUCT_RANDOM_DATA
 HAVE_STRTOULL
 HAVE_STRTOLL
 HAVE_STRTOD
-HAVE_DECL_SETENV
 HAVE_SETENV
-HAVE_SECURE_GETENV
 HAVE_RPMATCH
 HAVE_REALPATH
+HAVE_REALLOC_POSIX
 HAVE_RANDOM_R
-HAVE_RANDOM_H
-HAVE_RANDOM
-HAVE_PTSNAME_R
 HAVE_PTSNAME
-HAVE_POSIX_OPENPT
 HAVE_MKSTEMPS
 HAVE_MKSTEMP
 HAVE_MKOSTEMPS
 HAVE_MKOSTEMP
 HAVE_MKDTEMP
+HAVE_MALLOC_POSIX
 HAVE_GRANTPT
 HAVE_GETSUBOPT
 HAVE_DECL_GETLOADAVG
 HAVE_CANONICALIZE_FILE_NAME
+HAVE_CALLOC_POSIX
 HAVE_ATOLL
-HAVE__EXIT
-GNULIB_WCTOMB
 GNULIB_UNSETENV
 GNULIB_UNLOCKPT
-GNULIB_SYSTEM_POSIX
 GNULIB_STRTOULL
 GNULIB_STRTOLL
 GNULIB_STRTOD
 GNULIB_SETENV
-GNULIB_SECURE_GETENV
 GNULIB_RPMATCH
 GNULIB_REALPATH
 GNULIB_REALLOC_POSIX
 GNULIB_RANDOM_R
-GNULIB_RANDOM
-GNULIB_QSORT_R
 GNULIB_PUTENV
-GNULIB_PTSNAME_R
 GNULIB_PTSNAME
-GNULIB_POSIX_OPENPT
 GNULIB_MKSTEMPS
 GNULIB_MKSTEMP
 GNULIB_MKOSTEMPS
 GNULIB_MKOSTEMP
 GNULIB_MKDTEMP
-GNULIB_MBTOWC
 GNULIB_MALLOC_POSIX
 GNULIB_GRANTPT
 GNULIB_GETSUBOPT
@@ -1548,22 +1456,10 @@
 GNULIB_CANONICALIZE_FILE_NAME
 GNULIB_CALLOC_POSIX
 GNULIB_ATOLL
-GNULIB__EXIT
-GL_GENERATE_BYTESWAP_H_FALSE
-GL_GENERATE_BYTESWAP_H_TRUE
 BYTESWAP_H
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ANSICXX_FALSE
-ANSICXX_TRUE
-CXXFLAGS
-ac_ct_CXX
-CXX
-CXX_CHOICE
-GL_GENERATE_ALLOCA_H_FALSE
-GL_GENERATE_ALLOCA_H_TRUE
 ALLOCA_H
+USE_ACL
+LIB_ACL
 GL_COND_LIBTOOL_FALSE
 GL_COND_LIBTOOL_TRUE
 MSGMERGE_LIBM
@@ -1593,14 +1489,6 @@
 INTL_MACOSX_LIBS
 GLIBC21
 INTLBISON
-GL_GENERATE_ICONV_H_FALSE
-GL_GENERATE_ICONV_H_TRUE
-ICONV_H
-REPLACE_ICONV_UTF
-REPLACE_ICONV_OPEN
-REPLACE_ICONV
-ICONV_CONST
-GNULIB_ICONV
 LTLIBICONV
 LIBICONV
 LTLIBMULTITHREAD
@@ -1627,14 +1515,15 @@
 USE_NLS
 WOE32_FALSE
 WOE32_TRUE
+LTNOUNDEF
 RC
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-MANIFEST_TOOL
-ac_ct_AR
+lt_ECHO
+AR
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -1647,8 +1536,6 @@
 DLLTOOL
 AS
 RANLIB
-ARFLAGS
-AR
 host_os
 host_vendor
 host_cpu
@@ -1713,7 +1600,6 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
-am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1729,8 +1615,6 @@
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -1800,14 +1684,12 @@
 enable_java
 enable_native_java
 enable_csharp
-enable_largefile
 enable_threads
 enable_shared
 enable_static
 with_pic
 enable_fast_install
 with_gnu_ld
-with_sysroot
 enable_libtool_lock
 enable_nls
 enable_rpath
@@ -1815,18 +1697,18 @@
 with_libiconv_prefix
 with_included_gettext
 with_libintl_prefix
-enable_c__
+enable_acl
 with_included_glib
-with_libglib_2_0_prefix
+with_libglib_20_prefix
 with_included_libcroco
-with_libcroco_0_6_prefix
+with_libcroco_06_prefix
 with_included_libunistring
 with_libunistring_prefix
 with_included_libxml
 with_libxml2_prefix
 enable_openmp
-enable_acl
 enable_relocatable
+enable_largefile
 enable_curses
 with_libncurses_prefix
 with_libtermcap_prefix
@@ -1834,12 +1716,10 @@
 with_libcurses_prefix
 with_included_regex
 with_libexpat_prefix
-with_emacs
 with_lispdir
+with_emacs
 with_git
 with_cvs
-with_bzip2
-with_xz
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1854,10 +1734,10 @@
 GCJ
 GCJFLAGS
 CPP
-CXX
-CXXFLAGS
 EMACS
 EMACSLOADPATH
+CXX
+CXXFLAGS
 CCC
 CXXCPP'
 ac_subdirs_all='examples'
@@ -1900,7 +1780,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc/${PACKAGE}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1922,9 +1802,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1969,9 +1848,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1995,9 +1874,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2199,9 +2078,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2215,9 +2094,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2245,8 +2124,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -2254,7 +2133,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -2264,7 +2143,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -2272,13 +2151,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -2301,7 +2180,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -2315,6 +2194,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -2329,9 +2210,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -2370,11 +2251,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2400,7 +2281,7 @@
   # 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.3 to adapt to many kinds of systems.
+\`configure' configures this package to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2414,7 +2295,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -2448,7 +2329,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/gettext-tools]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -2469,26 +2350,21 @@
 fi
 
 if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext-tools 0.19.3:";;
-   esac
+
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-java          do not build Java sources
   --disable-native-java   do not compile Java to native executables
   --enable-csharp[=IMPL]  choose preferred C# implementation (pnet or mono)
-  --disable-largefile     omit support for large files
-  --enable-threads={posix|solaris|pth|windows}
+  --enable-threads={posix|solaris|pth|win32}
                           specify multithreading API
   --disable-threads       build without multithread safety
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -2498,22 +2374,20 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --disable-c++           do not build C++ sources
-  --disable-openmp        do not use OpenMP
   --disable-acl           do not support ACLs
+  --disable-openmp        do not use OpenMP
   --enable-relocatable    install a package that can be moved in the file
                           system
+  --disable-largefile     omit support for large files
   --disable-curses        do not use libncurses, libtermcap even if they exist
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+  --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libpth-prefix[=DIR]  search for libpth in DIR/include and DIR/lib
   --without-libpth-prefix     don't search for libpth in includedir and libdir
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
@@ -2547,13 +2421,11 @@
                           (use with caution on other systems).
   --with-libexpat-prefix[=DIR]  search for libexpat in DIR/include and DIR/lib
   --without-libexpat-prefix     don't search for libexpat in includedir and libdir
-  --without-emacs         do not use Emacs, don't install po-mode
   --with-lispdir          override the default lisp directory
+  --without-emacs         do not use Emacs, don't install po-mode
   --without-git           don't use git to compress the infrastructure archive
   --with-cvs              use cvs to compress the infrastructure archive
                           (deprecated)
-  --without-bzip2         don't use bzip2 to compress the infrastructure archive
-  --without-xz            don't use xz to compress the infrastructure archive
 
 Some influential environment variables:
   CC          C compiler command
@@ -2563,26 +2435,25 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  YACC        The `Yet Another Compiler Compiler' implementation to use.
-              Defaults to the first program found out of: `bison -y', `byacc',
-              `yacc'.
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
   GCJ         Java native code compiler command
   GCJFLAGS    Java native code compiler flags
   CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
   EMACS       the Emacs editor command
   EMACSLOADPATH
               the Emacs library search path
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <bug-gnu-gettext@gnu.org>.
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -2645,10 +2516,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext-tools configure 0.19.3
-generated by GNU Autoconf 2.69
+configure
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2692,7 +2563,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -2718,7 +2589,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2729,7 +2600,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -2742,10 +2613,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2781,7 +2652,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2804,15 +2675,11 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
-## Report this to bug-gnu-gettext@gnu.org ##
-## -------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2821,7 +2688,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_mongrel
 
@@ -2862,7 +2729,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2876,7 +2743,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2894,7 +2761,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_compile
 
@@ -2925,7 +2792,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2939,7 +2806,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2952,7 +2819,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3007,7 +2874,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
 
@@ -3020,7 +2887,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -3061,56 +2928,10 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -3128,8 +2949,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -3145,8 +2965,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -3172,8 +2991,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -3189,8 +3007,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -3224,8 +3041,7 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
@@ -3289,11 +3105,50 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
 
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 # Tries to find if the field MEMBER exists in type AGGR, after including
@@ -3303,7 +3158,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3347,7 +3202,7 @@
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_member
 
@@ -3384,7 +3239,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -3410,7 +3265,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -3421,7 +3276,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -3453,7 +3308,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -3467,7 +3322,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
@@ -3475,8 +3330,8 @@
 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -3586,9 +3441,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -3622,9 +3479,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -3637,9 +3496,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -3653,9 +3514,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -3710,12 +3573,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -3730,11 +3588,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
@@ -3756,83 +3610,87 @@
 fi
 
 gt_needs="$gt_needs need-ngettext"
-as_fn_append ac_header_list " stdlib.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_header_list " sys/param.h"
-as_fn_append ac_func_list " symlink"
-as_fn_append ac_header_list " string.h"
-as_fn_append ac_func_list " canonicalize_file_name"
-as_fn_append ac_func_list " getcwd"
-as_fn_append ac_func_list " readlink"
-as_fn_append ac_func_list " realpath"
-as_fn_append ac_func_list " readlinkat"
-as_fn_append ac_func_list " _set_invalid_parameter_handler"
-as_fn_append ac_header_list " sys/socket.h"
-as_fn_append ac_header_list " utime.h"
-as_fn_append ac_header_list " dirent.h"
-as_fn_append ac_func_list " getdtablesize"
-as_fn_append ac_func_list " fcntl"
-as_fn_append ac_func_list " btowc"
-as_fn_append ac_func_list " isblank"
-as_fn_append ac_func_list " iswctype"
-as_fn_append ac_func_list " mbsrtowcs"
-as_fn_append ac_func_list " mempcpy"
-as_fn_append ac_func_list " wmemchr"
-as_fn_append ac_func_list " wmemcpy"
-as_fn_append ac_func_list " wmempcpy"
-as_fn_append ac_header_list " wctype.h"
-as_fn_append ac_header_list " sys/stat.h"
-as_fn_append ac_func_list " getdelim"
+gl_header_list="$gl_header_list stdlib.h"
+gl_header_list="$gl_header_list unistd.h"
+gl_header_list="$gl_header_list sys/param.h"
+gl_header_list="$gl_header_list string.h"
+gl_func_list="$gl_func_list canonicalize_file_name"
+gl_func_list="$gl_func_list getcwd"
+gl_func_list="$gl_func_list readlink"
+gl_func_list="$gl_func_list realpath"
+gl_header_list="$gl_header_list utime.h"
+gl_func_list="$gl_func_list dup2"
+gl_header_list="$gl_header_list errno.h"
+gl_func_list="$gl_func_list fcntl"
+gl_header_list="$gl_header_list fcntl.h"
+gl_header_list="$gl_header_list float.h"
+gl_func_list="$gl_func_list btowc"
+gl_func_list="$gl_func_list isblank"
+gl_func_list="$gl_func_list iswctype"
+gl_func_list="$gl_func_list mbsrtowcs"
+gl_func_list="$gl_func_list mempcpy"
+gl_func_list="$gl_func_list wmemchr"
+gl_func_list="$gl_func_list wmemcpy"
+gl_func_list="$gl_func_list wmempcpy"
+gl_header_list="$gl_header_list wctype.h"
+gl_func_list="$gl_func_list getdelim"
+gl_func_list="$gl_func_list getdtablesize"
 gl_getopt_required=GNU
-as_fn_append ac_header_list " getopt.h"
-as_fn_append ac_header_list " sys/time.h"
-as_fn_append ac_func_list " gettimeofday"
-as_fn_append ac_header_list " iconv.h"
-as_fn_append ac_func_list " iswcntrl"
-as_fn_append ac_func_list " iswblank"
-as_fn_append ac_header_list " libcroco-0.6/libcroco/libcroco-config.h"
-as_fn_append ac_header_list " libxml2/libxml/xmlexports.h"
-as_fn_append ac_header_list " libxml2/libxml/xmlversion.h"
-as_fn_append ac_header_list " xlocale.h"
-as_fn_append ac_func_list " lstat"
-as_fn_append ac_func_list " mbsinit"
-as_fn_append ac_func_list " mbrtowc"
-as_fn_append ac_func_list " mbslen"
-as_fn_append ac_header_list " wchar.h"
-as_fn_append ac_func_list " isascii"
-as_fn_append ac_header_list " sys/mman.h"
-as_fn_append ac_func_list " mprotect"
-as_fn_append ac_func_list " select"
-as_fn_append ac_func_list " pipe2"
-as_fn_append ac_func_list " fchmod"
-as_fn_append ac_func_list " setenv"
-as_fn_append ac_header_list " sched.h"
-as_fn_append ac_func_list " secure_getenv"
-as_fn_append ac_func_list " sigaction"
-as_fn_append ac_func_list " sigaltstack"
-as_fn_append ac_func_list " siginterrupt"
-as_fn_append ac_func_list " snprintf"
-as_fn_append ac_header_list " spawn.h"
-as_fn_append ac_header_list " stdint.h"
-as_fn_append ac_func_list " stpncpy"
-as_fn_append ac_header_list " sys/select.h"
-as_fn_append ac_header_list " sys/wait.h"
-as_fn_append ac_func_list " pipe"
-as_fn_append ac_func_list " vasnprintf"
-as_fn_append ac_header_list " features.h"
-as_fn_append ac_func_list " wcwidth"
-as_fn_append ac_header_list " inttypes.h"
-as_fn_append ac_func_list " newlocale"
-as_fn_append ac_func_list " sleep"
-as_fn_append ac_func_list " wcrtomb"
-as_fn_append ac_func_list " wctob"
-as_fn_append ac_header_list " langinfo.h"
-as_fn_append ac_func_list " mbrlen"
-as_fn_append ac_func_list " nl_langinfo"
-as_fn_append ac_header_list " malloc.h"
-as_fn_append ac_func_list " getrlimit"
-as_fn_append ac_func_list " setrlimit"
-as_fn_append ac_func_list " uselocale"
+gl_header_list="$gl_header_list getopt.h"
+gl_header_list="$gl_header_list sys/time.h"
+gl_func_list="$gl_func_list gettimeofday"
+gl_header_list="$gl_header_list iconv.h"
+gl_header_list="$gl_header_list libcroco-0.6/libcroco/libcroco-config.h"
+gl_header_list="$gl_header_list libxml2/libxml/xmlexports.h"
+gl_header_list="$gl_header_list libxml2/libxml/xmlversion.h"
+gl_header_list="$gl_header_list stddef.h"
+gl_header_list="$gl_header_list xlocale.h"
+gl_header_list="$gl_header_list locale.h"
+gl_func_list="$gl_func_list lstat"
+gl_func_list="$gl_func_list mbsinit"
+gl_func_list="$gl_func_list mbrtowc"
+gl_func_list="$gl_func_list mbslen"
+gl_header_list="$gl_header_list wchar.h"
+gl_func_list="$gl_func_list isascii"
+gl_header_list="$gl_header_list sys/mman.h"
+gl_func_list="$gl_func_list mprotect"
+gl_func_list="$gl_func_list memchr"
+gl_func_list="$gl_func_list pathconf"
+gl_func_list="$gl_func_list select"
+gl_func_list="$gl_func_list pipe2"
+gl_func_list="$gl_func_list posix_spawn"
+gl_func_list="$gl_func_list setenv"
+gl_header_list="$gl_header_list sys/socket.h"
+gl_header_list="$gl_header_list sched.h"
+gl_func_list="$gl_func_list sigaction"
+gl_func_list="$gl_func_list sigaltstack"
+gl_func_list="$gl_func_list siginterrupt"
+gl_header_list="$gl_header_list signal.h"
+gl_header_list="$gl_header_list spawn.h"
+gl_header_list="$gl_header_list stdarg.h"
+gl_header_list="$gl_header_list stdint.h"
+gl_header_list="$gl_header_list stdio.h"
+gl_func_list="$gl_func_list stpncpy"
+gl_header_list="$gl_header_list sys/select.h"
+gl_header_list="$gl_header_list sys/stat.h"
+gl_header_list="$gl_header_list sys/wait.h"
+gl_header_list="$gl_header_list time.h"
+gl_func_list="$gl_func_list pipe"
+gl_func_list="$gl_func_list vasnprintf"
+gl_func_list="$gl_func_list iswcntrl"
+gl_func_list="$gl_func_list iswblank"
+gl_func_list="$gl_func_list wcwidth"
+gl_func_list="$gl_func_list newlocale"
+gl_func_list="$gl_func_list symlink"
+gl_func_list="$gl_func_list shutdown"
+gl_func_list="$gl_func_list wctob"
+gl_header_list="$gl_header_list langinfo.h"
+gl_func_list="$gl_func_list nl_langinfo"
+gl_func_list="$gl_func_list wcscoll"
+gl_func_list="$gl_func_list wcrtomb"
+gl_func_list="$gl_func_list getrlimit"
+gl_func_list="$gl_func_list setrlimit"
+gl_func_list="$gl_func_list uselocale"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -3888,7 +3746,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3904,22 +3762,16 @@
 
 ac_aux_dir=
 for ac_dir in ../build-aux "$srcdir"/../build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../build-aux \"$srcdir\"/../build-aux" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in ../build-aux \"$srcdir\"/../build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3931,7 +3783,14 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+. $srcdir/../version.sh
+
+
+
+
+
+
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3950,7 +3809,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3970,7 +3829,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -4028,71 +3887,56 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -4115,12 +3959,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -4132,17 +3976,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -4154,7 +3998,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4182,7 +4026,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -4194,7 +4038,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4235,7 +4079,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4245,7 +4089,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -4274,13 +4118,20 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -4292,7 +4143,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4320,7 +4171,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -4328,7 +4179,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -4361,47 +4212,22 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
 AM_BACKSLASH='\'
 
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+
+
+  if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -4416,19 +4242,10 @@
 
 
 # Define the identity of the package.
- PACKAGE='gettext-tools'
- VERSION='0.19.3'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+ PACKAGE=''
+ VERSION=''
 
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
@@ -4445,74 +4262,39 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+    PACKAGE=gettext-tools
 
+     VERSION=$VERSION_NUMBER
 
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
 
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
 
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
 
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
 
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4524,7 +4306,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4536,7 +4318,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4564,7 +4346,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4576,7 +4358,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4617,7 +4399,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4629,7 +4411,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4657,7 +4439,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4670,7 +4452,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4716,7 +4498,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4728,7 +4510,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4760,7 +4542,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4772,7 +4554,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4814,8 +4596,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4929,8 +4711,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -4972,8 +4755,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -5030,9 +4813,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -5043,7 +4826,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5083,8 +4866,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -5094,7 +4877,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5131,7 +4914,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5209,7 +4992,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -5218,7 +5001,8 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5302,65 +5086,6 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -5380,7 +5105,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -5413,7 +5138,6 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -5429,16 +5153,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5472,16 +5195,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -5490,16 +5213,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5560,7 +5283,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
+if test "${ac_cv_prog_YACC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -5572,7 +5295,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5632,7 +5355,7 @@
   # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcj; ac_word=$2
 :
-if ${ac_cv_prog_GCJ+:} false; then :
+if test "${ac_cv_prog_GCJ+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$GCJ"; then
@@ -5644,7 +5367,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GCJ="${ac_tool_prefix}gcj"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5669,7 +5392,7 @@
   # Extract the first word of "gcj", so it can be a program name with args.
 set dummy gcj; ac_word=$2
 :
-if ${ac_cv_prog_ac_ct_GCJ+:} false; then :
+if test "${ac_cv_prog_ac_ct_GCJ+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_GCJ"; then
@@ -5681,7 +5404,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_GCJ="gcj"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5786,7 +5509,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5816,7 +5539,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5832,11 +5555,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -5875,7 +5598,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5891,18 +5614,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5914,7 +5637,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5928,7 +5651,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -5963,7 +5686,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -5977,7 +5700,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5994,7 +5717,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -6029,7 +5752,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -6075,7 +5798,7 @@
                 # Extract the first word of "gij", so it can be a program name with args.
 set dummy gij; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_GIJ_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_GIJ_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_GIJ_IN_PATH"; then
@@ -6087,7 +5810,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_GIJ_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6109,7 +5832,7 @@
     # Extract the first word of "java", so it can be a program name with args.
 set dummy java; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JAVA_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JAVA_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JAVA_IN_PATH"; then
@@ -6121,7 +5844,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JAVA_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6143,7 +5866,7 @@
     # Extract the first word of "jre", so it can be a program name with args.
 set dummy jre; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JRE_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JRE_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JRE_IN_PATH"; then
@@ -6155,7 +5878,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JRE_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6177,7 +5900,7 @@
     # Extract the first word of "jview", so it can be a program name with args.
 set dummy jview; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JVIEW_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JVIEW_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JVIEW_IN_PATH"; then
@@ -6189,7 +5912,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JVIEW_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6277,7 +6000,7 @@
 
   source_version=1.3
   test -n "$source_version" || {
-    as_fn_error $? "missing source-version argument to gt_JAVACOMP" "$LINENO" 5
+    as_fn_error "missing source-version argument to gt_JAVACOMP" "$LINENO" 5
   }
   if test -n "$HAVE_JAVAEXEC"; then
               cat > conftestver.java <<EOF
@@ -6293,7 +6016,7 @@
          > conftestver.class
        target_version=`{
          unset JAVA_HOME
-         echo "$as_me:6296: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
+         echo "$as_me:6019: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
          CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&5
        }`
        case "$target_version" in
@@ -6315,7 +6038,7 @@
          failcode='class conftestfail<T> { T foo() { return null; } }' ;;
     1.5) goodcode='class conftest<T>     { T foo() { return null; } }'
          failcode='class conftestfail syntax error' ;;
-    *) as_fn_error $? "invalid source-version argument to gt_JAVACOMP: $source_version" "$LINENO" 5 ;;
+    *) as_fn_error "invalid source-version argument to gt_JAVACOMP: $source_version" "$LINENO" 5 ;;
   esac
   case "$target_version" in
     1.1) cfversion=45 ;;
@@ -6324,7 +6047,7 @@
     1.4) cfversion=48 ;;
     1.5) cfversion=49 ;;
     1.6) cfversion=50 ;;
-    *) as_fn_error $? "invalid target-version argument to gt_JAVACOMP: $target_version" "$LINENO" 5 ;;
+    *) as_fn_error "invalid target-version argument to gt_JAVACOMP: $target_version" "$LINENO" 5 ;;
   esac
   # Function to output the classfile version of a file (8th byte) in decimal.
   if od -A x < /dev/null >/dev/null 2>/dev/null; then
@@ -6361,23 +6084,23 @@
         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:6364: $JAVAC -d . conftest.java" >&5
+        if { echo "$as_me:6087: $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:6371: $JAVAC -fsource=$source_version -d . conftest.java" >&5
+          if { echo "$as_me:6094: $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:6376: $JAVAC -d . conftestfail.java" >&5
+             && { echo "$as_me:6099: $JAVAC -d . conftestfail.java" >&5
                   $JAVAC -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:6380: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:6103: $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"
@@ -6391,7 +6114,7 @@
         else
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:6394: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+          if { echo "$as_me:6117: $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 \
@@ -6404,7 +6127,7 @@
       else
                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
                     rm -f conftest.class
-          if { echo "$as_me:6407: $JAVAC -d . conftest.java" >&5
+          if { echo "$as_me:6130: $JAVAC -d . conftest.java" >&5
                $JAVAC -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class; then
@@ -6416,7 +6139,7 @@
           if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                     javac_works=
             rm -f conftest.class
-            if { echo "$as_me:6419: $JAVAC -d . conftest.java" >&5
+            if { echo "$as_me:6142: $JAVAC -d . conftest.java" >&5
                  $JAVAC -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -6424,7 +6147,7 @@
             fi
             javac_noassert_works=
             rm -f conftest.class
-            if { echo "$as_me:6427: $JAVAC -fno-assert -d . conftest.java" >&5
+            if { echo "$as_me:6150: $JAVAC -fno-assert -d . conftest.java" >&5
                  $JAVAC -fno-assert -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -6432,11 +6155,11 @@
             fi
             if test -n "$javac_works" && test -n "$javac_noassert_works"; then
               rm -f conftestfail.class
-              if { echo "$as_me:6435: $JAVAC -d . conftestfail.java" >&5
+              if { echo "$as_me:6158: $JAVAC -d . conftestfail.java" >&5
                    $JAVAC -d . conftestfail.java >&5 2>&1
                  } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:6439: $JAVAC -fno-assert -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:6162: $JAVAC -fno-assert -d . conftestfail.java" >&5
                         $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
                       }; then
                                 javac_works=
@@ -6458,23 +6181,23 @@
       fi
     else
                   rm -f conftest.class
-      if { echo "$as_me:6461: $JAVAC -d . conftest.java" >&5
+      if { echo "$as_me:6184: $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:6468: $JAVAC -source $source_version -d . conftest.java" >&5
+        if { echo "$as_me:6191: $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:6473: $JAVAC -d . conftestfail.java" >&5
+           && { echo "$as_me:6196: $JAVAC -d . conftestfail.java" >&5
                 $JAVAC -d . conftestfail.java >&5 2>&1
               } \
            && test -f conftestfail.class \
-           && ! { echo "$as_me:6477: $JAVAC -source $source_version -d . conftestfail.java" >&5
+           && ! { echo "$as_me:6200: $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"
@@ -6487,23 +6210,23 @@
         fi
       else
                         rm -f conftest.class
-        if { echo "$as_me:6490: $JAVAC -target $target_version -d . conftest.java" >&5
+        if { echo "$as_me:6213: $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:6497: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:6220: $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:6502: $JAVAC -target $target_version -d . conftestfail.java" >&5
+             && { echo "$as_me:6225: $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:6506: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:6229: $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"
@@ -6516,7 +6239,7 @@
           fi
         else
                                         rm -f conftest.class
-          if { echo "$as_me:6519: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:6242: $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 \
@@ -6533,7 +6256,7 @@
                 # Extract the first word of "gcj", so it can be a program name with args.
 set dummy gcj; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_GCJ_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_GCJ_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_GCJ_IN_PATH"; then
@@ -6545,7 +6268,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_GCJ_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6567,7 +6290,7 @@
     # Extract the first word of "javac", so it can be a program name with args.
 set dummy javac; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JAVAC_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JAVAC_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JAVAC_IN_PATH"; then
@@ -6579,7 +6302,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JAVAC_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6601,7 +6324,7 @@
     # Extract the first word of "jikes", so it can be a program name with args.
 set dummy jikes; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_JIKES_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_JIKES_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_JIKES_IN_PATH"; then
@@ -6613,7 +6336,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_JIKES_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6634,28 +6357,28 @@
 
                 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:6637: gcj -C -d . conftestlib.java" >&5
+                if { echo "$as_me:6360: 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:6642: gcj -C -d . conftest.java" >&5
+            if { echo "$as_me:6365: 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:6649: gcj -C -fsource=$source_version -d . conftest.java" >&5
+              if { echo "$as_me:6372: 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:6654: gcj -C -d . conftestfail.java" >&5
+                 && { echo "$as_me:6377: gcj -C -d . conftestfail.java" >&5
                       gcj -C -d . conftestfail.java >&5 2>&1
                     } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:6658: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:6381: 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"
@@ -6669,7 +6392,7 @@
             else
                             rm -f conftest.class
               rm -f conftestfail.class
-              if { echo "$as_me:6672: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+              if { echo "$as_me:6395: 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 \
@@ -6682,7 +6405,7 @@
           else
                                                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
               rm -f conftest.class
-              if { echo "$as_me:6685: gcj -C -d . conftest.java" >&5
+              if { echo "$as_me:6408: gcj -C -d . conftest.java" >&5
                    gcj -C -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class; then
@@ -6693,7 +6416,7 @@
             else
               if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                                 rm -f conftest.class
-                if { echo "$as_me:6696: gcj -C -fno-assert -d . conftest.java" >&5
+                if { echo "$as_me:6419: gcj -C -fno-assert -d . conftest.java" >&5
                      gcj -C -fno-assert -d . conftest.java >&5 2>&1
                    } \
                    && test -f conftest.class; then
@@ -6702,7 +6425,7 @@
                   HAVE_JAVACOMP=1
                 else
                   rm -f conftest.class
-                  if { echo "$as_me:6705: gcj -C -d . conftest.java" >&5
+                  if { echo "$as_me:6428: gcj -C -d . conftest.java" >&5
                        gcj -C -d . conftest.java >&5 2>&1
                      } \
                      && test -f conftest.class; then
@@ -6721,23 +6444,23 @@
             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:6724: javac -d . conftest.java" >&5
+        if { echo "$as_me:6447: 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:6731: javac -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:6454: 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:6736: javac -d . conftestfail.java" >&5
+             && { echo "$as_me:6459: javac -d . conftestfail.java" >&5
                   javac -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:6740: javac -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:6463: 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"
@@ -6750,23 +6473,23 @@
           fi
         else
                               rm -f conftest.class
-          if { echo "$as_me:6753: javac -target $target_version -d . conftest.java" >&5
+          if { echo "$as_me:6476: 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:6760: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:6483: 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:6765: javac -target $target_version -d . conftestfail.java" >&5
+               && { echo "$as_me:6488: 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:6769: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
+               && ! { echo "$as_me:6492: 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"
@@ -6779,7 +6502,7 @@
             fi
           else
                                                 rm -f conftest.class
-            if { echo "$as_me:6782: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:6505: 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 \
@@ -6830,7 +6553,7 @@
 set dummy jar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_JAR+:} false; then :
+if test "${ac_cv_prog_JAR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$JAR"; then
@@ -6842,7 +6565,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_JAR="jar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6910,7 +6633,7 @@
         # Extract the first word of "cscc", so it can be a program name with args.
 set dummy cscc; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_CSCC_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_CSCC_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_CSCC_IN_PATH"; then
@@ -6922,7 +6645,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_CSCC_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6944,7 +6667,7 @@
   # Extract the first word of "mcs", so it can be a program name with args.
 set dummy mcs; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_MCS_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_MCS_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_MCS_IN_PATH"; then
@@ -6956,7 +6679,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_MCS_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6978,7 +6701,7 @@
   # Extract the first word of "csc", so it can be a program name with args.
 set dummy csc; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_CSC_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_CSC_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_CSC_IN_PATH"; then
@@ -6990,7 +6713,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_CSC_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7093,7 +6816,7 @@
         # Extract the first word of "ilrun", so it can be a program name with args.
 set dummy ilrun; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_ILRUN_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_ILRUN_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_ILRUN_IN_PATH"; then
@@ -7105,7 +6828,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_ILRUN_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7127,7 +6850,7 @@
   # Extract the first word of "mono", so it can be a program name with args.
 set dummy mono; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_MONO_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_MONO_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_MONO_IN_PATH"; then
@@ -7139,7 +6862,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_MONO_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7161,7 +6884,7 @@
   # Extract the first word of "clix", so it can be a program name with args.
 set dummy clix; ac_word=$2
 :
-if ${ac_cv_prog_HAVE_CLIX_IN_PATH+:} false; then :
+if test "${ac_cv_prog_HAVE_CLIX_IN_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_CLIX_IN_PATH"; then
@@ -7173,7 +6896,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_CLIX_IN_PATH="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7258,27 +6981,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -7296,14 +7019,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -7311,7 +7034,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -7331,51 +7054,16 @@
 
 
 
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
-$as_echo_n "checking for Minix Amsterdam compiler... " >&6; }
-if ${gl_cv_c_amsterdam_compiler+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef __ACK__
-Amsterdam
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Amsterdam" >/dev/null 2>&1; then :
-  gl_cv_c_amsterdam_compiler=yes
-else
-  gl_cv_c_amsterdam_compiler=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-$as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
-  if test -z "$AR"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      AR='cc -c.a'
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='-o'
-      fi
-    else
-                  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7383,8 +7071,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7394,10 +7082,10 @@
 
 fi
 fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -7405,17 +7093,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7423,8 +7111,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7434,17 +7122,17 @@
 
 fi
 fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR="ar"
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7452,127 +7140,141 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    AR=$ac_ct_AR
+    RANLIB=$ac_ct_RANLIB
   fi
 else
-  AR="$ac_cv_prog_AR"
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
-      fi
-    fi
-  else
-    if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
-    fi
-  fi
-
-
-  if test -z "$RANLIB"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      RANLIB=':'
-    else
-            if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
   fi
-done
-  done
-IFS=$as_save_IFS
-
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
 fi
+rm -f core conftest*
+
 fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
 
-    fi
-  fi
+fi
 
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7689,7 +7391,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7700,8 +7403,10 @@
 
 
 
+
+
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
   MINIX=yes
 else
   MINIX=
@@ -7718,15 +7423,20 @@
 
 $as_echo "#define _MINIX 1" >>confdefs.h
 
+  fi
+
+        case "$host_os" in
+    hpux*)
 
-$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
 
-  fi
+      ;;
+  esac
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7756,367 +7466,18 @@
 
   $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-  $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
-
   $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
   $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
-$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if ${ac_cv_should_define__xopen_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_should_define__xopen_source=no
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #include <wchar.h>
-          mbstate_t x;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #define _XOPEN_SOURCE 500
-             #include <wchar.h>
-             mbstate_t x;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_should_define__xopen_source=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-$as_echo "$ac_cv_should_define__xopen_source" >&6; }
-  test $ac_cv_should_define__xopen_source = yes &&
-    $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-
-
-
-
-
-
-
-
-
-
-
-  # IEEE behaviour is the default on all CPUs except Alpha and SH
-  # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4
-  # and the GCC 4.1.2 manual).
-  case "$host_cpu" in
-    alpha*)
-      # On Alpha systems, a compiler option provides the behaviour.
-      # See the ieee(3) manual page, also available at
-      # <http://h30097.www3.hp.com/docs/base_doc/DOCUMENTATION/V51B_HTML/MAN/MAN3/0600____.HTM>
-      if test -n "$GCC"; then
-        # GCC has the option -mieee.
-        # For full IEEE compliance (rarely needed), use option -mieee-with-inexact.
-        CPPFLAGS="$CPPFLAGS -mieee"
-      else
-        # Compaq (ex-DEC) C has the option -ieee, equivalent to -ieee_with_no_inexact.
-        # For full IEEE compliance (rarely needed), use option -ieee_with_inexact.
-        CPPFLAGS="$CPPFLAGS -ieee"
-      fi
-      ;;
-    sh*)
-      if test -n "$GCC"; then
-        # GCC has the option -mieee.
-        CPPFLAGS="$CPPFLAGS -mieee"
-      fi
-      ;;
-  esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_sys_largefile_source=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_sys_largefile_source=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  ac_cv_sys_largefile_source=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
-$as_echo "$ac_cv_sys_largefile_source" >&6; }
-case $ac_cv_sys_largefile_source in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-_ACEOF
-;;
-esac
-rm -rf conftest*
-
-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-# in glibc 2.1.3, but that breaks too many other things.
-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-if test $ac_cv_sys_largefile_source != unknown; then
-
-$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
-
-fi
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-         if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-         CC="$CC -n32"
-         if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1];
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
 
 
-$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h
 
-fi
 
    case $ac_cv_prog_cc_stdc in #(
   no) :
@@ -8124,7 +7485,7 @@
   *) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if ${ac_cv_prog_cc_c99+:} false; then :
+if test "${ac_cv_prog_cc_c99+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
@@ -8268,7 +7629,7 @@
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
@@ -8299,7 +7660,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -8308,7 +7669,8 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -8394,7 +7756,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
 $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
-  if ${ac_cv_prog_cc_stdc+:} false; then :
+  if test "${ac_cv_prog_cc_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 
@@ -8444,7 +7806,7 @@
         # groks <pthread.h>. cc also understands the flag -pthread, but
         # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
         # 2. putting a flag into CPPFLAGS that has an effect on the linker
-        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
+        # causes the AC_TRY_LINK test below to succeed unexpectedly,
         # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
         CPPFLAGS="$CPPFLAGS -D_REENTRANT"
         ;;
@@ -8461,15 +7823,15 @@
 
 
 
-  # Code from module absolute-header:
   # Code from module acl:
   # Code from module acl-tests:
+  # Code from module alignof:
+  # Code from module alignof-tests:
   # Code from module alloca-opt:
   # Code from module alloca-opt-tests:
-  # Code from module allocator:
-  # Code from module ansi-c++-opt:
   # Code from module areadlink:
   # Code from module areadlink-tests:
+  # Code from module arg-nonnull:
   # Code from module argmatch:
   # Code from module argmatch-tests:
   # Code from module array-list:
@@ -8481,10 +7843,9 @@
   # Code from module binary-io:
   # Code from module binary-io-tests:
   # Code from module bison-i18n:
-  # Code from module btowc:
-  # Code from module btowc-tests:
   # Code from module byteswap:
   # Code from module byteswap-tests:
+  # Code from module c++defs:
   # Code from module c-ctype:
   # Code from module c-ctype-tests:
   # Code from module c-strcase:
@@ -8496,14 +7857,10 @@
   # Code from module c-strstr-tests:
   # Code from module canonicalize-lgpl:
   # Code from module canonicalize-lgpl-tests:
-  # Code from module careadlinkat:
   # Code from module classpath:
   # Code from module clean-temp:
   # Code from module cloexec:
   # Code from module cloexec-tests:
-  # Code from module close:
-  # Code from module close-tests:
-  # Code from module closedir:
   # Code from module closeout:
   # Code from module concat-filename:
   # Code from module configmake:
@@ -8514,12 +7871,7 @@
   # Code from module csharpexec:
   # Code from module csharpexec-script:
   # Code from module diffseq:
-  # Code from module dirent:
-  # Code from module dirent-tests:
-  # Code from module dosname:
   # Code from module double-slash-root:
-  # Code from module dup:
-  # Code from module dup-tests:
   # Code from module dup2:
   # Code from module dup2-tests:
   # Code from module environ:
@@ -8532,48 +7884,27 @@
   # Code from module exitfail:
   # Code from module extensions:
 
-  # Code from module extern-inline:
   # Code from module fatal-signal:
   # Code from module fcntl:
   # Code from module fcntl-h:
   # Code from module fcntl-h-tests:
   # Code from module fcntl-tests:
-  # Code from module fd-hook:
   # Code from module fd-ostream:
   # Code from module fd-safer-flag:
-  # Code from module fdopen:
-  # Code from module fdopen-tests:
-  # Code from module fgetc-tests:
   # Code from module file-ostream:
   # Code from module filename:
   # Code from module findprog:
   # Code from module float:
-  # Code from module float-tests:
   # Code from module fnmatch:
   # Code from module fnmatch-tests:
   # Code from module fopen:
   # Code from module fopen-tests:
-  # Code from module fpieee:
-
-  # Code from module fpucw:
-  # Code from module fputc-tests:
-  # Code from module fread-tests:
-  # Code from module fstat:
-  # Code from module fstat-tests:
   # Code from module fstrcmp:
   # Code from module fstrcmp-tests:
-  # Code from module ftell:
-  # Code from module ftell-tests:
-  # Code from module ftello:
-
-  # Code from module ftello-tests:
   # Code from module full-write:
-  # Code from module fwrite-tests:
   # Code from module fwriteerror:
   # Code from module gcd:
   # Code from module gcj:
-  # Code from module getcwd-lgpl:
-  # Code from module getcwd-lgpl-tests:
   # Code from module getdelim:
   # Code from module getdelim-tests:
   # Code from module getdtablesize:
@@ -8600,24 +7931,15 @@
   # Code from module iconv-tests:
   # Code from module iconv_open:
   # Code from module ignore-value:
-  # Code from module ignore-value-tests:
   # Code from module include_next:
   # Code from module inline:
   # Code from module intprops:
-  # Code from module intprops-tests:
-  # Code from module inttypes:
-  # Code from module inttypes-incomplete:
-  # Code from module inttypes-tests:
-  # Code from module iswblank:
-  # Code from module iswblank-tests:
   # Code from module java:
   # Code from module javacomp:
   # Code from module javacomp-script:
   # Code from module javaexec:
   # Code from module javaexec-script:
   # Code from module javaversion:
-  # Code from module largefile:
-
   # Code from module libcroco:
   # Code from module libglib:
   # Code from module libunistring-optional:
@@ -8632,8 +7954,6 @@
   # Code from module localename-tests:
   # Code from module lock:
   # Code from module lock-tests:
-  # Code from module lseek:
-  # Code from module lseek-tests:
   # Code from module lstat:
   # Code from module lstat-tests:
   # Code from module malloc-posix:
@@ -8651,7 +7971,6 @@
   # Code from module mbsstr:
   # Code from module mbsstr-tests:
   # Code from module mbswidth:
-  # Code from module mbtowc:
   # Code from module mbuiter:
   # Code from module memchr:
   # Code from module memchr-tests:
@@ -8661,31 +7980,25 @@
   # Code from module mkdtemp:
   # Code from module moo:
   # Code from module moo-tests:
-  # Code from module msvc-inval:
-  # Code from module msvc-nothrow:
   # Code from module multiarch:
   # Code from module no-c++:
-  # Code from module nocrash:
   # Code from module obstack:
   # Code from module open:
   # Code from module open-tests:
-  # Code from module opendir:
   # Code from module openmp:
   # Code from module ostream:
   # Code from module pathmax:
-  # Code from module pathmax-tests:
+  # Code from module pipe:
   # Code from module pipe-filter-ii:
   # Code from module pipe-filter-ii-tests:
+  # Code from module pipe-tests:
   # Code from module pipe2:
   # Code from module pipe2-safer:
   # Code from module pipe2-tests:
   # Code from module posix_spawn-internal:
   # Code from module posix_spawn_file_actions_addclose:
-  # Code from module posix_spawn_file_actions_addclose-tests:
   # Code from module posix_spawn_file_actions_adddup2:
-  # Code from module posix_spawn_file_actions_adddup2-tests:
   # Code from module posix_spawn_file_actions_addopen:
-  # Code from module posix_spawn_file_actions_addopen-tests:
   # Code from module posix_spawn_file_actions_destroy:
   # Code from module posix_spawn_file_actions_init:
   # Code from module posix_spawnattr_destroy:
@@ -8697,20 +8010,14 @@
   # Code from module progname:
   # Code from module propername:
   # Code from module putenv:
-  # Code from module qacl:
   # Code from module quote:
   # Code from module quotearg:
   # Code from module quotearg-simple:
   # Code from module quotearg-simple-tests:
-  # Code from module raise:
-  # Code from module raise-tests:
   # Code from module rawmemchr:
   # Code from module rawmemchr-tests:
-  # Code from module read:
   # Code from module read-file:
   # Code from module read-file-tests:
-  # Code from module read-tests:
-  # Code from module readdir:
   # Code from module readlink:
   # Code from module readlink-tests:
   # Code from module realloc-posix:
@@ -8724,42 +8031,26 @@
   # Code from module same-inode:
   # Code from module sched:
   # Code from module sched-tests:
-  # Code from module secure_getenv:
   # Code from module setenv:
   # Code from module setenv-tests:
-  # Code from module setlocale:
-  # Code from module setlocale-tests:
   # Code from module sh-quote:
-  # Code from module sh-quote-tests:
   # Code from module sigaction:
   # Code from module sigaction-tests:
-  # Code from module signal-h:
-  # Code from module signal-h-tests:
+  # Code from module signal:
+  # Code from module signal-tests:
   # Code from module sigpipe:
   # Code from module sigpipe-tests:
   # Code from module sigprocmask:
-  # Code from module sigprocmask-tests:
   # Code from module size_max:
-  # Code from module sleep:
-  # Code from module sleep-tests:
-  # Code from module snippet/_Noreturn:
-  # Code from module snippet/arg-nonnull:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/unused-parameter:
-  # Code from module snippet/warn-on-use:
   # Code from module snprintf:
   # Code from module snprintf-tests:
   # Code from module spawn:
-  # Code from module spawn-pipe:
-  # Code from module spawn-pipe-tests:
   # Code from module spawn-tests:
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stat-tests:
   # Code from module stdarg:
 
-
-
   # Code from module stdbool:
   # Code from module stdbool-tests:
   # Code from module stddef:
@@ -8777,7 +8068,6 @@
   # Code from module strcspn:
   # Code from module streq:
   # Code from module strerror:
-  # Code from module strerror-override:
   # Code from module strerror-tests:
   # Code from module striconv:
   # Code from module striconv-tests:
@@ -8788,27 +8078,24 @@
   # Code from module string:
   # Code from module string-tests:
   # Code from module strnlen:
-  # Code from module strnlen-tests:
   # Code from module strnlen1:
   # Code from module strpbrk:
   # Code from module strstr:
   # Code from module strstr-simple:
   # Code from module strstr-tests:
   # Code from module strtol:
-  # Code from module strtol-tests:
   # Code from module strtoul:
-  # Code from module strtoul-tests:
   # Code from module styled-ostream:
   # Code from module symlink:
   # Code from module symlink-tests:
   # Code from module sys_select:
   # Code from module sys_select-tests:
+  # Code from module sys_socket:
+  # Code from module sys_socket-tests:
   # Code from module sys_stat:
   # Code from module sys_stat-tests:
   # Code from module sys_time:
   # Code from module sys_time-tests:
-  # Code from module sys_types:
-  # Code from module sys_types-tests:
   # Code from module sys_wait:
   # Code from module sys_wait-tests:
   # Code from module tempname:
@@ -8817,10 +8104,7 @@
   # Code from module term-styled-ostream:
   # Code from module terminfo:
   # Code from module terminfo-h:
-  # Code from module test-framework-sh:
-  # Code from module test-framework-sh-tests:
   # Code from module thread:
-  # Code from module thread-tests:
   # Code from module threadlib:
 
 
@@ -8837,10 +8121,12 @@
   # Code from module unilbrk/base:
   # Code from module unilbrk/tables:
   # Code from module unilbrk/u8-possible-linebreaks:
+  # Code from module unilbrk/u8-possible-linebreaks-tests:
   # Code from module unilbrk/u8-width-linebreaks:
   # Code from module unilbrk/u8-width-linebreaks-tests:
   # Code from module unilbrk/ulc-common:
   # Code from module unilbrk/ulc-width-linebreaks:
+  # Code from module unilbrk/ulc-width-linebreaks-tests:
   # Code from module uniname/base:
   # Code from module uniname/uniname:
   # Code from module uniname/uniname-tests:
@@ -8858,7 +8144,9 @@
   # Code from module unistr/u8-mblen:
   # Code from module unistr/u8-mblen-tests:
   # Code from module unistr/u8-mbtouc:
+  # Code from module unistr/u8-mbtouc-tests:
   # Code from module unistr/u8-mbtouc-unsafe:
+  # Code from module unistr/u8-mbtouc-unsafe-tests:
   # Code from module unistr/u8-mbtoucr:
   # Code from module unistr/u8-mbtoucr-tests:
   # Code from module unistr/u8-prev:
@@ -8870,9 +8158,11 @@
   # Code from module unitypes:
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
+  # Code from module uniwidth/width-tests:
   # Code from module unlocked-io:
   # Code from module unsetenv:
   # Code from module unsetenv-tests:
+  # Code from module unused-parameter:
   # Code from module vasnprintf:
   # Code from module vasnprintf-tests:
   # Code from module vasprintf:
@@ -8882,19 +8172,15 @@
   # Code from module vsnprintf:
   # Code from module vsnprintf-tests:
   # Code from module wait-process:
-  # Code from module waitpid:
+  # Code from module warn-on-use:
   # Code from module wchar:
   # Code from module wchar-tests:
-  # Code from module wcrtomb:
-  # Code from module wcrtomb-tests:
   # Code from module wctob:
-  # Code from module wctomb:
-  # Code from module wctype-h:
-  # Code from module wctype-h-tests:
+  # Code from module wctype:
+  # Code from module wctype-tests:
   # Code from module wcwidth:
   # Code from module wcwidth-tests:
   # Code from module write:
-  # Code from module write-tests:
   # Code from module xalloc:
   # Code from module xalloc-die:
   # Code from module xalloc-die-tests:
@@ -8913,60 +8199,45 @@
 
 
 
-
   # Code from module btowc:
-  # Code from module havelib:
+  # Code from module c++defs:
   # Code from module langinfo:
-  # Code from module localeconv:
-  # Code from module lock:
-  # Code from module mbrlen:
-  # Code from module mbtowc:
   # Code from module nl_langinfo:
   # Code from module regex:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/warn-on-use:
-  # Code from module threadlib:
-
-
-
+  # Code from module warn-on-use:
   # Code from module wcrtomb:
 
 
 
 
-  # Code from module absolute-header:
   # Code from module alloca-opt:
+  # Code from module arg-nonnull:
   # Code from module basename:
+  # Code from module c++defs:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module c-strcaseeq:
   # Code from module c-strstr:
-  # Code from module close:
   # Code from module concat-filename:
   # Code from module configmake:
   # Code from module diffseq:
-  # Code from module dosname:
   # Code from module errno:
   # Code from module error:
   # Code from module error-progname:
   # Code from module exitfail:
   # Code from module extensions:
 
-  # Code from module extern-inline:
   # Code from module fcntl-h:
-  # Code from module fd-hook:
   # Code from module file-ostream:
   # Code from module filename:
   # Code from module float:
   # Code from module fopen:
-  # Code from module fstat:
   # Code from module fstrcmp:
   # Code from module fwriteerror:
   # Code from module gcd:
   # Code from module getdelim:
   # Code from module getline:
   # Code from module gettext-h:
-  # Code from module gettimeofday:
   # Code from module gperf:
   # Code from module hash:
   # Code from module havelib:
@@ -8976,8 +8247,6 @@
   # Code from module include_next:
   # Code from module inline:
   # Code from module intprops:
-  # Code from module largefile:
-
   # Code from module libunistring-optional:
   # Code from module localcharset:
   # Code from module lock:
@@ -8989,43 +8258,28 @@
   # Code from module memchr:
   # Code from module minmax:
   # Code from module moo:
-  # Code from module msvc-inval:
-  # Code from module msvc-nothrow:
   # Code from module multiarch:
   # Code from module obstack:
   # Code from module open:
   # Code from module ostream:
-  # Code from module pathmax:
   # Code from module progname:
-  # Code from module raise:
-  # Code from module rawmemchr:
   # Code from module realloc-posix:
   # Code from module relocatable-lib:
-  # Code from module signal-h:
+  # Code from module signal:
   # Code from module sigpipe:
   # Code from module sigprocmask:
   # Code from module size_max:
-  # Code from module snippet/_Noreturn:
-  # Code from module snippet/arg-nonnull:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/unused-parameter:
-  # Code from module snippet/warn-on-use:
-  # Code from module ssize_t:
   # Code from module stat:
   # Code from module stdarg:
 
-
-
   # Code from module stdbool:
   # Code from module stddef:
   # Code from module stdint:
   # Code from module stdio:
   # Code from module stdlib:
   # Code from module stpcpy:
-  # Code from module strchrnul:
   # Code from module streq:
   # Code from module strerror:
-  # Code from module strerror-override:
   # Code from module striconv:
   # Code from module striconveh:
   # Code from module striconveha:
@@ -9033,8 +8287,6 @@
   # Code from module strstr:
   # Code from module strstr-simple:
   # Code from module sys_stat:
-  # Code from module sys_time:
-  # Code from module sys_types:
   # Code from module threadlib:
 
 
@@ -9063,11 +8315,13 @@
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
   # Code from module unlocked-io:
+  # Code from module unused-parameter:
   # Code from module vasnprintf:
   # Code from module vasprintf:
   # Code from module verify:
+  # Code from module warn-on-use:
   # Code from module wchar:
-  # Code from module wctype-h:
+  # Code from module wctype:
   # Code from module wcwidth:
   # Code from module xalloc:
   # Code from module xalloc-die:
@@ -9086,7 +8340,7 @@
     mingw* | cygwin*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
 $as_echo_n "checking for auto-import of symbols... " >&6; }
-      if ${gl_cv_ld_autoimport+:} false; then :
+      if test "${gl_cv_ld_autoimport+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9130,8 +8384,8 @@
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.2.6'
+macro_revision='1.3012'
 
 
 
@@ -9147,78 +8401,9 @@
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -9238,7 +8423,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -9273,7 +8458,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -9300,7 +8485,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -9317,7 +8502,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -9352,7 +8537,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -9431,7 +8616,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -9468,10 +8653,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -9498,7 +8683,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -9506,7 +8691,10 @@
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+  if test -n "$ac_tool_prefix" \
+     && { test "$build" = "$host" \
+          || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
+        }; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -9523,13 +8711,13 @@
 	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 	*/dev/null* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
+	  break
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
+	    break
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -9561,7 +8749,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -9573,7 +8761,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9605,7 +8793,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -9617,7 +8805,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9677,18 +8865,18 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:8873: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:8876: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  (eval echo "\"\$as_me:8879: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -9712,7 +8900,7 @@
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -9745,11 +8933,6 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -9775,11 +8958,6 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -9819,8 +8997,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -9862,8 +9040,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -9912,83 +9090,9 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
@@ -10002,11 +9106,6 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -10029,7 +9128,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -10041,7 +9140,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10069,7 +9168,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -10081,7 +9180,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10125,7 +9224,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -10167,18 +9266,16 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc*)
+cegcc)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -10208,10 +9305,6 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -10220,11 +9313,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -10245,8 +9338,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -10327,177 +9420,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
@@ -10506,13 +9436,11 @@
 
 
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -10524,8 +9452,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -10545,18 +9473,14 @@
 fi
 
 
-    test -n "$AR" && break
-  done
 fi
-if test -z "$AR"; then
+if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -10568,8 +9492,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -10588,10 +9512,6 @@
 $as_echo "no" >&6; }
 fi
 
-
-  test -n "$ac_ct_AR" && break
-done
-
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -10603,72 +9523,16 @@
 esac
     AR=$ac_ct_AR
   fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  AR="$ac_cv_prog_AR"
+fi
 
-int
-main ()
-{
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
 
 
 
@@ -10681,7 +9545,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -10693,7 +9557,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10721,7 +9585,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -10733,7 +9597,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10780,7 +9644,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -10792,7 +9656,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10820,7 +9684,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -10832,7 +9696,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10882,27 +9746,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
 
 
 
@@ -10949,7 +9801,7 @@
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11010,8 +9862,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -11035,7 +9887,6 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -11048,7 +9899,6 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -11074,8 +9924,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -11090,18 +9940,6 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -11113,7 +9951,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
+const struct {
   const char *name;
   void       *address;
 }
@@ -11139,8 +9977,8 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -11150,8 +9988,8 @@
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -11188,27 +10026,6 @@
 $as_echo "ok" >&6; }
 fi
 
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -11221,38 +10038,10 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
 
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
 
 
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
@@ -11289,7 +10078,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  echo '#line 10081 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11383,7 +10172,7 @@
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -11424,7 +10213,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-*-*solaris*)
+sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -11435,20 +10224,7 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -11464,123 +10240,6 @@
 
 need_locks="$enable_libtool_lock"
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
 
   case $host_os in
     rhapsody* | darwin*)
@@ -11589,7 +10248,7 @@
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -11601,7 +10260,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11629,7 +10288,7 @@
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -11641,7 +10300,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11681,7 +10340,7 @@
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -11693,7 +10352,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11721,7 +10380,7 @@
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -11733,7 +10392,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11773,7 +10432,7 @@
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -11785,7 +10444,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11813,7 +10472,7 @@
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -11825,7 +10484,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11865,7 +10524,7 @@
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -11877,7 +10536,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11905,7 +10564,7 @@
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -11917,7 +10576,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11957,7 +10616,7 @@
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -11969,7 +10628,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -11997,7 +10656,7 @@
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -12009,7 +10668,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12072,7 +10731,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -12088,13 +10747,7 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -12105,10 +10758,9 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
@@ -12138,41 +10790,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -12200,7 +10817,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test "$DSYMUTIL" != ":"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -12212,7 +10829,7 @@
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -12223,19 +10840,17 @@
 
 
 
-
-
 # Set options
 enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
+if test "${ac_cv_prog_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -12247,7 +10862,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12275,7 +10890,7 @@
 set dummy as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
@@ -12287,7 +10902,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12327,7 +10942,7 @@
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
@@ -12339,7 +10954,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12367,7 +10982,7 @@
 set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
@@ -12379,7 +10994,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12419,7 +11034,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -12431,7 +11046,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12459,7 +11074,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -12471,7 +11086,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12598,22 +11213,7 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+  withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
 fi
@@ -12690,11 +11290,6 @@
 
 
 
-
-
-
-
-
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -12716,7 +11311,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -12744,6 +11339,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -12756,6 +11364,23 @@
   ;;
 esac
 
+# 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'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -12784,7 +11409,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -12794,7 +11419,7 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -12860,7 +11485,7 @@
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -12993,16 +11618,11 @@
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -13018,15 +11638,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11641: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:11645: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -13055,6 +11675,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -13102,12 +11724,6 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -13150,15 +11766,6 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -13200,7 +11807,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -13221,13 +11828,7 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+      pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -13239,40 +11840,25 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -13304,7 +11890,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+      f77* | f90* | f95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -13361,17 +11947,13 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -13379,7 +11961,7 @@
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -13395,15 +11977,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11980: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:11984: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -13432,18 +12014,13 @@
 
 
 
-
-
-
-
-
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -13456,7 +12033,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -13486,7 +12063,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -13505,16 +12082,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12085: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:12089: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -13541,7 +12118,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -13560,16 +12137,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12140: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:12144: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -13635,6 +12212,7 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -13681,33 +12259,7 @@
   esac
 
   ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -13725,7 +12277,6 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -13741,12 +12292,11 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
 _LT_EOF
       fi
@@ -13782,12 +12332,10 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -13805,11 +12353,6 @@
       fi
       ;;
 
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -13825,7 +12368,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -13835,16 +12378,15 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=' $pic_flag'
+	tmp_addflag=
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -13855,17 +12397,13 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -13881,16 +12419,17 @@
         fi
 
 	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
+	xlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -13904,8 +12443,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -13923,8 +12462,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -13970,8 +12509,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -14011,10 +12550,8 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -14101,13 +12638,7 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14120,32 +12651,25 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -14154,13 +12678,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14173,42 +12691,30 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -14240,64 +12746,20 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     darwin* | rhapsody*)
@@ -14307,12 +12769,7 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
+  whole_archive_flag_spec=''
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -14320,7 +12777,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -14338,6 +12795,10 @@
       hardcode_shlibpath_var=no
       ;;
 
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -14350,7 +12811,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -14359,7 +12820,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -14367,7 +12828,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -14382,13 +12843,14 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -14400,16 +12862,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -14421,46 +12883,7 @@
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
@@ -14488,39 +12911,26 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo (void) { return 0; }
+int foo(void) {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
+        LDFLAGS="$save_LDFLAGS"
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -14582,17 +12992,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -14602,13 +13012,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -14621,9 +13031,9 @@
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -14811,50 +13221,44 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
@@ -15012,6 +13416,11 @@
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15020,23 +13429,16 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -15049,7 +13451,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -15069,13 +13471,7 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -15101,7 +13497,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15110,7 +13506,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15163,7 +13559,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -15175,7 +13571,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15194,9 +13590,8 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -15217,83 +13612,36 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
     ;;
   esac
+  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -15314,7 +13662,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -15322,6 +13670,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -15329,7 +13681,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -15347,7 +13699,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -15367,26 +13719,12 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -15439,7 +13777,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -15455,7 +13793,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -15492,9 +13830,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15502,17 +13840,12 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15525,17 +13858,13 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -15544,7 +13873,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15576,7 +13905,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -15645,7 +13974,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15670,7 +13999,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15694,7 +14023,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -15725,7 +14054,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15735,7 +14064,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15924,7 +14253,7 @@
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15958,7 +14287,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -15972,12 +14301,12 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16011,16 +14340,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16054,12 +14383,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16093,12 +14422,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16132,7 +14461,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -16173,7 +14502,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -16182,7 +14511,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 14514 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16223,13 +14552,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -16238,11 +14561,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -16279,7 +14598,7 @@
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -16288,7 +14607,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 14610 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16329,13 +14648,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -16344,11 +14657,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -16517,8 +14826,6 @@
 
 
 
-
-
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -16533,7 +14840,7 @@
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RC+:} false; then :
+if test "${ac_cv_prog_RC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RC"; then
@@ -16545,7 +14852,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16573,7 +14880,7 @@
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RC+:} false; then :
+if test "${ac_cv_prog_ac_ct_RC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RC"; then
@@ -16585,7 +14892,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RC="windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16669,11 +14976,9 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
-CFLAGS=
 compiler=$CC
 compiler_RC=$CC
 for cc_temp in $compiler""; do
@@ -16684,7 +14989,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 lt_cv_prog_compiler_c_o_RC=yes
 
@@ -16702,8 +15007,15 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
+
+
+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' ;;
+  *) LTNOUNDEF='' ;;
+esac
 
 
 case "$host_os" in
@@ -16719,10 +15031,6 @@
 fi
 
 
-case "$host_os" in
-  cygwin*) ac_cv_lib_error_at_line=no ;;
-esac
-
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
@@ -16740,7 +15048,7 @@
 
 
 
-      GETTEXT_MACRO_VERSION=0.19
+      GETTEXT_MACRO_VERSION=0.18
 
 
 
@@ -16748,14 +15056,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -16776,7 +15085,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -16817,7 +15126,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -16831,7 +15140,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16870,14 +15179,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -16898,7 +15208,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -16947,14 +15257,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -16975,7 +15286,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -17024,7 +15335,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2 or newer" >&5
 $as_echo_n "checking whether we are using the GNU C Library 2 or newer... " >&6; }
-if ${ac_cv_gnu_library_2+:} false; then :
+if test "${ac_cv_gnu_library_2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17032,7 +15343,7 @@
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
@@ -17062,7 +15373,7 @@
   if test -n "$GCC"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 $as_echo_n "checking whether the -Werror option is usable... " >&6; }
-    if ${gl_cv_cc_vis_werror+:} false; then :
+    if test "${gl_cv_cc_vis_werror+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17092,7 +15403,7 @@
 $as_echo "$gl_cv_cc_vis_werror" >&6; }
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 $as_echo_n "checking for simple visibility declarations... " >&6; }
-    if ${gl_cv_cc_visibility+:} false; then :
+    if test "${gl_cv_cc_visibility+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17104,11 +15415,10 @@
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-             void dummyfunc (void) {}
-
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+         void dummyfunc (void) {}
 int
 main ()
 {
@@ -17143,7 +15453,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
+if test "${ac_cv_c_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -17184,7 +15494,7 @@
 esac
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
 else
 
@@ -17197,13 +15507,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
 $as_echo_n "checking for stdint.h... " >&6; }
-if ${gl_cv_header_stdint_h+:} false; then :
+if test "${gl_cv_header_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-            #include <stdint.h>
+#include <stdint.h>
 int
 main ()
 {
@@ -17233,7 +15543,7 @@
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
+if test "${ac_cv_working_alloca_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17266,7 +15576,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+if test "${ac_cv_func_alloca_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17285,7 +15595,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
+char *alloca ();
 #    endif
 #   endif
 #  endif
@@ -17329,7 +15639,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
+if test "${ac_cv_os_cray+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17356,7 +15666,8 @@
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -17370,7 +15681,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -17380,20 +15691,23 @@
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction (int *addr, int depth)
+find_stack_direction ()
 {
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
 }
 
 int
-main (int argc, char **argv)
+main ()
 {
-  return find_stack_direction (0, argc + !argv + 20) < 0;
+  return find_stack_direction () < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -17418,12 +15732,13 @@
 
 
 
-  for ac_header in $ac_header_list
+
+  for ac_header in $gl_header_list
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17439,10 +15754,30 @@
 
 
 
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
 for ac_func in getpagesize
 do :
   ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPAGESIZE 1
 _ACEOF
@@ -17452,7 +15787,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -17529,7 +15864,6 @@
 main ()
 {
   char *data, *data2, *data3;
-  const char *cdata2;
   int i, pagesize;
   int fd, fd2;
 
@@ -17554,10 +15888,10 @@
   fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
   if (fd2 < 0)
     return 4;
-  cdata2 = "";
-  if (write (fd2, cdata2, 1) != 1)
+  data2 = "";
+  if (write (fd2, data2, 1) != 1)
     return 5;
-  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
   if (data2 == MAP_FAILED)
     return 6;
   for (i = 0; i < pagesize; ++i)
@@ -17620,14 +15954,14 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5
 $as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
-if ${gt_cv_int_divbyzero_sigfpe+:} false; then :
+if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
       gt_cv_int_divbyzero_sigfpe=
       case "$host_os" in
         macos* | darwin[6-9]* | darwin[1-9][0-9]*)
-          # On Mac OS X 10.2 or newer, just assume the same as when cross-
+          # On MacOS X 10.2 or newer, just assume the same as when cross-
           # compiling. If we were to perform the real test, 1 Crash Report
           # dialog window would pop up.
           case "$host_cpu" in
@@ -17680,7 +16014,7 @@
 
   z = x / y;
   nan = y / y;
-  exit (2);
+  exit (1);
 }
 
 _ACEOF
@@ -17711,15 +16045,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
 $as_echo_n "checking for inttypes.h... " >&6; }
-if ${gl_cv_header_inttypes_h+:} false; then :
+if test "${gl_cv_header_inttypes_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <sys/types.h>
 #include <inttypes.h>
-
 int
 main ()
 {
@@ -17748,12 +16080,10 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
 $as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   /* For now, do not test the preprocessor; as of 2007 there are too many
@@ -17786,13 +16116,12 @@
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-
+  ac_cv_type_unsigned_long_long_int=yes
 else
   ac_cv_type_unsigned_long_long_int=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
@@ -17825,7 +16154,7 @@
   for ac_header in inttypes.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_inttypes_h" = xyes; then :
+if test "x$ac_cv_header_inttypes_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INTTYPES_H 1
 _ACEOF
@@ -17837,13 +16166,12 @@
   if test $ac_cv_header_inttypes_h = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
 $as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
-if ${gt_cv_inttypes_pri_broken+:} false; then :
+if test "${gt_cv_inttypes_pri_broken+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <inttypes.h>
 #ifdef PRId32
 char *p = PRId32;
@@ -17897,7 +16225,6 @@
   prefix="$acl_save_prefix"
 
 
-
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -17908,21 +16235,21 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -17932,11 +16259,11 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
+    [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -17957,30 +16284,27 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
+if test "${acl_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
+        test "$with_gnu_ld" != no && break ;;
       *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+        test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
-  IFS="$acl_save_ifs"
+  IFS="$ac_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -17994,20 +16318,18 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
+  acl_cv_prog_gnu_ld=yes ;;
 *)
-  acl_cv_prog_gnu_ld=no
-  ;;
+  acl_cv_prog_gnu_ld=no ;;
 esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -18019,7 +16341,7 @@
 
                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
+if test "${acl_cv_rpath+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -18057,7 +16379,7 @@
     solaris*)
                                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
 $as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
+if test "${gl_cv_solaris_64bit+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18122,7 +16444,7 @@
   if test "$gl_use_threads" != no; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 $as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
-if ${gl_cv_have_weak+:} false; then :
+if test "${gl_cv_have_weak+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gl_cv_have_weak=no
@@ -18190,7 +16512,7 @@
       # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
       # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
       ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
   gl_have_pthread_h=yes
 else
   gl_have_pthread_h=no
@@ -18205,47 +16527,31 @@
         # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
         # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
         # the second one only in libpthread, and lock.c needs it.
-        #
-        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
-        # needs -pthread for some reason.  See:
-        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
-        save_LIBS=$LIBS
-        for gl_pthread in '' '-pthread'; do
-          LIBS="$LIBS $gl_pthread"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
-                 pthread_mutex_t m;
-                 pthread_mutexattr_t ma;
-
 int
 main ()
 {
-pthread_mutex_lock (&m);
-                 pthread_mutexattr_init (&ma);
+pthread_mutex_lock((pthread_mutex_t*)0);
+           pthread_mutexattr_init((pthread_mutexattr_t*)0);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   gl_have_pthread=yes
-             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
-             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-          LIBS=$save_LIBS
-          test -n "$gl_have_pthread" && break
-        done
-
         # Test for libpthread by looking for pthread_kill. (Not pthread_self,
         # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
+        if test -n "$gl_have_pthread"; then
           # The program links fine without libpthread. But it may actually
           # need to link with libpthread in order to create multiple threads.
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18279,7 +16585,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
   LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
              # On Solaris and HP-UX, most pthread functions exist also in libc.
              # Therefore pthread_in_use() needs to actually try to create a
@@ -18294,11 +16600,11 @@
 
 fi
 
-        elif test -z "$gl_have_pthread"; then
+        else
           # Some library is needed. Try libpthread and libc_r.
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18332,7 +16638,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
   gl_have_pthread=yes
              LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
              LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
@@ -18342,7 +16648,7 @@
             # For FreeBSD 4.
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
 $as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_pthread_kill+:} false; then :
+if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18376,7 +16682,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
 $as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then :
   gl_have_pthread=yes
                LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
                LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
@@ -18408,10 +16714,8 @@
         LIBS="$LIBS -lthread"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <thread.h>
 #include <synch.h>
-
 int
 main ()
 {
@@ -18454,7 +16758,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
 $as_echo_n "checking how to link with libpth... " >&6; }
-if ${ac_cv_libpth_libs+:} false; then :
+if test "${ac_cv_libpth_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -18532,7 +16836,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -18963,7 +17267,7 @@
 
       gl_have_pth=
       gl_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBPTH"
+      LIBS="$LIBS -lpth"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pth.h>
@@ -19004,20 +17308,18 @@
       fi
     fi
     if test -z "$gl_have_pthread"; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
+        if { case "$host_os" in
+               mingw*) true;;
+               *) false;;
+             esac
+           }; then
+          gl_threads_api=win32
 
-$as_echo "#define USE_WINDOWS_THREADS 1" >>confdefs.h
+$as_echo "#define USE_WIN32_THREADS 1" >>confdefs.h
 
-          fi
-          ;;
-      esac
+        fi
+      fi
     fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
@@ -19036,11 +17338,11 @@
 
 
   if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
+    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
     ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
 "
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then :
 
 $as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
@@ -19049,22 +17351,16 @@
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-      #include <pthread.h>
+#include <pthread.h>
 int
 main ()
 {
-
 #if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
 #endif
-
   ;
   return 0;
 }
@@ -19076,7 +17372,9 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
-  :
+
+
+
 
 
 
@@ -19156,7 +17454,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -19545,22 +17843,6 @@
 
 
 
-  GNULIB_ICONV=0;
-    ICONV_CONST=;
-  REPLACE_ICONV=0;
-  REPLACE_ICONV_OPEN=0;
-  REPLACE_ICONV_UTF=0;
-  ICONV_H='';
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
-
-
 
 
 
@@ -19592,7 +17874,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
+if test "${am_cv_func_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19600,16 +17882,14 @@
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <stdlib.h>
 #include <iconv.h>
-
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
   ;
   return 0;
 }
@@ -19624,16 +17904,14 @@
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <stdlib.h>
 #include <iconv.h>
-
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
   ;
   return 0;
 }
@@ -19653,21 +17931,19 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
+if test "${am_cv_func_iconv_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-                  am_save_LIBS="$LIBS"
+            am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
+  case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
-
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19676,7 +17952,6 @@
 #include <string.h>
 int main ()
 {
-  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -19693,8 +17968,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
+          return 1;
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -19713,27 +17987,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        const char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
+          return 1;
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -19752,8 +18006,7 @@
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
+          return 1;
       }
   }
 #endif
@@ -19767,8 +18020,8 @@
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
+    return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -19813,7 +18066,7 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
 $as_echo_n "checking for iconv declaration... " >&6; }
-    if ${am_cv_proto_iconv+:} false; then :
+    if test "${am_cv_proto_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19826,7 +18079,7 @@
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
+#if defined(__STDC__) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
@@ -19859,11 +18112,6 @@
 #define ICONV_CONST $am_cv_proto_iconv_arg1
 _ACEOF
 
-
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
-
   fi
 
 
@@ -19892,7 +18140,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -19907,7 +18156,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -19916,39 +18166,98 @@
 done
 
 
-          ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl_feof_unlocked" = xyes; then :
-  ac_have_decl=1
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
+$as_echo_n "checking whether feof_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef feof_unlocked
+  char *p = (char *) feof_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_feof_unlocked=yes
+else
+  ac_cv_have_decl_feof_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
+$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
+  if test $ac_cv_have_decl_feof_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl
+#define HAVE_DECL_FEOF_UNLOCKED $gt_value
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl_fgets_unlocked" = xyes; then :
-  ac_have_decl=1
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
+$as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef fgets_unlocked
+  char *p = (char *) fgets_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_fgets_unlocked=yes
+else
+  ac_cv_have_decl_fgets_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
+$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
+  if test $ac_cv_have_decl_fgets_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl
+#define HAVE_DECL_FGETS_UNLOCKED $gt_value
 _ACEOF
 
 
 
 
-                    for ac_prog in bison
+
+                      for ac_prog in bison
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_INTLBISON+:} false; then :
+if test "${ac_cv_prog_INTLBISON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$INTLBISON"; then
@@ -19960,7 +18269,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_INTLBISON="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -19992,7 +18301,7 @@
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      2.[7-9]* | [3-9].*)
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
     esac
@@ -20004,47 +18313,75 @@
   fi
 
 
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
 $as_echo_n "checking for long long int... " >&6; }
-if ${ac_cv_type_long_long_int+:} false; then :
+if test "${ac_cv_type_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* For now, do not test the preprocessor; as of 2007 there are too many
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+                          if test "$cross_compiling" = yes; then :
   ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-                                        if test "$cross_compiling" = yes; then :
-  :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
-                 #ifndef LLONG_MAX
-                 # define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 # define LLONG_MAX (HALF - 1 + HALF)
-                 #endif
+               #ifndef LLONG_MAX
+               # define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               # define LLONG_MAX (HALF - 1 + HALF)
+               #endif
 int
 main ()
 {
 long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-
+  ac_cv_type_long_long_int=yes
 else
   ac_cv_type_long_long_int=no
 fi
@@ -20052,8 +18389,11 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-        fi
-      fi
+else
+  ac_cv_type_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
 $as_echo "$ac_cv_type_long_long_int" >&6; }
@@ -20066,13 +18406,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 $as_echo_n "checking for wchar_t... " >&6; }
-if ${gt_cv_c_wchar_t+:} false; then :
+if test "${gt_cv_c_wchar_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';
+       wchar_t foo = (wchar_t)'\0';
 int
 main ()
 {
@@ -20099,7 +18439,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 $as_echo_n "checking for wint_t... " >&6; }
-if ${gt_cv_c_wint_t+:} false; then :
+if test "${gt_cv_c_wint_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20113,7 +18453,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-            wint_t foo = (wchar_t)'\0';
+       wint_t foo = (wchar_t)'\0';
 int
 main ()
 {
@@ -20142,7 +18482,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
 $as_echo_n "checking for intmax_t... " >&6; }
-if ${gt_cv_c_intmax_t+:} false; then :
+if test "${gt_cv_c_intmax_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20161,7 +18501,7 @@
 main ()
 {
 intmax_t x = -1;
-            return !x;
+        return !x;
   ;
   return 0;
 }
@@ -20185,13 +18525,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5
 $as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; }
-if ${gt_cv_func_printf_posix+:} false; then :
+if test "${gt_cv_func_printf_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
       if test "$cross_compiling" = yes; then :
 
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
@@ -20246,9 +18586,9 @@
   esac
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if ${ac_cv_gnu_library_2_1+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20260,13 +18600,10 @@
   Lucky GNU user
  #endif
 #endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky" >/dev/null 2>&1; then :
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2_1=yes
 else
   ac_cv_gnu_library_2_1=no
@@ -20286,7 +18623,7 @@
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -20297,7 +18634,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 $as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
+if test "${gl_cv_size_max+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20339,8 +18676,8 @@
                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
+            extern size_t foo;
+            extern unsigned long foo;
 
 int
 main ()
@@ -20379,10 +18716,11 @@
 
 
 
+
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -20394,29 +18732,9 @@
 
 
 
-
-  for ac_func in $ac_func_list
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 $as_echo_n "checking for working fcntl.h... " >&6; }
-if ${gl_cv_header_working_fcntl_h+:} false; then :
+if test "${gl_cv_header_working_fcntl_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -20426,13 +18744,7 @@
 /* end confdefs.h.  */
 #include <sys/types.h>
            #include <sys/stat.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <io.h>
-           # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
-           #endif
+           #include <unistd.h>
            #include <fcntl.h>
            #ifndef O_NOATIME
             #define O_NOATIME 0
@@ -20450,69 +18762,29 @@
 main ()
 {
 
-            int result = !constants;
-            #if HAVE_SYMLINK
+            int status = !constants;
             {
               static char const sym[] = "conftest.sym";
-              if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
+              if (symlink (".", sym) != 0
+                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
+                status |= 32;
               unlink (sym);
             }
-            #endif
             {
               static char const file[] = "confdefs.h";
               int fd = open (file, O_RDONLY | O_NOATIME);
-              if (fd < 0)
-                result |= 8;
-              else
-                {
-                  struct stat st0;
-                  if (fstat (fd, &st0) != 0)
-                    result |= 16;
-                  else
-                    {
-                      char c;
-                      sleep (1);
-                      if (read (fd, &c, 1) != 1)
-                        result |= 24;
-                      else
-                        {
-                          if (close (fd) != 0)
-                            result |= 32;
-                          else
-                            {
-                              struct stat st1;
-                              if (stat (file, &st1) != 0)
-                                result |= 40;
-                              else
-                                if (st0.st_atime != st1.st_atime)
-                                  result |= 64;
-                            }
-                        }
-                    }
-                }
+              char c;
+              struct stat st0, st1;
+              if (fd < 0
+                  || fstat (fd, &st0) != 0
+                  || sleep (1) != 0
+                  || read (fd, &c, 1) != 1
+                  || close (fd) != 0
+                  || stat (file, &st1) != 0
+                  || st0.st_atime != st1.st_atime)
+                status |= 64;
             }
-            return result;
+            return status;
   ;
   return 0;
 }
@@ -20521,9 +18793,9 @@
   gl_cv_header_working_fcntl_h=yes
 else
   case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
         64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
          *) gl_cv_header_working_fcntl_h='no';;
         esac
 fi
@@ -20558,7 +18830,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -20592,7 +18864,7 @@
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -20635,11 +18907,6 @@
 
 
 
-
-
-
-
-
     case "$enable_silent_rules" in
     yes) INTL_DEFAULT_VERBOSITY=0;;
     no)  INTL_DEFAULT_VERBOSITY=1;;
@@ -20648,7 +18915,7 @@
 
 
   ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 else
 
@@ -20657,11 +18924,12 @@
 
 fi
 
-  for ac_header in features.h stddef.h stdlib.h string.h
+  for ac_header in stddef.h stdlib.h string.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -20675,7 +18943,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -20684,43 +18953,131 @@
 done
 
 
-      ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl__snprintf" = xyes; then :
-  ac_have_decl=1
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snprintf is declared" >&5
+$as_echo_n "checking whether _snprintf is declared... " >&6; }
+if test "${ac_cv_have_decl__snprintf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef _snprintf
+  char *p = (char *) _snprintf;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl__snprintf=yes
+else
+  ac_cv_have_decl__snprintf=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5
+$as_echo "$ac_cv_have_decl__snprintf" >&6; }
+  if test $ac_cv_have_decl__snprintf = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNPRINTF $ac_have_decl
+#define HAVE_DECL__SNPRINTF $gt_value
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "_snwprintf" "ac_cv_have_decl__snwprintf" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl__snwprintf" = xyes; then :
-  ac_have_decl=1
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5
+$as_echo_n "checking whether _snwprintf is declared... " >&6; }
+if test "${ac_cv_have_decl__snwprintf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef _snwprintf
+  char *p = (char *) _snwprintf;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl__snwprintf=yes
+else
+  ac_cv_have_decl__snwprintf=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5
+$as_echo "$ac_cv_have_decl__snwprintf" >&6; }
+  if test $ac_cv_have_decl__snwprintf = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNWPRINTF $ac_have_decl
+#define HAVE_DECL__SNWPRINTF $gt_value
 _ACEOF
 
 
-          ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "#include <stdio.h>
-"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
-  ac_have_decl=1
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5
+$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef getc_unlocked
+  char *p = (char *) getc_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_getc_unlocked=yes
+else
+  ac_cv_have_decl_getc_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5
+$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
+  if test $ac_cv_have_decl_getc_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+#define HAVE_DECL_GETC_UNLOCKED $gt_value
 _ACEOF
 
 
+
   case $gt_cv_func_printf_posix in
     *yes) HAVE_POSIX_PRINTF=1 ;;
     *) HAVE_POSIX_PRINTF=0 ;;
@@ -20754,7 +19111,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if ${am_cv_langinfo_codeset+:} false; then :
+if test "${am_cv_langinfo_codeset+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20788,7 +19145,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if ${gt_cv_val_LC_MESSAGES+:} false; then :
+if test "${gt_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20842,7 +19199,7 @@
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINDRES+:} false; then :
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$WINDRES"; then
@@ -20854,7 +19211,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -20882,7 +19239,7 @@
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_WINDRES"; then
@@ -20894,7 +19251,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_WINDRES="windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -20964,7 +19321,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -20998,7 +19355,7 @@
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -21093,24 +19450,20 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
-
 int
 main ()
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-
   ;
   return 0;
 }
@@ -21203,7 +19556,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -21592,7 +19945,7 @@
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -21601,7 +19954,6 @@
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -21610,14 +19962,11 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-
 int
 main ()
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
   ;
   return 0;
 }
@@ -21633,7 +19982,6 @@
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -21642,22 +19990,19 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-
 int
 main ()
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -21907,105 +20252,38 @@
 
 
 
-
           LIBC_FATAL_STDERR_=1
   export LIBC_FATAL_STDERR_
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use C++" >&5
-$as_echo_n "checking whether to use C++... " >&6; }
-    # Check whether --enable-c++ was given.
-if test "${enable_c__+set}" = set; then :
-  enableval=$enable_c__; CXX_CHOICE="$enableval"
-else
-  CXX_CHOICE=yes
+
+
+
+
+
+
+  for ac_func in $gl_func_list
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
 fi
+done
+
+
+
+
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX_CHOICE" >&5
-$as_echo "$CXX_CHOICE" >&6; }
 
 
 
-  GNULIB__EXIT=0;
-  GNULIB_ATOLL=0;
-  GNULIB_CALLOC_POSIX=0;
-  GNULIB_CANONICALIZE_FILE_NAME=0;
-  GNULIB_GETLOADAVG=0;
-  GNULIB_GETSUBOPT=0;
-  GNULIB_GRANTPT=0;
-  GNULIB_MALLOC_POSIX=0;
-  GNULIB_MBTOWC=0;
-  GNULIB_MKDTEMP=0;
-  GNULIB_MKOSTEMP=0;
-  GNULIB_MKOSTEMPS=0;
-  GNULIB_MKSTEMP=0;
-  GNULIB_MKSTEMPS=0;
-  GNULIB_POSIX_OPENPT=0;
-  GNULIB_PTSNAME=0;
-  GNULIB_PTSNAME_R=0;
-  GNULIB_PUTENV=0;
-  GNULIB_QSORT_R=0;
-  GNULIB_RANDOM=0;
-  GNULIB_RANDOM_R=0;
-  GNULIB_REALLOC_POSIX=0;
-  GNULIB_REALPATH=0;
-  GNULIB_RPMATCH=0;
-  GNULIB_SECURE_GETENV=0;
-  GNULIB_SETENV=0;
-  GNULIB_STRTOD=0;
-  GNULIB_STRTOLL=0;
-  GNULIB_STRTOULL=0;
-  GNULIB_SYSTEM_POSIX=0;
-  GNULIB_UNLOCKPT=0;
-  GNULIB_UNSETENV=0;
-  GNULIB_WCTOMB=0;
-    HAVE__EXIT=1;
-  HAVE_ATOLL=1;
-  HAVE_CANONICALIZE_FILE_NAME=1;
-  HAVE_DECL_GETLOADAVG=1;
-  HAVE_GETSUBOPT=1;
-  HAVE_GRANTPT=1;
-  HAVE_MKDTEMP=1;
-  HAVE_MKOSTEMP=1;
-  HAVE_MKOSTEMPS=1;
-  HAVE_MKSTEMP=1;
-  HAVE_MKSTEMPS=1;
-  HAVE_POSIX_OPENPT=1;
-  HAVE_PTSNAME=1;
-  HAVE_PTSNAME_R=1;
-  HAVE_RANDOM=1;
-  HAVE_RANDOM_H=1;
-  HAVE_RANDOM_R=1;
-  HAVE_REALPATH=1;
-  HAVE_RPMATCH=1;
-  HAVE_SECURE_GETENV=1;
-  HAVE_SETENV=1;
-  HAVE_DECL_SETENV=1;
-  HAVE_STRTOD=1;
-  HAVE_STRTOLL=1;
-  HAVE_STRTOULL=1;
-  HAVE_STRUCT_RANDOM_DATA=1;
-  HAVE_SYS_LOADAVG_H=0;
-  HAVE_UNLOCKPT=1;
-  HAVE_DECL_UNSETENV=1;
-  REPLACE_CALLOC=0;
-  REPLACE_CANONICALIZE_FILE_NAME=0;
-  REPLACE_MALLOC=0;
-  REPLACE_MBTOWC=0;
-  REPLACE_MKSTEMP=0;
-  REPLACE_PTSNAME=0;
-  REPLACE_PTSNAME_R=0;
-  REPLACE_PUTENV=0;
-  REPLACE_QSORT_R=0;
-  REPLACE_RANDOM_R=0;
-  REPLACE_REALLOC=0;
-  REPLACE_REALPATH=0;
-  REPLACE_SETENV=0;
-  REPLACE_STRTOD=0;
-  REPLACE_UNSETENV=0;
-  REPLACE_WCTOMB=0;
 
 
 
@@ -22017,7 +20295,7 @@
 
   { $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 :
+if test "${gl_cv_double_slash_root+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
    if test x"$cross_compiling" = xyes ; then
@@ -22056,170 +20334,39 @@
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+
+
+
+  :
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 $as_echo_n "checking whether realpath works... " >&6; }
-if ${gl_cv_func_realpath_works+:} false; then :
+if test "${gl_cv_func_realpath_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
     touch conftest.a
-    mkdir conftest.d
     if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                       # Guess yes on glibc systems.
-        *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-                       # If we don't know, assume the worst.
-        *)             gl_cv_func_realpath_works="guessing no" ;;
-      esac
-
+  gl_cv_func_realpath_works="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
-
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-
         #include <stdlib.h>
-        #include <string.h>
 
 int
 main ()
 {
 
-        int result = 0;
-        {
-          char *name = realpath ("conftest.a", NULL);
-          if (!(name && *name == '/'))
-            result |= 1;
-        }
-        {
-          char *name = realpath ("conftest.b/../conftest.a", NULL);
-          if (name != NULL)
-            result |= 2;
-        }
-        {
-          char *name = realpath ("conftest.a/", NULL);
-          if (name != NULL)
-            result |= 4;
-        }
-        {
-          char *name1 = realpath (".", NULL);
-          char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
-            result |= 8;
-        }
-        return result;
+        char *name1 = realpath ("conftest.a", NULL);
+        char *name2 = realpath ("conftest.b/../conftest.a", NULL);
+        char *name3 = realpath ("conftest.a/", NULL);
+        return !(name1 && *name1 == '/' && !name2 && !name3);
 
   ;
   return 0;
@@ -22235,33 +20382,107 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-    rm -rf conftest.a conftest.d
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
 $as_echo "$gl_cv_func_realpath_works" >&6; }
-  case "$gl_cv_func_realpath_works" in
-    *yes)
+  if test "$gl_cv_func_realpath_works" = yes; then
 
 $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
-      ;;
-  esac
+  fi
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
 
 
 
 
 
 
+  GNULIB_ATOLL=0;
+  GNULIB_CALLOC_POSIX=0;
+  GNULIB_CANONICALIZE_FILE_NAME=0;
+  GNULIB_GETLOADAVG=0;
+  GNULIB_GETSUBOPT=0;
+  GNULIB_GRANTPT=0;
+  GNULIB_MALLOC_POSIX=0;
+  GNULIB_MKDTEMP=0;
+  GNULIB_MKOSTEMP=0;
+  GNULIB_MKOSTEMPS=0;
+  GNULIB_MKSTEMP=0;
+  GNULIB_MKSTEMPS=0;
+  GNULIB_PTSNAME=0;
+  GNULIB_PUTENV=0;
+  GNULIB_RANDOM_R=0;
+  GNULIB_REALLOC_POSIX=0;
+  GNULIB_REALPATH=0;
+  GNULIB_RPMATCH=0;
+  GNULIB_SETENV=0;
+  GNULIB_STRTOD=0;
+  GNULIB_STRTOLL=0;
+  GNULIB_STRTOULL=0;
+  GNULIB_UNLOCKPT=0;
+  GNULIB_UNSETENV=0;
+    HAVE_ATOLL=1;
+  HAVE_CALLOC_POSIX=1;
+  HAVE_CANONICALIZE_FILE_NAME=1;
+  HAVE_DECL_GETLOADAVG=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_GRANTPT=1;
+  HAVE_MALLOC_POSIX=1;
+  HAVE_MKDTEMP=1;
+  HAVE_MKOSTEMP=1;
+  HAVE_MKOSTEMPS=1;
+  HAVE_MKSTEMP=1;
+  HAVE_MKSTEMPS=1;
+  HAVE_PTSNAME=1;
+  HAVE_RANDOM_R=1;
+  HAVE_REALLOC_POSIX=1;
+  HAVE_REALPATH=1;
+  HAVE_RPMATCH=1;
+  HAVE_SETENV=1;
+  HAVE_STRTOD=1;
+  HAVE_STRTOLL=1;
+  HAVE_STRTOULL=1;
+  HAVE_STRUCT_RANDOM_DATA=1;
+  HAVE_SYS_LOADAVG_H=0;
+  HAVE_UNLOCKPT=1;
+  HAVE_UNSETENV=1;
+  REPLACE_CANONICALIZE_FILE_NAME=0;
+  REPLACE_MKSTEMP=0;
+  REPLACE_PUTENV=0;
+  REPLACE_REALPATH=0;
+  REPLACE_SETENV=0;
+  REPLACE_STRTOD=0;
+  REPLACE_UNSETENV=0;
+
+
 
 
 
 
 
-  GNULIB_CHDIR=0;
   GNULIB_CHOWN=0;
   GNULIB_CLOSE=0;
-  GNULIB_DUP=0;
   GNULIB_DUP2=0;
   GNULIB_DUP3=0;
   GNULIB_ENVIRON=0;
@@ -22269,7 +20490,6 @@
   GNULIB_FACCESSAT=0;
   GNULIB_FCHDIR=0;
   GNULIB_FCHOWNAT=0;
-  GNULIB_FDATASYNC=0;
   GNULIB_FSYNC=0;
   GNULIB_FTRUNCATE=0;
   GNULIB_GETCWD=0;
@@ -22281,26 +20501,21 @@
   GNULIB_GETLOGIN_R=0;
   GNULIB_GETPAGESIZE=0;
   GNULIB_GETUSERSHELL=0;
-  GNULIB_GROUP_MEMBER=0;
-  GNULIB_ISATTY=0;
   GNULIB_LCHOWN=0;
   GNULIB_LINK=0;
   GNULIB_LINKAT=0;
   GNULIB_LSEEK=0;
-  GNULIB_PIPE=0;
   GNULIB_PIPE2=0;
   GNULIB_PREAD=0;
   GNULIB_PWRITE=0;
-  GNULIB_READ=0;
   GNULIB_READLINK=0;
   GNULIB_READLINKAT=0;
   GNULIB_RMDIR=0;
-  GNULIB_SETHOSTNAME=0;
   GNULIB_SLEEP=0;
   GNULIB_SYMLINK=0;
   GNULIB_SYMLINKAT=0;
   GNULIB_TTYNAME_R=0;
-  GNULIB_UNISTD_H_NONBLOCKING=0;
+  GNULIB_UNISTD_H_GETOPT=0;
   GNULIB_UNISTD_H_SIGPIPE=0;
   GNULIB_UNLINK=0;
   GNULIB_UNLINKAT=0;
@@ -22313,39 +20528,32 @@
   HAVE_FACCESSAT=1;
   HAVE_FCHDIR=1;
   HAVE_FCHOWNAT=1;
-  HAVE_FDATASYNC=1;
   HAVE_FSYNC=1;
   HAVE_FTRUNCATE=1;
+  HAVE_GETDOMAINNAME=1;
   HAVE_GETDTABLESIZE=1;
   HAVE_GETGROUPS=1;
   HAVE_GETHOSTNAME=1;
   HAVE_GETLOGIN=1;
   HAVE_GETPAGESIZE=1;
-  HAVE_GROUP_MEMBER=1;
   HAVE_LCHOWN=1;
   HAVE_LINK=1;
   HAVE_LINKAT=1;
-  HAVE_PIPE=1;
   HAVE_PIPE2=1;
   HAVE_PREAD=1;
   HAVE_PWRITE=1;
   HAVE_READLINK=1;
   HAVE_READLINKAT=1;
-  HAVE_SETHOSTNAME=1;
   HAVE_SLEEP=1;
   HAVE_SYMLINK=1;
   HAVE_SYMLINKAT=1;
+  HAVE_TTYNAME_R=1;
   HAVE_UNLINKAT=1;
   HAVE_USLEEP=1;
   HAVE_DECL_ENVIRON=1;
-  HAVE_DECL_FCHDIR=1;
-  HAVE_DECL_FDATASYNC=1;
-  HAVE_DECL_GETDOMAINNAME=1;
   HAVE_DECL_GETLOGIN_R=1;
   HAVE_DECL_GETPAGESIZE=1;
   HAVE_DECL_GETUSERSHELL=1;
-  HAVE_DECL_SETHOSTNAME=1;
-  HAVE_DECL_TTYNAME_R=1;
   HAVE_OS_H=0;
   HAVE_SYS_PARAM_H=0;
   REPLACE_CHOWN=0;
@@ -22353,21 +20561,15 @@
   REPLACE_DUP=0;
   REPLACE_DUP2=0;
   REPLACE_FCHOWNAT=0;
-  REPLACE_FTRUNCATE=0;
   REPLACE_GETCWD=0;
-  REPLACE_GETDOMAINNAME=0;
-  REPLACE_GETDTABLESIZE=0;
-  REPLACE_GETLOGIN_R=0;
   REPLACE_GETGROUPS=0;
   REPLACE_GETPAGESIZE=0;
-  REPLACE_ISATTY=0;
   REPLACE_LCHOWN=0;
   REPLACE_LINK=0;
   REPLACE_LINKAT=0;
   REPLACE_LSEEK=0;
   REPLACE_PREAD=0;
   REPLACE_PWRITE=0;
-  REPLACE_READ=0;
   REPLACE_READLINK=0;
   REPLACE_RMDIR=0;
   REPLACE_SLEEP=0;
@@ -22385,48 +20587,56 @@
 
 
 
-  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
 
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+$as_echo_n "checking if environ is properly declared... " >&6; }
+  if test "${gt_cv_var_environ_declaration+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+      extern struct { int foo; } environ;
+int
+main ()
+{
+environ.foo = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_var_environ_declaration=no
+else
+  gt_cv_var_environ_declaration=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+$as_echo "$gt_cv_var_environ_declaration" >&6; }
+  if test $gt_cv_var_environ_declaration = yes; then
+
+$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
-     GNULIB_OPENDIR=0;
-  GNULIB_READDIR=0;
-  GNULIB_REWINDDIR=0;
-  GNULIB_CLOSEDIR=0;
-  GNULIB_DIRFD=0;
-  GNULIB_FDOPENDIR=0;
-  GNULIB_SCANDIR=0;
-  GNULIB_ALPHASORT=0;
-    HAVE_OPENDIR=1;
-  HAVE_READDIR=1;
-  HAVE_REWINDDIR=1;
-  HAVE_CLOSEDIR=1;
-  HAVE_DECL_DIRFD=1;
-  HAVE_DECL_FDOPENDIR=1;
-  HAVE_FDOPENDIR=1;
-  HAVE_SCANDIR=1;
-  HAVE_ALPHASORT=1;
-  REPLACE_OPENDIR=0;
-  REPLACE_CLOSEDIR=0;
-  REPLACE_DIRFD=0;
-  REPLACE_FDOPENDIR=0;
+  fi
 
 
+  if test $gt_cv_var_environ_declaration != yes; then
+    HAVE_DECL_ENVIRON=0
+  fi
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 $as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if ${gl_cv_have_include_next+:} false; then :
+if test "${gl_cv_have_include_next+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -rf conftestd1a conftestd1b conftestd2
@@ -22504,98 +20714,17 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
-$as_echo_n "checking whether system header files limit the line length... " >&6; }
-if ${gl_cv_pragma_columns+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef __TANDEM
-choke me
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "choke me" >/dev/null 2>&1; then :
-  gl_cv_pragma_columns=yes
-else
-  gl_cv_pragma_columns=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
-$as_echo "$gl_cv_pragma_columns" >&6; }
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
-$as_echo_n "checking if environ is properly declared... " >&6; }
-  if ${gt_cv_var_environ_declaration+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if HAVE_UNISTD_H
-     #include <unistd.h>
-     #endif
-     /* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
-     #include <stdlib.h>
-
-           extern struct { int foo; } environ;
-int
-main ()
-{
-environ.foo = 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gt_cv_var_environ_declaration=no
-else
-  gt_cv_var_environ_declaration=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
-$as_echo "$gt_cv_var_environ_declaration" >&6; }
-  if test $gt_cv_var_environ_declaration = yes; then
 
-$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
-  fi
 
 
-  if test $gt_cv_var_environ_declaration != yes; then
-    HAVE_DECL_ENVIRON=0
-  fi
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 $as_echo_n "checking for complete errno.h... " >&6; }
-if ${gl_cv_header_errno_h_complete+:} false; then :
+if test "${gl_cv_header_errno_h_complete+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22603,9 +20732,6 @@
 /* end confdefs.h.  */
 
 #include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
 #if !defined ENOMSG
 booboo
 #endif
@@ -22630,30 +20756,12 @@
 #if !defined ENOTSUP
 booboo
 #endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
 #if !defined ESTALE
 booboo
 #endif
-#if !defined EDQUOT
-booboo
-#endif
 #if !defined ECANCELED
 booboo
 #endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -22675,6 +20783,10 @@
 
 
 
+  :
+
+
+
 
 
 
@@ -22684,45 +20796,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 $as_echo_n "checking absolute name of <errno.h>... " >&6; }
-if ${gl_cv_next_errno_h+:} false; then :
+if test "${gl_cv_next_errno_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_errno_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'errno.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_errno_h
-           gl_cv_next_errno_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/errno.h#{
+                 s#.*"\(.*/errno.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_errno_h='<'errno.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
@@ -22741,23 +20838,14 @@
 
 
 
-
     ERRNO_H='errno.h'
   fi
 
-   if test -n "$ERRNO_H"; then
-  GL_GENERATE_ERRNO_H_TRUE=
-  GL_GENERATE_ERRNO_H_FALSE='#'
-else
-  GL_GENERATE_ERRNO_H_TRUE='#'
-  GL_GENERATE_ERRNO_H_FALSE=
-fi
-
 
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 $as_echo_n "checking for EMULTIHOP value... " >&6; }
-if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then :
+if test "${gl_cv_header_errno_h_EMULTIHOP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22828,7 +20916,7 @@
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 $as_echo_n "checking for ENOLINK value... " >&6; }
-if ${gl_cv_header_errno_h_ENOLINK+:} false; then :
+if test "${gl_cv_header_errno_h_ENOLINK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22899,7 +20987,7 @@
   if test -n "$ERRNO_H"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 $as_echo_n "checking for EOVERFLOW value... " >&6; }
-if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then :
+if test "${gl_cv_header_errno_h_EOVERFLOW+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22968,7 +21056,7 @@
 
 
 ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
+if test "x$ac_cv_have_decl_strerror_r" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -22981,7 +21069,7 @@
 for ac_func in strerror_r
 do :
   ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
-if test "x$ac_cv_func_strerror_r" = xyes; then :
+if test "x$ac_cv_func_strerror_r" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRERROR_R 1
 _ACEOF
@@ -22991,7 +21079,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 $as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if ${ac_cv_func_strerror_r_char_p+:} false; then :
+if test "${ac_cv_func_strerror_r_char_p+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23063,7 +21151,7 @@
   XGETTEXT_EXTRA_OPTIONS=
 
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
+if test "x$ac_cv_type_mode_t" = x""yes; then :
 
 else
 
@@ -23076,7 +21164,7 @@
 
   ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "#include <signal.h>
 "
-if test "x$ac_cv_type_sig_atomic_t" = xyes; then :
+if test "x$ac_cv_type_sig_atomic_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SIG_ATOMIC_T 1
@@ -23092,7 +21180,6 @@
 
 
   GNULIB_FCNTL=0;
-  GNULIB_NONBLOCKING=0;
   GNULIB_OPEN=0;
   GNULIB_OPENAT=0;
     HAVE_FCNTL=1;
@@ -23103,20 +21190,17 @@
 
 
 
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
 
-else
 
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
 
-fi
+
+
+
+
 
 
   ac_fn_c_check_func "$LINENO" "eaccess" "ac_cv_func_eaccess"
-if test "x$ac_cv_func_eaccess" = xyes; then :
+if test "x$ac_cv_func_eaccess" = x""yes; then :
 
 else
 
@@ -23127,22 +21211,20 @@
 
 
 
+
+
+
+
+
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 $as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
+#           include <wchar.h>
 int
 main ()
 {
@@ -23189,33 +21271,52 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   GNULIB_DPRINTF=0;
   GNULIB_FCLOSE=0;
-  GNULIB_FDOPEN=0;
   GNULIB_FFLUSH=0;
-  GNULIB_FGETC=0;
-  GNULIB_FGETS=0;
   GNULIB_FOPEN=0;
   GNULIB_FPRINTF=0;
   GNULIB_FPRINTF_POSIX=0;
   GNULIB_FPURGE=0;
   GNULIB_FPUTC=0;
   GNULIB_FPUTS=0;
-  GNULIB_FREAD=0;
   GNULIB_FREOPEN=0;
-  GNULIB_FSCANF=0;
   GNULIB_FSEEK=0;
   GNULIB_FSEEKO=0;
   GNULIB_FTELL=0;
   GNULIB_FTELLO=0;
   GNULIB_FWRITE=0;
-  GNULIB_GETC=0;
-  GNULIB_GETCHAR=0;
   GNULIB_GETDELIM=0;
   GNULIB_GETLINE=0;
   GNULIB_OBSTACK_PRINTF=0;
   GNULIB_OBSTACK_PRINTF_POSIX=0;
-  GNULIB_PCLOSE=0;
   GNULIB_PERROR=0;
   GNULIB_POPEN=0;
   GNULIB_PRINTF=0;
@@ -23226,15 +21327,11 @@
   GNULIB_REMOVE=0;
   GNULIB_RENAME=0;
   GNULIB_RENAMEAT=0;
-  GNULIB_SCANF=0;
   GNULIB_SNPRINTF=0;
   GNULIB_SPRINTF_POSIX=0;
-  GNULIB_STDIO_H_NONBLOCKING=0;
   GNULIB_STDIO_H_SIGPIPE=0;
   GNULIB_TMPFILE=0;
   GNULIB_VASPRINTF=0;
-  GNULIB_VFSCANF=0;
-  GNULIB_VSCANF=0;
   GNULIB_VDPRINTF=0;
   GNULIB_VFPRINTF=0;
   GNULIB_VFPRINTF_POSIX=0;
@@ -23243,8 +21340,6 @@
   GNULIB_VSNPRINTF=0;
   GNULIB_VSPRINTF_POSIX=0;
     HAVE_DECL_FPURGE=1;
-  HAVE_DECL_FSEEKO=1;
-  HAVE_DECL_FTELLO=1;
   HAVE_DECL_GETDELIM=1;
   HAVE_DECL_GETLINE=1;
   HAVE_DECL_OBSTACK_PRINTF=1;
@@ -23253,14 +21348,11 @@
   HAVE_DPRINTF=1;
   HAVE_FSEEKO=1;
   HAVE_FTELLO=1;
-  HAVE_PCLOSE=1;
-  HAVE_POPEN=1;
   HAVE_RENAMEAT=1;
   HAVE_VASPRINTF=1;
   HAVE_VDPRINTF=1;
   REPLACE_DPRINTF=0;
   REPLACE_FCLOSE=0;
-  REPLACE_FDOPEN=0;
   REPLACE_FFLUSH=0;
   REPLACE_FOPEN=0;
   REPLACE_FPRINTF=0;
@@ -23281,7 +21373,6 @@
   REPLACE_RENAMEAT=0;
   REPLACE_SNPRINTF=0;
   REPLACE_SPRINTF=0;
-  REPLACE_STDIO_READ_FUNCS=0;
   REPLACE_STDIO_WRITE_FUNCS=0;
   REPLACE_TMPFILE=0;
   REPLACE_VASPRINTF=0;
@@ -23292,128 +21383,39 @@
   REPLACE_VSPRINTF=0;
 
 
-     GNULIB_FCHMODAT=0;
-  GNULIB_FSTAT=0;
-  GNULIB_FSTATAT=0;
-  GNULIB_FUTIMENS=0;
-  GNULIB_LCHMOD=0;
-  GNULIB_LSTAT=0;
-  GNULIB_MKDIRAT=0;
-  GNULIB_MKFIFO=0;
-  GNULIB_MKFIFOAT=0;
-  GNULIB_MKNOD=0;
-  GNULIB_MKNODAT=0;
-  GNULIB_STAT=0;
-  GNULIB_UTIMENSAT=0;
-    HAVE_FCHMODAT=1;
-  HAVE_FSTATAT=1;
-  HAVE_FUTIMENS=1;
-  HAVE_LCHMOD=1;
-  HAVE_LSTAT=1;
-  HAVE_MKDIRAT=1;
-  HAVE_MKFIFO=1;
-  HAVE_MKFIFOAT=1;
-  HAVE_MKNOD=1;
-  HAVE_MKNODAT=1;
-  HAVE_UTIMENSAT=1;
-  REPLACE_FSTAT=0;
-  REPLACE_FSTATAT=0;
-  REPLACE_FUTIMENS=0;
-  REPLACE_LSTAT=0;
-  REPLACE_MKDIR=0;
-  REPLACE_MKFIFO=0;
-  REPLACE_MKNOD=0;
-  REPLACE_STAT=0;
-  REPLACE_UTIMENSAT=0;
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
-  $as_echo_n "(cached) " >&6
+      ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getdelim" = x""yes; then :
+  ac_have_decl=1
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
+  ac_have_decl=0
+fi
 
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETDELIM $ac_have_decl
+_ACEOF
 
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
 
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
 
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stat_broken=no
-else
-  ac_cv_header_stat_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
 
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
 
-fi
 
 
 
 
 
-  case "$host_os" in
-    mingw*)
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
-$as_echo_n "checking for 64-bit off_t... " >&6; }
-if ${gl_cv_type_off_t_64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_off_t_64=yes
+      ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getline" = x""yes; then :
+  ac_have_decl=1
 else
-  gl_cv_type_off_t_64=no
+  ac_have_decl=0
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-$as_echo "$gl_cv_type_off_t_64" >&6; }
-      if test $gl_cv_type_off_t_64 = no; then
-        WINDOWS_64_BIT_OFF_T=1
-      else
-        WINDOWS_64_BIT_OFF_T=0
-      fi
-                  WINDOWS_64_BIT_ST_SIZE=1
-      ;;
-    *)
-                                                      WINDOWS_64_BIT_OFF_T=0
-      WINDOWS_64_BIT_ST_SIZE=0
-      ;;
-  esac
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETLINE $ac_have_decl
+_ACEOF
 
 
 
@@ -23429,349 +21431,156 @@
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_stat_h='<'sys/stat.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
-$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
-if ${gl_cv_next_sys_stat_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  :
 
-             if test $ac_cv_header_sys_stat_h = yes; then
 
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/stat.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_getopt_h='<'getopt.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
+$as_echo_n "checking absolute name of <getopt.h>... " >&6; }
+if test "${gl_cv_next_getopt_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_getopt_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <getopt.h>
 
-           gl_header=$gl_cv_absolute_sys_stat_h
-           gl_cv_next_sys_stat_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/getopt.h#{
+                 s#.*"\(.*/getopt.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sys_stat_h='<'sys/stat.h'>'
-             fi
-
+            gl_cv_next_getopt_h='<'getopt.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-$as_echo "$gl_cv_next_sys_stat_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
+$as_echo "$gl_cv_next_getopt_h" >&6; }
      fi
-     NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
+     NEXT_GETOPT_H=$gl_cv_next_getopt_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/stat.h'>'
+       gl_next_as_first_directive='<'getopt.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_stat_h
+       gl_next_as_first_directive=$gl_cv_next_getopt_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive
+     NEXT_AS_FIRST_DIRECTIVE_GETOPT_H=$gl_next_as_first_directive
+
 
 
 
+  :
+
 
 
 
 
+  if test $ac_cv_header_getopt_h = yes; then
+    HAVE_GETOPT_H=1
+  else
+    HAVE_GETOPT_H=0
+  fi
 
 
+  gl_replace_getopt=
 
+    if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
+    for ac_header in getopt.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
+if test "x$ac_cv_header_getopt_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETOPT_H 1
+_ACEOF
 
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
+else
+  gl_replace_getopt=yes
+fi
 
-$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h
+done
 
   fi
 
-      ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
-     #include <sys/stat.h>
-"
-if test "x$ac_cv_type_nlink_t" = xyes; then :
-
-else
-
-$as_echo "#define nlink_t int" >>confdefs.h
-
-fi
-
-
-
-    for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
-
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+    if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
+    for ac_func in getopt_long_only
+do :
+  ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
+if test "x$ac_cv_func_getopt_long_only" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+#define HAVE_GETOPT_LONG_ONLY 1
 _ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
+else
+  gl_replace_getopt=yes
 fi
-      done
+done
 
+  fi
 
-ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getdelim" = xyes; then :
+              if test -z "$gl_replace_getopt"; then
+    ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include <getopt.h>
+"
+if test "x$ac_cv_have_decl_optreset" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETDELIM $ac_have_decl
+#define HAVE_DECL_OPTRESET $ac_have_decl
 _ACEOF
+if test $ac_have_decl = 1; then :
 
-
-
-ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getline" = xyes; then :
+else
+  ac_fn_c_check_decl "$LINENO" "getopt_clip" "ac_cv_have_decl_getopt_clip" "#include <getopt.h>
+"
+if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETLINE $ac_have_decl
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_getopt_h='<'getopt.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
-$as_echo_n "checking absolute name of <getopt.h>... " >&6; }
-if ${gl_cv_next_getopt_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-             if test $ac_cv_header_getopt_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <getopt.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'getopt.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_getopt_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_getopt_h
-           gl_cv_next_getopt_h='"'$gl_header'"'
-          else
-               gl_cv_next_getopt_h='<'getopt.h'>'
-             fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
-$as_echo "$gl_cv_next_getopt_h" >&6; }
-     fi
-     NEXT_GETOPT_H=$gl_cv_next_getopt_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'getopt.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_getopt_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_GETOPT_H=$gl_next_as_first_directive
-
-
-
-
-  if test $ac_cv_header_getopt_h = yes; then
-    HAVE_GETOPT_H=1
-  else
-    HAVE_GETOPT_H=0
-  fi
-
-
-  gl_replace_getopt=
-
-    if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-    for ac_header in getopt.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETOPT_H 1
+#define HAVE_DECL_GETOPT_CLIP $ac_have_decl
 _ACEOF
 
-else
-  gl_replace_getopt=yes
-fi
-
-done
-
-  fi
-
-    if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-    for ac_func in getopt_long_only
-do :
-  ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
-if test "x$ac_cv_func_getopt_long_only" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETOPT_LONG_ONLY 1
-_ACEOF
 
-else
-  gl_replace_getopt=yes
 fi
-done
 
   fi
 
-          if test -z "$gl_replace_getopt"; then
+                    if test -z "$gl_replace_getopt"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
 $as_echo_n "checking whether getopt is POSIX compatible... " >&6; }
-if ${gl_cv_func_getopt_posix+:} false; then :
+if test "${gl_cv_func_getopt_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-                                                if test $cross_compiling = no; then
-                              if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-main ()
-{
-  static char program[] = "program";
-  static char a[] = "-a";
-  static char foo[] = "foo";
-  static char bar[] = "bar";
-  char *argv[] = { program, a, foo, bar, NULL };
-  int c;
-
-  c = getopt (4, argv, "ab");
-  if (!(c == 'a'))
-    return 1;
-  c = getopt (4, argv, "ab");
-  if (!(c == -1))
-    return 2;
-  if (!(optind == 2))
-    return 3;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getopt_posix=maybe
-else
-  gl_cv_func_getopt_posix=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+                if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+             mingw*) gl_cv_func_getopt_posix="guessing no";;
+             darwin*) gl_cv_func_getopt_posix="guessing no";;
+             *)      gl_cv_func_getopt_posix="guessing yes";;
+           esac
 
-          if test $gl_cv_func_getopt_posix = maybe; then
-                                    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -23780,80 +21589,89 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP
+# define OPTIND_MIN 0
+#else
+# define OPTIND_MIN 1
+#endif
+
 int
 main ()
 {
-  static char program[] = "program";
-  static char donald[] = "donald";
-  static char p[] = "-p";
-  static char billy[] = "billy";
-  static char duck[] = "duck";
-  static char a[] = "-a";
-  static char bar[] = "bar";
-  char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
-  int c;
-
-  c = getopt (7, argv, "+abp:q:");
-  if (!(c == -1))
-    return 4;
-  if (!(strcmp (argv[0], "program") == 0))
-    return 5;
-  if (!(strcmp (argv[1], "donald") == 0))
-    return 6;
-  if (!(strcmp (argv[2], "-p") == 0))
-    return 7;
-  if (!(strcmp (argv[3], "billy") == 0))
-    return 8;
-  if (!(strcmp (argv[4], "duck") == 0))
-    return 9;
-  if (!(strcmp (argv[5], "-a") == 0))
-    return 10;
-  if (!(strcmp (argv[6], "bar") == 0))
-    return 11;
-  if (!(optind == 1))
-    return 12;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getopt_posix=maybe
-else
-  gl_cv_func_getopt_posix=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "-a";
+    argv[argc++] = "foo";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
 
-          fi
-          if test $gl_cv_func_getopt_posix = maybe; then
-                        if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    c = getopt (argc, argv, "ab");
+    if (!(c == 'a'))
+      return 1;
+    c = getopt (argc, argv, "ab");
+    if (!(c == -1))
+      return 2;
+    if (!(optind == 2))
+      return 3;
+  }
+  /* Some internal state exists at this point.  */
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "donald";
+    argv[argc++] = "-p";
+    argv[argc++] = "billy";
+    argv[argc++] = "duck";
+    argv[argc++] = "-a";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+    c = getopt (argc, argv, "+abp:q:");
+    if (!(c == -1))
+      return 4;
+    if (!(strcmp (argv[0], "program") == 0))
+      return 5;
+    if (!(strcmp (argv[1], "donald") == 0))
+      return 6;
+    if (!(strcmp (argv[2], "-p") == 0))
+      return 7;
+    if (!(strcmp (argv[3], "billy") == 0))
+      return 8;
+    if (!(strcmp (argv[4], "duck") == 0))
+      return 9;
+    if (!(strcmp (argv[5], "-a") == 0))
+      return 10;
+    if (!(strcmp (argv[6], "bar") == 0))
+      return 11;
+    if (!(optind == 1))
+      return 12;
+  }
+  /* Detect MacOS 10.5 bug.  */
+  {
+    char *argv[3] = { "program", "-ab", NULL };
+    optind = OPTIND_MIN;
+    opterr = 0;
+    if (getopt (2, argv, "ab:") != 'a')
+      return 13;
+    if (getopt (2, argv, "ab:") != '?')
+      return 14;
+    if (optopt != 'b')
+      return 15;
+    if (optind != 2)
+      return 16;
+  }
 
-int
-main ()
-{
-  static char program[] = "program";
-  static char ab[] = "-ab";
-  char *argv[3] = { program, ab, NULL };
-  if (getopt (2, argv, "ab:") != 'a')
-    return 13;
-  if (getopt (2, argv, "ab:") != '?')
-    return 14;
-  if (optopt != 'b')
-    return 15;
-  if (optind != 2)
-    return 16;
   return 0;
 }
 
@@ -23867,13 +21685,6 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-          fi
-        else
-          case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
-          esac
-        fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5
@@ -23886,25 +21697,22 @@
   if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5
 $as_echo_n "checking for working GNU getopt function... " >&6; }
-if ${gl_cv_func_getopt_gnu+:} false; then :
+if test "${gl_cv_func_getopt_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
        # optstring is necessary for programs like m4 that have POSIX-mandated
        # semantics for supporting options interspersed with files.
        # Also, since getopt_long is a GNU extension, we require optind=0.
-       # Bash ties 'set -o posix' to a non-exported POSIXLY_CORRECT;
-       # so take care to revert to the correct (non-)export state.
-       gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
-       case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
-         xx) gl_had_POSIXLY_CORRECT=exported ;;
-         x)  gl_had_POSIXLY_CORRECT=yes      ;;
-         *)  gl_had_POSIXLY_CORRECT=         ;;
-       esac
+       gl_had_POSIXLY_CORRECT=${POSIXLY_CORRECT:+yes}
        POSIXLY_CORRECT=1
        export POSIXLY_CORRECT
        if test "$cross_compiling" = yes; then :
-           gl_cv_func_getopt_gnu="guessing no"
+           case $host_os:$ac_cv_have_decl_optreset in
+           *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
+           *:yes)               gl_cv_func_getopt_gnu=no;;
+           *)                   gl_cv_func_getopt_gnu=yes;;
+         esac
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23913,193 +21721,57 @@
                            #include <stddef.h>
                            #include <string.h>
 
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-
-
 int
 main ()
 {
 
-             int result = 0;
-
-             nocrash_init();
-
              /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
-                and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
+                and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
                 OSF/1 5.1, Solaris 10.  */
              {
-               static char conftest[] = "conftest";
-               static char plus[] = "-+";
-               char *argv[3] = { conftest, plus, NULL };
+               char *myargv[3];
+               myargv[0] = "conftest";
+               myargv[1] = "-+";
+               myargv[2] = 0;
                opterr = 0;
-               if (getopt (2, argv, "+a") != '?')
-                 result |= 1;
+               if (getopt (2, myargv, "+a") != '?')
+                 return 1;
              }
              /* This code succeeds on glibc 2.8, mingw,
-                and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
+                and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
                 IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x.  */
              {
-               static char program[] = "program";
-               static char p[] = "-p";
-               static char foo[] = "foo";
-               static char bar[] = "bar";
-               char *argv[] = { program, p, foo, bar, NULL };
+               char *argv[] = { "program", "-p", "foo", "bar", NULL };
 
                optind = 1;
                if (getopt (4, argv, "p::") != 'p')
-                 result |= 2;
-               else if (optarg != NULL)
-                 result |= 4;
-               else if (getopt (4, argv, "p::") != -1)
-                 result |= 6;
-               else if (optind != 2)
-                 result |= 8;
+                 return 2;
+               if (optarg != NULL)
+                 return 3;
+               if (getopt (4, argv, "p::") != -1)
+                 return 4;
+               if (optind != 2)
+                 return 5;
              }
              /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0.  */
              {
-               static char program[] = "program";
-               static char foo[] = "foo";
-               static char p[] = "-p";
-               char *argv[] = { program, foo, p, NULL };
+               char *argv[] = { "program", "foo", "-p", NULL };
                optind = 0;
                if (getopt (3, argv, "-p") != 1)
-                 result |= 16;
-               else if (getopt (3, argv, "-p") != 'p')
-                 result |= 16;
+                 return 6;
+               if (getopt (3, argv, "-p") != 'p')
+                 return 7;
              }
              /* This code fails on glibc 2.11.  */
              {
-               static char program[] = "program";
-               static char b[] = "-b";
-               static char a[] = "-a";
-               char *argv[] = { program, b, a, NULL };
+               char *argv[] = { "program", "-b", "-a", NULL };
                optind = opterr = 0;
                if (getopt (3, argv, "+:a:b") != 'b')
-                 result |= 32;
-               else if (getopt (3, argv, "+:a:b") != ':')
-                 result |= 32;
-             }
-             /* This code dumps core on glibc 2.14.  */
-             {
-               static char program[] = "program";
-               static char w[] = "-W";
-               static char dummy[] = "dummy";
-               char *argv[] = { program, w, dummy, NULL };
-               optind = opterr = 1;
-               if (getopt (3, argv, "W;") != 'W')
-                 result |= 64;
+                 return 8;
+               if (getopt (3, argv, "+:a:b") != ':')
+                 return 9;
              }
-             return result;
+             return 0;
 
   ;
   return 0;
@@ -24114,94 +21786,39 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-       case $gl_had_POSIXLY_CORRECT in
-         exported) ;;
-         yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;;
-         *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;;
-       esac
+       if test "$gl_had_POSIXLY_CORRECT" != yes; then
+         { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}
+       fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5
 $as_echo "$gl_cv_func_getopt_gnu" >&6; }
-    if test "$gl_cv_func_getopt_gnu" != yes; then
+    if test "$gl_cv_func_getopt_gnu" = "no"; then
       gl_replace_getopt=yes
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5
-$as_echo_n "checking for working GNU getopt_long function... " >&6; }
-if ${gl_cv_func_getopt_long_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-              case "$host_os" in
-              openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
-              *)        gl_cv_func_getopt_long_gnu="guessing yes";;
-            esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <getopt.h>
-                #include <stddef.h>
-                #include <string.h>
+    fi
+  fi
 
-int
-main ()
-{
-static const struct option long_options[] =
-                  {
-                    { "xtremely-",no_argument,       NULL, 1003 },
-                    { "xtra",     no_argument,       NULL, 1001 },
-                    { "xtreme",   no_argument,       NULL, 1002 },
-                    { "xtremely", no_argument,       NULL, 1003 },
-                    { NULL,       0,                 NULL, 0 }
-                  };
-                /* This code fails on OpenBSD 5.0.  */
-                {
-                  static char program[] = "program";
-                  static char xtremel[] = "--xtremel";
-                  char *argv[] = { program, xtremel, NULL };
-                  int option_index;
-                  optind = 1; opterr = 0;
-                  if (getopt_long (2, argv, "", long_options, &option_index) != 1003)
-                    return 1;
-                }
-                return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getopt_long_gnu=yes
+      ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
+  ac_have_decl=1
 else
-  gl_cv_func_getopt_long_gnu=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  ac_have_decl=0
 fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV $ac_have_decl
+_ACEOF
+
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5
-$as_echo "$gl_cv_func_getopt_long_gnu" >&6; }
-      case "$gl_cv_func_getopt_long_gnu" in
-        *yes) ;;
-        *) gl_replace_getopt=yes ;;
-      esac
-    fi
-  fi
 
 
 
 
 
+  if test -n "$gl_replace_getopt"; then :
 
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
 
-  if test $REPLACE_GETOPT = 1; then
 
   GETOPT_H=getopt.h
 
@@ -24209,22 +21826,44 @@
 
 
 
-  fi
+    GNULIB_UNISTD_H_GETOPT=1
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
+
+
+
+  :
+
+
+
+
+
+
+
 
-ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getenv" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
 fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETENV $ac_have_decl
-_ACEOF
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if ${ac_cv_c_restrict+:} false; then :
+if test "${ac_cv_c_restrict+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_restrict=no
@@ -24232,19 +21871,17 @@
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-typedef int *int_ptr;
-	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
-	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
-	   int bar (int ip[$ac_kw]) { return ip[0]; }
-
+typedef int * int_ptr;
+	int foo (int_ptr $ac_kw ip) {
+	return ip[0];
+       }
 int
 main ()
 {
 int s[1];
-	   int *$ac_kw t = s;
-	   t[0] = 0;
-	   return foo (t) + bar (t);
-
+	int * $ac_kw t = s;
+	t[0] = 0;
+	return foo(t)
   ;
   return 0;
 }
@@ -24276,7 +21913,6 @@
   HAVE_STRUCT_TIMEVAL=1;
   HAVE_SYS_TIME_H=1;
   REPLACE_GETTIMEOFDAY=0;
-  REPLACE_STRUCT_TIMEVAL=0;
 
 
 
@@ -24287,6 +21923,18 @@
 
 
 
+  :
+
+
+
+
+
+
+
+
+
+  :
+
 
 
 
@@ -24298,51 +21946,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/time.h>" >&5
 $as_echo_n "checking absolute name of <sys/time.h>... " >&6; }
-if ${gl_cv_next_sys_time_h+:} false; then :
+if test "${gl_cv_next_sys_time_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_sys_time_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_sys_time_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/time.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_sys_time_h
-           gl_cv_next_sys_time_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/time.h#{
+                 s#.*"\(.*/sys/time.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sys_time_h='<'sys/time.h'>'
-             fi
-
+            gl_cv_next_sys_time_h='<'sys/time.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5
@@ -24362,41 +21989,13 @@
 
 
 
-
   if test $ac_cv_header_sys_time_h != yes; then
     HAVE_SYS_TIME_H=0
   fi
 
-
-
-
-
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
-
-fi
-
-done
-
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
 $as_echo_n "checking for struct timeval... " >&6; }
-if ${gl_cv_sys_struct_timeval+:} false; then :
+if test "${gl_cv_sys_struct_timeval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24405,9 +22004,6 @@
              #include <sys/time.h>
             #endif
             #include <time.h>
-            #if HAVE_WINSOCK2_H
-            # include <winsock2.h>
-            #endif
 
 int
 main ()
@@ -24423,53 +22019,11 @@
   gl_cv_sys_struct_timeval=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5
 $as_echo "$gl_cv_sys_struct_timeval" >&6; }
   if test $gl_cv_sys_struct_timeval != yes; then
     HAVE_STRUCT_TIMEVAL=0
-  else
-                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5
-$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; }
-if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if HAVE_SYS_TIME_H
-               #include <sys/time.h>
-              #endif
-              #include <time.h>
-              #if HAVE_WINSOCK2_H
-              # include <winsock2.h>
-              #endif
-
-int
-main ()
-{
-static struct timeval x;
-              typedef int verify_tv_sec_type[
-                sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
-              ];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_timeval_tv_sec=yes
-else
-  gl_cv_sys_struct_timeval_tv_sec=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5
-$as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; }
-    if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
-      REPLACE_STRUCT_TIMEVAL=1
-    fi
   fi
 
 
@@ -24477,7 +22031,7 @@
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24507,7 +22061,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -24525,40 +22080,45 @@
 
 
 
-  GNULIB_ISWBLANK=0;
-  GNULIB_WCTYPE=0;
-  GNULIB_ISWCTYPE=0;
-  GNULIB_WCTRANS=0;
-  GNULIB_TOWCTRANS=0;
-    HAVE_ISWBLANK=1;
-  HAVE_WCTYPE_T=1;
-  HAVE_WCTRANS_T=1;
-  REPLACE_ISWBLANK=0;
-
-
-
 
+    REPLACE_ICONV=0;
+  REPLACE_ICONV_OPEN=0;
+  REPLACE_ICONV_UTF=0;
+  ICONV_H='';
 
 
 
 
-  if test $ac_cv_func_iswcntrl = yes; then
-    HAVE_ISWCNTRL=1
-  else
-    HAVE_ISWCNTRL=0
-  fi
 
 
 
-  if test $gt_cv_c_wint_t = yes; then
-    HAVE_WINT_T=1
-  else
-    HAVE_WINT_T=0
-  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included glib is requested" >&5
+$as_echo_n "checking whether included glib is requested... " >&6; }
 
+# Check whether --with-included-glib was given.
+if test "${with_included_glib+set}" = set; then :
+  withval=$with_included_glib; gl_cv_libglib_force_included=$withval
+else
+  gl_cv_libglib_force_included=no
+fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_libglib_force_included" >&5
+$as_echo "$gl_cv_libglib_force_included" >&6; }
 
+  gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
+  LIBGLIB=
+  LTLIBGLIB=
+  INCGLIB=
+  if test "$gl_cv_libglib_use_included" != yes; then
+            if test "${gl_cv_libglib+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+      gl_cv_libglib=no
+      gl_cv_LIBGLIB=
+      gl_cv_LTLIBGLIB=
+      gl_cv_INCGLIB=
+      gl_save_LIBS="$LIBS"
 
 
 
@@ -24566,392 +22126,23 @@
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_wctype_h='<'wctype.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
-$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if ${gl_cv_next_wctype_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    use_additional=yes
 
-             if test $ac_cv_header_wctype_h = yes; then
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
 
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <wctype.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wctype.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_wctype_h
-           gl_cv_next_wctype_h='"'$gl_header'"'
-          else
-               gl_cv_next_wctype_h='<'wctype.h'>'
-             fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-$as_echo "$gl_cv_next_wctype_h" >&6; }
-     fi
-     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'wctype.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_wctype_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
-
-
-
-
-  if test $ac_cv_header_wctype_h = yes; then
-    if test $ac_cv_func_iswcntrl = yes; then
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
-$as_echo_n "checking whether iswcntrl works... " >&6; }
-if ${gl_cv_func_iswcntrl_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-          if test "$cross_compiling" = yes; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-                          #if __GNU_LIBRARY__ == 1
-                          Linux libc5 i18n is broken.
-                          #endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_iswcntrl_works="guessing yes"
-else
-  gl_cv_func_iswcntrl_works="guessing no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_iswcntrl_works=yes
-else
-  gl_cv_func_iswcntrl_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_iswcntrl_works" >&5
-$as_echo "$gl_cv_func_iswcntrl_works" >&6; }
-    fi
-    HAVE_WCTYPE_H=1
-  else
-    HAVE_WCTYPE_H=0
-  fi
-
-
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
-
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  fi
-
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
-  else
-    for ac_func in towlower
-do :
-  ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
-if test "x$ac_cv_func_towlower" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TOWLOWER 1
-_ACEOF
-
-fi
-done
-
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
-
-"
-if test "x$ac_cv_have_decl_towlower" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER $ac_have_decl
-_ACEOF
-
-      if test $ac_cv_have_decl_towlower = yes; then
-                                REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
-
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-        :
-  fi
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
-$as_echo_n "checking for wctype_t... " >&6; }
-if ${gl_cv_type_wctype_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctype_t=yes
-else
-  gl_cv_type_wctype_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
-$as_echo "$gl_cv_type_wctype_t" >&6; }
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
-  fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
-$as_echo_n "checking for wctrans_t... " >&6; }
-if ${gl_cv_type_wctrans_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctrans_t=yes
-else
-  gl_cv_type_wctrans_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
-$as_echo "$gl_cv_type_wctrans_t" >&6; }
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
-  fi
-
-
-    for gl_func in wctype iswctype wctrans towctrans     ; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
-
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included glib is requested" >&5
-$as_echo_n "checking whether included glib is requested... " >&6; }
-
-# Check whether --with-included-glib was given.
-if test "${with_included_glib+set}" = set; then :
-  withval=$with_included_glib; gl_cv_libglib_force_included=$withval
-else
-  gl_cv_libglib_force_included=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_libglib_force_included" >&5
-$as_echo "$gl_cv_libglib_force_included" >&6; }
-
-  gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
-  LIBGLIB=
-  LTLIBGLIB=
-  INCGLIB=
-  if test "$gl_cv_libglib_use_included" != yes; then
-            if ${gl_cv_libglib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      gl_cv_libglib=no
-      gl_cv_LIBGLIB=
-      gl_cv_LTLIBGLIB=
-      gl_cv_INCGLIB=
-      gl_save_LIBS="$LIBS"
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
 
 
 # Check whether --with-libglib-2.0-prefix was given.
-if test "${with_libglib_2_0_prefix+set}" = set; then :
-  withval=$with_libglib_2_0_prefix;
+if test "${with_libglib_20_prefix+set}" = set; then :
+  withval=$with_libglib_20_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -25002,7 +22193,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -25509,7 +22700,7 @@
     for ac_header in unistd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
+if test "x$ac_cv_header_unistd_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNISTD_H 1
 _ACEOF
@@ -25540,6 +22731,9 @@
 
 
 
+
+
+
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included libunistring is requested" >&5
 $as_echo_n "checking whether included libunistring is requested... " >&6; }
 
@@ -25643,7 +22837,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -26058,7 +23252,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunistring" >&5
 $as_echo_n "checking for libunistring... " >&6; }
-if ${ac_cv_libunistring+:} false; then :
+if test "${ac_cv_libunistring+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -26197,7 +23391,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -26612,7 +23806,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunistring" >&5
 $as_echo_n "checking for libunistring... " >&6; }
-if ${ac_cv_libunistring+:} false; then :
+if test "${ac_cv_libunistring+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -26754,7 +23948,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -27169,7 +24363,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunistring" >&5
 $as_echo_n "checking for libunistring... " >&6; }
-if ${ac_cv_libunistring+:} false; then :
+if test "${ac_cv_libunistring+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -27228,7 +24422,7 @@
   if test $HAVE_LIBUNISTRING = yes; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunistring version" >&5
 $as_echo_n "checking for libunistring version... " >&6; }
-if ${gl_cv_libunistring_version+:} false; then :
+if test "${gl_cv_libunistring_version+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "_LIBUNISTRING_VERSION" "gl_libunistring_hexversion"        "#include <unistring/version.h>"; then :
@@ -27252,10 +24446,9 @@
 else
   gl_cv_libunistring_version092=false
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
          if $gl_cv_libunistring_version092; then
 
-
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistr.h>
@@ -27264,27 +24457,13 @@
     aix*) gl_absname_cpp="$ac_cpp -C" ;;
     *)    gl_absname_cpp="$ac_cpp" ;;
   esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'unistr.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
         gl_cv_absolute_unistr_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+sed -n '\#/unistr.h#{
+        s#.*"\(.*/unistr.h\)".*#\1#
+        s#^/[^/]#//&#
+        p
+        q
+}'`
 
            if test -n "$gl_cv_absolute_unistr_h" \
               && grep 'Copy no more than N units of SRC to DEST.  Return a pointer' $gl_cv_absolute_unistr_h > /dev/null; then
@@ -27296,7 +24475,7 @@
                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unicase.h>
-                  casing_suffix_context_t ct;
+                           casing_suffix_context_t ct;
 int
 main ()
 {
@@ -27341,8 +24520,15 @@
 
 
 
-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+
+
+
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -27353,30 +24539,31 @@
 _ACEOF
 
 
-  GNULIB_LOCALECONV=0;
-  GNULIB_SETLOCALE=0;
+
   GNULIB_DUPLOCALE=0;
     HAVE_DUPLOCALE=1;
-  REPLACE_LOCALECONV=0;
-  REPLACE_SETLOCALE=0;
   REPLACE_DUPLOCALE=0;
-  REPLACE_STRUCT_LCONV=0;
 
 
     REPLACE_NULL=0;
   HAVE_WCHAR_T=1;
+  STDDEF_H='';
+
+
+
+
+
 
 
 
 
-  STDDEF_H=
   if test $gt_cv_c_wchar_t = no; then
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+if test "${gl_cv_decl_null_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27405,17 +24592,12 @@
     REPLACE_NULL=1
     STDDEF_H=stddef.h
   fi
+  if test -n "$STDDEF_H"; then
+
 
-   if test -n "$STDDEF_H"; then
-  GL_GENERATE_STDDEF_H_TRUE=
-  GL_GENERATE_STDDEF_H_FALSE='#'
-else
-  GL_GENERATE_STDDEF_H_TRUE='#'
-  GL_GENERATE_STDDEF_H_FALSE=
-fi
 
-  if test -n "$STDDEF_H"; then
 
+  :
 
 
 
@@ -27428,45 +24610,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 $as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
+if test "${gl_cv_next_stddef_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stddef_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stddef.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stddef_h
-           gl_cv_next_stddef_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stddef.h#{
+                 s#.*"\(.*/stddef.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stddef_h='<'stddef.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
@@ -27485,7 +24652,6 @@
 
 
 
-
   fi
 
 
@@ -27493,22 +24659,60 @@
 
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+
+
+
+
+
+
+     GNULIB_FCHMODAT=0;
+  GNULIB_FSTATAT=0;
+  GNULIB_FUTIMENS=0;
+  GNULIB_LCHMOD=0;
+  GNULIB_LSTAT=0;
+  GNULIB_MKDIRAT=0;
+  GNULIB_MKFIFO=0;
+  GNULIB_MKFIFOAT=0;
+  GNULIB_MKNOD=0;
+  GNULIB_MKNODAT=0;
+  GNULIB_STAT=0;
+  GNULIB_UTIMENSAT=0;
+    HAVE_FCHMODAT=1;
+  HAVE_FSTATAT=1;
+  HAVE_FUTIMENS=1;
+  HAVE_LCHMOD=1;
+  HAVE_LSTAT=1;
+  HAVE_MKDIRAT=1;
+  HAVE_MKFIFO=1;
+  HAVE_MKFIFOAT=1;
+  HAVE_MKNOD=1;
+  HAVE_MKNODAT=1;
+  HAVE_UTIMENSAT=1;
+  REPLACE_FSTAT=0;
+  REPLACE_FSTATAT=0;
+  REPLACE_FUTIMENS=0;
+  REPLACE_LSTAT=0;
+  REPLACE_MKDIR=0;
+  REPLACE_MKFIFO=0;
+  REPLACE_MKNOD=0;
+  REPLACE_STAT=0;
+  REPLACE_UTIMENSAT=0;
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if ${gl_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f conftest.sym conftest.file
-     echo >conftest.file
-     if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
-          esac
-
+echo >conftest.file
+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27517,48 +24721,58 @@
 main ()
 {
 struct stat sbuf;
-              /* Linux will dereference the symlink and fail, as required by
-                 POSIX.  That is better in the sense that it means we will not
-                 have to compile and use the lstat wrapper.  */
-              return lstat ("conftest.sym/", &sbuf) == 0;
-
+     /* Linux will dereference the symlink and fail, as required by POSIX.
+	That is better in the sense that it means we will not
+	have to compile and use the lstat wrapper.  */
+     return lstat ("conftest.sym/", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_lstat_dereferences_slashed_symlink=yes
+  ac_cv_func_lstat_dereferences_slashed_symlink=yes
 else
-  gl_cv_func_lstat_dereferences_slashed_symlink=no
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-     else
-       # If the 'ln -s' command failed, then we probably don't even
-       # have an lstat function.
-       gl_cv_func_lstat_dereferences_slashed_symlink="guessing no"
-     fi
-     rm -f conftest.sym conftest.file
+else
+  # If the `ln -s' command failed, then we probably don't even
+  # have an lstat function.
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+fi
+rm -f conftest.sym conftest.file
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-$as_echo "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
-  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-    *yes)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+
+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
 
 cat >>confdefs.h <<_ACEOF
 #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 _ACEOF
 
-      ;;
-  esac
+
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
+
+fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc are POSIX compliant" >&5
 $as_echo_n "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; }
-if ${gl_cv_func_malloc_posix+:} false; then :
+if test "${gl_cv_func_malloc_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -27569,8 +24783,8 @@
 main ()
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-             choke me
-             #endif
+         choke me
+         #endif
 
   ;
   return 0;
@@ -27588,11 +24802,10 @@
 $as_echo "$gl_cv_func_malloc_posix" >&6; }
 
 
-
-      for ac_header in stdlib.h
+  for ac_header in stdlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
 _ACEOF
@@ -27601,29 +24814,21 @@
 
 done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* \
-          | hpux* | solaris* | cygwin* | mingw*)
-            ac_cv_func_malloc_0_nonnull=yes ;;
-          # If we don't know, assume the worst.
-          *) ac_cv_func_malloc_0_nonnull=no ;;
-        esac
-
+  ac_cv_func_malloc_0_nonnull=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined STDC_HEADERS || defined HAVE_STDLIB_H
-            # include <stdlib.h>
-            #else
-            char *malloc ();
-            #endif
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
 
 int
 main ()
@@ -27632,7 +24837,6 @@
   ;
   return 0;
 }
-
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_malloc_0_nonnull=yes
@@ -27643,11 +24847,10 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
 $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-  if test $ac_cv_func_malloc_0_nonnull = yes; then :
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
   gl_cv_func_malloc_0_nonnull=1
 else
   gl_cv_func_malloc_0_nonnull=0
@@ -27660,6 +24863,43 @@
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
+$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if test "${ac_cv_func_mbrtowc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wchar.h>
+int
+main ()
+{
+wchar_t wc;
+	      char const s[] = "";
+	      size_t n = 1;
+	      mbstate_t state;
+	      return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_mbrtowc=yes
+else
+  ac_cv_func_mbrtowc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
+$as_echo "$ac_cv_func_mbrtowc" >&6; }
+  if test $ac_cv_func_mbrtowc = yes; then
+
+$as_echo "#define HAVE_MBRTOWC 1" >>confdefs.h
+
+  fi
+
+
   GNULIB_BTOWC=0;
   GNULIB_WCTOB=0;
   GNULIB_MBSINIT=0;
@@ -27671,34 +24911,6 @@
   GNULIB_WCSRTOMBS=0;
   GNULIB_WCSNRTOMBS=0;
   GNULIB_WCWIDTH=0;
-  GNULIB_WMEMCHR=0;
-  GNULIB_WMEMCMP=0;
-  GNULIB_WMEMCPY=0;
-  GNULIB_WMEMMOVE=0;
-  GNULIB_WMEMSET=0;
-  GNULIB_WCSLEN=0;
-  GNULIB_WCSNLEN=0;
-  GNULIB_WCSCPY=0;
-  GNULIB_WCPCPY=0;
-  GNULIB_WCSNCPY=0;
-  GNULIB_WCPNCPY=0;
-  GNULIB_WCSCAT=0;
-  GNULIB_WCSNCAT=0;
-  GNULIB_WCSCMP=0;
-  GNULIB_WCSNCMP=0;
-  GNULIB_WCSCASECMP=0;
-  GNULIB_WCSNCASECMP=0;
-  GNULIB_WCSCOLL=0;
-  GNULIB_WCSXFRM=0;
-  GNULIB_WCSDUP=0;
-  GNULIB_WCSCHR=0;
-  GNULIB_WCSRCHR=0;
-  GNULIB_WCSCSPN=0;
-  GNULIB_WCSSPN=0;
-  GNULIB_WCSPBRK=0;
-  GNULIB_WCSSTR=0;
-  GNULIB_WCSTOK=0;
-  GNULIB_WCSWIDTH=0;
     HAVE_BTOWC=1;
   HAVE_MBSINIT=1;
   HAVE_MBRTOWC=1;
@@ -27708,34 +24920,6 @@
   HAVE_WCRTOMB=1;
   HAVE_WCSRTOMBS=1;
   HAVE_WCSNRTOMBS=1;
-  HAVE_WMEMCHR=1;
-  HAVE_WMEMCMP=1;
-  HAVE_WMEMCPY=1;
-  HAVE_WMEMMOVE=1;
-  HAVE_WMEMSET=1;
-  HAVE_WCSLEN=1;
-  HAVE_WCSNLEN=1;
-  HAVE_WCSCPY=1;
-  HAVE_WCPCPY=1;
-  HAVE_WCSNCPY=1;
-  HAVE_WCPNCPY=1;
-  HAVE_WCSCAT=1;
-  HAVE_WCSNCAT=1;
-  HAVE_WCSCMP=1;
-  HAVE_WCSNCMP=1;
-  HAVE_WCSCASECMP=1;
-  HAVE_WCSNCASECMP=1;
-  HAVE_WCSCOLL=1;
-  HAVE_WCSXFRM=1;
-  HAVE_WCSDUP=1;
-  HAVE_WCSCHR=1;
-  HAVE_WCSRCHR=1;
-  HAVE_WCSCSPN=1;
-  HAVE_WCSSPN=1;
-  HAVE_WCSPBRK=1;
-  HAVE_WCSSTR=1;
-  HAVE_WCSTOK=1;
-  HAVE_WCSWIDTH=1;
   HAVE_DECL_WCTOB=1;
   HAVE_DECL_WCWIDTH=1;
   REPLACE_MBSTATE_T=0;
@@ -27750,7 +24934,12 @@
   REPLACE_WCSRTOMBS=0;
   REPLACE_WCSNRTOMBS=0;
   REPLACE_WCWIDTH=0;
-  REPLACE_WCSWIDTH=0;
+
+
+
+
+
+
 
 
 
@@ -27761,7 +24950,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
 $as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
+if test "${gt_cv_locale_ja+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -27781,30 +24970,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -27819,7 +24995,7 @@
   if (MB_CUR_MAX == 1)
     return 1;
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -27834,58 +25010,42 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
+          else
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
             else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
               else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
                 else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
+                  # None found.
+                  gt_cv_locale_ja=none
                 fi
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
@@ -27900,7 +25060,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
 $as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
+if test "${gt_cv_locale_zh_CN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -27921,30 +25081,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -27955,7 +25102,7 @@
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -27974,47 +25121,22 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
           gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     else
       # If there was a link error, due to mblen(), the system is so old that
       # it certainly doesn't have a chinese locale.
@@ -28032,7 +25154,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
 $as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -28054,19 +25176,9 @@
      variables, and all locales use the UTF-8 encoding.  */
 #if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -28092,12 +25204,10 @@
       || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
     return 1;
 #endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 
@@ -28107,46 +25217,27 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
           else
             # None found.
             gt_cv_locale_fr_utf8=none
           fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
@@ -28157,8 +25248,6 @@
 
 
 
-  GNULIB_FFSL=0;
-  GNULIB_FFSLL=0;
   GNULIB_MEMCHR=0;
   GNULIB_MEMMEM=0;
   GNULIB_MEMPCPY=0;
@@ -28191,13 +25280,10 @@
   GNULIB_MBSSEP=0;
   GNULIB_MBSTOK_R=0;
   GNULIB_STRERROR=0;
-  GNULIB_STRERROR_R=0;
   GNULIB_STRSIGNAL=0;
   GNULIB_STRVERSCMP=0;
   HAVE_MBSLEN=0;
-    HAVE_FFSL=1;
-  HAVE_FFSLL=1;
-  HAVE_MEMCHR=1;
+    HAVE_MEMCHR=1;
   HAVE_DECL_MEMMEM=1;
   HAVE_MEMPCPY=1;
   HAVE_DECL_MEMRCHR=1;
@@ -28212,7 +25298,6 @@
   HAVE_STRSEP=1;
   HAVE_STRCASESTR=1;
   HAVE_DECL_STRTOK_R=1;
-  HAVE_DECL_STRERROR_R=1;
   HAVE_DECL_STRSIGNAL=1;
   HAVE_STRVERSCMP=1;
   REPLACE_MEMCHR=0;
@@ -28221,9 +25306,7 @@
   REPLACE_STRDUP=0;
   REPLACE_STRSTR=0;
   REPLACE_STRCASESTR=0;
-  REPLACE_STRCHRNUL=0;
   REPLACE_STRERROR=0;
-  REPLACE_STRERROR_R=0;
   REPLACE_STRNCAT=0;
   REPLACE_STRNDUP=0;
   REPLACE_STRNLEN=0;
@@ -28236,136 +25319,24 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
 
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -28384,7 +25355,7 @@
   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
   # irrelevant for anonymous mappings.
   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
+if test "x$ac_cv_func_mmap" = x""yes; then :
   gl_have_mmap=yes
 else
   gl_have_mmap=no
@@ -28401,12 +25372,12 @@
 
 #include <sys/mman.h>
 #ifdef MAP_ANONYMOUS
-    I cannot identify this map
+    I cant identify this map.
 #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
   gl_have_mmap_anonymous=yes
 fi
 rm -f conftest*
@@ -28417,12 +25388,12 @@
 
 #include <sys/mman.h>
 #ifdef MAP_ANON
-    I cannot identify this map
+    I cant identify this map.
 #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
 
 $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
@@ -28441,11 +25412,29 @@
   fi
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+  :
 
 
 
 
-  if test $HAVE_MEMCHR = 1; then
+
+  if test $ac_cv_func_memchr = yes; then
     # Detect platform-specific bugs in some versions of glibc:
     # memchr should not dereference anything with length 0
     #   http://bugzilla.redhat.com/499689
@@ -28455,7 +25444,7 @@
     # Assume that memchr works on platforms that lack mprotect.
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
 $as_echo_n "checking whether memchr works... " >&6; }
-if ${gl_cv_func_memchr_works+:} false; then :
+if test "${gl_cv_func_memchr_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -28479,7 +25468,6 @@
 main ()
 {
 
-  int result = 0;
   char *fence = NULL;
 #if HAVE_SYS_MMAN_H && HAVE_MPROTECT
 # if HAVE_MAP_ANONYMOUS
@@ -28503,14 +25491,12 @@
   if (fence)
     {
       if (memchr (fence, 0, 0))
-        result |= 1;
+        return 1;
       strcpy (fence - 9, "12345678");
       if (memchr (fence - 9, 0, 79) != fence - 1)
-        result |= 2;
-      if (memchr (fence - 1, 0, 3) != fence - 1)
-        result |= 4;
+        return 2;
     }
-  return result;
+  return 0;
 
   ;
   return 0;
@@ -28531,6 +25517,34 @@
     if test "$gl_cv_func_memchr_works" != yes; then
       REPLACE_MEMCHR=1
     fi
+  else
+    HAVE_MEMCHR=0
+  fi
+  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext"
+
+
+  for ac_header in bp-sym.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
+if test "x$ac_cv_header_bp_sym_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BP_SYM_H 1
+_ACEOF
+
+fi
+
+done
+
+
   fi
 
 
@@ -28539,13 +25553,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
 $as_echo_n "checking whether <limits.h> defines MIN and MAX... " >&6; }
-if ${gl_cv_minmax_in_limits_h+:} false; then :
+if test "${gl_cv_minmax_in_limits_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
-            int x = MIN (42, 17);
+int x = MIN (42, 17);
 int
 main ()
 {
@@ -28576,13 +25590,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
 $as_echo_n "checking whether <sys/param.h> defines MIN and MAX... " >&6; }
-if ${gl_cv_minmax_in_sys_param_h+:} false; then :
+if test "${gl_cv_minmax_in_sys_param_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/param.h>
-            int x = MIN (42, 17);
+int x = MIN (42, 17);
 int
 main ()
 {
@@ -28645,6 +25659,9 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   if test $gl_cv_c_multiarch = yes; then
+
+$as_echo "#define AA_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
     APPLE_UNIVERSAL_BUILD=1
   else
     APPLE_UNIVERSAL_BUILD=0
@@ -28655,7 +25672,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 $as_echo_n "checking for promoted mode_t type... " >&6; }
-if ${gl_cv_promoted_mode_t+:} false; then :
+if test "${gl_cv_promoted_mode_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -28691,6 +25708,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
   GNULIB_POSIX_SPAWN=0;
   GNULIB_POSIX_SPAWNP=0;
   GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=0;
@@ -28717,88 +25745,21 @@
   HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1;
 
   REPLACE_POSIX_SPAWN=0;
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;
 
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;
 
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;
 
 
 
 
 
-  LIB_POSIX_SPAWN=
 
-  gl_saved_libs=$LIBS
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
-$as_echo_n "checking for library containing posix_spawn... " >&6; }
-if ${ac_cv_search_posix_spawn+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char posix_spawn ();
-int
-main ()
-{
-return posix_spawn ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_posix_spawn=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_posix_spawn+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_posix_spawn+:} false; then :
 
-else
-  ac_cv_search_posix_spawn=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
-$as_echo "$ac_cv_search_posix_spawn" >&6; }
-ac_res=$ac_cv_search_posix_spawn
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  test "$ac_cv_search_posix_spawn" = "none required" ||
-                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn
-fi
+  :
+
 
-    for ac_func in posix_spawn
-do :
-  ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
-if test "x$ac_cv_func_posix_spawn" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_POSIX_SPAWN 1
-_ACEOF
 
-fi
-done
 
-  LIBS=$gl_saved_libs
 
   if test $ac_cv_func_posix_spawn != yes; then
     HAVE_POSIX_SPAWN=0
@@ -28812,7 +25773,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn works" >&5
 $as_echo_n "checking whether posix_spawn works... " >&6; }
-if ${gl_cv_func_posix_spawn_works+:} false; then :
+if test "${gl_cv_func_posix_spawn_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test $cross_compiling = no; then
@@ -28968,8 +25929,8 @@
          if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -29036,7 +25997,7 @@
   if (fflush (fp) || fclose (fp))
     {
       perror ("cannot prepare data file");
-      return 2;
+      return 1;
     }
 
   /* Avoid reading from our stdin, as it could block.  */
@@ -29054,7 +26015,7 @@
         posix_spawn_file_actions_destroy (&actions);
       errno = err;
       perror ("subprocess failed");
-      return 3;
+      return 1;
     }
   posix_spawn_file_actions_destroy (&actions);
   status = 0;
@@ -29063,13 +26024,13 @@
   if (!WIFEXITED (status))
     {
       fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      return 4;
+      return 1;
     }
   exitstatus = WEXITSTATUS (status);
   if (exitstatus != 0)
     {
       fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      return 5;
+      return 1;
     }
   return 0;
 }
@@ -29084,7 +26045,7 @@
       && memcmp (buf, "Halle Potta", 11) == 0)
     return 0;
   else
-    return 8;
+    return 2;
 }
 
 static void
@@ -29148,12 +26109,9 @@
 
     case "$gl_cv_func_posix_spawn_works" in
       *yes)
-
-$as_echo "#define HAVE_WORKING_POSIX_SPAWN 1" >>confdefs.h
-
                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5
 $as_echo_n "checking whether posix_spawnattr_setschedpolicy is supported... " >&6; }
-if ${gl_cv_func_spawnattr_setschedpolicy+:} false; then :
+if test "${gl_cv_func_spawnattr_setschedpolicy+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29179,7 +26137,7 @@
 $as_echo "$gl_cv_func_spawnattr_setschedpolicy" >&6; }
                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5
 $as_echo_n "checking whether posix_spawnattr_setschedparam is supported... " >&6; }
-if ${gl_cv_func_spawnattr_setschedparam+:} false; then :
+if test "${gl_cv_func_spawnattr_setschedparam+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29209,83 +26167,9 @@
   fi
 
 
-
-
-  GNULIB_PTHREAD_SIGMASK=0;
-  GNULIB_RAISE=0;
-  GNULIB_SIGNAL_H_SIGPIPE=0;
-  GNULIB_SIGPROCMASK=0;
-  GNULIB_SIGACTION=0;
-    HAVE_POSIX_SIGNALBLOCKING=1;
-  HAVE_PTHREAD_SIGMASK=1;
-  HAVE_RAISE=1;
-  HAVE_SIGSET_T=1;
-  HAVE_SIGINFO_T=1;
-  HAVE_SIGACTION=1;
-  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
-
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
-
-  HAVE_SIGHANDLER_T=1;
-  REPLACE_PTHREAD_SIGMASK=0;
-  REPLACE_RAISE=0;
-
-
-  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "
-      #include <signal.h>
-      /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-      #include <sys/types.h>
-
-"
-if test "x$ac_cv_type_sigset_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGSET_T 1
-_ACEOF
-
-gl_cv_type_sigset_t=yes
-else
-  gl_cv_type_sigset_t=no
-fi
-
-  if test $gl_cv_type_sigset_t != yes; then
-    HAVE_SIGSET_T=0
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
-$as_echo_n "checking for SIGPIPE... " >&6; }
-if ${gl_cv_header_signal_h_SIGPIPE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <signal.h>
-#if !defined SIGPIPE
-booboo
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "booboo" >/dev/null 2>&1; then :
-  gl_cv_header_signal_h_SIGPIPE=no
-else
-  gl_cv_header_signal_h_SIGPIPE=yes
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
-$as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
-
-
                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 $as_echo_n "checking for shared library path variable... " >&6; }
-if ${acl_cv_libpath+:} false; then :
+if test "${acl_cv_libpath+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -29344,14 +26228,13 @@
 
   is_noop=no
   use_elf_origin_trick=no
-  use_wrapper=no
   if test $RELOCATABLE = yes; then
     # --enable-relocatable implies --disable-rpath
     enable_rpath=no
     for ac_header in mach-o/dyld.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_o_dyld_h" = xyes; then :
+if test "x$ac_cv_header_mach_o_dyld_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MACH_O_DYLD_H 1
 _ACEOF
@@ -29363,7 +26246,7 @@
     for ac_func in _NSGetExecutablePath
 do :
   ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
-if test "x$ac_cv_func__NSGetExecutablePath" = xyes; then :
+if test "x$ac_cv_func__NSGetExecutablePath" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE__NSGETEXECUTABLEPATH 1
 _ACEOF
@@ -29373,7 +26256,7 @@
 
     case "$host_os" in
       mingw*) is_noop=yes ;;
-      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
+      linux*) use_elf_origin_trick=yes ;;
     esac
     if test $is_noop = yes; then
       RELOCATABLE_LDFLAGS=:
@@ -29387,7 +26270,6 @@
         RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
 
       else
-        use_wrapper=yes
                                         INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
 
         case "$ac_aux_dir" in
@@ -29405,14 +26287,6 @@
   RELOCATABLE_VIA_LD_FALSE=
 fi
 
-   if test $use_wrapper = yes; then
-  RELOCATABLE_VIA_WRAPPER_TRUE=
-  RELOCATABLE_VIA_WRAPPER_FALSE='#'
-else
-  RELOCATABLE_VIA_WRAPPER_TRUE='#'
-  RELOCATABLE_VIA_WRAPPER_FALSE=
-fi
-
 
 
 
@@ -29423,23 +26297,116 @@
       RELOCATABLE_STRIP=':'
 
 
-ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_setenv" = xyes; then :
-  ac_have_decl=1
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system is Windows or MSDOS" >&5
+$as_echo_n "checking whether system is Windows or MSDOS... " >&6; }
+if test "${ac_cv_win_or_dos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_have_decl=0
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
+neither MSDOS nor Windows
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_win_or_dos=yes
+else
+  ac_cv_win_or_dos=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_win_or_dos" >&5
+$as_echo "$ac_cv_win_or_dos" >&6; }
+
+    if test x"$ac_cv_win_or_dos" = xyes; then
+      ac_fs_accepts_drive_letter_prefix=1
+      ac_fs_backslash_is_file_name_separator=1
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether drive letter can start relative path" >&5
+$as_echo_n "checking whether drive letter can start relative path... " >&6; }
+if test "${ac_cv_drive_letter_can_be_relative+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#if defined __CYGWIN__
+drive letters are always absolute
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_drive_letter_can_be_relative=yes
+else
+  ac_cv_drive_letter_can_be_relative=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_drive_letter_can_be_relative" >&5
+$as_echo "$ac_cv_drive_letter_can_be_relative" >&6; }
+      if test x"$ac_cv_drive_letter_can_be_relative" = xyes; then
+        ac_fs_drive_letter_can_be_relative=1
+      else
+        ac_fs_drive_letter_can_be_relative=0
+      fi
+    else
+      ac_fs_accepts_drive_letter_prefix=0
+      ac_fs_backslash_is_file_name_separator=0
+      ac_fs_drive_letter_can_be_relative=0
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX $ac_fs_accepts_drive_letter_prefix
+_ACEOF
+
+
+
+
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SETENV $ac_have_decl
+#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR $ac_fs_backslash_is_file_name_separator
 _ACEOF
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE $ac_fs_drive_letter_can_be_relative
+_ACEOF
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 $as_echo_n "checking for ssize_t... " >&6; }
-if ${gt_cv_ssize_t+:} false; then :
+if test "${gt_cv_ssize_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29449,7 +26416,7 @@
 main ()
 {
 int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;
+        return !x;
   ;
   return 0;
 }
@@ -29475,9 +26442,26 @@
 
 
 
+  GNULIB_SIGNAL_H_SIGPIPE=0;
+  GNULIB_SIGPROCMASK=0;
+  GNULIB_SIGACTION=0;
+    HAVE_POSIX_SIGNALBLOCKING=1;
+  HAVE_SIGSET_T=1;
+  HAVE_SIGINFO_T=1;
+  HAVE_SIGACTION=1;
+  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
+
+  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
+if test "${ac_cv_type_uid_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29510,68 +26494,8 @@
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef _MSC_VER
-MicrosoftCompiler
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "MicrosoftCompiler" >/dev/null 2>&1; then :
-  gl_asmext='asm'
-     gl_c_asm_opt='-c -Fa'
-
-else
-  gl_asmext='s'
-     gl_c_asm_opt='-S'
-
-fi
-rm -f conftest*
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
-$as_echo_n "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
-if ${gl_cv_prog_as_underscore+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" int foo (void);
-#endif
-int foo(void) { return 0; }
-EOF
-     # Look for the assembly language name in the .s file.
-     { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c'
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-  (eval $ac_try) 2>&5
-  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
-       gl_cv_prog_as_underscore=yes
-     else
-       gl_cv_prog_as_underscore=no
-     fi
-     rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-$as_echo "$gl_cv_prog_as_underscore" >&6; }
-  if test $gl_cv_prog_as_underscore = yes; then
-    USER_LABEL_PREFIX=_
-  else
-    USER_LABEL_PREFIX=
-  fi
 
-cat >>confdefs.h <<_ACEOF
-#define USER_LABEL_PREFIX $USER_LABEL_PREFIX
-_ACEOF
 
-  ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
 
 
 
@@ -29582,92 +26506,37 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5
-$as_echo_n "checking whether snprintf returns a byte count as in C99... " >&6; }
-if ${gl_cv_func_snprintf_retval_c99+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+$as_echo_n "checking for SIGPIPE... " >&6; }
+if test "${gl_cv_header_signal_h_SIGPIPE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-      if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
-           darwin*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on OpenBSD >= 3.9.
-           openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
-                                 gl_cv_func_snprintf_retval_c99="guessing no";;
-           openbsd*)             gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on Solaris >= 2.10.
-           solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";;
-           solaris*)             gl_cv_func_printf_sizes_c99="guessing no";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_snprintf_retval_c99="guessing no";;
-           aix*)                 gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_snprintf_retval_c99="guessing no";;
-           netbsd*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_snprintf_retval_c99="guessing no";;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <stdio.h>
-#include <string.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
+#include <signal.h>
+#if !defined SIGPIPE
+booboo
 #endif
-static char buf[100];
-int main ()
-{
-  strcpy (buf, "ABCDEF");
-  if (my_snprintf (buf, 3, "%d %d", 4567, 89) != 7)
-    return 1;
-  if (my_snprintf (buf, 0, "%d %d", 4567, 89) != 7)
-    return 2;
-  if (my_snprintf (NULL, 0, "%d %d", 4567, 89) != 7)
-    return 3;
-  return 0;
-}
+
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_snprintf_retval_c99=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "booboo" >/dev/null 2>&1; then :
+  gl_cv_header_signal_h_SIGPIPE=no
 else
-  gl_cv_func_snprintf_retval_c99=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  gl_cv_header_signal_h_SIGPIPE=yes
 fi
+rm -f conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5
-$as_echo "$gl_cv_func_snprintf_retval_c99" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+$as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+
 
-ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_snprintf" = xyes; then :
+      ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -29679,68 +26548,93 @@
 
 
 
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
+          #include <stdbool.h>
+          #ifndef bool
+           "error: bool is not defined"
+          #endif
+          #ifndef false
+           "error: false is not defined"
+          #endif
+          #if false
+           "error: false is not 0"
+          #endif
+          #ifndef true
+           "error: true is not defined"
+          #endif
+          #if true != 1
+           "error: true is not 1"
+          #endif
+          #ifndef __bool_true_false_are_defined
+           "error: __bool_true_false_are_defined is not defined"
+          #endif
 
-             struct s { _Bool s: 1; _Bool t; } s;
+          struct s { _Bool s: 1; _Bool t; } s;
 
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
+          char a[true == 1 ? 1 : -1];
+          char b[false == 0 ? 1 : -1];
+          char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+          char d[(bool) 0.5 == true ? 1 : -1];
+          bool e = &s;
+          char f[(_Bool) 0.0 == false ? 1 : -1];
+          char g[true];
+          char h[sizeof (_Bool)];
+          char i[sizeof s.t];
+          enum { j = false, k = true, l = false * true, m = true * 256 };
+          _Bool n[m];
+          char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+          #if defined __xlc__ || defined __GNUC__
+           /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+              reported by James Lemley on 2005-10-05; see
+              http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+              This test is not quite right, since xlc is allowed to
+              reject this program, as the initializer for xlcbug is
+              not one of the forms that C requires support for.
+              However, doing the test right would require a run-time
+              test, and that would make cross-compilation harder.
+              Let us hope that IBM fixes the xlc bug, and also adds
+              support for this kind of constant expression.  In the
+              meantime, this test will reject xlc, which is OK, since
+              our stdbool.h substitute should suffice.  We also test
+              this with GCC, where it should work, to detect more
+              quickly whether someone messes up the test in the
+              future.  */
+           char digs[] = "0123456789";
+           int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+          #endif
+          /* Catch a bug in an HP-UX C compiler.  See
+             http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+             http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+           */
+          _Bool q = true;
+          _Bool *pq = &q;
 
 int
 main ()
 {
 
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
+          *pq |= q;
+          *pq |= ! q;
+          /* Refer to every declared value, to avoid compiler optimizations.  */
+          return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                  + !m + !n + !o + !p + !q + !pq);
 
   ;
   return 0;
@@ -29756,7 +26650,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
+if test "x$ac_cv_type__Bool" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
@@ -29765,46 +26659,61 @@
 
 fi
 
+   if test $ac_cv_header_stdbool_h = yes; then
 
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
+   fi
 
 
 
 
-  if test $ac_cv_type_long_long_int = yes; then
-    HAVE_LONG_LONG_INT=1
-  else
-    HAVE_LONG_LONG_INT=0
-  fi
 
 
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    HAVE_UNSIGNED_LONG_LONG_INT=1
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+$as_echo_n "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
+if test "${gl_cv_prog_as_underscore+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat > conftest.c <<EOF
+#ifdef __cplusplus
+extern "C" int foo (void);
+#endif
+int foo(void) { return 0; }
+EOF
+     # Look for the assembly language name in the .s file.
+     { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } >/dev/null 2>&1
+     if grep _foo conftest.s >/dev/null ; then
+       gl_cv_prog_as_underscore=yes
+     else
+       gl_cv_prog_as_underscore=no
+     fi
+     rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+$as_echo "$gl_cv_prog_as_underscore" >&6; }
+  if test $gl_cv_prog_as_underscore = yes; then
+    USER_LABEL_PREFIX=_
   else
-    HAVE_UNSIGNED_LONG_LONG_INT=0
+    USER_LABEL_PREFIX=
   fi
 
+cat >>confdefs.h <<_ACEOF
+#define USER_LABEL_PREFIX $USER_LABEL_PREFIX
+_ACEOF
 
+  ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
 
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
 
 
-      if test $ac_cv_header_inttypes_h = yes; then
-    HAVE_INTTYPES_H=1
-  else
-    HAVE_INTTYPES_H=0
-  fi
 
 
-      if test $ac_cv_header_sys_types_h = yes; then
-    HAVE_SYS_TYPES_H=1
-  else
-    HAVE_SYS_TYPES_H=0
-  fi
 
 
 
@@ -29816,759 +26725,503 @@
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdint_h='<'stdint.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
-$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
-if ${gl_cv_next_stdint_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-             if test $ac_cv_header_stdint_h = yes; then
 
 
+  :
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdint.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_stdint_h
-           gl_cv_next_stdint_h='"'$gl_header'"'
-          else
-               gl_cv_next_stdint_h='<'stdint.h'>'
-             fi
 
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_string_h='<'string.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+$as_echo_n "checking absolute name of <string.h>... " >&6; }
+if test "${gl_cv_next_string_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_string_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/string.h#{
+                 s#.*"\(.*/string.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_string_h='<'string.h'>'
+          fi
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-$as_echo "$gl_cv_next_stdint_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+$as_echo "$gl_cv_next_string_h" >&6; }
      fi
-     NEXT_STDINT_H=$gl_cv_next_stdint_h
+     NEXT_STRING_H=$gl_cv_next_string_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdint.h'>'
+       gl_next_as_first_directive='<'string.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdint_h
+       gl_next_as_first_directive=$gl_cv_next_string_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
-
+     NEXT_AS_FIRST_DIRECTIVE_STRING_H=$gl_next_as_first_directive
 
 
 
-  if test $ac_cv_header_stdint_h = yes; then
-    HAVE_STDINT_H=1
-  else
-    HAVE_STDINT_H=0
-  fi
 
 
-    if test $ac_cv_header_stdint_h = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
-$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
-if ${gl_cv_header_working_stdint_h+:} false; then :
+    for gl_func in memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup      strncat strndup strnlen strpbrk strsep strcasestr strtok_r strsignal      strverscmp; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  gl_cv_header_working_stdint_h=no
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <string.h>
 
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
 
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#include <stdint.h>
-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
-#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
-#endif
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+      done
 
 
-  /* 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
 
+      ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strnlen" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-#ifdef INT8_MAX
-int8_t a1 = INT8_MAX;
-int8_t a1min = INT8_MIN;
-#endif
-#ifdef INT16_MAX
-int16_t a2 = INT16_MAX;
-int16_t a2min = INT16_MIN;
-#endif
-#ifdef INT32_MAX
-int32_t a3 = INT32_MAX;
-int32_t a3min = INT32_MIN;
-#endif
-#ifdef INT64_MAX
-int64_t a4 = INT64_MAX;
-int64_t a4min = INT64_MIN;
-#endif
-#ifdef UINT8_MAX
-uint8_t b1 = UINT8_MAX;
-#else
-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-#endif
-#ifdef UINT16_MAX
-uint16_t b2 = UINT16_MAX;
-#endif
-#ifdef UINT32_MAX
-uint32_t b3 = UINT32_MAX;
-#endif
-#ifdef UINT64_MAX
-uint64_t b4 = UINT64_MAX;
-#endif
-int_least8_t c1 = INT8_C (0x7f);
-int_least8_t c1max = INT_LEAST8_MAX;
-int_least8_t c1min = INT_LEAST8_MIN;
-int_least16_t c2 = INT16_C (0x7fff);
-int_least16_t c2max = INT_LEAST16_MAX;
-int_least16_t c2min = INT_LEAST16_MIN;
-int_least32_t c3 = INT32_C (0x7fffffff);
-int_least32_t c3max = INT_LEAST32_MAX;
-int_least32_t c3min = INT_LEAST32_MIN;
-int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-int_least64_t c4max = INT_LEAST64_MAX;
-int_least64_t c4min = INT_LEAST64_MIN;
-uint_least8_t d1 = UINT8_C (0xff);
-uint_least8_t d1max = UINT_LEAST8_MAX;
-uint_least16_t d2 = UINT16_C (0xffff);
-uint_least16_t d2max = UINT_LEAST16_MAX;
-uint_least32_t d3 = UINT32_C (0xffffffff);
-uint_least32_t d3max = UINT_LEAST32_MAX;
-uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-uint_least64_t d4max = UINT_LEAST64_MAX;
-int_fast8_t e1 = INT_FAST8_MAX;
-int_fast8_t e1min = INT_FAST8_MIN;
-int_fast16_t e2 = INT_FAST16_MAX;
-int_fast16_t e2min = INT_FAST16_MIN;
-int_fast32_t e3 = INT_FAST32_MAX;
-int_fast32_t e3min = INT_FAST32_MIN;
-int_fast64_t e4 = INT_FAST64_MAX;
-int_fast64_t e4min = INT_FAST64_MIN;
-uint_fast8_t f1 = UINT_FAST8_MAX;
-uint_fast16_t f2 = UINT_FAST16_MAX;
-uint_fast32_t f3 = UINT_FAST32_MAX;
-uint_fast64_t f4 = UINT_FAST64_MAX;
-#ifdef INTPTR_MAX
-intptr_t g = INTPTR_MAX;
-intptr_t gmin = INTPTR_MIN;
-#endif
-#ifdef UINTPTR_MAX
-uintptr_t h = UINTPTR_MAX;
-#endif
-intmax_t i = INTMAX_MAX;
-uintmax_t j = UINTMAX_MAX;
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRNLEN $ac_have_decl
+_ACEOF
 
-#include <limits.h> /* for CHAR_BIT */
-#define TYPE_MINIMUM(t) \
-  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t) \
-  ((t) ((t) 0 < (t) -1 \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-struct s {
-  int check_PTRDIFF:
-      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
-      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
-      ? 1 : -1;
-  /* Detect bug in FreeBSD 6.0 / ia64.  */
-  int check_SIG_ATOMIC:
-      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
-      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
-      ? 1 : -1;
-  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
-  int check_WCHAR:
-      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
-      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
-      ? 1 : -1;
-  /* Detect bug in mingw.  */
-  int check_WINT:
-      WINT_MIN == TYPE_MINIMUM (wint_t)
-      && WINT_MAX == TYPE_MAXIMUM (wint_t)
-      ? 1 : -1;
 
-  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
-  int check_UINT8_C:
-        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
-  int check_UINT16_C:
-        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
 
-  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
-#ifdef UINT8_MAX
-  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
-#endif
-#ifdef UINT16_MAX
-  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
-#endif
-#ifdef UINT32_MAX
-  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
-#endif
-#ifdef UINT64_MAX
-  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
-#endif
-  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
-  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
-  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
-  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
-  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
-  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
-  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
-  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
-  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
-  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
-  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-};
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-                                                    if test "$cross_compiling" = yes; then :
-                 gl_cv_header_working_stdint_h=yes
+  if test "$gl_cv_func_memchr_works" != yes; then
+    REPLACE_STRSTR=1
 
-else
-  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
 
 
-#include <stdio.h>
-#include <string.h>
-#define MVAL(macro) MVAL1(macro)
-#define MVAL1(expression) #expression
-static const char *macro_values[] =
-  {
-#ifdef INT8_MAX
-    MVAL (INT8_MAX),
-#endif
-#ifdef INT16_MAX
-    MVAL (INT16_MAX),
-#endif
-#ifdef INT32_MAX
-    MVAL (INT32_MAX),
-#endif
-#ifdef INT64_MAX
-    MVAL (INT64_MAX),
-#endif
-#ifdef UINT8_MAX
-    MVAL (UINT8_MAX),
-#endif
-#ifdef UINT16_MAX
-    MVAL (UINT16_MAX),
-#endif
-#ifdef UINT32_MAX
-    MVAL (UINT32_MAX),
-#endif
-#ifdef UINT64_MAX
-    MVAL (UINT64_MAX),
-#endif
-    NULL
-  };
 
+  gl_LIBOBJS="$gl_LIBOBJS strstr.$ac_objext"
+
+  fi
+
+
+  GNULIB_SOCKET=0;
+  GNULIB_CONNECT=0;
+  GNULIB_ACCEPT=0;
+  GNULIB_BIND=0;
+  GNULIB_GETPEERNAME=0;
+  GNULIB_GETSOCKNAME=0;
+  GNULIB_GETSOCKOPT=0;
+  GNULIB_LISTEN=0;
+  GNULIB_RECV=0;
+  GNULIB_SEND=0;
+  GNULIB_RECVFROM=0;
+  GNULIB_SENDTO=0;
+  GNULIB_SETSOCKOPT=0;
+  GNULIB_SHUTDOWN=0;
+  GNULIB_ACCEPT4=0;
+  HAVE_STRUCT_SOCKADDR_STORAGE=1;
+  HAVE_SA_FAMILY_T=1;
+  HAVE_ACCEPT4=1;
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> is self-contained" >&5
+$as_echo_n "checking whether <sys/socket.h> is self-contained... " >&6; }
+if test "${gl_cv_header_sys_socket_h_selfcontained+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/socket.h>
 int
 main ()
 {
 
-  const char **mv;
-  for (mv = macro_values; *mv != NULL; mv++)
-    {
-      const char *value = *mv;
-      /* Test whether it looks like a cast expression.  */
-      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
-          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
-          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
-          || strncmp (value, "((int)"/*)*/, 6) == 0
-          || strncmp (value, "((signed short)"/*)*/, 15) == 0
-          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-        return mv - macro_values + 1;
-    }
-  return 0;
-
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_header_working_stdint_h=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_sys_socket_h_selfcontained=yes
+else
+  gl_cv_header_sys_socket_h_selfcontained=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_working_stdint_h" >&5
-$as_echo "$gl_cv_header_working_stdint_h" >&6; }
-  fi
-  if test "$gl_cv_header_working_stdint_h" = yes; then
-    STDINT_H=
-  else
-            for ac_header in sys/inttypes.h sys/bitypes.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_selfcontained" >&5
+$as_echo "$gl_cv_header_sys_socket_h_selfcontained" >&6; }
+  if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
+            for ac_func in shutdown
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
+if test "x$ac_cv_func_shutdown" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SHUTDOWN 1
 _ACEOF
 
 fi
-
 done
 
-    if test $ac_cv_header_sys_inttypes_h = yes; then
-      HAVE_SYS_INTTYPES_H=1
-    else
-      HAVE_SYS_INTTYPES_H=0
-    fi
+    if test $ac_cv_func_shutdown = yes; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> defines the SHUT_* macros" >&5
+$as_echo_n "checking whether <sys/socket.h> defines the SHUT_* macros... " >&6; }
+if test "${gl_cv_header_sys_socket_h_shut+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    if test $ac_cv_header_sys_bitypes_h = yes; then
-      HAVE_SYS_BITYPES_H=1
-    else
-      HAVE_SYS_BITYPES_H=0
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/socket.h>
+int
+main ()
+{
+int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_sys_socket_h_shut=yes
+else
+  gl_cv_header_sys_socket_h_shut=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_sys_socket_h_shut" >&5
+$as_echo "$gl_cv_header_sys_socket_h_shut" >&6; }
+      if test $gl_cv_header_sys_socket_h_shut = no; then
+        SYS_SOCKET_H='sys/socket.h'
+      fi
     fi
+  fi
+  # We need to check for ws2tcpip.h now.
 
 
 
 
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
+
+  :
 
 
-  for gltype in ptrdiff_t size_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_socket_h='<'sys/socket.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/socket.h>" >&5
+$as_echo_n "checking absolute name of <sys/socket.h>... " >&6; }
+if test "${gl_cv_next_sys_socket_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
-  /* 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
 
-#include <limits.h>"; then :
+          if test $ac_cv_header_sys_socket_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/socket.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_socket_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/socket.h#{
+                 s#.*"\(.*/sys/socket.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_sys_socket_h='<'sys/socket.h'>'
+          fi
 
-else
-  result=unknown
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_socket_h" >&5
+$as_echo "$gl_cv_next_sys_socket_h" >&6; }
+     fi
+     NEXT_SYS_SOCKET_H=$gl_cv_next_sys_socket_h
 
-       eval gl_cv_bitsizeof_${gltype}=\$result
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'sys/socket.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_sys_socket_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H=$gl_next_as_first_directive
 
-fi
-eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_bitsizeof_${gltype}
-    if test $result = unknown; then
-                                                result=0
-    fi
-    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    cat >>confdefs.h <<_ACEOF
-#define BITSIZEOF_${GLTYPE} $result
+
+
+  if test $ac_cv_header_sys_socket_h = yes; then
+    HAVE_SYS_SOCKET_H=1
+    HAVE_WS2TCPIP_H=0
+  else
+    HAVE_SYS_SOCKET_H=0
+                    for ac_header in ws2tcpip.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WS2TCPIP_H 1
 _ACEOF
 
-    eval BITSIZEOF_${GLTYPE}=\$result
-  done
+fi
 
+done
 
+    if test $ac_cv_header_ws2tcpip_h = yes; then
+      HAVE_WS2TCPIP_H=1
+    else
+      HAVE_WS2TCPIP_H=0
+    fi
   fi
 
 
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
-  /* 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
 
-#include <limits.h>"; then :
+  ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
 
-else
-  result=unknown
-fi
+"
+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+_ACEOF
 
-       eval gl_cv_bitsizeof_${gltype}=\$result
 
 fi
-eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_bitsizeof_${gltype}
-    if test $result = unknown; then
-                                                result=0
-    fi
-    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    cat >>confdefs.h <<_ACEOF
-#define BITSIZEOF_${GLTYPE} $result
+ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
+"
+if test "x$ac_cv_type_sa_family_t" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SA_FAMILY_T 1
 _ACEOF
 
-    eval BITSIZEOF_${GLTYPE}=\$result
-  done
 
+fi
 
+  if test $ac_cv_type_struct_sockaddr_storage = no; then
+    HAVE_STRUCT_SOCKADDR_STORAGE=0
+  fi
+  if test $ac_cv_type_sa_family_t = no; then
+    HAVE_SA_FAMILY_T=0
+  fi
 
 
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
-$as_echo_n "checking whether $gltype is signed... " >&6; }
-if eval \${gl_cv_type_${gltype}_signed+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.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
-
-            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  result=yes
-else
-  result=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       eval gl_cv_type_${gltype}_signed=\$result
-
-fi
-eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_type_${gltype}_signed
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    if test "$result" = yes; then
-      cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGNED_${GLTYPE} 1
-_ACEOF
-
-      eval HAVE_SIGNED_${GLTYPE}=1
-    else
-      eval HAVE_SIGNED_${GLTYPE}=0
-    fi
-  done
 
-
-  gl_cv_type_ptrdiff_t_signed=yes
-  gl_cv_type_size_t_signed=no
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
+  :
 
 
-  for gltype in ptrdiff_t size_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
-$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval gl_cv_type_${gltype}_suffix=no
-       eval result=\$gl_cv_type_${gltype}_signed
-       if test "$result" = yes; then
-         glsufu=
-       else
-         glsufu=u
-       fi
-       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-         case $glsuf in
-           '')  gltype1='int';;
-           l)   gltype1='long int';;
-           ll)  gltype1='long long int';;
-           i64) gltype1='__int64';;
-           u)   gltype1='unsigned int';;
-           ul)  gltype1='unsigned long int';;
-           ull) gltype1='unsigned long long int';;
-           ui64)gltype1='unsigned __int64';;
-         esac
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.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
 
-              extern $gltype foo;
-              extern $gltype1 foo;
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval gl_cv_type_${gltype}_suffix=\$glsuf
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         eval result=\$gl_cv_type_${gltype}_suffix
-         test "$result" != no && break
-       done
-fi
-eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    eval result=\$gl_cv_type_${gltype}_suffix
-    test "$result" = no && result=
-    eval ${GLTYPE}_SUFFIX=\$result
-    cat >>confdefs.h <<_ACEOF
-#define ${GLTYPE}_SUFFIX $result
+  if test $ac_cv_header_sys_socket_h != yes; then
+                    for ac_header in winsock2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WINSOCK2_H 1
 _ACEOF
 
-  done
+fi
 
+done
 
   fi
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    HAVE_WINSOCK2_H=1
+    UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
+  else
+    HAVE_WINSOCK2_H=0
+  fi
 
 
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
-$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+
+
+    for gl_func in socket connect accept bind getpeername getsockname getsockopt     listen recv send recvfrom sendto setsockopt shutdown accept4; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  eval gl_cv_type_${gltype}_suffix=no
-       eval result=\$gl_cv_type_${gltype}_signed
-       if test "$result" = yes; then
-         glsufu=
-       else
-         glsufu=u
-       fi
-       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-         case $glsuf in
-           '')  gltype1='int';;
-           l)   gltype1='long int';;
-           ll)  gltype1='long long int';;
-           i64) gltype1='__int64';;
-           u)   gltype1='unsigned int';;
-           ul)  gltype1='unsigned long int';;
-           ull) gltype1='unsigned long long int';;
-           ui64)gltype1='unsigned __int64';;
-         esac
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.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
+/* Some systems require prerequisite headers.  */
+#include <sys/types.h>
+#if !defined __GLIBC__ && HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/select.h>
 
-              extern $gltype foo;
-              extern $gltype1 foo;
 int
 main ()
 {
-
+#undef $gl_func
+  (void) $gl_func;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval gl_cv_type_${gltype}_suffix=\$glsuf
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         eval result=\$gl_cv_type_${gltype}_suffix
-         test "$result" != no && break
-       done
 fi
-eval ac_res=\$gl_cv_type_${gltype}_suffix
+eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    eval result=\$gl_cv_type_${gltype}_suffix
-    test "$result" = no && result=
-    eval ${GLTYPE}_SUFFIX=\$result
-    cat >>confdefs.h <<_ACEOF
-#define ${GLTYPE}_SUFFIX $result
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
-  done
-
-
-
-          if test $BITSIZEOF_WINT_T -lt 32; then
-    BITSIZEOF_WINT_T=32
-  fi
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+      done
 
-    STDINT_H=stdint.h
-  fi
 
-   if test -n "$STDINT_H"; then
-  GL_GENERATE_STDINT_H_TRUE=
-  GL_GENERATE_STDINT_H_FALSE='#'
-else
-  GL_GENERATE_STDINT_H_TRUE='#'
-  GL_GENERATE_STDINT_H_FALSE=
-fi
 
+  GNULIB_SELECT=0;
+    REPLACE_SELECT=0;
 
-ac_fn_c_check_decl "$LINENO" "stpncpy" "ac_cv_have_decl_stpncpy" "$ac_includes_default"
-if test "x$ac_cv_have_decl_stpncpy" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STPNCPY $ac_have_decl
-_ACEOF
 
 
 
 
-     REPLACE_STRERROR_0=0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
-$as_echo_n "checking whether strerror(0) succeeds... " >&6; }
-if ${gl_cv_func_strerror_0_works+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if test "${ac_cv_header_stat_broken+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_strerror_0_works="guessing no" ;;
-       esac
-
-else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
-           #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#if defined S_ISBLK && defined S_IFDIR
+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
+#endif
+
+#if defined S_ISBLK && defined S_IFCHR
+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
+#endif
+
+#if defined S_ISLNK && defined S_IFREG
+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
+#endif
+
+#if defined S_ISSOCK && defined S_IFREG
+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
+#endif
 
-int
-main ()
-{
-int result = 0;
-           char *str;
-           errno = 0;
-           str = strerror (0);
-           if (!*str) result |= 1;
-           if (errno) result |= 2;
-           if (strstr (str, "nknown") || strstr (str, "ndefined"))
-             result |= 4;
-           return result;
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strerror_0_works=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stat_broken=no
 else
-  gl_cv_func_strerror_0_works=no
+  ac_cv_header_stat_broken=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
+if test $ac_cv_header_stat_broken = yes; then
 
+$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
-$as_echo "$gl_cv_func_strerror_0_works" >&6; }
-  case "$gl_cv_func_strerror_0_works" in
-    *yes) ;;
-    *)
-      REPLACE_STRERROR_0=1
 
-$as_echo "#define REPLACE_STRERROR_0 1" >>confdefs.h
 
-      ;;
-  esac
 
 
 
@@ -30580,208 +27233,216 @@
 
 
 
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_string_h='<'string.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
-$as_echo_n "checking absolute name of <string.h>... " >&6; }
-if ${gl_cv_next_string_h+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'string.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_string_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_string_h
-           gl_cv_next_string_h='"'$gl_header'"'
-
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-$as_echo "$gl_cv_next_string_h" >&6; }
-     fi
-     NEXT_STRING_H=$gl_cv_next_string_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'string.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_string_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STRING_H=$gl_next_as_first_directive
-
-
-
-
-
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
 
-    for gl_func in ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul      strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r      strerror_r strsignal strverscmp; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
-
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
-#undef $gl_func
-  (void) $gl_func;
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
+  ac_cv_sys_file_offset_bits=no; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
 
-                     eval ac_cv_have_decl_$gl_func=yes
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
 fi
-      done
-
-
-ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strnlen" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRNLEN $ac_have_decl
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
-
-
-
-
-  if test "$gl_cv_func_memchr_works" != yes; then
-    REPLACE_STRSTR=1
-  else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5
-$as_echo_n "checking whether strstr works... " >&6; }
-if ${gl_cv_func_strstr_works_always+:} false; then :
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-                                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
 
-#ifdef __GNU_LIBRARY__
- #include <features.h>
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     || defined __UCLIBC__
-  Lucky user
- #endif
-#elif defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strstr_works_always="guessing yes"
-else
-  gl_cv_func_strstr_works_always="guessing no"
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
 fi
-rm -f conftest*
-
-
-else
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <string.h> /* for strstr */
-#define P "_EF_BF_BD"
-#define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P
-#define NEEDLE P P P P P
-
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
-return !!strstr (HAYSTACK, NEEDLE);
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strstr_works_always=yes
-else
-  gl_cv_func_strstr_works_always=no
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
 fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether curses libraries may be used" >&5
+$as_echo_n "checking whether curses libraries may be used... " >&6; }
+  # Check whether --enable-curses was given.
+if test "${enable_curses+set}" = set; then :
+  enableval=$enable_curses; gl_curses_allowed="$enableval"
+else
+  gl_curses_allowed=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strstr_works_always" >&5
-$as_echo "$gl_cv_func_strstr_works_always" >&6; }
-    case "$gl_cv_func_strstr_works_always" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
-  fi
 
-
-  GNULIB_PSELECT=0;
-  GNULIB_SELECT=0;
-    HAVE_PSELECT=1;
-  REPLACE_PSELECT=0;
-  REPLACE_SELECT=0;
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_curses_allowed" >&5
+$as_echo "$gl_curses_allowed" >&6; }
 
 
 
@@ -30790,6 +27451,7 @@
 
 
 
+  if test "$gl_curses_allowed" != no; then
 
 
 
@@ -30798,124 +27460,15 @@
 
 
 
+    use_additional=yes
 
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
 
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_types_h='<'sys/types.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
-$as_echo_n "checking absolute name of <sys/types.h>... " >&6; }
-if ${gl_cv_next_sys_types_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/types.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_sys_types_h
-           gl_cv_next_sys_types_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-$as_echo "$gl_cv_next_sys_types_h" >&6; }
-     fi
-     NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/types.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_types_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H=$gl_next_as_first_directive
-
-
-
-
-
-
-
-
-
-
-
-
-  GNULIB_WAITPID=0;
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether curses libraries may be used" >&5
-$as_echo_n "checking whether curses libraries may be used... " >&6; }
-  # Check whether --enable-curses was given.
-if test "${enable_curses+set}" = set; then :
-  enableval=$enable_curses; gl_curses_allowed="$enableval"
-else
-  gl_curses_allowed=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_curses_allowed" >&5
-$as_echo "$gl_curses_allowed" >&6; }
-
-
-
-
-
-
-
-
-  if test "$gl_curses_allowed" != no; then
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
 
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
@@ -30974,7 +27527,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -31436,7 +27989,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -31898,7 +28451,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -32360,7 +28913,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -32770,7 +29323,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking where terminfo library functions come from" >&5
 $as_echo_n "checking where terminfo library functions come from... " >&6; }
-if ${gl_cv_terminfo+:} false; then :
+if test "${gl_cv_terminfo+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33025,7 +29578,7 @@
     *)
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking where termcap library functions come from" >&5
 $as_echo_n "checking where termcap library functions come from... " >&6; }
-if ${gl_cv_termcap+:} false; then :
+if test "${gl_cv_termcap+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33139,7 +29692,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tparam" >&5
 $as_echo_n "checking for tparam... " >&6; }
-if ${gl_cv_terminfo_tparam+:} false; then :
+if test "${gl_cv_terminfo_tparam+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33184,7 +29737,7 @@
   else
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tparm" >&5
 $as_echo_n "checking for tparm... " >&6; }
-if ${gl_cv_terminfo_tparm+:} false; then :
+if test "${gl_cv_terminfo_tparm+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33229,7 +29782,7 @@
   GNULIB_STRPTIME=0;
   GNULIB_TIMEGM=0;
   GNULIB_TIME_R=0;
-    HAVE_DECL_LOCALTIME_R=1;
+    HAVE_LOCALTIME_R=1;
   HAVE_NANOSLEEP=1;
   HAVE_STRPTIME=1;
   HAVE_TIMEGM=1;
@@ -33238,15 +29791,22 @@
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
   REPLACE_TIMEGM=GNULIB_PORTCHECK;
 
-      : ${GNULIB_GETTIMEOFDAY=0};
-        REPLACE_GMTIME=0;
-  REPLACE_LOCALTIME=0;
+
+
+
+
+
+
+
+  :
+
+
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 $as_echo_n "checking for struct timespec in <time.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
+if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33279,7 +29839,7 @@
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 $as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then :
+if test "${gl_cv_sys_struct_timespec_in_sys_time_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33308,7 +29868,7 @@
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 $as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then :
+if test "${gl_cv_sys_struct_timespec_in_pthread_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33348,6 +29908,10 @@
 
 
 
+  :
+
+
+
 
 
 
@@ -33357,45 +29921,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 $as_echo_n "checking absolute name of <time.h>... " >&6; }
-if ${gl_cv_next_time_h+:} false; then :
+if test "${gl_cv_next_time_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_time_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'time.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_time_h
-           gl_cv_next_time_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/time.h#{
+                 s#.*"\(.*/time.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_time_h='<'time.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
@@ -33422,7 +29971,6 @@
 
 
 
-
 gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
 i\
 0
@@ -33448,8 +29996,12 @@
 
 
 
-ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes; then :
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_clearerr_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33459,8 +30011,10 @@
 #define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_feof_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_feof_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33470,8 +30024,10 @@
 #define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_ferror_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ferror_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33481,8 +30037,10 @@
 #define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fflush_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fflush_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33492,8 +30050,10 @@
 #define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fgets_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fgets_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33503,8 +30063,10 @@
 #define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fputc_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fputc_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33514,8 +30076,10 @@
 #define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fputs_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fputs_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33525,8 +30089,10 @@
 #define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fread_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fread_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33536,8 +30102,10 @@
 #define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fwrite_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33547,8 +30115,10 @@
 #define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getchar_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getchar_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33558,8 +30128,10 @@
 #define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_putc_unlocked" = xyes; then :
+
+
+      ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_putc_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -33569,26 +30141,17 @@
 #define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_putchar_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl
-_ACEOF
 
-ac_fn_c_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_unsetenv" = xyes; then :
+      ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_putchar_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_UNSETENV $ac_have_decl
+#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl
 _ACEOF
 
 
@@ -33597,19 +30160,12 @@
 
 
 
-  if test $ac_cv_header_features_h = yes; then
-    HAVE_FEATURES_H=1
-  else
-    HAVE_FEATURES_H=0
-  fi
-
-
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
 $as_echo_n "checking for intmax_t... " >&6; }
-if ${gt_cv_c_intmax_t+:} false; then :
+if test "${gt_cv_c_intmax_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33658,350 +30214,73 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'double'" >&5
-$as_echo_n "checking where to find the exponent in a 'double'... " >&6; }
-if ${gl_cv_cc_double_expbit0+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      if test "$cross_compiling" = yes; then :
-
-                                                                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#if defined arm || defined __arm || defined __arm__
-  mixed_endianness
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "mixed_endianness" >/dev/null 2>&1; then :
-  gl_cv_cc_double_expbit0="unknown"
-else
 
-                                                         :
-if ${ac_cv_c_bigendian+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5
+$as_echo_n "checking whether snprintf returns a byte count as in C99... " >&6; }
+if test "${gl_cv_func_snprintf_retval_c99+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
       if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-:
- case $ac_cv_c_bigendian in #(
-   yes)
-     gl_cv_cc_double_expbit0="word 0 bit 20";; #(
-   no)
-     gl_cv_cc_double_expbit0="word 1 bit 20" ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     gl_cv_cc_double_expbit0="unknown" ;;
- esac
-
-
-fi
-rm -f conftest*
 
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on FreeBSD >= 5.
+         freebsd[1-4]*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+         darwin*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on OpenBSD >= 3.9.
+         openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
+                               gl_cv_func_snprintf_retval_c99="guessing no";;
+         openbsd*)             gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on Solaris >= 2.6.
+         solaris2.[0-5]*)      gl_cv_func_snprintf_retval_c99="guessing no";;
+         solaris*)             gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on AIX >= 4.
+         aix[1-3]*)            gl_cv_func_snprintf_retval_c99="guessing no";;
+         aix*)                 gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_snprintf_retval_c99="guessing no";;
+         netbsd*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on BeOS.
+         beos*)                gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_snprintf_retval_c99="guessing no";;
+       esac
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <float.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#define NWORDS \
-  ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-typedef union { double value; unsigned int word[NWORDS]; } memory_double;
-static unsigned int ored_words[NWORDS];
-static unsigned int anded_words[NWORDS];
-static void add_to_ored_words (double x)
-{
-  memory_double m;
-  size_t i;
-  /* Clear it first, in case sizeof (double) < sizeof (memory_double).  */
-  memset (&m, 0, sizeof (memory_double));
-  m.value = x;
-  for (i = 0; i < NWORDS; i++)
-    {
-      ored_words[i] |= m.word[i];
-      anded_words[i] &= m.word[i];
-    }
-}
+static char buf[100];
 int main ()
 {
-  size_t j;
-  FILE *fp = fopen ("conftest.out", "w");
-  if (fp == NULL)
+  strcpy (buf, "ABCDEF");
+  if (snprintf (buf, 3, "%d %d", 4567, 89) != 7)
     return 1;
-  for (j = 0; j < NWORDS; j++)
-    anded_words[j] = ~ (unsigned int) 0;
-  add_to_ored_words (0.25);
-  add_to_ored_words (0.5);
-  add_to_ored_words (1.0);
-  add_to_ored_words (2.0);
-  add_to_ored_words (4.0);
-  /* Remove bits that are common (e.g. if representation of the first mantissa
-     bit is explicit).  */
-  for (j = 0; j < NWORDS; j++)
-    ored_words[j] &= ~anded_words[j];
-  /* Now find the nonzero word.  */
-  for (j = 0; j < NWORDS; j++)
-    if (ored_words[j] != 0)
-      break;
-  if (j < NWORDS)
-    {
-      size_t i;
-      for (i = j + 1; i < NWORDS; i++)
-        if (ored_words[i] != 0)
-          {
-            fprintf (fp, "unknown");
-            return (fclose (fp) != 0);
-          }
-      for (i = 0; ; i++)
-        if ((ored_words[j] >> i) & 1)
-          {
-            fprintf (fp, "word %d bit %d", (int) j, (int) i);
-            return (fclose (fp) != 0);
-          }
-    }
-  fprintf (fp, "unknown");
-  return (fclose (fp) != 0);
+  return 0;
 }
-
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_cc_double_expbit0=`cat conftest.out`
+  gl_cv_func_snprintf_retval_c99=yes
 else
-  gl_cv_cc_double_expbit0="unknown"
+  gl_cv_func_snprintf_retval_c99=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-      rm -f conftest.out
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_expbit0" >&5
-$as_echo "$gl_cv_cc_double_expbit0" >&6; }
-  case "$gl_cv_cc_double_expbit0" in
-    word*bit*)
-      word=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
-      bit=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word.*bit //'`
-
-cat >>confdefs.h <<_ACEOF
-#define DBL_EXPBIT0_WORD $word
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DBL_EXPBIT0_BIT $bit
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5
+$as_echo "$gl_cv_func_snprintf_retval_c99" >&6; }
 
-      ;;
-  esac
 
 
 
@@ -34012,7 +30291,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -34022,7 +30302,7 @@
 
       ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h>
 "
-if test "x$ac_cv_have_decl__snprintf" = xyes; then :
+if test "x$ac_cv_have_decl__snprintf" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -34033,7 +30313,6 @@
 _ACEOF
 
 
-
   case "$gl_cv_func_snprintf_retval_c99" in
     *yes)
 
@@ -34042,8 +30321,9 @@
       ;;
   esac
 
-ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_vsnprintf" = xyes; then :
+
+      ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -34054,9 +30334,10 @@
 _ACEOF
 
 
+
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 $as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
-if ${gl_cv_header_wchar_h_correct_inline+:} false; then :
+if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gl_cv_header_wchar_h_correct_inline=yes
@@ -34064,13 +30345,6 @@
 /* end confdefs.h.  */
 
        #define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 extern int zero (void);
 int main () { return zero(); }
@@ -34086,13 +30360,6 @@
 /* end confdefs.h.  */
 
          #define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int zero (void) { return 0; }
 
@@ -34116,7 +30383,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
 $as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
   if test $gl_cv_header_wchar_h_correct_inline = no; then
-    as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+    as_fn_error "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
 This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
 C99 mode. You have four options:
   - Add the flag -fgnu89-inline to CC and reconfigure, or
@@ -34129,8 +30396,22 @@
 
 
 
-ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
-if test "x$ac_cv_have_decl_alarm" = xyes; then :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
+if test "x$ac_cv_have_decl_alarm" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -34141,51 +30422,8 @@
 _ACEOF
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdin defaults to large file offsets" >&5
-$as_echo_n "checking whether stdin defaults to large file offsets... " >&6; }
-if ${gl_cv_var_stdin_large_offset+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-#if defined __SL64 && defined __SCLE /* cygwin */
-  /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making
-     fseeko/ftello needlessly fail.  This bug was fixed in 1.5.25, and
-     it is easier to do a version check than building a runtime test.  */
-# include <cygwin/version.h>
-# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)
-  choke me
-# endif
-#endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv_var_stdin_large_offset=yes
-else
-  gl_cv_var_stdin_large_offset=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var_stdin_large_offset" >&5
-$as_echo "$gl_cv_var_stdin_large_offset" >&6; }
 
-ac_fn_c_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_default"
-if test "x$ac_cv_have_decl_ftello" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FTELLO $ac_have_decl
-_ACEOF
 
 
 
@@ -34196,339 +30434,193 @@
 
 
 
-  if test $ac_cv_have_decl_ftello = no; then
-    HAVE_DECL_FTELLO=0
-  fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5
-$as_echo_n "checking for ftello... " >&6; }
-if ${gl_cv_func_ftello+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-ftello (stdin);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv_func_ftello=yes
-else
-  gl_cv_func_ftello=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5
-$as_echo "$gl_cv_func_ftello" >&6; }
-  if test $gl_cv_func_ftello = no; then
-    HAVE_FTELLO=0
-  else
-    if test $WINDOWS_64_BIT_OFF_T = 1; then
-      REPLACE_FTELLO=1
-    fi
-    if test $gl_cv_var_stdin_large_offset = no; then
-      REPLACE_FTELLO=1
-    fi
-    if test $REPLACE_FTELLO = 0; then
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5
-$as_echo_n "checking whether ftello works... " >&6; }
-if ${gl_cv_func_ftello_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-                              case "$host_os" in
-                      # Guess no on Solaris.
-            solaris*) gl_cv_func_ftello_works="guessing no" ;;
-                      # Guess yes otherwise.
-            *)        gl_cv_func_ftello_works="guessing yes" ;;
-          esac
-          if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define TESTFILE "conftest.tmp"
-int
-main (void)
-{
-  FILE *fp;
 
-  /* Create a file with some contents.  */
-  fp = fopen (TESTFILE, "w");
-  if (fp == NULL)
-    return 70;
-  if (fwrite ("foogarsh", 1, 8, fp) < 8)
-    return 71;
-  if (fclose (fp))
-    return 72;
 
-  /* The file's contents is now "foogarsh".  */
 
-  /* Try writing after reading to EOF.  */
-  fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    return 73;
-  if (fseek (fp, -1, SEEK_END))
-    return 74;
-  if (!(getc (fp) == 'h'))
-    return 1;
-  if (!(getc (fp) == EOF))
-    return 2;
-  if (!(ftell (fp) == 8))
-    return 3;
-  if (!(ftell (fp) == 8))
-    return 4;
-  if (!(putc ('!', fp) == '!'))
-    return 5;
-  if (!(ftell (fp) == 9))
-    return 6;
-  if (!(fclose (fp) == 0))
-    return 7;
-  fp = fopen (TESTFILE, "r");
-  if (fp == NULL)
-    return 75;
-  {
-    char buf[10];
-    if (!(fread (buf, 1, 10, fp) == 9))
-      return 10;
-    if (!(memcmp (buf, "foogarsh!", 9) == 0))
-      return 11;
-  }
-  if (!(fclose (fp) == 0))
-    return 12;
 
-  /* The file's contents is now "foogarsh!".  */
-
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_ftello_works=yes
+   if true; then
+  GL_COND_LIBTOOL_TRUE=
+  GL_COND_LIBTOOL_FALSE='#'
 else
-  gl_cv_func_ftello_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  GL_COND_LIBTOOL_TRUE='#'
+  GL_COND_LIBTOOL_FALSE=
 fi
 
+  gl_cond_libtool=true
+  gl_m4_base='gnulib-m4'
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5
-$as_echo "$gl_cv_func_ftello_works" >&6; }
-      case "$gl_cv_func_ftello_works" in
-        *yes) ;;
-        *)
-          REPLACE_FTELLO=1
 
-$as_echo "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs.h
 
-          ;;
-      esac
-    fi
-  fi
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ungetc works on arbitrary bytes" >&5
-$as_echo_n "checking whether ungetc works on arbitrary bytes... " >&6; }
-if ${gl_cv_func_ungetc_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_ungetc_works="guessing no" ;;
-         esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <stdio.h>
+  gl_source_base='gnulib-lib'
+  # Code from module acl:
 
-int
-main ()
-{
-FILE *f;
-           if (!(f = fopen ("conftest.tmp", "w+"))) return 1;
-           if (fputs ("abc", f) < 0) return 2;
-           rewind (f);
-           if (fgetc (f) != 'a') return 3;
-           if (fgetc (f) != 'b') return 4;
-           if (ungetc ('d', f) != 'd') return 5;
-           if (ftell (f) != 1) return 6;
-           if (fgetc (f) != 'd') return 7;
-           if (ftell (f) != 2) return 8;
-           if (fseek (f, 0, SEEK_CUR) != 0) return 9;
-           if (ftell (f) != 2) return 10;
-           if (fgetc (f) != 'c') return 11;
-           fclose (f); remove ("conftest.tmp");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_ungetc_works=yes
+  # Check whether --enable-acl was given.
+if test "${enable_acl+set}" = set; then :
+  enableval=$enable_acl;
 else
-  gl_cv_func_ungetc_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  enable_acl=auto
 fi
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ungetc_works" >&5
-$as_echo "$gl_cv_func_ungetc_works" >&6; }
-  case "$gl_cv_func_ungetc_works" in
-    *yes) ;;
-    *)
+  LIB_ACL=
+  use_acl=0
 
-$as_echo "#define FUNC_UNGETC_BROKEN 1" >>confdefs.h
+  if test "x$enable_acl" != "xno"; then
+        for ac_header in sys/acl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_acl_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ACL_H 1
+_ACEOF
 
-      ;;
-  esac
+fi
 
+done
 
+    if test $ac_cv_header_sys_acl_h = yes; then
+      ac_save_LIBS=$LIBS
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5
-$as_echo_n "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; }
-if ${gl_cv_func_getcwd_null+:} false; then :
+                  if test $use_acl = 0; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5
+$as_echo_n "checking for library containing acl_get_file... " >&6; }
+if test "${ac_cv_search_acl_get_file+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                     # Guess yes on glibc systems.
-            *-gnu*)  gl_cv_func_getcwd_null="guessing yes";;
-                     # Guess yes on Cygwin.
-            cygwin*) gl_cv_func_getcwd_null="guessing yes";;
-                     # If we don't know, assume the worst.
-            *)       gl_cv_func_getcwd_null="guessing no";;
-          esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#        if HAVE_UNISTD_H
-#         include <unistd.h>
-#        else /* on Windows with MSVC */
-#         include <direct.h>
-#        endif
-#        ifndef getcwd
-         char *getcwd ();
-#        endif
-
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_get_file ();
 int
 main ()
 {
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* mingw cwd does not start with '/', but getcwd does allocate.
-   However, mingw fails to honor non-zero size.  */
-#else
-           if (chdir ("/") != 0)
-             return 1;
-           else
-             {
-               char *f = getcwd (NULL, 0);
-               if (! f)
-                 return 2;
-               if (f[0] != '/')
-                 return 3;
-               if (f[1] != '\0')
-                 return 4;
-               return 0;
-             }
-#endif
-
+return acl_get_file ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getcwd_null=yes
+for ac_lib in '' acl pacl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_acl_get_file=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_acl_get_file+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_acl_get_file+set}" = set; then :
+
 else
-  gl_cv_func_getcwd_null=no
+  ac_cv_search_acl_get_file=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5
+$as_echo "$ac_cv_search_acl_get_file" >&6; }
+ac_res=$ac_cv_search_acl_get_file
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  if test "$ac_cv_search_acl_get_file" != "none required"; then
+             LIB_ACL=$ac_cv_search_acl_get_file
+           fi
+           for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \
+              acl_free acl_from_mode acl_from_text \
+              acl_delete_def_file acl_extended_file \
+              acl_delete_fd_np acl_delete_file_np \
+              acl_copy_ext_native acl_create_entry_np \
+              acl_to_short_text acl_free_text
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_null" >&5
-$as_echo "$gl_cv_func_getcwd_null" >&6; }
+done
 
+           # If the acl_get_file bug is detected, don't enable the ACL support.
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getcwd with POSIX signature" >&5
-$as_echo_n "checking for getcwd with POSIX signature... " >&6; }
-if ${gl_cv_func_getcwd_posix_signature+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5
+$as_echo_n "checking for working acl_get_file... " >&6; }
+if test "${gl_cv_func_working_acl_get_file+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then :
+  gl_cv_func_working_acl_get_file=cross-compiling
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <unistd.h>
+#include <sys/types.h>
+           #include <sys/acl.h>
+           #include <errno.h>
+
 int
 main ()
 {
-extern
-           #ifdef __cplusplus
-           "C"
-           #endif
-           char *getcwd (char *, size_t);
-
+return !! (!acl_get_file (".", ACL_TYPE_ACCESS)
+                       && errno == ENOENT);
   ;
   return 0;
 }
-
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_getcwd_posix_signature=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_working_acl_get_file=yes
 else
-  gl_cv_func_getcwd_posix_signature=no
+  gl_cv_func_working_acl_get_file=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_posix_signature" >&5
-$as_echo "$gl_cv_func_getcwd_posix_signature" >&6; }
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5
+$as_echo "$gl_cv_func_working_acl_get_file" >&6; }
 
+  if test $gl_cv_func_working_acl_get_file = yes; then :
+  use_acl=1
+fi
 
+           if test $use_acl = 1; then
+                          for ac_header in acl/libacl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default"
+if test "x$ac_cv_header_acl_libacl_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACL_LIBACL_H 1
+_ACEOF
 
-  GNULIB_IMAXABS=0;
-  GNULIB_IMAXDIV=0;
-  GNULIB_STRTOIMAX=0;
-  GNULIB_STRTOUMAX=0;
-    HAVE_DECL_IMAXABS=1;
-  HAVE_DECL_IMAXDIV=1;
-  HAVE_DECL_STRTOIMAX=1;
-  HAVE_DECL_STRTOUMAX=1;
-  REPLACE_STRTOIMAX=0;
-  REPLACE_STRTOUMAX=0;
-  INT32_MAX_LT_INTMAX_MAX=1;
-  INT64_MAX_EQ_LONG_MAX='defined _LP64';
-  PRI_MACROS_BROKEN=0;
-  PRIPTR_PREFIX=__PRIPTR_PREFIX;
-  UINT32_MAX_LT_UINTMAX_MAX=1;
-  UINT64_MAX_EQ_ULONG_MAX='defined _LP64';
+fi
 
+done
 
 
 
@@ -34538,159 +30630,255 @@
 
 
 
+  for ac_func in acl_entries
+do :
+  ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries"
+if test "x$ac_cv_func_acl_entries" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACL_ENTRIES 1
+_ACEOF
 
+else
 
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
+fi
+done
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_inttypes_h='<'inttypes.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
-$as_echo_n "checking absolute name of <inttypes.h>... " >&6; }
-if ${gl_cv_next_inttypes_h+:} false; then :
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5
+$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; }
+if test "${gl_cv_acl_ACL_FIRST_ENTRY+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-
-             if test $ac_cv_header_inttypes_h = yes; then
-
-
-
-
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/acl.h>
+int type = ACL_FIRST_ENTRY;
 _ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'inttypes.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_acl_ACL_FIRST_ENTRY=yes
+else
+  gl_cv_acl_ACL_FIRST_ENTRY=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5
+$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; }
+             if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
 
-        gl_cv_absolute_inttypes_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h
 
-           gl_header=$gl_cv_absolute_inttypes_h
-           gl_cv_next_inttypes_h='"'$gl_header'"'
-          else
-               gl_cv_next_inttypes_h='<'inttypes.h'>'
              fi
-
-
+                          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5
+$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; }
+if test "${gl_cv_acl_ACL_TYPE_EXTENDED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/acl.h>
+int type = ACL_TYPE_EXTENDED;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_acl_ACL_TYPE_EXTENDED=yes
+else
+  gl_cv_acl_ACL_TYPE_EXTENDED=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
-$as_echo "$gl_cv_next_inttypes_h" >&6; }
-     fi
-     NEXT_INTTYPES_H=$gl_cv_next_inttypes_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'inttypes.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_inttypes_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H=$gl_next_as_first_directive
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5
+$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; }
+             if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
 
+$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h
 
+             fi
+           else
+             LIB_ACL=
+           fi
 
+fi
 
+      fi
 
+            if test $use_acl = 0; then
+        for ac_func in acl
+do :
+  ac_fn_c_check_func "$LINENO" "acl" "ac_cv_func_acl"
+if test "x$ac_cv_func_acl" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACL 1
+_ACEOF
 
+fi
+done
 
-    for gl_func in imaxabs imaxdiv strtoimax strtoumax; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+        if test $ac_cv_func_acl = yes; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5
+$as_echo_n "checking for library containing acl_trivial... " >&6; }
+if test "${ac_cv_search_acl_trivial+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <inttypes.h>
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_trivial ();
 int
 main ()
 {
-#undef $gl_func
-  (void) $gl_func;
+return acl_trivial ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
+for ac_lib in '' sec; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_acl_trivial=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_acl_trivial+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_acl_trivial+set}" = set; then :
+
 else
-  eval "$as_gl_Symbol=no"
+  ac_cv_search_acl_trivial=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5
+$as_echo "$ac_cv_search_acl_trivial" >&6; }
+ac_res=$ac_cv_search_acl_trivial
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  if test "$ac_cv_search_acl_trivial" != "none required"; then
+               LIB_ACL=$ac_cv_search_acl_trivial
+             fi
+
+fi
+
+          for ac_func in acl_trivial
+do :
+  ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial"
+if test "x$ac_cv_func_acl_trivial" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+#define HAVE_ACL_TRIVIAL 1
 _ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
 fi
-      done
+done
+
+          use_acl=1
+        fi
+      fi
+
+            if test $use_acl = 0 || test "$ac_cv_func_acl" = yes; then
+        for ac_func in getacl
+do :
+  ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl"
+if test "x$ac_cv_func_getacl" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETACL 1
+_ACEOF
+
+fi
+done
 
+        if test $ac_cv_func_getacl = yes; then
+          use_acl=1
+        fi
+      fi
 
+            if test $use_acl = 0; then
+        for ac_func in aclx_get
+do :
+  ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get"
+if test "x$ac_cv_func_aclx_get" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACLX_GET 1
+_ACEOF
 
+fi
+done
 
+        if test $ac_cv_func_aclx_get = yes; then
+          use_acl=1
+        fi
+      fi
 
+            if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then
+        for ac_func in statacl
+do :
+  ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl"
+if test "x$ac_cv_func_statacl" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STATACL 1
+_ACEOF
 
+fi
+done
 
+        if test $ac_cv_func_statacl = yes; then
+          use_acl=1
+        fi
+      fi
 
+      LIBS=$ac_save_LIBS
+    fi
+    if test "x$enable_acl$use_acl" = "xyes0"; then
+      as_fn_error "ACLs enabled but support not detected" "$LINENO" 5
+    elif test "x$enable_acl$use_acl" = "xauto0"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5
+$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gettext-tools will be built without ACL support." >&5
+$as_echo "$as_me: WARNING: gettext-tools will be built without ACL support." >&2;}
+    fi
+  fi
 
 
+cat >>confdefs.h <<_ACEOF
+#define USE_ACL $use_acl
+_ACEOF
 
-   if true; then
-  GL_COND_LIBTOOL_TRUE=
-  GL_COND_LIBTOOL_FALSE='#'
-else
-  GL_COND_LIBTOOL_TRUE='#'
-  GL_COND_LIBTOOL_FALSE=
-fi
+  USE_ACL=$use_acl
 
-  gl_cond_libtool=true
-  gl_m4_base='gnulib-m4'
 
+  # Code from module alignof:
+  # Code from module alloca-opt:
 
 
 
 
 
+  if test $ac_cv_func_alloca_works = no; then
 
 
+  :
 
-  gl_source_base='gnulib-lib'
 
 
 
 
 
-  if test $ac_cv_func_alloca_works = no; then
 
 
   :
@@ -34716,389 +30904,63 @@
 rm -f conftest*
 
 
-   if test -n "$ALLOCA_H"; then
-  GL_GENERATE_ALLOCA_H_TRUE=
-  GL_GENERATE_ALLOCA_H_FALSE='#'
-else
-  GL_GENERATE_ALLOCA_H_TRUE='#'
-  GL_GENERATE_ALLOCA_H_FALSE=
-fi
 
+  # Code from module areadlink:
+  # Code from module arg-nonnull:
+  # Code from module argmatch:
 
 
 
 
-  if test "$CXX_CHOICE" = no; then
-    CXX=no
-  fi
-  if test -z "$CXX"; then
-    if test -n "$CCC"; then
-      CXX="$CCC"
-    else
-      if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
+  gl_LIBOBJS="$gl_LIBOBJS argmatch.$ac_objext"
 
-  test -n "$ac_ct_CXX" && break
-done
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
+  # Code from module array-list:
+  # Code from module atexit:
 
-    fi
-  fi
-  if test "$CXX" != no; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-$as_echo_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... " >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-    echo 'int main () { return 0; }' > conftest.$ac_ext
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      gl_cv_prog_ansicxx_works=yes
-      if (./conftest; exit) 2>/dev/null; then
-        gl_cv_prog_ansicxx_cross=no
-      else
-        gl_cv_prog_ansicxx_cross=yes
-      fi
-    else
-      gl_cv_prog_ansicxx_works=no
-    fi
-    rm -fr conftest*
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_works" >&5
-$as_echo "$gl_cv_prog_ansicxx_works" >&6; }
-    if test $gl_cv_prog_ansicxx_works = no; then
-      CXX=no
-    else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports namespaces" >&5
-$as_echo_n "checking whether the C++ compiler supports namespaces... " >&6; }
-      ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-      cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-        gl_cv_prog_ansicxx_namespaces=yes
-      else
-        gl_cv_prog_ansicxx_namespaces=no
-      fi
-      rm -fr conftest*
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_namespaces" >&5
-$as_echo "$gl_cv_prog_ansicxx_namespaces" >&6; }
-      if test $gl_cv_prog_ansicxx_namespaces = no; then
-        CXX=no
-      fi
-    fi
-  fi
-
-
-
-   if test "$CXX" != no; then
-  ANSICXX_TRUE=
-  ANSICXX_FALSE='#'
-else
-  ANSICXX_TRUE='#'
-  ANSICXX_FALSE=
-fi
-
-
-  if test "$CXX" != no; then
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
 
 
-  else
-     if false; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
 
-  fi
 
 
   for ac_func in atexit
 do :
   ac_fn_c_check_func "$LINENO" "atexit" "ac_cv_func_atexit"
-if test "x$ac_cv_func_atexit" = xyes; then :
+if test "x$ac_cv_func_atexit" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ATEXIT 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
 
   if test $ac_cv_func_atexit = no; then
 
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS atexit.$ac_objext"
-
-
   :
 
   fi
 
+  # Code from module backupfile:
+
     for ac_header in dirent.h string.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -35109,7 +30971,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
 $as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
+if test "${ac_cv_sys_long_file_names+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_long_file_names=yes
@@ -35150,7 +31012,7 @@
   for ac_func in pathconf
 do :
   ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf"
-if test "x$ac_cv_func_pathconf" = xyes; then :
+if test "x$ac_cv_func_pathconf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PATHCONF 1
 _ACEOF
@@ -35162,7 +31024,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -35172,6 +31035,9 @@
 done
 
 
+  # Code from module basename:
+  # Code from module binary-io:
+  # Code from module bison-i18n:
 
   if test -z "$USE_NLS"; then
     echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2
@@ -35197,11 +31063,12 @@
 
   fi
 
+  # Code from module byteswap:
 
     for ac_header in byteswap.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
-if test "x$ac_cv_header_byteswap_h" = xyes; then :
+if test "x$ac_cv_header_byteswap_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BYTESWAP_H 1
 _ACEOF
@@ -35217,40 +31084,18 @@
 done
 
 
-   if test -n "$BYTESWAP_H"; then
-  GL_GENERATE_BYTESWAP_H_TRUE=
-  GL_GENERATE_BYTESWAP_H_FALSE='#'
-else
-  GL_GENERATE_BYTESWAP_H_TRUE='#'
-  GL_GENERATE_BYTESWAP_H_FALSE=
-fi
-
-
 
+  # Code from module c++defs:
+  # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module c-strcaseeq:
+  # Code from module c-strcasestr:
+  # Code from module c-strstr:
+  # Code from module canonicalize-lgpl:
 
 
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
-    if test $ac_cv_func_realpath = no; then
-      HAVE_REALPATH=0
-    else
-      case "$gl_cv_func_realpath_works" in
-	*yes) ;;
-	*)    REPLACE_REALPATH=1 ;;
-      esac
-    fi
-  else
-    case "$gl_cv_func_realpath_works" in
-      *yes)
-        ;;
-      *)
-        REPLACE_CANONICALIZE_FILE_NAME=1
-        REPLACE_REALPATH=1
-        ;;
-    esac
-  fi
-
-  if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
 
 
 
@@ -35261,205 +31106,89 @@
 
   gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
 
-  fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_CANONICALIZE_LGPL 1
-_ACEOF
-
-
-
-
-
-
-
-          GNULIB_CANONICALIZE_FILE_NAME=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
-
-
-
-
-
-
-
-
-          GNULIB_REALPATH=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
-
-
-
-
-
-$as_echo "#define SIGNAL_SAFE_LIST 1" >>confdefs.h
-
-
-
-$as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
-
-
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_CLOSE=1
-  fi
-
-
-
-
-
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
-
-fi
-
-done
-
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-
-
-    if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then
-                        REPLACE_CLOSE=1
+    if test $ac_cv_func_realpath = no; then
+      HAVE_REALPATH=0
+    elif test "$gl_cv_func_realpath_works" != yes; then
+      REPLACE_REALPATH=1
     fi
+  elif test "$gl_cv_func_realpath_works" != yes; then
 
 
 
-  if test $REPLACE_CLOSE = 1; then
-
-
 
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
 
-  gl_LIBOBJS="$gl_LIBOBJS close.$ac_objext"
-
+    REPLACE_REALPATH=1
+    REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 
 
 
-
-
-          GNULIB_CLOSE=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_CLOSE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_CANONICALIZE_LGPL 1
+_ACEOF
 
 
 
 
 
+  GNULIB_CANONICALIZE_FILE_NAME=1
 
-  for ac_func in closedir
-do :
-  ac_fn_c_check_func "$LINENO" "closedir" "ac_cv_func_closedir"
-if test "x$ac_cv_func_closedir" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOSEDIR 1
-_ACEOF
 
-fi
-done
 
-  if test $ac_cv_func_closedir = no; then
-    HAVE_CLOSEDIR=0
-  fi
+$as_echo "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
-  if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
 
 
 
 
+  GNULIB_REALPATH=1
 
 
 
+$as_echo "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
-  gl_LIBOBJS="$gl_LIBOBJS closedir.$ac_objext"
 
-  fi
 
+  # Code from module classpath:
+  # Code from module clean-temp:
 
+$as_echo "#define SIGNAL_SAFE_LIST 1" >>confdefs.h
 
+  # Code from module cloexec:
 
 
-          GNULIB_CLOSEDIR=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h
 
 
+  gl_LIBOBJS="$gl_LIBOBJS cloexec.$ac_objext"
 
 
-          if test "x$datarootdir" = x; then
-    datarootdir='${datadir}'
 
-  fi
-    if test "x$docdir" = x; then
-    docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 
-  fi
-    if test "x$htmldir" = x; then
-    htmldir='${docdir}'
+$as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
-  fi
-  if test "x$dvidir" = x; then
-    dvidir='${docdir}'
 
-  fi
-  if test "x$pdfdir" = x; then
-    pdfdir='${docdir}'
+  # Code from module closeout:
+  # Code from module concat-filename:
+  # Code from module configmake:
+  # Code from module copy-file:
 
-  fi
-  if test "x$psdir" = x; then
-    psdir='${docdir}'
 
-  fi
-  if test "x$lispdir" = x; then
-    lispdir='${datarootdir}/emacs/site-lisp'
+  :
 
-  fi
-  if test "x$localedir" = x; then
-    localedir='${datarootdir}/locale'
 
-  fi
-    if test "x$runstatedir" = x; then
-    runstatedir='${localstatedir}/run'
 
-  fi
 
-      pkglibexecdir='${libexecdir}/${PACKAGE}'
 
 
 
@@ -35468,7 +31197,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -35477,146 +31207,23 @@
 done
 
 
+  # Code from module csharpcomp:
+  # Code from module csharpcomp-script:
 
   ac_config_files="$ac_config_files csharpcomp.sh:../build-aux/csharpcomp.sh.in"
 
+  # Code from module csharpexec:
+  # Code from module csharpexec-script:
   # You need to invoke gt_CSHARPEXEC yourself, possibly with arguments.
   ac_config_files="$ac_config_files csharpexec.sh:../build-aux/csharpexec.sh.in"
 
-
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_dirent_h='<'dirent.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <dirent.h>" >&5
-$as_echo_n "checking absolute name of <dirent.h>... " >&6; }
-if ${gl_cv_next_dirent_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-             if test $ac_cv_header_dirent_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <dirent.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'dirent.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_dirent_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_dirent_h
-           gl_cv_next_dirent_h='"'$gl_header'"'
-          else
-               gl_cv_next_dirent_h='<'dirent.h'>'
-             fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_dirent_h" >&5
-$as_echo "$gl_cv_next_dirent_h" >&6; }
-     fi
-     NEXT_DIRENT_H=$gl_cv_next_dirent_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'dirent.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_dirent_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_DIRENT_H=$gl_next_as_first_directive
-
-
-
-
-  if test $ac_cv_header_dirent_h = yes; then
-    HAVE_DIRENT_H=1
-  else
-    HAVE_DIRENT_H=0
-  fi
-
-
-
-    for gl_func in alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <dirent.h>
-
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
-
+  # Code from module diffseq:
+  # Code from module double-slash-root:
 
 
   { $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 :
+if test "${gl_cv_double_slash_root+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
    if test x"$cross_compiling" = xyes ; then
@@ -35651,76 +31258,66 @@
 
   fi
 
+  # Code from module dup2:
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_dup2 = no; then
+    HAVE_DUP2=0
 
 
 
 
 
 
-$as_echo "#define HAVE_DUP2 1" >>confdefs.h
 
 
-  if test $HAVE_DUP2 = 1; then
+  gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext"
+
+  else
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
 $as_echo_n "checking whether dup2 works... " >&6; }
-if ${gl_cv_func_dup2_works+:} false; then :
+if test "${gl_cv_func_dup2_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   case "$host_os" in
            mingw*) # on this platform, dup2 always returns 0 for success
-             gl_cv_func_dup2_works="guessing no" ;;
+             gl_cv_func_dup2_works=no;;
            cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
-             gl_cv_func_dup2_works="guessing no" ;;
+             gl_cv_func_dup2_works=no;;
            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-             gl_cv_func_dup2_works="guessing no" ;;
-           aix* | freebsd*)
-                   # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
-                   # not EBADF.
-             gl_cv_func_dup2_works="guessing no" ;;
-           haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
-             gl_cv_func_dup2_works="guessing no" ;;
-           *) gl_cv_func_dup2_works="guessing yes" ;;
+             gl_cv_func_dup2_works=no;;
+           freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
+             gl_cv_func_dup2_works=no;;
+           *) gl_cv_func_dup2_works=yes;;
          esac
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
          #include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
 int
 main ()
 {
-int result = 0;
-#ifdef HAVE_GETDTABLESIZE
-            int bad_fd = getdtablesize ();
-#else
-            int bad_fd = 1000000;
-#endif
-#ifdef FD_CLOEXEC
-            if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
-              result |= 1;
-#endif
-            if (dup2 (1, 1) == 0)
-              result |= 2;
-#ifdef FD_CLOEXEC
-            if (fcntl (1, F_GETFD) != FD_CLOEXEC)
-              result |= 4;
-#endif
+if (dup2 (1, 1) == 0)
+              return 1;
             close (0);
             if (dup2 (0, 0) != -1)
-              result |= 8;
+              return 2;
             /* Many gnulib modules require POSIX conformance of EBADF.  */
-            if (dup2 (2, bad_fd) == -1 && errno != EBADF)
-              result |= 16;
-            /* Flush out some cygwin core dumps.  */
-            if (dup2 (2, -1) != -1 || errno != EBADF)
-              result |= 32;
-            dup2 (2, 255);
-            dup2 (2, 256);
-            return result;
+            if (dup2 (1, 1000000) == -1 && errno != EBADF)
+              return 3;
+            return 0;
 
   ;
   return 0;
@@ -35740,29 +31337,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
 $as_echo "$gl_cv_func_dup2_works" >&6; }
-    case "$gl_cv_func_dup2_works" in
-      *yes) ;;
-      *)
-        REPLACE_DUP2=1
-        for ac_func in setdtablesize
-do :
-  ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
-if test "x$ac_cv_func_setdtablesize" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SETDTABLESIZE 1
-_ACEOF
+    if test "$gl_cv_func_dup2_works" = no; then
 
-fi
-done
 
-        ;;
-    esac
+  if test $ac_cv_func_dup2 = yes; then
+    REPLACE_DUP2=1
   fi
 
 
-  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
-
-
 
 
 
@@ -35772,43 +31354,52 @@
   gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext"
 
 
+    fi
   fi
 
 
 
 
+  GNULIB_DUP2=1
+
 
-          GNULIB_DUP2=1
+
+$as_echo "#define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
+  # Code from module environ:
 
 
-$as_echo "#define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
+  GNULIB_ENVIRON=1
 
 
 
+$as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
+  # Code from module errno:
 
-          GNULIB_ENVIRON=1
+  # Code from module error:
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 $as_echo_n "checking for error_at_line... " >&6; }
-if ${ac_cv_lib_error_at_line+:} false; then :
+if test "${ac_cv_lib_error_at_line+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -35832,8 +31423,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
 $as_echo "$ac_cv_lib_error_at_line" >&6; }
-
-  if test $ac_cv_lib_error_at_line = no; then
+if test $ac_cv_lib_error_at_line = no; then
 
 
 
@@ -35844,11 +31434,14 @@
 
   gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext"
 
+fi
+
+
 
 
   :
 
-  fi
+
 
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
@@ -35857,9 +31450,15 @@
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
 
+  # Code from module error-progname:
+  # Code from module execute:
+
 
 
 
+  # Code from module exitfail:
+  # Code from module extensions:
+  # Code from module fatal-signal:
 
 
 
@@ -35871,20 +31470,51 @@
 
 
 
-  if test $ac_cv_func_fcntl = no; then
+
+
+
+  # Code from module fcntl:
+
+
+
+
+
+  :
+
+
 
 
 
   if test $ac_cv_func_fcntl = no; then
-    HAVE_FCNTL=0
-  else
-    REPLACE_FCNTL=1
-  fi
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_fcntl = no; then
+    HAVE_FCNTL=0
+  else
+    REPLACE_FCNTL=1
+  fi
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS fcntl.$ac_objext"
+
 
   else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
 $as_echo_n "checking whether fcntl handles F_DUPFD correctly... " >&6; }
-if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then :
+if test "${gl_cv_func_fcntl_f_dupfd_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -35897,26 +31527,12 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#ifdef HAVE_GETDTABLESIZE
-# include <unistd.h>
-#endif
 #include <fcntl.h>
-#include <errno.h>
 
 int
 main ()
 {
-int result = 0;
-#ifdef HAVE_GETDTABLESIZE
-      int bad_fd = getdtablesize ();
-#else
-      int bad_fd = 1000000;
-#endif
-      if (fcntl (0, F_DUPFD, -1) != -1) result |= 1;
-      if (errno != EINVAL) result |= 2;
-      if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
-      if (errno != EINVAL) result |= 8;
-      return result;
+return fcntl (0, F_DUPFD, -1) != -1;
 
   ;
   return 0;
@@ -35939,6 +31555,12 @@
       *)
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
     HAVE_FCNTL=0
   else
@@ -35946,13 +31568,23 @@
   fi
 
 
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS fcntl.$ac_objext"
+
+
+
 $as_echo "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
  ;;
     esac
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
 $as_echo_n "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
-if ${gl_cv_func_fcntl_f_dupfd_cloexec+:} false; then :
+if test "${gl_cv_func_fcntl_f_dupfd_cloexec+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -36006,18 +31638,18 @@
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
     HAVE_FCNTL=0
   else
     REPLACE_FCNTL=1
   fi
 
-          fi
-  fi
-
-
-  if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then
-
 
 
 
@@ -36027,19 +31659,22 @@
 
   gl_LIBOBJS="$gl_LIBOBJS fcntl.$ac_objext"
 
+
+          fi
   fi
 
 
 
 
+  GNULIB_FCNTL=1
 
-          GNULIB_FCNTL=1
 
 
+$as_echo "#define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_FCNTL 1" >>confdefs.h
+  # Code from module fcntl-h:
 
 
 
@@ -36047,6 +31682,7 @@
 
 
 
+  :
 
 
 
@@ -36059,45 +31695,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 $as_echo_n "checking absolute name of <fcntl.h>... " >&6; }
-if ${gl_cv_next_fcntl_h+:} false; then :
+if test "${gl_cv_next_fcntl_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_fcntl_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'fcntl.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_fcntl_h
-           gl_cv_next_fcntl_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/fcntl.h#{
+                 s#.*"\(.*/fcntl.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_fcntl_h='<'fcntl.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
@@ -36118,16 +31739,11 @@
 
 
 
-
-
-
-
-
     for gl_func in fcntl openat; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -36153,7 +31769,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -36163,6 +31780,8 @@
       done
 
 
+  # Code from module fd-ostream:
+  # Code from module fd-safer-flag:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -36170,124 +31789,32 @@
 _ACEOF
 
 
+  # Code from module file-ostream:
+  # Code from module filename:
+  # Code from module findprog:
 
 
+  :
 
 
 
 
 
-  FLOAT_H=
-  REPLACE_FLOAT_LDBL=0
-  case "$host_os" in
-    aix* | beos* | openbsd* | mirbsd* | irix*)
-      FLOAT_H=float.h
-      ;;
-    freebsd*)
-      case "$host_cpu" in
-        i[34567]86 )
-          FLOAT_H=float.h
-          ;;
-        x86_64 )
-          # On x86_64 systems, the C compiler may still be generating
-          # 32-bit code.
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __x86_64__ || defined __amd64__
-             yes
-             #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-
-else
-  FLOAT_H=float.h
-fi
-rm -f conftest*
-
-          ;;
-      esac
-      ;;
-    linux*)
-      case "$host_cpu" in
-        powerpc*)
-          FLOAT_H=float.h
-          ;;
-      esac
-      ;;
-  esac
-  case "$host_os" in
-    aix* | freebsd* | linux*)
-      if test -n "$FLOAT_H"; then
-        REPLACE_FLOAT_LDBL=1
-      fi
-      ;;
-  esac
 
-    REPLACE_ITOLD=0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether conversion from 'int' to 'long double' works" >&5
-$as_echo_n "checking whether conversion from 'int' to 'long double' works... " >&6; }
-if ${gl_cv_func_itold_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-      if test "$cross_compiling" = yes; then :
-  case "$host" in
-           sparc*-*-linux*)
-             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __arch64__
-                yes
-                #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-  gl_cv_func_itold_works="guessing no"
-else
-  gl_cv_func_itold_works="guessing yes"
-fi
-rm -f conftest*
+  # Code from module float:
 
-             ;;
-           *) gl_cv_func_itold_works="guessing yes" ;;
-         esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int i = -1;
-volatile long double ld;
-int main ()
-{
-  ld += i * 1.0L;
-  if (ld > 0)
-    return 1;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_itold_works=yes
-else
-  gl_cv_func_itold_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
+  FLOAT_H=
+  case "$host_os" in
+    beos* | openbsd*)
+      FLOAT_H=float.h
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_itold_works" >&5
-$as_echo "$gl_cv_func_itold_works" >&6; }
-  case "$gl_cv_func_itold_works" in
-    *no)
-      REPLACE_ITOLD=1
-                  FLOAT_H=float.h
-      ;;
-  esac
 
-  if test -n "$FLOAT_H"; then
 
+  :
 
 
 
@@ -36300,45 +31827,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <float.h>" >&5
 $as_echo_n "checking absolute name of <float.h>... " >&6; }
-if ${gl_cv_next_float_h+:} false; then :
+if test "${gl_cv_next_float_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_float_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <float.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'float.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_float_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_float_h
-           gl_cv_next_float_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/float.h#{
+                 s#.*"\(.*/float.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_float_h='<'float.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5
@@ -36357,56 +31869,22 @@
 
 
 
+      ;;
+  esac
 
-  fi
-
-   if test -n "$FLOAT_H"; then
-  GL_GENERATE_FLOAT_H_TRUE=
-  GL_GENERATE_FLOAT_H_FALSE='#'
-else
-  GL_GENERATE_FLOAT_H_TRUE='#'
-  GL_GENERATE_FLOAT_H_FALSE=
-fi
-
-
-
-  if test $REPLACE_FLOAT_LDBL = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS float.$ac_objext"
-
-  fi
-  if test $REPLACE_ITOLD = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS itold.$ac_objext"
 
-  fi
+  # Code from module fnmatch:
 
 
 
 
 
   FNMATCH_H=
-  gl_fnmatch_required_lowercase=`
-    echo $gl_fnmatch_required | LC_ALL=C tr '[A-Z]' '[a-z]'
-  `
+  gl_fnmatch_required_lowercase=`echo $gl_fnmatch_required | tr 'A-Z' 'a-z'`
   gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working $gl_fnmatch_required fnmatch" >&5
 $as_echo_n "checking for working $gl_fnmatch_required fnmatch... " >&6; }
-if eval \${$gl_fnmatch_cache_var+:} false; then :
+if { as_var=$gl_fnmatch_cache_var; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
                            if test $gl_fnmatch_required = GNU; then
@@ -36444,62 +31922,33 @@
             static char const a01[] = { 'a' + 1, 0 };
             static char const bs_1[] = { '\\\\' - 1, 0 };
             static char const bs01[] = { '\\\\' + 1, 0 };
-            int result = 0;
-            if (!n ("a*", "", 0))
-              return 1;
-            if (!y ("a*", "abc", 0))
-              return 1;
-            if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
-              return 1;
-            if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
-              return 2;
-            if (!y ("a\\\\bc", "abc", 0))
-              return 3;
-            if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
-              return 3;
-            if (!y ("*x", ".x", 0))
-              return 4;
-            if (!n ("*x", ".x", FNM_PERIOD))
-              return 4;
-            if (!y (Apat, "\\\\", 0))
-              return 5;
-            if (!y (Apat, "A", 0))
-              return 5;
-            if (!y (apat, "\\\\", 0))
-              return 5;
-            if (!y (apat, "a", 0))
-              return 5;
-            if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
-              return 5;
-            if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(y (apat, a01, 0) == ('a' < '\\\\')))
-              return 5;
-            if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
-              return 5;
-            if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
-              return 5;
-            $gl_fnmatch_gnu_start
-            if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
-              result |= 8;
-            if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
-              result |= 16;
-            if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
-              result |= 32;
-            if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
-              result |= 64;
-            if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
-              result |= 64;
-            if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
-              result |= 64;
-            $gl_fnmatch_gnu_end
-            return result;
+            return
+             !(n ("a*", "", 0)
+               && y ("a*", "abc", 0)
+               && n ("d*/*1", "d/s/1", FNM_PATHNAME)
+               && y ("a\\\\bc", "abc", 0)
+               && n ("a\\\\bc", "abc", FNM_NOESCAPE)
+               && y ("*x", ".x", 0)
+               && n ("*x", ".x", FNM_PERIOD)
+               && y (Apat, "\\\\", 0) && y (Apat, "A", 0)
+               && y (apat, "\\\\", 0) && y (apat, "a", 0)
+               && n (Apat, A_1, 0) == ('A' < '\\\\')
+               && n (apat, a_1, 0) == ('a' < '\\\\')
+               && y (Apat, A01, 0) == ('A' < '\\\\')
+               && y (apat, a01, 0) == ('a' < '\\\\')
+               && y (Apat, bs_1, 0) == ('A' < '\\\\')
+               && y (apat, bs_1, 0) == ('a' < '\\\\')
+               && n (Apat, bs01, 0) == ('A' < '\\\\')
+               && n (apat, bs01, 0) == ('a' < '\\\\')
+               $gl_fnmatch_gnu_start
+               && y ("xxXX", "xXxX", FNM_CASEFOLD)
+               && y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)
+               && n ("d*/*1", "d/s/1", FNM_FILE_NAME)
+               && y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)
+               && y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)
+               && y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)
+               $gl_fnmatch_gnu_end
+              );
 
   ;
   return 0;
@@ -36524,18 +31973,6 @@
             rm -f "$gl_source_base/fnmatch.h"
   else
     FNMATCH_H=fnmatch.h
-  fi
-
-   if test -n "$FNMATCH_H"; then
-  GL_GENERATE_FNMATCH_H_TRUE=
-  GL_GENERATE_FNMATCH_H_FALSE='#'
-else
-  GL_GENERATE_FNMATCH_H_TRUE='#'
-  GL_GENERATE_FNMATCH_H_FALSE=
-fi
-
-
-  if test -n "$FNMATCH_H"; then
 
 
 
@@ -36547,15 +31984,14 @@
   gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
 
 
-
 cat >>confdefs.h <<_ACEOF
 #define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch
 _ACEOF
 
 
-  ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
+    ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
 "
-if test "x$ac_cv_have_decl_isblank" = xyes; then :
+if test "x$ac_cv_have_decl_isblank" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -36566,11 +32002,46 @@
 _ACEOF
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
 
 
   fi
 
 
+  # Code from module fopen:
+
+
 
   case "$host_os" in
     mingw* | pw*)
@@ -36580,17 +32051,16 @@
     *)
                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fopen recognizes a trailing slash" >&5
 $as_echo_n "checking whether fopen recognizes a trailing slash... " >&6; }
-if ${gl_cv_func_fopen_slash+:} false; then :
+if test "${gl_cv_func_fopen_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
           if test "$cross_compiling" = yes; then :
 
              case "$host_os" in
-               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-                 gl_cv_func_fopen_slash="guessing no" ;;
-               *)
-                 gl_cv_func_fopen_slash="guessing yes" ;;
+               solaris2.[0-9]*) gl_cv_func_fopen_slash="guessing no" ;;
+               hpux*)           gl_cv_func_fopen_slash="guessing no" ;;
+               *)               gl_cv_func_fopen_slash="guessing yes" ;;
              esac
 
 else
@@ -36628,7 +32098,6 @@
       REPLACE_FOPEN=1
       ;;
   esac
-
   if test $REPLACE_FOPEN = 1; then
 
 
@@ -36640,66 +32109,25 @@
 
   gl_LIBOBJS="$gl_LIBOBJS fopen.$ac_objext"
 
-    :
-  fi
-
-
-
-
-
-          GNULIB_FOPEN=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_FOPEN 1" >>confdefs.h
-
-
-
-
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_FSTAT=1
-  fi
-
-
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-    REPLACE_FSTAT=1
-  fi
-
-
-
-  if test $REPLACE_FSTAT = 1; then
-
 
 
 
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS fstat.$ac_objext"
-
-    :
   fi
 
 
 
 
-
-          GNULIB_FSTAT=1
-
+  GNULIB_FOPEN=1
 
 
 
-
-$as_echo "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
+$as_echo "#define GNULIB_TEST_FOPEN 1" >>confdefs.h
 
 
 
+  # Code from module fstrcmp:
+  # Code from module full-write:
+  # Code from module fwriteerror:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -36707,6 +32135,8 @@
 _ACEOF
 
 
+  # Code from module gcd:
+  # Code from module gcj:
 
 
 
@@ -36719,7 +32149,7 @@
   # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcj; ac_word=$2
 :
-if ${ac_cv_prog_GCJ+:} false; then :
+if test "${ac_cv_prog_GCJ+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$GCJ"; then
@@ -36731,7 +32161,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GCJ="${ac_tool_prefix}gcj"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -36756,7 +32186,7 @@
   # Extract the first word of "gcj", so it can be a program name with args.
 set dummy gcj; ac_word=$2
 :
-if ${ac_cv_prog_ac_ct_GCJ+:} false; then :
+if test "${ac_cv_prog_ac_ct_GCJ+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_GCJ"; then
@@ -36768,7 +32198,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_GCJ="gcj"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -36853,19 +32283,31 @@
 
 
 
+  # Code from module getdelim:
+
+
+
+
+
+
+  :
+
 
 
 
 
 
 
+  :
+
+
+
 
 
   if test $ac_cv_func_getdelim = yes; then
-    HAVE_GETDELIM=1
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
 $as_echo_n "checking for working getdelim function... " >&6; }
-if ${gl_cv_func_working_getdelim+:} false; then :
+if test "${gl_cv_func_working_getdelim+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -36875,7 +32317,7 @@
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
@@ -36883,9 +32325,9 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
-  gl_cv_func_working_getdelim="guessing yes"
+  gl_cv_func_working_getdelim=yes
 else
-  gl_cv_func_working_getdelim="guessing no"
+  gl_cv_func_working_getdelim=no
 fi
 rm -f conftest*
 
@@ -36909,7 +32351,7 @@
         size_t siz = 0;
         int len = getdelim (&line, &siz, '\n', in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
-          return 2;
+          return 1;
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -36917,7 +32359,7 @@
         char *line = NULL;
         size_t siz = (size_t)(~0) / 4;
         if (getdelim (&line, &siz, '\n', in) == -1)
-          return 3;
+          return 1;
       }
       return 0;
     }
@@ -36935,20 +32377,18 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
 $as_echo "$gl_cv_func_working_getdelim" >&6; }
-    case "$gl_cv_func_working_getdelim" in
-      *no)
-        REPLACE_GETDELIM=1
-        ;;
-    esac
   else
-    HAVE_GETDELIM=0
+    gl_cv_func_working_getdelim=no
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then
     HAVE_DECL_GETDELIM=0
   fi
 
-  if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
+  if test $gl_cv_func_working_getdelim = no; then
+    if test $ac_cv_func_getdelim = yes; then
+      REPLACE_GETDELIM=1
+    fi
 
 
 
@@ -36964,7 +32404,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -36973,7 +32414,7 @@
 done
 
   ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -36989,10 +32430,7 @@
 
 
 
-
-          GNULIB_GETDELIM=1
-
-
+  GNULIB_GETDELIM=1
 
 
 
@@ -37000,65 +32438,18 @@
 
 
 
+  # Code from module getdtablesize:
 
 
 
+  :
 
-  if test $ac_cv_func_getdtablesize = yes; then
-    # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit
-    # up to an unchangeable hard limit; all other platforms correctly
-    # require setrlimit before getdtablesize() can report a larger value.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
-$as_echo_n "checking whether getdtablesize works... " >&6; }
-if ${gl_cv_func_getdtablesize_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-          cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
-            gl_cv_func_getdtablesize_works="guessing no" ;;
-          *) gl_cv_func_getdtablesize_works="guessing yes" ;;
-         esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-        #include <unistd.h>
-int
-main ()
-{
-int size = getdtablesize();
-           if (dup2 (0, getdtablesize()) != -1)
-             return 1;
-           if (size != getdtablesize())
-             return 2;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_getdtablesize_works=yes
-else
-  gl_cv_func_getdtablesize_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_getdtablesize_works" >&5
-$as_echo "$gl_cv_func_getdtablesize_works" >&6; }
-    case "$gl_cv_func_getdtablesize_works" in
-      *yes) ;;
-      *) REPLACE_GETDTABLESIZE=1 ;;
-    esac
-  else
+  if test $ac_cv_func_getdtablesize != yes; then
     HAVE_GETDTABLESIZE=0
-  fi
-
-  if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
 
 
 
@@ -37069,25 +32460,28 @@
 
   gl_LIBOBJS="$gl_LIBOBJS getdtablesize.$ac_objext"
 
-    :
   fi
 
 
 
 
+  GNULIB_GETDTABLESIZE=1
 
-          GNULIB_GETDTABLESIZE=1
 
 
+$as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+  # Code from module getline:
+
 
 
 
 
 
+  :
+
 
 
 
@@ -37095,7 +32489,7 @@
 
   gl_getline_needs_run_time_check=no
   ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
-if test "x$ac_cv_func_getline" = xyes; then :
+if test "x$ac_cv_func_getline" = x""yes; then :
                    gl_getline_needs_run_time_check=yes
 else
   am_cv_func_working_getline=no
@@ -37104,7 +32498,7 @@
   if test $gl_getline_needs_run_time_check = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
 $as_echo_n "checking for working getline function... " >&6; }
-if ${am_cv_func_working_getline+:} false; then :
+if test "${am_cv_func_working_getline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -37114,7 +32508,7 @@
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
@@ -37122,9 +32516,9 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
-  am_cv_func_working_getline="guessing yes"
+  am_cv_func_working_getline=yes
 else
-  am_cv_func_working_getline="guessing no"
+  am_cv_func_working_getline=no
 fi
 rm -f conftest*
 
@@ -37148,7 +32542,7 @@
         size_t siz = 0;
         int len = getline (&line, &siz, in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
-          return 2;
+          return 1;
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -37156,7 +32550,7 @@
         char *line = NULL;
         size_t siz = (size_t)(~0) / 4;
         if (getline (&line, &siz, in) == -1)
-          return 3;
+          return 1;
       }
       return 0;
     }
@@ -37180,13 +32574,8 @@
     HAVE_DECL_GETLINE=0
   fi
 
-  case "$am_cv_func_working_getline" in
-    *no)
-                        REPLACE_GETLINE=1
-      ;;
-  esac
-
-  if test $REPLACE_GETLINE = 1; then
+  if test $am_cv_func_working_getline = no; then
+                REPLACE_GETLINE=1
 
 
 
@@ -37198,72 +32587,184 @@
   gl_LIBOBJS="$gl_LIBOBJS getline.$ac_objext"
 
 
-  :
 
-  fi
 
 
 
 
 
-          GNULIB_GETLINE=1
+
+  :
+
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
+
+  :
+
+
 
 
 
+  if test $ac_cv_func_getdelim = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
+$as_echo_n "checking for working getdelim function... " >&6; }
+if test "${gl_cv_func_working_getdelim+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+    if test "$cross_compiling" = yes; then :
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
+  gl_cv_func_working_getdelim=yes
+else
+  gl_cv_func_working_getdelim=no
+fi
+rm -f conftest*
 
 
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  if test $REPLACE_GETOPT = 1; then
+#    include <stdio.h>
+#    include <stdlib.h>
+#    include <string.h>
+    int main ()
+    {
+      FILE *in = fopen ("./conftest.data", "r");
+      if (!in)
+        return 1;
+      {
+        /* Test result for a NULL buffer and a zero size.
+           Based on a test program from Karl Heuer.  */
+        char *line = NULL;
+        size_t siz = 0;
+        int len = getdelim (&line, &siz, '\n', in);
+        if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
+          return 1;
+      }
+      {
+        /* Test result for a NULL buffer and a non-zero size.
+           This crashes on FreeBSD 8.0.  */
+        char *line = NULL;
+        size_t siz = (size_t)(~0) / 4;
+        if (getdelim (&line, &siz, '\n', in) == -1)
+          return 1;
+      }
+      return 0;
+    }
 
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_working_getdelim=yes
+else
+  gl_cv_func_working_getdelim=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_working_getdelim" >&5
+$as_echo "$gl_cv_func_working_getdelim" >&6; }
+  else
+    gl_cv_func_working_getdelim=no
+  fi
 
+  if test $ac_cv_have_decl_getdelim = no; then
+    HAVE_DECL_GETDELIM=0
+  fi
 
+  if test $gl_cv_func_working_getdelim = no; then
+    if test $ac_cv_func_getdelim = yes; then
+      REPLACE_GETDELIM=1
+    fi
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS getdelim.$ac_objext"
 
 
+  for ac_func in flockfile funlockfile
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
+  ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+_ACEOF
 
 
+  fi
 
 
-        GNULIB_GL_UNISTD_H_GETOPT=1
   fi
 
 
 
+
+  GNULIB_GETLINE=1
+
+
+
+$as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
+
+
+
+  # Code from module getopt-gnu:
+
+
+
+
+
+
+
 $as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
 
 
+  # Code from module getopt-posix:
+
 
 
 
 
+  if test -n "$gl_replace_getopt"; then :
 
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
 
-  if test $REPLACE_GETOPT = 1; then
 
   GETOPT_H=getopt.h
 
@@ -37271,9 +32772,7 @@
 
 
 
-  fi
-
-  if test $REPLACE_GETOPT = 1; then
+    GNULIB_UNISTD_H_GETOPT=1
 
 
 
@@ -37296,9 +32795,8 @@
 
 
 
+  :
 
-        GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
 
 
 
@@ -37306,32 +32804,79 @@
 
 
 
+fi
 
 
+  # Code from module gettext:
 
-  gl_gettimeofday_timezone=void
-  if test $ac_cv_func_gettimeofday != yes; then
-    HAVE_GETTIMEOFDAY=0
-  else
+  # Code from module gettext-h:
 
 
+  # Code from module gettext-tools-misc:
+  # Code from module gettimeofday:
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
-$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
-if ${gl_cv_func_gettimeofday_clobber+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # When cross-compiling:
-      case "$host_os" in
-                # Guess all is fine on glibc systems.
-        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                # If we don't know, assume the worst.
-        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-      esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+
+  :
+
+
+
+
+
+
+  gl_gettimeofday_timezone=void
+  if test $ac_cv_func_gettimeofday != yes; then
+    HAVE_GETTIMEOFDAY=0
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
+
+
+  for ac_header in sys/timeb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_timeb_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_TIMEB_H 1
+_ACEOF
+
+fi
+
+done
+
+  for ac_func in _ftime
+do :
+  ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
+if test "x$ac_cv_func__ftime" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__FTIME 1
+_ACEOF
+
+fi
+done
+
+
+  else
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
+$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
+if test "${gl_cv_func_gettimeofday_clobber+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+       gl_cv_func_gettimeofday_clobber=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
           #include <sys/time.h>
@@ -37368,22 +32913,59 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_clobber" >&5
 $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
 
- case "$gl_cv_func_gettimeofday_clobber" in
-   *yes)
-     REPLACE_GETTIMEOFDAY=1
+ if test $gl_cv_func_gettimeofday_clobber = yes; then
+   REPLACE_GETTIMEOFDAY=1
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
+
+
+  for ac_header in sys/timeb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_timeb_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_TIMEB_H 1
+_ACEOF
+
+fi
+
+done
+
+  for ac_func in _ftime
+do :
+  ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
+if test "x$ac_cv_func__ftime" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__FTIME 1
+_ACEOF
+
+fi
+done
+
+
+
+$as_echo "#define gmtime rpl_gmtime" >>confdefs.h
+
+
+$as_echo "#define localtime rpl_localtime" >>confdefs.h
 
-  REPLACE_GMTIME=1
-  REPLACE_LOCALTIME=1
 
 
 $as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
 
-     ;;
- esac
+ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
 $as_echo_n "checking for gettimeofday with POSIX signature... " >&6; }
-if ${gl_cv_func_gettimeofday_posix_signature+:} false; then :
+if test "${gl_cv_func_gettimeofday_posix_signature+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -37440,19 +33022,6 @@
       gl_gettimeofday_timezone='struct timezone'
     elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
       REPLACE_GETTIMEOFDAY=1
-    fi
-        if test $REPLACE_STRUCT_TIMEVAL = 1; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
-
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone
-_ACEOF
-
-
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
 
 
 
@@ -37467,7 +33036,7 @@
   for ac_header in sys/timeb.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_timeb_h" = xyes; then :
+if test "x$ac_cv_header_sys_timeb_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_TIMEB_H 1
 _ACEOF
@@ -37479,7 +33048,7 @@
   for ac_func in _ftime
 do :
   ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
-if test "x$ac_cv_func__ftime" = xyes; then :
+if test "x$ac_cv_func__ftime" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE__FTIME 1
 _ACEOF
@@ -37488,15 +33057,18 @@
 done
 
 
+    fi
   fi
 
+cat >>confdefs.h <<_ACEOF
+#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone
+_ACEOF
 
 
 
 
-          GNULIB_GETTIMEOFDAY=1
-
 
+  GNULIB_GETTIMEOFDAY=1
 
 
 
@@ -37504,15 +33076,14 @@
 
 
 
+  # Code from module gperf:
+  # Code from module hash:
+  # Code from module havelib:
+  # Code from module html-ostream:
+  # Code from module html-styled-ostream:
+  # Code from module iconv:
 
-
-
-
-
-
-          GNULIB_ICONV=1
-
-
+  # Code from module iconv-h:
 
 
 
@@ -37520,6 +33091,7 @@
 
 
 
+  :
 
 
 
@@ -37532,51 +33104,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <iconv.h>" >&5
 $as_echo_n "checking absolute name of <iconv.h>... " >&6; }
-if ${gl_cv_next_iconv_h+:} false; then :
+if test "${gl_cv_next_iconv_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_iconv_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_iconv_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'iconv.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_iconv_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_iconv_h
-           gl_cv_next_iconv_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_iconv_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/iconv.h#{
+                 s#.*"\(.*/iconv.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_iconv_h='<'iconv.h'>'
-             fi
-
+            gl_cv_next_iconv_h='<'iconv.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
@@ -37596,7 +33147,7 @@
 
 
 
-
+  # Code from module iconv_open:
 
 
 
@@ -37605,20 +33156,12 @@
 
 
   ICONV_H='iconv.h'
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
 
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #include <iconv.h>
-      #if defined _LIBICONV_VERSION || (defined __GLIBC__ && !defined __UCLIBC__)
+      #if defined _LIBICONV_VERSION || defined __GLIBC__
        gnu_iconv
       #endif
 
@@ -37650,24 +33193,9 @@
 
 
   ICONV_H='iconv.h'
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
 
   REPLACE_ICONV_OPEN=1
 
-      fi
-    fi
-
-  fi
-
-  if test $REPLACE_ICONV_OPEN = 1; then
-
 
 
 
@@ -37677,34 +33205,18 @@
 
   gl_LIBOBJS="$gl_LIBOBJS iconv_open.$ac_objext"
 
-  fi
-  if test $REPLACE_ICONV = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS iconv.$ac_objext"
-
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS iconv_close.$ac_objext"
 
+      fi
+    fi
   fi
 
+  # Code from module include_next:
+  # Code from module inline:
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5
 $as_echo_n "checking whether the compiler generally respects inline... " >&6; }
-if ${gl_cv_c_inline_effective+:} false; then :
+if test "${gl_cv_c_inline_effective+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test $ac_cv_c_inline = no; then
@@ -37740,79 +33252,8 @@
 
   fi
 
-
-
-
-
-
-  ac_fn_c_check_decl "$LINENO" "iswblank" "ac_cv_have_decl_iswblank" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
-
-"
-if test "x$ac_cv_have_decl_iswblank" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISWBLANK $ac_have_decl
-_ACEOF
-
-  if test $ac_cv_func_iswblank = no; then
-    HAVE_ISWBLANK=0
-    if test $ac_cv_have_decl_iswblank = yes; then
-      REPLACE_ISWBLANK=1
-    fi
-  fi
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-            :
-    fi
-  fi
-
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS iswblank.$ac_objext"
-
-    fi
-  fi
-
-
-
-
-
-          GNULIB_ISWBLANK=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_ISWBLANK 1" >>confdefs.h
-
-
-
+  # Code from module intprops:
+  # Code from module java:
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Java" >&5
 $as_echo_n "checking whether to use Java... " >&6; }
@@ -37834,13 +33275,18 @@
   fi
 
 
+  # Code from module javacomp:
+  # Code from module javacomp-script:
   # You need to invoke gt_JAVACOMP yourself, possibly with arguments.
   ac_config_files="$ac_config_files javacomp.sh:../build-aux/javacomp.sh.in"
 
+  # Code from module javaexec:
+  # Code from module javaexec-script:
   # You need to invoke gt_JAVAEXEC yourself, possibly with arguments.
   ac_config_files="$ac_config_files javaexec.sh:../build-aux/javaexec.sh.in"
 
-
+  # Code from module javaversion:
+  # Code from module libcroco:
 
 
 
@@ -37862,7 +33308,7 @@
   LTLIBCROCO=
   INCCROCO=
   if test "$gl_cv_libcroco_use_included" != yes; then
-            if ${gl_cv_libcroco+:} false; then :
+            if test "${gl_cv_libcroco+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -37893,8 +33339,8 @@
 
 
 # Check whether --with-libcroco-0.6-prefix was given.
-if test "${with_libcroco_0_6_prefix+set}" = set; then :
-  withval=$with_libcroco_0_6_prefix;
+if test "${with_libcroco_06_prefix+set}" = set; then :
+  withval=$with_libcroco_06_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -37945,7 +33391,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -38391,12 +33837,17 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <libcroco-0.6/libcroco/libcroco-config.h>" >&5
 $as_echo_n "checking absolute name of <libcroco-0.6/libcroco/libcroco-config.h>... " >&6; }
-if ${gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h+:} false; then :
+if test "${gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-          if test $ac_cv_header_libcroco_0_6_libcroco_libcroco_config_h = yes; then
+
+  :
+
+
 
 
+    if test $ac_cv_header_libcroco_0_6_libcroco_libcroco_config_h = yes; then
+
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libcroco-0.6/libcroco/libcroco-config.h>
@@ -38405,27 +33856,13 @@
     aix*) gl_absname_cpp="$ac_cpp -C" ;;
     *)    gl_absname_cpp="$ac_cpp" ;;
   esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'libcroco-0.6/libcroco/libcroco-config.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
         gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+sed -n '\#/libcroco-0.6/libcroco/libcroco-config.h#{
+        s#.*"\(.*/libcroco-0.6/libcroco/libcroco-config.h\)".*#\1#
+        s#^/[^/]#//&#
+        p
+        q
+}'`
 
     fi
 
@@ -38484,6 +33921,7 @@
 fi
 
 
+  # Code from module libglib:
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included glib is requested" >&5
 $as_echo_n "checking whether included glib is requested... " >&6; }
@@ -38503,7 +33941,7 @@
   LTLIBGLIB=
   INCGLIB=
   if test "$gl_cv_libglib_use_included" != yes; then
-            if ${gl_cv_libglib+:} false; then :
+            if test "${gl_cv_libglib+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -38534,8 +33972,8 @@
 
 
 # Check whether --with-libglib-2.0-prefix was given.
-if test "${with_libglib_2_0_prefix+set}" = set; then :
-  withval=$with_libglib_2_0_prefix;
+if test "${with_libglib_20_prefix+set}" = set; then :
+  withval=$with_libglib_20_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -38586,7 +34024,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -39093,7 +34531,7 @@
     for ac_header in unistd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
+if test "x$ac_cv_header_unistd_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNISTD_H 1
 _ACEOF
@@ -39116,6 +34554,7 @@
 fi
 
 
+  # Code from module libunistring-optional:
 
 
 
@@ -39124,6 +34563,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_libunistring_use_included" >&5
 $as_echo "$gl_libunistring_use_included" >&6; }
 
+  # Code from module libxml:
 
 
 
@@ -39145,7 +34585,7 @@
   LTLIBXML=
   INCXML=
   if test "$gl_cv_libxml_use_included" != yes; then
-            if ${gl_cv_libxml+:} false; then :
+            if test "${gl_cv_libxml+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -39229,7 +34669,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -39620,12 +35060,10 @@
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libxml/xmlversion.h>
-                   #include <libxml/xmlmemory.h>
-
 int
 main ()
 {
-xmlCheckVersion (0); xmlFree ((void *) 0);
+xmlCheckVersion (0);
   ;
   return 0;
 }
@@ -39644,12 +35082,10 @@
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libxml/xmlversion.h>
-                     #include <libxml/xmlmemory.h>
-
 int
 main ()
 {
-xmlCheckVersion (0); xmlFree ((void *) 0);
+xmlCheckVersion (0);
   ;
   return 0;
 }
@@ -39673,12 +35109,17 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <libxml2/libxml/xmlexports.h>" >&5
 $as_echo_n "checking absolute name of <libxml2/libxml/xmlexports.h>... " >&6; }
-if ${gl_cv_absolute_libxml2_libxml_xmlexports_h+:} false; then :
+if test "${gl_cv_absolute_libxml2_libxml_xmlexports_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-          if test $ac_cv_header_libxml2_libxml_xmlexports_h = yes; then
+
+  :
+
+
 
 
+    if test $ac_cv_header_libxml2_libxml_xmlexports_h = yes; then
+
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libxml2/libxml/xmlexports.h>
@@ -39687,27 +35128,13 @@
     aix*) gl_absname_cpp="$ac_cpp -C" ;;
     *)    gl_absname_cpp="$ac_cpp" ;;
   esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'libxml2/libxml/xmlexports.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
         gl_cv_absolute_libxml2_libxml_xmlexports_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+sed -n '\#/libxml2/libxml/xmlexports.h#{
+        s#.*"\(.*/libxml2/libxml/xmlexports.h\)".*#\1#
+        s#^/[^/]#//&#
+        p
+        q
+}'`
 
     fi
 
@@ -39722,7 +35149,7 @@
              libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'`
 
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
           if test -z "$libxml2_include_dir"; then
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -39732,11 +35159,16 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <libxml2/libxml/xmlversion.h>" >&5
 $as_echo_n "checking absolute name of <libxml2/libxml/xmlversion.h>... " >&6; }
-if ${gl_cv_absolute_libxml2_libxml_xmlversion_h+:} false; then :
+if test "${gl_cv_absolute_libxml2_libxml_xmlversion_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-          if test $ac_cv_header_libxml2_libxml_xmlversion_h = yes; then
 
+  :
+
+
+
+
+    if test $ac_cv_header_libxml2_libxml_xmlversion_h = yes; then
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -39746,27 +35178,13 @@
     aix*) gl_absname_cpp="$ac_cpp -C" ;;
     *)    gl_absname_cpp="$ac_cpp" ;;
   esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'libxml2/libxml/xmlversion.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
         gl_cv_absolute_libxml2_libxml_xmlversion_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+sed -n '\#/libxml2/libxml/xmlversion.h#{
+        s#.*"\(.*/libxml2/libxml/xmlversion.h\)".*#\1#
+        s#^/[^/]#//&#
+        p
+        q
+}'`
 
     fi
 
@@ -39781,19 +35199,17 @@
                libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'`
 
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
           fi
           if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libxml/xmlversion.h>
-                         #include <libxml/xmlmemory.h>
-
 int
 main ()
 {
-xmlCheckVersion (0); xmlFree ((void *) 0);
+xmlCheckVersion (0);
   ;
   return 0;
 }
@@ -39892,7 +35308,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -39909,7 +35326,7 @@
       #endif
 
 "
-if test "x$ac_cv_header_arpa_nameser_h" = xyes; then :
+if test "x$ac_cv_header_arpa_nameser_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ARPA_NAMESER_H 1
 _ACEOF
@@ -39932,7 +35349,7 @@
       #endif
 
 "
-if test "x$ac_cv_header_resolv_h" = xyes; then :
+if test "x$ac_cv_header_resolv_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_RESOLV_H 1
 _ACEOF
@@ -39945,7 +35362,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -39970,15 +35388,18 @@
 fi
 
 
+  # Code from module linkedhash-list:
+  # Code from module list:
 
 
 
+  # Code from module localcharset:
 
 
 
 
+  :
 
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
 
 
 
@@ -39987,25 +35408,25 @@
 
 
 
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+
+  # Code from module locale:
+
+
+
 
-  case "$host_os" in
-    solaris*)
 
-$as_echo "#define _LCONV_C99 1" >>confdefs.h
 
-      ;;
-  esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
 $as_echo_n "checking whether locale.h conforms to POSIX:2001... " >&6; }
-if ${gl_cv_header_locale_h_posix2001+:} false; then :
+if test "${gl_cv_header_locale_h_posix2001+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
-            int x = LC_MESSAGES;
-            int y = sizeof (((struct lconv *) 0)->decimal_point);
+int x = LC_MESSAGES;
 int
 main ()
 {
@@ -40025,17 +35446,23 @@
 $as_echo "$gl_cv_header_locale_h_posix2001" >&6; }
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_xlocale_h = yes; then
     HAVE_XLOCALE_H=1
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
 $as_echo_n "checking whether locale.h defines locale_t... " >&6; }
-if ${gl_cv_header_locale_has_locale_t+:} false; then :
+if test "${gl_cv_header_locale_has_locale_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
-              locale_t x;
+locale_t x;
 int
 main ()
 {
@@ -40065,40 +35492,11 @@
   fi
 
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5
-$as_echo_n "checking whether struct lconv is properly defined... " >&6; }
-if ${gl_cv_sys_struct_lconv_ok+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-            struct lconv l;
-            int x = sizeof (l.decimal_point);
-            int y = sizeof (l.int_p_cs_precedes);
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_sys_struct_lconv_ok=yes
-else
-  gl_cv_sys_struct_lconv_ok=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5
-$as_echo "$gl_cv_sys_struct_lconv_ok" >&6; }
-  if test $gl_cv_sys_struct_lconv_ok = no; then
-    REPLACE_STRUCT_LCONV=1
-  fi
 
 
+  :
 
 
 
@@ -40111,45 +35509,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
 $as_echo_n "checking absolute name of <locale.h>... " >&6; }
-if ${gl_cv_next_locale_h+:} false; then :
+if test "${gl_cv_next_locale_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_locale_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'locale.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_locale_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_locale_h
-           gl_cv_next_locale_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_locale_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/locale.h#{
+                 s#.*"\(.*/locale.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_locale_h='<'locale.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5
@@ -40169,13 +35552,20 @@
 
 
 
+  if test -n "$STDDEF_H" \
+     || test $gl_cv_header_locale_h_posix2001 = no \
+     || test $gl_cv_header_locale_h_needs_xlocale_h = yes; then
+
+    :
+
+  fi
 
 
-    for gl_func in setlocale duplocale; do
+    for gl_func in duplocale; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -40205,7 +35595,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -40215,6 +35606,7 @@
       done
 
 
+  # Code from module localename:
 
 
 
@@ -40222,7 +35614,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -40231,14 +35624,15 @@
 done
 
 
+  # Code from module lock:
 
 
   if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
+    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
     ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
 "
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then :
 
 $as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
@@ -40247,22 +35641,16 @@
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-      #include <pthread.h>
+#include <pthread.h>
 int
 main ()
 {
-
 #if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
 #endif
-
   ;
   return 0;
 }
@@ -40274,95 +35662,94 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
-  :
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_LOCK 1
-_ACEOF
 
+  # Code from module lstat:
 
 
 
+  :
 
-  if test $ac_cv_func_lstat = yes; then
 
-    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-      *no)
-        REPLACE_LSTAT=1
-        ;;
-    esac
-  else
-    HAVE_LSTAT=0
-  fi
 
-  if test $REPLACE_LSTAT = 1; then
 
 
+  if test $ac_cv_func_lstat = yes; then
 
+    if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+            REPLACE_LSTAT=1
+    fi
+    # Prerequisites of lib/lstat.c.
 
+  else
+    HAVE_LSTAT=0
+  fi
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
+  GNULIB_LSTAT=1
 
-    :
-  fi
 
 
+$as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
 
 
-          GNULIB_LSTAT=1
+  # Code from module malloc-posix:
 
 
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
 
+$as_echo "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
+  else
 
-$as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
 
 
 
 
 
-  if test $gl_cv_func_malloc_posix = yes; then
 
-$as_echo "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
+  gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext"
 
-  else
-    REPLACE_MALLOC=1
+    HAVE_MALLOC_POSIX=0
   fi
 
-  if test $REPLACE_MALLOC = 1; then
 
 
 
 
+  GNULIB_MALLOC_POSIX=1
+
 
 
+$as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
-  gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext"
 
-  fi
+  # Code from module malloca:
 
 
 
 
+  # Code from module mbchar:
 
-          GNULIB_MALLOC_POSIX=1
 
 
 
+  # Code from module mbiter:
 
 
-$as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
+  :
 
+  # Code from module mbrtowc:
 
 
 
@@ -40379,6 +35766,7 @@
 
 
 
+  :
 
 
 
@@ -40390,15 +35778,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -40409,13 +35797,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -40453,7 +35834,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -40473,13 +35854,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -40527,35 +35901,22 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
+  fi
 
-  if test $ac_cv_func_mbrtowc = no; then
-    HAVE_MBRTOWC=0
-    ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbrtowc" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRTOWC $ac_have_decl
-_ACEOF
+  :
 
-    if test $ac_cv_have_decl_mbrtowc = yes; then
-                        REPLACE_MBRTOWC=1
-    fi
+
+
+
+
+  if test $ac_cv_func_mbrtowc = no; then
+    HAVE_MBRTOWC=0
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBRTOWC=1
@@ -40563,17 +35924,17 @@
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
-$as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg1+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
+$as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
+if test "${gl_cv_func_mbrtowc_null_arg+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                  # Guess no on Solaris.
-        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
-                  # Guess yes otherwise.
-        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
+              # Guess no on OSF/1.
+        osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
       esac
       if test $LOCALE_FR_UTF8 != none; then
         if test "$cross_compiling" = yes; then :
@@ -40583,49 +35944,30 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
-#include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
-      char input[] = "\303\237er";
       mbstate_t state;
       wchar_t wc;
-      size_t ret;
+      int ret;
 
       memset (&state, '\0', sizeof (mbstate_t));
       wc = (wchar_t) 0xBADFACE;
-      ret = mbrtowc (&wc, input, 5, &state);
-      if (ret != 2)
-        result |= 1;
-      if (!mbsinit (&state))
-        result |= 2;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      ret = mbrtowc (NULL, input, 5, &state);
-      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
-        result |= 4;
-      if (!mbsinit (&state))
-        result |= 8;
+      mbrtowc (&wc, NULL, 5, &state);
+      /* Check that wc was not modified.  */
+      if (wc != (wchar_t) 0xBADFACE)
+        return 1;
     }
-  return result;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_null_arg1=yes
+  gl_cv_func_mbrtowc_null_arg=yes
 else
-  gl_cv_func_mbrtowc_null_arg1=no
+  gl_cv_func_mbrtowc_null_arg=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -40634,25 +35976,26 @@
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
-$as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg" >&5
+$as_echo "$gl_cv_func_mbrtowc_null_arg" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
-$as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
+$as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
+if test "${gl_cv_func_mbrtowc_retval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-              # Guess no on OSF/1.
-        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
-              # Guess yes otherwise.
-        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
-      if test $LOCALE_FR_UTF8 != none; then
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
   :
 else
@@ -40661,174 +36004,46 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
+  /* This fails on Solaris.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
+      char input[] = "B\303\274\303\237er"; /* "Büßer" */
       mbstate_t state;
       wchar_t wc;
-      int ret;
 
       memset (&state, '\0', sizeof (mbstate_t));
-      wc = (wchar_t) 0xBADFACE;
-      mbrtowc (&wc, NULL, 5, &state);
-      /* Check that wc was not modified.  */
-      if (wc != (wchar_t) 0xBADFACE)
-        return 1;
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 1)
+            return 1;
+        }
+    }
+  /* This fails on HP-UX 11.11.  */
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        {
+          input[1] = '\0';
+          if (mbrtowc (&wc, input + 2, 5, &state) != 2)
+            return 1;
+        }
     }
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_null_arg2=yes
-else
-  gl_cv_func_mbrtowc_null_arg2=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
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
-$as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
-$as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
-if ${gl_cv_func_mbrtowc_retval+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
-      esac
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
-        if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  int result = 0;
-  int found_some_locale = 0;
-  /* This fails on Solaris.  */
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      char input[] = "B\303\274\303\237er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        {
-          input[1] = '\0';
-          if (mbrtowc (&wc, input + 2, 5, &state) != 1)
-            result |= 1;
-        }
-      found_some_locale = 1;
-    }
-  /* This fails on HP-UX 11.11.  */
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        {
-          input[1] = '\0';
-          if (mbrtowc (&wc, input + 2, 5, &state) != 2)
-            result |= 2;
-        }
-      found_some_locale = 1;
-    }
-  /* This fails on native Windows.  */
-  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
-    {
-      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 4;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
-    {
-      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 8;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
-    {
-      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 16;
-        }
-      found_some_locale = 1;
-    }
-  return (found_some_locale ? result : 77);
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
   gl_cv_func_mbrtowc_retval=yes
 else
-  if test $? != 77; then
-             gl_cv_func_mbrtowc_retval=no
-           fi
-
+  gl_cv_func_mbrtowc_retval=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -40845,7 +36060,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
 $as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
-if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
+if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -40864,13 +36079,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -40902,61 +36110,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
 
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
-$as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
-if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  case "$host_os" in
-                     # Guess no on AIX and glibc systems.
-        aix* | *-gnu*)
-                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
-        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-      esac
-      if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-           #include <wchar.h>
-           static wchar_t wc;
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-           }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_empty_input=no
-else
-  gl_cv_func_mbrtowc_empty_input=yes
-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_mbrtowc_empty_input" >&5
-$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
-
-      case "$gl_cv_func_mbrtowc_null_arg1" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
-
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_null_arg2" in
+      case "$gl_cv_func_mbrtowc_null_arg" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
+$as_echo "#define MBRTOWC_NULL_ARG_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40977,19 +36134,13 @@
            REPLACE_MBRTOWC=1
            ;;
       esac
-      case "$gl_cv_func_mbrtowc_empty_input" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
-
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
     fi
   fi
-
   if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
 
+    :
+
+
 
 
 
@@ -41007,14 +36158,17 @@
 
 
 
+  GNULIB_MBRTOWC=1
+
 
-          GNULIB_MBRTOWC=1
+
+$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
+  # Code from module mbsinit:
 
 
-$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
@@ -41022,9 +36176,15 @@
 
 
 
+  :
+
+
+
 
 
 
+  :
+
 
 
 
@@ -41035,15 +36195,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -41054,13 +36214,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -41098,7 +36251,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -41118,13 +36271,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -41172,47 +36318,32 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
+  fi
 
-  if test $ac_cv_func_mbsinit = no; then
-    HAVE_MBSINIT=0
-    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT $ac_have_decl
-_ACEOF
+  :
 
-    if test $ac_cv_have_decl_mbsinit = yes; then
-                        REPLACE_MBSINIT=1
-    fi
+
+
+
+
+  if test $ac_cv_func_mbsinit = no; then
+    HAVE_MBSINIT=0
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBSINIT=1
-    else
-                        case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
-      esac
     fi
   fi
-
   if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
 
+    :
+
+
 
 
 
@@ -41230,17 +36361,21 @@
 
 
 
+  GNULIB_MBSINIT=1
 
-          GNULIB_MBSINIT=1
 
 
+$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+  # Code from module mbslen:
 
 
 
+  :
+
+
 
 
 
@@ -41253,23 +36388,32 @@
 
 
 
+  GNULIB_MBSLEN=1
+
+
+
+$as_echo "#define GNULIB_TEST_MBSLEN 1" >>confdefs.h
+
+
+
+  # Code from module mbsrtowcs:
 
 
-          GNULIB_MBSLEN=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_MBSLEN 1" >>confdefs.h
 
 
+  :
 
 
 
 
 
 
+  :
 
 
 
@@ -41281,15 +36425,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -41300,13 +36444,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -41344,7 +36481,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -41364,13 +36501,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -41418,35 +36548,22 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
+  fi
 
-  if test $ac_cv_func_mbsrtowcs = no; then
-    HAVE_MBSRTOWCS=0
-    ac_fn_c_check_decl "$LINENO" "mbsrtowcs" "ac_cv_have_decl_mbsrtowcs" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbsrtowcs" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSRTOWCS $ac_have_decl
-_ACEOF
+  :
 
-    if test $ac_cv_have_decl_mbsrtowcs = yes; then
-                        REPLACE_MBSRTOWCS=1
-    fi
+
+
+
+
+  if test $ac_cv_func_mbsrtowcs = no; then
+    HAVE_MBSRTOWCS=0
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBSRTOWCS=1
@@ -41456,20 +36573,19 @@
 
 
 
-
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbsrtowcs works" >&5
 $as_echo_n "checking whether mbsrtowcs works... " >&6; }
-if ${gl_cv_func_mbsrtowcs_works+:} false; then :
+if test "${gl_cv_func_mbsrtowcs_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, mingw.
-        hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbsrtowcs_works="guessing yes" ;;
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbsrtowcs_works="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbsrtowcs_works="guessing yes" ;;
       esac
-      if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
         if test "$cross_compiling" = yes; then :
   :
 else
@@ -41478,30 +36594,9 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-  /* Test whether the function supports a NULL destination argument.
-     This fails on native Windows.  */
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      const char input[] = "\337er";
-      const char *src = input;
-      mbstate_t state;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbsrtowcs (NULL, &src, 1, &state) != 3
-          || src != input)
-        result |= 1;
-    }
   /* Test whether the function works when started with a conversion state
      in non-initial state.  This fails on HP-UX 11.11 and Solaris 10.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
@@ -41515,7 +36610,7 @@
           {
             const char *src = input + 2;
             if (mbsrtowcs (NULL, &src, 10, &state) != 4)
-              result |= 2;
+              return 1;
           }
     }
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
@@ -41529,7 +36624,7 @@
           {
             const char *src = input + 4;
             if (mbsrtowcs (NULL, &src, 10, &state) != 3)
-              result |= 4;
+              return 1;
           }
     }
   if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
@@ -41543,10 +36638,10 @@
           {
             const char *src = input + 2;
             if (mbsrtowcs (NULL, &src, 10, &state) != 4)
-              result |= 8;
+              return 1;
           }
     }
-  return result;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -41570,9 +36665,11 @@
       esac
     fi
   fi
-
   if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
 
+    :
+
+
 
 
 
@@ -41600,29 +36697,39 @@
 
 
 
+  GNULIB_MBSRTOWCS=1
 
-          GNULIB_MBSRTOWCS=1
 
 
+$as_echo "#define GNULIB_TEST_MBSRTOWCS 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_MBSRTOWCS 1" >>confdefs.h
+  # Code from module mbsstr:
+
+
+
+  GNULIB_MBSSTR=1
 
 
 
+$as_echo "#define GNULIB_TEST_MBSSTR 1" >>confdefs.h
 
 
 
+  # Code from module mbswidth:
 
 
-          GNULIB_MBSSTR=1
+  :
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_MBSSTR 1" >>confdefs.h
+
+  :
+
+
 
 
 
@@ -41632,7 +36739,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbswidth is declared in <wchar.h>" >&5
 $as_echo_n "checking whether mbswidth is declared in <wchar.h>... " >&6; }
-if ${ac_cv_have_decl_mbswidth+:} false; then :
+if test "${ac_cv_have_decl_mbswidth+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -41682,20 +36789,13 @@
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 $as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
+#           include <wchar.h>
 int
 main ()
 {
@@ -41724,49 +36824,32 @@
    fi
 
 
-
-
-  :
-
-
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-
-
-
-
+  # Code from module mbuiter:
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext"
+  :
 
+  # Code from module memchr:
 
-  for ac_header in bp-sym.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
-if test "x$ac_cv_header_bp_sym_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BP_SYM_H 1
-_ACEOF
 
-fi
 
-done
 
+  GNULIB_MEMCHR=1
 
-  fi
 
 
+$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
 
 
 
-          GNULIB_MEMCHR=1
+  # Code from module memmove:
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
 
 
 
@@ -41774,58 +36857,67 @@
   for ac_func in memmove
 do :
   ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
+if test "x$ac_cv_func_memmove" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMMOVE 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
 
   if test $ac_cv_func_memmove = no; then
 
+  :
 
+  fi
 
+  # Code from module memset:
 
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS memmove.$ac_objext"
 
 
-  :
 
-  fi
 
   for ac_func in memset
 do :
   ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
-if test "x$ac_cv_func_memset" = xyes; then :
+if test "x$ac_cv_func_memset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMSET 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
 
   if test $ac_cv_func_memset = no; then
 
+  :
 
+  fi
 
+  # Code from module minmax:
 
 
 
+  # Code from module mkdtemp:
 
 
-  gl_LIBOBJS="$gl_LIBOBJS memset.$ac_objext"
 
 
-  :
 
-  fi
 
 
 
@@ -41834,29 +36926,21 @@
   for ac_func in mkdtemp
 do :
   ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
-if test "x$ac_cv_func_mkdtemp" = xyes; then :
+if test "x$ac_cv_func_mkdtemp" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MKDTEMP 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
+
   if test $ac_cv_func_mkdtemp = no; then
     HAVE_MKDTEMP=0
-  fi
-
-  if test $HAVE_MKDTEMP = 0; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS mkdtemp.$ac_objext"
-
     :
 
   fi
@@ -41864,10 +36948,7 @@
 
 
 
-
-          GNULIB_MKDTEMP=1
-
-
+  GNULIB_MKDTEMP=1
 
 
 
@@ -41875,11 +36956,12 @@
 
 
 
+  # Code from module moo:
 
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler is actually a C++ compiler" >&5
 $as_echo_n "checking whether the C compiler is actually a C++ compiler... " >&6; }
-if ${gl_cv_c_cplusplus+:} false; then :
+if test "${gl_cv_c_cplusplus+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -41907,46 +36989,9 @@
 
   fi
 
+  # Code from module multiarch:
 
-
-  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
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS msvc-inval.$ac_objext"
-
-  fi
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS msvc-nothrow.$ac_objext"
-
-  fi
-
+  # Code from module no-c++:
 
   NO_CXX=
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -41965,6 +37010,7 @@
 
 
 
+  # Code from module obstack:
 
 
 
@@ -41979,7 +37025,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5
 $as_echo_n "checking for obstacks... " >&6; }
-if ${ac_cv_func_obstack+:} false; then :
+if test "${ac_cv_func_obstack+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -42025,17 +37071,42 @@
 
 fi
 
+    # Code from module open:
 
 
   case "$host_os" in
     mingw* | pw*)
-      REPLACE_OPEN=1
+
+
+  REPLACE_OPEN=1
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS open.$ac_objext"
+
+
+
+
+  :
+
+
       ;;
     *)
 
+  :
+
+
+
+
+
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 $as_echo_n "checking whether open recognizes a trailing slash... " >&6; }
-if ${gl_cv_func_open_slash+:} false; then :
+if test "${gl_cv_func_open_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # Assume that if we have lstat, we can also check symlinks.
@@ -42046,10 +37117,10 @@
           if test "$cross_compiling" = yes; then :
 
              case "$host_os" in
-               freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-                 gl_cv_func_open_slash="guessing no" ;;
-               *)
-                 gl_cv_func_open_slash="guessing yes" ;;
+               freebsd*)        gl_cv_func_open_slash="guessing no" ;;
+               solaris2.[0-9]*) gl_cv_func_open_slash="guessing no" ;;
+               hpux*)           gl_cv_func_open_slash="guessing no" ;;
+               *)               gl_cv_func_open_slash="guessing yes" ;;
              esac
 
 else
@@ -42062,14 +37133,10 @@
 #endif
 int main ()
 {
-  int result = 0;
 #if HAVE_LSTAT
-  if (open ("conftest.lnk/", O_RDONLY) != -1)
-    result |= 1;
+  if (open ("conftest.lnk/", O_RDONLY) != -1) return 2;
 #endif
-  if (open ("conftest.sl/", O_CREAT, 0600) >= 0)
-    result |= 2;
-  return result;
+  return open ("conftest.sl/", O_CREAT, 0600) >= 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -42091,15 +37158,9 @@
 
 $as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
-          REPLACE_OPEN=1
-          ;;
-      esac
-      ;;
-  esac
-
 
 
-  if test $REPLACE_OPEN = 1; then
+  REPLACE_OPEN=1
 
 
 
@@ -42112,17 +37173,19 @@
 
 
 
-  :
-
-  fi
 
+  :
 
 
+          ;;
+      esac
+      ;;
+  esac
 
 
-          GNULIB_OPEN=1
 
 
+  GNULIB_OPEN=1
 
 
 
@@ -42130,52 +37193,7 @@
 
 
 
-
-
-
-  for ac_func in opendir
-do :
-  ac_fn_c_check_func "$LINENO" "opendir" "ac_cv_func_opendir"
-if test "x$ac_cv_func_opendir" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OPENDIR 1
-_ACEOF
-
-fi
-done
-
-  if test $ac_cv_func_opendir = no; then
-    HAVE_OPENDIR=0
-  fi
-
-
-  if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS opendir.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_OPENDIR=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_OPENDIR 1" >>confdefs.h
-
-
-
+  # Code from module openmp:
 
   OPENMP_CFLAGS=
   # Check whether --enable-openmp was given.
@@ -42186,7 +37204,7 @@
   if test "$enable_openmp" != no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5
 $as_echo_n "checking for $CC option to support OpenMP... " >&6; }
-if ${ac_cv_prog_c_openmp+:} false; then :
+if test "${ac_cv_prog_c_openmp+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -42203,8 +37221,7 @@
   ac_cv_prog_c_openmp='none needed'
 else
   ac_cv_prog_c_openmp='unsupported'
-	  	  	  	  	  	  	                                	  	  	  	  	  	  for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp \
-                           -Popenmp --openmp; do
+	  	  	  	  	  	  	  	  	  	  	  	  	  for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
 	    ac_save_CFLAGS=$CFLAGS
 	    CFLAGS="$CFLAGS $ac_option"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -42242,121 +37259,82 @@
   fi
 
 
+  # Code from module ostream:
+  # Code from module pathmax:
 
 
+  :
 
 
 
 
 
 
-
-
-  if test $ac_cv_func_pipe2 != yes; then
-    HAVE_PIPE2=0
-  fi
+  :
 
 
 
 
 
 
-          GNULIB_PIPE2=1
+  # Code from module pipe:
 
 
 
 
+  # Code from module pipe-filter-ii:
 
-$as_echo "#define GNULIB_TEST_PIPE2 1" >>confdefs.h
 
+  :
 
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_PIPE2_SAFER 1
-_ACEOF
 
+  # Code from module pipe2:
 
 
 
 
 
 
+  :
 
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addclose works" >&5
-$as_echo_n "checking whether posix_spawn_file_actions_addclose works... " >&6; }
-if ${gl_cv_func_posix_spawn_file_actions_addclose_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes";;
-          esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addclose (&actions, 10000000) == 0)
-    return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_posix_spawn_file_actions_addclose_works=yes
-else
-  gl_cv_func_posix_spawn_file_actions_addclose_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_posix_spawn_file_actions_addclose_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; }
-    case "$gl_cv_func_posix_spawn_file_actions_addclose_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1 ;;
-    esac
+  if test $ac_cv_func_pipe2 != yes; then
+    HAVE_PIPE2=0
   fi
 
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then
-
 
 
 
+  GNULIB_PIPE2=1
 
 
 
+$as_echo "#define GNULIB_TEST_PIPE2 1" >>confdefs.h
 
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_addclose.$ac_objext"
 
-  fi
 
+  # Code from module pipe2-safer:
 
 
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_PIPE2_SAFER 1
+_ACEOF
 
 
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
-
+  # Code from module posix_spawn-internal:
+  # Code from module posix_spawn_file_actions_addclose:
 
 
 
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE 1" >>confdefs.h
+    :
 
 
 
@@ -42366,140 +37344,58 @@
 
 
 
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_adddup2 works" >&5
-$as_echo_n "checking whether posix_spawn_file_actions_adddup2 works... " >&6; }
-if ${gl_cv_func_posix_spawn_file_actions_adddup2_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";;
-          esac
+  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_addclose.$ac_objext"
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  fi
 
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_adddup2 (&actions, 10000000, 2) == 0)
-    return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_posix_spawn_file_actions_adddup2_works=yes
-else
-  gl_cv_func_posix_spawn_file_actions_adddup2_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_posix_spawn_file_actions_adddup2_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; }
-    case "$gl_cv_func_posix_spawn_file_actions_adddup2_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1 ;;
-    esac
-  fi
+  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
 
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then
 
 
+$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE 1" >>confdefs.h
 
 
 
+  # Code from module posix_spawn_file_actions_adddup2:
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_adddup2.$ac_objext"
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
-  fi
+    :
 
 
 
 
 
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_adddup2.$ac_objext"
 
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 1" >>confdefs.h
+  fi
 
 
 
+  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
 
 
 
+$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 1" >>confdefs.h
 
 
 
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addopen works" >&5
-$as_echo_n "checking whether posix_spawn_file_actions_addopen works... " >&6; }
-if ${gl_cv_func_posix_spawn_file_actions_addopen_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";;
-          esac
+  # Code from module posix_spawn_file_actions_addopen:
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <spawn.h>
-#include <fcntl.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addopen (&actions, 10000000, "foo", 0, O_RDONLY)
-      == 0)
-    return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_posix_spawn_file_actions_addopen_works=yes
-else
-  gl_cv_func_posix_spawn_file_actions_addopen_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
 
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addopen_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; }
-    case "$gl_cv_func_posix_spawn_file_actions_addopen_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 ;;
-    esac
-  fi
+    :
 
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then
 
 
 
@@ -42514,11 +37410,7 @@
 
 
 
-
-
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
-
-
+  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
 
 
 
@@ -42526,11 +37418,13 @@
 
 
 
+  # Code from module posix_spawn_file_actions_destroy:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
 
 
 
@@ -42538,17 +37432,15 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_destroy.$ac_objext"
-
-  fi
-
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_destroy.$ac_objext"
 
+  fi
 
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY=1
 
 
+  GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY=1
 
 
 
@@ -42556,11 +37448,13 @@
 
 
 
+  # Code from module posix_spawn_file_actions_init:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
 
 
 
@@ -42568,17 +37462,15 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_init.$ac_objext"
-
-  fi
-
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_init.$ac_objext"
 
+  fi
 
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=1
 
 
+  GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=1
 
 
 
@@ -42586,11 +37478,13 @@
 
 
 
+  # Code from module posix_spawnattr_destroy:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
 
 
 
@@ -42598,17 +37492,15 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_destroy.$ac_objext"
-
-  fi
-
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawnattr_destroy.$ac_objext"
 
+  fi
 
-          GNULIB_POSIX_SPAWNATTR_DESTROY=1
 
 
+  GNULIB_POSIX_SPAWNATTR_DESTROY=1
 
 
 
@@ -42616,11 +37508,13 @@
 
 
 
+  # Code from module posix_spawnattr_init:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
 
 
 
@@ -42628,17 +37522,15 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_init.$ac_objext"
-
-  fi
-
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawnattr_init.$ac_objext"
 
+  fi
 
-          GNULIB_POSIX_SPAWNATTR_INIT=1
 
 
+  GNULIB_POSIX_SPAWNATTR_INIT=1
 
 
 
@@ -42646,11 +37538,13 @@
 
 
 
+  # Code from module posix_spawnattr_setflags:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
 
 
 
@@ -42658,17 +37552,15 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_setflags.$ac_objext"
-
-  fi
-
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawnattr_setflags.$ac_objext"
 
+  fi
 
-          GNULIB_POSIX_SPAWNATTR_SETFLAGS=1
 
 
+  GNULIB_POSIX_SPAWNATTR_SETFLAGS=1
 
 
 
@@ -42676,11 +37568,13 @@
 
 
 
+  # Code from module posix_spawnattr_setsigmask:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
 
 
 
@@ -42688,17 +37582,15 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_setsigmask.$ac_objext"
-
-  fi
-
 
 
+  gl_LIBOBJS="$gl_LIBOBJS spawnattr_setsigmask.$ac_objext"
 
+  fi
 
-          GNULIB_POSIX_SPAWNATTR_SETSIGMASK=1
 
 
+  GNULIB_POSIX_SPAWNATTR_SETSIGMASK=1
 
 
 
@@ -42706,11 +37598,15 @@
 
 
 
+  # Code from module posix_spawnp:
 
 
 
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
 
+    :
+
+
 
 
 
@@ -42728,13 +37624,13 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS spawni.$ac_objext"
 
+  gl_LIBOBJS="$gl_LIBOBJS spawni.$ac_objext"
 
-  for ac_header in paths.h
+    for ac_header in paths.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default"
-if test "x$ac_cv_header_paths_h" = xyes; then :
+if test "x$ac_cv_header_paths_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PATHS_H 1
 _ACEOF
@@ -42747,7 +37643,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -42760,11 +37657,7 @@
 
 
 
-
-
-          GNULIB_POSIX_SPAWNP=1
-
-
+  GNULIB_POSIX_SPAWNP=1
 
 
 
@@ -42772,9 +37665,10 @@
 
 
 
+  # Code from module progname:
   ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
 "
-if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then :
+if test "x$ac_cv_have_decl_program_invocation_name" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -42786,7 +37680,7 @@
 
   ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
 "
-if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then :
+if test "x$ac_cv_have_decl_program_invocation_short_name" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -42796,6 +37690,7 @@
 #define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl
 _ACEOF
 
+  # Code from module propername:
 
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'"
@@ -42804,228 +37699,94 @@
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'"
 
+  # Code from module quote:
 
-  # Check whether --enable-acl was given.
-if test "${enable_acl+set}" = set; then :
-  enableval=$enable_acl;
-else
-  enable_acl=auto
-fi
 
+  # Code from module quotearg:
 
 
-  LIB_ACL=
-  use_acl=0
-  if test "x$enable_acl" != "xno"; then
-        for ac_header in sys/acl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_acl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_ACL_H 1
-_ACEOF
+  # Code from module quotearg-simple:
+  # Code from module rawmemchr:
 
-fi
 
-done
 
-    if test $ac_cv_header_sys_acl_h = yes; then
-      ac_save_LIBS=$LIBS
 
-                  if test $use_acl = 0; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5
-$as_echo_n "checking for library containing acl_get_file... " >&6; }
-if ${ac_cv_search_acl_get_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char acl_get_file ();
-int
-main ()
-{
-return acl_get_file ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' acl pacl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_acl_get_file=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_acl_get_file+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_acl_get_file+:} false; then :
 
-else
-  ac_cv_search_acl_get_file=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5
-$as_echo "$ac_cv_search_acl_get_file" >&6; }
-ac_res=$ac_cv_search_acl_get_file
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  if test "$ac_cv_search_acl_get_file" != "none required"; then
-             LIB_ACL=$ac_cv_search_acl_get_file
-           fi
-           for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \
-              acl_free acl_from_mode acl_from_text \
-              acl_delete_def_file acl_extended_file \
-              acl_delete_fd_np acl_delete_file_np \
-              acl_copy_ext_native acl_create_entry_np \
-              acl_to_short_text acl_free_text
+
+
+
+
+
+
+  for ac_func in rawmemchr
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
+if test "x$ac_cv_func_rawmemchr" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_RAWMEMCHR 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
-           # If the acl_get_file bug is detected, don't enable the ACL support.
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5
-$as_echo_n "checking for working acl_get_file... " >&6; }
-if ${gl_cv_func_working_acl_get_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gl_cv_func_working_acl_get_file=no
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-           #include <sys/acl.h>
-           #include <errno.h>
+  if test $ac_cv_func_rawmemchr = no; then
+    HAVE_RAWMEMCHR=0
+    :
+  fi
 
-int
-main ()
-{
-if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
-              return 1;
-            return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if test $cross_compiling = yes; then
-          gl_cv_func_working_acl_get_file="guessing yes"
-        elif ./conftest$ac_exeext; then
-          gl_cv_func_working_acl_get_file=yes
-        fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5
-$as_echo "$gl_cv_func_working_acl_get_file" >&6; }
-  if test "$gl_cv_func_working_acl_get_file" != no; then :
-  use_acl=1
-fi
 
-           if test $use_acl = 1; then
-                          for ac_header in acl/libacl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default"
-if test "x$ac_cv_header_acl_libacl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACL_LIBACL_H 1
-_ACEOF
 
-fi
+  GNULIB_RAWMEMCHR=1
 
-done
 
 
+$as_echo "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
+  # Code from module readlink:
 
 
 
+  :
 
-  for ac_func in acl_entries
-do :
-  ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries"
-if test "x$ac_cv_func_acl_entries" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACL_ENTRIES 1
-_ACEOF
 
-else
 
-    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
-fi
-done
 
+  if test $ac_cv_func_readlink = no; then
+    HAVE_READLINK=0
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5
-$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; }
-if ${gl_cv_acl_ACL_FIRST_ENTRY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/acl.h>
-int type = ACL_FIRST_ENTRY;
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_acl_ACL_FIRST_ENTRY=yes
-else
-  gl_cv_acl_ACL_FIRST_ENTRY=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5
-$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; }
-             if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
 
-$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h
 
-             fi
-                          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5
-$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; }
-if ${gl_cv_acl_ACL_TYPE_EXTENDED+:} false; then :
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
+
+  :
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+$as_echo_n "checking whether readlink signature is correct... " >&6; }
+if test "${gl_cv_decl_readlink_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/acl.h>
-int type = ACL_TYPE_EXTENDED;
+#include <unistd.h>
+      /* Cause compilation failure if original declaration has wrong type.  */
+      ssize_t readlink (const char *, char *, size_t);
 int
 main ()
 {
@@ -43035,295 +37796,145 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_acl_ACL_TYPE_EXTENDED=yes
+  gl_cv_decl_readlink_works=yes
 else
-  gl_cv_acl_ACL_TYPE_EXTENDED=no
+  gl_cv_decl_readlink_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5
-$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; }
-             if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
-
-$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h
-
-             fi
-           else
-             LIB_ACL=
-           fi
-
-fi
-
-      fi
-
-            if test $use_acl = 0; then
-        for ac_func in facl
-do :
-  ac_fn_c_check_func "$LINENO" "facl" "ac_cv_func_facl"
-if test "x$ac_cv_func_facl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FACL 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_facl = yes; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5
-$as_echo_n "checking for library containing acl_trivial... " >&6; }
-if ${ac_cv_search_acl_trivial+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+$as_echo "$gl_cv_decl_readlink_works" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+$as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
+if test "${gl_cv_func_readlink_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  # We have readlink, so assume ln -s works.
+       ln -s conftest.no-such conftest.link
+       ln -s conftest.link conftest.lnk2
+       if test "$cross_compiling" = yes; then :
+  gl_cv_func_readlink_works="guessing no"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <unistd.h>
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char acl_trivial ();
 int
 main ()
 {
-return acl_trivial ();
+char buf[20];
+      return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' sec; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_acl_trivial=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_acl_trivial+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_acl_trivial+:} false; then :
-
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_readlink_works=yes
 else
-  ac_cv_search_acl_trivial=no
+  gl_cv_func_readlink_works=no
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5
-$as_echo "$ac_cv_search_acl_trivial" >&6; }
-ac_res=$ac_cv_search_acl_trivial
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  if test "$ac_cv_search_acl_trivial" != "none required"; then
-               LIB_ACL=$ac_cv_search_acl_trivial
-             fi
 
+      rm -f conftest.link conftest.lnk2
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_works" >&5
+$as_echo "$gl_cv_func_readlink_works" >&6; }
+    if test "$gl_cv_func_readlink_works" != yes; then
 
-          for ac_func in acl_trivial
-do :
-  ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial"
-if test "x$ac_cv_func_acl_trivial" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACL_TRIVIAL 1
-_ACEOF
+$as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
-fi
-done
+      REPLACE_READLINK=1
 
-          use_acl=1
-        fi
-      fi
 
-            if test $use_acl = 0; then
-        for ac_func in getacl
-do :
-  ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl"
-if test "x$ac_cv_func_getacl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETACL 1
-_ACEOF
 
-fi
-done
 
-        if test $ac_cv_func_getacl = yes; then
-          use_acl=1
-        fi
-                for ac_header in aclv.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "aclv.h" "ac_cv_header_aclv_h" "#include <sys/types.h>
-"
-if test "x$ac_cv_header_aclv_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACLV_H 1
-_ACEOF
 
-fi
 
-done
 
-      fi
 
-            if test $use_acl = 0; then
-        for ac_func in aclx_get
-do :
-  ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get"
-if test "x$ac_cv_func_aclx_get" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACLX_GET 1
-_ACEOF
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
 
-fi
-done
+    elif test "$gl_cv_decl_readlink_works" != yes; then
+      REPLACE_READLINK=1
 
-        if test $ac_cv_func_aclx_get = yes; then
-          use_acl=1
-        fi
-      fi
 
-            if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then
-        for ac_func in statacl
-do :
-  ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl"
-if test "x$ac_cv_func_statacl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STATACL 1
-_ACEOF
 
-fi
-done
 
-        if test $ac_cv_func_statacl = yes; then
-          use_acl=1
-        fi
-      fi
 
-            if test $use_acl = 0; then
-        for ac_func in aclsort
-do :
-  ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort"
-if test "x$ac_cv_func_aclsort" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACLSORT 1
-_ACEOF
 
-fi
-done
 
-        if test $ac_cv_func_aclsort = yes; then
-          use_acl=1
-        fi
-      fi
 
-      LIBS=$ac_save_LIBS
-    fi
-    if test "x$enable_acl$use_acl" = "xyes0"; then
-      as_fn_error $? "ACLs enabled but support not detected" "$LINENO" 5
-    elif test "x$enable_acl$use_acl" = "xauto0"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5
-$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gettext-tools will be built without ACL support." >&5
-$as_echo "$as_me: WARNING: gettext-tools will be built without ACL support." >&2;}
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
     fi
   fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define USE_ACL $use_acl
-_ACEOF
 
-  USE_ACL=$use_acl
 
+  GNULIB_READLINK=1
 
 
-      :
 
-
-  :
+$as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h
 
 
 
+  # Code from module realloc-posix:
 
 
-  for ac_func in raise
-do :
-  ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
-if test "x$ac_cv_func_raise" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RAISE 1
-_ACEOF
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_REALLOC_POSIX=1
 
-fi
-done
+$as_echo "#define HAVE_REALLOC_POSIX 1" >>confdefs.h
 
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
   else
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_RAISE=1
-    fi
 
 
 
 
-  if test $gl_cv_type_sigset_t = yes; then
-    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  gl_cv_func_sigprocmask=1
-fi
 
-  fi
-  if test -z "$gl_cv_func_sigprocmask"; then
-    HAVE_POSIX_SIGNALBLOCKING=0
-  fi
 
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
 
 
+  gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext"
 
+    HAVE_REALLOC_POSIX=0
+  fi
 
-          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-            REPLACE_RAISE=1
-          fi
 
-      fi
 
-  fi
 
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
 
+  GNULIB_REALLOC_POSIX=1
 
 
 
+$as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
+  # Code from module relocatable-prog:
 
-  gl_LIBOBJS="$gl_LIBOBJS raise.$ac_objext"
 
-    :
-  fi
 
 
+  if test $RELOCATABLE = yes; then
+
 
 
 
-          GNULIB_RAISE=1
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS relocatable.$ac_objext"
+
+  fi
 
-$as_echo "#define GNULIB_TEST_RAISE 1" >>confdefs.h
+  if test $RELOCATABLE = yes; then
 
 
 
@@ -43331,58 +37942,46 @@
 
 
 
-  for ac_func in rawmemchr
-do :
-  ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
-if test "x$ac_cv_func_rawmemchr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RAWMEMCHR 1
-_ACEOF
 
-fi
-done
+  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext"
 
-  if test $ac_cv_func_rawmemchr = no; then
-    HAVE_RAWMEMCHR=0
   fi
+  : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
+  RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
+  RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
 
-  if test $HAVE_RAWMEMCHR = 0; then
+  # Code from module relocatable-prog-wrapper:
 
 
+  :
 
 
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS rawmemchr.$ac_objext"
+  :
 
-    :
-  fi
 
 
 
 
+  :
 
-          GNULIB_RAWMEMCHR=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
 
 
 
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_READ=1
-  fi
 
 
-  if test $REPLACE_READ = 1; then
+  :
 
 
 
@@ -43391,261 +37990,185 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS read.$ac_objext"
 
-    :
-  fi
 
 
 
 
 
-          GNULIB_READ=1
 
 
+  :
 
 
 
-$as_echo "#define GNULIB_TEST_READ 1" >>confdefs.h
 
 
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv validates arguments" >&5
+$as_echo_n "checking whether setenv validates arguments... " >&6; }
+if test "${gl_cv_func_setenv_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  gl_cv_func_setenv_works="guessing no"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+       #include <stdlib.h>
+       #include <errno.h>
+       #include <string.h>
 
+int
+main ()
+{
 
+       if (setenv ("", "", 0) != -1) return 1;
+       if (errno != EINVAL) return 2;
+       if (setenv ("a", "=", 1) != 0) return 3;
+       if (strcmp (getenv ("a"), "=") != 0) return 4;
 
-  for ac_func in readdir
-do :
-  ac_fn_c_check_func "$LINENO" "readdir" "ac_cv_func_readdir"
-if test "x$ac_cv_func_readdir" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_READDIR 1
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_setenv_works=yes
+else
+  gl_cv_func_setenv_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
-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setenv_works" >&5
+$as_echo "$gl_cv_func_setenv_works" >&6; }
+    if test "$gl_cv_func_setenv_works" != yes; then
+      REPLACE_SETENV=1
+
 
-  if test $ac_cv_func_readdir = no; then
-    HAVE_READDIR=0
-  fi
 
-  if test $HAVE_READDIR = 0; then
 
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext"
 
+    fi
+  fi
 
 
-  gl_LIBOBJS="$gl_LIBOBJS readdir.$ac_objext"
 
-  fi
 
+  :
 
 
 
 
-          GNULIB_READDIR=1
 
+  for ac_header in search.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
+if test "x$ac_cv_header_search_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SEARCH_H 1
+_ACEOF
 
+fi
 
+done
 
+  for ac_func in tsearch
+do :
+  ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
+if test "x$ac_cv_func_tsearch" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TSEARCH 1
+_ACEOF
 
-$as_echo "#define GNULIB_TEST_READDIR 1" >>confdefs.h
+fi
+done
 
 
 
 
 
 
-  if test $ac_cv_func_readlink = no; then
-    HAVE_READLINK=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
-$as_echo_n "checking whether readlink signature is correct... " >&6; }
-if ${gl_cv_decl_readlink_works+:} false; then :
+  if test -z "$ERRNO_H"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+$as_echo_n "checking for working strerror function... " >&6; }
+if test "${gl_cv_func_working_strerror+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if test "$cross_compiling" = yes; then :
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <unistd.h>
-      /* Cause compilation failure if original declaration has wrong type.  */
-      ssize_t readlink (const char *, char *, size_t);
+#include <string.h>
+
 int
 main ()
 {
-
+return !*strerror (-2);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_decl_readlink_works=yes
+  gl_cv_func_working_strerror=yes
 else
-  gl_cv_decl_readlink_works=no
+  gl_cv_func_working_strerror=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-$as_echo "$gl_cv_decl_readlink_works" >&6; }
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
-$as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
-if ${gl_cv_func_readlink_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # We have readlink, so assume ln -s works.
-       ln -s conftest.no-such conftest.link
-       ln -s conftest.link conftest.lnk2
-       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_readlink_works="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_readlink_works="guessing no" ;;
-          esac
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <unistd.h>
+#include <string.h>
 
 int
 main ()
 {
-char buf[20];
-      return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;
+return !*strerror (-2);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_readlink_works=yes
+  gl_cv_func_working_strerror=yes
 else
-  gl_cv_func_readlink_works=no
+  gl_cv_func_working_strerror=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-      rm -f conftest.link conftest.lnk2
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_works" >&5
-$as_echo "$gl_cv_func_readlink_works" >&6; }
-    case "$gl_cv_func_readlink_works" in
-      *yes)
-        if test "$gl_cv_decl_readlink_works" != yes; then
-          REPLACE_READLINK=1
-        fi
-        ;;
-      *)
-
-$as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
-
-        REPLACE_READLINK=1
-        ;;
-    esac
-  fi
-
-  if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-          GNULIB_READLINK=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h
-
-
-
-
-
-
-  if test $gl_cv_func_malloc_posix = yes; then
-
-$as_echo "#define HAVE_REALLOC_POSIX 1" >>confdefs.h
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+$as_echo "$gl_cv_func_working_strerror" >&6; }
+    if test $gl_cv_func_working_strerror = no; then
+                  REPLACE_STRERROR=1
+    fi
   else
-    REPLACE_REALLOC=1
-  fi
-
-  if test $REPLACE_REALLOC = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext"
-
+            REPLACE_STRERROR=1
   fi
+  if test $REPLACE_STRERROR = 1; then
 
+  ac_fn_c_check_decl "$LINENO" "strerror" "ac_cv_have_decl_strerror" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strerror" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-
-
-
-          GNULIB_REALLOC_POSIX=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
-
-
-
-
-
-
-
-
-  : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
-  RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
-  RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
-
-  if test $RELOCATABLE = yes; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext"
-
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS relocatable.$ac_objext"
-
-  fi
-
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR $ac_have_decl
+_ACEOF
 
 
   :
@@ -43654,97 +38177,52 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  if test $ac_cv_have_decl_setenv = no; then
-    HAVE_DECL_SETENV=0
-  fi
-
-
-
-
-
-  for ac_header in search.h
+  if test $ac_cv_header_sys_socket_h != yes; then
+                    for ac_header in winsock2.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
-if test "x$ac_cv_header_search_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_SEARCH_H 1
+#define HAVE_WINSOCK2_H 1
 _ACEOF
 
 fi
 
 done
 
-  for ac_func in tsearch
-do :
-  ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
-if test "x$ac_cv_func_tsearch" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TSEARCH 1
-_ACEOF
-
-fi
-done
-
+  fi
 
+  fi
 
+  # Code from module relocatable-script:
 
   relocatable_sh=$ac_aux_dir/relocatable.sh.in
 
+  # Code from module rmdir:
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rmdir works" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rmdir works" >&5
 $as_echo_n "checking whether rmdir works... " >&6; }
-if ${gl_cv_func_rmdir_works+:} false; then :
+if test "${gl_cv_func_rmdir_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   mkdir conftest.dir
      touch conftest.file
      if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                  # Guess yes on glibc systems.
-          *-gnu*) gl_cv_func_rmdir_works="guessing yes" ;;
-                  # If we don't know, assume the worst.
-          *)      gl_cv_func_rmdir_works="guessing no" ;;
-        esac
-
+  gl_cv_func_rmdir_works="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
            #include <errno.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <direct.h>
-           #endif
+           #include <unistd.h>
 
 int
 main ()
 {
-int result = 0;
-      if (!rmdir ("conftest.file/"))
-        result |= 1;
-      else if (errno != ENOTDIR)
-        result |= 2;
-      if (!rmdir ("conftest.dir/./"))
-        result |= 4;
-      return result;
-
+return !rmdir ("conftest.file/") || errno != ENOTDIR
+       || !rmdir ("conftest.dir/./");
   ;
   return 0;
 }
@@ -43762,14 +38240,8 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rmdir_works" >&5
 $as_echo "$gl_cv_func_rmdir_works" >&6; }
-  case "$gl_cv_func_rmdir_works" in
-    *yes) ;;
-    *)
-      REPLACE_RMDIR=1
-      ;;
-  esac
-
-  if test $REPLACE_RMDIR = 1; then
+  if test x"$gl_cv_func_rmdir_works" != xyes; then
+    REPLACE_RMDIR=1
 
 
 
@@ -43785,14 +38257,17 @@
 
 
 
+  GNULIB_RMDIR=1
+
 
-          GNULIB_RMDIR=1
+
+$as_echo "#define GNULIB_TEST_RMDIR 1" >>confdefs.h
 
 
 
+  # Code from module safe-read:
 
 
-$as_echo "#define GNULIB_TEST_RMDIR 1" >>confdefs.h
 
 
 
@@ -43800,18 +38275,40 @@
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS safe-read.$ac_objext"
+
+
+
+
+
+
+  # Code from module safe-write:
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS safe-write.$ac_objext"
 
 
 
 
 
+
+
+
+  # Code from module sched:
+
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <sched.h>
        struct sched_param a;
        int b[] = { SCHED_FIFO, SCHED_RR, SCHED_OTHER };
-       pid_t t1;
 
 int
 main ()
@@ -43830,6 +38327,9 @@
 
 
 
+  :
+
+
 
 
 
@@ -43840,51 +38340,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sched.h>" >&5
 $as_echo_n "checking absolute name of <sched.h>... " >&6; }
-if ${gl_cv_next_sched_h+:} false; then :
+if test "${gl_cv_next_sched_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_sched_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_sched_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sched.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sched.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sched_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_sched_h
-           gl_cv_next_sched_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sched_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sched.h#{
+                 s#.*"\(.*/sched.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sched_h='<'sched.h'>'
-             fi
-
+            gl_cv_next_sched_h='<'sched.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sched_h" >&5
@@ -43905,6 +38384,12 @@
 
 
 
+  :
+
+
+
+
+
      if test $ac_cv_header_sched_h = yes; then
        HAVE_SCHED_H=1
      else
@@ -43914,7 +38399,7 @@
 
      ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include <sched.h>
 "
-if test "x$ac_cv_type_struct_sched_param" = xyes; then :
+if test "x$ac_cv_type_struct_sched_param" = x""yes; then :
   HAVE_STRUCT_SCHED_PARAM=1
 else
   HAVE_STRUCT_SCHED_PARAM=0
@@ -43922,152 +38407,65 @@
 
 
 
-
-
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-   if test -n "$SCHED_H"; then
-  GL_GENERATE_SCHED_H_TRUE=
-  GL_GENERATE_SCHED_H_FALSE='#'
-else
-  GL_GENERATE_SCHED_H_TRUE='#'
-  GL_GENERATE_SCHED_H_FALSE=
-fi
-
-
-
-
-
-
-
-  if test $ac_cv_func_secure_getenv = no; then
-    HAVE_SECURE_GETENV=0
-  fi
-
-  if test $HAVE_SECURE_GETENV = 0; then
-
-
-
 
+  # Code from module setenv:
 
 
+  if test $HAVE_SETENV$REPLACE_SETENV != 10; then
 
 
-  gl_LIBOBJS="$gl_LIBOBJS secure_getenv.$ac_objext"
 
 
-  for ac_func in __secure_getenv
-do :
-  ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv"
-if test "x$ac_cv_func___secure_getenv" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE___SECURE_GETENV 1
-_ACEOF
 
-fi
-done
 
-  if test $ac_cv_func___secure_getenv = no; then
-    for ac_func in issetugid
-do :
-  ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid"
-if test "x$ac_cv_func_issetugid" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ISSETUGID 1
-_ACEOF
 
-fi
-done
 
-  fi
+  gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext"
 
   fi
 
 
 
 
-
-          GNULIB_SECURE_GETENV=1
+  GNULIB_SETENV=1
 
 
 
+$as_echo "#define GNULIB_TEST_SETENV 1" >>confdefs.h
 
 
-$as_echo "#define GNULIB_TEST_SECURE_GETENV 1" >>confdefs.h
 
+  # Code from module sh-quote:
+  # Code from module sigaction:
 
 
 
+  :
 
-     if test $ac_cv_func_setenv = no; then
-    HAVE_SETENV=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv validates arguments" >&5
-$as_echo_n "checking whether setenv validates arguments... " >&6; }
-if ${gl_cv_func_setenv_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_setenv_works="guessing no" ;;
-       esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-       #include <stdlib.h>
-       #include <errno.h>
-       #include <string.h>
 
-int
-main ()
-{
 
-       int result = 0;
-       {
-         if (setenv ("", "", 0) != -1)
-           result |= 1;
-         else if (errno != EINVAL)
-           result |= 2;
-       }
-       {
-         if (setenv ("a", "=", 1) != 0)
-           result |= 4;
-         else if (strcmp (getenv ("a"), "=") != 0)
-           result |= 8;
-       }
-       return result;
+  if test $ac_cv_func_sigaction = yes; then
+    ac_fn_c_check_member "$LINENO" "struct sigaction" "sa_sigaction" "ac_cv_member_struct_sigaction_sa_sigaction" "#include <signal.h>
+"
+if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = x""yes; then :
 
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_setenv_works=yes
-else
-  gl_cv_func_setenv_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_setenv_works" >&5
-$as_echo "$gl_cv_func_setenv_works" >&6; }
-    case "$gl_cv_func_setenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_SETENV=1
-        ;;
-    esac
-  fi
 
-  if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
+    if test $ac_cv_member_struct_sigaction_sa_sigaction = no; then
+      HAVE_STRUCT_SIGACTION_SA_SIGACTION=0
+    fi
+  else
+    HAVE_SIGACTION=0
 
 
 
@@ -44076,193 +38474,97 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext"
+  gl_LIBOBJS="$gl_LIBOBJS sigaction.$ac_objext"
 
-  fi
 
 
 
 
 
-          GNULIB_SETENV=1
 
+  :
 
 
 
 
-$as_echo "#define GNULIB_TEST_SETENV 1" >>confdefs.h
 
 
 
 
+  ac_fn_c_check_type "$LINENO" "siginfo_t" "ac_cv_type_siginfo_t" "
+#include <signal.h>
 
+"
+if test "x$ac_cv_type_siginfo_t" = x""yes; then :
 
-  case "$host_os" in
-            mingw*) REPLACE_SETLOCALE=1 ;;
-            cygwin*)
-      case `uname -r` in
-        1.5.*) REPLACE_SETLOCALE=1 ;;
-      esac
-      ;;
-  esac
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGINFO_T 1
+_ACEOF
 
-  if test $REPLACE_SETLOCALE = 1; then
 
+fi
 
+  if test $ac_cv_type_siginfo_t = no; then
+    HAVE_SIGINFO_T=0
+  fi
 
+  fi
 
 
 
 
+  GNULIB_SIGACTION=1
 
-  gl_LIBOBJS="$gl_LIBOBJS setlocale.$ac_objext"
 
 
-  :
+$as_echo "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h
 
-  fi
 
 
+  # Code from module signal:
 
 
 
-          GNULIB_SETLOCALE=1
 
 
 
+  :
 
 
-$as_echo "#define GNULIB_TEST_SETLOCALE 1" >>confdefs.h
 
 
 
 
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_signal_h='<'signal.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+$as_echo_n "checking absolute name of <signal.h>... " >&6; }
+if test "${gl_cv_next_signal_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  if test $ac_cv_func_sigaction = yes; then
-    ac_fn_c_check_member "$LINENO" "struct sigaction" "sa_sigaction" "ac_cv_member_struct_sigaction_sa_sigaction" "#include <signal.h>
-"
-if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = xyes; then :
+          if test $ac_cv_header_signal_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1
 _ACEOF
-
-
-fi
-
-    if test $ac_cv_member_struct_sigaction_sa_sigaction = no; then
-      HAVE_STRUCT_SIGACTION_SA_SIGACTION=0
-    fi
-  else
-    HAVE_SIGACTION=0
-  fi
-
-  if test $HAVE_SIGACTION = 0; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS sigaction.$ac_objext"
-
-
-
-
-
-
-
-  ac_fn_c_check_type "$LINENO" "siginfo_t" "ac_cv_type_siginfo_t" "
-#include <signal.h>
-
-"
-if test "x$ac_cv_type_siginfo_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGINFO_T 1
-_ACEOF
-
-
-fi
-
-  if test $ac_cv_type_siginfo_t = no; then
-    HAVE_SIGINFO_T=0
-  fi
-
-  fi
-
-
-
-
-
-          GNULIB_SIGACTION=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_signal_h='<'signal.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
-$as_echo_n "checking absolute name of <signal.h>... " >&6; }
-if ${gl_cv_next_signal_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <signal.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'signal.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_signal_h
-           gl_cv_next_signal_h='"'$gl_header'"'
-
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/signal.h#{
+                 s#.*"\(.*/signal.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_signal_h='<'signal.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
@@ -44281,15 +38583,13 @@
 
 
 
-
-
 # AIX declares sig_atomic_t to already include volatile, and C89 compilers
 # then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
   ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" "
 #include <signal.h>
 
 "
-if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes; then :
+if test "x$ac_cv_type_volatile_sig_atomic_t" = x""yes; then :
 
 else
   HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
@@ -44298,26 +38598,11 @@
 
 
 
-
-
-
-  ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" "
-#include <signal.h>
-
-"
-if test "x$ac_cv_type_sighandler_t" = xyes; then :
-
-else
-  HAVE_SIGHANDLER_T=0
-fi
-
-
-
-    for gl_func in pthread_sigmask sigaction     sigaddset sigdelset sigemptyset sigfillset sigismember     sigpending sigprocmask; do
+    for gl_func in sigaction sigaddset sigdelset sigemptyset sigfillset sigismember     sigpending sigprocmask; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -44343,7 +38628,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -44353,6 +38639,7 @@
       done
 
 
+  # Code from module sigpipe:
 
 
 
@@ -44366,25 +38653,35 @@
 
   GNULIB_SIGNAL_H_SIGPIPE=1
 
-
   GNULIB_STDIO_H_SIGPIPE=1
 
   GNULIB_UNISTD_H_SIGPIPE=1
+  # Code from module sigprocmask:
+
+
+  signals_not_posix=
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sigset_t" >/dev/null 2>&1; then :
 
+else
+  signals_not_posix=1
+fi
+rm -f conftest*
 
-  if test $gl_cv_type_sigset_t = yes; then
+  if test -z "$signals_not_posix"; then
     ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
+if test "x$ac_cv_func_sigprocmask" = x""yes; then :
   gl_cv_func_sigprocmask=1
 fi
 
   fi
   if test -z "$gl_cv_func_sigprocmask"; then
     HAVE_POSIX_SIGNALBLOCKING=0
-  fi
-
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
 
 
 
@@ -44395,16 +38692,34 @@
 
   gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext"
 
-    :
-  fi
 
 
+  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>
+"
+if test "x$ac_cv_type_sigset_t" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGSET_T 1
+_ACEOF
+
+gl_cv_type_sigset_t=yes
+else
+  gl_cv_type_sigset_t=no
+fi
+
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
+  fi
+
 
+  fi
 
 
-          GNULIB_SIGPROCMASK=1
 
 
+  GNULIB_SIGPROCMASK=1
 
 
 
@@ -44412,11 +38727,12 @@
 
 
 
+  # Code from module size_max:
 
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -44427,7 +38743,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 $as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
+if test "${gl_cv_size_max+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -44469,8 +38785,8 @@
                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
+            extern size_t foo;
+            extern unsigned long foo;
 
 int
 main ()
@@ -44507,13 +38823,14 @@
   fi
 
 
+  # Code from module snprintf:
 
 
   gl_cv_func_snprintf_usable=no
   for ac_func in snprintf
 do :
   ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
-if test "x$ac_cv_func_snprintf" = xyes; then :
+if test "x$ac_cv_func_snprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SNPRINTF 1
 _ACEOF
@@ -44524,10 +38841,9 @@
   if test $ac_cv_func_snprintf = yes; then
 
 
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
 $as_echo_n "checking whether snprintf respects a size of 1... " >&6; }
-if ${gl_cv_func_snprintf_size1+:} false; then :
+if test "${gl_cv_func_snprintf_size1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -44538,24 +38854,10 @@
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
-#endif
 int main()
 {
   static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' };
-  my_snprintf (buf, 1, "%d", 12345);
+  snprintf (buf, 1, "%d", 12345);
   return buf[1] != 'E';
 }
 _ACEOF
@@ -44575,64 +38877,7 @@
 
     case "$gl_cv_func_snprintf_size1" in
       *yes)
-
-        case "$gl_cv_func_snprintf_retval_c99" in
-          *yes)
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
-$as_echo_n "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
-if ${gl_cv_func_printf_positions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
-           netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
-                         gl_cv_func_printf_positions="guessing no";;
-           beos*)        gl_cv_func_printf_positions="guessing no";;
-           mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
-           *)            gl_cv_func_printf_positions="guessing yes";;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_printf_positions=yes
-else
-  gl_cv_func_printf_positions=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_printf_positions" >&5
-$as_echo "$gl_cv_func_printf_positions" >&6; }
-
-            case "$gl_cv_func_printf_positions" in
-              *yes)
-                gl_cv_func_snprintf_usable=yes
-                ;;
-            esac
-            ;;
-        esac
+        gl_cv_func_snprintf_usable=yes
         ;;
     esac
   fi
@@ -44656,30 +38901,28 @@
 
   fi
 
-  if test $ac_cv_have_decl_snprintf = no; then
-    HAVE_DECL_SNPRINTF=0
-  fi
-
+  :
 
 
 
 
 
-          GNULIB_SNPRINTF=1
+  if test $ac_cv_have_decl_snprintf = no; then
+    HAVE_DECL_SNPRINTF=0
+  fi
 
 
 
 
+  GNULIB_SNPRINTF=1
 
-$as_echo "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h
 
 
+$as_echo "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_SNPRINTF 1
-_ACEOF
+  # Code from module spawn:
 
 
 
@@ -44687,6 +38930,7 @@
 
 
 
+  :
 
 
 
@@ -44699,51 +38943,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <spawn.h>" >&5
 $as_echo_n "checking absolute name of <spawn.h>... " >&6; }
-if ${gl_cv_next_spawn_h+:} false; then :
+if test "${gl_cv_next_spawn_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_spawn_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_spawn_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <spawn.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'spawn.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_spawn_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_spawn_h
-           gl_cv_next_spawn_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_spawn_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/spawn.h#{
+                 s#.*"\(.*/spawn.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_spawn_h='<'spawn.h'>'
-             fi
-
+            gl_cv_next_spawn_h='<'spawn.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_spawn_h" >&5
@@ -44764,13 +38987,19 @@
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_spawn_h = yes; then
     HAVE_SPAWN_H=1
     ac_fn_c_check_type "$LINENO" "posix_spawnattr_t" "ac_cv_type_posix_spawnattr_t" "
 #include <spawn.h>
 
 "
-if test "x$ac_cv_type_posix_spawnattr_t" = xyes; then :
+if test "x$ac_cv_type_posix_spawnattr_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_POSIX_SPAWNATTR_T 1
@@ -44785,7 +39014,7 @@
 #include <spawn.h>
 
 "
-if test "x$ac_cv_type_posix_spawn_file_actions_t" = xyes; then :
+if test "x$ac_cv_type_posix_spawn_file_actions_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1
@@ -44800,11 +39029,10 @@
     HAVE_SPAWN_H=0
     HAVE_POSIX_SPAWNATTR_T=0
     HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
-  fi
-
-
 
+    :
 
+  fi
 
 
 
@@ -44816,7 +39044,7 @@
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -44842,7 +39070,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -44852,13 +39081,11 @@
       done
 
 
-
-
-
+  # Code from module ssize_t:
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 $as_echo_n "checking for ssize_t... " >&6; }
-if ${gt_cv_ssize_t+:} false; then :
+if test "${gt_cv_ssize_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -44868,7 +39095,7 @@
 main ()
 {
 int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;
+        return !x;
   ;
   return 0;
 }
@@ -44888,12 +39115,20 @@
 
   fi
 
+  # Code from module stat:
+
+
+
+
+  :
+
+
 
 
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
 $as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
-if ${gl_cv_func_stat_dir_slash+:} false; then :
+if test "${gl_cv_func_stat_dir_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -44926,9 +39161,9 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_dir_slash" >&5
 $as_echo "$gl_cv_func_stat_dir_slash" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 $as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
-if ${gl_cv_func_stat_file_slash+:} false; then :
+if test "${gl_cv_func_stat_file_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   touch conftest.tmp
@@ -44937,13 +39172,7 @@
          ln -s conftest.tmp conftest.lnk
        fi
        if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_stat_file_slash="guessing no" ;;
-          esac
-
+  gl_cv_func_stat_file_slash="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -44952,15 +39181,11 @@
 int
 main ()
 {
-int result = 0;
-      struct stat st;
-      if (!stat ("conftest.tmp/", &st))
-        result |= 1;
+struct stat st;
+      if (!stat ("conftest.tmp/", &st)) return 1;
 #if HAVE_LSTAT
-      if (!stat ("conftest.lnk/", &st))
-        result |= 2;
+      if (!stat ("conftest.lnk/", &st)) return 2;
 #endif
-      return result;
 
   ;
   return 0;
@@ -44991,7 +39216,6 @@
 $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 ;;
   esac
-
   if test $REPLACE_STAT = 1; then
 
 
@@ -45003,16 +39227,13 @@
 
   gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext"
 
-    :
-  fi
-
-
 
+  fi
 
 
-          GNULIB_STAT=1
 
 
+  GNULIB_STAT=1
 
 
 
@@ -45020,12 +39241,13 @@
 
 
 
+  # Code from module stdarg:
 
-  STDARG_H=''
-  NEXT_STDARG_H='<stdarg.h>'
+  STDARG_H='';
+  NEXT_STDARG_H='<stdarg.h>';
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
 $as_echo_n "checking for va_copy... " >&6; }
-  if ${gl_cv_func_va_copy+:} false; then :
+  if test "${gl_cv_func_va_copy+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -45076,6 +39298,10 @@
 
 
 
+  :
+
+
+
 
 
 
@@ -45085,45 +39311,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdarg.h>" >&5
 $as_echo_n "checking absolute name of <stdarg.h>... " >&6; }
-if ${gl_cv_next_stdarg_h+:} false; then :
+if test "${gl_cv_next_stdarg_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdarg_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdarg.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdarg_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdarg_h
-           gl_cv_next_stdarg_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdarg.h#{
+                 s#.*"\(.*/stdarg.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdarg_h='<'stdarg.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdarg_h" >&5
@@ -45142,7 +39353,6 @@
 
 
 
-
             if test "$gl_cv_next_stdarg_h" = '""'; then
         gl_cv_next_stdarg_h='"///usr/include/stdarg.h"'
         NEXT_STDARG_H="$gl_cv_next_stdarg_h"
@@ -45151,7 +39361,7 @@
 
   saved_as_echo_n="$as_echo_n"
   as_echo_n=':'
-  if ${gl_cv_func___va_copy+:} false; then :
+  if test "${gl_cv_func___va_copy+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -45193,16 +39403,7 @@
     fi
   fi
 
-   if test -n "$STDARG_H"; then
-  GL_GENERATE_STDARG_H_TRUE=
-  GL_GENERATE_STDARG_H_FALSE='#'
-else
-  GL_GENERATE_STDARG_H_TRUE='#'
-  GL_GENERATE_STDARG_H_FALSE=
-fi
-
-
-
+  # Code from module stdbool:
 
 
 
@@ -45214,14 +39415,6 @@
     STDBOOL_H='stdbool.h'
   fi
 
-   if test -n "$STDBOOL_H"; then
-  GL_GENERATE_STDBOOL_H_TRUE=
-  GL_GENERATE_STDBOOL_H_FALSE='#'
-else
-  GL_GENERATE_STDBOOL_H_TRUE='#'
-  GL_GENERATE_STDBOOL_H_FALSE=
-fi
-
 
   if test "$ac_cv_type__Bool" = yes; then
     HAVE__BOOL=1
@@ -45230,17 +39423,17 @@
   fi
 
 
+  # Code from module stddef:
 
 
 
-  STDDEF_H=
   if test $gt_cv_c_wchar_t = no; then
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+if test "${gl_cv_decl_null_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -45269,17 +39462,12 @@
     REPLACE_NULL=1
     STDDEF_H=stddef.h
   fi
+  if test -n "$STDDEF_H"; then
+
 
-   if test -n "$STDDEF_H"; then
-  GL_GENERATE_STDDEF_H_TRUE=
-  GL_GENERATE_STDDEF_H_FALSE='#'
-else
-  GL_GENERATE_STDDEF_H_TRUE='#'
-  GL_GENERATE_STDDEF_H_FALSE=
-fi
 
-  if test -n "$STDDEF_H"; then
 
+  :
 
 
 
@@ -45292,45 +39480,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 $as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
+if test "${gl_cv_next_stddef_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stddef_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stddef.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stddef_h
-           gl_cv_next_stddef_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stddef.h#{
+                 s#.*"\(.*/stddef.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stddef_h='<'stddef.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
@@ -45349,692 +39522,998 @@
 
 
 
+  fi
+
+  # Code from module stdint:
+
+
+
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
+
 
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
   fi
 
 
+      if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
 
 
+      if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
 
 
 
 
 
 
+  :
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdio_h='<'stdio.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
-$as_echo_n "checking absolute name of <stdio.h>... " >&6; }
-if ${gl_cv_next_stdio_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdio.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdint_h='<'stdint.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if test "${gl_cv_next_stdint_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-           gl_header=$gl_cv_absolute_stdio_h
-           gl_cv_next_stdio_h='"'$gl_header'"'
+          if test $ac_cv_header_stdint_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdint.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdint.h#{
+                 s#.*"\(.*/stdint.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdint_h='<'stdint.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
-$as_echo "$gl_cv_next_stdio_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
      fi
-     NEXT_STDIO_H=$gl_cv_next_stdio_h
+     NEXT_STDINT_H=$gl_cv_next_stdint_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdio.h'>'
+       gl_next_as_first_directive='<'stdint.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdio_h
+       gl_next_as_first_directive=$gl_cv_next_stdint_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_STDIO_H=$gl_next_as_first_directive
-
-
-
-
-
-      GNULIB_FSCANF=1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_FSCANF 1
-_ACEOF
-
-
-  GNULIB_SCANF=1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_SCANF 1
-_ACEOF
-
-
-  GNULIB_FGETC=1
-  GNULIB_GETC=1
-  GNULIB_GETCHAR=1
-  GNULIB_FGETS=1
-  GNULIB_FREAD=1
-
-
-      GNULIB_FPRINTF=1
-  GNULIB_PRINTF=1
-  GNULIB_VFPRINTF=1
-  GNULIB_VPRINTF=1
-  GNULIB_FPUTC=1
-  GNULIB_PUTC=1
-  GNULIB_PUTCHAR=1
-  GNULIB_FPUTS=1
-  GNULIB_PUTS=1
-  GNULIB_FWRITE=1
-
-
-
-
-    if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-      REPLACE_STDIO_WRITE_FUNCS=1
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS stdio-write.$ac_objext"
+     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
 
-    fi
 
 
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
 
 
-    for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen     renameat snprintf tmpfile vdprintf vsnprintf; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+    if test $ac_cv_header_stdint_h = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if test "${gl_cv_header_working_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gl_cv_header_working_stdint_h=no
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
-
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
-
-
 
 
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
 
 
+  /* 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
 
 
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
 
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
 
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdlib_h='<'stdlib.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
-$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if ${gl_cv_next_stdlib_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+                                                    if test "$cross_compiling" = yes; then :
+                 gl_cv_header_working_stdint_h=yes
 
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdlib.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdlib_h
-           gl_cv_next_stdlib_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-$as_echo "$gl_cv_next_stdlib_h" >&6; }
-     fi
-     NEXT_STDLIB_H=$gl_cv_next_stdlib_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdlib.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdlib_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive
 
 
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#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
 
 
-    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#if HAVE_SYS_LOADAVG_H
-# include <sys/loadavg.h>
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
 #endif
-#if HAVE_RANDOM_H
-# include <random.h>
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
 #endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
 
 int
 main ()
 {
-#undef $gl_func
-  (void) $gl_func;
+
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return 1;
+    }
+  return 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_header_working_stdint_h=yes
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-      done
-
-
-
-
-
 
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  for ac_func in stpcpy
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
+  fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
+            for ac_header in sys/inttypes.h sys/bitypes.h
 do :
-  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
-if test "x$ac_cv_func_stpcpy" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STPCPY 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
-done
-
-  if test $ac_cv_func_stpcpy = no; then
-    HAVE_STPCPY=0
-  fi
-
-  if test $HAVE_STPCPY = 0; then
 
+done
 
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
 
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
 
 
 
+  :
 
 
-  gl_LIBOBJS="$gl_LIBOBJS stpcpy.$ac_objext"
 
 
-  :
 
-  fi
 
 
 
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
-          GNULIB_STPCPY=1
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* 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
 
+#include <limits.h>"; then :
 
+else
+  result=unknown
+fi
 
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
-$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
 
+  fi
 
 
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* 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
 
+#include <limits.h>"; then :
 
+else
+  result=unknown
+fi
 
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
 
 
 
-  if test $ac_cv_func_stpncpy = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working stpncpy" >&5
-$as_echo_n "checking for working stpncpy... " >&6; }
-if ${gl_cv_func_stpncpy+:} false; then :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+$as_echo_n "checking whether $gltype is signed... " >&6; }
+if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-
-      if test "$cross_compiling" = yes; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <features.h>
-#ifdef __GNU_LIBRARY__
-  Thanks for using GNU
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Thanks for using GNU" >/dev/null 2>&1; then :
-  gl_cv_func_stpncpy="guessing yes"
-else
-  gl_cv_func_stpncpy="guessing no"
-fi
-rm -f conftest*
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.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
 
-#include <stdlib.h>
-#include <string.h> /* for strcpy */
-/* The stpncpy prototype is missing in <string.h> on AIX 4.  */
-#if !HAVE_DECL_STPNCPY
-extern
-# ifdef __cplusplus
-"C"
-# endif
-char *stpncpy (char *dest, const char *src, size_t n);
-#endif
-int main ()
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
+int
+main ()
 {
-  int result = 0;
-  const char *src = "Hello";
-  char dest[10];
-  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+1 here.  */
-  {
-    strcpy (dest, "\377\377\377\377\377\377");
-    if (stpncpy (dest, src, 2) != dest + 2)
-      result |= 1;
-  }
-  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+4 here.  */
-  {
-    strcpy (dest, "\377\377\377\377\377\377");
-    if (stpncpy (dest, src, 5) != dest + 5)
-      result |= 2;
-  }
-  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+6 here.  */
-  {
-    strcpy (dest, "\377\377\377\377\377\377");
-    if (stpncpy (dest, src, 7) != dest + 5)
-      result |= 4;
-  }
-  return result;
-}
 
+  ;
+  return 0;
+}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_stpncpy=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  result=yes
 else
-  gl_cv_func_stpncpy=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  result=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       eval gl_cv_type_${gltype}_signed=\$result
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stpncpy" >&5
-$as_echo "$gl_cv_func_stpncpy" >&6; }
-    case "$gl_cv_func_stpncpy" in
-      *yes)
+eval ac_res=\$gl_cv_type_${gltype}_signed
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
-$as_echo "#define HAVE_STPNCPY 1" >>confdefs.h
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
 
-        ;;
-      *)
-        REPLACE_STPNCPY=1
-        ;;
-    esac
-  else
-    HAVE_STPNCPY=0
-  fi
 
-  if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.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
 
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
+fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
+  done
 
 
-  gl_LIBOBJS="$gl_LIBOBJS stpncpy.$ac_objext"
+  fi
 
 
-  :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  fi
+  /* 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
+
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
+fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
+
+  done
 
 
 
+    STDINT_H=stdint.h
+  fi
 
 
-          GNULIB_STPNCPY=1
+  # Code from module stdio:
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h
 
 
 
+  :
 
 
 
 
-  for ac_func in strchrnul
-do :
-  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
-if test "x$ac_cv_func_strchrnul" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRCHRNUL 1
-_ACEOF
 
-fi
-done
 
-  if test $ac_cv_func_strchrnul = no; then
-    HAVE_STRCHRNUL=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
-$as_echo_n "checking whether strchrnul works... " >&6; }
-if ${gl_cv_func_strchrnul_works+:} false; then :
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdio_h='<'stdio.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+$as_echo_n "checking absolute name of <stdio.h>... " >&6; }
+if test "${gl_cv_next_stdio_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#if defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 9)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
+          if test $ac_cv_header_stdio_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strchrnul_works="guessing yes"
-else
-  gl_cv_func_strchrnul_works="guessing no"
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdio.h#{
+                 s#.*"\(.*/stdio.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdio_h='<'stdio.h'>'
+          fi
+
 fi
-rm -f conftest*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+$as_echo "$gl_cv_next_stdio_h" >&6; }
+     fi
+     NEXT_STDIO_H=$gl_cv_next_stdio_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdio.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdio_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDIO_H=$gl_next_as_first_directive
+
+
+
+      GNULIB_FPRINTF=1
+  GNULIB_PRINTF=1
+  GNULIB_VFPRINTF=1
+  GNULIB_VPRINTF=1
+  GNULIB_FPUTC=1
+  GNULIB_PUTC=1
+  GNULIB_PUTCHAR=1
+  GNULIB_FPUTS=1
+  GNULIB_PUTS=1
+  GNULIB_FWRITE=1
+
+
+
+
+    if test $gl_cv_header_signal_h_SIGPIPE != yes; then
+      REPLACE_STDIO_WRITE_FUNCS=1
+
+
+
+
 
 
+
+
+  gl_LIBOBJS="$gl_LIBOBJS stdio-write.$ac_objext"
+
+    fi
+
+
+
+    for gl_func in dprintf fpurge fseeko ftello getdelim getline popen renameat     snprintf tmpfile vdprintf vsnprintf; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <string.h> /* for strchrnul */
+#include <stdio.h>
 
 int
 main ()
 {
-const char *buf = "a";
-      return strchrnul (buf, 'b') != buf + 1;
-
+#undef $gl_func
+  (void) $gl_func;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strchrnul_works=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
 else
-  gl_cv_func_strchrnul_works=no
+  eval "$as_gl_Symbol=no"
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
 
-
+                     eval ac_cv_have_decl_$gl_func=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5
-$as_echo "$gl_cv_func_strchrnul_works" >&6; }
-    case "$gl_cv_func_strchrnul_works" in
-      *yes) ;;
-      *) REPLACE_STRCHRNUL=1 ;;
-    esac
-  fi
-
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-
+      done
 
 
+  # Code from module stdlib:
 
 
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strchrnul.$ac_objext"
 
-    :
-  fi
+  :
 
 
 
 
 
-          GNULIB_STRCHRNUL=1
 
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdlib_h='<'stdlib.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
+if test "${gl_cv_next_stdlib_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+          if test $ac_cv_header_stdlib_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdlib.h#{
+                 s#.*"\(.*/stdlib.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdlib_h='<'stdlib.h'>'
+          fi
 
-$as_echo "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+$as_echo "$gl_cv_next_stdlib_h" >&6; }
+     fi
+     NEXT_STDLIB_H=$gl_cv_next_stdlib_h
 
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdlib.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdlib_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive
 
 
 
-  for ac_func in strcspn
+  for ac_header in random.h
 do :
-  ac_fn_c_check_func "$LINENO" "strcspn" "ac_cv_func_strcspn"
-if test "x$ac_cv_func_strcspn" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "random.h" "ac_cv_header_random_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_random_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STRCSPN 1
+#define HAVE_RANDOM_H 1
 _ACEOF
 
 fi
-done
-
-
-  if test $ac_cv_func_strcspn = no; then
-
-
-
-
 
+done
 
+  if test $ac_cv_header_random_h = yes; then
+    HAVE_RANDOM_H=1
+  else
+    HAVE_RANDOM_H=0
+  fi
 
+  ac_fn_c_check_type "$LINENO" "struct random_data" "ac_cv_type_struct_random_data" "#include <stdlib.h>
+      #if HAVE_RANDOM_H
+      # include <random.h>
+      #endif
 
-  gl_LIBOBJS="$gl_LIBOBJS strcspn.$ac_objext"
+"
+if test "x$ac_cv_type_struct_random_data" = x""yes; then :
 
-    :
-  fi
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RANDOM_DATA 1
+_ACEOF
 
 
+else
+  HAVE_STRUCT_RANDOM_DATA=0
+fi
 
 
 
-  if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
-$as_echo_n "checking for working strerror function... " >&6; }
-if ${gl_cv_func_working_strerror+:} false; then :
+    for gl_func in atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp     mkostemp mkostemps mkstemp mkstemps ptsname random_r initstat_r srandom_r     setstate_r realpath rpmatch setenv strtod strtoll strtoull unlockpt     unsetenv; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_working_strerror="guessing no" ;;
-         esac
-
-else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
+#include <stdlib.h>
+#if HAVE_SYS_LOADAVG_H
+# include <sys/loadavg.h>
+#endif
+#if HAVE_RANDOM_H
+# include <random.h>
+#endif
 
 int
 main ()
 {
-if (!*strerror (-2)) return 1;
+#undef $gl_func
+  (void) $gl_func;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_working_strerror=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
 else
-  gl_cv_func_working_strerror=no
+  eval "$as_gl_Symbol=no"
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
 
-
+                     eval ac_cv_have_decl_$gl_func=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
-$as_echo "$gl_cv_func_working_strerror" >&6; }
-    case "$gl_cv_func_working_strerror" in
-      *yes) ;;
-      *)
-                        REPLACE_STRERROR=1
-        ;;
-    esac
-
-  else
-            REPLACE_STRERROR=1
-  fi
-
-  if test $REPLACE_STRERROR = 1; then
-
-
-
-
+      done
 
 
+  # Code from module stpcpy:
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext"
 
-  fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_STRERROR 1
-_ACEOF
 
 
 
@@ -46042,137 +40521,144 @@
 
 
 
-          GNULIB_STRERROR=1
 
 
+  for ac_func in stpcpy
+do :
+  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
+if test "x$ac_cv_func_stpcpy" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STPCPY 1
+_ACEOF
 
+else
 
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
-$as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
+fi
+done
 
 
+  if test $ac_cv_func_stpcpy = no; then
+    HAVE_STPCPY=0
 
+  :
 
+  fi
 
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
 
 
 
+  GNULIB_STPCPY=1
 
 
 
+$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strerror-override.$ac_objext"
 
+  # Code from module stpncpy:
 
 
 
 
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
 
-fi
 
-done
 
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
 
 
-  fi
-  if test $gl_cond_libtool = false; then
-    gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
-    gl_libdeps="$gl_libdeps $LIBICONV"
-  fi
-  if test $gl_cond_libtool = false; then
-    gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
-    gl_libdeps="$gl_libdeps $LIBICONV"
-  fi
+  :
 
 
 
 
 
+  if test $ac_cv_func_stpncpy = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working stpncpy" >&5
+$as_echo_n "checking for working stpncpy... " >&6; }
+if test "${gl_cv_func_stpncpy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+      if test "$cross_compiling" = yes; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+  Thanks for using GNU
+#endif
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Thanks for using GNU" >/dev/null 2>&1; then :
+  gl_cv_func_stpncpy=yes
+else
+  gl_cv_func_stpncpy=no
+fi
+rm -f conftest*
 
-  if test $ac_cv_have_decl_strnlen = no; then
-    HAVE_DECL_STRNLEN=0
-  else
 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
-$as_echo_n "checking for working strnlen... " >&6; }
-if ${ac_cv_func_strnlen_working+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on AIX systems, yes otherwise.
-		case "$host_os" in
-		  aix*) ac_cv_func_strnlen_working=no;;
-		  *)    ac_cv_func_strnlen_working=yes;;
-		esac
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-#define S "foobar"
-#define S_LEN (sizeof S - 1)
-
-  /* At least one implementation is buggy: that of AIX 4.3 would
-     give strnlen (S, 1) == 3.  */
-
-  int i;
-  for (i = 0; i < S_LEN + 1; ++i)
-    {
-      int expected = i <= S_LEN ? i : S_LEN;
-      if (strnlen (S, i) != expected)
-	return 1;
-    }
-  return 0;
 
-  ;
-  return 0;
+#include <stdlib.h>
+#include <string.h> /* for strcpy */
+/* The stpncpy prototype is missing in <string.h> on AIX 4.  */
+extern char *stpncpy (char *dest, const char *src, size_t n);
+int main () {
+  const char *src = "Hello";
+  char dest[10];
+  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+1 here.  */
+  strcpy (dest, "\377\377\377\377\377\377");
+  if (stpncpy (dest, src, 2) != dest + 2) exit(1);
+  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+4 here.  */
+  strcpy (dest, "\377\377\377\377\377\377");
+  if (stpncpy (dest, src, 5) != dest + 5) exit(1);
+  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+6 here.  */
+  strcpy (dest, "\377\377\377\377\377\377");
+  if (stpncpy (dest, src, 7) != dest + 5) exit(1);
+  exit(0);
 }
+
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_strnlen_working=yes
+  gl_cv_func_stpncpy=yes
 else
-  ac_cv_func_strnlen_working=no
+  gl_cv_func_stpncpy=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: $ac_cv_func_strnlen_working" >&5
-$as_echo "$ac_cv_func_strnlen_working" >&6; }
-test $ac_cv_func_strnlen_working = no && :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stpncpy" >&5
+$as_echo "$gl_cv_func_stpncpy" >&6; }
+    if test $gl_cv_func_stpncpy = yes; then
 
+$as_echo "#define HAVE_STPNCPY 1" >>confdefs.h
+
+    else
+      REPLACE_STPNCPY=1
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS stpncpy.$ac_objext"
+
+
+  :
 
-    if test $ac_cv_func_strnlen_working = no; then
-      REPLACE_STRNLEN=1
     fi
-  fi
+  else
+    HAVE_STPNCPY=0
 
-  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
 
 
 
@@ -46180,94 +40666,315 @@
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS stpncpy.$ac_objext"
 
-  gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext"
 
-    :
+  :
+
   fi
 
 
 
 
+  GNULIB_STPNCPY=1
 
-          GNULIB_STRNLEN=1
 
 
+$as_echo "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
+  # Code from module strchrnul:
 
 
 
 
 
-  for ac_func in strpbrk
+
+
+
+
+
+
+
+  for ac_func in strchrnul
 do :
-  ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
-if test "x$ac_cv_func_strpbrk" = xyes; then :
+  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
+if test "x$ac_cv_func_strchrnul" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STRPBRK 1
+#define HAVE_STRCHRNUL 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
-  if test $ac_cv_func_strpbrk = no; then
-    HAVE_STRPBRK=0
+
+  if test $ac_cv_func_strchrnul = no; then
+    HAVE_STRCHRNUL=0
+    :
   fi
 
-  if test $HAVE_STRPBRK = 0; then
 
 
 
+  GNULIB_STRCHRNUL=1
 
 
 
+$as_echo "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strpbrk.$ac_objext"
 
-    :
-  fi
+  # Code from module strcspn:
 
 
 
 
 
-          GNULIB_STRPBRK=1
 
 
 
 
+  for ac_func in strcspn
+do :
+  ac_fn_c_check_func "$LINENO" "strcspn" "ac_cv_func_strcspn"
+if test "x$ac_cv_func_strcspn" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRCSPN 1
+_ACEOF
 
-$as_echo "#define GNULIB_TEST_STRPBRK 1" >>confdefs.h
+else
 
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
+fi
+done
 
 
+  if test $ac_cv_func_strcspn = no; then
+    :
+  fi
 
-  if test $REPLACE_STRSTR = 0; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works in linear time" >&5
-$as_echo_n "checking whether strstr works in linear time... " >&6; }
-if ${gl_cv_func_strstr_linear+:} false; then :
+  # Code from module streq:
+  # Code from module strerror:
+
+
+  if test $REPLACE_STRERROR = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext"
+
+
+cat >>confdefs.h <<_ACEOF
+#define REPLACE_STRERROR $REPLACE_STRERROR
+_ACEOF
+
+  fi
+
+
+
+
+  GNULIB_STRERROR=1
+
+
+
+$as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
+
+
+
+  # Code from module striconv:
+  if test $gl_cond_libtool = false; then
+    gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
+    gl_libdeps="$gl_libdeps $LIBICONV"
+  fi
+  # Code from module striconveh:
+  if test $gl_cond_libtool = false; then
+    gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
+    gl_libdeps="$gl_libdeps $LIBICONV"
+  fi
+  # Code from module striconveha:
+  # Code from module string:
+
+
+
+  # Code from module strnlen:
+
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_have_decl_strnlen = no; then
+    HAVE_DECL_STRNLEN=0
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+$as_echo_n "checking for working strnlen... " >&6; }
+if test "${ac_cv_func_strnlen_working+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_strnlen_working=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+#define S "foobar"
+#define S_LEN (sizeof S - 1)
+
+  /* At least one implementation is buggy: that of AIX 4.3 would
+     give strnlen (S, 1) == 3.  */
+
+  int i;
+  for (i = 0; i < S_LEN + 1; ++i)
+    {
+      int expected = i <= S_LEN ? i : S_LEN;
+      if (strnlen (S, i) != expected)
+	return 1;
+    }
+  return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_strnlen_working=yes
+else
+  ac_cv_func_strnlen_working=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: $ac_cv_func_strnlen_working" >&5
+$as_echo "$ac_cv_func_strnlen_working" >&6; }
+test $ac_cv_func_strnlen_working = no &&
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext"
+
+
+        if test $ac_cv_func_strnlen_working = no; then
+      REPLACE_STRNLEN=1
+    fi
+  fi
+  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext"
+
+    :
+  fi
+
+
+
+
+  GNULIB_STRNLEN=1
+
+
+
+$as_echo "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
+
+
+
+  # Code from module strnlen1:
+  # Code from module strpbrk:
+
+
+
+
+
+
+
+
+
+
+  for ac_func in strpbrk
+do :
+  ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
+if test "x$ac_cv_func_strpbrk" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRPBRK 1
+_ACEOF
+
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+fi
+done
+
+
+  if test $ac_cv_func_strpbrk = no; then
+    HAVE_STRPBRK=0
+    :
+  fi
+
+
+
+
+  GNULIB_STRPBRK=1
+
+
+
+$as_echo "#define GNULIB_TEST_STRPBRK 1" >>confdefs.h
+
+
+
+  # Code from module strstr:
+
+
+  if test $REPLACE_STRSTR = 0; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works in linear time" >&5
+$as_echo_n "checking whether strstr works in linear time... " >&6; }
+if test "${gl_cv_func_strstr_linear+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-                             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     && !(defined __i386__ || defined __x86_64__) \
-     && !defined __UCLIBC__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2)
   Lucky user
  #endif
 #endif
 #ifdef __CYGWIN__
  #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
+ #if CYGWIN_VERSION_DLL_MAJOR >= 1007
   Lucky user
  #endif
 #endif
@@ -46275,7 +40982,7 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strstr_linear="guessing yes"
+  gl_cv_func_strstr_linear=yes
 else
   gl_cv_func_strstr_linear="guessing no"
 fi
@@ -46287,22 +40994,20 @@
 /* end confdefs.h.  */
 
 #include <signal.h> /* for signal */
-#include <string.h> /* for strstr */
+#include <string.h> /* for memmem */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
 
 int
 main ()
 {
-
-    int result = 0;
-    size_t m = 1000000;
+size_t m = 1000000;
     char *haystack = (char *) malloc (2 * m + 2);
     char *needle = (char *) malloc (m + 2);
+    void *result = 0;
     /* Failure to compile this test due to missing alarm is okay,
        since all such platforms (mingw) also have quadratic strstr.  */
-    signal (SIGALRM, quit);
+    signal (SIGALRM, SIG_DFL);
     alarm (5);
     /* Check for quadratic performance.  */
     if (haystack && needle)
@@ -46313,11 +41018,9 @@
         memset (needle, 'A', m);
         needle[m] = 'B';
         needle[m + 1] = 0;
-        if (!strstr (haystack, needle))
-          result |= 1;
+        result = strstr (haystack, needle);
       }
-    return result;
-
+    return !result;
   ;
   return 0;
 }
@@ -46335,14 +41038,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strstr_linear" >&5
 $as_echo "$gl_cv_func_strstr_linear" >&6; }
-    case "$gl_cv_func_strstr_linear" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
+    if test "$gl_cv_func_strstr_linear" != yes; then
+      REPLACE_STRSTR=1
+    fi
   fi
-
   if test $REPLACE_STRSTR = 1; then
 
 
@@ -46356,108 +41055,41 @@
 
   fi
 
+  # Code from module strstr-simple:
+
 
 
   if test "$gl_cv_func_memchr_works" != yes; then
     REPLACE_STRSTR=1
-  else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5
-$as_echo_n "checking whether strstr works... " >&6; }
-if ${gl_cv_func_strstr_works_always+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-                                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#ifdef __GNU_LIBRARY__
- #include <features.h>
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     || defined __UCLIBC__
-  Lucky user
- #endif
-#elif defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strstr_works_always="guessing yes"
-else
-  gl_cv_func_strstr_works_always="guessing no"
-fi
-rm -f conftest*
 
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <string.h> /* for strstr */
-#define P "_EF_BF_BD"
-#define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P
-#define NEEDLE P P P P P
 
-int
-main ()
-{
-return !!strstr (HAYSTACK, NEEDLE);
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strstr_works_always=yes
-else
-  gl_cv_func_strstr_works_always=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
+  gl_LIBOBJS="$gl_LIBOBJS strstr.$ac_objext"
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strstr_works_always" >&5
-$as_echo "$gl_cv_func_strstr_works_always" >&6; }
-    case "$gl_cv_func_strstr_works_always" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
   fi
 
-  if test $REPLACE_STRSTR = 1; then
-
-
-
 
 
 
+  GNULIB_STRSTR=1
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strstr.$ac_objext"
-
-  fi
-
 
+$as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h
 
 
 
-          GNULIB_STRSTR=1
+  # Code from module strtol:
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h
 
 
 
@@ -46465,17 +41097,21 @@
   for ac_func in strtol
 do :
   ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
-if test "x$ac_cv_func_strtol" = xyes; then :
+if test "x$ac_cv_func_strtol" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOL 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
 
-  if test $ac_cv_func_strtol = no; then
 
+  # Code from module strtoul:
 
 
 
@@ -46483,40 +41119,33 @@
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strtol.$ac_objext"
 
-  fi
 
   for ac_func in strtoul
 do :
   ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
-if test "x$ac_cv_func_strtoul" = xyes; then :
+if test "x$ac_cv_func_strtoul" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOUL 1
 _ACEOF
 
-fi
-done
-
-
-  if test $ac_cv_func_strtoul = no; then
-
-
-
-
+else
 
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
+fi
+done
 
 
-  gl_LIBOBJS="$gl_LIBOBJS strtoul.$ac_objext"
 
-  fi
+  # Code from module styled-ostream:
+  # Code from module sys_select:
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/select.h> is self-contained" >&5
 $as_echo_n "checking whether <sys/select.h> is self-contained... " >&6; }
-if ${gl_cv_header_sys_select_h_selfcontained+:} false; then :
+if test "${gl_cv_header_sys_select_h_selfcontained+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -46560,18 +41189,10 @@
 
                   #undef memset
                   #define memset nonexistent_memset
-                  extern
-                  #ifdef __cplusplus
-                  "C"
-                  #endif
-                  void *memset (void *, int, unsigned long);
+                  extern void *memset (void *, int, unsigned long);
                   #undef bzero
                   #define bzero nonexistent_bzero
-                  extern
-                  #ifdef __cplusplus
-                  "C"
-                  #endif
-                  void bzero (void *, unsigned long);
+                  extern void bzero (void *, unsigned long);
                   fd_set fds;
                   FD_ZERO (&fds);
 
@@ -46596,12 +41217,22 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_select_h_selfcontained" >&5
 $as_echo "$gl_cv_header_sys_select_h_selfcontained" >&6; }
 
+  :
+
+
+
 
 
 
 
 
 
+  :
+
+
+
+
+
 
 
      if test $gl_cv_have_include_next = yes; then
@@ -46609,51 +41240,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/select.h>" >&5
 $as_echo_n "checking absolute name of <sys/select.h>... " >&6; }
-if ${gl_cv_next_sys_select_h+:} false; then :
+if test "${gl_cv_next_sys_select_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_sys_select_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_sys_select_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/select.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/select.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sys_select_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_sys_select_h
-           gl_cv_next_sys_select_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_select_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/select.h#{
+                 s#.*"\(.*/sys/select.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sys_select_h='<'sys/select.h'>'
-             fi
-
+            gl_cv_next_sys_select_h='<'sys/select.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_select_h" >&5
@@ -46672,7 +41282,6 @@
 
 
 
-
   if test $ac_cv_header_sys_select_h = yes; then
     HAVE_SYS_SELECT_H=1
   else
@@ -46683,11 +41292,17 @@
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_sys_socket_h != yes; then
                     for ac_header in winsock2.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
+if test "x$ac_cv_header_winsock2_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_WINSOCK2_H 1
 _ACEOF
@@ -46708,11 +41323,11 @@
 
 
 
-    for gl_func in pselect select; do
+    for gl_func in select; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -46720,7 +41335,7 @@
 
 /* Some systems require prerequisite headers.  */
 #include <sys/types.h>
-#if !(defined __GLIBC__ && !defined __UCLIBC__) && HAVE_SYS_TIME_H
+#if !defined __GLIBC__ && HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 #include <sys/select.h>
@@ -46744,7 +41359,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -46755,125 +41371,270 @@
 
 
 
+  # Code from module sys_socket:
 
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> is self-contained" >&5
+$as_echo_n "checking whether <sys/socket.h> is self-contained... " >&6; }
+if test "${gl_cv_header_sys_socket_h_selfcontained+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/socket.h>
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_sys_socket_h_selfcontained=yes
+else
+  gl_cv_header_sys_socket_h_selfcontained=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_sys_socket_h_selfcontained" >&5
+$as_echo "$gl_cv_header_sys_socket_h_selfcontained" >&6; }
+  if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
+            for ac_func in shutdown
+do :
+  ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
+if test "x$ac_cv_func_shutdown" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SHUTDOWN 1
+_ACEOF
 
+fi
+done
 
+    if test $ac_cv_func_shutdown = yes; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> defines the SHUT_* macros" >&5
+$as_echo_n "checking whether <sys/socket.h> defines the SHUT_* macros... " >&6; }
+if test "${gl_cv_header_sys_socket_h_shut+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/socket.h>
+int
+main ()
+{
+int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_sys_socket_h_shut=yes
+else
+  gl_cv_header_sys_socket_h_shut=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_sys_socket_h_shut" >&5
+$as_echo "$gl_cv_header_sys_socket_h_shut" >&6; }
+      if test $gl_cv_header_sys_socket_h_shut = no; then
+        SYS_SOCKET_H='sys/socket.h'
+      fi
+    fi
+  fi
+  # We need to check for ws2tcpip.h now.
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_stat_h='<'sys/stat.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
-$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
-if ${gl_cv_next_sys_stat_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-             if test $ac_cv_header_sys_stat_h = yes; then
 
+  :
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
 
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/stat.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_sys_stat_h
-           gl_cv_next_sys_stat_h='"'$gl_header'"'
-          else
-               gl_cv_next_sys_stat_h='<'sys/stat.h'>'
-             fi
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_socket_h='<'sys/socket.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/socket.h>" >&5
+$as_echo_n "checking absolute name of <sys/socket.h>... " >&6; }
+if test "${gl_cv_next_sys_socket_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_sys_socket_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/socket.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_socket_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/socket.h#{
+                 s#.*"\(.*/sys/socket.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_sys_socket_h='<'sys/socket.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-$as_echo "$gl_cv_next_sys_stat_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_socket_h" >&5
+$as_echo "$gl_cv_next_sys_socket_h" >&6; }
      fi
-     NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
+     NEXT_SYS_SOCKET_H=$gl_cv_next_sys_socket_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/stat.h'>'
+       gl_next_as_first_directive='<'sys/socket.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_stat_h
+       gl_next_as_first_directive=$gl_cv_next_sys_socket_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive
+     NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H=$gl_next_as_first_directive
+
+
+
+  if test $ac_cv_header_sys_socket_h = yes; then
+    HAVE_SYS_SOCKET_H=1
+    HAVE_WS2TCPIP_H=0
+  else
+    HAVE_SYS_SOCKET_H=0
+                    for ac_header in ws2tcpip.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WS2TCPIP_H 1
+_ACEOF
+
+fi
+
+done
 
+    if test $ac_cv_header_ws2tcpip_h = yes; then
+      HAVE_WS2TCPIP_H=1
+    else
+      HAVE_WS2TCPIP_H=0
+    fi
+  fi
 
 
 
+  ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
 
+"
+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+_ACEOF
 
 
+fi
+ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
 
+"
+if test "x$ac_cv_type_sa_family_t" = x""yes; then :
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SA_FAMILY_T 1
+_ACEOF
 
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
 
-$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h
+fi
 
+  if test $ac_cv_type_struct_sockaddr_storage = no; then
+    HAVE_STRUCT_SOCKADDR_STORAGE=0
+  fi
+  if test $ac_cv_type_sa_family_t = no; then
+    HAVE_SA_FAMILY_T=0
   fi
 
-      ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
-     #include <sys/stat.h>
-"
-if test "x$ac_cv_type_nlink_t" = xyes; then :
 
-else
 
-$as_echo "#define nlink_t int" >>confdefs.h
+
+  :
+
+
+
+
+
+  if test $ac_cv_header_sys_socket_h != yes; then
+                    for ac_header in winsock2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WINSOCK2_H 1
+_ACEOF
 
 fi
 
+done
+
+  fi
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    HAVE_WINSOCK2_H=1
+    UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
+  else
+    HAVE_WINSOCK2_H=0
+  fi
+
+
 
 
-    for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
+    for gl_func in socket connect accept bind getpeername getsockname getsockopt     listen recv send recvfrom sendto setsockopt shutdown accept4; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/stat.h>
+
+/* Some systems require prerequisite headers.  */
+#include <sys/types.h>
+#if !defined __GLIBC__ && HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/select.h>
 
 int
 main ()
@@ -46894,7 +41655,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -46905,6 +41667,7 @@
 
 
 
+  # Code from module sys_stat:
 
 
 
@@ -46916,6 +41679,7 @@
 
 
 
+  :
 
 
 
@@ -46924,88 +41688,77 @@
 
 
      if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_wait_h='<'sys/wait.h'>'
+       gl_cv_next_sys_stat_h='<'sys/stat.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/wait.h>" >&5
-$as_echo_n "checking absolute name of <sys/wait.h>... " >&6; }
-if ${gl_cv_next_sys_wait_h+:} false; then :
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
+if test "${gl_cv_next_sys_stat_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_sys_wait_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_sys_stat_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/wait.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/wait.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_sys_wait_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+#include <sys/stat.h>
 
-           gl_header=$gl_cv_absolute_sys_wait_h
-           gl_cv_next_sys_wait_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/stat.h#{
+                 s#.*"\(.*/sys/stat.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sys_wait_h='<'sys/wait.h'>'
-             fi
-
+            gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_wait_h" >&5
-$as_echo "$gl_cv_next_sys_wait_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+$as_echo "$gl_cv_next_sys_stat_h" >&6; }
      fi
-     NEXT_SYS_WAIT_H=$gl_cv_next_sys_wait_h
+     NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/wait.h'>'
+       gl_next_as_first_directive='<'sys/stat.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_wait_h
+       gl_next_as_first_directive=$gl_cv_next_sys_stat_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H=$gl_next_as_first_directive
+     NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive
 
 
 
 
+      ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
+     #include <sys/stat.h>
+"
+if test "x$ac_cv_type_nlink_t" = x""yes; then :
+
+else
+
+$as_echo "#define nlink_t int" >>confdefs.h
 
+fi
 
 
 
-    for gl_func in waitpid; do
+    for gl_func in fchmodat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/wait.h>
+#include <sys/stat.h>
+
 int
 main ()
 {
@@ -47025,7 +41778,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -47036,14 +41790,100 @@
 
 
 
+  # Code from module sys_time:
+
+
+
+
+  # Code from module sys_wait:
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_wait_h='<'sys/wait.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/wait.h>" >&5
+$as_echo_n "checking absolute name of <sys/wait.h>... " >&6; }
+if test "${gl_cv_next_sys_wait_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_sys_wait_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/wait.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_wait_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/wait.h#{
+                 s#.*"\(.*/sys/wait.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_sys_wait_h='<'sys/wait.h'>'
+          fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_wait_h" >&5
+$as_echo "$gl_cv_next_sys_wait_h" >&6; }
+     fi
+     NEXT_SYS_WAIT_H=$gl_cv_next_sys_wait_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'sys/wait.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_sys_wait_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H=$gl_next_as_first_directive
+
+
+
+
+
+  # Code from module tempname:
+
+
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS tempname.$ac_objext"
 
 
   :
 
 
+  # Code from module term-ostream:
 
 
 
+  # Code from module term-styled-ostream:
+  # Code from module terminfo:
 
 
   if test $gl_cv_terminfo_tparam = no && test $gl_cv_terminfo_tparm = no; then
@@ -47077,17 +41917,36 @@
       ;;
   esac
 
+  # Code from module terminfo-h:
+  # Code from module threadlib:
 
 
 
 
+  # Code from module time:
 
 
 
+  # Code from module tls:
 
 
 
-  :
+  # Code from module tmpdir:
+
+  for ac_func in __secure_getenv
+do :
+  ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv"
+if test "x$ac_cv_func___secure_getenv" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE___SECURE_GETENV 1
+_ACEOF
+
+fi
+done
+
+
+  # Code from module trim:
+  # Code from module uniconv/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47115,6 +41974,7 @@
   fi
 
 
+  # Code from module uniconv/u8-conv-from-enc:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47144,6 +42004,7 @@
 fi
 
 
+  # Code from module unilbrk/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47171,7 +42032,9 @@
   fi
 
 
+  # Code from module unilbrk/tables:
 
+  # Code from module unilbrk/u8-possible-linebreaks:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47183,7 +42046,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -47201,6 +42064,7 @@
 fi
 
 
+  # Code from module unilbrk/u8-width-linebreaks:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47212,7 +42076,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -47230,6 +42094,8 @@
 fi
 
 
+  # Code from module unilbrk/ulc-common:
+  # Code from module unilbrk/ulc-width-linebreaks:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47241,7 +42107,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -47259,6 +42125,7 @@
 fi
 
 
+  # Code from module uniname/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47286,6 +42153,7 @@
   fi
 
 
+  # Code from module uniname/uniname:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47315,12 +42183,17 @@
 fi
 
 
+  # Code from module unistd:
+
+
 
 
 
 
 
 
+  :
+
 
 
 
@@ -47332,51 +42205,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
-if ${gl_cv_next_unistd_h+:} false; then :
+if test "${gl_cv_next_unistd_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_unistd_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_unistd_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'unistd.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_unistd_h
-           gl_cv_next_unistd_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/unistd.h#{
+                 s#.*"\(.*/unistd.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_unistd_h='<'unistd.h'>'
-             fi
-
+            gl_cv_next_unistd_h='<'unistd.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
@@ -47396,6 +42248,13 @@
 
 
 
+
+  :
+
+
+
+
+
   if test $ac_cv_header_unistd_h = yes; then
     HAVE_UNISTD_H=1
   else
@@ -47404,25 +42263,18 @@
 
 
 
-
-
-
-
-    for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
+    for gl_func in chown dup2 dup3 environ euidaccess faccessat fchdir fchownat     fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize getusershell setusershell     endusershell lchown link linkat lseek pipe2 pread pwrite readlink     readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat     usleep; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 /* Some systems declare various items in the wrong headers.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#ifndef __GLIBC__
 # include <fcntl.h>
 # include <stdio.h>
 # include <stdlib.h>
@@ -47450,7 +42302,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -47460,9 +42313,47 @@
       done
 
 
+  # Code from module unistd-safer:
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS dup-safer.$ac_objext"
+
+
+
+
+
+
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS fd-safer.$ac_objext"
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS pipe-safer.$ac_objext"
+
+
+  # Code from module unistr/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47490,6 +42381,7 @@
   fi
 
 
+  # Code from module unistr/u16-mbtouc:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -47526,6 +42418,7 @@
 fi
 
 
+  # Code from module unistr/u8-check:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47555,6 +42448,7 @@
 fi
 
 
+  # Code from module unistr/u8-mblen:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47584,6 +42478,7 @@
 fi
 
 
+  # Code from module unistr/u8-mbtouc:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -47602,7 +42497,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -47620,6 +42515,7 @@
 fi
 
 
+  # Code from module unistr/u8-mbtouc-unsafe:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -47638,7 +42534,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -47656,6 +42552,7 @@
 fi
 
 
+  # Code from module unistr/u8-mbtoucr:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -47692,6 +42589,7 @@
 fi
 
 
+  # Code from module unistr/u8-prev:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47721,6 +42619,7 @@
 fi
 
 
+  # Code from module unistr/u8-uctomb:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -47757,6 +42656,7 @@
 fi
 
 
+  # Code from module unitypes:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47784,6 +42684,7 @@
   fi
 
 
+  # Code from module uniwidth/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47811,6 +42712,7 @@
   fi
 
 
+  # Code from module uniwidth/width:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -47822,7 +42724,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -47840,6 +42742,7 @@
 fi
 
 
+  # Code from module unlocked-io:
 
 
 $as_echo "#define USE_UNLOCKED_IO 1" >>confdefs.h
@@ -47848,29 +42751,104 @@
 
 
 
+  :
+
 
 
 
 
 
+  :
 
 
 
 
 
 
+  :
 
 
 
 
 
-  if test $ac_cv_have_decl_unsetenv = no; then
-    HAVE_DECL_UNSETENV=0
-  fi
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  # Code from module unsetenv:
+
+
   for ac_func in unsetenv
 do :
   ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
-if test "x$ac_cv_func_unsetenv" = xyes; then :
+if test "x$ac_cv_func_unsetenv" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNSETENV 1
 _ACEOF
@@ -47880,24 +42858,44 @@
 
   if test $ac_cv_func_unsetenv = no; then
     HAVE_UNSETENV=0
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS unsetenv.$ac_objext"
+
+
+
+
+  :
+
+
+
+
+
+
   else
-    HAVE_UNSETENV=1
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsetenv() return type" >&5
 $as_echo_n "checking for unsetenv() return type... " >&6; }
-if ${gt_cv_func_unsetenv_ret+:} false; then :
+if test "${gt_cv_func_unsetenv_ret+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#undef _BSD
-#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 <stdlib.h> */
 #include <stdlib.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
+#if defined(__STDC__) || defined(__cplusplus)
 int unsetenv (const char *name);
+#else
+int unsetenv();
+#endif
 
 int
 main ()
@@ -47921,48 +42919,41 @@
 $as_echo "#define VOID_UNSETENV 1" >>confdefs.h
 
       REPLACE_UNSETENV=1
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS unsetenv.$ac_objext"
+
     fi
 
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unsetenv obeys POSIX" >&5
-$as_echo_n "checking whether unsetenv obeys POSIX... " >&6; }
-if ${gl_cv_func_unsetenv_works+:} false; then :
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unsetenv works on duplicates" >&5
+$as_echo_n "checking whether unsetenv works on duplicates... " >&6; }
+if test "${gl_cv_func_unsetenv_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_unsetenv_works="guessing no" ;;
-       esac
-
+  gl_cv_func_unsetenv_works="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <stdlib.h>
-       #include <errno.h>
-       extern char **environ;
 
 int
 main ()
 {
 
-       char entry1[] = "a=1";
-       char entry2[] = "b=2";
-       char *env[] = { entry1, entry2, NULL };
+       char entry[] = "b=2";
        if (putenv ((char *) "a=1")) return 1;
-       if (putenv (entry2)) return 2;
-       entry2[0] = 'a';
+       if (putenv (entry)) return 2;
+       entry[0] = 'a';
        unsetenv ("a");
        if (getenv ("a")) return 3;
-       if (!unsetenv ("") || errno != EINVAL) return 4;
-       entry2[0] = 'b';
-       environ = env;
-       if (!getenv ("a")) return 5;
-       entry2[0] = 'a';
-       unsetenv ("a");
-       if (getenv ("a")) return 6;
 
   ;
   return 0;
@@ -47980,15 +42971,8 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unsetenv_works" >&5
 $as_echo "$gl_cv_func_unsetenv_works" >&6; }
-    case "$gl_cv_func_unsetenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_UNSETENV=1
-        ;;
-    esac
-  fi
-
-  if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
+    if test "$gl_cv_func_unsetenv_works" != yes; then
+      REPLACE_UNSETENV=1
 
 
 
@@ -47999,29 +42983,37 @@
 
   gl_LIBOBJS="$gl_LIBOBJS unsetenv.$ac_objext"
 
+    fi
+  fi
 
 
 
 
-  fi
+  GNULIB_UNSETENV=1
+
 
 
+$as_echo "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h
 
 
 
-          GNULIB_UNSETENV=1
+  # Code from module unused-parameter:
+  # Code from module vasnprintf:
 
 
+  :
 
 
 
-$as_echo "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h
 
 
+  if test $ac_cv_func_vasnprintf = no; then
+
+
+  :
 
 
 
-  if test $ac_cv_func_vasnprintf = no; then
 
 
 
@@ -48079,9 +43071,8 @@
 
 
 
-
   ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 else
 
@@ -48098,11 +43089,12 @@
 
   fi
 
+  # Code from module vasprintf:
 
   for ac_func in vasprintf
 do :
   ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
-if test "x$ac_cv_func_vasprintf" = xyes; then :
+if test "x$ac_cv_func_vasprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VASPRINTF 1
 _ACEOF
@@ -48151,11 +43143,7 @@
 
 
 
-
-
-          GNULIB_VASPRINTF=1
-
-
+  GNULIB_VASPRINTF=1
 
 
 
@@ -48171,13 +43159,15 @@
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=vasprintf:2:c-format"
 
+  # Code from module verify:
+  # Code from module vsnprintf:
 
 
   gl_cv_func_vsnprintf_usable=no
   for ac_func in vsnprintf
 do :
   ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
-if test "x$ac_cv_func_vsnprintf" = xyes; then :
+if test "x$ac_cv_func_vsnprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VSNPRINTF 1
 _ACEOF
@@ -48188,10 +43178,9 @@
   if test $ac_cv_func_vsnprintf = yes; then
 
 
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
 $as_echo_n "checking whether snprintf respects a size of 1... " >&6; }
-if ${gl_cv_func_snprintf_size1+:} false; then :
+if test "${gl_cv_func_snprintf_size1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -48202,24 +43191,10 @@
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
-#endif
 int main()
 {
   static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' };
-  my_snprintf (buf, 1, "%d", 12345);
+  snprintf (buf, 1, "%d", 12345);
   return buf[1] != 'E';
 }
 _ACEOF
@@ -48239,64 +43214,7 @@
 
     case "$gl_cv_func_snprintf_size1" in
       *yes)
-
-        case "$gl_cv_func_snprintf_retval_c99" in
-          *yes)
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
-$as_echo_n "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
-if ${gl_cv_func_printf_positions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
-           netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
-                         gl_cv_func_printf_positions="guessing no";;
-           beos*)        gl_cv_func_printf_positions="guessing no";;
-           mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
-           *)            gl_cv_func_printf_positions="guessing yes";;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_printf_positions=yes
-else
-  gl_cv_func_printf_positions=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_printf_positions" >&5
-$as_echo "$gl_cv_func_printf_positions" >&6; }
-
-            case "$gl_cv_func_printf_positions" in
-              *yes)
-                gl_cv_func_vsnprintf_usable=yes
-                ;;
-            esac
-            ;;
-        esac
+        gl_cv_func_vsnprintf_usable=yes
         ;;
     esac
   fi
@@ -48320,18 +43238,20 @@
 
   fi
 
-  if test $ac_cv_have_decl_vsnprintf = no; then
-    HAVE_DECL_VSNPRINTF=0
-  fi
+  :
+
 
 
 
 
+  if test $ac_cv_have_decl_vsnprintf = no; then
+    HAVE_DECL_VSNPRINTF=0
+  fi
 
 
-          GNULIB_VSNPRINTF=1
 
 
+  GNULIB_VSNPRINTF=1
 
 
 
@@ -48339,12 +43259,14 @@
 
 
 
+  # Code from module wait-process:
+
 
 
   for ac_func in waitid
 do :
   ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid"
-if test "x$ac_cv_func_waitid" = xyes; then :
+if test "x$ac_cv_func_waitid" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_WAITID 1
 _ACEOF
@@ -48357,7 +43279,7 @@
 for ac_func in waitpid
 do :
   ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
-if test "x$ac_cv_func_waitpid" = xyes; then :
+if test "x$ac_cv_func_waitpid" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_WAITPID 1
 _ACEOF
@@ -48367,7 +43289,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for union wait" >&5
 $as_echo_n "checking for union wait... " >&6; }
-if ${gt_cv_union_wait+:} false; then :
+if test "${gt_cv_union_wait+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -48414,37 +43336,14 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_union_wait" >&5
 $as_echo "$gt_cv_union_wait" >&6; }
 
-
-
-  HAVE_WAITPID=1
-  case $host_os in
-    mingw*) HAVE_WAITPID=0 ;;
-  esac
-
-  if test $HAVE_WAITPID = 0; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS waitpid.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_WAITPID=1
+  # Code from module warn-on-use:
+  # Code from module wchar:
 
 
 
 
+  :
 
-$as_echo "#define GNULIB_TEST_WAITPID 1" >>confdefs.h
 
 
 
@@ -48453,6 +43352,7 @@
 
 
 
+  :
 
 
 
@@ -48465,51 +43365,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 $as_echo_n "checking absolute name of <wchar.h>... " >&6; }
-if ${gl_cv_next_wchar_h+:} false; then :
+if test "${gl_cv_next_wchar_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_wchar_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_wchar_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wchar.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_wchar_h
-           gl_cv_next_wchar_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wchar.h#{
+                 s#.*"\(.*/wchar.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_wchar_h='<'wchar.h'>'
-             fi
-
+            gl_cv_next_wchar_h='<'wchar.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
@@ -48528,7 +43407,6 @@
 
 
 
-
   if test $ac_cv_header_wchar_h = yes; then
     HAVE_WCHAR_H=1
   else
@@ -48537,8 +43415,6 @@
 
 
 
-
-
   if test $gt_cv_c_wint_t = yes; then
     HAVE_WINT_T=1
   else
@@ -48547,21 +43423,18 @@
 
 
 
-    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth     ; do
+    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb     wcsrtombs wcsnrtombs wcwidth; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+/* Some systems require additional headers.  */
+#ifndef __GLIBC__
 # include <stddef.h>
 # include <stdio.h>
 # include <time.h>
@@ -48587,7 +43460,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -48597,6 +43471,12 @@
       done
 
 
+  # Code from module wctype:
+
+
+
+
+  :
 
 
 
@@ -48609,101 +43489,44 @@
   fi
 
 
+  :
 
-  if test $gt_cv_c_wint_t = yes; then
-    HAVE_WINT_T=1
-  else
-    HAVE_WINT_T=0
-  fi
 
 
 
 
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+  else
+    HAVE_ISWBLANK=0
+  fi
 
 
+  :
 
 
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_wctype_h='<'wctype.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
-$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if ${gl_cv_next_wctype_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-             if test $ac_cv_header_wctype_h = yes; then
 
 
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+
 
+  if test $ac_cv_header_wctype_h = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
+$as_echo_n "checking whether iswcntrl works... " >&6; }
+if test "${gl_cv_func_iswcntrl_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <wctype.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wctype.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_wctype_h
-           gl_cv_next_wctype_h='"'$gl_header'"'
-          else
-               gl_cv_next_wctype_h='<'wctype.h'>'
-             fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-$as_echo "$gl_cv_next_wctype_h" >&6; }
-     fi
-     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'wctype.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_wctype_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
-
-
-
-
-  if test $ac_cv_header_wctype_h = yes; then
-    if test $ac_cv_func_iswcntrl = yes; then
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
-$as_echo_n "checking whether iswcntrl works... " >&6; }
-if ${gl_cv_func_iswcntrl_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-          if test "$cross_compiling" = yes; then :
+          if test "$cross_compiling" = yes; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
@@ -48719,9 +43542,9 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_iswcntrl_works="guessing yes"
+  gl_cv_func_iswcntrl_works=yes
 else
-  gl_cv_func_iswcntrl_works="guessing no"
+  gl_cv_func_iswcntrl_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -48729,17 +43552,12 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
-
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   gl_cv_func_iswcntrl_works=yes
@@ -48755,214 +43573,96 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
 $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
     fi
-    HAVE_WCTYPE_H=1
-  else
-    HAVE_WCTYPE_H=0
-  fi
-
-
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
 
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  fi
 
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
-  else
-    for ac_func in towlower
-do :
-  ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
-if test "x$ac_cv_func_towlower" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TOWLOWER 1
-_ACEOF
 
-fi
-done
+  :
 
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
 
-"
-if test "x$ac_cv_have_decl_towlower" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER $ac_have_decl
-_ACEOF
 
-      if test $ac_cv_have_decl_towlower = yes; then
-                                REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
 
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-        :
-  fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
-$as_echo_n "checking for wctype_t... " >&6; }
-if ${gl_cv_type_wctype_t+:} false; then :
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wctype_h='<'wctype.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
+if test "${gl_cv_next_wctype_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
 
-int
-main ()
-{
+          if test $ac_cv_header_wctype_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wctype.h>
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctype_t=yes
-else
-  gl_cv_type_wctype_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wctype.h#{
+                 s#.*"\(.*/wctype.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_wctype_h='<'wctype.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
-$as_echo "$gl_cv_type_wctype_t" >&6; }
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
-  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
+$as_echo "$gl_cv_next_wctype_h" >&6; }
+     fi
+     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
-$as_echo_n "checking for wctrans_t... " >&6; }
-if ${gl_cv_type_wctrans_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'wctype.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wctype_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctrans_t=yes
-else
-  gl_cv_type_wctrans_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
-$as_echo "$gl_cv_type_wctrans_t" >&6; }
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
   fi
 
 
-    for gl_func in wctype iswctype wctrans towctrans     ; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
+  else
+    REPLACE_ISWCNTRL=0
+  fi
+
+
+  # Code from module wcwidth:
+
+
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
 
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
 
 
 
 
+  :
+
+
+
 
 
 
+  :
 
 
 
@@ -48982,7 +43682,7 @@
 #include <wchar.h>
 
 "
-if test "x$ac_cv_have_decl_wcwidth" = xyes; then :
+if test "x$ac_cv_have_decl_wcwidth" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -48997,19 +43697,18 @@
   fi
 
   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 :
+if test "${gl_cv_func_wcwidth_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
         if test "$cross_compiling" = yes; then :
 
            case "$host_os" in
-                     # Guess yes on glibc and AIX 7 systems.
-             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-             *)                  gl_cv_func_wcwidth_works="guessing no";;
+                     # Guess yes on glibc systems.
+             *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)      gl_cv_func_wcwidth_works="guessing no";;
            esac
 
 else
@@ -49036,17 +43735,10 @@
 #endif
 int main ()
 {
-  int result = 0;
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    {
-      if (wcwidth (0x0301) > 0)
-        result |= 1;
-      if (wcwidth (0x05B0) > 0)
-        result |= 2;
-      if (wcwidth (0x200B) > 0)
-        result |= 4;
-    }
-  return result;
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -49066,11 +43758,8 @@
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  else
-    HAVE_WCWIDTH=0
   fi
-
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
 
 
 
@@ -49082,14 +43771,17 @@
   gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
 
   fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
 
+    :
 
+  fi
 
 
 
-          GNULIB_WCWIDTH=1
-
 
+  GNULIB_WCWIDTH=1
 
 
 
@@ -49097,56 +43789,58 @@
 
 
 
+  # Code from module write:
 
 
 
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_WRITE=1
-  fi
-
 
 
 
     if test $gl_cv_header_signal_h_SIGPIPE != yes; then
       REPLACE_WRITE=1
-    fi
-
 
 
-  if test $REPLACE_WRITE = 1; then
 
 
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS write.$ac_objext"
 
+    fi
 
-  gl_LIBOBJS="$gl_LIBOBJS write.$ac_objext"
 
-    :
-  fi
 
 
 
+  GNULIB_WRITE=1
 
 
-          GNULIB_WRITE=1
 
+$as_echo "#define GNULIB_TEST_WRITE 1" >>confdefs.h
 
 
 
+  # Code from module xalloc:
+  # Code from module xalloc-die:
+  # Code from module xconcat-filename:
+  # Code from module xerror:
+  # Code from module xlist:
 
-$as_echo "#define GNULIB_TEST_WRITE 1" >>confdefs.h
 
 
+  # Code from module xmalloca:
+  # Code from module xreadlink:
+  # Code from module xsetenv:
+  # Code from module xsize:
 
 
 
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -49156,7 +43850,12 @@
 done
 
 
-  :
+  # Code from module xstriconv:
+  # Code from module xstriconveh:
+  # Code from module xvasprintf:
+
+
+
 
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=xasprintf:1:c-format"
@@ -49182,2789 +43881,24 @@
 
 
 
-  gl_source_base='gnulib-tests'
-  gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
-
-  gl_module_indicator_condition=$gltests_WITNESS
-
-
-
-
-
-
-
-
-  if test $ac_cv_func_btowc = no; then
-    HAVE_BTOWC=0
-  else
-
-
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5
-$as_echo_n "checking whether btowc(0) is correct... " >&6; }
-if ${gl_cv_func_btowc_nul+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-        if test "$cross_compiling" = yes; then :
-
-           case "$host_os" in
-                      # Guess no on Cygwin.
-             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
-                      # Guess yes otherwise.
-             *)       gl_cv_func_btowc_nul="guessing yes" ;;
-           esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (btowc ('\0') != 0)
-    return 1;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_btowc_nul=yes
-else
-  gl_cv_func_btowc_nul=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_btowc_nul" >&5
-$as_echo "$gl_cv_func_btowc_nul" >&6; }
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5
-$as_echo_n "checking whether btowc(EOF) is correct... " >&6; }
-if ${gl_cv_func_btowc_eof+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                        case "$host_os" in
-                 # Guess no on IRIX.
-          irix*) gl_cv_func_btowc_eof="guessing no" ;;
-                 # Guess yes otherwise.
-          *)     gl_cv_func_btowc_eof="guessing yes" ;;
-        esac
-        if test $LOCALE_FR != none; then
-          if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      if (btowc (EOF) != WEOF)
-        return 1;
-    }
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_btowc_eof=yes
-else
-  gl_cv_func_btowc_eof=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
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5
-$as_echo "$gl_cv_func_btowc_eof" >&6; }
-
-    case "$gl_cv_func_btowc_nul" in
-      *yes) ;;
-      *) REPLACE_BTOWC=1 ;;
-    esac
-    case "$gl_cv_func_btowc_eof" in
-      *yes) ;;
-      *) REPLACE_BTOWC=1 ;;
-    esac
-  fi
-
-  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS btowc.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_BTOWC" != 1; then
-        if test "$GNULIB_BTOWC" = 0; then
-      GNULIB_BTOWC=$gl_module_indicator_condition
-    else
-      GNULIB_BTOWC="($GNULIB_BTOWC || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a turkish Unicode locale" >&5
-$as_echo_n "checking for a turkish Unicode locale... " >&6; }
-if ${gt_cv_locale_tr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  But BeOS does not
-     implement the Turkish upper-/lowercase mappings.  Therefore, let this
-     program return 1 on BeOS.  */
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the eighth month, the second
-     character (should be U+011F: LATIN SMALL LETTER G WITH BREVE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1992 - 1900; t.tm_mon = 8 - 1; t.tm_mday = 19;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc4 || buf[2] != (char) 0x9f)
-    return 1;
-  /* Check whether the upper-/lowercase mappings are as expected for
-     Turkish.  */
-  if (towupper ('i') != 0x0130 || towlower (0x0130) != 'i'
-      || towupper(0x0131) != 'I' || towlower ('I') != 0x0131)
-    return 1;
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Turkish_Turkey.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_tr_utf8=Turkish_Turkey.65001
-          else
-            # None found.
-            gt_cv_locale_tr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=tr_TR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_tr_utf8=tr_TR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=tr_TR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_tr_utf8=tr_TR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=tr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_tr_utf8=tr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_tr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    else
-      gt_cv_locale_tr_utf8=none
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_tr_utf8" >&5
-$as_echo "$gt_cv_locale_tr_utf8" >&6; }
-  LOCALE_TR_UTF8=$gt_cv_locale_tr_utf8
-
-
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_DUP=1
-  fi
-
-
-  if test $REPLACE_DUP = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS dup.$ac_objext"
-
-    :
-  fi
-
-
-
-
-
-    if test "$GNULIB_DUP" != 1; then
-        if test "$GNULIB_DUP" = 0; then
-      GNULIB_DUP=$gl_module_indicator_condition
-    else
-      GNULIB_DUP="($GNULIB_DUP || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_DUP 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_FDOPEN=1
-  else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fdopen sets errno" >&5
-$as_echo_n "checking whether fdopen sets errno... " >&6; }
-if ${gl_cv_func_fdopen_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-        if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-             mingw*) gl_cv_func_fdopen_works="guessing no" ;;
-             *)      gl_cv_func_fdopen_works="guessing yes" ;;
-           esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <errno.h>
-int
-main (void)
-{
-  FILE *fp;
-  errno = 0;
-  fp = fdopen (-1, "r");
-  if (fp == NULL && errno == 0)
-    return 1;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_fdopen_works=yes
-else
-  gl_cv_func_fdopen_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_fdopen_works" >&5
-$as_echo "$gl_cv_func_fdopen_works" >&6; }
-    case "$gl_cv_func_fdopen_works" in
-      *no) REPLACE_FDOPEN=1 ;;
-    esac
-  fi
-
-  if test $REPLACE_FDOPEN = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS fdopen.$ac_objext"
-
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_FDOPEN" != 1; then
-        if test "$GNULIB_FDOPEN" = 0; then
-      GNULIB_FDOPEN=$gl_module_indicator_condition
-    else
-      GNULIB_FDOPEN="($GNULIB_FDOPEN || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_FDOPEN 1" >>confdefs.h
-
-
-
-
-
-
-    if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
-    REPLACE_FTELL=1
-  fi
-
-  if test $REPLACE_FTELL = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS ftell.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_FTELL" != 1; then
-        if test "$GNULIB_FTELL" = 0; then
-      GNULIB_FTELL=$gl_module_indicator_condition
-    else
-      GNULIB_FTELL="($GNULIB_FTELL || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_FTELL 1" >>confdefs.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-  if test $ac_cv_have_decl_ftello = no; then
-    HAVE_DECL_FTELLO=0
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5
-$as_echo_n "checking for ftello... " >&6; }
-if ${gl_cv_func_ftello+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-ftello (stdin);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv_func_ftello=yes
-else
-  gl_cv_func_ftello=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5
-$as_echo "$gl_cv_func_ftello" >&6; }
-  if test $gl_cv_func_ftello = no; then
-    HAVE_FTELLO=0
-  else
-    if test $WINDOWS_64_BIT_OFF_T = 1; then
-      REPLACE_FTELLO=1
-    fi
-    if test $gl_cv_var_stdin_large_offset = no; then
-      REPLACE_FTELLO=1
-    fi
-    if test $REPLACE_FTELLO = 0; then
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5
-$as_echo_n "checking whether ftello works... " >&6; }
-if ${gl_cv_func_ftello_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                              case "$host_os" in
-                      # Guess no on Solaris.
-            solaris*) gl_cv_func_ftello_works="guessing no" ;;
-                      # Guess yes otherwise.
-            *)        gl_cv_func_ftello_works="guessing yes" ;;
-          esac
-          if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define TESTFILE "conftest.tmp"
-int
-main (void)
-{
-  FILE *fp;
-
-  /* Create a file with some contents.  */
-  fp = fopen (TESTFILE, "w");
-  if (fp == NULL)
-    return 70;
-  if (fwrite ("foogarsh", 1, 8, fp) < 8)
-    return 71;
-  if (fclose (fp))
-    return 72;
-
-  /* The file's contents is now "foogarsh".  */
-
-  /* Try writing after reading to EOF.  */
-  fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    return 73;
-  if (fseek (fp, -1, SEEK_END))
-    return 74;
-  if (!(getc (fp) == 'h'))
-    return 1;
-  if (!(getc (fp) == EOF))
-    return 2;
-  if (!(ftell (fp) == 8))
-    return 3;
-  if (!(ftell (fp) == 8))
-    return 4;
-  if (!(putc ('!', fp) == '!'))
-    return 5;
-  if (!(ftell (fp) == 9))
-    return 6;
-  if (!(fclose (fp) == 0))
-    return 7;
-  fp = fopen (TESTFILE, "r");
-  if (fp == NULL)
-    return 75;
-  {
-    char buf[10];
-    if (!(fread (buf, 1, 10, fp) == 9))
-      return 10;
-    if (!(memcmp (buf, "foogarsh!", 9) == 0))
-      return 11;
-  }
-  if (!(fclose (fp) == 0))
-    return 12;
-
-  /* The file's contents is now "foogarsh!".  */
-
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_ftello_works=yes
-else
-  gl_cv_func_ftello_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_ftello_works" >&5
-$as_echo "$gl_cv_func_ftello_works" >&6; }
-      case "$gl_cv_func_ftello_works" in
-        *yes) ;;
-        *)
-          REPLACE_FTELLO=1
-
-$as_echo "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs.h
-
-          ;;
-      esac
-    fi
-  fi
-
-  if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS ftello.$ac_objext"
-
-
-      for ac_func in _ftelli64
-do :
-  ac_fn_c_check_func "$LINENO" "_ftelli64" "ac_cv_func__ftelli64"
-if test "x$ac_cv_func__ftelli64" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__FTELLI64 1
-_ACEOF
-
-fi
-done
-
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_FTELLO" != 1; then
-        if test "$GNULIB_FTELLO" = 0; then
-      GNULIB_FTELLO=$gl_module_indicator_condition
-    else
-      GNULIB_FTELLO="($GNULIB_FTELLO || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_FTELLO 1" >>confdefs.h
-
-
-
-
-
-
-
-
-
-  case $gl_cv_func_getcwd_null,$gl_cv_func_getcwd_posix_signature in
-  *yes,yes) ;;
-  *)
-        REPLACE_GETCWD=1
-    ;;
-  esac
-
-  if test $REPLACE_GETCWD = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS getcwd-lgpl.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_GETCWD" != 1; then
-        if test "$GNULIB_GETCWD" = 0; then
-      GNULIB_GETCWD=$gl_module_indicator_condition
-    else
-      GNULIB_GETCWD="($GNULIB_GETCWD || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
-
-
-
-
-
-
-  for ac_func in getpagesize
-do :
-  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
-_ACEOF
-
-fi
-done
-
-  if test $ac_cv_func_getpagesize = no; then
-    HAVE_GETPAGESIZE=0
-    for ac_header in OS.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_includes_default"
-if test "x$ac_cv_header_OS_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OS_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test $ac_cv_header_OS_h = yes; then
-      HAVE_OS_H=1
-    fi
-    for ac_header in sys/param.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_param_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PARAM_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test $ac_cv_header_sys_param_h = yes; then
-      HAVE_SYS_PARAM_H=1
-    fi
-  fi
-  case "$host_os" in
-    mingw*)
-      REPLACE_GETPAGESIZE=1
-      ;;
-  esac
-      ac_fn_c_check_decl "$LINENO" "getpagesize" "ac_cv_have_decl_getpagesize" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getpagesize" = xyes; then :
-
-else
-  HAVE_DECL_GETPAGESIZE=0
-fi
-
-
-  if test $REPLACE_GETPAGESIZE = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS getpagesize.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_GETPAGESIZE" != 1; then
-        if test "$GNULIB_GETPAGESIZE" = 0; then
-      GNULIB_GETPAGESIZE=$gl_module_indicator_condition
-    else
-      GNULIB_GETPAGESIZE="($GNULIB_GETPAGESIZE || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_GETPAGESIZE 1" >>confdefs.h
-
-
-
-
-
-
-
-
-  PRIPTR_PREFIX=
-  if test -n "$STDINT_H"; then
-        PRIPTR_PREFIX='"l"'
-  else
-        for glpfx in '' l ll I64; do
-      case $glpfx in
-        '')  gltype1='int';;
-        l)   gltype1='long int';;
-        ll)  gltype1='long long int';;
-        I64) gltype1='__int64';;
-      esac
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-           extern intptr_t foo;
-           extern $gltype1 foo;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  PRIPTR_PREFIX='"'$glpfx'"'
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      test -n "$PRIPTR_PREFIX" && break
-    done
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether INT32_MAX < INTMAX_MAX" >&5
-$as_echo_n "checking whether INT32_MAX < INTMAX_MAX... " >&6; }
-if ${gl_cv_test_INT32_MAX_LT_INTMAX_MAX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Work also in C++ mode.  */
-            #define __STDC_LIMIT_MACROS 1
-
-            /* Work if build is not clean.  */
-            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-
-            #include <limits.h>
-            #if HAVE_STDINT_H
-             #include <stdint.h>
-            #endif
-
-            #if defined INT32_MAX && defined INTMAX_MAX
-             #define CONDITION (INT32_MAX < INTMAX_MAX)
-            #elif HAVE_LONG_LONG_INT
-             #define CONDITION (sizeof (int) < sizeof (long long int))
-            #else
-             #define CONDITION 0
-            #endif
-            int test[CONDITION ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_test_INT32_MAX_LT_INTMAX_MAX=yes
-else
-  gl_cv_test_INT32_MAX_LT_INTMAX_MAX=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&5
-$as_echo "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; }
-  if test $gl_cv_test_INT32_MAX_LT_INTMAX_MAX = yes; then
-    INT32_MAX_LT_INTMAX_MAX=1;
-  else
-    INT32_MAX_LT_INTMAX_MAX=0;
-  fi
-
-
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether INT64_MAX == LONG_MAX" >&5
-$as_echo_n "checking whether INT64_MAX == LONG_MAX... " >&6; }
-if ${gl_cv_test_INT64_MAX_EQ_LONG_MAX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Work also in C++ mode.  */
-            #define __STDC_LIMIT_MACROS 1
-
-            /* Work if build is not clean.  */
-            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-
-            #include <limits.h>
-            #if HAVE_STDINT_H
-             #include <stdint.h>
-            #endif
-
-            #if defined INT64_MAX
-             #define CONDITION (INT64_MAX == LONG_MAX)
-            #elif HAVE_LONG_LONG_INT
-             #define CONDITION (sizeof (long long int) == sizeof (long int))
-            #else
-             #define CONDITION 0
-            #endif
-            int test[CONDITION ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_test_INT64_MAX_EQ_LONG_MAX=yes
-else
-  gl_cv_test_INT64_MAX_EQ_LONG_MAX=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&5
-$as_echo "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; }
-  if test $gl_cv_test_INT64_MAX_EQ_LONG_MAX = yes; then
-    INT64_MAX_EQ_LONG_MAX=1;
-  else
-    INT64_MAX_EQ_LONG_MAX=0;
-  fi
-
-
-  else
-    INT64_MAX_EQ_LONG_MAX=-1
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UINT32_MAX < UINTMAX_MAX" >&5
-$as_echo_n "checking whether UINT32_MAX < UINTMAX_MAX... " >&6; }
-if ${gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Work also in C++ mode.  */
-            #define __STDC_LIMIT_MACROS 1
-
-            /* Work if build is not clean.  */
-            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-
-            #include <limits.h>
-            #if HAVE_STDINT_H
-             #include <stdint.h>
-            #endif
-
-            #if defined UINT32_MAX && defined UINTMAX_MAX
-             #define CONDITION (UINT32_MAX < UINTMAX_MAX)
-            #elif HAVE_LONG_LONG_INT
-             #define CONDITION (sizeof (unsigned int) < sizeof (unsigned long long int))
-            #else
-             #define CONDITION 0
-            #endif
-            int test[CONDITION ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=yes
-else
-  gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&5
-$as_echo "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; }
-  if test $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX = yes; then
-    UINT32_MAX_LT_UINTMAX_MAX=1;
-  else
-    UINT32_MAX_LT_UINTMAX_MAX=0;
-  fi
-
-
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UINT64_MAX == ULONG_MAX" >&5
-$as_echo_n "checking whether UINT64_MAX == ULONG_MAX... " >&6; }
-if ${gl_cv_test_UINT64_MAX_EQ_ULONG_MAX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Work also in C++ mode.  */
-            #define __STDC_LIMIT_MACROS 1
-
-            /* Work if build is not clean.  */
-            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-
-            #include <limits.h>
-            #if HAVE_STDINT_H
-             #include <stdint.h>
-            #endif
-
-            #if defined UINT64_MAX
-             #define CONDITION (UINT64_MAX == ULONG_MAX)
-            #elif HAVE_LONG_LONG_INT
-             #define CONDITION (sizeof (unsigned long long int) == sizeof (unsigned long int))
-            #else
-             #define CONDITION 0
-            #endif
-            int test[CONDITION ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=yes
-else
-  gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&5
-$as_echo "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; }
-  if test $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX = yes; then
-    UINT64_MAX_EQ_ULONG_MAX=1;
-  else
-    UINT64_MAX_EQ_ULONG_MAX=0;
-  fi
-
-
-  else
-    UINT64_MAX_EQ_ULONG_MAX=-1
-  fi
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lseek detects pipes" >&5
-$as_echo_n "checking whether lseek detects pipes... " >&6; }
-if ${gl_cv_func_lseek_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$host_os" in
-       mingw*)
-                                                               gl_cv_func_lseek_pipe=no
-         ;;
-       *)
-         if test $cross_compiling = no; then
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h> /* for off_t */
-#include <stdio.h> /* for SEEK_CUR */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#else /* on Windows with MSVC */
-# include <io.h>
-#endif
-
-int
-main ()
-{
-
-  /* Exit with success only if stdin is seekable.  */
-  return lseek (0, (off_t)0, SEEK_CUR) < 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if test -s conftest$ac_exeext \
-                 && ./conftest$ac_exeext < conftest.$ac_ext \
-                 && test 1 = "`echo hi \
-                   | { ./conftest$ac_exeext; echo $?; cat >/dev/null; }`"; then
-                gl_cv_func_lseek_pipe=yes
-              else
-                gl_cv_func_lseek_pipe=no
-              fi
-
-else
-  gl_cv_func_lseek_pipe=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-         else
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#if defined __BEOS__
-/* BeOS mistakenly return 0 when trying to seek on pipes.  */
-  Choke me.
-#endif
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_lseek_pipe=yes
-else
-  gl_cv_func_lseek_pipe=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         fi
-         ;;
-     esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_pipe" >&5
-$as_echo "$gl_cv_func_lseek_pipe" >&6; }
-  if test $gl_cv_func_lseek_pipe = no; then
-    REPLACE_LSEEK=1
-
-$as_echo "#define LSEEK_PIPE_BROKEN 1" >>confdefs.h
-
-  fi
-
-
-  if test $WINDOWS_64_BIT_OFF_T = 1; then
-    REPLACE_LSEEK=1
-  fi
-
-  if test $REPLACE_LSEEK = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS lseek.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_LSEEK" != 1; then
-        if test "$GNULIB_LSEEK" = 0; then
-      GNULIB_LSEEK=$gl_module_indicator_condition
-    else
-      GNULIB_LSEEK="($GNULIB_LSEEK || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_LSEEK 1" >>confdefs.h
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
-     on Cygwin 1.5.x.  */
-  if (MB_CUR_MAX == 1)
-    return 1;
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
-            else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
-              else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
-  LOCALE_JA=$gt_cv_locale_ja
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  /* Check whether a typical GB18030 multibyte sequence is recognized as a
-     single wide character.  This excludes the GB2312 and GBK encodings.  */
-  if (mblen ("\203\062\332\066", 5) != 4)
-    return 1;
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
-          gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
-    else
-      # If there was a link error, due to mblen(), the system is so old that
-      # it certainly doesn't have a chinese locale.
-      gt_cv_locale_zh_CN=none
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
-  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
-     on Cygwin 1.5.x.  */
-  if (MB_CUR_MAX == 1)
-    return 1;
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  return 0;
-}
-
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
-            else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
-              else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
-  LOCALE_JA=$gt_cv_locale_ja
-
-
-
-
+  gl_source_base='gnulib-tests'
+  gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  gl_module_indicator_condition=$gltests_WITNESS
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  /* Check whether a typical GB18030 multibyte sequence is recognized as a
-     single wide character.  This excludes the GB2312 and GBK encodings.  */
-  if (mblen ("\203\062\332\066", 5) != 4)
-    return 1;
-  return 0;
-}
+  :
 
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
-          gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
-    else
-      # If there was a link error, due to mblen(), the system is so old that
-      # it certainly doesn't have a chinese locale.
-      gt_cv_locale_zh_CN=none
-    fi
-    rm -fr conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
-  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+$as_echo_n "checking for a traditional french locale... " >&6; }
+if test "${gt_cv_locale_fr+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -51981,55 +43915,36 @@
 struct tm t;
 char buf[16];
 int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
      some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
+#if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
     if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
-# endif
-# ifdef __CYGWIN__
+#endif
+#ifdef __CYGWIN__
   /* On Cygwin, avoid locale names without encoding suffix, because the
      locale_charset() function relies on the encoding suffix.  Note that
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
+#endif
   /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
+     one byte long. This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 
@@ -52039,61 +43954,51 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr=fr_FR.ISO-8859-1
+        else
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR.ISO8859-1
+          else
+            # Test for the HP-UX locale name.
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.iso88591
             else
               # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
               else
                 # None found.
-                gt_cv_locale_fr_utf8=none
+                gt_cv_locale_fr=none
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
+$as_echo "$gt_cv_locale_fr" >&6; }
+  LOCALE_FR=$gt_cv_locale_fr
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a turkish Unicode locale" >&5
+$as_echo_n "checking for a turkish Unicode locale... " >&6; }
+if test "${gt_cv_locale_tr_utf8+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -52101,7 +44006,6 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
-#include <stdlib.h>
 #include <time.h>
 #if HAVE_LANGINFO_CODESET
 # include <langinfo.h>
@@ -52110,34 +44014,24 @@
 #include <string.h>
 struct tm t;
 char buf[16];
-int main ()
-{
-  const char *p;
+int main () {
+  /* On BeOS, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  But BeOS does not
+     implement the Turkish upper-/lowercase mappings.  Therefore, let this
+     program return 1 on BeOS.  */
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -52147,16 +44041,17 @@
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  /* Check whether a typical GB18030 multibyte sequence is recognized as a
-     single wide character.  This excludes the GB2312 and GBK encodings.  */
-  if (mblen ("\203\062\332\066", 5) != 4)
+  /* Check whether in the abbreviation of the eighth month, the second
+     character (should be U+011F: LATIN SMALL LETTER G WITH BREVE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1992 - 1900; t.tm_mon = 8 - 1; t.tm_mday = 19;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf[1] != (char) 0xc4 || buf[2] != (char) 0x9f)
+    return 1;
+  /* Check whether the upper-/lowercase mappings are as expected for
+     Turkish.  */
+  if (towupper ('i') != 0x0130 || towlower (0x0130) != 'i'
+      || towupper(0x0131) != 'I' || towlower ('I') != 0x0131)
     return 1;
   return 0;
 }
@@ -52167,436 +44062,640 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=tr_TR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_tr_utf8=tr_TR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=tr_TR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_tr_utf8=tr_TR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=tr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_tr_utf8=tr.UTF-8
           else
             # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
-          gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
+            gt_cv_locale_tr_utf8=none
           fi
-          ;;
-      esac
+        fi
+      fi
     else
-      # If there was a link error, due to mblen(), the system is so old that
-      # it certainly doesn't have a chinese locale.
-      gt_cv_locale_zh_CN=none
+      gt_cv_locale_tr_utf8=none
     fi
     rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
-  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_tr_utf8" >&5
+$as_echo "$gt_cv_locale_tr_utf8" >&6; }
+  LOCALE_TR_UTF8=$gt_cv_locale_tr_utf8
 
 
 
-  if false; then
-    REPLACE_MBTOWC=1
-  fi
 
-  if test $REPLACE_MBTOWC = 1; then
 
+  for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
 
+fi
+done
 
+  if test $ac_cv_func_getpagesize = no; then
+    HAVE_GETPAGESIZE=0
+    for ac_header in OS.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_includes_default"
+if test "x$ac_cv_header_OS_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OS_H 1
+_ACEOF
 
+fi
 
+done
 
+    if test $ac_cv_header_OS_h = yes; then
+      HAVE_OS_H=1
+    fi
+    for ac_header in sys/param.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_PARAM_H 1
+_ACEOF
 
+fi
 
-  gltests_LIBOBJS="$gltests_LIBOBJS mbtowc.$ac_objext"
+done
 
+    if test $ac_cv_header_sys_param_h = yes; then
+      HAVE_SYS_PARAM_H=1
+    fi
+  fi
+  case "$host_os" in
+    mingw*)
+      REPLACE_GETPAGESIZE=1
 
-  :
 
-  fi
 
 
 
 
 
-    if test "$GNULIB_MBTOWC" != 1; then
-        if test "$GNULIB_MBTOWC" = 0; then
-      GNULIB_MBTOWC=$gl_module_indicator_condition
-    else
-      GNULIB_MBTOWC="($GNULIB_MBTOWC || $gl_module_indicator_condition)"
-    fi
-  fi
 
+  gltests_LIBOBJS="$gltests_LIBOBJS getpagesize.$ac_objext"
 
+      ;;
+  esac
+      ac_fn_c_check_decl "$LINENO" "getpagesize" "ac_cv_have_decl_getpagesize" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getpagesize" = x""yes; then :
 
+else
+  HAVE_DECL_GETPAGESIZE=0
+fi
 
 
-$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
 
 
 
+  GNULIB_GETPAGESIZE=$gl_module_indicator_condition
 
 
 
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
-else
-  gl_have_mmap=no
-fi
+$as_echo "#define GNULIB_TEST_GETPAGESIZE 1" >>confdefs.h
 
 
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
 
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  :
 
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
 
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
-         gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
 
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
 
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+  :
 
-    fi
-  fi
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-[
-  #if defined _MSC_VER || defined __MINGW32__
-    notposix
-  #endif
-    ]
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "notposix" >/dev/null 2>&1; then :
-  posix_spawn_ported=no
-else
-  posix_spawn_ported=yes
-fi
-rm -f conftest*
 
-   if test $posix_spawn_ported = yes; then
-  POSIX_SPAWN_PORTED_TRUE=
-  POSIX_SPAWN_PORTED_FALSE='#'
-else
-  POSIX_SPAWN_PORTED_TRUE='#'
-  POSIX_SPAWN_PORTED_FALSE=
-fi
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putenv compatible with GNU and SVID" >&5
-$as_echo_n "checking for putenv compatible with GNU and SVID... " >&6; }
-if ${gl_cv_func_svid_putenv+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+$as_echo_n "checking for a traditional french locale... " >&6; }
+if test "${gt_cv_locale_fr+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-               case "$host_os" in
-                        # Guess yes on glibc systems.
-                *-gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
-                        # If we don't know, assume the worst.
-                *)      gl_cv_func_svid_putenv="guessing no" ;;
-              esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
 
-    /* Put it in env.  */
-    if (putenv ("CONFTEST_putenv=val"))
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
-
-    /* Try to remove it.  */
-    if (putenv ("CONFTEST_putenv"))
-      return 2;
-
-    /* Make sure it was deleted.  */
-    if (getenv ("CONFTEST_putenv") != 0)
-      return 3;
-
-    return 0;
-
-  ;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
+     one byte long. This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
   return 0;
 }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_svid_putenv=yes
-else
-  gl_cv_func_svid_putenv=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
+_ACEOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr=fr_FR.ISO-8859-1
+        else
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR.ISO8859-1
+          else
+            # Test for the HP-UX locale name.
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.iso88591
+            else
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
+              else
+                # None found.
+                gt_cv_locale_fr=none
+              fi
+            fi
+          fi
+        fi
+      fi
+    fi
+    rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_svid_putenv" >&5
-$as_echo "$gl_cv_func_svid_putenv" >&6; }
-  case "$gl_cv_func_svid_putenv" in
-    *yes) ;;
-    *)
-      REPLACE_PUTENV=1
-      ;;
-  esac
-
-  if test $REPLACE_PUTENV = 1; then
-
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
+$as_echo "$gt_cv_locale_fr" >&6; }
+  LOCALE_FR=$gt_cv_locale_fr
 
 
 
 
-  gltests_LIBOBJS="$gltests_LIBOBJS putenv.$ac_objext"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+$as_echo_n "checking for a french Unicode locale... " >&6; }
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  ac_fn_c_check_decl "$LINENO" "_putenv" "ac_cv_have_decl__putenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl__putenv" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
+    return 1;
+#endif
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
+  return 0;
+}
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__PUTENV $ac_have_decl
 _ACEOF
-
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_PUTENV" != 1; then
-        if test "$GNULIB_PUTENV" = 0; then
-      GNULIB_PUTENV=$gl_module_indicator_condition
-    else
-      GNULIB_PUTENV="($GNULIB_PUTENV || $gl_module_indicator_condition)"
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
+          else
+            # None found.
+            gt_cv_locale_fr_utf8=none
+          fi
+        fi
+      fi
     fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_PUTENV 1" >>confdefs.h
+    rm -fr conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
 
 
 
 
 
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+$as_echo_n "checking for a traditional japanese locale... " >&6; }
+if test "${gt_cv_locale_ja+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  gl_have_mmap=no
-fi
-
 
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
 #endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
+  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
+     on Cygwin 1.5.x.  */
+  if (MB_CUR_MAX == 1)
+    return 1;
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  return 0;
+}
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
-
-         gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
-
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
-
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
+          else
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
+            else
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
+              else
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
+                else
+                  # None found.
+                  gt_cv_locale_ja=none
+                fi
+              fi
+            fi
+          fi
+        fi
+      fi
     fi
-  fi
+    rm -fr conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
+$as_echo "$gt_cv_locale_ja" >&6; }
+  LOCALE_JA=$gt_cv_locale_ja
 
 
 
 
 
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+$as_echo_n "checking for a transitional chinese locale... " >&6; }
+if test "${gt_cv_locale_zh_CN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  gl_have_mmap=no
-fi
 
-
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
+#include <locale.h>
+#include <stdlib.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
 #endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  /* Check whether a typical GB18030 multibyte sequence is recognized as a
+     single wide character.  This excludes the GB2312 and GBK encodings.  */
+  if (mblen ("\203\062\332\066", 5) != 4)
+    return 1;
+  return 0;
+}
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
+          gt_cv_locale_zh_CN=none
+        fi
+      fi
+    else
+      # If there was a link error, due to mblen(), the system is so old that
+      # it certainly doesn't have a chinese locale.
+      gt_cv_locale_zh_CN=none
+    fi
+    rm -fr conftest*
 
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
+$as_echo "$gt_cv_locale_zh_CN" >&6; }
+  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
-#endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
 
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
-         gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+$as_echo_n "checking for a french Unicode locale... " >&6; }
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
+    return 1;
+#endif
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
+  return 0;
+}
 
+_ACEOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
+          else
+            # None found.
+            gt_cv_locale_fr_utf8=none
+          fi
+        fi
+      fi
     fi
-  fi
+    rm -fr conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
 
 
-  :
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
 $as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
+if test "${gt_cv_locale_fr+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -52614,30 +44713,17 @@
 char buf[16];
 int main () {
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -52652,12 +44738,10 @@
      one byte long. This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 
@@ -52667,56 +44751,37 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr=fr_FR.ISO-8859-1
+        else
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR.ISO8859-1
+          else
+            # Test for the HP-UX locale name.
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.iso88591
             else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
               else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
+                # None found.
+                gt_cv_locale_fr=none
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
@@ -52730,7 +44795,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
 $as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -52752,19 +44817,9 @@
      variables, and all locales use the UTF-8 encoding.  */
 #if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -52790,12 +44845,10 @@
       || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
     return 1;
 #endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 
@@ -52805,61 +44858,246 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
           else
             # None found.
             gt_cv_locale_fr_utf8=none
           fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        fi
+      fi
+    fi
+    rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+$as_echo_n "checking for a traditional japanese locale... " >&6; }
+if test "${gt_cv_locale_ja+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
+     on Cygwin 1.5.x.  */
+  if (MB_CUR_MAX == 1)
+    return 1;
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  return 0;
+}
+
+_ACEOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
+          else
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
             else
               # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
               else
-                # None found.
-                gt_cv_locale_fr_utf8=none
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
+                else
+                  # None found.
+                  gt_cv_locale_ja=none
+                fi
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
+    fi
+    rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
+$as_echo "$gt_cv_locale_ja" >&6; }
+  LOCALE_JA=$gt_cv_locale_ja
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+$as_echo_n "checking for a transitional chinese locale... " >&6; }
+if test "${gt_cv_locale_zh_CN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  /* Check whether a typical GB18030 multibyte sequence is recognized as a
+     single wide character.  This excludes the GB2312 and GBK encodings.  */
+  if (mblen ("\203\062\332\066", 5) != 4)
+    return 1;
+  return 0;
+}
+
+_ACEOF
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
+          gt_cv_locale_zh_CN=none
+        fi
+      fi
+    else
+      # If there was a link error, due to mblen(), the system is so old that
+      # it certainly doesn't have a chinese locale.
+      gt_cv_locale_zh_CN=none
     fi
     rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
+$as_echo "$gt_cv_locale_zh_CN" >&6; }
+  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+$as_echo_n "checking for a french Unicode locale... " >&6; }
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -52875,54 +45113,44 @@
 #include <string.h>
 struct tm t;
 char buf[16];
-int main ()
-{
-  const char *p;
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
-#endif
-#ifdef __CYGWIN__
+# endif
+# ifdef __CYGWIN__
   /* On Cygwin, avoid locale names without encoding suffix, because the
      locale_charset() function relies on the encoding suffix.  Note that
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
-     on Cygwin 1.5.x.  */
-  if (MB_CUR_MAX == 1)
-    return 1;
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
+    return 1;
+#endif
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
   return 0;
 }
 
@@ -52932,65 +45160,34 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
           else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
-            else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
-              else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
-                fi
-              fi
-            fi
+            # None found.
+            gt_cv_locale_fr_utf8=none
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
-  LOCALE_JA=$gt_cv_locale_ja
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
 
 
 
@@ -52998,7 +45195,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
 $as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
+if test "${gt_cv_locale_zh_CN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -53019,30 +45216,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -53053,7 +45237,7 @@
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -53072,47 +45256,22 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
           gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     else
       # If there was a link error, due to mblen(), the system is so old that
       # it certainly doesn't have a chinese locale.
@@ -53126,66 +45285,59 @@
   LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+[
+  #if defined _MSC_VER || defined __MINGW32__
+    notposix
+  #endif
+    ]
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "notposix" >/dev/null 2>&1; then :
+  posix_spawn_ported=no
+else
+  posix_spawn_ported=yes
+fi
+rm -f conftest*
 
-
-               ac_fn_c_check_decl "$LINENO" "sleep" "ac_cv_have_decl_sleep" "#include <unistd.h>
-"
-if test "x$ac_cv_have_decl_sleep" = xyes; then :
-  ac_have_decl=1
+   if test $posix_spawn_ported = yes; then
+  POSIX_SPAWN_PORTED_TRUE=
+  POSIX_SPAWN_PORTED_FALSE='#'
 else
-  ac_have_decl=0
+  POSIX_SPAWN_PORTED_TRUE='#'
+  POSIX_SPAWN_PORTED_FALSE=
 fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SLEEP $ac_have_decl
-_ACEOF
 
 
-  if test $ac_cv_have_decl_sleep != yes; then
-    HAVE_SLEEP=0
-  else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working sleep" >&5
-$as_echo_n "checking for working sleep... " >&6; }
-if ${gl_cv_func_sleep_works+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putenv compatible with GNU and SVID" >&5
+$as_echo_n "checking for putenv compatible with GNU and SVID... " >&6; }
+if test "${gl_cv_func_svid_putenv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_sleep_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_sleep_works="guessing no" ;;
-       esac
-
+               gl_cv_func_svid_putenv=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-static void
-handle_alarm (int sig)
-{
-  if (sig != SIGALRM)
-    _exit (2);
-}
-
+$ac_includes_default
 int
 main ()
 {
 
-    /* Failure to compile this test due to missing alarm is okay,
-       since all such platforms (mingw) also lack sleep.  */
-    unsigned int pentecost = 50 * 24 * 60 * 60; /* 50 days.  */
-    unsigned int remaining;
-    signal (SIGALRM, handle_alarm);
-    alarm (1);
-    remaining = sleep (pentecost);
-    if (remaining > pentecost)
-      return 3;
-    if (remaining <= pentecost - 10)
-      return 4;
+    /* Put it in env.  */
+    if (putenv ("CONFTEST_putenv=val"))
+      return 1;
+
+    /* Try to remove it.  */
+    if (putenv ("CONFTEST_putenv"))
+      return 1;
+
+    /* Make sure it was deleted.  */
+    if (getenv ("CONFTEST_putenv") != 0)
+      return 1;
+
     return 0;
 
   ;
@@ -53193,333 +45345,138 @@
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_sleep_works=yes
+  gl_cv_func_svid_putenv=yes
 else
-  gl_cv_func_sleep_works=no
+  gl_cv_func_svid_putenv=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_sleep_works" >&5
-$as_echo "$gl_cv_func_sleep_works" >&6; }
-    case "$gl_cv_func_sleep_works" in
-      *yes) ;;
-      *)
-        REPLACE_SLEEP=1
-        ;;
-    esac
-  fi
-
-  if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then
-
-
-
-
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_svid_putenv" >&5
+$as_echo "$gl_cv_func_svid_putenv" >&6; }
+  if test $gl_cv_func_svid_putenv = no; then
+    REPLACE_PUTENV=1
 
 
 
-  gltests_LIBOBJS="$gltests_LIBOBJS sleep.$ac_objext"
 
-  fi
 
 
 
 
+  gltests_LIBOBJS="$gltests_LIBOBJS putenv.$ac_objext"
 
-    if test "$GNULIB_SLEEP" != 1; then
-        if test "$GNULIB_SLEEP" = 0; then
-      GNULIB_SLEEP=$gl_module_indicator_condition
-    else
-      GNULIB_SLEEP="($GNULIB_SLEEP || $gl_module_indicator_condition)"
-    fi
   fi
 
 
 
 
-
-$as_echo "#define GNULIB_TEST_SLEEP 1" >>confdefs.h
-
-
-
+  GNULIB_PUTENV=$gl_module_indicator_condition
 
 
 
+$as_echo "#define GNULIB_TEST_PUTENV 1" >>confdefs.h
 
 
 
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
-else
-  gl_have_mmap=no
-fi
-
-
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
 
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
-         gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
 
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
 
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
 
-    fi
-  fi
 
 
 
 
+  gltests_LIBOBJS="$gltests_LIBOBJS read-file.$ac_objext"
 
+  :
 
 
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if test "${gt_cv_c_wchar_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  gl_have_mmap=no
-fi
-
-
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';
+int
+main ()
+{
 
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
-#endif
-
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wchar_t=yes
+else
+  gt_cv_c_wchar_t=no
 fi
-rm -f conftest*
-
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
-
-         gl_have_mmap_anonymous=yes
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest*
-
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+$as_echo "$gt_cv_c_wchar_t" >&6; }
+  if test $gt_cv_c_wchar_t = yes; then
 
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
 
-    fi
   fi
 
 
-
-
-
-
-        if test $ac_cv_func_symlink = no; then
-    HAVE_SYMLINK=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5
-$as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; }
-if ${gl_cv_func_symlink_works+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+$as_echo_n "checking for wint_t... " >&6; }
+if test "${gt_cv_c_wint_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_symlink_works="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_symlink_works="guessing no" ;;
-          esac
-
-else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <unistd.h>
 
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.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 <stdio.h>
+#include <time.h>
+#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';
 int
 main ()
 {
-int result = 0;
-             if (!symlink ("a", "conftest.link/"))
-               result |= 1;
-             if (symlink ("conftest.f", "conftest.lnk2"))
-               result |= 2;
-             else if (!symlink ("a", "conftest.lnk2/"))
-               result |= 4;
-             return result;
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_symlink_works=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wint_t=yes
 else
-  gl_cv_func_symlink_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  gt_cv_c_wint_t=no
 fi
-
-      rm -f conftest.f conftest.link conftest.lnk2
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_symlink_works" >&5
-$as_echo "$gl_cv_func_symlink_works" >&6; }
-    case "$gl_cv_func_symlink_works" in
-      *yes) ;;
-      *)
-        REPLACE_SYMLINK=1
-        ;;
-    esac
-  fi
-
-  if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS symlink.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_SYMLINK" != 1; then
-        if test "$GNULIB_SYMLINK" = 0; then
-      GNULIB_SYMLINK=$gl_module_indicator_condition
-    else
-      GNULIB_SYMLINK="($GNULIB_SYMLINK || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_SYMLINK 1" >>confdefs.h
-
-
-
-
-
-
-  if test $gl_threads_api = posix; then
-    gl_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIBMULTITHREAD"
-    for ac_func in pthread_atfork
-do :
-  ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork"
-if test "x$ac_cv_func_pthread_atfork" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_ATFORK 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+$as_echo "$gt_cv_c_wint_t" >&6; }
+  if test $gt_cv_c_wint_t = yes; then
 
-fi
-done
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
 
-    LIBS="$gl_save_LIBS"
   fi
 
 
-
-       if  { test "$HAVE_LIBUNISTRING" != yes \
-    || {
-
+  :
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-                         }
-                    }
-               }
 
 
 
 
-       }
-  }; then
-  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE=
-  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_FALSE='#'
-else
-  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE='#'
-  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_FALSE=
-fi
 
 
 
@@ -53529,7 +45486,7 @@
   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
   # irrelevant for anonymous mappings.
   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
+if test "x$ac_cv_func_mmap" = x""yes; then :
   gl_have_mmap=yes
 else
   gl_have_mmap=no
@@ -53546,12 +45503,12 @@
 
 #include <sys/mman.h>
 #ifdef MAP_ANONYMOUS
-    I cannot identify this map
+    I cant identify this map.
 #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
   gl_have_mmap_anonymous=yes
 fi
 rm -f conftest*
@@ -53562,12 +45519,12 @@
 
 #include <sys/mman.h>
 #ifdef MAP_ANON
-    I cannot identify this map
+    I cant identify this map.
 #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
 
 $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
@@ -53586,889 +45543,303 @@
   fi
 
 
+  :
 
 
 
-       if  { test "$HAVE_LIBUNISTRING" != yes \
-    || {
-
-
-
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-                         }
-                    }
-               }
-
-
-
-
-       }
-  }; then
-  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE=
-  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_FALSE='#'
-else
-  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE='#'
-  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_FALSE=
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
-
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
-$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
-      esac
-      if test $LOCALE_JA != none; then
-        if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
 
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        if (mbsinit (&state))
-          return 1;
-    }
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_incomplete_state=yes
-else
-  gl_cv_func_mbrtowc_incomplete_state=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
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
-$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+  :
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
-$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-                  case "$host_os" in
-                    # Guess no on Solaris 8.
-        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
-                    # Guess yes otherwise.
-        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
-      esac
-      if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  /* This fails on Solaris 8:
-     mbrtowc returns 2, and sets wc to 0x00F0.
-     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
-    {
-      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
 
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 6, &state) != 4
-          && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
-    }
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_sanitycheck=yes
-else
-  gl_cv_func_mbrtowc_sanitycheck=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
+  :
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
-$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
-    REPLACE_MBSTATE_T=0
-    case "$gl_cv_func_mbrtowc_incomplete_state" in
-      *yes) ;;
-      *) REPLACE_MBSTATE_T=1 ;;
-    esac
-    case "$gl_cv_func_mbrtowc_sanitycheck" in
-      *yes) ;;
-      *) REPLACE_MBSTATE_T=1 ;;
-    esac
-  else
-    REPLACE_MBSTATE_T=1
-  fi
 
 
 
-  if test $ac_cv_func_wcrtomb = no; then
-    HAVE_WCRTOMB=0
-    ac_fn_c_check_decl "$LINENO" "wcrtomb" "ac_cv_have_decl_wcrtomb" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
+        if test $ac_cv_func_symlink = no; then
+    HAVE_SYMLINK=0
 
-"
-if test "x$ac_cv_have_decl_wcrtomb" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_WCRTOMB $ac_have_decl
-_ACEOF
 
-    if test $ac_cv_have_decl_wcrtomb = yes; then
-                        REPLACE_WCRTOMB=1
-    fi
-  else
-    if test $REPLACE_MBSTATE_T = 1; then
-      REPLACE_WCRTOMB=1
-    else
 
 
 
 
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
-$as_echo_n "checking whether wcrtomb return value is correct... " >&6; }
-if ${gl_cv_func_wcrtomb_retval+:} false; then :
+  gltests_LIBOBJS="$gltests_LIBOBJS symlink.$ac_objext"
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5
+$as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; }
+if test "${gl_cv_func_symlink_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-
-                              case "$host_os" in
-                                     # Guess no on AIX 4, OSF/1 and Solaris.
-            aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;;
-                                     # Guess yes otherwise.
-            *)                       gl_cv_func_wcrtomb_retval="guessing yes" ;;
-          esac
-          if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
-            if test "$cross_compiling" = yes; then :
-  :
+  if test "$cross_compiling" = yes; then :
+  gl_cv_func_symlink_works="guessing no"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <unistd.h>
 
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
+int
+main ()
 {
-  int result = 0;
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 1;
-    }
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 2;
-    }
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 4;
-    }
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 8;
-    }
-  return result;
+if (!symlink ("a", "conftest.link/")) return 1;
+      if (symlink ("conftest.f", "conftest.lnk2")) return 2;
+      if (!symlink ("a", "conftest.lnk2/")) return 3;
+  ;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_wcrtomb_retval=yes
+  gl_cv_func_symlink_works=yes
 else
-  gl_cv_func_wcrtomb_retval=no
+  gl_cv_func_symlink_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
-
+      rm -f conftest.f conftest.link conftest.lnk2
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5
-$as_echo "$gl_cv_func_wcrtomb_retval" >&6; }
-      case "$gl_cv_func_wcrtomb_retval" in
-        *yes) ;;
-        *) REPLACE_WCRTOMB=1 ;;
-      esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_symlink_works" >&5
+$as_echo "$gl_cv_func_symlink_works" >&6; }
+    if test "$gl_cv_func_symlink_works" != yes; then
+      REPLACE_SYMLINK=1
+
+
+
+
+
+
+
+
+  gltests_LIBOBJS="$gltests_LIBOBJS symlink.$ac_objext"
+
     fi
   fi
 
-  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
 
 
 
+  GNULIB_SYMLINK=$gl_module_indicator_condition
 
 
 
+$as_echo "#define GNULIB_TEST_SYMLINK 1" >>confdefs.h
 
 
-  gltests_LIBOBJS="$gltests_LIBOBJS wcrtomb.$ac_objext"
 
 
   :
 
-  fi
 
 
 
 
 
-    if test "$GNULIB_WCRTOMB" != 1; then
-        if test "$GNULIB_WCRTOMB" = 0; then
-      GNULIB_WCRTOMB=$gl_module_indicator_condition
-    else
-      GNULIB_WCRTOMB="($GNULIB_WCRTOMB || $gl_module_indicator_condition)"
-    fi
-  fi
 
 
 
+  if test $gl_threads_api = posix; then
+    gl_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIBMULTITHREAD"
+    for ac_func in pthread_atfork
+do :
+  ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork"
+if test "x$ac_cv_func_pthread_atfork" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_ATFORK 1
+_ACEOF
 
+fi
+done
 
-$as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
+    LIBS="$gl_save_LIBS"
+  fi
 
 
 
+       if  { test "$HAVE_LIBUNISTRING" != yes \
+    || {
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
+                         }
+                    }
+               }
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
 
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
 
+       }
+  }; then
+  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE=
+  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_FALSE='#'
+else
+  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE='#'
+  LIBUNISTRING_COMPILE_UNISTR_U8_CMP_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+
+
+
+  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
+  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+  # irrelevant for anonymous mappings.
+  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = x""yes; then :
+  gl_have_mmap=yes
 else
+  gl_have_mmap=no
+fi
+
 
+  # Try to allow MAP_ANONYMOUS.
+  gl_have_mmap_anonymous=no
+  if test $gl_have_mmap = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
+$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
+#include <sys/mman.h>
+#ifdef MAP_ANONYMOUS
+    I cant identify this map.
 #endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
+  gl_have_mmap_anonymous=yes
+fi
+rm -f conftest*
+
+    if test $gl_have_mmap_anonymous != yes; then
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/mman.h>
+#ifdef MAP_ANON
+    I cant identify this map.
 #endif
-  return 0;
-}
 
 _ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "I cant identify this map." >/dev/null 2>&1; then :
+
+$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
+         gl_have_mmap_anonymous=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+rm -f conftest*
 
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
+$as_echo "$gl_have_mmap_anonymous" >&6; }
+    if test $gl_have_mmap_anonymous = yes; then
 
+$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
 
+    fi
+  fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  :
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
-     on Cygwin 1.5.x.  */
-  if (MB_CUR_MAX == 1)
-    return 1;
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  return 0;
-}
 
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
-            else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
-              else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
 
+
+
+  :
+
+
+
+
+
+
+
+       if  { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+
+
+
+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
+                         }
+                    }
+               }
+
+
+
+
+       }
+  }; then
+  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE=
+  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_FALSE='#'
+else
+  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE='#'
+  LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
-  LOCALE_JA=$gt_cv_locale_ja
 
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  :
 
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  /* Check whether a typical GB18030 multibyte sequence is recognized as a
-     single wide character.  This excludes the GB2312 and GBK encodings.  */
-  if (mblen ("\203\062\332\066", 5) != 4)
-    return 1;
-  return 0;
-}
 
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
-          gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
-    else
-      # If there was a link error, due to mblen(), the system is so old that
-      # it certainly doesn't have a chinese locale.
-      gt_cv_locale_zh_CN=none
-    fi
-    rm -fr conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
-  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
+  if test $ac_cv_func_wctob = no; then
+    HAVE_DECL_WCTOB=0
 
+    :
 
 
 
-  if test $ac_cv_func_wctob = no; then
-    HAVE_WCTOB=0
-    HAVE_DECL_WCTOB=0
+
+
+
+
+
+
+  gltests_LIBOBJS="$gltests_LIBOBJS wctob.$ac_objext"
+
+
+  :
+
   else
-    HAVE_WCTOB=1
 
 
 
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wctob works" >&5
 $as_echo_n "checking whether wctob works... " >&6; }
-if ${gl_cv_func_wctob_works+:} false; then :
+if test "${gl_cv_func_wctob_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -54488,13 +45859,6 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 
 register long global __asm__ ("%ebx");
@@ -54531,13 +45895,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -54570,7 +45927,24 @@
       *yes) ;;
       *) REPLACE_WCTOB=1 ;;
     esac
-    if test $REPLACE_WCTOB = 0; then
+    if test $REPLACE_WCTOB = 1; then
+
+    :
+
+
+
+
+
+
+
+
+
+  gltests_LIBOBJS="$gltests_LIBOBJS wctob.$ac_objext"
+
+
+  :
+
+    else
 
             ac_fn_c_check_decl "$LINENO" "wctob" "ac_cv_have_decl_wctob" "
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -54583,7 +45957,7 @@
 #include <wchar.h>
 
 "
-if test "x$ac_cv_have_decl_wctob" = xyes; then :
+if test "x$ac_cv_have_decl_wctob" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -54595,86 +45969,21 @@
 
       if test $ac_cv_have_decl_wctob != yes; then
         HAVE_DECL_WCTOB=0
-      fi
-    fi
-  fi
-
-  if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS wctob.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
 
+    :
 
-    if test "$GNULIB_WCTOB" != 1; then
-        if test "$GNULIB_WCTOB" = 0; then
-      GNULIB_WCTOB=$gl_module_indicator_condition
-    else
-      GNULIB_WCTOB="($GNULIB_WCTOB || $gl_module_indicator_condition)"
+      fi
     fi
   fi
 
 
 
 
-
-$as_echo "#define GNULIB_TEST_WCTOB 1" >>confdefs.h
-
-
-
-
-
-
-  if false; then
-    REPLACE_WCTOMB=1
-  fi
-
-  if test $REPLACE_WCTOMB = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS wctomb.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_WCTOMB" != 1; then
-        if test "$GNULIB_WCTOMB" = 0; then
-      GNULIB_WCTOMB=$gl_module_indicator_condition
-    else
-      GNULIB_WCTOMB="($GNULIB_WCTOMB || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
+  GNULIB_WCTOB=$gl_module_indicator_condition
 
 
 
-$as_echo "#define GNULIB_TEST_WCTOMB 1" >>confdefs.h
+$as_echo "#define GNULIB_TEST_WCTOB 1" >>confdefs.h
 
 
 
@@ -54684,7 +45993,7 @@
   if test $gl_threads_api = posix; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
 $as_echo_n "checking for sched_yield in -lrt... " >&6; }
-if ${ac_cv_lib_rt_sched_yield+:} false; then :
+if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -54718,12 +46027,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
 $as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
-if test "x$ac_cv_lib_rt_sched_yield" = xyes; then :
+if test "x$ac_cv_lib_rt_sched_yield" = x""yes; then :
   YIELD_LIB=-lrt
 else
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
 $as_echo_n "checking for sched_yield in -lposix4... " >&6; }
-if ${ac_cv_lib_posix4_sched_yield+:} false; then :
+if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -54757,7 +46066,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
 $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; }
-if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then :
+if test "x$ac_cv_lib_posix4_sched_yield" = x""yes; then :
   YIELD_LIB=-lposix4
 fi
 
@@ -54793,6 +46102,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
    if false; then
   GL_COND_LIBTOOL_TRUE=
   GL_COND_LIBTOOL_FALSE='#'
@@ -54815,10 +46136,16 @@
 
 
   gl_source_base='libgrep'
+  # Code from module btowc:
+
+
 
 
 
 
+  :
+
+
 
 
 
@@ -54831,7 +46158,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5
 $as_echo_n "checking whether btowc(0) is correct... " >&6; }
-if ${gl_cv_func_btowc_nul+:} false; then :
+if test "${gl_cv_func_btowc_nul+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -54848,14 +46175,8 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
+#include <string.h>
 #include <wchar.h>
 int main ()
 {
@@ -54880,7 +46201,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5
 $as_echo_n "checking whether btowc(EOF) is correct... " >&6; }
-if ${gl_cv_func_btowc_eof+:} false; then :
+if test "${gl_cv_func_btowc_eof+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -54898,14 +46219,8 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
+#include <string.h>
 #include <wchar.h>
 int main ()
 {
@@ -54941,9 +46256,11 @@
       *) REPLACE_BTOWC=1 ;;
     esac
   fi
-
   if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
 
+    :
+
+
 
 
 
@@ -54961,21 +46278,16 @@
 
 
 
-
-    if test "$GNULIB_BTOWC" != 1; then
-        if test "$GNULIB_BTOWC" = 0; then
-      GNULIB_BTOWC=IN_GETTEXT_TOOLS_LIBGREP
-    else
-      GNULIB_BTOWC="($GNULIB_BTOWC || IN_GETTEXT_TOOLS_LIBGREP)"
-    fi
-  fi
+  GNULIB_BTOWC=1
 
 
 
+$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
 
 
-$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
 
+  # Code from module c++defs:
+  # Code from module langinfo:
 
 
 
@@ -54985,6 +46297,7 @@
 
 
 
+  :
 
 
 
@@ -54997,51 +46310,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <langinfo.h>" >&5
 $as_echo_n "checking absolute name of <langinfo.h>... " >&6; }
-if ${gl_cv_next_langinfo_h+:} false; then :
+if test "${gl_cv_next_langinfo_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_langinfo_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_langinfo_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'langinfo.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_langinfo_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_langinfo_h
-           gl_cv_next_langinfo_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_langinfo_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/langinfo.h#{
+                 s#.*"\(.*/langinfo.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_langinfo_h='<'langinfo.h'>'
-             fi
-
+            gl_cv_next_langinfo_h='<'langinfo.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_langinfo_h" >&5
@@ -55061,17 +46353,20 @@
 
 
 
-
     HAVE_LANGINFO_CODESET=0
-  HAVE_LANGINFO_T_FMT_AMPM=0
   HAVE_LANGINFO_ERA=0
-  HAVE_LANGINFO_YESEXPR=0
+
+  :
+
+
+
+
 
   if test $ac_cv_header_langinfo_h = yes; then
     HAVE_LANGINFO_H=1
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5
 $as_echo_n "checking whether langinfo.h defines CODESET... " >&6; }
-if ${gl_cv_header_langinfo_codeset+:} false; then :
+if test "${gl_cv_header_langinfo_codeset+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -55100,40 +46395,9 @@
     if test $gl_cv_header_langinfo_codeset = yes; then
       HAVE_LANGINFO_CODESET=1
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines T_FMT_AMPM" >&5
-$as_echo_n "checking whether langinfo.h defines T_FMT_AMPM... " >&6; }
-if ${gl_cv_header_langinfo_t_fmt_ampm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <langinfo.h>
-int a = T_FMT_AMPM;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_header_langinfo_t_fmt_ampm=yes
-else
-  gl_cv_header_langinfo_t_fmt_ampm=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_langinfo_t_fmt_ampm" >&5
-$as_echo "$gl_cv_header_langinfo_t_fmt_ampm" >&6; }
-    if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
-      HAVE_LANGINFO_T_FMT_AMPM=1
-    fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5
 $as_echo_n "checking whether langinfo.h defines ERA... " >&6; }
-if ${gl_cv_header_langinfo_era+:} false; then :
+if test "${gl_cv_header_langinfo_era+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -55162,37 +46426,6 @@
     if test $gl_cv_header_langinfo_era = yes; then
       HAVE_LANGINFO_ERA=1
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines YESEXPR" >&5
-$as_echo_n "checking whether langinfo.h defines YESEXPR... " >&6; }
-if ${gl_cv_header_langinfo_yesexpr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <langinfo.h>
-int a = YESEXPR;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_header_langinfo_yesexpr=yes
-else
-  gl_cv_header_langinfo_yesexpr=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_langinfo_yesexpr" >&5
-$as_echo "$gl_cv_header_langinfo_yesexpr" >&6; }
-    if test $gl_cv_header_langinfo_yesexpr = yes; then
-      HAVE_LANGINFO_YESEXPR=1
-    fi
   else
     HAVE_LANGINFO_H=0
   fi
@@ -55201,13 +46434,11 @@
 
 
 
-
-
     for gl_func in nl_langinfo; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -55233,7 +46464,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -55243,299 +46475,38 @@
       done
 
 
+  # Code from module nl_langinfo:
 
 
 
 
-  if test $REPLACE_STRUCT_LCONV = 1; then
-    REPLACE_LOCALECONV=1
-  fi
-
-  if test $REPLACE_LOCALECONV = 1; then
-
-
-
-
-
-
-
-
-  grgl_LIBOBJS="$grgl_LIBOBJS localeconv.$ac_objext"
-
-
-  ac_fn_c_check_member "$LINENO" "struct lconv" "decimal_point" "ac_cv_member_struct_lconv_decimal_point" "#include <locale.h>
-"
-if test "x$ac_cv_member_struct_lconv_decimal_point" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1
-_ACEOF
-
-
-fi
-
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_LOCALECONV" != 1; then
-        if test "$GNULIB_LOCALECONV" = 0; then
-      GNULIB_LOCALECONV=IN_GETTEXT_TOOLS_LIBGREP
-    else
-      GNULIB_LOCALECONV="($GNULIB_LOCALECONV || IN_GETTEXT_TOOLS_LIBGREP)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h
-
-
-
-
-
-  if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
-    ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
-"
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
-
-$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
-
-fi
-
-    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-      #include <pthread.h>
-int
-main ()
-{
-
-#if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
-  :
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_LOCK IN_GETTEXT_TOOLS_LIBGREP
-_ACEOF
-
-
-
-
-
-
-
-
-  if test $ac_cv_func_mbrlen = no; then
-    HAVE_MBRLEN=0
-    ac_fn_c_check_decl "$LINENO" "mbrlen" "ac_cv_have_decl_mbrlen" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-
-"
-if test "x$ac_cv_have_decl_mbrlen" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRLEN $ac_have_decl
-_ACEOF
-
-    if test $ac_cv_have_decl_mbrlen = yes; then
-                        REPLACE_MBRLEN=1
-    fi
-  else
-                    if test $REPLACE_MBRTOWC = 1; then
-      REPLACE_MBRLEN=1
-    fi
-  fi
-
-  if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
-
-
-
-
-
-
-
-
-  grgl_LIBOBJS="$grgl_LIBOBJS mbrlen.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_MBRLEN" != 1; then
-        if test "$GNULIB_MBRLEN" = 0; then
-      GNULIB_MBRLEN=IN_GETTEXT_TOOLS_LIBGREP
-    else
-      GNULIB_MBRLEN="($GNULIB_MBRLEN || IN_GETTEXT_TOOLS_LIBGREP)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_MBRLEN 1" >>confdefs.h
-
-
-
-
-
-
-  if false; then
-    REPLACE_MBTOWC=1
-  fi
-
-  if test $REPLACE_MBTOWC = 1; then
-
-
-
-
-
-
-
-
-  grgl_LIBOBJS="$grgl_LIBOBJS mbtowc.$ac_objext"
-
-
   :
 
-  fi
-
-
-
-
-
-    if test "$GNULIB_MBTOWC" != 1; then
-        if test "$GNULIB_MBTOWC" = 0; then
-      GNULIB_MBTOWC=IN_GETTEXT_TOOLS_LIBGREP
-    else
-      GNULIB_MBTOWC="($GNULIB_MBTOWC || IN_GETTEXT_TOOLS_LIBGREP)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
-
-
-
-
 
 
 
-     if test $ac_cv_func_nl_langinfo = yes; then
-    # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether YESEXPR works" >&5
-$as_echo_n "checking whether YESEXPR works... " >&6; }
-if ${gl_cv_func_nl_langinfo_yesexpr_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-
-         case "$host_os" in
-                   # Guess no on irix systems.
-           irix*)  gl_cv_func_nl_langinfo_yesexpr_works="guessing no";;
-                   # Guess yes elsewhere.
-           *)      gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <langinfo.h>
-
-int
-main ()
-{
-return !*nl_langinfo(YESEXPR);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_nl_langinfo_yesexpr_works=yes
-else
-  gl_cv_func_nl_langinfo_yesexpr_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_nl_langinfo_yesexpr_works" >&5
-$as_echo "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; }
-    case $gl_cv_func_nl_langinfo_yesexpr_works in
-      *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;;
-      *)    FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;;
-    esac
-
-cat >>confdefs.h <<_ACEOF
-#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS
-_ACEOF
 
-    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \
-        && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
+  if test $ac_cv_func_nl_langinfo = yes; then
+    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then
       :
     else
       REPLACE_NL_LANGINFO=1
 
 $as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h
 
+
+
+
+
+
+
+
+
+  grgl_LIBOBJS="$grgl_LIBOBJS nl_langinfo.$ac_objext"
+
     fi
   else
     HAVE_NL_LANGINFO=0
-  fi
-
-  if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
 
 
 
@@ -55551,20 +46522,20 @@
 
 
 
+  GNULIB_NL_LANGINFO=1
+
 
-    if test "$GNULIB_NL_LANGINFO" != 1; then
-        if test "$GNULIB_NL_LANGINFO" = 0; then
-      GNULIB_NL_LANGINFO=IN_GETTEXT_TOOLS_LIBGREP
-    else
-      GNULIB_NL_LANGINFO="($GNULIB_NL_LANGINFO || IN_GETTEXT_TOOLS_LIBGREP)"
-    fi
-  fi
+
+$as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h
 
 
 
+  # Code from module regex:
+
+
+  :
 
 
-$as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h
 
 
 
@@ -55584,11 +46555,9 @@
     # following run test, then default to *not* using the included regex.c.
     # If cross compiling, assume the test would fail and use the included
     # regex.c.
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5
 $as_echo_n "checking for working re_compile_pattern... " >&6; }
-if ${gl_cv_func_re_compile_pattern_working+:} false; then :
+if test "${gl_cv_func_re_compile_pattern_working+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -55596,56 +46565,30 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <regex.h>
-
+$ac_includes_default
+           #if HAVE_LOCALE_H
             #include <locale.h>
-            #include <limits.h>
-            #include <string.h>
-
-            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
-            # include <signal.h>
-            # include <unistd.h>
-            #endif
-
-            #if HAVE_MALLOC_H
-            # include <malloc.h>
-            #endif
-
-            #ifdef M_CHECK_ACTION
-            /* Exit with distinguishable exit code.  */
-            static void sigabrt_no_core (int sig) { raise (SIGTERM); }
-            #endif
+           #endif
+           #include <limits.h>
+           #include <regex.h>
 
 int
 main ()
 {
-int result = 0;
-            static struct re_pattern_buffer regex;
+static struct re_pattern_buffer regex;
             unsigned char folded_chars[UCHAR_MAX + 1];
             int i;
             const char *s;
             struct re_registers regs;
 
-            /* Some builds of glibc go into an infinite loop on this
-               test.  Use alarm to force death, and mallopt to avoid
-               malloc recursion in diagnosing the corrupted heap. */
-#if HAVE_DECL_ALARM
-            signal (SIGALRM, SIG_DFL);
-            alarm (2);
-#endif
-#ifdef M_CHECK_ACTION
-            signal (SIGABRT, sigabrt_no_core);
-            mallopt (M_CHECK_ACTION, 2);
-#endif
-
-            if (setlocale (LC_ALL, "en_US.UTF-8"))
-              {
+            #if HAVE_LOCALE_H
+              /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+                 This test needs valgrind to catch the bug on Debian
+                 GNU/Linux 3.1 x86, but it might catch the bug better
+                 on other platforms and it shouldn't hurt to try the
+                 test here.  */
+              if (setlocale (LC_ALL, "en_US.UTF-8"))
                 {
-                  /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
-                     This test needs valgrind to catch the bug on Debian
-                     GNU/Linux 3.1 x86, but it might catch the bug better
-                     on other platforms and it shouldn't hurt to try the
-                     test here.  */
                   static char const pat[] = "insert into";
                   static char const data[] =
                     "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
@@ -55654,57 +46597,26 @@
                   memset (&regex, 0, sizeof regex);
                   s = re_compile_pattern (pat, sizeof pat - 1, &regex);
                   if (s)
-                    result |= 1;
-                  else if (re_search (&regex, data, sizeof data - 1,
-                                      0, sizeof data - 1, &regs)
-                           != -1)
-                    result |= 1;
-                }
-
-                {
-                  /* This test is from glibc bug 15078.
-                     The test case is from Andreas Schwab in
-                     <http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html>.
-                     */
-                  static char const pat[] = "[^x]x";
-                  static char const data[] =
-                    /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
-                    "\xe1\x80\x80"
-                    "\xe1\x80\xbb"
-                    "\xe1\x80\xbd"
-                    "\xe1\x80\x94"
-                    "\xe1\x80\xba"
-                    "\xe1\x80\xaf"
-                    "\xe1\x80\x95"
-                    "\xe1\x80\xba"
-                    "x";
-                  re_set_syntax (0);
-                  memset (&regex, 0, sizeof regex);
-                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
-                  if (s)
-                    result |= 1;
-                  else
-                    {
-                      i = re_search (&regex, data, sizeof data - 1,
-                                     0, sizeof data - 1, 0);
-                      if (i != 0 && i != 21)
-                        result |= 1;
-                    }
+                    return 1;
+                  if (re_search (&regex, data, sizeof data - 1,
+                                 0, sizeof data - 1, &regs)
+                      != -1)
+                    return 1;
+                  if (! setlocale (LC_ALL, "C"))
+                    return 1;
                 }
-
-                if (! setlocale (LC_ALL, "C"))
-                  return 1;
-              }
+            #endif
 
             /* This test is from glibc bug 3957, reported by Andrew Mackey.  */
             re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE);
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("a[^x]b", 6, &regex);
             if (s)
-              result |= 2;
+              return 1;
+
             /* This should fail, but succeeds for glibc-2.5.  */
-            else if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
-              result |= 2;
+            if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
+              return 1;
 
             /* This regular expression is from Spencer ere test number 75
                in grep-2.3.  */
@@ -55716,7 +46628,7 @@
             s = re_compile_pattern ("a[[:]:]]b\n", 11, &regex);
             /* This should fail with _Invalid character class name_ error.  */
             if (!s)
-              result |= 4;
+              return 1;
 
             /* Ensure that [b-a] is diagnosed as invalid, when
                using RE_NO_EMPTY_RANGES. */
@@ -55724,31 +46636,34 @@
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("a[b-a]", 6, &regex);
             if (s == 0)
-              result |= 8;
+              return 1;
 
             /* This should succeed, but does not for glibc-2.1.3.  */
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("{1", 2, &regex);
+
             if (s)
-              result |= 8;
+              return 1;
 
             /* The following example is derived from a problem report
                against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("[an\371]*n", 7, &regex);
             if (s)
-              result |= 8;
+              return 1;
+
             /* This should match, but does not for glibc-2.2.1.  */
-            else if (re_match (&regex, "an", 2, 0, &regs) != 2)
-              result |= 8;
+            if (re_match (&regex, "an", 2, 0, &regs) != 2)
+              return 1;
 
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("x", 1, &regex);
             if (s)
-              result |= 8;
+              return 1;
+
             /* glibc-2.2.93 does not work with a negative RANGE argument.  */
-            else if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
-              result |= 8;
+            if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
+              return 1;
 
             /* The version of regex.c in older versions of gnulib
                ignored RE_ICASE.  Detect that problem too.  */
@@ -55756,9 +46671,10 @@
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("x", 1, &regex);
             if (s)
-              result |= 16;
-            else if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
-              result |= 16;
+              return 1;
+
+            if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
+              return 1;
 
             /* Catch a bug reported by Vin Shelton in
                http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html
@@ -55769,27 +46685,21 @@
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, &regex);
             if (s)
-              result |= 32;
+              return 1;
 
             /* REG_STARTEND was added to glibc on 2004-01-15.
                Reject older versions.  */
             if (! REG_STARTEND)
-              result |= 64;
+              return 1;
 
-#if 0
-            /* It would be nice to reject hosts whose regoff_t values are too
-               narrow (including glibc on hosts with 64-bit ptrdiff_t and
-               32-bit int), but we should wait until glibc implements this
-               feature.  Otherwise, support for equivalence classes and
-               multibyte collation symbols would always be broken except
-               when compiling --without-included-regex.   */
+            /* Reject hosts whose regoff_t values are too narrow.
+               These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
+               and 32-bit int.  */
             if (sizeof (regoff_t) < sizeof (ptrdiff_t)
                 || sizeof (regoff_t) < sizeof (ssize_t))
-              result |= 64;
-#endif
-
-            return result;
+              return 1;
 
+            return 0;
   ;
   return 0;
 }
@@ -55811,15 +46721,12 @@
     no) ac_use_included_regex=yes;;
     esac
     ;;
-  *) as_fn_error $? "Invalid value for --with-included-regex: $with_included_regex" "$LINENO" 5
+  *) as_fn_error "Invalid value for --with-included-regex: $with_included_regex" "$LINENO" 5
     ;;
   esac
 
   if test $ac_use_included_regex = yes; then
 
-$as_echo "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h
-
-
 $as_echo "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h
 
 
@@ -55867,9 +46774,6 @@
 
 $as_echo "#define regfree rpl_regfree" >>confdefs.h
 
-  fi
-
-  if test $ac_use_included_regex = yes; then
 
 
 
@@ -55885,12 +46789,10 @@
 
 
 
-
-
   for ac_header in libintl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL_H 1
 _ACEOF
@@ -55900,9 +46802,21 @@
 done
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
   ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
 "
-if test "x$ac_cv_have_decl_isblank" = xyes; then :
+if test "x$ac_cv_have_decl_isblank" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -55915,14 +46829,25 @@
 
   fi
 
+  # Code from module warn-on-use:
+  # Code from module wcrtomb:
+
+
+
+
 
 
 
 
 
+  :
+
+
+
 
 
 
+  :
 
 
 
@@ -55934,15 +46859,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -55953,13 +46878,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -55997,7 +46915,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -56017,13 +46935,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -56071,35 +46982,22 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
+  fi
 
-  if test $ac_cv_func_wcrtomb = no; then
-    HAVE_WCRTOMB=0
-    ac_fn_c_check_decl "$LINENO" "wcrtomb" "ac_cv_have_decl_wcrtomb" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_wcrtomb" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_WCRTOMB $ac_have_decl
-_ACEOF
+  :
 
-    if test $ac_cv_have_decl_wcrtomb = yes; then
-                        REPLACE_WCRTOMB=1
-    fi
+
+
+
+
+  if test $ac_cv_func_wcrtomb = no; then
+    HAVE_WCRTOMB=0
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_WCRTOMB=1
@@ -56111,7 +47009,7 @@
 
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
 $as_echo_n "checking whether wcrtomb return value is correct... " >&6; }
-if ${gl_cv_func_wcrtomb_retval+:} false; then :
+if test "${gl_cv_func_wcrtomb_retval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -56129,39 +47027,32 @@
 /* end confdefs.h.  */
 
 #include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
+#include <string.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
   if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 1;
+        return 1;
     }
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 2;
+        return 1;
     }
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 4;
+        return 1;
     }
   if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 8;
+        return 1;
     }
-  return result;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -56184,9 +47075,11 @@
       esac
     fi
   fi
-
   if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
 
+    :
+
+
 
 
 
@@ -56204,16 +47097,7 @@
 
 
 
-
-    if test "$GNULIB_WCRTOMB" != 1; then
-        if test "$GNULIB_WCRTOMB" = 0; then
-      GNULIB_WCRTOMB=IN_GETTEXT_TOOLS_LIBGREP
-    else
-      GNULIB_WCRTOMB="($GNULIB_WCRTOMB || IN_GETTEXT_TOOLS_LIBGREP)"
-    fi
-  fi
-
-
+  GNULIB_WCRTOMB=1
 
 
 
@@ -56221,7 +47105,7 @@
 
 
 
-
+  # Code from module dummy:
   # End of code from modules
 
 
@@ -56282,6 +47166,7 @@
 
 
   gl_source_base='libgettextpo'
+  # Code from module alloca-opt:
 
 
 
@@ -56292,6 +47177,15 @@
 
   :
 
+
+
+
+
+
+
+
+  :
+
   fi
 
   # Define an additional variable used in the Makefile substitution.
@@ -56313,128 +47207,36 @@
 rm -f conftest*
 
 
-   if test -n "$ALLOCA_H"; then
-  GL_GENERATE_ALLOCA_H_TRUE=
-  GL_GENERATE_ALLOCA_H_FALSE='#'
-else
-  GL_GENERATE_ALLOCA_H_TRUE='#'
-  GL_GENERATE_ALLOCA_H_FALSE=
-fi
-
-
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_CLOSE=1
-  fi
-
-
-
-
-
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
-
-fi
-
-done
-
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-
-
-    if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then
-                        REPLACE_CLOSE=1
-    fi
-
-
-
-  if test $REPLACE_CLOSE = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS close.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_CLOSE=1
-
 
+  # Code from module arg-nonnull:
+  # Code from module basename:
+  # Code from module c++defs:
+  # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module c-strcaseeq:
+  # Code from module c-strstr:
+  # Code from module concat-filename:
+  # Code from module configmake:
+  # Code from module diffseq:
+  # Code from module errno:
 
+  # Code from module error:
 
 
-$as_echo "#define GNULIB_TEST_CLOSE 1" >>confdefs.h
-
-
-
-
-          if test "x$datarootdir" = x; then
-    datarootdir='${datadir}'
-
-  fi
-    if test "x$docdir" = x; then
-    docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-
-  fi
-    if test "x$htmldir" = x; then
-    htmldir='${docdir}'
-
-  fi
-  if test "x$dvidir" = x; then
-    dvidir='${docdir}'
 
-  fi
-  if test "x$pdfdir" = x; then
-    pdfdir='${docdir}'
 
-  fi
-  if test "x$psdir" = x; then
-    psdir='${docdir}'
 
-  fi
-  if test "x$lispdir" = x; then
-    lispdir='${datarootdir}/emacs/site-lisp'
 
-  fi
-  if test "x$localedir" = x; then
-    localedir='${datarootdir}/locale'
 
-  fi
-    if test "x$runstatedir" = x; then
-    runstatedir='${localstatedir}/run'
 
-  fi
 
-      pkglibexecdir='${libexecdir}/${PACKAGE}'
 
 
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 $as_echo_n "checking for error_at_line... " >&6; }
-if ${ac_cv_lib_error_at_line+:} false; then :
+if test "${ac_cv_lib_error_at_line+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -56458,8 +47260,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
 $as_echo "$ac_cv_lib_error_at_line" >&6; }
-
-  if test $ac_cv_lib_error_at_line = no; then
+if test $ac_cv_lib_error_at_line = no; then
 
 
 
@@ -56470,11 +47271,14 @@
 
   gtpo_LIBOBJS="$gtpo_LIBOBJS error.$ac_objext"
 
+fi
+
+
 
 
   :
 
-  fi
+
 
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
@@ -56483,6 +47287,10 @@
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
 
+  # Code from module error-progname:
+  # Code from module exitfail:
+  # Code from module extensions:
+  # Code from module fcntl-h:
 
 
 
@@ -56490,6 +47298,9 @@
 
 
 
+  :
+
+
 
 
 
@@ -56500,45 +47311,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 $as_echo_n "checking absolute name of <fcntl.h>... " >&6; }
-if ${gl_cv_next_fcntl_h+:} false; then :
+if test "${gl_cv_next_fcntl_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_fcntl_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'fcntl.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_fcntl_h
-           gl_cv_next_fcntl_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/fcntl.h#{
+                 s#.*"\(.*/fcntl.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_fcntl_h='<'fcntl.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
@@ -56559,16 +47355,11 @@
 
 
 
-
-
-
-
-
     for gl_func in fcntl openat; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -56594,7 +47385,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -56604,120 +47396,21 @@
       done
 
 
+  # Code from module file-ostream:
+  # Code from module filename:
+  # Code from module float:
 
 
 
   FLOAT_H=
-  REPLACE_FLOAT_LDBL=0
   case "$host_os" in
-    aix* | beos* | openbsd* | mirbsd* | irix*)
+    beos* | openbsd*)
       FLOAT_H=float.h
-      ;;
-    freebsd*)
-      case "$host_cpu" in
-        i[34567]86 )
-          FLOAT_H=float.h
-          ;;
-        x86_64 )
-          # On x86_64 systems, the C compiler may still be generating
-          # 32-bit code.
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __x86_64__ || defined __amd64__
-             yes
-             #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-
-else
-  FLOAT_H=float.h
-fi
-rm -f conftest*
-
-          ;;
-      esac
-      ;;
-    linux*)
-      case "$host_cpu" in
-        powerpc*)
-          FLOAT_H=float.h
-          ;;
-      esac
-      ;;
-  esac
-  case "$host_os" in
-    aix* | freebsd* | linux*)
-      if test -n "$FLOAT_H"; then
-        REPLACE_FLOAT_LDBL=1
-      fi
-      ;;
-  esac
-
-    REPLACE_ITOLD=0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether conversion from 'int' to 'long double' works" >&5
-$as_echo_n "checking whether conversion from 'int' to 'long double' works... " >&6; }
-if ${gl_cv_func_itold_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      if test "$cross_compiling" = yes; then :
-  case "$host" in
-           sparc*-*-linux*)
-             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __arch64__
-                yes
-                #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-  gl_cv_func_itold_works="guessing no"
-else
-  gl_cv_func_itold_works="guessing yes"
-fi
-rm -f conftest*
-
-             ;;
-           *) gl_cv_func_itold_works="guessing yes" ;;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int i = -1;
-volatile long double ld;
-int main ()
-{
-  ld += i * 1.0L;
-  if (ld > 0)
-    return 1;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_itold_works=yes
-else
-  gl_cv_func_itold_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_itold_works" >&5
-$as_echo "$gl_cv_func_itold_works" >&6; }
-  case "$gl_cv_func_itold_works" in
-    *no)
-      REPLACE_ITOLD=1
-                  FLOAT_H=float.h
-      ;;
-  esac
-
-  if test -n "$FLOAT_H"; then
 
+  :
 
 
 
@@ -56730,45 +47423,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <float.h>" >&5
 $as_echo_n "checking absolute name of <float.h>... " >&6; }
-if ${gl_cv_next_float_h+:} false; then :
+if test "${gl_cv_next_float_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_float_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <float.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'float.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_float_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_float_h
-           gl_cv_next_float_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/float.h#{
+                 s#.*"\(.*/float.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_float_h='<'float.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5
@@ -56787,43 +47465,11 @@
 
 
 
+      ;;
+  esac
 
-  fi
-
-   if test -n "$FLOAT_H"; then
-  GL_GENERATE_FLOAT_H_TRUE=
-  GL_GENERATE_FLOAT_H_FALSE='#'
-else
-  GL_GENERATE_FLOAT_H_TRUE='#'
-  GL_GENERATE_FLOAT_H_FALSE=
-fi
-
-
-
-  if test $REPLACE_FLOAT_LDBL = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS float.$ac_objext"
-
-  fi
-  if test $REPLACE_ITOLD = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS itold.$ac_objext"
 
-  fi
+  # Code from module fopen:
 
 
 
@@ -56835,17 +47481,16 @@
     *)
                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fopen recognizes a trailing slash" >&5
 $as_echo_n "checking whether fopen recognizes a trailing slash... " >&6; }
-if ${gl_cv_func_fopen_slash+:} false; then :
+if test "${gl_cv_func_fopen_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
           if test "$cross_compiling" = yes; then :
 
              case "$host_os" in
-               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-                 gl_cv_func_fopen_slash="guessing no" ;;
-               *)
-                 gl_cv_func_fopen_slash="guessing yes" ;;
+               solaris2.[0-9]*) gl_cv_func_fopen_slash="guessing no" ;;
+               hpux*)           gl_cv_func_fopen_slash="guessing no" ;;
+               *)               gl_cv_func_fopen_slash="guessing yes" ;;
              esac
 
 else
@@ -56883,7 +47528,6 @@
       REPLACE_FOPEN=1
       ;;
   esac
-
   if test $REPLACE_FOPEN = 1; then
 
 
@@ -56895,86 +47539,57 @@
 
   gtpo_LIBOBJS="$gtpo_LIBOBJS fopen.$ac_objext"
 
-    :
-  fi
-
-
-
-
-
-          GNULIB_FOPEN=1
-
-
 
 
 
-$as_echo "#define GNULIB_TEST_FOPEN 1" >>confdefs.h
-
-
-
-
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_FSTAT=1
   fi
 
 
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-    REPLACE_FSTAT=1
-  fi
-
-
-
-  if test $REPLACE_FSTAT = 1; then
-
-
-
-
 
 
+  GNULIB_FOPEN=1
 
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS fstat.$ac_objext"
 
-    :
-  fi
+$as_echo "#define GNULIB_TEST_FOPEN 1" >>confdefs.h
 
 
 
+  # Code from module fstrcmp:
+  # Code from module fwriteerror:
 
 
-          GNULIB_FSTAT=1
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_FWRITEERROR 1
+_ACEOF
 
 
+  # Code from module gcd:
+  # Code from module getdelim:
 
 
 
-$as_echo "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
+  :
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_FWRITEERROR 1
-_ACEOF
 
 
 
 
 
+  :
 
 
 
 
 
   if test $ac_cv_func_getdelim = yes; then
-    HAVE_GETDELIM=1
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
 $as_echo_n "checking for working getdelim function... " >&6; }
-if ${gl_cv_func_working_getdelim+:} false; then :
+if test "${gl_cv_func_working_getdelim+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -56984,7 +47599,7 @@
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
@@ -56992,9 +47607,9 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
-  gl_cv_func_working_getdelim="guessing yes"
+  gl_cv_func_working_getdelim=yes
 else
-  gl_cv_func_working_getdelim="guessing no"
+  gl_cv_func_working_getdelim=no
 fi
 rm -f conftest*
 
@@ -57018,7 +47633,7 @@
         size_t siz = 0;
         int len = getdelim (&line, &siz, '\n', in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
-          return 2;
+          return 1;
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -57026,7 +47641,7 @@
         char *line = NULL;
         size_t siz = (size_t)(~0) / 4;
         if (getdelim (&line, &siz, '\n', in) == -1)
-          return 3;
+          return 1;
       }
       return 0;
     }
@@ -57044,20 +47659,18 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
 $as_echo "$gl_cv_func_working_getdelim" >&6; }
-    case "$gl_cv_func_working_getdelim" in
-      *no)
-        REPLACE_GETDELIM=1
-        ;;
-    esac
   else
-    HAVE_GETDELIM=0
+    gl_cv_func_working_getdelim=no
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then
     HAVE_DECL_GETDELIM=0
   fi
 
-  if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
+  if test $gl_cv_func_working_getdelim = no; then
+    if test $ac_cv_func_getdelim = yes; then
+      REPLACE_GETDELIM=1
+    fi
 
 
 
@@ -57073,7 +47686,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -57082,7 +47696,7 @@
 done
 
   ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -57098,19 +47712,23 @@
 
 
 
+  GNULIB_GETDELIM=1
 
-          GNULIB_GETDELIM=1
 
 
+$as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h
+  # Code from module getline:
+
 
 
 
 
 
+  :
+
 
 
 
@@ -57118,7 +47736,7 @@
 
   gl_getline_needs_run_time_check=no
   ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
-if test "x$ac_cv_func_getline" = xyes; then :
+if test "x$ac_cv_func_getline" = x""yes; then :
                    gl_getline_needs_run_time_check=yes
 else
   am_cv_func_working_getline=no
@@ -57127,7 +47745,7 @@
   if test $gl_getline_needs_run_time_check = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
 $as_echo_n "checking for working getline function... " >&6; }
-if ${am_cv_func_working_getline+:} false; then :
+if test "${am_cv_func_working_getline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -57137,7 +47755,7 @@
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
@@ -57145,9 +47763,9 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
-  am_cv_func_working_getline="guessing yes"
+  am_cv_func_working_getline=yes
 else
-  am_cv_func_working_getline="guessing no"
+  am_cv_func_working_getline=no
 fi
 rm -f conftest*
 
@@ -57171,7 +47789,7 @@
         size_t siz = 0;
         int len = getline (&line, &siz, in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
-          return 2;
+          return 1;
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -57179,7 +47797,7 @@
         char *line = NULL;
         size_t siz = (size_t)(~0) / 4;
         if (getline (&line, &siz, in) == -1)
-          return 3;
+          return 1;
       }
       return 0;
     }
@@ -57203,13 +47821,8 @@
     HAVE_DECL_GETLINE=0
   fi
 
-  case "$am_cv_func_working_getline" in
-    *no)
-                        REPLACE_GETLINE=1
-      ;;
-  esac
-
-  if test $REPLACE_GETLINE = 1; then
+  if test $am_cv_func_working_getline = no; then
+                REPLACE_GETLINE=1
 
 
 
@@ -57221,176 +47834,112 @@
   gtpo_LIBOBJS="$gtpo_LIBOBJS getline.$ac_objext"
 
 
-  :
-
-  fi
-
-
-
-
-
-          GNULIB_GETLINE=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
-
-
-
-
-
-
 
 
 
 
 
-  gl_gettimeofday_timezone=void
-  if test $ac_cv_func_gettimeofday != yes; then
-    HAVE_GETTIMEOFDAY=0
-  else
 
 
+  :
+
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
-$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
-if ${gl_cv_func_gettimeofday_clobber+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # When cross-compiling:
-      case "$host_os" in
-                # Guess all is fine on glibc systems.
-        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                # If we don't know, assume the worst.
-        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-      esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-          #include <sys/time.h>
-          #include <time.h>
-          #include <stdlib.h>
-
-int
-main ()
-{
 
-          time_t t = 0;
-          struct tm *lt;
-          struct tm saved_lt;
-          struct timeval tv;
-          lt = localtime (&t);
-          saved_lt = *lt;
-          gettimeofday (&tv, NULL);
-          return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_gettimeofday_clobber=no
-else
-  gl_cv_func_gettimeofday_clobber=yes
-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_gettimeofday_clobber" >&5
-$as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
 
- case "$gl_cv_func_gettimeofday_clobber" in
-   *yes)
-     REPLACE_GETTIMEOFDAY=1
 
-  REPLACE_GMTIME=1
-  REPLACE_LOCALTIME=1
+  :
 
 
-$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
 
-     ;;
- esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
-$as_echo_n "checking for gettimeofday with POSIX signature... " >&6; }
-if ${gl_cv_func_gettimeofday_posix_signature+:} false; then :
+
+  if test $ac_cv_func_getdelim = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
+$as_echo_n "checking for working getdelim function... " >&6; }
+if test "${gl_cv_func_working_getdelim+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+    if test "$cross_compiling" = yes; then :
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/time.h>
-              struct timeval c;
-              int gettimeofday (struct timeval *restrict, void *restrict);
 
-int
-main ()
-{
-/* glibc uses struct timezone * rather than the POSIX void *
-                 if _GNU_SOURCE is defined.  However, since the only portable
-                 use of gettimeofday uses NULL as the second parameter, and
-                 since the glibc definition is actually more typesafe, it is
-                 not worth wrapping this to get a compliant signature.  */
-              int (*f) (struct timeval *restrict, void *restrict)
-                = gettimeofday;
-              int x = f (&c, 0);
-              return !(x | c.tv_sec | c.tv_usec);
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_gettimeofday_posix_signature=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
+  gl_cv_func_working_getdelim=yes
+else
+  gl_cv_func_working_getdelim=no
+fi
+rm -f conftest*
+
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/time.h>
-int gettimeofday (struct timeval *restrict, struct timezone *restrict);
 
-int
-main ()
-{
+#    include <stdio.h>
+#    include <stdlib.h>
+#    include <string.h>
+    int main ()
+    {
+      FILE *in = fopen ("./conftest.data", "r");
+      if (!in)
+        return 1;
+      {
+        /* Test result for a NULL buffer and a zero size.
+           Based on a test program from Karl Heuer.  */
+        char *line = NULL;
+        size_t siz = 0;
+        int len = getdelim (&line, &siz, '\n', in);
+        if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
+          return 1;
+      }
+      {
+        /* Test result for a NULL buffer and a non-zero size.
+           This crashes on FreeBSD 8.0.  */
+        char *line = NULL;
+        size_t siz = (size_t)(~0) / 4;
+        if (getdelim (&line, &siz, '\n', in) == -1)
+          return 1;
+      }
+      return 0;
+    }
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_gettimeofday_posix_signature=almost
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_working_getdelim=yes
 else
-  gl_cv_func_gettimeofday_posix_signature=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  gl_cv_func_working_getdelim=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5
-$as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; }
-    if test $gl_cv_func_gettimeofday_posix_signature = almost; then
-      gl_gettimeofday_timezone='struct timezone'
-    elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
-        if test $REPLACE_STRUCT_TIMEVAL = 1; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
+$as_echo "$gl_cv_func_working_getdelim" >&6; }
+  else
+    gl_cv_func_working_getdelim=no
   fi
 
-cat >>confdefs.h <<_ACEOF
-#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone
-_ACEOF
-
+  if test $ac_cv_have_decl_getdelim = no; then
+    HAVE_DECL_GETDELIM=0
+  fi
 
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+  if test $gl_cv_func_working_getdelim = no; then
+    if test $ac_cv_func_getdelim = yes; then
+      REPLACE_GETDELIM=1
+    fi
 
 
 
@@ -57399,58 +47948,59 @@
 
 
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS gettimeofday.$ac_objext"
+  gtpo_LIBOBJS="$gtpo_LIBOBJS getdelim.$ac_objext"
 
 
-  for ac_header in sys/timeb.h
+  for ac_func in flockfile funlockfile
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_timeb_h" = xyes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_TIMEB_H 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
-
 done
 
-  for ac_func in _ftime
-do :
-  ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
-if test "x$ac_cv_func__ftime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__FTIME 1
-_ACEOF
-
+  ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
 fi
-done
-
-
-  fi
-
-
-
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+_ACEOF
 
-          GNULIB_GETTIMEOFDAY=1
 
+  fi
 
 
+  fi
 
 
-$as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
+  GNULIB_GETLINE=1
 
 
 
+$as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
 
 
 
+  # Code from module gettext-h:
 
-          GNULIB_ICONV=1
 
+  # Code from module gperf:
+  # Code from module hash:
+  # Code from module havelib:
+  # Code from module iconv:
 
+  # Code from module iconv-h:
 
 
 
@@ -57458,6 +48008,7 @@
 
 
 
+  :
 
 
 
@@ -57470,51 +48021,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <iconv.h>" >&5
 $as_echo_n "checking absolute name of <iconv.h>... " >&6; }
-if ${gl_cv_next_iconv_h+:} false; then :
+if test "${gl_cv_next_iconv_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_iconv_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_iconv_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'iconv.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_iconv_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_iconv_h
-           gl_cv_next_iconv_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_iconv_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/iconv.h#{
+                 s#.*"\(.*/iconv.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_iconv_h='<'iconv.h'>'
-             fi
-
+            gl_cv_next_iconv_h='<'iconv.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
@@ -57534,7 +48064,7 @@
 
 
 
-
+  # Code from module iconv_open:
 
 
 
@@ -57543,20 +48073,12 @@
 
 
   ICONV_H='iconv.h'
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
 
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #include <iconv.h>
-      #if defined _LIBICONV_VERSION || (defined __GLIBC__ && !defined __UCLIBC__)
+      #if defined _LIBICONV_VERSION || defined __GLIBC__
        gnu_iconv
       #endif
 
@@ -57588,24 +48110,9 @@
 
 
   ICONV_H='iconv.h'
-   if test -n "$ICONV_H"; then
-  GL_GENERATE_ICONV_H_TRUE=
-  GL_GENERATE_ICONV_H_FALSE='#'
-else
-  GL_GENERATE_ICONV_H_TRUE='#'
-  GL_GENERATE_ICONV_H_FALSE=
-fi
-
 
   REPLACE_ICONV_OPEN=1
 
-      fi
-    fi
-
-  fi
-
-  if test $REPLACE_ICONV_OPEN = 1; then
-
 
 
 
@@ -57615,34 +48122,18 @@
 
   gtpo_LIBOBJS="$gtpo_LIBOBJS iconv_open.$ac_objext"
 
-  fi
-  if test $REPLACE_ICONV = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS iconv.$ac_objext"
-
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS iconv_close.$ac_objext"
 
+      fi
+    fi
   fi
 
+  # Code from module include_next:
+  # Code from module inline:
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5
 $as_echo_n "checking whether the compiler generally respects inline... " >&6; }
-if ${gl_cv_c_inline_effective+:} false; then :
+if test "${gl_cv_c_inline_effective+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test $ac_cv_c_inline = no; then
@@ -57678,7 +48169,8 @@
 
   fi
 
-
+  # Code from module intprops:
+  # Code from module libunistring-optional:
 
 
 
@@ -57687,6 +48179,13 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_libunistring_use_included" >&5
 $as_echo "$gl_libunistring_use_included" >&6; }
 
+  # Code from module localcharset:
+
+
+
+
+  :
+
 
 
 
@@ -57695,16 +48194,17 @@
 
 
 
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
 
+  # Code from module lock:
 
 
   if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
+    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
     ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
 "
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then :
 
 $as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
@@ -57713,22 +48213,16 @@
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-      #include <pthread.h>
+#include <pthread.h>
 int
 main ()
 {
-
 #if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
 #endif
-
   ;
   return 0;
 }
@@ -57740,27 +48234,19 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
-  :
-
-
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_LOCK 1
-_ACEOF
 
 
 
+  # Code from module malloc-posix:
 
 
   if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
 
 $as_echo "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
-    REPLACE_MALLOC=1
-  fi
-
-  if test $REPLACE_MALLOC = 1; then
 
 
 
@@ -57771,19 +48257,29 @@
 
   gtpo_LIBOBJS="$gtpo_LIBOBJS malloc.$ac_objext"
 
+    HAVE_MALLOC_POSIX=0
   fi
 
 
 
 
 
-          GNULIB_MALLOC_POSIX=1
+  GNULIB_MALLOC_POSIX=1
+
 
 
+$as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+
+
+
+  # Code from module malloca:
 
 
 
-$as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+
+  # Code from module mbrtowc:
+
+
 
 
 
@@ -57791,11 +48287,14 @@
 
 
 
+  :
+
 
 
 
 
 
+  :
 
 
 
@@ -57807,15 +48306,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -57826,13 +48325,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -57870,7 +48362,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -57890,13 +48382,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -57944,130 +48429,40 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
-
-  if test $ac_cv_func_mbrtowc = no; then
-    HAVE_MBRTOWC=0
-    ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-
-"
-if test "x$ac_cv_have_decl_mbrtowc" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRTOWC $ac_have_decl
-_ACEOF
-
-    if test $ac_cv_have_decl_mbrtowc = yes; then
-                        REPLACE_MBRTOWC=1
-    fi
-  else
-    if test $REPLACE_MBSTATE_T = 1; then
-      REPLACE_MBRTOWC=1
-    else
-
+  fi
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
-$as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-                  case "$host_os" in
-                  # Guess no on Solaris.
-        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
-                  # Guess yes otherwise.
-        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
-      esac
-      if test $LOCALE_FR_UTF8 != none; then
-        if test "$cross_compiling" = yes; then :
   :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  int result = 0;
-
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      char input[] = "\303\237er";
-      mbstate_t state;
-      wchar_t wc;
-      size_t ret;
 
-      memset (&state, '\0', sizeof (mbstate_t));
-      wc = (wchar_t) 0xBADFACE;
-      ret = mbrtowc (&wc, input, 5, &state);
-      if (ret != 2)
-        result |= 1;
-      if (!mbsinit (&state))
-        result |= 2;
 
-      memset (&state, '\0', sizeof (mbstate_t));
-      ret = mbrtowc (NULL, input, 5, &state);
-      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
-        result |= 4;
-      if (!mbsinit (&state))
-        result |= 8;
-    }
-  return result;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_null_arg1=yes
-else
-  gl_cv_func_mbrtowc_null_arg1=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
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
-$as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; }
 
+  if test $ac_cv_func_mbrtowc = no; then
+    HAVE_MBRTOWC=0
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBRTOWC=1
+    else
 
 
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
 $as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
+if test "${gl_cv_func_mbrtowc_null_arg+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
               # Guess no on OSF/1.
-        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
+        osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;;
               # Guess yes otherwise.
-        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+        *)    gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
       esac
       if test $LOCALE_FR_UTF8 != none; then
         if test "$cross_compiling" = yes; then :
@@ -58078,13 +48473,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -58105,9 +48493,9 @@
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_null_arg2=yes
+  gl_cv_func_mbrtowc_null_arg=yes
 else
-  gl_cv_func_mbrtowc_null_arg2=no
+  gl_cv_func_mbrtowc_null_arg=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -58116,28 +48504,26 @@
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
-$as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg" >&5
+$as_echo "$gl_cv_func_mbrtowc_null_arg" >&6; }
 
 
 
 
 
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
 $as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
-if ${gl_cv_func_mbrtowc_retval+:} false; then :
+if test "${gl_cv_func_mbrtowc_retval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
   :
 else
@@ -58146,18 +48532,9 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-  int found_some_locale = 0;
   /* This fails on Solaris.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
@@ -58170,9 +48547,8 @@
         {
           input[1] = '\0';
           if (mbrtowc (&wc, input + 2, 5, &state) != 1)
-            result |= 1;
+            return 1;
         }
-      found_some_locale = 1;
     }
   /* This fails on HP-UX 11.11.  */
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
@@ -58186,66 +48562,16 @@
         {
           input[1] = '\0';
           if (mbrtowc (&wc, input + 2, 5, &state) != 2)
-            result |= 2;
-        }
-      found_some_locale = 1;
-    }
-  /* This fails on native Windows.  */
-  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
-    {
-      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 4;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
-    {
-      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 8;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
-    {
-      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 16;
+            return 1;
         }
-      found_some_locale = 1;
     }
-  return (found_some_locale ? result : 77);
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   gl_cv_func_mbrtowc_retval=yes
 else
-  if test $? != 77; then
-             gl_cv_func_mbrtowc_retval=no
-           fi
-
+  gl_cv_func_mbrtowc_retval=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -58262,7 +48588,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
 $as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
-if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
+if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -58281,13 +48607,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -58319,61 +48638,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
 
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
-$as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
-if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  case "$host_os" in
-                     # Guess no on AIX and glibc systems.
-        aix* | *-gnu*)
-                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
-        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-      esac
-      if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-           #include <wchar.h>
-           static wchar_t wc;
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-           }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_empty_input=no
-else
-  gl_cv_func_mbrtowc_empty_input=yes
-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_mbrtowc_empty_input" >&5
-$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
-
-      case "$gl_cv_func_mbrtowc_null_arg1" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
-
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_null_arg2" in
+      case "$gl_cv_func_mbrtowc_null_arg" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
+$as_echo "#define MBRTOWC_NULL_ARG_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -58394,19 +48662,13 @@
            REPLACE_MBRTOWC=1
            ;;
       esac
-      case "$gl_cv_func_mbrtowc_empty_input" in
-        *yes) ;;
-        *)
-$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
-
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
     fi
   fi
-
   if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
 
+    :
+
+
 
 
 
@@ -58424,23 +48686,32 @@
 
 
 
+  GNULIB_MBRTOWC=1
 
-          GNULIB_MBRTOWC=1
 
 
+$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
+
+
+
+  # Code from module mbsinit:
 
 
 
-$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
 
 
 
+  :
+
+
+
 
 
 
+  :
 
 
 
@@ -58452,15 +48723,15 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
                   case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
         if test "$cross_compiling" = yes; then :
@@ -58471,13 +48742,6 @@
 
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -58515,7 +48779,7 @@
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -58535,13 +48799,6 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -58589,47 +48846,32 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
 
+    :
 
+  fi
 
-  if test $ac_cv_func_mbsinit = no; then
-    HAVE_MBSINIT=0
-    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT $ac_have_decl
-_ACEOF
+  :
 
-    if test $ac_cv_have_decl_mbsinit = yes; then
-                        REPLACE_MBSINIT=1
-    fi
+
+
+
+
+  if test $ac_cv_func_mbsinit = no; then
+    HAVE_MBSINIT=0
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBSINIT=1
-    else
-                        case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
-      esac
     fi
   fi
-
   if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
 
+    :
+
+
 
 
 
@@ -58647,14 +48889,27 @@
 
 
 
+  GNULIB_MBSINIT=1
+
+
+
+$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+
+
+
+  # Code from module mbswidth:
+
+
+  :
+
+
 
-          GNULIB_MBSINIT=1
 
 
 
+  :
 
 
-$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
@@ -58664,7 +48919,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbswidth is declared in <wchar.h>" >&5
 $as_echo_n "checking whether mbswidth is declared in <wchar.h>... " >&6; }
-if ${ac_cv_have_decl_mbswidth+:} false; then :
+if test "${ac_cv_have_decl_mbswidth+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -58714,20 +48969,13 @@
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 $as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
+#           include <wchar.h>
 int
 main ()
 {
@@ -58756,41 +49004,12 @@
    fi
 
 
-
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS memchr.$ac_objext"
-
-
-  for ac_header in bp-sym.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
-if test "x$ac_cv_header_bp_sym_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BP_SYM_H 1
-_ACEOF
-
-fi
-
-done
-
-
-  fi
-
-
-
+  # Code from module memchr:
 
 
-          GNULIB_MEMCHR=1
 
 
+  GNULIB_MEMCHR=1
 
 
 
@@ -58798,14 +49017,16 @@
 
 
 
+  # Code from module minmax:
 
 
 
+  # Code from module moo:
 
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler is actually a C++ compiler" >&5
 $as_echo_n "checking whether the C compiler is actually a C++ compiler... " >&6; }
-if ${gl_cv_c_cplusplus+:} false; then :
+if test "${gl_cv_c_cplusplus+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -58833,46 +49054,9 @@
 
   fi
 
+  # Code from module multiarch:
 
-
-  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
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS msvc-inval.$ac_objext"
-
-  fi
-
-
-
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS msvc-nothrow.$ac_objext"
-
-  fi
-
+  # Code from module obstack:
 
 
 
@@ -58887,7 +49071,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5
 $as_echo_n "checking for obstacks... " >&6; }
-if ${ac_cv_func_obstack+:} false; then :
+if test "${ac_cv_func_obstack+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -58933,17 +49117,42 @@
 
 fi
 
+    # Code from module open:
 
 
   case "$host_os" in
     mingw* | pw*)
-      REPLACE_OPEN=1
+
+
+  REPLACE_OPEN=1
+
+
+
+
+
+
+
+
+  gtpo_LIBOBJS="$gtpo_LIBOBJS open.$ac_objext"
+
+
+
+
+  :
+
+
       ;;
     *)
 
+  :
+
+
+
+
+
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 $as_echo_n "checking whether open recognizes a trailing slash... " >&6; }
-if ${gl_cv_func_open_slash+:} false; then :
+if test "${gl_cv_func_open_slash+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # Assume that if we have lstat, we can also check symlinks.
@@ -58954,10 +49163,10 @@
           if test "$cross_compiling" = yes; then :
 
              case "$host_os" in
-               freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-                 gl_cv_func_open_slash="guessing no" ;;
-               *)
-                 gl_cv_func_open_slash="guessing yes" ;;
+               freebsd*)        gl_cv_func_open_slash="guessing no" ;;
+               solaris2.[0-9]*) gl_cv_func_open_slash="guessing no" ;;
+               hpux*)           gl_cv_func_open_slash="guessing no" ;;
+               *)               gl_cv_func_open_slash="guessing yes" ;;
              esac
 
 else
@@ -58970,14 +49179,10 @@
 #endif
 int main ()
 {
-  int result = 0;
 #if HAVE_LSTAT
-  if (open ("conftest.lnk/", O_RDONLY) != -1)
-    result |= 1;
+  if (open ("conftest.lnk/", O_RDONLY) != -1) return 2;
 #endif
-  if (open ("conftest.sl/", O_CREAT, 0600) >= 0)
-    result |= 2;
-  return result;
+  return open ("conftest.sl/", O_CREAT, 0600) >= 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -58999,15 +49204,9 @@
 
 $as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
-          REPLACE_OPEN=1
-          ;;
-      esac
-      ;;
-  esac
-
 
 
-  if test $REPLACE_OPEN = 1; then
+  REPLACE_OPEN=1
 
 
 
@@ -59020,17 +49219,19 @@
 
 
 
-  :
-
-  fi
 
+  :
 
 
+          ;;
+      esac
+      ;;
+  esac
 
 
-          GNULIB_OPEN=1
 
 
+  GNULIB_OPEN=1
 
 
 
@@ -59038,12 +49239,11 @@
 
 
 
-
-
-
+  # Code from module ostream:
+  # Code from module progname:
   ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
 "
-if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then :
+if test "x$ac_cv_have_decl_program_invocation_name" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -59055,7 +49255,7 @@
 
   ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
 "
-if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then :
+if test "x$ac_cv_have_decl_program_invocation_short_name" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -59065,103 +49265,218 @@
 #define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl
 _ACEOF
 
+  # Code from module realloc-posix:
 
 
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_REALLOC_POSIX=1
 
+$as_echo "#define HAVE_REALLOC_POSIX 1" >>confdefs.h
 
-  for ac_func in raise
-do :
-  ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
-if test "x$ac_cv_func_raise" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RAISE 1
-_ACEOF
+  else
 
-fi
-done
 
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
-  else
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_RAISE=1
-    fi
 
 
 
 
-  if test $gl_cv_type_sigset_t = yes; then
-    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  gl_cv_func_sigprocmask=1
-fi
 
-  fi
-  if test -z "$gl_cv_func_sigprocmask"; then
-    HAVE_POSIX_SIGNALBLOCKING=0
+
+  gtpo_LIBOBJS="$gtpo_LIBOBJS realloc.$ac_objext"
+
+    HAVE_REALLOC_POSIX=0
   fi
 
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
 
 
 
 
-          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-            REPLACE_RAISE=1
-          fi
+  GNULIB_REALLOC_POSIX=1
 
-      fi
 
-  fi
 
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
+$as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+
 
 
+  # Code from module relocatable-lib:
+
 
+  if test $RELOCATABLE = yes; then
 
 
 
 
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS raise.$ac_objext"
 
-    :
+
+
+  gtpo_LIBOBJS="$gtpo_LIBOBJS relocatable.$ac_objext"
+
   fi
 
+  # Code from module signal:
+
+
+
+
 
 
+  :
+
 
 
-          GNULIB_RAISE=1
 
 
 
 
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_signal_h='<'signal.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+$as_echo_n "checking absolute name of <signal.h>... " >&6; }
+if test "${gl_cv_next_signal_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_signal_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
 
-$as_echo "#define GNULIB_TEST_RAISE 1" >>confdefs.h
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/signal.h#{
+                 s#.*"\(.*/signal.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_signal_h='<'signal.h'>'
+          fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+$as_echo "$gl_cv_next_signal_h" >&6; }
+     fi
+     NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'signal.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_signal_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive
 
 
 
+# AIX declares sig_atomic_t to already include volatile, and C89 compilers
+# then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
+  ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" "
+#include <signal.h>
 
+"
+if test "x$ac_cv_type_volatile_sig_atomic_t" = x""yes; then :
 
-  for ac_func in rawmemchr
-do :
-  ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
-if test "x$ac_cv_func_rawmemchr" = xyes; then :
+else
+  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
+fi
+
+
+
+
+    for gl_func in sigaction sigaddset sigdelset sigemptyset sigfillset sigismember     sigpending sigprocmask; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_RAWMEMCHR 1
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+      done
+
+
+  # Code from module sigpipe:
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_SIGPIPE 1
+_ACEOF
+
+
+
+  GNULIB_SIGNAL_H_SIGPIPE=1
+
+  GNULIB_STDIO_H_SIGPIPE=1
+
+  GNULIB_UNISTD_H_SIGPIPE=1
+  # Code from module sigprocmask:
+
+
+  signals_not_posix=
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <signal.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sigset_t" >/dev/null 2>&1; then :
+
+else
+  signals_not_posix=1
+fi
+rm -f conftest*
+
+  if test -z "$signals_not_posix"; then
+    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+if test "x$ac_cv_func_sigprocmask" = x""yes; then :
+  gl_cv_func_sigprocmask=1
 fi
-done
 
-  if test $ac_cv_func_rawmemchr = no; then
-    HAVE_RAWMEMCHR=0
   fi
+  if test -z "$gl_cv_func_sigprocmask"; then
+    HAVE_POSIX_SIGNALBLOCKING=0
 
-  if test $HAVE_RAWMEMCHR = 0; then
 
 
 
@@ -59169,68 +49484,241 @@
 
 
 
+  gtpo_LIBOBJS="$gtpo_LIBOBJS sigprocmask.$ac_objext"
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS rawmemchr.$ac_objext"
 
-    :
+
+  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>
+"
+if test "x$ac_cv_type_sigset_t" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGSET_T 1
+_ACEOF
+
+gl_cv_type_sigset_t=yes
+else
+  gl_cv_type_sigset_t=no
+fi
+
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
   fi
 
 
+  fi
+
 
 
 
-          GNULIB_RAWMEMCHR=1
+  GNULIB_SIGPROCMASK=1
 
 
 
+$as_echo "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
-$as_echo "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
+  # Code from module size_max:
 
+  for ac_header in stdint.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDINT_H 1
+_ACEOF
 
+fi
 
+done
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
+$as_echo_n "checking for SIZE_MAX... " >&6; }
+if test "${gl_cv_size_max+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  if test $gl_cv_func_malloc_posix = yes; then
+    gl_cv_size_max=
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-$as_echo "#define HAVE_REALLOC_POSIX 1" >>confdefs.h
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
 
-  else
-    REPLACE_REALLOC=1
-  fi
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Found it" >/dev/null 2>&1; then :
+  gl_cv_size_max=yes
+fi
+rm -f conftest*
 
-  if test $REPLACE_REALLOC = 1; then
+    if test -z "$gl_cv_size_max"; then
+                        if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) * CHAR_BIT - 1" "size_t_bits_minus_1"        "#include <stddef.h>
+#include <limits.h>"; then :
 
+else
+  size_t_bits_minus_1=
+fi
 
+      if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint"        "#include <stddef.h>"; then :
 
+else
+  fits_in_uint=
+fi
 
+      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
+        if test $fits_in_uint = 1; then
+                              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+            extern size_t foo;
+            extern unsigned long foo;
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  fits_in_uint=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        fi
+                                if test $fits_in_uint = 1; then
+          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        else
+          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        fi
+      else
+                gl_cv_size_max='((size_t)~(size_t)0)'
+      fi
+    fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
+$as_echo "$gl_cv_size_max" >&6; }
+  if test "$gl_cv_size_max" != yes; then
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS realloc.$ac_objext"
+cat >>confdefs.h <<_ACEOF
+#define SIZE_MAX $gl_cv_size_max
+_ACEOF
 
   fi
 
 
+  # Code from module stat:
+
 
 
 
-          GNULIB_REALLOC_POSIX=1
+  :
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
+$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
+if test "${gl_cv_func_stat_dir_slash+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  case $host_os in
+            mingw*) gl_cv_func_stat_dir_slash="guessing no";;
+            *) gl_cv_func_stat_dir_slash="guessing yes";;
+          esac
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
+
+int
+main ()
+{
+struct stat st; return stat (".", &st) != stat ("./", &st);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_stat_dir_slash=yes
+else
+  gl_cv_func_stat_dir_slash=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_stat_dir_slash" >&5
+$as_echo "$gl_cv_func_stat_dir_slash" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
+if test "${gl_cv_func_stat_file_slash+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  touch conftest.tmp
+       # Assume that if we have lstat, we can also check symlinks.
+       if test $ac_cv_func_lstat = yes; then
+         ln -s conftest.tmp conftest.lnk
+       fi
+       if test "$cross_compiling" = yes; then :
+  gl_cv_func_stat_file_slash="guessing no"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
 
+int
+main ()
+{
+struct stat st;
+      if (!stat ("conftest.tmp/", &st)) return 1;
+#if HAVE_LSTAT
+      if (!stat ("conftest.lnk/", &st)) return 2;
+#endif
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_stat_file_slash=yes
+else
+  gl_cv_func_stat_file_slash=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
+       rm -f conftest.tmp conftest.lnk
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+$as_echo "$gl_cv_func_stat_file_slash" >&6; }
+  case $gl_cv_func_stat_dir_slash in
+    *no) REPLACE_STAT=1
 
+$as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h
+;;
+  esac
+  case $gl_cv_func_stat_file_slash in
+    *no) REPLACE_STAT=1
 
-  if test $RELOCATABLE = yes; then
+$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+;;
+  esac
+  if test $REPLACE_STAT = 1; then
 
 
 
@@ -59239,13 +49727,80 @@
 
 
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS relocatable.$ac_objext"
+  gtpo_LIBOBJS="$gtpo_LIBOBJS stat.$ac_objext"
+
+
+  fi
+
+
+
+
+  GNULIB_STAT=1
+
+
+
+$as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h
+
+
+
+  # Code from module stdarg:
+
+  STDARG_H='';
+  NEXT_STDARG_H='<stdarg.h>';
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
+$as_echo_n "checking for va_copy... " >&6; }
+  if test "${gl_cv_func_va_copy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+int
+main ()
+{
+
+#ifndef va_copy
+void (*func) (va_list, va_list) = va_copy;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func_va_copy=yes
+else
+  gl_cv_func_va_copy=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_va_copy" >&5
+$as_echo "$gl_cv_func_va_copy" >&6; }
+  if test $gl_cv_func_va_copy = no; then
+                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined _AIX && !defined __GNUC__
+        AIX vaccine
+       #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "vaccine" >/dev/null 2>&1; then :
+  gl_aixcc=yes
+else
+  gl_aixcc=no
+fi
+rm -f conftest*
 
-  fi
+    if test $gl_aixcc = yes; then
+            STDARG_H=stdarg.h
 
 
 
 
+  :
 
 
 
@@ -59254,686 +49809,818 @@
 
 
      if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_signal_h='<'signal.h'>'
+       gl_cv_next_stdarg_h='<'stdarg.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
-$as_echo_n "checking absolute name of <signal.h>... " >&6; }
-if ${gl_cv_next_signal_h+:} false; then :
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdarg.h>" >&5
+$as_echo_n "checking absolute name of <stdarg.h>... " >&6; }
+if test "${gl_cv_next_stdarg_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdarg_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <signal.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'signal.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_signal_h
-           gl_cv_next_signal_h='"'$gl_header'"'
+#include <stdarg.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdarg.h#{
+                 s#.*"\(.*/stdarg.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdarg_h='<'stdarg.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-$as_echo "$gl_cv_next_signal_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdarg_h" >&5
+$as_echo "$gl_cv_next_stdarg_h" >&6; }
      fi
-     NEXT_SIGNAL_H=$gl_cv_next_signal_h
+     NEXT_STDARG_H=$gl_cv_next_stdarg_h
 
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'signal.h'>'
+       gl_next_as_first_directive='<'stdarg.h'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_signal_h
+       gl_next_as_first_directive=$gl_cv_next_stdarg_h
      fi
-     NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive
+     NEXT_AS_FIRST_DIRECTIVE_STDARG_H=$gl_next_as_first_directive
 
 
 
+            if test "$gl_cv_next_stdarg_h" = '""'; then
+        gl_cv_next_stdarg_h='"///usr/include/stdarg.h"'
+        NEXT_STDARG_H="$gl_cv_next_stdarg_h"
+      fi
+    else
 
+  saved_as_echo_n="$as_echo_n"
+  as_echo_n=':'
+  if test "${gl_cv_func___va_copy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
-# AIX declares sig_atomic_t to already include volatile, and C89 compilers
-# then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
-  ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" "
-#include <signal.h>
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+int
+main ()
+{
 
-"
-if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes; then :
+#ifndef __va_copy
+error, bail out
+#endif
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func___va_copy=yes
 else
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
+  gl_cv_func___va_copy=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
+  as_echo_n="$saved_as_echo_n"
 
+      if test $gl_cv_func___va_copy = yes; then
 
+$as_echo "#define va_copy __va_copy" >>confdefs.h
 
+      else
 
 
+$as_echo "#define va_copy gl_va_copy" >>confdefs.h
 
-  ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" "
-#include <signal.h>
+      fi
+    fi
+  fi
+
+  # Code from module stdbool:
 
-"
-if test "x$ac_cv_type_sighandler_t" = xyes; then :
 
-else
-  HAVE_SIGHANDLER_T=0
-fi
 
+  # Define two additional variables used in the Makefile substitution.
 
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
 
-    for gl_func in pthread_sigmask sigaction     sigaddset sigdelset sigemptyset sigfillset sigismember     sigpending sigprocmask; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
+
+
+  # Code from module stddef:
+
+
+
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    STDDEF_H=stddef.h
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
+if test "${gl_cv_decl_null_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <signal.h>
+#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
 
 int
 main ()
 {
-#undef $gl_func
-  (void) $gl_func;
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
+  gl_cv_decl_null_works=yes
 else
-  eval "$as_gl_Symbol=no"
+  gl_cv_decl_null_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+$as_echo "$gl_cv_decl_null_works" >&6; }
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    STDDEF_H=stddef.h
+  fi
+  if test -n "$STDDEF_H"; then
 
 
 
 
+  :
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_SIGPIPE 1
-_ACEOF
 
 
 
-  GNULIB_SIGNAL_H_SIGPIPE=1
 
 
-  GNULIB_STDIO_H_SIGPIPE=1
 
-  GNULIB_UNISTD_H_SIGPIPE=1
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stddef_h='<'stddef.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
+if test "${gl_cv_next_stddef_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
+          if test $ac_cv_header_stddef_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stddef.h#{
+                 s#.*"\(.*/stddef.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stddef_h='<'stddef.h'>'
+          fi
 
-  if test $gl_cv_type_sigset_t = yes; then
-    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  gl_cv_func_sigprocmask=1
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+$as_echo "$gl_cv_next_stddef_h" >&6; }
+     fi
+     NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
-  fi
-  if test -z "$gl_cv_func_sigprocmask"; then
-    HAVE_POSIX_SIGNALBLOCKING=0
-  fi
-
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stddef.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stddef_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
 
 
 
+  fi
 
+  # Code from module stdint:
 
 
 
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS sigprocmask.$ac_objext"
 
-    :
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
   fi
 
 
+      if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
 
 
+      if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
 
-          GNULIB_SIGPROCMASK=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+  :
 
 
 
 
-  for ac_header in stdint.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H 1
-_ACEOF
 
-fi
 
-done
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
-$as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdint_h='<'stdint.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if test "${gl_cv_next_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-    gl_cv_size_max=
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdint_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <limits.h>
-#if HAVE_STDINT_H
 #include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Found it" >/dev/null 2>&1; then :
-  gl_cv_size_max=yes
-fi
-rm -f conftest*
-
-    if test -z "$gl_cv_size_max"; then
-                        if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) * CHAR_BIT - 1" "size_t_bits_minus_1"        "#include <stddef.h>
-#include <limits.h>"; then :
-
-else
-  size_t_bits_minus_1=
-fi
-
-      if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint"        "#include <stddef.h>"; then :
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdint.h#{
+                 s#.*"\(.*/stdint.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdint_h='<'stdint.h'>'
+          fi
 
-else
-  fits_in_uint=
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
+     fi
+     NEXT_STDINT_H=$gl_cv_next_stdint_h
 
-      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-        if test $fits_in_uint = 1; then
-                              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  fits_in_uint=0
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-        fi
-                                if test $fits_in_uint = 1; then
-          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        else
-          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        fi
-      else
-                gl_cv_size_max='((size_t)~(size_t)0)'
-      fi
-    fi
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdint.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdint_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
-$as_echo "$gl_cv_size_max" >&6; }
-  if test "$gl_cv_size_max" != yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define SIZE_MAX $gl_cv_size_max
-_ACEOF
 
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
   fi
 
 
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
-$as_echo_n "checking for ssize_t... " >&6; }
-if ${gt_cv_ssize_t+:} false; then :
+    if test $ac_cv_header_stdint_h = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if test "${gl_cv_header_working_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gl_cv_header_working_stdint_h=no
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/types.h>
-int
-main ()
-{
-int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gt_cv_ssize_t=yes
-else
-  gt_cv_ssize_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-$as_echo "$gt_cv_ssize_t" >&6; }
-  if test $gt_cv_ssize_t = no; then
 
-$as_echo "#define ssize_t int" >>confdefs.h
 
-  fi
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
 
 
+  /* 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
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
-$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
-if ${gl_cv_func_stat_dir_slash+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case $host_os in
-            mingw*) gl_cv_func_stat_dir_slash="guessing no";;
-            *) gl_cv_func_stat_dir_slash="guessing yes";;
-          esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
 
 int
 main ()
-{
-struct stat st; return stat (".", &st) != stat ("./", &st);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_stat_dir_slash=yes
-else
-  gl_cv_func_stat_dir_slash=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_stat_dir_slash" >&5
-$as_echo "$gl_cv_func_stat_dir_slash" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
-$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
-if ${gl_cv_func_stat_file_slash+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  touch conftest.tmp
-       # Assume that if we have lstat, we can also check symlinks.
-       if test $ac_cv_func_lstat = yes; then
-         ln -s conftest.tmp conftest.lnk
-       fi
-       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_stat_file_slash="guessing no" ;;
-          esac
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+                                                    if test "$cross_compiling" = yes; then :
+                 gl_cv_header_working_stdint_h=yes
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/stat.h>
+
+
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#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
+
+
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
 
 int
 main ()
 {
-int result = 0;
-      struct stat st;
-      if (!stat ("conftest.tmp/", &st))
-        result |= 1;
-#if HAVE_LSTAT
-      if (!stat ("conftest.lnk/", &st))
-        result |= 2;
-#endif
-      return result;
+
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return 1;
+    }
+  return 0;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_stat_file_slash=yes
-else
-  gl_cv_func_stat_file_slash=no
+  gl_cv_header_working_stdint_h=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-       rm -f conftest.tmp conftest.lnk
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-$as_echo "$gl_cv_func_stat_file_slash" >&6; }
-  case $gl_cv_func_stat_dir_slash in
-    *no) REPLACE_STAT=1
-
-$as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h
-;;
-  esac
-  case $gl_cv_func_stat_file_slash in
-    *no) REPLACE_STAT=1
-
-$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
-;;
-  esac
-
-  if test $REPLACE_STAT = 1; then
-
-
-
-
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
+  fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
+            for ac_header in sys/inttypes.h sys/bitypes.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS stat.$ac_objext"
+done
 
-    :
-  fi
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
 
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
 
 
 
+  :
 
-          GNULIB_STAT=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
-  STDARG_H=''
-  NEXT_STDARG_H='<stdarg.h>'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
-$as_echo_n "checking for va_copy... " >&6; }
-  if ${gl_cv_func_va_copy+:} false; then :
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* 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
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-int
-main ()
-{
-
-#ifndef va_copy
-void (*func) (va_list, va_list) = va_copy;
-#endif
+#include <limits.h>"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_va_copy=yes
 else
-  gl_cv_func_va_copy=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  result=unknown
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_va_copy" >&5
-$as_echo "$gl_cv_func_va_copy" >&6; }
-  if test $gl_cv_func_va_copy = no; then
-                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined _AIX && !defined __GNUC__
-        AIX vaccine
-       #endif
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "vaccine" >/dev/null 2>&1; then :
-  gl_aixcc=yes
-else
-  gl_aixcc=no
 fi
-rm -f conftest*
-
-    if test $gl_aixcc = yes; then
-            STDARG_H=stdarg.h
-
-
-
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
 
+  fi
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdarg_h='<'stdarg.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdarg.h>" >&5
-$as_echo_n "checking absolute name of <stdarg.h>... " >&6; }
-if ${gl_cv_next_stdarg_h+:} false; then :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* 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
 
+#include <limits.h>"; then :
 
+else
+  result=unknown
+fi
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdarg.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdarg_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdarg_h
-           gl_cv_next_stdarg_h='"'$gl_header'"'
-
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdarg_h" >&5
-$as_echo "$gl_cv_next_stdarg_h" >&6; }
-     fi
-     NEXT_STDARG_H=$gl_cv_next_stdarg_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdarg.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdarg_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDARG_H=$gl_next_as_first_directive
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
 
 
-            if test "$gl_cv_next_stdarg_h" = '""'; then
-        gl_cv_next_stdarg_h='"///usr/include/stdarg.h"'
-        NEXT_STDARG_H="$gl_cv_next_stdarg_h"
-      fi
-    else
 
-  saved_as_echo_n="$as_echo_n"
-  as_echo_n=':'
-  if ${gl_cv_func___va_copy+:} false; then :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+$as_echo_n "checking whether $gltype is signed... " >&6; }
+if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.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
+
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
 int
 main ()
 {
 
-#ifndef __va_copy
-error, bail out
-#endif
-
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func___va_copy=yes
+  result=yes
 else
-  gl_cv_func___va_copy=no
+  result=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-  as_echo_n="$saved_as_echo_n"
-
-      if test $gl_cv_func___va_copy = yes; then
-
-$as_echo "#define va_copy __va_copy" >>confdefs.h
-
-      else
-
-
-$as_echo "#define va_copy gl_va_copy" >>confdefs.h
-
-      fi
-    fi
-  fi
-
-   if test -n "$STDARG_H"; then
-  GL_GENERATE_STDARG_H_TRUE=
-  GL_GENERATE_STDARG_H_FALSE='#'
-else
-  GL_GENERATE_STDARG_H_TRUE='#'
-  GL_GENERATE_STDARG_H_FALSE=
-fi
-
-
-
-
-
-
-  # Define two additional variables used in the Makefile substitution.
-
-  if test "$ac_cv_header_stdbool_h" = yes; then
-    STDBOOL_H=''
-  else
-    STDBOOL_H='stdbool.h'
-  fi
+       eval gl_cv_type_${gltype}_signed=\$result
 
-   if test -n "$STDBOOL_H"; then
-  GL_GENERATE_STDBOOL_H_TRUE=
-  GL_GENERATE_STDBOOL_H_FALSE='#'
-else
-  GL_GENERATE_STDBOOL_H_TRUE='#'
-  GL_GENERATE_STDBOOL_H_FALSE=
 fi
+eval ac_res=\$gl_cv_type_${gltype}_signed
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
-
-  if test "$ac_cv_type__Bool" = yes; then
-    HAVE__BOOL=1
-  else
-    HAVE__BOOL=0
-  fi
-
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
 
 
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
-  STDDEF_H=
-  if test $gt_cv_c_wchar_t = no; then
-    HAVE_WCHAR_T=0
-    STDDEF_H=stddef.h
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
-$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stddef.h>
-      int test[2 * (sizeof NULL == sizeof (void *)) -1];
 
+  /* 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
+
+              extern $gltype foo;
+              extern $gltype1 foo;
 int
 main ()
 {
@@ -59943,105 +50630,114 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_decl_null_works=yes
-else
-  gl_cv_decl_null_works=no
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-$as_echo "$gl_cv_decl_null_works" >&6; }
-  if test $gl_cv_decl_null_works = no; then
-    REPLACE_NULL=1
-    STDDEF_H=stddef.h
-  fi
-
-   if test -n "$STDDEF_H"; then
-  GL_GENERATE_STDDEF_H_TRUE=
-  GL_GENERATE_STDDEF_H_FALSE='#'
-else
-  GL_GENERATE_STDDEF_H_TRUE='#'
-  GL_GENERATE_STDDEF_H_FALSE=
-fi
-
-  if test -n "$STDDEF_H"; then
-
-
-
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
+  done
 
 
+  fi
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stddef_h='<'stddef.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
-$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.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
 
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stddef.h>
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
+fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
 _ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stddef.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+  done
 
-           gl_header=$gl_cv_absolute_stddef_h
-           gl_cv_next_stddef_h='"'$gl_header'"'
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-$as_echo "$gl_cv_next_stddef_h" >&6; }
-     fi
-     NEXT_STDDEF_H=$gl_cv_next_stddef_h
+    STDINT_H=stdint.h
+  fi
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stddef.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stddef_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
 
+  # Code from module stdio:
 
 
 
-  fi
 
 
 
 
 
+  :
 
 
 
@@ -60054,45 +50750,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 $as_echo_n "checking absolute name of <stdio.h>... " >&6; }
-if ${gl_cv_next_stdio_h+:} false; then :
+if test "${gl_cv_next_stdio_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdio_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdio.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdio_h
-           gl_cv_next_stdio_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdio.h#{
+                 s#.*"\(.*/stdio.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdio_h='<'stdio.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
@@ -60111,31 +50792,6 @@
 
 
 
-
-
-      GNULIB_FSCANF=1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_FSCANF 1
-_ACEOF
-
-
-  GNULIB_SCANF=1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_SCANF 1
-_ACEOF
-
-
-  GNULIB_FGETC=1
-  GNULIB_GETC=1
-  GNULIB_GETCHAR=1
-  GNULIB_FGETS=1
-  GNULIB_FREAD=1
-
-
       GNULIB_FPRINTF=1
   GNULIB_PRINTF=1
   GNULIB_VFPRINTF=1
@@ -60166,12 +50822,11 @@
 
 
 
-
-    for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen     renameat snprintf tmpfile vdprintf vsnprintf; do
+    for gl_func in dprintf fpurge fseeko ftello getdelim getline popen renameat     snprintf tmpfile vdprintf vsnprintf; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -60197,7 +50852,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -60207,9 +50863,14 @@
       done
 
 
+  # Code from module stdlib:
+
+
+
 
 
 
+  :
 
 
 
@@ -60222,45 +50883,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 $as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if ${gl_cv_next_stdlib_h+:} false; then :
+if test "${gl_cv_next_stdlib_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_stdlib_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdlib.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdlib_h
-           gl_cv_next_stdlib_h='"'$gl_header'"'
 
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdlib.h#{
+                 s#.*"\(.*/stdlib.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdlib_h='<'stdlib.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
@@ -60279,14 +50925,49 @@
 
 
 
+  for ac_header in random.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "random.h" "ac_cv_header_random_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_random_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RANDOM_H 1
+_ACEOF
+
+fi
+
+done
+
+  if test $ac_cv_header_random_h = yes; then
+    HAVE_RANDOM_H=1
+  else
+    HAVE_RANDOM_H=0
+  fi
+
+  ac_fn_c_check_type "$LINENO" "struct random_data" "ac_cv_type_struct_random_data" "#include <stdlib.h>
+      #if HAVE_RANDOM_H
+      # include <random.h>
+      #endif
+
+"
+if test "x$ac_cv_type_struct_random_data" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RANDOM_DATA 1
+_ACEOF
+
+
+else
+  HAVE_STRUCT_RANDOM_DATA=0
+fi
 
 
 
-    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
+    for gl_func in atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp     mkostemp mkostemps mkstemp mkstemps ptsname random_r initstat_r srandom_r     setstate_r realpath rpmatch setenv strtod strtoll strtoull unlockpt     unsetenv; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -60318,7 +50999,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -60328,54 +51010,14 @@
       done
 
 
+  # Code from module stpcpy:
 
 
 
 
 
 
-  for ac_func in stpcpy
-do :
-  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
-if test "x$ac_cv_func_stpcpy" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STPCPY 1
-_ACEOF
-
-fi
-done
-
-  if test $ac_cv_func_stpcpy = no; then
-    HAVE_STPCPY=0
-  fi
-
-  if test $HAVE_STPCPY = 0; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS stpcpy.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-          GNULIB_STPCPY=1
-
-
-
-
 
-$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
 
 
 
@@ -60383,166 +51025,43 @@
 
 
 
-  for ac_func in strchrnul
+  for ac_func in stpcpy
 do :
-  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
-if test "x$ac_cv_func_strchrnul" = xyes; then :
+  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
+if test "x$ac_cv_func_stpcpy" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STRCHRNUL 1
-_ACEOF
-
-fi
-done
-
-  if test $ac_cv_func_strchrnul = no; then
-    HAVE_STRCHRNUL=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
-$as_echo_n "checking whether strchrnul works... " >&6; }
-if ${gl_cv_func_strchrnul_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#if defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 9)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-
+#define HAVE_STPCPY 1
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strchrnul_works="guessing yes"
-else
-  gl_cv_func_strchrnul_works="guessing no"
-fi
-rm -f conftest*
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <string.h> /* for strchrnul */
-
-int
-main ()
-{
-const char *buf = "a";
-      return strchrnul (buf, 'b') != buf + 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strchrnul_works=yes
 else
-  gl_cv_func_strchrnul_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
 
+    gtpo_LIBOBJS="$gtpo_LIBOBJS $ac_func.$ac_objext"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5
-$as_echo "$gl_cv_func_strchrnul_works" >&6; }
-    case "$gl_cv_func_strchrnul_works" in
-      *yes) ;;
-      *) REPLACE_STRCHRNUL=1 ;;
-    esac
-  fi
-
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-
-
-
-
-
+done
 
 
+  if test $ac_cv_func_stpcpy = no; then
+    HAVE_STPCPY=0
 
-  gtpo_LIBOBJS="$gtpo_LIBOBJS strchrnul.$ac_objext"
+  :
 
-    :
   fi
 
 
 
 
-
-          GNULIB_STRCHRNUL=1
-
-
-
+  GNULIB_STPCPY=1
 
 
-$as_echo "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
-
-
-
-
-
-
-
-
-  if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
-$as_echo_n "checking for working strerror function... " >&6; }
-if ${gl_cv_func_working_strerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_working_strerror="guessing no" ;;
-         esac
 
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
+$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
 
-int
-main ()
-{
-if (!*strerror (-2)) return 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_working_strerror=yes
-else
-  gl_cv_func_working_strerror=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_working_strerror" >&5
-$as_echo "$gl_cv_func_working_strerror" >&6; }
-    case "$gl_cv_func_working_strerror" in
-      *yes) ;;
-      *)
-                        REPLACE_STRERROR=1
-        ;;
-    esac
+  # Code from module streq:
+  # Code from module strerror:
 
-  else
-            REPLACE_STRERROR=1
-  fi
 
   if test $REPLACE_STRERROR = 1; then
 
@@ -60555,22 +51074,17 @@
 
   gtpo_LIBOBJS="$gtpo_LIBOBJS strerror.$ac_objext"
 
-  fi
-
 
 cat >>confdefs.h <<_ACEOF
-#define GNULIB_STRERROR 1
+#define REPLACE_STRERROR $REPLACE_STRERROR
 _ACEOF
 
+  fi
 
 
 
 
-
-
-          GNULIB_STRERROR=1
-
-
+  GNULIB_STRERROR=1
 
 
 
@@ -60578,81 +51092,43 @@
 
 
 
-
-
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
-
-
-
-
-
-
-
-
-  gtpo_LIBOBJS="$gtpo_LIBOBJS strerror-override.$ac_objext"
-
-
-
-
-
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
-
-fi
-
-done
-
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-
-
-  fi
+  # Code from module striconv:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module striconveh:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module striconveha:
+  # Code from module string:
 
 
 
+  # Code from module strstr:
 
 
   if test $REPLACE_STRSTR = 0; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works in linear time" >&5
 $as_echo_n "checking whether strstr works in linear time... " >&6; }
-if ${gl_cv_func_strstr_linear+:} false; then :
+if test "${gl_cv_func_strstr_linear+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-                             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     && !(defined __i386__ || defined __x86_64__) \
-     && !defined __UCLIBC__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2)
   Lucky user
  #endif
 #endif
 #ifdef __CYGWIN__
  #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
+ #if CYGWIN_VERSION_DLL_MAJOR >= 1007
   Lucky user
  #endif
 #endif
@@ -60660,7 +51136,7 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strstr_linear="guessing yes"
+  gl_cv_func_strstr_linear=yes
 else
   gl_cv_func_strstr_linear="guessing no"
 fi
@@ -60672,22 +51148,20 @@
 /* end confdefs.h.  */
 
 #include <signal.h> /* for signal */
-#include <string.h> /* for strstr */
+#include <string.h> /* for memmem */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
 
 int
 main ()
 {
-
-    int result = 0;
-    size_t m = 1000000;
+size_t m = 1000000;
     char *haystack = (char *) malloc (2 * m + 2);
     char *needle = (char *) malloc (m + 2);
+    void *result = 0;
     /* Failure to compile this test due to missing alarm is okay,
        since all such platforms (mingw) also have quadratic strstr.  */
-    signal (SIGALRM, quit);
+    signal (SIGALRM, SIG_DFL);
     alarm (5);
     /* Check for quadratic performance.  */
     if (haystack && needle)
@@ -60698,11 +51172,9 @@
         memset (needle, 'A', m);
         needle[m] = 'B';
         needle[m + 1] = 0;
-        if (!strstr (haystack, needle))
-          result |= 1;
+        result = strstr (haystack, needle);
       }
-    return result;
-
+    return !result;
   ;
   return 0;
 }
@@ -60720,14 +51192,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strstr_linear" >&5
 $as_echo "$gl_cv_func_strstr_linear" >&6; }
-    case "$gl_cv_func_strstr_linear" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
+    if test "$gl_cv_func_strstr_linear" != yes; then
+      REPLACE_STRSTR=1
+    fi
   fi
-
   if test $REPLACE_STRSTR = 1; then
 
 
@@ -60741,85 +51209,12 @@
 
   fi
 
+  # Code from module strstr-simple:
+
 
 
   if test "$gl_cv_func_memchr_works" != yes; then
     REPLACE_STRSTR=1
-  else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5
-$as_echo_n "checking whether strstr works... " >&6; }
-if ${gl_cv_func_strstr_works_always+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-                                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef __GNU_LIBRARY__
- #include <features.h>
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     || defined __UCLIBC__
-  Lucky user
- #endif
-#elif defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strstr_works_always="guessing yes"
-else
-  gl_cv_func_strstr_works_always="guessing no"
-fi
-rm -f conftest*
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <string.h> /* for strstr */
-#define P "_EF_BF_BD"
-#define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P
-#define NEEDLE P P P P P
-
-int
-main ()
-{
-return !!strstr (HAYSTACK, NEEDLE);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strstr_works_always=yes
-else
-  gl_cv_func_strstr_works_always=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_strstr_works_always" >&5
-$as_echo "$gl_cv_func_strstr_works_always" >&6; }
-    case "$gl_cv_func_strstr_works_always" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
-  fi
-
-  if test $REPLACE_STRSTR = 1; then
 
 
 
@@ -60835,14 +51230,16 @@
 
 
 
+  GNULIB_STRSTR=1
 
-          GNULIB_STRSTR=1
 
 
+$as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h
+  # Code from module sys_stat:
+
 
 
 
@@ -60853,6 +51250,7 @@
 
 
 
+  :
 
 
 
@@ -60865,51 +51263,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 $as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
-if ${gl_cv_next_sys_stat_h+:} false; then :
+if test "${gl_cv_next_sys_stat_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_sys_stat_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_sys_stat_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'sys/stat.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
 
-        gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_sys_stat_h
-           gl_cv_next_sys_stat_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/sys/stat.h#{
+                 s#.*"\(.*/sys/stat.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_sys_stat_h='<'sys/stat.h'>'
-             fi
-
+            gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
@@ -60929,23 +51306,10 @@
 
 
 
-
-
-
-
-
-
-
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-
-$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h
-
-  fi
-
       ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
      #include <sys/stat.h>
 "
-if test "x$ac_cv_type_nlink_t" = xyes; then :
+if test "x$ac_cv_type_nlink_t" = x""yes; then :
 
 else
 
@@ -60955,11 +51319,11 @@
 
 
 
-    for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
+    for gl_func in fchmodat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat     mknod mknodat stat utimensat; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -60985,7 +51349,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -60996,22 +51361,20 @@
 
 
 
+  # Code from module threadlib:
 
 
 
 
+  # Code from module time:
 
 
 
+  # Code from module tls:
 
 
 
-
-
-
-
-
-
+  # Code from module uniconv/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61039,6 +51402,7 @@
   fi
 
 
+  # Code from module uniconv/u8-conv-from-enc:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61068,6 +51432,7 @@
 fi
 
 
+  # Code from module unilbrk/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61095,7 +51460,9 @@
   fi
 
 
+  # Code from module unilbrk/tables:
 
+  # Code from module unilbrk/u8-possible-linebreaks:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61107,7 +51474,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -61125,6 +51492,7 @@
 fi
 
 
+  # Code from module unilbrk/u8-width-linebreaks:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61136,7 +51504,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -61154,6 +51522,8 @@
 fi
 
 
+  # Code from module unilbrk/ulc-common:
+  # Code from module unilbrk/ulc-width-linebreaks:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61165,7 +51535,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -61183,12 +51553,17 @@
 fi
 
 
+  # Code from module unistd:
+
+
 
 
 
 
 
 
+  :
+
 
 
 
@@ -61200,51 +51575,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
-if ${gl_cv_next_unistd_h+:} false; then :
+if test "${gl_cv_next_unistd_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_unistd_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_unistd_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'unistd.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_unistd_h
-           gl_cv_next_unistd_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/unistd.h#{
+                 s#.*"\(.*/unistd.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_unistd_h='<'unistd.h'>'
-             fi
-
+            gl_cv_next_unistd_h='<'unistd.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
@@ -61264,6 +51618,13 @@
 
 
 
+
+  :
+
+
+
+
+
   if test $ac_cv_header_unistd_h = yes; then
     HAVE_UNISTD_H=1
   else
@@ -61272,25 +51633,18 @@
 
 
 
-
-
-
-
-    for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
+    for gl_func in chown dup2 dup3 environ euidaccess faccessat fchdir fchownat     fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize getusershell setusershell     endusershell lchown link linkat lseek pipe2 pread pwrite readlink     readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat     usleep; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 /* Some systems declare various items in the wrong headers.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#ifndef __GLIBC__
 # include <fcntl.h>
 # include <stdio.h>
 # include <stdlib.h>
@@ -61318,7 +51672,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -61328,6 +51683,7 @@
       done
 
 
+  # Code from module unistr/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61355,6 +51711,7 @@
   fi
 
 
+  # Code from module unistr/u16-mbtouc:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -61391,6 +51748,7 @@
 fi
 
 
+  # Code from module unistr/u8-check:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61420,6 +51778,7 @@
 fi
 
 
+  # Code from module unistr/u8-mblen:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61449,6 +51808,7 @@
 fi
 
 
+  # Code from module unistr/u8-mbtouc:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -61467,7 +51827,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -61485,6 +51845,7 @@
 fi
 
 
+  # Code from module unistr/u8-mbtouc-unsafe:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -61503,7 +51864,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -61521,6 +51882,7 @@
 fi
 
 
+  # Code from module unistr/u8-mbtoucr:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -61557,6 +51919,7 @@
 fi
 
 
+  # Code from module unistr/u8-prev:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61586,6 +51949,7 @@
 fi
 
 
+  # Code from module unistr/u8-uctomb:
 
 
 cat >>confdefs.h <<_ACEOF
@@ -61622,6 +51986,7 @@
 fi
 
 
+  # Code from module unitypes:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61649,6 +52014,7 @@
   fi
 
 
+  # Code from module uniwidth/base:
 
 
       if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61676,6 +52042,7 @@
   fi
 
 
+  # Code from module uniwidth/width:
 
 
        if  { test "$HAVE_LIBUNISTRING" != yes \
@@ -61687,7 +52054,7 @@
             || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
                  && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
                       || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -61705,6 +52072,7 @@
 fi
 
 
+  # Code from module unlocked-io:
 
 
 $as_echo "#define USE_UNLOCKED_IO 1" >>confdefs.h
@@ -61713,16 +52081,102 @@
 
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
 
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
 
 
 
 
 
+  # Code from module unused-parameter:
+  # Code from module vasnprintf:
 
 
+  :
 
 
 
@@ -61731,6 +52185,12 @@
   if test $ac_cv_func_vasnprintf = no; then
 
 
+  :
+
+
+
+
+
 
 
 
@@ -61786,9 +52246,8 @@
 
 
 
-
   ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 else
 
@@ -61805,11 +52264,12 @@
 
   fi
 
+  # Code from module vasprintf:
 
   for ac_func in vasprintf
 do :
   ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
-if test "x$ac_cv_func_vasprintf" = xyes; then :
+if test "x$ac_cv_func_vasprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VASPRINTF 1
 _ACEOF
@@ -61858,25 +52318,30 @@
 
 
 
+  GNULIB_VASPRINTF=1
 
 
-          GNULIB_VASPRINTF=1
 
+$as_echo "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h
 
 
 
 
-$as_echo "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h
 
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=asprintf:2:c-format"
 
 
 
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=vasprintf:2:c-format"
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=asprintf:2:c-format"
+  # Code from module verify:
+  # Code from module warn-on-use:
+  # Code from module wchar:
 
 
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=vasprintf:2:c-format"
+
+  :
 
 
 
@@ -61886,6 +52351,10 @@
 
 
 
+  :
+
+
+
 
 
 
@@ -61895,51 +52364,30 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 $as_echo_n "checking absolute name of <wchar.h>... " >&6; }
-if ${gl_cv_next_wchar_h+:} false; then :
+if test "${gl_cv_next_wchar_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-             if test $ac_cv_header_wchar_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test $ac_cv_header_wchar_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wchar.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_wchar_h
-           gl_cv_next_wchar_h='"'$gl_header'"'
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wchar.h#{
+                 s#.*"\(.*/wchar.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
           else
-               gl_cv_next_wchar_h='<'wchar.h'>'
-             fi
-
+            gl_cv_next_wchar_h='<'wchar.h'>'
+          fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
@@ -61958,7 +52406,6 @@
 
 
 
-
   if test $ac_cv_header_wchar_h = yes; then
     HAVE_WCHAR_H=1
   else
@@ -61967,8 +52414,6 @@
 
 
 
-
-
   if test $gt_cv_c_wint_t = yes; then
     HAVE_WINT_T=1
   else
@@ -61977,21 +52422,18 @@
 
 
 
-    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth     ; do
+    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb     wcsrtombs wcsnrtombs wcwidth; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+/* Some systems require additional headers.  */
+#ifndef __GLIBC__
 # include <stddef.h>
 # include <stdio.h>
 # include <time.h>
@@ -62017,7 +52459,8 @@
 eval ac_res=\$$as_gl_Symbol
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+     eval as_val=\$$as_gl_Symbol
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
@@ -62027,109 +52470,58 @@
       done
 
 
+  # Code from module wctype:
 
 
 
 
+  :
 
-  if test $ac_cv_func_iswcntrl = yes; then
-    HAVE_ISWCNTRL=1
-  else
-    HAVE_ISWCNTRL=0
-  fi
 
 
 
-  if test $gt_cv_c_wint_t = yes; then
-    HAVE_WINT_T=1
+
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
   else
-    HAVE_WINT_T=0
+    HAVE_ISWCNTRL=0
   fi
 
 
+  :
 
 
 
 
 
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+  else
+    HAVE_ISWBLANK=0
+  fi
 
 
+  :
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_wctype_h='<'wctype.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
-$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if ${gl_cv_next_wctype_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-             if test $ac_cv_header_wctype_h = yes; then
-
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <wctype.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'wctype.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
 
-           gl_header=$gl_cv_absolute_wctype_h
-           gl_cv_next_wctype_h='"'$gl_header'"'
-          else
-               gl_cv_next_wctype_h='<'wctype.h'>'
-             fi
 
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-$as_echo "$gl_cv_next_wctype_h" >&6; }
-     fi
-     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'wctype.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_wctype_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
 
 
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
 
 
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
 $as_echo_n "checking whether iswcntrl works... " >&6; }
-if ${gl_cv_func_iswcntrl_works+:} false; then :
+if test "${gl_cv_func_iswcntrl_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -62149,9 +52541,9 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_func_iswcntrl_works="guessing yes"
+  gl_cv_func_iswcntrl_works=yes
 else
-  gl_cv_func_iswcntrl_works="guessing no"
+  gl_cv_func_iswcntrl_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -62159,17 +52551,12 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
-
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   gl_cv_func_iswcntrl_works=yes
@@ -62185,216 +52572,98 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
 $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
     fi
-    HAVE_WCTYPE_H=1
-  else
-    HAVE_WCTYPE_H=0
-  fi
 
 
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
-
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-        :
-  fi
 
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
-  else
-    for ac_func in towlower
-do :
-  ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
-if test "x$ac_cv_func_towlower" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TOWLOWER 1
-_ACEOF
 
-fi
-done
+  :
 
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
 
-"
-if test "x$ac_cv_have_decl_towlower" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER $ac_have_decl
-_ACEOF
 
-      if test $ac_cv_have_decl_towlower = yes; then
-                                REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
 
 
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-        :
-  fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
-$as_echo_n "checking for wctype_t... " >&6; }
-if ${gl_cv_type_wctype_t+:} false; then :
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wctype_h='<'wctype.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
+if test "${gl_cv_next_wctype_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
 
-int
-main ()
-{
+          if test $ac_cv_header_wctype_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wctype.h>
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctype_t=yes
-else
-  gl_cv_type_wctype_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wctype.h#{
+                 s#.*"\(.*/wctype.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_wctype_h='<'wctype.h'>'
+          fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
-$as_echo "$gl_cv_type_wctype_t" >&6; }
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
-  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
+$as_echo "$gl_cv_next_wctype_h" >&6; }
+     fi
+     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
-$as_echo_n "checking for wctrans_t... " >&6; }
-if ${gl_cv_type_wctrans_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'wctype.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wctype_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_type_wctrans_t=yes
-else
-  gl_cv_type_wctrans_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
-$as_echo "$gl_cv_type_wctrans_t" >&6; }
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
   fi
 
 
-    for gl_func in wctype iswctype wctrans towctrans     ; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
+  else
+    REPLACE_ISWCNTRL=0
+  fi
+
+
+  # Code from module wcwidth:
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
 
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
 
 
 
 
 
 
+  :
+
+
+
 
 
 
+  :
+
+
 
 
 
@@ -62412,7 +52681,7 @@
 #include <wchar.h>
 
 "
-if test "x$ac_cv_have_decl_wcwidth" = xyes; then :
+if test "x$ac_cv_have_decl_wcwidth" = x""yes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -62427,19 +52696,18 @@
   fi
 
   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 :
+if test "${gl_cv_func_wcwidth_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
         if test "$cross_compiling" = yes; then :
 
            case "$host_os" in
-                     # Guess yes on glibc and AIX 7 systems.
-             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-             *)                  gl_cv_func_wcwidth_works="guessing no";;
+                     # Guess yes on glibc systems.
+             *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)      gl_cv_func_wcwidth_works="guessing no";;
            esac
 
 else
@@ -62466,17 +52734,10 @@
 #endif
 int main ()
 {
-  int result = 0;
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    {
-      if (wcwidth (0x0301) > 0)
-        result |= 1;
-      if (wcwidth (0x05B0) > 0)
-        result |= 2;
-      if (wcwidth (0x200B) > 0)
-        result |= 4;
-    }
-  return result;
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -62496,11 +52757,8 @@
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  else
-    HAVE_WCWIDTH=0
   fi
-
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
 
 
 
@@ -62512,14 +52770,17 @@
   gtpo_LIBOBJS="$gtpo_LIBOBJS wcwidth.$ac_objext"
 
   fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
 
+    :
 
+  fi
 
 
 
-          GNULIB_WCWIDTH=1
-
 
+  GNULIB_WCWIDTH=1
 
 
 
@@ -62527,12 +52788,19 @@
 
 
 
+  # Code from module xalloc:
+  # Code from module xalloc-die:
+  # Code from module xconcat-filename:
+  # Code from module xerror:
+  # Code from module xmalloca:
+  # Code from module xsize:
+
 
 
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDINT_H 1
 _ACEOF
@@ -62542,7 +52810,11 @@
 done
 
 
-  :
+  # Code from module xstriconv:
+  # Code from module xvasprintf:
+
+
+
 
 
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=xasprintf:1:c-format"
@@ -62586,7 +52858,7 @@
 for ac_header in pwd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default"
-if test "x$ac_cv_header_pwd_h" = xyes; then :
+if test "x$ac_cv_header_pwd_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PWD_H 1
 _ACEOF
@@ -62598,7 +52870,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
+if test "${ac_cv_c_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -62641,12 +52913,10 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
 $as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   /* For now, do not test the preprocessor; as of 2007 there are too many
@@ -62679,13 +52949,12 @@
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-
+  ac_cv_type_unsigned_long_long_int=yes
 else
   ac_cv_type_unsigned_long_long_int=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
@@ -62696,7 +52965,7 @@
   fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
 else
 
@@ -62707,7 +52976,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PTRDIFF_T 1
@@ -62719,7 +52988,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 $as_echo_n "checking for ssize_t... " >&6; }
-if ${gt_cv_ssize_t+:} false; then :
+if test "${gt_cv_ssize_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62729,7 +52998,7 @@
 main ()
 {
 int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;
+        return !x;
   ;
   return 0;
 }
@@ -62750,7 +53019,7 @@
   fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+if test "x$ac_cv_type_pid_t" = x""yes; then :
 
 else
 
@@ -62761,9 +53030,9 @@
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if ${ac_cv_gnu_library_2_1+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62775,13 +53044,10 @@
   Lucky GNU user
  #endif
 #endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky" >/dev/null 2>&1; then :
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2_1=yes
 else
   ac_cv_gnu_library_2_1=no
@@ -62800,7 +53066,7 @@
 if test $GLIBC21 = yes; then
   ac_fn_c_check_member "$LINENO" "struct __locale_struct" "__names" "ac_cv_member_struct___locale_struct___names" "#include <xlocale.h>
 "
-if test "x$ac_cv_member_struct___locale_struct___names" = xyes; then :
+if test "x$ac_cv_member_struct___locale_struct___names" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT___LOCALE_STRUCT___NAMES 1
@@ -62814,7 +53080,7 @@
 for ac_func in select
 do :
   ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select"
-if test "x$ac_cv_func_select" = xyes; then :
+if test "x$ac_cv_func_select" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SELECT 1
 _ACEOF
@@ -62825,7 +53091,7 @@
 for ac_header in vfork.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = xyes; then :
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VFORK_H 1
 _ACEOF
@@ -62838,7 +53104,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -62849,7 +53116,7 @@
 if test "x$ac_cv_func_fork" = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
 $as_echo_n "checking for working fork... " >&6; }
-if ${ac_cv_func_fork_works+:} false; then :
+if test "${ac_cv_func_fork_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -62902,7 +53169,7 @@
 if test "x$ac_cv_func_vfork" = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
 $as_echo_n "checking for working vfork... " >&6; }
-if ${ac_cv_func_vfork_works+:} false; then :
+if test "${ac_cv_func_vfork_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -63038,7 +53305,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signal handlers with siginfo_t" >&5
 $as_echo_n "checking for signal handlers with siginfo_t... " >&6; }
-if ${gt_cv_siginfo_t+:} false; then :
+if test "${gt_cv_siginfo_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -63076,7 +53343,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setlocale declaration" >&5
 $as_echo_n "checking for setlocale declaration... " >&6; }
-if ${gt_cv_proto_setlocale+:} false; then :
+if test "${gt_cv_proto_setlocale+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -63126,7 +53393,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -63359,7 +53626,7 @@
   for ac_header in arpa/inet.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
+if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ARPA_INET_H 1
 _ACEOF
@@ -63372,7 +53639,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -63383,7 +53651,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 sockets" >&5
 $as_echo_n "checking for IPv6 sockets... " >&6; }
-  if ${gt_cv_socket_ipv6+:} false; then :
+  if test "${gt_cv_socket_ipv6+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -63441,25 +53709,13 @@
 
 fi
 
-GETTEXTLIB_EXPORTS_FLAGS=
 if test -n "$GETOPT_H"; then
-  GETTEXTLIB_EXPORTS_FLAGS="-DGNULIB_DEFINED_GETOPT $GETTEXTLIB_EXPORTS_FLAGS"
-fi
-if test "$ac_cv_lib_error_at_line" = no; then
-  GETTEXTLIB_EXPORTS_FLAGS="-DGNULIB_DEFINED_ERROR $GETTEXTLIB_EXPORTS_FLAGS"
-fi
-
-if test "$USER_LABEL_PREFIX" = _; then
-  GETTEXTLIB_EXPORTS_FLAGS="-DUSER_LABEL_PREFIX_UNDERSCORE $GETTEXTLIB_EXPORTS_FLAGS"
+  GETTEXTLIB_EXPORTS_FLAGS="-DGNULIB_DEFINED_GETOPT"
+else
+  GETTEXTLIB_EXPORTS_FLAGS=
 fi
 
 
-if test "$ac_cv_lib_error_at_line" = no; then
-
-$as_echo "#define GNULIB_REPLACE_ERROR 1" >>confdefs.h
-
-fi
-
 
 
 
@@ -63554,7 +53810,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -63969,7 +54225,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexpat" >&5
 $as_echo_n "checking for libexpat... " >&6; }
-if ${ac_cv_libexpat+:} false; then :
+if test "${ac_cv_libexpat+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -64029,7 +54285,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -64037,7 +54293,10 @@
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+  if test -n "$ac_tool_prefix" \
+     && { test "$build" = "$host" \
+          || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
+        }; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -64054,13 +54313,13 @@
 	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 	*/dev/null* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
+	  break
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
+	    break
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -64092,7 +54351,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -64104,7 +54363,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -64136,7 +54395,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -64148,84 +54407,369 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
-IFS=$as_save_IFS
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:54472: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:54475: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:54478: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_path_SED=$SED
 fi
 
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
 
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
   fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDGIRSTW]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
   rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
 
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
 
 
 
@@ -64239,25 +54783,7 @@
 
 
 
-
-# Check whether --with-emacs was given.
-if test "${with_emacs+set}" = set; then :
-  withval=$with_emacs; gt_use_emacs=$withval
-else
-  gt_use_emacs=yes
-fi
-
-if test "$EMACS" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Emacs support is requested" >&5
-$as_echo_n "checking whether Emacs support is requested... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_use_emacs" >&5
-$as_echo "$gt_use_emacs" >&6; }
-  if test "$gt_use_emacs" = no; then
-    EMACS=no
-  fi
-fi
-if test "$EMACS" != no; then
-   # If set to t, that means we are running in a shell under Emacs.
+ # If set to t, that means we are running in a shell under Emacs.
  # If you have an Emacs named "t", then use the full path.
  test x"$EMACS" = xt && EMACS=
  for ac_prog in emacs xemacs
@@ -64266,7 +54792,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_EMACS+:} false; then :
+if test "${ac_cv_prog_EMACS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$EMACS"; then
@@ -64278,7 +54804,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_EMACS="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -64317,7 +54843,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking where .elc files should go" >&5
 $as_echo_n "checking where .elc files should go... " >&6; }
-if ${am_cv_lispdir+:} false; then :
+if test "${am_cv_lispdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -64352,6 +54878,22 @@
 
 
 
+
+# Check whether --with-emacs was given.
+if test "${with_emacs+set}" = set; then :
+  withval=$with_emacs; gt_use_emacs=$withval
+else
+  gt_use_emacs=yes
+fi
+
+if test "$EMACS" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Emacs support is requested" >&5
+$as_echo_n "checking whether Emacs support is requested... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_use_emacs" >&5
+$as_echo "$gt_use_emacs" >&6; }
+  if test "$gt_use_emacs" = no; then
+    EMACS=no
+  fi
 fi
 
 aclocaldir='${datadir}/aclocal'
@@ -64373,118 +54915,34 @@
   gt_use_cvs=no
 fi
 
-
-# Check whether --with-bzip2 was given.
-if test "${with_bzip2+set}" = set; then :
-  withval=$with_bzip2; gt_use_bzip2=$withval
-else
-  gt_use_bzip2=maybe
-fi
-
-
-# Check whether --with-xz was given.
-if test "${with_xz+set}" = set; then :
-  withval=$with_xz; gt_use_xz=$withval
-else
-  gt_use_xz=maybe
-fi
-
 # The CVS format is deprecated, because "cvs init" does not work in all
 # circumstances
 # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
 # and we are not allowed to distribute the cvs infrastructure files ourselves
 # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
-#
-# With the archive from version 0.18.1, we can observe the following
-# compression rates:
-#    Size           File
-#  16916480   archive.dir.tar
-#   3528757   archive.dir.tar.gz
-#   2621440   archive.cvs.tar
-#   2082492   archive.dir.tar.bz2
-#    696320   archive.git.tar
-#    599046   archive.git.tar.bz2
-#    592989   archive.git.tar.gz
-#    588124   archive.git.tar.xz
-#    457190   archive.cvs.tar.gz
-#    335808   archive.cvs.tar.bz2
-#    308880   archive.dir.tar.xz
-#    299124   archive.cvs.tar.xz
-# Among these:
-#   - We don't offer the uncompressed ones, because at least gzip can be
-#     assumed to be present everywhere.
-#   - Among archive.git.tar.*, all have approximately the same size, because
-#     git already compresses most of its repository data. Offer only .gz here.
-#   - Among archive.cvs.tar.*, offer only .gz, for simplicity, since --with-cvs
-#     is deprecated.
-# The remaining ones are:
-#    Size           File            ARCHIVE_FORMAT
-#   3528757   archive.dir.tar.gz      dirgz
-#   2082492   archive.dir.tar.bz2     dirbz2
-#    592989   archive.git.tar.gz      git
-#    457190   archive.cvs.tar.gz      cvs
-#    308880   archive.dir.tar.xz      dirxz
-if test "$gt_use_xz" != no && test "$gt_use_xz" != maybe; then
-  # --with-xz is specified. Even if --with-git or --with-cvs or --with-bzip2 is
-  # also specified, we use the dirxz format.
-  ARCHIVE_FORMAT=dirxz
-else
-  if test "$gt_use_git" != no && test "$gt_use_git" != maybe; then
-    # --with-git is specified. Even if --with-cvs or --with-bzip2 is also
-    # specified, we use the git format.
-    ARCHIVE_FORMAT=git
-  else
-    if test "$gt_use_cvs" != no; then
-      # --with-cvs is specified. Even if --with-bzip2 is also specified, we use
-      # the cvs format.
-      ARCHIVE_FORMAT=cvs
+if test "$gt_use_git" != no && test "$gt_use_git" != maybe; then
+  # --with-git is specified. Even if --with-cvs is also specified, we use the
+  # git format.
+  ARCHIVE_FORMAT=git
+else
+  if test "$gt_use_cvs" != no; then
+    # --with-cvs is specified.
+    ARCHIVE_FORMAT=cvs
+  else
+    # Neither --with-git nor --with-cvs is specified.
+    if test "$gt_use_git" != no \
+       && (git --version) >/dev/null 2>&1 \
+       && { case `git --version | sed -e 's/^[^0-9]*//'` in
+              0.* | 1.[0-5].*) false ;;
+              *) true ;;
+            esac
+          }; then
+      # --without-git is not specified, and the git program exists
+      # in version 1.6 or newer. Use git format.
+      ARCHIVE_FORMAT=git
     else
-      if test "$gt_use_bzip2" != no && test "$gt_use_bzip2" != maybe; then
-        # --with-bzip2 is specified. We use the dirbz2 format.
-        ARCHIVE_FORMAT=dirbz2
-      else
-        # Neither --with-git nor --with-cvs nor --with-bzip2 nor --with-xz is
-        # specified. Determine which programs are present.
-        if test "$gt_use_xz" != no \
-           && (xz --version) >/dev/null 2>&1 \
-           && xz --version | grep lzma >/dev/null; then
-          # --without-xz is not specified, and the xz program exists.
-          ARCHIVE_FORMAT=dirxz
-        else
-          # --without-xz is specified, or the xz program is missing.
-          if test "$gt_use_git" != no \
-             && (git --version) >/dev/null 2>&1 \
-             && { case `git --version | sed -e 's/^[^0-9]*//'` in
-                    0.* | 1.[0-5].*) false ;;
-                    *) true ;;
-                  esac
-                }; then
-            # --without-git is not specified, and the git program exists
-            # in version 1.6 or newer. Use git format.
-            ARCHIVE_FORMAT=git
-          else
-            # --without-git is specified, or the git program is missing.
-            if test "$gt_use_bzip2" != no \
-               && (: | bzip2 --version) >/dev/null 2>&1 \
-               && { sed_bzip2_version1='s/ \([0-9][0-9.]*\).*/ \1/'
-                    sed_bzip2_version2='s/^.* //'
-                    case `(: | bzip2 --version) 2>&1 \
-                          | sed -e 1q \
-                          | sed -e "$sed_bzip2_version1" -e "$sed_bzip2_version2"` in
-                      0.*) false ;;
-                      *) true ;;
-                    esac
-                  }; then
-              # --without-bzip2 is not specified, and the bzip2 program exists
-              # in version 1.0 or newer. Use dirbz2 format.
-              ARCHIVE_FORMAT=dirbz2
-            else
-              # --without-bzip2 is specified, or the bzip2 program is missing.
-              ARCHIVE_FORMAT=dirgz
-            fi
-          fi
-        fi
-      fi
+      # --without-git is specified, or the git program is missing.
+      ARCHIVE_FORMAT=dir
     fi
   fi
 fi
@@ -64495,7 +54953,7 @@
 set dummy dvips; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DVIPS+:} false; then :
+if test "${ac_cv_path_DVIPS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $DVIPS in
@@ -64509,7 +54967,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -64536,7 +54994,7 @@
 set dummy texi2pdf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TEXI2PDF+:} false; then :
+if test "${ac_cv_path_TEXI2PDF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $TEXI2PDF in
@@ -64550,7 +55008,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TEXI2PDF="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -64577,7 +55035,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -64591,7 +55049,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -64619,23 +55077,13 @@
 
 
 
-
-
-  if test "$CXX_CHOICE" = no; then
-    CXX=no
-  fi
-  if test -z "$CXX"; then
-    if test -n "$CCC"; then
-      CXX="$CCC"
-    else
-      if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -64647,8 +55095,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -64668,72 +55116,14 @@
 fi
 
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
+  test -n "$CXX" && break
 done
+test -n "$CXX" || CXX=":"
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-    fi
-  fi
-  if test "$CXX" != no; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+if test "$CXX" != ":"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 $as_echo_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... " >&6; }
-    ac_ext=cpp
+  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -64741,229 +55131,77 @@
 
 
 
-    echo 'int main () { return 0; }' > conftest.$ac_ext
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      gl_cv_prog_ansicxx_works=yes
-      if (./conftest; exit) 2>/dev/null; then
-        gl_cv_prog_ansicxx_cross=no
-      else
-        gl_cv_prog_ansicxx_cross=yes
-      fi
+    ac_cv_prog_cxx_works=yes
+    if (./conftest; exit) 2>/dev/null; then
+      ac_cv_prog_cxx_cross=no
     else
-      gl_cv_prog_ansicxx_works=no
+      ac_cv_prog_cxx_cross=yes
     fi
-    rm -fr conftest*
-    ac_ext=c
+  else
+    ac_cv_prog_cxx_works=no
+  fi
+  rm -fr conftest*
+  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_works" >&5
-$as_echo "$gl_cv_prog_ansicxx_works" >&6; }
-    if test $gl_cv_prog_ansicxx_works = no; then
-      CXX=no
-    else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports namespaces" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_works" >&5
+$as_echo "$ac_cv_prog_cxx_works" >&6; }
+  if test $ac_cv_prog_cxx_works = no; then
+    CXX=:
+  else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports namespaces" >&5
 $as_echo_n "checking whether the C++ compiler supports namespaces... " >&6; }
-      ac_ext=cpp
+    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-      cat <<EOF > conftest.$ac_ext
+    cat <<EOF > conftest.$ac_ext
 #include <iostream>
 namespace test { using namespace std; }
 std::ostream* ptr;
 int main () { return 0; }
 EOF
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-        gl_cv_prog_ansicxx_namespaces=yes
-      else
-        gl_cv_prog_ansicxx_namespaces=no
-      fi
-      rm -fr conftest*
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_ansicxx_namespaces" >&5
-$as_echo "$gl_cv_prog_ansicxx_namespaces" >&6; }
-      if test $gl_cv_prog_ansicxx_namespaces = no; then
-        CXX=no
-      fi
-    fi
-  fi
-
-
-
-   if test "$CXX" != no; then
-  ANSICXX_TRUE=
-  ANSICXX_FALSE='#'
-else
-  ANSICXX_TRUE='#'
-  ANSICXX_FALSE=
-fi
-
-
-  if test "$CXX" != no; then
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-  else
-     if false; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+      gt_cv_prog_cxx_namespaces=yes
+    else
+      gt_cv_prog_cxx_namespaces=no
+    fi
+    rm -fr conftest*
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_prog_cxx_namespaces" >&5
+$as_echo "$gt_cv_prog_cxx_namespaces" >&6; }
+    if test $gt_cv_prog_cxx_namespaces = no; then
+      CXX=:
+    fi
   fi
+fi
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
 $as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
+if test "${gt_cv_locale_fr+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -64981,30 +55219,17 @@
 char buf[16];
 int main () {
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -65019,12 +55244,10 @@
      one byte long. This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 
@@ -65034,56 +55257,37 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr=fr_FR.ISO-8859-1
+        else
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR.ISO8859-1
+          else
+            # Test for the HP-UX locale name.
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.iso88591
             else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
               else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
+                # None found.
+                gt_cv_locale_fr=none
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
@@ -65097,7 +55301,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
 $as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
+if test "${gt_cv_locale_fr_utf8+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -65119,19 +55323,9 @@
      variables, and all locales use the UTF-8 encoding.  */
 #if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -65157,12 +55351,10 @@
       || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
     return 1;
 #endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 
@@ -65172,46 +55364,27 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
           else
             # None found.
             gt_cv_locale_fr_utf8=none
           fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
@@ -65226,7 +55399,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
 $as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
+if test "${gt_cv_locale_ja+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -65246,30 +55419,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -65284,7 +55444,7 @@
   if (MB_CUR_MAX == 1)
     return 1;
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -65299,58 +55459,42 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
+          else
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
             else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
               else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
                 else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
+                  # None found.
+                  gt_cv_locale_ja=none
                 fi
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
 
@@ -65369,6 +55513,29 @@
 
 
 
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -65385,7 +55552,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -65397,7 +55564,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -65429,7 +55596,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -65441,7 +55608,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -65507,7 +55674,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -65544,7 +55711,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -65630,16 +55797,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -65673,16 +55839,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -65691,16 +55857,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -65754,18 +55920,7 @@
 fi
 
 
-
-
-
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
   ac_ext=cpp
@@ -65776,7 +55931,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -65806,7 +55961,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -65822,11 +55977,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -65865,7 +56020,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -65881,18 +56036,17 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+_lt_caught_CXX_error=yes; }
 fi
 
 ac_ext=c
@@ -65905,6 +56059,9 @@
   _lt_caught_CXX_error=yes
 fi
 
+
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -65920,6 +56077,7 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -65929,8 +56087,6 @@
 module_expsym_cmds_CXX=
 link_all_deplibs_CXX=unknown
 old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
 no_undefined_flag_CXX=
 whole_archive_flag_spec_CXX=
 enable_shared_with_static_runtimes_CXX=no
@@ -65986,7 +56142,6 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -66004,7 +56159,6 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
   compiler=$CC
   compiler_CXX=$CC
   for cc_temp in $compiler""; do
@@ -66015,7 +56169,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
   if test -n "$compiler"; then
@@ -66078,7 +56232,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -66115,10 +56269,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -66144,8 +56298,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -66177,7 +56331,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
     else
       GXX=no
@@ -66287,13 +56441,7 @@
           allow_undefined_flag_CXX='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -66306,33 +56454,26 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
@@ -66341,13 +56482,7 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -66360,42 +56495,30 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    no_undefined_flag_CXX=' ${wl}-bernotok'
 	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_CXX='$convenience'
 	    archive_cmds_need_lc_CXX=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -66425,75 +56548,28 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+        # as there is no search path for DLLs.
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        allow_undefined_flag_CXX=unsupported
+        always_export_symbols_CXX=no
+        enable_shared_with_static_runtimes_CXX=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
       darwin* | rhapsody*)
 
 
@@ -66501,12 +56577,7 @@
   hardcode_direct_CXX=no
   hardcode_automatic_CXX=yes
   hardcode_shlibpath_var_CXX=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
+  whole_archive_flag_spec_CXX=''
   link_all_deplibs_CXX=yes
   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -66514,7 +56585,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -66548,7 +56619,7 @@
         esac
         ;;
 
-      freebsd2.*)
+      freebsd[12]*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -66567,11 +56638,6 @@
       gnu*)
         ;;
 
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
       hpux9*)
         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
         hardcode_libdir_separator_CXX=:
@@ -66596,11 +56662,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
             ;;
           *)
             if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               ld_shlibs_CXX=no
@@ -66661,7 +56727,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -66671,10 +56737,10 @@
 	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -66704,7 +56770,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -66715,9 +56781,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
 	      fi
 	    fi
 	    link_all_deplibs_CXX=yes
@@ -66728,7 +56794,7 @@
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -66746,7 +56812,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -66783,26 +56849,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
 	      prelink_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
 	      old_archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
 		$RANLIB $oldlib'
 	      archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 and above use weak symbols
+	    *) # Version 6 will use weak symbols
 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -66810,7 +56876,7 @@
 
 	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -66829,9 +56895,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
-	  xl* | mpixl* | bgxl*)
+	  xl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -66851,13 +56917,13 @@
 	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	      compiler_needs_object_CXX=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
+	      output_verbose_link_cmd='echo'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -66926,7 +56992,7 @@
 	    export_dynamic_flag_spec_CXX='${wl}-E'
 	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=func_echo_all
+	  output_verbose_link_cmd=echo
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -66961,15 +57027,15 @@
 	    case $host in
 	      osf3*)
 	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 		;;
@@ -66985,17 +57051,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -67005,7 +57071,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -67041,7 +57107,7 @@
 
       solaris*)
         case $cc_basename in
-          CC* | sunCC*)
+          CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             archive_cmds_need_lc_CXX=yes
 	    no_undefined_flag_CXX=' -zdefs'
@@ -67062,7 +57128,7 @@
 	    esac
 	    link_all_deplibs_CXX=yes
 
-	    output_verbose_link_cmd='func_echo_all'
+	    output_verbose_link_cmd='echo'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -67082,14 +57148,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -67100,7 +57166,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      fi
 
 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -67154,10 +57220,6 @@
           CC*)
 	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	      '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
 	    ;;
 	  *)
 	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -67219,14 +57281,6 @@
 };
 _LT_EOF
 
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -67240,7 +57294,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
+    case $p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -67249,22 +57303,13 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
+       else
+	 prev=
        fi
 
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
+	 case $p in
+	 -L* | -R*)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -67284,10 +57329,8 @@
 	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
 	 fi
        fi
-       prev=
        ;;
 
-    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -67323,7 +57366,6 @@
 fi
 
 $RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
@@ -67359,7 +57401,7 @@
 
 solaris*)
   case $cc_basename in
-  CC* | sunCC*)
+  CC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -67424,6 +57466,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -67473,11 +57517,6 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -67527,11 +57566,6 @@
 	  ;;
 	esac
 	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -67588,7 +57622,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -67621,8 +57655,8 @@
 	    lt_prog_compiler_pic_CXX=
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-qpic'
 	    lt_prog_compiler_static_CXX='-qstaticlink'
@@ -67684,7 +57718,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC* | sunCC*)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
@@ -67749,17 +57783,10 @@
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
@@ -67767,7 +57794,7 @@
 if test -n "$lt_prog_compiler_pic_CXX"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
@@ -67783,15 +57810,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:57813: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:57817: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_CXX=yes
@@ -67817,15 +57844,13 @@
 
 
 
-
-
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
@@ -67838,7 +57863,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_CXX=yes
@@ -67865,7 +57890,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -67884,16 +57909,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:57912: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:57916: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -67917,7 +57942,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -67936,16 +57961,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:57964: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:57968: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -67996,37 +58021,27 @@
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   case $host_os in
   aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     export_symbols_cmds_CXX="$ltdll_cmds"
-    ;;
+  ;;
   cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
+  ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
@@ -68058,50 +58073,44 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+        then
+	  archive_cmds_need_lc_CXX=no
+        else
+	  archive_cmds_need_lc_CXX=yes
+        fi
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
@@ -68169,6 +58178,8 @@
 
 
 
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -68194,7 +58205,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -68203,7 +58214,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -68256,7 +58267,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -68268,7 +58279,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -68287,9 +58298,8 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -68310,82 +58320,36 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
     ;;
   esac
+  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -68405,7 +58369,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -68413,6 +58377,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -68420,7 +58388,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -68438,7 +58406,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -68458,26 +58426,12 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -68530,7 +58484,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -68546,7 +58500,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -68583,9 +58537,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -68593,17 +58547,12 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -68616,17 +58565,13 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -68635,7 +58580,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -68667,7 +58612,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -68736,7 +58681,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -68761,7 +58706,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -68785,7 +58730,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -68816,7 +58761,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -68826,7 +58771,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -68936,7 +58881,6 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -68964,13 +58908,19 @@
 else
   TESTLIBASPRINTF=yes
 fi
-if test "$CXX" = no; then
+if test "$CXX" = ":"; then
   TESTLIBASPRINTF=no
 fi
 
 
 test -d intl || mkdir intl
 echo "GNU gettext library from gettext-$VERSION" > intl/VERSION
+cat > intl/ChangeLog.inst <<EOF
+$RELEASE_DATE  GNU  <bug-gnu-gettext@gnu.org>
+
+	* Version $VERSION released.
+
+EOF
 
 
 
@@ -69031,9 +58981,6 @@
 ac_config_files="$ac_config_files tests/Makefile"
 
 
-ac_config_files="$ac_config_files tests/init-env"
-
-
 ac_config_files="$ac_config_files gnulib-tests/Makefile"
 
 
@@ -69101,21 +59048,10 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -69131,7 +59067,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -69146,14 +59081,6 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -69163,171 +59090,98 @@
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
+  as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 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 "${GL_GENERATE_ICONV_H_TRUE}" && test -z "${GL_GENERATE_ICONV_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ICONV_H\" was never defined.
+  as_fn_error "conditional \"WOE32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ANSICXX_TRUE}" && test -z "${ANSICXX_FALSE}"; then
-  as_fn_error $? "conditional \"ANSICXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_BYTESWAP_H_TRUE}" && test -z "${GL_GENERATE_BYTESWAP_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ERRNO_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_FLOAT_H_TRUE}" && test -z "${GL_GENERATE_FLOAT_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_FLOAT_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_FNMATCH_H_TRUE}" && test -z "${GL_GENERATE_FNMATCH_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_FNMATCH_H\" 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
-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.
+  as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INCLUDED_LIBGLIB_TRUE}" && test -z "${INCLUDED_LIBGLIB_FALSE}"; then
-  as_fn_error $? "conditional \"INCLUDED_LIBGLIB\" was never defined.
+  as_fn_error "conditional \"INCLUDED_LIBGLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INCLUDED_LIBCROCO_TRUE}" && test -z "${INCLUDED_LIBCROCO_FALSE}"; then
-  as_fn_error $? "conditional \"INCLUDED_LIBCROCO\" was never defined.
+  as_fn_error "conditional \"INCLUDED_LIBCROCO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INCLUDED_LIBGLIB_TRUE}" && test -z "${INCLUDED_LIBGLIB_FALSE}"; then
-  as_fn_error $? "conditional \"INCLUDED_LIBGLIB\" was never defined.
+  as_fn_error "conditional \"INCLUDED_LIBGLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INCLUDED_LIBXML_TRUE}" && test -z "${INCLUDED_LIBXML_FALSE}"; then
-  as_fn_error $? "conditional \"INCLUDED_LIBXML\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+  as_fn_error "conditional \"INCLUDED_LIBXML\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${RELOCATABLE_VIA_LD_TRUE}" && test -z "${RELOCATABLE_VIA_LD_FALSE}"; then
-  as_fn_error $? "conditional \"RELOCATABLE_VIA_LD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${RELOCATABLE_VIA_WRAPPER_TRUE}" && test -z "${RELOCATABLE_VIA_WRAPPER_FALSE}"; then
-  as_fn_error $? "conditional \"RELOCATABLE_VIA_WRAPPER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_SCHED_H_TRUE}" && test -z "${GL_GENERATE_SCHED_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_SCHED_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDARG_H_TRUE}" && test -z "${GL_GENERATE_STDARG_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDARG_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined.
+  as_fn_error "conditional \"RELOCATABLE_VIA_LD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNINAME_UNINAME_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNINAME_UNINAME\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNINAME_UNINAME\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_CHECK\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_CHECK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_PREV_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_PREV\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_PREV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-
     gl_libobjs=
     gl_ltlibobjs=
     if test -n "$gl_LIBOBJS"; then
@@ -69344,15 +59198,15 @@
 
 
 if test -z "${POSIX_SPAWN_PORTED_TRUE}" && test -z "${POSIX_SPAWN_PORTED_FALSE}"; then
-  as_fn_error $? "conditional \"POSIX_SPAWN_PORTED\" was never defined.
+  as_fn_error "conditional \"POSIX_SPAWN_PORTED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_CMP_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_CMP\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_CMP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -69372,7 +59226,7 @@
 
 
 if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
+  as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -69408,87 +59262,59 @@
 
 
 if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_FLOAT_H_TRUE}" && test -z "${GL_GENERATE_FLOAT_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_FLOAT_H\" 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
-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
-fi
-if test -z "${GL_GENERATE_STDARG_H_TRUE}" && test -z "${GL_GENERATE_STDARG_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDARG_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+  as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_CHECK\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_CHECK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_PREV_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_PREV\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_PREV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then
-  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -69524,27 +59350,15 @@
 
 
 if test -z "${WOE32DLL_TRUE}" && test -z "${WOE32DLL_FALSE}"; then
-  as_fn_error $? "conditional \"WOE32DLL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ANSICXX_TRUE}" && test -z "${ANSICXX_FALSE}"; then
-  as_fn_error $? "conditional \"ANSICXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error "conditional \"WOE32DLL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -69645,7 +59459,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -69691,19 +59504,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -69841,16 +59654,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -69899,7 +59712,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -69910,16 +59723,28 @@
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -69940,8 +59765,8 @@
 # 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by gettext-tools $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -70000,17 +59825,17 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-gnu-gettext@gnu.org>."
+Report bugs to the package provider."
 
 _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.3
-configured by $0, generated by GNU Autoconf 2.69,
+gettext-tools config.status
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -70028,16 +59853,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -70059,7 +59879,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -70072,7 +59891,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -70081,7 +59900,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -70101,7 +59920,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -70135,260 +59954,234 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_RC='`$ECHO "$compiler_lib_search_dirs_RC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_RC='`$ECHO "$predep_objects_RC" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_RC='`$ECHO "$postdep_objects_RC" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_RC='`$ECHO "$predeps_RC" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_RC='`$ECHO "$postdeps_RC" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_RC='`$ECHO "$compiler_lib_search_path_RC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "X$install_override_mode" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_RC='`$ECHO "X$LD_RC" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_RC='`$ECHO "X$old_archive_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_RC='`$ECHO "X$compiler_RC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_RC='`$ECHO "X$GCC_RC" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_RC='`$ECHO "X$lt_prog_compiler_no_builtin_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_RC='`$ECHO "X$lt_prog_compiler_wl_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_RC='`$ECHO "X$lt_prog_compiler_pic_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_RC='`$ECHO "X$lt_prog_compiler_static_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_RC='`$ECHO "X$lt_cv_prog_compiler_c_o_RC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_RC='`$ECHO "X$archive_cmds_need_lc_RC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_RC='`$ECHO "X$enable_shared_with_static_runtimes_RC" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_RC='`$ECHO "X$export_dynamic_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_RC='`$ECHO "X$whole_archive_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_RC='`$ECHO "X$compiler_needs_object_RC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_RC='`$ECHO "X$old_archive_from_new_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_RC='`$ECHO "X$old_archive_from_expsyms_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_RC='`$ECHO "X$archive_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_RC='`$ECHO "X$archive_expsym_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_RC='`$ECHO "X$module_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_RC='`$ECHO "X$module_expsym_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_RC='`$ECHO "X$with_gnu_ld_RC" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_RC='`$ECHO "X$allow_undefined_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_RC='`$ECHO "X$no_undefined_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_RC='`$ECHO "X$hardcode_libdir_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_RC='`$ECHO "X$hardcode_libdir_flag_spec_ld_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_RC='`$ECHO "X$hardcode_libdir_separator_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_RC='`$ECHO "X$hardcode_direct_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_RC='`$ECHO "X$hardcode_direct_absolute_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_RC='`$ECHO "X$hardcode_minus_L_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_RC='`$ECHO "X$hardcode_shlibpath_var_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_RC='`$ECHO "X$hardcode_automatic_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_RC='`$ECHO "X$inherit_rpath_RC" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_RC='`$ECHO "X$link_all_deplibs_RC" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_RC='`$ECHO "X$fix_srcfile_path_RC" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_RC='`$ECHO "X$always_export_symbols_RC" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_RC='`$ECHO "X$export_symbols_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_RC='`$ECHO "X$exclude_expsyms_RC" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_RC='`$ECHO "X$include_expsyms_RC" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_RC='`$ECHO "X$prelink_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_RC='`$ECHO "X$file_list_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_RC='`$ECHO "X$hardcode_action_RC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_RC='`$ECHO "X$compiler_lib_search_dirs_RC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_RC='`$ECHO "X$predep_objects_RC" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_RC='`$ECHO "X$postdep_objects_RC" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_RC='`$ECHO "X$predeps_RC" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_RC='`$ECHO "X$postdeps_RC" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_RC='`$ECHO "X$compiler_lib_search_path_RC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
 # Quote evaled strings.
-for var in AS \
-DLLTOOL \
-OBJDUMP \
-SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
+for var in SED \
 GREP \
 EGREP \
 FGREP \
@@ -70400,12 +60193,8 @@
 reload_flag \
 deplibs_check_method \
 file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
-archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -70415,14 +60204,14 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
+SHELL \
+ECHO \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
 lt_prog_compiler_wl \
+lt_prog_compiler_pic \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
-MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -70436,7 +60225,9 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
+fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -70456,16 +60247,14 @@
 compiler_lib_search_path \
 LD_RC \
 LD_CXX \
-reload_flag_RC \
-reload_flag_CXX \
 compiler_RC \
 compiler_CXX \
 lt_prog_compiler_no_builtin_flag_RC \
 lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_pic_RC \
-lt_prog_compiler_pic_CXX \
 lt_prog_compiler_wl_RC \
 lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_RC \
+lt_prog_compiler_pic_CXX \
 lt_prog_compiler_static_RC \
 lt_prog_compiler_static_CXX \
 lt_cv_prog_compiler_c_o_RC \
@@ -70484,8 +60273,12 @@
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_RC \
 hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_RC \
+hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_RC \
 hardcode_libdir_separator_CXX \
+fix_srcfile_path_RC \
+fix_srcfile_path_CXX \
 exclude_expsyms_RC \
 exclude_expsyms_CXX \
 include_expsyms_RC \
@@ -70504,9 +60297,9 @@
 postdeps_CXX \
 compiler_lib_search_path_RC \
 compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -70528,14 +60321,11 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
-postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec \
-reload_cmds_RC \
-reload_cmds_CXX \
 old_archive_cmds_RC \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_RC \
@@ -70553,12 +60343,10 @@
 export_symbols_cmds_RC \
 export_symbols_cmds_CXX \
 prelink_cmds_RC \
-prelink_cmds_CXX \
-postlink_cmds_RC \
-postlink_cmds_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+prelink_cmds_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -70566,6 +60354,12 @@
     esac
 done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -70633,10 +60427,9 @@
     "man/x-to-1") CONFIG_FILES="$CONFIG_FILES man/x-to-1" ;;
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "tests/init-env") CONFIG_FILES="$CONFIG_FILES tests/init-env" ;;
     "gnulib-tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib-tests/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -70659,10 +60452,9 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -70670,13 +60462,12 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -70710,24 +60501,24 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 # Create commands to substitute file output variables.
 {
   echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
-  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
   echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
   echo "_ACAWK" &&
   echo "_ACEOF"
 } >conf$$files.sh &&
 . ./conf$$files.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 rm -f conf$$files.sh
 
 {
@@ -70735,18 +60526,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -70754,7 +60545,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -70802,7 +60593,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
   \$ac_cs_awk_pipe_init
@@ -70840,29 +60631,21 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -70874,7 +60657,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -70886,11 +60669,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -70975,7 +60758,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -70988,7 +60771,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -71007,7 +60790,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -71016,7 +60799,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -71042,8 +60825,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -71181,27 +60964,26 @@
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
 if $ac_cs_awk_getline; then
-  $AWK -f "$ac_tmp/subs.awk"
+  $AWK -f "$tmp/subs.awk"
 else
-  $AWK -f "$ac_tmp/subs.awk" | $SHELL
-fi \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  $AWK -f "$tmp/subs.awk" | $SHELL
+fi >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -71210,21 +60992,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -71270,7 +61052,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -71283,7 +61065,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -71317,19 +61099,21 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -71383,8 +61167,7 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -71421,13 +61204,13 @@
 macro_revision=$macro_revision
 
 # Assembler program.
-AS=$lt_AS
+AS=$AS
 
 # DLL creation program.
-DLLTOOL=$lt_DLLTOOL
+DLLTOOL=$DLLTOOL
 
 # Object dumper program.
-OBJDUMP=$lt_OBJDUMP
+OBJDUMP=$OBJDUMP
 
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
@@ -71441,15 +61224,6 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -71499,36 +61273,20 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method = "file_magic".
+# Command to use when deplibs_check_method == "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
 # The archiver.
 AR=$lt_AR
-
-# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -71537,9 +61295,6 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
 # A C compiler.
 LTCC=$lt_CC
 
@@ -71558,24 +61313,21 @@
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
 
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -71674,10 +61426,6 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -71690,12 +61438,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -71745,6 +61493,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -71778,6 +61530,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -71793,9 +61548,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -71842,169 +61594,212 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
 
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
 
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
 
-   mv -f "$cfgfile" "$ofile" ||
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -72016,10 +61811,6 @@
 # The linker used to build libraries.
 LD=$lt_LD_RC
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_RC
-reload_cmds=$lt_reload_cmds_RC
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_RC
 
@@ -72032,12 +61823,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl_RC
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_RC
 
@@ -72087,6 +61878,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
 
@@ -72120,6 +61915,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_RC
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_RC
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
 
@@ -72135,9 +61933,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_RC
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_RC
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_RC
 
@@ -72169,10 +61964,6 @@
 # The linker used to build libraries.
 LD=$lt_LD_CXX
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_CXX
 
@@ -72185,12 +61976,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl_CXX
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_CXX
 
@@ -72240,6 +62031,10 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
@@ -72273,6 +62068,9 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_CXX
 
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
 
@@ -72288,9 +62086,6 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_CXX
 
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_CXX
 
@@ -72325,7 +62120,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -72341,8 +62136,7 @@
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -72353,12 +62147,12 @@
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -72453,7 +62247,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -72474,7 +62268,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 
 #
@@ -72615,7 +62409,7 @@
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+	as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     fi
 
     cd "$ac_popdir"
diff -Nru gettext-0.19.3/gettext-tools/configure.ac gettext-0.18.1.1/gettext-tools/configure.ac
--- gettext-0.19.3/gettext-tools/configure.ac	2014-09-29 03:01:29.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/configure.ac	2010-06-06 20:04:04.000000000 +0000
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-tools directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2010 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
@@ -16,17 +16,17 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.62])
-AC_INIT([gettext-tools],
-	m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]),
-	[bug-gnu-gettext@gnu.org])
+AC_PREREQ([2.59])
+AC_INIT
 AC_CONFIG_SRCDIR([src/msgfmt.c])
 AC_CONFIG_AUX_DIR([../build-aux])
-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
-AC_CONFIG_HEADERS([config.h])
+. $srcdir/../version.sh
+gl_INIT_PACKAGE([gettext-tools], [$VERSION_NUMBER])
+AM_INIT_AUTOMAKE([silent-rules])
+AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -97,6 +97,14 @@
 dnl sets the RC variable to a program that compiles Windows resource files.
 LT_LANG([Windows Resource])
 
+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' ;;
+  *) LTNOUNDEF='' ;;
+esac
+AC_SUBST([LTNOUNDEF])
+
 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
@@ -105,13 +113,6 @@
 esac
 AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
 
-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
-dnl to gnulib's error.c.  See GETTEXTLIB_EXPORTS_FLAGS setting below.
-case "$host_os" in
-  cygwin*) ac_cv_lib_error_at_line=no ;;
-esac
-
 dnl Checks for libraries.
 
 dnl These are the only lines required to internationalize the package.
@@ -222,35 +223,16 @@
     [Define when --enable-shared is used on mingw or Cygwin.])
 fi
 
-GETTEXTLIB_EXPORTS_FLAGS=
 dnl woe32dll/gettextlib-exports.c needs to know whether the getopt facility
 dnl is replaced by gnulib. GETOPT_H is set by gl_FUNC_GETOPT_POSIX, inside
 dnl gl_INIT.
 if test -n "$GETOPT_H"; then
-  GETTEXTLIB_EXPORTS_FLAGS="-DGNULIB_DEFINED_GETOPT $GETTEXTLIB_EXPORTS_FLAGS"
-fi
-dnl woe32dll/gettextlib-exports.c needs to know whether the error
-dnl facility is replaced by gnulib. ac_cv_lib_error_at_line is set by
-dnl gl_ERROR, inside gl_INIT.
-if test "$ac_cv_lib_error_at_line" = no; then
-  GETTEXTLIB_EXPORTS_FLAGS="-DGNULIB_DEFINED_ERROR $GETTEXTLIB_EXPORTS_FLAGS"
-fi
-
-dnl 64-bit mingw does not prepend an underscore to C symbols.
-dnl USER_LABEL_PREFIX is set by gl_ASM_SYMBOL_PREFIX, inside gl_INIT.
-if test "$USER_LABEL_PREFIX" = _; then
-  GETTEXTLIB_EXPORTS_FLAGS="-DUSER_LABEL_PREFIX_UNDERSCORE $GETTEXTLIB_EXPORTS_FLAGS"
+  GETTEXTLIB_EXPORTS_FLAGS="-DGNULIB_DEFINED_GETOPT"
+else
+  GETTEXTLIB_EXPORTS_FLAGS=
 fi
 AC_SUBST([GETTEXTLIB_EXPORTS_FLAGS])
 
-dnl Tell the source files that the error facility is replaced by
-dnl gnulib, to make sure to prepend "rpl_" prefix to the error_*
-dnl symbols.
-if test "$ac_cv_lib_error_at_line" = no; then
-  AC_DEFINE([GNULIB_REPLACE_ERROR], [1],
-    [Define when the error facility is replaced by gnulib.])
-fi
-
 dnl Put some default definitions into config.h.
 AH_TOP([
 /* Default value for alignment of strings in .mo file.  */
@@ -314,6 +296,7 @@
 gt_GLOBAL_SYMBOL_PIPE
 
 dnl Check for Emacs and where to install .elc files.
+AM_PATH_LISPDIR
 dnl Sometimes Emacs is badly installed. Allow the user to work around it.
 AC_ARG_WITH([emacs],
   [  --without-emacs         do not use Emacs, don't install po-mode],
@@ -326,11 +309,6 @@
     EMACS=no
   fi
 fi
-dnl If $EMACS = no, we won't install any Emacs Lisp (*.el) files,
-dnl therefore it's useless to determine $(lispdir).
-if test "$EMACS" != no; then
-  AM_PATH_LISPDIR
-fi
 
 aclocaldir='${datadir}/aclocal'
 AC_SUBST([aclocaldir])
@@ -345,114 +323,36 @@
                           (deprecated)],
   [gt_use_cvs=$withval],
   [gt_use_cvs=no])
-AC_ARG_WITH([bzip2],
-  [  --without-bzip2         don't use bzip2 to compress the infrastructure archive],
-  [gt_use_bzip2=$withval],
-  [gt_use_bzip2=maybe])
-AC_ARG_WITH([xz],
-  [  --without-xz            don't use xz to compress the infrastructure archive],
-  [gt_use_xz=$withval],
-  [gt_use_xz=maybe])
 # The CVS format is deprecated, because "cvs init" does not work in all
 # circumstances
 # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
 # and we are not allowed to distribute the cvs infrastructure files ourselves
 # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
-#
-# With the archive from version 0.18.1, we can observe the following
-# compression rates:
-#    Size           File
-#  16916480   archive.dir.tar
-#   3528757   archive.dir.tar.gz
-#   2621440   archive.cvs.tar
-#   2082492   archive.dir.tar.bz2
-#    696320   archive.git.tar
-#    599046   archive.git.tar.bz2
-#    592989   archive.git.tar.gz
-#    588124   archive.git.tar.xz
-#    457190   archive.cvs.tar.gz
-#    335808   archive.cvs.tar.bz2
-#    308880   archive.dir.tar.xz
-#    299124   archive.cvs.tar.xz
-# Among these:
-#   - We don't offer the uncompressed ones, because at least gzip can be
-#     assumed to be present everywhere.
-#   - Among archive.git.tar.*, all have approximately the same size, because
-#     git already compresses most of its repository data. Offer only .gz here.
-#   - Among archive.cvs.tar.*, offer only .gz, for simplicity, since --with-cvs
-#     is deprecated.
-# The remaining ones are:
-#    Size           File            ARCHIVE_FORMAT
-#   3528757   archive.dir.tar.gz      dirgz
-#   2082492   archive.dir.tar.bz2     dirbz2
-#    592989   archive.git.tar.gz      git
-#    457190   archive.cvs.tar.gz      cvs
-#    308880   archive.dir.tar.xz      dirxz
-if test "$gt_use_xz" != no && test "$gt_use_xz" != maybe; then
-  # --with-xz is specified. Even if --with-git or --with-cvs or --with-bzip2 is
-  # also specified, we use the dirxz format.
-  ARCHIVE_FORMAT=dirxz
+if test "$gt_use_git" != no && test "$gt_use_git" != maybe; then
+  # --with-git is specified. Even if --with-cvs is also specified, we use the
+  # git format.
+  ARCHIVE_FORMAT=git
 else
-  if test "$gt_use_git" != no && test "$gt_use_git" != maybe; then
-    # --with-git is specified. Even if --with-cvs or --with-bzip2 is also
-    # specified, we use the git format.
-    ARCHIVE_FORMAT=git
+  if test "$gt_use_cvs" != no; then
+    # --with-cvs is specified.
+    ARCHIVE_FORMAT=cvs
   else
-    if test "$gt_use_cvs" != no; then
-      # --with-cvs is specified. Even if --with-bzip2 is also specified, we use
-      # the cvs format.
-      ARCHIVE_FORMAT=cvs
-    else
-      if test "$gt_use_bzip2" != no && test "$gt_use_bzip2" != maybe; then
-        # --with-bzip2 is specified. We use the dirbz2 format.
-        ARCHIVE_FORMAT=dirbz2
-      else
-        # Neither --with-git nor --with-cvs nor --with-bzip2 nor --with-xz is
-        # specified. Determine which programs are present.
-        if test "$gt_use_xz" != no \
-           && (xz --version) >/dev/null 2>&1 \
-           && xz --version | grep lzma >/dev/null; then
-          # --without-xz is not specified, and the xz program exists.
-          ARCHIVE_FORMAT=dirxz
-        else
-          # --without-xz is specified, or the xz program is missing.
-changequote(,)dnl
-          if test "$gt_use_git" != no \
-             && (git --version) >/dev/null 2>&1 \
-             && { case `git --version | sed -e 's/^[^0-9]*//'` in
-                    0.* | 1.[0-5].*) false ;;
-                    *) true ;;
-                  esac
-                }; then
-changequote([,])dnl
-            # --without-git is not specified, and the git program exists
-            # in version 1.6 or newer. Use git format.
-            ARCHIVE_FORMAT=git
-          else
-            # --without-git is specified, or the git program is missing.
+    # Neither --with-git nor --with-cvs is specified.
 changequote(,)dnl
-            if test "$gt_use_bzip2" != no \
-               && (: | bzip2 --version) >/dev/null 2>&1 \
-               && { sed_bzip2_version1='s/ \([0-9][0-9.]*\).*/ \1/'
-                    sed_bzip2_version2='s/^.* //'
-                    case `(: | bzip2 --version) 2>&1 \
-                          | sed -e 1q \
-                          | sed -e "$sed_bzip2_version1" -e "$sed_bzip2_version2"` in
-                      0.*) false ;;
-                      *) true ;;
-                    esac
-                  }; then
+    if test "$gt_use_git" != no \
+       && (git --version) >/dev/null 2>&1 \
+       && { case `git --version | sed -e 's/^[^0-9]*//'` in
+              0.* | 1.[0-5].*) false ;;
+              *) true ;;
+            esac
+          }; then
 changequote([,])dnl
-              # --without-bzip2 is not specified, and the bzip2 program exists
-              # in version 1.0 or newer. Use dirbz2 format.
-              ARCHIVE_FORMAT=dirbz2
-            else
-              # --without-bzip2 is specified, or the bzip2 program is missing.
-              ARCHIVE_FORMAT=dirgz
-            fi
-          fi
-        fi
-      fi
+      # --without-git is not specified, and the git program exists
+      # in version 1.6 or newer. Use git format.
+      ARCHIVE_FORMAT=git
+    else
+      # --without-git is specified, or the git program is missing.
+      ARCHIVE_FORMAT=dir
     fi
   fi
 fi
@@ -469,7 +369,7 @@
 AC_SUBST([CROSS_COMPILING])
 
 dnl Checks for optional programs for the tests/lang-*, tests/recode-* tests.
-gl_PROG_ANSI_CXX([CXX], [ANSICXX])
+gt_PROG_ANSI_CXX
 gt_LOCALE_FR
 gt_LOCALE_FR_UTF8
 gt_LOCALE_JA
@@ -491,7 +391,7 @@
 else
   TESTLIBASPRINTF=yes
 fi
-if test "$CXX" = no; then
+if test "$CXX" = ":"; then
   TESTLIBASPRINTF=no
 fi
 AC_SUBST([TESTLIBASPRINTF])
@@ -499,6 +399,12 @@
 dnl Generate the version information file in the intl/ directory.
 test -d intl || mkdir intl
 echo "GNU gettext library from gettext-$VERSION" > intl/VERSION
+cat > intl/ChangeLog.inst <<EOF
+$RELEASE_DATE  GNU  <bug-gnu-gettext@gnu.org>
+
+	* Version $VERSION released.
+
+EOF
 
 AC_CONFIG_SUBDIRS([examples])
 
@@ -543,8 +449,6 @@
 
 AC_CONFIG_FILES([tests/Makefile])
 
-AC_CONFIG_FILES([tests/init-env])
-
 AC_CONFIG_FILES([gnulib-tests/Makefile])
 
 AC_OUTPUT
diff -Nru gettext-0.19.3/gettext-tools/doc/ChangeLog gettext-0.18.1.1/gettext-tools/doc/ChangeLog
--- gettext-0.19.3/gettext-tools/doc/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,277 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-12  Daiki Ueno  <ueno@gnu.org>
-
-	* gpl.texi, lgpl.texi, fdl.texi: Update from GNU.
-	* gettext.texi (GNU GPL, GNU LGPL, GNU LGPL): Define nodes here,
-	instead of in those license documents.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-06-01  Daiki Ueno  <ueno@gnu.org>
-
-	* ISO_639: Remove Moldavian. Update Bihari, Bengali, Catalan,
-	Church Slavic, Divehi, Dzongkha, Ewe, Greek, Spanish, Fijian,
-	Gaelic, Hebrew, Interlingua, Indonesian, Inupiak, Central Khmer,
-	Kirghiz, Luxembourgish, Limburgan, Lao, Latvian, Norwegian Bokmal,
-	North Ndebele, Dutch, Norwegian Nynorsk, South Ndebele, Occitan,
-	Oromo, Pushto, Rundi, Romanian, Sango, Swati, South Sotho, Tswana,
-	Tonga, Uighur, Volapuk, Yiddish, and Zhuang.
-
-2014-05-31  Daiki Ueno  <ueno@gnu.org>
-
-	* msgexec.texi: Document the environment variable
-	MSGEXEC_PREV_MSGCTXT, MSGEXEC_PREV_MSGID, and
-	MSGEXEC_PREV_MSGID_PLURAL.
-
-2014-05-31  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfilter.texi: Document the environment variable
-	MSGFILTER_PREV_MSGCTXT, MSGFILTER_PREV_MSGID, and
-	MSGFILTER_PREV_MSGID_PLURAL.
-
-2014-05-15  Stanislav Brabec  <sbrabec@suse.cz>  (tiny change)
-
-	* msgfilter.texi: Document the environment variable
-	MSGFILTER_MSGID_PLURAL and MSGFILTER_PLURAL_FORM.
-
-2014-05-15  Stanislav Brabec  <sbrabec@suse.cz>  (tiny change)
-
-	* msgexec.texi: Document the environment variable
-	MSGEXEC_MSGID_PLURAL and MSGEXEC_PLURAL_FORM.
-
-2014-05-10  Guido Flohr  <guido@imperia.net>
-
-	msgattrib: Add --empty option to clear msgstr
-	* msgattrib.texi: Document --empty option.
-
-2014-05-05  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext.texi (Translations under Version Control): New section.
-
-2014-05-05  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext.texi (Version Control Issues): Rename from "CVS Issues";
-	talk about generic issues when using version control systems.
-
-2014-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext.texi (Scheme): Document gettext shorthand form _"abc".
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	build: Use git-version-gen intead of version.sh
-	* Makefile.am: Refer to .version instead of version.sh.
-
-2014-04-15  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfilter.texi: Document 'quot' and 'boldquot' built-in filters.
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt.texi: Document --desktop mode.
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext.texi: Document Desktop Entry file.
-
-2014-03-26  Aurélien Gâteau <mail@agateau.com>  (tiny change)
-
-	* msgfmt.texi: Document --source option.
-
-2014-03-25  Daiki Ueno  <ueno@gnu.org>
-
-	* msgattrib.texi: Document the optional argument of
-	--add-location.
-	* msgcat.texi: Likewise.
-	* msgcomm.texi: Likewise.
-	* msgconv.texi: Likewise.
-	* msgen.texi: Likewise.
-	* msgfilter.texi: Likewise.
-	* msggrep.texi: Likewise.
-	* msgmerge.texi: Likewise.
-	* msguniq.texi: Likewise.
-	* xgettext.texi: Likewise.
-
-2014-03-15  Daiki Ueno  <ueno@gnu.org>
-
-	* FAQ.html: Point to bug-gettext@gnu.org rather than
-	bug-gnu-gettext@gnu.org, in the context of mailing list; add a
-	link to the mailing list information page.  Point to the latest
-	URL of the GNOME Translation Project.  Replace the reference of
-	"Free Translation Project" with "Translation Project".
-	Reported by Benno Schulenberg.
-
-2014-02-10  Daiki Ueno  <ueno@gnu.org>
-
-	* ISO_3166: Remove AN, add BL, BQ, CW, MF, SS, and SX.  Update
-	country code for AG, AS, BA, BN, BO, CD, CG, FK, FM, FO, GB, GS,
-	HM, IR, KN, KP, KR, LA, LC, MD, MK, MM, PM, PS, RU, SH, SJ, ST,
-	SY, TC, TF, TT, TW, TZ, UM, VA, VC, VE, VG, VI, VN, WF, and WS.
-	* iso-3166.texi: Regenerate.
-	Reported by Karl Berry in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-02/msg00006.html>.
-
-2014-01-12  Benno Schulenberg <bensberg@justemail.net>  (tiny change)
-
-	* gettext.texi (c-format Flag): Wording fixes.
-
-2013-12-17  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext.texi (Installers): Fix wording.
-	Reported by Reuben Thomas in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00009.html>.
-
-2013-08-06  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: add support for GSettings schema file
-	* gettext.texi (GSettings): New subsection.
-	* xgettext.texi: Document GSettings source language.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2013-06-04  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Vala.
-	* xgettext.texi: Document Vala source language. Document
-	that it is applicable to --flag.
-
-2013-05-20  Pavel Kharitonov  <ineiev@gnu.org>  (tiny change)
-
-	Add --previous option to msgattrib.
-	* msgattrib.texi: Document --previous.
-
-2013-04-26  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Python brace format.
-	* gettext.texi (PO Files): Mention python-brace-format.
-	(python-format): Mention brace format.
-
-2013-04-17  Andreas Stricker  <astricker@futurelab.ch>
-
-	Support for JavaScript.
-	* gettext.texi (PO Files): Mention javascript-format.
-	(javascript-format): New subsection.
-	(JavaScript): New subsection.
-	* xgettext.texi: Document JavaScript source language. Document
-	that it is applicable to --flag.
-
-2013-04-11  Ľubomír Remák  <lubomirr@lubomirr.eu>
-
-	Support for Lua.
-	* gettext.texi (PO Files): Mention lua-format.
-	(lua-format): New subsection.
-	(Lua): New subsection.
-	* xgettext.texi: Document Lua source language. Document that it is
-	applicable to --flag.
-
-2013-04-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext.texi (PO Files): Use '@pxref' instead of '@xref'.
-
-2013-03-12  Andreas Stricker  <astricker@futurelab.ch>  (tiny change)
-
-	* msgfmt.texi (PO Format): A note about the header entry
-
-2013-02-15  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt.texi (Input file location): Output file is not PO.
-
-2013-01-30  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>  (tiny change)
-
-	* msgen.texi (Output details): Fix link in '@opindex' pointing to
-	msgcat.
-	Reported at <http://savannah.gnu.org/bugs/?36063>.
-	* msgmerge.texi (Output details): Likewise.
-
-2012-12-27  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext.texi (Plural forms): Fix ngettext arguments.
-	Reported by Reinhard Schaffner <rschaffner@zynga.com>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-06-03  Jim Meyering  <jim@meyering.net>
-
-	* gettext.texi: Spelling fixes.
-
-2012-05-03  Bruno Haible  <bruno@clisp.org>
-
-	Document msgfmt option --endianness.
-	* msgfmt.texi: Document the option --endianness.
-	Reported by Paul Martin <pm@debian.org> via
-	Santiago Vila <sanvila@unex.es>.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* FAQ.html: Quote 'like this', not `like this', as per the recent
-	change to the GNU coding standards.
-	* ISO_3166: Likewise.
-	* ISO_3166_de: Likewise.
-	* tutorial.html: Process through
-	sed -e "s/\`\`\([^']*\)''/“\1”/g" | sed -e "s/\`\([^']*\)'/‘\1’/g"
-
-2011-07-08  Bruno Haible  <bruno@clisp.org>
-
-	* gettext.texi (aclocal): Recommend the use of aclocal's --install
-	option.
-	Suggested by Stefano Lattarini <stefano.lattarini@gmail.com>.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* gettext.texi (Discussions, Licenses): Write "GNU Lesser General
-	Public License".
-
-2011-05-13  Ben Elliston  <bje@gnu.org>
-
-	* gettext.texi (config.guess): Update wget commands.
-
-2011-04-13  Bruno Haible  <bruno@clisp.org>
-
-	* msgcat.texi: Fix description of --use-first.
-	* msgcomm.texi: Fix typo.
-	Reported by Matthijs Kooijman.
-
-2010-12-14  Bruno Haible  <bruno@clisp.org>
-
-	* xgettext.texi: Mention that -L also supports Shell.
-	Reported by Eric Blake <eblake@redhat.com>.
-
-2010-11-13  Bruno Haible  <bruno@clisp.org>
-
-	* gettext.texi (Plural forms): Add Belarusian.
-	Reported by Ihar Hrachyshka <ihar.hrachyshka@gmail.com>.
-
-2010-08-29  Bruno Haible  <bruno@clisp.org>
-
-	* gettext.texi (Using Compendia): Correct after 2007-09-09 change.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	xgettext: Recognize language of files ending in .perl.
-	* gettext.texi (Perl): Mention file extension '.perl'.
-	Suggested by Ævar Arnfjörð Bjarmason <avarab@gmail.com>.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/doc/ChangeLog.0 gettext-0.18.1.1/gettext-tools/doc/ChangeLog.0
--- gettext-0.19.3/gettext-tools/doc/ChangeLog.0	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/ChangeLog.0	2010-06-06 12:49:57.000000000 +0000
@@ -1002,7 +1002,7 @@
 	Advise about always using GNU gettext moved to here from ../README.
 
 	* gettext.texi: Fix some typos reported by François Pinard.
-	In description of _N change the name to N_.
+	In descripton of _N change the name to N_.
 
 	* Makefile.in (gettext.info):
 	Remove old .info* files before generating new ones.
@@ -1175,4 +1175,4 @@
 
 	* First official release.  This directory now contains a very
 	preliminary version of the gettext manual with a quite complete
-	chapter for today's Emacs PO mode by François Pinard.
+	chapter for todays Emacs PO mode by François Pinard.
diff -Nru gettext-0.19.3/gettext-tools/doc/FAQ.html gettext-0.18.1.1/gettext-tools/doc/FAQ.html
--- gettext-0.19.3/gettext-tools/doc/FAQ.html	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/FAQ.html	2010-06-06 12:49:57.000000000 +0000
@@ -52,7 +52,7 @@
 </ul>
 <h3>Other</h3>
 <ul>
-  <li><a href="#newline">What does this mean: “'msgid' and 'msgstr'
+  <li><a href="#newline">What does this mean: “`msgid' and `msgstr'
 entries do not both
 end with '\n'”</a></li>
   <li><a href="#translit">German umlauts are displayed like “ge"andert”
@@ -72,22 +72,22 @@
 <h4><a name="general_mailinglist"></a>Where is the mailing list?</h4>
 Three mailing lists are available: <br>
 <ul>
-  <li><span style="font-family: monospace;">bug-gettext@gnu.org</span><br>
+  <li><span style="font-family: monospace;">bug-gnu-gettext@gnu.org</span><br>
 This mailing list is for discussion of features and bugs of the GNU
 gettext <span style="font-style: italic;">software</span>, including
-libintl, the gettext-tools, and its autoconf macros.  The archive and subscription instructions can be found at <a href="https://lists.gnu.org/mailman/listinfo/bug-gettext">the information page</a>.</li>
+libintl, the gettext-tools, and its autoconf macros.</li>
   <li><span style="font-family: monospace;">translation-i18n@lists.sourceforge.net</span><br>
 This mailing list is for methodology questions around
 internationalization, and for discussions of translator tools,
 including but not limited to GNU gettext.</li>
   <li><span style="font-family: monospace;">coordinator@translationproject.org</span><br>
 This is the email address of the <a
- href="http://translationproject.org/">Translation Project</a>,
+ href="http://translationproject.org/">Free Translation Project</a>,
 that is the project which manages the translated message
 catalogs for many free software packages. Note that KDE and GNOME
 packages are not part of this project; they have their own translation
 projects: <a href="http://i18n.kde.org/">i18n.kde.org</a> and <a
- href="https://wiki.gnome.org/TranslationProject/">GNOME Translation Project</a>.<br>
+ href="http://developer.gnome.org/projects/gtp/">gtp</a>.<br>
   </li>
 </ul>
 The <span style="font-family: monospace;">bug-gnu-gettext</span> list
@@ -698,7 +698,7 @@
   </li>
 </ul>
 <h3>Other</h3>
-<h4><a name="newline"></a>What does this mean: “'msgid' and 'msgstr'
+<h4><a name="newline"></a>What does this mean: “`msgid' and `msgstr'
 entries do not both end
 with '\n'”</h4>
 It means that when the original string ends in a newline, your
diff -Nru gettext-0.19.3/gettext-tools/doc/fdl.texi gettext-0.18.1.1/gettext-tools/doc/fdl.texi
--- gettext-0.19.3/gettext-tools/doc/fdl.texi	2014-06-17 03:13:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/fdl.texi	2010-06-06 12:49:57.000000000 +0000
@@ -1,12 +1,12 @@
-@c The GNU Free Documentation License.
+@node GNU FDL
+@appendixsec GNU Free Documentation License
+@cindex FDL, GNU Free Documentation License
+@cindex License, GNU FDL
 @center Version 1.2, November 2002
 
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -93,15 +93,15 @@
 
 Examples of suitable formats for Transparent copies include plain
 @sc{ascii} without markup, Texinfo input format, La@TeX{} input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML},
-PostScript or @acronym{PDF} designed for human modification.  Examples
-of transparent image formats include @acronym{PNG}, @acronym{XCF} and
-@acronym{JPG}.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
-@acronym{XML} for which the @acronym{DTD} and/or processing tools are
-not generally available, and the machine-generated @acronym{HTML},
-PostScript or @acronym{PDF} produced by some word processors for
+format, SGML or XML using a publicly available
+DTD, and standard-conforming simple HTML,
+PostScript or PDF designed for human modification.  Examples
+of transparent image formats include PNG, XCF and
+JPG.  Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, SGML or
+XML for which the DTD and/or processing tools are
+not generally available, and the machine-generated HTML,
+PostScript or PDF produced by some word processors for
 output purposes only.
 
 The ``Title Page'' means, for a printed book, the title page itself,
@@ -407,7 +407,7 @@
 @end enumerate
 
 @page
-@heading ADDENDUM: How to use this License for your documents
+@unnumberedsubsec ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
@@ -426,7 +426,7 @@
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with@dots{}Texts.'' line with this:
+replace the ``with...Texts.'' line with this:
 
 @smallexample
 @group
@@ -448,3 +448,4 @@
 @c Local Variables:
 @c ispell-local-pdict: "ispell-dict"
 @c End:
+
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_10.html gettext-0.18.1.1/gettext-tools/doc/gettext_10.html
--- gettext-0.19.3/gettext-tools/doc/gettext_10.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_10.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 10  Producing Binary MO Files</TITLE>
@@ -18,15 +18,15 @@
 <H2><A NAME="SEC157" HREF="gettext_toc.html#TOC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX967"></A>
-<A NAME="IDX968"></A>
+<A NAME="IDX947"></A>
+<A NAME="IDX948"></A>
 
 <PRE>
 msgfmt [<VAR>option</VAR>] <VAR>filename</VAR>.po ...
 </PRE>
 
 <P>
-<A NAME="IDX969"></A>
+<A NAME="IDX949"></A>
 The <CODE>msgfmt</CODE> programs generates a binary message catalog from a textual
 translation description.
 
@@ -43,10 +43,10 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX970"></A>
-<A NAME="IDX971"></A>
+<A NAME="IDX950"></A>
+<A NAME="IDX951"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
-searched relative to this list of directories.  The resulting binary
+searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
 
 </DL>
@@ -65,47 +65,41 @@
 <DD>
 <DT><SAMP>&lsquo;--java&rsquo;</SAMP>
 <DD>
-<A NAME="IDX972"></A>
-<A NAME="IDX973"></A>
-<A NAME="IDX974"></A>
+<A NAME="IDX952"></A>
+<A NAME="IDX953"></A>
+<A NAME="IDX954"></A>
 Java mode: generate a Java <CODE>ResourceBundle</CODE> class.
 
 <DT><SAMP>&lsquo;--java2&rsquo;</SAMP>
 <DD>
-<A NAME="IDX975"></A>
+<A NAME="IDX955"></A>
 Like --java, and assume Java2 (JDK 1.2 or higher).
 
 <DT><SAMP>&lsquo;--csharp&rsquo;</SAMP>
 <DD>
-<A NAME="IDX976"></A>
-<A NAME="IDX977"></A>
+<A NAME="IDX956"></A>
+<A NAME="IDX957"></A>
 C# mode: generate a .NET .dll file containing a subclass of
 <CODE>GettextResourceSet</CODE>.
 
 <DT><SAMP>&lsquo;--csharp-resources&rsquo;</SAMP>
 <DD>
-<A NAME="IDX978"></A>
-<A NAME="IDX979"></A>
+<A NAME="IDX958"></A>
+<A NAME="IDX959"></A>
 C# resources mode: generate a .NET <TT>&lsquo;.resources&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--tcl&rsquo;</SAMP>
 <DD>
-<A NAME="IDX980"></A>
-<A NAME="IDX981"></A>
+<A NAME="IDX960"></A>
+<A NAME="IDX961"></A>
 Tcl mode: generate a tcl/msgcat <TT>&lsquo;.msg&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--qt&rsquo;</SAMP>
 <DD>
-<A NAME="IDX982"></A>
-<A NAME="IDX983"></A>
+<A NAME="IDX962"></A>
+<A NAME="IDX963"></A>
 Qt mode: generate a Qt <TT>&lsquo;.qm&rsquo;</TT> file.
 
-<DT><SAMP>&lsquo;--desktop&rsquo;</SAMP>
-<DD>
-<A NAME="IDX984"></A>
-<A NAME="IDX985"></A>
-Desktop Entry mode: generate a <TT>&lsquo;.desktop&rsquo;</TT> file.
-
 </DL>
 
 
@@ -118,13 +112,13 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX986"></A>
-<A NAME="IDX987"></A>
+<A NAME="IDX964"></A>
+<A NAME="IDX965"></A>
 Write output to specified file.
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX988"></A>
+<A NAME="IDX966"></A>
 Direct the program to work strictly following the Uniforum/Sun
 implementation.  Currently this only affects the naming of the output
 file.  If this option is not given the name of the output file is the
@@ -151,29 +145,24 @@
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX989"></A>
-<A NAME="IDX990"></A>
+<A NAME="IDX967"></A>
+<A NAME="IDX968"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX991"></A>
-<A NAME="IDX992"></A>
+<A NAME="IDX969"></A>
+<A NAME="IDX970"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX993"></A>
+<A NAME="IDX971"></A>
 Specify the base directory of classes directory hierarchy.
 
-<DT><SAMP>&lsquo;--source&rsquo;</SAMP>
-<DD>
-<A NAME="IDX994"></A>
-Produce a .java source file, instead of a compiled .class file.
-
 </DL>
 
 <P>
@@ -192,22 +181,22 @@
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX995"></A>
-<A NAME="IDX996"></A>
+<A NAME="IDX972"></A>
+<A NAME="IDX973"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX997"></A>
-<A NAME="IDX998"></A>
+<A NAME="IDX974"></A>
+<A NAME="IDX975"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX999"></A>
+<A NAME="IDX976"></A>
 Specify the base directory for locale dependent <TT>&lsquo;.dll&rsquo;</TT> files.
 
 </DL>
@@ -228,14 +217,14 @@
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1000"></A>
-<A NAME="IDX1001"></A>
+<A NAME="IDX977"></A>
+<A NAME="IDX978"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1002"></A>
+<A NAME="IDX979"></A>
 Specify the base directory of <TT>&lsquo;.msg&rsquo;</TT> message catalogs.
 
 </DL>
@@ -247,79 +236,7 @@
 </P>
 
 
-<H3><A NAME="SEC164" HREF="gettext_toc.html#TOC164">10.1.7  Desktop Entry mode operations</A></H3>
-
-<DL COMPACT>
-
-<DT><SAMP>&lsquo;--template=<VAR>template</VAR>&rsquo;</SAMP>
-<DD>
-<A NAME="IDX1003"></A>
-Specify a .desktop file used as a template.
-
-<DT><SAMP>&lsquo;-k[<VAR>keywordspec</VAR>]&rsquo;</SAMP>
-<DD>
-<DT><SAMP>&lsquo;--keyword[=<VAR>keywordspec</VAR>]&rsquo;</SAMP>
-<DD>
-<A NAME="IDX1004"></A>
-<A NAME="IDX1005"></A>
-Specify <VAR>keywordspec</VAR> as an additional keyword to be looked for.
-Without a <VAR>keywordspec</VAR>, the option means to not use default keywords.
-
-<DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
-<DD>
-<DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
-<DD>
-<A NAME="IDX1006"></A>
-<A NAME="IDX1007"></A>
-Specify the locale name, either a language specification of the form <VAR>ll</VAR>
-or a combined language and country specification of the form <VAR>ll_CC</VAR>.
-
-<DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
-<DD>
-<A NAME="IDX1008"></A>
-Specify the base directory of <TT>&lsquo;.msg&rsquo;</TT> message catalogs.
-
-</DL>
-
-<P>
-To generate a <SAMP>&lsquo;.desktop&rsquo;</SAMP> file for a single locale, you can use it
-as follows.
-
-</P>
-
-<PRE>
-msgfmt --desktop --template=<VAR>template</VAR> --locale=<VAR>locale</VAR> \
-  -o <VAR>file</VAR> <VAR>filename</VAR>.po ...
-</PRE>
-
-<P>
-On the other hand, when using msgfmt from a Makefile, it is cumbersome
-to loop over all locales under a particular directory.  msgfmt
-provides a special operation mode for this use-case.  To generate a
-<SAMP>&lsquo;.desktop&rsquo;</SAMP> file from multiple <SAMP>&lsquo;.po&rsquo;</SAMP> files under a directory,
-specify the directory with the <SAMP>&lsquo;-d&rsquo;</SAMP> option.
-
-</P>
-
-<PRE>
-msgfmt --desktop --template=<VAR>template</VAR> -d <VAR>directory</VAR> -o <VAR>file</VAR>
-</PRE>
-
-<P>
-msgfmt first reads the <SAMP>&lsquo;LINGUAS&rsquo;</SAMP> file under <VAR>directory</VAR>, and
-then processes all <SAMP>&lsquo;.po&rsquo;</SAMP> files listed there.  You can also limit
-the locales to a subset, through the <SAMP>&lsquo;LINGUAS&rsquo;</SAMP> environment
-variable.
-
-</P>
-<P>
-For either operation modes, the <SAMP>&lsquo;-o&rsquo;</SAMP> and <SAMP>&lsquo;--template&rsquo;</SAMP>
-options are mandatory.
-
-</P>
-
-
-<H3><A NAME="SEC165" HREF="gettext_toc.html#TOC165">10.1.8  Input file syntax</A></H3>
+<H3><A NAME="SEC164" HREF="gettext_toc.html#TOC164">10.1.7  Input file syntax</A></H3>
 
 <DL COMPACT>
 
@@ -327,14 +244,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1009"></A>
-<A NAME="IDX1010"></A>
+<A NAME="IDX980"></A>
+<A NAME="IDX981"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1011"></A>
+<A NAME="IDX982"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -342,7 +259,7 @@
 
 
 
-<H3><A NAME="SEC166" HREF="gettext_toc.html#TOC166">10.1.9  Input file interpretation</A></H3>
+<H3><A NAME="SEC165" HREF="gettext_toc.html#TOC165">10.1.8  Input file interpretation</A></H3>
 
 <DL COMPACT>
 
@@ -350,15 +267,15 @@
 <DD>
 <DT><SAMP>&lsquo;--check&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1012"></A>
-<A NAME="IDX1013"></A>
+<A NAME="IDX983"></A>
+<A NAME="IDX984"></A>
 Perform all the checks implied by <CODE>--check-format</CODE>, <CODE>--check-header</CODE>,
 <CODE>--check-domain</CODE>.
 
 <DT><SAMP>&lsquo;--check-format&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1014"></A>
-<A NAME="IDX1015"></A>
+<A NAME="IDX985"></A>
+<A NAME="IDX986"></A>
 Check language dependent format strings.
 
 If the string represents a format string used in a
@@ -377,19 +294,19 @@
 errors where there are none.
 
 To solve this problem the programmer can dictate the decision to the
-<CODE>xgettext</CODE> program (see section <A HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A>).  The translator should not
+<CODE>xgettext</CODE> program (see section <A HREF="gettext_15.html#SEC249">15.3.1  C Format Strings</A>).  The translator should not
 consider removing the flag from the <KBD>#,</KBD> line.  This "fix" would be
 reversed again as soon as <CODE>msgmerge</CODE> is called the next time.
 
 <DT><SAMP>&lsquo;--check-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1016"></A>
+<A NAME="IDX987"></A>
 Verify presence and contents of the header entry.  See section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A>,
 for a description of the various fields in the header entry.
 
 <DT><SAMP>&lsquo;--check-domain&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1017"></A>
+<A NAME="IDX988"></A>
 Check for conflicts between domain directives and the <CODE>--output-file</CODE>
 option
 
@@ -397,18 +314,18 @@
 <DD>
 <DT><SAMP>&lsquo;--check-compatibility&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1018"></A>
-<A NAME="IDX1019"></A>
-<A NAME="IDX1020"></A>
+<A NAME="IDX989"></A>
+<A NAME="IDX990"></A>
+<A NAME="IDX991"></A>
 Check that GNU msgfmt behaves like X/Open msgfmt.  This will give an error
 when attempting to use the GNU extensions.
 
 <DT><SAMP>&lsquo;--check-accelerators[=<VAR>char</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1021"></A>
-<A NAME="IDX1022"></A>
-<A NAME="IDX1023"></A>
-<A NAME="IDX1024"></A>
+<A NAME="IDX992"></A>
+<A NAME="IDX993"></A>
+<A NAME="IDX994"></A>
+<A NAME="IDX995"></A>
 Check presence of keyboard accelerators for menu items.  This is based on
 the convention used in some GUIs that a keyboard accelerator in a menu
 item string is designated by an immediately preceding <SAMP>&lsquo;&#38;&rsquo;</SAMP> character.
@@ -423,9 +340,9 @@
 <DD>
 <DT><SAMP>&lsquo;--use-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1025"></A>
-<A NAME="IDX1026"></A>
-<A NAME="IDX1027"></A>
+<A NAME="IDX996"></A>
+<A NAME="IDX997"></A>
+<A NAME="IDX998"></A>
 Use fuzzy entries in output.  Note that using this option is usually wrong,
 because fuzzy messages are exactly those which have not been validated by
 a human translator.
@@ -434,7 +351,7 @@
 
 
 
-<H3><A NAME="SEC167" HREF="gettext_toc.html#TOC167">10.1.10  Output details</A></H3>
+<H3><A NAME="SEC166" HREF="gettext_toc.html#TOC166">10.1.9  Output details</A></H3>
 
 <DL COMPACT>
 
@@ -442,27 +359,13 @@
 <DD>
 <DT><SAMP>&lsquo;--alignment=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1028"></A>
-<A NAME="IDX1029"></A>
+<A NAME="IDX999"></A>
+<A NAME="IDX1000"></A>
 Align strings to <VAR>number</VAR> bytes (default: 1).
 
-<DT><SAMP>&lsquo;--endianness=<VAR>byteorder</VAR>&rsquo;</SAMP>
-<DD>
-<A NAME="IDX1030"></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.
-
-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.
-
 <DT><SAMP>&lsquo;--no-hash&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1031"></A>
+<A NAME="IDX1001"></A>
 Don't include a hash table in the binary file.  Lookup will be more expensive
 at run time (binary search instead of hash table lookup).
 
@@ -470,7 +373,7 @@
 
 
 
-<H3><A NAME="SEC168" HREF="gettext_toc.html#TOC168">10.1.11  Informative output</A></H3>
+<H3><A NAME="SEC167" HREF="gettext_toc.html#TOC167">10.1.10  Informative output</A></H3>
 
 <DL COMPACT>
 
@@ -478,21 +381,21 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1032"></A>
-<A NAME="IDX1033"></A>
+<A NAME="IDX1002"></A>
+<A NAME="IDX1003"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1034"></A>
-<A NAME="IDX1035"></A>
+<A NAME="IDX1004"></A>
+<A NAME="IDX1005"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;--statistics&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1036"></A>
+<A NAME="IDX1006"></A>
 Print statistics about translations.  When the option <CODE>--verbose</CODE> is used
 in combination with <CODE>--statistics</CODE>, the input file name is printed in
 front of the statistics line.
@@ -501,33 +404,33 @@
 <DD>
 <DT><SAMP>&lsquo;--verbose&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1037"></A>
-<A NAME="IDX1038"></A>
+<A NAME="IDX1007"></A>
+<A NAME="IDX1008"></A>
 Increase verbosity level.
 
 </DL>
 
 
 
-<H2><A NAME="SEC169" HREF="gettext_toc.html#TOC169">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
+<H2><A NAME="SEC168" HREF="gettext_toc.html#TOC168">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX1039"></A>
-<A NAME="IDX1040"></A>
+<A NAME="IDX1009"></A>
+<A NAME="IDX1010"></A>
 
 <PRE>
 msgunfmt [<VAR>option</VAR>] [<VAR>file</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX1041"></A>
+<A NAME="IDX1011"></A>
 The <CODE>msgunfmt</CODE> program converts a binary message catalog to a
 Uniforum style .po file.
 
 </P>
 
 
-<H3><A NAME="SEC170" HREF="gettext_toc.html#TOC170">10.2.1  Operation mode</A></H3>
+<H3><A NAME="SEC169" HREF="gettext_toc.html#TOC169">10.2.1  Operation mode</A></H3>
 
 <DL COMPACT>
 
@@ -535,35 +438,35 @@
 <DD>
 <DT><SAMP>&lsquo;--java&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1042"></A>
-<A NAME="IDX1043"></A>
-<A NAME="IDX1044"></A>
+<A NAME="IDX1012"></A>
+<A NAME="IDX1013"></A>
+<A NAME="IDX1014"></A>
 Java mode: input is a Java <CODE>ResourceBundle</CODE> class.
 
 <DT><SAMP>&lsquo;--csharp&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1045"></A>
-<A NAME="IDX1046"></A>
+<A NAME="IDX1015"></A>
+<A NAME="IDX1016"></A>
 C# mode: input is a .NET .dll file containing a subclass of
 <CODE>GettextResourceSet</CODE>.
 
 <DT><SAMP>&lsquo;--csharp-resources&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1047"></A>
-<A NAME="IDX1048"></A>
+<A NAME="IDX1017"></A>
+<A NAME="IDX1018"></A>
 C# resources mode: input is a .NET <TT>&lsquo;.resources&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--tcl&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1049"></A>
-<A NAME="IDX1050"></A>
+<A NAME="IDX1019"></A>
+<A NAME="IDX1020"></A>
 Tcl mode: input is a tcl/msgcat <TT>&lsquo;.msg&rsquo;</TT> file.
 
 </DL>
 
 
 
-<H3><A NAME="SEC171" HREF="gettext_toc.html#TOC171">10.2.2  Input file location</A></H3>
+<H3><A NAME="SEC170" HREF="gettext_toc.html#TOC170">10.2.2  Input file location</A></H3>
 
 <DL COMPACT>
 
@@ -579,7 +482,7 @@
 </P>
 
 
-<H3><A NAME="SEC172" HREF="gettext_toc.html#TOC172">10.2.3  Input file location in Java mode</A></H3>
+<H3><A NAME="SEC171" HREF="gettext_toc.html#TOC171">10.2.3  Input file location in Java mode</A></H3>
 
 <DL COMPACT>
 
@@ -587,16 +490,16 @@
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1051"></A>
-<A NAME="IDX1052"></A>
+<A NAME="IDX1021"></A>
+<A NAME="IDX1022"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1053"></A>
-<A NAME="IDX1054"></A>
+<A NAME="IDX1023"></A>
+<A NAME="IDX1024"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
@@ -609,7 +512,7 @@
 </P>
 
 
-<H3><A NAME="SEC173" HREF="gettext_toc.html#TOC173">10.2.4  Input file location in C# mode</A></H3>
+<H3><A NAME="SEC172" HREF="gettext_toc.html#TOC172">10.2.4  Input file location in C# mode</A></H3>
 
 <DL COMPACT>
 
@@ -617,22 +520,22 @@
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1055"></A>
-<A NAME="IDX1056"></A>
+<A NAME="IDX1025"></A>
+<A NAME="IDX1026"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1057"></A>
-<A NAME="IDX1058"></A>
+<A NAME="IDX1027"></A>
+<A NAME="IDX1028"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1059"></A>
+<A NAME="IDX1029"></A>
 Specify the base directory for locale dependent <TT>&lsquo;.dll&rsquo;</TT> files.
 
 </DL>
@@ -645,7 +548,7 @@
 </P>
 
 
-<H3><A NAME="SEC174" HREF="gettext_toc.html#TOC174">10.2.5  Input file location in Tcl mode</A></H3>
+<H3><A NAME="SEC173" HREF="gettext_toc.html#TOC173">10.2.5  Input file location in Tcl mode</A></H3>
 
 <DL COMPACT>
 
@@ -653,14 +556,14 @@
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1060"></A>
-<A NAME="IDX1061"></A>
+<A NAME="IDX1030"></A>
+<A NAME="IDX1031"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1062"></A>
+<A NAME="IDX1032"></A>
 Specify the base directory of <TT>&lsquo;.msg&rsquo;</TT> message catalogs.
 
 </DL>
@@ -672,7 +575,7 @@
 </P>
 
 
-<H3><A NAME="SEC175" HREF="gettext_toc.html#TOC175">10.2.6  Output file location</A></H3>
+<H3><A NAME="SEC174" HREF="gettext_toc.html#TOC174">10.2.6  Output file location</A></H3>
 
 <DL COMPACT>
 
@@ -680,8 +583,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1063"></A>
-<A NAME="IDX1064"></A>
+<A NAME="IDX1033"></A>
+<A NAME="IDX1034"></A>
 Write output to specified file.
 
 </DL>
@@ -693,7 +596,7 @@
 </P>
 
 
-<H3><A NAME="SEC176" HREF="gettext_toc.html#TOC176">10.2.7  Output details</A></H3>
+<H3><A NAME="SEC175" HREF="gettext_toc.html#TOC175">10.2.7  Output details</A></H3>
 
 <DL COMPACT>
 
@@ -701,32 +604,32 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1065"></A>
+<A NAME="IDX1035"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1066"></A>
+<A NAME="IDX1036"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1067"></A>
+<A NAME="IDX1037"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1068"></A>
-<A NAME="IDX1069"></A>
+<A NAME="IDX1038"></A>
+<A NAME="IDX1039"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1070"></A>
+<A NAME="IDX1040"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -735,15 +638,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1071"></A>
-<A NAME="IDX1072"></A>
+<A NAME="IDX1041"></A>
+<A NAME="IDX1042"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1073"></A>
+<A NAME="IDX1043"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -751,15 +654,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1074"></A>
-<A NAME="IDX1075"></A>
+<A NAME="IDX1044"></A>
+<A NAME="IDX1045"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1076"></A>
+<A NAME="IDX1046"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -768,9 +671,9 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1077"></A>
-<A NAME="IDX1078"></A>
-<A NAME="IDX1079"></A>
+<A NAME="IDX1047"></A>
+<A NAME="IDX1048"></A>
+<A NAME="IDX1049"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -778,7 +681,7 @@
 
 
 
-<H3><A NAME="SEC177" HREF="gettext_toc.html#TOC177">10.2.8  Informative output</A></H3>
+<H3><A NAME="SEC176" HREF="gettext_toc.html#TOC176">10.2.8  Informative output</A></H3>
 
 <DL COMPACT>
 
@@ -786,34 +689,34 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1080"></A>
-<A NAME="IDX1081"></A>
+<A NAME="IDX1050"></A>
+<A NAME="IDX1051"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1082"></A>
-<A NAME="IDX1083"></A>
+<A NAME="IDX1052"></A>
+<A NAME="IDX1053"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;-v&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--verbose&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1084"></A>
-<A NAME="IDX1085"></A>
+<A NAME="IDX1054"></A>
+<A NAME="IDX1055"></A>
 Increase verbosity level.
 
 </DL>
 
 
 
-<H2><A NAME="SEC178" HREF="gettext_toc.html#TOC178">10.3  The Format of GNU MO Files</A></H2>
+<H2><A NAME="SEC177" HREF="gettext_toc.html#TOC177">10.3  The Format of GNU MO Files</A></H2>
 <P>
-<A NAME="IDX1086"></A>
-<A NAME="IDX1087"></A>
+<A NAME="IDX1056"></A>
+<A NAME="IDX1057"></A>
 
 </P>
 <P>
@@ -822,7 +725,7 @@
 
 </P>
 <P>
-<A NAME="IDX1088"></A>
+<A NAME="IDX1058"></A>
 The first two words serve the identification of the file.  The magic
 number will always signal GNU MO files.  The number is stored in the
 byte order of the generating machine, so the magic number really is
@@ -882,7 +785,7 @@
 
 </P>
 <P>
-<A NAME="IDX1089"></A>
+<A NAME="IDX1059"></A>
 The size <VAR>S</VAR> of the hash table can be zero.  In this case, the
 hash table itself is not contained in the MO file.  Some people might
 prefer this because a precomputed hashing table takes disk space, and
@@ -903,13 +806,13 @@
 
 </P>
 <P>
-<A NAME="IDX1090"></A>
+<A NAME="IDX1060"></A>
 Contexts are stored by storing the concatenation of the context, a
 <KBD>EOT</KBD> byte, and the original string, instead of the original string.
 
 </P>
 <P>
-<A NAME="IDX1091"></A>
+<A NAME="IDX1061"></A>
 Plural forms are stored by letting the plural of the original string
 follow the singular of the original string, separated through a
 <KBD>NUL</KBD> byte.  The length which appears in the string descriptor
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_11.html gettext-0.18.1.1/gettext-tools/doc/gettext_11.html
--- gettext-0.19.3/gettext-tools/doc/gettext_11.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_11.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 11  The Programmer's View</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC179" HREF="gettext_toc.html#TOC179">11  The Programmer's View</A></H1>
+<H1><A NAME="SEC178" HREF="gettext_toc.html#TOC178">11  The Programmer's View</A></H1>
 
 <P>
 One aim of the current message catalog implementation provided by
@@ -29,9 +29,9 @@
 
 
 
-<H2><A NAME="SEC180" HREF="gettext_toc.html#TOC180">11.1  About <CODE>catgets</CODE></A></H2>
+<H2><A NAME="SEC179" HREF="gettext_toc.html#TOC179">11.1  About <CODE>catgets</CODE></A></H2>
 <P>
-<A NAME="IDX1092"></A>
+<A NAME="IDX1062"></A>
 
 </P>
 <P>
@@ -64,9 +64,9 @@
 
 
 
-<H3><A NAME="SEC181" HREF="gettext_toc.html#TOC181">11.1.1  The Interface</A></H3>
+<H3><A NAME="SEC180" HREF="gettext_toc.html#TOC180">11.1.1  The Interface</A></H3>
 <P>
-<A NAME="IDX1093"></A>
+<A NAME="IDX1063"></A>
 
 </P>
 <P>
@@ -79,7 +79,7 @@
 
 </P>
 <P>
-<A NAME="IDX1094"></A>
+<A NAME="IDX1064"></A>
 <CODE>catopen</CODE> is used like in this:
 
 </P>
@@ -98,7 +98,7 @@
 
 </P>
 <P>
-<A NAME="IDX1095"></A>
+<A NAME="IDX1065"></A>
 This handle is of course used in the <CODE>catgets</CODE> function which can
 be used like this:
 
@@ -130,7 +130,7 @@
 
 </P>
 <P>
-<A NAME="IDX1096"></A>
+<A NAME="IDX1066"></A>
 The last of these functions is used and behaves as expected:
 
 </P>
@@ -145,9 +145,9 @@
 </P>
 
 
-<H3><A NAME="SEC182" HREF="gettext_toc.html#TOC182">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
+<H3><A NAME="SEC181" HREF="gettext_toc.html#TOC181">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
 <P>
-<A NAME="IDX1097"></A>
+<A NAME="IDX1067"></A>
 
 </P>
 <P>
@@ -166,9 +166,9 @@
 </P>
 
 
-<H2><A NAME="SEC183" HREF="gettext_toc.html#TOC183">11.2  About <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC182" HREF="gettext_toc.html#TOC182">11.2  About <CODE>gettext</CODE></A></H2>
 <P>
-<A NAME="IDX1098"></A>
+<A NAME="IDX1068"></A>
 
 </P>
 <P>
@@ -183,7 +183,7 @@
 method of normal file handling (open-use-close) and that it does not
 burden the programmer with so many tasks, especially the unique key handling.
 Of course here also a unique key is needed, but this key is the message
-itself (how long or short it is).  See section <A HREF="gettext_11.html#SEC191">11.3  Comparing the Two Interfaces</A> for a more
+itself (how long or short it is).  See section <A HREF="gettext_11.html#SEC190">11.3  Comparing the Two Interfaces</A> for a more
 detailed comparison of the two methods.
 
 </P>
@@ -197,9 +197,9 @@
 
 
 
-<H3><A NAME="SEC184" HREF="gettext_toc.html#TOC184">11.2.1  The Interface</A></H3>
+<H3><A NAME="SEC183" HREF="gettext_toc.html#TOC183">11.2.1  The Interface</A></H3>
 <P>
-<A NAME="IDX1099"></A>
+<A NAME="IDX1069"></A>
 
 </P>
 <P>
@@ -268,11 +268,11 @@
 </P>
 
 
-<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">11.2.2  Solving Ambiguities</A></H3>
+<H3><A NAME="SEC184" HREF="gettext_toc.html#TOC184">11.2.2  Solving Ambiguities</A></H3>
 <P>
-<A NAME="IDX1100"></A>
-<A NAME="IDX1101"></A>
-<A NAME="IDX1102"></A>
+<A NAME="IDX1070"></A>
+<A NAME="IDX1071"></A>
+<A NAME="IDX1072"></A>
 
 </P>
 <P>
@@ -346,9 +346,9 @@
 </P>
 
 
-<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">11.2.3  Locating Message Catalog Files</A></H3>
+<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">11.2.3  Locating Message Catalog Files</A></H3>
 <P>
-<A NAME="IDX1103"></A>
+<A NAME="IDX1073"></A>
 
 </P>
 <P>
@@ -387,10 +387,10 @@
 </P>
 
 
-<H3><A NAME="SEC187" HREF="gettext_toc.html#TOC187">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
+<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
 <P>
-<A NAME="IDX1104"></A>
-<A NAME="IDX1105"></A>
+<A NAME="IDX1074"></A>
+<A NAME="IDX1075"></A>
 
 </P>
 <P>
@@ -422,7 +422,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>bind_textdomain_codeset</B> <I>(const char *<VAR>domainname</VAR>, const char *<VAR>codeset</VAR>)</I>
-<DD><A NAME="IDX1106"></A>
+<DD><A NAME="IDX1076"></A>
 The <CODE>bind_textdomain_codeset</CODE> function can be used to specify the
 output character set for message catalogs for domain <VAR>domainname</VAR>.
 The <VAR>codeset</VAR> argument must be a valid codeset name which can be used
@@ -454,12 +454,12 @@
 </P>
 
 
-<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">11.2.5  Using contexts for solving ambiguities</A></H3>
+<H3><A NAME="SEC187" HREF="gettext_toc.html#TOC187">11.2.5  Using contexts for solving ambiguities</A></H3>
 <P>
-<A NAME="IDX1107"></A>
-<A NAME="IDX1108"></A>
-<A NAME="IDX1109"></A>
-<A NAME="IDX1110"></A>
+<A NAME="IDX1077"></A>
+<A NAME="IDX1078"></A>
+<A NAME="IDX1079"></A>
+<A NAME="IDX1080"></A>
 
 </P>
 <P>
@@ -497,7 +497,7 @@
 
 </P>
 <P>
-<A NAME="IDX1111"></A>
+<A NAME="IDX1081"></A>
 
 <PRE>
 const char *pgettext (const char *msgctxt, const char *msgid);
@@ -532,8 +532,8 @@
 
 </P>
 <P>
-<A NAME="IDX1112"></A>
-<A NAME="IDX1113"></A>
+<A NAME="IDX1082"></A>
+<A NAME="IDX1083"></A>
 
 <PRE>
 const char *dpgettext (const char *domain_name,
@@ -618,9 +618,9 @@
 
 </P>
 <P>
-<A NAME="IDX1114"></A>
-<A NAME="IDX1115"></A>
-<A NAME="IDX1116"></A>
+<A NAME="IDX1084"></A>
+<A NAME="IDX1085"></A>
+<A NAME="IDX1086"></A>
 
 <PRE>
 const char *pgettext_expr (const char *msgctxt, const char *msgid);
@@ -640,9 +640,9 @@
 </P>
 
 
-<H3><A NAME="SEC189" HREF="gettext_toc.html#TOC189">11.2.6  Additional functions for plural forms</A></H3>
+<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">11.2.6  Additional functions for plural forms</A></H3>
 <P>
-<A NAME="IDX1117"></A>
+<A NAME="IDX1087"></A>
 
 </P>
 <P>
@@ -765,7 +765,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>ngettext</B> <I>(const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>)</I>
-<DD><A NAME="IDX1118"></A>
+<DD><A NAME="IDX1088"></A>
 The <CODE>ngettext</CODE> function is similar to the <CODE>gettext</CODE> function
 as it finds the message catalogs in the same way.  But it takes two
 extra arguments.  The <VAR>msgid1</VAR> parameter must contain the singular
@@ -815,8 +815,8 @@
 <PRE>
 printf (ngettext ("%d file removed from directory %s",
                   "%d files removed from directory %s",
-                  n),
-        n, dir);
+                  n, dir),
+        n);
 </PRE>
 
 <P>
@@ -831,12 +831,12 @@
 <PRE>
 printf (ngettext ("%$2d file removed from directory %$1s",
                   "%$2d files removed from directory %$1s",
-                  n),
-        dir, n);
+                  dir, n),
+        n);
 </PRE>
 
 <P>
-See section <A HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A> for details about this argument reordering syntax.
+See section <A HREF="gettext_15.html#SEC249">15.3.1  C Format Strings</A> for details about this argument reordering syntax.
 
 </P>
 <P>
@@ -875,7 +875,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>dngettext</B> <I>(const char *<VAR>domain</VAR>, const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>)</I>
-<DD><A NAME="IDX1119"></A>
+<DD><A NAME="IDX1089"></A>
 The <CODE>dngettext</CODE> is similar to the <CODE>dgettext</CODE> function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -886,7 +886,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>dcngettext</B> <I>(const char *<VAR>domain</VAR>, const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>, int <VAR>category</VAR>)</I>
-<DD><A NAME="IDX1120"></A>
+<DD><A NAME="IDX1090"></A>
 The <CODE>dcngettext</CODE> is similar to the <CODE>dcgettext</CODE> function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -911,9 +911,9 @@
 
 </P>
 <P>
-<A NAME="IDX1121"></A>
-<A NAME="IDX1122"></A>
-<A NAME="IDX1123"></A>
+<A NAME="IDX1091"></A>
+<A NAME="IDX1092"></A>
+<A NAME="IDX1093"></A>
 The information about the plural form selection has to be stored in the
 header entry of the PO file (the one with the empty <CODE>msgid</CODE> string).
 The plural form information looks like this:
@@ -941,7 +941,7 @@
 
 </P>
 <P>
-<A NAME="IDX1124"></A>
+<A NAME="IDX1094"></A>
 The following rules are known at this point.  The language with families
 are listed.  But this does not necessarily mean the information can be
 generalized for the whole family (as can be easily seen in the table
@@ -1156,7 +1156,6 @@
 <DD>
 Russian, 
 Ukrainian, 
-Belarusian, 
 Serbian, 
 Croatian 
 </DL>
@@ -1279,14 +1278,14 @@
 </P>
 <P>
 The translators' perspective regarding plural forms is explained in
-section <A HREF="gettext_12.html#SEC210">12.6  Translating plural forms</A>.
+section <A HREF="gettext_12.html#SEC209">12.6  Translating plural forms</A>.
 
 </P>
 
 
-<H3><A NAME="SEC190" HREF="gettext_toc.html#TOC190">11.2.7  Optimization of the *gettext functions</A></H3>
+<H3><A NAME="SEC189" HREF="gettext_toc.html#TOC189">11.2.7  Optimization of the *gettext functions</A></H3>
 <P>
-<A NAME="IDX1125"></A>
+<A NAME="IDX1095"></A>
 
 </P>
 <P>
@@ -1339,10 +1338,10 @@
 </P>
 
 
-<H2><A NAME="SEC191" HREF="gettext_toc.html#TOC191">11.3  Comparing the Two Interfaces</A></H2>
+<H2><A NAME="SEC190" HREF="gettext_toc.html#TOC190">11.3  Comparing the Two Interfaces</A></H2>
 <P>
-<A NAME="IDX1126"></A>
-<A NAME="IDX1127"></A>
+<A NAME="IDX1096"></A>
+<A NAME="IDX1097"></A>
 
 </P>
 
@@ -1392,7 +1391,7 @@
 
 </P>
 <P>
-<A NAME="IDX1128"></A>
+<A NAME="IDX1098"></A>
 
 <PRE>
 #include &#60;libintl.h&#62;
@@ -1407,7 +1406,7 @@
 
 </P>
 <P>
-<A NAME="IDX1129"></A>
+<A NAME="IDX1099"></A>
 The same procedure can be done for the <CODE>gettext_noop</CODE> invocations
 (see section <A HREF="gettext_4.html#SEC23">4.7  Special Cases of Translatable Strings</A>).  One usually defines <CODE>gettext_noop</CODE> as a
 no-op macro.  So you should consider the following code for your project:
@@ -1486,12 +1485,12 @@
 <P>
 <CODE>catgets</CODE> allows same original entry to have different translations,
 but <CODE>gettext</CODE> has another, scalable approach for solving ambiguities
-of this kind: See section <A HREF="gettext_11.html#SEC185">11.2.2  Solving Ambiguities</A>.
+of this kind: See section <A HREF="gettext_11.html#SEC184">11.2.2  Solving Ambiguities</A>.
 
 </P>
 
 
-<H2><A NAME="SEC192" HREF="gettext_toc.html#TOC192">11.4  Using libintl.a in own programs</A></H2>
+<H2><A NAME="SEC191" HREF="gettext_toc.html#TOC191">11.4  Using libintl.a in own programs</A></H2>
 
 <P>
 Starting with version 0.9.4 the library <CODE>libintl.h</CODE> should be
@@ -1502,7 +1501,7 @@
 </P>
 
 
-<H2><A NAME="SEC193" HREF="gettext_toc.html#TOC193">11.5  Being a <CODE>gettext</CODE> grok</A></H2>
+<H2><A NAME="SEC192" HREF="gettext_toc.html#TOC192">11.5  Being a <CODE>gettext</CODE> grok</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -1520,7 +1519,7 @@
 <UL>
 <LI>Changing the language at runtime
 
-<A NAME="IDX1130"></A>
+<A NAME="IDX1100"></A>
 
 For interactive programs it might be useful to offer a selection of the
 used language at runtime.  To understand how to do this one need to know
@@ -1537,20 +1536,20 @@
 <OL>
 <LI><CODE>LANGUAGE</CODE>
 
-<A NAME="IDX1131"></A>
+<A NAME="IDX1101"></A>
  
-<A NAME="IDX1132"></A>
+<A NAME="IDX1102"></A>
 <LI><CODE>LC_ALL</CODE>
 
-<A NAME="IDX1133"></A>
-<A NAME="IDX1134"></A>
-<A NAME="IDX1135"></A>
-<A NAME="IDX1136"></A>
-<A NAME="IDX1137"></A>
-<A NAME="IDX1138"></A>
+<A NAME="IDX1103"></A>
+<A NAME="IDX1104"></A>
+<A NAME="IDX1105"></A>
+<A NAME="IDX1106"></A>
+<A NAME="IDX1107"></A>
+<A NAME="IDX1108"></A>
 <LI><CODE>LC_xxx</CODE>, according to selected locale category
 
-<A NAME="IDX1139"></A>
+<A NAME="IDX1109"></A>
 <LI><CODE>LANG</CODE>
 
 </OL>
@@ -1568,7 +1567,7 @@
 some optimization.  This optimization normally prevents the calling of
 the <CODE>dcgettext</CODE> function as long as no new catalog is loaded.  But
 if <CODE>dcgettext</CODE> is not called the program also cannot find the
-<CODE>LANGUAGE</CODE> variable be changed (see section <A HREF="gettext_11.html#SEC190">11.2.7  Optimization of the *gettext functions</A>).  A
+<CODE>LANGUAGE</CODE> variable be changed (see section <A HREF="gettext_11.html#SEC189">11.2.7  Optimization of the *gettext functions</A>).  A
 solution for this is very easy.  Include the following code in the
 language switching function.
 
@@ -1584,7 +1583,7 @@
   }
 </PRE>
 
-<A NAME="IDX1140"></A>
+<A NAME="IDX1110"></A>
 The variable <CODE>_nl_msg_cat_cntr</CODE> is defined in <TT>&lsquo;loadmsgcat.c&rsquo;</TT>.
 You don't need to know what this is for.  But it can be used to detect
 whether a <CODE>gettext</CODE> implementation is GNU gettext and not non-GNU
@@ -1594,7 +1593,7 @@
 
 
 
-<H2><A NAME="SEC194" HREF="gettext_toc.html#TOC194">11.6  Temporary Notes for the Programmers Chapter</A></H2>
+<H2><A NAME="SEC193" HREF="gettext_toc.html#TOC193">11.6  Temporary Notes for the Programmers Chapter</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -1604,7 +1603,7 @@
 
 
 
-<H3><A NAME="SEC195" HREF="gettext_toc.html#TOC195">11.6.1  Temporary - Two Possible Implementations</A></H3>
+<H3><A NAME="SEC194" HREF="gettext_toc.html#TOC194">11.6.1  Temporary - Two Possible Implementations</A></H3>
 
 <P>
 There are two competing methods for language independent messages:
@@ -1636,7 +1635,7 @@
 </P>
 
 
-<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">11.6.2  Temporary - About <CODE>catgets</CODE></A></H3>
+<H3><A NAME="SEC195" HREF="gettext_toc.html#TOC195">11.6.2  Temporary - About <CODE>catgets</CODE></A></H3>
 
 <P>
 There have been a few discussions of late on the use of
@@ -1681,7 +1680,7 @@
 </P>
 
 
-<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">11.6.3  Temporary - Why a single implementation</A></H3>
+<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">11.6.3  Temporary - Why a single implementation</A></H3>
 
 <P>
 Now it seems kind of wasteful to me to have two different systems
@@ -1726,7 +1725,7 @@
 </P>
 
 
-<H3><A NAME="SEC198" HREF="gettext_toc.html#TOC198">11.6.4  Temporary - Notes</A></H3>
+<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">11.6.4  Temporary - Notes</A></H3>
 
 <P>
 X/Open agreed very late on the standard form so that many
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_12.html gettext-0.18.1.1/gettext-tools/doc/gettext_12.html
--- gettext-0.19.3/gettext-tools/doc/gettext_12.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_12.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 12  The Translator's View</TITLE>
@@ -11,11 +11,11 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC199" HREF="gettext_toc.html#TOC199">12  The Translator's View</A></H1>
+<H1><A NAME="SEC198" HREF="gettext_toc.html#TOC198">12  The Translator's View</A></H1>
 
 
 
-<H2><A NAME="SEC200" HREF="gettext_toc.html#TOC200">12.1  Introduction 0</A></H2>
+<H2><A NAME="SEC199" HREF="gettext_toc.html#TOC199">12.1  Introduction 0</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -98,7 +98,7 @@
 </P>
 
 
-<H2><A NAME="SEC201" HREF="gettext_toc.html#TOC201">12.2  Introduction 1</A></H2>
+<H2><A NAME="SEC200" HREF="gettext_toc.html#TOC200">12.2  Introduction 1</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -153,7 +153,7 @@
 </P>
 
 
-<H2><A NAME="SEC202" HREF="gettext_toc.html#TOC202">12.3  Discussions</A></H2>
+<H2><A NAME="SEC201" HREF="gettext_toc.html#TOC201">12.3  Discussions</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -211,12 +211,12 @@
 
 Some people wonder if using GNU <CODE>gettext</CODE> necessarily brings their
 package under the protective wing of the GNU General Public License or
-the GNU Lesser General Public License, when they do not want to make
+the GNU Library General Public License, when they do not want to make
 their program free, or want other kinds of freedom.  The simplest
 answer is “normally not”.
 
 The <CODE>gettext-runtime</CODE> part of GNU <CODE>gettext</CODE>, i.e. the
-contents of <CODE>libintl</CODE>, is covered by the GNU Lesser General Public
+contents of <CODE>libintl</CODE>, is covered by the GNU Library General Public
 License.  The <CODE>gettext-tools</CODE> part of GNU <CODE>gettext</CODE>, i.e. the
 rest of the GNU <CODE>gettext</CODE> package, is covered by the GNU General
 Public License.
@@ -236,7 +236,7 @@
 
 
 
-<H2><A NAME="SEC203" HREF="gettext_toc.html#TOC203">12.4  Organization</A></H2>
+<H2><A NAME="SEC202" HREF="gettext_toc.html#TOC202">12.4  Organization</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -285,7 +285,7 @@
 
 
 
-<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">12.4.1  Central Coordination</A></H3>
+<H3><A NAME="SEC203" HREF="gettext_toc.html#TOC203">12.4.1  Central Coordination</A></H3>
 
 <P>
 I also think GNU will need sooner than it thinks, that someone set up
@@ -310,7 +310,7 @@
 </P>
 
 
-<H3><A NAME="SEC205" HREF="gettext_toc.html#TOC205">12.4.2  National Teams</A></H3>
+<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">12.4.2  National Teams</A></H3>
 
 <P>
 I suggest we look for volunteer coordinators/editors for individual
@@ -373,7 +373,7 @@
 
 
 
-<H4><A NAME="SEC206" HREF="gettext_toc.html#TOC206">12.4.2.1  Sub-Cultures</A></H4>
+<H4><A NAME="SEC205" HREF="gettext_toc.html#TOC205">12.4.2.1  Sub-Cultures</A></H4>
 
 <P>
 Taking French for example, there are a few sub-cultures around computers
@@ -395,7 +395,7 @@
 </P>
 
 
-<H4><A NAME="SEC207" HREF="gettext_toc.html#TOC207">12.4.2.2  Organizational Ideas</A></H4>
+<H4><A NAME="SEC206" HREF="gettext_toc.html#TOC206">12.4.2.2  Organizational Ideas</A></H4>
 
 <P>
 I expect the next big changes after the official release.  Please note
@@ -432,7 +432,7 @@
 
 
 
-<H3><A NAME="SEC208" HREF="gettext_toc.html#TOC208">12.4.3  Mailing Lists</A></H3>
+<H3><A NAME="SEC207" HREF="gettext_toc.html#TOC207">12.4.3  Mailing Lists</A></H3>
 
 <P>
 If we get any inquiries about GNU <CODE>gettext</CODE>, send them on to:
@@ -486,7 +486,7 @@
 </P>
 
 
-<H2><A NAME="SEC209" HREF="gettext_toc.html#TOC209">12.5  Information Flow</A></H2>
+<H2><A NAME="SEC208" HREF="gettext_toc.html#TOC208">12.5  Information Flow</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -518,7 +518,7 @@
 or so, taking many weeks or months for bigger packages.  But it does
 not work this way.  I first did all the things I'm responsible for.
 I've nothing against some missionary work on other maintainers, but
-I'm also losing a lot of energy over it--same debates over again.
+I'm also loosing a lot of energy over it--same debates over again.
 
 </P>
 <P>
@@ -540,10 +540,10 @@
 </P>
 
 
-<H2><A NAME="SEC210" HREF="gettext_toc.html#TOC210">12.6  Translating plural forms</A></H2>
+<H2><A NAME="SEC209" HREF="gettext_toc.html#TOC209">12.6  Translating plural forms</A></H2>
 
 <P>
-<A NAME="IDX1141"></A>
+<A NAME="IDX1111"></A>
 Suppose you are translating a PO file, and it contains an entry like this:
 
 </P>
@@ -565,7 +565,7 @@
 the text depends on a cardinal number.  The general form of the message,
 in English, is the <CODE>msgid_plural</CODE> line.  The <CODE>msgid</CODE> line is the
 English singular form, that is, the form for when the number is equal to 1.
-More details about plural forms are explained in section <A HREF="gettext_11.html#SEC189">11.2.6  Additional functions for plural forms</A>.
+More details about plural forms are explained in section <A HREF="gettext_11.html#SEC188">11.2.6  Additional functions for plural forms</A>.
 
 </P>
 <P>
@@ -664,7 +664,7 @@
 </P>
 
 
-<H2><A NAME="SEC211" HREF="gettext_toc.html#TOC211">12.7  Prioritizing messages: How to determine which messages to translate first</A></H2>
+<H2><A NAME="SEC210" HREF="gettext_toc.html#TOC210">12.7  Prioritizing messages: How to determine which messages to translate first</A></H2>
 
 <P>
 A translator sometimes has only a limited amount of time per week to
@@ -688,7 +688,7 @@
 
 </P>
 <P>
-<A NAME="IDX1142"></A>
+<A NAME="IDX1112"></A>
 Here a more details.  The GNU <CODE>libintl</CODE> library (but not the
 corresponding functions in GNU <CODE>libc</CODE>) supports an environment variable
 <CODE>GETTEXT_LOG_UNTRANSLATED</CODE>.  The GNU <CODE>libintl</CODE> library will
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_13.html gettext-0.18.1.1/gettext-tools/doc/gettext_13.html
--- gettext-0.19.3/gettext-tools/doc/gettext_13.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_13.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 13  The Maintainer's View</TITLE>
@@ -11,9 +11,9 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC212" HREF="gettext_toc.html#TOC212">13  The Maintainer's View</A></H1>
+<H1><A NAME="SEC211" HREF="gettext_toc.html#TOC211">13  The Maintainer's View</A></H1>
 <P>
-<A NAME="IDX1143"></A>
+<A NAME="IDX1113"></A>
 
 </P>
 <P>
@@ -53,7 +53,7 @@
 
 
 
-<H2><A NAME="SEC213" HREF="gettext_toc.html#TOC213">13.1  Flat or Non-Flat Directory Structures</A></H2>
+<H2><A NAME="SEC212" HREF="gettext_toc.html#TOC212">13.1  Flat or Non-Flat Directory Structures</A></H2>
 
 <P>
 Some free software packages are distributed as <CODE>tar</CODE> files which unpack
@@ -86,11 +86,11 @@
 </P>
 
 
-<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">13.2  Prerequisite Works</A></H2>
+<H2><A NAME="SEC213" HREF="gettext_toc.html#TOC213">13.2  Prerequisite Works</A></H2>
 <P>
-<A NAME="IDX1144"></A>
-<A NAME="IDX1145"></A>
-<A NAME="IDX1146"></A>
+<A NAME="IDX1114"></A>
+<A NAME="IDX1115"></A>
+<A NAME="IDX1116"></A>
 
 </P>
 <P>
@@ -187,7 +187,7 @@
 </P>
 
 
-<H2><A NAME="SEC215" HREF="gettext_toc.html#TOC215">13.3  Invoking the <CODE>gettextize</CODE> Program</A></H2>
+<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">13.3  Invoking the <CODE>gettextize</CODE> Program</A></H2>
 
 <P>
 The <CODE>gettextize</CODE> program is an interactive tool that helps the
@@ -222,7 +222,7 @@
 
 <LI>It performs as many of the tasks mentioned in the next section
 
-section <A HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A> as can be performed automatically.
+section <A HREF="gettext_13.html#SEC215">13.4  Files You Must Create or Alter</A> as can be performed automatically.
 
 <LI>It removes obsolete files and idioms used for previous GNU
 
@@ -239,8 +239,8 @@
 
 </P>
 <P>
-<A NAME="IDX1147"></A>
-<A NAME="IDX1148"></A>
+<A NAME="IDX1117"></A>
+<A NAME="IDX1118"></A>
 
 <PRE>
 gettextize [ <VAR>option</VAR>... ] [ <VAR>directory</VAR> ]
@@ -256,13 +256,13 @@
 <DD>
 <DT><SAMP>&lsquo;--force&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1149"></A>
-<A NAME="IDX1150"></A>
+<A NAME="IDX1119"></A>
+<A NAME="IDX1120"></A>
 Force replacement of files which already exist.
 
 <DT><SAMP>&lsquo;--intl&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1151"></A>
+<A NAME="IDX1121"></A>
 Install the libintl sources in a subdirectory named <TT>&lsquo;intl/&rsquo;</TT>.
 This libintl will be used to provide internationalization on systems
 that don't have GNU libintl installed.  If this option is omitted,
@@ -272,7 +272,7 @@
 
 <DT><SAMP>&lsquo;--po-dir=<VAR>dir</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1152"></A>
+<A NAME="IDX1122"></A>
 Specify a directory containing PO files.  Such a directory contains the
 translations into various languages of a particular POT file.  This
 option can be specified multiple times, once for each translation domain.
@@ -280,14 +280,14 @@
 
 <DT><SAMP>&lsquo;--no-changelog&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1153"></A>
+<A NAME="IDX1123"></A>
 Don't update or create ChangeLog files.  By default, <CODE>gettextize</CODE>
 logs all changes (file additions, modifications and removals) in a
 file called <SAMP>&lsquo;ChangeLog&rsquo;</SAMP> in each affected directory.
 
 <DT><SAMP>&lsquo;--symlink&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1154"></A>
+<A NAME="IDX1124"></A>
 Make symbolic links instead of copying the needed files.  This can be
 useful to save a few kilobytes of disk space, but it requires extra
 effort to create self-contained tarballs, it may disturb some mechanism
@@ -298,20 +298,20 @@
 <DD>
 <DT><SAMP>&lsquo;--dry-run&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1155"></A>
-<A NAME="IDX1156"></A>
+<A NAME="IDX1125"></A>
+<A NAME="IDX1126"></A>
 Print modifications but don't perform them.  All actions that
 <CODE>gettextize</CODE> would normally execute are inhibited and instead only
 listed on standard output.
 
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1157"></A>
+<A NAME="IDX1127"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1158"></A>
+<A NAME="IDX1128"></A>
 Output version information and exit.
 
 </DL>
@@ -417,14 +417,14 @@
 entire job of adapting a package for using GNU <CODE>gettext</CODE>.  The
 amount of remaining work depends on whether the package uses GNU
 <CODE>automake</CODE> or not.  But in any case, the maintainer should still
-read the section section <A HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A> after invoking <CODE>gettextize</CODE>.
+read the section section <A HREF="gettext_13.html#SEC215">13.4  Files You Must Create or Alter</A> after invoking <CODE>gettextize</CODE>.
 
 </P>
 <P>
 In particular, if after using <SAMP>&lsquo;gettexize&rsquo;</SAMP>, you get an error
 <SAMP>&lsquo;AC_COMPILE_IFELSE was called before AC_GNU_SOURCE&rsquo;</SAMP> or
 <SAMP>&lsquo;AC_RUN_IFELSE was called before AC_GNU_SOURCE&rsquo;</SAMP>, you can fix it
-by modifying <TT>&lsquo;configure.ac&rsquo;</TT>, as described in section <A HREF="gettext_13.html#SEC221">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>.
+by modifying <TT>&lsquo;configure.ac&rsquo;</TT>, as described in section <A HREF="gettext_13.html#SEC220">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>.
 
 </P>
 <P>
@@ -432,14 +432,14 @@
 of the GNU build system, in the sense that it should not be invoked
 automatically, and not be invoked by someone who doesn't assume the
 responsibilities of a package maintainer.  For the latter purpose, a
-separate tool is provided, see section <A HREF="gettext_13.html#SEC242">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A>.
+separate tool is provided, see section <A HREF="gettext_13.html#SEC240">13.6.3  Invoking the <CODE>autopoint</CODE> Program</A>.
 
 </P>
 
 
-<H2><A NAME="SEC216" HREF="gettext_toc.html#TOC216">13.4  Files You Must Create or Alter</A></H2>
+<H2><A NAME="SEC215" HREF="gettext_toc.html#TOC215">13.4  Files You Must Create or Alter</A></H2>
 <P>
-<A NAME="IDX1159"></A>
+<A NAME="IDX1129"></A>
 
 </P>
 <P>
@@ -454,7 +454,7 @@
 <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.3 distribution itself, or from the GNU
+<CODE>gettext</CODE> 0.18.1 distribution itself, or from the GNU
 <CODE>hello</CODE> distribution (<A HREF="http://www.franken.de/users/gnu/ke/hello">http://www.franken.de/users/gnu/ke/hello</A>
 or <A HREF="http://www.gnu.franken.de/ke/hello/">http://www.gnu.franken.de/ke/hello/</A>)  You may indeed
 refer to the source code of the GNU <CODE>gettext</CODE> and GNU <CODE>hello</CODE>
@@ -465,9 +465,9 @@
 
 
 
-<H3><A NAME="SEC217" HREF="gettext_toc.html#TOC217">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC216" HREF="gettext_toc.html#TOC216">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1160"></A>
+<A NAME="IDX1130"></A>
 
 </P>
 <P>
@@ -511,9 +511,9 @@
 </P>
 
 
-<H3><A NAME="SEC218" HREF="gettext_toc.html#TOC218">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC217" HREF="gettext_toc.html#TOC217">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1161"></A>
+<A NAME="IDX1131"></A>
 
 </P>
 <P>
@@ -535,7 +535,7 @@
 want to further restrict, at installation time, the set of installed
 languages, this should not be done by modifying the <TT>&lsquo;LINGUAS&rsquo;</TT> file,
 but rather by using the <CODE>LINGUAS</CODE> environment variable
-(see section <A HREF="gettext_14.html#SEC246">14  The Installer's and Distributor's View</A>).
+(see section <A HREF="gettext_14.html#SEC244">14  The Installer's and Distributor's View</A>).
 
 </P>
 <P>
@@ -560,9 +560,9 @@
 </P>
 
 
-<H3><A NAME="SEC219" HREF="gettext_toc.html#TOC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC218" HREF="gettext_toc.html#TOC218">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1162"></A>
+<A NAME="IDX1132"></A>
 
 </P>
 <P>
@@ -584,14 +584,14 @@
 <P>
 As an alternative to the <CODE>XGETTEXT_OPTIONS</CODE> variables, it is also
 possible to specify <CODE>xgettext</CODE> options through the
-<CODE>AM_XGETTEXT_OPTION</CODE> autoconf macro.  See section <A HREF="gettext_13.html#SEC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
+<CODE>AM_XGETTEXT_OPTION</CODE> autoconf macro.  See section <A HREF="gettext_13.html#SEC235">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
 
 </P>
 
 
-<H3><A NAME="SEC220" HREF="gettext_toc.html#TOC220">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC219" HREF="gettext_toc.html#TOC219">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1163"></A>
+<A NAME="IDX1133"></A>
 
 </P>
 <P>
@@ -602,8 +602,8 @@
 
 </P>
 <P>
-<A NAME="IDX1164"></A>
-<A NAME="IDX1165"></A>
+<A NAME="IDX1134"></A>
+<A NAME="IDX1135"></A>
 GNU gettext comes with a <TT>&lsquo;Rules-quot&rsquo;</TT> file, containing rules for
 building catalogs <TT>&lsquo;en@quot.po&rsquo;</TT> and <TT>&lsquo;en@boldquot.po&rsquo;</TT>.  The
 effect of <TT>&lsquo;en@quot.po&rsquo;</TT> is that people who set their <CODE>LANGUAGE</CODE>
@@ -628,7 +628,7 @@
 </P>
 
 
-<H3><A NAME="SEC221" HREF="gettext_toc.html#TOC221">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC220" HREF="gettext_toc.html#TOC220">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A></H3>
 
 <P>
 <TT>&lsquo;configure.ac&rsquo;</TT> or <TT>&lsquo;configure.in&rsquo;</TT> - this is the source from which
@@ -639,14 +639,14 @@
 <OL>
 <LI>Declare the package and version.
 
-<A NAME="IDX1166"></A>
+<A NAME="IDX1136"></A>
 
 This is done by a set of lines like these:
 
 
 <PRE>
 PACKAGE=gettext
-VERSION=0.19.3
+VERSION=0.18.1
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -657,13 +657,13 @@
 
 
 <PRE>
-AM_INIT_AUTOMAKE(gettext, 0.19.3)
+AM_INIT_AUTOMAKE(gettext, 0.18.1)
 </PRE>
 
 Of course, you replace <SAMP>&lsquo;gettext&rsquo;</SAMP> with the name of your package,
-and <SAMP>&lsquo;0.19.3&rsquo;</SAMP> by its version numbers, exactly as they
+and <SAMP>&lsquo;0.18.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.3.tar.gz&rsquo;</TT>, here).
+(<TT>&lsquo;gettext-0.18.1.tar.gz&rsquo;</TT>, here).
 
 <LI>Check for internationalization support.
 
@@ -736,7 +736,7 @@
 </P>
 
 
-<H3><A NAME="SEC222" HREF="gettext_toc.html#TOC222">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC221" HREF="gettext_toc.html#TOC221">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A></H3>
 
 <P>
 If you haven't suppressed the <TT>&lsquo;intl/&rsquo;</TT> subdirectory,
@@ -748,12 +748,12 @@
 </P>
 <P>
 You can obtain the newest version of <TT>&lsquo;config.guess&rsquo;</TT> and
-<TT>&lsquo;config.sub&rsquo;</TT> from the <SAMP>&lsquo;config&rsquo;</SAMP> project at
+<TT>&lsquo;config.sub&rsquo;</TT> from the CVS of the <SAMP>&lsquo;config&rsquo;</SAMP> project at
 <TT>&lsquo;http://savannah.gnu.org/&rsquo;</TT>. The commands to fetch them are
 
 <PRE>
-$ wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-$ wget -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
+$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess'
+$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub'
 </PRE>
 
 <P>
@@ -777,9 +777,9 @@
 
 
 
-<H3><A NAME="SEC223" HREF="gettext_toc.html#TOC223">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC222" HREF="gettext_toc.html#TOC222">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1167"></A>
+<A NAME="IDX1137"></A>
 
 </P>
 <P>
@@ -791,9 +791,9 @@
 </P>
 
 
-<H3><A NAME="SEC224" HREF="gettext_toc.html#TOC224">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC223" HREF="gettext_toc.html#TOC223">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1168"></A>
+<A NAME="IDX1138"></A>
 
 </P>
 <P>
@@ -846,22 +846,6 @@
 
 </P>
 <P>
-If you are using GNU <CODE>automake</CODE> 1.10 or newer, it is even easier:
-Add the line
-
-</P>
-
-<PRE>
-ACLOCAL_AMFLAGS = --install -I m4
-</PRE>
-
-<P>
-to your top level <TT>&lsquo;Makefile.am&rsquo;</TT>, and run <SAMP>&lsquo;aclocal --install -I m4&rsquo;</SAMP>.
-This will copy the needed files to the <TT>&lsquo;m4/&rsquo;</TT> subdirectory automatically,
-before updating <TT>&lsquo;aclocal.m4&rsquo;</TT>.
-
-</P>
-<P>
 These macros check for the internationalization support functions
 and related informations.  Hopefully, once stabilized, these macros
 might be integrated in the standard Autoconf set, because this
@@ -871,9 +855,9 @@
 </P>
 
 
-<H3><A NAME="SEC225" HREF="gettext_toc.html#TOC225">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC224" HREF="gettext_toc.html#TOC224">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1169"></A>
+<A NAME="IDX1139"></A>
 
 </P>
 <P>
@@ -887,9 +871,9 @@
 </P>
 
 
-<H3><A NAME="SEC226" HREF="gettext_toc.html#TOC226">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC225" HREF="gettext_toc.html#TOC225">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1170"></A>
+<A NAME="IDX1140"></A>
 
 </P>
 <P>
@@ -936,7 +920,7 @@
 
 
 
-<H3><A NAME="SEC227" HREF="gettext_toc.html#TOC227">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC226" HREF="gettext_toc.html#TOC226">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A></H3>
 
 <P>
 Here are a few modifications you need to make to your main, top-level
@@ -1023,7 +1007,7 @@
 </P>
 
 
-<H3><A NAME="SEC228" HREF="gettext_toc.html#TOC228">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC227" HREF="gettext_toc.html#TOC227">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A></H3>
 
 <P>
 Some of the modifications made in the main <TT>&lsquo;Makefile.in&rsquo;</TT> will
@@ -1225,11 +1209,11 @@
 
 
 
-<H3><A NAME="SEC229" HREF="gettext_toc.html#TOC229">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC228" HREF="gettext_toc.html#TOC228">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1171"></A>
-<A NAME="IDX1172"></A>
-<A NAME="IDX1173"></A>
+<A NAME="IDX1141"></A>
+<A NAME="IDX1142"></A>
+<A NAME="IDX1143"></A>
 
 </P>
 <P>
@@ -1266,7 +1250,7 @@
 
 </P>
 <P>
-<A NAME="IDX1174"></A>
+<A NAME="IDX1144"></A>
 <TT>&lsquo;gettext.h&rsquo;</TT> is a convenience header file for conditional use of
 <TT>&lsquo;&#60;libintl.h&#62;&rsquo;</TT>, depending on the <CODE>ENABLE_NLS</CODE> macro.  If
 <CODE>ENABLE_NLS</CODE> is set, it includes <TT>&lsquo;&#60;libintl.h&#62;&rsquo;</TT>; otherwise it
@@ -1305,9 +1289,9 @@
 </P>
 
 
-<H2><A NAME="SEC230" HREF="gettext_toc.html#TOC230">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A></H2>
+<H2><A NAME="SEC229" HREF="gettext_toc.html#TOC229">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A></H2>
 <P>
-<A NAME="IDX1175"></A>
+<A NAME="IDX1145"></A>
 
 </P>
 <P>
@@ -1320,10 +1304,10 @@
 
 
 
-<H3><A NAME="SEC231" HREF="gettext_toc.html#TOC231">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC230" HREF="gettext_toc.html#TOC230">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1176"></A>
+<A NAME="IDX1146"></A>
 The <CODE>AM_GNU_GETTEXT</CODE> macro tests for the presence of the GNU gettext
 function family in either the C library or a separate <CODE>libintl</CODE>
 library (shared or static libraries are both supported) or in the package's
@@ -1393,7 +1377,7 @@
 <UL>
 <LI>
 
-<A NAME="IDX1177"></A>
+<A NAME="IDX1147"></A>
 Some operating systems have <CODE>gettext</CODE> in the C library, for example
 glibc.  Some have it in a separate library <CODE>libintl</CODE>.  GNU <CODE>libintl</CODE>
 might have been installed as part of the GNU <CODE>gettext</CODE> package.
@@ -1429,25 +1413,25 @@
 
 
 
-<H3><A NAME="SEC232" HREF="gettext_toc.html#TOC232">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC231" HREF="gettext_toc.html#TOC231">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1178"></A>
+<A NAME="IDX1148"></A>
 The <CODE>AM_GNU_GETTEXT_VERSION</CODE> macro declares the version number of
 the GNU gettext infrastructure that is used by the package.
 
 </P>
 <P>
 The use of this macro is optional; only the <CODE>autopoint</CODE> program makes
-use of it (see section <A HREF="gettext_13.html#SEC238">13.6  Integrating with Version Control Systems</A>).
+use of it (see section <A HREF="gettext_13.html#SEC237">13.6  Integrating with CVS</A>).
 
 </P>
 
 
-<H3><A NAME="SEC233" HREF="gettext_toc.html#TOC233">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC232" HREF="gettext_toc.html#TOC232">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1179"></A>
+<A NAME="IDX1149"></A>
 The <CODE>AM_GNU_GETTEXT_NEED</CODE> macro declares a constraint regarding the
 GNU gettext implementation.  The syntax is
 
@@ -1477,10 +1461,10 @@
 </P>
 
 
-<H3><A NAME="SEC234" HREF="gettext_toc.html#TOC234">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC233" HREF="gettext_toc.html#TOC233">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1180"></A>
+<A NAME="IDX1150"></A>
 The <CODE>AM_GNU_GETTEXT_INTL_SUBDIR</CODE> macro specifies that the
 <CODE>AM_GNU_GETTEXT</CODE> macro, although invoked with the first argument
 <SAMP>&lsquo;external&rsquo;</SAMP>, should also prepare for building the <TT>&lsquo;intl/&rsquo;</TT>
@@ -1499,14 +1483,14 @@
 </P>
 
 
-<H3><A NAME="SEC235" HREF="gettext_toc.html#TOC235">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC234" HREF="gettext_toc.html#TOC234">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1181"></A>
+<A NAME="IDX1151"></A>
 The <CODE>AM_PO_SUBDIRS</CODE> macro prepares the <TT>&lsquo;po/&rsquo;</TT> directories of the
 package for building.  This macro should be used in internationalized
 programs written in other programming languages than C, C++, Objective C,
-for example <CODE>sh</CODE>, <CODE>Python</CODE>, <CODE>Lisp</CODE>.  See section <A HREF="gettext_15.html#SEC247">15  Other Programming Languages</A> for a list of programming languages that support localization
+for example <CODE>sh</CODE>, <CODE>Python</CODE>, <CODE>Lisp</CODE>.  See section <A HREF="gettext_15.html#SEC245">15  Other Programming Languages</A> for a list of programming languages that support localization
 through PO files.
 
 </P>
@@ -1519,10 +1503,10 @@
 </P>
 
 
-<H3><A NAME="SEC236" HREF="gettext_toc.html#TOC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC235" HREF="gettext_toc.html#TOC235">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1182"></A>
+<A NAME="IDX1152"></A>
 The <CODE>AM_XGETTEXT_OPTION</CODE> macro registers a command-line option to be
 used in the invocations of <CODE>xgettext</CODE> in the <TT>&lsquo;po/&rsquo;</TT> directories
 of the package.
@@ -1553,10 +1537,10 @@
 </P>
 
 
-<H3><A NAME="SEC237" HREF="gettext_toc.html#TOC237">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC236" HREF="gettext_toc.html#TOC236">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1183"></A>
+<A NAME="IDX1153"></A>
 The <CODE>AM_ICONV</CODE> macro tests for the presence of the POSIX/XSI
 <CODE>iconv</CODE> function family in either the C library or a separate
 <CODE>libiconv</CODE> library.  If found, it sets the <CODE>am_cv_func_iconv</CODE>
@@ -1580,7 +1564,7 @@
 <UL>
 <LI>
 
-<A NAME="IDX1184"></A>
+<A NAME="IDX1154"></A>
 Some operating systems have <CODE>iconv</CODE> in the C library, for example
 glibc.  Some have it in a separate library <CODE>libiconv</CODE>, for example
 OSF/1 or FreeBSD.  Regardless of the operating system, GNU <CODE>libiconv</CODE>
@@ -1617,33 +1601,32 @@
 </P>
 
 
-<H2><A NAME="SEC238" HREF="gettext_toc.html#TOC238">13.6  Integrating with Version Control Systems</A></H2>
+<H2><A NAME="SEC237" HREF="gettext_toc.html#TOC237">13.6  Integrating with CVS</A></H2>
 
 <P>
-Many projects use version control systems for distributed development
-and source backup.  This section gives some advice how to manage the
-uses of <CODE>gettextize</CODE>, <CODE>autopoint</CODE> and <CODE>autoconf</CODE> on
-version controlled files.
+Many projects use CVS for distributed development, version control and
+source backup.  This section gives some advice how to manage the uses
+of <CODE>cvs</CODE>, <CODE>gettextize</CODE>, <CODE>autopoint</CODE> and <CODE>autoconf</CODE>.
 
 </P>
 
 
 
-<H3><A NAME="SEC239" HREF="gettext_toc.html#TOC239">13.6.1  Avoiding version mismatch in distributed development</A></H3>
+<H3><A NAME="SEC238" HREF="gettext_toc.html#TOC238">13.6.1  Avoiding version mismatch in distributed development</A></H3>
 
 <P>
-In a project development with multiple developers, there should be a
-single developer who occasionally - when there is desire to upgrade to
-a new <CODE>gettext</CODE> version - runs <CODE>gettextize</CODE> and performs the
-changes listed in section <A HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A>, and then commits his changes
-to the repository.
+In a project development with multiple developers, using CVS, there
+should be a single developer who occasionally - when there is desire to
+upgrade to a new <CODE>gettext</CODE> version - runs <CODE>gettextize</CODE> and
+performs the changes listed in section <A HREF="gettext_13.html#SEC215">13.4  Files You Must Create or Alter</A>, and then commits
+his changes to the CVS.
 
 </P>
 <P>
 It is highly recommended that all developers on a project use the same
 version of GNU <CODE>gettext</CODE> in the package.  In other words, if a
 developer runs <CODE>gettextize</CODE>, he should go the whole way, make the
-necessary remaining changes and commit his changes to the repository.
+necessary remaining changes and commit his changes to the CVS.
 Otherwise the following damages will likely occur:
 
 </P>
@@ -1677,14 +1660,14 @@
 
 
 
-<H3><A NAME="SEC240" HREF="gettext_toc.html#TOC240">13.6.2  Files to put under version control</A></H3>
+<H3><A NAME="SEC239" HREF="gettext_toc.html#TOC239">13.6.2  Files to put under CVS version control</A></H3>
 
 <P>
 There are basically three ways to deal with generated files in the
-context of a version controlled repository, such as <TT>&lsquo;configure&rsquo;</TT>
-generated from <TT>&lsquo;configure.ac&rsquo;</TT>, <CODE><VAR>parser</VAR>.c</CODE> generated
-from <CODE><VAR>parser</VAR>.y</CODE>, or <CODE>po/Makefile.in.in</CODE> autoinstalled
-by <CODE>gettextize</CODE> or <CODE>autopoint</CODE>.
+context of a CVS repository, such as <TT>&lsquo;configure&rsquo;</TT> generated from
+<TT>&lsquo;configure.ac&rsquo;</TT>, <CODE><VAR>parser</VAR>.c</CODE> generated from
+<CODE><VAR>parser</VAR>.y</CODE>, or <CODE>po/Makefile.in.in</CODE> autoinstalled by
+<CODE>gettextize</CODE> or <CODE>autopoint</CODE>.
 
 </P>
 
@@ -1711,40 +1694,39 @@
 <OL>
 <LI>
 
-The advantage is that anyone can check out the source at any moment and
+The advantage is that anyone can check out the CVS at any moment and
 gets a working build.  The drawbacks are:  1a. It requires some frequent
-"push" actions by the maintainers.  1b. The repository grows in size
+"cvs commit" actions by the maintainers.  1b. The repository grows in size
 quite fast.
 
 <LI>
 
-The advantage is that anyone can check out the source, and the usual
-"./configure; make" will work.  The drawbacks are: 2a. The one who
-checks out the repository needs tools like GNU <CODE>automake</CODE>, GNU
-<CODE>autoconf</CODE>, GNU <CODE>m4</CODE> installed in his PATH; sometimes he
-even needs particular versions of them.  2b. When a release is made
+The advantage is that anyone can check out the CVS, and the usual
+"./configure; make" will work.  The drawbacks are:  2a. The one who
+checks out the repository needs tools like GNU <CODE>automake</CODE>,
+GNU <CODE>autoconf</CODE>, GNU <CODE>m4</CODE> installed in his PATH; sometimes
+he even needs particular versions of them.  2b. When a release is made
 and a commit is made on the generated files, the other developers get
-conflicts on the generated files when merging the local work back to
-the repository.  Although these conflicts are easy to resolve, they
-are annoying.
+conflicts on the generated files after doing "cvs update".  Although
+these conflicts are easy to resolve, they are annoying.
 
 <LI>
 
 The advantage is less work for the maintainers.  The drawback is that
-anyone who checks out the source not only needs tools like GNU
-<CODE>automake</CODE>, GNU <CODE>autoconf</CODE>, GNU <CODE>m4</CODE> installed in his
-PATH, but also that he needs to perform a package specific pre-build
-step before being able to "./configure; make".
+anyone who checks out the CVS not only needs tools like GNU <CODE>automake</CODE>,
+GNU <CODE>autoconf</CODE>, GNU <CODE>m4</CODE> installed in his PATH, but also that
+he needs to perform a package specific pre-build step before being able
+to "./configure; make".
 </OL>
 
 <P>
 For the first and second approach, all files modified or brought in
 by the occasional <CODE>gettextize</CODE> invocation and update should be
-committed into the repository.
+committed into the CVS.
 
 </P>
 <P>
-For the third approach, the maintainer can omit from the repository
+For the third approach, the maintainer can omit from the CVS repository
 all the files that <CODE>gettextize</CODE> mentions as "copy".  Instead, he
 adds to the <TT>&lsquo;configure.ac&rsquo;</TT> or <TT>&lsquo;configure.in&rsquo;</TT> a line of the
 form
@@ -1752,14 +1734,14 @@
 </P>
 
 <PRE>
-AM_GNU_GETTEXT_VERSION(0.19.3)
+AM_GNU_GETTEXT_VERSION(0.18.1)
 </PRE>
 
 <P>
 and adds to the package's pre-build script an invocation of
-<SAMP>&lsquo;autopoint&rsquo;</SAMP>.  For everyone who checks out the source, this
+<SAMP>&lsquo;autopoint&rsquo;</SAMP>.  For everyone who checks out the CVS, this
 <CODE>autopoint</CODE> invocation will copy into the right place the
-<CODE>gettext</CODE> infrastructure files that have been omitted from the repository.
+<CODE>gettext</CODE> infrastructure files that have been omitted from the CVS.
 
 </P>
 <P>
@@ -1778,72 +1760,11 @@
 </P>
 
 
-<H3><A NAME="SEC241" HREF="gettext_toc.html#TOC241">13.6.3  Put PO Files under Version Control</A></H3>
-
-<P>
-Since translations are valuable assets as well as the source code, it
-would make sense to put them under version control.  The GNU gettext
-infrastructure supports two ways to deal with translations in the
-context of a version controlled repository.
-
-</P>
-
-<OL>
-<LI>
-
-Both POT file and PO files are committed into the repository.
-
-<LI>
-
-Only PO files are committed into the repository.
-
-</OL>
-
-<P>
-If a POT file is absent when building, it will be generated by
-scanning the source files with <CODE>xgettext</CODE>, and then the PO files
-are regenerated as a dependency.  On the other hand, some maintainers
-want to keep the POT file unchanged during the development phase.  So,
-even if a POT file is present and older than the source code, it won't
-be updated automatically.  You can manually update it with <CODE>make
-$(DOMAIN).pot-update</CODE>, and commit it at certain point.
+<H3><A NAME="SEC240" HREF="gettext_toc.html#TOC240">13.6.3  Invoking the <CODE>autopoint</CODE> Program</A></H3>
 
-</P>
 <P>
-Special advices for particular version control systems:
-
-</P>
-
-<UL>
-<LI>
-
-Recent version control systems, Git for instance, ignore file's
-timestamp.  In that case, PO files can be accidentally updated even if
-a POT file is not updated.  To prevent this, you can set
-<SAMP>&lsquo;PO_DEPENDS_ON_POT&rsquo;</SAMP> variable to <CODE>no</CODE> in the <TT>&lsquo;Makevars&rsquo;</TT>
-file and do <CODE>make update-po</CODE> manually.
-
-<LI>
-
-Location comments such as <CODE>#: lib/error.c:116</CODE> are sometimes
-annoying, since these comments are volatile and may introduce unwanted
-change to the working copy when building.  To mitigate this, you can
-decide to omit those comments from the PO files in the repository.
-
-This is possible with the <CODE>--no-location</CODE> option of the
-<CODE>msgmerge</CODE> command <A NAME="DOCF6" HREF="gettext_foot.html#FOOT6">(6)</A>.  The drawback is
-that, if the location information is needed, translators have to
-recover the location comments by running <CODE>msgmerge</CODE> again.
-
-</UL>
-
-
-
-<H3><A NAME="SEC242" HREF="gettext_toc.html#TOC242">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A></H3>
-
-<P>
-<A NAME="IDX1185"></A>
-<A NAME="IDX1186"></A>
+<A NAME="IDX1155"></A>
+<A NAME="IDX1156"></A>
 
 <PRE>
 autopoint [<VAR>option</VAR>]...
@@ -1860,7 +1781,7 @@
 </P>
 
 
-<H4><A NAME="SEC243" HREF="gettext_toc.html#TOC243">13.6.4.1  Options</A></H4>
+<H4><A NAME="SEC241" HREF="gettext_toc.html#TOC241">13.6.3.1  Options</A></H4>
 
 <DL COMPACT>
 
@@ -1868,16 +1789,16 @@
 <DD>
 <DT><SAMP>&lsquo;--force&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1187"></A>
-<A NAME="IDX1188"></A>
+<A NAME="IDX1157"></A>
+<A NAME="IDX1158"></A>
 Force overwriting of files that already exist.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--dry-run&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1189"></A>
-<A NAME="IDX1190"></A>
+<A NAME="IDX1159"></A>
+<A NAME="IDX1160"></A>
 Print modifications but don't perform them.  All file copying actions that
 <CODE>autopoint</CODE> would normally execute are inhibited and instead only
 listed on standard output.
@@ -1886,26 +1807,26 @@
 
 
 
-<H4><A NAME="SEC244" HREF="gettext_toc.html#TOC244">13.6.4.2  Informative output</A></H4>
+<H4><A NAME="SEC242" HREF="gettext_toc.html#TOC242">13.6.3.2  Informative output</A></H4>
 
 <DL COMPACT>
 
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1191"></A>
+<A NAME="IDX1161"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1192"></A>
+<A NAME="IDX1162"></A>
 Output version information and exit.
 
 </DL>
 
 <P>
 <CODE>autopoint</CODE> supports the GNU <CODE>gettext</CODE> versions from 0.10.35 to
-the current one, 0.19.3.  In order to apply <CODE>autopoint</CODE> to
-a package using a <CODE>gettext</CODE> version newer than 0.19.3, you
+the current one, 0.18.1.  In order to apply <CODE>autopoint</CODE> to
+a package using a <CODE>gettext</CODE> version newer than 0.18.1, you
 need to install this same version of GNU <CODE>gettext</CODE> at least.
 
 </P>
@@ -1927,11 +1848,11 @@
 </P>
 
 
-<H2><A NAME="SEC245" HREF="gettext_toc.html#TOC245">13.7  Creating a Distribution Tarball</A></H2>
+<H2><A NAME="SEC243" HREF="gettext_toc.html#TOC243">13.7  Creating a Distribution Tarball</A></H2>
 
 <P>
-<A NAME="IDX1193"></A>
-<A NAME="IDX1194"></A>
+<A NAME="IDX1163"></A>
+<A NAME="IDX1164"></A>
 In projects that use GNU <CODE>automake</CODE>, the usual commands for creating
 a distribution tarball, <SAMP>&lsquo;make dist&rsquo;</SAMP> or <SAMP>&lsquo;make distcheck&rsquo;</SAMP>,
 automatically update the PO files as needed.
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_14.html gettext-0.18.1.1/gettext-tools/doc/gettext_14.html
--- gettext-0.19.3/gettext-tools/doc/gettext_14.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_14.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 14  The Installer's and Distributor's View</TITLE>
@@ -11,17 +11,17 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC246" HREF="gettext_toc.html#TOC246">14  The Installer's and Distributor's View</A></H1>
+<H1><A NAME="SEC244" HREF="gettext_toc.html#TOC244">14  The Installer's and Distributor's View</A></H1>
 <P>
-<A NAME="IDX1195"></A>
-<A NAME="IDX1196"></A>
-<A NAME="IDX1197"></A>
-<A NAME="IDX1198"></A>
+<A NAME="IDX1165"></A>
+<A NAME="IDX1166"></A>
+<A NAME="IDX1167"></A>
+<A NAME="IDX1168"></A>
 
 </P>
 <P>
 By default, packages fully using GNU <CODE>gettext</CODE>, internally,
-are installed in such a way as to allow translation of
+are installed in such a way that they to allow translation of
 messages.  At <EM>configuration</EM> time, those packages should
 automatically detect whether the underlying host system already provides
 the GNU <CODE>gettext</CODE> functions.  If not,
@@ -35,7 +35,7 @@
 
 </P>
 <P>
-<A NAME="IDX1199"></A>
+<A NAME="IDX1169"></A>
 Internationalized packages have usually many <TT>&lsquo;<VAR>ll</VAR>.po&rsquo;</TT>
 files.  Unless
 translations are disabled, all those available are installed together
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_15.html gettext-0.18.1.1/gettext-tools/doc/gettext_15.html
--- gettext-0.19.3/gettext-tools/doc/gettext_15.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_15.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 15  Other Programming Languages</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC247" HREF="gettext_toc.html#TOC247">15  Other Programming Languages</A></H1>
+<H1><A NAME="SEC245" HREF="gettext_toc.html#TOC245">15  Other Programming Languages</A></H1>
 
 <P>
 While the presentation of <CODE>gettext</CODE> focuses mostly on C and
@@ -24,10 +24,10 @@
 
 
 
-<H2><A NAME="SEC248" HREF="gettext_toc.html#TOC248">15.1  The Language Implementor's View</A></H2>
+<H2><A NAME="SEC246" HREF="gettext_toc.html#TOC246">15.1  The Language Implementor's View</A></H2>
 <P>
-<A NAME="IDX1200"></A>
-<A NAME="IDX1201"></A>
+<A NAME="IDX1170"></A>
+<A NAME="IDX1171"></A>
 
 </P>
 <P>
@@ -125,7 +125,7 @@
 <LI>
 
 You may integrate the GNU <CODE>gettext</CODE>'s <TT>&lsquo;intl/&rsquo;</TT> directory in
-your package, as described in section <A HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>.  This allows you to
+your package, as described in section <A HREF="gettext_13.html#SEC211">13  The Maintainer's View</A>.  This allows you to
 have internationalization on all kinds of platforms.  Note that when you
 then distribute your package, it legally falls under the GNU General
 Public License, and the GNU project will be glad about your contribution
@@ -151,7 +151,7 @@
 
 
 
-<H2><A NAME="SEC249" HREF="gettext_toc.html#TOC249">15.2  The Programmer's View</A></H2>
+<H2><A NAME="SEC247" HREF="gettext_toc.html#TOC247">15.2  The Programmer's View</A></H2>
 
 <P>
 For the programmer, the general procedure is the same as for the C
@@ -164,7 +164,7 @@
 </P>
 
 
-<H2><A NAME="SEC250" HREF="gettext_toc.html#TOC250">15.3  The Translator's View</A></H2>
+<H2><A NAME="SEC248" HREF="gettext_toc.html#TOC248">15.3  The Translator's View</A></H2>
 
 <P>
 The translator works exactly as in the C language case.  The only
@@ -176,7 +176,7 @@
 
 
 
-<H3><A NAME="SEC251" HREF="gettext_toc.html#TOC251">15.3.1  C Format Strings</A></H3>
+<H3><A NAME="SEC249" HREF="gettext_toc.html#TOC249">15.3.1  C Format Strings</A></H3>
 
 <P>
 C format strings are described in POSIX (IEEE P1003.1 2001), section
@@ -214,8 +214,8 @@
 
 </P>
 <P>
-<A NAME="IDX1202"></A>
-<A NAME="IDX1203"></A>
+<A NAME="IDX1172"></A>
+<A NAME="IDX1173"></A>
 As a special feature for Farsi (Persian) and maybe Arabic, translators can
 insert an <SAMP>&lsquo;I&rsquo;</SAMP> flag into numeric format directives.  For example, the
 translation of <CODE>"%d"</CODE> can be <CODE>"%Id"</CODE>.  The effect of this flag,
@@ -234,7 +234,7 @@
 </P>
 
 
-<H3><A NAME="SEC252" HREF="gettext_toc.html#TOC252">15.3.2  Objective C Format Strings</A></H3>
+<H3><A NAME="SEC250" HREF="gettext_toc.html#TOC250">15.3.2  Objective C Format Strings</A></H3>
 
 <P>
 Objective C format strings are like C format strings.  They support an
@@ -244,7 +244,7 @@
 </P>
 
 
-<H3><A NAME="SEC253" HREF="gettext_toc.html#TOC253">15.3.3  Shell Format Strings</A></H3>
+<H3><A NAME="SEC251" HREF="gettext_toc.html#TOC251">15.3.3  Shell Format Strings</A></H3>
 
 <P>
 Shell format strings, as supported by GNU gettext and the <SAMP>&lsquo;envsubst&rsquo;</SAMP>
@@ -266,17 +266,10 @@
 </P>
 
 
-<H3><A NAME="SEC254" HREF="gettext_toc.html#TOC254">15.3.4  Python Format Strings</A></H3>
+<H3><A NAME="SEC252" HREF="gettext_toc.html#TOC252">15.3.4  Python Format Strings</A></H3>
 
 <P>
-There are two kinds of format strings in Python: those acceptable to
-the Python built-in format operator <CODE>%</CODE>, labelled as
-<SAMP>&lsquo;python-format&rsquo;</SAMP>, and those acceptable to the <CODE>format</CODE> method
-of the <SAMP>&lsquo;str&rsquo;</SAMP> object.
-
-</P>
-<P>
-Python <CODE>%</CODE> format strings are described in
+Python format strings are described in
 Python Library reference /
 2. Built-in Types, Exceptions and Functions /
 2.2. Built-in Types /
@@ -285,14 +278,9 @@
 <A HREF="http://www.python.org/doc/2.2.1/lib/typesseq-strings.html">http://www.python.org/doc/2.2.1/lib/typesseq-strings.html</A>.
 
 </P>
-<P>
-Python brace format strings are described in PEP 3101 -- Advanced
-String Formatting, <A HREF="http://www.python.org/dev/peps/pep-3101/">http://www.python.org/dev/peps/pep-3101/</A>.
-
-</P>
 
 
-<H3><A NAME="SEC255" HREF="gettext_toc.html#TOC255">15.3.5  Lisp Format Strings</A></H3>
+<H3><A NAME="SEC253" HREF="gettext_toc.html#TOC253">15.3.5  Lisp Format Strings</A></H3>
 
 <P>
 Lisp format strings are described in the Common Lisp HyperSpec,
@@ -302,7 +290,7 @@
 </P>
 
 
-<H3><A NAME="SEC256" HREF="gettext_toc.html#TOC256">15.3.6  Emacs Lisp Format Strings</A></H3>
+<H3><A NAME="SEC254" HREF="gettext_toc.html#TOC254">15.3.6  Emacs Lisp Format Strings</A></H3>
 
 <P>
 Emacs Lisp format strings are documented in the Emacs Lisp reference,
@@ -314,7 +302,7 @@
 </P>
 
 
-<H3><A NAME="SEC257" HREF="gettext_toc.html#TOC257">15.3.7  librep Format Strings</A></H3>
+<H3><A NAME="SEC255" HREF="gettext_toc.html#TOC255">15.3.7  librep Format Strings</A></H3>
 
 <P>
 librep format strings are documented in the librep manual, section
@@ -325,7 +313,7 @@
 </P>
 
 
-<H3><A NAME="SEC258" HREF="gettext_toc.html#TOC258">15.3.8  Scheme Format Strings</A></H3>
+<H3><A NAME="SEC256" HREF="gettext_toc.html#TOC256">15.3.8  Scheme Format Strings</A></H3>
 
 <P>
 Scheme format strings are documented in the SLIB manual, section
@@ -334,7 +322,7 @@
 </P>
 
 
-<H3><A NAME="SEC259" HREF="gettext_toc.html#TOC259">15.3.9  Smalltalk Format Strings</A></H3>
+<H3><A NAME="SEC257" HREF="gettext_toc.html#TOC257">15.3.9  Smalltalk Format Strings</A></H3>
 
 <P>
 Smalltalk format strings are described in the GNU Smalltalk documentation,
@@ -347,7 +335,7 @@
 </P>
 
 
-<H3><A NAME="SEC260" HREF="gettext_toc.html#TOC260">15.3.10  Java Format Strings</A></H3>
+<H3><A NAME="SEC258" HREF="gettext_toc.html#TOC258">15.3.10  Java Format Strings</A></H3>
 
 <P>
 Java format strings are described in the JDK documentation for class
@@ -359,7 +347,7 @@
 </P>
 
 
-<H3><A NAME="SEC261" HREF="gettext_toc.html#TOC261">15.3.11  C# Format Strings</A></H3>
+<H3><A NAME="SEC259" HREF="gettext_toc.html#TOC259">15.3.11  C# Format Strings</A></H3>
 
 <P>
 C# format strings are described in the .NET documentation for class
@@ -369,7 +357,7 @@
 </P>
 
 
-<H3><A NAME="SEC262" HREF="gettext_toc.html#TOC262">15.3.12  awk Format Strings</A></H3>
+<H3><A NAME="SEC260" HREF="gettext_toc.html#TOC260">15.3.12  awk Format Strings</A></H3>
 
 <P>
 awk format strings are described in the gawk documentation, section
@@ -379,7 +367,7 @@
 </P>
 
 
-<H3><A NAME="SEC263" HREF="gettext_toc.html#TOC263">15.3.13  Object Pascal Format Strings</A></H3>
+<H3><A NAME="SEC261" HREF="gettext_toc.html#TOC261">15.3.13  Object Pascal Format Strings</A></H3>
 
 <P>
 Object Pascal format strings are described in the documentation of the
@@ -389,7 +377,7 @@
 </P>
 
 
-<H3><A NAME="SEC264" HREF="gettext_toc.html#TOC264">15.3.14  YCP Format Strings</A></H3>
+<H3><A NAME="SEC262" HREF="gettext_toc.html#TOC262">15.3.14  YCP Format Strings</A></H3>
 
 <P>
 YCP sformat strings are described in the libycp documentation
@@ -400,7 +388,7 @@
 </P>
 
 
-<H3><A NAME="SEC265" HREF="gettext_toc.html#TOC265">15.3.15  Tcl Format Strings</A></H3>
+<H3><A NAME="SEC263" HREF="gettext_toc.html#TOC263">15.3.15  Tcl Format Strings</A></H3>
 
 <P>
 Tcl format strings are described in the <TT>&lsquo;format.n&rsquo;</TT> manual page,
@@ -409,7 +397,7 @@
 </P>
 
 
-<H3><A NAME="SEC266" HREF="gettext_toc.html#TOC266">15.3.16  Perl Format Strings</A></H3>
+<H3><A NAME="SEC264" HREF="gettext_toc.html#TOC264">15.3.16  Perl Format Strings</A></H3>
 
 <P>
 There are two kinds format strings in Perl: those acceptable to the
@@ -433,7 +421,7 @@
 </P>
 
 
-<H3><A NAME="SEC267" HREF="gettext_toc.html#TOC267">15.3.17  PHP Format Strings</A></H3>
+<H3><A NAME="SEC265" HREF="gettext_toc.html#TOC265">15.3.17  PHP Format Strings</A></H3>
 
 <P>
 PHP format strings are described in the documentation of the PHP function
@@ -443,7 +431,7 @@
 </P>
 
 
-<H3><A NAME="SEC268" HREF="gettext_toc.html#TOC268">15.3.18  GCC internal Format Strings</A></H3>
+<H3><A NAME="SEC266" HREF="gettext_toc.html#TOC266">15.3.18  GCC internal Format Strings</A></H3>
 
 <P>
 These format strings are used inside the GCC sources.  In such a format
@@ -464,7 +452,7 @@
 </P>
 
 
-<H3><A NAME="SEC269" HREF="gettext_toc.html#TOC269">15.3.19  GFC internal Format Strings</A></H3>
+<H3><A NAME="SEC267" HREF="gettext_toc.html#TOC267">15.3.19  GFC internal Format Strings</A></H3>
 
 <P>
 These format strings are used inside the GNU Fortran Compiler sources,
@@ -479,7 +467,7 @@
 </P>
 
 
-<H3><A NAME="SEC270" HREF="gettext_toc.html#TOC270">15.3.20  Qt Format Strings</A></H3>
+<H3><A NAME="SEC268" HREF="gettext_toc.html#TOC268">15.3.20  Qt Format Strings</A></H3>
 
 <P>
 Qt format strings are described in the documentation of the QString class
@@ -490,7 +478,7 @@
 </P>
 
 
-<H3><A NAME="SEC271" HREF="gettext_toc.html#TOC271">15.3.21  Qt Format Strings</A></H3>
+<H3><A NAME="SEC269" HREF="gettext_toc.html#TOC269">15.3.21  Qt Format Strings</A></H3>
 
 <P>
 Qt format strings are described in the documentation of the QObject::tr method
@@ -500,7 +488,7 @@
 </P>
 
 
-<H3><A NAME="SEC272" HREF="gettext_toc.html#TOC272">15.3.22  KDE Format Strings</A></H3>
+<H3><A NAME="SEC270" HREF="gettext_toc.html#TOC270">15.3.22  KDE Format Strings</A></H3>
 
 <P>
 KDE 4 format strings are defined as follows:
@@ -511,7 +499,7 @@
 </P>
 
 
-<H3><A NAME="SEC273" HREF="gettext_toc.html#TOC273">15.3.23  Boost Format Strings</A></H3>
+<H3><A NAME="SEC271" HREF="gettext_toc.html#TOC271">15.3.23  Boost Format Strings</A></H3>
 
 <P>
 Boost format strings are described in the documentation of the
@@ -525,34 +513,7 @@
 </P>
 
 
-<H3><A NAME="SEC274" HREF="gettext_toc.html#TOC274">15.3.24  Lua Format Strings</A></H3>
-
-<P>
-Lua format strings are described in the Lua reference manual, section String Manipulation,
-<A HREF="http://www.lua.org/manual/5.1/manual.html#pdf-string.format">http://www.lua.org/manual/5.1/manual.html#pdf-string.format</A>.
-
-</P>
-
-
-<H3><A NAME="SEC275" HREF="gettext_toc.html#TOC275">15.3.25  JavaScript Format Strings</A></H3>
-
-<P>
-Although JavaScript specification itself does not define any format
-strings, many JavaScript implementations provide printf-like
-functions.  <CODE>xgettext</CODE> understands a set of common format strings
-used in popular JavaScript implementations including Gjs, Seed, and
-Node.JS.  In such a format string, a directive starts with <SAMP>&lsquo;%&rsquo;</SAMP>
-and is finished by a specifier: <SAMP>&lsquo;%&rsquo;</SAMP> denotes a literal percent
-sign, <SAMP>&lsquo;c&rsquo;</SAMP> denotes a character, <SAMP>&lsquo;s&rsquo;</SAMP> denotes a string,
-<SAMP>&lsquo;b&rsquo;</SAMP>, <SAMP>&lsquo;d&rsquo;</SAMP>, <SAMP>&lsquo;o&rsquo;</SAMP>, <SAMP>&lsquo;x&rsquo;</SAMP>, <SAMP>&lsquo;X&rsquo;</SAMP> denote an integer,
-<SAMP>&lsquo;f&rsquo;</SAMP> denotes floating-point number, <SAMP>&lsquo;j&rsquo;</SAMP> denotes a JSON
-object.
-
-</P>
-
-
-
-<H2><A NAME="SEC276" HREF="gettext_toc.html#TOC276">15.4  The Maintainer's View</A></H2>
+<H2><A NAME="SEC272" HREF="gettext_toc.html#TOC272">15.4  The Maintainer's View</A></H2>
 
 <P>
 For the maintainer, the general procedure differs from the C language
@@ -572,7 +533,7 @@
 <LI>
 
 If only a single programming language is used, the <CODE>XGETTEXT_OPTIONS</CODE>
-variable in <TT>&lsquo;po/Makevars&rsquo;</TT> (see section <A HREF="gettext_13.html#SEC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>) should be adjusted to
+variable in <TT>&lsquo;po/Makevars&rsquo;</TT> (see section <A HREF="gettext_13.html#SEC218">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>) should be adjusted to
 match the <CODE>xgettext</CODE> options for that particular programming language.
 If the package uses more than one programming language with <CODE>gettext</CODE>
 support, it becomes necessary to change the POT file construction rule
@@ -583,13 +544,13 @@
 
 
 
-<H2><A NAME="SEC277" HREF="gettext_toc.html#TOC277">15.5  Individual Programming Languages</A></H2>
+<H2><A NAME="SEC273" HREF="gettext_toc.html#TOC273">15.5  Individual Programming Languages</A></H2>
 
 
 
-<H3><A NAME="SEC278" HREF="gettext_toc.html#TOC278">15.5.1  C, C++, Objective C</A></H3>
+<H3><A NAME="SEC274" HREF="gettext_toc.html#TOC274">15.5.1  C, C++, Objective C</A></H3>
 <P>
-<A NAME="IDX1204"></A>
+<A NAME="IDX1174"></A>
 
 </P>
 <DL COMPACT>
@@ -667,9 +628,9 @@
 </P>
 
 
-<H3><A NAME="SEC279" HREF="gettext_toc.html#TOC279">15.5.2  sh - Shell Script</A></H3>
+<H3><A NAME="SEC275" HREF="gettext_toc.html#TOC275">15.5.2  sh - Shell Script</A></H3>
 <P>
-<A NAME="IDX1205"></A>
+<A NAME="IDX1175"></A>
 
 </P>
 <DL COMPACT>
@@ -692,19 +653,19 @@
 
 <DT>gettext/ngettext functions
 <DD>
-<A NAME="IDX1206"></A>
-<A NAME="IDX1207"></A>
+<A NAME="IDX1176"></A>
+<A NAME="IDX1177"></A>
 <CODE>gettext</CODE>, <CODE>ngettext</CODE> programs
 <BR><CODE>eval_gettext</CODE>, <CODE>eval_ngettext</CODE> shell functions
 
 <DT>textdomain
 <DD>
-<A NAME="IDX1208"></A>
+<A NAME="IDX1178"></A>
 environment variable <CODE>TEXTDOMAIN</CODE>
 
 <DT>bindtextdomain
 <DD>
-<A NAME="IDX1209"></A>
+<A NAME="IDX1179"></A>
 environment variable <CODE>TEXTDOMAINDIR</CODE>
 
 <DT>setlocale
@@ -743,9 +704,9 @@
 
 
 
-<H4><A NAME="SEC280" HREF="gettext_toc.html#TOC280">15.5.2.1  Preparing Shell Scripts for Internationalization</A></H4>
+<H4><A NAME="SEC276" HREF="gettext_toc.html#TOC276">15.5.2.1  Preparing Shell Scripts for Internationalization</A></H4>
 <P>
-<A NAME="IDX1210"></A>
+<A NAME="IDX1180"></A>
 
 </P>
 <P>
@@ -767,8 +728,8 @@
 
 near the top of the script.  <CODE>gettext.sh</CODE> is a shell function library
 that provides the functions
-<CODE>eval_gettext</CODE> (see section <A HREF="gettext_15.html#SEC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>) and
-<CODE>eval_ngettext</CODE> (see section <A HREF="gettext_15.html#SEC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>).
+<CODE>eval_gettext</CODE> (see section <A HREF="gettext_15.html#SEC281">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>) and
+<CODE>eval_ngettext</CODE> (see section <A HREF="gettext_15.html#SEC282">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>).
 You have to ensure that <CODE>gettext.sh</CODE> can be found in the <CODE>PATH</CODE>.
 
 <LI>
@@ -883,7 +844,7 @@
 
 
 
-<H4><A NAME="SEC281" HREF="gettext_toc.html#TOC281">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A></H4>
+<H4><A NAME="SEC277" HREF="gettext_toc.html#TOC277">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A></H4>
 
 <P>
 <CODE>gettext.sh</CODE>, contained in the run-time package of GNU gettext, provides
@@ -899,20 +860,20 @@
 
 <LI>eval_gettext
 
-See section <A HREF="gettext_15.html#SEC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>.
+See section <A HREF="gettext_15.html#SEC281">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>.
 
 <LI>eval_ngettext
 
-See section <A HREF="gettext_15.html#SEC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>.
+See section <A HREF="gettext_15.html#SEC282">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>.
 </UL>
 
 
 
-<H4><A NAME="SEC282" HREF="gettext_toc.html#TOC282">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A></H4>
+<H4><A NAME="SEC278" HREF="gettext_toc.html#TOC278">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A></H4>
 
 <P>
-<A NAME="IDX1211"></A>
-<A NAME="IDX1212"></A>
+<A NAME="IDX1181"></A>
+<A NAME="IDX1182"></A>
 
 <PRE>
 gettext [<VAR>option</VAR>] [[<VAR>textdomain</VAR>] <VAR>msgid</VAR>]
@@ -920,7 +881,7 @@
 </PRE>
 
 <P>
-<A NAME="IDX1213"></A>
+<A NAME="IDX1183"></A>
 The <CODE>gettext</CODE> program displays the native language translation of a
 textual message.
 
@@ -935,14 +896,14 @@
 <DD>
 <DT><SAMP>&lsquo;--domain=<VAR>textdomain</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1214"></A>
-<A NAME="IDX1215"></A>
+<A NAME="IDX1184"></A>
+<A NAME="IDX1185"></A>
 Retrieve translated messages from <VAR>textdomain</VAR>.  Usually a <VAR>textdomain</VAR>
 corresponds to a package, a program, or a module of a program.
 
 <DT><SAMP>&lsquo;-e&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1216"></A>
+<A NAME="IDX1186"></A>
 Enable expansion of some escape sequences.  This option is for compatibility
 with the <SAMP>&lsquo;echo&rsquo;</SAMP> program or shell built-in.  The escape sequences
 <SAMP>&lsquo;\a&rsquo;</SAMP>, <SAMP>&lsquo;\b&rsquo;</SAMP>, <SAMP>&lsquo;\c&rsquo;</SAMP>, <SAMP>&lsquo;\f&rsquo;</SAMP>, <SAMP>&lsquo;\n&rsquo;</SAMP>, <SAMP>&lsquo;\r&rsquo;</SAMP>, <SAMP>&lsquo;\t&rsquo;</SAMP>,
@@ -951,7 +912,7 @@
 
 <DT><SAMP>&lsquo;-E&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1217"></A>
+<A NAME="IDX1187"></A>
 This option is only for compatibility with the <SAMP>&lsquo;echo&rsquo;</SAMP> program or shell
 built-in.  It has no effect.
 
@@ -959,13 +920,13 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1218"></A>
-<A NAME="IDX1219"></A>
+<A NAME="IDX1188"></A>
+<A NAME="IDX1189"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1220"></A>
+<A NAME="IDX1190"></A>
 Suppress trailing newline.  By default, <CODE>gettext</CODE> adds a newline to
 the output.
 
@@ -973,8 +934,8 @@
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1221"></A>
-<A NAME="IDX1222"></A>
+<A NAME="IDX1191"></A>
+<A NAME="IDX1192"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;[<VAR>textdomain</VAR>] <VAR>msgid</VAR>&rsquo;</SAMP>
@@ -1004,18 +965,18 @@
 </P>
 
 
-<H4><A NAME="SEC283" HREF="gettext_toc.html#TOC283">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A></H4>
+<H4><A NAME="SEC279" HREF="gettext_toc.html#TOC279">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A></H4>
 
 <P>
-<A NAME="IDX1223"></A>
-<A NAME="IDX1224"></A>
+<A NAME="IDX1193"></A>
+<A NAME="IDX1194"></A>
 
 <PRE>
 ngettext [<VAR>option</VAR>] [<VAR>textdomain</VAR>] <VAR>msgid</VAR> <VAR>msgid-plural</VAR> <VAR>count</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX1225"></A>
+<A NAME="IDX1195"></A>
 The <CODE>ngettext</CODE> program displays the native language translation of a
 textual message whose grammatical form depends on a number.
 
@@ -1030,14 +991,14 @@
 <DD>
 <DT><SAMP>&lsquo;--domain=<VAR>textdomain</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1226"></A>
-<A NAME="IDX1227"></A>
+<A NAME="IDX1196"></A>
+<A NAME="IDX1197"></A>
 Retrieve translated messages from <VAR>textdomain</VAR>.  Usually a <VAR>textdomain</VAR>
 corresponds to a package, a program, or a module of a program.
 
 <DT><SAMP>&lsquo;-e&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1228"></A>
+<A NAME="IDX1198"></A>
 Enable expansion of some escape sequences.  This option is for compatibility
 with the <SAMP>&lsquo;gettext&rsquo;</SAMP> program.  The escape sequences
 <SAMP>&lsquo;\a&rsquo;</SAMP>, <SAMP>&lsquo;\b&rsquo;</SAMP>, <SAMP>&lsquo;\c&rsquo;</SAMP>, <SAMP>&lsquo;\f&rsquo;</SAMP>, <SAMP>&lsquo;\n&rsquo;</SAMP>, <SAMP>&lsquo;\r&rsquo;</SAMP>, <SAMP>&lsquo;\t&rsquo;</SAMP>,
@@ -1046,7 +1007,7 @@
 
 <DT><SAMP>&lsquo;-E&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1229"></A>
+<A NAME="IDX1199"></A>
 This option is only for compatibility with the <SAMP>&lsquo;gettext&rsquo;</SAMP> program.  It has
 no effect.
 
@@ -1054,16 +1015,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1230"></A>
-<A NAME="IDX1231"></A>
+<A NAME="IDX1200"></A>
+<A NAME="IDX1201"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1232"></A>
-<A NAME="IDX1233"></A>
+<A NAME="IDX1202"></A>
+<A NAME="IDX1203"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;<VAR>textdomain</VAR>&rsquo;</SAMP>
@@ -1095,20 +1056,20 @@
 </P>
 
 
-<H4><A NAME="SEC284" HREF="gettext_toc.html#TOC284">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A></H4>
+<H4><A NAME="SEC280" HREF="gettext_toc.html#TOC280">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A></H4>
 
 <P>
-<A NAME="IDX1234"></A>
-<A NAME="IDX1235"></A>
+<A NAME="IDX1204"></A>
+<A NAME="IDX1205"></A>
 
 <PRE>
 envsubst [<VAR>option</VAR>] [<VAR>shell-format</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX1236"></A>
-<A NAME="IDX1237"></A>
-<A NAME="IDX1238"></A>
+<A NAME="IDX1206"></A>
+<A NAME="IDX1207"></A>
+<A NAME="IDX1208"></A>
 The <CODE>envsubst</CODE> program substitutes the values of environment variables.
 
 </P>
@@ -1122,8 +1083,8 @@
 <DD>
 <DT><SAMP>&lsquo;--variables&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1239"></A>
-<A NAME="IDX1240"></A>
+<A NAME="IDX1209"></A>
+<A NAME="IDX1210"></A>
 Output the variables occurring in <VAR>shell-format</VAR>.
 
 </DL>
@@ -1138,16 +1099,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1241"></A>
-<A NAME="IDX1242"></A>
+<A NAME="IDX1211"></A>
+<A NAME="IDX1212"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1243"></A>
-<A NAME="IDX1244"></A>
+<A NAME="IDX1213"></A>
+<A NAME="IDX1214"></A>
 Output version information and exit.
 
 </DL>
@@ -1177,17 +1138,17 @@
 </P>
 
 
-<H4><A NAME="SEC285" HREF="gettext_toc.html#TOC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A></H4>
+<H4><A NAME="SEC281" HREF="gettext_toc.html#TOC281">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A></H4>
 
 <P>
-<A NAME="IDX1245"></A>
+<A NAME="IDX1215"></A>
 
 <PRE>
 eval_gettext <VAR>msgid</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX1246"></A>
+<A NAME="IDX1216"></A>
 This function outputs the native language translation of a textual message,
 performing dollar-substitution on the result.  Note that only shell variables
 mentioned in <VAR>msgid</VAR> will be dollar-substituted in the result.
@@ -1195,17 +1156,17 @@
 </P>
 
 
-<H4><A NAME="SEC286" HREF="gettext_toc.html#TOC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A></H4>
+<H4><A NAME="SEC282" HREF="gettext_toc.html#TOC282">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A></H4>
 
 <P>
-<A NAME="IDX1247"></A>
+<A NAME="IDX1217"></A>
 
 <PRE>
 eval_ngettext <VAR>msgid</VAR> <VAR>msgid-plural</VAR> <VAR>count</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX1248"></A>
+<A NAME="IDX1218"></A>
 This function outputs the native language translation of a textual message
 whose grammatical form depends on a number, performing dollar-substitution
 on the result.  Note that only shell variables mentioned in <VAR>msgid</VAR> or
@@ -1214,9 +1175,9 @@
 </P>
 
 
-<H3><A NAME="SEC287" HREF="gettext_toc.html#TOC287">15.5.3  bash - Bourne-Again Shell Script</A></H3>
+<H3><A NAME="SEC283" HREF="gettext_toc.html#TOC283">15.5.3  bash - Bourne-Again Shell Script</A></H3>
 <P>
-<A NAME="IDX1249"></A>
+<A NAME="IDX1219"></A>
 
 </P>
 <P>
@@ -1265,9 +1226,9 @@
 </P>
 
 
-<H3><A NAME="SEC288" HREF="gettext_toc.html#TOC288">15.5.4  Python</A></H3>
+<H3><A NAME="SEC284" HREF="gettext_toc.html#TOC284">15.5.4  Python</A></H3>
 <P>
-<A NAME="IDX1250"></A>
+<A NAME="IDX1220"></A>
 
 </P>
 <DL COMPACT>
@@ -1379,11 +1340,11 @@
 
 
 
-<H3><A NAME="SEC289" HREF="gettext_toc.html#TOC289">15.5.5  GNU clisp - Common Lisp</A></H3>
+<H3><A NAME="SEC285" HREF="gettext_toc.html#TOC285">15.5.5  GNU clisp - Common Lisp</A></H3>
 <P>
-<A NAME="IDX1251"></A>
-<A NAME="IDX1252"></A>
-<A NAME="IDX1253"></A>
+<A NAME="IDX1221"></A>
+<A NAME="IDX1222"></A>
+<A NAME="IDX1223"></A>
 
 </P>
 <DL COMPACT>
@@ -1451,9 +1412,9 @@
 </P>
 
 
-<H3><A NAME="SEC290" HREF="gettext_toc.html#TOC290">15.5.6  GNU clisp C sources</A></H3>
+<H3><A NAME="SEC286" HREF="gettext_toc.html#TOC286">15.5.6  GNU clisp C sources</A></H3>
 <P>
-<A NAME="IDX1254"></A>
+<A NAME="IDX1224"></A>
 
 </P>
 <DL COMPACT>
@@ -1519,9 +1480,9 @@
 
 
 
-<H3><A NAME="SEC291" HREF="gettext_toc.html#TOC291">15.5.7  Emacs Lisp</A></H3>
+<H3><A NAME="SEC287" HREF="gettext_toc.html#TOC287">15.5.7  Emacs Lisp</A></H3>
 <P>
-<A NAME="IDX1255"></A>
+<A NAME="IDX1225"></A>
 
 </P>
 <DL COMPACT>
@@ -1585,9 +1546,9 @@
 
 
 
-<H3><A NAME="SEC292" HREF="gettext_toc.html#TOC292">15.5.8  librep</A></H3>
+<H3><A NAME="SEC288" HREF="gettext_toc.html#TOC288">15.5.8  librep</A></H3>
 <P>
-<A NAME="IDX1256"></A>
+<A NAME="IDX1226"></A>
 
 </P>
 <DL COMPACT>
@@ -1655,10 +1616,10 @@
 </P>
 
 
-<H3><A NAME="SEC293" HREF="gettext_toc.html#TOC293">15.5.9  GNU guile - Scheme</A></H3>
+<H3><A NAME="SEC289" HREF="gettext_toc.html#TOC289">15.5.9  GNU guile - Scheme</A></H3>
 <P>
-<A NAME="IDX1257"></A>
-<A NAME="IDX1258"></A>
+<A NAME="IDX1227"></A>
+<A NAME="IDX1228"></A>
 
 </P>
 <DL COMPACT>
@@ -1677,7 +1638,7 @@
 
 <DT>gettext shorthand
 <DD>
-<CODE>(_ "abc")</CODE>, <CODE>_"abc"</CODE> (GIMP script-fu extension)
+<CODE>(_ "abc")</CODE>
 
 <DT>gettext/ngettext functions
 <DD>
@@ -1726,9 +1687,9 @@
 </P>
 
 
-<H3><A NAME="SEC294" HREF="gettext_toc.html#TOC294">15.5.10  GNU Smalltalk</A></H3>
+<H3><A NAME="SEC290" HREF="gettext_toc.html#TOC290">15.5.10  GNU Smalltalk</A></H3>
 <P>
-<A NAME="IDX1259"></A>
+<A NAME="IDX1229"></A>
 
 </P>
 <DL COMPACT>
@@ -1799,9 +1760,9 @@
 </P>
 
 
-<H3><A NAME="SEC295" HREF="gettext_toc.html#TOC295">15.5.11  Java</A></H3>
+<H3><A NAME="SEC291" HREF="gettext_toc.html#TOC291">15.5.11  Java</A></H3>
 <P>
-<A NAME="IDX1260"></A>
+<A NAME="IDX1230"></A>
 
 </P>
 <DL COMPACT>
@@ -1935,7 +1896,7 @@
 handling and the <CODE>pgettext</CODE> and <CODE>npgettext</CODE> for strings constraint
 to a particular context.
 
-<A NAME="IDX1261"></A>
+<A NAME="IDX1231"></A>
 To use this API, one needs the <CODE>libintl.jar</CODE> file which is part of
 the GNU gettext package and distributed under the LGPL.
 </OL>
@@ -2042,9 +2003,9 @@
 </P>
 
 
-<H3><A NAME="SEC296" HREF="gettext_toc.html#TOC296">15.5.12  C#</A></H3>
+<H3><A NAME="SEC292" HREF="gettext_toc.html#TOC292">15.5.12  C#</A></H3>
 <P>
-<A NAME="IDX1262"></A>
+<A NAME="IDX1232"></A>
 
 </P>
 <DL COMPACT>
@@ -2283,7 +2244,7 @@
 specific to a particular context, with plural handling, like the
 <CODE>npgettext</CODE> function in C.
 
-<A NAME="IDX1263"></A>
+<A NAME="IDX1233"></A>
 To use this API, one needs the <CODE>GNU.Gettext.dll</CODE> file which is part of
 the GNU gettext package and distributed under the LGPL.
 </OL>
@@ -2368,10 +2329,10 @@
 </P>
 
 
-<H3><A NAME="SEC297" HREF="gettext_toc.html#TOC297">15.5.13  GNU awk</A></H3>
+<H3><A NAME="SEC293" HREF="gettext_toc.html#TOC293">15.5.13  GNU awk</A></H3>
 <P>
-<A NAME="IDX1264"></A>
-<A NAME="IDX1265"></A>
+<A NAME="IDX1234"></A>
+<A NAME="IDX1235"></A>
 
 </P>
 <DL COMPACT>
@@ -2441,11 +2402,11 @@
 </P>
 
 
-<H3><A NAME="SEC298" HREF="gettext_toc.html#TOC298">15.5.14  Pascal - Free Pascal Compiler</A></H3>
+<H3><A NAME="SEC294" HREF="gettext_toc.html#TOC294">15.5.14  Pascal - Free Pascal Compiler</A></H3>
 <P>
-<A NAME="IDX1266"></A>
-<A NAME="IDX1267"></A>
-<A NAME="IDX1268"></A>
+<A NAME="IDX1236"></A>
+<A NAME="IDX1237"></A>
+<A NAME="IDX1238"></A>
 
 </P>
 <DL COMPACT>
@@ -2522,9 +2483,9 @@
 </P>
 
 
-<H3><A NAME="SEC299" HREF="gettext_toc.html#TOC299">15.5.15  wxWidgets library</A></H3>
+<H3><A NAME="SEC295" HREF="gettext_toc.html#TOC295">15.5.15  wxWidgets library</A></H3>
 <P>
-<A NAME="IDX1269"></A>
+<A NAME="IDX1239"></A>
 
 </P>
 <DL COMPACT>
@@ -2590,10 +2551,10 @@
 
 
 
-<H3><A NAME="SEC300" HREF="gettext_toc.html#TOC300">15.5.16  YCP - YaST2 scripting language</A></H3>
+<H3><A NAME="SEC296" HREF="gettext_toc.html#TOC296">15.5.16  YCP - YaST2 scripting language</A></H3>
 <P>
-<A NAME="IDX1270"></A>
-<A NAME="IDX1271"></A>
+<A NAME="IDX1240"></A>
+<A NAME="IDX1241"></A>
 
 </P>
 <DL COMPACT>
@@ -2661,10 +2622,10 @@
 </P>
 
 
-<H3><A NAME="SEC301" HREF="gettext_toc.html#TOC301">15.5.17  Tcl - Tk's scripting language</A></H3>
+<H3><A NAME="SEC297" HREF="gettext_toc.html#TOC297">15.5.17  Tcl - Tk's scripting language</A></H3>
 <P>
-<A NAME="IDX1272"></A>
-<A NAME="IDX1273"></A>
+<A NAME="IDX1242"></A>
+<A NAME="IDX1243"></A>
 
 </P>
 <DL COMPACT>
@@ -2747,9 +2708,9 @@
 </P>
 
 
-<H3><A NAME="SEC302" HREF="gettext_toc.html#TOC302">15.5.18  Perl</A></H3>
+<H3><A NAME="SEC298" HREF="gettext_toc.html#TOC298">15.5.18  Perl</A></H3>
 <P>
-<A NAME="IDX1274"></A>
+<A NAME="IDX1244"></A>
 
 </P>
 <DL COMPACT>
@@ -2760,7 +2721,7 @@
 
 <DT>File extension
 <DD>
-<CODE>pl</CODE>, <CODE>PL</CODE>, <CODE>pm</CODE>, <CODE>perl</CODE>, <CODE>cgi</CODE>
+<CODE>pl</CODE>, <CODE>PL</CODE>, <CODE>pm</CODE>, <CODE>cgi</CODE>
 
 <DT>String syntax
 <DD>
@@ -2862,7 +2823,7 @@
 
 </P>
 <P>
-<A NAME="IDX1275"></A>
+<A NAME="IDX1245"></A>
 
 </P>
 <P>
@@ -2877,7 +2838,7 @@
 
 
 
-<H4><A NAME="SEC303" HREF="gettext_toc.html#TOC303">15.5.18.1  General Problems Parsing Perl Code</A></H4>
+<H4><A NAME="SEC299" HREF="gettext_toc.html#TOC299">15.5.18.1  General Problems Parsing Perl Code</A></H4>
 
 <P>
 It is often heard that only Perl can parse Perl.  This is not true.
@@ -3082,9 +3043,9 @@
 </P>
 
 
-<H4><A NAME="SEC304" HREF="gettext_toc.html#TOC304">15.5.18.2  Which keywords will xgettext look for?</A></H4>
+<H4><A NAME="SEC300" HREF="gettext_toc.html#TOC300">15.5.18.2  Which keywords will xgettext look for?</A></H4>
 <P>
-<A NAME="IDX1276"></A>
+<A NAME="IDX1246"></A>
 
 </P>
 <P>
@@ -3131,9 +3092,9 @@
 
 
 
-<H4><A NAME="SEC305" HREF="gettext_toc.html#TOC305">15.5.18.3  How to Extract Hash Keys</A></H4>
+<H4><A NAME="SEC301" HREF="gettext_toc.html#TOC301">15.5.18.3  How to Extract Hash Keys</A></H4>
 <P>
-<A NAME="IDX1277"></A>
+<A NAME="IDX1247"></A>
 
 </P>
 <P>
@@ -3186,9 +3147,9 @@
 </P>
 
 
-<H4><A NAME="SEC306" HREF="gettext_toc.html#TOC306">15.5.18.4  What are Strings And Quote-like Expressions?</A></H4>
+<H4><A NAME="SEC302" HREF="gettext_toc.html#TOC302">15.5.18.4  What are Strings And Quote-like Expressions?</A></H4>
 <P>
-<A NAME="IDX1278"></A>
+<A NAME="IDX1248"></A>
 
 </P>
 <P>
@@ -3286,9 +3247,9 @@
 
 
 
-<H4><A NAME="SEC307" HREF="gettext_toc.html#TOC307">15.5.18.5  Invalid Uses Of String Interpolation</A></H4>
+<H4><A NAME="SEC303" HREF="gettext_toc.html#TOC303">15.5.18.5  Invalid Uses Of String Interpolation</A></H4>
 <P>
-<A NAME="IDX1279"></A>
+<A NAME="IDX1249"></A>
 
 </P>
 <P>
@@ -3424,9 +3385,9 @@
 </P>
 
 
-<H4><A NAME="SEC308" HREF="gettext_toc.html#TOC308">15.5.18.6  Valid Uses Of String Interpolation</A></H4>
+<H4><A NAME="SEC304" HREF="gettext_toc.html#TOC304">15.5.18.6  Valid Uses Of String Interpolation</A></H4>
 <P>
-<A NAME="IDX1280"></A>
+<A NAME="IDX1250"></A>
 
 </P>
 <P>
@@ -3512,9 +3473,9 @@
 
 
 
-<H4><A NAME="SEC309" HREF="gettext_toc.html#TOC309">15.5.18.7  When To Use Parentheses</A></H4>
+<H4><A NAME="SEC305" HREF="gettext_toc.html#TOC305">15.5.18.7  When To Use Parentheses</A></H4>
 <P>
-<A NAME="IDX1281"></A>
+<A NAME="IDX1251"></A>
 
 </P>
 <P>
@@ -3558,9 +3519,9 @@
 
 
 
-<H4><A NAME="SEC310" HREF="gettext_toc.html#TOC310">15.5.18.8  How To Grok with Long Lines</A></H4>
+<H4><A NAME="SEC306" HREF="gettext_toc.html#TOC306">15.5.18.8  How To Grok with Long Lines</A></H4>
 <P>
-<A NAME="IDX1282"></A>
+<A NAME="IDX1252"></A>
 
 </P>
 <P>
@@ -3632,9 +3593,9 @@
 </P>
 
 
-<H4><A NAME="SEC311" HREF="gettext_toc.html#TOC311">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A></H4>
+<H4><A NAME="SEC307" HREF="gettext_toc.html#TOC307">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A></H4>
 <P>
-<A NAME="IDX1283"></A>
+<A NAME="IDX1253"></A>
 
 </P>
 <P>
@@ -3784,9 +3745,9 @@
 </P>
 
 
-<H3><A NAME="SEC312" HREF="gettext_toc.html#TOC312">15.5.19  PHP Hypertext Preprocessor</A></H3>
+<H3><A NAME="SEC308" HREF="gettext_toc.html#TOC308">15.5.19  PHP Hypertext Preprocessor</A></H3>
 <P>
-<A NAME="IDX1284"></A>
+<A NAME="IDX1254"></A>
 
 </P>
 <DL COMPACT>
@@ -3855,9 +3816,9 @@
 </P>
 
 
-<H3><A NAME="SEC313" HREF="gettext_toc.html#TOC313">15.5.20  Pike</A></H3>
+<H3><A NAME="SEC309" HREF="gettext_toc.html#TOC309">15.5.20  Pike</A></H3>
 <P>
-<A NAME="IDX1285"></A>
+<A NAME="IDX1255"></A>
 
 </P>
 <DL COMPACT>
@@ -3921,9 +3882,9 @@
 
 
 
-<H3><A NAME="SEC314" HREF="gettext_toc.html#TOC314">15.5.21  GNU Compiler Collection sources</A></H3>
+<H3><A NAME="SEC310" HREF="gettext_toc.html#TOC310">15.5.21  GNU Compiler Collection sources</A></H3>
 <P>
-<A NAME="IDX1286"></A>
+<A NAME="IDX1256"></A>
 
 </P>
 <DL COMPACT>
@@ -3988,157 +3949,7 @@
 
 
 
-<H3><A NAME="SEC315" HREF="gettext_toc.html#TOC315">15.5.22  Lua</A></H3>
-
-<DL COMPACT>
-
-<DT>RPMs
-<DD>
-lua
-
-<DT>File extension
-<DD>
-<CODE>lua</CODE>
-
-<DT>String syntax
-<DD>
-
-<UL>
-
-<LI><CODE>"abc"</CODE>
-
-<LI><CODE>'abc'</CODE>
-
-<LI><CODE>[[abc]]</CODE>
-
-<LI><CODE>[=[abc]=]</CODE>
-
-<LI><CODE>[==[abc]==]</CODE>
-
-<LI>...
-
-</UL>
-
-<DT>gettext shorthand
-<DD>
-<CODE>_("abc")</CODE>
-
-<DT>gettext/ngettext functions
-<DD>
-<CODE>gettext.gettext</CODE>, <CODE>gettext.dgettext</CODE>, <CODE>gettext.dcgettext</CODE>,
-<CODE>gettext.ngettext</CODE>, <CODE>gettext.dngettext</CODE>, <CODE>gettext.dcngettext</CODE>
-
-<DT>textdomain
-<DD>
-<CODE>textdomain</CODE> function
-
-<DT>bindtextdomain
-<DD>
-<CODE>bindtextdomain</CODE> function
-
-<DT>setlocale
-<DD>
-automatic
-
-<DT>Prerequisite
-<DD>
-<CODE>require 'gettext'</CODE> or running lua interpreter with <CODE>-l gettext</CODE> option
-
-<DT>Use or emulate GNU gettext
-<DD>
-use
-
-<DT>Extractor
-<DD>
-<CODE>xgettext</CODE>
-
-<DT>Formatting with positions
-<DD>
----
-
-<DT>Portability
-<DD>
-On platforms without gettext, the functions are not available.
-
-<DT>po-mode marking
-<DD>
----
-</DL>
-
-
-
-<H3><A NAME="SEC316" HREF="gettext_toc.html#TOC316">15.5.23  JavaScript</A></H3>
-
-<DL COMPACT>
-
-<DT>RPMs
-<DD>
-js
-
-<DT>File extension
-<DD>
-<CODE>js</CODE>
-
-<DT>String syntax
-<DD>
-
-<UL>
-
-<LI><CODE>"abc"</CODE>
-
-<LI><CODE>'abc'</CODE>
-
-</UL>
-
-<DT>gettext shorthand
-<DD>
-<CODE>_("abc")</CODE>
-
-<DT>gettext/ngettext functions
-<DD>
-<CODE>gettext</CODE>, <CODE>dgettext</CODE>, <CODE>dcgettext</CODE>, <CODE>ngettext</CODE>,
-<CODE>dngettext</CODE>
-
-<DT>textdomain
-<DD>
-<CODE>textdomain</CODE> function
-
-<DT>bindtextdomain
-<DD>
-<CODE>bindtextdomain</CODE> function
-
-<DT>setlocale
-<DD>
-automatic
-
-<DT>Prerequisite
-<DD>
----
-
-<DT>Use or emulate GNU gettext
-<DD>
-use, or emulate
-
-<DT>Extractor
-<DD>
-<CODE>xgettext</CODE>
-
-<DT>Formatting with positions
-<DD>
----
-
-<DT>Portability
-<DD>
-On platforms without gettext, the functions are not available.
-
-<DT>po-mode marking
-<DD>
----
-</DL>
-
-
-
-<H2><A NAME="SEC317" HREF="gettext_toc.html#TOC317">15.6  Internationalizable Data</A></H2>
+<H2><A NAME="SEC311" HREF="gettext_toc.html#TOC311">15.6  Internationalizable Data</A></H2>
 
 <P>
 Here is a list of other data formats which can be internationalized
@@ -4148,7 +3959,7 @@
 
 
 
-<H3><A NAME="SEC318" HREF="gettext_toc.html#TOC318">15.6.1  POT - Portable Object Template</A></H3>
+<H3><A NAME="SEC312" HREF="gettext_toc.html#TOC312">15.6.1  POT - Portable Object Template</A></H3>
 
 <DL COMPACT>
 
@@ -4167,9 +3978,9 @@
 
 
 
-<H3><A NAME="SEC319" HREF="gettext_toc.html#TOC319">15.6.2  Resource String Table</A></H3>
+<H3><A NAME="SEC313" HREF="gettext_toc.html#TOC313">15.6.2  Resource String Table</A></H3>
 <P>
-<A NAME="IDX1287"></A>
+<A NAME="IDX1257"></A>
 
 </P>
 <DL COMPACT>
@@ -4189,7 +4000,7 @@
 
 
 
-<H3><A NAME="SEC320" HREF="gettext_toc.html#TOC320">15.6.3  Glade - GNOME user interface description</A></H3>
+<H3><A NAME="SEC314" HREF="gettext_toc.html#TOC314">15.6.3  Glade - GNOME user interface description</A></H3>
 
 <DL COMPACT>
 
@@ -4199,32 +4010,13 @@
 
 <DT>File extension
 <DD>
-<CODE>glade</CODE>, <CODE>glade2</CODE>, <CODE>ui</CODE>
+<CODE>glade</CODE>, <CODE>glade2</CODE>
 
 <DT>Extractor
 <DD>
 <CODE>xgettext</CODE>, <CODE>libglade-xgettext</CODE>, <CODE>xml-i18n-extract</CODE>, <CODE>intltool-extract</CODE>
 </DL>
 
-
-
-<H3><A NAME="SEC321" HREF="gettext_toc.html#TOC321">15.6.4  GSettings - GNOME user configuration schema</A></H3>
-
-<DL COMPACT>
-
-<DT>RPMs
-<DD>
-glib2
-
-<DT>File extension
-<DD>
-<CODE>gschema.xml</CODE>
-
-<DT>Extractor
-<DD>
-<CODE>xgettext</CODE>, <CODE>intltool-extract</CODE>
-</DL>
-
 <P><HR><P>
 Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_14.html">previous</A>, <A HREF="gettext_16.html">next</A>, <A HREF="gettext_25.html">last</A> section, <A HREF="gettext_toc.html">table of contents</A>.
 </BODY>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_16.html gettext-0.18.1.1/gettext-tools/doc/gettext_16.html
--- gettext-0.19.3/gettext-tools/doc/gettext_16.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_16.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 16  Concluding Remarks</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC322" HREF="gettext_toc.html#TOC322">16  Concluding Remarks</A></H1>
+<H1><A NAME="SEC315" HREF="gettext_toc.html#TOC315">16  Concluding Remarks</A></H1>
 
 <P>
 We would like to conclude this GNU <CODE>gettext</CODE> manual by presenting
@@ -23,9 +23,9 @@
 
 
 
-<H2><A NAME="SEC323" HREF="gettext_toc.html#TOC323">16.1  History of GNU <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC316" HREF="gettext_toc.html#TOC316">16.1  History of GNU <CODE>gettext</CODE></A></H2>
 <P>
-<A NAME="IDX1288"></A>
+<A NAME="IDX1258"></A>
 
 </P>
 <P>
@@ -125,10 +125,10 @@
 </P>
 
 
-<H2><A NAME="SEC324" HREF="gettext_toc.html#TOC324">16.2  Related Readings</A></H2>
+<H2><A NAME="SEC317" HREF="gettext_toc.html#TOC317">16.2  Related Readings</A></H2>
 <P>
-<A NAME="IDX1289"></A>
-<A NAME="IDX1290"></A>
+<A NAME="IDX1259"></A>
+<A NAME="IDX1260"></A>
 
 </P>
 <P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_17.html gettext-0.18.1.1/gettext-tools/doc/gettext_17.html
--- gettext-0.19.3/gettext-tools/doc/gettext_17.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_17.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - A  Language Codes</TITLE>
@@ -11,10 +11,10 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC325" HREF="gettext_toc.html#TOC325">A  Language Codes</A></H1>
+<H1><A NAME="SEC318" HREF="gettext_toc.html#TOC318">A  Language Codes</A></H1>
 <P>
-<A NAME="IDX1291"></A>
-<A NAME="IDX1292"></A>
+<A NAME="IDX1261"></A>
+<A NAME="IDX1262"></A>
 
 </P>
 <P>
@@ -27,7 +27,7 @@
 
 
 
-<H2><A NAME="SEC326" HREF="gettext_toc.html#TOC326">A.1  Usual Language Codes</A></H2>
+<H2><A NAME="SEC319" HREF="gettext_toc.html#TOC319">A.1  Usual Language Codes</A></H2>
 
 <P>
 For the commonly used languages, the ISO 639-1 standard defines two-letter
@@ -595,7 +595,7 @@
 
 
 
-<H2><A NAME="SEC327" HREF="gettext_toc.html#TOC327">A.2  Rare Language Codes</A></H2>
+<H2><A NAME="SEC320" HREF="gettext_toc.html#TOC320">A.2  Rare Language Codes</A></H2>
 
 <P>
 For rarely used languages, the ISO 639-2 standard defines three-letter
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_18.html gettext-0.18.1.1/gettext-tools/doc/gettext_18.html
--- gettext-0.19.3/gettext-tools/doc/gettext_18.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_18.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - B  Country Codes</TITLE>
@@ -11,10 +11,10 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC328" HREF="gettext_toc.html#TOC328">B  Country Codes</A></H1>
+<H1><A NAME="SEC321" HREF="gettext_toc.html#TOC321">B  Country Codes</A></H1>
 <P>
-<A NAME="IDX1293"></A>
-<A NAME="IDX1294"></A>
+<A NAME="IDX1263"></A>
+<A NAME="IDX1264"></A>
 
 </P>
 <P>
@@ -46,6 +46,9 @@
 <DT><SAMP>&lsquo;AM&rsquo;</SAMP>
 <DD>
 Armenia.
+<DT><SAMP>&lsquo;AN&rsquo;</SAMP>
+<DD>
+Netherlands Antilles.
 <DT><SAMP>&lsquo;AO&rsquo;</SAMP>
 <DD>
 Angola.
@@ -57,7 +60,7 @@
 Argentina.
 <DT><SAMP>&lsquo;AS&rsquo;</SAMP>
 <DD>
-American Samoa.
+Samoa (American).
 <DT><SAMP>&lsquo;AT&rsquo;</SAMP>
 <DD>
 Austria.
@@ -100,21 +103,15 @@
 <DT><SAMP>&lsquo;BJ&rsquo;</SAMP>
 <DD>
 Benin.
-<DT><SAMP>&lsquo;BL&rsquo;</SAMP>
-<DD>
-Saint Barthelemy.
 <DT><SAMP>&lsquo;BM&rsquo;</SAMP>
 <DD>
 Bermuda.
 <DT><SAMP>&lsquo;BN&rsquo;</SAMP>
 <DD>
-Brunei Darussalam.
+Brunei.
 <DT><SAMP>&lsquo;BO&rsquo;</SAMP>
 <DD>
-Bolivia, Plurinational State of.
-<DT><SAMP>&lsquo;BQ&rsquo;</SAMP>
-<DD>
-Bonaire, Sint Eustatius and Saba.
+Bolivia.
 <DT><SAMP>&lsquo;BR&rsquo;</SAMP>
 <DD>
 Brazil.
@@ -144,13 +141,13 @@
 Cocos (Keeling) Islands.
 <DT><SAMP>&lsquo;CD&rsquo;</SAMP>
 <DD>
-Congo, The Democratic Republic of the.
+Congo (Dem. Rep.).
 <DT><SAMP>&lsquo;CF&rsquo;</SAMP>
 <DD>
 Central African Republic.
 <DT><SAMP>&lsquo;CG&rsquo;</SAMP>
 <DD>
-Congo.
+Congo (Rep.).
 <DT><SAMP>&lsquo;CH&rsquo;</SAMP>
 <DD>
 Switzerland.
@@ -181,9 +178,6 @@
 <DT><SAMP>&lsquo;CV&rsquo;</SAMP>
 <DD>
 Cape Verde.
-<DT><SAMP>&lsquo;CW&rsquo;</SAMP>
-<DD>
-Curaçao.
 <DT><SAMP>&lsquo;CX&rsquo;</SAMP>
 <DD>
 Christmas Island.
@@ -240,13 +234,13 @@
 Fiji.
 <DT><SAMP>&lsquo;FK&rsquo;</SAMP>
 <DD>
-Falkland Islands (Malvinas).
+Falkland Islands.
 <DT><SAMP>&lsquo;FM&rsquo;</SAMP>
 <DD>
-Micronesia, Federated States of.
+Micronesia.
 <DT><SAMP>&lsquo;FO&rsquo;</SAMP>
 <DD>
-Faroe Islands.
+Faeroe Islands.
 <DT><SAMP>&lsquo;FR&rsquo;</SAMP>
 <DD>
 France.
@@ -255,7 +249,7 @@
 Gabon.
 <DT><SAMP>&lsquo;GB&rsquo;</SAMP>
 <DD>
-United Kingdom.
+Britain (United Kingdom).
 <DT><SAMP>&lsquo;GD&rsquo;</SAMP>
 <DD>
 Grenada.
@@ -348,7 +342,7 @@
 Iraq.
 <DT><SAMP>&lsquo;IR&rsquo;</SAMP>
 <DD>
-Iran, Islamic Republic of.
+Iran.
 <DT><SAMP>&lsquo;IS&rsquo;</SAMP>
 <DD>
 Iceland.
@@ -384,13 +378,13 @@
 Comoros.
 <DT><SAMP>&lsquo;KN&rsquo;</SAMP>
 <DD>
-Saint Kitts and Nevis.
+St Kitts and Nevis.
 <DT><SAMP>&lsquo;KP&rsquo;</SAMP>
 <DD>
-Korea, Democratic People's Republic of.
+Korea (North).
 <DT><SAMP>&lsquo;KR&rsquo;</SAMP>
 <DD>
-Korea, Republic of.
+Korea (South).
 <DT><SAMP>&lsquo;KW&rsquo;</SAMP>
 <DD>
 Kuwait.
@@ -402,13 +396,13 @@
 Kazakhstan.
 <DT><SAMP>&lsquo;LA&rsquo;</SAMP>
 <DD>
-Lao People's Democratic Republic.
+Laos.
 <DT><SAMP>&lsquo;LB&rsquo;</SAMP>
 <DD>
 Lebanon.
 <DT><SAMP>&lsquo;LC&rsquo;</SAMP>
 <DD>
-Saint Lucia.
+St Lucia.
 <DT><SAMP>&lsquo;LI&rsquo;</SAMP>
 <DD>
 Liechtenstein.
@@ -441,13 +435,10 @@
 Monaco.
 <DT><SAMP>&lsquo;MD&rsquo;</SAMP>
 <DD>
-Moldova, Republic of.
+Moldova.
 <DT><SAMP>&lsquo;ME&rsquo;</SAMP>
 <DD>
 Montenegro.
-<DT><SAMP>&lsquo;MF&rsquo;</SAMP>
-<DD>
-Saint Martin (French part).
 <DT><SAMP>&lsquo;MG&rsquo;</SAMP>
 <DD>
 Madagascar.
@@ -456,13 +447,13 @@
 Marshall Islands.
 <DT><SAMP>&lsquo;MK&rsquo;</SAMP>
 <DD>
-Macedonia, The Former Yugoslav Republic of.
+Macedonia.
 <DT><SAMP>&lsquo;ML&rsquo;</SAMP>
 <DD>
 Mali.
 <DT><SAMP>&lsquo;MM&rsquo;</SAMP>
 <DD>
-Myanmar.
+Myanmar (Burma).
 <DT><SAMP>&lsquo;MN&rsquo;</SAMP>
 <DD>
 Mongolia.
@@ -564,7 +555,7 @@
 Poland.
 <DT><SAMP>&lsquo;PM&rsquo;</SAMP>
 <DD>
-Saint Pierre and Miquelon.
+St Pierre and Miquelon.
 <DT><SAMP>&lsquo;PN&rsquo;</SAMP>
 <DD>
 Pitcairn.
@@ -573,7 +564,7 @@
 Puerto Rico.
 <DT><SAMP>&lsquo;PS&rsquo;</SAMP>
 <DD>
-Palestine, State of.
+Palestine.
 <DT><SAMP>&lsquo;PT&rsquo;</SAMP>
 <DD>
 Portugal.
@@ -597,7 +588,7 @@
 Serbia.
 <DT><SAMP>&lsquo;RU&rsquo;</SAMP>
 <DD>
-Russian Federation.
+Russia.
 <DT><SAMP>&lsquo;RW&rsquo;</SAMP>
 <DD>
 Rwanda.
@@ -621,7 +612,7 @@
 Singapore.
 <DT><SAMP>&lsquo;SH&rsquo;</SAMP>
 <DD>
-Saint Helena, Ascension and Tristan da Cunha.
+St Helena.
 <DT><SAMP>&lsquo;SI&rsquo;</SAMP>
 <DD>
 Slovenia.
@@ -646,21 +637,15 @@
 <DT><SAMP>&lsquo;SR&rsquo;</SAMP>
 <DD>
 Suriname.
-<DT><SAMP>&lsquo;SS&rsquo;</SAMP>
-<DD>
-South Sudan.
 <DT><SAMP>&lsquo;ST&rsquo;</SAMP>
 <DD>
 Sao Tome and Principe.
 <DT><SAMP>&lsquo;SV&rsquo;</SAMP>
 <DD>
 El Salvador.
-<DT><SAMP>&lsquo;SX&rsquo;</SAMP>
-<DD>
-Sint Maarten (Dutch part).
 <DT><SAMP>&lsquo;SY&rsquo;</SAMP>
 <DD>
-Syrian Arab Republic.
+Syria.
 <DT><SAMP>&lsquo;SZ&rsquo;</SAMP>
 <DD>
 Swaziland.
@@ -672,7 +657,7 @@
 Chad.
 <DT><SAMP>&lsquo;TF&rsquo;</SAMP>
 <DD>
-French Southern Territories.
+French Southern and Antarctic Lands.
 <DT><SAMP>&lsquo;TG&rsquo;</SAMP>
 <DD>
 Togo.
@@ -708,10 +693,10 @@
 Tuvalu.
 <DT><SAMP>&lsquo;TW&rsquo;</SAMP>
 <DD>
-Taiwan, Province of China.
+Taiwan.
 <DT><SAMP>&lsquo;TZ&rsquo;</SAMP>
 <DD>
-Tanzania, United Republic of.
+Tanzania.
 <DT><SAMP>&lsquo;UA&rsquo;</SAMP>
 <DD>
 Ukraine.
@@ -720,7 +705,7 @@
 Uganda.
 <DT><SAMP>&lsquo;UM&rsquo;</SAMP>
 <DD>
-United States Minor Outlying Islands.
+US minor outlying islands.
 <DT><SAMP>&lsquo;US&rsquo;</SAMP>
 <DD>
 United States.
@@ -732,22 +717,22 @@
 Uzbekistan.
 <DT><SAMP>&lsquo;VA&rsquo;</SAMP>
 <DD>
-Holy See (Vatican City State).
+Vatican City.
 <DT><SAMP>&lsquo;VC&rsquo;</SAMP>
 <DD>
-Saint Vincent and the Grenadines.
+St Vincent and the Grenadines.
 <DT><SAMP>&lsquo;VE&rsquo;</SAMP>
 <DD>
-Venezuela, Bolivarian Republic of.
+Venezuela.
 <DT><SAMP>&lsquo;VG&rsquo;</SAMP>
 <DD>
-Virgin Islands, British.
+Virgin Islands (UK).
 <DT><SAMP>&lsquo;VI&rsquo;</SAMP>
 <DD>
-Virgin Islands, U.S..
+Virgin Islands (US).
 <DT><SAMP>&lsquo;VN&rsquo;</SAMP>
 <DD>
-Viet Nam.
+Vietnam.
 <DT><SAMP>&lsquo;VU&rsquo;</SAMP>
 <DD>
 Vanuatu.
@@ -756,7 +741,7 @@
 Wallis and Futuna.
 <DT><SAMP>&lsquo;WS&rsquo;</SAMP>
 <DD>
-Samoa.
+Samoa (Western).
 <DT><SAMP>&lsquo;YE&rsquo;</SAMP>
 <DD>
 Yemen.
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_19.html gettext-0.18.1.1/gettext-tools/doc/gettext_19.html
--- gettext-0.19.3/gettext-tools/doc/gettext_19.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_19.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - C  Licenses</TITLE>
@@ -11,9 +11,9 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC329" HREF="gettext_toc.html#TOC329">C  Licenses</A></H1>
+<H1><A NAME="SEC322" HREF="gettext_toc.html#TOC322">C  Licenses</A></H1>
 <P>
-<A NAME="IDX1295"></A>
+<A NAME="IDX1265"></A>
 
 </P>
 <P>
@@ -26,14 +26,14 @@
 <LI>
 
 The <CODE>libintl</CODE> and <CODE>libasprintf</CODE> libraries are covered by the
-GNU Lesser General Public License (LGPL).  
-A copy of the license is included in section <A HREF="gettext_19.html#SEC331">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>.
+GNU Library General Public License (LGPL).  
+A copy of the license is included in section <A HREF="gettext_19.html#SEC326">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>.
 
 <LI>
 
 The executable programs of this package and the <CODE>libgettextpo</CODE> library
 are covered by the GNU General Public License (GPL).
-A copy of the license is included in section <A HREF="gettext_19.html#SEC330">C.1  GNU GENERAL PUBLIC LICENSE</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC323">C.1  GNU GENERAL PUBLIC LICENSE</A>.
 
 <LI>
 
@@ -47,21 +47,21 @@
 License, or (at your option) any later version published by the
 Free Software Foundation (FSF); with no Invariant Sections, with no
 Front-Cover Text, and with no Back-Cover Texts.
-A copy of the license is included in section <A HREF="gettext_19.html#SEC332">C.3  GNU Free Documentation License</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC329">C.3  GNU Free Documentation License</A>.
 <BR>
 This manual is covered by the GNU GPL.  You can redistribute it and/or
 modify it under the terms of the GNU General Public License (GPL), either
 version 2 of the License, or (at your option) any later version published
 by the Free Software Foundation (FSF).
-A copy of the license is included in section <A HREF="gettext_19.html#SEC330">C.1  GNU GENERAL PUBLIC LICENSE</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC323">C.1  GNU GENERAL PUBLIC LICENSE</A>.
 </UL>
 
 
 
-<H2><A NAME="SEC330" HREF="gettext_toc.html#TOC330">C.1  GNU GENERAL PUBLIC LICENSE</A></H2>
+<H2><A NAME="SEC323" HREF="gettext_toc.html#TOC323">C.1  GNU GENERAL PUBLIC LICENSE</A></H2>
 <P>
-<A NAME="IDX1296"></A>
-<A NAME="IDX1297"></A>
+<A NAME="IDX1266"></A>
+<A NAME="IDX1267"></A>
 Version 2, June 1991
 
 </P>
@@ -76,7 +76,8 @@
 </PRE>
 
 
-<H2>16.3  Preamble</H2>
+
+<H3><A NAME="SEC324" HREF="gettext_toc.html#TOC324">Preamble</A></H3>
 
 <P>
   The licenses for most software are designed to take away your
@@ -86,7 +87,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
 </P>
@@ -143,8 +144,6 @@
 
 </P>
 
-<H2>16.4  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H2>
-
 
 <OL>
 <LI>
@@ -409,7 +408,8 @@
 </OL>
 
 
-<H2>16.5  Appendix: How to Apply These Terms to Your New Programs</H2>
+
+<H3><A NAME="SEC325" HREF="gettext_toc.html#TOC325">Appendix: How to Apply These Terms to Your New Programs</A></H3>
 
 <P>
   If you develop a new program, and you want it to be of the greatest
@@ -455,7 +455,7 @@
 </P>
 
 <PRE>
-Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
+Gnomovision version 69, Copyright (C) 19<VAR>yy</VAR> <VAR>name of author</VAR>
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type `show c' for details.
@@ -488,22 +488,21 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
 
-<H2><A NAME="SEC331" HREF="gettext_toc.html#TOC331">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A></H2>
+<H2><A NAME="SEC326" HREF="gettext_toc.html#TOC326">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A></H2>
 <P>
-<A NAME="IDX1298"></A>
-<A NAME="IDX1299"></A>
+<A NAME="IDX1268"></A>
+<A NAME="IDX1269"></A>
 Version 2.1, February 1999
 
 </P>
 
-
 <PRE>
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+51 Franklin St -- Fifth Floor, Boston, MA 02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -514,7 +513,8 @@
 </PRE>
 
 
-<H3>16.5.1  Preamble</H3>
+
+<H3><A NAME="SEC327" HREF="gettext_toc.html#TOC327">Preamble</A></H3>
 
 <P>
   The licenses for most software are designed to take away your
@@ -647,8 +647,6 @@
 
 </P>
 
-<H3>16.5.2  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H3>
-
 
 <OL>
 <LI>
@@ -1029,8 +1027,6 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-<B>NO WARRANTY</B>
-
 <LI>
 
 BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
@@ -1058,10 +1054,8 @@
 </OL>
 
 
-<H3>16.5.3  END OF TERMS AND CONDITIONS</H3>
-
 
-<H3>16.5.4  How to Apply These Terms to Your New Libraries</H3>
+<H3><A NAME="SEC328" HREF="gettext_toc.html#TOC328">How to Apply These Terms to Your New Libraries</A></H3>
 
 <P>
   If you develop a new library, and you want it to be of the greatest
@@ -1122,18 +1116,17 @@
 That's all there is to it!
 
 
-<H2><A NAME="SEC332" HREF="gettext_toc.html#TOC332">C.3  GNU Free Documentation License</A></H2>
+<H2><A NAME="SEC329" HREF="gettext_toc.html#TOC329">C.3  GNU Free Documentation License</A></H2>
 <P>
-<A NAME="IDX1300"></A>
-<A NAME="IDX1301"></A>
+<A NAME="IDX1270"></A>
+<A NAME="IDX1271"></A>
 Version 1.2, November 2002
 
 </P>
 
-
 <PRE>
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -1223,15 +1216,15 @@
 
 Examples of suitable formats for Transparent copies include plain
 ASCII without markup, Texinfo input format, LaTeX input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML},
-PostScript or @acronym{PDF} designed for human modification.  Examples
-of transparent image formats include @acronym{PNG}, @acronym{XCF} and
-@acronym{JPG}.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
-@acronym{XML} for which the @acronym{DTD} and/or processing tools are
-not generally available, and the machine-generated @acronym{HTML},
-PostScript or @acronym{PDF} produced by some word processors for
+format, SGML or XML using a publicly available
+DTD, and standard-conforming simple HTML,
+PostScript or PDF designed for human modification.  Examples
+of transparent image formats include PNG, XCF and
+JPG.  Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, SGML or
+XML for which the DTD and/or processing tools are
+not generally available, and the machine-generated HTML,
+PostScript or PDF produced by some word processors for
 output purposes only.
 
 The “Title Page” means, for a printed book, the title page itself,
@@ -1562,7 +1555,8 @@
 </OL>
 
 
-<H2>16.6  ADDENDUM: How to use this License for your documents</H2>
+
+<H3><A NAME="SEC330" HREF="gettext_toc.html#TOC330">ADDENDUM: How to use this License for your documents</A></H3>
 
 <P>
 To use this License in a document you have written, include a copy of
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_1.html gettext-0.18.1.1/gettext-tools/doc/gettext_1.html
--- gettext-0.19.3/gettext-tools/doc/gettext_1.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_1.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 1  Introduction</TITLE>
@@ -174,7 +174,7 @@
 other English specific habits, and connected to generic ways of doing
 the same, instead.  Program developers may use various techniques to
 internationalize their programs.  Some of these have been standardized.
-GNU <CODE>gettext</CODE> offers one of these standards.  See section <A HREF="gettext_11.html#SEC179">11  The Programmer's View</A>.
+GNU <CODE>gettext</CODE> offers one of these standards.  See section <A HREF="gettext_11.html#SEC178">11  The Programmer's View</A>.
 
 </P>
 <P>
@@ -559,7 +559,7 @@
 See section <A HREF="gettext_5.html#SEC28">5.1  Invoking the <CODE>xgettext</CODE> Program</A>, for more details about how one calls the
 <CODE>xgettext</CODE> program.  If you are <EM>really</EM> lazy, you might
 be interested at working a lot more right away, and preparing the
-whole distribution setup (see section <A HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>).  By doing so, you
+whole distribution setup (see section <A HREF="gettext_13.html#SEC211">13  The Maintainer's View</A>).  By doing so, you
 spare yourself typing the <CODE>xgettext</CODE> command, as <CODE>make</CODE>
 should now generate the proper things automatically for you!
 
@@ -576,7 +576,7 @@
 itself is a whole matter, still exclusively meant for humans,
 and whose complexity far overwhelms the level of this manual.
 Nevertheless, a few hints are given in some other chapter of this
-manual (see section <A HREF="gettext_12.html#SEC199">12  The Translator's View</A>).  You will also find there indications
+manual (see section <A HREF="gettext_12.html#SEC198">12  The Translator's View</A>).  You will also find there indications
 about how to contact translating teams, or becoming part of them,
 for sharing your translating concerns with others who target the same
 native language.
@@ -675,7 +675,7 @@
 Once the PO file is complete and dependable, the <CODE>msgfmt</CODE> program
 is used for turning the PO file into a machine-oriented format, which
 may yield efficient retrieval of translations by the programs of the
-package, whenever needed at runtime (see section <A HREF="gettext_10.html#SEC178">10.3  The Format of GNU MO Files</A>).  See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, for more information about all modes of execution
+package, whenever needed at runtime (see section <A HREF="gettext_10.html#SEC177">10.3  The Format of GNU MO Files</A>).  See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, for more information about all modes of execution
 for the <CODE>msgfmt</CODE> program.
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_20.html gettext-0.18.1.1/gettext-tools/doc/gettext_20.html
--- gettext-0.19.3/gettext-tools/doc/gettext_20.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_20.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Program Index</TITLE>
@@ -11,14 +11,12 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC333" HREF="gettext_toc.html#TOC333">Program Index</A></H1>
+<H1><A NAME="SEC331" HREF="gettext_toc.html#TOC331">Program Index</A></H1>
 
 <P>
 Jump to:
 <A HREF="#pindex_a">a</A>
 -
-<A HREF="#pindex_b">b</A>
--
 <A HREF="#pindex_e">e</A>
 -
 <A HREF="#pindex_g">g</A>
@@ -27,61 +25,51 @@
 -
 <A HREF="#pindex_n">n</A>
 -
-<A HREF="#pindex_q">q</A>
--
 <A HREF="#pindex_r">r</A>
 -
 <A HREF="#pindex_x">x</A>
 <P>
 <H2><A NAME="pindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX1185">autopoint</A>
-</DIR>
-<H2><A NAME="pindex_b">b</A></H2>
-<DIR>
-<LI><A HREF="gettext_9.html#IDX714">boldquot</A>
+<LI><A HREF="gettext_13.html#IDX1155">autopoint</A>
 </DIR>
 <H2><A NAME="pindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1234">envsubst</A>
+<LI><A HREF="gettext_15.html#IDX1204">envsubst</A>
 </DIR>
 <H2><A NAME="pindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1206">gettext</A>, <A HREF="gettext_15.html#IDX1211">gettext</A>
-<LI><A HREF="gettext_13.html#IDX1147">gettextize</A>
+<LI><A HREF="gettext_15.html#IDX1176">gettext</A>, <A HREF="gettext_15.html#IDX1181">gettext</A>
+<LI><A HREF="gettext_13.html#IDX1117">gettextize</A>
 </DIR>
 <H2><A NAME="pindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX841">msgattrib</A>
-<LI><A HREF="gettext_9.html#IDX548">msgcat</A>
-<LI><A HREF="gettext_9.html#IDX823">msgcmp</A>
-<LI><A HREF="gettext_9.html#IDX781">msgcomm</A>
-<LI><A HREF="gettext_9.html#IDX596">msgconv</A>
-<LI><A HREF="gettext_9.html#IDX893">msgen</A>
-<LI><A HREF="gettext_9.html#IDX926">msgexec</A>
-<LI><A HREF="gettext_9.html#IDX685">msgfilter</A>
-<LI><A HREF="gettext_10.html#IDX967">msgfmt</A>
-<LI><A HREF="gettext_9.html#IDX630">msggrep</A>
-<LI><A HREF="gettext_6.html#IDX245">msginit</A>
-<LI><A HREF="gettext_7.html#IDX282">msgmerge</A>
-<LI><A HREF="gettext_10.html#IDX1039">msgunfmt</A>
-<LI><A HREF="gettext_9.html#IDX740">msguniq</A>
+<LI><A HREF="gettext_9.html#IDX828">msgattrib</A>
+<LI><A HREF="gettext_9.html#IDX542">msgcat</A>
+<LI><A HREF="gettext_9.html#IDX810">msgcmp</A>
+<LI><A HREF="gettext_9.html#IDX768">msgcomm</A>
+<LI><A HREF="gettext_9.html#IDX590">msgconv</A>
+<LI><A HREF="gettext_9.html#IDX878">msgen</A>
+<LI><A HREF="gettext_9.html#IDX911">msgexec</A>
+<LI><A HREF="gettext_9.html#IDX679">msgfilter</A>
+<LI><A HREF="gettext_10.html#IDX947">msgfmt</A>
+<LI><A HREF="gettext_9.html#IDX624">msggrep</A>
+<LI><A HREF="gettext_6.html#IDX239">msginit</A>
+<LI><A HREF="gettext_7.html#IDX276">msgmerge</A>
+<LI><A HREF="gettext_10.html#IDX1009">msgunfmt</A>
+<LI><A HREF="gettext_9.html#IDX727">msguniq</A>
 </DIR>
 <H2><A NAME="pindex_n">n</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1207">ngettext</A>, <A HREF="gettext_15.html#IDX1223">ngettext</A>
-</DIR>
-<H2><A NAME="pindex_q">q</A></H2>
-<DIR>
-<LI><A HREF="gettext_9.html#IDX713">quot</A>
+<LI><A HREF="gettext_15.html#IDX1177">ngettext</A>, <A HREF="gettext_15.html#IDX1193">ngettext</A>
 </DIR>
 <H2><A NAME="pindex_r">r</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX711">recode-sr-latin</A>
+<LI><A HREF="gettext_9.html#IDX700">recode-sr-latin</A>
 </DIR>
 <H2><A NAME="pindex_x">x</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX165">xgettext</A>
+<LI><A HREF="gettext_5.html#IDX159">xgettext</A>
 </DIR>
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_21.html gettext-0.18.1.1/gettext-tools/doc/gettext_21.html
--- gettext-0.19.3/gettext-tools/doc/gettext_21.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_21.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Option Index</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC334" HREF="gettext_toc.html#TOC334">Option Index</A></H1>
+<H1><A NAME="SEC332" HREF="gettext_toc.html#TOC332">Option Index</A></H1>
 
 <P>
 Jump to:
@@ -19,597 +19,587 @@
 <P>
 <H2><A NAME="opindex_-">-</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX189">--add-comments, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX877">--add-location, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX579">--add-location, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX806">--add-location, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX614">--add-location, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX910">--add-location, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX724">--add-location, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX671">--add-location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX312">--add-location, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX765">--add-location, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX217">--add-location, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1029">--alignment, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX293">--backup, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX206">--boost, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX182">--c++, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1013">--check, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1021">--check-accelerators, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1019">--check-compatibility, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1017">--check-domain, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1014">--check-format, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1016">--check-header, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX857">--clear-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX859">--clear-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX861">--clear-previous, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX870">--color, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX572">--color, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX950">--color, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX799">--color, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX608">--color, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX904">--color, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX718">--color, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX666">--color, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX259">--color, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX306">--color, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1065">--color, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX758">--color, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX210">--color, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX648">--comment, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX287">--compendium, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX231">--copyright-holder, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX976">--csharp, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1045">--csharp, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX978">--csharp-resources, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1047">--csharp-resources, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX208">--debug, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX172">--default-domain, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX984">--desktop, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX846">--directory, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX555">--directory, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX827">--directory, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX787">--directory, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX600">--directory, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX897">--directory, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX942">--directory, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX699">--directory, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX971">--directory, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX634">--directory, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX285">--directory, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX745">--directory, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX170">--directory, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1215">--domain, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX640">--domain, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1227">--domain, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1190">--dry-run, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1156">--dry-run, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX862">--empty, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1030">--endianness, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX187">--exclude-file, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX705">--expression, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX652">--extended-regexp, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX191">--extract-all, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX650">--extracted-comment, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX707">--file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX658">--file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX553">--files-from, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX785">--files-from, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX168">--files-from, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX654">--fixed-strings, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX196">--flag, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1188">--force, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1150">--force, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX872">--force-po, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX574">--force-po, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX801">--force-po, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX610">--force-po, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX906">--force-po, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX720">--force-po, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX668">--force-po, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX308">--force-po, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1067">--force-po, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX760">--force-po, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX212">--force-po, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX232">--foreign-user, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX183">--from-code, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX865">--fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1191">--help, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1242">--help, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1219">--help, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1157">--help, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX890">--help, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX593">--help, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX838">--help, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX820">--help, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX627">--help, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX923">--help, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX947">--help, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX737">--help, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1033">--help, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX682">--help, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX268">--help, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX326">--help, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1081">--help, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX778">--help, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1231">--help, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX241">--help, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX660">--ignore-case, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX864">--ignore-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX874">--indent, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX576">--indent, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX803">--indent, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX612">--indent, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX908">--indent, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX721">--indent, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX669">--indent, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX310">--indent, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1069">--indent, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX762">--indent, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX214">--indent, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX940">--input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX697">--input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX250">--input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1151">--intl, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX662">--invert-match, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX973">--java, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1043">--java, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX975">--java2, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX185">--join-existing, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX204">--kde, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX722">--keep-header, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1005">--keyword, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX193">--keyword, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX571">--lang, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX903">--lang, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX305">--lang, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX179">--language, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX560">--less-than, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX791">--less-than, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX992">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX998">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1001">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1007">--locale, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX257">--locale, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1054">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1058">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1061">--locale, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX638">--location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX562">--more-than, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX793">--more-than, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX642">--msgctxt, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX644">--msgid, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX235">--msgid-bugs-address, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX646">--msgstr, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX237">--msgstr-prefix, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX239">--msgstr-suffix, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX829">--multi-domain, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX298">--multi-domain, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1153">--no-changelog, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX851">--no-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX831">--no-fuzzy-matching, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX300">--no-fuzzy-matching, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1031">--no-hash, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX875">--no-location, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX577">--no-location, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX804">--no-location, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX613">--no-location, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX909">--no-location, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX723">--no-location, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX670">--no-location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX311">--no-location, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX763">--no-location, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX215">--no-location, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX853">--no-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX258">--no-translator, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX884">--no-wrap, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX586">--no-wrap, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX813">--no-wrap, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX621">--no-wrap, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX917">--no-wrap, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX731">--no-wrap, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX678">--no-wrap, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX266">--no-wrap, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX319">--no-wrap, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1076">--no-wrap, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX772">--no-wrap, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX223">--no-wrap, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX866">--obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX818">--omit-header, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX229">--omit-header, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX863">--only-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX852">--only-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX854">--only-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX174">--output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX176">--output-dir, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX848">--output-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX557">--output-file, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX789">--output-file, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX602">--output-file, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX899">--output-file, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX701">--output-file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX987">--output-file, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX636">--output-file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX252">--output-file, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX291">--output-file, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1064">--output-file, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX747">--output-file, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX233">--package-name, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX234">--package-version, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1152">--po-dir, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX860">--previous, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX301">--previous, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX868">--properties-input, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX566">--properties-input, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX835">--properties-input, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX797">--properties-input, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX606">--properties-input, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX901">--properties-input, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX944">--properties-input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX716">--properties-input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1010">--properties-input, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX664">--properties-input, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX254">--properties-input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX303">--properties-input, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX753">--properties-input, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX880">--properties-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX582">--properties-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX809">--properties-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX617">--properties-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX913">--properties-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX727">--properties-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX674">--properties-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX262">--properties-output, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX315">--properties-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1072">--properties-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX768">--properties-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX219">--properties-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX982">--qt, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX202">--qt, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX709">--quiet, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX332">--quiet, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX656">--regexp=, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX749">--repeated, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX990">--resource, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX996">--resource, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1052">--resource, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1056">--resource, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX856">--set-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX858">--set-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX710">--silent, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX333">--silent, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX888">--sort-by-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX591">--sort-by-file, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX817">--sort-by-file, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX625">--sort-by-file, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX921">--sort-by-file, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX735">--sort-by-file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX680">--sort-by-file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX324">--sort-by-file, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX776">--sort-by-file, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX228">--sort-by-file, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX886">--sort-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX588">--sort-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX815">--sort-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX623">--sort-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX919">--sort-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX733">--sort-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX679">--sort-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX321">--sort-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1078">--sort-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX774">--sort-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX225">--sort-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX994">--source, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1036">--statistics, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX878">--strict, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX580">--strict, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX807">--strict, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX615">--strict, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX911">--strict, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX725">--strict, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX988">--strict, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX672">--strict, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX313">--strict, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1070">--strict, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX766">--strict, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX218">--strict, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX869">--stringtable-input, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX567">--stringtable-input, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX836">--stringtable-input, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX798">--stringtable-input, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX902">--stringtable-input, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX945">--stringtable-input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX717">--stringtable-input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1011">--stringtable-input, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX665">--stringtable-input, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX255">--stringtable-input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX304">--stringtable-input, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX607">--stringtable-input, <CODE>msgonv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX754">--stringtable-input, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX881">--stringtable-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX583">--stringtable-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX810">--stringtable-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX618">--stringtable-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX914">--stringtable-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX728">--stringtable-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX675">--stringtable-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX263">--stringtable-output, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX316">--stringtable-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1073">--stringtable-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX769">--stringtable-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX220">--stringtable-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX871">--style, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX573">--style, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX952">--style, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX800">--style, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX609">--style, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX905">--style, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX719">--style, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX667">--style, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX260">--style, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX307">--style, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1066">--style, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX759">--style, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX211">--style, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX295">--suffix, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1154">--symlink, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX980">--tcl, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1049">--tcl, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1003">--template, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX569">--to-code, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX604">--to-code, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX756">--to-code, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX849">--translated, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX200">--trigraphs, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX564">--unique, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX795">--unique, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX751">--unique, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX850">--untranslated, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX289">--update, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX570">--use-first, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX757">--use-first, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX832">--use-fuzzy, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1026">--use-fuzzy, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX833">--use-untranslated, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1240">--variables, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1038">--verbose, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX330">--verbose, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1085">--verbose, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1192">--version, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1244">--version, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1222">--version, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1158">--version, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX892">--version, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX595">--version, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX840">--version, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX822">--version, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX629">--version, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX925">--version, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX949">--version, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX739">--version, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1035">--version, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX684">--version, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX270">--version, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX328">--version, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1083">--version, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX780">--version, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1233">--version, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX243">--version, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX883">--width, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX585">--width, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX812">--width, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX620">--width, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX916">--width, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX730">--width, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX677">--width, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX265">--width, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX318">--width, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1075">--width, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX771">--width, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX222">--width, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX559">-&#60;, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX790">-&#60;, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX561">-&#62;, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX792">-&#62;, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1028">-a, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX190">-a, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1012">-c, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1018">-C, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX647">-C, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX286">-C, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX188">-c, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX181">-C, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1189">-d, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1214">-d, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1155">-d, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX845">-D, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX554">-D, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX826">-D, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX786">-D, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX599">-D, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX896">-D, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX941">-D, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX698">-D, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX993">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX999">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1002">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1008">-d, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX970">-D, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX633">-D, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX284">-D, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1059">-d, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1062">-d, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX748">-d, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX744">-D, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1226">-d, <CODE>ngettext</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#IDX1217">-E, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1216">-e, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX704">-e, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX655">-e, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX651">-E, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1228">-e, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1229">-E, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1187">-f, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1149">-f, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX887">-F, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX552">-f, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX590">-F, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX784">-f, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX816">-F, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX624">-F, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX920">-F, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX706">-f, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX734">-F, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1025">-f, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX657">-f, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX653">-F, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX323">-F, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX775">-F, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX167">-f, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX227">-F, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1241">-h, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1218">-h, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX889">-h, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX592">-h, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX837">-h, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX819">-h, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX626">-h, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX922">-h, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX946">-h, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX736">-h, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1032">-h, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX681">-h, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX267">-h, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX325">-h, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1080">-h, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX777">-h, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1230">-h, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX240">-h, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX873">-i, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX575">-i, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX802">-i, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX611">-i, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX907">-i, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX939">-i, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX696">-i, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX659">-i, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX249">-i, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX309">-i, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1068">-i, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX761">-i, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX213">-i, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX972">-j, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX641">-J, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1042">-j, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX184">-j, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1004">-k, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX643">-K, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX192">-k, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX991">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX997">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1000">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1006">-l, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX256">-l, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1053">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1057">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1060">-l, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX178">-L, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX828">-m, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX639">-M, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX297">-m, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX236">-m, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX238">-M, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1220">-n, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX876">-n, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX578">-n, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX830">-N, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX805">-n, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX708">-n, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX637">-N, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX299">-N, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX764">-n, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX216">-n, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX847">-o, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX556">-o, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX788">-o, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX601">-o, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX898">-o, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX700">-o, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX986">-o, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX635">-o, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX251">-o, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX290">-o, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1063">-o, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX746">-o, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX173">-o, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX879">-p, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX867">-P, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX581">-p, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX565">-P, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX834">-P, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX808">-p, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX796">-P, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX605">-P, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX616">-p, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX900">-P, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX912">-p, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX943">-P, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX715">-P, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX726">-p, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1009">-P, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX663">-P, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX673">-p, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX253">-P, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX261">-p, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX314">-p, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX302">-P, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1071">-p, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX767">-p, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX752">-P, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX175">-p, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX331">-q, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX989">-r, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX995">-r, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1051">-r, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1055">-r, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX885">-s, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX587">-s, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX814">-s, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX622">-s, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX918">-s, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX732">-s, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX320">-s, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1077">-s, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX773">-s, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX224">-s, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX568">-t, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX603">-t, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX645">-T, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX755">-t, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX199">-T, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX563">-u, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX794">-u, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX288">-U, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX750">-u, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1239">-v, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1243">-V, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1221">-V, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX891">-V, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX594">-V, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX839">-V, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX821">-V, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX628">-V, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX924">-V, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX948">-V, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX738">-V, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1034">-V, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1037">-v, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX661">-v, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX683">-V, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX269">-V, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX327">-V, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX329">-v, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1082">-V, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1084">-v, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX779">-V, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1232">-V, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX242">-V, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX882">-w, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX584">-w, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX811">-w, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX619">-w, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX915">-w, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX729">-w, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX676">-w, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX264">-w, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX317">-w, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1074">-w, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX770">-w, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX221">-w, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX649">-X, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX186">-x, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX183">--add-comments, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX862">--add-location, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX573">--add-location, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX793">--add-location, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX608">--add-location, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX895">--add-location, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX711">--add-location, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX665">--add-location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX306">--add-location, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX752">--add-location, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX211">--add-location, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1000">--alignment, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX287">--backup, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX200">--boost, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX176">--c++, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX984">--check, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX992">--check-accelerators, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX990">--check-compatibility, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX988">--check-domain, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX985">--check-format, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX987">--check-header, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX844">--clear-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX846">--clear-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX847">--clear-previous, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX855">--color, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX566">--color, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX930">--color, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX786">--color, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX602">--color, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX889">--color, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX705">--color, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX660">--color, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX253">--color, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX300">--color, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1035">--color, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX745">--color, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX204">--color, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX642">--comment, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX281">--compendium, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX225">--copyright-holder, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX956">--csharp, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1015">--csharp, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX958">--csharp-resources, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1017">--csharp-resources, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX202">--debug, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX166">--default-domain, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX833">--directory, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX549">--directory, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX814">--directory, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX774">--directory, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX594">--directory, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX882">--directory, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX922">--directory, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX688">--directory, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX951">--directory, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX628">--directory, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX279">--directory, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX732">--directory, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX164">--directory, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1185">--domain, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX634">--domain, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1197">--domain, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1160">--dry-run, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1126">--dry-run, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX181">--exclude-file, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX694">--expression, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX646">--extended-regexp, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX185">--extract-all, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX644">--extracted-comment, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX696">--file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX652">--file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX547">--files-from, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX772">--files-from, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX162">--files-from, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX648">--fixed-strings, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX190">--flag, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1158">--force, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1120">--force, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX857">--force-po, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX568">--force-po, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX788">--force-po, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX604">--force-po, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX891">--force-po, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX707">--force-po, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX662">--force-po, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX302">--force-po, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1037">--force-po, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX747">--force-po, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX206">--force-po, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX226">--foreign-user, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX177">--from-code, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX850">--fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1161">--help, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1212">--help, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1189">--help, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1127">--help, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX875">--help, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX587">--help, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX825">--help, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX807">--help, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX621">--help, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX908">--help, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX927">--help, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX724">--help, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1003">--help, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX676">--help, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX262">--help, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX320">--help, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1051">--help, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX765">--help, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1201">--help, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX235">--help, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX654">--ignore-case, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX849">--ignore-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX859">--indent, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX570">--indent, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX790">--indent, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX606">--indent, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX893">--indent, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX708">--indent, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX663">--indent, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX304">--indent, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1039">--indent, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX749">--indent, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX208">--indent, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX920">--input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX686">--input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX244">--input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1121">--intl, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX656">--invert-match, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX953">--java, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1013">--java, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX955">--java2, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX179">--join-existing, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX198">--kde, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX709">--keep-header, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX187">--keyword, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX299">--lang, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX565">--lang, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX888">--lang, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX173">--language, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX554">--less-than, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX778">--less-than, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX970">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX975">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX978">--locale, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX251">--locale, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1024">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1028">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1031">--locale, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX632">--location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX556">--more-than, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX780">--more-than, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX636">--msgctxt, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX638">--msgid, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX229">--msgid-bugs-address, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX640">--msgstr, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX231">--msgstr-prefix, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX233">--msgstr-suffix, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX816">--multi-domain, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX292">--multi-domain, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1123">--no-changelog, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX838">--no-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX818">--no-fuzzy-matching, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX294">--no-fuzzy-matching, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1001">--no-hash, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX860">--no-location, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX571">--no-location, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX791">--no-location, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX607">--no-location, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX894">--no-location, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX710">--no-location, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX664">--no-location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX305">--no-location, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX750">--no-location, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX209">--no-location, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX840">--no-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX252">--no-translator, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX869">--no-wrap, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX580">--no-wrap, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX800">--no-wrap, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX615">--no-wrap, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX902">--no-wrap, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX718">--no-wrap, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX672">--no-wrap, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX260">--no-wrap, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX313">--no-wrap, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1046">--no-wrap, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX759">--no-wrap, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX217">--no-wrap, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX851">--obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX805">--omit-header, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX223">--omit-header, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX848">--only-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX839">--only-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX841">--only-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX168">--output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX170">--output-dir, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX835">--output-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX551">--output-file, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX776">--output-file, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX596">--output-file, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX884">--output-file, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX690">--output-file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX965">--output-file, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX630">--output-file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX246">--output-file, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX285">--output-file, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1034">--output-file, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX734">--output-file, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX227">--package-name, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX228">--package-version, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1122">--po-dir, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX295">--previous, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX853">--properties-input, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX560">--properties-input, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX822">--properties-input, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX784">--properties-input, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX600">--properties-input, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX886">--properties-input, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX924">--properties-input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX703">--properties-input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX981">--properties-input, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX658">--properties-input, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX248">--properties-input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX297">--properties-input, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX740">--properties-input, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX865">--properties-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX576">--properties-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX796">--properties-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX611">--properties-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX898">--properties-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX714">--properties-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX668">--properties-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX256">--properties-output, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX309">--properties-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1042">--properties-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX755">--properties-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX213">--properties-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX962">--qt, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX196">--qt, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX698">--quiet, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX326">--quiet, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX650">--regexp=, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX736">--repeated, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX968">--resource, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX973">--resource, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1022">--resource, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1026">--resource, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX843">--set-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX845">--set-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX699">--silent, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX327">--silent, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX873">--sort-by-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX585">--sort-by-file, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX804">--sort-by-file, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX619">--sort-by-file, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX906">--sort-by-file, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX722">--sort-by-file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX674">--sort-by-file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX318">--sort-by-file, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX763">--sort-by-file, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX222">--sort-by-file, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX871">--sort-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX582">--sort-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX802">--sort-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX617">--sort-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX904">--sort-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX720">--sort-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX673">--sort-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX315">--sort-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1048">--sort-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX761">--sort-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX219">--sort-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1006">--statistics, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX863">--strict, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX574">--strict, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX794">--strict, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX609">--strict, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX896">--strict, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX712">--strict, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX966">--strict, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX666">--strict, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX307">--strict, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1040">--strict, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX753">--strict, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX212">--strict, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX854">--stringtable-input, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX561">--stringtable-input, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX823">--stringtable-input, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX785">--stringtable-input, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX887">--stringtable-input, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX925">--stringtable-input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX704">--stringtable-input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX982">--stringtable-input, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX659">--stringtable-input, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX249">--stringtable-input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX298">--stringtable-input, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX601">--stringtable-input, <CODE>msgonv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX741">--stringtable-input, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX866">--stringtable-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX577">--stringtable-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX797">--stringtable-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX612">--stringtable-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX899">--stringtable-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX715">--stringtable-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX669">--stringtable-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX257">--stringtable-output, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX310">--stringtable-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1043">--stringtable-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX756">--stringtable-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX214">--stringtable-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX856">--style, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX567">--style, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX932">--style, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX787">--style, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX603">--style, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX890">--style, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX706">--style, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX661">--style, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX254">--style, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX301">--style, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1036">--style, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX746">--style, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX205">--style, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX289">--suffix, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1124">--symlink, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX960">--tcl, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1019">--tcl, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX563">--to-code, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX598">--to-code, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX743">--to-code, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX836">--translated, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX194">--trigraphs, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX558">--unique, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX782">--unique, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX738">--unique, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX837">--untranslated, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX283">--update, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX564">--use-first, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX744">--use-first, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX819">--use-fuzzy, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX997">--use-fuzzy, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX820">--use-untranslated, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1210">--variables, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1008">--verbose, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX324">--verbose, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1055">--verbose, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1162">--version, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1214">--version, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1192">--version, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1128">--version, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX877">--version, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX589">--version, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX827">--version, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX809">--version, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX623">--version, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX910">--version, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX929">--version, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX726">--version, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1005">--version, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX678">--version, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX264">--version, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX322">--version, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1053">--version, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX767">--version, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1203">--version, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX237">--version, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX868">--width, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX579">--width, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX799">--width, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX614">--width, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX901">--width, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX717">--width, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX671">--width, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX259">--width, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX312">--width, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1045">--width, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX758">--width, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX216">--width, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX553">-&#60;, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX777">-&#60;, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX555">-&#62;, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX779">-&#62;, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX999">-a, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX184">-a, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX989">-C, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX983">-c, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX641">-C, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX280">-C, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX175">-C, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX182">-c, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1159">-d, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1184">-d, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1125">-d, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX832">-D, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX548">-D, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX813">-D, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX773">-D, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX593">-D, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX881">-D, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX921">-D, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX687">-D, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX971">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX976">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX979">-d, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX950">-D, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX627">-D, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX278">-D, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1029">-d, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1032">-d, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX731">-D, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX735">-d, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1196">-d, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX163">-D, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX165">-d, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1186">-e, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1187">-E, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX693">-e, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX645">-E, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX649">-e, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1198">-e, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1199">-E, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1157">-f, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1119">-f, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX872">-F, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX546">-f, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX584">-F, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX803">-F, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX771">-f, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX618">-F, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX905">-F, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX721">-F, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX695">-f, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX996">-f, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX651">-f, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX647">-F, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX317">-F, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX762">-F, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX221">-F, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX161">-f, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1211">-h, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1188">-h, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX874">-h, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX586">-h, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX824">-h, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX806">-h, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX620">-h, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX907">-h, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX926">-h, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX723">-h, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1002">-h, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX675">-h, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX261">-h, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX319">-h, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1050">-h, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX764">-h, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1200">-h, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX234">-h, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX858">-i, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX569">-i, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX789">-i, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX605">-i, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX892">-i, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX919">-i, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX685">-i, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX653">-i, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX243">-i, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX303">-i, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1038">-i, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX748">-i, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX207">-i, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX952">-j, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX635">-J, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1012">-j, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX178">-j, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX637">-K, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX186">-k, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX969">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX974">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX977">-l, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX250">-l, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1023">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1027">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1030">-l, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX172">-L, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX815">-m, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX633">-M, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX291">-m, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX232">-M, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX230">-m, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1190">-n, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX861">-n, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX572">-n, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX817">-N, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX792">-n, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX697">-n, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX631">-N, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX293">-N, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX751">-n, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX210">-n, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX834">-o, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX550">-o, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX775">-o, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX595">-o, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX883">-o, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX689">-o, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX964">-o, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX629">-o, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX245">-o, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX284">-o, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1033">-o, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX733">-o, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX167">-o, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX852">-P, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX864">-p, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX559">-P, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX575">-p, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX821">-P, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX783">-P, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX795">-p, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX599">-P, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX610">-p, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX885">-P, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX897">-p, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX923">-P, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX702">-P, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX713">-p, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX980">-P, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX667">-p, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX657">-P, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX247">-P, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX255">-p, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX308">-p, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX296">-P, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1041">-p, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX754">-p, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX739">-P, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX169">-p, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX325">-q, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX967">-r, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX972">-r, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1021">-r, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1025">-r, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX870">-s, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX581">-s, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX801">-s, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX616">-s, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX903">-s, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX719">-s, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX314">-s, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1047">-s, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX760">-s, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX218">-s, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX562">-t, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX597">-t, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX639">-T, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX742">-t, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX193">-T, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX557">-u, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX781">-u, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX282">-U, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX737">-u, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1209">-v, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1213">-V, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1191">-V, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX876">-V, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX588">-V, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX826">-V, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX808">-V, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX622">-V, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX909">-V, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX928">-V, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX725">-V, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1004">-V, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1007">-v, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX677">-V, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX655">-v, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX263">-V, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX323">-v, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX321">-V, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1054">-v, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1052">-V, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX766">-V, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1202">-V, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX236">-V, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX867">-w, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX578">-w, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX798">-w, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX613">-w, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX900">-w, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX716">-w, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX670">-w, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX258">-w, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX311">-w, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1044">-w, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX757">-w, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX215">-w, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX643">-X, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX180">-x, <CODE>xgettext</CODE> option</A>
 </DIR>
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_22.html gettext-0.18.1.1/gettext-tools/doc/gettext_22.html
--- gettext-0.19.3/gettext-tools/doc/gettext_22.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_22.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Variable Index</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC335" HREF="gettext_toc.html#TOC335">Variable Index</A></H1>
+<H1><A NAME="SEC333" HREF="gettext_toc.html#TOC333">Variable Index</A></H1>
 
 <P>
 Jump to:
@@ -27,49 +27,39 @@
 <P>
 <H2><A NAME="vindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_12.html#IDX1142">GETTEXT_LOG_UNTRANSLATED, environment variable</A>
+<LI><A HREF="gettext_12.html#IDX1112">GETTEXT_LOG_UNTRANSLATED, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_l">l</A></H2>
 <DIR>
-<LI><A HREF="gettext_2.html#IDX51">LANG, environment variable</A>, <A HREF="gettext_11.html#IDX1139">LANG, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX43">LANGUAGE, environment variable</A>, <A HREF="gettext_11.html#IDX1131">LANGUAGE, environment variable</A>, <A HREF="gettext_13.html#IDX1165">LANGUAGE, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX44">LC_ALL, environment variable</A>, <A HREF="gettext_11.html#IDX1132">LC_ALL, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX48">LC_COLLATE, environment variable</A>, <A HREF="gettext_11.html#IDX1136">LC_COLLATE, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX45">LC_CTYPE, environment variable</A>, <A HREF="gettext_11.html#IDX1133">LC_CTYPE, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX50">LC_MESSAGES, environment variable</A>, <A HREF="gettext_11.html#IDX1138">LC_MESSAGES, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX49">LC_MONETARY, environment variable</A>, <A HREF="gettext_11.html#IDX1137">LC_MONETARY, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX46">LC_NUMERIC, environment variable</A>, <A HREF="gettext_11.html#IDX1134">LC_NUMERIC, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX47">LC_TIME, environment variable</A>, <A HREF="gettext_11.html#IDX1135">LC_TIME, environment variable</A>
-<LI><A HREF="gettext_14.html#IDX1199">LINGUAS, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX51">LANG, environment variable</A>, <A HREF="gettext_11.html#IDX1109">LANG, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX43">LANGUAGE, environment variable</A>, <A HREF="gettext_11.html#IDX1101">LANGUAGE, environment variable</A>, <A HREF="gettext_13.html#IDX1135">LANGUAGE, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX44">LC_ALL, environment variable</A>, <A HREF="gettext_11.html#IDX1102">LC_ALL, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX48">LC_COLLATE, environment variable</A>, <A HREF="gettext_11.html#IDX1106">LC_COLLATE, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX45">LC_CTYPE, environment variable</A>, <A HREF="gettext_11.html#IDX1103">LC_CTYPE, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX50">LC_MESSAGES, environment variable</A>, <A HREF="gettext_11.html#IDX1108">LC_MESSAGES, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX49">LC_MONETARY, environment variable</A>, <A HREF="gettext_11.html#IDX1107">LC_MONETARY, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX46">LC_NUMERIC, environment variable</A>, <A HREF="gettext_11.html#IDX1104">LC_NUMERIC, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX47">LC_TIME, environment variable</A>, <A HREF="gettext_11.html#IDX1105">LC_TIME, environment variable</A>
+<LI><A HREF="gettext_14.html#IDX1169">LINGUAS, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX933">MSGEXEC_LOCATION, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX930">MSGEXEC_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX931">MSGEXEC_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX932">MSGEXEC_MSGID_PLURAL, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX934">MSGEXEC_PLURAL_FORM, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX935">MSGEXEC_PREV_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX936">MSGEXEC_PREV_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX937">MSGEXEC_PREV_MSGID_PLURAL, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX691">MSGFILTER_LOCATION, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX688">MSGFILTER_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX689">MSGFILTER_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX690">MSGFILTER_MSGID_PLURAL, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX692">MSGFILTER_PLURAL_FORM, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX693">MSGFILTER_PREV_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX694">MSGFILTER_PREV_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX695">MSGFILTER_PREV_MSGID_PLURAL, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX917">MSGEXEC_LOCATION, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX915">MSGEXEC_MSGCTXT, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX916">MSGEXEC_MSGID, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX684">MSGFILTER_LOCATION, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX682">MSGFILTER_MSGCTXT, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX683">MSGFILTER_MSGID, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX953">PO_STYLE, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX933">PO_STYLE, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX951">TERM, environment variable</A>
-<LI><A HREF="gettext_15.html#IDX1208">TEXTDOMAIN, environment variable</A>
-<LI><A HREF="gettext_15.html#IDX1209">TEXTDOMAINDIR, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX931">TERM, environment variable</A>
+<LI><A HREF="gettext_15.html#IDX1178">TEXTDOMAIN, environment variable</A>
+<LI><A HREF="gettext_15.html#IDX1179">TEXTDOMAINDIR, environment variable</A>
 </DIR>
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_23.html gettext-0.18.1.1/gettext-tools/doc/gettext_23.html
--- gettext-0.19.3/gettext-tools/doc/gettext_23.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_23.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - PO Mode Index</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC336" HREF="gettext_toc.html#TOC336">PO Mode Index</A></H1>
+<H1><A NAME="SEC334" HREF="gettext_toc.html#TOC334">PO Mode Index</A></H1>
 
 <P>
 Jump to:
@@ -41,70 +41,70 @@
 <P>
 <H2><A NAME="emindex_&">&#38;</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX340"><TT>&lsquo;.emacs&rsquo;</TT> customizations</A>
-<LI><A HREF="gettext_4.html#IDX153"><TT>&lsquo;TAGS&rsquo;</TT>, and marking translatable strings</A>
+<LI><A HREF="gettext_8.html#IDX334"><TT>&lsquo;.emacs&rsquo;</TT> customizations</A>
+<LI><A HREF="gettext_4.html#IDX147"><TT>&lsquo;TAGS&rsquo;</TT>, and marking translatable strings</A>
 </DIR>
 <H2><A NAME="emindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX517">auxiliary PO file</A>
+<LI><A HREF="gettext_8.html#IDX511">auxiliary PO file</A>
 </DIR>
 <H2><A NAME="emindex_c">c</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX343">commands</A>
-<LI><A HREF="gettext_8.html#IDX447">comment out PO file entry</A>
-<LI><A HREF="gettext_8.html#IDX499">consulting program sources</A>
-<LI><A HREF="gettext_8.html#IDX515">consulting translations to other languages</A>
-<LI><A HREF="gettext_8.html#IDX368">current entry of a PO file</A>
-<LI><A HREF="gettext_8.html#IDX463">cut and paste for translated strings</A>
+<LI><A HREF="gettext_8.html#IDX337">commands</A>
+<LI><A HREF="gettext_8.html#IDX441">comment out PO file entry</A>
+<LI><A HREF="gettext_8.html#IDX493">consulting program sources</A>
+<LI><A HREF="gettext_8.html#IDX509">consulting translations to other languages</A>
+<LI><A HREF="gettext_8.html#IDX362">current entry of a PO file</A>
+<LI><A HREF="gettext_8.html#IDX457">cut and paste for translated strings</A>
 </DIR>
 <H2><A NAME="emindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX472">editing comments</A>
-<LI><A HREF="gettext_8.html#IDX497">editing multiple entries</A>
-<LI><A HREF="gettext_8.html#IDX449">editing translations</A>
-<LI><A HREF="gettext_4.html#IDX152"><CODE>etags</CODE>, using for marking strings</A>
-<LI><A HREF="gettext_8.html#IDX490">exiting PO subedit</A>
+<LI><A HREF="gettext_8.html#IDX466">editing comments</A>
+<LI><A HREF="gettext_8.html#IDX491">editing multiple entries</A>
+<LI><A HREF="gettext_8.html#IDX443">editing translations</A>
+<LI><A HREF="gettext_4.html#IDX146"><CODE>etags</CODE>, using for marking strings</A>
+<LI><A HREF="gettext_8.html#IDX484">exiting PO subedit</A>
 </DIR>
 <H2><A NAME="emindex_f">f</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX502">find source fragment for a PO file entry</A>
+<LI><A HREF="gettext_8.html#IDX496">find source fragment for a PO file entry</A>
 </DIR>
 <H2><A NAME="emindex_i">i</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX341">installing PO mode</A>
+<LI><A HREF="gettext_8.html#IDX335">installing PO mode</A>
 </DIR>
 <H2><A NAME="emindex_l">l</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX500">looking at the source to aid translation</A>
+<LI><A HREF="gettext_8.html#IDX494">looking at the source to aid translation</A>
 </DIR>
 <H2><A NAME="emindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_4.html#IDX151">marking strings for translation</A>
-<LI><A HREF="gettext_8.html#IDX411">moving by fuzzy entries</A>
-<LI><A HREF="gettext_8.html#IDX436">moving by obsolete entries</A>
-<LI><A HREF="gettext_8.html#IDX400">moving by translated entries</A>
-<LI><A HREF="gettext_8.html#IDX425">moving by untranslated entries</A>
-<LI><A HREF="gettext_8.html#IDX369">moving through a PO file</A>
+<LI><A HREF="gettext_4.html#IDX145">marking strings for translation</A>
+<LI><A HREF="gettext_8.html#IDX405">moving by fuzzy entries</A>
+<LI><A HREF="gettext_8.html#IDX430">moving by obsolete entries</A>
+<LI><A HREF="gettext_8.html#IDX394">moving by translated entries</A>
+<LI><A HREF="gettext_8.html#IDX419">moving by untranslated entries</A>
+<LI><A HREF="gettext_8.html#IDX363">moving through a PO file</A>
 </DIR>
 <H2><A NAME="emindex_o">o</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX446">obsolete active entry</A>
+<LI><A HREF="gettext_8.html#IDX440">obsolete active entry</A>
 </DIR>
 <H2><A NAME="emindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX498">pending subedits</A>
+<LI><A HREF="gettext_8.html#IDX492">pending subedits</A>
 </DIR>
 <H2><A NAME="emindex_s">s</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX462">starting a string translation</A>
-<LI><A HREF="gettext_8.html#IDX395">string normalization in entries</A>
-<LI><A HREF="gettext_8.html#IDX486">subedit minor mode</A>
+<LI><A HREF="gettext_8.html#IDX456">starting a string translation</A>
+<LI><A HREF="gettext_8.html#IDX389">string normalization in entries</A>
+<LI><A HREF="gettext_8.html#IDX480">subedit minor mode</A>
 </DIR>
 <H2><A NAME="emindex_u">u</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX501">use the source, Luke</A>
-<LI><A HREF="gettext_8.html#IDX470">using obsolete translations to make new entries</A>
-<LI><A HREF="gettext_8.html#IDX531">using translation compendia</A>
+<LI><A HREF="gettext_8.html#IDX495">use the source, Luke</A>
+<LI><A HREF="gettext_8.html#IDX464">using obsolete translations to make new entries</A>
+<LI><A HREF="gettext_8.html#IDX525">using translation compendia</A>
 </DIR>
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_24.html gettext-0.18.1.1/gettext-tools/doc/gettext_24.html
--- gettext-0.19.3/gettext-tools/doc/gettext_24.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_24.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Autoconf Macro Index</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC337" HREF="gettext_toc.html#TOC337">Autoconf Macro Index</A></H1>
+<H1><A NAME="SEC335" HREF="gettext_toc.html#TOC335">Autoconf Macro Index</A></H1>
 
 <P>
 Jump to:
@@ -19,13 +19,13 @@
 <P>
 <H2><A NAME="amindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX1176">AM_GNU_GETTEXT</A>
-<LI><A HREF="gettext_13.html#IDX1180">AM_GNU_GETTEXT_INTL_SUBDIR</A>
-<LI><A HREF="gettext_13.html#IDX1179">AM_GNU_GETTEXT_NEED</A>
-<LI><A HREF="gettext_13.html#IDX1178">AM_GNU_GETTEXT_VERSION</A>
-<LI><A HREF="gettext_13.html#IDX1183">AM_ICONV</A>
-<LI><A HREF="gettext_13.html#IDX1181">AM_PO_SUBDIRS</A>
-<LI><A HREF="gettext_13.html#IDX1182">AM_XGETTEXT_OPTION</A>
+<LI><A HREF="gettext_13.html#IDX1146">AM_GNU_GETTEXT</A>
+<LI><A HREF="gettext_13.html#IDX1150">AM_GNU_GETTEXT_INTL_SUBDIR</A>
+<LI><A HREF="gettext_13.html#IDX1149">AM_GNU_GETTEXT_NEED</A>
+<LI><A HREF="gettext_13.html#IDX1148">AM_GNU_GETTEXT_VERSION</A>
+<LI><A HREF="gettext_13.html#IDX1153">AM_ICONV</A>
+<LI><A HREF="gettext_13.html#IDX1151">AM_PO_SUBDIRS</A>
+<LI><A HREF="gettext_13.html#IDX1152">AM_XGETTEXT_OPTION</A>
 </DIR>
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_25.html gettext-0.18.1.1/gettext-tools/doc/gettext_25.html
--- gettext-0.19.3/gettext-tools/doc/gettext_25.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_25.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - General Index</TITLE>
@@ -11,7 +11,7 @@
 <P><HR><P>
 
 
-<H1><A NAME="SEC338" HREF="gettext_toc.html#TOC338">General Index</A></H1>
+<H1><A NAME="SEC336" HREF="gettext_toc.html#TOC336">General Index</A></H1>
 
 <P>
 Jump to:
@@ -72,430 +72,429 @@
 <H2><A NAME="cindex_&">&#38;</A></H2>
 <DIR>
 <LI><A HREF="gettext_2.html#IDX54"><TT>&lsquo;ABOUT-NLS&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1169"><TT>&lsquo;acconfig.h&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1168"><TT>&lsquo;aclocal.m4&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1170"><TT>&lsquo;config.h.in&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1171"><TT>&lsquo;gettext.h&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1161"><TT>&lsquo;LINGUAS&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1163"><TT>&lsquo;Makefile.in.in&rsquo;</TT> extensions</A>
-<LI><A HREF="gettext_13.html#IDX1162"><TT>&lsquo;Makevars&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1167"><TT>&lsquo;mkinstalldirs&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1160"><TT>&lsquo;POTFILES.in&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1139"><TT>&lsquo;acconfig.h&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1138"><TT>&lsquo;aclocal.m4&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1140"><TT>&lsquo;config.h.in&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1141"><TT>&lsquo;gettext.h&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1131"><TT>&lsquo;LINGUAS&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1133"><TT>&lsquo;Makefile.in.in&rsquo;</TT> extensions</A>
+<LI><A HREF="gettext_13.html#IDX1132"><TT>&lsquo;Makevars&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1137"><TT>&lsquo;mkinstalldirs&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1130"><TT>&lsquo;POTFILES.in&rsquo;</TT> file</A>
 </DIR>
 <H2><A NAME="cindex__">_</A></H2>
 <DIR>
-<LI><A HREF="gettext_4.html#IDX150"><CODE>_</CODE>, a macro to mark strings for translation</A>
-<LI><A HREF="gettext_11.html#IDX1140"><CODE>_nl_msg_cat_cntr</CODE></A>
+<LI><A HREF="gettext_4.html#IDX144"><CODE>_</CODE>, a macro to mark strings for translation</A>
+<LI><A HREF="gettext_11.html#IDX1110"><CODE>_nl_msg_cat_cntr</CODE></A>
 </DIR>
 <H2><A NAME="cindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX536">accumulating translations</A>
-<LI><A HREF="gettext_5.html#IDX194">adding keywords, <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_4.html#IDX138">ambiguities</A>
-<LI><A HREF="gettext_9.html#IDX687">apply a filter to translations</A>
-<LI><A HREF="gettext_9.html#IDX928">apply command to all translations in a catalog</A>
-<LI><A HREF="gettext_15.html#IDX1203">Arabic digits</A>
-<LI><A HREF="gettext_9.html#IDX844">attribute manipulation</A>
-<LI><A HREF="gettext_8.html#IDX410">attribute, fuzzy</A>
-<LI><A HREF="gettext_8.html#IDX409">attributes of a PO file entry</A>
-<LI><A HREF="gettext_9.html#IDX547">attributes, manipulating</A>
-<LI><A HREF="gettext_13.html#IDX1175">autoconf macros for <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_13.html#IDX1186"><CODE>autopoint</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX516">auxiliary PO file</A>
+<LI><A HREF="gettext_8.html#IDX530">accumulating translations</A>
+<LI><A HREF="gettext_5.html#IDX188">adding keywords, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_4.html#IDX132">ambiguities</A>
+<LI><A HREF="gettext_9.html#IDX681">apply a filter to translations</A>
+<LI><A HREF="gettext_9.html#IDX913">apply command to all translations in a catalog</A>
+<LI><A HREF="gettext_15.html#IDX1173">Arabic digits</A>
+<LI><A HREF="gettext_9.html#IDX831">attribute manipulation</A>
+<LI><A HREF="gettext_8.html#IDX404">attribute, fuzzy</A>
+<LI><A HREF="gettext_8.html#IDX403">attributes of a PO file entry</A>
+<LI><A HREF="gettext_9.html#IDX541">attributes, manipulating</A>
+<LI><A HREF="gettext_13.html#IDX1145">autoconf macros for <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1156"><CODE>autopoint</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX510">auxiliary PO file</A>
 <LI><A HREF="gettext_2.html#IDX53">available translations</A>
-<LI><A HREF="gettext_15.html#IDX1264">awk</A>
+<LI><A HREF="gettext_15.html#IDX1234">awk</A>
 </DIR>
 <H2><A NAME="cindex_b">b</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX294">backup old file, and <CODE>msgmerge</CODE> program</A>
-<LI><A HREF="gettext_15.html#IDX1249">bash</A>
-<LI><A HREF="gettext_16.html#IDX1290">bibliography</A>
+<LI><A HREF="gettext_7.html#IDX288">backup old file, and <CODE>msgmerge</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1219">bash</A>
+<LI><A HREF="gettext_16.html#IDX1260">bibliography</A>
 <LI><A HREF="gettext_1.html#IDX31">big picture</A>
-<LI><A HREF="gettext_11.html#IDX1106">bind_textdomain_codeset</A>
-<LI><A HREF="gettext_5.html#IDX207">Boost format strings</A>
+<LI><A HREF="gettext_11.html#IDX1076">bind_textdomain_codeset</A>
+<LI><A HREF="gettext_5.html#IDX201">Boost format strings</A>
 <LI><A HREF="gettext_1.html#IDX4">bug report address</A>
 </DIR>
 <H2><A NAME="cindex_c">c</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1204">C and C-like languages</A>
-<LI><A HREF="gettext_5.html#IDX201">C trigraphs</A>
-<LI><A HREF="gettext_15.html#IDX1262">C#</A>
-<LI><A HREF="gettext_10.html#IDX977">C# mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1046">C# mode, and <CODE>msgunfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX979">C# resources mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1048">C# resources mode, and <CODE>msgunfmt</CODE> program</A>
-<LI><A HREF="gettext_4.html#IDX146">C#, string concatenation</A>
-<LI><A HREF="gettext_9.html#IDX938">catalog encoding and <CODE>msgexec</CODE> output</A>
-<LI><A HREF="gettext_11.html#IDX1096"><CODE>catclose</CODE>, a <CODE>catgets</CODE> function</A>
-<LI><A HREF="gettext_11.html#IDX1092"><CODE>catgets</CODE>, X/Open specification</A>
-<LI><A HREF="gettext_11.html#IDX1095"><CODE>catgets</CODE>, a <CODE>catgets</CODE> function</A>
-<LI><A HREF="gettext_11.html#IDX1094"><CODE>catopen</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_15.html#IDX1174">C and C-like languages</A>
+<LI><A HREF="gettext_5.html#IDX195">C trigraphs</A>
+<LI><A HREF="gettext_15.html#IDX1232">C#</A>
+<LI><A HREF="gettext_10.html#IDX957">C# mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1016">C# mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX959">C# resources mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1018">C# resources mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_4.html#IDX140">C#, string concatenation</A>
+<LI><A HREF="gettext_9.html#IDX918">catalog encoding and <CODE>msgexec</CODE> output</A>
+<LI><A HREF="gettext_11.html#IDX1066"><CODE>catclose</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_11.html#IDX1062"><CODE>catgets</CODE>, X/Open specification</A>
+<LI><A HREF="gettext_11.html#IDX1065"><CODE>catgets</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_11.html#IDX1064"><CODE>catopen</CODE>, a <CODE>catgets</CODE> function</A>
 <LI><A HREF="gettext_1.html#IDX17">character encoding</A>
-<LI><A HREF="gettext_11.html#IDX1104">charset conversion at runtime</A>
-<LI><A HREF="gettext_6.html#IDX274">charset of PO files</A>
-<LI><A HREF="gettext_10.html#IDX1015">check format strings</A>
-<LI><A HREF="gettext_9.html#IDX545">checking of translations</A>
-<LI><A HREF="gettext_15.html#IDX1253">clisp</A>
-<LI><A HREF="gettext_15.html#IDX1254">clisp C sources</A>
+<LI><A HREF="gettext_11.html#IDX1074">charset conversion at runtime</A>
+<LI><A HREF="gettext_6.html#IDX268">charset of PO files</A>
+<LI><A HREF="gettext_10.html#IDX986">check format strings</A>
+<LI><A HREF="gettext_9.html#IDX539">checking of translations</A>
+<LI><A HREF="gettext_15.html#IDX1223">clisp</A>
+<LI><A HREF="gettext_15.html#IDX1224">clisp C sources</A>
 <LI><A HREF="gettext_1.html#IDX15">codeset</A>
-<LI><A HREF="gettext_3.html#IDX123">comments in PO files</A>
+<LI><A HREF="gettext_3.html#IDX117">comments in PO files</A>
 <LI><A HREF="gettext_3.html#IDX58">comments, automatic</A>
 <LI><A HREF="gettext_3.html#IDX59">comments, extracted</A>
 <LI><A HREF="gettext_3.html#IDX57">comments, translator</A>
-<LI><A HREF="gettext_15.html#IDX1251">Common Lisp</A>
-<LI><A HREF="gettext_9.html#IDX825">compare PO files</A>
-<LI><A HREF="gettext_11.html#IDX1127">comparison of interfaces</A>
-<LI><A HREF="gettext_10.html#IDX1020">compatibility with X/Open <CODE>msgfmt</CODE></A>
-<LI><A HREF="gettext_8.html#IDX532">compendium</A>
-<LI><A HREF="gettext_8.html#IDX534">compendium, creating</A>
-<LI><A HREF="gettext_9.html#IDX550">concatenate PO files</A>
-<LI><A HREF="gettext_8.html#IDX535">concatenating PO files into a compendium</A>
-<LI><A HREF="gettext_4.html#IDX143">concatenation of strings</A>
-<LI><A HREF="gettext_11.html#IDX1107">context</A>
-<LI><A HREF="gettext_5.html#IDX195">context, argument specification in <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_10.html#IDX1090">context, in MO files</A>
-<LI><A HREF="gettext_3.html#IDX118">context, in PO files</A>
-<LI><A HREF="gettext_4.html#IDX148">control characters</A>
-<LI><A HREF="gettext_10.html#IDX1041">convert binary message catalog into PO file</A>
-<LI><A HREF="gettext_9.html#IDX598">convert translations to a different encoding</A>
-<LI><A HREF="gettext_13.html#IDX1144">converting a package to use <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_18.html#IDX1293">country codes</A>
-<LI><A HREF="gettext_6.html#IDX247">create new PO file</A>
-<LI><A HREF="gettext_6.html#IDX244">creating a new PO file</A>
-<LI><A HREF="gettext_8.html#IDX533">creating compendia</A>
+<LI><A HREF="gettext_15.html#IDX1221">Common Lisp</A>
+<LI><A HREF="gettext_9.html#IDX812">compare PO files</A>
+<LI><A HREF="gettext_11.html#IDX1097">comparison of interfaces</A>
+<LI><A HREF="gettext_10.html#IDX991">compatibility with X/Open <CODE>msgfmt</CODE></A>
+<LI><A HREF="gettext_8.html#IDX526">compendium</A>
+<LI><A HREF="gettext_8.html#IDX528">compendium, creating</A>
+<LI><A HREF="gettext_9.html#IDX544">concatenate PO files</A>
+<LI><A HREF="gettext_8.html#IDX529">concatenating PO files into a compendium</A>
+<LI><A HREF="gettext_4.html#IDX137">concatenation of strings</A>
+<LI><A HREF="gettext_11.html#IDX1077">context</A>
+<LI><A HREF="gettext_5.html#IDX189">context, argument specification in <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_10.html#IDX1060">context, in MO files</A>
+<LI><A HREF="gettext_3.html#IDX112">context, in PO files</A>
+<LI><A HREF="gettext_4.html#IDX142">control characters</A>
+<LI><A HREF="gettext_10.html#IDX1011">convert binary message catalog into PO file</A>
+<LI><A HREF="gettext_9.html#IDX592">convert translations to a different encoding</A>
+<LI><A HREF="gettext_13.html#IDX1114">converting a package to use <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_18.html#IDX1263">country codes</A>
+<LI><A HREF="gettext_6.html#IDX241">create new PO file</A>
+<LI><A HREF="gettext_6.html#IDX238">creating a new PO file</A>
+<LI><A HREF="gettext_8.html#IDX527">creating compendia</A>
 <LI><A HREF="gettext_1.html#IDX19">currency symbols</A>
 </DIR>
 <H2><A NAME="cindex_d">d</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX21">date format</A>
-<LI><A HREF="gettext_11.html#IDX1120">dcngettext</A>
-<LI><A HREF="gettext_11.html#IDX1113">dcpgettext</A>
-<LI><A HREF="gettext_11.html#IDX1116">dcpgettext_expr</A>
-<LI><A HREF="gettext_5.html#IDX209">debugging messages marked as format strings</A>
-<LI><A HREF="gettext_10.html#IDX985">Desktop Entry mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_9.html#IDX543">dialect</A>
-<LI><A HREF="gettext_13.html#IDX1173">disabling NLS</A>
-<LI><A HREF="gettext_13.html#IDX1194">distribution tarball</A>
-<LI><A HREF="gettext_11.html#IDX1119">dngettext</A>
-<LI><A HREF="gettext_15.html#IDX1237">dollar substitution</A>
-<LI><A HREF="gettext_11.html#IDX1101">domain ambiguities</A>
-<LI><A HREF="gettext_11.html#IDX1112">dpgettext</A>
-<LI><A HREF="gettext_11.html#IDX1115">dpgettext_expr</A>
-<LI><A HREF="gettext_9.html#IDX546">duplicate elimination</A>
-<LI><A HREF="gettext_9.html#IDX743">duplicate removal</A>
+<LI><A HREF="gettext_11.html#IDX1090">dcngettext</A>
+<LI><A HREF="gettext_11.html#IDX1083">dcpgettext</A>
+<LI><A HREF="gettext_11.html#IDX1086">dcpgettext_expr</A>
+<LI><A HREF="gettext_5.html#IDX203">debugging messages marked as format strings</A>
+<LI><A HREF="gettext_9.html#IDX537">dialect</A>
+<LI><A HREF="gettext_13.html#IDX1143">disabling NLS</A>
+<LI><A HREF="gettext_13.html#IDX1164">distribution tarball</A>
+<LI><A HREF="gettext_11.html#IDX1089">dngettext</A>
+<LI><A HREF="gettext_15.html#IDX1207">dollar substitution</A>
+<LI><A HREF="gettext_11.html#IDX1071">domain ambiguities</A>
+<LI><A HREF="gettext_11.html#IDX1082">dpgettext</A>
+<LI><A HREF="gettext_11.html#IDX1085">dpgettext_expr</A>
+<LI><A HREF="gettext_9.html#IDX540">duplicate elimination</A>
+<LI><A HREF="gettext_9.html#IDX730">duplicate removal</A>
 </DIR>
 <H2><A NAME="cindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX471">editing comments in PO files</A>
-<LI><A HREF="gettext_8.html#IDX334">Editing PO Files</A>
-<LI><A HREF="gettext_8.html#IDX448">editing translations</A>
-<LI><A HREF="gettext_15.html#IDX1255">Emacs Lisp</A>
-<LI><A HREF="gettext_8.html#IDX337">Emacs PO Mode</A>
+<LI><A HREF="gettext_8.html#IDX465">editing comments in PO files</A>
+<LI><A HREF="gettext_8.html#IDX328">Editing PO Files</A>
+<LI><A HREF="gettext_8.html#IDX442">editing translations</A>
+<LI><A HREF="gettext_15.html#IDX1225">Emacs Lisp</A>
+<LI><A HREF="gettext_8.html#IDX331">Emacs PO Mode</A>
 <LI><A HREF="gettext_1.html#IDX16">encoding</A>
-<LI><A HREF="gettext_9.html#IDX542">encoding conversion</A>
-<LI><A HREF="gettext_11.html#IDX1105">encoding conversion at runtime</A>
-<LI><A HREF="gettext_6.html#IDX278">encoding for your language</A>
-<LI><A HREF="gettext_6.html#IDX276">encoding list</A>
-<LI><A HREF="gettext_6.html#IDX273">encoding of PO files</A>
-<LI><A HREF="gettext_15.html#IDX1238">environment variables</A>
-<LI><A HREF="gettext_15.html#IDX1235"><CODE>envsubst</CODE> program, usage</A>
-<LI><A HREF="gettext_15.html#IDX1245"><CODE>eval_gettext</CODE> function, usage</A>
-<LI><A HREF="gettext_15.html#IDX1247"><CODE>eval_ngettext</CODE> function, usage</A>
+<LI><A HREF="gettext_9.html#IDX536">encoding conversion</A>
+<LI><A HREF="gettext_11.html#IDX1075">encoding conversion at runtime</A>
+<LI><A HREF="gettext_6.html#IDX272">encoding for your language</A>
+<LI><A HREF="gettext_6.html#IDX270">encoding list</A>
+<LI><A HREF="gettext_6.html#IDX267">encoding of PO files</A>
+<LI><A HREF="gettext_15.html#IDX1208">environment variables</A>
+<LI><A HREF="gettext_15.html#IDX1205"><CODE>envsubst</CODE> program, usage</A>
+<LI><A HREF="gettext_15.html#IDX1215"><CODE>eval_gettext</CODE> function, usage</A>
+<LI><A HREF="gettext_15.html#IDX1217"><CODE>eval_ngettext</CODE> function, usage</A>
 <LI><A HREF="gettext_1.html#IDX39">evolution of packages</A>
-<LI><A HREF="gettext_8.html#IDX537">extracting parts of a PO file into a compendium</A>
+<LI><A HREF="gettext_8.html#IDX531">extracting parts of a PO file into a compendium</A>
 </DIR>
 <H2><A NAME="cindex_f">f</A></H2>
 <DIR>
-<LI><A HREF="gettext_19.html#IDX1300">FDL, GNU Free Documentation License</A>
-<LI><A HREF="gettext_10.html#IDX1087">file format, <TT>&lsquo;.mo&rsquo;</TT></A>
+<LI><A HREF="gettext_19.html#IDX1270">FDL, GNU Free Documentation License</A>
+<LI><A HREF="gettext_10.html#IDX1057">file format, <TT>&lsquo;.mo&rsquo;</TT></A>
 <LI><A HREF="gettext_3.html#IDX56">file format, <TT>&lsquo;.po&rsquo;</TT></A>
 <LI><A HREF="gettext_1.html#IDX29">files, <TT>&lsquo;.po&rsquo;</TT> and <TT>&lsquo;.mo&rsquo;</TT></A>
 <LI><A HREF="gettext_1.html#IDX38">files, <TT>&lsquo;.pot&rsquo;</TT></A>
-<LI><A HREF="gettext_9.html#IDX843">filter messages according to attributes</A>
-<LI><A HREF="gettext_9.html#IDX783">find common messages</A>
-<LI><A HREF="gettext_10.html#IDX1027">force use of fuzzy entries</A>
-<LI><A HREF="gettext_4.html#IDX160">format strings</A>
-<LI><A HREF="gettext_15.html#IDX1267">Free Pascal</A>
-<LI><A HREF="gettext_5.html#IDX197">function attribute, __format__</A>
-<LI><A HREF="gettext_5.html#IDX198">function attribute, __format_arg__</A>
-<LI><A HREF="gettext_8.html#IDX408">fuzzy entries</A>
+<LI><A HREF="gettext_9.html#IDX830">filter messages according to attributes</A>
+<LI><A HREF="gettext_9.html#IDX770">find common messages</A>
+<LI><A HREF="gettext_10.html#IDX998">force use of fuzzy entries</A>
+<LI><A HREF="gettext_4.html#IDX154">format strings</A>
+<LI><A HREF="gettext_15.html#IDX1237">Free Pascal</A>
+<LI><A HREF="gettext_5.html#IDX191">function attribute, __format__</A>
+<LI><A HREF="gettext_5.html#IDX192">function attribute, __format_arg__</A>
+<LI><A HREF="gettext_8.html#IDX402">fuzzy entries</A>
 </DIR>
 <H2><A NAME="cindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1265">gawk</A>
-<LI><A HREF="gettext_15.html#IDX1286">GCC-source</A>
-<LI><A HREF="gettext_10.html#IDX969">generate binary message catalog from PO file</A>
-<LI><A HREF="gettext_9.html#IDX895">generate translation catalog in English</A>
-<LI><A HREF="gettext_13.html#IDX1159"><CODE>gettext</CODE> files</A>
-<LI><A HREF="gettext_8.html#IDX339"><CODE>gettext</CODE> installation</A>
-<LI><A HREF="gettext_11.html#IDX1099"><CODE>gettext</CODE> interface</A>
-<LI><A HREF="gettext_15.html#IDX1212"><CODE>gettext</CODE> program, usage</A>
-<LI><A HREF="gettext_11.html#IDX1098"><CODE>gettext</CODE>, a programmer's view</A>
-<LI><A HREF="gettext_11.html#IDX1126"><CODE>gettext</CODE> vs <CODE>catgets</CODE></A>
-<LI><A HREF="gettext_13.html#IDX1148"><CODE>gettextize</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX336">GNOME PO file editor</A>
-<LI><A HREF="gettext_19.html#IDX1296">GPL, GNU General Public License</A>
-<LI><A HREF="gettext_11.html#IDX1108">GUI programs</A>
-<LI><A HREF="gettext_15.html#IDX1258">guile</A>
+<LI><A HREF="gettext_15.html#IDX1235">gawk</A>
+<LI><A HREF="gettext_15.html#IDX1256">GCC-source</A>
+<LI><A HREF="gettext_10.html#IDX949">generate binary message catalog from PO file</A>
+<LI><A HREF="gettext_9.html#IDX880">generate translation catalog in English</A>
+<LI><A HREF="gettext_13.html#IDX1129"><CODE>gettext</CODE> files</A>
+<LI><A HREF="gettext_8.html#IDX333"><CODE>gettext</CODE> installation</A>
+<LI><A HREF="gettext_11.html#IDX1069"><CODE>gettext</CODE> interface</A>
+<LI><A HREF="gettext_15.html#IDX1182"><CODE>gettext</CODE> program, usage</A>
+<LI><A HREF="gettext_11.html#IDX1068"><CODE>gettext</CODE>, a programmer's view</A>
+<LI><A HREF="gettext_11.html#IDX1096"><CODE>gettext</CODE> vs <CODE>catgets</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1118"><CODE>gettextize</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX330">GNOME PO file editor</A>
+<LI><A HREF="gettext_19.html#IDX1266">GPL, GNU General Public License</A>
+<LI><A HREF="gettext_11.html#IDX1078">GUI programs</A>
+<LI><A HREF="gettext_15.html#IDX1228">guile</A>
 </DIR>
 <H2><A NAME="cindex_h">h</A></H2>
 <DIR>
-<LI><A HREF="gettext_10.html#IDX1089">hash table, inside MO files</A>
+<LI><A HREF="gettext_10.html#IDX1059">hash table, inside MO files</A>
 <LI><A HREF="gettext_1.html#IDX2">he, she, and they</A>
-<LI><A HREF="gettext_6.html#IDX271">header entry of a PO file</A>
-<LI><A HREF="gettext_4.html#IDX141">help option</A>
-<LI><A HREF="gettext_16.html#IDX1288">history of GNU <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_6.html#IDX265">header entry of a PO file</A>
+<LI><A HREF="gettext_4.html#IDX135">help option</A>
+<LI><A HREF="gettext_16.html#IDX1258">history of GNU <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_i">i</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX6">i18n</A>
-<LI><A HREF="gettext_8.html#IDX397">importing PO files</A>
-<LI><A HREF="gettext_1.html#IDX34">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_4.html#IDX125">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_11.html#IDX1128">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_13.html#IDX1174">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>
-<LI><A HREF="gettext_4.html#IDX126">initialization</A>
-<LI><A HREF="gettext_6.html#IDX248">initialize new PO file</A>
-<LI><A HREF="gettext_8.html#IDX538">initialize translations from a compendium</A>
-<LI><A HREF="gettext_8.html#IDX338">installing <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_11.html#IDX1093">interface to <CODE>catgets</CODE></A>
+<LI><A HREF="gettext_8.html#IDX391">importing PO files</A>
+<LI><A HREF="gettext_1.html#IDX34">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_4.html#IDX119">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_11.html#IDX1098">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_13.html#IDX1144">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>
+<LI><A HREF="gettext_4.html#IDX120">initialization</A>
+<LI><A HREF="gettext_6.html#IDX242">initialize new PO file</A>
+<LI><A HREF="gettext_8.html#IDX532">initialize translations from a compendium</A>
+<LI><A HREF="gettext_8.html#IDX332">installing <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_11.html#IDX1063">interface to <CODE>catgets</CODE></A>
 <LI><A HREF="gettext_1.html#IDX8">internationalization</A>
-<LI><A HREF="gettext_4.html#IDX144"><CODE>inttypes.h</CODE></A>
-<LI><A HREF="gettext_18.html#IDX1294">ISO 3166</A>
-<LI><A HREF="gettext_17.html#IDX1292">ISO 639</A>
+<LI><A HREF="gettext_4.html#IDX138"><CODE>inttypes.h</CODE></A>
+<LI><A HREF="gettext_18.html#IDX1264">ISO 3166</A>
+<LI><A HREF="gettext_17.html#IDX1262">ISO 639</A>
 </DIR>
 <H2><A NAME="cindex_j">j</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1260">Java</A>
-<LI><A HREF="gettext_10.html#IDX974">Java mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1044">Java mode, and <CODE>msgunfmt</CODE> program</A>
-<LI><A HREF="gettext_4.html#IDX145">Java, string concatenation</A>
+<LI><A HREF="gettext_15.html#IDX1230">Java</A>
+<LI><A HREF="gettext_10.html#IDX954">Java mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1014">Java mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_4.html#IDX139">Java, string concatenation</A>
 </DIR>
 <H2><A NAME="cindex_k">k</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX205">KDE format strings</A>
-<LI><A HREF="gettext_8.html#IDX335">KDE PO file editor</A>
-<LI><A HREF="gettext_10.html#IDX1022">keyboard accelerator checking</A>
+<LI><A HREF="gettext_5.html#IDX199">KDE format strings</A>
+<LI><A HREF="gettext_8.html#IDX329">KDE PO file editor</A>
+<LI><A HREF="gettext_10.html#IDX993">keyboard accelerator checking</A>
 </DIR>
 <H2><A NAME="cindex_l">l</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX7">l10n</A>
-<LI><A HREF="gettext_17.html#IDX1291">language codes</A>
+<LI><A HREF="gettext_17.html#IDX1261">language codes</A>
 <LI><A HREF="gettext_2.html#IDX42">language selection</A>
-<LI><A HREF="gettext_11.html#IDX1130">language selection at runtime</A>
-<LI><A HREF="gettext_11.html#IDX1102">large package</A>
-<LI><A HREF="gettext_19.html#IDX1298">LGPL, GNU Lesser General Public License</A>
-<LI><A HREF="gettext_13.html#IDX1184"><CODE>libiconv</CODE> library</A>
-<LI><A HREF="gettext_15.html#IDX1263"><CODE>libintl</CODE> for C#</A>
-<LI><A HREF="gettext_15.html#IDX1261"><CODE>libintl</CODE> for Java</A>
-<LI><A HREF="gettext_13.html#IDX1177"><CODE>libintl</CODE> library</A>
-<LI><A HREF="gettext_15.html#IDX1256"><CODE>librep</CODE> Lisp</A>
-<LI><A HREF="gettext_19.html#IDX1301">License, GNU FDL</A>
-<LI><A HREF="gettext_19.html#IDX1297">License, GNU GPL</A>
-<LI><A HREF="gettext_19.html#IDX1299">License, GNU LGPL</A>
-<LI><A HREF="gettext_19.html#IDX1295">Licenses</A>
+<LI><A HREF="gettext_11.html#IDX1100">language selection at runtime</A>
+<LI><A HREF="gettext_11.html#IDX1072">large package</A>
+<LI><A HREF="gettext_19.html#IDX1268">LGPL, GNU Lesser General Public License</A>
+<LI><A HREF="gettext_13.html#IDX1154"><CODE>libiconv</CODE> library</A>
+<LI><A HREF="gettext_15.html#IDX1233"><CODE>libintl</CODE> for C#</A>
+<LI><A HREF="gettext_15.html#IDX1231"><CODE>libintl</CODE> for Java</A>
+<LI><A HREF="gettext_13.html#IDX1147"><CODE>libintl</CODE> library</A>
+<LI><A HREF="gettext_15.html#IDX1226"><CODE>librep</CODE> Lisp</A>
+<LI><A HREF="gettext_19.html#IDX1271">License, GNU FDL</A>
+<LI><A HREF="gettext_19.html#IDX1267">License, GNU GPL</A>
+<LI><A HREF="gettext_19.html#IDX1269">License, GNU LGPL</A>
+<LI><A HREF="gettext_19.html#IDX1265">Licenses</A>
 <LI><A HREF="gettext_1.html#IDX35">link with <TT>&lsquo;libintl&rsquo;</TT></A>
-<LI><A HREF="gettext_1.html#IDX28">Linux</A>, <A HREF="gettext_1.html#IDX36">Linux</A>, <A HREF="gettext_6.html#IDX277">Linux</A>
-<LI><A HREF="gettext_15.html#IDX1252">Lisp</A>
-<LI><A HREF="gettext_6.html#IDX272">list of translation teams, where to find</A>
+<LI><A HREF="gettext_1.html#IDX28">Linux</A>, <A HREF="gettext_1.html#IDX36">Linux</A>, <A HREF="gettext_6.html#IDX271">Linux</A>
+<LI><A HREF="gettext_15.html#IDX1222">Lisp</A>
+<LI><A HREF="gettext_6.html#IDX266">list of translation teams, where to find</A>
 <LI><A HREF="gettext_1.html#IDX14">locale categories</A>, <A HREF="gettext_1.html#IDX27">locale categories</A>
-<LI><A HREF="gettext_4.html#IDX127">locale category, LC_ALL</A>
-<LI><A HREF="gettext_4.html#IDX130">locale category, LC_COLLATE</A>
-<LI><A HREF="gettext_1.html#IDX18">locale category, LC_CTYPE</A>, <A HREF="gettext_4.html#IDX128">locale category, LC_CTYPE</A>, <A HREF="gettext_4.html#IDX129">locale category, LC_CTYPE</A>
-<LI><A HREF="gettext_1.html#IDX26">locale category, LC_MESSAGES</A>, <A HREF="gettext_4.html#IDX134">locale category, LC_MESSAGES</A>
-<LI><A HREF="gettext_1.html#IDX20">locale category, LC_MONETARY</A>, <A HREF="gettext_4.html#IDX131">locale category, LC_MONETARY</A>
-<LI><A HREF="gettext_1.html#IDX24">locale category, LC_NUMERIC</A>, <A HREF="gettext_4.html#IDX132">locale category, LC_NUMERIC</A>
-<LI><A HREF="gettext_4.html#IDX135">locale category, LC_RESPONSES</A>
-<LI><A HREF="gettext_1.html#IDX22">locale category, LC_TIME</A>, <A HREF="gettext_4.html#IDX133">locale category, LC_TIME</A>
-<LI><A HREF="gettext_6.html#IDX275"><CODE>locale</CODE> program</A>
+<LI><A HREF="gettext_4.html#IDX121">locale category, LC_ALL</A>
+<LI><A HREF="gettext_4.html#IDX124">locale category, LC_COLLATE</A>
+<LI><A HREF="gettext_1.html#IDX18">locale category, LC_CTYPE</A>, <A HREF="gettext_4.html#IDX122">locale category, LC_CTYPE</A>, <A HREF="gettext_4.html#IDX123">locale category, LC_CTYPE</A>
+<LI><A HREF="gettext_1.html#IDX26">locale category, LC_MESSAGES</A>, <A HREF="gettext_4.html#IDX128">locale category, LC_MESSAGES</A>
+<LI><A HREF="gettext_1.html#IDX20">locale category, LC_MONETARY</A>, <A HREF="gettext_4.html#IDX125">locale category, LC_MONETARY</A>
+<LI><A HREF="gettext_1.html#IDX24">locale category, LC_NUMERIC</A>, <A HREF="gettext_4.html#IDX126">locale category, LC_NUMERIC</A>
+<LI><A HREF="gettext_4.html#IDX129">locale category, LC_RESPONSES</A>
+<LI><A HREF="gettext_1.html#IDX22">locale category, LC_TIME</A>, <A HREF="gettext_4.html#IDX127">locale category, LC_TIME</A>
+<LI><A HREF="gettext_6.html#IDX269"><CODE>locale</CODE> program</A>
 <LI><A HREF="gettext_1.html#IDX9">localization</A>
-<LI><A HREF="gettext_15.html#IDX1213">lookup message translation</A>, <A HREF="gettext_15.html#IDX1246">lookup message translation</A>
-<LI><A HREF="gettext_15.html#IDX1225">lookup plural message translation</A>, <A HREF="gettext_15.html#IDX1248">lookup plural message translation</A>
+<LI><A HREF="gettext_15.html#IDX1183">lookup message translation</A>, <A HREF="gettext_15.html#IDX1216">lookup message translation</A>
+<LI><A HREF="gettext_15.html#IDX1195">lookup plural message translation</A>, <A HREF="gettext_15.html#IDX1218">lookup plural message translation</A>
 </DIR>
 <H2><A NAME="cindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_10.html#IDX1088">magic signature of MO files</A>
-<LI><A HREF="gettext_9.html#IDX540">manipulating PO files</A>
-<LI><A HREF="gettext_15.html#IDX1275">marking Perl sources</A>
-<LI><A HREF="gettext_4.html#IDX163">marking string initializers</A>
-<LI><A HREF="gettext_4.html#IDX149">marking strings that require translation</A>
-<LI><A HREF="gettext_4.html#IDX136">marking strings, preparations</A>
+<LI><A HREF="gettext_10.html#IDX1058">magic signature of MO files</A>
+<LI><A HREF="gettext_9.html#IDX534">manipulating PO files</A>
+<LI><A HREF="gettext_15.html#IDX1245">marking Perl sources</A>
+<LI><A HREF="gettext_4.html#IDX157">marking string initializers</A>
+<LI><A HREF="gettext_4.html#IDX143">marking strings that require translation</A>
+<LI><A HREF="gettext_4.html#IDX130">marking strings, preparations</A>
 <LI><A HREF="gettext_1.html#IDX33">marking translatable strings</A>
-<LI><A HREF="gettext_4.html#IDX147">markup</A>
-<LI><A HREF="gettext_11.html#IDX1110">menu entries</A>
-<LI><A HREF="gettext_10.html#IDX1023">menu, keyboard accelerator support</A>
-<LI><A HREF="gettext_9.html#IDX551">merge PO files</A>
-<LI><A HREF="gettext_9.html#IDX541">merging two PO files</A>
-<LI><A HREF="gettext_11.html#IDX1103">message catalog files location</A>
+<LI><A HREF="gettext_4.html#IDX141">markup</A>
+<LI><A HREF="gettext_11.html#IDX1080">menu entries</A>
+<LI><A HREF="gettext_10.html#IDX994">menu, keyboard accelerator support</A>
+<LI><A HREF="gettext_9.html#IDX545">merge PO files</A>
+<LI><A HREF="gettext_9.html#IDX535">merging two PO files</A>
+<LI><A HREF="gettext_11.html#IDX1073">message catalog files location</A>
 <LI><A HREF="gettext_1.html#IDX25">messages</A>
-<LI><A HREF="gettext_13.html#IDX1145">migration from earlier versions of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_10.html#IDX1024">mnemonics of menu entries</A>
-<LI><A HREF="gettext_10.html#IDX1086">MO file's format</A>
-<LI><A HREF="gettext_9.html#IDX855">modify message attributes</A>
-<LI><A HREF="gettext_9.html#IDX842"><CODE>msgattrib</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX549"><CODE>msgcat</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX824"><CODE>msgcmp</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX782"><CODE>msgcomm</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX597"><CODE>msgconv</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX894"><CODE>msgen</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX927"><CODE>msgexec</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX702"><CODE>msgfilter</CODE> filter and catalog encoding</A>
-<LI><A HREF="gettext_9.html#IDX686"><CODE>msgfilter</CODE> program, usage</A>
-<LI><A HREF="gettext_10.html#IDX968"><CODE>msgfmt</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX631"><CODE>msggrep</CODE> program, usage</A>
-<LI><A HREF="gettext_6.html#IDX246"><CODE>msginit</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX283"><CODE>msgmerge</CODE> program, usage</A>
-<LI><A HREF="gettext_10.html#IDX1040"><CODE>msgunfmt</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX741"><CODE>msguniq</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX398">multi-line strings</A>
+<LI><A HREF="gettext_13.html#IDX1115">migration from earlier versions of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_10.html#IDX995">mnemonics of menu entries</A>
+<LI><A HREF="gettext_10.html#IDX1056">MO file's format</A>
+<LI><A HREF="gettext_9.html#IDX842">modify message attributes</A>
+<LI><A HREF="gettext_9.html#IDX829"><CODE>msgattrib</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX543"><CODE>msgcat</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX811"><CODE>msgcmp</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX769"><CODE>msgcomm</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX591"><CODE>msgconv</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX879"><CODE>msgen</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX912"><CODE>msgexec</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX691"><CODE>msgfilter</CODE> filter and catalog encoding</A>
+<LI><A HREF="gettext_9.html#IDX680"><CODE>msgfilter</CODE> program, usage</A>
+<LI><A HREF="gettext_10.html#IDX948"><CODE>msgfmt</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX625"><CODE>msggrep</CODE> program, usage</A>
+<LI><A HREF="gettext_6.html#IDX240"><CODE>msginit</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX277"><CODE>msgmerge</CODE> program, usage</A>
+<LI><A HREF="gettext_10.html#IDX1010"><CODE>msgunfmt</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX728"><CODE>msguniq</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX392">multi-line strings</A>
 </DIR>
 <H2><A NAME="cindex_n">n</A></H2>
 <DIR>
-<LI><A HREF="gettext_11.html#IDX1129"><CODE>N_</CODE>, a convenience macro</A>
+<LI><A HREF="gettext_11.html#IDX1099"><CODE>N_</CODE>, a convenience macro</A>
 <LI><A HREF="gettext_1.html#IDX11">Native Language Support</A>
 <LI><A HREF="gettext_1.html#IDX12">Natural Language Support</A>
-<LI><A HREF="gettext_3.html#IDX122">newlines in PO files</A>
-<LI><A HREF="gettext_11.html#IDX1118">ngettext</A>
-<LI><A HREF="gettext_15.html#IDX1224"><CODE>ngettext</CODE> program, usage</A>
+<LI><A HREF="gettext_3.html#IDX116">newlines in PO files</A>
+<LI><A HREF="gettext_11.html#IDX1088">ngettext</A>
+<LI><A HREF="gettext_15.html#IDX1194"><CODE>ngettext</CODE> program, usage</A>
 <LI><A HREF="gettext_1.html#IDX10">NLS</A>
 <LI><A HREF="gettext_1.html#IDX23">number format</A>
 </DIR>
 <H2><A NAME="cindex_o">o</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1268">Object Pascal</A>
-<LI><A HREF="gettext_8.html#IDX435">obsolete entries</A>
-<LI><A HREF="gettext_11.html#IDX1125">optimization of <CODE>gettext</CODE> functions</A>
-<LI><A HREF="gettext_9.html#IDX544">orthography</A>
-<LI><A HREF="gettext_15.html#IDX1202">outdigits</A>
-<LI><A HREF="gettext_5.html#IDX177">output to stdout, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_15.html#IDX1238">Object Pascal</A>
+<LI><A HREF="gettext_8.html#IDX429">obsolete entries</A>
+<LI><A HREF="gettext_11.html#IDX1095">optimization of <CODE>gettext</CODE> functions</A>
+<LI><A HREF="gettext_9.html#IDX538">orthography</A>
+<LI><A HREF="gettext_15.html#IDX1172">outdigits</A>
+<LI><A HREF="gettext_5.html#IDX171">output to stdout, <CODE>xgettext</CODE></A>
 <LI><A HREF="gettext_1.html#IDX30">overview of <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX1166">package and version declaration in <TT>&lsquo;configure.ac&rsquo;</TT></A>
-<LI><A HREF="gettext_14.html#IDX1197">package build and installation options</A>
-<LI><A HREF="gettext_14.html#IDX1196">package distributor's view of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_14.html#IDX1195">package installer's view of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_13.html#IDX1143">package maintainer's view of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_4.html#IDX140">paragraphs</A>
-<LI><A HREF="gettext_15.html#IDX1266">Pascal</A>
-<LI><A HREF="gettext_15.html#IDX1274">Perl</A>
-<LI><A HREF="gettext_15.html#IDX1276">Perl default keywords</A>
-<LI><A HREF="gettext_15.html#IDX1279">Perl invalid string interpolation</A>
-<LI><A HREF="gettext_15.html#IDX1282">Perl long lines</A>
-<LI><A HREF="gettext_15.html#IDX1281">Perl parentheses</A>
-<LI><A HREF="gettext_15.html#IDX1283">Perl pitfalls</A>
-<LI><A HREF="gettext_15.html#IDX1278">Perl quote-like expressions</A>
-<LI><A HREF="gettext_15.html#IDX1277">Perl special keywords for hash-lookups</A>
-<LI><A HREF="gettext_15.html#IDX1280">Perl valid string interpolation</A>
-<LI><A HREF="gettext_11.html#IDX1111">pgettext</A>
-<LI><A HREF="gettext_11.html#IDX1114">pgettext_expr</A>
-<LI><A HREF="gettext_15.html#IDX1284">PHP</A>
-<LI><A HREF="gettext_15.html#IDX1285">Pike</A>
-<LI><A HREF="gettext_11.html#IDX1124">plural form formulas</A>
-<LI><A HREF="gettext_11.html#IDX1117">plural forms</A>
-<LI><A HREF="gettext_10.html#IDX1091">plural forms, in MO files</A>
-<LI><A HREF="gettext_3.html#IDX120">plural forms, in PO files</A>
-<LI><A HREF="gettext_12.html#IDX1141">plural forms, translating</A>
+<LI><A HREF="gettext_13.html#IDX1136">package and version declaration in <TT>&lsquo;configure.ac&rsquo;</TT></A>
+<LI><A HREF="gettext_14.html#IDX1167">package build and installation options</A>
+<LI><A HREF="gettext_14.html#IDX1166">package distributor's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_14.html#IDX1165">package installer's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1113">package maintainer's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_4.html#IDX134">paragraphs</A>
+<LI><A HREF="gettext_15.html#IDX1236">Pascal</A>
+<LI><A HREF="gettext_15.html#IDX1244">Perl</A>
+<LI><A HREF="gettext_15.html#IDX1246">Perl default keywords</A>
+<LI><A HREF="gettext_15.html#IDX1249">Perl invalid string interpolation</A>
+<LI><A HREF="gettext_15.html#IDX1252">Perl long lines</A>
+<LI><A HREF="gettext_15.html#IDX1251">Perl parentheses</A>
+<LI><A HREF="gettext_15.html#IDX1253">Perl pitfalls</A>
+<LI><A HREF="gettext_15.html#IDX1248">Perl quote-like expressions</A>
+<LI><A HREF="gettext_15.html#IDX1247">Perl special keywords for hash-lookups</A>
+<LI><A HREF="gettext_15.html#IDX1250">Perl valid string interpolation</A>
+<LI><A HREF="gettext_11.html#IDX1081">pgettext</A>
+<LI><A HREF="gettext_11.html#IDX1084">pgettext_expr</A>
+<LI><A HREF="gettext_15.html#IDX1254">PHP</A>
+<LI><A HREF="gettext_15.html#IDX1255">Pike</A>
+<LI><A HREF="gettext_11.html#IDX1094">plural form formulas</A>
+<LI><A HREF="gettext_11.html#IDX1087">plural forms</A>
+<LI><A HREF="gettext_10.html#IDX1061">plural forms, in MO files</A>
+<LI><A HREF="gettext_3.html#IDX114">plural forms, in PO files</A>
+<LI><A HREF="gettext_12.html#IDX1111">plural forms, translating</A>
 <LI><A HREF="gettext_3.html#IDX55">PO files' format</A>
-<LI><A HREF="gettext_8.html#IDX342">PO mode (Emacs) commands</A>
-<LI><A HREF="gettext_5.html#IDX164">PO template file</A>
-<LI><A HREF="gettext_9.html#IDX959">po_file_domains</A>
-<LI><A HREF="gettext_9.html#IDX958">po_file_free</A>
-<LI><A HREF="gettext_9.html#IDX957">po_file_read</A>
-<LI><A HREF="gettext_9.html#IDX960">po_message_iterator</A>
-<LI><A HREF="gettext_9.html#IDX961">po_message_iterator_free</A>
-<LI><A HREF="gettext_9.html#IDX963">po_message_msgid</A>
-<LI><A HREF="gettext_9.html#IDX964">po_message_msgid_plural</A>
-<LI><A HREF="gettext_9.html#IDX965">po_message_msgstr</A>
-<LI><A HREF="gettext_9.html#IDX966">po_message_msgstr_plural</A>
-<LI><A HREF="gettext_9.html#IDX962">po_next_message</A>
-<LI><A HREF="gettext_9.html#IDX703">portability problems with <CODE>sed</CODE></A>
-<LI><A HREF="gettext_4.html#IDX124">preparing programs for translation</A>
-<LI><A HREF="gettext_15.html#IDX1210">preparing shell scripts for translation</A>
-<LI><A HREF="gettext_11.html#IDX1097">problems with <CODE>catgets</CODE> interface</A>
-<LI><A HREF="gettext_15.html#IDX1200">programming languages</A>
-<LI><A HREF="gettext_15.html#IDX1250">Python</A>
+<LI><A HREF="gettext_8.html#IDX336">PO mode (Emacs) commands</A>
+<LI><A HREF="gettext_5.html#IDX158">PO template file</A>
+<LI><A HREF="gettext_9.html#IDX939">po_file_domains</A>
+<LI><A HREF="gettext_9.html#IDX938">po_file_free</A>
+<LI><A HREF="gettext_9.html#IDX937">po_file_read</A>
+<LI><A HREF="gettext_9.html#IDX940">po_message_iterator</A>
+<LI><A HREF="gettext_9.html#IDX941">po_message_iterator_free</A>
+<LI><A HREF="gettext_9.html#IDX943">po_message_msgid</A>
+<LI><A HREF="gettext_9.html#IDX944">po_message_msgid_plural</A>
+<LI><A HREF="gettext_9.html#IDX945">po_message_msgstr</A>
+<LI><A HREF="gettext_9.html#IDX946">po_message_msgstr_plural</A>
+<LI><A HREF="gettext_9.html#IDX942">po_next_message</A>
+<LI><A HREF="gettext_9.html#IDX692">portability problems with <CODE>sed</CODE></A>
+<LI><A HREF="gettext_4.html#IDX118">preparing programs for translation</A>
+<LI><A HREF="gettext_15.html#IDX1180">preparing shell scripts for translation</A>
+<LI><A HREF="gettext_11.html#IDX1067">problems with <CODE>catgets</CODE> interface</A>
+<LI><A HREF="gettext_15.html#IDX1170">programming languages</A>
+<LI><A HREF="gettext_15.html#IDX1220">Python</A>
 </DIR>
 <H2><A NAME="cindex_q">q</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX203">Qt format strings</A>
-<LI><A HREF="gettext_10.html#IDX983">Qt mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_6.html#IDX280">quotation marks</A>, <A HREF="gettext_13.html#IDX1164">quotation marks</A>
-<LI><A HREF="gettext_6.html#IDX279">quote characters, use in PO files</A>
+<LI><A HREF="gettext_5.html#IDX197">Qt format strings</A>
+<LI><A HREF="gettext_10.html#IDX963">Qt mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_6.html#IDX274">quotation marks</A>, <A HREF="gettext_13.html#IDX1134">quotation marks</A>
+<LI><A HREF="gettext_6.html#IDX273">quote characters, use in PO files</A>
 </DIR>
 <H2><A NAME="cindex_r">r</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX712"><CODE>recode-sr-latin</CODE> program</A>
-<LI><A HREF="gettext_16.html#IDX1289">related reading</A>
-<LI><A HREF="gettext_13.html#IDX1193">release</A>
-<LI><A HREF="gettext_15.html#IDX1287">RST</A>
+<LI><A HREF="gettext_9.html#IDX701"><CODE>recode-sr-latin</CODE> program</A>
+<LI><A HREF="gettext_16.html#IDX1259">related reading</A>
+<LI><A HREF="gettext_13.html#IDX1163">release</A>
+<LI><A HREF="gettext_15.html#IDX1257">RST</A>
 </DIR>
 <H2><A NAME="cindex_s">s</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1257">Scheme</A>
-<LI><A HREF="gettext_15.html#IDX1201">scripting languages</A>
-<LI><A HREF="gettext_9.html#IDX632">search messages in a catalog</A>
+<LI><A HREF="gettext_15.html#IDX1227">Scheme</A>
+<LI><A HREF="gettext_15.html#IDX1171">scripting languages</A>
+<LI><A HREF="gettext_9.html#IDX626">search messages in a catalog</A>
 <LI><A HREF="gettext_2.html#IDX41">selecting message language</A>
-<LI><A HREF="gettext_4.html#IDX139">sentences</A>
-<LI><A HREF="gettext_14.html#IDX1198">setting up <CODE>gettext</CODE> at build time</A>
+<LI><A HREF="gettext_4.html#IDX133">sentences</A>
+<LI><A HREF="gettext_14.html#IDX1168">setting up <CODE>gettext</CODE> at build time</A>
 <LI><A HREF="gettext_2.html#IDX40">setting up <CODE>gettext</CODE> at run time</A>
-<LI><A HREF="gettext_11.html#IDX1100">several domains</A>
+<LI><A HREF="gettext_11.html#IDX1070">several domains</A>
 <LI><A HREF="gettext_1.html#IDX1">sex</A>
 <LI><A HREF="gettext_1.html#IDX3">she, he, and they</A>
-<LI><A HREF="gettext_15.html#IDX1236">shell format string</A>
-<LI><A HREF="gettext_15.html#IDX1205">shell scripts</A>
-<LI><A HREF="gettext_15.html#IDX1259">Smalltalk</A>
-<LI><A HREF="gettext_9.html#IDX589">sorting <CODE>msgcat</CODE> output</A>
-<LI><A HREF="gettext_7.html#IDX322">sorting <CODE>msgmerge</CODE> output</A>
-<LI><A HREF="gettext_10.html#IDX1079">sorting <CODE>msgunfmt</CODE> output</A>
-<LI><A HREF="gettext_5.html#IDX226">sorting output of <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_11.html#IDX1121">specifying plural form in a PO file</A>
-<LI><A HREF="gettext_9.html#IDX558">standard output, and <CODE>msgcat</CODE></A>
-<LI><A HREF="gettext_7.html#IDX292">standard output, and <CODE>msgmerge</CODE> program</A>
-<LI><A HREF="gettext_4.html#IDX142">string concatenation</A>
-<LI><A HREF="gettext_8.html#IDX394">string normalization in entries</A>
-<LI><A HREF="gettext_4.html#IDX137">style</A>
-<LI><A HREF="gettext_5.html#IDX180">supported languages, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_15.html#IDX1206">shell format string</A>
+<LI><A HREF="gettext_15.html#IDX1175">shell scripts</A>
+<LI><A HREF="gettext_15.html#IDX1229">Smalltalk</A>
+<LI><A HREF="gettext_9.html#IDX583">sorting <CODE>msgcat</CODE> output</A>
+<LI><A HREF="gettext_7.html#IDX316">sorting <CODE>msgmerge</CODE> output</A>
+<LI><A HREF="gettext_10.html#IDX1049">sorting <CODE>msgunfmt</CODE> output</A>
+<LI><A HREF="gettext_5.html#IDX220">sorting output of <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_11.html#IDX1091">specifying plural form in a PO file</A>
+<LI><A HREF="gettext_9.html#IDX552">standard output, and <CODE>msgcat</CODE></A>
+<LI><A HREF="gettext_7.html#IDX286">standard output, and <CODE>msgmerge</CODE> program</A>
+<LI><A HREF="gettext_4.html#IDX136">string concatenation</A>
+<LI><A HREF="gettext_8.html#IDX388">string normalization in entries</A>
+<LI><A HREF="gettext_4.html#IDX131">style</A>
+<LI><A HREF="gettext_5.html#IDX174">supported languages, <CODE>xgettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1272">Tcl</A>
-<LI><A HREF="gettext_10.html#IDX981">Tcl mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1050">Tcl mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1242">Tcl</A>
+<LI><A HREF="gettext_10.html#IDX961">Tcl mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1020">Tcl mode, and <CODE>msgunfmt</CODE> program</A>
 <LI><A HREF="gettext_1.html#IDX37">template PO file</A>
-<LI><A HREF="gettext_5.html#IDX230">testing <TT>&lsquo;.po&rsquo;</TT> files for equivalence</A>
-<LI><A HREF="gettext_15.html#IDX1273">Tk's scripting language</A>
-<LI><A HREF="gettext_8.html#IDX399">translated entries</A>
-<LI><A HREF="gettext_11.html#IDX1109">translating menu entries</A>
+<LI><A HREF="gettext_5.html#IDX224">testing <TT>&lsquo;.po&rsquo;</TT> files for equivalence</A>
+<LI><A HREF="gettext_15.html#IDX1243">Tk's scripting language</A>
+<LI><A HREF="gettext_8.html#IDX393">translated entries</A>
+<LI><A HREF="gettext_11.html#IDX1079">translating menu entries</A>
 <LI><A HREF="gettext_1.html#IDX13">translation aspects</A>
 <LI><A HREF="gettext_2.html#IDX52">Translation Matrix</A>
 <LI><A HREF="gettext_1.html#IDX5">Translation Project</A>
-<LI><A HREF="gettext_13.html#IDX1172">turning off NLS support</A>
+<LI><A HREF="gettext_13.html#IDX1142">turning off NLS support</A>
 <LI><A HREF="gettext_1.html#IDX32">tutorial of <CODE>gettext</CODE> usage</A>
 </DIR>
 <H2><A NAME="cindex_u">u</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX742">unify duplicate translations</A>
-<LI><A HREF="gettext_8.html#IDX424">untranslated entries</A>
-<LI><A HREF="gettext_8.html#IDX539">update translations from a compendium</A>
-<LI><A HREF="gettext_13.html#IDX1146">upgrading to new versions of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_9.html#IDX729">unify duplicate translations</A>
+<LI><A HREF="gettext_8.html#IDX418">untranslated entries</A>
+<LI><A HREF="gettext_8.html#IDX533">update translations from a compendium</A>
+<LI><A HREF="gettext_13.html#IDX1116">upgrading to new versions of <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_v">v</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX296">version control for backup files, <CODE>msgmerge</CODE></A>
+<LI><A HREF="gettext_7.html#IDX290">version control for backup files, <CODE>msgmerge</CODE></A>
 </DIR>
 <H2><A NAME="cindex_w">w</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1269"><CODE>wxWidgets</CODE> library</A>
+<LI><A HREF="gettext_15.html#IDX1239"><CODE>wxWidgets</CODE> library</A>
 </DIR>
 <H2><A NAME="cindex_x">x</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX929"><CODE>xargs</CODE>, and output from <CODE>msgexec</CODE></A>
-<LI><A HREF="gettext_5.html#IDX166"><CODE>xgettext</CODE> program, usage</A>
-<LI><A HREF="gettext_6.html#IDX281"><CODE>xmodmap</CODE> program, and typing quotation marks</A>
+<LI><A HREF="gettext_9.html#IDX914"><CODE>xargs</CODE>, and output from <CODE>msgexec</CODE></A>
+<LI><A HREF="gettext_5.html#IDX160"><CODE>xgettext</CODE> program, usage</A>
+<LI><A HREF="gettext_6.html#IDX275"><CODE>xmodmap</CODE> program, and typing quotation marks</A>
 </DIR>
 <H2><A NAME="cindex_y">y</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1271">YaST2 scripting language</A>
-<LI><A HREF="gettext_15.html#IDX1270">YCP</A>
+<LI><A HREF="gettext_15.html#IDX1241">YaST2 scripting language</A>
+<LI><A HREF="gettext_15.html#IDX1240">YCP</A>
 </DIR>
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_2.html gettext-0.18.1.1/gettext-tools/doc/gettext_2.html
--- gettext-0.19.3/gettext-tools/doc/gettext_2.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_2.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 2  The User's View</TITLE>
@@ -126,8 +126,8 @@
 <SAMP>&lsquo;<VAR>ll</VAR>&rsquo;</SAMP> is an ISO 639 two-letter language code, and
 <SAMP>&lsquo;<VAR>CC</VAR>&rsquo;</SAMP> is an ISO 3166 two-letter country code.  For example,
 for German in Germany, <VAR>ll</VAR> is <CODE>de</CODE>, and <VAR>CC</VAR> is <CODE>DE</CODE>.
-You find a list of the language codes in appendix section <A HREF="gettext_17.html#SEC325">A  Language Codes</A> and
-a list of the country codes in appendix section <A HREF="gettext_18.html#SEC328">B  Country Codes</A>.
+You find a list of the language codes in appendix section <A HREF="gettext_17.html#SEC318">A  Language Codes</A> and
+a list of the country codes in appendix section <A HREF="gettext_18.html#SEC321">B  Country Codes</A>.
 
 </P>
 <P>
@@ -144,7 +144,7 @@
 switched to locales in UTF-8 encoding.  For example, the German locale on
 glibc systems is nowadays <SAMP>&lsquo;de_DE.UTF-8&rsquo;</SAMP>.  The older name <SAMP>&lsquo;de_DE&rsquo;</SAMP>
 still refers to the German locale as of 2000 that stores characters in
-ISO-8859-1 encoding -- a text encoding that cannot even accommodate the Euro
+ISO-8859-1 encoding -- a text encoding that cannot even accomodate the Euro
 currency sign.
 
 </P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_3.html gettext-0.18.1.1/gettext-tools/doc/gettext_3.html
--- gettext-0.19.3/gettext-tools/doc/gettext_3.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_3.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 3  The Format of PO Files</TITLE>
@@ -153,7 +153,7 @@
 
 When the <CODE>c-format</CODE> flag is given for a string the <CODE>msgfmt</CODE>
 program does some more tests to check the validity of the translation.
-See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, section <A HREF="gettext_4.html#SEC22">4.6  Special Comments preceding Keywords</A> and section <A HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A>.
+See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, section <A HREF="gettext_4.html#SEC22">4.6  Special Comments preceding Keywords</A> and section <A HREF="gettext_15.html#SEC249">15.3.1  C Format Strings</A>.
 
 <DT><CODE>objc-format</CODE>
 <DD>
@@ -161,7 +161,7 @@
 <DT><CODE>no-objc-format</CODE>
 <DD>
 <A NAME="IDX66"></A>
-Likewise for Objective C, see section <A HREF="gettext_15.html#SEC252">15.3.2  Objective C Format Strings</A>.
+Likewise for Objective C, see section <A HREF="gettext_15.html#SEC250">15.3.2  Objective C Format Strings</A>.
 
 <DT><CODE>sh-format</CODE>
 <DD>
@@ -169,7 +169,7 @@
 <DT><CODE>no-sh-format</CODE>
 <DD>
 <A NAME="IDX68"></A>
-Likewise for Shell, see section <A HREF="gettext_15.html#SEC253">15.3.3  Shell Format Strings</A>.
+Likewise for Shell, see section <A HREF="gettext_15.html#SEC251">15.3.3  Shell Format Strings</A>.
 
 <DT><CODE>python-format</CODE>
 <DD>
@@ -177,197 +177,173 @@
 <DT><CODE>no-python-format</CODE>
 <DD>
 <A NAME="IDX70"></A>
-Likewise for Python, see section <A HREF="gettext_15.html#SEC254">15.3.4  Python Format Strings</A>.
-
-<DT><CODE>python-brace-format</CODE>
-<DD>
-<A NAME="IDX71"></A>
-<DT><CODE>no-python-brace-format</CODE>
-<DD>
-<A NAME="IDX72"></A>
-Likewise for Python brace, see section <A HREF="gettext_15.html#SEC254">15.3.4  Python Format Strings</A>.
+Likewise for Python, see section <A HREF="gettext_15.html#SEC252">15.3.4  Python Format Strings</A>.
 
 <DT><CODE>lisp-format</CODE>
 <DD>
-<A NAME="IDX73"></A>
+<A NAME="IDX71"></A>
 <DT><CODE>no-lisp-format</CODE>
 <DD>
-<A NAME="IDX74"></A>
-Likewise for Lisp, see section <A HREF="gettext_15.html#SEC255">15.3.5  Lisp Format Strings</A>.
+<A NAME="IDX72"></A>
+Likewise for Lisp, see section <A HREF="gettext_15.html#SEC253">15.3.5  Lisp Format Strings</A>.
 
 <DT><CODE>elisp-format</CODE>
 <DD>
-<A NAME="IDX75"></A>
+<A NAME="IDX73"></A>
 <DT><CODE>no-elisp-format</CODE>
 <DD>
-<A NAME="IDX76"></A>
-Likewise for Emacs Lisp, see section <A HREF="gettext_15.html#SEC256">15.3.6  Emacs Lisp Format Strings</A>.
+<A NAME="IDX74"></A>
+Likewise for Emacs Lisp, see section <A HREF="gettext_15.html#SEC254">15.3.6  Emacs Lisp Format Strings</A>.
 
 <DT><CODE>librep-format</CODE>
 <DD>
-<A NAME="IDX77"></A>
+<A NAME="IDX75"></A>
 <DT><CODE>no-librep-format</CODE>
 <DD>
-<A NAME="IDX78"></A>
-Likewise for librep, see section <A HREF="gettext_15.html#SEC257">15.3.7  librep Format Strings</A>.
+<A NAME="IDX76"></A>
+Likewise for librep, see section <A HREF="gettext_15.html#SEC255">15.3.7  librep Format Strings</A>.
 
 <DT><CODE>scheme-format</CODE>
 <DD>
-<A NAME="IDX79"></A>
+<A NAME="IDX77"></A>
 <DT><CODE>no-scheme-format</CODE>
 <DD>
-<A NAME="IDX80"></A>
-Likewise for Scheme, see section <A HREF="gettext_15.html#SEC258">15.3.8  Scheme Format Strings</A>.
+<A NAME="IDX78"></A>
+Likewise for Scheme, see section <A HREF="gettext_15.html#SEC256">15.3.8  Scheme Format Strings</A>.
 
 <DT><CODE>smalltalk-format</CODE>
 <DD>
-<A NAME="IDX81"></A>
+<A NAME="IDX79"></A>
 <DT><CODE>no-smalltalk-format</CODE>
 <DD>
-<A NAME="IDX82"></A>
-Likewise for Smalltalk, see section <A HREF="gettext_15.html#SEC259">15.3.9  Smalltalk Format Strings</A>.
+<A NAME="IDX80"></A>
+Likewise for Smalltalk, see section <A HREF="gettext_15.html#SEC257">15.3.9  Smalltalk Format Strings</A>.
 
 <DT><CODE>java-format</CODE>
 <DD>
-<A NAME="IDX83"></A>
+<A NAME="IDX81"></A>
 <DT><CODE>no-java-format</CODE>
 <DD>
-<A NAME="IDX84"></A>
-Likewise for Java, see section <A HREF="gettext_15.html#SEC260">15.3.10  Java Format Strings</A>.
+<A NAME="IDX82"></A>
+Likewise for Java, see section <A HREF="gettext_15.html#SEC258">15.3.10  Java Format Strings</A>.
 
 <DT><CODE>csharp-format</CODE>
 <DD>
-<A NAME="IDX85"></A>
+<A NAME="IDX83"></A>
 <DT><CODE>no-csharp-format</CODE>
 <DD>
-<A NAME="IDX86"></A>
-Likewise for C#, see section <A HREF="gettext_15.html#SEC261">15.3.11  C# Format Strings</A>.
+<A NAME="IDX84"></A>
+Likewise for C#, see section <A HREF="gettext_15.html#SEC259">15.3.11  C# Format Strings</A>.
 
 <DT><CODE>awk-format</CODE>
 <DD>
-<A NAME="IDX87"></A>
+<A NAME="IDX85"></A>
 <DT><CODE>no-awk-format</CODE>
 <DD>
-<A NAME="IDX88"></A>
-Likewise for awk, see section <A HREF="gettext_15.html#SEC262">15.3.12  awk Format Strings</A>.
+<A NAME="IDX86"></A>
+Likewise for awk, see section <A HREF="gettext_15.html#SEC260">15.3.12  awk Format Strings</A>.
 
 <DT><CODE>object-pascal-format</CODE>
 <DD>
-<A NAME="IDX89"></A>
+<A NAME="IDX87"></A>
 <DT><CODE>no-object-pascal-format</CODE>
 <DD>
-<A NAME="IDX90"></A>
-Likewise for Object Pascal, see section <A HREF="gettext_15.html#SEC263">15.3.13  Object Pascal Format Strings</A>.
+<A NAME="IDX88"></A>
+Likewise for Object Pascal, see section <A HREF="gettext_15.html#SEC261">15.3.13  Object Pascal Format Strings</A>.
 
 <DT><CODE>ycp-format</CODE>
 <DD>
-<A NAME="IDX91"></A>
+<A NAME="IDX89"></A>
 <DT><CODE>no-ycp-format</CODE>
 <DD>
-<A NAME="IDX92"></A>
-Likewise for YCP, see section <A HREF="gettext_15.html#SEC264">15.3.14  YCP Format Strings</A>.
+<A NAME="IDX90"></A>
+Likewise for YCP, see section <A HREF="gettext_15.html#SEC262">15.3.14  YCP Format Strings</A>.
 
 <DT><CODE>tcl-format</CODE>
 <DD>
-<A NAME="IDX93"></A>
+<A NAME="IDX91"></A>
 <DT><CODE>no-tcl-format</CODE>
 <DD>
-<A NAME="IDX94"></A>
-Likewise for Tcl, see section <A HREF="gettext_15.html#SEC265">15.3.15  Tcl Format Strings</A>.
+<A NAME="IDX92"></A>
+Likewise for Tcl, see section <A HREF="gettext_15.html#SEC263">15.3.15  Tcl Format Strings</A>.
 
 <DT><CODE>perl-format</CODE>
 <DD>
-<A NAME="IDX95"></A>
+<A NAME="IDX93"></A>
 <DT><CODE>no-perl-format</CODE>
 <DD>
-<A NAME="IDX96"></A>
-Likewise for Perl, see section <A HREF="gettext_15.html#SEC266">15.3.16  Perl Format Strings</A>.
+<A NAME="IDX94"></A>
+Likewise for Perl, see section <A HREF="gettext_15.html#SEC264">15.3.16  Perl Format Strings</A>.
 
 <DT><CODE>perl-brace-format</CODE>
 <DD>
-<A NAME="IDX97"></A>
+<A NAME="IDX95"></A>
 <DT><CODE>no-perl-brace-format</CODE>
 <DD>
-<A NAME="IDX98"></A>
-Likewise for Perl brace, see section <A HREF="gettext_15.html#SEC266">15.3.16  Perl Format Strings</A>.
+<A NAME="IDX96"></A>
+Likewise for Perl brace, see section <A HREF="gettext_15.html#SEC264">15.3.16  Perl Format Strings</A>.
 
 <DT><CODE>php-format</CODE>
 <DD>
-<A NAME="IDX99"></A>
+<A NAME="IDX97"></A>
 <DT><CODE>no-php-format</CODE>
 <DD>
-<A NAME="IDX100"></A>
-Likewise for PHP, see section <A HREF="gettext_15.html#SEC267">15.3.17  PHP Format Strings</A>.
+<A NAME="IDX98"></A>
+Likewise for PHP, see section <A HREF="gettext_15.html#SEC265">15.3.17  PHP Format Strings</A>.
 
 <DT><CODE>gcc-internal-format</CODE>
 <DD>
-<A NAME="IDX101"></A>
+<A NAME="IDX99"></A>
 <DT><CODE>no-gcc-internal-format</CODE>
 <DD>
-<A NAME="IDX102"></A>
-Likewise for the GCC sources, see section <A HREF="gettext_15.html#SEC268">15.3.18  GCC internal Format Strings</A>.
+<A NAME="IDX100"></A>
+Likewise for the GCC sources, see section <A HREF="gettext_15.html#SEC266">15.3.18  GCC internal Format Strings</A>.
 
 <DT><CODE>gfc-internal-format</CODE>
 <DD>
-<A NAME="IDX103"></A>
+<A NAME="IDX101"></A>
 <DT><CODE>no-gfc-internal-format</CODE>
 <DD>
-<A NAME="IDX104"></A>
-Likewise for the GNU Fortran Compiler sources, see section <A HREF="gettext_15.html#SEC269">15.3.19  GFC internal Format Strings</A>.
+<A NAME="IDX102"></A>
+Likewise for the GNU Fortran Compiler sources, see section <A HREF="gettext_15.html#SEC267">15.3.19  GFC internal Format Strings</A>.
 
 <DT><CODE>qt-format</CODE>
 <DD>
-<A NAME="IDX105"></A>
+<A NAME="IDX103"></A>
 <DT><CODE>no-qt-format</CODE>
 <DD>
-<A NAME="IDX106"></A>
-Likewise for Qt, see section <A HREF="gettext_15.html#SEC270">15.3.20  Qt Format Strings</A>.
+<A NAME="IDX104"></A>
+Likewise for Qt, see section <A HREF="gettext_15.html#SEC268">15.3.20  Qt Format Strings</A>.
 
 <DT><CODE>qt-plural-format</CODE>
 <DD>
-<A NAME="IDX107"></A>
+<A NAME="IDX105"></A>
 <DT><CODE>no-qt-plural-format</CODE>
 <DD>
-<A NAME="IDX108"></A>
-Likewise for Qt plural forms, see section <A HREF="gettext_15.html#SEC271">15.3.21  Qt Format Strings</A>.
+<A NAME="IDX106"></A>
+Likewise for Qt plural forms, see section <A HREF="gettext_15.html#SEC269">15.3.21  Qt Format Strings</A>.
 
 <DT><CODE>kde-format</CODE>
 <DD>
-<A NAME="IDX109"></A>
+<A NAME="IDX107"></A>
 <DT><CODE>no-kde-format</CODE>
 <DD>
-<A NAME="IDX110"></A>
-Likewise for KDE, see section <A HREF="gettext_15.html#SEC272">15.3.22  KDE Format Strings</A>.
+<A NAME="IDX108"></A>
+Likewise for KDE, see section <A HREF="gettext_15.html#SEC270">15.3.22  KDE Format Strings</A>.
 
 <DT><CODE>boost-format</CODE>
 <DD>
-<A NAME="IDX111"></A>
+<A NAME="IDX109"></A>
 <DT><CODE>no-boost-format</CODE>
 <DD>
-<A NAME="IDX112"></A>
-Likewise for Boost, see section <A HREF="gettext_15.html#SEC273">15.3.23  Boost Format Strings</A>.
-
-<DT><CODE>lua-format</CODE>
-<DD>
-<A NAME="IDX113"></A>
-<DT><CODE>no-lua-format</CODE>
-<DD>
-<A NAME="IDX114"></A>
-Likewise for Lua, see section <A HREF="gettext_15.html#SEC274">15.3.24  Lua Format Strings</A>.
-
-<DT><CODE>javascript-format</CODE>
-<DD>
-<A NAME="IDX115"></A>
-<DT><CODE>no-javascript-format</CODE>
-<DD>
-<A NAME="IDX116"></A>
-Likewise for JavaScript, see section <A HREF="gettext_15.html#SEC275">15.3.25  JavaScript Format Strings</A>.
+<A NAME="IDX110"></A>
+Likewise for Boost, see section <A HREF="gettext_15.html#SEC271">15.3.23  Boost Format Strings</A>.
 
 </DL>
 
 <P>
-<A NAME="IDX117"></A>
-<A NAME="IDX118"></A>
+<A NAME="IDX111"></A>
+<A NAME="IDX112"></A>
 It is also possible to have entries with a context specifier. They look like
 this:
 
@@ -395,8 +371,8 @@
 
 </P>
 <P>
-<A NAME="IDX119"></A>
-<A NAME="IDX120"></A>
+<A NAME="IDX113"></A>
+<A NAME="IDX114"></A>
 A different kind of entries is used for translations which involve
 plural forms.
 
@@ -444,7 +420,7 @@
 
 <DT><CODE>range:</CODE>
 <DD>
-<A NAME="IDX121"></A>
+<A NAME="IDX115"></A>
 This flag is followed by a range of non-negative numbers, using the syntax
 <CODE>range: <VAR>minimum-value</VAR>..<VAR>maximum-value</VAR></CODE>.  It designates the
 possible values that the numeric parameter of the message can take.  In some
@@ -474,14 +450,6 @@
 
 </P>
 <P>
-An empty <VAR>untranslated-string</VAR> is reserved to contain the header
-entry with the meta information (see section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A>).  This header
-entry should be the first entry of the file.  The empty
-<VAR>untranslated-string</VAR> is reserved for this purpose and must
-not be used anywhere else.
-
-</P>
-<P>
 Each of <VAR>untranslated-string</VAR> and <VAR>translated-string</VAR> respects
 the C syntax for a character string, including the surrounding quotes
 and embedded backslashed escape sequences.  When the time comes
@@ -516,7 +484,7 @@
 
 </P>
 <P>
-<A NAME="IDX122"></A>
+<A NAME="IDX116"></A>
 One should carefully distinguish between end of lines marked as
 <SAMP>&lsquo;\n&rsquo;</SAMP> <EM>inside</EM> quotes, which are part of the represented
 string, and end of lines in the PO file itself, outside string quotes,
@@ -524,7 +492,7 @@
 
 </P>
 <P>
-<A NAME="IDX123"></A>
+<A NAME="IDX117"></A>
 Outside strings, white lines and comments may be used freely.
 Comments start at the beginning of a line with <SAMP>&lsquo;#&rsquo;</SAMP> and extend
 until the end of the PO file line.  Comments written by translators
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_4.html gettext-0.18.1.1/gettext-tools/doc/gettext_4.html
--- gettext-0.19.3/gettext-tools/doc/gettext_4.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_4.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 4  Preparing Program Sources</TITLE>
@@ -13,7 +13,7 @@
 
 <H1><A NAME="SEC16" HREF="gettext_toc.html#TOC16">4  Preparing Program Sources</A></H1>
 <P>
-<A NAME="IDX124"></A>
+<A NAME="IDX118"></A>
 
 </P>
 
@@ -35,12 +35,12 @@
 <P>
 Presuming that your set of programs, or package, has been adjusted
 so all needed GNU <CODE>gettext</CODE> files are available, and your
-<TT>&lsquo;Makefile&rsquo;</TT> files are adjusted (see section <A HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>), each C module
+<TT>&lsquo;Makefile&rsquo;</TT> files are adjusted (see section <A HREF="gettext_13.html#SEC211">13  The Maintainer's View</A>), each C module
 having translated C strings should contain the line:
 
 </P>
 <P>
-<A NAME="IDX125"></A>
+<A NAME="IDX119"></A>
 
 <PRE>
 #include &#60;libintl.h&#62;
@@ -62,7 +62,7 @@
 <H2><A NAME="SEC18" HREF="gettext_toc.html#TOC18">4.2  Triggering <CODE>gettext</CODE> Operations</A></H2>
 
 <P>
-<A NAME="IDX126"></A>
+<A NAME="IDX120"></A>
 The initialization of locale data should be done with more or less
 the same code in every program, as demonstrated below:
 
@@ -87,8 +87,8 @@
 
 </P>
 <P>
-<A NAME="IDX127"></A>
-<A NAME="IDX128"></A>
+<A NAME="IDX121"></A>
+<A NAME="IDX122"></A>
 The use of <CODE>LC_ALL</CODE> might not be appropriate for you.
 <CODE>LC_ALL</CODE> includes all locale categories and especially
 <CODE>LC_CTYPE</CODE>.  This latter category is responsible for determining
@@ -129,13 +129,13 @@
 </PRE>
 
 <P>
+<A NAME="IDX123"></A>
+<A NAME="IDX124"></A>
+<A NAME="IDX125"></A>
+<A NAME="IDX126"></A>
+<A NAME="IDX127"></A>
+<A NAME="IDX128"></A>
 <A NAME="IDX129"></A>
-<A NAME="IDX130"></A>
-<A NAME="IDX131"></A>
-<A NAME="IDX132"></A>
-<A NAME="IDX133"></A>
-<A NAME="IDX134"></A>
-<A NAME="IDX135"></A>
 On all POSIX conformant systems the locale categories <CODE>LC_CTYPE</CODE>,
 <CODE>LC_MESSAGES</CODE>, <CODE>LC_COLLATE</CODE>, <CODE>LC_MONETARY</CODE>,
 <CODE>LC_NUMERIC</CODE>, and <CODE>LC_TIME</CODE> are available.  On some systems
@@ -170,7 +170,7 @@
 <H2><A NAME="SEC19" HREF="gettext_toc.html#TOC19">4.3  Preparing Translatable Strings</A></H2>
 
 <P>
-<A NAME="IDX136"></A>
+<A NAME="IDX130"></A>
 Before strings can be marked for translations, they sometimes need to
 be adjusted.  Usually preparing a string for translation is done right
 before marking it, during the marking phase which is described in the
@@ -206,7 +206,7 @@
 
 </P>
 <P>
-<A NAME="IDX137"></A>
+<A NAME="IDX131"></A>
 Translatable strings should be in good English style.  If slang language
 with abbreviations and shortcuts is used, often translators will not
 understand the message and will produce very inappropriate translations.
@@ -235,13 +235,13 @@
 
 </P>
 <P>
-<A NAME="IDX138"></A>
+<A NAME="IDX132"></A>
 In both cases, adding more words to the message will help both the
 translator and the English speaking user.
 
 </P>
 <P>
-<A NAME="IDX139"></A>
+<A NAME="IDX133"></A>
 Translatable strings should be entire sentences.  It is often not possible
 to translate single verbs or adjectives in a substitutable way.
 
@@ -327,7 +327,7 @@
 
 </P>
 <P>
-<A NAME="IDX140"></A>
+<A NAME="IDX134"></A>
 Translatable strings should be limited to one paragraph; don't let a
 single message be longer than ten lines.  The reason is that when the
 translatable string changes, the translator is faced with the task of
@@ -338,7 +338,7 @@
 
 </P>
 <P>
-<A NAME="IDX141"></A>
+<A NAME="IDX135"></A>
 Many GNU programs have a <SAMP>&lsquo;--help&rsquo;</SAMP> output that extends over several
 screen pages.  It is a courtesy towards the translators to split such a
 message into several ones of five to ten lines each.  While doing that,
@@ -349,8 +349,8 @@
 
 </P>
 <P>
-<A NAME="IDX142"></A>
-<A NAME="IDX143"></A>
+<A NAME="IDX136"></A>
+<A NAME="IDX137"></A>
 Hardcoded string concatenation is sometimes used to construct English
 strings:
 
@@ -377,7 +377,7 @@
 </PRE>
 
 <P>
-<A NAME="IDX144"></A>
+<A NAME="IDX138"></A>
 A similar case is compile time concatenation of strings.  The ISO C 99
 include file <CODE>&#60;inttypes.h&#62;</CODE> contains a macro <CODE>PRId64</CODE> that
 can be used as a formatting directive for outputting an <SAMP>&lsquo;int64_t&rsquo;</SAMP>
@@ -431,8 +431,8 @@
 
 </P>
 <P>
-<A NAME="IDX145"></A>
-<A NAME="IDX146"></A>
+<A NAME="IDX139"></A>
+<A NAME="IDX140"></A>
 All this applies to other programming languages as well.  For example, in
 Java and C#, string concatenation is very frequently used, because it is a
 compiler built-in operator.  Like in C, in Java, you would change
@@ -474,8 +474,8 @@
 </PRE>
 
 <P>
-<A NAME="IDX147"></A>
-<A NAME="IDX148"></A>
+<A NAME="IDX141"></A>
+<A NAME="IDX142"></A>
 Unusual markup or control characters should not be used in translatable
 strings.  Translators will likely not understand the particular meaning
 of the markup or control characters.
@@ -511,7 +511,7 @@
 
 <H2><A NAME="SEC20" HREF="gettext_toc.html#TOC20">4.4  How Marks Appear in Sources</A></H2>
 <P>
-<A NAME="IDX149"></A>
+<A NAME="IDX143"></A>
 
 </P>
 <P>
@@ -562,7 +562,7 @@
 
 </P>
 <P>
-<A NAME="IDX150"></A>
+<A NAME="IDX144"></A>
 Many packages use <SAMP>&lsquo;_&rsquo;</SAMP> (a simple underline) as a keyword,
 and write <SAMP>&lsquo;_("Translatable string")&rsquo;</SAMP> instead of <SAMP>&lsquo;gettext
 ("Translatable string")&rsquo;</SAMP>.  Further, the coding rule, from GNU standards,
@@ -594,7 +594,7 @@
 the function call; this is useful in C++.  All this is achieved using
 <CODE>xgettext</CODE>'s <SAMP>&lsquo;--keyword&rsquo;</SAMP> option.  How to pass such an option
 to <CODE>xgettext</CODE>, assuming that <CODE>gettextize</CODE> is used, is described
-in section <A HREF="gettext_13.html#SEC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A> and section <A HREF="gettext_13.html#SEC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
+in section <A HREF="gettext_13.html#SEC218">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A> and section <A HREF="gettext_13.html#SEC235">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
 
 </P>
 <P>
@@ -618,7 +618,7 @@
 
 <H2><A NAME="SEC21" HREF="gettext_toc.html#TOC21">4.5  Marking Translatable Strings</A></H2>
 <P>
-<A NAME="IDX151"></A>
+<A NAME="IDX145"></A>
 
 </P>
 <P>
@@ -635,7 +635,7 @@
 
 </P>
 <P>
-<A NAME="IDX152"></A>
+<A NAME="IDX146"></A>
 The set of program sources, targeted by the PO mode commands describe
 here, should have an Emacs tags table constructed for your project,
 prior to using these PO file commands.  This is easy to do.  In any
@@ -657,7 +657,7 @@
 
 </P>
 <P>
-<A NAME="IDX153"></A>
+<A NAME="IDX147"></A>
 For packages following the GNU coding standards, there is
 a make goal <CODE>tags</CODE> or <CODE>TAGS</CODE> which constructs the tag files in
 all directories and for all files containing source code.
@@ -677,18 +677,18 @@
 
 <DT><KBD>,</KBD>
 <DD>
-<A NAME="IDX154"></A>
+<A NAME="IDX148"></A>
 Search through program sources for a string which looks like a
 candidate for translation (<CODE>po-tags-search</CODE>).
 
 <DT><KBD>M-,</KBD>
 <DD>
-<A NAME="IDX155"></A>
+<A NAME="IDX149"></A>
 Mark the last string found with <SAMP>&lsquo;_()&rsquo;</SAMP> (<CODE>po-mark-translatable</CODE>).
 
 <DT><KBD>M-.</KBD>
 <DD>
-<A NAME="IDX156"></A>
+<A NAME="IDX150"></A>
 Mark the last string found with a keyword taken from a set of possible
 keywords.  This command with a prefix allows some management of these
 keywords (<CODE>po-select-mark-and-mark</CODE>).
@@ -696,7 +696,7 @@
 </DL>
 
 <P>
-<A NAME="IDX157"></A>
+<A NAME="IDX151"></A>
 The <KBD>,</KBD> (<CODE>po-tags-search</CODE>) command searches for the next
 occurrence of a string which looks like a possible candidate for
 translation, and displays the program source in another Emacs window,
@@ -748,8 +748,8 @@
 
 </P>
 <P>
-<A NAME="IDX158"></A>
-<A NAME="IDX159"></A>
+<A NAME="IDX152"></A>
+<A NAME="IDX153"></A>
 The <KBD>M-,</KBD> (<CODE>po-mark-translatable</CODE>) command will mark the
 recently found string with the <SAMP>&lsquo;_&rsquo;</SAMP> keyword.  The <KBD>M-.</KBD>
 (<CODE>po-select-mark-and-mark</CODE>) command will request that you type
@@ -810,7 +810,7 @@
 <H2><A NAME="SEC22" HREF="gettext_toc.html#TOC22">4.6  Special Comments preceding Keywords</A></H2>
 
 <P>
-<A NAME="IDX160"></A>
+<A NAME="IDX154"></A>
 In C programs strings are often used within calls of functions from the
 <CODE>printf</CODE> family.  The special thing about these format strings is
 that they can contain format specifiers introduced with <KBD>%</KBD>.  Assume
@@ -840,13 +840,13 @@
 
 </P>
 <P>
-To prevent errors at runtime caused by translations, the <CODE>msgfmt</CODE>
+To prevent errors at runtime caused by translations the <CODE>msgfmt</CODE>
 tool can check statically whether the arguments in the original and the
 translation string match in type and number.  If this is not the case
 and the <SAMP>&lsquo;-c&rsquo;</SAMP> option has been passed to <CODE>msgfmt</CODE>, <CODE>msgfmt</CODE>
-will give an error and refuse to produce a MO file.  Thus consistent
+will give an error and refuse to produce a MO file.  Thus consequent
 use of <SAMP>&lsquo;msgfmt -c&rsquo;</SAMP> will catch the error, so that it cannot cause
-problems at runtime.
+cause problems at runtime.
 
 </P>
 <P>
@@ -864,22 +864,22 @@
 
 </P>
 <P>
-Because not all strings in a program will be format strings, it is not
+Because not all strings in a program must be format strings it is not
 useful for <CODE>msgfmt</CODE> to test all the strings in the <TT>&lsquo;.po&rsquo;</TT> file.
 This might cause problems because the string might contain what looks
 like a format specifier, but the string is not used in <CODE>printf</CODE>.
 
 </P>
 <P>
-Therefore <CODE>xgettext</CODE> adds a special tag to those messages it
+Therefore the <CODE>xgettext</CODE> adds a special tag to those messages it
 thinks might be a format string.  There is no absolute rule for this,
 only a heuristic.  In the <TT>&lsquo;.po&rsquo;</TT> file the entry is marked using the
 <CODE>c-format</CODE> flag in the <CODE>#,</CODE> comment line (see section <A HREF="gettext_3.html#SEC15">3  The Format of PO Files</A>).
 
 </P>
 <P>
-<A NAME="IDX161"></A>
-<A NAME="IDX162"></A>
+<A NAME="IDX155"></A>
+<A NAME="IDX156"></A>
 The careful reader now might say that this again can cause problems.
 The heuristic might guess it wrong.  This is true and therefore
 <CODE>xgettext</CODE> knows about a special kind of comment which lets
@@ -925,7 +925,7 @@
 <H2><A NAME="SEC23" HREF="gettext_toc.html#TOC23">4.7  Special Cases of Translatable Strings</A></H2>
 
 <P>
-<A NAME="IDX163"></A>
+<A NAME="IDX157"></A>
 The attentive reader might now point out that it is not always possible
 to mark translatable string with <CODE>gettext</CODE> or something like this.
 Consider the following case:
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_5.html gettext-0.18.1.1/gettext-tools/doc/gettext_5.html
--- gettext-0.19.3/gettext-tools/doc/gettext_5.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_5.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 5  Making the PO Template File</TITLE>
@@ -13,7 +13,7 @@
 
 <H1><A NAME="SEC27" HREF="gettext_toc.html#TOC27">5  Making the PO Template File</A></H1>
 <P>
-<A NAME="IDX164"></A>
+<A NAME="IDX158"></A>
 
 </P>
 <P>
@@ -36,8 +36,8 @@
 <H2><A NAME="SEC28" HREF="gettext_toc.html#TOC28">5.1  Invoking the <CODE>xgettext</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX165"></A>
-<A NAME="IDX166"></A>
+<A NAME="IDX159"></A>
+<A NAME="IDX160"></A>
 
 <PRE>
 xgettext [<VAR>option</VAR>] [<VAR>inputfile</VAR>] ...
@@ -62,8 +62,8 @@
 <DD>
 <DT><SAMP>&lsquo;--files-from=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX167"></A>
-<A NAME="IDX168"></A>
+<A NAME="IDX161"></A>
+<A NAME="IDX162"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -71,8 +71,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX169"></A>
-<A NAME="IDX170"></A>
+<A NAME="IDX163"></A>
+<A NAME="IDX164"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -93,16 +93,16 @@
 <DD>
 <DT><SAMP>&lsquo;--default-domain=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX171"></A>
-<A NAME="IDX172"></A>
+<A NAME="IDX165"></A>
+<A NAME="IDX166"></A>
 Use <TT>&lsquo;<VAR>name</VAR>.po&rsquo;</TT> for output (instead of <TT>&lsquo;messages.po&rsquo;</TT>).
 
 <DT><SAMP>&lsquo;-o <VAR>file</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--output=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX173"></A>
-<A NAME="IDX174"></A>
+<A NAME="IDX167"></A>
+<A NAME="IDX168"></A>
 Write output to specified file (instead of <TT>&lsquo;<VAR>name</VAR>.po&rsquo;</TT> or
 <TT>&lsquo;messages.po&rsquo;</TT>).
 
@@ -110,14 +110,14 @@
 <DD>
 <DT><SAMP>&lsquo;--output-dir=<VAR>dir</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX175"></A>
-<A NAME="IDX176"></A>
+<A NAME="IDX169"></A>
+<A NAME="IDX170"></A>
 Output files will be placed in directory <VAR>dir</VAR>.
 
 </DL>
 
 <P>
-<A NAME="IDX177"></A>
+<A NAME="IDX171"></A>
 If the output <VAR>file</VAR> is <SAMP>&lsquo;-&rsquo;</SAMP> or <SAMP>&lsquo;/dev/stdout&rsquo;</SAMP>, the output
 is written to standard output.
 
@@ -132,23 +132,22 @@
 <DD>
 <DT><SAMP>&lsquo;--language=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX178"></A>
-<A NAME="IDX179"></A>
-<A NAME="IDX180"></A>
+<A NAME="IDX172"></A>
+<A NAME="IDX173"></A>
+<A NAME="IDX174"></A>
 Specifies the language of the input files.  The supported languages
-are <CODE>C</CODE>, <CODE>C++</CODE>, <CODE>ObjectiveC</CODE>, <CODE>PO</CODE>, <CODE>Shell</CODE>,
-<CODE>Python</CODE>, <CODE>Lisp</CODE>, <CODE>EmacsLisp</CODE>, <CODE>librep</CODE>, <CODE>Scheme</CODE>,
-<CODE>Smalltalk</CODE>, <CODE>Java</CODE>, <CODE>JavaProperties</CODE>, <CODE>C#</CODE>, <CODE>awk</CODE>,
-<CODE>YCP</CODE>, <CODE>Tcl</CODE>, <CODE>Perl</CODE>, <CODE>PHP</CODE>, <CODE>GCC-source</CODE>,
-<CODE>NXStringTable</CODE>, <CODE>RST</CODE>, <CODE>Glade</CODE>, <CODE>Lua</CODE>, <CODE>JavaScript</CODE>,
-<CODE>Vala</CODE>, <CODE>GSettings</CODE>, <CODE>Desktop</CODE>.
+are <CODE>C</CODE>, <CODE>C++</CODE>, <CODE>ObjectiveC</CODE>, <CODE>PO</CODE>, <CODE>Python</CODE>,
+<CODE>Lisp</CODE>, <CODE>EmacsLisp</CODE>, <CODE>librep</CODE>, <CODE>Scheme</CODE>, <CODE>Smalltalk</CODE>,
+<CODE>Java</CODE>, <CODE>JavaProperties</CODE>, <CODE>C#</CODE>, <CODE>awk</CODE>, <CODE>YCP</CODE>,
+<CODE>Tcl</CODE>, <CODE>Perl</CODE>, <CODE>PHP</CODE>, <CODE>GCC-source</CODE>, <CODE>NXStringTable</CODE>,
+<CODE>RST</CODE>, <CODE>Glade</CODE>.
 
 <DT><SAMP>&lsquo;-C&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--c++&rsquo;</SAMP>
 <DD>
-<A NAME="IDX181"></A>
-<A NAME="IDX182"></A>
+<A NAME="IDX175"></A>
+<A NAME="IDX176"></A>
 This is a shorthand for <CODE>--language=C++</CODE>.
 
 </DL>
@@ -166,7 +165,7 @@
 
 <DT><SAMP>&lsquo;--from-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX183"></A>
+<A NAME="IDX177"></A>
 Specifies the encoding of the input files.  This option is needed only
 if some untranslated message strings or their corresponding comments
 contain non-ASCII characters.  Note that Tcl and Glade input files are
@@ -188,16 +187,16 @@
 <DD>
 <DT><SAMP>&lsquo;--join-existing&rsquo;</SAMP>
 <DD>
-<A NAME="IDX184"></A>
-<A NAME="IDX185"></A>
+<A NAME="IDX178"></A>
+<A NAME="IDX179"></A>
 Join messages with existing file.
 
 <DT><SAMP>&lsquo;-x <VAR>file</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--exclude-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX186"></A>
-<A NAME="IDX187"></A>
+<A NAME="IDX180"></A>
+<A NAME="IDX181"></A>
 Entries from <VAR>file</VAR> are not extracted.  <VAR>file</VAR> should be a PO or
 POT file.
 
@@ -205,8 +204,8 @@
 <DD>
 <DT><SAMP>&lsquo;--add-comments[=<VAR>tag</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX188"></A>
-<A NAME="IDX189"></A>
+<A NAME="IDX182"></A>
+<A NAME="IDX183"></A>
 Place comment blocks starting with <VAR>tag</VAR> and preceding keyword lines
 in the output file.  Without a <VAR>tag</VAR>, the option means to put <EM>all</EM>
 comment blocks preceding keyword lines in the output file.
@@ -223,25 +222,25 @@
 <DD>
 <DT><SAMP>&lsquo;--extract-all&rsquo;</SAMP>
 <DD>
-<A NAME="IDX190"></A>
-<A NAME="IDX191"></A>
+<A NAME="IDX184"></A>
+<A NAME="IDX185"></A>
 Extract all strings.
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
-GCC-source, Glade, Lua, JavaScript, Vala, GSettings.
+GCC-source, Glade.
 
 <DT><SAMP>&lsquo;-k[<VAR>keywordspec</VAR>]&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--keyword[=<VAR>keywordspec</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX192"></A>
-<A NAME="IDX193"></A>
+<A NAME="IDX186"></A>
+<A NAME="IDX187"></A>
 Specify <VAR>keywordspec</VAR> as an additional keyword to be looked for.
 Without a <VAR>keywordspec</VAR>, the option means to not use default keywords.
 
-<A NAME="IDX194"></A>
-<A NAME="IDX195"></A>
+<A NAME="IDX188"></A>
+<A NAME="IDX189"></A>
 If <VAR>keywordspec</VAR> is a C identifier <VAR>id</VAR>, <CODE>xgettext</CODE> looks
 for strings in the first argument of each call to the function or macro
 <VAR>id</VAR>.  If <VAR>keywordspec</VAR> is of the form
@@ -274,7 +273,7 @@
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
-GCC-source, Glade, Lua, JavaScript, Vala, GSettings, Desktop.
+GCC-source, Glade.
 
 The default keyword specifications, which are always looked for if not
 explicitly disabled, are language dependent.  They are:
@@ -355,29 +354,6 @@
 
 For Glade 1: <CODE>label</CODE>, <CODE>title</CODE>, <CODE>text</CODE>, <CODE>format</CODE>,
 <CODE>copyright</CODE>, <CODE>comments</CODE>, <CODE>preview_text</CODE>, <CODE>tooltip</CODE>.
-
-<LI>
-
-For Lua: <CODE>_</CODE>, <CODE>gettext.gettext</CODE>, <CODE>gettext.dgettext:2</CODE>,
-<CODE>gettext.dcgettext:2</CODE>, <CODE>gettext.ngettext:1,2</CODE>,
-<CODE>gettext.dngettext:2,3</CODE>, <CODE>gettext.dcngettext:2,3</CODE>.
-
-<LI>
-
-For JavaScript: <CODE>_</CODE>, <CODE>gettext</CODE>, <CODE>dgettext:2</CODE>,
-<CODE>dcgettext:2</CODE>, <CODE>ngettext:1,2</CODE>, <CODE>dngettext:2,3</CODE>,
-<CODE>pgettext:1c,2</CODE>, <CODE>dpgettext:2c,3</CODE>.
-
-<LI>
-
-For Vala: <CODE>_</CODE>, <CODE>Q_</CODE>, <CODE>N_</CODE>, <CODE>NC_</CODE>, <CODE>dgettext:2</CODE>,
-<CODE>dcgettext:2</CODE>, <CODE>ngettext:1,2</CODE>, <CODE>dngettext:2,3</CODE>,
-<CODE>dpgettext:2c,3</CODE>, <CODE>dpgettext2:2c,3</CODE>.
-
-<LI>
-
-For Desktop: <CODE>Name</CODE>, <CODE>GenericName</CODE>, <CODE>Comment</CODE>,
-<CODE>Icon</CODE>, <CODE>Keywords</CODE>.
 </UL>
 
 To disable the default keyword specifications, the option <SAMP>&lsquo;-k&rsquo;</SAMP> or
@@ -386,13 +362,13 @@
 
 <DT><SAMP>&lsquo;--flag=<VAR>word</VAR>:<VAR>arg</VAR>:<VAR>flag</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX196"></A>
+<A NAME="IDX190"></A>
 Specifies additional flags for strings occurring as part of the <VAR>arg</VAR>th
 argument of the function <VAR>word</VAR>.  The possible flags are the possible
 format string indicators, such as <SAMP>&lsquo;c-format&rsquo;</SAMP>, and their negations,
 such as <SAMP>&lsquo;no-c-format&rsquo;</SAMP>, possibly prefixed with <SAMP>&lsquo;pass-&rsquo;</SAMP>.
 <BR>
-<A NAME="IDX197"></A>
+<A NAME="IDX191"></A>
 The meaning of <CODE>--flag=<VAR>function</VAR>:<VAR>arg</VAR>:<VAR>lang</VAR>-format</CODE>
 is that in language <VAR>lang</VAR>, the specified <VAR>function</VAR> expects as
 <VAR>arg</VAR>th argument a format string.  (For those of you familiar with
@@ -410,7 +386,7 @@
 translators cannot accidentally use format string directives that would
 lead to a crash at runtime.
 <BR>
-<A NAME="IDX198"></A>
+<A NAME="IDX192"></A>
 The meaning of <CODE>--flag=<VAR>function</VAR>:<VAR>arg</VAR>:pass-<VAR>lang</VAR>-format</CODE>
 is that in language <VAR>lang</VAR>, if the <VAR>function</VAR> call occurs in a
 position that must yield a format string, then its <VAR>arg</VAR>th argument
@@ -431,47 +407,47 @@
 <BR>
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk, YCP, Tcl, Perl, PHP,
-GCC-source, Lua, JavaScript, Vala.
+GCC-source.
 
 <DT><SAMP>&lsquo;-T&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--trigraphs&rsquo;</SAMP>
 <DD>
-<A NAME="IDX199"></A>
-<A NAME="IDX200"></A>
-<A NAME="IDX201"></A>
+<A NAME="IDX193"></A>
+<A NAME="IDX194"></A>
+<A NAME="IDX195"></A>
 Understand ANSI C trigraphs for input.
 <BR>
 This option has an effect only with the languages C, C++, ObjectiveC.
 
 <DT><SAMP>&lsquo;--qt&rsquo;</SAMP>
 <DD>
-<A NAME="IDX202"></A>
-<A NAME="IDX203"></A>
+<A NAME="IDX196"></A>
+<A NAME="IDX197"></A>
 Recognize Qt format strings.
 <BR>
 This option has an effect only with the language C++.
 
 <DT><SAMP>&lsquo;--kde&rsquo;</SAMP>
 <DD>
-<A NAME="IDX204"></A>
-<A NAME="IDX205"></A>
+<A NAME="IDX198"></A>
+<A NAME="IDX199"></A>
 Recognize KDE 4 format strings.
 <BR>
 This option has an effect only with the language C++.
 
 <DT><SAMP>&lsquo;--boost&rsquo;</SAMP>
 <DD>
-<A NAME="IDX206"></A>
-<A NAME="IDX207"></A>
+<A NAME="IDX200"></A>
+<A NAME="IDX201"></A>
 Recognize Boost format strings.
 <BR>
 This option has an effect only with the language C++.
 
 <DT><SAMP>&lsquo;--debug&rsquo;</SAMP>
 <DD>
-<A NAME="IDX208"></A>
-<A NAME="IDX209"></A>
+<A NAME="IDX202"></A>
+<A NAME="IDX203"></A>
 Use the flags <CODE>c-format</CODE> and <CODE>possible-c-format</CODE> to show who was
 responsible for marking a message as a format string.  The latter form is
 used if the <CODE>xgettext</CODE> program decided, the format form is used if
@@ -498,67 +474,61 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX210"></A>
+<A NAME="IDX204"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX211"></A>
+<A NAME="IDX205"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX212"></A>
+<A NAME="IDX206"></A>
 Always write an output file even if no message is defined.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX213"></A>
-<A NAME="IDX214"></A>
+<A NAME="IDX207"></A>
+<A NAME="IDX208"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX215"></A>
+<A NAME="IDX209"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.  Note that using
 this option makes it harder for technically skilled translators to understand
 each message's context.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX216"></A>
-<A NAME="IDX217"></A>
+<A NAME="IDX210"></A>
+<A NAME="IDX211"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX218"></A>
+<A NAME="IDX212"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
 
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX219"></A>
+<A NAME="IDX213"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX220"></A>
+<A NAME="IDX214"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -566,15 +536,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX221"></A>
-<A NAME="IDX222"></A>
+<A NAME="IDX215"></A>
+<A NAME="IDX216"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX223"></A>
+<A NAME="IDX217"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -583,9 +553,9 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX224"></A>
-<A NAME="IDX225"></A>
-<A NAME="IDX226"></A>
+<A NAME="IDX218"></A>
+<A NAME="IDX219"></A>
+<A NAME="IDX220"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -593,16 +563,16 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX227"></A>
-<A NAME="IDX228"></A>
+<A NAME="IDX221"></A>
+<A NAME="IDX222"></A>
 Sort output by file location.
 
 <DT><SAMP>&lsquo;--omit-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX229"></A>
+<A NAME="IDX223"></A>
 Don't write header with <SAMP>&lsquo;msgid ""&rsquo;</SAMP> entry.
 
-<A NAME="IDX230"></A>
+<A NAME="IDX224"></A>
 This is useful for testing purposes because it eliminates a source
 of variance for generated <CODE>.gmo</CODE> files.  With <CODE>--omit-header</CODE>,
 two invocations of <CODE>xgettext</CODE> on the same files with the same
@@ -613,7 +583,7 @@
 
 <DT><SAMP>&lsquo;--copyright-holder=<VAR>string</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX231"></A>
+<A NAME="IDX225"></A>
 Set the copyright holder in the output.  <VAR>string</VAR> should be the
 copyright holder of the surrounding package.  (Note that the msgstr
 strings, extracted from the package's sources, belong to the copyright
@@ -629,25 +599,25 @@
 
 <DT><SAMP>&lsquo;--foreign-user&rsquo;</SAMP>
 <DD>
-<A NAME="IDX232"></A>
+<A NAME="IDX226"></A>
 Omit FSF copyright in output.  This option is equivalent to
 <SAMP>&lsquo;--copyright-holder=”&rsquo;</SAMP>.  It can be useful for packages outside the GNU
 project that want their translations to be in the public domain.
 
 <DT><SAMP>&lsquo;--package-name=<VAR>package</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX233"></A>
+<A NAME="IDX227"></A>
 Set the package name in the header of the output.
 
 <DT><SAMP>&lsquo;--package-version=<VAR>version</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX234"></A>
+<A NAME="IDX228"></A>
 Set the package version in the header of the output.  This option has an
 effect only if the <SAMP>&lsquo;--package-name&rsquo;</SAMP> option is also used.
 
 <DT><SAMP>&lsquo;--msgid-bugs-address=<VAR>email@address</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX235"></A>
+<A NAME="IDX229"></A>
 Set the reporting address for msgid bugs.  This is the email address or URL
 to which the translators shall report bugs in the untranslated strings:
 
@@ -681,16 +651,16 @@
 <DD>
 <DT><SAMP>&lsquo;--msgstr-prefix[=<VAR>string</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX236"></A>
-<A NAME="IDX237"></A>
+<A NAME="IDX230"></A>
+<A NAME="IDX231"></A>
 Use <VAR>string</VAR> (or "" if not specified) as prefix for msgstr values.
 
 <DT><SAMP>&lsquo;-M[<VAR>string</VAR>]&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgstr-suffix[=<VAR>string</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX238"></A>
-<A NAME="IDX239"></A>
+<A NAME="IDX232"></A>
+<A NAME="IDX233"></A>
 Use <VAR>string</VAR> (or "" if not specified) as suffix for msgstr values.
 
 </DL>
@@ -705,16 +675,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX240"></A>
-<A NAME="IDX241"></A>
+<A NAME="IDX234"></A>
+<A NAME="IDX235"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX242"></A>
-<A NAME="IDX243"></A>
+<A NAME="IDX236"></A>
+<A NAME="IDX237"></A>
 Output version information and exit.
 
 </DL>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_6.html gettext-0.18.1.1/gettext-tools/doc/gettext_6.html
--- gettext-0.19.3/gettext-tools/doc/gettext_6.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_6.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 6  Creating a New PO File</TITLE>
@@ -13,7 +13,7 @@
 
 <H1><A NAME="SEC37" HREF="gettext_toc.html#TOC37">6  Creating a New PO File</A></H1>
 <P>
-<A NAME="IDX244"></A>
+<A NAME="IDX238"></A>
 
 </P>
 <P>
@@ -48,16 +48,16 @@
 <H2><A NAME="SEC38" HREF="gettext_toc.html#TOC38">6.1  Invoking the <CODE>msginit</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX245"></A>
-<A NAME="IDX246"></A>
+<A NAME="IDX239"></A>
+<A NAME="IDX240"></A>
 
 <PRE>
 msginit [<VAR>option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX247"></A>
-<A NAME="IDX248"></A>
+<A NAME="IDX241"></A>
+<A NAME="IDX242"></A>
 The <CODE>msginit</CODE> program creates a new PO file, initializing the meta
 information with values from the user's environment.
 
@@ -72,8 +72,8 @@
 <DD>
 <DT><SAMP>&lsquo;--input=<VAR>inputfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX249"></A>
-<A NAME="IDX250"></A>
+<A NAME="IDX243"></A>
+<A NAME="IDX244"></A>
 Input POT file.
 
 </DL>
@@ -93,8 +93,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX251"></A>
-<A NAME="IDX252"></A>
+<A NAME="IDX245"></A>
+<A NAME="IDX246"></A>
 Write output to specified PO file.
 
 </DL>
@@ -115,14 +115,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX253"></A>
-<A NAME="IDX254"></A>
+<A NAME="IDX247"></A>
+<A NAME="IDX248"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX255"></A>
+<A NAME="IDX249"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -138,15 +138,15 @@
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>ll_CC</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX256"></A>
-<A NAME="IDX257"></A>
+<A NAME="IDX250"></A>
+<A NAME="IDX251"></A>
 Set target locale.  <VAR>ll</VAR> should be a language code, and <VAR>CC</VAR> should
 be a country code.  The command <SAMP>&lsquo;locale -a&rsquo;</SAMP> can be used to output a list
 of all installed locales.  The default is the user's locale setting.
 
 <DT><SAMP>&lsquo;--no-translator&rsquo;</SAMP>
 <DD>
-<A NAME="IDX258"></A>
+<A NAME="IDX252"></A>
 Declares that the PO file will not have a human translator and is instead
 automatically generated.
 
@@ -154,13 +154,13 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX259"></A>
+<A NAME="IDX253"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX260"></A>
+<A NAME="IDX254"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
@@ -168,15 +168,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX261"></A>
-<A NAME="IDX262"></A>
+<A NAME="IDX255"></A>
+<A NAME="IDX256"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX263"></A>
+<A NAME="IDX257"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -184,15 +184,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX264"></A>
-<A NAME="IDX265"></A>
+<A NAME="IDX258"></A>
+<A NAME="IDX259"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX266"></A>
+<A NAME="IDX260"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -209,16 +209,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX267"></A>
-<A NAME="IDX268"></A>
+<A NAME="IDX261"></A>
+<A NAME="IDX262"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX269"></A>
-<A NAME="IDX270"></A>
+<A NAME="IDX263"></A>
+<A NAME="IDX264"></A>
 Output version information and exit.
 
 </DL>
@@ -227,7 +227,7 @@
 
 <H2><A NAME="SEC44" HREF="gettext_toc.html#TOC44">6.2  Filling in the Header Entry</A></H2>
 <P>
-<A NAME="IDX271"></A>
+<A NAME="IDX265"></A>
 
 </P>
 <P>
@@ -297,7 +297,7 @@
 your translation team, not only to make sure you don't do duplicated work,
 but also to coordinate difficult linguistic issues.
 
-<A NAME="IDX272"></A>
+<A NAME="IDX266"></A>
 In the Free Translation Project, each translation team has its own mailing
 list.  The up-to-date list of teams can be found at the Free Translation
 Project's homepage, <A HREF="http://translationproject.org/">http://translationproject.org/</A>, in the "Teams"
@@ -313,7 +313,7 @@
 <LI>
 
 <SAMP>&lsquo;<VAR>ll</VAR>&rsquo;</SAMP>, an ISO 639 two-letter language code (lowercase).
-See section <A HREF="gettext_17.html#SEC325">A  Language Codes</A> for the list of codes.
+See section <A HREF="gettext_17.html#SEC318">A  Language Codes</A> for the list of codes.
 
 <LI>
 
@@ -322,8 +322,8 @@
 country code (uppercase).  The country code specification is not redundant:
 Some languages have dialects in different countries.  For example,
 <SAMP>&lsquo;de_AT&rsquo;</SAMP> is used for Austria, and <SAMP>&lsquo;pt_BR&rsquo;</SAMP> for Brazil.  The country
-code serves to distinguish the dialects. See section <A HREF="gettext_17.html#SEC325">A  Language Codes</A> and
-section <A HREF="gettext_18.html#SEC328">B  Country Codes</A> for the lists of codes.
+code serves to distinguish the dialects. See section <A HREF="gettext_17.html#SEC318">A  Language Codes</A> and
+section <A HREF="gettext_18.html#SEC321">B  Country Codes</A> for the lists of codes.
 
 <LI>
 
@@ -362,14 +362,14 @@
 
 <DT>Content-Type
 <DD>
-<A NAME="IDX273"></A>
-<A NAME="IDX274"></A>
+<A NAME="IDX267"></A>
+<A NAME="IDX268"></A>
 Replace <SAMP>&lsquo;CHARSET&rsquo;</SAMP> with the character encoding used for your language,
 in your locale, or UTF-8.  This field is needed for correct operation of the
 <CODE>msgmerge</CODE> and <CODE>msgfmt</CODE> programs, as well as for users whose
-locale's character encoding differs from yours (see section <A HREF="gettext_11.html#SEC187">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>).
+locale's character encoding differs from yours (see section <A HREF="gettext_11.html#SEC186">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>).
 
-<A NAME="IDX275"></A>
+<A NAME="IDX269"></A>
 You get the character encoding of your locale by running the shell command
 <SAMP>&lsquo;locale charmap&rsquo;</SAMP>.  If the result is <SAMP>&lsquo;C&rsquo;</SAMP> or <SAMP>&lsquo;ANSI_X3.4-1968&rsquo;</SAMP>,
 which is equivalent to <SAMP>&lsquo;ASCII&rsquo;</SAMP> (= <SAMP>&lsquo;US-ASCII&rsquo;</SAMP>), it means that your
@@ -377,7 +377,7 @@
 team which charset to use.  <SAMP>&lsquo;ASCII&rsquo;</SAMP> is not usable for any language
 except Latin.
 
-<A NAME="IDX276"></A>
+<A NAME="IDX270"></A>
 Because the PO files must be portable to operating systems with less advanced
 internationalization facilities, the character encodings that can be used
 are limited to those supported by both GNU <CODE>libc</CODE> and GNU
@@ -394,11 +394,11 @@
 <CODE>BIG5</CODE>, <CODE>BIG5-HKSCS</CODE>, <CODE>GBK</CODE>, <CODE>GB18030</CODE>, <CODE>SHIFT_JIS</CODE>,
 <CODE>JOHAB</CODE>, <CODE>TIS-620</CODE>, <CODE>VISCII</CODE>, <CODE>GEORGIAN-PS</CODE>, <CODE>UTF-8</CODE>.
 
-<A NAME="IDX277"></A>
+<A NAME="IDX271"></A>
 In the GNU system, the following encodings are frequently used for the
 corresponding languages.
 
-<A NAME="IDX278"></A>
+<A NAME="IDX272"></A>
 
 <UL>
 <LI><CODE>ISO-8859-1</CODE> for
@@ -458,8 +458,8 @@
 
 </UL>
 
-<A NAME="IDX279"></A>
-<A NAME="IDX280"></A>
+<A NAME="IDX273"></A>
+<A NAME="IDX274"></A>
 When single quote characters or double quote characters are used in
 translations for your language, and your locale's encoding is one of the
 ISO-8859-* charsets, it is best if you create your PO files in UTF-8
@@ -471,7 +471,7 @@
 vertical apostrophe and the vertical double quote instead (because that's
 what the character set conversion will transliterate them to).
 
-<A NAME="IDX281"></A>
+<A NAME="IDX275"></A>
 To enter such quote characters under X11, you can change your keyboard
 mapping using the <CODE>xmodmap</CODE> program.  The X11 names of the quote
 characters are "leftsinglequotemark", "rightsinglequotemark",
@@ -493,8 +493,8 @@
 <DD>
 This field is optional.  It is only needed if the PO file has plural forms.
 You can find them by searching for the <SAMP>&lsquo;msgid_plural&rsquo;</SAMP> keyword.  The
-format of the plural forms field is described in section <A HREF="gettext_11.html#SEC189">11.2.6  Additional functions for plural forms</A> and
-section <A HREF="gettext_12.html#SEC210">12.6  Translating plural forms</A>.
+format of the plural forms field is described in section <A HREF="gettext_11.html#SEC188">11.2.6  Additional functions for plural forms</A> and
+section <A HREF="gettext_12.html#SEC209">12.6  Translating plural forms</A>.
 </DL>
 
 <P><HR><P>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_7.html gettext-0.18.1.1/gettext-tools/doc/gettext_7.html
--- gettext-0.19.3/gettext-tools/doc/gettext_7.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_7.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 7  Updating Existing PO Files</TITLE>
@@ -18,8 +18,8 @@
 <H2><A NAME="SEC46" HREF="gettext_toc.html#TOC46">7.1  Invoking the <CODE>msgmerge</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX282"></A>
-<A NAME="IDX283"></A>
+<A NAME="IDX276"></A>
+<A NAME="IDX277"></A>
 
 <PRE>
 msgmerge [<VAR>option</VAR>] <VAR>def</VAR>.po <VAR>ref</VAR>.pot
@@ -56,8 +56,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX284"></A>
-<A NAME="IDX285"></A>
+<A NAME="IDX278"></A>
+<A NAME="IDX279"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -66,8 +66,8 @@
 <DD>
 <DT><SAMP>&lsquo;--compendium=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX286"></A>
-<A NAME="IDX287"></A>
+<A NAME="IDX280"></A>
+<A NAME="IDX281"></A>
 Specify an additional library of message translations.  See section <A HREF="gettext_8.html#SEC72">8.4  Using Translation Compendia</A>.
 This option may be specified more than once.
 
@@ -83,8 +83,8 @@
 <DD>
 <DT><SAMP>&lsquo;--update&rsquo;</SAMP>
 <DD>
-<A NAME="IDX288"></A>
-<A NAME="IDX289"></A>
+<A NAME="IDX282"></A>
+<A NAME="IDX283"></A>
 Update <VAR>def</VAR>.po.  Do nothing if <VAR>def</VAR>.po is already up to date.
 
 </DL>
@@ -99,14 +99,14 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX290"></A>
-<A NAME="IDX291"></A>
+<A NAME="IDX284"></A>
+<A NAME="IDX285"></A>
 Write output to specified file.
 
 </DL>
 
 <P>
-<A NAME="IDX292"></A>
+<A NAME="IDX286"></A>
 The results are written to standard output if no output file is specified
 or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 
@@ -123,19 +123,19 @@
 
 <DT><SAMP>&lsquo;--backup=<VAR>control</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX293"></A>
-<A NAME="IDX294"></A>
+<A NAME="IDX287"></A>
+<A NAME="IDX288"></A>
 Make a backup of <VAR>def</VAR>.po
 
 <DT><SAMP>&lsquo;--suffix=<VAR>suffix</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX295"></A>
+<A NAME="IDX289"></A>
 Override the usual backup suffix.
 
 </DL>
 
 <P>
-<A NAME="IDX296"></A>
+<A NAME="IDX290"></A>
 The version control method may be selected via the <CODE>--backup</CODE> option
 or through the <CODE>VERSION_CONTROL</CODE> environment variable.  Here are the
 values:
@@ -185,22 +185,22 @@
 <DD>
 <DT><SAMP>&lsquo;--multi-domain&rsquo;</SAMP>
 <DD>
-<A NAME="IDX297"></A>
-<A NAME="IDX298"></A>
+<A NAME="IDX291"></A>
+<A NAME="IDX292"></A>
 Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 <DT><SAMP>&lsquo;-N&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--no-fuzzy-matching&rsquo;</SAMP>
 <DD>
-<A NAME="IDX299"></A>
-<A NAME="IDX300"></A>
+<A NAME="IDX293"></A>
+<A NAME="IDX294"></A>
 Do not use fuzzy matching when an exact match is not found.  This may speed
 up the operation considerably.
 
 <DT><SAMP>&lsquo;--previous&rsquo;</SAMP>
 <DD>
-<A NAME="IDX301"></A>
+<A NAME="IDX295"></A>
 Keep the previous msgids of translated messages, marked with <SAMP>&lsquo;#|&rsquo;</SAMP>, when
 adding the fuzzy marker to such messages.
 </DL>
@@ -215,14 +215,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX302"></A>
-<A NAME="IDX303"></A>
+<A NAME="IDX296"></A>
+<A NAME="IDX297"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX304"></A>
+<A NAME="IDX298"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -236,7 +236,7 @@
 
 <DT><SAMP>&lsquo;--lang=<VAR>catalogname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX305"></A>
+<A NAME="IDX299"></A>
 Specify the <SAMP>&lsquo;Language&rsquo;</SAMP> field to be used in the header entry.  See
 section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for the meaning of this field.  Note: The
 <SAMP>&lsquo;Language-Team&rsquo;</SAMP> and <SAMP>&lsquo;Plural-Forms&rsquo;</SAMP> fields are left unchanged.
@@ -247,50 +247,42 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX306"></A>
+<A NAME="IDX300"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX307"></A>
+<A NAME="IDX301"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX308"></A>
+<A NAME="IDX302"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX309"></A>
-<A NAME="IDX310"></A>
+<A NAME="IDX303"></A>
+<A NAME="IDX304"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX311"></A>
+<A NAME="IDX305"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
-<DT><SAMP>&lsquo;-n&rsquo;</SAMP>
-<DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX312"></A>
+<A NAME="IDX306"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX313"></A>
+<A NAME="IDX307"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -299,15 +291,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX314"></A>
-<A NAME="IDX315"></A>
+<A NAME="IDX308"></A>
+<A NAME="IDX309"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX316"></A>
+<A NAME="IDX310"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -315,15 +307,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX317"></A>
-<A NAME="IDX318"></A>
+<A NAME="IDX311"></A>
+<A NAME="IDX312"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX319"></A>
+<A NAME="IDX313"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -332,9 +324,9 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX320"></A>
-<A NAME="IDX321"></A>
-<A NAME="IDX322"></A>
+<A NAME="IDX314"></A>
+<A NAME="IDX315"></A>
+<A NAME="IDX316"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -342,8 +334,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX323"></A>
-<A NAME="IDX324"></A>
+<A NAME="IDX317"></A>
+<A NAME="IDX318"></A>
 Sort output by file location.
 
 </DL>
@@ -358,24 +350,24 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX325"></A>
-<A NAME="IDX326"></A>
+<A NAME="IDX319"></A>
+<A NAME="IDX320"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX327"></A>
-<A NAME="IDX328"></A>
+<A NAME="IDX321"></A>
+<A NAME="IDX322"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;-v&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--verbose&rsquo;</SAMP>
 <DD>
-<A NAME="IDX329"></A>
-<A NAME="IDX330"></A>
+<A NAME="IDX323"></A>
+<A NAME="IDX324"></A>
 Increase verbosity level.
 
 <DT><SAMP>&lsquo;-q&rsquo;</SAMP>
@@ -384,9 +376,9 @@
 <DD>
 <DT><SAMP>&lsquo;--silent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX331"></A>
-<A NAME="IDX332"></A>
-<A NAME="IDX333"></A>
+<A NAME="IDX325"></A>
+<A NAME="IDX326"></A>
+<A NAME="IDX327"></A>
 Suppress progress indicators.
 
 </DL>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_8.html gettext-0.18.1.1/gettext-tools/doc/gettext_8.html
--- gettext-0.19.3/gettext-tools/doc/gettext_8.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_8.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 8  Editing PO Files</TITLE>
@@ -13,7 +13,7 @@
 
 <H1><A NAME="SEC55" HREF="gettext_toc.html#TOC55">8  Editing PO Files</A></H1>
 <P>
-<A NAME="IDX334"></A>
+<A NAME="IDX328"></A>
 
 </P>
 
@@ -21,21 +21,21 @@
 
 <H2><A NAME="SEC56" HREF="gettext_toc.html#TOC56">8.1  KDE's PO File Editor</A></H2>
 <P>
-<A NAME="IDX335"></A>
+<A NAME="IDX329"></A>
 
 </P>
 
 
 <H2><A NAME="SEC57" HREF="gettext_toc.html#TOC57">8.2  GNOME's PO File Editor</A></H2>
 <P>
-<A NAME="IDX336"></A>
+<A NAME="IDX330"></A>
 
 </P>
 
 
 <H2><A NAME="SEC58" HREF="gettext_toc.html#TOC58">8.3  Emacs's PO File Editor</A></H2>
 <P>
-<A NAME="IDX337"></A>
+<A NAME="IDX331"></A>
 
 </P>
 
@@ -64,8 +64,8 @@
 <H3><A NAME="SEC59" HREF="gettext_toc.html#TOC59">8.3.1  Completing GNU <CODE>gettext</CODE> Installation</A></H3>
 
 <P>
-<A NAME="IDX338"></A>
-<A NAME="IDX339"></A>
+<A NAME="IDX332"></A>
+<A NAME="IDX333"></A>
 Once you have received, unpacked, configured and compiled the GNU
 <CODE>gettext</CODE> distribution, the <SAMP>&lsquo;make install&rsquo;</SAMP> command puts in
 place the programs <CODE>xgettext</CODE>, <CODE>msgfmt</CODE>, <CODE>gettext</CODE>, and
@@ -75,8 +75,8 @@
 
 </P>
 <P>
-<A NAME="IDX340"></A>
-<A NAME="IDX341"></A>
+<A NAME="IDX334"></A>
+<A NAME="IDX335"></A>
 During the installation of the PO mode, you might want to modify your
 file <TT>&lsquo;.emacs&rsquo;</TT>, once and for all, so it contains a few lines looking
 like:
@@ -126,8 +126,8 @@
 <H3><A NAME="SEC60" HREF="gettext_toc.html#TOC60">8.3.2  Main PO mode Commands</A></H3>
 
 <P>
-<A NAME="IDX342"></A>
-<A NAME="IDX343"></A>
+<A NAME="IDX336"></A>
+<A NAME="IDX337"></A>
 After setting up Emacs with something similar to the lines in
 section <A HREF="gettext_8.html#SEC59">8.3.1  Completing GNU <CODE>gettext</CODE> Installation</A>, PO mode is activated for a window when Emacs finds a
 PO file in that window.  This puts the window read-only and establishes a
@@ -159,47 +159,47 @@
 
 <DT><KBD>_</KBD>
 <DD>
-<A NAME="IDX344"></A>
+<A NAME="IDX338"></A>
 Undo last modification to the PO file (<CODE>po-undo</CODE>).
 
 <DT><KBD>Q</KBD>
 <DD>
-<A NAME="IDX345"></A>
+<A NAME="IDX339"></A>
 Quit processing and save the PO file (<CODE>po-quit</CODE>).
 
 <DT><KBD>q</KBD>
 <DD>
-<A NAME="IDX346"></A>
+<A NAME="IDX340"></A>
 Quit processing, possibly after confirmation (<CODE>po-confirm-and-quit</CODE>).
 
 <DT><KBD>0</KBD>
 <DD>
-<A NAME="IDX347"></A>
+<A NAME="IDX341"></A>
 Temporary leave the PO file window (<CODE>po-other-window</CODE>).
 
 <DT><KBD>?</KBD>
 <DD>
 <DT><KBD>h</KBD>
 <DD>
-<A NAME="IDX348"></A>
-<A NAME="IDX349"></A>
+<A NAME="IDX342"></A>
+<A NAME="IDX343"></A>
 Show help about PO mode (<CODE>po-help</CODE>).
 
 <DT><KBD>=</KBD>
 <DD>
-<A NAME="IDX350"></A>
+<A NAME="IDX344"></A>
 Give some PO file statistics (<CODE>po-statistics</CODE>).
 
 <DT><KBD>V</KBD>
 <DD>
-<A NAME="IDX351"></A>
+<A NAME="IDX345"></A>
 Batch validate the format of the whole PO file (<CODE>po-validate</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX352"></A>
-<A NAME="IDX353"></A>
+<A NAME="IDX346"></A>
+<A NAME="IDX347"></A>
 The command <KBD>_</KBD> (<CODE>po-undo</CODE>) interfaces to the Emacs
 <EM>undo</EM> facility.  See section ‘Undoing Changes’ in <CITE>The Emacs Editor</CITE>.  Each time <KBD>_</KBD> is typed, modifications which the translator
 did to the PO file are undone a little more.  For the purpose of
@@ -211,10 +211,10 @@
 
 </P>
 <P>
-<A NAME="IDX354"></A>
-<A NAME="IDX355"></A>
-<A NAME="IDX356"></A>
-<A NAME="IDX357"></A>
+<A NAME="IDX348"></A>
+<A NAME="IDX349"></A>
+<A NAME="IDX350"></A>
+<A NAME="IDX351"></A>
 The commands <KBD>Q</KBD> (<CODE>po-quit</CODE>) and <KBD>q</KBD>
 (<CODE>po-confirm-and-quit</CODE>) are used when the translator is done with the
 PO file.  The former is a bit less verbose than the latter.  If the file
@@ -227,8 +227,8 @@
 
 </P>
 <P>
-<A NAME="IDX358"></A>
-<A NAME="IDX359"></A>
+<A NAME="IDX352"></A>
+<A NAME="IDX353"></A>
 The command <KBD>0</KBD> (<CODE>po-other-window</CODE>) is another, softer way,
 to leave PO mode, temporarily.  It just moves the cursor to some other
 Emacs window, and pops one if necessary.  For example, if the translator
@@ -242,9 +242,9 @@
 
 </P>
 <P>
-<A NAME="IDX360"></A>
-<A NAME="IDX361"></A>
-<A NAME="IDX362"></A>
+<A NAME="IDX354"></A>
+<A NAME="IDX355"></A>
+<A NAME="IDX356"></A>
 The command <KBD>h</KBD> (<CODE>po-help</CODE>) displays a summary of all available PO
 mode commands.  The translator should then type any character to resume
 normal PO mode operations.  The command <KBD>?</KBD> has the same effect
@@ -252,8 +252,8 @@
 
 </P>
 <P>
-<A NAME="IDX363"></A>
-<A NAME="IDX364"></A>
+<A NAME="IDX357"></A>
+<A NAME="IDX358"></A>
 The command <KBD>=</KBD> (<CODE>po-statistics</CODE>) computes the total number of
 entries in the PO file, the ordinal of the current entry (counted from
 1), the number of untranslated entries, the number of obsolete entries,
@@ -261,8 +261,8 @@
 
 </P>
 <P>
-<A NAME="IDX365"></A>
-<A NAME="IDX366"></A>
+<A NAME="IDX359"></A>
+<A NAME="IDX360"></A>
 The command <KBD>V</KBD> (<CODE>po-validate</CODE>) launches <CODE>msgfmt</CODE> in
 checking and verbose
 mode over the current PO file.  This command first offers to save the
@@ -273,7 +273,7 @@
 
 </P>
 <P>
-<A NAME="IDX367"></A>
+<A NAME="IDX361"></A>
 The program <CODE>msgfmt</CODE> runs asynchronously with Emacs, so the
 translator regains control immediately while her PO file is being studied.
 Error output is collected in the Emacs <SAMP>&lsquo;*compilation*&rsquo;</SAMP> buffer,
@@ -289,7 +289,7 @@
 <H3><A NAME="SEC61" HREF="gettext_toc.html#TOC61">8.3.3  Entry Positioning</A></H3>
 
 <P>
-<A NAME="IDX368"></A>
+<A NAME="IDX362"></A>
 The cursor in a PO file window is almost always part of
 an entry.  The only exceptions are the special case when the cursor
 is after the last entry in the file, or when the PO file is
@@ -300,7 +300,7 @@
 
 </P>
 <P>
-<A NAME="IDX369"></A>
+<A NAME="IDX363"></A>
 Some PO mode commands alter the position of the cursor in a specialized
 way.  A few of those special purpose positioning are described here,
 the others are described in following sections (for a complete list try
@@ -311,51 +311,51 @@
 
 <DT><KBD>.</KBD>
 <DD>
-<A NAME="IDX370"></A>
+<A NAME="IDX364"></A>
 Redisplay the current entry (<CODE>po-current-entry</CODE>).
 
 <DT><KBD>n</KBD>
 <DD>
-<A NAME="IDX371"></A>
+<A NAME="IDX365"></A>
 Select the entry after the current one (<CODE>po-next-entry</CODE>).
 
 <DT><KBD>p</KBD>
 <DD>
-<A NAME="IDX372"></A>
+<A NAME="IDX366"></A>
 Select the entry before the current one (<CODE>po-previous-entry</CODE>).
 
 <DT><KBD>&#60;</KBD>
 <DD>
-<A NAME="IDX373"></A>
+<A NAME="IDX367"></A>
 Select the first entry in the PO file (<CODE>po-first-entry</CODE>).
 
 <DT><KBD>&#62;</KBD>
 <DD>
-<A NAME="IDX374"></A>
+<A NAME="IDX368"></A>
 Select the last entry in the PO file (<CODE>po-last-entry</CODE>).
 
 <DT><KBD>m</KBD>
 <DD>
-<A NAME="IDX375"></A>
+<A NAME="IDX369"></A>
 Record the location of the current entry for later use
 (<CODE>po-push-location</CODE>).
 
 <DT><KBD>r</KBD>
 <DD>
-<A NAME="IDX376"></A>
+<A NAME="IDX370"></A>
 Return to a previously saved entry location (<CODE>po-pop-location</CODE>).
 
 <DT><KBD>x</KBD>
 <DD>
-<A NAME="IDX377"></A>
+<A NAME="IDX371"></A>
 Exchange the current entry location with the previously saved one
 (<CODE>po-exchange-location</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX378"></A>
-<A NAME="IDX379"></A>
+<A NAME="IDX372"></A>
+<A NAME="IDX373"></A>
 Any Emacs command able to reposition the cursor may be used
 to select the current entry in PO mode, including commands which
 move by characters, lines, paragraphs, screens or pages, and search
@@ -384,10 +384,10 @@
 
 </P>
 <P>
-<A NAME="IDX380"></A>
-<A NAME="IDX381"></A>
-<A NAME="IDX382"></A>
-<A NAME="IDX383"></A>
+<A NAME="IDX374"></A>
+<A NAME="IDX375"></A>
+<A NAME="IDX376"></A>
+<A NAME="IDX377"></A>
 The commands <KBD>n</KBD> (<CODE>po-next-entry</CODE>) and <KBD>p</KBD>
 (<CODE>po-previous-entry</CODE>) move the cursor the entry following,
 or preceding, the current one.  If <KBD>n</KBD> is given while the
@@ -396,10 +396,10 @@
 
 </P>
 <P>
-<A NAME="IDX384"></A>
-<A NAME="IDX385"></A>
-<A NAME="IDX386"></A>
-<A NAME="IDX387"></A>
+<A NAME="IDX378"></A>
+<A NAME="IDX379"></A>
+<A NAME="IDX380"></A>
+<A NAME="IDX381"></A>
 The commands <KBD>&#60;</KBD> (<CODE>po-first-entry</CODE>) and <KBD>&#62;</KBD>
 (<CODE>po-last-entry</CODE>) move the cursor to the first entry, or last
 entry, of the PO file.  When the cursor is located past the last
@@ -422,10 +422,10 @@
 
 </P>
 <P>
-<A NAME="IDX388"></A>
-<A NAME="IDX389"></A>
-<A NAME="IDX390"></A>
-<A NAME="IDX391"></A>
+<A NAME="IDX382"></A>
+<A NAME="IDX383"></A>
+<A NAME="IDX384"></A>
+<A NAME="IDX385"></A>
 PO mode offers another approach, by which cursor locations may be saved
 onto a special stack.  The command <KBD>m</KBD> (<CODE>po-push-location</CODE>)
 merely adds the location of current entry to the stack, pushing
@@ -445,8 +445,8 @@
 
 </P>
 <P>
-<A NAME="IDX392"></A>
-<A NAME="IDX393"></A>
+<A NAME="IDX386"></A>
+<A NAME="IDX387"></A>
 The command <KBD>x</KBD> (<CODE>po-exchange-location</CODE>) simultaneously
 repositions the cursor to the entry associated with the top element of
 the stack of saved locations, and replaces that top element with the
@@ -461,7 +461,7 @@
 
 <H3><A NAME="SEC62" HREF="gettext_toc.html#TOC62">8.3.4  Normalizing Strings in Entries</A></H3>
 <P>
-<A NAME="IDX394"></A>
+<A NAME="IDX388"></A>
 
 </P>
 <P>
@@ -495,12 +495,12 @@
 
 </P>
 <P>
-<A NAME="IDX395"></A>
+<A NAME="IDX389"></A>
 <DL COMPACT>
 
 <DT><KBD>M-x po-normalize</KBD>
 <DD>
-<A NAME="IDX396"></A>
+<A NAME="IDX390"></A>
 Tidy the whole PO file by making entries more uniform.
 
 </DL>
@@ -532,7 +532,7 @@
 
 </P>
 <P>
-<A NAME="IDX397"></A>
+<A NAME="IDX391"></A>
 Having such an explicit normalizing command allows for importing PO
 files from other sources, but also eases the evolution of the current
 convention, evolution driven mostly by aesthetic concerns, as of now.
@@ -545,7 +545,7 @@
 
 </P>
 <P>
-<A NAME="IDX398"></A>
+<A NAME="IDX392"></A>
 Right now, in PO mode, strings are single line or multi-line.  A string
 goes multi-line if and only if it has <EM>embedded</EM> newlines, that
 is, if it matches <SAMP>&lsquo;[^\n]\n+[^\n]&rsquo;</SAMP>.  So, we would have:
@@ -598,7 +598,7 @@
 
 <H3><A NAME="SEC63" HREF="gettext_toc.html#TOC63">8.3.5  Translated Entries</A></H3>
 <P>
-<A NAME="IDX399"></A>
+<A NAME="IDX393"></A>
 
 </P>
 <P>
@@ -610,7 +610,7 @@
 
 </P>
 <P>
-<A NAME="IDX400"></A>
+<A NAME="IDX394"></A>
 Some commands are more specifically related to translated entry processing.
 
 </P>
@@ -618,21 +618,21 @@
 
 <DT><KBD>t</KBD>
 <DD>
-<A NAME="IDX401"></A>
+<A NAME="IDX395"></A>
 Find the next translated entry (<CODE>po-next-translated-entry</CODE>).
 
 <DT><KBD>T</KBD>
 <DD>
-<A NAME="IDX402"></A>
+<A NAME="IDX396"></A>
 Find the previous translated entry (<CODE>po-previous-translated-entry</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX403"></A>
-<A NAME="IDX404"></A>
-<A NAME="IDX405"></A>
-<A NAME="IDX406"></A>
+<A NAME="IDX397"></A>
+<A NAME="IDX398"></A>
+<A NAME="IDX399"></A>
+<A NAME="IDX400"></A>
 The commands <KBD>t</KBD> (<CODE>po-next-translated-entry</CODE>) and <KBD>T</KBD>
 (<CODE>po-previous-translated-entry</CODE>) move forwards or backwards, chasing
 for an translated entry.  If none is found, the search is extended and
@@ -640,7 +640,7 @@
 
 </P>
 <P>
-<A NAME="IDX407"></A>
+<A NAME="IDX401"></A>
 Translated entries usually result from the translator having edited in
 a translation for them, section <A HREF="gettext_8.html#SEC67">8.3.9  Modifying Translations</A>.  However, if the
 variable <CODE>po-auto-fuzzy-on-edit</CODE> is not <CODE>nil</CODE>, the entry having
@@ -653,12 +653,12 @@
 
 <H3><A NAME="SEC64" HREF="gettext_toc.html#TOC64">8.3.6  Fuzzy Entries</A></H3>
 <P>
-<A NAME="IDX408"></A>
+<A NAME="IDX402"></A>
 
 </P>
 <P>
-<A NAME="IDX409"></A>
-<A NAME="IDX410"></A>
+<A NAME="IDX403"></A>
+<A NAME="IDX404"></A>
 Each PO file entry may have a set of <EM>attributes</EM>, which are
 qualities given a name and explicitly associated with the translation,
 using a special system comment.  One of these attributes
@@ -681,7 +681,7 @@
 
 </P>
 <P>
-<A NAME="IDX411"></A>
+<A NAME="IDX405"></A>
 Also, the translator may decide herself to mark an entry as fuzzy
 for her own convenience, when she wants to remember that the entry
 has to be later revisited.  So, some commands are more specifically
@@ -692,26 +692,26 @@
 
 <DT><KBD>f</KBD>
 <DD>
-<A NAME="IDX412"></A>
+<A NAME="IDX406"></A>
 Find the next fuzzy entry (<CODE>po-next-fuzzy-entry</CODE>).
 
 <DT><KBD>F</KBD>
 <DD>
-<A NAME="IDX413"></A>
+<A NAME="IDX407"></A>
 Find the previous fuzzy entry (<CODE>po-previous-fuzzy-entry</CODE>).
 
 <DT><KBD><KBD>TAB</KBD></KBD>
 <DD>
-<A NAME="IDX414"></A>
+<A NAME="IDX408"></A>
 Remove the fuzzy attribute of the current entry (<CODE>po-unfuzzy</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX415"></A>
-<A NAME="IDX416"></A>
-<A NAME="IDX417"></A>
-<A NAME="IDX418"></A>
+<A NAME="IDX409"></A>
+<A NAME="IDX410"></A>
+<A NAME="IDX411"></A>
+<A NAME="IDX412"></A>
 The commands <KBD>f</KBD> (<CODE>po-next-fuzzy-entry</CODE>) and <KBD>F</KBD>
 (<CODE>po-previous-fuzzy-entry</CODE>) move forwards or backwards, chasing for
 a fuzzy entry.  If none is found, the search is extended and wraps
@@ -719,9 +719,9 @@
 
 </P>
 <P>
-<A NAME="IDX419"></A>
-<A NAME="IDX420"></A>
-<A NAME="IDX421"></A>
+<A NAME="IDX413"></A>
+<A NAME="IDX414"></A>
+<A NAME="IDX415"></A>
 The command <KBD><KBD>TAB</KBD></KBD> (<CODE>po-unfuzzy</CODE>) removes the fuzzy
 attribute associated with an entry, usually leaving it translated.
 Further, if the variable <CODE>po-auto-select-on-unfuzzy</CODE> has not
@@ -743,8 +743,8 @@
 
 </P>
 <P>
-<A NAME="IDX422"></A>
-<A NAME="IDX423"></A>
+<A NAME="IDX416"></A>
+<A NAME="IDX417"></A>
 The translator may also use the <KBD><KBD>DEL</KBD></KBD> command
 (<CODE>po-fade-out-entry</CODE>) over any translated entry to mark it as being
 fuzzy, when she wants to easily leave a trace she wants to later return
@@ -761,7 +761,7 @@
 
 <H3><A NAME="SEC65" HREF="gettext_toc.html#TOC65">8.3.7  Untranslated Entries</A></H3>
 <P>
-<A NAME="IDX424"></A>
+<A NAME="IDX418"></A>
 
 </P>
 <P>
@@ -781,7 +781,7 @@
 
 </P>
 <P>
-<A NAME="IDX425"></A>
+<A NAME="IDX419"></A>
 The work of the translator might be (quite naively) seen as the process
 of seeking for an untranslated entry, editing a translation for
 it, and repeating these actions until no untranslated entries remain.
@@ -793,26 +793,26 @@
 
 <DT><KBD>u</KBD>
 <DD>
-<A NAME="IDX426"></A>
+<A NAME="IDX420"></A>
 Find the next untranslated entry (<CODE>po-next-untranslated-entry</CODE>).
 
 <DT><KBD>U</KBD>
 <DD>
-<A NAME="IDX427"></A>
+<A NAME="IDX421"></A>
 Find the previous untranslated entry (<CODE>po-previous-untransted-entry</CODE>).
 
 <DT><KBD>k</KBD>
 <DD>
-<A NAME="IDX428"></A>
+<A NAME="IDX422"></A>
 Turn the current entry into an untranslated one (<CODE>po-kill-msgstr</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX429"></A>
-<A NAME="IDX430"></A>
-<A NAME="IDX431"></A>
-<A NAME="IDX432"></A>
+<A NAME="IDX423"></A>
+<A NAME="IDX424"></A>
+<A NAME="IDX425"></A>
+<A NAME="IDX426"></A>
 The commands <KBD>u</KBD> (<CODE>po-next-untranslated-entry</CODE>) and <KBD>U</KBD>
 (<CODE>po-previous-untransted-entry</CODE>) move forwards or backwards,
 chasing for an untranslated entry.  If none is found, the search is
@@ -820,8 +820,8 @@
 
 </P>
 <P>
-<A NAME="IDX433"></A>
-<A NAME="IDX434"></A>
+<A NAME="IDX427"></A>
+<A NAME="IDX428"></A>
 An entry can be turned back into an untranslated entry by
 merely emptying its translation, using the command <KBD>k</KBD>
 (<CODE>po-kill-msgstr</CODE>).  See section <A HREF="gettext_8.html#SEC67">8.3.9  Modifying Translations</A>.
@@ -837,7 +837,7 @@
 
 <H3><A NAME="SEC66" HREF="gettext_toc.html#TOC66">8.3.8  Obsolete Entries</A></H3>
 <P>
-<A NAME="IDX435"></A>
+<A NAME="IDX429"></A>
 
 </P>
 <P>
@@ -863,7 +863,7 @@
 
 </P>
 <P>
-<A NAME="IDX436"></A>
+<A NAME="IDX430"></A>
 Moreover, some commands are more specifically related to obsolete
 entry processing.
 
@@ -872,27 +872,27 @@
 
 <DT><KBD>o</KBD>
 <DD>
-<A NAME="IDX437"></A>
+<A NAME="IDX431"></A>
 Find the next obsolete entry (<CODE>po-next-obsolete-entry</CODE>).
 
 <DT><KBD>O</KBD>
 <DD>
-<A NAME="IDX438"></A>
+<A NAME="IDX432"></A>
 Find the previous obsolete entry (<CODE>po-previous-obsolete-entry</CODE>).
 
 <DT><KBD><KBD>DEL</KBD></KBD>
 <DD>
-<A NAME="IDX439"></A>
+<A NAME="IDX433"></A>
 Make an active entry obsolete, or zap out an obsolete entry
 (<CODE>po-fade-out-entry</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX440"></A>
-<A NAME="IDX441"></A>
-<A NAME="IDX442"></A>
-<A NAME="IDX443"></A>
+<A NAME="IDX434"></A>
+<A NAME="IDX435"></A>
+<A NAME="IDX436"></A>
+<A NAME="IDX437"></A>
 The commands <KBD>o</KBD> (<CODE>po-next-obsolete-entry</CODE>) and <KBD>O</KBD>
 (<CODE>po-previous-obsolete-entry</CODE>) move forwards or backwards,
 chasing for an obsolete entry.  If none is found, the search is
@@ -908,10 +908,10 @@
 
 </P>
 <P>
-<A NAME="IDX444"></A>
-<A NAME="IDX445"></A>
-<A NAME="IDX446"></A>
-<A NAME="IDX447"></A>
+<A NAME="IDX438"></A>
+<A NAME="IDX439"></A>
+<A NAME="IDX440"></A>
+<A NAME="IDX441"></A>
 However, it is possible to comment out an active entry, so making
 it obsolete.  GNU <CODE>gettext</CODE> utilities will later react to the
 disappearance of a translation by using the untranslated string.
@@ -941,8 +941,8 @@
 
 <H3><A NAME="SEC67" HREF="gettext_toc.html#TOC67">8.3.9  Modifying Translations</A></H3>
 <P>
-<A NAME="IDX448"></A>
-<A NAME="IDX449"></A>
+<A NAME="IDX442"></A>
+<A NAME="IDX443"></A>
 
 </P>
 <P>
@@ -968,40 +968,40 @@
 
 <DT><KBD><KBD>RET</KBD></KBD>
 <DD>
-<A NAME="IDX450"></A>
+<A NAME="IDX444"></A>
 Interactively edit the translation (<CODE>po-edit-msgstr</CODE>).
 
 <DT><KBD><KBD>LFD</KBD></KBD>
 <DD>
 <DT><KBD>C-j</KBD>
 <DD>
-<A NAME="IDX451"></A>
-<A NAME="IDX452"></A>
+<A NAME="IDX445"></A>
+<A NAME="IDX446"></A>
 Reinitialize the translation with the original, untranslated string
 (<CODE>po-msgid-to-msgstr</CODE>).
 
 <DT><KBD>k</KBD>
 <DD>
-<A NAME="IDX453"></A>
+<A NAME="IDX447"></A>
 Save the translation on the kill ring, and delete it (<CODE>po-kill-msgstr</CODE>).
 
 <DT><KBD>w</KBD>
 <DD>
-<A NAME="IDX454"></A>
+<A NAME="IDX448"></A>
 Save the translation on the kill ring, without deleting it
 (<CODE>po-kill-ring-save-msgstr</CODE>).
 
 <DT><KBD>y</KBD>
 <DD>
-<A NAME="IDX455"></A>
+<A NAME="IDX449"></A>
 Replace the translation, taking the new from the kill ring
 (<CODE>po-yank-msgstr</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX456"></A>
-<A NAME="IDX457"></A>
+<A NAME="IDX450"></A>
+<A NAME="IDX451"></A>
 The command <KBD><KBD>RET</KBD></KBD> (<CODE>po-edit-msgstr</CODE>) opens a new Emacs
 window meant to edit in a new translation, or to modify an already existing
 translation.  The new window contains a copy of the translation taken from
@@ -1014,9 +1014,9 @@
 
 </P>
 <P>
-<A NAME="IDX458"></A>
-<A NAME="IDX459"></A>
-<A NAME="IDX460"></A>
+<A NAME="IDX452"></A>
+<A NAME="IDX453"></A>
+<A NAME="IDX454"></A>
 The command <KBD><KBD>LFD</KBD></KBD> (<CODE>po-msgid-to-msgstr</CODE>) initializes, or
 reinitializes the translation with the original string.  This command is
 normally used when the translator wants to redo a fresh translation of
@@ -1024,7 +1024,7 @@
 
 </P>
 <P>
-<A NAME="IDX461"></A>
+<A NAME="IDX455"></A>
 It is possible to arrange so, whenever editing an untranslated
 entry, the <KBD><KBD>LFD</KBD></KBD> command be automatically executed.  If you set
 <CODE>po-auto-edit-with-msgid</CODE> to <CODE>t</CODE>, the translation gets
@@ -1033,7 +1033,7 @@
 
 </P>
 <P>
-<A NAME="IDX462"></A>
+<A NAME="IDX456"></A>
 In fact, whether it is best to start a translation with an empty
 string, or rather with a copy of the original string, is a matter of
 taste or habit.  Sometimes, the source language and the
@@ -1047,11 +1047,11 @@
 
 </P>
 <P>
-<A NAME="IDX463"></A>
-<A NAME="IDX464"></A>
-<A NAME="IDX465"></A>
-<A NAME="IDX466"></A>
-<A NAME="IDX467"></A>
+<A NAME="IDX457"></A>
+<A NAME="IDX458"></A>
+<A NAME="IDX459"></A>
+<A NAME="IDX460"></A>
+<A NAME="IDX461"></A>
 The command <KBD>k</KBD> (<CODE>po-kill-msgstr</CODE>) merely empties the
 translation string, so turning the entry into an untranslated
 one.  But while doing so, its previous contents is put apart in
@@ -1083,8 +1083,8 @@
 
 </P>
 <P>
-<A NAME="IDX468"></A>
-<A NAME="IDX469"></A>
+<A NAME="IDX462"></A>
+<A NAME="IDX463"></A>
 The command <KBD>y</KBD> (<CODE>po-yank-msgstr</CODE>) completely replaces the
 translation of the current entry by a string taken from the kill ring.
 Following Emacs terminology, we then say that the replacement
@@ -1118,7 +1118,7 @@
 
 </P>
 <P>
-<A NAME="IDX470"></A>
+<A NAME="IDX464"></A>
 To better illustrate the operation of killing and yanking, let's
 use an actual example, taken from a common situation.  When the
 programmer slightly modifies some string right in the program, his
@@ -1158,8 +1158,8 @@
 
 <H3><A NAME="SEC68" HREF="gettext_toc.html#TOC68">8.3.10  Modifying Comments</A></H3>
 <P>
-<A NAME="IDX471"></A>
-<A NAME="IDX472"></A>
+<A NAME="IDX465"></A>
+<A NAME="IDX466"></A>
 
 </P>
 <P>
@@ -1188,24 +1188,24 @@
 
 <DT><KBD>#</KBD>
 <DD>
-<A NAME="IDX473"></A>
+<A NAME="IDX467"></A>
 Interactively edit the translator comments (<CODE>po-edit-comment</CODE>).
 
 <DT><KBD>K</KBD>
 <DD>
-<A NAME="IDX474"></A>
+<A NAME="IDX468"></A>
 Save the translator comments on the kill ring, and delete it
 (<CODE>po-kill-comment</CODE>).
 
 <DT><KBD>W</KBD>
 <DD>
-<A NAME="IDX475"></A>
+<A NAME="IDX469"></A>
 Save the translator comments on the kill ring, without deleting it
 (<CODE>po-kill-ring-save-comment</CODE>).
 
 <DT><KBD>Y</KBD>
 <DD>
-<A NAME="IDX476"></A>
+<A NAME="IDX470"></A>
 Replace the translator comments, taking the new from the kill ring
 (<CODE>po-yank-comment</CODE>).
 
@@ -1221,8 +1221,8 @@
 
 </P>
 <P>
-<A NAME="IDX477"></A>
-<A NAME="IDX478"></A>
+<A NAME="IDX471"></A>
+<A NAME="IDX472"></A>
 The command <KBD>#</KBD> (<CODE>po-edit-comment</CODE>) opens a new Emacs window
 containing a copy of the translator comments on the current PO file entry.
 If there are no such comments, PO mode understands that the translator wants
@@ -1236,18 +1236,18 @@
 
 </P>
 <P>
-<A NAME="IDX479"></A>
+<A NAME="IDX473"></A>
 Functions found on <CODE>po-subedit-mode-hook</CODE>, if any, are executed after
 the string has been inserted in the edit buffer.
 
 </P>
 <P>
-<A NAME="IDX480"></A>
-<A NAME="IDX481"></A>
-<A NAME="IDX482"></A>
-<A NAME="IDX483"></A>
-<A NAME="IDX484"></A>
-<A NAME="IDX485"></A>
+<A NAME="IDX474"></A>
+<A NAME="IDX475"></A>
+<A NAME="IDX476"></A>
+<A NAME="IDX477"></A>
+<A NAME="IDX478"></A>
+<A NAME="IDX479"></A>
 The command <KBD>K</KBD> (<CODE>po-kill-comment</CODE>) gets rid of all
 translator comments, while saving those comments on the kill ring.
 The command <KBD>W</KBD> (<CODE>po-kill-ring-save-comment</CODE>) takes
@@ -1288,7 +1288,7 @@
 
 <H3><A NAME="SEC69" HREF="gettext_toc.html#TOC69">8.3.11  Details of Sub Edition</A></H3>
 <P>
-<A NAME="IDX486"></A>
+<A NAME="IDX480"></A>
 
 </P>
 <P>
@@ -1301,25 +1301,25 @@
 
 <DT><KBD>C-c C-c</KBD>
 <DD>
-<A NAME="IDX487"></A>
+<A NAME="IDX481"></A>
 Complete edition (<CODE>po-subedit-exit</CODE>).
 
 <DT><KBD>C-c C-k</KBD>
 <DD>
-<A NAME="IDX488"></A>
+<A NAME="IDX482"></A>
 Abort edition (<CODE>po-subedit-abort</CODE>).
 
 <DT><KBD>C-c C-a</KBD>
 <DD>
-<A NAME="IDX489"></A>
+<A NAME="IDX483"></A>
 Consult auxiliary PO files (<CODE>po-subedit-cycle-auxiliary</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX490"></A>
-<A NAME="IDX491"></A>
-<A NAME="IDX492"></A>
+<A NAME="IDX484"></A>
+<A NAME="IDX485"></A>
+<A NAME="IDX486"></A>
 The window's contents represents a translation for a given message,
 or a translator comment.  The translator may modify this window to
 her heart's content.  Once this is done, the command <KBD>C-c C-c</KBD>
@@ -1329,8 +1329,8 @@
 
 </P>
 <P>
-<A NAME="IDX493"></A>
-<A NAME="IDX494"></A>
+<A NAME="IDX487"></A>
+<A NAME="IDX488"></A>
 If the translator becomes unsatisfied with her translation or comment,
 to the extent she prefers keeping what was existent prior to the
 <KBD><KBD>RET</KBD></KBD> or <KBD>#</KBD> command, she may use the command <KBD>C-c C-k</KBD>
@@ -1341,8 +1341,8 @@
 
 </P>
 <P>
-<A NAME="IDX495"></A>
-<A NAME="IDX496"></A>
+<A NAME="IDX489"></A>
+<A NAME="IDX490"></A>
 The command <KBD>C-c C-a</KBD> (<CODE>po-subedit-cycle-auxiliary</CODE>)
 allows for glancing through translations
 already achieved in other languages, directly while editing the current
@@ -1376,7 +1376,7 @@
 
 </P>
 <P>
-<A NAME="IDX497"></A>
+<A NAME="IDX491"></A>
 When a translation (or a comment) is being edited, the translator may move
 the cursor back into the PO file buffer and freely move to other entries,
 browsing at will.  If, with an edition pending, the translator wanders in the
@@ -1389,7 +1389,7 @@
 
 </P>
 <P>
-<A NAME="IDX498"></A>
+<A NAME="IDX492"></A>
 Pending subedits may be completed or aborted in any order, regardless
 of how or when they were started.  When many subedits are pending and the
 translator asks for quitting the PO file (with the <KBD>q</KBD> command), subedits
@@ -1400,9 +1400,9 @@
 
 <H3><A NAME="SEC70" HREF="gettext_toc.html#TOC70">8.3.12  C Sources Context</A></H3>
 <P>
-<A NAME="IDX499"></A>
-<A NAME="IDX500"></A>
-<A NAME="IDX501"></A>
+<A NAME="IDX493"></A>
+<A NAME="IDX494"></A>
+<A NAME="IDX495"></A>
 
 </P>
 <P>
@@ -1439,7 +1439,7 @@
 
 </P>
 <P>
-<A NAME="IDX502"></A>
+<A NAME="IDX496"></A>
 The following commands are meant to help the translator at getting
 program source context for a PO file entry.
 
@@ -1448,35 +1448,35 @@
 
 <DT><KBD>s</KBD>
 <DD>
-<A NAME="IDX503"></A>
+<A NAME="IDX497"></A>
 Resume the display of a program source context, or cycle through them
 (<CODE>po-cycle-source-reference</CODE>).
 
 <DT><KBD>M-s</KBD>
 <DD>
-<A NAME="IDX504"></A>
+<A NAME="IDX498"></A>
 Display of a program source context selected by menu
 (<CODE>po-select-source-reference</CODE>).
 
 <DT><KBD>S</KBD>
 <DD>
-<A NAME="IDX505"></A>
+<A NAME="IDX499"></A>
 Add a directory to the search path for source files
 (<CODE>po-consider-source-path</CODE>).
 
 <DT><KBD>M-S</KBD>
 <DD>
-<A NAME="IDX506"></A>
+<A NAME="IDX500"></A>
 Delete a directory from the search path for source files
 (<CODE>po-ignore-source-path</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX507"></A>
-<A NAME="IDX508"></A>
-<A NAME="IDX509"></A>
-<A NAME="IDX510"></A>
+<A NAME="IDX501"></A>
+<A NAME="IDX502"></A>
+<A NAME="IDX503"></A>
+<A NAME="IDX504"></A>
 The commands <KBD>s</KBD> (<CODE>po-cycle-source-reference</CODE>) and <KBD>M-s</KBD>
 (<CODE>po-select-source-reference</CODE>) both open another window displaying
 some source program file, and already positioned in such a way that
@@ -1521,10 +1521,10 @@
 
 </P>
 <P>
-<A NAME="IDX511"></A>
-<A NAME="IDX512"></A>
-<A NAME="IDX513"></A>
-<A NAME="IDX514"></A>
+<A NAME="IDX505"></A>
+<A NAME="IDX506"></A>
+<A NAME="IDX507"></A>
+<A NAME="IDX508"></A>
 Program source files are usually found relative to where the PO
 file stands.  As a special provision, when this fails, the file is
 also looked for, but relative to the directory immediately above it.
@@ -1544,7 +1544,7 @@
 
 <H3><A NAME="SEC71" HREF="gettext_toc.html#TOC71">8.3.13  Consulting Auxiliary PO Files</A></H3>
 <P>
-<A NAME="IDX515"></A>
+<A NAME="IDX509"></A>
 
 </P>
 <P>
@@ -1557,8 +1557,8 @@
 
 </P>
 <P>
-<A NAME="IDX516"></A>
-<A NAME="IDX517"></A>
+<A NAME="IDX510"></A>
+<A NAME="IDX511"></A>
 An <EM>auxiliary</EM> PO file is an existing PO file meant for the same
 package the translator is working on, but targeted to a different mother
 tongue language.  Commands exist for declaring and handling auxiliary
@@ -1573,41 +1573,41 @@
 
 <DT><KBD>a</KBD>
 <DD>
-<A NAME="IDX518"></A>
+<A NAME="IDX512"></A>
 Seek auxiliary files for another translation for the same entry
 (<CODE>po-cycle-auxiliary</CODE>).
 
 <DT><KBD>C-c C-a</KBD>
 <DD>
-<A NAME="IDX519"></A>
+<A NAME="IDX513"></A>
 Switch to a particular auxiliary file (<CODE>po-select-auxiliary</CODE>).
 
 <DT><KBD>A</KBD>
 <DD>
-<A NAME="IDX520"></A>
+<A NAME="IDX514"></A>
 Declare this PO file as an auxiliary file (<CODE>po-consider-as-auxiliary</CODE>).
 
 <DT><KBD>M-A</KBD>
 <DD>
-<A NAME="IDX521"></A>
+<A NAME="IDX515"></A>
 Remove this PO file from the list of auxiliary files
 (<CODE>po-ignore-as-auxiliary</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX522"></A>
-<A NAME="IDX523"></A>
-<A NAME="IDX524"></A>
-<A NAME="IDX525"></A>
+<A NAME="IDX516"></A>
+<A NAME="IDX517"></A>
+<A NAME="IDX518"></A>
+<A NAME="IDX519"></A>
 Command <KBD>A</KBD> (<CODE>po-consider-as-auxiliary</CODE>) adds the current
 PO file to the list of auxiliary files, while command <KBD>M-A</KBD>
 (<CODE>po-ignore-as-auxiliary</CODE> just removes it.
 
 </P>
 <P>
-<A NAME="IDX526"></A>
-<A NAME="IDX527"></A>
+<A NAME="IDX520"></A>
+<A NAME="IDX521"></A>
 The command <KBD>a</KBD> (<CODE>po-cycle-auxiliary</CODE>) seeks all auxiliary PO
 files, round-robin, searching for a translated entry in some other language
 having an <CODE>msgid</CODE> field identical as the one for the current entry.
@@ -1619,8 +1619,8 @@
 
 </P>
 <P>
-<A NAME="IDX528"></A>
-<A NAME="IDX529"></A>
+<A NAME="IDX522"></A>
+<A NAME="IDX523"></A>
 The command <KBD>C-c C-a</KBD> (<CODE>po-select-auxiliary</CODE>) asks the translator
 for her choice of a particular auxiliary file, with completion, and
 then switches to that selected PO file.  The command also checks if
@@ -1640,7 +1640,7 @@
 
 </P>
 <P>
-<A NAME="IDX530"></A>
+<A NAME="IDX524"></A>
 However, PO files initially created by PO mode itself, while marking
 strings in source files, are normalised differently.  So are PO
 files resulting of the <SAMP>&lsquo;M-x normalize&rsquo;</SAMP> command.  Until these
@@ -1652,11 +1652,11 @@
 
 <H2><A NAME="SEC72" HREF="gettext_toc.html#TOC72">8.4  Using Translation Compendia</A></H2>
 <P>
-<A NAME="IDX531"></A>
+<A NAME="IDX525"></A>
 
 </P>
 <P>
-<A NAME="IDX532"></A>
+<A NAME="IDX526"></A>
 A <EM>compendium</EM> is a special PO file containing a set of
 translations recurring in many different packages.  The translator can
 use gettext tools to build a new compendium, to add entries to her
@@ -1669,8 +1669,8 @@
 
 <H3><A NAME="SEC73" HREF="gettext_toc.html#TOC73">8.4.1  Creating Compendia</A></H3>
 <P>
-<A NAME="IDX533"></A>
-<A NAME="IDX534"></A>
+<A NAME="IDX527"></A>
+<A NAME="IDX528"></A>
 
 </P>
 <P>
@@ -1685,8 +1685,8 @@
 <H4><A NAME="SEC74" HREF="gettext_toc.html#TOC74">8.4.1.1  Concatenate PO Files</A></H4>
 
 <P>
-<A NAME="IDX535"></A>
-<A NAME="IDX536"></A>
+<A NAME="IDX529"></A>
+<A NAME="IDX530"></A>
 To concatenate several valid PO files into one compendium file you can
 use <SAMP>&lsquo;msgcomm&rsquo;</SAMP> or <SAMP>&lsquo;msgcat&rsquo;</SAMP> (the latter preferred):
 
@@ -1767,7 +1767,7 @@
 
 <H4><A NAME="SEC75" HREF="gettext_toc.html#TOC75">8.4.1.2  Extract a Message Subset from a PO File</A></H4>
 <P>
-<A NAME="IDX537"></A>
+<A NAME="IDX531"></A>
 
 </P>
 <P>
@@ -1798,7 +1798,7 @@
 
 <H4><A NAME="SEC77" HREF="gettext_toc.html#TOC77">8.4.2.1  Initialize a New Translation File</A></H4>
 <P>
-<A NAME="IDX538"></A>
+<A NAME="IDX532"></A>
 
 </P>
 <P>
@@ -1815,13 +1815,13 @@
 
 <H4><A NAME="SEC78" HREF="gettext_toc.html#TOC78">8.4.2.2  Update an Existing Translation File</A></H4>
 <P>
-<A NAME="IDX539"></A>
+<A NAME="IDX533"></A>
 
 </P>
 <P>
 Concatenate the compendium file(s) and the existing PO, merge the
 result with the POT file and remove the obsolete entries (optional,
-here done using <SAMP>&lsquo;msgattrib&rsquo;</SAMP>):
+here done using <SAMP>&lsquo;sed&rsquo;</SAMP>):
 
 </P>
 
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_9.html gettext-0.18.1.1/gettext-tools/doc/gettext_9.html
--- gettext-0.19.3/gettext-tools/doc/gettext_9.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_9.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 9  Manipulating PO Files</TITLE>
@@ -13,7 +13,7 @@
 
 <H1><A NAME="SEC79" HREF="gettext_toc.html#TOC79">9  Manipulating PO Files</A></H1>
 <P>
-<A NAME="IDX540"></A>
+<A NAME="IDX534"></A>
 
 </P>
 <P>
@@ -23,7 +23,7 @@
 
 </P>
 <P>
-<A NAME="IDX541"></A>
+<A NAME="IDX535"></A>
 When merging two packages into a single package, the resulting POT file
 will be the concatenation of the two packages' POT files.  Thus the
 maintainer must concatenate the two existing package translations into
@@ -33,7 +33,7 @@
 
 </P>
 <P>
-<A NAME="IDX542"></A>
+<A NAME="IDX536"></A>
 When a translator takes over the translation job from another translator,
 but she uses a different character encoding in her locale, she will
 convert the catalog to her character encoding.  This is best done through
@@ -49,8 +49,8 @@
 
 </P>
 <P>
-<A NAME="IDX543"></A>
-<A NAME="IDX544"></A>
+<A NAME="IDX537"></A>
+<A NAME="IDX538"></A>
 When a translator wants to adjust some translation catalog for a special
 dialect or orthography -- for example, German as written in Switzerland
 versus German as written in Germany -- she needs to apply some text
@@ -67,14 +67,14 @@
 
 </P>
 <P>
-<A NAME="IDX545"></A>
+<A NAME="IDX539"></A>
 When a translator wants to check her translations, for example according
 to orthography rules or using a non-interactive spell checker, she can do
 so using the <SAMP>&lsquo;msgexec&rsquo;</SAMP> program.
 
 </P>
 <P>
-<A NAME="IDX546"></A>
+<A NAME="IDX540"></A>
 When third party tools create PO or POT files, sometimes duplicates cannot
 be avoided.  But the GNU <CODE>gettext</CODE> tools give an error when they
 encounter duplicate msgids in the same file and in the same domain.
@@ -92,7 +92,7 @@
 
 </P>
 <P>
-<A NAME="IDX547"></A>
+<A NAME="IDX541"></A>
 <SAMP>&lsquo;msgattrib&rsquo;</SAMP> can be used to select and extract only the fuzzy
 or untranslated messages of a translation catalog.
 
@@ -114,25 +114,25 @@
 <H2><A NAME="SEC80" HREF="gettext_toc.html#TOC80">9.1  Invoking the <CODE>msgcat</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX548"></A>
-<A NAME="IDX549"></A>
+<A NAME="IDX542"></A>
+<A NAME="IDX543"></A>
 
 <PRE>
 msgcat [<VAR>option</VAR>] [<VAR>inputfile</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX550"></A>
-<A NAME="IDX551"></A>
+<A NAME="IDX544"></A>
+<A NAME="IDX545"></A>
 The <CODE>msgcat</CODE> program concatenates and merges the specified PO files.
 It finds messages which are common to two or more of the specified PO files.
 By using the <CODE>--more-than</CODE> option, greater commonality may be requested
 before messages are printed.  Conversely, the <CODE>--less-than</CODE> option may be
 used to specify less commonality before messages are printed (i.e.
 <SAMP>&lsquo;--less-than=2&rsquo;</SAMP> will only print the unique messages).  Translations,
-comments, extracted comments, and file positions will be cumulated, except that
-if <CODE>--use-first</CODE> is specified, they will be taken from the first PO file
-to define them.
+comments and extract comments will be cumulated, except that if
+<CODE>--use-first</CODE> is specified, they will be taken from the first PO file
+to define them.  File positions from all PO files will be cumulated.
 
 </P>
 
@@ -149,8 +149,8 @@
 <DD>
 <DT><SAMP>&lsquo;--files-from=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX552"></A>
-<A NAME="IDX553"></A>
+<A NAME="IDX546"></A>
+<A NAME="IDX547"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -158,8 +158,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX554"></A>
-<A NAME="IDX555"></A>
+<A NAME="IDX548"></A>
+<A NAME="IDX549"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -180,14 +180,14 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX556"></A>
-<A NAME="IDX557"></A>
+<A NAME="IDX550"></A>
+<A NAME="IDX551"></A>
 Write output to specified file.
 
 </DL>
 
 <P>
-<A NAME="IDX558"></A>
+<A NAME="IDX552"></A>
 The results are written to standard output if no output file is specified
 or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 
@@ -202,8 +202,8 @@
 <DD>
 <DT><SAMP>&lsquo;--less-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX559"></A>
-<A NAME="IDX560"></A>
+<A NAME="IDX553"></A>
+<A NAME="IDX554"></A>
 Print messages with less than <VAR>number</VAR> definitions, defaults to infinite
 if not set.
 
@@ -211,8 +211,8 @@
 <DD>
 <DT><SAMP>&lsquo;--more-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX561"></A>
-<A NAME="IDX562"></A>
+<A NAME="IDX555"></A>
+<A NAME="IDX556"></A>
 Print messages with more than <VAR>number</VAR> definitions, defaults to 0 if not
 set.
 
@@ -220,8 +220,8 @@
 <DD>
 <DT><SAMP>&lsquo;--unique&rsquo;</SAMP>
 <DD>
-<A NAME="IDX563"></A>
-<A NAME="IDX564"></A>
+<A NAME="IDX557"></A>
+<A NAME="IDX558"></A>
 Shorthand for <SAMP>&lsquo;--less-than=2&rsquo;</SAMP>.  Requests that only unique messages be
 printed.
 
@@ -237,14 +237,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX565"></A>
-<A NAME="IDX566"></A>
+<A NAME="IDX559"></A>
+<A NAME="IDX560"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX567"></A>
+<A NAME="IDX561"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -260,19 +260,19 @@
 <DD>
 <DT><SAMP>&lsquo;--to-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX568"></A>
-<A NAME="IDX569"></A>
+<A NAME="IDX562"></A>
+<A NAME="IDX563"></A>
 Specify encoding for output.
 
 <DT><SAMP>&lsquo;--use-first&rsquo;</SAMP>
 <DD>
-<A NAME="IDX570"></A>
+<A NAME="IDX564"></A>
 Use first available translation for each message.  Don't merge several
 translations into one.
 
 <DT><SAMP>&lsquo;--lang=<VAR>catalogname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX571"></A>
+<A NAME="IDX565"></A>
 Specify the <SAMP>&lsquo;Language&rsquo;</SAMP> field to be used in the header entry.  See
 section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for the meaning of this field.  Note: The
 <SAMP>&lsquo;Language-Team&rsquo;</SAMP> and <SAMP>&lsquo;Plural-Forms&rsquo;</SAMP> fields are left unchanged.
@@ -281,51 +281,45 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX572"></A>
+<A NAME="IDX566"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX573"></A>
+<A NAME="IDX567"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX574"></A>
+<A NAME="IDX568"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX575"></A>
-<A NAME="IDX576"></A>
+<A NAME="IDX569"></A>
+<A NAME="IDX570"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX577"></A>
+<A NAME="IDX571"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX578"></A>
-<A NAME="IDX579"></A>
+<A NAME="IDX572"></A>
+<A NAME="IDX573"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX580"></A>
+<A NAME="IDX574"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -334,15 +328,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX581"></A>
-<A NAME="IDX582"></A>
+<A NAME="IDX575"></A>
+<A NAME="IDX576"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX583"></A>
+<A NAME="IDX577"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -350,15 +344,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX584"></A>
-<A NAME="IDX585"></A>
+<A NAME="IDX578"></A>
+<A NAME="IDX579"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX586"></A>
+<A NAME="IDX580"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -367,9 +361,9 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX587"></A>
-<A NAME="IDX588"></A>
-<A NAME="IDX589"></A>
+<A NAME="IDX581"></A>
+<A NAME="IDX582"></A>
+<A NAME="IDX583"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -377,8 +371,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX590"></A>
-<A NAME="IDX591"></A>
+<A NAME="IDX584"></A>
+<A NAME="IDX585"></A>
 Sort output by file location.
 
 </DL>
@@ -393,16 +387,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX592"></A>
-<A NAME="IDX593"></A>
+<A NAME="IDX586"></A>
+<A NAME="IDX587"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX594"></A>
-<A NAME="IDX595"></A>
+<A NAME="IDX588"></A>
+<A NAME="IDX589"></A>
 Output version information and exit.
 
 </DL>
@@ -412,15 +406,15 @@
 <H2><A NAME="SEC87" HREF="gettext_toc.html#TOC87">9.2  Invoking the <CODE>msgconv</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX596"></A>
-<A NAME="IDX597"></A>
+<A NAME="IDX590"></A>
+<A NAME="IDX591"></A>
 
 <PRE>
 msgconv [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX598"></A>
+<A NAME="IDX592"></A>
 The <CODE>msgconv</CODE> program converts a translation catalog to a different
 character encoding.
 
@@ -439,8 +433,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX599"></A>
-<A NAME="IDX600"></A>
+<A NAME="IDX593"></A>
+<A NAME="IDX594"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -461,8 +455,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX601"></A>
-<A NAME="IDX602"></A>
+<A NAME="IDX595"></A>
+<A NAME="IDX596"></A>
 Write output to specified file.
 
 </DL>
@@ -482,8 +476,8 @@
 <DD>
 <DT><SAMP>&lsquo;--to-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX603"></A>
-<A NAME="IDX604"></A>
+<A NAME="IDX597"></A>
+<A NAME="IDX598"></A>
 Specify encoding for output.
 
 </DL>
@@ -502,14 +496,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX605"></A>
-<A NAME="IDX606"></A>
+<A NAME="IDX599"></A>
+<A NAME="IDX600"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX607"></A>
+<A NAME="IDX601"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -525,50 +519,42 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX608"></A>
+<A NAME="IDX602"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX609"></A>
+<A NAME="IDX603"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX610"></A>
+<A NAME="IDX604"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX611"></A>
-<A NAME="IDX612"></A>
+<A NAME="IDX605"></A>
+<A NAME="IDX606"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX613"></A>
+<A NAME="IDX607"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
-<DT><SAMP>&lsquo;-n&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
-<DD>
-<A NAME="IDX614"></A>
+<A NAME="IDX608"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX615"></A>
+<A NAME="IDX609"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -577,15 +563,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX616"></A>
-<A NAME="IDX617"></A>
+<A NAME="IDX610"></A>
+<A NAME="IDX611"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX618"></A>
+<A NAME="IDX612"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -593,15 +579,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX619"></A>
-<A NAME="IDX620"></A>
+<A NAME="IDX613"></A>
+<A NAME="IDX614"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX621"></A>
+<A NAME="IDX615"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -610,8 +596,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX622"></A>
-<A NAME="IDX623"></A>
+<A NAME="IDX616"></A>
+<A NAME="IDX617"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -619,8 +605,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX624"></A>
-<A NAME="IDX625"></A>
+<A NAME="IDX618"></A>
+<A NAME="IDX619"></A>
 Sort output by file location.
 
 </DL>
@@ -635,16 +621,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX626"></A>
-<A NAME="IDX627"></A>
+<A NAME="IDX620"></A>
+<A NAME="IDX621"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX628"></A>
-<A NAME="IDX629"></A>
+<A NAME="IDX622"></A>
+<A NAME="IDX623"></A>
 Output version information and exit.
 
 </DL>
@@ -654,15 +640,15 @@
 <H2><A NAME="SEC94" HREF="gettext_toc.html#TOC94">9.3  Invoking the <CODE>msggrep</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX630"></A>
-<A NAME="IDX631"></A>
+<A NAME="IDX624"></A>
+<A NAME="IDX625"></A>
 
 <PRE>
 msggrep [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX632"></A>
+<A NAME="IDX626"></A>
 The <CODE>msggrep</CODE> program extracts all messages of a translation catalog
 that match a given pattern or belong to some given source files.
 
@@ -681,8 +667,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX633"></A>
-<A NAME="IDX634"></A>
+<A NAME="IDX627"></A>
+<A NAME="IDX628"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -703,8 +689,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX635"></A>
-<A NAME="IDX636"></A>
+<A NAME="IDX629"></A>
+<A NAME="IDX630"></A>
 Write output to specified file.
 
 </DL>
@@ -770,8 +756,8 @@
 <DD>
 <DT><SAMP>&lsquo;--location=<VAR>sourcefile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX637"></A>
-<A NAME="IDX638"></A>
+<A NAME="IDX631"></A>
+<A NAME="IDX632"></A>
 Select messages extracted from <VAR>sourcefile</VAR>.  <VAR>sourcefile</VAR> can be
 either a literal file name or a wildcard pattern.
 
@@ -779,96 +765,96 @@
 <DD>
 <DT><SAMP>&lsquo;--domain=<VAR>domainname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX639"></A>
-<A NAME="IDX640"></A>
+<A NAME="IDX633"></A>
+<A NAME="IDX634"></A>
 Select messages belonging to domain <VAR>domainname</VAR>.
 
 <DT><SAMP>&lsquo;-J&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgctxt&rsquo;</SAMP>
 <DD>
-<A NAME="IDX641"></A>
-<A NAME="IDX642"></A>
+<A NAME="IDX635"></A>
+<A NAME="IDX636"></A>
 Start of patterns for the msgctxt.
 
 <DT><SAMP>&lsquo;-K&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgid&rsquo;</SAMP>
 <DD>
-<A NAME="IDX643"></A>
-<A NAME="IDX644"></A>
+<A NAME="IDX637"></A>
+<A NAME="IDX638"></A>
 Start of patterns for the msgid.
 
 <DT><SAMP>&lsquo;-T&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgstr&rsquo;</SAMP>
 <DD>
-<A NAME="IDX645"></A>
-<A NAME="IDX646"></A>
+<A NAME="IDX639"></A>
+<A NAME="IDX640"></A>
 Start of patterns for the msgstr.
 
 <DT><SAMP>&lsquo;-C&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--comment&rsquo;</SAMP>
 <DD>
-<A NAME="IDX647"></A>
-<A NAME="IDX648"></A>
+<A NAME="IDX641"></A>
+<A NAME="IDX642"></A>
 Start of patterns for the translator's comment.
 
 <DT><SAMP>&lsquo;-X&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--extracted-comment&rsquo;</SAMP>
 <DD>
-<A NAME="IDX649"></A>
-<A NAME="IDX650"></A>
+<A NAME="IDX643"></A>
+<A NAME="IDX644"></A>
 Start of patterns for the extracted comments.
 
 <DT><SAMP>&lsquo;-E&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--extended-regexp&rsquo;</SAMP>
 <DD>
-<A NAME="IDX651"></A>
-<A NAME="IDX652"></A>
+<A NAME="IDX645"></A>
+<A NAME="IDX646"></A>
 Specify that <VAR>pattern</VAR> is an extended regular expression.
 
 <DT><SAMP>&lsquo;-F&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--fixed-strings&rsquo;</SAMP>
 <DD>
-<A NAME="IDX653"></A>
-<A NAME="IDX654"></A>
+<A NAME="IDX647"></A>
+<A NAME="IDX648"></A>
 Specify that <VAR>pattern</VAR> is a set of newline-separated strings.
 
 <DT><SAMP>&lsquo;-e <VAR>pattern</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--regexp=<VAR>pattern</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX655"></A>
-<A NAME="IDX656"></A>
+<A NAME="IDX649"></A>
+<A NAME="IDX650"></A>
 Use <VAR>pattern</VAR> as a regular expression.
 
 <DT><SAMP>&lsquo;-f <VAR>file</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX657"></A>
-<A NAME="IDX658"></A>
+<A NAME="IDX651"></A>
+<A NAME="IDX652"></A>
 Obtain <VAR>pattern</VAR> from <VAR>file</VAR>.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--ignore-case&rsquo;</SAMP>
 <DD>
-<A NAME="IDX659"></A>
-<A NAME="IDX660"></A>
+<A NAME="IDX653"></A>
+<A NAME="IDX654"></A>
 Ignore case distinctions.
 
 <DT><SAMP>&lsquo;-v&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--invert-match&rsquo;</SAMP>
 <DD>
-<A NAME="IDX661"></A>
-<A NAME="IDX662"></A>
+<A NAME="IDX655"></A>
+<A NAME="IDX656"></A>
 Output only the messages that do not match any selection criterion, instead
 of the messages that match a selection criterion.
 
@@ -884,14 +870,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX663"></A>
-<A NAME="IDX664"></A>
+<A NAME="IDX657"></A>
+<A NAME="IDX658"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX665"></A>
+<A NAME="IDX659"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -907,47 +893,39 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX666"></A>
+<A NAME="IDX660"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX667"></A>
+<A NAME="IDX661"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX668"></A>
+<A NAME="IDX662"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX669"></A>
+<A NAME="IDX663"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX670"></A>
+<A NAME="IDX664"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
-<DT><SAMP>&lsquo;-n&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
-<DD>
-<A NAME="IDX671"></A>
+<A NAME="IDX665"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX672"></A>
+<A NAME="IDX666"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -956,15 +934,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX673"></A>
-<A NAME="IDX674"></A>
+<A NAME="IDX667"></A>
+<A NAME="IDX668"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX675"></A>
+<A NAME="IDX669"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -972,28 +950,28 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX676"></A>
-<A NAME="IDX677"></A>
+<A NAME="IDX670"></A>
+<A NAME="IDX671"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX678"></A>
+<A NAME="IDX672"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
 
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX679"></A>
+<A NAME="IDX673"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX680"></A>
+<A NAME="IDX674"></A>
 Sort output by file location.
 
 </DL>
@@ -1008,16 +986,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX681"></A>
-<A NAME="IDX682"></A>
+<A NAME="IDX675"></A>
+<A NAME="IDX676"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX683"></A>
-<A NAME="IDX684"></A>
+<A NAME="IDX677"></A>
+<A NAME="IDX678"></A>
 Output version information and exit.
 
 </DL>
@@ -1071,42 +1049,29 @@
 <H2><A NAME="SEC102" HREF="gettext_toc.html#TOC102">9.4  Invoking the <CODE>msgfilter</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX685"></A>
-<A NAME="IDX686"></A>
+<A NAME="IDX679"></A>
+<A NAME="IDX680"></A>
 
 <PRE>
 msgfilter [<VAR>option</VAR>] <VAR>filter</VAR> [<VAR>filter-option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX687"></A>
+<A NAME="IDX681"></A>
 The <CODE>msgfilter</CODE> program applies a filter to all translations of a
 translation catalog.
 
 </P>
 <P>
-<A NAME="IDX688"></A>
-<A NAME="IDX689"></A>
-<A NAME="IDX690"></A>
-<A NAME="IDX691"></A>
-<A NAME="IDX692"></A>
-<A NAME="IDX693"></A>
-<A NAME="IDX694"></A>
-<A NAME="IDX695"></A>
+<A NAME="IDX682"></A>
+<A NAME="IDX683"></A>
+<A NAME="IDX684"></A>
 During each <VAR>filter</VAR> invocation, the environment variable
 <CODE>MSGFILTER_MSGID</CODE> is bound to the message's msgid, and the environment
 variable <CODE>MSGFILTER_LOCATION</CODE> is bound to the location in the PO file
 of the message.  If the message has a context, the environment variable
 <CODE>MSGFILTER_MSGCTXT</CODE> is bound to the message's msgctxt, otherwise it is
-unbound.  If the message has a plural form, environment variable
-<CODE>MSGFILTER_MSGID_PLURAL</CODE> is bound to the message's msgid_plural and
-<CODE>MSGFILTER_PLURAL_FORM</CODE> is bound to the order number of the plural
-actually processed (starting with 0), otherwise both are unbound.
-If the message has a previous msgid (added by <CODE>msgmerge</CODE>),
-environment variable <CODE>MSGFILTER_PREV_MSGCTXT</CODE> is bound to the
-message's previous msgctxt, <CODE>MSGFILTER_PREV_MSGID</CODE> is bound to
-the previous msgid, and <CODE>MSGFILTER_PREV_MSGID_PLURAL</CODE> is bound to
-the previous msgid_plural.
+unbound.
 
 </P>
 
@@ -1119,16 +1084,16 @@
 <DD>
 <DT><SAMP>&lsquo;--input=<VAR>inputfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX696"></A>
-<A NAME="IDX697"></A>
+<A NAME="IDX685"></A>
+<A NAME="IDX686"></A>
 Input PO file.
 
 <DT><SAMP>&lsquo;-D <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX698"></A>
-<A NAME="IDX699"></A>
+<A NAME="IDX687"></A>
+<A NAME="IDX688"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -1149,8 +1114,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX700"></A>
-<A NAME="IDX701"></A>
+<A NAME="IDX689"></A>
+<A NAME="IDX690"></A>
 Write output to specified file.
 
 </DL>
@@ -1172,7 +1137,7 @@
 
 </P>
 <P>
-<A NAME="IDX702"></A>
+<A NAME="IDX691"></A>
 Note: If the filter is not a built-in filter, you have to care about encodings:
 It is your responsibility to ensure that the <VAR>filter</VAR> can cope
 with input encoded in the translation catalog's encoding.  If the
@@ -1186,7 +1151,7 @@
 
 </P>
 <P>
-<A NAME="IDX703"></A>
+<A NAME="IDX692"></A>
 Note: Most translations in a translation catalog don't end with a newline
 character.  For this reason, it is important that the <VAR>filter</VAR>
 recognizes its last input line even if it ends without a newline, and that
@@ -1206,16 +1171,16 @@
 <DD>
 <DT><SAMP>&lsquo;--expression=<VAR>script</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX704"></A>
-<A NAME="IDX705"></A>
+<A NAME="IDX693"></A>
+<A NAME="IDX694"></A>
 Add <VAR>script</VAR> to the commands to be executed.
 
 <DT><SAMP>&lsquo;-f <VAR>scriptfile</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--file=<VAR>scriptfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX706"></A>
-<A NAME="IDX707"></A>
+<A NAME="IDX695"></A>
+<A NAME="IDX696"></A>
 Add the contents of <VAR>scriptfile</VAR> to the commands to be executed.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
@@ -1224,9 +1189,9 @@
 <DD>
 <DT><SAMP>&lsquo;--silent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX708"></A>
-<A NAME="IDX709"></A>
-<A NAME="IDX710"></A>
+<A NAME="IDX697"></A>
+<A NAME="IDX698"></A>
+<A NAME="IDX699"></A>
 Suppress automatic printing of pattern space.
 
 </DL>
@@ -1236,8 +1201,8 @@
 <H3><A NAME="SEC107" HREF="gettext_toc.html#TOC107">9.4.5  Built-in <VAR>filter</VAR>s</A></H3>
 
 <P>
-<A NAME="IDX711"></A>
-<A NAME="IDX712"></A>
+<A NAME="IDX700"></A>
+<A NAME="IDX701"></A>
 The filter <SAMP>&lsquo;recode-sr-latin&rsquo;</SAMP> is recognized as a built-in filter.
 The command <SAMP>&lsquo;recode-sr-latin&rsquo;</SAMP> converts Serbian text, written in the
 Cyrillic script, to the Latin script.
@@ -1247,21 +1212,6 @@
 
 </P>
 <P>
-<A NAME="IDX713"></A>
-The filter <SAMP>&lsquo;quot&rsquo;</SAMP> is recognized as a built-in filter.
-The command <SAMP>&lsquo;msgfilter quot&rsquo;</SAMP> converts any quotations surrounded
-by a pair of <SAMP>&lsquo;"&rsquo;</SAMP>, <SAMP>&lsquo;'&rsquo;</SAMP>, and <SAMP>&lsquo;`&rsquo;</SAMP>.
-
-</P>
-<P>
-<A NAME="IDX714"></A>
-The filter <SAMP>&lsquo;boldquot&rsquo;</SAMP> is recognized as a built-in filter.
-The command <SAMP>&lsquo;msgfilter boldquot&rsquo;</SAMP> converts any quotations
-surrounded by a pair of <SAMP>&lsquo;"&rsquo;</SAMP>, <SAMP>&lsquo;'&rsquo;</SAMP>, and <SAMP>&lsquo;`&rsquo;</SAMP>, also adding the
-VT100 escape sequences to the text to decorate it as bold.
-
-</P>
-<P>
 The use of built-in filters is not sensitive to the current locale's encoding.
 Moreover, when used with a built-in filter, <SAMP>&lsquo;msgfilter&rsquo;</SAMP> can automatically
 convert the message catalog to the UTF-8 encoding when needed.
@@ -1277,14 +1227,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX715"></A>
-<A NAME="IDX716"></A>
+<A NAME="IDX702"></A>
+<A NAME="IDX703"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX717"></A>
+<A NAME="IDX704"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -1300,54 +1250,46 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX718"></A>
+<A NAME="IDX705"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX719"></A>
+<A NAME="IDX706"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX720"></A>
+<A NAME="IDX707"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX721"></A>
+<A NAME="IDX708"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--keep-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX722"></A>
+<A NAME="IDX709"></A>
 Keep the header entry, i.e. the message with <SAMP>&lsquo;msgid ""&rsquo;</SAMP>, unmodified,
 instead of filtering it.  By default, the header entry is subject to
 filtering like any other message.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX723"></A>
+<A NAME="IDX710"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
-<DT><SAMP>&lsquo;-n&rsquo;</SAMP>
-<DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX724"></A>
+<A NAME="IDX711"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX725"></A>
+<A NAME="IDX712"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1356,15 +1298,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX726"></A>
-<A NAME="IDX727"></A>
+<A NAME="IDX713"></A>
+<A NAME="IDX714"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX728"></A>
+<A NAME="IDX715"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1372,15 +1314,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX729"></A>
-<A NAME="IDX730"></A>
+<A NAME="IDX716"></A>
+<A NAME="IDX717"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX731"></A>
+<A NAME="IDX718"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1389,8 +1331,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX732"></A>
-<A NAME="IDX733"></A>
+<A NAME="IDX719"></A>
+<A NAME="IDX720"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1398,8 +1340,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX734"></A>
-<A NAME="IDX735"></A>
+<A NAME="IDX721"></A>
+<A NAME="IDX722"></A>
 Sort output by file location.
 
 </DL>
@@ -1414,16 +1356,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX736"></A>
-<A NAME="IDX737"></A>
+<A NAME="IDX723"></A>
+<A NAME="IDX724"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX738"></A>
-<A NAME="IDX739"></A>
+<A NAME="IDX725"></A>
+<A NAME="IDX726"></A>
 Output version information and exit.
 
 </DL>
@@ -1455,16 +1397,16 @@
 <H2><A NAME="SEC112" HREF="gettext_toc.html#TOC112">9.5  Invoking the <CODE>msguniq</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX740"></A>
-<A NAME="IDX741"></A>
+<A NAME="IDX727"></A>
+<A NAME="IDX728"></A>
 
 <PRE>
 msguniq [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX742"></A>
-<A NAME="IDX743"></A>
+<A NAME="IDX729"></A>
+<A NAME="IDX730"></A>
 The <CODE>msguniq</CODE> program unifies duplicate translations in a translation
 catalog.  It finds duplicate translations of the same message ID.  Such
 duplicates are invalid input for other programs like <CODE>msgfmt</CODE>,
@@ -1491,8 +1433,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX744"></A>
-<A NAME="IDX745"></A>
+<A NAME="IDX731"></A>
+<A NAME="IDX732"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -1513,8 +1455,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX746"></A>
-<A NAME="IDX747"></A>
+<A NAME="IDX733"></A>
+<A NAME="IDX734"></A>
 Write output to specified file.
 
 </DL>
@@ -1534,16 +1476,16 @@
 <DD>
 <DT><SAMP>&lsquo;--repeated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX748"></A>
-<A NAME="IDX749"></A>
+<A NAME="IDX735"></A>
+<A NAME="IDX736"></A>
 Print only duplicates.
 
 <DT><SAMP>&lsquo;-u&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--unique&rsquo;</SAMP>
 <DD>
-<A NAME="IDX750"></A>
-<A NAME="IDX751"></A>
+<A NAME="IDX737"></A>
+<A NAME="IDX738"></A>
 Print only unique messages, discard duplicates.
 
 </DL>
@@ -1558,14 +1500,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX752"></A>
-<A NAME="IDX753"></A>
+<A NAME="IDX739"></A>
+<A NAME="IDX740"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX754"></A>
+<A NAME="IDX741"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -1581,13 +1523,13 @@
 <DD>
 <DT><SAMP>&lsquo;--to-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX755"></A>
-<A NAME="IDX756"></A>
+<A NAME="IDX742"></A>
+<A NAME="IDX743"></A>
 Specify encoding for output.
 
 <DT><SAMP>&lsquo;--use-first&rsquo;</SAMP>
 <DD>
-<A NAME="IDX757"></A>
+<A NAME="IDX744"></A>
 Use first available translation for each message.  Don't merge several
 translations into one.
 
@@ -1595,51 +1537,45 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX758"></A>
+<A NAME="IDX745"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX759"></A>
+<A NAME="IDX746"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX760"></A>
+<A NAME="IDX747"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX761"></A>
-<A NAME="IDX762"></A>
+<A NAME="IDX748"></A>
+<A NAME="IDX749"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX763"></A>
+<A NAME="IDX750"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX764"></A>
-<A NAME="IDX765"></A>
+<A NAME="IDX751"></A>
+<A NAME="IDX752"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX766"></A>
+<A NAME="IDX753"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1648,15 +1584,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX767"></A>
-<A NAME="IDX768"></A>
+<A NAME="IDX754"></A>
+<A NAME="IDX755"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX769"></A>
+<A NAME="IDX756"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1664,15 +1600,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX770"></A>
-<A NAME="IDX771"></A>
+<A NAME="IDX757"></A>
+<A NAME="IDX758"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX772"></A>
+<A NAME="IDX759"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1681,8 +1617,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX773"></A>
-<A NAME="IDX774"></A>
+<A NAME="IDX760"></A>
+<A NAME="IDX761"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1690,8 +1626,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX775"></A>
-<A NAME="IDX776"></A>
+<A NAME="IDX762"></A>
+<A NAME="IDX763"></A>
 Sort output by file location.
 
 </DL>
@@ -1706,16 +1642,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX777"></A>
-<A NAME="IDX778"></A>
+<A NAME="IDX764"></A>
+<A NAME="IDX765"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX779"></A>
-<A NAME="IDX780"></A>
+<A NAME="IDX766"></A>
+<A NAME="IDX767"></A>
 Output version information and exit.
 
 </DL>
@@ -1725,22 +1661,22 @@
 <H2><A NAME="SEC119" HREF="gettext_toc.html#TOC119">9.6  Invoking the <CODE>msgcomm</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX781"></A>
-<A NAME="IDX782"></A>
+<A NAME="IDX768"></A>
+<A NAME="IDX769"></A>
 
 <PRE>
 msgcomm [<VAR>option</VAR>] [<VAR>inputfile</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX783"></A>
+<A NAME="IDX770"></A>
 The <CODE>msgcomm</CODE> program finds messages which are common to two or more
 of the specified PO files.
 By using the <CODE>--more-than</CODE> option, greater commonality may be requested
 before messages are printed.  Conversely, the <CODE>--less-than</CODE> option may be
 used to specify less commonality before messages are printed (i.e.
 <SAMP>&lsquo;--less-than=2&rsquo;</SAMP> will only print the unique messages).  Translations,
-comments and extracted comments will be preserved, but only from the first
+comments and extract comments will be preserved, but only from the first
 PO file to define them.  File positions from all PO files will be
 cumulated.
 
@@ -1759,8 +1695,8 @@
 <DD>
 <DT><SAMP>&lsquo;--files-from=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX784"></A>
-<A NAME="IDX785"></A>
+<A NAME="IDX771"></A>
+<A NAME="IDX772"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -1768,8 +1704,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX786"></A>
-<A NAME="IDX787"></A>
+<A NAME="IDX773"></A>
+<A NAME="IDX774"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -1790,8 +1726,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX788"></A>
-<A NAME="IDX789"></A>
+<A NAME="IDX775"></A>
+<A NAME="IDX776"></A>
 Write output to specified file.
 
 </DL>
@@ -1811,8 +1747,8 @@
 <DD>
 <DT><SAMP>&lsquo;--less-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX790"></A>
-<A NAME="IDX791"></A>
+<A NAME="IDX777"></A>
+<A NAME="IDX778"></A>
 Print messages with less than <VAR>number</VAR> definitions, defaults to infinite
 if not set.
 
@@ -1820,8 +1756,8 @@
 <DD>
 <DT><SAMP>&lsquo;--more-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX792"></A>
-<A NAME="IDX793"></A>
+<A NAME="IDX779"></A>
+<A NAME="IDX780"></A>
 Print messages with more than <VAR>number</VAR> definitions, defaults to 1 if not
 set.
 
@@ -1829,8 +1765,8 @@
 <DD>
 <DT><SAMP>&lsquo;--unique&rsquo;</SAMP>
 <DD>
-<A NAME="IDX794"></A>
-<A NAME="IDX795"></A>
+<A NAME="IDX781"></A>
+<A NAME="IDX782"></A>
 Shorthand for <SAMP>&lsquo;--less-than=2&rsquo;</SAMP>.  Requests that only unique messages be
 printed.
 
@@ -1846,14 +1782,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX796"></A>
-<A NAME="IDX797"></A>
+<A NAME="IDX783"></A>
+<A NAME="IDX784"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX798"></A>
+<A NAME="IDX785"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -1869,51 +1805,45 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX799"></A>
+<A NAME="IDX786"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX800"></A>
+<A NAME="IDX787"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX801"></A>
+<A NAME="IDX788"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX802"></A>
-<A NAME="IDX803"></A>
+<A NAME="IDX789"></A>
+<A NAME="IDX790"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX804"></A>
+<A NAME="IDX791"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX805"></A>
-<A NAME="IDX806"></A>
+<A NAME="IDX792"></A>
+<A NAME="IDX793"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX807"></A>
+<A NAME="IDX794"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1922,15 +1852,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX808"></A>
-<A NAME="IDX809"></A>
+<A NAME="IDX795"></A>
+<A NAME="IDX796"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX810"></A>
+<A NAME="IDX797"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1938,15 +1868,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX811"></A>
-<A NAME="IDX812"></A>
+<A NAME="IDX798"></A>
+<A NAME="IDX799"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX813"></A>
+<A NAME="IDX800"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1955,8 +1885,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX814"></A>
-<A NAME="IDX815"></A>
+<A NAME="IDX801"></A>
+<A NAME="IDX802"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1964,13 +1894,13 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX816"></A>
-<A NAME="IDX817"></A>
+<A NAME="IDX803"></A>
+<A NAME="IDX804"></A>
 Sort output by file location.
 
 <DT><SAMP>&lsquo;--omit-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX818"></A>
+<A NAME="IDX805"></A>
 Don't write header with <SAMP>&lsquo;msgid ""&rsquo;</SAMP> entry.
 
 </DL>
@@ -1985,16 +1915,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX819"></A>
-<A NAME="IDX820"></A>
+<A NAME="IDX806"></A>
+<A NAME="IDX807"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX821"></A>
-<A NAME="IDX822"></A>
+<A NAME="IDX808"></A>
+<A NAME="IDX809"></A>
 Output version information and exit.
 
 </DL>
@@ -2004,15 +1934,15 @@
 <H2><A NAME="SEC126" HREF="gettext_toc.html#TOC126">9.7  Invoking the <CODE>msgcmp</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX823"></A>
-<A NAME="IDX824"></A>
+<A NAME="IDX810"></A>
+<A NAME="IDX811"></A>
 
 <PRE>
 msgcmp [<VAR>option</VAR>] <VAR>def</VAR>.po <VAR>ref</VAR>.pot
 </PRE>
 
 <P>
-<A NAME="IDX825"></A>
+<A NAME="IDX812"></A>
 The <CODE>msgcmp</CODE> program compares two Uniforum style .po files to check that
 both contain the same set of msgid strings.  The <VAR>def</VAR>.po file is an
 existing PO file with the translations.  The <VAR>ref</VAR>.pot file is the last
@@ -2040,8 +1970,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX826"></A>
-<A NAME="IDX827"></A>
+<A NAME="IDX813"></A>
+<A NAME="IDX814"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.
 
@@ -2057,29 +1987,29 @@
 <DD>
 <DT><SAMP>&lsquo;--multi-domain&rsquo;</SAMP>
 <DD>
-<A NAME="IDX828"></A>
-<A NAME="IDX829"></A>
+<A NAME="IDX815"></A>
+<A NAME="IDX816"></A>
 Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 <DT><SAMP>&lsquo;-N&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--no-fuzzy-matching&rsquo;</SAMP>
 <DD>
-<A NAME="IDX830"></A>
-<A NAME="IDX831"></A>
+<A NAME="IDX817"></A>
+<A NAME="IDX818"></A>
 Do not use fuzzy matching when an exact match is not found.  This may speed
 up the operation considerably.
 
 <DT><SAMP>&lsquo;--use-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX832"></A>
+<A NAME="IDX819"></A>
 Consider fuzzy messages in the <VAR>def</VAR>.po file like translated messages.
 Note that using this option is usually wrong, because fuzzy messages are
 exactly those which have not been validated by a human translator.
 
 <DT><SAMP>&lsquo;--use-untranslated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX833"></A>
+<A NAME="IDX820"></A>
 Consider untranslated messages in the <VAR>def</VAR>.po file like translated
 messages.  Note that using this option is usually wrong.
 
@@ -2095,14 +2025,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX834"></A>
-<A NAME="IDX835"></A>
+<A NAME="IDX821"></A>
+<A NAME="IDX822"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX836"></A>
+<A NAME="IDX823"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2118,16 +2048,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX837"></A>
-<A NAME="IDX838"></A>
+<A NAME="IDX824"></A>
+<A NAME="IDX825"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX839"></A>
-<A NAME="IDX840"></A>
+<A NAME="IDX826"></A>
+<A NAME="IDX827"></A>
 Output version information and exit.
 
 </DL>
@@ -2137,16 +2067,16 @@
 <H2><A NAME="SEC131" HREF="gettext_toc.html#TOC131">9.8  Invoking the <CODE>msgattrib</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX841"></A>
-<A NAME="IDX842"></A>
+<A NAME="IDX828"></A>
+<A NAME="IDX829"></A>
 
 <PRE>
 msgattrib [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX843"></A>
-<A NAME="IDX844"></A>
+<A NAME="IDX830"></A>
+<A NAME="IDX831"></A>
 The <CODE>msgattrib</CODE> program filters the messages of a translation catalog
 according to their attributes, and manipulates the attributes.
 
@@ -2165,8 +2095,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX845"></A>
-<A NAME="IDX846"></A>
+<A NAME="IDX832"></A>
+<A NAME="IDX833"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -2187,8 +2117,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX847"></A>
-<A NAME="IDX848"></A>
+<A NAME="IDX834"></A>
+<A NAME="IDX835"></A>
 Write output to specified file.
 
 </DL>
@@ -2206,36 +2136,36 @@
 
 <DT><SAMP>&lsquo;--translated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX849"></A>
+<A NAME="IDX836"></A>
 Keep translated messages, remove untranslated messages.
 
 <DT><SAMP>&lsquo;--untranslated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX850"></A>
+<A NAME="IDX837"></A>
 Keep untranslated messages, remove translated messages.
 
 <DT><SAMP>&lsquo;--no-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX851"></A>
+<A NAME="IDX838"></A>
 Remove
 ‘fuzzy’
 marked messages.
 
 <DT><SAMP>&lsquo;--only-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX852"></A>
+<A NAME="IDX839"></A>
 Keep
 ‘fuzzy’
 marked messages, remove all other messages.
 
 <DT><SAMP>&lsquo;--no-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX853"></A>
+<A NAME="IDX840"></A>
 Remove obsolete #~ messages.
 
 <DT><SAMP>&lsquo;--only-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX854"></A>
+<A NAME="IDX841"></A>
 Keep obsolete #~ messages, remove all other messages.
 
 </DL>
@@ -2245,7 +2175,7 @@
 <H3><A NAME="SEC135" HREF="gettext_toc.html#TOC135">9.8.4  Attribute manipulation</A></H3>
 
 <P>
-<A NAME="IDX855"></A>
+<A NAME="IDX842"></A>
 Attributes are modified after the message selection/removal has been
 performed.  If the <SAMP>&lsquo;--only-file&rsquo;</SAMP> or <SAMP>&lsquo;--ignore-file&rsquo;</SAMP> option is
 specified, the attribute modification is applied only to those messages
@@ -2257,60 +2187,46 @@
 
 <DT><SAMP>&lsquo;--set-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX856"></A>
+<A NAME="IDX843"></A>
 Set all messages
 ‘fuzzy’.
 
 <DT><SAMP>&lsquo;--clear-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX857"></A>
+<A NAME="IDX844"></A>
 Set all messages
 non-‘fuzzy’.
 
 <DT><SAMP>&lsquo;--set-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX858"></A>
+<A NAME="IDX845"></A>
 Set all messages obsolete.
 
 <DT><SAMP>&lsquo;--clear-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX859"></A>
+<A NAME="IDX846"></A>
 Set all messages non-obsolete.
 
-<DT><SAMP>&lsquo;--previous&rsquo;</SAMP>
-<DD>
-<A NAME="IDX860"></A>
-When setting
-‘fuzzy’
-mark, keep “previous msgid” of translated messages.
-
 <DT><SAMP>&lsquo;--clear-previous&rsquo;</SAMP>
 <DD>
-<A NAME="IDX861"></A>
+<A NAME="IDX847"></A>
 Remove the “previous msgid” (<SAMP>&lsquo;#|&rsquo;</SAMP>) comments from all messages.
 
-<DT><SAMP>&lsquo;--empty&rsquo;</SAMP>
-<DD>
-<A NAME="IDX862"></A>
-When removing
-‘fuzzy’
-mark, also set msgstr empty.
-
 <DT><SAMP>&lsquo;--only-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX863"></A>
+<A NAME="IDX848"></A>
 Limit the attribute changes to entries that are listed in <VAR>file</VAR>.
 <VAR>file</VAR> should be a PO or POT file.
 
 <DT><SAMP>&lsquo;--ignore-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX864"></A>
+<A NAME="IDX849"></A>
 Limit the attribute changes to entries that are not listed in <VAR>file</VAR>.
 <VAR>file</VAR> should be a PO or POT file.
 
 <DT><SAMP>&lsquo;--fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX865"></A>
+<A NAME="IDX850"></A>
 Synonym for <SAMP>&lsquo;--only-fuzzy --clear-fuzzy&rsquo;</SAMP>: It keeps only the fuzzy
 messages and removes their
 ‘fuzzy’
@@ -2318,7 +2234,7 @@
 
 <DT><SAMP>&lsquo;--obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX866"></A>
+<A NAME="IDX851"></A>
 Synonym for <SAMP>&lsquo;--only-obsolete --clear-obsolete&rsquo;</SAMP>: It keeps only the
 obsolete messages and makes them non-obsolete.
 
@@ -2334,14 +2250,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX867"></A>
-<A NAME="IDX868"></A>
+<A NAME="IDX852"></A>
+<A NAME="IDX853"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX869"></A>
+<A NAME="IDX854"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2357,51 +2273,45 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX870"></A>
+<A NAME="IDX855"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX871"></A>
+<A NAME="IDX856"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX872"></A>
+<A NAME="IDX857"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX873"></A>
-<A NAME="IDX874"></A>
+<A NAME="IDX858"></A>
+<A NAME="IDX859"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX875"></A>
+<A NAME="IDX860"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX876"></A>
-<A NAME="IDX877"></A>
+<A NAME="IDX861"></A>
+<A NAME="IDX862"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX878"></A>
+<A NAME="IDX863"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -2410,15 +2320,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX879"></A>
-<A NAME="IDX880"></A>
+<A NAME="IDX864"></A>
+<A NAME="IDX865"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX881"></A>
+<A NAME="IDX866"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -2426,15 +2336,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX882"></A>
-<A NAME="IDX883"></A>
+<A NAME="IDX867"></A>
+<A NAME="IDX868"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX884"></A>
+<A NAME="IDX869"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -2443,8 +2353,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX885"></A>
-<A NAME="IDX886"></A>
+<A NAME="IDX870"></A>
+<A NAME="IDX871"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -2452,8 +2362,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX887"></A>
-<A NAME="IDX888"></A>
+<A NAME="IDX872"></A>
+<A NAME="IDX873"></A>
 Sort output by file location.
 
 </DL>
@@ -2468,16 +2378,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX889"></A>
-<A NAME="IDX890"></A>
+<A NAME="IDX874"></A>
+<A NAME="IDX875"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX891"></A>
-<A NAME="IDX892"></A>
+<A NAME="IDX876"></A>
+<A NAME="IDX877"></A>
 Output version information and exit.
 
 </DL>
@@ -2487,15 +2397,15 @@
 <H2><A NAME="SEC139" HREF="gettext_toc.html#TOC139">9.9  Invoking the <CODE>msgen</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX893"></A>
-<A NAME="IDX894"></A>
+<A NAME="IDX878"></A>
+<A NAME="IDX879"></A>
 
 <PRE>
 msgen [<VAR>option</VAR>] <VAR>inputfile</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX895"></A>
+<A NAME="IDX880"></A>
 The <CODE>msgen</CODE> program creates an English translation catalog.  The
 input file is the last created English PO file, or a PO Template file
 (generally created by xgettext).  Untranslated entries are assigned a
@@ -2522,8 +2432,8 @@
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX896"></A>
-<A NAME="IDX897"></A>
+<A NAME="IDX881"></A>
+<A NAME="IDX882"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -2544,8 +2454,8 @@
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX898"></A>
-<A NAME="IDX899"></A>
+<A NAME="IDX883"></A>
+<A NAME="IDX884"></A>
 Write output to specified file.
 
 </DL>
@@ -2565,14 +2475,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX900"></A>
-<A NAME="IDX901"></A>
+<A NAME="IDX885"></A>
+<A NAME="IDX886"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX902"></A>
+<A NAME="IDX887"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2586,7 +2496,7 @@
 
 <DT><SAMP>&lsquo;--lang=<VAR>catalogname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX903"></A>
+<A NAME="IDX888"></A>
 Specify the <SAMP>&lsquo;Language&rsquo;</SAMP> field to be used in the header entry.  See
 section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for the meaning of this field.  Note: The
 <SAMP>&lsquo;Language-Team&rsquo;</SAMP> and <SAMP>&lsquo;Plural-Forms&rsquo;</SAMP> fields are not set by this
@@ -2596,50 +2506,42 @@
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX904"></A>
+<A NAME="IDX889"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX905"></A>
+<A NAME="IDX890"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX906"></A>
+<A NAME="IDX891"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX907"></A>
-<A NAME="IDX908"></A>
+<A NAME="IDX892"></A>
+<A NAME="IDX893"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX909"></A>
+<A NAME="IDX894"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
-<DT><SAMP>&lsquo;-n&rsquo;</SAMP>
-<DD>
-<DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
+<DT><SAMP>&lsquo;--add-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX910"></A>
+<A NAME="IDX895"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
-The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
-<SAMP>&lsquo;never&rsquo;</SAMP>.  If it is not given or <SAMP>&lsquo;full&rsquo;</SAMP>, it generates the
-lines with both file name and line number.  If it is <SAMP>&lsquo;file&rsquo;</SAMP>, the
-line number part is omitted.  If it is <SAMP>&lsquo;never&rsquo;</SAMP>, it completely
-suppresses the lines (same as <CODE>--no-location</CODE>).
-
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX911"></A>
+<A NAME="IDX896"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -2648,15 +2550,15 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX912"></A>
-<A NAME="IDX913"></A>
+<A NAME="IDX897"></A>
+<A NAME="IDX898"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX914"></A>
+<A NAME="IDX899"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -2664,15 +2566,15 @@
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX915"></A>
-<A NAME="IDX916"></A>
+<A NAME="IDX900"></A>
+<A NAME="IDX901"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX917"></A>
+<A NAME="IDX902"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -2681,8 +2583,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX918"></A>
-<A NAME="IDX919"></A>
+<A NAME="IDX903"></A>
+<A NAME="IDX904"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -2690,8 +2592,8 @@
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX920"></A>
-<A NAME="IDX921"></A>
+<A NAME="IDX905"></A>
+<A NAME="IDX906"></A>
 Sort output by file location.
 
 </DL>
@@ -2706,16 +2608,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX922"></A>
-<A NAME="IDX923"></A>
+<A NAME="IDX907"></A>
+<A NAME="IDX908"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX924"></A>
-<A NAME="IDX925"></A>
+<A NAME="IDX909"></A>
+<A NAME="IDX910"></A>
 Output version information and exit.
 
 </DL>
@@ -2725,15 +2627,15 @@
 <H2><A NAME="SEC145" HREF="gettext_toc.html#TOC145">9.10  Invoking the <CODE>msgexec</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX926"></A>
-<A NAME="IDX927"></A>
+<A NAME="IDX911"></A>
+<A NAME="IDX912"></A>
 
 <PRE>
 msgexec [<VAR>option</VAR>] <VAR>command</VAR> [<VAR>command-option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX928"></A>
+<A NAME="IDX913"></A>
 The <CODE>msgexec</CODE> program applies a command to all translations of a
 translation catalog.
 The <VAR>command</VAR> can be any program that reads a translation from standard
@@ -2743,39 +2645,26 @@
 
 </P>
 <P>
-<A NAME="IDX929"></A>
+<A NAME="IDX914"></A>
 A special builtin command called <SAMP>&lsquo;0&rsquo;</SAMP> outputs the translation, followed
 by a null byte.  The output of <SAMP>&lsquo;msgexec 0&rsquo;</SAMP> is suitable as input for
 <SAMP>&lsquo;xargs -0&rsquo;</SAMP>.
 
 </P>
 <P>
-<A NAME="IDX930"></A>
-<A NAME="IDX931"></A>
-<A NAME="IDX932"></A>
-<A NAME="IDX933"></A>
-<A NAME="IDX934"></A>
-<A NAME="IDX935"></A>
-<A NAME="IDX936"></A>
-<A NAME="IDX937"></A>
+<A NAME="IDX915"></A>
+<A NAME="IDX916"></A>
+<A NAME="IDX917"></A>
 During each <VAR>command</VAR> invocation, the environment variable
 <CODE>MSGEXEC_MSGID</CODE> is bound to the message's msgid, and the environment
 variable <CODE>MSGEXEC_LOCATION</CODE> is bound to the location in the PO file
 of the message.  If the message has a context, the environment variable
 <CODE>MSGEXEC_MSGCTXT</CODE> is bound to the message's msgctxt, otherwise it is
-unbound.  If the message has a plural form, environment variable
-<CODE>MSGEXEC_MSGID_PLURAL</CODE> is bound to the message's msgid_plural and
-<CODE>MSGEXEC_PLURAL_FORM</CODE> is bound to the order number of the plural
-actually processed (starting with 0), otherwise both are unbound.
-If the message has a previous msgid (added by <CODE>msgmerge</CODE>),
-environment variable <CODE>MSGEXEC_PREV_MSGCTXT</CODE> is bound to the
-message's previous msgctxt, <CODE>MSGEXEC_PREV_MSGID</CODE> is bound to
-the previous msgid, and <CODE>MSGEXEC_PREV_MSGID_PLURAL</CODE> is bound to
-the previous msgid_plural.
+unbound.
 
 </P>
 <P>
-<A NAME="IDX938"></A>
+<A NAME="IDX918"></A>
 Note: It is your responsibility to ensure that the <VAR>command</VAR> can cope
 with input encoded in the translation catalog's encoding.  If the
 <VAR>command</VAR> wants input in a particular encoding, you can in a first step
@@ -2797,16 +2686,16 @@
 <DD>
 <DT><SAMP>&lsquo;--input=<VAR>inputfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX939"></A>
-<A NAME="IDX940"></A>
+<A NAME="IDX919"></A>
+<A NAME="IDX920"></A>
 Input PO file.
 
 <DT><SAMP>&lsquo;-D <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX941"></A>
-<A NAME="IDX942"></A>
+<A NAME="IDX921"></A>
+<A NAME="IDX922"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -2827,14 +2716,14 @@
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX943"></A>
-<A NAME="IDX944"></A>
+<A NAME="IDX923"></A>
+<A NAME="IDX924"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX945"></A>
+<A NAME="IDX925"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2850,16 +2739,16 @@
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX946"></A>
-<A NAME="IDX947"></A>
+<A NAME="IDX926"></A>
+<A NAME="IDX927"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX948"></A>
-<A NAME="IDX949"></A>
+<A NAME="IDX928"></A>
+<A NAME="IDX929"></A>
 Output version information and exit.
 
 </DL>
@@ -2888,7 +2777,7 @@
 <H3><A NAME="SEC150" HREF="gettext_toc.html#TOC150">9.11.1  The <CODE>--color</CODE> option</A></H3>
 
 <P>
-<A NAME="IDX950"></A>
+<A NAME="IDX930"></A>
 The <SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP> option specifies under which conditions
 colorized output should be generated.  The <VAR>when</VAR> part can be one of
 the following:
@@ -2954,7 +2843,7 @@
 <H3><A NAME="SEC151" HREF="gettext_toc.html#TOC151">9.11.2  The environment variable <CODE>TERM</CODE></A></H3>
 
 <P>
-<A NAME="IDX951"></A>
+<A NAME="IDX931"></A>
 The environment variable <CODE>TERM</CODE> contains a identifier for the text
 window's capabilities.  You can get a detailed list of these cababilities
 by using the <SAMP>&lsquo;infocmp&rsquo;</SAMP> command, using <SAMP>&lsquo;man 5 terminfo&rsquo;</SAMP> as a
@@ -3001,14 +2890,14 @@
 <H3><A NAME="SEC152" HREF="gettext_toc.html#TOC152">9.11.3  The <CODE>--style</CODE> option</A></H3>
 
 <P>
-<A NAME="IDX952"></A>
+<A NAME="IDX932"></A>
 The <SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP> option specifies the style file to use
 when colorizing.  It has an effect only when the <CODE>--color</CODE> option is
 effective.
 
 </P>
 <P>
-<A NAME="IDX953"></A>
+<A NAME="IDX933"></A>
 If the <CODE>--style</CODE> option is not specified, the environment variable
 <CODE>PO_STYLE</CODE> is considered.  It is meant to point to the user's
 preferred style for PO files.
@@ -3404,7 +3293,7 @@
 <P>
 <DL>
 <DT><U>Data Type:</U> <B>po_file_t</B>
-<DD><A NAME="IDX954"></A>
+<DD><A NAME="IDX934"></A>
 This is a pointer type that refers to the contents of a PO file, after it has
 been read into memory.
 </DL>
@@ -3413,7 +3302,7 @@
 <P>
 <DL>
 <DT><U>Data Type:</U> <B>po_message_iterator_t</B>
-<DD><A NAME="IDX955"></A>
+<DD><A NAME="IDX935"></A>
 This is a pointer type that refers to an iterator that produces a sequence of
 messages.
 </DL>
@@ -3422,7 +3311,7 @@
 <P>
 <DL>
 <DT><U>Data Type:</U> <B>po_message_t</B>
-<DD><A NAME="IDX956"></A>
+<DD><A NAME="IDX936"></A>
 This is a pointer type that refers to a message of a PO file, including its
 translation.
 </DL>
@@ -3431,7 +3320,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> po_file_t <B>po_file_read</B> <I>(const char *<VAR>filename</VAR>)</I>
-<DD><A NAME="IDX957"></A>
+<DD><A NAME="IDX937"></A>
 The <CODE>po_file_read</CODE> function reads a PO file into memory.  The file name
 is given as argument.  The return value is a handle to the PO file's contents,
 valid until <CODE>po_file_free</CODE> is called on it.  In case of error, the return
@@ -3442,7 +3331,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> void <B>po_file_free</B> <I>(po_file_t <VAR>file</VAR>)</I>
-<DD><A NAME="IDX958"></A>
+<DD><A NAME="IDX938"></A>
 The <CODE>po_file_free</CODE> function frees a PO file's contents from memory,
 including all messages that are only implicitly accessible through iterators.
 </DL>
@@ -3451,7 +3340,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> const char * const * <B>po_file_domains</B> <I>(po_file_t <VAR>file</VAR>)</I>
-<DD><A NAME="IDX959"></A>
+<DD><A NAME="IDX939"></A>
 The <CODE>po_file_domains</CODE> function returns the domains for which the given
 PO file has messages.  The return value is a <CODE>NULL</CODE> terminated array
 which is valid as long as the <VAR>file</VAR> handle is valid.  For PO files which
@@ -3463,7 +3352,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> po_message_iterator_t <B>po_message_iterator</B> <I>(po_file_t <VAR>file</VAR>, const char *<VAR>domain</VAR>)</I>
-<DD><A NAME="IDX960"></A>
+<DD><A NAME="IDX940"></A>
 The <CODE>po_message_iterator</CODE> returns an iterator that will produce the
 messages of <VAR>file</VAR> that belong to the given <VAR>domain</VAR>.  If <VAR>domain</VAR>
 is <CODE>NULL</CODE>, the default domain is used instead.  To list the messages,
@@ -3474,7 +3363,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> void <B>po_message_iterator_free</B> <I>(po_message_iterator_t <VAR>iterator</VAR>)</I>
-<DD><A NAME="IDX961"></A>
+<DD><A NAME="IDX941"></A>
 The <CODE>po_message_iterator_free</CODE> function frees an iterator previously
 allocated through the <CODE>po_message_iterator</CODE> function.
 </DL>
@@ -3483,7 +3372,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> po_message_t <B>po_next_message</B> <I>(po_message_iterator_t <VAR>iterator</VAR>)</I>
-<DD><A NAME="IDX962"></A>
+<DD><A NAME="IDX942"></A>
 The <CODE>po_next_message</CODE> function returns the next message from
 <VAR>iterator</VAR> and advances the iterator.  It returns <CODE>NULL</CODE> when the
 iterator has reached the end of its message list.
@@ -3498,7 +3387,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgid</B> <I>(po_message_t <VAR>message</VAR>)</I>
-<DD><A NAME="IDX963"></A>
+<DD><A NAME="IDX943"></A>
 The <CODE>po_message_msgid</CODE> function returns the <CODE>msgid</CODE> (untranslated
 English string) of a message.  This is guaranteed to be non-<CODE>NULL</CODE>.
 </DL>
@@ -3507,7 +3396,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgid_plural</B> <I>(po_message_t <VAR>message</VAR>)</I>
-<DD><A NAME="IDX964"></A>
+<DD><A NAME="IDX944"></A>
 The <CODE>po_message_msgid_plural</CODE> function returns the <CODE>msgid_plural</CODE>
 (untranslated English plural string) of a message with plurals, or <CODE>NULL</CODE>
 for a message without plural.
@@ -3517,7 +3406,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgstr</B> <I>(po_message_t <VAR>message</VAR>)</I>
-<DD><A NAME="IDX965"></A>
+<DD><A NAME="IDX945"></A>
 The <CODE>po_message_msgstr</CODE> function returns the <CODE>msgstr</CODE> (translation)
 of a message.  For an untranslated message, the return value is an empty
 string.
@@ -3527,7 +3416,7 @@
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgstr_plural</B> <I>(po_message_t <VAR>message</VAR>, int <VAR>index</VAR>)</I>
-<DD><A NAME="IDX966"></A>
+<DD><A NAME="IDX946"></A>
 The <CODE>po_message_msgstr_plural</CODE> function returns the
 <CODE>msgstr[<VAR>index</VAR>]</CODE> of a message with plurals, or <CODE>NULL</CODE> when
 the <VAR>index</VAR> is out of range or for a message without plural.
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_foot.html gettext-0.18.1.1/gettext-tools/doc/gettext_foot.html
--- gettext-0.19.3/gettext-tools/doc/gettext_foot.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_foot.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,15 +1,15 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <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.3</H1>
+<H1>GNU gettext tools, version 0.18.1</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.19.3, 17 June 2014</H2>
+<H2>Edition 0.18.1, 6 June 2010</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -36,11 +36,8 @@
 <H3><A NAME="FOOT5" HREF="gettext_11.html#DOCF5">(5)</A></H3>
 <P>Additions are welcome.  Send appropriate information to
 <A HREF="mailto:bug-gnu-gettext@gnu.org">bug-gnu-gettext@gnu.org</A> and <A HREF="mailto:bug-glibc-manual@gnu.org">bug-glibc-manual@gnu.org</A>.
-<H3><A NAME="FOOT6" HREF="gettext_13.html#DOCF6">(6)</A></H3>
-<P>you can also use it through the
-<SAMP>&lsquo;MSGMERGE_OPTIONS&rsquo;</SAMP> option from <TT>&lsquo;Makevars&rsquo;</TT>
 <P><HR><P>
-This document was generated on 16 October 2014 using the
+This document was generated on 6 June 2010 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52b.</P>
 </BODY>
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext.info gettext-0.18.1.1/gettext-tools/doc/gettext.info
--- gettext-0.19.3/gettext-tools/doc/gettext.info	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext.info	2010-06-06 18:36:28.000000000 +0000
@@ -1,24 +1,6 @@
-This is gettext.info, produced by makeinfo version 5.1 from
+This is gettext.info, produced by makeinfo version 4.13 from
 gettext.texi.
 
-   Copyright (C) 1995-1998, 2001-2012 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
-manual under either of these two licenses, at your choice.
-
-   This manual is covered by the GNU FDL. Permission is granted to copy,
-distribute and/or modify this document under the terms of the GNU Free
-Documentation License (FDL), either version 1.2 of the License, or (at
-your option) any later version published by the Free Software Foundation
-(FSF); with no Invariant Sections, with no Front-Cover Text, and with no
-Back-Cover Texts.  A copy of the license is included in *note GNU FDL::.
-
-   This manual is covered by the GNU GPL. You can redistribute it and/or
-modify it under the terms of the GNU General Public License (GPL),
-either version 2 of the License, or (at your option) any later version
-published by the Free Software Foundation (FSF). A copy of the license
-is included in *note GNU GPL::.
 INFO-DIR-SECTION GNU Gettext Utilities
 START-INFO-DIR-ENTRY
 * gettext: (gettext).                          GNU gettext utilities.
@@ -45,22 +27,42 @@
 * ISO3166: (gettext)Country Codes.             ISO 3166 country codes.
 END-INFO-DIR-ENTRY
 
-   This file provides documentation for GNU ‘gettext’ utilities.  It
+   This file provides documentation for GNU `gettext' utilities.  It
 also serves as a reference for the free Translation Project.
 
+   Copyright (C) 1995-1998, 2001-2007 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
+manual under either of these two licenses, at your choice.
+
+   This manual is covered by the GNU FDL.  Permission is granted to
+copy, distribute and/or modify this document under the terms of the GNU
+Free Documentation License (FDL), either version 1.2 of the License, or
+(at your option) any later version published by the Free Software
+Foundation (FSF); with no Invariant Sections, with no Front-Cover Text,
+and with no Back-Cover Texts.  A copy of the license is included in
+*note GNU FDL::.
+
+   This manual is covered by the GNU GPL.  You can redistribute it
+and/or modify it under the terms of the GNU General Public License
+(GPL), either version 2 of the License, or (at your option) any later
+version published by the Free Software Foundation (FSF).  A copy of the
+license is included in *note GNU GPL::.
+
 
 File: gettext.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 
-GNU ‘gettext’ utilities
+GNU `gettext' utilities
 ***********************
 
    This manual documents the GNU gettext tools and the GNU libintl
-library, version 0.19.3.
+library, version 0.18.1.
 
 * Menu:
 
 * Introduction::                Introduction
-* Users::                       The User’s View
+* Users::                       The User's View
 * PO Files::                    The Format of PO Files
 * Sources::                     Preparing Program Sources
 * Template::                    Making the PO Template File
@@ -69,10 +71,10 @@
 * Editing::                     Editing PO Files
 * Manipulating::                Manipulating PO Files
 * Binaries::                    Producing Binary MO Files
-* Programmers::                 The Programmer’s View
-* Translators::                 The Translator’s View
-* Maintainers::                 The Maintainer’s View
-* Installers::                  The Installer’s and Distributor’s View
+* Programmers::                 The Programmer's View
+* Translators::                 The Translator's View
+* Maintainers::                 The Maintainer's View
+* Installers::                  The Installer's and Distributor's View
 * Programming Languages::       Other Programming Languages
 * Conclusion::                  Concluding Remarks
 
@@ -87,33 +89,33 @@
 * Autoconf Macro Index::        Index of Autoconf Macros
 * Index::                       General Index
 
- — The Detailed Node Listing —
+ --- The Detailed Node Listing ---
 
 Introduction
 
-* Why::                         The Purpose of GNU ‘gettext’
+* Why::                         The Purpose of GNU `gettext'
 * Concepts::                    I18n, L10n, and Such
 * Aspects::                     Aspects in Native Language Support
 * Files::                       Files Conveying Translations
-* Overview::                    Overview of GNU ‘gettext’
+* Overview::                    Overview of GNU `gettext'
 
-The User’s View
+The User's View
 
 * System Installation::         Questions During Operating System Installation
 * Setting the GUI Locale::      How to Specify the Locale Used by GUI Programs
 * Setting the POSIX Locale::    How to Specify the Locale According to POSIX
 * Installing Localizations::    How to Install Additional Translations
 
-Setting the Locale through Environment Variables
+Setting the POSIX Locale
 
 * Locale Names::                How a Locale Specification Looks Like
-* Locale Environment Variables::  Which Environment Variable Specfies What
+* Locale Environment Variables:: Which Environment Variable Specfies What
 * The LANGUAGE variable::       How to Specify a Priority List of Languages
 
 Preparing Program Sources
 
-* Importing::                   Importing the ‘gettext’ declaration
-* Triggering::                  Triggering ‘gettext’ Operations
+* Importing::                   Importing the `gettext' declaration
+* Triggering::                  Triggering `gettext' Operations
 * Preparing Strings::           Preparing Translatable Strings
 * Mark Keywords::               How Marks Appear in Sources
 * Marking::                     Marking Translatable Strings
@@ -125,27 +127,27 @@
 
 Making the PO Template File
 
-* xgettext Invocation::         Invoking the ‘xgettext’ Program
+* xgettext Invocation::         Invoking the `xgettext' Program
 
 Creating a New PO File
 
-* msginit Invocation::          Invoking the ‘msginit’ Program
+* msginit Invocation::          Invoking the `msginit' Program
 * Header Entry::                Filling in the Header Entry
 
 Updating Existing PO Files
 
-* msgmerge Invocation::         Invoking the ‘msgmerge’ Program
+* msgmerge Invocation::         Invoking the `msgmerge' Program
 
 Editing PO Files
 
-* KBabel::                      KDE’s PO File Editor
-* Gtranslator::                 GNOME’s PO File Editor
-* PO Mode::                     Emacs’s PO File Editor
+* KBabel::                      KDE's PO File Editor
+* Gtranslator::                 GNOME's PO File Editor
+* PO Mode::                     Emacs's PO File Editor
 * Compendium::                  Using Translation Compendia
 
-Emacs’s PO File Editor
+Emacs's PO File Editor
 
-* Installation::                Completing GNU ‘gettext’ Installation
+* Installation::                Completing GNU `gettext' Installation
 * Main PO Commands::            Main Commands
 * Entry Positioning::           Entry Positioning
 * Normalizing::                 Normalizing Strings in Entries
@@ -166,48 +168,48 @@
 
 Manipulating PO Files
 
-* msgcat Invocation::           Invoking the ‘msgcat’ Program
-* msgconv Invocation::          Invoking the ‘msgconv’ Program
-* msggrep Invocation::          Invoking the ‘msggrep’ Program
-* msgfilter Invocation::        Invoking the ‘msgfilter’ Program
-* msguniq Invocation::          Invoking the ‘msguniq’ Program
-* msgcomm Invocation::          Invoking the ‘msgcomm’ Program
-* msgcmp Invocation::           Invoking the ‘msgcmp’ Program
-* msgattrib Invocation::        Invoking the ‘msgattrib’ Program
-* msgen Invocation::            Invoking the ‘msgen’ Program
-* msgexec Invocation::          Invoking the ‘msgexec’ Program
+* msgcat Invocation::           Invoking the `msgcat' Program
+* msgconv Invocation::          Invoking the `msgconv' Program
+* msggrep Invocation::          Invoking the `msggrep' Program
+* msgfilter Invocation::        Invoking the `msgfilter' Program
+* msguniq Invocation::          Invoking the `msguniq' Program
+* msgcomm Invocation::          Invoking the `msgcomm' Program
+* msgcmp Invocation::           Invoking the `msgcmp' Program
+* msgattrib Invocation::        Invoking the `msgattrib' Program
+* msgen Invocation::            Invoking the `msgen' Program
+* msgexec Invocation::          Invoking the `msgexec' Program
 * Colorizing::                  Highlighting parts of PO files
 * libgettextpo::                Writing your own programs that process PO files
 
 Highlighting parts of PO files
 
 * The --color option::          Triggering colorized output
-* The TERM variable::           The environment variable ‘TERM’
-* The --style option::          The ‘--style’ option
+* The TERM variable::           The environment variable `TERM'
+* The --style option::          The `--style' option
 * Style rules::                 Style rules for PO files
-* Customizing less::            Customizing ‘less’ for viewing PO files
+* Customizing less::            Customizing `less' for viewing PO files
 
 Producing Binary MO Files
 
-* msgfmt Invocation::           Invoking the ‘msgfmt’ Program
-* msgunfmt Invocation::         Invoking the ‘msgunfmt’ Program
+* msgfmt Invocation::           Invoking the `msgfmt' Program
+* msgunfmt Invocation::         Invoking the `msgunfmt' Program
 * MO Files::                    The Format of GNU MO Files
 
-The Programmer’s View
+The Programmer's View
 
-* catgets::                     About ‘catgets’
-* gettext::                     About ‘gettext’
+* catgets::                     About `catgets'
+* gettext::                     About `gettext'
 * Comparison::                  Comparing the two interfaces
 * Using libintl.a::             Using libintl.a in own programs
-* gettext grok::                Being a ‘gettext’ grok
+* gettext grok::                Being a `gettext' grok
 * Temp Programmers::            Temporary Notes for the Programmers Chapter
 
-About ‘catgets’
+About `catgets'
 
 * Interface to catgets::        The interface
-* Problems with catgets::       Problems with the ‘catgets’ interface?!
+* Problems with catgets::       Problems with the `catgets' interface?!
 
-About ‘gettext’
+About `gettext'
 
 * Interface to gettext::        The interface
 * Ambiguities::                 Solving ambiguities
@@ -220,18 +222,18 @@
 Temporary Notes for the Programmers Chapter
 
 * Temp Implementations::        Temporary - Two Possible Implementations
-* Temp catgets::                Temporary - About ‘catgets’
+* Temp catgets::                Temporary - About `catgets'
 * Temp WSI::                    Temporary - Why a single implementation
 * Temp Notes::                  Temporary - Notes
 
-The Translator’s View
+The Translator's View
 
 * Trans Intro 0::               Introduction 0
 * Trans Intro 1::               Introduction 1
 * Discussions::                 Discussions
 * Organization::                Organization
 * Information Flow::            Information Flow
-* Translating plural forms::    How to fill in ‘msgstr[0]’, ‘msgstr[1]’
+* Translating plural forms::    How to fill in `msgstr[0]', `msgstr[1]'
 * Prioritizing messages::       How to find which messages to translate first
 
 Organization
@@ -245,59 +247,57 @@
 * Sub-Cultures::                Sub-Cultures
 * Organizational Ideas::        Organizational Ideas
 
-The Maintainer’s View
+The Maintainer's View
 
 * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
 * Prerequisites::               Prerequisite Works
-* gettextize Invocation::       Invoking the ‘gettextize’ Program
+* gettextize Invocation::       Invoking the `gettextize' Program
 * Adjusting Files::             Files You Must Create or Alter
-* autoconf macros::             Autoconf macros for use in ‘configure.ac’
-* Version Control Issues::      
+* autoconf macros::             Autoconf macros for use in `configure.ac'
+* CVS Issues::                  Integrating with CVS
 * Release Management::          Creating a Distribution Tarball
 
 Files You Must Create or Alter
 
-* po/POTFILES.in::              ‘POTFILES.in’ in ‘po/’
-* po/LINGUAS::                  ‘LINGUAS’ in ‘po/’
-* po/Makevars::                 ‘Makevars’ in ‘po/’
-* po/Rules-*::                  Extending ‘Makefile’ in ‘po/’
-* configure.ac::                ‘configure.ac’ at top level
-* config.guess::                ‘config.guess’, ‘config.sub’ at top level
-* mkinstalldirs::               ‘mkinstalldirs’ at top level
-* aclocal::                     ‘aclocal.m4’ at top level
-* acconfig::                    ‘acconfig.h’ at top level
-* config.h.in::                 ‘config.h.in’ at top level
-* Makefile::                    ‘Makefile.in’ at top level
-* src/Makefile::                ‘Makefile.in’ in ‘src/’
-* lib/gettext.h::               ‘gettext.h’ in ‘lib/’
-
-Autoconf macros for use in ‘configure.ac’
-
-* AM_GNU_GETTEXT::              AM_GNU_GETTEXT in ‘gettext.m4’
-* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in ‘gettext.m4’
-* AM_GNU_GETTEXT_NEED::         AM_GNU_GETTEXT_NEED in ‘gettext.m4’
-* AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in ‘intldir.m4’
-* AM_PO_SUBDIRS::               AM_PO_SUBDIRS in ‘po.m4’
-* AM_XGETTEXT_OPTION::          AM_XGETTEXT_OPTION in ‘po.m4’
-* AM_ICONV::                    AM_ICONV in ‘iconv.m4’
-
-Integrating with Version Control Systems
-
-* Distributed Development::     Avoiding version mismatch in distributed development
-* Files under Version Control::  Files to put under version control
-* Translations under Version Control::  Put PO Files under Version Control
-* autopoint Invocation::        Invoking the ‘autopoint’ Program
+* po/POTFILES.in::              `POTFILES.in' in `po/'
+* po/LINGUAS::                  `LINGUAS' in `po/'
+* po/Makevars::                 `Makevars' in `po/'
+* po/Rules-*::                  Extending `Makefile' in `po/'
+* configure.ac::                `configure.ac' at top level
+* config.guess::                `config.guess', `config.sub' at top level
+* mkinstalldirs::               `mkinstalldirs' at top level
+* aclocal::                     `aclocal.m4' at top level
+* acconfig::                    `acconfig.h' at top level
+* config.h.in::                 `config.h.in' at top level
+* Makefile::                    `Makefile.in' at top level
+* src/Makefile::                `Makefile.in' in `src/'
+* lib/gettext.h::               `gettext.h' in `lib/'
+
+Autoconf macros for use in `configure.ac'
+
+* AM_GNU_GETTEXT::              AM_GNU_GETTEXT in `gettext.m4'
+* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in `gettext.m4'
+* AM_GNU_GETTEXT_NEED::         AM_GNU_GETTEXT_NEED in `gettext.m4'
+* AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4'
+* AM_PO_SUBDIRS::               AM_PO_SUBDIRS in `po.m4'
+* AM_ICONV::                    AM_ICONV in `iconv.m4'
+
+Integrating with CVS
+
+* Distributed CVS::             Avoiding version mismatch in distributed development
+* Files under CVS::             Files to put under CVS version control
+* autopoint Invocation::        Invoking the `autopoint' Program
 
 Other Programming Languages
 
-* Language Implementors::       The Language Implementor’s View
-* Programmers for other Languages::  The Programmer’s View
-* Translators for other Languages::  The Translator’s View
-* Maintainers for other Languages::  The Maintainer’s View
+* Language Implementors::       The Language Implementor's View
+* Programmers for other Languages::  The Programmer's View
+* Translators for other Languages::  The Translator's View
+* Maintainers for other Languages::  The Maintainer's View
 * List of Programming Languages::  Individual Programming Languages
 * List of Data Formats::        Internationalizable Data
 
-The Translator’s View
+The Translator's View
 
 * c-format::                    C Format Strings
 * objc-format::                 Objective C Format Strings
@@ -322,8 +322,6 @@
 * qt-plural-format::            Qt Plural Format Strings
 * kde-format::                  KDE Format Strings
 * boost-format::                Boost Format Strings
-* lua-format::                  Lua Format Strings
-* javascript-format::           JavaScript Format Strings
 
 Individual Programming Languages
 
@@ -343,23 +341,21 @@
 * Pascal::                      Pascal - Free Pascal Compiler
 * wxWidgets::                   wxWidgets library
 * YCP::                         YCP - YaST2 scripting language
-* Tcl::                         Tcl - Tk’s scripting language
+* Tcl::                         Tcl - Tk's scripting language
 * Perl::                        Perl
 * PHP::                         PHP Hypertext Preprocessor
 * Pike::                        Pike
 * GCC-source::                  GNU Compiler Collection sources
-* Lua::                         Lua
-* JavaScript::                  JavaScript
 
 sh - Shell Script
 
 * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
-* gettext.sh::                  Contents of ‘gettext.sh’
-* gettext Invocation::          Invoking the ‘gettext’ program
-* ngettext Invocation::         Invoking the ‘ngettext’ program
-* envsubst Invocation::         Invoking the ‘envsubst’ program
-* eval_gettext Invocation::     Invoking the ‘eval_gettext’ function
-* eval_ngettext Invocation::    Invoking the ‘eval_ngettext’ function
+* gettext.sh::                  Contents of `gettext.sh'
+* gettext Invocation::          Invoking the `gettext' program
+* ngettext Invocation::         Invoking the `ngettext' program
+* envsubst Invocation::         Invoking the `envsubst' program
+* eval_gettext Invocation::     Invoking the `eval_gettext' function
+* eval_ngettext Invocation::    Invoking the `eval_ngettext' function
 
 Perl
 
@@ -378,11 +374,10 @@
 * POT::                         POT - Portable Object Template
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
-* GSettings::                   GSettings - GNOME user configuration schema
 
 Concluding Remarks
 
-* History::                     History of GNU ‘gettext’
+* History::                     History of GNU `gettext'
 * References::                  Related Readings
 
 Language Codes
@@ -396,7 +391,6 @@
 * GNU LGPL::                    GNU Lesser General Public License
 * GNU FDL::                     GNU Free Documentation License
 
-
 
 File: gettext.info,  Node: Introduction,  Next: Users,  Prev: Top,  Up: Top
 
@@ -404,7 +398,7 @@
 **************
 
    This chapter explains the goals sought in the creation of GNU
-‘gettext’ and the free Translation Project.  Then, it explains a few
+`gettext' and the free Translation Project.  Then, it explains a few
 broad concepts around Native Language Support, and positions message
 translation with regard to other aspects of national and cultural
 variance, as they apply to programs.  It also surveys those files used
@@ -414,10 +408,10 @@
 
    In this manual, we use _he_ when speaking of the programmer or
 maintainer, _she_ when speaking of the translator, and _they_ when
-speaking of the installers or end users of the translated program.  This
-is only a convenience for clarifying the documentation.  It is
+speaking of the installers or end users of the translated program.
+This is only a convenience for clarifying the documentation.  It is
 _absolutely_ not meant to imply that some roles are more appropriate to
-males or females.  Besides, as you might guess, GNU ‘gettext’ is meant
+males or females.  Besides, as you might guess, GNU `gettext' is meant
 to be useful for people using computers, whatever their sex, race,
 religion or nationality!
 
@@ -426,33 +420,33 @@
      Internet address:
          bug-gnu-gettext@gnu.org
 
-Please include the manual’s edition number and update date in your
+Please include the manual's edition number and update date in your
 messages.
 
 * Menu:
 
-* Why::                         The Purpose of GNU ‘gettext’
+* Why::                         The Purpose of GNU `gettext'
 * Concepts::                    I18n, L10n, and Such
 * Aspects::                     Aspects in Native Language Support
 * Files::                       Files Conveying Translations
-* Overview::                    Overview of GNU ‘gettext’
+* Overview::                    Overview of GNU `gettext'
 
 
 File: gettext.info,  Node: Why,  Next: Concepts,  Prev: Introduction,  Up: Introduction
 
-1.1 The Purpose of GNU ‘gettext’
+1.1 The Purpose of GNU `gettext'
 ================================
 
    Usually, programs are written and documented in English, and use
-English at execution time to interact with users.  This is true not only
-of GNU software, but also of a great deal of proprietary and free
+English at execution time to interact with users.  This is true not
+only of GNU software, but also of a great deal of proprietary and free
 software.  Using a common language is quite handy for communication
 between developers, maintainers and users from all countries.  On the
 other hand, most people are less comfortable with English than with
 their own native language, and would prefer to use their mother tongue
-for day to day’s work, as far as possible.  Many would simply _love_ to
-see their computer screen showing a lot less of English, and far more of
-their own language.
+for day to day's work, as far as possible.  Many would simply _love_ to
+see their computer screen showing a lot less of English, and far more
+of their own language.
 
    However, to many people, this dream might appear so far fetched that
 they may believe it is not even worth spending time thinking about it.
@@ -462,45 +456,46 @@
 structure, which has a good chance to get all of us nearer the
 achievement of a truly multi-lingual set of programs.
 
-   GNU ‘gettext’ is an important step for the Translation Project, as it
-is an asset on which we may build many other steps.  This package offers
-to programmers, translators and even users, a well integrated set of
-tools and documentation.  Specifically, the GNU ‘gettext’ utilities are
-a set of tools that provides a framework within which other free
-packages may produce multi-lingual messages.  These tools include
+   GNU `gettext' is an important step for the Translation Project, as
+it is an asset on which we may build many other steps.  This package
+offers to programmers, translators and even users, a well integrated
+set of tools and documentation.  Specifically, the GNU `gettext'
+utilities are a set of tools that provides a framework within which
+other free packages may produce multi-lingual messages.  These tools
+include
 
-   • A set of conventions about how programs should be written to
+   * A set of conventions about how programs should be written to
      support message catalogs.
 
-   • A directory and file naming organization for the message catalogs
+   * A directory and file naming organization for the message catalogs
      themselves.
 
-   • A runtime library supporting the retrieval of translated messages.
+   * A runtime library supporting the retrieval of translated messages.
 
-   • A few stand-alone programs to massage in various ways the sets of
+   * A few stand-alone programs to massage in various ways the sets of
      translatable strings, or already translated strings.
 
-   • A library supporting the parsing and creation of files containing
+   * A library supporting the parsing and creation of files containing
      translated messages.
 
-   • A special mode for Emacs(1) which helps preparing these sets and
+   * A special mode for Emacs(1) which helps preparing these sets and
      bringing them up to date.
 
-   GNU ‘gettext’ is designed to minimize the impact of
+   GNU `gettext' is designed to minimize the impact of
 internationalization on program sources, keeping this impact as small
 and hardly noticeable as possible.  Internationalization has better
 chances of succeeding if it is very light weighted, or at least, appear
 to be so, when looking at program sources.
 
-   The Translation Project also uses the GNU ‘gettext’ distribution as a
-vehicle for documenting its structure and methods.  This goes beyond the
-strict technicalities of documenting the GNU ‘gettext’ proper.  By so
-doing, translators will find in a single place, as far as possible, all
-they need to know for properly doing their translating work.  Also, this
-supplemental documentation might also help programmers, and even curious
-users, in understanding how GNU ‘gettext’ is related to the remainder of
-the Translation Project, and consequently, have a glimpse at the _big
-picture_.
+   The Translation Project also uses the GNU `gettext' distribution as
+a vehicle for documenting its structure and methods.  This goes beyond
+the strict technicalities of documenting the GNU `gettext' proper.  By
+so doing, translators will find in a single place, as far as possible,
+all they need to know for properly doing their translating work.  Also,
+this supplemental documentation might also help programmers, and even
+curious users, in understanding how GNU `gettext' is related to the
+remainder of the Translation Project, and consequently, have a glimpse
+at the _big picture_.
 
    ---------- Footnotes ----------
 
@@ -522,7 +517,7 @@
 "i18n" and "l10n" instead, quoting the first and last letter of each
 word, and replacing the run of intermediate letters by a number merely
 telling how many such letters there are.  But in this manual, in the
-sake of clarity, we will patiently write the names in full, each time…
+sake of clarity, we will patiently write the names in full, each time...
 
    By "internationalization", one refers to the operation by which a
 program, or a set of programs turned into a package, is made aware of
@@ -531,7 +526,7 @@
 strings or other English specific habits, and connected to generic ways
 of doing the same, instead.  Program developers may use various
 techniques to internationalize their programs.  Some of these have been
-standardized.  GNU ‘gettext’ offers one of these standards.  *Note
+standardized.  GNU `gettext' offers one of these standards.  *Note
 Programmers::.
 
    By "localization", one means the operation by which, in a set of
@@ -539,10 +534,10 @@
 information so that it can adapt itself to handle its input and output
 in a fashion which is correct for some native language and cultural
 habits.  This is a particularisation process, by which generic methods
-already implemented in an internationalized program are used in specific
-ways.  The programming environment puts several functions to the
-programmers disposal which allow this runtime configuration.  The formal
-description of specific set of cultural habits for some country,
+already implemented in an internationalized program are used in
+specific ways.  The programming environment puts several functions to
+the programmers disposal which allow this runtime configuration.  The
+formal description of specific set of cultural habits for some country,
 together with all associated translations targeted to the same native
 language, is called the "locale" for this language or country.  Users
 achieve localization of programs by setting proper values to special
@@ -556,15 +551,15 @@
 stored in a particular locale.  When someone presently refers to a
 particular locale, they are obviously referring to the data stored
 within that particular locale.  Similarly, if a programmer is referring
-to “accessing the locale routines”, they are referring to the complete
-suite of routines that access all of the locale’s information.
+to "accessing the locale routines", they are referring to the complete
+suite of routines that access all of the locale's information.
 
-   One uses the expression "Native Language Support", or merely NLS, for
-speaking of the overall activity or feature encompassing both
+   One uses the expression "Native Language Support", or merely NLS,
+for speaking of the overall activity or feature encompassing both
 internationalization and localization, allowing for multi-lingual
 interactions in a program.  In a nutshell, one could say that
-internationalization is the operation by which further localizations are
-made possible.
+internationalization is the operation by which further localizations
+are made possible.
 
    Also, very roughly said, when it comes to multi-lingual messages,
 internationalization is usually taken care of by programmers, and
@@ -579,94 +574,91 @@
    For a totally multi-lingual distribution, there are many things to
 translate beyond output messages.
 
-   • As of today, GNU ‘gettext’ offers a complete toolset for
+   * As of today, GNU `gettext' offers a complete toolset for
      translating messages output by C programs.  Perl scripts and shell
      scripts will also need to be translated.  Even if there are today
      some hooks by which this can be done, these hooks are not
      integrated as well as they should be.
 
-   • Some programs, like ‘autoconf’ or ‘bison’, are able to produce
+   * Some programs, like `autoconf' or `bison', are able to produce
      other programs (or scripts).  Even if the generating programs
      themselves are internationalized, the generated programs they
      produce may need internationalization on their own, and this
      indirect internationalization could be automated right from the
      generating program.  In fact, quite usually, generating and
-     generated programs could be internationalized independently, as the
-     effort needed is fairly orthogonal.
+     generated programs could be internationalized independently, as
+     the effort needed is fairly orthogonal.
 
-   • A few programs include textual tables which might need translation
+   * A few programs include textual tables which might need translation
      themselves, independently of the strings contained in the program
      itself.  For example, RFC 1345 gives an English description for
-     each character which the ‘recode’ program is able to reconstruct at
-     execution.  Since these descriptions are extracted from the RFC by
-     mechanical means, translating them properly would require a prior
-     translation of the RFC itself.
+     each character which the `recode' program is able to reconstruct
+     at execution.  Since these descriptions are extracted from the RFC
+     by mechanical means, translating them properly would require a
+     prior translation of the RFC itself.
 
-   • Almost all programs accept options, which are often worded out so
+   * Almost all programs accept options, which are often worded out so
      to be descriptive for the English readers; one might want to
      consider offering translated versions for program options as well.
 
-   • Many programs read, interpret, compile, or are somewhat driven by
+   * Many programs read, interpret, compile, or are somewhat driven by
      input files which are texts containing keywords, identifiers, or
      replies which are inherently translatable.  For example, one may
-     want ‘gcc’ to allow diacriticized characters in identifiers or use
-     translated keywords; ‘rm -i’ might accept something else than ‘y’
-     or ‘n’ for replies, etc.  Even if the program will eventually make
+     want `gcc' to allow diacriticized characters in identifiers or use
+     translated keywords; `rm -i' might accept something else than `y'
+     or `n' for replies, etc.  Even if the program will eventually make
      most of its output in the foreign languages, one has to decide
      whether the input syntax, option values, etc., are to be localized
      or not.
 
-   • The manual accompanying a package, as well as all documentation
+   * The manual accompanying a package, as well as all documentation
      files in the distribution, could surely be translated, too.
      Translating a manual, with the intent of later keeping up with
      updates, is a major undertaking in itself, generally.
 
+
    As we already stressed, translation is only one aspect of locales.
 Other internationalization aspects are system services and are handled
-in GNU ‘libc’.  There are many attributes that are needed to define a
-country’s cultural conventions.  These attributes include beside the
-country’s native language, the formatting of the date and time, the
+in GNU `libc'.  There are many attributes that are needed to define a
+country's cultural conventions.  These attributes include beside the
+country's native language, the formatting of the date and time, the
 representation of numbers, the symbols for currency, etc.  These local
-"rules" are termed the country’s locale.  The locale represents the
-knowledge needed to support the country’s native attributes.
+"rules" are termed the country's locale.  The locale represents the
+knowledge needed to support the country's native attributes.
 
    There are a few major areas which may vary between countries and
 hence, define what a locale must describe.  The following list helps
 putting multi-lingual messages into the proper context of other tasks
-related to locales.  See the GNU ‘libc’ manual for details.
+related to locales.  See the GNU `libc' manual for details.
 
 _Characters and Codesets_
-
      The codeset most commonly used through out the USA and most English
      speaking parts of the world is the ASCII codeset.  However, there
      are many characters needed by various locales that are not found
-     within this codeset.  The 8-bit ISO 8859-1 code set has most of the
-     special characters needed to handle the major European languages.
-     However, in many cases, choosing ISO 8859-1 is nevertheless not
-     adequate: it doesn’t even handle the major European currency.
-     Hence each locale will need to specify which codeset they need to
-     use and will need to have the appropriate character handling
-     routines to cope with the codeset.
+     within this codeset.  The 8-bit ISO 8859-1 code set has most of
+     the special characters needed to handle the major European
+     languages.  However, in many cases, choosing ISO 8859-1 is
+     nevertheless not adequate: it doesn't even handle the major
+     European currency.  Hence each locale will need to specify which
+     codeset they need to use and will need to have the appropriate
+     character handling routines to cope with the codeset.
 
 _Currency_
-
      The symbols used vary from country to country as does the position
      used by the symbol.  Software needs to be able to transparently
      display currency figures in the native mode for each locale.
 
 _Dates_
-
      The format of date varies between locales.  For example, Christmas
      day in 1994 is written as 12/25/94 in the USA and as 25/12/94 in
      Australia.  Other countries might use ISO 8601 dates, etc.
 
      Time of the day may be noted as HH:MM, HH.MM, or otherwise.  Some
-     locales require time to be specified in 24-hour mode rather than as
-     AM or PM. Further, the nature and yearly extent of the Daylight
-     Saving correction vary widely between countries.
+     locales require time to be specified in 24-hour mode rather than
+     as AM or PM.  Further, the nature and yearly extent of the
+     Daylight Saving correction vary widely between countries.
 
 _Numbers_
-
      Numbers can be represented differently in different locales.  For
      example, the following numbers are all written correctly for their
      respective locales:
@@ -681,28 +673,28 @@
      about how numbers are spelled in full.
 
 _Messages_
-
      The most obvious area is the language support within a locale.
-     This is where GNU ‘gettext’ provides the means for developers and
+     This is where GNU `gettext' provides the means for developers and
      users to easily change the language that the software uses to
      communicate to the user.
 
+
    These areas of cultural conventions are called _locale categories_.
 It is an unfortunate term; _locale aspects_ or _locale feature
-categories_ would be a better term, because each “locale category”
+categories_ would be a better term, because each "locale category"
 describes an area or task that requires localization.  The concrete data
 that describes the cultural conventions for such an area and for a
-particular culture is also called a _locale category_.  In this sense, a
-locale is composed of several locale categories: the locale category
-describing the codeset, the locale category describing the formatting of
-numbers, the locale category containing the translated messages, and so
-on.
+particular culture is also called a _locale category_.  In this sense,
+a locale is composed of several locale categories: the locale category
+describing the codeset, the locale category describing the formatting
+of numbers, the locale category containing the translated messages, and
+so on.
 
    Components of locale outside of message handling are standardized in
 the ISO C standard and the POSIX:2001 standard (also known as the SUSV3
-specification).  GNU ‘libc’ fully implements this, and most other modern
-systems provide a more or less reasonable support for at least some of
-the missing components.
+specification).  GNU `libc' fully implements this, and most other
+modern systems provide a more or less reasonable support for at least
+some of the missing components.
 
 
 File: gettext.info,  Node: Files,  Next: Overview,  Prev: Aspects,  Up: Introduction
@@ -710,10 +702,11 @@
 1.4 Files Conveying Translations
 ================================
 
-   The letters PO in ‘.po’ files means Portable Object, to distinguish
-it from ‘.mo’ files, where MO stands for Machine Object.  This paradigm,
-as well as the PO file format, is inspired by the NLS standard developed
-by Uniforum, and first implemented by Sun in their Solaris system.
+   The letters PO in `.po' files means Portable Object, to distinguish
+it from `.mo' files, where MO stands for Machine Object.  This
+paradigm, as well as the PO file format, is inspired by the NLS
+standard developed by Uniforum, and first implemented by Sun in their
+Solaris system.
 
    PO files are meant to be read and edited by humans, and associate
 each original, translatable string of a given package with its
@@ -721,32 +714,32 @@
 dedicated to a single target language.  If a package supports many
 languages, there is one such PO file per language supported, and each
 package has its own set of PO files.  These PO files are best created by
-the ‘xgettext’ program, and later updated or refreshed through the
-‘msgmerge’ program.  Program ‘xgettext’ extracts all marked messages
-from a set of C files and initializes a PO file with empty translations.
-Program ‘msgmerge’ takes care of adjusting PO files between releases of
-the corresponding sources, commenting obsolete entries, initializing new
-ones, and updating all source line references.  Files ending with ‘.pot’
-are kind of base translation files found in distributions, in PO file
-format.
+the `xgettext' program, and later updated or refreshed through the
+`msgmerge' program.  Program `xgettext' extracts all marked messages
+from a set of C files and initializes a PO file with empty
+translations.  Program `msgmerge' takes care of adjusting PO files
+between releases of the corresponding sources, commenting obsolete
+entries, initializing new ones, and updating all source line
+references.  Files ending with `.pot' are kind of base translation
+files found in distributions, in PO file format.
 
    MO files are meant to be read by programs, and are binary in nature.
 A few systems already offer tools for creating and handling MO files as
 part of the Native Language Support coming with the system, but the
 format of these MO files is often different from system to system, and
-non-portable.  The tools already provided with these systems don’t
-support all the features of GNU ‘gettext’.  Therefore GNU ‘gettext’ uses
-its own format for MO files.  Files ending with ‘.gmo’ are really MO
-files, when it is known that these files use the GNU format.
+non-portable.  The tools already provided with these systems don't
+support all the features of GNU `gettext'.  Therefore GNU `gettext'
+uses its own format for MO files.  Files ending with `.gmo' are really
+MO files, when it is known that these files use the GNU format.
 
 
 File: gettext.info,  Node: Overview,  Prev: Files,  Up: Introduction
 
-1.5 Overview of GNU ‘gettext’
+1.5 Overview of GNU `gettext'
 =============================
 
    The following diagram summarizes the relation between the files
-handled by GNU ‘gettext’ and the tools acting on these files.  It is
+handled by GNU `gettext' and the tools acting on these files.  It is
 followed by somewhat detailed explanations, which you should read while
 keeping an eye on the diagram.  Having a clear understanding of these
 interrelations will surely help programmers, translators and
@@ -773,7 +766,7 @@
      |                                              +---> "Hello world!"
      `-------> install ---> /.../bin/PROGRAM -------'
 
-   As a programmer, the first step to bringing GNU ‘gettext’ into your
+   As a programmer, the first step to bringing GNU `gettext' into your
 package is identifying, right in the C sources, those strings which are
 meant to be translatable, and those which are untranslatable.  This
 tedious job can be done a little more comfortably using emacs PO mode,
@@ -783,7 +776,7 @@
 information about all this.
 
    For newly written software the strings of course can and should be
-marked while writing it.  The ‘gettext’ approach makes this very easy.
+marked while writing it.  The `gettext' approach makes this very easy.
 Simply put the following lines at the beginning of each file or in a
 central header file:
 
@@ -793,7 +786,7 @@
      #define bindtextdomain(Package, Directory)
 
 Doing this allows you to prepare the sources for internationalization.
-Later when you feel ready for the step to use the ‘gettext’ library
+Later when you feel ready for the step to use the `gettext' library
 simply replace these definitions by the following:
 
      #include <libintl.h>
@@ -801,38 +794,38 @@
      #define gettext_noop(String) String
      #define N_(String) gettext_noop (String)
 
-and link against ‘libintl.a’ or ‘libintl.so’.  Note that on GNU systems,
-you don’t need to link with ‘libintl’ because the ‘gettext’ library
-functions are already contained in GNU libc.  That is all you have to
-change.
-
-   Once the C sources have been modified, the ‘xgettext’ program is used
-to find and extract all translatable strings, and create a PO template
-file out of all these.  This ‘PACKAGE.pot’ file contains all original
-program strings.  It has sets of pointers to exactly where in C sources
-each string is used.  All translations are set to empty.  The letter ‘t’
-in ‘.pot’ marks this as a Template PO file, not yet oriented towards any
-particular language.  *Note xgettext Invocation::, for more details
-about how one calls the ‘xgettext’ program.  If you are _really_ lazy,
-you might be interested at working a lot more right away, and preparing
-the whole distribution setup (*note Maintainers::).  By doing so, you
-spare yourself typing the ‘xgettext’ command, as ‘make’ should now
-generate the proper things automatically for you!
-
-   The first time through, there is no ‘LANG.po’ yet, so the ‘msgmerge’
-step may be skipped and replaced by a mere copy of ‘PACKAGE.pot’ to
-‘LANG.po’, where LANG represents the target language.  See *note
+and link against `libintl.a' or `libintl.so'.  Note that on GNU
+systems, you don't need to link with `libintl' because the `gettext'
+library functions are already contained in GNU libc.  That is all you
+have to change.
+
+   Once the C sources have been modified, the `xgettext' program is
+used to find and extract all translatable strings, and create a PO
+template file out of all these.  This `PACKAGE.pot' file contains all
+original program strings.  It has sets of pointers to exactly where in
+C sources each string is used.  All translations are set to empty.  The
+letter `t' in `.pot' marks this as a Template PO file, not yet oriented
+towards any particular language.  *Note xgettext Invocation::, for more
+details about how one calls the `xgettext' program.  If you are
+_really_ lazy, you might be interested at working a lot more right
+away, and preparing the whole distribution setup (*note Maintainers::).
+By doing so, you spare yourself typing the `xgettext' command, as `make'
+should now generate the proper things automatically for you!
+
+   The first time through, there is no `LANG.po' yet, so the `msgmerge'
+step may be skipped and replaced by a mere copy of `PACKAGE.pot' to
+`LANG.po', where LANG represents the target language.  See *note
 Creating:: for details.
 
    Then comes the initial translation of messages.  Translation in
 itself is a whole matter, still exclusively meant for humans, and whose
-complexity far overwhelms the level of this manual.  Nevertheless, a few
-hints are given in some other chapter of this manual (*note
+complexity far overwhelms the level of this manual.  Nevertheless, a
+few hints are given in some other chapter of this manual (*note
 Translators::).  You will also find there indications about how to
 contact translating teams, or becoming part of them, for sharing your
 translating concerns with others who target the same native language.
 
-   While adding the translated messages into the ‘LANG.po’ PO file, if
+   While adding the translated messages into the `LANG.po' PO file, if
 you are not using one of the dedicated PO file editors (*note
 Editing::), you are on your own for ensuring that your efforts fully
 respect the PO file format, and quoting conventions (*note PO Files::).
@@ -849,21 +842,21 @@
 
    Programs, or packages of programs, are dynamic in nature: users write
 bug reports and suggestion for improvements, maintainers react by
-modifying programs in various ways.  The fact that a package has already
-been internationalized should not make maintainers shy of adding new
-strings, or modifying strings already translated.  They just do their
-job the best they can.  For the Translation Project to work smoothly, it
-is important that maintainers do not carry translation concerns on their
-already loaded shoulders, and that translators be kept as free as
-possible of programming concerns.
+modifying programs in various ways.  The fact that a package has
+already been internationalized should not make maintainers shy of
+adding new strings, or modifying strings already translated.  They just
+do their job the best they can.  For the Translation Project to work
+smoothly, it is important that maintainers do not carry translation
+concerns on their already loaded shoulders, and that translators be
+kept as free as possible of programming concerns.
 
    The only concern maintainers should have is carefully marking new
-strings as translatable, when they should be, and do not otherwise worry
-about them being translated, as this will come in proper time.
+strings as translatable, when they should be, and do not otherwise
+worry about them being translated, as this will come in proper time.
 Consequently, when programs and their strings are adjusted in various
 ways by maintainers, and for matters usually unrelated to translation,
-‘xgettext’ would construct ‘PACKAGE.pot’ files which are evolving over
-time, so the translations carried by ‘LANG.po’ are slowly fading out of
+`xgettext' would construct `PACKAGE.pot' files which are evolving over
+time, so the translations carried by `LANG.po' are slowly fading out of
 date.
 
    It is important for translators (and even maintainers) to understand
@@ -871,23 +864,23 @@
 package, and not something which is done once and for all at the start.
 After an initial burst of translation activity for a given package,
 interventions are needed once in a while, because here and there,
-translated entries become obsolete, and new untranslated entries appear,
-needing translation.
+translated entries become obsolete, and new untranslated entries
+appear, needing translation.
 
-   The ‘msgmerge’ program has the purpose of refreshing an already
-existing ‘LANG.po’ file, by comparing it with a newer ‘PACKAGE.pot’
-template file, extracted by ‘xgettext’ out of recent C sources.  The
+   The `msgmerge' program has the purpose of refreshing an already
+existing `LANG.po' file, by comparing it with a newer `PACKAGE.pot'
+template file, extracted by `xgettext' out of recent C sources.  The
 refreshing operation adjusts all references to C source locations for
 strings, since these strings move as programs are modified.  Also,
-‘msgmerge’ comments out as obsolete, in ‘LANG.po’, those already
+`msgmerge' comments out as obsolete, in `LANG.po', those already
 translated entries which are no longer used in the program sources
 (*note Obsolete Entries::).  It finally discovers new strings and
 inserts them in the resulting PO file as untranslated entries (*note
 Untranslated Entries::).  *Note msgmerge Invocation::, for more
-information about what ‘msgmerge’ really does.
+information about what `msgmerge' really does.
 
    Whatever route or means taken, the goal is to obtain an updated
-‘LANG.po’ file offering translations for all strings.
+`LANG.po' file offering translations for all strings.
 
    The temporal mobility, or fluidity of PO files, is an integral part
 of the translation game, and should be well understood, and accepted.
@@ -899,24 +892,25 @@
 job done.  The pressure should rather come from the community of users
 speaking a particular language, and maintainers should consider
 themselves fairly relieved of any concern about the adequacy of
-translation files.  On the other hand, translators should reasonably try
-updating the PO files they are responsible for, while the package is
-undergoing pretest, prior to an official distribution.
+translation files.  On the other hand, translators should reasonably
+try updating the PO files they are responsible for, while the package
+is undergoing pretest, prior to an official distribution.
 
-   Once the PO file is complete and dependable, the ‘msgfmt’ program is
+   Once the PO file is complete and dependable, the `msgfmt' program is
 used for turning the PO file into a machine-oriented format, which may
 yield efficient retrieval of translations by the programs of the
 package, whenever needed at runtime (*note MO Files::).  *Note msgfmt
 Invocation::, for more information about all modes of execution for the
-‘msgfmt’ program.
+`msgfmt' program.
 
    Finally, the modified and marked C sources are compiled and linked
-with the GNU ‘gettext’ library, usually through the operation of ‘make’,
-given a suitable ‘Makefile’ exists for the project, and the resulting
-executable is installed somewhere users will find it.  The MO files
-themselves should also be properly installed.  Given the appropriate
-environment variables are set (*note Setting the POSIX Locale::), the
-program should localize itself automatically, whenever it executes.
+with the GNU `gettext' library, usually through the operation of
+`make', given a suitable `Makefile' exists for the project, and the
+resulting executable is installed somewhere users will find it.  The MO
+files themselves should also be properly installed.  Given the
+appropriate environment variables are set (*note Setting the POSIX
+Locale::), the program should localize itself automatically, whenever
+it executes.
 
    The remainder of this manual has the purpose of explaining in depth
 the various steps outlined above.
@@ -924,14 +918,15 @@
 
 File: gettext.info,  Node: Users,  Next: PO Files,  Prev: Introduction,  Up: Top
 
-2 The User’s View
+2 The User's View
 *****************
 
    Nowadays, when users log into a computer, they usually find that all
-their programs show messages in their native language – at least for
+their programs show messages in their native language - at least for
 users of languages with an active free software community, like French
-or German; to a lesser extent for languages with a smaller participation
-in free software and the GNU project, like Hindi and Filipino.
+or German; to a lesser extent for languages with a smaller
+participation in free software and the GNU project, like Hindi and
+Filipino.
 
    How does this work?  How can the user influence the language that is
 used by the programs?  This chapter will answer it.
@@ -956,19 +951,19 @@
 system.  Some OS installers only ask for the language once.
 
    This determines the system-wide default language for all users.  But
-the installers often give the possibility to install extra localizations
-for additional languages.  For example, the localizations of KDE (the K
-Desktop Environment) and OpenOffice.org are often bundled separately, as
-one installable package per language.
-
-   At this point it is good to consider the intended use of the machine:
-If it is a machine designated for personal use, additional localizations
-are probably not necessary.  If, however, the machine is in use in an
-organization or company that has international relationships, one can
-consider the needs of guest users.  If you have a guest from abroad, for
-a week, what could be his preferred locales?  It may be worth installing
-these additional localizations ahead of time, since they cost only a bit
-of disk space at this point.
+the installers often give the possibility to install extra
+localizations for additional languages.  For example, the localizations
+of KDE (the K Desktop Environment) and OpenOffice.org are often bundled
+separately, as one installable package per language.
+
+   At this point it is good to consider the intended use of the
+machine: If it is a machine designated for personal use, additional
+localizations are probably not necessary.  If, however, the machine is
+in use in an organization or company that has international
+relationships, one can consider the needs of guest users.  If you have
+a guest from abroad, for a week, what could be his preferred locales?
+It may be worth installing these additional localizations ahead of
+time, since they cost only a bit of disk space at this point.
 
    The system-wide default language is the locale configuration that is
 used when a new user account is created.  But the user can have his own
@@ -982,14 +977,14 @@
 2.2 Setting the Locale Used by GUI Programs
 ===========================================
 
-   The immediately available programs in a user’s desktop come from a
-group of programs called a “desktop environment”; it usually includes
+   The immediately available programs in a user's desktop come from a
+group of programs called a "desktop environment"; it usually includes
 the window manager, a web browser, a text editor, and more.  The most
 common free desktop environments are KDE, GNOME, and Xfce.
 
    The locale used by GUI programs of the desktop environment can be
-specified in a configuration screen called “control center”, “language
-settings” or “country settings”.
+specified in a configuration screen called "control center", "language
+settings" or "country settings".
 
    Individual GUI programs that are not part of the desktop environment
 can have their locale specified either in a settings panel, or through
@@ -997,12 +992,12 @@
 
    For some programs, it is possible to specify the locale through
 environment variables, possibly even to a different locale than the
-desktop’s locale.  This means, instead of starting a program through a
+desktop's locale.  This means, instead of starting a program through a
 menu or from the file system, you can start it from the command-line,
 after having set some environment variables.  The environment variables
 can be those specified in the next section (*note Setting the POSIX
 Locale::); for some versions of KDE, however, the locale is specified
-through a variable ‘KDE_LANG’, rather than ‘LANG’ or ‘LC_ALL’.
+through a variable `KDE_LANG', rather than `LANG' or `LC_ALL'.
 
 
 File: gettext.info,  Node: Setting the POSIX Locale,  Next: Installing Localizations,  Prev: Setting the GUI Locale,  Up: Users
@@ -1011,17 +1006,17 @@
 ====================================================
 
    As a user, if your language has been installed for this package, in
-the simplest case, you only have to set the ‘LANG’ environment variable
-to the appropriate ‘LL_CC’ combination.  For example, let’s suppose that
-you speak German and live in Germany.  At the shell prompt, merely
-execute ‘setenv LANG de_DE’ (in ‘csh’), ‘export LANG; LANG=de_DE’ (in
-‘sh’) or ‘export LANG=de_DE’ (in ‘bash’).  This can be done from your
-‘.login’ or ‘.profile’ file, once and for all.
+the simplest case, you only have to set the `LANG' environment variable
+to the appropriate `LL_CC' combination.  For example, let's suppose
+that you speak German and live in Germany.  At the shell prompt, merely
+execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in
+`sh') or `export LANG=de_DE' (in `bash').  This can be done from your
+`.login' or `.profile' file, once and for all.
 
 * Menu:
 
 * Locale Names::                How a Locale Specification Looks Like
-* Locale Environment Variables::  Which Environment Variable Specfies What
+* Locale Environment Variables:: Which Environment Variable Specfies What
 * The LANGUAGE variable::       How to Specify a Priority List of Languages
 
 
@@ -1030,41 +1025,42 @@
 2.3.1 Locale Names
 ------------------
 
-   A locale name usually has the form ‘LL_CC’.  Here ‘LL’ is an ISO 639
-two-letter language code, and ‘CC’ is an ISO 3166 two-letter country
-code.  For example, for German in Germany, LL is ‘de’, and CC is ‘DE’.
-You find a list of the language codes in appendix *note Language Codes::
-and a list of the country codes in appendix *note Country Codes::.
+   A locale name usually has the form `LL_CC'.  Here `LL' is an ISO 639
+two-letter language code, and `CC' is an ISO 3166 two-letter country
+code.  For example, for German in Germany, LL is `de', and CC is `DE'.
+You find a list of the language codes in appendix *note Language
+Codes:: and a list of the country codes in appendix *note Country
+Codes::.
 
    You might think that the country code specification is redundant.
 But in fact, some languages have dialects in different countries.  For
-example, ‘de_AT’ is used for Austria, and ‘pt_BR’ for Brazil.  The
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
 country code serves to distinguish the dialects.
 
-   Many locale names have an extended syntax ‘LL_CC.ENCODING’ that also
-specifies the character encoding.  These are in use because between 2000
-and 2005, most users have switched to locales in UTF-8 encoding.  For
-example, the German locale on glibc systems is nowadays ‘de_DE.UTF-8’.
-The older name ‘de_DE’ still refers to the German locale as of 2000 that
-stores characters in ISO-8859-1 encoding – a text encoding that cannot
-even accommodate the Euro currency sign.
+   Many locale names have an extended syntax `LL_CC.ENCODING' that also
+specifies the character encoding.  These are in use because between
+2000 and 2005, most users have switched to locales in UTF-8 encoding.
+For example, the German locale on glibc systems is nowadays
+`de_DE.UTF-8'.  The older name `de_DE' still refers to the German
+locale as of 2000 that stores characters in ISO-8859-1 encoding - a
+text encoding that cannot even accomodate the Euro currency sign.
 
-   Some locale names use ‘LL_CC.@VARIANT’ instead of ‘LL_CC’.  The
-‘@VARIANT’ can denote any kind of characteristics that is not already
+   Some locale names use `LL_CC.@VARIANT' instead of `LL_CC'.  The
+`@VARIANT' can denote any kind of characteristics that is not already
 implied by the language LL and the country CC.  It can denote a
-particular monetary unit.  For example, on glibc systems, ‘de_DE@euro’
-denotes the locale that uses the Euro currency, in contrast to the older
-locale ‘de_DE’ which implies the use of the currency before 2002.  It
-can also denote a dialect of the language, or the script used to write
-text (for example, ‘sr_RS@latin’ uses the Latin script, whereas ‘sr_RS’
-uses the Cyrillic script to write Serbian), or the orthography rules, or
-similar.
+particular monetary unit.  For example, on glibc systems, `de_DE@euro'
+denotes the locale that uses the Euro currency, in contrast to the
+older locale `de_DE' which implies the use of the currency before 2002.
+It can also denote a dialect of the language, or the script used to
+write text (for example, `sr_RS@latin' uses the Latin script, whereas
+`sr_RS' uses the Cyrillic script to write Serbian), or the orthography
+rules, or similar.
 
    On other systems, some variations of this scheme are used, such as
-‘LL’.  You can get the list of locales supported by your system for your
-language by running the command ‘locale -a | grep '^LL'’.
+`LL'.  You can get the list of locales supported by your system for
+your language by running the command `locale -a | grep '^LL''.
 
-   There is also a special locale, called ‘C’.  When it is used, it
+   There is also a special locale, called `C'.  When it is used, it
 disables all localization: in this locale, all programs standardized by
 POSIX use English messages and an unspecified character encoding (often
 US-ASCII, but sometimes also ISO-8859-1 or UTF-8, depending on the
@@ -1081,43 +1077,46 @@
 this according to the following environment variables, in priority
 order:
 
-  1. ‘LANGUAGE’
-  2. ‘LC_ALL’
-  3. ‘LC_xxx’, according to selected locale category: ‘LC_CTYPE’,
-     ‘LC_NUMERIC’, ‘LC_TIME’, ‘LC_COLLATE’, ‘LC_MONETARY’,
-     ‘LC_MESSAGES’, ...
-  4. ‘LANG’
+  1. `LANGUAGE' 
+
+  2. `LC_ALL' 
+
+  3. `LC_xxx', according to selected locale category: `LC_CTYPE',
+     `LC_NUMERIC', `LC_TIME', `LC_COLLATE', `LC_MONETARY',
+     `LC_MESSAGES', ...  
+
+  4. `LANG'
 
    Variables whose value is set but is empty are ignored in this lookup.
 
-   ‘LANG’ is the normal environment variable for specifying a locale.
+   `LANG' is the normal environment variable for specifying a locale.
 As a user, you normally set this variable (unless some of the other
-variables have already been set by the system, in ‘/etc/profile’ or
+variables have already been set by the system, in `/etc/profile' or
 similar initialization files).
 
-   ‘LC_CTYPE’, ‘LC_NUMERIC’, ‘LC_TIME’, ‘LC_COLLATE’, ‘LC_MONETARY’,
-‘LC_MESSAGES’, and so on, are the environment variables meant to
-override ‘LANG’ and affecting a single locale category only.  For
+   `LC_CTYPE', `LC_NUMERIC', `LC_TIME', `LC_COLLATE', `LC_MONETARY',
+`LC_MESSAGES', and so on, are the environment variables meant to
+override `LANG' and affecting a single locale category only.  For
 example, assume you are a Swedish user in Spain, and you want your
 programs to handle numbers and dates according to Spanish conventions,
 and only the messages should be in Swedish.  Then you could create a
-locale named ‘sv_ES’ or ‘sv_ES.UTF-8’ by use of the ‘localedef’ program.
-But it is simpler, and achieves the same effect, to set the ‘LANG’
-variable to ‘es_ES.UTF-8’ and the ‘LC_MESSAGES’ variable to
-‘sv_SE.UTF-8’; these two locales come already preinstalled with the
+locale named `sv_ES' or `sv_ES.UTF-8' by use of the `localedef'
+program.  But it is simpler, and achieves the same effect, to set the
+`LANG' variable to `es_ES.UTF-8' and the `LC_MESSAGES' variable to
+`sv_SE.UTF-8'; these two locales come already preinstalled with the
 operating system.
 
-   ‘LC_ALL’ is an environment variable that overrides all of these.  It
+   `LC_ALL' is an environment variable that overrides all of these.  It
 is typically used in scripts that run particular programs.  For example,
-‘configure’ scripts generated by GNU autoconf use ‘LC_ALL’ to make sure
-that the configuration tests don’t operate in locale dependent ways.
+`configure' scripts generated by GNU autoconf use `LC_ALL' to make sure
+that the configuration tests don't operate in locale dependent ways.
 
-   Some systems, unfortunately, set ‘LC_ALL’ in ‘/etc/profile’ or in
+   Some systems, unfortunately, set `LC_ALL' in `/etc/profile' or in
 similar initialization files.  As a user, you therefore have to unset
-this variable if you want to set ‘LANG’ and optionally some of the other
-‘LC_xxx’ variables.
+this variable if you want to set `LANG' and optionally some of the other
+`LC_xxx' variables.
 
-   The ‘LANGUAGE’ variable is described in the next subsection.
+   The `LANGUAGE' variable is described in the next subsection.
 
 
 File: gettext.info,  Node: The LANGUAGE variable,  Prev: Locale Environment Variables,  Up: Setting the POSIX Locale
@@ -1129,31 +1128,31 @@
 English message is shown in place of a nonexistent translation.  If you
 understand other languages, you can set up a priority list of languages.
 This is done through a different environment variable, called
-‘LANGUAGE’.  GNU ‘gettext’ gives preference to ‘LANGUAGE’ over ‘LC_ALL’
-and ‘LANG’ for the purpose of message handling, but you still need to
-have ‘LANG’ (or ‘LC_ALL’) set to the primary language; this is required
-by other parts of the system libraries.  For example, some Swedish users
-who would rather read translations in German than English for when
-Swedish is not available, set ‘LANGUAGE’ to ‘sv:de’ while leaving ‘LANG’
-to ‘sv_SE’.
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LC_ALL'
+and `LANG' for the purpose of message handling, but you still need to
+have `LANG' (or `LC_ALL') set to the primary language; this is required
+by other parts of the system libraries.  For example, some Swedish
+users who would rather read translations in German than English for
+when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving
+`LANG' to `sv_SE'.
 
    Special advice for Norwegian users: The language code for Norwegian
-bokmål changed from ‘no’ to ‘nb’ recently (in 2003).  During the
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
 transition period, while some message catalogs for this language are
-installed under ‘nb’ and some older ones under ‘no’, it is recommended
-for Norwegian users to set ‘LANGUAGE’ to ‘nb:no’ so that both newer and
+installed under `nb' and some older ones under `no', it is recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
 older translations are used.
 
-   In the ‘LANGUAGE’ environment variable, but not in the other
-environment variables, ‘LL_CC’ combinations can be abbreviated as ‘LL’
-to denote the language’s main dialect.  For example, ‘de’ is equivalent
-to ‘de_DE’ (German as spoken in Germany), and ‘pt’ to ‘pt_PT’
+   In the `LANGUAGE' environment variable, but not in the other
+environment variables, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-   Note: The variable ‘LANGUAGE’ is ignored if the locale is set to ‘C’.
-In other words, you have to first enable localization, by setting ‘LANG’
-(or ‘LC_ALL’) to a value other than ‘C’, before you can use a language
-priority list through the ‘LANGUAGE’ variable.
+   Note: The variable `LANGUAGE' is ignored if the locale is set to
+`C'.  In other words, you have to first enable localization, by setting
+`LANG' (or `LC_ALL') to a value other than `C', before you can use a
+language priority list through the `LANGUAGE' variable.
 
 
 File: gettext.info,  Node: Installing Localizations,  Prev: Setting the POSIX Locale,  Up: Users
@@ -1162,7 +1161,7 @@
 ===================================================
 
    Languages are not equally well supported in all packages using GNU
-‘gettext’, and more translations are added over time.  Usually, you use
+`gettext', and more translations are added over time.  Usually, you use
 the translations that are shipped with the operating system or with
 particular packages that you install afterwards.  But you can also
 install newer localizations directly.  For doing this, you will need an
@@ -1170,19 +1169,19 @@
 
    For programs that participate in the Translation Project, you can
 start looking for translations here:
-<http://translationproject.org/team/index.html>.  A snapshot of this
-information is also found in the ‘ABOUT-NLS’ file that is shipped with
+`http://translationproject.org/team/index.html'.  A snapshot of this
+information is also found in the `ABOUT-NLS' file that is shipped with
 GNU gettext.
 
    For programs that are part of the KDE project, the starting point is:
-<http://i18n.kde.org/>.
+`http://i18n.kde.org/'.
 
    For programs that are part of the GNOME project, the starting point
-is: <http://www.gnome.org/i18n/>.
+is: `http://www.gnome.org/i18n/'.
 
-   For other programs, you may check whether the program’s source code
-package contains some ‘LL.po’ files; often they are kept together in a
-directory called ‘po/’.  Each ‘LL.po’ file contains the message
+   For other programs, you may check whether the program's source code
+package contains some `LL.po' files; often they are kept together in a
+directory called `po/'.  Each `LL.po' file contains the message
 translations for the language whose abbreviation of LL.
 
 
@@ -1191,22 +1190,22 @@
 3 The Format of PO Files
 ************************
 
-   The GNU ‘gettext’ toolset helps programmers and translators at
+   The GNU `gettext' toolset helps programmers and translators at
 producing, updating and using translation files, mainly those PO files
 which are textual, editable files.  This chapter explains the format of
 PO files.
 
    A PO file is made up of many entries, each entry holding the relation
 between an original untranslated string and its corresponding
-translation.  All entries in a given PO file usually pertain to a single
-project, and all translations are expressed in a single target language.
-One PO file "entry" has the following schematic structure:
+translation.  All entries in a given PO file usually pertain to a
+single project, and all translations are expressed in a single target
+language.  One PO file "entry" has the following schematic structure:
 
      WHITE-SPACE
      #  TRANSLATOR-COMMENTS
      #. EXTRACTED-COMMENTS
-     #: REFERENCE…
-     #, FLAG…
+     #: REFERENCE...
+     #, FLAG...
      #| msgid PREVIOUS-UNTRANSLATED-STRING
      msgid UNTRANSLATED-STRING
      msgstr TRANSLATED-STRING
@@ -1222,188 +1221,179 @@
      msgstr "Error desconegut del sistema"
 
    Entries begin with some optional white space.  Usually, when
-generated through GNU ‘gettext’ tools, there is exactly one blank line
+generated through GNU `gettext' tools, there is exactly one blank line
 between entries.  Then comments follow, on lines all starting with the
-character ‘#’.  There are two kinds of comments: those which have some
-white space immediately following the ‘#’ - the TRANSLATOR COMMENTS -,
-which comments are created and maintained exclusively by the translator,
-and those which have some non-white character just after the ‘#’ - the
-AUTOMATIC COMMENTS -, which comments are created and maintained
-automatically by GNU ‘gettext’ tools.  Comment lines starting with ‘#.’
-contain comments given by the programmer, directed at the translator;
-these comments are called EXTRACTED COMMENTS because the ‘xgettext’
-program extracts them from the program’s source code.  Comment lines
-starting with ‘#:’ contain references to the program’s source code.
-Comment lines starting with ‘#,’ contain flags; more about these below.
-Comment lines starting with ‘#|’ contain the previous untranslated
-string for which the translator gave a translation.
+character `#'.  There are two kinds of comments: those which have some
+white space immediately following the `#' - the TRANSLATOR COMMENTS -,
+which comments are created and maintained exclusively by the
+translator, and those which have some non-white character just after the
+`#' - the AUTOMATIC COMMENTS -, which comments are created and
+maintained automatically by GNU `gettext' tools.  Comment lines
+starting with `#.' contain comments given by the programmer, directed
+at the translator; these comments are called EXTRACTED COMMENTS because
+the `xgettext' program extracts them from the program's source code.
+Comment lines starting with `#:' contain references to the program's
+source code.  Comment lines starting with `#,' contain flags; more
+about these below.  Comment lines starting with `#|' contain the
+previous untranslated string for which the translator gave a
+translation.
 
    All comments, of either kind, are optional.
 
    After white space and comments, entries show two strings, namely
 first the untranslated string as it appears in the original program
 sources, and then, the translation of this string.  The original string
-is introduced by the keyword ‘msgid’, and the translation, by ‘msgstr’.
-The two strings, untranslated and translated, are quoted in various ways
-in the PO file, using ‘"’ delimiters and ‘\’ escapes, but the translator
-does not really have to pay attention to the precise quoting format, as
-PO mode fully takes care of quoting for her.
-
-   The ‘msgid’ strings, as well as automatic comments, are produced and
-managed by other GNU ‘gettext’ tools, and PO mode does not provide means
-for the translator to alter these.  The most she can do is merely
-deleting them, and only by deleting the whole entry.  On the other hand,
-the ‘msgstr’ string, as well as translator comments, are really meant
-for the translator, and PO mode gives her the full control she needs.
+is introduced by the keyword `msgid', and the translation, by `msgstr'.
+The two strings, untranslated and translated, are quoted in various
+ways in the PO file, using `"' delimiters and `\' escapes, but the
+translator does not really have to pay attention to the precise quoting
+format, as PO mode fully takes care of quoting for her.
+
+   The `msgid' strings, as well as automatic comments, are produced and
+managed by other GNU `gettext' tools, and PO mode does not provide
+means for the translator to alter these.  The most she can do is merely
+deleting them, and only by deleting the whole entry.  On the other
+hand, the `msgstr' string, as well as translator comments, are really
+meant for the translator, and PO mode gives her the full control she
+needs.
 
-   The comment lines beginning with ‘#,’ are special because they are
+   The comment lines beginning with `#,' are special because they are
 not completely ignored by the programs as comments generally are.  The
-comma separated list of FLAGs is used by the ‘msgfmt’ program to give
-the user some better diagnostic messages.  Currently there are two forms
-of flags defined:
-
-‘fuzzy’
-     This flag can be generated by the ‘msgmerge’ program or it can be
-     inserted by the translator herself.  It shows that the ‘msgstr’
+comma separated list of FLAGs is used by the `msgfmt' program to give
+the user some better diagnostic messages.  Currently there are two
+forms of flags defined:
+
+`fuzzy'
+     This flag can be generated by the `msgmerge' program or it can be
+     inserted by the translator herself.  It shows that the `msgstr'
      string might not be a correct translation (anymore).  Only the
      translator can judge if the translation requires further
      modification, or is acceptable as is.  Once satisfied with the
-     translation, she then removes this ‘fuzzy’ attribute.  The
-     ‘msgmerge’ program inserts this when it combined the ‘msgid’ and
-     ‘msgstr’ entries after fuzzy search only.  *Note Fuzzy Entries::.
+     translation, she then removes this `fuzzy' attribute.  The
+     `msgmerge' program inserts this when it combined the `msgid' and
+     `msgstr' entries after fuzzy search only.  *Note Fuzzy Entries::.
 
-‘c-format’
-‘no-c-format’
+`c-format'
+`no-c-format'
      These flags should not be added by a human.  Instead only the
-     ‘xgettext’ program adds them.  In an automated PO file processing
-     system as proposed here, the user’s changes would be thrown away
-     again as soon as the ‘xgettext’ program generates a new template
+     `xgettext' program adds them.  In an automated PO file processing
+     system as proposed here, the user's changes would be thrown away
+     again as soon as the `xgettext' program generates a new template
      file.
 
-     The ‘c-format’ flag indicates that the untranslated string and the
-     translation are supposed to be C format strings.  The ‘no-c-format’
+     The `c-format' flag indicates that the untranslated string and the
+     translation are supposed to be C format strings.  The `no-c-format'
      flag indicates that they are not C format strings, even though the
      untranslated string happens to look like a C format string (with
-     ‘%’ directives).
+     `%' directives).
 
-     When the ‘c-format’ flag is given for a string the ‘msgfmt’ program
-     does some more tests to check the validity of the translation.
-     *Note msgfmt Invocation::, *note c-format Flag:: and *note
-     c-format::.
+     When the `c-format' flag is given for a string the `msgfmt'
+     program does some more tests to check the validity of the
+     translation.  *Note msgfmt Invocation::, *note c-format Flag:: and
+     *note c-format::.
 
-‘objc-format’
-‘no-objc-format’
+`objc-format'
+`no-objc-format'
      Likewise for Objective C, see *note objc-format::.
 
-‘sh-format’
-‘no-sh-format’
+`sh-format'
+`no-sh-format'
      Likewise for Shell, see *note sh-format::.
 
-‘python-format’
-‘no-python-format’
+`python-format'
+`no-python-format'
      Likewise for Python, see *note python-format::.
 
-‘python-brace-format’
-‘no-python-brace-format’
-     Likewise for Python brace, see *note python-format::.
-
-‘lisp-format’
-‘no-lisp-format’
+`lisp-format'
+`no-lisp-format'
      Likewise for Lisp, see *note lisp-format::.
 
-‘elisp-format’
-‘no-elisp-format’
+`elisp-format'
+`no-elisp-format'
      Likewise for Emacs Lisp, see *note elisp-format::.
 
-‘librep-format’
-‘no-librep-format’
+`librep-format'
+`no-librep-format'
      Likewise for librep, see *note librep-format::.
 
-‘scheme-format’
-‘no-scheme-format’
+`scheme-format'
+`no-scheme-format'
      Likewise for Scheme, see *note scheme-format::.
 
-‘smalltalk-format’
-‘no-smalltalk-format’
+`smalltalk-format'
+`no-smalltalk-format'
      Likewise for Smalltalk, see *note smalltalk-format::.
 
-‘java-format’
-‘no-java-format’
+`java-format'
+`no-java-format'
      Likewise for Java, see *note java-format::.
 
-‘csharp-format’
-‘no-csharp-format’
+`csharp-format'
+`no-csharp-format'
      Likewise for C#, see *note csharp-format::.
 
-‘awk-format’
-‘no-awk-format’
+`awk-format'
+`no-awk-format'
      Likewise for awk, see *note awk-format::.
 
-‘object-pascal-format’
-‘no-object-pascal-format’
+`object-pascal-format'
+`no-object-pascal-format'
      Likewise for Object Pascal, see *note object-pascal-format::.
 
-‘ycp-format’
-‘no-ycp-format’
+`ycp-format'
+`no-ycp-format'
      Likewise for YCP, see *note ycp-format::.
 
-‘tcl-format’
-‘no-tcl-format’
+`tcl-format'
+`no-tcl-format'
      Likewise for Tcl, see *note tcl-format::.
 
-‘perl-format’
-‘no-perl-format’
+`perl-format'
+`no-perl-format'
      Likewise for Perl, see *note perl-format::.
 
-‘perl-brace-format’
-‘no-perl-brace-format’
+`perl-brace-format'
+`no-perl-brace-format'
      Likewise for Perl brace, see *note perl-format::.
 
-‘php-format’
-‘no-php-format’
+`php-format'
+`no-php-format'
      Likewise for PHP, see *note php-format::.
 
-‘gcc-internal-format’
-‘no-gcc-internal-format’
+`gcc-internal-format'
+`no-gcc-internal-format'
      Likewise for the GCC sources, see *note gcc-internal-format::.
 
-‘gfc-internal-format’
-‘no-gfc-internal-format’
+`gfc-internal-format'
+`no-gfc-internal-format'
      Likewise for the GNU Fortran Compiler sources, see *note
      gfc-internal-format::.
 
-‘qt-format’
-‘no-qt-format’
+`qt-format'
+`no-qt-format'
      Likewise for Qt, see *note qt-format::.
 
-‘qt-plural-format’
-‘no-qt-plural-format’
+`qt-plural-format'
+`no-qt-plural-format'
      Likewise for Qt plural forms, see *note qt-plural-format::.
 
-‘kde-format’
-‘no-kde-format’
+`kde-format'
+`no-kde-format'
      Likewise for KDE, see *note kde-format::.
 
-‘boost-format’
-‘no-boost-format’
+`boost-format'
+`no-boost-format'
      Likewise for Boost, see *note boost-format::.
 
-‘lua-format’
-‘no-lua-format’
-     Likewise for Lua, see *note lua-format::.
-
-‘javascript-format’
-‘no-javascript-format’
-     Likewise for JavaScript, see *note javascript-format::.
 
-   It is also possible to have entries with a context specifier.  They
+   It is also possible to have entries with a context specifier. They
 look like this:
 
      WHITE-SPACE
      #  TRANSLATOR-COMMENTS
      #. EXTRACTED-COMMENTS
-     #: REFERENCE…
-     #, FLAG…
+     #: REFERENCE...
+     #, FLAG...
      #| msgctxt PREVIOUS-CONTEXT
      #| msgid PREVIOUS-UNTRANSLATED-STRING
      msgctxt CONTEXT
@@ -1414,7 +1404,7 @@
 UNTRANSLATED-STRING.  It is possible to have several entries with the
 same UNTRANSLATED-STRING in a PO file, provided that they each have a
 different CONTEXT.  Note that an empty CONTEXT string and an absent
-‘msgctxt’ line do not mean the same thing.
+`msgctxt' line do not mean the same thing.
 
    A different kind of entries is used for translations which involve
 plural forms.
@@ -1422,8 +1412,8 @@
      WHITE-SPACE
      #  TRANSLATOR-COMMENTS
      #. EXTRACTED-COMMENTS
-     #: REFERENCE…
-     #, FLAG…
+     #: REFERENCE...
+     #, FLAG...
      #| msgid PREVIOUS-UNTRANSLATED-STRING-SINGULAR
      #| msgid_plural PREVIOUS-UNTRANSLATED-STRING-PLURAL
      msgid UNTRANSLATED-STRING-SINGULAR
@@ -1441,23 +1431,23 @@
      msgstr[0] "s'ha trobat %d error fatal"
      msgstr[1] "s'han trobat %d errors fatals"
 
-   Here also, a ‘msgctxt’ context can be specified before ‘msgid’, like
+   Here also, a `msgctxt' context can be specified before `msgid', like
 above.
 
    Here, additional kinds of flags can be used:
 
-‘range:’
-     This flag is followed by a range of non-negative numbers, using the
-     syntax ‘range: MINIMUM-VALUE..MAXIMUM-VALUE’.  It designates the
-     possible values that the numeric parameter of the message can take.
-     In some languages, translators may produce slightly better
+`range:'
+     This flag is followed by a range of non-negative numbers, using
+     the syntax `range: MINIMUM-VALUE..MAXIMUM-VALUE'.  It designates
+     the possible values that the numeric parameter of the message can
+     take.  In some languages, translators may produce slightly better
      translations if they know that the value can only take on values
      between 0 and 10, for example.
 
    The PREVIOUS-UNTRANSLATED-STRING is optionally inserted by the
-‘msgmerge’ program, at the same time when it marks a message fuzzy.  It
-helps the translator to see which changes were done by the developers on
-the UNTRANSLATED-STRING.
+`msgmerge' program, at the same time when it marks a message fuzzy.  It
+helps the translator to see which changes were done by the developers
+on the UNTRANSLATED-STRING.
 
    It happens that some lines, usually whitespace or comments, follow
 the very last entry of a PO file.  Such lines are not part of any entry,
@@ -1469,11 +1459,6 @@
 idea of the precise format of a PO file.  On the other hand, those
 wishing to modify PO files by hand should carefully continue reading on.
 
-   An empty UNTRANSLATED-STRING is reserved to contain the header entry
-with the meta information (*note Header Entry::).  This header entry
-should be the first entry of the file.  The empty UNTRANSLATED-STRING is
-reserved for this purpose and must not be used anywhere else.
-
    Each of UNTRANSLATED-STRING and TRANSLATED-STRING respects the C
 syntax for a character string, including the surrounding quotes and
 embedded backslashed escape sequences.  When the time comes to write
@@ -1487,36 +1472,37 @@
      "for the common case the string represents multi-line output.\n"
 
 In this example, the empty string is used on the first line, to allow
-better alignment of the ‘H’ from the word ‘Here’ over the ‘f’ from the
-word ‘for’.  In this example, the ‘msgid’ keyword is followed by three
+better alignment of the `H' from the word `Here' over the `f' from the
+word `for'.  In this example, the `msgid' keyword is followed by three
 strings, which are meant to be concatenated.  Concatenating the empty
-string does not change the resulting overall string, but it is a way for
-us to comply with the necessity of ‘msgid’ to be followed by a string on
-the same line, while keeping the multi-line presentation left-justified,
-as we find this to be a cleaner disposition.  The empty string could
-have been omitted, but only if the string starting with ‘Here’ was
-promoted on the first line, right after ‘msgid’.(1)  It was not really
-necessary either to switch between the two last quoted strings
-immediately after the newline ‘\n’, the switch could have occurred after
-_any_ other character, we just did it this way because it is neater.
+string does not change the resulting overall string, but it is a way
+for us to comply with the necessity of `msgid' to be followed by a
+string on the same line, while keeping the multi-line presentation
+left-justified, as we find this to be a cleaner disposition.  The empty
+string could have been omitted, but only if the string starting with
+`Here' was promoted on the first line, right after `msgid'.(1) It was
+not really necessary either to switch between the two last quoted
+strings immediately after the newline `\n', the switch could have
+occurred after _any_ other character, we just did it this way because
+it is neater.
 
-   One should carefully distinguish between end of lines marked as ‘\n’
+   One should carefully distinguish between end of lines marked as `\n'
 _inside_ quotes, which are part of the represented string, and end of
 lines in the PO file itself, outside string quotes, which have no
 incidence on the represented string.
 
    Outside strings, white lines and comments may be used freely.
-Comments start at the beginning of a line with ‘#’ and extend until the
+Comments start at the beginning of a line with `#' and extend until the
 end of the PO file line.  Comments written by translators should have
-the initial ‘#’ immediately followed by some white space.  If the ‘#’ is
-not immediately followed by white space, this comment is most likely
+the initial `#' immediately followed by some white space.  If the `#'
+is not immediately followed by white space, this comment is most likely
 generated and managed by specialized GNU tools, and might disappear or
-be replaced unexpectedly when the PO file is given to ‘msgmerge’.
+be replaced unexpectedly when the PO file is given to `msgmerge'.
 
    ---------- Footnotes ----------
 
-   (1) This limitation is not imposed by GNU ‘gettext’, but is for
-compatibility with the ‘msgfmt’ implementation on Solaris.
+   (1) This limitation is not imposed by GNU `gettext', but is for
+compatibility with the `msgfmt' implementation on Solaris.
 
 
 File: gettext.info,  Node: Sources,  Next: Template,  Prev: PO Files,  Up: Top
@@ -1525,16 +1511,17 @@
 ***************************
 
    For the programmer, changes to the C source code fall into three
-categories.  First, you have to make the localization functions known to
-all modules needing message translation.  Second, you should properly
-trigger the operation of GNU ‘gettext’ when the program initializes,
-usually from the ‘main’ function.  Last, you should identify, adjust and
-mark all constant strings in your program needing translation.
+categories.  First, you have to make the localization functions known
+to all modules needing message translation.  Second, you should
+properly trigger the operation of GNU `gettext' when the program
+initializes, usually from the `main' function.  Last, you should
+identify, adjust and mark all constant strings in your program needing
+translation.
 
 * Menu:
 
-* Importing::                   Importing the ‘gettext’ declaration
-* Triggering::                  Triggering ‘gettext’ Operations
+* Importing::                   Importing the `gettext' declaration
+* Triggering::                  Triggering `gettext' Operations
 * Preparing Strings::           Preparing Translatable Strings
 * Mark Keywords::               How Marks Appear in Sources
 * Marking::                     Marking Translatable Strings
@@ -1547,26 +1534,26 @@
 
 File: gettext.info,  Node: Importing,  Next: Triggering,  Prev: Sources,  Up: Sources
 
-4.1 Importing the ‘gettext’ declaration
+4.1 Importing the `gettext' declaration
 =======================================
 
-   Presuming that your set of programs, or package, has been adjusted so
-all needed GNU ‘gettext’ files are available, and your ‘Makefile’ files
-are adjusted (*note Maintainers::), each C module having translated C
-strings should contain the line:
+   Presuming that your set of programs, or package, has been adjusted
+so all needed GNU `gettext' files are available, and your `Makefile'
+files are adjusted (*note Maintainers::), each C module having
+translated C strings should contain the line:
 
      #include <libintl.h>
 
-   Similarly, each C module containing ‘printf()’/‘fprintf()’/...  calls
-with a format string that could be a translated C string (even if the C
-string comes from a different C module) should contain the line:
+   Similarly, each C module containing `printf()'/`fprintf()'/...
+calls with a format string that could be a translated C string (even if
+the C string comes from a different C module) should contain the line:
 
      #include <libintl.h>
 
 
 File: gettext.info,  Node: Triggering,  Next: Preparing Strings,  Prev: Importing,  Up: Sources
 
-4.2 Triggering ‘gettext’ Operations
+4.2 Triggering `gettext' Operations
 ===================================
 
    The initialization of locale data should be done with more or less
@@ -1575,65 +1562,66 @@
      int
      main (int argc, char *argv[])
      {
-       …
+       ...
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
-       …
+       ...
      }
 
-   PACKAGE and LOCALEDIR should be provided either by ‘config.h’ or by
-the Makefile.  For now consult the ‘gettext’ or ‘hello’ sources for more
-information.
+   PACKAGE and LOCALEDIR should be provided either by `config.h' or by
+the Makefile.  For now consult the `gettext' or `hello' sources for
+more information.
 
-   The use of ‘LC_ALL’ might not be appropriate for you.  ‘LC_ALL’
-includes all locale categories and especially ‘LC_CTYPE’.  This latter
+   The use of `LC_ALL' might not be appropriate for you.  `LC_ALL'
+includes all locale categories and especially `LC_CTYPE'.  This latter
 category is responsible for determining character classes with the
-‘isalnum’ etc.  functions from ‘ctype.h’ which could especially for
+`isalnum' etc. functions from `ctype.h' which could especially for
 programs, which process some kind of input language, be wrong.  For
 example this would mean that a source code using the ç (c-cedilla
 character) is runnable in France but not in the U.S.
 
    Some systems also have problems with parsing numbers using the
-‘scanf’ functions if an other but the ‘LC_ALL’ locale category is used.
-The standards say that additional formats but the one known in the ‘"C"’
-locale might be recognized.  But some systems seem to reject numbers in
-the ‘"C"’ locale format.  In some situation, it might also be a problem
-with the notation itself which makes it impossible to recognize whether
-the number is in the ‘"C"’ locale or the local format.  This can happen
-if thousands separator characters are used.  Some locales define this
-character according to the national conventions to ‘'.'’ which is the
-same character used in the ‘"C"’ locale to denote the decimal point.
+`scanf' functions if an other but the `LC_ALL' locale category is used.
+The standards say that additional formats but the one known in the
+`"C"' locale might be recognized.  But some systems seem to reject
+numbers in the `"C"' locale format.  In some situation, it might also
+be a problem with the notation itself which makes it impossible to
+recognize whether the number is in the `"C"' locale or the local
+format.  This can happen if thousands separator characters are used.
+Some locales define this character according to the national
+conventions to `'.'' which is the same character used in the `"C"'
+locale to denote the decimal point.
 
-   So it is sometimes necessary to replace the ‘LC_ALL’ line in the code
-above by a sequence of ‘setlocale’ lines
+   So it is sometimes necessary to replace the `LC_ALL' line in the
+code above by a sequence of `setlocale' lines
 
      {
-       …
+       ...
        setlocale (LC_CTYPE, "");
        setlocale (LC_MESSAGES, "");
-       …
+       ...
      }
 
-On all POSIX conformant systems the locale categories ‘LC_CTYPE’,
-‘LC_MESSAGES’, ‘LC_COLLATE’, ‘LC_MONETARY’, ‘LC_NUMERIC’, and ‘LC_TIME’
+On all POSIX conformant systems the locale categories `LC_CTYPE',
+`LC_MESSAGES', `LC_COLLATE', `LC_MONETARY', `LC_NUMERIC', and `LC_TIME'
 are available.  On some systems which are only ISO C compliant,
-‘LC_MESSAGES’ is missing, but a substitute for it is defined in GNU
-gettext’s ‘<libintl.h>’ and in GNU gnulib’s ‘<locale.h>’.
+`LC_MESSAGES' is missing, but a substitute for it is defined in GNU
+gettext's `<libintl.h>' and in GNU gnulib's `<locale.h>'.
 
-   Note that changing the ‘LC_CTYPE’ also affects the functions declared
-in the ‘<ctype.h>’ standard header and some functions declared in the
-‘<string.h>’ and ‘<stdlib.h>’ standard headers.  If this is not
-desirable in your application (for example in a compiler’s parser), you
+   Note that changing the `LC_CTYPE' also affects the functions
+declared in the `<ctype.h>' standard header and some functions declared
+in the `<string.h>' and `<stdlib.h>' standard headers.  If this is not
+desirable in your application (for example in a compiler's parser), you
 can use a set of substitute functions which hardwire the C locale, such
-as found in the modules ‘c-ctype’, ‘c-strcase’, ‘c-strcasestr’,
-‘c-strtod’, ‘c-strtold’ in the GNU gnulib source distribution.
+as found in the modules `c-ctype', `c-strcase', `c-strcasestr',
+`c-strtod', `c-strtold' in the GNU gnulib source distribution.
 
    It is also possible to switch the locale forth and back between the
 environment dependent locale and the C locale, but this approach is
-normally avoided because a ‘setlocale’ call is expensive, because it is
+normally avoided because a `setlocale' call is expensive, because it is
 tedious to determine the places where a locale switch is needed in a
-large program’s source, and because switching a locale is not
+large program's source, and because switching a locale is not
 multithread-safe.
 
 
@@ -1648,17 +1636,17 @@
 next sections.  What you have to keep in mind while doing that is the
 following.
 
-   • Decent English style.
+   * Decent English style.
 
-   • Entire sentences.
+   * Entire sentences.
 
-   • Split at paragraphs.
+   * Split at paragraphs.
 
-   • Use format strings instead of string concatenation.
+   * Use format strings instead of string concatenation.
 
-   • Avoid unusual markup and unusual control characters.
+   * Avoid unusual markup and unusual control characters.
 
-Let’s look at some examples of these guidelines.
+Let's look at some examples of these guidelines.
 
    Translatable strings should be in good English style.  If slang
 language with abbreviations and shortcuts is used, often translators
@@ -1673,9 +1661,9 @@
      "No match"
 
 The ambiguity in this message makes it unintelligible: Is the program
-attempting to set something on fire?  Does it mean "The given object
-does not match the template"?  Does it mean "The template does not fit
-for any of the objects"?
+attempting to set something on fire? Does it mean "The given object does
+not match the template"? Does it mean "The template does not fit for any
+of the objects"?
 
    In both cases, adding more words to the message will help both the
 translator and the English speaking user.
@@ -1686,7 +1674,7 @@
      printf ("File %s is %s protected", filename, rw ? "write" : "read");
 
 Most translators will not look at the source and will thus only see the
-string ‘"File %s is %s protected"’, which is unintelligible.  Change
+string `"File %s is %s protected"', which is unintelligible.  Change
 this to
 
      printf (rw ? "File %s is write protected" : "File %s is read protected",
@@ -1704,48 +1692,48 @@
 consequence is that asking a translator to translate two half-sentences
 and then combining these two half-sentences through dumb string
 concatenation will not work, for many languages, even though it would
-work for English.  That’s why translators need to handle entire
+work for English.  That's why translators need to handle entire
 sentences.
 
-   Often sentences don’t fit into a single line.  If a sentence is
-output using two subsequent ‘printf’ statements, like this
+   Often sentences don't fit into a single line.  If a sentence is
+output using two subsequent `printf' statements, like this
 
      printf ("Locale charset \"%s\" is different from\n", lcharset);
      printf ("input file charset \"%s\".\n", fcharset);
 
 the translator would have to translate two half sentences, but nothing
 in the POT file would tell her that the two half sentences belong
-together.  It is necessary to merge the two ‘printf’ statements so that
+together.  It is necessary to merge the two `printf' statements so that
 the translator can handle the entire sentence at once and decide at
 which place to insert a line break in the translation (if at all):
 
      printf ("Locale charset \"%s\" is different from\n\
      input file charset \"%s\".\n", lcharset, fcharset);
 
-   You may now ask: how about two or more adjacent sentences?  Like in
+   You may now ask: how about two or more adjacent sentences? Like in
 this case:
 
      puts ("Apollo 13 scenario: Stack overflow handling failed.");
      puts ("On the next stack overflow we will crash!!!");
 
-Should these two statements merged into a single one?  I would recommend
+Should these two statements merged into a single one? I would recommend
 to merge them if the two sentences are related to each other, because
 then it makes it easier for the translator to understand and translate
 both.  On the other hand, if one of the two messages is a stereotypic
 one, occurring in other places as well, you will do a favour to the
 translator by not merging the two.  (Identical messages occurring in
-several places are combined by xgettext, so the translator has to handle
-them once only.)
+several places are combined by xgettext, so the translator has to
+handle them once only.)
 
-   Translatable strings should be limited to one paragraph; don’t let a
+   Translatable strings should be limited to one paragraph; don't let a
 single message be longer than ten lines.  The reason is that when the
 translatable string changes, the translator is faced with the task of
 updating the entire translated string.  Maybe only a single word will
-have changed in the English string, but the translator doesn’t see that
-(with the current translation tools), therefore she has to proofread the
-entire message.
+have changed in the English string, but the translator doesn't see that
+(with the current translation tools), therefore she has to proofread
+the entire message.
 
-   Many GNU programs have a ‘--help’ output that extends over several
+   Many GNU programs have a `--help' output that extends over several
 screen pages.  It is a courtesy towards the translators to split such a
 message into several ones of five to ten lines each.  While doing that,
 you can also attempt to split the documented options into groups, such
@@ -1763,43 +1751,43 @@
      strcat (s, "?");
 
 In order to present to the translator only entire sentences, and also
-because in some languages the translator might want to swap the order of
-‘object1’ and ‘object2’, it is necessary to change this to use a format
-string:
+because in some languages the translator might want to swap the order
+of `object1' and `object2', it is necessary to change this to use a
+format string:
 
      sprintf (s, "Replace %s with %s?", object1, object2);
 
    A similar case is compile time concatenation of strings.  The ISO C
-99 include file ‘<inttypes.h>’ contains a macro ‘PRId64’ that can be
-used as a formatting directive for outputting an ‘int64_t’ integer
-through ‘printf’.  It expands to a constant string, usually "d" or "ld"
+99 include file `<inttypes.h>' contains a macro `PRId64' that can be
+used as a formatting directive for outputting an `int64_t' integer
+through `printf'.  It expands to a constant string, usually "d" or "ld"
 or "lld" or something like this, depending on the platform.  Assume you
 have code like
 
      printf ("The amount is %0" PRId64 "\n", number);
 
-The ‘gettext’ tools and library have special support for these
-‘<inttypes.h>’ macros.  You can therefore simply write
+The `gettext' tools and library have special support for these
+`<inttypes.h>' macros.  You can therefore simply write
 
      printf (gettext ("The amount is %0" PRId64 "\n"), number);
 
 The PO file will contain the string "The amount is %0<PRId64>\n".  The
 translators will provide a translation containing "%0<PRId64>" as well,
-and at runtime the ‘gettext’ function’s result will contain the
+and at runtime the `gettext' function's result will contain the
 appropriate constant string, "d" or "ld" or "lld".
 
-   This works only for the predefined ‘<inttypes.h>’ macros.  If you
-have defined your own similar macros, let’s say ‘MYPRId64’, that are not
-known to ‘xgettext’, the solution for this problem is to change the code
-like this:
+   This works only for the predefined `<inttypes.h>' macros.  If you
+have defined your own similar macros, let's say `MYPRId64', that are
+not known to `xgettext', the solution for this problem is to change the
+code like this:
 
      char buf1[100];
      sprintf (buf1, "%0" MYPRId64, number);
      printf (gettext ("The amount is %s\n"), buf1);
 
-   This means, you put the platform dependent code in one statement, and
-the internationalization code in a different statement.  Note that a
-buffer length of 100 is safe, because all available hardware integer
+   This means, you put the platform dependent code in one statement,
+and the internationalization code in a different statement.  Note that
+a buffer length of 100 is safe, because all available hardware integer
 types are limited to 128 bits, and to print a 128 bit integer one needs
 at most 54 characters, regardless whether in decimal, octal or
 hexadecimal.
@@ -1830,24 +1818,25 @@
 translatable strings.  Translators will likely not understand the
 particular meaning of the markup or control characters.
 
-   For example, if you have a convention that ‘|’ delimits the left-hand
-and right-hand part of some GUI elements, translators will often not
-understand it without specific comments.  It might be better to have the
-translator translate the left-hand and right-hand part separately.
+   For example, if you have a convention that `|' delimits the
+left-hand and right-hand part of some GUI elements, translators will
+often not understand it without specific comments.  It might be better
+to have the translator translate the left-hand and right-hand part
+separately.
 
-   Another example is the ‘argp’ convention to use a single ‘\v’
+   Another example is the `argp' convention to use a single `\v'
 (vertical tab) control character to delimit two sections inside a
 string.  This is flawed.  Some translators may convert it to a simple
 newline, some to blank lines.  With some PO file editors it may not be
 easy to even enter a vertical tab control character.  So, you cannot be
-sure that the translation will contain a ‘\v’ character, at the
+sure that the translation will contain a `\v' character, at the
 corresponding position.  The solution is, again, to let the translator
 translate two separate strings and combine at run-time the two
-translated strings with the ‘\v’ required by the convention.
+translated strings with the `\v' required by the convention.
 
-   HTML markup, however, is common enough that it’s probably ok to use
+   HTML markup, however, is common enough that it's probably ok to use
 in translatable strings.  But please bear in mind that the GNU gettext
-tools don’t verify that the translations are well-formed HTML.
+tools don't verify that the translations are well-formed HTML.
 
 
 File: gettext.info,  Node: Mark Keywords,  Next: Marking,  Prev: Preparing Strings,  Up: Sources
@@ -1859,13 +1848,13 @@
 Marking is done in such a way that each translatable string appears to
 be the sole argument of some function or preprocessor macro.  There are
 only a few such possible functions or macros meant for translation, and
-their names are said to be marking keywords.  The marking is attached to
-strings themselves, rather than to what we do with them.  This approach
-has more uses.  A blatant example is an error message produced by
-formatting.  The format string needs translation, as well as some
-strings inserted through some ‘%s’ specification in the format, while
-the result from ‘sprintf’ may have so many different instances that it
-is impractical to list them all in some ‘error_string_out()’ routine,
+their names are said to be marking keywords.  The marking is attached
+to strings themselves, rather than to what we do with them.  This
+approach has more uses.  A blatant example is an error message produced
+by formatting.  The format string needs translation, as well as some
+strings inserted through some `%s' specification in the format, while
+the result from `sprintf' may have so many different instances that it
+is impractical to list them all in some `error_string_out()' routine,
 say.
 
    This marking operation has two goals.  The first goal of marking is
@@ -1873,64 +1862,64 @@
 keyword is possibly resolved into a routine able to dynamically return
 the proper translation, as far as possible or wanted, for the argument
 string.  Most localizable strings are found in executable positions,
-that is, attached to variables or given as parameters to functions.  But
-this is not universal usage, and some translatable strings appear in
-structured initializations.  *Note Special cases::.
+that is, attached to variables or given as parameters to functions.
+But this is not universal usage, and some translatable strings appear
+in structured initializations.  *Note Special cases::.
 
-   The second goal of the marking operation is to help ‘xgettext’ at
+   The second goal of the marking operation is to help `xgettext' at
 properly extracting all translatable strings when it scans a set of
 program sources and produces PO file templates.
 
-   The canonical keyword for marking translatable strings is ‘gettext’,
-it gave its name to the whole GNU ‘gettext’ package.  For packages
-making only light use of the ‘gettext’ keyword, macro or function, it is
-easily used _as is_.  However, for packages using the ‘gettext’
+   The canonical keyword for marking translatable strings is `gettext',
+it gave its name to the whole GNU `gettext' package.  For packages
+making only light use of the `gettext' keyword, macro or function, it
+is easily used _as is_.  However, for packages using the `gettext'
 interface more heavily, it is usually more convenient to give the main
 keyword a shorter, less obtrusive name.  Indeed, the keyword might
-appear on a lot of strings all over the package, and programmers usually
-do not want nor need their program sources to remind them forcefully,
-all the time, that they are internationalized.  Further, a long keyword
-has the disadvantage of using more horizontal space, forcing more
-indentation work on sources for those trying to keep them within 79 or
-80 columns.
-
-   Many packages use ‘_’ (a simple underline) as a keyword, and write
-‘_("Translatable string")’ instead of ‘gettext ("Translatable string")’.
-Further, the coding rule, from GNU standards, wanting that there is a
-space between the keyword and the opening parenthesis is relaxed, in
-practice, for this particular usage.  So, the textual overhead per
-translatable string is reduced to only three characters: the underline
-and the two parentheses.  However, even if GNU ‘gettext’ uses this
-convention internally, it does not offer it officially.  The real,
-genuine keyword is truly ‘gettext’ indeed.  It is fairly easy for those
-wanting to use ‘_’ instead of ‘gettext’ to declare:
+appear on a lot of strings all over the package, and programmers
+usually do not want nor need their program sources to remind them
+forcefully, all the time, that they are internationalized.  Further, a
+long keyword has the disadvantage of using more horizontal space,
+forcing more indentation work on sources for those trying to keep them
+within 79 or 80 columns.
+
+   Many packages use `_' (a simple underline) as a keyword, and write
+`_("Translatable string")' instead of `gettext ("Translatable
+string")'.  Further, the coding rule, from GNU standards, wanting that
+there is a space between the keyword and the opening parenthesis is
+relaxed, in practice, for this particular usage.  So, the textual
+overhead per translatable string is reduced to only three characters:
+the underline and the two parentheses.  However, even if GNU `gettext'
+uses this convention internally, it does not offer it officially.  The
+real, genuine keyword is truly `gettext' indeed.  It is fairly easy for
+those wanting to use `_' instead of `gettext' to declare:
 
      #include <libintl.h>
      #define _(String) gettext (String)
 
-instead of merely using ‘#include <libintl.h>’.
+instead of merely using `#include <libintl.h>'.
 
-   The marking keywords ‘gettext’ and ‘_’ take the translatable string
+   The marking keywords `gettext' and `_' take the translatable string
 as sole argument.  It is also possible to define marking functions that
 take it at another argument position.  It is even possible to make the
 marked argument position depend on the total number of arguments of the
 function call; this is useful in C++.  All this is achieved using
-‘xgettext’’s ‘--keyword’ option.  How to pass such an option to
-‘xgettext’, assuming that ‘gettextize’ is used, is described in *note
+`xgettext''s `--keyword' option.  How to pass such an option to
+`xgettext', assuming that `gettextize' is used, is described in *note
 po/Makevars:: and *note AM_XGETTEXT_OPTION::.
 
    Note also that long strings can be split across lines, into multiple
 adjacent string tokens.  Automatic string concatenation is performed at
-compile time according to ISO C and ISO C++; ‘xgettext’ also supports
+compile time according to ISO C and ISO C++; `xgettext' also supports
 this syntax.
 
    Later on, the maintenance is relatively easy.  If, as a programmer,
 you add or modify a string, you will have to ask yourself if the new or
-altered string requires translation, and include it within ‘_()’ if you
-think it should be translated.  For example, ‘"%s"’ is an example of
-string _not_ requiring translation.  But ‘"%s: %d"’ _does_ require
-translation, because in French, unlike in English, it’s customary to put
-a space before a colon.
+altered string requires translation, and include it within `_()' if you
+think it should be translated.  For example, `"%s"' is an example of
+string _not_ requiring translation.  But `"%s: %d"' _does_ require
+translation, because in French, unlike in English, it's customary to
+put a space before a colon.
 
 
 File: gettext.info,  Node: Marking,  Next: c-format Flag,  Prev: Mark Keywords,  Up: Sources
@@ -1945,9 +1934,9 @@
 strings by other means, using any editor of his choice, PO mode makes
 this work more comfortable.  Further, this gives translators who feel a
 little like programmers, or programmers who feel a little like
-translators, a tool letting them work at marking translatable strings in
-the program sources, while simultaneously producing a set of translation
-in some language, for the package being internationalized.
+translators, a tool letting them work at marking translatable strings
+in the program sources, while simultaneously producing a set of
+translation in some language, for the package being internationalized.
 
    The set of program sources, targeted by the PO mode commands describe
 here, should have an Emacs tags table constructed for your project,
@@ -1957,16 +1946,17 @@
 
      etags src/*.[hc] lib/*.[hc]
 
-presuming here you want to process all ‘.h’ and ‘.c’ files from the
-‘src/’ and ‘lib/’ directories.  This command will explore all said files
-and create a ‘TAGS’ file in your root directory, somewhat summarizing
-the contents using a special file format Emacs can understand.
-
-   For packages following the GNU coding standards, there is a make goal
-‘tags’ or ‘TAGS’ which constructs the tag files in all directories and
-for all files containing source code.
+presuming here you want to process all `.h' and `.c' files from the
+`src/' and `lib/' directories.  This command will explore all said
+files and create a `TAGS' file in your root directory, somewhat
+summarizing the contents using a special file format Emacs can
+understand.
+
+   For packages following the GNU coding standards, there is a make
+goal `tags' or `TAGS' which constructs the tag files in all directories
+and for all files containing source code.
 
-   Once your ‘TAGS’ file is ready, the following commands assist the
+   Once your `TAGS' file is ready, the following commands assist the
 programmer at marking translatable strings in his set of sources.  But
 these commands are necessarily driven from within a PO file window, and
 it is likely that you do not even have such a PO file yet.  This is not
@@ -1974,105 +1964,107 @@
 for using these commands.  This empty PO file will slowly fill in while
 you mark strings as translatable in your program sources.
 
-‘,’
+`,'
      Search through program sources for a string which looks like a
-     candidate for translation (‘po-tags-search’).
+     candidate for translation (`po-tags-search').
 
-‘M-,’
-     Mark the last string found with ‘_()’ (‘po-mark-translatable’).
+`M-,'
+     Mark the last string found with `_()' (`po-mark-translatable').
 
-‘M-.’
+`M-.'
      Mark the last string found with a keyword taken from a set of
      possible keywords.  This command with a prefix allows some
-     management of these keywords (‘po-select-mark-and-mark’).
+     management of these keywords (`po-select-mark-and-mark').
+
 
-   The ‘,’ (‘po-tags-search’) command searches for the next occurrence
+   The `,' (`po-tags-search') command searches for the next occurrence
 of a string which looks like a possible candidate for translation, and
 displays the program source in another Emacs window, positioned in such
 a way that the string is near the top of this other window.  If the
 string is too big to fit whole in this window, it is positioned so only
 its end is shown.  In any case, the cursor is left in the PO file
 window.  If the shown string would be better presented differently in
-different native languages, you may mark it using ‘M-,’ or ‘M-.’.
+different native languages, you may mark it using `M-,' or `M-.'.
 Otherwise, you might rather ignore it and skip to the next string by
-merely repeating the ‘,’ command.
+merely repeating the `,' command.
 
    A string is a good candidate for translation if it contains a
 sequence of three or more letters.  A string containing at most two
 letters in a row will be considered as a candidate if it has more
 letters than non-letters.  The command disregards strings containing no
 letters, or isolated letters only.  It also disregards strings within
-comments, or strings already marked with some keyword PO mode knows (see
-below).
+comments, or strings already marked with some keyword PO mode knows
+(see below).
 
-   If you have never told Emacs about some ‘TAGS’ file to use, the
-command will request that you specify one from the minibuffer, the first
-time you use the command.  You may later change your ‘TAGS’ file by
-using the regular Emacs command ‘M-x visit-tags-table’, which will ask
-you to name the precise ‘TAGS’ file you want to use.  *Note Tag Tables:
-(emacs)Tags.
+   If you have never told Emacs about some `TAGS' file to use, the
+command will request that you specify one from the minibuffer, the
+first time you use the command.  You may later change your `TAGS' file
+by using the regular Emacs command `M-x visit-tags-table', which will
+ask you to name the precise `TAGS' file you want to use.  *Note Tag
+Tables: (emacs)Tags.
 
-   Each time you use the ‘,’ command, the search resumes from where it
+   Each time you use the `,' command, the search resumes from where it
 was left by the previous search, and goes through all program sources,
-obeying the ‘TAGS’ file, until all sources have been processed.
-However, by giving a prefix argument to the command (‘C-u ,’), you may
+obeying the `TAGS' file, until all sources have been processed.
+However, by giving a prefix argument to the command (`C-u ,'), you may
 request that the search be restarted all over again from the first
 program source; but in this case, strings that you recently marked as
 translatable will be automatically skipped.
 
-   Using this ‘,’ command does not prevent using of other regular Emacs
-tags commands.  For example, regular ‘tags-search’ or
-‘tags-query-replace’ commands may be used without disrupting the
-independent ‘,’ search sequence.  However, as implemented, the _initial_
-‘,’ command (or the ‘,’ command is used with a prefix) might also
-reinitialize the regular Emacs tags searching to the first tags file,
-this reinitialization might be considered spurious.
-
-   The ‘M-,’ (‘po-mark-translatable’) command will mark the recently
-found string with the ‘_’ keyword.  The ‘M-.’
-(‘po-select-mark-and-mark’) command will request that you type one
-keyword from the minibuffer and use that keyword for marking the string.
-Both commands will automatically create a new PO file untranslated entry
-for the string being marked, and make it the current entry (making it
-easy for you to immediately proceed to its translation, if you feel like
-doing it right away).  It is possible that the modifications made to the
-program source by ‘M-,’ or ‘M-.’ render some source line longer than 80
-columns, forcing you to break and re-indent this line differently.  You
-may use the ‘O’ command from PO mode, or any other window changing
-command from Emacs, to break out into the program source window, and do
-any needed adjustments.  You will have to use some regular Emacs command
-to return the cursor to the PO file window, if you want command ‘,’ for
-the next string, say.
+   Using this `,' command does not prevent using of other regular Emacs
+tags commands.  For example, regular `tags-search' or
+`tags-query-replace' commands may be used without disrupting the
+independent `,' search sequence.  However, as implemented, the
+_initial_ `,' command (or the `,' command is used with a prefix) might
+also reinitialize the regular Emacs tags searching to the first tags
+file, this reinitialization might be considered spurious.
+
+   The `M-,' (`po-mark-translatable') command will mark the recently
+found string with the `_' keyword.  The `M-.'
+(`po-select-mark-and-mark') command will request that you type one
+keyword from the minibuffer and use that keyword for marking the
+string.  Both commands will automatically create a new PO file
+untranslated entry for the string being marked, and make it the current
+entry (making it easy for you to immediately proceed to its
+translation, if you feel like doing it right away).  It is possible
+that the modifications made to the program source by `M-,' or `M-.'
+render some source line longer than 80 columns, forcing you to break
+and re-indent this line differently.  You may use the `O' command from
+PO mode, or any other window changing command from Emacs, to break out
+into the program source window, and do any needed adjustments.  You
+will have to use some regular Emacs command to return the cursor to the
+PO file window, if you want command `,' for the next string, say.
 
-   The ‘M-.’ command has a few built-in speedups, so you do not have to
+   The `M-.' command has a few built-in speedups, so you do not have to
 explicitly type all keywords all the time.  The first such speedup is
 that you are presented with a _preferred_ keyword, which you may accept
-by merely typing ‘<RET>’ at the prompt.  The second speedup is that you
+by merely typing `<RET>' at the prompt.  The second speedup is that you
 may type any non-ambiguous prefix of the keyword you really mean, and
 the command will complete it automatically for you.  This also means
 that PO mode has to _know_ all your possible keywords, and that it will
 not accept mistyped keywords.
 
-   If you reply ‘?’ to the keyword request, the command gives a list of
+   If you reply `?' to the keyword request, the command gives a list of
 all known keywords, from which you may choose.  When the command is
-prefixed by an argument (‘C-u M-.’), it inhibits updating any program
+prefixed by an argument (`C-u M-.'), it inhibits updating any program
 source or PO file buffer, and does some simple keyword management
-instead.  In this case, the command asks for a keyword, written in full,
-which becomes a new allowed keyword for later ‘M-.’ commands.  Moreover,
-this new keyword automatically becomes the _preferred_ keyword for later
-commands.  By typing an already known keyword in response to ‘C-u M-.’,
-one merely changes the _preferred_ keyword and does nothing more.
+instead.  In this case, the command asks for a keyword, written in
+full, which becomes a new allowed keyword for later `M-.' commands.
+Moreover, this new keyword automatically becomes the _preferred_
+keyword for later commands.  By typing an already known keyword in
+response to `C-u M-.', one merely changes the _preferred_ keyword and
+does nothing more.
 
-   All keywords known for ‘M-.’ are recognized by the ‘,’ command when
+   All keywords known for `M-.' are recognized by the `,' command when
 scanning for strings, and strings already marked by any of those known
 keywords are automatically skipped.  If many PO files are opened
 simultaneously, each one has its own independent set of known keywords.
 There is no provision in PO mode, currently, for deleting a known
-keyword, you have to quit the file (maybe using ‘q’) and reopen it
+keyword, you have to quit the file (maybe using `q') and reopen it
 afresh.  When a PO file is newly brought up in an Emacs window, only
-‘gettext’ and ‘_’ are known as keywords, and ‘gettext’ is preferred for
-the ‘M-.’ command.  In fact, this is not useful to prefer ‘_’, as this
-one is already built in the ‘M-,’ command.
+`gettext' and `_' are known as keywords, and `gettext' is preferred for
+the `M-.' command.  In fact, this is not useful to prefer `_', as this
+one is already built in the `M-,' command.
 
 
 File: gettext.info,  Node: c-format Flag,  Next: Special cases,  Prev: Marking,  Up: Sources
@@ -2081,8 +2073,8 @@
 =======================================
 
    In C programs strings are often used within calls of functions from
-the ‘printf’ family.  The special thing about these format strings is
-that they can contain format specifiers introduced with ‘%’.  Assume we
+the `printf' family.  The special thing about these format strings is
+that they can contain format specifiers introduced with `%'.  Assume we
 have the code
 
      printf (gettext ("String `%s' has %d characters\n"), s, strlen (s));
@@ -2093,64 +2085,65 @@
 
    A C programmer, even if he cannot speak German, will recognize that
 there is something wrong here.  The order of the two format specifiers
-is changed but of course the arguments in the ‘printf’ don’t have.  This
-will most probably lead to problems because now the length of the string
-is regarded as the address.
+is changed but of course the arguments in the `printf' don't have.
+This will most probably lead to problems because now the length of the
+string is regarded as the address.
 
-   To prevent errors at runtime caused by translations, the ‘msgfmt’
+   To prevent errors at runtime caused by translations the `msgfmt'
 tool can check statically whether the arguments in the original and the
 translation string match in type and number.  If this is not the case
-and the ‘-c’ option has been passed to ‘msgfmt’, ‘msgfmt’ will give an
-error and refuse to produce a MO file.  Thus consistent use of ‘msgfmt
--c’ will catch the error, so that it cannot cause problems at runtime.
+and the `-c' option has been passed to `msgfmt', `msgfmt' will give an
+error and refuse to produce a MO file.  Thus consequent use of `msgfmt
+-c' will catch the error, so that it cannot cause cause problems at
+runtime.
 
 If the word order in the above German translation would be correct one
 would have to write
 
      "%2$d Zeichen lang ist die Zeichenkette `%1$s'"
 
-The routines in ‘msgfmt’ know about this special notation.
+The routines in `msgfmt' know about this special notation.
 
-   Because not all strings in a program will be format strings, it is
-not useful for ‘msgfmt’ to test all the strings in the ‘.po’ file.  This
+   Because not all strings in a program must be format strings it is not
+useful for `msgfmt' to test all the strings in the `.po' file.  This
 might cause problems because the string might contain what looks like a
-format specifier, but the string is not used in ‘printf’.
+format specifier, but the string is not used in `printf'.
 
-   Therefore ‘xgettext’ adds a special tag to those messages it thinks
-might be a format string.  There is no absolute rule for this, only a
-heuristic.  In the ‘.po’ file the entry is marked using the ‘c-format’
-flag in the ‘#,’ comment line (*note PO Files::).
+   Therefore the `xgettext' adds a special tag to those messages it
+thinks might be a format string.  There is no absolute rule for this,
+only a heuristic.  In the `.po' file the entry is marked using the
+`c-format' flag in the `#,' comment line (*note PO Files::).
 
    The careful reader now might say that this again can cause problems.
 The heuristic might guess it wrong.  This is true and therefore
-‘xgettext’ knows about a special kind of comment which lets the
+`xgettext' knows about a special kind of comment which lets the
 programmer take over the decision.  If in the same line as or the
-immediately preceding line to the ‘gettext’ keyword the ‘xgettext’
-program finds a comment containing the words ‘xgettext:c-format’, it
-will mark the string in any case with the ‘c-format’ flag.  This kind of
-comment should be used when ‘xgettext’ does not recognize the string as
-a format string but it really is one and it should be tested.  Please
-note that when the comment is in the same line as the ‘gettext’ keyword,
-it must be before the string to be translated.
+immediately preceding line to the `gettext' keyword the `xgettext'
+program finds a comment containing the words `xgettext:c-format', it
+will mark the string in any case with the `c-format' flag.  This kind
+of comment should be used when `xgettext' does not recognize the string
+as a format string but it really is one and it should be tested.
+Please note that when the comment is in the same line as the `gettext'
+keyword, it must be before the string to be translated.
 
-   This situation happens quite often.  The ‘printf’ function is often
+   This situation happens quite often.  The `printf' function is often
 called with strings which do not contain a format specifier.  Of course
-one would normally use ‘fputs’ but it does happen.  In this case
-‘xgettext’ does not recognize this as a format string but what happens
-if the translation introduces a valid format specifier?  The ‘printf’
+one would normally use `fputs' but it does happen.  In this case
+`xgettext' does not recognize this as a format string but what happens
+if the translation introduces a valid format specifier?  The `printf'
 function will try to access one of the parameters but none exists
 because the original code does not pass any parameters.
 
-   ‘xgettext’ of course could make a wrong decision the other way round,
-i.e. a string marked as a format string actually is not a format string.
-In this case the ‘msgfmt’ might give too many warnings and would prevent
-translating the ‘.po’ file.  The method to prevent this wrong decision
-is similar to the one used above, only the comment to use must contain
-the string ‘xgettext:no-c-format’.
+   `xgettext' of course could make a wrong decision the other way
+round, i.e. a string marked as a format string actually is not a format
+string.  In this case the `msgfmt' might give too many warnings and
+would prevent translating the `.po' file.  The method to prevent this
+wrong decision is similar to the one used above, only the comment to
+use must contain the string `xgettext:no-c-format'.
 
-   If a string is marked with ‘c-format’ and this is not correct the
+   If a string is marked with `c-format' and this is not correct the
 user can find out who is responsible for the decision.  See *note
-xgettext Invocation:: to see how the ‘--debug’ option can be used for
+xgettext Invocation:: to see how the `--debug' option can be used for
 solving this problem.
 
 
@@ -2160,7 +2153,7 @@
 =========================================
 
    The attentive reader might now point out that it is not always
-possible to mark translatable string with ‘gettext’ or something like
+possible to mark translatable string with `gettext' or something like
 this.  Consider the following case:
 
      {
@@ -2169,20 +2162,20 @@
          "and another one"
        };
        const char *string;
-       …
+       ...
        string
          = index > 1 ? "a default message" : messages[index];
 
        fputs (string);
-       …
+       ...
      }
 
-   While it is no problem to mark the string ‘"a default message"’ it is
-not possible to mark the string initializers for ‘messages’.  What is to
-be done?  We have to fulfill two tasks.  First we have to mark the
-strings so that the ‘xgettext’ program (*note xgettext Invocation::) can
-find them, and second we have to translate the string at runtime before
-printing them.
+   While it is no problem to mark the string `"a default message"' it
+is not possible to mark the string initializers for `messages'.  What
+is to be done?  We have to fulfill two tasks.  First we have to mark the
+strings so that the `xgettext' program (*note xgettext Invocation::)
+can find them, and second we have to translate the string at runtime
+before printing them.
 
    The first task can be fulfilled by creating a new keyword, which
 names a no-op.  For the second we have to mark all access points to a
@@ -2196,17 +2189,17 @@
          gettext_noop ("and another one")
        };
        const char *string;
-       …
+       ...
        string
          = index > 1 ? gettext ("a default message") : gettext (messages[index]);
 
        fputs (string);
-       …
+       ...
      }
 
-   Please convince yourself that the string which is written by ‘fputs’
-is translated in any case.  How to get ‘xgettext’ know the additional
-keyword ‘gettext_noop’ is explained in *note xgettext Invocation::.
+   Please convince yourself that the string which is written by `fputs'
+is translated in any case.  How to get `xgettext' know the additional
+keyword `gettext_noop' is explained in *note xgettext Invocation::.
 
    The above is of course not the only solution.  You could also come
 along with the following one:
@@ -2219,17 +2212,17 @@
          gettext_noop ("and another one")
        };
        const char *string;
-       …
+       ...
        string
          = index > 1 ? gettext_noop ("a default message") : messages[index];
 
        fputs (gettext (string));
-       …
+       ...
      }
 
    But this has a drawback.  The programmer has to take care that he
-uses ‘gettext_noop’ for the string ‘"a default message"’.  A use of
-‘gettext’ could have in rare cases unpredictable results.
+uses `gettext_noop' for the string `"a default message"'.  A use of
+`gettext' could have in rare cases unpredictable results.
 
    One advantage is that you need not make control flow analysis to make
 sure the output is really translated in any case.  But this analysis is
@@ -2243,9 +2236,9 @@
 =========================================
 
    Code sometimes has bugs, but translations sometimes have bugs too.
-The users need to be able to report them.  Reporting translation bugs to
-the programmer or maintainer of a package is not very useful, since the
-maintainer must never change a translation, except on behalf of the
+The users need to be able to report them.  Reporting translation bugs
+to the programmer or maintainer of a package is not very useful, since
+the maintainer must never change a translation, except on behalf of the
 translator.  Hence the translation bugs must be reported to the
 translators.
 
@@ -2254,10 +2247,10 @@
 addresses of the translators or their translation teams.
 
    Every program has a place where is shows the bug report address.  For
-GNU programs, it is the code which handles the “–help” option, typically
-in a function called “usage”.  In this place, instruct the translator to
-add her own bug reporting address.  For example, if that code has a
-statement
+GNU programs, it is the code which handles the "-help" option,
+typically in a function called "usage".  In this place, instruct the
+translator to add her own bug reporting address.  For example, if that
+code has a statement
 
      printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 
@@ -2269,7 +2262,7 @@
         bugs (typically your translation team's web or email address).  */
      printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 
-   These will be extracted by ‘xgettext’, leading to a .pot file that
+   These will be extracted by `xgettext', leading to a .pot file that
 contains this:
 
      #. TRANSLATORS: The placeholder indicates the bug-reporting address
@@ -2287,10 +2280,10 @@
 4.9 Marking Proper Names for Translation
 ========================================
 
-   Should names of persons, cities, locations etc.  be marked for
+   Should names of persons, cities, locations etc. be marked for
 translation or not?  People who only know languages that can be written
-with Latin letters (English, Spanish, French, German, etc.)  are tempted
-to say “no”, because names usually do not change when transported
+with Latin letters (English, Spanish, French, German, etc.) are tempted
+to say "no", because names usually do not change when transported
 between these languages.  However, in general when translating from one
 script to another, names are translated too, usually phonetically or by
 transliteration.  For example, Russian or Greek names are converted to
@@ -2313,13 +2306,13 @@
                 Pronunciation is like "fraa-swa pee-nar".  */
              _("Francois Pinard"));
 
-The GNU gnulib library offers a module ‘propername’
-(<http://www.gnu.org/software/gnulib/MODULES.html#module=propername>)
+The GNU gnulib library offers a module `propername'
+(`http://www.gnu.org/software/gnulib/MODULES.html#module=propername')
 which takes care to automatically append the original name, in
 parentheses, to the translated name.  For names that cannot be written
 in ASCII, it also frees the translator from the task of entering the
-appropriate non-ASCII characters if no script change is needed.  In this
-more comfortable form, it looks like this:
+appropriate non-ASCII characters if no script change is needed.  In
+this more comfortable form, it looks like this:
 
      printf (_("Written by %s and %s.\n"),
              proper_name ("Ulrich Drepper"),
@@ -2333,7 +2326,7 @@
 You can also write the original name directly in Unicode (rather than
 with Unicode escapes or HTML entities) and denote the pronunciation
 using the International Phonetic Alphabet (see
-<http://www.wikipedia.org/wiki/International_Phonetic_Alphabet>).
+`http://www.wikipedia.org/wiki/International_Phonetic_Alphabet').
 
    As a translator, you should use some care when translating names,
 because it is frustrating if people see their names mutilated or
@@ -2342,15 +2335,15 @@
    If your language uses the Latin script, all you need to do is to
 reproduce the name as perfectly as you can within the usual character
 set of your language.  In this particular case, this means to provide a
-translation containing the c-cedilla character.  If your language uses a
-different script and the people speaking it don’t usually read Latin
+translation containing the c-cedilla character.  If your language uses
+a different script and the people speaking it don't usually read Latin
 words, it means transliteration.  If the programmer used the simple
-case, you should still give, in parentheses, the original writing of the
-name – for the sake of the people that do read the Latin script.  If the
-programmer used the ‘propername’ module mentioned above, you don’t need
-to give the original writing of the name in parentheses, because the
-program will already do so.  Here is an example, using Greek as the
-target script:
+case, you should still give, in parentheses, the original writing of
+the name - for the sake of the people that do read the Latin script.
+If the programmer used the `propername' module mentioned above, you
+don't need to give the original writing of the name in parentheses,
+because the program will already do so.  Here is an example, using
+Greek as the target script:
 
      #. This is a proper name.  See the gettext
      #. manual, section Names.  Note this is actually a non-ASCII
@@ -2371,17 +2364,17 @@
 ==============================
 
    When you are preparing a library, not a program, for the use of
-‘gettext’, only a few details are different.  Here we assume that the
-library has a translation domain and a POT file of its own.  (If it uses
-the translation domain and POT file of the main program, then the
+`gettext', only a few details are different.  Here we assume that the
+library has a translation domain and a POT file of its own.  (If it
+uses the translation domain and POT file of the main program, then the
 previous sections apply without changes.)
 
-  1. The library code doesn’t call ‘setlocale (LC_ALL, "")’.  It’s the
+  1. The library code doesn't call `setlocale (LC_ALL, "")'.  It's the
      responsibility of the main program to set the locale.  The
-     library’s documentation should mention this fact, so that
+     library's documentation should mention this fact, so that
      developers of programs using the library are aware of it.
 
-  2. The library code doesn’t call ‘textdomain (PACKAGE)’, because it
+  2. The library code doesn't call `textdomain (PACKAGE)', because it
      would interfere with the text domain set by the main program.
 
   3. The initialization code for a program was
@@ -2394,14 +2387,14 @@
 
             bindtextdomain (PACKAGE, LOCALEDIR);
 
-     If your library’s API doesn’t already have an initialization
+     If your library's API doesn't already have an initialization
      function, you need to create one, containing at least the
-     ‘bindtextdomain’ invocation.  However, you usually don’t need to
+     `bindtextdomain' invocation.  However, you usually don't need to
      export and document this initialization function: It is sufficient
      that all entry points of the library call the initialization
-     function if it hasn’t been called before.  The typical idiom used
-     to achieve this is a static boolean variable that indicates whether
-     the initialization function has been called.  Like this:
+     function if it hasn't been called before.  The typical idiom used
+     to achieve this is a static boolean variable that indicates
+     whether the initialization function has been called. Like this:
 
           static bool libfoo_initialized;
 
@@ -2432,7 +2425,7 @@
             ...
           }
 
-  4. The usual declaration of the ‘_’ macro in each source file was
+  4. The usual declaration of the `_' macro in each source file was
 
           #include <libintl.h>
           #define _(String) gettext (String)
@@ -2443,9 +2436,9 @@
           #include <libintl.h>
           #define _(String) dgettext (PACKAGE, String)
 
-     In other words, ‘dgettext’ is used instead of ‘gettext’.
-     Similarly, the ‘dngettext’ function should be used in place of the
-     ‘ngettext’ function.
+     In other words, `dgettext' is used instead of `gettext'.
+     Similarly, the `dngettext' function should be used in place of the
+     `ngettext' function.
 
 
 File: gettext.info,  Node: Template,  Next: Creating,  Prev: Sources,  Up: Top
@@ -2454,83 +2447,85 @@
 *****************************
 
    After preparing the sources, the programmer creates a PO template
-file.  This section explains how to use ‘xgettext’ for this purpose.
+file.  This section explains how to use `xgettext' for this purpose.
 
-   ‘xgettext’ creates a file named ‘DOMAINNAME.po’.  You should then
-rename it to ‘DOMAINNAME.pot’.  (Why doesn’t ‘xgettext’ create it under
-the name ‘DOMAINNAME.pot’ right away?  The answer is: for historical
-reasons.  When ‘xgettext’ was specified, the distinction between a PO
-file and PO file template was fuzzy, and the suffix ‘.pot’ wasn’t in use
-at that time.)
+   `xgettext' creates a file named `DOMAINNAME.po'.  You should then
+rename it to `DOMAINNAME.pot'.  (Why doesn't `xgettext' create it under
+the name `DOMAINNAME.pot' right away?  The answer is: for historical
+reasons.  When `xgettext' was specified, the distinction between a PO
+file and PO file template was fuzzy, and the suffix `.pot' wasn't in
+use at that time.)
 
 * Menu:
 
-* xgettext Invocation::         Invoking the ‘xgettext’ Program
+* xgettext Invocation::         Invoking the `xgettext' Program
 
 
 File: gettext.info,  Node: xgettext Invocation,  Prev: Template,  Up: Template
 
-5.1 Invoking the ‘xgettext’ Program
+5.1 Invoking the `xgettext' Program
 ===================================
 
-     xgettext [OPTION] [INPUTFILE] …
+     xgettext [OPTION] [INPUTFILE] ...
 
-   The ‘xgettext’ program extracts translatable strings from given input
-files.
+   The `xgettext' program extracts translatable strings from given
+input files.
 
 5.1.1 Input file location
 -------------------------
 
-‘INPUTFILE …’
+`INPUTFILE ...'
      Input files.
 
-‘-f FILE’
-‘--files-from=FILE’
-     Read the names of the input files from FILE instead of getting them
-     from the command line.
+`-f FILE'
+`--files-from=FILE'
+     Read the names of the input files from FILE instead of getting
+     them from the command line.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If INPUTFILE is ‘-’, standard input is read.
+
+   If INPUTFILE is `-', standard input is read.
 
 5.1.2 Output file location
 --------------------------
 
-‘-d NAME’
-‘--default-domain=NAME’
-     Use ‘NAME.po’ for output (instead of ‘messages.po’).
-
-‘-o FILE’
-‘--output=FILE’
-     Write output to specified file (instead of ‘NAME.po’ or
-     ‘messages.po’).
+`-d NAME'
+`--default-domain=NAME'
+     Use `NAME.po' for output (instead of `messages.po').
+
+`-o FILE'
+`--output=FILE'
+     Write output to specified file (instead of `NAME.po' or
+     `messages.po').
 
-‘-p DIR’
-‘--output-dir=DIR’
+`-p DIR'
+`--output-dir=DIR'
      Output files will be placed in directory DIR.
 
-   If the output FILE is ‘-’ or ‘/dev/stdout’, the output is written to
+
+   If the output FILE is `-' or `/dev/stdout', the output is written to
 standard output.
 
 5.1.3 Choice of input file language
 -----------------------------------
 
-‘-L NAME’
-‘--language=NAME’
+`-L NAME'
+`--language=NAME'
      Specifies the language of the input files.  The supported languages
-     are ‘C’, ‘C++’, ‘ObjectiveC’, ‘PO’, ‘Shell’, ‘Python’, ‘Lisp’,
-     ‘EmacsLisp’, ‘librep’, ‘Scheme’, ‘Smalltalk’, ‘Java’,
-     ‘JavaProperties’, ‘C#’, ‘awk’, ‘YCP’, ‘Tcl’, ‘Perl’, ‘PHP’,
-     ‘GCC-source’, ‘NXStringTable’, ‘RST’, ‘Glade’, ‘Lua’, ‘JavaScript’,
-     ‘Vala’, ‘GSettings’, ‘Desktop’.
-
-‘-C’
-‘--c++’
-     This is a shorthand for ‘--language=C++’.
+     are `C', `C++', `ObjectiveC', `PO', `Python', `Lisp', `EmacsLisp',
+     `librep', `Scheme', `Smalltalk', `Java', `JavaProperties', `C#',
+     `awk', `YCP', `Tcl', `Perl', `PHP', `GCC-source', `NXStringTable',
+     `RST', `Glade'.
+
+`-C'
+`--c++'
+     This is a shorthand for `--language=C++'.
+
 
    By default the language is guessed depending on the input file name
 extension.
@@ -2538,340 +2533,325 @@
 5.1.4 Input file interpretation
 -------------------------------
 
-‘--from-code=NAME’
+`--from-code=NAME'
      Specifies the encoding of the input files.  This option is needed
      only if some untranslated message strings or their corresponding
      comments contain non-ASCII characters.  Note that Tcl and Glade
      input files are always assumed to be in UTF-8, regardless of this
      option.
 
+
    By default the input files are assumed to be in ASCII.
 
 5.1.5 Operation mode
 --------------------
 
-‘-j’
-‘--join-existing’
+`-j'
+`--join-existing'
      Join messages with existing file.
 
-‘-x FILE’
-‘--exclude-file=FILE’
+`-x FILE'
+`--exclude-file=FILE'
      Entries from FILE are not extracted.  FILE should be a PO or POT
      file.
 
-‘-c[TAG]’
-‘--add-comments[=TAG]’
+`-c[TAG]'
+`--add-comments[=TAG]'
      Place comment blocks starting with TAG and preceding keyword lines
      in the output file.  Without a TAG, the option means to put _all_
      comment blocks preceding keyword lines in the output file.
 
+
 5.1.6 Language specific options
 -------------------------------
 
-‘-a’
-‘--extract-all’
+`-a'
+`--extract-all'
      Extract all strings.
 
      This option has an effect with most languages, namely C, C++,
      ObjectiveC, Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk,
-     Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript, Vala,
-     GSettings.
+     Tcl, Perl, PHP, GCC-source, Glade.
 
-‘-k[KEYWORDSPEC]’
-‘--keyword[=KEYWORDSPEC]’
+`-k[KEYWORDSPEC]'
+`--keyword[=KEYWORDSPEC]'
      Specify KEYWORDSPEC as an additional keyword to be looked for.
      Without a KEYWORDSPEC, the option means to not use default
      keywords.
 
-     If KEYWORDSPEC is a C identifier ID, ‘xgettext’ looks for strings
-     in the first argument of each call to the function or macro ID.  If
-     KEYWORDSPEC is of the form ‘ID:ARGNUM’, ‘xgettext’ looks for
-     strings in the ARGNUMth argument of the call.  If KEYWORDSPEC is of
-     the form ‘ID:ARGNUM1,ARGNUM2’, ‘xgettext’ looks for strings in the
-     ARGNUM1st argument and in the ARGNUM2nd argument of the call, and
-     treats them as singular/plural variants for a message with plural
-     handling.  Also, if KEYWORDSPEC is of the form
-     ‘ID:CONTEXTARGNUMc,ARGNUM’ or ‘ID:ARGNUM,CONTEXTARGNUMc’,
-     ‘xgettext’ treats strings in the CONTEXTARGNUMth argument as a
-     context specifier.  And, as a special-purpose support for GNOME, if
-     KEYWORDSPEC is of the form ‘ID:ARGNUMg’, ‘xgettext’ recognizes the
-     ARGNUMth argument as a string with context, using the GNOME ‘glib’
-     syntax ‘"msgctxt|msgid"’.
-     Furthermore, if KEYWORDSPEC is of the form ‘ID:…,TOTALNUMARGSt’,
-     ‘xgettext’ recognizes this argument specification only if the
+     If KEYWORDSPEC is a C identifier ID, `xgettext' looks for strings
+     in the first argument of each call to the function or macro ID.
+     If KEYWORDSPEC is of the form `ID:ARGNUM', `xgettext' looks for
+     strings in the ARGNUMth argument of the call.  If KEYWORDSPEC is
+     of the form `ID:ARGNUM1,ARGNUM2', `xgettext' looks for strings in
+     the ARGNUM1st argument and in the ARGNUM2nd argument of the call,
+     and treats them as singular/plural variants for a message with
+     plural handling.  Also, if KEYWORDSPEC is of the form
+     `ID:CONTEXTARGNUMc,ARGNUM' or `ID:ARGNUM,CONTEXTARGNUMc',
+     `xgettext' treats strings in the CONTEXTARGNUMth argument as a
+     context specifier.  And, as a special-purpose support for GNOME,
+     if KEYWORDSPEC is of the form `ID:ARGNUMg', `xgettext' recognizes
+     the ARGNUMth argument as a string with context, using the GNOME
+     `glib' syntax `"msgctxt|msgid"'.
+     Furthermore, if KEYWORDSPEC is of the form `ID:...,TOTALNUMARGSt',
+     `xgettext' recognizes this argument specification only if the
      number of actual arguments is equal to TOTALNUMARGS.  This is
      useful for disambiguating overloaded function calls in C++.
-     Finally, if KEYWORDSPEC is of the form ‘ID:ARGNUM...,"XCOMMENT"’,
-     ‘xgettext’, when extracting a message from the specified argument
+     Finally, if KEYWORDSPEC is of the form `ID:ARGNUM...,"XCOMMENT"',
+     `xgettext', when extracting a message from the specified argument
      strings, adds an extracted comment XCOMMENT to the message.  Note
      that when used through a normal shell command line, the
      double-quotes around the XCOMMENT need to be escaped.
 
      This option has an effect with most languages, namely C, C++,
      ObjectiveC, Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk,
-     Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript, Vala,
-     GSettings, Desktop.
+     Tcl, Perl, PHP, GCC-source, Glade.
 
      The default keyword specifications, which are always looked for if
      not explicitly disabled, are language dependent.  They are:
 
-        • For C, C++, and GCC-source: ‘gettext’, ‘dgettext:2’,
-          ‘dcgettext:2’, ‘ngettext:1,2’, ‘dngettext:2,3’,
-          ‘dcngettext:2,3’, ‘gettext_noop’, and ‘pgettext:1c,2’,
-          ‘dpgettext:2c,3’, ‘dcpgettext:2c,3’, ‘npgettext:1c,2,3’,
-          ‘dnpgettext:2c,3,4’, ‘dcnpgettext:2c,3,4’.
-
-        • For Objective C: Like for C, and also ‘NSLocalizedString’,
-          ‘_’, ‘NSLocalizedStaticString’, ‘__’.
-
-        • For Shell scripts: ‘gettext’, ‘ngettext:1,2’, ‘eval_gettext’,
-          ‘eval_ngettext:1,2’.
+        * For C, C++, and GCC-source: `gettext', `dgettext:2',
+          `dcgettext:2', `ngettext:1,2', `dngettext:2,3',
+          `dcngettext:2,3', `gettext_noop', and `pgettext:1c,2',
+          `dpgettext:2c,3', `dcpgettext:2c,3', `npgettext:1c,2,3',
+          `dnpgettext:2c,3,4', `dcnpgettext:2c,3,4'.
 
-        • For Python: ‘gettext’, ‘ugettext’, ‘dgettext:2’,
-          ‘ngettext:1,2’, ‘ungettext:1,2’, ‘dngettext:2,3’, ‘_’.
+        * For Objective C: Like for C, and also `NSLocalizedString',
+          `_', `NSLocalizedStaticString', `__'.
 
-        • For Lisp: ‘gettext’, ‘ngettext:1,2’, ‘gettext-noop’.
+        * For Shell scripts: `gettext', `ngettext:1,2', `eval_gettext',
+          `eval_ngettext:1,2'.
 
-        • For EmacsLisp: ‘_’.
+        * For Python: `gettext', `ugettext', `dgettext:2',
+          `ngettext:1,2', `ungettext:1,2', `dngettext:2,3', `_'.
 
-        • For librep: ‘_’.
+        * For Lisp: `gettext', `ngettext:1,2', `gettext-noop'.
 
-        • For Scheme: ‘gettext’, ‘ngettext:1,2’, ‘gettext-noop’.
+        * For EmacsLisp: `_'.
 
-        • For Java: ‘GettextResource.gettext:2’,
-          ‘GettextResource.ngettext:2,3’,
-          ‘GettextResource.pgettext:2c,3’,
-          ‘GettextResource.npgettext:2c,3,4’, ‘gettext’, ‘ngettext:1,2’,
-          ‘pgettext:1c,2’, ‘npgettext:1c,2,3’, ‘getString’.
+        * For librep: `_'.
 
-        • For C#: ‘GetString’, ‘GetPluralString:1,2’,
-          ‘GetParticularString:1c,2’,
-          ‘GetParticularPluralString:1c,2,3’.
+        * For Scheme: `gettext', `ngettext:1,2', `gettext-noop'.
 
-        • For awk: ‘dcgettext’, ‘dcngettext:1,2’.
+        * For Java: `GettextResource.gettext:2',
+          `GettextResource.ngettext:2,3',
+          `GettextResource.pgettext:2c,3',
+          `GettextResource.npgettext:2c,3,4', `gettext', `ngettext:1,2',
+          `pgettext:1c,2', `npgettext:1c,2,3', `getString'.
 
-        • For Tcl: ‘::msgcat::mc’.
+        * For C#: `GetString', `GetPluralString:1,2',
+          `GetParticularString:1c,2',
+          `GetParticularPluralString:1c,2,3'.
 
-        • For Perl: ‘gettext’, ‘%gettext’, ‘$gettext’, ‘dgettext:2’,
-          ‘dcgettext:2’, ‘ngettext:1,2’, ‘dngettext:2,3’,
-          ‘dcngettext:2,3’, ‘gettext_noop’.
+        * For awk: `dcgettext', `dcngettext:1,2'.
 
-        • For PHP: ‘_’, ‘gettext’, ‘dgettext:2’, ‘dcgettext:2’,
-          ‘ngettext:1,2’, ‘dngettext:2,3’, ‘dcngettext:2,3’.
+        * For Tcl: `::msgcat::mc'.
 
-        • For Glade 1: ‘label’, ‘title’, ‘text’, ‘format’, ‘copyright’,
-          ‘comments’, ‘preview_text’, ‘tooltip’.
+        * For Perl: `gettext', `%gettext', `$gettext', `dgettext:2',
+          `dcgettext:2', `ngettext:1,2', `dngettext:2,3',
+          `dcngettext:2,3', `gettext_noop'.
 
-        • For Lua: ‘_’, ‘gettext.gettext’, ‘gettext.dgettext:2’,
-          ‘gettext.dcgettext:2’, ‘gettext.ngettext:1,2’,
-          ‘gettext.dngettext:2,3’, ‘gettext.dcngettext:2,3’.
+        * For PHP: `_', `gettext', `dgettext:2', `dcgettext:2',
+          `ngettext:1,2', `dngettext:2,3', `dcngettext:2,3'.
 
-        • For JavaScript: ‘_’, ‘gettext’, ‘dgettext:2’, ‘dcgettext:2’,
-          ‘ngettext:1,2’, ‘dngettext:2,3’, ‘pgettext:1c,2’,
-          ‘dpgettext:2c,3’.
+        * For Glade 1: `label', `title', `text', `format', `copyright',
+          `comments', `preview_text', `tooltip'.
 
-        • For Vala: ‘_’, ‘Q_’, ‘N_’, ‘NC_’, ‘dgettext:2’, ‘dcgettext:2’,
-          ‘ngettext:1,2’, ‘dngettext:2,3’, ‘dpgettext:2c,3’,
-          ‘dpgettext2:2c,3’.
+     To disable the default keyword specifications, the option `-k' or
+     `--keyword' or `--keyword=', without a KEYWORDSPEC, can be used.
 
-        • For Desktop: ‘Name’, ‘GenericName’, ‘Comment’, ‘Icon’,
-          ‘Keywords’.
-
-     To disable the default keyword specifications, the option ‘-k’ or
-     ‘--keyword’ or ‘--keyword=’, without a KEYWORDSPEC, can be used.
-
-‘--flag=WORD:ARG:FLAG’
+`--flag=WORD:ARG:FLAG'
      Specifies additional flags for strings occurring as part of the
      ARGth argument of the function WORD.  The possible flags are the
-     possible format string indicators, such as ‘c-format’, and their
-     negations, such as ‘no-c-format’, possibly prefixed with ‘pass-’.
-     The meaning of ‘--flag=FUNCTION:ARG:LANG-format’ is that in
+     possible format string indicators, such as `c-format', and their
+     negations, such as `no-c-format', possibly prefixed with `pass-'.
+     The meaning of `--flag=FUNCTION:ARG:LANG-format' is that in
      language LANG, the specified FUNCTION expects as ARGth argument a
      format string.  (For those of you familiar with GCC function
-     attributes, ‘--flag=FUNCTION:ARG:c-format’ is roughly equivalent to
-     the declaration ‘__attribute__ ((__format__ (__printf__, ARG,
-     ...)))’ attached to FUNCTION in a C source file.)  For example, if
-     you use the ‘error’ function from GNU libc, you can specify its
-     behaviour through ‘--flag=error:3:c-format’.  The effect of this
-     specification is that ‘xgettext’ will mark as format strings all
-     ‘gettext’ invocations that occur as ARGth argument of FUNCTION.
+     attributes, `--flag=FUNCTION:ARG:c-format' is roughly equivalent
+     to the declaration `__attribute__ ((__format__ (__printf__, ARG,
+     ...)))' attached to FUNCTION in a C source file.)  For example, if
+     you use the `error' function from GNU libc, you can specify its
+     behaviour through `--flag=error:3:c-format'.  The effect of this
+     specification is that `xgettext' will mark as format strings all
+     `gettext' invocations that occur as ARGth argument of FUNCTION.
      This is useful when such strings contain no format string
-     directives: together with the checks done by ‘msgfmt -c’ it will
+     directives: together with the checks done by `msgfmt -c' it will
      ensure that translators cannot accidentally use format string
      directives that would lead to a crash at runtime.
-     The meaning of ‘--flag=FUNCTION:ARG:pass-LANG-format’ is that in
+     The meaning of `--flag=FUNCTION:ARG:pass-LANG-format' is that in
      language LANG, if the FUNCTION call occurs in a position that must
      yield a format string, then its ARGth argument must yield a format
      string of the same type as well.  (If you know GCC function
-     attributes, the ‘--flag=FUNCTION:ARG:pass-c-format’ option is
-     roughly equivalent to the declaration ‘__attribute__
-     ((__format_arg__ (ARG)))’ attached to FUNCTION in a C source file.)
-     For example, if you use the ‘_’ shortcut for the ‘gettext’
-     function, you should use ‘--flag=_:1:pass-c-format’.  The effect of
-     this specification is that ‘xgettext’ will propagate a format
-     string requirement for a ‘_("string")’ call to its first argument,
-     the literal ‘"string"’, and thus mark it as a format string.  This
+     attributes, the `--flag=FUNCTION:ARG:pass-c-format' option is
+     roughly equivalent to the declaration `__attribute__
+     ((__format_arg__ (ARG)))' attached to FUNCTION in a C source file.)
+     For example, if you use the `_' shortcut for the `gettext'
+     function, you should use `--flag=_:1:pass-c-format'.  The effect
+     of this specification is that `xgettext' will propagate a format
+     string requirement for a `_("string")' call to its first argument,
+     the literal `"string"', and thus mark it as a format string.  This
      is useful when such strings contain no format string directives:
-     together with the checks done by ‘msgfmt -c’ it will ensure that
+     together with the checks done by `msgfmt -c' it will ensure that
      translators cannot accidentally use format string directives that
      would lead to a crash at runtime.
      This option has an effect with most languages, namely C, C++,
      ObjectiveC, Shell, Python, Lisp, EmacsLisp, librep, Scheme, Java,
-     C#, awk, YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript, Vala.
+     C#, awk, YCP, Tcl, Perl, PHP, GCC-source.
 
-‘-T’
-‘--trigraphs’
+`-T'
+`--trigraphs'
      Understand ANSI C trigraphs for input.
      This option has an effect only with the languages C, C++,
      ObjectiveC.
 
-‘--qt’
+`--qt'
      Recognize Qt format strings.
      This option has an effect only with the language C++.
 
-‘--kde’
+`--kde'
      Recognize KDE 4 format strings.
      This option has an effect only with the language C++.
 
-‘--boost’
+`--boost'
      Recognize Boost format strings.
      This option has an effect only with the language C++.
 
-‘--debug’
-     Use the flags ‘c-format’ and ‘possible-c-format’ to show who was
+`--debug'
+     Use the flags `c-format' and `possible-c-format' to show who was
      responsible for marking a message as a format string.  The latter
-     form is used if the ‘xgettext’ program decided, the format form is
+     form is used if the `xgettext' program decided, the format form is
      used if the programmer prescribed it.
 
-     By default only the ‘c-format’ form is used.  The translator should
+     By default only the `c-format' form is used.  The translator should
      not have to care about these details.
 
-   This implementation of ‘xgettext’ is able to process a few awkward
+
+   This implementation of `xgettext' is able to process a few awkward
 cases, like strings in preprocessor macros, ANSI concatenation of
 adjacent strings, and escaped end of lines for continued strings.
 
 5.1.7 Output details
 --------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if no message is defined.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.  Note that using this option
-     makes it harder for technically skilled translators to understand
-     each message’s context.
-
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.  Note that using this
+     option makes it harder for technically skilled translators to
+     understand each message's context.
+
+`-n'
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
-‘--omit-header’
-     Don’t write header with ‘msgid ""’ entry.
+`--omit-header'
+     Don't write header with `msgid ""' entry.
 
      This is useful for testing purposes because it eliminates a source
-     of variance for generated ‘.gmo’ files.  With ‘--omit-header’, two
-     invocations of ‘xgettext’ on the same files with the same options
+     of variance for generated `.gmo' files.  With `--omit-header', two
+     invocations of `xgettext' on the same files with the same options
      at different times are guaranteed to produce the same results.
 
      Note that using this option will lead to an error if the resulting
      file would not entirely be in ASCII.
 
-‘--copyright-holder=STRING’
+`--copyright-holder=STRING'
      Set the copyright holder in the output.  STRING should be the
      copyright holder of the surrounding package.  (Note that the msgstr
-     strings, extracted from the package’s sources, belong to the
+     strings, extracted from the package's sources, belong to the
      copyright holder of the package.)  Translators are expected to
      transfer or disclaim the copyright for their translations, so that
      package maintainers can distribute them without legal risk.  If
-     STRING is empty, the output files are marked as being in the public
-     domain; in this case, the translators are expected to disclaim
-     their copyright, again so that package maintainers can distribute
-     them without legal risk.
+     STRING is empty, the output files are marked as being in the
+     public domain; in this case, the translators are expected to
+     disclaim their copyright, again so that package maintainers can
+     distribute them without legal risk.
 
      The default value for STRING is the Free Software Foundation, Inc.,
-     simply because ‘xgettext’ was first used in the GNU project.
+     simply because `xgettext' was first used in the GNU project.
 
-‘--foreign-user’
+`--foreign-user'
      Omit FSF copyright in output.  This option is equivalent to
-     ‘--copyright-holder=''’.  It can be useful for packages outside the
-     GNU project that want their translations to be in the public
+     `--copyright-holder='''.  It can be useful for packages outside
+     the GNU project that want their translations to be in the public
      domain.
 
-‘--package-name=PACKAGE’
+`--package-name=PACKAGE'
      Set the package name in the header of the output.
 
-‘--package-version=VERSION’
+`--package-version=VERSION'
      Set the package version in the header of the output.  This option
-     has an effect only if the ‘--package-name’ option is also used.
+     has an effect only if the `--package-name' option is also used.
 
-‘--msgid-bugs-address=EMAIL@ADDRESS’
+`--msgid-bugs-address=EMAIL@ADDRESS'
      Set the reporting address for msgid bugs.  This is the email
      address or URL to which the translators shall report bugs in the
      untranslated strings:
 
         - Strings which are not entire sentences, see the maintainer
           guidelines in *note Preparing Strings::.
+
         - Strings which use unclear terms or require additional context
           to be understood.
-        - Strings which make invalid assumptions about notation of date,
-          time or money.
+
+        - Strings which make invalid assumptions about notation of
+          date, time or money.
+
         - Pluralisation problems.
+
         - Incorrect English spelling.
+
         - Incorrect formatting.
 
      It can be your email address, or a mailing list address where
@@ -2879,27 +2859,29 @@
      web page through which the translators can contact you.
 
      The default value is empty, which means that translators will be
-     clueless!  Don’t forget to specify this option.
+     clueless!  Don't forget to specify this option.
 
-‘-m[STRING]’
-‘--msgstr-prefix[=STRING]’
+`-m[STRING]'
+`--msgstr-prefix[=STRING]'
      Use STRING (or "" if not specified) as prefix for msgstr values.
 
-‘-M[STRING]’
-‘--msgstr-suffix[=STRING]’
+`-M[STRING]'
+`--msgstr-suffix[=STRING]'
      Use STRING (or "" if not specified) as suffix for msgstr values.
 
+
 5.1.8 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: Creating,  Next: Updating,  Prev: Template,  Up: Top
 
@@ -2907,11 +2889,12 @@
 ************************
 
    When starting a new translation, the translator creates a file called
-‘LANG.po’, as a copy of the ‘PACKAGE.pot’ template file with
-modifications in the initial comments (at the beginning of the file) and
-in the header entry (the first entry, near the beginning of the file).
+`LANG.po', as a copy of the `PACKAGE.pot' template file with
+modifications in the initial comments (at the beginning of the file)
+and in the header entry (the first entry, near the beginning of the
+file).
 
-   The easiest way to do so is by use of the ‘msginit’ program.  For
+   The easiest way to do so is by use of the `msginit' program.  For
 example:
 
      $ cd PACKAGE-VERSION
@@ -2919,115 +2902,120 @@
      $ msginit
 
    The alternative way is to do the copy and modifications by hand.  To
-do so, the translator copies ‘PACKAGE.pot’ to ‘LANG.po’.  Then she
+do so, the translator copies `PACKAGE.pot' to `LANG.po'.  Then she
 modifies the initial comments and the header entry of this file.
 
 * Menu:
 
-* msginit Invocation::          Invoking the ‘msginit’ Program
+* msginit Invocation::          Invoking the `msginit' Program
 * Header Entry::                Filling in the Header Entry
 
 
 File: gettext.info,  Node: msginit Invocation,  Next: Header Entry,  Prev: Creating,  Up: Creating
 
-6.1 Invoking the ‘msginit’ Program
+6.1 Invoking the `msginit' Program
 ==================================
 
      msginit [OPTION]
 
-   The ‘msginit’ program creates a new PO file, initializing the meta
-information with values from the user’s environment.
+   The `msginit' program creates a new PO file, initializing the meta
+information with values from the user's environment.
 
 6.1.1 Input file location
 -------------------------
 
-‘-i INPUTFILE’
-‘--input=INPUTFILE’
+`-i INPUTFILE'
+`--input=INPUTFILE'
      Input POT file.
 
+
    If no INPUTFILE is given, the current directory is searched for the
-POT file.  If it is ‘-’, standard input is read.
+POT file.  If it is `-', standard input is read.
 
 6.1.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified PO file.
 
-   If no output file is given, it depends on the ‘--locale’ option or
-the user’s locale setting.  If it is ‘-’, the results are written to
+
+   If no output file is given, it depends on the `--locale' option or
+the user's locale setting.  If it is `-', the results are written to
 standard output.
 
 6.1.3 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 6.1.4 Output details
 --------------------
 
-‘-l LL_CC’
-‘--locale=LL_CC’
+`-l LL_CC'
+`--locale=LL_CC'
      Set target locale.  LL should be a language code, and CC should be
-     a country code.  The command ‘locale -a’ can be used to output a
-     list of all installed locales.  The default is the user’s locale
+     a country code.  The command `locale -a' can be used to output a
+     list of all installed locales.  The default is the user's locale
      setting.
 
-‘--no-translator’
+`--no-translator'
      Declares that the PO file will not have a human translator and is
      instead automatically generated.
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
+
 
 6.1.5 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: Header Entry,  Prev: msginit Invocation,  Up: Creating
 
@@ -3038,36 +3026,41 @@
 AUTHOR <EMAIL@ADDRESS>, YEAR" ought to be replaced by sensible
 information.  This can be done in any text editor; if Emacs is used and
 it switched to PO mode automatically (because it has recognized the
-file’s suffix), you can disable it by typing ‘M-x fundamental-mode’.
+file's suffix), you can disable it by typing `M-x fundamental-mode'.
 
    Modifying the header entry can already be done using PO mode: in
-Emacs, type ‘M-x po-mode RET’ and then ‘RET’ again to start editing the
+Emacs, type `M-x po-mode RET' and then `RET' again to start editing the
 entry.  You should fill in the following fields.
 
 Project-Id-Version
      This is the name and version of the package.  Fill it in if it has
-     not already been filled in by ‘xgettext’.
+     not already been filled in by `xgettext'.
 
 Report-Msgid-Bugs-To
-     This has already been filled in by ‘xgettext’.  It contains an
+     This has already been filled in by `xgettext'.  It contains an
      email address or URL where you can report bugs in the untranslated
      strings:
 
         - Strings which are not entire sentences, see the maintainer
           guidelines in *note Preparing Strings::.
+
         - Strings which use unclear terms or require additional context
           to be understood.
-        - Strings which make invalid assumptions about notation of date,
-          time or money.
+
+        - Strings which make invalid assumptions about notation of
+          date, time or money.
+
         - Pluralisation problems.
+
         - Incorrect English spelling.
+
         - Incorrect formatting.
 
 POT-Creation-Date
-     This has already been filled in by ‘xgettext’.
+     This has already been filled in by `xgettext'.
 
 PO-Revision-Date
-     You don’t need to fill this in.  It will be filled by the PO file
+     You don't need to fill this in.  It will be filled by the PO file
      editor when you save the file.
 
 Last-Translator
@@ -3078,148 +3071,169 @@
      homepage URL of the language team you are part of.
 
      Before starting a translation, it is a good idea to get in touch
-     with your translation team, not only to make sure you don’t do
+     with your translation team, not only to make sure you don't do
      duplicated work, but also to coordinate difficult linguistic
      issues.
 
      In the Free Translation Project, each translation team has its own
      mailing list.  The up-to-date list of teams can be found at the
-     Free Translation Project’s homepage,
-     <http://translationproject.org/>, in the "Teams" area.
+     Free Translation Project's homepage,
+     `http://translationproject.org/', in the "Teams" area.
 
 Language
      Fill in the language code of the language.  This can be in one of
      three forms:
 
-        - ‘LL’, an ISO 639 two-letter language code (lowercase).  See
+        - `LL', an ISO 639 two-letter language code (lowercase).  See
           *note Language Codes:: for the list of codes.
 
-        - ‘LL_CC’, where ‘LL’ is an ISO 639 two-letter language code
-          (lowercase) and ‘CC’ is an ISO 3166 two-letter country code
+        - `LL_CC', where `LL' is an ISO 639 two-letter language code
+          (lowercase) and `CC' is an ISO 3166 two-letter country code
           (uppercase).  The country code specification is not redundant:
           Some languages have dialects in different countries.  For
-          example, ‘de_AT’ is used for Austria, and ‘pt_BR’ for Brazil.
-          The country code serves to distinguish the dialects.  See
-          *note Language Codes:: and *note Country Codes:: for the lists
-          of codes.
-
-        - ‘LL_CC@VARIANT’, where ‘LL’ is an ISO 639 two-letter language
-          code (lowercase), ‘CC’ is an ISO 3166 two-letter country code
-          (uppercase), and ‘VARIANT’ is a variant designator.  The
+          example, `de_AT' is used for Austria, and `pt_BR' for Brazil.
+          The country code serves to distinguish the dialects. See
+          *note Language Codes:: and *note Country Codes:: for the
+          lists of codes.
+
+        - `LL_CC@VARIANT', where `LL' is an ISO 639 two-letter language
+          code (lowercase), `CC' is an ISO 3166 two-letter country code
+          (uppercase), and `VARIANT' is a variant designator. The
           variant designator (lowercase) can be a script designator,
-          such as ‘latin’ or ‘cyrillic’.
+          such as `latin' or `cyrillic'.
 
-     The naming convention ‘LL_CC’ is also the way locales are named on
+     The naming convention `LL_CC' is also the way locales are named on
      systems based on GNU libc.  But there are three important
      differences:
 
-        • In this PO file field, but not in locale names, ‘LL_CC’
-          combinations denoting a language’s main dialect are
-          abbreviated as ‘LL’.  For example, ‘de’ is equivalent to
-          ‘de_DE’ (German as spoken in Germany), and ‘pt’ to ‘pt_PT’
+        * In this PO file field, but not in locale names, `LL_CC'
+          combinations denoting a language's main dialect are
+          abbreviated as `LL'.  For example, `de' is equivalent to
+          `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
           (Portuguese as spoken in Portugal) in this context.
 
-        • In this PO file field, suffixes like ‘.ENCODING’ are not used.
+        * In this PO file field, suffixes like `.ENCODING' are not used.
 
-        • In this PO file field, variant designators that are not
-          relevant to message translation, such as ‘@euro’, are not
+        * In this PO file field, variant designators that are not
+          relevant to message translation, such as `@euro', are not
           used.
 
-     So, if your locale name is ‘de_DE.UTF-8’, the language
-     specification in PO files is just ‘de’.
+     So, if your locale name is `de_DE.UTF-8', the language
+     specification in PO files is just `de'.
 
 Content-Type
-     Replace ‘CHARSET’ with the character encoding used for your
+     Replace `CHARSET' with the character encoding used for your
      language, in your locale, or UTF-8.  This field is needed for
-     correct operation of the ‘msgmerge’ and ‘msgfmt’ programs, as well
-     as for users whose locale’s character encoding differs from yours
+     correct operation of the `msgmerge' and `msgfmt' programs, as well
+     as for users whose locale's character encoding differs from yours
      (see *note Charset conversion::).
 
      You get the character encoding of your locale by running the shell
-     command ‘locale charmap’.  If the result is ‘C’ or
-     ‘ANSI_X3.4-1968’, which is equivalent to ‘ASCII’ (= ‘US-ASCII’), it
-     means that your locale is not correctly configured.  In this case,
-     ask your translation team which charset to use.  ‘ASCII’ is not
-     usable for any language except Latin.
+     command `locale charmap'.  If the result is `C' or
+     `ANSI_X3.4-1968', which is equivalent to `ASCII' (= `US-ASCII'),
+     it means that your locale is not correctly configured.  In this
+     case, ask your translation team which charset to use.  `ASCII' is
+     not usable for any language except Latin.
 
      Because the PO files must be portable to operating systems with
      less advanced internationalization facilities, the character
      encodings that can be used are limited to those supported by both
-     GNU ‘libc’ and GNU ‘libiconv’.  These are: ‘ASCII’, ‘ISO-8859-1’,
-     ‘ISO-8859-2’, ‘ISO-8859-3’, ‘ISO-8859-4’, ‘ISO-8859-5’,
-     ‘ISO-8859-6’, ‘ISO-8859-7’, ‘ISO-8859-8’, ‘ISO-8859-9’,
-     ‘ISO-8859-13’, ‘ISO-8859-14’, ‘ISO-8859-15’, ‘KOI8-R’, ‘KOI8-U’,
-     ‘KOI8-T’, ‘CP850’, ‘CP866’, ‘CP874’, ‘CP932’, ‘CP949’, ‘CP950’,
-     ‘CP1250’, ‘CP1251’, ‘CP1252’, ‘CP1253’, ‘CP1254’, ‘CP1255’,
-     ‘CP1256’, ‘CP1257’, ‘GB2312’, ‘EUC-JP’, ‘EUC-KR’, ‘EUC-TW’, ‘BIG5’,
-     ‘BIG5-HKSCS’, ‘GBK’, ‘GB18030’, ‘SHIFT_JIS’, ‘JOHAB’, ‘TIS-620’,
-     ‘VISCII’, ‘GEORGIAN-PS’, ‘UTF-8’.
+     GNU `libc' and GNU `libiconv'.  These are: `ASCII', `ISO-8859-1',
+     `ISO-8859-2', `ISO-8859-3', `ISO-8859-4', `ISO-8859-5',
+     `ISO-8859-6', `ISO-8859-7', `ISO-8859-8', `ISO-8859-9',
+     `ISO-8859-13', `ISO-8859-14', `ISO-8859-15', `KOI8-R', `KOI8-U',
+     `KOI8-T', `CP850', `CP866', `CP874', `CP932', `CP949', `CP950',
+     `CP1250', `CP1251', `CP1252', `CP1253', `CP1254', `CP1255',
+     `CP1256', `CP1257', `GB2312', `EUC-JP', `EUC-KR', `EUC-TW',
+     `BIG5', `BIG5-HKSCS', `GBK', `GB18030', `SHIFT_JIS', `JOHAB',
+     `TIS-620', `VISCII', `GEORGIAN-PS', `UTF-8'.
 
      In the GNU system, the following encodings are frequently used for
      the corresponding languages.
 
-        • ‘ISO-8859-1’ for Afrikaans, Albanian, Basque, Breton, Catalan,
-          Cornish, Danish, Dutch, English, Estonian, Faroese, Finnish,
-          French, Galician, German, Greenlandic, Icelandic, Indonesian,
-          Irish, Italian, Malay, Manx, Norwegian, Occitan, Portuguese,
-          Spanish, Swedish, Tagalog, Uzbek, Walloon,
-        • ‘ISO-8859-2’ for Bosnian, Croatian, Czech, Hungarian, Polish,
+        * `ISO-8859-1' for Afrikaans, Albanian, Basque, Breton,
+          Catalan, Cornish, Danish, Dutch, English, Estonian, Faroese,
+          Finnish, French, Galician, German, Greenlandic, Icelandic,
+          Indonesian, Irish, Italian, Malay, Manx, Norwegian, Occitan,
+          Portuguese, Spanish, Swedish, Tagalog, Uzbek, Walloon,
+
+        * `ISO-8859-2' for Bosnian, Croatian, Czech, Hungarian, Polish,
           Romanian, Serbian, Slovak, Slovenian,
-        • ‘ISO-8859-3’ for Maltese,
-        • ‘ISO-8859-5’ for Macedonian, Serbian,
-        • ‘ISO-8859-6’ for Arabic,
-        • ‘ISO-8859-7’ for Greek,
-        • ‘ISO-8859-8’ for Hebrew,
-        • ‘ISO-8859-9’ for Turkish,
-        • ‘ISO-8859-13’ for Latvian, Lithuanian, Maori,
-        • ‘ISO-8859-14’ for Welsh,
-        • ‘ISO-8859-15’ for Basque, Catalan, Dutch, English, Finnish,
-          French, Galician, German, Irish, Italian, Portuguese, Spanish,
-          Swedish, Walloon,
-        • ‘KOI8-R’ for Russian,
-        • ‘KOI8-U’ for Ukrainian,
-        • ‘KOI8-T’ for Tajik,
-        • ‘CP1251’ for Bulgarian, Belarusian,
-        • ‘GB2312’, ‘GBK’, ‘GB18030’ for simplified writing of Chinese,
-        • ‘BIG5’, ‘BIG5-HKSCS’ for traditional writing of Chinese,
-        • ‘EUC-JP’ for Japanese,
-        • ‘EUC-KR’ for Korean,
-        • ‘TIS-620’ for Thai,
-        • ‘GEORGIAN-PS’ for Georgian,
-        • ‘UTF-8’ for any language, including those listed above.
+
+        * `ISO-8859-3' for Maltese,
+
+        * `ISO-8859-5' for Macedonian, Serbian,
+
+        * `ISO-8859-6' for Arabic,
+
+        * `ISO-8859-7' for Greek,
+
+        * `ISO-8859-8' for Hebrew,
+
+        * `ISO-8859-9' for Turkish,
+
+        * `ISO-8859-13' for Latvian, Lithuanian, Maori,
+
+        * `ISO-8859-14' for Welsh,
+
+        * `ISO-8859-15' for Basque, Catalan, Dutch, English, Finnish,
+          French, Galician, German, Irish, Italian, Portuguese,
+          Spanish, Swedish, Walloon,
+
+        * `KOI8-R' for Russian,
+
+        * `KOI8-U' for Ukrainian,
+
+        * `KOI8-T' for Tajik,
+
+        * `CP1251' for Bulgarian, Belarusian,
+
+        * `GB2312', `GBK', `GB18030' for simplified writing of Chinese,
+
+        * `BIG5', `BIG5-HKSCS' for traditional writing of Chinese,
+
+        * `EUC-JP' for Japanese,
+
+        * `EUC-KR' for Korean,
+
+        * `TIS-620' for Thai,
+
+        * `GEORGIAN-PS' for Georgian,
+
+        * `UTF-8' for any language, including those listed above.
 
      When single quote characters or double quote characters are used in
-     translations for your language, and your locale’s encoding is one
+     translations for your language, and your locale's encoding is one
      of the ISO-8859-* charsets, it is best if you create your PO files
-     in UTF-8 encoding, instead of your locale’s encoding.  This is
+     in UTF-8 encoding, instead of your locale's encoding.  This is
      because in UTF-8 the real quote characters can be represented
      (single quote characters: U+2018, U+2019, double quote characters:
      U+201C, U+201D), whereas none of ISO-8859-* charsets has them all.
      Users in UTF-8 locales will see the real quote characters, whereas
      users in ISO-8859-* locales will see the vertical apostrophe and
-     the vertical double quote instead (because that’s what the
+     the vertical double quote instead (because that's what the
      character set conversion will transliterate them to).
 
      To enter such quote characters under X11, you can change your
-     keyboard mapping using the ‘xmodmap’ program.  The X11 names of the
-     quote characters are "leftsinglequotemark", "rightsinglequotemark",
-     "leftdoublequotemark", "rightdoublequotemark",
-     "singlelowquotemark", "doublelowquotemark".
+     keyboard mapping using the `xmodmap' program.  The X11 names of
+     the quote characters are "leftsinglequotemark",
+     "rightsinglequotemark", "leftdoublequotemark",
+     "rightdoublequotemark", "singlelowquotemark", "doublelowquotemark".
 
      Note that only recent versions of GNU Emacs support the UTF-8
      encoding: Emacs 20 with Mule-UCS, and Emacs 21.  As of January
-     2001, XEmacs doesn’t support the UTF-8 encoding.
+     2001, XEmacs doesn't support the UTF-8 encoding.
 
-     The character encoding name can be written in either upper or lower
-     case.  Usually upper case is preferred.
+     The character encoding name can be written in either upper or
+     lower case.  Usually upper case is preferred.
 
 Content-Transfer-Encoding
-     Set this to ‘8bit’.
+     Set this to `8bit'.
 
 Plural-Forms
      This field is optional.  It is only needed if the PO file has
      plural forms.  You can find them by searching for the
-     ‘msgid_plural’ keyword.  The format of the plural forms field is
+     `msgid_plural' keyword.  The format of the plural forms field is
      described in *note Plural forms:: and *note Translating plural
      forms::.
 
@@ -3231,223 +3245,224 @@
 
 * Menu:
 
-* msgmerge Invocation::         Invoking the ‘msgmerge’ Program
+* msgmerge Invocation::         Invoking the `msgmerge' Program
 
 
 File: gettext.info,  Node: msgmerge Invocation,  Prev: Updating,  Up: Updating
 
-7.1 Invoking the ‘msgmerge’ Program
+7.1 Invoking the `msgmerge' Program
 ===================================
 
      msgmerge [OPTION] DEF.po REF.pot
 
-   The ‘msgmerge’ program merges two Uniforum style .po files together.
+   The `msgmerge' program merges two Uniforum style .po files together.
 The DEF.po file is an existing PO file with translations which will be
 taken over to the newly created file as long as they still match;
 comments will be preserved, but extracted comments and file positions
 will be discarded.  The REF.pot file is the last created PO file with
 up-to-date source references but old translations, or a PO Template file
-(generally created by ‘xgettext’); any translations or comments in the
+(generally created by `xgettext'); any translations or comments in the
 file will be discarded, however dot comments and file positions will be
-preserved.  Where an exact match cannot be found, fuzzy matching is used
-to produce better results.
+preserved.  Where an exact match cannot be found, fuzzy matching is
+used to produce better results.
 
 7.1.1 Input file location
 -------------------------
 
-‘DEF.po’
+`DEF.po'
      Translations referring to old sources.
 
-‘REF.pot’
+`REF.pot'
      References to the new sources.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-‘-C FILE’
-‘--compendium=FILE’
+`-C FILE'
+`--compendium=FILE'
      Specify an additional library of message translations.  *Note
      Compendium::.  This option may be specified more than once.
 
+
 7.1.2 Operation mode
 --------------------
 
-‘-U’
-‘--update’
+`-U'
+`--update'
      Update DEF.po.  Do nothing if DEF.po is already up to date.
 
+
 7.1.3 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 7.1.4 Output file location in update mode
 -----------------------------------------
 
    The result is written back to DEF.po.
 
-‘--backup=CONTROL’
+`--backup=CONTROL'
      Make a backup of DEF.po
 
-‘--suffix=SUFFIX’
+`--suffix=SUFFIX'
      Override the usual backup suffix.
 
-   The version control method may be selected via the ‘--backup’ option
-or through the ‘VERSION_CONTROL’ environment variable.  Here are the
+
+   The version control method may be selected via the `--backup' option
+or through the `VERSION_CONTROL' environment variable.  Here are the
 values:
 
-‘none’
-‘off’
-     Never make backups (even if ‘--backup’ is given).
+`none'
+`off'
+     Never make backups (even if `--backup' is given).
 
-‘numbered’
-‘t’
+`numbered'
+`t'
      Make numbered backups.
 
-‘existing’
-‘nil’
+`existing'
+`nil'
      Make numbered backups if numbered backups for this file already
      exist, otherwise make simple backups.
 
-‘simple’
-‘never’
+`simple'
+`never'
      Always make simple backups.
 
-   The backup suffix is ‘~’, unless set with ‘--suffix’ or the
-‘SIMPLE_BACKUP_SUFFIX’ environment variable.
+
+   The backup suffix is `~', unless set with `--suffix' or the
+`SIMPLE_BACKUP_SUFFIX' environment variable.
 
 7.1.5 Operation modifiers
 -------------------------
 
-‘-m’
-‘--multi-domain’
+`-m'
+`--multi-domain'
      Apply REF.pot to each of the domains in DEF.po.
 
-‘-N’
-‘--no-fuzzy-matching’
+`-N'
+`--no-fuzzy-matching'
      Do not use fuzzy matching when an exact match is not found.  This
      may speed up the operation considerably.
 
-‘--previous’
-     Keep the previous msgids of translated messages, marked with ‘#|’,
+`--previous'
+     Keep the previous msgids of translated messages, marked with `#|',
      when adding the fuzzy marker to such messages.
 
 7.1.6 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input files are Java ResourceBundles in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
 
-‘--stringtable-input’
+`--stringtable-input'
      Assume the input files are NeXTstep/GNUstep localized resource
-     files in ‘.strings’ syntax, not in PO file syntax.
+     files in `.strings' syntax, not in PO file syntax.
+
 
 7.1.7 Output details
 --------------------
 
-‘--lang=CATALOGNAME’
-     Specify the ‘Language’ field to be used in the header entry.  See
+`--lang=CATALOGNAME'
+     Specify the `Language' field to be used in the header entry.  See
      *note Header Entry:: for the meaning of this field.  Note: The
-     ‘Language-Team’ and ‘Plural-Forms’ fields are left unchanged.  If
-     this option is not specified, the ‘Language’ field is inferred, as
-     best as possible, from the ‘Language-Team’ field.
+     `Language-Team' and `Plural-Forms' fields are left unchanged.  If
+     this option is not specified, the `Language' field is inferred, as
+     best as possible, from the `Language-Team' field.
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 7.1.8 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
-‘-v’
-‘--verbose’
+`-v'
+`--verbose'
      Increase verbosity level.
 
-‘-q’
-‘--quiet’
-‘--silent’
+`-q'
+`--quiet'
+`--silent'
      Suppress progress indicators.
 
+
 
 File: gettext.info,  Node: Editing,  Next: Manipulating,  Prev: Updating,  Up: Top
 
@@ -3456,27 +3471,27 @@
 
 * Menu:
 
-* KBabel::                      KDE’s PO File Editor
-* Gtranslator::                 GNOME’s PO File Editor
-* PO Mode::                     Emacs’s PO File Editor
+* KBabel::                      KDE's PO File Editor
+* Gtranslator::                 GNOME's PO File Editor
+* PO Mode::                     Emacs's PO File Editor
 * Compendium::                  Using Translation Compendia
 
 
 File: gettext.info,  Node: KBabel,  Next: Gtranslator,  Prev: Editing,  Up: Editing
 
-8.1 KDE’s PO File Editor
+8.1 KDE's PO File Editor
 ========================
 
 
 File: gettext.info,  Node: Gtranslator,  Next: PO Mode,  Prev: KBabel,  Up: Editing
 
-8.2 GNOME’s PO File Editor
+8.2 GNOME's PO File Editor
 ==========================
 
 
 File: gettext.info,  Node: PO Mode,  Next: Compendium,  Prev: Gtranslator,  Up: Editing
 
-8.3 Emacs’s PO File Editor
+8.3 Emacs's PO File Editor
 ==========================
 
    For those of you being the lucky users of Emacs, PO mode has been
@@ -3484,8 +3499,8 @@
 modifying PO files.  While editing a PO file, PO mode allows for the
 easy browsing of auxiliary and compendium PO files, as well as for
 following references into the set of C program sources from which PO
-files have been derived.  It has a few special features, among which are
-the interactive marking of program strings as translatable, and the
+files have been derived.  It has a few special features, among which
+are the interactive marking of program strings as translatable, and the
 validation of PO files with easy repositioning to PO file lines showing
 errors.
 
@@ -3496,7 +3511,7 @@
 
 * Menu:
 
-* Installation::                Completing GNU ‘gettext’ Installation
+* Installation::                Completing GNU `gettext' Installation
 * Main PO Commands::            Main Commands
 * Entry Positioning::           Entry Positioning
 * Normalizing::                 Normalizing Strings in Entries
@@ -3513,30 +3528,30 @@
 
 File: gettext.info,  Node: Installation,  Next: Main PO Commands,  Prev: PO Mode,  Up: PO Mode
 
-8.3.1 Completing GNU ‘gettext’ Installation
+8.3.1 Completing GNU `gettext' Installation
 -------------------------------------------
 
    Once you have received, unpacked, configured and compiled the GNU
-‘gettext’ distribution, the ‘make install’ command puts in place the
-programs ‘xgettext’, ‘msgfmt’, ‘gettext’, and ‘msgmerge’, as well as
+`gettext' distribution, the `make install' command puts in place the
+programs `xgettext', `msgfmt', `gettext', and `msgmerge', as well as
 their available message catalogs.  To top off a comfortable
 installation, you might also want to make the PO mode available to your
 Emacs users.
 
    During the installation of the PO mode, you might want to modify your
-file ‘.emacs’, once and for all, so it contains a few lines looking
+file `.emacs', once and for all, so it contains a few lines looking
 like:
 
      (setq auto-mode-alist
            (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist))
      (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
 
-   Later, whenever you edit some ‘.po’ file, or any file having the
-string ‘.po.’ within its name, Emacs loads ‘po-mode.elc’ (or
-‘po-mode.el’) as needed, and automatically activates PO mode commands
-for the associated buffer.  The string _PO_ appears in the mode line for
-any buffer for which PO mode is active.  Many PO files may be active at
-once in a single Emacs session.
+   Later, whenever you edit some `.po' file, or any file having the
+string `.po.' within its name, Emacs loads `po-mode.elc' (or
+`po-mode.el') as needed, and automatically activates PO mode commands
+for the associated buffer.  The string _PO_ appears in the mode line
+for any buffer for which PO mode is active.  Many PO files may be
+active at once in a single Emacs session.
 
    If you are using Emacs version 20 or newer, and have already
 installed the appropriate international fonts on your system, you may
@@ -3549,7 +3564,7 @@
                                  'po-find-file-coding-system)
      (autoload 'po-find-file-coding-system "po-mode")
 
-to your ‘.emacs’ file.  If, with this, you still see boxes instead of
+to your `.emacs' file.  If, with this, you still see boxes instead of
 international characters, try a different font set (via Shift Mouse
 button 1).
 
@@ -3563,99 +3578,100 @@
 Installation::, PO mode is activated for a window when Emacs finds a PO
 file in that window.  This puts the window read-only and establishes a
 po-mode-map, which is a genuine Emacs mode, in a way that is not derived
-from text mode in any way.  Functions found on ‘po-mode-hook’, if any,
+from text mode in any way.  Functions found on `po-mode-hook', if any,
 will be executed.
 
-   When PO mode is active in a window, the letters ‘PO’ appear in the
-mode line for that window.  The mode line also displays how many entries
-of each kind are held in the PO file.  For example, the string
-‘132t+3f+10u+2o’ would tell the translator that the PO mode contains 132
-translated entries (*note Translated Entries::, 3 fuzzy entries (*note
-Fuzzy Entries::), 10 untranslated entries (*note Untranslated Entries::)
-and 2 obsolete entries (*note Obsolete Entries::).  Zero-coefficients
-items are not shown.  So, in this example, if the fuzzy entries were
-unfuzzied, the untranslated entries were translated and the obsolete
-entries were deleted, the mode line would merely display ‘145t’ for the
-counters.
+   When PO mode is active in a window, the letters `PO' appear in the
+mode line for that window.  The mode line also displays how many
+entries of each kind are held in the PO file.  For example, the string
+`132t+3f+10u+2o' would tell the translator that the PO mode contains
+132 translated entries (*note Translated Entries::, 3 fuzzy entries
+(*note Fuzzy Entries::), 10 untranslated entries (*note Untranslated
+Entries::) and 2 obsolete entries (*note Obsolete Entries::).
+Zero-coefficients items are not shown.  So, in this example, if the
+fuzzy entries were unfuzzied, the untranslated entries were translated
+and the obsolete entries were deleted, the mode line would merely
+display `145t' for the counters.
 
    The main PO commands are those which do not fit into the other
 categories of subsequent sections.  These allow for quitting PO mode or
 for managing windows in special ways.
 
-‘_’
-     Undo last modification to the PO file (‘po-undo’).
+`_'
+     Undo last modification to the PO file (`po-undo').
 
-‘Q’
-     Quit processing and save the PO file (‘po-quit’).
+`Q'
+     Quit processing and save the PO file (`po-quit').
 
-‘q’
+`q'
      Quit processing, possibly after confirmation
-     (‘po-confirm-and-quit’).
+     (`po-confirm-and-quit').
+
+`0'
+     Temporary leave the PO file window (`po-other-window').
 
-‘0’
-     Temporary leave the PO file window (‘po-other-window’).
+`?'
+`h'
+     Show help about PO mode (`po-help').
 
-‘?’
-‘h’
-     Show help about PO mode (‘po-help’).
+`='
+     Give some PO file statistics (`po-statistics').
 
-‘=’
-     Give some PO file statistics (‘po-statistics’).
+`V'
+     Batch validate the format of the whole PO file (`po-validate').
 
-‘V’
-     Batch validate the format of the whole PO file (‘po-validate’).
 
-   The command ‘_’ (‘po-undo’) interfaces to the Emacs _undo_ facility.
-*Note Undoing Changes: (emacs)Undo.  Each time ‘_’ is typed,
+   The command `_' (`po-undo') interfaces to the Emacs _undo_ facility.
+*Note Undoing Changes: (emacs)Undo.  Each time `_' is typed,
 modifications which the translator did to the PO file are undone a
 little more.  For the purpose of undoing, each PO mode command is
-atomic.  This is especially true for the ‘<RET>’ command: the whole
+atomic.  This is especially true for the `<RET>' command: the whole
 edition made by using a single use of this command is undone at once,
 even if the edition itself implied several actions.  However, while in
 the editing window, one can undo the edition work quite parsimoniously.
 
-   The commands ‘Q’ (‘po-quit’) and ‘q’ (‘po-confirm-and-quit’) are used
-when the translator is done with the PO file.  The former is a bit less
-verbose than the latter.  If the file has been modified, it is saved to
-disk first.  In both cases, and prior to all this, the commands check if
-any untranslated messages remain in the PO file and, if so, the
-translator is asked if she really wants to leave off working with this
-PO file.  This is the preferred way of getting rid of an Emacs PO file
-buffer.  Merely killing it through the usual command ‘C-x k’
-(‘kill-buffer’) is not the tidiest way to proceed.
+   The commands `Q' (`po-quit') and `q' (`po-confirm-and-quit') are
+used when the translator is done with the PO file.  The former is a bit
+less verbose than the latter.  If the file has been modified, it is
+saved to disk first.  In both cases, and prior to all this, the
+commands check if any untranslated messages remain in the PO file and,
+if so, the translator is asked if she really wants to leave off working
+with this PO file.  This is the preferred way of getting rid of an
+Emacs PO file buffer.  Merely killing it through the usual command
+`C-x k' (`kill-buffer') is not the tidiest way to proceed.
 
-   The command ‘0’ (‘po-other-window’) is another, softer way, to leave
+   The command `0' (`po-other-window') is another, softer way, to leave
 PO mode, temporarily.  It just moves the cursor to some other Emacs
 window, and pops one if necessary.  For example, if the translator just
 got PO mode to show some source context in some other, she might
 discover some apparent bug in the program source that needs correction.
 This command allows the translator to change sex, become a programmer,
-and have the cursor right into the window containing the program she (or
-rather _he_) wants to modify.  By later getting the cursor back in the
-PO file window, or by asking Emacs to edit this file once again, PO mode
-is then recovered.
+and have the cursor right into the window containing the program she
+(or rather _he_) wants to modify.  By later getting the cursor back in
+the PO file window, or by asking Emacs to edit this file once again, PO
+mode is then recovered.
 
-   The command ‘h’ (‘po-help’) displays a summary of all available PO
+   The command `h' (`po-help') displays a summary of all available PO
 mode commands.  The translator should then type any character to resume
-normal PO mode operations.  The command ‘?’ has the same effect as ‘h’.
+normal PO mode operations.  The command `?' has the same effect as `h'.
 
-   The command ‘=’ (‘po-statistics’) computes the total number of
+   The command `=' (`po-statistics') computes the total number of
 entries in the PO file, the ordinal of the current entry (counted from
 1), the number of untranslated entries, the number of obsolete entries,
 and displays all these numbers.
 
-   The command ‘V’ (‘po-validate’) launches ‘msgfmt’ in checking and
+   The command `V' (`po-validate') launches `msgfmt' in checking and
 verbose mode over the current PO file.  This command first offers to
-save the current PO file on disk.  The ‘msgfmt’ tool, from GNU
-‘gettext’, has the purpose of creating a MO file out of a PO file, and
+save the current PO file on disk.  The `msgfmt' tool, from GNU
+`gettext', has the purpose of creating a MO file out of a PO file, and
 PO mode uses the features of this program for checking the overall
 format of a PO file, as well as all individual entries.
 
-   The program ‘msgfmt’ runs asynchronously with Emacs, so the
+   The program `msgfmt' runs asynchronously with Emacs, so the
 translator regains control immediately while her PO file is being
-studied.  Error output is collected in the Emacs ‘*compilation*’ buffer,
-displayed in another window.  The regular Emacs command ‘C-x`’
-(‘next-error’), as well as other usual compile commands, allow the
+studied.  Error output is collected in the Emacs `*compilation*' buffer,
+displayed in another window.  The regular Emacs command `C-x`'
+(`next-error'), as well as other usual compile commands, allow the
 translator to reposition quickly to the offending parts of the PO file.
 Once the cursor is on the line in error, the translator may decide on
 any PO mode action which would help correcting the error.
@@ -3669,51 +3685,52 @@
    The cursor in a PO file window is almost always part of an entry.
 The only exceptions are the special case when the cursor is after the
 last entry in the file, or when the PO file is empty.  The entry where
-the cursor is found to be is said to be the current entry.  Many PO mode
-commands operate on the current entry, so moving the cursor does more
-than allowing the translator to browse the PO file, this also selects on
-which entry commands operate.
+the cursor is found to be is said to be the current entry.  Many PO
+mode commands operate on the current entry, so moving the cursor does
+more than allowing the translator to browse the PO file, this also
+selects on which entry commands operate.
 
    Some PO mode commands alter the position of the cursor in a
 specialized way.  A few of those special purpose positioning are
 described here, the others are described in following sections (for a
-complete list try ‘C-h m’):
+complete list try `C-h m'):
 
-‘.’
-     Redisplay the current entry (‘po-current-entry’).
+`.'
+     Redisplay the current entry (`po-current-entry').
 
-‘n’
-     Select the entry after the current one (‘po-next-entry’).
+`n'
+     Select the entry after the current one (`po-next-entry').
 
-‘p’
-     Select the entry before the current one (‘po-previous-entry’).
+`p'
+     Select the entry before the current one (`po-previous-entry').
 
-‘<’
-     Select the first entry in the PO file (‘po-first-entry’).
+`<'
+     Select the first entry in the PO file (`po-first-entry').
 
-‘>’
-     Select the last entry in the PO file (‘po-last-entry’).
+`>'
+     Select the last entry in the PO file (`po-last-entry').
 
-‘m’
+`m'
      Record the location of the current entry for later use
-     (‘po-push-location’).
+     (`po-push-location').
 
-‘r’
-     Return to a previously saved entry location (‘po-pop-location’).
+`r'
+     Return to a previously saved entry location (`po-pop-location').
 
-‘x’
+`x'
      Exchange the current entry location with the previously saved one
-     (‘po-exchange-location’).
+     (`po-exchange-location').
 
-   Any Emacs command able to reposition the cursor may be used to select
-the current entry in PO mode, including commands which move by
+
+   Any Emacs command able to reposition the cursor may be used to
+select the current entry in PO mode, including commands which move by
 characters, lines, paragraphs, screens or pages, and search commands.
-However, there is a kind of standard way to display the current entry in
-PO mode, which usual Emacs commands moving the cursor do not especially
-try to enforce.  The command ‘.’ (‘po-current-entry’) has the sole
-purpose of redisplaying the current entry properly, after the current
-entry has been changed by means external to PO mode, or the Emacs screen
-otherwise altered.
+However, there is a kind of standard way to display the current entry
+in PO mode, which usual Emacs commands moving the cursor do not
+especially try to enforce.  The command `.' (`po-current-entry') has
+the sole purpose of redisplaying the current entry properly, after the
+current entry has been changed by means external to PO mode, or the
+Emacs screen otherwise altered.
 
    It is yet to be decided if PO mode helps the translator, or otherwise
 irritates her, by forcing a rigid window disposition while she is doing
@@ -3721,57 +3738,57 @@
 should behave, but on the other hand, anyone used to Emacs is often
 happy to keep full control.  Maybe a fixed window disposition might be
 offered as a PO mode option that the translator might activate or
-deactivate at will, so it could be offered on an experimental basis.  If
-nobody feels a real need for using it, or a compulsion for writing it,
-we should drop this whole idea.  The incentive for doing it should come
-from translators rather than programmers, as opinions from an
+deactivate at will, so it could be offered on an experimental basis.
+If nobody feels a real need for using it, or a compulsion for writing
+it, we should drop this whole idea.  The incentive for doing it should
+come from translators rather than programmers, as opinions from an
 experienced translator are surely more worth to me than opinions from
 programmers _thinking_ about how _others_ should do translation.
 
-   The commands ‘n’ (‘po-next-entry’) and ‘p’ (‘po-previous-entry’) move
-the cursor the entry following, or preceding, the current one.  If ‘n’
-is given while the cursor is on the last entry of the PO file, or if ‘p’
-is given while the cursor is on the first entry, no move is done.
+   The commands `n' (`po-next-entry') and `p' (`po-previous-entry')
+move the cursor the entry following, or preceding, the current one.  If
+`n' is given while the cursor is on the last entry of the PO file, or
+if `p' is given while the cursor is on the first entry, no move is done.
 
-   The commands ‘<’ (‘po-first-entry’) and ‘>’ (‘po-last-entry’) move
+   The commands `<' (`po-first-entry') and `>' (`po-last-entry') move
 the cursor to the first entry, or last entry, of the PO file.  When the
 cursor is located past the last entry in a PO file, most PO mode
-commands will return an error saying ‘After last entry’.  Moreover, the
-commands ‘<’ and ‘>’ have the special property of being able to work
+commands will return an error saying `After last entry'.  Moreover, the
+commands `<' and `>' have the special property of being able to work
 even when the cursor is not into some PO file entry, and one may use
-them for nicely correcting this situation.  But even these commands will
-fail on a truly empty PO file.  There are development plans for the PO
-mode for it to interactively fill an empty PO file from sources.  *Note
-Marking::.
+them for nicely correcting this situation.  But even these commands
+will fail on a truly empty PO file.  There are development plans for
+the PO mode for it to interactively fill an empty PO file from sources.
+*Note Marking::.
 
    The translator may decide, before working at the translation of a
-particular entry, that she needs to browse the remainder of the PO file,
-maybe for finding the terminology or phraseology used in related
-entries.  She can of course use the standard Emacs idioms for saving the
-current cursor location in some register, and use that register for
+particular entry, that she needs to browse the remainder of the PO
+file, maybe for finding the terminology or phraseology used in related
+entries.  She can of course use the standard Emacs idioms for saving
+the current cursor location in some register, and use that register for
 getting back, or else, use the location ring.
 
    PO mode offers another approach, by which cursor locations may be
-saved onto a special stack.  The command ‘m’ (‘po-push-location’) merely
-adds the location of current entry to the stack, pushing the already
-saved locations under the new one.  The command ‘r’ (‘po-pop-location’)
-consumes the top stack element and repositions the cursor to the entry
-associated with that top element.  This position is then lost, for the
-next ‘r’ will move the cursor to the previously saved location, and so
-on until no locations remain on the stack.
+saved onto a special stack.  The command `m' (`po-push-location')
+merely adds the location of current entry to the stack, pushing the
+already saved locations under the new one.  The command `r'
+(`po-pop-location') consumes the top stack element and repositions the
+cursor to the entry associated with that top element.  This position is
+then lost, for the next `r' will move the cursor to the previously
+saved location, and so on until no locations remain on the stack.
 
    If the translator wants the position to be kept on the location
 stack, maybe for taking a look at the entry associated with the top
 element, then go elsewhere with the intent of getting back later, she
-ought to use ‘m’ immediately after ‘r’.
+ought to use `m' immediately after `r'.
 
-   The command ‘x’ (‘po-exchange-location’) simultaneously repositions
+   The command `x' (`po-exchange-location') simultaneously repositions
 the cursor to the entry associated with the top element of the stack of
 saved locations, and replaces that top element with the location of the
-current entry before the move.  Consequently, repeating the ‘x’ command
+current entry before the move.  Consequently, repeating the `x' command
 toggles alternatively between two entries.  For achieving this, the
-translator will position the cursor on the first entry, use ‘m’, then
-position to the second entry, and merely use ‘x’ for making the switch.
+translator will position the cursor on the first entry, use `m', then
+position to the second entry, and merely use `x' for making the switch.
 
 
 File: gettext.info,  Node: Normalizing,  Next: Translated Entries,  Prev: Entry Positioning,  Up: PO Mode
@@ -3783,63 +3800,64 @@
 PO file entry, because there are so many different ways to split and
 quote multi-line strings, and even, to represent special characters by
 backslashed escaped sequences.  Some features of PO mode rely on the
-ability for PO mode to scan an already existing PO file for a particular
-string encoded into the ‘msgid’ field of some entry.  Even if PO mode
-has internally all the built-in machinery for implementing this
-recognition easily, doing it fast is technically difficult.  To
+ability for PO mode to scan an already existing PO file for a
+particular string encoded into the `msgid' field of some entry.  Even
+if PO mode has internally all the built-in machinery for implementing
+this recognition easily, doing it fast is technically difficult.  To
 facilitate a solution to this efficiency problem, we decided on a
 canonical representation for strings.
 
    A conventional representation of strings in a PO file is currently
 under discussion, and PO mode experiments with a canonical
-representation.  Having both ‘xgettext’ and PO mode converging towards a
-uniform way of representing equivalent strings would be useful, as the
-internal normalization needed by PO mode could be automatically
-satisfied when using ‘xgettext’ from GNU ‘gettext’.  An explicit PO mode
-normalization should then be only necessary for PO files imported from
-elsewhere, or for when the convention itself evolves.
-
-   So, for achieving normalization of at least the strings of a given PO
-file needing a canonical representation, the following PO mode command
-is available:
+representation.  Having both `xgettext' and PO mode converging towards
+a uniform way of representing equivalent strings would be useful, as
+the internal normalization needed by PO mode could be automatically
+satisfied when using `xgettext' from GNU `gettext'.  An explicit PO
+mode normalization should then be only necessary for PO files imported
+from elsewhere, or for when the convention itself evolves.
+
+   So, for achieving normalization of at least the strings of a given
+PO file needing a canonical representation, the following PO mode
+command is available:
 
-‘M-x po-normalize’
+`M-x po-normalize'
      Tidy the whole PO file by making entries more uniform.
 
-   The special command ‘M-x po-normalize’, which has no associated keys,
-revises all entries, ensuring that strings of both original and
-translated entries use uniform internal quoting in the PO file.  It also
-removes any crumb after the last entry.  This command may be useful for
-PO files freshly imported from elsewhere, or if we ever improve on the
-canonical quoting format we use.  This canonical format is not only
-meant for getting cleaner PO files, but also for greatly speeding up
-‘msgid’ string lookup for some other PO mode commands.
 
-   ‘M-x po-normalize’ presently makes three passes over the entries.
+   The special command `M-x po-normalize', which has no associated
+keys, revises all entries, ensuring that strings of both original and
+translated entries use uniform internal quoting in the PO file.  It
+also removes any crumb after the last entry.  This command may be
+useful for PO files freshly imported from elsewhere, or if we ever
+improve on the canonical quoting format we use.  This canonical format
+is not only meant for getting cleaner PO files, but also for greatly
+speeding up `msgid' string lookup for some other PO mode commands.
+
+   `M-x po-normalize' presently makes three passes over the entries.
 The first implements heuristics for converting PO files for GNU
-‘gettext’ 0.6 and earlier, in which ‘msgid’ and ‘msgstr’ fields were
+`gettext' 0.6 and earlier, in which `msgid' and `msgstr' fields were
 using K&R style C string syntax for multi-line strings.  These
 heuristics may fail for comments not related to obsolete entries and
 ending with a backslash; they also depend on subsequent passes for
 finalizing the proper commenting of continued lines for obsolete
-entries.  This first pass might disappear once all oldish PO files would
-have been adjusted.  The second and third pass normalize all ‘msgid’ and
-‘msgstr’ strings respectively.  They also clean out those trailing
-backslashes used by XView’s ‘msgfmt’ for continued lines.
+entries.  This first pass might disappear once all oldish PO files
+would have been adjusted.  The second and third pass normalize all
+`msgid' and `msgstr' strings respectively.  They also clean out those
+trailing backslashes used by XView's `msgfmt' for continued lines.
 
    Having such an explicit normalizing command allows for importing PO
 files from other sources, but also eases the evolution of the current
 convention, evolution driven mostly by aesthetic concerns, as of now.
 It is easy to make suggested adjustments at a later time, as the
-normalizing command and eventually, other GNU ‘gettext’ tools should
+normalizing command and eventually, other GNU `gettext' tools should
 greatly automate conformance.  A description of the canonical string
 format is given below, for the particular benefit of those not having
-Emacs handy, and who would nevertheless want to handcraft their PO files
-in nice ways.
+Emacs handy, and who would nevertheless want to handcraft their PO
+files in nice ways.
 
    Right now, in PO mode, strings are single line or multi-line.  A
 string goes multi-line if and only if it has _embedded_ newlines, that
-is, if it matches ‘[^\n]\n+[^\n]’.  So, we would have:
+is, if it matches `[^\n]\n+[^\n]'.  So, we would have:
 
      msgstr "\n\nHello, world!\n\n\n"
 
@@ -3855,11 +3873,11 @@
 
    We are deliberately using a caricatural example, here, to make the
 point clearer.  Usually, multi-lines are not that bad looking.  It is
-probable that we will implement the following suggestion.  We might lump
-together all initial newlines into the empty string, and also all
-newlines introducing empty lines (that is, for N > 1, the N-1’th last
-newlines would go together on a separate string), so making the previous
-example appear:
+probable that we will implement the following suggestion.  We might
+lump together all initial newlines into the empty string, and also all
+newlines introducing empty lines (that is, for N > 1, the N-1'th last
+newlines would go together on a separate string), so making the
+previous example appear:
 
      msgstr "\n\n"
      "Hello,\n"
@@ -3876,30 +3894,31 @@
 8.3.5 Translated Entries
 ------------------------
 
-   Each PO file entry for which the ‘msgstr’ field has been filled with
+   Each PO file entry for which the `msgstr' field has been filled with
 a translation, and which is not marked as fuzzy (*note Fuzzy Entries::),
 is said to be a "translated" entry.  Only translated entries will later
-be compiled by GNU ‘msgfmt’ and become usable in programs.  Other entry
+be compiled by GNU `msgfmt' and become usable in programs.  Other entry
 types will be excluded; translation will not occur for them.
 
    Some commands are more specifically related to translated entry
 processing.
 
-‘t’
-     Find the next translated entry (‘po-next-translated-entry’).
+`t'
+     Find the next translated entry (`po-next-translated-entry').
 
-‘T’
+`T'
      Find the previous translated entry
-     (‘po-previous-translated-entry’).
+     (`po-previous-translated-entry').
 
-   The commands ‘t’ (‘po-next-translated-entry’) and ‘T’
-(‘po-previous-translated-entry’) move forwards or backwards, chasing for
-an translated entry.  If none is found, the search is extended and wraps
-around in the PO file buffer.
+
+   The commands `t' (`po-next-translated-entry') and `T'
+(`po-previous-translated-entry') move forwards or backwards, chasing
+for an translated entry.  If none is found, the search is extended and
+wraps around in the PO file buffer.
 
    Translated entries usually result from the translator having edited
 in a translation for them, *note Modifying Translations::.  However, if
-the variable ‘po-auto-fuzzy-on-edit’ is not ‘nil’, the entry having
+the variable `po-auto-fuzzy-on-edit' is not `nil', the entry having
 received a new translation first becomes a fuzzy entry, which ought to
 be later unfuzzied before becoming an official, genuine translated
 entry.  *Note Fuzzy Entries::.
@@ -3913,61 +3932,64 @@
    Each PO file entry may have a set of "attributes", which are
 qualities given a name and explicitly associated with the translation,
 using a special system comment.  One of these attributes has the name
-‘fuzzy’, and entries having this attribute are said to have a fuzzy
+`fuzzy', and entries having this attribute are said to have a fuzzy
 translation.  They are called fuzzy entries, for short.
 
    Fuzzy entries, even if they account for translated entries for most
 other purposes, usually call for revision by the translator.  Those may
-be produced by applying the program ‘msgmerge’ to update an older
+be produced by applying the program `msgmerge' to update an older
 translated PO files according to a new PO template file, when this tool
-hypothesises that some new ‘msgid’ has been modified only slightly out
+hypothesises that some new `msgid' has been modified only slightly out
 of an older one, and chooses to pair what it thinks to be the old
 translation for the new modified entry.  The slight alteration in the
-original string (the ‘msgid’ string) should often be reflected in the
-translated string, and this requires the intervention of the translator.
-For this reason, ‘msgmerge’ might mark some entries as being fuzzy.
-
-   Also, the translator may decide herself to mark an entry as fuzzy for
-her own convenience, when she wants to remember that the entry has to be
-later revisited.  So, some commands are more specifically related to
-fuzzy entry processing.
-
-‘f’
-     Find the next fuzzy entry (‘po-next-fuzzy-entry’).
+original string (the `msgid' string) should often be reflected in the
+translated string, and this requires the intervention of the
+translator.  For this reason, `msgmerge' might mark some entries as
+being fuzzy.
+
+   Also, the translator may decide herself to mark an entry as fuzzy
+for her own convenience, when she wants to remember that the entry has
+to be later revisited.  So, some commands are more specifically related
+to fuzzy entry processing.
 
-‘F’
-     Find the previous fuzzy entry (‘po-previous-fuzzy-entry’).
+`f'
+     Find the next fuzzy entry (`po-next-fuzzy-entry').
 
-‘<TAB>’
-     Remove the fuzzy attribute of the current entry (‘po-unfuzzy’).
+`F'
+     Find the previous fuzzy entry (`po-previous-fuzzy-entry').
 
-   The commands ‘f’ (‘po-next-fuzzy-entry’) and ‘F’
-(‘po-previous-fuzzy-entry’) move forwards or backwards, chasing for a
+`<TAB>'
+     Remove the fuzzy attribute of the current entry (`po-unfuzzy').
+
+
+   The commands `f' (`po-next-fuzzy-entry') and `F'
+(`po-previous-fuzzy-entry') move forwards or backwards, chasing for a
 fuzzy entry.  If none is found, the search is extended and wraps around
 in the PO file buffer.
 
-   The command ‘<TAB>’ (‘po-unfuzzy’) removes the fuzzy attribute
+   The command `<TAB>' (`po-unfuzzy') removes the fuzzy attribute
 associated with an entry, usually leaving it translated.  Further, if
-the variable ‘po-auto-select-on-unfuzzy’ has not the ‘nil’ value, the
-‘<TAB>’ command will automatically chase for another interesting entry
-to work on.  The initial value of ‘po-auto-select-on-unfuzzy’ is ‘nil’.
-
-   The initial value of ‘po-auto-fuzzy-on-edit’ is ‘nil’.  However, if
-the variable ‘po-auto-fuzzy-on-edit’ is set to ‘t’, any entry edited
-through the ‘<RET>’ command is marked fuzzy, as a way to ensure some
+the variable `po-auto-select-on-unfuzzy' has not the `nil' value, the
+`<TAB>' command will automatically chase for another interesting entry
+to work on.  The initial value of `po-auto-select-on-unfuzzy' is `nil'.
+
+   The initial value of `po-auto-fuzzy-on-edit' is `nil'.  However, if
+the variable `po-auto-fuzzy-on-edit' is set to `t', any entry edited
+through the `<RET>' command is marked fuzzy, as a way to ensure some
 kind of double check, later.  In this case, the usual paradigm is that
-an entry becomes fuzzy (if not already) whenever the translator modifies
-it.  If she is satisfied with the translation, she then uses ‘<TAB>’ to
-pick another entry to work on, clearing the fuzzy attribute on the same
-blow.  If she is not satisfied yet, she merely uses ‘<SPC>’ to chase
-another entry, leaving the entry fuzzy.
-
-   The translator may also use the ‘<DEL>’ command (‘po-fade-out-entry’)
-over any translated entry to mark it as being fuzzy, when she wants to
-easily leave a trace she wants to later return working at this entry.
+an entry becomes fuzzy (if not already) whenever the translator
+modifies it.  If she is satisfied with the translation, she then uses
+`<TAB>' to pick another entry to work on, clearing the fuzzy attribute
+on the same blow.  If she is not satisfied yet, she merely uses `<SPC>'
+to chase another entry, leaving the entry fuzzy.
+
+   The translator may also use the `<DEL>' command
+(`po-fade-out-entry') over any translated entry to mark it as being
+fuzzy, when she wants to easily leave a trace she wants to later return
+working at this entry.
 
    Also, when time comes to quit working on a PO file buffer with the
-‘q’ command, the translator is asked for confirmation, if fuzzy string
+`q' command, the translator is asked for confirmation, if fuzzy string
 still exists.
 
 
@@ -3976,9 +3998,9 @@
 8.3.7 Untranslated Entries
 --------------------------
 
-   When ‘xgettext’ originally creates a PO file, unless told otherwise,
-it initializes the ‘msgid’ field with the untranslated string, and
-leaves the ‘msgstr’ string to be empty.  Such entries, having an empty
+   When `xgettext' originally creates a PO file, unless told otherwise,
+it initializes the `msgid' field with the untranslated string, and
+leaves the `msgstr' string to be empty.  Such entries, having an empty
 translation, are said to be "untranslated" entries.  Later, when the
 programmer slightly modifies some string right in the program, this
 change is later reflected in the PO file by the appearance of a new
@@ -3986,7 +4008,7 @@
 
    The usual commands moving from entry to entry consider untranslated
 entries on the same level as active entries.  Untranslated entries are
-easily recognizable by the fact they end with ‘msgstr ""’.
+easily recognizable by the fact they end with `msgstr ""'.
 
    The work of the translator might be (quite naively) seen as the
 process of seeking for an untranslated entry, editing a translation for
@@ -3994,27 +4016,28 @@
 Some commands are more specifically related to untranslated entry
 processing.
 
-‘u’
-     Find the next untranslated entry (‘po-next-untranslated-entry’).
+`u'
+     Find the next untranslated entry (`po-next-untranslated-entry').
 
-‘U’
+`U'
      Find the previous untranslated entry
-     (‘po-previous-untransted-entry’).
+     (`po-previous-untransted-entry').
 
-‘k’
-     Turn the current entry into an untranslated one (‘po-kill-msgstr’).
+`k'
+     Turn the current entry into an untranslated one (`po-kill-msgstr').
 
-   The commands ‘u’ (‘po-next-untranslated-entry’) and ‘U’
-(‘po-previous-untransted-entry’) move forwards or backwards, chasing for
-an untranslated entry.  If none is found, the search is extended and
-wraps around in the PO file buffer.
+
+   The commands `u' (`po-next-untranslated-entry') and `U'
+(`po-previous-untransted-entry') move forwards or backwards, chasing
+for an untranslated entry.  If none is found, the search is extended
+and wraps around in the PO file buffer.
 
    An entry can be turned back into an untranslated entry by merely
-emptying its translation, using the command ‘k’ (‘po-kill-msgstr’).
+emptying its translation, using the command `k' (`po-kill-msgstr').
 *Note Modifying Translations::.
 
    Also, when time comes to quit working on a PO file buffer with the
-‘q’ command, the translator is asked for confirmation, if some
+`q' command, the translator is asked for confirmation, if some
 untranslated string still exists.
 
 
@@ -4024,13 +4047,13 @@
 ----------------------
 
    By "obsolete" PO file entries, we mean those entries which are
-commented out, usually by ‘msgmerge’ when it found that the translation
+commented out, usually by `msgmerge' when it found that the translation
 is not needed anymore by the package being localized.
 
    The usual commands moving from entry to entry consider obsolete
 entries on the same level as active entries.  Obsolete entries are
-easily recognizable by the fact that all their lines start with ‘#’,
-even those lines containing ‘msgid’ or ‘msgstr’.
+easily recognizable by the fact that all their lines start with `#',
+even those lines containing `msgid' or `msgstr'.
 
    Commands exist for emptying the translation or reinitializing it to
 the original untranslated string.  Commands interfacing with the kill
@@ -4042,48 +4065,50 @@
    Moreover, some commands are more specifically related to obsolete
 entry processing.
 
-‘o’
-     Find the next obsolete entry (‘po-next-obsolete-entry’).
+`o'
+     Find the next obsolete entry (`po-next-obsolete-entry').
 
-‘O’
-     Find the previous obsolete entry (‘po-previous-obsolete-entry’).
+`O'
+     Find the previous obsolete entry (`po-previous-obsolete-entry').
 
-‘<DEL>’
+`<DEL>'
      Make an active entry obsolete, or zap out an obsolete entry
-     (‘po-fade-out-entry’).
+     (`po-fade-out-entry').
 
-   The commands ‘o’ (‘po-next-obsolete-entry’) and ‘O’
-(‘po-previous-obsolete-entry’) move forwards or backwards, chasing for
+
+   The commands `o' (`po-next-obsolete-entry') and `O'
+(`po-previous-obsolete-entry') move forwards or backwards, chasing for
 an obsolete entry.  If none is found, the search is extended and wraps
 around in the PO file buffer.
 
-   PO mode does not provide ways for un-commenting an obsolete entry and
-making it active, because this would reintroduce an original
+   PO mode does not provide ways for un-commenting an obsolete entry
+and making it active, because this would reintroduce an original
 untranslated string which does not correspond to any marked string in
-the program sources.  This goes with the philosophy of never introducing
-useless ‘msgid’ values.
+the program sources.  This goes with the philosophy of never
+introducing useless `msgid' values.
 
    However, it is possible to comment out an active entry, so making it
-obsolete.  GNU ‘gettext’ utilities will later react to the disappearance
-of a translation by using the untranslated string.  The command ‘<DEL>’
-(‘po-fade-out-entry’) pushes the current entry a little further towards
-annihilation.  If the entry is active (it is a translated entry), then
-it is first made fuzzy.  If it is already fuzzy, then the entry is
-merely commented out, with confirmation.  If the entry is already
-obsolete, then it is completely deleted from the PO file.  It is easy to
-recycle the translation so deleted into some other PO file entry,
-usually one which is untranslated.  *Note Modifying Translations::.
+obsolete.  GNU `gettext' utilities will later react to the
+disappearance of a translation by using the untranslated string.  The
+command `<DEL>' (`po-fade-out-entry') pushes the current entry a little
+further towards annihilation.  If the entry is active (it is a
+translated entry), then it is first made fuzzy.  If it is already fuzzy,
+then the entry is merely commented out, with confirmation.  If the entry
+is already obsolete, then it is completely deleted from the PO file.
+It is easy to recycle the translation so deleted into some other PO file
+entry, usually one which is untranslated.  *Note Modifying
+Translations::.
 
    Here is a quite interesting problem to solve for later development of
-PO mode, for those nights you are not sleepy.  The idea would be that PO
-mode might become bright enough, one of these days, to make good guesses
-at retrieving the most probable candidate, among all obsolete entries,
-for initializing the translation of a newly appeared string.  I think it
-might be a quite hard problem to do this algorithmically, as we have to
-develop good and efficient measures of string similarity.  Right now, PO
-mode completely lets the decision to the translator, when the time comes
-to find the adequate obsolete translation, it merely tries to provide
-handy tools for helping her to do so.
+PO mode, for those nights you are not sleepy.  The idea would be that
+PO mode might become bright enough, one of these days, to make good
+guesses at retrieving the most probable candidate, among all obsolete
+entries, for initializing the translation of a newly appeared string.
+I think it might be a quite hard problem to do this algorithmically, as
+we have to develop good and efficient measures of string similarity.
+Right now, PO mode completely lets the decision to the translator, when
+the time comes to find the adequate obsolete translation, it merely
+tries to provide handy tools for helping her to do so.
 
 
 File: gettext.info,  Node: Modifying Translations,  Next: Modifying Comments,  Prev: Obsolete Entries,  Up: PO Mode
@@ -4092,12 +4117,12 @@
 ----------------------------
 
    PO mode prevents direct modification of the PO file, by the usual
-means Emacs gives for altering a buffer’s contents.  By doing so, it
+means Emacs gives for altering a buffer's contents.  By doing so, it
 pretends helping the translator to avoid little clerical errors about
 the overall file format, or the proper quoting of strings, as those
 errors would be easily made.  Other kinds of errors are still possible,
 but some may be caught and diagnosed by the batch validation process,
-which the translator may always trigger by the ‘V’ command.  For all
+which the translator may always trigger by the `V' command.  For all
 other errors, the translator has to rely on her own judgment, and also
 on the linguistic reports submitted to her by the users of the
 translated package, having the same mother tongue.
@@ -4106,46 +4131,47 @@
 diagnosed mechanically or reported by a user, the translators have to
 resort to using the following commands for modifying the translations.
 
-‘<RET>’
-     Interactively edit the translation (‘po-edit-msgstr’).
+`<RET>'
+     Interactively edit the translation (`po-edit-msgstr').
 
-‘<LFD>’
-‘C-j’
+`<LFD>'
+`C-j'
      Reinitialize the translation with the original, untranslated string
-     (‘po-msgid-to-msgstr’).
+     (`po-msgid-to-msgstr').
 
-‘k’
+`k'
      Save the translation on the kill ring, and delete it
-     (‘po-kill-msgstr’).
+     (`po-kill-msgstr').
 
-‘w’
+`w'
      Save the translation on the kill ring, without deleting it
-     (‘po-kill-ring-save-msgstr’).
+     (`po-kill-ring-save-msgstr').
 
-‘y’
+`y'
      Replace the translation, taking the new from the kill ring
-     (‘po-yank-msgstr’).
+     (`po-yank-msgstr').
+
 
-   The command ‘<RET>’ (‘po-edit-msgstr’) opens a new Emacs window meant
-to edit in a new translation, or to modify an already existing
+   The command `<RET>' (`po-edit-msgstr') opens a new Emacs window
+meant to edit in a new translation, or to modify an already existing
 translation.  The new window contains a copy of the translation taken
 from the current PO file entry, all ready for edition, expunged of all
 quoting marks, fully modifiable and with the complete extent of Emacs
-modifying commands.  When the translator is done with her modifications,
-she may use ‘C-c C-c’ to close the subedit window with the automatically
-requoted results, or ‘C-c C-k’ to abort her modifications.  *Note
-Subedit::, for more information.
+modifying commands.  When the translator is done with her
+modifications, she may use `C-c C-c' to close the subedit window with
+the automatically requoted results, or `C-c C-k' to abort her
+modifications.  *Note Subedit::, for more information.
 
-   The command ‘<LFD>’ (‘po-msgid-to-msgstr’) initializes, or
+   The command `<LFD>' (`po-msgid-to-msgstr') initializes, or
 reinitializes the translation with the original string.  This command is
 normally used when the translator wants to redo a fresh translation of
 the original string, disregarding any previous work.
 
-   It is possible to arrange so, whenever editing an untranslated entry,
-the ‘<LFD>’ command be automatically executed.  If you set
-‘po-auto-edit-with-msgid’ to ‘t’, the translation gets initialised with
-the original string, in case none exists already.  The default value for
-‘po-auto-edit-with-msgid’ is ‘nil’.
+   It is possible to arrange so, whenever editing an untranslated
+entry, the `<LFD>' command be automatically executed.  If you set
+`po-auto-edit-with-msgid' to `t', the translation gets initialised with
+the original string, in case none exists already.  The default value
+for `po-auto-edit-with-msgid' is `nil'.
 
    In fact, whether it is best to start a translation with an empty
 string, or rather with a copy of the original string, is a matter of
@@ -4158,40 +4184,41 @@
 original text with the translation, even if this requires some extra
 editing work to get rid of the original.
 
-   The command ‘k’ (‘po-kill-msgstr’) merely empties the translation
+   The command `k' (`po-kill-msgstr') merely empties the translation
 string, so turning the entry into an untranslated one.  But while doing
 so, its previous contents is put apart in a special place, known as the
-kill ring.  The command ‘w’ (‘po-kill-ring-save-msgstr’) has also the
+kill ring.  The command `w' (`po-kill-ring-save-msgstr') has also the
 effect of taking a copy of the translation onto the kill ring, but it
 otherwise leaves the entry alone, and does _not_ remove the translation
-from the entry.  Both commands use exactly the Emacs kill ring, which is
-shared between buffers, and which is well known already to Emacs lovers.
+from the entry.  Both commands use exactly the Emacs kill ring, which
+is shared between buffers, and which is well known already to Emacs
+lovers.
 
-   The translator may use ‘k’ or ‘w’ many times in the course of her
+   The translator may use `k' or `w' many times in the course of her
 work, as the kill ring may hold several saved translations.  From the
-kill ring, strings may later be reinserted in various Emacs buffers.  In
-particular, the kill ring may be used for moving translation strings
+kill ring, strings may later be reinserted in various Emacs buffers.
+In particular, the kill ring may be used for moving translation strings
 between different entries of a single PO file buffer, or if the
 translator is handling many such buffers at once, even between PO files.
 
    To facilitate exchanges with buffers which are not in PO mode, the
-translation string put on the kill ring by the ‘k’ command is fully
+translation string put on the kill ring by the `k' command is fully
 unquoted before being saved: external quotes are removed, multi-line
 strings are concatenated, and backslash escaped sequences are turned
 into their corresponding characters.  In the special case of obsolete
 entries, the translation is also uncommented prior to saving.
 
-   The command ‘y’ (‘po-yank-msgstr’) completely replaces the
+   The command `y' (`po-yank-msgstr') completely replaces the
 translation of the current entry by a string taken from the kill ring.
 Following Emacs terminology, we then say that the replacement string is
-"yanked" into the PO file buffer.  *Note (emacs)Yanking::.  The first
-time ‘y’ is used, the translation receives the value of the most recent
-addition to the kill ring.  If ‘y’ is typed once again, immediately,
-without intervening keystrokes, the translation just inserted is taken
-away and replaced by the second most recent addition to the kill ring.
-By repeating ‘y’ many times in a row, the translator may travel along
-the kill ring for saved strings, until she finds the string she really
-wanted.
+"yanked" into the PO file buffer.  *Note Yanking: (emacs)Yanking.  The
+first time `y' is used, the translation receives the value of the most
+recent addition to the kill ring.  If `y' is typed once again,
+immediately, without intervening keystrokes, the translation just
+inserted is taken away and replaced by the second most recent addition
+to the kill ring.  By repeating `y' many times in a row, the translator
+may travel along the kill ring for saved strings, until she finds the
+string she really wanted.
 
    When a string is yanked into a PO file entry, it is fully and
 automatically requoted for complying with the format PO files should
@@ -4201,13 +4228,13 @@
 course, the necessity of the translated string itself respective to the
 program using it.
 
-   Note that ‘k’ or ‘w’ are not the only commands pushing strings on the
-kill ring, as almost any PO mode command replacing translation strings
-(or the translator comments) automatically saves the old string on the
-kill ring.  The main exceptions to this general rule are the yanking
-commands themselves.
+   Note that `k' or `w' are not the only commands pushing strings on
+the kill ring, as almost any PO mode command replacing translation
+strings (or the translator comments) automatically saves the old string
+on the kill ring.  The main exceptions to this general rule are the
+yanking commands themselves.
 
-   To better illustrate the operation of killing and yanking, let’s use
+   To better illustrate the operation of killing and yanking, let's use
 an actual example, taken from a common situation.  When the programmer
 slightly modifies some string right in the program, his change is later
 reflected in the PO file by the appearance of a new untranslated entry
@@ -4215,26 +4242,26 @@
 original or unmodified string becomes obsolete.  In many cases, the
 translator might spare herself some work by retrieving the unmodified
 translation from the obsolete entry, then initializing the untranslated
-entry ‘msgstr’ field with this retrieved translation.  Once this done,
+entry `msgstr' field with this retrieved translation.  Once this done,
 the obsolete entry is not wanted anymore, and may be safely deleted.
 
    When the translator finds an untranslated entry and suspects that a
-slight variant of the translation exists, she immediately uses ‘m’ to
+slight variant of the translation exists, she immediately uses `m' to
 mark the current entry location, then starts chasing obsolete entries
-with ‘o’, hoping to find some translation corresponding to the
-unmodified string.  Once found, she uses the ‘<DEL>’ command for
-deleting the obsolete entry, knowing that ‘<DEL>’ also _kills_ the
+with `o', hoping to find some translation corresponding to the
+unmodified string.  Once found, she uses the `<DEL>' command for
+deleting the obsolete entry, knowing that `<DEL>' also _kills_ the
 translation, that is, pushes the translation on the kill ring.  Then,
-‘r’ returns to the initial untranslated entry, and ‘y’ then _yanks_ the
-saved translation right into the ‘msgstr’ field.  The translator is then
-free to use ‘<RET>’ for fine tuning the translation contents, and maybe
-to later use ‘u’, then ‘m’ again, for going on with the next
+`r' returns to the initial untranslated entry, and `y' then _yanks_ the
+saved translation right into the `msgstr' field.  The translator is
+then free to use `<RET>' for fine tuning the translation contents, and
+maybe to later use `u', then `m' again, for going on with the next
 untranslated string.
 
    When some sequence of keys has to be typed over and over again, the
 translator may find it useful to become better acquainted with the Emacs
 capability of learning these sequences and playing them back under
-request.  *Note (emacs)Keyboard Macros::.
+request.  *Note Keyboard Macros: (emacs)Keyboard Macros.
 
 
 File: gettext.info,  Node: Modifying Comments,  Next: Subedit,  Prev: Modifying Translations,  Up: PO Mode
@@ -4246,12 +4273,12 @@
 difficulties, for which decisions have to be made, and the choices
 further documented.  These documents may be saved within the PO file in
 form of translator comments, which the translator is free to create,
-delete, or modify at will.  These comments may be useful to herself when
-she returns to this PO file after a while.
+delete, or modify at will.  These comments may be useful to herself
+when she returns to this PO file after a while.
 
-   Comments not having whitespace after the initial ‘#’, for example,
-those beginning with ‘#.’ or ‘#:’, are _not_ translator comments, they
-are exclusively created by other ‘gettext’ tools.  So, the commands
+   Comments not having whitespace after the initial `#', for example,
+those beginning with `#.' or `#:', are _not_ translator comments, they
+are exclusively created by other `gettext' tools.  So, the commands
 below will never alter such system added comments, they are not meant
 for the translator to modify.  *Note PO Files::.
 
@@ -4259,20 +4286,21 @@
 translations, so the general indications given for those apply here.
 *Note Modifying Translations::.
 
-‘#’
-     Interactively edit the translator comments (‘po-edit-comment’).
+`#'
+     Interactively edit the translator comments (`po-edit-comment').
 
-‘K’
+`K'
      Save the translator comments on the kill ring, and delete it
-     (‘po-kill-comment’).
+     (`po-kill-comment').
 
-‘W’
+`W'
      Save the translator comments on the kill ring, without deleting it
-     (‘po-kill-ring-save-comment’).
+     (`po-kill-ring-save-comment').
 
-‘Y’
+`Y'
      Replace the translator comments, taking the new from the kill ring
-     (‘po-yank-comment’).
+     (`po-yank-comment').
+
 
    These commands parallel PO mode commands for modifying the
 translation strings, and behave much the same way as they do, except
@@ -4281,49 +4309,49 @@
 given below are slightly succinct, it is because the full details have
 already been given.  *Note Modifying Translations::.
 
-   The command ‘#’ (‘po-edit-comment’) opens a new Emacs window
+   The command `#' (`po-edit-comment') opens a new Emacs window
 containing a copy of the translator comments on the current PO file
 entry.  If there are no such comments, PO mode understands that the
 translator wants to add a comment to the entry, and she is presented
-with an empty screen.  Comment marks (‘#’) and the space following them
+with an empty screen.  Comment marks (`#') and the space following them
 are automatically removed before edition, and reinstated after.  For
-translator comments pertaining to obsolete entries, the uncommenting and
-recommenting operations are done twice.  Once in the editing window, the
-keys ‘C-c C-c’ allow the translator to tell she is finished with editing
-the comment.  *Note Subedit::, for further details.
+translator comments pertaining to obsolete entries, the uncommenting
+and recommenting operations are done twice.  Once in the editing
+window, the keys `C-c C-c' allow the translator to tell she is finished
+with editing the comment.  *Note Subedit::, for further details.
 
-   Functions found on ‘po-subedit-mode-hook’, if any, are executed after
+   Functions found on `po-subedit-mode-hook', if any, are executed after
 the string has been inserted in the edit buffer.
 
-   The command ‘K’ (‘po-kill-comment’) gets rid of all translator
-comments, while saving those comments on the kill ring.  The command ‘W’
-(‘po-kill-ring-save-comment’) takes a copy of the translator comments on
-the kill ring, but leaves them undisturbed in the current entry.  The
-command ‘Y’ (‘po-yank-comment’) completely replaces the translator
-comments by a string taken at the front of the kill ring.  When this
-command is immediately repeated, the comments just inserted are
-withdrawn, and replaced by other strings taken along the kill ring.
+   The command `K' (`po-kill-comment') gets rid of all translator
+comments, while saving those comments on the kill ring.  The command
+`W' (`po-kill-ring-save-comment') takes a copy of the translator
+comments on the kill ring, but leaves them undisturbed in the current
+entry.  The command `Y' (`po-yank-comment') completely replaces the
+translator comments by a string taken at the front of the kill ring.
+When this command is immediately repeated, the comments just inserted
+are withdrawn, and replaced by other strings taken along the kill ring.
 
    On the kill ring, all strings have the same nature.  There is no
 distinction between _translation_ strings and _translator comments_
-strings.  So, for example, let’s presume the translator has just
+strings.  So, for example, let's presume the translator has just
 finished editing a translation, and wants to create a new translator
 comment to document why the previous translation was not good, just to
 remember what was the problem.  Foreseeing that she will do that in her
-documentation, the translator may want to quote the previous translation
-in her translator comments.  To do so, she may initialize the translator
-comments with the previous translation, still at the head of the kill
-ring.  Because editing already pushed the previous translation on the
-kill ring, she merely has to type ‘M-w’ prior to ‘#’, and the previous
-translation will be right there, all ready for being introduced by some
-explanatory text.
+documentation, the translator may want to quote the previous
+translation in her translator comments.  To do so, she may initialize
+the translator comments with the previous translation, still at the
+head of the kill ring.  Because editing already pushed the previous
+translation on the kill ring, she merely has to type `M-w' prior to
+`#', and the previous translation will be right there, all ready for
+being introduced by some explanatory text.
 
    On the other hand, presume there are some translator comments already
 and that the translator wants to add to those comments, instead of
 wholly replacing them.  Then, she should edit the comment right away
-with ‘#’.  Once inside the editing window, she can use the regular Emacs
-commands ‘C-y’ (‘yank’) and ‘M-y’ (‘yank-pop’) to get the previous
-translation where she likes.
+with `#'.  Once inside the editing window, she can use the regular
+Emacs commands `C-y' (`yank') and `M-y' (`yank-pop') to get the
+previous translation where she likes.
 
 
 File: gettext.info,  Node: Subedit,  Next: C Sources Context,  Prev: Modifying Comments,  Up: PO Mode
@@ -4335,71 +4363,72 @@
 described in fuller detail.  It installs a few commands over the usual
 editing set of Emacs, which are described below.
 
-‘C-c C-c’
-     Complete edition (‘po-subedit-exit’).
+`C-c C-c'
+     Complete edition (`po-subedit-exit').
+
+`C-c C-k'
+     Abort edition (`po-subedit-abort').
 
-‘C-c C-k’
-     Abort edition (‘po-subedit-abort’).
+`C-c C-a'
+     Consult auxiliary PO files (`po-subedit-cycle-auxiliary').
 
-‘C-c C-a’
-     Consult auxiliary PO files (‘po-subedit-cycle-auxiliary’).
 
-   The window’s contents represents a translation for a given message,
+   The window's contents represents a translation for a given message,
 or a translator comment.  The translator may modify this window to her
-heart’s content.  Once this is done, the command ‘C-c C-c’
-(‘po-subedit-exit’) may be used to return the edited translation into
+heart's content.  Once this is done, the command `C-c C-c'
+(`po-subedit-exit') may be used to return the edited translation into
 the PO file, replacing the original translation, even if it moved out of
 sight or if buffers were switched.
 
    If the translator becomes unsatisfied with her translation or
 comment, to the extent she prefers keeping what was existent prior to
-the ‘<RET>’ or ‘#’ command, she may use the command ‘C-c C-k’
-(‘po-subedit-abort’) to merely get rid of edition, while preserving the
+the `<RET>' or `#' command, she may use the command `C-c C-k'
+(`po-subedit-abort') to merely get rid of edition, while preserving the
 original translation or comment.  Another way would be for her to exit
-normally with ‘C-c C-c’, then type ‘U’ once for undoing the whole effect
-of last edition.
+normally with `C-c C-c', then type `U' once for undoing the whole
+effect of last edition.
 
-   The command ‘C-c C-a’ (‘po-subedit-cycle-auxiliary’) allows for
+   The command `C-c C-a' (`po-subedit-cycle-auxiliary') allows for
 glancing through translations already achieved in other languages,
 directly while editing the current translation.  This may be quite
 convenient when the translator is fluent at many languages, but of
 course, only makes sense when such completed auxiliary PO files are
 already available to her (*note Auxiliary::).
 
-   Functions found on ‘po-subedit-mode-hook’, if any, are executed after
+   Functions found on `po-subedit-mode-hook', if any, are executed after
 the string has been inserted in the edit buffer.
 
-   While editing her translation, the translator should pay attention to
-not inserting unwanted ‘<RET>’ (newline) characters at the end of the
-translated string if those are not meant to be there, or to removing
+   While editing her translation, the translator should pay attention
+to not inserting unwanted `<RET>' (newline) characters at the end of
+the translated string if those are not meant to be there, or to removing
 such characters when they are required.  Since these characters are not
 visible in the editing buffer, they are easily introduced by mistake.
-To help her, ‘<RET>’ automatically puts the character ‘<’ at the end of
-the string being edited, but this ‘<’ is not really part of the string.
-On exiting the editing window with ‘C-c C-c’, PO mode automatically
-removes such ‘<’ and all whitespace added after it.  If the translator
-adds characters after the terminating ‘<’, it looses its delimiting
+To help her, `<RET>' automatically puts the character `<' at the end of
+the string being edited, but this `<' is not really part of the string.
+On exiting the editing window with `C-c C-c', PO mode automatically
+removes such `<' and all whitespace added after it.  If the translator
+adds characters after the terminating `<', it looses its delimiting
 property and integrally becomes part of the string.  If she removes the
-delimiting ‘<’, then the edited string is taken _as is_, with all
+delimiting `<', then the edited string is taken _as is_, with all
 trailing newlines, even if invisible.  Also, if the translated string
-ought to end itself with a genuine ‘<’, then the delimiting ‘<’ may not
+ought to end itself with a genuine `<', then the delimiting `<' may not
 be removed; so the string should appear, in the editing window, as
-ending with two ‘<’ in a row.
+ending with two `<' in a row.
 
-   When a translation (or a comment) is being edited, the translator may
-move the cursor back into the PO file buffer and freely move to other
-entries, browsing at will.  If, with an edition pending, the translator
-wanders in the PO file buffer, she may decide to start modifying another
-entry.  Each entry being edited has its own subedit buffer.  It is
-possible to simultaneously edit the translation _and_ the comment of a
-single entry, or to edit entries in different PO files, all at once.
-Typing ‘<RET>’ on a field already being edited merely resumes that
-particular edit.  Yet, the translator should better be comfortable at
-handling many Emacs windows!
+   When a translation (or a comment) is being edited, the translator
+may move the cursor back into the PO file buffer and freely move to
+other entries, browsing at will.  If, with an edition pending, the
+translator wanders in the PO file buffer, she may decide to start
+modifying another entry.  Each entry being edited has its own subedit
+buffer.  It is possible to simultaneously edit the translation _and_
+the comment of a single entry, or to edit entries in different PO
+files, all at once.  Typing `<RET>' on a field already being edited
+merely resumes that particular edit.  Yet, the translator should better
+be comfortable at handling many Emacs windows!
 
    Pending subedits may be completed or aborted in any order, regardless
 of how or when they were started.  When many subedits are pending and
-the translator asks for quitting the PO file (with the ‘q’ command),
+the translator asks for quitting the PO file (with the `q' command),
 subedits are automatically resumed one at a time, so she may decide for
 each of them.
 
@@ -4410,7 +4439,7 @@
 ------------------------
 
    PO mode is particularly powerful when used with PO files created
-through GNU ‘gettext’ utilities, as those utilities insert special
+through GNU `gettext' utilities, as those utilities insert special
 comments in the PO files they generate.  Some of these special comments
 relate the PO file entry to exactly where the untranslated string
 appears in the program sources.
@@ -4419,8 +4448,8 @@
 often faced with an original string which is not as informative as it
 normally should be, being succinct, cryptic, or otherwise ambiguous.
 Before choosing how to translate the string, she needs to understand
-better what the string really means and how tight the translation has to
-be.  Most of the time, when problems arise, the only way left to make
+better what the string really means and how tight the translation has
+to be.  Most of the time, when problems arise, the only way left to make
 her judgment is looking at the true program sources from where this
 string originated, searching for surrounding comments the programmer
 might have put in there, and looking around for helping clues of _any_
@@ -4432,62 +4461,63 @@
 should not be shy at taking a look, once in a while.  It is most
 probable that she will still be able to find some of the hints she
 needs.  She will learn quickly to not feel uncomfortable in program
-code, paying more attention to programmer’s comments, variable and
+code, paying more attention to programmer's comments, variable and
 function names (if he dared choosing them well), and overall
 organization, than to the program code itself.
 
    The following commands are meant to help the translator at getting
 program source context for a PO file entry.
 
-‘s’
+`s'
      Resume the display of a program source context, or cycle through
-     them (‘po-cycle-source-reference’).
+     them (`po-cycle-source-reference').
 
-‘M-s’
+`M-s'
      Display of a program source context selected by menu
-     (‘po-select-source-reference’).
+     (`po-select-source-reference').
 
-‘S’
+`S'
      Add a directory to the search path for source files
-     (‘po-consider-source-path’).
+     (`po-consider-source-path').
 
-‘M-S’
+`M-S'
      Delete a directory from the search path for source files
-     (‘po-ignore-source-path’).
+     (`po-ignore-source-path').
 
-   The commands ‘s’ (‘po-cycle-source-reference’) and ‘M-s’
-(‘po-select-source-reference’) both open another window displaying some
+
+   The commands `s' (`po-cycle-source-reference') and `M-s'
+(`po-select-source-reference') both open another window displaying some
 source program file, and already positioned in such a way that it shows
 an actual use of the string to be translated.  By doing so, the command
 gives source program context for the string.  But if the entry has no
-source context references, or if all references are unresolved along the
-search path for program sources, then the command diagnoses this as an
-error.
+source context references, or if all references are unresolved along
+the search path for program sources, then the command diagnoses this as
+an error.
 
-   Even if ‘s’ (or ‘M-s’) opens a new window, the cursor stays in the PO
-file window.  If the translator really wants to get into the program
+   Even if `s' (or `M-s') opens a new window, the cursor stays in the
+PO file window.  If the translator really wants to get into the program
 source window, she ought to do it explicitly, maybe by using command
-‘O’.
+`O'.
 
-   When ‘s’ is typed for the first time, or for a PO file entry which is
-different of the last one used for getting source context, then the
+   When `s' is typed for the first time, or for a PO file entry which
+is different of the last one used for getting source context, then the
 command reacts by giving the first context available for this entry, if
 any.  If some context has already been recently displayed for the
 current PO file entry, and the translator wandered off to do other
-things, typing ‘s’ again will merely resume, in another window, the
+things, typing `s' again will merely resume, in another window, the
 context last displayed.  In particular, if the translator moved the
 cursor away from the context in the source file, the command will bring
-the cursor back to the context.  By using ‘s’ many times in a row, with
+the cursor back to the context.  By using `s' many times in a row, with
 no other commands intervening, PO mode will cycle to the next available
 contexts for this particular entry, getting back to the first context
 once the last has been shown.
 
-   The command ‘M-s’ behaves differently.  Instead of cycling through
+   The command `M-s' behaves differently.  Instead of cycling through
 references, it lets the translator choose a particular reference among
 many, and displays that reference.  It is best used with completion, if
-the translator types ‘<TAB>’ immediately after ‘M-s’, in response to the
-question, she will be offered a menu of all possible references, as a
-reminder of which are the acceptable answers.  This command is useful
+the translator types `<TAB>' immediately after `M-s', in response to
+the question, she will be offered a menu of all possible references, as
+a reminder of which are the acceptable answers.  This command is useful
 only where there are really many contexts available for a single string
 to translate.
 
@@ -4499,11 +4529,11 @@
 its normal location.  When this happens, the translator should tell PO
 mode in which directory normally sits the genuine PO file.  Many such
 directories may be specified, and all together, they constitute what is
-called the "search path" for program sources.  The command ‘S’
-(‘po-consider-source-path’) is used to interactively enter a new
-directory at the front of the search path, and the command ‘M-S’
-(‘po-ignore-source-path’) is used to select, with completion, one of the
-directories she does not want anymore on the search path.
+called the "search path" for program sources.  The command `S'
+(`po-consider-source-path') is used to interactively enter a new
+directory at the front of the search path, and the command `M-S'
+(`po-ignore-source-path') is used to select, with completion, one of
+the directories she does not want anymore on the search path.
 
 
 File: gettext.info,  Node: Auxiliary,  Prev: C Sources Context,  Up: PO Mode
@@ -4520,58 +4550,59 @@
 
    An "auxiliary" PO file is an existing PO file meant for the same
 package the translator is working on, but targeted to a different mother
-tongue language.  Commands exist for declaring and handling auxiliary PO
-files, and also for showing contexts for the entry under work.
+tongue language.  Commands exist for declaring and handling auxiliary
+PO files, and also for showing contexts for the entry under work.
 
    Here are the auxiliary file commands available in PO mode.
 
-‘a’
+`a'
      Seek auxiliary files for another translation for the same entry
-     (‘po-cycle-auxiliary’).
+     (`po-cycle-auxiliary').
 
-‘C-c C-a’
-     Switch to a particular auxiliary file (‘po-select-auxiliary’).
+`C-c C-a'
+     Switch to a particular auxiliary file (`po-select-auxiliary').
 
-‘A’
+`A'
      Declare this PO file as an auxiliary file
-     (‘po-consider-as-auxiliary’).
+     (`po-consider-as-auxiliary').
 
-‘M-A’
+`M-A'
      Remove this PO file from the list of auxiliary files
-     (‘po-ignore-as-auxiliary’).
+     (`po-ignore-as-auxiliary').
+
 
-   Command ‘A’ (‘po-consider-as-auxiliary’) adds the current PO file to
-the list of auxiliary files, while command ‘M-A’
-(‘po-ignore-as-auxiliary’ just removes it.
+   Command `A' (`po-consider-as-auxiliary') adds the current PO file to
+the list of auxiliary files, while command `M-A'
+(`po-ignore-as-auxiliary' just removes it.
 
-   The command ‘a’ (‘po-cycle-auxiliary’) seeks all auxiliary PO files,
+   The command `a' (`po-cycle-auxiliary') seeks all auxiliary PO files,
 round-robin, searching for a translated entry in some other language
-having an ‘msgid’ field identical as the one for the current entry.  The
-found PO file, if any, takes the place of the current PO file in the
-display (its window gets on top).  Before doing so, the current PO file
-is also made into an auxiliary file, if not already.  So, ‘a’ in this
-newly displayed PO file will seek another PO file, and so on, so
-repeating ‘a’ will eventually yield back the original PO file.
-
-   The command ‘C-c C-a’ (‘po-select-auxiliary’) asks the translator for
-her choice of a particular auxiliary file, with completion, and then
-switches to that selected PO file.  The command also checks if the
-selected file has an ‘msgid’ field identical as the one for the current
-entry, and if yes, this entry becomes current.  Otherwise, the cursor of
-the selected file is left undisturbed.
+having an `msgid' field identical as the one for the current entry.
+The found PO file, if any, takes the place of the current PO file in
+the display (its window gets on top).  Before doing so, the current PO
+file is also made into an auxiliary file, if not already.  So, `a' in
+this newly displayed PO file will seek another PO file, and so on, so
+repeating `a' will eventually yield back the original PO file.
+
+   The command `C-c C-a' (`po-select-auxiliary') asks the translator
+for her choice of a particular auxiliary file, with completion, and
+then switches to that selected PO file.  The command also checks if the
+selected file has an `msgid' field identical as the one for the current
+entry, and if yes, this entry becomes current.  Otherwise, the cursor
+of the selected file is left undisturbed.
 
    For all this to work fully, auxiliary PO files will have to be
-normalized, in that way that ‘msgid’ fields should be written _exactly_
-the same way.  It is possible to write ‘msgid’ fields in various ways
+normalized, in that way that `msgid' fields should be written _exactly_
+the same way.  It is possible to write `msgid' fields in various ways
 for representing the same string, different writing would break the
 proper behaviour of the auxiliary file commands of PO mode.  This is not
 expected to be much a problem in practice, as most existing PO files
-have their ‘msgid’ entries written by the same GNU ‘gettext’ tools.
+have their `msgid' entries written by the same GNU `gettext' tools.
 
    However, PO files initially created by PO mode itself, while marking
 strings in source files, are normalised differently.  So are PO files
-resulting of the ‘M-x normalize’ command.  Until these discrepancies
-between PO mode and other GNU ‘gettext’ tools get fully resolved, the
+resulting of the `M-x normalize' command.  Until these discrepancies
+between PO mode and other GNU `gettext' tools get fully resolved, the
 translator should stay aware of normalisation issues.
 
 
@@ -4599,27 +4630,27 @@
 
    Basically every PO file consisting of translated entries only can be
 declared as a valid compendium.  Often the translator wants to have
-special compendia; let’s consider two cases: ‘concatenating PO files’
-and ‘extracting a message subset from a PO file’.
+special compendia; let's consider two cases: `concatenating PO files'
+and `extracting a message subset from a PO file'.
 
 8.4.1.1 Concatenate PO Files
 ............................
 
    To concatenate several valid PO files into one compendium file you
-can use ‘msgcomm’ or ‘msgcat’ (the latter preferred):
+can use `msgcomm' or `msgcat' (the latter preferred):
 
      msgcat -o compendium.po file1.po file2.po
 
-   By default, ‘msgcat’ will accumulate divergent translations for the
-same string.  Those occurrences will be marked as ‘fuzzy’ and highly
-visible decorated; calling ‘msgcat’ on ‘file1.po’:
+   By default, `msgcat' will accumulate divergent translations for the
+same string.  Those occurrences will be marked as `fuzzy' and highly
+visible decorated; calling `msgcat' on `file1.po':
 
      #: src/hello.c:200
      #, c-format
      msgid "Report bugs to <%s>.\n"
      msgstr "Comunicar `bugs' a <%s>.\n"
 
-and ‘file2.po’:
+and `file2.po':
 
      #: src/bye.c:100
      #, c-format
@@ -4637,29 +4668,30 @@
      "#-#-#-#-#  file2.po  #-#-#-#-#\n"
      "Comunicar \"bugs\" a <%s>.\n"
 
-The translator will have to resolve this “conflict” manually; she has to
-decide whether the first or the second version is appropriate (or
-provide a new translation), to delete the “marker lines”, and finally to
-remove the ‘fuzzy’ mark.
+The translator will have to resolve this "conflict" manually; she has
+to decide whether the first or the second version is appropriate (or
+provide a new translation), to delete the "marker lines", and finally
+to remove the `fuzzy' mark.
 
    If the translator knows in advance the first found translation of a
 message is always the best translation she can make use to the
-‘--use-first’ switch:
+`--use-first' switch:
 
      msgcat --use-first -o compendium.po file1.po file2.po
 
-   A good compendium file must not contain ‘fuzzy’ or untranslated
-entries.  If input files are “dirty” you must preprocess the input files
-or postprocess the result using ‘msgattrib --translated --no-fuzzy’.
+   A good compendium file must not contain `fuzzy' or untranslated
+entries.  If input files are "dirty" you must preprocess the input
+files or postprocess the result using `msgattrib --translated
+--no-fuzzy'.
 
 8.4.1.2 Extract a Message Subset from a PO File
 ...............................................
 
    Nobody wants to translate the same messages again and again; thus you
-may wish to have a compendium file containing ‘getopt.c’ messages.
+may wish to have a compendium file containing `getopt.c' messages.
 
-   To extract a message subset (e.g., all ‘getopt.c’ messages) from an
-existing PO file into one compendium file you can use ‘msggrep’:
+   To extract a message subset (e.g., all `getopt.c' messages) from an
+existing PO file into one compendium file you can use `msggrep':
 
      msggrep --location src/getopt.c -o compendium.po file.po
 
@@ -4676,7 +4708,7 @@
 .........................................
 
    Since a PO file with translations does not exist the translator can
-merely use ‘/dev/null’ to fake the “old” translation file.
+merely use `/dev/null' to fake the "old" translation file.
 
      msgmerge --compendium compendium.po -o file.po /dev/null file.pot
 
@@ -4684,8 +4716,8 @@
 ...........................................
 
    Concatenate the compendium file(s) and the existing PO, merge the
-result with the POT file and remove the obsolete entries (optional, here
-done using ‘msgattrib’):
+result with the POT file and remove the obsolete entries (optional,
+here done using `sed'):
 
      msgcat --use-first -o update.po compendium1.po compendium2.po file.po
      msgmerge update.po file.pot | msgattrib --no-obsolete > file.po
@@ -4697,420 +4729,422 @@
 ***********************
 
    Sometimes it is necessary to manipulate PO files in a way that is
-better performed automatically than by hand.  GNU ‘gettext’ includes a
+better performed automatically than by hand.  GNU `gettext' includes a
 complete set of tools for this purpose.
 
    When merging two packages into a single package, the resulting POT
-file will be the concatenation of the two packages’ POT files.  Thus the
-maintainer must concatenate the two existing package translations into a
-single translation catalog, for each language.  This is best performed
-using ‘msgcat’.  It is then the translators’ duty to deal with any
+file will be the concatenation of the two packages' POT files.  Thus the
+maintainer must concatenate the two existing package translations into
+a single translation catalog, for each language.  This is best performed
+using `msgcat'.  It is then the translators' duty to deal with any
 possible conflicts that arose during the merge.
 
    When a translator takes over the translation job from another
 translator, but she uses a different character encoding in her locale,
 she will convert the catalog to her character encoding.  This is best
-done through the ‘msgconv’ program.
+done through the `msgconv' program.
 
    When a maintainer takes a source file with tagged messages from
 another package, he should also take the existing translations for this
 source file (and not let the translators do the same job twice).  One
-way to do this is through ‘msggrep’, another is to create a POT file for
-that source file and use ‘msgmerge’.
+way to do this is through `msggrep', another is to create a POT file for
+that source file and use `msgmerge'.
 
    When a translator wants to adjust some translation catalog for a
-special dialect or orthography — for example, German as written in
-Switzerland versus German as written in Germany — she needs to apply
+special dialect or orthography -- for example, German as written in
+Switzerland versus German as written in Germany -- she needs to apply
 some text processing to every message in the catalog.  The tool for
-doing this is ‘msgfilter’.
+doing this is `msgfilter'.
 
-   Another use of ‘msgfilter’ is to produce approximately the POT file
+   Another use of `msgfilter' is to produce approximately the POT file
 for which a given PO file was made.  This can be done through a filter
-command like ‘msgfilter sed -e d | sed -e '/^# /d'’.  Note that the
+command like `msgfilter sed -e d | sed -e '/^# /d''.  Note that the
 original POT file may have had different comments and different plural
-message counts, that’s why it’s better to use the original POT file if
+message counts, that's why it's better to use the original POT file if
 available.
 
    When a translator wants to check her translations, for example
-according to orthography rules or using a non-interactive spell checker,
-she can do so using the ‘msgexec’ program.
+according to orthography rules or using a non-interactive spell
+checker, she can do so using the `msgexec' program.
 
    When third party tools create PO or POT files, sometimes duplicates
-cannot be avoided.  But the GNU ‘gettext’ tools give an error when they
+cannot be avoided.  But the GNU `gettext' tools give an error when they
 encounter duplicate msgids in the same file and in the same domain.  To
-merge duplicates, the ‘msguniq’ program can be used.
+merge duplicates, the `msguniq' program can be used.
 
-   ‘msgcomm’ is a more general tool for keeping or throwing away
+   `msgcomm' is a more general tool for keeping or throwing away
 duplicates, occurring in different files.
 
-   ‘msgcmp’ can be used to check whether a translation catalog is
+   `msgcmp' can be used to check whether a translation catalog is
 completely translated.
 
-   ‘msgattrib’ can be used to select and extract only the fuzzy or
+   `msgattrib' can be used to select and extract only the fuzzy or
 untranslated messages of a translation catalog.
 
-   ‘msgen’ is useful as a first step for preparing English translation
-catalogs.  It copies each message’s msgid to its msgstr.
+   `msgen' is useful as a first step for preparing English translation
+catalogs.  It copies each message's msgid to its msgstr.
 
    Finally, for those applications where all these various programs are
-not sufficient, a library ‘libgettextpo’ is provided that can be used to
+not sufficient, a library `libgettextpo' is provided that can be used to
 write other specialized programs that process PO files.
 
 * Menu:
 
-* msgcat Invocation::           Invoking the ‘msgcat’ Program
-* msgconv Invocation::          Invoking the ‘msgconv’ Program
-* msggrep Invocation::          Invoking the ‘msggrep’ Program
-* msgfilter Invocation::        Invoking the ‘msgfilter’ Program
-* msguniq Invocation::          Invoking the ‘msguniq’ Program
-* msgcomm Invocation::          Invoking the ‘msgcomm’ Program
-* msgcmp Invocation::           Invoking the ‘msgcmp’ Program
-* msgattrib Invocation::        Invoking the ‘msgattrib’ Program
-* msgen Invocation::            Invoking the ‘msgen’ Program
-* msgexec Invocation::          Invoking the ‘msgexec’ Program
+* msgcat Invocation::           Invoking the `msgcat' Program
+* msgconv Invocation::          Invoking the `msgconv' Program
+* msggrep Invocation::          Invoking the `msggrep' Program
+* msgfilter Invocation::        Invoking the `msgfilter' Program
+* msguniq Invocation::          Invoking the `msguniq' Program
+* msgcomm Invocation::          Invoking the `msgcomm' Program
+* msgcmp Invocation::           Invoking the `msgcmp' Program
+* msgattrib Invocation::        Invoking the `msgattrib' Program
+* msgen Invocation::            Invoking the `msgen' Program
+* msgexec Invocation::          Invoking the `msgexec' Program
 * Colorizing::                  Highlighting parts of PO files
 * libgettextpo::                Writing your own programs that process PO files
 
 
 File: gettext.info,  Node: msgcat Invocation,  Next: msgconv Invocation,  Prev: Manipulating,  Up: Manipulating
 
-9.1 Invoking the ‘msgcat’ Program
+9.1 Invoking the `msgcat' Program
 =================================
 
      msgcat [OPTION] [INPUTFILE]...
 
-   The ‘msgcat’ program concatenates and merges the specified PO files.
+   The `msgcat' program concatenates and merges the specified PO files.
 It finds messages which are common to two or more of the specified PO
-files.  By using the ‘--more-than’ option, greater commonality may be
-requested before messages are printed.  Conversely, the ‘--less-than’
+files.  By using the `--more-than' option, greater commonality may be
+requested before messages are printed.  Conversely, the `--less-than'
 option may be used to specify less commonality before messages are
-printed (i.e. ‘--less-than=2’ will only print the unique messages).
-Translations, comments, extracted comments, and file positions will be
-cumulated, except that if ‘--use-first’ is specified, they will be taken
-from the first PO file to define them.
+printed (i.e.  `--less-than=2' will only print the unique messages).
+Translations, comments and extract comments will be cumulated, except
+that if `--use-first' is specified, they will be taken from the first
+PO file to define them.  File positions from all PO files will be
+cumulated.
 
 9.1.1 Input file location
 -------------------------
 
-‘INPUTFILE …’
+`INPUTFILE ...'
      Input files.
 
-‘-f FILE’
-‘--files-from=FILE’
-     Read the names of the input files from FILE instead of getting them
-     from the command line.
+`-f FILE'
+`--files-from=FILE'
+     Read the names of the input files from FILE instead of getting
+     them from the command line.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If INPUTFILE is ‘-’, standard input is read.
+
+   If INPUTFILE is `-', standard input is read.
 
 9.1.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.1.3 Message selection
 -----------------------
 
-‘-< NUMBER’
-‘--less-than=NUMBER’
+`-< NUMBER'
+`--less-than=NUMBER'
      Print messages with less than NUMBER definitions, defaults to
      infinite if not set.
 
-‘-> NUMBER’
-‘--more-than=NUMBER’
+`-> NUMBER'
+`--more-than=NUMBER'
      Print messages with more than NUMBER definitions, defaults to 0 if
      not set.
 
-‘-u’
-‘--unique’
-     Shorthand for ‘--less-than=2’.  Requests that only unique messages
+`-u'
+`--unique'
+     Shorthand for `--less-than=2'.  Requests that only unique messages
      be printed.
 
+
 9.1.4 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input files are Java ResourceBundles in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
 
-‘--stringtable-input’
+`--stringtable-input'
      Assume the input files are NeXTstep/GNUstep localized resource
-     files in ‘.strings’ syntax, not in PO file syntax.
+     files in `.strings' syntax, not in PO file syntax.
+
 
 9.1.5 Output details
 --------------------
 
-‘-t’
-‘--to-code=NAME’
+`-t'
+`--to-code=NAME'
      Specify encoding for output.
 
-‘--use-first’
-     Use first available translation for each message.  Don’t merge
+`--use-first'
+     Use first available translation for each message.  Don't merge
      several translations into one.
 
-‘--lang=CATALOGNAME’
-     Specify the ‘Language’ field to be used in the header entry.  See
+`--lang=CATALOGNAME'
+     Specify the `Language' field to be used in the header entry.  See
      *note Header Entry:: for the meaning of this field.  Note: The
-     ‘Language-Team’ and ‘Plural-Forms’ fields are left unchanged.
+     `Language-Team' and `Plural-Forms' fields are left unchanged.
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`-n'
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 9.1.6 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msgconv Invocation,  Next: msggrep Invocation,  Prev: msgcat Invocation,  Up: Manipulating
 
-9.2 Invoking the ‘msgconv’ Program
+9.2 Invoking the `msgconv' Program
 ==================================
 
      msgconv [OPTION] [INPUTFILE]
 
-   The ‘msgconv’ program converts a translation catalog to a different
+   The `msgconv' program converts a translation catalog to a different
 character encoding.
 
 9.2.1 Input file location
 -------------------------
 
-‘INPUTFILE’
+`INPUTFILE'
      Input PO file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If no INPUTFILE is given or if it is ‘-’, standard input is read.
+
+   If no INPUTFILE is given or if it is `-', standard input is read.
 
 9.2.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.2.3 Conversion target
 -----------------------
 
-‘-t’
-‘--to-code=NAME’
+`-t'
+`--to-code=NAME'
      Specify encoding for output.
 
-   The default encoding is the current locale’s encoding.
+
+   The default encoding is the current locale's encoding.
 
 9.2.4 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.2.5 Output details
 --------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 9.2.6 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msggrep Invocation,  Next: msgfilter Invocation,  Prev: msgconv Invocation,  Up: Manipulating
 
-9.3 Invoking the ‘msggrep’ Program
+9.3 Invoking the `msggrep' Program
 ==================================
 
      msggrep [OPTION] [INPUTFILE]
 
-   The ‘msggrep’ program extracts all messages of a translation catalog
+   The `msggrep' program extracts all messages of a translation catalog
 that match a given pattern or belong to some given source files.
 
 9.3.1 Input file location
 -------------------------
 
-‘INPUTFILE’
+`INPUTFILE'
      Input PO file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If no INPUTFILE is given or if it is ‘-’, standard input is read.
+
+   If no INPUTFILE is given or if it is `-', standard input is read.
 
 9.3.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.3.3 Message selection
 -----------------------
@@ -5120,15 +5154,20 @@
        [-C COMMENT-PATTERN]
 
    A message is selected if
-   • it comes from one of the specified source files,
-   • or if it comes from one of the specified domains,
-   • or if ‘-J’ is given and its context (msgctxt) matches
+   * it comes from one of the specified source files,
+
+   * or if it comes from one of the specified domains,
+
+   * or if `-J' is given and its context (msgctxt) matches
      MSGCTXT-PATTERN,
-   • or if ‘-K’ is given and its key (msgid or msgid_plural) matches
+
+   * or if `-K' is given and its key (msgid or msgid_plural) matches
      MSGID-PATTERN,
-   • or if ‘-T’ is given and its translation (msgstr) matches
+
+   * or if `-T' is given and its translation (msgstr) matches
      MSGSTR-PATTERN,
-   • or if ‘-C’ is given and the translator’s comment matches
+
+   * or if `-C' is given and the translator's comment matches
      COMMENT-PATTERN.
 
    When more than one selection criterion is specified, the set of
@@ -5140,384 +5179,366 @@
    PATTERNs are basic regular expressions by default, or extended
 regular expressions if -E is given, or fixed strings if -F is given.
 
-‘-N SOURCEFILE’
-‘--location=SOURCEFILE’
+`-N SOURCEFILE'
+`--location=SOURCEFILE'
      Select messages extracted from SOURCEFILE.  SOURCEFILE can be
      either a literal file name or a wildcard pattern.
 
-‘-M DOMAINNAME’
-‘--domain=DOMAINNAME’
+`-M DOMAINNAME'
+`--domain=DOMAINNAME'
      Select messages belonging to domain DOMAINNAME.
 
-‘-J’
-‘--msgctxt’
+`-J'
+`--msgctxt'
      Start of patterns for the msgctxt.
 
-‘-K’
-‘--msgid’
+`-K'
+`--msgid'
      Start of patterns for the msgid.
 
-‘-T’
-‘--msgstr’
+`-T'
+`--msgstr'
      Start of patterns for the msgstr.
 
-‘-C’
-‘--comment’
-     Start of patterns for the translator’s comment.
+`-C'
+`--comment'
+     Start of patterns for the translator's comment.
 
-‘-X’
-‘--extracted-comment’
+`-X'
+`--extracted-comment'
      Start of patterns for the extracted comments.
 
-‘-E’
-‘--extended-regexp’
+`-E'
+`--extended-regexp'
      Specify that PATTERN is an extended regular expression.
 
-‘-F’
-‘--fixed-strings’
+`-F'
+`--fixed-strings'
      Specify that PATTERN is a set of newline-separated strings.
 
-‘-e PATTERN’
-‘--regexp=PATTERN’
+`-e PATTERN'
+`--regexp=PATTERN'
      Use PATTERN as a regular expression.
 
-‘-f FILE’
-‘--file=FILE’
+`-f FILE'
+`--file=FILE'
      Obtain PATTERN from FILE.
 
-‘-i’
-‘--ignore-case’
+`-i'
+`--ignore-case'
      Ignore case distinctions.
 
-‘-v’
-‘--invert-match’
-     Output only the messages that do not match any selection criterion,
-     instead of the messages that match a selection criterion.
+`-v'
+`--invert-match'
+     Output only the messages that do not match any selection
+     criterion, instead of the messages that match a selection
+     criterion.
+
 
 9.3.4 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.3.5 Output details
 --------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘--indent’
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘--sort-output’
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘--sort-by-file’
+`--sort-by-file'
      Sort output by file location.
 
+
 9.3.6 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 9.3.7 Examples
 --------------
 
    To extract the messages that come from the source files
-‘gnulib-lib/error.c’ and ‘gnulib-lib/getopt.c’:
+`gnulib-lib/error.c' and `gnulib-lib/getopt.c':
 
      msggrep -N gnulib-lib/error.c -N gnulib-lib/getopt.c input.po
 
-   To extract the messages that contain the string “Please specify” in
+   To extract the messages that contain the string "Please specify" in
 the original string:
 
      msggrep --msgid -F -e 'Please specify' input.po
 
    To extract the messages that have a context specifier of either
-“Menu>File” or “Menu>Edit” or a submenu of them:
+"Menu>File" or "Menu>Edit" or a submenu of them:
 
      msggrep --msgctxt -E -e '^Menu>(File|Edit)' input.po
 
-   To extract the messages whose translation contains one of the strings
-in the file ‘wordlist.txt’:
+   To extract the messages whose translation contains one of the
+strings in the file `wordlist.txt':
 
      msggrep --msgstr -F -f wordlist.txt input.po
 
 
 File: gettext.info,  Node: msgfilter Invocation,  Next: msguniq Invocation,  Prev: msggrep Invocation,  Up: Manipulating
 
-9.4 Invoking the ‘msgfilter’ Program
+9.4 Invoking the `msgfilter' Program
 ====================================
 
      msgfilter [OPTION] FILTER [FILTER-OPTION]
 
-   The ‘msgfilter’ program applies a filter to all translations of a
+   The `msgfilter' program applies a filter to all translations of a
 translation catalog.
 
    During each FILTER invocation, the environment variable
-‘MSGFILTER_MSGID’ is bound to the message’s msgid, and the environment
-variable ‘MSGFILTER_LOCATION’ is bound to the location in the PO file of
-the message.  If the message has a context, the environment variable
-‘MSGFILTER_MSGCTXT’ is bound to the message’s msgctxt, otherwise it is
-unbound.  If the message has a plural form, environment variable
-‘MSGFILTER_MSGID_PLURAL’ is bound to the message’s msgid_plural and
-‘MSGFILTER_PLURAL_FORM’ is bound to the order number of the plural
-actually processed (starting with 0), otherwise both are unbound.  If
-the message has a previous msgid (added by ‘msgmerge’), environment
-variable ‘MSGFILTER_PREV_MSGCTXT’ is bound to the message’s previous
-msgctxt, ‘MSGFILTER_PREV_MSGID’ is bound to the previous msgid, and
-‘MSGFILTER_PREV_MSGID_PLURAL’ is bound to the previous msgid_plural.
+`MSGFILTER_MSGID' is bound to the message's msgid, and the environment
+variable `MSGFILTER_LOCATION' is bound to the location in the PO file
+of the message.  If the message has a context, the environment variable
+`MSGFILTER_MSGCTXT' is bound to the message's msgctxt, otherwise it is
+unbound.
 
 9.4.1 Input file location
 -------------------------
 
-‘-i INPUTFILE’
-‘--input=INPUTFILE’
+`-i INPUTFILE'
+`--input=INPUTFILE'
      Input PO file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If no INPUTFILE is given or if it is ‘-’, standard input is read.
+
+   If no INPUTFILE is given or if it is `-', standard input is read.
 
 9.4.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.4.3 The filter
 ----------------
 
    The FILTER can be any program that reads a translation from standard
 input and writes a modified translation to standard output.  A
-frequently used filter is ‘sed’.  A few particular built-in filters are
+frequently used filter is `sed'.  A few particular built-in filters are
 also recognized.
 
    Note: If the filter is not a built-in filter, you have to care about
 encodings: It is your responsibility to ensure that the FILTER can cope
-with input encoded in the translation catalog’s encoding.  If the FILTER
-wants input in a particular encoding, you can in a first step convert
-the translation catalog to that encoding using the ‘msgconv’ program,
-before invoking ‘msgfilter’.  If the FILTER wants input in the locale’s
-encoding, but you want to avoid the locale’s encoding, then you can
-first convert the translation catalog to UTF-8 using the ‘msgconv’
-program and then make ‘msgfilter’ work in an UTF-8 locale, by using the
-‘LC_ALL’ environment variable.
+with input encoded in the translation catalog's encoding.  If the
+FILTER wants input in a particular encoding, you can in a first step
+convert the translation catalog to that encoding using the `msgconv'
+program, before invoking `msgfilter'.  If the FILTER wants input in the
+locale's encoding, but you want to avoid the locale's encoding, then
+you can first convert the translation catalog to UTF-8 using the
+`msgconv' program and then make `msgfilter' work in an UTF-8 locale, by
+using the `LC_ALL' environment variable.
 
-   Note: Most translations in a translation catalog don’t end with a
+   Note: Most translations in a translation catalog don't end with a
 newline character.  For this reason, it is important that the FILTER
 recognizes its last input line even if it ends without a newline, and
-that it doesn’t add an undesired trailing newline at the end.  The ‘sed’
+that it doesn't add an undesired trailing newline at the end.  The `sed'
 program on some platforms is known to ignore the last line of input if
-it is not terminated with a newline.  You can use GNU ‘sed’ instead; it
+it is not terminated with a newline.  You can use GNU `sed' instead; it
 does not have this limitation.
 
-9.4.4 Useful FILTER-OPTIONs when the FILTER is ‘sed’
+9.4.4 Useful FILTER-OPTIONs when the FILTER is `sed'
 ----------------------------------------------------
 
-‘-e SCRIPT’
-‘--expression=SCRIPT’
+`-e SCRIPT'
+`--expression=SCRIPT'
      Add SCRIPT to the commands to be executed.
 
-‘-f SCRIPTFILE’
-‘--file=SCRIPTFILE’
+`-f SCRIPTFILE'
+`--file=SCRIPTFILE'
      Add the contents of SCRIPTFILE to the commands to be executed.
 
-‘-n’
-‘--quiet’
-‘--silent’
+`-n'
+`--quiet'
+`--silent'
      Suppress automatic printing of pattern space.
 
+
 9.4.5 Built-in FILTERs
 ----------------------
 
-   The filter ‘recode-sr-latin’ is recognized as a built-in filter.  The
-command ‘recode-sr-latin’ converts Serbian text, written in the Cyrillic
-script, to the Latin script.  The command ‘msgfilter recode-sr-latin’
-applies this conversion to the translations of a PO file.  Thus, it can
-be used to convert an ‘sr.po’ file to an ‘sr@latin.po’ file.
-
-   The filter ‘quot’ is recognized as a built-in filter.  The command
-‘msgfilter quot’ converts any quotations surrounded by a pair of ‘"’,
-‘'’, and ‘`’.
-
-   The filter ‘boldquot’ is recognized as a built-in filter.  The
-command ‘msgfilter boldquot’ converts any quotations surrounded by a
-pair of ‘"’, ‘'’, and ‘`’, also adding the VT100 escape sequences to the
-text to decorate it as bold.
+   The filter `recode-sr-latin' is recognized as a built-in filter.
+The command `recode-sr-latin' converts Serbian text, written in the
+Cyrillic script, to the Latin script.  The command `msgfilter
+recode-sr-latin' applies this conversion to the translations of a PO
+file.  Thus, it can be used to convert an `sr.po' file to an
+`sr@latin.po' file.
 
-   The use of built-in filters is not sensitive to the current locale’s
-encoding.  Moreover, when used with a built-in filter, ‘msgfilter’ can
+   The use of built-in filters is not sensitive to the current locale's
+encoding.  Moreover, when used with a built-in filter, `msgfilter' can
 automatically convert the message catalog to the UTF-8 encoding when
 needed.
 
 9.4.6 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.4.7 Output details
 --------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘--indent’
+`--indent'
      Write the .po file using indented style.
 
-‘--keep-header’
-     Keep the header entry, i.e. the message with ‘msgid ""’,
+`--keep-header'
+     Keep the header entry, i.e. the message with `msgid ""',
      unmodified, instead of filtering it.  By default, the header entry
      is subject to filtering like any other message.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 9.4.8 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 9.4.9 Examples
 --------------
 
@@ -5533,803 +5554,795 @@
 
 File: gettext.info,  Node: msguniq Invocation,  Next: msgcomm Invocation,  Prev: msgfilter Invocation,  Up: Manipulating
 
-9.5 Invoking the ‘msguniq’ Program
+9.5 Invoking the `msguniq' Program
 ==================================
 
      msguniq [OPTION] [INPUTFILE]
 
-   The ‘msguniq’ program unifies duplicate translations in a translation
-catalog.  It finds duplicate translations of the same message ID. Such
-duplicates are invalid input for other programs like ‘msgfmt’,
-‘msgmerge’ or ‘msgcat’.  By default, duplicates are merged together.
-When using the ‘--repeated’ option, only duplicates are output, and all
+   The `msguniq' program unifies duplicate translations in a translation
+catalog.  It finds duplicate translations of the same message ID.  Such
+duplicates are invalid input for other programs like `msgfmt',
+`msgmerge' or `msgcat'.  By default, duplicates are merged together.
+When using the `--repeated' option, only duplicates are output, and all
 other messages are discarded.  Comments and extracted comments will be
-cumulated, except that if ‘--use-first’ is specified, they will be taken
-from the first translation.  File positions will be cumulated.  When
-using the ‘--unique’ option, duplicates are discarded.
+cumulated, except that if `--use-first' is specified, they will be
+taken from the first translation.  File positions will be cumulated.
+When using the `--unique' option, duplicates are discarded.
 
 9.5.1 Input file location
 -------------------------
 
-‘INPUTFILE’
+`INPUTFILE'
      Input PO file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If no INPUTFILE is given or if it is ‘-’, standard input is read.
+
+   If no INPUTFILE is given or if it is `-', standard input is read.
 
 9.5.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.5.3 Message selection
 -----------------------
 
-‘-d’
-‘--repeated’
+`-d'
+`--repeated'
      Print only duplicates.
 
-‘-u’
-‘--unique’
+`-u'
+`--unique'
      Print only unique messages, discard duplicates.
 
+
 9.5.4 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.5.5 Output details
 --------------------
 
-‘-t’
-‘--to-code=NAME’
+`-t'
+`--to-code=NAME'
      Specify encoding for output.
 
-‘--use-first’
-     Use first available translation for each message.  Don’t merge
+`--use-first'
+     Use first available translation for each message.  Don't merge
      several translations into one.
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`-n'
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 9.5.6 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msgcomm Invocation,  Next: msgcmp Invocation,  Prev: msguniq Invocation,  Up: Manipulating
 
-9.6 Invoking the ‘msgcomm’ Program
+9.6 Invoking the `msgcomm' Program
 ==================================
 
      msgcomm [OPTION] [INPUTFILE]...
 
-   The ‘msgcomm’ program finds messages which are common to two or more
-of the specified PO files.  By using the ‘--more-than’ option, greater
+   The `msgcomm' program finds messages which are common to two or more
+of the specified PO files.  By using the `--more-than' option, greater
 commonality may be requested before messages are printed.  Conversely,
-the ‘--less-than’ option may be used to specify less commonality before
-messages are printed (i.e. ‘--less-than=2’ will only print the unique
-messages).  Translations, comments and extracted comments will be
+the `--less-than' option may be used to specify less commonality before
+messages are printed (i.e.  `--less-than=2' will only print the unique
+messages).  Translations, comments and extract comments will be
 preserved, but only from the first PO file to define them.  File
 positions from all PO files will be cumulated.
 
 9.6.1 Input file location
 -------------------------
 
-‘INPUTFILE …’
+`INPUTFILE ...'
      Input files.
 
-‘-f FILE’
-‘--files-from=FILE’
-     Read the names of the input files from FILE instead of getting them
-     from the command line.
+`-f FILE'
+`--files-from=FILE'
+     Read the names of the input files from FILE instead of getting
+     them from the command line.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If INPUTFILE is ‘-’, standard input is read.
+
+   If INPUTFILE is `-', standard input is read.
 
 9.6.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.6.3 Message selection
 -----------------------
 
-‘-< NUMBER’
-‘--less-than=NUMBER’
+`-< NUMBER'
+`--less-than=NUMBER'
      Print messages with less than NUMBER definitions, defaults to
      infinite if not set.
 
-‘-> NUMBER’
-‘--more-than=NUMBER’
+`-> NUMBER'
+`--more-than=NUMBER'
      Print messages with more than NUMBER definitions, defaults to 1 if
      not set.
 
-‘-u’
-‘--unique’
-     Shorthand for ‘--less-than=2’.  Requests that only unique messages
+`-u'
+`--unique'
+     Shorthand for `--less-than=2'.  Requests that only unique messages
      be printed.
 
+
 9.6.4 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input files are Java ResourceBundles in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
 
-‘--stringtable-input’
+`--stringtable-input'
      Assume the input files are NeXTstep/GNUstep localized resource
-     files in ‘.strings’ syntax, not in PO file syntax.
+     files in `.strings' syntax, not in PO file syntax.
+
 
 9.6.5 Output details
 --------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`-n'
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
-‘--omit-header’
-     Don’t write header with ‘msgid ""’ entry.
+`--omit-header'
+     Don't write header with `msgid ""' entry.
+
 
 9.6.6 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msgcmp Invocation,  Next: msgattrib Invocation,  Prev: msgcomm Invocation,  Up: Manipulating
 
-9.7 Invoking the ‘msgcmp’ Program
+9.7 Invoking the `msgcmp' Program
 =================================
 
      msgcmp [OPTION] DEF.po REF.pot
 
-   The ‘msgcmp’ program compares two Uniforum style .po files to check
+   The `msgcmp' program compares two Uniforum style .po files to check
 that both contain the same set of msgid strings.  The DEF.po file is an
 existing PO file with the translations.  The REF.pot file is the last
 created PO file, or a PO Template file (generally created by
-‘xgettext’).  This is useful for checking that you have translated each
+`xgettext').  This is useful for checking that you have translated each
 and every message in your program.  Where an exact match cannot be
 found, fuzzy matching is used to produce better diagnostics.
 
 9.7.1 Input file location
 -------------------------
 
-‘DEF.po’
+`DEF.po'
      Translations.
 
-‘REF.pot’
+`REF.pot'
      References to the sources.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
      searched relative to this list of directories.
 
+
 9.7.2 Operation modifiers
 -------------------------
 
-‘-m’
-‘--multi-domain’
+`-m'
+`--multi-domain'
      Apply REF.pot to each of the domains in DEF.po.
 
-‘-N’
-‘--no-fuzzy-matching’
+`-N'
+`--no-fuzzy-matching'
      Do not use fuzzy matching when an exact match is not found.  This
      may speed up the operation considerably.
 
-‘--use-fuzzy’
+`--use-fuzzy'
      Consider fuzzy messages in the DEF.po file like translated
      messages.  Note that using this option is usually wrong, because
-     fuzzy messages are exactly those which have not been validated by a
-     human translator.
+     fuzzy messages are exactly those which have not been validated by
+     a human translator.
 
-‘--use-untranslated’
+`--use-untranslated'
      Consider untranslated messages in the DEF.po file like translated
      messages.  Note that using this option is usually wrong.
 
+
 9.7.3 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input files are Java ResourceBundles in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
 
-‘--stringtable-input’
+`--stringtable-input'
      Assume the input files are NeXTstep/GNUstep localized resource
-     files in ‘.strings’ syntax, not in PO file syntax.
+     files in `.strings' syntax, not in PO file syntax.
+
 
 9.7.4 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msgattrib Invocation,  Next: msgen Invocation,  Prev: msgcmp Invocation,  Up: Manipulating
 
-9.8 Invoking the ‘msgattrib’ Program
+9.8 Invoking the `msgattrib' Program
 ====================================
 
      msgattrib [OPTION] [INPUTFILE]
 
-   The ‘msgattrib’ program filters the messages of a translation catalog
+   The `msgattrib' program filters the messages of a translation catalog
 according to their attributes, and manipulates the attributes.
 
 9.8.1 Input file location
 -------------------------
 
-‘INPUTFILE’
+`INPUTFILE'
      Input PO file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If no INPUTFILE is given or if it is ‘-’, standard input is read.
+
+   If no INPUTFILE is given or if it is `-', standard input is read.
 
 9.8.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.8.3 Message selection
 -----------------------
 
-‘--translated’
+`--translated'
      Keep translated messages, remove untranslated messages.
 
-‘--untranslated’
+`--untranslated'
      Keep untranslated messages, remove translated messages.
 
-‘--no-fuzzy’
-     Remove ‘fuzzy’ marked messages.
+`--no-fuzzy'
+     Remove `fuzzy' marked messages.
 
-‘--only-fuzzy’
-     Keep ‘fuzzy’ marked messages, remove all other messages.
+`--only-fuzzy'
+     Keep `fuzzy' marked messages, remove all other messages.
 
-‘--no-obsolete’
+`--no-obsolete'
      Remove obsolete #~ messages.
 
-‘--only-obsolete’
+`--only-obsolete'
      Keep obsolete #~ messages, remove all other messages.
 
+
 9.8.4 Attribute manipulation
 ----------------------------
 
    Attributes are modified after the message selection/removal has been
-performed.  If the ‘--only-file’ or ‘--ignore-file’ option is specified,
-the attribute modification is applied only to those messages that are
-listed in the ONLY-FILE and not listed in the IGNORE-FILE.
+performed.  If the `--only-file' or `--ignore-file' option is
+specified, the attribute modification is applied only to those messages
+that are listed in the ONLY-FILE and not listed in the IGNORE-FILE.
 
-‘--set-fuzzy’
-     Set all messages ‘fuzzy’.
+`--set-fuzzy'
+     Set all messages `fuzzy'.
 
-‘--clear-fuzzy’
-     Set all messages non-‘fuzzy’.
+`--clear-fuzzy'
+     Set all messages non-`fuzzy'.
 
-‘--set-obsolete’
+`--set-obsolete'
      Set all messages obsolete.
 
-‘--clear-obsolete’
+`--clear-obsolete'
      Set all messages non-obsolete.
 
-‘--previous’
-     When setting ‘fuzzy’ mark, keep “previous msgid” of translated
-     messages.
-
-‘--clear-previous’
-     Remove the “previous msgid” (‘#|’) comments from all messages.
+`--clear-previous'
+     Remove the "previous msgid" (`#|') comments from all messages.
 
-‘--empty’
-     When removing ‘fuzzy’ mark, also set msgstr empty.
-
-‘--only-file=FILE’
+`--only-file=FILE'
      Limit the attribute changes to entries that are listed in FILE.
      FILE should be a PO or POT file.
 
-‘--ignore-file=FILE’
+`--ignore-file=FILE'
      Limit the attribute changes to entries that are not listed in FILE.
      FILE should be a PO or POT file.
 
-‘--fuzzy’
-     Synonym for ‘--only-fuzzy --clear-fuzzy’: It keeps only the fuzzy
-     messages and removes their ‘fuzzy’ mark.
+`--fuzzy'
+     Synonym for `--only-fuzzy --clear-fuzzy': It keeps only the fuzzy
+     messages and removes their `fuzzy' mark.
 
-‘--obsolete’
-     Synonym for ‘--only-obsolete --clear-obsolete’: It keeps only the
+`--obsolete'
+     Synonym for `--only-obsolete --clear-obsolete': It keeps only the
      obsolete messages and makes them non-obsolete.
 
+
 9.8.5 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.8.6 Output details
 --------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`-n'
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 9.8.7 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msgen Invocation,  Next: msgexec Invocation,  Prev: msgattrib Invocation,  Up: Manipulating
 
-9.9 Invoking the ‘msgen’ Program
+9.9 Invoking the `msgen' Program
 ================================
 
      msgen [OPTION] INPUTFILE
 
-   The ‘msgen’ program creates an English translation catalog.  The
+   The `msgen' program creates an English translation catalog.  The
 input file is the last created English PO file, or a PO Template file
 (generally created by xgettext).  Untranslated entries are assigned a
 translation that is identical to the msgid.
 
-   Note: ‘msginit --no-translator --locale=en’ performs a very similar
-task.  The main difference is that ‘msginit’ cares specially about the
-header entry, whereas ‘msgen’ doesn’t.
+   Note: `msginit --no-translator --locale=en' performs a very similar
+task.  The main difference is that `msginit' cares specially about the
+header entry, whereas `msgen' doesn't.
 
 9.9.1 Input file location
 -------------------------
 
-‘INPUTFILE’
+`INPUTFILE'
      Input PO or POT file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If INPUTFILE is ‘-’, standard input is read.
+
+   If INPUTFILE is `-', standard input is read.
 
 9.9.2 Output file location
 --------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 9.9.3 Input file syntax
 -----------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.9.4 Output details
 --------------------
 
-‘--lang=CATALOGNAME’
-     Specify the ‘Language’ field to be used in the header entry.  See
+`--lang=CATALOGNAME'
+     Specify the `Language' field to be used in the header entry.  See
      *note Header Entry:: for the meaning of this field.  Note: The
-     ‘Language-Team’ and ‘Plural-Forms’ fields are not set by this
+     `Language-Team' and `Plural-Forms' fields are not set by this
      option.
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--no-location’
-     Do not write ‘#: FILENAME:LINE’ lines.
+`--no-location'
+     Do not write `#: FILENAME:LINE' lines.
 
-‘-n’
-‘--add-location=TYPE’
-     Generate ‘#: FILENAME:LINE’ lines (default).
-
-     The optional TYPE can be either ‘full’, ‘file’, or ‘never’.  If it
-     is not given or ‘full’, it generates the lines with both file name
-     and line number.  If it is ‘file’, the line number part is omitted.
-     If it is ‘never’, it completely suppresses the lines (same as
-     ‘--no-location’).
+`--add-location'
+     Generate `#: FILENAME:LINE' lines (default).
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
 
-‘-F’
-‘--sort-by-file’
+`-F'
+`--sort-by-file'
      Sort output by file location.
 
+
 9.9.5 Informative output
 ------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: msgexec Invocation,  Next: Colorizing,  Prev: msgen Invocation,  Up: Manipulating
 
-9.10 Invoking the ‘msgexec’ Program
+9.10 Invoking the `msgexec' Program
 ===================================
 
      msgexec [OPTION] COMMAND [COMMAND-OPTION]
 
-   The ‘msgexec’ program applies a command to all translations of a
+   The `msgexec' program applies a command to all translations of a
 translation catalog.  The COMMAND can be any program that reads a
 translation from standard input.  It is invoked once for each
-translation.  Its output becomes msgexec’s output.  ‘msgexec’’s return
+translation.  Its output becomes msgexec's output.  `msgexec''s return
 code is the maximum return code across all invocations.
 
-   A special builtin command called ‘0’ outputs the translation,
-followed by a null byte.  The output of ‘msgexec 0’ is suitable as input
-for ‘xargs -0’.
+   A special builtin command called `0' outputs the translation,
+followed by a null byte.  The output of `msgexec 0' is suitable as
+input for `xargs -0'.
 
    During each COMMAND invocation, the environment variable
-‘MSGEXEC_MSGID’ is bound to the message’s msgid, and the environment
-variable ‘MSGEXEC_LOCATION’ is bound to the location in the PO file of
+`MSGEXEC_MSGID' is bound to the message's msgid, and the environment
+variable `MSGEXEC_LOCATION' is bound to the location in the PO file of
 the message.  If the message has a context, the environment variable
-‘MSGEXEC_MSGCTXT’ is bound to the message’s msgctxt, otherwise it is
-unbound.  If the message has a plural form, environment variable
-‘MSGEXEC_MSGID_PLURAL’ is bound to the message’s msgid_plural and
-‘MSGEXEC_PLURAL_FORM’ is bound to the order number of the plural
-actually processed (starting with 0), otherwise both are unbound.  If
-the message has a previous msgid (added by ‘msgmerge’), environment
-variable ‘MSGEXEC_PREV_MSGCTXT’ is bound to the message’s previous
-msgctxt, ‘MSGEXEC_PREV_MSGID’ is bound to the previous msgid, and
-‘MSGEXEC_PREV_MSGID_PLURAL’ is bound to the previous msgid_plural.
+`MSGEXEC_MSGCTXT' is bound to the message's msgctxt, otherwise it is
+unbound.
 
    Note: It is your responsibility to ensure that the COMMAND can cope
-with input encoded in the translation catalog’s encoding.  If the
+with input encoded in the translation catalog's encoding.  If the
 COMMAND wants input in a particular encoding, you can in a first step
-convert the translation catalog to that encoding using the ‘msgconv’
-program, before invoking ‘msgexec’.  If the COMMAND wants input in the
-locale’s encoding, but you want to avoid the locale’s encoding, then you
-can first convert the translation catalog to UTF-8 using the ‘msgconv’
-program and then make ‘msgexec’ work in an UTF-8 locale, by using the
-‘LC_ALL’ environment variable.
+convert the translation catalog to that encoding using the `msgconv'
+program, before invoking `msgexec'.  If the COMMAND wants input in the
+locale's encoding, but you want to avoid the locale's encoding, then
+you can first convert the translation catalog to UTF-8 using the
+`msgconv' program and then make `msgexec' work in an UTF-8 locale, by
+using the `LC_ALL' environment variable.
 
 9.10.1 Input file location
 --------------------------
 
-‘-i INPUTFILE’
-‘--input=INPUTFILE’
+`-i INPUTFILE'
+`--input=INPUTFILE'
      Input PO file.
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting ‘.po’
+     searched relative to this list of directories.  The resulting `.po'
      file will be written relative to the current directory, though.
 
-   If no INPUTFILE is given or if it is ‘-’, standard input is read.
+
+   If no INPUTFILE is given or if it is `-', standard input is read.
 
 9.10.2 Input file syntax
 ------------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input file is a Java ResourceBundle in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
+
+`--stringtable-input'
+     Assume the input file is a NeXTstep/GNUstep localized resource
+     file in `.strings' syntax, not in PO file syntax.
 
-‘--stringtable-input’
-     Assume the input file is a NeXTstep/GNUstep localized resource file
-     in ‘.strings’ syntax, not in PO file syntax.
 
 9.10.3 Informative output
 -------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
 
 File: gettext.info,  Node: Colorizing,  Next: libgettextpo,  Prev: msgexec Invocation,  Up: Manipulating
 
@@ -6340,139 +6353,139 @@
 and fuzzy messages of a PO file.  Also, when a message is set fuzzy
 because the msgid changed, they want to see the differences between the
 previous msgid and the current one (especially if the msgid is long and
-only few words in it have changed).  Finally, it’s always welcome to
+only few words in it have changed).  Finally, it's always welcome to
 highlight the different sections of a message in a PO file (comments,
 msgid, msgstr, etc.).
 
-   Such highlighting is possible through the ‘msgcat’ options ‘--color’
-and ‘--style’.
+   Such highlighting is possible through the `msgcat' options `--color'
+and `--style'.
 
 * Menu:
 
 * The --color option::          Triggering colorized output
-* The TERM variable::           The environment variable ‘TERM’
-* The --style option::          The ‘--style’ option
+* The TERM variable::           The environment variable `TERM'
+* The --style option::          The `--style' option
 * Style rules::                 Style rules for PO files
-* Customizing less::            Customizing ‘less’ for viewing PO files
+* Customizing less::            Customizing `less' for viewing PO files
 
 
-File: gettext.info,  Node: The --color option,  Next: The TERM variable,  Prev: Colorizing,  Up: Colorizing
+File: gettext.info,  Node: The --color option,  Next: The TERM variable,  Up: Colorizing
 
-9.11.1 The ‘--color’ option
+9.11.1 The `--color' option
 ---------------------------
 
-   The ‘--color=WHEN’ option specifies under which conditions colorized
+   The `--color=WHEN' option specifies under which conditions colorized
 output should be generated.  The WHEN part can be one of the following:
 
-‘always’
-‘yes’
+`always'
+`yes'
      The output will be colorized.
 
-‘never’
-‘no’
+`never'
+`no'
      The output will not be colorized.
 
-‘auto’
-‘tty’
+`auto'
+`tty'
      The output will be colorized if the output device is a tty, i.e.
-     when the output goes directly to a text screen or terminal emulator
-     window.
+     when the output goes directly to a text screen or terminal
+     emulator window.
 
-‘html’
+`html'
      The output will be colorized and be in HTML format.
 
-‘--color’ is equivalent to ‘--color=yes’.  The default is
-‘--color=auto’.
+`--color' is equivalent to `--color=yes'.  The default is
+`--color=auto'.
 
-   Thus, a command like ‘msgcat vi.po’ will produce colorized output
+   Thus, a command like `msgcat vi.po' will produce colorized output
 when called by itself in a command window.  Whereas in a pipe, such as
-‘msgcat vi.po | less -R’, it will not produce colorized output.  To get
-colorized output in this situation nevertheless, use the command ‘msgcat
---color vi.po | less -R’.
-
-   The ‘--color=html’ option will produce output that can be viewed in a
-browser.  This can be useful, for example, for Indic languages, because
-the renderic of Indic scripts in browser is usually better than in
-terminal emulators.
+`msgcat vi.po | less -R', it will not produce colorized output.  To get
+colorized output in this situation nevertheless, use the command
+`msgcat --color vi.po | less -R'.
+
+   The `--color=html' option will produce output that can be viewed in
+a browser.  This can be useful, for example, for Indic languages,
+because the renderic of Indic scripts in browser is usually better than
+in terminal emulators.
 
-   Note that the output produced with the ‘--color’ option is _not_ a
+   Note that the output produced with the `--color' option is _not_ a
 valid PO file in itself.  It contains additional terminal-specific
 escape sequences or HTML tags.  A PO file reader will give a syntax
-error when confronted with such content.  Except for the ‘--color=html’
-case, you therefore normally don’t need to save output produced with the
-‘--color’ option in a file.
+error when confronted with such content.  Except for the `--color=html'
+case, you therefore normally don't need to save output produced with the
+`--color' option in a file.
 
 
 File: gettext.info,  Node: The TERM variable,  Next: The --style option,  Prev: The --color option,  Up: Colorizing
 
-9.11.2 The environment variable ‘TERM’
+9.11.2 The environment variable `TERM'
 --------------------------------------
 
-   The environment variable ‘TERM’ contains a identifier for the text
-window’s capabilities.  You can get a detailed list of these
-cababilities by using the ‘infocmp’ command, using ‘man 5 terminfo’ as a
+   The environment variable `TERM' contains a identifier for the text
+window's capabilities.  You can get a detailed list of these
+cababilities by using the `infocmp' command, using `man 5 terminfo' as a
 reference.
 
-   When producing text with embedded color directives, ‘msgcat’ looks at
-the ‘TERM’ variable.  Text windows today typically support at least 8
-colors.  Often, however, the text window supports 16 or more colors,
-even though the ‘TERM’ variable is set to a identifier denoting only 8
-supported colors.  It can be worth setting the ‘TERM’ variable to a
+   When producing text with embedded color directives, `msgcat' looks
+at the `TERM' variable.  Text windows today typically support at least
+8 colors.  Often, however, the text window supports 16 or more colors,
+even though the `TERM' variable is set to a identifier denoting only 8
+supported colors.  It can be worth setting the `TERM' variable to a
 different value in these cases:
 
-‘xterm’
-     ‘xterm’ is in most cases built with support for 16 colors.  It can
+`xterm'
+     `xterm' is in most cases built with support for 16 colors.  It can
      also be built with support for 88 or 256 colors (but not both).
-     You can try to set ‘TERM’ to either ‘xterm-16color’,
-     ‘xterm-88color’, or ‘xterm-256color’.
+     You can try to set `TERM' to either `xterm-16color',
+     `xterm-88color', or `xterm-256color'.
 
-‘rxvt’
-     ‘rxvt’ is often built with support for 16 colors.  You can try to
-     set ‘TERM’ to ‘rxvt-16color’.
-
-‘konsole’
-     ‘konsole’ too is often built with support for 16 colors.  You can
-     try to set ‘TERM’ to ‘konsole-16color’ or ‘xterm-16color’.
+`rxvt'
+     `rxvt' is often built with support for 16 colors.  You can try to
+     set `TERM' to `rxvt-16color'.
+
+`konsole'
+     `konsole' too is often built with support for 16 colors.  You can
+     try to set `TERM' to `konsole-16color' or `xterm-16color'.
 
-   After setting ‘TERM’, you can verify it by invoking ‘msgcat
---color=test’ and seeing whether the output looks like a reasonable
+   After setting `TERM', you can verify it by invoking `msgcat
+--color=test' and seeing whether the output looks like a reasonable
 color map.
 
 
 File: gettext.info,  Node: The --style option,  Next: Style rules,  Prev: The TERM variable,  Up: Colorizing
 
-9.11.3 The ‘--style’ option
+9.11.3 The `--style' option
 ---------------------------
 
-   The ‘--style=STYLE_FILE’ option specifies the style file to use when
-colorizing.  It has an effect only when the ‘--color’ option is
+   The `--style=STYLE_FILE' option specifies the style file to use when
+colorizing.  It has an effect only when the `--color' option is
 effective.
 
-   If the ‘--style’ option is not specified, the environment variable
-‘PO_STYLE’ is considered.  It is meant to point to the user’s preferred
+   If the `--style' option is not specified, the environment variable
+`PO_STYLE' is considered.  It is meant to point to the user's preferred
 style for PO files.
 
    The default style file is
-‘$prefix/share/gettext/styles/po-default.css’, where ‘$prefix’ is the
+`$prefix/share/gettext/styles/po-default.css', where `$prefix' is the
 installation location.
 
    A few style files are predefined:
-‘po-vim.css’
+`po-vim.css'
      This style imitates the look used by vim 7.
 
-‘po-emacs-x.css’
+`po-emacs-x.css'
      This style imitates the look used by GNU Emacs 21 and 22 in an X11
      window.
 
-‘po-emacs-xterm.css’
-‘po-emacs-xterm16.css’
-‘po-emacs-xterm256.css’
+`po-emacs-xterm.css'
+`po-emacs-xterm16.css'
+`po-emacs-xterm256.css'
      This style imitates the look used by GNU Emacs 22 in a terminal of
-     type ‘xterm’ (8 colors) or ‘xterm-16color’ (16 colors) or
-     ‘xterm-256color’ (256 colors), respectively.
+     type `xterm' (8 colors) or `xterm-16color' (16 colors) or
+     `xterm-256color' (256 colors), respectively.
 
 You can use these styles without specifying a directory.  They are
-actually located in ‘$prefix/share/gettext/styles/’, where ‘$prefix’ is
+actually located in `$prefix/share/gettext/styles/', where `$prefix' is
 the installation location.
 
    You can also design your own styles.  This is described in the next
@@ -6486,150 +6499,150 @@
 
    The same style file can be used for styling of a PO file, for
 terminal output and for HTML output.  It is written in CSS (Cascading
-Style Sheet) syntax.  See <http://www.w3.org/TR/css2/cover.html> for a
-formal definition of CSS. Many HTML authoring tutorials also contain
+Style Sheet) syntax.  See `http://www.w3.org/TR/css2/cover.html' for a
+formal definition of CSS.  Many HTML authoring tutorials also contain
 explanations of CSS.
 
    In the case of HTML output, the style file is embedded in the HTML
 output.  In the case of text output, the style file is interpreted by
-the ‘msgcat’ program.  This means, in particular, that when ‘@import’ is
-used with relative file names, the file names are
+the `msgcat' program.  This means, in particular, that when `@import'
+is used with relative file names, the file names are
 
-   − relative to the resulting HTML file, in the case of HTML output,
+   - relative to the resulting HTML file, in the case of HTML output,
 
-   − relative to the style sheet containing the ‘@import’, in the case
-     of text output.  (Actually, ‘@import’s are not yet supported in
-     this case, due to a limitation in ‘libcroco’.)
+   - relative to the style sheet containing the `@import', in the case
+     of text output.  (Actually, `@import's are not yet supported in
+     this case, due to a limitation in `libcroco'.)
 
    CSS rules are built up from selectors and declarations.  The
-declarations specify graphical properties; the selectors specify specify
-when they apply.
+declarations specify graphical properties; the selectors specify
+specify when they apply.
 
    In PO files, the following simple selectors (based on "CSS classes",
 see the CSS2 spec, section 5.8.3) are supported.
 
-   • Selectors that apply to entire messages:
+   * Selectors that apply to entire messages:
 
-     ‘.header’
+    `.header'
           This matches the header entry of a PO file.
 
-     ‘.translated’
+    `.translated'
           This matches a translated message.
 
-     ‘.untranslated’
+    `.untranslated'
           This matches an untranslated message (i.e. a message with
           empty translation).
 
-     ‘.fuzzy’
+    `.fuzzy'
           This matches a fuzzy message (i.e. a message which has a
           translation that needs review by the translator).
 
-     ‘.obsolete’
+    `.obsolete'
           This matches an obsolete message (i.e. a message that was
           translated but is not needed by the current POT file any
           more).
 
-   • Selectors that apply to parts of a message in PO syntax.  Recall
+   * Selectors that apply to parts of a message in PO syntax.  Recall
      the general structure of a message in PO syntax:
 
           WHITE-SPACE
           #  TRANSLATOR-COMMENTS
           #. EXTRACTED-COMMENTS
-          #: REFERENCE…
-          #, FLAG…
+          #: REFERENCE...
+          #, FLAG...
           #| msgid PREVIOUS-UNTRANSLATED-STRING
           msgid UNTRANSLATED-STRING
           msgstr TRANSLATED-STRING
 
-     ‘.comment’
+    `.comment'
           This matches all comments (translator comments, extracted
           comments, source file reference comments, flag comments,
           previous message comments, as well as the entire obsolete
           messages).
 
-     ‘.translator-comment’
+    `.translator-comment'
           This matches the translator comments.
 
-     ‘.extracted-comment’
+    `.extracted-comment'
           This matches the extracted comments, i.e. the comments placed
           by the programmer at the attention of the translator.
 
-     ‘.reference-comment’
+    `.reference-comment'
           This matches the source file reference comments (entire
           lines).
 
-     ‘.reference’
+    `.reference'
           This matches the individual source file references inside the
           source file reference comment lines.
 
-     ‘.flag-comment’
+    `.flag-comment'
           This matches the flag comment lines (entire lines).
 
-     ‘.flag’
+    `.flag'
           This matches the individual flags inside flag comment lines.
 
-     ‘.fuzzy-flag’
-          This matches the ‘fuzzy’ flag inside flag comment lines.
+    `.fuzzy-flag'
+          This matches the `fuzzy' flag inside flag comment lines.
 
-     ‘.previous-comment’
-          This matches the comments containing the previous untranslated
-          string (entire lines).
+    `.previous-comment'
+          This matches the comments containing the previous
+          untranslated string (entire lines).
 
-     ‘.previous’
+    `.previous'
           This matches the previous untranslated string including the
-          string delimiters, the associated keywords (‘msgid’ etc.)  and
+          string delimiters, the associated keywords (`msgid' etc.) and
           the spaces between them.
 
-     ‘.msgid’
+    `.msgid'
           This matches the untranslated string including the string
-          delimiters, the associated keywords (‘msgid’ etc.)  and the
+          delimiters, the associated keywords (`msgid' etc.) and the
           spaces between them.
 
-     ‘.msgstr’
+    `.msgstr'
           This matches the translated string including the string
-          delimiters, the associated keywords (‘msgstr’ etc.)  and the
+          delimiters, the associated keywords (`msgstr' etc.) and the
           spaces between them.
 
-     ‘.keyword’
-          This matches the keywords (‘msgid’, ‘msgstr’, etc.).
+    `.keyword'
+          This matches the keywords (`msgid', `msgstr', etc.).
 
-     ‘.string’
+    `.string'
           This matches strings, including the string delimiters (double
           quotes).
 
-   • Selectors that apply to parts of strings:
+   * Selectors that apply to parts of strings:
 
-     ‘.text’
+    `.text'
           This matches the entire contents of a string (excluding the
           string delimiters, i.e. the double quotes).
 
-     ‘.escape-sequence’
+    `.escape-sequence'
           This matches an escape sequence (starting with a backslash).
 
-     ‘.format-directive’
-          This matches a format string directive (starting with a ‘%’
-          sign in the case of most programming languages, with a ‘{’ in
-          the case of ‘java-format’ and ‘csharp-format’, with a ‘~’ in
-          the case of ‘lisp-format’ and ‘scheme-format’, or with ‘$’ in
-          the case of ‘sh-format’).
+    `.format-directive'
+          This matches a format string directive (starting with a `%'
+          sign in the case of most programming languages, with a `{' in
+          the case of `java-format' and `csharp-format', with a `~' in
+          the case of `lisp-format' and `scheme-format', or with `$' in
+          the case of `sh-format').
 
-     ‘.invalid-format-directive’
+    `.invalid-format-directive'
           This matches an invalid format string directive.
 
-     ‘.added’
+    `.added'
           In an untranslated string, this matches a part of the string
           that was not present in the previous untranslated string.
           (Not yet implemented in this release.)
 
-     ‘.changed’
+    `.changed'
           In an untranslated string or in a previous untranslated
           string, this matches a part of the string that is changed or
           replaced.  (Not yet implemented in this release.)
 
-     ‘.removed’
+    `.removed'
           In a previous untranslated string, this matches a part of the
-          string that is not present in the current untranslated string.
-          (Not yet implemented in this release.)
+          string that is not present in the current untranslated
+          string.  (Not yet implemented in this release.)
 
    These selectors can be combined to hierarchical selectors.  For
 example,
@@ -6647,36 +6660,36 @@
    The declarations in text mode are limited to the following
 properties.  Other properties will be silently ignored.
 
-‘color’ (CSS2 spec, section 14.1)
-‘background-color’ (CSS2 spec, section 14.2.1)
+`color' (CSS2 spec, section 14.1)
+`background-color' (CSS2 spec, section 14.2.1)
      These properties is supported.  Colors will be adjusted to match
-     the terminal’s capabilities.  Note that many terminals support only
-     8 colors.
+     the terminal's capabilities.  Note that many terminals support
+     only 8 colors.
 
-‘font-weight’ (CSS2 spec, section 15.2.3)
+`font-weight' (CSS2 spec, section 15.2.3)
      This property is supported, but most terminals can only render two
-     different weights: ‘normal’ and ‘bold’.  Values >= 600 are rendered
-     as ‘bold’.
+     different weights: `normal' and `bold'.  Values >= 600 are
+     rendered as `bold'.
 
-‘font-style’ (CSS2 spec, section 15.2.3)
-     This property is supported.  The values ‘italic’ and ‘oblique’ are
+`font-style' (CSS2 spec, section 15.2.3)
+     This property is supported.  The values `italic' and `oblique' are
      rendered the same way.
 
-‘text-decoration’ (CSS2 spec, section 16.3.1)
-     This property is supported, limited to the values ‘none’ and
-     ‘underline’.
+`text-decoration' (CSS2 spec, section 16.3.1)
+     This property is supported, limited to the values `none' and
+     `underline'.
 
 
 File: gettext.info,  Node: Customizing less,  Prev: Style rules,  Up: Colorizing
 
-9.11.5 Customizing ‘less’ for viewing PO files
+9.11.5 Customizing `less' for viewing PO files
 ----------------------------------------------
 
-   The ‘less’ program is a popular text file browser for use in a text
+   The `less' program is a popular text file browser for use in a text
 screen or terminal emulator.  It also supports text with embedded escape
 sequences for colors and text decorations.
 
-   You can use ‘less’ to view a PO file like this (assuming an UTF-8
+   You can use `less' to view a PO file like this (assuming an UTF-8
 environment):
 
      msgcat --to-code=UTF-8 --color xyz.po | less -R
@@ -6687,18 +6700,18 @@
 
 after these three preparations:
 
-  1. Add the options ‘-R’ and ‘-f’ to the ‘LESS’ environment variable.
+  1. Add the options `-R' and `-f' to the `LESS' environment variable.
      In sh shells:
           $ LESS="$LESS -R -f"
           $ export LESS
 
-  2. If your system does not already have the ‘lessopen.sh’ and
-     ‘lessclose.sh’ scripts, create them and set the ‘LESSOPEN’ and
-     ‘LESSCLOSE’ environment variables, as indicated in the manual page
-     (‘man less’).
+  2. If your system does not already have the `lessopen.sh' and
+     `lessclose.sh' scripts, create them and set the `LESSOPEN' and
+     `LESSCLOSE' environment variables, as indicated in the manual page
+     (`man less').
 
-  3. Add to ‘lessopen.sh’ a piece of script that recognizes PO files
-     through their file extension and invokes ‘msgcat’ on them,
+  3. Add to `lessopen.sh' a piece of script that recognizes PO files
+     through their file extension and invokes `msgcat' on them,
      producing a temporary file.  Like this:
 
           case "$1" in
@@ -6716,16 +6729,16 @@
 9.12 Writing your own programs that process PO files
 ====================================================
 
-   For the tasks for which a combination of ‘msgattrib’, ‘msgcat’ etc.
+   For the tasks for which a combination of `msgattrib', `msgcat' etc.
 is not sufficient, a set of C functions is provided in a library, to
-make it possible to process PO files in your own programs.  When you use
-this library, you don’t need to write routines to parse the PO file;
-instead, you retrieve a pointer in memory to each of messages contained
-in the PO file.  Functions for writing PO files are not provided at this
-time.
+make it possible to process PO files in your own programs.  When you
+use this library, you don't need to write routines to parse the PO
+file; instead, you retrieve a pointer in memory to each of messages
+contained in the PO file.  Functions for writing PO files are not
+provided at this time.
 
-   The functions are declared in the header file ‘<gettext-po.h>’, and
-are defined in a library called ‘libgettextpo’.
+   The functions are declared in the header file `<gettext-po.h>', and
+are defined in a library called `libgettextpo'.
 
  -- Data Type: po_file_t
      This is a pointer type that refers to the contents of a PO file,
@@ -6740,69 +6753,69 @@
      including its translation.
 
  -- Function: po_file_t po_file_read (const char *FILENAME)
-     The ‘po_file_read’ function reads a PO file into memory.  The file
+     The `po_file_read' function reads a PO file into memory.  The file
      name is given as argument.  The return value is a handle to the PO
-     file’s contents, valid until ‘po_file_free’ is called on it.  In
-     case of error, the return value is ‘NULL’, and ‘errno’ is set.
+     file's contents, valid until `po_file_free' is called on it.  In
+     case of error, the return value is `NULL', and `errno' is set.
 
  -- Function: void po_file_free (po_file_t FILE)
-     The ‘po_file_free’ function frees a PO file’s contents from memory,
+     The `po_file_free' function frees a PO file's contents from memory,
      including all messages that are only implicitly accessible through
      iterators.
 
  -- Function: const char * const * po_file_domains (po_file_t FILE)
-     The ‘po_file_domains’ function returns the domains for which the
-     given PO file has messages.  The return value is a ‘NULL’
+     The `po_file_domains' function returns the domains for which the
+     given PO file has messages.  The return value is a `NULL'
      terminated array which is valid as long as the FILE handle is
-     valid.  For PO files which contain no ‘domain’ directive, the
+     valid.  For PO files which contain no `domain' directive, the
      return value contains only one domain, namely the default domain
-     ‘"messages"’.
+     `"messages"'.
 
- -- Function: po_message_iterator_t po_message_iterator (po_file_t FILE,
-          const char *DOMAIN)
-     The ‘po_message_iterator’ returns an iterator that will produce the
+ -- Function: po_message_iterator_t po_message_iterator (po_file_t
+          FILE, const char *DOMAIN)
+     The `po_message_iterator' returns an iterator that will produce the
      messages of FILE that belong to the given DOMAIN.  If DOMAIN is
-     ‘NULL’, the default domain is used instead.  To list the messages,
-     use the function ‘po_next_message’ repeatedly.
+     `NULL', the default domain is used instead.  To list the messages,
+     use the function `po_next_message' repeatedly.
 
  -- Function: void po_message_iterator_free (po_message_iterator_t
           ITERATOR)
-     The ‘po_message_iterator_free’ function frees an iterator
-     previously allocated through the ‘po_message_iterator’ function.
+     The `po_message_iterator_free' function frees an iterator
+     previously allocated through the `po_message_iterator' function.
 
  -- Function: po_message_t po_next_message (po_message_iterator_t
           ITERATOR)
-     The ‘po_next_message’ function returns the next message from
-     ITERATOR and advances the iterator.  It returns ‘NULL’ when the
+     The `po_next_message' function returns the next message from
+     ITERATOR and advances the iterator.  It returns `NULL' when the
      iterator has reached the end of its message list.
 
-   The following functions returns details of a ‘po_message_t’.  Recall
+   The following functions returns details of a `po_message_t'.  Recall
 that the results are valid as long as the FILE handle is valid.
 
  -- Function: const char * po_message_msgid (po_message_t MESSAGE)
-     The ‘po_message_msgid’ function returns the ‘msgid’ (untranslated
-     English string) of a message.  This is guaranteed to be non-‘NULL’.
+     The `po_message_msgid' function returns the `msgid' (untranslated
+     English string) of a message.  This is guaranteed to be non-`NULL'.
 
  -- Function: const char * po_message_msgid_plural (po_message_t
           MESSAGE)
-     The ‘po_message_msgid_plural’ function returns the ‘msgid_plural’
+     The `po_message_msgid_plural' function returns the `msgid_plural'
      (untranslated English plural string) of a message with plurals, or
-     ‘NULL’ for a message without plural.
+     `NULL' for a message without plural.
 
  -- Function: const char * po_message_msgstr (po_message_t MESSAGE)
-     The ‘po_message_msgstr’ function returns the ‘msgstr’ (translation)
+     The `po_message_msgstr' function returns the `msgstr' (translation)
      of a message.  For an untranslated message, the return value is an
      empty string.
 
  -- Function: const char * po_message_msgstr_plural (po_message_t
           MESSAGE, int INDEX)
-     The ‘po_message_msgstr_plural’ function returns the ‘msgstr[INDEX]’
-     of a message with plurals, or ‘NULL’ when the INDEX is out of range
-     or for a message without plural.
+     The `po_message_msgstr_plural' function returns the
+     `msgstr[INDEX]' of a message with plurals, or `NULL' when the
+     INDEX is out of range or for a message without plural.
 
    Here is an example code how these functions can be used.
 
-     const char *filename = …;
+     const char *filename = ...;
      po_file_t file = po_file_read (filename);
 
      if (file == NULL)
@@ -6826,7 +6839,7 @@
                  const char *msgid = po_message_msgid (message);
                  const char *msgstr = po_message_msgstr (message);
 
-                 …
+                 ...
                }
              }
            po_message_iterator_free (iterator);
@@ -6842,464 +6855,421 @@
 
 * Menu:
 
-* msgfmt Invocation::           Invoking the ‘msgfmt’ Program
-* msgunfmt Invocation::         Invoking the ‘msgunfmt’ Program
+* msgfmt Invocation::           Invoking the `msgfmt' Program
+* msgunfmt Invocation::         Invoking the `msgunfmt' Program
 * MO Files::                    The Format of GNU MO Files
 
 
 File: gettext.info,  Node: msgfmt Invocation,  Next: msgunfmt Invocation,  Prev: Binaries,  Up: Binaries
 
-10.1 Invoking the ‘msgfmt’ Program
+10.1 Invoking the `msgfmt' Program
 ==================================
 
-     msgfmt [OPTION] FILENAME.po …
+     msgfmt [OPTION] FILENAME.po ...
 
-   The ‘msgfmt’ programs generates a binary message catalog from a
+   The `msgfmt' programs generates a binary message catalog from a
 textual translation description.
 
 10.1.1 Input file location
 --------------------------
 
-‘FILENAME.po …’
+`FILENAME.po ...'
 
-‘-D DIRECTORY’
-‘--directory=DIRECTORY’
+`-D DIRECTORY'
+`--directory=DIRECTORY'
      Add DIRECTORY to the list of directories.  Source files are
-     searched relative to this list of directories.  The resulting
-     binary file will be written relative to the current directory,
-     though.
+     searched relative to this list of directories.  The resulting `.po'
+     file will be written relative to the current directory, though.
 
-   If an input file is ‘-’, standard input is read.
+
+   If an input file is `-', standard input is read.
 
 10.1.2 Operation mode
 ---------------------
 
-‘-j’
-‘--java’
-     Java mode: generate a Java ‘ResourceBundle’ class.
+`-j'
+`--java'
+     Java mode: generate a Java `ResourceBundle' class.
 
-‘--java2’
-     Like –java, and assume Java2 (JDK 1.2 or higher).
+`--java2'
+     Like -java, and assume Java2 (JDK 1.2 or higher).
 
-‘--csharp’
+`--csharp'
      C# mode: generate a .NET .dll file containing a subclass of
-     ‘GettextResourceSet’.
+     `GettextResourceSet'.
 
-‘--csharp-resources’
-     C# resources mode: generate a .NET ‘.resources’ file.
+`--csharp-resources'
+     C# resources mode: generate a .NET `.resources' file.
 
-‘--tcl’
-     Tcl mode: generate a tcl/msgcat ‘.msg’ file.
+`--tcl'
+     Tcl mode: generate a tcl/msgcat `.msg' file.
 
-‘--qt’
-     Qt mode: generate a Qt ‘.qm’ file.
+`--qt'
+     Qt mode: generate a Qt `.qm' file.
 
-‘--desktop’
-     Desktop Entry mode: generate a ‘.desktop’ file.
 
 10.1.3 Output file location
 ---------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
-‘--strict’
+`--strict'
      Direct the program to work strictly following the Uniforum/Sun
      implementation.  Currently this only affects the naming of the
      output file.  If this option is not given the name of the output
      file is the same as the domain name.  If the strict Uniforum mode
-     is enabled the suffix ‘.mo’ is added to the file name if it is not
+     is enabled the suffix `.mo' is added to the file name if it is not
      already present.
 
-     We find this behaviour of Sun’s implementation rather silly and so
+     We find this behaviour of Sun's implementation rather silly and so
      by default this mode is _not_ selected.
 
-   If the output FILE is ‘-’, output is written to standard output.
+
+   If the output FILE is `-', output is written to standard output.
 
 10.1.4 Output file location in Java mode
 ----------------------------------------
 
-‘-r RESOURCE’
-‘--resource=RESOURCE’
+`-r RESOURCE'
+`--resource=RESOURCE'
      Specify the resource name.
 
-‘-l LOCALE’
-‘--locale=LOCALE’
+`-l LOCALE'
+`--locale=LOCALE'
      Specify the locale name, either a language specification of the
      form LL or a combined language and country specification of the
      form LL_CC.
 
-‘-d DIRECTORY’
+`-d DIRECTORY'
      Specify the base directory of classes directory hierarchy.
 
-‘--source’
-     Produce a .java source file, instead of a compiled .class file.
 
    The class name is determined by appending the locale name to the
-resource name, separated with an underscore.  The ‘-d’ option is
+resource name, separated with an underscore.  The `-d' option is
 mandatory.  The class is written under the specified directory.
 
 10.1.5 Output file location in C# mode
 --------------------------------------
 
-‘-r RESOURCE’
-‘--resource=RESOURCE’
+`-r RESOURCE'
+`--resource=RESOURCE'
      Specify the resource name.
 
-‘-l LOCALE’
-‘--locale=LOCALE’
+`-l LOCALE'
+`--locale=LOCALE'
      Specify the locale name, either a language specification of the
      form LL or a combined language and country specification of the
      form LL_CC.
 
-‘-d DIRECTORY’
-     Specify the base directory for locale dependent ‘.dll’ files.
+`-d DIRECTORY'
+     Specify the base directory for locale dependent `.dll' files.
 
-   The ‘-l’ and ‘-d’ options are mandatory.  The ‘.dll’ file is written
+
+   The `-l' and `-d' options are mandatory.  The `.dll' file is written
 in a subdirectory of the specified directory whose name depends on the
 locale.
 
 10.1.6 Output file location in Tcl mode
 ---------------------------------------
 
-‘-l LOCALE’
-‘--locale=LOCALE’
-     Specify the locale name, either a language specification of the
-     form LL or a combined language and country specification of the
-     form LL_CC.
-
-‘-d DIRECTORY’
-     Specify the base directory of ‘.msg’ message catalogs.
-
-   The ‘-l’ and ‘-d’ options are mandatory.  The ‘.msg’ file is written
-in the specified directory.
-
-10.1.7 Desktop Entry mode operations
-------------------------------------
-
-‘--template=TEMPLATE’
-     Specify a .desktop file used as a template.
-
-‘-k[KEYWORDSPEC]’
-‘--keyword[=KEYWORDSPEC]’
-     Specify KEYWORDSPEC as an additional keyword to be looked for.
-     Without a KEYWORDSPEC, the option means to not use default
-     keywords.
-
-‘-l LOCALE’
-‘--locale=LOCALE’
+`-l LOCALE'
+`--locale=LOCALE'
      Specify the locale name, either a language specification of the
      form LL or a combined language and country specification of the
      form LL_CC.
 
-‘-d DIRECTORY’
-     Specify the base directory of ‘.msg’ message catalogs.
-
-   To generate a ‘.desktop’ file for a single locale, you can use it as
-follows.
-
-     msgfmt --desktop --template=TEMPLATE --locale=LOCALE \
-       -o FILE FILENAME.po …
-
-   On the other hand, when using msgfmt from a Makefile, it is
-cumbersome to loop over all locales under a particular directory.
-msgfmt provides a special operation mode for this use-case.  To generate
-a ‘.desktop’ file from multiple ‘.po’ files under a directory, specify
-the directory with the ‘-d’ option.
+`-d DIRECTORY'
+     Specify the base directory of `.msg' message catalogs.
 
-     msgfmt --desktop --template=TEMPLATE -d DIRECTORY -o FILE
 
-   msgfmt first reads the ‘LINGUAS’ file under DIRECTORY, and then
-processes all ‘.po’ files listed there.  You can also limit the locales
-to a subset, through the ‘LINGUAS’ environment variable.
-
-   For either operation modes, the ‘-o’ and ‘--template’ options are
-mandatory.
+   The `-l' and `-d' options are mandatory.  The `.msg' file is written
+in the specified directory.
 
-10.1.8 Input file syntax
+10.1.7 Input file syntax
 ------------------------
 
-‘-P’
-‘--properties-input’
+`-P'
+`--properties-input'
      Assume the input files are Java ResourceBundles in Java
-     ‘.properties’ syntax, not in PO file syntax.
+     `.properties' syntax, not in PO file syntax.
 
-‘--stringtable-input’
+`--stringtable-input'
      Assume the input files are NeXTstep/GNUstep localized resource
-     files in ‘.strings’ syntax, not in PO file syntax.
+     files in `.strings' syntax, not in PO file syntax.
 
-10.1.9 Input file interpretation
+
+10.1.8 Input file interpretation
 --------------------------------
 
-‘-c’
-‘--check’
-     Perform all the checks implied by ‘--check-format’,
-     ‘--check-header’, ‘--check-domain’.
+`-c'
+`--check'
+     Perform all the checks implied by `--check-format',
+     `--check-header', `--check-domain'.
 
-‘--check-format’
+`--check-format'
      Check language dependent format strings.
 
-     If the string represents a format string used in a ‘printf’-like
-     function both strings should have the same number of ‘%’ format
-     specifiers, with matching types.  If the flag ‘c-format’ or
-     ‘possible-c-format’ appears in the special comment <#,> for this
+     If the string represents a format string used in a `printf'-like
+     function both strings should have the same number of `%' format
+     specifiers, with matching types.  If the flag `c-format' or
+     `possible-c-format' appears in the special comment <#,> for this
      entry a check is performed.  For example, the check will diagnose
-     using ‘%.*s’ against ‘%s’, or ‘%d’ against ‘%s’, or ‘%d’ against
-     ‘%x’.  It can even handle positional parameters.
+     using `%.*s' against `%s', or `%d' against `%s', or `%d' against
+     `%x'.  It can even handle positional parameters.
 
-     Normally the ‘xgettext’ program automatically decides whether a
+     Normally the `xgettext' program automatically decides whether a
      string is a format string or not.  This algorithm is not perfect,
      though.  It might regard a string as a format string though it is
-     not used in a ‘printf’-like function and so ‘msgfmt’ might report
+     not used in a `printf'-like function and so `msgfmt' might report
      errors where there are none.
 
      To solve this problem the programmer can dictate the decision to
-     the ‘xgettext’ program (*note c-format::).  The translator should
+     the `xgettext' program (*note c-format::).  The translator should
      not consider removing the flag from the <#,> line.  This "fix"
-     would be reversed again as soon as ‘msgmerge’ is called the next
+     would be reversed again as soon as `msgmerge' is called the next
      time.
 
-‘--check-header’
+`--check-header'
      Verify presence and contents of the header entry.  *Note Header
      Entry::, for a description of the various fields in the header
      entry.
 
-‘--check-domain’
+`--check-domain'
      Check for conflicts between domain directives and the
-     ‘--output-file’ option
+     `--output-file' option
 
-‘-C’
-‘--check-compatibility’
+`-C'
+`--check-compatibility'
      Check that GNU msgfmt behaves like X/Open msgfmt.  This will give
      an error when attempting to use the GNU extensions.
 
-‘--check-accelerators[=CHAR]’
+`--check-accelerators[=CHAR]'
      Check presence of keyboard accelerators for menu items.  This is
      based on the convention used in some GUIs that a keyboard
      accelerator in a menu item string is designated by an immediately
-     preceding ‘&’ character.  Sometimes a keyboard accelerator is also
+     preceding `&' character.  Sometimes a keyboard accelerator is also
      called "keyboard mnemonic".  This check verifies that if the
-     untranslated string has exactly one ‘&’ character, the translated
-     string has exactly one ‘&’ as well.  If this option is given with a
-     CHAR argument, this CHAR should be a non-alphanumeric character and
-     is used as keyboard accelerator mark instead of ‘&’.
+     untranslated string has exactly one `&' character, the translated
+     string has exactly one `&' as well.  If this option is given with
+     a CHAR argument, this CHAR should be a non-alphanumeric character
+     and is used as keyboard accelerator mark instead of `&'.
 
-‘-f’
-‘--use-fuzzy’
+`-f'
+`--use-fuzzy'
      Use fuzzy entries in output.  Note that using this option is
      usually wrong, because fuzzy messages are exactly those which have
      not been validated by a human translator.
 
-10.1.10 Output details
-----------------------
 
-‘-a NUMBER’
-‘--alignment=NUMBER’
+10.1.9 Output details
+---------------------
+
+`-a NUMBER'
+`--alignment=NUMBER'
      Align strings to NUMBER bytes (default: 1).
 
-‘--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.
-
-     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.
-
-‘--no-hash’
-     Don’t include a hash table in the binary file.  Lookup will be more
-     expensive at run time (binary search instead of hash table lookup).
+`--no-hash'
+     Don't include a hash table in the binary file.  Lookup will be
+     more expensive at run time (binary search instead of hash table
+     lookup).
 
-10.1.11 Informative output
+
+10.1.10 Informative output
 --------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
-‘--statistics’
-     Print statistics about translations.  When the option ‘--verbose’
-     is used in combination with ‘--statistics’, the input file name is
+`--statistics'
+     Print statistics about translations.  When the option `--verbose'
+     is used in combination with `--statistics', the input file name is
      printed in front of the statistics line.
 
-‘-v’
-‘--verbose’
+`-v'
+`--verbose'
      Increase verbosity level.
 
+
 
 File: gettext.info,  Node: msgunfmt Invocation,  Next: MO Files,  Prev: msgfmt Invocation,  Up: Binaries
 
-10.2 Invoking the ‘msgunfmt’ Program
+10.2 Invoking the `msgunfmt' Program
 ====================================
 
      msgunfmt [OPTION] [FILE]...
 
-   The ‘msgunfmt’ program converts a binary message catalog to a
+   The `msgunfmt' program converts a binary message catalog to a
 Uniforum style .po file.
 
 10.2.1 Operation mode
 ---------------------
 
-‘-j’
-‘--java’
-     Java mode: input is a Java ‘ResourceBundle’ class.
+`-j'
+`--java'
+     Java mode: input is a Java `ResourceBundle' class.
 
-‘--csharp’
+`--csharp'
      C# mode: input is a .NET .dll file containing a subclass of
-     ‘GettextResourceSet’.
+     `GettextResourceSet'.
 
-‘--csharp-resources’
-     C# resources mode: input is a .NET ‘.resources’ file.
+`--csharp-resources'
+     C# resources mode: input is a .NET `.resources' file.
+
+`--tcl'
+     Tcl mode: input is a tcl/msgcat `.msg' file.
 
-‘--tcl’
-     Tcl mode: input is a tcl/msgcat ‘.msg’ file.
 
 10.2.2 Input file location
 --------------------------
 
-‘FILE …’
+`FILE ...'
      Input .mo files.
 
-   If no input FILE is given or if it is ‘-’, standard input is read.
+
+   If no input FILE is given or if it is `-', standard input is read.
 
 10.2.3 Input file location in Java mode
 ---------------------------------------
 
-‘-r RESOURCE’
-‘--resource=RESOURCE’
+`-r RESOURCE'
+`--resource=RESOURCE'
      Specify the resource name.
 
-‘-l LOCALE’
-‘--locale=LOCALE’
+`-l LOCALE'
+`--locale=LOCALE'
      Specify the locale name, either a language specification of the
      form LL or a combined language and country specification of the
      form LL_CC.
 
+
    The class name is determined by appending the locale name to the
-resource name, separated with an underscore.  The class is located using
-the ‘CLASSPATH’.
+resource name, separated with an underscore.  The class is located
+using the `CLASSPATH'.
 
 10.2.4 Input file location in C# mode
 -------------------------------------
 
-‘-r RESOURCE’
-‘--resource=RESOURCE’
+`-r RESOURCE'
+`--resource=RESOURCE'
      Specify the resource name.
 
-‘-l LOCALE’
-‘--locale=LOCALE’
+`-l LOCALE'
+`--locale=LOCALE'
      Specify the locale name, either a language specification of the
      form LL or a combined language and country specification of the
      form LL_CC.
 
-‘-d DIRECTORY’
-     Specify the base directory for locale dependent ‘.dll’ files.
+`-d DIRECTORY'
+     Specify the base directory for locale dependent `.dll' files.
+
 
-   The ‘-l’ and ‘-d’ options are mandatory.  The ‘.msg’ file is located
+   The `-l' and `-d' options are mandatory.  The `.msg' file is located
 in a subdirectory of the specified directory whose name depends on the
 locale.
 
 10.2.5 Input file location in Tcl mode
 --------------------------------------
 
-‘-l LOCALE’
-‘--locale=LOCALE’
+`-l LOCALE'
+`--locale=LOCALE'
      Specify the locale name, either a language specification of the
      form LL or a combined language and country specification of the
      form LL_CC.
 
-‘-d DIRECTORY’
-     Specify the base directory of ‘.msg’ message catalogs.
+`-d DIRECTORY'
+     Specify the base directory of `.msg' message catalogs.
 
-   The ‘-l’ and ‘-d’ options are mandatory.  The ‘.msg’ file is located
+
+   The `-l' and `-d' options are mandatory.  The `.msg' file is located
 in the specified directory.
 
 10.2.6 Output file location
 ---------------------------
 
-‘-o FILE’
-‘--output-file=FILE’
+`-o FILE'
+`--output-file=FILE'
      Write output to specified file.
 
+
    The results are written to standard output if no output file is
-specified or if it is ‘-’.
+specified or if it is `-'.
 
 10.2.7 Output details
 ---------------------
 
-‘--color’
-‘--color=WHEN’
+`--color'
+`--color=WHEN'
      Specify whether or when to use colors and other text attributes.
      See *note The --color option:: for details.
 
-‘--style=STYLE_FILE’
-     Specify the CSS style rule file to use for ‘--color’.  See *note
+`--style=STYLE_FILE'
+     Specify the CSS style rule file to use for `--color'.  See *note
      The --style option:: for details.
 
-‘--force-po’
+`--force-po'
      Always write an output file even if it contains no message.
 
-‘-i’
-‘--indent’
+`-i'
+`--indent'
      Write the .po file using indented style.
 
-‘--strict’
+`--strict'
      Write out a strict Uniforum conforming PO file.  Note that this
-     Uniforum format should be avoided because it doesn’t support the
+     Uniforum format should be avoided because it doesn't support the
      GNU extensions.
 
-‘-p’
-‘--properties-output’
-     Write out a Java ResourceBundle in Java ‘.properties’ syntax.  Note
-     that this file format doesn’t support plural forms and silently
+`-p'
+`--properties-output'
+     Write out a Java ResourceBundle in Java `.properties' syntax.  Note
+     that this file format doesn't support plural forms and silently
      drops obsolete messages.
 
-‘--stringtable-output’
-     Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
-     syntax.  Note that this file format doesn’t support plural forms.
+`--stringtable-output'
+     Write out a NeXTstep/GNUstep localized resource file in `.strings'
+     syntax.  Note that this file format doesn't support plural forms.
 
-‘-w NUMBER’
-‘--width=NUMBER’
+`-w NUMBER'
+`--width=NUMBER'
      Set the output page width.  Long strings in the output files will
-     be split across multiple lines in order to ensure that each line’s
+     be split across multiple lines in order to ensure that each line's
      width (= number of screen columns) is less or equal to the given
      NUMBER.
 
-‘--no-wrap’
-     Do not break long message lines.  Message lines whose width exceeds
-     the output page width will not be split into several lines.  Only
-     file reference lines which are wider than the output page width
-     will be split.
+`--no-wrap'
+     Do not break long message lines.  Message lines whose width
+     exceeds the output page width will not be split into several
+     lines.  Only file reference lines which are wider than the output
+     page width will be split.
 
-‘-s’
-‘--sort-output’
+`-s'
+`--sort-output'
      Generate sorted output.  Note that using this option makes it much
-     harder for the translator to understand each message’s context.
+     harder for the translator to understand each message's context.
+
 
 10.2.8 Informative output
 -------------------------
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
-‘-v’
-‘--verbose’
+`-v'
+`--verbose'
      Increase verbosity level.
 
+
 
 File: gettext.info,  Node: MO Files,  Prev: msgunfmt Invocation,  Up: Binaries
 
@@ -7312,13 +7282,13 @@
    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’.
+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
-ensure that the readers of MO files can distinguish new formats from old
-ones and handle their contents, as far as possible.  For now the major
-revision is 0 or 1, and the minor revision is also 0 or 1.  More
+ensure that the readers of MO files can distinguish new formats from
+old ones and handle their contents, as far as possible.  For now the
+major revision is 0 or 1, and the minor revision is also 0 or 1.  More
 revisions might be added in the future.  A program seeing an unexpected
 major revision number should stop reading the MO file entirely; whereas
 an unexpected minor revision number means that the file can be read but
@@ -7327,13 +7297,13 @@
 
    The version is kept separate from the magic number, instead of using
 different magic numbers for different formats, mainly because
-‘/etc/magic’ is not updated often.
+`/etc/magic' is not updated often.
 
-   Follow a number of pointers to later tables in the file, allowing for
-the extension of the prefix part of MO files without having to recompile
-programs reading them.  This might become useful for later inserting a
-few flag bits, indication about the charset used, new tables, or other
-things.
+   Follow a number of pointers to later tables in the file, allowing
+for the extension of the prefix part of MO files without having to
+recompile programs reading them.  This might become useful for later
+inserting a few flag bits, indication about the charset used, new
+tables, or other things.
 
    Then, at offset O and offset T in the picture, two tables of string
 descriptors can be found.  In both tables, each string descriptor uses
@@ -7349,11 +7319,11 @@
    Having the original strings sorted enables the use of simple binary
 search, for when the MO file does not contain an hashing table, or for
 when it is not practical to use the hashing table provided in the MO
-file.  This also has another advantage, as the empty string in a PO file
-GNU ‘gettext’ is usually _translated_ into some system information
+file.  This also has another advantage, as the empty string in a PO
+file GNU `gettext' is usually _translated_ into some system information
 attached to that particular MO file, and the empty string necessarily
-becomes the first in both the original and translated tables, making the
-system information very easy to find.
+becomes the first in both the original and translated tables, making
+the system information very easy to find.
 
    The size S of the hash table can be zero.  In this case, the hash
 table itself is not contained in the MO file.  Some people might prefer
@@ -7361,11 +7331,11 @@
 win _that_ much speed.  The hash table contains indices to the sorted
 array of strings in the MO file.  Conflict resolution is done by double
 hashing.  The precise hashing algorithm used is fairly dependent on GNU
-‘gettext’ code, and is not documented here.
+`gettext' code, and is not documented here.
 
-   As for the strings themselves, they follow the hash file, and each is
-terminated with a <NUL>, and this <NUL> is not counted in the length
-which appears in the string descriptor.  The ‘msgfmt’ program has an
+   As for the strings themselves, they follow the hash file, and each
+is terminated with a <NUL>, and this <NUL> is not counted in the length
+which appears in the string descriptor.  The `msgfmt' program has an
 option selecting the alignment for MO file strings.  With this option,
 each string is separately aligned so it starts at an offset which is a
 multiple of the alignment value.  On some RISC machines, a correct
@@ -7377,26 +7347,26 @@
    Plural forms are stored by letting the plural of the original string
 follow the singular of the original string, separated through a <NUL>
 byte.  The length which appears in the string descriptor includes both.
-However, only the singular of the original string takes part in the hash
-table lookup.  The plural variants of the translation are all stored
-consecutively, separated through a <NUL> byte.  Here also, the length in
-the string descriptor includes all of them.
+However, only the singular of the original string takes part in the
+hash table lookup.  The plural variants of the translation are all
+stored consecutively, separated through a <NUL> byte.  Here also, the
+length in the string descriptor includes all of them.
 
    Nothing prevents a MO file from having embedded <NUL>s in strings.
 However, the program interface currently used already presumes that
 strings are <NUL> terminated, so embedded <NUL>s are somewhat useless.
 But the MO file format is general enough so other interfaces would be
 later possible, if for example, we ever want to implement wide
-characters right in MO files, where <NUL> bytes may accidentally appear.
-(No, we don’t want to have wide characters in MO files.  They would make
-the file unnecessarily large, and the ‘wchar_t’ type being platform
-dependent, MO files would be platform dependent as well.)
+characters right in MO files, where <NUL> bytes may accidentally
+appear.  (No, we don't want to have wide characters in MO files.  They
+would make the file unnecessarily large, and the `wchar_t' type being
+platform dependent, MO files would be platform dependent as well.)
 
-   This particular issue has been strongly debated in the GNU ‘gettext’
+   This particular issue has been strongly debated in the GNU `gettext'
 development forum, and it is expectable that MO file format will evolve
-or change over time.  It is even possible that many formats may later be
-supported concurrently.  But surely, we have to start somewhere, and the
-MO file format described here is a good start.  Nothing is cast in
+or change over time.  It is even possible that many formats may later
+be supported concurrently.  But surely, we have to start somewhere, and
+the MO file format described here is a good start.  Nothing is cast in
 concrete, and the format may later evolve fairly easily, so we should
 feel comfortable with the current approach.
 
@@ -7451,60 +7421,60 @@
 
 File: gettext.info,  Node: Programmers,  Next: Translators,  Prev: Binaries,  Up: Top
 
-11 The Programmer’s View
+11 The Programmer's View
 ************************
 
-   One aim of the current message catalog implementation provided by GNU
-‘gettext’ was to use the system’s message catalog handling, if the
+   One aim of the current message catalog implementation provided by
+GNU `gettext' was to use the system's message catalog handling, if the
 installer wishes to do so.  So we perhaps should first take a look at
 the solutions we know about.  The people in the POSIX committee did not
-manage to agree on one of the semi-official standards which we’ll
-describe below.  In fact they couldn’t agree on anything, so they
+manage to agree on one of the semi-official standards which we'll
+describe below.  In fact they couldn't agree on anything, so they
 decided only to include an example of an interface.  The major Unix
-vendors are split in the usage of the two most important specifications:
-X/Open’s catgets vs.  Uniforum’s gettext interface.  We’ll describe them
-both and later explain our solution of this dilemma.
+vendors are split in the usage of the two most important
+specifications: X/Open's catgets vs. Uniforum's gettext interface.
+We'll describe them both and later explain our solution of this dilemma.
 
 * Menu:
 
-* catgets::                     About ‘catgets’
-* gettext::                     About ‘gettext’
+* catgets::                     About `catgets'
+* gettext::                     About `gettext'
 * Comparison::                  Comparing the two interfaces
 * Using libintl.a::             Using libintl.a in own programs
-* gettext grok::                Being a ‘gettext’ grok
+* gettext grok::                Being a `gettext' grok
 * Temp Programmers::            Temporary Notes for the Programmers Chapter
 
 
 File: gettext.info,  Node: catgets,  Next: gettext,  Prev: Programmers,  Up: Programmers
 
-11.1 About ‘catgets’
+11.1 About `catgets'
 ====================
 
-   The ‘catgets’ implementation is defined in the X/Open Portability
+   The `catgets' implementation is defined in the X/Open Portability
 Guide, Volume 3, XSI Supplementary Definitions, Chapter 5.  But the
 process of creating this standard seemed to be too slow for some of the
 Unix vendors so they created their implementations on preliminary
 versions of the standard.  Of course this leads again to problems while
-writing platform independent programs: even the usage of ‘catgets’ does
+writing platform independent programs: even the usage of `catgets' does
 not guarantee a unique interface.
 
    Another, personal comment on this that only a bunch of committee
 members could have made this interface.  They never really tried to
 program using this interface.  It is a fast, memory-saving
 implementation, an user can happily live with it.  But programmers hate
-it (at least I and some others do…)
+it (at least I and some others do...)
 
    But we must not forget one point: after all the trouble with
 transferring the rights on Unix(tm) they at last came to X/Open, the
-very same who published this specification.  This leads me to making the
-prediction that this interface will be in future Unix standards (e.g.
-Spec1170) and therefore part of all Unix implementation
+very same who published this specification.  This leads me to making
+the prediction that this interface will be in future Unix standards
+(e.g. Spec1170) and therefore part of all Unix implementation
 (implementations, which are _allowed_ to wear this name).
 
 * Menu:
 
 * Interface to catgets::        The interface
-* Problems with catgets::       Problems with the ‘catgets’ interface?!
+* Problems with catgets::       Problems with the `catgets' interface?!
 
 
 File: gettext.info,  Node: Interface to catgets,  Next: Problems with catgets,  Prev: catgets,  Up: catgets
@@ -7512,77 +7482,77 @@
 11.1.1 The Interface
 --------------------
 
-   The interface to the ‘catgets’ implementation consists of three
-functions which correspond to those used in file access: ‘catopen’ to
-open the catalog for using, ‘catgets’ for accessing the message tables,
-and ‘catclose’ for closing after work is done.  Prototypes for the
-functions and the needed definitions are in the ‘<nl_types.h>’ header
+   The interface to the `catgets' implementation consists of three
+functions which correspond to those used in file access: `catopen' to
+open the catalog for using, `catgets' for accessing the message tables,
+and `catclose' for closing after work is done.  Prototypes for the
+functions and the needed definitions are in the `<nl_types.h>' header
 file.
 
-   ‘catopen’ is used like in this:
+   `catopen' is used like in this:
 
      nl_catd catd = catopen ("catalog_name", 0);
 
    The function takes as the argument the name of the catalog.  This
 usual refers to the name of the program or the package.  The second
-parameter is not further specified in the standard.  I don’t even know
+parameter is not further specified in the standard.  I don't even know
 whether it is implemented consistently among various systems.  So the
-common advice is to use ‘0’ as the value.  The return value is a handle
+common advice is to use `0' as the value.  The return value is a handle
 to the message catalog, equivalent to handles to file returned by
-‘open’.
+`open'.
 
-   This handle is of course used in the ‘catgets’ function which can be
+   This handle is of course used in the `catgets' function which can be
 used like this:
 
      char *translation = catgets (catd, set_no, msg_id, "original string");
 
    The first parameter is this catalog descriptor.  The second parameter
 specifies the set of messages in this catalog, in which the message
-described by ‘msg_id’ is obtained.  ‘catgets’ therefore uses a
+described by `msg_id' is obtained.  `catgets' therefore uses a
 three-stage addressing:
 
-     catalog name ⇒ set number ⇒ message ID ⇒ translation
+     catalog name => set number => message ID => translation
 
    The fourth argument is not used to address the translation.  It is
-given as a default value in case when one of the addressing stages fail.
-One important thing to remember is that although the return type of
-catgets is ‘char *’ the resulting string _must not_ be changed.  It
-should better be ‘const char *’, but the standard is published in 1988,
+given as a default value in case when one of the addressing stages
+fail.  One important thing to remember is that although the return type
+of catgets is `char *' the resulting string _must not_ be changed.  It
+should better be `const char *', but the standard is published in 1988,
 one year before ANSI C.
 
 The last of these functions is used and behaves as expected:
 
      catclose (catd);
 
-   After this no ‘catgets’ call using the descriptor is legal anymore.
+   After this no `catgets' call using the descriptor is legal anymore.
 
 
 File: gettext.info,  Node: Problems with catgets,  Prev: Interface to catgets,  Up: catgets
 
-11.1.2 Problems with the ‘catgets’ Interface?!
+11.1.2 Problems with the `catgets' Interface?!
 ----------------------------------------------
 
-   Now that this description seemed to be really easy — where are the
+   Now that this description seemed to be really easy -- where are the
 problems we speak of?  In fact the interface could be used in a
 reasonable way, but constructing the message catalogs is a pain.  The
-reason for this lies in the third argument of ‘catgets’: the unique
-message ID. This has to be a numeric value for all messages in a single
+reason for this lies in the third argument of `catgets': the unique
+message ID.  This has to be a numeric value for all messages in a single
 set.  Perhaps you could imagine the problems keeping such a list while
 changing the source code.  Add a new message here, remove one there.  Of
 course there have been developed a lot of tools helping to organize this
-chaos but one as the other fails in one aspect or the other.  We don’t
+chaos but one as the other fails in one aspect or the other.  We don't
 want to say that the other approach has no problems but they are far
 more easy to manage.
 
 
 File: gettext.info,  Node: gettext,  Next: Comparison,  Prev: catgets,  Up: Programmers
 
-11.2 About ‘gettext’
+11.2 About `gettext'
 ====================
 
-   The definition of the ‘gettext’ interface comes from a Uniforum
+   The definition of the `gettext' interface comes from a Uniforum
 proposal.  It was submitted there by Sun, who had implemented the
-‘gettext’ function in SunOS 4, around 1990.  Nowadays, the ‘gettext’
+`gettext' function in SunOS 4, around 1990.  Nowadays, the `gettext'
 interface is specified by the OpenI18N standard.
 
    The main point about this solution is that it does not follow the
@@ -7594,7 +7564,7 @@
 
    The following section contains a rather detailed description of the
 interface.  We make it that detailed because this is the interface we
-chose for the GNU ‘gettext’ Library.  Programmers interested in using
+chose for the GNU `gettext' Library.  Programmers interested in using
 this library will be interested in this description.
 
 * Menu:
@@ -7618,42 +7588,42 @@
 not reasonable because its construction and maintenance is difficult,
 perhaps impossible) and b) to access a string in a selected domain.
 
-   This is principally the description of the ‘gettext’ interface.  It
+   This is principally the description of the `gettext' interface.  It
 has a global domain which unqualified usages reference.  Of course this
 domain is selectable by the user.
 
      char *textdomain (const char *domain_name);
 
    This provides the possibility to change or query the current status
-of the current global domain of the ‘LC_MESSAGE’ category.  The argument
-is a null-terminated string, whose characters must be legal in the use
-in filenames.  If the DOMAIN_NAME argument is ‘NULL’, the function
-returns the current value.  If no value has been set before, the name of
-the default domain is returned: _messages_.  Please note that although
-the return value of ‘textdomain’ is of type ‘char *’ no changing is
-allowed.  It is also important to know that no checks of the
-availability are made.  If the name is not available you will see this
-by the fact that no translations are provided.
+of the current global domain of the `LC_MESSAGE' category.  The
+argument is a null-terminated string, whose characters must be legal in
+the use in filenames.  If the DOMAIN_NAME argument is `NULL', the
+function returns the current value.  If no value has been set before,
+the name of the default domain is returned: _messages_.  Please note
+that although the return value of `textdomain' is of type `char *' no
+changing is allowed.  It is also important to know that no checks of
+the availability are made.  If the name is not available you will see
+this by the fact that no translations are provided.
 
-To use a domain set by ‘textdomain’ the function
+To use a domain set by `textdomain' the function
 
      char *gettext (const char *msgid);
 
 is to be used.  This is the simplest reasonable form one can imagine.
 The translation of the string MSGID is returned if it is available in
 the current domain.  If it is not available, the argument itself is
-returned.  If the argument is ‘NULL’ the result is undefined.
+returned.  If the argument is `NULL' the result is undefined.
 
    One thing which should come into mind is that no explicit dependency
 to the used domain is given.  The current value of the domain is used.
-If this changes between two executions of the same ‘gettext’ call in the
-program, both calls reference a different message catalog.
+If this changes between two executions of the same `gettext' call in
+the program, both calls reference a different message catalog.
 
    For the easiest case, which is normally used in internationalized
-packages, once at the beginning of execution a call to ‘textdomain’ is
+packages, once at the beginning of execution a call to `textdomain' is
 issued, setting the domain to a unique name, normally the package name.
 In the following code all strings which have to be translated are
-filtered through the gettext function.  That’s all, the package speaks
+filtered through the gettext function.  That's all, the package speaks
 your language.
 
 
@@ -7665,10 +7635,10 @@
    While this single name domain works well for most applications there
 might be the need to get translations from more than one domain.  Of
 course one could switch between different domains with calls to
-‘textdomain’, but this is really not convenient nor is it fast.  A
+`textdomain', but this is really not convenient nor is it fast.  A
 possible situation could be one case subject to discussion during this
-writing: all error messages of functions in the set of common used
-functions should go into a separate domain ‘error’.  By this mean we
+writing:  all error messages of functions in the set of common used
+functions should go into a separate domain `error'.  By this mean we
 would only need to translate them once.  Another case are messages from
 a library, as these _have_ to be independent of the current domain set
 by the application.
@@ -7680,10 +7650,10 @@
                       int category);
 
    Both take an additional argument at the first place, which
-corresponds to the argument of ‘textdomain’.  The third argument of
-‘dcgettext’ allows to use another locale category but ‘LC_MESSAGES’.
-But I really don’t know where this can be useful.  If the DOMAIN_NAME is
-‘NULL’ or CATEGORY has an value beside the known ones, the result is
+corresponds to the argument of `textdomain'.  The third argument of
+`dcgettext' allows to use another locale category but `LC_MESSAGES'.
+But I really don't know where this can be useful.  If the DOMAIN_NAME
+is `NULL' or CATEGORY has an value beside the known ones, the result is
 undefined.  It should also be noted that this function is not part of
 the second known implementation of this function family, the one found
 in Solaris.
@@ -7699,17 +7669,17 @@
 specified directory (how this file is determined follows below).
 Especially a file in the systems default place is not favored against
 the specified file anymore (as it would be by solely using
-‘textdomain’).  A ‘NULL’ pointer for the DIR_NAME parameter returns the
-binding associated with DOMAIN_NAME.  If DOMAIN_NAME itself is ‘NULL’
-nothing happens and a ‘NULL’ pointer is returned.  Here again as for all
-the other functions is true that none of the return value must be
+`textdomain').  A `NULL' pointer for the DIR_NAME parameter returns the
+binding associated with DOMAIN_NAME.  If DOMAIN_NAME itself is `NULL'
+nothing happens and a `NULL' pointer is returned.  Here again as for
+all the other functions is true that none of the return value must be
 changed!
 
-   It is important to remember that relative path names for the DIR_NAME
-parameter can be trouble.  Since the path is always computed relative to
-the current directory different results will be achieved when the
-program executes a ‘chdir’ command.  Relative paths should always be
-avoided to avoid dependencies and unreliabilities.
+   It is important to remember that relative path names for the
+DIR_NAME parameter can be trouble.  Since the path is always computed
+relative to the current directory different results will be achieved
+when the program executes a `chdir' command.  Relative paths should
+always be avoided to avoid dependencies and unreliabilities.
 
 
 File: gettext.info,  Node: Locating Catalogs,  Next: Charset conversion,  Prev: Ambiguities,  Up: gettext
@@ -7721,81 +7691,81 @@
 be stored we need some way to add these information to file message
 catalog files.  The way usually used in Unix environments is have this
 encoding in the file name.  This is also done here.  The directory name
-given in ‘bindtextdomain’s second argument (or the default directory),
+given in `bindtextdomain's second argument (or the default directory),
 followed by the name of the locale, the locale category, and the domain
 name are concatenated:
 
      DIR_NAME/LOCALE/LC_CATEGORY/DOMAIN_NAME.mo
 
    The default value for DIR_NAME is system specific.  For the GNU
-library, and for packages adhering to its conventions, it’s:
+library, and for packages adhering to its conventions, it's:
      /usr/local/share/locale
 
 LOCALE is the name of the locale category which is designated by
-‘LC_CATEGORY’.  For ‘gettext’ and ‘dgettext’ this ‘LC_CATEGORY’ is
-always ‘LC_MESSAGES’.(1)  The name of the locale category is determined
-through ‘setlocale (LC_CATEGORY, NULL)’.  (2) When using the function
-‘dcgettext’, you can specify the locale category through the third
+`LC_CATEGORY'.  For `gettext' and `dgettext' this `LC_CATEGORY' is
+always `LC_MESSAGES'.(1) The name of the locale category is determined
+through `setlocale (LC_CATEGORY, NULL)'.  (2) When using the function
+`dcgettext', you can specify the locale category through the third
 argument.
 
    ---------- Footnotes ----------
 
-   (1) Some system, e.g. mingw, don’t have ‘LC_MESSAGES’.  Here we use a
-more or less arbitrary value for it, namely 1729, the smallest positive
-integer which can be represented in two different ways as the sum of two
-cubes.
+   (1) Some system, e.g. mingw, don't have `LC_MESSAGES'.  Here we use
+a more or less arbitrary value for it, namely 1729, the smallest
+positive integer which can be represented in two different ways as the
+sum of two cubes.
 
-   (2) When the system does not support ‘setlocale’ its behavior in
+   (2) When the system does not support `setlocale' its behavior in
 setting the locale values is simulated by looking at the environment
 variables.
 
 
 File: gettext.info,  Node: Charset conversion,  Next: Contexts,  Prev: Locating Catalogs,  Up: gettext
 
-11.2.4 How to specify the output character set ‘gettext’ uses
+11.2.4 How to specify the output character set `gettext' uses
 -------------------------------------------------------------
 
-   ‘gettext’ not only looks up a translation in a message catalog.  It
+   `gettext' not only looks up a translation in a message catalog.  It
 also converts the translation on the fly to the desired output character
 set.  This is useful if the user is working in a different character set
 than the translator who created the message catalog, because it avoids
 distributing variants of message catalogs which differ only in the
 character set.
 
-   The output character set is, by default, the value of ‘nl_langinfo
-(CODESET)’, which depends on the ‘LC_CTYPE’ part of the current locale.
+   The output character set is, by default, the value of `nl_langinfo
+(CODESET)', which depends on the `LC_CTYPE' part of the current locale.
 But programs which store strings in a locale independent way (e.g.
-UTF-8) can request that ‘gettext’ and related functions return the
-translations in that encoding, by use of the ‘bind_textdomain_codeset’
+UTF-8) can request that `gettext' and related functions return the
+translations in that encoding, by use of the `bind_textdomain_codeset'
 function.
 
-   Note that the MSGID argument to ‘gettext’ is not subject to character
-set conversion.  Also, when ‘gettext’ does not find a translation for
-MSGID, it returns MSGID unchanged – independently of the current output
-character set.  It is therefore recommended that all MSGIDs be US-ASCII
-strings.
+   Note that the MSGID argument to `gettext' is not subject to
+character set conversion.  Also, when `gettext' does not find a
+translation for MSGID, it returns MSGID unchanged - independently of
+the current output character set.  It is therefore recommended that all
+MSGIDs be US-ASCII strings.
 
  -- Function: char * bind_textdomain_codeset (const char *DOMAINNAME,
           const char *CODESET)
-     The ‘bind_textdomain_codeset’ function can be used to specify the
+     The `bind_textdomain_codeset' function can be used to specify the
      output character set for message catalogs for domain DOMAINNAME.
      The CODESET argument must be a valid codeset name which can be used
-     for the ‘iconv_open’ function, or a null pointer.
+     for the `iconv_open' function, or a null pointer.
 
      If the CODESET parameter is the null pointer,
-     ‘bind_textdomain_codeset’ returns the currently selected codeset
-     for the domain with the name DOMAINNAME.  It returns ‘NULL’ if no
+     `bind_textdomain_codeset' returns the currently selected codeset
+     for the domain with the name DOMAINNAME.  It returns `NULL' if no
      codeset has yet been selected.
 
-     The ‘bind_textdomain_codeset’ function can be used several times.
-     If used multiple times with the same DOMAINNAME argument, the later
-     call overrides the settings made by the earlier one.
+     The `bind_textdomain_codeset' function can be used several times.
+     If used multiple times with the same DOMAINNAME argument, the
+     later call overrides the settings made by the earlier one.
 
-     The ‘bind_textdomain_codeset’ function returns a pointer to a
+     The `bind_textdomain_codeset' function returns a pointer to a
      string containing the name of the selected codeset.  The string is
      allocated internally in the function and must not be changed by the
      user.  If the system went out of core during the execution of
-     ‘bind_textdomain_codeset’, the return value is ‘NULL’ and the
+     `bind_textdomain_codeset', the return value is `NULL' and the
      global variable ERRNO is set accordingly.
 
 
@@ -7804,7 +7774,7 @@
 11.2.5 Using contexts for solving ambiguities
 ---------------------------------------------
 
-   One place where the ‘gettext’ functions, if used normally, have big
+   One place where the `gettext' functions, if used normally, have big
 problems is within programs with graphical user interfaces (GUIs).  The
 problem is that many of the strings which have to be translated are very
 short.  They have to appear in pull-down menus which restricts the
@@ -7814,22 +7784,22 @@
 especially true for the one-word strings which are frequently used in
 GUI programs.
 
-   As a consequence many people say that the ‘gettext’ approach is wrong
-and instead ‘catgets’ should be used which indeed does not have this
-problem.  But there is a very simple and powerful method to handle this
-kind of problems with the ‘gettext’ functions.
+   As a consequence many people say that the `gettext' approach is
+wrong and instead `catgets' should be used which indeed does not have
+this problem.  But there is a very simple and powerful method to handle
+this kind of problems with the `gettext' functions.
 
    Contexts can be added to strings to be translated.  A context
-dependent translation lookup is when a translation for a given string is
-searched, that is limited to a given context.  The translation for the
-same string in a different context can be different.  The different
+dependent translation lookup is when a translation for a given string
+is searched, that is limited to a given context.  The translation for
+the same string in a different context can be different.  The different
 translations of the same string in different contexts can be stored in
-the in the same MO file, and can be edited by the translator in the same
-PO file.
+the in the same MO file, and can be edited by the translator in the
+same PO file.
 
-   The ‘gettext.h’ include file contains the lookup macros for strings
+   The `gettext.h' include file contains the lookup macros for strings
 with contexts.  They are implemented as thin macros and inline functions
-over the functions from ‘<libintl.h>’.
+over the functions from `<libintl.h>'.
 
      const char *pgettext (const char *msgctxt, const char *msgid);
 
@@ -7839,19 +7809,19 @@
 
    The MSGCTXT string is visible in the PO file to the translator.  You
 should try to make it somehow canonical and never changing.  Because
-every time you change an MSGCTXT, the translator will have to review the
-translation of MSGID.
+every time you change an MSGCTXT, the translator will have to review
+the translation of MSGID.
 
-   Finding a canonical MSGCTXT string that doesn’t change over time can
-be hard.  But you shouldn’t use the file name or class name containing
-the ‘pgettext’ call – because it is a common development task to rename
-a file or a class, and it shouldn’t cause translator work.  Also you
-shouldn’t use a comment in the form of a complete English sentence as
-MSGCTXT – because orthography or grammar changes are often applied to
-such sentences, and again, it shouldn’t force the translator to do a
+   Finding a canonical MSGCTXT string that doesn't change over time can
+be hard.  But you shouldn't use the file name or class name containing
+the `pgettext' call - because it is a common development task to rename
+a file or a class, and it shouldn't cause translator work.  Also you
+shouldn't use a comment in the form of a complete English sentence as
+MSGCTXT - because orthography or grammar changes are often applied to
+such sentences, and again, it shouldn't force the translator to do a
 review.
 
-   The ‘p’ in ‘pgettext’ stands for “particular”: ‘pgettext’ fetches a
+   The `p' in `pgettext' stands for "particular": `pgettext' fetches a
 particular translation of the MSGID.
 
      const char *dpgettext (const char *domain_name,
@@ -7860,10 +7830,10 @@
                              const char *msgctxt, const char *msgid,
                              int category);
 
-   These are generalizations of ‘pgettext’.  They behave similarly to
-‘dgettext’ and ‘dcgettext’, respectively.  The DOMAIN_NAME argument
+   These are generalizations of `pgettext'.  They behave similarly to
+`dgettext' and `dcgettext', respectively.  The DOMAIN_NAME argument
 defines the translation domain.  The CATEGORY argument allows to use
-another locale category than ‘LC_MESSAGES’.
+another locale category than `LC_MESSAGES'.
 
    As as example consider the following fictional situation.  A GUI
 program has a menu bar with the following entries:
@@ -7876,14 +7846,14 @@
      +----------+ | Connect  |
                   +----------+
 
-   To have the strings ‘File’, ‘Printer’, ‘Open’, ‘New’, ‘Select’, and
-‘Connect’ translated there has to be at some point in the code a call to
-a function of the ‘gettext’ family.  But in two places the string passed
-into the function would be ‘Open’.  The translations might not be the
-same and therefore we are in the dilemma described above.
+   To have the strings `File', `Printer', `Open', `New', `Select', and
+`Connect' translated there has to be at some point in the code a call
+to a function of the `gettext' family.  But in two places the string
+passed into the function would be `Open'.  The translations might not
+be the same and therefore we are in the dilemma described above.
 
-   What distinguishes the two places is the menu path from the menu root
-to the particular menu entries:
+   What distinguishes the two places is the menu path from the menu
+root to the particular menu entries:
 
      Menu|File
      Menu|Printer
@@ -7904,7 +7874,7 @@
      pgettext ("Menu|Printer|", "Open")
      pgettext ("Menu|Printer|", "Connect")
 
-   Whether or not to use the ‘|’ character at the end of the context is
+   Whether or not to use the `|' character at the end of the context is
 a matter of style.
 
    For more complex cases, where the MSGCTXT or MSGID are not string
@@ -7919,7 +7889,7 @@
 
    Here MSGCTXT and MSGID can be arbitrary string-valued expressions.
 These macros are more general.  But in the case that both argument
-expressions are string literals, the macros without the ‘_expr’ suffix
+expressions are string literals, the macros without the `_expr' suffix
 are more efficient.
 
 
@@ -7928,8 +7898,8 @@
 11.2.6 Additional functions for plural forms
 --------------------------------------------
 
-   The functions of the ‘gettext’ family described so far (and all the
-‘catgets’ functions as well) have one problem in the real world which
+   The functions of the `gettext' family described so far (and all the
+`catgets' functions as well) have one problem in the real world which
 have been neglected completely in all existing approaches.  What is
 meant here is the handling of plural forms.
 
@@ -7941,7 +7911,7 @@
 
 After the first complaints from people internationalizing the code
 people either completely avoided formulations like this or used strings
-like ‘"file(s)"’.  Both look unnatural and should be avoided.  First
+like `"file(s)"'.  Both look unnatural and should be avoided.  First
 tries to solve the problem correctly looked like this:
 
         if (n == 1)
@@ -7950,11 +7920,11 @@
           printf ("%d files deleted", n);
 
    But this does not solve the problem.  It helps languages where the
-plural form of a noun is not simply constructed by adding an ‘s’ but
+plural form of a noun is not simply constructed by adding an `s' but
 that is all.  Once again people fell into the trap of believing the
 rules their language is using are universal.  But the handling of plural
 forms differs widely between the language families.  For example, Rafal
-Maszkowski ‘<rzm@mat.uni.torun.pl>’ reports:
+Maszkowski `<rzm@mat.uni.torun.pl>' reports:
 
      In Polish we use e.g. plik (file) this way:
           1 plik
@@ -7962,19 +7932,19 @@
           5-21 pliko'w
           22-24 pliki
           25-31 pliko'w
-     and so on (o’ means 8859-2 oacute which should be rather okreska,
+     and so on (o' means 8859-2 oacute which should be rather okreska,
      similar to aogonek).
 
    There are two things which can differ between languages (and even
 inside language families);
 
-   • The form how plural forms are built differs.  This is a problem
+   * The form how plural forms are built differs.  This is a problem
      with languages which have many irregularities.  German, for
-     instance, is a drastic case.  Though English and German are part of
-     the same language family (Germanic), the almost regular forming of
-     plural noun forms (appending an ‘s’) is hardly found in German.
+     instance, is a drastic case.  Though English and German are part
+     of the same language family (Germanic), the almost regular forming
+     of plural noun forms (appending an `s') is hardly found in German.
 
-   • The number of plural forms differ.  This is somewhat surprising for
+   * The number of plural forms differ.  This is somewhat surprising for
      those who only have experiences with Romanic and Germanic languages
      since here the number is the same (there are two).
 
@@ -7984,7 +7954,7 @@
    The consequence of this is that application writers should not try to
 solve the problem in their code.  This would be localization since it is
 only usable for certain, hardcoded language environments.  Instead the
-extended ‘gettext’ interface should be used.
+extended `gettext' interface should be used.
 
    These extra functions are taking instead of the one key string two
 strings and a numerical argument.  The idea behind this is that using
@@ -7992,43 +7962,43 @@
 can select using rules specified by the translator the right plural
 form.  The two string arguments then will be used to provide a return
 value in case no message catalog is found (similar to the normal
-‘gettext’ behavior).  In this case the rules for Germanic language is
+`gettext' behavior).  In this case the rules for Germanic language is
 used and it is assumed that the first string argument is the singular
 form, the second the plural form.
 
    This has the consequence that programs without language catalogs can
 display the correct strings only if the program itself is written using
 a Germanic language.  This is a limitation but since the GNU C library
-(as well as the GNU ‘gettext’ package) are written as part of the GNU
+(as well as the GNU `gettext' package) are written as part of the GNU
 package and the coding standards for the GNU project require program
 being written in English, this solution nevertheless fulfills its
 purpose.
 
  -- Function: char * ngettext (const char *MSGID1, const char *MSGID2,
           unsigned long int N)
-     The ‘ngettext’ function is similar to the ‘gettext’ function as it
-     finds the message catalogs in the same way.  But it takes two extra
-     arguments.  The MSGID1 parameter must contain the singular form of
-     the string to be converted.  It is also used as the key for the
-     search in the catalog.  The MSGID2 parameter is the plural form.
-     The parameter N is used to determine the plural form.  If no
-     message catalog is found MSGID1 is returned if ‘n == 1’, otherwise
-     ‘msgid2’.
+     The `ngettext' function is similar to the `gettext' function as it
+     finds the message catalogs in the same way.  But it takes two
+     extra arguments.  The MSGID1 parameter must contain the singular
+     form of the string to be converted.  It is also used as the key
+     for the search in the catalog.  The MSGID2 parameter is the plural
+     form.  The parameter N is used to determine the plural form.  If no
+     message catalog is found MSGID1 is returned if `n == 1', otherwise
+     `msgid2'.
 
      An example for the use of this function is:
 
           printf (ngettext ("%d file removed", "%d files removed", n), n);
 
      Please note that the numeric value N has to be passed to the
-     ‘printf’ function as well.  It is not sufficient to pass it only to
-     ‘ngettext’.
+     `printf' function as well.  It is not sufficient to pass it only to
+     `ngettext'.
 
-     In the English singular case, the number – always 1 – can be
+     In the English singular case, the number - always 1 - can be
      replaced with "one":
 
           printf (ngettext ("One file removed", "%d files removed", n), n);
 
-     This works because the ‘printf’ function discards excess arguments
+     This works because the `printf' function discards excess arguments
      that are not consumed by the format string.
 
      If this function is meant to yield a format string that takes two
@@ -8036,27 +8006,27 @@
 
           printf (ngettext ("%d file removed from directory %s",
                             "%d files removed from directory %s",
-                            n),
-                  n, dir);
+                            n, dir),
+                  n);
 
-     because in many languages the translators want to replace the ‘%d’
-     with an explicit word in the singular case, just like “one” in
+     because in many languages the translators want to replace the `%d'
+     with an explicit word in the singular case, just like "one" in
      English, and C format strings cannot consume the second argument
      but skip the first argument.  Instead, you have to reorder the
-     arguments so that ‘n’ comes last:
+     arguments so that `n' comes last:
 
           printf (ngettext ("%$2d file removed from directory %$1s",
                             "%$2d files removed from directory %$1s",
-                            n),
-                  dir, n);
+                            dir, n),
+                  n);
 
      See *note c-format:: for details about this argument reordering
      syntax.
 
-     When you know that the value of ‘n’ is within a given range, you
-     can specify it as a comment directed to the ‘xgettext’ tool.  This
-     information may help translators to use more adequate translations.
-     Like this:
+     When you know that the value of `n' is within a given range, you
+     can specify it as a comment directed to the `xgettext' tool.  This
+     information may help translators to use more adequate
+     translations.  Like this:
 
           if (days > 7 && days < 14)
             /* xgettext: range: 1..6 */
@@ -8064,7 +8034,7 @@
                               days - 7),
                     days - 7);
 
-     It is also possible to use this function when the strings don’t
+     It is also possible to use this function when the strings don't
      contain a cardinal number:
 
           puts (ngettext ("Delete the selected file?",
@@ -8075,17 +8045,18 @@
 
  -- Function: char * dngettext (const char *DOMAIN, const char *MSGID1,
           const char *MSGID2, unsigned long int N)
-     The ‘dngettext’ is similar to the ‘dgettext’ function in the way
+     The `dngettext' is similar to the `dgettext' function in the way
      the message catalog is selected.  The difference is that it takes
      two extra parameter to provide the correct plural form.  These two
-     parameters are handled in the same way ‘ngettext’ handles them.
+     parameters are handled in the same way `ngettext' handles them.
 
- -- Function: char * dcngettext (const char *DOMAIN, const char *MSGID1,
-          const char *MSGID2, unsigned long int N, int CATEGORY)
-     The ‘dcngettext’ is similar to the ‘dcgettext’ function in the way
+ -- Function: char * dcngettext (const char *DOMAIN, const char
+          *MSGID1, const char *MSGID2, unsigned long int N, int
+          CATEGORY)
+     The `dcngettext' is similar to the `dcgettext' function in the way
      the message catalog is selected.  The difference is that it takes
      two extra parameter to provide the correct plural form.  These two
-     parameters are handled in the same way ‘ngettext’ handles them.
+     parameters are handled in the same way `ngettext' handles them.
 
    Now, how do these functions solve the problem of the plural forms?
 Without the input of linguists (which was not available) it was not
@@ -8100,24 +8071,24 @@
 possibility of extensions to not prevent the use of new languages).
 
    The information about the plural form selection has to be stored in
-the header entry of the PO file (the one with the empty ‘msgid’ string).
+the header entry of the PO file (the one with the empty `msgid' string).
 The plural form information looks like this:
 
      Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;
 
-   The ‘nplurals’ value must be a decimal number which specifies how
+   The `nplurals' value must be a decimal number which specifies how
 many different plural forms exist for this language.  The string
-following ‘plural’ is an expression which is using the C language
+following `plural' is an expression which is using the C language
 syntax.  Exceptions are that no negative numbers are allowed, numbers
-must be decimal, and the only variable allowed is ‘n’.  Spaces are
+must be decimal, and the only variable allowed is `n'.  Spaces are
 allowed in the expression, but backslash-newlines are not; in the
 examples below the backslash-newlines are present for formatting
 purposes only.  This expression will be evaluated whenever one of the
-functions ‘ngettext’, ‘dngettext’, or ‘dcngettext’ is called.  The
+functions `ngettext', `dngettext', or `dcngettext' is called.  The
 numeric value passed to these functions is then substituted for all uses
-of the variable ‘n’ in the expression.  The resulting value then must be
-greater or equal to zero and smaller than the value given as the value
-of ‘nplurals’.
+of the variable `n' in the expression.  The resulting value then must
+be greater or equal to zero and smaller than the value given as the
+value of `nplurals'.
 
 The following rules are known at this point.  The language with families
 are listed.  But this does not necessarily mean the information can be
@@ -8133,7 +8104,7 @@
 
      Languages with this property include:
 
-     Asian family
+    Asian family
           Japanese, Vietnamese, Korean
 
 Two forms, singular used for one only
@@ -8147,38 +8118,44 @@
 
      Languages with this property include:
 
-     Germanic family
+    Germanic family
           English, German, Dutch, Swedish, Danish, Norwegian, Faroese
-     Romanic family
+
+    Romanic family
           Spanish, Portuguese, Italian, Bulgarian
-     Latin/Greek family
+
+    Latin/Greek family
           Greek
-     Finno-Ugric family
+
+    Finno-Ugric family
           Finnish, Estonian
-     Semitic family
+
+    Semitic family
           Hebrew
-     Artificial
+
+    Artificial
           Esperanto
 
      Other languages using the same header entry are:
 
-     Finno-Ugric family
+    Finno-Ugric family
           Hungarian
-     Turkic/Altaic family
+
+    Turkic/Altaic family
           Turkish
 
-     Hungarian does not appear to have a plural if you look at sentences
-     involving cardinal numbers.  For example, “1 apple” is “1 alma”,
-     and “123 apples” is “123 alma”.  But when the number is not
-     explicit, the distinction between singular and plural exists: “the
-     apple” is “az alma”, and “the apples” is “az almák”.  Since
-     ‘ngettext’ has to support both types of sentences, it is classified
-     here, under “two forms”.
-
-     The same holds for Turkish: “1 apple” is “1 elma”, and “123 apples”
-     is “123 elma”.  But when the number is omitted, the distinction
-     between singular and plural exists: “the apple” is “elma”, and “the
-     apples” is “elmalar”.
+     Hungarian does not appear to have a plural if you look at
+     sentences involving cardinal numbers.  For example, "1 apple" is
+     "1 alma", and "123 apples" is "123 alma".  But when the number is
+     not explicit, the distinction between singular and plural exists:
+     "the apple" is "az alma", and "the apples" is "az almák".  Since
+     `ngettext' has to support both types of sentences, it is
+     classified here, under "two forms".
+
+     The same holds for Turkish: "1 apple" is "1 elma", and "123
+     apples" is "123 elma".  But when the number is omitted, the
+     distinction between singular and plural exists: "the apple" is
+     "elma", and "the apples" is "elmalar".
 
 Two forms, singular used for zero and one
      Exceptional case in the language family.  The header entry would
@@ -8188,7 +8165,7 @@
 
      Languages with this property include:
 
-     Romanic family
+    Romanic family
           Brazilian Portuguese, French
 
 Three forms, special case for zero
@@ -8198,7 +8175,7 @@
 
      Languages with this property include:
 
-     Baltic family
+    Baltic family
           Latvian
 
 Three forms, special cases for one and two
@@ -8208,7 +8185,7 @@
 
      Languages with this property include:
 
-     Celtic
+    Celtic
           Gaeilge (Irish)
 
 Three forms, special case for numbers ending in 00 or [2-9][0-9]
@@ -8219,7 +8196,7 @@
 
      Languages with this property include:
 
-     Romanic family
+    Romanic family
           Romanian
 
 Three forms, special case for numbers ending in 1[2-9]
@@ -8231,7 +8208,7 @@
 
      Languages with this property include:
 
-     Baltic family
+    Baltic family
           Lithuanian
 
 Three forms, special cases for numbers ending in 1 and 2, 3, 4, except those ending in 1[1-4]
@@ -8243,8 +8220,8 @@
 
      Languages with this property include:
 
-     Slavic family
-          Russian, Ukrainian, Belarusian, Serbian, Croatian
+    Slavic family
+          Russian, Ukrainian, Serbian, Croatian
 
 Three forms, special cases for 1 and 2, 3, 4
      The header entry would look like this:
@@ -8254,7 +8231,7 @@
 
      Languages with this property include:
 
-     Slavic family
+    Slavic family
           Czech, Slovak
 
 Three forms, special case for one and some numbers ending in 2, 3, or 4
@@ -8266,7 +8243,7 @@
 
      Languages with this property include:
 
-     Slavic family
+    Slavic family
           Polish
 
 Four forms, special case for one and all numbers ending in 02, 03, or 04
@@ -8277,23 +8254,24 @@
 
      Languages with this property include:
 
-     Slavic family
+    Slavic family
           Slovenian
 
-   You might now ask, ‘ngettext’ handles only numbers N of type
-‘unsigned long’.  What about larger integer types?  What about negative
+   You might now ask, `ngettext' handles only numbers N of type
+`unsigned long'.  What about larger integer types?  What about negative
 numbers?  What about floating-point numbers?
 
-   About larger integer types, such as ‘uintmax_t’ or ‘unsigned long
-long’: they can be handled by reducing the value to a range that fits in
-an ‘unsigned long’.  Simply casting the value to ‘unsigned long’ would
-not do the right thing, since it would treat ‘ULONG_MAX + 1’ like zero,
-‘ULONG_MAX + 2’ like singular, and the like.  Here you can exploit the
-fact that all mentioned plural form formulas eventually become periodic,
-with a period that is a divisor of 100 (or 1000 or 1000000).  So, when
-you reduce a large value to another one in the range [1000000, 1999999]
-that ends in the same 6 decimal digits, you can assume that it will lead
-to the same plural form selection.  This code does this:
+   About larger integer types, such as `uintmax_t' or `unsigned long
+long': they can be handled by reducing the value to a range that fits
+in an `unsigned long'.  Simply casting the value to `unsigned long'
+would not do the right thing, since it would treat `ULONG_MAX + 1' like
+zero, `ULONG_MAX + 2' like singular, and the like.  Here you can
+exploit the fact that all mentioned plural form formulas eventually
+become periodic, with a period that is a divisor of 100 (or 1000 or
+1000000).  So, when you reduce a large value to another one in the
+range [1000000, 1999999] that ends in the same 6 decimal digits, you
+can assume that it will lead to the same plural form selection.  This
+code does this:
 
      #include <inttypes.h>
      uintmax_t nbytes = ...;
@@ -8305,8 +8283,8 @@
              nbytes);
 
    Negative and floating-point values usually represent physical
-entities for which singular and plural don’t clearly apply.  In such
-cases, there is no need to use ‘ngettext’; a simple ‘gettext’ call with
+entities for which singular and plural don't clearly apply.  In such
+cases, there is no need to use `ngettext'; a simple `gettext' call with
 a form suitable for all values will do.  For example:
 
      printf (gettext ("Time elapsed: %.3f seconds"),
@@ -8314,9 +8292,9 @@
 
 Even if NUM_MILLISECONDS happens to be a multiple of 1000, the output
      Time elapsed: 1.000 seconds
-is acceptable in English, and similarly for other languages.
+   is acceptable in English, and similarly for other languages.
 
-   The translators’ perspective regarding plural forms is explained in
+   The translators' perspective regarding plural forms is explained in
 *note Translating plural forms::.
 
    ---------- Footnotes ----------
@@ -8331,7 +8309,7 @@
 ---------------------------------------------
 
    At this point of the discussion we should talk about an advantage of
-the GNU ‘gettext’ implementation.  Some readers might have pointed out
+the GNU `gettext' implementation.  Some readers might have pointed out
 that an internationalized program might have a poor performance if some
 string has to be translated in an inner loop.  While this is unavoidable
 when the string varies from one run of the loop to the other it is
@@ -8339,7 +8317,7 @@
 following example:
 
      {
-       while (…)
+       while (...)
          {
            puts (gettext ("Hello world"));
          }
@@ -8350,7 +8328,7 @@
 
      {
        str = gettext ("Hello world");
-       while (…)
+       while (...)
          {
            puts (str);
          }
@@ -8359,9 +8337,9 @@
 But this solution is not usable in all situation (e.g. when the locale
 selection changes) nor does it lead to legible code.
 
-   For this reason, GNU ‘gettext’ caches previous translation results.
+   For this reason, GNU `gettext' caches previous translation results.
 When the same translation is requested twice, with no new message
-catalogs being loaded in between, ‘gettext’ will, the second time, find
+catalogs being loaded in between, `gettext' will, the second time, find
 the result through a single cache lookup.
 
 
@@ -8371,23 +8349,23 @@
 =================================
 
    The following discussion is perhaps a little bit colored.  As said
-above we implemented GNU ‘gettext’ following the Uniforum proposal and
+above we implemented GNU `gettext' following the Uniforum proposal and
 this surely has its reasons.  But it should show how we came to this
 decision.
 
    First we take a look at the developing process.  When we write an
-application using NLS provided by ‘gettext’ we proceed as always.  Only
+application using NLS provided by `gettext' we proceed as always.  Only
 when we come to a string which might be seen by the users and thus has
-to be translated we use ‘gettext("…")’ instead of ‘"…"’.  At the
+to be translated we use `gettext("...")' instead of `"..."'.  At the
 beginning of each source file (or in a central header file) we define
 
      #define gettext(String) (String)
 
    Even this definition can be avoided when the system supports the
-‘gettext’ function in its C library.  When we compile this code the
-result is the same as if no NLS code is used.  When you take a look at
-the GNU ‘gettext’ code you will see that we use ‘_("…")’ instead of
-‘gettext("…")’.  This reduces the number of additional characters per
+`gettext' function in its C library.  When we compile this code the
+result is the same as if no NLS code is used.  When  you take a look at
+the GNU `gettext' code you will see that we use `_("...")' instead of
+`gettext("...")'.  This reduces the number of additional characters per
 translatable string to _3_ (in words: three).
 
    When now a production version of the program is needed we simply
@@ -8400,34 +8378,35 @@
      #include <libintl.h>
      #define _(String) gettext (String)
 
-Additionally we run the program ‘xgettext’ on all source code file which
-contain translatable strings and that’s it: we have a running program
-which does not depend on translations to be available, but which can use
-any that becomes available.
+Additionally we run the program `xgettext' on all source code file
+which contain translatable strings and that's it: we have a running
+program which does not depend on translations to be available, but which
+can use any that becomes available.
 
-   The same procedure can be done for the ‘gettext_noop’ invocations
-(*note Special cases::).  One usually defines ‘gettext_noop’ as a no-op
+   The same procedure can be done for the `gettext_noop' invocations
+(*note Special cases::).  One usually defines `gettext_noop' as a no-op
 macro.  So you should consider the following code for your project:
 
      #define gettext_noop(String) String
      #define N_(String) gettext_noop (String)
 
-   ‘N_’ is a short form similar to ‘_’.  The ‘Makefile’ in the ‘po/’
-directory of GNU ‘gettext’ knows by default both of the mentioned short
+   `N_' is a short form similar to `_'.  The `Makefile' in the `po/'
+directory of GNU `gettext' knows by default both of the mentioned short
 forms so you are invited to follow this proposal for your own ease.
 
-   Now to ‘catgets’.  The main problem is the work for the programmer.
+   Now to `catgets'.  The main problem is the work for the programmer.
 Every time he comes to a translatable string he has to define a number
 (or a symbolic constant) which has also be defined in the message
-catalog file.  He also has to take care for duplicate entries, duplicate
-message IDs etc.  If he wants to have the same quality in the message
-catalog as the GNU ‘gettext’ program provides he also has to put the
-descriptive comments for the strings and the location in all source code
-files in the message catalog.  This is nearly a Mission: Impossible.
+catalog file.  He also has to take care for duplicate entries,
+duplicate message IDs etc.  If he wants to have the same quality in the
+message catalog as the GNU `gettext' program provides he also has to
+put the descriptive comments for the strings and the location in all
+source code files in the message catalog.  This is nearly a Mission:
+Impossible.
 
    But there are also some points people might call advantages speaking
-for ‘catgets’.  If you have a single word in a string and this string is
-used in different contexts it is likely that in one or the other
+for `catgets'.  If you have a single word in a string and this string
+is used in different contexts it is likely that in one or the other
 language the word has different translations.  Example:
 
      printf ("%s: %d", gettext ("number"), number_of_errors)
@@ -8435,11 +8414,11 @@
      printf ("you should see %d %s", number_count,
              number_count == 1 ? gettext ("number") : gettext ("numbers"))
 
-   Here we have to translate two times the string ‘"number"’.  Even if
+   Here we have to translate two times the string `"number"'.  Even if
 you do not speak a language beside English it might be possible to
 recognize that the two words have a different meaning.  In German the
-first appearance has to be translated to ‘"Anzahl"’ and the second to
-‘"Zahl"’.
+first appearance has to be translated to `"Anzahl"' and the second to
+`"Zahl"'.
 
    Now you can say that this example is really esoteric.  And you are
 right!  This is exactly how we felt about this problem and decide that
@@ -8456,8 +8435,8 @@
 is difficult one can also consider changing one of the conflicting
 string a little bit.  But it is not impossible to overcome.
 
-   ‘catgets’ allows same original entry to have different translations,
-but ‘gettext’ has another, scalable approach for solving ambiguities of
+   `catgets' allows same original entry to have different translations,
+but `gettext' has another, scalable approach for solving ambiguities of
 this kind: *Note Ambiguities::.
 
 
@@ -8466,58 +8445,61 @@
 11.4 Using libintl.a in own programs
 ====================================
 
-   Starting with version 0.9.4 the library ‘libintl.h’ should be
+   Starting with version 0.9.4 the library `libintl.h' should be
 self-contained.  I.e., you can use it in your own programs without
-providing additional functions.  The ‘Makefile’ will put the header and
-the library in directories selected using the ‘$(prefix)’.
+providing additional functions.  The `Makefile' will put the header and
+the library in directories selected using the `$(prefix)'.
 
 
 File: gettext.info,  Node: gettext grok,  Next: Temp Programmers,  Prev: Using libintl.a,  Up: Programmers
 
-11.5 Being a ‘gettext’ grok
+11.5 Being a `gettext' grok
 ===========================
 
    * NOTE: * This documentation section is outdated and needs to be
 revised.
 
-   To fully exploit the functionality of the GNU ‘gettext’ library it is
-surely helpful to read the source code.  But for those who don’t want to
-spend that much time in reading the (sometimes complicated) code here is
-a list comments:
+   To fully exploit the functionality of the GNU `gettext' library it
+is surely helpful to read the source code.  But for those who don't want
+to spend that much time in reading the (sometimes complicated) code here
+is a list comments:
 
-   • Changing the language at runtime
+   * Changing the language at runtime 
 
-     For interactive programs it might be useful to offer a selection of
-     the used language at runtime.  To understand how to do this one
+     For interactive programs it might be useful to offer a selection
+     of the used language at runtime.  To understand how to do this one
      need to know how the used language is determined while executing
-     the ‘gettext’ function.  The method which is presented here only
-     works correctly with the GNU implementation of the ‘gettext’
+     the `gettext' function.  The method which is presented here only
+     works correctly with the GNU implementation of the `gettext'
      functions.
 
-     In the function ‘dcgettext’ at every call the current setting of
+     In the function `dcgettext' at every call the current setting of
      the highest priority environment variable is determined and used.
      Highest priority means here the following list with decreasing
      priority:
 
-       1. ‘LANGUAGE’
-       2. ‘LC_ALL’
-       3. ‘LC_xxx’, according to selected locale category
-       4. ‘LANG’
+       1. `LANGUAGE' 
+
+       2. `LC_ALL' 
+
+       3. `LC_xxx', according to selected locale category 
+
+       4. `LANG'
 
      Afterwards the path is constructed using the found value and the
      translation file is loaded if available.
 
-     What happens now when the value for, say, ‘LANGUAGE’ changes?
+     What happens now when the value for, say, `LANGUAGE' changes?
      According to the process explained above the new value of this
-     variable is found as soon as the ‘dcgettext’ function is called.
-     But this also means the (perhaps) different message catalog file is
-     loaded.  In other words: the used language is changed.
+     variable is found as soon as the `dcgettext' function is called.
+     But this also means the (perhaps) different message catalog file
+     is loaded.  In other words: the used language is changed.
 
      But there is one little hook.  The code for gcc-2.7.0 and up
      provides some optimization.  This optimization normally prevents
-     the calling of the ‘dcgettext’ function as long as no new catalog
-     is loaded.  But if ‘dcgettext’ is not called the program also
-     cannot find the ‘LANGUAGE’ variable be changed (*note Optimized
+     the calling of the `dcgettext' function as long as no new catalog
+     is loaded.  But if `dcgettext' is not called the program also
+     cannot find the `LANGUAGE' variable be changed (*note Optimized
      gettext::).  A solution for this is very easy.  Include the
      following code in the language switching function.
 
@@ -8530,10 +8512,11 @@
               ++_nl_msg_cat_cntr;
             }
 
-     The variable ‘_nl_msg_cat_cntr’ is defined in ‘loadmsgcat.c’.  You
-     don’t need to know what this is for.  But it can be used to detect
-     whether a ‘gettext’ implementation is GNU gettext and not non-GNU
-     system’s native gettext implementation.
+     The variable `_nl_msg_cat_cntr' is defined in `loadmsgcat.c'.  You
+     don't need to know what this is for.  But it can be used to detect
+     whether a `gettext' implementation is GNU gettext and not non-GNU
+     system's native gettext implementation.
+
 
 
 File: gettext.info,  Node: Temp Programmers,  Prev: gettext grok,  Up: Programmers
@@ -8547,7 +8530,7 @@
 * Menu:
 
 * Temp Implementations::        Temporary - Two Possible Implementations
-* Temp catgets::                Temporary - About ‘catgets’
+* Temp catgets::                Temporary - About `catgets'
 * Temp WSI::                    Temporary - Why a single implementation
 * Temp Notes::                  Temporary - Notes
 
@@ -8558,37 +8541,37 @@
 -----------------------------------------------
 
    There are two competing methods for language independent messages:
-the X/Open ‘catgets’ method, and the Uniforum ‘gettext’ method.  The
-‘catgets’ method indexes messages by integers; the ‘gettext’ method
-indexes them by their English translations.  The ‘catgets’ method has
-been around longer and is supported by more vendors.  The ‘gettext’
+the X/Open `catgets' method, and the Uniforum `gettext' method.  The
+`catgets' method indexes messages by integers; the `gettext' method
+indexes them by their English translations.  The `catgets' method has
+been around longer and is supported by more vendors.  The `gettext'
 method is supported by Sun, and it has been heard that the COSE
 multi-vendor initiative is supporting it.  Neither method is a POSIX
 standard; the POSIX.1 committee had a lot of disagreement in this area.
 
-   Neither one is in the POSIX standard.  There was much disagreement in
-the POSIX.1 committee about using the ‘gettext’ routines vs.  ‘catgets’
-(XPG). In the end the committee couldn’t agree on anything, so no
-messaging system was included as part of the standard.  I believe the
-informative annex of the standard includes the XPG3 messaging
-interfaces, “…as an example of a messaging system that has been
-implemented…”
+   Neither one is in the POSIX standard.  There was much disagreement
+in the POSIX.1 committee about using the `gettext' routines vs.
+`catgets' (XPG).  In the end the committee couldn't agree on anything,
+so no messaging system was included as part of the standard.  I believe
+the informative annex of the standard includes the XPG3 messaging
+interfaces, "...as an example of a messaging system that has been
+implemented..."
 
    They were very careful not to say anywhere that you should use one
-set of interfaces over the other.  For more on this topic please see the
-Programming for Internationalization FAQ.
+set of interfaces over the other.  For more on this topic please see
+the Programming for Internationalization FAQ.
 
 
 File: gettext.info,  Node: Temp catgets,  Next: Temp WSI,  Prev: Temp Implementations,  Up: Temp Programmers
 
-11.6.2 Temporary - About ‘catgets’
+11.6.2 Temporary - About `catgets'
 ----------------------------------
 
-   There have been a few discussions of late on the use of ‘catgets’ as
+   There have been a few discussions of late on the use of `catgets' as
 a base.  I think it important to present both sides of the argument and
-hence am opting to play devil’s advocate for a little bit.
+hence am opting to play devil's advocate for a little bit.
 
-   I’ll not deny the fact that ‘catgets’ could have been designed a lot
+   I'll not deny the fact that `catgets' could have been designed a lot
 better.  It currently has quite a number of limitations and these have
 already been pointed out.
 
@@ -8597,8 +8580,8 @@
 is the myriad portability problems across Unix platforms.  It seems as
 if every Unix vendor had a look at the operating system and found parts
 they could improve upon.  Undoubtedly, these modifications are probably
-innovative and solve real problems.  However, software developers have a
-hard time keeping up with all these changes across so many platforms.
+innovative and solve real problems.  However, software developers have
+a hard time keeping up with all these changes across so many platforms.
 
    And this has prompted the Unix vendors to begin to standardize their
 systems.  Hence the impetus for Spec1170.  Every major Unix vendor has
@@ -8608,9 +8591,10 @@
 platforms.
 
    As I understand it, Spec1170 is roughly based upon version 4 of the
-X/Open Portability Guidelines (XPG4).  Because ‘catgets’ and friends are
-defined in XPG4, I’m led to believe that ‘catgets’ is a part of Spec1170
-and hence will become a standardized component of all Unix systems.
+X/Open Portability Guidelines (XPG4).  Because `catgets' and friends
+are defined in XPG4, I'm led to believe that `catgets' is a part of
+Spec1170 and hence will become a standardized component of all Unix
+systems.
 
 
 File: gettext.info,  Node: Temp WSI,  Next: Temp Notes,  Prev: Temp catgets,  Up: Temp Programmers
@@ -8620,33 +8604,33 @@
 
    Now it seems kind of wasteful to me to have two different systems
 installed for accessing message catalogs.  If we do want to remedy
-‘catgets’ deficiencies why don’t we try to expand ‘catgets’ (in a
+`catgets' deficiencies why don't we try to expand `catgets' (in a
 compatible manner) rather than implement an entirely new system.
-Otherwise, we’ll end up with two message catalog access systems
+Otherwise, we'll end up with two message catalog access systems
 installed with an operating system - one set of routines for packages
-using GNU ‘gettext’ for their internationalization, and another set of
+using GNU `gettext' for their internationalization, and another set of
 routines (catgets) for all other software.  Bloated?
 
    Supposing another catalog access system is implemented.  Which do we
 recommend?  At least for Linux, we need to attract as many software
 developers as possible.  Hence we need to make it as easy for them to
-port their software as possible.  Which means supporting ‘catgets’.  We
-will be implementing the ‘libintl’ code within our ‘libc’, but does this
-mean we also have to incorporate another message catalog access scheme
-within our ‘libc’ as well?  And what about people who are going to be
-using the ‘libintl’ + non-‘catgets’ routines.  When they port their
-software to other platforms, they’re now going to have to include the
-front-end (‘libintl’) code plus the back-end code (the non-‘catgets’
+port their software as possible.  Which means supporting `catgets'.  We
+will be implementing the `libintl' code within our `libc', but does
+this mean we also have to incorporate another message catalog access
+scheme within our `libc' as well?  And what about people who are going
+to be using the `libintl' + non-`catgets' routines.  When they port
+their software to other platforms, they're now going to have to include
+the front-end (`libintl') code plus the back-end code (the non-`catgets'
 access routines) with their software instead of just including the
-‘libintl’ code with their software.
+`libintl' code with their software.
 
-   Message catalog support is however only the tip of the iceberg.  What
-about the data for the other locale categories?  They also have a number
-of deficiencies.  Are we going to abandon them as well and develop
-another duplicate set of routines (should ‘libintl’ expand beyond
-message catalog support)?
+   Message catalog support is however only the tip of the iceberg.
+What about the data for the other locale categories?  They also have a
+number of deficiencies.  Are we going to abandon them as well and
+develop another duplicate set of routines (should `libintl' expand
+beyond message catalog support)?
 
-   Like many parts of Unix that can be improved upon, we’re stuck with
+   Like many parts of Unix that can be improved upon, we're stuck with
 balancing compatibility with the past with useful improvements and
 innovations for the future.
 
@@ -8660,14 +8644,14 @@
 implementations differ from the final form.  Both of my system (old
 Linux catgets and Ultrix-4) have a strange variation.
 
-   OK. After incorporating the last changes I have to spend some time on
-making the GNU/Linux ‘libc’ ‘gettext’ functions.  So in future Solaris
-is not the only system having ‘gettext’.
+   OK.  After incorporating the last changes I have to spend some time
+on making the GNU/Linux `libc' `gettext' functions.  So in future
+Solaris is not the only system having `gettext'.
 
 
 File: gettext.info,  Node: Translators,  Next: Maintainers,  Prev: Programmers,  Up: Top
 
-12 The Translator’s View
+12 The Translator's View
 ************************
 
 * Menu:
@@ -8677,7 +8661,7 @@
 * Discussions::                 Discussions
 * Organization::                Organization
 * Information Flow::            Information Flow
-* Translating plural forms::    How to fill in ‘msgstr[0]’, ‘msgstr[1]’
+* Translating plural forms::    How to fill in `msgstr[0]', `msgstr[1]'
 * Prioritizing messages::       How to find which messages to translate first
 
 
@@ -8693,33 +8677,34 @@
 way to get maintainers, translators and users all together, so free
 software will gradually become able to speak many native languages.
 
-   The GNU ‘gettext’ tool set contains _everything_ maintainers need for
-internationalizing their packages for messages.  It also contains quite
-useful tools for helping translators at localizing messages to their
-native language, once a package has already been internationalized.
+   The GNU `gettext' tool set contains _everything_ maintainers need
+for internationalizing their packages for messages.  It also contains
+quite useful tools for helping translators at localizing messages to
+their native language, once a package has already been
+internationalized.
 
    To achieve the Translation Project, we need many interested people
 who like their own language and write it well, and who are also able to
-synergize with other translators speaking the same language.  If you’d
-like to volunteer to _work_ at translating messages, please send mail to
-your translating team.
+synergize with other translators speaking the same language.  If you'd
+like to volunteer to _work_ at translating messages, please send mail
+to your translating team.
 
    Each team has its own mailing list, courtesy of Linux International.
-You may reach your translating team at the address ‘LL@li.org’,
-replacing LL by the two-letter ISO 639 code for your language.  Language
-codes are _not_ the same as country codes given in ISO 3166.  The
-following translating teams exist:
-
-     Chinese ‘zh’, Czech ‘cs’, Danish ‘da’, Dutch ‘nl’, Esperanto ‘eo’,
-     Finnish ‘fi’, French ‘fr’, Irish ‘ga’, German ‘de’, Greek ‘el’,
-     Italian ‘it’, Japanese ‘ja’, Indonesian ‘in’, Norwegian ‘no’,
-     Polish ‘pl’, Portuguese ‘pt’, Russian ‘ru’, Spanish ‘es’, Swedish
-     ‘sv’ and Turkish ‘tr’.
+You may reach your translating team at the address `LL@li.org',
+replacing LL by the two-letter ISO 639 code for your language.
+Language codes are _not_ the same as country codes given in ISO 3166.
+The following translating teams exist:
+
+     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', Esperanto `eo',
+     Finnish `fi', French `fr', Irish `ga', German `de', Greek `el',
+     Italian `it', Japanese `ja', Indonesian `in', Norwegian `no',
+     Polish `pl', Portuguese `pt', Russian `ru', Spanish `es', Swedish
+     `sv' and Turkish `tr'.
 
 For example, you may reach the Chinese translating team by writing to
-‘zh@li.org’.  When you become a member of the translating team for your
+`zh@li.org'.  When you become a member of the translating team for your
 own language, you may subscribe to its list.  For example, Swedish
-people can send a message to ‘sv-request@li.org’, having this message
+people can send a message to `sv-request@li.org', having this message
 body:
 
      subscribe
@@ -8727,16 +8712,17 @@
    Keep in mind that team members should be interested in _working_ at
 translations, or at solving translational difficulties, rather than
 merely lurking around.  If your team does not exist yet and you want to
-start one, please write to ‘coordinator@translationproject.org’; you
+start one, please write to `coordinator@translationproject.org'; you
 will then reach the coordinator for all translator teams.
 
-   A handful of GNU packages have already been adapted and provided with
-message translations for several languages.  Translation teams have
-begun to organize, using these packages as a starting point.  But there
-are many more packages and many languages for which we have no volunteer
-translators.  If you would like to volunteer to work at translating
-messages, please send mail to ‘coordinator@translationproject.org’
-indicating what language(s) you can work on.
+   A handful of GNU packages have already been adapted and provided
+with message translations for several languages.  Translation teams
+have begun to organize, using these packages as a starting point.  But
+there are many more packages and many languages for which we have no
+volunteer translators.  If you would like to volunteer to work at
+translating messages, please send mail to
+`coordinator@translationproject.org' indicating what language(s) you
+can work on.
 
 
 File: gettext.info,  Node: Trans Intro 1,  Next: Discussions,  Prev: Trans Intro 0,  Up: Translators
@@ -8751,19 +8737,19 @@
 announcement submitted for the January 1995 GNU Bulletin:
 
      A handful of GNU packages have already been adapted and provided
-     with message translations for several languages.  Translation teams
-     have begun to organize, using these packages as a starting point.
-     But there are many more packages and many languages for which we
-     have no volunteer translators.  If you’d like to volunteer to work
-     at translating messages, please send mail to
-     ‘coordinator@translationproject.org’ indicating what language(s)
+     with message translations for several languages.  Translation
+     teams have begun to organize, using these packages as a starting
+     point.  But there are many more packages and many languages for
+     which we have no volunteer translators.  If you'd like to
+     volunteer to work at translating messages, please send mail to
+     `coordinator@translationproject.org' indicating what language(s)
      you can work on.
 
    This document should answer many questions for those who are curious
 about the process or would like to contribute.  Please at least skim
 over it, hoping to cut down a little of the high volume of e-mail
-generated by this collective effort towards internationalization of free
-software.
+generated by this collective effort towards internationalization of
+free software.
 
    Most free programming which is widely shared is done in English, and
 currently, English is used as the main communicating language between
@@ -8778,7 +8764,7 @@
 internationalization of free software is dedicated to succeed.
 
    For suggestion clarifications, additions or corrections to this
-document, please e-mail to ‘coordinator@translationproject.org’.
+document, please e-mail to `coordinator@translationproject.org'.
 
 
 File: gettext.info,  Node: Discussions,  Next: Organization,  Prev: Trans Intro 1,  Up: Translators
@@ -8792,7 +8778,7 @@
    Facing this internationalization effort, a few users expressed their
 concerns.  Some of these doubts are presented and discussed, here.
 
-   • Smaller groups
+   * Smaller groups
 
      Some languages are not spoken by a very large number of people, so
      people speaking them sometimes consider that there may not be all
@@ -8801,31 +8787,31 @@
      generally seem to prefer English versions of their software.
 
      On the other end, people might enjoy their own language a lot, and
-     be very motivated at providing to themselves the pleasure of having
-     their beloved free software speaking their mother tongue.  They do
-     themselves a personal favor, and do not pay that much attention to
-     the number of people benefiting of their work.
+     be very motivated at providing to themselves the pleasure of
+     having their beloved free software speaking their mother tongue.
+     They do themselves a personal favor, and do not pay that much
+     attention to the number of people benefiting of their work.
 
-   • Misinterpretation
+   * Misinterpretation
 
      Other users are shy to push forward their own language, seeing in
-     this some kind of misplaced propaganda.  Someone thought there must
-     be some users of the language over the networks pestering other
-     people with it.
+     this some kind of misplaced propaganda.  Someone thought there
+     must be some users of the language over the networks pestering
+     other people with it.
 
      But any spoken language is worth localization, because there are
      people behind the language for whom the language is important and
      dear to their hearts.
 
-   • Odd translations
+   * Odd translations
 
      The biggest problem is to find the right translations so that
      everybody can understand the messages.  Translations are usually a
      little odd.  Some people get used to English, to the extent they
-     may find translations into their own language “rather pushy,
-     obnoxious and sometimes even hilarious.” As a French speaking man,
-     I have the experience of those instruction manuals for goods, so
-     poorly translated in French in Korea or Taiwan…
+     may find translations into their own language "rather pushy,
+     obnoxious and sometimes even hilarious."  As a French speaking
+     man, I have the experience of those instruction manuals for goods,
+     so poorly translated in French in Korea or Taiwan...
 
      The fact is that we sometimes have to create a kind of national
      computer culture, and this is not easy without the collaboration of
@@ -8834,30 +8820,32 @@
      language, and ready to work together at improving the results they
      obtain.
 
-   • Dependencies over the GPL or LGPL
+   * Dependencies over the GPL or LGPL
 
-     Some people wonder if using GNU ‘gettext’ necessarily brings their
-     package under the protective wing of the GNU General Public License
-     or the GNU Lesser General Public License, when they do not want to
-     make their program free, or want other kinds of freedom.  The
-     simplest answer is “normally not”.
-
-     The ‘gettext-runtime’ part of GNU ‘gettext’, i.e. the contents of
-     ‘libintl’, is covered by the GNU Lesser General Public License.
-     The ‘gettext-tools’ part of GNU ‘gettext’, i.e. the rest of the GNU
-     ‘gettext’ package, is covered by the GNU General Public License.
+     Some people wonder if using GNU `gettext' necessarily brings their
+     package under the protective wing of the GNU General Public
+     License or the GNU Library General Public License, when they do
+     not want to make their program free, or want other kinds of
+     freedom.  The simplest answer is "normally not".
+
+     The `gettext-runtime' part of GNU `gettext', i.e. the contents of
+     `libintl', is covered by the GNU Library General Public License.
+     The `gettext-tools' part of GNU `gettext', i.e. the rest of the
+     GNU `gettext' package, is covered by the GNU General Public
+     License.
 
      The mere marking of localizable strings in a package, or
      conditional inclusion of a few lines for initialization, is not
-     really including GPL’ed or LGPL’ed code.  However, since the
-     localization routines in ‘libintl’ are under the LGPL, the LGPL
+     really including GPL'ed or LGPL'ed code.  However, since the
+     localization routines in `libintl' are under the LGPL, the LGPL
      needs to be considered.  It gives the right to distribute the
-     complete unmodified source of ‘libintl’ even with non-free
-     programs.  It also gives the right to use ‘libintl’ as a shared
-     library, even for non-free programs.  But it gives the right to use
-     ‘libintl’ as a static library or to incorporate ‘libintl’ into
+     complete unmodified source of `libintl' even with non-free
+     programs.  It also gives the right to use `libintl' as a shared
+     library, even for non-free programs.  But it gives the right to
+     use `libintl' as a static library or to incorporate `libintl' into
      another library only to free software.
 
+
 
 File: gettext.info,  Node: Organization,  Next: Information Flow,  Prev: Discussions,  Up: Translators
 
@@ -8881,7 +8869,7 @@
 work duplication, and further be put in contact for solving together
 problems particular to their tongue (in most languages, there are many
 difficulties peculiar to translating technical English).  My Swedish
-contributor acknowledged these difficulties, and I’m well aware of them
+contributor acknowledged these difficulties, and I'm well aware of them
 for French.
 
    This is surely not a technical issue, but we should manage so the
@@ -8891,9 +8879,9 @@
    The Translation Project needs some setup for coordinating language
 coordinators.  Localizing evolving programs will surely become a
 permanent and continuous activity in the free software community, once
-well started.  The setup should be minimally completed and tested before
-GNU ‘gettext’ becomes an official reality.  The e-mail address
-‘coordinator@translationproject.org’ has been set up for receiving
+well started.  The setup should be minimally completed and tested
+before GNU `gettext' becomes an official reality.  The e-mail address
+`coordinator@translationproject.org' has been set up for receiving
 offers from volunteers and general e-mail on these topics.  This address
 reaches the Translation Project coordinator.
 
@@ -8913,17 +8901,18 @@
 a way to organize and coordinate these groups.  Some kind of group of
 groups.  My opinion is that it would be good that GNU delegates this
 task to a small group of collaborating volunteers, shortly.  Perhaps in
-‘gnu.announce’ a list of this national committee’s can be published.
+`gnu.announce' a list of this national committee's can be published.
 
    My role as coordinator would simply be to refer to Ulrich any German
-speaking volunteer interested to localization of free software packages,
-and maybe helping national groups to initially organize, while
-maintaining national registries for until national groups are ready to
-take over.  In fact, the coordinator should ease volunteers to get in
-contact with one another for creating national teams, which should then
-select one coordinator per language, or country (regionalized language).
-If well done, the coordination should be useful without being an
-overwhelming task, the time to put delegations in place.
+speaking volunteer interested to localization of free software
+packages, and maybe helping national groups to initially organize,
+while maintaining national registries for until national groups are
+ready to take over.  In fact, the coordinator should ease volunteers to
+get in contact with one another for creating national teams, which
+should then select one coordinator per language, or country
+(regionalized language).  If well done, the coordination should be
+useful without being an overwhelming task, the time to put delegations
+in place.
 
 
 File: gettext.info,  Node: National Teams,  Next: Mailing Lists,  Prev: Central Coordination,  Up: Organization
@@ -8944,18 +8933,18 @@
 idea.
 
    We need to choose someone who is good at writing clear and concise
-prose in the language in question.  That is hard—we can’t check it
-ourselves.  So we need to ask a few people to judge each others’ writing
-and select the one who is best.
+prose in the language in question.  That is hard--we can't check it
+ourselves.  So we need to ask a few people to judge each others'
+writing and select the one who is best.
 
    I announce my prerelease to a few dozen people, and you would not
 believe all the discussions it generated already.  I shudder to think
-what will happen when this will be launched, for true, officially, world
-wide.  Who am I to arbitrate between two Czekolsovak users contradicting
-each other, for example?
+what will happen when this will be launched, for true, officially,
+world wide.  Who am I to arbitrate between two Czekolsovak users
+contradicting each other, for example?
 
-   I assume that your German is not much better than my French so that I
-would not be able to judge about these formulations.  What I would
+   I assume that your German is not much better than my French so that
+I would not be able to judge about these formulations.  What I would
 suggest is that for each language there is a group for people who
 maintain the PO files and judge about changes.  I suspect there will be
 cultural differences between how such groups of people will behave.
@@ -8971,7 +8960,7 @@
 subscribed to all my pretest lists, so I do not even have to warn him
 specifically of incoming releases.
 
-   I’m sure, that is a good idea to get teams for each language working
+   I'm sure, that is a good idea to get teams for each language working
 on translations.  That will make the translations better and more
 consistent.
 
@@ -8988,17 +8977,17 @@
 
    Taking French for example, there are a few sub-cultures around
 computers which developed diverging vocabularies.  Picking volunteers
-here and there without addressing this problem in an organized way, soon
-in the project, might produce a distasteful mix of internationalized
-programs, and possibly trigger endless quarrels among those who really
-care.
+here and there without addressing this problem in an organized way,
+soon in the project, might produce a distasteful mix of
+internationalized programs, and possibly trigger endless quarrels among
+those who really care.
 
    Keeping some kind of unity in the way French localization of
 internationalized programs is achieved is a difficult (and delicate)
 job.  Knowing the latin character of French people (:-), if we take this
 the wrong way, we could end up nowhere, or spoil a lot of energies.
 Maybe we should begin to address this problem seriously _before_ GNU
-‘gettext’ become officially published.  And I suspect that this means
+`gettext' become officially published.  And I suspect that this means
 soon!
 
 
@@ -9012,51 +9001,52 @@
 need to set a few good examples before the localization goes out for
 true in the free software community.  Here are a few points to discuss:
 
-   • Each group should have one FTP server (at least one master).
+   * Each group should have one FTP server (at least one master).
 
-   • The files on the server should reflect the latest version (of
-     course!)  and it should also contain a RCS directory with the
-     corresponding archives (I don’t have this now).
+   * The files on the server should reflect the latest version (of
+     course!) and it should also contain a RCS directory with the
+     corresponding archives (I don't have this now).
 
-   • There should also be a ChangeLog file (this is more useful than the
+   * There should also be a ChangeLog file (this is more useful than the
      RCS archive but can be generated automatically from the later by
      Emacs).
 
-   • A "core group" should judge about questionable changes (for now
+   * A "core group" should judge about questionable changes (for now
      this group consists solely by me but I ask some others
      occasionally; this also seems to work).
 
+
 
 File: gettext.info,  Node: Mailing Lists,  Prev: National Teams,  Up: Organization
 
 12.4.3 Mailing Lists
 --------------------
 
-   If we get any inquiries about GNU ‘gettext’, send them on to:
+   If we get any inquiries about GNU `gettext', send them on to:
 
-     coordinator@translationproject.org
+     `coordinator@translationproject.org'
 
-   The ‘*-pretest’ lists are quite useful to me, maybe the idea could be
-generalized to many GNU, and non-GNU packages.  But each maintainer
+   The `*-pretest' lists are quite useful to me, maybe the idea could
+be generalized to many GNU, and non-GNU packages.  But each maintainer
 his/her way!
 
-   François, we have a mechanism in place here at ‘gnu.ai.mit.edu’ to
+   François, we have a mechanism in place here at `gnu.ai.mit.edu' to
 track teams, support mailing lists for them and log members.  We have a
 slight preference that you use it.  If this is OK with you, I can get
 you clued in.
 
-   Things are changing!  A few years ago, when Daniel Fekete and I asked
-for a mailing list for GNU localization, nested at the FSF, we were
-politely invited to organize it anywhere else, and so did we.  For
+   Things are changing!  A few years ago, when Daniel Fekete and I
+asked for a mailing list for GNU localization, nested at the FSF, we
+were politely invited to organize it anywhere else, and so did we.  For
 communicating with my pretesters, I later made a handful of mailing
-lists located at iro.umontreal.ca and administrated by ‘majordomo’.
-These lists have been _very_ dependable so far…
+lists located at iro.umontreal.ca and administrated by `majordomo'.
+These lists have been _very_ dependable so far...
 
    I suspect that the German team will organize itself a mailing list
 located in Germany, and so forth for other countries.  But before they
 organize for true, it could surely be useful to offer mailing lists
-located at the FSF to each national team.  So yes, please explain me how
-I should proceed to create and handle them.
+located at the FSF to each national team.  So yes, please explain me
+how I should proceed to create and handle them.
 
    We should create temporary mailing lists, one per country, to help
 people organize.  Temporary, because once regrouped and structured, it
@@ -9084,20 +9074,20 @@
    If I put one of my things to pretest, Ulrich receives the
 announcement and passes it on to the German team, who make last minute
 revisions.  Then he submits the translation files to me _as the
-maintainer_.  For free packages I do not maintain, I would not even hear
-about it.  This scheme could be made to work for the whole Translation
-Project, I think.  For security reasons, maybe Ulrich (national
-coordinators, in fact) should update central registry kept at the
-Translation Project (Jim, me, or Len’s recruits) once in a while.
-
-   In December/January, I was aggressively ready to internationalize all
-of GNU, giving myself the duty of one small GNU package per week or so,
-taking many weeks or months for bigger packages.  But it does not work
-this way.  I first did all the things I’m responsible for.  I’ve nothing
-against some missionary work on other maintainers, but I’m also losing a
-lot of energy over it—same debates over again.
+maintainer_.  For free packages I do not maintain, I would not even
+hear about it.  This scheme could be made to work for the whole
+Translation Project, I think.  For security reasons, maybe Ulrich
+(national coordinators, in fact) should update central registry kept at
+the Translation Project (Jim, me, or Len's recruits) once in a while.
+
+   In December/January, I was aggressively ready to internationalize
+all of GNU, giving myself the duty of one small GNU package per week or
+so, taking many weeks or months for bigger packages.  But it does not
+work this way.  I first did all the things I'm responsible for.  I've
+nothing against some missionary work on other maintainers, but I'm also
+loosing a lot of energy over it--same debates over again.
 
-   And when the first localized packages are released we’ll get a lot of
+   And when the first localized packages are released we'll get a lot of
 responses about ugly translations :-).  Surely, and we need to have
 beforehand a fairly good idea about how to handle the information flow
 between the national teams and the package maintainers.
@@ -9105,10 +9095,10 @@
    Please start saving somewhere a quick history of each PO file.  I
 know for sure that the file format will change, allowing for comments.
 It would be nice that each file has a kind of log, and references for
-those who want to submit comments or gripes, or otherwise contribute.  I
-sent a proposal for a fast and flexible format, but it is not receiving
-acceptance yet by the GNU deciders.  I’ll tell you when I have more
-information about this.
+those who want to submit comments or gripes, or otherwise contribute.
+I sent a proposal for a fast and flexible format, but it is not
+receiving acceptance yet by the GNU deciders.  I'll tell you when I
+have more information about this.
 
 
 File: gettext.info,  Node: Translating plural forms,  Next: Prioritizing messages,  Prev: Information Flow,  Up: Translators
@@ -9125,35 +9115,35 @@
      msgstr[0] ""
      msgstr[1] ""
 
-What does this mean?  How do you fill it in?
+What does this mean? How do you fill it in?
 
-   Such an entry denotes a message with plural forms, that is, a message
-where the text depends on a cardinal number.  The general form of the
-message, in English, is the ‘msgid_plural’ line.  The ‘msgid’ line is
-the English singular form, that is, the form for when the number is
-equal to 1.  More details about plural forms are explained in *note
-Plural forms::.
-
-   The first thing you need to look at is the ‘Plural-Forms’ line in the
-header entry of the PO file.  It contains the number of plural forms and
-a formula.  If the PO file does not yet have such a line, you have to
-add it.  It only depends on the language into which you are translating.
-You can get this info by using the ‘msginit’ command (see *note
-Creating::) – it contains a database of known plural formulas – or by
-asking other members of your translation team.
+   Such an entry denotes a message with plural forms, that is, a
+message where the text depends on a cardinal number.  The general form
+of the message, in English, is the `msgid_plural' line.  The `msgid'
+line is the English singular form, that is, the form for when the
+number is equal to 1.  More details about plural forms are explained in
+*note Plural forms::.
+
+   The first thing you need to look at is the `Plural-Forms' line in the
+header entry of the PO file.  It contains the number of plural forms
+and a formula.  If the PO file does not yet have such a line, you have
+to add it.  It only depends on the language into which you are
+translating.  You can get this info by using the `msginit' command (see
+*note Creating::) - it contains a database of known plural formulas -
+or by asking other members of your translation team.
 
    Suppose the line looks as follows:
 
      "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"
 
-   It’s logically one line; recall that the PO file formatting is
+   It's logically one line; recall that the PO file formatting is
 allowed to break long lines so that each physical line fits in 80
 monospaced columns.
 
-   The value of ‘nplurals’ here tells you that there are three plural
+   The value of `nplurals' here tells you that there are three plural
 forms.  The first thing you need to do is to ensure that the entry
-contains an ‘msgstr’ line for each of the forms:
+contains an `msgstr' line for each of the forms:
 
      #, c-format
      msgid "One file removed"
@@ -9162,8 +9152,8 @@
      msgstr[1] ""
      msgstr[2] ""
 
-   Then translate the ‘msgid_plural’ line and fill it in into each
-‘msgstr’ line:
+   Then translate the `msgid_plural' line and fill it in into each
+`msgstr' line:
 
      #, c-format
      msgid "One file removed"
@@ -9173,9 +9163,9 @@
      msgstr[2] "%d slika uklonjenih"
 
    Now you can refine the translation so that it matches the plural
-form.  According to the formula above, ‘msgstr[0]’ is used when the
-number ends in 1 but does not end in 11; ‘msgstr[1]’ is used when the
-number ends in 2, 3, 4, but not in 12, 13, 14; and ‘msgstr[2]’ is used
+form.  According to the formula above, `msgstr[0]' is used when the
+number ends in 1 but does not end in 11; `msgstr[1]' is used when the
+number ends in 2, 3, 4, but not in 12, 13, 14; and `msgstr[2]' is used
 in all other cases.  With this knowledge, you can refine the
 translations:
 
@@ -9186,17 +9176,17 @@
      msgstr[1] "%d datoteke uklonjenih"
      msgstr[2] "%d slika uklonjenih"
 
-   You noticed that in the English singular form (‘msgid’) the number
-placeholder could be omitted and replaced by the numeral word “one”.
+   You noticed that in the English singular form (`msgid') the number
+placeholder could be omitted and replaced by the numeral word "one".
 Can you do this in your translation as well?
 
      msgstr[0] "jednom datotekom je uklonjen"
 
-Well, it depends on whether ‘msgstr[0]’ applies only to the number 1, or
-to other numbers as well.  If, according to the plural formula,
-‘msgstr[0]’ applies only to ‘n == 1’, then you can use the specialized
+Well, it depends on whether `msgstr[0]' applies only to the number 1,
+or to other numbers as well.  If, according to the plural formula,
+`msgstr[0]' applies only to `n == 1', then you can use the specialized
 translation without the number placeholder.  In our case, however,
-‘msgstr[0]’ also applies to the numbers 21, 31, 41, etc., and therefore
+`msgstr[0]' also applies to the numbers 21, 31, 41, etc., and therefore
 you cannot omit the placeholder.
 
 
@@ -9209,29 +9199,30 @@
 spend on a package, and some packages have quite large message catalogs
 (over 1000 messages).  Therefore she wishes to translate the messages
 first that are the most visible to the user, or that occur most
-frequently.  This section describes how to determine these "most urgent"
-messages.  It also applies to determine the "next most urgent" messages
-after the message catalog has already been partially translated.
+frequently.  This section describes how to determine these "most
+urgent" messages.  It also applies to determine the "next most urgent"
+messages after the message catalog has already been partially
+translated.
 
    In a first step, she uses the programs like a user would do.  While
-she does this, the GNU ‘gettext’ library logs into a file the not yet
+she does this, the GNU `gettext' library logs into a file the not yet
 translated messages for which a translation was requested from the
 program.
 
    In a second step, she uses the PO mode to translate precisely this
 set of messages.
 
-   Here a more details.  The GNU ‘libintl’ library (but not the
-corresponding functions in GNU ‘libc’) supports an environment variable
-‘GETTEXT_LOG_UNTRANSLATED’.  The GNU ‘libintl’ library will log into
-this file the messages for which ‘gettext()’ and related functions
-couldn’t find the translation.  If the file doesn’t exist, it will be
-created as needed.  On systems with GNU ‘libc’ a shared library
-‘preloadable_libintl.so’ is provided that can be used with the ELF
-‘LD_PRELOAD’ mechanism.
+   Here a more details.  The GNU `libintl' library (but not the
+corresponding functions in GNU `libc') supports an environment variable
+`GETTEXT_LOG_UNTRANSLATED'.  The GNU `libintl' library will log into
+this file the messages for which `gettext()' and related functions
+couldn't find the translation.  If the file doesn't exist, it will be
+created as needed.  On systems with GNU `libc' a shared library
+`preloadable_libintl.so' is provided that can be used with the ELF
+`LD_PRELOAD' mechanism.
 
    So, in the first step, the translator uses these commands on systems
-with GNU ‘libc’:
+with GNU `libc':
 
      $ LD_PRELOAD=/usr/local/lib/preloadable_libintl.so
      $ export LD_PRELOAD
@@ -9257,25 +9248,25 @@
 
    The result is a PO file, but needs some preprocessing before a PO
 file editor can be used with it.  First, it is a multi-domain PO file,
-containing messages from many translation domains.  Second, it lacks all
-translator comments and source references.  Here is how to get a list of
-the affected translation domains:
+containing messages from many translation domains.  Second, it lacks
+all translator comments and source references.  Here is how to get a
+list of the affected translation domains:
 
      $ sed -n -e 's,^domain "\(.*\)"$,\1,p' < missing.po | sort | uniq
 
    Then the translator can handle the domains one by one.  For
-simplicity, let’s use environment variables to denote the language,
+simplicity, let's use environment variables to denote the language,
 domain and source package.
 
      $ lang=nl             # your language
      $ domain=coreutils    # the name of the domain to be handled
      $ package=/usr/src/gnu/coreutils-4.5.4   # the package where it comes from
 
-   She takes the latest copy of ‘$lang.po’ from the Translation Project,
-or from the package (in most cases, ‘$package/po/$lang.po’), or creates
-a fresh one if she’s the first translator (see *note Creating::).  She
+   She takes the latest copy of `$lang.po' from the Translation Project,
+or from the package (in most cases, `$package/po/$lang.po'), or creates
+a fresh one if she's the first translator (see *note Creating::).  She
 then uses the following commands to mark the not urgent messages as
-"obsolete".  (This doesn’t mean that these messages - translated and
+"obsolete".  (This doesn't mean that these messages - translated and
 untranslated ones - will go away.  It simply means that the PO file
 editor will ignore them in the following editing session.)
 
@@ -9284,22 +9275,23 @@
      $ msgattrib --set-obsolete --ignore-file $domain-missing.po $domain.$lang.po \
        > $domain.$lang-urgent.po
 
-   The she translates ‘$domain.$lang-urgent.po’ by use of a PO file
-editor (*note Editing::).  (FIXME: I don’t know whether ‘KBabel’ and
-‘gtranslator’ also preserve obsolete messages, as they should.)  Finally
-she restores the not urgent messages (with their earlier translations,
-for those which were already translated) through this command:
+   The she translates `$domain.$lang-urgent.po' by use of a PO file
+editor (*note Editing::).  (FIXME: I don't know whether `KBabel' and
+`gtranslator' also preserve obsolete messages, as they should.)
+Finally she restores the not urgent messages (with their earlier
+translations, for those which were already translated) through this
+command:
 
      $ msgmerge --no-fuzzy-matching $domain.$lang-urgent.po $package/po/$domain.pot \
        > $domain.$lang.po
 
-   Then she can submit ‘$domain.$lang.po’ and proceed to the next
+   Then she can submit `$domain.$lang.po' and proceed to the next
 domain.
 
 
 File: gettext.info,  Node: Maintainers,  Next: Installers,  Prev: Translators,  Up: Top
 
-13 The Maintainer’s View
+13 The Maintainer's View
 ************************
 
    The maintainer of a package has many responsibilities.  One of them
@@ -9307,34 +9299,34 @@
 that the magic we described earlier (*note Users::) will work for
 installers and end users.
 
-   Of course, there are many possible ways by which GNU ‘gettext’ might
-be integrated in a distribution, and this chapter does not cover them in
-all generality.  Instead, it details one possible approach which is
+   Of course, there are many possible ways by which GNU `gettext' might
+be integrated in a distribution, and this chapter does not cover them
+in all generality.  Instead, it details one possible approach which is
 especially adequate for many free software distributions following GNU
-standards, or even better, Gnits standards, because GNU ‘gettext’ is
-purposely for helping the internationalization of the whole GNU project,
-and as many other good free packages as possible.  So, the maintainer’s
-view presented here presumes that the package already has a
-‘configure.ac’ file and uses GNU Autoconf.
+standards, or even better, Gnits standards, because GNU `gettext' is
+purposely for helping the internationalization of the whole GNU
+project, and as many other good free packages as possible.  So, the
+maintainer's view presented here presumes that the package already has
+a `configure.ac' file and uses GNU Autoconf.
 
-   Nevertheless, GNU ‘gettext’ may surely be useful for free packages
+   Nevertheless, GNU `gettext' may surely be useful for free packages
 not following GNU standards and conventions, but the maintainers of such
 packages might have to show imagination and initiative in organizing
-their distributions so ‘gettext’ work for them in all situations.  There
-are surely many, out there.
+their distributions so `gettext' work for them in all situations.
+There are surely many, out there.
 
-   Even if ‘gettext’ methods are now stabilizing, slight adjustments
-might be needed between successive ‘gettext’ versions, so you should
+   Even if `gettext' methods are now stabilizing, slight adjustments
+might be needed between successive `gettext' versions, so you should
 ideally revise this chapter in subsequent releases, looking for changes.
 
 * Menu:
 
 * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
 * Prerequisites::               Prerequisite Works
-* gettextize Invocation::       Invoking the ‘gettextize’ Program
+* gettextize Invocation::       Invoking the `gettextize' Program
 * Adjusting Files::             Files You Must Create or Alter
-* autoconf macros::             Autoconf macros for use in ‘configure.ac’
-* Version Control Issues::      
+* autoconf macros::             Autoconf macros for use in `configure.ac'
+* CVS Issues::                  Integrating with CVS
 * Release Management::          Creating a Distribution Tarball
 
 
@@ -9343,28 +9335,28 @@
 13.1 Flat or Non-Flat Directory Structures
 ==========================================
 
-   Some free software packages are distributed as ‘tar’ files which
+   Some free software packages are distributed as `tar' files which
 unpack in a single directory, these are said to be "flat" distributions.
 Other free software packages have a one level hierarchy of
-subdirectories, using for example a subdirectory named ‘doc/’ for the
-Texinfo manual and man pages, another called ‘lib/’ for holding
-functions meant to replace or complement C libraries, and a subdirectory
-‘src/’ for holding the proper sources for the package.  These other
-distributions are said to be "non-flat".
+subdirectories, using for example a subdirectory named `doc/' for the
+Texinfo manual and man pages, another called `lib/' for holding
+functions meant to replace or complement C libraries, and a
+subdirectory `src/' for holding the proper sources for the package.
+These other distributions are said to be "non-flat".
 
    We cannot say much about flat distributions.  A flat directory
 structure has the disadvantage of increasing the difficulty of updating
-to a new version of GNU ‘gettext’.  Also, if you have many PO files,
+to a new version of GNU `gettext'.  Also, if you have many PO files,
 this could somewhat pollute your single directory.  Also, GNU
-‘gettext’’s libintl sources consist of C sources, shell scripts, ‘sed’
-scripts and complicated Makefile rules, which don’t fit well into an
+`gettext''s libintl sources consist of C sources, shell scripts, `sed'
+scripts and complicated Makefile rules, which don't fit well into an
 existing flat structure.  For these reasons, we recommend to use
 non-flat approach in this case as well.
 
-   Maybe because GNU ‘gettext’ itself has a non-flat structure, we have
+   Maybe because GNU `gettext' itself has a non-flat structure, we have
 more experience with this approach, and this is what will be described
-in the remaining of this chapter.  Some maintainers might use this as an
-opportunity to unflatten their package structure.
+in the remaining of this chapter.  Some maintainers might use this as
+an opportunity to unflatten their package structure.
 
 
 File: gettext.info,  Node: Prerequisites,  Next: gettextize Invocation,  Prev: Flat and Non-Flat,  Up: Maintainers
@@ -9372,239 +9364,243 @@
 13.2 Prerequisite Works
 =======================
 
-   There are some works which are required for using GNU ‘gettext’ in
+   There are some works which are required for using GNU `gettext' in
 one of your package.  These works have some kind of generality that
 escape the point by point descriptions used in the remainder of this
 chapter.  So, we describe them here.
 
-   • Before attempting to use ‘gettextize’ you should install some other
-     packages first.  Ensure that recent versions of GNU ‘m4’, GNU
-     Autoconf and GNU ‘gettext’ are already installed at your site, and
-     if not, proceed to do this first.  If you get to install these
-     things, beware that GNU ‘m4’ must be fully installed before GNU
+   * Before attempting to use `gettextize' you should install some
+     other packages first.  Ensure that recent versions of GNU `m4',
+     GNU Autoconf and GNU `gettext' are already installed at your site,
+     and if not, proceed to do this first.  If you get to install these
+     things, beware that GNU `m4' must be fully installed before GNU
      Autoconf is even _configured_.
 
-     To further ease the task of a package maintainer the ‘automake’
-     package was designed and implemented.  GNU ‘gettext’ now uses this
-     tool and the ‘Makefile’s in the ‘intl/’ and ‘po/’ therefore know
-     about all the goals necessary for using ‘automake’ and ‘libintl’ in
-     one project.
+     To further ease the task of a package maintainer the `automake'
+     package was designed and implemented.  GNU `gettext' now uses this
+     tool and the `Makefile's in the `intl/' and `po/' therefore know
+     about all the goals necessary for using `automake' and `libintl'
+     in one project.
 
      Those four packages are only needed by you, as a maintainer; the
-     installers of your own package and end users do not really need any
-     of GNU ‘m4’, GNU Autoconf, GNU ‘gettext’, or GNU ‘automake’ for
-     successfully installing and running your package, with messages
+     installers of your own package and end users do not really need
+     any of GNU `m4', GNU Autoconf, GNU `gettext', or GNU `automake'
+     for successfully installing and running your package, with messages
      properly translated.  But this is not completely true if you
      provide internationalized shell scripts within your own package:
-     GNU ‘gettext’ shall then be installed at the user site if the end
+     GNU `gettext' shall then be installed at the user site if the end
      users want to see the translation of shell script messages.
 
-   • Your package should use Autoconf and have a ‘configure.ac’ or
-     ‘configure.in’ file.  If it does not, you have to learn how.  The
+   * Your package should use Autoconf and have a `configure.ac' or
+     `configure.in' file.  If it does not, you have to learn how.  The
      Autoconf documentation is quite well written, it is a good idea
      that you print it and get familiar with it.
 
-   • Your C sources should have already been modified according to
+   * Your C sources should have already been modified according to
      instructions given earlier in this manual.  *Note Sources::.
 
-   • Your ‘po/’ directory should receive all PO files submitted to you
-     by the translator teams, each having ‘LL.po’ as a name.  This is
+   * Your `po/' directory should receive all PO files submitted to you
+     by the translator teams, each having `LL.po' as a name.  This is
      not usually easy to get translation work done before your package
-     gets internationalized and available!  Since the cycle has to start
-     somewhere, the easiest for the maintainer is to start with
-     absolutely no PO files, and wait until various translator teams get
-     interested in your package, and submit PO files.
+     gets internationalized and available!  Since the cycle has to
+     start somewhere, the easiest for the maintainer is to start with
+     absolutely no PO files, and wait until various translator teams
+     get interested in your package, and submit PO files.
+
 
    It is worth adding here a few words about how the maintainer should
 ideally behave with PO files submissions.  As a maintainer, your role is
 to authenticate the origin of the submission as being the representative
 of the appropriate translating teams of the Translation Project (forward
-the submission to ‘coordinator@translationproject.org’ in case of
+the submission to `coordinator@translationproject.org' in case of
 doubt), to ensure that the PO file format is not severely broken and
 does not prevent successful installation, and for the rest, to merely
-put these PO files in ‘po/’ for distribution.
+put these PO files in `po/' for distribution.
 
    As a maintainer, you do not have to take on your shoulders the
-responsibility of checking if the translations are adequate or complete,
-and should avoid diving into linguistic matters.  Translation teams
-drive themselves and are fully responsible of their linguistic choices
-for the Translation Project.  Keep in mind that translator teams are
-_not_ driven by maintainers.  You can help by carefully redirecting all
-communications and reports from users about linguistic matters to the
-appropriate translation team, or explain users how to reach or join
-their team.  The simplest might be to send them the ‘ABOUT-NLS’ file.
-
-   Maintainers should _never ever_ apply PO file bug reports themselves,
-short-cutting translation teams.  If some translator has difficulty to
-get some of her points through her team, it should not be an option for
-her to directly negotiate translations with maintainers.  Teams ought to
-settle their problems themselves, if any.  If you, as a maintainer, ever
-think there is a real problem with a team, please never try to _solve_ a
-team’s problem on your own.
+responsibility of checking if the translations are adequate or
+complete, and should avoid diving into linguistic matters.  Translation
+teams drive themselves and are fully responsible of their linguistic
+choices for the Translation Project.  Keep in mind that translator
+teams are _not_ driven by maintainers.  You can help by carefully
+redirecting all communications and reports from users about linguistic
+matters to the appropriate translation team, or explain users how to
+reach or join their team.  The simplest might be to send them the
+`ABOUT-NLS' file.
+
+   Maintainers should _never ever_ apply PO file bug reports
+themselves, short-cutting translation teams.  If some translator has
+difficulty to get some of her points through her team, it should not be
+an option for her to directly negotiate translations with maintainers.
+Teams ought to settle their problems themselves, if any.  If you, as a
+maintainer, ever think there is a real problem with a team, please
+never try to _solve_ a team's problem on your own.
 
 
 File: gettext.info,  Node: gettextize Invocation,  Next: Adjusting Files,  Prev: Prerequisites,  Up: Maintainers
 
-13.3 Invoking the ‘gettextize’ Program
+13.3 Invoking the `gettextize' Program
 ======================================
 
-   The ‘gettextize’ program is an interactive tool that helps the
-maintainer of a package internationalized through GNU ‘gettext’.  It is
+   The `gettextize' program is an interactive tool that helps the
+maintainer of a package internationalized through GNU `gettext'.  It is
 used for two purposes:
 
-   • As a wizard, when a package is modified to use GNU ‘gettext’ for
+   * As a wizard, when a package is modified to use GNU `gettext' for
      the first time.
 
-   • As a migration tool, for upgrading the GNU ‘gettext’ support in a
-     package from a previous to a newer version of GNU ‘gettext’.
+   * As a migration tool, for upgrading the GNU `gettext' support in a
+     package from a previous to a newer version of GNU `gettext'.
 
    This program performs the following tasks:
 
-   • It copies into the package some files that are consistently and
+   * It copies into the package some files that are consistently and
      identically needed in every package internationalized through GNU
-     ‘gettext’.
+     `gettext'.
 
-   • It performs as many of the tasks mentioned in the next section
+   * It performs as many of the tasks mentioned in the next section
      *note Adjusting Files:: as can be performed automatically.
 
-   • It removes obsolete files and idioms used for previous GNU
-     ‘gettext’ versions to the form recommended for the current GNU
-     ‘gettext’ version.
+   * It removes obsolete files and idioms used for previous GNU
+     `gettext' versions to the form recommended for the current GNU
+     `gettext' version.
 
-   • It prints a summary of the tasks that ought to be done manually and
-     could not be done automatically by ‘gettextize’.
+   * It prints a summary of the tasks that ought to be done manually
+     and could not be done automatically by `gettextize'.
 
    It can be invoked as follows:
 
-     gettextize [ OPTION… ] [ DIRECTORY ]
+     gettextize [ OPTION... ] [ DIRECTORY ]
 
 and accepts the following options:
 
-‘-f’
-‘--force’
+`-f'
+`--force'
      Force replacement of files which already exist.
 
-‘--intl’
-     Install the libintl sources in a subdirectory named ‘intl/’.  This
+`--intl'
+     Install the libintl sources in a subdirectory named `intl/'.  This
      libintl will be used to provide internationalization on systems
-     that don’t have GNU libintl installed.  If this option is omitted,
-     the call to ‘AM_GNU_GETTEXT’ in ‘configure.ac’ should read:
-     ‘AM_GNU_GETTEXT([external])’, and internationalization will not be
+     that don't have GNU libintl installed.  If this option is omitted,
+     the call to `AM_GNU_GETTEXT' in `configure.ac' should read:
+     `AM_GNU_GETTEXT([external])', and internationalization will not be
      enabled on systems lacking GNU gettext.
 
-‘--po-dir=DIR’
-     Specify a directory containing PO files.  Such a directory contains
-     the translations into various languages of a particular POT file.
-     This option can be specified multiple times, once for each
-     translation domain.  If it is not specified, the directory named
-     ‘po/’ is updated.
+`--po-dir=DIR'
+     Specify a directory containing PO files.  Such a directory
+     contains the translations into various languages of a particular
+     POT file.  This option can be specified multiple times, once for
+     each translation domain.  If it is not specified, the directory
+     named `po/' is updated.
 
-‘--no-changelog’
-     Don’t update or create ChangeLog files.  By default, ‘gettextize’
+`--no-changelog'
+     Don't update or create ChangeLog files.  By default, `gettextize'
      logs all changes (file additions, modifications and removals) in a
-     file called ‘ChangeLog’ in each affected directory.
+     file called `ChangeLog' in each affected directory.
 
-‘--symlink’
+`--symlink'
      Make symbolic links instead of copying the needed files.  This can
      be useful to save a few kilobytes of disk space, but it requires
-     extra effort to create self-contained tarballs, it may disturb some
-     mechanism the maintainer applies to the sources, and it is likely
-     to introduce bugs when a newer version of ‘gettext’ is installed on
-     the system.
-
-‘-n’
-‘--dry-run’
-     Print modifications but don’t perform them.  All actions that
-     ‘gettextize’ would normally execute are inhibited and instead only
+     extra effort to create self-contained tarballs, it may disturb
+     some mechanism the maintainer applies to the sources, and it is
+     likely to introduce bugs when a newer version of `gettext' is
+     installed on the system.
+
+`-n'
+`--dry-run'
+     Print modifications but don't perform them.  All actions that
+     `gettextize' would normally execute are inhibited and instead only
      listed on standard output.
 
-‘--help’
+`--help'
      Display this help and exit.
 
-‘--version’
+`--version'
      Output version information and exit.
 
+
    If DIRECTORY is given, this is the top level directory of a package
-to prepare for using GNU ‘gettext’.  If not given, it is assumed that
+to prepare for using GNU `gettext'.  If not given, it is assumed that
 the current directory is the top level directory of such a package.
 
-   The program ‘gettextize’ provides the following files.  However, no
-existing file will be replaced unless the option ‘--force’ (‘-f’) is
+   The program `gettextize' provides the following files.  However, no
+existing file will be replaced unless the option `--force' (`-f') is
 specified.
 
-  1. The ‘ABOUT-NLS’ file is copied in the main directory of your
+  1. The `ABOUT-NLS' file is copied in the main directory of your
      package, the one being at the top level.  This file gives the main
      indications about how to install and use the Native Language
      Support features of your program.  You might elect to use a more
-     recent copy of this ‘ABOUT-NLS’ file than the one provided through
-     ‘gettextize’, if you have one handy.  You may also fetch a more
-     recent copy of file ‘ABOUT-NLS’ from Translation Project sites, and
-     from most GNU archive sites.
-
-  2. A ‘po/’ directory is created for eventually holding all translation
-     files, but initially only containing the file ‘po/Makefile.in.in’
-     from the GNU ‘gettext’ distribution (beware the double ‘.in’ in the
-     file name) and a few auxiliary files.  If the ‘po/’ directory
-     already exists, it will be preserved along with the files it
-     contains, and only ‘Makefile.in.in’ and the auxiliary files will be
-     overwritten.
-
-     If ‘--po-dir’ has been specified, this holds for every directory
-     specified through ‘--po-dir’, instead of ‘po/’.
-
-  3. Only if ‘--intl’ has been specified: A ‘intl/’ directory is created
-     and filled with most of the files originally in the ‘intl/’
-     directory of the GNU ‘gettext’ distribution.  Also, if option
-     ‘--force’ (‘-f’) is given, the ‘intl/’ directory is emptied first.
+     recent copy of this `ABOUT-NLS' file than the one provided through
+     `gettextize', if you have one handy.  You may also fetch a more
+     recent copy of file `ABOUT-NLS' from Translation Project sites,
+     and from most GNU archive sites.
+
+  2. A `po/' directory is created for eventually holding all
+     translation files, but initially only containing the file
+     `po/Makefile.in.in' from the GNU `gettext' distribution (beware
+     the double `.in' in the file name) and a few auxiliary files.  If
+     the `po/' directory already exists, it will be preserved along
+     with the files it contains, and only `Makefile.in.in' and the
+     auxiliary files will be overwritten.
+
+     If `--po-dir' has been specified, this holds for every directory
+     specified through `--po-dir', instead of `po/'.
+
+  3. Only if `--intl' has been specified: A `intl/' directory is
+     created and filled with most of the files originally in the
+     `intl/' directory of the GNU `gettext' distribution.  Also, if
+     option `--force' (`-f') is given, the `intl/' directory is emptied
+     first.
 
-  4. The file ‘config.rpath’ is copied into the directory containing
-     configuration support files.  It is needed by the ‘AM_GNU_GETTEXT’
+  4. The file `config.rpath' is copied into the directory containing
+     configuration support files.  It is needed by the `AM_GNU_GETTEXT'
      autoconf macro.
 
-  5. Only if the project is using GNU ‘automake’: A set of ‘autoconf’
-     macro files is copied into the package’s ‘autoconf’ macro
-     repository, usually in a directory called ‘m4/’.
+  5. Only if the project is using GNU `automake': A set of `autoconf'
+     macro files is copied into the package's `autoconf' macro
+     repository, usually in a directory called `m4/'.
 
-   If your site support symbolic links, ‘gettextize’ will not actually
+   If your site support symbolic links, `gettextize' will not actually
 copy the files into your package, but establish symbolic links instead.
 This avoids duplicating the disk space needed in all packages.  Merely
-using the ‘-h’ option while creating the ‘tar’ archive of your
+using the `-h' option while creating the `tar' archive of your
 distribution will resolve each link by an actual copy in the
-distribution archive.  So, to insist, you really should use ‘-h’ option
-with ‘tar’ within your ‘dist’ goal of your main ‘Makefile.in’.
+distribution archive.  So, to insist, you really should use `-h' option
+with `tar' within your `dist' goal of your main `Makefile.in'.
 
-   Furthermore, ‘gettextize’ will update all ‘Makefile.am’ files in each
-affected directory, as well as the top level ‘configure.ac’ or
-‘configure.in’ file.
+   Furthermore, `gettextize' will update all `Makefile.am' files in
+each affected directory, as well as the top level `configure.ac' or
+`configure.in' file.
 
    It is interesting to understand that most new files for supporting
-GNU ‘gettext’ facilities in one package go in ‘intl/’, ‘po/’ and ‘m4/’
-subdirectories.  One distinction between ‘intl/’ and the two other
-directories is that ‘intl/’ is meant to be completely identical in all
-packages using GNU ‘gettext’, while the other directories will mostly
+GNU `gettext' facilities in one package go in `intl/', `po/' and `m4/'
+subdirectories.  One distinction between `intl/' and the two other
+directories is that `intl/' is meant to be completely identical in all
+packages using GNU `gettext', while the other directories will mostly
 contain package dependent files.
 
-   The ‘gettextize’ program makes backup files for all files it replaces
-or changes, and also write ChangeLog entries about these changes.  This
-way, the careful maintainer can check after running ‘gettextize’ whether
-its changes are acceptable to him, and possibly adjust them.  An
-exception to this rule is the ‘intl/’ directory, which is added or
-replaced or removed as a whole.
-
-   It is important to understand that ‘gettextize’ can not do the entire
-job of adapting a package for using GNU ‘gettext’.  The amount of
-remaining work depends on whether the package uses GNU ‘automake’ or
+   The `gettextize' program makes backup files for all files it
+replaces or changes, and also write ChangeLog entries about these
+changes.  This way, the careful maintainer can check after running
+`gettextize' whether its changes are acceptable to him, and possibly
+adjust them.  An exception to this rule is the `intl/' directory, which
+is added or replaced or removed as a whole.
+
+   It is important to understand that `gettextize' can not do the
+entire job of adapting a package for using GNU `gettext'.  The amount
+of remaining work depends on whether the package uses GNU `automake' or
 not.  But in any case, the maintainer should still read the section
-*note Adjusting Files:: after invoking ‘gettextize’.
+*note Adjusting Files:: after invoking `gettextize'.
 
-   In particular, if after using ‘gettexize’, you get an error
-‘AC_COMPILE_IFELSE was called before AC_GNU_SOURCE’ or ‘AC_RUN_IFELSE
-was called before AC_GNU_SOURCE’, you can fix it by modifying
-‘configure.ac’, as described in *note configure.ac::.
+   In particular, if after using `gettexize', you get an error
+`AC_COMPILE_IFELSE was called before AC_GNU_SOURCE' or `AC_RUN_IFELSE
+was called before AC_GNU_SOURCE', you can fix it by modifying
+`configure.ac', as described in *note configure.ac::.
 
-   It is also important to understand that ‘gettextize’ is not part of
+   It is also important to understand that `gettextize' is not part of
 the GNU build system, in the sense that it should not be invoked
-automatically, and not be invoked by someone who doesn’t assume the
+automatically, and not be invoked by someone who doesn't assume the
 responsibilities of a package maintainer.  For the latter purpose, a
 separate tool is provided, see *note autopoint Invocation::.
 
@@ -9614,44 +9610,44 @@
 13.4 Files You Must Create or Alter
 ===================================
 
-   Besides files which are automatically added through ‘gettextize’,
+   Besides files which are automatically added through `gettextize',
 there are many files needing revision for properly interacting with GNU
-‘gettext’.  If you are closely following GNU standards for Makefile
+`gettext'.  If you are closely following GNU standards for Makefile
 engineering and auto-configuration, the adaptations should be easier to
 achieve.  Here is a point by point description of the changes needed in
 each.
 
    So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-‘gettext’ 0.19.3 distribution itself, or from the GNU ‘hello’
-distribution (<http://www.franken.de/users/gnu/ke/hello> or
-<http://www.gnu.franken.de/ke/hello/>) You may indeed refer to the
-source code of the GNU ‘gettext’ and GNU ‘hello’ packages, as they are
+`gettext' 0.18.1 distribution itself, or from the GNU `hello'
+distribution (`http://www.franken.de/users/gnu/ke/hello' or
+`http://www.gnu.franken.de/ke/hello/')  You may indeed refer to the
+source code of the GNU `gettext' and GNU `hello' packages, as they are
 intended to be good examples for using GNU gettext functionality.
 
 * Menu:
 
-* po/POTFILES.in::              ‘POTFILES.in’ in ‘po/’
-* po/LINGUAS::                  ‘LINGUAS’ in ‘po/’
-* po/Makevars::                 ‘Makevars’ in ‘po/’
-* po/Rules-*::                  Extending ‘Makefile’ in ‘po/’
-* configure.ac::                ‘configure.ac’ at top level
-* config.guess::                ‘config.guess’, ‘config.sub’ at top level
-* mkinstalldirs::               ‘mkinstalldirs’ at top level
-* aclocal::                     ‘aclocal.m4’ at top level
-* acconfig::                    ‘acconfig.h’ at top level
-* config.h.in::                 ‘config.h.in’ at top level
-* Makefile::                    ‘Makefile.in’ at top level
-* src/Makefile::                ‘Makefile.in’ in ‘src/’
-* lib/gettext.h::               ‘gettext.h’ in ‘lib/’
+* po/POTFILES.in::              `POTFILES.in' in `po/'
+* po/LINGUAS::                  `LINGUAS' in `po/'
+* po/Makevars::                 `Makevars' in `po/'
+* po/Rules-*::                  Extending `Makefile' in `po/'
+* configure.ac::                `configure.ac' at top level
+* config.guess::                `config.guess', `config.sub' at top level
+* mkinstalldirs::               `mkinstalldirs' at top level
+* aclocal::                     `aclocal.m4' at top level
+* acconfig::                    `acconfig.h' at top level
+* config.h.in::                 `config.h.in' at top level
+* Makefile::                    `Makefile.in' at top level
+* src/Makefile::                `Makefile.in' in `src/'
+* lib/gettext.h::               `gettext.h' in `lib/'
 
 
 File: gettext.info,  Node: po/POTFILES.in,  Next: po/LINGUAS,  Prev: Adjusting Files,  Up: Adjusting Files
 
-13.4.1 ‘POTFILES.in’ in ‘po/’
+13.4.1 `POTFILES.in' in `po/'
 -----------------------------
 
-   The ‘po/’ directory should receive a file named ‘POTFILES.in’.  This
+   The `po/' directory should receive a file named `POTFILES.in'.  This
 file tells which files, among all program sources, have marked strings
 needing translation.  Here is an example of such a file:
 
@@ -9669,26 +9665,26 @@
      src/xgettext.c
 
 Hash-marked comments and white lines are ignored.  All other lines list
-those source files containing strings marked for translation (*note Mark
-Keywords::), in a notation relative to the top level of your whole
-distribution, rather than the location of the ‘POTFILES.in’ file itself.
-
-   When a C file is automatically generated by a tool, like ‘flex’ or
-‘bison’, that doesn’t introduce translatable strings by itself, it is
-recommended to list in ‘po/POTFILES.in’ the real source file (ending in
-‘.l’ in the case of ‘flex’, or in ‘.y’ in the case of ‘bison’), not the
+those source files containing strings marked for translation (*note
+Mark Keywords::), in a notation relative to the top level of your whole
+distribution, rather than the location of the `POTFILES.in' file itself.
+
+   When a C file is automatically generated by a tool, like `flex' or
+`bison', that doesn't introduce translatable strings by itself, it is
+recommended to list in `po/POTFILES.in' the real source file (ending in
+`.l' in the case of `flex', or in `.y' in the case of `bison'), not the
 generated C file.
 
 
 File: gettext.info,  Node: po/LINGUAS,  Next: po/Makevars,  Prev: po/POTFILES.in,  Up: Adjusting Files
 
-13.4.2 ‘LINGUAS’ in ‘po/’
+13.4.2 `LINGUAS' in `po/'
 -------------------------
 
-   The ‘po/’ directory should also receive a file named ‘LINGUAS’.  This
-file contains the list of available translations.  It is a whitespace
-separated list.  Hash-marked comments and white lines are ignored.  Here
-is an example file:
+   The `po/' directory should also receive a file named `LINGUAS'.
+This file contains the list of available translations.  It is a
+whitespace separated list.  Hash-marked comments and white lines are
+ignored.  Here is an example file:
 
      # Set of available languages.
      de fr
@@ -9696,140 +9692,141 @@
 This example means that German and French PO files are available, so
 that these languages are currently supported by your package.  If you
 want to further restrict, at installation time, the set of installed
-languages, this should not be done by modifying the ‘LINGUAS’ file, but
-rather by using the ‘LINGUAS’ environment variable (*note Installers::).
+languages, this should not be done by modifying the `LINGUAS' file, but
+rather by using the `LINGUAS' environment variable (*note Installers::).
 
-   It is recommended that you add the "languages" ‘en@quot’ and
-‘en@boldquot’ to the ‘LINGUAS’ file.  ‘en@quot’ is a variant of English
-message catalogs (‘en’) which uses real quotation marks instead of the
-ugly looking asymmetric ASCII substitutes ‘`’ and ‘'’.  ‘en@boldquot’ is
-a variant of ‘en@quot’ that additionally outputs quoted pieces of text
-in a bold font, when used in a terminal emulator which supports the
-VT100 escape sequences (such as ‘xterm’ or the Linux console, but not
-Emacs in ‘M-x shell’ mode).
-
-   These extra message catalogs ‘en@quot’ and ‘en@boldquot’ are
-constructed automatically, not by translators; to support them, you need
-the files ‘Rules-quot’, ‘quot.sed’, ‘boldquot.sed’, ‘en@quot.header’,
-‘en@boldquot.header’, ‘insert-header.sin’ in the ‘po/’ directory.  You
-can copy them from GNU gettext’s ‘po/’ directory; they are also
-installed by running ‘gettextize’.
+   It is recommended that you add the "languages" `en@quot' and
+`en@boldquot' to the `LINGUAS' file.  `en@quot' is a variant of English
+message catalogs (`en') which uses real quotation marks instead of the
+ugly looking asymmetric ASCII substitutes ``' and `''.  `en@boldquot'
+is a variant of `en@quot' that additionally outputs quoted pieces of
+text in a bold font, when used in a terminal emulator which supports
+the VT100 escape sequences (such as `xterm' or the Linux console, but
+not Emacs in `M-x shell' mode).
+
+   These extra message catalogs `en@quot' and `en@boldquot' are
+constructed automatically, not by translators; to support them, you
+need the files `Rules-quot', `quot.sed', `boldquot.sed',
+`en@quot.header', `en@boldquot.header', `insert-header.sin' in the
+`po/' directory.  You can copy them from GNU gettext's `po/' directory;
+they are also installed by running `gettextize'.
 
 
 File: gettext.info,  Node: po/Makevars,  Next: po/Rules-*,  Prev: po/LINGUAS,  Up: Adjusting Files
 
-13.4.3 ‘Makevars’ in ‘po/’
+13.4.3 `Makevars' in `po/'
 --------------------------
 
-   The ‘po/’ directory also has a file named ‘Makevars’.  It contains
-variables that are specific to your project.  ‘po/Makevars’ gets
-inserted into the ‘po/Makefile’ when the latter is created.  The
+   The `po/' directory also has a file named `Makevars'.  It contains
+variables that are specific to your project.  `po/Makevars' gets
+inserted into the `po/Makefile' when the latter is created.  The
 variables thus take effect when the POT file is created or updated, and
 when the message catalogs get installed.
 
    The first three variables can be left unmodified if your package has
-a single message domain and, accordingly, a single ‘po/’ directory.
-Only packages which have multiple ‘po/’ directories at different
+a single message domain and, accordingly, a single `po/' directory.
+Only packages which have multiple `po/' directories at different
 locations need to adjust the three first variables defined in
-‘Makevars’.
+`Makevars'.
 
-   As an alternative to the ‘XGETTEXT_OPTIONS’ variables, it is also
-possible to specify ‘xgettext’ options through the ‘AM_XGETTEXT_OPTION’
+   As an alternative to the `XGETTEXT_OPTIONS' variables, it is also
+possible to specify `xgettext' options through the `AM_XGETTEXT_OPTION'
 autoconf macro.  See *note AM_XGETTEXT_OPTION::.
 
 
 File: gettext.info,  Node: po/Rules-*,  Next: configure.ac,  Prev: po/Makevars,  Up: Adjusting Files
 
-13.4.4 Extending ‘Makefile’ in ‘po/’
+13.4.4 Extending `Makefile' in `po/'
 ------------------------------------
 
-   All files called ‘Rules-*’ in the ‘po/’ directory get appended to the
-‘po/Makefile’ when it is created.  They present an opportunity to add
-rules for special PO files to the Makefile, without needing to mess with
-‘po/Makefile.in.in’.
-
-   GNU gettext comes with a ‘Rules-quot’ file, containing rules for
-building catalogs ‘en@quot.po’ and ‘en@boldquot.po’.  The effect of
-‘en@quot.po’ is that people who set their ‘LANGUAGE’ environment
-variable to ‘en@quot’ will get messages with proper looking symmetric
+   All files called `Rules-*' in the `po/' directory get appended to
+the `po/Makefile' when it is created.  They present an opportunity to
+add rules for special PO files to the Makefile, without needing to mess
+with `po/Makefile.in.in'.
+
+   GNU gettext comes with a `Rules-quot' file, containing rules for
+building catalogs `en@quot.po' and `en@boldquot.po'.  The effect of
+`en@quot.po' is that people who set their `LANGUAGE' environment
+variable to `en@quot' will get messages with proper looking symmetric
 Unicode quotation marks instead of abusing the ASCII grave accent and
-the ASCII apostrophe for indicating quotations.  To enable this catalog,
-simply add ‘en@quot’ to the ‘po/LINGUAS’ file.  The effect of
-‘en@boldquot.po’ is that people who set ‘LANGUAGE’ to ‘en@boldquot’ will
-get not only proper quotation marks, but also the quoted text will be
-shown in a bold font on terminals and consoles.  This catalog is useful
-only for command-line programs, not GUI programs.  To enable it,
-similarly add ‘en@boldquot’ to the ‘po/LINGUAS’ file.
+the ASCII apostrophe for indicating quotations.  To enable this
+catalog, simply add `en@quot' to the `po/LINGUAS' file.  The effect of
+`en@boldquot.po' is that people who set `LANGUAGE' to `en@boldquot'
+will get not only proper quotation marks, but also the quoted text will
+be shown in a bold font on terminals and consoles.  This catalog is
+useful only for command-line programs, not GUI programs.  To enable it,
+similarly add `en@boldquot' to the `po/LINGUAS' file.
 
    Similarly, you can create rules for building message catalogs for the
-‘sr@latin’ locale – Serbian written with the Latin alphabet – from those
-for the ‘sr’ locale – Serbian written with Cyrillic letters.  See *note
-msgfilter Invocation::.
+`sr@latin' locale - Serbian written with the Latin alphabet - from
+those for the `sr' locale - Serbian written with Cyrillic letters.  See
+*note msgfilter Invocation::.
 
 
 File: gettext.info,  Node: configure.ac,  Next: config.guess,  Prev: po/Rules-*,  Up: Adjusting Files
 
-13.4.5 ‘configure.ac’ at top level
+13.4.5 `configure.ac' at top level
 ----------------------------------
 
-   ‘configure.ac’ or ‘configure.in’ - this is the source from which
-‘autoconf’ generates the ‘configure’ script.
+   `configure.ac' or `configure.in' - this is the source from which
+`autoconf' generates the `configure' script.
 
-  1. Declare the package and version.
+  1. Declare the package and version.  
 
      This is done by a set of lines like these:
 
           PACKAGE=gettext
-          VERSION=0.19.3
+          VERSION=0.18.1
           AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
           AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
           AC_SUBST(PACKAGE)
           AC_SUBST(VERSION)
 
-     or, if you are using GNU ‘automake’, by a line like this:
+     or, if you are using GNU `automake', by a line like this:
 
-          AM_INIT_AUTOMAKE(gettext, 0.19.3)
+          AM_INIT_AUTOMAKE(gettext, 0.18.1)
 
-     Of course, you replace ‘gettext’ with the name of your package, and
-     ‘0.19.3’ by its version numbers, exactly as they should appear in
-     the packaged ‘tar’ file name of your distribution
-     (‘gettext-0.19.3.tar.gz’, here).
+     Of course, you replace `gettext' with the name of your package,
+     and `0.18.1' by its version numbers, exactly as they should appear
+     in the packaged `tar' file name of your distribution
+     (`gettext-0.18.1.tar.gz', here).
 
   2. Check for internationalization support.
 
-     Here is the main ‘m4’ macro for triggering internationalization
-     support.  Just add this line to ‘configure.ac’:
+     Here is the main `m4' macro for triggering internationalization
+     support.  Just add this line to `configure.ac':
 
           AM_GNU_GETTEXT
 
      This call is purposely simple, even if it generates a lot of
      configure time checking and actions.
 
-     If you have suppressed the ‘intl/’ subdirectory by calling
-     ‘gettextize’ without ‘--intl’ option, this call should read
+     If you have suppressed the `intl/' subdirectory by calling
+     `gettextize' without `--intl' option, this call should read
 
           AM_GNU_GETTEXT([external])
 
   3. Have output files created.
 
-     The ‘AC_OUTPUT’ directive, at the end of your ‘configure.ac’ file,
+     The `AC_OUTPUT' directive, at the end of your `configure.ac' file,
      needs to be modified in two ways:
 
           AC_OUTPUT([EXISTING CONFIGURATION FILES intl/Makefile po/Makefile.in],
           [EXISTING ADDITIONAL ACTIONS])
 
-     The modification to the first argument to ‘AC_OUTPUT’ asks for
-     substitution in the ‘intl/’ and ‘po/’ directories.  Note the ‘.in’
-     suffix used for ‘po/’ only.  This is because the distributed file
-     is really ‘po/Makefile.in.in’.
-
-     If you have suppressed the ‘intl/’ subdirectory by calling
-     ‘gettextize’ without ‘--intl’ option, then you don’t need to add
-     ‘intl/Makefile’ to the ‘AC_OUTPUT’ line.
+     The modification to the first argument to `AC_OUTPUT' asks for
+     substitution in the `intl/' and `po/' directories.  Note the `.in'
+     suffix used for `po/' only.  This is because the distributed file
+     is really `po/Makefile.in.in'.
+
+     If you have suppressed the `intl/' subdirectory by calling
+     `gettextize' without `--intl' option, then you don't need to add
+     `intl/Makefile' to the `AC_OUTPUT' line.
+
 
    If, after doing the recommended modifications, a command like
-‘aclocal -I m4’ or ‘autoconf’ or ‘autoreconf’ fails with a trace similar
-to this:
+`aclocal -I m4' or `autoconf' or `autoreconf' fails with a trace
+similar to this:
 
      configure.ac:44: warning: AC_COMPILE_IFELSE was called before AC_GNU_SOURCE
      ../../lib/autoconf/specific.m4:335: AC_GNU_SOURCE is expanded from...
@@ -9840,144 +9837,136 @@
      configure.ac:44: the top level
      configure.ac:44: warning: AC_RUN_IFELSE was called before AC_GNU_SOURCE
 
-you need to add an explicit invocation of ‘AC_GNU_SOURCE’ in the
-‘configure.ac’ file - after ‘AC_PROG_CC’ but before ‘AM_GNU_GETTEXT’,
-most likely very close to the ‘AC_PROG_CC’ invocation.  This is
+you need to add an explicit invocation of `AC_GNU_SOURCE' in the
+`configure.ac' file - after `AC_PROG_CC' but before `AM_GNU_GETTEXT',
+most likely very close to the `AC_PROG_CC' invocation.  This is
 necessary because of ordering restrictions imposed by GNU autoconf.
 
 
 File: gettext.info,  Node: config.guess,  Next: mkinstalldirs,  Prev: configure.ac,  Up: Adjusting Files
 
-13.4.6 ‘config.guess’, ‘config.sub’ at top level
+13.4.6 `config.guess', `config.sub' at top level
 ------------------------------------------------
 
-   If you haven’t suppressed the ‘intl/’ subdirectory, you need to add
-the GNU ‘config.guess’ and ‘config.sub’ files to your distribution.
-They are needed because the ‘intl/’ directory has platform dependent
-support for determining the locale’s character encoding and therefore
+   If you haven't suppressed the `intl/' subdirectory, you need to add
+the GNU `config.guess' and `config.sub' files to your distribution.
+They are needed because the `intl/' directory has platform dependent
+support for determining the locale's character encoding and therefore
 needs to identify the platform.
 
-   You can obtain the newest version of ‘config.guess’ and ‘config.sub’
-from the ‘config’ project at ‘http://savannah.gnu.org/’.  The commands
-to fetch them are
-     $ wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-     $ wget -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
-Less recent versions are also contained in the GNU ‘automake’ and GNU
-‘libtool’ packages.
-
-   Normally, ‘config.guess’ and ‘config.sub’ are put at the top level of
-a distribution.  But it is also possible to put them in a subdirectory,
-altogether with other configuration support files like ‘install-sh’,
-‘ltconfig’, ‘ltmain.sh’ or ‘missing’.  All you need to do, other than
-moving the files, is to add the following line to your ‘configure.ac’.
+   You can obtain the newest version of `config.guess' and `config.sub'
+from the CVS of the `config' project at `http://savannah.gnu.org/'. The
+commands to fetch them are
+     $ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess'
+     $ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub'
+   Less recent versions are also contained in the GNU `automake' and
+GNU `libtool' packages.
+
+   Normally, `config.guess' and `config.sub' are put at the top level
+of a distribution.  But it is also possible to put them in a
+subdirectory, altogether with other configuration support files like
+`install-sh', `ltconfig', `ltmain.sh' or `missing'.  All you need to
+do, other than moving the files, is to add the following line to your
+`configure.ac'.
 
      AC_CONFIG_AUX_DIR([SUBDIR])
 
 
 File: gettext.info,  Node: mkinstalldirs,  Next: aclocal,  Prev: config.guess,  Up: Adjusting Files
 
-13.4.7 ‘mkinstalldirs’ at top level
+13.4.7 `mkinstalldirs' at top level
 -----------------------------------
 
    With earlier versions of GNU gettext, you needed to add the GNU
-‘mkinstalldirs’ script to your distribution.  This is not needed any
-more.  You can remove it if you not also using an automake version older
-than automake 1.9.
+`mkinstalldirs' script to your distribution.  This is not needed any
+more.  You can remove it if you not also using an automake version
+older than automake 1.9.
 
 
 File: gettext.info,  Node: aclocal,  Next: acconfig,  Prev: mkinstalldirs,  Up: Adjusting Files
 
-13.4.8 ‘aclocal.m4’ at top level
+13.4.8 `aclocal.m4' at top level
 --------------------------------
 
-   If you do not have an ‘aclocal.m4’ file in your distribution, the
-simplest is to concatenate the files ‘codeset.m4’, ‘fcntl-o.m4’,
-‘gettext.m4’, ‘glibc2.m4’, ‘glibc21.m4’, ‘iconv.m4’, ‘intdiv0.m4’,
-‘intl.m4’, ‘intldir.m4’, ‘intlmacosx.m4’, ‘intmax.m4’, ‘inttypes_h.m4’,
-‘inttypes-pri.m4’, ‘lcmessage.m4’, ‘lib-ld.m4’, ‘lib-link.m4’,
-‘lib-prefix.m4’, ‘lock.m4’, ‘longlong.m4’, ‘nls.m4’, ‘po.m4’,
-‘printf-posix.m4’, ‘progtest.m4’, ‘size_max.m4’, ‘stdint_h.m4’,
-‘threadlib.m4’, ‘uintmax_t.m4’, ‘visibility.m4’, ‘wchar_t.m4’,
-‘wint_t.m4’, ‘xsize.m4’ from GNU ‘gettext’’s ‘m4/’ directory into a
-single file.  If you have suppressed the ‘intl/’ directory, only
-‘gettext.m4’, ‘iconv.m4’, ‘lib-ld.m4’, ‘lib-link.m4’, ‘lib-prefix.m4’,
-‘nls.m4’, ‘po.m4’, ‘progtest.m4’ need to be concatenated.
-
-   If you are not using GNU ‘automake’ 1.8 or newer, you will need to
-add a file ‘mkdirp.m4’ from a newer automake distribution to the list of
-files above.
-
-   If you already have an ‘aclocal.m4’ file, then you will have to merge
-the said macro files into your ‘aclocal.m4’.  Note that if you are
-upgrading from a previous release of GNU ‘gettext’, you should most
-probably _replace_ the macros (‘AM_GNU_GETTEXT’, etc.), as they usually
-change a little from one release of GNU ‘gettext’ to the next.  Their
+   If you do not have an `aclocal.m4' file in your distribution, the
+simplest is to concatenate the files `codeset.m4', `fcntl-o.m4',
+`gettext.m4', `glibc2.m4', `glibc21.m4', `iconv.m4', `intdiv0.m4',
+`intl.m4', `intldir.m4', `intlmacosx.m4', `intmax.m4', `inttypes_h.m4',
+`inttypes-pri.m4', `lcmessage.m4', `lib-ld.m4', `lib-link.m4',
+`lib-prefix.m4', `lock.m4', `longlong.m4', `nls.m4', `po.m4',
+`printf-posix.m4', `progtest.m4', `size_max.m4', `stdint_h.m4',
+`threadlib.m4', `uintmax_t.m4', `visibility.m4', `wchar_t.m4',
+`wint_t.m4', `xsize.m4' from GNU `gettext''s `m4/' directory into a
+single file.  If you have suppressed the `intl/' directory, only
+`gettext.m4', `iconv.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4',
+`nls.m4', `po.m4', `progtest.m4' need to be concatenated.
+
+   If you are not using GNU `automake' 1.8 or newer, you will need to
+add a file `mkdirp.m4' from a newer automake distribution to the list
+of files above.
+
+   If you already have an `aclocal.m4' file, then you will have to
+merge the said macro files into your `aclocal.m4'.  Note that if you
+are upgrading from a previous release of GNU `gettext', you should most
+probably _replace_ the macros (`AM_GNU_GETTEXT', etc.), as they usually
+change a little from one release of GNU `gettext' to the next.  Their
 contents may vary as we get more experience with strange systems out
 there.
 
-   If you are using GNU ‘automake’ 1.5 or newer, it is enough to put
-these macro files into a subdirectory named ‘m4/’ and add the line
+   If you are using GNU `automake' 1.5 or newer, it is enough to put
+these macro files into a subdirectory named `m4/' and add the line
 
      ACLOCAL_AMFLAGS = -I m4
 
-to your top level ‘Makefile.am’.
-
-   If you are using GNU ‘automake’ 1.10 or newer, it is even easier: Add
-the line
-
-     ACLOCAL_AMFLAGS = --install -I m4
-
-to your top level ‘Makefile.am’, and run ‘aclocal --install -I m4’.
-This will copy the needed files to the ‘m4/’ subdirectory automatically,
-before updating ‘aclocal.m4’.
+to your top level `Makefile.am'.
 
-   These macros check for the internationalization support functions and
-related informations.  Hopefully, once stabilized, these macros might be
-integrated in the standard Autoconf set, because this piece of ‘m4’ code
-will be the same for all projects using GNU ‘gettext’.
+   These macros check for the internationalization support functions
+and related informations.  Hopefully, once stabilized, these macros
+might be integrated in the standard Autoconf set, because this piece of
+`m4' code will be the same for all projects using GNU `gettext'.
 
 
 File: gettext.info,  Node: acconfig,  Next: config.h.in,  Prev: aclocal,  Up: Adjusting Files
 
-13.4.9 ‘acconfig.h’ at top level
+13.4.9 `acconfig.h' at top level
 --------------------------------
 
-   Earlier GNU ‘gettext’ releases required to put definitions for
-‘ENABLE_NLS’, ‘HAVE_GETTEXT’ and ‘HAVE_LC_MESSAGES’, ‘HAVE_STPCPY’,
-‘PACKAGE’ and ‘VERSION’ into an ‘acconfig.h’ file.  This is not needed
-any more; you can remove them from your ‘acconfig.h’ file unless your
-package uses them independently from the ‘intl/’ directory.
+   Earlier GNU `gettext' releases required to put definitions for
+`ENABLE_NLS', `HAVE_GETTEXT' and `HAVE_LC_MESSAGES', `HAVE_STPCPY',
+`PACKAGE' and `VERSION' into an `acconfig.h' file.  This is not needed
+any more; you can remove them from your `acconfig.h' file unless your
+package uses them independently from the `intl/' directory.
 
 
 File: gettext.info,  Node: config.h.in,  Next: Makefile,  Prev: acconfig,  Up: Adjusting Files
 
-13.4.10 ‘config.h.in’ at top level
+13.4.10 `config.h.in' at top level
 ----------------------------------
 
    The include file template that holds the C macros to be defined by
-‘configure’ is usually called ‘config.h.in’ and may be maintained either
-manually or automatically.
+`configure' is usually called `config.h.in' and may be maintained
+either manually or automatically.
 
-   If ‘gettextize’ has created an ‘intl/’ directory, this file must be
-called ‘config.h.in’ and must be at the top level.  If, however, you
-have suppressed the ‘intl/’ directory by calling ‘gettextize’ without
-‘--intl’ option, then you can choose the name of this file and its
+   If `gettextize' has created an `intl/' directory, this file must be
+called `config.h.in' and must be at the top level.  If, however, you
+have suppressed the `intl/' directory by calling `gettextize' without
+`--intl' option, then you can choose the name of this file and its
 location freely.
 
-   If it is maintained automatically, by use of the ‘autoheader’
+   If it is maintained automatically, by use of the `autoheader'
 program, you need to do nothing about it.  This is the case in
-particular if you are using GNU ‘automake’.
+particular if you are using GNU `automake'.
 
-   If it is maintained manually, and if ‘gettextize’ has created an
-‘intl/’ directory, you should switch to using ‘autoheader’.  The list of
-C macros to be added for the sake of the ‘intl/’ directory is just too
-long to be maintained manually; it also changes between different
-versions of GNU ‘gettext’.
+   If it is maintained manually, and if `gettextize' has created an
+`intl/' directory, you should switch to using `autoheader'.  The list
+of C macros to be added for the sake of the `intl/' directory is just
+too long to be maintained manually; it also changes between different
+versions of GNU `gettext'.
 
    If it is maintained manually, and if on the other hand you have
-suppressed the ‘intl/’ directory by calling ‘gettextize’ without
-‘--intl’ option, then you can get away by adding the following lines to
-‘config.h.in’:
+suppressed the `intl/' directory by calling `gettextize' without
+`--intl' option, then you can get away by adding the following lines to
+`config.h.in':
 
      /* Define to 1 if translation of program messages to the user's
         native language is requested. */
@@ -9986,47 +9975,47 @@
 
 File: gettext.info,  Node: Makefile,  Next: src/Makefile,  Prev: config.h.in,  Up: Adjusting Files
 
-13.4.11 ‘Makefile.in’ at top level
+13.4.11 `Makefile.in' at top level
 ----------------------------------
 
    Here are a few modifications you need to make to your main, top-level
-‘Makefile.in’ file.
+`Makefile.in' file.
 
-  1. Add the following lines near the beginning of your ‘Makefile.in’,
-     so the ‘dist:’ goal will work properly (as explained further down):
+  1. Add the following lines near the beginning of your `Makefile.in',
+     so the `dist:' goal will work properly (as explained further down):
 
           PACKAGE = @PACKAGE@
           VERSION = @VERSION@
 
-  2. Add file ‘ABOUT-NLS’ to the ‘DISTFILES’ definition, so the file
+  2. Add file `ABOUT-NLS' to the `DISTFILES' definition, so the file
      gets distributed.
 
-  3. Wherever you process subdirectories in your ‘Makefile.in’, be sure
-     you also process the subdirectories ‘intl’ and ‘po’.  Special rules
-     in the ‘Makefiles’ take care for the case where no
+  3. Wherever you process subdirectories in your `Makefile.in', be sure
+     you also process the subdirectories `intl' and `po'.  Special
+     rules in the `Makefiles' take care for the case where no
      internationalization is wanted.
 
      If you are using Makefiles, either generated by automake, or
-     hand-written so they carefully follow the GNU coding standards, the
-     effected goals for which the new subdirectories must be handled
-     include ‘installdirs’, ‘install’, ‘uninstall’, ‘clean’,
-     ‘distclean’.
+     hand-written so they carefully follow the GNU coding standards,
+     the effected goals for which the new subdirectories must be
+     handled include `installdirs', `install', `uninstall', `clean',
+     `distclean'.
 
      Here is an example of a canonical order of processing.  In this
-     example, we also define ‘SUBDIRS’ in ‘Makefile.in’ for it to be
-     further used in the ‘dist:’ goal.
+     example, we also define `SUBDIRS' in `Makefile.in' for it to be
+     further used in the `dist:' goal.
 
           SUBDIRS = doc intl lib src po
 
-     Note that you must arrange for ‘make’ to descend into the ‘intl’
+     Note that you must arrange for `make' to descend into the `intl'
      directory before descending into other directories containing code
-     which make use of the ‘libintl.h’ header file.  For this reason,
-     here we mention ‘intl’ before ‘lib’ and ‘src’.
+     which make use of the `libintl.h' header file.  For this reason,
+     here we mention `intl' before `lib' and `src'.
 
-  4. A delicate point is the ‘dist:’ goal, as both ‘intl/Makefile’ and
-     ‘po/Makefile’ will later assume that the proper directory has been
-     set up from the main ‘Makefile’.  Here is an example at what the
-     ‘dist:’ goal might look like:
+  4. A delicate point is the `dist:' goal, as both `intl/Makefile' and
+     `po/Makefile' will later assume that the proper directory has been
+     set up from the main `Makefile'.  Here is an example at what the
+     `dist:' goal might look like:
 
           distdir = $(PACKAGE)-$(VERSION)
           dist: Makefile
@@ -10044,47 +10033,48 @@
           	tar chozf $(distdir).tar.gz $(distdir)
           	rm -fr $(distdir)
 
-   Note that if you are using GNU ‘automake’, ‘Makefile.in’ is
-automatically generated from ‘Makefile.am’, and all needed changes to
-‘Makefile.am’ are already made by running ‘gettextize’.
+
+   Note that if you are using GNU `automake', `Makefile.in' is
+automatically generated from `Makefile.am', and all needed changes to
+`Makefile.am' are already made by running `gettextize'.
 
 
 File: gettext.info,  Node: src/Makefile,  Next: lib/gettext.h,  Prev: Makefile,  Up: Adjusting Files
 
-13.4.12 ‘Makefile.in’ in ‘src/’
+13.4.12 `Makefile.in' in `src/'
 -------------------------------
 
-   Some of the modifications made in the main ‘Makefile.in’ will also be
-needed in the ‘Makefile.in’ from your package sources, which we assume
-here to be in the ‘src/’ subdirectory.  Here are all the modifications
-needed in ‘src/Makefile.in’:
+   Some of the modifications made in the main `Makefile.in' will also
+be needed in the `Makefile.in' from your package sources, which we
+assume here to be in the `src/' subdirectory.  Here are all the
+modifications needed in `src/Makefile.in':
 
-  1. In view of the ‘dist:’ goal, you should have these lines near the
-     beginning of ‘src/Makefile.in’:
+  1. In view of the `dist:' goal, you should have these lines near the
+     beginning of `src/Makefile.in':
 
           PACKAGE = @PACKAGE@
           VERSION = @VERSION@
 
-  2. If not done already, you should guarantee that ‘top_srcdir’ gets
-     defined.  This will serve for ‘cpp’ include files.  Just add the
+  2. If not done already, you should guarantee that `top_srcdir' gets
+     defined.  This will serve for `cpp' include files.  Just add the
      line:
 
           top_srcdir = @top_srcdir@
 
-  3. You might also want to define ‘subdir’ as ‘src’, later allowing for
-     almost uniform ‘dist:’ goals in all your ‘Makefile.in’.  At list,
-     the ‘dist:’ goal below assume that you used:
+  3. You might also want to define `subdir' as `src', later allowing
+     for almost uniform `dist:' goals in all your `Makefile.in'.  At
+     list, the `dist:' goal below assume that you used:
 
           subdir = src
 
-  4. The ‘main’ function of your program will normally call
-     ‘bindtextdomain’ (see *note Triggering::), like this:
+  4. The `main' function of your program will normally call
+     `bindtextdomain' (see *note Triggering::), like this:
 
           bindtextdomain (PACKAGE, LOCALEDIR);
           textdomain (PACKAGE);
 
      To make LOCALEDIR known to the program, add the following lines to
-     ‘Makefile.in’ if you are using Autoconf version 2.60 or newer:
+     `Makefile.in' if you are using Autoconf version 2.60 or newer:
 
           datadir = @datadir@
           datarootdir= @datarootdir@
@@ -10097,34 +10087,35 @@
           localedir = $(datadir)/locale
           DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
-     Note that ‘@datadir@’ defaults to ‘$(prefix)/share’, thus
-     ‘$(localedir)’ defaults to ‘$(prefix)/share/locale’.
+     Note that `@datadir@' defaults to `$(prefix)/share', thus
+     `$(localedir)' defaults to `$(prefix)/share/locale'.
 
-  5. You should ensure that the final linking will use ‘@LIBINTL@’ or
-     ‘@LTLIBINTL@’ as a library.  ‘@LIBINTL@’ is for use without
-     ‘libtool’, ‘@LTLIBINTL@’ is for use with ‘libtool’.  An easy way to
-     achieve this is to manage that it gets into ‘LIBS’, like this:
+  5. You should ensure that the final linking will use `@LIBINTL@' or
+     `@LTLIBINTL@' as a library.  `@LIBINTL@' is for use without
+     `libtool', `@LTLIBINTL@' is for use with `libtool'.  An easy way
+     to achieve this is to manage that it gets into `LIBS', like this:
 
           LIBS = @LIBINTL@ @LIBS@
 
-     In most packages internationalized with GNU ‘gettext’, one will
-     find a directory ‘lib/’ in which a library containing some helper
+     In most packages internationalized with GNU `gettext', one will
+     find a directory `lib/' in which a library containing some helper
      functions will be build.  (You need at least the few functions
-     which the GNU ‘gettext’ Library itself needs.)  However some of the
-     functions in the ‘lib/’ also give messages to the user which of
-     course should be translated, too.  Taking care of this, the support
-     library (say ‘libsupport.a’) should be placed before ‘@LIBINTL@’
-     and ‘@LIBS@’ in the above example.  So one has to write this:
+     which the GNU `gettext' Library itself needs.)  However some of
+     the functions in the `lib/' also give messages to the user which
+     of course should be translated, too.  Taking care of this, the
+     support library (say `libsupport.a') should be placed before
+     `@LIBINTL@' and `@LIBS@' in the above example.  So one has to
+     write this:
 
           LIBS = ../lib/libsupport.a @LIBINTL@ @LIBS@
 
-  6. You should also ensure that directory ‘intl/’ will be searched for
+  6. You should also ensure that directory `intl/' will be searched for
      C preprocessor include files in all circumstances.  So, you have to
-     manage so both ‘-I../intl’ and ‘-I$(top_srcdir)/intl’ will be given
-     to the C compiler.
+     manage so both `-I../intl' and `-I$(top_srcdir)/intl' will be
+     given to the C compiler.
 
-  7. Your ‘dist:’ goal has to conform with others.  Here is a reasonable
-     definition for it:
+  7. Your `dist:' goal has to conform with others.  Here is a
+     reasonable definition for it:
 
           distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
           dist: Makefile $(DISTFILES)
@@ -10132,13 +10123,14 @@
           	  ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir) || exit 1; \
           	done
 
-   Note that if you are using GNU ‘automake’, ‘Makefile.in’ is
-automatically generated from ‘Makefile.am’, and the first three changes
+
+   Note that if you are using GNU `automake', `Makefile.in' is
+automatically generated from `Makefile.am', and the first three changes
 and the last change are not necessary.  The remaining needed
-‘Makefile.am’ modifications are the following:
+`Makefile.am' modifications are the following:
 
   1. To make LOCALEDIR known to the program, add the following to
-     ‘Makefile.am’:
+     `Makefile.am':
 
           <module>_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 
@@ -10147,13 +10139,13 @@
           AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 
      for all modules and compilation units together.  Furthermore, if
-     you are using an Autoconf version older then 2.60, add this line to
-     define ‘localedir’:
+     you are using an Autoconf version older then 2.60, add this line
+     to define `localedir':
 
           localedir = $(datadir)/locale
 
-  2. To ensure that the final linking will use ‘@LIBINTL@’ or
-     ‘@LTLIBINTL@’ as a library, add the following to ‘Makefile.am’:
+  2. To ensure that the final linking will use `@LIBINTL@' or
+     `@LTLIBINTL@' as a library, add the following to `Makefile.am':
 
           <program>_LDADD = @LIBINTL@
 
@@ -10161,53 +10153,54 @@
 
           LDADD = @LIBINTL@
 
-     for all programs together.  Remember that when you use ‘libtool’ to
-     link a program, you need to use @LTLIBINTL@ instead of @LIBINTL@
+     for all programs together.  Remember that when you use `libtool'
+     to link a program, you need to use @LTLIBINTL@ instead of @LIBINTL@
      for that program.
 
-  3. If you have an ‘intl/’ directory, whose contents is created by
-     ‘gettextize’, then to ensure that it will be searched for C
+  3. If you have an `intl/' directory, whose contents is created by
+     `gettextize', then to ensure that it will be searched for C
      preprocessor include files in all circumstances, add something like
-     this to ‘Makefile.am’:
+     this to `Makefile.am':
 
           AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl
 
+
 
 File: gettext.info,  Node: lib/gettext.h,  Prev: src/Makefile,  Up: Adjusting Files
 
-13.4.13 ‘gettext.h’ in ‘lib/’
+13.4.13 `gettext.h' in `lib/'
 -----------------------------
 
-   Internationalization of packages, as provided by GNU ‘gettext’, is
+   Internationalization of packages, as provided by GNU `gettext', is
 optional.  It can be turned off in two situations:
 
-   • When the installer has specified ‘./configure --disable-nls’.  This
-     can be useful when small binaries are more important than features,
-     for example when building utilities for boot diskettes.  It can
-     also be useful in order to get some specific C compiler warnings
-     about code quality with some older versions of GCC (older than
-     3.0).
+   * When the installer has specified `./configure --disable-nls'.  This
+     can be useful when small binaries are more important than
+     features, for example when building utilities for boot diskettes.
+     It can also be useful in order to get some specific C compiler
+     warnings about code quality with some older versions of GCC (older
+     than 3.0).
 
-   • When the package does not include the ‘intl/’ subdirectory, and the
+   * When the package does not include the `intl/' subdirectory, and the
      libintl.h header (with its associated libintl library, if any) is
      not already installed on the system, it is preferable that the
-     package builds without internationalization support, rather than to
-     give a compilation error.
+     package builds without internationalization support, rather than
+     to give a compilation error.
 
    A C preprocessor macro can be used to detect these two cases.
-Usually, when ‘libintl.h’ was found and not explicitly disabled, the
-‘ENABLE_NLS’ macro will be defined to 1 in the autoconf generated
-configuration file (usually called ‘config.h’).  In the two negative
+Usually, when `libintl.h' was found and not explicitly disabled, the
+`ENABLE_NLS' macro will be defined to 1 in the autoconf generated
+configuration file (usually called `config.h').  In the two negative
 situations, however, this macro will not be defined, thus it will
 evaluate to 0 in C preprocessor expressions.
 
-   ‘gettext.h’ is a convenience header file for conditional use of
-‘<libintl.h>’, depending on the ‘ENABLE_NLS’ macro.  If ‘ENABLE_NLS’ is
-set, it includes ‘<libintl.h>’; otherwise it defines no-op substitutes
-for the libintl.h functions.  We recommend the use of ‘"gettext.h"’ over
-direct use of ‘<libintl.h>’, so that portability to older systems is
-guaranteed and installers can turn off internationalization if they want
-to.  In the C code, you will then write
+   `gettext.h' is a convenience header file for conditional use of
+`<libintl.h>', depending on the `ENABLE_NLS' macro.  If `ENABLE_NLS' is
+set, it includes `<libintl.h>'; otherwise it defines no-op substitutes
+for the libintl.h functions.  We recommend the use of `"gettext.h"'
+over direct use of `<libintl.h>', so that portability to older systems
+is guaranteed and installers can turn off internationalization if they
+want to.  In the C code, you will then write
 
      #include "gettext.h"
 
@@ -10215,159 +10208,160 @@
 
      #include <libintl.h>
 
-   The location of ‘gettext.h’ is usually in a directory containing
+   The location of `gettext.h' is usually in a directory containing
 auxiliary include files.  In many GNU packages, there is a directory
-‘lib/’ containing helper functions; ‘gettext.h’ fits there.  In other
-packages, it can go into the ‘src’ directory.
+`lib/' containing helper functions; `gettext.h' fits there.  In other
+packages, it can go into the `src' directory.
 
-   Do not install the ‘gettext.h’ file in public locations.  Every
+   Do not install the `gettext.h' file in public locations.  Every
 package that needs it should contain a copy of it on its own.
 
 
-File: gettext.info,  Node: autoconf macros,  Next: Version Control Issues,  Prev: Adjusting Files,  Up: Maintainers
+File: gettext.info,  Node: autoconf macros,  Next: CVS Issues,  Prev: Adjusting Files,  Up: Maintainers
 
-13.5 Autoconf macros for use in ‘configure.ac’
+13.5 Autoconf macros for use in `configure.ac'
 ==============================================
 
-   GNU ‘gettext’ installs macros for use in a package’s ‘configure.ac’
-or ‘configure.in’.  *Note Introduction: (autoconf)Top.  The primary
-macro is, of course, ‘AM_GNU_GETTEXT’.
+   GNU `gettext' installs macros for use in a package's `configure.ac'
+or `configure.in'.  *Note Introduction: (autoconf)Top.  The primary
+macro is, of course, `AM_GNU_GETTEXT'.
 
 * Menu:
 
-* AM_GNU_GETTEXT::              AM_GNU_GETTEXT in ‘gettext.m4’
-* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in ‘gettext.m4’
-* AM_GNU_GETTEXT_NEED::         AM_GNU_GETTEXT_NEED in ‘gettext.m4’
-* AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in ‘intldir.m4’
-* AM_PO_SUBDIRS::               AM_PO_SUBDIRS in ‘po.m4’
-* AM_XGETTEXT_OPTION::          AM_XGETTEXT_OPTION in ‘po.m4’
-* AM_ICONV::                    AM_ICONV in ‘iconv.m4’
+* AM_GNU_GETTEXT::              AM_GNU_GETTEXT in `gettext.m4'
+* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in `gettext.m4'
+* AM_GNU_GETTEXT_NEED::         AM_GNU_GETTEXT_NEED in `gettext.m4'
+* AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4'
+* AM_PO_SUBDIRS::               AM_PO_SUBDIRS in `po.m4'
+* AM_XGETTEXT_OPTION::          AM_XGETTEXT_OPTION in `po.m4'
+* AM_ICONV::                    AM_ICONV in `iconv.m4'
 
 
 File: gettext.info,  Node: AM_GNU_GETTEXT,  Next: AM_GNU_GETTEXT_VERSION,  Prev: autoconf macros,  Up: autoconf macros
 
-13.5.1 AM_GNU_GETTEXT in ‘gettext.m4’
+13.5.1 AM_GNU_GETTEXT in `gettext.m4'
 -------------------------------------
 
-   The ‘AM_GNU_GETTEXT’ macro tests for the presence of the GNU gettext
-function family in either the C library or a separate ‘libintl’ library
-(shared or static libraries are both supported) or in the package’s
-‘intl/’ directory.  It also invokes ‘AM_PO_SUBDIRS’, thus preparing the
-‘po/’ directories of the package for building.
+   The `AM_GNU_GETTEXT' macro tests for the presence of the GNU gettext
+function family in either the C library or a separate `libintl' library
+(shared or static libraries are both supported) or in the package's
+`intl/' directory.  It also invokes `AM_PO_SUBDIRS', thus preparing the
+`po/' directories of the package for building.
 
-   ‘AM_GNU_GETTEXT’ accepts up to three optional arguments.  The general
+   `AM_GNU_GETTEXT' accepts up to three optional arguments.  The general
 syntax is
 
      AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR])
 
-   INTLSYMBOL can be ‘external’ or ‘no-libtool’.  The default (if it is
-not specified or empty) is ‘no-libtool’.  INTLSYMBOL should be
-‘external’ for packages with no ‘intl/’ directory.  For packages with an
-‘intl/’ directory, you can either use an INTLSYMBOL equal to
-‘no-libtool’, or you can use ‘external’ and override by using the macro
-‘AM_GNU_GETTEXT_INTL_SUBDIR’ elsewhere.  The two ways to specify the
-existence of an ‘intl/’ directory are equivalent.  At build time, a
-static library ‘$(top_builddir)/intl/libintl.a’ will then be created.
+   INTLSYMBOL can be `external' or `no-libtool'.  The default (if it is
+not specified or empty) is `no-libtool'.  INTLSYMBOL should be
+`external' for packages with no `intl/' directory.  For packages with
+an `intl/' directory, you can either use an INTLSYMBOL equal to
+`no-libtool', or you can use `external' and override by using the macro
+`AM_GNU_GETTEXT_INTL_SUBDIR' elsewhere.  The two ways to specify the
+existence of an `intl/' directory are equivalent.  At build time, a
+static library `$(top_builddir)/intl/libintl.a' will then be created.
 
-   If NEEDSYMBOL is specified and is ‘need-ngettext’, then GNU gettext
-implementations (in libc or libintl) without the ‘ngettext()’ function
+   If NEEDSYMBOL is specified and is `need-ngettext', then GNU gettext
+implementations (in libc or libintl) without the `ngettext()' function
 will be ignored.  If NEEDSYMBOL is specified and is
-‘need-formatstring-macros’, then GNU gettext implementations that don’t
-support the ISO C 99 ‘<inttypes.h>’ formatstring macros will be ignored.
+`need-formatstring-macros', then GNU gettext implementations that don't
+support the ISO C 99 `<inttypes.h>' formatstring macros will be ignored.
 Only one NEEDSYMBOL can be specified.  These requirements can also be
-specified by using the macro ‘AM_GNU_GETTEXT_NEED’ elsewhere.  To
+specified by using the macro `AM_GNU_GETTEXT_NEED' elsewhere.  To
 specify more than one requirement, just specify the strongest one among
-them, or invoke the ‘AM_GNU_GETTEXT_NEED’ macro several times.  The
+them, or invoke the `AM_GNU_GETTEXT_NEED' macro several times.  The
 hierarchy among the various alternatives is as follows:
-‘need-formatstring-macros’ implies ‘need-ngettext’.
+`need-formatstring-macros' implies `need-ngettext'.
 
    INTLDIR is used to find the intl libraries.  If empty, the value
-‘$(top_builddir)/intl/’ is used.
+`$(top_builddir)/intl/' is used.
 
-   The ‘AM_GNU_GETTEXT’ macro determines whether GNU gettext is
-available and should be used.  If so, it sets the ‘USE_NLS’ variable to
-‘yes’; it defines ‘ENABLE_NLS’ to 1 in the autoconf generated
-configuration file (usually called ‘config.h’); it sets the variables
-‘LIBINTL’ and ‘LTLIBINTL’ to the linker options for use in a Makefile
-(‘LIBINTL’ for use without libtool, ‘LTLIBINTL’ for use with libtool);
-it adds an ‘-I’ option to ‘CPPFLAGS’ if necessary.  In the negative
-case, it sets ‘USE_NLS’ to ‘no’; it sets ‘LIBINTL’ and ‘LTLIBINTL’ to
-empty and doesn’t change ‘CPPFLAGS’.
-
-   The complexities that ‘AM_GNU_GETTEXT’ deals with are the following:
-
-   • Some operating systems have ‘gettext’ in the C library, for example
-     glibc.  Some have it in a separate library ‘libintl’.  GNU
-     ‘libintl’ might have been installed as part of the GNU ‘gettext’
+   The `AM_GNU_GETTEXT' macro determines whether GNU gettext is
+available and should be used.  If so, it sets the `USE_NLS' variable to
+`yes'; it defines `ENABLE_NLS' to 1 in the autoconf generated
+configuration file (usually called `config.h'); it sets the variables
+`LIBINTL' and `LTLIBINTL' to the linker options for use in a Makefile
+(`LIBINTL' for use without libtool, `LTLIBINTL' for use with libtool);
+it adds an `-I' option to `CPPFLAGS' if necessary.  In the negative
+case, it sets `USE_NLS' to `no'; it sets `LIBINTL' and `LTLIBINTL' to
+empty and doesn't change `CPPFLAGS'.
+
+   The complexities that `AM_GNU_GETTEXT' deals with are the following:
+
+   * Some operating systems have `gettext' in the C library, for example
+     glibc.  Some have it in a separate library `libintl'.  GNU
+     `libintl' might have been installed as part of the GNU `gettext'
      package.
 
-   • GNU ‘libintl’, if installed, is not necessarily already in the
-     search path (‘CPPFLAGS’ for the include file search path, ‘LDFLAGS’
-     for the library search path).
-
-   • Except for glibc, the operating system’s native ‘gettext’ cannot
-     exploit the GNU mo files, doesn’t have the necessary locale
-     dependency features, and cannot convert messages from the catalog’s
-     text encoding to the user’s locale encoding.
+   * GNU `libintl', if installed, is not necessarily already in the
+     search path (`CPPFLAGS' for the include file search path,
+     `LDFLAGS' for the library search path).
+
+   * Except for glibc, the operating system's native `gettext' cannot
+     exploit the GNU mo files, doesn't have the necessary locale
+     dependency features, and cannot convert messages from the
+     catalog's text encoding to the user's locale encoding.
 
-   • GNU ‘libintl’, if installed, is not necessarily already in the run
+   * GNU `libintl', if installed, is not necessarily already in the run
      time library search path.  To avoid the need for setting an
-     environment variable like ‘LD_LIBRARY_PATH’, the macro adds the
-     appropriate run time search path options to the ‘LIBINTL’ and
-     ‘LTLIBINTL’ variables.  This works on most systems, but not on some
-     operating systems with limited shared library support, like SCO.
+     environment variable like `LD_LIBRARY_PATH', the macro adds the
+     appropriate run time search path options to the `LIBINTL' and
+     `LTLIBINTL' variables.  This works on most systems, but not on
+     some operating systems with limited shared library support, like
+     SCO.
 
-   • GNU ‘libintl’ relies on POSIX/XSI ‘iconv’.  The macro checks for
+   * GNU `libintl' relies on POSIX/XSI `iconv'.  The macro checks for
      linker options needed to use iconv and appends them to the
-     ‘LIBINTL’ and ‘LTLIBINTL’ variables.
+     `LIBINTL' and `LTLIBINTL' variables.
 
 
 File: gettext.info,  Node: AM_GNU_GETTEXT_VERSION,  Next: AM_GNU_GETTEXT_NEED,  Prev: AM_GNU_GETTEXT,  Up: autoconf macros
 
-13.5.2 AM_GNU_GETTEXT_VERSION in ‘gettext.m4’
+13.5.2 AM_GNU_GETTEXT_VERSION in `gettext.m4'
 ---------------------------------------------
 
-   The ‘AM_GNU_GETTEXT_VERSION’ macro declares the version number of the
-GNU gettext infrastructure that is used by the package.
+   The `AM_GNU_GETTEXT_VERSION' macro declares the version number of
+the GNU gettext infrastructure that is used by the package.
 
-   The use of this macro is optional; only the ‘autopoint’ program makes
-use of it (*note Version Control Issues::).
+   The use of this macro is optional; only the `autopoint' program makes
+use of it (*note CVS Issues::).
 
 
 File: gettext.info,  Node: AM_GNU_GETTEXT_NEED,  Next: AM_GNU_GETTEXT_INTL_SUBDIR,  Prev: AM_GNU_GETTEXT_VERSION,  Up: autoconf macros
 
-13.5.3 AM_GNU_GETTEXT_NEED in ‘gettext.m4’
+13.5.3 AM_GNU_GETTEXT_NEED in `gettext.m4'
 ------------------------------------------
 
-   The ‘AM_GNU_GETTEXT_NEED’ macro declares a constraint regarding the
+   The `AM_GNU_GETTEXT_NEED' macro declares a constraint regarding the
 GNU gettext implementation.  The syntax is
 
      AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
 
-   If NEEDSYMBOL is ‘need-ngettext’, then GNU gettext implementations
-(in libc or libintl) without the ‘ngettext()’ function will be ignored.
-If NEEDSYMBOL is ‘need-formatstring-macros’, then GNU gettext
-implementations that don’t support the ISO C 99 ‘<inttypes.h>’
+   If NEEDSYMBOL is `need-ngettext', then GNU gettext implementations
+(in libc or libintl) without the `ngettext()' function will be ignored.
+If NEEDSYMBOL is `need-formatstring-macros', then GNU gettext
+implementations that don't support the ISO C 99 `<inttypes.h>'
 formatstring macros will be ignored.
 
-   The optional second argument of ‘AM_GNU_GETTEXT’ is also taken into
+   The optional second argument of `AM_GNU_GETTEXT' is also taken into
 account.
 
-   The ‘AM_GNU_GETTEXT_NEED’ invocations can occur before or after the
-‘AM_GNU_GETTEXT’ invocation; the order doesn’t matter.
+   The `AM_GNU_GETTEXT_NEED' invocations can occur before or after the
+`AM_GNU_GETTEXT' invocation; the order doesn't matter.
 
 
 File: gettext.info,  Node: AM_GNU_GETTEXT_INTL_SUBDIR,  Next: AM_PO_SUBDIRS,  Prev: AM_GNU_GETTEXT_NEED,  Up: autoconf macros
 
-13.5.4 AM_GNU_GETTEXT_INTL_SUBDIR in ‘intldir.m4’
+13.5.4 AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4'
 -------------------------------------------------
 
-   The ‘AM_GNU_GETTEXT_INTL_SUBDIR’ macro specifies that the
-‘AM_GNU_GETTEXT’ macro, although invoked with the first argument
-‘external’, should also prepare for building the ‘intl/’ subdirectory.
+   The `AM_GNU_GETTEXT_INTL_SUBDIR' macro specifies that the
+`AM_GNU_GETTEXT' macro, although invoked with the first argument
+`external', should also prepare for building the `intl/' subdirectory.
 
-   The ‘AM_GNU_GETTEXT_INTL_SUBDIR’ invocation can occur before or after
-the ‘AM_GNU_GETTEXT’ invocation; the order doesn’t matter.
+   The `AM_GNU_GETTEXT_INTL_SUBDIR' invocation can occur before or after
+the `AM_GNU_GETTEXT' invocation; the order doesn't matter.
 
    The use of this macro requires GNU automake 1.10 or newer and GNU
 autoconf 2.61 or newer.
@@ -10375,153 +10369,152 @@
 
 File: gettext.info,  Node: AM_PO_SUBDIRS,  Next: AM_XGETTEXT_OPTION,  Prev: AM_GNU_GETTEXT_INTL_SUBDIR,  Up: autoconf macros
 
-13.5.5 AM_PO_SUBDIRS in ‘po.m4’
+13.5.5 AM_PO_SUBDIRS in `po.m4'
 -------------------------------
 
-   The ‘AM_PO_SUBDIRS’ macro prepares the ‘po/’ directories of the
+   The `AM_PO_SUBDIRS' macro prepares the `po/' directories of the
 package for building.  This macro should be used in internationalized
 programs written in other programming languages than C, C++, Objective
-C, for example ‘sh’, ‘Python’, ‘Lisp’.  See *note Programming
+C, for example `sh', `Python', `Lisp'.  See *note Programming
 Languages:: for a list of programming languages that support
 localization through PO files.
 
-   The ‘AM_PO_SUBDIRS’ macro determines whether internationalization
-should be used.  If so, it sets the ‘USE_NLS’ variable to ‘yes’,
-otherwise to ‘no’.  It also determines the right values for Makefile
-variables in each ‘po/’ directory.
+   The `AM_PO_SUBDIRS' macro determines whether internationalization
+should be used.  If so, it sets the `USE_NLS' variable to `yes',
+otherwise to `no'.  It also determines the right values for Makefile
+variables in each `po/' directory.
 
 
 File: gettext.info,  Node: AM_XGETTEXT_OPTION,  Next: AM_ICONV,  Prev: AM_PO_SUBDIRS,  Up: autoconf macros
 
-13.5.6 AM_XGETTEXT_OPTION in ‘po.m4’
+13.5.6 AM_XGETTEXT_OPTION in `po.m4'
 ------------------------------------
 
-   The ‘AM_XGETTEXT_OPTION’ macro registers a command-line option to be
-used in the invocations of ‘xgettext’ in the ‘po/’ directories of the
+   The `AM_XGETTEXT_OPTION' macro registers a command-line option to be
+used in the invocations of `xgettext' in the `po/' directories of the
 package.
 
    For example, if you have a source file that defines a function
-‘error_at_line’ whose fifth argument is a format string, you can use
+`error_at_line' whose fifth argument is a format string, you can use
      AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])
-to instruct ‘xgettext’ to mark all translatable strings in ‘gettext’
-invocations that occur as fifth argument to this function as ‘c-format’.
+   to instruct `xgettext' to mark all translatable strings in `gettext'
+invocations that occur as fifth argument to this function as `c-format'.
 
    See *note xgettext Invocation:: for the list of options that
-‘xgettext’ accepts.
+`xgettext' accepts.
 
    The use of this macro is an alternative to the use of the
-‘XGETTEXT_OPTIONS’ variable in ‘po/Makevars’.
+`XGETTEXT_OPTIONS' variable in `po/Makevars'.
 
 
 File: gettext.info,  Node: AM_ICONV,  Prev: AM_XGETTEXT_OPTION,  Up: autoconf macros
 
-13.5.7 AM_ICONV in ‘iconv.m4’
+13.5.7 AM_ICONV in `iconv.m4'
 -----------------------------
 
-   The ‘AM_ICONV’ macro tests for the presence of the POSIX/XSI ‘iconv’
-function family in either the C library or a separate ‘libiconv’
-library.  If found, it sets the ‘am_cv_func_iconv’ variable to ‘yes’; it
-defines ‘HAVE_ICONV’ to 1 in the autoconf generated configuration file
-(usually called ‘config.h’); it defines ‘ICONV_CONST’ to ‘const’ or to
-empty, depending on whether the second argument of ‘iconv()’ is of type
-‘const char **’ or ‘char **’; it sets the variables ‘LIBICONV’ and
-‘LTLIBICONV’ to the linker options for use in a Makefile (‘LIBICONV’ for
-use without libtool, ‘LTLIBICONV’ for use with libtool); it adds an ‘-I’
-option to ‘CPPFLAGS’ if necessary.  If not found, it sets ‘LIBICONV’ and
-‘LTLIBICONV’ to empty and doesn’t change ‘CPPFLAGS’.
-
-   The complexities that ‘AM_ICONV’ deals with are the following:
-
-   • Some operating systems have ‘iconv’ in the C library, for example
-     glibc.  Some have it in a separate library ‘libiconv’, for example
-     OSF/1 or FreeBSD. Regardless of the operating system, GNU
-     ‘libiconv’ might have been installed.  In that case, it should be
-     used instead of the operating system’s native ‘iconv’.
-
-   • GNU ‘libiconv’, if installed, is not necessarily already in the
-     search path (‘CPPFLAGS’ for the include file search path, ‘LDFLAGS’
-     for the library search path).
-
-   • GNU ‘libiconv’ is binary incompatible with some operating system’s
-     native ‘iconv’, for example on FreeBSD. Use of an ‘iconv.h’ and
-     ‘libiconv.so’ that don’t fit together would produce program
+   The `AM_ICONV' macro tests for the presence of the POSIX/XSI `iconv'
+function family in either the C library or a separate `libiconv'
+library.  If found, it sets the `am_cv_func_iconv' variable to `yes';
+it defines `HAVE_ICONV' to 1 in the autoconf generated configuration
+file (usually called `config.h'); it defines `ICONV_CONST' to `const'
+or to empty, depending on whether the second argument of `iconv()' is
+of type `const char **' or `char **'; it sets the variables `LIBICONV'
+and `LTLIBICONV' to the linker options for use in a Makefile
+(`LIBICONV' for use without libtool, `LTLIBICONV' for use with
+libtool); it adds an `-I' option to `CPPFLAGS' if necessary.  If not
+found, it sets `LIBICONV' and `LTLIBICONV' to empty and doesn't change
+`CPPFLAGS'.
+
+   The complexities that `AM_ICONV' deals with are the following:
+
+   * Some operating systems have `iconv' in the C library, for example
+     glibc.  Some have it in a separate library `libiconv', for example
+     OSF/1 or FreeBSD.  Regardless of the operating system, GNU
+     `libiconv' might have been installed.  In that case, it should be
+     used instead of the operating system's native `iconv'.
+
+   * GNU `libiconv', if installed, is not necessarily already in the
+     search path (`CPPFLAGS' for the include file search path,
+     `LDFLAGS' for the library search path).
+
+   * GNU `libiconv' is binary incompatible with some operating system's
+     native `iconv', for example on FreeBSD.  Use of an `iconv.h' and
+     `libiconv.so' that don't fit together would produce program
      crashes.
 
-   • GNU ‘libiconv’, if installed, is not necessarily already in the run
-     time library search path.  To avoid the need for setting an
-     environment variable like ‘LD_LIBRARY_PATH’, the macro adds the
-     appropriate run time search path options to the ‘LIBICONV’
+   * GNU `libiconv', if installed, is not necessarily already in the
+     run time library search path.  To avoid the need for setting an
+     environment variable like `LD_LIBRARY_PATH', the macro adds the
+     appropriate run time search path options to the `LIBICONV'
      variable.  This works on most systems, but not on some operating
      systems with limited shared library support, like SCO.
 
-   ‘iconv.m4’ is distributed with the GNU gettext package because
-‘gettext.m4’ relies on it.
+   `iconv.m4' is distributed with the GNU gettext package because
+`gettext.m4' relies on it.
 
 
-File: gettext.info,  Node: Version Control Issues,  Next: Release Management,  Prev: autoconf macros,  Up: Maintainers
+File: gettext.info,  Node: CVS Issues,  Next: Release Management,  Prev: autoconf macros,  Up: Maintainers
 
-13.6 Integrating with Version Control Systems
-=============================================
+13.6 Integrating with CVS
+=========================
 
-   Many projects use version control systems for distributed development
+   Many projects use CVS for distributed development, version control
 and source backup.  This section gives some advice how to manage the
-uses of ‘gettextize’, ‘autopoint’ and ‘autoconf’ on version controlled
-files.
+uses of `cvs', `gettextize', `autopoint' and `autoconf'.
 
 * Menu:
 
-* Distributed Development::     Avoiding version mismatch in distributed development
-* Files under Version Control::  Files to put under version control
-* Translations under Version Control::  Put PO Files under Version Control
-* autopoint Invocation::        Invoking the ‘autopoint’ Program
+* Distributed CVS::             Avoiding version mismatch in distributed development
+* Files under CVS::             Files to put under CVS version control
+* autopoint Invocation::        Invoking the `autopoint' Program
 
 
-File: gettext.info,  Node: Distributed Development,  Next: Files under Version Control,  Prev: Version Control Issues,  Up: Version Control Issues
+File: gettext.info,  Node: Distributed CVS,  Next: Files under CVS,  Prev: CVS Issues,  Up: CVS Issues
 
 13.6.1 Avoiding version mismatch in distributed development
 -----------------------------------------------------------
 
-   In a project development with multiple developers, there should be a
-single developer who occasionally - when there is desire to upgrade to a
-new ‘gettext’ version - runs ‘gettextize’ and performs the changes
-listed in *note Adjusting Files::, and then commits his changes to the
-repository.
+   In a project development with multiple developers, using CVS, there
+should be a single developer who occasionally - when there is desire to
+upgrade to a new `gettext' version - runs `gettextize' and performs the
+changes listed in *note Adjusting Files::, and then commits his changes
+to the CVS.
 
    It is highly recommended that all developers on a project use the
-same version of GNU ‘gettext’ in the package.  In other words, if a
-developer runs ‘gettextize’, he should go the whole way, make the
-necessary remaining changes and commit his changes to the repository.
+same version of GNU `gettext' in the package.  In other words, if a
+developer runs `gettextize', he should go the whole way, make the
+necessary remaining changes and commit his changes to the CVS.
 Otherwise the following damages will likely occur:
 
-   • Apparent version mismatch between developers.  Since some ‘gettext’
-     specific portions in ‘configure.ac’, ‘configure.in’ and
-     ‘Makefile.am’, ‘Makefile.in’ files depend on the ‘gettext’ version,
-     the use of infrastructure files belonging to different ‘gettext’
-     versions can easily lead to build errors.
+   * Apparent version mismatch between developers.  Since some `gettext'
+     specific portions in `configure.ac', `configure.in' and
+     `Makefile.am', `Makefile.in' files depend on the `gettext'
+     version, the use of infrastructure files belonging to different
+     `gettext' versions can easily lead to build errors.
 
-   • Hidden version mismatch.  Such version mismatch can also lead to
+   * Hidden version mismatch.  Such version mismatch can also lead to
      malfunctioning of the package, that may be undiscovered by the
      developers.  The worst case of hidden version mismatch is that
-     internationalization of the package doesn’t work at all.
+     internationalization of the package doesn't work at all.
 
-   • Release risks.  All developers implicitly perform constant testing
+   * Release risks.  All developers implicitly perform constant testing
      on a package.  This is important in the days and weeks before a
      release.  If the guy who makes the release tar files uses a
-     different version of GNU ‘gettext’ than the other developers, the
+     different version of GNU `gettext' than the other developers, the
      distribution will be less well tested than if all had been using
-     the same ‘gettext’ version.  For example, it is possible that a
+     the same `gettext' version.  For example, it is possible that a
      platform specific bug goes undiscovered due to this constellation.
 
 
-File: gettext.info,  Node: Files under Version Control,  Next: Translations under Version Control,  Prev: Distributed Development,  Up: Version Control Issues
+File: gettext.info,  Node: Files under CVS,  Next: autopoint Invocation,  Prev: Distributed CVS,  Up: CVS Issues
 
-13.6.2 Files to put under version control
------------------------------------------
+13.6.2 Files to put under CVS version control
+---------------------------------------------
 
    There are basically three ways to deal with generated files in the
-context of a version controlled repository, such as ‘configure’
-generated from ‘configure.ac’, ‘PARSER.c’ generated from ‘PARSER.y’, or
-‘po/Makefile.in.in’ autoinstalled by ‘gettextize’ or ‘autopoint’.
+context of a CVS repository, such as `configure' generated from
+`configure.ac', `PARSER.c' generated from `PARSER.y', or
+`po/Makefile.in.in' autoinstalled by `gettextize' or `autopoint'.
 
   1. All generated files are always committed into the repository.
 
@@ -10533,166 +10526,121 @@
    Each of these three approaches has different advantages and
 drawbacks.
 
-  1. The advantage is that anyone can check out the source at any moment
-     and gets a working build.  The drawbacks are: 1a.  It requires some
-     frequent "push" actions by the maintainers.  1b.  The repository
-     grows in size quite fast.
-
-  2. The advantage is that anyone can check out the source, and the
-     usual "./configure; make" will work.  The drawbacks are: 2a.  The
-     one who checks out the repository needs tools like GNU ‘automake’,
-     GNU ‘autoconf’, GNU ‘m4’ installed in his PATH; sometimes he even
-     needs particular versions of them.  2b.  When a release is made and
+  1. The advantage is that anyone can check out the CVS at any moment
+     and gets a working build.  The drawbacks are:  1a. It requires
+     some frequent "cvs commit" actions by the maintainers.  1b. The
+     repository grows in size quite fast.
+
+  2. The advantage is that anyone can check out the CVS, and the usual
+     "./configure; make" will work.  The drawbacks are:  2a. The one who
+     checks out the repository needs tools like GNU `automake', GNU
+     `autoconf', GNU `m4' installed in his PATH; sometimes he even
+     needs particular versions of them.  2b. When a release is made and
      a commit is made on the generated files, the other developers get
-     conflicts on the generated files when merging the local work back
-     to the repository.  Although these conflicts are easy to resolve,
-     they are annoying.
+     conflicts on the generated files after doing "cvs update".
+     Although these conflicts are easy to resolve, they are annoying.
 
   3. The advantage is less work for the maintainers.  The drawback is
-     that anyone who checks out the source not only needs tools like GNU
-     ‘automake’, GNU ‘autoconf’, GNU ‘m4’ installed in his PATH, but
+     that anyone who checks out the CVS not only needs tools like GNU
+     `automake', GNU `autoconf', GNU `m4' installed in his PATH, but
      also that he needs to perform a package specific pre-build step
      before being able to "./configure; make".
 
    For the first and second approach, all files modified or brought in
-by the occasional ‘gettextize’ invocation and update should be committed
-into the repository.
-
-   For the third approach, the maintainer can omit from 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.3)
-
-and adds to the package’s pre-build script an invocation of ‘autopoint’.
-For everyone who checks out the source, this ‘autopoint’ invocation will
-copy into the right place the ‘gettext’ infrastructure files that have
-been omitted from the repository.
-
-   The version number used as argument to ‘AM_GNU_GETTEXT_VERSION’ is
-the version of the ‘gettext’ infrastructure that the package wants to
-use.  It is also the minimum version number of the ‘autopoint’ program.
-So, if you write ‘AM_GNU_GETTEXT_VERSION(0.11.5)’ then the developers
-can have any version >= 0.11.5 installed; the package will work with the
-0.11.5 infrastructure in all developers’ builds.  When the maintainer
-then runs gettextize from, say, version 0.12.1 on the package, the
-occurrence of ‘AM_GNU_GETTEXT_VERSION(0.11.5)’ will be changed into
-‘AM_GNU_GETTEXT_VERSION(0.12.1)’, and all other developers that use the
-CVS will henceforth need to have GNU ‘gettext’ 0.12.1 or newer
-installed.
-
-
-File: gettext.info,  Node: Translations under Version Control,  Next: autopoint Invocation,  Prev: Files under Version Control,  Up: Version Control Issues
-
-13.6.3 Put PO Files under Version Control
------------------------------------------
-
-   Since translations are valuable assets as well as the source code, it
-would make sense to put them under version control.  The GNU gettext
-infrastructure supports two ways to deal with translations in the
-context of a version controlled repository.
-
-  1. Both POT file and PO files are committed into the repository.
-
-  2. Only PO files are committed into the repository.
-
-   If a POT file is absent when building, it will be generated by
-scanning the source files with ‘xgettext’, and then the PO files are
-regenerated as a dependency.  On the other hand, some maintainers want
-to keep the POT file unchanged during the development phase.  So, even
-if a POT file is present and older than the source code, it won’t be
-updated automatically.  You can manually update it with ‘make
-$(DOMAIN).pot-update’, and commit it at certain point.
-
-   Special advices for particular version control systems:
-
-   • Recent version control systems, Git for instance, ignore file’s
-     timestamp.  In that case, PO files can be accidentally updated even
-     if a POT file is not updated.  To prevent this, you can set
-     ‘PO_DEPENDS_ON_POT’ variable to ‘no’ in the ‘Makevars’ file and do
-     ‘make update-po’ manually.
-
-   • Location comments such as ‘#: lib/error.c:116’ are sometimes
-     annoying, since these comments are volatile and may introduce
-     unwanted change to the working copy when building.  To mitigate
-     this, you can decide to omit those comments from the PO files in
-     the repository.
-
-     This is possible with the ‘--no-location’ option of the ‘msgmerge’
-     command (1).  The drawback is that, if the location information is
-     needed, translators have to recover the location comments by
-     running ‘msgmerge’ again.
+by the occasional `gettextize' invocation and update should be
+committed into the CVS.
 
-   ---------- Footnotes ----------
-
-   (1) you can also use it through the ‘MSGMERGE_OPTIONS’ option from
-‘Makevars’
+   For the third approach, the maintainer can omit from the CVS
+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.18.1)
+
+and adds to the package's pre-build script an invocation of
+`autopoint'.  For everyone who checks out the CVS, this `autopoint'
+invocation will copy into the right place the `gettext' infrastructure
+files that have been omitted from the CVS.
+
+   The version number used as argument to `AM_GNU_GETTEXT_VERSION' is
+the version of the `gettext' infrastructure that the package wants to
+use.  It is also the minimum version number of the `autopoint' program.
+So, if you write `AM_GNU_GETTEXT_VERSION(0.11.5)' then the developers
+can have any version >= 0.11.5 installed; the package will work with
+the 0.11.5 infrastructure in all developers' builds.  When the
+maintainer then runs gettextize from, say, version 0.12.1 on the
+package, the occurrence of `AM_GNU_GETTEXT_VERSION(0.11.5)' will be
+changed into `AM_GNU_GETTEXT_VERSION(0.12.1)', and all other developers
+that use the CVS will henceforth need to have GNU `gettext' 0.12.1 or
+newer installed.
 
 
-File: gettext.info,  Node: autopoint Invocation,  Prev: Translations under Version Control,  Up: Version Control Issues
+File: gettext.info,  Node: autopoint Invocation,  Prev: Files under CVS,  Up: CVS Issues
 
-13.6.4 Invoking the ‘autopoint’ Program
+13.6.3 Invoking the `autopoint' Program
 ---------------------------------------
 
      autopoint [OPTION]...
 
-   The ‘autopoint’ program copies standard gettext infrastructure files
+   The `autopoint' program copies standard gettext infrastructure files
 into a source package.  It extracts from a macro call of the form
-‘AM_GNU_GETTEXT_VERSION(VERSION)’, found in the package’s ‘configure.in’
-or ‘configure.ac’ file, the gettext version used by the package, and
-copies the infrastructure files belonging to this version into the
-package.
+`AM_GNU_GETTEXT_VERSION(VERSION)', found in the package's
+`configure.in' or `configure.ac' file, the gettext version used by the
+package, and copies the infrastructure files belonging to this version
+into the package.
 
-13.6.4.1 Options
+13.6.3.1 Options
 ................
 
-‘-f’
-‘--force’
+`-f'
+`--force'
      Force overwriting of files that already exist.
 
-‘-n’
-‘--dry-run’
-     Print modifications but don’t perform them.  All file copying
-     actions that ‘autopoint’ would normally execute are inhibited and
+`-n'
+`--dry-run'
+     Print modifications but don't perform them.  All file copying
+     actions that `autopoint' would normally execute are inhibited and
      instead only listed on standard output.
 
-13.6.4.2 Informative output
+
+13.6.3.2 Informative output
 ...........................
 
-‘--help’
+`--help'
      Display this help and exit.
 
-‘--version’
+`--version'
      Output version information and exit.
 
-   ‘autopoint’ supports the GNU ‘gettext’ versions from 0.10.35 to the
-current one, 0.19.3.  In order to apply ‘autopoint’ to a package using a
-‘gettext’ version newer than 0.19.3, you need to install this same
-version of GNU ‘gettext’ at least.
-
-   In packages using GNU ‘automake’, an invocation of ‘autopoint’ should
-be followed by invocations of ‘aclocal’ and then ‘autoconf’ and
-‘autoheader’.  The reason is that ‘autopoint’ installs some autoconf
-macro files, which are used by ‘aclocal’ to create ‘aclocal.m4’, and the
-latter is used by ‘autoconf’ to create the package’s ‘configure’ script
-and by ‘autoheader’ to create the package’s ‘config.h.in’ include file
-template.
 
-   The name ‘autopoint’ is an abbreviation of ‘auto-po-intl-m4’; the
-tool copies or updates mostly files in the ‘po’, ‘intl’, ‘m4’
+   `autopoint' supports the GNU `gettext' versions from 0.10.35 to the
+current one, 0.18.1.  In order to apply `autopoint' to a package using
+a `gettext' version newer than 0.18.1, you need to install this same
+version of GNU `gettext' at least.
+
+   In packages using GNU `automake', an invocation of `autopoint'
+should be followed by invocations of `aclocal' and then `autoconf' and
+`autoheader'.  The reason is that `autopoint' installs some autoconf
+macro files, which are used by `aclocal' to create `aclocal.m4', and
+the latter is used by `autoconf' to create the package's `configure'
+script and by `autoheader' to create the package's `config.h.in'
+include file template.
+
+   The name `autopoint' is an abbreviation of `auto-po-intl-m4'; the
+tool copies or updates mostly files in the `po', `intl', `m4'
 directories.
 
 
-File: gettext.info,  Node: Release Management,  Prev: Version Control Issues,  Up: Maintainers
+File: gettext.info,  Node: Release Management,  Prev: CVS Issues,  Up: Maintainers
 
 13.7 Creating a Distribution Tarball
 ====================================
 
-   In projects that use GNU ‘automake’, the usual commands for creating
-a distribution tarball, ‘make dist’ or ‘make distcheck’, automatically
+   In projects that use GNU `automake', the usual commands for creating
+a distribution tarball, `make dist' or `make distcheck', automatically
 update the PO files as needed.
 
-   If GNU ‘automake’ is not used, the maintainer needs to perform this
+   If GNU `automake' is not used, the maintainer needs to perform this
 update before making a release:
 
      $ ./configure
@@ -10702,24 +10650,24 @@
 
 File: gettext.info,  Node: Installers,  Next: Programming Languages,  Prev: Maintainers,  Up: Top
 
-14 The Installer’s and Distributor’s View
+14 The Installer's and Distributor's View
 *****************************************
 
-   By default, packages fully using GNU ‘gettext’, internally, are
-installed in such a way as to allow translation of messages.  At
-_configuration_ time, those packages should automatically detect whether
-the underlying host system already provides the GNU ‘gettext’ functions.
-If not, the GNU ‘gettext’ library should be automatically prepared and
-used.  Installers may use special options at configuration time for
-changing this behavior.  The command ‘./configure
---with-included-gettext’ bypasses system ‘gettext’ to use the included
-GNU ‘gettext’ instead, while ‘./configure --disable-nls’ produces
+   By default, packages fully using GNU `gettext', internally, are
+installed in such a way that they to allow translation of messages.  At
+_configuration_ time, those packages should automatically detect
+whether the underlying host system already provides the GNU `gettext'
+functions.  If not, the GNU `gettext' library should be automatically
+prepared and used.  Installers may use special options at configuration
+time for changing this behavior.  The command `./configure
+--with-included-gettext' bypasses system `gettext' to use the included
+GNU `gettext' instead, while `./configure --disable-nls' produces
 programs totally unable to translate messages.
 
-   Internationalized packages have usually many ‘LL.po’ files.  Unless
+   Internationalized packages have usually many `LL.po' files.  Unless
 translations are disabled, all those available are installed together
-with the package.  However, the environment variable ‘LINGUAS’ may be
-set, prior to configuration, to limit the installed set.  ‘LINGUAS’
+with the package.  However, the environment variable `LINGUAS' may be
+set, prior to configuration, to limit the installed set.  `LINGUAS'
 should then contain a space separated list of two-letter codes, stating
 which languages are allowed.
 
@@ -10729,7 +10677,7 @@
 15 Other Programming Languages
 ******************************
 
-   While the presentation of ‘gettext’ focuses mostly on C and
+   While the presentation of `gettext' focuses mostly on C and
 implicitly applies to C++ as well, its scope is far broader than that:
 Many programming languages, scripting languages and other textual data
 like GUI resources or package descriptions can make use of the gettext
@@ -10737,64 +10685,64 @@
 
 * Menu:
 
-* Language Implementors::       The Language Implementor’s View
-* Programmers for other Languages::  The Programmer’s View
-* Translators for other Languages::  The Translator’s View
-* Maintainers for other Languages::  The Maintainer’s View
+* Language Implementors::       The Language Implementor's View
+* Programmers for other Languages::  The Programmer's View
+* Translators for other Languages::  The Translator's View
+* Maintainers for other Languages::  The Maintainer's View
 * List of Programming Languages::  Individual Programming Languages
 * List of Data Formats::        Internationalizable Data
 
 
 File: gettext.info,  Node: Language Implementors,  Next: Programmers for other Languages,  Prev: Programming Languages,  Up: Programming Languages
 
-15.1 The Language Implementor’s View
+15.1 The Language Implementor's View
 ====================================
 
    All programming and scripting languages that have the notion of
-strings are eligible to supporting ‘gettext’.  Supporting ‘gettext’
+strings are eligible to supporting `gettext'.  Supporting `gettext'
 means the following:
 
   1. You should add to the language a syntax for translatable strings.
-     In principle, a function call of ‘gettext’ would do, but a
+     In principle, a function call of `gettext' would do, but a
      shorthand syntax helps keeping the legibility of internationalized
-     programs.  For example, in C we use the syntax ‘_("string")’, and
-     in GNU awk we use the shorthand ‘_"string"’.
+     programs.  For example, in C we use the syntax `_("string")', and
+     in GNU awk we use the shorthand `_"string"'.
 
   2. You should arrange that evaluation of such a translatable string at
-     runtime calls the ‘gettext’ function, or performs equivalent
+     runtime calls the `gettext' function, or performs equivalent
      processing.
 
-  3. Similarly, you should make the functions ‘ngettext’, ‘dcgettext’,
-     ‘dcngettext’ available from within the language.  These functions
+  3. Similarly, you should make the functions `ngettext', `dcgettext',
+     `dcngettext' available from within the language.  These functions
      are less often used, but are nevertheless necessary for particular
-     purposes: ‘ngettext’ for correct plural handling, and ‘dcgettext’
-     and ‘dcngettext’ for obeying other locale-related environment
-     variables than ‘LC_MESSAGES’, such as ‘LC_TIME’ or ‘LC_MONETARY’.
-     For these latter functions, you need to make the ‘LC_*’ constants,
-     available in the C header ‘<locale.h>’, referenceable from within
+     purposes: `ngettext' for correct plural handling, and `dcgettext'
+     and `dcngettext' for obeying other locale-related environment
+     variables than `LC_MESSAGES', such as `LC_TIME' or `LC_MONETARY'.
+     For these latter functions, you need to make the `LC_*' constants,
+     available in the C header `<locale.h>', referenceable from within
      the language, usually either as enumeration values or as strings.
 
   4. You should allow the programmer to designate a message domain,
-     either by making the ‘textdomain’ function available from within
+     either by making the `textdomain' function available from within
      the language, or by introducing a magic variable called
-     ‘TEXTDOMAIN’.  Similarly, you should allow the programmer to
-     designate where to search for message catalogs, by providing access
-     to the ‘bindtextdomain’ function.
-
-  5. You should either perform a ‘setlocale (LC_ALL, "")’ call during
-     the startup of your language runtime, or allow the programmer to do
-     so.  Remember that gettext will act as a no-op if the ‘LC_MESSAGES’
-     and ‘LC_CTYPE’ locale categories are not both set.
+     `TEXTDOMAIN'.  Similarly, you should allow the programmer to
+     designate where to search for message catalogs, by providing
+     access to the `bindtextdomain' function.
+
+  5. You should either perform a `setlocale (LC_ALL, "")' call during
+     the startup of your language runtime, or allow the programmer to
+     do so.  Remember that gettext will act as a no-op if the
+     `LC_MESSAGES' and `LC_CTYPE' locale categories are not both set.
 
-  6. A programmer should have a way to extract translatable strings from
-     a program into a PO file.  The GNU ‘xgettext’ program is being
+  6. A programmer should have a way to extract translatable strings
+     from a program into a PO file.  The GNU `xgettext' program is being
      extended to support very different programming languages.  Please
-     contact the GNU ‘gettext’ maintainers to help them doing this.  If
-     the string extractor is best integrated into your language’s
-     parser, GNU ‘xgettext’ can function as a front end to your string
+     contact the GNU `gettext' maintainers to help them doing this.  If
+     the string extractor is best integrated into your language's
+     parser, GNU `xgettext' can function as a front end to your string
      extractor.
 
-  7. The language’s library should have a string formatting facility
+  7. The language's library should have a string formatting facility
      where the arguments of a format string are denoted by a positional
      number or a name.  This is needed because for some languages and
      some messages with more than one substitutable argument, the
@@ -10802,62 +10750,62 @@
      different order.  *Note c-format Flag::.
 
   8. If the language has more than one implementation, and not all of
-     the implementations use ‘gettext’, but the programs should be
+     the implementations use `gettext', but the programs should be
      portable across implementations, you should provide a no-i18n
      emulation, that makes the other implementations accept programs
      written for yours, without actually translating the strings.
 
   9. To help the programmer in the task of marking translatable strings,
      which is sometimes performed using the Emacs PO mode (*note
-     Marking::), you are welcome to contact the GNU ‘gettext’
+     Marking::), you are welcome to contact the GNU `gettext'
      maintainers, so they can add support for your language to
-     ‘po-mode.el’.
+     `po-mode.el'.
 
    On the implementation side, three approaches are possible, with
 different effects on portability and copyright:
 
-   • You may integrate the GNU ‘gettext’’s ‘intl/’ directory in your
+   * You may integrate the GNU `gettext''s `intl/' directory in your
      package, as described in *note Maintainers::.  This allows you to
      have internationalization on all kinds of platforms.  Note that
      when you then distribute your package, it legally falls under the
      GNU General Public License, and the GNU project will be glad about
      your contribution to the Free Software pool.
 
-   • You may link against GNU ‘gettext’ functions if they are found in
-     the C library.  For example, an autoconf test for ‘gettext()’ and
-     ‘ngettext()’ will detect this situation.  For the moment, this test
+   * You may link against GNU `gettext' functions if they are found in
+     the C library.  For example, an autoconf test for `gettext()' and
+     `ngettext()' will detect this situation.  For the moment, this test
      will succeed on GNU systems and not on other platforms.  No severe
      copyright restrictions apply.
 
-   • You may emulate or reimplement the GNU ‘gettext’ functionality.
+   * You may emulate or reimplement the GNU `gettext' functionality.
      This has the advantage of full portability and no copyright
      restrictions, but also the drawback that you have to reimplement
-     the GNU ‘gettext’ features (such as the ‘LANGUAGE’ environment
+     the GNU `gettext' features (such as the `LANGUAGE' environment
      variable, the locale aliases database, the automatic charset
      conversion, and plural handling).
 
 
 File: gettext.info,  Node: Programmers for other Languages,  Next: Translators for other Languages,  Prev: Language Implementors,  Up: Programming Languages
 
-15.2 The Programmer’s View
+15.2 The Programmer's View
 ==========================
 
    For the programmer, the general procedure is the same as for the C
 language.  The Emacs PO mode marking supports other languages, and the
-GNU ‘xgettext’ string extractor recognizes other languages based on the
-file extension or a command-line option.  In some languages, ‘setlocale’
-is not needed because it is already performed by the underlying language
-runtime.
+GNU `xgettext' string extractor recognizes other languages based on the
+file extension or a command-line option.  In some languages,
+`setlocale' is not needed because it is already performed by the
+underlying language runtime.
 
 
 File: gettext.info,  Node: Translators for other Languages,  Next: Maintainers for other Languages,  Prev: Programmers for other Languages,  Up: Programming Languages
 
-15.3 The Translator’s View
+15.3 The Translator's View
 ==========================
 
    The translator works exactly as in the C language case.  The only
 difference is that when translating format strings, she has to be aware
-of the language’s particular syntax for positional arguments in format
+of the language's particular syntax for positional arguments in format
 strings.
 
 * Menu:
@@ -10885,8 +10833,6 @@
 * qt-plural-format::            Qt Plural Format Strings
 * kde-format::                  KDE Format Strings
 * boost-format::                Boost Format Strings
-* lua-format::                  Lua Format Strings
-* javascript-format::           JavaScript Format Strings
 
 
 File: gettext.info,  Node: c-format,  Next: objc-format,  Prev: Translators for other Languages,  Up: Translators for other Languages
@@ -10896,10 +10842,10 @@
 
    C format strings are described in POSIX (IEEE P1003.1 2001), section
 XSH 3 fprintf(),
-<http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html>.
+`http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html'.
 See also the fprintf() manual page,
-<http://www.linuxvalley.it/encyclopedia/ldp/manpage/man3/printf.3.php>,
-<http://informatik.fh-wuerzburg.de/student/i510/man/printf.html>.
+`http://www.linuxvalley.it/encyclopedia/ldp/manpage/man3/printf.3.php',
+`http://informatik.fh-wuerzburg.de/student/i510/man/printf.html'.
 
    Although format strings with positions that reorder arguments, such
 as
@@ -10911,21 +10857,21 @@
      "'%s' has only %d bytes free."
 
 are a POSIX/XSI feature and not specified by ISO C 99, translators can
-rely on this reordering ability: On the few platforms where ‘printf()’,
-‘fprintf()’ etc.  don’t support this feature natively, ‘libintl.a’ or
-‘libintl.so’ provides replacement functions, and GNU ‘<libintl.h>’
+rely on this reordering ability: On the few platforms where `printf()',
+`fprintf()' etc. don't support this feature natively, `libintl.a' or
+`libintl.so' provides replacement functions, and GNU `<libintl.h>'
 activates these replacement functions automatically.
 
    As a special feature for Farsi (Persian) and maybe Arabic,
-translators can insert an ‘I’ flag into numeric format directives.  For
-example, the translation of ‘"%d"’ can be ‘"%Id"’.  The effect of this
-flag, on systems with GNU ‘libc’, is that in the output, the ASCII
-digits are replaced with the ‘outdigits’ defined in the ‘LC_CTYPE’
-locale category.  On other systems, the ‘gettext’ function removes this
+translators can insert an `I' flag into numeric format directives.  For
+example, the translation of `"%d"' can be `"%Id"'.  The effect of this
+flag, on systems with GNU `libc', is that in the output, the ASCII
+digits are replaced with the `outdigits' defined in the `LC_CTYPE'
+locale category.  On other systems, the `gettext' function removes this
 flag, so that it has no effect.
 
    Note that the programmer should _not_ put this flag into the
-untranslated string.  (Putting the ‘I’ format directive flag into an
+untranslated string.  (Putting the `I' format directive flag into an
 MSGID string would lead to undefined behaviour on platforms without
 glibc when NLS is disabled.)
 
@@ -10937,7 +10883,7 @@
 
    Objective C format strings are like C format strings.  They support
 an additional format directive: "%@", which when executed consumes an
-argument of type ‘Object *’.
+argument of type `Object *'.
 
 
 File: gettext.info,  Node: sh-format,  Next: python-format,  Prev: objc-format,  Up: Translators for other Languages
@@ -10945,13 +10891,13 @@
 15.3.3 Shell Format Strings
 ---------------------------
 
-   Shell format strings, as supported by GNU gettext and the ‘envsubst’
+   Shell format strings, as supported by GNU gettext and the `envsubst'
 program, are strings with references to shell variables in the form
-‘$VARIABLE’ or ‘${VARIABLE}’.  References of the form
-‘${VARIABLE-DEFAULT}’, ‘${VARIABLE:-DEFAULT}’, ‘${VARIABLE=DEFAULT}’,
-‘${VARIABLE:=DEFAULT}’, ‘${VARIABLE+REPLACEMENT}’,
-‘${VARIABLE:+REPLACEMENT}’, ‘${VARIABLE?IGNORED}’,
-‘${VARIABLE:?IGNORED}’, that would be valid inside shell scripts, are
+`$VARIABLE' or `${VARIABLE}'.  References of the form
+`${VARIABLE-DEFAULT}', `${VARIABLE:-DEFAULT}', `${VARIABLE=DEFAULT}',
+`${VARIABLE:=DEFAULT}', `${VARIABLE+REPLACEMENT}',
+`${VARIABLE:+REPLACEMENT}', `${VARIABLE?IGNORED}',
+`${VARIABLE:?IGNORED}', that would be valid inside shell scripts, are
 not supported.  The VARIABLE names must consist solely of alphanumeric
 or underscore ASCII characters, not start with a digit and be nonempty;
 otherwise such a variable reference is ignored.
@@ -10962,18 +10908,10 @@
 15.3.4 Python Format Strings
 ----------------------------
 
-   There are two kinds of format strings in Python: those acceptable to
-the Python built-in format operator ‘%’, labelled as ‘python-format’,
-and those acceptable to the ‘format’ method of the ‘str’ object.
-
-   Python ‘%’ format strings are described in Python Library reference /
-2. Built-in Types, Exceptions and Functions / 2.2. Built-in Types / 2.2.6. Sequence Types
-/ 2.2.6.2. String Formatting Operations.
-<http://www.python.org/doc/2.2.1/lib/typesseq-strings.html>.
-
-   Python brace format strings are described in
-PEP 3101 – Advanced String Formatting,
-<http://www.python.org/dev/peps/pep-3101/>.
+   Python format strings are described in Python Library reference /
+2. Built-in Types, Exceptions and Functions / 2.2. Built-in Types /
+2.2.6. Sequence Types / 2.2.6.2. String Formatting Operations.
+`http://www.python.org/doc/2.2.1/lib/typesseq-strings.html'.
 
 
 File: gettext.info,  Node: lisp-format,  Next: elisp-format,  Prev: python-format,  Up: Translators for other Languages
@@ -10983,7 +10921,7 @@
 
    Lisp format strings are described in the Common Lisp HyperSpec,
 chapter 22.3 Formatted Output,
-<http://www.lisp.org/HyperSpec/Body/sec_22-3.html>.
+`http://www.lisp.org/HyperSpec/Body/sec_22-3.html'.
 
 
 File: gettext.info,  Node: elisp-format,  Next: librep-format,  Prev: lisp-format,  Up: Translators for other Languages
@@ -10993,9 +10931,9 @@
 
    Emacs Lisp format strings are documented in the Emacs Lisp reference,
 section Formatting Strings,
-<http://www.gnu.org/manual/elisp-manual-21-2.8/html_chapter/elisp_4.html#SEC75>.
+`http://www.gnu.org/manual/elisp-manual-21-2.8/html_chapter/elisp_4.html#SEC75'.
 Note that as of version 21, XEmacs supports numbered argument
-specifications in format strings while FSF Emacs doesn’t.
+specifications in format strings while FSF Emacs doesn't.
 
 
 File: gettext.info,  Node: librep-format,  Next: scheme-format,  Prev: elisp-format,  Up: Translators for other Languages
@@ -11005,8 +10943,8 @@
 
    librep format strings are documented in the librep manual, section
 Formatted Output,
-<http://librep.sourceforge.net/librep-manual.html#Formatted%20Output>,
-<http://www.gwinnup.org/research/docs/librep.html#SEC122>.
+`http://librep.sourceforge.net/librep-manual.html#Formatted%20Output',
+`http://www.gwinnup.org/research/docs/librep.html#SEC122'.
 
 
 File: gettext.info,  Node: scheme-format,  Next: smalltalk-format,  Prev: librep-format,  Up: Translators for other Languages
@@ -11024,11 +10962,11 @@
 -------------------------------
 
    Smalltalk format strings are described in the GNU Smalltalk
-documentation, class ‘CharArray’, methods ‘bindWith:’ and
-‘bindWithArguments:’.
-<http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238>.
-In summary, a directive starts with ‘%’ and is followed by ‘%’ or a
-nonzero digit (‘1’ to ‘9’).
+documentation, class `CharArray', methods `bindWith:' and
+`bindWithArguments:'.
+`http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238'.
+In summary, a directive starts with `%' and is followed by `%' or a
+nonzero digit (`1' to `9').
 
 
 File: gettext.info,  Node: java-format,  Next: csharp-format,  Prev: smalltalk-format,  Up: Translators for other Languages
@@ -11037,10 +10975,10 @@
 ---------------------------
 
    Java format strings are described in the JDK documentation for class
-‘java.text.MessageFormat’,
-<http://java.sun.com/j2se/1.4/docs/api/java/text/MessageFormat.html>.
+`java.text.MessageFormat',
+`http://java.sun.com/j2se/1.4/docs/api/java/text/MessageFormat.html'.
 See also the ICU documentation
-<http://oss.software.ibm.com/icu/apiref/classMessageFormat.html>.
+`http://oss.software.ibm.com/icu/apiref/classMessageFormat.html'.
 
 
 File: gettext.info,  Node: csharp-format,  Next: awk-format,  Prev: java-format,  Up: Translators for other Languages
@@ -11049,8 +10987,8 @@
 -------------------------
 
    C# format strings are described in the .NET documentation for class
-‘System.String’ and in
-<http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguide/html/cpConFormattingOverview.asp>.
+`System.String' and in
+`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguide/html/cpConFormattingOverview.asp'.
 
 
 File: gettext.info,  Node: awk-format,  Next: object-pascal-format,  Prev: csharp-format,  Up: Translators for other Languages
@@ -11059,7 +10997,7 @@
 --------------------------
 
    awk format strings are described in the gawk documentation, section
-Printf, <http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf>.
+Printf, `http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf'.
 
 
 File: gettext.info,  Node: object-pascal-format,  Next: ycp-format,  Prev: awk-format,  Up: Translators for other Languages
@@ -11069,7 +11007,7 @@
 
    Object Pascal format strings are described in the documentation of
 the Free Pascal runtime library, section Format,
-<http://www.freepascal.org/docs-html/rtl/sysutils/format.html>.
+`http://www.freepascal.org/docs-html/rtl/sysutils/format.html'.
 
 
 File: gettext.info,  Node: ycp-format,  Next: tcl-format,  Prev: object-pascal-format,  Up: Translators for other Languages
@@ -11078,9 +11016,9 @@
 --------------------------
 
    YCP sformat strings are described in the libycp documentation
-<file:/usr/share/doc/packages/libycp/YCP-builtins.html>.  In summary, a
-directive starts with ‘%’ and is followed by ‘%’ or a nonzero digit (‘1’
-to ‘9’).
+`file:/usr/share/doc/packages/libycp/YCP-builtins.html'.  In summary, a
+directive starts with `%' and is followed by `%' or a nonzero digit
+(`1' to `9').
 
 
 File: gettext.info,  Node: tcl-format,  Next: perl-format,  Prev: ycp-format,  Up: Translators for other Languages
@@ -11088,8 +11026,8 @@
 15.3.15 Tcl Format Strings
 --------------------------
 
-   Tcl format strings are described in the ‘format.n’ manual page,
-<http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm>.
+   Tcl format strings are described in the `format.n' manual page,
+`http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm'.
 
 
 File: gettext.info,  Node: perl-format,  Next: php-format,  Prev: tcl-format,  Up: Translators for other Languages
@@ -11098,17 +11036,17 @@
 ---------------------------
 
    There are two kinds format strings in Perl: those acceptable to the
-Perl built-in function ‘printf’, labelled as ‘perl-format’, and those
-acceptable to the ‘libintl-perl’ function ‘__x’, labelled as
-‘perl-brace-format’.
+Perl built-in function `printf', labelled as `perl-format', and those
+acceptable to the `libintl-perl' function `__x', labelled as
+`perl-brace-format'.
 
-   Perl ‘printf’ format strings are described in the ‘sprintf’ section
-of ‘man perlfunc’.
+   Perl `printf' format strings are described in the `sprintf' section
+of `man perlfunc'.
 
    Perl brace format strings are described in the
-‘Locale::TextDomain(3pm)’ manual page of the CPAN package libintl-perl.
-In brief, Perl format uses placeholders put between braces (‘{’ and
-‘}’).  The placeholder must have the syntax of simple identifiers.
+`Locale::TextDomain(3pm)' manual page of the CPAN package libintl-perl.
+In brief, Perl format uses placeholders put between braces (`{' and
+`}').  The placeholder must have the syntax of simple identifiers.
 
 
 File: gettext.info,  Node: php-format,  Next: gcc-internal-format,  Prev: perl-format,  Up: Translators for other Languages
@@ -11117,8 +11055,8 @@
 --------------------------
 
    PHP format strings are described in the documentation of the PHP
-function ‘sprintf’, in ‘phpdoc/manual/function.sprintf.html’ or
-<http://www.php.net/manual/en/function.sprintf.php>.
+function `sprintf', in `phpdoc/manual/function.sprintf.html' or
+`http://www.php.net/manual/en/function.sprintf.php'.
 
 
 File: gettext.info,  Node: gcc-internal-format,  Next: gfc-internal-format,  Prev: php-format,  Up: Translators for other Languages
@@ -11127,17 +11065,17 @@
 -----------------------------------
 
    These format strings are used inside the GCC sources.  In such a
-format string, a directive starts with ‘%’, is optionally followed by a
-size specifier ‘l’, an optional flag ‘+’, another optional flag ‘#’, and
-is finished by a specifier: ‘%’ denotes a literal percent sign, ‘c’
-denotes a character, ‘s’ denotes a string, ‘i’ and ‘d’ denote an
-integer, ‘o’, ‘u’, ‘x’ denote an unsigned integer, ‘.*s’ denotes a
-string preceded by a width specification, ‘H’ denotes a ‘location_t *’
-pointer, ‘D’ denotes a general declaration, ‘F’ denotes a function
-declaration, ‘T’ denotes a type, ‘A’ denotes a function argument, ‘C’
-denotes a tree code, ‘E’ denotes an expression, ‘L’ denotes a
-programming language, ‘O’ denotes a binary operator, ‘P’ denotes a
-function parameter, ‘Q’ denotes an assignment operator, ‘V’ denotes a
+format string, a directive starts with `%', is optionally followed by a
+size specifier `l', an optional flag `+', another optional flag `#',
+and is finished by a specifier: `%' denotes a literal percent sign, `c'
+denotes a character, `s' denotes a string, `i' and `d' denote an
+integer, `o', `u', `x' denote an unsigned integer, `.*s' denotes a
+string preceded by a width specification, `H' denotes a `location_t *'
+pointer, `D' denotes a general declaration, `F' denotes a function
+declaration, `T' denotes a type, `A' denotes a function argument, `C'
+denotes a tree code, `E' denotes an expression, `L' denotes a
+programming language, `O' denotes a binary operator, `P' denotes a
+function parameter, `Q' denotes an assignment operator, `V' denotes a
 const/volatile qualifier.
 
 
@@ -11148,12 +11086,12 @@
 
    These format strings are used inside the GNU Fortran Compiler
 sources, that is, the Fortran frontend in the GCC sources.  In such a
-format string, a directive starts with ‘%’ and is finished by a
-specifier: ‘%’ denotes a literal percent sign, ‘C’ denotes the current
-source location, ‘L’ denotes a source location, ‘c’ denotes a character,
-‘s’ denotes a string, ‘i’ and ‘d’ denote an integer, ‘u’ denotes an
-unsigned integer.  ‘i’, ‘d’, and ‘u’ may be preceded by a size specifier
-‘l’.
+format string, a directive starts with `%' and is finished by a
+specifier: `%' denotes a literal percent sign, `C' denotes the current
+source location, `L' denotes a source location, `c' denotes a
+character, `s' denotes a string, `i' and `d' denote an integer, `u'
+denotes an unsigned integer.  `i', `d', and `u' may be preceded by a
+size specifier `l'.
 
 
 File: gettext.info,  Node: qt-format,  Next: qt-plural-format,  Prev: gfc-internal-format,  Up: Translators for other Languages
@@ -11162,8 +11100,8 @@
 -------------------------
 
    Qt format strings are described in the documentation of the QString
-class <file:/usr/lib/qt-4.3.0/doc/html/qstring.html>.  In summary, a
-directive consists of a ‘%’ followed by a digit.  The same directive
+class `file:/usr/lib/qt-4.3.0/doc/html/qstring.html'.  In summary, a
+directive consists of a `%' followed by a digit. The same directive
 cannot occur more than once in a format string.
 
 
@@ -11173,8 +11111,8 @@
 -------------------------
 
    Qt format strings are described in the documentation of the
-QObject::tr method <file:/usr/lib/qt-4.3.0/doc/html/qobject.html>.  In
-summary, the only allowed directive is ‘%n’.
+QObject::tr method `file:/usr/lib/qt-4.3.0/doc/html/qobject.html'.  In
+summary, the only allowed directive is `%n'.
 
 
 File: gettext.info,  Node: kde-format,  Next: boost-format,  Prev: qt-plural-format,  Up: Translators for other Languages
@@ -11183,73 +11121,49 @@
 --------------------------
 
    KDE 4 format strings are defined as follows: A directive consists of
-a ‘%’ followed by a non-zero decimal number.  If a ‘%n’ occurs in a
-format strings, all of ‘%1’, ..., ‘%(n-1)’ must occur as well, except
+a `%' followed by a non-zero decimal number.  If a `%n' occurs in a
+format strings, all of `%1', ..., `%(n-1)' must occur as well, except
 possibly one of them.
 
 
-File: gettext.info,  Node: boost-format,  Next: lua-format,  Prev: kde-format,  Up: Translators for other Languages
+File: gettext.info,  Node: boost-format,  Prev: kde-format,  Up: Translators for other Languages
 
 15.3.23 Boost Format Strings
 ----------------------------
 
    Boost format strings are described in the documentation of the
-‘boost::format’ class, at
-<http://www.boost.org/libs/format/doc/format.html>.  In summary, a
+`boost::format' class, at
+`http://www.boost.org/libs/format/doc/format.html'.  In summary, a
 directive has either the same syntax as in a C format string, such as
-‘%1$+5d’, or may be surrounded by vertical bars, such as ‘%|1$+5d|’ or
-‘%|1$+5|’, or consists of just an argument number between percent signs,
-such as ‘%1%’.
-
-
-File: gettext.info,  Node: lua-format,  Next: javascript-format,  Prev: boost-format,  Up: Translators for other Languages
-
-15.3.24 Lua Format Strings
---------------------------
-
-   Lua format strings are described in the Lua reference manual, section
-String Manipulation,
-<http://www.lua.org/manual/5.1/manual.html#pdf-string.format>.
-
-
-File: gettext.info,  Node: javascript-format,  Prev: lua-format,  Up: Translators for other Languages
-
-15.3.25 JavaScript Format Strings
----------------------------------
-
-   Although JavaScript specification itself does not define any format
-strings, many JavaScript implementations provide printf-like functions.
-‘xgettext’ understands a set of common format strings used in popular
-JavaScript implementations including Gjs, Seed, and Node.JS. In such a
-format string, a directive starts with ‘%’ and is finished by a
-specifier: ‘%’ denotes a literal percent sign, ‘c’ denotes a character,
-‘s’ denotes a string, ‘b’, ‘d’, ‘o’, ‘x’, ‘X’ denote an integer, ‘f’
-denotes floating-point number, ‘j’ denotes a JSON object.
+`%1$+5d', or may be surrounded by vertical bars, such as `%|1$+5d|' or
+`%|1$+5|', or consists of just an argument number between percent
+signs, such as `%1%'.
 
 
 File: gettext.info,  Node: Maintainers for other Languages,  Next: List of Programming Languages,  Prev: Translators for other Languages,  Up: Programming Languages
 
-15.4 The Maintainer’s View
+15.4 The Maintainer's View
 ==========================
 
    For the maintainer, the general procedure differs from the C language
 case in two ways.
 
-   • For those languages that don’t use GNU gettext, the ‘intl/’
+   * For those languages that don't use GNU gettext, the `intl/'
      directory is not needed and can be omitted.  This means that the
-     maintainer calls the ‘gettextize’ program without the ‘--intl’
-     option, and that he invokes the ‘AM_GNU_GETTEXT’ autoconf macro via
-     ‘AM_GNU_GETTEXT([external])’.
-
-   • If only a single programming language is used, the
-     ‘XGETTEXT_OPTIONS’ variable in ‘po/Makevars’ (*note po/Makevars::)
-     should be adjusted to match the ‘xgettext’ options for that
-     particular programming language.  If the package uses more than one
-     programming language with ‘gettext’ support, it becomes necessary
-     to change the POT file construction rule in ‘po/Makefile.in.in’.
-     It is recommended to make one ‘xgettext’ invocation per programming
-     language, each with the options appropriate for that language, and
-     to combine the resulting files using ‘msgcat’.
+     maintainer calls the `gettextize' program without the `--intl'
+     option, and that he invokes the `AM_GNU_GETTEXT' autoconf macro via
+     `AM_GNU_GETTEXT([external])'.
+
+   * If only a single programming language is used, the
+     `XGETTEXT_OPTIONS' variable in `po/Makevars' (*note po/Makevars::)
+     should be adjusted to match the `xgettext' options for that
+     particular programming language.  If the package uses more than
+     one programming language with `gettext' support, it becomes
+     necessary to change the POT file construction rule in
+     `po/Makefile.in.in'.  It is recommended to make one `xgettext'
+     invocation per programming language, each with the options
+     appropriate for that language, and to combine the resulting files
+     using `msgcat'.
 
 
 File: gettext.info,  Node: List of Programming Languages,  Next: List of Data Formats,  Prev: Maintainers for other Languages,  Up: Programming Languages
@@ -11275,13 +11189,11 @@
 * Pascal::                      Pascal - Free Pascal Compiler
 * wxWidgets::                   wxWidgets library
 * YCP::                         YCP - YaST2 scripting language
-* Tcl::                         Tcl - Tk’s scripting language
+* Tcl::                         Tcl - Tk's scripting language
 * Perl::                        Perl
 * PHP::                         PHP Hypertext Preprocessor
 * Pike::                        Pike
 * GCC-source::                  GNU Compiler Collection sources
-* Lua::                         Lua
-* JavaScript::                  JavaScript
 
 
 File: gettext.info,  Node: C,  Next: sh,  Prev: List of Programming Languages,  Up: List of Programming Languages
@@ -11293,43 +11205,43 @@
      gcc, gpp, gobjc, glibc, gettext
 
 File extension
-     For C: ‘c’, ‘h’.
-     For C++: ‘C’, ‘c++’, ‘cc’, ‘cxx’, ‘cpp’, ‘hpp’.
-     For Objective C: ‘m’.
+     For C: `c', `h'.
+     For C++: `C', `c++', `cc', `cxx', `cpp', `hpp'.
+     For Objective C: `m'.
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘_("abc")’
+     `_("abc")'
 
 gettext/ngettext functions
-     ‘gettext’, ‘dgettext’, ‘dcgettext’, ‘ngettext’, ‘dngettext’,
-     ‘dcngettext’
+     `gettext', `dgettext', `dcgettext', `ngettext', `dngettext',
+     `dcngettext'
 
 textdomain
-     ‘textdomain’ function
+     `textdomain' function
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 setlocale
-     Programmer must call ‘setlocale (LC_ALL, "")’
+     Programmer must call `setlocale (LC_ALL, "")'
 
 Prerequisite
-     ‘#include <libintl.h>’
-     ‘#include <locale.h>’
-     ‘#define _(string) gettext (string)’
+     `#include <libintl.h>'
+     `#include <locale.h>'
+     `#define _(string) gettext (string)'
 
 Use or emulate GNU gettext
      Use
 
 Extractor
-     ‘xgettext -k_’
+     `xgettext -k_'
 
 Formatting with positions
-     ‘fprintf "%2$d %1$d"’
-     In C++: ‘autosprintf "%2$d %1$d"’ (*note Introduction:
+     `fprintf "%2$d %1$d"'
+     In C++: `autosprintf "%2$d %1$d"' (*note Introduction:
      (autosprintf)Top.)
 
 Portability
@@ -11338,10 +11250,10 @@
 po-mode marking
      yes
 
-   The following examples are available in the ‘examples’ directory:
-‘hello-c’, ‘hello-c-gnome’, ‘hello-c++’, ‘hello-c++-qt’,
-‘hello-c++-kde’, ‘hello-c++-gnome’, ‘hello-c++-wxwidgets’, ‘hello-objc’,
-‘hello-objc-gnustep’, ‘hello-objc-gnome’.
+   The following examples are available in the `examples' directory:
+`hello-c', `hello-c-gnome', `hello-c++', `hello-c++-qt',
+`hello-c++-kde', `hello-c++-gnome', `hello-c++-wxwidgets',
+`hello-objc', `hello-objc-gnustep', `hello-objc-gnome'.
 
 
 File: gettext.info,  Node: sh,  Next: bash,  Prev: C,  Up: List of Programming Languages
@@ -11353,56 +11265,56 @@
      bash, gettext
 
 File extension
-     ‘sh’
+     `sh'
 
 String syntax
-     ‘"abc"’, ‘'abc'’, ‘abc’
+     `"abc"', `'abc'', `abc'
 
 gettext shorthand
-     ‘"`gettext \"abc\"`"’
+     `"`gettext \"abc\"`"'
 
 gettext/ngettext functions
-     ‘gettext’, ‘ngettext’ programs
-     ‘eval_gettext’, ‘eval_ngettext’ shell functions
+     `gettext', `ngettext' programs
+     `eval_gettext', `eval_ngettext' shell functions
 
 textdomain
-     environment variable ‘TEXTDOMAIN’
+     environment variable `TEXTDOMAIN'
 
 bindtextdomain
-     environment variable ‘TEXTDOMAINDIR’
+     environment variable `TEXTDOMAINDIR'
 
 setlocale
      automatic
 
 Prerequisite
-     ‘. gettext.sh’
+     `. gettext.sh'
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     —
+     --
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-sh’.
+   An example is available in the `examples' directory: `hello-sh'.
 
 * Menu:
 
 * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
-* gettext.sh::                  Contents of ‘gettext.sh’
-* gettext Invocation::          Invoking the ‘gettext’ program
-* ngettext Invocation::         Invoking the ‘ngettext’ program
-* envsubst Invocation::         Invoking the ‘envsubst’ program
-* eval_gettext Invocation::     Invoking the ‘eval_gettext’ function
-* eval_ngettext Invocation::    Invoking the ‘eval_ngettext’ function
+* gettext.sh::                  Contents of `gettext.sh'
+* gettext Invocation::          Invoking the `gettext' program
+* ngettext Invocation::         Invoking the `ngettext' program
+* envsubst Invocation::         Invoking the `envsubst' program
+* eval_gettext Invocation::     Invoking the `eval_gettext' function
+* eval_ngettext Invocation::    Invoking the `eval_ngettext' function
 
 
 File: gettext.info,  Node: Preparing Shell Scripts,  Next: gettext.sh,  Prev: sh,  Up: sh
@@ -11418,16 +11330,16 @@
 
           . gettext.sh
 
-     near the top of the script.  ‘gettext.sh’ is a shell function
-     library that provides the functions ‘eval_gettext’ (see *note
-     eval_gettext Invocation::) and ‘eval_ngettext’ (see *note
-     eval_ngettext Invocation::).  You have to ensure that ‘gettext.sh’
-     can be found in the ‘PATH’.
-
-  2. Set and export the ‘TEXTDOMAIN’ and ‘TEXTDOMAINDIR’ environment
-     variables.  Usually ‘TEXTDOMAIN’ is the package or program name,
-     and ‘TEXTDOMAINDIR’ is the absolute pathname corresponding to
-     ‘$prefix/share/locale’, where ‘$prefix’ is the installation
+     near the top of the script.  `gettext.sh' is a shell function
+     library that provides the functions `eval_gettext' (see *note
+     eval_gettext Invocation::) and `eval_ngettext' (see *note
+     eval_ngettext Invocation::).  You have to ensure that `gettext.sh'
+     can be found in the `PATH'.
+
+  2. Set and export the `TEXTDOMAIN' and `TEXTDOMAINDIR' environment
+     variables.  Usually `TEXTDOMAIN' is the package or program name,
+     and `TEXTDOMAINDIR' is the absolute pathname corresponding to
+     `$prefix/share/locale', where `$prefix' is the installation
      location.
 
           TEXTDOMAIN=@PACKAGE@
@@ -11438,11 +11350,11 @@
   3. Prepare the strings for translation, as described in *note
      Preparing Strings::.
 
-  4. Simplify translatable strings so that they don’t contain command
-     substitution (‘"`...`"’ or ‘"$(...)"’), variable access with
-     defaulting (like ‘${VARIABLE-DEFAULT}’), access to positional
-     arguments (like ‘$0’, ‘$1’, ...)  or highly volatile shell
-     variables (like ‘$?’).  This can always be done through simple
+  4. Simplify translatable strings so that they don't contain command
+     substitution (`"`...`"' or `"$(...)"'), variable access with
+     defaulting (like `${VARIABLE-DEFAULT}'), access to positional
+     arguments (like `$0', `$1', ...) or highly volatile shell
+     variables (like `$?'). This can always be done through simple
      local code restructuring.  For example,
 
           echo "Usage: $0 [OPTION] FILE..."
@@ -11461,19 +11373,19 @@
           filecount="`ls | wc -l`"
           echo "Remaining files: $filecount"
 
-  5. For each translatable string, change the output command ‘echo’ or
-     ‘$echo’ to ‘gettext’ (if the string contains no references to shell
-     variables) or to ‘eval_gettext’ (if it refers to shell variables),
-     followed by a no-argument ‘echo’ command (to account for the
-     terminating newline).  Similarly, for cases with plural handling,
-     replace a conditional ‘echo’ command with an invocation of
-     ‘ngettext’ or ‘eval_ngettext’, followed by a no-argument ‘echo’
+  5. For each translatable string, change the output command `echo' or
+     `$echo' to `gettext' (if the string contains no references to
+     shell variables) or to `eval_gettext' (if it refers to shell
+     variables), followed by a no-argument `echo' command (to account
+     for the terminating newline). Similarly, for cases with plural
+     handling, replace a conditional `echo' command with an invocation
+     of `ngettext' or `eval_ngettext', followed by a no-argument `echo'
      command.
 
-     When doing this, you also need to add an extra backslash before the
-     dollar sign in references to shell variables, so that the
-     ‘eval_gettext’ function receives the translatable string before the
-     variable values are substituted into it.  For example,
+     When doing this, you also need to add an extra backslash before
+     the dollar sign in references to shell variables, so that the
+     `eval_gettext' function receives the translatable string before
+     the variable values are substituted into it. For example,
 
           echo "Remaining files: $filecount"
 
@@ -11481,11 +11393,11 @@
 
           eval_gettext "Remaining files: \$filecount"; echo
 
-     If the output command is not ‘echo’, you can make it use ‘echo’
-     nevertheless, through the use of backquotes.  However, note that
+     If the output command is not `echo', you can make it use `echo'
+     nevertheless, through the use of backquotes. However, note that
      inside backquotes, backslashes must be doubled to be effective
-     (because the backquoting eats one level of backslashes).  For
-     example, assuming that ‘error’ is a shell function that signals an
+     (because the backquoting eats one level of backslashes). For
+     example, assuming that `error' is a shell function that signals an
      error,
 
           error "file not found: $filename"
@@ -11501,181 +11413,186 @@
 
 File: gettext.info,  Node: gettext.sh,  Next: gettext Invocation,  Prev: Preparing Shell Scripts,  Up: sh
 
-15.5.2.2 Contents of ‘gettext.sh’
+15.5.2.2 Contents of `gettext.sh'
 .................................
 
-   ‘gettext.sh’, contained in the run-time package of GNU gettext,
+   `gettext.sh', contained in the run-time package of GNU gettext,
 provides the following:
 
-   • $echo The variable ‘echo’ is set to a command that outputs its
+   * $echo The variable `echo' is set to a command that outputs its
      first argument and a newline, without interpreting backslashes in
      the argument string.
 
-   • eval_gettext See *note eval_gettext Invocation::.
+   * eval_gettext See *note eval_gettext Invocation::.
 
-   • eval_ngettext See *note eval_ngettext Invocation::.
+   * eval_ngettext See *note eval_ngettext Invocation::.
 
 
 File: gettext.info,  Node: gettext Invocation,  Next: ngettext Invocation,  Prev: gettext.sh,  Up: sh
 
-15.5.2.3 Invoking the ‘gettext’ program
+15.5.2.3 Invoking the `gettext' program
 .......................................
 
      gettext [OPTION] [[TEXTDOMAIN] MSGID]
      gettext [OPTION] -s [MSGID]...
 
-   The ‘gettext’ program displays the native language translation of a
+   The `gettext' program displays the native language translation of a
 textual message.
 
 *Arguments*
 
-‘-d TEXTDOMAIN’
-‘--domain=TEXTDOMAIN’
+`-d TEXTDOMAIN'
+`--domain=TEXTDOMAIN'
      Retrieve translated messages from TEXTDOMAIN.  Usually a TEXTDOMAIN
      corresponds to a package, a program, or a module of a program.
 
-‘-e’
+`-e'
      Enable expansion of some escape sequences.  This option is for
-     compatibility with the ‘echo’ program or shell built-in.  The
-     escape sequences ‘\a’, ‘\b’, ‘\c’, ‘\f’, ‘\n’, ‘\r’, ‘\t’, ‘\v’,
-     ‘\\’, and ‘\’ followed by one to three octal digits, are
-     interpreted like the System V ‘echo’ program did.
+     compatibility with the `echo' program or shell built-in.  The
+     escape sequences `\a', `\b', `\c', `\f', `\n', `\r', `\t', `\v',
+     `\\', and `\' followed by one to three octal digits, are
+     interpreted like the System V `echo' program did.
 
-‘-E’
-     This option is only for compatibility with the ‘echo’ program or
+`-E'
+     This option is only for compatibility with the `echo' program or
      shell built-in.  It has no effect.
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-n’
-     Suppress trailing newline.  By default, ‘gettext’ adds a newline to
+`-n'
+     Suppress trailing newline.  By default, `gettext' adds a newline to
      the output.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
-‘[TEXTDOMAIN] MSGID’
+`[TEXTDOMAIN] MSGID'
      Retrieve translated message corresponding to MSGID from TEXTDOMAIN.
 
+
    If the TEXTDOMAIN parameter is not given, the domain is determined
-from the environment variable ‘TEXTDOMAIN’.  If the message catalog is
+from the environment variable `TEXTDOMAIN'.  If the message catalog is
 not found in the regular directory, another location can be specified
-with the environment variable ‘TEXTDOMAINDIR’.
+with the environment variable `TEXTDOMAINDIR'.
 
-   When used with the ‘-s’ option the program behaves like the ‘echo’
+   When used with the `-s' option the program behaves like the `echo'
 command.  But it does not simply copy its arguments to stdout.  Instead
 those messages found in the selected catalog are translated.
 
-   Note: ‘xgettext’ supports only the one-argument form of the ‘gettext’
-invocation, where no options are present and the TEXTDOMAIN is implicit,
-from the environment.
+   Note: `xgettext' supports only the one-argument form of the
+`gettext' invocation, where no options are present and the TEXTDOMAIN
+is implicit, from the environment.
 
 
 File: gettext.info,  Node: ngettext Invocation,  Next: envsubst Invocation,  Prev: gettext Invocation,  Up: sh
 
-15.5.2.4 Invoking the ‘ngettext’ program
+15.5.2.4 Invoking the `ngettext' program
 ........................................
 
      ngettext [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT
 
-   The ‘ngettext’ program displays the native language translation of a
+   The `ngettext' program displays the native language translation of a
 textual message whose grammatical form depends on a number.
 
 *Arguments*
 
-‘-d TEXTDOMAIN’
-‘--domain=TEXTDOMAIN’
+`-d TEXTDOMAIN'
+`--domain=TEXTDOMAIN'
      Retrieve translated messages from TEXTDOMAIN.  Usually a TEXTDOMAIN
      corresponds to a package, a program, or a module of a program.
 
-‘-e’
+`-e'
      Enable expansion of some escape sequences.  This option is for
-     compatibility with the ‘gettext’ program.  The escape sequences
-     ‘\a’, ‘\b’, ‘\c’, ‘\f’, ‘\n’, ‘\r’, ‘\t’, ‘\v’, ‘\\’, and ‘\’
+     compatibility with the `gettext' program.  The escape sequences
+     `\a', `\b', `\c', `\f', `\n', `\r', `\t', `\v', `\\', and `\'
      followed by one to three octal digits, are interpreted like the
-     System V ‘echo’ program did.
+     System V `echo' program did.
 
-‘-E’
-     This option is only for compatibility with the ‘gettext’ program.
+`-E'
+     This option is only for compatibility with the `gettext' program.
      It has no effect.
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
-‘TEXTDOMAIN’
+`TEXTDOMAIN'
      Retrieve translated message from TEXTDOMAIN.
 
-‘MSGID MSGID-PLURAL’
+`MSGID MSGID-PLURAL'
      Translate MSGID (English singular) / MSGID-PLURAL (English plural).
 
-‘COUNT’
+`COUNT'
      Choose singular/plural form based on this value.
 
+
    If the TEXTDOMAIN parameter is not given, the domain is determined
-from the environment variable ‘TEXTDOMAIN’.  If the message catalog is
+from the environment variable `TEXTDOMAIN'.  If the message catalog is
 not found in the regular directory, another location can be specified
-with the environment variable ‘TEXTDOMAINDIR’.
+with the environment variable `TEXTDOMAINDIR'.
 
-   Note: ‘xgettext’ supports only the three-arguments form of the
-‘ngettext’ invocation, where no options are present and the TEXTDOMAIN
+   Note: `xgettext' supports only the three-arguments form of the
+`ngettext' invocation, where no options are present and the TEXTDOMAIN
 is implicit, from the environment.
 
 
 File: gettext.info,  Node: envsubst Invocation,  Next: eval_gettext Invocation,  Prev: ngettext Invocation,  Up: sh
 
-15.5.2.5 Invoking the ‘envsubst’ program
+15.5.2.5 Invoking the `envsubst' program
 ........................................
 
      envsubst [OPTION] [SHELL-FORMAT]
 
-   The ‘envsubst’ program substitutes the values of environment
+   The `envsubst' program substitutes the values of environment
 variables.
 
 *Operation mode*
 
-‘-v’
-‘--variables’
+`-v'
+`--variables'
      Output the variables occurring in SHELL-FORMAT.
 
+
 *Informative output*
 
-‘-h’
-‘--help’
+`-h'
+`--help'
      Display this help and exit.
 
-‘-V’
-‘--version’
+`-V'
+`--version'
      Output version information and exit.
 
+
    In normal operation mode, standard input is copied to standard
-output, with references to environment variables of the form ‘$VARIABLE’
-or ‘${VARIABLE}’ being replaced with the corresponding values.  If a
-SHELL-FORMAT is given, only those environment variables that are
-referenced in SHELL-FORMAT are substituted; otherwise all environment
-variables references occurring in standard input are substituted.
+output, with references to environment variables of the form
+`$VARIABLE' or `${VARIABLE}' being replaced with the corresponding
+values.  If a SHELL-FORMAT is given, only those environment variables
+that are referenced in SHELL-FORMAT are substituted; otherwise all
+environment variables references occurring in standard input are
+substituted.
 
    These substitutions are a subset of the substitutions that a shell
 performs on unquoted and double-quoted strings.  Other kinds of
-substitutions done by a shell, such as ‘${VARIABLE-DEFAULT}’ or
-‘$(COMMAND-LIST)’ or ‘`COMMAND-LIST`’, are not performed by the
-‘envsubst’ program, due to security reasons.
+substitutions done by a shell, such as `${VARIABLE-DEFAULT}' or
+`$(COMMAND-LIST)' or ``COMMAND-LIST`', are not performed by the
+`envsubst' program, due to security reasons.
 
-   When ‘--variables’ is used, standard input is ignored, and the output
+   When `--variables' is used, standard input is ignored, and the output
 consists of the environment variables that are referenced in
 SHELL-FORMAT, one per line.
 
 
 File: gettext.info,  Node: eval_gettext Invocation,  Next: eval_ngettext Invocation,  Prev: envsubst Invocation,  Up: sh
 
-15.5.2.6 Invoking the ‘eval_gettext’ function
+15.5.2.6 Invoking the `eval_gettext' function
 .............................................
 
      eval_gettext MSGID
@@ -11688,7 +11605,7 @@
 
 File: gettext.info,  Node: eval_ngettext Invocation,  Prev: eval_gettext Invocation,  Up: sh
 
-15.5.2.7 Invoking the ‘eval_ngettext’ function
+15.5.2.7 Invoking the `eval_ngettext' function
 ..............................................
 
      eval_ngettext MSGID MSGID-PLURAL COUNT
@@ -11705,39 +11622,39 @@
 15.5.3 bash - Bourne-Again Shell Script
 ---------------------------------------
 
-   GNU ‘bash’ 2.0 or newer has a special shorthand for translating a
-string and substituting variable values in it: ‘$"msgid"’.  But the use
+   GNU `bash' 2.0 or newer has a special shorthand for translating a
+string and substituting variable values in it: `$"msgid"'.  But the use
 of this construct is *discouraged*, due to the security holes it opens
 and due to its portability problems.
 
-   The security holes of ‘$"..."’ come from the fact that after looking
-up the translation of the string, ‘bash’ processes it like it processes
-any double-quoted string: dollar and backquote processing, like ‘eval’
+   The security holes of `$"..."' come from the fact that after looking
+up the translation of the string, `bash' processes it like it processes
+any double-quoted string: dollar and backquote processing, like `eval'
 does.
 
   1. In a locale whose encoding is one of BIG5, BIG5-HKSCS, GBK,
      GB18030, SHIFT_JIS, JOHAB, some double-byte characters have a
-     second byte whose value is ‘0x60’.  For example, the byte sequence
-     ‘\xe0\x60’ is a single character in these locales.  Many versions
-     of ‘bash’ (all versions up to bash-2.05, and newer versions on
-     platforms without ‘mbsrtowcs()’ function) don’t know about
+     second byte whose value is `0x60'.  For example, the byte sequence
+     `\xe0\x60' is a single character in these locales.  Many versions
+     of `bash' (all versions up to bash-2.05, and newer versions on
+     platforms without `mbsrtowcs()' function) don't know about
      character boundaries and see a backquote character where there is
      only a particular Chinese character.  Thus it can start executing
      part of the translation as a command list.  This situation can
      occur even without the translator being aware of it: if the
      translator provides translations in the UTF-8 encoding, it is the
-     ‘gettext()’ function which will, during its conversion from the
-     translator’s encoding to the user’s locale’s encoding, produce the
-     dangerous ‘\x60’ bytes.
+     `gettext()' function which will, during its conversion from the
+     translator's encoding to the user's locale's encoding, produce the
+     dangerous `\x60' bytes.
 
   2. A translator could - voluntarily or inadvertently - use backquotes
-     ‘"`...`"’ or dollar-parentheses ‘"$(...)"’ in her translations.
+     `"`...`"' or dollar-parentheses `"$(...)"' in her translations.
      The enclosed strings would be executed as command lists by the
      shell.
 
-   The portability problem is that ‘bash’ must be built with
+   The portability problem is that `bash' must be built with
 internationalization support; this is normally not the case on systems
-that don’t have the ‘gettext()’ function in libc.
+that don't have the `gettext()' function in libc.
 
 
 File: gettext.info,  Node: Python,  Next: Common Lisp,  Prev: bash,  Up: List of Programming Languages
@@ -11749,73 +11666,73 @@
      python
 
 File extension
-     ‘py’
+     `py'
 
 String syntax
-     ‘'abc'’, ‘u'abc'’, ‘r'abc'’, ‘ur'abc'’,
-     ‘"abc"’, ‘u"abc"’, ‘r"abc"’, ‘ur"abc"’,
-     ‘'''abc'''’, ‘u'''abc'''’, ‘r'''abc'''’, ‘ur'''abc'''’,
-     ‘"""abc"""’, ‘u"""abc"""’, ‘r"""abc"""’, ‘ur"""abc"""’
+     `'abc'', `u'abc'', `r'abc'', `ur'abc'',
+     `"abc"', `u"abc"', `r"abc"', `ur"abc"',
+     `'''abc'''', `u'''abc'''', `r'''abc'''', `ur'''abc'''',
+     `"""abc"""', `u"""abc"""', `r"""abc"""', `ur"""abc"""'
 
 gettext shorthand
-     ‘_('abc')’ etc.
+     `_('abc')' etc.
 
 gettext/ngettext functions
-     ‘gettext.gettext’, ‘gettext.dgettext’, ‘gettext.ngettext’,
-     ‘gettext.dngettext’, also ‘ugettext’, ‘ungettext’
+     `gettext.gettext', `gettext.dgettext', `gettext.ngettext',
+     `gettext.dngettext', also `ugettext', `ungettext'
 
 textdomain
-     ‘gettext.textdomain’ function, or ‘gettext.install(DOMAIN)’
+     `gettext.textdomain' function, or `gettext.install(DOMAIN)'
      function
 
 bindtextdomain
-     ‘gettext.bindtextdomain’ function, or
-     ‘gettext.install(DOMAIN,LOCALEDIR)’ function
+     `gettext.bindtextdomain' function, or
+     `gettext.install(DOMAIN,LOCALEDIR)' function
 
 setlocale
      not used by the gettext emulation
 
 Prerequisite
-     ‘import gettext’
+     `import gettext'
 
 Use or emulate GNU gettext
      emulate
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘'...%(ident)d...' % { 'ident': value }’
+     `'...%(ident)d...' % { 'ident': value }'
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-python’.
+   An example is available in the `examples' directory: `hello-python'.
 
    A note about format strings: Python supports format strings with
-unnamed arguments, such as ‘'...%d...'’, and format strings with named
-arguments, such as ‘'...%(ident)d...'’.  The latter are preferable for
+unnamed arguments, such as `'...%d...'', and format strings with named
+arguments, such as `'...%(ident)d...''.  The latter are preferable for
 internationalized programs, for two reasons:
 
-   • When a format string takes more than one argument, the translator
+   * When a format string takes more than one argument, the translator
      can provide a translation that uses the arguments in a different
-     order, if the format string uses named arguments.  For example, the
-     translator can reformulate
+     order, if the format string uses named arguments.  For example,
+     the translator can reformulate
           "'%(volume)s' has only %(freespace)d bytes free."
      to
           "Only %(freespace)d bytes free on '%(volume)s'."
      Additionally, the identifiers also provide some context to the
      translator.
 
-   • In the context of plural forms, the format string used for the
+   * In the context of plural forms, the format string used for the
      singular form does not use the numeric argument in many languages.
-     Even in English, one prefers to write ‘"one hour"’ instead of ‘"1
-     hour"’.  Omitting individual arguments from format strings like
+     Even in English, one prefers to write `"one hour"' instead of `"1
+     hour"'.  Omitting individual arguments from format strings like
      this is only possible with the named argument syntax.  (With
-     unnamed arguments, Python – unlike C – verifies that the format
+     unnamed arguments, Python - unlike C - verifies that the format
      string uses all supplied arguments.)
 
 
@@ -11828,45 +11745,45 @@
      clisp 2.28 or newer
 
 File extension
-     ‘lisp’
+     `lisp'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘(_ "abc")’, ‘(ENGLISH "abc")’
+     `(_ "abc")', `(ENGLISH "abc")'
 
 gettext/ngettext functions
-     ‘i18n:gettext’, ‘i18n:ngettext’
+     `i18n:gettext', `i18n:ngettext'
 
 textdomain
-     ‘i18n:textdomain’
+     `i18n:textdomain'
 
 bindtextdomain
-     ‘i18n:textdomaindir’
+     `i18n:textdomaindir'
 
 setlocale
      automatic
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext -k_ -kENGLISH’
+     `xgettext -k_ -kENGLISH'
 
 Formatting with positions
-     ‘format "~1@*~D ~0@*~D"’
+     `format "~1@*~D ~0@*~D"'
 
 Portability
      On platforms without gettext, no translation.
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-clisp’.
+   An example is available in the `examples' directory: `hello-clisp'.
 
 
 File: gettext.info,  Node: clisp C,  Next: Emacs Lisp,  Prev: Common Lisp,  Up: List of Programming Languages
@@ -11878,45 +11795,45 @@
      clisp
 
 File extension
-     ‘d’
+     `d'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘ENGLISH ? "abc" : ""’
-     ‘GETTEXT("abc")’
-     ‘GETTEXTL("abc")’
+     `ENGLISH ? "abc" : ""'
+     `GETTEXT("abc")'
+     `GETTEXTL("abc")'
 
 gettext/ngettext functions
-     ‘clgettext’, ‘clgettextl’
+     `clgettext', `clgettextl'
 
 textdomain
-     —
+     --
 
 bindtextdomain
-     —
+     --
 
 setlocale
      automatic
 
 Prerequisite
-     ‘#include "lispbibl.c"’
+     `#include "lispbibl.c"'
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘clisp-xgettext’
+     `clisp-xgettext'
 
 Formatting with positions
-     ‘fprintf "%2$d %1$d"’
+     `fprintf "%2$d %1$d"'
 
 Portability
      On platforms without gettext, no translation.
 
 po-mode marking
-     —
+     --
 
 
 File: gettext.info,  Node: Emacs Lisp,  Next: librep,  Prev: clisp C,  Up: List of Programming Languages
@@ -11928,44 +11845,44 @@
      emacs, xemacs
 
 File extension
-     ‘el’
+     `el'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘(_"abc")’
+     `(_"abc")'
 
 gettext/ngettext functions
-     ‘gettext’, ‘dgettext’ (xemacs only)
+     `gettext', `dgettext' (xemacs only)
 
 textdomain
-     ‘domain’ special form (xemacs only)
+     `domain' special form (xemacs only)
 
 bindtextdomain
-     ‘bind-text-domain’ function (xemacs only)
+     `bind-text-domain' function (xemacs only)
 
 setlocale
      automatic
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘format "%2$d %1$d"’
+     `format "%2$d %1$d"'
 
 Portability
-     Only XEmacs.  Without ‘I18N3’ defined at build time, no
+     Only XEmacs.  Without `I18N3' defined at build time, no
      translation.
 
 po-mode marking
-     —
+     --
 
 
 File: gettext.info,  Node: librep,  Next: Scheme,  Prev: Emacs Lisp,  Up: List of Programming Languages
@@ -11977,45 +11894,45 @@
      librep 0.15.3 or newer
 
 File extension
-     ‘jl’
+     `jl'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘(_"abc")’
+     `(_"abc")'
 
 gettext/ngettext functions
-     ‘gettext’
+     `gettext'
 
 textdomain
-     ‘textdomain’ function
+     `textdomain' function
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 setlocale
-     —
+     --
 
 Prerequisite
-     ‘(require 'rep.i18n.gettext)’
+     `(require 'rep.i18n.gettext)'
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘format "%2$d %1$d"’
+     `format "%2$d %1$d"'
 
 Portability
      On platforms without gettext, no translation.
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-librep’.
+   An example is available in the `examples' directory: `hello-librep'.
 
 
 File: gettext.info,  Node: Scheme,  Next: Smalltalk,  Prev: librep,  Up: List of Programming Languages
@@ -12027,45 +11944,45 @@
      guile
 
 File extension
-     ‘scm’
+     `scm'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘(_ "abc")’, ‘_"abc"’ (GIMP script-fu extension)
+     `(_ "abc")'
 
 gettext/ngettext functions
-     ‘gettext’, ‘ngettext’
+     `gettext', `ngettext'
 
 textdomain
-     ‘textdomain’
+     `textdomain'
 
 bindtextdomain
-     ‘bindtextdomain’
+     `bindtextdomain'
 
 setlocale
-     ‘(catch #t (lambda () (setlocale LC_ALL "")) (lambda args #f))’
+     `(catch #t (lambda () (setlocale LC_ALL "")) (lambda args #f))'
 
 Prerequisite
-     ‘(use-modules (ice-9 format))’
+     `(use-modules (ice-9 format))'
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext -k_’
+     `xgettext -k_'
 
 Formatting with positions
-     —
+     --
 
 Portability
      On platforms without gettext, no translation.
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-guile’.
+   An example is available in the `examples' directory: `hello-guile'.
 
 
 File: gettext.info,  Node: Smalltalk,  Next: Java,  Prev: Scheme,  Up: List of Programming Languages
@@ -12077,49 +11994,49 @@
      smalltalk
 
 File extension
-     ‘st’
+     `st'
 
 String syntax
-     ‘'abc'’
+     `'abc''
 
 gettext shorthand
-     ‘NLS ? 'abc'’
+     `NLS ? 'abc''
 
 gettext/ngettext functions
-     ‘LcMessagesDomain>>#at:’, ‘LcMessagesDomain>>#at:plural:with:’
+     `LcMessagesDomain>>#at:', `LcMessagesDomain>>#at:plural:with:'
 
 textdomain
-     ‘LcMessages>>#domain:localeDirectory:’ (returns a
-     ‘LcMessagesDomain’ object).
-     Example: ‘I18N Locale default messages domain: 'gettext'
-     localeDirectory: /usr/local/share/locale'’
+     `LcMessages>>#domain:localeDirectory:' (returns a
+     `LcMessagesDomain' object).
+     Example: `I18N Locale default messages domain: 'gettext'
+     localeDirectory: /usr/local/share/locale''
 
 bindtextdomain
-     ‘LcMessages>>#domain:localeDirectory:’, see above.
+     `LcMessages>>#domain:localeDirectory:', see above.
 
 setlocale
-     Automatic if you use ‘I18N Locale default’.
+     Automatic if you use `I18N Locale default'.
 
 Prerequisite
-     ‘PackageLoader fileInPackage: 'I18N'!’
+     `PackageLoader fileInPackage: 'I18N'!'
 
 Use or emulate GNU gettext
      emulate
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘'%1 %2' bindWith: 'Hello' with: 'world'’
+     `'%1 %2' bindWith: 'Hello' with: 'world''
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory:
-‘hello-smalltalk’.
+   An example is available in the `examples' directory:
+`hello-smalltalk'.
 
 
 File: gettext.info,  Node: Java,  Next: C#,  Prev: Smalltalk,  Up: List of Programming Languages
@@ -12131,7 +12048,7 @@
      java, java2
 
 File extension
-     ‘java’
+     `java'
 
 String syntax
      "abc"
@@ -12140,105 +12057,105 @@
      _("abc")
 
 gettext/ngettext functions
-     ‘GettextResource.gettext’, ‘GettextResource.ngettext’,
-     ‘GettextResource.pgettext’, ‘GettextResource.npgettext’
+     `GettextResource.gettext', `GettextResource.ngettext',
+     `GettextResource.pgettext', `GettextResource.npgettext'
 
 textdomain
-     —, use ‘ResourceBundle.getResource’ instead
+     --, use `ResourceBundle.getResource' instead
 
 bindtextdomain
-     —, use CLASSPATH instead
+     --, use CLASSPATH instead
 
 setlocale
      automatic
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
-     —, uses a Java specific message catalog format
+     --, uses a Java specific message catalog format
 
 Extractor
-     ‘xgettext -k_’
+     `xgettext -k_'
 
 Formatting with positions
-     ‘MessageFormat.format "{1,number} {0,number}"’
+     `MessageFormat.format "{1,number} {0,number}"'
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
    Before marking strings as internationalizable, uses of the string
-concatenation operator need to be converted to ‘MessageFormat’
-applications.  For example, ‘"file "+filename+" not found"’ becomes
-‘MessageFormat.format("file {0} not found", new Object[] { filename })’.
+concatenation operator need to be converted to `MessageFormat'
+applications.  For example, `"file "+filename+" not found"' becomes
+`MessageFormat.format("file {0} not found", new Object[] { filename })'.
 Only after this is done, can the strings be marked and extracted.
 
    GNU gettext uses the native Java internationalization mechanism,
-namely ‘ResourceBundle’s.  There are two formats of ‘ResourceBundle’s:
-‘.properties’ files and ‘.class’ files.  The ‘.properties’ format is a
+namely `ResourceBundle's.  There are two formats of `ResourceBundle's:
+`.properties' files and `.class' files.  The `.properties' format is a
 text file which the translators can directly edit, like PO files, but
-which doesn’t support plural forms.  Whereas the ‘.class’ format is
-compiled from ‘.java’ source code and can support plural forms (provided
-it is accessed through an appropriate API, see below).
-
-   To convert a PO file to a ‘.properties’ file, the ‘msgcat’ program
-can be used with the option ‘--properties-output’.  To convert a
-‘.properties’ file back to a PO file, the ‘msgcat’ program can be used
-with the option ‘--properties-input’.  All the tools that manipulate PO
-files can work with ‘.properties’ files as well, if given the
-‘--properties-input’ and/or ‘--properties-output’ option.
-
-   To convert a PO file to a ResourceBundle class, the ‘msgfmt’ program
-can be used with the option ‘--java’ or ‘--java2’.  To convert a
-ResourceBundle back to a PO file, the ‘msgunfmt’ program can be used
-with the option ‘--java’.
+which doesn't support plural forms.  Whereas the `.class' format is
+compiled from `.java' source code and can support plural forms
+(provided it is accessed through an appropriate API, see below).
+
+   To convert a PO file to a `.properties' file, the `msgcat' program
+can be used with the option `--properties-output'.  To convert a
+`.properties' file back to a PO file, the `msgcat' program can be used
+with the option `--properties-input'.  All the tools that manipulate PO
+files can work with `.properties' files as well, if given the
+`--properties-input' and/or `--properties-output' option.
+
+   To convert a PO file to a ResourceBundle class, the `msgfmt' program
+can be used with the option `--java' or `--java2'.  To convert a
+ResourceBundle back to a PO file, the `msgunfmt' program can be used
+with the option `--java'.
 
    Two different programmatic APIs can be used to access
 ResourceBundles.  Note that both APIs work with all kinds of
 ResourceBundles, whether GNU gettext generated classes, or other
-‘.class’ or ‘.properties’ files.
+`.class' or `.properties' files.
 
-  1. The ‘java.util.ResourceBundle’ API.
+  1. The `java.util.ResourceBundle' API.
 
-     In particular, its ‘getString’ function returns a string
+     In particular, its `getString' function returns a string
      translation.  Note that a missing translation yields a
-     ‘MissingResourceException’.
+     `MissingResourceException'.
 
-     This has the advantage of being the standard API. And it does not
-     require any additional libraries, only the ‘msgcat’ generated
-     ‘.properties’ files or the ‘msgfmt’ generated ‘.class’ files.  But
-     it cannot do plural handling, even if the resource was generated by
-     ‘msgfmt’ from a PO file with plural handling.
+     This has the advantage of being the standard API.  And it does not
+     require any additional libraries, only the `msgcat' generated
+     `.properties' files or the `msgfmt' generated `.class' files.  But
+     it cannot do plural handling, even if the resource was generated
+     by `msgfmt' from a PO file with plural handling.
 
-  2. The ‘gnu.gettext.GettextResource’ API.
+  2. The `gnu.gettext.GettextResource' API.
 
      Reference documentation in Javadoc 1.1 style format is in the
      javadoc2 directory (javadoc2/index.html).
 
-     Its ‘gettext’ function returns a string translation.  Note that
+     Its `gettext' function returns a string translation.  Note that
      when a translation is missing, the MSGID argument is returned
      unchanged.
 
-     This has the advantage of having the ‘ngettext’ function for plural
-     handling and the ‘pgettext’ and ‘npgettext’ for strings constraint
+     This has the advantage of having the `ngettext' function for plural
+     handling and the `pgettext' and `npgettext' for strings constraint
      to a particular context.
 
-     To use this API, one needs the ‘libintl.jar’ file which is part of
+     To use this API, one needs the `libintl.jar' file which is part of
      the GNU gettext package and distributed under the LGPL.
 
-   Four examples, using the second API, are available in the ‘examples’
-directory: ‘hello-java’, ‘hello-java-awt’, ‘hello-java-swing’,
-‘hello-java-qtjambi’.
+   Four examples, using the second API, are available in the `examples'
+directory: `hello-java', `hello-java-awt', `hello-java-swing',
+`hello-java-qtjambi'.
 
-   Now, to make use of the API and define a shorthand for ‘getString’,
+   Now, to make use of the API and define a shorthand for `getString',
 there are three idioms that you can choose from:
 
-   • (This one assumes Java 1.5 or newer.)  In a unique class of your
-     project, say ‘Util’, define a static variable holding the
-     ‘ResourceBundle’ instance and the shorthand:
+   * (This one assumes Java 1.5 or newer.)  In a unique class of your
+     project, say `Util', define a static variable holding the
+     `ResourceBundle' instance and the shorthand:
 
           private static ResourceBundle myResources =
             ResourceBundle.getBundle("domain-name");
@@ -12254,8 +12171,8 @@
 
           System.out.println(_("Operation completed."));
 
-   • In a unique class of your project, say ‘Util’, define a static
-     variable holding the ‘ResourceBundle’ instance:
+   * In a unique class of your project, say `Util', define a static
+     variable holding the `ResourceBundle' instance:
 
           public static ResourceBundle myResources =
             ResourceBundle.getBundle("domain-name");
@@ -12269,7 +12186,7 @@
 
           System.out.println(_("Operation completed."));
 
-   • You add a class with a very short name, say ‘S’, containing just
+   * You add a class with a very short name, say `S', containing just
      the definition of the resource bundle and of the shorthand:
 
           public class S {
@@ -12299,193 +12216,192 @@
      pnet, pnetlib 0.6.2 or newer, or mono 0.29 or newer
 
 File extension
-     ‘cs’
+     `cs'
 
 String syntax
-     ‘"abc"’, ‘@"abc"’
+     `"abc"', `@"abc"'
 
 gettext shorthand
      _("abc")
 
 gettext/ngettext functions
-     ‘GettextResourceManager.GetString’,
-     ‘GettextResourceManager.GetPluralString’
-     ‘GettextResourceManager.GetParticularString’
-     ‘GettextResourceManager.GetParticularPluralString’
+     `GettextResourceManager.GetString',
+     `GettextResourceManager.GetPluralString'
+     `GettextResourceManager.GetParticularString'
+     `GettextResourceManager.GetParticularPluralString'
 
 textdomain
-     ‘new GettextResourceManager(domain)’
+     `new GettextResourceManager(domain)'
 
 bindtextdomain
-     —, compiled message catalogs are located in subdirectories of the
+     --, compiled message catalogs are located in subdirectories of the
      directory containing the executable
 
 setlocale
      automatic
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
-     —, uses a C# specific message catalog format
+     --, uses a C# specific message catalog format
 
 Extractor
-     ‘xgettext -k_’
+     `xgettext -k_'
 
 Formatting with positions
-     ‘String.Format "{1} {0}"’
+     `String.Format "{1} {0}"'
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
    Before marking strings as internationalizable, uses of the string
-concatenation operator need to be converted to ‘String.Format’
-invocations.  For example, ‘"file "+filename+" not found"’ becomes
-‘String.Format("file {0} not found", filename)’.  Only after this is
+concatenation operator need to be converted to `String.Format'
+invocations.  For example, `"file "+filename+" not found"' becomes
+`String.Format("file {0} not found", filename)'.  Only after this is
 done, can the strings be marked and extracted.
 
    GNU gettext uses the native C#/.NET internationalization mechanism,
-namely the classes ‘ResourceManager’ and ‘ResourceSet’.  Applications
-use the ‘ResourceManager’ methods to retrieve the native language
-translation of strings.  An instance of ‘ResourceSet’ is the in-memory
-representation of a message catalog file.  The ‘ResourceManager’ loads
-and accesses ‘ResourceSet’ instances as needed to look up the
+namely the classes `ResourceManager' and `ResourceSet'.  Applications
+use the `ResourceManager' methods to retrieve the native language
+translation of strings.  An instance of `ResourceSet' is the in-memory
+representation of a message catalog file.  The `ResourceManager' loads
+and accesses `ResourceSet' instances as needed to look up the
 translations.
 
-   There are two formats of ‘ResourceSet’s that can be directly loaded
-by the C# runtime: ‘.resources’ files and ‘.dll’ files.
+   There are two formats of `ResourceSet's that can be directly loaded
+by the C# runtime: `.resources' files and `.dll' files.
 
-   • The ‘.resources’ format is a binary file usually generated through
-     the ‘resgen’ or ‘monoresgen’ utility, but which doesn’t support
-     plural forms.  ‘.resources’ files can also be embedded in .NET
-     ‘.exe’ files.  This only affects whether a file system access is
-     performed to load the message catalog; it doesn’t affect the
+   * The `.resources' format is a binary file usually generated through
+     the `resgen' or `monoresgen' utility, but which doesn't support
+     plural forms.  `.resources' files can also be embedded in .NET
+     `.exe' files.  This only affects whether a file system access is
+     performed to load the message catalog; it doesn't affect the
      contents of the message catalog.
 
-   • On the other hand, the ‘.dll’ format is a binary file that is
-     compiled from ‘.cs’ source code and can support plural forms
+   * On the other hand, the `.dll' format is a binary file that is
+     compiled from `.cs' source code and can support plural forms
      (provided it is accessed through the GNU gettext API, see below).
 
-   Note that these .NET ‘.dll’ and ‘.exe’ files are not tied to a
+   Note that these .NET `.dll' and `.exe' files are not tied to a
 particular platform; their file format and GNU gettext for C# can be
 used on any platform.
 
-   To convert a PO file to a ‘.resources’ file, the ‘msgfmt’ program can
-be used with the option ‘--csharp-resources’.  To convert a ‘.resources’
-file back to a PO file, the ‘msgunfmt’ program can be used with the
-option ‘--csharp-resources’.  You can also, in some cases, use the
-‘resgen’ program (from the ‘pnet’ package) or the ‘monoresgen’ program
-(from the ‘mono’/‘mcs’ package).  These programs can also convert a
-‘.resources’ file back to a PO file.  But beware: as of this writing
-(January 2004), the ‘monoresgen’ converter is quite buggy and the
-‘resgen’ converter ignores the encoding of the PO files.
-
-   To convert a PO file to a ‘.dll’ file, the ‘msgfmt’ program can be
-used with the option ‘--csharp’.  The result will be a ‘.dll’ file
-containing a subclass of ‘GettextResourceSet’, which itself is a
-subclass of ‘ResourceSet’.  To convert a ‘.dll’ file containing a
-‘GettextResourceSet’ subclass back to a PO file, the ‘msgunfmt’ program
-can be used with the option ‘--csharp’.
+   To convert a PO file to a `.resources' file, the `msgfmt' program
+can be used with the option `--csharp-resources'.  To convert a
+`.resources' file back to a PO file, the `msgunfmt' program can be used
+with the option `--csharp-resources'.  You can also, in some cases, use
+the `resgen' program (from the `pnet' package) or the `monoresgen'
+program (from the `mono'/`mcs' package).  These programs can also
+convert a `.resources' file back to a PO file.  But beware: as of this
+writing (January 2004), the `monoresgen' converter is quite buggy and
+the `resgen' converter ignores the encoding of the PO files.
+
+   To convert a PO file to a `.dll' file, the `msgfmt' program can be
+used with the option `--csharp'.  The result will be a `.dll' file
+containing a subclass of `GettextResourceSet', which itself is a
+subclass of `ResourceSet'.  To convert a `.dll' file containing a
+`GettextResourceSet' subclass back to a PO file, the `msgunfmt' program
+can be used with the option `--csharp'.
 
-   The advantages of the ‘.dll’ format over the ‘.resources’ format are:
+   The advantages of the `.dll' format over the `.resources' format are:
 
   1. Freedom to localize: Users can add their own translations to an
      application after it has been built and distributed.  Whereas when
-     the programmer uses a ‘ResourceManager’ constructor provided by the
-     system, the set of ‘.resources’ files for an application must be
-     specified when the application is built and cannot be extended
+     the programmer uses a `ResourceManager' constructor provided by
+     the system, the set of `.resources' files for an application must
+     be specified when the application is built and cannot be extended
      afterwards.
 
-  2. Plural handling: A message catalog in ‘.dll’ format supports the
-     plural handling function ‘GetPluralString’.  Whereas ‘.resources’
-     files can only contain data and only support lookups that depend on
-     a single string.
-
-  3. Context handling: A message catalog in ‘.dll’ format supports the
-     query-with-context functions ‘GetParticularString’ and
-     ‘GetParticularPluralString’.  Whereas ‘.resources’ files can only
+  2. Plural handling: A message catalog in `.dll' format supports the
+     plural handling function `GetPluralString'.  Whereas `.resources'
+     files can only contain data and only support lookups that depend
+     on a single string.
+
+  3. Context handling: A message catalog in `.dll' format supports the
+     query-with-context functions `GetParticularString' and
+     `GetParticularPluralString'.  Whereas `.resources' files can only
      contain data and only support lookups that depend on a single
      string.
 
-  4. The ‘GettextResourceManager’ that loads the message catalogs in
-     ‘.dll’ format also provides for inheritance on a per-message basis.
-     For example, in Austrian (‘de_AT’) locale, translations from the
-     German (‘de’) message catalog will be used for messages not found
-     in the Austrian message catalog.  This has the consequence that the
-     Austrian translators need only translate those few messages for
-     which the translation into Austrian differs from the German one.
-     Whereas when working with ‘.resources’ files, each message catalog
-     must provide the translations of all messages by itself.
+  4. The `GettextResourceManager' that loads the message catalogs in
+     `.dll' format also provides for inheritance on a per-message basis.
+     For example, in Austrian (`de_AT') locale, translations from the
+     German (`de') message catalog will be used for messages not found
+     in the Austrian message catalog.  This has the consequence that
+     the Austrian translators need only translate those few messages
+     for which the translation into Austrian differs from the German
+     one.  Whereas when working with `.resources' files, each message
+     catalog must provide the translations of all messages by itself.
 
-  5. The ‘GettextResourceManager’ that loads the message catalogs in
-     ‘.dll’ format also provides for a fallback: The English MSGID is
+  5. The `GettextResourceManager' that loads the message catalogs in
+     `.dll' format also provides for a fallback: The English MSGID is
      returned when no translation can be found.  Whereas when working
-     with ‘.resources’ files, a language-neutral ‘.resources’ file must
+     with `.resources' files, a language-neutral `.resources' file must
      explicitly be provided as a fallback.
 
    On the side of the programmatic APIs, the programmer can use either
-the standard ‘ResourceManager’ API and the GNU ‘GettextResourceManager’
-API. The latter is an extension of the former, because
-‘GettextResourceManager’ is a subclass of ‘ResourceManager’.
+the standard `ResourceManager' API and the GNU `GettextResourceManager'
+API.  The latter is an extension of the former, because
+`GettextResourceManager' is a subclass of `ResourceManager'.
 
-  1. The ‘System.Resources.ResourceManager’ API.
+  1. The `System.Resources.ResourceManager' API.
 
-     This API works with resources in ‘.resources’ format.
+     This API works with resources in `.resources' format.
 
-     The creation of the ‘ResourceManager’ is done through
+     The creation of the `ResourceManager' is done through
             new ResourceManager(domainname, Assembly.GetExecutingAssembly())
+     The `GetString' function returns a string's translation.  Note
+     that this function returns null when a translation is missing
+     (i.e. not even found in the fallback resource file).
 
-     The ‘GetString’ function returns a string’s translation.  Note that
-     this function returns null when a translation is missing (i.e. not
-     even found in the fallback resource file).
-
-  2. The ‘GNU.Gettext.GettextResourceManager’ API.
+  2. The `GNU.Gettext.GettextResourceManager' API.
 
-     This API works with resources in ‘.dll’ format.
+     This API works with resources in `.dll' format.
 
      Reference documentation is in the csharpdoc directory
      (csharpdoc/index.html).
 
-     The creation of the ‘ResourceManager’ is done through
+     The creation of the `ResourceManager' is done through
             new GettextResourceManager(domainname)
 
-     The ‘GetString’ function returns a string’s translation.  Note that
-     when a translation is missing, the MSGID argument is returned
+     The `GetString' function returns a string's translation.  Note
+     that when a translation is missing, the MSGID argument is returned
      unchanged.
 
-     The ‘GetPluralString’ function returns a string translation with
-     plural handling, like the ‘ngettext’ function in C.
+     The `GetPluralString' function returns a string translation with
+     plural handling, like the `ngettext' function in C.
 
-     The ‘GetParticularString’ function returns a string’s translation,
-     specific to a particular context, like the ‘pgettext’ function in
-     C. Note that when a translation is missing, the MSGID argument is
+     The `GetParticularString' function returns a string's translation,
+     specific to a particular context, like the `pgettext' function in
+     C.  Note that when a translation is missing, the MSGID argument is
      returned unchanged.
 
-     The ‘GetParticularPluralString’ function returns a string
+     The `GetParticularPluralString' function returns a string
      translation, specific to a particular context, with plural
-     handling, like the ‘npgettext’ function in C.
+     handling, like the `npgettext' function in C.
 
-     To use this API, one needs the ‘GNU.Gettext.dll’ file which is part
-     of the GNU gettext package and distributed under the LGPL.
+     To use this API, one needs the `GNU.Gettext.dll' file which is
+     part of the GNU gettext package and distributed under the LGPL.
 
    You can also mix both approaches: use the
-‘GNU.Gettext.GettextResourceManager’ constructor, but otherwise use only
-the ‘ResourceManager’ type and only the ‘GetString’ method.  This is
-appropriate when you want to profit from the tools for PO files, but
-don’t want to change an existing source code that uses ‘ResourceManager’
-and don’t (yet) need the ‘GetPluralString’ method.
+`GNU.Gettext.GettextResourceManager' constructor, but otherwise use
+only the `ResourceManager' type and only the `GetString' method.  This
+is appropriate when you want to profit from the tools for PO files, but
+don't want to change an existing source code that uses
+`ResourceManager' and don't (yet) need the `GetPluralString' method.
 
-   Two examples, using the second API, are available in the ‘examples’
-directory: ‘hello-csharp’, ‘hello-csharp-forms’.
+   Two examples, using the second API, are available in the `examples'
+directory: `hello-csharp', `hello-csharp-forms'.
 
-   Now, to make use of the API and define a shorthand for ‘GetString’,
+   Now, to make use of the API and define a shorthand for `GetString',
 there are two idioms that you can choose from:
 
-   • In a unique class of your project, say ‘Util’, define a static
-     variable holding the ‘ResourceManager’ instance:
+   * In a unique class of your project, say `Util', define a static
+     variable holding the `ResourceManager' instance:
 
           public static GettextResourceManager MyResourceManager =
             new GettextResourceManager("domain-name");
@@ -12499,7 +12415,7 @@
 
           Console.WriteLine(_("Operation completed."));
 
-   • You add a class with a very short name, say ‘S’, containing just
+   * You add a class with a very short name, say `S', containing just
      the definition of the resource manager and of the shorthand:
 
           public class S {
@@ -12528,47 +12444,47 @@
      gawk 3.1 or newer
 
 File extension
-     ‘awk’
+     `awk'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘_"abc"’
+     `_"abc"'
 
 gettext/ngettext functions
-     ‘dcgettext’, missing ‘dcngettext’ in gawk-3.1.0
+     `dcgettext', missing `dcngettext' in gawk-3.1.0
 
 textdomain
-     ‘TEXTDOMAIN’ variable
+     `TEXTDOMAIN' variable
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 setlocale
-     automatic, but missing ‘setlocale (LC_MESSAGES, "")’ in gawk-3.1.0
+     automatic, but missing `setlocale (LC_MESSAGES, "")' in gawk-3.1.0
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘printf "%2$d %1$d"’ (GNU awk only)
+     `printf "%2$d %1$d"' (GNU awk only)
 
 Portability
-     On platforms without gettext, no translation.  On non-GNU awks, you
-     must define ‘dcgettext’, ‘dcngettext’ and ‘bindtextdomain’
+     On platforms without gettext, no translation.  On non-GNU awks,
+     you must define `dcgettext', `dcngettext' and `bindtextdomain'
      yourself.
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-gawk’.
+   An example is available in the `examples' directory: `hello-gawk'.
 
 
 File: gettext.info,  Node: Pascal,  Next: wxWidgets,  Prev: gawk,  Up: List of Programming Languages
@@ -12580,53 +12496,53 @@
      fpk
 
 File extension
-     ‘pp’, ‘pas’
+     `pp', `pas'
 
 String syntax
-     ‘'abc'’
+     `'abc''
 
 gettext shorthand
      automatic
 
 gettext/ngettext functions
-     —, use ‘ResourceString’ data type instead
+     --, use `ResourceString' data type instead
 
 textdomain
-     —, use ‘TranslateResourceStrings’ function instead
+     --, use `TranslateResourceStrings' function instead
 
 bindtextdomain
-     —, use ‘TranslateResourceStrings’ function instead
+     --, use `TranslateResourceStrings' function instead
 
 setlocale
      automatic, but uses only LANG, not LC_MESSAGES or LC_ALL
 
 Prerequisite
-     ‘{$mode delphi}’ or ‘{$mode objfpc}’
-     ‘uses gettext;’
+     `{$mode delphi}' or `{$mode objfpc}'
+     `uses gettext;'
 
 Use or emulate GNU gettext
      emulate partially
 
 Extractor
-     ‘ppc386’ followed by ‘xgettext’ or ‘rstconv’
+     `ppc386' followed by `xgettext' or `rstconv'
 
 Formatting with positions
-     ‘uses sysutils;’
-     ‘format "%1:d %0:d"’
+     `uses sysutils;'
+     `format "%1:d %0:d"'
 
 Portability
      ?
 
 po-mode marking
-     —
+     --
 
-   The Pascal compiler has special support for the ‘ResourceString’ data
-type.  It generates a ‘.rst’ file.  This is then converted to a ‘.pot’
-file by use of ‘xgettext’ or ‘rstconv’.  At runtime, a ‘.mo’ file
-corresponding to translations of this ‘.pot’ file can be loaded using
-the ‘TranslateResourceStrings’ function in the ‘gettext’ unit.
+   The Pascal compiler has special support for the `ResourceString' data
+type.  It generates a `.rst' file.  This is then converted to a `.pot'
+file by use of `xgettext' or `rstconv'.  At runtime, a `.mo' file
+corresponding to translations of this `.pot' file can be loaded using
+the `TranslateResourceStrings' function in the `gettext' unit.
 
-   An example is available in the ‘examples’ directory: ‘hello-pascal’.
+   An example is available in the `examples' directory: `hello-pascal'.
 
 
 File: gettext.info,  Node: wxWidgets,  Next: YCP,  Prev: Pascal,  Up: List of Programming Languages
@@ -12638,38 +12554,38 @@
      wxGTK, gettext
 
 File extension
-     ‘cpp’
+     `cpp'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘_("abc")’
+     `_("abc")'
 
 gettext/ngettext functions
-     ‘wxLocale::GetString’, ‘wxGetTranslation’
+     `wxLocale::GetString', `wxGetTranslation'
 
 textdomain
-     ‘wxLocale::AddCatalog’
+     `wxLocale::AddCatalog'
 
 bindtextdomain
-     ‘wxLocale::AddCatalogLookupPathPrefix’
+     `wxLocale::AddCatalogLookupPathPrefix'
 
 setlocale
-     ‘wxLocale::Init’, ‘wxSetLocale’
+     `wxLocale::Init', `wxSetLocale'
 
 Prerequisite
-     ‘#include <wx/intl.h>’
+     `#include <wx/intl.h>'
 
 Use or emulate GNU gettext
-     emulate, see ‘include/wx/intl.h’ and ‘src/common/intl.cpp’
+     emulate, see `include/wx/intl.h' and `src/common/intl.cpp'
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
      wxString::Format supports positions if and only if the system has
-     ‘wprintf()’, ‘vswprintf()’ functions and they support positions
+     `wprintf()', `vswprintf()' functions and they support positions
      according to POSIX.
 
 Portability
@@ -12688,106 +12604,106 @@
      libycp, libycp-devel, yast2-core, yast2-core-devel
 
 File extension
-     ‘ycp’
+     `ycp'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘_("abc")’
+     `_("abc")'
 
 gettext/ngettext functions
-     ‘_()’ with 1 or 3 arguments
+     `_()' with 1 or 3 arguments
 
 textdomain
-     ‘textdomain’ statement
+     `textdomain' statement
 
 bindtextdomain
-     —
+     --
 
 setlocale
-     —
+     --
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘sformat "%2 %1"’
+     `sformat "%2 %1"'
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-ycp’.
+   An example is available in the `examples' directory: `hello-ycp'.
 
 
 File: gettext.info,  Node: Tcl,  Next: Perl,  Prev: YCP,  Up: List of Programming Languages
 
-15.5.17 Tcl - Tk’s scripting language
+15.5.17 Tcl - Tk's scripting language
 -------------------------------------
 
 RPMs
      tcl
 
 File extension
-     ‘tcl’
+     `tcl'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘[_ "abc"]’
+     `[_ "abc"]'
 
 gettext/ngettext functions
-     ‘::msgcat::mc’
+     `::msgcat::mc'
 
 textdomain
-     —
+     --
 
 bindtextdomain
-     —, use ‘::msgcat::mcload’ instead
+     --, use `::msgcat::mcload' instead
 
 setlocale
      automatic, uses LANG, but ignores LC_MESSAGES and LC_ALL
 
 Prerequisite
-     ‘package require msgcat’
-     ‘proc _ {s} {return [::msgcat::mc $s]}’
+     `package require msgcat'
+     `proc _ {s} {return [::msgcat::mc $s]}'
 
 Use or emulate GNU gettext
-     —, uses a Tcl specific message catalog format
+     --, uses a Tcl specific message catalog format
 
 Extractor
-     ‘xgettext -k_’
+     `xgettext -k_'
 
 Formatting with positions
-     ‘format "%2\$d %1\$d"’
+     `format "%2\$d %1\$d"'
 
 Portability
      fully portable
 
 po-mode marking
-     —
+     --
 
-   Two examples are available in the ‘examples’ directory: ‘hello-tcl’,
-‘hello-tcl-tk’.
+   Two examples are available in the `examples' directory: `hello-tcl',
+`hello-tcl-tk'.
 
    Before marking strings as internationalizable, substitutions of
-variables into the string need to be converted to ‘format’ applications.
-For example, ‘"file $filename not found"’ becomes ‘[format "file %s not
-found" $filename]’.  Only after this is done, can the strings be marked
-and extracted.  After marking, this example becomes ‘[format [_ "file %s
-not found"] $filename]’ or ‘[msgcat::mc "file %s not found" $filename]’.
-Note that the ‘msgcat::mc’ function implicitly calls ‘format’ when more
-than one argument is given.
+variables into the string need to be converted to `format'
+applications.  For example, `"file $filename not found"' becomes
+`[format "file %s not found" $filename]'.  Only after this is done, can
+the strings be marked and extracted.  After marking, this example
+becomes `[format [_ "file %s not found"] $filename]' or `[msgcat::mc
+"file %s not found" $filename]'.  Note that the `msgcat::mc' function
+implicitly calls `format' when more than one argument is given.
 
 
 File: gettext.info,  Node: Perl,  Next: PHP,  Prev: Tcl,  Up: List of Programming Languages
@@ -12799,56 +12715,56 @@
      perl
 
 File extension
-     ‘pl’, ‘PL’, ‘pm’, ‘perl’, ‘cgi’
+     `pl', `PL', `pm', `cgi'
 
 String syntax
+        * `"abc"'
 
-        • ‘"abc"’
+        * `'abc''
 
-        • ‘'abc'’
+        * `qq (abc)'
 
-        • ‘qq (abc)’
+        * `q (abc)'
 
-        • ‘q (abc)’
+        * `qr /abc/'
 
-        • ‘qr /abc/’
+        * `qx (/bin/date)'
 
-        • ‘qx (/bin/date)’
+        * `/pattern match/'
 
-        • ‘/pattern match/’
+        * `?pattern match?'
 
-        • ‘?pattern match?’
+        * `s/substitution/operators/'
 
-        • ‘s/substitution/operators/’
+        * `$tied_hash{"message"}'
 
-        • ‘$tied_hash{"message"}’
+        * `$tied_hash_reference->{"message"}'
 
-        • ‘$tied_hash_reference->{"message"}’
+        * etc., issue the command `man perlsyn' for details
 
-        • etc., issue the command ‘man perlsyn’ for details
 
 gettext shorthand
-     ‘__’ (double underscore)
+     `__' (double underscore)
 
 gettext/ngettext functions
-     ‘gettext’, ‘dgettext’, ‘dcgettext’, ‘ngettext’, ‘dngettext’,
-     ‘dcngettext’
+     `gettext', `dgettext', `dcgettext', `ngettext', `dngettext',
+     `dcngettext'
 
 textdomain
-     ‘textdomain’ function
+     `textdomain' function
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 bind_textdomain_codeset
-     ‘bind_textdomain_codeset’ function
+     `bind_textdomain_codeset' function
 
 setlocale
-     Use ‘setlocale (LC_ALL, "");’
+     Use `setlocale (LC_ALL, "");'
 
 Prerequisite
-     ‘use POSIX;’
-     ‘use Locale::TextDomain;’ (included in the package libintl-perl
+     `use POSIX;'
+     `use Locale::TextDomain;' (included in the package libintl-perl
      which is available on the Comprehensive Perl Archive Network CPAN,
      http://www.cpan.org/).
 
@@ -12857,36 +12773,37 @@
      gettext
 
 Extractor
-     ‘xgettext -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2
-     -kN__ -k’
+     `xgettext -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2
+     -kN__ -k'
 
 Formatting with positions
      Both kinds of format strings support formatting with positions.
-     ‘printf "%2\$d %1\$d", ...’ (requires Perl 5.8.0 or newer)
-     ‘__expand("[new] replaces [old]", old => $oldvalue, new =>
-     $newvalue)’
+     `printf "%2\$d %1\$d", ...' (requires Perl 5.8.0 or newer)
+     `__expand("[new] replaces [old]", old => $oldvalue, new =>
+     $newvalue)'
 
 Portability
-     The ‘libintl-perl’ package is platform independent but is not part
+     The `libintl-perl' package is platform independent but is not part
      of the Perl core.  The programmer is responsible for providing a
      dummy implementation of the required functions if the package is
      not installed on the target system.
 
 po-mode marking
-     —
+     --
 
 Documentation
-     Included in ‘libintl-perl’, available on CPAN
+     Included in `libintl-perl', available on CPAN
      (http://www.cpan.org/).
 
-   An example is available in the ‘examples’ directory: ‘hello-perl’.
 
-   The ‘xgettext’ parser backend for Perl differs significantly from the
-parser backends for other programming languages, just as Perl itself
-differs significantly from other programming languages.  The Perl parser
-backend offers many more string marking facilities than the other
-backends but it also has some Perl specific limitations, the worst
-probably being its imperfectness.
+   An example is available in the `examples' directory: `hello-perl'.
+
+   The `xgettext' parser backend for Perl differs significantly from
+the parser backends for other programming languages, just as Perl
+itself differs significantly from other programming languages.  The
+Perl parser backend offers many more string marking facilities than the
+other backends but it also has some Perl specific limitations, the
+worst probably being its imperfectness.
 
 * Menu:
 
@@ -12901,7 +12818,7 @@
 * Perl Pitfalls::               Bugs, Pitfalls, and Things That Do Not Work
 
 
-File: gettext.info,  Node: General Problems,  Next: Default Keywords,  Prev: Perl,  Up: Perl
+File: gettext.info,  Node: General Problems,  Next: Default Keywords,  Up: Perl
 
 15.5.18.1 General Problems Parsing Perl Code
 ............................................
@@ -12920,7 +12837,7 @@
      open gettext, ">testfile" or die;
      print gettext "Hello world!"
 
-   In this context, the string ‘gettext’ looks more like a file handle.
+   In this context, the string `gettext' looks more like a file handle.
 But not necessarily:
 
      use Locale::Messages qw (:libintl_h);
@@ -12928,17 +12845,17 @@
      print gettext "Hello world!";
 
    Now, the file is probably syntactically incorrect, provided that the
-module ‘Locale::Messages’ found first in the Perl include path exports a
-function ‘gettext’.  But what if the module ‘Locale::Messages’ really
+module `Locale::Messages' found first in the Perl include path exports a
+function `gettext'.  But what if the module `Locale::Messages' really
 looks like this?
 
      use vars qw (*gettext);
 
      1;
 
-   In this case, the string ‘gettext’ will be interpreted as a file
-handle again, and the above example will create a file ‘testfile’ and
-write the string “Hello world!” into it.  Even advanced control flow
+   In this case, the string `gettext' will be interpreted as a file
+handle again, and the above example will create a file `testfile' and
+write the string "Hello world!" into it.  Even advanced control flow
 analysis will not really help:
 
      if (0.5 < rand) {
@@ -12948,17 +12865,17 @@
      }
      print gettext "Hello world!";
 
-   If the module ‘Sane’ exports a function ‘gettext’ that does what we
-expect, and the module ‘InSane’ opens a file for writing and associates
-the _handle_ ‘gettext’ with this output stream, we are clueless again
-about what will happen at runtime.  It is completely unpredictable.  The
-truth is that Perl has so many ways to fill its symbol table at runtime
-that it is impossible to interpret a particular piece of code without
-executing it.
-
-   Of course, ‘xgettext’ will not execute your Perl sources while
-scanning for translatable strings, but rather use heuristics in order to
-guess what you meant.
+   If the module `Sane' exports a function `gettext' that does what we
+expect, and the module `InSane' opens a file for writing and associates
+the _handle_ `gettext' with this output stream, we are clueless again
+about what will happen at runtime.  It is completely unpredictable.
+The truth is that Perl has so many ways to fill its symbol table at
+runtime that it is impossible to interpret a particular piece of code
+without executing it.
+
+   Of course, `xgettext' will not execute your Perl sources while
+scanning for translatable strings, but rather use heuristics in order
+to guess what you meant.
 
    Another problem is the ambiguity of the slash and the question mark.
 Their interpretation depends on the context:
@@ -12978,12 +12895,12 @@
    The slash may either act as the division operator or introduce a
 pattern match, whereas the question mark may act as the ternary
 conditional operator or as a pattern match, too.  Other programming
-languages like ‘awk’ present similar problems, but the consequences of a
-misinterpretation are particularly nasty with Perl sources.  In ‘awk’
+languages like `awk' present similar problems, but the consequences of a
+misinterpretation are particularly nasty with Perl sources.  In `awk'
 for instance, a statement can never exceed one line and the parser can
 recover from a parsing error at the next newline and interpret the rest
-of the input stream correctly.  Perl is different, as a pattern match is
-terminated by the next appearance of the delimiter (the slash or the
+of the input stream correctly.  Perl is different, as a pattern match
+is terminated by the next appearance of the delimiter (the slash or the
 question mark) in the input stream, regardless of the semantic context.
 If a slash is really a division sign but mis-interpreted as a pattern
 match, the rest of the input file is most probably parsed incorrectly.
@@ -12993,42 +12910,42 @@
 
      $x = wantarray ? 1 : 0;
 
-   The Perl built-in function ‘wantarray’ does not accept any arguments.
+   The Perl built-in function `wantarray' does not accept any arguments.
 The Perl parser therefore knows that the question mark does not start a
 regular expression but is the ternary conditional operator.
 
      sub wantarrays {}
      $x = wantarrays ? 1 : 0;
 
-   Now the situation is different.  The function ‘wantarrays’ takes a
+   Now the situation is different.  The function `wantarrays' takes a
 variable number of arguments (like any non-prototyped Perl function).
-The question mark is now the delimiter of a pattern match, and hence the
-piece of code does not compile.
+The question mark is now the delimiter of a pattern match, and hence
+the piece of code does not compile.
 
      sub wantarrays() {}
      $x = wantarrays ? 1 : 0;
 
    Now the function is prototyped, Perl knows that it does not accept
 any arguments, and the question mark is therefore interpreted as the
-ternaray operator again.  But that unfortunately outsmarts ‘xgettext’.
+ternaray operator again.  But that unfortunately outsmarts `xgettext'.
 
-   The Perl parser in ‘xgettext’ cannot know whether a function has a
+   The Perl parser in `xgettext' cannot know whether a function has a
 prototype and what that prototype would look like.  It therefore makes
 an educated guess.  If a function is known to be a Perl built-in and
 this function does not accept any arguments, a following question mark
 or slash is treated as an operator, otherwise as the delimiter of a
 following regular expression.  The Perl built-ins that do not accept
-arguments are ‘wantarray’, ‘fork’, ‘time’, ‘times’, ‘getlogin’,
-‘getppid’, ‘getpwent’, ‘getgrent’, ‘gethostent’, ‘getnetent’,
-‘getprotoent’, ‘getservent’, ‘setpwent’, ‘setgrent’, ‘endpwent’,
-‘endgrent’, ‘endhostent’, ‘endnetent’, ‘endprotoent’, and ‘endservent’.
-
-   If you find that ‘xgettext’ fails to extract strings from portions of
-your sources, you should therefore look out for slashes and/or question
-marks preceding these sections.  You may have come across a bug in
-‘xgettext’’s Perl parser (and of course you should report that bug).  In
-the meantime you should consider to reformulate your code in a manner
-less challenging to ‘xgettext’.
+arguments are `wantarray', `fork', `time', `times', `getlogin',
+`getppid', `getpwent', `getgrent', `gethostent', `getnetent',
+`getprotoent', `getservent', `setpwent', `setgrent', `endpwent',
+`endgrent', `endhostent', `endnetent', `endprotoent', and `endservent'.
+
+   If you find that `xgettext' fails to extract strings from portions
+of your sources, you should therefore look out for slashes and/or
+question marks preceding these sections.  You may have come across a
+bug in `xgettext''s Perl parser (and of course you should report that
+bug).  In the meantime you should consider to reformulate your code in
+a manner less challenging to `xgettext'.
 
    In particular, if the parser is too dumb to see that a function does
 not accept arguments, use parentheses:
@@ -13045,42 +12962,43 @@
 15.5.18.2 Which keywords will xgettext look for?
 ................................................
 
-   Unless you instruct ‘xgettext’ otherwise by invoking it with one of
-the options ‘--keyword’ or ‘-k’, it will recognize the following
+   Unless you instruct `xgettext' otherwise by invoking it with one of
+the options `--keyword' or `-k', it will recognize the following
 keywords in your Perl sources:
 
-   • ‘gettext’
+   * `gettext'
 
-   • ‘dgettext’
+   * `dgettext'
 
-   • ‘dcgettext’
+   * `dcgettext'
 
-   • ‘ngettext:1,2’
+   * `ngettext:1,2'
 
      The first (singular) and the second (plural) argument will be
      extracted.
 
-   • ‘dngettext:1,2’
+   * `dngettext:1,2'
 
      The first (singular) and the second (plural) argument will be
      extracted.
 
-   • ‘dcngettext:1,2’
+   * `dcngettext:1,2'
 
      The first (singular) and the second (plural) argument will be
      extracted.
 
-   • ‘gettext_noop’
+   * `gettext_noop'
 
-   • ‘%gettext’
+   * `%gettext'
 
-     The keys of lookups into the hash ‘%gettext’ will be extracted.
+     The keys of lookups into the hash `%gettext' will be extracted.
 
-   • ‘$gettext’
+   * `$gettext'
 
-     The keys of lookups into the hash reference ‘$gettext’ will be
+     The keys of lookups into the hash reference `$gettext' will be
      extracted.
 
+
 
 File: gettext.info,  Node: Special Keywords,  Next: Quote-like Expressions,  Prev: Default Keywords,  Up: Perl
 
@@ -13089,8 +13007,8 @@
 
    Translating messages at runtime is normally performed by looking up
 the original string in the translation database and returning the
-translated version.  The “natural” Perl implementation is a hash lookup,
-and, of course, ‘xgettext’ supports such practice.
+translated version.  The "natural" Perl implementation is a hash
+lookup, and, of course, `xgettext' supports such practice.
 
      print __"Hello world!";
      print $__{"Hello world!"};
@@ -13098,10 +13016,10 @@
      print $$__{"Hello world!"};
 
    The above four lines all do the same thing.  The Perl module
-‘Locale::TextDomain’ exports by default a hash ‘%__’ that is tied to the
-function ‘__()’.  It also exports a reference ‘$__’ to ‘%__’.
+`Locale::TextDomain' exports by default a hash `%__' that is tied to
+the function `__()'.  It also exports a reference `$__' to `%__'.
 
-   If an argument to the ‘xgettext’ option ‘--keyword’, resp.  ‘-k’
+   If an argument to the `xgettext' option `--keyword', resp. `-k'
 starts with a percent sign, the rest of the keyword is interpreted as
 the name of a hash.  If it starts with a dollar sign, the rest of the
 keyword is interpreted as a reference to a hash.
@@ -13112,10 +13030,10 @@
      print $gettext{Error};
 
    The exact rule is: You can omit the surrounding quotes, when the hash
-key is a valid C (!)  identifier, i.e. when it starts with an underscore
+key is a valid C (!) identifier, i.e. when it starts with an underscore
 or an ASCII letter and is followed by an arbitrary number of
 underscores, ASCII letters or digits.  Other Unicode characters are
-_not_ allowed, regardless of the ‘use utf8’ pragma.
+_not_ allowed, regardless of the `use utf8' pragma.
 
 
 File: gettext.info,  Node: Quote-like Expressions,  Next: Interpolation I,  Prev: Special Keywords,  Up: Perl
@@ -13125,45 +13043,45 @@
 
    Perl offers a plethora of different string constructs.  Those that
 can be used either as arguments to functions or inside braces for hash
-lookups are generally supported by ‘xgettext’.
+lookups are generally supported by `xgettext'.
 
-   • *double-quoted strings*
+   * *double-quoted strings*
           print gettext "Hello World!";
 
-   • *single-quoted strings*
+   * *single-quoted strings*
           print gettext 'Hello World!';
 
-   • *the operator qq*
+   * *the operator qq*
           print gettext qq |Hello World!|;
           print gettext qq <E-mail: <guido\@imperia.net>>;
 
-     The operator ‘qq’ is fully supported.  You can use arbitrary
+     The operator `qq' is fully supported.  You can use arbitrary
      delimiters, including the four bracketing delimiters (round, angle,
      square, curly) that nest.
 
-   • *the operator q*
+   * *the operator q*
           print gettext q |Hello World!|;
           print gettext q <E-mail: <guido@imperia.net>>;
 
-     The operator ‘q’ is fully supported.  You can use arbitrary
+     The operator `q' is fully supported.  You can use arbitrary
      delimiters, including the four bracketing delimiters (round, angle,
      square, curly) that nest.
 
-   • *the operator qx*
+   * *the operator qx*
           print gettext qx ;LANGUAGE=C /bin/date;
           print gettext qx [/usr/bin/ls | grep '^[A-Z]*'];
 
-     The operator ‘qx’ is fully supported.  You can use arbitrary
+     The operator `qx' is fully supported.  You can use arbitrary
      delimiters, including the four bracketing delimiters (round, angle,
      square, curly) that nest.
 
-     The example is actually a useless use of ‘gettext’.  It will invoke
-     the ‘gettext’ function on the output of the command specified with
-     the ‘qx’ operator.  The feature was included in order to make the
-     interface consistent (the parser will extract all strings and
-     quote-like expressions).
+     The example is actually a useless use of `gettext'.  It will
+     invoke the `gettext' function on the output of the command
+     specified with the `qx' operator.  The feature was included in
+     order to make the interface consistent (the parser will extract
+     all strings and quote-like expressions).
 
-   • *here documents*
+   * *here documents*
           print gettext <<'EOF';
           program not found in $PATH
           EOF
@@ -13181,6 +13099,7 @@
 
      Delimiters that start with a digit are not supported!
 
+
 
 File: gettext.info,  Node: Interpolation I,  Next: Interpolation II,  Prev: Quote-like Expressions,  Up: Perl
 
@@ -13194,21 +13113,21 @@
 
      print gettext "This is the program $0!\n";
 
-   Perl will interpolate at runtime the value of the variable ‘$0’ into
-the argument of the ‘gettext()’ function.  Hence, this argument is not a
-string constant but a variable argument (‘$0’ is a global variable that
-holds the name of the Perl script being executed).  The interpolation is
-performed by Perl before the string argument is passed to ‘gettext()’
-and will therefore depend on the name of the script which can only be
-determined at runtime.  Consequently, it is almost impossible that a
-translation can be looked up at runtime (except if, by accident, the
-interpolated string is found in the message catalog).
+   Perl will interpolate at runtime the value of the variable `$0' into
+the argument of the `gettext()' function.  Hence, this argument is not
+a string constant but a variable argument (`$0' is a global variable
+that holds the name of the Perl script being executed).  The
+interpolation is performed by Perl before the string argument is passed
+to `gettext()' and will therefore depend on the name of the script
+which can only be determined at runtime.  Consequently, it is almost
+impossible that a translation can be looked up at runtime (except if,
+by accident, the interpolated string is found in the message catalog).
 
-   The ‘xgettext’ program will therefore terminate parsing with a fatal
+   The `xgettext' program will therefore terminate parsing with a fatal
 error if it encounters a variable inside of an extracted string.  In
 general, this will happen for all kinds of string interpolations that
-cannot be safely performed at compile time.  If you absolutely know what
-you are doing, you can always circumvent this behavior:
+cannot be safely performed at compile time.  If you absolutely know
+what you are doing, you can always circumvent this behavior:
 
      my $know_what_i_am_doing = "This is program $0!\n";
      print gettext $know_what_i_am_doing;
@@ -13218,60 +13137,60 @@
 You will have to find another way, however, to let your original string
 make it into your message catalog.
 
-   If invoked with the option ‘--extract-all’, resp.  ‘-a’, variable
+   If invoked with the option `--extract-all', resp. `-a', variable
 interpolation will be accepted.  Rationale: You will generally use this
 option in order to prepare your sources for internationalization.
 
-   Please see the manual page ‘man perlop’ for details of strings and
+   Please see the manual page `man perlop' for details of strings and
 quote-like expressions that are subject to interpolation and those that
 are not.  Safe interpolations (that will not lead to a fatal error) are:
 
-   • the escape sequences ‘\t’ (tab, HT, TAB), ‘\n’ (newline, NL), ‘\r’
-     (return, CR), ‘\f’ (form feed, FF), ‘\b’ (backspace, BS), ‘\a’
-     (alarm, bell, BEL), and ‘\e’ (escape, ESC).
-
-   • octal chars, like ‘\033’
-     Note that octal escapes in the range of 400-777 are translated into
-     a UTF-8 representation, regardless of the presence of the ‘use
-     utf8’ pragma.
+   * the escape sequences `\t' (tab, HT, TAB), `\n' (newline, NL), `\r'
+     (return, CR), `\f' (form feed, FF), `\b' (backspace, BS), `\a'
+     (alarm, bell, BEL), and `\e' (escape, ESC).
+
+   * octal chars, like `\033'
+     Note that octal escapes in the range of 400-777 are translated
+     into a UTF-8 representation, regardless of the presence of the
+     `use utf8' pragma.
 
-   • hex chars, like ‘\x1b’
+   * hex chars, like `\x1b'
 
-   • wide hex chars, like ‘\x{263a}’
+   * wide hex chars, like `\x{263a}'
      Note that this escape is translated into a UTF-8 representation,
-     regardless of the presence of the ‘use utf8’ pragma.
+     regardless of the presence of the `use utf8' pragma.
 
-   • control chars, like ‘\c[’ (CTRL-[)
-
-   • named Unicode chars, like ‘\N{LATIN CAPITAL LETTER C WITH CEDILLA}’
+   * control chars, like `\c[' (CTRL-[)
 
+   * named Unicode chars, like `\N{LATIN CAPITAL LETTER C WITH CEDILLA}'
      Note that this escape is translated into a UTF-8 representation,
-     regardless of the presence of the ‘use utf8’ pragma.
+     regardless of the presence of the `use utf8' pragma.
 
    The following escapes are considered partially safe:
 
-   • ‘\l’ lowercase next char
+   * `\l' lowercase next char
+
+   * `\u' uppercase next char
 
-   • ‘\u’ uppercase next char
+   * `\L' lowercase till \E
 
-   • ‘\L’ lowercase till \E
+   * `\U' uppercase till \E
 
-   • ‘\U’ uppercase till \E
+   * `\E' end case modification
 
-   • ‘\E’ end case modification
+   * `\Q' quote non-word characters till \E
 
-   • ‘\Q’ quote non-word characters till \E
 
    These escapes are only considered safe if the string consists of
 ASCII characters only.  Translation of characters outside the range
 defined by ASCII is locale-dependent and can actually only be performed
-at runtime; ‘xgettext’ doesn’t do these locale-dependent translations at
-extraction time.
+at runtime; `xgettext' doesn't do these locale-dependent translations
+at extraction time.
 
-   Except for the modifier ‘\Q’, these translations, albeit valid, are
-generally useless and only obfuscate your sources.  If a translation can
-be safely performed at compile time you can just as well write what you
-mean.
+   Except for the modifier `\Q', these translations, albeit valid, are
+generally useless and only obfuscate your sources.  If a translation
+can be safely performed at compile time you can just as well write what
+you mean.
 
 
 File: gettext.info,  Node: Interpolation II,  Next: Parentheses,  Prev: Interpolation I,  Up: Perl
@@ -13317,16 +13236,16 @@
 readability.
 
    You can interpolate hash lookups in all strings or quote-like
-expressions that are subject to interpolation (see the manual page ‘man
-perlop’ for details).  Double interpolation is invalid, however:
+expressions that are subject to interpolation (see the manual page `man
+perlop' for details).  Double interpolation is invalid, however:
 
      # TRANSLATORS: Replace "the earth" with the name of your planet.
      print gettext qq{Welcome to $gettext->{"the earth"}};
 
-   The ‘qq’-quoted string is recognized as an argument to ‘xgettext’ in
+   The `qq'-quoted string is recognized as an argument to `xgettext' in
 the first place, and checked for invalid variable interpolation.  The
 dollar sign of hash-dereferencing will therefore terminate the parser
-with an “invalid interpolation” error.
+with an "invalid interpolation" error.
 
    It is valid to interpolate hash lookups in regular expressions:
 
@@ -13342,10 +13261,11 @@
 .................................
 
    In Perl, parentheses around function arguments are mostly optional.
-‘xgettext’ will always assume that all recognized keywords (except for
+`xgettext' will always assume that all recognized keywords (except for
 hashes and hash references) are names of properly prototyped functions,
-and will (hopefully) only require parentheses where Perl itself requires
-them.  All constructs in the following example are therefore ok to use:
+and will (hopefully) only require parentheses where Perl itself
+requires them.  All constructs in the following example are therefore
+ok to use:
 
      print gettext ("Hello World!\n");
      print gettext "Hello World!\n";
@@ -13382,7 +13302,7 @@
 
    The necessity of long messages can often lead to a cumbersome or
 unreadable coding style.  Perl has several options that may prevent you
-from writing unreadable code, and ‘xgettext’ does its best to do
+from writing unreadable code, and `xgettext' does its best to do
 likewise.  This is where the dot operator (the string concatenation
 operator) may come in handy:
 
@@ -13393,12 +13313,12 @@
                     . " multiple lines.\n");
 
    Perl is smart enough to concatenate these constant string fragments
-into one long string at compile time, and so is ‘xgettext’.  You will
+into one long string at compile time, and so is `xgettext'.  You will
 only find one long message in the resulting POT file.
 
-   Note that the future Perl 6 will probably use the underscore (‘_’) as
-the string concatenation operator, and the dot (‘.’) for dereferencing.
-This new syntax is not yet supported by ‘xgettext’.
+   Note that the future Perl 6 will probably use the underscore (`_')
+as the string concatenation operator, and the dot (`.') for
+dereferencing.  This new syntax is not yet supported by `xgettext'.
 
    If embedded newline characters are not an issue, or even desired, you
 may also insert newline characters inside quoted strings wherever you
@@ -13430,7 +13350,7 @@
 15.5.18.9 Bugs, Pitfalls, And Things That Do Not Work
 .....................................................
 
-   The foregoing sections should have proven that ‘xgettext’ is quite
+   The foregoing sections should have proven that `xgettext' is quite
 smart in extracting translatable strings from Perl sources.  Yet, some
 more or less exotic constructs that could be expected to work, actually
 do not work.
@@ -13448,15 +13368,15 @@
      EOF
 
    This is valid Perl code and will actually trigger invocations of the
-‘gettext’ function at runtime.  Yet, the Perl parser in ‘xgettext’ will
+`gettext' function at runtime.  Yet, the Perl parser in `xgettext' will
 fail to recognize the strings.  A less obvious example can be found in
 the interpolation of regular expressions:
 
      s/<!--START_OF_WEEK-->/gettext ("Sunday")/e;
 
-   The modifier ‘e’ will cause the substitution to be interpreted as an
-evaluable statement.  Consequently, at runtime the function ‘gettext()’
-is called, but again, the parser fails to extract the string “Sunday”.
+   The modifier `e' will cause the substitution to be interpreted as an
+evaluable statement.  Consequently, at runtime the function `gettext()'
+is called, but again, the parser fails to extract the string "Sunday".
 Use a temporary variable as a simple workaround if you really happen to
 need this feature:
 
@@ -13471,13 +13391,13 @@
      @weekdays = @gettext{qw (Sunday Monday Tuesday Wednesday Thursday
                               Friday Saturday) };
 
-   This is perfectly valid usage of the tied hash ‘%gettext’ but the
+   This is perfectly valid usage of the tied hash `%gettext' but the
 strings are not recognized and therefore will not be extracted.
 
    Another caveat of the current version is its rudimentary support for
-non-ASCII characters in identifiers.  You may encounter serious problems
-if you use identifiers with characters outside the range of ’A’-’Z’,
-’a’-’z’, ’0’-’9’ and the underscore ’_’.
+non-ASCII characters in identifiers.  You may encounter serious
+problems if you use identifiers with characters outside the range of
+'A'-'Z', 'a'-'z', '0'-'9' and the underscore '_'.
 
    Maybe some of these missing features will be implemented in future
 versions, but since you can always make do without them at minimal
@@ -13494,33 +13414,33 @@
 
      die __x ("usage: {program} {OPTIONS} FILENAME...\n", program => $0);
 
-   Whereas ‘{program}’ is a placeholder, ‘{OPTIONS}’ is not and should
-probably be translated.  Yet, there is no way to teach the Perl parser
-in ‘xgettext’ to recognize the first one, and leave the other one alone.
+   Whereas `{program}' is a placeholder, `{OPTIONS}' is not and should
+probably be translated. Yet, there is no way to teach the Perl parser
+in `xgettext' to recognize the first one, and leave the other one alone.
 
    There are two possible work-arounds for this problem.  If you are
 sure that your program will run under Perl 5.8.0 or newer (these Perl
-versions handle positional parameters in ‘printf()’) or if you are sure
+versions handle positional parameters in `printf()') or if you are sure
 that the translator will not have to reorder the arguments in her
-translation – for example if you have only one brace placeholder in your
-string, or if it describes a syntax, like in this one –, you can mark
-the string as ‘no-perl-brace-format’ and use ‘printf()’:
+translation - for example if you have only one brace placeholder in
+your string, or if it describes a syntax, like in this one -, you can
+mark the string as `no-perl-brace-format' and use `printf()':
 
      # xgettext: no-perl-brace-format
      die sprintf ("usage: %s {OPTIONS} FILENAME...\n", $0);
 
-   If you want to use the more portable Perl brace format, you will have
-to do put placeholders in place of the literal braces:
+   If you want to use the more portable Perl brace format, you will
+have to do put placeholders in place of the literal braces:
 
      die __x ("usage: {program} {[}OPTIONS{]} FILENAME...\n",
               program => $0, '[' => '{', ']' => '}');
 
    Perl brace format strings know no escaping mechanism.  No matter how
-this escaping mechanism looked like, it would either give the programmer
-a hard time, make translating Perl brace format strings heavy-going, or
-result in a performance penalty at runtime, when the format directives
-get executed.  Most of the time you will happily get along with
-‘printf()’ for this special case.
+this escaping mechanism looked like, it would either give the
+programmer a hard time, make translating Perl brace format strings
+heavy-going, or result in a performance penalty at runtime, when the
+format directives get executed.  Most of the time you will happily get
+along with `printf()' for this special case.
 
 
 File: gettext.info,  Node: PHP,  Next: Pike,  Prev: Perl,  Up: List of Programming Languages
@@ -13532,46 +13452,46 @@
      mod_php4, mod_php4-core, phpdoc
 
 File extension
-     ‘php’, ‘php3’, ‘php4’
+     `php', `php3', `php4'
 
 String syntax
-     ‘"abc"’, ‘'abc'’
+     `"abc"', `'abc''
 
 gettext shorthand
-     ‘_("abc")’
+     `_("abc")'
 
 gettext/ngettext functions
-     ‘gettext’, ‘dgettext’, ‘dcgettext’; starting with PHP 4.2.0 also
-     ‘ngettext’, ‘dngettext’, ‘dcngettext’
+     `gettext', `dgettext', `dcgettext'; starting with PHP 4.2.0 also
+     `ngettext', `dngettext', `dcngettext'
 
 textdomain
-     ‘textdomain’ function
+     `textdomain' function
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 setlocale
-     Programmer must call ‘setlocale (LC_ALL, "")’
+     Programmer must call `setlocale (LC_ALL, "")'
 
 Prerequisite
-     —
+     --
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 Formatting with positions
-     ‘printf "%2\$d %1\$d"’
+     `printf "%2\$d %1\$d"'
 
 Portability
      On platforms without gettext, the functions are not available.
 
 po-mode marking
-     —
+     --
 
-   An example is available in the ‘examples’ directory: ‘hello-php’.
+   An example is available in the `examples' directory: `hello-php'.
 
 
 File: gettext.info,  Node: Pike,  Next: GCC-source,  Prev: PHP,  Up: List of Programming Languages
@@ -13583,46 +13503,46 @@
      roxen
 
 File extension
-     ‘pike’
+     `pike'
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     —
+     --
 
 gettext/ngettext functions
-     ‘gettext’, ‘dgettext’, ‘dcgettext’
+     `gettext', `dgettext', `dcgettext'
 
 textdomain
-     ‘textdomain’ function
+     `textdomain' function
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 setlocale
-     ‘setlocale’ function
+     `setlocale' function
 
 Prerequisite
-     ‘import Locale.Gettext;’
+     `import Locale.Gettext;'
 
 Use or emulate GNU gettext
      use
 
 Extractor
-     —
+     --
 
 Formatting with positions
-     —
+     --
 
 Portability
      On platforms without gettext, the functions are not available.
 
 po-mode marking
-     —
+     --
 
 
-File: gettext.info,  Node: GCC-source,  Next: Lua,  Prev: Pike,  Up: List of Programming Languages
+File: gettext.info,  Node: GCC-source,  Prev: Pike,  Up: List of Programming Languages
 
 15.5.21 GNU Compiler Collection sources
 ---------------------------------------
@@ -13631,38 +13551,38 @@
      gcc
 
 File extension
-     ‘c’, ‘h’.
+     `c', `h'.
 
 String syntax
-     ‘"abc"’
+     `"abc"'
 
 gettext shorthand
-     ‘_("abc")’
+     `_("abc")'
 
 gettext/ngettext functions
-     ‘gettext’, ‘dgettext’, ‘dcgettext’, ‘ngettext’, ‘dngettext’,
-     ‘dcngettext’
+     `gettext', `dgettext', `dcgettext', `ngettext', `dngettext',
+     `dcngettext'
 
 textdomain
-     ‘textdomain’ function
+     `textdomain' function
 
 bindtextdomain
-     ‘bindtextdomain’ function
+     `bindtextdomain' function
 
 setlocale
-     Programmer must call ‘setlocale (LC_ALL, "")’
+     Programmer must call `setlocale (LC_ALL, "")'
 
 Prerequisite
-     ‘#include "intl.h"’
+     `#include "intl.h"'
 
 Use or emulate GNU gettext
      Use
 
 Extractor
-     ‘xgettext -k_’
+     `xgettext -k_'
 
 Formatting with positions
-     —
+     --
 
 Portability
      Uses autoconf macros
@@ -13671,118 +13591,6 @@
      yes
 
 
-File: gettext.info,  Node: Lua,  Next: JavaScript,  Prev: GCC-source,  Up: List of Programming Languages
-
-15.5.22 Lua
------------
-
-RPMs
-     lua
-
-File extension
-     ‘lua’
-
-String syntax
-
-        • ‘"abc"’
-
-        • ‘'abc'’
-
-        • ‘[[abc]]’
-
-        • ‘[=[abc]=]’
-
-        • ‘[==[abc]==]’
-
-        • ...
-
-gettext shorthand
-     ‘_("abc")’
-
-gettext/ngettext functions
-     ‘gettext.gettext’, ‘gettext.dgettext’, ‘gettext.dcgettext’,
-     ‘gettext.ngettext’, ‘gettext.dngettext’, ‘gettext.dcngettext’
-
-textdomain
-     ‘textdomain’ function
-
-bindtextdomain
-     ‘bindtextdomain’ function
-
-setlocale
-     automatic
-
-Prerequisite
-     ‘require 'gettext'’ or running lua interpreter with ‘-l gettext’
-     option
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     ‘xgettext’
-
-Formatting with positions
-     —
-
-Portability
-     On platforms without gettext, the functions are not available.
-
-po-mode marking
-     —
-
-
-File: gettext.info,  Node: JavaScript,  Prev: Lua,  Up: List of Programming Languages
-
-15.5.23 JavaScript
-------------------
-
-RPMs
-     js
-
-File extension
-     ‘js’
-
-String syntax
-
-        • ‘"abc"’
-
-        • ‘'abc'’
-
-gettext shorthand
-     ‘_("abc")’
-
-gettext/ngettext functions
-     ‘gettext’, ‘dgettext’, ‘dcgettext’, ‘ngettext’, ‘dngettext’
-
-textdomain
-     ‘textdomain’ function
-
-bindtextdomain
-     ‘bindtextdomain’ function
-
-setlocale
-     automatic
-
-Prerequisite
-     —
-
-Use or emulate GNU gettext
-     use, or emulate
-
-Extractor
-     ‘xgettext’
-
-Formatting with positions
-     —
-
-Portability
-     On platforms without gettext, the functions are not available.
-
-po-mode marking
-     —
-
-
 File: gettext.info,  Node: List of Data Formats,  Prev: List of Programming Languages,  Up: Programming Languages
 
 15.6 Internationalizable Data
@@ -13796,7 +13604,6 @@
 * POT::                         POT - Portable Object Template
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
-* GSettings::                   GSettings - GNOME user configuration schema
 
 
 File: gettext.info,  Node: POT,  Next: RST,  Prev: List of Data Formats,  Up: List of Data Formats
@@ -13808,10 +13615,10 @@
      gettext
 
 File extension
-     ‘pot’, ‘po’
+     `pot', `po'
 
 Extractor
-     ‘xgettext’
+     `xgettext'
 
 
 File: gettext.info,  Node: RST,  Next: Glade,  Prev: POT,  Up: List of Data Formats
@@ -13823,13 +13630,13 @@
      fpk
 
 File extension
-     ‘rst’
+     `rst'
 
 Extractor
-     ‘xgettext’, ‘rstconv’
+     `xgettext', `rstconv'
 
 
-File: gettext.info,  Node: Glade,  Next: GSettings,  Prev: RST,  Up: List of Data Formats
+File: gettext.info,  Node: Glade,  Prev: RST,  Up: List of Data Formats
 
 15.6.3 Glade - GNOME user interface description
 -----------------------------------------------
@@ -13838,26 +13645,11 @@
      glade, libglade, glade2, libglade2, intltool
 
 File extension
-     ‘glade’, ‘glade2’, ‘ui’
+     `glade', `glade2'
 
 Extractor
-     ‘xgettext’, ‘libglade-xgettext’, ‘xml-i18n-extract’,
-     ‘intltool-extract’
-
-
-File: gettext.info,  Node: GSettings,  Prev: Glade,  Up: List of Data Formats
-
-15.6.4 GSettings - GNOME user configuration schema
---------------------------------------------------
-
-RPMs
-     glib2
-
-File extension
-     ‘gschema.xml’
-
-Extractor
-     ‘xgettext’, ‘intltool-extract’
+     `xgettext', `libglade-xgettext', `xml-i18n-extract',
+     `intltool-extract'
 
 
 File: gettext.info,  Node: Conclusion,  Next: Language Codes,  Prev: Programming Languages,  Up: Top
@@ -13865,91 +13657,91 @@
 16 Concluding Remarks
 *********************
 
-   We would like to conclude this GNU ‘gettext’ manual by presenting an
+   We would like to conclude this GNU `gettext' manual by presenting an
 history of the Translation Project so far.  We finally give a few
 pointers for those who want to do further research or readings about
 Native Language Support matters.
 
 * Menu:
 
-* History::                     History of GNU ‘gettext’
+* History::                     History of GNU `gettext'
 * References::                  Related Readings
 
 
 File: gettext.info,  Node: History,  Next: References,  Prev: Conclusion,  Up: Conclusion
 
-16.1 History of GNU ‘gettext’
+16.1 History of GNU `gettext'
 =============================
 
-   Internationalization concerns and algorithms have been informally and
-casually discussed for years in GNU, sometimes around GNU ‘libc’, maybe
-around the incoming ‘Hurd’, or otherwise (nobody clearly remembers).
-And even then, when the work started for real, this was somewhat
-independently of these previous discussions.
-
-   This all began in July 1994, when Patrick D’Cruze had the idea and
-initiative of internationalizing version 3.9.2 of GNU ‘fileutils’.  He
-then asked Jim Meyering, the maintainer, how to get those changes folded
-into an official release.  That first draft was full of ‘#ifdef’s and
-somewhat disconcerting, and Jim wanted to find nicer ways.  Patrick and
-Jim shared some tries and experimentations in this area.  Then, feeling
-that this might eventually have a deeper impact on GNU, Jim wanted to
-know what standards were, and contacted Richard Stallman, who very
-quickly and verbally described an overall design for what was meant to
-become ‘glocale’, at that time.
+   Internationalization concerns and algorithms have been informally
+and casually discussed for years in GNU, sometimes around GNU `libc',
+maybe around the incoming `Hurd', or otherwise (nobody clearly
+remembers).  And even then, when the work started for real, this was
+somewhat independently of these previous discussions.
+
+   This all began in July 1994, when Patrick D'Cruze had the idea and
+initiative of internationalizing version 3.9.2 of GNU `fileutils'.  He
+then asked Jim Meyering, the maintainer, how to get those changes
+folded into an official release.  That first draft was full of
+`#ifdef's and somewhat disconcerting, and Jim wanted to find nicer
+ways.  Patrick and Jim shared some tries and experimentations in this
+area.  Then, feeling that this might eventually have a deeper impact on
+GNU, Jim wanted to know what standards were, and contacted Richard
+Stallman, who very quickly and verbally described an overall design for
+what was meant to become `glocale', at that time.
 
-   Jim implemented ‘glocale’ and got a lot of exhausting feedback from
+   Jim implemented `glocale' and got a lot of exhausting feedback from
 Patrick and Richard, of course, but also from Mitchum DSouza (who wrote
-a ‘catgets’-like package), Roland McGrath, maybe David MacKenzie,
+a `catgets'-like package), Roland McGrath, maybe David MacKenzie,
 François Pinard, and Paul Eggert, all pushing and pulling in various
 directions, not always compatible, to the extent that after a couple of
-test releases, ‘glocale’ was torn apart.  In particular, Paul Eggert –
-always keeping an eye on developments in Solaris – advocated the use of
-the ‘gettext’ API over ‘glocale’’s ‘catgets’-based API.
+test releases, `glocale' was torn apart.  In particular, Paul Eggert -
+always keeping an eye on developments in Solaris - advocated the use of
+the `gettext' API over `glocale''s `catgets'-based API.
 
    While Jim took some distance and time and became dad for a second
-time, Roland wanted to get GNU ‘libc’ internationalized, and got Ulrich
-Drepper involved in that project.  Instead of starting from ‘glocale’,
-Ulrich rewrote something from scratch, but more conforming to the set of
-guidelines who emerged out of the ‘glocale’ effort.  Then, Ulrich got
-people from the previous forum to involve themselves into this new
-project, and the switch from ‘glocale’ to what was first named
-‘msgutils’, renamed ‘nlsutils’, and later ‘gettext’, became officially
+time, Roland wanted to get GNU `libc' internationalized, and got Ulrich
+Drepper involved in that project.  Instead of starting from `glocale',
+Ulrich rewrote something from scratch, but more conforming to the set
+of guidelines who emerged out of the `glocale' effort.  Then, Ulrich
+got people from the previous forum to involve themselves into this new
+project, and the switch from `glocale' to what was first named
+`msgutils', renamed `nlsutils', and later `gettext', became officially
 accepted by Richard in May 1995 or so.
 
-   Let’s summarize by saying that Ulrich Drepper wrote GNU ‘gettext’ in
+   Let's summarize by saying that Ulrich Drepper wrote GNU `gettext' in
 April 1995.  The first official release of the package, including PO
 mode, occurred in July 1995, and was numbered 0.7.  Other people
-contributed to the effort by providing a discussion forum around Ulrich,
-writing little pieces of code, or testing.  These are quoted in the
-‘THANKS’ file which comes with the GNU ‘gettext’ distribution.
+contributed to the effort by providing a discussion forum around
+Ulrich, writing little pieces of code, or testing.  These are quoted in
+the `THANKS' file which comes with the GNU `gettext' distribution.
 
    While this was being done, François adapted half a dozen of GNU
-packages to ‘glocale’ first, then later to ‘gettext’, putting them in
+packages to `glocale' first, then later to `gettext', putting them in
 pretest, so providing along the way an effective user environment for
 fine tuning the evolving tools.  He also took the responsibility of
 organizing and coordinating the Translation Project.  After nearly a
 year of informal exchanges between people from many countries,
 translator teams started to exist in May 1995, through the creation and
-support by Patrick D’Cruze of twenty unmoderated mailing lists for that
+support by Patrick D'Cruze of twenty unmoderated mailing lists for that
 many native languages, and two moderated lists: one for reaching all
 teams at once, the other for reaching all willing maintainers of
 internationalized free software packages.
 
    François also wrote PO mode in June 1995 with the collaboration of
-Greg McGary, as a kind of contribution to Ulrich’s package.  He also
-gave a hand with the GNU ‘gettext’ Texinfo manual.
+Greg McGary, as a kind of contribution to Ulrich's package.  He also
+gave a hand with the GNU `gettext' Texinfo manual.
 
    In 1997, Ulrich Drepper released the GNU libc 2.0, which included the
-‘gettext’, ‘textdomain’ and ‘bindtextdomain’ functions.
+`gettext', `textdomain' and `bindtextdomain' functions.
 
-   In 2000, Ulrich Drepper added plural form handling (the ‘ngettext’
+   In 2000, Ulrich Drepper added plural form handling (the `ngettext'
 function) to GNU libc.  Later, in 2001, he released GNU libc 2.2.x,
 which is the first free C library with full internationalization
 support.
 
    Ulrich being quite busy in his role of General Maintainer of GNU
-libc, he handed over the GNU ‘gettext’ maintenance to Bruno Haible in
+libc, he handed over the GNU `gettext' maintenance to Bruno Haible in
 2000.  Bruno added the plural form handling to the tools as well, added
 support for UTF-8 and CJK locales, and wrote a few new tools for
 manipulating PO files.
@@ -13963,34 +13755,34 @@
    * NOTE: * This documentation section is outdated and needs to be
 revised.
 
-   Eugene H. Dorr (‘dorre@well.com’) maintains an interesting
+   Eugene H. Dorr (`dorre@well.com') maintains an interesting
 bibliography on internationalization matters, called
-‘Internationalization Reference List’, which is available as:
+`Internationalization Reference List', which is available as:
      ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/i18n-books.txt
 
-   Michael Gschwind (‘mike@vlsivie.tuwien.ac.at’) maintains a Frequently
-Asked Questions (FAQ) list, entitled ‘Programming for
-Internationalisation’.  This FAQ discusses writing programs which can
+   Michael Gschwind (`mike@vlsivie.tuwien.ac.at') maintains a
+Frequently Asked Questions (FAQ) list, entitled `Programming for
+Internationalisation'.  This FAQ discusses writing programs which can
 handle different language conventions, character sets, etc.; and is
 applicable to all character set encodings, with particular emphasis on
 ISO 8859-1.  It is regularly published in Usenet groups
-‘comp.unix.questions’, ‘comp.std.internat’,
-‘comp.software.international’, ‘comp.lang.c’, ‘comp.windows.x’,
-‘comp.std.c’, ‘comp.answers’ and ‘news.answers’.  The home location of
+`comp.unix.questions', `comp.std.internat',
+`comp.software.international', `comp.lang.c', `comp.windows.x',
+`comp.std.c', `comp.answers' and `news.answers'.  The home location of
 this document is:
      ftp://ftp.vlsivie.tuwien.ac.at/pub/8bit/ISO-programming
 
-   Patrick D’Cruze (‘pdcruze@li.org’) wrote a tutorial about NLS
-matters, and Jochen Hein (‘Hein@student.tu-clausthal.de’) took over the
+   Patrick D'Cruze (`pdcruze@li.org') wrote a tutorial about NLS
+matters, and Jochen Hein (`Hein@student.tu-clausthal.de') took over the
 responsibility of maintaining it.  It may be found as:
      ftp://sunsite.unc.edu/pub/Linux/utils/nls/catalogs/Incoming/...
           ...locale-tutorial-0.8.txt.gz
-This site is mirrored in:
+   This site is mirrored in:
      ftp://ftp.ibp.fr/pub/linux/sunsite/
 
    A French version of the same tutorial should be findable at:
      ftp://ftp.ibp.fr/pub/linux/french/docs/
-together with French translations of many Linux-related documents.
+   together with French translations of many Linux-related documents.
 
 
 File: gettext.info,  Node: Language Codes,  Next: Country Codes,  Prev: Conclusion,  Up: Top
@@ -14017,375 +13809,559 @@
    For the commonly used languages, the ISO 639-1 standard defines
 two-letter codes.
 
-‘aa’
+`aa'
      Afar.
-‘ab’
+
+`ab'
      Abkhazian.
-‘ae’
+
+`ae'
      Avestan.
-‘af’
+
+`af'
      Afrikaans.
-‘ak’
+
+`ak'
      Akan.
-‘am’
+
+`am'
      Amharic.
-‘an’
+
+`an'
      Aragonese.
-‘ar’
+
+`ar'
      Arabic.
-‘as’
+
+`as'
      Assamese.
-‘av’
+
+`av'
      Avaric.
-‘ay’
+
+`ay'
      Aymara.
-‘az’
+
+`az'
      Azerbaijani.
-‘ba’
+
+`ba'
      Bashkir.
-‘be’
+
+`be'
      Belarusian.
-‘bg’
+
+`bg'
      Bulgarian.
-‘bh’
+
+`bh'
      Bihari.
-‘bi’
+
+`bi'
      Bislama.
-‘bm’
+
+`bm'
      Bambara.
-‘bn’
+
+`bn'
      Bengali; Bangla.
-‘bo’
+
+`bo'
      Tibetan.
-‘br’
+
+`br'
      Breton.
-‘bs’
+
+`bs'
      Bosnian.
-‘ca’
+
+`ca'
      Catalan.
-‘ce’
+
+`ce'
      Chechen.
-‘ch’
+
+`ch'
      Chamorro.
-‘co’
+
+`co'
      Corsican.
-‘cr’
+
+`cr'
      Cree.
-‘cs’
+
+`cs'
      Czech.
-‘cu’
+
+`cu'
      Church Slavic.
-‘cv’
+
+`cv'
      Chuvash.
-‘cy’
+
+`cy'
      Welsh.
-‘da’
+
+`da'
      Danish.
-‘de’
+
+`de'
      German.
-‘dv’
+
+`dv'
      Divehi; Maldivian.
-‘dz’
+
+`dz'
      Dzongkha; Bhutani.
-‘ee’
+
+`ee'
      Éwé.
-‘el’
+
+`el'
      Greek.
-‘en’
+
+`en'
      English.
-‘eo’
+
+`eo'
      Esperanto.
-‘es’
+
+`es'
      Spanish.
-‘et’
+
+`et'
      Estonian.
-‘eu’
+
+`eu'
      Basque.
-‘fa’
+
+`fa'
      Persian.
-‘ff’
+
+`ff'
      Fulah.
-‘fi’
+
+`fi'
      Finnish.
-‘fj’
+
+`fj'
      Fijian; Fiji.
-‘fo’
+
+`fo'
      Faroese.
-‘fr’
+
+`fr'
      French.
-‘fy’
+
+`fy'
      Western Frisian.
-‘ga’
+
+`ga'
      Irish.
-‘gd’
+
+`gd'
      Scottish Gaelic.
-‘gl’
+
+`gl'
      Galician.
-‘gn’
+
+`gn'
      Guarani.
-‘gu’
+
+`gu'
      Gujarati.
-‘gv’
+
+`gv'
      Manx.
-‘ha’
+
+`ha'
      Hausa.
-‘he’
+
+`he'
      Hebrew (formerly iw).
-‘hi’
+
+`hi'
      Hindi.
-‘ho’
+
+`ho'
      Hiri Motu.
-‘hr’
+
+`hr'
      Croatian.
-‘ht’
+
+`ht'
      Haitian; Haitian Creole.
-‘hu’
+
+`hu'
      Hungarian.
-‘hy’
+
+`hy'
      Armenian.
-‘hz’
+
+`hz'
      Herero.
-‘ia’
+
+`ia'
      Interlingua.
-‘id’
+
+`id'
      Indonesian (formerly in).
-‘ie’
+
+`ie'
      Interlingue; Occidental.
-‘ig’
+
+`ig'
      Igbo.
-‘ii’
+
+`ii'
      Sichuan Yi; Nuosu.
-‘ik’
+
+`ik'
      Inupiak; Inupiaq.
-‘io’
+
+`io'
      Ido.
-‘is’
+
+`is'
      Icelandic.
-‘it’
+
+`it'
      Italian.
-‘iu’
+
+`iu'
      Inuktitut.
-‘ja’
+
+`ja'
      Japanese.
-‘jv’
+
+`jv'
      Javanese.
-‘ka’
+
+`ka'
      Georgian.
-‘kg’
+
+`kg'
      Kongo.
-‘ki’
+
+`ki'
      Kikuyu; Gikuyu.
-‘kj’
+
+`kj'
      Kuanyama; Kwanyama.
-‘kk’
+
+`kk'
      Kazakh.
-‘kl’
+
+`kl'
      Kalaallisut; Greenlandic.
-‘km’
+
+`km'
      Central Khmer; Cambodian.
-‘kn’
+
+`kn'
      Kannada.
-‘ko’
+
+`ko'
      Korean.
-‘kr’
+
+`kr'
      Kanuri.
-‘ks’
+
+`ks'
      Kashmiri.
-‘ku’
+
+`ku'
      Kurdish.
-‘kv’
+
+`kv'
      Komi.
-‘kw’
+
+`kw'
      Cornish.
-‘ky’
+
+`ky'
      Kirghiz.
-‘la’
+
+`la'
      Latin.
-‘lb’
+
+`lb'
      Letzeburgesch; Luxembourgish.
-‘lg’
+
+`lg'
      Ganda.
-‘li’
+
+`li'
      Limburgish; Limburger; Limburgan.
-‘ln’
+
+`ln'
      Lingala.
-‘lo’
+
+`lo'
      Lao; Laotian.
-‘lt’
+
+`lt'
      Lithuanian.
-‘lu’
+
+`lu'
      Luba-Katanga.
-‘lv’
+
+`lv'
      Latvian; Lettish.
-‘mg’
+
+`mg'
      Malagasy.
-‘mh’
+
+`mh'
      Marshallese.
-‘mi’
+
+`mi'
      Maori.
-‘mk’
+
+`mk'
      Macedonian.
-‘ml’
+
+`ml'
      Malayalam.
-‘mn’
+
+`mn'
      Mongolian.
-‘mo’
+
+`mo'
      Moldavian.
-‘mr’
+
+`mr'
      Marathi.
-‘ms’
+
+`ms'
      Malay.
-‘mt’
+
+`mt'
      Maltese.
-‘my’
+
+`my'
      Burmese.
-‘na’
+
+`na'
      Nauru.
-‘nb’
+
+`nb'
      Norwegian Bokmål.
-‘nd’
+
+`nd'
      Ndebele, North.
-‘ne’
+
+`ne'
      Nepali.
-‘ng’
+
+`ng'
      Ndonga.
-‘nl’
+
+`nl'
      Dutch.
-‘nn’
+
+`nn'
      Norwegian Nynorsk.
-‘no’
+
+`no'
      Norwegian.
-‘nr’
+
+`nr'
      Ndebele, South.
-‘nv’
+
+`nv'
      Navajo; Navaho.
-‘ny’
+
+`ny'
      Chichewa; Nyanja.
-‘oc’
+
+`oc'
      Occitan; Provençal.
-‘oj’
+
+`oj'
      Ojibwa.
-‘om’
+
+`om'
      (Afan) Oromo.
-‘or’
+
+`or'
      Oriya.
-‘os’
+
+`os'
      Ossetian; Ossetic.
-‘pa’
+
+`pa'
      Panjabi; Punjabi.
-‘pi’
+
+`pi'
      Pali.
-‘pl’
+
+`pl'
      Polish.
-‘ps’
+
+`ps'
      Pashto; Pushto.
-‘pt’
+
+`pt'
      Portuguese.
-‘qu’
+
+`qu'
      Quechua.
-‘rm’
+
+`rm'
      Romansh.
-‘rn’
+
+`rn'
      Rundi; Kirundi.
-‘ro’
+
+`ro'
      Romanian.
-‘ru’
+
+`ru'
      Russian.
-‘rw’
+
+`rw'
      Kinyarwanda.
-‘sa’
+
+`sa'
      Sanskrit.
-‘sc’
+
+`sc'
      Sardinian.
-‘sd’
+
+`sd'
      Sindhi.
-‘se’
+
+`se'
      Northern Sami.
-‘sg’
+
+`sg'
      Sango; Sangro.
-‘si’
+
+`si'
      Sinhala; Sinhalese.
-‘sk’
+
+`sk'
      Slovak.
-‘sl’
+
+`sl'
      Slovenian.
-‘sm’
+
+`sm'
      Samoan.
-‘sn’
+
+`sn'
      Shona.
-‘so’
+
+`so'
      Somali.
-‘sq’
+
+`sq'
      Albanian.
-‘sr’
+
+`sr'
      Serbian.
-‘ss’
+
+`ss'
      Swati; Siswati.
-‘st’
+
+`st'
      Sesotho; Sotho, Southern.
-‘su’
+
+`su'
      Sundanese.
-‘sv’
+
+`sv'
      Swedish.
-‘sw’
+
+`sw'
      Swahili.
-‘ta’
+
+`ta'
      Tamil.
-‘te’
+
+`te'
      Telugu.
-‘tg’
+
+`tg'
      Tajik.
-‘th’
+
+`th'
      Thai.
-‘ti’
+
+`ti'
      Tigrinya.
-‘tk’
+
+`tk'
      Turkmen.
-‘tl’
+
+`tl'
      Tagalog.
-‘tn’
+
+`tn'
      Tswana; Setswana.
-‘to’
+
+`to'
      Tonga.
-‘tr’
+
+`tr'
      Turkish.
-‘ts’
+
+`ts'
      Tsonga.
-‘tt’
+
+`tt'
      Tatar.
-‘tw’
+
+`tw'
      Twi.
-‘ty’
+
+`ty'
      Tahitian.
-‘ug’
+
+`ug'
      Uighur.
-‘uk’
+
+`uk'
      Ukrainian.
-‘ur’
+
+`ur'
      Urdu.
-‘uz’
+
+`uz'
      Uzbek.
-‘ve’
+
+`ve'
      Venda.
-‘vi’
+
+`vi'
      Vietnamese.
-‘vo’
+
+`vo'
      Volapük; Volapuk.
-‘wa’
+
+`wa'
      Walloon.
-‘wo’
+
+`wo'
      Wolof.
-‘xh’
+
+`xh'
      Xhosa.
-‘yi’
+
+`yi'
      Yiddish (formerly ji).
-‘yo’
+
+`yo'
      Yoruba.
-‘za’
+
+`za'
      Zhuang.
-‘zh’
+
+`zh'
      Chinese.
-‘zu’
+
+`zu'
      Zulu.
 
 
@@ -14398,125 +14374,184 @@
 three-letter codes.  Here is the current list, reduced to only living
 languages with at least one million of speakers.
 
-‘ace’
+`ace'
      Achinese.
-‘awa’
+
+`awa'
      Awadhi.
-‘bal’
+
+`bal'
      Baluchi.
-‘ban’
+
+`ban'
      Balinese.
-‘bej’
+
+`bej'
      Beja; Bedawiyet.
-‘bem’
+
+`bem'
      Bemba.
-‘bho’
+
+`bho'
      Bhojpuri.
-‘bik’
+
+`bik'
      Bikol.
-‘bin’
+
+`bin'
      Bini; Edo.
-‘bug’
+
+`bug'
      Buginese.
-‘ceb’
+
+`ceb'
      Cebuano.
-‘din’
+
+`din'
      Dinka.
-‘doi’
+
+`doi'
      Dogri.
-‘fil’
+
+`fil'
      Filipino; Pilipino.
-‘fon’
+
+`fon'
      Fon.
-‘gon’
+
+`gon'
      Gondi.
-‘gsw’
+
+`gsw'
      Swiss German; Alemannic; Alsatian.
-‘hil’
+
+`hil'
      Hiligaynon.
-‘hmn’
+
+`hmn'
      Hmong.
-‘ilo’
+
+`ilo'
      Iloko.
-‘kab’
+
+`kab'
      Kabyle.
-‘kam’
+
+`kam'
      Kamba.
-‘kbd’
+
+`kbd'
      Kabardian.
-‘kmb’
+
+`kmb'
      Kimbundu.
-‘kok’
+
+`kok'
      Konkani.
-‘kru’
+
+`kru'
      Kurukh.
-‘lua’
+
+`lua'
      Luba-Lulua.
-‘luo’
+
+`luo'
      Luo (Kenya and Tanzania).
-‘mad’
+
+`mad'
      Madurese.
-‘mag’
+
+`mag'
      Magahi.
-‘mai’
+
+`mai'
      Maithili.
-‘mak’
+
+`mak'
      Makasar.
-‘man’
+
+`man'
      Mandingo.
-‘men’
+
+`men'
      Mende.
-‘min’
+
+`min'
      Minangkabau.
-‘mni’
+
+`mni'
      Manipuri.
-‘mos’
+
+`mos'
      Mossi.
-‘mwr’
+
+`mwr'
      Marwari.
-‘nap’
+
+`nap'
      Neapolitan.
-‘nso’
+
+`nso'
      Pedi; Sepedi; Northern Sotho.
-‘nym’
+
+`nym'
      Nyamwezi.
-‘nyn’
+
+`nyn'
      Nyankole.
-‘pag’
+
+`pag'
      Pangasinan.
-‘pam’
+
+`pam'
      Pampanga; Kapampangan.
-‘raj’
+
+`raj'
      Rajasthani.
-‘sas’
+
+`sas'
      Sasak.
-‘sat’
+
+`sat'
      Santali.
-‘scn’
+
+`scn'
      Sicilian.
-‘shn’
+
+`shn'
      Shan.
-‘sid’
+
+`sid'
      Sidamo.
-‘srr’
+
+`srr'
      Serer.
-‘suk’
+
+`suk'
      Sukuma.
-‘sus’
+
+`sus'
      Susu.
-‘tem’
+
+`tem'
      Timne.
-‘tiv’
+
+`tiv'
      Tiv.
-‘tum’
+
+`tum'
      Tumbuka.
-‘umb’
+
+`umb'
      Umbundu.
-‘wal’
+
+`wal'
      Walamo.
-‘war’
+
+`war'
      Waray.
-‘yao’
+
+`yao'
      Yao.
 
 
@@ -14529,503 +14564,736 @@
 and territories.  All abbreviations for countries used in the
 Translation Project should come from this standard.
 
-‘AD’
+`AD'
      Andorra.
-‘AE’
+
+`AE'
      United Arab Emirates.
-‘AF’
+
+`AF'
      Afghanistan.
-‘AG’
+
+`AG'
      Antigua and Barbuda.
-‘AI’
+
+`AI'
      Anguilla.
-‘AL’
+
+`AL'
      Albania.
-‘AM’
+
+`AM'
      Armenia.
-‘AO’
+
+`AN'
+     Netherlands Antilles.
+
+`AO'
      Angola.
-‘AQ’
+
+`AQ'
      Antarctica.
-‘AR’
+
+`AR'
      Argentina.
-‘AS’
-     American Samoa.
-‘AT’
+
+`AS'
+     Samoa (American).
+
+`AT'
      Austria.
-‘AU’
+
+`AU'
      Australia.
-‘AW’
+
+`AW'
      Aruba.
-‘AX’
+
+`AX'
      Aaland Islands.
-‘AZ’
+
+`AZ'
      Azerbaijan.
-‘BA’
+
+`BA'
      Bosnia and Herzegovina.
-‘BB’
+
+`BB'
      Barbados.
-‘BD’
+
+`BD'
      Bangladesh.
-‘BE’
+
+`BE'
      Belgium.
-‘BF’
+
+`BF'
      Burkina Faso.
-‘BG’
+
+`BG'
      Bulgaria.
-‘BH’
+
+`BH'
      Bahrain.
-‘BI’
+
+`BI'
      Burundi.
-‘BJ’
+
+`BJ'
      Benin.
-‘BL’
-     Saint Barthelemy.
-‘BM’
+
+`BM'
      Bermuda.
-‘BN’
-     Brunei Darussalam.
-‘BO’
-     Bolivia, Plurinational State of.
-‘BQ’
-     Bonaire, Sint Eustatius and Saba.
-‘BR’
+
+`BN'
+     Brunei.
+
+`BO'
+     Bolivia.
+
+`BR'
      Brazil.
-‘BS’
+
+`BS'
      Bahamas.
-‘BT’
+
+`BT'
      Bhutan.
-‘BV’
+
+`BV'
      Bouvet Island.
-‘BW’
+
+`BW'
      Botswana.
-‘BY’
+
+`BY'
      Belarus.
-‘BZ’
+
+`BZ'
      Belize.
-‘CA’
+
+`CA'
      Canada.
-‘CC’
+
+`CC'
      Cocos (Keeling) Islands.
-‘CD’
-     Congo, The Democratic Republic of the.
-‘CF’
+
+`CD'
+     Congo (Dem. Rep.).
+
+`CF'
      Central African Republic.
-‘CG’
-     Congo.
-‘CH’
+
+`CG'
+     Congo (Rep.).
+
+`CH'
      Switzerland.
-‘CI’
-     Côte d’Ivoire.
-‘CK’
+
+`CI'
+     Côte d'Ivoire.
+
+`CK'
      Cook Islands.
-‘CL’
+
+`CL'
      Chile.
-‘CM’
+
+`CM'
      Cameroon.
-‘CN’
+
+`CN'
      China.
-‘CO’
+
+`CO'
      Colombia.
-‘CR’
+
+`CR'
      Costa Rica.
-‘CU’
+
+`CU'
      Cuba.
-‘CV’
+
+`CV'
      Cape Verde.
-‘CW’
-     Curaçao.
-‘CX’
+
+`CX'
      Christmas Island.
-‘CY’
+
+`CY'
      Cyprus.
-‘CZ’
+
+`CZ'
      Czech Republic.
-‘DE’
+
+`DE'
      Germany.
-‘DJ’
+
+`DJ'
      Djibouti.
-‘DK’
+
+`DK'
      Denmark.
-‘DM’
+
+`DM'
      Dominica.
-‘DO’
+
+`DO'
      Dominican Republic.
-‘DZ’
+
+`DZ'
      Algeria.
-‘EC’
+
+`EC'
      Ecuador.
-‘EE’
+
+`EE'
      Estonia.
-‘EG’
+
+`EG'
      Egypt.
-‘EH’
+
+`EH'
      Western Sahara.
-‘ER’
+
+`ER'
      Eritrea.
-‘ES’
+
+`ES'
      Spain.
-‘ET’
+
+`ET'
      Ethiopia.
-‘FI’
+
+`FI'
      Finland.
-‘FJ’
+
+`FJ'
      Fiji.
-‘FK’
-     Falkland Islands (Malvinas).
-‘FM’
-     Micronesia, Federated States of.
-‘FO’
-     Faroe Islands.
-‘FR’
+
+`FK'
+     Falkland Islands.
+
+`FM'
+     Micronesia.
+
+`FO'
+     Faeroe Islands.
+
+`FR'
      France.
-‘GA’
+
+`GA'
      Gabon.
-‘GB’
-     United Kingdom.
-‘GD’
+
+`GB'
+     Britain (United Kingdom).
+
+`GD'
      Grenada.
-‘GE’
+
+`GE'
      Georgia.
-‘GF’
+
+`GF'
      French Guiana.
-‘GG’
+
+`GG'
      Guernsey.
-‘GH’
+
+`GH'
      Ghana.
-‘GI’
+
+`GI'
      Gibraltar.
-‘GL’
+
+`GL'
      Greenland.
-‘GM’
+
+`GM'
      Gambia.
-‘GN’
+
+`GN'
      Guinea.
-‘GP’
+
+`GP'
      Guadeloupe.
-‘GQ’
+
+`GQ'
      Equatorial Guinea.
-‘GR’
+
+`GR'
      Greece.
-‘GS’
+
+`GS'
      South Georgia and the South Sandwich Islands.
-‘GT’
+
+`GT'
      Guatemala.
-‘GU’
+
+`GU'
      Guam.
-‘GW’
+
+`GW'
      Guinea-Bissau.
-‘GY’
+
+`GY'
      Guyana.
-‘HK’
+
+`HK'
      Hong Kong.
-‘HM’
+
+`HM'
      Heard Island and McDonald Islands.
-‘HN’
+
+`HN'
      Honduras.
-‘HR’
+
+`HR'
      Croatia.
-‘HT’
+
+`HT'
      Haiti.
-‘HU’
+
+`HU'
      Hungary.
-‘ID’
+
+`ID'
      Indonesia.
-‘IE’
+
+`IE'
      Ireland.
-‘IL’
+
+`IL'
      Israel.
-‘IM’
+
+`IM'
      Isle of Man.
-‘IN’
+
+`IN'
      India.
-‘IO’
+
+`IO'
      British Indian Ocean Territory.
-‘IQ’
+
+`IQ'
      Iraq.
-‘IR’
-     Iran, Islamic Republic of.
-‘IS’
+
+`IR'
+     Iran.
+
+`IS'
      Iceland.
-‘IT’
+
+`IT'
      Italy.
-‘JE’
+
+`JE'
      Jersey.
-‘JM’
+
+`JM'
      Jamaica.
-‘JO’
+
+`JO'
      Jordan.
-‘JP’
+
+`JP'
      Japan.
-‘KE’
+
+`KE'
      Kenya.
-‘KG’
+
+`KG'
      Kyrgyzstan.
-‘KH’
+
+`KH'
      Cambodia.
-‘KI’
+
+`KI'
      Kiribati.
-‘KM’
+
+`KM'
      Comoros.
-‘KN’
-     Saint Kitts and Nevis.
-‘KP’
-     Korea, Democratic People’s Republic of.
-‘KR’
-     Korea, Republic of.
-‘KW’
+
+`KN'
+     St Kitts and Nevis.
+
+`KP'
+     Korea (North).
+
+`KR'
+     Korea (South).
+
+`KW'
      Kuwait.
-‘KY’
+
+`KY'
      Cayman Islands.
-‘KZ’
+
+`KZ'
      Kazakhstan.
-‘LA’
-     Lao People’s Democratic Republic.
-‘LB’
+
+`LA'
+     Laos.
+
+`LB'
      Lebanon.
-‘LC’
-     Saint Lucia.
-‘LI’
+
+`LC'
+     St Lucia.
+
+`LI'
      Liechtenstein.
-‘LK’
+
+`LK'
      Sri Lanka.
-‘LR’
+
+`LR'
      Liberia.
-‘LS’
+
+`LS'
      Lesotho.
-‘LT’
+
+`LT'
      Lithuania.
-‘LU’
+
+`LU'
      Luxembourg.
-‘LV’
+
+`LV'
      Latvia.
-‘LY’
+
+`LY'
      Libya.
-‘MA’
+
+`MA'
      Morocco.
-‘MC’
+
+`MC'
      Monaco.
-‘MD’
-     Moldova, Republic of.
-‘ME’
+
+`MD'
+     Moldova.
+
+`ME'
      Montenegro.
-‘MF’
-     Saint Martin (French part).
-‘MG’
+
+`MG'
      Madagascar.
-‘MH’
+
+`MH'
      Marshall Islands.
-‘MK’
-     Macedonia, The Former Yugoslav Republic of.
-‘ML’
+
+`MK'
+     Macedonia.
+
+`ML'
      Mali.
-‘MM’
-     Myanmar.
-‘MN’
+
+`MM'
+     Myanmar (Burma).
+
+`MN'
      Mongolia.
-‘MO’
+
+`MO'
      Macao.
-‘MP’
+
+`MP'
      Northern Mariana Islands.
-‘MQ’
+
+`MQ'
      Martinique.
-‘MR’
+
+`MR'
      Mauritania.
-‘MS’
+
+`MS'
      Montserrat.
-‘MT’
+
+`MT'
      Malta.
-‘MU’
+
+`MU'
      Mauritius.
-‘MV’
+
+`MV'
      Maldives.
-‘MW’
+
+`MW'
      Malawi.
-‘MX’
+
+`MX'
      Mexico.
-‘MY’
+
+`MY'
      Malaysia.
-‘MZ’
+
+`MZ'
      Mozambique.
-‘NA’
+
+`NA'
      Namibia.
-‘NC’
+
+`NC'
      New Caledonia.
-‘NE’
+
+`NE'
      Niger.
-‘NF’
+
+`NF'
      Norfolk Island.
-‘NG’
+
+`NG'
      Nigeria.
-‘NI’
+
+`NI'
      Nicaragua.
-‘NL’
+
+`NL'
      Netherlands.
-‘NO’
+
+`NO'
      Norway.
-‘NP’
+
+`NP'
      Nepal.
-‘NR’
+
+`NR'
      Nauru.
-‘NU’
+
+`NU'
      Niue.
-‘NZ’
+
+`NZ'
      New Zealand.
-‘OM’
+
+`OM'
      Oman.
-‘PA’
+
+`PA'
      Panama.
-‘PE’
+
+`PE'
      Peru.
-‘PF’
+
+`PF'
      French Polynesia.
-‘PG’
+
+`PG'
      Papua New Guinea.
-‘PH’
+
+`PH'
      Philippines.
-‘PK’
+
+`PK'
      Pakistan.
-‘PL’
+
+`PL'
      Poland.
-‘PM’
-     Saint Pierre and Miquelon.
-‘PN’
+
+`PM'
+     St Pierre and Miquelon.
+
+`PN'
      Pitcairn.
-‘PR’
+
+`PR'
      Puerto Rico.
-‘PS’
-     Palestine, State of.
-‘PT’
+
+`PS'
+     Palestine.
+
+`PT'
      Portugal.
-‘PW’
+
+`PW'
      Palau.
-‘PY’
+
+`PY'
      Paraguay.
-‘QA’
+
+`QA'
      Qatar.
-‘RE’
+
+`RE'
      Reunion.
-‘RO’
+
+`RO'
      Romania.
-‘RS’
+
+`RS'
      Serbia.
-‘RU’
-     Russian Federation.
-‘RW’
+
+`RU'
+     Russia.
+
+`RW'
      Rwanda.
-‘SA’
+
+`SA'
      Saudi Arabia.
-‘SB’
+
+`SB'
      Solomon Islands.
-‘SC’
+
+`SC'
      Seychelles.
-‘SD’
+
+`SD'
      Sudan.
-‘SE’
+
+`SE'
      Sweden.
-‘SG’
+
+`SG'
      Singapore.
-‘SH’
-     Saint Helena, Ascension and Tristan da Cunha.
-‘SI’
+
+`SH'
+     St Helena.
+
+`SI'
      Slovenia.
-‘SJ’
+
+`SJ'
      Svalbard and Jan Mayen.
-‘SK’
+
+`SK'
      Slovakia.
-‘SL’
+
+`SL'
      Sierra Leone.
-‘SM’
+
+`SM'
      San Marino.
-‘SN’
+
+`SN'
      Senegal.
-‘SO’
+
+`SO'
      Somalia.
-‘SR’
+
+`SR'
      Suriname.
-‘SS’
-     South Sudan.
-‘ST’
+
+`ST'
      Sao Tome and Principe.
-‘SV’
+
+`SV'
      El Salvador.
-‘SX’
-     Sint Maarten (Dutch part).
-‘SY’
-     Syrian Arab Republic.
-‘SZ’
+
+`SY'
+     Syria.
+
+`SZ'
      Swaziland.
-‘TC’
+
+`TC'
      Turks and Caicos Islands.
-‘TD’
+
+`TD'
      Chad.
-‘TF’
-     French Southern Territories.
-‘TG’
+
+`TF'
+     French Southern and Antarctic Lands.
+
+`TG'
      Togo.
-‘TH’
+
+`TH'
      Thailand.
-‘TJ’
+
+`TJ'
      Tajikistan.
-‘TK’
+
+`TK'
      Tokelau.
-‘TL’
+
+`TL'
      Timor-Leste.
-‘TM’
+
+`TM'
      Turkmenistan.
-‘TN’
+
+`TN'
      Tunisia.
-‘TO’
+
+`TO'
      Tonga.
-‘TR’
+
+`TR'
      Turkey.
-‘TT’
+
+`TT'
      Trinidad and Tobago.
-‘TV’
+
+`TV'
      Tuvalu.
-‘TW’
-     Taiwan, Province of China.
-‘TZ’
-     Tanzania, United Republic of.
-‘UA’
+
+`TW'
+     Taiwan.
+
+`TZ'
+     Tanzania.
+
+`UA'
      Ukraine.
-‘UG’
+
+`UG'
      Uganda.
-‘UM’
-     United States Minor Outlying Islands.
-‘US’
+
+`UM'
+     US minor outlying islands.
+
+`US'
      United States.
-‘UY’
+
+`UY'
      Uruguay.
-‘UZ’
+
+`UZ'
      Uzbekistan.
-‘VA’
-     Holy See (Vatican City State).
-‘VC’
-     Saint Vincent and the Grenadines.
-‘VE’
-     Venezuela, Bolivarian Republic of.
-‘VG’
-     Virgin Islands, British.
-‘VI’
-     Virgin Islands, U.S..
-‘VN’
-     Viet Nam.
-‘VU’
+
+`VA'
+     Vatican City.
+
+`VC'
+     St Vincent and the Grenadines.
+
+`VE'
+     Venezuela.
+
+`VG'
+     Virgin Islands (UK).
+
+`VI'
+     Virgin Islands (US).
+
+`VN'
+     Vietnam.
+
+`VU'
      Vanuatu.
-‘WF’
+
+`WF'
      Wallis and Futuna.
-‘WS’
-     Samoa.
-‘YE’
+
+`WS'
+     Samoa (Western).
+
+`YE'
      Yemen.
-‘YT’
+
+`YT'
      Mayotte.
-‘ZA’
+
+`ZA'
      South Africa.
-‘ZM’
+
+`ZM'
      Zambia.
-‘ZW’
+
+`ZW'
      Zimbabwe.
 
 
@@ -15037,28 +15305,28 @@
    The files of this package are covered by the licenses indicated in
 each particular file or directory.  Here is a summary:
 
-   • The ‘libintl’ and ‘libasprintf’ libraries are covered by the GNU
-     Lesser General Public License (LGPL). A copy of the license is
+   * The `libintl' and `libasprintf' libraries are covered by the GNU
+     Library General Public License (LGPL).  A copy of the license is
      included in *note GNU LGPL::.
 
-   • The executable programs of this package and the ‘libgettextpo’
-     library are covered by the GNU General Public License (GPL). A copy
-     of the license is included in *note GNU GPL::.
+   * The executable programs of this package and the `libgettextpo'
+     library are covered by the GNU General Public License (GPL).  A
+     copy of the license is included in *note GNU GPL::.
 
-   • This manual is free documentation.  It is dually licensed under the
-     GNU FDL and the GNU GPL. This means that you can redistribute this
+   * This manual is free documentation.  It is dually licensed under the
+     GNU FDL and the GNU GPL.  This means that you can redistribute this
      manual under either of these two licenses, at your choice.
-     This manual is covered by the GNU FDL. Permission is granted to
+     This manual is covered by the GNU FDL.  Permission is granted to
      copy, distribute and/or modify this document under the terms of the
      GNU Free Documentation License (FDL), either version 1.2 of the
      License, or (at your option) any later version published by the
      Free Software Foundation (FSF); with no Invariant Sections, with no
      Front-Cover Text, and with no Back-Cover Texts.  A copy of the
      license is included in *note GNU FDL::.
-     This manual is covered by the GNU GPL. You can redistribute it
+     This manual is covered by the GNU GPL.  You can redistribute it
      and/or modify it under the terms of the GNU General Public License
      (GPL), either version 2 of the License, or (at your option) any
-     later version published by the Free Software Foundation (FSF). A
+     later version published by the Free Software Foundation (FSF).  A
      copy of the license is included in *note GNU GPL::.
 
 * Menu:
@@ -15075,30 +15343,31 @@
 
                          Version 2, June 1991
 
-     Copyright © 1989, 1991 Free Software Foundation, Inc.
+     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
      51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
 
 Preamble
-========
+--------
 
-   The licenses for most software are designed to take away your freedom
-to share and change it.  By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software—to
-make sure the software is free for all its users.  This General Public
-License applies to most of the Free Software Foundation’s software and
-to any other program whose authors commit to using it.  (Some other Free
-Software Foundation software is covered by the GNU Lesser General Public
-License instead.)  You can apply it to your programs, too.
+   The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
 
    When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it if
-you want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it in
+new free programs; and that you know you can do these things.
 
    To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
@@ -15115,35 +15384,34 @@
 and (2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
 
-   Also, for each author’s protection and ours, we want to make certain
+   Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
-authors’ reputations.
+authors' reputations.
 
    Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that redistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone’s free use or not licensed at all.
+patent must be licensed for everyone's free use or not licensed at all.
 
    The precise terms and conditions for copying, distribution and
 modification follow.
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-===============================================================
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains a
      notice placed by the copyright holder saying it may be distributed
-     under the terms of this General Public License.  The “Program”,
-     below, refers to any such program or work, and a “work based on the
-     Program” means either the Program or any derivative work under
+     under the terms of this General Public License.  The "Program",
+     below, refers to any such program or work, and a "work based on
+     the Program" means either the Program or any derivative work under
      copyright law: that is to say, a work containing the Program or a
      portion of it, either verbatim or with modifications and/or
      translated into another language.  (Hereinafter, translation is
-     included without limitation in the term “modification”.)  Each
-     licensee is addressed as “you”.
+     included without limitation in the term "modification".)  Each
+     licensee is addressed as "you".
 
      Activities other than copying, distribution and modification are
      not covered by this License; they are outside its scope.  The act
@@ -15152,8 +15420,8 @@
      the Program (independent of having been made by running the
      Program).  Whether that is true depends on what the Program does.
 
-  1. You may copy and distribute verbatim copies of the Program’s source
-     code as you receive it, in any medium, provided that you
+  1. You may copy and distribute verbatim copies of the Program's
+     source code as you receive it, in any medium, provided that you
      conspicuously and appropriately publish on each copy an appropriate
      copyright notice and disclaimer of warranty; keep intact all the
      notices that refer to this License and to the absence of any
@@ -15164,8 +15432,8 @@
      and you may at your option offer warranty protection in exchange
      for a fee.
 
-  2. You may modify your copy or copies of the Program or any portion of
-     it, thus forming a work based on the Program, and copy and
+  2. You may modify your copy or copies of the Program or any portion
+     of it, thus forming a work based on the Program, and copy and
      distribute such modifications or work under the terms of Section 1
      above, provided that you also meet all of these conditions:
 
@@ -15173,9 +15441,9 @@
           stating that you changed the files and the date of any change.
 
        b. You must cause any work that you distribute or publish, that
-          in whole or in part contains or is derived from the Program or
-          any part thereof, to be licensed as a whole at no charge to
-          all third parties under the terms of this License.
+          in whole or in part contains or is derived from the Program
+          or any part thereof, to be licensed as a whole at no charge
+          to all third parties under the terms of this License.
 
        c. If the modified program normally reads commands interactively
           when run, you must cause it, when started running for such
@@ -15192,13 +15460,13 @@
      These requirements apply to the modified work as a whole.  If
      identifiable sections of that work are not derived from the
      Program, and can be reasonably considered independent and separate
-     works in themselves, then this License, and its terms, do not apply
-     to those sections when you distribute them as separate works.  But
-     when you distribute the same sections as part of a whole which is a
-     work based on the Program, the distribution of the whole must be on
-     the terms of this License, whose permissions for other licensees
-     extend to the entire whole, and thus to each and every part
-     regardless of who wrote it.
+     works in themselves, then this License, and its terms, do not
+     apply to those sections when you distribute them as separate
+     works.  But when you distribute the same sections as part of a
+     whole which is a work based on the Program, the distribution of
+     the whole must be on the terms of this License, whose permissions
+     for other licensees extend to the entire whole, and thus to each
+     and every part regardless of who wrote it.
 
      Thus, it is not the intent of this section to claim rights or
      contest your rights to work written entirely by you; rather, the
@@ -15206,9 +15474,9 @@
      derivative or collective works based on the Program.
 
      In addition, mere aggregation of another work not based on the
-     Program with the Program (or with a work based on the Program) on a
-     volume of a storage or distribution medium does not bring the other
-     work under the scope of this License.
+     Program with the Program (or with a work based on the Program) on
+     a volume of a storage or distribution medium does not bring the
+     other work under the scope of this License.
 
   3. You may copy and distribute the Program (or a work based on it,
      under Section 2) in object code or executable form under the terms
@@ -15239,10 +15507,10 @@
      plus any associated interface definition files, plus the scripts
      used to control compilation and installation of the executable.
      However, as a special exception, the source code distributed need
-     not include anything that is normally distributed (in either source
-     or binary form) with the major components (compiler, kernel, and so
-     on) of the operating system on which the executable runs, unless
-     that component itself accompanies the executable.
+     not include anything that is normally distributed (in either
+     source or binary form) with the major components (compiler,
+     kernel, and so on) of the operating system on which the executable
+     runs, unless that component itself accompanies the executable.
 
      If distribution of executable or object code is made by offering
      access to copy from a designated place, then offering equivalent
@@ -15255,25 +15523,25 @@
      otherwise to copy, modify, sublicense or distribute the Program is
      void, and will automatically terminate your rights under this
      License.  However, parties who have received copies, or rights,
-     from you under this License will not have their licenses terminated
-     so long as such parties remain in full compliance.
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
 
   5. You are not required to accept this License, since you have not
      signed it.  However, nothing else grants you permission to modify
      or distribute the Program or its derivative works.  These actions
      are prohibited by law if you do not accept this License.
      Therefore, by modifying or distributing the Program (or any work
-     based on the Program), you indicate your acceptance of this License
-     to do so, and all its terms and conditions for copying,
+     based on the Program), you indicate your acceptance of this
+     License to do so, and all its terms and conditions for copying,
      distributing or modifying the Program or works based on it.
 
   6. Each time you redistribute the Program (or any work based on the
      Program), the recipient automatically receives a license from the
-     original licensor to copy, distribute or modify the Program subject
-     to these terms and conditions.  You may not impose any further
-     restrictions on the recipients’ exercise of the rights granted
-     herein.  You are not responsible for enforcing compliance by third
-     parties to this License.
+     original licensor to copy, distribute or modify the Program
+     subject to these terms and conditions.  You may not impose any
+     further restrictions on the recipients' exercise of the rights
+     granted herein.  You are not responsible for enforcing compliance
+     by third parties to this License.
 
   7. If, as a consequence of a court judgment or allegation of patent
      infringement or for any other reason (not limited to patent
@@ -15284,10 +15552,10 @@
      your obligations under this License and any other pertinent
      obligations, then as a consequence you may not distribute the
      Program at all.  For example, if a patent license would not permit
-     royalty-free redistribution of the Program by all those who receive
-     copies directly or indirectly through you, then the only way you
-     could satisfy both it and this License would be to refrain entirely
-     from distribution of the Program.
+     royalty-free redistribution of the Program by all those who
+     receive copies directly or indirectly through you, then the only
+     way you could satisfy both it and this License would be to refrain
+     entirely from distribution of the Program.
 
      If any portion of this section is held invalid or unenforceable
      under any particular circumstance, the balance of the section is
@@ -15318,41 +15586,41 @@
      this License.
 
   9. The Free Software Foundation may publish revised and/or new
-     versions of the General Public License from time to time.  Such new
-     versions will be similar in spirit to the present version, but may
-     differ in detail to address new problems or concerns.
+     versions of the General Public License from time to time.  Such
+     new versions will be similar in spirit to the present version, but
+     may differ in detail to address new problems or concerns.
 
      Each version is given a distinguishing version number.  If the
-     Program specifies a version number of this License which applies to
-     it and “any later version”, you have the option of following the
-     terms and conditions either of that version or of any later version
-     published by the Free Software Foundation.  If the Program does not
-     specify a version number of this License, you may choose any
-     version ever published by the Free Software Foundation.
+     Program specifies a version number of this License which applies
+     to it and "any later version", you have the option of following
+     the terms and conditions either of that version or of any later
+     version published by the Free Software Foundation.  If the Program
+     does not specify a version number of this License, you may choose
+     any version ever published by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
+ 10. If you wish to incorporate parts of the Program into other free
      programs whose distribution conditions are different, write to the
-     author to ask for permission.  For software which is copyrighted by
-     the Free Software Foundation, write to the Free Software
+     author to ask for permission.  For software which is copyrighted
+     by the Free Software Foundation, write to the Free Software
      Foundation; we sometimes make exceptions for this.  Our decision
      will be guided by the two goals of preserving the free status of
      all derivatives of our free software and of promoting the sharing
      and reuse of software generally.
 
-                              NO WARRANTY
+                                NO WARRANTY
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
      WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-     AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
-     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-     FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-     PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
-     DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
-     OR CORRECTION.
+     LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+     HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+     WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
+     NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+     FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE
+     QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
+     SERVICING, REPAIR OR CORRECTION.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
      WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
      MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
      LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
@@ -15366,7 +15634,7 @@
                       END OF TERMS AND CONDITIONS
 
 Appendix: How to Apply These Terms to Your New Programs
-=======================================================
+-------------------------------------------------------
 
    If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -15375,8 +15643,8 @@
 
    To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-“copyright” line and a pointer to where the full notice is found.
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
 
      ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
      Copyright (C) YYYY  NAME OF AUTHOR
@@ -15401,19 +15669,19 @@
    If the program is interactive, make it output a short notice like
 this when it starts in an interactive mode:
 
-     Gnomovision version 69, Copyright (C) YEAR NAME OF AUTHOR
+     Gnomovision version 69, Copyright (C) 19YY NAME OF AUTHOR
      Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
      This is free software, and you are welcome to redistribute it
      under certain conditions; type `show c' for details.
 
-   The hypothetical commands ‘show w’ and ‘show c’ should show the
+   The hypothetical commands `show w' and `show c' should show the
 appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than ‘show w’ and ‘show
-c’; they could even be mouse-clicks or menu items—whatever suits your
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
 program.
 
    You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a “copyright disclaimer” for the program,
+your school, if any, to sign a "copyright disclaimer" for the program,
 if necessary.  Here is a sample; alter the names:
 
      Yoyodyne, Inc., hereby disclaims all copyright interest in the program
@@ -15426,7 +15694,7 @@
 program into proprietary programs.  If your program is a subroutine
 library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use the
-GNU Lesser General Public License instead of this License.
+GNU Library General Public License instead of this License.
 
 
 File: gettext.info,  Node: GNU LGPL,  Next: GNU FDL,  Prev: GNU GPL,  Up: Licenses
@@ -15436,8 +15704,8 @@
 
                       Version 2.1, February 1999
 
-     Copyright © 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+     Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA
 
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
@@ -15449,17 +15717,17 @@
 Preamble
 --------
 
-   The licenses for most software are designed to take away your freedom
-to share and change it.  By contrast, the GNU General Public Licenses
-are intended to guarantee your freedom to share and change free
-software—to make sure the software is free for all its users.
+   The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
 
    This license, the Lesser General Public License, applies to some
-specially designated software—typically libraries—of the Free Software
-Foundation and other authors who decide to use it.  You can use it too,
-but we suggest you first think carefully about whether this license or
-the ordinary General Public License is the better strategy to use in any
-particular case, based on the explanations below.
+specially designated software--typically libraries--of the Free
+Software Foundation and other authors who decide to use it.  You can use
+it too, but we suggest you first think carefully about whether this
+license or the ordinary General Public License is the better strategy to
+use in any particular case, based on the explanations below.
 
    When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -15479,98 +15747,99 @@
 you.  You must make sure that they, too, receive or can get the source
 code.  If you link other code with the library, you must provide
 complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling it.
-And you must show them these terms so they know their rights.
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
 
    We protect your rights with a two-step method: (1) we copyright the
 library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.
 
-   To protect each distributor, we want to make it very clear that there
-is no warranty for the free library.  Also, if the library is modified
-by someone else and passed on, the recipients should know that what they
-have is not the original version, so that the original author’s
-reputation will not be affected by problems that might be introduced by
-others.
+   To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know that
+what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
 
    Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that any
-patent license obtained for a version of the library must be consistent
-with the full freedom of use specified in this license.
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
 
    Most GNU software, including some libraries, is covered by the
 ordinary GNU General Public License.  This license, the GNU Lesser
 General Public License, applies to certain designated libraries, and is
 quite different from the ordinary General Public License.  We use this
-license for certain libraries in order to permit linking those libraries
-into non-free programs.
+license for certain libraries in order to permit linking those
+libraries into non-free programs.
 
    When a program is linked with a library, whether statically or using
 a shared library, the combination of the two is legally speaking a
 combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the entire
-combination fits its criteria of freedom.  The Lesser General Public
-License permits more lax criteria for linking other code with the
-library.
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
 
    We call this license the "Lesser" General Public License because it
-does _Less_ to protect the user’s freedom than the ordinary General
-Public License.  It also provides other free software developers Less of
-an advantage over competing non-free programs.  These disadvantages are
-the reason we use the ordinary General Public License for many
+does _Less_ to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
 libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
    For example, on rare occasions, there may be a special need to
 encourage the widest possible use of a certain library, so that it
 becomes a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free library
-does the same job as widely used non-free libraries.  In this case,
-there is little to gain by limiting the free library to free software
-only, so we use the Lesser General Public License.
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
 
    In other cases, permission to use a particular library in non-free
 programs enables a greater number of people to use a large body of free
 software.  For example, permission to use the GNU C Library in non-free
-programs enables many more people to use the whole GNU operating system,
-as well as its variant, the GNU/Linux operating system.
+programs enables many more people to use the whole GNU operating
+system, as well as its variant, the GNU/Linux operating system.
 
    Although the Lesser General Public License is Less protective of the
-users’ freedom, it does ensure that the user of a program that is linked
-with the Library has the freedom and the wherewithal to run that program
-using a modified version of the Library.
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run that
+program using a modified version of the Library.
 
    The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
-“work based on the library” and a “work that uses the library”.  The
+"work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
----------------------------------------------------------------
+                   GNU LESSER GENERAL PUBLIC LICENSE
+
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
      program which contains a notice placed by the copyright holder or
-     other authorized party saying it may be distributed under the terms
-     of this Lesser General Public License (also called “this License”).
-     Each licensee is addressed as “you”.
+     other authorized party saying it may be distributed under the
+     terms of this Lesser General Public License (also called "this
+     License").  Each licensee is addressed as "you".
 
-     A “library” means a collection of software functions and/or data
+     A "library" means a collection of software functions and/or data
      prepared so as to be conveniently linked with application programs
      (which use some of those functions and data) to form executables.
 
-     The “Library”, below, refers to any such software library or work
-     which has been distributed under these terms.  A “work based on the
-     Library” means either the Library or any derivative work under
+     The "Library", below, refers to any such software library or work
+     which has been distributed under these terms.  A "work based on the
+     Library" means either the Library or any derivative work under
      copyright law: that is to say, a work containing the Library or a
      portion of it, either verbatim or with modifications and/or
      translated straightforwardly into another language.  (Hereinafter,
      translation is included without limitation in the term
-     “modification”.)
+     "modification".)
 
-     “Source code” for a work means the preferred form of the work for
+     "Source code" for a work means the preferred form of the work for
      making modifications to it.  For a library, complete source code
      means all the source code for all modules it contains, plus any
      associated interface definition files, plus the scripts used to
@@ -15582,10 +15851,10 @@
      output from such a program is covered only if its contents
      constitute a work based on the Library (independent of the use of
      the Library in a tool for writing it).  Whether that is true
-     depends on what the Library does and what the program that uses the
-     Library does.
+     depends on what the Library does and what the program that uses
+     the Library does.
 
-  1. You may copy and distribute verbatim copies of the Library’s
+  1. You may copy and distribute verbatim copies of the Library's
      complete source code as you receive it, in any medium, provided
      that you conspicuously and appropriately publish on each copy an
      appropriate copyright notice and disclaimer of warranty; keep
@@ -15597,8 +15866,8 @@
      and you may at your option offer warranty protection in exchange
      for a fee.
 
-  2. You may modify your copy or copies of the Library or any portion of
-     it, thus forming a work based on the Library, and copy and
+  2. You may modify your copy or copies of the Library or any portion
+     of it, thus forming a work based on the Library, and copy and
      distribute such modifications or work under the terms of Section 1
      above, provided that you also meet all of these conditions:
 
@@ -15613,10 +15882,10 @@
        d. If a facility in the modified Library refers to a function or
           a table of data to be supplied by an application program that
           uses the facility, other than as an argument passed when the
-          facility is invoked, then you must make a good faith effort to
-          ensure that, in the event an application does not supply such
-          function or table, the facility still operates, and performs
-          whatever part of its purpose remains meaningful.
+          facility is invoked, then you must make a good faith effort
+          to ensure that, in the event an application does not supply
+          such function or table, the facility still operates, and
+          performs whatever part of its purpose remains meaningful.
 
           (For example, a function in a library to compute square roots
           has a purpose that is entirely well-defined independent of the
@@ -15628,13 +15897,13 @@
      These requirements apply to the modified work as a whole.  If
      identifiable sections of that work are not derived from the
      Library, and can be reasonably considered independent and separate
-     works in themselves, then this License, and its terms, do not apply
-     to those sections when you distribute them as separate works.  But
-     when you distribute the same sections as part of a whole which is a
-     work based on the Library, the distribution of the whole must be on
-     the terms of this License, whose permissions for other licensees
-     extend to the entire whole, and thus to each and every part
-     regardless of who wrote it.
+     works in themselves, then this License, and its terms, do not
+     apply to those sections when you distribute them as separate
+     works.  But when you distribute the same sections as part of a
+     whole which is a work based on the Library, the distribution of
+     the whole must be on the terms of this License, whose permissions
+     for other licensees extend to the entire whole, and thus to each
+     and every part regardless of who wrote it.
 
      Thus, it is not the intent of this section to claim rights or
      contest your rights to work written entirely by you; rather, the
@@ -15642,32 +15911,33 @@
      derivative or collective works based on the Library.
 
      In addition, mere aggregation of another work not based on the
-     Library with the Library (or with a work based on the Library) on a
-     volume of a storage or distribution medium does not bring the other
-     work under the scope of this License.
+     Library with the Library (or with a work based on the Library) on
+     a volume of a storage or distribution medium does not bring the
+     other work under the scope of this License.
 
   3. You may opt to apply the terms of the ordinary GNU General Public
-     License instead of this License to a given copy of the Library.  To
-     do this, you must alter all the notices that refer to this License,
-     so that they refer to the ordinary GNU General Public License,
-     version 2, instead of to this License.  (If a newer version than
-     version 2 of the ordinary GNU General Public License has appeared,
-     then you can specify that version instead if you wish.)  Do not
-     make any other change in these notices.
+     License instead of this License to a given copy of the Library.
+     To do this, you must alter all the notices that refer to this
+     License, so that they refer to the ordinary GNU General Public
+     License, version 2, instead of to this License.  (If a newer
+     version than version 2 of the ordinary GNU General Public License
+     has appeared, then you can specify that version instead if you
+     wish.)  Do not make any other change in these notices.
 
      Once this change is made in a given copy, it is irreversible for
      that copy, so the ordinary GNU General Public License applies to
      all subsequent copies and derivative works made from that copy.
 
-     This option is useful when you wish to copy part of the code of the
-     Library into a program that is not a library.
+     This option is useful when you wish to copy part of the code of
+     the Library into a program that is not a library.
 
-  4. You may copy and distribute the Library (or a portion or derivative
-     of it, under Section 2) in object code or executable form under the
-     terms of Sections 1 and 2 above provided that you accompany it with
-     the complete corresponding machine-readable source code, which must
-     be distributed under the terms of Sections 1 and 2 above on a
-     medium customarily used for software interchange.
+  4. You may copy and distribute the Library (or a portion or
+     derivative of it, under Section 2) in object code or executable
+     form under the terms of Sections 1 and 2 above provided that you
+     accompany it with the complete corresponding machine-readable
+     source code, which must be distributed under the terms of Sections
+     1 and 2 above on a medium customarily used for software
+     interchange.
 
      If distribution of object code is made by offering access to copy
      from a designated place, then offering equivalent access to copy
@@ -15676,18 +15946,19 @@
      compelled to copy the source along with the object code.
 
   5. A program that contains no derivative of any portion of the
-     Library, but is designed to work with the Library by being compiled
-     or linked with it, is called a “work that uses the Library”.  Such
-     a work, in isolation, is not a derivative work of the Library, and
-     therefore falls outside the scope of this License.
+     Library, but is designed to work with the Library by being
+     compiled or linked with it, is called a "work that uses the
+     Library".  Such a work, in isolation, is not a derivative work of
+     the Library, and therefore falls outside the scope of this License.
 
-     However, linking a “work that uses the Library” with the Library
+     However, linking a "work that uses the Library" with the Library
      creates an executable that is a derivative of the Library (because
-     it contains portions of the Library), rather than a “work that uses
-     the library”.  The executable is therefore covered by this License.
-     Section 6 states terms for distribution of such executables.
+     it contains portions of the Library), rather than a "work that
+     uses the library".  The executable is therefore covered by this
+     License.  Section 6 states terms for distribution of such
+     executables.
 
-     When a “work that uses the Library” uses material from a header
+     When a "work that uses the Library" uses material from a header
      file that is part of the Library, the object code for the work may
      be a derivative work of the Library even though the source code is
      not.  Whether this is true is especially significant if the work
@@ -15707,12 +15978,12 @@
      6.  Any executables containing that work also fall under Section 6,
      whether or not they are linked directly with the Library itself.
 
-  6. As an exception to the Sections above, you may also combine or link
-     a “work that uses the Library” with the Library to produce a work
-     containing portions of the Library, and distribute that work under
-     terms of your choice, provided that the terms permit modification
-     of the work for the customer’s own use and reverse engineering for
-     debugging such modifications.
+  6. As an exception to the Sections above, you may also combine or
+     link a "work that uses the Library" with the Library to produce a
+     work containing portions of the Library, and distribute that work
+     under terms of your choice, provided that the terms permit
+     modification of the work for the customer's own use and reverse
+     engineering for debugging such modifications.
 
      You must give prominent notice with each copy of the work that the
      Library is used in it and that the Library and its use are covered
@@ -15725,9 +15996,9 @@
        a. Accompany the work with the complete corresponding
           machine-readable source code for the Library including
           whatever changes were used in the work (which must be
-          distributed under Sections 1 and 2 above); and, if the work is
-          an executable linked with the Library, with the complete
-          machine-readable “work that uses the Library”, as object code
+          distributed under Sections 1 and 2 above); and, if the work
+          is an executable linked with the Library, with the complete
+          machine-readable "work that uses the Library", as object code
           and/or source code, so that the user can modify the Library
           and then relink to produce a modified executable containing
           the modified Library.  (It is understood that the user who
@@ -15737,7 +16008,7 @@
 
        b. Use a suitable shared library mechanism for linking with the
           Library.  A suitable mechanism is one that (1) uses at run
-          time a copy of the library already present on the user’s
+          time a copy of the library already present on the user's
           computer system, rather than copying library functions into
           the executable, and (2) will operate properly with a modified
           version of the library, if the user installs one, as long as
@@ -15756,8 +16027,8 @@
        e. Verify that the user has already received a copy of these
           materials or that you have already sent this user a copy.
 
-     For an executable, the required form of the “work that uses the
-     Library” must include any data and utility programs needed for
+     For an executable, the required form of the "work that uses the
+     Library" must include any data and utility programs needed for
      reproducing the executable from it.  However, as a special
      exception, the materials to be distributed need not include
      anything that is normally distributed (in either source or binary
@@ -15768,15 +16039,16 @@
      It may happen that this requirement contradicts the license
      restrictions of other proprietary libraries that do not normally
      accompany the operating system.  Such a contradiction means you
-     cannot use both them and the Library together in an executable that
-     you distribute.
+     cannot use both them and the Library together in an executable
+     that you distribute.
 
   7. You may place library facilities that are a work based on the
      Library side-by-side in a single library together with other
-     library facilities not covered by this License, and distribute such
-     a combined library, provided that the separate distribution of the
-     work based on the Library and of the other library facilities is
-     otherwise permitted, and provided that you do these two things:
+     library facilities not covered by this License, and distribute
+     such a combined library, provided that the separate distribution
+     of the work based on the Library and of the other library
+     facilities is otherwise permitted, and provided that you do these
+     two things:
 
        a. Accompany the combined library with a copy of the same work
           based on the Library, uncombined with any other library
@@ -15792,29 +16064,29 @@
      Library except as expressly provided under this License.  Any
      attempt otherwise to copy, modify, sublicense, link with, or
      distribute the Library is void, and will automatically terminate
-     your rights under this License.  However, parties who have received
-     copies, or rights, from you under this License will not have their
-     licenses terminated so long as such parties remain in full
-     compliance.
+     your rights under this License.  However, parties who have
+     received copies, or rights, from you under this License will not
+     have their licenses terminated so long as such parties remain in
+     full compliance.
 
   9. You are not required to accept this License, since you have not
      signed it.  However, nothing else grants you permission to modify
      or distribute the Library or its derivative works.  These actions
      are prohibited by law if you do not accept this License.
      Therefore, by modifying or distributing the Library (or any work
-     based on the Library), you indicate your acceptance of this License
-     to do so, and all its terms and conditions for copying,
+     based on the Library), you indicate your acceptance of this
+     License to do so, and all its terms and conditions for copying,
      distributing or modifying the Library or works based on it.
 
-  10. Each time you redistribute the Library (or any work based on the
+ 10. Each time you redistribute the Library (or any work based on the
      Library), the recipient automatically receives a license from the
      original licensor to copy, distribute, link with or modify the
      Library subject to these terms and conditions.  You may not impose
-     any further restrictions on the recipients’ exercise of the rights
+     any further restrictions on the recipients' exercise of the rights
      granted herein.  You are not responsible for enforcing compliance
      by third parties with this License.
 
-  11. If, as a consequence of a court judgment or allegation of patent
+ 11. If, as a consequence of a court judgment or allegation of patent
      infringement or for any other reason (not limited to patent
      issues), conditions are imposed on you (whether by court order,
      agreement or otherwise) that contradict the conditions of this
@@ -15823,10 +16095,10 @@
      your obligations under this License and any other pertinent
      obligations, then as a consequence you may not distribute the
      Library at all.  For example, if a patent license would not permit
-     royalty-free redistribution of the Library by all those who receive
-     copies directly or indirectly through you, then the only way you
-     could satisfy both it and this License would be to refrain entirely
-     from distribution of the Library.
+     royalty-free redistribution of the Library by all those who
+     receive copies directly or indirectly through you, then the only
+     way you could satisfy both it and this License would be to refrain
+     entirely from distribution of the Library.
 
      If any portion of this section is held invalid or unenforceable
      under any particular circumstance, the balance of the section is
@@ -15847,7 +16119,7 @@
      This section is intended to make thoroughly clear what is believed
      to be a consequence of the rest of this License.
 
-  12. If the distribution and/or use of the Library is restricted in
+ 12. If the distribution and/or use of the Library is restricted in
      certain countries either by patents or by copyrighted interfaces,
      the original copyright holder who places the Library under this
      License may add an explicit geographical distribution limitation
@@ -15856,42 +16128,42 @@
      License incorporates the limitation as if written in the body of
      this License.
 
-  13. The Free Software Foundation may publish revised and/or new
+ 13. The Free Software Foundation may publish revised and/or new
      versions of the Lesser General Public License from time to time.
      Such new versions will be similar in spirit to the present version,
      but may differ in detail to address new problems or concerns.
 
      Each version is given a distinguishing version number.  If the
-     Library specifies a version number of this License which applies to
-     it and “any later version”, you have the option of following the
-     terms and conditions either of that version or of any later version
-     published by the Free Software Foundation.  If the Library does not
-     specify a license version number, you may choose any version ever
-     published by the Free Software Foundation.
+     Library specifies a version number of this License which applies
+     to it and "any later version", you have the option of following
+     the terms and conditions either of that version or of any later
+     version published by the Free Software Foundation.  If the Library
+     does not specify a license version number, you may choose any
+     version ever published by the Free Software Foundation.
 
-  14. If you wish to incorporate parts of the Library into other free
+ 14. If you wish to incorporate parts of the Library into other free
      programs whose distribution conditions are incompatible with these,
      write to the author to ask for permission.  For software which is
      copyrighted by the Free Software Foundation, write to the Free
      Software Foundation; we sometimes make exceptions for this.  Our
      decision will be guided by the two goals of preserving the free
-     status of all derivatives of our free software and of promoting the
-     sharing and reuse of software generally.
+     status of all derivatives of our free software and of promoting
+     the sharing and reuse of software generally.
 
-                              NO WARRANTY
+                                NO WARRANTY
 
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
      WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-     AND/OR OTHER PARTIES PROVIDE THE LIBRARY “AS IS” WITHOUT WARRANTY
-     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-     FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-     PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
-     DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
-     OR CORRECTION.
+     LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+     HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT
+     WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
+     NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+     FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE
+     QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU.  SHOULD THE
+     LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
+     SERVICING, REPAIR OR CORRECTION.
 
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
      WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
      MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE
      LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
@@ -15902,8 +16174,7 @@
      OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
      ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
----------------------------
+                      END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Libraries
 ----------------------------------------------
@@ -15917,7 +16188,7 @@
    To apply these terms, attach the following notices to the library.
 It is safest to attach them to the start of each source file to most
 effectively convey the exclusion of warranty; and each file should have
-at least the “copyright” line and a pointer to where the full notice is
+at least the "copyright" line and a pointer to where the full notice is
 found.
 
      ONE LINE TO GIVE THE LIBRARY'S NAME AND AN IDEA OF WHAT IT DOES.
@@ -15942,7 +16213,7 @@
 mail.
 
    You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a “copyright disclaimer” for the library,
+your school, if any, to sign a "copyright disclaimer" for the library,
 if necessary.  Here is a sample; alter the names:
 
      Yoyodyne, Inc., hereby disclaims all copyright interest in the library
@@ -15951,7 +16222,7 @@
      SIGNATURE OF TY COON, 1 April 1990
      Ty Coon, President of Vice
 
-   That’s all there is to it!
+   That's all there is to it!
 
 
 File: gettext.info,  Node: GNU FDL,  Prev: GNU LGPL,  Up: Licenses
@@ -15961,8 +16232,8 @@
 
                       Version 1.2, November 2002
 
-     Copyright © 2000,2001,2002 Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+     Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
@@ -15977,7 +16248,7 @@
      author and publisher a way to get credit for their work, while not
      being considered responsible for modifications made by others.
 
-     This License is a kind of “copyleft”, which means that derivative
+     This License is a kind of "copyleft", which means that derivative
      works of the document must themselves be free in the same sense.
      It complements the GNU General Public License, which is a copyleft
      license designed for free software.
@@ -15987,29 +16258,29 @@
      free program should come with manuals providing the same freedoms
      that the software does.  But this License is not limited to
      software manuals; it can be used for any textual work, regardless
-     of subject matter or whether it is published as a printed book.  We
-     recommend this License principally for works whose purpose is
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
      instruction or reference.
 
   1. APPLICABILITY AND DEFINITIONS
 
      This License applies to any manual or other work, in any medium,
-     that contains a notice placed by the copyright holder saying it can
-     be distributed under the terms of this License.  Such a notice
+     that contains a notice placed by the copyright holder saying it
+     can be distributed under the terms of this License.  Such a notice
      grants a world-wide, royalty-free license, unlimited in duration,
      to use that work under the conditions stated herein.  The
-     “Document”, below, refers to any such manual or work.  Any member
-     of the public is a licensee, and is addressed as “you”.  You accept
-     the license if you copy, modify or distribute the work in a way
-     requiring permission under copyright law.
+     "Document", below, refers to any such manual or work.  Any member
+     of the public is a licensee, and is addressed as "you".  You
+     accept the license if you copy, modify or distribute the work in a
+     way requiring permission under copyright law.
 
-     A “Modified Version” of the Document means any work containing the
+     A "Modified Version" of the Document means any work containing the
      Document or a portion of it, either copied verbatim, or with
      modifications and/or translated into another language.
 
-     A “Secondary Section” is a named appendix or a front-matter section
+     A "Secondary Section" is a named appendix or a front-matter section
      of the Document that deals exclusively with the relationship of the
-     publishers or authors of the Document to the Document’s overall
+     publishers or authors of the Document to the Document's overall
      subject (or to related matters) and contains nothing that could
      fall directly within that overall subject.  (Thus, if the Document
      is in part a textbook of mathematics, a Secondary Section may not
@@ -16018,59 +16289,59 @@
      of legal, commercial, philosophical, ethical or political position
      regarding them.
 
-     The “Invariant Sections” are certain Secondary Sections whose
-     titles are designated, as being those of Invariant Sections, in the
-     notice that says that the Document is released under this License.
-     If a section does not fit the above definition of Secondary then it
-     is not allowed to be designated as Invariant.  The Document may
-     contain zero Invariant Sections.  If the Document does not identify
-     any Invariant Sections then there are none.
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.  If a section does not fit the above definition of
+     Secondary then it is not allowed to be designated as Invariant.
+     The Document may contain zero Invariant Sections.  If the Document
+     does not identify any Invariant Sections then there are none.
 
-     The “Cover Texts” are certain short passages of text that are
+     The "Cover Texts" are certain short passages of text that are
      listed, as Front-Cover Texts or Back-Cover Texts, in the notice
      that says that the Document is released under this License.  A
      Front-Cover Text may be at most 5 words, and a Back-Cover Text may
      be at most 25 words.
 
-     A “Transparent” copy of the Document means a machine-readable copy,
+     A "Transparent" copy of the Document means a machine-readable copy,
      represented in a format whose specification is available to the
      general public, that is suitable for revising the document
-     straightforwardly with generic text editors or (for images composed
-     of pixels) generic paint programs or (for drawings) some widely
-     available drawing editor, and that is suitable for input to text
-     formatters or for automatic translation to a variety of formats
-     suitable for input to text formatters.  A copy made in an otherwise
-     Transparent file format whose markup, or absence of markup, has
-     been arranged to thwart or discourage subsequent modification by
-     readers is not Transparent.  An image format is not Transparent if
-     used for any substantial amount of text.  A copy that is not
-     “Transparent” is called “Opaque”.
+     straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup, or absence of
+     markup, has been arranged to thwart or discourage subsequent
+     modification by readers is not Transparent.  An image format is
+     not Transparent if used for any substantial amount of text.  A
+     copy that is not "Transparent" is called "Opaque".
 
      Examples of suitable formats for Transparent copies include plain
      ASCII without markup, Texinfo input format, LaTeX input format,
-     SGML or XML using a publicly available DTD, and standard-conforming
-     simple HTML, PostScript or PDF designed for human modification.
-     Examples of transparent image formats include PNG, XCF and JPG.
-     Opaque formats include proprietary formats that can be read and
-     edited only by proprietary word processors, SGML or XML for which
-     the DTD and/or processing tools are not generally available, and
-     the machine-generated HTML, PostScript or PDF produced by some word
-     processors for output purposes only.
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML, PostScript or PDF designed for
+     human modification.  Examples of transparent image formats include
+     PNG, XCF and JPG.  Opaque formats include proprietary formats that
+     can be read and edited only by proprietary word processors, SGML or
+     XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML, PostScript or PDF
+     produced by some word processors for output purposes only.
 
-     The “Title Page” means, for a printed book, the title page itself,
+     The "Title Page" means, for a printed book, the title page itself,
      plus such following pages as are needed to hold, legibly, the
      material this License requires to appear in the title page.  For
-     works in formats which do not have any title page as such, “Title
-     Page” means the text near the most prominent appearance of the
-     work’s title, preceding the beginning of the body of the text.
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
 
-     A section “Entitled XYZ” means a named subunit of the Document
+     A section "Entitled XYZ" means a named subunit of the Document
      whose title either is precisely XYZ or contains XYZ in parentheses
      following text that translates XYZ in another language.  (Here XYZ
      stands for a specific section name mentioned below, such as
-     “Acknowledgements”, “Dedications”, “Endorsements”, or “History”.)
-     To “Preserve the Title” of such a section when you modify the
-     Document means that it remains a section “Entitled XYZ” according
+     "Acknowledgements", "Dedications", "Endorsements", or "History".)
+     To "Preserve the Title" of such a section when you modify the
+     Document means that it remains a section "Entitled XYZ" according
      to this definition.
 
      The Document may include Warranty Disclaimers next to the notice
@@ -16090,8 +16361,8 @@
      may not use technical measures to obstruct or control the reading
      or further copying of the copies you make or distribute.  However,
      you may accept compensation in exchange for copies.  If you
-     distribute a large enough number of copies you must also follow the
-     conditions in section 3.
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
 
      You may also lend copies, under the same conditions stated above,
      and you may publicly display copies.
@@ -16100,16 +16371,17 @@
 
      If you publish printed copies (or copies in media that commonly
      have printed covers) of the Document, numbering more than 100, and
-     the Document’s license notice requires Cover Texts, you must
+     the Document's license notice requires Cover Texts, you must
      enclose the copies in covers that carry, clearly and legibly, all
      these Cover Texts: Front-Cover Texts on the front cover, and
      Back-Cover Texts on the back cover.  Both covers must also clearly
      and legibly identify you as the publisher of these copies.  The
-     front cover must present the full title with all words of the title
-     equally prominent and visible.  You may add other material on the
-     covers in addition.  Copying with changes limited to the covers, as
-     long as they preserve the title of the Document and satisfy these
-     conditions, can be treated as verbatim copying in other respects.
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
 
      If the required texts for either cover are too voluminous to fit
      legibly, you should put the first ones listed (as many as fit
@@ -16117,39 +16389,40 @@
      adjacent pages.
 
      If you publish or distribute Opaque copies of the Document
-     numbering more than 100, you must either include a machine-readable
-     Transparent copy along with each Opaque copy, or state in or with
-     each Opaque copy a computer-network location from which the general
-     network-using public has access to download using public-standard
-     network protocols a complete Transparent copy of the Document, free
-     of added material.  If you use the latter option, you must take
-     reasonably prudent steps, when you begin distribution of Opaque
-     copies in quantity, to ensure that this Transparent copy will
-     remain thus accessible at the stated location until at least one
-     year after the last time you distribute an Opaque copy (directly or
-     through your agents or retailers) of that edition to the public.
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a computer-network location from
+     which the general network-using public has access to download
+     using public-standard network protocols a complete Transparent
+     copy of the Document, free of added material.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
 
      It is requested, but not required, that you contact the authors of
-     the Document well before redistributing any large number of copies,
-     to give them a chance to provide you with an updated version of the
-     Document.
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
 
   4. MODIFICATIONS
 
      You may copy and distribute a Modified Version of the Document
      under the conditions of sections 2 and 3 above, provided that you
-     release the Modified Version under precisely this License, with the
-     Modified Version filling the role of the Document, thus licensing
-     distribution and modification of the Modified Version to whoever
-     possesses a copy of it.  In addition, you must do these things in
-     the Modified Version:
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
 
        A. Use in the Title Page (and on the covers, if any) a title
-          distinct from that of the Document, and from those of previous
-          versions (which should, if there were any, be listed in the
-          History section of the Document).  You may use the same title
-          as a previous version if the original publisher of that
-          version gives permission.
+          distinct from that of the Document, and from those of
+          previous versions (which should, if there were any, be listed
+          in the History section of the Document).  You may use the
+          same title as a previous version if the original publisher of
+          that version gives permission.
 
        B. List on the Title Page, as authors, one or more persons or
           entities responsible for authorship of the modifications in
@@ -16172,71 +16445,72 @@
           the Addendum below.
 
        G. Preserve in that license notice the full lists of Invariant
-          Sections and required Cover Texts given in the Document’s
+          Sections and required Cover Texts given in the Document's
           license notice.
 
        H. Include an unaltered copy of this License.
 
-       I. Preserve the section Entitled “History”, Preserve its Title,
+       I. Preserve the section Entitled "History", Preserve its Title,
           and add to it an item stating at least the title, year, new
-          authors, and publisher of the Modified Version as given on the
-          Title Page.  If there is no section Entitled “History” in the
-          Document, create one stating the title, year, authors, and
-          publisher of the Document as given on its Title Page, then add
-          an item describing the Modified Version as stated in the
-          previous sentence.
+          authors, and publisher of the Modified Version as given on
+          the Title Page.  If there is no section Entitled "History" in
+          the Document, create one stating the title, year, authors,
+          and publisher of the Document as given on its Title Page,
+          then add an item describing the Modified Version as stated in
+          the previous sentence.
 
        J. Preserve the network location, if any, given in the Document
           for public access to a Transparent copy of the Document, and
           likewise the network locations given in the Document for
-          previous versions it was based on.  These may be placed in the
-          “History” section.  You may omit a network location for a work
-          that was published at least four years before the Document
-          itself, or if the original publisher of the version it refers
-          to gives permission.
-
-       K. For any section Entitled “Acknowledgements” or “Dedications”,
-          Preserve the Title of the section, and preserve in the section
-          all the substance and tone of each of the contributor
+          previous versions it was based on.  These may be placed in
+          the "History" section.  You may omit a network location for a
+          work that was published at least four years before the
+          Document itself, or if the original publisher of the version
+          it refers to gives permission.
+
+       K. For any section Entitled "Acknowledgements" or "Dedications",
+          Preserve the Title of the section, and preserve in the
+          section all the substance and tone of each of the contributor
           acknowledgements and/or dedications given therein.
 
-       L. Preserve all the Invariant Sections of the Document, unaltered
-          in their text and in their titles.  Section numbers or the
-          equivalent are not considered part of the section titles.
+       L. Preserve all the Invariant Sections of the Document,
+          unaltered in their text and in their titles.  Section numbers
+          or the equivalent are not considered part of the section
+          titles.
 
-       M. Delete any section Entitled “Endorsements”.  Such a section
+       M. Delete any section Entitled "Endorsements".  Such a section
           may not be included in the Modified Version.
 
        N. Do not retitle any existing section to be Entitled
-          “Endorsements” or to conflict in title with any Invariant
+          "Endorsements" or to conflict in title with any Invariant
           Section.
 
        O. Preserve any Warranty Disclaimers.
 
      If the Modified Version includes new front-matter sections or
      appendices that qualify as Secondary Sections and contain no
-     material copied from the Document, you may at your option designate
-     some or all of these sections as invariant.  To do this, add their
-     titles to the list of Invariant Sections in the Modified Version’s
-     license notice.  These titles must be distinct from any other
-     section titles.
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
 
-     You may add a section Entitled “Endorsements”, provided it contains
+     You may add a section Entitled "Endorsements", provided it contains
      nothing but endorsements of your Modified Version by various
-     parties—for example, statements of peer review or that the text has
-     been approved by an organization as the authoritative definition of
-     a standard.
+     parties--for example, statements of peer review or that the text
+     has been approved by an organization as the authoritative
+     definition of a standard.
 
      You may add a passage of up to five words as a Front-Cover Text,
-     and a passage of up to 25 words as a Back-Cover Text, to the end of
-     the list of Cover Texts in the Modified Version.  Only one passage
-     of Front-Cover Text and one of Back-Cover Text may be added by (or
-     through arrangements made by) any one entity.  If the Document
-     already includes a cover text for the same cover, previously added
-     by you or by arrangement made by the same entity you are acting on
-     behalf of, you may not add another; but you may replace the old
-     one, on explicit permission from the previous publisher that added
-     the old one.
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
 
      The author(s) and publisher(s) of the Document do not by this
      License give permission to use their names for publicity for or to
@@ -16246,8 +16520,8 @@
 
      You may combine the Document with other documents released under
      this License, under the terms defined in section 4 above for
-     modified versions, provided that you include in the combination all
-     of the Invariant Sections of all of the original documents,
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
      unmodified, and list them all as Invariant Sections of your
      combined work in its license notice, and that you preserve all
      their Warranty Disclaimers.
@@ -16263,10 +16537,10 @@
      combined work.
 
      In the combination, you must combine any sections Entitled
-     “History” in the various original documents, forming one section
-     Entitled “History”; likewise combine any sections Entitled
-     “Acknowledgements”, and any sections Entitled “Dedications”.  You
-     must delete all sections Entitled “Endorsements.”
+     "History" in the various original documents, forming one section
+     Entitled "History"; likewise combine any sections Entitled
+     "Acknowledgements", and any sections Entitled "Dedications".  You
+     must delete all sections Entitled "Endorsements."
 
   6. COLLECTIONS OF DOCUMENTS
 
@@ -16274,29 +16548,29 @@
      documents released under this License, and replace the individual
      copies of this License in the various documents with a single copy
      that is included in the collection, provided that you follow the
-     rules of this License for verbatim copying of each of the documents
-     in all other respects.
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
 
      You may extract a single document from such a collection, and
      distribute it individually under this License, provided you insert
-     a copy of this License into the extracted document, and follow this
-     License in all other respects regarding verbatim copying of that
-     document.
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
 
   7. AGGREGATION WITH INDEPENDENT WORKS
 
      A compilation of the Document or its derivatives with other
-     separate and independent documents or works, in or on a volume of a
-     storage or distribution medium, is called an “aggregate” if the
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, is called an "aggregate" if the
      copyright resulting from the compilation is not used to limit the
-     legal rights of the compilation’s users beyond what the individual
+     legal rights of the compilation's users beyond what the individual
      works permit.  When the Document is included in an aggregate, this
      License does not apply to the other works in the aggregate which
      are not themselves derivative works of the Document.
 
      If the Cover Text requirement of section 3 is applicable to these
      copies of the Document, then if the Document is less than one half
-     of the entire aggregate, the Document’s Cover Texts may be placed
+     of the entire aggregate, the Document's Cover Texts may be placed
      on covers that bracket the Document within the aggregate, or the
      electronic equivalent of covers if the Document is in electronic
      form.  Otherwise they must appear on printed covers that bracket
@@ -16318,8 +16592,8 @@
      this License or a notice or disclaimer, the original version will
      prevail.
 
-     If a section in the Document is Entitled “Acknowledgements”,
-     “Dedications”, or “History”, the requirement (section 4) to
+     If a section in the Document is Entitled "Acknowledgements",
+     "Dedications", or "History", the requirement (section 4) to
      Preserve its Title (section 1) will typically require changing the
      actual title.
 
@@ -16330,29 +16604,29 @@
      attempt to copy, modify, sublicense or distribute the Document is
      void, and will automatically terminate your rights under this
      License.  However, parties who have received copies, or rights,
-     from you under this License will not have their licenses terminated
-     so long as such parties remain in full compliance.
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
 
-  10. FUTURE REVISIONS OF THIS LICENSE
+ 10. FUTURE REVISIONS OF THIS LICENSE
 
      The Free Software Foundation may publish new, revised versions of
      the GNU Free Documentation License from time to time.  Such new
      versions will be similar in spirit to the present version, but may
      differ in detail to address new problems or concerns.  See
-     <http://www.gnu.org/copyleft/>.
+     `http://www.gnu.org/copyleft/'.
 
      Each version of the License is given a distinguishing version
      number.  If the Document specifies that a particular numbered
-     version of this License “or any later version” applies to it, you
+     version of this License "or any later version" applies to it, you
      have the option of following the terms and conditions either of
      that specified version or of any later version that has been
-     published (not as a draft) by the Free Software Foundation.  If the
-     Document does not specify a version number of this License, you may
-     choose any version ever published (not as a draft) by the Free
-     Software Foundation.
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
 
 ADDENDUM: How to use this License for your documents
-====================================================
+----------------------------------------------------
 
    To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and license
@@ -16367,7 +16641,7 @@
        Free Documentation License''.
 
    If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the “with…Texts.” line with this:
+Texts, replace the "with...Texts." line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
@@ -16378,9 +16652,9 @@
 situation.
 
    If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of free
-software license, such as the GNU General Public License, to permit
-their use in free software.
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
 
 
 File: gettext.info,  Node: Program Index,  Next: Option Index,  Prev: Licenses,  Up: Top
@@ -16391,38 +16665,30 @@
 [index]
 * Menu:
 
-* autopoint:                             autopoint Invocation.
-                                                              (line   6)
-* boldquot:                              msgfilter Invocation.
-                                                              (line 106)
-* envsubst:                              envsubst Invocation. (line   6)
-* gettext:                               sh.                  (line  19)
-* gettext <1>:                           gettext Invocation.  (line   6)
+* autopoint:                             autopoint Invocation. (line  6)
+* envsubst:                              envsubst Invocation.  (line  6)
+* gettext <1>:                           gettext Invocation.   (line  6)
+* gettext:                               sh.                   (line 19)
 * gettextize:                            gettextize Invocation.
-                                                              (line  34)
-* msgattrib:                             msgattrib Invocation.
-                                                              (line   6)
-* msgcat:                                msgcat Invocation.   (line   6)
-* msgcmp:                                msgcmp Invocation.   (line   6)
-* msgcomm:                               msgcomm Invocation.  (line   6)
-* msgconv:                               msgconv Invocation.  (line   6)
-* msgen:                                 msgen Invocation.    (line   6)
-* msgexec:                               msgexec Invocation.  (line   6)
-* msgfilter:                             msgfilter Invocation.
-                                                              (line   6)
-* msgfmt:                                msgfmt Invocation.   (line   6)
-* msggrep:                               msggrep Invocation.  (line   6)
-* msginit:                               msginit Invocation.  (line   6)
-* msgmerge:                              msgmerge Invocation. (line   6)
-* msgunfmt:                              msgunfmt Invocation. (line   6)
-* msguniq:                               msguniq Invocation.  (line   6)
-* ngettext:                              sh.                  (line  19)
-* ngettext <1>:                          ngettext Invocation. (line   6)
-* quot:                                  msgfilter Invocation.
-                                                              (line 102)
-* recode-sr-latin:                       msgfilter Invocation.
-                                                              (line  96)
-* xgettext:                              xgettext Invocation. (line   6)
+                                                               (line 34)
+* msgattrib:                             msgattrib Invocation. (line  6)
+* msgcat:                                msgcat Invocation.    (line  6)
+* msgcmp:                                msgcmp Invocation.    (line  6)
+* msgcomm:                               msgcomm Invocation.   (line  6)
+* msgconv:                               msgconv Invocation.   (line  6)
+* msgen:                                 msgen Invocation.     (line  6)
+* msgexec:                               msgexec Invocation.   (line  6)
+* msgfilter:                             msgfilter Invocation. (line  6)
+* msgfmt:                                msgfmt Invocation.    (line  6)
+* msggrep:                               msggrep Invocation.   (line  6)
+* msginit:                               msginit Invocation.   (line  6)
+* msgmerge:                              msgmerge Invocation.  (line  6)
+* msgunfmt:                              msgunfmt Invocation.  (line  6)
+* msguniq:                               msguniq Invocation.   (line  6)
+* ngettext <1>:                          ngettext Invocation.  (line  6)
+* ngettext:                              sh.                   (line 19)
+* recode-sr-latin:                       msgfilter Invocation. (line 92)
+* xgettext:                              xgettext Invocation.  (line  6)
 
 
 File: gettext.info,  Node: Option Index,  Next: Variable Index,  Prev: Program Index,  Up: Top
@@ -16433,727 +16699,690 @@
 [index]
 * Menu:
 
-* --add-comments, ‘xgettext’ option:     xgettext Invocation. (line  94)
-* --add-location, ‘msgattrib’ option:    msgattrib Invocation.
-                                                              (line 138)
-* --add-location, ‘msgcat’ option:       msgcat Invocation.   (line 114)
-* --add-location, ‘msgcomm’ option:      msgcomm Invocation.  (line 100)
-* --add-location, ‘msgconv’ option:      msgconv Invocation.  (line  80)
-* --add-location, ‘msgen’ option:        msgen Invocation.    (line  83)
-* --add-location, ‘msgfilter’ option:    msgfilter Invocation.
-                                                              (line 156)
-* --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 309)
-* --alignment, ‘msgfmt’ option:          msgfmt Invocation.   (line 250)
-* --backup, ‘msgmerge’ option:           msgmerge Invocation. (line  62)
-* --boost, ‘xgettext’ option:            xgettext Invocation. (line 267)
-* --c++, ‘xgettext’ option:              xgettext Invocation. (line  63)
-* --check, ‘msgfmt’ option:              msgfmt Invocation.   (line 188)
-* --check-accelerators, ‘msgfmt’ option: msgfmt Invocation.   (line 229)
-* --check-compatibility, ‘msgfmt’ option: msgfmt Invocation.  (line 225)
-* --check-domain, ‘msgfmt’ option:       msgfmt Invocation.   (line 220)
-* --check-format, ‘msgfmt’ option:       msgfmt Invocation.   (line 192)
-* --check-header, ‘msgfmt’ option:       msgfmt Invocation.   (line 215)
-* --clear-fuzzy, ‘msgattrib’ option:     msgattrib Invocation.
-                                                              (line  68)
-* --clear-obsolete, ‘msgattrib’ option:  msgattrib Invocation.
-                                                              (line  74)
-* --clear-previous, ‘msgattrib’ option:  msgattrib Invocation.
-                                                              (line  81)
-* --color, ‘msgattrib’ option:           msgattrib Invocation.
-                                                              (line 119)
-* --color, ‘msgcat’ option:              msgcat Invocation.   (line  95)
-* --color, ‘msgcat’ option <1>:          The --color option.  (line   6)
-* --color, ‘msgcomm’ option:             msgcomm Invocation.  (line  81)
-* --color, ‘msgconv’ option:             msgconv Invocation.  (line  61)
-* --color, ‘msgen’ option:               msgen Invocation.    (line  64)
-* --color, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line 133)
-* --color, ‘msggrep’ option:             msggrep Invocation.  (line 134)
-* --color, ‘msginit’ option:             msginit Invocation.  (line  60)
-* --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 288)
-* --comment, ‘msggrep’ option:           msggrep Invocation.  (line  86)
-* --compendium, ‘msgmerge’ option:       msgmerge Invocation. (line  36)
-* --copyright-holder, ‘xgettext’ option: xgettext Invocation. (line 365)
-* --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 271)
-* --default-domain, ‘xgettext’ option:   xgettext Invocation. (line  35)
-* --desktop, ‘msgfmt’ option:            msgfmt Invocation.   (line  49)
-* --directory, ‘msgattrib’ option:       msgattrib Invocation.
+* --add-comments, xgettext option:       xgettext Invocation. (line  97)
+* --add-location, msgattrib option:      msgattrib Invocation.
+                                                              (line 136)
+* --add-location, msgcat option:         msgcat Invocation.   (line 119)
+* --add-location, msgcomm option:        msgcomm Invocation.  (line 104)
+* --add-location, msgconv option:        msgconv Invocation.  (line  83)
+* --add-location, msgen option:          msgen Invocation.    (line  85)
+* --add-location, msgfilter option:      msgfilter Invocation.
+                                                              (line 144)
+* --add-location, msggrep option:        msggrep Invocation.  (line 161)
+* --add-location, msgmerge option:       msgmerge Invocation. (line 155)
+* --add-location, msguniq option:        msguniq Invocation.  (line 101)
+* --add-location, xgettext option:       xgettext Invocation. (line 297)
+* --alignment, msgfmt option:            msgfmt Invocation.   (line 209)
+* --backup, msgmerge option:             msgmerge Invocation. (line  65)
+* --boost, xgettext option:              xgettext Invocation. (line 254)
+* --c++, xgettext option:                xgettext Invocation. (line  64)
+* --check, msgfmt option:                msgfmt Invocation.   (line 146)
+* --check-accelerators, msgfmt option:   msgfmt Invocation.   (line 187)
+* --check-compatibility, msgfmt option:  msgfmt Invocation.   (line 183)
+* --check-domain, msgfmt option:         msgfmt Invocation.   (line 178)
+* --check-format, msgfmt option:         msgfmt Invocation.   (line 150)
+* --check-header, msgfmt option:         msgfmt Invocation.   (line 173)
+* --clear-fuzzy, msgattrib option:       msgattrib Invocation.
+                                                              (line  71)
+* --clear-obsolete, msgattrib option:    msgattrib Invocation.
+                                                              (line  77)
+* --clear-previous, msgattrib option:    msgattrib Invocation.
+                                                              (line  80)
+* --color, msgattrib option:             msgattrib Invocation.
+                                                              (line 117)
+* --color, msgcat option <1>:            The --color option.  (line   6)
+* --color, msgcat option:                msgcat Invocation.   (line 100)
+* --color, msgcomm option:               msgcomm Invocation.  (line  85)
+* --color, msgconv option:               msgconv Invocation.  (line  65)
+* --color, msgen option:                 msgen Invocation.    (line  67)
+* --color, msgfilter option:             msgfilter Invocation.
+                                                              (line 122)
+* --color, msggrep option:               msggrep Invocation.  (line 144)
+* --color, msginit option:               msginit Invocation.  (line  63)
+* --color, msgmerge option:              msgmerge Invocation. (line 137)
+* --color, msgunfmt option:              msgunfmt Invocation. (line 109)
+* --color, msguniq option:               msguniq Invocation.  (line  82)
+* --color, xgettext option:              xgettext Invocation. (line 276)
+* --comment, msggrep option:             msggrep Invocation.  (line  93)
+* --compendium, msgmerge option:         msgmerge Invocation. (line  36)
+* --copyright-holder, xgettext option:   xgettext Invocation. (line 347)
+* --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 258)
+* --default-domain, xgettext option:     xgettext Invocation. (line  36)
+* --directory, msgattrib option:         msgattrib Invocation.
                                                               (line  19)
-* --directory, ‘msgcat’ option:          msgcat Invocation.   (line  31)
-* --directory, ‘msgcmp’ option:          msgcmp Invocation.   (line  27)
-* --directory, ‘msgcomm’ option:         msgcomm Invocation.  (line  30)
-* --directory, ‘msgconv’ option:         msgconv Invocation.  (line  19)
-* --directory, ‘msgen’ option:           msgen Invocation.    (line  25)
-* --directory, ‘msgexec’ option:         msgexec Invocation.  (line  51)
-* --directory, ‘msgfilter’ option:       msgfilter Invocation.
-                                                              (line  34)
-* --directory, ‘msgfmt’ option:          msgfmt Invocation.   (line  18)
-* --directory, ‘msggrep’ option:         msggrep Invocation.  (line  19)
-* --directory, ‘msgmerge’ option:        msgmerge Invocation. (line  30)
-* --directory, ‘msguniq’ option:         msguniq Invocation.  (line  26)
-* --directory, ‘xgettext’ option:        xgettext Invocation. (line  24)
-* --domain, ‘gettext’ option:            gettext Invocation.  (line  16)
-* --domain, ‘msggrep’ option:            msggrep Invocation.  (line  70)
-* --domain, ‘ngettext’ option:           ngettext Invocation. (line  15)
-* --dry-run, ‘autopoint’ option:         autopoint Invocation.
+* --directory, msgcat option:            msgcat Invocation.   (line  32)
+* --directory, msgcmp option:            msgcmp Invocation.   (line  27)
+* --directory, msgcomm option:           msgcomm Invocation.  (line  30)
+* --directory, msgconv option:           msgconv Invocation.  (line  19)
+* --directory, msgen option:             msgen Invocation.    (line  25)
+* --directory, msgexec option:           msgexec Invocation.  (line  44)
+* --directory, msgfilter option:         msgfilter Invocation.
+                                                              (line  27)
+* --directory, msgfmt option:            msgfmt Invocation.   (line  18)
+* --directory, msggrep option:           msggrep Invocation.  (line  19)
+* --directory, msgmerge option:          msgmerge Invocation. (line  30)
+* --directory, msguniq option:           msguniq Invocation.  (line  26)
+* --directory, xgettext option:          xgettext Invocation. (line  24)
+* --domain, gettext option:              gettext Invocation.  (line  16)
+* --domain, msggrep option:              msggrep Invocation.  (line  77)
+* --domain, ngettext option:             ngettext Invocation. (line  15)
+* --dry-run, autopoint option:           autopoint Invocation.
                                                               (line  24)
-* --dry-run, ‘gettextize’ option:        gettextize Invocation.
+* --dry-run, gettextize option:          gettextize Invocation.
                                                               (line  72)
-* --empty, ‘msgattrib’ option:           msgattrib Invocation.
-                                                              (line  84)
-* --endianness, ‘msgfmt’ option:         msgfmt Invocation.   (line 253)
-* --exclude-file, ‘xgettext’ option:     xgettext Invocation. (line  89)
-* --expression, ‘msgfilter’ option:      msgfilter Invocation.
-                                                              (line  82)
-* --extended-regexp, ‘msggrep’ option:   msggrep Invocation.  (line  94)
-* --extract-all, ‘xgettext’ option:      xgettext Invocation. (line 103)
-* --extracted-comment, ‘msggrep’ option: msggrep Invocation.  (line  90)
-* --file, ‘msgfilter’ option:            msgfilter Invocation.
-                                                              (line  86)
-* --file, ‘msggrep’ option:              msggrep Invocation.  (line 106)
-* --files-from, ‘msgcat’ option:         msgcat Invocation.   (line  26)
-* --files-from, ‘msgcomm’ option:        msgcomm Invocation.  (line  25)
-* --files-from, ‘xgettext’ option:       xgettext Invocation. (line  19)
-* --fixed-strings, ‘msggrep’ option:     msggrep Invocation.  (line  98)
-* --flag, ‘xgettext’ option:             xgettext Invocation. (line 214)
-* --force, ‘autopoint’ option:           autopoint Invocation.
+* --exclude-file, xgettext option:       xgettext Invocation. (line  92)
+* --expression, msgfilter option:        msgfilter Invocation.
+                                                              (line  77)
+* --extended-regexp, msggrep option:     msggrep Invocation.  (line 101)
+* --extract-all, xgettext option:        xgettext Invocation. (line 107)
+* --extracted-comment, msggrep option:   msggrep Invocation.  (line  97)
+* --file, msgfilter option:              msgfilter Invocation.
+                                                              (line  81)
+* --file, msggrep option:                msggrep Invocation.  (line 113)
+* --files-from, msgcat option:           msgcat Invocation.   (line  27)
+* --files-from, msgcomm option:          msgcomm Invocation.  (line  25)
+* --files-from, xgettext option:         xgettext Invocation. (line  19)
+* --fixed-strings, msggrep option:       msggrep Invocation.  (line 105)
+* --flag, xgettext option:               xgettext Invocation. (line 201)
+* --force, autopoint option:             autopoint Invocation.
                                                               (line  20)
-* --force, ‘gettextize’ option:          gettextize Invocation.
+* --force, gettextize option:            gettextize Invocation.
                                                               (line  40)
-* --force-po, ‘msgattrib’ option:        msgattrib Invocation.
-                                                              (line 127)
-* --force-po, ‘msgcat’ option:           msgcat Invocation.   (line 103)
-* --force-po, ‘msgcomm’ option:          msgcomm Invocation.  (line  89)
-* --force-po, ‘msgconv’ option:          msgconv Invocation.  (line  69)
-* --force-po, ‘msgen’ option:            msgen Invocation.    (line  72)
-* --force-po, ‘msgfilter’ option:        msgfilter Invocation.
-                                                              (line 141)
-* --force-po, ‘msggrep’ option:          msggrep Invocation.  (line 142)
-* --force-po, ‘msgmerge’ option:         msgmerge Invocation. (line 139)
-* --force-po, ‘msgunfmt’ option:         msgunfmt Invocation. (line 111)
-* --force-po, ‘msguniq’ option:          msguniq Invocation.  (line  86)
-* --force-po, ‘xgettext’ option:         xgettext Invocation. (line 296)
-* --foreign-user, ‘xgettext’ option:     xgettext Invocation. (line 380)
-* --from-code, ‘xgettext’ option:        xgettext Invocation. (line  72)
-* --fuzzy, ‘msgattrib’ option:           msgattrib Invocation.
-                                                              (line  95)
-* --help, ‘autopoint’ option:            autopoint Invocation.
-                                                              (line  32)
-* --help, ‘envsubst’ option:             envsubst Invocation. (line  21)
-* --help, ‘gettext’ option:              gettext Invocation.  (line  32)
-* --help, ‘gettextize’ option:           gettextize Invocation.
-                                                              (line  77)
-* --help, ‘msgattrib’ option:            msgattrib Invocation.
-                                                              (line 188)
-* --help, ‘msgcat’ option:               msgcat Invocation.   (line 164)
-* --help, ‘msgcmp’ option:               msgcmp Invocation.   (line  69)
-* --help, ‘msgcomm’ option:              msgcomm Invocation.  (line 153)
-* --help, ‘msgconv’ option:              msgconv Invocation.  (line 130)
-* --help, ‘msgen’ option:                msgen Invocation.    (line 133)
-* --help, ‘msgexec’ option:              msgexec Invocation.  (line  74)
-* --help, ‘msgfilter’ option:            msgfilter Invocation.
-                                                              (line 206)
-* --help, ‘msgfmt’ option:               msgfmt Invocation.   (line 274)
-* --help, ‘msggrep’ option:              msggrep Invocation.  (line 200)
-* --help, ‘msginit’ option:              msginit Invocation.  (line  95)
-* --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 427)
-* --ignore-case, ‘msggrep’ option:       msggrep Invocation.  (line 110)
-* --ignore-file, ‘msgattrib’ option:     msgattrib Invocation.
+* --force-po, msgattrib option:          msgattrib Invocation.
+                                                              (line 125)
+* --force-po, msgcat option:             msgcat Invocation.   (line 108)
+* --force-po, msgcomm option:            msgcomm Invocation.  (line  93)
+* --force-po, msgconv option:            msgconv Invocation.  (line  73)
+* --force-po, msgen option:              msgen Invocation.    (line  75)
+* --force-po, msgfilter option:          msgfilter Invocation.
+                                                              (line 130)
+* --force-po, msggrep option:            msggrep Invocation.  (line 152)
+* --force-po, msgmerge option:           msgmerge Invocation. (line 145)
+* --force-po, msgunfmt option:           msgunfmt Invocation. (line 117)
+* --force-po, msguniq option:            msguniq Invocation.  (line  90)
+* --force-po, xgettext option:           xgettext Invocation. (line 284)
+* --foreign-user, xgettext option:       xgettext Invocation. (line 362)
+* --from-code, xgettext option:          xgettext Invocation. (line  74)
+* --fuzzy, msgattrib option:             msgattrib Invocation.
                                                               (line  91)
-* --indent, ‘msgattrib’ option:          msgattrib Invocation.
-                                                              (line 131)
-* --indent, ‘msgcat’ option:             msgcat Invocation.   (line 107)
-* --indent, ‘msgcomm’ option:            msgcomm Invocation.  (line  93)
-* --indent, ‘msgconv’ option:            msgconv Invocation.  (line  73)
-* --indent, ‘msgen’ option:              msgen Invocation.    (line  76)
-* --indent, ‘msgfilter’ option:          msgfilter Invocation.
-                                                              (line 144)
-* --indent, ‘msggrep’ option:            msggrep Invocation.  (line 145)
-* --indent, ‘msgmerge’ option:           msgmerge Invocation. (line 143)
-* --indent, ‘msgunfmt’ option:           msgunfmt Invocation. (line 115)
-* --indent, ‘msguniq’ option:            msguniq Invocation.  (line  90)
-* --indent, ‘xgettext’ option:           xgettext Invocation. (line 300)
-* --input, ‘msgexec’ option:             msgexec Invocation.  (line  47)
-* --input, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line  30)
-* --input, ‘msginit’ option:             msginit Invocation.  (line  16)
-* --intl, ‘gettextize’ option:           gettextize Invocation.
+* --help, autopoint option:              autopoint Invocation.
+                                                              (line  33)
+* --help, envsubst option:               envsubst Invocation. (line  22)
+* --help, gettext option:                gettext Invocation.  (line  32)
+* --help, gettextize option:             gettextize Invocation.
+                                                              (line  77)
+* --help, msgattrib option:              msgattrib Invocation.
+                                                              (line 181)
+* --help, msgcat option:                 msgcat Invocation.   (line 164)
+* --help, msgcmp option:                 msgcmp Invocation.   (line  72)
+* --help, msgcomm option:                msgcomm Invocation.  (line 152)
+* --help, msgconv option:                msgconv Invocation.  (line 128)
+* --help, msgen option:                  msgen Invocation.    (line 130)
+* --help, msgexec option:                msgexec Invocation.  (line  69)
+* --help, msgfilter option:              msgfilter Invocation.
+                                                              (line 189)
+* --help, msgfmt option:                 msgfmt Invocation.   (line 222)
+* --help, msggrep option:                msggrep Invocation.  (line 204)
+* --help, msginit option:                msginit Invocation.  (line  99)
+* --help, msgmerge option:               msgmerge Invocation. (line 200)
+* --help, msgunfmt option:               msgunfmt Invocation. (line 162)
+* --help, msguniq option:                msguniq Invocation.  (line 146)
+* --help, ngettext option:               ngettext Invocation. (line  31)
+* --help, xgettext option:               xgettext Invocation. (line 415)
+* --ignore-case, msggrep option:         msggrep Invocation.  (line 117)
+* --ignore-file, msgattrib option:       msgattrib Invocation.
+                                                              (line  87)
+* --indent, msgattrib option:            msgattrib Invocation.
+                                                              (line 129)
+* --indent, msgcat option:               msgcat Invocation.   (line 112)
+* --indent, msgcomm option:              msgcomm Invocation.  (line  97)
+* --indent, msgconv option:              msgconv Invocation.  (line  77)
+* --indent, msgen option:                msgen Invocation.    (line  79)
+* --indent, msgfilter option:            msgfilter Invocation.
+                                                              (line 133)
+* --indent, msggrep option:              msggrep Invocation.  (line 155)
+* --indent, msgmerge option:             msgmerge Invocation. (line 149)
+* --indent, msgunfmt option:             msgunfmt Invocation. (line 121)
+* --indent, msguniq option:              msguniq Invocation.  (line  94)
+* --indent, xgettext option:             xgettext Invocation. (line 288)
+* --input, msgexec option:               msgexec Invocation.  (line  40)
+* --input, msgfilter option:             msgfilter Invocation.
+                                                              (line  23)
+* --input, msginit option:               msginit Invocation.  (line  16)
+* --intl, gettextize option:             gettextize Invocation.
                                                               (line  43)
-* --invert-match, ‘msggrep’ option:      msggrep Invocation.  (line 114)
-* --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 263)
-* --keep-header, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line 147)
-* --keyword, ‘msgfmt’ option:            msgfmt Invocation.   (line 137)
-* --keyword, ‘xgettext’ option:          xgettext Invocation. (line 112)
-* --lang, ‘msgcat’ option:               msgcat Invocation.   (line  89)
-* --lang, ‘msgen’ option:                msgen Invocation.    (line  57)
-* --lang, ‘msgmerge’ option:             msgmerge Invocation. (line 123)
-* --language, ‘xgettext’ option:         xgettext Invocation. (line  54)
-* --less-than, ‘msgcat’ option:          msgcat Invocation.   (line  52)
-* --less-than, ‘msgcomm’ option:         msgcomm Invocation.  (line  51)
-* --locale, ‘msgfmt’ option:             msgfmt Invocation.   (line  80)
-* --locale, ‘msgfmt’ option <1>:         msgfmt Invocation.   (line 103)
-* --locale, ‘msgfmt’ option <2>:         msgfmt Invocation.   (line 119)
-* --locale, ‘msgfmt’ option <3>:         msgfmt Invocation.   (line 143)
-* --locale, ‘msginit’ option:            msginit Invocation.  (line  49)
-* --locale, ‘msgunfmt’ option:           msgunfmt Invocation. (line  45)
-* --locale, ‘msgunfmt’ option <1>:       msgunfmt Invocation. (line  62)
-* --locale, ‘msgunfmt’ option <2>:       msgunfmt Invocation. (line  78)
-* --location, ‘msggrep’ option:          msggrep Invocation.  (line  65)
-* --more-than, ‘msgcat’ option:          msgcat Invocation.   (line  57)
-* --more-than, ‘msgcomm’ option:         msgcomm Invocation.  (line  56)
-* --msgctxt, ‘msggrep’ option:           msggrep Invocation.  (line  74)
-* --msgid, ‘msggrep’ option:             msggrep Invocation.  (line  78)
-* --msgid-bugs-address, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 393)
-* --msgstr, ‘msggrep’ option:            msggrep Invocation.  (line  82)
-* --msgstr-prefix, ‘xgettext’ option:    xgettext Invocation. (line 416)
-* --msgstr-suffix, ‘xgettext’ option:    xgettext Invocation. (line 420)
-* --multi-domain, ‘msgcmp’ option:       msgcmp Invocation.   (line  35)
-* --multi-domain, ‘msgmerge’ option:     msgmerge Invocation. (line  96)
-* --no-changelog, ‘gettextize’ option:   gettextize Invocation.
+* --invert-match, msggrep option:        msggrep Invocation.  (line 121)
+* --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  88)
+* --kde, xgettext option:                xgettext Invocation. (line 250)
+* --keep-header, msgfilter option:       msgfilter Invocation.
+                                                              (line 136)
+* --keyword, xgettext option:            xgettext Invocation. (line 115)
+* --lang, msgcat option <1>:             msgen Invocation.    (line  60)
+* --lang, msgcat option <2>:             msgcat Invocation.   (line  94)
+* --lang, msgcat option:                 msgmerge Invocation. (line 129)
+* --language, xgettext option:           xgettext Invocation. (line  56)
+* --less-than, msgcat option:            msgcat Invocation.   (line  55)
+* --less-than, msgcomm option:           msgcomm Invocation.  (line  53)
+* --locale, msgfmt option:               msgfmt Invocation.   (line  79)
+* --locale, msginit option:              msginit Invocation.  (line  52)
+* --locale, msgunfmt option:             msgunfmt Invocation. (line  47)
+* --location, msggrep option:            msggrep Invocation.  (line  72)
+* --more-than, msgcat option:            msgcat Invocation.   (line  60)
+* --more-than, msgcomm option:           msgcomm Invocation.  (line  58)
+* --msgctxt, msggrep option:             msggrep Invocation.  (line  81)
+* --msgid, msggrep option:               msggrep Invocation.  (line  85)
+* --msgid-bugs-address, xgettext option: xgettext Invocation. (line 375)
+* --msgstr, msggrep option:              msggrep Invocation.  (line  89)
+* --msgstr-prefix, xgettext option:      xgettext Invocation. (line 403)
+* --msgstr-suffix, xgettext option:      xgettext Invocation. (line 407)
+* --multi-domain, msgcmp option:         msgcmp Invocation.   (line  36)
+* --multi-domain, msgmerge option:       msgmerge Invocation. (line 101)
+* --no-changelog, gettextize option:     gettextize Invocation.
                                                               (line  58)
-* --no-fuzzy, ‘msgattrib’ option:        msgattrib Invocation.
-                                                              (line  45)
-* --no-fuzzy-matching, ‘msgcmp’ option:  msgcmp Invocation.   (line  39)
-* --no-fuzzy-matching, ‘msgmerge’ option: msgmerge Invocation.
-                                                              (line 100)
-* --no-hash, ‘msgfmt’ option:            msgfmt Invocation.   (line 266)
-* --no-location, ‘msgattrib’ option:     msgattrib Invocation.
-                                                              (line 134)
-* --no-location, ‘msgcat’ option:        msgcat Invocation.   (line 110)
-* --no-location, ‘msgcomm’ option:       msgcomm Invocation.  (line  96)
-* --no-location, ‘msgconv’ option:       msgconv Invocation.  (line  76)
-* --no-location, ‘msgen’ option:         msgen Invocation.    (line  79)
-* --no-location, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line 152)
-* --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 303)
-* --no-obsolete, ‘msgattrib’ option:     msgattrib Invocation.
-                                                              (line  51)
-* --no-translator, ‘msginit’ option:     msginit Invocation.  (line  55)
-* --no-wrap, ‘msgattrib’ option:         msgattrib Invocation.
+* --no-fuzzy, msgattrib option:          msgattrib Invocation.
+                                                              (line  47)
+* --no-fuzzy-matching, msgcmp option:    msgcmp Invocation.   (line  40)
+* --no-fuzzy-matching, msgmerge option:  msgmerge Invocation. (line 105)
+* --no-hash, msgfmt option:              msgfmt Invocation.   (line 212)
+* --no-location, msgattrib option:       msgattrib Invocation.
+                                                              (line 132)
+* --no-location, msgcat option:          msgcat Invocation.   (line 115)
+* --no-location, msgcomm option:         msgcomm Invocation.  (line 100)
+* --no-location, msgconv option:         msgconv Invocation.  (line  80)
+* --no-location, msgen option:           msgen Invocation.    (line  82)
+* --no-location, msgfilter option:       msgfilter Invocation.
+                                                              (line 141)
+* --no-location, msggrep option:         msggrep Invocation.  (line 158)
+* --no-location, msgmerge option:        msgmerge Invocation. (line 152)
+* --no-location, msguniq option:         msguniq Invocation.  (line  97)
+* --no-location, xgettext option:        xgettext Invocation. (line 291)
+* --no-obsolete, msgattrib option:       msgattrib Invocation.
+                                                              (line  53)
+* --no-translator, msginit option:       msginit Invocation.  (line  58)
+* --no-wrap, msgattrib option:           msgattrib Invocation.
+                                                              (line 161)
+* --no-wrap, msgcat option:              msgcat Invocation.   (line 144)
+* --no-wrap, msgcomm option:             msgcomm Invocation.  (line 129)
+* --no-wrap, msgconv option:             msgconv Invocation.  (line 108)
+* --no-wrap, msgen option:               msgen Invocation.    (line 110)
+* --no-wrap, msgfilter option:           msgfilter Invocation.
                                                               (line 169)
-* --no-wrap, ‘msgcat’ option:            msgcat Invocation.   (line 145)
-* --no-wrap, ‘msgcomm’ option:           msgcomm Invocation.  (line 131)
-* --no-wrap, ‘msgconv’ option:           msgconv Invocation.  (line 111)
-* --no-wrap, ‘msgen’ option:             msgen Invocation.    (line 114)
-* --no-wrap, ‘msgfilter’ option:         msgfilter Invocation.
-                                                              (line 187)
-* --no-wrap, ‘msggrep’ option:           msggrep Invocation.  (line 183)
-* --no-wrap, ‘msginit’ option:           msginit Invocation.  (line  85)
-* --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 339)
-* --obsolete, ‘msgattrib’ option:        msgattrib Invocation.
-                                                              (line  99)
-* --omit-header, ‘msgcomm’ option:       msgcomm Invocation.  (line 146)
-* --omit-header, ‘xgettext’ option:      xgettext Invocation. (line 354)
-* --only-file, ‘msgattrib’ option:       msgattrib Invocation.
-                                                              (line  87)
-* --only-fuzzy, ‘msgattrib’ option:      msgattrib Invocation.
-                                                              (line  48)
-* --only-obsolete, ‘msgattrib’ option:   msgattrib Invocation.
-                                                              (line  54)
-* --output, ‘xgettext’ option:           xgettext Invocation. (line  39)
-* --output-dir, ‘xgettext’ option:       xgettext Invocation. (line  44)
-* --output-file, ‘msgattrib’ option:     msgattrib Invocation.
-                                                              (line  30)
-* --output-file, ‘msgcat’ option:        msgcat Invocation.   (line  42)
-* --output-file, ‘msgcomm’ option:       msgcomm Invocation.  (line  41)
-* --output-file, ‘msgconv’ option:       msgconv Invocation.  (line  30)
-* --output-file, ‘msgen’ option:         msgen Invocation.    (line  36)
-* --output-file, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line  45)
-* --output-file, ‘msgfmt’ option:        msgfmt Invocation.   (line  56)
-* --output-file, ‘msggrep’ option:       msggrep Invocation.  (line  30)
-* --output-file, ‘msginit’ option:       msginit Invocation.  (line  26)
-* --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 386)
-* --package-version, ‘xgettext’ option:  xgettext Invocation. (line 389)
-* --po-dir, ‘gettextize’ option:         gettextize Invocation.
+* --no-wrap, msggrep option:             msggrep Invocation.  (line 186)
+* --no-wrap, msginit option:             msginit Invocation.  (line  88)
+* --no-wrap, msgmerge option:            msgmerge Invocation. (line 180)
+* --no-wrap, msgunfmt option:            msgunfmt Invocation. (line 146)
+* --no-wrap, msguniq option:             msguniq Invocation.  (line 126)
+* --no-wrap, xgettext option:            xgettext Invocation. (line 321)
+* --obsolete, msgattrib option:          msgattrib Invocation.
+                                                              (line  95)
+* --omit-header, msgcomm option:         msgcomm Invocation.  (line 144)
+* --omit-header, xgettext option:        xgettext Invocation. (line 336)
+* --only-file, msgattrib option:         msgattrib Invocation.
+                                                              (line  83)
+* --only-fuzzy, msgattrib option:        msgattrib Invocation.
+                                                              (line  50)
+* --only-obsolete, msgattrib option:     msgattrib Invocation.
+                                                              (line  56)
+* --output, xgettext option:             xgettext Invocation. (line  40)
+* --output-dir, xgettext option:         xgettext Invocation. (line  45)
+* --output-file, msgattrib option:       msgattrib Invocation.
+                                                              (line  31)
+* --output-file, msgcat option:          msgcat Invocation.   (line  44)
+* --output-file, msgcomm option:         msgcomm Invocation.  (line  42)
+* --output-file, msgconv option:         msgconv Invocation.  (line  31)
+* --output-file, msgen option:           msgen Invocation.    (line  37)
+* --output-file, msgfilter option:       msgfilter Invocation.
+                                                              (line  39)
+* --output-file, msgfmt option:          msgfmt Invocation.   (line  54)
+* --output-file, msggrep option:         msggrep Invocation.  (line  31)
+* --output-file, msginit option:         msginit Invocation.  (line  27)
+* --output-file, msgmerge option:        msgmerge Invocation. (line  53)
+* --output-file, msgunfmt option:        msgunfmt Invocation. (line  98)
+* --output-file, msguniq option:         msguniq Invocation.  (line  38)
+* --package-name, xgettext option:       xgettext Invocation. (line 368)
+* --package-version, xgettext option:    xgettext Invocation. (line 371)
+* --po-dir, gettextize option:           gettextize Invocation.
                                                               (line  51)
-* --previous, ‘msgattrib’ option:        msgattrib Invocation.
-                                                              (line  77)
-* --previous, ‘msgmerge’ option:         msgmerge Invocation. (line 104)
-* --properties-input, ‘msgattrib’ option: msgattrib Invocation.
-                                                              (line 107)
-* --properties-input, ‘msgcat’ option:   msgcat Invocation.   (line  70)
-* --properties-input, ‘msgcmp’ option:   msgcmp Invocation.   (line  57)
-* --properties-input, ‘msgcomm’ option:  msgcomm Invocation.  (line  69)
-* --properties-input, ‘msgconv’ option:  msgconv Invocation.  (line  49)
-* --properties-input, ‘msgen’ option:    msgen Invocation.    (line  46)
-* --properties-input, ‘msgexec’ option:  msgexec Invocation.  (line  62)
-* --properties-input, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 121)
-* --properties-input, ‘msgfmt’ option:   msgfmt Invocation.   (line 176)
-* --properties-input, ‘msggrep’ option:  msggrep Invocation.  (line 122)
-* --properties-input, ‘msginit’ option:  msginit Invocation.  (line  37)
-* --properties-input, ‘msgmerge’ option: msgmerge Invocation. (line 112)
-* --properties-input, ‘msguniq’ option:  msguniq Invocation.  (line  58)
-* --properties-output, ‘msgattrib’ option: msgattrib Invocation.
+* --previous, msgmerge option:           msgmerge Invocation. (line 109)
+* --properties-input, msgattrib option:  msgattrib Invocation.
+                                                              (line 104)
+* --properties-input, msgcat option:     msgcat Invocation.   (line  74)
+* --properties-input, msgcmp option:     msgcmp Invocation.   (line  59)
+* --properties-input, msgcomm option:    msgcomm Invocation.  (line  72)
+* --properties-input, msgconv option:    msgconv Invocation.  (line  52)
+* --properties-input, msgen option:      msgen Invocation.    (line  48)
+* --properties-input, msgexec option:    msgexec Invocation.  (line  56)
+* --properties-input, msgfilter option:  msgfilter Invocation.
+                                                              (line 109)
+* --properties-input, msgfmt option:     msgfmt Invocation.   (line 133)
+* --properties-input, msggrep option:    msggrep Invocation.  (line 131)
+* --properties-input, msginit option:    msginit Invocation.  (line  39)
+* --properties-input, msgmerge option:   msgmerge Invocation. (line 117)
+* --properties-input, msguniq option:    msguniq Invocation.  (line  61)
+* --properties-output, msgattrib option: msgattrib Invocation.
+                                                              (line 145)
+* --properties-output, msgcat option:    msgcat Invocation.   (line 128)
+* --properties-output, msgcomm option:   msgcomm Invocation.  (line 113)
+* --properties-output, msgconv option:   msgconv Invocation.  (line  92)
+* --properties-output, msgen option:     msgen Invocation.    (line  94)
+* --properties-output, msgfilter option: msgfilter Invocation.
                                                               (line 153)
-* --properties-output, ‘msgcat’ option:  msgcat Invocation.   (line 129)
-* --properties-output, ‘msgcomm’ option: msgcomm Invocation.  (line 115)
-* --properties-output, ‘msgconv’ option: msgconv Invocation.  (line  95)
-* --properties-output, ‘msgen’ option:   msgen Invocation.    (line  98)
-* --properties-output, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 171)
-* --properties-output, ‘msggrep’ option: msggrep Invocation.  (line 167)
-* --properties-output, ‘msginit’ option: msginit Invocation.  (line  69)
-* --properties-output, ‘msgmerge’ option: msgmerge Invocation.
-                                                              (line 165)
-* --properties-output, ‘msgunfmt’ option: msgunfmt Invocation.
-                                                              (line 124)
-* --properties-output, ‘msguniq’ option: msguniq Invocation.  (line 112)
-* --properties-output, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 323)
-* --qt, ‘msgfmt’ option:                 msgfmt Invocation.   (line  46)
-* --qt, ‘xgettext’ option:               xgettext Invocation. (line 259)
-* --quiet, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line  91)
-* --quiet, ‘msgmerge’ option:            msgmerge Invocation. (line 213)
-* --regexp=, ‘msggrep’ option:           msggrep Invocation.  (line 102)
-* --repeated, ‘msguniq’ option:          msguniq Invocation.  (line  47)
-* --resource, ‘msgfmt’ option:           msgfmt Invocation.   (line  76)
-* --resource, ‘msgfmt’ option <1>:       msgfmt Invocation.   (line  99)
-* --resource, ‘msgunfmt’ option:         msgunfmt Invocation. (line  41)
-* --resource, ‘msgunfmt’ option <1>:     msgunfmt Invocation. (line  58)
-* --set-fuzzy, ‘msgattrib’ option:       msgattrib Invocation.
-                                                              (line  65)
-* --set-obsolete, ‘msgattrib’ option:    msgattrib Invocation.
-                                                              (line  71)
-* --silent, ‘msgfilter’ option:          msgfilter Invocation.
-                                                              (line  91)
-* --silent, ‘msgmerge’ option:           msgmerge Invocation. (line 213)
-* --sort-by-file, ‘msgattrib’ option:    msgattrib Invocation.
+* --properties-output, msggrep option:   msggrep Invocation.  (line 170)
+* --properties-output, msginit option:   msginit Invocation.  (line  72)
+* --properties-output, msgmerge option:  msgmerge Invocation. (line 164)
+* --properties-output, msgunfmt option:  msgunfmt Invocation. (line 130)
+* --properties-output, msguniq option:   msguniq Invocation.  (line 110)
+* --properties-output, xgettext option:  xgettext Invocation. (line 305)
+* --qt, msgfmt option:                   msgfmt Invocation.   (line  46)
+* --qt, xgettext option:                 xgettext Invocation. (line 246)
+* --quiet, msgfilter option:             msgfilter Invocation.
+                                                              (line  86)
+* --quiet, msgmerge option:              msgmerge Invocation. (line 213)
+* --regexp=, msggrep option:             msggrep Invocation.  (line 109)
+* --repeated, msguniq option:            msguniq Invocation.  (line  49)
+* --resource, msgfmt option:             msgfmt Invocation.   (line  75)
+* --resource, msgunfmt option:           msgunfmt Invocation. (line  43)
+* --set-fuzzy, msgattrib option:         msgattrib Invocation.
+                                                              (line  68)
+* --set-obsolete, msgattrib option:      msgattrib Invocation.
+                                                              (line  74)
+* --silent, msgfilter option:            msgfilter Invocation.
+                                                              (line  86)
+* --silent, msgmerge option:             msgmerge Invocation. (line 213)
+* --sort-by-file, msgattrib option:      msgattrib Invocation.
+                                                              (line 173)
+* --sort-by-file, msgcat option:         msgcat Invocation.   (line 156)
+* --sort-by-file, msgcomm option:        msgcomm Invocation.  (line 141)
+* --sort-by-file, msgconv option:        msgconv Invocation.  (line 120)
+* --sort-by-file, msgen option:          msgen Invocation.    (line 122)
+* --sort-by-file, msgfilter option:      msgfilter Invocation.
                                                               (line 181)
-* --sort-by-file, ‘msgcat’ option:       msgcat Invocation.   (line 157)
-* --sort-by-file, ‘msgcomm’ option:      msgcomm Invocation.  (line 143)
-* --sort-by-file, ‘msgconv’ option:      msgconv Invocation.  (line 123)
-* --sort-by-file, ‘msgen’ option:        msgen Invocation.    (line 126)
-* --sort-by-file, ‘msgfilter’ option:    msgfilter Invocation.
-                                                              (line 199)
-* --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 351)
-* --sort-output, ‘msgattrib’ option:     msgattrib Invocation.
+* --sort-by-file, msggrep option:        msggrep Invocation.  (line 196)
+* --sort-by-file, msgmerge option:       msgmerge Invocation. (line 192)
+* --sort-by-file, msguniq option:        msguniq Invocation.  (line 138)
+* --sort-by-file, xgettext option:       xgettext Invocation. (line 333)
+* --sort-output, msgattrib option:       msgattrib Invocation.
+                                                              (line 168)
+* --sort-output, msgcat option:          msgcat Invocation.   (line 151)
+* --sort-output, msgcomm option:         msgcomm Invocation.  (line 136)
+* --sort-output, msgconv option:         msgconv Invocation.  (line 115)
+* --sort-output, msgen option:           msgen Invocation.    (line 117)
+* --sort-output, msgfilter option:       msgfilter Invocation.
                                                               (line 176)
-* --sort-output, ‘msgcat’ option:        msgcat Invocation.   (line 152)
-* --sort-output, ‘msgcomm’ option:       msgcomm Invocation.  (line 138)
-* --sort-output, ‘msgconv’ option:       msgconv Invocation.  (line 118)
-* --sort-output, ‘msgen’ option:         msgen Invocation.    (line 121)
-* --sort-output, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line 194)
-* --sort-output, ‘msggrep’ option:       msggrep Invocation.  (line 189)
-* --sort-output, ‘msgmerge’ option:      msgmerge Invocation. (line 188)
-* --sort-output, ‘msgunfmt’ option:      msgunfmt Invocation. (line 147)
-* --sort-output, ‘msguniq’ option:       msguniq Invocation.  (line 135)
-* --sort-output, ‘xgettext’ option:      xgettext Invocation. (line 346)
-* --source, ‘msgfmt’ option:             msgfmt Invocation.   (line  88)
-* --statistics, ‘msgfmt’ option:         msgfmt Invocation.   (line 281)
-* --strict, ‘msgattrib’ option:          msgattrib Invocation.
+* --sort-output, msggrep option:         msggrep Invocation.  (line 192)
+* --sort-output, msgmerge option:        msgmerge Invocation. (line 187)
+* --sort-output, msgunfmt option:        msgunfmt Invocation. (line 153)
+* --sort-output, msguniq option:         msguniq Invocation.  (line 133)
+* --sort-output, xgettext option:        xgettext Invocation. (line 328)
+* --statistics, msgfmt option:           msgfmt Invocation.   (line 229)
+* --strict, msgattrib option:            msgattrib Invocation.
+                                                              (line 139)
+* --strict, msgcat option:               msgcat Invocation.   (line 122)
+* --strict, msgcomm option:              msgcomm Invocation.  (line 107)
+* --strict, msgconv option:              msgconv Invocation.  (line  86)
+* --strict, msgen option:                msgen Invocation.    (line  88)
+* --strict, msgfilter option:            msgfilter Invocation.
                                                               (line 147)
-* --strict, ‘msgcat’ option:             msgcat Invocation.   (line 123)
-* --strict, ‘msgcomm’ option:            msgcomm Invocation.  (line 109)
-* --strict, ‘msgconv’ option:            msgconv Invocation.  (line  89)
-* --strict, ‘msgen’ option:              msgen Invocation.    (line  92)
-* --strict, ‘msgfilter’ option:          msgfilter Invocation.
-                                                              (line 165)
-* --strict, ‘msgfmt’ option:             msgfmt Invocation.   (line  59)
-* --strict, ‘msggrep’ option:            msggrep Invocation.  (line 161)
-* --strict, ‘msgmerge’ option:           msgmerge Invocation. (line 159)
-* --strict, ‘msgunfmt’ option:           msgunfmt Invocation. (line 118)
-* --strict, ‘msguniq’ option:            msguniq Invocation.  (line 106)
-* --strict, ‘xgettext’ option:           xgettext Invocation. (line 318)
-* --stringtable-input, ‘msgattrib’ option: msgattrib Invocation.
-                                                              (line 111)
-* --stringtable-input, ‘msgcat’ option:  msgcat Invocation.   (line  74)
-* --stringtable-input, ‘msgcmp’ option:  msgcmp Invocation.   (line  61)
-* --stringtable-input, ‘msgcomm’ option: msgcomm Invocation.  (line  73)
-* --stringtable-input, ‘msgen’ option:   msgen Invocation.    (line  50)
-* --stringtable-input, ‘msgexec’ option: msgexec Invocation.  (line  66)
-* --stringtable-input, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 125)
-* --stringtable-input, ‘msgfmt’ option:  msgfmt Invocation.   (line 180)
-* --stringtable-input, ‘msggrep’ option: msggrep Invocation.  (line 126)
-* --stringtable-input, ‘msginit’ option: msginit Invocation.  (line  41)
-* --stringtable-input, ‘msgmerge’ option: msgmerge Invocation.
-                                                              (line 116)
-* --stringtable-input, ‘msgonv’ option:  msgconv Invocation.  (line  53)
-* --stringtable-input, ‘msguniq’ option: msguniq Invocation.  (line  62)
-* --stringtable-output, ‘msgattrib’ option: msgattrib Invocation.
+* --strict, msgfmt option:               msgfmt Invocation.   (line  57)
+* --strict, msggrep option:              msggrep Invocation.  (line 164)
+* --strict, msgmerge option:             msgmerge Invocation. (line 158)
+* --strict, msgunfmt option:             msgunfmt Invocation. (line 124)
+* --strict, msguniq option:              msguniq Invocation.  (line 104)
+* --strict, xgettext option:             xgettext Invocation. (line 300)
+* --stringtable-input, msgattrib option: msgattrib Invocation.
+                                                              (line 108)
+* --stringtable-input, msgcat option:    msgcat Invocation.   (line  78)
+* --stringtable-input, msgcmp option:    msgcmp Invocation.   (line  63)
+* --stringtable-input, msgcomm option:   msgcomm Invocation.  (line  76)
+* --stringtable-input, msgen option:     msgen Invocation.    (line  52)
+* --stringtable-input, msgexec option:   msgexec Invocation.  (line  60)
+* --stringtable-input, msgfilter option: msgfilter Invocation.
+                                                              (line 113)
+* --stringtable-input, msgfmt option:    msgfmt Invocation.   (line 137)
+* --stringtable-input, msggrep option:   msggrep Invocation.  (line 135)
+* --stringtable-input, msginit option:   msginit Invocation.  (line  43)
+* --stringtable-input, msgmerge option:  msgmerge Invocation. (line 121)
+* --stringtable-input, msgonv option:    msgconv Invocation.  (line  56)
+* --stringtable-input, msguniq option:   msguniq Invocation.  (line  65)
+* --stringtable-output, msgattrib option: msgattrib Invocation.
+                                                              (line 150)
+* --stringtable-output, msgcat option:   msgcat Invocation.   (line 133)
+* --stringtable-output, msgcomm option:  msgcomm Invocation.  (line 118)
+* --stringtable-output, msgconv option:  msgconv Invocation.  (line  97)
+* --stringtable-output, msgen option:    msgen Invocation.    (line  99)
+* --stringtable-output, msgfilter option: msgfilter Invocation.
                                                               (line 158)
-* --stringtable-output, ‘msgcat’ option: msgcat Invocation.   (line 134)
-* --stringtable-output, ‘msgcomm’ option: msgcomm Invocation. (line 120)
-* --stringtable-output, ‘msgconv’ option: msgconv Invocation. (line 100)
-* --stringtable-output, ‘msgen’ option:  msgen Invocation.    (line 103)
-* --stringtable-output, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 176)
-* --stringtable-output, ‘msggrep’ option: msggrep Invocation. (line 172)
-* --stringtable-output, ‘msginit’ option: msginit Invocation. (line  74)
-* --stringtable-output, ‘msgmerge’ option: msgmerge Invocation.
-                                                              (line 170)
-* --stringtable-output, ‘msgunfmt’ option: msgunfmt Invocation.
-                                                              (line 129)
-* --stringtable-output, ‘msguniq’ option: msguniq Invocation. (line 117)
-* --stringtable-output, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 328)
-* --style, ‘msgattrib’ option:           msgattrib Invocation.
-                                                              (line 123)
-* --style, ‘msgcat’ option:              msgcat Invocation.   (line  99)
-* --style, ‘msgcat’ option <1>:          The --style option.  (line   6)
-* --style, ‘msgcomm’ option:             msgcomm Invocation.  (line  85)
-* --style, ‘msgconv’ option:             msgconv Invocation.  (line  65)
-* --style, ‘msgen’ option:               msgen Invocation.    (line  68)
-* --style, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line 137)
-* --style, ‘msggrep’ option:             msggrep Invocation.  (line 138)
-* --style, ‘msginit’ option:             msginit Invocation.  (line  64)
-* --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 292)
-* --suffix, ‘msgmerge’ option:           msgmerge Invocation. (line  65)
-* --symlink, ‘gettextize’ option:        gettextize Invocation.
+* --stringtable-output, msggrep option:  msggrep Invocation.  (line 175)
+* --stringtable-output, msginit option:  msginit Invocation.  (line  77)
+* --stringtable-output, msgmerge option: msgmerge Invocation. (line 169)
+* --stringtable-output, msgunfmt option: msgunfmt Invocation. (line 135)
+* --stringtable-output, msguniq option:  msguniq Invocation.  (line 115)
+* --stringtable-output, xgettext option: xgettext Invocation. (line 310)
+* --style, msgattrib option:             msgattrib Invocation.
+                                                              (line 121)
+* --style, msgcat option <1>:            The --style option.  (line   6)
+* --style, msgcat option:                msgcat Invocation.   (line 104)
+* --style, msgcomm option:               msgcomm Invocation.  (line  89)
+* --style, msgconv option:               msgconv Invocation.  (line  69)
+* --style, msgen option:                 msgen Invocation.    (line  71)
+* --style, msgfilter option:             msgfilter Invocation.
+                                                              (line 126)
+* --style, msggrep option:               msggrep Invocation.  (line 148)
+* --style, msginit option:               msginit Invocation.  (line  67)
+* --style, msgmerge option:              msgmerge Invocation. (line 141)
+* --style, msgunfmt option:              msgunfmt Invocation. (line 113)
+* --style, msguniq option:               msguniq Invocation.  (line  86)
+* --style, xgettext option:              xgettext Invocation. (line 280)
+* --suffix, msgmerge option:             msgmerge Invocation. (line  68)
+* --symlink, gettextize option:          gettextize Invocation.
                                                               (line  63)
-* --tcl, ‘msgfmt’ option:                msgfmt Invocation.   (line  43)
-* --tcl, ‘msgunfmt’ option:              msgunfmt Invocation. (line  26)
-* --template, ‘msgfmt’ option:           msgfmt Invocation.   (line 133)
-* --to-code, ‘msgcat’ option:            msgcat Invocation.   (line  82)
-* --to-code, ‘msgconv’ option:           msgconv Invocation.  (line  40)
-* --to-code, ‘msguniq’ option:           msguniq Invocation.  (line  70)
-* --translated, ‘msgattrib’ option:      msgattrib Invocation.
-                                                              (line  39)
-* --trigraphs, ‘xgettext’ option:        xgettext Invocation. (line 254)
-* --unique, ‘msgcat’ option:             msgcat Invocation.   (line  62)
-* --unique, ‘msgcomm’ option:            msgcomm Invocation.  (line  61)
-* --unique, ‘msguniq’ option:            msguniq Invocation.  (line  51)
-* --untranslated, ‘msgattrib’ option:    msgattrib Invocation.
-                                                              (line  42)
-* --update, ‘msgmerge’ option:           msgmerge Invocation. (line  44)
-* --use-first, ‘msgcat’ option:          msgcat Invocation.   (line  85)
-* --use-first, ‘msguniq’ option:         msguniq Invocation.  (line  73)
-* --use-fuzzy, ‘msgcmp’ option:          msgcmp Invocation.   (line  43)
-* --use-fuzzy, ‘msgfmt’ option:          msgfmt Invocation.   (line 241)
-* --use-untranslated, ‘msgcmp’ option:   msgcmp Invocation.   (line  49)
-* --variables, ‘envsubst’ option:        envsubst Invocation. (line  15)
-* --verbose, ‘msgfmt’ option:            msgfmt Invocation.   (line 287)
-* --verbose, ‘msgmerge’ option:          msgmerge Invocation. (line 208)
-* --verbose, ‘msgunfmt’ option:          msgunfmt Invocation. (line 163)
-* --version, ‘autopoint’ option:         autopoint Invocation.
-                                                              (line  35)
-* --version, ‘envsubst’ option:          envsubst Invocation. (line  25)
-* --version, ‘gettext’ option:           gettext Invocation.  (line  40)
-* --version, ‘gettextize’ option:        gettextize Invocation.
+* --tcl, msgfmt option:                  msgfmt Invocation.   (line  43)
+* --tcl, msgunfmt option:                msgunfmt Invocation. (line  26)
+* --to-code, msgcat option:              msgcat Invocation.   (line  87)
+* --to-code, msgconv option:             msgconv Invocation.  (line  42)
+* --to-code, msguniq option:             msguniq Invocation.  (line  74)
+* --translated, msgattrib option:        msgattrib Invocation.
+                                                              (line  41)
+* --trigraphs, xgettext option:          xgettext Invocation. (line 241)
+* --unique, msgcat option:               msgcat Invocation.   (line  65)
+* --unique, msgcomm option:              msgcomm Invocation.  (line  63)
+* --unique, msguniq option:              msguniq Invocation.  (line  53)
+* --untranslated, msgattrib option:      msgattrib Invocation.
+                                                              (line  44)
+* --update, msgmerge option:             msgmerge Invocation. (line  45)
+* --use-first, msgcat option:            msgcat Invocation.   (line  90)
+* --use-first, msguniq option:           msguniq Invocation.  (line  77)
+* --use-fuzzy, msgcmp option:            msgcmp Invocation.   (line  44)
+* --use-fuzzy, msgfmt option:            msgfmt Invocation.   (line 199)
+* --use-untranslated, msgcmp option:     msgcmp Invocation.   (line  50)
+* --variables, envsubst option:          envsubst Invocation. (line  15)
+* --verbose, msgfmt option:              msgfmt Invocation.   (line 235)
+* --verbose, msgmerge option:            msgmerge Invocation. (line 208)
+* --verbose, msgunfmt option:            msgunfmt Invocation. (line 170)
+* --version, autopoint option:           autopoint Invocation.
+                                                              (line  36)
+* --version, envsubst option:            envsubst Invocation. (line  26)
+* --version, gettext option:             gettext Invocation.  (line  40)
+* --version, gettextize option:          gettextize Invocation.
                                                               (line  80)
-* --version, ‘msgattrib’ option:         msgattrib Invocation.
-                                                              (line 192)
-* --version, ‘msgcat’ option:            msgcat Invocation.   (line 168)
-* --version, ‘msgcmp’ option:            msgcmp Invocation.   (line  73)
-* --version, ‘msgcomm’ option:           msgcomm Invocation.  (line 157)
-* --version, ‘msgconv’ option:           msgconv Invocation.  (line 134)
-* --version, ‘msgen’ option:             msgen Invocation.    (line 137)
-* --version, ‘msgexec’ option:           msgexec Invocation.  (line  78)
-* --version, ‘msgfilter’ option:         msgfilter Invocation.
-                                                              (line 210)
-* --version, ‘msgfmt’ option:            msgfmt Invocation.   (line 278)
-* --version, ‘msggrep’ option:           msggrep Invocation.  (line 204)
-* --version, ‘msginit’ option:           msginit Invocation.  (line  99)
-* --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 431)
-* --width, ‘msgattrib’ option:           msgattrib Invocation.
+* --version, msgattrib option:           msgattrib Invocation.
+                                                              (line 185)
+* --version, msgcat option:              msgcat Invocation.   (line 168)
+* --version, msgcmp option:              msgcmp Invocation.   (line  76)
+* --version, msgcomm option:             msgcomm Invocation.  (line 156)
+* --version, msgconv option:             msgconv Invocation.  (line 132)
+* --version, msgen option:               msgen Invocation.    (line 134)
+* --version, msgexec option:             msgexec Invocation.  (line  73)
+* --version, msgfilter option:           msgfilter Invocation.
+                                                              (line 193)
+* --version, msgfmt option:              msgfmt Invocation.   (line 226)
+* --version, msggrep option:             msggrep Invocation.  (line 208)
+* --version, msginit option:             msginit Invocation.  (line 103)
+* --version, msgmerge option:            msgmerge Invocation. (line 204)
+* --version, msgunfmt option:            msgunfmt Invocation. (line 166)
+* --version, msguniq option:             msguniq Invocation.  (line 150)
+* --version, ngettext option:            ngettext Invocation. (line  35)
+* --version, xgettext option:            xgettext Invocation. (line 419)
+* --width, msgattrib option:             msgattrib Invocation.
+                                                              (line 155)
+* --width, msgcat option:                msgcat Invocation.   (line 138)
+* --width, msgcomm option:               msgcomm Invocation.  (line 123)
+* --width, msgconv option:               msgconv Invocation.  (line 102)
+* --width, msgen option:                 msgen Invocation.    (line 104)
+* --width, msgfilter option:             msgfilter Invocation.
                                                               (line 163)
-* --width, ‘msgcat’ option:              msgcat Invocation.   (line 139)
-* --width, ‘msgcomm’ option:             msgcomm Invocation.  (line 125)
-* --width, ‘msgconv’ option:             msgconv Invocation.  (line 105)
-* --width, ‘msgen’ option:               msgen Invocation.    (line 108)
-* --width, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line 181)
-* --width, ‘msggrep’ option:             msggrep Invocation.  (line 177)
-* --width, ‘msginit’ option:             msginit Invocation.  (line  79)
-* --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 333)
-* -<, ‘msgcat’ option:                   msgcat Invocation.   (line  52)
-* -<, ‘msgcomm’ option:                  msgcomm Invocation.  (line  51)
-* ->, ‘msgcat’ option:                   msgcat Invocation.   (line  57)
-* ->, ‘msgcomm’ option:                  msgcomm Invocation.  (line  56)
-* -a, ‘msgfmt’ option:                   msgfmt Invocation.   (line 250)
-* -a, ‘xgettext’ option:                 xgettext Invocation. (line 103)
-* -c, ‘msgfmt’ option:                   msgfmt Invocation.   (line 188)
-* -C, ‘msgfmt’ option:                   msgfmt Invocation.   (line 225)
-* -C, ‘msggrep’ option:                  msggrep Invocation.  (line  86)
-* -C, ‘msgmerge’ option:                 msgmerge Invocation. (line  36)
-* -C, ‘xgettext’ option:                 xgettext Invocation. (line  63)
-* -c, ‘xgettext’ option:                 xgettext Invocation. (line  94)
-* -d, ‘autopoint’ option:                autopoint Invocation.
+* --width, msggrep option:               msggrep Invocation.  (line 180)
+* --width, msginit option:               msginit Invocation.  (line  82)
+* --width, msgmerge option:              msgmerge Invocation. (line 174)
+* --width, msgunfmt option:              msgunfmt Invocation. (line 140)
+* --width, msguniq option:               msguniq Invocation.  (line 120)
+* --width, xgettext option:              xgettext Invocation. (line 315)
+* -<, msgcat option:                     msgcat Invocation.   (line  55)
+* -<, msgcomm option:                    msgcomm Invocation.  (line  53)
+* ->, msgcat option:                     msgcat Invocation.   (line  60)
+* ->, msgcomm option:                    msgcomm Invocation.  (line  58)
+* -a, msgfmt option:                     msgfmt Invocation.   (line 209)
+* -a, xgettext option:                   xgettext Invocation. (line 107)
+* -C, msgfmt option:                     msgfmt Invocation.   (line 183)
+* -c, msgfmt option:                     msgfmt Invocation.   (line 146)
+* -C, msggrep option:                    msggrep Invocation.  (line  93)
+* -C, msgmerge option:                   msgmerge Invocation. (line  36)
+* -c, xgettext option:                   xgettext Invocation. (line  97)
+* -C, xgettext option:                   xgettext Invocation. (line  64)
+* -d, autopoint option:                  autopoint Invocation.
                                                               (line  24)
-* -d, ‘gettext’ option:                  gettext Invocation.  (line  16)
-* -d, ‘gettextize’ option:               gettextize Invocation.
+* -d, gettext option:                    gettext Invocation.  (line  16)
+* -d, gettextize option:                 gettextize Invocation.
                                                               (line  72)
-* -D, ‘msgattrib’ option:                msgattrib Invocation.
+* -D, msgattrib option:                  msgattrib Invocation.
                                                               (line  19)
-* -D, ‘msgcat’ option:                   msgcat Invocation.   (line  31)
-* -D, ‘msgcmp’ option:                   msgcmp Invocation.   (line  27)
-* -D, ‘msgcomm’ option:                  msgcomm Invocation.  (line  30)
-* -D, ‘msgconv’ option:                  msgconv Invocation.  (line  19)
-* -D, ‘msgen’ option:                    msgen Invocation.    (line  25)
-* -D, ‘msgexec’ option:                  msgexec Invocation.  (line  51)
-* -D, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  34)
-* -D, ‘msgfmt’ option:                   msgfmt Invocation.   (line  18)
-* -d, ‘msgfmt’ option:                   msgfmt Invocation.   (line  85)
-* -d, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 108)
-* -d, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 124)
-* -d, ‘msgfmt’ option <3>:               msgfmt Invocation.   (line 148)
-* -D, ‘msggrep’ option:                  msggrep Invocation.  (line  19)
-* -D, ‘msgmerge’ option:                 msgmerge Invocation. (line  30)
-* -d, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  67)
-* -d, ‘msgunfmt’ option <1>:             msgunfmt Invocation. (line  83)
-* -D, ‘msguniq’ option:                  msguniq Invocation.  (line  26)
-* -d, ‘msguniq’ option:                  msguniq Invocation.  (line  47)
-* -d, ‘ngettext’ option:                 ngettext Invocation. (line  15)
-* -D, ‘xgettext’ option:                 xgettext Invocation. (line  24)
-* -d, ‘xgettext’ option:                 xgettext Invocation. (line  35)
-* -e, ‘gettext’ option:                  gettext Invocation.  (line  20)
-* -E, ‘gettext’ option:                  gettext Invocation.  (line  27)
-* -e, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  82)
-* -E, ‘msggrep’ option:                  msggrep Invocation.  (line  94)
-* -e, ‘msggrep’ option:                  msggrep Invocation.  (line 102)
-* -e, ‘ngettext’ option:                 ngettext Invocation. (line  19)
-* -E, ‘ngettext’ option:                 ngettext Invocation. (line  26)
-* -f, ‘autopoint’ option:                autopoint Invocation.
+* -D, msgcat option:                     msgcat Invocation.   (line  32)
+* -D, msgcmp option:                     msgcmp Invocation.   (line  27)
+* -D, msgcomm option:                    msgcomm Invocation.  (line  30)
+* -D, msgconv option:                    msgconv Invocation.  (line  19)
+* -D, msgen option:                      msgen Invocation.    (line  25)
+* -D, msgexec option:                    msgexec Invocation.  (line  44)
+* -D, msgfilter option:                  msgfilter Invocation.
+                                                              (line  27)
+* -d, msgfmt option:                     msgfmt Invocation.   (line  84)
+* -D, msgfmt option:                     msgfmt Invocation.   (line  18)
+* -D, msggrep option:                    msggrep Invocation.  (line  19)
+* -D, msgmerge option:                   msgmerge Invocation. (line  30)
+* -d, msgunfmt option:                   msgunfmt Invocation. (line  70)
+* -d, msguniq option:                    msguniq Invocation.  (line  49)
+* -D, msguniq option:                    msguniq Invocation.  (line  26)
+* -d, ngettext option:                   ngettext Invocation. (line  15)
+* -d, xgettext option:                   xgettext Invocation. (line  36)
+* -D, xgettext option:                   xgettext Invocation. (line  24)
+* -E, gettext option:                    gettext Invocation.  (line  27)
+* -e, gettext option:                    gettext Invocation.  (line  20)
+* -e, msgfilter option:                  msgfilter Invocation.
+                                                              (line  77)
+* -e, msggrep option:                    msggrep Invocation.  (line 109)
+* -E, msggrep option:                    msggrep Invocation.  (line 101)
+* -E, ngettext option:                   ngettext Invocation. (line  26)
+* -e, ngettext option:                   ngettext Invocation. (line  19)
+* -f, autopoint option:                  autopoint Invocation.
                                                               (line  20)
-* -f, ‘gettextize’ option:               gettextize Invocation.
+* -f, gettextize option:                 gettextize Invocation.
                                                               (line  40)
-* -F, ‘msgattrib’ option:                msgattrib Invocation.
+* -F, msgattrib option:                  msgattrib Invocation.
+                                                              (line 173)
+* -F, msgcat option:                     msgcat Invocation.   (line 156)
+* -f, msgcat option:                     msgcat Invocation.   (line  27)
+* -F, msgcomm option:                    msgcomm Invocation.  (line 141)
+* -f, msgcomm option:                    msgcomm Invocation.  (line  25)
+* -F, msgconv option:                    msgconv Invocation.  (line 120)
+* -F, msgen option:                      msgen Invocation.    (line 122)
+* -F, msgfilter option:                  msgfilter Invocation.
+                                                              (line 181)
+* -f, msgfilter option:                  msgfilter Invocation.
+                                                              (line  81)
+* -f, msgfmt option:                     msgfmt Invocation.   (line 199)
+* -f, msggrep option:                    msggrep Invocation.  (line 113)
+* -F, msggrep option:                    msggrep Invocation.  (line 105)
+* -F, msgmerge option:                   msgmerge Invocation. (line 192)
+* -F, msguniq option:                    msguniq Invocation.  (line 138)
+* -F, xgettext option:                   xgettext Invocation. (line 333)
+* -f, xgettext option:                   xgettext Invocation. (line  19)
+* -h, envsubst option:                   envsubst Invocation. (line  22)
+* -h, gettext option:                    gettext Invocation.  (line  32)
+* -h, msgattrib option:                  msgattrib Invocation.
                                                               (line 181)
-* -f, ‘msgcat’ option:                   msgcat Invocation.   (line  26)
-* -F, ‘msgcat’ option:                   msgcat Invocation.   (line 157)
-* -f, ‘msgcomm’ option:                  msgcomm Invocation.  (line  25)
-* -F, ‘msgcomm’ option:                  msgcomm Invocation.  (line 143)
-* -F, ‘msgconv’ option:                  msgconv Invocation.  (line 123)
-* -F, ‘msgen’ option:                    msgen Invocation.    (line 126)
-* -f, ‘msgfilter’ option:                msgfilter Invocation.
+* -h, msgcat option:                     msgcat Invocation.   (line 164)
+* -h, msgcmp option:                     msgcmp Invocation.   (line  72)
+* -h, msgcomm option:                    msgcomm Invocation.  (line 152)
+* -h, msgconv option:                    msgconv Invocation.  (line 128)
+* -h, msgen option:                      msgen Invocation.    (line 130)
+* -h, msgexec option:                    msgexec Invocation.  (line  69)
+* -h, msgfilter option:                  msgfilter Invocation.
+                                                              (line 189)
+* -h, msgfmt option:                     msgfmt Invocation.   (line 222)
+* -h, msggrep option:                    msggrep Invocation.  (line 204)
+* -h, msginit option:                    msginit Invocation.  (line  99)
+* -h, msgmerge option:                   msgmerge Invocation. (line 200)
+* -h, msgunfmt option:                   msgunfmt Invocation. (line 162)
+* -h, msguniq option:                    msguniq Invocation.  (line 146)
+* -h, ngettext option:                   ngettext Invocation. (line  31)
+* -h, xgettext option:                   xgettext Invocation. (line 415)
+* -i, msgattrib option:                  msgattrib Invocation.
+                                                              (line 129)
+* -i, msgcat option:                     msgcat Invocation.   (line 112)
+* -i, msgcomm option:                    msgcomm Invocation.  (line  97)
+* -i, msgconv option:                    msgconv Invocation.  (line  77)
+* -i, msgen option:                      msgen Invocation.    (line  79)
+* -i, msgexec option:                    msgexec Invocation.  (line  40)
+* -i, msgfilter option:                  msgfilter Invocation.
+                                                              (line  23)
+* -i, msggrep option:                    msggrep Invocation.  (line 117)
+* -i, msginit option:                    msginit Invocation.  (line  16)
+* -i, msgmerge option:                   msgmerge Invocation. (line 149)
+* -i, msgunfmt option:                   msgunfmt Invocation. (line 121)
+* -i, msguniq option:                    msguniq Invocation.  (line  94)
+* -i, xgettext option:                   xgettext Invocation. (line 288)
+* -j, msgfmt option:                     msgfmt Invocation.   (line  30)
+* -J, msggrep option:                    msggrep Invocation.  (line  81)
+* -j, msgunfmt option:                   msgunfmt Invocation. (line  16)
+* -j, xgettext option:                   xgettext Invocation. (line  88)
+* -K, msggrep option:                    msggrep Invocation.  (line  85)
+* -k, xgettext option:                   xgettext Invocation. (line 115)
+* -l, msgfmt option:                     msgfmt Invocation.   (line  79)
+* -l, msginit option:                    msginit Invocation.  (line  52)
+* -l, msgunfmt option:                   msgunfmt Invocation. (line  47)
+* -L, xgettext option:                   xgettext Invocation. (line  56)
+* -m, msgcmp option:                     msgcmp Invocation.   (line  36)
+* -M, msggrep option:                    msggrep Invocation.  (line  77)
+* -m, msgmerge option:                   msgmerge Invocation. (line 101)
+* -M, xgettext option:                   xgettext Invocation. (line 407)
+* -m, xgettext option:                   xgettext Invocation. (line 403)
+* -n, gettext option:                    gettext Invocation.  (line  35)
+* -n, msgattrib option:                  msgattrib Invocation.
+                                                              (line 136)
+* -n, msgcat option:                     msgcat Invocation.   (line 119)
+* -N, msgcmp option:                     msgcmp Invocation.   (line  40)
+* -n, msgcomm option:                    msgcomm Invocation.  (line 104)
+* -n, msgfilter option:                  msgfilter Invocation.
                                                               (line  86)
-* -F, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 199)
-* -f, ‘msgfmt’ option:                   msgfmt Invocation.   (line 241)
-* -F, ‘msggrep’ option:                  msggrep Invocation.  (line  98)
-* -f, ‘msggrep’ option:                  msggrep Invocation.  (line 106)
-* -F, ‘msgmerge’ option:                 msgmerge Invocation. (line 193)
-* -F, ‘msguniq’ option:                  msguniq Invocation.  (line 140)
-* -f, ‘xgettext’ option:                 xgettext Invocation. (line  19)
-* -F, ‘xgettext’ option:                 xgettext Invocation. (line 351)
-* -h, ‘envsubst’ option:                 envsubst Invocation. (line  21)
-* -h, ‘gettext’ option:                  gettext Invocation.  (line  32)
-* -h, ‘msgattrib’ option:                msgattrib Invocation.
-                                                              (line 188)
-* -h, ‘msgcat’ option:                   msgcat Invocation.   (line 164)
-* -h, ‘msgcmp’ option:                   msgcmp Invocation.   (line  69)
-* -h, ‘msgcomm’ option:                  msgcomm Invocation.  (line 153)
-* -h, ‘msgconv’ option:                  msgconv Invocation.  (line 130)
-* -h, ‘msgen’ option:                    msgen Invocation.    (line 133)
-* -h, ‘msgexec’ option:                  msgexec Invocation.  (line  74)
-* -h, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 206)
-* -h, ‘msgfmt’ option:                   msgfmt Invocation.   (line 274)
-* -h, ‘msggrep’ option:                  msggrep Invocation.  (line 200)
-* -h, ‘msginit’ option:                  msginit Invocation.  (line  95)
-* -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 427)
-* -i, ‘msgattrib’ option:                msgattrib Invocation.
-                                                              (line 131)
-* -i, ‘msgcat’ option:                   msgcat Invocation.   (line 107)
-* -i, ‘msgcomm’ option:                  msgcomm Invocation.  (line  93)
-* -i, ‘msgconv’ option:                  msgconv Invocation.  (line  73)
-* -i, ‘msgen’ option:                    msgen Invocation.    (line  76)
-* -i, ‘msgexec’ option:                  msgexec Invocation.  (line  47)
-* -i, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  30)
-* -i, ‘msggrep’ option:                  msggrep Invocation.  (line 110)
-* -i, ‘msginit’ option:                  msginit Invocation.  (line  16)
-* -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 300)
-* -j, ‘msgfmt’ option:                   msgfmt Invocation.   (line  30)
-* -J, ‘msggrep’ option:                  msggrep Invocation.  (line  74)
-* -j, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  16)
-* -j, ‘xgettext’ option:                 xgettext Invocation. (line  85)
-* -k, ‘msgfmt’ option:                   msgfmt Invocation.   (line 137)
-* -K, ‘msggrep’ option:                  msggrep Invocation.  (line  78)
-* -k, ‘xgettext’ option:                 xgettext Invocation. (line 112)
-* -l, ‘msgfmt’ option:                   msgfmt Invocation.   (line  80)
-* -l, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 103)
-* -l, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 119)
-* -l, ‘msgfmt’ option <3>:               msgfmt Invocation.   (line 143)
-* -l, ‘msginit’ option:                  msginit Invocation.  (line  49)
-* -l, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  45)
-* -l, ‘msgunfmt’ option <1>:             msgunfmt Invocation. (line  62)
-* -l, ‘msgunfmt’ option <2>:             msgunfmt Invocation. (line  78)
-* -L, ‘xgettext’ option:                 xgettext Invocation. (line  54)
-* -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 416)
-* -M, ‘xgettext’ option:                 xgettext Invocation. (line 420)
-* -n, ‘gettext’ option:                  gettext Invocation.  (line  35)
-* -n, ‘msgattrib’ option:                msgattrib Invocation.
-                                                              (line 138)
-* -n, ‘msgcat’ option:                   msgcat Invocation.   (line 114)
-* -N, ‘msgcmp’ option:                   msgcmp Invocation.   (line  39)
-* -n, ‘msgcomm’ option:                  msgcomm Invocation.  (line 100)
-* -n, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  91)
-* -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 309)
-* -o, ‘msgattrib’ option:                msgattrib Invocation.
-                                                              (line  30)
-* -o, ‘msgcat’ option:                   msgcat Invocation.   (line  42)
-* -o, ‘msgcomm’ option:                  msgcomm Invocation.  (line  41)
-* -o, ‘msgconv’ option:                  msgconv Invocation.  (line  30)
-* -o, ‘msgen’ option:                    msgen Invocation.    (line  36)
-* -o, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  45)
-* -o, ‘msgfmt’ option:                   msgfmt Invocation.   (line  56)
-* -o, ‘msggrep’ option:                  msggrep Invocation.  (line  30)
-* -o, ‘msginit’ option:                  msginit Invocation.  (line  26)
-* -o, ‘msgmerge’ option:                 msgmerge Invocation. (line  51)
-* -o, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  93)
-* -o, ‘msguniq’ option:                  msguniq Invocation.  (line  37)
-* -o, ‘xgettext’ option:                 xgettext Invocation. (line  39)
-* -P, ‘msgattrib’ option:                msgattrib Invocation.
-                                                              (line 107)
-* -p, ‘msgattrib’ option:                msgattrib Invocation.
+* -N, msggrep option:                    msggrep Invocation.  (line  72)
+* -N, msgmerge option:                   msgmerge Invocation. (line 105)
+* -n, msguniq option:                    msguniq Invocation.  (line 101)
+* -n, xgettext option:                   xgettext Invocation. (line 297)
+* -o, msgattrib option:                  msgattrib Invocation.
+                                                              (line  31)
+* -o, msgcat option:                     msgcat Invocation.   (line  44)
+* -o, msgcomm option:                    msgcomm Invocation.  (line  42)
+* -o, msgconv option:                    msgconv Invocation.  (line  31)
+* -o, msgen option:                      msgen Invocation.    (line  37)
+* -o, msgfilter option:                  msgfilter Invocation.
+                                                              (line  39)
+* -o, msgfmt option:                     msgfmt Invocation.   (line  54)
+* -o, msggrep option:                    msggrep Invocation.  (line  31)
+* -o, msginit option:                    msginit Invocation.  (line  27)
+* -o, msgmerge option:                   msgmerge Invocation. (line  53)
+* -o, msgunfmt option:                   msgunfmt Invocation. (line  98)
+* -o, msguniq option:                    msguniq Invocation.  (line  38)
+* -o, xgettext option:                   xgettext Invocation. (line  40)
+* -p, msgattrib option:                  msgattrib Invocation.
+                                                              (line 145)
+* -P, msgattrib option:                  msgattrib Invocation.
+                                                              (line 104)
+* -p, msgcat option:                     msgcat Invocation.   (line 128)
+* -P, msgcat option:                     msgcat Invocation.   (line  74)
+* -P, msgcmp option:                     msgcmp Invocation.   (line  59)
+* -p, msgcomm option:                    msgcomm Invocation.  (line 113)
+* -P, msgcomm option:                    msgcomm Invocation.  (line  72)
+* -p, msgconv option:                    msgconv Invocation.  (line  92)
+* -P, msgconv option:                    msgconv Invocation.  (line  52)
+* -p, msgen option:                      msgen Invocation.    (line  94)
+* -P, msgen option:                      msgen Invocation.    (line  48)
+* -P, msgexec option:                    msgexec Invocation.  (line  56)
+* -p, msgfilter option:                  msgfilter Invocation.
                                                               (line 153)
-* -P, ‘msgcat’ option:                   msgcat Invocation.   (line  70)
-* -p, ‘msgcat’ option:                   msgcat Invocation.   (line 129)
-* -P, ‘msgcmp’ option:                   msgcmp Invocation.   (line  57)
-* -P, ‘msgcomm’ option:                  msgcomm Invocation.  (line  69)
-* -p, ‘msgcomm’ option:                  msgcomm Invocation.  (line 115)
-* -P, ‘msgconv’ option:                  msgconv Invocation.  (line  49)
-* -p, ‘msgconv’ option:                  msgconv Invocation.  (line  95)
-* -P, ‘msgen’ option:                    msgen Invocation.    (line  46)
-* -p, ‘msgen’ option:                    msgen Invocation.    (line  98)
-* -P, ‘msgexec’ option:                  msgexec Invocation.  (line  62)
-* -P, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 121)
-* -p, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 171)
-* -P, ‘msgfmt’ option:                   msgfmt Invocation.   (line 176)
-* -P, ‘msggrep’ option:                  msggrep Invocation.  (line 122)
-* -p, ‘msggrep’ option:                  msggrep Invocation.  (line 167)
-* -P, ‘msginit’ option:                  msginit Invocation.  (line  37)
-* -p, ‘msginit’ option:                  msginit Invocation.  (line  69)
-* -P, ‘msgmerge’ option:                 msgmerge Invocation. (line 112)
-* -p, ‘msgmerge’ option:                 msgmerge Invocation. (line 165)
-* -p, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 124)
-* -P, ‘msguniq’ option:                  msguniq Invocation.  (line  58)
-* -p, ‘msguniq’ option:                  msguniq Invocation.  (line 112)
-* -p, ‘xgettext’ option:                 xgettext Invocation. (line  44)
-* -q, ‘msgmerge’ option:                 msgmerge Invocation. (line 213)
-* -r, ‘msgfmt’ option:                   msgfmt Invocation.   (line  76)
-* -r, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line  99)
-* -r, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  41)
-* -r, ‘msgunfmt’ option <1>:             msgunfmt Invocation. (line  58)
-* -s, ‘msgattrib’ option:                msgattrib Invocation.
+* -P, msgfilter option:                  msgfilter Invocation.
+                                                              (line 109)
+* -P, msgfmt option:                     msgfmt Invocation.   (line 133)
+* -p, msggrep option:                    msggrep Invocation.  (line 170)
+* -P, msggrep option:                    msggrep Invocation.  (line 131)
+* -p, msginit option:                    msginit Invocation.  (line  72)
+* -P, msginit option:                    msginit Invocation.  (line  39)
+* -p, msgmerge option:                   msgmerge Invocation. (line 164)
+* -P, msgmerge option:                   msgmerge Invocation. (line 117)
+* -p, msgunfmt option:                   msgunfmt Invocation. (line 130)
+* -p, msguniq option:                    msguniq Invocation.  (line 110)
+* -P, msguniq option:                    msguniq Invocation.  (line  61)
+* -p, xgettext option:                   xgettext Invocation. (line  45)
+* -q, msgmerge option:                   msgmerge Invocation. (line 213)
+* -r, msgfmt option:                     msgfmt Invocation.   (line  75)
+* -r, msgunfmt option:                   msgunfmt Invocation. (line  43)
+* -s, msgattrib option:                  msgattrib Invocation.
+                                                              (line 168)
+* -s, msgcat option:                     msgcat Invocation.   (line 151)
+* -s, msgcomm option:                    msgcomm Invocation.  (line 136)
+* -s, msgconv option:                    msgconv Invocation.  (line 115)
+* -s, msgen option:                      msgen Invocation.    (line 117)
+* -s, msgfilter option:                  msgfilter Invocation.
                                                               (line 176)
-* -s, ‘msgcat’ option:                   msgcat Invocation.   (line 152)
-* -s, ‘msgcomm’ option:                  msgcomm Invocation.  (line 138)
-* -s, ‘msgconv’ option:                  msgconv Invocation.  (line 118)
-* -s, ‘msgen’ option:                    msgen Invocation.    (line 121)
-* -s, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 194)
-* -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 346)
-* -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 254)
-* -u, ‘msgcat’ option:                   msgcat Invocation.   (line  62)
-* -u, ‘msgcomm’ option:                  msgcomm Invocation.  (line  61)
-* -U, ‘msgmerge’ option:                 msgmerge Invocation. (line  44)
-* -u, ‘msguniq’ option:                  msguniq Invocation.  (line  51)
-* -v, ‘envsubst’ option:                 envsubst Invocation. (line  15)
-* -V, ‘envsubst’ option:                 envsubst Invocation. (line  25)
-* -V, ‘gettext’ option:                  gettext Invocation.  (line  40)
-* -V, ‘msgattrib’ option:                msgattrib Invocation.
-                                                              (line 192)
-* -V, ‘msgcat’ option:                   msgcat Invocation.   (line 168)
-* -V, ‘msgcmp’ option:                   msgcmp Invocation.   (line  73)
-* -V, ‘msgcomm’ option:                  msgcomm Invocation.  (line 157)
-* -V, ‘msgconv’ option:                  msgconv Invocation.  (line 134)
-* -V, ‘msgen’ option:                    msgen Invocation.    (line 137)
-* -V, ‘msgexec’ option:                  msgexec Invocation.  (line  78)
-* -V, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 210)
-* -V, ‘msgfmt’ option:                   msgfmt Invocation.   (line 278)
-* -v, ‘msgfmt’ option:                   msgfmt Invocation.   (line 287)
-* -v, ‘msggrep’ option:                  msggrep Invocation.  (line 114)
-* -V, ‘msggrep’ option:                  msggrep Invocation.  (line 204)
-* -V, ‘msginit’ option:                  msginit Invocation.  (line  99)
-* -V, ‘msgmerge’ option:                 msgmerge Invocation. (line 204)
-* -v, ‘msgmerge’ option:                 msgmerge Invocation. (line 208)
-* -V, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 159)
-* -v, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 163)
-* -V, ‘msguniq’ option:                  msguniq Invocation.  (line 151)
-* -V, ‘ngettext’ option:                 ngettext Invocation. (line  35)
-* -V, ‘xgettext’ option:                 xgettext Invocation. (line 431)
-* -w, ‘msgattrib’ option:                msgattrib Invocation.
+* -s, msgmerge option:                   msgmerge Invocation. (line 187)
+* -s, msgunfmt option:                   msgunfmt Invocation. (line 153)
+* -s, msguniq option:                    msguniq Invocation.  (line 133)
+* -s, xgettext option:                   xgettext Invocation. (line 328)
+* -t, msgcat option:                     msgcat Invocation.   (line  87)
+* -t, msgconv option:                    msgconv Invocation.  (line  42)
+* -T, msggrep option:                    msggrep Invocation.  (line  89)
+* -t, msguniq option:                    msguniq Invocation.  (line  74)
+* -T, xgettext option:                   xgettext Invocation. (line 241)
+* -u, msgcat option:                     msgcat Invocation.   (line  65)
+* -u, msgcomm option:                    msgcomm Invocation.  (line  63)
+* -U, msgmerge option:                   msgmerge Invocation. (line  45)
+* -u, msguniq option:                    msguniq Invocation.  (line  53)
+* -V, envsubst option:                   envsubst Invocation. (line  26)
+* -v, envsubst option:                   envsubst Invocation. (line  15)
+* -V, gettext option:                    gettext Invocation.  (line  40)
+* -V, msgattrib option:                  msgattrib Invocation.
+                                                              (line 185)
+* -V, msgcat option:                     msgcat Invocation.   (line 168)
+* -V, msgcmp option:                     msgcmp Invocation.   (line  76)
+* -V, msgcomm option:                    msgcomm Invocation.  (line 156)
+* -V, msgconv option:                    msgconv Invocation.  (line 132)
+* -V, msgen option:                      msgen Invocation.    (line 134)
+* -V, msgexec option:                    msgexec Invocation.  (line  73)
+* -V, msgfilter option:                  msgfilter Invocation.
+                                                              (line 193)
+* -v, msgfmt option:                     msgfmt Invocation.   (line 235)
+* -V, msgfmt option:                     msgfmt Invocation.   (line 226)
+* -V, msggrep option:                    msggrep Invocation.  (line 208)
+* -v, msggrep option:                    msggrep Invocation.  (line 121)
+* -V, msginit option:                    msginit Invocation.  (line 103)
+* -v, msgmerge option:                   msgmerge Invocation. (line 208)
+* -V, msgmerge option:                   msgmerge Invocation. (line 204)
+* -v, msgunfmt option:                   msgunfmt Invocation. (line 170)
+* -V, msgunfmt option:                   msgunfmt Invocation. (line 166)
+* -V, msguniq option:                    msguniq Invocation.  (line 150)
+* -V, ngettext option:                   ngettext Invocation. (line  35)
+* -V, xgettext option:                   xgettext Invocation. (line 419)
+* -w, msgattrib option:                  msgattrib Invocation.
+                                                              (line 155)
+* -w, msgcat option:                     msgcat Invocation.   (line 138)
+* -w, msgcomm option:                    msgcomm Invocation.  (line 123)
+* -w, msgconv option:                    msgconv Invocation.  (line 102)
+* -w, msgen option:                      msgen Invocation.    (line 104)
+* -w, msgfilter option:                  msgfilter Invocation.
                                                               (line 163)
-* -w, ‘msgcat’ option:                   msgcat Invocation.   (line 139)
-* -w, ‘msgcomm’ option:                  msgcomm Invocation.  (line 125)
-* -w, ‘msgconv’ option:                  msgconv Invocation.  (line 105)
-* -w, ‘msgen’ option:                    msgen Invocation.    (line 108)
-* -w, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 181)
-* -w, ‘msggrep’ option:                  msggrep Invocation.  (line 177)
-* -w, ‘msginit’ option:                  msginit Invocation.  (line  79)
-* -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 333)
-* -X, ‘msggrep’ option:                  msggrep Invocation.  (line  90)
-* -x, ‘xgettext’ option:                 xgettext Invocation. (line  89)
+* -w, msggrep option:                    msggrep Invocation.  (line 180)
+* -w, msginit option:                    msginit Invocation.  (line  82)
+* -w, msgmerge option:                   msgmerge Invocation. (line 174)
+* -w, msgunfmt option:                   msgunfmt Invocation. (line 140)
+* -w, msguniq option:                    msguniq Invocation.  (line 120)
+* -w, xgettext option:                   xgettext Invocation. (line 315)
+* -X, msggrep option:                    msggrep Invocation.  (line  97)
+* -x, xgettext option:                   xgettext Invocation. (line  92)
 
 
 File: gettext.info,  Node: Variable Index,  Next: PO Mode Index,  Prev: Option Index,  Up: Top
@@ -17165,64 +17394,44 @@
 * Menu:
 
 * GETTEXT_LOG_UNTRANSLATED, environment variable: Prioritizing messages.
-                                                               (line 22)
+                                                               (line 23)
+* LANG, environment variable <1>:        gettext grok.         (line 32)
 * LANG, environment variable:            Locale Environment Variables.
-                                                               (line 15)
-* LANG, environment variable <1>:        gettext grok.         (line 30)
+                                                               (line 17)
+* LANGUAGE, environment variable <1>:    po/Rules-*.           (line 11)
+* LANGUAGE, environment variable <2>:    gettext grok.         (line 28)
 * LANGUAGE, environment variable:        Locale Environment Variables.
                                                                (line 11)
-* LANGUAGE, environment variable <1>:    gettext grok.         (line 28)
-* LANGUAGE, environment variable <2>:    po/Rules-*.           (line 11)
+* LC_ALL, environment variable <1>:      gettext grok.         (line 28)
 * LC_ALL, environment variable:          Locale Environment Variables.
                                                                (line 11)
-* LC_ALL, environment variable <1>:      gettext grok.         (line 28)
+* LC_COLLATE, environment variable <1>:  gettext grok.         (line 30)
 * LC_COLLATE, environment variable:      Locale Environment Variables.
-                                                               (line 12)
-* LC_COLLATE, environment variable <1>:  gettext grok.         (line 29)
+                                                               (line 13)
+* LC_CTYPE, environment variable <1>:    gettext grok.         (line 30)
 * LC_CTYPE, environment variable:        Locale Environment Variables.
-                                                               (line 12)
-* LC_CTYPE, environment variable <1>:    gettext grok.         (line 29)
+                                                               (line 13)
+* LC_MESSAGES, environment variable <1>: gettext grok.         (line 30)
 * LC_MESSAGES, environment variable:     Locale Environment Variables.
-                                                               (line 12)
-* LC_MESSAGES, environment variable <1>: gettext grok.         (line 29)
+                                                               (line 13)
+* LC_MONETARY, environment variable <1>: gettext grok.         (line 30)
 * LC_MONETARY, environment variable:     Locale Environment Variables.
-                                                               (line 12)
-* LC_MONETARY, environment variable <1>: gettext grok.         (line 29)
+                                                               (line 13)
+* LC_NUMERIC, environment variable <1>:  gettext grok.         (line 30)
 * LC_NUMERIC, environment variable:      Locale Environment Variables.
-                                                               (line 12)
-* LC_NUMERIC, environment variable <1>:  gettext grok.         (line 29)
+                                                               (line 13)
+* LC_TIME, environment variable <1>:     gettext grok.         (line 30)
 * LC_TIME, environment variable:         Locale Environment Variables.
-                                                               (line 12)
-* LC_TIME, environment variable <1>:     gettext grok.         (line 29)
+                                                               (line 13)
 * LINGUAS, environment variable:         Installers.           (line 17)
 * MSGEXEC_LOCATION, environment variable: msgexec Invocation.  (line 18)
 * MSGEXEC_MSGCTXT, environment variable: msgexec Invocation.   (line 18)
 * MSGEXEC_MSGID, environment variable:   msgexec Invocation.   (line 18)
-* MSGEXEC_MSGID_PLURAL, environment variable: msgexec Invocation.
-                                                               (line 18)
-* MSGEXEC_PLURAL_FORM, environment variable: msgexec Invocation.
-                                                               (line 18)
-* MSGEXEC_PREV_MSGCTXT, environment variable: msgexec Invocation.
-                                                               (line 18)
-* MSGEXEC_PREV_MSGID, environment variable: msgexec Invocation.
-                                                               (line 18)
-* MSGEXEC_PREV_MSGID_PLURAL, environment variable: msgexec Invocation.
-                                                               (line 18)
 * MSGFILTER_LOCATION, environment variable: msgfilter Invocation.
                                                                (line 11)
 * MSGFILTER_MSGCTXT, environment variable: msgfilter Invocation.
                                                                (line 11)
 * MSGFILTER_MSGID, environment variable: msgfilter Invocation. (line 11)
-* MSGFILTER_MSGID_PLURAL, environment variable: msgfilter Invocation.
-                                                               (line 11)
-* MSGFILTER_PLURAL_FORM, environment variable: msgfilter Invocation.
-                                                               (line 11)
-* MSGFILTER_PREV_MSGCTXT, environment variable: msgfilter Invocation.
-                                                               (line 11)
-* MSGFILTER_PREV_MSGID, environment variable: msgfilter Invocation.
-                                                               (line 11)
-* MSGFILTER_PREV_MSGID_PLURAL, environment variable: msgfilter Invocation.
-                                                               (line 11)
 * PO_STYLE, environment variable:        The --style option.   (line 10)
 * TERM, environment variable:            The TERM variable.    (line  6)
 * TEXTDOMAIN, environment variable:      sh.                   (line 23)
@@ -17238,236 +17447,196 @@
 * Menu:
 
 * #, PO Mode command:                    Modifying Comments.  (line  24)
-* #, PO Mode command <1>:                Modifying Comments.  (line  45)
-* ,, PO Mode command:                    Marking.             (line  43)
+* ,, PO Mode command:                    Marking.             (line  44)
 * ., PO Mode command:                    Entry Positioning.   (line  20)
-* ., PO Mode command <1>:                Entry Positioning.   (line  45)
-* ‘.emacs’ customizations:               Installation.        (line  13)
+* .emacs customizations:                 Installation.        (line  13)
 * 0, PO Mode command:                    Main PO Commands.    (line  40)
-* 0, PO Mode command <1>:                Main PO Commands.    (line  72)
 * <, PO Mode command:                    Entry Positioning.   (line  29)
-* <, PO Mode command <1>:                Entry Positioning.   (line  73)
 * =, PO Mode command:                    Main PO Commands.    (line  47)
-* =, PO Mode command <1>:                Main PO Commands.    (line  87)
 * >, PO Mode command:                    Entry Positioning.   (line  32)
-* >, PO Mode command <1>:                Entry Positioning.   (line  73)
 * ?, PO Mode command:                    Main PO Commands.    (line  44)
-* ?, PO Mode command <1>:                Main PO Commands.    (line  83)
 * _, PO Mode command:                    Main PO Commands.    (line  30)
-* _, PO Mode command <1>:                Main PO Commands.    (line  52)
-* a, PO Mode command:                    Auxiliary.           (line  21)
+* a, PO Mode command:                    Auxiliary.           (line  40)
 * A, PO Mode command:                    Auxiliary.           (line  28)
-* A, PO Mode command <1>:                Auxiliary.           (line  35)
-* a, PO Mode command <1>:                Auxiliary.           (line  39)
+* a, PO Mode command:                    Auxiliary.           (line  21)
 * auxiliary PO file:                     Auxiliary.           (line  13)
+* C-c C-a, PO Mode command <1>:          Auxiliary.           (line  25)
 * C-c C-a, PO Mode command:              Subedit.             (line  17)
-* C-c C-a, PO Mode command <1>:          Subedit.             (line  36)
-* C-c C-a, PO Mode command <2>:          Auxiliary.           (line  25)
-* C-c C-a, PO Mode command <3>:          Auxiliary.           (line  48)
 * C-c C-c, PO Mode command:              Subedit.             (line  11)
-* C-c C-c, PO Mode command <1>:          Subedit.             (line  19)
 * C-c C-k, PO Mode command:              Subedit.             (line  14)
-* C-c C-k, PO Mode command <1>:          Subedit.             (line  27)
 * C-j, PO Mode command:                  Modifying Translations.
                                                               (line  26)
-* C-j, PO Mode command <1>:              Modifying Translations.
-                                                              (line  52)
 * commands:                              Main PO Commands.    (line   6)
-* comment out PO file entry:             Obsolete Entries.    (line  46)
+* comment out PO file entry:             Obsolete Entries.    (line  47)
 * consulting program sources:            C Sources Context.   (line   6)
 * consulting translations to other languages: Auxiliary.      (line   6)
 * current entry of a PO file:            Entry Positioning.   (line   6)
 * cut and paste for translated strings:  Modifying Translations.
                                                               (line  74)
-* DEL, PO Mode command:                  Fuzzy Entries.       (line  58)
 * DEL, PO Mode command <1>:              Obsolete Entries.    (line  32)
-* DEL, PO Mode command <2>:              Obsolete Entries.    (line  46)
+* DEL, PO Mode command:                  Fuzzy Entries.       (line  60)
 * editing comments:                      Modifying Comments.  (line   6)
-* editing multiple entries:              Subedit.             (line  64)
+* editing multiple entries:              Subedit.             (line  62)
 * editing translations:                  Modifying Translations.
                                                               (line   6)
-* ‘etags’, using for marking strings:    Marking.             (line  17)
-* exiting PO subedit:                    Subedit.             (line  19)
-* f, PO Mode command:                    Fuzzy Entries.       (line  29)
-* F, PO Mode command:                    Fuzzy Entries.       (line  32)
-* f, PO Mode command <1>:                Fuzzy Entries.       (line  37)
-* F, PO Mode command <1>:                Fuzzy Entries.       (line  37)
+* etags, using for marking strings:      Marking.             (line  17)
+* exiting PO subedit:                    Subedit.             (line  20)
+* F, PO Mode command:                    Fuzzy Entries.       (line  39)
+* f, PO Mode command:                    Fuzzy Entries.       (line  39)
+* F, PO Mode command:                    Fuzzy Entries.       (line  33)
+* f, PO Mode command:                    Fuzzy Entries.       (line  30)
 * find source fragment for a PO file entry: C Sources Context.
                                                               (line  33)
 * h, PO Mode command:                    Main PO Commands.    (line  44)
-* h, PO Mode command <1>:                Main PO Commands.    (line  83)
 * installing PO mode:                    Installation.        (line  13)
-* k, PO Mode command:                    Untranslated Entries.
-                                                              (line  33)
-* k, PO Mode command <1>:                Untranslated Entries.
-                                                              (line  40)
-* k, PO Mode command <2>:                Modifying Translations.
-                                                              (line  30)
-* k, PO Mode command <3>:                Modifying Translations.
-                                                              (line  74)
 * K, PO Mode command:                    Modifying Comments.  (line  27)
-* K, PO Mode command <1>:                Modifying Comments.  (line  60)
+* k, PO Mode command <1>:                Modifying Translations.
+                                                              (line  30)
+* k, PO Mode command:                    Untranslated Entries.
+                                                              (line  32)
 * LFD, PO Mode command:                  Modifying Translations.
                                                               (line  26)
-* LFD, PO Mode command <1>:              Modifying Translations.
-                                                              (line  52)
 * looking at the source to aid translation: C Sources Context.
                                                               (line   6)
 * m, PO Mode command:                    Entry Positioning.   (line  35)
-* m, PO Mode command <1>:                Entry Positioning.   (line  91)
-* M-,, PO Mode command:                  Marking.             (line  47)
-* M-., PO Mode command:                  Marking.             (line  50)
+* M-,, PO Mode command:                  Marking.             (line  48)
+* M-., PO Mode command:                  Marking.             (line  51)
 * M-A, PO Mode command:                  Auxiliary.           (line  32)
-* M-A, PO Mode command <1>:              Auxiliary.           (line  35)
-* M-s, PO Mode command:                  C Sources Context.   (line  41)
+* M-S, PO Mode command:                  C Sources Context.   (line  89)
+* M-s, PO Mode command:                  C Sources Context.   (line  53)
 * M-S, PO Mode command:                  C Sources Context.   (line  49)
-* M-s, PO Mode command <1>:              C Sources Context.   (line  52)
-* M-S, PO Mode command <1>:              C Sources Context.   (line  88)
+* M-s, PO Mode command:                  C Sources Context.   (line  41)
 * marking strings for translation:       Marking.             (line   6)
-* moving by fuzzy entries:               Fuzzy Entries.       (line  23)
+* moving by fuzzy entries:               Fuzzy Entries.       (line  24)
 * moving by obsolete entries:            Obsolete Entries.    (line  22)
 * moving by translated entries:          Translated Entries.  (line  12)
 * moving by untranslated entries:        Untranslated Entries.
-                                                              (line  19)
+                                                              (line  18)
 * moving through a PO file:              Entry Positioning.   (line  14)
 * n, PO Mode command:                    Entry Positioning.   (line  23)
-* n, PO Mode command <1>:                Entry Positioning.   (line  68)
 * next-error, stepping through PO file validation results: Main PO Commands.
                                                               (line  99)
-* normalize, PO Mode command:            Auxiliary.           (line  63)
-* o, PO Mode command:                    Obsolete Entries.    (line  26)
+* normalize, PO Mode command:            Auxiliary.           (line  64)
+* O, PO Mode command:                    Obsolete Entries.    (line  36)
+* o, PO Mode command:                    Obsolete Entries.    (line  36)
 * O, PO Mode command:                    Obsolete Entries.    (line  29)
-* o, PO Mode command <1>:                Obsolete Entries.    (line  35)
-* O, PO Mode command <1>:                Obsolete Entries.    (line  35)
-* obsolete active entry:                 Obsolete Entries.    (line  46)
+* o, PO Mode command:                    Obsolete Entries.    (line  26)
+* obsolete active entry:                 Obsolete Entries.    (line  47)
 * p, PO Mode command:                    Entry Positioning.   (line  26)
-* p, PO Mode command <1>:                Entry Positioning.   (line  68)
-* pending subedits:                      Subedit.             (line  75)
+* pending subedits:                      Subedit.             (line  73)
 * po-auto-edit-with-msgid, PO Mode variable: Modifying Translations.
                                                               (line  57)
 * po-auto-fuzzy-on-edit, PO Mode variable: Translated Entries.
-                                                              (line  27)
-* po-auto-select-on-unfuzzy, PO Mode variable: Fuzzy Entries. (line  42)
-* po-confirm-and-quit, PO Mode command:  Main PO Commands.    (line  61)
-* po-consider-as-auxiliary, PO Mode command: Auxiliary.       (line  35)
+                                                              (line  28)
+* po-auto-select-on-unfuzzy, PO Mode variable: Fuzzy Entries. (line  44)
+* po-confirm-and-quit, PO Mode command:  Main PO Commands.    (line  62)
+* po-consider-as-auxiliary, PO Mode command: Auxiliary.       (line  36)
 * po-consider-source-path, PO Mode command: C Sources Context.
-                                                              (line  88)
-* po-current-entry, PO Mode command:     Entry Positioning.   (line  45)
-* po-cycle-auxiliary, PO Mode command:   Auxiliary.           (line  39)
+                                                              (line  89)
+* po-current-entry, PO Mode command:     Entry Positioning.   (line  46)
+* po-cycle-auxiliary, PO Mode command:   Auxiliary.           (line  40)
 * po-cycle-source-reference, PO Mode command: C Sources Context.
-                                                              (line  52)
-* po-edit-comment, PO Mode command:      Modifying Comments.  (line  45)
+                                                              (line  53)
+* po-edit-comment, PO Mode command:      Modifying Comments.  (line  46)
 * po-edit-msgstr, PO Mode command:       Modifying Translations.
-                                                              (line  41)
-* po-exchange-location, PO Mode command: Entry Positioning.   (line 105)
-* po-fade-out-entry, PO Mode command:    Fuzzy Entries.       (line  58)
-* po-fade-out-entry, PO Mode command <1>: Obsolete Entries.   (line  46)
-* po-first-entry, PO Mode command:       Entry Positioning.   (line  73)
+                                                              (line  42)
+* po-exchange-location, PO Mode command: Entry Positioning.   (line 106)
+* po-fade-out-entry, PO Mode command <1>: Obsolete Entries.   (line  47)
+* po-fade-out-entry, PO Mode command:    Fuzzy Entries.       (line  60)
+* po-first-entry, PO Mode command:       Entry Positioning.   (line  74)
 * po-help, PO Mode command:              Main PO Commands.    (line  83)
-* po-ignore-as-auxiliary, PO Mode command: Auxiliary.         (line  35)
-* po-ignore-source-path, PO Mode command: C Sources Context.  (line  88)
+* po-ignore-as-auxiliary, PO Mode command: Auxiliary.         (line  36)
+* po-ignore-source-path, PO Mode command: C Sources Context.  (line  89)
 * po-kill-comment, PO Mode command:      Modifying Comments.  (line  60)
-* po-kill-msgstr, PO Mode command:       Untranslated Entries.
-                                                              (line  40)
 * po-kill-msgstr, PO Mode command <1>:   Modifying Translations.
                                                               (line  74)
+* po-kill-msgstr, PO Mode command:       Untranslated Entries.
+                                                              (line  40)
 * po-kill-ring-save-comment, PO Mode command: Modifying Comments.
                                                               (line  60)
 * po-kill-ring-save-msgstr, PO Mode command: Modifying Translations.
                                                               (line  74)
-* po-last-entry, PO Mode command:        Entry Positioning.   (line  73)
+* po-last-entry, PO Mode command:        Entry Positioning.   (line  74)
 * po-mark-translatable, PO Mode command: Marking.             (line  98)
 * po-msgid-to-msgstr, PO Mode command:   Modifying Translations.
                                                               (line  52)
-* po-next-entry, PO Mode command:        Entry Positioning.   (line  68)
-* po-next-fuzzy-entry, PO Mode command:  Fuzzy Entries.       (line  37)
-* po-next-obsolete-entry, PO Mode command: Obsolete Entries.  (line  35)
+* po-next-entry, PO Mode command:        Entry Positioning.   (line  69)
+* po-next-fuzzy-entry, PO Mode command:  Fuzzy Entries.       (line  39)
+* po-next-obsolete-entry, PO Mode command: Obsolete Entries.  (line  36)
 * po-next-translated-entry, PO Mode command: Translated Entries.
-                                                              (line  22)
+                                                              (line  23)
 * po-next-untranslated-entry, PO Mode command: Untranslated Entries.
                                                               (line  35)
 * po-normalize, PO Mode command:         Normalizing.         (line  31)
 * po-other-window, PO Mode command:      Main PO Commands.    (line  72)
-* po-pop-location, PO Mode command:      Entry Positioning.   (line  91)
-* po-previous-entry, PO Mode command:    Entry Positioning.   (line  68)
-* po-previous-fuzzy-entry, PO Mode command: Fuzzy Entries.    (line  37)
+* po-pop-location, PO Mode command:      Entry Positioning.   (line  92)
+* po-previous-entry, PO Mode command:    Entry Positioning.   (line  69)
+* po-previous-fuzzy-entry, PO Mode command: Fuzzy Entries.    (line  39)
 * po-previous-obsolete-entry, PO Mode command: Obsolete Entries.
-                                                              (line  35)
+                                                              (line  36)
 * po-previous-translated-entry, PO Mode command: Translated Entries.
-                                                              (line  22)
+                                                              (line  23)
 * po-previous-untransted-entry, PO Mode command: Untranslated Entries.
                                                               (line  35)
-* po-push-location, PO Mode command:     Entry Positioning.   (line  91)
-* po-quit, PO Mode command:              Main PO Commands.    (line  61)
-* po-select-auxiliary, PO Mode command:  Auxiliary.           (line  48)
+* po-push-location, PO Mode command:     Entry Positioning.   (line  92)
+* po-quit, PO Mode command:              Main PO Commands.    (line  62)
+* po-select-auxiliary, PO Mode command:  Auxiliary.           (line  49)
 * po-select-mark-and-mark, PO Mode command: Marking.          (line  98)
 * po-select-source-reference, PO Mode command: C Sources Context.
-                                                              (line  52)
+                                                              (line  53)
 * po-statistics, PO Mode command:        Main PO Commands.    (line  87)
 * po-subedit-abort, PO Mode command:     Subedit.             (line  27)
-* po-subedit-cycle-auxiliary, PO Mode command: Subedit.       (line  36)
-* po-subedit-exit, PO Mode command:      Subedit.             (line  19)
+* po-subedit-cycle-auxiliary, PO Mode command: Subedit.       (line  35)
+* po-subedit-exit, PO Mode command:      Subedit.             (line  20)
 * po-subedit-mode-hook, PO Mode variable: Modifying Comments. (line  57)
-* po-tags-search, PO Mode command:       Marking.             (line  54)
-* po-undo, PO Mode command:              Main PO Commands.    (line  52)
-* po-unfuzzy, PO Mode command:           Fuzzy Entries.       (line  42)
+* po-tags-search, PO Mode command:       Marking.             (line  56)
+* po-undo, PO Mode command:              Main PO Commands.    (line  53)
+* po-unfuzzy, PO Mode command:           Fuzzy Entries.       (line  44)
 * po-validate, PO Mode command:          Main PO Commands.    (line  92)
 * po-yank-comment, PO Mode command:      Modifying Comments.  (line  60)
 * po-yank-msgstr, PO Mode command:       Modifying Translations.
-                                                              (line  97)
-* Q, PO Mode command:                    Main PO Commands.    (line  33)
+                                                              (line  98)
+* q, PO Mode command:                    Main PO Commands.    (line  62)
+* Q, PO Mode command:                    Main PO Commands.    (line  62)
 * q, PO Mode command:                    Main PO Commands.    (line  36)
-* Q, PO Mode command <1>:                Main PO Commands.    (line  61)
-* q, PO Mode command <1>:                Main PO Commands.    (line  61)
+* Q, PO Mode command:                    Main PO Commands.    (line  33)
 * r, PO Mode command:                    Entry Positioning.   (line  39)
-* r, PO Mode command <1>:                Entry Positioning.   (line  91)
 * RET, PO Mode command:                  Modifying Translations.
                                                               (line  22)
-* RET, PO Mode command <1>:              Modifying Translations.
-                                                              (line  41)
-* s, PO Mode command:                    C Sources Context.   (line  37)
+* S, PO Mode command:                    C Sources Context.   (line  89)
+* s, PO Mode command:                    C Sources Context.   (line  53)
 * S, PO Mode command:                    C Sources Context.   (line  45)
-* s, PO Mode command <1>:                C Sources Context.   (line  52)
-* S, PO Mode command <1>:                C Sources Context.   (line  88)
+* s, PO Mode command:                    C Sources Context.   (line  37)
 * starting a string translation:         Modifying Translations.
                                                               (line  63)
 * string normalization in entries:       Normalizing.         (line  30)
 * subedit minor mode:                    Subedit.             (line   6)
-* t, PO Mode command:                    Translated Entries.  (line  16)
+* T, PO Mode command:                    Translated Entries.  (line  23)
+* t, PO Mode command:                    Translated Entries.  (line  23)
 * T, PO Mode command:                    Translated Entries.  (line  19)
-* t, PO Mode command <1>:                Translated Entries.  (line  22)
-* T, PO Mode command <1>:                Translated Entries.  (line  22)
-* TAB, PO Mode command:                  Fuzzy Entries.       (line  35)
-* TAB, PO Mode command <1>:              Fuzzy Entries.       (line  42)
-* ‘TAGS’, and marking translatable strings: Marking.          (line  30)
-* u, PO Mode command:                    Untranslated Entries.
-                                                              (line  26)
+* t, PO Mode command:                    Translated Entries.  (line  16)
+* TAB, PO Mode command:                  Fuzzy Entries.       (line  36)
+* TAGS, and marking translatable strings: Marking.            (line  31)
 * U, PO Mode command:                    Untranslated Entries.
-                                                              (line  29)
-* u, PO Mode command <1>:                Untranslated Entries.
                                                               (line  35)
-* U, PO Mode command <1>:                Untranslated Entries.
+* u, PO Mode command:                    Untranslated Entries.
                                                               (line  35)
+* U, PO Mode command:                    Untranslated Entries.
+                                                              (line  28)
+* u, PO Mode command:                    Untranslated Entries.
+                                                              (line  25)
 * use the source, Luke:                  C Sources Context.   (line   6)
 * using obsolete translations to make new entries: Modifying Translations.
-                                                              (line 123)
+                                                              (line 124)
 * using translation compendia:           Compendium.          (line   6)
 * V, PO Mode command:                    Main PO Commands.    (line  50)
-* V, PO Mode command <1>:                Main PO Commands.    (line  92)
+* W, PO Mode command:                    Modifying Comments.  (line  31)
 * w, PO Mode command:                    Modifying Translations.
                                                               (line  34)
-* w, PO Mode command <1>:                Modifying Translations.
-                                                              (line  74)
-* W, PO Mode command:                    Modifying Comments.  (line  31)
-* W, PO Mode command <1>:                Modifying Comments.  (line  60)
 * x, PO Mode command:                    Entry Positioning.   (line  42)
-* x, PO Mode command <1>:                Entry Positioning.   (line 105)
+* Y, PO Mode command:                    Modifying Comments.  (line  35)
 * y, PO Mode command:                    Modifying Translations.
                                                               (line  38)
-* y, PO Mode command <1>:                Modifying Translations.
-                                                              (line  97)
-* Y, PO Mode command:                    Modifying Comments.  (line  35)
-* Y, PO Mode command <1>:                Modifying Comments.  (line  60)
 
 
 File: gettext.info,  Node: Autoconf Macro Index,  Next: Index,  Prev: PO Mode Index,  Up: Top
@@ -17497,15 +17666,14 @@
 [index]
 * Menu:
 
-* ‘_’, a macro to mark strings for translation: Mark Keywords.
-                                                              (line  45)
-* ‘_nl_msg_cat_cntr’:                    gettext grok.        (line  59)
-* ‘ABOUT-NLS’ file:                      Installing Localizations.
+* _, a macro to mark strings for translation: Mark Keywords.  (line  45)
+* _nl_msg_cat_cntr:                      gettext grok.        (line  62)
+* ABOUT-NLS file:                        Installing Localizations.
                                                               (line  13)
-* ‘acconfig.h’ file:                     acconfig.            (line   6)
+* acconfig.h file:                       acconfig.            (line   6)
 * accumulating translations:             Creating Compendia.  (line  14)
-* ‘aclocal.m4’ file:                     aclocal.             (line   6)
-* adding keywords, ‘xgettext’:           xgettext Invocation. (line 116)
+* aclocal.m4 file:                       aclocal.             (line   6)
+* adding keywords, xgettext:             xgettext Invocation. (line 119)
 * ambiguities:                           Preparing Strings.   (line  41)
 * apply a filter to translations:        msgfilter Invocation.
                                                               (line   8)
@@ -17517,94 +17685,91 @@
 * attribute, fuzzy:                      Fuzzy Entries.       (line   6)
 * attributes of a PO file entry:         Fuzzy Entries.       (line   6)
 * attributes, manipulating:              Manipulating.        (line  56)
-* autoconf macros for ‘gettext’:         autoconf macros.     (line   6)
-* ‘autopoint’ program, usage:            autopoint Invocation.
+* autoconf macros for gettext:           autoconf macros.     (line   6)
+* autopoint program, usage:              autopoint Invocation.
                                                               (line   6)
 * auxiliary PO file:                     Auxiliary.           (line  13)
 * available translations:                Installing Localizations.
                                                               (line   6)
 * awk:                                   gawk.                (line   6)
-* awk-format flag:                       PO Files.            (line 151)
-* backup old file, and ‘msgmerge’ program: msgmerge Invocation.
-                                                              (line  62)
+* awk-format flag:                       PO Files.            (line 149)
+* backup old file, and msgmerge program: msgmerge Invocation. (line  65)
 * bash:                                  bash.                (line   6)
 * bibliography:                          References.          (line   6)
 * big picture:                           Overview.            (line   6)
-* bind_textdomain_codeset:               Charset conversion.  (line  26)
-* Boost format strings:                  xgettext Invocation. (line 267)
-* boost-format flag:                     PO Files.            (line 200)
+* bind_textdomain_codeset:               Charset conversion.  (line  28)
+* Boost format strings:                  xgettext Invocation. (line 254)
+* boost-format flag:                     PO Files.            (line 198)
 * bug report address:                    Introduction.        (line  24)
 * C and C-like languages:                C.                   (line   6)
-* C trigraphs:                           xgettext Invocation. (line 254)
+* C trigraphs:                           xgettext Invocation. (line 241)
 * C#:                                    C#.                  (line   6)
-* C# mode, and ‘msgfmt’ program:         msgfmt Invocation.   (line  36)
-* C# mode, and ‘msgunfmt’ program:       msgunfmt Invocation. (line  19)
-* C# resources mode, and ‘msgfmt’ program: msgfmt Invocation. (line  40)
-* C# resources mode, and ‘msgunfmt’ program: msgunfmt Invocation.
+* C# mode, and msgfmt program:           msgfmt Invocation.   (line  36)
+* C# mode, and msgunfmt program:         msgunfmt Invocation. (line  19)
+* C# resources mode, and msgfmt program: msgfmt Invocation.   (line  40)
+* C# resources mode, and msgunfmt program: msgunfmt Invocation.
                                                               (line  23)
 * C#, string concatenation:              Preparing Strings.   (line 168)
-* c-format flag:                         PO Files.            (line  88)
-* c-format, and ‘xgettext’:              c-format Flag.       (line  47)
-* catalog encoding and ‘msgexec’ output: msgexec Invocation.  (line  32)
-* ‘catclose’, a ‘catgets’ function:      Interface to catgets.
+* c-format flag:                         PO Files.            (line  90)
+* c-format, and xgettext:                c-format Flag.       (line  48)
+* catalog encoding and msgexec output:   msgexec Invocation.  (line  25)
+* catclose, a catgets function:          Interface to catgets.
                                                               (line  44)
-* ‘catgets’, a ‘catgets’ function:       Interface to catgets.
+* catgets, a catgets function:           Interface to catgets.
                                                               (line  25)
-* ‘catgets’, X/Open specification:       catgets.             (line   6)
-* ‘catopen’, a ‘catgets’ function:       Interface to catgets.
+* catgets, X/Open specification:         catgets.             (line   6)
+* catopen, a catgets function:           Interface to catgets.
                                                               (line  13)
 * character encoding:                    Aspects.             (line  67)
 * charset conversion at runtime:         Charset conversion.  (line   6)
-* charset of PO files:                   Header Entry.        (line 101)
-* check format strings:                  msgfmt Invocation.   (line 192)
+* charset of PO files:                   Header Entry.        (line 106)
+* check format strings:                  msgfmt Invocation.   (line 150)
 * checking of translations:              Manipulating.        (line  41)
 * clisp:                                 Common Lisp.         (line   6)
 * clisp C sources:                       clisp C.             (line   6)
 * codeset:                               Aspects.             (line  67)
-* comments in PO files:                  PO Files.            (line 320)
+* comments in PO files:                  PO Files.            (line 307)
 * comments, automatic:                   PO Files.            (line  36)
 * comments, extracted:                   PO Files.            (line  36)
 * comments, translator:                  PO Files.            (line  36)
 * Common Lisp:                           Common Lisp.         (line   6)
 * compare PO files:                      msgcmp Invocation.   (line   8)
 * comparison of interfaces:              Comparison.          (line   6)
-* compatibility with X/Open ‘msgfmt’:    msgfmt Invocation.   (line 225)
+* compatibility with X/Open msgfmt:      msgfmt Invocation.   (line 183)
 * compendium:                            Compendium.          (line   6)
 * compendium, creating:                  Creating Compendia.  (line   6)
 * concatenate PO files:                  msgcat Invocation.   (line   8)
 * concatenating PO files into a compendium: Creating Compendia.
                                                               (line  14)
 * concatenation of strings:              Preparing Strings.   (line 117)
-* ‘config.h.in’ file:                    config.h.in.         (line   6)
+* config.h.in file:                      config.h.in.         (line   6)
 * context:                               Contexts.            (line   6)
-* context, argument specification in ‘xgettext’: xgettext Invocation.
-                                                              (line 116)
+* context, argument specification in xgettext: xgettext Invocation.
+                                                              (line 119)
 * context, in MO files:                  MO Files.            (line  71)
-* context, in PO files:                  PO Files.            (line 211)
+* context, in PO files:                  PO Files.            (line 202)
 * control characters:                    Preparing Strings.   (line 190)
 * convert binary message catalog into PO file: msgunfmt Invocation.
                                                               (line   8)
 * convert translations to a different encoding: msgconv Invocation.
                                                               (line   8)
-* converting a package to use ‘gettext’: Prerequisites.       (line   6)
+* converting a package to use gettext:   Prerequisites.       (line   6)
 * country codes:                         Country Codes.       (line   6)
 * create new PO file:                    msginit Invocation.  (line   8)
 * creating a new PO file:                Creating.            (line   6)
 * creating compendia:                    Creating Compendia.  (line   6)
-* csharp-format flag:                    PO Files.            (line 147)
-* currency symbols:                      Aspects.             (line  80)
-* date format:                           Aspects.             (line  86)
-* dcngettext:                            Plural forms.        (line 158)
+* csharp-format flag:                    PO Files.            (line 145)
+* currency symbols:                      Aspects.             (line  79)
+* date format:                           Aspects.             (line  84)
+* dcngettext:                            Plural forms.        (line 161)
 * dcpgettext:                            Contexts.            (line  56)
 * dcpgettext_expr:                       Contexts.            (line 112)
 * debugging messages marked as format strings: xgettext Invocation.
-                                                              (line 271)
-* Desktop Entry mode, and ‘msgfmt’ program: msgfmt Invocation.
-                                                              (line  49)
+                                                              (line 258)
 * dialect:                               Manipulating.        (line  28)
 * disabling NLS:                         lib/gettext.h.       (line   6)
 * distribution tarball:                  Release Management.  (line   6)
-* dngettext:                             Plural forms.        (line 151)
+* dngettext:                             Plural forms.        (line 153)
 * dollar substitution:                   envsubst Invocation. (line   8)
 * domain ambiguities:                    Ambiguities.         (line   6)
 * dpgettext:                             Contexts.            (line  56)
@@ -17615,57 +17780,57 @@
 * Editing PO Files:                      Editing.             (line   6)
 * editing translations:                  Modifying Translations.
                                                               (line   6)
-* elisp-format flag:                     PO Files.            (line 127)
+* elisp-format flag:                     PO Files.            (line 125)
 * Emacs Lisp:                            Emacs Lisp.          (line   6)
 * Emacs PO Mode:                         PO Mode.             (line   6)
 * encoding:                              Aspects.             (line  67)
 * encoding conversion:                   Manipulating.        (line  17)
 * encoding conversion at runtime:        Charset conversion.  (line   6)
-* encoding for your language:            Header Entry.        (line 130)
-* encoding list:                         Header Entry.        (line 114)
-* encoding of PO files:                  Header Entry.        (line 101)
+* encoding for your language:            Header Entry.        (line 135)
+* encoding list:                         Header Entry.        (line 119)
+* encoding of PO files:                  Header Entry.        (line 106)
 * environment variables:                 envsubst Invocation. (line   8)
-* ‘envsubst’ program, usage:             envsubst Invocation. (line   6)
-* ‘eval_gettext’ function, usage:        eval_gettext Invocation.
+* envsubst program, usage:               envsubst Invocation. (line   6)
+* eval_gettext function, usage:          eval_gettext Invocation.
                                                               (line   6)
-* ‘eval_ngettext’ function, usage:       eval_ngettext Invocation.
+* eval_ngettext function, usage:         eval_ngettext Invocation.
                                                               (line   6)
 * evolution of packages:                 Overview.            (line 127)
 * extracting parts of a PO file into a compendium: Creating Compendia.
-                                                              (line  64)
+                                                              (line  65)
 * FDL, GNU Free Documentation License:   GNU FDL.             (line   6)
-* file format, ‘.mo’:                    MO Files.            (line   6)
-* file format, ‘.po’:                    PO Files.            (line   6)
-* files, ‘.po’ and ‘.mo’:                Files.               (line   6)
-* files, ‘.pot’:                         Overview.            (line  67)
+* file format, .mo:                      MO Files.            (line   6)
+* file format, .po:                      PO Files.            (line   6)
+* files, .po and .mo:                    Files.               (line   6)
+* files, .pot:                           Overview.            (line  67)
 * filter messages according to attributes: msgattrib Invocation.
                                                               (line   8)
 * find common messages:                  msgcomm Invocation.  (line   8)
-* force use of fuzzy entries:            msgfmt Invocation.   (line 241)
+* force use of fuzzy entries:            msgfmt Invocation.   (line 199)
 * format strings:                        c-format Flag.       (line   6)
 * Free Pascal:                           Pascal.              (line   6)
-* function attribute, __format_arg__:    xgettext Invocation. (line 232)
-* function attribute, __format__:        xgettext Invocation. (line 218)
+* function attribute, __format__:        xgettext Invocation. (line 205)
+* function attribute, __format_arg__:    xgettext Invocation. (line 219)
 * fuzzy entries:                         Fuzzy Entries.       (line   6)
-* fuzzy flag:                            PO Files.            (line  78)
+* fuzzy flag:                            PO Files.            (line  80)
 * gawk:                                  gawk.                (line   6)
-* gcc-internal-format flag:              PO Files.            (line 179)
+* gcc-internal-format flag:              PO Files.            (line 177)
 * GCC-source:                            GCC-source.          (line   6)
 * generate binary message catalog from PO file: msgfmt Invocation.
                                                               (line   8)
 * generate translation catalog in English: msgen Invocation.  (line   8)
-* ‘gettext’ files:                       Adjusting Files.     (line   6)
-* ‘gettext’ installation:                Installation.        (line   6)
-* ‘gettext’ interface:                   Interface to gettext.
+* gettext files:                         Adjusting Files.     (line   6)
+* gettext installation:                  Installation.        (line   6)
+* gettext interface:                     Interface to gettext.
                                                               (line   6)
-* ‘gettext’ program, usage:              gettext Invocation.  (line   6)
-* ‘gettext’ vs ‘catgets’:                Comparison.          (line   6)
-* ‘gettext’, a programmer’s view:        gettext.             (line   6)
-* ‘gettext.h’ file:                      lib/gettext.h.       (line   6)
-* ‘gettextize’ program, usage:           gettextize Invocation.
+* gettext program, usage:                gettext Invocation.  (line   6)
+* gettext vs catgets:                    Comparison.          (line   6)
+* gettext, a programmer's view:          gettext.             (line   6)
+* gettext.h file:                        lib/gettext.h.       (line   6)
+* gettextize program, usage:             gettextize Invocation.
                                                               (line  34)
-* gfc-internal-format flag:              PO Files.            (line 183)
-* GNOME PO file editor:                  Gtranslator.         (line   5)
+* gfc-internal-format flag:              PO Files.            (line 181)
+* GNOME PO file editor:                  Gtranslator.         (line   6)
 * GPL, GNU General Public License:       GNU GPL.             (line   6)
 * GUI programs:                          Contexts.            (line   6)
 * guile:                                 Scheme.              (line   6)
@@ -17673,33 +17838,32 @@
 * he, she, and they:                     Introduction.        (line  15)
 * header entry of a PO file:             Header Entry.        (line   6)
 * help option:                           Preparing Strings.   (line 109)
-* history of GNU ‘gettext’:              History.             (line   6)
+* history of GNU gettext:                History.             (line   6)
 * i18n:                                  Concepts.            (line   6)
-* importing PO files:                    Normalizing.         (line  54)
-* include file ‘libintl.h’:              Overview.            (line  57)
-* include file ‘libintl.h’ <1>:          Importing.           (line  11)
-* include file ‘libintl.h’ <2>:          Comparison.          (line  33)
-* include file ‘libintl.h’ <3>:          lib/gettext.h.       (line  29)
+* importing PO files:                    Normalizing.         (line  55)
+* include file libintl.h <1>:            lib/gettext.h.       (line  29)
+* include file libintl.h <2>:            Comparison.          (line  33)
+* include file libintl.h <3>:            Importing.           (line  11)
+* include file libintl.h:                Overview.            (line  57)
 * initialization:                        Triggering.          (line   6)
 * initialize new PO file:                msginit Invocation.  (line   8)
 * initialize translations from a compendium: Using Compendia. (line  12)
-* installing ‘gettext’:                  Installation.        (line   6)
-* interface to ‘catgets’:                Interface to catgets.
+* installing gettext:                    Installation.        (line   6)
+* interface to catgets:                  Interface to catgets.
                                                               (line   6)
 * internationalization:                  Concepts.            (line  16)
-* ‘inttypes.h’:                          Preparing Strings.   (line 133)
+* inttypes.h:                            Preparing Strings.   (line 133)
 * ISO 3166:                              Country Codes.       (line   6)
 * ISO 639:                               Language Codes.      (line   6)
 * Java:                                  Java.                (line   6)
-* Java mode, and ‘msgfmt’ program:       msgfmt Invocation.   (line  30)
-* Java mode, and ‘msgunfmt’ program:     msgunfmt Invocation. (line  16)
+* Java mode, and msgfmt program:         msgfmt Invocation.   (line  30)
+* Java mode, and msgunfmt program:       msgunfmt Invocation. (line  16)
 * 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 263)
-* KDE PO file editor:                    KBabel.              (line   5)
-* kde-format flag:                       PO Files.            (line 196)
-* keyboard accelerator checking:         msgfmt Invocation.   (line 229)
+* java-format flag:                      PO Files.            (line 141)
+* KDE format strings:                    xgettext Invocation. (line 250)
+* KDE PO file editor:                    KBabel.              (line   6)
+* kde-format flag:                       PO Files.            (line 194)
+* keyboard accelerator checking:         msgfmt Invocation.   (line 187)
 * l10n:                                  Concepts.            (line   6)
 * language codes:                        Language Codes.      (line   6)
 * language selection:                    Locale Environment Variables.
@@ -17707,147 +17871,140 @@
 * language selection at runtime:         gettext grok.        (line  14)
 * large package:                         Ambiguities.         (line   6)
 * LGPL, GNU Lesser General Public License: GNU LGPL.          (line   6)
-* ‘libiconv’ library:                    AM_ICONV.            (line  20)
-* ‘libintl’ for C#:                      C#.                  (line 179)
-* ‘libintl’ for Java:                    Java.                (line 105)
-* ‘libintl’ library:                     AM_GNU_GETTEXT.      (line  53)
-* ‘librep’ Lisp:                         librep.              (line   6)
-* librep-format flag:                    PO Files.            (line 131)
+* libiconv library:                      AM_ICONV.            (line  21)
+* libintl for C#:                        C#.                  (line 178)
+* libintl for Java:                      Java.                (line 105)
+* libintl library:                       AM_GNU_GETTEXT.      (line  53)
+* librep Lisp:                           librep.              (line   6)
+* librep-format flag:                    PO Files.            (line 129)
 * License, GNU FDL:                      GNU FDL.             (line   6)
 * License, GNU GPL:                      GNU GPL.             (line   6)
 * License, GNU LGPL:                     GNU LGPL.            (line   6)
 * Licenses:                              Licenses.            (line   6)
-* ‘LINGUAS’ file:                        po/LINGUAS.          (line   6)
-* link with ‘libintl’:                   Overview.            (line  62)
-* Linux:                                 Aspects.             (line 129)
-* Linux <1>:                             Overview.            (line  62)
-* Linux <2>:                             Header Entry.        (line 127)
+* LINGUAS file:                          po/LINGUAS.          (line   6)
+* link with libintl:                     Overview.            (line  62)
+* Linux <1>:                             Header Entry.        (line 132)
+* Linux <2>:                             Overview.            (line  62)
+* Linux:                                 Aspects.             (line 125)
 * Lisp:                                  Common Lisp.         (line   6)
-* lisp-format flag:                      PO Files.            (line 123)
-* list of translation teams, where to find: Header Entry.     (line  54)
+* lisp-format flag:                      PO Files.            (line 121)
+* list of translation teams, where to find: Header Entry.     (line  59)
 * locale categories:                     Aspects.             (line  61)
-* locale categories <1>:                 Aspects.             (line 118)
 * locale category, LC_ALL:               Triggering.          (line  23)
-* locale category, LC_COLLATE:           Triggering.          (line  52)
-* locale category, LC_CTYPE:             Aspects.             (line  67)
+* locale category, LC_COLLATE:           Triggering.          (line  53)
 * locale category, LC_CTYPE <1>:         Triggering.          (line  23)
-* locale category, LC_CTYPE <2>:         Triggering.          (line  52)
-* locale category, LC_MESSAGES:          Aspects.             (line 112)
-* locale category, LC_MESSAGES <1>:      Triggering.          (line  52)
-* locale category, LC_MONETARY:          Aspects.             (line  80)
-* locale category, LC_MONETARY <1>:      Triggering.          (line  52)
-* locale category, LC_NUMERIC:           Aspects.             (line  97)
-* locale category, LC_NUMERIC <1>:       Triggering.          (line  52)
-* locale category, LC_RESPONSES:         Triggering.          (line  52)
-* locale category, LC_TIME:              Aspects.             (line  86)
-* locale category, LC_TIME <1>:          Triggering.          (line  52)
-* ‘locale’ program:                      Header Entry.        (line 107)
+* locale category, LC_CTYPE:             Aspects.             (line  67)
+* locale category, LC_MESSAGES <1>:      Triggering.          (line  53)
+* locale category, LC_MESSAGES:          Aspects.             (line 108)
+* locale category, LC_MONETARY <1>:      Triggering.          (line  53)
+* locale category, LC_MONETARY:          Aspects.             (line  79)
+* locale category, LC_NUMERIC <1>:       Triggering.          (line  53)
+* locale category, LC_NUMERIC:           Aspects.             (line  94)
+* locale category, LC_RESPONSES:         Triggering.          (line  53)
+* locale category, LC_TIME <1>:          Triggering.          (line  53)
+* locale category, LC_TIME:              Aspects.             (line  84)
+* locale program:                        Header Entry.        (line 112)
 * localization:                          Concepts.            (line  26)
-* lookup message translation:            gettext Invocation.  (line   9)
 * lookup message translation <1>:        eval_gettext Invocation.
                                                               (line   8)
-* lookup plural message translation:     ngettext Invocation. (line   8)
+* lookup message translation:            gettext Invocation.  (line   9)
 * lookup plural message translation <1>: eval_ngettext Invocation.
                                                               (line   8)
-* lua-format flag:                       PO Files.            (line 204)
+* lookup plural message translation:     ngettext Invocation. (line   8)
 * magic signature of MO files:           MO Files.            (line   9)
-* ‘Makefile.in.in’ extensions:           po/Rules-*.          (line   6)
-* ‘Makevars’ file:                       po/Makevars.         (line   6)
+* Makefile.in.in extensions:             po/Rules-*.          (line   6)
+* Makevars file:                         po/Makevars.         (line   6)
 * manipulating PO files:                 Manipulating.        (line   6)
-* marking Perl sources:                  Perl.                (line  92)
+* marking Perl sources:                  Perl.                (line  93)
 * marking string initializers:           Special cases.       (line   6)
 * marking strings that require translation: Mark Keywords.    (line   6)
 * marking strings, preparations:         Preparing Strings.   (line   6)
 * marking translatable strings:          Overview.            (line  34)
 * markup:                                Preparing Strings.   (line 190)
 * menu entries:                          Contexts.            (line   6)
-* menu, keyboard accelerator support:    msgfmt Invocation.   (line 229)
+* menu, keyboard accelerator support:    msgfmt Invocation.   (line 187)
 * merge PO files:                        msgcat Invocation.   (line   8)
 * merging two PO files:                  Manipulating.        (line  10)
 * message catalog files location:        Locating Catalogs.   (line   6)
-* messages:                              Aspects.             (line 112)
-* migration from earlier versions of ‘gettext’: Prerequisites.
-                                                              (line   6)
-* ‘mkinstalldirs’ file:                  mkinstalldirs.       (line   6)
-* mnemonics of menu entries:             msgfmt Invocation.   (line 229)
-* MO file’s format:                      MO Files.            (line   6)
+* messages:                              Aspects.             (line 108)
+* migration from earlier versions of gettext: Prerequisites.  (line   6)
+* mkinstalldirs file:                    mkinstalldirs.       (line   6)
+* mnemonics of menu entries:             msgfmt Invocation.   (line 187)
+* MO file's format:                      MO Files.            (line   6)
 * modify message attributes:             msgattrib Invocation.
-                                                              (line  59)
-* ‘msgattrib’ program, usage:            msgattrib Invocation.
+                                                              (line  62)
+* msgattrib program, usage:              msgattrib Invocation.
                                                               (line   6)
-* ‘msgcat’ program, usage:               msgcat Invocation.   (line   6)
-* ‘msgcmp’ program, usage:               msgcmp Invocation.   (line   6)
-* ‘msgcomm’ program, usage:              msgcomm Invocation.  (line   6)
-* ‘msgconv’ program, usage:              msgconv Invocation.  (line   6)
-* msgctxt:                               PO Files.            (line 211)
-* ‘msgen’ program, usage:                msgen Invocation.    (line   6)
-* ‘msgexec’ program, usage:              msgexec Invocation.  (line   6)
-* ‘msgfilter’ filter and catalog encoding: msgfilter Invocation.
-                                                              (line  58)
-* ‘msgfilter’ program, usage:            msgfilter Invocation.
+* msgcat program, usage:                 msgcat Invocation.   (line   6)
+* msgcmp program, usage:                 msgcmp Invocation.   (line   6)
+* msgcomm program, usage:                msgcomm Invocation.  (line   6)
+* msgconv program, usage:                msgconv Invocation.  (line   6)
+* msgctxt:                               PO Files.            (line 202)
+* msgen program, usage:                  msgen Invocation.    (line   6)
+* msgexec program, usage:                msgexec Invocation.  (line   6)
+* msgfilter filter and catalog encoding: msgfilter Invocation.
+                                                              (line  53)
+* msgfilter program, usage:              msgfilter Invocation.
                                                               (line   6)
-* ‘msgfmt’ program, usage:               msgfmt Invocation.   (line   6)
-* ‘msggrep’ program, usage:              msggrep Invocation.  (line   6)
-* msgid:                                 PO Files.            (line  55)
-* msgid_plural:                          PO Files.            (line 231)
-* ‘msginit’ program, usage:              msginit Invocation.  (line   6)
-* ‘msgmerge’ program, usage:             msgmerge Invocation. (line   6)
-* msgstr:                                PO Files.            (line  55)
-* ‘msgunfmt’ program, usage:             msgunfmt Invocation. (line   6)
-* ‘msguniq’ program, usage:              msguniq Invocation.  (line   6)
-* multi-line strings:                    Normalizing.         (line  64)
+* msgfmt program, usage:                 msgfmt Invocation.   (line   6)
+* msggrep program, usage:                msggrep Invocation.  (line   6)
+* msgid:                                 PO Files.            (line  56)
+* msgid_plural:                          PO Files.            (line 222)
+* msginit program, usage:                msginit Invocation.  (line   6)
+* msgmerge program, usage:               msgmerge Invocation. (line   6)
+* msgstr:                                PO Files.            (line  56)
+* msgunfmt program, usage:               msgunfmt Invocation. (line   6)
+* msguniq program, usage:                msguniq Invocation.  (line   6)
+* multi-line strings:                    Normalizing.         (line  65)
+* N_, a convenience macro:               Comparison.          (line  41)
 * Native Language Support:               Concepts.            (line  51)
 * Natural Language Support:              Concepts.            (line  51)
-* newlines in PO files:                  PO Files.            (line 315)
-* ngettext:                              Plural forms.        (line  82)
-* ‘ngettext’ program, usage:             ngettext Invocation. (line   6)
+* newlines in PO files:                  PO Files.            (line 302)
+* ngettext:                              Plural forms.        (line  84)
+* ngettext program, usage:               ngettext Invocation. (line   6)
 * NLS:                                   Concepts.            (line  51)
-* no-awk-format flag:                    PO Files.            (line 152)
-* no-boost-format flag:                  PO Files.            (line 201)
-* no-c-format flag:                      PO Files.            (line  89)
-* no-c-format, and ‘xgettext’:           c-format Flag.       (line  47)
-* no-csharp-format flag:                 PO Files.            (line 148)
-* no-elisp-format flag:                  PO Files.            (line 128)
-* no-gcc-internal-format flag:           PO Files.            (line 180)
-* no-gfc-internal-format flag:           PO Files.            (line 184)
-* no-java-format flag:                   PO Files.            (line 144)
-* no-javascript-format flag:             PO Files.            (line 209)
-* no-kde-format flag:                    PO Files.            (line 197)
-* no-librep-format flag:                 PO Files.            (line 132)
-* no-lisp-format flag:                   PO Files.            (line 124)
-* no-lua-format flag:                    PO Files.            (line 205)
-* no-objc-format flag:                   PO Files.            (line 108)
-* no-object-pascal-format flag:          PO Files.            (line 156)
-* no-perl-brace-format flag:             PO Files.            (line 172)
-* no-perl-format flag:                   PO Files.            (line 168)
-* no-php-format flag:                    PO Files.            (line 176)
-* no-python-brace-format flag:           PO Files.            (line 120)
-* no-python-format flag:                 PO Files.            (line 116)
-* no-qt-format flag:                     PO Files.            (line 189)
-* no-qt-plural-format flag:              PO Files.            (line 193)
-* no-scheme-format flag:                 PO Files.            (line 136)
-* no-sh-format flag:                     PO Files.            (line 112)
-* no-smalltalk-format flag:              PO Files.            (line 140)
-* no-tcl-format flag:                    PO Files.            (line 164)
-* no-ycp-format flag:                    PO Files.            (line 160)
-* nplurals, in a PO file header:         Plural forms.        (line 177)
-* number format:                         Aspects.             (line  97)
-* ‘N_’, a convenience macro:             Comparison.          (line  41)
-* objc-format flag:                      PO Files.            (line 107)
+* no-awk-format flag:                    PO Files.            (line 150)
+* no-boost-format flag:                  PO Files.            (line 199)
+* no-c-format flag:                      PO Files.            (line  91)
+* no-c-format, and xgettext:             c-format Flag.       (line  48)
+* no-csharp-format flag:                 PO Files.            (line 146)
+* no-elisp-format flag:                  PO Files.            (line 126)
+* no-gcc-internal-format flag:           PO Files.            (line 178)
+* no-gfc-internal-format flag:           PO Files.            (line 182)
+* no-java-format flag:                   PO Files.            (line 142)
+* no-kde-format flag:                    PO Files.            (line 195)
+* no-librep-format flag:                 PO Files.            (line 130)
+* no-lisp-format flag:                   PO Files.            (line 122)
+* no-objc-format flag:                   PO Files.            (line 110)
+* no-object-pascal-format flag:          PO Files.            (line 154)
+* no-perl-brace-format flag:             PO Files.            (line 170)
+* no-perl-format flag:                   PO Files.            (line 166)
+* no-php-format flag:                    PO Files.            (line 174)
+* no-python-format flag:                 PO Files.            (line 118)
+* no-qt-format flag:                     PO Files.            (line 187)
+* no-qt-plural-format flag:              PO Files.            (line 191)
+* no-scheme-format flag:                 PO Files.            (line 134)
+* no-sh-format flag:                     PO Files.            (line 114)
+* no-smalltalk-format flag:              PO Files.            (line 138)
+* no-tcl-format flag:                    PO Files.            (line 162)
+* no-ycp-format flag:                    PO Files.            (line 158)
+* nplurals, in a PO file header:         Plural forms.        (line 178)
+* number format:                         Aspects.             (line  94)
+* objc-format flag:                      PO Files.            (line 109)
 * Object Pascal:                         Pascal.              (line   6)
-* object-pascal-format flag:             PO Files.            (line 155)
+* object-pascal-format flag:             PO Files.            (line 153)
 * obsolete entries:                      Obsolete Entries.    (line   6)
-* optimization of ‘gettext’ functions:   Optimized gettext.   (line   6)
+* optimization of gettext functions:     Optimized gettext.   (line   6)
 * orthography:                           Manipulating.        (line  28)
 * outdigits:                             c-format.            (line  28)
-* output to stdout, ‘xgettext’:          xgettext Invocation. (line  46)
-* overview of ‘gettext’:                 Overview.            (line   6)
-* package and version declaration in ‘configure.ac’: configure.ac.
+* output to stdout, xgettext:            xgettext Invocation. (line  48)
+* overview of gettext:                   Overview.            (line   6)
+* package and version declaration in configure.ac: configure.ac.
                                                               (line   9)
 * package build and installation options: Installers.         (line   6)
-* package distributor’s view of ‘gettext’: Installers.        (line   6)
-* package installer’s view of ‘gettext’: Installers.          (line   6)
-* package maintainer’s view of ‘gettext’: Maintainers.        (line   6)
+* package distributor's view of gettext: Installers.          (line   6)
+* package installer's view of gettext:   Installers.          (line   6)
+* package maintainer's view of gettext:  Maintainers.         (line   6)
 * paragraphs:                            Preparing Strings.   (line 101)
 * Pascal:                                Pascal.              (line   6)
 * Perl:                                  Perl.                (line   6)
@@ -17860,97 +18017,95 @@
                                                               (line   6)
 * Perl special keywords for hash-lookups: Special Keywords.   (line   6)
 * Perl valid string interpolation:       Interpolation II.    (line   6)
-* perl-brace-format flag:                PO Files.            (line 171)
-* perl-format flag:                      PO Files.            (line 167)
+* perl-brace-format flag:                PO Files.            (line 169)
+* perl-format flag:                      PO Files.            (line 165)
 * pgettext:                              Contexts.            (line  33)
 * pgettext_expr:                         Contexts.            (line 112)
 * PHP:                                   PHP.                 (line   6)
-* php-format flag:                       PO Files.            (line 175)
+* php-format flag:                       PO Files.            (line 173)
 * Pike:                                  Pike.                (line   6)
-* plural form formulas:                  Plural forms.        (line 197)
+* plural form formulas:                  Plural forms.        (line 198)
 * plural forms:                          Plural forms.        (line   6)
 * plural forms, in MO files:             MO Files.            (line  74)
-* plural forms, in PO files:             PO Files.            (line 231)
+* plural forms, in PO files:             PO Files.            (line 222)
 * plural forms, translating:             Translating plural forms.
                                                               (line   6)
-* plural, in a PO file header:           Plural forms.        (line 177)
-* PO files’ format:                      PO Files.            (line   6)
+* plural, in a PO file header:           Plural forms.        (line 178)
+* PO files' format:                      PO Files.            (line   6)
 * PO mode (Emacs) commands:              Main PO Commands.    (line   6)
 * PO template file:                      Template.            (line   6)
-* portability problems with ‘sed’:       msgfilter Invocation.
-                                                              (line  69)
-* ‘POTFILES.in’ file:                    po/POTFILES.in.      (line   6)
-* po_file_domains:                       libgettextpo.        (line  40)
-* po_file_free:                          libgettextpo.        (line  35)
-* po_file_read:                          libgettextpo.        (line  29)
-* po_message_iterator:                   libgettextpo.        (line  48)
-* po_message_iterator_free:              libgettextpo.        (line  55)
-* po_message_msgid:                      libgettextpo.        (line  69)
-* po_message_msgid_plural:               libgettextpo.        (line  73)
-* po_message_msgstr:                     libgettextpo.        (line  79)
-* po_message_msgstr_plural:              libgettextpo.        (line  84)
-* po_next_message:                       libgettextpo.        (line  60)
+* po_file_domains:                       libgettextpo.        (line  41)
+* po_file_free:                          libgettextpo.        (line  36)
+* po_file_read:                          libgettextpo.        (line  30)
+* po_message_iterator:                   libgettextpo.        (line  50)
+* po_message_iterator_free:              libgettextpo.        (line  57)
+* po_message_msgid:                      libgettextpo.        (line  70)
+* po_message_msgid_plural:               libgettextpo.        (line  75)
+* po_message_msgstr:                     libgettextpo.        (line  80)
+* po_message_msgstr_plural:              libgettextpo.        (line  86)
+* po_next_message:                       libgettextpo.        (line  62)
+* portability problems with sed:         msgfilter Invocation.
+                                                              (line  64)
+* POTFILES.in file:                      po/POTFILES.in.      (line   6)
 * preparing programs for translation:    Sources.             (line   6)
 * preparing shell scripts for translation: Preparing Shell Scripts.
                                                               (line   6)
-* problems with ‘catgets’ interface:     Problems with catgets.
+* problems with catgets interface:       Problems with catgets.
                                                               (line   6)
 * programming languages:                 Language Implementors.
                                                               (line   6)
 * 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 259)
-* Qt mode, and ‘msgfmt’ program:         msgfmt Invocation.   (line  46)
-* qt-format flag:                        PO Files.            (line 188)
-* qt-plural-format flag:                 PO Files.            (line 192)
-* quotation marks:                       Header Entry.        (line 160)
+* python-format flag:                    PO Files.            (line 117)
+* Qt format strings:                     xgettext Invocation. (line 246)
+* Qt mode, and msgfmt program:           msgfmt Invocation.   (line  46)
+* qt-format flag:                        PO Files.            (line 186)
+* qt-plural-format flag:                 PO Files.            (line 190)
 * quotation marks <1>:                   po/Rules-*.          (line  11)
-* quote characters, use in PO files:     Header Entry.        (line 160)
-* range: flag:                           PO Files.            (line 262)
-* ‘recode-sr-latin’ program:             msgfilter Invocation.
-                                                              (line  96)
+* quotation marks:                       Header Entry.        (line 186)
+* quote characters, use in PO files:     Header Entry.        (line 186)
+* range: flag:                           PO Files.            (line 253)
+* recode-sr-latin program:               msgfilter Invocation.
+                                                              (line  92)
 * related reading:                       References.          (line   6)
 * release:                               Release Management.  (line   6)
 * RST:                                   RST.                 (line   6)
 * Scheme:                                Scheme.              (line   6)
-* scheme-format flag:                    PO Files.            (line 135)
+* scheme-format flag:                    PO Files.            (line 133)
 * scripting languages:                   Language Implementors.
                                                               (line   6)
 * search messages in a catalog:          msggrep Invocation.  (line   8)
 * selecting message language:            Locale Environment Variables.
                                                               (line   6)
 * sentences:                             Preparing Strings.   (line  44)
-* setting up ‘gettext’ at build time:    Installers.          (line   6)
-* setting up ‘gettext’ at run time:      Locale Environment Variables.
+* setting up gettext at build time:      Installers.          (line   6)
+* setting up gettext at run time:        Locale Environment Variables.
                                                               (line   6)
 * several domains:                       Ambiguities.         (line   6)
 * sex:                                   Introduction.        (line  15)
-* sh-format flag:                        PO Files.            (line 111)
+* sh-format flag:                        PO Files.            (line 113)
 * she, he, and they:                     Introduction.        (line  15)
 * shell format string:                   envsubst Invocation. (line   8)
 * shell scripts:                         sh.                  (line   6)
 * Smalltalk:                             Smalltalk.           (line   6)
-* smalltalk-format flag:                 PO Files.            (line 139)
-* 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 346)
-* 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.
-                                                              (line  53)
+* smalltalk-format flag:                 PO Files.            (line 137)
+* sorting msgcat output:                 msgcat Invocation.   (line 151)
+* sorting msgmerge output:               msgmerge Invocation. (line 187)
+* sorting msgunfmt output:               msgunfmt Invocation. (line 153)
+* sorting output of xgettext:            xgettext Invocation. (line 328)
+* specifying plural form in a PO file:   Plural forms.        (line 178)
+* standard output, and msgcat:           msgcat Invocation.   (line  47)
+* standard output, and msgmerge program: msgmerge Invocation. (line  56)
 * string concatenation:                  Preparing Strings.   (line 117)
 * string normalization in entries:       Normalizing.         (line   6)
 * style:                                 Preparing Strings.   (line  24)
-* supported languages, ‘xgettext’:       xgettext Invocation. (line  54)
+* supported languages, xgettext:         xgettext Invocation. (line  56)
 * Tcl:                                   Tcl.                 (line   6)
-* Tcl mode, and ‘msgfmt’ program:        msgfmt Invocation.   (line  43)
-* Tcl mode, and ‘msgunfmt’ program:      msgunfmt Invocation. (line  26)
-* tcl-format flag:                       PO Files.            (line 163)
+* Tcl mode, and msgfmt program:          msgfmt Invocation.   (line  43)
+* Tcl mode, and msgunfmt program:        msgunfmt Invocation. (line  26)
+* tcl-format flag:                       PO Files.            (line 161)
 * template PO file:                      Overview.            (line  67)
-* testing ‘.po’ files for equivalence:   xgettext Invocation. (line 356)
-* Tk’s scripting language:               Tcl.                 (line   6)
+* testing .po files for equivalence:     xgettext Invocation. (line 338)
+* Tk's scripting language:               Tcl.                 (line   6)
 * translated entries:                    Translated Entries.  (line   6)
 * translating menu entries:              Contexts.            (line   6)
 * translation aspects:                   Aspects.             (line   6)
@@ -17958,266 +18113,258 @@
                                                               (line   6)
 * Translation Project:                   Why.                 (line  17)
 * turning off NLS support:               lib/gettext.h.       (line   6)
-* tutorial of ‘gettext’ usage:           Overview.            (line   6)
+* tutorial of gettext usage:             Overview.            (line   6)
 * unify duplicate translations:          msguniq Invocation.  (line   8)
 * untranslated entries:                  Untranslated Entries.
                                                               (line   6)
 * update translations from a compendium: Using Compendia.     (line  20)
-* upgrading to new versions of ‘gettext’: Prerequisites.      (line   6)
-* version control for backup files, ‘msgmerge’: msgmerge Invocation.
-                                                              (line  67)
-* ‘wxWidgets’ library:                   wxWidgets.           (line   6)
-* ‘xargs’, and output from ‘msgexec’:    msgexec Invocation.  (line  14)
-* ‘xgettext’ program, usage:             xgettext Invocation. (line   6)
-* ‘xmodmap’ program, and typing quotation marks: Header Entry.
-                                                              (line 172)
+* upgrading to new versions of gettext:  Prerequisites.       (line   6)
+* version control for backup files, msgmerge: msgmerge Invocation.
+                                                              (line  71)
+* wxWidgets library:                     wxWidgets.           (line   6)
+* xargs, and output from msgexec:        msgexec Invocation.  (line  14)
+* xgettext program, usage:               xgettext Invocation. (line   6)
+* xmodmap program, and typing quotation marks: Header Entry.  (line 198)
 * YaST2 scripting language:              YCP.                 (line   6)
 * YCP:                                   YCP.                 (line   6)
-* ycp-format flag:                       PO Files.            (line 159)
+* ycp-format flag:                       PO Files.            (line 157)
 
 
 
 Tag Table:
-Node: Top2954
-Node: Introduction18147
-Node: Why19789
-Ref: Why-Footnote-123045
-Node: Concepts23201
-Node: Aspects26632
-Node: Files33240
-Node: Overview35190
-Node: Users45277
-Node: System Installation46192
-Node: Setting the GUI Locale47885
-Node: Setting the POSIX Locale49293
-Node: Locale Names50275
-Node: Locale Environment Variables52764
-Node: The LANGUAGE variable55107
-Node: Installing Localizations57128
-Node: PO Files58505
-Ref: PO Files-Footnote-171643
-Node: Sources71778
-Node: Importing73020
-Node: Triggering73724
-Node: Preparing Strings77082
-Node: Mark Keywords86241
-Node: Marking90809
-Node: c-format Flag98766
-Node: Special cases102812
-Node: Bug Report Address105595
-Node: Names107574
-Node: Libraries111880
-Node: Template114970
-Node: xgettext Invocation115735
-Node: Creating133523
-Node: msginit Invocation134432
-Node: Header Entry137477
-Node: Updating146934
-Node: msgmerge Invocation147153
-Node: Editing153619
-Node: KBabel153983
-Node: Gtranslator154123
-Node: PO Mode154267
-Node: Installation155927
-Node: Main PO Commands157943
-Node: Entry Positioning163215
-Node: Normalizing168860
-Node: Translated Entries173421
-Node: Fuzzy Entries174826
-Node: Untranslated Entries178133
-Node: Obsolete Entries180132
-Node: Modifying Translations183431
-Node: Modifying Comments191573
-Node: Subedit196122
-Node: C Sources Context200140
-Node: Auxiliary205369
-Node: Compendium208689
-Node: Creating Compendia209304
-Node: Using Compendia211866
-Node: Manipulating212824
-Node: msgcat Invocation216768
-Node: msgconv Invocation222090
-Node: msggrep Invocation226081
-Node: msgfilter Invocation232903
-Node: msguniq Invocation241089
-Node: msgcomm Invocation245829
-Node: msgcmp Invocation250730
-Node: msgattrib Invocation252971
-Node: msgen Invocation258740
-Node: msgexec Invocation263149
-Node: Colorizing266408
-Node: The --color option267463
-Node: The TERM variable269192
-Node: The --style option270746
-Node: Style rules272124
-Node: Customizing less279137
-Node: libgettextpo280592
-Node: Binaries285842
-Node: msgfmt Invocation286194
-Node: msgunfmt Invocation295936
-Node: MO Files300620
-Node: Programmers309231
-Node: catgets310445
-Node: Interface to catgets311875
-Node: Problems with catgets313944
-Node: gettext314869
-Node: Interface to gettext316392
-Node: Ambiguities318760
-Node: Locating Catalogs321520
-Ref: Locating Catalogs-Footnote-1322785
-Ref: Locating Catalogs-Footnote-2323017
-Node: Charset conversion323170
-Node: Contexts325690
-Node: Plural forms331310
-Ref: Plural forms-Footnote-1347528
-Node: Optimized gettext347650
-Node: Comparison349001
-Node: Using libintl.a353368
-Node: gettext grok353823
-Node: Temp Programmers356532
-Node: Temp Implementations357064
-Node: Temp catgets358482
-Node: Temp WSI360209
-Node: Temp Notes362272
-Node: Translators362786
-Node: Trans Intro 0363331
-Node: Trans Intro 1366188
-Node: Discussions368161
-Node: Organization371879
-Node: Central Coordination373965
-Node: National Teams375113
-Node: Sub-Cultures377647
-Node: Organizational Ideas378588
-Node: Mailing Lists379619
-Node: Information Flow381456
-Node: Translating plural forms383723
-Node: Prioritizing messages387166
-Node: Maintainers391550
-Node: Flat and Non-Flat393527
-Node: Prerequisites395057
-Node: gettextize Invocation399316
-Node: Adjusting Files407096
-Node: po/POTFILES.in408988
-Node: po/LINGUAS410287
-Node: po/Makevars412094
-Node: po/Rules-*413084
-Node: configure.ac414645
-Node: config.guess417810
-Node: mkinstalldirs419276
-Node: aclocal419689
-Node: acconfig422244
-Node: config.h.in422788
-Node: Makefile424336
-Node: src/Makefile427068
-Node: lib/gettext.h431994
-Node: autoconf macros434327
-Node: AM_GNU_GETTEXT435231
-Node: AM_GNU_GETTEXT_VERSION439455
-Node: AM_GNU_GETTEXT_NEED439934
-Node: AM_GNU_GETTEXT_INTL_SUBDIR440867
-Node: AM_PO_SUBDIRS441552
-Node: AM_XGETTEXT_OPTION442391
-Node: AM_ICONV443302
-Node: Version Control Issues445687
-Node: Distributed Development446442
-Node: Files under Version Control448477
-Node: Translations under Version Control451968
-Ref: Translations under Version Control-Footnote-1454044
-Node: autopoint Invocation454134
-Node: Release Management456151
-Node: Installers456692
-Node: Programming Languages457955
-Node: Language Implementors458793
-Node: Programmers for other Languages463783
-Node: Translators for other Languages464377
-Node: c-format466187
-Node: objc-format467961
-Node: sh-format468320
-Node: python-format469169
-Node: lisp-format469976
-Node: elisp-format470305
-Node: librep-format470800
-Node: scheme-format471203
-Node: smalltalk-format471482
-Node: java-format472013
-Node: csharp-format472468
-Node: awk-format472850
-Node: object-pascal-format473178
-Node: ycp-format473564
-Node: tcl-format473982
-Node: perl-format474284
-Node: php-format475076
-Node: gcc-internal-format475452
-Node: gfc-internal-format476611
-Node: qt-format477360
-Node: qt-plural-format477806
-Node: kde-format478165
-Node: boost-format478594
-Node: lua-format479181
-Node: javascript-format479520
-Node: Maintainers for other Languages480290
-Node: List of Programming Languages481578
-Node: C482942
-Node: sh484390
-Node: Preparing Shell Scripts485750
-Node: gettext.sh489270
-Node: gettext Invocation489838
-Node: ngettext Invocation491889
-Node: envsubst Invocation493769
-Node: eval_gettext Invocation495248
-Node: eval_ngettext Invocation495713
-Node: bash496231
-Node: Python498280
-Node: Common Lisp500760
-Node: clisp C501610
-Node: Emacs Lisp502368
-Node: librep503136
-Node: Scheme503917
-Node: Smalltalk504792
-Node: Java505887
-Node: C#511931
-Node: gawk521605
-Node: Pascal522579
-Node: wxWidgets523991
-Node: YCP524958
-Node: Tcl525737
-Node: Perl527227
-Node: General Problems530419
-Node: Default Keywords536087
-Node: Special Keywords537115
-Node: Quote-like Expressions538677
-Node: Interpolation I540994
-Node: Interpolation II544938
-Node: Parentheses547322
-Node: Long Lines548847
-Node: Perl Pitfalls550714
-Node: PHP555048
-Node: Pike556057
-Node: GCC-source556758
-Node: Lua557578
-Node: JavaScript558584
-Node: List of Data Formats559339
-Node: POT559884
-Node: RST560154
-Node: Glade560392
-Node: GSettings560804
-Node: Conclusion561099
-Node: History561613
-Node: References566016
-Node: Language Codes567715
-Node: Usual Language Codes568230
-Node: Rare Language Codes573148
-Node: Country Codes574998
-Node: Licenses582151
-Node: GNU GPL584007
-Node: GNU LGPL603304
-Node: GNU FDL631539
-Node: Program Index654069
-Node: Option Index656479
-Node: Variable Index710633
-Node: PO Mode Index715304
-Node: Autoconf Macro Index732014
-Node: Index732821
+Node: Top2956
+Node: Introduction17401
+Node: Why19024
+Ref: Why-Footnote-122238
+Node: Concepts22394
+Node: Aspects25815
+Node: Files32349
+Node: Overview34258
+Node: Users44194
+Node: System Installation45105
+Node: Setting the GUI Locale46797
+Node: Setting the POSIX Locale48173
+Node: Locale Names49112
+Node: Locale Environment Variables51517
+Node: The LANGUAGE variable53730
+Node: Installing Localizations55630
+Node: PO Files56985
+Ref: PO Files-Footnote-169122
+Node: Sources69249
+Node: Importing70475
+Node: Triggering71158
+Node: Preparing Strings74358
+Node: Mark Keywords83401
+Node: Marking87861
+Node: c-format Flag95591
+Node: Special cases99510
+Node: Bug Report Address102253
+Node: Names104218
+Node: Libraries108503
+Node: Template111540
+Node: xgettext Invocation112265
+Node: Creating127823
+Node: msginit Invocation128708
+Node: Header Entry131610
+Node: Updating140573
+Node: msgmerge Invocation140788
+Node: Editing146578
+Node: KBabel146936
+Node: Gtranslator147074
+Node: PO Mode147216
+Node: Installation148870
+Node: Main PO Commands150834
+Node: Entry Positioning155922
+Node: Normalizing161390
+Node: Translated Entries165884
+Node: Fuzzy Entries167242
+Node: Untranslated Entries170423
+Node: Obsolete Entries172355
+Node: Modifying Translations175580
+Node: Modifying Comments183549
+Node: Subedit187976
+Node: C Sources Context191872
+Node: Auxiliary196996
+Node: Compendium200212
+Node: Creating Compendia200827
+Node: Using Compendia203311
+Node: Manipulating204251
+Node: msgcat Invocation208079
+Node: msgconv Invocation212833
+Node: msggrep Invocation216288
+Node: msgfilter Invocation222446
+Node: msguniq Invocation228985
+Node: msgcomm Invocation233150
+Node: msgcmp Invocation237471
+Node: msgattrib Invocation239628
+Node: msgen Invocation244589
+Node: msgexec Invocation248441
+Node: Colorizing251020
+Node: The --color option252049
+Node: The TERM variable253681
+Node: The --style option255133
+Node: Style rules256441
+Node: Customizing less263183
+Node: libgettextpo264586
+Node: Binaries269702
+Node: msgfmt Invocation270046
+Node: msgunfmt Invocation277198
+Node: MO Files281636
+Node: Programmers290214
+Node: catgets291396
+Node: Interface to catgets292810
+Node: Problems with catgets294819
+Node: gettext295734
+Node: Interface to gettext297237
+Node: Ambiguities299567
+Node: Locating Catalogs302282
+Ref: Locating Catalogs-Footnote-1303512
+Ref: Locating Catalogs-Footnote-2303738
+Node: Charset conversion303887
+Node: Contexts306341
+Node: Plural forms311847
+Ref: Plural forms-Footnote-1327784
+Node: Optimized gettext327906
+Node: Comparison329245
+Node: Using libintl.a333515
+Node: gettext grok333958
+Node: Temp Programmers336599
+Node: Temp Implementations337127
+Node: Temp catgets338507
+Node: Temp WSI340208
+Node: Temp Notes342210
+Node: Translators342713
+Node: Trans Intro 0343248
+Node: Trans Intro 1345997
+Node: Discussions347961
+Node: Organization351619
+Node: Central Coordination353695
+Node: National Teams354838
+Node: Sub-Cultures357365
+Node: Organizational Ideas358302
+Node: Mailing Lists359323
+Node: Information Flow361146
+Node: Translating plural forms363400
+Node: Prioritizing messages366769
+Node: Maintainers371076
+Node: Flat and Non-Flat373032
+Node: Prerequisites374525
+Node: gettextize Invocation378682
+Node: Adjusting Files386091
+Node: po/POTFILES.in387880
+Node: po/LINGUAS389129
+Node: po/Makevars390821
+Node: po/Rules-*391763
+Node: configure.ac393234
+Node: config.guess396256
+Node: mkinstalldirs397611
+Node: aclocal398016
+Node: acconfig400030
+Node: config.h.in400530
+Node: Makefile401998
+Node: src/Makefile404595
+Node: lib/gettext.h409316
+Node: autoconf macros411564
+Node: AM_GNU_GETTEXT412406
+Node: AM_GNU_GETTEXT_VERSION416371
+Node: AM_GNU_GETTEXT_NEED416826
+Node: AM_GNU_GETTEXT_INTL_SUBDIR417719
+Node: AM_PO_SUBDIRS418374
+Node: AM_XGETTEXT_OPTION419169
+Node: AM_ICONV420039
+Node: CVS Issues422254
+Node: Distributed CVS422845
+Node: Files under CVS424773
+Node: autopoint Invocation428049
+Node: Release Management429893
+Node: Installers430406
+Node: Programming Languages431633
+Node: Language Implementors432459
+Node: Programmers for other Languages437287
+Node: Translators for other Languages437871
+Node: c-format439568
+Node: objc-format441287
+Node: sh-format441642
+Node: python-format442447
+Node: lisp-format442888
+Node: elisp-format443217
+Node: librep-format443710
+Node: scheme-format444113
+Node: smalltalk-format444392
+Node: java-format444895
+Node: csharp-format445346
+Node: awk-format445724
+Node: object-pascal-format446052
+Node: ycp-format446438
+Node: tcl-format446840
+Node: perl-format447138
+Node: php-format447886
+Node: gcc-internal-format448254
+Node: gfc-internal-format449309
+Node: qt-format450006
+Node: qt-plural-format450447
+Node: kde-format450802
+Node: boost-format451215
+Node: Maintainers for other Languages451763
+Node: List of Programming Languages453001
+Node: C454284
+Node: sh455584
+Node: Preparing Shell Scripts456858
+Node: gettext.sh460250
+Node: gettext Invocation460800
+Node: ngettext Invocation462724
+Node: envsubst Invocation464485
+Node: eval_gettext Invocation465906
+Node: eval_ngettext Invocation466367
+Node: bash466881
+Node: Python468860
+Node: Common Lisp471183
+Node: clisp C471983
+Node: Emacs Lisp472698
+Node: librep473424
+Node: Scheme474159
+Node: Smalltalk474943
+Node: Java475977
+Node: C#481773
+Node: gawk490999
+Node: Pascal491911
+Node: wxWidgets493219
+Node: YCP494126
+Node: Tcl494865
+Node: Perl496275
+Node: General Problems499283
+Node: Default Keywords504771
+Node: Special Keywords505726
+Node: Quote-like Expressions507242
+Node: Interpolation I509520
+Node: Interpolation II513313
+Node: Parentheses515681
+Node: Long Lines517202
+Node: Perl Pitfalls519050
+Node: PHP523295
+Node: Pike524226
+Node: GCC-source524887
+Node: List of Data Formats525634
+Node: POT526103
+Node: RST526361
+Node: Glade526587
+Node: Conclusion526947
+Node: History527453
+Node: References531723
+Node: Language Codes533370
+Node: Usual Language Codes533885
+Node: Rare Language Codes538247
+Node: Country Codes539916
+Node: Licenses545805
+Node: GNU GPL547650
+Node: GNU LGPL566833
+Node: GNU FDL594972
+Node: Program Index617361
+Node: Option Index619247
+Node: Variable Index668348
+Node: PO Mode Index671605
+Node: Autoconf Macro Index685441
+Node: Index686248
 
 End Tag Table
 
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext.texi gettext-0.18.1.1/gettext-tools/doc/gettext.texi
--- gettext-0.19.3/gettext-tools/doc/gettext.texi	2014-06-17 03:13:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext.texi	2010-06-06 12:49:57.000000000 +0000
@@ -79,7 +79,7 @@
 It also serves as a reference for the free Translation Project.
 
 @copying
-Copyright (C) 1995-1998, 2001-2012 Free Software Foundation, Inc.
+Copyright (C) 1995-1998, 2001-2007 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
@@ -114,7 +114,7 @@
 @page
 @vskip 0pt plus 1filll
 @c @insertcopying
-Copyright (C) 1995-1998, 2001-2012 Free Software Foundation, Inc.
+Copyright (C) 1995-1998, 2001-2007 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
@@ -193,10 +193,10 @@
 * Setting the POSIX Locale::    How to Specify the Locale According to POSIX
 * Installing Localizations::    How to Install Additional Translations
 
-Setting the Locale through Environment Variables
+Setting the POSIX Locale
 
 * Locale Names::                How a Locale Specification Looks Like
-* Locale Environment Variables::  Which Environment Variable Specfies What
+* Locale Environment Variables:: Which Environment Variable Specfies What
 * The LANGUAGE variable::       How to Specify a Priority List of Languages
 
 Preparing Program Sources
@@ -341,7 +341,7 @@
 * gettextize Invocation::       Invoking the @code{gettextize} Program
 * Adjusting Files::             Files You Must Create or Alter
 * autoconf macros::             Autoconf macros for use in @file{configure.ac}
-* Version Control Issues::      
+* CVS Issues::                  Integrating with CVS
 * Release Management::          Creating a Distribution Tarball
 
 Files You Must Create or Alter
@@ -367,14 +367,12 @@
 * AM_GNU_GETTEXT_NEED::         AM_GNU_GETTEXT_NEED in @file{gettext.m4}
 * AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4}
 * AM_PO_SUBDIRS::               AM_PO_SUBDIRS in @file{po.m4}
-* AM_XGETTEXT_OPTION::          AM_XGETTEXT_OPTION in @file{po.m4}
 * AM_ICONV::                    AM_ICONV in @file{iconv.m4}
 
-Integrating with Version Control Systems
+Integrating with CVS
 
-* Distributed Development::     Avoiding version mismatch in distributed development
-* Files under Version Control::  Files to put under version control
-* Translations under Version Control::  Put PO Files under Version Control
+* Distributed CVS::             Avoiding version mismatch in distributed development
+* Files under CVS::             Files to put under CVS version control
 * autopoint Invocation::        Invoking the @code{autopoint} Program
 
 Other Programming Languages
@@ -411,8 +409,6 @@
 * qt-plural-format::            Qt Plural Format Strings
 * kde-format::                  KDE Format Strings
 * boost-format::                Boost Format Strings
-* lua-format::                  Lua Format Strings
-* javascript-format::           JavaScript Format Strings
 
 Individual Programming Languages
 
@@ -437,8 +433,6 @@
 * PHP::                         PHP Hypertext Preprocessor
 * Pike::                        Pike
 * GCC-source::                  GNU Compiler Collection sources
-* Lua::                         Lua
-* JavaScript::                  JavaScript
 
 sh - Shell Script
 
@@ -467,7 +461,6 @@
 * POT::                         POT - Portable Object Template
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
-* GSettings::                   GSettings - GNOME user configuration schema
 
 Concluding Remarks
 
@@ -1198,7 +1191,7 @@
 
 @menu
 * Locale Names::                How a Locale Specification Looks Like
-* Locale Environment Variables::  Which Environment Variable Specfies What
+* Locale Environment Variables:: Which Environment Variable Specfies What
 * The LANGUAGE variable::       How to Specify a Priority List of Languages
 @end menu
 
@@ -1223,7 +1216,7 @@
 switched to locales in UTF-8 encoding.  For example, the German locale on
 glibc systems is nowadays @samp{de_DE.UTF-8}.  The older name @samp{de_DE}
 still refers to the German locale as of 2000 that stores characters in
-ISO-8859-1 encoding -- a text encoding that cannot even accommodate the Euro
+ISO-8859-1 encoding -- a text encoding that cannot even accomodate the Euro
 currency sign.
 
 Some locale names use @samp{@var{ll}_@var{CC}.@@@var{variant}} instead of
@@ -1510,12 +1503,6 @@
 @kwindex no-python-format@r{ flag}
 Likewise for Python, see @ref{python-format}.
 
-@item python-brace-format
-@kwindex python-brace-format@r{ flag}
-@itemx no-python-brace-format
-@kwindex no-python-brace-format@r{ flag}
-Likewise for Python brace, see @ref{python-format}.
-
 @item lisp-format
 @kwindex lisp-format@r{ flag}
 @itemx no-lisp-format
@@ -1636,18 +1623,6 @@
 @kwindex no-boost-format@r{ flag}
 Likewise for Boost, see @ref{boost-format}.
 
-@item lua-format
-@kwindex lua-format@r{ flag}
-@itemx no-lua-format
-@kwindex no-lua-format@r{ flag}
-Likewise for Lua, see @ref{lua-format}.
-
-@item javascript-format
-@kwindex javascript-format@r{ flag}
-@itemx no-javascript-format
-@kwindex no-javascript-format@r{ flag}
-Likewise for JavaScript, see @ref{javascript-format}.
-
 @end table
 
 @kwindex msgctxt
@@ -1735,12 +1710,6 @@
 idea of the precise format of a PO file.  On the other hand, those
 wishing to modify PO files by hand should carefully continue reading on.
 
-An empty @var{untranslated-string} is reserved to contain the header
-entry with the meta information (@pxref{Header Entry}).  This header
-entry should be the first entry of the file.  The empty
-@var{untranslated-string} is reserved for this purpose and must
-not be used anywhere else.
-
 Each of @var{untranslated-string} and @var{translated-string} respects
 the C syntax for a character string, including the surrounding quotes
 and embedded backslashed escape sequences.  When the time comes
@@ -2471,13 +2440,13 @@
 This will most probably lead to problems because now the length of the
 string is regarded as the address.
 
-To prevent errors at runtime caused by translations, the @code{msgfmt}
+To prevent errors at runtime caused by translations the @code{msgfmt}
 tool can check statically whether the arguments in the original and the
 translation string match in type and number.  If this is not the case
 and the @samp{-c} option has been passed to @code{msgfmt}, @code{msgfmt}
-will give an error and refuse to produce a MO file.  Thus consistent
+will give an error and refuse to produce a MO file.  Thus consequent
 use of @samp{msgfmt -c} will catch the error, so that it cannot cause
-problems at runtime.
+cause problems at runtime.
 
 @noindent
 If the word order in the above German translation would be correct one
@@ -2490,12 +2459,12 @@
 @noindent
 The routines in @code{msgfmt} know about this special notation.
 
-Because not all strings in a program will be format strings, it is not
+Because not all strings in a program must be format strings it is not
 useful for @code{msgfmt} to test all the strings in the @file{.po} file.
 This might cause problems because the string might contain what looks
 like a format specifier, but the string is not used in @code{printf}.
 
-Therefore @code{xgettext} adds a special tag to those messages it
+Therefore the @code{xgettext} adds a special tag to those messages it
 thinks might be a format string.  There is no absolute rule for this,
 only a heuristic.  In the @file{.po} file the entry is marked using the
 @code{c-format} flag in the @code{#,} comment line (@pxref{PO Files}).
@@ -4624,7 +4593,7 @@
 
 Concatenate the compendium file(s) and the existing PO, merge the
 result with the POT file and remove the obsolete entries (optional,
-here done using @samp{msgattrib}):
+here done using @samp{sed}):
 
 @example
 msgcat --use-first -o update.po compendium1.po compendium2.po file.po
@@ -4787,7 +4756,7 @@
 * Customizing less::            Customizing @code{less} for viewing PO files
 @end menu
 
-@node The --color option, The TERM variable, Colorizing, Colorizing
+@node The --color option, The TERM variable,  , Colorizing
 @subsection The @code{--color} option
 
 @opindex --color@r{, @code{msgcat} option}
@@ -6118,8 +6087,8 @@
 @smallexample
 printf (ngettext ("%d file removed from directory %s",
                   "%d files removed from directory %s",
-                  n),
-        n, dir);
+                  n, dir),
+        n);
 @end smallexample
 
 @noindent
@@ -6132,8 +6101,8 @@
 @smallexample
 printf (ngettext ("%$2d file removed from directory %$1s",
                   "%$2d files removed from directory %$1s",
-                  n),
-        dir, n);
+                  dir, n),
+        n);
 @end smallexample
 
 @noindent
@@ -6399,7 +6368,6 @@
 @item Slavic family
 Russian, @c    143.6 million speakers
 Ukrainian, @c   37.0 million speakers
-Belarusian, @c   8.6 million speakers
 Serbian, @c      7.0 million speakers
 Croatian @c      5.5 million speakers
 @end table
@@ -7047,12 +7015,12 @@
 
 Some people wonder if using GNU @code{gettext} necessarily brings their
 package under the protective wing of the GNU General Public License or
-the GNU Lesser General Public License, when they do not want to make
+the GNU Library General Public License, when they do not want to make
 their program free, or want other kinds of freedom.  The simplest
 answer is ``normally not''.
 
 The @code{gettext-runtime} part of GNU @code{gettext}, i.e.@: the
-contents of @code{libintl}, is covered by the GNU Lesser General Public
+contents of @code{libintl}, is covered by the GNU Library General Public
 License.  The @code{gettext-tools} part of GNU @code{gettext}, i.e.@: the
 rest of the GNU @code{gettext} package, is covered by the GNU General
 Public License.
@@ -7297,7 +7265,7 @@
 or so, taking many weeks or months for bigger packages.  But it does
 not work this way.  I first did all the things I'm responsible for.
 I've nothing against some missionary work on other maintainers, but
-I'm also losing a lot of energy over it---same debates over again.
+I'm also loosing a lot of energy over it---same debates over again.
 
 And when the first localized packages are released we'll get a lot of
 responses about ugly translations :-).  Surely, and we need to have
@@ -7556,7 +7524,7 @@
 * gettextize Invocation::       Invoking the @code{gettextize} Program
 * Adjusting Files::             Files You Must Create or Alter
 * autoconf macros::             Autoconf macros for use in @file{configure.ac}
-* Version Control Issues::      
+* CVS Issues::                  Integrating with CVS
 * Release Management::          Creating a Distribution Tarball
 @end menu
 
@@ -7948,11 +7916,11 @@
 encoding and therefore needs to identify the platform.
 
 You can obtain the newest version of @file{config.guess} and
-@file{config.sub} from the @samp{config} project at
+@file{config.sub} from the CVS of the @samp{config} project at
 @file{http://savannah.gnu.org/}. The commands to fetch them are
 @smallexample
-$ wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-$ wget -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
+$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess'
+$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub'
 @end smallexample
 @noindent
 Less recent versions are also contained in the GNU @code{automake} and
@@ -8021,18 +7989,6 @@
 @noindent
 to your top level @file{Makefile.am}.
 
-If you are using GNU @code{automake} 1.10 or newer, it is even easier:
-Add the line
-
-@example
-ACLOCAL_AMFLAGS = --install -I m4
-@end example
-
-@noindent
-to your top level @file{Makefile.am}, and run @samp{aclocal --install -I m4}.
-This will copy the needed files to the @file{m4/} subdirectory automatically,
-before updating @file{aclocal.m4}.
-
 These macros check for the internationalization support functions
 and related informations.  Hopefully, once stabilized, these macros
 might be integrated in the standard Autoconf set, because this
@@ -8392,7 +8348,7 @@
 Do not install the @code{gettext.h} file in public locations.  Every
 package that needs it should contain a copy of it on its own.
 
-@node autoconf macros, Version Control Issues, Adjusting Files, Maintainers
+@node autoconf macros, CVS Issues, Adjusting Files, Maintainers
 @section Autoconf macros for use in @file{configure.ac}
 @cindex autoconf macros for @code{gettext}
 
@@ -8510,7 +8466,7 @@
 the GNU gettext infrastructure that is used by the package.
 
 The use of this macro is optional; only the @code{autopoint} program makes
-use of it (@pxref{Version Control Issues}).
+use of it (@pxref{CVS Issues}).
 
 @node AM_GNU_GETTEXT_NEED, AM_GNU_GETTEXT_INTL_SUBDIR, AM_GNU_GETTEXT_VERSION, autoconf macros
 @subsection AM_GNU_GETTEXT_NEED in @file{gettext.m4}
@@ -8641,34 +8597,32 @@
 @file{iconv.m4} is distributed with the GNU gettext package because
 @file{gettext.m4} relies on it.
 
-@node Version Control Issues, Release Management, autoconf macros, Maintainers
-@section Integrating with Version Control Systems
+@node CVS Issues, Release Management, autoconf macros, Maintainers
+@section Integrating with CVS
 
-Many projects use version control systems for distributed development
-and source backup.  This section gives some advice how to manage the
-uses of @code{gettextize}, @code{autopoint} and @code{autoconf} on
-version controlled files.
+Many projects use CVS for distributed development, version control and
+source backup.  This section gives some advice how to manage the uses
+of @code{cvs}, @code{gettextize}, @code{autopoint} and @code{autoconf}.
 
 @menu
-* Distributed Development::     Avoiding version mismatch in distributed development
-* Files under Version Control::  Files to put under version control
-* Translations under Version Control::  Put PO Files under Version Control
+* Distributed CVS::             Avoiding version mismatch in distributed development
+* Files under CVS::             Files to put under CVS version control
 * autopoint Invocation::        Invoking the @code{autopoint} Program
 @end menu
 
-@node Distributed Development, Files under Version Control, Version Control Issues, Version Control Issues
+@node Distributed CVS, Files under CVS, CVS Issues, CVS Issues
 @subsection Avoiding version mismatch in distributed development
 
-In a project development with multiple developers, there should be a
-single developer who occasionally - when there is desire to upgrade to
-a new @code{gettext} version - runs @code{gettextize} and performs the
-changes listed in @ref{Adjusting Files}, and then commits his changes
-to the repository.
+In a project development with multiple developers, using CVS, there
+should be a single developer who occasionally - when there is desire to
+upgrade to a new @code{gettext} version - runs @code{gettextize} and
+performs the changes listed in @ref{Adjusting Files}, and then commits
+his changes to the CVS.
 
 It is highly recommended that all developers on a project use the same
 version of GNU @code{gettext} in the package.  In other words, if a
 developer runs @code{gettextize}, he should go the whole way, make the
-necessary remaining changes and commit his changes to the repository.
+necessary remaining changes and commit his changes to the CVS.
 Otherwise the following damages will likely occur:
 
 @itemize @bullet
@@ -8695,14 +8649,14 @@
 undiscovered due to this constellation.
 @end itemize
 
-@node Files under Version Control, Translations under Version Control, Distributed Development, Version Control Issues
-@subsection Files to put under version control
+@node Files under CVS, autopoint Invocation, Distributed CVS, CVS Issues
+@subsection Files to put under CVS version control
 
 There are basically three ways to deal with generated files in the
-context of a version controlled repository, such as @file{configure}
-generated from @file{configure.ac}, @code{@var{parser}.c} generated
-from @code{@var{parser}.y}, or @code{po/Makefile.in.in} autoinstalled
-by @code{gettextize} or @code{autopoint}.
+context of a CVS repository, such as @file{configure} generated from
+@file{configure.ac}, @code{@var{parser}.c} generated from
+@code{@var{parser}.y}, or @code{po/Makefile.in.in} autoinstalled by
+@code{gettextize} or @code{autopoint}.
 
 @enumerate
 @item
@@ -8720,35 +8674,34 @@
 
 @enumerate
 @item
-The advantage is that anyone can check out the source at any moment and
+The advantage is that anyone can check out the CVS at any moment and
 gets a working build.  The drawbacks are:  1a. It requires some frequent
-"push" actions by the maintainers.  1b. The repository grows in size
+"cvs commit" actions by the maintainers.  1b. The repository grows in size
 quite fast.
 
 @item
-The advantage is that anyone can check out the source, and the usual
-"./configure; make" will work.  The drawbacks are: 2a. The one who
-checks out the repository needs tools like GNU @code{automake}, GNU
-@code{autoconf}, GNU @code{m4} installed in his PATH; sometimes he
-even needs particular versions of them.  2b. When a release is made
+The advantage is that anyone can check out the CVS, and the usual
+"./configure; make" will work.  The drawbacks are:  2a. The one who
+checks out the repository needs tools like GNU @code{automake},
+GNU @code{autoconf}, GNU @code{m4} installed in his PATH; sometimes
+he even needs particular versions of them.  2b. When a release is made
 and a commit is made on the generated files, the other developers get
-conflicts on the generated files when merging the local work back to
-the repository.  Although these conflicts are easy to resolve, they
-are annoying.
+conflicts on the generated files after doing "cvs update".  Although
+these conflicts are easy to resolve, they are annoying.
 
 @item
 The advantage is less work for the maintainers.  The drawback is that
-anyone who checks out the source not only needs tools like GNU
-@code{automake}, GNU @code{autoconf}, GNU @code{m4} installed in his
-PATH, but also that he needs to perform a package specific pre-build
-step before being able to "./configure; make".
+anyone who checks out the CVS not only needs tools like GNU @code{automake},
+GNU @code{autoconf}, GNU @code{m4} installed in his PATH, but also that
+he needs to perform a package specific pre-build step before being able
+to "./configure; make".
 @end enumerate
 
 For the first and second approach, all files modified or brought in
 by the occasional @code{gettextize} invocation and update should be
-committed into the repository.
+committed into the CVS.
 
-For the third approach, the maintainer can omit from the repository
+For the third approach, the maintainer can omit from the CVS repository
 all the files that @code{gettextize} mentions as "copy".  Instead, he
 adds to the @file{configure.ac} or @file{configure.in} a line of the
 form
@@ -8759,9 +8712,9 @@
 
 @noindent
 and adds to the package's pre-build script an invocation of
-@samp{autopoint}.  For everyone who checks out the source, this
+@samp{autopoint}.  For everyone who checks out the CVS, this
 @code{autopoint} invocation will copy into the right place the
-@code{gettext} infrastructure files that have been omitted from the repository.
+@code{gettext} infrastructure files that have been omitted from the CVS.
 
 The version number used as argument to @code{AM_GNU_GETTEXT_VERSION} is
 the version of the @code{gettext} infrastructure that the package wants
@@ -8775,61 +8728,12 @@
 use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer
 installed.
 
-@node Translations under Version Control, autopoint Invocation, Files under Version Control, Version Control Issues
-@subsection Put PO Files under Version Control
-
-Since translations are valuable assets as well as the source code, it
-would make sense to put them under version control.  The GNU gettext
-infrastructure supports two ways to deal with translations in the
-context of a version controlled repository.
-
-@enumerate
-@item
-Both POT file and PO files are committed into the repository.
-
-@item
-Only PO files are committed into the repository.
-
-@end enumerate
-
-If a POT file is absent when building, it will be generated by
-scanning the source files with @code{xgettext}, and then the PO files
-are regenerated as a dependency.  On the other hand, some maintainers
-want to keep the POT file unchanged during the development phase.  So,
-even if a POT file is present and older than the source code, it won't
-be updated automatically.  You can manually update it with @code{make
-$(DOMAIN).pot-update}, and commit it at certain point.
-
-Special advices for particular version control systems:
-
-@itemize @bullet
-@item
-Recent version control systems, Git for instance, ignore file's
-timestamp.  In that case, PO files can be accidentally updated even if
-a POT file is not updated.  To prevent this, you can set
-@samp{PO_DEPENDS_ON_POT} variable to @code{no} in the @file{Makevars}
-file and do @code{make update-po} manually.
-
-@item
-Location comments such as @code{#: lib/error.c:116} are sometimes
-annoying, since these comments are volatile and may introduce unwanted
-change to the working copy when building.  To mitigate this, you can
-decide to omit those comments from the PO files in the repository.
-
-This is possible with the @code{--no-location} option of the
-@code{msgmerge} command @footnote{you can also use it through the
-@samp{MSGMERGE_OPTIONS} option from @file{Makevars}}.  The drawback is
-that, if the location information is needed, translators have to
-recover the location comments by running @code{msgmerge} again.
-
-@end itemize
-
-@node autopoint Invocation,  , Translations under Version Control, Version Control Issues
+@node autopoint Invocation,  , Files under CVS, CVS Issues
 @subsection Invoking the @code{autopoint} Program
 
 @include autopoint.texi
 
-@node Release Management,  , Version Control Issues, Maintainers
+@node Release Management,  , CVS Issues, Maintainers
 @section Creating a Distribution Tarball
 
 @cindex release
@@ -8855,7 +8759,7 @@
 @cindex setting up @code{gettext} at build time
 
 By default, packages fully using GNU @code{gettext}, internally,
-are installed in such a way as to allow translation of
+are installed in such a way that they to allow translation of
 messages.  At @emph{configuration} time, those packages should
 automatically detect whether the underlying host system already provides
 the GNU @code{gettext} functions.  If not,
@@ -9042,8 +8946,6 @@
 * qt-plural-format::            Qt Plural Format Strings
 * kde-format::                  KDE Format Strings
 * boost-format::                Boost Format Strings
-* lua-format::                  Lua Format Strings
-* javascript-format::           JavaScript Format Strings
 @end menu
 
 @node c-format, objc-format, Translators for other Languages, Translators for other Languages
@@ -9120,12 +9022,7 @@
 @node python-format, lisp-format, sh-format, Translators for other Languages
 @subsection Python Format Strings
 
-There are two kinds of format strings in Python: those acceptable to
-the Python built-in format operator @code{%}, labelled as
-@samp{python-format}, and those acceptable to the @code{format} method
-of the @samp{str} object.
-
-Python @code{%} format strings are described in
+Python format strings are described in
 @w{Python Library reference} /
 @w{2. Built-in Types, Exceptions and Functions} /
 @w{2.2. Built-in Types} /
@@ -9133,9 +9030,6 @@
 @w{2.2.6.2. String Formatting Operations}.
 @uref{http://www.python.org/doc/2.2.1/lib/typesseq-strings.html}.
 
-Python brace format strings are described in @w{PEP 3101 -- Advanced
-String Formatting}, @uref{http://www.python.org/dev/peps/pep-3101/}.
-
 @node lisp-format, elisp-format, python-format, Translators for other Languages
 @subsection Lisp Format Strings
 
@@ -9297,7 +9191,7 @@
 If a @samp{%n} occurs in a format strings, all of @samp{%1}, ..., @samp{%(n-1)}
 must occur as well, except possibly one of them.
 
-@node boost-format, lua-format, kde-format, Translators for other Languages
+@node boost-format,  , kde-format, Translators for other Languages
 @subsection Boost Format Strings
 
 Boost format strings are described in the documentation of the
@@ -9308,27 +9202,6 @@
 @samp{%|1$+5d|} or @samp{%|1$+5|}, or consists of just an argument number
 between percent signs, such as @samp{%1%}.
 
-@node lua-format, javascript-format, boost-format, Translators for other Languages
-@subsection Lua Format Strings
-
-Lua format strings are described in the Lua reference manual, section @w{String Manipulation},
-@uref{http://www.lua.org/manual/5.1/manual.html#pdf-string.format}.
-
-@node javascript-format,  , lua-format, Translators for other Languages
-@subsection JavaScript Format Strings
-
-Although JavaScript specification itself does not define any format
-strings, many JavaScript implementations provide printf-like
-functions.  @code{xgettext} understands a set of common format strings
-used in popular JavaScript implementations including Gjs, Seed, and
-Node.JS.  In such a format string, a directive starts with @samp{%}
-and is finished by a specifier: @samp{%} denotes a literal percent
-sign, @samp{c} denotes a character, @samp{s} denotes a string,
-@samp{b}, @samp{d}, @samp{o}, @samp{x}, @samp{X} denote an integer,
-@samp{f} denotes floating-point number, @samp{j} denotes a JSON
-object.
-
-
 @node Maintainers for other Languages, List of Programming Languages, Translators for other Languages, Programming Languages
 @section The Maintainer's View
 
@@ -9432,8 +9305,6 @@
 * PHP::                         PHP Hypertext Preprocessor
 * Pike::                        Pike
 * GCC-source::                  GNU Compiler Collection sources
-* Lua::                         Lua
-* JavaScript::                  JavaScript
 @end menu
 
 @node C, sh, List of Programming Languages, List of Programming Languages
@@ -10088,7 +9959,7 @@
 @code{"abc"}
 
 @item gettext shorthand
-@code{(_ "abc")}, @code{_"abc"} (GIMP script-fu extension)
+@code{(_ "abc")}
 
 @item gettext/ngettext functions
 @code{gettext}, @code{ngettext}
@@ -10925,7 +10796,7 @@
 perl
 
 @item File extension
-@code{pl}, @code{PL}, @code{pm}, @code{perl}, @code{cgi}
+@code{pl}, @code{PL}, @code{pm}, @code{cgi}
 
 @item String syntax
 @itemize @bullet
@@ -11030,7 +10901,7 @@
 * Perl Pitfalls::               Bugs, Pitfalls, and Things That Do Not Work
 @end menu
 
-@node General Problems, Default Keywords, Perl, Perl
+@node General Problems, Default Keywords,  , Perl
 @subsubsection General Problems Parsing Perl Code
 
 It is often heard that only Perl can parse Perl.  This is not true.
@@ -11845,7 +11716,7 @@
 ---
 @end table
 
-@node GCC-source, Lua, Pike, List of Programming Languages
+@node GCC-source,  , Pike, List of Programming Languages
 @subsection GNU Compiler Collection sources
 @cindex GCC-source
 
@@ -11894,122 +11765,6 @@
 yes
 @end table
 
-@node Lua, JavaScript, GCC-source, List of Programming Languages
-@subsection Lua
-
-@table @asis
-@item RPMs
-lua
-
-@item File extension
-@code{lua}
-
-@item String syntax
-@itemize @bullet
-
-@item @code{"abc"}
-
-@item @code{'abc'}
-
-@item @code{[[abc]]}
-
-@item @code{[=[abc]=]}
-
-@item @code{[==[abc]==]}
-
-@item ...
-
-@end itemize
-
-@item gettext shorthand
-@code{_("abc")}
-
-@item gettext/ngettext functions
-@code{gettext.gettext}, @code{gettext.dgettext}, @code{gettext.dcgettext},
-@code{gettext.ngettext}, @code{gettext.dngettext}, @code{gettext.dcngettext}
-
-@item textdomain
-@code{textdomain} function
-
-@item bindtextdomain
-@code{bindtextdomain} function
-
-@item setlocale
-automatic
-
-@item Prerequisite
-@code{require 'gettext'} or running lua interpreter with @code{-l gettext} option
-
-@item Use or emulate GNU gettext
-use
-
-@item Extractor
-@code{xgettext}
-
-@item Formatting with positions
----
-
-@item Portability
-On platforms without gettext, the functions are not available.
-
-@item po-mode marking
----
-@end table
-
-@node JavaScript,  , Lua, List of Programming Languages
-@subsection JavaScript
-
-@table @asis
-@item RPMs
-js
-
-@item File extension
-@code{js}
-
-@item String syntax
-@itemize @bullet
-
-@item @code{"abc"}
-
-@item @code{'abc'}
-
-@end itemize
-
-@item gettext shorthand
-@code{_("abc")}
-
-@item gettext/ngettext functions
-@code{gettext}, @code{dgettext}, @code{dcgettext}, @code{ngettext},
-@code{dngettext}
-
-@item textdomain
-@code{textdomain} function
-
-@item bindtextdomain
-@code{bindtextdomain} function
-
-@item setlocale
-automatic
-
-@item Prerequisite
----
-
-@item Use or emulate GNU gettext
-use, or emulate
-
-@item Extractor
-@code{xgettext}
-
-@item Formatting with positions
----
-
-@item Portability
-On platforms without gettext, the functions are not available.
-
-@item po-mode marking
----
-@end table
-
 @c This is the template for new languages.
 @ignore
 
@@ -12058,7 +11813,6 @@
 * POT::                         POT - Portable Object Template
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
-* GSettings::                   GSettings - GNOME user configuration schema
 @end menu
 
 @node POT, RST, List of Data Formats, List of Data Formats
@@ -12090,7 +11844,7 @@
 @code{xgettext}, @code{rstconv}
 @end table
 
-@node Glade, GSettings, RST, List of Data Formats
+@node Glade,  , RST, List of Data Formats
 @subsection Glade - GNOME user interface description
 
 @table @asis
@@ -12098,26 +11852,12 @@
 glade, libglade, glade2, libglade2, intltool
 
 @item File extension
-@code{glade}, @code{glade2}, @code{ui}
+@code{glade}, @code{glade2}
 
 @item Extractor
 @code{xgettext}, @code{libglade-xgettext}, @code{xml-i18n-extract}, @code{intltool-extract}
 @end table
 
-@node GSettings,  , Glade, List of Data Formats
-@subsection GSettings - GNOME user configuration schema
-
-@table @asis
-@item RPMs
-glib2
-
-@item File extension
-@code{gschema.xml}
-
-@item Extractor
-@code{xgettext}, @code{intltool-extract}
-@end table
-
 @c This is the template for new data formats.
 @ignore
 
@@ -12334,7 +12074,7 @@
 @itemize @bullet
 @item
 The @code{libintl} and @code{libasprintf} libraries are covered by the
-GNU Lesser General Public License (LGPL).  
+GNU Library General Public License (LGPL).  
 A copy of the license is included in @ref{GNU LGPL}.
 
 @item
@@ -12369,22 +12109,10 @@
 @end menu
 
 @page
-@node GNU GPL
-@appendixsec GNU GENERAL PUBLIC LICENSE
-@cindex GPL, GNU General Public License
-@cindex License, GNU GPL
 @include gpl.texi
 @page
-@node GNU LGPL
-@appendixsec GNU LESSER GENERAL PUBLIC LICENSE
-@cindex LGPL, GNU Lesser General Public License
-@cindex License, GNU LGPL
 @include lgpl.texi
 @page
-@node GNU FDL
-@appendixsec GNU Free Documentation License
-@cindex FDL, GNU Free Documentation License
-@cindex License, GNU FDL
 @include fdl.texi
 
 @node Program Index, Option Index, Licenses, Top
diff -Nru gettext-0.19.3/gettext-tools/doc/gettext_toc.html gettext-0.18.1.1/gettext-tools/doc/gettext_toc.html
--- gettext-0.19.3/gettext-tools/doc/gettext_toc.html	2014-10-16 06:02:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gettext_toc.html	2010-06-06 18:36:29.000000000 +0000
@@ -1,15 +1,15 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 16 October 2014 -->
+     from gettext.texi on 6 June 2010 -->
 
 <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.3</H1>
+<H1>GNU gettext tools, version 0.18.1</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.19.3, 17 June 2014</H2>
+<H2>Edition 0.18.1, 6 June 2010</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -236,230 +236,234 @@
 <LI><A NAME="TOC161" HREF="gettext_10.html#SEC161">10.1.4  Output file location in Java mode</A>
 <LI><A NAME="TOC162" HREF="gettext_10.html#SEC162">10.1.5  Output file location in C# mode</A>
 <LI><A NAME="TOC163" HREF="gettext_10.html#SEC163">10.1.6  Output file location in Tcl mode</A>
-<LI><A NAME="TOC164" HREF="gettext_10.html#SEC164">10.1.7  Desktop Entry mode operations</A>
-<LI><A NAME="TOC165" HREF="gettext_10.html#SEC165">10.1.8  Input file syntax</A>
-<LI><A NAME="TOC166" HREF="gettext_10.html#SEC166">10.1.9  Input file interpretation</A>
-<LI><A NAME="TOC167" HREF="gettext_10.html#SEC167">10.1.10  Output details</A>
-<LI><A NAME="TOC168" HREF="gettext_10.html#SEC168">10.1.11  Informative output</A>
-</UL>
-<LI><A NAME="TOC169" HREF="gettext_10.html#SEC169">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A>
-<UL>
-<LI><A NAME="TOC170" HREF="gettext_10.html#SEC170">10.2.1  Operation mode</A>
-<LI><A NAME="TOC171" HREF="gettext_10.html#SEC171">10.2.2  Input file location</A>
-<LI><A NAME="TOC172" HREF="gettext_10.html#SEC172">10.2.3  Input file location in Java mode</A>
-<LI><A NAME="TOC173" HREF="gettext_10.html#SEC173">10.2.4  Input file location in C# mode</A>
-<LI><A NAME="TOC174" HREF="gettext_10.html#SEC174">10.2.5  Input file location in Tcl mode</A>
-<LI><A NAME="TOC175" HREF="gettext_10.html#SEC175">10.2.6  Output file location</A>
-<LI><A NAME="TOC176" HREF="gettext_10.html#SEC176">10.2.7  Output details</A>
-<LI><A NAME="TOC177" HREF="gettext_10.html#SEC177">10.2.8  Informative output</A>
-</UL>
-<LI><A NAME="TOC178" HREF="gettext_10.html#SEC178">10.3  The Format of GNU MO Files</A>
-</UL>
-<LI><A NAME="TOC179" HREF="gettext_11.html#SEC179">11  The Programmer's View</A>
-<UL>
-<LI><A NAME="TOC180" HREF="gettext_11.html#SEC180">11.1  About <CODE>catgets</CODE></A>
-<UL>
-<LI><A NAME="TOC181" HREF="gettext_11.html#SEC181">11.1.1  The Interface</A>
-<LI><A NAME="TOC182" HREF="gettext_11.html#SEC182">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A>
-</UL>
-<LI><A NAME="TOC183" HREF="gettext_11.html#SEC183">11.2  About <CODE>gettext</CODE></A>
-<UL>
-<LI><A NAME="TOC184" HREF="gettext_11.html#SEC184">11.2.1  The Interface</A>
-<LI><A NAME="TOC185" HREF="gettext_11.html#SEC185">11.2.2  Solving Ambiguities</A>
-<LI><A NAME="TOC186" HREF="gettext_11.html#SEC186">11.2.3  Locating Message Catalog Files</A>
-<LI><A NAME="TOC187" HREF="gettext_11.html#SEC187">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>
-<LI><A NAME="TOC188" HREF="gettext_11.html#SEC188">11.2.5  Using contexts for solving ambiguities</A>
-<LI><A NAME="TOC189" HREF="gettext_11.html#SEC189">11.2.6  Additional functions for plural forms</A>
-<LI><A NAME="TOC190" HREF="gettext_11.html#SEC190">11.2.7  Optimization of the *gettext functions</A>
-</UL>
-<LI><A NAME="TOC191" HREF="gettext_11.html#SEC191">11.3  Comparing the Two Interfaces</A>
-<LI><A NAME="TOC192" HREF="gettext_11.html#SEC192">11.4  Using libintl.a in own programs</A>
-<LI><A NAME="TOC193" HREF="gettext_11.html#SEC193">11.5  Being a <CODE>gettext</CODE> grok</A>
-<LI><A NAME="TOC194" HREF="gettext_11.html#SEC194">11.6  Temporary Notes for the Programmers Chapter</A>
-<UL>
-<LI><A NAME="TOC195" HREF="gettext_11.html#SEC195">11.6.1  Temporary - Two Possible Implementations</A>
-<LI><A NAME="TOC196" HREF="gettext_11.html#SEC196">11.6.2  Temporary - About <CODE>catgets</CODE></A>
-<LI><A NAME="TOC197" HREF="gettext_11.html#SEC197">11.6.3  Temporary - Why a single implementation</A>
-<LI><A NAME="TOC198" HREF="gettext_11.html#SEC198">11.6.4  Temporary - Notes</A>
-</UL>
-</UL>
-<LI><A NAME="TOC199" HREF="gettext_12.html#SEC199">12  The Translator's View</A>
-<UL>
-<LI><A NAME="TOC200" HREF="gettext_12.html#SEC200">12.1  Introduction 0</A>
-<LI><A NAME="TOC201" HREF="gettext_12.html#SEC201">12.2  Introduction 1</A>
-<LI><A NAME="TOC202" HREF="gettext_12.html#SEC202">12.3  Discussions</A>
-<LI><A NAME="TOC203" HREF="gettext_12.html#SEC203">12.4  Organization</A>
-<UL>
-<LI><A NAME="TOC204" HREF="gettext_12.html#SEC204">12.4.1  Central Coordination</A>
-<LI><A NAME="TOC205" HREF="gettext_12.html#SEC205">12.4.2  National Teams</A>
-<UL>
-<LI><A NAME="TOC206" HREF="gettext_12.html#SEC206">12.4.2.1  Sub-Cultures</A>
-<LI><A NAME="TOC207" HREF="gettext_12.html#SEC207">12.4.2.2  Organizational Ideas</A>
-</UL>
-<LI><A NAME="TOC208" HREF="gettext_12.html#SEC208">12.4.3  Mailing Lists</A>
-</UL>
-<LI><A NAME="TOC209" HREF="gettext_12.html#SEC209">12.5  Information Flow</A>
-<LI><A NAME="TOC210" HREF="gettext_12.html#SEC210">12.6  Translating plural forms</A>
-<LI><A NAME="TOC211" HREF="gettext_12.html#SEC211">12.7  Prioritizing messages: How to determine which messages to translate first</A>
-</UL>
-<LI><A NAME="TOC212" HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>
-<UL>
-<LI><A NAME="TOC213" HREF="gettext_13.html#SEC213">13.1  Flat or Non-Flat Directory Structures</A>
-<LI><A NAME="TOC214" HREF="gettext_13.html#SEC214">13.2  Prerequisite Works</A>
-<LI><A NAME="TOC215" HREF="gettext_13.html#SEC215">13.3  Invoking the <CODE>gettextize</CODE> Program</A>
-<LI><A NAME="TOC216" HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A>
-<UL>
-<LI><A NAME="TOC217" HREF="gettext_13.html#SEC217">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC218" HREF="gettext_13.html#SEC218">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC219" HREF="gettext_13.html#SEC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC220" HREF="gettext_13.html#SEC220">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC221" HREF="gettext_13.html#SEC221">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC222" HREF="gettext_13.html#SEC222">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC223" HREF="gettext_13.html#SEC223">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC224" HREF="gettext_13.html#SEC224">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC225" HREF="gettext_13.html#SEC225">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC226" HREF="gettext_13.html#SEC226">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC227" HREF="gettext_13.html#SEC227">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC228" HREF="gettext_13.html#SEC228">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A>
-<LI><A NAME="TOC229" HREF="gettext_13.html#SEC229">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A>
-</UL>
-<LI><A NAME="TOC230" HREF="gettext_13.html#SEC230">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A>
-<UL>
-<LI><A NAME="TOC231" HREF="gettext_13.html#SEC231">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
-<LI><A NAME="TOC232" HREF="gettext_13.html#SEC232">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
-<LI><A NAME="TOC233" HREF="gettext_13.html#SEC233">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
-<LI><A NAME="TOC234" HREF="gettext_13.html#SEC234">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A>
-<LI><A NAME="TOC235" HREF="gettext_13.html#SEC235">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A>
-<LI><A NAME="TOC236" HREF="gettext_13.html#SEC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>
-<LI><A NAME="TOC237" HREF="gettext_13.html#SEC237">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A>
-</UL>
-<LI><A NAME="TOC238" HREF="gettext_13.html#SEC238">13.6  Integrating with Version Control Systems</A>
-<UL>
-<LI><A NAME="TOC239" HREF="gettext_13.html#SEC239">13.6.1  Avoiding version mismatch in distributed development</A>
-<LI><A NAME="TOC240" HREF="gettext_13.html#SEC240">13.6.2  Files to put under version control</A>
-<LI><A NAME="TOC241" HREF="gettext_13.html#SEC241">13.6.3  Put PO Files under Version Control</A>
-<LI><A NAME="TOC242" HREF="gettext_13.html#SEC242">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A>
-<UL>
-<LI><A NAME="TOC243" HREF="gettext_13.html#SEC243">13.6.4.1  Options</A>
-<LI><A NAME="TOC244" HREF="gettext_13.html#SEC244">13.6.4.2  Informative output</A>
-</UL>
-</UL>
-<LI><A NAME="TOC245" HREF="gettext_13.html#SEC245">13.7  Creating a Distribution Tarball</A>
-</UL>
-<LI><A NAME="TOC246" HREF="gettext_14.html#SEC246">14  The Installer's and Distributor's View</A>
-<LI><A NAME="TOC247" HREF="gettext_15.html#SEC247">15  Other Programming Languages</A>
-<UL>
-<LI><A NAME="TOC248" HREF="gettext_15.html#SEC248">15.1  The Language Implementor's View</A>
-<LI><A NAME="TOC249" HREF="gettext_15.html#SEC249">15.2  The Programmer's View</A>
-<LI><A NAME="TOC250" HREF="gettext_15.html#SEC250">15.3  The Translator's View</A>
-<UL>
-<LI><A NAME="TOC251" HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A>
-<LI><A NAME="TOC252" HREF="gettext_15.html#SEC252">15.3.2  Objective C Format Strings</A>
-<LI><A NAME="TOC253" HREF="gettext_15.html#SEC253">15.3.3  Shell Format Strings</A>
-<LI><A NAME="TOC254" HREF="gettext_15.html#SEC254">15.3.4  Python Format Strings</A>
-<LI><A NAME="TOC255" HREF="gettext_15.html#SEC255">15.3.5  Lisp Format Strings</A>
-<LI><A NAME="TOC256" HREF="gettext_15.html#SEC256">15.3.6  Emacs Lisp Format Strings</A>
-<LI><A NAME="TOC257" HREF="gettext_15.html#SEC257">15.3.7  librep Format Strings</A>
-<LI><A NAME="TOC258" HREF="gettext_15.html#SEC258">15.3.8  Scheme Format Strings</A>
-<LI><A NAME="TOC259" HREF="gettext_15.html#SEC259">15.3.9  Smalltalk Format Strings</A>
-<LI><A NAME="TOC260" HREF="gettext_15.html#SEC260">15.3.10  Java Format Strings</A>
-<LI><A NAME="TOC261" HREF="gettext_15.html#SEC261">15.3.11  C# Format Strings</A>
-<LI><A NAME="TOC262" HREF="gettext_15.html#SEC262">15.3.12  awk Format Strings</A>
-<LI><A NAME="TOC263" HREF="gettext_15.html#SEC263">15.3.13  Object Pascal Format Strings</A>
-<LI><A NAME="TOC264" HREF="gettext_15.html#SEC264">15.3.14  YCP Format Strings</A>
-<LI><A NAME="TOC265" HREF="gettext_15.html#SEC265">15.3.15  Tcl Format Strings</A>
-<LI><A NAME="TOC266" HREF="gettext_15.html#SEC266">15.3.16  Perl Format Strings</A>
-<LI><A NAME="TOC267" HREF="gettext_15.html#SEC267">15.3.17  PHP Format Strings</A>
-<LI><A NAME="TOC268" HREF="gettext_15.html#SEC268">15.3.18  GCC internal Format Strings</A>
-<LI><A NAME="TOC269" HREF="gettext_15.html#SEC269">15.3.19  GFC internal Format Strings</A>
-<LI><A NAME="TOC270" HREF="gettext_15.html#SEC270">15.3.20  Qt Format Strings</A>
-<LI><A NAME="TOC271" HREF="gettext_15.html#SEC271">15.3.21  Qt Format Strings</A>
-<LI><A NAME="TOC272" HREF="gettext_15.html#SEC272">15.3.22  KDE Format Strings</A>
-<LI><A NAME="TOC273" HREF="gettext_15.html#SEC273">15.3.23  Boost Format Strings</A>
-<LI><A NAME="TOC274" HREF="gettext_15.html#SEC274">15.3.24  Lua Format Strings</A>
-<LI><A NAME="TOC275" HREF="gettext_15.html#SEC275">15.3.25  JavaScript Format Strings</A>
-</UL>
-<LI><A NAME="TOC276" HREF="gettext_15.html#SEC276">15.4  The Maintainer's View</A>
-<LI><A NAME="TOC277" HREF="gettext_15.html#SEC277">15.5  Individual Programming Languages</A>
-<UL>
-<LI><A NAME="TOC278" HREF="gettext_15.html#SEC278">15.5.1  C, C++, Objective C</A>
-<LI><A NAME="TOC279" HREF="gettext_15.html#SEC279">15.5.2  sh - Shell Script</A>
-<UL>
-<LI><A NAME="TOC280" HREF="gettext_15.html#SEC280">15.5.2.1  Preparing Shell Scripts for Internationalization</A>
-<LI><A NAME="TOC281" HREF="gettext_15.html#SEC281">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A>
-<LI><A NAME="TOC282" HREF="gettext_15.html#SEC282">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A>
-<LI><A NAME="TOC283" HREF="gettext_15.html#SEC283">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A>
-<LI><A NAME="TOC284" HREF="gettext_15.html#SEC284">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A>
-<LI><A NAME="TOC285" HREF="gettext_15.html#SEC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>
-<LI><A NAME="TOC286" HREF="gettext_15.html#SEC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>
-</UL>
-<LI><A NAME="TOC287" HREF="gettext_15.html#SEC287">15.5.3  bash - Bourne-Again Shell Script</A>
-<LI><A NAME="TOC288" HREF="gettext_15.html#SEC288">15.5.4  Python</A>
-<LI><A NAME="TOC289" HREF="gettext_15.html#SEC289">15.5.5  GNU clisp - Common Lisp</A>
-<LI><A NAME="TOC290" HREF="gettext_15.html#SEC290">15.5.6  GNU clisp C sources</A>
-<LI><A NAME="TOC291" HREF="gettext_15.html#SEC291">15.5.7  Emacs Lisp</A>
-<LI><A NAME="TOC292" HREF="gettext_15.html#SEC292">15.5.8  librep</A>
-<LI><A NAME="TOC293" HREF="gettext_15.html#SEC293">15.5.9  GNU guile - Scheme</A>
-<LI><A NAME="TOC294" HREF="gettext_15.html#SEC294">15.5.10  GNU Smalltalk</A>
-<LI><A NAME="TOC295" HREF="gettext_15.html#SEC295">15.5.11  Java</A>
-<LI><A NAME="TOC296" HREF="gettext_15.html#SEC296">15.5.12  C#</A>
-<LI><A NAME="TOC297" HREF="gettext_15.html#SEC297">15.5.13  GNU awk</A>
-<LI><A NAME="TOC298" HREF="gettext_15.html#SEC298">15.5.14  Pascal - Free Pascal Compiler</A>
-<LI><A NAME="TOC299" HREF="gettext_15.html#SEC299">15.5.15  wxWidgets library</A>
-<LI><A NAME="TOC300" HREF="gettext_15.html#SEC300">15.5.16  YCP - YaST2 scripting language</A>
-<LI><A NAME="TOC301" HREF="gettext_15.html#SEC301">15.5.17  Tcl - Tk's scripting language</A>
-<LI><A NAME="TOC302" HREF="gettext_15.html#SEC302">15.5.18  Perl</A>
-<UL>
-<LI><A NAME="TOC303" HREF="gettext_15.html#SEC303">15.5.18.1  General Problems Parsing Perl Code</A>
-<LI><A NAME="TOC304" HREF="gettext_15.html#SEC304">15.5.18.2  Which keywords will xgettext look for?</A>
-<LI><A NAME="TOC305" HREF="gettext_15.html#SEC305">15.5.18.3  How to Extract Hash Keys</A>
-<LI><A NAME="TOC306" HREF="gettext_15.html#SEC306">15.5.18.4  What are Strings And Quote-like Expressions?</A>
-<LI><A NAME="TOC307" HREF="gettext_15.html#SEC307">15.5.18.5  Invalid Uses Of String Interpolation</A>
-<LI><A NAME="TOC308" HREF="gettext_15.html#SEC308">15.5.18.6  Valid Uses Of String Interpolation</A>
-<LI><A NAME="TOC309" HREF="gettext_15.html#SEC309">15.5.18.7  When To Use Parentheses</A>
-<LI><A NAME="TOC310" HREF="gettext_15.html#SEC310">15.5.18.8  How To Grok with Long Lines</A>
-<LI><A NAME="TOC311" HREF="gettext_15.html#SEC311">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A>
-</UL>
-<LI><A NAME="TOC312" HREF="gettext_15.html#SEC312">15.5.19  PHP Hypertext Preprocessor</A>
-<LI><A NAME="TOC313" HREF="gettext_15.html#SEC313">15.5.20  Pike</A>
-<LI><A NAME="TOC314" HREF="gettext_15.html#SEC314">15.5.21  GNU Compiler Collection sources</A>
-<LI><A NAME="TOC315" HREF="gettext_15.html#SEC315">15.5.22  Lua</A>
-<LI><A NAME="TOC316" HREF="gettext_15.html#SEC316">15.5.23  JavaScript</A>
-</UL>
-<LI><A NAME="TOC317" HREF="gettext_15.html#SEC317">15.6  Internationalizable Data</A>
-<UL>
-<LI><A NAME="TOC318" HREF="gettext_15.html#SEC318">15.6.1  POT - Portable Object Template</A>
-<LI><A NAME="TOC319" HREF="gettext_15.html#SEC319">15.6.2  Resource String Table</A>
-<LI><A NAME="TOC320" HREF="gettext_15.html#SEC320">15.6.3  Glade - GNOME user interface description</A>
-<LI><A NAME="TOC321" HREF="gettext_15.html#SEC321">15.6.4  GSettings - GNOME user configuration schema</A>
-</UL>
-</UL>
-<LI><A NAME="TOC322" HREF="gettext_16.html#SEC322">16  Concluding Remarks</A>
-<UL>
-<LI><A NAME="TOC323" HREF="gettext_16.html#SEC323">16.1  History of GNU <CODE>gettext</CODE></A>
-<LI><A NAME="TOC324" HREF="gettext_16.html#SEC324">16.2  Related Readings</A>
-</UL>
-<LI><A NAME="TOC325" HREF="gettext_17.html#SEC325">A  Language Codes</A>
-<UL>
-<LI><A NAME="TOC326" HREF="gettext_17.html#SEC326">A.1  Usual Language Codes</A>
-<LI><A NAME="TOC327" HREF="gettext_17.html#SEC327">A.2  Rare Language Codes</A>
-</UL>
-<LI><A NAME="TOC328" HREF="gettext_18.html#SEC328">B  Country Codes</A>
-<LI><A NAME="TOC329" HREF="gettext_19.html#SEC329">C  Licenses</A>
-<UL>
-<LI><A NAME="TOC330" HREF="gettext_19.html#SEC330">C.1  GNU GENERAL PUBLIC LICENSE</A>
-<LI><A NAME="TOC331" HREF="gettext_19.html#SEC331">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>
-<LI><A NAME="TOC332" HREF="gettext_19.html#SEC332">C.3  GNU Free Documentation License</A>
-</UL>
-<LI><A NAME="TOC333" HREF="gettext_20.html#SEC333">Program Index</A>
-<LI><A NAME="TOC334" HREF="gettext_21.html#SEC334">Option Index</A>
-<LI><A NAME="TOC335" HREF="gettext_22.html#SEC335">Variable Index</A>
-<LI><A NAME="TOC336" HREF="gettext_23.html#SEC336">PO Mode Index</A>
-<LI><A NAME="TOC337" HREF="gettext_24.html#SEC337">Autoconf Macro Index</A>
-<LI><A NAME="TOC338" HREF="gettext_25.html#SEC338">General Index</A>
+<LI><A NAME="TOC164" HREF="gettext_10.html#SEC164">10.1.7  Input file syntax</A>
+<LI><A NAME="TOC165" HREF="gettext_10.html#SEC165">10.1.8  Input file interpretation</A>
+<LI><A NAME="TOC166" HREF="gettext_10.html#SEC166">10.1.9  Output details</A>
+<LI><A NAME="TOC167" HREF="gettext_10.html#SEC167">10.1.10  Informative output</A>
+</UL>
+<LI><A NAME="TOC168" HREF="gettext_10.html#SEC168">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A>
+<UL>
+<LI><A NAME="TOC169" HREF="gettext_10.html#SEC169">10.2.1  Operation mode</A>
+<LI><A NAME="TOC170" HREF="gettext_10.html#SEC170">10.2.2  Input file location</A>
+<LI><A NAME="TOC171" HREF="gettext_10.html#SEC171">10.2.3  Input file location in Java mode</A>
+<LI><A NAME="TOC172" HREF="gettext_10.html#SEC172">10.2.4  Input file location in C# mode</A>
+<LI><A NAME="TOC173" HREF="gettext_10.html#SEC173">10.2.5  Input file location in Tcl mode</A>
+<LI><A NAME="TOC174" HREF="gettext_10.html#SEC174">10.2.6  Output file location</A>
+<LI><A NAME="TOC175" HREF="gettext_10.html#SEC175">10.2.7  Output details</A>
+<LI><A NAME="TOC176" HREF="gettext_10.html#SEC176">10.2.8  Informative output</A>
+</UL>
+<LI><A NAME="TOC177" HREF="gettext_10.html#SEC177">10.3  The Format of GNU MO Files</A>
+</UL>
+<LI><A NAME="TOC178" HREF="gettext_11.html#SEC178">11  The Programmer's View</A>
+<UL>
+<LI><A NAME="TOC179" HREF="gettext_11.html#SEC179">11.1  About <CODE>catgets</CODE></A>
+<UL>
+<LI><A NAME="TOC180" HREF="gettext_11.html#SEC180">11.1.1  The Interface</A>
+<LI><A NAME="TOC181" HREF="gettext_11.html#SEC181">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A>
+</UL>
+<LI><A NAME="TOC182" HREF="gettext_11.html#SEC182">11.2  About <CODE>gettext</CODE></A>
+<UL>
+<LI><A NAME="TOC183" HREF="gettext_11.html#SEC183">11.2.1  The Interface</A>
+<LI><A NAME="TOC184" HREF="gettext_11.html#SEC184">11.2.2  Solving Ambiguities</A>
+<LI><A NAME="TOC185" HREF="gettext_11.html#SEC185">11.2.3  Locating Message Catalog Files</A>
+<LI><A NAME="TOC186" HREF="gettext_11.html#SEC186">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>
+<LI><A NAME="TOC187" HREF="gettext_11.html#SEC187">11.2.5  Using contexts for solving ambiguities</A>
+<LI><A NAME="TOC188" HREF="gettext_11.html#SEC188">11.2.6  Additional functions for plural forms</A>
+<LI><A NAME="TOC189" HREF="gettext_11.html#SEC189">11.2.7  Optimization of the *gettext functions</A>
+</UL>
+<LI><A NAME="TOC190" HREF="gettext_11.html#SEC190">11.3  Comparing the Two Interfaces</A>
+<LI><A NAME="TOC191" HREF="gettext_11.html#SEC191">11.4  Using libintl.a in own programs</A>
+<LI><A NAME="TOC192" HREF="gettext_11.html#SEC192">11.5  Being a <CODE>gettext</CODE> grok</A>
+<LI><A NAME="TOC193" HREF="gettext_11.html#SEC193">11.6  Temporary Notes for the Programmers Chapter</A>
+<UL>
+<LI><A NAME="TOC194" HREF="gettext_11.html#SEC194">11.6.1  Temporary - Two Possible Implementations</A>
+<LI><A NAME="TOC195" HREF="gettext_11.html#SEC195">11.6.2  Temporary - About <CODE>catgets</CODE></A>
+<LI><A NAME="TOC196" HREF="gettext_11.html#SEC196">11.6.3  Temporary - Why a single implementation</A>
+<LI><A NAME="TOC197" HREF="gettext_11.html#SEC197">11.6.4  Temporary - Notes</A>
+</UL>
+</UL>
+<LI><A NAME="TOC198" HREF="gettext_12.html#SEC198">12  The Translator's View</A>
+<UL>
+<LI><A NAME="TOC199" HREF="gettext_12.html#SEC199">12.1  Introduction 0</A>
+<LI><A NAME="TOC200" HREF="gettext_12.html#SEC200">12.2  Introduction 1</A>
+<LI><A NAME="TOC201" HREF="gettext_12.html#SEC201">12.3  Discussions</A>
+<LI><A NAME="TOC202" HREF="gettext_12.html#SEC202">12.4  Organization</A>
+<UL>
+<LI><A NAME="TOC203" HREF="gettext_12.html#SEC203">12.4.1  Central Coordination</A>
+<LI><A NAME="TOC204" HREF="gettext_12.html#SEC204">12.4.2  National Teams</A>
+<UL>
+<LI><A NAME="TOC205" HREF="gettext_12.html#SEC205">12.4.2.1  Sub-Cultures</A>
+<LI><A NAME="TOC206" HREF="gettext_12.html#SEC206">12.4.2.2  Organizational Ideas</A>
+</UL>
+<LI><A NAME="TOC207" HREF="gettext_12.html#SEC207">12.4.3  Mailing Lists</A>
+</UL>
+<LI><A NAME="TOC208" HREF="gettext_12.html#SEC208">12.5  Information Flow</A>
+<LI><A NAME="TOC209" HREF="gettext_12.html#SEC209">12.6  Translating plural forms</A>
+<LI><A NAME="TOC210" HREF="gettext_12.html#SEC210">12.7  Prioritizing messages: How to determine which messages to translate first</A>
+</UL>
+<LI><A NAME="TOC211" HREF="gettext_13.html#SEC211">13  The Maintainer's View</A>
+<UL>
+<LI><A NAME="TOC212" HREF="gettext_13.html#SEC212">13.1  Flat or Non-Flat Directory Structures</A>
+<LI><A NAME="TOC213" HREF="gettext_13.html#SEC213">13.2  Prerequisite Works</A>
+<LI><A NAME="TOC214" HREF="gettext_13.html#SEC214">13.3  Invoking the <CODE>gettextize</CODE> Program</A>
+<LI><A NAME="TOC215" HREF="gettext_13.html#SEC215">13.4  Files You Must Create or Alter</A>
+<UL>
+<LI><A NAME="TOC216" HREF="gettext_13.html#SEC216">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC217" HREF="gettext_13.html#SEC217">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC218" HREF="gettext_13.html#SEC218">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC219" HREF="gettext_13.html#SEC219">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC220" HREF="gettext_13.html#SEC220">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC221" HREF="gettext_13.html#SEC221">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC222" HREF="gettext_13.html#SEC222">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC223" HREF="gettext_13.html#SEC223">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC224" HREF="gettext_13.html#SEC224">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC225" HREF="gettext_13.html#SEC225">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC226" HREF="gettext_13.html#SEC226">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC227" HREF="gettext_13.html#SEC227">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A>
+<LI><A NAME="TOC228" HREF="gettext_13.html#SEC228">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A>
+</UL>
+<LI><A NAME="TOC229" HREF="gettext_13.html#SEC229">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A>
+<UL>
+<LI><A NAME="TOC230" HREF="gettext_13.html#SEC230">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
+<LI><A NAME="TOC231" HREF="gettext_13.html#SEC231">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
+<LI><A NAME="TOC232" HREF="gettext_13.html#SEC232">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
+<LI><A NAME="TOC233" HREF="gettext_13.html#SEC233">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A>
+<LI><A NAME="TOC234" HREF="gettext_13.html#SEC234">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A>
+<LI><A NAME="TOC235" HREF="gettext_13.html#SEC235">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>
+<LI><A NAME="TOC236" HREF="gettext_13.html#SEC236">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A>
+</UL>
+<LI><A NAME="TOC237" HREF="gettext_13.html#SEC237">13.6  Integrating with CVS</A>
+<UL>
+<LI><A NAME="TOC238" HREF="gettext_13.html#SEC238">13.6.1  Avoiding version mismatch in distributed development</A>
+<LI><A NAME="TOC239" HREF="gettext_13.html#SEC239">13.6.2  Files to put under CVS version control</A>
+<LI><A NAME="TOC240" HREF="gettext_13.html#SEC240">13.6.3  Invoking the <CODE>autopoint</CODE> Program</A>
+<UL>
+<LI><A NAME="TOC241" HREF="gettext_13.html#SEC241">13.6.3.1  Options</A>
+<LI><A NAME="TOC242" HREF="gettext_13.html#SEC242">13.6.3.2  Informative output</A>
+</UL>
+</UL>
+<LI><A NAME="TOC243" HREF="gettext_13.html#SEC243">13.7  Creating a Distribution Tarball</A>
+</UL>
+<LI><A NAME="TOC244" HREF="gettext_14.html#SEC244">14  The Installer's and Distributor's View</A>
+<LI><A NAME="TOC245" HREF="gettext_15.html#SEC245">15  Other Programming Languages</A>
+<UL>
+<LI><A NAME="TOC246" HREF="gettext_15.html#SEC246">15.1  The Language Implementor's View</A>
+<LI><A NAME="TOC247" HREF="gettext_15.html#SEC247">15.2  The Programmer's View</A>
+<LI><A NAME="TOC248" HREF="gettext_15.html#SEC248">15.3  The Translator's View</A>
+<UL>
+<LI><A NAME="TOC249" HREF="gettext_15.html#SEC249">15.3.1  C Format Strings</A>
+<LI><A NAME="TOC250" HREF="gettext_15.html#SEC250">15.3.2  Objective C Format Strings</A>
+<LI><A NAME="TOC251" HREF="gettext_15.html#SEC251">15.3.3  Shell Format Strings</A>
+<LI><A NAME="TOC252" HREF="gettext_15.html#SEC252">15.3.4  Python Format Strings</A>
+<LI><A NAME="TOC253" HREF="gettext_15.html#SEC253">15.3.5  Lisp Format Strings</A>
+<LI><A NAME="TOC254" HREF="gettext_15.html#SEC254">15.3.6  Emacs Lisp Format Strings</A>
+<LI><A NAME="TOC255" HREF="gettext_15.html#SEC255">15.3.7  librep Format Strings</A>
+<LI><A NAME="TOC256" HREF="gettext_15.html#SEC256">15.3.8  Scheme Format Strings</A>
+<LI><A NAME="TOC257" HREF="gettext_15.html#SEC257">15.3.9  Smalltalk Format Strings</A>
+<LI><A NAME="TOC258" HREF="gettext_15.html#SEC258">15.3.10  Java Format Strings</A>
+<LI><A NAME="TOC259" HREF="gettext_15.html#SEC259">15.3.11  C# Format Strings</A>
+<LI><A NAME="TOC260" HREF="gettext_15.html#SEC260">15.3.12  awk Format Strings</A>
+<LI><A NAME="TOC261" HREF="gettext_15.html#SEC261">15.3.13  Object Pascal Format Strings</A>
+<LI><A NAME="TOC262" HREF="gettext_15.html#SEC262">15.3.14  YCP Format Strings</A>
+<LI><A NAME="TOC263" HREF="gettext_15.html#SEC263">15.3.15  Tcl Format Strings</A>
+<LI><A NAME="TOC264" HREF="gettext_15.html#SEC264">15.3.16  Perl Format Strings</A>
+<LI><A NAME="TOC265" HREF="gettext_15.html#SEC265">15.3.17  PHP Format Strings</A>
+<LI><A NAME="TOC266" HREF="gettext_15.html#SEC266">15.3.18  GCC internal Format Strings</A>
+<LI><A NAME="TOC267" HREF="gettext_15.html#SEC267">15.3.19  GFC internal Format Strings</A>
+<LI><A NAME="TOC268" HREF="gettext_15.html#SEC268">15.3.20  Qt Format Strings</A>
+<LI><A NAME="TOC269" HREF="gettext_15.html#SEC269">15.3.21  Qt Format Strings</A>
+<LI><A NAME="TOC270" HREF="gettext_15.html#SEC270">15.3.22  KDE Format Strings</A>
+<LI><A NAME="TOC271" HREF="gettext_15.html#SEC271">15.3.23  Boost Format Strings</A>
+</UL>
+<LI><A NAME="TOC272" HREF="gettext_15.html#SEC272">15.4  The Maintainer's View</A>
+<LI><A NAME="TOC273" HREF="gettext_15.html#SEC273">15.5  Individual Programming Languages</A>
+<UL>
+<LI><A NAME="TOC274" HREF="gettext_15.html#SEC274">15.5.1  C, C++, Objective C</A>
+<LI><A NAME="TOC275" HREF="gettext_15.html#SEC275">15.5.2  sh - Shell Script</A>
+<UL>
+<LI><A NAME="TOC276" HREF="gettext_15.html#SEC276">15.5.2.1  Preparing Shell Scripts for Internationalization</A>
+<LI><A NAME="TOC277" HREF="gettext_15.html#SEC277">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A>
+<LI><A NAME="TOC278" HREF="gettext_15.html#SEC278">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A>
+<LI><A NAME="TOC279" HREF="gettext_15.html#SEC279">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A>
+<LI><A NAME="TOC280" HREF="gettext_15.html#SEC280">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A>
+<LI><A NAME="TOC281" HREF="gettext_15.html#SEC281">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>
+<LI><A NAME="TOC282" HREF="gettext_15.html#SEC282">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>
+</UL>
+<LI><A NAME="TOC283" HREF="gettext_15.html#SEC283">15.5.3  bash - Bourne-Again Shell Script</A>
+<LI><A NAME="TOC284" HREF="gettext_15.html#SEC284">15.5.4  Python</A>
+<LI><A NAME="TOC285" HREF="gettext_15.html#SEC285">15.5.5  GNU clisp - Common Lisp</A>
+<LI><A NAME="TOC286" HREF="gettext_15.html#SEC286">15.5.6  GNU clisp C sources</A>
+<LI><A NAME="TOC287" HREF="gettext_15.html#SEC287">15.5.7  Emacs Lisp</A>
+<LI><A NAME="TOC288" HREF="gettext_15.html#SEC288">15.5.8  librep</A>
+<LI><A NAME="TOC289" HREF="gettext_15.html#SEC289">15.5.9  GNU guile - Scheme</A>
+<LI><A NAME="TOC290" HREF="gettext_15.html#SEC290">15.5.10  GNU Smalltalk</A>
+<LI><A NAME="TOC291" HREF="gettext_15.html#SEC291">15.5.11  Java</A>
+<LI><A NAME="TOC292" HREF="gettext_15.html#SEC292">15.5.12  C#</A>
+<LI><A NAME="TOC293" HREF="gettext_15.html#SEC293">15.5.13  GNU awk</A>
+<LI><A NAME="TOC294" HREF="gettext_15.html#SEC294">15.5.14  Pascal - Free Pascal Compiler</A>
+<LI><A NAME="TOC295" HREF="gettext_15.html#SEC295">15.5.15  wxWidgets library</A>
+<LI><A NAME="TOC296" HREF="gettext_15.html#SEC296">15.5.16  YCP - YaST2 scripting language</A>
+<LI><A NAME="TOC297" HREF="gettext_15.html#SEC297">15.5.17  Tcl - Tk's scripting language</A>
+<LI><A NAME="TOC298" HREF="gettext_15.html#SEC298">15.5.18  Perl</A>
+<UL>
+<LI><A NAME="TOC299" HREF="gettext_15.html#SEC299">15.5.18.1  General Problems Parsing Perl Code</A>
+<LI><A NAME="TOC300" HREF="gettext_15.html#SEC300">15.5.18.2  Which keywords will xgettext look for?</A>
+<LI><A NAME="TOC301" HREF="gettext_15.html#SEC301">15.5.18.3  How to Extract Hash Keys</A>
+<LI><A NAME="TOC302" HREF="gettext_15.html#SEC302">15.5.18.4  What are Strings And Quote-like Expressions?</A>
+<LI><A NAME="TOC303" HREF="gettext_15.html#SEC303">15.5.18.5  Invalid Uses Of String Interpolation</A>
+<LI><A NAME="TOC304" HREF="gettext_15.html#SEC304">15.5.18.6  Valid Uses Of String Interpolation</A>
+<LI><A NAME="TOC305" HREF="gettext_15.html#SEC305">15.5.18.7  When To Use Parentheses</A>
+<LI><A NAME="TOC306" HREF="gettext_15.html#SEC306">15.5.18.8  How To Grok with Long Lines</A>
+<LI><A NAME="TOC307" HREF="gettext_15.html#SEC307">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A>
+</UL>
+<LI><A NAME="TOC308" HREF="gettext_15.html#SEC308">15.5.19  PHP Hypertext Preprocessor</A>
+<LI><A NAME="TOC309" HREF="gettext_15.html#SEC309">15.5.20  Pike</A>
+<LI><A NAME="TOC310" HREF="gettext_15.html#SEC310">15.5.21  GNU Compiler Collection sources</A>
+</UL>
+<LI><A NAME="TOC311" HREF="gettext_15.html#SEC311">15.6  Internationalizable Data</A>
+<UL>
+<LI><A NAME="TOC312" HREF="gettext_15.html#SEC312">15.6.1  POT - Portable Object Template</A>
+<LI><A NAME="TOC313" HREF="gettext_15.html#SEC313">15.6.2  Resource String Table</A>
+<LI><A NAME="TOC314" HREF="gettext_15.html#SEC314">15.6.3  Glade - GNOME user interface description</A>
+</UL>
+</UL>
+<LI><A NAME="TOC315" HREF="gettext_16.html#SEC315">16  Concluding Remarks</A>
+<UL>
+<LI><A NAME="TOC316" HREF="gettext_16.html#SEC316">16.1  History of GNU <CODE>gettext</CODE></A>
+<LI><A NAME="TOC317" HREF="gettext_16.html#SEC317">16.2  Related Readings</A>
+</UL>
+<LI><A NAME="TOC318" HREF="gettext_17.html#SEC318">A  Language Codes</A>
+<UL>
+<LI><A NAME="TOC319" HREF="gettext_17.html#SEC319">A.1  Usual Language Codes</A>
+<LI><A NAME="TOC320" HREF="gettext_17.html#SEC320">A.2  Rare Language Codes</A>
+</UL>
+<LI><A NAME="TOC321" HREF="gettext_18.html#SEC321">B  Country Codes</A>
+<LI><A NAME="TOC322" HREF="gettext_19.html#SEC322">C  Licenses</A>
+<UL>
+<LI><A NAME="TOC323" HREF="gettext_19.html#SEC323">C.1  GNU GENERAL PUBLIC LICENSE</A>
+<UL>
+<LI><A NAME="TOC324" HREF="gettext_19.html#SEC324">Preamble</A>
+<LI><A NAME="TOC325" HREF="gettext_19.html#SEC325">Appendix: How to Apply These Terms to Your New Programs</A>
+</UL>
+<LI><A NAME="TOC326" HREF="gettext_19.html#SEC326">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>
+<UL>
+<LI><A NAME="TOC327" HREF="gettext_19.html#SEC327">Preamble</A>
+<LI><A NAME="TOC328" HREF="gettext_19.html#SEC328">How to Apply These Terms to Your New Libraries</A>
+</UL>
+<LI><A NAME="TOC329" HREF="gettext_19.html#SEC329">C.3  GNU Free Documentation License</A>
+<UL>
+<LI><A NAME="TOC330" HREF="gettext_19.html#SEC330">ADDENDUM: How to use this License for your documents</A>
+</UL>
+</UL>
+<LI><A NAME="TOC331" HREF="gettext_20.html#SEC331">Program Index</A>
+<LI><A NAME="TOC332" HREF="gettext_21.html#SEC332">Option Index</A>
+<LI><A NAME="TOC333" HREF="gettext_22.html#SEC333">Variable Index</A>
+<LI><A NAME="TOC334" HREF="gettext_23.html#SEC334">PO Mode Index</A>
+<LI><A NAME="TOC335" HREF="gettext_24.html#SEC335">Autoconf Macro Index</A>
+<LI><A NAME="TOC336" HREF="gettext_25.html#SEC336">General Index</A>
 </UL>
 <P><HR><P>
-This document was generated on 16 October 2014 using the
+This document was generated on 6 June 2010 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52b.</P>
 </BODY>
diff -Nru gettext-0.19.3/gettext-tools/doc/gpl.texi gettext-0.18.1.1/gettext-tools/doc/gpl.texi
--- gettext-0.19.3/gettext-tools/doc/gpl.texi	2014-06-17 03:13:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/gpl.texi	2010-06-06 12:49:57.000000000 +0000
@@ -1,8 +1,10 @@
-@c The GNU General Public License.
+@node GNU GPL
+@appendixsec GNU GENERAL PUBLIC LICENSE
+@cindex GPL, GNU General Public License
+@cindex License, GNU GPL
 @center Version 2, June 1991
 
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
+@c This file is intended to be included in another file.
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
@@ -12,7 +14,7 @@
 of this license document, but changing it is not allowed.
 @end display
 
-@heading Preamble
+@unnumberedsubsec Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -21,7 +23,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -62,7 +64,13 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-@heading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@iftex
+@unnumberedsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end iftex
+@ifinfo
+@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+@end ifinfo
 
 @enumerate 0
 @item
@@ -322,7 +330,7 @@
 @end ifinfo
 
 @page
-@heading Appendix: How to Apply These Terms to Your New Programs
+@unnumberedsubsec Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -358,7 +366,7 @@
 when it starts in an interactive mode:
 
 @smallexample
-Gnomovision version 69, Copyright (C) @var{year} @var{name of author}
+Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type `show c' for details.
@@ -385,5 +393,5 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
diff -Nru gettext-0.19.3/gettext-tools/doc/ISO_3166 gettext-0.18.1.1/gettext-tools/doc/ISO_3166
--- gettext-0.19.3/gettext-tools/doc/ISO_3166	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/ISO_3166	2010-06-06 12:49:57.000000000 +0000
@@ -16,30 +16,28 @@
 # Columns are separated by a single tab.
 # The table is sorted by country code.
 #
-# Lines beginning with '#' are comments.
-#
-# Updated from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-# 2014-02-10 by Daiki Ueno
+# Lines beginning with `#' are comments.
 #
 #country-
 #code	country name
 AD	Andorra
 AE	United Arab Emirates
 AF	Afghanistan
-AG	Antigua and Barbuda
+AG	Antigua & Barbuda
 AI	Anguilla
 AL	Albania
 AM	Armenia
+AN	Netherlands Antilles
 AO	Angola
 AQ	Antarctica
 AR	Argentina
-AS	American Samoa
+AS	Samoa (American)
 AT	Austria
 AU	Australia
 AW	Aruba
 AX	Åland Islands
 AZ	Azerbaijan
-BA	Bosnia and Herzegovina
+BA	Bosnia & Herzegovina
 BB	Barbados
 BD	Bangladesh
 BE	Belgium
@@ -48,11 +46,9 @@
 BH	Bahrain
 BI	Burundi
 BJ	Benin
-BL	Saint Barthélemy
 BM	Bermuda
-BN	Brunei Darussalam
-BO	Bolivia, Plurinational State of
-BQ	Bonaire, Sint Eustatius and Saba
+BN	Brunei
+BO	Bolivia
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -62,9 +58,9 @@
 BZ	Belize
 CA	Canada
 CC	Cocos (Keeling) Islands
-CD	Congo, The Democratic Republic of the
+CD	Congo (Dem. Rep.)
 CF	Central African Republic
-CG	Congo
+CG	Congo (Rep.)
 CH	Switzerland
 CI	Côte d'Ivoire
 CK	Cook Islands
@@ -75,7 +71,6 @@
 CR	Costa Rica
 CU	Cuba
 CV	Cape Verde
-CW	Curaçao
 CX	Christmas Island
 CY	Cyprus
 CZ	Czech Republic
@@ -94,12 +89,12 @@
 ET	Ethiopia
 FI	Finland
 FJ	Fiji
-FK	Falkland Islands (Malvinas)
-FM	Micronesia, Federated States of
-FO	Faroe Islands
+FK	Falkland Islands
+FM	Micronesia
+FO	Faeroe Islands
 FR	France
 GA	Gabon
-GB	United Kingdom
+GB	Britain (United Kingdom)
 GD	Grenada
 GE	Georgia
 GF	French Guiana
@@ -112,13 +107,13 @@
 GP	Guadeloupe
 GQ	Equatorial Guinea
 GR	Greece
-GS	South Georgia and the South Sandwich Islands
+GS	South Georgia & the South Sandwich Islands
 GT	Guatemala
 GU	Guam
 GW	Guinea-Bissau
 GY	Guyana
 HK	Hong Kong
-HM	Heard Island and McDonald Islands
+HM	Heard Island & McDonald Islands
 HN	Honduras
 HR	Croatia
 HT	Haiti
@@ -130,7 +125,7 @@
 IN	India
 IO	British Indian Ocean Territory
 IQ	Iraq
-IR	Iran, Islamic Republic of
+IR	Iran
 IS	Iceland
 IT	Italy
 JE	Jersey
@@ -142,15 +137,15 @@
 KH	Cambodia
 KI	Kiribati
 KM	Comoros
-KN	Saint Kitts and Nevis
-KP	Korea, Democratic People's Republic of
-KR	Korea, Republic of
+KN	St Kitts & Nevis
+KP	Korea (North)
+KR	Korea (South)
 KW	Kuwait
 KY	Cayman Islands
 KZ	Kazakhstan
-LA	Lao People's Democratic Republic
+LA	Laos
 LB	Lebanon
-LC	Saint Lucia
+LC	St Lucia
 LI	Liechtenstein
 LK	Sri Lanka
 LR	Liberia
@@ -161,14 +156,13 @@
 LY	Libya
 MA	Morocco
 MC	Monaco
-MD	Moldova, Republic of
+MD	Moldova
 ME	Montenegro
-MF	Saint Martin (French part)
 MG	Madagascar
 MH	Marshall Islands
-MK	Macedonia, The Former Yugoslav Republic of
+MK	Macedonia
 ML	Mali
-MM	Myanmar
+MM	Myanmar (Burma)
 MN	Mongolia
 MO	Macao
 MP	Northern Mariana Islands
@@ -202,10 +196,10 @@
 PH	Philippines
 PK	Pakistan
 PL	Poland
-PM	Saint Pierre and Miquelon
+PM	St Pierre & Miquelon
 PN	Pitcairn
 PR	Puerto Rico
-PS	Palestine, State of
+PS	Palestine
 PT	Portugal
 PW	Palau
 PY	Paraguay
@@ -213,7 +207,7 @@
 RE	Réunion
 RO	Romania
 RS	Serbia
-RU	Russian Federation
+RU	Russia
 RW	Rwanda
 SA	Saudi Arabia
 SB	Solomon Islands
@@ -221,24 +215,22 @@
 SD	Sudan
 SE	Sweden
 SG	Singapore
-SH	Saint Helena, Ascension and Tristan da Cunha
+SH	St Helena
 SI	Slovenia
-SJ	Svalbard and Jan Mayen
+SJ	Svalbard & Jan Mayen
 SK	Slovakia
 SL	Sierra Leone
 SM	San Marino
 SN	Senegal
 SO	Somalia
 SR	Suriname
-SS	South Sudan
-ST	Sao Tome and Principe
+ST	Sao Tome & Principe
 SV	El Salvador
-SX	Sint Maarten (Dutch part)
-SY	Syrian Arab Republic
+SY	Syria
 SZ	Swaziland
-TC	Turks and Caicos Islands
+TC	Turks & Caicos Islands
 TD	Chad
-TF	French Southern Territories
+TF	French Southern & Antarctic Lands
 TG	Togo
 TH	Thailand
 TJ	Tajikistan
@@ -248,25 +240,25 @@
 TN	Tunisia
 TO	Tonga
 TR	Turkey
-TT	Trinidad and Tobago
+TT	Trinidad & Tobago
 TV	Tuvalu
-TW	Taiwan, Province of China
-TZ	Tanzania, United Republic of
+TW	Taiwan
+TZ	Tanzania
 UA	Ukraine
 UG	Uganda
-UM	United States Minor Outlying Islands
+UM	US minor outlying islands
 US	United States
 UY	Uruguay
 UZ	Uzbekistan
-VA	Holy See (Vatican City State)
-VC	Saint Vincent and the Grenadines
-VE	Venezuela, Bolivarian Republic of
-VG	Virgin Islands, British
-VI	Virgin Islands, U.S.
-VN	Viet Nam
+VA	Vatican City
+VC	St Vincent & the Grenadines
+VE	Venezuela
+VG	Virgin Islands (UK)
+VI	Virgin Islands (US)
+VN	Vietnam
 VU	Vanuatu
-WF	Wallis and Futuna
-WS	Samoa
+WF	Wallis & Futuna
+WS	Samoa (Western)
 YE	Yemen
 YT	Mayotte
 ZA	South Africa
diff -Nru gettext-0.19.3/gettext-tools/doc/ISO_3166_de gettext-0.18.1.1/gettext-tools/doc/ISO_3166_de
--- gettext-0.19.3/gettext-tools/doc/ISO_3166_de	2014-02-10 08:10:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/ISO_3166_de	2010-06-06 12:49:57.000000000 +0000
@@ -10,7 +10,7 @@
 # Columns are separated by a single tab.
 # The table is sorted by 2-letter country code.
 #
-# Lines beginning with '#' are comments.
+# Lines beginning with `#' are comments.
 #
 AD	AND	Andorra
 AE	ARE	Vereinigte Arabische Emirate
diff -Nru gettext-0.19.3/gettext-tools/doc/iso-3166.texi gettext-0.18.1.1/gettext-tools/doc/iso-3166.texi
--- gettext-0.19.3/gettext-tools/doc/iso-3166.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/iso-3166.texi	2010-06-06 12:49:57.000000000 +0000
@@ -12,6 +12,8 @@
 Albania.
 @item AM
 Armenia.
+@item AN
+Netherlands Antilles.
 @item AO
 Angola.
 @item AQ
@@ -19,7 +21,7 @@
 @item AR
 Argentina.
 @item AS
-American Samoa.
+Samoa (American).
 @item AT
 Austria.
 @item AU
@@ -48,16 +50,12 @@
 Burundi.
 @item BJ
 Benin.
-@item BL
-Saint Barthelemy.
 @item BM
 Bermuda.
 @item BN
-Brunei Darussalam.
+Brunei.
 @item BO
-Bolivia, Plurinational State of.
-@item BQ
-Bonaire, Sint Eustatius and Saba.
+Bolivia.
 @item BR
 Brazil.
 @item BS
@@ -77,11 +75,11 @@
 @item CC
 Cocos (Keeling) Islands.
 @item CD
-Congo, The Democratic Republic of the.
+Congo (Dem. Rep.).
 @item CF
 Central African Republic.
 @item CG
-Congo.
+Congo (Rep.).
 @item CH
 Switzerland.
 @item CI
@@ -102,8 +100,6 @@
 Cuba.
 @item CV
 Cape Verde.
-@item CW
-Curaçao.
 @item CX
 Christmas Island.
 @item CY
@@ -141,17 +137,17 @@
 @item FJ
 Fiji.
 @item FK
-Falkland Islands (Malvinas).
+Falkland Islands.
 @item FM
-Micronesia, Federated States of.
+Micronesia.
 @item FO
-Faroe Islands.
+Faeroe Islands.
 @item FR
 France.
 @item GA
 Gabon.
 @item GB
-United Kingdom.
+Britain (United Kingdom).
 @item GD
 Grenada.
 @item GE
@@ -213,7 +209,7 @@
 @item IQ
 Iraq.
 @item IR
-Iran, Islamic Republic of.
+Iran.
 @item IS
 Iceland.
 @item IT
@@ -237,11 +233,11 @@
 @item KM
 Comoros.
 @item KN
-Saint Kitts and Nevis.
+St Kitts and Nevis.
 @item KP
-Korea, Democratic People's Republic of.
+Korea (North).
 @item KR
-Korea, Republic of.
+Korea (South).
 @item KW
 Kuwait.
 @item KY
@@ -249,11 +245,11 @@
 @item KZ
 Kazakhstan.
 @item LA
-Lao People's Democratic Republic.
+Laos.
 @item LB
 Lebanon.
 @item LC
-Saint Lucia.
+St Lucia.
 @item LI
 Liechtenstein.
 @item LK
@@ -275,21 +271,19 @@
 @item MC
 Monaco.
 @item MD
-Moldova, Republic of.
+Moldova.
 @item ME
 Montenegro.
-@item MF
-Saint Martin (French part).
 @item MG
 Madagascar.
 @item MH
 Marshall Islands.
 @item MK
-Macedonia, The Former Yugoslav Republic of.
+Macedonia.
 @item ML
 Mali.
 @item MM
-Myanmar.
+Myanmar (Burma).
 @item MN
 Mongolia.
 @item MO
@@ -357,13 +351,13 @@
 @item PL
 Poland.
 @item PM
-Saint Pierre and Miquelon.
+St Pierre and Miquelon.
 @item PN
 Pitcairn.
 @item PR
 Puerto Rico.
 @item PS
-Palestine, State of.
+Palestine.
 @item PT
 Portugal.
 @item PW
@@ -379,7 +373,7 @@
 @item RS
 Serbia.
 @item RU
-Russian Federation.
+Russia.
 @item RW
 Rwanda.
 @item SA
@@ -395,7 +389,7 @@
 @item SG
 Singapore.
 @item SH
-Saint Helena, Ascension and Tristan da Cunha.
+St Helena.
 @item SI
 Slovenia.
 @item SJ
@@ -412,16 +406,12 @@
 Somalia.
 @item SR
 Suriname.
-@item SS
-South Sudan.
 @item ST
 Sao Tome and Principe.
 @item SV
 El Salvador.
-@item SX
-Sint Maarten (Dutch part).
 @item SY
-Syrian Arab Republic.
+Syria.
 @item SZ
 Swaziland.
 @item TC
@@ -429,7 +419,7 @@
 @item TD
 Chad.
 @item TF
-French Southern Territories.
+French Southern and Antarctic Lands.
 @item TG
 Togo.
 @item TH
@@ -453,15 +443,15 @@
 @item TV
 Tuvalu.
 @item TW
-Taiwan, Province of China.
+Taiwan.
 @item TZ
-Tanzania, United Republic of.
+Tanzania.
 @item UA
 Ukraine.
 @item UG
 Uganda.
 @item UM
-United States Minor Outlying Islands.
+US minor outlying islands.
 @item US
 United States.
 @item UY
@@ -469,23 +459,23 @@
 @item UZ
 Uzbekistan.
 @item VA
-Holy See (Vatican City State).
+Vatican City.
 @item VC
-Saint Vincent and the Grenadines.
+St Vincent and the Grenadines.
 @item VE
-Venezuela, Bolivarian Republic of.
+Venezuela.
 @item VG
-Virgin Islands, British.
+Virgin Islands (UK).
 @item VI
-Virgin Islands, U.S..
+Virgin Islands (US).
 @item VN
-Viet Nam.
+Vietnam.
 @item VU
 Vanuatu.
 @item WF
 Wallis and Futuna.
 @item WS
-Samoa.
+Samoa (Western).
 @item YE
 Yemen.
 @item YT
diff -Nru gettext-0.19.3/gettext-tools/doc/ISO_639 gettext-0.18.1.1/gettext-tools/doc/ISO_639
--- gettext-0.19.3/gettext-tools/doc/ISO_639	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/ISO_639	2010-06-06 12:49:57.000000000 +0000
@@ -13,8 +13,6 @@
 2004-01-18 by Bruno Haible
 Updated from http://www.loc.gov/standards/iso639-2/index.html
 2008-04-25 by Bruno Haible
-Updated from http://www.loc.gov/standards/iso639-2/index.html
-2014-05-31 by Daiki Ueno
 
 Two-letter lower-case symbols are used.
 The Registration Authority for ISO 639 is Infoterm, Osterreichisches
@@ -36,54 +34,54 @@
 ba Bashkir
 be Belarusian
 bg Bulgarian
-bh Bihari languages
+bh Bihari
 bi Bislama
 bm Bambara
-bn Bengali
+bn Bengali; Bangla
 bo Tibetan
 br Breton
 bs Bosnian
 
-ca Catalan; Valencian
+ca Catalan
 ce Chechen
 ch Chamorro
 co Corsican
 cr Cree
 cs Czech
-cu Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic
+cu Church Slavic
 cv Chuvash
 cy Welsh
 
 da Danish
 de German
-dv Divehi; Dhivehi; Maldivian
-dz Dzongkha
+dv Divehi; Maldivian
+dz Dzongkha; Bhutani
 
-ee Ewe
-el Greek, Modern (1453-)
+ee @'Ew@'e
+el Greek
 en English
 eo Esperanto
-es Spanish; Castilian
+es Spanish
 et Estonian
 eu Basque
 
 fa Persian
 ff Fulah
 fi Finnish
-fj Fijian
+fj Fijian; Fiji
 fo Faroese
 fr French
 fy Western Frisian
 
 ga Irish
-gd Gaelic; Scottish Gaelic
+gd Scottish Gaelic
 gl Galician
 gn Guarani
 gu Gujarati
 gv Manx
 
 ha Hausa
-he Hebrew
+he Hebrew (formerly iw)
 hi Hindi
 ho Hiri Motu
 hr Croatian
@@ -92,12 +90,12 @@
 hy Armenian
 hz Herero
 
-ia Interlingua (International Auxiliary Language Association)
-id Indonesian
+ia Interlingua
+id Indonesian (formerly in)
 ie Interlingue; Occidental
 ig Igbo
 ii Sichuan Yi; Nuosu
-ik Inupiak
+ik Inupiak; Inupiaq
 io Ido
 is Icelandic
 it Italian
@@ -112,7 +110,7 @@
 kj Kuanyama; Kwanyama
 kk Kazakh
 kl Kalaallisut; Greenlandic
-km Central Khmer
+km Central Khmer; Cambodian
 kn Kannada
 ko Korean
 kr Kanuri
@@ -120,17 +118,17 @@
 ku Kurdish
 kv Komi
 kw Cornish
-ky Kirghiz; Kyrgyz
+ky Kirghiz
 
 la Latin
-lb Luxembourgish; Letzeburgesch
+lb Letzeburgesch; Luxembourgish
 lg Ganda
-li Limburgan; Limburger; Limburgish
+li Limburgish; Limburger; Limburgan
 ln Lingala
-lo Lao
+lo Lao; Laotian
 lt Lithuanian
 lu Luba-Katanga
-lv Latvian
+lv Latvian; Lettish
 
 mg Malagasy
 mh Marshallese
@@ -138,40 +136,41 @@
 mk Macedonian
 ml Malayalam
 mn Mongolian
+mo Moldavian
 mr Marathi
 ms Malay
 mt Maltese
 my Burmese
 
 na Nauru
-nb Bokm@aa{}l, Norwegian; Norwegian Bokm@aa{}l
-nd Ndebele, North; North Ndebele
+nb Norwegian Bokm@aa{}l
+nd Ndebele, North
 ne Nepali
 ng Ndonga
-nl Dutch; Flemish
-nn Norwegian Nynorsk; Nynorsk, Norwegian
+nl Dutch
+nn Norwegian Nynorsk
 no Norwegian
-nr Ndebele, South; South Ndebele
+nr Ndebele, South
 nv Navajo; Navaho
 ny Chichewa; Nyanja
 
-oc Occitan (post 1500); Proven@,{c}al
+oc Occitan; Proven@,{c}al
 oj Ojibwa
-om Oromo
+om (Afan) Oromo
 or Oriya
 os Ossetian; Ossetic
 
 pa Panjabi; Punjabi
 pi Pali
 pl Polish
-ps Pushto; Pashto
+ps Pashto; Pushto
 pt Portuguese
 
 qu Quechua
 
 rm Romansh
-rn Rundi
-ro Romanian; Moldavian; Moldovan
+rn Rundi; Kirundi
+ro Romanian
 ru Russian
 rw Kinyarwanda
 
@@ -179,7 +178,7 @@
 sc Sardinian
 sd Sindhi
 se Northern Sami
-sg Sango
+sg Sango; Sangro
 si Sinhala; Sinhalese
 sk Slovak
 sl Slovenian
@@ -188,8 +187,8 @@
 so Somali
 sq Albanian
 sr Serbian
-ss Swati
-st Sotho, Southern
+ss Swati; Siswati
+st Sesotho; Sotho, Southern
 su Sundanese
 sv Swedish
 sw Swahili
@@ -201,31 +200,31 @@
 ti Tigrinya
 tk Turkmen
 tl Tagalog
-tn Tswana
-to Tonga (Tonga Islands)
+tn Tswana; Setswana
+to Tonga
 tr Turkish
 ts Tsonga
 tt Tatar
 tw Twi
 ty Tahitian
 
-ug Uighur; Uyghur
+ug Uighur
 uk Ukrainian
 ur Urdu
 uz Uzbek
 
 ve Venda
 vi Vietnamese
-vo Volap@"{u}k
+vo Volap@"{u}k; Volapuk
 
 wa Walloon
 wo Wolof
 
 xh Xhosa
 
-yi Yiddish
+yi Yiddish (formerly ji)
 yo Yoruba
 
-za Zhuang; Chuang
+za Zhuang
 zh Chinese
 zu Zulu
diff -Nru gettext-0.19.3/gettext-tools/doc/lgpl.texi gettext-0.18.1.1/gettext-tools/doc/lgpl.texi
--- gettext-0.19.3/gettext-tools/doc/lgpl.texi	2014-06-17 03:13:14.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/lgpl.texi	2010-06-06 12:49:57.000000000 +0000
@@ -1,12 +1,12 @@
-@c The GNU Lesser General Public License.
+@node GNU LGPL
+@appendixsec GNU LESSER GENERAL PUBLIC LICENSE
+@cindex LGPL, GNU Lesser General Public License
+@cindex License, GNU LGPL
 @center Version 2.1, February 1999
 
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
 @display
 Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+51 Franklin St -- Fifth Floor, Boston, MA 02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -16,7 +16,7 @@
 version number 2.1.]
 @end display
 
-@subheading Preamble
+@unnumberedsubsec Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -118,7 +118,15 @@
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-@subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@iftex
+@unnumberedsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end iftex
+@ifinfo
+@center GNU LESSER GENERAL PUBLIC LICENSE
+
+@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+@end ifinfo
 
 @enumerate 0
 @item
@@ -470,7 +478,13 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-@center @b{NO WARRANTY}
+@iftex
+@heading NO WARRANTY
+@end iftex
+@ifinfo
+@center NO WARRANTY
+
+@end ifinfo
 
 @item
 BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
@@ -496,10 +510,16 @@
 DAMAGES.
 @end enumerate
 
-@subheading END OF TERMS AND CONDITIONS
+@iftex
+@heading END OF TERMS AND CONDITIONS
+@end iftex
+@ifinfo
+@center END OF TERMS AND CONDITIONS
+
+@end ifinfo
 
 @page
-@subheading How to Apply These Terms to Your New Libraries
+@unnumberedsubsec How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
diff -Nru gettext-0.19.3/gettext-tools/doc/Makefile.am gettext-0.18.1.1/gettext-tools/doc/Makefile.am
--- gettext-0.19.3/gettext-tools/doc/Makefile.am	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -71,7 +71,7 @@
 # The dependencies of stamp-vti generated by automake are incomplete.
 # So we have to duplicate the entire rule which would otherwise be generated
 # by automake.
-$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.version
+$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh
 	(dir=.; test -f ./gettext.texi || dir=$(srcdir); \
 	set `$(SHELL) $(top_srcdir)/../build-aux/mdate-sh $$dir/gettext.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
@@ -118,7 +118,7 @@
 # The install-dvi target is already defined by automake.
 
 installdirs-dvi:
-	$(MKDIR_P) $(DESTDIR)$(dvidir)
+	$(mkdir_p) $(DESTDIR)$(dvidir)
 
 uninstall-dvi:
 	$(RM) $(DESTDIR)$(dvidir)/gettext.dvi
@@ -149,7 +149,7 @@
 # The install-ps target is already defined by automake.
 
 installdirs-ps:
-	$(MKDIR_P) $(DESTDIR)$(psdir)
+	$(mkdir_p) $(DESTDIR)$(psdir)
 
 uninstall-ps:
 	$(RM) $(DESTDIR)$(psdir)/gettext.ps
@@ -164,7 +164,7 @@
 # The install-pdf target is already defined by automake.
 
 installdirs-pdf:
-	$(MKDIR_P) $(DESTDIR)$(pdfdir)
+	$(mkdir_p) $(DESTDIR)$(pdfdir)
 
 uninstall-pdf:
 	$(RM) $(DESTDIR)$(pdfdir)/gettext.pdf
@@ -192,17 +192,17 @@
 	esac
 
 install-html-monolithic: gettext.html
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	$(INSTALL_DATA) `if test -f gettext.html; then echo .; else echo $(srcdir); fi`/gettext.html $(DESTDIR)$(htmldir)/gettext.html
 
 install-html-split: gettext_toc.html
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	for file in `if test -f gettext_toc.html; then echo .; else echo $(srcdir); fi`/gettext_*.html; do \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \
 	done
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html-monolithic:
 	$(RM) $(DESTDIR)$(htmldir)/gettext.html
@@ -211,14 +211,14 @@
 	$(RM) $(DESTDIR)$(htmldir)/gettext_*.html
 
 dist-html-monolithic:
-	$(MKDIR_P) $(distdir)/
+	$(mkdir_p) $(distdir)/
 	file=gettext.html; \
 	if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	cp -p $$d/$$file $(distdir)/$$file || exit 1
 
 # We would like to put gettext_*.html into EXTRA_DIST, but it doesn't work.
 dist-html-split: gettext_toc.html
-	$(MKDIR_P) $(distdir)/
+	$(mkdir_p) $(distdir)/
 	file=gettext_toc.html; \
 	if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	for file in `cd $$d && echo gettext_*.html`; do \
diff -Nru gettext-0.19.3/gettext-tools/doc/Makefile.in gettext-0.18.1.1/gettext-tools/doc/Makefile.in
--- gettext-0.19.3/gettext-tools/doc/Makefile.in	2014-10-16 06:01:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/Makefile.in	2010-06-06 20:12:28.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,54 +16,10 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -78,72 +35,60 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs $(gettext_TEXINFOS) \
-	$(top_srcdir)/../build-aux/mdate-sh $(srcdir)/version.texi \
-	$(srcdir)/stamp-vti $(top_srcdir)/../build-aux/texinfo.tex \
-	ChangeLog
+DIST_COMMON = $(gettext_TEXINFOS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
+	$(srcdir)/version.texi ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -151,12 +96,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -173,7 +115,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -185,7 +126,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -194,26 +134,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -222,17 +156,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -258,7 +188,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -267,7 +196,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -276,26 +204,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -331,48 +257,14 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
-am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
-am__v_DVIPS_0 = @echo "  DVIPS   " $@;
-am__v_DVIPS_1 = 
-AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
-am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
-am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
-am__v_MAKEINFO_1 = 
-AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
-am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
-am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
-am__v_INFOHTML_1 = 
-AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
-am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
-am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
-am__v_TEXI2DVI_1 = 
-AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
-am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
-am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
-am__v_TEXI2PDF_1 = 
-AM_V_texinfo = $(am__v_texinfo_@AM_V@)
-am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
-am__v_texinfo_0 = -q
-am__v_texinfo_1 = 
-AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
-am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
-am__v_texidevnull_0 = > /dev/null
-am__v_texidevnull_1 = 
 INFO_DEPS = $(srcdir)/gettext.info
 TEXINFO_TEX = $(top_srcdir)/../build-aux/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/../build-aux
@@ -383,11 +275,6 @@
 TEXINFOS = gettext.texi
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(docdir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -410,16 +297,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 DATA = $(doc_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -428,7 +307,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -466,7 +344,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -508,18 +385,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -531,26 +407,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -558,8 +424,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -571,23 +435,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -610,7 +469,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -628,18 +486,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -664,47 +517,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -712,7 +557,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -722,21 +566,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -748,103 +588,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -855,11 +642,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -869,6 +651,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -881,7 +664,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -902,16 +684,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -934,48 +716,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -998,6 +765,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1007,13 +775,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1022,47 +793,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1077,8 +817,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1118,7 +856,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1140,8 +877,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1149,13 +886,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1168,21 +903,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1195,9 +928,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1221,9 +954,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1237,12 +968,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1250,8 +978,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1263,41 +989,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1311,27 +1025,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1339,34 +1040,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1382,9 +1074,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1409,8 +1099,6 @@
 #TEXI2PDF = @TEXI2PDF@
 TEXI2PDF = @TEXI2PDF@ $(TEXINCLUDES)
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1419,8 +1107,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1435,7 +1121,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1486,6 +1171,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1493,7 +1179,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1589,7 +1274,7 @@
 	-rm -rf .libs _libs
 
 .texi.info:
-	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -1611,25 +1296,27 @@
 	rm -rf $$backupdir; exit $$rc
 
 .texi.dvi:
-	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
-	$<
+	$(TEXI2DVI) $<
 
 .texi.pdf:
-	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
-	$<
+	$(TEXI2PDF) $<
 
 .texi.html:
-	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
-	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	rm -rf $(@:.html=.htp)
+	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@ && mv $(@:.html=.htp) $@; \
+	  rm -rf $@; \
+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
 	else \
-	  rm -rf $(@:.html=.htp); exit 1; \
+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+	  exit 1; \
 	fi
 $(srcdir)/gettext.info: gettext.texi $(srcdir)/version.texi $(gettext_TEXINFOS)
 gettext.dvi: gettext.texi $(srcdir)/version.texi $(gettext_TEXINFOS)
@@ -1642,8 +1329,8 @@
 maintainer-clean-vti:
 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 .dvi.ps:
-	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) $(AM_V_texinfo) -o $@ $<
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) -o $@ $<
 
 uninstall-dvi-am:
 	@$(NORMAL_UNINSTALL)
@@ -1665,7 +1352,9 @@
 
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
+	@if test -d '$(DESTDIR)$(infodir)' && \
+	    (install-info --version && \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -1722,7 +1411,11 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -rf gettext.t2d gettext.t2p
+	-rm -rf gettext.am gettext.ams gettext.aux gettext.cp gettext.cps \
+	  gettext.ef gettext.em gettext.ems gettext.ev gettext.fn \
+	  gettext.kw gettext.ky gettext.kys gettext.log gettext.op \
+	  gettext.ops gettext.pg gettext.pgs gettext.tmp gettext.toc \
+	  gettext.tp gettext.tps gettext.vr gettext.vrs
 
 clean-aminfo:
 	-test -z "gettext.dvi gettext.pdf gettext.ps gettext.html" \
@@ -1736,11 +1429,8 @@
 	done
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1754,12 +1444,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(docdir)" && rm -f $$files
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1812,15 +1504,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -1860,11 +1547,8 @@
 
 install-dvi-am: $(DVIS)
 	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1877,22 +1561,18 @@
 
 install-html-am: $(HTMLS)
 	@$(NORMAL_INSTALL)
+	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  d2=$$d$$p; \
-	  if test -d "$$d2"; then \
+	  if test -d "$$d$$p"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d2"; \
+	    list2="$$list2 $$d$$p"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -1904,12 +1584,9 @@
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
+	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
-	fi; \
 	for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -1927,7 +1604,8 @@
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@if $(am__can_run_installinfo); then \
+	@if (install-info --version && \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -1941,11 +1619,8 @@
 
 install-pdf-am: $(PDFS)
 	@$(NORMAL_INSTALL)
+	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
 	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1957,11 +1632,8 @@
 
 install-ps-am: $(PSS)
 	@$(NORMAL_INSTALL)
+	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
 	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1996,22 +1668,21 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-aminfo \
-	clean-generic clean-libtool cscopelist-am ctags-am dist-hook \
-	dist-info distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am html-local info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-docDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-local \
-	maintainer-clean maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-vti mostlyclean \
-	mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-vti pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-docDATA uninstall-dvi-am \
-	uninstall-html-am uninstall-info-am uninstall-local \
-	uninstall-pdf-am uninstall-ps-am
+	clean-generic clean-libtool dist-hook dist-info distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am html-local info info-am install install-am \
+	install-data install-data-am install-data-local \
+	install-docDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-local maintainer-clean \
+	maintainer-clean-aminfo maintainer-clean-generic \
+	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-vti pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \
+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-local uninstall-pdf-am uninstall-ps-am
 
 
 iso-639.texi: ISO_639 iso-639.sed
@@ -2032,7 +1703,7 @@
 # The dependencies of stamp-vti generated by automake are incomplete.
 # So we have to duplicate the entire rule which would otherwise be generated
 # by automake.
-$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.version
+$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh
 	(dir=.; test -f ./gettext.texi || dir=$(srcdir); \
 	set `$(SHELL) $(top_srcdir)/../build-aux/mdate-sh $$dir/gettext.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
@@ -2069,7 +1740,7 @@
 # The install-dvi target is already defined by automake.
 
 installdirs-dvi:
-	$(MKDIR_P) $(DESTDIR)$(dvidir)
+	$(mkdir_p) $(DESTDIR)$(dvidir)
 
 uninstall-dvi:
 	$(RM) $(DESTDIR)$(dvidir)/gettext.dvi
@@ -2080,7 +1751,7 @@
 # The install-ps target is already defined by automake.
 
 installdirs-ps:
-	$(MKDIR_P) $(DESTDIR)$(psdir)
+	$(mkdir_p) $(DESTDIR)$(psdir)
 
 uninstall-ps:
 	$(RM) $(DESTDIR)$(psdir)/gettext.ps
@@ -2088,7 +1759,7 @@
 # The install-pdf target is already defined by automake.
 
 installdirs-pdf:
-	$(MKDIR_P) $(DESTDIR)$(pdfdir)
+	$(mkdir_p) $(DESTDIR)$(pdfdir)
 
 uninstall-pdf:
 	$(RM) $(DESTDIR)$(pdfdir)/gettext.pdf
@@ -2111,17 +1782,17 @@
 	esac
 
 install-html-monolithic: gettext.html
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	$(INSTALL_DATA) `if test -f gettext.html; then echo .; else echo $(srcdir); fi`/gettext.html $(DESTDIR)$(htmldir)/gettext.html
 
 install-html-split: gettext_toc.html
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	for file in `if test -f gettext_toc.html; then echo .; else echo $(srcdir); fi`/gettext_*.html; do \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \
 	done
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html-monolithic:
 	$(RM) $(DESTDIR)$(htmldir)/gettext.html
@@ -2130,14 +1801,14 @@
 	$(RM) $(DESTDIR)$(htmldir)/gettext_*.html
 
 dist-html-monolithic:
-	$(MKDIR_P) $(distdir)/
+	$(mkdir_p) $(distdir)/
 	file=gettext.html; \
 	if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	cp -p $$d/$$file $(distdir)/$$file || exit 1
 
 # We would like to put gettext_*.html into EXTRA_DIST, but it doesn't work.
 dist-html-split: gettext_toc.html
-	$(MKDIR_P) $(distdir)/
+	$(mkdir_p) $(distdir)/
 	file=gettext_toc.html; \
 	if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	for file in `cd $$d && echo gettext_*.html`; do \
diff -Nru gettext-0.19.3/gettext-tools/doc/msgattrib.texi gettext-0.18.1.1/gettext-tools/doc/msgattrib.texi
--- gettext-0.19.3/gettext-tools/doc/msgattrib.texi	2014-05-13 06:27:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgattrib.texi	2010-06-06 12:49:57.000000000 +0000
@@ -122,32 +122,10 @@
 @opindex --clear-obsolete@r{, @code{msgattrib} option}
 Set all messages non-obsolete.
 
-@item --previous
-@opindex --previous@r{, @code{msgattrib} option}
-When setting
-@ifhtml
-‘fuzzy’
-@end ifhtml
-@ifnothtml
-`fuzzy'
-@end ifnothtml
-mark, keep ``previous msgid'' of translated messages.
-
 @item --clear-previous
 @opindex --clear-previous@r{, @code{msgattrib} option}
 Remove the ``previous msgid'' (@samp{#|}) comments from all messages.
 
-@item --empty
-@opindex --empty@r{, @code{msgattrib} option}
-When removing
-@ifhtml
-‘fuzzy’
-@end ifhtml
-@ifnothtml
-`fuzzy'
-@end ifnothtml
-mark, also set msgstr empty.
-
 @item --only-file=@var{file}
 @opindex --only-file@r{, @code{msgattrib} option}
 Limit the attribute changes to entries that are listed in @var{file}.
@@ -225,17 +203,11 @@
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
 @item -n
-@itemx --add-location=@var{type}
+@itemx --add-location
 @opindex -n@r{, @code{msgattrib} option}
 @opindex --add-location@r{, @code{msgattrib} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgattrib} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgcat.texi gettext-0.18.1.1/gettext-tools/doc/msgcat.texi
--- gettext-0.19.3/gettext-tools/doc/msgcat.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgcat.texi	2010-06-06 12:49:57.000000000 +0000
@@ -12,9 +12,9 @@
 before messages are printed.  Conversely, the @code{--less-than} option may be
 used to specify less commonality before messages are printed (i.e.@:
 @samp{--less-than=2} will only print the unique messages).  Translations,
-comments, extracted comments, and file positions will be cumulated, except that
-if @code{--use-first} is specified, they will be taken from the first PO file
-to define them.
+comments and extract comments will be cumulated, except that if
+@code{--use-first} is specified, they will be taken from the first PO file
+to define them.  File positions from all PO files will be cumulated.
 
 @subsection Input file location
 
@@ -147,17 +147,11 @@
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
 @item -n
-@itemx --add-location=@var{type}
+@itemx --add-location
 @opindex -n@r{, @code{msgcat} option}
 @opindex --add-location@r{, @code{msgcat} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgcat} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgcomm.texi gettext-0.18.1.1/gettext-tools/doc/msgcomm.texi
--- gettext-0.19.3/gettext-tools/doc/msgcomm.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgcomm.texi	2010-06-06 12:49:57.000000000 +0000
@@ -11,7 +11,7 @@
 before messages are printed.  Conversely, the @code{--less-than} option may be
 used to specify less commonality before messages are printed (i.e.@:
 @samp{--less-than=2} will only print the unique messages).  Translations,
-comments and extracted comments will be preserved, but only from the first
+comments and extract comments will be preserved, but only from the first
 PO file to define them.  File positions from all PO files will be
 cumulated.
 
@@ -128,17 +128,11 @@
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
 @item -n
-@itemx --add-location=@var{type}
+@itemx --add-location
 @opindex -n@r{, @code{msgcomm} option}
 @opindex --add-location@r{, @code{msgcomm} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgcomm} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgconv.texi gettext-0.18.1.1/gettext-tools/doc/msgconv.texi
--- gettext-0.19.3/gettext-tools/doc/msgconv.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgconv.texi	2010-06-06 12:49:57.000000000 +0000
@@ -100,17 +100,10 @@
 @opindex --no-location@r{, @code{msgconv} option}
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
-@item -n
-@itemx --add-location=@var{type}
+@item --add-location
 @opindex --add-location@r{, @code{msgconv} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgconv} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgen.texi gettext-0.18.1.1/gettext-tools/doc/msgen.texi
--- gettext-0.19.3/gettext-tools/doc/msgen.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgen.texi	2010-06-06 12:49:57.000000000 +0000
@@ -69,7 +69,7 @@
 
 @table @samp
 @item --lang=@var{catalogname}
-@opindex --lang@r{, @code{msgen} option}
+@opindex --lang@r{, @code{msgcat} option}
 Specify the @samp{Language} field to be used in the header entry.  See
 @ref{Header Entry} for the meaning of this field.  Note: The
 @samp{Language-Team} and @samp{Plural-Forms} fields are not set by this
@@ -100,17 +100,10 @@
 @opindex --no-location@r{, @code{msgen} option}
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
-@item -n
-@itemx --add-location=@var{type}
+@item --add-location
 @opindex --add-location@r{, @code{msgen} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgen} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgexec.texi gettext-0.18.1.1/gettext-tools/doc/msgexec.texi
--- gettext-0.19.3/gettext-tools/doc/msgexec.texi	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgexec.texi	2010-06-06 12:49:57.000000000 +0000
@@ -19,26 +19,13 @@
 
 @vindex MSGEXEC_MSGCTXT@r{, environment variable}
 @vindex MSGEXEC_MSGID@r{, environment variable}
-@vindex MSGEXEC_MSGID_PLURAL@r{, environment variable}
 @vindex MSGEXEC_LOCATION@r{, environment variable}
-@vindex MSGEXEC_PLURAL_FORM@r{, environment variable}
-@vindex MSGEXEC_PREV_MSGCTXT@r{, environment variable}
-@vindex MSGEXEC_PREV_MSGID@r{, environment variable}
-@vindex MSGEXEC_PREV_MSGID_PLURAL@r{, environment variable}
 During each @var{command} invocation, the environment variable
 @code{MSGEXEC_MSGID} is bound to the message's msgid, and the environment
 variable @code{MSGEXEC_LOCATION} is bound to the location in the PO file
 of the message.  If the message has a context, the environment variable
 @code{MSGEXEC_MSGCTXT} is bound to the message's msgctxt, otherwise it is
-unbound.  If the message has a plural form, environment variable
-@code{MSGEXEC_MSGID_PLURAL} is bound to the message's msgid_plural and
-@code{MSGEXEC_PLURAL_FORM} is bound to the order number of the plural
-actually processed (starting with 0), otherwise both are unbound.
-If the message has a previous msgid (added by @code{msgmerge}),
-environment variable @code{MSGEXEC_PREV_MSGCTXT} is bound to the
-message's previous msgctxt, @code{MSGEXEC_PREV_MSGID} is bound to
-the previous msgid, and @code{MSGEXEC_PREV_MSGID_PLURAL} is bound to
-the previous msgid_plural.
+unbound.
 
 @cindex catalog encoding and @code{msgexec} output
 Note: It is your responsibility to ensure that the @var{command} can cope
diff -Nru gettext-0.19.3/gettext-tools/doc/msgfilter.texi gettext-0.18.1.1/gettext-tools/doc/msgfilter.texi
--- gettext-0.19.3/gettext-tools/doc/msgfilter.texi	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgfilter.texi	2010-06-06 12:49:57.000000000 +0000
@@ -10,26 +10,13 @@
 
 @vindex MSGFILTER_MSGCTXT@r{, environment variable}
 @vindex MSGFILTER_MSGID@r{, environment variable}
-@vindex MSGFILTER_MSGID_PLURAL@r{, environment variable}
 @vindex MSGFILTER_LOCATION@r{, environment variable}
-@vindex MSGFILTER_PLURAL_FORM@r{, environment variable}
-@vindex MSGFILTER_PREV_MSGCTXT@r{, environment variable}
-@vindex MSGFILTER_PREV_MSGID@r{, environment variable}
-@vindex MSGFILTER_PREV_MSGID_PLURAL@r{, environment variable}
 During each @var{filter} invocation, the environment variable
 @code{MSGFILTER_MSGID} is bound to the message's msgid, and the environment
 variable @code{MSGFILTER_LOCATION} is bound to the location in the PO file
 of the message.  If the message has a context, the environment variable
 @code{MSGFILTER_MSGCTXT} is bound to the message's msgctxt, otherwise it is
-unbound.  If the message has a plural form, environment variable
-@code{MSGFILTER_MSGID_PLURAL} is bound to the message's msgid_plural and
-@code{MSGFILTER_PLURAL_FORM} is bound to the order number of the plural
-actually processed (starting with 0), otherwise both are unbound.
-If the message has a previous msgid (added by @code{msgmerge}),
-environment variable @code{MSGFILTER_PREV_MSGCTXT} is bound to the
-message's previous msgctxt, @code{MSGFILTER_PREV_MSGID} is bound to
-the previous msgid, and @code{MSGFILTER_PREV_MSGID_PLURAL} is bound to
-the previous msgid_plural.
+unbound.
 
 @subsection Input file location
 
@@ -130,17 +117,6 @@
 translations of a PO file.  Thus, it can be used to convert an @file{sr.po}
 file to an @file{sr@@latin.po} file.
 
-@pindex quot
-The filter @samp{quot} is recognized as a built-in filter.
-The command @samp{msgfilter quot} converts any quotations surrounded
-by a pair of @samp{"}, @samp{'}, and @samp{`}.
-
-@pindex boldquot
-The filter @samp{boldquot} is recognized as a built-in filter.
-The command @samp{msgfilter boldquot} converts any quotations
-surrounded by a pair of @samp{"}, @samp{'}, and @samp{`}, also adding the
-VT100 escape sequences to the text to decorate it as bold.
-
 The use of built-in filters is not sensitive to the current locale's encoding.
 Moreover, when used with a built-in filter, @samp{msgfilter} can automatically
 convert the message catalog to the UTF-8 encoding when needed.
@@ -196,17 +172,10 @@
 @opindex --no-location@r{, @code{msgfilter} option}
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
-@item -n
-@itemx --add-location=@var{type}
+@item --add-location
 @opindex --add-location@r{, @code{msgfilter} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgfilter} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgfmt.texi gettext-0.18.1.1/gettext-tools/doc/msgfmt.texi
--- gettext-0.19.3/gettext-tools/doc/msgfmt.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgfmt.texi	2010-06-06 12:49:57.000000000 +0000
@@ -18,7 +18,7 @@
 @opindex -D@r{, @code{msgfmt} option}
 @opindex --directory@r{, @code{msgfmt} option}
 Add @var{directory} to the list of directories.  Source files are
-searched relative to this list of directories.  The resulting binary
+searched relative to this list of directories.  The resulting @file{.po}
 file will be written relative to the current directory, though.
 
 @end table
@@ -60,11 +60,6 @@
 @cindex Qt mode, and @code{msgfmt} program
 Qt mode: generate a Qt @file{.qm} file.
 
-@item --desktop
-@opindex --desktop@r{, @code{msgfmt} option}
-@cindex Desktop Entry mode, and @code{msgfmt} program
-Desktop Entry mode: generate a @file{.desktop} file.
-
 @end table
 
 @subsection Output file location
@@ -112,10 +107,6 @@
 @opindex -d@r{, @code{msgfmt} option}
 Specify the base directory of classes directory hierarchy.
 
-@item --source
-@opindex --source@r{, @code{msgfmt} option}
-Produce a .java source file, instead of a compiled .class file.
-
 @end table
 
 The class name is determined by appending the locale name to the resource name,
@@ -167,59 +158,6 @@
 The @samp{-l} and @samp{-d} options are mandatory.  The @file{.msg} file is
 written in the specified directory.
 
-@subsection Desktop Entry mode operations
-
-@table @samp
-@item --template=@var{template}
-@opindex --template@r{, @code{msgfmt} option}
-Specify a .desktop file used as a template.
-
-@item -k[@var{keywordspec}]
-@itemx --keyword[=@var{keywordspec}]
-@opindex -k@r{, @code{msgfmt} option}
-@opindex --keyword@r{, @code{msgfmt} option}
-Specify @var{keywordspec} as an additional keyword to be looked for.
-Without a @var{keywordspec}, the option means to not use default keywords.
-
-@item -l @var{locale}
-@itemx --locale=@var{locale}
-@opindex -l@r{, @code{msgfmt} option}
-@opindex --locale@r{, @code{msgfmt} option}
-Specify the locale name, either a language specification of the form @var{ll}
-or a combined language and country specification of the form @var{ll_CC}.
-
-@item -d @var{directory}
-@opindex -d@r{, @code{msgfmt} option}
-Specify the base directory of @file{.msg} message catalogs.
-
-@end table
-
-To generate a @samp{.desktop} file for a single locale, you can use it
-as follows.
-
-@example
-msgfmt --desktop --template=@var{template} --locale=@var{locale} \
-  -o @var{file} @var{filename}.po @dots{}
-@end example
-
-On the other hand, when using msgfmt from a Makefile, it is cumbersome
-to loop over all locales under a particular directory.  msgfmt
-provides a special operation mode for this use-case.  To generate a
-@samp{.desktop} file from multiple @samp{.po} files under a directory,
-specify the directory with the @samp{-d} option.
-
-@example
-msgfmt --desktop --template=@var{template} -d @var{directory} -o @var{file}
-@end example
-
-msgfmt first reads the @samp{LINGUAS} file under @var{directory}, and
-then processes all @samp{.po} files listed there.  You can also limit
-the locales to a subset, through the @samp{LINGUAS} environment
-variable.
-
-For either operation modes, the @samp{-o} and @samp{--template}
-options are mandatory.
-
 @subsection Input file syntax
 
 @table @samp
@@ -327,19 +265,6 @@
 @c Currently the README mentions that this constant could be changed by
 @c the installer by changing the value in config.h.  Should this go away?
 
-@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.
-
-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.
-
 @item --no-hash
 @opindex --no-hash@r{, @code{msgfmt} option}
 Don't include a hash table in the binary file.  Lookup will be more expensive
diff -Nru gettext-0.19.3/gettext-tools/doc/msggrep.texi gettext-0.18.1.1/gettext-tools/doc/msggrep.texi
--- gettext-0.19.3/gettext-tools/doc/msggrep.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msggrep.texi	2010-06-06 12:49:57.000000000 +0000
@@ -200,17 +200,10 @@
 @opindex --no-location@r{, @code{msggrep} option}
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
-@item -n
-@itemx --add-location=@var{type}
+@item --add-location
 @opindex --add-location@r{, @code{msggrep} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msggrep} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msgmerge.texi gettext-0.18.1.1/gettext-tools/doc/msgmerge.texi
--- gettext-0.19.3/gettext-tools/doc/msgmerge.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msgmerge.texi	2010-06-06 12:49:57.000000000 +0000
@@ -156,7 +156,7 @@
 
 @table @samp
 @item --lang=@var{catalogname}
-@opindex --lang@r{, @code{msgmerge} option}
+@opindex --lang@r{, @code{msgcat} option}
 Specify the @samp{Language} field to be used in the header entry.  See
 @ref{Header Entry} for the meaning of this field.  Note: The
 @samp{Language-Team} and @samp{Plural-Forms} fields are left unchanged.
@@ -188,17 +188,10 @@
 @opindex --no-location@r{, @code{msgmerge} option}
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
-@item -n
-@itemx --add-location=@var{type}
+@item --add-location
 @opindex --add-location@r{, @code{msgmerge} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msgmerge} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/msguniq.texi gettext-0.18.1.1/gettext-tools/doc/msguniq.texi
--- gettext-0.19.3/gettext-tools/doc/msguniq.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/msguniq.texi	2010-06-06 12:49:57.000000000 +0000
@@ -125,17 +125,11 @@
 Do not write @samp{#: @var{filename}:@var{line}} lines.
 
 @item -n
-@itemx --add-location=@var{type}
+@itemx --add-location
 @opindex -n@r{, @code{msguniq} option}
 @opindex --add-location@r{, @code{msguniq} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{msguniq} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/doc/stamp-vti gettext-0.18.1.1/gettext-tools/doc/stamp-vti
--- gettext-0.19.3/gettext-tools/doc/stamp-vti	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/stamp-vti	2010-06-06 18:36:27.000000000 +0000
@@ -1,4 +1,4 @@
-@set UPDATED 17 June 2014
-@set UPDATED-MONTH June 2014
-@set EDITION 0.19.3
-@set VERSION 0.19.3
+@set UPDATED 6 June 2010
+@set UPDATED-MONTH June 2010
+@set EDITION 0.18.1
+@set VERSION 0.18.1
diff -Nru gettext-0.19.3/gettext-tools/doc/tutorial.html gettext-0.18.1.1/gettext-tools/doc/tutorial.html
--- gettext-0.19.3/gettext-tools/doc/tutorial.html	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/tutorial.html	2010-06-06 12:49:57.000000000 +0000
@@ -89,7 +89,7 @@
 A simple example</A>
 </H1>
 <A NAME="sec:simple"></A>Our first example of using <TT>gettext</TT> will be the good old Hello World program,
-whose sole function is to print the phrase “Hello, world!” to the terminal.
+whose sole function is to print the phrase ``Hello, world!'' to the terminal.
 The internationalized version of this program might be saved in hello.c as:
 <PRE>
 1    #include &lt;libintl.h&gt;
@@ -116,7 +116,7 @@
 The programmer's viewpoint</A>
 </H2>
    As expected, when the <TT>hello</TT> executable is run under the default locale
-(usually the C locale) it prints “Hello, world!” in the terminal. Besides
+(usually the C locale) it prints ``Hello, world!'' in the terminal. Besides
 some initial setup work, the only additional burden faced by the programmer is
 to replace any string to be printed with <TT>gettext(string)</TT>, i.e., to
 instead pass the string as an argument to the <TT>gettext</TT> function. For lazy
@@ -140,24 +140,24 @@
   and an empty string as the second one, initializes the entire current locale
   of the program as per environment variables set by the user. In other words,
   the program locale is initialized to match that of the user. For details see
-  “man <TT>setlocale</TT>.”
+  ``man <TT>setlocale</TT>.''
 </LI>
 <LI>The <TT>bindtextdomain</TT> function on line 8 sets the base directory for the
   message catalogs for a given message domain. A message domain is a set of
   translatable messages, with every software package typically having its own
-  domain. Here, we have used “hello” as the name of the message domain for
+  domain. Here, we have used ``hello'' as the name of the message domain for
   our toy program. As the second argument, /usr/share/locale, is the default
   system location for message catalogs, what we are saying here is that we are
   going to place the message catalog in the default system directory. Thus, we
   could have dispensed with the call to <TT>bindtextdomain</TT> here, and this
   function is useful only if the message catalogs are installed in a
   non-standard place, e.g., a packaged software distribution might have
-  the catalogs under a po/ directory under its own main directory. See “man
-  <TT>bindtextdomain</TT>” for details.
+  the catalogs under a po/ directory under its own main directory. See ``man
+  <TT>bindtextdomain</TT>'' for details.
 </LI>
 <LI>The <TT>textdomain</TT> call on line 9 sets the message domain of the current
-  program to “hello,” i.e., the name that we are using for our example
-  program. “man textdomain” will give usage details for the function.
+  program to ``hello,'' i.e., the name that we are using for our example
+  program. ``man textdomain'' will give usage details for the function.
 </LI>
 <LI>Finally, on line 10, we have replaced what would normally have been,
 <PRE>
@@ -192,7 +192,7 @@
 The message domain for the program should be specified as the argument
 to the -d option, and should match the domain specified in the call to
 <TT>textdomain</TT> (on line 9 of the program source). Other details on how to use
-<TT>gettext</TT> can be found from “man gettext.”
+<TT>gettext</TT> can be found from ``man gettext.''
 
 <P>
 A .pot (portable object template) file is used as the basis for translating
@@ -279,14 +279,14 @@
 the corresponding English string. For the <TT>msgstr</TT> line in each of the
 remaining entries, add the translated Oriya text between the double quotes;
 the translation corresponding to the English phrase in the <TT>msgid</TT> string
-for the entry. For example, for the phrase “Hello world!<!-- MATH
+for the entry. For example, for the phrase ``Hello world!<!-- MATH
  $\backslash$
  -->
-<SPAN CLASS="MATH">&#92;</SPAN>n” in
-oriya.po, we could enter “&#x0b28;&#x0b2e;&#x0b38;&#x0b4d;&#x0b15;&#x0b3e;&#x0b30;<!-- MATH
+<SPAN CLASS="MATH">&#92;</SPAN>n'' in
+oriya.po, we could enter ``&#x0b28;&#x0b2e;&#x0b38;&#x0b4d;&#x0b15;&#x0b3e;&#x0b30;<!-- MATH
  $\backslash$
  -->
-<SPAN CLASS="MATH">&#92;</SPAN>n”. The final
+<SPAN CLASS="MATH">&#92;</SPAN>n''. The final
 oriya.po file might look like:
 <PRE>
   # Oriya translations for hello example package.
@@ -346,8 +346,8 @@
 file will be in the sub-directory LL/LC_MESSAGES or LL_CC/LC_MESSAGES under
 the base directory, where LL stands for a language, and CC for a country. For
 example, as we have chosen the standard location, /usr/share/locale, for our
-base directory, and for us the language and country strings are “or” and
-“IN,” respectively, we will place hello.mo in /usr/share/locale/or_IN. Note
+base directory, and for us the language and country strings are ``or'' and
+``IN,'' respectively, we will place hello.mo in /usr/share/locale/or_IN. Note
 that you will need super-user privilege to copy hello.mo to this system
 directory. Thus,
 <PRE><FONT color="red">
@@ -376,30 +376,30 @@
 seems to have better support for internationalization. gnome-terminal needs to
 be told that the bytes arriving are UTF-8 encoded multibyte sequences. This
 can be done by (a) choosing Terminal <TT>-&gt;</TT> Character Coding <TT>-&gt;</TT>
-Unicode (UTF-8), or (b) typing “/bin/echo -n -e
+Unicode (UTF-8), or (b) typing ``/bin/echo -n -e
 '<!-- MATH
  $\backslash$
  -->
 <SPAN CLASS="MATH">&#92;</SPAN>033%<!-- MATH
  $\backslash$
  -->
-<SPAN CLASS="MATH">&#92;</SPAN>G'” in the terminal, or (c) by running
+<SPAN CLASS="MATH">&#92;</SPAN>G''' in the terminal, or (c) by running
 /bin/unicode_start. Likewise, you can revert to the default locale by (a)
 choosing Terminal <TT>-&gt;</TT> Character Coding <TT>-&gt;</TT> Current Locale
-(ISO-8859-1), or (b) “/bin/echo -n -e '<!-- MATH
+(ISO-8859-1), or (b) ``/bin/echo -n -e '<!-- MATH
  $\backslash$
  -->
 <SPAN CLASS="MATH">&#92;</SPAN>033%<!-- MATH
  $\backslash$
  -->
-<SPAN CLASS="MATH">&#92;</SPAN>@',” or
+<SPAN CLASS="MATH">&#92;</SPAN>@','' or
 (c) by running /bin/unicode_stop. Now, running the example program (after
 compiling with gcc as described in Sec.&nbsp;<A HREF="#sec:simple">2</A>) with,
 <PRE><FONT color="red">
   ./hello
 </FONT></PRE>
 should give you output in Oriya. Please note that conjuncts will most likely
-be displayed with a “halant” as the terminal probably does not render Indian
+be displayed with a ``halant'' as the terminal probably does not render Indian
 language fonts correctly. Also, as most terminal emulators assume fixed-width
 fonts, the results are hardly likely to be aesthetically appealing.
 
@@ -469,7 +469,7 @@
 </FONT></PRE>
 The -U option updates the existing
 .po file, oriya.po. We could have chosen to instead create a new .po file by
-using “-o <SPAN CLASS="MATH">&lt;</SPAN>filename<SPAN CLASS="MATH">&gt;</SPAN>” instead of -U. The updated .po file will still
+using ``-o <SPAN CLASS="MATH">&lt;</SPAN>filename<SPAN CLASS="MATH">&gt;</SPAN>'' instead of -U. The updated .po file will still
 have the old translations embedded in it, and new entries with untranslated
 <TT>msgid</TT> lines. For us, the new lines in oriya.po will look like,
 <PRE>
@@ -477,9 +477,9 @@
   msgid "How are you?\n"
   msgstr ""
 </PRE>
-For the new translation, we could use, “&#x0b06;&#x0b2a;&#x0b23;
-&#x0b15;&#x0b3f;&#x0b2a;&#x0b30;&#x0b3f; &#x0b05;&#x0b1b;&#x0b28;&#x0b4d;&#x0b24;&#x0b3f;?” in
-place of the English phrase “How are you?” The updated oriya.po file,
+For the new translation, we could use, ``&#x0b06;&#x0b2a;&#x0b23;
+&#x0b15;&#x0b3f;&#x0b2a;&#x0b30;&#x0b3f; &#x0b05;&#x0b1b;&#x0b28;&#x0b4d;&#x0b24;&#x0b3f;?'' in
+place of the English phrase ``How are you?'' The updated oriya.po file,
 including the translation might look like:
 <PRE>
   # Oriya translations for hello example package.
@@ -572,21 +572,21 @@
 <H1><A NAME="SECTION00070000000000000000">
 The Emacs info browser</A>
 </H1>
-<A NAME="sec:emacs-info"></A>You can start up Emacs from the command-line by typing “emacs,” or “emacs
-<SPAN CLASS="MATH">&lt;</SPAN>filename<SPAN CLASS="MATH">&gt;</SPAN>.” It can be started from the menu in some desktops, e.g., on
+<A NAME="sec:emacs-info"></A>You can start up Emacs from the command-line by typing ``emacs,'' or ``emacs
+<SPAN CLASS="MATH">&lt;</SPAN>filename<SPAN CLASS="MATH">&gt;</SPAN>.'' It can be started from the menu in some desktops, e.g., on
 my GNOME desktop, it is under Main Menu <TT>-&gt;</TT> Programming <TT>-&gt;</TT>
 Emacs. If you are unfamiliar with Emacs, a tutorial can be started by typing
-“C-h t” in an Emacs window, or from the Help item in the menubar at the
-top. Emacs makes extensive use of the Control (sometimes labelled as “CTRL”
-or “CTL”) and Meta (sometimes labelled as “Edit” or “Alt”) keys. In
-Emacs parlance, a hyphenated sequence, such as “C-h” means to press the
-Control and ‘h’ key simultaneously, while “C-h t” would mean to press the
-Control and ‘h’ key together, release them, and press the ‘t’ key. Similarly,
-“M-x” is used to indicate that the Meta and ‘x’ keys should be pressed at
+``C-h t'' in an Emacs window, or from the Help item in the menubar at the
+top. Emacs makes extensive use of the Control (sometimes labelled as ``CTRL''
+or ``CTL'') and Meta (sometimes labelled as ``Edit'' or ``Alt'') keys. In
+Emacs parlance, a hyphenated sequence, such as ``C-h'' means to press the
+Control and `h' key simultaneously, while ``C-h t'' would mean to press the
+Control and `h' key together, release them, and press the `t' key. Similarly,
+``M-x'' is used to indicate that the Meta and `x' keys should be pressed at
 the same time.
 
 <P>
-The info browser can be started by typing “C-h i” in Emacs. The first time
+The info browser can be started by typing ``C-h i'' in Emacs. The first time
 you do this, it will briefly list some commands available inside the info
 browser, and present you with a menu of major topics. Each menu item, or
 cross-reference is hyperlinked to the appropriate node, and you can visit that
@@ -597,26 +597,26 @@
   * gettext: (gettext).                          GNU gettext utilities.
 </PRE>
 and visit that node. Or, as it is several pages down, you can locate it using
-“I-search.” Type “C-s” to enter “I-search” which will then prompt you
+``I-search.'' Type ``C-s'' to enter ``I-search'' which will then prompt you
 for a string in the mini-buffer at the bottom of the window. This is an
 incremental search, so that Emacs will keep moving you forward through the
 buffer as you are entering your search string. If you have reached the last
 occurrence of the search string in the current buffer, you will get a message
-saying “Failing I-search: ...” on pressing “C-s.” At that point, press
-“C-s” again to resume the search at the beginning of the buffer. Likewise,
-“C-r” incrementally searches backwards from the present location.
+saying ``Failing I-search: ...'' on pressing ``C-s.'' At that point, press
+``C-s'' again to resume the search at the beginning of the buffer. Likewise,
+``C-r'' incrementally searches backwards from the present location.
 
 <P>
-Info nodes are listed in this document with a “::” separator, so
+Info nodes are listed in this document with a ``::'' separator, so
 that one can go to the gettext::Creating::Header Entry:: by visiting the
-“gettext” node from the main info menu, navigating to the “Creating”
-node, and following that to the “Header Entry” node.
+``gettext'' node from the main info menu, navigating to the ``Creating''
+node, and following that to the ``Header Entry'' node.
 
 <P>
 A stand-alone info browser, independent of Emacs, is also available on many
 systems. Thus, the <TT>gettext</TT> info page can also be accessed by typing
-“info gettext” in a terminal. <TT>xinfo</TT> is an X application serving as an
-info browser, so that if it is installed, typing “xinfo gettext” from the
+``info gettext'' in a terminal. <TT>xinfo</TT> is an X application serving as an
+info browser, so that if it is installed, typing ``xinfo gettext'' from the
 command line will open a new browser window with the <TT>gettext</TT> info page.
 
 <P>
@@ -636,10 +636,10 @@
 Emacs PO mode</A>
 </H2>
   Emacs should automatically enter po-mode when you load a .po file, as
-indicated by “PO” in the modeline at the bottom. The window is made
+indicated by ``PO'' in the modeline at the bottom. The window is made
 read-only, so that you can edit the .po file only through special commands.  A
 description of Emacs po-mode can be found under the gettext::Basics info node,
-or type ‘h’ or ‘?’ in a po-mode window for a list of available commands. While
+or type `h' or `?' in a po-mode window for a list of available commands. While
 I find Emacs po-mode quite restrictive, this is probably due to unfamiliarity
 with it. Its main advantage is that it imposes rigid conformance to the PO
 file format, and checks the file format when closing the .po file
diff -Nru gettext-0.19.3/gettext-tools/doc/version.texi gettext-0.18.1.1/gettext-tools/doc/version.texi
--- gettext-0.19.3/gettext-tools/doc/version.texi	2014-10-16 06:02:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/version.texi	2010-06-06 18:36:27.000000000 +0000
@@ -1,4 +1,4 @@
-@set UPDATED 17 June 2014
-@set UPDATED-MONTH June 2014
-@set EDITION 0.19.3
-@set VERSION 0.19.3
+@set UPDATED 6 June 2010
+@set UPDATED-MONTH June 2010
+@set EDITION 0.18.1
+@set VERSION 0.18.1
diff -Nru gettext-0.19.3/gettext-tools/doc/xgettext.texi gettext-0.18.1.1/gettext-tools/doc/xgettext.texi
--- gettext-0.19.3/gettext-tools/doc/xgettext.texi	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/doc/xgettext.texi	2010-06-06 12:49:57.000000000 +0000
@@ -69,12 +69,11 @@
 @opindex --language@r{, @code{xgettext} option}
 @cindex supported languages, @code{xgettext}
 Specifies the language of the input files.  The supported languages
-are @code{C}, @code{C++}, @code{ObjectiveC}, @code{PO}, @code{Shell},
-@code{Python}, @code{Lisp}, @code{EmacsLisp}, @code{librep}, @code{Scheme},
-@code{Smalltalk}, @code{Java}, @code{JavaProperties}, @code{C#}, @code{awk},
-@code{YCP}, @code{Tcl}, @code{Perl}, @code{PHP}, @code{GCC-source},
-@code{NXStringTable}, @code{RST}, @code{Glade}, @code{Lua}, @code{JavaScript},
-@code{Vala}, @code{GSettings}, @code{Desktop}.
+are @code{C}, @code{C++}, @code{ObjectiveC}, @code{PO}, @code{Python},
+@code{Lisp}, @code{EmacsLisp}, @code{librep}, @code{Scheme}, @code{Smalltalk},
+@code{Java}, @code{JavaProperties}, @code{C#}, @code{awk}, @code{YCP},
+@code{Tcl}, @code{Perl}, @code{PHP}, @code{GCC-source}, @code{NXStringTable},
+@code{RST}, @code{Glade}.
 
 @item -C
 @itemx --c++
@@ -138,7 +137,7 @@
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
-GCC-source, Glade, Lua, JavaScript, Vala, GSettings.
+GCC-source, Glade.
 
 @item -k[@var{keywordspec}]
 @itemx --keyword[=@var{keywordspec}]
@@ -181,7 +180,7 @@
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
-GCC-source, Glade, Lua, JavaScript, Vala, GSettings, Desktop.
+GCC-source, Glade.
 
 The default keyword specifications, which are always looked for if not
 explicitly disabled, are language dependent.  They are:
@@ -246,25 +245,6 @@
 @item
 For Glade 1: @code{label}, @code{title}, @code{text}, @code{format},
 @code{copyright}, @code{comments}, @code{preview_text}, @code{tooltip}.
-
-@item
-For Lua: @code{_}, @code{gettext.gettext}, @code{gettext.dgettext:2},
-@code{gettext.dcgettext:2}, @code{gettext.ngettext:1,2},
-@code{gettext.dngettext:2,3}, @code{gettext.dcngettext:2,3}.
-
-@item
-For JavaScript: @code{_}, @code{gettext}, @code{dgettext:2},
-@code{dcgettext:2}, @code{ngettext:1,2}, @code{dngettext:2,3},
-@code{pgettext:1c,2}, @code{dpgettext:2c,3}.
-
-@item
-For Vala: @code{_}, @code{Q_}, @code{N_}, @code{NC_}, @code{dgettext:2},
-@code{dcgettext:2}, @code{ngettext:1,2}, @code{dngettext:2,3},
-@code{dpgettext:2c,3}, @code{dpgettext2:2c,3}.
-
-@item
-For Desktop: @code{Name}, @code{GenericName}, @code{Comment},
-@code{Icon}, @code{Keywords}.
 @end itemize
 
 To disable the default keyword specifications, the option @samp{-k} or
@@ -317,7 +297,7 @@
 @*
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk, YCP, Tcl, Perl, PHP,
-GCC-source, Lua, JavaScript, Vala.
+GCC-source.
 
 @item -T
 @itemx --trigraphs
@@ -399,17 +379,11 @@
 each message's context.
 
 @item -n
-@itemx --add-location=@var{type}
+@itemx --add-location
 @opindex -n@r{, @code{xgettext} option}
 @opindex --add-location@r{, @code{xgettext} option}
 Generate @samp{#: @var{filename}:@var{line}} lines (default).
 
-The optional @var{type} can be either @samp{full}, @samp{file}, or
-@samp{never}.  If it is not given or @samp{full}, it generates the
-lines with both file name and line number.  If it is @samp{file}, the
-line number part is omitted.  If it is @samp{never}, it completely
-suppresses the lines (same as @code{--no-location}).
-
 @item --strict
 @opindex --strict@r{, @code{xgettext} option}
 Write out a strict Uniforum conforming PO file.  Note that this
diff -Nru gettext-0.19.3/gettext-tools/examples/aclocal.m4 gettext-0.18.1.1/gettext-tools/examples/aclocal.m4
--- gettext-0.19.3/gettext-tools/examples/aclocal.m4	2014-10-16 06:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/aclocal.m4	2010-06-06 20:11:40.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  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.
@@ -11,16 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +26,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,22 +45,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -85,7 +79,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -111,21 +105,18 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 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.
 
+# serial 16
+
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -138,7 +129,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -167,40 +158,31 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -211,78 +193,34 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
+
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -304,7 +242,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -323,14 +261,16 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST([install_sh])])
+AC_SUBST(install_sh)])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  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.
 
+# serial 2
+
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -346,12 +286,15 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
 
+# serial 6
+
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -359,10 +302,11 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
+
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -375,35 +319,63 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005, 2006  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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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.
 
+# serial 4
+
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -416,16 +388,22 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# 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.
 
+# serial 5
+
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -436,40 +414,32 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
    test "$[2]" = conftest.file
    )
 then
@@ -479,85 +449,36 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
+AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009  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.
 
+# serial 1
+
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -565,32 +486,34 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  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.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -598,22 +521,24 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  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.
 
+# serial 2
+
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -623,119 +548,81 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
-#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
 
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
 
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
+  # tar/untar a dummy directory, and stop if the command works
   rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
 
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([../../m4/fixautomake.m4])
+m4_include([../../m4/init-package-version.m4])
 m4_include([../../gettext-runtime/m4/nls.m4])
 m4_include([../../gettext-runtime/m4/po.m4])
 m4_include([../../gettext-runtime/m4/progtest.m4])
diff -Nru gettext-0.19.3/gettext-tools/examples/ChangeLog gettext-0.18.1.1/gettext-tools/examples/ChangeLog
--- gettext-0.19.3/gettext-tools/examples/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,150 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* po/eo.po, po/es.po, po/nb.po: Update.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	examples: Don't require msgfmt when compiling hello-c-gnome3
-	* hello-c-gnome3/Makefile.am (CLEANFILES): Clean hello.desktop.
-	(EXTRA_DIST): Add hello.desktop.in.
-	(MAINTAINERCLEANFILES): Add hello.desktop.in.
-	(hello.desktop): Move msgfmt invocation to...
-	(hello.desktop.in): ...here.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	* configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is
-	set.
-
-2014-05-06  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (install-data-local): Don't fail if a PO file does
-	not exist, but warn user to do "make dist".
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	build: Use git-version-gen intead of version.sh
-	* configure.ac: Use git-version-gen in AC_INIT.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	examples: Quote shell variables in hello-java*/configure
-	When running from xsmallpot.sh, embedded shell-script snippets are
-	stripped off from configure.ac and some variables are not set.
-	Make sure to quote them to avoid error.
-	* hello-java/configure.ac: Quote $BUILDJAVA.
-	* hello-java-awt/configure.ac: Quote $BUILDJAVAEXE and $BUILDJAVA.
-	* hello-java-qtjambi/configure.ac: Likewise.
-	* hello-java-swing/configure.ac: Likewise.
-
-2014-04-15  Daiki Ueno  <ueno@gnu.org>
-
-	examples: Add a new example 'hello-c-gnome3'
-	* hello-c-gnome3: New subdirectory.
-	* README: Mention it.
-	* Makefile.am (EXAMPLESFILES): Add the files in hello-c-gnome3.
-	(EXAMPLESDIRS): Add hello-c-gnome3.
-	* po/Makefile.am (POTFILES): Add hello-c-gnome3 source.
-	(SMALLPOTS): Add hello-c-gnome3.pot.
-	(hello-c-gnome3.pot): New rule.
-	(SMALLPOFILES_FOR_lang): Add hello-c-gnome3 elements.
-	(../hello-c-gnome3/po/$(LL).po): New rule.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	* hello-c++-qt/po/Makefile.am: Likewise.
-	* hello-c++-wxwidgets/po/Makefile.am: Likewise.
-	* hello-clisp/po/Makefile.am: Likewise.
-	* hello-csharp-forms/Makefile.am: Likewise.
-	* hello-csharp-forms/po/Makefile.am: Likewise.
-	* hello-csharp/Makefile.am: Likewise.
-	* hello-csharp/po/Makefile.am: Likewise.
-	* hello-gawk/po/Makefile.am: Likewise.
-	* hello-guile/po/Makefile.am: Likewise.
-	* hello-java-awt/Makefile.am: Likewise.
-	* hello-java-qtjambi/Makefile.am: Likewise.
-	* hello-java-swing/Makefile.am: Likewise.
-	* hello-java/Makefile.am: Likewise.
-	* hello-librep/po/Makefile.am: Likewise.
-	* hello-pascal/Makefile.am: Likewise.
-	* hello-pascal/po/Makefile.am: Likewise.
-	* hello-perl/po/Makefile.am: Likewise.
-	* hello-php/po/Makefile.am: Likewise.
-	* hello-python/po/Makefile.am: Likewise.
-	* hello-sh/po/Makefile.am: Likewise.
-	* hello-smalltalk/po/Makefile.am: Likewise.
-	* hello-tcl-tk/po/Makefile.am: Likewise.
-	* hello-tcl/po/Makefile.am: Likewise.
-	* hello-ycp/po/Makefile.am: Likewise.
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2013-04-23  Daiki Ueno  <ueno@gnu.org>
-
-	* po/xsmallpot.sh: Don't assume that aclocal accepts configure.in.
-
-2013-04-02  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (clean-local): New rule to remove tmp-hello-*.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-19  Daiki Ueno  <ueno@gnu.org>
-
-	Fix build error in hello-c++-kde due to autom4te cache.
-	* po/xsmallpot.sh: Pass -f to autoconf to ignore cache.
-
-2012-12-07  Bruno Haible  <bruno@clisp.org>
-
-	* po/cs.po: New file, from Marek Černocký <marek@manet.cz>.
-	* po/nb.po: New file, from Johnny A. Solbu <johnny@solbu.net>.
-	* po/vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-	* po/LINGUAS: Add cs, hr, nb.
-	* hello-*/po/LINGUAS: Update.
-	* Makefile.am (EXAMPLESPOFILES): Add the new message catalogs.
-
-2012-07-08  Bruno Haible  <bruno@clisp.org>
-
-	* po/hr.po: New file, from Tomislav Krznar <tomislav.krznar@gmail.com>.
-
-2011-01-18  Bruno Haible  <bruno@clisp.org>
-
-	* po/da.po: New file, from Keld Simonsen <keld@keldix.com>.
-	* po/gl.po: New file, from
-	Leandro Regueiro <leandro.regueiro@gmail.com>.
-	* po/LINGUAS: Add da, gl.
-	* hello-*/po/LINGUAS: Update.
-	* Makefile.am (EXAMPLESPOFILES): Add the new message catalogs.
-
-2010-10-10  Bruno Haible  <bruno@clisp.org>
-
-	* po/bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
-
-2010-08-13  Nicola Pero  <nicola.pero@meta-innovation.com>  (tiny change)
-
-	Fix build error in hello-objc-gnustep due to 'ast' and 'ky' catalogs.
-	* hello-objc-gnustep/po/LocaleAliases: Regenerated from newest
-	gnustep-base/Languages/Locale.aliases.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/examples/configure gettext-0.18.1.1/gettext-tools/examples/configure
--- gettext-0.19.3/gettext-tools/examples/configure	2014-10-16 06:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/configure	2010-06-06 20:11:40.000000000 +0000
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext-examples 0.19.3.
+# Generated by GNU Autoconf 2.65.
 #
-# Report bugs to <bug-gnu-gettext@gnu.org>.
 #
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,7 +89,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -134,31 +133,6 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -192,13 +166,11 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -238,25 +210,14 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -266,11 +227,10 @@
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: bug-gnu-gettext@gnu.org about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -355,18 +315,10 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -403,19 +355,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -488,10 +440,6 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -526,16 +474,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -547,8 +495,28 @@
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -561,7 +529,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -578,12 +546,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='gettext-examples'
-PACKAGE_TARNAME='gettext-examples'
-PACKAGE_VERSION='0.19.3'
-PACKAGE_STRING='gettext-examples 0.19.3'
-PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
-PACKAGE_URL=''
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="installpaths.in"
 ac_subst_vars='LTLIBOBJS
@@ -599,11 +567,8 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
-SED
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -714,7 +679,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc/${PACKAGE}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -736,9 +701,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -783,9 +747,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -809,9 +773,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1013,9 +977,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1029,9 +993,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed -e 's/[+]/x/g' -e 's/[-.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1059,8 +1023,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1068,7 +1032,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1078,7 +1042,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1086,13 +1050,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1115,7 +1079,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1129,6 +1093,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1143,9 +1109,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1184,11 +1150,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1214,7 +1180,7 @@
   # 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.3 to adapt to many kinds of systems.
+\`configure' configures this package to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1228,7 +1194,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1262,8 +1228,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/gettext-examples]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1280,20 +1245,18 @@
 fi
 
 if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext-examples 0.19.3:";;
-   esac
+
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-nls           do not use Native Language Support
 
-Report bugs to <bug-gnu-gettext@gnu.org>.
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1356,10 +1319,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext-examples configure 0.19.3
-generated by GNU Autoconf 2.69
+configure
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1373,8 +1336,8 @@
 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1484,9 +1447,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1520,9 +1485,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1535,9 +1502,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -1551,9 +1520,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -1608,12 +1579,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1628,11 +1594,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
@@ -1708,7 +1670,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -1724,22 +1686,16 @@
 
 ac_aux_dir=
 for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../build-aux \"$srcdir\"/../../build-aux" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in ../../build-aux \"$srcdir\"/../../build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1751,7 +1707,14 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+. $srcdir/../../version.sh
+
+
+
+
+
+
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1770,7 +1733,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1790,7 +1753,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1848,71 +1811,56 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -1935,12 +1883,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -1952,17 +1900,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -1974,7 +1922,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2002,7 +1950,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2014,7 +1962,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2055,7 +2003,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2065,7 +2013,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2094,13 +2042,19 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2112,7 +2066,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2140,7 +2094,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2148,7 +2102,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2181,47 +2135,22 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
 AM_BACKSLASH='\'
 
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+
+
+  if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2236,19 +2165,10 @@
 
 
 # Define the identity of the package.
- PACKAGE='gettext-examples'
- VERSION='0.19.3'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+ PACKAGE=''
+ VERSION=''
 
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
@@ -2265,141 +2185,37 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
+# Always define AMTAR for backward compatibility.
 
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
 
 
+    PACKAGE=gettext-examples
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
+     VERSION=$VERSION_NUMBER
 
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
 
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
 
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
 
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
 
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
 
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
@@ -2417,7 +2233,7 @@
 
 
 
-      GETTEXT_MACRO_VERSION=0.19
+      GETTEXT_MACRO_VERSION=0.18
 
 
 
@@ -2425,14 +2241,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -2453,7 +2270,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -2494,7 +2311,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -2508,7 +2325,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2547,14 +2364,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -2575,7 +2393,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -2624,14 +2442,15 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -2652,7 +2471,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -2773,21 +2592,10 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -2839,7 +2647,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -2854,17 +2661,9 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
 
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -2965,7 +2764,6 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3011,19 +2809,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -3161,16 +2959,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -3219,7 +3017,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -3230,16 +3028,28 @@
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3260,8 +3070,8 @@
 # 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.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by gettext-examples $as_me, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3311,17 +3121,17 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-gnu-gettext@gnu.org>."
+Report bugs to the package provider."
 
 _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.3
-configured by $0, generated by GNU Autoconf 2.69,
+gettext-examples config.status
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3339,16 +3149,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -3370,7 +3175,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -3381,7 +3185,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -3401,7 +3205,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -3446,7 +3250,7 @@
     "installpaths") CONFIG_FILES="$CONFIG_FILES installpaths" ;;
     "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -3468,10 +3272,9 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -3479,13 +3282,12 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3502,12 +3304,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -3516,18 +3318,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3535,7 +3337,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -3583,7 +3385,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -3615,29 +3417,21 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -3655,7 +3449,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -3674,7 +3468,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -3683,7 +3477,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -3709,8 +3503,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -3846,24 +3640,23 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -3884,7 +3677,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -3900,8 +3693,7 @@
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -3912,12 +3704,12 @@
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -4004,7 +3796,7 @@
 
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
@@ -4032,7 +3824,6 @@
   fi
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
   sed_x_variable='
 # Test if the hold space is empty.
 x
@@ -4040,9 +3831,9 @@
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+/^[	 ]*VARIABLE[	 ]*=/{
   # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  s/^[	 ]*VARIABLE[	 ]*=//
   ba
 }
 bd
@@ -4093,7 +3884,7 @@
     sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assignment from automake < 1.5.
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -4183,15 +3974,14 @@
   fi
 
   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -4201,8 +3991,8 @@
       frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -4223,7 +4013,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -4244,7 +4034,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -Nru gettext-0.19.3/gettext-tools/examples/configure.ac gettext-0.18.1.1/gettext-tools/examples/configure.ac
--- gettext-0.19.3/gettext-tools/examples/configure.ac	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -17,15 +17,15 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.57])
-AC_INIT([gettext-examples],
-	m4_esyscmd([../../build-aux/git-version-gen ../../.tarball-version]),
-	[bug-gnu-gettext@gnu.org])
+AC_INIT
 AC_CONFIG_SRCDIR([installpaths.in])
 AC_CONFIG_AUX_DIR([../../build-aux])
+. $srcdir/../../version.sh
+gl_INIT_PACKAGE([gettext-examples], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 AM_PO_SUBDIRS
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.c:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.c:30
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.c:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-c.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:30
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.c:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.c:30
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-0.19-rc1\n"
+"Project-Id-Version: hello-c-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.c:30
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.c:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-c package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.c:30
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.c:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-c to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c 0.18\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"
-"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"
-
-#: hello.c:30
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.c:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-c.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.c:30
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.c:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-c package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.c:30
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.c:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-0.19-rc1\n"
+"Project-Id-Version: hello-c-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.c:30
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-0.19-rc1\n"
+"Project-Id-Version: hello-c-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.c:30
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.c:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-c-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.c:30
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.c:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-0.19-rc1\n"
+"Project-Id-Version: hello-c 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.c:30
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/uk.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-c
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.c:30
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.c:31
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19-rc1\n"
+"Project-Id-Version: hello-c 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.c:30
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.c:31
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.18\n"
+"Project-Id-Version: hello-c 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.c:30
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.c:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c++ package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++ 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++ 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.cc:40
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++ 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cc:39
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.cc:40
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-c++.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++ 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cc:39
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.cc:40
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c++.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++ package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-0.19-rc1\n"
+"Project-Id-Version: hello-c++-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.cc:40
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-c++ package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cc:39
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.cc:40
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-c++ to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++ 0.18\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"
-"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"
-
-#: hello.cc:39
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.cc:40
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-c++.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++ package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.cc:40
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c++' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++ package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++ 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++ 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++ 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-c++ package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cc:39
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.cc:40
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c++.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c++-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++ package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-0.19-rc1\n"
+"Project-Id-Version: hello-c++-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-0.19-rc1\n"
+"Project-Id-Version: hello-c++-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cc:39
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.cc:40
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-c++-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++ package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.cc:40
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c++ package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c++ package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++ 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++ 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c++-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c++.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c++' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c++.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/uk.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-c++
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++ package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.cc:40
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19-rc1\n"
+"Project-Id-Version: hello-c++ 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.cc:40
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c++.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c++.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.18\n"
+"Project-Id-Version: hello-c++ 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.cc:39
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.cc:40
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c-gnome package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c-gnome 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.c:51
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.c:46
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.c:51
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-c-gnome.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:46
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.c:51
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c-gnome.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c-gnome package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.c:46
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.c:46
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.c:51
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-c-gnome package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.c:46
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.c:51
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-c-gnome to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome 0.18\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"
-"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"
-
-#: hello.c:46
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.c:51
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-c-gnome.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c-gnome package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.c:46
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.c:51
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c-gnome' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c-gnome package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c-gnome 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c-gnome 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-c-gnome package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.c:46
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.c:51
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c-gnome.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c-gnome-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c-gnome package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.c:46
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.c:46
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.c:51
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-c-gnome-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c-gnome package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.c:46
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.c:51
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c-gnome package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c-gnome package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c-gnome 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c-gnome-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c-gnome.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c-gnome' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.c:46
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c-gnome.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/uk.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-c-gnome
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c-gnome package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.c:46
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.c:51
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.c:46
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.c:51
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c-gnome.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c-gnome.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.18\n"
+"Project-Id-Version: hello-c-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.c:46
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.c:51
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c++-gnome package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-gnome 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.cc:55
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cc:50
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.cc:55
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-c++-gnome.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cc:50
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.cc:55
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c++-gnome.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-gnome package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.cc:55
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-c++-gnome package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cc:50
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.cc:55
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-c++-gnome to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.18\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"
-"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"
-
-#: hello.cc:50
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.cc:55
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-c++-gnome.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-gnome package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.cc:55
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c++-gnome' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-gnome package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-gnome 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++-gnome 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-c++-gnome package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cc:50
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.cc:55
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c++-gnome.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c++-gnome-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-gnome package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cc:50
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.cc:55
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-c++-gnome-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-gnome package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.cc:55
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c++-gnome package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c++-gnome package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-gnome 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c++-gnome-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c++-gnome.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c++-gnome' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c++-gnome.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/uk.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-c++-gnome
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-gnome package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.cc:55
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.cc:55
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-gnome/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-gnome/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c++-gnome.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c++-gnome.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.18\n"
+"Project-Id-Version: hello-c++-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.cc:50
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.cc:55
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/autoclean.sh gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/autoclean.sh
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/autoclean.sh	2014-04-15 08:10:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/autoclean.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-#!/bin/sh
-# Example for use of GNU gettext.
-# This file is in the public domain.
-#
-# Script for cleaning all autogenerated files.
-
-test ! -f Makefile || make distclean
-
-# Brought in by autopoint.
-rm -f ABOUT-NLS
-rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
-rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
-rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
-rm -f m4/lib-ld.m4
-rm -f m4/lib-link.m4
-rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longlong.m4
-rm -f m4/nls.m4
-rm -f m4/po.m4
-rm -f m4/printf-posix.m4
-rm -f m4/progtest.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
-rm -f po/Makefile.in.in
-rm -f po/remove-potcdate.sin
-
-# Generated by aclocal.
-rm -f aclocal.m4
-
-# Generated by autoconf.
-rm -f configure
-
-# Generated or brought in by automake.
-rm -f Makefile.in
-rm -f m4/Makefile.in
-rm -f install-sh
-rm -f missing
-rm -f config.guess
-rm -f config.sub
-rm -f po/*.pot
-rm -f po/stamp-po
-rm -f po/*.gmo
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/autogen.sh gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/autogen.sh
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/autogen.sh	2014-04-17 06:53:42.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/autogen.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Example for use of GNU gettext.
-# This file is in the public domain.
-#
-# Script for regenerating all autogenerated files.
-
-autopoint -f # was: gettextize -f -c
-rm po/Makevars.template
-rm po/Rules-quot
-rm po/boldquot.sed
-rm po/en@boldquot.header
-rm po/en@quot.header
-rm po/insert-header.sin
-rm po/quot.sed
-
-aclocal -I m4
-
-autoconf
-
-automake -a -c
-
-cd po
-for f in *.po; do
-  if test -r "$f"; then
-    lang=`echo $f | sed -e 's,\.po$,,'`
-    msgfmt -c -o $lang.gmo $lang.po
-  fi
-done
-cd ..
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/configure.ac gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/configure.ac
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/configure.ac	2014-04-24 03:41:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/configure.ac	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-dnl Example for use of GNU gettext.
-dnl This file is in the public domain.
-dnl
-dnl Configuration file - processed by autoconf.
-
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-AM_INIT_AUTOMAKE(hello-c-gnome3, 0)
-
-AC_PROG_CC
-AC_CHECK_HEADERS([unistd.h])
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.15)
-
-dnl Check GNOME specific stuff.
-dnl
-dnl If you have full GNOME development environment installed on your
-dnl system, you should be able to use the following macros:
-dnl
-dnl   AM_PATH_GLIB_2_0
-dnl   PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.10], ,
-dnl     [AC_MSG_ERROR([can't find gtk+-3.0])])
-dnl
-dnl Here, in gettext-tools/examples, we do the checks manually for
-dnl simplicity.
-
-AC_PATH_PROG(GLIB_COMPILE_RESOURCES, [glib-compile-resources])
-AS_IF([test -z "$GLIB_COMPILE_RESOURCES"], [
-  AC_MSG_ERROR([can't find glib-compile-resources])
-])
-
-AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, [glib-compile-schemas])
-AS_IF([test -z "$GLIB_COMPILE_SCHEMAS"], [
-  AC_MSG_ERROR([can't find glib-compile-schemas])
-])
-
-AC_PATH_PROG([PKG_CONFIG], [pkg-config])
-AS_IF([test -z "$PKG_CONFIG"], [
-  AC_MSG_ERROR([can't find pkg-config])
-])
-
-GTK="gtk+-3.0 >= 3.10"
-AS_IF(["$PKG_CONFIG" --exists "$GTK"], , [
-  AC_MSG_ERROR([can't find $GTK])
-])
-
-GTK_CFLAGS=`"$PKG_CONFIG" --cflags "$GTK"`
-AC_SUBST(GTK_CFLAGS)
-
-GTK_LIBS=`"$PKG_CONFIG" --libs "$GTK"`
-AC_SUBST(GTK_LIBS)
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([m4/Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.c gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.c
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.c	2014-04-17 09:06:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-/* Example for use of GNU gettext.
-   This file is in the public domain.
-
-   Source code of the C program.  */
-
-
-/* Get GTK declarations.  */
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
-/* Get getpid() declaration.  */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#define UI_PATH "/org/gnu/gettext/examples/hello/hello.ui"
-#define APPLICATION_ID "org.gnu.gettext.examples.hello"
-#define GSETTINGS_SCHEMA "org.gnu.gettext.examples.hello"
-
-static void
-quit_callback (GtkWidget *widget, void *data)
-{
-  g_application_quit (G_APPLICATION (data));
-}
-
-/* Forward declaration of GObject types.  */
-
-#define HELLO_TYPE_APPLICATION_WINDOW (hello_application_window_get_type ())
-#define HELLO_APPLICATION_WINDOW(obj)                           \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                           \
-                               HELLO_TYPE_APPLICATION_WINDOW,   \
-                               HelloApplicationWindow))
-
-typedef struct _HelloApplicationWindow HelloApplicationWindow;
-typedef struct _HelloApplicationWindowClass HelloApplicationWindowClass;
-
-#define HELLO_TYPE_APPLICATION (hello_application_get_type ())
-#define HELLO_APPLICATION(obj)                          \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                   \
-                               HELLO_TYPE_APPLICATION,  \
-                               HelloApplication))
-
-typedef struct _HelloApplication HelloApplication;
-typedef struct _HelloApplicationClass HelloApplicationClass;
-
-/* Custom application window implementation.  */
-
-struct _HelloApplicationWindow
-{
-  GtkApplicationWindow parent;
-  GtkWidget *label2;
-  GtkWidget *button;
-  GSettings *settings;
-};
-
-struct _HelloApplicationWindowClass
-{
-  GtkApplicationWindowClass parent_class;
-};
-
-G_DEFINE_TYPE (HelloApplicationWindow, hello_application_window,
-               GTK_TYPE_APPLICATION_WINDOW);
-
-static void
-hello_application_window_init (HelloApplicationWindow *window)
-{
-  char *label;
-
-  gtk_widget_init_template (GTK_WIDGET (window));
-  label = g_strdup_printf (_("This program is running as process number %d."),
-                           getpid ());
-  gtk_label_set_label (GTK_LABEL (window->label2), label);
-  g_free (label);
-
-  window->settings = g_settings_new (GSETTINGS_SCHEMA);
-  g_settings_bind (window->settings, "label-sensitive",
-                   window->label2, "sensitive",
-                   G_SETTINGS_BIND_DEFAULT);
-}
-
-static void
-hello_application_window_dispose (GObject *object)
-{
-  HelloApplicationWindow *window = HELLO_APPLICATION_WINDOW (object);
-  g_clear_object (&window->settings);
-}
-
-static void
-hello_application_window_class_init (HelloApplicationWindowClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = hello_application_window_dispose;
-
-  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass),
-                                               UI_PATH);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass),
-                                        HelloApplicationWindow, label2);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass),
-                                        HelloApplicationWindow, button);
-}
-
-static HelloApplicationWindow *
-hello_application_window_new (HelloApplication *application)
-{
-  return g_object_new (HELLO_TYPE_APPLICATION_WINDOW,
-                       "application", application,
-                       NULL);
-}
-
-/* Custom application implementation.  */
-
-struct _HelloApplication
-{
-  GtkApplication parent;
-};
-
-struct _HelloApplicationClass
-{
-  GtkApplicationClass parent_class;
-};
-
-G_DEFINE_TYPE (HelloApplication, hello_application, GTK_TYPE_APPLICATION);
-
-static void
-hello_application_init (HelloApplication *application)
-{
-}
-
-static void
-hello_application_activate (GApplication *application)
-{
-  HelloApplicationWindow *window;
-
-  window = hello_application_window_new (HELLO_APPLICATION (application));
-  g_signal_connect (window->button, "clicked",
-                    G_CALLBACK (quit_callback), application);
-  gtk_window_present (GTK_WINDOW (window));
-}
-
-static void
-hello_application_class_init (HelloApplicationClass *klass)
-{
-  G_APPLICATION_CLASS (klass)->activate = hello_application_activate;
-}
-
-static HelloApplication *
-hello_application_new (void)
-{
-  return g_object_new (HELLO_TYPE_APPLICATION,
-                       "application-id", APPLICATION_ID,
-                       NULL);
-}
-
-int
-main (int argc, char *argv[])
-{
-  GApplication *application;
-  int status;
-
-  /* Load the GSettings schema from the current directory.  */
-  g_setenv ("GSETTINGS_SCHEMA_DIR", ".", FALSE);
-
-  /* Initializations.  */
-  textdomain ("hello-c-gnome3");
-  bindtextdomain ("hello-c-gnome3", LOCALEDIR);
-
-  /* Create application.  */
-  application = G_APPLICATION (hello_application_new ());
-
-  /* Start the application.  */
-  status = g_application_run (application, argc, argv);
-  g_object_unref (application);
-
-  return status;
-}
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.desktop.in.in gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.desktop.in.in
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.desktop.in.in	2014-04-17 09:06:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.desktop.in.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hello
-Comment=Hello, world!
-StartupNotify=true
-Exec=@bindir@/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.gresource.xml gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.gresource.xml
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.gresource.xml	2014-04-24 03:41:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.gresource.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnu/gettext/examples/hello">
-    <file preprocess="xml-stripblanks">hello.ui</file>
-  </gresource>
-</gresources>
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.gschema.xml gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.gschema.xml
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.gschema.xml	2014-04-24 03:41:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.gschema.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema path="/org/gnu/gettext/examples/hello/"
-	  id="org.gnu.gettext.examples.hello">
-    <key name="label-sensitive" type="b">
-      <default>true</default>
-      <summary>Set label sensitive</summary>
-      <description>Whether to set the label sensitive.</description>
-    </key>
-  </schema>
-</schemalist>
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.ui gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.ui
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/hello.ui	2014-04-16 06:44:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/hello.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.10 -->
-  <template class="HelloApplicationWindow" parent="GtkApplicationWindow">
-    <property name="title" translatable="yes">Example Application</property>
-    <property name="default-width">600</property>
-    <property name="default-height">400</property>
-    <child>
-      <object class="GtkBox" id="panel">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-	  <object class="GtkAlignment" id="label1aligned">
-            <property name="visible">True</property>
-            <property name="xalign">0.0</property>
-            <property name="yalign">0.5</property>
-            <property name="xscale">0</property>
-            <property name="yscale">0</property>
-            <child>
-	      <object class="GtkLabel" id="label1">
-		<property name="visible">True</property>
-                <property name="label" translatable="yes">Hello, world!</property>
-	      </object>
-	    </child>
-	  </object>
-        </child>
-        <child>
-	  <object class="GtkAlignment" id="label2aligned">
-            <property name="visible">True</property>
-            <property name="xalign">0.0</property>
-            <property name="yalign">0.5</property>
-            <property name="xscale">0</property>
-            <property name="yscale">0</property>
-            <child>
-	      <object class="GtkLabel" id="label2">
-		<property name="visible">True</property>
-	      </object>
-	    </child>
-	  </object>
-        </child>
-        <child>
-	  <object class="GtkHButtonBox" id="buttonbar">
-            <property name="visible">True</property>
-	    <child>
-	      <object class="GtkButton" id="button">
-		<property name="visible">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
-	      </object>
-	    </child>
-	  </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/INSTALL gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/INSTALL
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/INSTALL	2014-04-15 08:10:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/INSTALL	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-This example relies on:
-  - the GTK libraries (libgtk, libgdk), version 3.10 or later
-  - the glib libraries (libglib)
-
-Installation:
-  ./autogen.sh
-  ./configure --prefix=/some/prefix
-  make
-  make install
-Cleanup:
-  make distclean
-  ./autoclean.sh
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am	2014-04-17 09:06:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 \
-  lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 visibility.m4
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/Makefile.am	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-# Example for use of GNU gettext.
-# This file is in the public domain.
-#
-# Makefile configuration - processed by automake.
-
-# General automake options.
-AUTOMAKE_OPTIONS = foreign no-dependencies
-ACLOCAL_AMFLAGS = -I m4
-
-# The list of subdirectories containing Makefiles.
-SUBDIRS = m4 po
-
-# The list of programs that are built.
-bin_PROGRAMS = hello
-
-# The source files of the 'hello' program.
-hello_SOURCES = hello.c resources.c
-
-# Define a C macro LOCALEDIR indicating where catalogs will be installed.
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-# Make sure the gnome.h include file is found.
-AM_CPPFLAGS = $(GTK_CFLAGS)
-
-# Link time dependencies.
-LDADD = $(GTK_LIBS) @LIBINTL@
-
-BUILT_SOURCES = gschemas.compiled resources.c
-
-# Compile GSettings schema.
-gschemas.compiled: hello.gschema.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) .
-
-# Compile assets into a C source and link it with the application.
-resources.c: hello.gresource.xml hello.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \
-		--sourcedir=$(srcdir) --generate-source
-
-# Merge translations into a Desktop Entry file.
-desktopdir = $(datadir)/applications
-desktop_DATA = hello.desktop
-
-hello.desktop.in: hello.desktop.in.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
-	  -d $(top_srcdir)/po && mv $@-t $@
-
-hello.desktop: hello.desktop.in
-	@rm -f $@ $@-t
-	$(AM_V_GEN) srcdir=''; \
-	  test -f ./$< || srcdir=$(srcdir)/; \
-	  sed -e "s|@bindir[@]|$(bindir)|" $< > $@-t && mv $@-t $@
-
-CLEANFILES = $(BUILT_SOURCES) hello.desktop $(desktop_DATA)
-
-# Additional files to be distributed.
-EXTRA_DIST = autogen.sh autoclean.sh hello.ui \
-	hello.desktop.in.in hello.desktop.in \
-	hello.gschema.xml \
-	hello.gresource.xml
-
-MAINTAINERCLEANFILES = hello.desktop.in
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/af.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/af.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/af.po	2014-10-16 06:05:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/af.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Afrikaans translation for Silky 
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the silky package.
-# Hanlie Pretorius <hpretorius@pnp.co.za>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.13.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: af\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Hierdie program loop as prosesnommer %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hallo wêreld!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ast.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ast.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ast.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ast.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Mensajes en asturianu para GNU gettext.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# Marquinos <maacub@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.17\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: ast\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "�Hola, mundu!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/bg.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Bulgarian translations for hello-c-gnome3 package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
-"Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
-"Language: bg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Примерно приложение"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Здравейте на всички !"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ca.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ca.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ca.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ca.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Catalan messages for GNU hello-c-gnome3.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as the hello-c-gnome3 package.
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.13.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2003-12-18 10:41+0100\n"
-"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
-"Language-Team: Catalan <ca@dodds.net>\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Aquest programa està corrent amb el número de procés %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hola, món!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Danish messages for hello-c-gnome3.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hej verden!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/de.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# German messages for hello-c-gnome3.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Bruno Haible <bruno@clisp.org>, 2003.
-# Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dieses Programm läuft mit der Prozess-Nummer %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Beispielanwendung"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hallo Welt!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/el.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/el.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/el.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/el.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Greek translation of hello-c-gnome3
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Simos Xenitellis <simos74@gmx.net>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.14.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Γεια σου, κόσμε!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/eo.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/eo.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/eo.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/eo.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# La teksto por la mesaĝoj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
-# This file is distributed under the same license as the gettext package.
-# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.15-pre5\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"
-"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
-"Language: eo\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Saluton, mondo!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/es.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Ejemplo de aplicación"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/fi.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
-# Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
-"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tämän ohjelman prosessinumero on %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Esimerkkisovellus"
-
-# Tämä nimenomainen käännös valittu GNU Hellon mukaisesti.
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Terve maailma!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/fr.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/fr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/fr.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/fr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Messages français pour GNU gettext.
-# Copyright © 2006 Yoyodyne, Inc.
-# Michel Robitaille <robitail@IRO.UMontreal.CA>, 2006.
-# Christophe Combelles <ccomb@free.fr>, 2006
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU hello-c-gnome3 0.15-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-10-01 02:29+0200\n"
-"Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
-"Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ce programme est exécuté en tant que processus numéro %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Bonjour, le monde !"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ga.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ga.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ga.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ga.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Irish translations for hello-c-gnome3.
-# Copyright (C) 2004 Yoyodyne, Inc.
-# This file is distributed under the same license as the hello-c-gnome3 package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.14.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: ga\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "T� an cl�r seo � rith mar phr�iseas %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Dia duit, a dhomhain!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# Galician translation for hello-c-gnome3 package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Aplicativo de exemplo"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# Translation of hello-c-gnome3 to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.18\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"
-"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"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/hu.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# Hungarian translation for hello-c-gnome3.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
-"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
-"Language: hu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Példa alkalmazás"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hello, világ!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/id.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/id.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/id.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/id.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# translation of hello-c-gnome3-0.15-pre5.po to Indonesian
-# Copyright (C) 2006 Yoyodyne, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Tedi Heriyanto <tedi_heriyanto@yahoo.com>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.15-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: id\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Program ini berjalan sebagai proses nomor %d"
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/it.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/it.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/it.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/it.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Italian messages for hello-c-gnome3.
-# Copyright (C) 2005, 2006 Yoyodyne, Inc.
-# This file is distributed under the same license as the gettext package.
-# Marco Colombo <m.colombo@ed.ac.uk>, 2005, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.15-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-01 10:46+0100\n"
-"Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Questo programma è in esecuzione con numero di processo %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Salve, mondo!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ja.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Translation of `hello-c-gnome3' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
-"Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
-"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "���Υץ������ϥץ������ֹ� %d ��ư���Ƥ��ޤ�."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "�������"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "������, ����ˤ���!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ky.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ky.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ky.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ky.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# Translation of 'hello-c-gnome3' messages to Kirghiz.
-# Copyright (C) 2006 Yoyodyne, Inc.
-# This file is distributed under the same license as the silky package.
-# Ilyas Bakirov <just_ilyas@yahoo.com>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.16.2-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: ky\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Kyrgyz\n"
-"X-Poedit-Country: KYRGYZSTAN\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Бул программа %d процесс номери катары иштеп жатат."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Салам дүйнө!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/LINGUAS	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# Example for use of GNU gettext.
-# This file is in the public domain.
-#
-# Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/lv.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/lv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/lv.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/lv.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Latvian translation of hello-c-gnome3
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Arvis Lācis <arvis.lacis@inbox.lv>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.17\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: lv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Latvian\n"
-"X-Poedit-Country: LATVIA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Šī programma darbojas kā process ar numuru %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Sveika, pasaule!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/Makevars gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/Makevars
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/Makevars	2014-04-15 08:10:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/Makevars	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = \
-  --keyword=_ --flag=_:1:pass-c-format \
-  --keyword=N_ --flag=N_:1:pass-c-format \
-  --flag=g_log:3:c-format --flag=g_logv:3:c-format \
-  --flag=g_error:1:c-format --flag=g_message:1:c-format \
-  --flag=g_critical:1:c-format --flag=g_warning:1:c-format \
-  --flag=g_print:1:c-format \
-  --flag=g_printerr:1:c-format \
-  --flag=g_strdup_printf:1:c-format --flag=g_strdup_vprintf:1:c-format \
-  --flag=g_printf_string_upper_bound:1:c-format \
-  --flag=g_snprintf:3:c-format --flag=g_vsnprintf:3:c-format \
-  --flag=g_string_sprintf:2:c-format \
-  --flag=g_string_sprintfa:2:c-format \
-  --flag=g_scanner_error:2:c-format \
-  --flag=g_scanner_warn:2:c-format
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Yoyodyne, Inc.
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS = --quiet
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ms.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ms.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ms.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ms.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# hello-c-gnome3 Bahasa Melayu (Malay) (ms).
-# Copyright (C) 2006 Yoyodyne, Inc.
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the hello-c-gnome3 package.
-# Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.15-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-12-22 21:36+0800\n"
-"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
-"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
-"Language: ms\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Program ini dilaksanakan sebagai proses bernombor %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/mt.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# hello-c-gnome3-0.16.2-pre5.
-# Copyright (C) 2008 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.16.2-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: mt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-3\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dal-programm qed jaħdem taħt il-proċess numru %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hello, lil kulħadd!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# Norwegian Bokmal translations for hello-c-gnome3 package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Eksempelprogram"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hallo verden!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/nl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# Dutch translations for GNU hello-c-gnome3.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
-# Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
-"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
-"Language: nl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dit programma draait als proces nummer %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Voorbeeldtoepassing"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hallo, wereld!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/pl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# Polish translations for the GNU gettext messages, hello-c-gnome3 domain
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
-"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
-"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ten program działa jako proces o numerze %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Program przykładowy"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Witaj świecie!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/POTFILES.in gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/POTFILES.in
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/POTFILES.in	2014-04-24 03:41:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/POTFILES.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# Example for use of GNU gettext.
-# This file is in the public domain.
-#
-# List of files which contain translatable strings.
-hello.c
-hello.desktop.in.in
-hello.ui
-hello.gschema.xml
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Aplicativo exemplo"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/pt.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/pt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/pt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/pt.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Portuguese translation of 'hello-c-gnome3' package.
-# Copyright (C) 2005 Yoyodyne, Inc.
-# This file is distributed under the same license as the hello-c-gnome3 package.
-# Helder Correia <helder.pereira.correia@gmail.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.14.5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está a ser executado com o número de processo %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Olá, Mundo!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ro.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ro.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ro.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ro.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Mesajele �n limba rom�n� pentru pachetul hello-c-gnome3-0.13-pre1.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Acest fi�ier este distribuit sub aceea�i licen�� ca pachetul hello-c-gnome3.
-# Eugen Hoanca <eugenh@urban-grafx.ro>, 2003
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.13-pre1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2003-11-22 11:15+0200\n"
-"Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
-"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Acest program este rulat ca procesul num�rul %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Salut, lume! (Hello, world!)"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/ru.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Translation of hello-c-gnome3-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
-"Language: ru\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Пример приложения"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sk.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Slovak translations GNU for hello-c-gnome3 package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
-"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
-"Language: sk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program beží ako proces s číslom %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Ukážková aplikácia"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Ahoj svet!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c-gnome3-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
-"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
-"Language: sl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ta program teče kot proces številka %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Zgled aplikacije"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Pozdravljen, svet!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# Serbian translation of hello-c-gnome3.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3-0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
-"Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Овај програм се извршава као процес број %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Програм примера"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Здраво свима!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/sv.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Swedish messages for hello-c-gnome3.
-# Copyright © 2006, 2014 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
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
-"Language: sv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Detta program kör som process nummer %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Exempelprogram"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Hej världen!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/tr.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/tr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/tr.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/tr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Turkish translations for Gnu Gettext Package.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Nilgün Belma Bugüner <nilgun@superonline.com>, 2003,2004
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.14-pre1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: tr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Bu yazılım, %d süreç kimliği ile çalışıyor."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Merhaba Dünyalı!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/uk.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Ukrainian translation to hello-c-gnome3
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# 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>, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
-"Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ця програма виконується як процес з номером %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Програма-приклад"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Привіт, світе!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/vi.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình %d."
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr "Ứng dụng mẫu"
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "Chào thế giới!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/zh_CN.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# zh_CN translation for hello-c-gnome3.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as the hello-c-gnome3 package.
-# Funda Wang <fundawang@linux.net.cn>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.13.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2003-12-18 19:07+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "此程序正以进程号 %d 运行。"
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "世界你好！"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/zh_HK.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/zh_HK.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/zh_HK.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/zh_HK.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Chinese (Hong Kong) translation of hello-c-gnome3.
-# Copyright (C) 2006 Yoyodyne, Inc.
-# Abel Cheung <abelcheung@gmail.com>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.15-pre5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: zh_HK\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "本程式正在執行中，進程編號為 %d。"
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "你好！"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c-gnome3/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c-gnome3/po/zh_TW.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Traditional Chinese translation of hello-c-gnome3.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.c:70
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
-
-#: hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello.ui:22
-msgid "Hello, world!"
-msgstr "哈囉，大家好！"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c++-kde package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-kde 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,4 +30,4 @@
 #: hellowindow.cc:49
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Програмата е пусната под процес номер %1."
+msgstr "Програмата е запусната под процес номер %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-kde 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cc:46
-msgid "Hello example"
-msgstr "Příklad „Hello“"
-
-#: hello.cc:48
-msgid "Hello world example"
-msgstr "Příklad „Hello world“"
-
-#: hellowindow.cc:42
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hellowindow.cc:49
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Tento program běží jako proces číslo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Danish messages for hello-c++-kde.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-kde 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cc:46
-msgid "Hello example"
-msgstr "Eksempel p� hilsen"
-
-#: hello.cc:48
-msgid "Hello world example"
-msgstr "\"Hej verden\"-eksempel"
-
-#: hellowindow.cc:42
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hellowindow.cc:49
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Dette program k�rer som proces nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c++-kde.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-kde package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cc:46
 msgid "Hello example"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,21 +1,17 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde-0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,9 +25,9 @@
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hellowindow.cc:49
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Este programa está corriendo como el proceso número %1."
+msgstr "Este programa est� corriendo como el proceso n�mero %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# Galician translation for hello-c++-kde package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cc:46
-msgid "Hello example"
-msgstr "Exemplo ola"
-
-#: hello.cc:48
-msgid "Hello world example"
-msgstr "Exemplo ola mundo"
-
-#: hellowindow.cc:42
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hellowindow.cc:49
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Este programa estase executando como o proceso número %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# Translation of hello-c++-kde to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-kde 0.18\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"
-"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"
-
-#: hello.cc:46
-msgid "Hello example"
-msgstr "Primjer pozdrava"
-
-#: hello.cc:48
-msgid "Hello world example"
-msgstr "Primjer pozdrava svijetu"
-
-#: hellowindow.cc:42
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hellowindow.cc:49
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Ovaj program je pokrenut kao proces broj %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,36 +1,33 @@
 # Hungarian translation for hello-c++-kde.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-kde package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:46
 msgid "Hello example"
-msgstr "Hello példa"
+msgstr "Hello p�lda"
 
 #: hello.cc:48
 msgid "Hello world example"
-msgstr "Hello világ példa"
+msgstr "Hello vil�g p�lda"
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hellowindow.cc:49
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Ez a program a(z) %1 folyamatazonosítóval fut."
+msgstr "Ez a program a %1 processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c++-kde' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-kde package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-kde 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++-kde 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# Norwegian Bokmal translations for hello-c++-kde package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cc:46
-msgid "Hello example"
-msgstr "Hallo eksempel"
-
-#: hello.cc:48
-msgid "Hello world example"
-msgstr "Hallo verden-eksempel"
-
-#: hellowindow.cc:42
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hellowindow.cc:49
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Dette programmet kjører som prosess nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c++-kde.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c++-kde-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-kde package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde-0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cc:46
 msgid "Hello example"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde-0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cc:46
-msgid "Hello example"
-msgstr "Olá exemplo"
-
-#: hello.cc:48
-msgid "Hello world example"
-msgstr "Olá mundo exemplo"
-
-#: hellowindow.cc:42
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hellowindow.cc:49
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Este programa está executando com número de processo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,37 +1,35 @@
 # Translation of hello-c++-kde-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-kde package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cc:46
 msgid "Hello example"
-msgstr "Пример: Здравствуй"
+msgstr "������: ����������"
 
 #: hello.cc:48
 msgid "Hello world example"
-msgstr "Пример: Здравствуй, мир"
+msgstr "������: ����������, ���"
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hellowindow.cc:49
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Эта программа выполняется как процесс под номером %1."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c++-kde package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c++-kde package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-kde 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c++-kde-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c++-kde.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c++-kde' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde-0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cc:46
 msgid "Hello example"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c++-kde.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/uk.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,23 +1,19 @@
 # Ukrainian translation to hello-c++-kde
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-kde package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:46
 msgid "Hello example"
@@ -25,11 +21,11 @@
 
 #: hello.cc:48
 msgid "Hello world example"
-msgstr "Приклад «Привітання»"
+msgstr "Приклад \"Привітання\""
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hellowindow.cc:49
 #, qt-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,38 +1,34 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cc:46
 msgid "Hello example"
-msgstr "Ví dụ “Chào”"
+msgstr "Lời ví dụ « Chào »"
 
 #: hello.cc:48
 msgid "Hello world example"
-msgstr "Ví dụ “Chào thế giới”"
+msgstr "Lời ví dụ « Chào thế giới »"
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hellowindow.cc:49
 #, qt-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c++-kde.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c++-kde.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.18\n"
+"Project-Id-Version: hello-c++-kde 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -26,9 +24,9 @@
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hellowindow.cc:49
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "本程式正在執行，行程編號為 %1。"
+msgstr "本程式正在執行中，進程編號為 %1。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-clisp package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-clisp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-clisp 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.lisp.in:13
 #, lisp-format
 msgid "This program is running as process number ~D."
-msgstr "Програмата е пусната под процес номер ~D."
+msgstr "Програмата е запусната под процес номер ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-clisp 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.lisp.in:11
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.lisp.in:13
-#, lisp-format
-msgid "This program is running as process number ~D."
-msgstr "Tento program běží jako proces číslo ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-clisp.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-clisp 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.lisp.in:11
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.lisp.in:13
-#, lisp-format
-msgid "This program is running as process number ~D."
-msgstr "Dette program k�rer som proces nummer ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-clisp.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-clisp package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp-0.19-rc1\n"
+"Project-Id-Version: hello-clisp-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.lisp.in:13
 #, lisp-format
 msgid "This program is running as process number ~D."
-msgstr "Este programa está corriendo como el proceso número ~D."
+msgstr "Este programa est� corriendo como el proceso n�mero ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-clisp package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.lisp.in:11
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.lisp.in:13
-#, lisp-format
-msgid "This program is running as process number ~D."
-msgstr "Este programa estase executando como o proceso número ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-clisp to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-clisp 0.18\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"
-"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"
-
-#: hello.lisp.in:11
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.lisp.in:13
-#, lisp-format
-msgid "This program is running as process number ~D."
-msgstr "Ovaj program je pokrenut kao proces broj ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-clisp.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-clisp package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.lisp.in:13
 #, lisp-format
 msgid "This program is running as process number ~D."
-msgstr "Ez a program a(z) ~D folyamatazonosítóval fut."
+msgstr "Ez a program a ~D processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-clisp' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-clisp package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-clisp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-clisp 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-clisp 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-clisp package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.lisp.in:11
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.lisp.in:13
-#, lisp-format
-msgid "This program is running as process number ~D."
-msgstr "Dette programmet kjører som prosess nummer ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-clisp.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-clisp-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-clisp package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp-0.19-rc1\n"
+"Project-Id-Version: hello-clisp-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp-0.19-rc1\n"
+"Project-Id-Version: hello-clisp-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.lisp.in:11
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.lisp.in:13
-#, lisp-format
-msgid "This program is running as process number ~D."
-msgstr "Este programa está executando com número de processo ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-clisp-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-clisp package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.lisp.in:13
 #, lisp-format
 msgid "This program is running as process number ~D."
-msgstr "Эта программа выполняется как процесс под номером ~D."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-clisp package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-clisp package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-clisp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-clisp 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-clisp-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-clisp.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-clisp' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp-0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-clisp.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-clisp
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-clisp package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.lisp.in:13
 #, lisp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19-rc1\n"
+"Project-Id-Version: hello-clisp 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.lisp.in:13
 #, lisp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-clisp/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-clisp/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-clisp/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-clisp.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-clisp.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.18\n"
+"Project-Id-Version: hello-clisp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.lisp.in:13
 #, lisp-format
 msgid "This program is running as process number ~D."
-msgstr "本程式正在執行，行程編號為 ~D。"
+msgstr "本程式正在執行中，進程編號為 ~D。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c++-qt package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-qt 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.cc:52
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Програмата е пусната под процес номер %1."
+msgstr "Програмата е запусната под процес номер %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-qt 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cc:45
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.cc:52
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Tento program běží jako proces číslo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-c++-qt.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-qt 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cc:45
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.cc:52
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Dette program k�rer som proces nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c++-qt.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-qt package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt-0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.cc:52
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Este programa está corriendo como el proceso número %1."
+msgstr "Este programa est� corriendo como el proceso n�mero %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-c++-qt package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cc:45
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.cc:52
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Este programa estase executando como o proceso número %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-c++-qt to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-qt 0.18\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"
-"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"
-
-#: hello.cc:45
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.cc:52
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Ovaj program je pokrenut kao proces broj %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-c++-qt.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-qt package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.cc:52
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Ez a program a(z) %1 folyamatazonosítóval fut."
+msgstr "Ez a program a %1 processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c++-qt' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-qt package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-qt 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -194,7 +194,7 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/locale
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/locale
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -206,7 +206,7 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/locale
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/locale
 
 uninstall-local: uninstall-local-@USE_NLS@
 uninstall-local-no:
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++-qt 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-c++-qt package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cc:45
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.cc:52
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Dette programmet kjører som prosess nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c++-qt.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c++-qt-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-qt package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt-0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt-0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cc:45
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.cc:52
-#, qt-format
-msgid "This program is running as process number %1."
-msgstr "Este programa está executando com número de processo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-c++-qt-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-qt package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.cc:52
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "Эта программа выполняется как процесс под номером %1."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c++-qt package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c++-qt package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-qt 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c++-qt-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c++-qt.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c++-qt' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt-0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c++-qt.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/uk.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-c++-qt
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-qt package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.cc:52
 #, qt-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.cc:52
 #, qt-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-qt/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-qt/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c++-qt.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c++-qt.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.18\n"
+"Project-Id-Version: hello-c++-qt 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.cc:45
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.cc:52
 #, qt-format
 msgid "This program is running as process number %1."
-msgstr "本程式正在執行，行程編號為 %1。"
+msgstr "本程式正在執行中，進程編號為 %1。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-csharp/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -52,19 +52,19 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_DATA) hello.net.exe $(DESTDIR)$(pkglibdir)/hello.net.exe
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) csharpexec.sh $(DESTDIR)$(pkgdatadir)/csharpexec.sh
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-csharp package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-csharp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-csharp 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.cs:17
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cs:14
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.cs:17
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-csharp.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cs:14
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.cs:17
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-csharp.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-csharp package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.cs:17
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-csharp package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cs:14
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.cs:17
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-csharp to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp 0.18\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"
-"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"
-
-#: hello.cs:14
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.cs:17
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-csharp.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.cs:17
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-csharp' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-csharp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-csharp 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -183,10 +183,10 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(MKDIR_P) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$(pkglibdir)/$$cat; \
 	  echo "installing $$realcat as $(DESTDIR)$(pkglibdir)/$$cat"; \
@@ -195,10 +195,10 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(MKDIR_P) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	done
 
 uninstall-local: uninstall-local-@USE_NLS@
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-csharp 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-csharp package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cs:14
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.cs:17
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-csharp.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-csharp-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cs:14
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.cs:17
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-csharp-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-csharp package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.cs:17
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-csharp package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-csharp package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-csharp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-csharp 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-csharp-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-csharp.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-csharp' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-csharp.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-csharp
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.cs:17
 #, csharp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19-rc1\n"
+"Project-Id-Version: hello-csharp 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.cs:17
 #, csharp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-csharp.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-csharp.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.18\n"
+"Project-Id-Version: hello-csharp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.cs:14
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.cs:17
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -52,19 +52,19 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_DATA) hello.net.exe $(DESTDIR)$(pkglibdir)/hello.net.exe
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) csharpexec.sh $(DESTDIR)$(pkgdatadir)/csharpexec.sh
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-csharp-forms package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: GNU hello-csharp-forms 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cs:29
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-csharp-forms.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cs:29
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-csharp-forms.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-csharp-forms package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-csharp-forms package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cs:29
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-csharp-forms to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.18\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"
-"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"
-
-#: hello.cs:29
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-csharp-forms.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp-forms package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-csharp-forms' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp-forms package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: GNU hello-csharp-forms 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -183,10 +183,10 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(MKDIR_P) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$(pkglibdir)/$$cat; \
 	  echo "installing $$realcat as $(DESTDIR)$(pkglibdir)/$$cat"; \
@@ -195,10 +195,10 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(MKDIR_P) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	done
 
 uninstall-local: uninstall-local-@USE_NLS@
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-csharp-forms 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-csharp-forms package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cs:29
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-csharp-forms.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-csharp-forms-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp-forms package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cs:29
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-csharp-forms-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-csharp-forms package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-csharp-forms package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-csharp-forms package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: GNU hello-csharp-forms 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-csharp-forms-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-csharp-forms.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-csharp-forms' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms-0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-csharp-forms.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-csharp-forms
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-csharp-forms package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.cs:36
 #, csharp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.cs:36
 #, csharp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-csharp-forms/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-csharp-forms/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-csharp-forms.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-csharp-forms.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.18\n"
+"Project-Id-Version: hello-csharp-forms 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.cs:29
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-c++-wxwidgets package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-wxwidgets 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.cc:71
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.cc:68
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.cc:71
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-c++-wxwidgets.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.cc:68
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.cc:71
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-c++-wxwidgets.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-wxwidgets package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets-0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.cc:71
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-c++-wxwidgets package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.cc:68
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.cc:71
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-c++-wxwidgets to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.18\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"
-"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"
-
-#: hello.cc:68
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.cc:71
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-c++-wxwidgets.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-wxwidgets package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.cc:71
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-c++-wxwidgets' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-wxwidgets package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-wxwidgets 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -201,13 +201,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -244,13 +244,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/mt.po	2010-06-06 21:16:06.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++-wxwidgets 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-c++-wxwidgets package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.cc:68
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.cc:71
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-c++-wxwidgets.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-c++-wxwidgets-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-wxwidgets package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets-0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets-0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.cc:68
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.cc:71
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-c++-wxwidgets-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-c++-wxwidgets package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.cc:71
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-c++-wxwidgets package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-c++-wxwidgets package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: GNU hello-c++-wxwidgets 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-c++-wxwidgets-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-c++-wxwidgets.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-c++-wxwidgets' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets-0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-c++-wxwidgets.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-c++-wxwidgets
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-c++-wxwidgets package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.cc:71
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.cc:71
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-c++-wxwidgets/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-c++-wxwidgets/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-c++-wxwidgets.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-c++-wxwidgets.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.18\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.cc:68
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.cc:71
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-gawk package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-gawk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-gawk 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.awk:12
 #, awk-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-gawk 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.awk:11
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.awk:12
-#, awk-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-gawk.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-gawk 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.awk:11
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.awk:12
-#, awk-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-gawk.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-gawk package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk-0.19-rc1\n"
+"Project-Id-Version: hello-gawk-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.awk:12
 #, awk-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-gawk package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.awk:11
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.awk:12
-#, awk-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-gawk to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-gawk 0.18\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"
-"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"
-
-#: hello.awk:11
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.awk:12
-#, awk-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-gawk.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-gawk package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.awk:12
 #, awk-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-gawk' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-gawk package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-gawk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-gawk 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-gawk 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-gawk package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.awk:11
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.awk:12
-#, awk-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-gawk.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-gawk-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-gawk package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk-0.19-rc1\n"
+"Project-Id-Version: hello-gawk-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk-0.19-rc1\n"
+"Project-Id-Version: hello-gawk-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.awk:11
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.awk:12
-#, awk-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-gawk-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-gawk package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.awk:12
 #, awk-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-gawk package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-gawk package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-gawk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-gawk 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-gawk-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-gawk.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-gawk' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk-0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-gawk.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-gawk
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-gawk package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.awk:12
 #, awk-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19-rc1\n"
+"Project-Id-Version: hello-gawk 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.awk:12
 #, awk-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-gawk/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-gawk/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-gawk/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-gawk.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-gawk.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.18\n"
+"Project-Id-Version: hello-gawk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.awk:11
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.awk:12
 #, awk-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-guile package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-guile 0.19-rc1\n"
+"Project-Id-Version: GNU hello-guile 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Програмата е пусната под процес номер ~D."
+msgstr "Програмата е запусната под процес номер ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-guile 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.scm:15
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Tento program běží jako proces číslo ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-guile.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-guile 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.scm:15
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Dette program k�rer som proces nummer ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-guile.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-guile package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile-0.19-rc1\n"
+"Project-Id-Version: hello-guile-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Este programa está corriendo como el proceso número ~D."
+msgstr "Este programa est� corriendo como el proceso n�mero ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-guile package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.scm:15
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Este programa estase executando como o proceso número ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-guile to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-guile 0.18\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"
-"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"
-
-#: hello.scm:15
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Ovaj program je pokrenut kao proces broj ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-guile.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-guile package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Ez a program a(z) ~D folyamatazonosítóval fut."
+msgstr "Ez a program a ~D processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-guile' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-guile package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-guile 0.19-rc1\n"
+"Project-Id-Version: GNU hello-guile 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-guile 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-guile package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.scm:15
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Dette programmet kjører som prosess nummer ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-guile.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-guile-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-guile package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile-0.19-rc1\n"
+"Project-Id-Version: hello-guile-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile-0.19-rc1\n"
+"Project-Id-Version: hello-guile-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.scm:15
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Este programa está executando com número de processo ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-guile-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-guile package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Эта программа выполняется как процесс под номером ~D."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� ~D."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-guile package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-guile package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-guile 0.19-rc1\n"
+"Project-Id-Version: GNU hello-guile 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-guile-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-guile.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-guile' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile-0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-guile.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-guile
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-guile package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.scm:17
 #, scheme-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19-rc1\n"
+"Project-Id-Version: hello-guile 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.scm:17
 #, scheme-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-guile/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-guile/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-guile/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-guile.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-guile.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.18\n"
+"Project-Id-Version: hello-guile 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.scm:15
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "本程式正在執行，行程編號為 ~D。"
+msgstr "本程式正在執行中，進程編號為 ~D。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/configure.ac gettext-0.18.1.1/gettext-tools/examples/hello-java/configure.ac
--- gettext-0.19.3/gettext-tools/examples/hello-java/configure.ac	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -32,7 +32,7 @@
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-if test -n "$HAVE_JAVAEXEC" && test "$BUILDJAVA" = yes; then
+if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
   TESTJAVA=no
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-java/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-java/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -93,19 +93,19 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -141,18 +141,18 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-java package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: Hello.java:18
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: Hello.java:14
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: Hello.java:18
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-java.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Hello.java:14
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: Hello.java:18
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-java.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-0.19-rc1\n"
+"Project-Id-Version: hello-java-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: Hello.java:18
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-java package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: Hello.java:14
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: Hello.java:18
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-java to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java 0.18\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"
-"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"
-
-#: Hello.java:14
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: Hello.java:18
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-java.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: Hello.java:18
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-java' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-java/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-java 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-java package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: Hello.java:14
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: Hello.java:18
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-java.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-java-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-0.19-rc1\n"
+"Project-Id-Version: hello-java-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-0.19-rc1\n"
+"Project-Id-Version: hello-java-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: Hello.java:14
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: Hello.java:18
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-java-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: Hello.java:18
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-java package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-java package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-java-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-java.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-java' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-0.19-rc1\n"
+"Project-Id-Version: hello-java 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-java.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-java
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: Hello.java:18
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19-rc1\n"
+"Project-Id-Version: hello-java 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: Hello.java:18
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-java/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-java/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-java.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-java.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.18\n"
+"Project-Id-Version: hello-java 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: Hello.java:14
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: Hello.java:18
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/configure.ac gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/configure.ac
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/configure.ac	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -18,7 +18,7 @@
   BUILDJAVAEXE=no
 fi
 AC_SUBST(BUILDJAVAEXE)
-AM_CONDITIONAL([USEJEXE], [test "$BUILDJAVAEXE" = yes])
+AM_CONDITIONAL([USEJEXE], [test $BUILDJAVAEXE = yes])
 AC_PROG_RANLIB
 
 dnl Check whether we can execute Java programs.
@@ -32,7 +32,7 @@
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-if test -n "$HAVE_JAVAEXEC" && test "$BUILDJAVA" = yes; then
+if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
   TESTJAVA=no
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -93,19 +93,19 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -141,18 +141,18 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-java-awt package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-awt 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: Hello.java:28
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-awt 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: Hello.java:23
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: Hello.java:28
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-java-awt.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-awt 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Hello.java:23
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: Hello.java:28
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-java-awt.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java-awt package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt-0.19-rc1\n"
+"Project-Id-Version: hello-java-awt-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: Hello.java:28
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-java-awt package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: Hello.java:23
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: Hello.java:28
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-java-awt to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-awt 0.18\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"
-"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"
-
-#: Hello.java:23
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: Hello.java:28
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-java-awt.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-awt package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: Hello.java:28
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-java-awt' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-awt package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-awt 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-java-awt 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-java-awt package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: Hello.java:23
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: Hello.java:28
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-java-awt.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-java-awt-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-awt package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt-0.19-rc1\n"
+"Project-Id-Version: hello-java-awt-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt-0.19-rc1\n"
+"Project-Id-Version: hello-java-awt-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: Hello.java:23
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: Hello.java:28
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-java-awt-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java-awt package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: Hello.java:28
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-java-awt package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-java-awt package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-awt 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-java-awt-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-java-awt.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-java-awt' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt-0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-java-awt.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-java-awt
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-awt package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: Hello.java:28
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19-rc1\n"
+"Project-Id-Version: hello-java-awt 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: Hello.java:28
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-awt/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-awt/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-java-awt.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-java-awt.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.18\n"
+"Project-Id-Version: hello-java-awt 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: Hello.java:23
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: Hello.java:28
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/configure.ac gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/configure.ac
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/configure.ac	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -20,7 +20,7 @@
 dnl fi
 BUILDJAVAEXE=no
 AC_SUBST(BUILDJAVAEXE)
-AM_CONDITIONAL([USEJEXE], [test "$BUILDJAVAEXE" = yes])
+AM_CONDITIONAL([USEJEXE], [test $BUILDJAVAEXE = yes])
 AC_PROG_RANLIB
 
 dnl Check whether we can execute Java programs.
@@ -34,7 +34,7 @@
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-if test -n "$HAVE_JAVAEXEC" && test "$BUILDJAVA" = yes; then
+if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
   TESTJAVA=no
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -93,19 +93,19 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -141,18 +141,18 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-java-qtjambi package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-qtjambi 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: Hello.java:34
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: Hello.java:27
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: Hello.java:34
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-java-qtjambi.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Hello.java:27
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: Hello.java:34
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-java-qtjambi.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java-qtjambi package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi-0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: Hello.java:34
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-java-qtjambi package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: Hello.java:27
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: Hello.java:34
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-java-qtjambi to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.18\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"
-"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"
-
-#: Hello.java:27
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: Hello.java:34
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-java-qtjambi.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-qtjambi package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: Hello.java:34
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-java-qtjambi' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-qtjambi package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-qtjambi 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-java-qtjambi 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-java-qtjambi package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: Hello.java:27
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: Hello.java:34
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-java-qtjambi.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-java-qtjambi-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-qtjambi package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi-0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi-0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: Hello.java:27
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: Hello.java:34
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-java-qtjambi-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java-qtjambi package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: Hello.java:34
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-java-qtjambi package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-java-qtjambi package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-qtjambi 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-java-qtjambi-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-java-qtjambi.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-java-qtjambi' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi-0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-java-qtjambi.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-java-qtjambi
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-qtjambi package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: Hello.java:34
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: Hello.java:34
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-qtjambi/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-qtjambi/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-java-qtjambi.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-java-qtjambi.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.18\n"
+"Project-Id-Version: hello-java-qtjambi 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: Hello.java:27
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: Hello.java:34
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/configure.ac gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/configure.ac
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/configure.ac	2014-04-22 09:40:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/configure.ac	2010-06-06 12:49:57.000000000 +0000
@@ -18,7 +18,7 @@
   BUILDJAVAEXE=no
 fi
 AC_SUBST(BUILDJAVAEXE)
-AM_CONDITIONAL([USEJEXE], [test "$BUILDJAVAEXE" = yes])
+AM_CONDITIONAL([USEJEXE], [test $BUILDJAVAEXE = yes])
 AC_PROG_RANLIB
 
 dnl Check whether we can execute Java programs.
@@ -32,7 +32,7 @@
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-if test -n "$HAVE_JAVAEXEC" && test "$BUILDJAVA" = yes; then
+if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
   TESTJAVA=no
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -93,19 +93,19 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -141,18 +141,18 @@
 	} > $@
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-java-swing package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-swing 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: Hello.java:25
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-swing 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: Hello.java:20
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: Hello.java:25
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-java-swing.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-swing 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Hello.java:20
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: Hello.java:25
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-java-swing.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java-swing package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing-0.19-rc1\n"
+"Project-Id-Version: hello-java-swing-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: Hello.java:25
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-java-swing package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: Hello.java:20
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: Hello.java:25
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-java-swing to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-swing 0.18\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"
-"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"
-
-#: Hello.java:20
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: Hello.java:25
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-java-swing.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-swing package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: Hello.java:25
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-java-swing' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-swing package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-swing 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-java-swing 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-java-swing package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: Hello.java:20
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: Hello.java:25
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-java-swing.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-java-swing-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-swing package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing-0.19-rc1\n"
+"Project-Id-Version: hello-java-swing-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing-0.19-rc1\n"
+"Project-Id-Version: hello-java-swing-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: Hello.java:20
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: Hello.java:25
-#, java-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-java-swing-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-java-swing package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: Hello.java:25
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-java-swing package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-java-swing package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: GNU hello-java-swing 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-java-swing-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-java-swing.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-java-swing' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing-0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-java-swing.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-java-swing
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-java-swing package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: Hello.java:25
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19-rc1\n"
+"Project-Id-Version: hello-java-swing 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: Hello.java:25
 #, java-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-java-swing/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-java-swing/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-java-swing.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-java-swing.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.18\n"
+"Project-Id-Version: hello-java-swing 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: Hello.java:20
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: Hello.java:25
 #, java-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-librep package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-librep 0.19-rc1\n"
+"Project-Id-Version: GNU hello-librep 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.jl.in:14
 #, librep-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-librep 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.jl.in:12
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.jl.in:14
-#, librep-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-librep.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-librep 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.jl.in:12
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.jl.in:14
-#, librep-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-librep.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-librep package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep-0.19-rc1\n"
+"Project-Id-Version: hello-librep-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.jl.in:14
 #, librep-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-librep package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.jl.in:12
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.jl.in:14
-#, librep-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-librep to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-librep 0.18\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"
-"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"
-
-#: hello.jl.in:12
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.jl.in:14
-#, librep-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-librep.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-librep package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.jl.in:14
 #, librep-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-librep' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-librep package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-librep 0.19-rc1\n"
+"Project-Id-Version: GNU hello-librep 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-librep 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-librep package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.jl.in:12
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.jl.in:14
-#, librep-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-librep.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-librep-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-librep package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep-0.19-rc1\n"
+"Project-Id-Version: hello-librep-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep-0.19-rc1\n"
+"Project-Id-Version: hello-librep-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.jl.in:12
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.jl.in:14
-#, librep-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-librep-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-librep package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.jl.in:14
 #, librep-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-librep package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-librep package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-librep 0.19-rc1\n"
+"Project-Id-Version: GNU hello-librep 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-librep-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-librep.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-librep' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep-0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-librep.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-librep
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-librep package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.jl.in:14
 #, librep-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19-rc1\n"
+"Project-Id-Version: hello-librep 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.jl.in:14
 #, librep-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-librep/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-librep/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-librep/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-librep.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-librep.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.18\n"
+"Project-Id-Version: hello-librep 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.jl.in:12
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.jl.in:14
 #, librep-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-objc package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.m:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.m:30
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.m:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-objc.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.m:30
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.m:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-objc.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-objc package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.m:30
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-0.19-rc1\n"
+"Project-Id-Version: hello-objc-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.m:30
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.m:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-objc package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.m:30
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.m:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-objc to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc 0.18\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"
-"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"
-
-#: hello.m:30
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.m:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-objc.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.m:30
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.m:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-objc' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-objc 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-objc package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.m:30
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.m:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-objc.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-objc-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-0.19-rc1\n"
+"Project-Id-Version: hello-objc-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.m:30
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-0.19-rc1\n"
+"Project-Id-Version: hello-objc-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.m:30
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.m:31
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-objc-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-objc package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.m:30
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.m:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-objc package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-objc package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-objc-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-objc.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-objc' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.m:30
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-objc.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-objc
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.m:30
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.m:31
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19-rc1\n"
+"Project-Id-Version: hello-objc 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.m:30
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.m:31
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-objc.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-objc.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.18\n"
+"Project-Id-Version: hello-objc 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.m:30
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.m:31
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-objc-gnome package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc-gnome 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.m:52
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.m:47
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.m:52
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-objc-gnome.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.m:47
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.m:52
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-objc-gnome.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-objc-gnome package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.m:47
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.m:47
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.m:52
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-objc-gnome package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.m:47
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.m:52
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-objc-gnome to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.18\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"
-"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"
-
-#: hello.m:47
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.m:52
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-objc-gnome.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnome package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.m:47
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.m:52
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-objc-gnome' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnome package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc-gnome 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-objc-gnome 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-objc-gnome package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.m:47
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.m:52
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-objc-gnome.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-objc-gnome-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnome package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.m:47
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.m:47
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.m:52
-#, c-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-objc-gnome-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-objc-gnome package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.m:47
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.m:52
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-objc-gnome package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-objc-gnome package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc-gnome 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-objc-gnome-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-objc-gnome.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-objc-gnome' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.m:47
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-objc-gnome.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-objc-gnome
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnome package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.m:47
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.m:52
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.m:47
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.m:52
 #, c-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnome/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnome/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-objc-gnome.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-objc-gnome.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.18\n"
+"Project-Id-Version: hello-objc-gnome 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.m:47
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.m:52
 #, c-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-objc-gnustep package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc-gnustep 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: Hello.m:58
 #, objc-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: Hello.m:49
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: Hello.m:58
-#, objc-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-objc-gnustep.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Hello.m:49
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: Hello.m:58
-#, objc-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-objc-gnustep.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-objc-gnustep package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: Hello.m:58
 #, objc-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-objc-gnustep package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: Hello.m:49
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: Hello.m:58
-#, objc-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-objc-gnustep to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.18\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"
-"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"
-
-#: Hello.m:49
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: Hello.m:58
-#, objc-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-objc-gnustep.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnustep package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: Hello.m:58
 #, objc-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-objc-gnustep' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnustep package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc-gnustep 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/LocaleAliases gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/LocaleAliases
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/LocaleAliases	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/LocaleAliases	2010-06-06 12:49:57.000000000 +0000
@@ -9,16 +9,9 @@
 NSLOCALE_aa_DJ = DjiboutiAfar
 NSLOCALE_aa_ER = EritreaAfar
 NSLOCALE_aa_ET = EthiopiaAfar
-NSLOCALE_ab = Abkhazian
-NSLOCALE_ace = Achinese
-NSLOCALE_ach = Acoli
-NSLOCALE_ada = Adangme
-NSLOCALE_ady = Adyghe
 NSLOCALE_af = Afrikaans
-NSLOCALE_ak = Akan
 NSLOCALE_am = Amharic
 NSLOCALE_an = Aragonese
-NSLOCALE_anp = Angika
 NSLOCALE_ar = Arabic
 NSLOCALE_ar_AE = UnitedArabEmiratesArabic
 NSLOCALE_ar_BH = BahrainArabic
@@ -38,47 +31,17 @@
 NSLOCALE_ar_SY = SyriaArabic
 NSLOCALE_ar_TN = TunisiaArabic
 NSLOCALE_ar_YE = YemenArabic
-NSLOCALE_arn = Mapudungun
-NSLOCALE_as = Assamese
-NSLOCALE_ast = Asturian
-NSLOCALE_av = Avaric
-NSLOCALE_awa = Awadhi
-NSLOCALE_ay = Aymara
 NSLOCALE_az = Azerbaijani
-NSLOCALE_ba = Bashkir
-NSLOCALE_bal = Baluchi
-NSLOCALE_ban = Balinese
-NSLOCALE_bas = Basa
 NSLOCALE_be = Belarusian
-NSLOCALE_bej = Beja
-NSLOCALE_bem = Bemba
 NSLOCALE_bg = Bulgarian
-NSLOCALE_bh = Bihari
-NSLOCALE_bho = Bhojpuri
-NSLOCALE_bi = Bislama
-NSLOCALE_bik = Bikol
-NSLOCALE_bin = Bini
-NSLOCALE_bm = Bambara
 NSLOCALE_bn = Bengali
 NSLOCALE_bn_BD = BangladeshBengali
 NSLOCALE_bn_IN = IndiaBengali
-NSLOCALE_bo = Tibetan
 NSLOCALE_br = Breton
 NSLOCALE_bs = Bosnian
-NSLOCALE_bua = Buriat
-NSLOCALE_bug = Buginese
 NSLOCALE_byn = Blin
 NSLOCALE_ca = Catalan
-NSLOCALE_ce = Chechen
-NSLOCALE_ceb = Cebuano
-NSLOCALE_ch = Chamorro
-NSLOCALE_chm = Mari
-NSLOCALE_co = Corsican
-NSLOCALE_cr = Cree
-NSLOCALE_crh = CrimeanTatar
 NSLOCALE_cs = Czech
-NSLOCALE_cu = ChurchSlavic
-NSLOCALE_cv = Chuvash
 NSLOCALE_cy = Welsh
 NSLOCALE_da = Danish
 NSLOCALE_de = German
@@ -86,12 +49,6 @@
 NSLOCALE_de_BE = BelgiumGerman
 NSLOCALE_de_CH = SwitzerlandGerman
 NSLOCALE_de_LU = LuxemburgGerman
-NSLOCALE_din = Dinka
-NSLOCALE_doi = Dogri
-NSLOCALE_dv = Maldivian
-NSLOCALE_dyu = Dyula
-NSLOCALE_dz = Bhutani
-NSLOCALE_efi = Efik
 NSLOCALE_el = Greek
 NSLOCALE_el_GR = GreeceGreek
 NSLOCALE_en = English
@@ -118,7 +75,6 @@
 NSLOCALE_es_CR = CostaRicaSpanish
 NSLOCALE_es_DO = DominicanRepublicSpanish
 NSLOCALE_es_EC = EcuadorSpanish
-NSLOCALE_es_ES = SpainSpanish
 NSLOCALE_es_GT = GuatemalaSpanish
 NSLOCALE_es_HN = HondurasSpanish
 NSLOCALE_es_MX = MexicoSpanish
@@ -135,199 +91,73 @@
 NSLOCALE_et_EE = EstoniaEstonian
 NSLOCALE_eu = Basque
 NSLOCALE_eu_ES = SpainBasque
-NSLOCALE_ewo = Ewondo
 NSLOCALE_fa = Persian
-NSLOCALE_fan = Fang
-NSLOCALE_ff = Fulah
 NSLOCALE_fi = Finnish
-NSLOCALE_fil = Filipino
-NSLOCALE_fj = Fijian
 NSLOCALE_fo = Faroese
-NSLOCALE_fon = Fon
 NSLOCALE_fr = French
 NSLOCALE_fr_BE = BelgiumFrench
 NSLOCALE_fr_CA = CanadaFrench
 NSLOCALE_fr_CH = SwitzerlandFrench
 NSLOCALE_fr_LU = LuxemburgFrench
-NSLOCALE_fur = Friulian
-NSLOCALE_fy = WesternFrisian
 NSLOCALE_ga = Irish
-NSLOCALE_gaa = Ga
-NSLOCALE_gay = Gayo
-NSLOCALE_gba = Gbaya
 NSLOCALE_gd = Gaelic
 NSLOCALE_gd_GB = ScotsGaelic
 NSLOCALE_gez = Geez
 NSLOCALE_gez_ER = EritreaGeez
 NSLOCALE_gez_ET = EthiopiaGeez
 NSLOCALE_gl = Gallegan
-NSLOCALE_gn = Guarani
-NSLOCALE_gon = Gondi
-NSLOCALE_gor = Gorontalo
-NSLOCALE_grb = Grebo
 NSLOCALE_gu = Gujarati
 NSLOCALE_gv = Manx
-NSLOCALE_ha = Hausa
 NSLOCALE_he = Hebrew
 NSLOCALE_hi = Hindi
-NSLOCALE_hil = Hiligaynon
-NSLOCALE_hmn = Hmong
-NSLOCALE_ho = HiriMotu
 NSLOCALE_hr = Croatian
-NSLOCALE_ht = Haitian
 NSLOCALE_hu = Hungarian
 NSLOCALE_hy = Armenian
-NSLOCALE_hz = Herero
-NSLOCALE_ia = Interlingua
-NSLOCALE_iba = Iban
 NSLOCALE_id = Indonesian
-NSLOCALE_ie = Interlingue
-NSLOCALE_ig = Igbo
-NSLOCALE_ii = SichuanYi
-NSLOCALE_ik = Inupiak
-NSLOCALE_ilo = Iloko
-NSLOCALE_inh = Ingush
-NSLOCALE_io = Ido
+NSLOCALE_in = Indonesian
 NSLOCALE_is = Icelandic
 NSLOCALE_it = Italian
 NSLOCALE_it_CH = SwitzerlandItalian
-NSLOCALE_iu = Inuktitut
 NSLOCALE_iw = Hebrew
 NSLOCALE_ja = Japanese
-NSLOCALE_jv = Javanese
 NSLOCALE_ka = Georgian
-NSLOCALE_kaa = KaraKalpak
-NSLOCALE_kab = Kabyle
-NSLOCALE_kac = Kachin
-NSLOCALE_kam = Kamba
-NSLOCALE_kbd = Kabardian
-NSLOCALE_kg = Kongo
-NSLOCALE_kha = Khasi
-NSLOCALE_ki = Kikuyu
-NSLOCALE_kj = Kwanyama
-NSLOCALE_kk = Kazakh
 NSLOCALE_kl = Greenlandic
-NSLOCALE_km = Cambodian
-NSLOCALE_kmb = Kimbundu
 NSLOCALE_kn = Kannada
 NSLOCALE_ko = Korean
-NSLOCALE_kr = Kanuri
-NSLOCALE_krc = KarachayBalkar
-NSLOCALE_krl = Karelian
-NSLOCALE_kru = Kurukh
-NSLOCALE_ks = Kashmiri
-NSLOCALE_ku = Kurdish
-NSLOCALE_kum = Kumyk
-NSLOCALE_kv = Komi
 NSLOCALE_kw = Cornish
-NSLOCALE_ky = Kirghiz
-NSLOCALE_la = Latin
-NSLOCALE_lad = Ladino
-NSLOCALE_lam = Lamba
-NSLOCALE_lb = Luxembourgish
-NSLOCALE_lez = Lezghian
-NSLOCALE_lg = Ganda
-NSLOCALE_li = Limburgish
-NSLOCALE_ln = Lingala
 NSLOCALE_lo = Lao
-NSLOCALE_lol = Mongo
-NSLOCALE_loz = Lozi
 NSLOCALE_lt = Lithuanian
-NSLOCALE_lu = LubaKatanga
-NSLOCALE_lua = LubaLulua
 NSLOCALE_lug = Luganda
-NSLOCALE_lun = Lunda
-NSLOCALE_luo = Luo
-NSLOCALE_lus = Lushai
 NSLOCALE_lv = Latvian
-NSLOCALE_mad = Madurese
-NSLOCALE_mag = Magahi
-NSLOCALE_mai = Maithili
-NSLOCALE_mak = Makasar
-NSLOCALE_man = Mandingo
-NSLOCALE_mas = Masai
-NSLOCALE_mdf = Moksha
-NSLOCALE_mdr = Mandar
-NSLOCALE_men = Mende
-NSLOCALE_mg = Malagasy
-NSLOCALE_mh = Marshallese
 NSLOCALE_mi = Maori
-NSLOCALE_min = Minangkabau
 NSLOCALE_mk = Macedonian
 NSLOCALE_ml = Malayalam
 NSLOCALE_mn = Mongolian
-NSLOCALE_mni = Manipuri
-NSLOCALE_mo = Moldavian
-NSLOCALE_mos = Mossi
 NSLOCALE_mr = Marathi
 NSLOCALE_ms = Malay
 NSLOCALE_mt = Maltese
-NSLOCALE_my = Burmese
-NSLOCALE_myv = Erzya
-NSLOCALE_na = Nauru
-NSLOCALE_nap = Neapolitan
 NSLOCALE_nb = NorwegianBokmal
-NSLOCALE_nd = NdebeleNorth
 NSLOCALE_ne = Nepali
-NSLOCALE_new = NepalBhasa
-NSLOCALE_ng = Ndonga
-NSLOCALE_nia = Nias
 NSLOCALE_nl = Dutch
 NSLOCALE_nl_BE = BelgiumDutch
 NSLOCALE_nl_NL = NetherlandsDutch
 NSLOCALE_nn = NorwegianNynorsk
 NSLOCALE_no = Norwegian
-NSLOCALE_nr = NdebeleSouth
-NSLOCALE_nso = Pedi
-NSLOCALE_nv = Navajo
-NSLOCALE_ny = Chichewa
-NSLOCALE_nym = Nyamwezi
-NSLOCALE_nyn = Nyankole
-NSLOCALE_nyo = Nyoro
-NSLOCALE_nzi = Nzima
 NSLOCALE_oc = Occitan
-NSLOCALE_oj = Ojibwa
 NSLOCALE_om = Oromo
 NSLOCALE_om_ET = EthiopiaOromo
 NSLOCALE_om_KE = KenyaOromo
-NSLOCALE_or = Oriya
-NSLOCALE_os = Ossetian
 NSLOCALE_pa = Punjabi
-NSLOCALE_pag = Pangasinan
-NSLOCALE_pam = Pampanga
-NSLOCALE_pap = Papiamento
-NSLOCALE_pi = Pali
 NSLOCALE_pl = Polish
-NSLOCALE_ps = Pashto
 NSLOCALE_pt = Portuguese
 NSLOCALE_pt_BR = BrasilPortuguese
-NSLOCALE_qu = Quechua
-NSLOCALE_raj = Rajasthani
-NSLOCALE_rm = Romansh
-NSLOCALE_rn = Rundi
 NSLOCALE_ro = Romanian
 NSLOCALE_ru = Russian
 NSLOCALE_ru_UA = UkraineRussian
-NSLOCALE_rup = Aromanian
-NSLOCALE_rw = Kinyarwanda
-NSLOCALE_sa = Sanskrit
-NSLOCALE_sah = Yakut
-NSLOCALE_sas = Sasak
-NSLOCALE_sat = Santali
-NSLOCALE_scn = Sicilian
-NSLOCALE_sco = Scots
-NSLOCALE_sc = Sardinian
-NSLOCALE_sd = Sindhi
 NSLOCALE_se = NorthernSaami
-NSLOCALE_sg = Sango
-NSLOCALE_shn = Shan
-NSLOCALE_si = Sinhala
 NSLOCALE_sid = Sidamo
 NSLOCALE_sk = Slovak
 NSLOCALE_sl = Slovenian
-NSLOCALE_sm = Samoan
-NSLOCALE_sn = Shona
-NSLOCALE_snk = Soninke
 NSLOCALE_so = Somali
 NSLOCALE_so_DJ = DjiboutiSomali
 NSLOCALE_so_ET = EthiopiaSomali
@@ -335,58 +165,27 @@
 NSLOCALE_so_SO = SomaliaSomali
 NSLOCALE_sq = Albanian
 NSLOCALE_sr = Serbian
-NSLOCALE_srr = Serer
-NSLOCALE_ss = Swati
 NSLOCALE_st = Sotho
-NSLOCALE_su = Sundanese
-NSLOCALE_suk = Sukuma
-NSLOCALE_sus = Susu
 NSLOCALE_sv = Swedish
 NSLOCALE_sv_FI = FinlandSwedish
-NSLOCALE_sw = Swahili
 NSLOCALE_ta = Tamil
 NSLOCALE_te = Telugu
-NSLOCALE_tem = Timne
-NSLOCALE_tet = Tetum
 NSLOCALE_tg = Tajik
 NSLOCALE_th = Thai
 NSLOCALE_ti = Tigrinya
 NSLOCALE_ti_ER = EritreaTigrinya
 NSLOCALE_ti_ET = EthiopiaTigrinya
 NSLOCALE_tig = Tigre
-NSLOCALE_tiv = Tiv
-NSLOCALE_tk = Turkmen
 NSLOCALE_tl = Tagalog
-NSLOCALE_tn = Tswana
-NSLOCALE_to = Tonga
-NSLOCALE_tog = TongaNyasa
-NSLOCALE_tpi = TokPisin
 NSLOCALE_tr = Turkish
-NSLOCALE_ts = Tsonga
 NSLOCALE_tt = Tatar
-NSLOCALE_tum = Tumbuka
-NSLOCALE_tw = Twi
-NSLOCALE_ty = Tahitian
-NSLOCALE_tyv = Tuvinian
-NSLOCALE_udm = Udmurt
-NSLOCALE_ug = Uighur
 NSLOCALE_uk = Ukrainian
-NSLOCALE_umb = Umbundu
 NSLOCALE_ur = Urdu
 NSLOCALE_uz = Uzbek
-NSLOCALE_vai = Vai
-NSLOCALE_ve = Venda
 NSLOCALE_vi = Vietnamese
 NSLOCALE_wa = Walloon
-NSLOCALE_wal = Walamo
-NSLOCALE_war = Waray
-NSLOCALE_wo = Wolof
-NSLOCALE_xal = Kalmyk
 NSLOCALE_xh = Xhosa
-NSLOCALE_yao = Yao
 NSLOCALE_yi = Yiddish
-NSLOCALE_yo = Yoruba
-NSLOCALE_za = Zhuang
 NSLOCALE_zh = Chinese
 NSLOCALE_zh_CN = SimplifiedChinese
 NSLOCALE_zh_HK = HongKongChinese
@@ -398,16 +197,9 @@
 UNIXLOCALE_DjiboutiAfar = aa_DJ
 UNIXLOCALE_EritreaAfar = aa_ER
 UNIXLOCALE_EthiopiaAfar = aa_ET
-UNIXLOCALE_Abkhazian = ab
-UNIXLOCALE_Achinese = ace
-UNIXLOCALE_Acoli = ach
-UNIXLOCALE_Adangme = ada
-UNIXLOCALE_Adyghe = ady
 UNIXLOCALE_Afrikaans = af
-UNIXLOCALE_Akan = ak
 UNIXLOCALE_Amharic = am
 UNIXLOCALE_Aragonese = an
-UNIXLOCALE_Angika = anp
 UNIXLOCALE_Arabic = ar
 UNIXLOCALE_UnitedArabEmiratesArabic = ar_AE
 UNIXLOCALE_BahrainArabic = ar_BH
@@ -427,47 +219,17 @@
 UNIXLOCALE_SyriaArabic = ar_SY
 UNIXLOCALE_TunisiaArabic = ar_TN
 UNIXLOCALE_YemenArabic = ar_YE
-UNIXLOCALE_Mapudungun = arn
-UNIXLOCALE_Assamese = as
-UNIXLOCALE_Asturian = ast
-UNIXLOCALE_Avaric = av
-UNIXLOCALE_Awadhi = awa
-UNIXLOCALE_Aymara = ay
 UNIXLOCALE_Azerbaijani = az
-UNIXLOCALE_Bashkir = ba
-UNIXLOCALE_Baluchi = bal
-UNIXLOCALE_Balinese = ban
-UNIXLOCALE_Basa = bas
 UNIXLOCALE_Belarusian = be
-UNIXLOCALE_Beja = bej
-UNIXLOCALE_Bemba = bem
 UNIXLOCALE_Bulgarian = bg
-UNIXLOCALE_Bihari = bh
-UNIXLOCALE_Bhojpuri = bho
-UNIXLOCALE_Bislama = bi
-UNIXLOCALE_Bikol = bik
-UNIXLOCALE_Bini = bin
-UNIXLOCALE_Bambara = bm
 UNIXLOCALE_Bengali = bn
 UNIXLOCALE_BangladeshBengali = bn_BD
 UNIXLOCALE_IndiaBengali = bn_IN
-UNIXLOCALE_Tibetan = bo
 UNIXLOCALE_Breton = br
 UNIXLOCALE_Bosnian = bs
-UNIXLOCALE_Buriat = bua
-UNIXLOCALE_Buginese = bug
 UNIXLOCALE_Blin = byn
 UNIXLOCALE_Catalan = ca
-UNIXLOCALE_Chechen = ce
-UNIXLOCALE_Cebuano = ceb
-UNIXLOCALE_Chamorro = ch
-UNIXLOCALE_Mari = chm
-UNIXLOCALE_Corsican = co
-UNIXLOCALE_Cree = cr
-UNIXLOCALE_CrimeanTatar = crh
 UNIXLOCALE_Czech = cs
-UNIXLOCALE_ChurchSlavic = cu
-UNIXLOCALE_Chuvash = cv
 UNIXLOCALE_Welsh = cy
 UNIXLOCALE_Danish = da
 UNIXLOCALE_German = de
@@ -475,12 +237,6 @@
 UNIXLOCALE_BelgiumGerman = de_BE
 UNIXLOCALE_SwitzerlandGerman = de_CH
 UNIXLOCALE_LuxemburgGerman = de_LU
-UNIXLOCALE_Dinka = din
-UNIXLOCALE_Dogri = doi
-UNIXLOCALE_Maldivian = dv
-UNIXLOCALE_Dyula = dyu
-UNIXLOCALE_Bhutani = dz
-UNIXLOCALE_Efik = efi
 UNIXLOCALE_Greek = el
 UNIXLOCALE_GreeceGreek = el_GR
 UNIXLOCALE_English = en
@@ -507,7 +263,6 @@
 UNIXLOCALE_CostaRicaSpanish = es_CR
 UNIXLOCALE_DominicanRepublicSpanish = es_DO
 UNIXLOCALE_EcuadorSpanish = es_EC
-UNIXLOCALE_SpainSpanish = es_ES
 UNIXLOCALE_GuatemalaSpanish = es_GT
 UNIXLOCALE_HondurasSpanish = es_HN
 UNIXLOCALE_MexicoSpanish = es_MX
@@ -524,199 +279,71 @@
 UNIXLOCALE_EstoniaEstonian = et_EE
 UNIXLOCALE_Basque = eu
 UNIXLOCALE_SpainBasque = eu_ES
-UNIXLOCALE_Ewondo = ewo
 UNIXLOCALE_Persian = fa
-UNIXLOCALE_Fang = fan
-UNIXLOCALE_Fulah = ff
 UNIXLOCALE_Finnish = fi
-UNIXLOCALE_Filipino = fil
-UNIXLOCALE_Fijian = fj
 UNIXLOCALE_Faroese = fo
-UNIXLOCALE_Fon = fon
 UNIXLOCALE_French = fr
 UNIXLOCALE_BelgiumFrench = fr_BE
 UNIXLOCALE_CanadaFrench = fr_CA
 UNIXLOCALE_SwitzerlandFrench = fr_CH
 UNIXLOCALE_LuxemburgFrench = fr_LU
-UNIXLOCALE_Friulian = fur
-UNIXLOCALE_WesternFrisian = fy
 UNIXLOCALE_Irish = ga
-UNIXLOCALE_Ga = gaa
-UNIXLOCALE_Gayo = gay
-UNIXLOCALE_Gbaya = gba
 UNIXLOCALE_Gaelic = gd
 UNIXLOCALE_ScotsGaelic = gd_GB
 UNIXLOCALE_Geez = gez
 UNIXLOCALE_EritreaGeez = gez_ER
 UNIXLOCALE_EthiopiaGeez = gez_ET
 UNIXLOCALE_Gallegan = gl
-UNIXLOCALE_Guarani = gn
-UNIXLOCALE_Gondi = gon
-UNIXLOCALE_Gorontalo = gor
-UNIXLOCALE_Grebo = grb
 UNIXLOCALE_Gujarati = gu
 UNIXLOCALE_Manx = gv
-UNIXLOCALE_Hausa = ha
 UNIXLOCALE_Hebrew = he
 UNIXLOCALE_Hindi = hi
-UNIXLOCALE_Hiligaynon = hil
-UNIXLOCALE_Hmong = hmn
-UNIXLOCALE_HiriMotu = ho
 UNIXLOCALE_Croatian = hr
-UNIXLOCALE_Haitian = ht
 UNIXLOCALE_Hungarian = hu
 UNIXLOCALE_Armenian = hy
-UNIXLOCALE_Herero = hz
-UNIXLOCALE_Interlingua = ia
-UNIXLOCALE_Iban = iba
 UNIXLOCALE_Indonesian = id
-UNIXLOCALE_Interlingue = ie
-UNIXLOCALE_Igbo = ig
-UNIXLOCALE_SichuanYi = ii
-UNIXLOCALE_Inupiak = ik
-UNIXLOCALE_Iloko = ilo
-UNIXLOCALE_Ingush = inh
-UNIXLOCALE_Ido = io
 UNIXLOCALE_Icelandic = is
 UNIXLOCALE_Italian = it
 UNIXLOCALE_SwitzerlandItalian = it_CH
-UNIXLOCALE_Inuktitut = iu
-UNIXLOCALE_Hebrew = iw
 UNIXLOCALE_Japanese = ja
-UNIXLOCALE_Javanese = jv
 UNIXLOCALE_Georgian = ka
-UNIXLOCALE_KaraKalpak = kaa
-UNIXLOCALE_Kabyle = kab
-UNIXLOCALE_Kachin = kac
-UNIXLOCALE_Kamba = kam
-UNIXLOCALE_Kabardian = kbd
-UNIXLOCALE_Kongo = kg
-UNIXLOCALE_Khasi = kha
-UNIXLOCALE_Kikuyu = ki
-UNIXLOCALE_Kwanyama = kj
-UNIXLOCALE_Kazakh = kk
 UNIXLOCALE_Greenlandic = kl
-UNIXLOCALE_Cambodian = km
-UNIXLOCALE_Kimbundu = kmb
 UNIXLOCALE_Kannada = kn
 UNIXLOCALE_Korean = ko
-UNIXLOCALE_Kanuri = kr
-UNIXLOCALE_KarachayBalkar = krc
-UNIXLOCALE_Karelian = krl
-UNIXLOCALE_Kurukh = kru
-UNIXLOCALE_Kashmiri = ks
-UNIXLOCALE_Kurdish = ku
-UNIXLOCALE_Kumyk = kum
-UNIXLOCALE_Komi = kv
 UNIXLOCALE_Cornish = kw
-UNIXLOCALE_Kirghiz = ky
-UNIXLOCALE_Latin = la
-UNIXLOCALE_Ladino = lad
-UNIXLOCALE_Lamba = lam
-UNIXLOCALE_Luxembourgish = lb
-UNIXLOCALE_Lezghian = lez
-UNIXLOCALE_Ganda = lg
-UNIXLOCALE_Limburgish = li
-UNIXLOCALE_Lingala = ln
 UNIXLOCALE_Lao = lo
-UNIXLOCALE_Mongo = lol
-UNIXLOCALE_Lozi = loz
 UNIXLOCALE_Lithuanian = lt
-UNIXLOCALE_LubaKatanga = lu
-UNIXLOCALE_LubaLulua = lua
 UNIXLOCALE_Luganda = lug
-UNIXLOCALE_Lunda = lun
-UNIXLOCALE_Luo = luo
-UNIXLOCALE_Lushai = lus
 UNIXLOCALE_Latvian = lv
-UNIXLOCALE_Madurese = mad
-UNIXLOCALE_Magahi = mag
-UNIXLOCALE_Maithili = mai
-UNIXLOCALE_Makasar = mak
-UNIXLOCALE_Mandingo = man
-UNIXLOCALE_Masai = mas
-UNIXLOCALE_Moksha = mdf
-UNIXLOCALE_Mandar = mdr
-UNIXLOCALE_Mende = men
-UNIXLOCALE_Malagasy = mg
-UNIXLOCALE_Marshallese = mh
 UNIXLOCALE_Maori = mi
-UNIXLOCALE_Minangkabau = min
 UNIXLOCALE_Macedonian = mk
 UNIXLOCALE_Malayalam = ml
 UNIXLOCALE_Mongolian = mn
-UNIXLOCALE_Manipuri = mni
-UNIXLOCALE_Moldavian = mo
-UNIXLOCALE_Mossi = mos
 UNIXLOCALE_Marathi = mr
 UNIXLOCALE_Malay = ms
 UNIXLOCALE_Maltese = mt
-UNIXLOCALE_Burmese = my
-UNIXLOCALE_Erzya = myv
-UNIXLOCALE_Nauru = na
-UNIXLOCALE_Neapolitan = nap
 UNIXLOCALE_NorwegianBokmal = nb
-UNIXLOCALE_NdebeleNorth = nd
 UNIXLOCALE_Nepali = ne
-UNIXLOCALE_NepalBhasa = new
-UNIXLOCALE_Ndonga = ng
-UNIXLOCALE_Nias = nia
 UNIXLOCALE_Dutch = nl
 UNIXLOCALE_BelgiumDutch = nl_BE
 UNIXLOCALE_NetherlandsDutch = nl_NL
 UNIXLOCALE_NorwegianNynorsk = nn
 UNIXLOCALE_Norwegian = no
-UNIXLOCALE_NdebeleSouth = nr
-UNIXLOCALE_Pedi = nso
-UNIXLOCALE_Navajo = nv
-UNIXLOCALE_Chichewa = ny
-UNIXLOCALE_Nyamwezi = nym
-UNIXLOCALE_Nyankole = nyn
-UNIXLOCALE_Nyoro = nyo
-UNIXLOCALE_Nzima = nzi
 UNIXLOCALE_Occitan = oc
-UNIXLOCALE_Ojibwa = oj
 UNIXLOCALE_Oromo = om
 UNIXLOCALE_EthiopiaOromo = om_ET
 UNIXLOCALE_KenyaOromo = om_KE
-UNIXLOCALE_Oriya = or
-UNIXLOCALE_Ossetian = os
 UNIXLOCALE_Punjabi = pa
-UNIXLOCALE_Pangasinan = pag
-UNIXLOCALE_Pampanga = pam
-UNIXLOCALE_Papiamento = pap
-UNIXLOCALE_Pali = pi
 UNIXLOCALE_Polish = pl
-UNIXLOCALE_Pashto = ps
 UNIXLOCALE_Portuguese = pt
 UNIXLOCALE_BrasilPortuguese = pt_BR
-UNIXLOCALE_Quechua = qu
-UNIXLOCALE_Rajasthani = raj
-UNIXLOCALE_Romansh = rm
-UNIXLOCALE_Rundi = rn
 UNIXLOCALE_Romanian = ro
 UNIXLOCALE_Russian = ru
 UNIXLOCALE_UkraineRussian = ru_UA
-UNIXLOCALE_Aromanian = rup
-UNIXLOCALE_Kinyarwanda = rw
-UNIXLOCALE_Sanskrit = sa
-UNIXLOCALE_Yakut = sah
-UNIXLOCALE_Sasak = sas
-UNIXLOCALE_Santali = sat
-UNIXLOCALE_Sicilian = scn
-UNIXLOCALE_Scots = sco
-UNIXLOCALE_Sardinian = sc
-UNIXLOCALE_Sindhi = sd
 UNIXLOCALE_NorthernSaami = se
-UNIXLOCALE_Sango = sg
-UNIXLOCALE_Shan = shn
-UNIXLOCALE_Sinhala = si
 UNIXLOCALE_Sidamo = sid
 UNIXLOCALE_Slovak = sk
 UNIXLOCALE_Slovenian = sl
-UNIXLOCALE_Samoan = sm
-UNIXLOCALE_Shona = sn
-UNIXLOCALE_Soninke = snk
 UNIXLOCALE_Somali = so
 UNIXLOCALE_DjiboutiSomali = so_DJ
 UNIXLOCALE_EthiopiaSomali = so_ET
@@ -724,58 +351,27 @@
 UNIXLOCALE_SomaliaSomali = so_SO
 UNIXLOCALE_Albanian = sq
 UNIXLOCALE_Serbian = sr
-UNIXLOCALE_Serer = srr
-UNIXLOCALE_Swati = ss
 UNIXLOCALE_Sotho = st
-UNIXLOCALE_Sundanese = su
-UNIXLOCALE_Sukuma = suk
-UNIXLOCALE_Susu = sus
 UNIXLOCALE_Swedish = sv
 UNIXLOCALE_FinlandSwedish = sv_FI
-UNIXLOCALE_Swahili = sw
 UNIXLOCALE_Tamil = ta
 UNIXLOCALE_Telugu = te
-UNIXLOCALE_Timne = tem
-UNIXLOCALE_Tetum = tet
 UNIXLOCALE_Tajik = tg
 UNIXLOCALE_Thai = th
 UNIXLOCALE_Tigrinya = ti
 UNIXLOCALE_EritreaTigrinya = ti_ER
 UNIXLOCALE_EthiopiaTigrinya = ti_ET
 UNIXLOCALE_Tigre = tig
-UNIXLOCALE_Tiv = tiv
-UNIXLOCALE_Turkmen = tk
 UNIXLOCALE_Tagalog = tl
-UNIXLOCALE_Tswana = tn
-UNIXLOCALE_Tonga = to
-UNIXLOCALE_TongaNyasa = tog
-UNIXLOCALE_TokPisin = tpi
 UNIXLOCALE_Turkish = tr
-UNIXLOCALE_Tsonga = ts
 UNIXLOCALE_Tatar = tt
-UNIXLOCALE_Tumbuka = tum
-UNIXLOCALE_Twi = tw
-UNIXLOCALE_Tahitian = ty
-UNIXLOCALE_Tuvinian = tyv
-UNIXLOCALE_Udmurt = udm
-UNIXLOCALE_Uighur = ug
 UNIXLOCALE_Ukrainian = uk
-UNIXLOCALE_Umbundu = umb
 UNIXLOCALE_Urdu = ur
 UNIXLOCALE_Uzbek = uz
-UNIXLOCALE_Vai = vai
-UNIXLOCALE_Venda = ve
 UNIXLOCALE_Vietnamese = vi
 UNIXLOCALE_Walloon = wa
-UNIXLOCALE_Walamo = wal
-UNIXLOCALE_Waray = war
-UNIXLOCALE_Wolof = wo
-UNIXLOCALE_Kalmyk = xal
 UNIXLOCALE_Xhosa = xh
-UNIXLOCALE_Yao = yao
 UNIXLOCALE_Yiddish = yi
-UNIXLOCALE_Yoruba = yo
-UNIXLOCALE_Zhuang = za
 UNIXLOCALE_Chinese = zh
 UNIXLOCALE_SimplifiedChinese = zh_CN
 UNIXLOCALE_HongKongChinese = zh_HK
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-objc-gnustep 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-objc-gnustep package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: Hello.m:49
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: Hello.m:58
-#, objc-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-objc-gnustep.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-objc-gnustep-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnustep package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: Hello.m:49
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: Hello.m:58
-#, objc-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-objc-gnustep-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-objc-gnustep package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: Hello.m:58
 #, objc-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-objc-gnustep package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-objc-gnustep package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: GNU hello-objc-gnustep 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-objc-gnustep-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-objc-gnustep.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-objc-gnustep' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep-0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-objc-gnustep.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-objc-gnustep
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-objc-gnustep package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: Hello.m:58
 #, objc-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: Hello.m:58
 #, objc-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-objc-gnustep/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-objc-gnustep/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-objc-gnustep.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-objc-gnustep.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.18\n"
+"Project-Id-Version: hello-objc-gnustep 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: Hello.m:49
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: Hello.m:58
 #, objc-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-pascal/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -28,11 +28,11 @@
 	LOCALEDIR='@localedir@' $(PPC) $(hello_SOURCES)
 
 install-exec-local: all-local
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) hello$(EXEEXT) $(DESTDIR)$(bindir)/hello$(EXEEXT)
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello$(EXEEXT)
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-pascal package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-pascal 0.19-rc1\n"
+"Project-Id-Version: GNU hello-pascal 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.running_as
 #, object-pascal-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-pascal 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.hello_world
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.running_as
-#, object-pascal-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-pascal.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-pascal 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.hello_world
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.running_as
-#, object-pascal-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-pascal.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-pascal package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal-0.19-rc1\n"
+"Project-Id-Version: hello-pascal-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.running_as
 #, object-pascal-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-pascal package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.hello_world
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.running_as
-#, object-pascal-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-pascal to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-pascal 0.18\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"
-"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"
-
-#: hello.hello_world
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.running_as
-#, object-pascal-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-pascal.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-pascal package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.running_as
 #, object-pascal-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-pascal' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-pascal package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-pascal 0.19-rc1\n"
+"Project-Id-Version: GNU hello-pascal 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-pascal 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-pascal package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.hello_world
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.running_as
-#, object-pascal-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-pascal.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-pascal-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-pascal package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal-0.19-rc1\n"
+"Project-Id-Version: hello-pascal-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal-0.19-rc1\n"
+"Project-Id-Version: hello-pascal-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.hello_world
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.running_as
-#, object-pascal-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-pascal-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-pascal package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.running_as
 #, object-pascal-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-pascal package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-pascal package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-pascal 0.19-rc1\n"
+"Project-Id-Version: GNU hello-pascal 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-pascal-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-pascal.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-pascal' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal-0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/sv.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-pascal.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-pascal
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-pascal package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.running_as
 #, object-pascal-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19-rc1\n"
+"Project-Id-Version: hello-pascal 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.running_as
 #, object-pascal-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-pascal/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-pascal/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-pascal/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-pascal.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-pascal.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.18\n"
+"Project-Id-Version: hello-pascal 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.hello_world
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.running_as
 #, object-pascal-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-perl package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-perl 0.19-rc1\n"
+"Project-Id-Version: GNU hello-perl 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,9 +22,9 @@
 #: hello-1.pl.in:19
 #, perl-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
 
 #: hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Програмата е пусната под процес номер {pid}."
+msgstr "Програмата е запусната под процес номер {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-perl 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello-1.pl.in:17 hello-2.pl.in:12
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello-1.pl.in:19
-#, perl-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
-
-#: hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Tento program běží jako proces číslo {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/da.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Danish messages for hello-perl.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-perl 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello-1.pl.in:17 hello-2.pl.in:12
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello-1.pl.in:19
-#, perl-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
-
-#: hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Dette program k�rer som proces nummer {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-perl.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-perl package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
@@ -32,4 +29,4 @@
 #: hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Dieses Programm läuft mit der Prozess-Nummer {pid}."
+msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,34 +1,30 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl-0.19-rc1\n"
+"Project-Id-Version: hello-perl-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello-1.pl.in:19
 #, perl-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
 
 #: hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Este programa está corriendo como el proceso número {pid}."
+msgstr "Este programa est� corriendo como el proceso n�mero {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# Galician translation for hello-perl package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello-1.pl.in:17 hello-2.pl.in:12
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello-1.pl.in:19
-#, perl-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
-
-#: hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Este programa estase executando como o proceso número {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# Translation of hello-perl to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-perl 0.18\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"
-"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"
-
-#: hello-1.pl.in:17 hello-2.pl.in:12
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello-1.pl.in:19
-#, perl-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
-
-#: hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Ovaj program je pokrenut kao proces broj {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,33 +1,30 @@
 # Hungarian translation for hello-perl.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-perl package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello-1.pl.in:19
 #, perl-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
 
 #: hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Ez a program a(z) {pid} folyamatazonosítóval fut."
+msgstr "Ez a program a {pid} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-perl' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-perl package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-perl 0.19-rc1\n"
+"Project-Id-Version: GNU hello-perl 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -205,13 +205,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -248,13 +248,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-perl 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Norwegian Bokmal translations for hello-perl package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello-1.pl.in:17 hello-2.pl.in:12
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello-1.pl.in:19
-#, perl-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
-
-#: hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Dette programmet kjører som prosess nummer {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-perl.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-perl-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-perl package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl-0.19-rc1\n"
+"Project-Id-Version: hello-perl-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl-0.19-rc1\n"
+"Project-Id-Version: hello-perl-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello-1.pl.in:17 hello-2.pl.in:12
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello-1.pl.in:19
-#, perl-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
-
-#: hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Este programa está executando com número de processo {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,34 +1,32 @@
 # Translation of hello-perl-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-perl package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello-1.pl.in:19
 #, perl-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
 
 #: hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Эта программа выполняется как процесс под номером {pid}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sk.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-perl package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-perl package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-perl 0.19-rc1\n"
+"Project-Id-Version: GNU hello-perl 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-perl-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-perl.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-perl' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl-0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/sv.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-perl.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-perl
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-perl package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello-1.pl.in:19
 #, perl-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19-rc1\n"
+"Project-Id-Version: hello-perl 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello-1.pl.in:19
 #, perl-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-perl/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-perl/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-perl/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-perl.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-perl.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.18\n"
+"Project-Id-Version: hello-perl 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +16,14 @@
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello-1.pl.in:19
 #, perl-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
 
 #: hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "本程式正在執行，行程編號為 {pid}。"
+msgstr "本程式正在執行中，進程編號為 {pid}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-php package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-php 0.19-rc1\n"
+"Project-Id-Version: GNU hello-php 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-php 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.php:12
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/da.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-php.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-php 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.php:12
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-php.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-php package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.php:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php-0.19-rc1\n"
+"Project-Id-Version: hello-php-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.php:12
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-php package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.php:12
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-php to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-php 0.18\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"
-"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"
-
-#: hello.php:12
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-php.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-php package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.php:12
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-php' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-php package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-php 0.19-rc1\n"
+"Project-Id-Version: GNU hello-php 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-php/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-php/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-php 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-php package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.php:12
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-php.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-php-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-php package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php-0.19-rc1\n"
+"Project-Id-Version: hello-php-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.php:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php-0.19-rc1\n"
+"Project-Id-Version: hello-php-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.php:12
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-php-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-php package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.php:12
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sk.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-php package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-php package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-php 0.19-rc1\n"
+"Project-Id-Version: GNU hello-php 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-php-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-php.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-php' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php-0.19-rc1\n"
+"Project-Id-Version: hello-php 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.php:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/sv.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-php.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-php
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-php package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.php:12
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.php:14
 #, php-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19-rc1\n"
+"Project-Id-Version: hello-php 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.php:12
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.php:14
 #, php-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-php/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-php/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-php/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-php/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-php.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-php.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.18\n"
+"Project-Id-Version: hello-php 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.php:12
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-python package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-python 0.19-rc1\n"
+"Project-Id-Version: GNU hello-python 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Програмата е пусната под процес номер %(pid)d."
+msgstr "Програмата е запусната под процес номер %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-python 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.py.in:12
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Tento program běží jako proces číslo %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-python.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-python 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.py.in:12
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Dette program k�rer som proces nummer %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-python.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-python package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python-0.19-rc1\n"
+"Project-Id-Version: hello-python-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Este programa está corriendo como el proceso número %(pid)d."
+msgstr "Este programa est� corriendo como el proceso n�mero %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-python package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.py.in:12
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Este programa estase executando como o proceso número %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-python to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-python 0.18\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"
-"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"
-
-#: hello.py.in:12
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Ovaj program je pokrenut kao proces broj %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-python.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-python package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Ez a program a(z) %(pid)d folyamatazonosítóval fut."
+msgstr "Ez a program a %(pid)d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-python' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-python package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-python 0.19-rc1\n"
+"Project-Id-Version: GNU hello-python 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-python/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-python/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-python 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-python package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.py.in:12
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Dette programmet kjører som prosess nummer %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-python.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-python-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-python package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python-0.19-rc1\n"
+"Project-Id-Version: hello-python-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python-0.19-rc1\n"
+"Project-Id-Version: hello-python-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.py.in:12
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Este programa está executando com número de processo %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-python-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-python package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Эта программа выполняется как процесс под номером %(pid)d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %(pid)d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-python package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-python package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-python 0.19-rc1\n"
+"Project-Id-Version: GNU hello-python 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-python-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-python.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-python' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python-0.19-rc1\n"
+"Project-Id-Version: hello-python 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-python.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-python
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-python package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.py.in:13
 #, python-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19-rc1\n"
+"Project-Id-Version: hello-python 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.py.in:13
 #, python-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-python/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-python/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-python/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-python/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-python.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-python.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.18\n"
+"Project-Id-Version: hello-python 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.py.in:12
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "本程式正在執行，行程編號為 %(pid)d。"
+msgstr "本程式正在執行中，進程編號為 %(pid)d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/bg.po	2010-06-06 21:15:59.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-sh package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-sh 0.19-rc1\n"
+"Project-Id-Version: GNU hello-sh 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Програмата е пусната под процес номер $pid."
+msgstr "Програмата е запусната под процес номер $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-sh 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.sh:14
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Tento program běží jako proces číslo $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-sh.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-sh 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.sh:14
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Dette program k�rer som proces nummer $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-sh.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-sh package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh-0.19-rc1\n"
+"Project-Id-Version: hello-sh-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Este programa está corriendo como el proceso número $pid."
+msgstr "Este programa est� corriendo como el proceso n�mero $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-sh package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.sh:14
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Este programa estase executando como o proceso número $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-sh to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-sh 0.18\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"
-"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"
-
-#: hello.sh:14
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Ovaj program je pokrenut kao proces broj $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-sh.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-sh package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Ez a program a(z) $pid folyamatazonosítóval fut."
+msgstr "Ez a program a $pid processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-sh' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-sh package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-sh 0.19-rc1\n"
+"Project-Id-Version: GNU hello-sh 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-sh 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-sh package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.sh:14
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Dette programmet kjører som prosess nummer $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-sh.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-sh-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-sh package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh-0.19-rc1\n"
+"Project-Id-Version: hello-sh-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/pl.po	2010-06-06 21:16:07.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh-0.19-rc1\n"
+"Project-Id-Version: hello-sh-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.sh:14
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Este programa está executando com número de processo $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-sh-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-sh package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Эта программа выполняется как процесс под номером $pid."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� $pid."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-sh package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-sh package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-sh 0.19-rc1\n"
+"Project-Id-Version: GNU hello-sh 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-sh-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-sh.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-sh' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh-0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-sh.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-sh
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-sh package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.sh:17
 #, sh-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19-rc1\n"
+"Project-Id-Version: hello-sh 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.sh:17
 #, sh-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/zh_CN.po	2010-06-06 21:16:12.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-sh/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-sh/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-sh/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-sh.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-sh.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.18\n"
+"Project-Id-Version: hello-sh 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.sh:14
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "本程式正在執行，行程編號為 $pid。"
+msgstr "本程式正在執行中，進程編號為 $pid。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-smalltalk package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-smalltalk 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.st.in:32
 #, smalltalk-format
 msgid "This program is running as process number %1."
-msgstr "Програмата е пусната под процес номер %1."
+msgstr "Програмата е запусната под процес номер %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-smalltalk 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.st.in:31
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.st.in:32
-#, smalltalk-format
-msgid "This program is running as process number %1."
-msgstr "Tento program běží jako proces číslo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-smalltalk.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-smalltalk 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.st.in:31
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.st.in:32
-#, smalltalk-format
-msgid "This program is running as process number %1."
-msgstr "Dette program k�rer som proces nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/de.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-smalltalk.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-smalltalk package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk-0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.st.in:32
 #, smalltalk-format
 msgid "This program is running as process number %1."
-msgstr "Este programa está corriendo como el proceso número %1."
+msgstr "Este programa est� corriendo como el proceso n�mero %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-smalltalk package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.st.in:31
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.st.in:32
-#, smalltalk-format
-msgid "This program is running as process number %1."
-msgstr "Este programa estase executando como o proceso número %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-smalltalk to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-smalltalk 0.18\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"
-"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"
-
-#: hello.st.in:31
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.st.in:32
-#, smalltalk-format
-msgid "This program is running as process number %1."
-msgstr "Ovaj program je pokrenut kao proces broj %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/hu.po	2010-06-06 21:16:03.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-smalltalk.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-smalltalk package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.st.in:32
 #, smalltalk-format
 msgid "This program is running as process number %1."
-msgstr "Ez a program a(z) %1 folyamatazonosítóval fut."
+msgstr "Ez a program a %1 processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-smalltalk' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-smalltalk package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-smalltalk 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-smalltalk 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-smalltalk package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.st.in:31
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.st.in:32
-#, smalltalk-format
-msgid "This program is running as process number %1."
-msgstr "Dette programmet kjører som prosess nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-smalltalk.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-smalltalk-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-smalltalk package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk-0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk-0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.st.in:31
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.st.in:32
-#, smalltalk-format
-msgid "This program is running as process number %1."
-msgstr "Este programa está executando com número de processo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-smalltalk-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-smalltalk package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.st.in:32
 #, smalltalk-format
 msgid "This program is running as process number %1."
-msgstr "Эта программа выполняется как процесс под номером %1."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-smalltalk package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-smalltalk package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-smalltalk 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-smalltalk-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-smalltalk.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-smalltalk' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk-0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-smalltalk.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-smalltalk
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-smalltalk package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.st.in:32
 #, smalltalk-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.st.in:32
 #, smalltalk-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-smalltalk/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-smalltalk/po/zh_TW.po	2010-06-06 21:16:13.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-smalltalk.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-smalltalk.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.18\n"
+"Project-Id-Version: hello-smalltalk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.st.in:31
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.st.in:32
 #, smalltalk-format
 msgid "This program is running as process number %1."
-msgstr "本程式正在執行，行程編號為 %1。"
+msgstr "本程式正在執行中，進程編號為 %1。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-tcl package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-tcl 0.19-rc1\n"
+"Project-Id-Version: GNU hello-tcl 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.tcl:12
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.tcl:11
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.tcl:12
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/da.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-tcl.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.tcl:11
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.tcl:12
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-tcl.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-tcl package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.tcl:12
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-tcl package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.tcl:11
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.tcl:12
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-tcl to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl 0.18\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"
-"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"
-
-#: hello.tcl:11
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.tcl:12
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-tcl.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.tcl:12
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-tcl' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-tcl 0.19-rc1\n"
+"Project-Id-Version: GNU hello-tcl 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -181,7 +181,7 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -193,7 +193,7 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 
 uninstall-local: uninstall-local-@USE_NLS@
 uninstall-local-no:
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-tcl 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-tcl package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.tcl:11
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.tcl:12
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-tcl.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-tcl-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.tcl:11
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.tcl:12
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-tcl-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-tcl package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.tcl:12
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sk.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-tcl package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-tcl package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-tcl 0.19-rc1\n"
+"Project-Id-Version: GNU hello-tcl 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-tcl-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-tcl.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-tcl' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/sv.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-tcl.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-tcl
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.tcl:12
 #, tcl-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19-rc1\n"
+"Project-Id-Version: hello-tcl 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.tcl:12
 #, tcl-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-tcl.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-tcl.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.18\n"
+"Project-Id-Version: hello-tcl 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.tcl:11
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.tcl:12
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-tcl-tk package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-tcl-tk 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.tcl:16
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
+msgstr "Програмата е запусната под процес номер %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.tcl:13
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.tcl:16
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/da.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-tcl-tk.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.tcl:13
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.tcl:16
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-tcl-tk.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-tcl-tk package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.tcl:16
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-tcl-tk package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.tcl:13
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.tcl:16
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-tcl-tk to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.18\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"
-"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"
-
-#: hello.tcl:13
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.tcl:16
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-tcl-tk.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl-tk package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.tcl:16
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
+msgstr "Ez a program a %d processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-tcl-tk' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl-tk package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-tcl-tk 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -181,7 +181,7 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -193,7 +193,7 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 
 uninstall-local: uninstall-local-@USE_NLS@
 uninstall-local-no:
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-tcl-tk 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-tcl-tk package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.tcl:13
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.tcl:16
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-tcl-tk.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-tcl-tk-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl-tk package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.tcl:13
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.tcl:16
-#, tcl-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-tcl-tk-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-tcl-tk package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.tcl:16
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sk.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-tcl-tk package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-tcl-tk package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: GNU hello-tcl-tk 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-tcl-tk-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-tcl-tk.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-tcl-tk' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk-0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/sv.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-tcl-tk.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-tcl-tk
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-tcl-tk package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.tcl:16
 #, tcl-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.tcl:16
 #, tcl-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-tcl-tk/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-tcl-tk/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-tcl-tk.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-tcl-tk.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.18\n"
+"Project-Id-Version: hello-tcl-tk 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.tcl:13
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.tcl:16
 #, tcl-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
+msgstr "本程式正在執行中，進程編號為 %d。"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/bg.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/bg.po	2010-06-06 21:16:00.000000000 +0000
@@ -1,15 +1,15 @@
 # Bulgarian translations for hello-ycp package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-ycp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-ycp 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,4 +22,4 @@
 #: hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Програмата е пусната под процес номер %1."
+msgstr "Програмата е запусната под процес номер %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/cs.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-ycp 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello.ycp:15
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Tento program běží jako proces číslo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/da.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/da.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Danish messages for hello-ycp.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-ycp 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello.ycp:15
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Dette program k�rer som proces nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/de.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/de.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/de.po	2010-06-06 21:16:01.000000000 +0000
@@ -1,24 +1,21 @@
 # German messages for hello-ycp.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-ycp package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/es.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/es.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/es.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,29 +1,25 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp-0.19-rc1\n"
+"Project-Id-Version: hello-ycp-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
 #: hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Este programa está corriendo como el proceso número %1."
+msgstr "Este programa est� corriendo como el proceso n�mero %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/fi.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/fi.po	2010-06-06 21:16:02.000000000 +0000
@@ -1,15 +1,13 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/gl.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Galician translation for hello-ycp package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello.ycp:15
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Este programa estase executando como o proceso número %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/hr.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Translation of hello-ycp to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-ycp 0.18\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"
-"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"
-
-#: hello.ycp:15
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Ovaj program je pokrenut kao proces broj %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/hu.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/hu.po	2010-06-06 21:16:04.000000000 +0000
@@ -1,28 +1,25 @@
 # Hungarian translation for hello-ycp.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-ycp package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
 #: hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Ez a program a(z) %1 folyamatazonosítóval fut."
+msgstr "Ez a program a %1 processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/ja.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/ja.po	2010-06-06 21:16:05.000000000 +0000
@@ -1,13 +1,13 @@
 # Translation of `hello-ycp' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-ycp package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-ycp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-ycp 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -195,13 +195,13 @@
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -238,13 +238,13 @@
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(MKDIR_P) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/mt.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/mt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/mt.po	2010-06-06 21:16:07.000000000 +0000
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-ycp 0.16.2-pre5\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/nb.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Norwegian Bokmal translations for hello-ycp package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello.ycp:15
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Dette programmet kjører som prosess nummer %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/nl.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/nl.po	2010-06-06 21:16:07.000000000 +0000
@@ -1,24 +1,21 @@
-# Dutch translations for GNU hello-ycp.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of hello-ycp-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-ycp package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp-0.19-rc1\n"
+"Project-Id-Version: hello-ycp-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/pl.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/pl.po	2010-06-06 21:16:08.000000000 +0000
@@ -2,18 +2,18 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp-0.19-rc1\n"
+"Project-Id-Version: hello-ycp-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello.ycp:15
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Este programa está executando com número de processo %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/ru.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/ru.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,29 +1,27 @@
 # Translation of hello-ycp-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello-ycp package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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: KBabel 1.3\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
 #: hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Эта программа выполняется как процесс под номером %1."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %1."
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sk.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sk.po	2010-06-06 21:16:09.000000000 +0000
@@ -1,13 +1,13 @@
 # Slovak translations GNU for hello-ycp package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU hello-ycp package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello-ycp 0.19-rc1\n"
+"Project-Id-Version: GNU hello-ycp 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sl.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sl.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,20 +1,18 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: hello-ycp-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sr.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sr.po	2010-06-06 21:16:10.000000000 +0000
@@ -1,22 +1,18 @@
 # Serbian translation of hello-ycp.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `hello-ycp' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp-0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sv.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/sv.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/sv.po	2010-06-06 21:16:11.000000000 +0000
@@ -1,12 +1,12 @@
 # Swedish messages for hello-ycp.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/uk.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/uk.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,27 +1,23 @@
 # Ukrainian translation to hello-ycp
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the hello-ycp package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
 #: hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/vi.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/vi.po	2010-06-06 21:16:12.000000000 +0000
@@ -1,30 +1,26 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19-rc1\n"
+"Project-Id-Version: hello-ycp 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
 #: hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/zh_CN.po	2010-06-06 21:16:13.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff -Nru gettext-0.19.3/gettext-tools/examples/hello-ycp/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/hello-ycp/po/zh_TW.po	2014-10-16 06:06:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/hello-ycp/po/zh_TW.po	2010-06-06 21:16:14.000000000 +0000
@@ -1,15 +1,13 @@
-# Traditional Chinese translation of hello-ycp.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of hello-ycp.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.18\n"
+"Project-Id-Version: hello-ycp 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +16,9 @@
 
 #: hello.ycp:15
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
 #: hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "本程式正在執行，行程編號為 %1。"
+msgstr "本程式正在執行中，進程編號為 %1。"
diff -Nru gettext-0.19.3/gettext-tools/examples/Makefile.am gettext-0.18.1.1/gettext-tools/examples/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/Makefile.am	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/examples subdirectory of GNU gettext
-## Copyright (C) 2001-2007, 2009-2012 Free Software Foundation, Inc.
+## Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.2 foreign
+ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@
 ACLOCAL_AMFLAGS = -I ../../gettext-runtime/m4 -I ../../m4
 SUBDIRS = po
 EXTRA_DIST =
@@ -51,20 +52,6 @@
   hello-c-gnome/po/Makevars \
   hello-c-gnome/po/POTFILES.in \
   \
-  hello-c-gnome3/INSTALL \
-  hello-c-gnome3/autogen.sh \
-  hello-c-gnome3/autoclean.sh \
-  hello-c-gnome3/hello.c \
-  hello-c-gnome3/hello.desktop.in.in \
-  hello-c-gnome3/hello.gschema.xml \
-  hello-c-gnome3/hello.gresource.xml \
-  hello-c-gnome3/hello.ui \
-  hello-c-gnome3/Makefile.am \
-  hello-c-gnome3/configure.ac \
-  hello-c-gnome3/m4/Makefile.am \
-  hello-c-gnome3/po/Makevars \
-  hello-c-gnome3/po/POTFILES.in \
-  \
   hello-c++/INSTALL \
   hello-c++/autogen.sh \
   hello-c++/autoclean.sh \
@@ -375,7 +362,6 @@
 EXAMPLESDIRS = \
   hello-c \
   hello-c-gnome \
-  hello-c-gnome3 \
   hello-c++ \
   hello-c++-qt \
   hello-c++-kde \
@@ -411,8 +397,6 @@
   ast.po \
   bg.po \
   ca.po \
-  cs.po \
-  da.po \
   de.po \
   el.po \
   eo.po \
@@ -420,8 +404,6 @@
   fi.po \
   fr.po \
   ga.po \
-  gl.po \
-  hr.po \
   hu.po \
   id.po \
   it.po \
@@ -430,11 +412,9 @@
   lv.po \
   ms.po \
   mt.po \
-  nb.po \
   nl.po \
   pl.po \
   pt.po \
-  pt_BR.po \
   ro.po \
   ru.po \
   sk.po \
@@ -449,10 +429,10 @@
   zh_TW.po
 
 install-data-local: $(EXAMPLESFILES)
-	$(MKDIR_P) $(DESTDIR)$(examplesdir)
+	$(mkdir_p) $(DESTDIR)$(examplesdir)
 	for f in $(EXAMPLESFILES); do \
 	  d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	  test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	  test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	  b=`echo $$f | sed -e 's,^.*/,,'`; \
 	  if test $$b = autogen.sh || test $$b = autoclean.sh; then \
 	    echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f"; \
@@ -465,12 +445,8 @@
 	for f1 in $(EXAMPLESDIRS); do \
 	  for f2 in $(EXAMPLESPOFILES); do \
 	    f=$$f1/po/$$f2; \
-	    test -f $(srcdir)/$$f || { \
-	      echo "WARNING: $(srcdir)/$$f doesn't exist; do \"make dist\" to prepare" >&2; \
-	      break; \
-	    }; \
 	    d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	    test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	    test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	    b=`echo $$f | sed -e 's,^.*/,,'`; \
 	    echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f"; \
 	    $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f; \
@@ -478,16 +454,16 @@
 	done
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(examplesdir)
+	$(mkdir_p) $(DESTDIR)$(examplesdir)
 	for f in $(EXAMPLESFILES); do \
 	  d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	  test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	  test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	done
 	for f1 in $(EXAMPLESDIRS); do \
 	  for f2 in $(EXAMPLESPOFILES); do \
 	    f=$$f1/po/$$f2; \
 	    d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	    test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	    test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	  done; \
 	done
 
@@ -509,7 +485,7 @@
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(MKDIR_P) "$(distdir)/$$dir"; \
+	    $(mkdir_p) "$(distdir)/$$dir"; \
 	  fi; \
 	  cp -p $$d/$$file $(distdir)/$$file || exit 1; \
 	done
@@ -519,17 +495,11 @@
 	    if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	    dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	      $(MKDIR_P) "$(distdir)/$$dir"; \
+	      $(mkdir_p) "$(distdir)/$$dir"; \
 	    fi; \
 	    cp -p $$d/$$file $(distdir)/$$file || exit 1; \
 	  done; \
 	done
 
 # Temporary directories created by po/Makefile.
-clean-local:
-	-rm -rf tmp-hello-*
-
-maintainer-update-po: $(top_builddir)/config.status
-	$(SHELL) ./config.status --recheck
-	$(SHELL) ./config.status po/Makefile
-	cd po && $(MAKE) update-po
+CLEANFILES = tmp-hello-*
diff -Nru gettext-0.19.3/gettext-tools/examples/Makefile.in gettext-0.18.1.1/gettext-tools/examples/Makefile.in
--- gettext-0.19.3/gettext-tools/examples/Makefile.in	2014-10-16 06:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/Makefile.in	2010-06-06 20:11:41.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,51 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -77,19 +33,21 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/../../build-aux/mkinstalldirs \
-	$(srcdir)/installpaths.in ChangeLog README \
-	../../build-aux/compile ../../build-aux/config.guess \
-	../../build-aux/config.rpath ../../build-aux/config.sub \
-	../../build-aux/install-sh ../../build-aux/missing \
-	../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
-	../../build-aux/ltmain.sh \
-	$(top_srcdir)/../../build-aux/install-sh \
-	$(top_srcdir)/../../build-aux/missing
+DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../../build-aux/install-sh \
+	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../build-aux/mkinstalldirs $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/installpaths.in \
+	$(top_srcdir)/configure ../../build-aux/compile \
+	../../build-aux/config.guess ../../build-aux/config.rpath \
+	../../build-aux/config.sub ../../build-aux/depcomp \
+	../../build-aux/elisp-comp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/mdate-sh \
+	../../build-aux/missing ../../build-aux/mkinstalldirs \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/fixautomake.m4 \
+	$(top_srcdir)/../../m4/init-package-version.m4 \
 	$(top_srcdir)/../../gettext-runtime/m4/nls.m4 \
 	$(top_srcdir)/../../gettext-runtime/m4/po.m4 \
 	$(top_srcdir)/../../gettext-runtime/m4/progtest.m4 \
@@ -101,33 +59,21 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs
 CONFIG_CLEAN_FILES = installpaths
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -149,53 +95,23 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(examplesdir)"
 DATA = $(examples_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -223,12 +139,9 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
+ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
@@ -264,7 +177,6 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -346,20 +258,6 @@
   hello-c-gnome/po/Makevars \
   hello-c-gnome/po/POTFILES.in \
   \
-  hello-c-gnome3/INSTALL \
-  hello-c-gnome3/autogen.sh \
-  hello-c-gnome3/autoclean.sh \
-  hello-c-gnome3/hello.c \
-  hello-c-gnome3/hello.desktop.in.in \
-  hello-c-gnome3/hello.gschema.xml \
-  hello-c-gnome3/hello.gresource.xml \
-  hello-c-gnome3/hello.ui \
-  hello-c-gnome3/Makefile.am \
-  hello-c-gnome3/configure.ac \
-  hello-c-gnome3/m4/Makefile.am \
-  hello-c-gnome3/po/Makevars \
-  hello-c-gnome3/po/POTFILES.in \
-  \
   hello-c++/INSTALL \
   hello-c++/autogen.sh \
   hello-c++/autoclean.sh \
@@ -671,7 +569,6 @@
 EXAMPLESDIRS = \
   hello-c \
   hello-c-gnome \
-  hello-c-gnome3 \
   hello-c++ \
   hello-c++-qt \
   hello-c++-kde \
@@ -708,8 +605,6 @@
   ast.po \
   bg.po \
   ca.po \
-  cs.po \
-  da.po \
   de.po \
   el.po \
   eo.po \
@@ -717,8 +612,6 @@
   fi.po \
   fr.po \
   ga.po \
-  gl.po \
-  hr.po \
   hu.po \
   id.po \
   it.po \
@@ -727,11 +620,9 @@
   lv.po \
   ms.po \
   mt.po \
-  nb.po \
   nl.po \
   pl.po \
   pt.po \
-  pt_BR.po \
   ro.po \
   ru.po \
   sk.po \
@@ -745,10 +636,13 @@
   zh_HK.po \
   zh_TW.po
 
+
+# Temporary directories created by po/Makefile.
+CLEANFILES = tmp-hello-*
 all: all-recursive
 
 .SUFFIXES:
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -786,11 +680,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-examplesDATA: $(examples_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
 	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -804,28 +695,27 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(examplesdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(examplesdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -840,12 +730,57 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -861,7 +796,12 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -873,11 +813,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -886,31 +830,9 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -946,10 +868,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -978,42 +903,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -1024,8 +943,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1035,19 +954,17 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1070,21 +987,13 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1118,18 +1027,14 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1140,7 +1045,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-local mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -1207,31 +1112,32 @@
 
 uninstall-am: uninstall-examplesDATA uninstall-local
 
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-local cscope cscopelist-am ctags ctags-am dist dist-all \
-	dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-generic distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am \
 	install-examplesDATA install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am installdirs-local maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-examplesDATA uninstall-local
 
 
 install-data-local: $(EXAMPLESFILES)
-	$(MKDIR_P) $(DESTDIR)$(examplesdir)
+	$(mkdir_p) $(DESTDIR)$(examplesdir)
 	for f in $(EXAMPLESFILES); do \
 	  d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	  test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	  test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	  b=`echo $$f | sed -e 's,^.*/,,'`; \
 	  if test $$b = autogen.sh || test $$b = autoclean.sh; then \
 	    echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f"; \
@@ -1244,12 +1150,8 @@
 	for f1 in $(EXAMPLESDIRS); do \
 	  for f2 in $(EXAMPLESPOFILES); do \
 	    f=$$f1/po/$$f2; \
-	    test -f $(srcdir)/$$f || { \
-	      echo "WARNING: $(srcdir)/$$f doesn't exist; do \"make dist\" to prepare" >&2; \
-	      break; \
-	    }; \
 	    d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	    test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	    test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	    b=`echo $$f | sed -e 's,^.*/,,'`; \
 	    echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f"; \
 	    $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f; \
@@ -1257,16 +1159,16 @@
 	done
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(examplesdir)
+	$(mkdir_p) $(DESTDIR)$(examplesdir)
 	for f in $(EXAMPLESFILES); do \
 	  d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	  test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	  test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	done
 	for f1 in $(EXAMPLESDIRS); do \
 	  for f2 in $(EXAMPLESPOFILES); do \
 	    f=$$f1/po/$$f2; \
 	    d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	    test -z "$$d" || $(MKDIR_P) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	    test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	  done; \
 	done
 
@@ -1288,7 +1190,7 @@
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(MKDIR_P) "$(distdir)/$$dir"; \
+	    $(mkdir_p) "$(distdir)/$$dir"; \
 	  fi; \
 	  cp -p $$d/$$file $(distdir)/$$file || exit 1; \
 	done
@@ -1298,21 +1200,12 @@
 	    if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	    dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	      $(MKDIR_P) "$(distdir)/$$dir"; \
+	      $(mkdir_p) "$(distdir)/$$dir"; \
 	    fi; \
 	    cp -p $$d/$$file $(distdir)/$$file || exit 1; \
 	  done; \
 	done
 
-# Temporary directories created by po/Makefile.
-clean-local:
-	-rm -rf tmp-hello-*
-
-maintainer-update-po: $(top_builddir)/config.status
-	$(SHELL) ./config.status --recheck
-	$(SHELL) ./config.status po/Makefile
-	cd po && $(MAKE) update-po
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gettext-0.19.3/gettext-tools/examples/po/af.po gettext-0.18.1.1/gettext-tools/examples/po/af.po
--- gettext-0.19.3/gettext-tools/examples/po/af.po	2014-10-16 06:05:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/af.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples-0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hallo wêreld!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Hierdie program loop as prosesnommer %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ast.po gettext-0.18.1.1/gettext-tools/examples/po/ast.po
--- gettext-0.19.3/gettext-tools/examples/po/ast.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ast.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -17,40 +17,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "�Hola, mundu!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Esti programa ta corriendo como'l procesu n�mberu %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/bg.po gettext-0.18.1.1/gettext-tools/examples/po/bg.po
--- gettext-0.19.3/gettext-tools/examples/po/bg.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/bg.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,60 +1,55 @@
 # Bulgarian translations for gettext-examples package.
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2014.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-examples 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-examples 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2010-05-10 13:49+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Здравейте на всички !"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Програмата е пусната под процес номер %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Примерно приложение"
+msgstr "Програмата е запусната под процес номер %d."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Програмата е пусната под процес номер %1."
+msgstr "Програмата е запусната под процес номер %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
@@ -67,26 +62,26 @@
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Програмата е пусната под процес номер $pid."
+msgstr "Програмата е запусната под процес номер $pid."
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Програмата е пусната под процес номер %(pid)d."
+msgstr "Програмата е запусната под процес номер %(pid)d."
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Програмата е пусната под процес номер ~D."
+msgstr "Програмата е запусната под процес номер ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Програмата е пусната под процес номер {0}."
+msgstr "Програмата е запусната под процес номер {0}."
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Програмата е пусната под процес номер {pid}."
+msgstr "Програмата е запусната под процес номер {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ca.po gettext-0.18.1.1/gettext-tools/examples/po/ca.po
--- gettext-0.19.3/gettext-tools/examples/po/ca.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ca.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2003-12-18 10:41+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -17,40 +17,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hola, món!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Aquest programa està corrent amb el número de procés %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/cs.po gettext-0.18.1.1/gettext-tools/examples/po/cs.po
--- gettext-0.19.3/gettext-tools/examples/po/cs.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/cs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-# The Czech translation for the gettext package.
-# Copyright (C) 2011 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Marek Černocký <marek@manet.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-examples 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2011-11-30 16:10+0100\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
-#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
-#: hello-php/hello.php:12
-msgid "Hello, world!"
-msgstr "Ahoj světe!"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Tento program běží jako proces číslo %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Tento program běží jako proces číslo %1."
-
-#: hello-c++-kde/hello.cc:46
-msgid "Hello example"
-msgstr "Příklad „Hello“"
-
-#: hello-c++-kde/hello.cc:48
-msgid "Hello world example"
-msgstr "Příklad „Hello world“"
-
-#: hello-sh/hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Tento program běží jako proces číslo $pid."
-
-#: hello-python/hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Tento program běží jako proces číslo %(pid)d."
-
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Tento program běží jako proces číslo ~D."
-
-#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Tento program běží jako proces číslo {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Tento program běží jako proces číslo {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/da.po gettext-0.18.1.1/gettext-tools/examples/po/da.po
--- gettext-0.19.3/gettext-tools/examples/po/da.po	2014-10-16 06:06:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-# Danish messages for gettext-examples.
-# Copyright (C) 2011 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
-# Keld Simonsen <keld@keldix.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-examples 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2011-01-08 12:39+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
-#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
-#: hello-php/hello.php:12
-msgid "Hello, world!"
-msgstr "Hej verden!"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Dette program k�rer som proces nummer %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Dette program k�rer som proces nummer %1."
-
-#: hello-c++-kde/hello.cc:46
-msgid "Hello example"
-msgstr "Eksempel p� hilsen"
-
-#: hello-c++-kde/hello.cc:48
-msgid "Hello world example"
-msgstr "\"Hej verden\"-eksempel"
-
-#: hello-sh/hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Dette program k�rer som proces nummer $pid."
-
-#: hello-python/hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Dette program k�rer som proces nummer %(pid)d."
-
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Dette program k�rer som proces nummer ~D."
-
-#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Dette program k�rer som proces nummer {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Dette program k�rer som proces nummer {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/de.po gettext-0.18.1.1/gettext-tools/examples/po/de.po
--- gettext-0.19.3/gettext-tools/examples/po/de.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/de.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,60 +1,52 @@
 # German messages for gettext-examples.
-# Copyright © 2003, 2013 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright © 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext-examples package.
 # Bruno Haible <bruno@clisp.org>, 2003.
 # Karl Eichwalder <ke@gnu.franken.de>, 2003.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-10 17:47+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2003-12-18 10:09+0100\n"
+"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
+"Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hallo Welt!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Beispielanwendung"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
@@ -94,4 +86,4 @@
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Dieses Programm läuft mit der Prozess-Nummer {pid}."
+msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/el.po gettext-0.18.1.1/gettext-tools/examples/po/el.po
--- gettext-0.19.3/gettext-tools/examples/po/el.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/el.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -16,40 +16,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Γεια σου, κόσμε!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/eo.po gettext-0.18.1.1/gettext-tools/examples/po/eo.po
--- gettext-0.19.3/gettext-tools/examples/po/eo.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/eo.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2006-07-02 19:24+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Saluton, mondo!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/es.po gettext-0.18.1.1/gettext-tools/examples/po/es.po
--- gettext-0.19.3/gettext-tools/examples/po/es.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/es.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,64 +1,55 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-#
-# This file is distributed under the same license as the gettext package.
-#
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2014
-#
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 
+# 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples-0.19-rc1\n"
+"Project-Id-Version: gettext-examples-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2004-01-29 13:59-0600\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "¡Hola, mundo!"
+msgstr "�Hola, mundo!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está corriendo como el proceso número %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Ejemplo de aplicación"
+msgstr "Este programa est� corriendo como el proceso n�mero %d."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Este programa está corriendo como el proceso número %1."
+msgstr "Este programa est� corriendo como el proceso n�mero %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
@@ -71,26 +62,26 @@
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Este programa está corriendo como el proceso número $pid."
+msgstr "Este programa est� corriendo como el proceso n�mero $pid."
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Este programa está corriendo como el proceso número %(pid)d."
+msgstr "Este programa est� corriendo como el proceso n�mero %(pid)d."
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Este programa está corriendo como el proceso número ~D."
+msgstr "Este programa est� corriendo como el proceso n�mero ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está corriendo como el proceso número {0}."
+msgstr "Este programa est� corriendo como el proceso n�mero {0}."
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Este programa está corriendo como el proceso número {pid}."
+msgstr "Este programa est� corriendo como el proceso n�mero {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/fi.po gettext-0.18.1.1/gettext-tools/examples/po/fi.po
--- gettext-0.19.3/gettext-tools/examples/po/fi.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/fi.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,16 +1,14 @@
 # Finnish messages for GNU Gettext examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright © 2007, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2007 Yoyodyne, Inc.
 # Lauri Nurmi <lanurmi@iki.fi>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-06-23 16:51+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2007-10-20 23:42+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -18,40 +16,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # Tämä nimenomainen käännös valittu GNU Hellon mukaisesti.
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Terve maailma!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tämän ohjelman prosessinumero on %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Esimerkkisovellus"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/fr.po gettext-0.18.1.1/gettext-tools/examples/po/fr.po
--- gettext-0.19.3/gettext-tools/examples/po/fr.po	2014-10-16 06:06:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/fr.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2006-10-01 02:29+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -17,40 +17,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Bonjour, le monde !"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ce programme est exécuté en tant que processus numéro %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ga.po gettext-0.18.1.1/gettext-tools/examples/po/ga.po
--- gettext-0.19.3/gettext-tools/examples/po/ga.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ga.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Dia duit, a dhomhain!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "T� an cl�r seo � rith mar phr�iseas %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/gettext-examples.pot gettext-0.18.1.1/gettext-tools/examples/po/gettext-examples.pot
--- gettext-0.19.3/gettext-tools/examples/po/gettext-examples.pot	2014-10-16 06:05:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/gettext-examples.pot	2010-06-06 12:49:57.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -17,40 +17,35 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr ""
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr ""
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/gl.po gettext-0.18.1.1/gettext-tools/examples/po/gl.po
--- gettext-0.19.3/gettext-tools/examples/po/gl.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/gl.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-# Galician translation for gettext-examples package.
-# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2010-2014.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+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"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
-#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
-#: hello-php/hello.php:12
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Este programa estase executando como o proceso número %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Aplicativo de exemplo"
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Este programa estase executando como o proceso número %1."
-
-#: hello-c++-kde/hello.cc:46
-msgid "Hello example"
-msgstr "Exemplo ola"
-
-#: hello-c++-kde/hello.cc:48
-msgid "Hello world example"
-msgstr "Exemplo ola mundo"
-
-#: hello-sh/hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Este programa estase executando como o proceso número $pid."
-
-#: hello-python/hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Este programa estase executando como o proceso número %(pid)d."
-
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Este programa estase executando como o proceso número ~D."
-
-#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa estase executando como o proceso número {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Este programa estase executando como o proceso número {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/hr.po gettext-0.18.1.1/gettext-tools/examples/po/hr.po
--- gettext-0.19.3/gettext-tools/examples/po/hr.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/hr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-# Translation of gettext-examples to Croatian.
-# Copyright © 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-examples 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.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"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
-#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
-#: hello-php/hello.php:12
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Ovaj program je pokrenut kao proces broj %1."
-
-#: hello-c++-kde/hello.cc:46
-msgid "Hello example"
-msgstr "Primjer pozdrava"
-
-#: hello-c++-kde/hello.cc:48
-msgid "Hello world example"
-msgstr "Primjer pozdrava svijetu"
-
-#: hello-sh/hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Ovaj program je pokrenut kao proces broj $pid."
-
-#: hello-python/hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Ovaj program je pokrenut kao proces broj %(pid)d."
-
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Ovaj program je pokrenut kao proces broj ~D."
-
-#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Ovaj program je pokrenut kao proces broj {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Ovaj program je pokrenut kao proces broj {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/hu.po gettext-0.18.1.1/gettext-tools/examples/po/hu.po
--- gettext-0.19.3/gettext-tools/examples/po/hu.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/hu.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,95 +1,87 @@
 # Hungarian translation for gettext-examples.
-# This file is distributed under the same license as the gettext package.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2005 Yoyodyne, Inc.
+# This file is distributed under the same license as the gettext-examples package.
+# Kiss Tam�s <atomi@inf.elte.hu>, 2005.
 #
-# Tamás Kiss <atomi@inf.elte.hu>, 2005.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-11 16:21+0200\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2005-08-28 03:21+0200\n"
+"Last-Translator: Kiss Tam�s <atomi@inf.elte.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "Hello, világ!"
+msgstr "Hello, vil�g!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Példa alkalmazás"
+msgstr "Ez a program a %d processz azonos�t�val fut."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Ez a program a(z) %1 folyamatazonosítóval fut."
+msgstr "Ez a program a %1 processz azonos�t�val fut."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
-msgstr "Hello példa"
+msgstr "Hello p�lda"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "Hello világ példa"
+msgstr "Hello vil�g p�lda"
 
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Ez a program a(z) $pid folyamatazonosítóval fut."
+msgstr "Ez a program a $pid processz azonos�t�val fut."
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Ez a program a(z) %(pid)d folyamatazonosítóval fut."
+msgstr "Ez a program a %(pid)d processz azonos�t�val fut."
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Ez a program a(z) ~D folyamatazonosítóval fut."
+msgstr "Ez a program a ~D processz azonos�t�val fut."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Ez a program a(z) {0} folyamatazonosítóval fut."
+msgstr "Ez a program a {0} processz azonos�t�val fut."
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Ez a program a(z) {pid} folyamatazonosítóval fut."
+msgstr "Ez a program a {pid} processz azonos�t�val fut."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/id.po gettext-0.18.1.1/gettext-tools/examples/po/id.po
--- gettext-0.19.3/gettext-tools/examples/po/id.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/id.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples-0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -17,40 +17,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini berjalan sebagai proses nomor %d"
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/it.po gettext-0.18.1.1/gettext-tools/examples/po/it.po
--- gettext-0.19.3/gettext-tools/examples/po/it.po	2014-10-16 06:06:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/it.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2006-07-01 10:46+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Salve, mondo!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Questo programma è in esecuzione con numero di processo %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ja.po gettext-0.18.1.1/gettext-tools/examples/po/ja.po
--- gettext-0.19.3/gettext-tools/examples/po/ja.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ja.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,14 +1,14 @@
 # Translation of `gettext-examples' messages to Japanese.
-# Copyright (C) 2005, 2006, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the gettext-examples package.
+# Masahito Yamaga <ma@yama-ga.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-examples 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-examples 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2007-10-16 10:31+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "������, ����ˤ���!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "���Υץ������ϥץ������ֹ� %d ��ư���Ƥ��ޤ�."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "�������"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ky.po gettext-0.18.1.1/gettext-tools/examples/po/ky.po
--- gettext-0.19.3/gettext-tools/examples/po/ky.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ky.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -18,40 +18,35 @@
 "X-Poedit-Language: Kyrgyz\n"
 "X-Poedit-Country: KYRGYZSTAN\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Салам дүйнө!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Бул программа %d процесс номери катары иштеп жатат."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/LINGUAS gettext-0.18.1.1/gettext-tools/examples/po/LINGUAS
--- gettext-0.19.3/gettext-tools/examples/po/LINGUAS	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca de el eo es fi fr ga hu id it ja ky lv ms mt nl pl pt ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff -Nru gettext-0.19.3/gettext-tools/examples/po/lv.po gettext-0.18.1.1/gettext-tools/examples/po/lv.po
--- gettext-0.19.3/gettext-tools/examples/po/lv.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/lv.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -20,40 +20,35 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Sveika, pasaule!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Šī programma darbojas kā process ar numuru %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/Makefile.am gettext-0.18.1.1/gettext-tools/examples/po/Makefile.am
--- gettext-0.19.3/gettext-tools/examples/po/Makefile.am	2014-04-24 03:41:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -22,10 +22,6 @@
 POTFILES = \
   hello-c/hello.c \
   hello-c-gnome/hello.c \
-  hello-c-gnome3/hello.c \
-  hello-c-gnome3/hello.desktop.in.in \
-  hello-c-gnome3/hello.gschema.xml \
-  hello-c-gnome3/hello.ui \
   hello-c++/hello.cc \
   hello-c++-qt/hello.cc \
   hello-c++-kde/hello.cc \
@@ -65,7 +61,6 @@
 SMALLPOTS = \
   hello-c.pot \
   hello-c-gnome.pot \
-  hello-c-gnome3.pot \
   hello-c++.pot \
   hello-c++-qt.pot \
   hello-c++-kde.pot \
@@ -221,9 +216,6 @@
 hello-c-gnome.pot : $(POTFILES_DEPS)
 	$(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome
 
-hello-c-gnome3.pot : $(POTFILES_DEPS)
-	$(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome3
-
 hello-c++.pot : $(POTFILES_DEPS)
 	$(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++
 
@@ -386,7 +378,6 @@
 SMALLPOFILES_FOR_lang = \
   ../hello-c/po/$$lang.po \
   ../hello-c-gnome/po/$$lang.po \
-  ../hello-c-gnome3/po/$$lang.po \
   ../hello-c++/po/$$lang.po \
   ../hello-c++-qt/po/$$lang.po \
   ../hello-c++-kde/po/$$lang.po \
@@ -421,9 +412,6 @@
 ../hello-c-gnome/po/$(LL).po: hello-c-gnome.pot $(LL).po
 	$(SHELL) mmsmallpo.sh hello-c-gnome $(LL)
 
-../hello-c-gnome3/po/$(LL).po: hello-c-gnome3.pot $(LL).po
-	$(SHELL) mmsmallpo.sh hello-c-gnome3 $(LL)
-
 ../hello-c++/po/$(LL).po: hello-c++.pot $(LL).po
 	$(SHELL) mmsmallpo.sh hello-c++ $(LL)
 
diff -Nru gettext-0.19.3/gettext-tools/examples/po/Makefile.in gettext-0.18.1.1/gettext-tools/examples/po/Makefile.in
--- gettext-0.19.3/gettext-tools/examples/po/Makefile.in	2014-10-16 06:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/Makefile.in	2010-06-06 20:11:41.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,51 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -76,10 +32,10 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = po
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../../build-aux/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/fixautomake.m4 \
+	$(top_srcdir)/../../m4/init-package-version.m4 \
 	$(top_srcdir)/../../gettext-runtime/m4/nls.m4 \
 	$(top_srcdir)/../../gettext-runtime/m4/po.m4 \
 	$(top_srcdir)/../../gettext-runtime/m4/progtest.m4 \
@@ -89,26 +45,14 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -146,7 +90,6 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -201,10 +144,6 @@
 POTFILES = \
   hello-c/hello.c \
   hello-c-gnome/hello.c \
-  hello-c-gnome3/hello.c \
-  hello-c-gnome3/hello.desktop.in.in \
-  hello-c-gnome3/hello.gschema.xml \
-  hello-c-gnome3/hello.ui \
   hello-c++/hello.cc \
   hello-c++-qt/hello.cc \
   hello-c++-kde/hello.cc \
@@ -245,7 +184,6 @@
 SMALLPOTS = \
   hello-c.pot \
   hello-c-gnome.pot \
-  hello-c-gnome3.pot \
   hello-c++.pot \
   hello-c++-qt.pot \
   hello-c++-kde.pot \
@@ -342,7 +280,6 @@
 SMALLPOFILES_FOR_lang = \
   ../hello-c/po/$$lang.po \
   ../hello-c-gnome/po/$$lang.po \
-  ../hello-c-gnome3/po/$$lang.po \
   ../hello-c++/po/$$lang.po \
   ../hello-c++-qt/po/$$lang.po \
   ../hello-c++-kde/po/$$lang.po \
@@ -405,11 +342,11 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -456,15 +393,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -548,15 +480,15 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	cscopelist-am ctags-am distclean distclean-generic distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am
 
 
 .sin.sed:
@@ -627,9 +559,6 @@
 hello-c-gnome.pot : $(POTFILES_DEPS)
 	$(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome
 
-hello-c-gnome3.pot : $(POTFILES_DEPS)
-	$(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c-gnome3
-
 hello-c++.pot : $(POTFILES_DEPS)
 	$(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++
 
@@ -776,9 +705,6 @@
 ../hello-c-gnome/po/$(LL).po: hello-c-gnome.pot $(LL).po
 	$(SHELL) mmsmallpo.sh hello-c-gnome $(LL)
 
-../hello-c-gnome3/po/$(LL).po: hello-c-gnome3.pot $(LL).po
-	$(SHELL) mmsmallpo.sh hello-c-gnome3 $(LL)
-
 ../hello-c++/po/$(LL).po: hello-c++.pot $(LL).po
 	$(SHELL) mmsmallpo.sh hello-c++ $(LL)
 
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ms.po gettext-0.18.1.1/gettext-tools/examples/po/ms.po
--- gettext-0.19.3/gettext-tools/examples/po/ms.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ms.po	2010-06-06 12:49:57.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2006-12-22 21:36+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -17,40 +17,35 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/mt.po gettext-0.18.1.1/gettext-tools/examples/po/mt.po
--- gettext-0.19.3/gettext-tools/examples/po/mt.po	2014-10-16 06:06:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/mt.po	2010-06-06 12:49:57.000000000 +0000
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the gettext package.
 # Clyde Meli <cmeli@cis.um.edu.mt>, 2001-2008.
 #
-#, fuzzy
 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: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -17,40 +16,35 @@
 "Content-Type: text/plain; charset=ISO-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, lil kulħadd!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dal-programm qed jaħdem taħt il-proċess numru %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/nb.po gettext-0.18.1.1/gettext-tools/examples/po/nb.po
--- gettext-0.19.3/gettext-tools/examples/po/nb.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/nb.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-# Norwegian Bokmal translations for gettext-examples package.
-# Copyright (C) 2012 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Johnny A. Solbu <johnny@solbu.net>, 2012-2014
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-07-22 13:18+0100\n"
-"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
-#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
-#: hello-php/hello.php:12
-msgid "Hello, world!"
-msgstr "Hallo verden!"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Dette programmet kjører som prosess nummer %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Eksempelprogram"
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Dette programmet kjører som prosess nummer %1."
-
-#: hello-c++-kde/hello.cc:46
-msgid "Hello example"
-msgstr "Hallo eksempel"
-
-#: hello-c++-kde/hello.cc:48
-msgid "Hello world example"
-msgstr "Hallo verden-eksempel"
-
-#: hello-sh/hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Dette programmet kjører som prosess nummer $pid."
-
-#: hello-python/hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Dette programmet kjører som prosess nummer %(pid)d."
-
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Dette programmet kjører som prosess nummer ~D."
-
-#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Dette programmet kjører som prosess nummer {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Dette programmet kjører som prosess nummer {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/nl.po gettext-0.18.1.1/gettext-tools/examples/po/nl.po
--- gettext-0.19.3/gettext-tools/examples/po/nl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/nl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,60 +1,52 @@
-# Dutch translations for GNU gettext-examples.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Translation of gettext-examples-0.16.2-pre5 to Dutch.
+# Copyright (C) 2005, 2006 Yoyodyne, Inc.
+# This file is distributed under the same license as the gettext-examples package.
 #
-# "Waar de wind waait."
-#
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2014.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples-0.19-rc1\n"
+"Project-Id-Version: gettext-examples-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-11 12:17+0200\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hallo, wereld!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dit programma draait als proces nummer %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Voorbeeldtoepassing"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/pl.po gettext-0.18.1.1/gettext-tools/examples/po/pl.po
--- gettext-0.19.3/gettext-tools/examples/po/pl.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/pl.po	2010-06-06 12:49:57.000000000 +0000
@@ -2,56 +2,51 @@
 # Copyright (C) 2010 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014	„”
+# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010	„”
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples-0.19-rc1\n"
+"Project-Id-Version: gettext-examples-0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Witaj świecie!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ten program działa jako proces o numerze %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Program przykładowy"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/pt_BR.po gettext-0.18.1.1/gettext-tools/examples/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/examples/po/pt_BR.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
-#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
-#: hello-php/hello.php:12
-msgid "Hello, world!"
-msgstr "Olá, mundo!"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
-#, php-format
-msgid "This program is running as process number %d."
-msgstr "Este programa está executando com número de processo %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Aplicativo exemplo"
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
-#, ycp-format
-msgid "This program is running as process number %1."
-msgstr "Este programa está executando com número de processo %1."
-
-#: hello-c++-kde/hello.cc:46
-msgid "Hello example"
-msgstr "Olá exemplo"
-
-#: hello-c++-kde/hello.cc:48
-msgid "Hello world example"
-msgstr "Olá mundo exemplo"
-
-#: hello-sh/hello.sh:17
-#, sh-format
-msgid "This program is running as process number $pid."
-msgstr "Este programa está executando com número de processo $pid."
-
-#: hello-python/hello.py.in:13
-#, python-format
-msgid "This program is running as process number %(pid)d."
-msgstr "Este programa está executando com número de processo %(pid)d."
-
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
-msgid "This program is running as process number ~D."
-msgstr "Este programa está executando com número de processo ~D."
-
-#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
-#, csharp-format
-msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Este programa está executando com número de processo {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/pt.po gettext-0.18.1.1/gettext-tools/examples/po/pt.po
--- gettext-0.19.3/gettext-tools/examples/po/pt.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/pt.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Olá, Mundo!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa está a ser executado com o número de processo %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ro.po gettext-0.18.1.1/gettext-tools/examples/po/ro.po
--- gettext-0.19.3/gettext-tools/examples/po/ro.po	2014-10-16 06:06:04.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ro.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2003-11-22 11:15+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Salut, lume! (Hello, world!)"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Acest program este rulat ca procesul num�rul %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/ru.po gettext-0.18.1.1/gettext-tools/examples/po/ru.po
--- gettext-0.19.3/gettext-tools/examples/po/ru.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/ru.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,96 +1,89 @@
 # Translation of gettext-examples-0.14.1.po to Russian
-# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext-examples package.
+# Copyright (C) 2004 Yoyodyne, Inc.
 # Pavel Maryanov <acid_jack@ukr.net>, 2004.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2004-11-17 10:08+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\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"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+"X-Generator: KBabel 1.3\n"
+
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "Здравствуй, мир!"
+msgstr "����������, ���!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Эта программа выполняется как процесс под номером %d."
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Пример приложения"
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %d."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Эта программа выполняется как процесс под номером %1."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
-msgstr "Пример: Здравствуй"
+msgstr "������: ����������"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "Пример: Здравствуй, мир"
+msgstr "������: ����������, ���"
 
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Эта программа выполняется как процесс под номером $pid."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� $pid."
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Эта программа выполняется как процесс под номером %(pid)d."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� %(pid)d."
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Эта программа выполняется как процесс под номером ~D."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Эта программа выполняется как процесс под номером {0}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {0}."
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Эта программа выполняется как процесс под номером {pid}."
+msgstr "��� ��������� ����������� ��� ������� ��� ������� {pid}."
diff -Nru gettext-0.19.3/gettext-tools/examples/po/sk.po gettext-0.18.1.1/gettext-tools/examples/po/sk.po
--- gettext-0.19.3/gettext-tools/examples/po/sk.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/sk.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,14 +1,14 @@
 # Slovak translations GNU for gettext-examples package.
-# Copyright (C) 2003, 2004, 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-# Marcel Telka <marcel@telka.sk>, 2003, 2004, 2014.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gettext-examples package.
+# Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-examples 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-examples 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
@@ -16,40 +16,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Ahoj svet!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tento program beží ako proces s číslom %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Ukážková aplikácia"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/sl.po gettext-0.18.1.1/gettext-tools/examples/po/sl.po
--- gettext-0.19.3/gettext-tools/examples/po/sl.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/sl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,58 +1,51 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
-# Copyright (C) 2005 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: gettext-examples-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# Copyright (C) 2005 Yoyodyne, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005.
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
-"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2005-09-29 13:38+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Pozdravljen, svet!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ta program teče kot proces številka %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Zgled aplikacije"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/sr.po gettext-0.18.1.1/gettext-tools/examples/po/sr.po
--- gettext-0.19.3/gettext-tools/examples/po/sr.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/sr.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,58 +1,49 @@
 # Serbian translation of gettext-examples.
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the `gettext-examples' package.
 # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples-0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-12 21:25+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2004-01-31 00:47-0500\n"
+"Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
 "Language: sr\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"
-"X-Generator: Virtaal 0.7.1\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Здраво свима!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Овај програм се извршава као процес број %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Програм примера"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/sv.po gettext-0.18.1.1/gettext-tools/examples/po/sv.po
--- gettext-0.19.3/gettext-tools/examples/po/sv.po	2014-10-16 06:06:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/sv.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,13 +1,13 @@
 # Swedish messages for gettext-examples.
-# Copyright © 2006, 2014 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
+# Copyright © 2006 Yoyodyne, Inc.
+# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006
+# Revision: 1.9
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -15,40 +15,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hej världen!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Detta program kör som process nummer %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Exempelprogram"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/tr.po gettext-0.18.1.1/gettext-tools/examples/po/tr.po
--- gettext-0.19.3/gettext-tools/examples/po/tr.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/tr.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -16,40 +16,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Merhaba Dünyalı!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Bu yazılım, %d süreç kimliği ile çalışıyor."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/uk.po gettext-0.18.1.1/gettext-tools/examples/po/uk.po
--- gettext-0.19.3/gettext-tools/examples/po/uk.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/uk.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,59 +1,50 @@
 # Ukrainian translation to gettext-examples
-# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2004 Yoyodyne, Inc.
+# This file is distributed under the same license as the gettext-examples package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007
 #
-# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2007-07-05 20:24+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\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"
-"X-Generator: Lokalize 1.5\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "Привіт, світе!"
+msgstr "Привіт, світ!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ця програма виконується як процес з номером %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Програма-приклад"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
@@ -66,7 +57,7 @@
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "Приклад «Привітання»"
+msgstr "Приклад \"Привітання\""
 
 #: hello-sh/hello.sh:17
 #, sh-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/vi.po gettext-0.18.1.1/gettext-tools/examples/po/vi.po
--- gettext-0.19.3/gettext-tools/examples/po/vi.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/vi.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,62 +1,53 @@
 # Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
-# Copyright © 2014 Yoyodyne, Inc. (msgids)
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 Yoyodyne, Inc. (msgids)
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2010-05-13 17:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "Chào thế giới!"
+msgstr "Chào thế giới !"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Chương trình này đang chạy với số hiệu tiến trình %d."
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr "Ứng dụng mẫu"
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
@@ -65,11 +56,11 @@
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
-msgstr "Ví dụ “Chào”"
+msgstr "Lời ví dụ « Chào »"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "Ví dụ “Chào thế giới”"
+msgstr "Lời ví dụ « Chào thế giới »"
 
 #: hello-sh/hello.sh:17
 #, sh-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/xsmallpot.sh gettext-0.18.1.1/gettext-tools/examples/po/xsmallpot.sh
--- gettext-0.19.3/gettext-tools/examples/po/xsmallpot.sh	2014-05-01 09:37:33.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/xsmallpot.sh	2010-06-06 12:49:57.000000000 +0000
@@ -20,30 +20,19 @@
 cd tmp-$directory
 case $directory in
   hello-c++-kde)
-    cat > configure.ac <<EOF
-AC_INIT
-AC_CONFIG_AUX_DIR(admin)
-AM_INIT_AUTOMAKE([$directory], 0)
-AC_PROG_CXX
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.15)
-AC_CONFIG_FILES([po/Makefile.in])
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([m4/Makefile])
-AC_OUTPUT
-EOF
-    aclocal -I m4
-    autopoint -f
+    ./autogen.sh
+    sed -e 's,tmp-,,' < configure.in > configure.ac
+    grep '^\(AC_INIT\|AC_CONFIG\|AC_PROG_\|AC_SUBST(.*OBJC\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
+    rm -f configure.ac 
     autoconf
-    automake -a -c
     ./configure
     ;;
   hello-objc-gnustep)
     ./autogen.sh
     ;;
   *)
-    grep '^\(AC_INIT\|AC_CONFIG\|AC_PROG_\|AC_SUBST(.*OBJC\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > tmp-configure.ac
-    mv -f tmp-configure.ac configure.ac
+    grep '^\(AC_INIT\|AC_CONFIG\|AC_PROG_\|AC_SUBST(.*OBJC\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
+    rm -f configure.ac 
     ./autogen.sh
     ./configure
     ;;
diff -Nru gettext-0.19.3/gettext-tools/examples/po/zh_CN.po gettext-0.18.1.1/gettext-tools/examples/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/examples/po/zh_CN.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/zh_CN.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,49 +7,44 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "世界你好！"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "此程序正以进程号 %d 运行。"
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/zh_HK.po gettext-0.18.1.1/gettext-tools/examples/po/zh_HK.po
--- gettext-0.19.3/gettext-tools/examples/po/zh_HK.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/zh_HK.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\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"
@@ -15,40 +15,35 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "你好！"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "本程式正在執行中，進程編號為 %d。"
 
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff -Nru gettext-0.19.3/gettext-tools/examples/po/zh_TW.po gettext-0.18.1.1/gettext-tools/examples/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/examples/po/zh_TW.po	2014-10-16 06:06:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/po/zh_TW.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,61 +1,54 @@
-# Traditional Chinese translation of gettext-examples.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
+# traditional Chinese translation of gettext-examples.
+# Copyright (C) 2005 Yoyodyne, Inc.
 # Abel Cheung <abelcheung@gmail.com>, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.18\n"
+"Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:05+0900\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
+"PO-Revision-Date: 2005-08-10 12:25+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
-#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
-#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
-#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
-#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "哈囉，大家好！"
+msgstr "您好！"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "本程式正在執行，行程編號為 %d。"
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
+msgstr "本程式正在執行中，進程編號為 %d。"
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "本程式正在執行，行程編號為 %1。"
+msgstr "本程式正在執行中，進程編號為 %1。"
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
@@ -68,26 +61,26 @@
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "本程式正在執行，行程編號為 $pid。"
+msgstr "本程式正在執行中，進程編號為 $pid。"
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "本程式正在執行，行程編號為 %(pid)d。"
+msgstr "本程式正在執行中，進程編號為 %(pid)d。"
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "本程式正在執行，行程編號為 ~D。"
+msgstr "本程式正在執行中，進程編號為 ~D。"
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "本程式正在執行，行程編號為 {0}。"
+msgstr "本程式正在執行中，進程編號為 {0}。"
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "本程式正在執行，行程編號為 {pid}。"
+msgstr "本程式正在執行中，進程編號為 {pid}。"
diff -Nru gettext-0.19.3/gettext-tools/examples/README gettext-0.18.1.1/gettext-tools/examples/README
--- gettext-0.19.3/gettext-tools/examples/README	2014-04-15 08:10:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/examples/README	2010-06-06 12:49:57.000000000 +0000
@@ -6,16 +6,15 @@
     Example                    Language          GUI Environment
 
     hello-c                    C
-    hello-c-gnome              C                 GNOME (obsolete)
-    hello-c-gnome3             C                 GNOME 3.10 or later
+    hello-c-gnome              C                 GNOME
     hello-c++                  C++
     hello-c++-qt               C++               Qt
     hello-c++-kde              C++               KDE
-    hello-c++-gnome            C++               GNOME (obsolete)
+    hello-c++-gnome            C++               GNOME
     hello-c++-wxwidgets        C++               wxWidgets
     hello-objc                 ObjectiveC
     hello-objc-gnustep         ObjectiveC        GNUstep
-    hello-objc-gnome           ObjectiveC        GNOME (obsolete)
+    hello-objc-gnome           ObjectiveC        GNOME
     hello-sh                   Shell
     hello-python               Python
     hello-clisp                Lisp
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/acl_entries.c gettext-0.18.1.1/gettext-tools/gnulib-lib/acl_entries.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/acl_entries.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/acl_entries.c	2010-05-24 09:42:35.000000000 +0000
@@ -1,6 +1,6 @@
 /* Return the number of entries in an ACL.
 
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #include "acl-internal.h"
 
 /* This file assumes POSIX-draft like ACLs
-   (Linux, FreeBSD, Mac OS X, IRIX, Tru64).  */
+   (Linux, FreeBSD, MacOS X, IRIX, Tru64).  */
 
 /* Return the number of entries in ACL.
    Return -1 and set errno upon failure to determine it.  */
@@ -34,8 +34,8 @@
 
   if (acl != NULL)
     {
-#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */
-# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
+#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, MacOS X */
+# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
       /* acl_get_entry returns 0 when it successfully fetches an entry,
          and -1/EINVAL at the end.  */
       acl_entry_t ace;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/acl-errno-valid.c gettext-0.18.1.1/gettext-tools/gnulib-lib/acl-errno-valid.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/acl-errno-valid.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/acl-errno-valid.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/* Test whether ACLs are well supported on this system.
-
-   Copyright 2013-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert.  */
-
-#include <config.h>
-
-#include <acl.h>
-
-#include <errno.h>
-
-/* Return true if errno value ERRNUM indicates that ACLs are well
-   supported on this system.  ERRNUM should be an errno value obtained
-   after an ACL-related system call fails.  */
-bool
-acl_errno_valid (int errnum)
-{
-  /* Recognize some common errors such as from an NFS mount that does
-     not support ACLs, even when local drives do.  */
-  switch (errnum)
-    {
-    case EBUSY: return false;
-    case EINVAL: return false;
-#if defined __APPLE__ && defined __MACH__
-    case ENOENT: return false;
-#endif
-    case ENOSYS: return false;
-
-#if defined ENOTSUP && ENOTSUP != EOPNOTSUPP
-# if ENOTSUP != ENOSYS /* Needed for the MS-Windows port of GNU Emacs.  */
-    case ENOTSUP: return false;
-# endif
-#endif
-
-    case EOPNOTSUPP: return false;
-    default: return true;
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/acl.h gettext-0.18.1.1/gettext-tools/gnulib-lib/acl.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/acl.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/acl.h	2010-05-24 09:42:35.000000000 +0000
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,19 +17,11 @@
 
    Written by Paul Eggert.  */
 
-#ifndef _GL_ACL_H
-#define _GL_ACL_H 1
-
-#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-bool acl_errno_valid (int) _GL_ATTRIBUTE_CONST;
 int file_has_acl (char const *, struct stat const *);
-int qset_acl (char const *, int, mode_t);
-int set_acl (char const *, int, mode_t);
-int qcopy_acl (char const *, int, char const *, int, mode_t);
 int copy_acl (char const *, int, char const *, int, mode_t);
+int set_acl (char const *, int, mode_t);
+int qset_acl (char const *, int, mode_t);
 int chmod_or_fchmod (char const *, int, mode_t);
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/acl-internal.h gettext-0.18.1.1/gettext-tools/gnulib-lib/acl-internal.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/acl-internal.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/acl-internal.h	2010-05-24 09:42:35.000000000 +0000
@@ -1,6 +1,6 @@
 /* Internal implementation of access control lists.
 
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #if HAVE_SYS_ACL_H
 # include <sys/acl.h>
 #endif
-#if defined HAVE_FACL && ! defined GETACLCNT && defined ACL_CNT
+#if defined HAVE_ACL && ! defined GETACLCNT && defined ACL_CNT
 # define GETACLCNT ACL_CNT
 #endif
 
@@ -35,24 +35,15 @@
 # include <acl/libacl.h>
 #endif
 
-/* On HP-UX >= 11.11, additional ACL API is available in <aclv.h>.  */
-#if HAVE_ACLV_H
-# include <sys/types.h>
-# include <aclv.h>
-/* HP-UX 11.11 lacks these declarations.  */
-extern int acl (char *, int, int, struct acl *);
-extern int aclsort (int, int, struct acl *);
-#endif
+#include "error.h"
+#include "quote.h"
 
 #include <errno.h>
-
-#include <limits.h>
-#ifndef MIN
-# define MIN(a,b) ((a) < (b) ? (a) : (b))
+#ifndef ENOSYS
+# define ENOSYS (-1)
 #endif
-
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
+#ifndef ENOTSUP
+# define ENOTSUP (-1)
 #endif
 
 #ifndef HAVE_FCHMOD
@@ -60,19 +51,12 @@
 # define fchmod(fd, mode) (-1)
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef ACL_INTERNAL_INLINE
-# define ACL_INTERNAL_INLINE _GL_INLINE
-#endif
 
 #if USE_ACL
 
 # if HAVE_ACL_GET_FILE
 /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
-/* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+/* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
 
 #  ifndef MIN_ACL_ENTRIES
 #   define MIN_ACL_ENTRIES 4
@@ -83,7 +67,7 @@
 /* Most platforms have a 1-argument acl_get_fd, only OSF/1 has a 2-argument
    macro(!).  */
 #   if HAVE_ACL_FREE_TEXT /* OSF/1 */
-ACL_INTERNAL_INLINE acl_t
+static inline acl_t
 rpl_acl_get_fd (int fd)
 {
   return acl_get_fd (fd, ACL_TYPE_ACCESS);
@@ -102,7 +86,7 @@
 /* Most platforms have a 2-argument acl_set_fd, only OSF/1 has a 3-argument
    macro(!).  */
 #   if HAVE_ACL_FREE_TEXT /* OSF/1 */
-ACL_INTERNAL_INLINE int
+static inline int
 rpl_acl_set_fd (int fd, acl_t acl)
 {
   return acl_set_fd (fd, ACL_TYPE_ACCESS, acl);
@@ -135,12 +119,23 @@
 
 /* Set to 1 if a file's mode is implicit by the ACL.
    Set to 0 if a file's mode is stored independently from the ACL.  */
-#  if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi /* Mac OS X, IRIX */
+#  if HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP /* MacOS X */
 #   define MODE_INSIDE_ACL 0
 #  else
 #   define MODE_INSIDE_ACL 1
 #  endif
 
+#  if defined __APPLE__ && defined __MACH__ /* MacOS X */
+#   define ACL_NOT_WELL_SUPPORTED(Err) \
+     ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY || (Err) == ENOENT)
+#  elif defined EOPNOTSUPP /* Tru64 NFS */
+#   define ACL_NOT_WELL_SUPPORTED(Err) \
+     ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY || (Err) == EOPNOTSUPP)
+#  else
+#   define ACL_NOT_WELL_SUPPORTED(Err) \
+     ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY)
+#  endif
+
 /* Return the number of entries in ACL.
    Return -1 and set errno upon failure to determine it.  */
 /* Define a replacement for acl_entries if needed. (Only Linux has it.)  */
@@ -149,7 +144,7 @@
 extern int acl_entries (acl_t);
 #  endif
 
-#  if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
+#  if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
 /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
    Return 1 if the given ACL is non-trivial.
    Return 0 if it is trivial.  */
@@ -162,7 +157,7 @@
 extern int acl_access_nontrivial (acl_t);
 #  endif
 
-# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+# elif HAVE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
 
 /* Set to 1 if a file's mode is implicit by the ACL.
    Set to 0 if a file's mode is stored independently from the ACL.  */
@@ -172,47 +167,35 @@
 #   define MODE_INSIDE_ACL 1
 #  endif
 
+#  if !defined ACL_NO_TRIVIAL /* Solaris <= 10, Cygwin */
+
 /* Return 1 if the given ACL is non-trivial.
    Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-extern int acl_nontrivial (int count, aclent_t *entries) _GL_ATTRIBUTE_PURE;
+extern int acl_nontrivial (int count, aclent_t *entries);
 
-#  ifdef ACE_GETACL /* Solaris 10 */
+#   ifdef ACE_GETACL /* Solaris 10 */
 
 /* Test an ACL retrieved with ACE_GETACL.
    Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
    Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-extern int acl_ace_nontrivial (int count, ace_t *entries) _GL_ATTRIBUTE_PURE;
+extern int acl_ace_nontrivial (int count, ace_t *entries);
 
 /* Definitions for when the built executable is executed on Solaris 10
    (newer version) or Solaris 11.  */
 /* For a_type.  */
-#   define OLD_ALLOW 0
-#   define OLD_DENY  1
-#   define NEW_ACE_ACCESS_ALLOWED_ACE_TYPE 0 /* replaces ALLOW */
-#   define NEW_ACE_ACCESS_DENIED_ACE_TYPE  1 /* replaces DENY */
+#    define ACE_ACCESS_ALLOWED_ACE_TYPE 0 /* replaces ALLOW */
+#    define ACE_ACCESS_DENIED_ACE_TYPE  1 /* replaces DENY */
 /* For a_flags.  */
-#   define OLD_ACE_OWNER            0x0100
-#   define OLD_ACE_GROUP            0x0200
-#   define OLD_ACE_OTHER            0x0400
-#   define NEW_ACE_OWNER            0x1000
-#   define NEW_ACE_GROUP            0x2000
-#   define NEW_ACE_IDENTIFIER_GROUP 0x0040
-#   define NEW_ACE_EVERYONE         0x4000
+#    define NEW_ACE_OWNER            0x1000
+#    define NEW_ACE_GROUP            0x2000
+#    define NEW_ACE_IDENTIFIER_GROUP 0x0040
+#    define ACE_EVERYONE             0x4000
 /* For a_access_mask.  */
-#   define NEW_ACE_READ_DATA         0x001 /* corresponds to 'r' */
-#   define NEW_ACE_WRITE_DATA        0x002 /* corresponds to 'w' */
-#   define NEW_ACE_APPEND_DATA       0x004
-#   define NEW_ACE_READ_NAMED_ATTRS  0x008
-#   define NEW_ACE_WRITE_NAMED_ATTRS 0x010
-#   define NEW_ACE_EXECUTE           0x020
-#   define NEW_ACE_DELETE_CHILD      0x040
-#   define NEW_ACE_READ_ATTRIBUTES   0x080
-#   define NEW_ACE_WRITE_ATTRIBUTES  0x100
-#   define NEW_ACE_DELETE          0x10000
-#   define NEW_ACE_READ_ACL        0x20000
-#   define NEW_ACE_WRITE_ACL       0x40000
-#   define NEW_ACE_WRITE_OWNER     0x80000
-#   define NEW_ACE_SYNCHRONIZE    0x100000
+#    define NEW_ACE_READ_DATA  0x001 /* corresponds to 'r' */
+#    define NEW_ACE_WRITE_DATA 0x002 /* corresponds to 'w' */
+#    define NEW_ACE_EXECUTE    0x004 /* corresponds to 'x' */
+
+#   endif
 
 #  endif
 
@@ -222,14 +205,6 @@
    Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
 extern int acl_nontrivial (int count, struct acl_entry *entries, struct stat *sb);
 
-#  if HAVE_ACLV_H /* HP-UX >= 11.11 */
-
-/* Return 1 if the given ACL is non-trivial.
-   Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-extern int aclv_nontrivial (int count, struct acl *entries);
-
-#  endif
-
 # elif HAVE_ACLX_GET && 0 /* AIX */
 
 /* TODO */
@@ -240,14 +215,6 @@
    Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
 extern int acl_nontrivial (struct acl *a);
 
-# elif HAVE_ACLSORT /* NonStop Kernel */
-
-/* Return 1 if the given ACL is non-trivial.
-   Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-extern int acl_nontrivial (int count, struct acl *entries);
-
 # endif
 
 #endif
-
-_GL_INLINE_HEADER_END
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/alignof.h gettext-0.18.1.1/gettext-tools/gnulib-lib/alignof.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/alignof.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/alignof.h	2010-05-24 09:42:35.000000000 +0000
@@ -0,0 +1,53 @@
+/* Determine alignment of types.
+   Copyright (C) 2003-2004, 2006, 2009-2010 Free Software Foundation, Inc.
+
+   This 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ALIGNOF_H
+#define _ALIGNOF_H
+
+#include <stddef.h>
+
+/* Determine the alignment of a structure slot (field) of a given type,
+   at compile time.  Note that the result depends on the ABI.
+   Note: The result cannot be used as a value for an 'enum' constant,
+   due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
+#if defined __cplusplus
+  template <class type> struct alignof_helper { char __slot1; type __slot2; };
+# define alignof_slot(type) offsetof (alignof_helper<type>, __slot2)
+#else
+# define alignof_slot(type) offsetof (struct { char __slot1; type __slot2; }, __slot2)
+#endif
+
+/* Determine the good alignment of a object of the given type at compile time.
+   Note that this is not necessarily the same as alignof_slot(type).
+   For example, with GNU C on x86 platforms: alignof_type(double) = 8, but
+   - when -malign-double is not specified:  alignof_slot(double) = 4,
+   - when -malign-double is specified:      alignof_slot(double) = 8.
+   Note: The result cannot be used as a value for an 'enum' constant,
+   due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
+#if defined __GNUC__
+# define alignof_type __alignof__
+#else
+# define alignof_type alignof_slot
+#endif
+
+/* alignof is an alias for alignof_slot semantics, since that's what most
+   callers need.
+   Note: The result cannot be used as a value for an 'enum' constant,
+   due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
+#define alignof alignof_slot
+
+#endif /* _ALIGNOF_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/allocator.c gettext-0.18.1.1/gettext-tools/gnulib-lib/allocator.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/allocator.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/allocator.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#define _GL_USE_STDLIB_ALLOC 1
-#include <config.h>
-#include "allocator.h"
-#include <stdlib.h>
-struct allocator const stdlib_allocator = { malloc, realloc, free, NULL };
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/allocator.h gettext-0.18.1.1/gettext-tools/gnulib-lib/allocator.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/allocator.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/allocator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/* Memory allocators such as malloc+free.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert.  */
-
-#ifndef _GL_ALLOCATOR_H
-#define _GL_ALLOCATOR_H
-
-#include <stddef.h>
-
-/* An object describing a memory allocator family.  */
-
-struct allocator
-{
-  /* Do not use GCC attributes such as __attribute__ ((malloc)) with
-     the function types pointed at by these members, because these
-     attributes do not work with pointers to functions.  See
-     <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00007.html>.  */
-
-  /* Call ALLOCATE to allocate memory, like 'malloc'.  On failure ALLOCATE
-     should return NULL, though not necessarily set errno.  When given
-     a zero size it may return NULL even if successful.  */
-  void *(*allocate) (size_t);
-
-  /* If nonnull, call REALLOCATE to reallocate memory, like 'realloc'.
-     On failure REALLOCATE should return NULL, though not necessarily set
-     errno.  When given a zero size it may return NULL even if
-     successful.  */
-  void *(*reallocate) (void *, size_t);
-
-  /* Call FREE to free memory, like 'free'.  */
-  void (*free) (void *);
-
-  /* If nonnull, call DIE (SIZE) if MALLOC (SIZE) or REALLOC (...,
-     SIZE) fails.  DIE should not return.  SIZE should equal SIZE_MAX
-     if size_t overflow was detected while calculating sizes to be
-     passed to MALLOC or REALLOC.  */
-  void (*die) (size_t);
-};
-
-/* An allocator using the stdlib functions and a null DIE function.  */
-extern struct allocator const stdlib_allocator;
-
-#endif /* _GL_ALLOCATOR_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/areadlink.c gettext-0.18.1.1/gettext-tools/gnulib-lib/areadlink.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/areadlink.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/areadlink.c	2010-05-24 09:42:35.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,33 +24,96 @@
 /* Specification.  */
 #include "areadlink.h"
 
-#include "careadlinkat.h"
-
+#include <errno.h>
+#include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-/* Get the symbolic link value of FILENAME and put it into BUFFER, with
-   size BUFFER_SIZE.  This function acts like readlink but has
-   readlinkat's signature.  */
-static ssize_t
-careadlinkatcwd (int fd, char const *filename, char *buffer,
-                 size_t buffer_size)
-{
-  /* FD must be AT_FDCWD here, otherwise the caller is using this
-     function in contexts it was not meant for.  */
-  if (fd != AT_FDCWD)
-    abort ();
-  return readlink (filename, buffer, buffer_size);
-}
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
+
+/* The initial buffer size for the link value.  A power of 2
+   detects arithmetic overflow earlier, but is not required.  */
+enum {
+  INITIAL_BUF_SIZE = 1024
+};
 
 /* Call readlink to get the symbolic link value of FILENAME.
    Return a pointer to that NUL-terminated string in malloc'd storage.
    If readlink fails, return NULL and set errno.
-   If allocation fails, or if the link value is longer than SIZE_MAX :-),
+   If realloc fails, or if the link value is longer than SIZE_MAX :-),
    return NULL and set errno to ENOMEM.  */
 
 char *
 areadlink (char const *filename)
 {
-  return careadlinkat (AT_FDCWD, filename, NULL, 0, NULL, careadlinkatcwd);
+  /* Allocate the initial buffer on the stack.  This way, in the common
+     case of a symlink of small size, we get away with a single small malloc()
+     instead of a big malloc() followed by a shrinking realloc().  */
+  char initial_buf[INITIAL_BUF_SIZE];
+
+  char *buffer = initial_buf;
+  size_t buf_size = sizeof initial_buf;
+
+  while (1)
+    {
+      /* Attempt to read the link into the current buffer.  */
+      ssize_t link_length = readlink (filename, buffer, buf_size);
+
+      /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1
+         with errno == ERANGE if the buffer is too small.  */
+      if (link_length < 0 && errno != ERANGE)
+        {
+          if (buffer != initial_buf)
+            {
+              int saved_errno = errno;
+              free (buffer);
+              errno = saved_errno;
+            }
+          return NULL;
+        }
+
+      if ((size_t) link_length < buf_size)
+        {
+          buffer[link_length++] = '\0';
+
+          /* Return it in a chunk of memory as small as possible.  */
+          if (buffer == initial_buf)
+            {
+              buffer = (char *) malloc (link_length);
+              if (buffer == NULL)
+                /* errno is ENOMEM.  */
+                return NULL;
+              memcpy (buffer, initial_buf, link_length);
+            }
+          else
+            {
+              /* Shrink buffer before returning it.  */
+              if ((size_t) link_length < buf_size)
+                {
+                  char *smaller_buffer = (char *) realloc (buffer, link_length);
+
+                  if (smaller_buffer != NULL)
+                    buffer = smaller_buffer;
+                }
+            }
+          return buffer;
+        }
+
+      if (buffer != initial_buf)
+        free (buffer);
+      buf_size *= 2;
+      if (SSIZE_MAX < buf_size || (SIZE_MAX / 2 < SSIZE_MAX && buf_size == 0))
+        {
+          errno = ENOMEM;
+          return NULL;
+        }
+      buffer = (char *) malloc (buf_size);
+      if (buffer == NULL)
+        /* errno is ENOMEM.  */
+        return NULL;
+    }
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/areadlink.h gettext-0.18.1.1/gettext-tools/gnulib-lib/areadlink.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/areadlink.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/areadlink.h	2010-05-24 09:42:35.000000000 +0000
@@ -1,6 +1,6 @@
 /* Read symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/argmatch.c gettext-0.18.1.1/gettext-tools/gnulib-lib/argmatch.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/argmatch.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/argmatch.c	2010-05-24 09:42:35.000000000 +0000
@@ -1,7 +1,7 @@
 /* argmatch.c -- find a match for a string in an array
 
-   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -77,7 +77,7 @@
    synonyms, i.e., for
      "yes", "yop" -> 0
      "no", "nope" -> 1
-   "y" is a valid argument, for 0, and "n" for 1.  */
+   "y" is a valid argument, for `0', and "n" for `1'.  */
 
 ptrdiff_t
 argmatch (const char *arg, const char *const *arglist,
@@ -150,17 +150,17 @@
 
   /* We try to put synonyms on the same line.  The assumption is that
      synonyms follow each other */
-  fputs (_("Valid arguments are:"), stderr);
+  fprintf (stderr, _("Valid arguments are:"));
   for (i = 0; arglist[i]; i++)
     if ((i == 0)
         || memcmp (last_val, vallist + valsize * i, valsize))
       {
-        fprintf (stderr, "\n  - %s", quote (arglist[i]));
+        fprintf (stderr, "\n  - `%s'", arglist[i]);
         last_val = vallist + valsize * i;
       }
     else
       {
-        fprintf (stderr, ", %s", quote (arglist[i]));
+        fprintf (stderr, ", `%s'", arglist[i]);
       }
   putc ('\n', stderr);
 }
@@ -269,7 +269,7 @@
     backup_type = XARGMATCH (program_name, argv[1],
                              backup_args, backup_vals);
 
-  printf ("The version control is '%s'\n",
+  printf ("The version control is `%s'\n",
           ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
 
   return 0;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/argmatch.h gettext-0.18.1.1/gettext-tools/gnulib-lib/argmatch.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/argmatch.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/argmatch.h	2010-05-24 09:42:35.000000000 +0000
@@ -1,7 +1,7 @@
 /* argmatch.h -- definitions and prototypes for argmatch.c
 
-   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2004, 2005, 2009, 2010 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,10 +26,6 @@
 
 # include "verify.h"
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 # define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 
 /* Assert there are as many real arguments as there are values
@@ -44,14 +40,14 @@
    to the same values in VALLIST).  */
 
 ptrdiff_t argmatch (char const *arg, char const *const *arglist,
-                    char const *vallist, size_t valsize) _GL_ATTRIBUTE_PURE;
+                    char const *vallist, size_t valsize);
 
 # define ARGMATCH(Arg, Arglist, Vallist) \
   argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist))
 
 /* xargmatch calls this function when it fails.  This function should not
    return.  By default, this is a function that calls ARGMATCH_DIE which
-   in turn defaults to 'exit (exit_failure)'.  */
+   in turn defaults to `exit (exit_failure)'.  */
 typedef void (*argmatch_exit_fn) (void);
 extern DLL_VARIABLE argmatch_exit_fn argmatch_die;
 
@@ -77,8 +73,8 @@
 
 
 
-/* Same as argmatch, but upon failure, report an explanation of the
-   failure, and exit using the function EXIT_FN. */
+/* Same as argmatch, but upon failure, reports a explanation on the
+   failure, and exits using the function EXIT_FN. */
 
 ptrdiff_t __xargmatch_internal (char const *context,
                                 char const *arg, char const *const *arglist,
@@ -97,15 +93,10 @@
 
 char const *argmatch_to_argument (char const *value,
                                   char const *const *arglist,
-                                  char const *vallist, size_t valsize)
-  _GL_ATTRIBUTE_PURE;
+                                  char const *vallist, size_t valsize);
 
 # define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist)                  \
   argmatch_to_argument (Value, Arglist,                                 \
                         (char const *) (Vallist), sizeof *(Vallist))
 
-#ifdef  __cplusplus
-}
-#endif
-
 #endif /* ARGMATCH_H_ */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/asnprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/asnprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/asnprintf.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/asnprintf.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/asprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/asprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/asprintf.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/asprintf.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/backupfile.c gettext-0.18.1.1/gettext-tools/gnulib-lib/backupfile.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/backupfile.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/backupfile.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-1999, 2000-2003, 2005-2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
    - It's typically faster.
    Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
    only '0' through '9' are digits.  Prefer ISDIGIT to isdigit unless
-   it's important to use the locale's definition of 'digit' even when the
+   it's important to use the locale's definition of `digit' even when the
    host does not conform to Posix.  */
 #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
 
@@ -90,7 +90,7 @@
   char *s;
   const char *suffix = simple_backup_suffix;
 
-  /* Allow room for simple or '.~N~' backups.  */
+  /* Allow room for simple or `.~N~' backups.  */
   backup_suffix_size_max = strlen (simple_backup_suffix) + 1;
   if (HAVE_DIR && backup_suffix_size_max < numbered_suffix_size_max)
     backup_suffix_size_max = numbered_suffix_size_max;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/basename.c gettext-0.18.1.1/gettext-tools/gnulib-lib/basename.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/basename.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/basename.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000-2002, 2004, 2006, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002, 2004, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -22,7 +22,7 @@
 /* Specification.  */
 #include "basename.h"
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 
 #include <stdio.h>
 #include <assert.h>
@@ -45,16 +45,16 @@
 #endif
 
 #ifndef _LIBC
-/* We cannot generally use the name 'basename' since XPG defines an unusable
+/* We cannot generally use the name `basename' since XPG defines an unusable
    variant of the function but we cannot use it.  */
 # undef basename
 # define basename gnu_basename
 #endif
 
-/* In general, we can't use the builtin 'basename' function if available,
+/* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
-   In some environments the builtin 'basename' modifies its argument.
-   If NAME is all slashes, be sure to return '/'.  */
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
 basename (char const *name)
@@ -71,7 +71,7 @@
         all_slashes = 0;
     }
 
-  /* If NAME is all slashes, arrange to return '/'.  */
+  /* If NAME is all slashes, arrange to return `/'.  */
   if (*base == '\0' && ISSLASH (*name) && all_slashes)
     --base;
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/basename.h gettext-0.18.1.1/gettext-tools/gnulib-lib/basename.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/basename.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/basename.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -27,7 +27,7 @@
 #endif
 
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 /* When not using the GNU libc we use the basename implementation we
    provide here.  */
 extern char *gnu_basename (const char *);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/binary-io.c gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/binary-io.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define BINARY_IO_INLINE _GL_EXTERN_INLINE
-#include "binary-io.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/binary-io.h gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/binary-io.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,6 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008, 2009, 2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,58 +19,48 @@
 #define _BINARY_H
 
 /* For systems that distinguish between text and binary I/O.
-   O_BINARY is guaranteed by the gnulib <fcntl.h>. */
+   O_BINARY is usually declared in <fcntl.h>. */
 #include <fcntl.h>
 
 /* The MSVC7 <stdio.h> doesn't like to be included after '#define fileno ...',
    so we include it here first.  */
 #include <stdio.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
+#if !defined O_BINARY && defined _O_BINARY
+  /* For MSC-compatible compilers.  */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
 #endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef BINARY_IO_INLINE
-# define BINARY_IO_INLINE _GL_INLINE
+#if defined __BEOS__ || defined __HAIKU__
+  /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
+# undef O_BINARY
+# undef O_TEXT
 #endif
 
-/* set_binary_mode (fd, mode)
-   sets the binary/text I/O mode of file descriptor fd to the given mode
-   (must be O_BINARY or O_TEXT) and returns the previous mode.  */
+/* SET_BINARY (fd);
+   changes the file descriptor fd to perform binary I/O.  */
 #if O_BINARY
 # if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__
 #  include <io.h> /* declares setmode() */
-#  define set_binary_mode setmode
 # else
-#  define set_binary_mode _setmode
+#  define setmode _setmode
 #  undef fileno
 #  define fileno _fileno
 # endif
+# ifdef __DJGPP__
+#  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
+      to interrupt the program through Ctrl-C or Ctrl-Break.  */
+#  define SET_BINARY(fd) ((void) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0))
+# else
+#  define SET_BINARY(fd) ((void) setmode (fd, O_BINARY))
+# endif
 #else
-  /* On reasonable systems, binary I/O is the only choice.  */
-  /* Use a function rather than a macro, to avoid gcc warnings
-     "warning: statement with no effect".  */
-BINARY_IO_INLINE int
-set_binary_mode (int fd, int mode)
-{
-  (void) fd;
-  (void) mode;
-  return O_BINARY;
-}
-#endif
-
-/* SET_BINARY (fd);
-   changes the file descriptor fd to perform binary I/O.  */
-#ifdef __DJGPP__
-# 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
-     to interrupt the program through Ctrl-C or Ctrl-Break.  */
-# define SET_BINARY(fd) ((void) (!isatty (fd) ? (set_binary_mode (fd, O_BINARY), 0) : 0))
-#else
-# define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY))
+  /* On reasonable systems, binary I/O is the default.  */
+# undef O_BINARY
+# define O_BINARY 0
+# define SET_BINARY(fd) /* do nothing */ ((void) 0)
 #endif
 
-_GL_INLINE_HEADER_END
-
 #endif /* _BINARY_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/byteswap.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/byteswap.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/byteswap.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/byteswap.in.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* byteswap.h - Byte swapping
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/canonicalize-lgpl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/canonicalize-lgpl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/canonicalize-lgpl.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/canonicalize-lgpl.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2014 Free Software Foundation, Inc.
+   Copyright (C) 1996-2010 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
@@ -16,16 +16,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
-/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
-   optimizes away the name == NULL test below.  */
-# define _GL_ARG_NONNULL(params)
-
-# define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
 #if !HAVE_CANONICALIZE_FILE_NAME || !FUNC_REALPATH_WORKS || defined _LIBC
 
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the name == NULL test below.  */
+#define _GL_ARG_NONNULL(params)
+
 /* Specification.  */
 #include <stdlib.h>
 
@@ -51,14 +50,7 @@
 # define __realpath realpath
 # include "pathmax.h"
 # include "malloca.h"
-# include "dosname.h"
 # if HAVE_GETCWD
-#  if IN_RELOCWRAPPER
-    /* When building the relocatable program wrapper, use the system's getcwd
-       function, not the gnulib override, otherwise we would get a link error.
-     */
-#   undef getcwd
-#  endif
 #  ifdef VMS
     /* We want the directory in Unix syntax, not in VMS syntax.  */
 #   define __getcwd(buf, max) getcwd (buf, max, 0)
@@ -85,10 +77,10 @@
 
 #if !FUNC_REALPATH_WORKS || defined _LIBC
 /* Return the canonical absolute name of file NAME.  A canonical name
-   does not contain any ".", ".." components nor any repeated path
+   does not contain any `.', `..' components nor any repeated path
    separators ('/') or symlinks.  All path components must exist.  If
    RESOLVED is null, the result is malloc'd; otherwise, if the
-   canonical name is PATH_MAX chars or more, returns null with 'errno'
+   canonical name is PATH_MAX chars or more, returns null with `errno'
    set to ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars,
    returns the name in RESOLVED.  If the name cannot be resolved and
    RESOLVED is non-NULL, it contains the path of the first component
@@ -102,7 +94,6 @@
   const char *start, *end, *rpath_limit;
   long int path_max;
   int num_links = 0;
-  size_t prefix_len;
 
   if (name == NULL)
     {
@@ -127,7 +118,7 @@
 #else
   path_max = pathconf (name, _PC_PATH_MAX);
   if (path_max <= 0)
-    path_max = 8192;
+    path_max = 1024;
 #endif
 
   if (resolved == NULL)
@@ -145,11 +136,7 @@
     rpath = resolved;
   rpath_limit = rpath + path_max;
 
-  /* This is always zero for Posix hosts, but can be 2 for MS-Windows
-     and MS-DOS X:/foo/bar file names.  */
-  prefix_len = FILE_SYSTEM_PREFIX_LEN (name);
-
-  if (!IS_ABSOLUTE_FILE_NAME (name))
+  if (name[0] != '/')
     {
       if (!__getcwd (rpath, path_max))
         {
@@ -157,28 +144,16 @@
           goto error;
         }
       dest = strchr (rpath, '\0');
-      start = name;
-      prefix_len = FILE_SYSTEM_PREFIX_LEN (rpath);
     }
   else
     {
-      dest = rpath;
-      if (prefix_len)
-        {
-          memcpy (rpath, name, prefix_len);
-          dest += prefix_len;
-        }
-      *dest++ = '/';
-      if (DOUBLE_SLASH_IS_DISTINCT_ROOT)
-        {
-          if (ISSLASH (name[1]) && !ISSLASH (name[2]) && !prefix_len)
-            *dest++ = '/';
-          *dest = '\0';
-        }
-      start = name + prefix_len;
+      rpath[0] = '/';
+      dest = rpath + 1;
+      if (DOUBLE_SLASH_IS_DISTINCT_ROOT && name[1] == '/')
+        *dest++ = '/';
     }
 
-  for (end = start; *start; start = end)
+  for (start = end = name; *start; start = end)
     {
 #ifdef _LIBC
       struct stat64 st;
@@ -188,11 +163,11 @@
       int n;
 
       /* Skip sequence of multiple path-separators.  */
-      while (ISSLASH (*start))
+      while (*start == '/')
         ++start;
 
       /* Find end of path component.  */
-      for (end = start; *end && !ISSLASH (*end); ++end)
+      for (end = start; *end && *end != '/'; ++end)
         /* Nothing.  */;
 
       if (end - start == 0)
@@ -202,19 +177,17 @@
       else if (end - start == 2 && start[0] == '.' && start[1] == '.')
         {
           /* Back up to previous component, ignore if at root already.  */
-          if (dest > rpath + prefix_len + 1)
-            for (--dest; dest > rpath && !ISSLASH (dest[-1]); --dest)
-              continue;
-          if (DOUBLE_SLASH_IS_DISTINCT_ROOT
-              && dest == rpath + 1 && !prefix_len
-              && ISSLASH (*dest) && !ISSLASH (dest[1]))
+          if (dest > rpath + 1)
+            while ((--dest)[-1] != '/');
+          if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
+              && *dest == '/')
             dest++;
         }
       else
         {
           size_t new_size;
 
-          if (!ISSLASH (dest[-1]))
+          if (dest[-1] != '/')
             *dest++ = '/';
 
           if (dest + (end - start) >= rpath_limit)
@@ -225,7 +198,7 @@
               if (resolved)
                 {
                   __set_errno (ENAMETOOLONG);
-                  if (dest > rpath + prefix_len + 1)
+                  if (dest > rpath + 1)
                     dest--;
                   *dest = '\0';
                   goto error;
@@ -315,32 +288,20 @@
               memmove (&extra_buf[n], end, len + 1);
               name = end = memcpy (extra_buf, buf, n);
 
-              if (IS_ABSOLUTE_FILE_NAME (buf))
+              if (buf[0] == '/')
                 {
-                  size_t pfxlen = FILE_SYSTEM_PREFIX_LEN (buf);
-
-                  if (pfxlen)
-                    memcpy (rpath, buf, pfxlen);
-                  dest = rpath + pfxlen;
-                  *dest++ = '/'; /* It's an absolute symlink */
-                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT)
-                    {
-                      if (ISSLASH (buf[1]) && !ISSLASH (buf[2]) && !pfxlen)
-                        *dest++ = '/';
-                      *dest = '\0';
-                    }
-                  /* Install the new prefix to be in effect hereafter.  */
-                  prefix_len = pfxlen;
+                  dest = rpath + 1;     /* It's an absolute symlink */
+                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && buf[1] == '/')
+                    *dest++ = '/';
                 }
               else
                 {
                   /* Back up to previous component, ignore if at root
                      already: */
-                  if (dest > rpath + prefix_len + 1)
-                    for (--dest; dest > rpath && !ISSLASH (dest[-1]); --dest)
-                      continue;
+                  if (dest > rpath + 1)
+                    while ((--dest)[-1] != '/');
                   if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
-                      && ISSLASH (*dest) && !ISSLASH (dest[1]) && !prefix_len)
+                      && *dest == '/')
                     dest++;
                 }
             }
@@ -351,10 +312,9 @@
             }
         }
     }
-  if (dest > rpath + prefix_len + 1 && ISSLASH (dest[-1]))
+  if (dest > rpath + 1 && dest[-1] == '/')
     --dest;
-  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && !prefix_len
-      && ISSLASH (*dest) && !ISSLASH (dest[1]))
+  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && *dest == '/')
     dest++;
   *dest = '\0';
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/careadlinkat.c gettext-0.18.1.1/gettext-tools/gnulib-lib/careadlinkat.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/careadlinkat.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/careadlinkat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-/* Read symbolic links into a buffer without size limitation, relative to fd.
-
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
-   Inc.
-
-   This 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 Paul Eggert, Bruno Haible, and Jim Meyering.  */
-
-#include <config.h>
-
-#include "careadlinkat.h"
-
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Define this independently so that stdint.h is not a prerequisite.  */
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-
-#ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
-#endif
-
-#include "allocator.h"
-
-/* Assuming the current directory is FD, get the symbolic link value
-   of FILENAME as a null-terminated string and put it into a buffer.
-   If FD is AT_FDCWD, FILENAME is interpreted relative to the current
-   working directory, as in openat.
-
-   If the link is small enough to fit into BUFFER put it there.
-   BUFFER's size is BUFFER_SIZE, and BUFFER can be null
-   if BUFFER_SIZE is zero.
-
-   If the link is not small, put it into a dynamically allocated
-   buffer managed by ALLOC.  It is the caller's responsibility to free
-   the returned value if it is nonnull and is not BUFFER.  A null
-   ALLOC stands for the standard allocator.
-
-   The PREADLINKAT function specifies how to read links.  It operates
-   like POSIX readlinkat()
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
-   but can assume that its first argument is the same as FD.
-
-   If successful, return the buffer address; otherwise return NULL and
-   set errno.  */
-
-char *
-careadlinkat (int fd, char const *filename,
-              char *buffer, size_t buffer_size,
-              struct allocator const *alloc,
-              ssize_t (*preadlinkat) (int, char const *, char *, size_t))
-{
-  char *buf;
-  size_t buf_size;
-  size_t buf_size_max =
-    SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-  char stack_buf[1024];
-
-  if (! alloc)
-    alloc = &stdlib_allocator;
-
-  if (! buffer_size)
-    {
-      /* Allocate the initial buffer on the stack.  This way, in the
-         common case of a symlink of small size, we get away with a
-         single small malloc() instead of a big malloc() followed by a
-         shrinking realloc().  */
-      buffer = stack_buf;
-      buffer_size = sizeof stack_buf;
-    }
-
-  buf = buffer;
-  buf_size = buffer_size;
-
-  do
-    {
-      /* Attempt to read the link into the current buffer.  */
-      ssize_t link_length = preadlinkat (fd, filename, buf, buf_size);
-      size_t link_size;
-      if (link_length < 0)
-        {
-          /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1
-             with errno == ERANGE if the buffer is too small.  */
-          int readlinkat_errno = errno;
-          if (readlinkat_errno != ERANGE)
-            {
-              if (buf != buffer)
-                {
-                  alloc->free (buf);
-                  errno = readlinkat_errno;
-                }
-              return NULL;
-            }
-        }
-
-      link_size = link_length;
-
-      if (link_size < buf_size)
-        {
-          buf[link_size++] = '\0';
-
-          if (buf == stack_buf)
-            {
-              char *b = (char *) alloc->allocate (link_size);
-              buf_size = link_size;
-              if (! b)
-                break;
-              memcpy (b, buf, link_size);
-              buf = b;
-            }
-          else if (link_size < buf_size && buf != buffer && alloc->reallocate)
-            {
-              /* Shrink BUF before returning it.  */
-              char *b = (char *) alloc->reallocate (buf, link_size);
-              if (b)
-                buf = b;
-            }
-
-          return buf;
-        }
-
-      if (buf != buffer)
-        alloc->free (buf);
-
-      if (buf_size <= buf_size_max / 2)
-        buf_size *= 2;
-      else if (buf_size < buf_size_max)
-        buf_size = buf_size_max;
-      else if (buf_size_max < SIZE_MAX)
-        {
-          errno = ENAMETOOLONG;
-          return NULL;
-        }
-      else
-        break;
-      buf = (char *) alloc->allocate (buf_size);
-    }
-  while (buf);
-
-  if (alloc->die)
-    alloc->die (buf_size);
-  errno = ENOMEM;
-  return NULL;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/careadlinkat.h gettext-0.18.1.1/gettext-tools/gnulib-lib/careadlinkat.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/careadlinkat.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/careadlinkat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/* Read symbolic links into a buffer without size limitation, relative to fd.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert, Bruno Haible, and Jim Meyering.  */
-
-#ifndef _GL_CAREADLINKAT_H
-#define _GL_CAREADLINKAT_H
-
-#include <fcntl.h>
-#include <unistd.h>
-
-struct allocator;
-
-/* Assuming the current directory is FD, get the symbolic link value
-   of FILENAME as a null-terminated string and put it into a buffer.
-   If FD is AT_FDCWD, FILENAME is interpreted relative to the current
-   working directory, as in openat.
-
-   If the link is small enough to fit into BUFFER put it there.
-   BUFFER's size is BUFFER_SIZE, and BUFFER can be null
-   if BUFFER_SIZE is zero.
-
-   If the link is not small, put it into a dynamically allocated
-   buffer managed by ALLOC.  It is the caller's responsibility to free
-   the returned value if it is nonnull and is not BUFFER.
-
-   The PREADLINKAT function specifies how to read links.  It operates
-   like POSIX readlinkat()
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
-   but can assume that its first argument is the same as FD.
-
-   If successful, return the buffer address; otherwise return NULL and
-   set errno.  */
-
-char *careadlinkat (int fd, char const *filename,
-                    char *buffer, size_t buffer_size,
-                    struct allocator const *alloc,
-                    ssize_t (*preadlinkat) (int, char const *,
-                                            char *, size_t));
-
-/* Suitable value for careadlinkat's FD argument.  */
-#if HAVE_READLINKAT
-/* AT_FDCWD is declared in <fcntl.h>.  */
-#else
-/* Define AT_FDCWD independently, so that the careadlinkat module does
-   not depend on the fcntl-h module.  We might as well use the same value
-   as fcntl-h.  */
-# ifndef AT_FDCWD
-#  define AT_FDCWD (-3041965)
-# endif
-#endif
-
-#endif /* _GL_CAREADLINKAT_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-ctype.c gettext-0.18.1.1/gettext-tools/gnulib-lib/c-ctype.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-ctype.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-ctype.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Character handling in C locale.
 
-   Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright 2000-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 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/>.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-ctype.h gettext-0.18.1.1/gettext-tools/gnulib-lib/c-ctype.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-ctype.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-ctype.h	2010-05-24 09:42:36.000000000 +0000
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,7 +18,8 @@
 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/>.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef C_CTYPE_H
 #define C_CTYPE_H
@@ -117,27 +118,26 @@
          if (c_isalpha (*s)) ...
  */
 
-extern bool c_isascii (int c) _GL_ATTRIBUTE_CONST; /* not locale dependent */
+extern bool c_isascii (int c); /* not locale dependent */
 
-extern bool c_isalnum (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isalpha (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isblank (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_iscntrl (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isdigit (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_islower (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isgraph (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isprint (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_ispunct (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isspace (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isupper (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isxdigit (int c) _GL_ATTRIBUTE_CONST;
+extern bool c_isalnum (int c);
+extern bool c_isalpha (int c);
+extern bool c_isblank (int c);
+extern bool c_iscntrl (int c);
+extern bool c_isdigit (int c);
+extern bool c_islower (int c);
+extern bool c_isgraph (int c);
+extern bool c_isprint (int c);
+extern bool c_ispunct (int c);
+extern bool c_isspace (int c);
+extern bool c_isupper (int c);
+extern bool c_isxdigit (int c);
 
-extern int c_tolower (int c) _GL_ATTRIBUTE_CONST;
-extern int c_toupper (int c) _GL_ATTRIBUTE_CONST;
+extern int c_tolower (int c);
+extern int c_toupper (int c);
 
 
-#if (defined __GNUC__ && !defined __STRICT_ANSI__ && defined __OPTIMIZE__ \
-     && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS)
+#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS
 
 /* ASCII optimizations. */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/classpath.c gettext-0.18.1.1/gettext-tools/gnulib-lib/classpath.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/classpath.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/classpath.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Java CLASSPATH handling.
-   Copyright (C) 2001-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2009-2010 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
@@ -34,7 +34,7 @@
 
 /* Separator in PATH like lists of pathnames.  */
 #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+  /* Win32, OS/2, DOS */
 # define PATH_SEPARATOR ';'
 #else
   /* Unix */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/classpath.h gettext-0.18.1.1/gettext-tools/gnulib-lib/classpath.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/classpath.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/classpath.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Java CLASSPATH handling.
-   Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/clean-temp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/clean-temp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/clean-temp.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/clean-temp.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Temporary directories and temporary files with automatic cleanup.
-   Copyright (C) 2001, 2003, 2006-2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001, 2003, 2006-2007, 2009-2010 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
@@ -59,16 +59,26 @@
 
 #define _(str) gettext (str)
 
-/* GNU Hurd doesn't have PATH_MAX.  Use a fallback.
-   Temporary directory names are usually not that long.  */
+/* GNU Hurd doesn't have PATH_MAX.  */
 #ifndef PATH_MAX
-# define PATH_MAX 1024
+# ifdef MAXPATHLEN
+#  define PATH_MAX MAXPATHLEN
+# else
+#  define PATH_MAX 1024
+# endif
 #endif
 
 #ifndef uintptr_t
 # define uintptr_t unsigned long
 #endif
 
+#if !GNULIB_FCNTL_SAFER
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+# undef open
+# undef close
+#endif
+
 
 /* The use of 'volatile' in the types below (and ISO C 99 section 5.1.2.3.(5))
    ensure that while constructing or modifying the data structures, the field
@@ -549,10 +559,7 @@
           }
         else
           cleanup_list.tempdir_list[i] = NULL;
-        /* Now only we can free the tmpdir->dirname, tmpdir->subdirs,
-           tmpdir->files, and tmpdir itself.  */
-        gl_list_free (tmpdir->files);
-        gl_list_free (tmpdir->subdirs);
+        /* Now only we can free the tmpdir->dirname and tmpdir itself.  */
         free (tmpdir->dirname);
         free (tmpdir);
         return err;
@@ -579,11 +586,6 @@
     {
       OSVERSIONINFO v;
 
-      /* According to
-         <http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx>
-         this structure must be initialised as follows:  */
-      v.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-
       if (GetVersionEx (&v))
         known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
       else
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/clean-temp.h gettext-0.18.1.1/gettext-tools/gnulib-lib/clean-temp.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/clean-temp.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/clean-temp.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Temporary directories and temporary files with automatic cleanup.
-   Copyright (C) 2006, 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -39,16 +39,7 @@
 
    This module provides support for temporary directories and temporary files
    inside these temporary directories.  Temporary files without temporary
-   directories are not supported here.  The temporary directories and files
-   are automatically cleaned up (at the latest) when the program exits or
-   dies from a fatal signal such as SIGINT, SIGTERM, SIGHUP, but not if it
-   dies from a fatal signal such as SIGQUIT, SIGKILL, or SIGABRT, SIGSEGV,
-   SIGBUS, SIGILL, SIGFPE.
-
-   For the cleanup in the normal case, programs that use this module need to
-   call 'cleanup_temp_dir' for each successful return of 'create_temp_dir'.
-   The cleanup in the case of a fatal signal such as SIGINT, SIGTERM, SIGHUP,
-   is done entirely automatically by the functions of this module.  */
+   directories are not supported here.  */
 
 struct temp_dir
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/cloexec.c gettext-0.18.1.1/gettext-tools/gnulib-lib/cloexec.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/cloexec.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/cloexec.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,9 +25,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-/* Set the 'FD_CLOEXEC' flag of DESC if VALUE is true,
+/* Set the `FD_CLOEXEC' flag of DESC if VALUE is true,
    or clear the flag if VALUE is false.
-   Return 0 on success, or -1 on error with 'errno' set.
+   Return 0 on success, or -1 on error with `errno' set.
 
    Note that on MingW, this function does NOT protect DESC from being
    inherited into spawned children.  Instead, either use dup_cloexec
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/cloexec.h gettext-0.18.1.1/gettext-tools/gnulib-lib/cloexec.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/cloexec.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/cloexec.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
 
 #include <stdbool.h>
 
-/* Set the 'FD_CLOEXEC' flag of DESC if VALUE is true,
+/* Set the `FD_CLOEXEC' flag of DESC if VALUE is true,
    or clear the flag if VALUE is false.
-   Return 0 on success, or -1 on error with 'errno' set.
+   Return 0 on success, or -1 on error with `errno' set.
 
    Note that on MingW, this function does NOT protect DESC from being
    inherited into spawned children.  Instead, either use dup_cloexec
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/close.c gettext-0.18.1.1/gettext-tools/gnulib-lib/close.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/close.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/close.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* close replacement.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <unistd.h>
-
-#include <errno.h>
-
-#include "fd-hook.h"
-#include "msvc-inval.h"
-
-#undef close
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-close_nothrow (int fd)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = close (fd);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#else
-# define close_nothrow close
-#endif
-
-/* Override close() to call into other gnulib modules.  */
-
-int
-rpl_close (int fd)
-{
-#if WINDOWS_SOCKETS
-  int retval = execute_all_close_hooks (close_nothrow, fd);
-#else
-  int retval = close_nothrow (fd);
-#endif
-
-#if REPLACE_FCHDIR
-  if (retval >= 0)
-    _gl_unregister_fd (fd);
-#endif
-
-  return retval;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/closedir.c gettext-0.18.1.1/gettext-tools/gnulib-lib/closedir.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/closedir.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/closedir.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/* Stop reading the entries of a directory.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <dirent.h>
-
-#if REPLACE_FCHDIR
-# include <unistd.h>
-#endif
-
-#if HAVE_CLOSEDIR
-
-/* Override closedir(), to keep track of the open file descriptors.
-   Needed because there is a function dirfd().  */
-
-#else
-
-# include <stdlib.h>
-
-# include "dirent-private.h"
-
-#endif
-
-int
-closedir (DIR *dirp)
-{
-# if REPLACE_FCHDIR
-  int fd = dirfd (dirp);
-# endif
-  int retval;
-
-#if HAVE_CLOSEDIR
-# undef closedir
-
-  retval = closedir (dirp);
-
-#else
-
-  if (dirp->current != INVALID_HANDLE_VALUE)
-    FindClose (dirp->current);
-  free (dirp);
-
-  retval = 0;
-
-#endif
-
-#if REPLACE_FCHDIR
-  if (retval >= 0)
-    _gl_unregister_fd (fd);
-#endif
-  return retval;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/closeout.c gettext-0.18.1.1/gettext-tools/gnulib-lib/closeout.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/closeout.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/closeout.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
    Likewise for standard error.
 
    It's important to detect such failures and exit nonzero because many
-   tools (most notably 'make' and other build-management systems) depend
+   tools (most notably `make' and other build-management systems) depend
    on being able to detect failure in other tools via their exit status.  */
 
 /* Close standard output and standard error, exiting with status EXIT_FAILURE
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/concat-filename.c gettext-0.18.1.1/gettext-tools/gnulib-lib/concat-filename.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/concat-filename.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/concat-filename.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/concat-filename.h gettext-0.18.1.1/gettext-tools/gnulib-lib/concat-filename.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/concat-filename.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/concat-filename.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/config.charset gettext-0.18.1.1/gettext-tools/gnulib-lib/config.charset
--- gettext-0.19.3/gettext-tools/gnulib-lib/config.charset	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/config.charset	2010-05-24 10:59:04.000000000 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
@@ -29,8 +30,6 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name              MIME?             used by which systems
-#                                    (darwin = Mac OS X, woe32 = native Windows)
-#
 #   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
 #   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
 #   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/copy-acl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/copy-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/copy-acl.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/copy-acl.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* copy-acl.c - copy access control list from one file to another file
 
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,10 +21,8 @@
 
 #include "acl.h"
 
-#include <errno.h>
+#include "acl-internal.h"
 
-#include "quote.h"
-#include "error.h"
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -36,8 +34,504 @@
    If access control lists are not available, fchmod the target file to
    MODE.  Also sets the non-permission bits of the destination file
    (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
-   Return 0 if successful, otherwise output a diagnostic and return a
-   negative error code.  */
+   Return 0 if successful.
+   Return -2 and set errno for an error relating to the source file.
+   Return -1 and set errno for an error relating to the destination file.  */
+
+static int
+qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
+           int dest_desc, mode_t mode)
+{
+#if USE_ACL && HAVE_ACL_GET_FILE
+  /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
+  /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+# if MODE_INSIDE_ACL
+  /* Linux, FreeBSD, IRIX, Tru64 */
+
+  acl_t acl;
+  int ret;
+
+  if (HAVE_ACL_GET_FD && source_desc != -1)
+    acl = acl_get_fd (source_desc);
+  else
+    acl = acl_get_file (src_name, ACL_TYPE_ACCESS);
+  if (acl == NULL)
+    {
+      if (ACL_NOT_WELL_SUPPORTED (errno))
+        return qset_acl (dst_name, dest_desc, mode);
+      else
+        return -2;
+    }
+
+  if (HAVE_ACL_SET_FD && dest_desc != -1)
+    ret = acl_set_fd (dest_desc, acl);
+  else
+    ret = acl_set_file (dst_name, ACL_TYPE_ACCESS, acl);
+  if (ret != 0)
+    {
+      int saved_errno = errno;
+
+      if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_access_nontrivial (acl))
+        {
+          acl_free (acl);
+          return chmod_or_fchmod (dst_name, dest_desc, mode);
+        }
+      else
+        {
+          acl_free (acl);
+          chmod_or_fchmod (dst_name, dest_desc, mode);
+          errno = saved_errno;
+          return -1;
+        }
+    }
+  else
+    acl_free (acl);
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, and either the mode and the ACL are
+         separate or special bits are to be set which don't fit into ACLs.  */
+
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        return -1;
+    }
+
+  if (S_ISDIR (mode))
+    {
+      acl = acl_get_file (src_name, ACL_TYPE_DEFAULT);
+      if (acl == NULL)
+        return -2;
+
+      if (acl_set_file (dst_name, ACL_TYPE_DEFAULT, acl))
+        {
+          int saved_errno = errno;
+
+          acl_free (acl);
+          errno = saved_errno;
+          return -1;
+        }
+      else
+        acl_free (acl);
+    }
+  return 0;
+
+# else /* !MODE_INSIDE_ACL */
+  /* MacOS X */
+
+#  if !HAVE_ACL_TYPE_EXTENDED
+#   error Must have ACL_TYPE_EXTENDED
+#  endif
+
+  /* On MacOS X,  acl_get_file (name, ACL_TYPE_ACCESS)
+     and          acl_get_file (name, ACL_TYPE_DEFAULT)
+     always return NULL / EINVAL.  You have to use
+                  acl_get_file (name, ACL_TYPE_EXTENDED)
+     or           acl_get_fd (open (name, ...))
+     to retrieve an ACL.
+     On the other hand,
+                  acl_set_file (name, ACL_TYPE_ACCESS, acl)
+     and          acl_set_file (name, ACL_TYPE_DEFAULT, acl)
+     have the same effect as
+                  acl_set_file (name, ACL_TYPE_EXTENDED, acl):
+     Each of these calls sets the file's ACL.  */
+
+  acl_t acl;
+  int ret;
+
+  if (HAVE_ACL_GET_FD && source_desc != -1)
+    acl = acl_get_fd (source_desc);
+  else
+    acl = acl_get_file (src_name, ACL_TYPE_EXTENDED);
+  if (acl == NULL)
+    {
+      if (ACL_NOT_WELL_SUPPORTED (errno))
+        return qset_acl (dst_name, dest_desc, mode);
+      else
+        return -2;
+    }
+
+  if (HAVE_ACL_SET_FD && dest_desc != -1)
+    ret = acl_set_fd (dest_desc, acl);
+  else
+    ret = acl_set_file (dst_name, ACL_TYPE_EXTENDED, acl);
+  if (ret != 0)
+    {
+      int saved_errno = errno;
+
+      if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_extended_nontrivial (acl))
+        {
+          acl_free (acl);
+          return chmod_or_fchmod (dst_name, dest_desc, mode);
+        }
+      else
+        {
+          acl_free (acl);
+          chmod_or_fchmod (dst_name, dest_desc, mode);
+          errno = saved_errno;
+          return -1;
+        }
+    }
+  else
+    acl_free (acl);
+
+  /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly.  */
+  return chmod_or_fchmod (dst_name, dest_desc, mode);
+
+# endif
+
+#elif USE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+
+# if defined ACL_NO_TRIVIAL
+  /* Solaris 10 (newer version), which has additional API declared in
+     <sys/acl.h> (acl_t) and implemented in libsec (acl_set, acl_trivial,
+     acl_fromtext, ...).  */
+
+  int ret;
+  acl_t *aclp = NULL;
+  ret = (source_desc < 0
+         ? acl_get (src_name, ACL_NO_TRIVIAL, &aclp)
+         : facl_get (source_desc, ACL_NO_TRIVIAL, &aclp));
+  if (ret != 0 && errno != ENOSYS)
+    return -2;
+
+  ret = qset_acl (dst_name, dest_desc, mode);
+  if (ret != 0)
+    return -1;
+
+  if (aclp)
+    {
+      ret = (dest_desc < 0
+             ? acl_set (dst_name, aclp)
+             : facl_set (dest_desc, aclp));
+      if (ret != 0)
+        {
+          int saved_errno = errno;
+
+          acl_free (aclp);
+          errno = saved_errno;
+          return -1;
+        }
+      acl_free (aclp);
+    }
+
+  return 0;
+
+# else /* Solaris, Cygwin, general case */
+
+  /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions
+     of Unixware.  The acl() call returns the access and default ACL both
+     at once.  */
+#  ifdef ACE_GETACL
+  int ace_count;
+  ace_t *ace_entries;
+#  endif
+  int count;
+  aclent_t *entries;
+  int did_chmod;
+  int saved_errno;
+  int ret;
+
+#  ifdef ACE_GETACL
+  /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
+     file systems (whereas the other ones are used in UFS file systems).
+     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
+     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.
+     When setting the destination ACL, we try either ACL types, assuming
+     that the kernel will translate the ACL from one form to the other.
+     (See in <http://docs.sun.com/app/docs/doc/819-2241/6n4huc7ia?l=en&a=view>
+     the description of ENOTSUP.)  */
+  for (;;)
+    {
+      ace_count = (source_desc != -1
+                   ? facl (source_desc, ACE_GETACLCNT, 0, NULL)
+                   : acl (src_name, ACE_GETACLCNT, 0, NULL));
+
+      if (ace_count < 0)
+        {
+          if (errno == ENOSYS || errno == EINVAL)
+            {
+              ace_count = 0;
+              ace_entries = NULL;
+              break;
+            }
+          else
+            return -2;
+        }
+
+      if (ace_count == 0)
+        {
+          ace_entries = NULL;
+          break;
+        }
+
+      ace_entries = (ace_t *) malloc (ace_count * sizeof (ace_t));
+      if (ace_entries == NULL)
+        {
+          errno = ENOMEM;
+          return -2;
+        }
+
+      if ((source_desc != -1
+           ? facl (source_desc, ACE_GETACL, ace_count, ace_entries)
+           : acl (src_name, ACE_GETACL, ace_count, ace_entries))
+          == ace_count)
+        break;
+      /* Huh? The number of ACL entries changed since the last call.
+         Repeat.  */
+    }
+#  endif
+
+  for (;;)
+    {
+      count = (source_desc != -1
+               ? facl (source_desc, GETACLCNT, 0, NULL)
+               : acl (src_name, GETACLCNT, 0, NULL));
+
+      if (count < 0)
+        {
+          if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
+            {
+              count = 0;
+              entries = NULL;
+              break;
+            }
+          else
+            return -2;
+        }
+
+      if (count == 0)
+        {
+          entries = NULL;
+          break;
+        }
+
+      entries = (aclent_t *) malloc (count * sizeof (aclent_t));
+      if (entries == NULL)
+        {
+          errno = ENOMEM;
+          return -2;
+        }
+
+      if ((source_desc != -1
+           ? facl (source_desc, GETACL, count, entries)
+           : acl (src_name, GETACL, count, entries))
+          == count)
+        break;
+      /* Huh? The number of ACL entries changed since the last call.
+         Repeat.  */
+    }
+
+  /* Is there an ACL of either kind?  */
+#  ifdef ACE_GETACL
+  if (ace_count == 0)
+#  endif
+    if (count == 0)
+      return qset_acl (dst_name, dest_desc, mode);
+
+  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
+  saved_errno = 0; /* the first non-ignorable error code */
+
+  if (!MODE_INSIDE_ACL)
+    {
+      /* On Cygwin, it is necessary to call chmod before acl, because
+         chmod can change the contents of the ACL (in ways that don't
+         change the allowed accesses, but still visible).  */
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        saved_errno = errno;
+      did_chmod = 1;
+    }
+
+  /* If both ace_entries and entries are available, try SETACL before
+     ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL
+     can.  */
+
+  if (count > 0)
+    {
+      ret = (dest_desc != -1
+             ? facl (dest_desc, SETACL, count, entries)
+             : acl (dst_name, SETACL, count, entries));
+      if (ret < 0 && saved_errno == 0)
+        {
+          saved_errno = errno;
+          if ((errno == ENOSYS || errno == EOPNOTSUPP)
+              && !acl_nontrivial (count, entries))
+            saved_errno = 0;
+        }
+      else
+        did_chmod = 1;
+    }
+  free (entries);
+
+#  ifdef ACE_GETACL
+  if (ace_count > 0)
+    {
+      ret = (dest_desc != -1
+             ? facl (dest_desc, ACE_SETACL, ace_count, ace_entries)
+             : acl (dst_name, ACE_SETACL, ace_count, ace_entries));
+      if (ret < 0 && saved_errno == 0)
+        {
+          saved_errno = errno;
+          if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
+              && !acl_ace_nontrivial (ace_count, ace_entries))
+            saved_errno = 0;
+        }
+    }
+  free (ace_entries);
+#  endif
+
+  if (MODE_INSIDE_ACL
+      && did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
+    {
+      /* We did not call chmod so far, and either the mode and the ACL are
+         separate or special bits are to be set which don't fit into ACLs.  */
+
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        {
+          if (saved_errno == 0)
+            saved_errno = errno;
+        }
+    }
+
+  if (saved_errno)
+    {
+      errno = saved_errno;
+      return -1;
+    }
+  return 0;
+
+# endif
+
+#elif USE_ACL && HAVE_GETACL /* HP-UX */
+
+  int count;
+  struct acl_entry entries[NACLENTRIES];
+  int ret;
+
+  for (;;)
+    {
+      count = (source_desc != -1
+               ? fgetacl (source_desc, 0, NULL)
+               : getacl (src_name, 0, NULL));
+
+      if (count < 0)
+        {
+          if (errno == ENOSYS || errno == EOPNOTSUPP)
+            {
+              count = 0;
+              break;
+            }
+          else
+            return -2;
+        }
+
+      if (count == 0)
+        break;
+
+      if (count > NACLENTRIES)
+        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
+        abort ();
+
+      if ((source_desc != -1
+           ? fgetacl (source_desc, count, entries)
+           : getacl (src_name, count, entries))
+          == count)
+        break;
+      /* Huh? The number of ACL entries changed since the last call.
+         Repeat.  */
+    }
+
+  if (count == 0)
+    return qset_acl (dst_name, dest_desc, mode);
+
+  ret = (dest_desc != -1
+         ? fsetacl (dest_desc, count, entries)
+         : setacl (dst_name, count, entries));
+  if (ret < 0)
+    {
+      int saved_errno = errno;
+
+      if (errno == ENOSYS || errno == EOPNOTSUPP)
+        {
+          struct stat source_statbuf;
+
+          if ((source_desc != -1
+               ? fstat (source_desc, &source_statbuf)
+               : stat (src_name, &source_statbuf)) == 0)
+            {
+              if (!acl_nontrivial (count, entries, &source_statbuf))
+                return chmod_or_fchmod (dst_name, dest_desc, mode);
+            }
+          else
+            saved_errno = errno;
+        }
+
+      chmod_or_fchmod (dst_name, dest_desc, mode);
+      errno = saved_errno;
+      return -1;
+    }
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, and either the mode and the ACL are
+         separate or special bits are to be set which don't fit into ACLs.  */
+
+      return chmod_or_fchmod (dst_name, dest_desc, mode);
+    }
+  return 0;
+
+#elif USE_ACL && HAVE_ACLX_GET && 0 /* AIX */
+
+  /* TODO */
+
+#elif USE_ACL && HAVE_STATACL /* older AIX */
+
+  union { struct acl a; char room[4096]; } u;
+  int ret;
+
+  if ((source_desc != -1
+       ? fstatacl (source_desc, STX_NORMAL, &u.a, sizeof (u))
+       : statacl (src_name, STX_NORMAL, &u.a, sizeof (u)))
+      < 0)
+    return -2;
+
+  ret = (dest_desc != -1
+         ? fchacl (dest_desc, &u.a, u.a.acl_len)
+         : chacl (dst_name, &u.a, u.a.acl_len));
+  if (ret < 0)
+    {
+      int saved_errno = errno;
+
+      chmod_or_fchmod (dst_name, dest_desc, mode);
+      errno = saved_errno;
+      return -1;
+    }
+
+  /* No need to call chmod_or_fchmod at this point, since the mode bits
+     S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL.  */
+
+  return 0;
+
+#else
+
+  return qset_acl (dst_name, dest_desc, mode);
+
+#endif
+}
+
+
+/* Copy access control lists from one file to another. If SOURCE_DESC is
+   a valid file descriptor, use file descriptor operations, else use
+   filename based operations on SRC_NAME. Likewise for DEST_DESC and
+   DST_NAME.
+   If access control lists are not available, fchmod the target file to
+   MODE.  Also sets the non-permission bits of the destination file
+   (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
+   Return 0 if successful, otherwise output a diagnostic and return -1.  */
 
 int
 copy_acl (const char *src_name, int source_desc, const char *dst_name,
@@ -48,14 +542,13 @@
     {
     case -2:
       error (0, errno, "%s", quote (src_name));
-      break;
+      return -1;
 
     case -1:
       error (0, errno, _("preserving permissions for %s"), quote (dst_name));
-      break;
+      return -1;
 
     default:
-      break;
+      return 0;
     }
-  return ret;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/copy-file.c gettext-0.18.1.1/gettext-tools/gnulib-lib/copy-file.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/copy-file.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/copy-file.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Copying of files.
-   Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2007, 2009-2010 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
@@ -37,23 +37,25 @@
 #endif
 
 #include "error.h"
-#include "ignore-value.h"
 #include "safe-read.h"
 #include "full-write.h"
 #include "acl.h"
 #include "binary-io.h"
-#include "quote.h"
 #include "gettext.h"
 #include "xalloc.h"
 
 #define _(str) gettext (str)
 
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
+
 enum { IO_SIZE = 32 * 1024 };
 
-int
-qcopy_file_preserving (const char *src_filename, const char *dest_filename)
+void
+copy_file_preserving (const char *src_filename, const char *dest_filename)
 {
-  int err = 0;
   int src_fd;
   struct stat statbuf;
   int mode;
@@ -61,58 +63,37 @@
   char *buf = xmalloc (IO_SIZE);
 
   src_fd = open (src_filename, O_RDONLY | O_BINARY);
-  if (src_fd < 0)
-    {
-      err = GL_COPY_ERR_OPEN_READ;
-      goto error;
-    }
-  if (fstat (src_fd, &statbuf) < 0)
-    {
-      err = GL_COPY_ERR_OPEN_READ;
-      goto error_src;
-    }
+  if (src_fd < 0 || fstat (src_fd, &statbuf) < 0)
+    error (EXIT_FAILURE, errno, _("error while opening \"%s\" for reading"),
+           src_filename);
 
   mode = statbuf.st_mode & 07777;
 
   dest_fd = open (dest_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600);
   if (dest_fd < 0)
-    {
-      err = GL_COPY_ERR_OPEN_BACKUP_WRITE;
-      goto error_src;
-    }
+    error (EXIT_FAILURE, errno, _("cannot open backup file \"%s\" for writing"),
+           dest_filename);
 
   /* Copy the file contents.  */
   for (;;)
     {
       size_t n_read = safe_read (src_fd, buf, IO_SIZE);
       if (n_read == SAFE_READ_ERROR)
-        {
-          err = GL_COPY_ERR_READ;
-          goto error_src_dest;
-        }
+        error (EXIT_FAILURE, errno, _("error reading \"%s\""), src_filename);
       if (n_read == 0)
         break;
 
       if (full_write (dest_fd, buf, n_read) < n_read)
-        {
-          err = GL_COPY_ERR_WRITE;
-          goto error_src_dest;
-        }
+        error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
     }
 
   free (buf);
 
 #if !USE_ACL
   if (close (dest_fd) < 0)
-    {
-      err = GL_COPY_ERR_WRITE;
-      goto error_src;
-    }
+    error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
   if (close (src_fd) < 0)
-    {
-      err = GL_COPY_ERR_AFTER_READ;
-      goto error;
-    }
+    error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
 #endif
 
   /* Preserve the access and modification times.  */
@@ -136,83 +117,21 @@
 
 #if HAVE_CHOWN
   /* Preserve the owner and group.  */
-  ignore_value (chown (dest_filename, statbuf.st_uid, statbuf.st_gid));
+  chown (dest_filename, statbuf.st_uid, statbuf.st_gid);
 #endif
 
   /* Preserve the access permissions.  */
 #if USE_ACL
-  switch (qcopy_acl (src_filename, src_fd, dest_filename, dest_fd, mode))
-    {
-    case -2:
-      err = GL_COPY_ERR_GET_ACL;
-      goto error_src_dest;
-    case -1:
-      err = GL_COPY_ERR_SET_ACL;
-      goto error_src_dest;
-    }
+  if (copy_acl (src_filename, src_fd, dest_filename, dest_fd, mode))
+    exit (EXIT_FAILURE);
 #else
   chmod (dest_filename, mode);
 #endif
 
 #if USE_ACL
   if (close (dest_fd) < 0)
-    {
-      err = GL_COPY_ERR_WRITE;
-      goto error_src;
-    }
+    error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
   if (close (src_fd) < 0)
-    {
-      err = GL_COPY_ERR_AFTER_READ;
-      goto error;
-    }
+    error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
 #endif
-
-  return 0;
-
- error_src_dest:
-  close (dest_fd);
- error_src:
-  close (src_fd);
- error:
-  return err;
-}
-
-void
-copy_file_preserving (const char *src_filename, const char *dest_filename)
-{
-  switch (qcopy_file_preserving (src_filename, dest_filename))
-    {
-    case 0:
-      return;
-
-    case GL_COPY_ERR_OPEN_READ:
-      error (EXIT_FAILURE, errno, _("error while opening %s for reading"),
-             quote (src_filename));
-
-    case GL_COPY_ERR_OPEN_BACKUP_WRITE:
-      error (EXIT_FAILURE, errno, _("cannot open backup file %s for writing"),
-             quote (dest_filename));
-
-    case GL_COPY_ERR_READ:
-      error (EXIT_FAILURE, errno, _("error reading %s"),
-             quote (src_filename));
-
-    case GL_COPY_ERR_WRITE:
-      error (EXIT_FAILURE, errno, _("error writing %s"),
-             quote (dest_filename));
-
-    case GL_COPY_ERR_AFTER_READ:
-      error (EXIT_FAILURE, errno, _("error after reading %s"),
-             quote (src_filename));
-
-    case GL_COPY_ERR_GET_ACL:
-      error (EXIT_FAILURE, errno, "%s", quote (src_filename));
-
-    case GL_COPY_ERR_SET_ACL:
-      error (EXIT_FAILURE, errno, _("preserving permissions for %s"),
-             quote (dest_filename));
-
-    default:
-      abort ();
-    }
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/copy-file.h gettext-0.18.1.1/gettext-tools/gnulib-lib/copy-file.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/copy-file.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/copy-file.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Copying of files.
-   Copyright (C) 2001-2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2009-2010 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
@@ -21,26 +21,6 @@
 #endif
 
 
-/* Error codes returned by qcopy_file_preserving.  */
-enum
-{
-  GL_COPY_ERR_OPEN_READ = -1,
-  GL_COPY_ERR_OPEN_BACKUP_WRITE = -2,
-  GL_COPY_ERR_READ = -3,
-  GL_COPY_ERR_WRITE = -4,
-  GL_COPY_ERR_AFTER_READ = -5,
-  GL_COPY_ERR_GET_ACL = -6,
-  GL_COPY_ERR_SET_ACL = -7
-};
-
-/* Copy a regular file: from src_filename to dest_filename.
-   The destination file is assumed to be a backup file.
-   Modification times, owner, group and access permissions are preserved as
-   far as possible.
-   Return 0 if successful, otherwise set errno and return one of the error
-   codes above.  */
-extern int qcopy_file_preserving (const char *src_filename, const char *dest_filename);
-
 /* Copy a regular file: from src_filename to dest_filename.
    The destination file is assumed to be a backup file.
    Modification times, owner, group and access permissions are preserved as
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/csharpcomp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpcomp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/csharpcomp.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpcomp.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Compile a C# program.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "execute.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "sh-quote.h"
 #include "safe-read.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/csharpcomp.h gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpcomp.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/csharpcomp.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpcomp.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Compile a C# program.
-   Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/csharpexec.c gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpexec.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/csharpexec.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpexec.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Execute a C# program.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -44,10 +44,10 @@
 
 /* Handling of clix' PATH variable is just like Java CLASSPATH.  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-  /* Native Windows, Cygwin */
+  /* Win32, Cygwin */
   #define CLASSPATHVAR "PATH"
 #elif defined __APPLE__ && defined __MACH__
-  /* Mac OS X */
+  /* MacOS X */
   #define CLASSPATHVAR "DYLD_LIBRARY_PATH"
 #else
   /* Normal Unix */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/csharpexec.h gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpexec.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/csharpexec.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/csharpexec.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Execute a C# program.
-   Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strcasecmp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcasecmp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strcasecmp.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcasecmp.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strcaseeq.h gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcaseeq.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strcaseeq.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcaseeq.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Optimized case-insensitive string comparison in C locale.
-   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strcase.h gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcase.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strcase.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcase.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef C_STRCASE_H
 #define C_STRCASE_H
@@ -39,13 +40,12 @@
 /* Compare strings S1 and S2, ignoring case, returning less than, equal to or
    greater than zero if S1 is lexicographically less than, equal to or greater
    than S2.  */
-extern int c_strcasecmp (const char *s1, const char *s2) _GL_ATTRIBUTE_PURE;
+extern int c_strcasecmp (const char *s1, const char *s2);
 
 /* Compare no more than N characters of strings S1 and S2, ignoring case,
    returning less than, equal to or greater than zero if S1 is
    lexicographically less than, equal to or greater than S2.  */
-extern int c_strncasecmp (const char *s1, const char *s2, size_t n)
-  _GL_ATTRIBUTE_PURE;
+extern int c_strncasecmp (const char *s1, const char *s2, size_t n);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strcasestr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcasestr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strcasestr.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcasestr.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strcasestr.c -- case insensitive substring search in C locale
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strcasestr.h gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcasestr.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strcasestr.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strcasestr.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Case-insensitive searching in a string in C locale.
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strncasecmp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strncasecmp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strncasecmp.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strncasecmp.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strstr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strstr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strstr.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strstr.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strstr.c -- substring search in C locale
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/c-strstr.h gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strstr.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/c-strstr.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/c-strstr.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2001-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 
    This program 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 @@
         [this restriction is needed because of BIG5, BIG5-HKSCS, GBK, GB18030,
          Shift_JIS, JOHAB], and
      3. does not consist entirely of decimal digits, or has at least length 4
-        [this restriction is needed because of GB18030].
+        [this restricion is needed because of GB18030].
    This function is also safe to be called, even in a multibyte locale, if
    HAYSTACK and NEEDLE are known to both consist solely of printable ASCII
    characters excluding '\\' and '~'.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/diffseq.h gettext-0.18.1.1/gettext-tools/gnulib-lib/diffseq.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/diffseq.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/diffseq.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2014 Free Software
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,15 +26,18 @@
    distance" in Wikipedia.
 
    The basic algorithm is described in:
-   "An O(ND) Difference Algorithm and its Variations", Eugene W. Myers,
-   Algorithmica Vol. 1, 1986, pp. 251-266,
-   <http://dx.doi.org/10.1007/BF01840446>.
-   See especially section 4.2, which describes the variation used below.
+   "An O(ND) Difference Algorithm and its Variations", Eugene Myers,
+   Algorithmica Vol. 1 No. 2, 1986, pp. 251-266;
+   see especially section 4.2, which describes the variation used below.
 
    The basic algorithm was independently discovered as described in:
-   "Algorithms for Approximate String Matching", Esko Ukkonen,
-   Information and Control Vol. 64, 1985, pp. 100-118,
-   <http://dx.doi.org/10.1016/S0019-9958(85)80046-2>.  */
+   "Algorithms for Approximate String Matching", E. Ukkonen,
+   Information and Control Vol. 64, 1985, pp. 100-118.
+
+   Unless the 'find_minimal' flag is set, this code uses the TOO_EXPENSIVE
+   heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N)
+   at the price of producing suboptimal output for large inputs with
+   many differences.  */
 
 /* Before including this file, you need to define:
      ELEMENT                 The element type of the vectors being compared.
@@ -73,7 +76,7 @@
 # define EARLY_ABORT(ctxt) false
 #endif
 
-/* Use this to suppress gcc's "...may be used before initialized" warnings.
+/* Use this to suppress gcc's `...may be used before initialized' warnings.
    Beware: The Code argument must not contain commas.  */
 #ifndef IF_LINT
 # ifdef lint
@@ -117,13 +120,16 @@
   OFFSET *bdiag;
 
   #ifdef USE_HEURISTIC
-  /* This corresponds to the diff --speed-large-files flag.  With this
-     heuristic, for vectors with a constant small density of changes,
-     the algorithm is linear in the vector size.  */
+  /* This corresponds to the diff -H flag.  With this heuristic, for
+     vectors with a constant small density of changes, the algorithm is
+     linear in the vectors size.  */
   bool heuristic;
   #endif
 
-  /* Snakes bigger than this are considered "big".  */
+  /* Edit scripts longer than this are too expensive to compute.  */
+  OFFSET too_expensive;
+
+  /* Snakes bigger than this are considered `big'.  */
   #define SNAKE_LIMIT 20
 };
 
@@ -132,6 +138,12 @@
   /* Midpoints of this partition.  */
   OFFSET xmid;
   OFFSET ymid;
+
+  /* True if low half will be analyzed minimally.  */
+  bool lo_minimal;
+
+  /* Likewise for high half.  */
+  bool hi_minimal;
 };
 
 
@@ -143,10 +155,17 @@
    When the two searches meet, we have found the midpoint of the shortest
    edit sequence.
 
-   Set *PART to the midpoint (XMID,YMID).  The diagonal number
+   If FIND_MINIMAL is true, find the minimal edit script regardless of
+   expense.  Otherwise, if the search is too expensive, use heuristics to
+   stop the search and report a suboptimal answer.
+
+   Set PART->(xmid,ymid) to the midpoint (XMID,YMID).  The diagonal number
    XMID - YMID equals the number of inserted elements minus the number
    of deleted elements (counting only elements before the midpoint).
 
+   Set PART->lo_minimal to true iff the minimal edit script for the
+   left half of the partition is known; similarly for PART->hi_minimal.
+
    This function assumes that the first elements of the specified portions
    of the two vectors do not match, and likewise that the last elements do not
    match.  The caller must trim matching elements from the beginning and end
@@ -156,7 +175,7 @@
    suboptimal diff output.  It cannot cause incorrect diff output.  */
 
 static void
-diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
+diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
       struct partition *part, struct context *ctxt)
 {
   OFFSET *const fd = ctxt->fdiag;       /* Give the compiler a chance. */
@@ -216,6 +235,7 @@
             {
               part->xmid = x;
               part->ymid = y;
+              part->lo_minimal = part->hi_minimal = true;
               return;
             }
         }
@@ -248,10 +268,14 @@
             {
               part->xmid = x;
               part->ymid = y;
+              part->lo_minimal = part->hi_minimal = true;
               return;
             }
         }
 
+      if (find_minimal)
+        continue;
+
 #ifdef USE_HEURISTIC
       /* Heuristic: check occasionally for a diagonal that has made lots
          of progress compared with the edit distance.  If we have any
@@ -295,7 +319,11 @@
                   }
               }
             if (best > 0)
-	      return;
+              {
+                part->lo_minimal = true;
+                part->hi_minimal = false;
+                return;
+              }
           }
 
           {
@@ -330,10 +358,77 @@
                   }
               }
             if (best > 0)
-	      return;
+              {
+                part->lo_minimal = false;
+                part->hi_minimal = true;
+                return;
+              }
           }
         }
 #endif /* USE_HEURISTIC */
+
+      /* Heuristic: if we've gone well beyond the call of duty, give up
+         and report halfway between our best results so far.  */
+      if (c >= ctxt->too_expensive)
+        {
+          OFFSET fxybest;
+          OFFSET fxbest IF_LINT (= 0);
+          OFFSET bxybest;
+          OFFSET bxbest IF_LINT (= 0);
+
+          /* Find forward diagonal that maximizes X + Y.  */
+          fxybest = -1;
+          for (d = fmax; d >= fmin; d -= 2)
+            {
+              OFFSET x = MIN (fd[d], xlim);
+              OFFSET y = x - d;
+              if (ylim < y)
+                {
+                  x = ylim + d;
+                  y = ylim;
+                }
+              if (fxybest < x + y)
+                {
+                  fxybest = x + y;
+                  fxbest = x;
+                }
+            }
+
+          /* Find backward diagonal that minimizes X + Y.  */
+          bxybest = OFFSET_MAX;
+          for (d = bmax; d >= bmin; d -= 2)
+            {
+              OFFSET x = MAX (xoff, bd[d]);
+              OFFSET y = x - d;
+              if (y < yoff)
+                {
+                  x = yoff + d;
+                  y = yoff;
+                }
+              if (x + y < bxybest)
+                {
+                  bxybest = x + y;
+                  bxbest = x;
+                }
+            }
+
+          /* Use the better of the two diagonals.  */
+          if ((xlim + ylim) - bxybest < fxybest - (xoff + yoff))
+            {
+              part->xmid = fxbest;
+              part->ymid = fxybest - fxbest;
+              part->lo_minimal = true;
+              part->hi_minimal = false;
+            }
+          else
+            {
+              part->xmid = bxbest;
+              part->ymid = bxybest - bxbest;
+              part->lo_minimal = false;
+              part->hi_minimal = true;
+            }
+          return;
+        }
     }
   #undef XREF_YREF_EQUAL
 }
@@ -347,6 +442,9 @@
    Note that XLIM, YLIM are exclusive bounds.  All indices into the vectors
    are origin-0.
 
+   If FIND_MINIMAL, find a minimal difference no matter how
+   expensive it is.
+
    The results are recorded by invoking NOTE_DELETE and NOTE_INSERT.
 
    Return false if terminated normally, or true if terminated through early
@@ -354,7 +452,7 @@
 
 static bool
 compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
-            struct context *ctxt)
+            bool find_minimal, struct context *ctxt)
 {
 #ifdef ELEMENT
   ELEMENT const *xv = ctxt->xvec; /* Help the compiler.  */
@@ -400,12 +498,12 @@
       struct partition part IF_LINT2 (= { .xmid = 0, .ymid = 0 });
 
       /* Find a point of correspondence in the middle of the vectors.  */
-      diag (xoff, xlim, yoff, ylim, &part, ctxt);
+      diag (xoff, xlim, yoff, ylim, find_minimal, &part, ctxt);
 
       /* Use the partitions to split this problem into subproblems.  */
-      if (compareseq (xoff, part.xmid, yoff, part.ymid, ctxt))
+      if (compareseq (xoff, part.xmid, yoff, part.ymid, part.lo_minimal, ctxt))
         return true;
-      if (compareseq (part.xmid, xlim, part.ymid, ylim, ctxt))
+      if (compareseq (part.xmid, xlim, part.ymid, ylim, part.hi_minimal, ctxt))
         return true;
     }
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/dirent.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/dirent.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/dirent.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/dirent.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,258 +0,0 @@
-/* A GNU-like <dirent.h>.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
-
-   This 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 _@GUARD_PREFIX@_DIRENT_H
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-/* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_DIRENT_H@
-# @INCLUDE_NEXT@ @NEXT_DIRENT_H@
-#endif
-
-#ifndef _@GUARD_PREFIX@_DIRENT_H
-#define _@GUARD_PREFIX@_DIRENT_H
-
-/* Get ino_t.  Needed on some systems, including glibc 2.8.  */
-#include <sys/types.h>
-
-#if !@HAVE_DIRENT_H@
-/* Define types DIR and 'struct dirent'.  */
-# if !GNULIB_defined_struct_dirent
-struct dirent
-{
-  char d_type;
-  char d_name[1];
-};
-/* Possible values for 'd_type'.  */
-#  define DT_UNKNOWN 0
-#  define DT_FIFO    1          /* FIFO */
-#  define DT_CHR     2          /* character device */
-#  define DT_DIR     4          /* directory */
-#  define DT_BLK     6          /* block device */
-#  define DT_REG     8          /* regular file */
-#  define DT_LNK    10          /* symbolic link */
-#  define DT_SOCK   12          /* socket */
-#  define DT_WHT    14          /* whiteout */
-typedef struct gl_directory DIR;
-#  define GNULIB_defined_struct_dirent 1
-# endif
-#endif
-
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-
-/* Declare overridden functions.  */
-
-#if @GNULIB_OPENDIR@
-# if @REPLACE_OPENDIR@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef opendir
-#   define opendir rpl_opendir
-#  endif
-_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name));
-# else
-#  if !@HAVE_OPENDIR@
-_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (opendir, DIR *, (const char *dir_name));
-# endif
-_GL_CXXALIASWARN (opendir);
-#elif defined GNULIB_POSIXCHECK
-# undef opendir
-# if HAVE_RAW_DECL_OPENDIR
-_GL_WARN_ON_USE (opendir, "opendir is not portable - "
-                 "use gnulib module opendir for portability");
-# endif
-#endif
-
-#if @GNULIB_READDIR@
-# if !@HAVE_READDIR@
-_GL_FUNCDECL_SYS (readdir, struct dirent *, (DIR *dirp) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (readdir, struct dirent *, (DIR *dirp));
-_GL_CXXALIASWARN (readdir);
-#elif defined GNULIB_POSIXCHECK
-# undef readdir
-# if HAVE_RAW_DECL_READDIR
-_GL_WARN_ON_USE (readdir, "readdir is not portable - "
-                 "use gnulib module readdir for portability");
-# endif
-#endif
-
-#if @GNULIB_REWINDDIR@
-# if !@HAVE_REWINDDIR@
-_GL_FUNCDECL_SYS (rewinddir, void, (DIR *dirp) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (rewinddir, void, (DIR *dirp));
-_GL_CXXALIASWARN (rewinddir);
-#elif defined GNULIB_POSIXCHECK
-# undef rewinddir
-# if HAVE_RAW_DECL_REWINDDIR
-_GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - "
-                 "use gnulib module rewinddir for portability");
-# endif
-#endif
-
-#if @GNULIB_CLOSEDIR@
-# if @REPLACE_CLOSEDIR@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef closedir
-#   define closedir rpl_closedir
-#  endif
-_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp));
-# else
-#  if !@HAVE_CLOSEDIR@
-_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp));
-# endif
-_GL_CXXALIASWARN (closedir);
-#elif defined GNULIB_POSIXCHECK
-# undef closedir
-# if HAVE_RAW_DECL_CLOSEDIR
-_GL_WARN_ON_USE (closedir, "closedir is not portable - "
-                 "use gnulib module closedir for portability");
-# endif
-#endif
-
-#if @GNULIB_DIRFD@
-/* Return the file descriptor associated with the given directory stream,
-   or -1 if none exists.  */
-# if @REPLACE_DIRFD@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef dirfd
-#   define dirfd rpl_dirfd
-#  endif
-_GL_FUNCDECL_RPL (dirfd, int, (DIR *) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (dirfd, int, (DIR *));
-# else
-#  if defined __cplusplus && defined GNULIB_NAMESPACE && defined dirfd
-    /* dirfd is defined as a macro and not as a function.
-       Turn it into a function and get rid of the macro.  */
-static inline int (dirfd) (DIR *dp) { return dirfd (dp); }
-#   undef dirfd
-#  endif
-#  if !(@HAVE_DECL_DIRFD@ || defined dirfd)
-_GL_FUNCDECL_SYS (dirfd, int, (DIR *) _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (dirfd, int, (DIR *));
-# endif
-_GL_CXXALIASWARN (dirfd);
-#elif defined GNULIB_POSIXCHECK
-# undef dirfd
-# if HAVE_RAW_DECL_DIRFD
-_GL_WARN_ON_USE (dirfd, "dirfd is unportable - "
-                 "use gnulib module dirfd for portability");
-# endif
-#endif
-
-#if @GNULIB_FDOPENDIR@
-/* Open a directory stream visiting the given directory file
-   descriptor.  Return NULL and set errno if fd is not visiting a
-   directory.  On success, this function consumes fd (it will be
-   implicitly closed either by this function or by a subsequent
-   closedir).  */
-# if @REPLACE_FDOPENDIR@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fdopendir
-#   define fdopendir rpl_fdopendir
-#  endif
-_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd));
-_GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd));
-# else
-#  if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@
-_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd));
-#  endif
-_GL_CXXALIAS_SYS (fdopendir, DIR *, (int fd));
-# endif
-_GL_CXXALIASWARN (fdopendir);
-#elif defined GNULIB_POSIXCHECK
-# undef fdopendir
-# if HAVE_RAW_DECL_FDOPENDIR
-_GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - "
-                 "use gnulib module fdopendir for portability");
-# endif
-#endif
-
-#if @GNULIB_SCANDIR@
-/* Scan the directory DIR, calling FILTER on each directory entry.
-   Entries for which FILTER returns nonzero are individually malloc'd,
-   sorted using qsort with CMP, and collected in a malloc'd array in
-   *NAMELIST.  Returns the number of entries selected, or -1 on error.  */
-# if !@HAVE_SCANDIR@
-_GL_FUNCDECL_SYS (scandir, int,
-                  (const char *dir, struct dirent ***namelist,
-                   int (*filter) (const struct dirent *),
-                   int (*cmp) (const struct dirent **, const struct dirent **))
-                  _GL_ARG_NONNULL ((1, 2, 4)));
-# endif
-/* Need to cast, because on glibc systems, the fourth parameter is
-                        int (*cmp) (const void *, const void *).  */
-_GL_CXXALIAS_SYS_CAST (scandir, int,
-                       (const char *dir, struct dirent ***namelist,
-                        int (*filter) (const struct dirent *),
-                        int (*cmp) (const struct dirent **, const struct dirent **)));
-_GL_CXXALIASWARN (scandir);
-#elif defined GNULIB_POSIXCHECK
-# undef scandir
-# if HAVE_RAW_DECL_SCANDIR
-_GL_WARN_ON_USE (scandir, "scandir is unportable - "
-                 "use gnulib module scandir for portability");
-# endif
-#endif
-
-#if @GNULIB_ALPHASORT@
-/* Compare two 'struct dirent' entries alphabetically.  */
-# if !@HAVE_ALPHASORT@
-_GL_FUNCDECL_SYS (alphasort, int,
-                  (const struct dirent **, const struct dirent **)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
-# endif
-/* Need to cast, because on glibc systems, the parameters are
-                       (const void *, const void *).  */
-_GL_CXXALIAS_SYS_CAST (alphasort, int,
-                       (const struct dirent **, const struct dirent **));
-_GL_CXXALIASWARN (alphasort);
-#elif defined GNULIB_POSIXCHECK
-# undef alphasort
-# if HAVE_RAW_DECL_ALPHASORT
-_GL_WARN_ON_USE (alphasort, "alphasort is unportable - "
-                 "use gnulib module alphasort for portability");
-# endif
-#endif
-
-
-#endif /* _@GUARD_PREFIX@_DIRENT_H */
-#endif /* _@GUARD_PREFIX@_DIRENT_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/dirent-private.h gettext-0.18.1.1/gettext-tools/gnulib-lib/dirent-private.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/dirent-private.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/dirent-private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/* Private details of the DIR type.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 _DIRENT_PRIVATE_H
-#define _DIRENT_PRIVATE_H 1
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-struct gl_directory
-{
-  /* Status, or error code to produce in next readdir() call.
-     -2 means the end of the directory is already reached,
-     -1 means the entry was already filled by FindFirstFile,
-     0 means the entry needs to be filled using FindNextFile.
-     A positive value is an error code.  */
-  int status;
-  /* Handle, reading the directory, at current position.  */
-  HANDLE current;
-  /* Found directory entry.  */
-  WIN32_FIND_DATA entry;
-  /* Argument to pass to FindFirstFile.  It consists of the absolutized
-     directory name, followed by a directory separator and the wildcards.  */
-  char dir_name_mask[1];
-};
-
-#endif /* _DIRENT_PRIVATE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/dosname.h gettext-0.18.1.1/gettext-tools/gnulib-lib/dosname.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/dosname.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/dosname.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* File names on MS-DOS/Windows systems.
-
-   Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.
-
-   From Paul Eggert and Jim Meyering.  */
-
-#ifndef _DOSNAME_H
-#define _DOSNAME_H
-
-#if (defined _WIN32 || defined __WIN32__ ||     \
-     defined __MSDOS__ || defined __CYGWIN__ || \
-     defined __EMX__ || defined __DJGPP__)
-   /* This internal macro assumes ASCII, but all hosts that support drive
-      letters use ASCII.  */
-# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a'  \
-                              <= 'z' - 'a')
-# define FILE_SYSTEM_PREFIX_LEN(Filename) \
-          (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
-# ifndef __CYGWIN__
-#  define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
-# endif
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#else
-# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
-# define ISSLASH(C) ((C) == '/')
-#endif
-
-#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
-# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
-#endif
-
-#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
-#  define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
-# else
-#  define IS_ABSOLUTE_FILE_NAME(F)                              \
-     (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0)
-#endif
-#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
-
-#endif /* DOSNAME_H_ */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/dup2.c gettext-0.18.1.1/gettext-tools/gnulib-lib/dup2.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/dup2.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/dup2.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,26 +25,21 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Get declarations of the Win32 API functions.  */
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
 #if HAVE_DUP2
 
 # undef dup2
 
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Get declarations of the native Windows API functions.  */
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-
-#  include "msvc-inval.h"
-
-/* Get _get_osfhandle.  */
-#  include "msvc-nothrow.h"
-
-static int
-ms_windows_dup2 (int fd, int desired_fd)
+int
+rpl_dup2 (int fd, int desired_fd)
 {
   int result;
-
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   /* If fd is closed, mingw hangs on dup2 (fd, fd).  If fd is open,
      dup2 (fd, fd) returns 0, but all further attempts to use fd in
      future dup2 calls will hang.  */
@@ -57,7 +52,6 @@
         }
       return fd;
     }
-
   /* Wine 1.0.1 return 0 when desired_fd is negative but not -1:
      http://bugs.winehq.org/show_bug.cgi?id=21289 */
   if (desired_fd < 0)
@@ -65,52 +59,22 @@
       errno = EBADF;
       return -1;
     }
-
-  TRY_MSVC_INVAL
-    {
-      result = dup2 (fd, desired_fd);
-    }
-  CATCH_MSVC_INVAL
+# endif
+  result = dup2 (fd, desired_fd);
+# ifdef __linux__
+  /* Correct a Linux return value.
+     <http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.30.y.git;a=commitdiff;h=2b79bc4f7ebbd5af3c8b867968f9f15602d5f802>
+   */
+  if (fd == desired_fd && result == (unsigned int) -EBADF)
     {
       errno = EBADF;
       result = -1;
     }
-  DONE_MSVC_INVAL;
-
+# endif
   if (result == 0)
     result = desired_fd;
-
-  return result;
-}
-
-#  define dup2 ms_windows_dup2
-
-# endif
-
-int
-rpl_dup2 (int fd, int desired_fd)
-{
-  int result;
-
-# ifdef F_GETFL
-  /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF.
-     On Cygwin 1.5.x, dup2 (1, 1) returns 0.
-     On Cygwin 1.7.17, dup2 (1, -1) dumps core.
-     On Cygwin 1.7.25, dup2 (1, 256) can dump core.
-     On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC.  */
-#  if HAVE_SETDTABLESIZE
-  setdtablesize (desired_fd + 1);
-#  endif
-  if (desired_fd < 0)
-    fd = desired_fd;
-  if (fd == desired_fd)
-    return fcntl (fd, F_GETFL) == -1 ? -1 : fd;
-# endif
-
-  result = dup2 (fd, desired_fd);
-
-  /* Correct an errno value on FreeBSD 6.1 and Cygwin 1.5.x.  */
-  if (result == -1 && errno == EMFILE)
+  /* Correct a cygwin 1.5.x errno value.  */
+  else if (result == -1 && errno == EMFILE)
     errno = EBADF;
 # if REPLACE_FCHDIR
   if (fd != desired_fd && result != -1)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/dup-safer.c gettext-0.18.1.1/gettext-tools/gnulib-lib/dup-safer.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/dup-safer.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/dup-safer.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Invoke dup, but avoid some glitches.
 
-   Copyright (C) 2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/dup-safer-flag.c gettext-0.18.1.1/gettext-tools/gnulib-lib/dup-safer-flag.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/dup-safer-flag.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/dup-safer-flag.c	2010-05-24 09:42:36.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,6 +26,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "cloexec.h"
+
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+
 /* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
    STDERR_FILENO.  If FLAG contains O_CLOEXEC, behave like
    fcntl(F_DUPFD_CLOEXEC) rather than fcntl(F_DUPFD).  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/errno.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/errno.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/errno.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/errno.in.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,137 +13,69 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
-#define _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
+#define _GL_ERRNO_H
 
 
 /* On native Windows platforms, many macros are not defined.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* These are the same values as defined by MSVC 10, for interoperability.  */
+/* POSIX says that EAGAIN and EWOULDBLOCK may have the same value.  */
+#  define EWOULDBLOCK     EAGAIN
 
-#  ifndef ENOMSG
-#   define ENOMSG    122
-#   define GNULIB_defined_ENOMSG 1
-#  endif
-
-#  ifndef EIDRM
-#   define EIDRM     111
-#   define GNULIB_defined_EIDRM 1
-#  endif
-
-#  ifndef ENOLINK
-#   define ENOLINK   121
-#   define GNULIB_defined_ENOLINK 1
-#  endif
-
-#  ifndef EPROTO
-#   define EPROTO    134
-#   define GNULIB_defined_EPROTO 1
-#  endif
-
-#  ifndef EBADMSG
-#   define EBADMSG   104
-#   define GNULIB_defined_EBADMSG 1
-#  endif
-
-#  ifndef EOVERFLOW
-#   define EOVERFLOW 132
-#   define GNULIB_defined_EOVERFLOW 1
-#  endif
-
-#  ifndef ENOTSUP
-#   define ENOTSUP   129
-#   define GNULIB_defined_ENOTSUP 1
-#  endif
-
-#  ifndef ENETRESET
-#   define ENETRESET 117
-#   define GNULIB_defined_ENETRESET 1
-#  endif
-
-#  ifndef ECONNABORTED
-#   define ECONNABORTED 106
-#   define GNULIB_defined_ECONNABORTED 1
-#  endif
-
-#  ifndef ECANCELED
-#   define ECANCELED 105
-#   define GNULIB_defined_ECANCELED 1
-#  endif
-
-#  ifndef EOWNERDEAD
-#   define EOWNERDEAD 133
-#   define GNULIB_defined_EOWNERDEAD 1
-#  endif
-
-#  ifndef ENOTRECOVERABLE
-#   define ENOTRECOVERABLE 127
-#   define GNULIB_defined_ENOTRECOVERABLE 1
-#  endif
-
-#  ifndef EINPROGRESS
-#   define EINPROGRESS     112
-#   define EALREADY        103
-#   define ENOTSOCK        128
-#   define EDESTADDRREQ    109
-#   define EMSGSIZE        115
-#   define EPROTOTYPE      136
-#   define ENOPROTOOPT     123
-#   define EPROTONOSUPPORT 135
-#   define EOPNOTSUPP      130
-#   define EAFNOSUPPORT    102
-#   define EADDRINUSE      100
-#   define EADDRNOTAVAIL   101
-#   define ENETDOWN        116
-#   define ENETUNREACH     118
-#   define ECONNRESET      108
-#   define ENOBUFS         119
-#   define EISCONN         113
-#   define ENOTCONN        126
-#   define ETIMEDOUT       138
-#   define ECONNREFUSED    107
-#   define ELOOP           114
-#   define EHOSTUNREACH    110
-#   define EWOULDBLOCK     140
-#   define GNULIB_defined_ESOCK 1
-#  endif
-
-#  ifndef ETXTBSY
-#   define ETXTBSY         139
-#   define ENODATA         120  /* not required by POSIX */
-#   define ENOSR           124  /* not required by POSIX */
-#   define ENOSTR          125  /* not required by POSIX */
-#   define ETIME           137  /* not required by POSIX */
-#   define EOTHER          131  /* not required by POSIX */
-#   define GNULIB_defined_ESTREAMS 1
-#  endif
+/* Values >= 100 seem safe to use.  */
+#  define ETXTBSY   100
+#  define GNULIB_defined_ETXTBSY 1
 
 /* These are intentionally the same values as the WSA* error numbers, defined
    in <winsock2.h>.  */
+#  define EINPROGRESS     10036
+#  define EALREADY        10037
+#  define ENOTSOCK        10038
+#  define EDESTADDRREQ    10039
+#  define EMSGSIZE        10040
+#  define EPROTOTYPE      10041
+#  define ENOPROTOOPT     10042
+#  define EPROTONOSUPPORT 10043
 #  define ESOCKTNOSUPPORT 10044  /* not required by POSIX */
+#  define EOPNOTSUPP      10045
 #  define EPFNOSUPPORT    10046  /* not required by POSIX */
+#  define EAFNOSUPPORT    10047
+#  define EADDRINUSE      10048
+#  define EADDRNOTAVAIL   10049
+#  define ENETDOWN        10050
+#  define ENETUNREACH     10051
+#  define ENETRESET       10052
+#  define ECONNABORTED    10053
+#  define ECONNRESET      10054
+#  define ENOBUFS         10055
+#  define EISCONN         10056
+#  define ENOTCONN        10057
 #  define ESHUTDOWN       10058  /* not required by POSIX */
 #  define ETOOMANYREFS    10059  /* not required by POSIX */
+#  define ETIMEDOUT       10060
+#  define ECONNREFUSED    10061
+#  define ELOOP           10062
 #  define EHOSTDOWN       10064  /* not required by POSIX */
+#  define EHOSTUNREACH    10065
 #  define EPROCLIM        10067  /* not required by POSIX */
 #  define EUSERS          10068  /* not required by POSIX */
 #  define EDQUOT          10069
 #  define ESTALE          10070
 #  define EREMOTE         10071  /* not required by POSIX */
-#  define GNULIB_defined_EWINSOCK 1
+#  define GNULIB_defined_ESOCK 1
 
 # endif
 
@@ -166,7 +98,6 @@
 
 /* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK,
    EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined.
-   Likewise, on NonStop Kernel, EDQUOT is not defined.
    Define them here.  Values >= 2000 seem safe to use: Solaris ESTALE = 151,
    HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133.
 
@@ -214,66 +145,16 @@
 #  define GNULIB_defined_ENOTSUP 1
 # endif
 
-# ifndef ENETRESET
-#  define ENETRESET 2011
-#  define GNULIB_defined_ENETRESET 1
-# endif
-
-# ifndef ECONNABORTED
-#  define ECONNABORTED 2012
-#  define GNULIB_defined_ECONNABORTED 1
-# endif
-
 # ifndef ESTALE
 #  define ESTALE    2009
 #  define GNULIB_defined_ESTALE 1
 # endif
 
-# ifndef EDQUOT
-#  define EDQUOT 2010
-#  define GNULIB_defined_EDQUOT 1
-# endif
-
 # ifndef ECANCELED
 #  define ECANCELED 2008
 #  define GNULIB_defined_ECANCELED 1
 # endif
 
-/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not
-   defined.  */
-
-# ifndef EOWNERDEAD
-#  if defined __sun
-    /* Use the same values as defined for Solaris >= 8, for
-       interoperability.  */
-#   define EOWNERDEAD      58
-#   define ENOTRECOVERABLE 59
-#  elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-    /* We have a conflict here: pthreads-win32 defines these values
-       differently than MSVC 10.  It's hairy to decide which one to use.  */
-#   if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
-     /* Use the same values as defined by pthreads-win32, for
-        interoperability.  */
-#    define EOWNERDEAD      43
-#    define ENOTRECOVERABLE 44
-#   else
-     /* Use the same values as defined by MSVC 10, for
-        interoperability.  */
-#    define EOWNERDEAD      133
-#    define ENOTRECOVERABLE 127
-#   endif
-#  else
-#   define EOWNERDEAD      2013
-#   define ENOTRECOVERABLE 2014
-#  endif
-#  define GNULIB_defined_EOWNERDEAD 1
-#  define GNULIB_defined_ENOTRECOVERABLE 1
-# endif
-
-# ifndef EILSEQ
-#  define EILSEQ 2015
-#  define GNULIB_defined_EILSEQ 1
-# endif
 
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
+#endif /* _GL_ERRNO_H */
+#endif /* _GL_ERRNO_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/error.c gettext-0.18.1.1/gettext-tools/gnulib-lib/error.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/error.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/error.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2010 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
@@ -39,9 +39,6 @@
 # include <stdint.h>
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs
-# define USE_UNLOCKED_IO 0
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
-# define _GL_ARG_NONNULL(a)
 #endif
 
 #if USE_UNLOCKED_IO
@@ -57,7 +54,7 @@
    function without parameters instead.  */
 void (*error_print_progname) (void);
 
-/* This variable is incremented each time 'error' is called.  */
+/* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count;
 
 #ifdef _LIBC
@@ -68,21 +65,21 @@
 # include <limits.h>
 # include <libio/libioP.h>
 
-/* In GNU libc we want do not want to use the common name 'error' directly.
+/* In GNU libc we want do not want to use the common name `error' directly.
    Instead make it a weak alias.  */
 extern void __error (int status, int errnum, const char *message, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __error_at_line (int status, int errnum, const char *file_name,
                              unsigned int line_number, const char *message,
                              ...)
-     __attribute__ ((__format__ (__printf__, 5, 6)));
+     __attribute__ ((__format__ (__printf__, 5, 6)));;
 # define error __error
 # define error_at_line __error_at_line
 
 # include <libio/iolibio.h>
-# define fflush(s) _IO_fflush (s)
+# define fflush(s) INTUSE(_IO_fflush) (s)
 # undef putc
-# define putc(c, fp) _IO_putc (c, fp)
+# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
 
 # include <bits/libc-lock.h>
 
@@ -92,25 +89,19 @@
 # include <unistd.h>
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-/* Get _get_osfhandle.  */
-#  include "msvc-nothrow.h"
 # endif
 
 /* The gnulib override of fcntl is not needed in this file.  */
 # undef fcntl
 
-# if !HAVE_DECL_STRERROR_R
+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
 #  endif
-#  if STRERROR_R_CHAR_P
 char *strerror_r ();
-#  else
-int strerror_r ();
-#  endif
 # endif
 
 /* The calling program should define program_name and set it to the
@@ -124,14 +115,13 @@
 
 #if !_LIBC
 /* Return non-zero if FD is open.  */
-static int
+static inline int
 is_open (int fd)
 {
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows: The initial state of unassigned standard file
-     descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
-     There is no fcntl, and the gnulib replacement fcntl does not support
-     F_GETFL.  */
+  /* On Win32: The initial state of unassigned standard file descriptors is
+     that they are open but point to an INVALID_HANDLE_VALUE.  There is no
+     fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
 # else
 #  ifndef F_GETFL
@@ -142,7 +132,7 @@
 }
 #endif
 
-static void
+static inline void
 flush_stdout (void)
 {
 #if !_LIBC
@@ -174,7 +164,7 @@
 
 #if defined HAVE_STRERROR_R || _LIBC
   char errbuf[1024];
-# if _LIBC || STRERROR_R_CHAR_P
+# if STRERROR_R_CHAR_P || _LIBC
   s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else
   if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
@@ -198,12 +188,13 @@
 #endif
 }
 
-static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
+static void
 error_tail (int status, int errnum, const char *message, va_list args)
 {
 #if _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     {
+# define ALLOCA_LIMIT 2000
       size_t len = strlen (message) + 1;
       wchar_t *wmessage = NULL;
       mbstate_t st;
@@ -239,7 +230,7 @@
           if (res != len)
             break;
 
-          if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
+          if (__builtin_expect (len >= SIZE_MAX / 2, 0))
             {
               /* This really should not happen if everything is fine.  */
               res = (size_t) -1;
@@ -344,10 +335,7 @@
 
       if (old_line_number == line_number
           && (file_name == old_file_name
-              || (old_file_name != NULL
-                  && file_name != NULL
-                  && strcmp (old_file_name, file_name) == 0)))
-
+              || strcmp (old_file_name, file_name) == 0))
         /* Simply return and print nothing.  */
         return;
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/error.h gettext-0.18.1.1/gettext-tools/gnulib-lib/error.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/error.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/error.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 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
@@ -19,48 +19,39 @@
 #ifndef _ERROR_H
 #define _ERROR_H 1
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-#if GNULIB_REPLACE_ERROR
-# undef error_print_progname
-# undef error_message_count
-# undef error_one_per_line
-# define error_print_progname rpl_error_print_progname
-# define error_message_count rpl_error_message_count
-# define error_one_per_line rpl_error_one_per_line
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Print a message with 'fprintf (stderr, FORMAT, ...)';
+/* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
 
 extern void error (int __status, int __errnum, const char *__format, ...)
-     _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
+     __attribute__ ((__format__ (__printf__, 3, 4)));
 
 extern void error_at_line (int __status, int __errnum, const char *__fname,
                            unsigned int __lineno, const char *__format, ...)
-     _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6));
+     __attribute__ ((__format__ (__printf__, 5, 6)));
 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
 extern DLL_VARIABLE void (*error_print_progname) (void);
 
-/* This variable is incremented each time 'error' is called.  */
+/* This variable is incremented each time `error' is called.  */
 extern DLL_VARIABLE unsigned int error_message_count;
 
 /* Sometimes we want to have at most one error per line.  This
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/execute.c gettext-0.18.1.1/gettext-tools/gnulib-lib/execute.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/execute.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/execute.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Creation of autonomous subprocesses.
-   Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2010 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
@@ -37,7 +37,7 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* Native Windows API.  */
+/* Native Woe32 API.  */
 # include <process.h>
 # include "w32spawn.h"
 
@@ -48,21 +48,19 @@
 
 #endif
 
-/* environ is the exported symbol referencing the internal
-   __cygwin_environ variable on cygwin64:
-   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-#if defined __CYGWIN__ && defined __x86_64__
-extern DLL_VARIABLE char **environ;
-#endif
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
 
 
-#if defined EINTR && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#ifdef EINTR
 
 /* EINTR handling for close(), open().
    These functions can return -1/EINTR even though we don't have any
    signal handlers set up, namely when we get interrupted via SIGSTOP.  */
 
-static int
+static inline int
 nonintr_close (int fd)
 {
   int retval;
@@ -75,7 +73,7 @@
 }
 #define close nonintr_close
 
-static int
+static inline int
 nonintr_open (const char *pathname, int oflag, mode_t mode)
 {
   int retval;
@@ -108,7 +106,7 @@
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-  /* Native Windows API.  */
+  /* Native Woe32 API.  */
   int orig_stdin;
   int orig_stdout;
   int orig_stderr;
@@ -160,7 +158,7 @@
                            (const char **) environ);
       if (exitcode < 0 && errno == ENOEXEC)
         {
-          /* prog is not a native executable.  Try to execute it as a
+          /* prog is not an native executable.  Try to execute it as a
              shell script.  Note that prepare_spawn() has already prepended
              a hidden element "sh.exe" to prog_argv.  */
           --prog_argv;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/execute.h gettext-0.18.1.1/gettext-tools/gnulib-lib/execute.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/execute.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/execute.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Creation of autonomous subprocesses.
-   Copyright (C) 2001-2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2008-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/exitfail.c gettext-0.18.1.1/gettext-tools/gnulib-lib/exitfail.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/exitfail.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/exitfail.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,7 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/exitfail.h gettext-0.18.1.1/gettext-tools/gnulib-lib/exitfail.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/exitfail.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/exitfail.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fatal-signal.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fatal-signal.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fatal-signal.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fatal-signal.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -71,7 +71,7 @@
 #ifdef SIGXFSZ
     SIGXFSZ,
 #endif
-    /* Native Windows signals.  */
+    /* Woe32 signals.  */
 #ifdef SIGBREAK
     SIGBREAK,
 #endif
@@ -131,8 +131,8 @@
 
 
 /* Uninstall the handlers.  */
-static void
-uninstall_handlers (void)
+static inline void
+uninstall_handlers ()
 {
   size_t i;
 
@@ -176,8 +176,8 @@
 
 
 /* Install the handlers.  */
-static void
-install_handlers (void)
+static inline void
+install_handlers ()
 {
   size_t i;
   struct sigaction action;
@@ -251,7 +251,7 @@
 static sigset_t fatal_signal_set;
 
 static void
-init_fatal_signal_set (void)
+init_fatal_signal_set ()
 {
   static bool fatal_signal_set_initialized = false;
   if (!fatal_signal_set_initialized)
@@ -271,7 +271,7 @@
 
 /* Temporarily delay the catchable fatal signals.  */
 void
-block_fatal_signals (void)
+block_fatal_signals ()
 {
   init_fatal_signal_set ();
   sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL);
@@ -279,7 +279,7 @@
 
 /* Stop delaying the catchable fatal signals.  */
 void
-unblock_fatal_signals (void)
+unblock_fatal_signals ()
 {
   init_fatal_signal_set ();
   sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fatal-signal.h gettext-0.18.1.1/gettext-tools/gnulib-lib/fatal-signal.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/fatal-signal.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fatal-signal.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fcntl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fcntl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fcntl.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fcntl.c	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,13 +33,10 @@
 #undef fcntl
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
-
 /* Upper bound on getdtablesize().  See lib/getdtablesize.c.  */
 # define OPEN_MAX_MAX 0x10000
 
@@ -94,7 +91,7 @@
           result = -1;
           break;
         }
-      duplicated_fd = _open_osfhandle ((intptr_t) new_handle, flags);
+      duplicated_fd = _open_osfhandle ((long) new_handle, flags);
       if (duplicated_fd < 0)
         {
           CloseHandle (new_handle);
@@ -190,21 +187,7 @@
           errno = EINVAL;
         else
           {
-            /* Haiku alpha 2 loses fd flags on original.  */
-            int flags = fcntl (fd, F_GETFD);
-            if (flags < 0)
-              {
-                result = -1;
-                break;
-              }
             result = fcntl (fd, action, target);
-            if (0 <= result && fcntl (fd, F_SETFD, flags) == -1)
-              {
-                int saved_errno = errno;
-                close (result);
-                result = -1;
-                errno = saved_errno;
-              }
 # if REPLACE_FCHDIR
             if (0 <= result)
               result = _gl_register_dup (fd, result);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fcntl.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/fcntl.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/fcntl.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fcntl.in.h	2010-05-24 09:42:36.000000000 +0000
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,12 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_system_fcntl_h
 /* Special invocation convention.  */
 
-/* Needed before <sys/stat.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
 #include <sys/types.h>
-/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
-   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
-   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
-   extern "C" { ... } block, which leads to errors in C++ mode with the
-   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
-   with g++ version >= 4.3.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
+#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <sys/stat.h>
 #endif
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
@@ -42,36 +33,22 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_FCNTL_H
+#ifndef _GL_FCNTL_H
 
-/* Needed before <sys/stat.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
 #include <sys/types.h>
-/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
-   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
-   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
-   extern "C" { ... } block, which leads to errors in C++ mode with the
-   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
-   with g++ version >= 4.3.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
+#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <sys/stat.h>
 #endif
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
 
-#ifndef _@GUARD_PREFIX@_FCNTL_H
-#define _@GUARD_PREFIX@_FCNTL_H
+#ifndef _GL_FCNTL_H
+#define _GL_FCNTL_H
 
 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <unistd.h>
 #endif
 
-/* Native Windows platforms declare open(), creat() in <io.h>.  */
-#if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \
-    && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -117,11 +94,7 @@
 # else
 _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
 # endif
-/* On HP-UX 11, in C++ mode, open() is defined as an inline function with a
-   default argument.  _GL_CXXALIASWARN does not work in this case.  */
-# if !defined __hpux
 _GL_CXXALIASWARN (open);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef open
 /* Assume open is always declared.  */
@@ -186,36 +159,17 @@
 
 /* Fix up the O_* macros.  */
 
-/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT
-   to values outside 'int' range, so omit these misdefinitions.
-   But avoid namespace pollution on non-AIX systems.  */
-#ifdef _AIX
-# include <limits.h>
-# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX)
-#  undef O_CLOEXEC
-# endif
-# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX)
-#  undef O_NOFOLLOW
-# endif
-# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX)
-#  undef O_TTY_INIT
-# endif
-#endif
-
 #if !defined O_DIRECT && defined O_DIRECTIO
-/* Tru64 spells it 'O_DIRECTIO'.  */
+/* Tru64 spells it `O_DIRECTIO'.  */
 # define O_DIRECT O_DIRECTIO
 #endif
 
 #if !defined O_CLOEXEC && defined O_NOINHERIT
-/* Mingw spells it 'O_NOINHERIT'.  */
+/* Mingw spells it `O_NOINHERIT'.  Intentionally leave it
+   undefined if not available.  */
 # define O_CLOEXEC O_NOINHERIT
 #endif
 
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
 #ifndef O_DIRECT
 # define O_DIRECT 0
 #endif
@@ -228,14 +182,6 @@
 # define O_DSYNC 0
 #endif
 
-#ifndef O_EXEC
-# define O_EXEC O_RDONLY /* This is often close enough in older systems.  */
-#endif
-
-#ifndef O_IGNORE_CTTY
-# define O_IGNORE_CTTY 0
-#endif
-
 #ifndef O_NDELAY
 # define O_NDELAY 0
 #endif
@@ -248,19 +194,6 @@
 # define O_NONBLOCK O_NDELAY
 #endif
 
-/* If the gnulib module 'nonblocking' is in use, guarantee a working non-zero
-   value of O_NONBLOCK.  Otherwise, O_NONBLOCK is defined (above) to O_NDELAY
-   or to 0 as fallback.  */
-#if @GNULIB_NONBLOCKING@
-# if O_NONBLOCK
-#  define GNULIB_defined_O_NONBLOCK 0
-# else
-#  define GNULIB_defined_O_NONBLOCK 1
-#  undef O_NONBLOCK
-#  define O_NONBLOCK 0x40000000
-# endif
-#endif
-
 #ifndef O_NOCTTY
 # define O_NOCTTY 0
 #endif
@@ -269,26 +202,14 @@
 # define O_NOFOLLOW 0
 #endif
 
-#ifndef O_NOLINK
-# define O_NOLINK 0
-#endif
-
 #ifndef O_NOLINKS
 # define O_NOLINKS 0
 #endif
 
-#ifndef O_NOTRANS
-# define O_NOTRANS 0
-#endif
-
 #ifndef O_RSYNC
 # define O_RSYNC 0
 #endif
 
-#ifndef O_SEARCH
-# define O_SEARCH O_RDONLY /* This is often close enough in older systems.  */
-#endif
-
 #ifndef O_SYNC
 # define O_SYNC 0
 #endif
@@ -297,11 +218,6 @@
 # define O_TTY_INIT 0
 #endif
 
-#if ~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
-# undef O_ACCMODE
-# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
-#endif
-
 /* For systems that distinguish between text and binary I/O.
    O_BINARY is usually declared in fcntl.h  */
 #if !defined O_BINARY && defined _O_BINARY
@@ -358,6 +274,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_FCNTL_H */
-#endif /* _@GUARD_PREFIX@_FCNTL_H */
+#endif /* _GL_FCNTL_H */
+#endif /* _GL_FCNTL_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fd-hook.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-hook.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fd-hook.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-hook.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2014 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
-   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>
-
-/* Specification.  */
-#include "fd-hook.h"
-
-#include <stdlib.h>
-
-/* Currently, this entire code is only needed for the handling of sockets
-   on native Windows platforms.  */
-#if WINDOWS_SOCKETS
-
-/* The first and last link in the doubly linked list.
-   Initially the list is empty.  */
-static struct fd_hook anchor = { &anchor, &anchor, NULL, NULL };
-
-int
-execute_close_hooks (const struct fd_hook *remaining_list, gl_close_fn primary,
-                     int fd)
-{
-  if (remaining_list == &anchor)
-    /* End of list reached.  */
-    return primary (fd);
-  else
-    return remaining_list->private_close_fn (remaining_list->private_next,
-                                             primary, fd);
-}
-
-int
-execute_all_close_hooks (gl_close_fn primary, int fd)
-{
-  return execute_close_hooks (anchor.private_next, primary, fd);
-}
-
-int
-execute_ioctl_hooks (const struct fd_hook *remaining_list, gl_ioctl_fn primary,
-                     int fd, int request, void *arg)
-{
-  if (remaining_list == &anchor)
-    /* End of list reached.  */
-    return primary (fd, request, arg);
-  else
-    return remaining_list->private_ioctl_fn (remaining_list->private_next,
-                                             primary, fd, request, arg);
-}
-
-int
-execute_all_ioctl_hooks (gl_ioctl_fn primary,
-                         int fd, int request, void *arg)
-{
-  return execute_ioctl_hooks (anchor.private_next, primary, fd, request, arg);
-}
-
-void
-register_fd_hook (close_hook_fn close_hook, ioctl_hook_fn ioctl_hook, struct fd_hook *link)
-{
-  if (close_hook == NULL)
-    close_hook = execute_close_hooks;
-  if (ioctl_hook == NULL)
-    ioctl_hook = execute_ioctl_hooks;
-
-  if (link->private_next == NULL && link->private_prev == NULL)
-    {
-      /* Add the link to the doubly linked list.  */
-      link->private_next = anchor.private_next;
-      link->private_prev = &anchor;
-      link->private_close_fn = close_hook;
-      link->private_ioctl_fn = ioctl_hook;
-      anchor.private_next->private_prev = link;
-      anchor.private_next = link;
-    }
-  else
-    {
-      /* The link is already in use.  */
-      if (link->private_close_fn != close_hook
-          || link->private_ioctl_fn != ioctl_hook)
-        abort ();
-    }
-}
-
-void
-unregister_fd_hook (struct fd_hook *link)
-{
-  struct fd_hook *next = link->private_next;
-  struct fd_hook *prev = link->private_prev;
-
-  if (next != NULL && prev != NULL)
-    {
-      /* The link is in use.  Remove it from the doubly linked list.  */
-      prev->private_next = next;
-      next->private_prev = prev;
-      /* Clear the link, to mark it unused.  */
-      link->private_next = NULL;
-      link->private_prev = NULL;
-      link->private_close_fn = NULL;
-      link->private_ioctl_fn = NULL;
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fd-hook.h gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-hook.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/fd-hook.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-hook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-/* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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 FD_HOOK_H
-#define FD_HOOK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Currently, this entire code is only needed for the handling of sockets
-   on native Windows platforms.  */
-#if WINDOWS_SOCKETS
-
-
-/* Type of function that closes FD.  */
-typedef int (*gl_close_fn) (int fd);
-
-/* Type of function that applies a control request to FD.  */
-typedef int (*gl_ioctl_fn) (int fd, int request, void *arg);
-
-/* An element of the list of file descriptor hooks.
-   In CLOS (Common Lisp Object System) speak, it consists of an "around"
-   method for the close() function and an "around" method for the ioctl()
-   function.
-   The fields of this structure are considered private.  */
-struct fd_hook
-{
-  /* Doubly linked list.  */
-  struct fd_hook *private_next;
-  struct fd_hook *private_prev;
-  /* Function that treats the types of FD that it knows about and calls
-     execute_close_hooks (REMAINING_LIST, PRIMARY, FD) as a fallback.  */
-  int (*private_close_fn) (const struct fd_hook *remaining_list,
-                           gl_close_fn primary,
-                           int fd);
-  /* Function that treats the types of FD that it knows about and calls
-     execute_ioctl_hooks (REMAINING_LIST, PRIMARY, FD, REQUEST, ARG) as a
-     fallback.  */
-  int (*private_ioctl_fn) (const struct fd_hook *remaining_list,
-                           gl_ioctl_fn primary,
-                           int fd, int request, void *arg);
-};
-
-/* This type of function closes FD, applying special knowledge for the FD
-   types it knows about, and calls
-   execute_close_hooks (REMAINING_LIST, PRIMARY, FD)
-   for the other FD types.
-   In CLOS speak, REMAINING_LIST is the remaining list of "around" methods,
-   and PRIMARY is the "primary" method for close().  */
-typedef int (*close_hook_fn) (const struct fd_hook *remaining_list,
-                              gl_close_fn primary,
-                              int fd);
-
-/* Execute the close hooks in REMAINING_LIST, with PRIMARY as "primary" method.
-   Return 0 or -1, like close() would do.  */
-extern int execute_close_hooks (const struct fd_hook *remaining_list,
-                                gl_close_fn primary,
-                                int fd);
-
-/* Execute all close hooks, with PRIMARY as "primary" method.
-   Return 0 or -1, like close() would do.  */
-extern int execute_all_close_hooks (gl_close_fn primary, int fd);
-
-/* This type of function applies a control request to FD, applying special
-   knowledge for the FD types it knows about, and calls
-   execute_ioctl_hooks (REMAINING_LIST, PRIMARY, FD, REQUEST, ARG)
-   for the other FD types.
-   In CLOS speak, REMAINING_LIST is the remaining list of "around" methods,
-   and PRIMARY is the "primary" method for ioctl().  */
-typedef int (*ioctl_hook_fn) (const struct fd_hook *remaining_list,
-                              gl_ioctl_fn primary,
-                              int fd, int request, void *arg);
-
-/* Execute the ioctl hooks in REMAINING_LIST, with PRIMARY as "primary" method.
-   Return 0 or -1, like ioctl() would do.  */
-extern int execute_ioctl_hooks (const struct fd_hook *remaining_list,
-                                gl_ioctl_fn primary,
-                                int fd, int request, void *arg);
-
-/* Execute all ioctl hooks, with PRIMARY as "primary" method.
-   Return 0 or -1, like ioctl() would do.  */
-extern int execute_all_ioctl_hooks (gl_ioctl_fn primary,
-                                    int fd, int request, void *arg);
-
-/* Add a function pair to the list of file descriptor hooks.
-   CLOSE_HOOK and IOCTL_HOOK may be NULL, indicating no change.
-   The LINK variable points to a piece of memory which is guaranteed to be
-   accessible until the corresponding call to unregister_fd_hook.  */
-extern void register_fd_hook (close_hook_fn close_hook, ioctl_hook_fn ioctl_hook,
-                              struct fd_hook *link);
-
-/* Removes a hook from the list of file descriptor hooks.  */
-extern void unregister_fd_hook (struct fd_hook *link);
-
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FD_HOOK_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fd-safer.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-safer.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fd-safer.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-safer.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fd-safer-flag.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-safer-flag.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fd-safer-flag.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fd-safer-flag.c	2010-05-24 09:42:37.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/file-has-acl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/file-has-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/file-has-acl.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/file-has-acl.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* Test whether a file has a nontrivial access control list.
 
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,12 +17,6 @@
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
-/* Without this pragma, gcc 4.7.0 20120126 may suggest that the
-   file_has_acl function might be candidate for attribute 'const'  */
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-# pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
-#endif
-
 #include <config.h>
 
 #include "acl.h"
@@ -32,7 +26,7 @@
 
 #if USE_ACL && HAVE_ACL_GET_FILE
 
-# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
+# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
 
 /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
    Return 1 if the given ACL is non-trivial.
@@ -75,7 +69,8 @@
     }
   return got_one;
 
-#  elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */
+#  else /* IRIX, Tru64 */
+#   if HAVE_ACL_TO_SHORT_TEXT /* IRIX */
   /* Don't use acl_get_entry: it is undocumented.  */
 
   int count = acl->acl_cnt;
@@ -92,7 +87,8 @@
     }
   return 0;
 
-#  elif HAVE_ACL_FREE_TEXT /* Tru64 */
+#   endif
+#   if HAVE_ACL_FREE_TEXT /* Tru64 */
   /* Don't use acl_get_entry: it takes only one argument and does not work.  */
 
   int count = acl->acl_num;
@@ -115,17 +111,16 @@
     }
   return 0;
 
-#  else
-
-  errno = ENOSYS;
-  return -1;
+#   endif
 #  endif
 }
 
 # endif
 
 
-#elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+#elif USE_ACL && HAVE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+
+# if !defined ACL_NO_TRIVIAL /* Solaris <= 10, Cygwin */
 
 /* Test an ACL retrieved with GETACL.
    Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
@@ -153,10 +148,7 @@
   return 0;
 }
 
-# ifdef ACE_GETACL
-
-/* A shortcut for a bitmask.  */
-#  define NEW_ACE_WRITEA_DATA (NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA)
+#  ifdef ACE_GETACL
 
 /* Test an ACL retrieved with ACE_GETACL.
    Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
@@ -175,7 +167,7 @@
   int old_convention = 0;
 
   for (i = 0; i < count; i++)
-    if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER))
+    if (entries[i].a_flags & (ACE_OWNER | ACE_GROUP | ACE_OTHER))
       {
         old_convention = 1;
         break;
@@ -191,152 +183,34 @@
            If ace->a_flags = ACE_OWNER, ace->a_who is the st_uid from stat().
            If ace->a_flags = ACE_GROUP, ace->a_who is the st_gid from stat().
            We don't need to check ace->a_who in these cases.  */
-        if (!(ace->a_type == OLD_ALLOW
-              && (ace->a_flags == OLD_ACE_OWNER
-                  || ace->a_flags == OLD_ACE_GROUP
-                  || ace->a_flags == OLD_ACE_OTHER)))
+        if (!(ace->a_type == ALLOW
+              && (ace->a_flags == ACE_OWNER
+                  || ace->a_flags == ACE_GROUP
+                  || ace->a_flags == ACE_OTHER)))
           return 1;
       }
   else
-    {
-      /* Running on Solaris 10 (newer version) or Solaris 11.  */
-      unsigned int access_masks[6] =
-        {
-          0, /* owner@ deny */
-          0, /* owner@ allow */
-          0, /* group@ deny */
-          0, /* group@ allow */
-          0, /* everyone@ deny */
-          0  /* everyone@ allow */
-        };
-
-      for (i = 0; i < count; i++)
-        {
-          ace_t *ace = &entries[i];
-          unsigned int index1;
-          unsigned int index2;
-
-          if (ace->a_type == NEW_ACE_ACCESS_ALLOWED_ACE_TYPE)
-            index1 = 1;
-          else if (ace->a_type == NEW_ACE_ACCESS_DENIED_ACE_TYPE)
-            index1 = 0;
-          else
-            return 1;
-
-          if (ace->a_flags == NEW_ACE_OWNER)
-            index2 = 0;
-          else if (ace->a_flags == (NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP))
-            index2 = 2;
-          else if (ace->a_flags == NEW_ACE_EVERYONE)
-            index2 = 4;
-          else
-            return 1;
-
-          access_masks[index1 + index2] |= ace->a_access_mask;
-        }
-
-      /* The same bit shouldn't be both allowed and denied.  */
-      if (access_masks[0] & access_masks[1])
-        return 1;
-      if (access_masks[2] & access_masks[3])
-        return 1;
-      if (access_masks[4] & access_masks[5])
-        return 1;
+    /* Running on Solaris 10 (newer version) or Solaris 11.  */
+    for (i = 0; i < count; i++)
+      {
+        ace_t *ace = &entries[i];
 
-      /* Check minimum masks.  */
-      if ((NEW_ACE_WRITE_NAMED_ATTRS
-           | NEW_ACE_WRITE_ATTRIBUTES
-           | NEW_ACE_WRITE_ACL
-           | NEW_ACE_WRITE_OWNER)
-          & ~ access_masks[1])
-        return 1;
-      access_masks[1] &= ~(NEW_ACE_WRITE_NAMED_ATTRS
-                           | NEW_ACE_WRITE_ATTRIBUTES
-                           | NEW_ACE_WRITE_ACL
-                           | NEW_ACE_WRITE_OWNER);
-      if ((NEW_ACE_READ_NAMED_ATTRS
-           | NEW_ACE_READ_ATTRIBUTES
-           | NEW_ACE_READ_ACL
-           | NEW_ACE_SYNCHRONIZE)
-          & ~ access_masks[5])
-        return 1;
-      access_masks[5] &= ~(NEW_ACE_READ_NAMED_ATTRS
-                           | NEW_ACE_READ_ATTRIBUTES
-                           | NEW_ACE_READ_ACL
-                           | NEW_ACE_SYNCHRONIZE);
-
-      /* Check the allowed or denied bits.  */
-      switch ((access_masks[0] | access_masks[1])
-              & ~(NEW_ACE_READ_NAMED_ATTRS
-                  | NEW_ACE_READ_ATTRIBUTES
-                  | NEW_ACE_READ_ACL
-                  | NEW_ACE_SYNCHRONIZE))
-        {
-        case 0:
-        case NEW_ACE_READ_DATA:
-        case                     NEW_ACE_WRITEA_DATA:
-        case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA:
-        case                                           NEW_ACE_EXECUTE:
-        case NEW_ACE_READ_DATA |                       NEW_ACE_EXECUTE:
-        case                     NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
-        case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
-          break;
-        default:
-          return 1;
-        }
-      switch ((access_masks[2] | access_masks[3])
-              & ~(NEW_ACE_READ_NAMED_ATTRS
-                  | NEW_ACE_READ_ATTRIBUTES
-                  | NEW_ACE_READ_ACL
-                  | NEW_ACE_SYNCHRONIZE))
-        {
-        case 0:
-        case NEW_ACE_READ_DATA:
-        case                     NEW_ACE_WRITEA_DATA:
-        case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA:
-        case                                           NEW_ACE_EXECUTE:
-        case NEW_ACE_READ_DATA |                       NEW_ACE_EXECUTE:
-        case                     NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
-        case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
-          break;
-        default:
+        if (!(ace->a_type == ACE_ACCESS_ALLOWED_ACE_TYPE
+              && (ace->a_flags == NEW_ACE_OWNER
+                  || ace->a_flags
+                     == (NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP)
+                  || ace->a_flags == ACE_EVERYONE)
+              && (ace->a_access_mask
+                  & ~(NEW_ACE_READ_DATA | NEW_ACE_WRITE_DATA | NEW_ACE_EXECUTE))
+                 == 0))
           return 1;
-        }
-      switch ((access_masks[4] | access_masks[5])
-              & ~(NEW_ACE_WRITE_NAMED_ATTRS
-                  | NEW_ACE_WRITE_ATTRIBUTES
-                  | NEW_ACE_WRITE_ACL
-                  | NEW_ACE_WRITE_OWNER))
-        {
-        case 0:
-        case NEW_ACE_READ_DATA:
-        case                     NEW_ACE_WRITEA_DATA:
-        case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA:
-        case                                           NEW_ACE_EXECUTE:
-        case NEW_ACE_READ_DATA |                       NEW_ACE_EXECUTE:
-        case                     NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
-        case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
-          break;
-        default:
-          return 1;
-        }
-
-      /* Check that the NEW_ACE_WRITE_DATA and NEW_ACE_APPEND_DATA bits are
-         either both allowed or both denied.  */
-      if (((access_masks[0] & NEW_ACE_WRITE_DATA) != 0)
-          != ((access_masks[0] & NEW_ACE_APPEND_DATA) != 0))
-        return 1;
-      if (((access_masks[2] & NEW_ACE_WRITE_DATA) != 0)
-          != ((access_masks[2] & NEW_ACE_APPEND_DATA) != 0))
-        return 1;
-      if (((access_masks[4] & NEW_ACE_WRITE_DATA) != 0)
-          != ((access_masks[4] & NEW_ACE_APPEND_DATA) != 0))
-        return 1;
-    }
+      }
 
   return 0;
 }
 
+#  endif
+
 # endif
 
 #elif USE_ACL && HAVE_GETACL /* HP-UX */
@@ -360,33 +234,6 @@
   return 0;
 }
 
-# if HAVE_ACLV_H /* HP-UX >= 11.11 */
-
-/* Return 1 if the given ACL is non-trivial.
-   Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-int
-aclv_nontrivial (int count, struct acl *entries)
-{
-  int i;
-
-  for (i = 0; i < count; i++)
-    {
-      struct acl *ace = &entries[i];
-
-      /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat().
-         If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat().
-         We don't need to check ace->a_id in these cases.  */
-      if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */
-            || ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */
-            || ace->a_type == CLASS_OBJ
-            || ace->a_type == OTHER_OBJ))
-        return 1;
-    }
-  return 0;
-}
-
-# endif
-
 #elif USE_ACL && (HAVE_ACLX_GET || HAVE_STATACL) /* AIX */
 
 /* Return 1 if the given ACL is non-trivial.
@@ -447,39 +294,12 @@
 
 # endif
 
-#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */
-
-/* Test an ACL retrieved with ACL_GET.
-   Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
-   Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-int
-acl_nontrivial (int count, struct acl *entries)
-{
-  int i;
-
-  for (i = 0; i < count; i++)
-    {
-      struct acl *ace = &entries[i];
-
-      /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat().
-         If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat().
-         We don't need to check ace->a_id in these cases.  */
-      if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */
-            || ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */
-            || ace->a_type == CLASS_OBJ
-            || ace->a_type == OTHER_OBJ))
-        return 1;
-    }
-  return 0;
-}
-
 #endif
 
 
 /* Return 1 if NAME has a nontrivial access control list, 0 if NAME
    only has no or a base access control list, and -1 (setting errno)
-   on error.  SB must be set to the stat buffer of NAME, obtained
-   through stat() or lstat().  */
+   on error.  SB must be set to the stat buffer of FILE.  */
 
 int
 file_has_acl (char const *name, struct stat const *sb)
@@ -490,7 +310,7 @@
 # if HAVE_ACL_GET_FILE
 
       /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
-      /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+      /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
       int ret;
 
       if (HAVE_ACL_EXTENDED_FILE) /* Linux */
@@ -500,10 +320,10 @@
              ACL_TYPE_DEFAULT.  */
           ret = acl_extended_file (name);
         }
-      else /* FreeBSD, Mac OS X, IRIX, Tru64 */
+      else /* FreeBSD, MacOS X, IRIX, Tru64 */
         {
-#  if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
-          /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
+#  if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
+          /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS)
              and acl_get_file (name, ACL_TYPE_DEFAULT)
              always return NULL / EINVAL.  There is no point in making
              these two useless calls.  The real ACL is retrieved through
@@ -554,10 +374,10 @@
 #  endif
         }
       if (ret < 0)
-        return - acl_errno_valid (errno);
+        return ACL_NOT_WELL_SUPPORTED (errno) ? 0 : -1;
       return ret;
 
-# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+# elif HAVE_ACL && defined GETACLCNT /* Solaris, Cygwin, not HP-UX */
 
 #  if defined ACL_NO_TRIVIAL
 
@@ -571,156 +391,100 @@
       /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions
          of Unixware.  The acl() call returns the access and default ACL both
          at once.  */
+      int count;
       {
-        /* Initially, try to read the entries into a stack-allocated buffer.
-           Use malloc if it does not fit.  */
-        enum
-          {
-            alloc_init = 4000 / sizeof (aclent_t), /* >= 3 */
-            alloc_max = MIN (INT_MAX, SIZE_MAX / sizeof (aclent_t))
-          };
-        aclent_t buf[alloc_init];
-        size_t alloc = alloc_init;
-        aclent_t *entries = buf;
-        aclent_t *malloced = NULL;
-        int count;
+        aclent_t *entries;
 
         for (;;)
           {
-            count = acl (name, GETACL, alloc, entries);
-            if (count < 0 && errno == ENOSPC)
-              {
-                /* Increase the size of the buffer.  */
-                free (malloced);
-                if (alloc > alloc_max / 2)
-                  {
-                    errno = ENOMEM;
-                    return -1;
-                  }
-                alloc = 2 * alloc; /* <= alloc_max */
-                entries = malloced =
-                  (aclent_t *) malloc (alloc * sizeof (aclent_t));
-                if (entries == NULL)
-                  {
-                    errno = ENOMEM;
-                    return -1;
-                  }
-                continue;
-              }
-            break;
-          }
-        if (count < 0)
-          {
-            if (errno == ENOSYS || errno == ENOTSUP)
-              ;
-            else
+            count = acl (name, GETACLCNT, 0, NULL);
+
+            if (count < 0)
               {
-                int saved_errno = errno;
-                free (malloced);
-                errno = saved_errno;
-                return -1;
+                if (errno == ENOSYS || errno == ENOTSUP)
+                  break;
+                else
+                  return -1;
               }
-          }
-        else if (count == 0)
-          ;
-        else
-          {
+
+            if (count == 0)
+              break;
+
             /* Don't use MIN_ACL_ENTRIES:  It's set to 4 on Cygwin, but Cygwin
                returns only 3 entries for files with no ACL.  But this is safe:
                If there are more than 4 entries, there cannot be only the
                "user::", "group::", "other:", and "mask:" entries.  */
             if (count > 4)
+              return 1;
+
+            entries = (aclent_t *) malloc (count * sizeof (aclent_t));
+            if (entries == NULL)
               {
-                free (malloced);
-                return 1;
+                errno = ENOMEM;
+                return -1;
               }
-
-            if (acl_nontrivial (count, entries))
+            if (acl (name, GETACL, count, entries) == count)
               {
-                free (malloced);
-                return 1;
+                if (acl_nontrivial (count, entries))
+                  {
+                    free (entries);
+                    return 1;
+                  }
+                free (entries);
+                break;
               }
+            /* Huh? The number of ACL entries changed since the last call.
+               Repeat.  */
+            free (entries);
           }
-        free (malloced);
       }
 
 #   ifdef ACE_GETACL
       /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
          file systems (whereas the other ones are used in UFS file systems).  */
       {
-        /* Initially, try to read the entries into a stack-allocated buffer.
-           Use malloc if it does not fit.  */
-        enum
-          {
-            alloc_init = 4000 / sizeof (ace_t), /* >= 3 */
-            alloc_max = MIN (INT_MAX, SIZE_MAX / sizeof (ace_t))
-          };
-        ace_t buf[alloc_init];
-        size_t alloc = alloc_init;
-        ace_t *entries = buf;
-        ace_t *malloced = NULL;
-        int count;
+        ace_t *entries;
 
         for (;;)
           {
-            count = acl (name, ACE_GETACL, alloc, entries);
-            if (count < 0 && errno == ENOSPC)
+            count = acl (name, ACE_GETACLCNT, 0, NULL);
+
+            if (count < 0)
               {
-                /* Increase the size of the buffer.  */
-                free (malloced);
-                if (alloc > alloc_max / 2)
-                  {
-                    errno = ENOMEM;
-                    return -1;
-                  }
-                alloc = 2 * alloc; /* <= alloc_max */
-                entries = malloced = (ace_t *) malloc (alloc * sizeof (ace_t));
-                if (entries == NULL)
-                  {
-                    errno = ENOMEM;
-                    return -1;
-                  }
-                continue;
+                if (errno == ENOSYS || errno == EINVAL)
+                  break;
+                else
+                  return -1;
               }
-            break;
-          }
-        if (count < 0)
-          {
-            if (errno == ENOSYS || errno == EINVAL)
-              ;
-            else
+
+            if (count == 0)
+              break;
+
+            /* If there are more than 3 entries, there cannot be only the
+               ACE_OWNER, ACE_GROUP, ACE_OTHER entries.  */
+            if (count > 3)
+              return 1;
+
+            entries = (ace_t *) malloc (count * sizeof (ace_t));
+            if (entries == NULL)
               {
-                int saved_errno = errno;
-                free (malloced);
-                errno = saved_errno;
+                errno = ENOMEM;
                 return -1;
               }
-          }
-        else if (count == 0)
-          ;
-        else
-          {
-            /* In the old (original Solaris 10) convention:
-               If there are more than 3 entries, there cannot be only the
-               ACE_OWNER, ACE_GROUP, ACE_OTHER entries.
-               In the newer Solaris 10 and Solaris 11 convention:
-               If there are more than 6 entries, there cannot be only the
-               ACE_OWNER, ACE_GROUP, ACE_EVERYONE entries, each once with
-               NEW_ACE_ACCESS_ALLOWED_ACE_TYPE and once with
-               NEW_ACE_ACCESS_DENIED_ACE_TYPE.  */
-            if (count > 6)
-              {
-                free (malloced);
-                return 1;
-              }
-
-            if (acl_ace_nontrivial (count, entries))
+            if (acl (name, ACE_GETACL, count, entries) == count)
               {
-                free (malloced);
-                return 1;
+                if (acl_ace_nontrivial (count, entries))
+                  {
+                    free (entries);
+                    return 1;
+                  }
+                free (entries);
+                break;
               }
+            /* Huh? The number of ACL entries changed since the last call.
+               Repeat.  */
+            free (entries);
           }
-        free (malloced);
       }
 #   endif
 
@@ -729,36 +493,30 @@
 
 # elif HAVE_GETACL /* HP-UX */
 
-      {
-        struct acl_entry entries[NACLENTRIES];
-        int count;
+      int count;
+      struct acl_entry entries[NACLENTRIES];
 
-        count = getacl (name, NACLENTRIES, entries);
+      for (;;)
+        {
+          count = getacl (name, 0, NULL);
 
-        if (count < 0)
-          {
-            /* ENOSYS is seen on newer HP-UX versions.
-               EOPNOTSUPP is typically seen on NFS mounts.
-               ENOTSUP was seen on Quantum StorNext file systems (cvfs).  */
-            if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
-              ;
-            else
-              return -1;
-          }
-        else if (count == 0)
-          return 0;
-        else /* count > 0 */
-          {
-            if (count > NACLENTRIES)
-              /* If NACLENTRIES cannot be trusted, use dynamic memory
-                 allocation.  */
-              abort ();
+          if (count < 0)
+            return (errno == ENOSYS || errno == EOPNOTSUPP ? 0 : -1);
 
-            /* If there are more than 3 entries, there cannot be only the
-               (uid,%), (%,gid), (%,%) entries.  */
-            if (count > 3)
-              return 1;
+          if (count == 0)
+            return 0;
 
+          if (count > NACLENTRIES)
+            /* If NACLENTRIES cannot be trusted, use dynamic memory
+               allocation.  */
+            abort ();
+
+          /* If there are more than 3 entries, there cannot be only the
+             (uid,%), (%,gid), (%,%) entries.  */
+          if (count > 3)
+            return 1;
+
+          if (getacl (name, count, entries) == count)
             {
               struct stat statbuf;
 
@@ -767,45 +525,9 @@
 
               return acl_nontrivial (count, entries, &statbuf);
             }
-          }
-      }
-
-#  if HAVE_ACLV_H /* HP-UX >= 11.11 */
-
-      {
-        struct acl entries[NACLVENTRIES];
-        int count;
-
-        count = acl ((char *) name, ACL_GET, NACLVENTRIES, entries);
-
-        if (count < 0)
-          {
-            /* EOPNOTSUPP is seen on NFS in HP-UX 11.11, 11.23.
-               EINVAL is seen on NFS in HP-UX 11.31.  */
-            if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-              ;
-            else
-              return -1;
-          }
-        else if (count == 0)
-          return 0;
-        else /* count > 0 */
-          {
-            if (count > NACLVENTRIES)
-              /* If NACLVENTRIES cannot be trusted, use dynamic memory
-                 allocation.  */
-              abort ();
-
-            /* If there are more than 4 entries, there cannot be only the
-               four base ACL entries.  */
-            if (count > 4)
-              return 1;
-
-            return aclv_nontrivial (count, entries);
-          }
-      }
-
-#  endif
+          /* Huh? The number of ACL entries changed since the last call.
+             Repeat.  */
+        }
 
 # elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */
 
@@ -822,8 +544,6 @@
           type.u64 = ACL_ANY;
           if (aclx_get (name, 0, &type, aclbuf, &aclsize, &mode) >= 0)
             break;
-          if (errno == ENOSYS)
-            return 0;
           if (errno != ENOSPC)
             {
               if (acl != aclbuf)
@@ -878,39 +598,6 @@
 
       return acl_nontrivial (&u.a);
 
-# elif HAVE_ACLSORT /* NonStop Kernel */
-
-      {
-        struct acl entries[NACLENTRIES];
-        int count;
-
-        count = acl ((char *) name, ACL_GET, NACLENTRIES, entries);
-
-        if (count < 0)
-          {
-            if (errno == ENOSYS || errno == ENOTSUP)
-              ;
-            else
-              return -1;
-          }
-        else if (count == 0)
-          return 0;
-        else /* count > 0 */
-          {
-            if (count > NACLENTRIES)
-              /* If NACLENTRIES cannot be trusted, use dynamic memory
-                 allocation.  */
-              abort ();
-
-            /* If there are more than 4 entries, there cannot be only the
-               four base ACL entries.  */
-            if (count > 4)
-              return 1;
-
-            return acl_nontrivial (count, entries);
-          }
-      }
-
 # endif
     }
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/filename.h gettext-0.18.1.1/gettext-tools/gnulib-lib/filename.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/filename.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/filename.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/findprog.c gettext-0.18.1.1/gettext-tools/gnulib-lib/findprog.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/findprog.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/findprog.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2010 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
@@ -39,7 +39,7 @@
 find_in_path (const char *progname)
 {
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
   /* The searching rules with .COM, .EXE, .BAT, .CMD etc. suffixes are
      too complicated.  Leave it to the OS.  */
   return progname;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/findprog.h gettext-0.18.1.1/gettext-tools/gnulib-lib/findprog.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/findprog.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/findprog.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/float.c gettext-0.18.1.1/gettext-tools/gnulib-lib/float.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/float.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/float.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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>
-
-/* Specification.  */
-#include <float.h>
-
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
-const union gl_long_double_union gl_LDBL_MAX =
-  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-#elif defined __i386__
-const union gl_long_double_union gl_LDBL_MAX =
-  { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-#else
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/float+.h gettext-0.18.1.1/gettext-tools/gnulib-lib/float+.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/float+.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/float+.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _FLOATPLUS_H
 #define _FLOATPLUS_H
@@ -140,8 +141,8 @@
 #define SIZEOF_LDBL ((LDBL_TOTAL_BIT + CHAR_BIT - 1) / CHAR_BIT)
 
 /* Verify that SIZEOF_FLT <= sizeof (float) etc.  */
-typedef int verify_sizeof_flt[SIZEOF_FLT <= sizeof (float) ? 1 : -1];
-typedef int verify_sizeof_dbl[SIZEOF_DBL <= sizeof (double) ? 1 : - 1];
-typedef int verify_sizeof_ldbl[SIZEOF_LDBL <= sizeof (long double) ? 1 : - 1];
+typedef int verify_sizeof_flt[2 * (SIZEOF_FLT <= sizeof (float)) - 1];
+typedef int verify_sizeof_dbl[2 * (SIZEOF_DBL <= sizeof (double)) - 1];
+typedef int verify_sizeof_ldbl[2 * (SIZEOF_LDBL <= sizeof (long double)) - 1];
 
 #endif /* _FLOATPLUS_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/float.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/float.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/float.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/float.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,21 +15,19 @@
    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 _@GUARD_PREFIX@_FLOAT_H
+#ifndef _GL_FLOAT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FLOAT_H@
 
-#ifndef _@GUARD_PREFIX@_FLOAT_H
-#define _@GUARD_PREFIX@_FLOAT_H
+#ifndef _GL_FLOAT_H
+#define _GL_FLOAT_H
 
 /* 'long double' properties.  */
-
 #if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__)
 /* Number of mantissa units, in base FLT_RADIX.  */
 # undef LDBL_MANT_DIG
@@ -60,129 +58,5 @@
 # define LDBL_MAX_10_EXP 4932
 #endif
 
-/* On FreeBSD/x86 6.4, the 'long double' type really has only 53 bits of
-   precision in the compiler but 64 bits of precision at runtime.  See
-   <http://lists.gnu.org/archive/html/bug-gnulib/2008-07/msg00063.html>.  */
-#if defined __i386__ && defined __FreeBSD__
-/* Number of mantissa units, in base FLT_RADIX.  */
-# undef LDBL_MANT_DIG
-# define LDBL_MANT_DIG   64
-/* Number of decimal digits that is sufficient for representing a number.  */
-# undef LDBL_DIG
-# define LDBL_DIG        18
-/* x-1 where x is the smallest representable number > 1.  */
-# undef LDBL_EPSILON
-# define LDBL_EPSILON 1.084202172485504434007452800869941711426e-19L /* 2^-63 */
-/* Minimum e such that FLT_RADIX^(e-1) is a normalized number.  */
-# undef LDBL_MIN_EXP
-# define LDBL_MIN_EXP    (-16381)
-/* Maximum e such that FLT_RADIX^(e-1) is a representable finite number.  */
-# undef LDBL_MAX_EXP
-# define LDBL_MAX_EXP    16384
-/* Minimum positive normalized number.  */
-# undef LDBL_MIN
-# define LDBL_MIN        3.3621031431120935E-4932L /* = 0x1p-16382L */
-/* Maximum representable finite number.  */
-# undef LDBL_MAX
-/* LDBL_MAX is represented as { 0xFFFFFFFF, 0xFFFFFFFF, 32766 }.
-   But the largest literal that GCC allows us to write is
-   0x0.fffffffffffff8p16384L = { 0xFFFFF800, 0xFFFFFFFF, 32766 }.
-   So, define it like this through a reference to an external variable
-
-     const unsigned int LDBL_MAX[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 32766 };
-     extern const long double LDBL_MAX;
-
-   Unfortunately, this is not a constant expression.  */
-union gl_long_double_union
-  {
-    struct { unsigned int lo; unsigned int hi; unsigned int exponent; } xd;
-    long double ld;
-  };
-extern const union gl_long_double_union gl_LDBL_MAX;
-# define LDBL_MAX (gl_LDBL_MAX.ld)
-/* Minimum e such that 10^e is in the range of normalized numbers.  */
-# undef LDBL_MIN_10_EXP
-# define LDBL_MIN_10_EXP (-4931)
-/* Maximum e such that 10^e is in the range of representable finite numbers.  */
-# undef LDBL_MAX_10_EXP
-# define LDBL_MAX_10_EXP 4932
-#endif
-
-/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
-   wrong.
-   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
-#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
-# undef LDBL_MIN_EXP
-# define LDBL_MIN_EXP DBL_MIN_EXP
-# undef LDBL_MIN_10_EXP
-# define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-# undef LDBL_MIN
-# define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
-#endif
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
-# undef LDBL_MAX
-/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
-   It is not easy to define:
-     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
-   is too small, whereas
-     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
-   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
-   Also, I can't get values larger than
-     #define LDBL63 ((long double) (1ULL << 63))
-     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
-   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
-   So, define it like this through a reference to an external variable
-
-     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
-     extern const long double LDBL_MAX;
-
-   or through a pointer cast
-
-     #define LDBL_MAX \
-       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
-
-   Unfortunately, this is not a constant expression, and the latter expression
-   does not work well when GCC is optimizing..  */
-union gl_long_double_union
-  {
-    struct { double hi; double lo; } dd;
-    long double ld;
-  };
-extern const union gl_long_double_union gl_LDBL_MAX;
-# define LDBL_MAX (gl_LDBL_MAX.ld)
-#endif
-
-/* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
-   On IRIX 6.5, with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_EPSILON
-   are wrong.  */
-#if defined __sgi && (LDBL_MANT_DIG >= 106)
-# undef LDBL_MANT_DIG
-# define LDBL_MANT_DIG 106
-# if defined __GNUC__
-#  undef LDBL_MIN_EXP
-#  define LDBL_MIN_EXP DBL_MIN_EXP
-#  undef LDBL_MIN_10_EXP
-#  define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#  undef LDBL_MIN
-#  define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
-#  undef LDBL_EPSILON
-#  define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
-# endif
-#endif
-
-#if @REPLACE_ITOLD@
-/* Pull in a function that fixes the 'int' to 'long double' conversion
-   of glibc 2.7.  */
-extern
-# ifdef __cplusplus
-"C"
-# endif
-void _Qp_itoq (long double *, int);
-static void (*_gl_float_fix_itold) (long double *, int) = _Qp_itoq;
-#endif
-
-#endif /* _@GUARD_PREFIX@_FLOAT_H */
-#endif /* _@GUARD_PREFIX@_FLOAT_H */
+#endif /* _GL_FLOAT_H */
+#endif /* _GL_FLOAT_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fnmatch.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fnmatch.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fnmatch.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fnmatch.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1993, 1996-2007, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LIBC
 # include <config.h>
@@ -41,7 +43,7 @@
   (HAVE_WCTYPE_H && HAVE_BTOWC && HAVE_ISWCTYPE \
    && HAVE_WMEMCHR && (HAVE_WMEMCPY || HAVE_WMEMPCPY))
 
-/* For platform which support the ISO C amendment 1 functionality we
+/* For platform which support the ISO C amendement 1 functionality we
    support user defined character classes.  */
 #if defined _LIBC || WIDE_CHAR_SUPPORT
 # include <wctype.h>
@@ -77,7 +79,7 @@
    Library, but also included in many other GNU distributions.  Compiling
    and linking in this code is a waste when using the GNU C library
    (especially if it is a shared library).  Rather than having every GNU
-   program understand 'configure --with-gnu-libc' and omit the object files,
+   program understand `configure --with-gnu-libc' and omit the object files,
    it is simpler to just do this in the source for each such file.  */
 
 #if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU
@@ -91,7 +93,7 @@
 
 # if defined _LIBC || WIDE_CHAR_SUPPORT
 /* The GNU C library provides support for user-defined character classes
-   and the functions from ISO C amendment 1.  */
+   and the functions from ISO C amendement 1.  */
 #  ifdef CHARCLASS_NAME_MAX
 #   define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
 #  else
@@ -118,7 +120,7 @@
 #  endif
 
 # else
-#  define CHAR_CLASS_MAX_LENGTH  6 /* Namely, 'xdigit'.  */
+#  define CHAR_CLASS_MAX_LENGTH  6 /* Namely, `xdigit'.  */
 
 #  define IS_CHAR_CLASS(string)                                               \
    (STREQ (string, "alpha") || STREQ (string, "upper")                        \
@@ -167,6 +169,7 @@
 #  endif
 # endif
 # define MEMCHR(S, C, N) memchr (S, C, N)
+# define STRCOLL(S1, S2) strcoll (S1, S2)
 # include "fnmatch_loop.c"
 
 
@@ -194,6 +197,7 @@
 #   endif
 #  endif
 #  define MEMCHR(S, C, N) wmemchr (S, C, N)
+#  define STRCOLL(S1, S2) wcscoll (S1, S2)
 #  define WIDE_CHAR_VERSION 1
 
 #  undef IS_CHAR_CLASS
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fnmatch.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/fnmatch.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/fnmatch.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fnmatch.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2014 Free
-   Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+   2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
@@ -14,7 +14,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _FNMATCH_H
 #define _FNMATCH_H      1
@@ -31,23 +32,23 @@
 #undef  FNM_NOESCAPE
 #undef  FNM_PERIOD
 
-/* Bits set in the FLAGS argument to 'fnmatch'.  */
-#define FNM_PATHNAME    (1 << 0) /* No wildcard can ever match '/'.  */
+/* Bits set in the FLAGS argument to `fnmatch'.  */
+#define FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
 #define FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special chars.  */
-#define FNM_PERIOD      (1 << 2) /* Leading '.' is matched only explicitly.  */
+#define FNM_PERIOD      (1 << 2) /* Leading `.' is matched only explicitly.  */
 
 #if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
 # define FNM_FILE_NAME   FNM_PATHNAME   /* Preferred GNU name.  */
-# define FNM_LEADING_DIR (1 << 3)       /* Ignore '/...' after a match.  */
+# define FNM_LEADING_DIR (1 << 3)       /* Ignore `/...' after a match.  */
 # define FNM_CASEFOLD    (1 << 4)       /* Compare without regard to case.  */
 # define FNM_EXTMATCH    (1 << 5)       /* Use ksh-like extended matching. */
 #endif
 
-/* Value returned by 'fnmatch' if STRING does not match PATTERN.  */
+/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
 #define FNM_NOMATCH     1
 
 /* This value is returned if the implementation does not support
-   'fnmatch'.  Since this is not the case here it will never be
+   `fnmatch'.  Since this is not the case here it will never be
    returned but the conformance test suites still require the symbol
    to be defined.  */
 #ifdef _XOPEN_SOURCE
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fnmatch_loop.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fnmatch_loop.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fnmatch_loop.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fnmatch_loop.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1993, 1996-2006, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2009, 2010 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
@@ -12,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Match STRING against the file name pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
@@ -199,8 +201,6 @@
         case L_('['):
           {
             /* Nonzero if the sense of the character class is inverted.  */
-            const CHAR *p_init = p;
-            const CHAR *n_init = n;
             register bool not;
             CHAR cold;
             UCHAR fn;
@@ -215,7 +215,7 @@
               return FNM_NOMATCH;
 
             if (*n == L_('/') && (flags & FNM_FILE_NAME))
-              /* '/' cannot be matched.  */
+              /* `/' cannot be matched.  */
               return FNM_NOMATCH;
 
             not = (*p == L_('!') || (posixly_correct < 0 && *p == L_('^')));
@@ -227,8 +227,6 @@
             c = *p++;
             for (;;)
               {
-		bool is_range = false;
-
                 if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
                   {
                     if (*p == L_('\0'))
@@ -383,7 +381,7 @@
                           {
                             /* We found a table entry.  Now see whether the
                                character we are currently at has the same
-                               equivalence class value.  */
+                               equivalance class value.  */
                             int len = weights[idx & 0xffffff];
                             int32_t idx2;
                             const UCHAR *np = (const UCHAR *) n;
@@ -413,15 +411,12 @@
                   }
 #endif
                 else if (c == L_('\0'))
-                  {
-                    /* [ unterminated, treat as normal character.  */
-                    p = p_init;
-                    n = n_init;
-                    c = L_('[');
-                    goto normal_match;
-                  }
+                  /* [ (unterminated) loses.  */
+                  return FNM_NOMATCH;
                 else
                   {
+                    bool is_range = false;
+
 #ifdef _LIBC
                     bool is_seqval = false;
 
@@ -635,7 +630,7 @@
                         UCHAR cend = *p++;
 
 # ifdef WIDE_CHAR_VERSION
-                        /* Search in the 'names' array for the characters.  */
+                        /* Search in the `names' array for the characters.  */
                         fcollseq = __collseq_table_lookup (collseq, fn);
                         if (fcollseq == ~((uint32_t) 0))
                           /* XXX We don't know anything about the character
@@ -838,7 +833,7 @@
 #else
                         /* We use a boring value comparison of the character
                            values.  This is better than comparing using
-                           'strcoll' since the latter would have surprising
+                           `strcoll' since the latter would have surprising
                            and sometimes fatal consequences.  */
                         UCHAR cend = *p++;
 
@@ -1190,7 +1185,7 @@
         {
           struct patternlist *next;
 
-          /* I cannot believe it but 'strcat' is actually acceptable
+          /* I cannot believe it but `strcat' is actually acceptable
              here.  Match the entire string with the prefix from the
              pattern list and the rest of the pattern following the
              pattern list.  */
@@ -1272,6 +1267,7 @@
 #undef END
 #undef MEMPCPY
 #undef MEMCHR
+#undef STRCOLL
 #undef STRLEN
 #undef STRCAT
 #undef L_
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fopen.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fopen.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fopen.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fopen.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,26 +16,21 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* If the user's config.h happens to include <stdio.h>, let it include only
-   the system's <stdio.h> here, so that orig_fopen doesn't recurse to
-   rpl_fopen.  */
-#define __need_FILE
 #include <config.h>
 
 /* Get the original definition of fopen.  It might be defined as a macro.  */
+#define __need_FILE
 #include <stdio.h>
 #undef __need_FILE
 
-static FILE *
+static inline FILE *
 orig_fopen (const char *filename, const char *mode)
 {
   return fopen (filename, mode);
 }
 
 /* Specification.  */
-/* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates
-   this include because of the preliminary #include <stdio.h> above.  */
-#include "stdio.h"
+#include <stdio.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fstat.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fstat.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fstat.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fstat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* fstat() replacement.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_fstat doesn't recurse to
-   rpl_fstat.  */
-#define __need_system_sys_stat_h
-#include <config.h>
-
-/* Get the original definition of fstat.  It might be defined as a macro.  */
-#include <sys/types.h>
-#include <sys/stat.h>
-#if _GL_WINDOWS_64_BIT_ST_SIZE
-# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-# define stat _stati64
-# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-# define fstat _fstati64
-#endif
-#undef __need_system_sys_stat_h
-
-static int
-orig_fstat (int fd, struct stat *buf)
-{
-  return fstat (fd, buf);
-}
-
-/* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-#include "sys/stat.h"
-
-#include <errno.h>
-#include <unistd.h>
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-# include "msvc-inval.h"
-#endif
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-fstat_nothrow (int fd, struct stat *buf)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = orig_fstat (fd, buf);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#else
-# define fstat_nothrow orig_fstat
-#endif
-
-int
-rpl_fstat (int fd, struct stat *buf)
-{
-#if REPLACE_FCHDIR && REPLACE_OPEN_DIRECTORY
-  /* Handle the case when rpl_open() used a dummy file descriptor to work
-     around an open() that can't normally visit directories.  */
-  const char *name = _gl_directory_name (fd);
-  if (name != NULL)
-    return stat (name, buf);
-#endif
-
-  return fstat_nothrow (fd, buf);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fstrcmp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fstrcmp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fstrcmp.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fstrcmp.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions to make fuzzy comparisons between strings
-   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2014 Free
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2010 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -13,9 +13,33 @@
    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/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+   Derived from GNU diff 2.7, analyze.c et al.
+
+   The basic idea is to consider two vectors as similar if, when
+   transforming the first vector into the second vector through a
+   sequence of edits (inserts and deletes of one element each),
+   this sequence is short - or equivalently, if the ordered list
+   of elements that are untouched by these edits is long.  For a
+   good introduction to the subject, read about the "Levenshtein
+   distance" in Wikipedia.
+
+   The basic algorithm is described in:
+   "An O(ND) Difference Algorithm and its Variations", Eugene Myers,
+   Algorithmica Vol. 1 No. 2, 1986, pp. 251-266;
+   see especially section 4.2, which describes the variation used below.
+
+   The basic algorithm was independently discovered as described in:
+   "Algorithms for Approximate String Matching", E. Ukkonen,
+   Information and Control Vol. 64, 1985, pp. 100-118.
+
+   Unless the 'find_minimal' flag is set, this code uses the TOO_EXPENSIVE
+   heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N)
+   at the price of producing suboptimal output for large inputs with
+   many differences.  */
+
 #include <config.h>
 
 /* Specification.  */
@@ -179,6 +203,16 @@
   ctxt.xvec = string1;
   ctxt.yvec = string2;
 
+  /* Set TOO_EXPENSIVE to be approximate square root of input size,
+     bounded below by 256.  */
+  ctxt.too_expensive = 1;
+  for (i = xvec_length + yvec_length;
+       i != 0;
+       i >>= 2)
+    ctxt.too_expensive <<= 1;
+  if (ctxt.too_expensive < 256)
+    ctxt.too_expensive = 256;
+
   /* Allocate memory for fdiag and bdiag from a thread-local pool.  */
   fdiag_len = xvec_length + yvec_length + 3;
   gl_once (keys_init_once, keys_init);
@@ -218,7 +252,7 @@
 
   /* Now do the main comparison algorithm */
   ctxt.edit_count = - ctxt.edit_count_limit;
-  if (compareseq (0, xvec_length, 0, yvec_length, &ctxt)) /* Prob: 98% */
+  if (compareseq (0, xvec_length, 0, yvec_length, 0, &ctxt)) /* Prob: 98% */
     /* The edit_count passed the limit.  Hence the result would be
        < lower_bound.  We can return any value < lower_bound instead.  */
     return 0.0;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fstrcmp.h gettext-0.18.1.1/gettext-tools/gnulib-lib/fstrcmp.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/fstrcmp.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fstrcmp.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Fuzzy string comparison.
-   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2014 Free Software
+   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2010 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/full-write.c gettext-0.18.1.1/gettext-tools/gnulib-lib/full-write.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/full-write.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/full-write.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* An interface to read and write that retries (if necessary) until complete.
 
-   Copyright (C) 1993-1994, 1997-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 1997-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/full-write.h gettext-0.18.1.1/gettext-tools/gnulib-lib/full-write.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/full-write.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/full-write.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* An interface to write() that writes all it is asked to write.
 
-   Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fwriteerror.c gettext-0.18.1.1/gettext-tools/gnulib-lib/fwriteerror.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/fwriteerror.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fwriteerror.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@
      or if fclose failed, with two exceptions:
        - Ignore an fclose failure if there was no previous error, no data
          remains to be flushed, and fclose failed with EBADF.  That can
-         happen when a program like cp is invoked like this 'cp a b >&-'
+         happen when a program like cp is invoked like this `cp a b >&-'
          (i.e., with standard output closed) and doesn't generate any
          output (hence no previous error and nothing to be flushed).
        - Ignore an fclose failure due to EPIPE.  That can happen when a
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/fwriteerror.h gettext-0.18.1.1/gettext-tools/gnulib-lib/fwriteerror.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/fwriteerror.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/fwriteerror.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gcd.c gettext-0.18.1.1/gettext-tools/gnulib-lib/gcd.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/gcd.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gcd.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gcd.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gcd.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gcd.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gcd.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getdelim.c gettext-0.18.1.1/gettext-tools/gnulib-lib/getdelim.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/getdelim.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getdelim.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008,
+   2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -13,16 +13,18 @@
    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/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Ported from glibc by Simon Josefsson. */
 
+#include <config.h>
+
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below.  */
 #define _GL_ARG_NONNULL(params)
 
-#include <config.h>
-
 #include <stdio.h>
 
 #include <limits.h>
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getdtablesize.c gettext-0.18.1.1/gettext-tools/gnulib-lib/getdtablesize.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/getdtablesize.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getdtablesize.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* getdtablesize() function for platforms that don't have it.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,33 +22,9 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-# include <stdio.h>
+#include <stdio.h>
 
-# include "msvc-inval.h"
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-_setmaxstdio_nothrow (int newmax)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = _setmaxstdio (newmax);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#  define _setmaxstdio _setmaxstdio_nothrow
-# endif
-
-/* Cache for the previous getdtablesize () result.  Safe to cache because
-   Windows also lacks setrlimit.  */
+/* Cache for the previous getdtablesize () result.  */
 static int dtablesize;
 
 int
@@ -84,32 +60,4 @@
   return dtablesize;
 }
 
-#elif HAVE_GETDTABLESIZE
-
-# include <sys/resource.h>
-# undef getdtablesize
-
-int
-rpl_getdtablesize(void)
-{
-  /* To date, this replacement is only compiled for Cygwin 1.7.25,
-     which auto-increased the RLIMIT_NOFILE soft limit until it
-     hits the compile-time constant hard limit of 3200.  Although
-     that version of cygwin supported a child process inheriting
-     a smaller soft limit, the smaller limit is not enforced, so
-     we might as well just report the hard limit.  */
-  struct rlimit lim;
-  if (!getrlimit (RLIMIT_NOFILE, &lim) && lim.rlim_max != RLIM_INFINITY)
-    return lim.rlim_max;
-  return getdtablesize ();
-}
-
-#elif defined _SC_OPEN_MAX
-
-int
-getdtablesize (void)
-{
-  return sysconf (_SC_OPEN_MAX);
-}
-
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getline.c gettext-0.18.1.1/gettext-tools/gnulib-lib/getline.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/getline.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getline.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -12,7 +12,9 @@
    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/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Written by Simon Josefsson. */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getopt1.c gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt1.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/getopt1.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt1.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,6 +1,6 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
+   1998, 2004, 2006, 2009, 2010 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
@@ -141,11 +141,11 @@
           break;
 
         case 'c':
-          printf ("option c with value '%s'\n", optarg);
+          printf ("option c with value `%s'\n", optarg);
           break;
 
         case 'd':
-          printf ("option d with value '%s'\n", optarg);
+          printf ("option d with value `%s'\n", optarg);
           break;
 
         case '?':
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getopt.c gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/getopt.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt.c	2010-05-24 09:42:37.000000000 +0000
@@ -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-2014 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -41,15 +41,15 @@
 # include <wchar.h>
 #endif
 
-/* This version of 'getopt' appears to the caller like standard Unix 'getopt'
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
 
-   As 'getopt_long' works, it permutes the elements of ARGV so that,
+   As `getopt_long' works, it permutes the elements of ARGV so that,
    when it is done, all the options precede everything else.  Thus
    all application programs are extended to handle flexible argument order.
 
-   Using 'getopt' or setting the environment variable POSIXLY_CORRECT
+   Using `getopt' or setting the environment variable POSIXLY_CORRECT
    disables permutation.
    Then the behavior is completely standard.
 
@@ -58,24 +58,24 @@
 
 #include "getopt_int.h"
 
-/* For communication from 'getopt' to the caller.
-   When 'getopt' finds an option that takes an argument,
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
    the argument value is returned here.
-   Also, when 'ordering' is RETURN_IN_ORDER,
+   Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
 char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to 'getopt'.
+   and for communication between successive calls to `getopt'.
 
-   On entry to 'getopt', zero means this is the first call; initialize.
+   On entry to `getopt', zero means this is the first call; initialize.
 
-   When 'getopt' returns -1, this is the index of the first of the
+   When `getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, 'optind' communicates from one call to the next
+   Otherwise, `optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 /* 1003.2 says this must be 1 before any call.  */
@@ -137,7 +137,7 @@
    The other is elements [last_nonopt,optind), which contains all
    the options processed since those non-options were skipped.
 
-   'first_nonopt' and 'last_nonopt' are relocated so that they describe
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
    the new indices of the non-options in ARGV after they are moved.  */
 
 static void
@@ -154,7 +154,7 @@
      but it consists of two parts that need to be swapped next.  */
 
 #if defined _LIBC && defined USE_NONOPTION_FLAGS
-  /* First make sure the handling of the '__getopt_nonoption_flags'
+  /* First make sure the handling of the `__getopt_nonoption_flags'
      string can work normally.  Our top argument must be in the range
      of the string.  */
   if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
@@ -291,48 +291,48 @@
 
    If an element of ARGV starts with '-', and is not exactly "-" or "--",
    then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If 'getopt'
+   (aside from the initial '-') are option characters.  If `getopt'
    is called repeatedly, it returns successively each of the option characters
    from each of the option elements.
 
-   If 'getopt' finds another option character, it returns that character,
-   updating 'optind' and 'nextchar' so that the next call to 'getopt' can
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
    resume the scan with the following option character or ARGV-element.
 
-   If there are no more option characters, 'getopt' returns -1.
-   Then 'optind' is the index in ARGV of the first ARGV-element
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
    that is not an option.  (The ARGV-elements have been permuted
    so that those that are not options now come last.)
 
    OPTSTRING is a string containing the legitimate option characters.
    If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set 'opterr' to
+   return '?' after printing an error message.  If you set `opterr' to
    zero, the error message is suppressed but we still return '?'.
 
    If a char in OPTSTRING is followed by a colon, that means it wants an arg,
    so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in 'optarg'.  Two colons mean an option that
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
    wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in 'optarg', otherwise 'optarg' is set to zero.
+   it is returned in `optarg', otherwise `optarg' is set to zero.
 
-   If OPTSTRING starts with '-' or '+', it requests different methods of
+   If OPTSTRING starts with `-' or `+', it requests different methods of
    handling the non-option ARGV-elements.
    See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
 
-   Long-named options begin with '--' instead of '-'.
+   Long-named options begin with `--' instead of `-'.
    Their names may be abbreviated as long as the abbreviation is unique
    or is an exact match for some defined option.  If they have an
    argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a '=', or else the in next ARGV-element.
-   When 'getopt' finds a long-named option, it returns 0 if that option's
-   'flag' field is nonzero, the value of the option's 'val' field
-   if the 'flag' field is zero.
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
 
    The elements of ARGV aren't really const, because we permute them.
    But we pretend they're const in the prototype to be compatible
    with other systems.
 
-   LONGOPTS is a vector of 'struct option' terminated by an
+   LONGOPTS is a vector of `struct option' terminated by an
    element containing a name which is zero.
 
    LONGIND returns the index in LONGOPT of the long-named option found.
@@ -409,7 +409,7 @@
           d->__last_nonopt = d->optind;
         }
 
-      /* The special ARGV-element '--' means premature end of options.
+      /* The special ARGV-element `--' means premature end of options.
          Skip it like a null option,
          then exchange with previous non-options as if it were an option,
          then skip everything else like a non-option.  */
@@ -479,28 +479,23 @@
                             || !strchr (optstring, argv[d->optind][1])))))
     {
       char *nameend;
-      unsigned int namelen;
       const struct option *p;
       const struct option *pfound = NULL;
-      struct option_list
-      {
-        const struct option *p;
-        struct option_list *next;
-      } *ambig_list = NULL;
       int exact = 0;
+      int ambig = 0;
       int indfound = -1;
       int option_index;
 
       for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
         /* Do nothing.  */ ;
-      namelen = nameend - d->__nextchar;
 
       /* Test all long options for either exact match
          or abbreviated matches.  */
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
-        if (!strncmp (p->name, d->__nextchar, namelen))
+        if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
           {
-            if (namelen == (unsigned int) strlen (p->name))
+            if ((unsigned int) (nameend - d->__nextchar)
+                == (unsigned int) strlen (p->name))
               {
                 /* Exact match found.  */
                 pfound = p;
@@ -518,71 +513,35 @@
                      || pfound->has_arg != p->has_arg
                      || pfound->flag != p->flag
                      || pfound->val != p->val)
-              {
-                /* Second or later nonexact match found.  */
-                struct option_list *newp = malloc (sizeof (*newp));
-                newp->p = p;
-                newp->next = ambig_list;
-                ambig_list = newp;
-              }
+              /* Second or later nonexact match found.  */
+              ambig = 1;
           }
 
-      if (ambig_list != NULL && !exact)
+      if (ambig && !exact)
         {
           if (print_errors)
             {
-              struct option_list first;
-              first.p = pfound;
-              first.next = ambig_list;
-              ambig_list = &first;
-
 #if defined _LIBC && defined USE_IN_LIBIO
-              char *buf = NULL;
-              size_t buflen = 0;
+              char *buf;
 
-              FILE *fp = open_memstream (&buf, &buflen);
-              if (fp != NULL)
+              if (__asprintf (&buf, _("%s: option '%s' is ambiguous\n"),
+                              argv[0], argv[d->optind]) >= 0)
                 {
-                  fprintf (fp,
-                           _("%s: option '%s' is ambiguous; possibilities:"),
-                           argv[0], argv[d->optind]);
-
-                  do
-                    {
-                      fprintf (fp, " '--%s'", ambig_list->p->name);
-                      ambig_list = ambig_list->next;
-                    }
-                  while (ambig_list != NULL);
-
-                  fputc_unlocked ('\n', fp);
-
-                  if (__builtin_expect (fclose (fp) != EOF, 1))
-                    {
-                      _IO_flockfile (stderr);
+                  _IO_flockfile (stderr);
 
-                      int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                      ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-                      __fxprintf (NULL, "%s", buf);
+                  __fxprintf (NULL, "%s", buf);
 
-                      ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                      _IO_funlockfile (stderr);
+                  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                  _IO_funlockfile (stderr);
 
-                      free (buf);
-                    }
+                  free (buf);
                 }
 #else
-              fprintf (stderr,
-                       _("%s: option '%s' is ambiguous; possibilities:"),
+              fprintf (stderr, _("%s: option '%s' is ambiguous\n"),
                        argv[0], argv[d->optind]);
-              do
-                {
-                  fprintf (stderr, " '--%s'", ambig_list->p->name);
-                  ambig_list = ambig_list->next;
-                }
-              while (ambig_list != NULL);
-
-              fputc ('\n', stderr);
 #endif
             }
           d->__nextchar += strlen (d->__nextchar);
@@ -591,13 +550,6 @@
           return '?';
         }
 
-      while (ambig_list != NULL)
-        {
-          struct option_list *pn = ambig_list->next;
-          free (ambig_list);
-          ambig_list = pn;
-        }
-
       if (pfound != NULL)
         {
           option_index = indfound;
@@ -788,7 +740,7 @@
     char c = *d->__nextchar++;
     const char *temp = strchr (optstring, c);
 
-    /* Increment 'optind' when we start to process its last character.  */
+    /* Increment `optind' when we start to process its last character.  */
     if (*d->__nextchar == '\0')
       ++d->optind;
 
@@ -839,9 +791,6 @@
         int indfound = 0;
         int option_index;
 
-        if (longopts == NULL)
-          goto no_longs;
-
         /* This is an option that requires an argument.  */
         if (*d->__nextchar != '\0')
           {
@@ -887,7 +836,7 @@
             return c;
           }
         else
-          /* We already incremented 'd->optind' once;
+          /* We already incremented `d->optind' once;
              increment it again when taking next ARGV-elt as argument.  */
           d->optarg = argv[d->optind++];
 
@@ -1049,10 +998,8 @@
               }
             return pfound->val;
           }
-
-      no_longs:
-        d->__nextchar = NULL;
-        return 'W';   /* Let the application handle it.   */
+          d->__nextchar = NULL;
+          return 'W';   /* Let the application handle it.   */
       }
     if (temp[1] == ':')
       {
@@ -1114,7 +1061,7 @@
                   c = '?';
               }
             else
-              /* We already incremented 'optind' once;
+              /* We already incremented `optind' once;
                  increment it again when taking next ARGV-elt as argument.  */
               d->optarg = argv[d->optind++];
             d->__nextchar = NULL;
@@ -1177,7 +1124,7 @@
 #ifdef TEST
 
 /* Compile with -DTEST to make an executable for use in testing
-   the above definition of 'getopt'.  */
+   the above definition of `getopt'.  */
 
 int
 main (int argc, char **argv)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getopt.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/getopt.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,12 +16,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 _@GUARD_PREFIX@_GETOPT_H
+#ifndef _GL_GETOPT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  We must
    also inform the replacement unistd.h to not recursively use
@@ -32,10 +31,10 @@
 # undef _GL_SYSTEM_GETOPT
 #endif
 
-#ifndef _@GUARD_PREFIX@_GETOPT_H
+#ifndef _GL_GETOPT_H
 
 #ifndef __need_getopt
-# define _@GUARD_PREFIX@_GETOPT_H 1
+# define _GL_GETOPT_H 1
 #endif
 
 /* Ensure that DLL_VARIABLE is defined.  Since on OSF/1 4.0 and Irix 6.5
@@ -57,9 +56,7 @@
    linkers.  */
 #if defined __GETOPT_PREFIX && !defined __need_getopt
 # if !@HAVE_GETOPT_H@
-#  define __need_system_stdlib_h
 #  include <stdlib.h>
-#  undef __need_system_stdlib_h
 #  include <stdio.h>
 #  include <unistd.h>
 # endif
@@ -92,7 +89,7 @@
    getopt_long_only can permute argv; this is required for backward
    compatibility (e.g., for LSB 2.0.1).
 
-   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',
+   This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt',
    but it caused redefinition warnings if both unistd.h and getopt.h were
    included, since unistd.h includes getopt.h having previously defined
    __need_getopt.
@@ -138,29 +135,29 @@
 extern "C" {
 #endif
 
-/* For communication from 'getopt' to the caller.
-   When 'getopt' finds an option that takes an argument,
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
    the argument value is returned here.
-   Also, when 'ordering' is RETURN_IN_ORDER,
+   Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
 extern DLL_VARIABLE char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to 'getopt'.
+   and for communication between successive calls to `getopt'.
 
-   On entry to 'getopt', zero means this is the first call; initialize.
+   On entry to `getopt', zero means this is the first call; initialize.
 
-   When 'getopt' returns -1, this is the index of the first of the
+   When `getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, 'optind' communicates from one call to the next
+   Otherwise, `optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 extern DLL_VARIABLE int optind;
 
-/* Callers store zero here to inhibit the error message 'getopt' prints
+/* Callers store zero here to inhibit the error message `getopt' prints
    for unrecognized options.  */
 
 extern DLL_VARIABLE int opterr;
@@ -172,26 +169,25 @@
 #ifndef __need_getopt
 /* Describe the long-named options requested by the application.
    The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of 'struct option' terminated by an element containing a name which is
+   of `struct option' terminated by an element containing a name which is
    zero.
 
-   The field 'has_arg' is:
+   The field `has_arg' is:
    no_argument          (or 0) if the option does not take an argument,
    required_argument    (or 1) if the option requires an argument,
    optional_argument    (or 2) if the option takes an optional argument.
 
-   If the field 'flag' is not NULL, it points to a variable that is set
-   to the value given in the field 'val' when the option is found, but
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
    left unchanged if the option is not found.
 
-   To have a long-named option do something other than set an 'int' to
-   a compiled-in constant, such as set a value from 'optarg', set the
-   option's 'flag' field to zero and its 'val' field to a nonzero
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
    value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero 'flag' field, 'getopt'
-   returns the contents of the 'val' field.  */
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
 
-# if !GNULIB_defined_struct_option
 struct option
 {
   const char *name;
@@ -201,10 +197,8 @@
   int *flag;
   int val;
 };
-#  define GNULIB_defined_struct_option 1
-# endif
 
-/* Names for the values of the 'has_arg' field of 'struct option'.  */
+/* Names for the values of the `has_arg' field of `struct option'.  */
 
 # define no_argument            0
 # define required_argument      1
@@ -218,23 +212,23 @@
 
    Return the option character from OPTS just read.  Return -1 when
    there are no more options.  For unrecognized options, or options
-   missing arguments, 'optopt' is set to the option letter, and '?' is
+   missing arguments, `optopt' is set to the option letter, and '?' is
    returned.
 
    The OPTS string is a list of characters which are recognized option
    letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in 'optarg'.
+   takes an argument, to be placed in `optarg'.
 
    If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU 'getopt'.
+   optional.  This behavior is specific to the GNU `getopt'.
 
-   The argument '--' causes premature termination of argument
-   scanning, explicitly telling 'getopt' that there are no more
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
    options.
 
-   If OPTS begins with '-', then non-option arguments are treated as
+   If OPTS begins with `-', then non-option arguments are treated as
    arguments to the option '\1'.  This behavior is specific to the GNU
-   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
+   `getopt'.  If OPTS begins with `+', or POSIXLY_CORRECT is set in
    the environment, then do not permute arguments.  */
 
 extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
@@ -259,5 +253,5 @@
 /* Make sure we later can get all the definitions and declarations.  */
 #undef __need_getopt
 
-#endif /* _@GUARD_PREFIX@_GETOPT_H */
-#endif /* _@GUARD_PREFIX@_GETOPT_H */
+#endif /* getopt.h */
+#endif /* getopt.h */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/getopt_int.h gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt_int.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/getopt_int.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/getopt_int.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -40,7 +40,7 @@
    stop option processing when the first non-option is seen.
    This is what Unix does.
    This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using '+' as the first character
+   variable POSIXLY_CORRECT, or using `+' as the first character
    of the list of option characters, or by calling getopt.
 
    PERMUTE is the default.  We permute the contents of ARGV as we
@@ -52,12 +52,12 @@
    written to expect options and other ARGV-elements in any order
    and that care about the ordering of the two.  We describe each
    non-option ARGV-element as if it were the argument of an option
-   with character code 1.  Using '-' as the first character of the
+   with character code 1.  Using `-' as the first character of the
    list of option characters selects this mode of operation.
 
-   The special argument '--' forces an end of option-scanning regardless
-   of the value of 'ordering'.  In the case of RETURN_IN_ORDER, only
-   '--' can cause 'getopt' to return -1 with 'optind' != ARGC.  */
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
 
 enum __ord
   {
@@ -99,8 +99,8 @@
   /* Handle permutation of arguments.  */
 
   /* Describe the part of ARGV that contains non-options that have
-     been skipped.  'first_nonopt' is the index in ARGV of the first
-     of them; 'last_nonopt' is the index after the last of them.  */
+     been skipped.  `first_nonopt' is the index in ARGV of the first
+     of them; `last_nonopt' is the index after the last of them.  */
 
   int __first_nonopt;
   int __last_nonopt;
@@ -108,7 +108,7 @@
 #if defined _LIBC && defined USE_NONOPTION_FLAGS
   int __nonoption_flags_max_len;
   int __nonoption_flags_len;
-#endif
+# endif
 };
 
 /* The initializer is necessary to set OPTIND and OPTERR to their
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gettext.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gettext.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gettext.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gettext.h	2010-05-24 10:59:05.000000000 +0000
@@ -1,18 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -52,7 +54,7 @@
    it now, to make later inclusions of <libintl.h> a NOP.  */
 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
 # include <cstdlib>
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
 #  include <libintl.h>
 # endif
 #endif
@@ -79,7 +81,7 @@
     ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
 # undef dcngettext
 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N))
+    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
 # undef textdomain
 # define textdomain(Domainname) ((const char *) (Domainname))
 # undef bindtextdomain
@@ -91,12 +93,6 @@
 
 #endif
 
-/* Prefer gnulib's setlocale override over libintl's setlocale override.  */
-#ifdef GNULIB_defined_setlocale
-# undef setlocale
-# define setlocale rpl_setlocale
-#endif
-
 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
    translation is done at a different place in the code.
@@ -182,12 +178,9 @@
 
 #include <string.h>
 
-#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
-     /* || __STDC_VERSION__ >= 199901L */ )
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
-#else
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
-#endif
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+  (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
+   /* || __STDC_VERSION__ >= 199901L */ )
 
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
 #include <stdlib.h>
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gettimeofday.c gettext-0.18.1.1/gettext-tools/gnulib-lib/gettimeofday.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/gettimeofday.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gettimeofday.c	2010-05-24 09:42:37.000000000 +0000
@@ -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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
@@ -39,10 +40,10 @@
 static struct tm tm_zero_buffer;
 static struct tm *localtime_buffer_addr = &tm_zero_buffer;
 
-# undef localtime
+#undef localtime
 extern struct tm *localtime (time_t const *);
 
-# undef gmtime
+#undef gmtime
 extern struct tm *gmtime (time_t const *);
 
 /* This is a wrapper for localtime.  It is used only on systems for which
@@ -78,7 +79,7 @@
 
 #if TZSET_CLOBBERS_LOCALTIME
 
-# undef tzset
+#undef tzset
 extern void tzset (void);
 
 /* This is a wrapper for tzset, for systems on which tzset may clobber
@@ -109,18 +110,7 @@
   struct tm save = *localtime_buffer_addr;
 # endif
 
-# if defined timeval /* 'struct timeval' overridden by gnulib?  */
-#  undef timeval
-  struct timeval otv;
-  int result = gettimeofday (&otv, (struct timezone *) tz);
-  if (result == 0)
-    {
-      tv->tv_sec = otv.tv_sec;
-      tv->tv_usec = otv.tv_usec;
-    }
-# else
   int result = gettimeofday (tv, (struct timezone *) tz);
-# endif
 
 # if GETTIMEOFDAY_CLOBBERS_LOCALTIME
   *localtime_buffer_addr = save;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_anyhash_list1.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anyhash_list1.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_anyhash_list1.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anyhash_list1.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with another list.
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_anyhash_list2.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anyhash_list2.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_anyhash_list2.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anyhash_list2.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with another list.
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_anylinked_list1.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anylinked_list1.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_anylinked_list1.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anylinked_list1.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_anylinked_list2.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anylinked_list2.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_anylinked_list2.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_anylinked_list2.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_array_list.c gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_array_list.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_array_list.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_array_list.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by an array.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -120,7 +120,7 @@
   return list->count;
 }
 
-static const void * _GL_ATTRIBUTE_PURE
+static const void *
 gl_array_node_value (gl_list_t list, gl_list_node_t node)
 {
   uintptr_t index = NODE_TO_INDEX (node);
@@ -142,7 +142,7 @@
   return 0;
 }
 
-static gl_list_node_t _GL_ATTRIBUTE_PURE
+static gl_list_node_t
 gl_array_next_node (gl_list_t list, gl_list_node_t node)
 {
   uintptr_t index = NODE_TO_INDEX (node);
@@ -156,7 +156,7 @@
     return NULL;
 }
 
-static gl_list_node_t _GL_ATTRIBUTE_PURE
+static gl_list_node_t
 gl_array_previous_node (gl_list_t list, gl_list_node_t node)
 {
   uintptr_t index = NODE_TO_INDEX (node);
@@ -169,7 +169,7 @@
     return NULL;
 }
 
-static const void * _GL_ATTRIBUTE_PURE
+static const void *
 gl_array_get_at (gl_list_t list, size_t position)
 {
   size_t count = list->count;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_array_list.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_array_list.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_array_list.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_array_list.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by an array.
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/ghash.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/ghash.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/ghash.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/ghash.c	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/ghash.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/ghash.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/ghash.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/ghash.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/glist.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/glist.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/glist.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/glist.c	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/glist.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/glist.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/glist.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/glist.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gmessages.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gmessages.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gmessages.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gmessages.c	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gprimes.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gprimes.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gprimes.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gprimes.c	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gprimes.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gprimes.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gprimes.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gprimes.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstrfuncs.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstrfuncs.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstrfuncs.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstrfuncs.c	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstrfuncs.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstrfuncs.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstrfuncs.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstrfuncs.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstring.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstring.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstring.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstring.c	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstring.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstring.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gstring.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gstring.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib/gtypes.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gtypes.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib/gtypes.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib/gtypes.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glibconfig.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glibconfig.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glibconfig.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glibconfig.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glib.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glib.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glib.in.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glib.in.h	2010-05-24 09:42:37.000000000 +0000
@@ -9,7 +9,7 @@
  * This library 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_linkedhash_list.c gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_linkedhash_list.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_linkedhash_list.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_linkedhash_list.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with a linked list.
-   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@
 #include "gl_anyhash_list2.h"
 
 /* Resize the hash table if needed, after list->count was incremented.  */
-static void
+static inline void
 hash_resize_after_add (gl_list_t list)
 {
   size_t count = list->count;
@@ -53,7 +53,7 @@
 }
 
 /* Add a node to the hash table structure.  */
-static void
+static inline void
 add_to_bucket (gl_list_t list, gl_list_node_t node)
 {
   size_t bucket = node->h.hashcode % list->table_size;
@@ -65,7 +65,7 @@
 #define add_to_bucket(list,node)  ((add_to_bucket) (list, node), 0)
 
 /* Remove a node from the hash table structure.  */
-static void
+static inline void
 remove_from_bucket (gl_list_t list, gl_list_node_t node)
 {
   size_t bucket = node->h.hashcode % list->table_size;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_linkedhash_list.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_linkedhash_list.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_linkedhash_list.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_linkedhash_list.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with a linked list.
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_list.c gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_list.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_list.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_list.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,3 +1,283 @@
+/* Abstract sequential list data type.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2006.
+
+   This 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>
-#define GL_LIST_INLINE _GL_EXTERN_INLINE
+
+/* Specification.  */
 #include "gl_list.h"
+
+#if !HAVE_INLINE
+
+/* Define all functions of this file as inline accesses to the
+   struct gl_list_implementation.
+   Use #define to avoid a warning because of extern vs. static.  */
+
+gl_list_t
+gl_list_nx_create_empty (gl_list_implementation_t implementation,
+                         gl_listelement_equals_fn equals_fn,
+                         gl_listelement_hashcode_fn hashcode_fn,
+                         gl_listelement_dispose_fn dispose_fn,
+                         bool allow_duplicates)
+{
+  return implementation->nx_create_empty (implementation, equals_fn,
+                                          hashcode_fn, dispose_fn,
+                                          allow_duplicates);
+}
+
+gl_list_t
+gl_list_nx_create (gl_list_implementation_t implementation,
+                   gl_listelement_equals_fn equals_fn,
+                   gl_listelement_hashcode_fn hashcode_fn,
+                   gl_listelement_dispose_fn dispose_fn,
+                   bool allow_duplicates,
+                   size_t count, const void **contents)
+{
+  return implementation->nx_create (implementation, equals_fn, hashcode_fn,
+                                    dispose_fn, allow_duplicates, count,
+                                    contents);
+}
+
+size_t
+gl_list_size (gl_list_t list)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->size (list);
+}
+
+const void *
+gl_list_node_value (gl_list_t list, gl_list_node_t node)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->node_value (list, node);
+}
+
+int
+gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node,
+                           const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->node_nx_set_value (list, node, elt);
+}
+
+gl_list_node_t
+gl_list_next_node (gl_list_t list, gl_list_node_t node)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->next_node (list, node);
+}
+
+gl_list_node_t
+gl_list_previous_node (gl_list_t list, gl_list_node_t node)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->previous_node (list, node);
+}
+
+const void *
+gl_list_get_at (gl_list_t list, size_t position)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->get_at (list, position);
+}
+
+gl_list_node_t
+gl_list_nx_set_at (gl_list_t list, size_t position, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->nx_set_at (list, position, elt);
+}
+
+gl_list_node_t
+gl_list_search (gl_list_t list, const void *elt)
+{
+  size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->search_from_to (list, 0, size, elt);
+}
+
+gl_list_node_t
+gl_list_search_from (gl_list_t list, size_t start_index, const void *elt)
+{
+  size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->search_from_to (list, start_index, size, elt);
+}
+
+gl_list_node_t
+gl_list_search_from_to (gl_list_t list, size_t start_index, size_t end_index, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->search_from_to (list, start_index, end_index, elt);
+}
+
+size_t
+gl_list_indexof (gl_list_t list, const void *elt)
+{
+  size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->indexof_from_to (list, 0, size, elt);
+}
+
+size_t
+gl_list_indexof_from (gl_list_t list, size_t start_index, const void *elt)
+{
+  size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->indexof_from_to (list, start_index, size, elt);
+}
+
+size_t
+gl_list_indexof_from_to (gl_list_t list, size_t start_index, size_t end_index, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->indexof_from_to (list, start_index, end_index, elt);
+}
+
+gl_list_node_t
+gl_list_nx_add_first (gl_list_t list, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->nx_add_first (list, elt);
+}
+
+gl_list_node_t
+gl_list_nx_add_last (gl_list_t list, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->nx_add_last (list, elt);
+}
+
+gl_list_node_t
+gl_list_nx_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->nx_add_before (list, node, elt);
+}
+
+gl_list_node_t
+gl_list_nx_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->nx_add_after (list, node, elt);
+}
+
+gl_list_node_t
+gl_list_nx_add_at (gl_list_t list, size_t position, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->nx_add_at (list, position, elt);
+}
+
+bool
+gl_list_remove_node (gl_list_t list, gl_list_node_t node)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->remove_node (list, node);
+}
+
+bool
+gl_list_remove_at (gl_list_t list, size_t position)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->remove_at (list, position);
+}
+
+bool
+gl_list_remove (gl_list_t list, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->remove_elt (list, elt);
+}
+
+void
+gl_list_free (gl_list_t list)
+{
+  ((const struct gl_list_impl_base *) list)->vtable->list_free (list);
+}
+
+gl_list_iterator_t
+gl_list_iterator (gl_list_t list)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->iterator (list);
+}
+
+gl_list_iterator_t
+gl_list_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->iterator_from_to (list, start_index, end_index);
+}
+
+bool
+gl_list_iterator_next (gl_list_iterator_t *iterator,
+                       const void **eltp, gl_list_node_t *nodep)
+{
+  return iterator->vtable->iterator_next (iterator, eltp, nodep);
+}
+
+void
+gl_list_iterator_free (gl_list_iterator_t *iterator)
+{
+  iterator->vtable->iterator_free (iterator);
+}
+
+gl_list_node_t
+gl_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->sortedlist_search (list, compar, elt);
+}
+
+gl_list_node_t
+gl_sortedlist_search_from_to (gl_list_t list, gl_listelement_compar_fn compar, size_t start_index, size_t end_index, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->sortedlist_search_from_to (list, compar, start_index, end_index,
+                                      elt);
+}
+
+size_t
+gl_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->sortedlist_indexof (list, compar, elt);
+}
+
+size_t
+gl_sortedlist_indexof_from_to (gl_list_t list, gl_listelement_compar_fn compar, size_t start_index, size_t end_index, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->sortedlist_indexof_from_to (list, compar, start_index, end_index,
+                                       elt);
+}
+
+gl_list_node_t
+gl_sortedlist_nx_add (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->sortedlist_nx_add (list, compar, elt);
+}
+
+bool
+gl_sortedlist_remove (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
+{
+  return ((const struct gl_list_impl_base *) list)->vtable
+         ->sortedlist_remove (list, compar, elt);
+}
+
+#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_list.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_list.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_list.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_list.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -21,14 +21,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef GL_LIST_INLINE
-# define GL_LIST_INLINE _GL_INLINE
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -128,8 +120,6 @@
 /* Type representing a list datatype implementation.  */
 typedef const struct gl_list_implementation * gl_list_implementation_t;
 
-#if 0 /* Unless otherwise specified, these are defined inline below.  */
-
 /* Create an empty list.
    IMPLEMENTATION is one of GL_ARRAY_LIST, GL_CARRAY_LIST, GL_LINKED_LIST,
    GL_AVLTREE_LIST, GL_RBTREE_LIST, GL_LINKEDHASH_LIST, GL_AVLTREEHASH_LIST,
@@ -139,12 +129,13 @@
    DISPOSE_FN is an element disposal function or NULL.
    ALLOW_DUPLICATES is false if duplicate elements shall not be allowed in
    the list. The implementation may verify this at runtime.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_t gl_list_create_empty (gl_list_implementation_t implementation,
                                        gl_listelement_equals_fn equals_fn,
                                        gl_listelement_hashcode_fn hashcode_fn,
                                        gl_listelement_dispose_fn dispose_fn,
                                        bool allow_duplicates);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_t gl_list_nx_create_empty (gl_list_implementation_t implementation,
                                           gl_listelement_equals_fn equals_fn,
@@ -163,13 +154,14 @@
    the list. The implementation may verify this at runtime.
    COUNT is the number of initial elements.
    CONTENTS[0..COUNT-1] is the initial contents.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_t gl_list_create (gl_list_implementation_t implementation,
                                  gl_listelement_equals_fn equals_fn,
                                  gl_listelement_hashcode_fn hashcode_fn,
                                  gl_listelement_dispose_fn dispose_fn,
                                  bool allow_duplicates,
                                  size_t count, const void **contents);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_t gl_list_nx_create (gl_list_implementation_t implementation,
                                     gl_listelement_equals_fn equals_fn,
@@ -185,9 +177,10 @@
 extern const void * gl_list_node_value (gl_list_t list, gl_list_node_t node);
 
 /* Replace the element value represented by a list node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern void gl_list_node_set_value (gl_list_t list, gl_list_node_t node,
                                     const void *elt);
+#endif
 /* Likewise.  Return 0 upon success, -1 upon out-of-memory.  */
 extern int gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node,
                                       const void *elt)
@@ -211,9 +204,10 @@
 /* Replace the element at a given position in the list.
    POSITION must be >= 0 and < gl_list_size (list).
    Return its node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_set_at (gl_list_t list, size_t position,
                                       const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_set_at (gl_list_t list, size_t position,
                                          const void *elt)
@@ -259,8 +253,9 @@
 
 /* Add an element as the first element of the list.
    Return its node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_first (gl_list_t list, const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_first (gl_list_t list, const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
@@ -270,8 +265,9 @@
 
 /* Add an element as the last element of the list.
    Return its node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_last (gl_list_t list, const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_last (gl_list_t list, const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
@@ -281,9 +277,10 @@
 
 /* Add an element before a given element node of the list.
    Return its node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_before (gl_list_t list, gl_list_node_t node,
                                           const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_before (gl_list_t list,
                                              gl_list_node_t node,
@@ -295,9 +292,10 @@
 
 /* Add an element after a given element node of the list.
    Return its node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_after (gl_list_t list, gl_list_node_t node,
                                          const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_after (gl_list_t list, gl_list_node_t node,
                                             const void *elt)
@@ -308,9 +306,10 @@
 
 /* Add an element at a given position in the list.
    POSITION must be >= 0 and <= gl_list_size (list).  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_at (gl_list_t list, size_t position,
                                       const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_at (gl_list_t list, size_t position,
                                          const void *elt)
@@ -336,8 +335,6 @@
    (But this call does not free the elements of the list.)  */
 extern void gl_list_free (gl_list_t list);
 
-#endif /* End of inline and gl_xlist.h-defined functions.  */
-
 /* --------------------- gl_list_iterator_t Data Type --------------------- */
 
 /* Functions for iterating through a list.  */
@@ -357,8 +354,6 @@
   size_t i; size_t j;
 } gl_list_iterator_t;
 
-#if 0 /* These are defined inline below.  */
-
 /* Create an iterator traversing a list.
    The list contents must not be modified while the iterator is in use,
    except for replacing or removing the last returned element.  */
@@ -381,8 +376,6 @@
 /* Free an iterator.  */
 extern void gl_list_iterator_free (gl_list_iterator_t *iterator);
 
-#endif /* End of inline functions.  */
-
 /* ---------------------- Sorted gl_list_t Data Type ---------------------- */
 
 /* The following functions are for lists without duplicates where the
@@ -392,8 +385,6 @@
    NULL denotes pointer comparison.  */
 typedef int (*gl_listelement_compar_fn) (const void *elt1, const void *elt2);
 
-#if 0 /* Unless otherwise specified, these are defined inline below.  */
-
 /* Search whether an element is already in the list.
    The list is assumed to be sorted with COMPAR.
    Return its node if found, or NULL if not present in the list.
@@ -443,10 +434,11 @@
 /* Add an element at the appropriate position in the list.
    The list is assumed to be sorted with COMPAR.
    Return its node.  */
-/* declared in gl_xlist.h */
+#if 0 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_sortedlist_add (gl_list_t list,
                                          gl_listelement_compar_fn compar,
                                          const void *elt);
+#endif
 /* Likewise.  Return NULL upon out-of-memory.  */
 extern gl_list_node_t gl_sortedlist_nx_add (gl_list_t list,
                                             gl_listelement_compar_fn compar,
@@ -465,8 +457,6 @@
                                   gl_listelement_compar_fn compar,
                                   const void *elt);
 
-#endif /* End of inline and gl_xlist.h-defined functions.  */
-
 /* ------------------------ Implementation Details ------------------------ */
 
 struct gl_list_implementation
@@ -549,10 +539,14 @@
   bool allow_duplicates;
 };
 
-/* Define all functions of this file as accesses to the
-   struct gl_list_implementation.  */
+#if HAVE_INLINE
+
+/* Define all functions of this file as inline accesses to the
+   struct gl_list_implementation.
+   Use #define to avoid a warning because of extern vs. static.  */
 
-GL_LIST_INLINE gl_list_t
+# define gl_list_nx_create_empty gl_list_nx_create_empty_inline
+static inline gl_list_t
 gl_list_nx_create_empty (gl_list_implementation_t implementation,
                          gl_listelement_equals_fn equals_fn,
                          gl_listelement_hashcode_fn hashcode_fn,
@@ -564,7 +558,8 @@
                                           allow_duplicates);
 }
 
-GL_LIST_INLINE gl_list_t
+# define gl_list_nx_create gl_list_nx_create_inline
+static inline gl_list_t
 gl_list_nx_create (gl_list_implementation_t implementation,
                    gl_listelement_equals_fn equals_fn,
                    gl_listelement_hashcode_fn hashcode_fn,
@@ -577,24 +572,24 @@
                                     contents);
 }
 
-GL_LIST_INLINE size_t
+# define gl_list_size gl_list_size_inline
+static inline size_t
 gl_list_size (gl_list_t list)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->size (list);
 }
 
-GL_LIST_INLINE const void *
+# define gl_list_node_value gl_list_node_value_inline
+static inline const void *
 gl_list_node_value (gl_list_t list, gl_list_node_t node)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->node_value (list, node);
 }
 
-GL_LIST_INLINE int
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_node_nx_set_value gl_list_node_nx_set_value_inline
+static inline int
 gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node,
                            const void *elt)
 {
@@ -602,38 +597,40 @@
          ->node_nx_set_value (list, node, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_list_next_node gl_list_next_node_inline
+static inline gl_list_node_t
 gl_list_next_node (gl_list_t list, gl_list_node_t node)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->next_node (list, node);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_list_previous_node gl_list_previous_node_inline
+static inline gl_list_node_t
 gl_list_previous_node (gl_list_t list, gl_list_node_t node)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->previous_node (list, node);
 }
 
-GL_LIST_INLINE const void *
+# define gl_list_get_at gl_list_get_at_inline
+static inline const void *
 gl_list_get_at (gl_list_t list, size_t position)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->get_at (list, position);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_nx_set_at gl_list_nx_set_at_inline
+static inline gl_list_node_t
 gl_list_nx_set_at (gl_list_t list, size_t position, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->nx_set_at (list, position, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_list_search gl_list_search_inline
+static inline gl_list_node_t
 gl_list_search (gl_list_t list, const void *elt)
 {
   size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
@@ -641,7 +638,8 @@
          ->search_from_to (list, 0, size, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_list_search_from gl_list_search_from_inline
+static inline gl_list_node_t
 gl_list_search_from (gl_list_t list, size_t start_index, const void *elt)
 {
   size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
@@ -649,7 +647,8 @@
          ->search_from_to (list, start_index, size, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_list_search_from_to gl_list_search_from_to_inline
+static inline gl_list_node_t
 gl_list_search_from_to (gl_list_t list, size_t start_index, size_t end_index,
                         const void *elt)
 {
@@ -657,7 +656,8 @@
          ->search_from_to (list, start_index, end_index, elt);
 }
 
-GL_LIST_INLINE size_t
+# define gl_list_indexof gl_list_indexof_inline
+static inline size_t
 gl_list_indexof (gl_list_t list, const void *elt)
 {
   size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
@@ -665,7 +665,8 @@
          ->indexof_from_to (list, 0, size, elt);
 }
 
-GL_LIST_INLINE size_t
+# define gl_list_indexof_from gl_list_indexof_from_inline
+static inline size_t
 gl_list_indexof_from (gl_list_t list, size_t start_index, const void *elt)
 {
   size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list);
@@ -673,7 +674,8 @@
          ->indexof_from_to (list, start_index, size, elt);
 }
 
-GL_LIST_INLINE size_t
+# define gl_list_indexof_from_to gl_list_indexof_from_to_inline
+static inline size_t
 gl_list_indexof_from_to (gl_list_t list, size_t start_index, size_t end_index,
                          const void *elt)
 {
@@ -681,118 +683,118 @@
          ->indexof_from_to (list, start_index, end_index, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_nx_add_first gl_list_nx_add_first_inline
+static inline gl_list_node_t
 gl_list_nx_add_first (gl_list_t list, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->nx_add_first (list, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_nx_add_last gl_list_nx_add_last_inline
+static inline gl_list_node_t
 gl_list_nx_add_last (gl_list_t list, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->nx_add_last (list, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_nx_add_before gl_list_nx_add_before_inline
+static inline gl_list_node_t
 gl_list_nx_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->nx_add_before (list, node, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_nx_add_after gl_list_nx_add_after_inline
+static inline gl_list_node_t
 gl_list_nx_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->nx_add_after (list, node, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_list_nx_add_at gl_list_nx_add_at_inline
+static inline gl_list_node_t
 gl_list_nx_add_at (gl_list_t list, size_t position, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->nx_add_at (list, position, elt);
 }
 
-GL_LIST_INLINE bool
+# define gl_list_remove_node gl_list_remove_node_inline
+static inline bool
 gl_list_remove_node (gl_list_t list, gl_list_node_t node)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->remove_node (list, node);
 }
 
-GL_LIST_INLINE bool
+# define gl_list_remove_at gl_list_remove_at_inline
+static inline bool
 gl_list_remove_at (gl_list_t list, size_t position)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->remove_at (list, position);
 }
 
-GL_LIST_INLINE bool
+# define gl_list_remove gl_list_remove_inline
+static inline bool
 gl_list_remove (gl_list_t list, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->remove_elt (list, elt);
 }
 
-GL_LIST_INLINE void
+# define gl_list_free gl_list_free_inline
+static inline void
 gl_list_free (gl_list_t list)
 {
   ((const struct gl_list_impl_base *) list)->vtable->list_free (list);
 }
 
-GL_LIST_INLINE gl_list_iterator_t
+# define gl_list_iterator gl_list_iterator_inline
+static inline gl_list_iterator_t
 gl_list_iterator (gl_list_t list)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->iterator (list);
 }
 
-GL_LIST_INLINE gl_list_iterator_t
+# define gl_list_iterator_from_to gl_list_iterator_from_to_inline
+static inline gl_list_iterator_t
 gl_list_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->iterator_from_to (list, start_index, end_index);
 }
 
-GL_LIST_INLINE bool
+# define gl_list_iterator_next gl_list_iterator_next_inline
+static inline bool
 gl_list_iterator_next (gl_list_iterator_t *iterator,
                        const void **eltp, gl_list_node_t *nodep)
 {
   return iterator->vtable->iterator_next (iterator, eltp, nodep);
 }
 
-GL_LIST_INLINE void
+# define gl_list_iterator_free gl_list_iterator_free_inline
+static inline void
 gl_list_iterator_free (gl_list_iterator_t *iterator)
 {
   iterator->vtable->iterator_free (iterator);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_sortedlist_search gl_sortedlist_search_inline
+static inline gl_list_node_t
 gl_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->sortedlist_search (list, compar, elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
+# define gl_sortedlist_search_from_to gl_sortedlist_search_from_to_inline
+static inline gl_list_node_t
 gl_sortedlist_search_from_to (gl_list_t list, gl_listelement_compar_fn compar, size_t start_index, size_t end_index, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
@@ -800,14 +802,16 @@
                                       elt);
 }
 
-GL_LIST_INLINE size_t
+# define gl_sortedlist_indexof gl_sortedlist_indexof_inline
+static inline size_t
 gl_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->sortedlist_indexof (list, compar, elt);
 }
 
-GL_LIST_INLINE size_t
+# define gl_sortedlist_indexof_from_to gl_sortedlist_indexof_from_to_inline
+static inline size_t
 gl_sortedlist_indexof_from_to (gl_list_t list, gl_listelement_compar_fn compar, size_t start_index, size_t end_index, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
@@ -815,27 +819,26 @@
                                        elt);
 }
 
-GL_LIST_INLINE gl_list_node_t
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  __attribute__ ((__warn_unused_result__))
-#endif
+# define gl_sortedlist_nx_add gl_sortedlist_nx_add_inline
+static inline gl_list_node_t
 gl_sortedlist_nx_add (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->sortedlist_nx_add (list, compar, elt);
 }
 
-GL_LIST_INLINE bool
+# define gl_sortedlist_remove gl_sortedlist_remove_inline
+static inline bool
 gl_sortedlist_remove (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
 {
   return ((const struct gl_list_impl_base *) list)->vtable
          ->sortedlist_remove (list, compar, elt);
 }
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif
 
-_GL_INLINE_HEADER_END
-
 #endif /* _GL_LIST_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glthread/lock.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/lock.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glthread/lock.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/lock.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -629,7 +630,7 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
 /* -------------------------- gl_lock_t datatype -------------------------- */
 
@@ -682,7 +683,7 @@
 /* In this file, the waitqueues are implemented as circular arrays.  */
 #define gl_waitqueue_t gl_carray_waitqueue_t
 
-static void
+static inline void
 gl_waitqueue_init (gl_waitqueue_t *wq)
 {
   wq->array = NULL;
@@ -743,7 +744,7 @@
 }
 
 /* Notifies the first thread from a wait queue and dequeues it.  */
-static void
+static inline void
 gl_waitqueue_notify_first (gl_waitqueue_t *wq)
 {
   SetEvent (wq->array[wq->offset + 0]);
@@ -754,7 +755,7 @@
 }
 
 /* Notifies all threads from a wait queue and dequeues them all.  */
-static void
+static inline void
 gl_waitqueue_notify_all (gl_waitqueue_t *wq)
 {
   unsigned int i;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glthread/lock.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/lock.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glthread/lock.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/lock.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -613,17 +614,16 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 # ifdef __cplusplus
 extern "C" {
 # endif
 
-/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
-   Mutex, Semaphore types, because
+/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex,
+   Semaphore types, because
      - we need only to synchronize inside a single process (address space),
        not inter-process locking,
      - we don't need to support trylock operations.  (TryEnterCriticalSection
@@ -709,9 +709,9 @@
 
 /* --------------------- gl_recursive_lock_t datatype --------------------- */
 
-/* The native Windows documentation says that CRITICAL_SECTION already
-   implements a recursive lock.  But we need not rely on it: It's easy to
-   implement a recursive lock without this assumption.  */
+/* The Win32 documentation says that CRITICAL_SECTION already implements a
+   recursive lock.  But we need not rely on it: It's easy to implement a
+   recursive lock without this assumption.  */
 
 typedef struct
         {
@@ -763,7 +763,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glthread/threadlib.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/threadlib.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glthread/threadlib.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/threadlib.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glthread/tls.c gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/tls.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/glthread/tls.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/tls.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This 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,7 +54,7 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
 #endif
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/glthread/tls.h gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/tls.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/glthread/tls.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/glthread/tls.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,9 +220,8 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 /* ------------------------- gl_tls_key_t datatype ------------------------- */
@@ -242,7 +241,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_xlist.c gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_xlist.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_xlist.c	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_xlist.c	2010-05-24 09:42:37.000000000 +0000
@@ -1,3 +1,128 @@
+/* Abstract sequential list data type, with out-of-memory checking.
+   Copyright (C) 2009, 2010 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 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>
-#define GL_XLIST_INLINE _GL_EXTERN_INLINE
+
+/* Specification.  */
 #include "gl_xlist.h"
+
+#if !HAVE_INLINE
+
+gl_list_t
+gl_list_create_empty (gl_list_implementation_t implementation,
+                      gl_listelement_equals_fn equals_fn,
+                      gl_listelement_hashcode_fn hashcode_fn,
+                      gl_listelement_dispose_fn dispose_fn,
+                      bool allow_duplicates)
+{
+  gl_list_t result =
+    gl_list_nx_create_empty (implementation, equals_fn, hashcode_fn, dispose_fn,
+                             allow_duplicates);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_t
+gl_list_create (gl_list_implementation_t implementation,
+                gl_listelement_equals_fn equals_fn,
+                gl_listelement_hashcode_fn hashcode_fn,
+                gl_listelement_dispose_fn dispose_fn,
+                bool allow_duplicates,
+                size_t count, const void **contents)
+{
+  gl_list_t result =
+    gl_list_nx_create (implementation, equals_fn, hashcode_fn, dispose_fn,
+                       allow_duplicates, count, contents);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+void
+gl_list_node_set_value (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  int result = gl_list_node_nx_set_value (list, node, elt);
+  if (result < 0)
+    xalloc_die ();
+}
+
+gl_list_node_t
+gl_list_set_at (gl_list_t list, size_t position, const void *elt)
+{
+  gl_list_node_t result = gl_list_nx_set_at (list, position, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_node_t
+gl_list_add_first (gl_list_t list, const void *elt)
+{
+  gl_list_node_t result = gl_list_nx_add_first (list, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_node_t
+gl_list_add_last (gl_list_t list, const void *elt)
+{
+  gl_list_node_t result = gl_list_nx_add_last (list, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_node_t
+gl_list_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  gl_list_node_t result = gl_list_nx_add_before (list, node, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_node_t
+gl_list_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  gl_list_node_t result = gl_list_nx_add_after (list, node, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_node_t
+gl_list_add_at (gl_list_t list, size_t position, const void *elt)
+{
+  gl_list_node_t result = gl_list_nx_add_at (list, position, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+gl_list_node_t
+gl_sortedlist_add (gl_list_t list, gl_listelement_compar_fn compar,
+                   const void *elt)
+{
+  gl_list_node_t result = gl_sortedlist_nx_add (list, compar, elt);
+  if (result == NULL)
+    xalloc_die ();
+  return result;
+}
+
+#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/gl_xlist.h gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_xlist.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/gl_xlist.h	2014-10-16 06:00:31.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/gl_xlist.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type, with out-of-memory checking.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
@@ -21,14 +21,6 @@
 #include "gl_list.h"
 #include "xalloc.h"
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef GL_XLIST_INLINE
-# define GL_XLIST_INLINE _GL_INLINE
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,7 +28,6 @@
 /* These functions are thin wrappers around the corresponding functions with
    _nx_ infix from gl_list.h.  Upon out-of-memory, they invoke xalloc_die (),
    instead of returning an error indicator.  */
-#if 0 /* These are defined inline below.  */
 extern gl_list_t gl_list_create_empty (gl_list_implementation_t implementation,
                                        gl_listelement_equals_fn equals_fn,
                                        gl_listelement_hashcode_fn hashcode_fn,
@@ -63,9 +54,11 @@
 extern gl_list_node_t gl_sortedlist_add (gl_list_t list,
                                          gl_listelement_compar_fn compar,
                                          const void *elt);
-#endif
 
-GL_XLIST_INLINE gl_list_t
+#if HAVE_INLINE
+
+# define gl_list_create_empty gl_list_create_empty_inline
+static inline gl_list_t
 gl_list_create_empty (gl_list_implementation_t implementation,
                       gl_listelement_equals_fn equals_fn,
                       gl_listelement_hashcode_fn hashcode_fn,
@@ -80,7 +73,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_t
+# define gl_list_create gl_list_create_inline
+static inline gl_list_t
 gl_list_create (gl_list_implementation_t implementation,
                 gl_listelement_equals_fn equals_fn,
                 gl_listelement_hashcode_fn hashcode_fn,
@@ -96,7 +90,8 @@
   return result;
 }
 
-GL_XLIST_INLINE void
+# define gl_list_node_set_value gl_list_node_set_value_inline
+static inline void
 gl_list_node_set_value (gl_list_t list, gl_list_node_t node, const void *elt)
 {
   int result = gl_list_node_nx_set_value (list, node, elt);
@@ -104,7 +99,8 @@
     xalloc_die ();
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_list_set_at gl_list_set_at_inline
+static inline gl_list_node_t
 gl_list_set_at (gl_list_t list, size_t position, const void *elt)
 {
   gl_list_node_t result = gl_list_nx_set_at (list, position, elt);
@@ -113,7 +109,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_list_add_first gl_list_add_first_inline
+static inline gl_list_node_t
 gl_list_add_first (gl_list_t list, const void *elt)
 {
   gl_list_node_t result = gl_list_nx_add_first (list, elt);
@@ -122,7 +119,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_list_add_last gl_list_add_last_inline
+static inline gl_list_node_t
 gl_list_add_last (gl_list_t list, const void *elt)
 {
   gl_list_node_t result = gl_list_nx_add_last (list, elt);
@@ -131,7 +129,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_list_add_before gl_list_add_before_inline
+static inline gl_list_node_t
 gl_list_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
 {
   gl_list_node_t result = gl_list_nx_add_before (list, node, elt);
@@ -140,7 +139,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_list_add_after gl_list_add_after_inline
+static inline gl_list_node_t
 gl_list_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
 {
   gl_list_node_t result = gl_list_nx_add_after (list, node, elt);
@@ -149,7 +149,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_list_add_at gl_list_add_at_inline
+static inline gl_list_node_t
 gl_list_add_at (gl_list_t list, size_t position, const void *elt)
 {
   gl_list_node_t result = gl_list_nx_add_at (list, position, elt);
@@ -158,7 +159,8 @@
   return result;
 }
 
-GL_XLIST_INLINE gl_list_node_t
+# define gl_sortedlist_add gl_sortedlist_add_inline
+static inline gl_list_node_t
 gl_sortedlist_add (gl_list_t list, gl_listelement_compar_fn compar,
                    const void *elt)
 {
@@ -168,10 +170,10 @@
   return result;
 }
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif
 
-_GL_INLINE_HEADER_END
-
 #endif /* _GL_XLIST_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/hash.h gettext-0.18.1.1/gettext-tools/gnulib-lib/hash.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/hash.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/hash.h	2010-05-24 09:42:37.000000000 +0000
@@ -1,17 +1,19 @@
 /* Copyright (C) 1995, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
-   This 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.
+   The GNU C Library 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,
+   The GNU C Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+   Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _HASH_H
 #define _HASH_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/iconv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/iconv.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <iconv.h>
-
-#include <stddef.h>
-
-#if REPLACE_ICONV_UTF
-# include <errno.h>
-# include <stdint.h>
-# include <stdlib.h>
-# include "unistr.h"
-# ifndef uintptr_t
-#  define uintptr_t unsigned long
-# endif
-#endif
-
-#if REPLACE_ICONV_UTF
-
-/* UTF-{16,32}{BE,LE} converters taken from GNU libiconv 1.11.  */
-
-/* Return code if invalid. (xxx_mbtowc) */
-# define RET_ILSEQ      -1
-/* Return code if no bytes were read. (xxx_mbtowc) */
-# define RET_TOOFEW     -2
-
-/* Return code if invalid. (xxx_wctomb) */
-# define RET_ILUNI      -1
-/* Return code if output buffer is too small. (xxx_wctomb, xxx_reset) */
-# define RET_TOOSMALL   -2
-
-/*
- * UTF-16BE
- */
-
-/* Specification: RFC 2781 */
-
-static int
-utf16be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 2)
-    {
-      ucs4_t wc = (s[0] << 8) + s[1];
-      if (wc >= 0xd800 && wc < 0xdc00)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc2 = (s[2] << 8) + s[3];
-              if (!(wc2 >= 0xdc00 && wc2 < 0xe000))
-                return RET_ILSEQ;
-              *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00);
-              return 4;
-            }
-        }
-      else if (wc >= 0xdc00 && wc < 0xe000)
-        {
-          return RET_ILSEQ;
-        }
-      else
-        {
-          *pwc = wc;
-          return 2;
-        }
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf16be_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (!(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (wc < 0x10000)
-        {
-          if (n >= 2)
-            {
-              r[0] = (unsigned char) (wc >> 8);
-              r[1] = (unsigned char) wc;
-              return 2;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-      else if (wc < 0x110000)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10);
-              ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff);
-              r[0] = (unsigned char) (wc1 >> 8);
-              r[1] = (unsigned char) wc1;
-              r[2] = (unsigned char) (wc2 >> 8);
-              r[3] = (unsigned char) wc2;
-              return 4;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-16LE
- */
-
-/* Specification: RFC 2781 */
-
-static int
-utf16le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 2)
-    {
-      ucs4_t wc = s[0] + (s[1] << 8);
-      if (wc >= 0xd800 && wc < 0xdc00)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc2 = s[2] + (s[3] << 8);
-              if (!(wc2 >= 0xdc00 && wc2 < 0xe000))
-                return RET_ILSEQ;
-              *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00);
-              return 4;
-            }
-        }
-      else if (wc >= 0xdc00 && wc < 0xe000)
-        {
-          return RET_ILSEQ;
-        }
-      else
-        {
-          *pwc = wc;
-          return 2;
-        }
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf16le_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (!(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (wc < 0x10000)
-        {
-          if (n >= 2)
-            {
-              r[0] = (unsigned char) wc;
-              r[1] = (unsigned char) (wc >> 8);
-              return 2;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-      else if (wc < 0x110000)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10);
-              ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff);
-              r[0] = (unsigned char) wc1;
-              r[1] = (unsigned char) (wc1 >> 8);
-              r[2] = (unsigned char) wc2;
-              r[3] = (unsigned char) (wc2 >> 8);
-              return 4;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-32BE
- */
-
-/* Specification: Unicode 3.1 Standard Annex #19 */
-
-static int
-utf32be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 4)
-    {
-      ucs4_t wc = (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3];
-      if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-        {
-          *pwc = wc;
-          return 4;
-        }
-      else
-        return RET_ILSEQ;
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf32be_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (n >= 4)
-        {
-          r[0] = 0;
-          r[1] = (unsigned char) (wc >> 16);
-          r[2] = (unsigned char) (wc >> 8);
-          r[3] = (unsigned char) wc;
-          return 4;
-        }
-      else
-        return RET_TOOSMALL;
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-32LE
- */
-
-/* Specification: Unicode 3.1 Standard Annex #19 */
-
-static int
-utf32le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 4)
-    {
-      ucs4_t wc = s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24);
-      if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-        {
-          *pwc = wc;
-          return 4;
-        }
-      else
-        return RET_ILSEQ;
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf32le_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (n >= 4)
-        {
-          r[0] = (unsigned char) wc;
-          r[1] = (unsigned char) (wc >> 8);
-          r[2] = (unsigned char) (wc >> 16);
-          r[3] = 0;
-          return 4;
-        }
-      else
-        return RET_TOOSMALL;
-    }
-  return RET_ILUNI;
-}
-
-#endif
-
-size_t
-rpl_iconv (iconv_t cd,
-           ICONV_CONST char **inbuf, size_t *inbytesleft,
-           char **outbuf, size_t *outbytesleft)
-#undef iconv
-{
-#if REPLACE_ICONV_UTF
-  switch ((uintptr_t) cd)
-    {
-      {
-        int (*xxx_wctomb) (unsigned char *, ucs4_t, size_t);
-
-        case (uintptr_t) _ICONV_UTF8_UTF16BE:
-          xxx_wctomb = utf16be_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF16LE:
-          xxx_wctomb = utf16le_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF32BE:
-          xxx_wctomb = utf32be_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF32LE:
-          xxx_wctomb = utf32le_wctomb;
-          goto loop_from_utf8;
-
-       loop_from_utf8:
-        if (inbuf == NULL || *inbuf == NULL)
-          return 0;
-        {
-          ICONV_CONST char *inptr = *inbuf;
-          size_t inleft = *inbytesleft;
-          char *outptr = *outbuf;
-          size_t outleft = *outbytesleft;
-          size_t res = 0;
-          while (inleft > 0)
-            {
-              ucs4_t uc;
-              int m = u8_mbtoucr (&uc, (const uint8_t *) inptr, inleft);
-              if (m <= 0)
-                {
-                  if (m == -1)
-                    {
-                      errno = EILSEQ;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  if (m == -2)
-                    {
-                      errno = EINVAL;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  abort ();
-                }
-              else
-                {
-                  int n = xxx_wctomb ((uint8_t *) outptr, uc, outleft);
-                  if (n < 0)
-                    {
-                      if (n == RET_ILUNI)
-                        {
-                          errno = EILSEQ;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      if (n == RET_TOOSMALL)
-                        {
-                          errno = E2BIG;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      abort ();
-                    }
-                  else
-                    {
-                      inptr += m;
-                      inleft -= m;
-                      outptr += n;
-                      outleft -= n;
-                    }
-                }
-            }
-          *inbuf = inptr;
-          *inbytesleft = inleft;
-          *outbuf = outptr;
-          *outbytesleft = outleft;
-          return res;
-        }
-      }
-
-      {
-        int (*xxx_mbtowc) (ucs4_t *, const unsigned char *, size_t);
-
-        case (uintptr_t) _ICONV_UTF16BE_UTF8:
-          xxx_mbtowc = utf16be_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF16LE_UTF8:
-          xxx_mbtowc = utf16le_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF32BE_UTF8:
-          xxx_mbtowc = utf32be_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF32LE_UTF8:
-          xxx_mbtowc = utf32le_mbtowc;
-          goto loop_to_utf8;
-
-       loop_to_utf8:
-        if (inbuf == NULL || *inbuf == NULL)
-          return 0;
-        {
-          ICONV_CONST char *inptr = *inbuf;
-          size_t inleft = *inbytesleft;
-          char *outptr = *outbuf;
-          size_t outleft = *outbytesleft;
-          size_t res = 0;
-          while (inleft > 0)
-            {
-              ucs4_t uc;
-              int m = xxx_mbtowc (&uc, (const uint8_t *) inptr, inleft);
-              if (m <= 0)
-                {
-                  if (m == RET_ILSEQ)
-                    {
-                      errno = EILSEQ;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  if (m == RET_TOOFEW)
-                    {
-                      errno = EINVAL;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  abort ();
-                }
-              else
-                {
-                  int n = u8_uctomb ((uint8_t *) outptr, uc, outleft);
-                  if (n < 0)
-                    {
-                      if (n == -1)
-                        {
-                          errno = EILSEQ;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      if (n == -2)
-                        {
-                          errno = E2BIG;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      abort ();
-                    }
-                  else
-                    {
-                      inptr += m;
-                      inleft -= m;
-                      outptr += n;
-                      outleft -= n;
-                    }
-                }
-            }
-          *inbuf = inptr;
-          *inbytesleft = inleft;
-          *outbuf = outptr;
-          *outbytesleft = outleft;
-          return res;
-        }
-      }
-    }
-#endif
-  return iconv (cd, inbuf, inbytesleft, outbuf, outbytesleft);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/iconv_close.c gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv_close.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/iconv_close.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv_close.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <iconv.h>
-
-#include <stdint.h>
-#ifndef uintptr_t
-# define uintptr_t unsigned long
-#endif
-
-int
-rpl_iconv_close (iconv_t cd)
-#undef iconv_close
-{
-#if REPLACE_ICONV_UTF
-  switch ((uintptr_t) cd)
-    {
-    case (uintptr_t) _ICONV_UTF8_UTF16BE:
-    case (uintptr_t) _ICONV_UTF8_UTF16LE:
-    case (uintptr_t) _ICONV_UTF8_UTF32BE:
-    case (uintptr_t) _ICONV_UTF8_UTF32LE:
-    case (uintptr_t) _ICONV_UTF16BE_UTF8:
-    case (uintptr_t) _ICONV_UTF16LE_UTF8:
-    case (uintptr_t) _ICONV_UTF32BE_UTF8:
-    case (uintptr_t) _ICONV_UTF32LE_UTF8:
-      return 0;
-    }
-#endif
-  return iconv_close (cd);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/iconveh.h gettext-0.18.1.1/gettext-tools/gnulib-lib/iconveh.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/iconveh.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/iconveh.h	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion handler type.
-   Copyright (C) 2001-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/iconv.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/iconv.in.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv.in.h	2010-05-24 09:42:38.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,20 +13,20 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ICONV_H
+#ifndef _GL_ICONV_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ICONV_H@
 
-#ifndef _@GUARD_PREFIX@_ICONV_H
-#define _@GUARD_PREFIX@_ICONV_H
+#ifndef _GL_ICONV_H
+#define _GL_ICONV_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -35,24 +35,22 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV_OPEN@
+#if @REPLACE_ICONV_OPEN@
 /* An iconv_open wrapper that supports the IANA standardized encoding names
    ("ISO-8859-1" etc.) as far as possible.  */
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv_open rpl_iconv_open
-#  endif
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv_open rpl_iconv_open
+# endif
 _GL_FUNCDECL_RPL (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode));
-# endif
-_GL_CXXALIASWARN (iconv_open);
 #endif
+_GL_CXXALIASWARN (iconv_open);
 
 #if @REPLACE_ICONV_UTF@
 /* Special constants for supporting UTF-{16,32}{BE,LE} encodings.
@@ -67,11 +65,10 @@
 # define _ICONV_UTF32LE_UTF8 (iconv_t)(-168)
 #endif
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv rpl_iconv
-#  endif
+#if @REPLACE_ICONV@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv rpl_iconv
+# endif
 _GL_FUNCDECL_RPL (iconv, size_t,
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
@@ -80,31 +77,25 @@
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv, size_t,
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
-# endif
-_GL_CXXALIASWARN (iconv);
-# ifndef ICONV_CONST
-#  define ICONV_CONST @ICONV_CONST@
-# endif
 #endif
+_GL_CXXALIASWARN (iconv);
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv_close rpl_iconv_close
-#  endif
+#if @REPLACE_ICONV@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv_close rpl_iconv_close
+# endif
 _GL_FUNCDECL_RPL (iconv_close, int, (iconv_t cd));
 _GL_CXXALIAS_RPL (iconv_close, int, (iconv_t cd));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv_close, int, (iconv_t cd));
-# endif
-_GL_CXXALIASWARN (iconv_close);
 #endif
+_GL_CXXALIASWARN (iconv_close);
 
 
-#endif /* _@GUARD_PREFIX@_ICONV_H */
-#endif /* _@GUARD_PREFIX@_ICONV_H */
+#endif /* _GL_ICONV_H */
+#endif /* _GL_ICONV_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/iconv_open.c gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv_open.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/iconv_open.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/iconv_open.c	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -56,7 +57,7 @@
      iconv() to these encoding inserts a BOM, which is wrong.
      We do not need to handle conversion between arbitrary encodings and
      UTF-{16,32}{BE,LE}, because the 'striconveh' module implements two-step
-     conversion through UTF-8.
+     conversion throough UTF-8.
      The _ICONV_* constants are chosen to be disjoint from any iconv_t
      returned by the system's iconv_open() functions.  Recall that iconv_t
      is a scalar type.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/ignore-value.h gettext-0.18.1.1/gettext-tools/gnulib-lib/ignore-value.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/ignore-value.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/ignore-value.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* ignore a function return without a compiler warning
-
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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, Eric Blake and Pádraig Brady.  */
-
-/* Use "ignore_value" to avoid a warning when using a function declared with
-   gcc's warn_unused_result attribute, but for which you really do want to
-   ignore the result.  Traditionally, people have used a "(void)" cast to
-   indicate that a function's return value is deliberately unused.  However,
-   if the function is declared with __attribute__((warn_unused_result)),
-   gcc issues a warning even with the cast.
-
-   Caution: most of the time, you really should heed gcc's warning, and
-   check the return value.  However, in those exceptional cases in which
-   you're sure you know what you're doing, use this function.
-
-   For the record, here's one of the ignorable warnings:
-   "copy.c:233: warning: ignoring return value of 'fchown',
-   declared with attribute warn_unused_result".  */
-
-#ifndef _GL_IGNORE_VALUE_H
-#define _GL_IGNORE_VALUE_H
-
-/* Normally casting an expression to void discards its value, but GCC
-   versions 3.4 and newer have __attribute__ ((__warn_unused_result__))
-   which may cause unwanted diagnostics in that case.  Use __typeof__
-   and __extension__ to work around the problem, if the workaround is
-   known to be needed.  */
-#if 3 < __GNUC__ + (4 <= __GNUC_MINOR__)
-# define ignore_value(x) \
-    (__extension__ ({ __typeof__ (x) __x = (x); (void) __x; }))
-#else
-# define ignore_value(x) ((void) (x))
-#endif
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/intprops.h gettext-0.18.1.1/gettext-tools/gnulib-lib/intprops.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/intprops.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/intprops.h	2010-05-24 09:42:38.000000000 +0000
@@ -1,6 +1,7 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,304 +18,66 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _GL_INTPROPS_H
-#define _GL_INTPROPS_H
+#ifndef GL_INTPROPS_H
+# define GL_INTPROPS_H
 
-#include <limits.h>
-
-/* Return an integer value, converted to the same type as the integer
-   expression E after integer type promotion.  V is the unconverted value.  */
-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
-
-/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>.  */
-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
+# include <limits.h>
 
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
 
 /* True if the arithmetic type T is an integer type.  bool counts as
    an integer.  */
-#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
+# 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)
+# 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))
-
-/* Return 1 if the integer expression E, after integer promotion, has
-   a signed type.  */
-#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
+# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-
-/* Minimum and maximum values for integer types and expressions.  These
+/* 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.  */
-
-/* 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_MAXIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) -1                                                        \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-/* The maximum and minimum values for the type of the expression E,
-   after integer promotion.  E should not have side effects.  */
-#define _GL_INT_MINIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
-   : _GL_INT_CONVERT (e, 0))
-#define _GL_INT_MAXIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-   : _GL_INT_NEGATE_CONVERT (e, 1))
-#define _GL_SIGNED_INT_MAXIMUM(e)                                       \
-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-
-
-/* Return 1 if the __typeof__ keyword works.  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__))
-# define _GL_HAVE___TYPEOF__ 1
-#else
-# define _GL_HAVE___TYPEOF__ 0
-#endif
-
-/* Return 1 if the integer type or expression T might be signed.  Return 0
-   if it is definitely unsigned.  This macro does not evaluate its argument,
-   and expands to an integer constant expression.  */
-#if _GL_HAVE___TYPEOF__
-# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
-#else
-# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
-#endif
-
-/* Bound on length of the string representing an unsigned integer
-   value representable in B bits.  log10 (2.0) < 146/485.  The
-   smallest value of B where this bound is not tight is 2621.  */
-#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
+# define TYPE_MINIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+        ? (t) 0 \
+        : TYPE_SIGNED_MAGNITUDE (t) \
+        ? ~ (t) 0 \
+        : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+# define TYPE_MAXIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+        ? (t) -1 \
+        : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+
+/* Return zero if T can be determined to be an unsigned type.
+   Otherwise, return 1.
+   When compiling with GCC, INT_STRLEN_BOUND uses this macro to obtain a
+   tighter bound.  Otherwise, it overestimates the true bound by one byte
+   when applied to unsigned types of size 2, 4, 16, ... bytes.
+   The symbol signed_type_or_expr__ is private to this header file.  */
+# if __GNUC__ >= 2
+#  define signed_type_or_expr__(t) TYPE_SIGNED (__typeof__ (t))
+# else
+#  define signed_type_or_expr__(t) 1
+# endif
 
 /* Bound on length of the string representing an integer type or expression T.
-   Subtract 1 for the sign bit if T is signed, and then add 1 more for
-   a minus sign if needed.
-
-   Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is
-   signed, this macro may overestimate the true bound by one byte when
-   applied to unsigned types of size 2, 4, 16, ... bytes.  */
-#define INT_STRLEN_BOUND(t)                                     \
-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
-   + _GL_SIGNED_TYPE_OR_EXPR (t))
+   Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485;
+   add 1 for integer division truncation; add 1 more for a minus sign
+   if needed.  */
+# define INT_STRLEN_BOUND(t) \
+  ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \
+   + signed_type_or_expr__ (t) + 1)
 
 /* Bound on buffer size needed to represent an integer type or expression T,
    including the terminating null.  */
-#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
-
-
-/* Range overflow checks.
-
-   The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
-   operators might not yield numerically correct answers due to
-   arithmetic overflow.  They do not rely on undefined or
-   implementation-defined behavior.  Their implementations are simple
-   and straightforward, but they are a bit harder to use than the
-   INT_<op>_OVERFLOW macros described below.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   Restrictions on *_RANGE_OVERFLOW macros:
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times,
-   so the arguments should not have side effects.  The arithmetic
-   arguments (including the MIN and MAX arguments) must be of the same
-   integer type after the usual arithmetic conversions, and the type
-   must have minimum value MIN and maximum MAX.  Unsigned types should
-   use a zero MIN of the proper type.
-
-   These macros are tuned for constant MIN and MAX.  For commutative
-   operations such as A + B, they are also tuned for constant B.  */
-
-/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_ADD_RANGE_OVERFLOW(a, b, min, max)          \
-  ((b) < 0                                              \
-   ? (a) < (min) - (b)                                  \
-   : (max) - (b) < (a))
-
-/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? (max) + (b) < (a)                                  \
-   : (a) < (min) + (b))
-
-/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_NEGATE_RANGE_OVERFLOW(a, min, max)          \
-  ((min) < 0                                            \
-   ? (a) < - (max)                                      \
-   : 0 < (a))
-
-/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Avoid && and || as they tickle
-   bugs in Sun C 5.11 2010/08/13 and other compilers; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>.  */
-#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? ((a) < 0                                           \
-      ? (a) < (max) / (b)                               \
-      : (b) == -1                                       \
-      ? 0                                               \
-      : (min) / (b) < (a))                              \
-   : (b) == 0                                           \
-   ? 0                                                  \
-   : ((a) < 0                                           \
-      ? (a) < (min) / (b)                               \
-      : (max) / (b) < (a)))
-
-/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.  */
-#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max)       \
-  ((min) < 0 && (b) == -1 && (a) < - (max))
-
-/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.
-   Mathematically, % should never overflow, but on x86-like hosts
-   INT_MIN % -1 traps, and the C standard permits this, so treat this
-   as an overflow too.  */
-#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max)    \
-  INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
-
-/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Here, MIN and MAX are for A only, and B need
-   not be of the same type as the other arguments.  The C standard says that
-   behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
-   A is negative then A << B has undefined behavior and A >> B has
-   implementation-defined behavior, but do not check these other
-   restrictions.  */
-#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max)   \
-  ((a) < 0                                              \
-   ? (a) < (min) >> (b)                                 \
-   : (max) >> (b) < (a))
-
-
-/* The _GL*_OVERFLOW macros have the same restrictions as the
-   *_RANGE_OVERFLOW macros, except that they do not assume that operands
-   (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-   that the result (e.g., A + B) has that type.  */
-#define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-  ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-   : (a) < 0 ? (b) <= (a) + (b)                                         \
-   : (b) < 0 ? (a) <= (a) + (b)                                         \
-   : (a) + (b) < (b))
-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
-  ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
-   : (a) < 0 ? 1                                                        \
-   : (b) < 0 ? (a) - (b) <= (a)                                         \
-   : (a) < (b))
-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
-  (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
-   || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
-#define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
-   : (b) < 0 && (a) + (b) <= (a))
-#define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
-   : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
-
-/* Return a nonzero value if A is a mathematical multiple of B, where
-   A is unsigned, B is negative, and MAX is the maximum value of A's
-   type.  A's type must be the same as (A % B)'s type.  Normally (A %
-   -B == 0) suffices, but things get tricky if -B would overflow.  */
-#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max)                            \
-  (((b) < -_GL_SIGNED_INT_MAXIMUM (b)                                   \
-    ? (_GL_SIGNED_INT_MAXIMUM (b) == (max)                              \
-       ? (a)                                                            \
-       : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1))   \
-    : (a) % - (b))                                                      \
-   == 0)
-
-
-/* Integer overflow checks.
-
-   The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
-   might not yield numerically correct answers due to arithmetic overflow.
-   They work correctly on all known practical hosts, and do not rely
-   on undefined behavior due to signed arithmetic overflow.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_OVERFLOW (i, j))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times, so the
-   arguments should not have side effects.
-
-   These macros are tuned for their last argument being a constant.
-
-   Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
-   A % B, and A << B would overflow, respectively.  */
-
-#define INT_ADD_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
-#define INT_SUBTRACT_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
-#define INT_NEGATE_OVERFLOW(a) \
-  INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-#define INT_MULTIPLY_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
-#define INT_DIVIDE_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
-#define INT_REMAINDER_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
-#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
-  INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
-                                 _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-
-/* Return 1 if the expression A <op> B would overflow,
-   where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
-   assuming MIN and MAX are the minimum and maximum for the result type.
-   Arguments should be free of side effects.  */
-#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
-  op_result_overflow (a, b,                                     \
-                      _GL_INT_MINIMUM (0 * (b) + (a)),          \
-                      _GL_INT_MAXIMUM (0 * (b) + (a)))
+# define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
 
-#endif /* _GL_INTPROPS_H */
+#endif /* GL_INTPROPS_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/iswblank.c gettext-0.18.1.1/gettext-tools/gnulib-lib/iswblank.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/iswblank.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/iswblank.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* Test wide character for being blank.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <wctype.h>
-
-int
-iswblank (wint_t wc)
-{
-  return wc == ' ' || wc == '\t';
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/itold.c gettext-0.18.1.1/gettext-tools/gnulib-lib/itold.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/itold.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/itold.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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>
-
-/* Specification.  */
-#include <float.h>
-
-void
-_Qp_itoq (long double *result, int a)
-{
-  /* Convert from 'int' to 'double', then from 'double' to 'long double'.  */
-  *result = (double) a;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javacomp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/javacomp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/javacomp.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javacomp.c	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -32,7 +32,7 @@
 
 #include "javaversion.h"
 #include "execute.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "classpath.h"
 #include "xsetenv.h"
@@ -51,6 +51,11 @@
 
 #define _(str) gettext (str)
 
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
+
 
 /* Survey of Java compilers.
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javacomp.h gettext-0.18.1.1/gettext-tools/gnulib-lib/javacomp.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/javacomp.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javacomp.h	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javaexec.c gettext-0.18.1.1/gettext-tools/gnulib-lib/javaexec.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/javaexec.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javaexec.c	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Execute a Java program.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -358,7 +358,7 @@
   }
 
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-  /* Native Windows, Cygwin */
+  /* Win32, Cygwin */
   {
     static bool jview_tested;
     static bool jview_present;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javaexec.h gettext-0.18.1.1/gettext-tools/gnulib-lib/javaexec.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/javaexec.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javaexec.h	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Execute a Java program.
-   Copyright (C) 2001-2002, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javaversion.c gettext-0.18.1.1/gettext-tools/gnulib-lib/javaversion.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/javaversion.c	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javaversion.c	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #endif
 
 #include "javaexec.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "error.h"
 #include "gettext.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javaversion.h gettext-0.18.1.1/gettext-tools/gnulib-lib/javaversion.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/javaversion.h	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javaversion.h	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/javaversion.java gettext-0.18.1.1/gettext-tools/gnulib-lib/javaversion.java
--- gettext-0.19.3/gettext-tools/gnulib-lib/javaversion.java	2014-10-16 06:00:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/javaversion.java	2010-05-24 09:42:38.000000000 +0000
@@ -1,5 +1,5 @@
 /* Show the Java version.
- * Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/localcharset.c gettext-0.18.1.1/gettext-tools/gnulib-lib/localcharset.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/localcharset.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/localcharset.c	2010-05-24 10:59:08.000000000 +0000
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
@@ -29,12 +30,11 @@
 #include <stdlib.h>
 
 #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
+# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# include <locale.h>
+# define WIN32_NATIVE
 #endif
 
 #if defined __EMX__
@@ -44,7 +44,7 @@
 # endif
 #endif
 
-#if !defined WINDOWS_NATIVE
+#if !defined WIN32_NATIVE
 # include <unistd.h>
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
@@ -57,7 +57,7 @@
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 # endif
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -66,11 +66,6 @@
 # include <os2.h>
 #endif
 
-/* For MB_CUR_MAX_L */
-#if defined DARWIN7
-# include <xlocale.h>
-#endif
-
 #if ENABLE_RELOCATABLE
 # include "relocatable.h"
 #else
@@ -88,7 +83,7 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #endif
 
@@ -128,7 +123,7 @@
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
       const char *dir;
       const char *base = "charset.alias";
       char *file_name;
@@ -233,7 +228,8 @@
                         {
                           /* Out of memory. */
                           res_size = 0;
-                          free (old_res_ptr);
+                          if (old_res_ptr != NULL)
+                            free (old_res_ptr);
                           break;
                         }
                       strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
@@ -313,7 +309,7 @@
            "DECKOREAN" "\0" "EUC-KR" "\0";
 # endif
 
-# if defined WINDOWS_NATIVE || defined __CYGWIN__
+# if defined WIN32_NATIVE || defined __CYGWIN__
       /* To avoid the troubles of installing a separate file in the same
          directory as the DLL and of retrieving the DLL's directory at
          runtime, simply inline the aliases here.  */
@@ -365,7 +361,7 @@
   const char *codeset;
   const char *aliases;
 
-#if !(defined WINDOWS_NATIVE || defined OS2)
+#if !(defined WIN32_NATIVE || defined OS2)
 
 # if HAVE_LANGINFO_CODESET
 
@@ -412,10 +408,10 @@
             }
         }
 
-      /* The Windows API has a function returning the locale's codepage as a
-         number: GetACP().  This encoding is used by Cygwin, unless the user
-         has set the environment variable CYGWIN=codepage:oem (which very few
-         people do).
+      /* Woe32 has a function returning the locale's codepage as a number:
+         GetACP().  This encoding is used by Cygwin, unless the user has set
+         the environment variable CYGWIN=codepage:oem (which very few people
+         do).
          Output directed to console windows needs to be converted (to
          GetOEMCP() if the console is using a raster font, or to
          GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
@@ -458,38 +454,18 @@
 
 # endif
 
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 
   static char buf[2 + 10 + 1];
 
-  /* The Windows API has a function returning the locale's codepage as
-     a number, but the value doesn't change according to what the
-     'setlocale' call specified.  So we use it as a last resort, in
-     case the string returned by 'setlocale' doesn't specify the
-     codepage.  */
-  char *current_locale = setlocale (LC_ALL, NULL);
-  char *pdot;
-
-  /* If they set different locales for different categories,
-     'setlocale' will return a semi-colon separated list of locale
-     values.  To make sure we use the correct one, we choose LC_CTYPE.  */
-  if (strchr (current_locale, ';'))
-    current_locale = setlocale (LC_CTYPE, NULL);
-
-  pdot = strrchr (current_locale, '.');
-  if (pdot)
-    sprintf (buf, "CP%s", pdot + 1);
-  else
-    {
-      /* The Windows API has a function returning the locale's codepage as a
-        number: GetACP().
-        When the output goes to a console window, it needs to be provided in
-        GetOEMCP() encoding if the console is using a raster font, or in
-        GetConsoleOutputCP() encoding if it is using a TrueType font.
-        But in GUI programs and for output sent to files and pipes, GetACP()
-        encoding is the best bet.  */
-      sprintf (buf, "CP%u", GetACP ());
-    }
+  /* Woe32 has a function returning the locale's codepage as a number:
+     GetACP().
+     When the output goes to a console window, it needs to be provided in
+     GetOEMCP() encoding if the console is using a raster font, or in
+     GetConsoleOutputCP() encoding if it is using a TrueType font.
+     But in GUI programs and for output sent to files and pipes, GetACP()
+     encoding is the best bet.  */
+  sprintf (buf, "CP%u", GetACP ());
   codeset = buf;
 
 #elif defined OS2
@@ -568,12 +544,5 @@
   if (codeset[0] == '\0')
     codeset = "ASCII";
 
-#ifdef DARWIN7
-  /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
-     (the default codeset) does not work when MB_CUR_MAX is 1.  */
-  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
-    codeset = "ASCII";
-#endif
-
   return codeset;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/localcharset.h gettext-0.18.1.1/gettext-tools/gnulib-lib/localcharset.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/localcharset.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/localcharset.h	2010-05-24 10:59:08.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2010 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
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/locale.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/locale.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/locale.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/locale.in.h	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,37 +14,22 @@
    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 _GL_LOCALE_H
+
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
-
-#ifdef _GL_ALREADY_INCLUDING_LOCALE_H
-
-/* Special invocation conventions to handle Solaris header files
-   (through Solaris 10) when combined with gettext's libintl.h.  */
-
-#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
-
-#else
-/* Normal invocation convention.  */
-
-#ifndef _@GUARD_PREFIX@_LOCALE_H
-
-#define _GL_ALREADY_INCLUDING_LOCALE_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_LOCALE_H@
 
-#undef _GL_ALREADY_INCLUDING_LOCALE_H
-
-#ifndef _@GUARD_PREFIX@_LOCALE_H
-#define _@GUARD_PREFIX@_LOCALE_H
+#ifndef _GL_LOCALE_H
+#define _GL_LOCALE_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
-/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */
+/* MacOS X 10.5 defines the locale_t type in <xlocale.h>.  */
 #if @HAVE_XLOCALE_H@
 # include <xlocale.h>
 #endif
@@ -61,132 +46,6 @@
 # define LC_MESSAGES 1729
 #endif
 
-/* Bionic libc's 'struct lconv' is just a dummy.  */
-#if @REPLACE_STRUCT_LCONV@
-# define lconv rpl_lconv
-struct lconv
-{
-  /* All 'char *' are actually 'const char *'.  */
-
-  /* Members that depend on the LC_NUMERIC category of the locale.  See
-     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap07.html#tag_07_03_04> */
-
-  /* Symbol used as decimal point.  */
-  char *decimal_point;
-  /* Symbol used to separate groups of digits to the left of the decimal
-     point.  */
-  char *thousands_sep;
-  /* Definition of the size of groups of digits to the left of the decimal
-     point.  */
-  char *grouping;
-
-  /* Members that depend on the LC_MONETARY category of the locale.  See
-     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap07.html#tag_07_03_03> */
-
-  /* Symbol used as decimal point.  */
-  char *mon_decimal_point;
-  /* Symbol used to separate groups of digits to the left of the decimal
-     point.  */
-  char *mon_thousands_sep;
-  /* Definition of the size of groups of digits to the left of the decimal
-     point.  */
-  char *mon_grouping;
-  /* Sign used to indicate a value >= 0.  */
-  char *positive_sign;
-  /* Sign used to indicate a value < 0.  */
-  char *negative_sign;
-
-  /* For formatting local currency.  */
-  /* Currency symbol (3 characters) followed by separator (1 character).  */
-  char *currency_symbol;
-  /* Number of digits after the decimal point.  */
-  char frac_digits;
-  /* For values >= 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char p_cs_precedes;
-  /* For values >= 0: Position of the sign.  */
-  char p_sign_posn;
-  /* For values >= 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char p_sep_by_space;
-  /* For values < 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char n_cs_precedes;
-  /* For values < 0: Position of the sign.  */
-  char n_sign_posn;
-  /* For values < 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char n_sep_by_space;
-
-  /* For formatting international currency.  */
-  /* Currency symbol (3 characters) followed by separator (1 character).  */
-  char *int_curr_symbol;
-  /* Number of digits after the decimal point.  */
-  char int_frac_digits;
-  /* For values >= 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char int_p_cs_precedes;
-  /* For values >= 0: Position of the sign.  */
-  char int_p_sign_posn;
-  /* For values >= 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char int_p_sep_by_space;
-  /* For values < 0: 1 if the currency symbol precedes the number, 0 if it
-     comes after the number.  */
-  char int_n_cs_precedes;
-  /* For values < 0: Position of the sign.  */
-  char int_n_sign_posn;
-  /* For values < 0: Placement of spaces between currency symbol, sign, and
-     number.  */
-  char int_n_sep_by_space;
-};
-#endif
-
-#if @GNULIB_LOCALECONV@
-# if @REPLACE_LOCALECONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef localeconv
-#   define localeconv rpl_localeconv
-#  endif
-_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void));
-_GL_CXXALIAS_RPL (localeconv, struct lconv *, (void));
-# else
-_GL_CXXALIAS_SYS (localeconv, struct lconv *, (void));
-# endif
-_GL_CXXALIASWARN (localeconv);
-#elif @REPLACE_STRUCT_LCONV@
-# undef localeconv
-# define localeconv localeconv_used_without_requesting_gnulib_module_localeconv
-#elif defined GNULIB_POSIXCHECK
-# undef localeconv
-# if HAVE_RAW_DECL_LOCALECONV
-_GL_WARN_ON_USE (localeconv,
-                 "localeconv returns too few information on some platforms - "
-                 "use gnulib module localeconv for portability");
-# endif
-#endif
-
-#if @GNULIB_SETLOCALE@
-# if @REPLACE_SETLOCALE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef setlocale
-#   define setlocale rpl_setlocale
-#   define GNULIB_defined_setlocale 1
-#  endif
-_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale));
-_GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale));
-# else
-_GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale));
-# endif
-_GL_CXXALIASWARN (setlocale);
-#elif defined GNULIB_POSIXCHECK
-# undef setlocale
-# if HAVE_RAW_DECL_SETLOCALE
-_GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
-                 "use gnulib module setlocale for portability");
-# endif
-#endif
-
 #if @GNULIB_DUPLOCALE@
 # if @REPLACE_DUPLOCALE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -211,6 +70,5 @@
 # endif
 #endif
 
-#endif /* _@GUARD_PREFIX@_LOCALE_H */
-#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */
-#endif /* _@GUARD_PREFIX@_LOCALE_H */
+#endif /* _GL_LOCALE_H */
+#endif /* _GL_LOCALE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/localename.c gettext-0.18.1.1/gettext-tools/gnulib-lib/localename.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/localename.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/localename.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,22 +1,24 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-2010 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
-/* Native Windows code written by Tor Lillqvist <tml@iki.fi>.  */
-/* Mac OS X code written by Bruno Haible <bruno@clisp.org>.  */
+/* Win32 code written by Tor Lillqvist <tml@iki.fi>.  */
+/* MacOS X code written by Bruno Haible <bruno@clisp.org>.  */
 
 #include <config.h>
 
@@ -34,7 +36,7 @@
 #include <string.h>
 
 #if HAVE_USELOCALE
-/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */
+/* MacOS X 10.5 defines the locale_t type in <xlocale.h>.  */
 # if defined __APPLE__ && defined __MACH__
 #  include <xlocale.h>
 # endif
@@ -54,16 +56,12 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# if !defined IN_LIBINTL
-#  include "glthread/lock.h"
-# endif
+# define WIN32_NATIVE
 #endif
 
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-# include <winnls.h>
 /* List of language codes, sorted by value:
    0x01 LANG_ARABIC
    0x02 LANG_BULGARIAN
@@ -1128,18 +1126,15 @@
 # ifndef LOCALE_SNAME
 # define LOCALE_SNAME 0x5c
 # endif
-# ifndef LOCALE_NAME_MAX_LENGTH
-# define LOCALE_NAME_MAX_LENGTH 85
-# endif
 #endif
 
 
 #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-/* Mac OS X 10.2 or newer */
+/* MacOS X 10.2 or newer */
 
-/* Canonicalize a Mac OS X locale name to a Unix locale name.
+/* Canonicalize a MacOS X locale name to a Unix locale name.
    NAME is a sufficiently large buffer.
-   On input, it contains the Mac OS X locale name.
+   On input, it contains the MacOS X locale name.
    On output, it contains the Unix locale name.  */
 # if !defined IN_LIBINTL
 static
@@ -1152,9 +1147,9 @@
      http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
 
   /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
-     ISO 3166) names.  Prior to Mac OS X 10.3, there is no API for doing this.
+     ISO 3166) names.  Prior to MacOS X 10.3, there is no API for doing this.
      Therefore we do it ourselves, using a table based on the results of the
-     Mac OS X 10.3.8 function
+     MacOS X 10.3.8 function
      CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
   typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
           legacy_entry;
@@ -1297,26 +1292,26 @@
   typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
           langtag_entry;
   static const langtag_entry langtag_table[] = {
-    /* Mac OS X has "az-Arab", "az-Cyrl", "az-Latn".
+    /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
        The default script for az on Unix is Latin.  */
     { "az-Latn", "az" },
-    /* Mac OS X has "ga-dots".  Does not yet exist on Unix.  */
+    /* MacOS X has "ga-dots".  Does not yet exist on Unix.  */
     { "ga-dots", "ga" },
-    /* Mac OS X has "kk-Cyrl".  Does not yet exist on Unix.  */
-    /* Mac OS X has "mn-Cyrl", "mn-Mong".
+    /* MacOS X has "kk-Cyrl".  Does not yet exist on Unix.  */
+    /* MacOS X has "mn-Cyrl", "mn-Mong".
        The default script for mn on Unix is Cyrillic.  */
     { "mn-Cyrl", "mn" },
-    /* Mac OS X has "ms-Arab", "ms-Latn".
+    /* MacOS X has "ms-Arab", "ms-Latn".
        The default script for ms on Unix is Latin.  */
     { "ms-Latn", "ms" },
-    /* Mac OS X has "tg-Cyrl".
+    /* MacOS X has "tg-Cyrl".
        The default script for tg on Unix is Cyrillic.  */
     { "tg-Cyrl", "tg" },
-    /* Mac OS X has "tk-Cyrl".  Does not yet exist on Unix.  */
-    /* Mac OS X has "tt-Cyrl".
+    /* MacOS X has "tk-Cyrl".  Does not yet exist on Unix.  */
+    /* MacOS X has "tt-Cyrl".
        The default script for tt on Unix is Cyrillic.  */
     { "tt-Cyrl", "tt" },
-    /* Mac OS X has "zh-Hans", "zh-Hant".
+    /* MacOS X has "zh-Hans", "zh-Hant".
        Country codes are used to distinguish these on Unix.  */
     { "zh-Hans", "zh_CN" },
     { "zh-Hant", "zh_TW" }
@@ -1412,11 +1407,11 @@
 #endif
 
 
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
 
-/* Canonicalize a Windows native locale name to a Unix locale name.
+/* Canonicalize a Win32 native locale name to a Unix locale name.
    NAME is a sufficiently large buffer.
-   On input, it contains the Windows locale name.
+   On input, it contains the Win32 locale name.
    On output, it contains the Unix locale name.  */
 # if !defined IN_LIBINTL
 static
@@ -1472,9 +1467,9 @@
     }
   /* Internet Explorer has an LCID to RFC3066 name mapping stored in
      HKEY_CLASSES_ROOT\Mime\Database\Rfc1766.  But we better don't use that
-     since IE's i18n subsystem is known to be inconsistent with the native
-     Windows base (e.g. they have different character conversion facilities
-     that produce different results).  */
+     since IE's i18n subsystem is known to be inconsistent with the Win32 base
+     (e.g. they have different character conversion facilities that produce
+     different results).  */
   /* Use our own table.  */
   {
     int primary, sub;
@@ -2509,82 +2504,10 @@
   return gl_locale_name_from_win32_LANGID (langid);
 }
 
-# ifdef WINDOWS_NATIVE
-
-/* Two variables to interface between get_lcid and the EnumLocales
-   callback function below.  */
-static LCID found_lcid;
-static char lname[LC_MAX * (LOCALE_NAME_MAX_LENGTH + 1) + 1];
-
-/* Callback function for EnumLocales.  */
-static BOOL CALLBACK
-enum_locales_fn (LPTSTR locale_num_str)
-{
-  char *endp;
-  char locval[2 * LOCALE_NAME_MAX_LENGTH + 1 + 1];
-  LCID try_lcid = strtoul (locale_num_str, &endp, 16);
-
-  if (GetLocaleInfo (try_lcid, LOCALE_SENGLANGUAGE,
-                    locval, LOCALE_NAME_MAX_LENGTH))
-    {
-      strcat (locval, "_");
-      if (GetLocaleInfo (try_lcid, LOCALE_SENGCOUNTRY,
-                        locval + strlen (locval), LOCALE_NAME_MAX_LENGTH))
-       {
-         size_t locval_len = strlen (locval);
-
-         if (strncmp (locval, lname, locval_len) == 0
-             && (lname[locval_len] == '.'
-                 || lname[locval_len] == '\0'))
-           {
-             found_lcid = try_lcid;
-             return FALSE;
-           }
-       }
-    }
-  return TRUE;
-}
-
-/* This lock protects the get_lcid against multiple simultaneous calls.  */
-gl_lock_define_initialized(static, get_lcid_lock)
-
-/* Return the Locale ID (LCID) number given the locale's name, a
-   string, in LOCALE_NAME.  This works by enumerating all the locales
-   supported by the system, until we find one whose name matches
-   LOCALE_NAME.  */
-static LCID
-get_lcid (const char *locale_name)
-{
-  /* A simple cache.  */
-  static LCID last_lcid;
-  static char last_locale[1000];
-
-  /* Lock while looking for an LCID, to protect access to static
-     variables: last_lcid, last_locale, found_lcid, and lname.  */
-  gl_lock_lock (get_lcid_lock);
-  if (last_lcid > 0 && strcmp (locale_name, last_locale) == 0)
-    {
-      gl_lock_unlock (get_lcid_lock);
-      return last_lcid;
-    }
-  strncpy (lname, locale_name, sizeof (lname) - 1);
-  lname[sizeof (lname) - 1] = '\0';
-  found_lcid = 0;
-  EnumSystemLocales (enum_locales_fn, LCID_SUPPORTED);
-  if (found_lcid > 0)
-    {
-      last_lcid = found_lcid;
-      strcpy (last_locale, locale_name);
-    }
-  gl_lock_unlock (get_lcid_lock);
-  return found_lcid;
-}
-
-# endif
 #endif
 
 
-#if HAVE_USELOCALE /* glibc or Mac OS X */
+#if HAVE_USELOCALE /* glibc or MacOS X */
 
 /* Simple hash set of strings.  We don't want to drag in lots of hash table
    code here.  */
@@ -2594,7 +2517,7 @@
 /* A hash function for NUL-terminated char* strings using
    the method described by Bruno Haible.
    See http://www.haible.de/bruno/hashfunc.html.  */
-static size_t _GL_ATTRIBUTE_PURE
+static size_t
 string_hash (const void *x)
 {
   const char *s = (const char *) x;
@@ -2684,7 +2607,7 @@
     locale_t thread_locale = uselocale (NULL);
     if (thread_locale != LC_GLOBAL_LOCALE)
       {
-#  if __GLIBC__ >= 2 && !defined __UCLIBC__
+#  if __GLIBC__ >= 2
         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
            glibc < 2.12.
            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
@@ -2695,34 +2618,133 @@
              nl_langinfo (_NL_LOCALE_NAME (category)).  */
           name = thread_locale->__names[category];
         return name;
-#  elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__)
-        /* FreeBSD, Mac OS X */
-        int mask;
-
+#  endif
+#  if defined __APPLE__ && defined __MACH__ /* MacOS X */
+        /* The locale name is found deep in an undocumented data structure.
+           Since it's stored in a buffer of size 32 and newlocale() rejects
+           locale names of length > 31, we can assume that it is NUL terminated
+           in this buffer. But we need to make a copy of the locale name, of
+           indefinite extent.  */
+        struct _xlocale_part1_v0 /* used in MacOS X 10.5 */
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            __darwin_mbstate_t __mbs[10];
+            int64_t __magic;
+          };
+        struct _xlocale_part1_v1 /* used in MacOS X >= 10.6.0 */
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            __darwin_mbstate_t __mbs[10];
+            /*pthread_lock_t*/ int __lock;
+            int64_t __magic;
+          };
+        struct _xlocale_part2
+          {
+            int64_t __magic;
+            unsigned char __collate_load_error;
+            unsigned char __collate_substitute_nontrivial;
+            unsigned char _messages_using_locale;
+            unsigned char _monetary_using_locale;
+            unsigned char _numeric_using_locale;
+            unsigned char _time_using_locale;
+            unsigned char __mlocale_changed;
+            unsigned char __nlocale_changed;
+            unsigned char __numeric_fp_cvt;
+            struct __xlocale_st_collate *__lc_collate;
+            struct __xlocale_st_runelocale *__lc_ctype;
+            struct __xlocale_st_messages *__lc_messages;
+            struct __xlocale_st_monetary *__lc_monetary;
+            struct __xlocale_st_numeric *__lc_numeric;
+            struct _xlocale *__lc_numeric_loc;
+            struct __xlocale_st_time *__lc_time;
+            /* more */
+          };
+        struct __xlocale_st_collate
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char __encoding[32];
+            /* more */
+          };
+        struct __xlocale_st_runelocale
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char __ctype_encoding[32];
+            /* more */
+          };
+        struct __xlocale_st_messages
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_messages_locale_buf;
+            /* more */
+          };
+        struct __xlocale_st_monetary
+          {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_monetary_locale_buf;
+            /* more */
+          };
+        struct __xlocale_st_numeric {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_numeric_locale_buf;
+            /* more */
+          };
+        struct __xlocale_st_time {
+            int32_t __refcount;
+            void (*__free_extra)(void *);
+            char *_time_locale_buf;
+            /* more */
+          };
+        struct _xlocale_part2 *tlp;
+        if (((struct _xlocale_part1_v0 *) thread_locale)->__magic
+            == 0x786C6F63616C6530LL)
+          /* MacOS X 10.5 */
+          tlp =
+            (struct _xlocale_part2 *)
+            &((struct _xlocale_part1_v0 *) thread_locale)->__magic;
+        else if (((struct _xlocale_part1_v1 *) thread_locale)->__magic
+                 == 0x786C6F63616C6530LL)
+          /* MacOS X >= 10.6.0 */
+          tlp =
+            (struct _xlocale_part2 *)
+            &((struct _xlocale_part1_v1 *) thread_locale)->__magic;
+        else
+          /* Unsupported version of MacOS X: The internals of 'struct _xlocale'
+             have changed again.  */
+          return "";
         switch (category)
           {
           case LC_CTYPE:
-            mask = LC_CTYPE_MASK;
-            break;
+            return tlp->__lc_ctype->__ctype_encoding;
           case LC_NUMERIC:
-            mask = LC_NUMERIC_MASK;
-            break;
+            return tlp->_numeric_using_locale
+                   ? tlp->__lc_numeric->_numeric_locale_buf
+                   : "C";
           case LC_TIME:
-            mask = LC_TIME_MASK;
-            break;
+            return tlp->_time_using_locale
+                   ? tlp->__lc_time->_time_locale_buf
+                   : "C";
           case LC_COLLATE:
-            mask = LC_COLLATE_MASK;
-            break;
+            return !tlp->__collate_load_error
+                   ? tlp->__lc_collate->__encoding
+                   : "C";
           case LC_MONETARY:
-            mask = LC_MONETARY_MASK;
-            break;
+            return tlp->_monetary_using_locale
+                   ? tlp->__lc_monetary->_monetary_locale_buf
+                   : "C";
           case LC_MESSAGES:
-            mask = LC_MESSAGES_MASK;
-            break;
+            return tlp->_messages_using_locale
+                   ? tlp->__lc_messages->_messages_locale_buf
+                   : "C";
           default: /* We shouldn't get here.  */
             return "";
           }
-        return querylocale (mask, thread_locale);
 #  endif
       }
   }
@@ -2739,27 +2761,6 @@
   const char *name = gl_locale_name_thread_unsafe (category, categoryname);
   if (name != NULL)
     return struniq (name);
-#elif defined WINDOWS_NATIVE
-  if (LC_MIN <= category && category <= LC_MAX)
-    {
-      char *locname = setlocale (category, NULL);
-      LCID lcid = 0;
-
-      /* If CATEGORY is LC_ALL, the result might be a semi-colon
-        separated list of locales.  We need only one, so we take the
-        one corresponding to LC_CTYPE, as the most important for
-        character translations.  */
-      if (strchr (locname, ';'))
-       locname = setlocale (LC_CTYPE, NULL);
-
-      /* Convert locale name to LCID.  We don't want to use
-         LocaleNameToLCID because (a) it is only available since Vista,
-         and (b) it doesn't accept locale names returned by 'setlocale'.  */
-      lcid = get_lcid (locname);
-
-      if (lcid > 0)
-        return gl_locale_name_from_win32_LCID (lcid);
-    }
 #endif
   return NULL;
 }
@@ -2770,7 +2771,7 @@
    However it does not specify the exact format.  Neither do SUSV2 and
    ISO C 99.  So we can use this feature only on selected systems (e.g.
    those using GNU C Library).  */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
+#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
 # define HAVE_LOCALE_NULL
 #endif
 
@@ -2785,8 +2786,8 @@
   /* On other systems we ignore what setlocale reports and instead look at the
      environment variables directly.  This is necessary
        1. on systems which have a facility for customizing the default locale
-          (Mac OS X, native Windows, Cygwin) and where the system's setlocale()
-          function ignores this default locale (Mac OS X, Cygwin), in two cases:
+          (MacOS X, native Windows, Cygwin) and where the system's setlocale()
+          function ignores this default locale (MacOS X, Cygwin), in two cases:
           a. when the user missed to use the setlocale() override from libintl
              (for example by not including <libintl.h>),
           b. when setlocale supports only the "C" locale, such as on Cygwin
@@ -2821,7 +2822,7 @@
   if (retval != NULL && retval[0] != '\0')
     {
 #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-      /* Mac OS X 10.2 or newer.
+      /* MacOS X 10.2 or newer.
          Ignore invalid LANG value set by the Terminal application.  */
       if (strcmp (retval, "UTF-8") != 0)
 #endif
@@ -2848,10 +2849,10 @@
       locale, customizing it for each location.  POSIX:2001 does not require
       such a facility.
 
-     The systems with such a facility are Mac OS X and Windows: They provide a
+     The systems with such a facility are MacOS X and Windows: They provide a
      GUI that allows the user to choose a locale.
-       - On Mac OS X, by default, none of LC_* or LANG are set.  Starting with
-         Mac OS X 10.4 or 10.5, LANG is set for processes launched by the
+       - On MacOS X, by default, none of LC_* or LANG are set.  Starting with
+         MacOS X 10.4 or 10.5, LANG is set for processes launched by the
          'Terminal' application (but sometimes to an incorrect value "UTF-8").
          When no environment variable is set, setlocale (LC_ALL, "") uses the
          "C" locale.
@@ -2867,7 +2868,7 @@
          "C.UTF-8" locale, which operates in the same way as the "C" locale.
   */
 
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WIN32_NATIVE || defined __CYGWIN__)
 
   /* The system does not have a way of setting the locale, other than the
      POSIX specified environment variables.  We use C as default locale.  */
@@ -2881,7 +2882,7 @@
      codeset.  */
 
 # if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-  /* Mac OS X 10.2 or newer */
+  /* MacOS X 10.2 or newer */
   {
     /* Cache the locale name, since CoreFoundation calls are expensive.  */
     static const char *cached_localename;
@@ -2889,7 +2890,7 @@
     if (cached_localename == NULL)
       {
         char namebuf[256];
-#  if HAVE_CFLOCALECOPYCURRENT /* Mac OS X 10.3 or newer */
+#  if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
         CFLocaleRef locale = CFLocaleCopyCurrent ();
         CFStringRef name = CFLocaleGetIdentifier (locale);
 
@@ -2900,7 +2901,7 @@
             cached_localename = strdup (namebuf);
           }
         CFRelease (locale);
-#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* Mac OS X 10.2 or newer */
+#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
         CFTypeRef value =
           CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
                                      kCFPreferencesCurrentApplication);
@@ -2922,11 +2923,11 @@
 
 # endif
 
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
   {
     LCID lcid;
 
-    /* Use native Windows API locale ID.  */
+    /* Use native Win32 API locale ID.  */
     lcid = GetThreadLocale ();
 
     return gl_locale_name_from_win32_LCID (lcid);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/localename.h gettext-0.18.1.1/gettext-tools/gnulib-lib/localename.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/localename.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/localename.h	2010-05-24 09:42:45.000000000 +0000
@@ -1,18 +1,20 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _GL_LOCALENAME_H
 #define _GL_LOCALENAME_H
@@ -85,12 +87,8 @@
       not require such a facility."
 
    The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name_default (void)
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE \
-      || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
-  _GL_ATTRIBUTE_CONST
-#endif
-  ;
+extern const char * gl_locale_name_default (void);
+
 
 #ifdef __cplusplus
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/lstat.c gettext-0.18.1.1/gettext-tools/gnulib-lib/lstat.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/lstat.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/lstat.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,10 +17,6 @@
 
 /* written by Jim Meyering */
 
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
-   rpl_lstat.  */
-#define __need_system_sys_stat_h
 #include <config.h>
 
 #if !HAVE_LSTAT
@@ -31,31 +27,29 @@
 #else /* HAVE_LSTAT */
 
 /* Get the original definition of lstat.  It might be defined as a macro.  */
+# define __need_system_sys_stat_h
 # include <sys/types.h>
 # include <sys/stat.h>
 # undef __need_system_sys_stat_h
 
-static int
+static inline int
 orig_lstat (const char *filename, struct stat *buf)
 {
   return lstat (filename, buf);
 }
 
 /* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-# include "sys/stat.h"
+# include <sys/stat.h>
 
 # include <string.h>
 # include <errno.h>
 
 /* lstat works differently on Linux and Solaris systems.  POSIX (see
-   "pathname resolution" in the glossary) requires that programs like
-   'ls' take into consideration the fact that FILE has a trailing slash
+   `pathname resolution' in the glossary) requires that programs like
+   `ls' take into consideration the fact that FILE has a trailing slash
    when FILE is a symbolic link.  On Linux and Solaris 10 systems, the
    lstat function already has the desired semantics (in treating
-   'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)',
+   `lstat ("symlink/", sbuf)' just like `lstat ("symlink/.", sbuf)',
    but on Solaris 9 and earlier it does not.
 
    If FILE has a trailing slash and specifies a symbolic link,
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/Makefile.gnulib gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.gnulib
--- gettext-0.19.3/gettext-tools/gnulib-lib/Makefile.gnulib	2014-10-16 06:00:44.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.gnulib	2010-06-03 21:36:31.000000000 +0000
@@ -1,27 +1,15 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-tools --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 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 --dir=gettext-tools --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 --makefile-name=Makefile.gnulib --libtool --macro-prefix=gl alloca-opt arg-nonnull atexit backupfile basename binary-io bison-i18n byteswap c++defs c-ctype c-strcase c-strcasestr c-strstr clean-temp 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 openmp ostream pipe pipe-filter-ii progname propername relocatable-prog relocatable-script sh-quote sigpipe sigprocmask 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 unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process warn-on-use wchar wctype write xalloc xconcat-filename xerror xmalloca xsetenv xstriconv xstriconveh xvasprintf
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -32,61 +20,42 @@
 libgettextlib_la_DEPENDENCIES = $(gl_LTLIBOBJS)
 EXTRA_libgettextlib_la_SOURCES =
 libgettextlib_la_LDFLAGS = $(AM_LDFLAGS)
-libgettextlib_la_LDFLAGS += -no-undefined
-libgettextlib_la_LDFLAGS += $(LIB_ACL)
-libgettextlib_la_LDFLAGS += $(LTLIBICONV)
-libgettextlib_la_LDFLAGS += $(LTLIBINTL)
-libgettextlib_la_LDFLAGS += $(LTLIBTHREAD)
-libgettextlib_la_LDFLAGS += $(LTLIBUNISTRING)
-libgettextlib_la_LDFLAGS += $(OPENMP_CFLAGS)
-libgettextlib_la_LDFLAGS += @INTL_MACOSX_LIBS@
-
-## begin gnulib module absolute-header
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-
-## end   gnulib module absolute-header
 
 ## begin gnulib module acl
 
-libgettextlib_la_SOURCES += copy-acl.c set-acl.c
+libgettextlib_la_SOURCES += set-mode-acl.c copy-acl.c file-has-acl.c
+
+EXTRA_DIST += acl-internal.h acl.h acl_entries.c
+
+EXTRA_libgettextlib_la_SOURCES += acl_entries.c
 
 ## end   gnulib module acl
 
+## begin gnulib module alignof
+
+
+EXTRA_DIST += alignof.h
+
+## end   gnulib module alignof
+
 ## begin gnulib module alloca-opt
 
 BUILT_SOURCES += $(ALLOCA_H)
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ALLOCA_H
-alloca.h: alloca.in.h $(top_builddir)/config.status
+alloca.h: alloca.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/alloca.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-else
-alloca.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
-## begin gnulib module allocator
-
-libgettextlib_la_SOURCES += allocator.c
-
-EXTRA_DIST += allocator.h
-
-## end   gnulib module allocator
-
 ## begin gnulib module areadlink
 
 libgettextlib_la_SOURCES += areadlink.c
@@ -95,11 +64,36 @@
 
 ## end   gnulib module areadlink
 
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/arg-nonnull.h
+
+## end   gnulib module arg-nonnull
+
 ## begin gnulib module argmatch
 
-libgettextlib_la_SOURCES += argmatch.c
 
-EXTRA_DIST += argmatch.h
+EXTRA_DIST += argmatch.c argmatch.h
+
+EXTRA_libgettextlib_la_SOURCES += argmatch.c
 
 ## end   gnulib module argmatch
 
@@ -132,7 +126,7 @@
 
 ## begin gnulib module binary-io
 
-libgettextlib_la_SOURCES += binary-io.h binary-io.c
+libgettextlib_la_SOURCES += binary-io.h
 
 ## end   gnulib module binary-io
 
@@ -142,23 +136,42 @@
 
 # We need the following in order to create <byteswap.h> when the system
 # doesn't have one.
-if GL_GENERATE_BYTESWAP_H
-byteswap.h: byteswap.in.h $(top_builddir)/config.status
+byteswap.h: byteswap.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/byteswap.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-else
-byteswap.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += byteswap.h byteswap.h-t
 
 EXTRA_DIST += byteswap.in.h
 
 ## end   gnulib module byteswap
 
+## begin gnulib module c++defs
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/c++defs.h
+
+## end   gnulib module c++defs
+
 ## begin gnulib module c-ctype
 
 libgettextlib_la_SOURCES += c-ctype.h c-ctype.c
@@ -201,14 +214,6 @@
 
 ## end   gnulib module canonicalize-lgpl
 
-## begin gnulib module careadlinkat
-
-libgettextlib_la_SOURCES += careadlinkat.c
-
-EXTRA_DIST += careadlinkat.h
-
-## end   gnulib module careadlinkat
-
 ## begin gnulib module classpath
 
 libgettextlib_la_SOURCES += classpath.h classpath.c
@@ -223,29 +228,12 @@
 
 ## begin gnulib module cloexec
 
-libgettextlib_la_SOURCES += cloexec.c
-
-EXTRA_DIST += cloexec.h
-
-## end   gnulib module cloexec
-
-## begin gnulib module close
-
-
-EXTRA_DIST += close.c
-
-EXTRA_libgettextlib_la_SOURCES += close.c
 
-## end   gnulib module close
+EXTRA_DIST += cloexec.c cloexec.h
 
-## begin gnulib module closedir
+EXTRA_libgettextlib_la_SOURCES += cloexec.c
 
-
-EXTRA_DIST += closedir.c dirent-private.h
-
-EXTRA_libgettextlib_la_SOURCES += closedir.c
-
-## end   gnulib module closedir
+## end   gnulib module cloexec
 
 ## begin gnulib module closeout
 
@@ -263,8 +251,21 @@
 
 ## begin gnulib module configmake
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
@@ -280,7 +281,6 @@
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -299,7 +299,11 @@
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
 
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
@@ -349,61 +353,6 @@
 
 ## end   gnulib module diffseq
 
-## begin gnulib module dirent
-
-BUILT_SOURCES += dirent.h
-
-# We need the following in order to create <dirent.h> when the system
-# doesn't have one that works with the given compiler.
-dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
-	      -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \
-	      -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \
-	      -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \
-	      -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \
-	      -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \
-	      -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \
-	      -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \
-	      -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \
-	      -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \
-	      -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \
-	      -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \
-	      -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \
-	      -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \
-	      -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \
-	      -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \
-	      -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \
-	      -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \
-	      -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \
-	      -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \
-	      -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \
-	      -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/dirent.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += dirent.h dirent.h-t
-
-EXTRA_DIST += dirent.in.h
-
-## end   gnulib module dirent
-
-## begin gnulib module dosname
-
-
-EXTRA_DIST += dosname.h
-
-## end   gnulib module dosname
-
 ## begin gnulib module dup2
 
 
@@ -419,14 +368,11 @@
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-if GL_GENERATE_ERRNO_H
-errno.h: errno.in.h $(top_builddir)/config.status
+errno.h: errno.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
 	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
 	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
@@ -437,10 +383,6 @@
 	      < $(srcdir)/errno.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-errno.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += errno.h errno.h-t
 
 EXTRA_DIST += errno.in.h
@@ -497,18 +439,15 @@
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-	      -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
-	      -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
-	      -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
+	      -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
 	      -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
 	      -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
 	      -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
@@ -526,14 +465,6 @@
 
 ## end   gnulib module fcntl-h
 
-## begin gnulib module fd-hook
-
-libgettextlib_la_SOURCES += fd-hook.c
-
-EXTRA_DIST += fd-hook.h
-
-## end   gnulib module fd-hook
-
 ## begin gnulib module fd-ostream
 
 libgettextlib_la_SOURCES += fd-ostream.c
@@ -617,28 +548,18 @@
 
 # We need the following in order to create <float.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_FLOAT_H
-float.h: float.in.h $(top_builddir)/config.status
+float.h: float.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
-	      -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
 	      < $(srcdir)/float.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-float.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += float.h float.h-t
 
-EXTRA_DIST += float.c float.in.h itold.c
-
-EXTRA_libgettextlib_la_SOURCES += float.c itold.c
+EXTRA_DIST += float.in.h
 
 ## end   gnulib module float
 
@@ -648,18 +569,13 @@
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-if GL_GENERATE_FNMATCH_H
-fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+fnmatch.h: fnmatch.in.h $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      < $(srcdir)/fnmatch.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-else
-fnmatch.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
 EXTRA_DIST += fnmatch.c fnmatch.in.h fnmatch_loop.c
@@ -677,15 +593,6 @@
 
 ## end   gnulib module fopen
 
-## begin gnulib module fstat
-
-
-EXTRA_DIST += fstat.c
-
-EXTRA_libgettextlib_la_SOURCES += fstat.c
-
-## end   gnulib module fstat
-
 ## begin gnulib module fstrcmp
 
 libgettextlib_la_SOURCES += fstrcmp.h fstrcmp.c
@@ -743,14 +650,12 @@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+	  sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      < $(srcdir)/getopt.in.h; \
@@ -766,16 +671,15 @@
 
 ## begin gnulib module gettext
 
-# If your project uses "gettextize --intl" to put a source-code
-# copy of libintl into the package, every Makefile.am needs
+# This is for those projects which use "gettextize --intl" to put a source-code
+# copy of libintl into their package. In such projects, every Makefile.am needs
 # -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# Here's one way to do this:
-#AM_CPPFLAGS += -I$(top_builddir)/intl
-# This option has no effect when the user disables NLS (because then
-# the intl directory contains no libintl.h file).  This option is not
-# enabled by default because the intl directory might not exist if
-# your project does not use "gettext --intl", and some compilers
-# complain about -I options applied to nonexistent directories.
+# For the Makefile.ams in other directories it is the maintainer's
+# responsibility; for the one from gnulib we do it here.
+# This option has no effect when the user disables NLS (because then the intl
+# directory contains no libintl.h file) or when the project does not use
+# "gettextize --intl".
+AM_CPPFLAGS += -I$(top_builddir)/intl
 
 EXTRA_DIST += $(top_srcdir)/../build-aux/config.rpath
 
@@ -799,10 +703,10 @@
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
 # Need @LIB_ACL@ because copy-file.c uses acl.h.
-# As of 2010-10-04, these are all added by gnulib-tool automatically.
-#libgettextlib_la_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
-
-libgettextlib_la_LDFLAGS += -release @VERSION@
+# Need @LTLIBC@ for -no-undefined to work on many platforms.
+libgettextlib_la_LDFLAGS += \
+  -release @VERSION@ \
+  $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL
@@ -917,16 +821,12 @@
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ICONV_H
-iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-	      -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
 	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
 	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
 	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
@@ -937,10 +837,6 @@
 	      < $(srcdir)/iconv.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-iconv.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += iconv.h iconv.h-t
 
 EXTRA_DIST += iconv.in.h
@@ -969,19 +865,12 @@
 MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 
-EXTRA_DIST += 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
+EXTRA_DIST += iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c
 
-EXTRA_libgettextlib_la_SOURCES += iconv.c iconv_close.c iconv_open.c
+EXTRA_libgettextlib_la_SOURCES += iconv_open.c
 
 ## end   gnulib module iconv_open
 
-## begin gnulib module ignore-value
-
-
-EXTRA_DIST += ignore-value.h
-
-## end   gnulib module ignore-value
-
 ## begin gnulib module intprops
 
 
@@ -989,15 +878,6 @@
 
 ## end   gnulib module intprops
 
-## begin gnulib module iswblank
-
-
-EXTRA_DIST += iswblank.c
-
-EXTRA_libgettextlib_la_SOURCES += iswblank.c
-
-## end   gnulib module iswblank
-
 ## begin gnulib module javacomp
 
 libgettextlib_la_SOURCES += javacomp.h javacomp.c
@@ -1118,42 +998,42 @@
 	mv -f $@-t $@
 
 glib/ghash.h: glib/ghash.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/ghash.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/glist.h: glib/glist.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/glist.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gprimes.h: glib/gprimes.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gprimes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gstrfuncs.h: glib/gstrfuncs.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gstrfuncs.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gstring.h: glib/gstring.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gstring.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gtypes.h: glib/gtypes.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gtypes.in.h; \
 	} > $@-t
@@ -1244,329 +1124,329 @@
 BUILT_SOURCES += $(LIBXML_H)
 
 libxml/DOCBparser.h: libxml/DOCBparser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/DOCBparser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/HTMLparser.h: libxml/HTMLparser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/HTMLparser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/HTMLtree.h: libxml/HTMLtree.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/HTMLtree.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/SAX.h: libxml/SAX.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/SAX.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/SAX2.h: libxml/SAX2.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/SAX2.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/c14n.h: libxml/c14n.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/c14n.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/catalog.h: libxml/catalog.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/catalog.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/chvalid.h: libxml/chvalid.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/chvalid.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/debugXML.h: libxml/debugXML.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/debugXML.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/dict.h: libxml/dict.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/dict.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/encoding.h: libxml/encoding.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/encoding.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/entities.h: libxml/entities.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/entities.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/globals.h: libxml/globals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/globals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/hash.h: libxml/hash.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/hash.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/list.h: libxml/list.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/list.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/nanoftp.h: libxml/nanoftp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/nanoftp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/nanohttp.h: libxml/nanohttp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/nanohttp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/parser.h: libxml/parser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/parser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/parserInternals.h: libxml/parserInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/parserInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/pattern.h: libxml/pattern.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/pattern.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/relaxng.h: libxml/relaxng.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/relaxng.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/schemasInternals.h: libxml/schemasInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/schemasInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/schematron.h: libxml/schematron.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/schematron.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/threads.h: libxml/threads.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/threads.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/tree.h: libxml/tree.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/tree.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/uri.h: libxml/uri.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/uri.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/valid.h: libxml/valid.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/valid.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xinclude.h: libxml/xinclude.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xinclude.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xlink.h: libxml/xlink.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xlink.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlIO.h: libxml/xmlIO.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlIO.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlautomata.h: libxml/xmlautomata.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlautomata.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlerror.h: libxml/xmlerror.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlerror.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlexports.h: libxml/xmlexports.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlexports.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlmemory.h: libxml/xmlmemory.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlmemory.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlmodule.h: libxml/xmlmodule.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlmodule.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlreader.h: libxml/xmlreader.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlreader.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlregexp.h: libxml/xmlregexp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlregexp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlsave.h: libxml/xmlsave.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlsave.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlschemas.h: libxml/xmlschemas.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlschemas.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlschemastypes.h: libxml/xmlschemastypes.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlschemastypes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlstring.h: libxml/xmlstring.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlstring.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlunicode.h: libxml/xmlunicode.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlunicode.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlversion.h: libxml/xmlversion.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlversion.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlwriter.h: libxml/xmlwriter.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlwriter.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpath.h: libxml/xpath.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpath.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpathInternals.h: libxml/xpathInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpathInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpointer.h: libxml/xpointer.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpointer.in.h; \
 	} > $@-t
@@ -1724,23 +1604,16 @@
 
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
-locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+	      -e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
 	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
 	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
 	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
-	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -1803,7 +1676,7 @@
 
 ## begin gnulib module mbiter
 
-libgettextlib_la_SOURCES += mbiter.h mbiter.c
+libgettextlib_la_SOURCES += mbiter.h
 
 ## end   gnulib module mbiter
 
@@ -1834,7 +1707,7 @@
 ## begin gnulib module mbsrtowcs
 
 
-EXTRA_DIST += mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c
+EXTRA_DIST += mbsrtowcs-state.c mbsrtowcs.c
 
 EXTRA_libgettextlib_la_SOURCES += mbsrtowcs-state.c mbsrtowcs.c
 
@@ -1856,7 +1729,7 @@
 
 ## begin gnulib module mbuiter
 
-libgettextlib_la_SOURCES += mbuiter.h mbuiter.c
+libgettextlib_la_SOURCES += mbuiter.h
 
 ## end   gnulib module mbuiter
 
@@ -1912,24 +1785,6 @@
 
 ## end   gnulib module moo
 
-## begin gnulib module msvc-inval
-
-
-EXTRA_DIST += msvc-inval.c msvc-inval.h
-
-EXTRA_libgettextlib_la_SOURCES += msvc-inval.c
-
-## end   gnulib module msvc-inval
-
-## begin gnulib module msvc-nothrow
-
-
-EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
-
-EXTRA_libgettextlib_la_SOURCES += msvc-nothrow.c
-
-## end   gnulib module msvc-nothrow
-
 ## begin gnulib module obstack
 
 
@@ -1948,15 +1803,6 @@
 
 ## end   gnulib module open
 
-## begin gnulib module opendir
-
-
-EXTRA_DIST += dirent-private.h opendir.c
-
-EXTRA_libgettextlib_la_SOURCES += opendir.c
-
-## end   gnulib module opendir
-
 ## begin gnulib module ostream
 
 libgettextlib_la_SOURCES += ostream.c
@@ -1993,9 +1839,15 @@
 
 ## end   gnulib module pathmax
 
+## begin gnulib module pipe
+
+libgettextlib_la_SOURCES += pipe.h pipe.c w32spawn.h
+
+## end   gnulib module pipe
+
 ## begin gnulib module pipe-filter-ii
 
-libgettextlib_la_SOURCES += pipe-filter-ii.c pipe-filter-aux.c
+libgettextlib_la_SOURCES += pipe-filter-ii.c
 
 EXTRA_DIST += pipe-filter-aux.h pipe-filter.h
 
@@ -2124,40 +1976,18 @@
 
 ## end   gnulib module propername
 
-## begin gnulib module qacl
-
-libgettextlib_la_SOURCES += acl-errno-valid.c file-has-acl.c qcopy-acl.c qset-acl.c
-
-EXTRA_DIST += acl-internal.h acl.h acl_entries.c
-
-EXTRA_libgettextlib_la_SOURCES += acl_entries.c
-
-## end   gnulib module qacl
-
 ## begin gnulib module quote
 
-
-EXTRA_DIST += quote.h
+libgettextlib_la_SOURCES += quote.h quote.c
 
 ## end   gnulib module quote
 
 ## begin gnulib module quotearg
 
-libgettextlib_la_SOURCES += quotearg.c
-
-EXTRA_DIST += quote.h quotearg.h
+libgettextlib_la_SOURCES += quotearg.h quotearg.c
 
 ## end   gnulib module quotearg
 
-## begin gnulib module raise
-
-
-EXTRA_DIST += raise.c
-
-EXTRA_libgettextlib_la_SOURCES += raise.c
-
-## end   gnulib module raise
-
 ## begin gnulib module rawmemchr
 
 
@@ -2167,24 +1997,6 @@
 
 ## end   gnulib module rawmemchr
 
-## begin gnulib module read
-
-
-EXTRA_DIST += read.c
-
-EXTRA_libgettextlib_la_SOURCES += read.c
-
-## end   gnulib module read
-
-## begin gnulib module readdir
-
-
-EXTRA_DIST += dirent-private.h readdir.c
-
-EXTRA_libgettextlib_la_SOURCES += readdir.c
-
-## end   gnulib module readdir
-
 ## begin gnulib module readlink
 
 
@@ -2206,20 +2018,6 @@
 ## begin gnulib module relocatable-prog
 
 DEFS += -DEXEEXT=\"@EXEEXT@\"
-if RELOCATABLE_VIA_WRAPPER
-uninstall-hook: uninstall-relocwrapper
-uninstall-relocwrapper:
-	if test $(RELOCATABLE) = yes; then \
-	  case '$(EXEEXT)' in \
-	    .bin*) ;; \
-	    *) cd $(top_builddir) && \
-	       $(MAKE) $(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT) \
-		       AM_MAKEFLAGS='$(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT)' \
-		       uninstall ;; \
-	  esac; \
-	fi
-.PHONY: uninstall-relocwrapper
-endif
 
 EXTRA_DIST += progreloc.c relocatable.c relocatable.h
 
@@ -2232,7 +2030,7 @@
 ## begin gnulib module relocatable-prog-wrapper
 
 
-EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c
+EXTRA_DIST += areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c
 
 EXTRA_DIST += $(top_srcdir)/../build-aux/install-reloc
 
@@ -2256,19 +2054,19 @@
 
 ## begin gnulib module safe-read
 
-libgettextlib_la_SOURCES += safe-read.c
 
-EXTRA_DIST += safe-read.h
+EXTRA_DIST += safe-read.c safe-read.h
+
+EXTRA_libgettextlib_la_SOURCES += safe-read.c
 
 ## end   gnulib module safe-read
 
 ## begin gnulib module safe-write
 
-libgettextlib_la_SOURCES += safe-write.c
 
-EXTRA_DIST += safe-read.c safe-write.h
+EXTRA_DIST += safe-write.c safe-write.h
 
-EXTRA_libgettextlib_la_SOURCES += safe-read.c
+EXTRA_libgettextlib_la_SOURCES += safe-write.c
 
 ## end   gnulib module safe-write
 
@@ -2278,39 +2076,23 @@
 
 # We need the following in order to create a replacement for <sched.h> when
 # the system doesn't have one.
-if GL_GENERATE_SCHED_H
-sched.h: sched.in.h $(top_builddir)/config.status
+sched.h: sched.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+	  sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \
 	      -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \
 	      < $(srcdir)/sched.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-sched.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += sched.h sched.h-t
 
 EXTRA_DIST += sched.in.h
 
 ## end   gnulib module sched
 
-## begin gnulib module secure_getenv
-
-
-EXTRA_DIST += secure_getenv.c
-
-EXTRA_libgettextlib_la_SOURCES += secure_getenv.c
-
-## end   gnulib module secure_getenv
-
 ## begin gnulib module setenv
 
 
@@ -2320,15 +2102,6 @@
 
 ## end   gnulib module setenv
 
-## begin gnulib module setlocale
-
-
-EXTRA_DIST += setlocale.c
-
-EXTRA_libgettextlib_la_SOURCES += setlocale.c
-
-## end   gnulib module setlocale
-
 ## begin gnulib module sh-quote
 
 libgettextlib_la_SOURCES += sh-quote.h sh-quote.c
@@ -2337,7 +2110,6 @@
 
 ## begin gnulib module sigaction
 
-libgettextlib_la_SOURCES += sig-handler.c
 
 EXTRA_DIST += sig-handler.h sigaction.c
 
@@ -2345,36 +2117,27 @@
 
 ## end   gnulib module sigaction
 
-## begin gnulib module signal-h
+## begin gnulib module signal
 
 BUILT_SOURCES += signal.h
 
 # We need the following in order to create <signal.h> when the system
 # doesn't have a complete one.
-signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
-	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
+	      -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
+	      -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
 	      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
-	      -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
 	      -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
 	      -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
 	      -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
 	      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
 	      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-	      -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
-	      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -2385,16 +2148,7 @@
 
 EXTRA_DIST += signal.in.h
 
-## end   gnulib module signal-h
-
-## begin gnulib module sigpipe
-
-
-EXTRA_DIST += stdio-write.c
-
-EXTRA_libgettextlib_la_SOURCES += stdio-write.c
-
-## end   gnulib module sigpipe
+## end   gnulib module signal
 
 ## begin gnulib module sigprocmask
 
@@ -2411,112 +2165,6 @@
 
 ## end   gnulib module size_max
 
-## begin gnulib module snippet/_Noreturn
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-
-_NORETURN_H=$(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-## end   gnulib module snippet/_Noreturn
-
-## begin gnulib module snippet/arg-nonnull
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-
-ARG_NONNULL_H=arg-nonnull.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-
-## end   gnulib module snippet/arg-nonnull
-
-## begin gnulib module snippet/c++defs
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/c++defs.h
-
-## end   gnulib module snippet/c++defs
-
-## begin gnulib module snippet/unused-parameter
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += unused-parameter.h
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
-
-UNUSED_PARAMETER_H=unused-parameter.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-
-## end   gnulib module snippet/unused-parameter
-
-## begin gnulib module snippet/warn-on-use
-
-BUILT_SOURCES += warn-on-use.h
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
-
-WARN_ON_USE_H=warn-on-use.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-
-## end   gnulib module snippet/warn-on-use
-
 ## begin gnulib module snprintf
 
 
@@ -2532,43 +2180,38 @@
 
 # We need the following in order to create a replacement for <spawn.h> when
 # the system doesn't have one.
-spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+spawn.h: spawn.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
+	  sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_DESTROY''@/$(GNULIB_POSIX_SPAWNATTR_DESTROY)/g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN''@|$(GNULIB_POSIX_SPAWN)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNP''@|$(GNULIB_POSIX_SPAWNP)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_INIT''@|$(GNULIB_POSIX_SPAWNATTR_INIT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@|$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@|$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@|$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@|$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@|$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@|$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@|$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@|$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@|$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@|$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@|$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@|$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_DESTROY''@|$(GNULIB_POSIX_SPAWNATTR_DESTROY)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \
 	      -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -2581,12 +2224,6 @@
 
 ## end   gnulib module spawn
 
-## begin gnulib module spawn-pipe
-
-libgettextlib_la_SOURCES += spawn-pipe.h spawn-pipe.c w32spawn.h
-
-## end   gnulib module spawn-pipe
-
 ## begin gnulib module stat
 
 
@@ -2602,22 +2239,15 @@
 
 # We need the following in order to create <stdarg.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDARG_H
-stdarg.h: stdarg.in.h $(top_builddir)/config.status
+stdarg.h: stdarg.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
 	      < $(srcdir)/stdarg.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdarg.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdarg.h stdarg.h-t
 
 EXTRA_DIST += stdarg.in.h
@@ -2630,17 +2260,12 @@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-if GL_GENERATE_STDBOOL_H
-stdbool.h: stdbool.in.h $(top_builddir)/config.status
+stdbool.h: stdbool.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdbool.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
 EXTRA_DIST += stdbool.in.h
@@ -2653,24 +2278,17 @@
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDDEF_H
-stddef.h: stddef.in.h $(top_builddir)/config.status
+stddef.h: stddef.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
 	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
 	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
 	      < $(srcdir)/stddef.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stddef.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stddef.h stddef.h-t
 
 EXTRA_DIST += stddef.in.h
@@ -2683,21 +2301,17 @@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDINT_H
-stdint.h: stdint.in.h $(top_builddir)/config.status
+stdint.h: stdint.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
 	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
 	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
 	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
 	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
@@ -2717,10 +2331,6 @@
 	      < $(srcdir)/stdint.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdint.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
 EXTRA_DIST += stdint.in.h
@@ -2733,71 +2343,55 @@
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
-	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
-	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
-	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
-	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
-	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
-	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
-	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
-	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
-	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
-	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
-	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
-	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
-	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
-	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
-	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
-	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
-	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
-	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
-	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
-	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
-	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
-	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
-	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
-	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
-	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
-	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
-	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
-	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
-	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
-	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
-	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
-	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
-	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
-	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
-	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
-	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+	      -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+	      -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+	      -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+	      -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+	      -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      < $(srcdir)/stdio.in.h | \
 	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
-	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -2806,14 +2400,11 @@
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
 	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
-	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
-	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -2834,7 +2425,6 @@
 	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
 	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
@@ -2851,7 +2441,9 @@
 	mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
-EXTRA_DIST += stdio.in.h
+EXTRA_DIST += stdio-write.c stdio.in.h
+
+EXTRA_libgettextlib_la_SOURCES += stdio-write.c
 
 ## end   gnulib module stdio
 
@@ -2861,97 +2453,73 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+	      -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+	      -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
 	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
 	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
@@ -3012,15 +2580,6 @@
 
 ## end   gnulib module strerror
 
-## begin gnulib module strerror-override
-
-
-EXTRA_DIST += strerror-override.c strerror-override.h
-
-EXTRA_libgettextlib_la_SOURCES += strerror-override.c
-
-## end   gnulib module strerror-override
-
 ## begin gnulib module striconv
 
 libgettextlib_la_SOURCES += striconv.h striconv.c
@@ -3053,55 +2612,48 @@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-	      -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-	      -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-	      -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-	      -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-	      -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-	      -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-	      -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-	      -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-	      -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-	      -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-	      -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-	      -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-	      -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-	      -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-	      -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-	      -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-	      -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-	      -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-	      -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-	      -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-	      -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-	      -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-	      -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-	      -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-	      -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-	      -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-	      -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-	      -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-	      -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-	      -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-	      -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-	      -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-	      -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+	  sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -3117,18 +2669,15 @@
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-	      -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
 	      -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
 	      -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -3192,9 +2741,9 @@
 ## begin gnulib module strtoul
 
 
-EXTRA_DIST += strtol.c strtoul.c
+EXTRA_DIST += strtoul.c
 
-EXTRA_libgettextlib_la_SOURCES += strtol.c strtoul.c
+EXTRA_libgettextlib_la_SOURCES += strtoul.c
 
 ## end   gnulib module strtoul
 
@@ -3233,21 +2782,16 @@
 
 # We need the following in order to create <sys/select.h> when the system
 # doesn't have one that works with the given compiler.
-sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/select.h: sys_select.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
 	      -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \
-	      -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \
-	      -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \
+	      -e 's|@''GNULIB_SELECT''@|$(GNULIB_SELECT)|g' \
 	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \
-	      -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \
 	      -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -3261,35 +2805,79 @@
 
 ## end   gnulib module sys_select
 
+## begin gnulib module sys_socket
+
+BUILT_SOURCES += sys/socket.h
+
+# We need the following in order to create <sys/socket.h> when the system
+# doesn't have one that works with the given compiler.
+sys/socket.h: sys_socket.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
+	      -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_SOCKET''@|$(GNULIB_SOCKET)|g' \
+	      -e 's|@''GNULIB_CONNECT''@|$(GNULIB_CONNECT)|g' \
+	      -e 's|@''GNULIB_ACCEPT''@|$(GNULIB_ACCEPT)|g' \
+	      -e 's|@''GNULIB_BIND''@|$(GNULIB_BIND)|g' \
+	      -e 's|@''GNULIB_GETPEERNAME''@|$(GNULIB_GETPEERNAME)|g' \
+	      -e 's|@''GNULIB_GETSOCKNAME''@|$(GNULIB_GETSOCKNAME)|g' \
+	      -e 's|@''GNULIB_GETSOCKOPT''@|$(GNULIB_GETSOCKOPT)|g' \
+	      -e 's|@''GNULIB_LISTEN''@|$(GNULIB_LISTEN)|g' \
+	      -e 's|@''GNULIB_RECV''@|$(GNULIB_RECV)|g' \
+	      -e 's|@''GNULIB_SEND''@|$(GNULIB_SEND)|g' \
+	      -e 's|@''GNULIB_RECVFROM''@|$(GNULIB_RECVFROM)|g' \
+	      -e 's|@''GNULIB_SENDTO''@|$(GNULIB_SENDTO)|g' \
+	      -e 's|@''GNULIB_SETSOCKOPT''@|$(GNULIB_SETSOCKOPT)|g' \
+	      -e 's|@''GNULIB_SHUTDOWN''@|$(GNULIB_SHUTDOWN)|g' \
+	      -e 's|@''GNULIB_ACCEPT4''@|$(GNULIB_ACCEPT4)|g' \
+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+	      -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+	      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
+	      -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \
+	      -e 's|@''HAVE_ACCEPT4''@|$(HAVE_ACCEPT4)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/sys_socket.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
+MOSTLYCLEANDIRS += sys
+
+EXTRA_DIST += sys_socket.in.h
+
+## end   gnulib module sys_socket
+
 ## begin gnulib module sys_stat
 
 BUILT_SOURCES += sys/stat.h
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+	      -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+	      -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+	      -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+	      -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+	      -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+	      -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+	      -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+	      -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+	      -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+	      -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+	      -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -3329,22 +2917,18 @@
 
 # We need the following in order to create <sys/time.h> when the system
 # doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/time.h: sys_time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+	  sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
 	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
 	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
 	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
 	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -3357,49 +2941,19 @@
 
 ## end   gnulib module sys_time
 
-## begin gnulib module sys_types
-
-BUILT_SOURCES += sys/types.h
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      < $(srcdir)/sys_types.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += sys/types.h sys/types.h-t
-
-EXTRA_DIST += sys_types.in.h
-
-## end   gnulib module sys_types
-
 ## begin gnulib module sys_wait
 
 BUILT_SOURCES += sys/wait.h
 
 # We need the following in order to create <sys/wait.h> when the system
 # has one that is incomplete.
-sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/wait.h: sys_wait.in.h
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-	      -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_wait.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -3412,9 +2966,10 @@
 
 ## begin gnulib module tempname
 
-libgettextlib_la_SOURCES += tempname.c
 
-EXTRA_DIST += tempname.h
+EXTRA_DIST += tempname.c tempname.h
+
+EXTRA_libgettextlib_la_SOURCES += tempname.c
 
 ## end   gnulib module tempname
 
@@ -3513,26 +3068,21 @@
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
-	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
-	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
-	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
-	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+	      -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+	      -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+	      -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+	      -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+	      -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
-	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
-	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -3683,69 +3233,56 @@
 ## begin gnulib module unistd
 
 BUILT_SOURCES += unistd.h
-libgettextlib_la_SOURCES += unistd.c
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
-	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
-	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
-	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
-	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
-	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
-	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
-	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
-	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
-	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
-	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
-	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
-	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
-	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
-	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
-	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
-	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
-	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
-	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
-	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
-	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
-	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
-	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
-	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
-	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+	      -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+	      -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+	      -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+	      -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+	      -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+	      -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+	      -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+	      -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+	      -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+	      -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+	      -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      < $(srcdir)/unistd.in.h | \
 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -3754,62 +3291,48 @@
 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
-	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
-	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
-	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
-	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
-	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
-	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
@@ -3834,9 +3357,10 @@
 
 ## begin gnulib module unistd-safer
 
-libgettextlib_la_SOURCES += dup-safer.c fd-safer.c pipe-safer.c
 
-EXTRA_DIST += unistd--.h unistd-safer.h
+EXTRA_DIST += dup-safer.c fd-safer.c pipe-safer.c unistd--.h unistd-safer.h
+
+EXTRA_libgettextlib_la_SOURCES += dup-safer.c fd-safer.c pipe-safer.c
 
 ## end   gnulib module unistd-safer
 
@@ -3978,6 +3502,31 @@
 
 ## end   gnulib module unsetenv
 
+## begin gnulib module unused-parameter
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += unused-parameter.h
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/../build-aux/unused-parameter.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+	  < $(top_srcdir)/../build-aux/unused-parameter.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
+
+UNUSED_PARAMETER_H=unused-parameter.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/unused-parameter.h
+
+## end   gnulib module unused-parameter
+
 ## begin gnulib module vasnprintf
 
 
@@ -3998,8 +3547,7 @@
 
 ## begin gnulib module verify
 
-
-EXTRA_DIST += verify.h
+libgettextlib_la_SOURCES += verify.h
 
 ## end   gnulib module verify
 
@@ -4018,14 +3566,24 @@
 
 ## end   gnulib module wait-process
 
-## begin gnulib module waitpid
+## begin gnulib module warn-on-use
 
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
 
-EXTRA_DIST += waitpid.c
+WARN_ON_USE_H=warn-on-use.h
 
-EXTRA_libgettextlib_la_SOURCES += waitpid.c
+EXTRA_DIST += $(top_srcdir)/../build-aux/warn-on-use.h
 
-## end   gnulib module waitpid
+## end   gnulib module warn-on-use
 
 ## begin gnulib module wchar
 
@@ -4033,57 +3591,25 @@
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -4093,38 +3619,9 @@
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -4136,10 +3633,10 @@
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
@@ -4148,35 +3645,23 @@
 
 ## end   gnulib module wchar
 
-## begin gnulib module wctype-h
+## begin gnulib module wctype
 
 BUILT_SOURCES += wctype.h
-libgettextlib_la_SOURCES += wctype-h.c
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
-	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
 	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
-	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/wctype.in.h; \
@@ -4186,7 +3671,7 @@
 
 EXTRA_DIST += wctype.in.h
 
-## end   gnulib module wctype-h
+## end   gnulib module wctype
 
 ## begin gnulib module wcwidth
 
@@ -4256,7 +3741,7 @@
 
 ## begin gnulib module xsize
 
-libgettextlib_la_SOURCES += xsize.h xsize.c
+libgettextlib_la_SOURCES += xsize.h
 
 ## end   gnulib module xsize
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/Makefile.in gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.in
--- gettext-0.19.3/gettext-tools/gnulib-lib/Makefile.in	2014-10-16 06:01:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.in	2010-06-06 20:12:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,78 +15,22 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-tools --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 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 --dir=gettext-tools --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 --makefile-name=Makefile.gnulib --libtool --macro-prefix=gl alloca-opt arg-nonnull atexit backupfile basename binary-io bison-i18n byteswap c++defs c-ctype c-strcase c-strcasestr c-strstr clean-temp 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 openmp ostream pipe pipe-filter-ii progname propername relocatable-prog relocatable-script sh-quote sigpipe sigprocmask 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 unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process warn-on-use wchar wctype write xalloc xconcat-filename xerror xmalloca xsetenv xstriconv xstriconveh xvasprintf
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -105,8 +50,8 @@
 # When building a shared library, don't export the variables
 # xmlMalloc, xmlMallocAtomic, xmlRealloc, xmlFree, xmlMemStrdup.
 @INCLUDED_LIBXML_TRUE@am__append_1 = -DLIBXML_STATIC
-DIST_COMMON = $(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/../build-aux/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib \
+	$(srcdir)/Makefile.in
 
 # Tell the mingw or Cygwin linker which symbols to export.
 @WOE32DLL_TRUE@am__append_2 = ../woe32dll/gettextlib-exports.c
@@ -148,64 +93,54 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -213,12 +148,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -235,7 +167,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -247,7 +178,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -256,26 +186,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -284,17 +208,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -320,7 +240,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -329,7 +248,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -338,26 +256,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -414,12 +330,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)" \
 	"$(DESTDIR)$(pkgdatadir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
@@ -453,59 +363,54 @@
 	libcroco/libcroco_rpl_la-cr-token.lo \
 	libcroco/libcroco_rpl_la-cr-utils.lo
 libcroco_rpl_la_OBJECTS = $(am_libcroco_rpl_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 @INCLUDED_LIBCROCO_TRUE@am_libcroco_rpl_la_rpath =
 am__DEPENDENCIES_1 =
-am__libgettextlib_la_SOURCES_DIST = copy-acl.c set-acl.c allocator.c \
-	areadlink.c argmatch.c gl_array_list.h gl_array_list.c \
+am__libgettextlib_la_SOURCES_DIST = set-mode-acl.c copy-acl.c \
+	file-has-acl.c areadlink.c gl_array_list.h gl_array_list.c \
 	backupfile.h backupfile.c addext.c basename.h basename.c \
-	binary-io.h binary-io.c c-ctype.h c-ctype.c c-strcase.h \
-	c-strcasecmp.c c-strncasecmp.c c-strcasestr.h c-strcasestr.c \
-	c-strstr.h c-strstr.c careadlinkat.c classpath.h classpath.c \
-	clean-temp.h clean-temp.c cloexec.c closeout.h closeout.c \
-	concat-filename.c copy-file.h copy-file.c csharpcomp.h \
-	csharpcomp.c csharpexec.h csharpexec.c diffseq.h \
-	error-progname.h error-progname.c execute.h execute.c \
-	w32spawn.h exitfail.c fatal-signal.h fatal-signal.c fd-hook.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 \
-	../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 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 \
-	acl-errno-valid.c file-has-acl.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 \
+	binary-io.h c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \
+	c-strncasecmp.c c-strcasestr.h c-strcasestr.c c-strstr.h \
+	c-strstr.c classpath.h classpath.c clean-temp.h clean-temp.c \
+	closeout.h closeout.c concat-filename.c copy-file.h \
+	copy-file.c csharpcomp.h csharpcomp.c csharpexec.h \
+	csharpexec.c diffseq.h error-progname.h error-progname.c \
+	execute.h execute.c w32spawn.h exitfail.c fatal-signal.h \
+	fatal-signal.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 ../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 mbchar.c mbiter.h \
+	mbslen.c mbsstr.c mbswidth.h mbswidth.c mbuiter.h minmax.h \
+	ostream.c pipe.h pipe.c pipe-filter-ii.c pipe2.c pipe2-safer.c \
+	progname.h progname.c propername.h propername.c quote.h \
+	quote.c quotearg.h quotearg.c sh-quote.h sh-quote.c size_max.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 term-styled-ostream.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 unilbrk/lbrktables.c \
 	unilbrk/u8-possible-linebreaks.c unilbrk/u8-width-linebreaks.c \
 	unilbrk/ulc-common.c unilbrk/ulc-width-linebreaks.c \
-	uniname/uniname.c unistd.c dup-safer.c fd-safer.c pipe-safer.c \
-	unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c unistr/u8-check.c \
-	unistr/u8-mblen.c unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c \
-	unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c \
-	unistr/u8-mbtoucr.c unistr/u8-prev.c unistr/u8-uctomb.c \
-	unistr/u8-uctomb-aux.c uniwidth/width.c 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
+	uniname/uniname.c unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c \
+	unistr/u8-check.c unistr/u8-mblen.c unistr/u8-mbtouc.c \
+	unistr/u8-mbtouc-aux.c unistr/u8-mbtouc-unsafe.c \
+	unistr/u8-mbtouc-unsafe-aux.c unistr/u8-mbtoucr.c \
+	unistr/u8-prev.c unistr/u8-uctomb.c unistr/u8-uctomb-aux.c \
+	uniwidth/width.c verify.h wait-process.h wait-process.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 xstriconv.h xstriconv.c \
+	xstriconveh.c xvasprintf.h xvasprintf.c xasprintf.c
 @WOE32DLL_TRUE@am__objects_1 = ../woe32dll/gettextlib-exports.lo
 @WOE32DLL_FALSE@am__objects_2 = html-styled-ostream.lo
 @WOE32DLL_TRUE@am__objects_3 = ../woe32dll/c++html-styled-ostream.lo
@@ -534,37 +439,32 @@
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	unistr/u8-uctomb-aux.lo
 @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_19 =  \
 @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@	uniwidth/width.lo
-am_libgettextlib_la_OBJECTS = copy-acl.lo set-acl.lo allocator.lo \
-	areadlink.lo argmatch.lo gl_array_list.lo backupfile.lo \
-	addext.lo basename.lo binary-io.lo c-ctype.lo c-strcasecmp.lo \
-	c-strncasecmp.lo c-strcasestr.lo c-strstr.lo careadlinkat.lo \
-	classpath.lo clean-temp.lo cloexec.lo closeout.lo \
-	concat-filename.lo copy-file.lo csharpcomp.lo csharpexec.lo \
-	error-progname.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 \
+am_libgettextlib_la_OBJECTS = set-mode-acl.lo copy-acl.lo \
+	file-has-acl.lo areadlink.lo gl_array_list.lo backupfile.lo \
+	addext.lo basename.lo c-ctype.lo c-strcasecmp.lo \
+	c-strncasecmp.lo c-strcasestr.lo c-strstr.lo classpath.lo \
+	clean-temp.lo closeout.lo concat-filename.lo copy-file.lo \
+	csharpcomp.lo csharpexec.lo error-progname.lo execute.lo \
+	exitfail.lo fatal-signal.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 \
 	localcharset.lo localename.lo glthread/lock.lo malloca.lo \
-	mbchar.lo mbiter.lo mbslen.lo mbsstr.lo mbswidth.lo mbuiter.lo \
-	ostream.lo pipe-filter-ii.lo pipe-filter-aux.lo pipe2.lo \
-	pipe2-safer.lo progname.lo propername.lo acl-errno-valid.lo \
-	file-has-acl.lo qcopy-acl.lo qset-acl.lo quotearg.lo \
-	safe-read.lo safe-write.lo sh-quote.lo sig-handler.lo \
-	spawn-pipe.lo striconv.lo striconveh.lo striconveha.lo \
-	strnlen1.lo styled-ostream.lo tempname.lo term-ostream.lo \
-	$(am__objects_4) $(am__objects_5) glthread/threadlib.lo \
-	glthread/tls.lo tmpdir.lo trim.lo $(am__objects_6) \
-	unilbrk/lbrktables.lo $(am__objects_7) $(am__objects_8) \
-	unilbrk/ulc-common.lo $(am__objects_9) $(am__objects_10) \
-	unistd.lo dup-safer.lo fd-safer.lo pipe-safer.lo \
-	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
-	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
-	$(am__objects_17) $(am__objects_18) $(am__objects_19) \
-	wait-process.lo wctype-h.lo xmalloc.lo xstrdup.lo \
+	mbchar.lo mbslen.lo mbsstr.lo mbswidth.lo ostream.lo pipe.lo \
+	pipe-filter-ii.lo pipe2.lo pipe2-safer.lo progname.lo \
+	propername.lo quote.lo quotearg.lo sh-quote.lo striconv.lo \
+	striconveh.lo striconveha.lo strnlen1.lo styled-ostream.lo \
+	term-ostream.lo $(am__objects_4) $(am__objects_5) \
+	glthread/threadlib.lo glthread/tls.lo tmpdir.lo trim.lo \
+	$(am__objects_6) unilbrk/lbrktables.lo $(am__objects_7) \
+	$(am__objects_8) unilbrk/ulc-common.lo $(am__objects_9) \
+	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+	$(am__objects_13) $(am__objects_14) $(am__objects_15) \
+	$(am__objects_16) $(am__objects_17) $(am__objects_18) \
+	$(am__objects_19) wait-process.lo xmalloc.lo xstrdup.lo \
 	xconcat-filename.lo xerror.lo gl_xlist.lo xmalloca.lo \
-	xreadlink.lo xsetenv.lo xsize.lo xstriconv.lo xstriconveh.lo \
+	xreadlink.lo xsetenv.lo xstriconv.lo xstriconveh.lo \
 	xvasprintf.lo xasprintf.lo
 libgettextlib_la_OBJECTS = $(am_libgettextlib_la_OBJECTS)
 libglib_rpl_la_LIBADD =
@@ -611,18 +511,6 @@
 	libxml/libxml_rpl_la-xpath.lo libxml/libxml_rpl_la-xpointer.lo
 libxml_rpl_la_OBJECTS = $(am_libxml_rpl_la_OBJECTS)
 @INCLUDED_LIBXML_TRUE@am_libxml_rpl_la_rpath =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -632,36 +520,38 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libcroco_rpl_la_SOURCES) $(libgettextlib_la_SOURCES) \
 	$(EXTRA_libgettextlib_la_SOURCES) $(libglib_rpl_la_SOURCES) \
 	$(libxml_rpl_la_SOURCES)
@@ -669,36 +559,13 @@
 	$(am__libgettextlib_la_SOURCES_DIST) \
 	$(EXTRA_libgettextlib_la_SOURCES) $(libglib_rpl_la_SOURCES) \
 	$(libxml_rpl_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DATA = $(gettextsrc_DATA) $(pkgdata_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 # Where to install javaversion.class.
 pkgdatadir = $(datadir)/gettext
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -707,7 +574,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -745,7 +611,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@ -DEXEEXT=\"@EXEEXT@\" -DEXEEXT=\"@EXEEXT@\" \
@@ -783,18 +648,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -806,26 +670,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -833,8 +687,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -846,23 +698,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -885,7 +732,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -903,18 +749,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -939,47 +780,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -987,7 +820,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -997,21 +829,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -1023,103 +851,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -1130,11 +905,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -1144,6 +914,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -1156,7 +927,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1177,16 +947,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -1209,48 +979,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -1273,6 +1028,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1282,13 +1038,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1297,47 +1056,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1352,8 +1080,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1393,7 +1119,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1415,8 +1140,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1424,13 +1149,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1443,21 +1166,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1470,9 +1191,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1496,9 +1217,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1512,12 +1231,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1525,8 +1241,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1538,41 +1252,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1586,27 +1288,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1614,34 +1303,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1657,9 +1337,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1679,8 +1357,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1689,8 +1365,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1705,7 +1379,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1756,6 +1429,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1763,7 +1437,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1774,45 +1447,33 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects no-dependencies
-
-# If your project uses "gettextize --intl" to put a source-code
-# copy of libintl into the package, every Makefile.am needs
-# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# Here's one way to do this:
-#AM_CPPFLAGS += -I$(top_builddir)/intl
-# This option has no effect when the user disables NLS (because then
-# the intl directory contains no libintl.h file).  This option is not
-# enabled by default because the intl directory might not exist if
-# your project does not use "gettext --intl", and some compilers
-# complain about -I options applied to nonexistent directories.
-EXTRA_DIST = alloca.in.h allocator.h areadlink.h argmatch.h atexit.c \
-	byteswap.in.h c-strcaseeq.h str-two-way.h canonicalize-lgpl.c \
-	careadlinkat.h cloexec.h close.c closedir.c dirent-private.h \
+EXTRA_DIST = acl-internal.h acl.h acl_entries.c alignof.h alloca.in.h \
+	areadlink.h $(top_srcdir)/../build-aux/arg-nonnull.h \
+	argmatch.c argmatch.h atexit.c byteswap.in.h \
+	$(top_srcdir)/../build-aux/c++defs.h c-strcaseeq.h \
+	str-two-way.h canonicalize-lgpl.c cloexec.c cloexec.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 \
-	fd_ostream.priv.h fd_ostream.vt.h fd-ostream.oo.c \
+	$(top_srcdir)/../build-aux/csharpexec.sh.in dup2.c errno.in.h \
+	error.c error.h exitfail.h fcntl.c fcntl.in.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 \
-	file-ostream.oo.h filename.h float.c float.in.h itold.c \
-	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 \
-	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 \
-	intprops.h iswblank.c \
-	$(top_srcdir)/../build-aux/javacomp.sh.in \
+	file-ostream.oo.h filename.h float.in.h fnmatch.c fnmatch.in.h \
+	fnmatch_loop.c fopen.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_open-aix.gperf \
+	iconv_open-hpux.gperf iconv_open-irix.gperf \
+	iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c \
+	intprops.h $(top_srcdir)/../build-aux/javacomp.sh.in \
 	$(top_srcdir)/../build-aux/javaexec.sh.in javaversion.class \
 	javaversion.java libcroco/cr-additional-sel.c \
 	libcroco/cr-additional-sel.h libcroco/cr-attr-sel.c \
@@ -1876,50 +1537,39 @@
 	libxml/xpath.in.h libxml/xpathInternals.in.h libxml/xpointer.c \
 	libxml/xpointer.in.h config.charset ref-add.sin ref-del.sin \
 	locale.in.h localename.h lstat.c malloc.c malloca.h \
-	malloca.valgrind mbchar.h mbrtowc.c mbsinit.c mbsrtowcs-impl.h \
+	malloca.valgrind mbchar.h mbrtowc.c mbsinit.c \
 	mbsrtowcs-state.c mbsrtowcs.c str-kmp.h memchr.c \
 	memchr.valgrind memmove.c memset.c mkdtemp.c moo.h \
-	$(top_srcdir)/../build-aux/moopp msvc-inval.c msvc-inval.h \
-	msvc-nothrow.c msvc-nothrow.h obstack.c obstack.h open.c \
-	dirent-private.h opendir.c ostream.h ostream.c ostream.priv.h \
-	ostream.vt.h ostream.oo.c ostream.oo.h pathmax.h \
-	pipe-filter-aux.h pipe-filter.h spawn_int.h spawni.c \
-	spawn_faction_addclose.c spawn_int.h spawn_faction_adddup2.c \
-	spawn_int.h spawn_faction_addopen.c spawn_int.h \
-	spawn_faction_destroy.c spawn_faction_init.c spawn_int.h \
-	spawnattr_destroy.c spawnattr_init.c spawnattr_setflags.c \
-	spawnattr_setsigmask.c spawnp.c acl-internal.h acl.h \
-	acl_entries.c quote.h quote.h quotearg.h raise.c rawmemchr.c \
-	rawmemchr.valgrind read.c dirent-private.h readdir.c \
-	readlink.c realloc.c progreloc.c relocatable.c relocatable.h \
+	$(top_srcdir)/../build-aux/moopp obstack.c obstack.h open.c \
+	ostream.h ostream.c ostream.priv.h ostream.vt.h ostream.oo.c \
+	ostream.oo.h pathmax.h pipe-filter-aux.h pipe-filter.h \
+	spawn_int.h spawni.c spawn_faction_addclose.c spawn_int.h \
+	spawn_faction_adddup2.c spawn_int.h spawn_faction_addopen.c \
+	spawn_int.h spawn_faction_destroy.c spawn_faction_init.c \
+	spawn_int.h spawnattr_destroy.c spawnattr_init.c \
+	spawnattr_setflags.c spawnattr_setsigmask.c spawnp.c \
+	rawmemchr.c rawmemchr.valgrind readlink.c realloc.c \
+	progreloc.c relocatable.c relocatable.h \
 	$(top_srcdir)/../build-aux/config.libpath \
-	$(top_srcdir)/../build-aux/reloc-ldflags allocator.c \
-	allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h \
-	canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c \
+	$(top_srcdir)/../build-aux/reloc-ldflags areadlink.c \
+	areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c malloca.c \
 	malloca.h progname.c progname.h progreloc.c readlink.c \
-	relocatable.c relocatable.h relocwrapper.c setenv.c \
+	relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c \
 	$(top_srcdir)/../build-aux/install-reloc \
 	$(top_srcdir)/../build-aux/relocatable.sh.in rmdir.c \
-	safe-read.h safe-read.c safe-write.h sched.in.h \
-	secure_getenv.c setenv.c setlocale.c sig-handler.h sigaction.c \
-	signal.in.h stdio-write.c sigprocmask.c \
-	$(top_srcdir)/../build-aux/snippet/_Noreturn.h \
-	$(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	$(top_srcdir)/../build-aux/snippet/c++defs.h \
-	$(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	$(top_srcdir)/../build-aux/snippet/warn-on-use.h snprintf.c \
-	spawn.in.h stat.c stdarg.in.h stdbool.in.h stddef.in.h \
-	stdint.in.h stdio.in.h stdlib.in.h stpcpy.c stpncpy.c \
-	strchrnul.c strchrnul.valgrind strcspn.c streq.h strerror.c \
-	strerror-override.c strerror-override.h iconveh.h string.in.h \
-	strnlen.c strpbrk.c str-two-way.h strstr.c strtol.c strtol.c \
-	strtoul.c styled-ostream.h styled-ostream.c \
-	styled_ostream.priv.h styled_ostream.vt.h styled-ostream.oo.c \
-	styled-ostream.oo.h sys_select.in.h sys_stat.in.h \
-	sys_time.in.h sys_types.in.h sys_wait.in.h tempname.h \
-	term-ostream.h term-ostream.c term_ostream.priv.h \
-	term_ostream.vt.h term-ostream.oo.c term-ostream.oo.h \
-	term-styled-ostream.h term-styled-ostream.c \
+	safe-read.c safe-read.h safe-write.c safe-write.h sched.in.h \
+	setenv.c sig-handler.h sigaction.c signal.in.h sigprocmask.c \
+	snprintf.c spawn.in.h stat.c stdarg.in.h stdbool.in.h \
+	stddef.in.h stdint.in.h stdio-write.c stdio.in.h stdlib.in.h \
+	stpcpy.c stpncpy.c strchrnul.c strchrnul.valgrind strcspn.c \
+	streq.h strerror.c iconveh.h string.in.h strnlen.c strpbrk.c \
+	str-two-way.h strstr.c strtol.c strtoul.c styled-ostream.h \
+	styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h \
+	styled-ostream.oo.c styled-ostream.oo.h sys_select.in.h \
+	sys_socket.in.h sys_stat.in.h sys_time.in.h sys_wait.in.h \
+	tempname.c tempname.h term-ostream.h term-ostream.c \
+	term_ostream.priv.h term_ostream.vt.h term-ostream.oo.c \
+	term-ostream.oo.h term-styled-ostream.h term-styled-ostream.c \
 	term_styled_ostream.priv.h term_styled_ostream.vt.h \
 	term-styled-ostream.oo.c term-styled-ostream.oo.h tparm.c \
 	tputs.c terminfo.h $(top_srcdir)/../build-aux/config.rpath \
@@ -1927,14 +1577,17 @@
 	uniconv.in.h unilbrk.in.h unilbrk/lbrkprop1.h \
 	unilbrk/lbrkprop2.h unilbrk/lbrktables.h uniwidth/cjk.h \
 	unilbrk/ulc-common.h uniname.in.h uniname/gen-uninames.lisp \
-	uniname/uninames.h unistd.in.h unistd--.h unistd-safer.h \
-	unistr.in.h unitypes.in.h localcharset.h uniwidth.in.h \
-	uniwidth/cjk.h unlocked-io.h unsetenv.c asnprintf.c float+.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
+	uniname/uninames.h unistd.in.h dup-safer.c fd-safer.c \
+	pipe-safer.c unistd--.h unistd-safer.h unistr.in.h \
+	unitypes.in.h localcharset.h uniwidth.in.h uniwidth/cjk.h \
+	unlocked-io.h unsetenv.c \
+	$(top_srcdir)/../build-aux/unused-parameter.h asnprintf.c \
+	float+.h printf-args.c printf-args.h printf-parse.c \
+	printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \
+	vasprintf.c vsnprintf.c \
+	$(top_srcdir)/../build-aux/warn-on-use.h wchar.in.h \
+	wctype.in.h wcwidth.c write.c concat-filename.h xmalloca.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
@@ -1950,36 +1603,38 @@
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = $(ALLOCA_H) $(BYTESWAP_H) configmake.h dirent.h \
-	$(ERRNO_H) fcntl.h fd-ostream.h fd-ostream.c fd_ostream.priv.h \
-	fd_ostream.vt.h file-ostream.h file-ostream.c \
-	file_ostream.priv.h file_ostream.vt.h $(FLOAT_H) $(FNMATCH_H) \
-	$(GETOPT_H) html-ostream.h html-ostream.c html_ostream.priv.h \
-	html_ostream.vt.h html-styled-ostream.h html-styled-ostream.c \
+BUILT_SOURCES = $(ALLOCA_H) arg-nonnull.h $(BYTESWAP_H) c++defs.h \
+	configmake.h $(ERRNO_H) fcntl.h fd-ostream.h fd-ostream.c \
+	fd_ostream.priv.h fd_ostream.vt.h file-ostream.h \
+	file-ostream.c file_ostream.priv.h file_ostream.vt.h \
+	$(FLOAT_H) $(FNMATCH_H) $(GETOPT_H) html-ostream.h \
+	html-ostream.c html_ostream.priv.h html_ostream.vt.h \
+	html-styled-ostream.h html-styled-ostream.c \
 	html_styled_ostream.priv.h html_styled_ostream.vt.h $(ICONV_H) \
 	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
 	iconv_open-osf.h iconv_open-solaris.h $(LIBGLIB_H) $(LIBXML_H) \
 	locale.h ostream.h ostream.c ostream.priv.h ostream.vt.h \
-	$(SCHED_H) signal.h arg-nonnull.h c++defs.h unused-parameter.h \
-	warn-on-use.h spawn.h $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) \
-	$(STDINT_H) stdio.h stdlib.h string.h styled-ostream.h \
-	styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h \
-	sys/select.h sys/stat.h sys/time.h sys/types.h sys/wait.h \
-	term-ostream.h term-ostream.c term_ostream.priv.h \
-	term_ostream.vt.h term-styled-ostream.h term-styled-ostream.c \
-	term_styled_ostream.priv.h term_styled_ostream.vt.h time.h \
-	$(LIBUNISTRING_UNICONV_H) $(LIBUNISTRING_UNILBRK_H) \
-	$(LIBUNISTRING_UNINAME_H) unistd.h $(LIBUNISTRING_UNISTR_H) \
-	$(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) wchar.h \
-	wctype.h
+	$(SCHED_H) signal.h spawn.h $(STDARG_H) $(STDBOOL_H) \
+	$(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \
+	styled-ostream.h styled-ostream.c styled_ostream.priv.h \
+	styled_ostream.vt.h sys/select.h sys/socket.h sys/stat.h \
+	sys/time.h sys/wait.h term-ostream.h term-ostream.c \
+	term_ostream.priv.h term_ostream.vt.h term-styled-ostream.h \
+	term-styled-ostream.c term_styled_ostream.priv.h \
+	term_styled_ostream.vt.h time.h $(LIBUNISTRING_UNICONV_H) \
+	$(LIBUNISTRING_UNILBRK_H) $(LIBUNISTRING_UNINAME_H) unistd.h \
+	$(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \
+	$(LIBUNISTRING_UNIWIDTH_H) unused-parameter.h warn-on-use.h \
+	wchar.h wctype.h
 MOSTLYCLEANFILES = core *.stackdump core *.stackdump alloca.h \
-	alloca.h-t byteswap.h byteswap.h-t dirent.h dirent.h-t errno.h \
-	errno.h-t fcntl.h fcntl.h-t float.h float.h-t fnmatch.h \
-	fnmatch.h-t getopt.h getopt.h-t iconv.h iconv.h-t \
-	iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t \
-	iconv_open-osf.h-t iconv_open-solaris.h-t glib.h glibconfig.h \
-	glib/ghash.h glib/glist.h glib/gprimes.h glib/gstrfuncs.h \
-	glib/gstring.h glib/gtypes.h glib/*.h-t libxml/DOCBparser.h \
+	alloca.h-t arg-nonnull.h arg-nonnull.h-t byteswap.h \
+	byteswap.h-t c++defs.h c++defs.h-t errno.h errno.h-t fcntl.h \
+	fcntl.h-t float.h float.h-t fnmatch.h fnmatch.h-t getopt.h \
+	getopt.h-t iconv.h iconv.h-t iconv_open-aix.h-t \
+	iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t \
+	iconv_open-solaris.h-t glib.h glibconfig.h glib/ghash.h \
+	glib/glist.h glib/gprimes.h glib/gstrfuncs.h glib/gstring.h \
+	glib/gtypes.h glib/*.h-t libxml/DOCBparser.h \
 	libxml/HTMLparser.h libxml/HTMLtree.h libxml/SAX.h \
 	libxml/SAX2.h libxml/c14n.h libxml/catalog.h libxml/chvalid.h \
 	libxml/debugXML.h libxml/dict.h libxml/encoding.h \
@@ -1995,18 +1650,18 @@
 	libxml/xmlstring.h libxml/xmlunicode.h libxml/xmlversion.h \
 	libxml/xmlwriter.h libxml/xpath.h libxml/xpathInternals.h \
 	libxml/xpointer.h libxml/*.h-t locale.h locale.h-t sched.h \
-	sched.h-t signal.h signal.h-t 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 spawn.h spawn.h-t stdarg.h \
+	sched.h-t signal.h signal.h-t spawn.h spawn.h-t stdarg.h \
 	stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \
 	stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h \
-	string.h-t sys/select.h sys/select.h-t sys/stat.h sys/stat.h-t \
-	sys/time.h sys/time.h-t sys/types.h sys/types.h-t sys/wait.h \
-	sys/wait.h-t time.h time.h-t uniconv.h uniconv.h-t unilbrk.h \
-	unilbrk.h-t uniname.h uniname.h-t unistd.h unistd.h-t unistr.h \
-	unistr.h-t unitypes.h unitypes.h-t uniwidth.h uniwidth.h-t \
-	wchar.h wchar.h-t wctype.h wctype.h-t
-MOSTLYCLEANDIRS = sys sys sys
+	string.h-t sys/select.h sys/select.h-t sys/socket.h \
+	sys/socket.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \
+	sys/wait.h sys/wait.h-t time.h time.h-t uniconv.h uniconv.h-t \
+	unilbrk.h unilbrk.h-t uniname.h uniname.h-t unistd.h \
+	unistd.h-t unistr.h unistr.h-t unitypes.h unitypes.h-t \
+	uniwidth.h uniwidth.h-t unused-parameter.h \
+	unused-parameter.h-t warn-on-use.h warn-on-use.h-t wchar.h \
+	wchar.h-t wctype.h wctype.h-t
+MOSTLYCLEANDIRS = sys sys sys sys
 CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
 	ref-del.sed
 DISTCLEANFILES = 
@@ -2036,21 +1691,30 @@
 # Needed so that config.h and woe32dll/export.h are found.
 
 # Parametrization of the 'relocatable' module.
+
+# This is for those projects which use "gettextize --intl" to put a source-code
+# copy of libintl into their package. In such projects, every Makefile.am needs
+# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
+# For the Makefile.ams in other directories it is the maintainer's
+# responsibility; for the one from gnulib we do it here.
+# This option has no effect when the user disables NLS (because then the intl
+# directory contains no libintl.h file) or when the project does not use
+# "gettextize --intl".
 AM_CPPFLAGS = -I$(top_builddir)/intl -I$(top_srcdir)/intl \
 	-I$(top_builddir) -I$(top_srcdir) -DDEPENDS_ON_LIBICONV=1 \
-	-DDEPENDS_ON_LIBINTL=1 $(am__append_1) $(am__append_4) \
-	$(INCGLIB) $(INCXML) $(am__append_7) $(am__append_11)
-libgettextlib_la_SOURCES = copy-acl.c set-acl.c allocator.c \
-	areadlink.c argmatch.c gl_array_list.h gl_array_list.c \
-	backupfile.h backupfile.c addext.c basename.h basename.c \
-	binary-io.h binary-io.c c-ctype.h c-ctype.c c-strcase.h \
-	c-strcasecmp.c c-strncasecmp.c c-strcasestr.h c-strcasestr.c \
-	c-strstr.h c-strstr.c careadlinkat.c classpath.h classpath.c \
-	clean-temp.h clean-temp.c cloexec.c closeout.h closeout.c \
-	concat-filename.c copy-file.h copy-file.c csharpcomp.h \
-	csharpcomp.c csharpexec.h csharpexec.c diffseq.h \
+	-DDEPENDS_ON_LIBINTL=1 $(am__append_1) -I$(top_builddir)/intl \
+	$(am__append_4) $(INCGLIB) $(INCXML) $(am__append_7) \
+	$(am__append_11)
+libgettextlib_la_SOURCES = set-mode-acl.c copy-acl.c file-has-acl.c \
+	areadlink.c gl_array_list.h gl_array_list.c backupfile.h \
+	backupfile.c addext.c basename.h basename.c binary-io.h \
+	c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \
+	c-strcasestr.h c-strcasestr.c c-strstr.h c-strstr.c \
+	classpath.h classpath.c clean-temp.h clean-temp.c closeout.h \
+	closeout.c concat-filename.c copy-file.h copy-file.c \
+	csharpcomp.h csharpcomp.c csharpexec.h csharpexec.c diffseq.h \
 	error-progname.h error-progname.c execute.h execute.c \
-	w32spawn.h exitfail.c fatal-signal.h fatal-signal.c fd-hook.c \
+	w32spawn.h exitfail.c fatal-signal.h fatal-signal.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 \
@@ -2060,39 +1724,36 @@
 	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 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 \
-	acl-errno-valid.c file-has-acl.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 \
+	glthread/lock.c malloca.c mbchar.c mbiter.h mbslen.c mbsstr.c \
+	mbswidth.h mbswidth.c mbuiter.h minmax.h ostream.c pipe.h \
+	pipe.c w32spawn.h pipe-filter-ii.c pipe2.c pipe2-safer.c \
+	progname.h progname.c propername.h propername.c quote.h \
+	quote.c quotearg.h quotearg.c sh-quote.h sh-quote.c size_max.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) \
+	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) unilbrk/lbrktables.c \
 	$(am__append_22) $(am__append_23) unilbrk/ulc-common.c \
-	$(am__append_24) $(am__append_25) unistd.c dup-safer.c \
-	fd-safer.c pipe-safer.c $(am__append_26) $(am__append_27) \
-	$(am__append_28) $(am__append_29) $(am__append_30) \
-	$(am__append_31) $(am__append_32) $(am__append_33) \
-	$(am__append_34) 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 \
+	$(am__append_24) $(am__append_25) $(am__append_26) \
+	$(am__append_27) $(am__append_28) $(am__append_29) \
+	$(am__append_30) $(am__append_31) $(am__append_32) \
+	$(am__append_33) $(am__append_34) verify.h wait-process.h \
+	wait-process.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 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 = 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 \
-	iswblank.c libcroco/cr-additional-sel.c libcroco/cr-attr-sel.c \
+EXTRA_libgettextlib_la_SOURCES = acl_entries.c argmatch.c atexit.c \
+	canonicalize-lgpl.c cloexec.c classpath.c dup2.c error.c \
+	fcntl.c fd-ostream.oo.c file-ostream.oo.c fnmatch.c \
+	fnmatch_loop.c fopen.c getdelim.c getdtablesize.c getline.c \
+	getopt.c getopt1.c gettimeofday.c html-ostream.oo.c \
+	html-styled-ostream.oo.c iconv_open.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 \
@@ -2120,22 +1781,20 @@
 	libxml/xmlstring.c libxml/xmlunicode.c libxml/xmlwriter.c \
 	libxml/xpath.c libxml/xpointer.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 \
+	memset.c mkdtemp.c obstack.c open.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 \
-	acl_entries.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 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 \
+	rawmemchr.c readlink.c realloc.c progreloc.c relocatable.c \
+	rmdir.c safe-read.c safe-write.c setenv.c sigaction.c \
+	sigprocmask.c snprintf.c stat.c stdio-write.c stpcpy.c \
+	stpncpy.c strchrnul.c strcspn.c strerror.c strnlen.c strpbrk.c \
+	strstr.c strtol.c strtoul.c styled-ostream.oo.c tempname.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
+	dup-safer.c fd-safer.c pipe-safer.c unsetenv.c asnprintf.c \
+	printf-args.c printf-parse.c vasnprintf.c asprintf.c \
+	vasprintf.c vsnprintf.c wcwidth.c write.c
 
 # Need $(LTLIBUNISTRING) because ulc_width_linebreaks, uc_width, etc. may be
 # taken from libunistring, when the configure option --with-libunistring-prefix
@@ -2143,17 +1802,12 @@
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
 # Need @LIB_ACL@ because copy-file.c uses acl.h.
-# As of 2010-10-04, these are all added by gnulib-tool automatically.
-#libgettextlib_la_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
-libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LIB_ACL) \
-	$(LTLIBICONV) $(LTLIBINTL) $(LTLIBTHREAD) $(LTLIBUNISTRING) \
-	$(OPENMP_CFLAGS) @INTL_MACOSX_LIBS@ -release @VERSION@ \
-	$(am__append_3) $(am__append_12)
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+# Need @LTLIBC@ for -no-undefined to work on many platforms.
+libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -release @VERSION@ \
+	$(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ \
+	@LTNOUNDEF@ $(am__append_3) $(am__append_12)
+ARG_NONNULL_H = arg-nonnull.h
+CXXDEFS_H = c++defs.h
 
 # Specify that libgettextlib should installed in $(libdir).
 lib_LTLIBRARIES = libgettextlib.la
@@ -2249,13 +1903,6 @@
 
 # Which classes to export from the shared library.
 MOOPPFLAGS = --dllexport=styled_ostream
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-_NORETURN_H = $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-ARG_NONNULL_H = arg-nonnull.h
-CXXDEFS_H = c++defs.h
 UNUSED_PARAMETER_H = unused-parameter.h
 WARN_ON_USE_H = warn-on-use.h
 
@@ -2296,7 +1943,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.gnulib:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2306,9 +1952,9 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -2316,8 +1962,6 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -2333,25 +1977,21 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 libcroco/$(am__dirstamp):
 	@$(MKDIR_P) libcroco
 	@: > libcroco/$(am__dirstamp)
@@ -2383,8 +2023,7 @@
 libcroco/libcroco_rpl_la-cr-tknzr.lo: libcroco/$(am__dirstamp)
 libcroco/libcroco_rpl_la-cr-token.lo: libcroco/$(am__dirstamp)
 libcroco/libcroco_rpl_la-cr-utils.lo: libcroco/$(am__dirstamp)
-
-libcroco_rpl.la: $(libcroco_rpl_la_OBJECTS) $(libcroco_rpl_la_DEPENDENCIES) $(EXTRA_libcroco_rpl_la_DEPENDENCIES) 
+libcroco_rpl.la: $(libcroco_rpl_la_OBJECTS) $(libcroco_rpl_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) $(am_libcroco_rpl_la_rpath) $(libcroco_rpl_la_OBJECTS) $(libcroco_rpl_la_LIBADD) $(LIBS)
 ../woe32dll/$(am__dirstamp):
 	@$(MKDIR_P) ../woe32dll
@@ -2514,8 +2153,7 @@
 libxml/xmlwriter.lo: libxml/$(am__dirstamp)
 libxml/xpath.lo: libxml/$(am__dirstamp)
 libxml/xpointer.lo: libxml/$(am__dirstamp)
-
-libgettextlib.la: $(libgettextlib_la_OBJECTS) $(libgettextlib_la_DEPENDENCIES) $(EXTRA_libgettextlib_la_DEPENDENCIES) 
+libgettextlib.la: $(libgettextlib_la_OBJECTS) $(libgettextlib_la_DEPENDENCIES) 
 	$(AM_V_GEN)$(libgettextlib_la_LINK) -rpath $(libdir) $(libgettextlib_la_OBJECTS) $(libgettextlib_la_LIBADD) $(LIBS)
 glib/libglib_rpl_la-ghash.lo: glib/$(am__dirstamp)
 glib/libglib_rpl_la-glist.lo: glib/$(am__dirstamp)
@@ -2523,8 +2161,7 @@
 glib/libglib_rpl_la-gprimes.lo: glib/$(am__dirstamp)
 glib/libglib_rpl_la-gstrfuncs.lo: glib/$(am__dirstamp)
 glib/libglib_rpl_la-gstring.lo: glib/$(am__dirstamp)
-
-libglib_rpl.la: $(libglib_rpl_la_OBJECTS) $(libglib_rpl_la_DEPENDENCIES) $(EXTRA_libglib_rpl_la_DEPENDENCIES) 
+libglib_rpl.la: $(libglib_rpl_la_OBJECTS) $(libglib_rpl_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) $(am_libglib_rpl_la_rpath) $(libglib_rpl_la_OBJECTS) $(libglib_rpl_la_LIBADD) $(LIBS)
 libxml/libxml_rpl_la-DOCBparser.lo: libxml/$(am__dirstamp)
 libxml/libxml_rpl_la-HTMLparser.lo: libxml/$(am__dirstamp)
@@ -2569,278 +2206,690 @@
 libxml/libxml_rpl_la-xmlwriter.lo: libxml/$(am__dirstamp)
 libxml/libxml_rpl_la-xpath.lo: libxml/$(am__dirstamp)
 libxml/libxml_rpl_la-xpointer.lo: libxml/$(am__dirstamp)
-
-libxml_rpl.la: $(libxml_rpl_la_OBJECTS) $(libxml_rpl_la_DEPENDENCIES) $(EXTRA_libxml_rpl_la_DEPENDENCIES) 
+libxml_rpl.la: $(libxml_rpl_la_OBJECTS) $(libxml_rpl_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) $(am_libxml_rpl_la_rpath) $(libxml_rpl_la_OBJECTS) $(libxml_rpl_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../woe32dll/*.$(OBJEXT)
-	-rm -f ../woe32dll/*.lo
-	-rm -f glib/*.$(OBJEXT)
-	-rm -f glib/*.lo
-	-rm -f glthread/*.$(OBJEXT)
-	-rm -f glthread/*.lo
-	-rm -f libcroco/*.$(OBJEXT)
-	-rm -f libcroco/*.lo
-	-rm -f libxml/*.$(OBJEXT)
-	-rm -f libxml/*.lo
-	-rm -f uniconv/*.$(OBJEXT)
-	-rm -f uniconv/*.lo
-	-rm -f unilbrk/*.$(OBJEXT)
-	-rm -f unilbrk/*.lo
-	-rm -f uniname/*.$(OBJEXT)
-	-rm -f uniname/*.lo
-	-rm -f unistr/*.$(OBJEXT)
-	-rm -f unistr/*.lo
-	-rm -f uniwidth/*.$(OBJEXT)
-	-rm -f uniwidth/*.lo
+	-rm -f ../woe32dll/c++html-styled-ostream.$(OBJEXT)
+	-rm -f ../woe32dll/c++html-styled-ostream.lo
+	-rm -f ../woe32dll/c++term-styled-ostream.$(OBJEXT)
+	-rm -f ../woe32dll/c++term-styled-ostream.lo
+	-rm -f ../woe32dll/gettextlib-exports.$(OBJEXT)
+	-rm -f ../woe32dll/gettextlib-exports.lo
+	-rm -f glib/ghash.$(OBJEXT)
+	-rm -f glib/ghash.lo
+	-rm -f glib/glist.$(OBJEXT)
+	-rm -f glib/glist.lo
+	-rm -f glib/gmessages.$(OBJEXT)
+	-rm -f glib/gmessages.lo
+	-rm -f glib/gprimes.$(OBJEXT)
+	-rm -f glib/gprimes.lo
+	-rm -f glib/gstrfuncs.$(OBJEXT)
+	-rm -f glib/gstrfuncs.lo
+	-rm -f glib/gstring.$(OBJEXT)
+	-rm -f glib/gstring.lo
+	-rm -f glib/libglib_rpl_la-ghash.$(OBJEXT)
+	-rm -f glib/libglib_rpl_la-ghash.lo
+	-rm -f glib/libglib_rpl_la-glist.$(OBJEXT)
+	-rm -f glib/libglib_rpl_la-glist.lo
+	-rm -f glib/libglib_rpl_la-gmessages.$(OBJEXT)
+	-rm -f glib/libglib_rpl_la-gmessages.lo
+	-rm -f glib/libglib_rpl_la-gprimes.$(OBJEXT)
+	-rm -f glib/libglib_rpl_la-gprimes.lo
+	-rm -f glib/libglib_rpl_la-gstrfuncs.$(OBJEXT)
+	-rm -f glib/libglib_rpl_la-gstrfuncs.lo
+	-rm -f glib/libglib_rpl_la-gstring.$(OBJEXT)
+	-rm -f glib/libglib_rpl_la-gstring.lo
+	-rm -f glthread/lock.$(OBJEXT)
+	-rm -f glthread/lock.lo
+	-rm -f glthread/threadlib.$(OBJEXT)
+	-rm -f glthread/threadlib.lo
+	-rm -f glthread/tls.$(OBJEXT)
+	-rm -f glthread/tls.lo
+	-rm -f libcroco/cr-additional-sel.$(OBJEXT)
+	-rm -f libcroco/cr-additional-sel.lo
+	-rm -f libcroco/cr-attr-sel.$(OBJEXT)
+	-rm -f libcroco/cr-attr-sel.lo
+	-rm -f libcroco/cr-cascade.$(OBJEXT)
+	-rm -f libcroco/cr-cascade.lo
+	-rm -f libcroco/cr-declaration.$(OBJEXT)
+	-rm -f libcroco/cr-declaration.lo
+	-rm -f libcroco/cr-doc-handler.$(OBJEXT)
+	-rm -f libcroco/cr-doc-handler.lo
+	-rm -f libcroco/cr-enc-handler.$(OBJEXT)
+	-rm -f libcroco/cr-enc-handler.lo
+	-rm -f libcroco/cr-fonts.$(OBJEXT)
+	-rm -f libcroco/cr-fonts.lo
+	-rm -f libcroco/cr-input.$(OBJEXT)
+	-rm -f libcroco/cr-input.lo
+	-rm -f libcroco/cr-num.$(OBJEXT)
+	-rm -f libcroco/cr-num.lo
+	-rm -f libcroco/cr-om-parser.$(OBJEXT)
+	-rm -f libcroco/cr-om-parser.lo
+	-rm -f libcroco/cr-parser.$(OBJEXT)
+	-rm -f libcroco/cr-parser.lo
+	-rm -f libcroco/cr-parsing-location.$(OBJEXT)
+	-rm -f libcroco/cr-parsing-location.lo
+	-rm -f libcroco/cr-prop-list.$(OBJEXT)
+	-rm -f libcroco/cr-prop-list.lo
+	-rm -f libcroco/cr-pseudo.$(OBJEXT)
+	-rm -f libcroco/cr-pseudo.lo
+	-rm -f libcroco/cr-rgb.$(OBJEXT)
+	-rm -f libcroco/cr-rgb.lo
+	-rm -f libcroco/cr-sel-eng.$(OBJEXT)
+	-rm -f libcroco/cr-sel-eng.lo
+	-rm -f libcroco/cr-selector.$(OBJEXT)
+	-rm -f libcroco/cr-selector.lo
+	-rm -f libcroco/cr-simple-sel.$(OBJEXT)
+	-rm -f libcroco/cr-simple-sel.lo
+	-rm -f libcroco/cr-statement.$(OBJEXT)
+	-rm -f libcroco/cr-statement.lo
+	-rm -f libcroco/cr-string.$(OBJEXT)
+	-rm -f libcroco/cr-string.lo
+	-rm -f libcroco/cr-style.$(OBJEXT)
+	-rm -f libcroco/cr-style.lo
+	-rm -f libcroco/cr-stylesheet.$(OBJEXT)
+	-rm -f libcroco/cr-stylesheet.lo
+	-rm -f libcroco/cr-term.$(OBJEXT)
+	-rm -f libcroco/cr-term.lo
+	-rm -f libcroco/cr-tknzr.$(OBJEXT)
+	-rm -f libcroco/cr-tknzr.lo
+	-rm -f libcroco/cr-token.$(OBJEXT)
+	-rm -f libcroco/cr-token.lo
+	-rm -f libcroco/cr-utils.$(OBJEXT)
+	-rm -f libcroco/cr-utils.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-additional-sel.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-additional-sel.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-attr-sel.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-attr-sel.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-cascade.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-cascade.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-declaration.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-declaration.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-doc-handler.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-doc-handler.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-enc-handler.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-enc-handler.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-fonts.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-fonts.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-input.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-input.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-num.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-num.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-om-parser.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-om-parser.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-parser.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-parser.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-parsing-location.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-parsing-location.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-prop-list.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-prop-list.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-pseudo.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-pseudo.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-rgb.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-rgb.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-sel-eng.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-sel-eng.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-selector.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-selector.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-simple-sel.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-simple-sel.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-statement.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-statement.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-string.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-string.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-style.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-style.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-stylesheet.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-stylesheet.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-term.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-term.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-tknzr.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-tknzr.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-token.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-token.lo
+	-rm -f libcroco/libcroco_rpl_la-cr-utils.$(OBJEXT)
+	-rm -f libcroco/libcroco_rpl_la-cr-utils.lo
+	-rm -f libxml/DOCBparser.$(OBJEXT)
+	-rm -f libxml/DOCBparser.lo
+	-rm -f libxml/HTMLparser.$(OBJEXT)
+	-rm -f libxml/HTMLparser.lo
+	-rm -f libxml/HTMLtree.$(OBJEXT)
+	-rm -f libxml/HTMLtree.lo
+	-rm -f libxml/SAX.$(OBJEXT)
+	-rm -f libxml/SAX.lo
+	-rm -f libxml/SAX2.$(OBJEXT)
+	-rm -f libxml/SAX2.lo
+	-rm -f libxml/c14n.$(OBJEXT)
+	-rm -f libxml/c14n.lo
+	-rm -f libxml/catalog.$(OBJEXT)
+	-rm -f libxml/catalog.lo
+	-rm -f libxml/chvalid.$(OBJEXT)
+	-rm -f libxml/chvalid.lo
+	-rm -f libxml/debugXML.$(OBJEXT)
+	-rm -f libxml/debugXML.lo
+	-rm -f libxml/dict.$(OBJEXT)
+	-rm -f libxml/dict.lo
+	-rm -f libxml/encoding.$(OBJEXT)
+	-rm -f libxml/encoding.lo
+	-rm -f libxml/entities.$(OBJEXT)
+	-rm -f libxml/entities.lo
+	-rm -f libxml/error.$(OBJEXT)
+	-rm -f libxml/error.lo
+	-rm -f libxml/globals.$(OBJEXT)
+	-rm -f libxml/globals.lo
+	-rm -f libxml/hash.$(OBJEXT)
+	-rm -f libxml/hash.lo
+	-rm -f libxml/legacy.$(OBJEXT)
+	-rm -f libxml/legacy.lo
+	-rm -f libxml/libxml_rpl_la-DOCBparser.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-DOCBparser.lo
+	-rm -f libxml/libxml_rpl_la-HTMLparser.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-HTMLparser.lo
+	-rm -f libxml/libxml_rpl_la-HTMLtree.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-HTMLtree.lo
+	-rm -f libxml/libxml_rpl_la-SAX.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-SAX.lo
+	-rm -f libxml/libxml_rpl_la-SAX2.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-SAX2.lo
+	-rm -f libxml/libxml_rpl_la-c14n.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-c14n.lo
+	-rm -f libxml/libxml_rpl_la-catalog.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-catalog.lo
+	-rm -f libxml/libxml_rpl_la-chvalid.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-chvalid.lo
+	-rm -f libxml/libxml_rpl_la-debugXML.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-debugXML.lo
+	-rm -f libxml/libxml_rpl_la-dict.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-dict.lo
+	-rm -f libxml/libxml_rpl_la-encoding.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-encoding.lo
+	-rm -f libxml/libxml_rpl_la-entities.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-entities.lo
+	-rm -f libxml/libxml_rpl_la-error.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-error.lo
+	-rm -f libxml/libxml_rpl_la-globals.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-globals.lo
+	-rm -f libxml/libxml_rpl_la-hash.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-hash.lo
+	-rm -f libxml/libxml_rpl_la-legacy.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-legacy.lo
+	-rm -f libxml/libxml_rpl_la-list.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-list.lo
+	-rm -f libxml/libxml_rpl_la-nanoftp.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-nanoftp.lo
+	-rm -f libxml/libxml_rpl_la-nanohttp.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-nanohttp.lo
+	-rm -f libxml/libxml_rpl_la-parser.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-parser.lo
+	-rm -f libxml/libxml_rpl_la-parserInternals.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-parserInternals.lo
+	-rm -f libxml/libxml_rpl_la-pattern.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-pattern.lo
+	-rm -f libxml/libxml_rpl_la-relaxng.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-relaxng.lo
+	-rm -f libxml/libxml_rpl_la-schematron.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-schematron.lo
+	-rm -f libxml/libxml_rpl_la-threads.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-threads.lo
+	-rm -f libxml/libxml_rpl_la-tree.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-tree.lo
+	-rm -f libxml/libxml_rpl_la-uri.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-uri.lo
+	-rm -f libxml/libxml_rpl_la-valid.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-valid.lo
+	-rm -f libxml/libxml_rpl_la-xinclude.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xinclude.lo
+	-rm -f libxml/libxml_rpl_la-xlink.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xlink.lo
+	-rm -f libxml/libxml_rpl_la-xmlIO.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlIO.lo
+	-rm -f libxml/libxml_rpl_la-xmlmemory.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlmemory.lo
+	-rm -f libxml/libxml_rpl_la-xmlmodule.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlmodule.lo
+	-rm -f libxml/libxml_rpl_la-xmlreader.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlreader.lo
+	-rm -f libxml/libxml_rpl_la-xmlregexp.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlregexp.lo
+	-rm -f libxml/libxml_rpl_la-xmlsave.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlsave.lo
+	-rm -f libxml/libxml_rpl_la-xmlschemas.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlschemas.lo
+	-rm -f libxml/libxml_rpl_la-xmlschemastypes.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlschemastypes.lo
+	-rm -f libxml/libxml_rpl_la-xmlstring.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlstring.lo
+	-rm -f libxml/libxml_rpl_la-xmlunicode.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlunicode.lo
+	-rm -f libxml/libxml_rpl_la-xmlwriter.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xmlwriter.lo
+	-rm -f libxml/libxml_rpl_la-xpath.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xpath.lo
+	-rm -f libxml/libxml_rpl_la-xpointer.$(OBJEXT)
+	-rm -f libxml/libxml_rpl_la-xpointer.lo
+	-rm -f libxml/list.$(OBJEXT)
+	-rm -f libxml/list.lo
+	-rm -f libxml/nanoftp.$(OBJEXT)
+	-rm -f libxml/nanoftp.lo
+	-rm -f libxml/nanohttp.$(OBJEXT)
+	-rm -f libxml/nanohttp.lo
+	-rm -f libxml/parser.$(OBJEXT)
+	-rm -f libxml/parser.lo
+	-rm -f libxml/parserInternals.$(OBJEXT)
+	-rm -f libxml/parserInternals.lo
+	-rm -f libxml/pattern.$(OBJEXT)
+	-rm -f libxml/pattern.lo
+	-rm -f libxml/relaxng.$(OBJEXT)
+	-rm -f libxml/relaxng.lo
+	-rm -f libxml/schematron.$(OBJEXT)
+	-rm -f libxml/schematron.lo
+	-rm -f libxml/threads.$(OBJEXT)
+	-rm -f libxml/threads.lo
+	-rm -f libxml/tree.$(OBJEXT)
+	-rm -f libxml/tree.lo
+	-rm -f libxml/uri.$(OBJEXT)
+	-rm -f libxml/uri.lo
+	-rm -f libxml/valid.$(OBJEXT)
+	-rm -f libxml/valid.lo
+	-rm -f libxml/xinclude.$(OBJEXT)
+	-rm -f libxml/xinclude.lo
+	-rm -f libxml/xlink.$(OBJEXT)
+	-rm -f libxml/xlink.lo
+	-rm -f libxml/xmlIO.$(OBJEXT)
+	-rm -f libxml/xmlIO.lo
+	-rm -f libxml/xmlmemory.$(OBJEXT)
+	-rm -f libxml/xmlmemory.lo
+	-rm -f libxml/xmlmodule.$(OBJEXT)
+	-rm -f libxml/xmlmodule.lo
+	-rm -f libxml/xmlreader.$(OBJEXT)
+	-rm -f libxml/xmlreader.lo
+	-rm -f libxml/xmlregexp.$(OBJEXT)
+	-rm -f libxml/xmlregexp.lo
+	-rm -f libxml/xmlsave.$(OBJEXT)
+	-rm -f libxml/xmlsave.lo
+	-rm -f libxml/xmlschemas.$(OBJEXT)
+	-rm -f libxml/xmlschemas.lo
+	-rm -f libxml/xmlschemastypes.$(OBJEXT)
+	-rm -f libxml/xmlschemastypes.lo
+	-rm -f libxml/xmlstring.$(OBJEXT)
+	-rm -f libxml/xmlstring.lo
+	-rm -f libxml/xmlunicode.$(OBJEXT)
+	-rm -f libxml/xmlunicode.lo
+	-rm -f libxml/xmlwriter.$(OBJEXT)
+	-rm -f libxml/xmlwriter.lo
+	-rm -f libxml/xpath.$(OBJEXT)
+	-rm -f libxml/xpath.lo
+	-rm -f libxml/xpointer.$(OBJEXT)
+	-rm -f libxml/xpointer.lo
+	-rm -f uniconv/u8-conv-from-enc.$(OBJEXT)
+	-rm -f uniconv/u8-conv-from-enc.lo
+	-rm -f unilbrk/lbrktables.$(OBJEXT)
+	-rm -f unilbrk/lbrktables.lo
+	-rm -f unilbrk/u8-possible-linebreaks.$(OBJEXT)
+	-rm -f unilbrk/u8-possible-linebreaks.lo
+	-rm -f unilbrk/u8-width-linebreaks.$(OBJEXT)
+	-rm -f unilbrk/u8-width-linebreaks.lo
+	-rm -f unilbrk/ulc-common.$(OBJEXT)
+	-rm -f unilbrk/ulc-common.lo
+	-rm -f unilbrk/ulc-width-linebreaks.$(OBJEXT)
+	-rm -f unilbrk/ulc-width-linebreaks.lo
+	-rm -f uniname/uniname.$(OBJEXT)
+	-rm -f uniname/uniname.lo
+	-rm -f unistr/u16-mbtouc-aux.$(OBJEXT)
+	-rm -f unistr/u16-mbtouc-aux.lo
+	-rm -f unistr/u16-mbtouc.$(OBJEXT)
+	-rm -f unistr/u16-mbtouc.lo
+	-rm -f unistr/u8-check.$(OBJEXT)
+	-rm -f unistr/u8-check.lo
+	-rm -f unistr/u8-mblen.$(OBJEXT)
+	-rm -f unistr/u8-mblen.lo
+	-rm -f unistr/u8-mbtouc-aux.$(OBJEXT)
+	-rm -f unistr/u8-mbtouc-aux.lo
+	-rm -f unistr/u8-mbtouc-unsafe-aux.$(OBJEXT)
+	-rm -f unistr/u8-mbtouc-unsafe-aux.lo
+	-rm -f unistr/u8-mbtouc-unsafe.$(OBJEXT)
+	-rm -f unistr/u8-mbtouc-unsafe.lo
+	-rm -f unistr/u8-mbtouc.$(OBJEXT)
+	-rm -f unistr/u8-mbtouc.lo
+	-rm -f unistr/u8-mbtoucr.$(OBJEXT)
+	-rm -f unistr/u8-mbtoucr.lo
+	-rm -f unistr/u8-prev.$(OBJEXT)
+	-rm -f unistr/u8-prev.lo
+	-rm -f unistr/u8-uctomb-aux.$(OBJEXT)
+	-rm -f unistr/u8-uctomb-aux.lo
+	-rm -f unistr/u8-uctomb.$(OBJEXT)
+	-rm -f unistr/u8-uctomb.lo
+	-rm -f uniwidth/width.$(OBJEXT)
+	-rm -f uniwidth/width.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c -o $@ $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
 libcroco/libcroco_rpl_la-cr-additional-sel.lo: libcroco/cr-additional-sel.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-additional-sel.lo `test -f 'libcroco/cr-additional-sel.c' || echo '$(srcdir)/'`libcroco/cr-additional-sel.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-additional-sel.lo `test -f 'libcroco/cr-additional-sel.c' || echo '$(srcdir)/'`libcroco/cr-additional-sel.c
 
 libcroco/libcroco_rpl_la-cr-attr-sel.lo: libcroco/cr-attr-sel.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-attr-sel.lo `test -f 'libcroco/cr-attr-sel.c' || echo '$(srcdir)/'`libcroco/cr-attr-sel.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-attr-sel.lo `test -f 'libcroco/cr-attr-sel.c' || echo '$(srcdir)/'`libcroco/cr-attr-sel.c
 
 libcroco/libcroco_rpl_la-cr-cascade.lo: libcroco/cr-cascade.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-cascade.lo `test -f 'libcroco/cr-cascade.c' || echo '$(srcdir)/'`libcroco/cr-cascade.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-cascade.lo `test -f 'libcroco/cr-cascade.c' || echo '$(srcdir)/'`libcroco/cr-cascade.c
 
 libcroco/libcroco_rpl_la-cr-declaration.lo: libcroco/cr-declaration.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-declaration.lo `test -f 'libcroco/cr-declaration.c' || echo '$(srcdir)/'`libcroco/cr-declaration.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-declaration.lo `test -f 'libcroco/cr-declaration.c' || echo '$(srcdir)/'`libcroco/cr-declaration.c
 
 libcroco/libcroco_rpl_la-cr-doc-handler.lo: libcroco/cr-doc-handler.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-doc-handler.lo `test -f 'libcroco/cr-doc-handler.c' || echo '$(srcdir)/'`libcroco/cr-doc-handler.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-doc-handler.lo `test -f 'libcroco/cr-doc-handler.c' || echo '$(srcdir)/'`libcroco/cr-doc-handler.c
 
 libcroco/libcroco_rpl_la-cr-enc-handler.lo: libcroco/cr-enc-handler.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-enc-handler.lo `test -f 'libcroco/cr-enc-handler.c' || echo '$(srcdir)/'`libcroco/cr-enc-handler.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-enc-handler.lo `test -f 'libcroco/cr-enc-handler.c' || echo '$(srcdir)/'`libcroco/cr-enc-handler.c
 
 libcroco/libcroco_rpl_la-cr-fonts.lo: libcroco/cr-fonts.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-fonts.lo `test -f 'libcroco/cr-fonts.c' || echo '$(srcdir)/'`libcroco/cr-fonts.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-fonts.lo `test -f 'libcroco/cr-fonts.c' || echo '$(srcdir)/'`libcroco/cr-fonts.c
 
 libcroco/libcroco_rpl_la-cr-input.lo: libcroco/cr-input.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-input.lo `test -f 'libcroco/cr-input.c' || echo '$(srcdir)/'`libcroco/cr-input.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-input.lo `test -f 'libcroco/cr-input.c' || echo '$(srcdir)/'`libcroco/cr-input.c
 
 libcroco/libcroco_rpl_la-cr-num.lo: libcroco/cr-num.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-num.lo `test -f 'libcroco/cr-num.c' || echo '$(srcdir)/'`libcroco/cr-num.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-num.lo `test -f 'libcroco/cr-num.c' || echo '$(srcdir)/'`libcroco/cr-num.c
 
 libcroco/libcroco_rpl_la-cr-om-parser.lo: libcroco/cr-om-parser.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-om-parser.lo `test -f 'libcroco/cr-om-parser.c' || echo '$(srcdir)/'`libcroco/cr-om-parser.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-om-parser.lo `test -f 'libcroco/cr-om-parser.c' || echo '$(srcdir)/'`libcroco/cr-om-parser.c
 
 libcroco/libcroco_rpl_la-cr-parser.lo: libcroco/cr-parser.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-parser.lo `test -f 'libcroco/cr-parser.c' || echo '$(srcdir)/'`libcroco/cr-parser.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-parser.lo `test -f 'libcroco/cr-parser.c' || echo '$(srcdir)/'`libcroco/cr-parser.c
 
 libcroco/libcroco_rpl_la-cr-parsing-location.lo: libcroco/cr-parsing-location.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-parsing-location.lo `test -f 'libcroco/cr-parsing-location.c' || echo '$(srcdir)/'`libcroco/cr-parsing-location.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-parsing-location.lo `test -f 'libcroco/cr-parsing-location.c' || echo '$(srcdir)/'`libcroco/cr-parsing-location.c
 
 libcroco/libcroco_rpl_la-cr-prop-list.lo: libcroco/cr-prop-list.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-prop-list.lo `test -f 'libcroco/cr-prop-list.c' || echo '$(srcdir)/'`libcroco/cr-prop-list.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-prop-list.lo `test -f 'libcroco/cr-prop-list.c' || echo '$(srcdir)/'`libcroco/cr-prop-list.c
 
 libcroco/libcroco_rpl_la-cr-pseudo.lo: libcroco/cr-pseudo.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-pseudo.lo `test -f 'libcroco/cr-pseudo.c' || echo '$(srcdir)/'`libcroco/cr-pseudo.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-pseudo.lo `test -f 'libcroco/cr-pseudo.c' || echo '$(srcdir)/'`libcroco/cr-pseudo.c
 
 libcroco/libcroco_rpl_la-cr-rgb.lo: libcroco/cr-rgb.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-rgb.lo `test -f 'libcroco/cr-rgb.c' || echo '$(srcdir)/'`libcroco/cr-rgb.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-rgb.lo `test -f 'libcroco/cr-rgb.c' || echo '$(srcdir)/'`libcroco/cr-rgb.c
 
 libcroco/libcroco_rpl_la-cr-sel-eng.lo: libcroco/cr-sel-eng.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-sel-eng.lo `test -f 'libcroco/cr-sel-eng.c' || echo '$(srcdir)/'`libcroco/cr-sel-eng.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-sel-eng.lo `test -f 'libcroco/cr-sel-eng.c' || echo '$(srcdir)/'`libcroco/cr-sel-eng.c
 
 libcroco/libcroco_rpl_la-cr-selector.lo: libcroco/cr-selector.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-selector.lo `test -f 'libcroco/cr-selector.c' || echo '$(srcdir)/'`libcroco/cr-selector.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-selector.lo `test -f 'libcroco/cr-selector.c' || echo '$(srcdir)/'`libcroco/cr-selector.c
 
 libcroco/libcroco_rpl_la-cr-simple-sel.lo: libcroco/cr-simple-sel.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-simple-sel.lo `test -f 'libcroco/cr-simple-sel.c' || echo '$(srcdir)/'`libcroco/cr-simple-sel.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-simple-sel.lo `test -f 'libcroco/cr-simple-sel.c' || echo '$(srcdir)/'`libcroco/cr-simple-sel.c
 
 libcroco/libcroco_rpl_la-cr-statement.lo: libcroco/cr-statement.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-statement.lo `test -f 'libcroco/cr-statement.c' || echo '$(srcdir)/'`libcroco/cr-statement.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-statement.lo `test -f 'libcroco/cr-statement.c' || echo '$(srcdir)/'`libcroco/cr-statement.c
 
 libcroco/libcroco_rpl_la-cr-string.lo: libcroco/cr-string.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-string.lo `test -f 'libcroco/cr-string.c' || echo '$(srcdir)/'`libcroco/cr-string.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-string.lo `test -f 'libcroco/cr-string.c' || echo '$(srcdir)/'`libcroco/cr-string.c
 
 libcroco/libcroco_rpl_la-cr-style.lo: libcroco/cr-style.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-style.lo `test -f 'libcroco/cr-style.c' || echo '$(srcdir)/'`libcroco/cr-style.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-style.lo `test -f 'libcroco/cr-style.c' || echo '$(srcdir)/'`libcroco/cr-style.c
 
 libcroco/libcroco_rpl_la-cr-stylesheet.lo: libcroco/cr-stylesheet.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-stylesheet.lo `test -f 'libcroco/cr-stylesheet.c' || echo '$(srcdir)/'`libcroco/cr-stylesheet.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-stylesheet.lo `test -f 'libcroco/cr-stylesheet.c' || echo '$(srcdir)/'`libcroco/cr-stylesheet.c
 
 libcroco/libcroco_rpl_la-cr-term.lo: libcroco/cr-term.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-term.lo `test -f 'libcroco/cr-term.c' || echo '$(srcdir)/'`libcroco/cr-term.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-term.lo `test -f 'libcroco/cr-term.c' || echo '$(srcdir)/'`libcroco/cr-term.c
 
 libcroco/libcroco_rpl_la-cr-tknzr.lo: libcroco/cr-tknzr.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-tknzr.lo `test -f 'libcroco/cr-tknzr.c' || echo '$(srcdir)/'`libcroco/cr-tknzr.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-tknzr.lo `test -f 'libcroco/cr-tknzr.c' || echo '$(srcdir)/'`libcroco/cr-tknzr.c
 
 libcroco/libcroco_rpl_la-cr-token.lo: libcroco/cr-token.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-token.lo `test -f 'libcroco/cr-token.c' || echo '$(srcdir)/'`libcroco/cr-token.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-token.lo `test -f 'libcroco/cr-token.c' || echo '$(srcdir)/'`libcroco/cr-token.c
 
 libcroco/libcroco_rpl_la-cr-utils.lo: libcroco/cr-utils.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-utils.lo `test -f 'libcroco/cr-utils.c' || echo '$(srcdir)/'`libcroco/cr-utils.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcroco_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcroco/libcroco_rpl_la-cr-utils.lo `test -f 'libcroco/cr-utils.c' || echo '$(srcdir)/'`libcroco/cr-utils.c
 
 glib/libglib_rpl_la-ghash.lo: glib/ghash.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-ghash.lo `test -f 'glib/ghash.c' || echo '$(srcdir)/'`glib/ghash.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-ghash.lo `test -f 'glib/ghash.c' || echo '$(srcdir)/'`glib/ghash.c
 
 glib/libglib_rpl_la-glist.lo: glib/glist.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-glist.lo `test -f 'glib/glist.c' || echo '$(srcdir)/'`glib/glist.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-glist.lo `test -f 'glib/glist.c' || echo '$(srcdir)/'`glib/glist.c
 
 glib/libglib_rpl_la-gmessages.lo: glib/gmessages.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gmessages.lo `test -f 'glib/gmessages.c' || echo '$(srcdir)/'`glib/gmessages.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gmessages.lo `test -f 'glib/gmessages.c' || echo '$(srcdir)/'`glib/gmessages.c
 
 glib/libglib_rpl_la-gprimes.lo: glib/gprimes.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gprimes.lo `test -f 'glib/gprimes.c' || echo '$(srcdir)/'`glib/gprimes.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gprimes.lo `test -f 'glib/gprimes.c' || echo '$(srcdir)/'`glib/gprimes.c
 
 glib/libglib_rpl_la-gstrfuncs.lo: glib/gstrfuncs.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gstrfuncs.lo `test -f 'glib/gstrfuncs.c' || echo '$(srcdir)/'`glib/gstrfuncs.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gstrfuncs.lo `test -f 'glib/gstrfuncs.c' || echo '$(srcdir)/'`glib/gstrfuncs.c
 
 glib/libglib_rpl_la-gstring.lo: glib/gstring.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gstring.lo `test -f 'glib/gstring.c' || echo '$(srcdir)/'`glib/gstring.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglib_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glib/libglib_rpl_la-gstring.lo `test -f 'glib/gstring.c' || echo '$(srcdir)/'`glib/gstring.c
 
 libxml/libxml_rpl_la-DOCBparser.lo: libxml/DOCBparser.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-DOCBparser.lo `test -f 'libxml/DOCBparser.c' || echo '$(srcdir)/'`libxml/DOCBparser.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-DOCBparser.lo `test -f 'libxml/DOCBparser.c' || echo '$(srcdir)/'`libxml/DOCBparser.c
 
 libxml/libxml_rpl_la-HTMLparser.lo: libxml/HTMLparser.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-HTMLparser.lo `test -f 'libxml/HTMLparser.c' || echo '$(srcdir)/'`libxml/HTMLparser.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-HTMLparser.lo `test -f 'libxml/HTMLparser.c' || echo '$(srcdir)/'`libxml/HTMLparser.c
 
 libxml/libxml_rpl_la-HTMLtree.lo: libxml/HTMLtree.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-HTMLtree.lo `test -f 'libxml/HTMLtree.c' || echo '$(srcdir)/'`libxml/HTMLtree.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-HTMLtree.lo `test -f 'libxml/HTMLtree.c' || echo '$(srcdir)/'`libxml/HTMLtree.c
 
 libxml/libxml_rpl_la-SAX.lo: libxml/SAX.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-SAX.lo `test -f 'libxml/SAX.c' || echo '$(srcdir)/'`libxml/SAX.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-SAX.lo `test -f 'libxml/SAX.c' || echo '$(srcdir)/'`libxml/SAX.c
 
 libxml/libxml_rpl_la-SAX2.lo: libxml/SAX2.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-SAX2.lo `test -f 'libxml/SAX2.c' || echo '$(srcdir)/'`libxml/SAX2.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-SAX2.lo `test -f 'libxml/SAX2.c' || echo '$(srcdir)/'`libxml/SAX2.c
 
 libxml/libxml_rpl_la-c14n.lo: libxml/c14n.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-c14n.lo `test -f 'libxml/c14n.c' || echo '$(srcdir)/'`libxml/c14n.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-c14n.lo `test -f 'libxml/c14n.c' || echo '$(srcdir)/'`libxml/c14n.c
 
 libxml/libxml_rpl_la-catalog.lo: libxml/catalog.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-catalog.lo `test -f 'libxml/catalog.c' || echo '$(srcdir)/'`libxml/catalog.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-catalog.lo `test -f 'libxml/catalog.c' || echo '$(srcdir)/'`libxml/catalog.c
 
 libxml/libxml_rpl_la-chvalid.lo: libxml/chvalid.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-chvalid.lo `test -f 'libxml/chvalid.c' || echo '$(srcdir)/'`libxml/chvalid.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-chvalid.lo `test -f 'libxml/chvalid.c' || echo '$(srcdir)/'`libxml/chvalid.c
 
 libxml/libxml_rpl_la-debugXML.lo: libxml/debugXML.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-debugXML.lo `test -f 'libxml/debugXML.c' || echo '$(srcdir)/'`libxml/debugXML.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-debugXML.lo `test -f 'libxml/debugXML.c' || echo '$(srcdir)/'`libxml/debugXML.c
 
 libxml/libxml_rpl_la-dict.lo: libxml/dict.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-dict.lo `test -f 'libxml/dict.c' || echo '$(srcdir)/'`libxml/dict.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-dict.lo `test -f 'libxml/dict.c' || echo '$(srcdir)/'`libxml/dict.c
 
 libxml/libxml_rpl_la-encoding.lo: libxml/encoding.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-encoding.lo `test -f 'libxml/encoding.c' || echo '$(srcdir)/'`libxml/encoding.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-encoding.lo `test -f 'libxml/encoding.c' || echo '$(srcdir)/'`libxml/encoding.c
 
 libxml/libxml_rpl_la-entities.lo: libxml/entities.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-entities.lo `test -f 'libxml/entities.c' || echo '$(srcdir)/'`libxml/entities.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-entities.lo `test -f 'libxml/entities.c' || echo '$(srcdir)/'`libxml/entities.c
 
 libxml/libxml_rpl_la-error.lo: libxml/error.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-error.lo `test -f 'libxml/error.c' || echo '$(srcdir)/'`libxml/error.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-error.lo `test -f 'libxml/error.c' || echo '$(srcdir)/'`libxml/error.c
 
 libxml/libxml_rpl_la-globals.lo: libxml/globals.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-globals.lo `test -f 'libxml/globals.c' || echo '$(srcdir)/'`libxml/globals.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-globals.lo `test -f 'libxml/globals.c' || echo '$(srcdir)/'`libxml/globals.c
 
 libxml/libxml_rpl_la-hash.lo: libxml/hash.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-hash.lo `test -f 'libxml/hash.c' || echo '$(srcdir)/'`libxml/hash.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-hash.lo `test -f 'libxml/hash.c' || echo '$(srcdir)/'`libxml/hash.c
 
 libxml/libxml_rpl_la-legacy.lo: libxml/legacy.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-legacy.lo `test -f 'libxml/legacy.c' || echo '$(srcdir)/'`libxml/legacy.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-legacy.lo `test -f 'libxml/legacy.c' || echo '$(srcdir)/'`libxml/legacy.c
 
 libxml/libxml_rpl_la-list.lo: libxml/list.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-list.lo `test -f 'libxml/list.c' || echo '$(srcdir)/'`libxml/list.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-list.lo `test -f 'libxml/list.c' || echo '$(srcdir)/'`libxml/list.c
 
 libxml/libxml_rpl_la-nanoftp.lo: libxml/nanoftp.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-nanoftp.lo `test -f 'libxml/nanoftp.c' || echo '$(srcdir)/'`libxml/nanoftp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-nanoftp.lo `test -f 'libxml/nanoftp.c' || echo '$(srcdir)/'`libxml/nanoftp.c
 
 libxml/libxml_rpl_la-nanohttp.lo: libxml/nanohttp.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-nanohttp.lo `test -f 'libxml/nanohttp.c' || echo '$(srcdir)/'`libxml/nanohttp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-nanohttp.lo `test -f 'libxml/nanohttp.c' || echo '$(srcdir)/'`libxml/nanohttp.c
 
 libxml/libxml_rpl_la-parser.lo: libxml/parser.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-parser.lo `test -f 'libxml/parser.c' || echo '$(srcdir)/'`libxml/parser.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-parser.lo `test -f 'libxml/parser.c' || echo '$(srcdir)/'`libxml/parser.c
 
 libxml/libxml_rpl_la-parserInternals.lo: libxml/parserInternals.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-parserInternals.lo `test -f 'libxml/parserInternals.c' || echo '$(srcdir)/'`libxml/parserInternals.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-parserInternals.lo `test -f 'libxml/parserInternals.c' || echo '$(srcdir)/'`libxml/parserInternals.c
 
 libxml/libxml_rpl_la-pattern.lo: libxml/pattern.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-pattern.lo `test -f 'libxml/pattern.c' || echo '$(srcdir)/'`libxml/pattern.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-pattern.lo `test -f 'libxml/pattern.c' || echo '$(srcdir)/'`libxml/pattern.c
 
 libxml/libxml_rpl_la-relaxng.lo: libxml/relaxng.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-relaxng.lo `test -f 'libxml/relaxng.c' || echo '$(srcdir)/'`libxml/relaxng.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-relaxng.lo `test -f 'libxml/relaxng.c' || echo '$(srcdir)/'`libxml/relaxng.c
 
 libxml/libxml_rpl_la-schematron.lo: libxml/schematron.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-schematron.lo `test -f 'libxml/schematron.c' || echo '$(srcdir)/'`libxml/schematron.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-schematron.lo `test -f 'libxml/schematron.c' || echo '$(srcdir)/'`libxml/schematron.c
 
 libxml/libxml_rpl_la-threads.lo: libxml/threads.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-threads.lo `test -f 'libxml/threads.c' || echo '$(srcdir)/'`libxml/threads.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-threads.lo `test -f 'libxml/threads.c' || echo '$(srcdir)/'`libxml/threads.c
 
 libxml/libxml_rpl_la-tree.lo: libxml/tree.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-tree.lo `test -f 'libxml/tree.c' || echo '$(srcdir)/'`libxml/tree.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-tree.lo `test -f 'libxml/tree.c' || echo '$(srcdir)/'`libxml/tree.c
 
 libxml/libxml_rpl_la-uri.lo: libxml/uri.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-uri.lo `test -f 'libxml/uri.c' || echo '$(srcdir)/'`libxml/uri.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-uri.lo `test -f 'libxml/uri.c' || echo '$(srcdir)/'`libxml/uri.c
 
 libxml/libxml_rpl_la-valid.lo: libxml/valid.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-valid.lo `test -f 'libxml/valid.c' || echo '$(srcdir)/'`libxml/valid.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-valid.lo `test -f 'libxml/valid.c' || echo '$(srcdir)/'`libxml/valid.c
 
 libxml/libxml_rpl_la-xinclude.lo: libxml/xinclude.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xinclude.lo `test -f 'libxml/xinclude.c' || echo '$(srcdir)/'`libxml/xinclude.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xinclude.lo `test -f 'libxml/xinclude.c' || echo '$(srcdir)/'`libxml/xinclude.c
 
 libxml/libxml_rpl_la-xlink.lo: libxml/xlink.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xlink.lo `test -f 'libxml/xlink.c' || echo '$(srcdir)/'`libxml/xlink.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xlink.lo `test -f 'libxml/xlink.c' || echo '$(srcdir)/'`libxml/xlink.c
 
 libxml/libxml_rpl_la-xmlIO.lo: libxml/xmlIO.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlIO.lo `test -f 'libxml/xmlIO.c' || echo '$(srcdir)/'`libxml/xmlIO.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlIO.lo `test -f 'libxml/xmlIO.c' || echo '$(srcdir)/'`libxml/xmlIO.c
 
 libxml/libxml_rpl_la-xmlmemory.lo: libxml/xmlmemory.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlmemory.lo `test -f 'libxml/xmlmemory.c' || echo '$(srcdir)/'`libxml/xmlmemory.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlmemory.lo `test -f 'libxml/xmlmemory.c' || echo '$(srcdir)/'`libxml/xmlmemory.c
 
 libxml/libxml_rpl_la-xmlmodule.lo: libxml/xmlmodule.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlmodule.lo `test -f 'libxml/xmlmodule.c' || echo '$(srcdir)/'`libxml/xmlmodule.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlmodule.lo `test -f 'libxml/xmlmodule.c' || echo '$(srcdir)/'`libxml/xmlmodule.c
 
 libxml/libxml_rpl_la-xmlreader.lo: libxml/xmlreader.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlreader.lo `test -f 'libxml/xmlreader.c' || echo '$(srcdir)/'`libxml/xmlreader.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlreader.lo `test -f 'libxml/xmlreader.c' || echo '$(srcdir)/'`libxml/xmlreader.c
 
 libxml/libxml_rpl_la-xmlregexp.lo: libxml/xmlregexp.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlregexp.lo `test -f 'libxml/xmlregexp.c' || echo '$(srcdir)/'`libxml/xmlregexp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlregexp.lo `test -f 'libxml/xmlregexp.c' || echo '$(srcdir)/'`libxml/xmlregexp.c
 
 libxml/libxml_rpl_la-xmlsave.lo: libxml/xmlsave.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlsave.lo `test -f 'libxml/xmlsave.c' || echo '$(srcdir)/'`libxml/xmlsave.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlsave.lo `test -f 'libxml/xmlsave.c' || echo '$(srcdir)/'`libxml/xmlsave.c
 
 libxml/libxml_rpl_la-xmlschemas.lo: libxml/xmlschemas.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlschemas.lo `test -f 'libxml/xmlschemas.c' || echo '$(srcdir)/'`libxml/xmlschemas.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlschemas.lo `test -f 'libxml/xmlschemas.c' || echo '$(srcdir)/'`libxml/xmlschemas.c
 
 libxml/libxml_rpl_la-xmlschemastypes.lo: libxml/xmlschemastypes.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlschemastypes.lo `test -f 'libxml/xmlschemastypes.c' || echo '$(srcdir)/'`libxml/xmlschemastypes.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlschemastypes.lo `test -f 'libxml/xmlschemastypes.c' || echo '$(srcdir)/'`libxml/xmlschemastypes.c
 
 libxml/libxml_rpl_la-xmlstring.lo: libxml/xmlstring.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlstring.lo `test -f 'libxml/xmlstring.c' || echo '$(srcdir)/'`libxml/xmlstring.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlstring.lo `test -f 'libxml/xmlstring.c' || echo '$(srcdir)/'`libxml/xmlstring.c
 
 libxml/libxml_rpl_la-xmlunicode.lo: libxml/xmlunicode.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlunicode.lo `test -f 'libxml/xmlunicode.c' || echo '$(srcdir)/'`libxml/xmlunicode.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlunicode.lo `test -f 'libxml/xmlunicode.c' || echo '$(srcdir)/'`libxml/xmlunicode.c
 
 libxml/libxml_rpl_la-xmlwriter.lo: libxml/xmlwriter.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlwriter.lo `test -f 'libxml/xmlwriter.c' || echo '$(srcdir)/'`libxml/xmlwriter.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xmlwriter.lo `test -f 'libxml/xmlwriter.c' || echo '$(srcdir)/'`libxml/xmlwriter.c
 
 libxml/libxml_rpl_la-xpath.lo: libxml/xpath.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xpath.lo `test -f 'libxml/xpath.c' || echo '$(srcdir)/'`libxml/xpath.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xpath.lo `test -f 'libxml/xpath.c' || echo '$(srcdir)/'`libxml/xpath.c
 
 libxml/libxml_rpl_la-xpointer.lo: libxml/xpointer.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xpointer.lo `test -f 'libxml/xpointer.c' || echo '$(srcdir)/'`libxml/xpointer.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxml_rpl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxml/libxml_rpl_la-xpointer.lo `test -f 'libxml/xpointer.c' || echo '$(srcdir)/'`libxml/xpointer.c
 
 .cc.o:
-	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -2859,11 +2908,8 @@
 	-rm -rf uniwidth/.libs uniwidth/_libs
 install-gettextsrcDATA: $(gettextsrc_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(gettextsrcdir)" || $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)"
 	@list='$(gettextsrc_DATA)'; test -n "$(gettextsrcdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gettextsrcdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -2877,14 +2923,13 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gettextsrc_DATA)'; test -n "$(gettextsrcdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(gettextsrcdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gettextsrcdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gettextsrcdir)" && rm -f $$files
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -2898,17 +2943,30 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -2920,11 +2978,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -2933,21 +2995,6 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -3001,15 +3048,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -3036,7 +3078,6 @@
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-@RELOCATABLE_VIA_WRAPPER_FALSE@uninstall-hook:
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@@ -3106,17 +3147,16 @@
 
 uninstall-am: uninstall-gettextsrcDATA uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-pkgdataDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-.MAKE: all check install install-am install-strip uninstall-am
 
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-local \
+	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local \
 	install-gettextsrcDATA install-html install-html-am \
 	install-info install-info-am install-libLTLIBRARIES \
 	install-man install-pdf install-pdf-am install-pkgdataDATA \
@@ -3124,35 +3164,60 @@
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-gettextsrcDATA uninstall-hook \
-	uninstall-libLTLIBRARIES uninstall-local uninstall-pkgdataDATA
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-gettextsrcDATA uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-pkgdataDATA
 
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ALLOCA_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_ALLOCA_H_TRUE@	  cat $(srcdir)/alloca.in.h; \
-@GL_GENERATE_ALLOCA_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ALLOCA_H_TRUE@	mv -f $@-t $@
-@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_FALSE@	rm -f $@
+alloca.h: alloca.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <byteswap.h> when the system
 # doesn't have one.
-@GL_GENERATE_BYTESWAP_H_TRUE@byteswap.h: byteswap.in.h $(top_builddir)/config.status
-@GL_GENERATE_BYTESWAP_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_BYTESWAP_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_BYTESWAP_H_TRUE@	  cat $(srcdir)/byteswap.in.h; \
-@GL_GENERATE_BYTESWAP_H_TRUE@	} > $@-t && \
-@GL_GENERATE_BYTESWAP_H_TRUE@	mv -f $@-t $@
-@GL_GENERATE_BYTESWAP_H_FALSE@byteswap.h: $(top_builddir)/config.status
-@GL_GENERATE_BYTESWAP_H_FALSE@	rm -f $@
+byteswap.h: byteswap.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/byteswap.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
@@ -3168,7 +3233,6 @@
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -3187,83 +3251,41 @@
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
 
-# We need the following in order to create <dirent.h> when the system
-# doesn't have one that works with the given compiler.
-dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+# We need the following in order to create <errno.h> when the system
+# doesn't have one that is POSIX compliant.
+errno.h: errno.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
-	      -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \
-	      -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \
-	      -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \
-	      -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \
-	      -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \
-	      -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \
-	      -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \
-	      -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \
-	      -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \
-	      -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \
-	      -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \
-	      -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \
-	      -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \
-	      -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \
-	      -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \
-	      -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \
-	      -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \
-	      -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \
-	      -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \
-	      -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \
-	      -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/dirent.in.h; \
+	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
+	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
+	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
+	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
+	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
+	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
+	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
+	      < $(srcdir)/errno.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
-# We need the following in order to create <errno.h> when the system
-# doesn't have one that is POSIX compliant.
-@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ERRNO_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ERRNO_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      < $(srcdir)/errno.in.h; \
-@GL_GENERATE_ERRNO_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ERRNO_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_FALSE@	rm -f $@
-
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-	      -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
-	      -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
-	      -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
+	      -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
 	      -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
 	      -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
 	      -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
@@ -3310,43 +3332,34 @@
 
 # We need the following in order to create <float.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_FLOAT_H_TRUE@float.h: float.in.h $(top_builddir)/config.status
-@GL_GENERATE_FLOAT_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_FLOAT_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_FLOAT_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      < $(srcdir)/float.in.h; \
-@GL_GENERATE_FLOAT_H_TRUE@	} > $@-t && \
-@GL_GENERATE_FLOAT_H_TRUE@	mv $@-t $@
-@GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status
-@GL_GENERATE_FLOAT_H_FALSE@	rm -f $@
+float.h: float.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
+	      < $(srcdir)/float.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-@GL_GENERATE_FNMATCH_H_TRUE@fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
-@GL_GENERATE_FNMATCH_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_FNMATCH_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_FNMATCH_H_TRUE@	  sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-@GL_GENERATE_FNMATCH_H_TRUE@	      < $(srcdir)/fnmatch.in.h; \
-@GL_GENERATE_FNMATCH_H_TRUE@	} > $@-t && \
-@GL_GENERATE_FNMATCH_H_TRUE@	mv -f $@-t $@
-@GL_GENERATE_FNMATCH_H_FALSE@fnmatch.h: $(top_builddir)/config.status
-@GL_GENERATE_FNMATCH_H_FALSE@	rm -f $@
+fnmatch.h: fnmatch.in.h $(ARG_NONNULL_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      < $(srcdir)/fnmatch.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+	  sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      < $(srcdir)/getopt.in.h; \
@@ -3395,27 +3408,22 @@
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@GL_GENERATE_ICONV_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ICONV_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ICONV_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      < $(srcdir)/iconv.in.h; \
-@GL_GENERATE_ICONV_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ICONV_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ICONV_H_FALSE@iconv.h: $(top_builddir)/config.status
-@GL_GENERATE_ICONV_H_FALSE@	rm -f $@
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
+	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
+	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
+	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
+	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/iconv.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
@@ -3446,371 +3454,371 @@
 	mv -f $@-t $@
 
 glib/ghash.h: glib/ghash.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/ghash.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/glist.h: glib/glist.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/glist.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gprimes.h: glib/gprimes.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gprimes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gstrfuncs.h: glib/gstrfuncs.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gstrfuncs.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gstring.h: glib/gstring.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gstring.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gtypes.h: glib/gtypes.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gtypes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/DOCBparser.h: libxml/DOCBparser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/DOCBparser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/HTMLparser.h: libxml/HTMLparser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/HTMLparser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/HTMLtree.h: libxml/HTMLtree.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/HTMLtree.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/SAX.h: libxml/SAX.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/SAX.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/SAX2.h: libxml/SAX2.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/SAX2.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/c14n.h: libxml/c14n.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/c14n.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/catalog.h: libxml/catalog.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/catalog.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/chvalid.h: libxml/chvalid.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/chvalid.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/debugXML.h: libxml/debugXML.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/debugXML.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/dict.h: libxml/dict.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/dict.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/encoding.h: libxml/encoding.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/encoding.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/entities.h: libxml/entities.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/entities.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/globals.h: libxml/globals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/globals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/hash.h: libxml/hash.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/hash.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/list.h: libxml/list.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/list.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/nanoftp.h: libxml/nanoftp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/nanoftp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/nanohttp.h: libxml/nanohttp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/nanohttp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/parser.h: libxml/parser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/parser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/parserInternals.h: libxml/parserInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/parserInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/pattern.h: libxml/pattern.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/pattern.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/relaxng.h: libxml/relaxng.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/relaxng.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/schemasInternals.h: libxml/schemasInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/schemasInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/schematron.h: libxml/schematron.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/schematron.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/threads.h: libxml/threads.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/threads.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/tree.h: libxml/tree.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/tree.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/uri.h: libxml/uri.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/uri.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/valid.h: libxml/valid.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/valid.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xinclude.h: libxml/xinclude.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xinclude.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xlink.h: libxml/xlink.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xlink.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlIO.h: libxml/xmlIO.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlIO.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlautomata.h: libxml/xmlautomata.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlautomata.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlerror.h: libxml/xmlerror.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlerror.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlexports.h: libxml/xmlexports.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlexports.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlmemory.h: libxml/xmlmemory.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlmemory.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlmodule.h: libxml/xmlmodule.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlmodule.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlreader.h: libxml/xmlreader.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlreader.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlregexp.h: libxml/xmlregexp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlregexp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlsave.h: libxml/xmlsave.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlsave.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlschemas.h: libxml/xmlschemas.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlschemas.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlschemastypes.h: libxml/xmlschemastypes.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlschemastypes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlstring.h: libxml/xmlstring.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlstring.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlunicode.h: libxml/xmlunicode.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlunicode.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlversion.h: libxml/xmlversion.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlversion.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlwriter.h: libxml/xmlwriter.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlwriter.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpath.h: libxml/xpath.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpath.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpathInternals.h: libxml/xpathInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpathInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpointer.h: libxml/xpointer.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpointer.in.h; \
 	} > $@-t
@@ -3877,23 +3885,16 @@
 
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
-locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+	      -e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
 	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
 	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
 	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
-	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -3916,144 +3917,79 @@
 	    test -f $(srcdir)/ostream.h; \
 	  fi; \
 	}
-@RELOCATABLE_VIA_WRAPPER_TRUE@uninstall-hook: uninstall-relocwrapper
-@RELOCATABLE_VIA_WRAPPER_TRUE@uninstall-relocwrapper:
-@RELOCATABLE_VIA_WRAPPER_TRUE@	if test $(RELOCATABLE) = yes; then \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	  case '$(EXEEXT)' in \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	    .bin*) ;; \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	    *) cd $(top_builddir) && \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	       $(MAKE) $(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT) \
-@RELOCATABLE_VIA_WRAPPER_TRUE@		       AM_MAKEFLAGS='$(AM_MAKEFLAGS) EXEEXT=.bin$(EXEEXT)' \
-@RELOCATABLE_VIA_WRAPPER_TRUE@		       uninstall ;; \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	  esac; \
-@RELOCATABLE_VIA_WRAPPER_TRUE@	fi
-@RELOCATABLE_VIA_WRAPPER_TRUE@.PHONY: uninstall-relocwrapper
 
 # We need the following in order to create a replacement for <sched.h> when
 # the system doesn't have one.
-@GL_GENERATE_SCHED_H_TRUE@sched.h: sched.in.h $(top_builddir)/config.status
-@GL_GENERATE_SCHED_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_SCHED_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_SCHED_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \
-@GL_GENERATE_SCHED_H_TRUE@	      < $(srcdir)/sched.in.h; \
-@GL_GENERATE_SCHED_H_TRUE@	} > $@-t && \
-@GL_GENERATE_SCHED_H_TRUE@	mv $@-t $@
-@GL_GENERATE_SCHED_H_FALSE@sched.h: $(top_builddir)/config.status
-@GL_GENERATE_SCHED_H_FALSE@	rm -f $@
+sched.h: sched.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \
+	      -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \
+	      < $(srcdir)/sched.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <signal.h> when the system
 # doesn't have a complete one.
-signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
-	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
+	      -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
+	      -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
 	      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
-	      -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
 	      -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
 	      -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
 	      -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
 	      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
 	      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-	      -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
-	      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/signal.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
 
 # We need the following in order to create a replacement for <spawn.h> when
 # the system doesn't have one.
-spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+spawn.h: spawn.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
+	  sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_DESTROY''@/$(GNULIB_POSIX_SPAWNATTR_DESTROY)/g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN''@|$(GNULIB_POSIX_SPAWN)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNP''@|$(GNULIB_POSIX_SPAWNP)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@|$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_INIT''@|$(GNULIB_POSIX_SPAWNATTR_INIT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@|$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@|$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@|$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@|$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@|$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@|$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@|$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@|$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@|$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@|$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@|$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@|$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)|g' \
+	      -e 's|@''GNULIB_POSIX_SPAWNATTR_DESTROY''@|$(GNULIB_POSIX_SPAWNATTR_DESTROY)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \
 	      -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -4063,154 +3999,123 @@
 
 # We need the following in order to create <stdarg.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDARG_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDARG_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_STDARG_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      < $(srcdir)/stdarg.in.h; \
-@GL_GENERATE_STDARG_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDARG_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status
-@GL_GENERATE_STDARG_H_FALSE@	rm -f $@
+stdarg.h: stdarg.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
+	      < $(srcdir)/stdarg.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDBOOL_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDBOOL_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_STDBOOL_H_TRUE@	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
-@GL_GENERATE_STDBOOL_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDBOOL_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status
-@GL_GENERATE_STDBOOL_H_FALSE@	rm -f $@
+stdbool.h: stdbool.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDDEF_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDDEF_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_STDDEF_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      < $(srcdir)/stddef.in.h; \
-@GL_GENERATE_STDDEF_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDDEF_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status
-@GL_GENERATE_STDDEF_H_FALSE@	rm -f $@
+stddef.h: stddef.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+	      < $(srcdir)/stddef.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDINT_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDINT_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_STDINT_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      < $(srcdir)/stdint.in.h; \
-@GL_GENERATE_STDINT_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDINT_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status
-@GL_GENERATE_STDINT_H_FALSE@	rm -f $@
+stdint.h: stdint.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
-	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
-	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
-	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
-	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
-	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
-	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
-	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
-	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
-	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
-	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
-	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
-	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
-	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
-	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
-	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
-	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
-	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
-	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
-	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
-	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
-	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
-	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
-	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
-	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
-	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
-	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
-	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
-	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
-	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
-	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
-	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
-	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
-	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
-	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
-	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
-	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+	      -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+	      -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+	      -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+	      -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+	      -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      < $(srcdir)/stdio.in.h | \
 	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
-	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -4219,14 +4124,11 @@
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
 	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
-	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
-	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -4247,7 +4149,6 @@
 	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
 	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
@@ -4265,151 +4166,120 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+	      -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+	      -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
 	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
 	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-	      -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-	      -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-	      -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-	      -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-	      -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-	      -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-	      -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-	      -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-	      -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-	      -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-	      -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-	      -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-	      -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-	      -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-	      -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-	      -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-	      -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-	      -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-	      -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-	      -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-	      -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-	      -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-	      -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-	      -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-	      -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-	      -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-	      -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-	      -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-	      -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-	      -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-	      -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-	      -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-	      -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+	  sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -4425,18 +4295,15 @@
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-	      -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
 	      -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
 	      -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -4468,21 +4335,16 @@
 
 # We need the following in order to create <sys/select.h> when the system
 # doesn't have one that works with the given compiler.
-sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/select.h: sys_select.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
 	      -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \
-	      -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \
-	      -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \
+	      -e 's|@''GNULIB_SELECT''@|$(GNULIB_SELECT)|g' \
 	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \
-	      -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \
 	      -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -4490,31 +4352,65 @@
 	} > $@-t && \
 	mv $@-t $@
 
+# We need the following in order to create <sys/socket.h> when the system
+# doesn't have one that works with the given compiler.
+sys/socket.h: sys_socket.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
+	      -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_SOCKET''@|$(GNULIB_SOCKET)|g' \
+	      -e 's|@''GNULIB_CONNECT''@|$(GNULIB_CONNECT)|g' \
+	      -e 's|@''GNULIB_ACCEPT''@|$(GNULIB_ACCEPT)|g' \
+	      -e 's|@''GNULIB_BIND''@|$(GNULIB_BIND)|g' \
+	      -e 's|@''GNULIB_GETPEERNAME''@|$(GNULIB_GETPEERNAME)|g' \
+	      -e 's|@''GNULIB_GETSOCKNAME''@|$(GNULIB_GETSOCKNAME)|g' \
+	      -e 's|@''GNULIB_GETSOCKOPT''@|$(GNULIB_GETSOCKOPT)|g' \
+	      -e 's|@''GNULIB_LISTEN''@|$(GNULIB_LISTEN)|g' \
+	      -e 's|@''GNULIB_RECV''@|$(GNULIB_RECV)|g' \
+	      -e 's|@''GNULIB_SEND''@|$(GNULIB_SEND)|g' \
+	      -e 's|@''GNULIB_RECVFROM''@|$(GNULIB_RECVFROM)|g' \
+	      -e 's|@''GNULIB_SENDTO''@|$(GNULIB_SENDTO)|g' \
+	      -e 's|@''GNULIB_SETSOCKOPT''@|$(GNULIB_SETSOCKOPT)|g' \
+	      -e 's|@''GNULIB_SHUTDOWN''@|$(GNULIB_SHUTDOWN)|g' \
+	      -e 's|@''GNULIB_ACCEPT4''@|$(GNULIB_ACCEPT4)|g' \
+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+	      -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+	      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
+	      -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \
+	      -e 's|@''HAVE_ACCEPT4''@|$(HAVE_ACCEPT4)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/sys_socket.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+	      -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+	      -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+	      -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+	      -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+	      -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+	      -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+	      -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+	      -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+	      -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+	      -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+	      -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -4544,22 +4440,18 @@
 
 # We need the following in order to create <sys/time.h> when the system
 # doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/time.h: sys_time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+	  sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
 	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
 	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
 	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
 	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -4567,36 +4459,15 @@
 	} > $@-t && \
 	mv $@-t $@
 
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      < $(srcdir)/sys_types.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-
 # We need the following in order to create <sys/wait.h> when the system
 # has one that is incomplete.
-sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/wait.h: sys_wait.in.h
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-	      -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_wait.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -4635,26 +4506,21 @@
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
-	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
-	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
-	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
-	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+	      -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+	      -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+	      -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+	      -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+	      -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
-	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
-	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -4692,65 +4558,53 @@
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
-	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
-	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
-	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
-	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
-	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
-	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
-	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
-	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
-	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
-	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
-	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
-	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
-	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
-	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
-	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
-	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
-	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
-	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
-	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
-	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
-	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
-	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
-	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
-	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+	      -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+	      -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+	      -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+	      -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+	      -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+	      -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+	      -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+	      -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+	      -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+	      -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+	      -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      < $(srcdir)/unistd.in.h | \
 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -4759,62 +4613,48 @@
 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
-	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
-	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
-	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
-	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
-	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
-	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
@@ -4852,60 +4692,45 @@
 	  cat $(srcdir)/uniwidth.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/../build-aux/unused-parameter.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+	  < $(top_srcdir)/../build-aux/unused-parameter.h \
+	  > $@-t && \
+	mv $@-t $@
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -4915,38 +4740,9 @@
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -4958,37 +4754,26 @@
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
-	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
 	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
-	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/wctype.in.h; \
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/malloca.c gettext-0.18.1.1/gettext-tools/gnulib-lib/malloca.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/malloca.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/malloca.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,18 +13,14 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
 #include "malloca.h"
 
-#include <stdint.h>
-
-#include "verify.h"
-
 /* The speed critical point in this file is freea() applied to an alloca()
    result: it must be fast, to match the speed of alloca().  The speed of
    mmalloca() and freea() in the other case are not critical, because they
@@ -49,18 +45,13 @@
 #define MAGIC_SIZE sizeof (int)
 /* This is how the header info would look like without any alignment
    considerations.  */
-struct preliminary_header { void *next; int magic; };
+struct preliminary_header { void *next; char room[MAGIC_SIZE]; };
 /* But the header's size must be a multiple of sa_alignment_max.  */
 #define HEADER_SIZE \
   (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
-union header {
-  void *next;
-  struct {
-    char room[HEADER_SIZE - MAGIC_SIZE];
-    int word;
-  } magic;
-};
-verify (HEADER_SIZE == sizeof (union header));
+struct header { void *next; char room[HEADER_SIZE - sizeof (struct preliminary_header) + MAGIC_SIZE]; };
+/* Verify that HEADER_SIZE == sizeof (struct header).  */
+typedef int verify1[2 * (HEADER_SIZE == sizeof (struct header)) - 1];
 /* We make the hash table quite big, so that during lookups the probability
    of empty hash buckets is quite high.  There is no need to make the hash
    table resizable, because when the hash table gets filled so much that the
@@ -80,21 +71,20 @@
 
   if (nplus >= n)
     {
-      void *p = malloc (nplus);
+      char *p = (char *) malloc (nplus);
 
       if (p != NULL)
         {
           size_t slot;
-          union header *h = p;
 
-          p = h + 1;
+          p += HEADER_SIZE;
 
           /* Put a magic number into the indicator word.  */
-          h->magic.word = MAGIC_NUMBER;
+          ((int *) p)[-1] = MAGIC_NUMBER;
 
           /* Enter p into the hash table.  */
-          slot = (uintptr_t) p % HASH_TABLE_SIZE;
-          h->next = mmalloca_results[slot];
+          slot = (unsigned long) p % HASH_TABLE_SIZE;
+          ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
           mmalloca_results[slot] = p;
 
           return p;
@@ -126,21 +116,19 @@
         {
           /* Looks like a mmalloca() result.  To see whether it really is one,
              perform a lookup in the hash table.  */
-          size_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
+          size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
           void **chain = &mmalloca_results[slot];
           for (; *chain != NULL;)
             {
-              union header *h = p;
               if (*chain == p)
                 {
                   /* Found it.  Remove it from the hash table and free it.  */
-                  union header *p_begin = h - 1;
-                  *chain = p_begin->next;
+                  char *p_begin = (char *) p - HEADER_SIZE;
+                  *chain = ((struct header *) p_begin)->next;
                   free (p_begin);
                   return;
                 }
-              h = *chain;
-              chain = &h[-1].next;
+              chain = &((struct header *) ((char *) *chain - HEADER_SIZE))->next;
             }
         }
       /* At this point, we know it was not a mmalloca() result.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/malloca.h gettext-0.18.1.1/gettext-tools/gnulib-lib/malloca.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/malloca.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/malloca.h	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MALLOCA_H
 #define _MALLOCA_H
@@ -42,7 +43,7 @@
    and a page size can be as small as 4096 bytes.  So we cannot safely
    allocate anything larger than 4096 bytes.  Also care for the possibility
    of a few compiler-allocated temporary stack slots.
-   This must be a macro, not a function.  */
+   This must be a macro, not an inline function.  */
 # define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
 #else
 # define safe_alloca(N) ((void) (N), NULL)
@@ -92,7 +93,7 @@
 /* ------------------- Auxiliary, non-public definitions ------------------- */
 
 /* Determine the alignment of a type at compile time.  */
-#if defined __GNUC__ || defined __IBM__ALIGNOF__
+#if defined __GNUC__
 # define sa_alignof __alignof__
 #elif defined __cplusplus
   template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/malloc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/malloc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/malloc.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/malloc.c	2010-05-24 10:59:08.000000000 +0000
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,25 +13,26 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering and Bruno Haible */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 /* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
 #ifdef malloc
-# define NEED_MALLOC_GNU 1
+# define NEED_MALLOC_GNU
 # undef malloc
-/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
-#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU
-# define NEED_MALLOC_GNU 1
 #endif
 
+/* Specification.  */
 #include <stdlib.h>
 
 #include <errno.h>
 
+/* Call the system's malloc below.  */
+#undef malloc
+
 /* Allocate an N-byte block of memory from the heap.
    If N is zero, allocate a 1-byte block.  */
 
@@ -40,7 +41,7 @@
 {
   void *result;
 
-#if NEED_MALLOC_GNU
+#ifdef NEED_MALLOC_GNU
   if (n == 0)
     n = 1;
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbchar.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbchar.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbchar.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbchar.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,8 +16,6 @@
 
 #include <config.h>
 
-#define MBCHAR_INLINE _GL_EXTERN_INLINE
-
 #include <limits.h>
 
 #include "mbchar.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbchar.h gettext-0.18.1.1/gettext-tools/gnulib-lib/mbchar.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbchar.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbchar.h	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Multibyte character data type.
-   Copyright (C) 2001, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -156,14 +156,6 @@
 #include <wchar.h>
 #include <wctype.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBCHAR_INLINE
-# define MBCHAR_INLINE _GL_INLINE
-#endif
-
 #define MBCHAR_BUF_SIZE 24
 
 struct mbchar
@@ -243,7 +235,7 @@
 /* Unprintable characters appear as a small box of width 1.  */
 #define MB_UNPRINTABLE_WIDTH 1
 
-MBCHAR_INLINE int
+static inline int
 mb_width_aux (wint_t wc)
 {
   int w = wcwidth (wc);
@@ -264,7 +256,7 @@
    (mbc)->wc = (mbc)->buf[0] = (sc))
 
 /* Copying a character.  */
-MBCHAR_INLINE void
+static inline void
 mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
 {
   if (old_mbc->ptr == &old_mbc->buf[0])
@@ -312,7 +304,7 @@
 
 extern const unsigned int is_basic_table[];
 
-MBCHAR_INLINE bool
+static inline bool
 is_basic (char c)
 {
   return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
@@ -321,7 +313,7 @@
 
 #else
 
-MBCHAR_INLINE bool
+static inline bool
 is_basic (char c)
 {
   switch (c)
@@ -355,6 +347,4 @@
 
 #endif
 
-_GL_INLINE_HEADER_END
-
 #endif /* _MBCHAR_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbiter.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbiter.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbiter.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbiter.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define MBITER_INLINE _GL_EXTERN_INLINE
-#include "mbiter.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbiter.h gettext-0.18.1.1/gettext-tools/gnulib-lib/mbiter.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbiter.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbiter.h	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,9 +47,9 @@
      initializes the iterator, starting at startptr and crossing length bytes.
 
    mbi_avail (iter)
-     returns true if there are more multibyte characters available before
+     returns true if there are more multibyte chracters available before
      the end of string is reached. In this case, mbi_cur (iter) is
-     initialized to the next multibyte character.
+     initialized to the next multibyte chracter.
 
    mbi_advance (iter)
      advances the iterator by one multibyte character.
@@ -97,14 +97,6 @@
 
 #include "mbchar.h"
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBITER_INLINE
-# define MBITER_INLINE _GL_INLINE
-#endif
-
 struct mbiter_multi
 {
   const char *limit;    /* pointer to end of string */
@@ -120,7 +112,7 @@
         */
 };
 
-MBITER_INLINE void
+static inline void
 mbiter_multi_next (struct mbiter_multi *iter)
 {
   if (iter->next_done)
@@ -180,14 +172,14 @@
   iter->next_done = true;
 }
 
-MBITER_INLINE void
+static inline void
 mbiter_multi_reloc (struct mbiter_multi *iter, ptrdiff_t ptrdiff)
 {
   iter->cur.ptr += ptrdiff;
   iter->limit += ptrdiff;
 }
 
-MBITER_INLINE void
+static inline void
 mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter)
 {
   new_iter->limit = old_iter->limit;
@@ -220,6 +212,4 @@
 /* Copying an iterator.  */
 #define mbi_copy mbiter_multi_copy
 
-_GL_INLINE_HEADER_END
-
 #endif /* _MBITER_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbrtowc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbrtowc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbrtowc.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbrtowc.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -40,6 +40,9 @@
 {
   char *pstate = (char *)ps;
 
+  if (pstate == NULL)
+    pstate = internal_state;
+
   if (s == NULL)
     {
       pwc = NULL;
@@ -51,10 +54,6 @@
     return (size_t)(-2);
 
   /* Here n > 0.  */
-
-  if (pstate == NULL)
-    pstate = internal_state;
-
   {
     size_t nstate = pstate[0];
     char buf[4];
@@ -92,7 +91,7 @@
 
     /* Here m > 0.  */
 
-# if __GLIBC__ || defined __UCLIBC__
+# if __GLIBC__
     /* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
     mbtowc (NULL, NULL, 0);
 # endif
@@ -128,7 +127,7 @@
       {
         const char *encoding = locale_charset ();
 
-        if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+        if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
           {
             /* Cf. unistr/u8-mblen.c.  */
             unsigned char c = (unsigned char) p[0];
@@ -185,8 +184,7 @@
         /* As a reference for this code, you can use the GNU libiconv
            implementation.  Look for uses of the RET_TOOFEW macro.  */
 
-        if (STREQ_OPT (encoding,
-                       "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
+        if (STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
           {
             if (m == 1)
               {
@@ -209,12 +207,9 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-            || STREQ_OPT (encoding,
-                          "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-            || STREQ_OPT (encoding,
-                          "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
+        if (STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+            || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+            || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
           {
             if (m == 1)
               {
@@ -225,8 +220,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
+        if (STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
           {
             if (m == 1)
               {
@@ -244,8 +238,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
+        if (STREQ (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
           {
             if (m == 1)
               {
@@ -278,7 +271,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
+        if (STREQ (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
           {
             if (m == 1)
               {
@@ -328,7 +321,7 @@
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
-# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
+# if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG
   if (s == NULL)
     {
       pwc = NULL;
@@ -337,16 +330,11 @@
     }
 # endif
 
-# if MBRTOWC_EMPTY_INPUT_BUG
-  if (n == 0)
-    return (size_t) -2;
-# endif
-
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
 
-    /* Override mbrtowc's internal state.  We cannot call mbsinit() on the
+    /* Override mbrtowc's internal state.  We can not call mbsinit() on the
        hidden internal state, but we can call it on our variable.  */
     if (ps == NULL)
       ps = &internal_state;
@@ -391,16 +379,7 @@
     return ret;
   }
 # else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
-
-    return mbrtowc (pwc, s, n, ps);
-  }
+  return mbrtowc (pwc, s, n, ps);
 # endif
 }
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbsinit.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsinit.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbsinit.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsinit.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,18 +22,6 @@
 
 #include "verify.h"
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-
-/* On native Windows, 'mbstate_t' is defined as 'int'.  */
-
-int
-mbsinit (const mbstate_t *ps)
-{
-  return ps == NULL || *ps == 0;
-}
-
-#else
-
 /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
    and wcrtomb(), wcsrtombs().
    We assume that
@@ -55,7 +43,5 @@
 {
   const char *pstate = (const char *)ps;
 
-  return pstate == NULL || pstate[0] == 0;
+  return pstate[0] == 0;
 }
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbslen.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbslen.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbslen.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbslen.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbsrtowcs.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsrtowcs.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbsrtowcs.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsrtowcs.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,4 +29,108 @@
 
 extern mbstate_t _gl_mbsrtowcs_state;
 
-#include "mbsrtowcs-impl.h"
+size_t
+mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+{
+  if (ps == NULL)
+    ps = &_gl_mbsrtowcs_state;
+  {
+    const char *src = *srcp;
+
+    if (dest != NULL)
+      {
+        wchar_t *destptr = dest;
+
+        for (; len > 0; destptr++, len--)
+          {
+            size_t src_avail;
+            size_t ret;
+
+            /* An optimized variant of
+               src_avail = strnlen1 (src, MB_LEN_MAX);  */
+            if (src[0] == '\0')
+              src_avail = 1;
+            else if (src[1] == '\0')
+              src_avail = 2;
+            else if (src[2] == '\0')
+              src_avail = 3;
+            else if (MB_LEN_MAX <= 4 || src[3] == '\0')
+              src_avail = 4;
+            else
+              src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
+
+            /* Parse the next multibyte character.  */
+            ret = mbrtowc (destptr, src, src_avail, ps);
+
+            if (ret == (size_t)(-2))
+              /* Encountered a multibyte character that extends past a '\0' byte
+                 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
+              abort ();
+
+            if (ret == (size_t)(-1))
+              goto bad_input;
+            if (ret == 0)
+              {
+                src = NULL;
+                /* Here mbsinit (ps).  */
+                break;
+              }
+            src += ret;
+          }
+
+        *srcp = src;
+        return destptr - dest;
+      }
+    else
+      {
+        /* Ignore dest and len, don't store *srcp at the end, and
+           don't clobber *ps.  */
+        mbstate_t state = *ps;
+        size_t totalcount = 0;
+
+        for (;; totalcount++)
+          {
+            size_t src_avail;
+            size_t ret;
+
+            /* An optimized variant of
+               src_avail = strnlen1 (src, MB_LEN_MAX);  */
+            if (src[0] == '\0')
+              src_avail = 1;
+            else if (src[1] == '\0')
+              src_avail = 2;
+            else if (src[2] == '\0')
+              src_avail = 3;
+            else if (MB_LEN_MAX <= 4 || src[3] == '\0')
+              src_avail = 4;
+            else
+              src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
+
+            /* Parse the next multibyte character.  */
+            ret = mbrtowc (NULL, src, src_avail, &state);
+
+            if (ret == (size_t)(-2))
+              /* Encountered a multibyte character that extends past a '\0' byte
+                 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
+              abort ();
+
+            if (ret == (size_t)(-1))
+              goto bad_input2;
+            if (ret == 0)
+              {
+                /* Here mbsinit (&state).  */
+                break;
+              }
+            src += ret;
+          }
+
+        return totalcount;
+      }
+
+   bad_input:
+    *srcp = src;
+   bad_input2:
+    errno = EILSEQ;
+    return (size_t)(-1);
+  }
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbsrtowcs-impl.h gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsrtowcs-impl.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbsrtowcs-impl.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsrtowcs-impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/* Convert string to wide string.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-   This 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/>.  */
-
-size_t
-mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
-{
-  if (ps == NULL)
-    ps = &_gl_mbsrtowcs_state;
-  {
-    const char *src = *srcp;
-
-    if (dest != NULL)
-      {
-        wchar_t *destptr = dest;
-
-        for (; len > 0; destptr++, len--)
-          {
-            size_t src_avail;
-            size_t ret;
-
-            /* An optimized variant of
-               src_avail = strnlen1 (src, MB_LEN_MAX);  */
-            if (src[0] == '\0')
-              src_avail = 1;
-            else if (src[1] == '\0')
-              src_avail = 2;
-            else if (src[2] == '\0')
-              src_avail = 3;
-            else if (MB_LEN_MAX <= 4 || src[3] == '\0')
-              src_avail = 4;
-            else
-              src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
-
-            /* Parse the next multibyte character.  */
-            ret = mbrtowc (destptr, src, src_avail, ps);
-
-            if (ret == (size_t)(-2))
-              /* Encountered a multibyte character that extends past a '\0' byte
-                 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
-              abort ();
-
-            if (ret == (size_t)(-1))
-              goto bad_input;
-            if (ret == 0)
-              {
-                src = NULL;
-                /* Here mbsinit (ps).  */
-                break;
-              }
-            src += ret;
-          }
-
-        *srcp = src;
-        return destptr - dest;
-      }
-    else
-      {
-        /* Ignore dest and len, don't store *srcp at the end, and
-           don't clobber *ps.  */
-        mbstate_t state = *ps;
-        size_t totalcount = 0;
-
-        for (;; totalcount++)
-          {
-            size_t src_avail;
-            size_t ret;
-
-            /* An optimized variant of
-               src_avail = strnlen1 (src, MB_LEN_MAX);  */
-            if (src[0] == '\0')
-              src_avail = 1;
-            else if (src[1] == '\0')
-              src_avail = 2;
-            else if (src[2] == '\0')
-              src_avail = 3;
-            else if (MB_LEN_MAX <= 4 || src[3] == '\0')
-              src_avail = 4;
-            else
-              src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
-
-            /* Parse the next multibyte character.  */
-            ret = mbrtowc (NULL, src, src_avail, &state);
-
-            if (ret == (size_t)(-2))
-              /* Encountered a multibyte character that extends past a '\0' byte
-                 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
-              abort ();
-
-            if (ret == (size_t)(-1))
-              goto bad_input2;
-            if (ret == 0)
-              {
-                /* Here mbsinit (&state).  */
-                break;
-              }
-            src += ret;
-          }
-
-        return totalcount;
-      }
-
-   bad_input:
-    *srcp = src;
-   bad_input2:
-    errno = EILSEQ;
-    return (size_t)(-1);
-  }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbsrtowcs-state.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsrtowcs-state.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbsrtowcs-state.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsrtowcs-state.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 /* Internal state used by the functions mbsrtowcs() and mbsnrtowcs().  */
 mbstate_t _gl_mbsrtowcs_state
 /* The state must initially be in the "initial state"; so, zero-initialize it.
-   On most systems, putting it into BSS is sufficient.  Not so on Mac OS X 10.3,
+   On most systems, putting it into BSS is sufficient.  Not so on MacOS X 10.3,
    see <http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>.
    When it needs an initializer, use 0 or {0} as initializer? 0 only works
    when mbstate_t is a scalar type (such as when gnulib defines it, or on
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbsstr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsstr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbsstr.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbsstr.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #include "mbuiter.h"
 
 /* Knuth-Morris-Pratt algorithm.  */
-#define UNIT unsigned char
 #define CANON_ELEMENT(c) c
 #include "str-kmp.h"
 
@@ -45,13 +44,11 @@
   size_t *table;
 
   /* Allocate room for needle_mbchars and the table.  */
-  void *memory = nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
-  void *table_memory;
+  char *memory = (char *) nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
   if (memory == NULL)
     return false;
-  needle_mbchars = memory;
-  table_memory = needle_mbchars + m;
-  table = table_memory;
+  needle_mbchars = (mbchar_t *) memory;
+  table = (size_t *) (memory + m * sizeof (mbchar_t));
 
   /* Fill needle_mbchars.  */
   {
@@ -342,12 +339,10 @@
                   if (needle_last_ccount == NULL)
                     {
                       /* Try the Knuth-Morris-Pratt algorithm.  */
-                      const unsigned char *result;
+                      const char *result;
                       bool success =
-                        knuth_morris_pratt ((const unsigned char *) haystack,
-                                            (const unsigned char *) (needle - 1),
-                                            strlen (needle - 1),
-                                            &result);
+                        knuth_morris_pratt_unibyte (haystack, needle - 1,
+                                                    &result);
                       if (success)
                         return (char *) result;
                       try_kmp = false;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbswidth.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbswidth.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbswidth.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbswidth.c	2010-05-24 09:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,14 +35,12 @@
 /* Get iswcntrl().  */
 #include <wctype.h>
 
-/* Get INT_MAX.  */
-#include <limits.h>
-
 /* Returns the number of columns needed to represent the multibyte
    character string pointed to by STRING.  If a non-printable character
    occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.
    With flags = MBSW_REJECT_INVALID | MBSW_REJECT_UNPRINTABLE, this is
-   the multibyte analogue of the wcswidth function.  */
+   the multibyte analogue of the wcswidth function.
+   If STRING is not of length < INT_MAX / 2, integer overflow can occur.  */
 int
 mbswidth (const char *string, int flags)
 {
@@ -52,7 +50,8 @@
 /* Returns the number of columns needed to represent the multibyte
    character string pointed to by STRING of length NBYTES.  If a
    non-printable character occurs, and MBSW_REJECT_UNPRINTABLE is
-   specified, -1 is returned.  */
+   specified, -1 is returned.
+   If NBYTES is not < INT_MAX / 2, integer overflow can occur.  */
 int
 mbsnwidth (const char *string, size_t nbytes, int flags)
 {
@@ -136,22 +135,11 @@
                     w = wcwidth (wc);
                     if (w >= 0)
                       /* A printable multibyte character.  */
-                      {
-                        if (w > INT_MAX - width)
-                          goto overflow;
-                        width += w;
-                      }
+                      width += w;
                     else
                       /* An unprintable multibyte character.  */
                       if (!(flags & MBSW_REJECT_UNPRINTABLE))
-                        {
-                          if (!iswcntrl (wc))
-                            {
-                              if (width == INT_MAX)
-                                goto overflow;
-                              width++;
-                            }
-                        }
+                        width += (iswcntrl (wc) ? 0 : 1);
                       else
                         return -1;
 
@@ -169,25 +157,11 @@
       unsigned char c = (unsigned char) *p++;
 
       if (isprint (c))
-        {
-          if (width == INT_MAX)
-            goto overflow;
-          width++;
-        }
+        width++;
       else if (!(flags & MBSW_REJECT_UNPRINTABLE))
-        {
-          if (!iscntrl (c))
-            {
-              if (width == INT_MAX)
-                goto overflow;
-              width++;
-            }
-        }
+        width += (iscntrl (c) ? 0 : 1);
       else
         return -1;
     }
   return width;
-
- overflow:
-  return INT_MAX;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbswidth.h gettext-0.18.1.1/gettext-tools/gnulib-lib/mbswidth.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbswidth.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbswidth.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2004, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbuiter.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mbuiter.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbuiter.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbuiter.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define MBUITER_INLINE _GL_EXTERN_INLINE
-#include "mbuiter.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mbuiter.h gettext-0.18.1.1/gettext-tools/gnulib-lib/mbuiter.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/mbuiter.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mbuiter.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -55,9 +55,9 @@
      initializes the iterator, starting at startptr.
 
    mbui_avail (iter)
-     returns true if there are more multibyte characters available before
+     returns true if there are more multibyte chracters available before
      the end of string is reached. In this case, mbui_cur (iter) is
-     initialized to the next multibyte character.
+     initialized to the next multibyte chracter.
 
    mbui_advance (iter)
      advances the iterator by one multibyte character.
@@ -106,14 +106,6 @@
 #include "mbchar.h"
 #include "strnlen1.h"
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBUITER_INLINE
-# define MBUITER_INLINE _GL_INLINE
-#endif
-
 struct mbuiter_multi
 {
   bool in_shift;        /* true if next byte may not be interpreted as ASCII */
@@ -128,7 +120,7 @@
         */
 };
 
-MBUITER_INLINE void
+static inline void
 mbuiter_multi_next (struct mbuiter_multi *iter)
 {
   if (iter->next_done)
@@ -189,13 +181,13 @@
   iter->next_done = true;
 }
 
-MBUITER_INLINE void
+static inline void
 mbuiter_multi_reloc (struct mbuiter_multi *iter, ptrdiff_t ptrdiff)
 {
   iter->cur.ptr += ptrdiff;
 }
 
-MBUITER_INLINE void
+static inline void
 mbuiter_multi_copy (struct mbuiter_multi *new_iter, const struct mbuiter_multi *old_iter)
 {
   if ((new_iter->in_shift = old_iter->in_shift))
@@ -227,6 +219,4 @@
 /* Copying an iterator.  */
 #define mbui_copy mbuiter_multi_copy
 
-_GL_INLINE_HEADER_END
-
 #endif /* _MBUITER_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/memchr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/memchr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/memchr.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/memchr.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2010
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/memset.c gettext-0.18.1.1/gettext-tools/gnulib-lib/memset.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/memset.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/memset.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* memset.c -- set an area of memory to a given value
-   Copyright (C) 1991, 2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2003, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,9 +12,8 @@
    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>
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/minmax.h gettext-0.18.1.1/gettext-tools/gnulib-lib/minmax.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/minmax.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/minmax.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009, 2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MINMAX_H
 #define _MINMAX_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/mkdtemp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/mkdtemp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/mkdtemp.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/mkdtemp.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2014 Free Software
+/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/moo.h gettext-0.18.1.1/gettext-tools/gnulib-lib/moo.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/moo.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/moo.h	2010-05-24 09:42:46.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file defines minimal facilities for object-oriented programming
    style in ANSI C.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/msvc-inval.c gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-inval.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/msvc-inval.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-inval.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "msvc-inval.h"
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && !(MSVC_INVALID_PARAMETER_HANDLING == SANE_LIBRARY_HANDLING)
-
-/* Get _invalid_parameter_handler type and _set_invalid_parameter_handler
-   declaration.  */
-# include <stdlib.h>
-
-# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-}
-
-# else
-
-/* Get declarations of the native Windows API functions.  */
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-
-#  if defined _MSC_VER
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-  RaiseException (STATUS_GNULIB_INVALID_PARAMETER, 0, 0, NULL);
-}
-
-#  else
-
-/* An index to thread-local storage.  */
-static DWORD tls_index;
-static int tls_initialized /* = 0 */;
-
-/* Used as a fallback only.  */
-static struct gl_msvc_inval_per_thread not_per_thread;
-
-struct gl_msvc_inval_per_thread *
-gl_msvc_inval_current (void)
-{
-  if (!tls_initialized)
-    {
-      tls_index = TlsAlloc ();
-      tls_initialized = 1;
-    }
-  if (tls_index == TLS_OUT_OF_INDEXES)
-    /* TlsAlloc had failed.  */
-    return &not_per_thread;
-  else
-    {
-      struct gl_msvc_inval_per_thread *pointer =
-        (struct gl_msvc_inval_per_thread *) TlsGetValue (tls_index);
-      if (pointer == NULL)
-        {
-          /* First call.  Allocate a new 'struct gl_msvc_inval_per_thread'.  */
-          pointer =
-            (struct gl_msvc_inval_per_thread *)
-            malloc (sizeof (struct gl_msvc_inval_per_thread));
-          if (pointer == NULL)
-            /* Could not allocate memory.  Use the global storage.  */
-            pointer = &not_per_thread;
-          TlsSetValue (tls_index, pointer);
-        }
-      return pointer;
-    }
-}
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-  struct gl_msvc_inval_per_thread *current = gl_msvc_inval_current ();
-  if (current->restart_valid)
-    longjmp (current->restart, 1);
-  else
-    /* An invalid parameter notification from outside the gnulib code.
-       Give the caller a chance to intervene.  */
-    RaiseException (STATUS_GNULIB_INVALID_PARAMETER, 0, 0, NULL);
-}
-
-#  endif
-
-# endif
-
-static int gl_msvc_inval_initialized /* = 0 */;
-
-void
-gl_msvc_inval_ensure_handler (void)
-{
-  if (gl_msvc_inval_initialized == 0)
-    {
-      _set_invalid_parameter_handler (gl_msvc_invalid_parameter_handler);
-      gl_msvc_inval_initialized = 1;
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/msvc-inval.h gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-inval.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/msvc-inval.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-inval.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +0,0 @@
-/* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _MSVC_INVAL_H
-#define _MSVC_INVAL_H
-
-/* With MSVC runtime libraries with the "invalid parameter handler" concept,
-   functions like fprintf(), dup2(), or close() crash when the caller passes
-   an invalid argument.  But POSIX wants error codes (such as EINVAL or EBADF)
-   instead.
-   This file defines macros that turn such an invalid parameter notification
-   into a non-local exit.  An error code can then be produced at the target
-   of this exit.  You can thus write code like
-
-     TRY_MSVC_INVAL
-       {
-         <Code that can trigger an invalid parameter notification
-          but does not do 'return', 'break', 'continue', nor 'goto'.>
-       }
-     CATCH_MSVC_INVAL
-       {
-         <Code that handles an invalid parameter notification
-          but does not do 'return', 'break', 'continue', nor 'goto'.>
-       }
-     DONE_MSVC_INVAL;
-
-   This entire block expands to a single statement.
-
-   The handling of invalid parameters can be done in three ways:
-
-     * The default way, which is reasonable for programs (not libraries):
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [DEFAULT_HANDLING])
-
-     * The way for libraries that make "hairy" calls (like close(-1), or
-       fclose(fp) where fileno(fp) is closed, or simply getdtablesize()):
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [HAIRY_LIBRARY_HANDLING])
-
-     * The way for libraries that make no "hairy" calls:
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [SANE_LIBRARY_HANDLING])
- */
-
-#define DEFAULT_HANDLING       0
-#define HAIRY_LIBRARY_HANDLING 1
-#define SANE_LIBRARY_HANDLING  2
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && !(MSVC_INVALID_PARAMETER_HANDLING == SANE_LIBRARY_HANDLING)
-/* A native Windows platform with the "invalid parameter handler" concept,
-   and either DEFAULT_HANDLING or HAIRY_LIBRARY_HANDLING.  */
-
-# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-/* Default handling.  */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-/* Ensure that the invalid parameter handler in installed that just returns.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-#  ifdef __cplusplus
-}
-#  endif
-
-#  define TRY_MSVC_INVAL \
-     do                                                                        \
-       {                                                                       \
-         gl_msvc_inval_ensure_handler ();                                      \
-         if (1)
-#  define CATCH_MSVC_INVAL \
-         else
-#  define DONE_MSVC_INVAL \
-       }                                                                       \
-     while (0)
-
-# else
-/* Handling for hairy libraries.  */
-
-#  include <excpt.h>
-
-/* Gnulib can define its own status codes, as described in the page
-   "Raising Software Exceptions" on microsoft.com
-   <http://msdn.microsoft.com/en-us/library/het71c37.aspx>.
-   Our status codes are composed of
-     - 0xE0000000, mandatory for all user-defined status codes,
-     - 0x474E550, a API identifier ("GNU"),
-     - 0, 1, 2, ..., used to distinguish different status codes from the
-       same API.  */
-#  define STATUS_GNULIB_INVALID_PARAMETER (0xE0000000 + 0x474E550 + 0)
-
-#  if defined _MSC_VER
-/* A compiler that supports __try/__except, as described in the page
-   "try-except statement" on microsoft.com
-   <http://msdn.microsoft.com/en-us/library/s58ftw19.aspx>.
-   With __try/__except, we can use the multithread-safe exception handling.  */
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-/* Ensure that the invalid parameter handler in installed that raises a
-   software exception with code STATUS_GNULIB_INVALID_PARAMETER.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#   define TRY_MSVC_INVAL \
-      do                                                                       \
-        {                                                                      \
-          gl_msvc_inval_ensure_handler ();                                     \
-          __try
-#   define CATCH_MSVC_INVAL \
-          __except (GetExceptionCode () == STATUS_GNULIB_INVALID_PARAMETER     \
-                    ? EXCEPTION_EXECUTE_HANDLER                                \
-                    : EXCEPTION_CONTINUE_SEARCH)
-#   define DONE_MSVC_INVAL \
-        }                                                                      \
-      while (0)
-
-#  else
-/* Any compiler.
-   We can only use setjmp/longjmp.  */
-
-#   include <setjmp.h>
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-struct gl_msvc_inval_per_thread
-{
-  /* The restart that will resume execution at the code between
-     CATCH_MSVC_INVAL and DONE_MSVC_INVAL.  It is enabled only between
-     TRY_MSVC_INVAL and CATCH_MSVC_INVAL.  */
-  jmp_buf restart;
-
-  /* Tells whether the contents of restart is valid.  */
-  int restart_valid;
-};
-
-/* Ensure that the invalid parameter handler in installed that passes
-   control to the gl_msvc_inval_restart if it is valid, or raises a
-   software exception with code STATUS_GNULIB_INVALID_PARAMETER otherwise.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-/* Return a pointer to the per-thread data for the current thread.  */
-extern struct gl_msvc_inval_per_thread *gl_msvc_inval_current (void);
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#   define TRY_MSVC_INVAL \
-      do                                                                       \
-        {                                                                      \
-          struct gl_msvc_inval_per_thread *msvc_inval_current;                 \
-          gl_msvc_inval_ensure_handler ();                                     \
-          msvc_inval_current = gl_msvc_inval_current ();                       \
-          /* First, initialize gl_msvc_inval_restart.  */                      \
-          if (setjmp (msvc_inval_current->restart) == 0)                       \
-            {                                                                  \
-              /* Then, mark it as valid.  */                                   \
-              msvc_inval_current->restart_valid = 1;
-#   define CATCH_MSVC_INVAL \
-              /* Execution completed.                                          \
-                 Mark gl_msvc_inval_restart as invalid.  */                    \
-              msvc_inval_current->restart_valid = 0;                           \
-            }                                                                  \
-          else                                                                 \
-            {                                                                  \
-              /* Execution triggered an invalid parameter notification.        \
-                 Mark gl_msvc_inval_restart as invalid.  */                    \
-              msvc_inval_current->restart_valid = 0;
-#   define DONE_MSVC_INVAL \
-            }                                                                  \
-        }                                                                      \
-      while (0)
-
-#  endif
-
-# endif
-
-#else
-/* A platform that does not need to the invalid parameter handler,
-   or when SANE_LIBRARY_HANDLING is desired.  */
-
-/* The braces here avoid GCC warnings like
-   "warning: suggest explicit braces to avoid ambiguous 'else'".  */
-# define TRY_MSVC_INVAL \
-    do                                                                         \
-      {                                                                        \
-        if (1)
-# define CATCH_MSVC_INVAL \
-        else
-# define DONE_MSVC_INVAL \
-      }                                                                        \
-    while (0)
-
-#endif
-
-#endif /* _MSVC_INVAL_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/msvc-nothrow.c gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-nothrow.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/msvc-nothrow.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-nothrow.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* Wrappers that don't throw invalid parameter notifications
-   with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "msvc-nothrow.h"
-
-/* Get declarations of the native Windows API functions.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "msvc-inval.h"
-
-#undef _get_osfhandle
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-intptr_t
-_gl_nothrow_get_osfhandle (int fd)
-{
-  intptr_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = _get_osfhandle (fd);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = (intptr_t) INVALID_HANDLE_VALUE;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/msvc-nothrow.h gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-nothrow.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/msvc-nothrow.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/msvc-nothrow.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* Wrappers that don't throw invalid parameter notifications
-   with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _MSVC_NOTHROW_H
-#define _MSVC_NOTHROW_H
-
-/* With MSVC runtime libraries with the "invalid parameter handler" concept,
-   functions like fprintf(), dup2(), or close() crash when the caller passes
-   an invalid argument.  But POSIX wants error codes (such as EINVAL or EBADF)
-   instead.
-   This file defines wrappers that turn such an invalid parameter notification
-   into an error code.  */
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Get original declaration of _get_osfhandle.  */
-# include <io.h>
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-
-/* Override _get_osfhandle.  */
-extern intptr_t _gl_nothrow_get_osfhandle (int fd);
-#  define _get_osfhandle _gl_nothrow_get_osfhandle
-
-# endif
-
-#endif
-
-#endif /* _MSVC_NOTHROW_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/obstack.c gettext-0.18.1.1/gettext-tools/gnulib-lib/obstack.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/obstack.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/obstack.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,21 +1,21 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-2014 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
-   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.
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free Software
+   Foundation, Inc.
+
+   This 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   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 _LIBC
 # include <obstack.h>
@@ -36,7 +36,7 @@
    C Library, but also included in many other GNU distributions.  Compiling
    and linking in this code is a waste when using the GNU C library
    (especially if it is a shared library).  Rather than having every GNU
-   program understand 'configure --with-gnu-libc' and omit the object
+   program understand `configure --with-gnu-libc' and omit the object
    files, it is simpler to just do this in the source for each such file.  */
 
 #include <stdio.h>              /* Random thing to get __GNU_LIBRARY__.  */
@@ -51,7 +51,6 @@
 
 #ifndef ELIDE_CODE
 
-
 # include <stdint.h>
 
 /* Determine default alignment.  */
@@ -70,30 +69,30 @@
    But in fact it might be less smart and round addresses to as much as
    DEFAULT_ROUNDING.  So we prepare for it to do that.  */
 enum
-{
-  DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
-  DEFAULT_ROUNDING = sizeof (union fooround)
-};
+  {
+    DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
+    DEFAULT_ROUNDING = sizeof (union fooround)
+  };
 
 /* When we copy a long block of data, this is the unit to do it with.
    On some machines, copying successive ints does not work;
-   in such a case, redefine COPYING_UNIT to 'long' (if that works)
-   or 'char' as a last resort.  */
+   in such a case, redefine COPYING_UNIT to `long' (if that works)
+   or `char' as a last resort.  */
 # ifndef COPYING_UNIT
 #  define COPYING_UNIT int
 # endif
 
 
-/* The functions allocating more room by calling 'obstack_chunk_alloc'
-   jump to the handler pointed to by 'obstack_alloc_failed_handler'.
+/* The functions allocating more room by calling `obstack_chunk_alloc'
+   jump to the handler pointed to by `obstack_alloc_failed_handler'.
    This can be set to a user defined function which should either
    abort gracefully or use longjump - but shouldn't return.  This
    variable by default points to the internal function
-   'print_and_abort'.  */
-static _Noreturn void print_and_abort (void);
+   `print_and_abort'.  */
+static void print_and_abort (void);
 void (*obstack_alloc_failed_handler) (void) = print_and_abort;
 
-/* Exit value used when 'print_and_abort' is used.  */
+/* Exit value used when `print_and_abort' is used.  */
 # include <stdlib.h>
 # ifdef _LIBC
 int obstack_exit_failure = EXIT_FAILURE;
@@ -107,7 +106,7 @@
 /* A looong time ago (before 1994, anyway; we're not sure) this global variable
    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
    library still exports it because somebody might use it.  */
-struct obstack *_obstack_compat = 0;
+struct obstack *_obstack_compat;
 compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
 #  endif
 # endif
@@ -119,19 +118,19 @@
    do not allow (expr) ? void : void.  */
 
 # define CALL_CHUNKFUN(h, size) \
-  (((h)->use_extra_arg)							      \
-   ? (*(h)->chunkfun)((h)->extra_arg, (size))				      \
-   : (*(struct _obstack_chunk *(*)(long))(h)->chunkfun)((size)))
+  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
 
 # define CALL_FREEFUN(h, old_chunk) \
   do { \
-      if ((h)->use_extra_arg)						      \
-        (*(h)->freefun)((h)->extra_arg, (old_chunk));			      \
-      else								      \
-        (*(void (*)(void *))(h)->freefun)((old_chunk));			      \
-    } while (0)
-
+    if ((h) -> use_extra_arg) \
+      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+    else \
+      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
+  } while (0)
 
+
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
    Objects start on multiples of ALIGNMENT (0 means use default).
    CHUNKFUN is the function to use to allocate chunks,
@@ -146,7 +145,7 @@
                 void *(*chunkfun) (long),
                 void (*freefun) (void *))
 {
-  struct _obstack_chunk *chunk; /* points to new chunk */
+  register struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -167,19 +166,19 @@
       size = 4096 - extra;
     }
 
-  h->chunkfun = (struct _obstack_chunk * (*) (void *, long)) chunkfun;
+  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
   h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->use_extra_arg = 0;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
   h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
                                                alignment - 1);
   h->chunk_limit = chunk->limit
-                     = (char *) chunk + h->chunk_size;
+    = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
   /* The initial chunk now contains no empty object.  */
   h->maybe_empty_object = 0;
@@ -193,7 +192,7 @@
                   void (*freefun) (void *, void *),
                   void *arg)
 {
-  struct _obstack_chunk *chunk; /* points to new chunk */
+  register struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -221,13 +220,13 @@
   h->extra_arg = arg;
   h->use_extra_arg = 1;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
   h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
                                                alignment - 1);
   h->chunk_limit = chunk->limit
-                     = (char *) chunk + h->chunk_size;
+    = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
   /* The initial chunk now contains no empty object.  */
   h->maybe_empty_object = 0;
@@ -244,11 +243,11 @@
 void
 _obstack_newchunk (struct obstack *h, int length)
 {
-  struct _obstack_chunk *old_chunk = h->chunk;
-  struct _obstack_chunk *new_chunk;
-  long new_size;
-  long obj_size = h->next_free - h->object_base;
-  long i;
+  register struct _obstack_chunk *old_chunk = h->chunk;
+  register struct _obstack_chunk *new_chunk;
+  register long new_size;
+  register long obj_size = h->next_free - h->object_base;
+  register long i;
   long already;
   char *object_base;
 
@@ -260,7 +259,7 @@
   /* Allocate and initialize the new chunk.  */
   new_chunk = CALL_CHUNKFUN (h, new_size);
   if (!new_chunk)
-    (*obstack_alloc_failed_handler)();
+    (*obstack_alloc_failed_handler) ();
   h->chunk = new_chunk;
   new_chunk->prev = old_chunk;
   new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
@@ -276,8 +275,8 @@
     {
       for (i = obj_size / sizeof (COPYING_UNIT) - 1;
            i >= 0; i--)
-        ((COPYING_UNIT *) object_base)[i]
-          = ((COPYING_UNIT *) h->object_base)[i];
+        ((COPYING_UNIT *)object_base)[i]
+          = ((COPYING_UNIT *)h->object_base)[i];
       /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
          but that can cross a page boundary on a machine
          which does not do strict alignment for COPYING_UNITS.  */
@@ -292,7 +291,7 @@
   /* If the object just copied was the only data in OLD_CHUNK,
      free that chunk and remove it from the chain.
      But not if that chunk might contain an empty object.  */
-  if (!h->maybe_empty_object
+  if (! h->maybe_empty_object
       && (h->object_base
           == __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
                           h->alignment_mask)))
@@ -316,13 +315,13 @@
 
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
    obstack.h because it is just for debugging.  */
-int _obstack_allocated_p (struct obstack *h, void *obj) __attribute_pure__;
+int _obstack_allocated_p (struct obstack *h, void *obj);
 
 int
 _obstack_allocated_p (struct obstack *h, void *obj)
 {
-  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
-  struct _obstack_chunk *plp;   /* point to previous chunk if any */
+  register struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;  /* point to previous chunk if any */
 
   lp = (h)->chunk;
   /* We use >= rather than > since the object cannot be exactly at
@@ -335,7 +334,7 @@
     }
   return lp != 0;
 }
-
+
 /* Free objects in obstack H, including OBJ and everything allocate
    more recently than OBJ.  If OBJ is zero, free everything in H.  */
 
@@ -344,8 +343,8 @@
 void
 __obstack_free (struct obstack *h, void *obj)
 {
-  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
-  struct _obstack_chunk *plp;   /* point to previous chunk if any */
+  register struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;  /* point to previous chunk if any */
 
   lp = h->chunk;
   /* We use >= because there cannot be an object at the beginning of a chunk.
@@ -376,12 +375,12 @@
    called by non-GCC compilers.  */
 strong_alias (obstack_free, _obstack_free)
 # endif
-
+
 int
 _obstack_memory_used (struct obstack *h)
 {
-  struct _obstack_chunk *lp;
-  int nbytes = 0;
+  register struct _obstack_chunk* lp;
+  register int nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
@@ -389,7 +388,7 @@
     }
   return nbytes;
 }
-
+
 /* Define the error handler.  */
 # ifdef _LIBC
 #  include <libintl.h>
@@ -404,7 +403,15 @@
 #  include <libio/iolibio.h>
 # endif
 
-static _Noreturn void
+# ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#   define __attribute__(Spec) /* empty */
+#  endif
+# endif
+
+static void
+__attribute__ ((noreturn))
 print_and_abort (void)
 {
   /* Don't change any of these strings.  Yes, it would be possible to add
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/obstack.h gettext-0.18.1.1/gettext-tools/gnulib-lib/obstack.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/obstack.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/obstack.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,90 +1,90 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988-2014 Free Software Foundation, Inc.
+   Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2010 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
-   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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Summary:
 
-   All the apparent functions defined here are macros. The idea
-   is that you would use these pre-tested macros to solve a
-   very specific set of problems, and they would run fast.
-   Caution: no side-effects in arguments please!! They may be
-   evaluated MANY times!!
-
-   These macros operate a stack of objects.  Each object starts life
-   small, and may grow to maturity.  (Consider building a word syllable
-   by syllable.)  An object can move while it is growing.  Once it has
-   been "finished" it never changes address again.  So the "top of the
-   stack" is typically an immature growing object, while the rest of the
-   stack is of mature, fixed size and fixed address objects.
-
-   These routines grab large chunks of memory, using a function you
-   supply, called 'obstack_chunk_alloc'.  On occasion, they free chunks,
-   by calling 'obstack_chunk_free'.  You must define them and declare
-   them before using any obstack macros.
-
-   Each independent stack is represented by a 'struct obstack'.
-   Each of the obstack macros expects a pointer to such a structure
-   as the first argument.
-
-   One motivation for this package is the problem of growing char strings
-   in symbol tables.  Unless you are "fascist pig with a read-only mind"
-   --Gosper's immortal quote from HAKMEM item 154, out of context--you
-   would not like to put any arbitrary upper limit on the length of your
-   symbols.
-
-   In practice this often means you will build many short symbols and a
-   few long symbols.  At the time you are reading a symbol you don't know
-   how long it is.  One traditional method is to read a symbol into a
-   buffer, realloc()ating the buffer every time you try to read a symbol
-   that is longer than the buffer.  This is beaut, but you still will
-   want to copy the symbol from the buffer to a more permanent
-   symbol-table entry say about half the time.
-
-   With obstacks, you can work differently.  Use one obstack for all symbol
-   names.  As you read a symbol, grow the name in the obstack gradually.
-   When the name is complete, finalize it.  Then, if the symbol exists already,
-   free the newly read name.
-
-   The way we do this is to take a large chunk, allocating memory from
-   low addresses.  When you want to build a symbol in the chunk you just
-   add chars above the current "high water mark" in the chunk.  When you
-   have finished adding chars, because you got to the end of the symbol,
-   you know how long the chars are, and you can create a new object.
-   Mostly the chars will not burst over the highest address of the chunk,
-   because you would typically expect a chunk to be (say) 100 times as
-   long as an average object.
-
-   In case that isn't clear, when we have enough chars to make up
-   the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
-   so we just point to it where it lies.  No moving of chars is
-   needed and this is the second win: potentially long strings need
-   never be explicitly shuffled. Once an object is formed, it does not
-   change its address during its lifetime.
-
-   When the chars burst over a chunk boundary, we allocate a larger
-   chunk, and then copy the partly formed object from the end of the old
-   chunk to the beginning of the new larger chunk.  We then carry on
-   accreting characters to the end of the object as we normally would.
-
-   A special macro is provided to add a single char at a time to a
-   growing object.  This allows the use of register variables, which
-   break the ordinary 'growth' macro.
+All the apparent functions defined here are macros. The idea
+is that you would use these pre-tested macros to solve a
+very specific set of problems, and they would run fast.
+Caution: no side-effects in arguments please!! They may be
+evaluated MANY times!!
+
+These macros operate a stack of objects.  Each object starts life
+small, and may grow to maturity.  (Consider building a word syllable
+by syllable.)  An object can move while it is growing.  Once it has
+been "finished" it never changes address again.  So the "top of the
+stack" is typically an immature growing object, while the rest of the
+stack is of mature, fixed size and fixed address objects.
+
+These routines grab large chunks of memory, using a function you
+supply, called `obstack_chunk_alloc'.  On occasion, they free chunks,
+by calling `obstack_chunk_free'.  You must define them and declare
+them before using any obstack macros.
+
+Each independent stack is represented by a `struct obstack'.
+Each of the obstack macros expects a pointer to such a structure
+as the first argument.
+
+One motivation for this package is the problem of growing char strings
+in symbol tables.  Unless you are "fascist pig with a read-only mind"
+--Gosper's immortal quote from HAKMEM item 154, out of context--you
+would not like to put any arbitrary upper limit on the length of your
+symbols.
+
+In practice this often means you will build many short symbols and a
+few long symbols.  At the time you are reading a symbol you don't know
+how long it is.  One traditional method is to read a symbol into a
+buffer, realloc()ating the buffer every time you try to read a symbol
+that is longer than the buffer.  This is beaut, but you still will
+want to copy the symbol from the buffer to a more permanent
+symbol-table entry say about half the time.
+
+With obstacks, you can work differently.  Use one obstack for all symbol
+names.  As you read a symbol, grow the name in the obstack gradually.
+When the name is complete, finalize it.  Then, if the symbol exists already,
+free the newly read name.
+
+The way we do this is to take a large chunk, allocating memory from
+low addresses.  When you want to build a symbol in the chunk you just
+add chars above the current "high water mark" in the chunk.  When you
+have finished adding chars, because you got to the end of the symbol,
+you know how long the chars are, and you can create a new object.
+Mostly the chars will not burst over the highest address of the chunk,
+because you would typically expect a chunk to be (say) 100 times as
+long as an average object.
+
+In case that isn't clear, when we have enough chars to make up
+the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
+so we just point to it where it lies.  No moving of chars is
+needed and this is the second win: potentially long strings need
+never be explicitly shuffled. Once an object is formed, it does not
+change its address during its lifetime.
+
+When the chars burst over a chunk boundary, we allocate a larger
+chunk, and then copy the partly formed object from the end of the old
+chunk to the beginning of the new larger chunk.  We then carry on
+accreting characters to the end of the object as we normally would.
+
+A special macro is provided to add a single char at a time to a
+growing object.  This allows the use of register variables, which
+break the ordinary 'growth' macro.
 
-   Summary:
+Summary:
         We allocate large chunks.
         We carve out one object at a time from the current chunk.
         Once carved, an object never moves.
@@ -93,17 +93,17 @@
         Exactly one object is growing in an obstack at any one time.
         You can run one obstack per control block.
         You may have as many control blocks as you dare.
-        Because of the way we do it, you can "unwind" an obstack
+        Because of the way we do it, you can `unwind' an obstack
           back to a previous state. (You may remove objects much
           as you would with a stack.)
- */
+*/
 
 
 /* Don't do the contents of this file more than once.  */
 
 #ifndef _OBSTACK_H
 #define _OBSTACK_H 1
-
+
 /* We need the type of a pointer subtraction.  If __PTRDIFF_TYPE__ is
    defined, as with GNU C, use that; that way we don't pollute the
    namespace with <stddef.h>'s symbols.  Otherwise, include <stddef.h>
@@ -122,90 +122,86 @@
 
 #define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))
 
-/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case
+/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case
    where pointers can be converted to integers, aligned as integers,
    and converted back again.  If PTR_INT_TYPE is narrower than a
    pointer (e.g., the AS/400), play it safe and compute the alignment
    relative to B.  Otherwise, use the faster strategy of computing the
    alignment relative to 0.  */
 
-#define __PTR_ALIGN(B, P, A)						      \
+#define __PTR_ALIGN(B, P, A)                                                \
   __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
                 P, A)
 
 #include <string.h>
 
-#ifndef __attribute_pure__
-# define __attribute_pure__ _GL_ATTRIBUTE_PURE
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct _obstack_chunk           /* Lives at front of each chunk. */
 {
-  char *limit;                  /* 1 past end of this chunk */
+  char  *limit;                 /* 1 past end of this chunk */
   struct _obstack_chunk *prev;  /* address of prior chunk or NULL */
-  char contents[4];             /* objects begin here */
+  char  contents[4];            /* objects begin here */
 };
 
 struct obstack          /* control current object in current chunk */
 {
-  long chunk_size;              /* preferred size to allocate chunks in */
+  long  chunk_size;             /* preferred size to allocate chunks in */
   struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */
-  char *object_base;            /* address of object we are building */
-  char *next_free;              /* where to add next char to current object */
-  char *chunk_limit;            /* address of char after current chunk */
+  char  *object_base;           /* address of object we are building */
+  char  *next_free;             /* where to add next char to current object */
+  char  *chunk_limit;           /* address of char after current chunk */
   union
   {
     PTR_INT_TYPE tempint;
     void *tempptr;
   } temp;                       /* Temporary for some macros.  */
-  int alignment_mask;           /* Mask of alignment for each object. */
-  /* These prototypes vary based on 'use_extra_arg', and we use
+  int   alignment_mask;         /* Mask of alignment for each object. */
+  /* These prototypes vary based on `use_extra_arg', and we use
      casts to the prototypeless function type in all assignments,
      but having prototypes here quiets -Wstrict-prototypes.  */
   struct _obstack_chunk *(*chunkfun) (void *, long);
   void (*freefun) (void *, struct _obstack_chunk *);
   void *extra_arg;              /* first arg for chunk alloc/dealloc funcs */
-  unsigned use_extra_arg : 1;     /* chunk alloc/dealloc funcs take extra arg */
-  unsigned maybe_empty_object : 1; /* There is a possibility that the current
-                                      chunk contains a zero-length object.  This
-                                      prevents freeing the chunk if we allocate
-                                      a bigger chunk to replace it. */
-  unsigned alloc_failed : 1;      /* No longer used, as we now call the failed
-                                     handler on error, but retained for binary
-                                     compatibility.  */
+  unsigned use_extra_arg:1;     /* chunk alloc/dealloc funcs take extra arg */
+  unsigned maybe_empty_object:1;/* There is a possibility that the current
+                                   chunk contains a zero-length object.  This
+                                   prevents freeing the chunk if we allocate
+                                   a bigger chunk to replace it. */
+  unsigned alloc_failed:1;      /* No longer used, as we now call the failed
+                                   handler on error, but retained for binary
+                                   compatibility.  */
 };
 
 /* Declare the external functions we use; they are in obstack.c.  */
 
 extern void _obstack_newchunk (struct obstack *, int);
 extern int _obstack_begin (struct obstack *, int, int,
-                           void *(*)(long), void (*)(void *));
+                            void *(*) (long), void (*) (void *));
 extern int _obstack_begin_1 (struct obstack *, int, int,
-                             void *(*)(void *, long),
-                             void (*)(void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *) __attribute_pure__;
+                             void *(*) (void *, long),
+                             void (*) (void *, void *), void *);
+extern int _obstack_memory_used (struct obstack *);
 
 /* The default name of the function for freeing a chunk is 'obstack_free',
    but gnulib users can override this by defining '__obstack_free'.  */
 #ifndef __obstack_free
 # define __obstack_free obstack_free
 #endif
-extern void __obstack_free (struct obstack *, void *);
-
+extern void __obstack_free (struct obstack *obstack, void *block);
 
-/* Error handler called when 'obstack_chunk_alloc' failed to allocate
+
+/* Error handler called when `obstack_chunk_alloc' failed to allocate
    more memory.  This can be set to a user defined function which
    should either abort gracefully or use longjump - but shouldn't
    return.  The default action is to print a message and abort.  */
 extern DLL_VARIABLE void (*obstack_alloc_failed_handler) (void);
 
-/* Exit value used when 'print_and_abort' is used.  */
+/* Exit value used when `print_and_abort' is used.  */
 extern DLL_VARIABLE int obstack_exit_failure;
-
+
 /* Pointer to beginning of object being allocated or to be allocated next.
    Note that this might not be the final address of the object
    because a new chunk might be needed to hold the final size.  */
@@ -225,202 +221,203 @@
 #define obstack_alignment_mask(h) ((h)->alignment_mask)
 
 /* To prevent prototype warnings provide complete argument list.  */
-#define obstack_init(h)							      \
-  _obstack_begin ((h), 0, 0,						      \
-                  (void *(*)(long))obstack_chunk_alloc,			      \
-                  (void (*)(void *))obstack_chunk_free)
-
-#define obstack_begin(h, size)						      \
-  _obstack_begin ((h), (size), 0,					      \
-                  (void *(*)(long))obstack_chunk_alloc,			      \
-                  (void (*)(void *))obstack_chunk_free)
+#define obstack_init(h)                                         \
+  _obstack_begin ((h), 0, 0,                                    \
+                  (void *(*) (long)) obstack_chunk_alloc,       \
+                  (void (*) (void *)) obstack_chunk_free)
+
+#define obstack_begin(h, size)                                  \
+  _obstack_begin ((h), (size), 0,                               \
+                  (void *(*) (long)) obstack_chunk_alloc,       \
+                  (void (*) (void *)) obstack_chunk_free)
 
 #define obstack_specify_allocation(h, size, alignment, chunkfun, freefun)  \
-  _obstack_begin ((h), (size), (alignment),				      \
-                  (void *(*)(long))(chunkfun),				      \
-                  (void (*)(void *))(freefun))
+  _obstack_begin ((h), (size), (alignment),                                \
+                  (void *(*) (long)) (chunkfun),                           \
+                  (void (*) (void *)) (freefun))
 
 #define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment),				      \
-                    (void *(*)(void *, long))(chunkfun),		      \
-                    (void (*)(void *, void *))(freefun), (arg))
+  _obstack_begin_1 ((h), (size), (alignment),                           \
+                    (void *(*) (void *, long)) (chunkfun),              \
+                    (void (*) (void *, void *)) (freefun), (arg))
 
 #define obstack_chunkfun(h, newchunkfun) \
-  ((h)->chunkfun = (struct _obstack_chunk *(*)(void *, long))(newchunkfun))
+  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
 
 #define obstack_freefun(h, newfreefun) \
-  ((h)->freefun = (void (*)(void *, struct _obstack_chunk *))(newfreefun))
+  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
 
-#define obstack_1grow_fast(h, achar) (*((h)->next_free)++ = (achar))
+#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
 
-#define obstack_blank_fast(h, n) ((h)->next_free += (n))
+#define obstack_blank_fast(h,n) ((h)->next_free += (n))
 
 #define obstack_memory_used(h) _obstack_memory_used (h)
-
-#if defined __GNUC__
-# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__))
+
+#if defined __GNUC__ && defined __STDC__ && __STDC__
+/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+   does not implement __extension__.  But that compiler doesn't define
+   __GNUC_MINOR__.  */
+# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
 #  define __extension__
 # endif
 
 /* For GNU C, if not -traditional,
    we can define these macros to compute all args only once
    without using a global variable.
-   Also, we can avoid using the 'temp' slot, to make faster code.  */
+   Also, we can avoid using the `temp' slot, to make faster code.  */
 
-# define obstack_object_size(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (unsigned) (__o->next_free - __o->object_base); })
-
-# define obstack_room(OBSTACK)						      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (unsigned) (__o->chunk_limit - __o->next_free); })
-
-# define obstack_make_room(OBSTACK, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->chunk_limit - __o->next_free < __len)			      \
-         _obstack_newchunk (__o, __len);				      \
-       (void) 0; })
-
-# define obstack_empty_p(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (__o->chunk->prev == 0						      \
-        && __o->next_free == __PTR_ALIGN ((char *) __o->chunk,		      \
-                                          __o->chunk->contents,		      \
-                                          __o->alignment_mask)); })
-
-# define obstack_grow(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->next_free + __len > __o->chunk_limit)			      \
-         _obstack_newchunk (__o, __len);				      \
-       memcpy (__o->next_free, where, __len);				      \
-       __o->next_free += __len;						      \
-       (void) 0; })
-
-# define obstack_grow0(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->next_free + __len + 1 > __o->chunk_limit)		      \
-         _obstack_newchunk (__o, __len + 1);				      \
-       memcpy (__o->next_free, where, __len);				      \
-       __o->next_free += __len;						      \
-       *(__o->next_free)++ = 0;						      \
-       (void) 0; })
-
-# define obstack_1grow(OBSTACK, datum)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + 1 > __o->chunk_limit)			      \
-         _obstack_newchunk (__o, 1);					      \
-       obstack_1grow_fast (__o, datum);					      \
-       (void) 0; })
+# define obstack_object_size(OBSTACK)                                   \
+  __extension__                                                         \
+  ({ struct obstack const *__o = (OBSTACK);                             \
+     (unsigned) (__o->next_free - __o->object_base); })
+
+# define obstack_room(OBSTACK)                                          \
+  __extension__                                                         \
+  ({ struct obstack const *__o = (OBSTACK);                             \
+     (unsigned) (__o->chunk_limit - __o->next_free); })
+
+# define obstack_make_room(OBSTACK,length)                              \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->chunk_limit - __o->next_free < __len)                       \
+     _obstack_newchunk (__o, __len);                                    \
+   (void) 0; })
+
+# define obstack_empty_p(OBSTACK)                                       \
+  __extension__                                                         \
+  ({ struct obstack const *__o = (OBSTACK);                             \
+     (__o->chunk->prev == 0                                             \
+      && __o->next_free == __PTR_ALIGN ((char *) __o->chunk,            \
+                                        __o->chunk->contents,           \
+                                        __o->alignment_mask)); })
+
+# define obstack_grow(OBSTACK,where,length)                             \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->next_free + __len > __o->chunk_limit)                       \
+     _obstack_newchunk (__o, __len);                                    \
+   memcpy (__o->next_free, where, __len);                               \
+   __o->next_free += __len;                                             \
+   (void) 0; })
+
+# define obstack_grow0(OBSTACK,where,length)                            \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->next_free + __len + 1 > __o->chunk_limit)                   \
+     _obstack_newchunk (__o, __len + 1);                                \
+   memcpy (__o->next_free, where, __len);                               \
+   __o->next_free += __len;                                             \
+   *(__o->next_free)++ = 0;                                             \
+   (void) 0; })
+
+# define obstack_1grow(OBSTACK,datum)                                   \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   if (__o->next_free + 1 > __o->chunk_limit)                           \
+     _obstack_newchunk (__o, 1);                                        \
+   obstack_1grow_fast (__o, datum);                                     \
+   (void) 0; })
 
 /* These assume that the obstack alignment is good enough for pointers
    or ints, and that the data added so far to the current object
    shares that much alignment.  */
 
-# define obstack_ptr_grow(OBSTACK, datum)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + sizeof (void *) > __o->chunk_limit)		      \
-         _obstack_newchunk (__o, sizeof (void *));			      \
-       obstack_ptr_grow_fast (__o, datum); })				      \
-
-# define obstack_int_grow(OBSTACK, datum)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + sizeof (int) > __o->chunk_limit)		      \
-         _obstack_newchunk (__o, sizeof (int));				      \
-       obstack_int_grow_fast (__o, datum); })
-
-# define obstack_ptr_grow_fast(OBSTACK, aptr)				      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__p1 = __o1->next_free;					      \
-       *(const void **) __p1 = (aptr);					      \
-       __o1->next_free += sizeof (const void *);			      \
-       (void) 0; })
-
-# define obstack_int_grow_fast(OBSTACK, aint)				      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__p1 = __o1->next_free;					      \
-       *(int *) __p1 = (aint);						      \
-       __o1->next_free += sizeof (int);					      \
-       (void) 0; })
-
-# define obstack_blank(OBSTACK, length)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->chunk_limit - __o->next_free < __len)			      \
-         _obstack_newchunk (__o, __len);				      \
-       obstack_blank_fast (__o, __len);					      \
-       (void) 0; })
-
-# define obstack_alloc(OBSTACK, length)					      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_blank (__h, (length));					      \
-       obstack_finish (__h); })
-
-# define obstack_copy(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_grow (__h, (where), (length));				      \
-       obstack_finish (__h); })
-
-# define obstack_copy0(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_grow0 (__h, (where), (length));				      \
-       obstack_finish (__h); })
+# define obstack_ptr_grow(OBSTACK,datum)                                \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   if (__o->next_free + sizeof (void *) > __o->chunk_limit)             \
+     _obstack_newchunk (__o, sizeof (void *));                          \
+   obstack_ptr_grow_fast (__o, datum); })                               \
+
+# define obstack_int_grow(OBSTACK,datum)                                \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   if (__o->next_free + sizeof (int) > __o->chunk_limit)                \
+     _obstack_newchunk (__o, sizeof (int));                             \
+   obstack_int_grow_fast (__o, datum); })
+
+# define obstack_ptr_grow_fast(OBSTACK,aptr)                            \
+__extension__                                                           \
+({ struct obstack *__o1 = (OBSTACK);                                    \
+   *(const void **) __o1->next_free = (aptr);                           \
+   __o1->next_free += sizeof (const void *);                            \
+   (void) 0; })
+
+# define obstack_int_grow_fast(OBSTACK,aint)                            \
+__extension__                                                           \
+({ struct obstack *__o1 = (OBSTACK);                                    \
+   *(int *) __o1->next_free = (aint);                                   \
+   __o1->next_free += sizeof (int);                                     \
+   (void) 0; })
+
+# define obstack_blank(OBSTACK,length)                                  \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->chunk_limit - __o->next_free < __len)                       \
+     _obstack_newchunk (__o, __len);                                    \
+   obstack_blank_fast (__o, __len);                                     \
+   (void) 0; })
+
+# define obstack_alloc(OBSTACK,length)                                  \
+__extension__                                                           \
+({ struct obstack *__h = (OBSTACK);                                     \
+   obstack_blank (__h, (length));                                       \
+   obstack_finish (__h); })
+
+# define obstack_copy(OBSTACK,where,length)                             \
+__extension__                                                           \
+({ struct obstack *__h = (OBSTACK);                                     \
+   obstack_grow (__h, (where), (length));                               \
+   obstack_finish (__h); })
+
+# define obstack_copy0(OBSTACK,where,length)                            \
+__extension__                                                           \
+({ struct obstack *__h = (OBSTACK);                                     \
+   obstack_grow0 (__h, (where), (length));                              \
+   obstack_finish (__h); })
 
 /* The local variable is named __o1 to avoid a name conflict
    when obstack_blank is called.  */
-# define obstack_finish(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__value = (void *) __o1->object_base;			      \
-       if (__o1->next_free == __value)					      \
-         __o1->maybe_empty_object = 1;					      \
-       __o1->next_free							      \
-         = __PTR_ALIGN (__o1->object_base, __o1->next_free,		      \
-                        __o1->alignment_mask);				      \
-       if (__o1->next_free - (char *) __o1->chunk			      \
-           > __o1->chunk_limit - (char *) __o1->chunk)			      \
-         __o1->next_free = __o1->chunk_limit;				      \
-       __o1->object_base = __o1->next_free;				      \
-       __value; })
-
-# define obstack_free(OBSTACK, OBJ)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       void *__obj = (OBJ);						      \
-       if (__obj > (void *) __o->chunk && __obj < (void *) __o->chunk_limit)  \
-         __o->next_free = __o->object_base = (char *) __obj;		      \
-       else (__obstack_free) (__o, __obj); })
-
-#else /* not __GNUC__ */
+# define obstack_finish(OBSTACK)                                        \
+__extension__                                                           \
+({ struct obstack *__o1 = (OBSTACK);                                    \
+   void *__value = (void *) __o1->object_base;                          \
+   if (__o1->next_free == __value)                                      \
+     __o1->maybe_empty_object = 1;                                      \
+   __o1->next_free                                                      \
+     = __PTR_ALIGN (__o1->object_base, __o1->next_free,                 \
+                    __o1->alignment_mask);                              \
+   if (__o1->next_free - (char *)__o1->chunk                            \
+       > __o1->chunk_limit - (char *)__o1->chunk)                       \
+     __o1->next_free = __o1->chunk_limit;                               \
+   __o1->object_base = __o1->next_free;                                 \
+   __value; })
+
+# define obstack_free(OBSTACK, OBJ)                                     \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   void *__obj = (OBJ);                                                 \
+   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
+     __o->next_free = __o->object_base = (char *)__obj;                 \
+   else (__obstack_free) (__o, __obj); })
+
+#else /* not __GNUC__ or not __STDC__ */
 
 # define obstack_object_size(h) \
-  (unsigned) ((h)->next_free - (h)->object_base)
+ (unsigned) ((h)->next_free - (h)->object_base)
 
-# define obstack_room(h)						      \
-  (unsigned) ((h)->chunk_limit - (h)->next_free)
+# define obstack_room(h)                \
+ (unsigned) ((h)->chunk_limit - (h)->next_free)
 
 # define obstack_empty_p(h) \
-  ((h)->chunk->prev == 0						      \
-   && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,		      \
-                                     (h)->chunk->contents,		      \
-                                     (h)->alignment_mask))
+ ((h)->chunk->prev == 0                                                 \
+  && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,                \
+                                    (h)->chunk->contents,               \
+                                    (h)->alignment_mask))
 
 /* Note that the call to _obstack_newchunk is enclosed in (..., 0)
    so that we can avoid having void expressions
@@ -428,85 +425,85 @@
    Casting the third operand to void was tried before,
    but some compilers won't accept it.  */
 
-# define obstack_make_room(h, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
+# define obstack_make_room(h,length)                                    \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)              \
    ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0))
 
-# define obstack_grow(h, where, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-   (h)->next_free += (h)->temp.tempint)
-
-# define obstack_grow0(h, where, length)				      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),		      \
-   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-   (h)->next_free += (h)->temp.tempint,					      \
-   *((h)->next_free)++ = 0)
-
-# define obstack_1grow(h, datum)					      \
-  ((((h)->next_free + 1 > (h)->chunk_limit)				      \
-    ? (_obstack_newchunk ((h), 1), 0) : 0),				      \
-   obstack_1grow_fast (h, datum))
-
-# define obstack_ptr_grow(h, datum)					      \
-  ((((h)->next_free + sizeof (char *) > (h)->chunk_limit)		      \
-    ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		      \
-   obstack_ptr_grow_fast (h, datum))
-
-# define obstack_int_grow(h, datum)					      \
-  ((((h)->next_free + sizeof (int) > (h)->chunk_limit)			      \
-    ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			      \
-   obstack_int_grow_fast (h, datum))
+# define obstack_grow(h,where,length)                                   \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)              \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),              \
+  memcpy ((h)->next_free, where, (h)->temp.tempint),                    \
+  (h)->next_free += (h)->temp.tempint)
+
+# define obstack_grow0(h,where,length)                                  \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)          \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),          \
+  memcpy ((h)->next_free, where, (h)->temp.tempint),                    \
+  (h)->next_free += (h)->temp.tempint,                                  \
+  *((h)->next_free)++ = 0)
+
+# define obstack_1grow(h,datum)                                         \
+( (((h)->next_free + 1 > (h)->chunk_limit)                              \
+   ? (_obstack_newchunk ((h), 1), 0) : 0),                              \
+  obstack_1grow_fast (h, datum))
+
+# define obstack_ptr_grow(h,datum)                                      \
+( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)                \
+   ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),                \
+  obstack_ptr_grow_fast (h, datum))
+
+# define obstack_int_grow(h,datum)                                      \
+( (((h)->next_free + sizeof (int) > (h)->chunk_limit)                   \
+   ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),                   \
+  obstack_int_grow_fast (h, datum))
 
-# define obstack_ptr_grow_fast(h, aptr)					      \
+# define obstack_ptr_grow_fast(h,aptr)                                  \
   (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
 
-# define obstack_int_grow_fast(h, aint)					      \
+# define obstack_int_grow_fast(h,aint)                                  \
   (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint))
 
-# define obstack_blank(h, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-   obstack_blank_fast (h, (h)->temp.tempint))
-
-# define obstack_alloc(h, length)					      \
-  (obstack_blank ((h), (length)), obstack_finish ((h)))
-
-# define obstack_copy(h, where, length)					      \
-  (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_copy0(h, where, length)				      \
-  (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_finish(h)						      \
-  (((h)->next_free == (h)->object_base					      \
-    ? (((h)->maybe_empty_object = 1), 0)				      \
-    : 0),								      \
-   (h)->temp.tempptr = (h)->object_base,				      \
-   (h)->next_free							      \
-     = __PTR_ALIGN ((h)->object_base, (h)->next_free,			      \
-                    (h)->alignment_mask),				      \
-   (((h)->next_free - (char *) (h)->chunk				      \
-     > (h)->chunk_limit - (char *) (h)->chunk)				      \
-   ? ((h)->next_free = (h)->chunk_limit) : 0),				      \
-   (h)->object_base = (h)->next_free,					      \
-   (h)->temp.tempptr)
-
-# define obstack_free(h, obj)						      \
-  ((h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,		      \
-   ((((h)->temp.tempint > 0						      \
-      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))	      \
-    ? (void) ((h)->next_free = (h)->object_base				      \
-                          = (h)->temp.tempint + (char *) (h)->chunk)	      \
-    : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk)))
+# define obstack_blank(h,length)                                        \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)              \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),              \
+  obstack_blank_fast (h, (h)->temp.tempint))
+
+# define obstack_alloc(h,length)                                        \
+ (obstack_blank ((h), (length)), obstack_finish ((h)))
+
+# define obstack_copy(h,where,length)                                   \
+ (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_copy0(h,where,length)                                  \
+ (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_finish(h)                                              \
+( ((h)->next_free == (h)->object_base                                   \
+   ? (((h)->maybe_empty_object = 1), 0)                                 \
+   : 0),                                                                \
+  (h)->temp.tempptr = (h)->object_base,                                 \
+  (h)->next_free                                                        \
+    = __PTR_ALIGN ((h)->object_base, (h)->next_free,                    \
+                   (h)->alignment_mask),                                \
+  (((h)->next_free - (char *) (h)->chunk                                \
+    > (h)->chunk_limit - (char *) (h)->chunk)                           \
+   ? ((h)->next_free = (h)->chunk_limit) : 0),                          \
+  (h)->object_base = (h)->next_free,                                    \
+  (h)->temp.tempptr)
+
+# define obstack_free(h,obj)                                            \
+( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,             \
+  ((((h)->temp.tempint > 0                                              \
+    && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))     \
+   ? (int) ((h)->next_free = (h)->object_base                           \
+            = (h)->temp.tempint + (char *) (h)->chunk)                  \
+   : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
 
-#endif /* not __GNUC__ */
+#endif /* not __GNUC__ or not __STDC__ */
 
 #ifdef __cplusplus
 }       /* C++ */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/open.c gettext-0.18.1.1/gettext-tools/gnulib-lib/open.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/open.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/open.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,27 +16,22 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* If the user's config.h happens to include <fcntl.h>, let it include only
-   the system's <fcntl.h> here, so that orig_open doesn't recurse to
-   rpl_open.  */
-#define __need_system_fcntl_h
 #include <config.h>
 
 /* Get the original definition of open.  It might be defined as a macro.  */
+#define __need_system_fcntl_h
 #include <fcntl.h>
-#include <sys/types.h>
 #undef __need_system_fcntl_h
+#include <sys/types.h>
 
-static int
+static inline int
 orig_open (const char *filename, int flags, mode_t mode)
 {
   return open (filename, flags, mode);
 }
 
 /* Specification.  */
-/* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
-   this include because of the preliminary #include <fcntl.h> above.  */
-#include "fcntl.h"
+#include <fcntl.h>
 
 #include <errno.h>
 #include <stdarg.h>
@@ -68,15 +63,6 @@
       va_end (arg);
     }
 
-#if GNULIB_defined_O_NONBLOCK
-  /* The only known platform that lacks O_NONBLOCK is mingw, but it
-     also lacks named pipes and Unix sockets, which are the only two
-     file types that require non-blocking handling in open().
-     Therefore, it is safe to ignore O_NONBLOCK here.  It is handy
-     that mingw also lacks openat(), so that is also covered here.  */
-  flags &= ~O_NONBLOCK;
-#endif
-
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   if (strcmp (filename, "/dev/null") == 0)
     filename = "NUL";
@@ -125,8 +111,7 @@
      override fstat() in fchdir.c to hide the fact that we have a
      dummy.  */
   if (REPLACE_OPEN_DIRECTORY && fd < 0 && errno == EACCES
-      && ((flags & O_ACCMODE) == O_RDONLY
-          || (O_SEARCH != O_RDONLY && (flags & O_ACCMODE) == O_SEARCH)))
+      && (flags & O_ACCMODE) == O_RDONLY)
     {
       struct stat statbuf;
       if (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/opendir.c gettext-0.18.1.1/gettext-tools/gnulib-lib/opendir.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/opendir.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/opendir.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-/* Start reading the entries of a directory.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <dirent.h>
-
-#include <errno.h>
-#include <stddef.h>
-
-#if HAVE_OPENDIR
-
-/* Override opendir(), to keep track of the open file descriptors.
-   Needed because there is a function dirfd().  */
-
-#else
-
-# include <stdlib.h>
-
-# include "dirent-private.h"
-# include "filename.h"
-
-#endif
-
-#if REPLACE_FCHDIR
-# include <unistd.h>
-#endif
-
-DIR *
-opendir (const char *dir_name)
-{
-#if HAVE_OPENDIR
-# undef opendir
-  DIR *dirp;
-
-  dirp = opendir (dir_name);
-  if (dirp == NULL)
-    return NULL;
-
-#else
-
-  char dir_name_mask[MAX_PATH + 1 + 1 + 1];
-  int status;
-  HANDLE current;
-  WIN32_FIND_DATA entry;
-  struct gl_directory *dirp;
-
-  if (dir_name[0] == '\0')
-    {
-      errno = ENOENT;
-      return NULL;
-    }
-
-  /* Make the dir_name absolute, so that we continue reading the same
-     directory if the current directory changed between this opendir()
-     call and a subsequent rewinddir() call.  */
-  if (!GetFullPathName (dir_name, MAX_PATH, dir_name_mask, NULL))
-    {
-      errno = EINVAL;
-      return NULL;
-    }
-
-  /* Append the mask.
-     "*" and "*.*" appear to be equivalent.  */
-  {
-    char *p;
-
-    p = dir_name_mask + strlen (dir_name_mask);
-    if (p > dir_name_mask && !ISSLASH (p[-1]))
-      *p++ = '\\';
-    *p++ = '*';
-    *p = '\0';
-  }
-
-  /* Start searching the directory.  */
-  status = -1;
-  current = FindFirstFile (dir_name_mask, &entry);
-  if (current == INVALID_HANDLE_VALUE)
-    {
-      switch (GetLastError ())
-        {
-        case ERROR_FILE_NOT_FOUND:
-          status = -2;
-          break;
-        case ERROR_PATH_NOT_FOUND:
-          errno = ENOENT;
-          return NULL;
-        case ERROR_DIRECTORY:
-          errno = ENOTDIR;
-          return NULL;
-        case ERROR_ACCESS_DENIED:
-          errno = EACCES;
-          return NULL;
-        default:
-          errno = EIO;
-          return NULL;
-        }
-    }
-
-  /* Allocate the result.  */
-  dirp =
-    (struct gl_directory *)
-    malloc (offsetof (struct gl_directory, dir_name_mask[0])
-            + strlen (dir_name_mask) + 1);
-  if (dirp == NULL)
-    {
-      if (current != INVALID_HANDLE_VALUE)
-        FindClose (current);
-      errno = ENOMEM;
-      return NULL;
-    }
-  dirp->status = status;
-  dirp->current = current;
-  if (status == -1)
-    memcpy (&dirp->entry, &entry, sizeof (WIN32_FIND_DATA));
-  strcpy (dirp->dir_name_mask, dir_name_mask);
-
-#endif
-
-#if REPLACE_FCHDIR
-  {
-    int fd = dirfd (dirp);
-    if (0 <= fd && _gl_register_fd (fd, dir_name) != fd)
-      {
-        int saved_errno = errno;
-        closedir (dirp);
-        errno = saved_errno;
-        return NULL;
-      }
-  }
-#endif
-
-  return dirp;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pathmax.h gettext-0.18.1.1/gettext-tools/gnulib-lib/pathmax.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/pathmax.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pathmax.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,32 +13,12 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PATHMAX_H
 # define _PATHMAX_H
 
-/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,
-   including the terminating NUL byte.
-   <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>
-   PATH_MAX is not defined on systems which have no limit on filename length,
-   such as GNU/Hurd.
-
-   This file does *not* define PATH_MAX always.  Programs that use this file
-   can handle the GNU/Hurd case in several ways:
-     - Either with a package-wide handling, or with a per-file handling,
-     - Either through a
-         #ifdef PATH_MAX
-       or through a fallback like
-         #ifndef PATH_MAX
-         # define PATH_MAX 8192
-         #endif
-       or through a fallback like
-         #ifndef PATH_MAX
-         # define PATH_MAX pathconf ("/", _PC_PATH_MAX)
-         #endif
- */
-
 # include <unistd.h>
 
 # include <limits.h>
@@ -47,6 +27,11 @@
 #  define _POSIX_PATH_MAX 256
 # endif
 
+# if !defined PATH_MAX && defined _PC_PATH_MAX && defined HAVE_PATHCONF
+#  define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \
+                    : pathconf ("/", _PC_PATH_MAX))
+# endif
+
 /* Don't include sys/param.h if it already has been.  */
 # if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
 #  include <sys/param.h>
@@ -56,28 +41,8 @@
 #  define PATH_MAX MAXPATHLEN
 # endif
 
-# ifdef __hpux
-/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,
-   *not* including the terminating NUL byte, and is set to 1023.
-   Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is
-   not defined at all any more.  */
-#  undef PATH_MAX
-#  define PATH_MAX 1024
-# endif
-
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,
-   section "Maximum Path Length Limitation",
-   <http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx#maxpath>
-   explains that the maximum size of a filename, including the terminating
-   NUL byte, is 260 = 3 + 256 + 1.
-   This is the same value as
-     - FILENAME_MAX in <stdio.h>,
-     - _MAX_PATH in <stdlib.h>,
-     - MAX_PATH in <windef.h>.
-   Undefine the original value, because mingw's <limits.h> gets it wrong.  */
-#  undef PATH_MAX
-#  define PATH_MAX 260
+# ifndef PATH_MAX
+#  define PATH_MAX _POSIX_PATH_MAX
 # endif
 
 #endif /* _PATHMAX_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe2.c gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe2.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Create a pipe, with specific opening flags.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -23,29 +24,24 @@
 #include <fcntl.h>
 
 #include "binary-io.h"
-#include "verify.h"
-
-#if GNULIB_defined_O_NONBLOCK
-# include "nonblocking.h"
-#endif
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Windows API.  */
+/* Native Woe32 API.  */
 
 # include <io.h>
 
+#else
+/* Unix API.  */
+
+# ifndef O_CLOEXEC
+#  define O_CLOEXEC 0
+# endif
+
 #endif
 
 int
 pipe2 (int fd[2], int flags)
 {
-  /* Mingw _pipe() corrupts fd on failure; also, if we succeed at
-     creating the pipe but later fail at changing fcntl, we want
-     to leave fd unchanged: http://austingroupbugs.net/view.php?id=467  */
-  int tmp[2];
-  tmp[0] = fd[0];
-  tmp[1] = fd[1];
-
 #if HAVE_PIPE2
 # undef pipe2
   /* Try the system call first, if it exists.  (We may be running with a glibc
@@ -66,53 +62,35 @@
   }
 #endif
 
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Native Woe32 API.  */
+
   /* Check the supported flags.  */
-  if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0)
+  if ((flags & ~(O_CLOEXEC | O_BINARY | O_TEXT)) != 0)
     {
       errno = EINVAL;
       return -1;
     }
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Windows API.  */
+  return _pipe (fd, 4096, flags);
 
-  if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
-    {
-      fd[0] = tmp[0];
-      fd[1] = tmp[1];
-      return -1;
-    }
+#else
+/* Unix API.  */
 
-  /* O_NONBLOCK handling.
-     On native Windows platforms, O_NONBLOCK is defined by gnulib.  Use the
-     functions defined by the gnulib module 'nonblocking'.  */
-# if GNULIB_defined_O_NONBLOCK
-  if (flags & O_NONBLOCK)
+  /* Check the supported flags.  */
+  if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0)
     {
-      if (set_nonblocking_flag (fd[0], true) != 0
-          || set_nonblocking_flag (fd[1], true) != 0)
-        goto fail;
+      errno = EINVAL;
+      return -1;
     }
-# else
-  {
-    verify (O_NONBLOCK == 0);
-  }
-# endif
-
-  return 0;
-
-#else
-/* Unix API.  */
 
   if (pipe (fd) < 0)
     return -1;
 
   /* POSIX <http://www.opengroup.org/onlinepubs/9699919799/functions/pipe.html>
      says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
-     both fd[0] and fd[1].  */
+     both fd[0] amd fd[1].  */
 
-  /* O_NONBLOCK handling.
-     On Unix platforms, O_NONBLOCK is defined by the system.  Use fcntl().  */
   if (flags & O_NONBLOCK)
     {
       int fcntl_flags;
@@ -138,31 +116,26 @@
 # if O_BINARY
   if (flags & O_BINARY)
     {
-      set_binary_mode (fd[1], O_BINARY);
-      set_binary_mode (fd[0], O_BINARY);
+      setmode (fd[1], O_BINARY);
+      setmode (fd[0], O_BINARY);
     }
   else if (flags & O_TEXT)
     {
-      set_binary_mode (fd[1], O_TEXT);
-      set_binary_mode (fd[0], O_TEXT);
+      setmode (fd[1], O_TEXT);
+      setmode (fd[0], O_TEXT);
     }
 # endif
 
   return 0;
 
-#endif
-
-#if GNULIB_defined_O_NONBLOCK || \
-  !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
  fail:
   {
     int saved_errno = errno;
     close (fd[0]);
     close (fd[1]);
-    fd[0] = tmp[0];
-    fd[1] = tmp[1];
     errno = saved_errno;
     return -1;
   }
+
 #endif
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe2-safer.c gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2-safer.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe2-safer.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2-safer.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Invoke pipe2, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe.c gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe.c	2010-05-24 09:42:46.000000000 +0000
@@ -0,0 +1,450 @@
+/* Creation of subprocesses, communicating via pipes.
+   Copyright (C) 2001-2004, 2006-2010 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
+   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>
+
+/* Specification.  */
+#include "pipe.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include "error.h"
+#include "fatal-signal.h"
+#include "unistd-safer.h"
+#include "wait-process.h"
+#include "gettext.h"
+
+#define _(str) gettext (str)
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* Native Woe32 API.  */
+# include <process.h>
+# include "w32spawn.h"
+
+#else
+
+/* Unix API.  */
+# include <spawn.h>
+
+#endif
+
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
+
+
+#ifdef EINTR
+
+/* EINTR handling for close().
+   These functions can return -1/EINTR even though we don't have any
+   signal handlers set up, namely when we get interrupted via SIGSTOP.  */
+
+static inline int
+nonintr_close (int fd)
+{
+  int retval;
+
+  do
+    retval = close (fd);
+  while (retval < 0 && errno == EINTR);
+
+  return retval;
+}
+#define close nonintr_close
+
+static inline int
+nonintr_open (const char *pathname, int oflag, mode_t mode)
+{
+  int retval;
+
+  do
+    retval = open (pathname, oflag, mode);
+  while (retval < 0 && errno == EINTR);
+
+  return retval;
+}
+#undef open /* avoid warning on VMS */
+#define open nonintr_open
+
+#endif
+
+
+/* Open a pipe connected to a child process.
+ *
+ *           write       system                read
+ *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child       if pipe_stdin
+ *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child       if pipe_stdout
+ *           read        system                write
+ *
+ * At least one of pipe_stdin, pipe_stdout must be true.
+ * pipe_stdin and prog_stdin together determine the child's standard input.
+ * pipe_stdout and prog_stdout together determine the child's standard output.
+ * If pipe_stdin is true, prog_stdin is ignored.
+ * If pipe_stdout is true, prog_stdout is ignored.
+ */
+static pid_t
+create_pipe (const char *progname,
+             const char *prog_path, char **prog_argv,
+             bool pipe_stdin, bool pipe_stdout,
+             const char *prog_stdin, const char *prog_stdout,
+             bool null_stderr,
+             bool slave_process, bool exit_on_error,
+             int fd[2])
+{
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+  /* Native Woe32 API.
+     This uses _pipe(), dup2(), and spawnv().  It could also be implemented
+     using the low-level functions CreatePipe(), DuplicateHandle(),
+     CreateProcess() and _open_osfhandle(); see the GNU make and GNU clisp
+     and cvs source code.  */
+  int ifd[2];
+  int ofd[2];
+  int orig_stdin;
+  int orig_stdout;
+  int orig_stderr;
+  int child;
+  int nulloutfd;
+  int stdinfd;
+  int stdoutfd;
+  int saved_errno;
+
+  /* FIXME: Need to free memory allocated by prepare_spawn.  */
+  prog_argv = prepare_spawn (prog_argv);
+
+  if (pipe_stdout)
+    if (pipe2_safer (ifd, O_BINARY | O_CLOEXEC) < 0)
+      error (EXIT_FAILURE, errno, _("cannot create pipe"));
+  if (pipe_stdin)
+    if (pipe2_safer (ofd, O_BINARY | O_CLOEXEC) < 0)
+      error (EXIT_FAILURE, errno, _("cannot create pipe"));
+/* Data flow diagram:
+ *
+ *           write        system         read
+ *    parent  ->   ofd[1]   ->   ofd[0]   ->   child       if pipe_stdin
+ *    parent  <-   ifd[0]   <-   ifd[1]   <-   child       if pipe_stdout
+ *           read         system         write
+ *
+ */
+
+  /* Save standard file handles of parent process.  */
+  if (pipe_stdin || prog_stdin != NULL)
+    orig_stdin = dup_safer_noinherit (STDIN_FILENO);
+  if (pipe_stdout || prog_stdout != NULL)
+    orig_stdout = dup_safer_noinherit (STDOUT_FILENO);
+  if (null_stderr)
+    orig_stderr = dup_safer_noinherit (STDERR_FILENO);
+  child = -1;
+
+  /* Create standard file handles of child process.  */
+  nulloutfd = -1;
+  stdinfd = -1;
+  stdoutfd = -1;
+  if ((!pipe_stdin || dup2 (ofd[0], STDIN_FILENO) >= 0)
+      && (!pipe_stdout || dup2 (ifd[1], STDOUT_FILENO) >= 0)
+      && (!null_stderr
+          || ((nulloutfd = open ("NUL", O_RDWR, 0)) >= 0
+              && (nulloutfd == STDERR_FILENO
+                  || (dup2 (nulloutfd, STDERR_FILENO) >= 0
+                      && close (nulloutfd) >= 0))))
+      && (pipe_stdin
+          || prog_stdin == NULL
+          || ((stdinfd = open (prog_stdin, O_RDONLY, 0)) >= 0
+              && (stdinfd == STDIN_FILENO
+                  || (dup2 (stdinfd, STDIN_FILENO) >= 0
+                      && close (stdinfd) >= 0))))
+      && (pipe_stdout
+          || prog_stdout == NULL
+          || ((stdoutfd = open (prog_stdout, O_WRONLY, 0)) >= 0
+              && (stdoutfd == STDOUT_FILENO
+                  || (dup2 (stdoutfd, STDOUT_FILENO) >= 0
+                      && close (stdoutfd) >= 0)))))
+    /* The child process doesn't inherit ifd[0], ifd[1], ofd[0], ofd[1],
+       but it inherits all open()ed or dup2()ed file handles (which is what
+       we want in the case of STD*_FILENO).  */
+    /* Use spawnvpe and pass the environment explicitly.  This is needed if
+       the program has modified the environment using putenv() or [un]setenv().
+       On Windows, programs have two environments, one in the "environment
+       block" of the process and managed through SetEnvironmentVariable(), and
+       one inside the process, in the location retrieved by the 'environ'
+       macro.  When using spawnvp() without 'e', the child process inherits a
+       copy of the environment block - ignoring the effects of putenv() and
+       [un]setenv().  */
+    {
+      child = spawnvpe (P_NOWAIT, prog_path, (const char **) prog_argv,
+                        (const char **) environ);
+      if (child < 0 && errno == ENOEXEC)
+        {
+          /* prog is not an native executable.  Try to execute it as a
+             shell script.  Note that prepare_spawn() has already prepended
+             a hidden element "sh.exe" to prog_argv.  */
+          --prog_argv;
+          child = spawnvpe (P_NOWAIT, prog_argv[0], (const char **) prog_argv,
+                            (const char **) environ);
+        }
+    }
+  if (child == -1)
+    saved_errno = errno;
+  if (stdinfd >= 0)
+    close (stdinfd);
+  if (stdoutfd >= 0)
+    close (stdoutfd);
+  if (nulloutfd >= 0)
+    close (nulloutfd);
+
+  /* Restore standard file handles of parent process.  */
+  if (null_stderr)
+    undup_safer_noinherit (orig_stderr, STDERR_FILENO);
+  if (pipe_stdout || prog_stdout != NULL)
+    undup_safer_noinherit (orig_stdout, STDOUT_FILENO);
+  if (pipe_stdin || prog_stdin != NULL)
+    undup_safer_noinherit (orig_stdin, STDIN_FILENO);
+
+  if (pipe_stdin)
+    close (ofd[0]);
+  if (pipe_stdout)
+    close (ifd[1]);
+  if (child == -1)
+    {
+      if (exit_on_error || !null_stderr)
+        error (exit_on_error ? EXIT_FAILURE : 0, saved_errno,
+               _("%s subprocess failed"), progname);
+      if (pipe_stdout)
+        close (ifd[0]);
+      if (pipe_stdin)
+        close (ofd[1]);
+      errno = saved_errno;
+      return -1;
+    }
+
+  if (pipe_stdout)
+    fd[0] = ifd[0];
+  if (pipe_stdin)
+    fd[1] = ofd[1];
+  return child;
+
+#else
+
+  /* Unix API.  */
+  int ifd[2];
+  int ofd[2];
+  sigset_t blocked_signals;
+  posix_spawn_file_actions_t actions;
+  bool actions_allocated;
+  posix_spawnattr_t attrs;
+  bool attrs_allocated;
+  int err;
+  pid_t child;
+
+  if (pipe_stdout)
+    if (pipe_safer (ifd) < 0)
+      error (EXIT_FAILURE, errno, _("cannot create pipe"));
+  if (pipe_stdin)
+    if (pipe_safer (ofd) < 0)
+      error (EXIT_FAILURE, errno, _("cannot create pipe"));
+/* Data flow diagram:
+ *
+ *           write        system         read
+ *    parent  ->   ofd[1]   ->   ofd[0]   ->   child       if pipe_stdin
+ *    parent  <-   ifd[0]   <-   ifd[1]   <-   child       if pipe_stdout
+ *           read         system         write
+ *
+ */
+
+  if (slave_process)
+    {
+      sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
+      block_fatal_signals ();
+    }
+  actions_allocated = false;
+  attrs_allocated = false;
+  if ((err = posix_spawn_file_actions_init (&actions)) != 0
+      || (actions_allocated = true,
+          (pipe_stdin
+           && (err = posix_spawn_file_actions_adddup2 (&actions,
+                                                       ofd[0], STDIN_FILENO))
+              != 0)
+          || (pipe_stdout
+              && (err = posix_spawn_file_actions_adddup2 (&actions,
+                                                          ifd[1], STDOUT_FILENO))
+                 != 0)
+          || (pipe_stdin
+              && (err = posix_spawn_file_actions_addclose (&actions, ofd[0]))
+                 != 0)
+          || (pipe_stdout
+              && (err = posix_spawn_file_actions_addclose (&actions, ifd[1]))
+                 != 0)
+          || (pipe_stdin
+              && (err = posix_spawn_file_actions_addclose (&actions, ofd[1]))
+                 != 0)
+          || (pipe_stdout
+              && (err = posix_spawn_file_actions_addclose (&actions, ifd[0]))
+                 != 0)
+          || (null_stderr
+              && (err = posix_spawn_file_actions_addopen (&actions,
+                                                          STDERR_FILENO,
+                                                          "/dev/null", O_RDWR,
+                                                          0))
+                 != 0)
+          || (!pipe_stdin
+              && prog_stdin != NULL
+              && (err = posix_spawn_file_actions_addopen (&actions,
+                                                          STDIN_FILENO,
+                                                          prog_stdin, O_RDONLY,
+                                                          0))
+                 != 0)
+          || (!pipe_stdout
+              && prog_stdout != NULL
+              && (err = posix_spawn_file_actions_addopen (&actions,
+                                                          STDOUT_FILENO,
+                                                          prog_stdout, O_WRONLY,
+                                                          0))
+                 != 0)
+          || (slave_process
+              && ((err = posix_spawnattr_init (&attrs)) != 0
+                  || (attrs_allocated = true,
+                      (err = posix_spawnattr_setsigmask (&attrs,
+                                                         &blocked_signals))
+                      != 0
+                      || (err = posix_spawnattr_setflags (&attrs,
+                                                        POSIX_SPAWN_SETSIGMASK))
+                         != 0)))
+          || (err = posix_spawnp (&child, prog_path, &actions,
+                                  attrs_allocated ? &attrs : NULL, prog_argv,
+                                  environ))
+             != 0))
+    {
+      if (actions_allocated)
+        posix_spawn_file_actions_destroy (&actions);
+      if (attrs_allocated)
+        posix_spawnattr_destroy (&attrs);
+      if (slave_process)
+        unblock_fatal_signals ();
+      if (exit_on_error || !null_stderr)
+        error (exit_on_error ? EXIT_FAILURE : 0, err,
+               _("%s subprocess failed"), progname);
+      if (pipe_stdout)
+        {
+          close (ifd[0]);
+          close (ifd[1]);
+        }
+      if (pipe_stdin)
+        {
+          close (ofd[0]);
+          close (ofd[1]);
+        }
+      errno = err;
+      return -1;
+    }
+  posix_spawn_file_actions_destroy (&actions);
+  if (attrs_allocated)
+    posix_spawnattr_destroy (&attrs);
+  if (slave_process)
+    {
+      register_slave_subprocess (child);
+      unblock_fatal_signals ();
+    }
+  if (pipe_stdin)
+    close (ofd[0]);
+  if (pipe_stdout)
+    close (ifd[1]);
+
+  if (pipe_stdout)
+    fd[0] = ifd[0];
+  if (pipe_stdin)
+    fd[1] = ofd[1];
+  return child;
+
+#endif
+}
+
+/* Open a bidirectional pipe.
+ *
+ *           write       system                read
+ *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child
+ *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
+ *           read        system                write
+ *
+ */
+pid_t
+create_pipe_bidi (const char *progname,
+                  const char *prog_path, char **prog_argv,
+                  bool null_stderr,
+                  bool slave_process, bool exit_on_error,
+                  int fd[2])
+{
+  pid_t result = create_pipe (progname, prog_path, prog_argv,
+                              true, true, NULL, NULL,
+                              null_stderr, slave_process, exit_on_error,
+                              fd);
+  return result;
+}
+
+/* Open a pipe for input from a child process.
+ * The child's stdin comes from a file.
+ *
+ *           read        system                write
+ *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
+ *
+ */
+pid_t
+create_pipe_in (const char *progname,
+                const char *prog_path, char **prog_argv,
+                const char *prog_stdin, bool null_stderr,
+                bool slave_process, bool exit_on_error,
+                int fd[1])
+{
+  int iofd[2];
+  pid_t result = create_pipe (progname, prog_path, prog_argv,
+                              false, true, prog_stdin, NULL,
+                              null_stderr, slave_process, exit_on_error,
+                              iofd);
+  if (result != -1)
+    fd[0] = iofd[0];
+  return result;
+}
+
+/* Open a pipe for output to a child process.
+ * The child's stdout goes to a file.
+ *
+ *           write       system                read
+ *    parent  ->   fd[0]   ->   STDIN_FILENO    ->   child
+ *
+ */
+pid_t
+create_pipe_out (const char *progname,
+                 const char *prog_path, char **prog_argv,
+                 const char *prog_stdout, bool null_stderr,
+                 bool slave_process, bool exit_on_error,
+                 int fd[1])
+{
+  int iofd[2];
+  pid_t result = create_pipe (progname, prog_path, prog_argv,
+                              true, false, NULL, prog_stdout,
+                              null_stderr, slave_process, exit_on_error,
+                              iofd);
+  if (result != -1)
+    fd[0] = iofd[1];
+  return result;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter-aux.c gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter-aux.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter-aux.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter-aux.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* Auxiliary code for filtering of data through a subprocess.
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-#define PIPE_FILTER_AUX_INLINE _GL_EXTERN_INLINE
-
-#include "pipe-filter.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# include <windows.h>
-#else
-# include <signal.h>
-# include <sys/select.h>
-#endif
-
-#include "error.h"
-#include "spawn-pipe.h"
-#include "wait-process.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-#include "pipe-filter-aux.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter-aux.h gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter-aux.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter-aux.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter-aux.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Auxiliary code for filtering of data through a subprocess.
-   Copyright (C) 2001-2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2008-2010 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
@@ -15,13 +15,6 @@
    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 _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef PIPE_FILTER_AUX_INLINE
-# define PIPE_FILTER_AUX_INLINE _GL_INLINE
-#endif
 
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
@@ -46,7 +39,7 @@
    These functions can return -1/EINTR even though we don't have any
    signal handlers set up, namely when we get interrupted via SIGSTOP.  */
 
-PIPE_FILTER_AUX_INLINE int
+static inline int
 nonintr_close (int fd)
 {
   int retval;
@@ -60,7 +53,7 @@
 #undef close /* avoid warning related to gnulib module unistd */
 #define close nonintr_close
 
-PIPE_FILTER_AUX_INLINE ssize_t
+static inline ssize_t
 nonintr_read (int fd, void *buf, size_t count)
 {
   ssize_t retval;
@@ -73,7 +66,7 @@
 }
 #define read nonintr_read
 
-PIPE_FILTER_AUX_INLINE ssize_t
+static inline ssize_t
 nonintr_write (int fd, const void *buf, size_t count)
 {
   ssize_t retval;
@@ -89,7 +82,7 @@
 
 # if HAVE_SELECT
 
-PIPE_FILTER_AUX_INLINE int
+static inline int
 nonintr_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
                 struct timeval *timeout)
 {
@@ -109,6 +102,9 @@
 #endif
 
 /* Non-blocking I/O.  */
+#ifndef O_NONBLOCK
+# define O_NONBLOCK O_NDELAY
+#endif
 #if HAVE_SELECT
 # define IS_EAGAIN(errcode) 0
 #else
@@ -118,5 +114,3 @@
 #  define IS_EAGAIN(errcode) ((errcode) == EAGAIN)
 # endif
 #endif
-
-_GL_INLINE_HEADER_END
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter.h gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Filtering of data through a subprocess.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2009,
    and Paolo Bonzini <bonzini@gnu.org>, 2009.
 
@@ -119,7 +119,7 @@
    true, otherwise return 127.
    Callback arguments are as described above.
 
-   Data is alternately written to the subprocess, through the functions
+   Data is alternatingly written to the subprocess, through the functions
    prepare_write and done_write, and read from the subprocess, through the
    functions prepare_read and done_read.
 
@@ -167,7 +167,7 @@
    true, otherwise return NULL and set errno.
 
    The caller will write to the subprocess through pipe_filter_gi_write
-   and finally call pipe_filter_gi_close.  During such calls, the
+   and finally call pipe_filter_gi_write.  During such calls, the
    prepare_read and done_read function may be called to process any data
    that the subprocess has written.
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter-ii.c gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter-ii.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe-filter-ii.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-filter-ii.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Filtering of data through a subprocess.
-   Copyright (C) 2001-2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #endif
 
 #include "error.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "gettext.h"
 
@@ -155,7 +155,7 @@
     return -1;
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* Native Windows API.  */
+  /* Native Woe32 API.  */
   /* Pipes have a non-blocking mode, see function SetNamedPipeHandleState and
      the article "Named Pipe Type, Read, and Wait Modes", but Microsoft's
      documentation discourages its use.  So don't use it.
@@ -347,42 +347,21 @@
             const void *buf = prepare_write (&bufsize, private_data);
             if (buf != NULL)
               {
-                /* Writing to a pipe in non-blocking mode is tricky: The
-                   write() call may fail with EAGAIN, simply because sufficient
-                   space is not available in the pipe. See POSIX:2008
-                   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html>.
-                   This happens actually on AIX and IRIX, when bufsize >= 8192
-                   (even though PIPE_BUF and pathconf ("/", _PC_PIPE_BUF) are
-                   both 32768).  */
-                size_t attempt_to_write =
-                  (bufsize > SSIZE_MAX ? SSIZE_MAX : bufsize);
-                for (;;)
+                ssize_t nwritten =
+                  write (fd[1], buf,
+                         bufsize > SSIZE_MAX ? SSIZE_MAX : bufsize);
+                if (nwritten < 0)
                   {
-                    ssize_t nwritten = write (fd[1], buf, attempt_to_write);
-                    if (nwritten < 0)
+                    if (!IS_EAGAIN (errno))
                       {
-                        if (errno == EAGAIN)
-                          {
-                            attempt_to_write = attempt_to_write / 2;
-                            if (attempt_to_write == 0)
-                              break;
-                          }
-                        else if (!IS_EAGAIN (errno))
-                          {
-                            if (exit_on_error)
-                              error (EXIT_FAILURE, errno,
-                                     _("write to %s subprocess failed"),
-                                     progname);
-                            goto fail;
-                          }
-                      }
-                    else
-                      {
-                        if (nwritten > 0)
-                          done_write ((void *) buf, nwritten, private_data);
-                        break;
+                        if (exit_on_error)
+                          error (EXIT_FAILURE, errno,
+                                 _("write to %s subprocess failed"), progname);
+                        goto fail;
                       }
                   }
+                else if (nwritten > 0)
+                  done_write ((void *) buf, nwritten, private_data);
               }
             else
               {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe.h gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe.h	2010-05-24 09:42:46.000000000 +0000
@@ -0,0 +1,147 @@
+/* Creation of subprocesses, communicating via pipes.
+   Copyright (C) 2001-2003, 2006, 2008-2010 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
+   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 _PIPE_H
+#define _PIPE_H
+
+/* Get pid_t.  */
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <stdbool.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* All these functions create a subprocess and don't wait for its termination.
+   They return the process id of the subprocess.  They also return in fd[]
+   one or two file descriptors for communication with the subprocess.
+   If the subprocess creation fails: if exit_on_error is true, the main
+   process exits with an error message; otherwise, an error message is given
+   if null_stderr is false, then -1 is returned, with errno set, and fd[]
+   remain uninitialized.
+
+   After finishing communication, the caller should call wait_subprocess()
+   to get rid of the subprocess in the process table.
+
+   If slave_process is true, the child process will be terminated when its
+   creator receives a catchable fatal signal or exits normally.  If
+   slave_process is false, the child process will continue running in this
+   case, until it is lucky enough to attempt to communicate with its creator
+   and thus get a SIGPIPE signal.
+
+   If exit_on_error is false, a child process id of -1 should be treated the
+   same way as a subprocess which accepts no input, produces no output and
+   terminates with exit code 127.  Why?  Some errors during posix_spawnp()
+   cause the function posix_spawnp() to return an error code; some other
+   errors cause the subprocess to exit with return code 127.  It is
+   implementation dependent which error is reported which way.  The caller
+   must treat both cases as equivalent.
+
+   It is recommended that no signal is blocked or ignored (i.e. have a
+   signal handler with value SIG_IGN) while any of these functions is called.
+   The reason is that child processes inherit the mask of blocked signals
+   from their parent (both through posix_spawn() and fork()/exec());
+   likewise, signals ignored in the parent are also ignored in the child
+   (except possibly for SIGCHLD).  And POSIX:2001 says [in the description
+   of exec()]:
+       "it should be noted that many existing applications wrongly
+        assume that they start with certain signals set to the default
+        action and/or unblocked. In particular, applications written
+        with a simpler signal model that does not include blocking of
+        signals, such as the one in the ISO C standard, may not behave
+        properly if invoked with some signals blocked. Therefore, it is
+        best not to block or ignore signals across execs without explicit
+        reason to do so, and especially not to block signals across execs
+        of arbitrary (not closely co-operating) programs."  */
+
+/* Open a pipe for output to a child process.
+ * The child's stdout goes to a file.
+ *
+ *           write       system                read
+ *    parent  ->   fd[0]   ->   STDIN_FILENO    ->   child
+ *
+ * Note: When writing to a child process, it is useful to ignore the SIGPIPE
+ * signal and the EPIPE error code.
+ */
+extern pid_t create_pipe_out (const char *progname,
+                              const char *prog_path, char **prog_argv,
+                              const char *prog_stdout, bool null_stderr,
+                              bool slave_process, bool exit_on_error,
+                              int fd[1]);
+
+/* Open a pipe for input from a child process.
+ * The child's stdin comes from a file.
+ *
+ *           read        system                write
+ *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
+ *
+ */
+extern pid_t create_pipe_in (const char *progname,
+                             const char *prog_path, char **prog_argv,
+                             const char *prog_stdin, bool null_stderr,
+                             bool slave_process, bool exit_on_error,
+                             int fd[1]);
+
+/* Open a bidirectional pipe.
+ *
+ *           write       system                read
+ *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child
+ *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
+ *           read        system                write
+ *
+ * Note: When writing to a child process, it is useful to ignore the SIGPIPE
+ * signal and the EPIPE error code.
+ *
+ * Note: The parent process must be careful to avoid deadlock.
+ * 1) If you write more than PIPE_MAX bytes or, more generally, if you write
+ *    more bytes than the subprocess can handle at once, the subprocess
+ *    may write its data and wait on you to read it, but you are currently
+ *    busy writing.
+ * 2) When you don't know ahead of time how many bytes the subprocess
+ *    will produce, the usual technique of calling read (fd, buf, BUFSIZ)
+ *    with a fixed BUFSIZ will, on Linux 2.2.17 and on BSD systems, cause
+ *    the read() call to block until *all* of the buffer has been filled.
+ *    But the subprocess cannot produce more data until you gave it more
+ *    input.  But you are currently busy reading from it.
+ */
+extern pid_t create_pipe_bidi (const char *progname,
+                               const char *prog_path, char **prog_argv,
+                               bool null_stderr,
+                               bool slave_process, bool exit_on_error,
+                               int fd[2]);
+
+/* The name of the "always silent" device.  */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Native Woe32 API.  */
+# define DEV_NULL "NUL"
+#else
+/* Unix API.  */
+# define DEV_NULL "/dev/null"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _PIPE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/pipe-safer.c gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-safer.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/pipe-safer.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe-safer.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Invoke pipe, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/printf-args.c gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-args.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/printf-args.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-args.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2014 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can be parametrized with the following macros:
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/printf-args.h gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-args.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/printf-args.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-args.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2014 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
@@ -135,14 +136,10 @@
 }
 argument;
 
-/* Number of directly allocated arguments (no malloc() needed).  */
-#define N_DIRECT_ALLOC_ARGUMENTS 7
-
 typedef struct
 {
   size_t count;
   argument *arg;
-  argument direct_alloc_arg[N_DIRECT_ALLOC_ARGUMENTS];
 }
 arguments;
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/printf-parse.c gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-parse.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/printf-parse.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-parse.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can be parametrized with the following macros:
      CHAR_T             The element type of the format string.
@@ -62,9 +63,6 @@
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
 
-/* memcpy().  */
-#include <string.h>
-
 /* errno.  */
 #include <errno.h>
 
@@ -82,20 +80,23 @@
 int
 PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 {
-  const CHAR_T *cp = format;    /* pointer into format */
+  const CHAR_T *cp = format;            /* pointer into format */
   size_t arg_posn = 0;          /* number of regular arguments consumed */
-  size_t d_allocated;           /* allocated elements of d->dir */
-  size_t a_allocated;           /* allocated elements of a->arg */
+  size_t d_allocated;                   /* allocated elements of d->dir */
+  size_t a_allocated;                   /* allocated elements of a->arg */
   size_t max_width_length = 0;
   size_t max_precision_length = 0;
 
   d->count = 0;
-  d_allocated = N_DIRECT_ALLOC_DIRECTIVES;
-  d->dir = d->direct_alloc_dir;
+  d_allocated = 1;
+  d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE));
+  if (d->dir == NULL)
+    /* Out of memory.  */
+    goto out_of_memory_1;
 
   a->count = 0;
-  a_allocated = N_DIRECT_ALLOC_ARGUMENTS;
-  a->arg = a->direct_alloc_arg;
+  a_allocated = 0;
+  a->arg = NULL;
 
 #define REGISTER_ARG(_index_,_type_) \
   {                                                                     \
@@ -112,14 +113,12 @@
         if (size_overflow_p (memory_size))                              \
           /* Overflow, would lead to out of memory.  */                 \
           goto out_of_memory;                                           \
-        memory = (argument *) (a->arg != a->direct_alloc_arg            \
+        memory = (argument *) (a->arg                                   \
                                ? realloc (a->arg, memory_size)          \
                                : malloc (memory_size));                 \
         if (memory == NULL)                                             \
           /* Out of memory.  */                                         \
           goto out_of_memory;                                           \
-        if (a->arg == a->direct_alloc_arg)                              \
-          memcpy (memory, a->arg, a->count * sizeof (argument));        \
         a->arg = memory;                                                \
       }                                                                 \
     while (a->count <= n)                                               \
@@ -207,13 +206,6 @@
                   dp->flags |= FLAG_ZERO;
                   cp++;
                 }
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-              else if (*cp == 'I')
-                {
-                  dp->flags |= FLAG_LOCALIZED;
-                  cp++;
-                }
-#endif
               else
                 break;
             }
@@ -401,7 +393,7 @@
                       cp++;
                     }
 #if defined __APPLE__ && defined __MACH__
-                  /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
+                  /* On MacOS X 10.3, PRIdMAX is defined as "qd".
                      We cannot change it to "lld" because PRIdMAX must also
                      be understood by the system's printf routines.  */
                   else if (*cp == 'q')
@@ -420,7 +412,7 @@
                     }
 #endif
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-                  /* On native Windows, PRIdMAX is defined as "I64d".
+                  /* On native Win32, PRIdMAX is defined as "I64d".
                      We cannot change it to "lld" because PRIdMAX must also
                      be understood by the system's printf routines.  */
                   else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4')
@@ -589,14 +581,10 @@
               if (size_overflow_p (memory_size))
                 /* Overflow, would lead to out of memory.  */
                 goto out_of_memory;
-              memory = (DIRECTIVE *) (d->dir != d->direct_alloc_dir
-                                      ? realloc (d->dir, memory_size)
-                                      : malloc (memory_size));
+              memory = (DIRECTIVE *) realloc (d->dir, memory_size);
               if (memory == NULL)
                 /* Out of memory.  */
                 goto out_of_memory;
-              if (d->dir == d->direct_alloc_dir)
-                memcpy (memory, d->dir, d->count * sizeof (DIRECTIVE));
               d->dir = memory;
             }
         }
@@ -615,18 +603,19 @@
   return 0;
 
 error:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
   errno = EINVAL;
   return -1;
 
 out_of_memory:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
+out_of_memory_1:
   errno = ENOMEM;
   return -1;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/printf-parse.h gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-parse.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/printf-parse.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/printf-parse.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2014 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PRINTF_PARSE_H
 #define _PRINTF_PARSE_H
@@ -22,10 +23,6 @@
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.
      STATIC             Set to 'static' to declare the function static.  */
 
-#if HAVE_FEATURES_H
-# include <features.h> /* for __GLIBC__, __UCLIBC__ */
-#endif
-
 #include "printf-args.h"
 
 
@@ -36,9 +33,6 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
-#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)
@@ -46,9 +40,6 @@
 /* xxx_directive: A parsed directive.
    xxx_directives: A parsed format string.  */
 
-/* Number of directly allocated directives (no malloc() needed).  */
-#define N_DIRECT_ALLOC_DIRECTIVES 7
-
 /* A parsed directive.  */
 typedef struct
 {
@@ -73,7 +64,6 @@
   char_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  char_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 char_directives;
 
@@ -103,7 +93,6 @@
   u8_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  u8_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 u8_directives;
 
@@ -131,7 +120,6 @@
   u16_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  u16_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 u16_directives;
 
@@ -159,7 +147,6 @@
   u32_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  u32_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 u32_directives;
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/progname.c gettext-0.18.1.1/gettext-tools/gnulib-lib/progname.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/progname.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/progname.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/progname.h gettext-0.18.1.1/gettext-tools/gnulib-lib/progname.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/progname.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/progname.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/progreloc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/progreloc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/progreloc.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/progreloc.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Provide relocatable programs.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -30,16 +29,16 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-/* Get declaration of _NSGetExecutablePath on Mac OS X 10.2 or newer.  */
+/* Get declaration of _NSGetExecutablePath on MacOS X 10.2 or newer.  */
 #if HAVE_MACH_O_DYLD_H
 # include <mach-o/dyld.h>
 #endif
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-# define WINDOWS_NATIVE
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_NATIVE
 #endif
 
-#ifdef WINDOWS_NATIVE
+#if defined WIN32_NATIVE || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -60,10 +59,6 @@
 # include "xalloc.h"
 #endif
 
-#ifndef O_EXEC
-# define O_EXEC O_RDONLY /* This is often close enough in older systems.  */
-#endif
-
 /* Declare canonicalize_file_name.
    The <stdlib.h> included above may be the system's one, not the gnulib
    one.  */
@@ -73,8 +68,8 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -89,15 +84,17 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef sprintf
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
 
 #undef set_program_name
 
 
 #if ENABLE_RELOCATABLE
 
-#if defined __linux__ || defined __CYGWIN__
+#ifdef __linux__
 /* File descriptor of the executable.
    (Only used to verify that we find the correct executable.)  */
 static int executable_fd = -1;
@@ -107,13 +104,12 @@
 static bool
 maybe_executable (const char *filename)
 {
-  /* The native Windows API lacks the access() function.  */
-#if !defined WINDOWS_NATIVE
+  /* Woe32 lacks the access() function, but Cygwin doesn't.  */
+#if !(defined WIN32_NATIVE && !defined __CYGWIN__)
   if (access (filename, X_OK) < 0)
     return false;
-#endif
 
-#if defined __linux__ || defined __CYGWIN__
+#ifdef __linux__
   if (executable_fd >= 0)
     {
       /* If we already have an executable_fd, check that filename points to
@@ -132,23 +128,19 @@
         }
     }
 #endif
+#endif
 
   return true;
 }
 
 /* Determine the full pathname of the current executable, freshly allocated.
    Return NULL if unknown.
-   Guaranteed to work on Linux and native Windows.  Likely to work on the
-   other Unixes (maybe except BeOS), under most conditions.  */
+   Guaranteed to work on Linux and Woe32.  Likely to work on the other
+   Unixes (maybe except BeOS), under most conditions.  */
 static char *
 find_executable (const char *argv0)
 {
-#if defined WINDOWS_NATIVE
-  /* Native Windows only.
-     On Cygwin, it is better to use the Cygwin provided /proc interface, than
-     to use native Windows API and cygwin_conv_to_posix_path, because it
-     supports longer file names
-     (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
+#if defined WIN32_NATIVE || defined __CYGWIN__
   char location[MAX_PATH];
   int length = GetModuleFileName (NULL, location, sizeof (location));
   if (length < 0)
@@ -156,9 +148,32 @@
   if (!IS_PATH_WITH_DIR (location))
     /* Shouldn't happen.  */
     return NULL;
-  return xstrdup (location);
-#else /* Unix */
-# ifdef __linux__
+  {
+#if defined __CYGWIN__
+    /* cygwin-1.5.13 (2005-03-01) or newer would also allow a Linux-like
+       implementation: readlink of "/proc/self/exe".  But using the
+       result of the Win32 system call is simpler and is consistent with the
+       code in relocatable.c.  */
+    /* On Cygwin, we need to convert paths coming from Win32 system calls
+       to the Unix-like slashified notation.  */
+    static char location_as_posix_path[2 * MAX_PATH];
+    /* There's no error return defined for cygwin_conv_to_posix_path.
+       See cygwin-api/func-cygwin-conv-to-posix-path.html.
+       Does it overflow the buffer of expected size MAX_PATH or does it
+       truncate the path?  I don't know.  Let's catch both.  */
+    cygwin_conv_to_posix_path (location, location_as_posix_path);
+    location_as_posix_path[MAX_PATH - 1] = '\0';
+    if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+      /* A sign of buffer overflow or path truncation.  */
+      return NULL;
+    /* Call canonicalize_file_name, because Cygwin supports symbolic links.  */
+    return canonicalize_file_name (location_as_posix_path);
+#else
+    return xstrdup (location);
+#endif
+  }
+#else /* Unix && !Cygwin */
+#ifdef __linux__
   /* The executable is accessible as /proc/<pid>/exe.  In newer Linux
      versions, also as /proc/self/exe.  Linux >= 2.1 provides a symlink
      to the true pathname; older Linux versions give only device and ino,
@@ -170,7 +185,7 @@
     if (link != NULL && link[0] != '[')
       return link;
     if (executable_fd < 0)
-      executable_fd = open ("/proc/self/exe", O_EXEC, 0);
+      executable_fd = open ("/proc/self/exe", O_RDONLY, 0);
 
     {
       char buf[6+10+5];
@@ -179,25 +194,12 @@
       if (link != NULL && link[0] != '[')
         return link;
       if (executable_fd < 0)
-        executable_fd = open (buf, O_EXEC, 0);
+        executable_fd = open (buf, O_RDONLY, 0);
     }
   }
-# endif
-# ifdef __CYGWIN__
-  /* The executable is accessible as /proc/<pid>/exe, at least in
-     Cygwin >= 1.5.  */
-  {
-    char *link;
-
-    link = xreadlink ("/proc/self/exe");
-    if (link != NULL)
-      return link;
-    if (executable_fd < 0)
-      executable_fd = open ("/proc/self/exe", O_EXEC, 0);
-  }
-# endif
-# if HAVE_MACH_O_DYLD_H && HAVE__NSGETEXECUTABLEPATH
-  /* On Mac OS X 10.2 or newer, the function
+#endif
+#if HAVE_MACH_O_DYLD_H && HAVE__NSGETEXECUTABLEPATH
+  /* On MacOS X 10.2 or newer, the function
        int _NSGetExecutablePath (char *buf, uint32_t *bufsize);
      can be used to retrieve the executable's full path.  */
   char location[4096];
@@ -205,7 +207,7 @@
   if (_NSGetExecutablePath (location, &length) == 0
       && location[0] == '/')
     return canonicalize_file_name (location);
-# endif
+#endif
   /* Guess the executable's full path.  We assume the executable has been
      called via execlp() or execvp() with properly set up argv[0].  The
      login(1) convention to add a '-' prefix to argv[0] is not supported.  */
@@ -246,10 +248,10 @@
                 /* We have a path item at p, of length p_len.
                    Now concatenate the path item and argv0.  */
                 concat_name = (char *) xmalloc (p_len + strlen (argv0) + 2);
-# ifdef NO_XMALLOC
+#ifdef NO_XMALLOC
                 if (concat_name == NULL)
                   return NULL;
-# endif
+#endif
                 if (p_len == 0)
                   /* An empty PATH element designates the current directory.  */
                   strcpy (concat_name, argv0);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/propername.c gettext-0.18.1.1/gettext-tools/gnulib-lib/propername.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/propername.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/propername.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -15,12 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Without this pragma, gcc 4.7.0 20111124 mistakenly suggests that
-   the proper_name function might be candidate for attribute 'const'  */
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-# pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
-#endif
-
 #include <config.h>
 
 /* Specification.  */
@@ -204,8 +198,7 @@
       name_converted = alloc_name_converted =
         xstr_iconv (name_utf8, "UTF-8", locale_code);
 
-# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-      && !defined __UCLIBC__) \
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
      || _LIBICONV_VERSION >= 0x0105
       {
         char *converted_translit;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/propername.h gettext-0.18.1.1/gettext-tools/gnulib-lib/propername.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/propername.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/propername.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -89,7 +89,7 @@
 #endif
 
 /* Return the localization of NAME.  NAME is written in ASCII.  */
-extern const char * proper_name (const char *name) /* NOT attribute const */;
+extern const char * proper_name (const char *name);
 
 /* Return the localization of a name whose original writing is not ASCII.
    NAME_UTF8 is the real name, written in UTF-8 with octal or hexadecimal
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/qcopy-acl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/qcopy-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/qcopy-acl.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/qcopy-acl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,583 +0,0 @@
-/* copy-acl.c - copy access control list from one file to another file
-
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
-
-#include <config.h>
-
-#include "acl.h"
-
-#include "acl-internal.h"
-
-
-/* Copy access control lists from one file to another. If SOURCE_DESC is
-   a valid file descriptor, use file descriptor operations, else use
-   filename based operations on SRC_NAME. Likewise for DEST_DESC and
-   DST_NAME.
-   If access control lists are not available, fchmod the target file to
-   MODE.  Also sets the non-permission bits of the destination file
-   (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
-   Return 0 if successful.
-   Return -2 and set errno for an error relating to the source file.
-   Return -1 and set errno for an error relating to the destination file.  */
-
-int
-qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
-           int dest_desc, mode_t mode)
-{
-#if USE_ACL && HAVE_ACL_GET_FILE
-  /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
-  /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
-# if !HAVE_ACL_TYPE_EXTENDED
-  /* Linux, FreeBSD, IRIX, Tru64 */
-
-  acl_t acl;
-  int ret;
-
-  if (HAVE_ACL_GET_FD && source_desc != -1)
-    acl = acl_get_fd (source_desc);
-  else
-    acl = acl_get_file (src_name, ACL_TYPE_ACCESS);
-  if (acl == NULL)
-    {
-      if (! acl_errno_valid (errno))
-        return qset_acl (dst_name, dest_desc, mode);
-      else
-        return -2;
-    }
-
-  if (HAVE_ACL_SET_FD && dest_desc != -1)
-    ret = acl_set_fd (dest_desc, acl);
-  else
-    ret = acl_set_file (dst_name, ACL_TYPE_ACCESS, acl);
-  if (ret != 0)
-    {
-      int saved_errno = errno;
-
-      if (! acl_errno_valid (errno) && !acl_access_nontrivial (acl))
-        {
-          acl_free (acl);
-          return chmod_or_fchmod (dst_name, dest_desc, mode);
-        }
-      else
-        {
-          acl_free (acl);
-          chmod_or_fchmod (dst_name, dest_desc, mode);
-          errno = saved_errno;
-          return -1;
-        }
-    }
-  else
-    acl_free (acl);
-
-  if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX)))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        return -1;
-    }
-
-  if (S_ISDIR (mode))
-    {
-      acl = acl_get_file (src_name, ACL_TYPE_DEFAULT);
-      if (acl == NULL)
-        return -2;
-
-      if (acl_set_file (dst_name, ACL_TYPE_DEFAULT, acl))
-        {
-          int saved_errno = errno;
-
-          acl_free (acl);
-          errno = saved_errno;
-          return -1;
-        }
-      else
-        acl_free (acl);
-    }
-  return 0;
-
-# else /* HAVE_ACL_TYPE_EXTENDED */
-  /* Mac OS X */
-
-  /* On Mac OS X,  acl_get_file (name, ACL_TYPE_ACCESS)
-     and           acl_get_file (name, ACL_TYPE_DEFAULT)
-     always return NULL / EINVAL.  You have to use
-                   acl_get_file (name, ACL_TYPE_EXTENDED)
-     or            acl_get_fd (open (name, ...))
-     to retrieve an ACL.
-     On the other hand,
-                   acl_set_file (name, ACL_TYPE_ACCESS, acl)
-     and           acl_set_file (name, ACL_TYPE_DEFAULT, acl)
-     have the same effect as
-                   acl_set_file (name, ACL_TYPE_EXTENDED, acl):
-     Each of these calls sets the file's ACL.  */
-
-  acl_t acl;
-  int ret;
-
-  if (HAVE_ACL_GET_FD && source_desc != -1)
-    acl = acl_get_fd (source_desc);
-  else
-    acl = acl_get_file (src_name, ACL_TYPE_EXTENDED);
-  if (acl == NULL)
-    {
-      if (!acl_errno_valid (errno))
-        return qset_acl (dst_name, dest_desc, mode);
-      else
-        return -2;
-    }
-
-  if (HAVE_ACL_SET_FD && dest_desc != -1)
-    ret = acl_set_fd (dest_desc, acl);
-  else
-    ret = acl_set_file (dst_name, ACL_TYPE_EXTENDED, acl);
-  if (ret != 0)
-    {
-      int saved_errno = errno;
-
-      if (!acl_errno_valid (saved_errno) && !acl_extended_nontrivial (acl))
-        {
-          acl_free (acl);
-          return chmod_or_fchmod (dst_name, dest_desc, mode);
-        }
-      else
-        {
-          acl_free (acl);
-          chmod_or_fchmod (dst_name, dest_desc, mode);
-          errno = saved_errno;
-          return -1;
-        }
-    }
-  else
-    acl_free (acl);
-
-  /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly.  */
-  return chmod_or_fchmod (dst_name, dest_desc, mode);
-
-# endif
-
-#elif USE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
-
-  /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions
-     of Unixware.  The acl() call returns the access and default ACL both
-     at once.  */
-# ifdef ACE_GETACL
-  int ace_count;
-  ace_t *ace_entries;
-# endif
-  int count;
-  aclent_t *entries;
-  int did_chmod;
-  int saved_errno;
-  int ret;
-
-# ifdef ACE_GETACL
-  /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
-     file systems (whereas the other ones are used in UFS file systems).
-     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
-     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.
-     When setting the destination ACL, we try either ACL types, assuming
-     that the kernel will translate the ACL from one form to the other.
-     (See in <http://docs.sun.com/app/docs/doc/819-2241/6n4huc7ia?l=en&a=view>
-     the description of ENOTSUP.)  */
-  for (;;)
-    {
-      ace_count = (source_desc != -1
-                   ? facl (source_desc, ACE_GETACLCNT, 0, NULL)
-                   : acl (src_name, ACE_GETACLCNT, 0, NULL));
-
-      if (ace_count < 0)
-        {
-          if (errno == ENOSYS || errno == EINVAL)
-            {
-              ace_count = 0;
-              ace_entries = NULL;
-              break;
-            }
-          else
-            return -2;
-        }
-
-      if (ace_count == 0)
-        {
-          ace_entries = NULL;
-          break;
-        }
-
-      ace_entries = (ace_t *) malloc (ace_count * sizeof (ace_t));
-      if (ace_entries == NULL)
-        {
-          errno = ENOMEM;
-          return -2;
-        }
-
-      ret = (source_desc != -1
-             ? facl (source_desc, ACE_GETACL, ace_count, ace_entries)
-             : acl (src_name, ACE_GETACL, ace_count, ace_entries));
-      if (ret < 0)
-        {
-          free (ace_entries);
-          if (errno == ENOSYS || errno == EINVAL)
-            {
-              ace_count = 0;
-              ace_entries = NULL;
-              break;
-            }
-          else
-            return -2;
-        }
-      if (ret == ace_count)
-        break;
-      /* Huh? The number of ACL entries changed since the last call.
-         Repeat.  */
-    }
-# endif
-
-  for (;;)
-    {
-      count = (source_desc != -1
-               ? facl (source_desc, GETACLCNT, 0, NULL)
-               : acl (src_name, GETACLCNT, 0, NULL));
-
-      if (count < 0)
-        {
-          if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
-            {
-              count = 0;
-              entries = NULL;
-              break;
-            }
-          else
-            return -2;
-        }
-
-      if (count == 0)
-        {
-          entries = NULL;
-          break;
-        }
-
-      entries = (aclent_t *) malloc (count * sizeof (aclent_t));
-      if (entries == NULL)
-        {
-          errno = ENOMEM;
-          return -2;
-        }
-
-      if ((source_desc != -1
-           ? facl (source_desc, GETACL, count, entries)
-           : acl (src_name, GETACL, count, entries))
-          == count)
-        break;
-      /* Huh? The number of ACL entries changed since the last call.
-         Repeat.  */
-    }
-
-  /* Is there an ACL of either kind?  */
-# ifdef ACE_GETACL
-  if (ace_count == 0)
-# endif
-    if (count == 0)
-      return qset_acl (dst_name, dest_desc, mode);
-
-  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
-  saved_errno = 0; /* the first non-ignorable error code */
-
-  if (!MODE_INSIDE_ACL)
-    {
-      /* On Cygwin, it is necessary to call chmod before acl, because
-         chmod can change the contents of the ACL (in ways that don't
-         change the allowed accesses, but still visible).  */
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        saved_errno = errno;
-      did_chmod = 1;
-    }
-
-  /* If both ace_entries and entries are available, try SETACL before
-     ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL
-     can.  */
-
-  if (count > 0)
-    {
-      ret = (dest_desc != -1
-             ? facl (dest_desc, SETACL, count, entries)
-             : acl (dst_name, SETACL, count, entries));
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-              && !acl_nontrivial (count, entries))
-            saved_errno = 0;
-        }
-      else
-        did_chmod = 1;
-    }
-  free (entries);
-
-# ifdef ACE_GETACL
-  if (ace_count > 0)
-    {
-      ret = (dest_desc != -1
-             ? facl (dest_desc, ACE_SETACL, ace_count, ace_entries)
-             : acl (dst_name, ACE_SETACL, ace_count, ace_entries));
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
-              && !acl_ace_nontrivial (ace_count, ace_entries))
-            saved_errno = 0;
-        }
-    }
-  free (ace_entries);
-# endif
-
-  if (MODE_INSIDE_ACL
-      && did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        {
-          if (saved_errno == 0)
-            saved_errno = errno;
-        }
-    }
-
-  if (saved_errno)
-    {
-      errno = saved_errno;
-      return -1;
-    }
-  return 0;
-
-#elif USE_ACL && HAVE_GETACL /* HP-UX */
-
-  struct acl_entry entries[NACLENTRIES];
-  int count;
-# if HAVE_ACLV_H
-  struct acl aclv_entries[NACLVENTRIES];
-  int aclv_count;
-# endif
-  int did_chmod;
-  int saved_errno;
-  int ret;
-
-  count = (source_desc != -1
-           ? fgetacl (source_desc, NACLENTRIES, entries)
-           : getacl (src_name, NACLENTRIES, entries));
-
-  if (count < 0)
-    {
-      if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
-        count = 0;
-      else
-        return -2;
-    }
-  else if (count > 0)
-    {
-      if (count > NACLENTRIES)
-        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
-        abort ();
-    }
-
-# if HAVE_ACLV_H
-  aclv_count = acl ((char *) src_name, ACL_GET, NACLVENTRIES, aclv_entries);
-
-  if (aclv_count < 0)
-    {
-      if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-        count = 0;
-      else
-        return -2;
-    }
-  else if (aclv_count > 0)
-    {
-      if (aclv_count > NACLVENTRIES)
-        /* If NACLVENTRIES cannot be trusted, use dynamic memory allocation.  */
-        abort ();
-    }
-# endif
-
-  if (count == 0)
-# if HAVE_ACLV_H
-    if (aclv_count == 0)
-# endif
-      return qset_acl (dst_name, dest_desc, mode);
-
-  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
-  saved_errno = 0; /* the first non-ignorable error code */
-
-  if (count > 0)
-    {
-      ret = (dest_desc != -1
-             ? fsetacl (dest_desc, count, entries)
-             : setacl (dst_name, count, entries));
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
-            {
-              struct stat source_statbuf;
-
-              if ((source_desc != -1
-                   ? fstat (source_desc, &source_statbuf)
-                   : stat (src_name, &source_statbuf)) == 0)
-                {
-                  if (!acl_nontrivial (count, entries, &source_statbuf))
-                    saved_errno = 0;
-                }
-              else
-                saved_errno = errno;
-            }
-        }
-      else
-        did_chmod = 1;
-    }
-
-# if HAVE_ACLV_H
-  if (aclv_count > 0)
-    {
-      ret = acl ((char *) dst_name, ACL_SET, aclv_count, aclv_entries);
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-            {
-              if (!aclv_nontrivial (aclv_count, aclv_entries))
-                saved_errno = 0;
-            }
-        }
-      else
-        did_chmod = 1;
-    }
-# endif
-
-  if (did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
-    {
-      /* We did not call chmod so far, and special bits are to be set which
-         don't fit into ACLs.  */
-
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        {
-          if (saved_errno == 0)
-            saved_errno = errno;
-        }
-    }
-
-  if (saved_errno)
-    {
-      errno = saved_errno;
-      return -1;
-    }
-  return 0;
-
-#elif USE_ACL && HAVE_ACLX_GET && 0 /* AIX */
-
-  /* TODO */
-
-#elif USE_ACL && HAVE_STATACL /* older AIX */
-
-  union { struct acl a; char room[4096]; } u;
-  int ret;
-
-  if ((source_desc != -1
-       ? fstatacl (source_desc, STX_NORMAL, &u.a, sizeof (u))
-       : statacl (src_name, STX_NORMAL, &u.a, sizeof (u)))
-      < 0)
-    return -2;
-
-  ret = (dest_desc != -1
-         ? fchacl (dest_desc, &u.a, u.a.acl_len)
-         : chacl (dst_name, &u.a, u.a.acl_len));
-  if (ret < 0)
-    {
-      int saved_errno = errno;
-
-      chmod_or_fchmod (dst_name, dest_desc, mode);
-      errno = saved_errno;
-      return -1;
-    }
-
-  /* No need to call chmod_or_fchmod at this point, since the mode bits
-     S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL.  */
-
-  return 0;
-
-#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */
-
-  struct acl entries[NACLENTRIES];
-  int count;
-  int ret;
-
-  count = acl ((char *) src_name, ACL_GET, NACLENTRIES, entries);
-
-  if (count < 0)
-    {
-      if (0)
-        count = 0;
-      else
-        return -2;
-    }
-  else if (count > 0)
-    {
-      if (count > NACLENTRIES)
-        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
-        abort ();
-    }
-
-  if (count == 0)
-    return qset_acl (dst_name, dest_desc, mode);
-
-  ret = acl ((char *) dst_name, ACL_SET, count, entries);
-  if (ret < 0)
-    {
-      int saved_errno = errno;
-
-      if (0)
-        {
-          if (!acl_nontrivial (count, entries))
-            return chmod_or_fchmod (dst_name, dest_desc, mode);
-        }
-
-      chmod_or_fchmod (dst_name, dest_desc, mode);
-      errno = saved_errno;
-      return -1;
-    }
-
-  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-
-      return chmod_or_fchmod (dst_name, dest_desc, mode);
-    }
-  return 0;
-
-#else
-
-  return qset_acl (dst_name, dest_desc, mode);
-
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/qset-acl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/qset-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/qset-acl.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/qset-acl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,676 +0,0 @@
-/* qset-acl.c - set access control list equivalent to a mode
-
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert and Andreas Gruenbacher, and Bruno Haible.  */
-
-#include <config.h>
-
-#define ACL_INTERNAL_INLINE _GL_EXTERN_INLINE
-
-#include "acl.h"
-
-#include "acl-internal.h"
-
-
-/* If DESC is a valid file descriptor use fchmod to change the
-   file's mode to MODE on systems that have fchmod. On systems
-   that don't have fchmod and if DESC is invalid, use chmod on
-   NAME instead.
-   Return 0 if successful.  Return -1 and set errno upon failure.  */
-
-int
-chmod_or_fchmod (const char *name, int desc, mode_t mode)
-{
-  if (HAVE_FCHMOD && desc != -1)
-    return fchmod (desc, mode);
-  else
-    return chmod (name, mode);
-}
-
-/* Set the access control lists of a file. If DESC is a valid file
-   descriptor, use file descriptor operations where available, else use
-   filename based operations on NAME.  If access control lists are not
-   available, fchmod the target file to MODE.  Also sets the
-   non-permission bits of the destination file (S_ISUID, S_ISGID, S_ISVTX)
-   to those from MODE if any are set.
-   Return 0 if successful.  Return -1 and set errno upon failure.  */
-
-int
-qset_acl (char const *name, int desc, mode_t mode)
-{
-#if USE_ACL
-# if HAVE_ACL_GET_FILE
-  /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
-  /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
-#  if !HAVE_ACL_TYPE_EXTENDED
-  /* Linux, FreeBSD, IRIX, Tru64 */
-
-  /* We must also have acl_from_text and acl_delete_def_file.
-     (acl_delete_def_file could be emulated with acl_init followed
-      by acl_set_file, but acl_set_file with an empty acl is
-      unspecified.)  */
-
-#   ifndef HAVE_ACL_FROM_TEXT
-#    error Must have acl_from_text (see POSIX 1003.1e draft 17).
-#   endif
-#   ifndef HAVE_ACL_DELETE_DEF_FILE
-#    error Must have acl_delete_def_file (see POSIX 1003.1e draft 17).
-#   endif
-
-  acl_t acl;
-  int ret;
-
-  if (HAVE_ACL_FROM_MODE) /* Linux */
-    {
-      acl = acl_from_mode (mode);
-      if (!acl)
-        return -1;
-    }
-  else /* FreeBSD, IRIX, Tru64 */
-    {
-      /* If we were to create the ACL using the functions acl_init(),
-         acl_create_entry(), acl_set_tag_type(), acl_set_qualifier(),
-         acl_get_permset(), acl_clear_perm[s](), acl_add_perm(), we
-         would need to create a qualifier.  I don't know how to do this.
-         So create it using acl_from_text().  */
-
-#   if HAVE_ACL_FREE_TEXT /* Tru64 */
-      char acl_text[] = "u::---,g::---,o::---,";
-#   else /* FreeBSD, IRIX */
-      char acl_text[] = "u::---,g::---,o::---";
-#   endif
-
-      if (mode & S_IRUSR) acl_text[ 3] = 'r';
-      if (mode & S_IWUSR) acl_text[ 4] = 'w';
-      if (mode & S_IXUSR) acl_text[ 5] = 'x';
-      if (mode & S_IRGRP) acl_text[10] = 'r';
-      if (mode & S_IWGRP) acl_text[11] = 'w';
-      if (mode & S_IXGRP) acl_text[12] = 'x';
-      if (mode & S_IROTH) acl_text[17] = 'r';
-      if (mode & S_IWOTH) acl_text[18] = 'w';
-      if (mode & S_IXOTH) acl_text[19] = 'x';
-
-      acl = acl_from_text (acl_text);
-      if (!acl)
-        return -1;
-    }
-  if (HAVE_ACL_SET_FD && desc != -1)
-    ret = acl_set_fd (desc, acl);
-  else
-    ret = acl_set_file (name, ACL_TYPE_ACCESS, acl);
-  if (ret != 0)
-    {
-      int saved_errno = errno;
-      acl_free (acl);
-      if (! acl_errno_valid (errno))
-        return chmod_or_fchmod (name, desc, mode);
-      errno = saved_errno;
-      return -1;
-    }
-  else
-    acl_free (acl);
-
-  if (S_ISDIR (mode) && acl_delete_def_file (name))
-    return -1;
-
-  if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX)))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-      return chmod_or_fchmod (name, desc, mode);
-    }
-  return 0;
-
-#  else /* HAVE_ACL_TYPE_EXTENDED */
-  /* Mac OS X */
-
-  /* On Mac OS X,  acl_get_file (name, ACL_TYPE_ACCESS)
-     and           acl_get_file (name, ACL_TYPE_DEFAULT)
-     always return NULL / EINVAL.  You have to use
-                   acl_get_file (name, ACL_TYPE_EXTENDED)
-     or            acl_get_fd (open (name, ...))
-     to retrieve an ACL.
-     On the other hand,
-                   acl_set_file (name, ACL_TYPE_ACCESS, acl)
-     and           acl_set_file (name, ACL_TYPE_DEFAULT, acl)
-     have the same effect as
-                   acl_set_file (name, ACL_TYPE_EXTENDED, acl):
-     Each of these calls sets the file's ACL.  */
-
-  acl_t acl;
-  int ret;
-
-  /* Remove the ACL if the file has ACLs.  */
-  if (HAVE_ACL_GET_FD && desc != -1)
-    acl = acl_get_fd (desc);
-  else
-    acl = acl_get_file (name, ACL_TYPE_EXTENDED);
-  if (acl)
-    {
-      acl_free (acl);
-
-      acl = acl_init (0);
-      if (acl)
-        {
-          if (HAVE_ACL_SET_FD && desc != -1)
-            ret = acl_set_fd (desc, acl);
-          else
-            ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl);
-          if (ret != 0)
-            {
-              int saved_errno = errno;
-              acl_free (acl);
-              if (! acl_errno_valid (saved_errno))
-                return chmod_or_fchmod (name, desc, mode);
-              errno = saved_errno;
-              return -1;
-            }
-          acl_free (acl);
-        }
-    }
-
-  /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly.  */
-  return chmod_or_fchmod (name, desc, mode);
-#  endif
-
-# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
-
-  int done_setacl = 0;
-
-#  ifdef ACE_GETACL
-  /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
-     file systems (whereas the other ones are used in UFS file systems).  */
-
-  /* The flags in the ace_t structure changed in a binary incompatible way
-     when ACL_NO_TRIVIAL etc. were introduced in <sys/acl.h> version 1.15.
-     How to distinguish the two conventions at runtime?
-     We fetch the existing ACL.  In the old convention, usually three ACEs have
-     a_flags = ACE_OWNER / ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400.
-     In the new convention, these values are not used.  */
-  int convention;
-
-  {
-    /* Initially, try to read the entries into a stack-allocated buffer.
-       Use malloc if it does not fit.  */
-    enum
-      {
-        alloc_init = 4000 / sizeof (ace_t), /* >= 3 */
-        alloc_max = MIN (INT_MAX, SIZE_MAX / sizeof (ace_t))
-      };
-    ace_t buf[alloc_init];
-    size_t alloc = alloc_init;
-    ace_t *entries = buf;
-    ace_t *malloced = NULL;
-    int count;
-
-    for (;;)
-      {
-        count = (desc != -1
-                 ? facl (desc, ACE_GETACL, alloc, entries)
-                 : acl (name, ACE_GETACL, alloc, entries));
-        if (count < 0 && errno == ENOSPC)
-          {
-            /* Increase the size of the buffer.  */
-            free (malloced);
-            if (alloc > alloc_max / 2)
-              {
-                errno = ENOMEM;
-                return -1;
-              }
-            alloc = 2 * alloc; /* <= alloc_max */
-            entries = malloced = (ace_t *) malloc (alloc * sizeof (ace_t));
-            if (entries == NULL)
-              {
-                errno = ENOMEM;
-                return -1;
-              }
-            continue;
-          }
-        break;
-      }
-
-    if (count <= 0)
-      convention = -1;
-    else
-      {
-        int i;
-
-        convention = 0;
-        for (i = 0; i < count; i++)
-          if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER))
-            {
-              convention = 1;
-              break;
-            }
-      }
-    free (malloced);
-  }
-
-  if (convention >= 0)
-    {
-      ace_t entries[6];
-      int count;
-      int ret;
-
-      if (convention)
-        {
-          /* Running on Solaris 10.  */
-          entries[0].a_type = OLD_ALLOW;
-          entries[0].a_flags = OLD_ACE_OWNER;
-          entries[0].a_who = 0; /* irrelevant */
-          entries[0].a_access_mask = (mode >> 6) & 7;
-          entries[1].a_type = OLD_ALLOW;
-          entries[1].a_flags = OLD_ACE_GROUP;
-          entries[1].a_who = 0; /* irrelevant */
-          entries[1].a_access_mask = (mode >> 3) & 7;
-          entries[2].a_type = OLD_ALLOW;
-          entries[2].a_flags = OLD_ACE_OTHER;
-          entries[2].a_who = 0;
-          entries[2].a_access_mask = mode & 7;
-          count = 3;
-        }
-      else
-        {
-          /* Running on Solaris 10 (newer version) or Solaris 11.
-             The details here were found through "/bin/ls -lvd somefiles".  */
-          entries[0].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE;
-          entries[0].a_flags = NEW_ACE_OWNER;
-          entries[0].a_who = 0; /* irrelevant */
-          entries[0].a_access_mask = 0;
-          entries[1].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE;
-          entries[1].a_flags = NEW_ACE_OWNER;
-          entries[1].a_who = 0; /* irrelevant */
-          entries[1].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS
-                                     | NEW_ACE_WRITE_ATTRIBUTES
-                                     | NEW_ACE_WRITE_ACL
-                                     | NEW_ACE_WRITE_OWNER;
-          if (mode & 0400)
-            entries[1].a_access_mask |= NEW_ACE_READ_DATA;
-          else
-            entries[0].a_access_mask |= NEW_ACE_READ_DATA;
-          if (mode & 0200)
-            entries[1].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA;
-          else
-            entries[0].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA;
-          if (mode & 0100)
-            entries[1].a_access_mask |= NEW_ACE_EXECUTE;
-          else
-            entries[0].a_access_mask |= NEW_ACE_EXECUTE;
-          entries[2].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE;
-          entries[2].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP;
-          entries[2].a_who = 0; /* irrelevant */
-          entries[2].a_access_mask = 0;
-          entries[3].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE;
-          entries[3].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP;
-          entries[3].a_who = 0; /* irrelevant */
-          entries[3].a_access_mask = 0;
-          if (mode & 0040)
-            entries[3].a_access_mask |= NEW_ACE_READ_DATA;
-          else
-            entries[2].a_access_mask |= NEW_ACE_READ_DATA;
-          if (mode & 0020)
-            entries[3].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA;
-          else
-            entries[2].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA;
-          if (mode & 0010)
-            entries[3].a_access_mask |= NEW_ACE_EXECUTE;
-          else
-            entries[2].a_access_mask |= NEW_ACE_EXECUTE;
-          entries[4].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE;
-          entries[4].a_flags = NEW_ACE_EVERYONE;
-          entries[4].a_who = 0;
-          entries[4].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS
-                                     | NEW_ACE_WRITE_ATTRIBUTES
-                                     | NEW_ACE_WRITE_ACL
-                                     | NEW_ACE_WRITE_OWNER;
-          entries[5].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE;
-          entries[5].a_flags = NEW_ACE_EVERYONE;
-          entries[5].a_who = 0;
-          entries[5].a_access_mask = NEW_ACE_READ_NAMED_ATTRS
-                                     | NEW_ACE_READ_ATTRIBUTES
-                                     | NEW_ACE_READ_ACL
-                                     | NEW_ACE_SYNCHRONIZE;
-          if (mode & 0004)
-            entries[5].a_access_mask |= NEW_ACE_READ_DATA;
-          else
-            entries[4].a_access_mask |= NEW_ACE_READ_DATA;
-          if (mode & 0002)
-            entries[5].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA;
-          else
-            entries[4].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA;
-          if (mode & 0001)
-            entries[5].a_access_mask |= NEW_ACE_EXECUTE;
-          else
-            entries[4].a_access_mask |= NEW_ACE_EXECUTE;
-          count = 6;
-        }
-      if (desc != -1)
-        ret = facl (desc, ACE_SETACL, count, entries);
-      else
-        ret = acl (name, ACE_SETACL, count, entries);
-      if (ret < 0 && errno != EINVAL && errno != ENOTSUP)
-        {
-          if (errno == ENOSYS)
-            return chmod_or_fchmod (name, desc, mode);
-          return -1;
-        }
-      if (ret == 0)
-        done_setacl = 1;
-    }
-#  endif
-
-  if (!done_setacl)
-    {
-      aclent_t entries[3];
-      int ret;
-
-      entries[0].a_type = USER_OBJ;
-      entries[0].a_id = 0; /* irrelevant */
-      entries[0].a_perm = (mode >> 6) & 7;
-      entries[1].a_type = GROUP_OBJ;
-      entries[1].a_id = 0; /* irrelevant */
-      entries[1].a_perm = (mode >> 3) & 7;
-      entries[2].a_type = OTHER_OBJ;
-      entries[2].a_id = 0;
-      entries[2].a_perm = mode & 7;
-
-      if (desc != -1)
-        ret = facl (desc, SETACL,
-                    sizeof (entries) / sizeof (aclent_t), entries);
-      else
-        ret = acl (name, SETACL,
-                   sizeof (entries) / sizeof (aclent_t), entries);
-      if (ret < 0)
-        {
-          if (errno == ENOSYS || errno == EOPNOTSUPP)
-            return chmod_or_fchmod (name, desc, mode);
-          return -1;
-        }
-    }
-
-  if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX)))
-    {
-      /* We did not call chmod so far, so the special bits have not yet
-         been set.  */
-      return chmod_or_fchmod (name, desc, mode);
-    }
-  return 0;
-
-# elif HAVE_GETACL /* HP-UX */
-
-  struct stat statbuf;
-  int ret;
-
-  if (desc != -1)
-    ret = fstat (desc, &statbuf);
-  else
-    ret = stat (name, &statbuf);
-  if (ret < 0)
-    return -1;
-
-  {
-    struct acl_entry entries[3];
-
-    entries[0].uid = statbuf.st_uid;
-    entries[0].gid = ACL_NSGROUP;
-    entries[0].mode = (mode >> 6) & 7;
-    entries[1].uid = ACL_NSUSER;
-    entries[1].gid = statbuf.st_gid;
-    entries[1].mode = (mode >> 3) & 7;
-    entries[2].uid = ACL_NSUSER;
-    entries[2].gid = ACL_NSGROUP;
-    entries[2].mode = mode & 7;
-
-    if (desc != -1)
-      ret = fsetacl (desc, sizeof (entries) / sizeof (struct acl_entry), entries);
-    else
-      ret = setacl (name, sizeof (entries) / sizeof (struct acl_entry), entries);
-  }
-  if (ret < 0)
-    {
-      if (!(errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP))
-        return -1;
-
-#  if HAVE_ACLV_H /* HP-UX >= 11.11 */
-      {
-        struct acl entries[4];
-
-        entries[0].a_type = USER_OBJ;
-        entries[0].a_id = 0; /* irrelevant */
-        entries[0].a_perm = (mode >> 6) & 7;
-        entries[1].a_type = GROUP_OBJ;
-        entries[1].a_id = 0; /* irrelevant */
-        entries[1].a_perm = (mode >> 3) & 7;
-        entries[2].a_type = CLASS_OBJ;
-        entries[2].a_id = 0;
-        entries[2].a_perm = (mode >> 3) & 7;
-        entries[3].a_type = OTHER_OBJ;
-        entries[3].a_id = 0;
-        entries[3].a_perm = mode & 7;
-
-        ret = aclsort (sizeof (entries) / sizeof (struct acl), 1, entries);
-        if (ret > 0)
-          abort ();
-        if (ret < 0)
-          {
-            if (0)
-              return chmod_or_fchmod (name, desc, mode);
-            return -1;
-          }
-
-        ret = acl ((char *) name, ACL_SET,
-                   sizeof (entries) / sizeof (struct acl), entries);
-        if (ret < 0)
-          {
-            if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-              return chmod_or_fchmod (name, desc, mode);
-            return -1;
-          }
-      }
-#  else
-      return chmod_or_fchmod (name, desc, mode);
-#  endif
-    }
-
-  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-    {
-      /* We did not call chmod so far, so the special bits have not yet
-         been set.  */
-      return chmod_or_fchmod (name, desc, mode);
-    }
-  return 0;
-
-# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */
-
-  acl_type_list_t types;
-  size_t types_size = sizeof (types);
-  acl_type_t type;
-
-  if (aclx_gettypes (name, &types, &types_size) < 0
-      || types.num_entries == 0)
-    return chmod_or_fchmod (name, desc, mode);
-
-  /* XXX Do we need to clear all types of ACLs for the given file, or is it
-     sufficient to clear the first one?  */
-  type = types.entries[0];
-  if (type.u64 == ACL_AIXC)
-    {
-      union { struct acl a; char room[128]; } u;
-      int ret;
-
-      u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */
-      u.a.acl_mode = mode & ~(S_IXACL | 0777);
-      u.a.u_access = (mode >> 6) & 7;
-      u.a.g_access = (mode >> 3) & 7;
-      u.a.o_access = mode & 7;
-
-      if (desc != -1)
-        ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS,
-                         type, &u.a, u.a.acl_len, mode);
-      else
-        ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS,
-                        type, &u.a, u.a.acl_len, mode);
-      if (!(ret < 0 && errno == ENOSYS))
-        return ret;
-    }
-  else if (type.u64 == ACL_NFS4)
-    {
-      union { nfs4_acl_int_t a; char room[128]; } u;
-      nfs4_ace_int_t *ace;
-      int ret;
-
-      u.a.aclVersion = NFS4_ACL_INT_STRUCT_VERSION;
-      u.a.aclEntryN = 0;
-      ace = &u.a.aclEntry[0];
-      {
-        ace->flags = ACE4_ID_SPECIAL;
-        ace->aceWho.special_whoid = ACE4_WHO_OWNER;
-        ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE;
-        ace->aceFlags = 0;
-        ace->aceMask =
-          (mode & 0400 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0)
-          | (mode & 0200
-             ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA
-               | ACE4_ADD_SUBDIRECTORY
-             : 0)
-          | (mode & 0100 ? ACE4_EXECUTE : 0);
-        ace->aceWhoString[0] = '\0';
-        ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace;
-        ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4];
-        u.a.aclEntryN++;
-      }
-      {
-        ace->flags = ACE4_ID_SPECIAL;
-        ace->aceWho.special_whoid = ACE4_WHO_GROUP;
-        ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE;
-        ace->aceFlags = 0;
-        ace->aceMask =
-          (mode & 0040 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0)
-          | (mode & 0020
-             ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA
-               | ACE4_ADD_SUBDIRECTORY
-             : 0)
-          | (mode & 0010 ? ACE4_EXECUTE : 0);
-        ace->aceWhoString[0] = '\0';
-        ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace;
-        ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4];
-        u.a.aclEntryN++;
-      }
-      {
-        ace->flags = ACE4_ID_SPECIAL;
-        ace->aceWho.special_whoid = ACE4_WHO_EVERYONE;
-        ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE;
-        ace->aceFlags = 0;
-        ace->aceMask =
-          (mode & 0004 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0)
-          | (mode & 0002
-             ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA
-               | ACE4_ADD_SUBDIRECTORY
-             : 0)
-          | (mode & 0001 ? ACE4_EXECUTE : 0);
-        ace->aceWhoString[0] = '\0';
-        ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace;
-        ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4];
-        u.a.aclEntryN++;
-      }
-      u.a.aclLength = (char *) ace - (char *) &u.a;
-
-      if (desc != -1)
-        ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS,
-                         type, &u.a, u.a.aclLength, mode);
-      else
-        ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS,
-                        type, &u.a, u.a.aclLength, mode);
-      if (!(ret < 0 && errno == ENOSYS))
-        return ret;
-    }
-
-  return chmod_or_fchmod (name, desc, mode);
-
-# elif HAVE_STATACL /* older AIX */
-
-  union { struct acl a; char room[128]; } u;
-  int ret;
-
-  u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */
-  u.a.acl_mode = mode & ~(S_IXACL | 0777);
-  u.a.u_access = (mode >> 6) & 7;
-  u.a.g_access = (mode >> 3) & 7;
-  u.a.o_access = mode & 7;
-
-  if (desc != -1)
-    ret = fchacl (desc, &u.a, u.a.acl_len);
-  else
-    ret = chacl (name, &u.a, u.a.acl_len);
-
-  if (ret < 0 && errno == ENOSYS)
-    return chmod_or_fchmod (name, desc, mode);
-
-  return ret;
-
-# elif HAVE_ACLSORT /* NonStop Kernel */
-
-  struct acl entries[4];
-  int ret;
-
-  entries[0].a_type = USER_OBJ;
-  entries[0].a_id = 0; /* irrelevant */
-  entries[0].a_perm = (mode >> 6) & 7;
-  entries[1].a_type = GROUP_OBJ;
-  entries[1].a_id = 0; /* irrelevant */
-  entries[1].a_perm = (mode >> 3) & 7;
-  entries[2].a_type = CLASS_OBJ;
-  entries[2].a_id = 0;
-  entries[2].a_perm = (mode >> 3) & 7;
-  entries[3].a_type = OTHER_OBJ;
-  entries[3].a_id = 0;
-  entries[3].a_perm = mode & 7;
-
-  ret = aclsort (sizeof (entries) / sizeof (struct acl), 1, entries);
-  if (ret > 0)
-    abort ();
-  if (ret < 0)
-    {
-      if (0)
-        return chmod_or_fchmod (name, desc, mode);
-      return -1;
-    }
-
-  ret = acl ((char *) name, ACL_SET,
-             sizeof (entries) / sizeof (struct acl), entries);
-  if (ret < 0)
-    {
-      if (0)
-        return chmod_or_fchmod (name, desc, mode);
-      return -1;
-    }
-
-  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-    {
-      /* We did not call chmod so far, so the special bits have not yet
-         been set.  */
-      return chmod_or_fchmod (name, desc, mode);
-    }
-  return 0;
-
-# else /* Unknown flavor of ACLs */
-  return chmod_or_fchmod (name, desc, mode);
-# endif
-#else /* !USE_ACL */
-  return chmod_or_fchmod (name, desc, mode);
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/quotearg.c gettext-0.18.1.1/gettext-tools/gnulib-lib/quotearg.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/quotearg.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/quotearg.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,7 @@
 /* quotearg.c - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,21 +18,11 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-/* Without this pragma, gcc 4.7.0 20111124 mistakenly suggests that
-   the quoting_options_from_style function might be candidate for
-   attribute 'pure'  */
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-# pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
-#endif
-
 #include <config.h>
 
 #include "quotearg.h"
-#include "quote.h"
 
 #include "xalloc.h"
-#include "c-strcaseeq.h"
-#include "localcharset.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -175,54 +166,25 @@
 }
 
 /* Return quoting options for STYLE, with no extra quoting.  */
-static struct quoting_options /* NOT PURE!! */
+static struct quoting_options
 quoting_options_from_style (enum quoting_style style)
 {
-  struct quoting_options o = { literal_quoting_style, 0, { 0 }, NULL, NULL };
-  if (style == custom_quoting_style)
-    abort ();
+  struct quoting_options o;
   o.style = style;
+  o.flags = 0;
+  memset (o.quote_these_too, 0, sizeof o.quote_these_too);
   return o;
 }
 
 /* MSGID approximates a quotation mark.  Return its translation if it
-   has one; otherwise, return either it or "\"", depending on S.
-
-   S is either clocale_quoting_style or locale_quoting_style.  */
+   has one; otherwise, return either it or "\"", depending on S.  */
 static char const *
 gettext_quote (char const *msgid, enum quoting_style s)
 {
   char const *translation = _(msgid);
-  char const *locale_code;
-
-  if (translation != msgid)
-    return translation;
-
-  /* For UTF-8 and GB-18030, use single quotes U+2018 and U+2019.
-     Here is a list of other locales that include U+2018 and U+2019:
-
-        ISO-8859-7   0xA1                 KOI8-T       0x91
-        CP869        0x8B                 CP874        0x91
-        CP932        0x81 0x65            CP936        0xA1 0xAE
-        CP949        0xA1 0xAE            CP950        0xA1 0xA5
-        CP1250       0x91                 CP1251       0x91
-        CP1252       0x91                 CP1253       0x91
-        CP1254       0x91                 CP1255       0x91
-        CP1256       0x91                 CP1257       0x91
-        EUC-JP       0xA1 0xC6            EUC-KR       0xA1 0xAE
-        EUC-TW       0xA1 0xE4            BIG5         0xA1 0xA5
-        BIG5-HKSCS   0xA1 0xA5            EUC-CN       0xA1 0xAE
-        GBK          0xA1 0xAE            Georgian-PS  0x91
-        PT154        0x91
-
-     None of these is still in wide use; using iconv is overkill.  */
-  locale_code = locale_charset ();
-  if (STRCASEEQ (locale_code, "UTF-8", 'U','T','F','-','8',0,0,0,0))
-    return msgid[0] == '`' ? "\xe2\x80\x98": "\xe2\x80\x99";
-  if (STRCASEEQ (locale_code, "GB18030", 'G','B','1','8','0','3','0',0,0))
-    return msgid[0] == '`' ? "\xa1\ae": "\xa1\xaf";
-
-  return (s == clocale_quoting_style ? "\"" : "'");
+  if (translation == msgid && s == clocale_quoting_style)
+    translation = "\"";
+  return translation;
 }
 
 /* Place into buffer BUFFER (of size BUFFERSIZE) a quoted version of
@@ -290,24 +252,22 @@
           {
             /* TRANSLATORS:
                Get translations for open and closing quotation marks.
+
                The message catalog should translate "`" to a left
                quotation mark suitable for the locale, and similarly for
-               "'".  For example, a French Unicode local should translate
-               these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-               QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-               QUOTATION MARK), respectively.
-
-               If the catalog has no translation, we will try to
-               use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-               Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-               current locale is not Unicode, locale_quoting_style
-               will quote 'like this', and clocale_quoting_style will
-               quote "like this".  You should always include translations
-               for "`" and "'" even if U+2018 and U+2019 are appropriate
-               for your locale.
+               "'".  If the catalog has no translation,
+               locale_quoting_style quotes `like this', and
+               clocale_quoting_style quotes "like this".
+
+               For example, an American English Unicode locale should
+               translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+               should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+               MARK).  A British English Unicode locale should instead
+               translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+               and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 
                If you don't know what to put here, please see
-               <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+               <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
                and use glyphs suitable for your language.  */
             left_quote = gettext_quote (N_("`"), quoting_style);
             right_quote = gettext_quote (N_("'"), quoting_style);
@@ -348,12 +308,7 @@
 
       if (backslash_escapes
           && quote_string_len
-          && (i + quote_string_len
-              <= (argsize == SIZE_MAX && 1 < quote_string_len
-                  /* Use strlen only if we must: when argsize is SIZE_MAX,
-                     and when the quote string is more than 1 byte long.
-                     If we do call strlen, save the result.  */
-                  ? (argsize = strlen (arg)) : argsize))
+          && i + quote_string_len <= argsize
           && memcmp (arg + i, quote_string, quote_string_len) == 0)
         {
           if (elide_outer_quotes)
@@ -626,7 +581,7 @@
 
       if (! ((backslash_escapes || elide_outer_quotes)
              && quote_these_too
-             && quote_these_too[c / INT_BITS] >> (c % INT_BITS) & 1)
+             && quote_these_too[c / INT_BITS] & (1 << (c % INT_BITS)))
           && !is_right_quote)
         goto store_c;
 
@@ -776,7 +731,7 @@
 
   if (nslots <= n0)
     {
-      /* FIXME: technically, the type of n1 should be 'unsigned int',
+      /* FIXME: technically, the type of n1 should be `unsigned int',
          but that evokes an unsuppressible warning from gcc-4.0.1 and
          older.  If gcc ever provides an option to suppress that warning,
          revert to the original type, so that the test in xalloc_oversized
@@ -932,37 +887,3 @@
   return quotearg_n_custom_mem (0, left_quote, right_quote, arg,
                                 argsize);
 }
-
-
-/* The quoting option used by the functions of quote.h.  */
-struct quoting_options quote_quoting_options =
-  {
-    locale_quoting_style,
-    0,
-    { 0 },
-    NULL, NULL
-  };
-
-char const *
-quote_n_mem (int n, char const *arg, size_t argsize)
-{
-  return quotearg_n_options (n, arg, argsize, &quote_quoting_options);
-}
-
-char const *
-quote_mem (char const *arg, size_t argsize)
-{
-  return quote_n_mem (0, arg, argsize);
-}
-
-char const *
-quote_n (int n, char const *arg)
-{
-  return quote_n_mem (n, arg, SIZE_MAX);
-}
-
-char const *
-quote (char const *arg)
-{
-  return quote_n (0, arg);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/quotearg.h gettext-0.18.1.1/gettext-tools/gnulib-lib/quotearg.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/quotearg.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/quotearg.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,7 +1,7 @@
 /* quotearg.h - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -112,10 +112,8 @@
     */
     escape_quoting_style,
 
-    /* Like clocale_quoting_style, but use single quotes in the
-       default C locale or if the program does not use gettext
-       (ls --quoting-style=locale).  For UTF-8 locales, quote
-       characters will use Unicode.
+    /* Like clocale_quoting_style, but quote `like this' instead of
+       "like this" in the default C locale (ls --quoting-style=locale).
 
        LC_MESSAGES=C
        quotearg_buffer:
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/quote.c gettext-0.18.1.1/gettext-tools/gnulib-lib/quote.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/quote.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/quote.c	2010-05-24 09:42:46.000000000 +0000
@@ -0,0 +1,40 @@
+/* quote.c - quote arguments for output
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2009, 2010 Free
+   Software Foundation, Inc.
+
+   This 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 Paul Eggert <eggert@twinsun.com> */
+
+#include <config.h>
+
+#include "quotearg.h"
+#include "quote.h"
+
+/* Return an unambiguous printable representation of NAME,
+   allocated in slot N, suitable for diagnostics.  */
+char const *
+quote_n (int n, char const *name)
+{
+  return quotearg_n_style (n, locale_quoting_style, name);
+}
+
+/* Return an unambiguous printable representation of NAME,
+   suitable for diagnostics.  */
+char const *
+quote (char const *name)
+{
+  return quote_n (0, name);
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/quote.h gettext-0.18.1.1/gettext-tools/gnulib-lib/quote.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/quote.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/quote.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,7 @@
 /* quote.h - prototypes for quote.c
 
-   Copyright (C) 1998-2001, 2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,32 +16,6 @@
    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 QUOTE_H_
-# define QUOTE_H_ 1
 
-# include <stddef.h>
-
-/* The quoting options used by quote_n and quote.  Its type is incomplete,
-   so it's useful only in expressions like '&quote_quoting_options'.  */
-extern struct quoting_options quote_quoting_options;
-
-/* Return an unambiguous printable representation of ARG (of size
-   ARGSIZE), allocated in slot N, suitable for diagnostics.  If
-   ARGSIZE is SIZE_MAX, use the string length of the argument for
-   ARGSIZE.  */
-char const *quote_n_mem (int n, char const *arg, size_t argsize);
-
-/* Return an unambiguous printable representation of ARG (of size
-   ARGSIZE), suitable for diagnostics.  If ARGSIZE is SIZE_MAX, use
-   the string length of the argument for ARGSIZE.  */
-char const *quote_mem (char const *arg, size_t argsize);
-
-/* Return an unambiguous printable representation of ARG, allocated in
-   slot N, suitable for diagnostics.  */
-char const *quote_n (int n, char const *arg);
-
-/* Return an unambiguous printable representation of ARG, suitable for
-   diagnostics.  */
-char const *quote (char const *arg);
-
-#endif /* !QUOTE_H_ */
+char const *quote_n (int n, char const *name);
+char const *quote (char const *name);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/raise.c gettext-0.18.1.1/gettext-tools/gnulib-lib/raise.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/raise.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/raise.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/* Provide a non-threads replacement for the POSIX raise function.
-
-   Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 and Bruno Haible */
-
-#include <config.h>
-
-/* Specification.  */
-#include <signal.h>
-
-#if HAVE_RAISE
-/* Native Windows platform.  */
-
-# include <errno.h>
-
-# include "msvc-inval.h"
-
-# undef raise
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-raise_nothrow (int sig)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = raise (sig);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EINVAL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# else
-#  define raise_nothrow raise
-# endif
-
-#else
-/* An old Unix platform.  */
-
-# include <unistd.h>
-
-# define rpl_raise raise
-
-#endif
-
-int
-rpl_raise (int sig)
-{
-#if GNULIB_defined_signal_blocking && GNULIB_defined_SIGPIPE
-  if (sig == SIGPIPE)
-    return _gl_raise_SIGPIPE ();
-#endif
-
-#if HAVE_RAISE
-  return raise_nothrow (sig);
-#else
-  return kill (getpid (), sig);
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/rawmemchr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/rawmemchr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/rawmemchr.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/rawmemchr.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/read.c gettext-0.18.1.1/gettext-tools/gnulib-lib/read.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/read.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/read.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/* POSIX compatible read() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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>
-
-/* Specification.  */
-#include <unistd.h>
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-# include <errno.h>
-# include <io.h>
-
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-
-# include "msvc-inval.h"
-# include "msvc-nothrow.h"
-
-# undef read
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static ssize_t
-read_nothrow (int fd, void *buf, size_t count)
-{
-  ssize_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = read (fd, buf, count);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# else
-#  define read_nothrow read
-# endif
-
-ssize_t
-rpl_read (int fd, void *buf, size_t count)
-{
-  ssize_t ret = read_nothrow (fd, buf, count);
-
-# if GNULIB_NONBLOCKING
-  if (ret < 0
-      && GetLastError () == ERROR_NO_DATA)
-    {
-      HANDLE h = (HANDLE) _get_osfhandle (fd);
-      if (GetFileType (h) == FILE_TYPE_PIPE)
-        {
-          /* h is a pipe or socket.  */
-          DWORD state;
-          if (GetNamedPipeHandleState (h, &state, NULL, NULL, NULL, NULL, 0)
-              && (state & PIPE_NOWAIT) != 0)
-            /* h is a pipe in non-blocking mode.
-               Change errno from EINVAL to EAGAIN.  */
-            errno = EAGAIN;
-        }
-    }
-# endif
-
-  return ret;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/readdir.c gettext-0.18.1.1/gettext-tools/gnulib-lib/readdir.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/readdir.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/readdir.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/* Read the next entry of a directory.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <dirent.h>
-
-#include <errno.h>
-#include <stddef.h>
-
-#include "dirent-private.h"
-
-struct dirent *
-readdir (DIR *dirp)
-{
-  char type;
-  struct dirent *result;
-
-  /* There is no need to add code to produce entries for "." and "..".
-     According to the POSIX:2008 section "4.12 Pathname Resolution"
-     <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html>
-     "." and ".." are syntactic entities.
-     POSIX also says:
-       "If entries for dot or dot-dot exist, one entry shall be returned
-        for dot and one entry shall be returned for dot-dot; otherwise,
-        they shall not be returned."  */
-
-  switch (dirp->status)
-    {
-    case -2:
-      /* End of directory already reached.  */
-      return NULL;
-    case -1:
-      break;
-    case 0:
-      if (!FindNextFile (dirp->current, &dirp->entry))
-        {
-          switch (GetLastError ())
-            {
-            case ERROR_NO_MORE_FILES:
-              dirp->status = -2;
-              return NULL;
-            default:
-              errno = EIO;
-              return NULL;
-            }
-        }
-      break;
-    default:
-      errno = dirp->status;
-      return NULL;
-    }
-
-  dirp->status = 0;
-
-  if (dirp->entry.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-    type = DT_DIR;
-  else if (dirp->entry.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
-    type = DT_LNK;
-  else if ((dirp->entry.dwFileAttributes
-            & ~(FILE_ATTRIBUTE_READONLY
-                | FILE_ATTRIBUTE_HIDDEN
-                | FILE_ATTRIBUTE_SYSTEM
-                | FILE_ATTRIBUTE_ARCHIVE
-                | FILE_ATTRIBUTE_NORMAL
-                | FILE_ATTRIBUTE_TEMPORARY
-                | FILE_ATTRIBUTE_SPARSE_FILE
-                | FILE_ATTRIBUTE_COMPRESSED
-                | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
-                | FILE_ATTRIBUTE_ENCRYPTED)) == 0)
-    /* Devices like COM1, LPT1, NUL would also have the attributes 0x20 but
-       they cannot occur here.  */
-    type = DT_REG;
-  else
-    type = DT_UNKNOWN;
-
-  /* Reuse the memory of dirp->entry for the result.  */
-  result =
-    (struct dirent *)
-    ((char *) dirp->entry.cFileName - offsetof (struct dirent, d_name[0]));
-  result->d_type = type;
-
-  return result;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/readlink.c gettext-0.18.1.1/gettext-tools/gnulib-lib/readlink.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/readlink.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/readlink.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/realloc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/realloc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/realloc.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/realloc.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* realloc() function that is glibc compatible.
 
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2014 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -18,27 +18,36 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
 #ifdef realloc
 # define NEED_REALLOC_GNU 1
-/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU.  */
-#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU
-# define NEED_REALLOC_GNU 1
 #endif
 
 /* Infer the properties of the system's malloc function.
-   The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
-#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU
+   Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
+#if GNULIB_MALLOC_GNU && !defined malloc
 # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
 #endif
 
+/* Below we want to call the system's malloc and realloc.
+   Undefine the symbols here so that including <stdlib.h> provides a
+   declaration of malloc(), not of rpl_malloc(), and likewise for realloc.  */
+#undef malloc
+#undef realloc
+
+/* Specification.  */
 #include <stdlib.h>
 
 #include <errno.h>
 
+/* Below we want to call the system's malloc and realloc.
+   Undefine the symbols, if they were defined by gnulib's <stdlib.h>
+   replacement.  */
+#undef malloc
+#undef realloc
+
 /* Change the size of an allocated block of memory P to N bytes,
    with error checking.  If N is zero, change it to 1.  If P is NULL,
    use malloc.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/ref-add.sin gettext-0.18.1.1/gettext-tools/gnulib-lib/ref-add.sin
--- gettext-0.19.3/gettext-tools/gnulib-lib/ref-add.sin	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/ref-add.sin	2010-05-24 10:59:08.000000000 +0000
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/ref-del.sin gettext-0.18.1.1/gettext-tools/gnulib-lib/ref-del.sin
--- gettext-0.19.3/gettext-tools/gnulib-lib/ref-del.sin	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/ref-del.sin	2010-05-24 10:59:08.000000000 +0000
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/relocatable.c gettext-0.18.1.1/gettext-tools/gnulib-lib/relocatable.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/relocatable.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/relocatable.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 
 /* Tell glibc's <stdio.h> to provide a prototype for getline().
@@ -23,7 +25,6 @@
 # define _GNU_SOURCE 1
 #endif
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -42,7 +43,7 @@
 # include "xalloc.h"
 #endif
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -69,8 +70,8 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -85,19 +86,6 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Whether to enable the more costly support for relocatable libraries.
-   It allows libraries to be have been installed with a different original
-   prefix than the program.  But it is quite costly, especially on Cygwin
-   platforms, see below.  Therefore we enable it by default only on native
-   Windows platforms.  */
-#ifndef ENABLE_COSTLY_RELOCATABLE
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-#  define ENABLE_COSTLY_RELOCATABLE 1
-# else
-#  define ENABLE_COSTLY_RELOCATABLE 0
-# endif
-#endif
-
 /* Original installation prefix.  */
 static char *orig_prefix;
 static size_t orig_prefix_len;
@@ -167,7 +155,7 @@
 #endif
 }
 
-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
 
 /* Convenience function:
    Computes the current installation prefix, based on the original
@@ -249,7 +237,7 @@
                often case-insensitive.  It's better to accept the comparison
                if the difference is only in case, rather than to fail.  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-            /* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
+            /* Win32, Cygwin, OS/2, DOS - case insignificant file system */
             if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
                 != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
               break;
@@ -297,17 +285,12 @@
 
 #endif /* !IN_LIBRARY || PIC */
 
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
 
 /* Full pathname of shared library, or NULL.  */
 static char *shared_library_fullname;
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-/* Native Windows only.
-   On Cygwin, it is better to use the Cygwin provided /proc interface, than
-   to use native Windows API and cygwin_conv_to_posix_path, because it
-   supports longer file names
-   (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 
 /* Determine the full pathname of the shared library when it is loaded.  */
 
@@ -329,23 +312,37 @@
         /* Shouldn't happen.  */
         return FALSE;
 
-      shared_library_fullname = strdup (location);
+      {
+#if defined __CYGWIN__
+        /* On Cygwin, we need to convert paths coming from Win32 system calls
+           to the Unix-like slashified notation.  */
+        static char location_as_posix_path[2 * MAX_PATH];
+        /* There's no error return defined for cygwin_conv_to_posix_path.
+           See cygwin-api/func-cygwin-conv-to-posix-path.html.
+           Does it overflow the buffer of expected size MAX_PATH or does it
+           truncate the path?  I don't know.  Let's catch both.  */
+        cygwin_conv_to_posix_path (location, location_as_posix_path);
+        location_as_posix_path[MAX_PATH - 1] = '\0';
+        if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+          /* A sign of buffer overflow or path truncation.  */
+          return FALSE;
+        shared_library_fullname = strdup (location_as_posix_path);
+#else
+        shared_library_fullname = strdup (location);
+#endif
+      }
     }
 
   return TRUE;
 }
 
-#else /* Unix */
+#else /* Unix except Cygwin */
 
 static void
 find_shared_library_fullname ()
 {
-#if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
-  /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
-     function.
-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
-     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
-     Cygwin 1.7.  */
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */
@@ -390,15 +387,15 @@
 #endif
 }
 
-#endif /* Native Windows / Unix */
+#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin, and native Windows.  */
+   Guaranteed to work only on Linux, Cygwin and Woe32.  */
 static char *
 get_shared_library_fullname ()
 {
-#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
   static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)
     {
@@ -418,7 +415,7 @@
 const char *
 relocate (const char *pathname)
 {
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
   static int initialized;
 
   /* Initialization code for a shared library.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/relocatable.h gettext-0.18.1.1/gettext-tools/gnulib-lib/relocatable.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/relocatable.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/relocatable.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _RELOCATABLE_H
 #define _RELOCATABLE_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/relocwrapper.c gettext-0.18.1.1/gettext-tools/gnulib-lib/relocwrapper.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/relocwrapper.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/relocwrapper.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
     -> progname
     -> progreloc
         -> areadlink
-           -> careadlinkat
-             -> allocator
            -> readlink
         -> canonicalize-lgpl
            -> malloca
@@ -29,6 +27,7 @@
     -> relocatable
     -> setenv
        -> malloca
+    -> strerror
     -> c-ctype
 
    Macros that need to be set while compiling this file:
@@ -44,7 +43,6 @@
    libc functions, no gettext(), no error(), no xmalloc(), no xsetenv().
  */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 #include <stdio.h>
@@ -56,10 +54,6 @@
 #include "progname.h"
 #include "relocatable.h"
 #include "c-ctype.h"
-#include "verify.h"
-
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef fprintf
 
 /* Return a copy of the filename, with an extra ".bin" at the end.
    More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}".  */
@@ -116,7 +110,7 @@
 /* List of directories that contain the libraries.  */
 static const char *libdirs[] = { LIBDIRS NULL };
 /* Verify that at least one directory is given.  */
-verify (sizeof (libdirs) / sizeof (libdirs[0]) > 1);
+typedef int verify1[2 * (sizeof (libdirs) / sizeof (libdirs[0]) > 1) - 1];
 
 /* Relocate the list of directories that contain the libraries.  */
 static void
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/rmdir.c gettext-0.18.1.1/gettext-tools/gnulib-lib/rmdir.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/rmdir.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/rmdir.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* Work around rmdir bugs.
 
-   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2014 Free Software
+   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -23,8 +23,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "dosname.h"
-
 #undef rmdir
 
 /* Remove directory DIR.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/safe-read.c gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-read.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/safe-read.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-read.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* An interface to read and write that retries after interrupts.
 
-   Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2014 Free Software
+   Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/safe-read.h gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-read.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/safe-read.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-read.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* An interface to read() that retries after interrupts.
-   Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,19 +14,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Some system calls may be interrupted and fail with errno = EINTR in the
-   following situations:
-     - The process is stopped and restarted (signal SIGSTOP and SIGCONT, user
-       types Ctrl-Z) on some platforms: Mac OS X.
-     - The process receives a signal for which a signal handler was installed
-       with sigaction() with an sa_flags field that does not contain
-       SA_RESTART.
-     - The process receives a signal for which a signal handler was installed
-       with signal() and for which no call to siginterrupt(sig,0) was done,
-       on some platforms: AIX, HP-UX, IRIX, OSF/1, Solaris.
-
-   This module provides a wrapper around read() that handles EINTR.  */
-
 #include <stddef.h>
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/safe-write.c gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-write.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/safe-write.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-write.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* An interface to write that retries after interrupts.
-   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/safe-write.h gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-write.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/safe-write.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/safe-write.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* An interface to write() that retries after interrupts.
-   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,19 +14,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Some system calls may be interrupted and fail with errno = EINTR in the
-   following situations:
-     - The process is stopped and restarted (signal SIGSTOP and SIGCONT, user
-       types Ctrl-Z) on some platforms: Mac OS X.
-     - The process receives a signal for which a signal handler was installed
-       with sigaction() with an sa_flags field that does not contain
-       SA_RESTART.
-     - The process receives a signal for which a signal handler was installed
-       with signal() and for which no call to siginterrupt(sig,0) was done,
-       on some platforms: AIX, HP-UX, IRIX, OSF/1, Solaris.
-
-   This module provides a wrapper around write() that handles EINTR.  */
-
 #include <stddef.h>
 
 #define SAFE_WRITE_ERROR ((size_t) -1)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sched.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sched.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sched.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sched.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Replacement <sched.h> for platforms that lack it.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,36 +14,26 @@
    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 _@GUARD_PREFIX@_SCHED_H
+#ifndef _GL_SCHED_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SCHED_H@
 # @INCLUDE_NEXT@ @NEXT_SCHED_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_SCHED_H
-#define _@GUARD_PREFIX@_SCHED_H
-
-/* Get pid_t.
-   This is needed on glibc 2.11 (see
-   glibc bug <http://sourceware.org/bugzilla/show_bug.cgi?id=13198>)
-   and Mac OS X 10.5.  */
-#include <sys/types.h>
+#ifndef _GL_SCHED_H
+#define _GL_SCHED_H
 
 #if !@HAVE_STRUCT_SCHED_PARAM@
 
-# if !GNULIB_defined_struct_sched_param
 struct sched_param
 {
   int sched_priority;
 };
-#  define GNULIB_defined_struct_sched_param 1
-# endif
 
 #endif
 
@@ -53,5 +43,5 @@
 # define SCHED_OTHER  0
 #endif
 
-#endif /* _@GUARD_PREFIX@_SCHED_H */
-#endif /* _@GUARD_PREFIX@_SCHED_H */
+#endif /* _GL_SCHED_H */
+#endif /* _GL_SCHED_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/secure_getenv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/secure_getenv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/secure_getenv.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/secure_getenv.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/* Look up an environment variable more securely.
-
-   Copyright 2013-2014 Free Software Foundation, Inc.
-
-   This 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 <stdlib.h>
-
-#if !HAVE___SECURE_GETENV
-# if HAVE_ISSETUGID
-#  include <unistd.h>
-# else
-#  undef issetugid
-#  define issetugid() 1
-# endif
-#endif
-
-char *
-secure_getenv (char const *name)
-{
-#if HAVE___SECURE_GETENV
-  return __secure_getenv (name);
-#else
-  if (issetugid ())
-    return 0;
-  return getenv (name);
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/set-acl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/set-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/set-acl.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/set-acl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* set-acl.c - set access control list equivalent to a mode
-
-   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert and Andreas Gruenbacher, and Bruno Haible.  */
-
-#include <config.h>
-
-#include "acl.h"
-
-#include <errno.h>
-
-#include "quote.h"
-#include "error.h"
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-
-/* Set the access control lists of a file. If DESC is a valid file
-   descriptor, use file descriptor operations where available, else use
-   filename based operations on NAME.  If access control lists are not
-   available, fchmod the target file to MODE.  Also sets the
-   non-permission bits of the destination file (S_ISUID, S_ISGID, S_ISVTX)
-   to those from MODE if any are set.
-   Return 0 if successful.  On failure, output a diagnostic, set errno and
-   return -1.  */
-
-int
-set_acl (char const *name, int desc, mode_t mode)
-{
-  int ret = qset_acl (name, desc, mode);
-  if (ret != 0)
-    error (0, errno, _("setting permissions for %s"), quote (name));
-  return ret;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/setenv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/setenv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/setenv.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/setenv.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2010 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
@@ -15,14 +15,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
-/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
-   optimizes away the name == NULL test below.  */
-# define _GL_ARG_NONNULL(params)
-
-# define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the name == NULL test below.  */
+#define _GL_ARG_NONNULL(params)
+
 #include <alloca.h>
 
 /* Specification.  */
@@ -49,7 +48,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of 'environ'.  */
+/* This lock protects against simultaneous modifications of `environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -103,11 +102,11 @@
 static char **last_environ;
 
 
-/* This function is used by 'setenv' and 'putenv'.  The difference between
+/* This function is used by `setenv' and `putenv'.  The difference between
    the two functions is that for the former must create a new string which
-   is then placed in the environment, while the argument of 'putenv'
+   is then placed in the environment, while the argument of `putenv'
    must be used directly.  This is all complicated by the fact that we try
-   to reuse values once generated for a 'setenv' call since we can never
+   to reuse values once generated for a `setenv' call since we can never
    free the strings.  */
 int
 __add_to_environ (const char *name, const char *value, const char *combined,
@@ -148,9 +147,6 @@
                    : realloc (last_environ, (size + 2) * sizeof (char *)));
       if (new_environ == NULL)
         {
-          /* It's easier to set errno to ENOMEM than to rely on the
-             'malloc-posix' and 'realloc-posix' gnulib modules.  */
-          __set_errno (ENOMEM);
           UNLOCK;
           return -1;
         }
@@ -299,7 +295,7 @@
   return __add_to_environ (name, value, NULL, replace);
 }
 
-/* The 'clearenv' was planned to be added to POSIX.1 but probably
+/* The `clearenv' was planned to be added to POSIX.1 but probably
    never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
    for Fortran 77) requires this function.  */
 int
@@ -350,9 +346,6 @@
 #if HAVE_SETENV
 
 # undef setenv
-# if !HAVE_DECL_SETENV
-extern int setenv (const char *, const char *, int);
-# endif
 # define STREQ(a, b) (strcmp (a, b) == 0)
 
 int
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/setlocale.c gettext-0.18.1.1/gettext-tools/gnulib-lib/setlocale.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/setlocale.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/setlocale.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,938 +0,0 @@
-/* Set the current locale.
-   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2009.  */
-
-#include <config.h>
-
-/* Override setlocale() so that when the default locale is requested
-   (locale = ""), the environment variables LC_ALL, LC_*, and LANG are
-   considered.
-   Also include all the functionality from libintl's setlocale() override.  */
-
-/* Please keep this file in sync with
-   gettext/gettext-runtime/intl/setlocale.c !  */
-
-/* Specification.  */
-#include <locale.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "localename.h"
-
-#if 1
-
-# undef setlocale
-
-/* Return string representation of locale category CATEGORY.  */
-static const char *
-category_to_name (int category)
-{
-  const char *retval;
-
-  switch (category)
-  {
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* The native Windows setlocale() function expects locale names of the form
-   "German" or "German_Germany" or "DEU", but not "de" or "de_DE".  We need
-   to convert the names from the form with ISO 639 language code and ISO 3166
-   country code to the form with English names or with three-letter identifier.
-   The three-letter identifiers known by a Windows XP SP2 or SP3 are:
-     AFK  Afrikaans_South Africa.1252
-     ARA  Arabic_Saudi Arabia.1256
-     ARB  Arabic_Lebanon.1256
-     ARE  Arabic_Egypt.1256
-     ARG  Arabic_Algeria.1256
-     ARH  Arabic_Bahrain.1256
-     ARI  Arabic_Iraq.1256
-     ARJ  Arabic_Jordan.1256
-     ARK  Arabic_Kuwait.1256
-     ARL  Arabic_Libya.1256
-     ARM  Arabic_Morocco.1256
-     ARO  Arabic_Oman.1256
-     ARQ  Arabic_Qatar.1256
-     ARS  Arabic_Syria.1256
-     ART  Arabic_Tunisia.1256
-     ARU  Arabic_U.A.E..1256
-     ARY  Arabic_Yemen.1256
-     AZE  Azeri (Latin)_Azerbaijan.1254
-     BEL  Belarusian_Belarus.1251
-     BGR  Bulgarian_Bulgaria.1251
-     BSB  Bosnian_Bosnia and Herzegovina.1250
-     BSC  Bosnian (Cyrillic)_Bosnia and Herzegovina.1250  (wrong encoding!)
-     CAT  Catalan_Spain.1252
-     CHH  Chinese_Hong Kong S.A.R..950
-     CHI  Chinese_Singapore.936
-     CHS  Chinese_People's Republic of China.936
-     CHT  Chinese_Taiwan.950
-     CSY  Czech_Czech Republic.1250
-     CYM  Welsh_United Kingdom.1252
-     DAN  Danish_Denmark.1252
-     DEA  German_Austria.1252
-     DEC  German_Liechtenstein.1252
-     DEL  German_Luxembourg.1252
-     DES  German_Switzerland.1252
-     DEU  German_Germany.1252
-     ELL  Greek_Greece.1253
-     ENA  English_Australia.1252
-     ENB  English_Caribbean.1252
-     ENC  English_Canada.1252
-     ENG  English_United Kingdom.1252
-     ENI  English_Ireland.1252
-     ENJ  English_Jamaica.1252
-     ENL  English_Belize.1252
-     ENP  English_Republic of the Philippines.1252
-     ENS  English_South Africa.1252
-     ENT  English_Trinidad and Tobago.1252
-     ENU  English_United States.1252
-     ENW  English_Zimbabwe.1252
-     ENZ  English_New Zealand.1252
-     ESA  Spanish_Panama.1252
-     ESB  Spanish_Bolivia.1252
-     ESC  Spanish_Costa Rica.1252
-     ESD  Spanish_Dominican Republic.1252
-     ESE  Spanish_El Salvador.1252
-     ESF  Spanish_Ecuador.1252
-     ESG  Spanish_Guatemala.1252
-     ESH  Spanish_Honduras.1252
-     ESI  Spanish_Nicaragua.1252
-     ESL  Spanish_Chile.1252
-     ESM  Spanish_Mexico.1252
-     ESN  Spanish_Spain.1252
-     ESO  Spanish_Colombia.1252
-     ESP  Spanish_Spain.1252
-     ESR  Spanish_Peru.1252
-     ESS  Spanish_Argentina.1252
-     ESU  Spanish_Puerto Rico.1252
-     ESV  Spanish_Venezuela.1252
-     ESY  Spanish_Uruguay.1252
-     ESZ  Spanish_Paraguay.1252
-     ETI  Estonian_Estonia.1257
-     EUQ  Basque_Spain.1252
-     FAR  Farsi_Iran.1256
-     FIN  Finnish_Finland.1252
-     FOS  Faroese_Faroe Islands.1252
-     FPO  Filipino_Philippines.1252
-     FRA  French_France.1252
-     FRB  French_Belgium.1252
-     FRC  French_Canada.1252
-     FRL  French_Luxembourg.1252
-     FRM  French_Principality of Monaco.1252
-     FRS  French_Switzerland.1252
-     FYN  Frisian_Netherlands.1252
-     GLC  Galician_Spain.1252
-     HEB  Hebrew_Israel.1255
-     HRB  Croatian_Bosnia and Herzegovina.1250
-     HRV  Croatian_Croatia.1250
-     HUN  Hungarian_Hungary.1250
-     IND  Indonesian_Indonesia.1252
-     IRE  Irish_Ireland.1252
-     ISL  Icelandic_Iceland.1252
-     ITA  Italian_Italy.1252
-     ITS  Italian_Switzerland.1252
-     IUK  Inuktitut (Latin)_Canada.1252
-     JPN  Japanese_Japan.932
-     KKZ  Kazakh_Kazakhstan.1251
-     KOR  Korean_Korea.949
-     KYR  Kyrgyz_Kyrgyzstan.1251
-     LBX  Luxembourgish_Luxembourg.1252
-     LTH  Lithuanian_Lithuania.1257
-     LVI  Latvian_Latvia.1257
-     MKI  FYRO Macedonian_Former Yugoslav Republic of Macedonia.1251
-     MON  Mongolian_Mongolia.1251
-     MPD  Mapudungun_Chile.1252
-     MSB  Malay_Brunei Darussalam.1252
-     MSL  Malay_Malaysia.1252
-     MWK  Mohawk_Canada.1252
-     NLB  Dutch_Belgium.1252
-     NLD  Dutch_Netherlands.1252
-     NON  Norwegian-Nynorsk_Norway.1252
-     NOR  Norwegian (Bokmål)_Norway.1252
-     NSO  Northern Sotho_South Africa.1252
-     PLK  Polish_Poland.1250
-     PTB  Portuguese_Brazil.1252
-     PTG  Portuguese_Portugal.1252
-     QUB  Quechua_Bolivia.1252
-     QUE  Quechua_Ecuador.1252
-     QUP  Quechua_Peru.1252
-     RMC  Romansh_Switzerland.1252
-     ROM  Romanian_Romania.1250
-     RUS  Russian_Russia.1251
-     SKY  Slovak_Slovakia.1250
-     SLV  Slovenian_Slovenia.1250
-     SMA  Sami (Southern)_Norway.1252
-     SMB  Sami (Southern)_Sweden.1252
-     SME  Sami (Northern)_Norway.1252
-     SMF  Sami (Northern)_Sweden.1252
-     SMG  Sami (Northern)_Finland.1252
-     SMJ  Sami (Lule)_Norway.1252
-     SMK  Sami (Lule)_Sweden.1252
-     SMN  Sami (Inari)_Finland.1252
-     SMS  Sami (Skolt)_Finland.1252
-     SQI  Albanian_Albania.1250
-     SRB  Serbian (Cyrillic)_Serbia and Montenegro.1251
-     SRL  Serbian (Latin)_Serbia and Montenegro.1250
-     SRN  Serbian (Cyrillic)_Bosnia and Herzegovina.1251
-     SRS  Serbian (Latin)_Bosnia and Herzegovina.1250
-     SVE  Swedish_Sweden.1252
-     SVF  Swedish_Finland.1252
-     SWK  Swahili_Kenya.1252
-     THA  Thai_Thailand.874
-     TRK  Turkish_Turkey.1254
-     TSN  Tswana_South Africa.1252
-     TTT  Tatar_Russia.1251
-     UKR  Ukrainian_Ukraine.1251
-     URD  Urdu_Islamic Republic of Pakistan.1256
-     USA  English_United States.1252
-     UZB  Uzbek (Latin)_Uzbekistan.1254
-     VIT  Vietnamese_Viet Nam.1258
-     XHO  Xhosa_South Africa.1252
-     ZHH  Chinese_Hong Kong S.A.R..950
-     ZHI  Chinese_Singapore.936
-     ZHM  Chinese_Macau S.A.R..950
-     ZUL  Zulu_South Africa.1252
- */
-
-/* Table from ISO 639 language code, optionally with country or script suffix,
-   to English name.
-   Keep in sync with the gl_locale_name_from_win32_LANGID function in
-   localename.c!  */
-struct table_entry
-{
-  const char *code;
-  const char *english;
-};
-static const struct table_entry language_table[] =
-  {
-    { "af", "Afrikaans" },
-    { "am", "Amharic" },
-    { "ar", "Arabic" },
-    { "arn", "Mapudungun" },
-    { "as", "Assamese" },
-    { "az@cyrillic", "Azeri (Cyrillic)" },
-    { "az@latin", "Azeri (Latin)" },
-    { "ba", "Bashkir" },
-    { "be", "Belarusian" },
-    { "ber", "Tamazight" },
-    { "ber@arabic", "Tamazight (Arabic)" },
-    { "ber@latin", "Tamazight (Latin)" },
-    { "bg", "Bulgarian" },
-    { "bin", "Edo" },
-    { "bn", "Bengali" },
-    { "bn_BD", "Bengali (Bangladesh)" },
-    { "bn_IN", "Bengali (India)" },
-    { "bnt", "Sutu" },
-    { "bo", "Tibetan" },
-    { "br", "Breton" },
-    { "bs", "BSB" }, /* "Bosnian (Latin)" */
-    { "bs@cyrillic", "BSC" }, /* Bosnian (Cyrillic) */
-    { "ca", "Catalan" },
-    { "chr", "Cherokee" },
-    { "co", "Corsican" },
-    { "cpe", "Hawaiian" },
-    { "cs", "Czech" },
-    { "cy", "Welsh" },
-    { "da", "Danish" },
-    { "de", "German" },
-    { "dsb", "Lower Sorbian" },
-    { "dv", "Divehi" },
-    { "el", "Greek" },
-    { "en", "English" },
-    { "es", "Spanish" },
-    { "et", "Estonian" },
-    { "eu", "Basque" },
-    { "fa", "Farsi" },
-    { "ff", "Fulfulde" },
-    { "fi", "Finnish" },
-    { "fo", "Faroese" }, /* "Faeroese" does not work */
-    { "fr", "French" },
-    { "fy", "Frisian" },
-    { "ga", "IRE" }, /* Gaelic (Ireland) */
-    { "gd", "Gaelic (Scotland)" },
-    { "gd", "Scottish Gaelic" },
-    { "gl", "Galician" },
-    { "gn", "Guarani" },
-    { "gsw", "Alsatian" },
-    { "gu", "Gujarati" },
-    { "ha", "Hausa" },
-    { "he", "Hebrew" },
-    { "hi", "Hindi" },
-    { "hr", "Croatian" },
-    { "hsb", "Upper Sorbian" },
-    { "hu", "Hungarian" },
-    { "hy", "Armenian" },
-    { "id", "Indonesian" },
-    { "ig", "Igbo" },
-    { "ii", "Yi" },
-    { "is", "Icelandic" },
-    { "it", "Italian" },
-    { "iu", "IUK" }, /* Inuktitut */
-    { "ja", "Japanese" },
-    { "ka", "Georgian" },
-    { "kk", "Kazakh" },
-    { "kl", "Greenlandic" },
-    { "km", "Cambodian" },
-    { "km", "Khmer" },
-    { "kn", "Kannada" },
-    { "ko", "Korean" },
-    { "kok", "Konkani" },
-    { "kr", "Kanuri" },
-    { "ks", "Kashmiri" },
-    { "ks_IN", "Kashmiri_India" },
-    { "ks_PK", "Kashmiri (Arabic)_Pakistan" },
-    { "ky", "Kyrgyz" },
-    { "la", "Latin" },
-    { "lb", "Luxembourgish" },
-    { "lo", "Lao" },
-    { "lt", "Lithuanian" },
-    { "lv", "Latvian" },
-    { "mi", "Maori" },
-    { "mk", "FYRO Macedonian" },
-    { "mk", "Macedonian" },
-    { "ml", "Malayalam" },
-    { "mn", "Mongolian" },
-    { "mni", "Manipuri" },
-    { "moh", "Mohawk" },
-    { "mr", "Marathi" },
-    { "ms", "Malay" },
-    { "mt", "Maltese" },
-    { "my", "Burmese" },
-    { "nb", "NOR" }, /* Norwegian Bokmål */
-    { "ne", "Nepali" },
-    { "nic", "Ibibio" },
-    { "nl", "Dutch" },
-    { "nn", "NON" }, /* Norwegian Nynorsk */
-    { "no", "Norwegian" },
-    { "nso", "Northern Sotho" },
-    { "nso", "Sepedi" },
-    { "oc", "Occitan" },
-    { "om", "Oromo" },
-    { "or", "Oriya" },
-    { "pa", "Punjabi" },
-    { "pap", "Papiamentu" },
-    { "pl", "Polish" },
-    { "prs", "Dari" },
-    { "ps", "Pashto" },
-    { "pt", "Portuguese" },
-    { "qu", "Quechua" },
-    { "qut", "K'iche'" },
-    { "rm", "Romansh" },
-    { "ro", "Romanian" },
-    { "ru", "Russian" },
-    { "rw", "Kinyarwanda" },
-    { "sa", "Sanskrit" },
-    { "sah", "Yakut" },
-    { "sd", "Sindhi" },
-    { "se", "Sami (Northern)" },
-    { "se", "Northern Sami" },
-    { "si", "Sinhalese" },
-    { "sk", "Slovak" },
-    { "sl", "Slovenian" },
-    { "sma", "Sami (Southern)" },
-    { "sma", "Southern Sami" },
-    { "smj", "Sami (Lule)" },
-    { "smj", "Lule Sami" },
-    { "smn", "Sami (Inari)" },
-    { "smn", "Inari Sami" },
-    { "sms", "Sami (Skolt)" },
-    { "sms", "Skolt Sami" },
-    { "so", "Somali" },
-    { "sq", "Albanian" },
-    { "sr", "Serbian (Latin)" },
-    { "sr@cyrillic", "SRB" }, /* Serbian (Cyrillic) */
-    { "sw", "Swahili" },
-    { "syr", "Syriac" },
-    { "ta", "Tamil" },
-    { "te", "Telugu" },
-    { "tg", "Tajik" },
-    { "th", "Thai" },
-    { "ti", "Tigrinya" },
-    { "tk", "Turkmen" },
-    { "tl", "Filipino" },
-    { "tn", "Tswana" },
-    { "tr", "Turkish" },
-    { "ts", "Tsonga" },
-    { "tt", "Tatar" },
-    { "ug", "Uighur" },
-    { "uk", "Ukrainian" },
-    { "ur", "Urdu" },
-    { "uz", "Uzbek" },
-    { "uz", "Uzbek (Latin)" },
-    { "uz@cyrillic", "Uzbek (Cyrillic)" },
-    { "ve", "Venda" },
-    { "vi", "Vietnamese" },
-    { "wen", "Sorbian" },
-    { "wo", "Wolof" },
-    { "xh", "Xhosa" },
-    { "yi", "Yiddish" },
-    { "yo", "Yoruba" },
-    { "zh", "Chinese" },
-    { "zu", "Zulu" }
-  };
-
-/* Table from ISO 3166 country code to English name.
-   Keep in sync with the gl_locale_name_from_win32_LANGID function in
-   localename.c!  */
-static const struct table_entry country_table[] =
-  {
-    { "AE", "U.A.E." },
-    { "AF", "Afghanistan" },
-    { "AL", "Albania" },
-    { "AM", "Armenia" },
-    { "AN", "Netherlands Antilles" },
-    { "AR", "Argentina" },
-    { "AT", "Austria" },
-    { "AU", "Australia" },
-    { "AZ", "Azerbaijan" },
-    { "BA", "Bosnia and Herzegovina" },
-    { "BD", "Bangladesh" },
-    { "BE", "Belgium" },
-    { "BG", "Bulgaria" },
-    { "BH", "Bahrain" },
-    { "BN", "Brunei Darussalam" },
-    { "BO", "Bolivia" },
-    { "BR", "Brazil" },
-    { "BT", "Bhutan" },
-    { "BY", "Belarus" },
-    { "BZ", "Belize" },
-    { "CA", "Canada" },
-    { "CG", "Congo" },
-    { "CH", "Switzerland" },
-    { "CI", "Cote d'Ivoire" },
-    { "CL", "Chile" },
-    { "CM", "Cameroon" },
-    { "CN", "People's Republic of China" },
-    { "CO", "Colombia" },
-    { "CR", "Costa Rica" },
-    { "CS", "Serbia and Montenegro" },
-    { "CZ", "Czech Republic" },
-    { "DE", "Germany" },
-    { "DK", "Denmark" },
-    { "DO", "Dominican Republic" },
-    { "DZ", "Algeria" },
-    { "EC", "Ecuador" },
-    { "EE", "Estonia" },
-    { "EG", "Egypt" },
-    { "ER", "Eritrea" },
-    { "ES", "Spain" },
-    { "ET", "Ethiopia" },
-    { "FI", "Finland" },
-    { "FO", "Faroe Islands" },
-    { "FR", "France" },
-    { "GB", "United Kingdom" },
-    { "GD", "Caribbean" },
-    { "GE", "Georgia" },
-    { "GL", "Greenland" },
-    { "GR", "Greece" },
-    { "GT", "Guatemala" },
-    { "HK", "Hong Kong" },
-    { "HK", "Hong Kong S.A.R." },
-    { "HN", "Honduras" },
-    { "HR", "Croatia" },
-    { "HT", "Haiti" },
-    { "HU", "Hungary" },
-    { "ID", "Indonesia" },
-    { "IE", "Ireland" },
-    { "IL", "Israel" },
-    { "IN", "India" },
-    { "IQ", "Iraq" },
-    { "IR", "Iran" },
-    { "IS", "Iceland" },
-    { "IT", "Italy" },
-    { "JM", "Jamaica" },
-    { "JO", "Jordan" },
-    { "JP", "Japan" },
-    { "KE", "Kenya" },
-    { "KG", "Kyrgyzstan" },
-    { "KH", "Cambodia" },
-    { "KR", "South Korea" },
-    { "KW", "Kuwait" },
-    { "KZ", "Kazakhstan" },
-    { "LA", "Laos" },
-    { "LB", "Lebanon" },
-    { "LI", "Liechtenstein" },
-    { "LK", "Sri Lanka" },
-    { "LT", "Lithuania" },
-    { "LU", "Luxembourg" },
-    { "LV", "Latvia" },
-    { "LY", "Libya" },
-    { "MA", "Morocco" },
-    { "MC", "Principality of Monaco" },
-    { "MD", "Moldava" },
-    { "MD", "Moldova" },
-    { "ME", "Montenegro" },
-    { "MK", "Former Yugoslav Republic of Macedonia" },
-    { "ML", "Mali" },
-    { "MM", "Myanmar" },
-    { "MN", "Mongolia" },
-    { "MO", "Macau S.A.R." },
-    { "MT", "Malta" },
-    { "MV", "Maldives" },
-    { "MX", "Mexico" },
-    { "MY", "Malaysia" },
-    { "NG", "Nigeria" },
-    { "NI", "Nicaragua" },
-    { "NL", "Netherlands" },
-    { "NO", "Norway" },
-    { "NP", "Nepal" },
-    { "NZ", "New Zealand" },
-    { "OM", "Oman" },
-    { "PA", "Panama" },
-    { "PE", "Peru" },
-    { "PH", "Philippines" },
-    { "PK", "Islamic Republic of Pakistan" },
-    { "PL", "Poland" },
-    { "PR", "Puerto Rico" },
-    { "PT", "Portugal" },
-    { "PY", "Paraguay" },
-    { "QA", "Qatar" },
-    { "RE", "Reunion" },
-    { "RO", "Romania" },
-    { "RS", "Serbia" },
-    { "RU", "Russia" },
-    { "RW", "Rwanda" },
-    { "SA", "Saudi Arabia" },
-    { "SE", "Sweden" },
-    { "SG", "Singapore" },
-    { "SI", "Slovenia" },
-    { "SK", "Slovak" },
-    { "SN", "Senegal" },
-    { "SO", "Somalia" },
-    { "SR", "Suriname" },
-    { "SV", "El Salvador" },
-    { "SY", "Syria" },
-    { "TH", "Thailand" },
-    { "TJ", "Tajikistan" },
-    { "TM", "Turkmenistan" },
-    { "TN", "Tunisia" },
-    { "TR", "Turkey" },
-    { "TT", "Trinidad and Tobago" },
-    { "TW", "Taiwan" },
-    { "TZ", "Tanzania" },
-    { "UA", "Ukraine" },
-    { "US", "United States" },
-    { "UY", "Uruguay" },
-    { "VA", "Vatican" },
-    { "VE", "Venezuela" },
-    { "VN", "Viet Nam" },
-    { "YE", "Yemen" },
-    { "ZA", "South Africa" },
-    { "ZW", "Zimbabwe" }
-  };
-
-/* Given a string STRING, find the set of indices i such that TABLE[i].code is
-   the given STRING.  It is a range [lo,hi-1].  */
-typedef struct { size_t lo; size_t hi; } range_t;
-static void
-search (const struct table_entry *table, size_t table_size, const char *string,
-        range_t *result)
-{
-  /* The table is sorted.  Perform a binary search.  */
-  size_t hi = table_size;
-  size_t lo = 0;
-  while (lo < hi)
-    {
-      /* Invariant:
-         for i < lo, strcmp (table[i].code, string) < 0,
-         for i >= hi, strcmp (table[i].code, string) > 0.  */
-      size_t mid = (hi + lo) >> 1; /* >= lo, < hi */
-      int cmp = strcmp (table[mid].code, string);
-      if (cmp < 0)
-        lo = mid + 1;
-      else if (cmp > 0)
-        hi = mid;
-      else
-        {
-          /* Found an i with
-               strcmp (language_table[i].code, string) == 0.
-             Find the entire interval of such i.  */
-          {
-            size_t i;
-
-            for (i = mid; i > lo; )
-              {
-                i--;
-                if (strcmp (table[i].code, string) < 0)
-                  {
-                    lo = i + 1;
-                    break;
-                  }
-              }
-          }
-          {
-            size_t i;
-
-            for (i = mid; i < hi; i++)
-              {
-                if (strcmp (table[i].code, string) > 0)
-                  {
-                    hi = i;
-                    break;
-                  }
-              }
-          }
-          /* The set of i with
-               strcmp (language_table[i].code, string) == 0
-             is the interval [lo, hi-1].  */
-          break;
-        }
-    }
-  result->lo = lo;
-  result->hi = hi;
-}
-
-/* Like setlocale, but accept also locale names in the form ll or ll_CC,
-   where ll is an ISO 639 language code and CC is an ISO 3166 country code.  */
-static char *
-setlocale_unixlike (int category, const char *locale)
-{
-  char *result;
-  char llCC_buf[64];
-  char ll_buf[64];
-  char CC_buf[64];
-
-  /* First, try setlocale with the original argument unchanged.  */
-  result = setlocale (category, locale);
-  if (result != NULL)
-    return result;
-
-  /* Otherwise, assume the argument is in the form
-       language[_territory][.codeset][@modifier]
-     and try to map it using the tables.  */
-  if (strlen (locale) < sizeof (llCC_buf))
-    {
-      /* Second try: Remove the codeset part.  */
-      {
-        const char *p = locale;
-        char *q = llCC_buf;
-
-        /* Copy the part before the dot.  */
-        for (; *p != '\0' && *p != '.'; p++, q++)
-          *q = *p;
-        if (*p == '.')
-          /* Skip the part up to the '@', if any.  */
-          for (; *p != '\0' && *p != '@'; p++)
-            ;
-        /* Copy the part starting with '@', if any.  */
-        for (; *p != '\0'; p++, q++)
-          *q = *p;
-        *q = '\0';
-      }
-      /* llCC_buf now contains
-           language[_territory][@modifier]
-       */
-      if (strcmp (llCC_buf, locale) != 0)
-        {
-          result = setlocale (category, llCC_buf);
-          if (result != NULL)
-            return result;
-        }
-      /* Look it up in language_table.  */
-      {
-        range_t range;
-        size_t i;
-
-        search (language_table,
-                sizeof (language_table) / sizeof (language_table[0]),
-                llCC_buf,
-                &range);
-
-        for (i = range.lo; i < range.hi; i++)
-          {
-            /* Try the replacement in language_table[i].  */
-            result = setlocale (category, language_table[i].english);
-            if (result != NULL)
-              return result;
-          }
-      }
-      /* Split language[_territory][@modifier]
-         into  ll_buf = language[@modifier]
-         and   CC_buf = territory
-       */
-      {
-        const char *underscore = strchr (llCC_buf, '_');
-        if (underscore != NULL)
-          {
-            const char *territory_start = underscore + 1;
-            const char *territory_end = strchr (territory_start, '@');
-            if (territory_end == NULL)
-              territory_end = territory_start + strlen (territory_start);
-
-            memcpy (ll_buf, llCC_buf, underscore - llCC_buf);
-            strcpy (ll_buf + (underscore - llCC_buf), territory_end);
-
-            memcpy (CC_buf, territory_start, territory_end - territory_start);
-            CC_buf[territory_end - territory_start] = '\0';
-
-            {
-              /* Look up ll_buf in language_table
-                 and CC_buf in country_table.  */
-              range_t language_range;
-
-              search (language_table,
-                      sizeof (language_table) / sizeof (language_table[0]),
-                      ll_buf,
-                      &language_range);
-              if (language_range.lo < language_range.hi)
-                {
-                  range_t country_range;
-
-                  search (country_table,
-                          sizeof (country_table) / sizeof (country_table[0]),
-                          CC_buf,
-                          &country_range);
-                  if (country_range.lo < country_range.hi)
-                    {
-                      size_t i;
-                      size_t j;
-
-                      for (i = language_range.lo; i < language_range.hi; i++)
-                        for (j = country_range.lo; j < country_range.hi; j++)
-                          {
-                            /* Concatenate the replacements.  */
-                            const char *part1 = language_table[i].english;
-                            size_t part1_len = strlen (part1);
-                            const char *part2 = country_table[j].english;
-                            size_t part2_len = strlen (part2) + 1;
-                            char buf[64+64];
-
-                            if (!(part1_len + 1 + part2_len <= sizeof (buf)))
-                              abort ();
-                            memcpy (buf, part1, part1_len);
-                            buf[part1_len] = '_';
-                            memcpy (buf + part1_len + 1, part2, part2_len);
-
-                            /* Try the concatenated replacements.  */
-                            result = setlocale (category, buf);
-                            if (result != NULL)
-                              return result;
-                          }
-                    }
-
-                  /* Try omitting the country entirely.  This may set a locale
-                     corresponding to the wrong country, but is better than
-                     failing entirely.  */
-                  {
-                    size_t i;
-
-                    for (i = language_range.lo; i < language_range.hi; i++)
-                      {
-                        /* Try only the language replacement.  */
-                        result =
-                          setlocale (category, language_table[i].english);
-                        if (result != NULL)
-                          return result;
-                      }
-                  }
-                }
-            }
-          }
-      }
-    }
-
-  /* Failed.  */
-  return NULL;
-}
-
-# else
-#  define setlocale_unixlike setlocale
-# endif
-
-# if LC_MESSAGES == 1729
-
-/* The system does not store an LC_MESSAGES locale category.  Do it here.  */
-static char lc_messages_name[64] = "C";
-
-/* Like setlocale, but support also LC_MESSAGES.  */
-static char *
-setlocale_single (int category, const char *locale)
-{
-  if (category == LC_MESSAGES)
-    {
-      if (locale != NULL)
-        {
-          lc_messages_name[sizeof (lc_messages_name) - 1] = '\0';
-          strncpy (lc_messages_name, locale, sizeof (lc_messages_name) - 1);
-        }
-      return lc_messages_name;
-    }
-  else
-    return setlocale_unixlike (category, locale);
-}
-
-# else
-#  define setlocale_single setlocale_unixlike
-# endif
-
-char *
-rpl_setlocale (int category, const char *locale)
-{
-  if (locale != NULL && locale[0] == '\0')
-    {
-      /* A request to the set the current locale to the default locale.  */
-      if (category == LC_ALL)
-        {
-          /* Set LC_CTYPE first.  Then the other categories.  */
-          static int const categories[] =
-            {
-              LC_NUMERIC,
-              LC_TIME,
-              LC_COLLATE,
-              LC_MONETARY,
-              LC_MESSAGES
-            };
-          char *saved_locale;
-          const char *base_name;
-          unsigned int i;
-
-          /* Back up the old locale, in case one of the steps fails.  */
-          saved_locale = setlocale (LC_ALL, NULL);
-          if (saved_locale == NULL)
-            return NULL;
-          saved_locale = strdup (saved_locale);
-          if (saved_locale == NULL)
-            return NULL;
-
-          /* Set LC_CTYPE category.  Set all other categories (except possibly
-             LC_MESSAGES) to the same value in the same call; this is likely to
-             save calls.  */
-          base_name =
-            gl_locale_name_environ (LC_CTYPE, category_to_name (LC_CTYPE));
-          if (base_name == NULL)
-            base_name = gl_locale_name_default ();
-
-          if (setlocale_unixlike (LC_ALL, base_name) == NULL)
-            goto fail;
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-          /* On native Windows, setlocale(LC_ALL,...) may succeed but set the
-             LC_CTYPE category to an invalid value ("C") when it does not
-             support the specified encoding.  Report a failure instead.  */
-          if (strchr (base_name, '.') != NULL
-              && strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-            goto fail;
-# endif
-
-          for (i = 0; i < sizeof (categories) / sizeof (categories[0]); i++)
-            {
-              int cat = categories[i];
-              const char *name;
-
-              name = gl_locale_name_environ (cat, category_to_name (cat));
-              if (name == NULL)
-                name = gl_locale_name_default ();
-
-              /* If name is the same as base_name, it has already been set
-                 through the setlocale call before the loop.  */
-              if (strcmp (name, base_name) != 0
-# if LC_MESSAGES == 1729
-                  || cat == LC_MESSAGES
-# endif
-                 )
-                if (setlocale_single (cat, name) == NULL)
-                  goto fail;
-            }
-
-          /* All steps were successful.  */
-          free (saved_locale);
-          return setlocale (LC_ALL, NULL);
-
-        fail:
-          if (saved_locale[0] != '\0') /* don't risk an endless recursion */
-            setlocale (LC_ALL, saved_locale);
-          free (saved_locale);
-          return NULL;
-        }
-      else
-        {
-          const char *name =
-            gl_locale_name_environ (category, category_to_name (category));
-          if (name == NULL)
-            name = gl_locale_name_default ();
-
-          return setlocale_single (category, name);
-        }
-    }
-  else
-    {
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-      if (category == LC_ALL && locale != NULL && strchr (locale, '.') != NULL)
-        {
-          char *saved_locale;
-
-          /* Back up the old locale.  */
-          saved_locale = setlocale (LC_ALL, NULL);
-          if (saved_locale == NULL)
-            return NULL;
-          saved_locale = strdup (saved_locale);
-          if (saved_locale == NULL)
-            return NULL;
-
-          if (setlocale_unixlike (LC_ALL, locale) == NULL)
-            {
-              free (saved_locale);
-              return NULL;
-            }
-
-          /* On native Windows, setlocale(LC_ALL,...) may succeed but set the
-             LC_CTYPE category to an invalid value ("C") when it does not
-             support the specified encoding.  Report a failure instead.  */
-          if (strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-            {
-              if (saved_locale[0] != '\0') /* don't risk an endless recursion */
-                setlocale (LC_ALL, saved_locale);
-              free (saved_locale);
-              return NULL;
-            }
-
-          /* It was really successful.  */
-          free (saved_locale);
-          return setlocale (LC_ALL, NULL);
-        }
-      else
-# endif
-        return setlocale_single (category, locale);
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/set-mode-acl.c gettext-0.18.1.1/gettext-tools/gnulib-lib/set-mode-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/set-mode-acl.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/set-mode-acl.c	2010-05-24 09:42:46.000000000 +0000
@@ -0,0 +1,593 @@
+/* set-mode-acl.c - set access control list equivalent to a mode
+
+   Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc.
+
+   This 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 Paul Eggert and Andreas Gruenbacher, and Bruno Haible.  */
+
+#include <config.h>
+
+#include "acl.h"
+
+#include "acl-internal.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+
+/* If DESC is a valid file descriptor use fchmod to change the
+   file's mode to MODE on systems that have fchown. On systems
+   that don't have fchown and if DESC is invalid, use chown on
+   NAME instead.
+   Return 0 if successful.  Return -1 and set errno upon failure.  */
+
+int
+chmod_or_fchmod (const char *name, int desc, mode_t mode)
+{
+  if (HAVE_FCHMOD && desc != -1)
+    return fchmod (desc, mode);
+  else
+    return chmod (name, mode);
+}
+
+/* Set the access control lists of a file. If DESC is a valid file
+   descriptor, use file descriptor operations where available, else use
+   filename based operations on NAME.  If access control lists are not
+   available, fchmod the target file to MODE.  Also sets the
+   non-permission bits of the destination file (S_ISUID, S_ISGID, S_ISVTX)
+   to those from MODE if any are set.
+   Return 0 if successful.  Return -1 and set errno upon failure.  */
+
+int
+qset_acl (char const *name, int desc, mode_t mode)
+{
+#if USE_ACL
+# if HAVE_ACL_GET_FILE
+  /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
+  /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+#  if MODE_INSIDE_ACL
+  /* Linux, FreeBSD, IRIX, Tru64 */
+
+  /* We must also have acl_from_text and acl_delete_def_file.
+     (acl_delete_def_file could be emulated with acl_init followed
+      by acl_set_file, but acl_set_file with an empty acl is
+      unspecified.)  */
+
+#   ifndef HAVE_ACL_FROM_TEXT
+#    error Must have acl_from_text (see POSIX 1003.1e draft 17).
+#   endif
+#   ifndef HAVE_ACL_DELETE_DEF_FILE
+#    error Must have acl_delete_def_file (see POSIX 1003.1e draft 17).
+#   endif
+
+  acl_t acl;
+  int ret;
+
+  if (HAVE_ACL_FROM_MODE) /* Linux */
+    {
+      acl = acl_from_mode (mode);
+      if (!acl)
+        return -1;
+    }
+  else /* FreeBSD, IRIX, Tru64 */
+    {
+      /* If we were to create the ACL using the functions acl_init(),
+         acl_create_entry(), acl_set_tag_type(), acl_set_qualifier(),
+         acl_get_permset(), acl_clear_perm[s](), acl_add_perm(), we
+         would need to create a qualifier.  I don't know how to do this.
+         So create it using acl_from_text().  */
+
+#   if HAVE_ACL_FREE_TEXT /* Tru64 */
+      char acl_text[] = "u::---,g::---,o::---,";
+#   else /* FreeBSD, IRIX */
+      char acl_text[] = "u::---,g::---,o::---";
+#   endif
+
+      if (mode & S_IRUSR) acl_text[ 3] = 'r';
+      if (mode & S_IWUSR) acl_text[ 4] = 'w';
+      if (mode & S_IXUSR) acl_text[ 5] = 'x';
+      if (mode & S_IRGRP) acl_text[10] = 'r';
+      if (mode & S_IWGRP) acl_text[11] = 'w';
+      if (mode & S_IXGRP) acl_text[12] = 'x';
+      if (mode & S_IROTH) acl_text[17] = 'r';
+      if (mode & S_IWOTH) acl_text[18] = 'w';
+      if (mode & S_IXOTH) acl_text[19] = 'x';
+
+      acl = acl_from_text (acl_text);
+      if (!acl)
+        return -1;
+    }
+  if (HAVE_ACL_SET_FD && desc != -1)
+    ret = acl_set_fd (desc, acl);
+  else
+    ret = acl_set_file (name, ACL_TYPE_ACCESS, acl);
+  if (ret != 0)
+    {
+      int saved_errno = errno;
+      acl_free (acl);
+
+      if (ACL_NOT_WELL_SUPPORTED (errno))
+        return chmod_or_fchmod (name, desc, mode);
+      else
+        {
+          errno = saved_errno;
+          return -1;
+        }
+    }
+  else
+    acl_free (acl);
+
+  if (S_ISDIR (mode) && acl_delete_def_file (name))
+    return -1;
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, so the special bits have not yet
+         been set.  */
+      return chmod_or_fchmod (name, desc, mode);
+    }
+  return 0;
+
+#  else /* !MODE_INSIDE_ACL */
+  /* MacOS X */
+
+#   if !HAVE_ACL_TYPE_EXTENDED
+#    error Must have ACL_TYPE_EXTENDED
+#   endif
+
+  /* On MacOS X,  acl_get_file (name, ACL_TYPE_ACCESS)
+     and          acl_get_file (name, ACL_TYPE_DEFAULT)
+     always return NULL / EINVAL.  You have to use
+                  acl_get_file (name, ACL_TYPE_EXTENDED)
+     or           acl_get_fd (open (name, ...))
+     to retrieve an ACL.
+     On the other hand,
+                  acl_set_file (name, ACL_TYPE_ACCESS, acl)
+     and          acl_set_file (name, ACL_TYPE_DEFAULT, acl)
+     have the same effect as
+                  acl_set_file (name, ACL_TYPE_EXTENDED, acl):
+     Each of these calls sets the file's ACL.  */
+
+  acl_t acl;
+  int ret;
+
+  /* Remove the ACL if the file has ACLs.  */
+  if (HAVE_ACL_GET_FD && desc != -1)
+    acl = acl_get_fd (desc);
+  else
+    acl = acl_get_file (name, ACL_TYPE_EXTENDED);
+  if (acl)
+    {
+      acl_free (acl);
+
+      acl = acl_init (0);
+      if (acl)
+        {
+          if (HAVE_ACL_SET_FD && desc != -1)
+            ret = acl_set_fd (desc, acl);
+          else
+            ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl);
+          if (ret != 0)
+            {
+              int saved_errno = errno;
+
+              acl_free (acl);
+
+              if (ACL_NOT_WELL_SUPPORTED (saved_errno))
+                return chmod_or_fchmod (name, desc, mode);
+              else
+                {
+                  errno = saved_errno;
+                  return -1;
+                }
+            }
+          acl_free (acl);
+        }
+    }
+
+  /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly.  */
+  return chmod_or_fchmod (name, desc, mode);
+#  endif
+
+# elif HAVE_ACL && defined GETACLCNT /* Solaris, Cygwin, not HP-UX */
+
+#  if defined ACL_NO_TRIVIAL
+  /* Solaris 10 (newer version), which has additional API declared in
+     <sys/acl.h> (acl_t) and implemented in libsec (acl_set, acl_trivial,
+     acl_fromtext, ...).  */
+
+  acl_t *aclp;
+  char acl_text[] = "user::---,group::---,mask:---,other:---";
+  int ret;
+  int saved_errno;
+
+  if (mode & S_IRUSR) acl_text[ 6] = 'r';
+  if (mode & S_IWUSR) acl_text[ 7] = 'w';
+  if (mode & S_IXUSR) acl_text[ 8] = 'x';
+  if (mode & S_IRGRP) acl_text[17] = acl_text[26] = 'r';
+  if (mode & S_IWGRP) acl_text[18] = acl_text[27] = 'w';
+  if (mode & S_IXGRP) acl_text[19] = acl_text[28] = 'x';
+  if (mode & S_IROTH) acl_text[36] = 'r';
+  if (mode & S_IWOTH) acl_text[37] = 'w';
+  if (mode & S_IXOTH) acl_text[38] = 'x';
+
+  if (acl_fromtext (acl_text, &aclp) != 0)
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+
+  ret = (desc < 0 ? acl_set (name, aclp) : facl_set (desc, aclp));
+  saved_errno = errno;
+  acl_free (aclp);
+  if (ret < 0)
+    {
+      if (saved_errno == ENOSYS || saved_errno == EOPNOTSUPP)
+        return chmod_or_fchmod (name, desc, mode);
+      errno = saved_errno;
+      return -1;
+    }
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, so the special bits have not yet
+         been set.  */
+      return chmod_or_fchmod (name, desc, mode);
+    }
+  return 0;
+
+#  else /* Solaris, Cygwin, general case */
+
+#   ifdef ACE_GETACL
+  /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
+     file systems (whereas the other ones are used in UFS file systems).  */
+
+  /* The flags in the ace_t structure changed in a binary incompatible way
+     when ACL_NO_TRIVIAL etc. were introduced in <sys/acl.h> version 1.15.
+     How to distinguish the two conventions at runtime?
+     We fetch the existing ACL.  In the old convention, usually three ACEs have
+     a_flags = ACE_OWNER / ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400.
+     In the new convention, these values are not used.  */
+  int convention;
+
+  {
+    int count;
+    ace_t *entries;
+
+    for (;;)
+      {
+        if (desc != -1)
+          count = facl (desc, ACE_GETACLCNT, 0, NULL);
+        else
+          count = acl (name, ACE_GETACLCNT, 0, NULL);
+        if (count <= 0)
+          {
+            convention = -1;
+            break;
+          }
+        entries = (ace_t *) malloc (count * sizeof (ace_t));
+        if (entries == NULL)
+          {
+            errno = ENOMEM;
+            return -1;
+          }
+        if ((desc != -1
+             ? facl (desc, ACE_GETACL, count, entries)
+             : acl (name, ACE_GETACL, count, entries))
+            == count)
+          {
+            int i;
+
+            convention = 0;
+            for (i = 0; i < count; i++)
+              if (entries[i].a_flags & (ACE_OWNER | ACE_GROUP | ACE_OTHER))
+                {
+                  convention = 1;
+                  break;
+                }
+            free (entries);
+            break;
+          }
+        /* Huh? The number of ACL entries changed since the last call.
+           Repeat.  */
+        free (entries);
+      }
+  }
+
+  if (convention >= 0)
+    {
+      ace_t entries[3];
+      int ret;
+
+      if (convention)
+        {
+          /* Running on Solaris 10.  */
+          entries[0].a_type = ALLOW;
+          entries[0].a_flags = ACE_OWNER;
+          entries[0].a_who = 0; /* irrelevant */
+          entries[0].a_access_mask = (mode >> 6) & 7;
+          entries[1].a_type = ALLOW;
+          entries[1].a_flags = ACE_GROUP;
+          entries[1].a_who = 0; /* irrelevant */
+          entries[1].a_access_mask = (mode >> 3) & 7;
+          entries[2].a_type = ALLOW;
+          entries[2].a_flags = ACE_OTHER;
+          entries[2].a_who = 0;
+          entries[2].a_access_mask = mode & 7;
+        }
+      else
+        {
+          /* Running on Solaris 10 (newer version) or Solaris 11.  */
+          entries[0].a_type = ACE_ACCESS_ALLOWED_ACE_TYPE;
+          entries[0].a_flags = NEW_ACE_OWNER;
+          entries[0].a_who = 0; /* irrelevant */
+          entries[0].a_access_mask =
+            (mode & 0400 ? NEW_ACE_READ_DATA : 0)
+            | (mode & 0200 ? NEW_ACE_WRITE_DATA : 0)
+            | (mode & 0100 ? NEW_ACE_EXECUTE : 0);
+          entries[1].a_type = ACE_ACCESS_ALLOWED_ACE_TYPE;
+          entries[1].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP;
+          entries[1].a_who = 0; /* irrelevant */
+          entries[1].a_access_mask =
+            (mode & 0040 ? NEW_ACE_READ_DATA : 0)
+            | (mode & 0020 ? NEW_ACE_WRITE_DATA : 0)
+            | (mode & 0010 ? NEW_ACE_EXECUTE : 0);
+          entries[2].a_type = ACE_ACCESS_ALLOWED_ACE_TYPE;
+          entries[2].a_flags = ACE_EVERYONE;
+          entries[2].a_who = 0;
+          entries[2].a_access_mask =
+            (mode & 0004 ? NEW_ACE_READ_DATA : 0)
+            | (mode & 0002 ? NEW_ACE_WRITE_DATA : 0)
+            | (mode & 0001 ? NEW_ACE_EXECUTE : 0);
+        }
+      if (desc != -1)
+        ret = facl (desc, ACE_SETACL,
+                    sizeof (entries) / sizeof (ace_t), entries);
+      else
+        ret = acl (name, ACE_SETACL,
+                   sizeof (entries) / sizeof (ace_t), entries);
+      if (ret < 0 && errno != EINVAL && errno != ENOTSUP)
+        {
+          if (errno == ENOSYS)
+            return chmod_or_fchmod (name, desc, mode);
+          return -1;
+        }
+    }
+#   endif
+
+  {
+    aclent_t entries[3];
+    int ret;
+
+    entries[0].a_type = USER_OBJ;
+    entries[0].a_id = 0; /* irrelevant */
+    entries[0].a_perm = (mode >> 6) & 7;
+    entries[1].a_type = GROUP_OBJ;
+    entries[1].a_id = 0; /* irrelevant */
+    entries[1].a_perm = (mode >> 3) & 7;
+    entries[2].a_type = OTHER_OBJ;
+    entries[2].a_id = 0;
+    entries[2].a_perm = mode & 7;
+
+    if (desc != -1)
+      ret = facl (desc, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
+    else
+      ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
+    if (ret < 0)
+      {
+        if (errno == ENOSYS || errno == EOPNOTSUPP)
+          return chmod_or_fchmod (name, desc, mode);
+        return -1;
+      }
+  }
+
+  if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX)))
+    {
+      /* We did not call chmod so far, so the special bits have not yet
+         been set.  */
+      return chmod_or_fchmod (name, desc, mode);
+    }
+  return 0;
+
+#  endif
+
+# elif HAVE_GETACL /* HP-UX */
+
+  struct stat statbuf;
+  struct acl_entry entries[3];
+  int ret;
+
+  if (desc != -1)
+    ret = fstat (desc, &statbuf);
+  else
+    ret = stat (name, &statbuf);
+  if (ret < 0)
+    return -1;
+
+  entries[0].uid = statbuf.st_uid;
+  entries[0].gid = ACL_NSGROUP;
+  entries[0].mode = (mode >> 6) & 7;
+  entries[1].uid = ACL_NSUSER;
+  entries[1].gid = statbuf.st_gid;
+  entries[1].mode = (mode >> 3) & 7;
+  entries[2].uid = ACL_NSUSER;
+  entries[2].gid = ACL_NSGROUP;
+  entries[2].mode = mode & 7;
+
+  if (desc != -1)
+    ret = fsetacl (desc, sizeof (entries) / sizeof (struct acl_entry), entries);
+  else
+    ret = setacl (name, sizeof (entries) / sizeof (struct acl_entry), entries);
+  if (ret < 0)
+    {
+      if (errno == ENOSYS || errno == EOPNOTSUPP)
+        return chmod_or_fchmod (name, desc, mode);
+      return -1;
+    }
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, so the special bits have not yet
+         been set.  */
+      return chmod_or_fchmod (name, desc, mode);
+    }
+  return 0;
+
+# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */
+
+  acl_type_list_t types;
+  size_t types_size = sizeof (types);
+  acl_type_t type;
+
+  if (aclx_gettypes (name, &types, &types_size) < 0
+      || types.num_entries == 0)
+    return chmod_or_fchmod (name, desc, mode);
+
+  /* XXX Do we need to clear all types of ACLs for the given file, or is it
+     sufficient to clear the first one?  */
+  type = types.entries[0];
+  if (type.u64 == ACL_AIXC)
+    {
+      union { struct acl a; char room[128]; } u;
+      int ret;
+
+      u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */
+      u.a.acl_mode = mode & ~(S_IXACL | 0777);
+      u.a.u_access = (mode >> 6) & 7;
+      u.a.g_access = (mode >> 3) & 7;
+      u.a.o_access = mode & 7;
+
+      if (desc != -1)
+        ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS,
+                         type, &u.a, u.a.acl_len, mode);
+      else
+        ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS,
+                        type, &u.a, u.a.acl_len, mode);
+      if (!(ret < 0 && errno == ENOSYS))
+        return ret;
+    }
+  else if (type.u64 == ACL_NFS4)
+    {
+      union { nfs4_acl_int_t a; char room[128]; } u;
+      nfs4_ace_int_t *ace;
+      int ret;
+
+      u.a.aclVersion = NFS4_ACL_INT_STRUCT_VERSION;
+      u.a.aclEntryN = 0;
+      ace = &u.a.aclEntry[0];
+      {
+        ace->flags = ACE4_ID_SPECIAL;
+        ace->aceWho.special_whoid = ACE4_WHO_OWNER;
+        ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE;
+        ace->aceFlags = 0;
+        ace->aceMask =
+          (mode & 0400 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0)
+          | (mode & 0200
+             ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA
+               | ACE4_ADD_SUBDIRECTORY
+             : 0)
+          | (mode & 0100 ? ACE4_EXECUTE : 0);
+        ace->aceWhoString[0] = '\0';
+        ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace;
+        ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4];
+        u.a.aclEntryN++;
+      }
+      {
+        ace->flags = ACE4_ID_SPECIAL;
+        ace->aceWho.special_whoid = ACE4_WHO_GROUP;
+        ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE;
+        ace->aceFlags = 0;
+        ace->aceMask =
+          (mode & 0040 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0)
+          | (mode & 0020
+             ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA
+               | ACE4_ADD_SUBDIRECTORY
+             : 0)
+          | (mode & 0010 ? ACE4_EXECUTE : 0);
+        ace->aceWhoString[0] = '\0';
+        ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace;
+        ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4];
+        u.a.aclEntryN++;
+      }
+      {
+        ace->flags = ACE4_ID_SPECIAL;
+        ace->aceWho.special_whoid = ACE4_WHO_EVERYONE;
+        ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE;
+        ace->aceFlags = 0;
+        ace->aceMask =
+          (mode & 0004 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0)
+          | (mode & 0002
+             ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA
+               | ACE4_ADD_SUBDIRECTORY
+             : 0)
+          | (mode & 0001 ? ACE4_EXECUTE : 0);
+        ace->aceWhoString[0] = '\0';
+        ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace;
+        ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4];
+        u.a.aclEntryN++;
+      }
+      u.a.aclLength = (char *) ace - (char *) &u.a;
+
+      if (desc != -1)
+        ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS,
+                         type, &u.a, u.a.aclLength, mode);
+      else
+        ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS,
+                        type, &u.a, u.a.aclLength, mode);
+      if (!(ret < 0 && errno == ENOSYS))
+        return ret;
+    }
+
+  return chmod_or_fchmod (name, desc, mode);
+
+# elif HAVE_STATACL /* older AIX */
+
+  union { struct acl a; char room[128]; } u;
+  int ret;
+
+  u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */
+  u.a.acl_mode = mode & ~(S_IXACL | 0777);
+  u.a.u_access = (mode >> 6) & 7;
+  u.a.g_access = (mode >> 3) & 7;
+  u.a.o_access = mode & 7;
+
+  if (desc != -1)
+    ret = fchacl (desc, &u.a, u.a.acl_len);
+  else
+    ret = chacl (name, &u.a, u.a.acl_len);
+
+  if (ret < 0 && errno == ENOSYS)
+    return chmod_or_fchmod (name, desc, mode);
+
+  return ret;
+
+# else /* Unknown flavor of ACLs */
+  return chmod_or_fchmod (name, desc, mode);
+# endif
+#else /* !USE_ACL */
+  return chmod_or_fchmod (name, desc, mode);
+#endif
+}
+
+/* As with qset_acl, but also output a diagnostic on failure.  */
+
+int
+set_acl (char const *name, int desc, mode_t mode)
+{
+  int r = qset_acl (name, desc, mode);
+  if (r != 0)
+    error (0, errno, _("setting permissions for %s"), quote (name));
+  return r;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sh-quote.c gettext-0.18.1.1/gettext-tools/gnulib-lib/sh-quote.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/sh-quote.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sh-quote.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Shell quoting.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 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
@@ -69,11 +69,11 @@
 /* Returns a freshly allocated string containing all argument strings, quoted,
    separated through spaces.  */
 char *
-shell_quote_argv (char * const *argv)
+shell_quote_argv (char **argv)
 {
   if (*argv != NULL)
     {
-      char * const *argp;
+      char **argp;
       size_t length;
       char *command;
       char *p;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sh-quote.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sh-quote.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sh-quote.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sh-quote.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Shell quoting.
-   Copyright (C) 2001-2002, 2004, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2004, 2009-2010 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
@@ -15,19 +15,12 @@
    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 _SH_QUOTE_H
-#define _SH_QUOTE_H
-
 /* When passing a command to a shell, we must quote the program name and
    arguments, since Unix shells interpret characters like " ", "'", "<", ">",
-   "$", '*', '?' etc. in a special way.  */
+   "$" etc. in a special way.  */
 
 #include <stddef.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Returns the number of bytes needed for the quoted string.  */
 extern size_t shell_quote_length (const char *string);
 
@@ -40,10 +33,4 @@
 
 /* Returns a freshly allocated string containing all argument strings, quoted,
    separated through spaces.  */
-extern char * shell_quote_argv (char * const *argv);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SH_QUOTE_H */
+extern char * shell_quote_argv (char **argv);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sigaction.c gettext-0.18.1.1/gettext-tools/gnulib-lib/sigaction.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/sigaction.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sigaction.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-/* This implementation of sigaction is tailored to native Windows behavior:
+/* This implementation of sigaction is tailored to Woe32 behavior:
    signal() has SysV semantics (ie. the handler is uninstalled before
    it is invoked).  This is an inherent data race if an asynchronous
    signal is sent twice in a row before we can reinstall our handler,
@@ -39,9 +39,9 @@
      - We don't implement SA_NOCLDSTOP or SA_NOCLDWAIT, because SIGCHLD
        is not defined.
      - We don't implement SA_ONSTACK, because sigaltstack() is not present.
-     - We ignore SA_RESTART, because blocking native Windows API calls are
-       not interrupted anyway when an asynchronous signal occurs, and the
-       MSVCRT runtime never sets errno to EINTR.
+     - We ignore SA_RESTART, because blocking Win32 calls are not interrupted
+       anyway when an asynchronous signal occurs, and the MSVCRT runtime
+       never sets errno to EINTR.
      - We don't implement SA_SIGINFO because it is impossible to do so
        portably.
 
@@ -142,10 +142,10 @@
       return -1;
     }
 
-#ifdef SIGABRT_COMPAT
+  #ifdef SIGABRT_COMPAT
   if (sig == SIGABRT_COMPAT)
     sig = SIGABRT;
-#endif
+  #endif
 
   /* POSIX requires sigaction() to be async-signal-safe.  In other
      words, if an asynchronous signal can occur while we are anywhere
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sig-handler.c gettext-0.18.1.1/gettext-tools/gnulib-lib/sig-handler.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/sig-handler.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sig-handler.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define SIG_HANDLER_INLINE _GL_EXTERN_INLINE
-#include "sig-handler.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sig-handler.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sig-handler.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sig-handler.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sig-handler.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* Convenience declarations when working with <signal.h>.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,13 @@
 
 #include <signal.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef SIG_HANDLER_INLINE
-# define SIG_HANDLER_INLINE _GL_INLINE
-#endif
-
 /* Convenience type when working with signal handlers.  */
 typedef void (*sa_handler_t) (int);
 
 /* Return the handler of a signal, as a sa_handler_t value regardless
    of its true type.  The resulting function can be compared to
    special values like SIG_IGN but it is not portable to call it.  */
-SIG_HANDLER_INLINE sa_handler_t
+static inline sa_handler_t
 get_handler (struct sigaction const *a)
 {
 #ifdef SA_SIGINFO
@@ -49,6 +41,4 @@
   return a->sa_handler;
 }
 
-_GL_INLINE_HEADER_END
-
 #endif /* _GL_SIG_HANDLER_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/signal.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/signal.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/signal.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/signal.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,51 +18,22 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
-/* Special invocation convention:
-   - Inside glibc header files.
-   - On glibc systems we have a sequence of nested includes
-     <signal.h> -> <ucontext.h> -> <signal.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.
-   - On glibc systems with GCC 4.3 we have a sequence of nested includes
-     <csignal> -> </usr/include/signal.h> -> <sys/ucontext.h> -> <signal.h>.
-     In this situation, some of the functions are not yet declared, therefore
-     we cannot provide the C++ aliases.  */
+#if defined __need_sig_atomic_t || defined __need_sigset_t
+/* Special invocation convention inside glibc header files.  */
 
 # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_SIGNAL_H
-
-#define _GL_ALREADY_INCLUDING_SIGNAL_H
-
-/* Define pid_t, uid_t.
-   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.
-   On Solaris 10, <signal.h> includes <sys/types.h>, which eventually includes
-   us; so include <sys/types.h> now, before the second inclusion guard.  */
-#include <sys/types.h>
+#ifndef _GL_SIGNAL_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
-#undef _GL_ALREADY_INCLUDING_SIGNAL_H
-
-#ifndef _@GUARD_PREFIX@_SIGNAL_H
-#define _@GUARD_PREFIX@_SIGNAL_H
-
-/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
-   pthread_sigmask in <pthread.h>, not in <signal.h>.
-   But avoid namespace pollution on glibc systems.*/
-#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
-    && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
-    && ! defined __GLIBC__
-# include <pthread.h>
-#endif
+#ifndef _GL_SIGNAL_H
+#define _GL_SIGNAL_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -70,38 +41,22 @@
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
+/* Define pid_t, uid_t.
+   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>
+
 /* On AIX, sig_atomic_t already includes volatile.  C99 requires that
    'volatile sig_atomic_t' ignore the extra modifier, but C89 did not.
    Hence, redefine this to a non-volatile type as needed.  */
 #if ! @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
-# if !GNULIB_defined_sig_atomic_t
 typedef int rpl_sig_atomic_t;
-#  undef sig_atomic_t
-#  define sig_atomic_t rpl_sig_atomic_t
-#  define GNULIB_defined_sig_atomic_t 1
-# endif
+# undef sig_atomic_t
+# define sig_atomic_t rpl_sig_atomic_t
 #endif
 
 /* A set or mask of signals.  */
 #if !@HAVE_SIGSET_T@
-# if !GNULIB_defined_sigset_t
 typedef unsigned int sigset_t;
-#  define GNULIB_defined_sigset_t 1
-# endif
-#endif
-
-/* Define sighandler_t, the type of signal handlers.  A GNU extension.  */
-#if !@HAVE_SIGHANDLER_T@
-# ifdef __cplusplus
-extern "C" {
-# endif
-# if !GNULIB_defined_sighandler_t
-typedef void (*sighandler_t) (int);
-#  define GNULIB_defined_sighandler_t 1
-# endif
-# ifdef __cplusplus
-}
-# endif
 #endif
 
 
@@ -116,102 +71,22 @@
 #endif
 
 
-/* Maximum signal number + 1.  */
-#ifndef NSIG
-# if defined __TANDEM
-#  define NSIG 32
-# endif
-#endif
-
-
-#if @GNULIB_PTHREAD_SIGMASK@
-# if @REPLACE_PTHREAD_SIGMASK@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pthread_sigmask
-#   define pthread_sigmask rpl_pthread_sigmask
-#  endif
-_GL_FUNCDECL_RPL (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-_GL_CXXALIAS_RPL (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-# else
-#  if !@HAVE_PTHREAD_SIGMASK@
-_GL_FUNCDECL_SYS (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-#  endif
-_GL_CXXALIAS_SYS (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-# endif
-_GL_CXXALIASWARN (pthread_sigmask);
-#elif defined GNULIB_POSIXCHECK
-# undef pthread_sigmask
-# if HAVE_RAW_DECL_PTHREAD_SIGMASK
-_GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - "
-                 "use gnulib module pthread_sigmask for portability");
-# endif
-#endif
-
-
-#if @GNULIB_RAISE@
-# if @REPLACE_RAISE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef raise
-#   define raise rpl_raise
-#  endif
-_GL_FUNCDECL_RPL (raise, int, (int sig));
-_GL_CXXALIAS_RPL (raise, int, (int sig));
-# else
-#  if !@HAVE_RAISE@
-_GL_FUNCDECL_SYS (raise, int, (int sig));
-#  endif
-_GL_CXXALIAS_SYS (raise, int, (int sig));
-# endif
-_GL_CXXALIASWARN (raise);
-#elif defined GNULIB_POSIXCHECK
-# undef raise
-/* Assume raise is always declared.  */
-_GL_WARN_ON_USE (raise, "raise can crash on native Windows - "
-                 "use gnulib module raise for portability");
-#endif
-
-
 #if @GNULIB_SIGPROCMASK@
 # if !@HAVE_POSIX_SIGNALBLOCKING@
 
-#  ifndef GNULIB_defined_signal_blocking
-#   define GNULIB_defined_signal_blocking 1
-#  endif
-
 /* Maximum signal number + 1.  */
 #  ifndef NSIG
 #   define NSIG 32
 #  endif
 
 /* This code supports only 32 signals.  */
-#  if !GNULIB_defined_verify_NSIG_constraint
-typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1];
-#   define GNULIB_defined_verify_NSIG_constraint 1
-#  endif
+typedef int verify_NSIG_constraint[2 * (NSIG <= 32) - 1];
 
 # endif
 
-/* When also using extern inline, suppress the use of static inline in
-   standard headers of problematic Apple configurations, as Libc at
-   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
-     && (defined __i386__ || defined __x86_64__))
-# undef sigaddset
-# undef sigdelset
-# undef sigemptyset
-# undef sigfillset
-# undef sigismember
-#endif
-
 /* Test whether a given signal is contained in a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigismember
 #  endif
@@ -224,7 +99,7 @@
 
 /* Initialize a signal set to the empty set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigemptyset
 #  endif
@@ -236,7 +111,7 @@
 
 /* Add a signal to a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigaddset
 #  endif
@@ -249,7 +124,7 @@
 
 /* Remove a signal from a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigdelset
 #  endif
@@ -262,7 +137,7 @@
 
 /* Fill a signal set with all possible signals.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigfillset
 #  endif
@@ -300,10 +175,7 @@
 # ifdef __cplusplus
 extern "C" {
 # endif
-# if !GNULIB_defined_function_taking_int_returning_void_t
 typedef void (*_gl_function_taking_int_returning_void_t) (int);
-#  define GNULIB_defined_function_taking_int_returning_void_t 1
-# endif
 # ifdef __cplusplus
 }
 # endif
@@ -321,10 +193,18 @@
 # endif
 _GL_CXXALIASWARN (signal);
 
+/* Raise signal SIG.  */
 # if !@HAVE_POSIX_SIGNALBLOCKING@ && GNULIB_defined_SIGPIPE
-/* Raise signal SIGPIPE.  */
-_GL_EXTERN_C int _gl_raise_SIGPIPE (void);
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef raise
+#   define raise rpl_raise
+#  endif
+_GL_FUNCDECL_RPL (raise, int, (int sig));
+_GL_CXXALIAS_RPL (raise, int, (int sig));
+# else
+_GL_CXXALIAS_SYS (raise, int, (int sig));
 # endif
+_GL_CXXALIASWARN (raise);
 
 #elif defined GNULIB_POSIXCHECK
 # undef sigaddset
@@ -369,9 +249,6 @@
 # if !@HAVE_SIGACTION@
 
 #  if !@HAVE_SIGINFO_T@
-
-#   if !GNULIB_defined_siginfo_types
-
 /* Present to allow compilation, but unsupported by gnulib.  */
 union sigval
 {
@@ -393,17 +270,11 @@
   union sigval si_value;
 };
 typedef struct siginfo_t siginfo_t;
-
-#    define GNULIB_defined_siginfo_types 1
-#   endif
-
 #  endif /* !@HAVE_SIGINFO_T@ */
 
 /* We assume that platforms which lack the sigaction() function also lack
    the 'struct sigaction' type, and vice versa.  */
 
-#  if !GNULIB_defined_struct_sigaction
-
 struct sigaction
 {
   union
@@ -419,15 +290,12 @@
   /* Not all POSIX flags are supported.  */
   int sa_flags;
 };
-#   define sa_handler _sa_func._sa_handler
-#   define sa_sigaction _sa_func._sa_sigaction
+#  define sa_handler _sa_func._sa_handler
+#  define sa_sigaction _sa_func._sa_sigaction
 /* Unsupported flags are not present.  */
-#   define SA_RESETHAND 1
-#   define SA_NODEFER 2
-#   define SA_RESTART 4
-
-#   define GNULIB_defined_struct_sigaction 1
-#  endif
+#  define SA_RESETHAND 1
+#  define SA_NODEFER 2
+#  define SA_RESTART 4
 
 _GL_FUNCDECL_SYS (sigaction, int, (int, const struct sigaction *restrict,
                                    struct sigaction *restrict));
@@ -456,6 +324,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sigprocmask.c gettext-0.18.1.1/gettext-tools/gnulib-lib/sigprocmask.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/sigprocmask.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sigprocmask.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,15 +24,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-# include "msvc-inval.h"
-#endif
-
 /* We assume that a platform without POSIX signal blocking functions
    also does not have the POSIX sigaction() function, only the
    signal() function.  We also assume signal() has SysV semantics,
    where any handler is uninstalled prior to being invoked.  This is
-   true for native Windows platforms.  */
+   true for Woe32 platforms.  */
 
 /* We use raw signal(), but also provide a wrapper rpl_signal() so
    that applications can query or change a blocked signal.  */
@@ -62,28 +58,6 @@
 
 typedef void (*handler_t) (int);
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static handler_t
-signal_nothrow (int sig, handler_t handler)
-{
-  handler_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = signal (sig, handler);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = SIG_ERR;
-      errno = EINVAL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# define signal signal_nothrow
-#endif
-
 /* Handling of gnulib defined signals.  */
 
 #if GNULIB_defined_SIGPIPE
@@ -106,7 +80,6 @@
       return signal (sig, handler);
     }
 }
-# undef signal
 # define signal ext_signal
 #endif
 
@@ -330,20 +303,27 @@
 }
 
 #if GNULIB_defined_SIGPIPE
-/* Raise the signal SIGPIPE.  */
+/* Raise the signal SIG.  */
 int
-_gl_raise_SIGPIPE (void)
+rpl_raise (int sig)
+# undef raise
 {
-  if (blocked_set & (1U << SIGPIPE))
-    pending_array[SIGPIPE] = 1;
-  else
+  switch (sig)
     {
-      handler_t handler = SIGPIPE_handler;
-      if (handler == SIG_DFL)
-        exit (128 + SIGPIPE);
-      else if (handler != SIG_IGN)
-        (*handler) (SIGPIPE);
+    case SIGPIPE:
+      if (blocked_set & (1U << sig))
+        pending_array[sig] = 1;
+      else
+        {
+          handler_t handler = SIGPIPE_handler;
+          if (handler == SIG_DFL)
+            exit (128 + SIGPIPE);
+          else if (handler != SIG_IGN)
+            (*handler) (sig);
+        }
+      return 0;
+    default: /* System defined signal */
+      return raise (sig);
     }
-  return 0;
 }
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/size_max.h gettext-0.18.1.1/gettext-tools/gnulib-lib/size_max.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/size_max.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/size_max.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef GNULIB_SIZE_MAX_H
 #define GNULIB_SIZE_MAX_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/snprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/snprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/snprintf.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/snprintf.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2010 Free Software Foundation, Inc.
    Written by Simon Josefsson and Paul Eggert.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_destroy.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_destroy.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_destroy.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_destroy.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -19,7 +19,7 @@
 /* Specification.  */
 #include <spawn.h>
 
-/* Initialize data structure for file attribute for 'spawn' call.  */
+/* Initialize data structure for file attribute for `spawn' call.  */
 int
 posix_spawnattr_destroy (posix_spawnattr_t *attr)
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_init.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_init.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_init.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_init.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-/* Initialize data structure for file attribute for 'spawn' call.  */
+/* Initialize data structure for file attribute for `spawn' call.  */
 int
 posix_spawnattr_init (posix_spawnattr_t *attr)
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_setflags.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_setflags.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_setflags.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_setflags.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2004, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2004, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_setsigmask.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_setsigmask.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawnattr_setsigmask.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnattr_setsigmask.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_addclose.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_addclose.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_addclose.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_addclose.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -26,44 +26,34 @@
 # define __sysconf(open_max) getdtablesize ()
 #endif
 
-#if !HAVE_WORKING_POSIX_SPAWN
-# include "spawn_int.h"
-#endif
+#include "spawn_int.h"
 
 /* Add an action to FILE-ACTIONS which tells the implementation to call
-   'close' for the given file descriptor during the 'spawn' call.  */
+   `close' for the given file descriptor during the `spawn' call.  */
 int
 posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions,
                                    int fd)
-#undef posix_spawn_file_actions_addclose
 {
   int maxfd = __sysconf (_SC_OPEN_MAX);
+  struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
   if (fd < 0 || fd >= maxfd)
     return EBADF;
 
-#if HAVE_WORKING_POSIX_SPAWN
-  return posix_spawn_file_actions_addclose (file_actions, fd);
-#else
   /* Allocate more memory if needed.  */
   if (file_actions->_used == file_actions->_allocated
       && __posix_spawn_file_actions_realloc (file_actions) != 0)
     /* This can only mean we ran out of memory.  */
     return ENOMEM;
 
-  {
-    struct __spawn_action *rec;
-
-    /* Add the new value.  */
-    rec = &file_actions->_actions[file_actions->_used];
-    rec->tag = spawn_do_close;
-    rec->action.open_action.fd = fd;
+  /* Add the new value.  */
+  rec = &file_actions->_actions[file_actions->_used];
+  rec->tag = spawn_do_close;
+  rec->action.open_action.fd = fd;
 
-    /* Account for the new entry.  */
-    ++file_actions->_used;
+  /* Account for the new entry.  */
+  ++file_actions->_used;
 
-    return 0;
-  }
-#endif
+  return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_adddup2.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_adddup2.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_adddup2.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_adddup2.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -26,45 +26,35 @@
 # define __sysconf(open_max) getdtablesize ()
 #endif
 
-#if !HAVE_WORKING_POSIX_SPAWN
-# include "spawn_int.h"
-#endif
+#include "spawn_int.h"
 
 /* Add an action to FILE-ACTIONS which tells the implementation to call
-   'dup2' for the given file descriptors during the 'spawn' call.  */
+   `dup2' for the given file descriptors during the `spawn' call.  */
 int
 posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions,
                                   int fd, int newfd)
-#undef posix_spawn_file_actions_adddup2
 {
   int maxfd = __sysconf (_SC_OPEN_MAX);
+  struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
   if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd)
     return EBADF;
 
-#if HAVE_WORKING_POSIX_SPAWN
-  return posix_spawn_file_actions_adddup2 (file_actions, fd, newfd);
-#else
   /* Allocate more memory if needed.  */
   if (file_actions->_used == file_actions->_allocated
       && __posix_spawn_file_actions_realloc (file_actions) != 0)
     /* This can only mean we ran out of memory.  */
     return ENOMEM;
 
-  {
-    struct __spawn_action *rec;
-
-    /* Add the new value.  */
-    rec = &file_actions->_actions[file_actions->_used];
-    rec->tag = spawn_do_dup2;
-    rec->action.dup2_action.fd = fd;
-    rec->action.dup2_action.newfd = newfd;
+  /* Add the new value.  */
+  rec = &file_actions->_actions[file_actions->_used];
+  rec->tag = spawn_do_dup2;
+  rec->action.dup2_action.fd = fd;
+  rec->action.dup2_action.newfd = newfd;
 
-    /* Account for the new entry.  */
-    ++file_actions->_used;
+  /* Account for the new entry.  */
+  ++file_actions->_used;
 
-    return 0;
-  }
-#endif
+  return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_addopen.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_addopen.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_addopen.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_addopen.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -26,48 +26,38 @@
 # define __sysconf(open_max) getdtablesize ()
 #endif
 
-#if !HAVE_WORKING_POSIX_SPAWN
-# include "spawn_int.h"
-#endif
+#include "spawn_int.h"
 
 /* Add an action to FILE-ACTIONS which tells the implementation to call
-   'open' for the given file during the 'spawn' call.  */
+   `open' for the given file during the `spawn' call.  */
 int
 posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
                                   int fd, const char *path, int oflag,
                                   mode_t mode)
-#undef posix_spawn_file_actions_addopen
 {
   int maxfd = __sysconf (_SC_OPEN_MAX);
+  struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
   if (fd < 0 || fd >= maxfd)
     return EBADF;
 
-#if HAVE_WORKING_POSIX_SPAWN
-  return posix_spawn_file_actions_addopen (file_actions, fd, path, oflag, mode);
-#else
   /* Allocate more memory if needed.  */
   if (file_actions->_used == file_actions->_allocated
       && __posix_spawn_file_actions_realloc (file_actions) != 0)
     /* This can only mean we ran out of memory.  */
     return ENOMEM;
 
-  {
-    struct __spawn_action *rec;
-
-    /* Add the new value.  */
-    rec = &file_actions->_actions[file_actions->_used];
-    rec->tag = spawn_do_open;
-    rec->action.open_action.fd = fd;
-    rec->action.open_action.path = path;
-    rec->action.open_action.oflag = oflag;
-    rec->action.open_action.mode = mode;
+  /* Add the new value.  */
+  rec = &file_actions->_actions[file_actions->_used];
+  rec->tag = spawn_do_open;
+  rec->action.open_action.fd = fd;
+  rec->action.open_action.path = path;
+  rec->action.open_action.oflag = oflag;
+  rec->action.open_action.mode = mode;
 
-    /* Account for the new entry.  */
-    ++file_actions->_used;
+  /* Account for the new entry.  */
+  ++file_actions->_used;
 
-    return 0;
-  }
-#endif
+  return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_destroy.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_destroy.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_destroy.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_destroy.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 
-/* Initialize data structure for file attribute for 'spawn' call.  */
+/* Initialize data structure for file attribute for `spawn' call.  */
 int
 posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *file_actions)
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_init.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_init.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn_faction_init.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_faction_init.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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
@@ -27,7 +27,7 @@
 
 
 /* Function used to increase the size of the allocated array.  This
-   function is called from the 'add'-functions.  */
+   function is called from the `add'-functions.  */
 int
 __posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *file_actions)
 {
@@ -46,7 +46,7 @@
 }
 
 
-/* Initialize data structure for file attribute for 'spawn' call.  */
+/* Initialize data structure for file attribute for `spawn' call.  */
 int
 posix_spawn_file_actions_init (posix_spawn_file_actions_t *file_actions)
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawni.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawni.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawni.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawni.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Guts of POSIX spawn interface.  Generic POSIX.1 version.
-   Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2010 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
@@ -91,7 +91,7 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* Native Windows API.  */
+/* Native Woe32 API.  */
 int
 __spawni (pid_t *pid, const char *file,
           const posix_spawn_file_actions_t *file_actions,
@@ -259,7 +259,7 @@
                                               action->action.open_action.mode);
 
                 if (new_fd == -1)
-                  /* The 'open' call failed.  */
+                  /* The `open' call failed.  */
                   _exit (SPAWN_ERROR);
 
                 /* Make sure the desired file descriptor is used.  */
@@ -267,11 +267,11 @@
                   {
                     if (dup2 (new_fd, action->action.open_action.fd)
                         != action->action.open_action.fd)
-                      /* The 'dup2' call failed.  */
+                      /* The `dup2' call failed.  */
                       _exit (SPAWN_ERROR);
 
                     if (close_not_cancel (new_fd) != 0)
-                      /* The 'close' call failed.  */
+                      /* The `close' call failed.  */
                       _exit (SPAWN_ERROR);
                   }
               }
@@ -281,7 +281,7 @@
               if (dup2 (action->action.dup2_action.fd,
                         action->action.dup2_action.newfd)
                   != action->action.dup2_action.newfd)
-                /* The 'dup2' call failed.  */
+                /* The `dup2' call failed.  */
                 _exit (SPAWN_ERROR);
               break;
             }
@@ -296,7 +296,7 @@
       if (errno == ENOEXEC)
         script_execute (file, argv, envp);
 
-      /* Oh, oh.  'execve' returns.  This is bad.  */
+      /* Oh, oh.  `execve' returns.  This is bad.  */
       _exit (SPAWN_ERROR);
     }
 
@@ -305,9 +305,9 @@
   if (path == NULL)
     {
 #if HAVE_CONFSTR
-      /* There is no 'PATH' in the environment.
+      /* There is no `PATH' in the environment.
          The default search path is the current directory
-         followed by the path 'confstr' returns for '_CS_PATH'.  */
+         followed by the path `confstr' returns for `_CS_PATH'.  */
       len = confstr (_CS_PATH, (char *) NULL, 0);
       path = (char *) alloca (1 + len);
       path[0] = ':';
@@ -336,7 +336,7 @@
 
       if (p == path)
         /* Two adjacent colons, or a colon at the beginning or the end
-           of 'PATH' means to search the current directory.  */
+           of `PATH' means to search the current directory.  */
         startp = name + 1;
       else
         startp = (char *) memcpy (name - (p - path), path, p - path);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions for POSIX spawn interface.
-   Copyright (C) 2000, 2003-2004, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003-2004, 2008-2010 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
@@ -15,24 +15,23 @@
    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 _@GUARD_PREFIX@_SPAWN_H
+#ifndef _GL_SPAWN_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SPAWN_H@
 # @INCLUDE_NEXT@ @NEXT_SPAWN_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_SPAWN_H
-#define _@GUARD_PREFIX@_SPAWN_H
+#ifndef _GL_SPAWN_H
+#define _GL_SPAWN_H
 
 /* Get definitions of 'struct sched_param' and 'sigset_t'.
    But avoid namespace pollution on glibc systems.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#ifndef __GLIBC__
 # include <sched.h>
 # include <signal.h>
 #endif
@@ -63,7 +62,7 @@
 #ifndef _Restrict_arr_
 # if ((199901L <= __STDC_VERSION__                                      \
        || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))     \
-           && !defined __STRICT_ANSI__))                                        \
+           && !__STRICT_ANSI__))                                        \
       && !defined __GNUG__)
 #  define _Restrict_arr_ _Restrict_
 # else
@@ -83,7 +82,6 @@
 # define posix_spawnattr_t rpl_posix_spawnattr_t
 #endif
 #if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWNATTR_T@
-# if !GNULIB_defined_posix_spawnattr_t
 typedef struct
 {
   short int _flags;
@@ -94,8 +92,6 @@
   int _policy;
   int __pad[16];
 } posix_spawnattr_t;
-#  define GNULIB_defined_posix_spawnattr_t 1
-# endif
 #endif
 
 
@@ -105,7 +101,6 @@
 # define posix_spawn_file_actions_t rpl_posix_spawn_file_actions_t
 #endif
 #if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
-# if !GNULIB_defined_posix_spawn_file_actions_t
 typedef struct
 {
   int _allocated;
@@ -113,12 +108,10 @@
   struct __spawn_action *_actions;
   int __pad[16];
 } posix_spawn_file_actions_t;
-#  define GNULIB_defined_posix_spawn_file_actions_t 1
-# endif
 #endif
 
 
-/* Flags to be set in the 'posix_spawnattr_t'.  */
+/* Flags to be set in the `posix_spawnattr_t'.  */
 #if @HAVE_POSIX_SPAWN@
 /* Use the values from the system, but provide the missing ones.  */
 # ifndef POSIX_SPAWN_SETSCHEDPARAM
@@ -152,16 +145,11 @@
     | POSIX_SPAWN_SETSCHEDULER                                            \
     | (POSIX_SPAWN_SETSCHEDULER > 0 ? POSIX_SPAWN_SETSCHEDULER - 1 : 0))  \
    + 1)
-#if !GNULIB_defined_verify_POSIX_SPAWN_USEVFORK_no_overlap
 typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap
-            [(((POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP
-                | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK
-                | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER)
-               & POSIX_SPAWN_USEVFORK)
-              == 0)
-             ? 1 : -1];
-# define GNULIB_defined_verify_POSIX_SPAWN_USEVFORK_no_overlap 1
-#endif
+            [2 * (((POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP
+                    | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK
+                    | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER)
+                   & POSIX_SPAWN_USEVFORK) == 0) - 1];
 
 
 #if @GNULIB_POSIX_SPAWN@
@@ -218,7 +206,7 @@
 #endif
 
 #if @GNULIB_POSIX_SPAWNP@
-/* Similar to 'posix_spawn' but search for FILE in the PATH.
+/* Similar to `posix_spawn' but search for FILE in the PATH.
 
    This function is a possible cancellation points and therefore not
    marked with __THROW.  */
@@ -263,7 +251,7 @@
 
 
 #if @GNULIB_POSIX_SPAWNATTR_INIT@
-/* Initialize data structure with attributes for 'spawn' to default values.  */
+/* Initialize data structure with attributes for `spawn' to default values.  */
 # if @REPLACE_POSIX_SPAWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define posix_spawnattr_init rpl_posix_spawnattr_init
@@ -307,8 +295,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_destroy
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_DESTROY
-_GL_WARN_ON_USE (posix_spawnattr_destroy,
-                 "posix_spawnattr_destroy is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_destroy, "posix_spawnattr_destroy is unportable - "
                  "use gnulib module posix_spawnattr_destroy for portability");
 # endif
 #endif
@@ -342,8 +329,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_getsigdefault
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSIGDEFAULT
-_GL_WARN_ON_USE (posix_spawnattr_getsigdefault,
-                 "posix_spawnattr_getsigdefault is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_getsigdefault, "posix_spawnattr_getsigdefault is unportable - "
                  "use gnulib module posix_spawnattr_getsigdefault for portability");
 # endif
 #endif
@@ -376,8 +362,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_setsigdefault
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSIGDEFAULT
-_GL_WARN_ON_USE (posix_spawnattr_setsigdefault,
-                 "posix_spawnattr_setsigdefault is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_setsigdefault, "posix_spawnattr_setsigdefault is unportable - "
                  "use gnulib module posix_spawnattr_setsigdefault for portability");
 # endif
 #endif
@@ -410,8 +395,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_getsigmask
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSIGMASK
-_GL_WARN_ON_USE (posix_spawnattr_getsigmask,
-                 "posix_spawnattr_getsigmask is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_getsigmask, "posix_spawnattr_getsigmask is unportable - "
                  "use gnulib module posix_spawnattr_getsigmask for portability");
 # endif
 #endif
@@ -444,8 +428,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_setsigmask
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSIGMASK
-_GL_WARN_ON_USE (posix_spawnattr_setsigmask,
-                 "posix_spawnattr_setsigmask is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_setsigmask, "posix_spawnattr_setsigmask is unportable - "
                  "use gnulib module posix_spawnattr_setsigmask for portability");
 # endif
 #endif
@@ -478,8 +461,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_getflags
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETFLAGS
-_GL_WARN_ON_USE (posix_spawnattr_getflags,
-                 "posix_spawnattr_getflags is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_getflags, "posix_spawnattr_getflags is unportable - "
                  "use gnulib module posix_spawnattr_getflags for portability");
 # endif
 #endif
@@ -508,8 +490,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_setflags
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETFLAGS
-_GL_WARN_ON_USE (posix_spawnattr_setflags,
-                 "posix_spawnattr_setflags is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_setflags, "posix_spawnattr_setflags is unportable - "
                  "use gnulib module posix_spawnattr_setflags for portability");
 # endif
 #endif
@@ -542,8 +523,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_getpgroup
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETPGROUP
-_GL_WARN_ON_USE (posix_spawnattr_getpgroup,
-                 "posix_spawnattr_getpgroup is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_getpgroup, "posix_spawnattr_getpgroup is unportable - "
                  "use gnulib module posix_spawnattr_getpgroup for portability");
 # endif
 #endif
@@ -572,8 +552,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_setpgroup
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETPGROUP
-_GL_WARN_ON_USE (posix_spawnattr_setpgroup,
-                 "posix_spawnattr_setpgroup is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_setpgroup, "posix_spawnattr_setpgroup is unportable - "
                  "use gnulib module posix_spawnattr_setpgroup for portability");
 # endif
 #endif
@@ -606,8 +585,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_getschedpolicy
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSCHEDPOLICY
-_GL_WARN_ON_USE (posix_spawnattr_getschedpolicy,
-                 "posix_spawnattr_getschedpolicy is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_getschedpolicy, "posix_spawnattr_getschedpolicy is unportable - "
                  "use gnulib module posix_spawnattr_getschedpolicy for portability");
 # endif
 #endif
@@ -636,8 +614,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_setschedpolicy
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSCHEDPOLICY
-_GL_WARN_ON_USE (posix_spawnattr_setschedpolicy,
-                 "posix_spawnattr_setschedpolicy is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_setschedpolicy, "posix_spawnattr_setschedpolicy is unportable - "
                  "use gnulib module posix_spawnattr_setschedpolicy for portability");
 # endif
 #endif
@@ -670,8 +647,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_getschedparam
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSCHEDPARAM
-_GL_WARN_ON_USE (posix_spawnattr_getschedparam,
-                 "posix_spawnattr_getschedparam is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_getschedparam, "posix_spawnattr_getschedparam is unportable - "
                  "use gnulib module posix_spawnattr_getschedparam for portability");
 # endif
 #endif
@@ -704,15 +680,14 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawnattr_setschedparam
 # if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSCHEDPARAM
-_GL_WARN_ON_USE (posix_spawnattr_setschedparam,
-                 "posix_spawnattr_setschedparam is unportable - "
+_GL_WARN_ON_USE (posix_spawnattr_setschedparam, "posix_spawnattr_setschedparam is unportable - "
                  "use gnulib module posix_spawnattr_setschedparam for portability");
 # endif
 #endif
 
 
 #if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT@
-/* Initialize data structure for file attribute for 'spawn' call.  */
+/* Initialize data structure for file attribute for `spawn' call.  */
 # if @REPLACE_POSIX_SPAWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define posix_spawn_file_actions_init rpl_posix_spawn_file_actions_init
@@ -735,8 +710,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawn_file_actions_init
 # if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_INIT
-_GL_WARN_ON_USE (posix_spawn_file_actions_init,
-                 "posix_spawn_file_actions_init is unportable - "
+_GL_WARN_ON_USE (posix_spawn_file_actions_init, "posix_spawn_file_actions_init is unportable - "
                  "use gnulib module posix_spawn_file_actions_init for portability");
 # endif
 #endif
@@ -765,16 +739,15 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawn_file_actions_destroy
 # if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_DESTROY
-_GL_WARN_ON_USE (posix_spawn_file_actions_destroy,
-                 "posix_spawn_file_actions_destroy is unportable - "
+_GL_WARN_ON_USE (posix_spawn_file_actions_destroy, "posix_spawn_file_actions_destroy is unportable - "
                  "use gnulib module posix_spawn_file_actions_destroy for portability");
 # endif
 #endif
 
 #if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 /* Add an action to FILE-ACTIONS which tells the implementation to call
-   'open' for the given file during the 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
+   `open' for the given file during the `spawn' call.  */
+# if @REPLACE_POSIX_SPAWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define posix_spawn_file_actions_addopen rpl_posix_spawn_file_actions_addopen
 #  endif
@@ -804,16 +777,15 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawn_file_actions_addopen
 # if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-_GL_WARN_ON_USE (posix_spawn_file_actions_addopen,
-                 "posix_spawn_file_actions_addopen is unportable - "
+_GL_WARN_ON_USE (posix_spawn_file_actions_addopen, "posix_spawn_file_actions_addopen is unportable - "
                  "use gnulib module posix_spawn_file_actions_addopen for portability");
 # endif
 #endif
 
 #if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
 /* Add an action to FILE-ACTIONS which tells the implementation to call
-   'close' for the given file descriptor during the 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
+   `close' for the given file descriptor during the `spawn' call.  */
+# if @REPLACE_POSIX_SPAWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define posix_spawn_file_actions_addclose rpl_posix_spawn_file_actions_addclose
 #  endif
@@ -835,16 +807,15 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawn_file_actions_addclose
 # if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-_GL_WARN_ON_USE (posix_spawn_file_actions_addclose,
-                 "posix_spawn_file_actions_addclose is unportable - "
+_GL_WARN_ON_USE (posix_spawn_file_actions_addclose, "posix_spawn_file_actions_addclose is unportable - "
                  "use gnulib module posix_spawn_file_actions_addclose for portability");
 # endif
 #endif
 
 #if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
 /* Add an action to FILE-ACTIONS which tells the implementation to call
-   'dup2' for the given file descriptors during the 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
+   `dup2' for the given file descriptors during the `spawn' call.  */
+# if @REPLACE_POSIX_SPAWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define posix_spawn_file_actions_adddup2 rpl_posix_spawn_file_actions_adddup2
 #  endif
@@ -870,12 +841,11 @@
 #elif defined GNULIB_POSIXCHECK
 # undef posix_spawn_file_actions_adddup2
 # if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-_GL_WARN_ON_USE (posix_spawn_file_actions_adddup2,
-                 "posix_spawn_file_actions_adddup2 is unportable - "
+_GL_WARN_ON_USE (posix_spawn_file_actions_adddup2, "posix_spawn_file_actions_adddup2 is unportable - "
                  "use gnulib module posix_spawn_file_actions_adddup2 for portability");
 # endif
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SPAWN_H */
-#endif /* _@GUARD_PREFIX@_SPAWN_H */
+#endif /* _GL_SPAWN_H */
+#endif /* _GL_SPAWN_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn_int.h gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_int.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn_int.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn_int.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2008-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2008, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawnp.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnp.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawnp.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawnp.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn-pipe.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn-pipe.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn-pipe.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,454 +0,0 @@
-/* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2004, 2006-2014 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
-   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>
-
-/* Specification.  */
-#include "spawn-pipe.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include "error.h"
-#include "fatal-signal.h"
-#include "unistd-safer.h"
-#include "wait-process.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Native Windows API.  */
-# include <process.h>
-# include "w32spawn.h"
-
-#else
-
-/* Unix API.  */
-# include <spawn.h>
-
-#endif
-
-/* environ is the exported symbol referencing the internal
-   __cygwin_environ variable on cygwin64:
-   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-#if defined __CYGWIN__ && defined __x86_64__
-extern DLL_VARIABLE char **environ;
-#endif
-
-
-#ifdef EINTR
-
-/* EINTR handling for close().
-   These functions can return -1/EINTR even though we don't have any
-   signal handlers set up, namely when we get interrupted via SIGSTOP.  */
-
-static int
-nonintr_close (int fd)
-{
-  int retval;
-
-  do
-    retval = close (fd);
-  while (retval < 0 && errno == EINTR);
-
-  return retval;
-}
-#define close nonintr_close
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-static int
-nonintr_open (const char *pathname, int oflag, mode_t mode)
-{
-  int retval;
-
-  do
-    retval = open (pathname, oflag, mode);
-  while (retval < 0 && errno == EINTR);
-
-  return retval;
-}
-# undef open /* avoid warning on VMS */
-# define open nonintr_open
-#endif
-
-#endif
-
-
-/* Open a pipe connected to a child process.
- *
- *           write       system                read
- *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child       if pipe_stdin
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child       if pipe_stdout
- *           read        system                write
- *
- * At least one of pipe_stdin, pipe_stdout must be true.
- * pipe_stdin and prog_stdin together determine the child's standard input.
- * pipe_stdout and prog_stdout together determine the child's standard output.
- * If pipe_stdin is true, prog_stdin is ignored.
- * If pipe_stdout is true, prog_stdout is ignored.
- */
-static pid_t
-create_pipe (const char *progname,
-             const char *prog_path, char **prog_argv,
-             bool pipe_stdin, bool pipe_stdout,
-             const char *prog_stdin, const char *prog_stdout,
-             bool null_stderr,
-             bool slave_process, bool exit_on_error,
-             int fd[2])
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-  /* Native Windows API.
-     This uses _pipe(), dup2(), and spawnv().  It could also be implemented
-     using the low-level functions CreatePipe(), DuplicateHandle(),
-     CreateProcess() and _open_osfhandle(); see the GNU make and GNU clisp
-     and cvs source code.  */
-  int ifd[2];
-  int ofd[2];
-  int orig_stdin;
-  int orig_stdout;
-  int orig_stderr;
-  int child;
-  int nulloutfd;
-  int stdinfd;
-  int stdoutfd;
-  int saved_errno;
-
-  /* FIXME: Need to free memory allocated by prepare_spawn.  */
-  prog_argv = prepare_spawn (prog_argv);
-
-  if (pipe_stdout)
-    if (pipe2_safer (ifd, O_BINARY | O_CLOEXEC) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-  if (pipe_stdin)
-    if (pipe2_safer (ofd, O_BINARY | O_CLOEXEC) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-/* Data flow diagram:
- *
- *           write        system         read
- *    parent  ->   ofd[1]   ->   ofd[0]   ->   child       if pipe_stdin
- *    parent  <-   ifd[0]   <-   ifd[1]   <-   child       if pipe_stdout
- *           read         system         write
- *
- */
-
-  /* Save standard file handles of parent process.  */
-  if (pipe_stdin || prog_stdin != NULL)
-    orig_stdin = dup_safer_noinherit (STDIN_FILENO);
-  if (pipe_stdout || prog_stdout != NULL)
-    orig_stdout = dup_safer_noinherit (STDOUT_FILENO);
-  if (null_stderr)
-    orig_stderr = dup_safer_noinherit (STDERR_FILENO);
-  child = -1;
-
-  /* Create standard file handles of child process.  */
-  nulloutfd = -1;
-  stdinfd = -1;
-  stdoutfd = -1;
-  if ((!pipe_stdin || dup2 (ofd[0], STDIN_FILENO) >= 0)
-      && (!pipe_stdout || dup2 (ifd[1], STDOUT_FILENO) >= 0)
-      && (!null_stderr
-          || ((nulloutfd = open ("NUL", O_RDWR, 0)) >= 0
-              && (nulloutfd == STDERR_FILENO
-                  || (dup2 (nulloutfd, STDERR_FILENO) >= 0
-                      && close (nulloutfd) >= 0))))
-      && (pipe_stdin
-          || prog_stdin == NULL
-          || ((stdinfd = open (prog_stdin, O_RDONLY, 0)) >= 0
-              && (stdinfd == STDIN_FILENO
-                  || (dup2 (stdinfd, STDIN_FILENO) >= 0
-                      && close (stdinfd) >= 0))))
-      && (pipe_stdout
-          || prog_stdout == NULL
-          || ((stdoutfd = open (prog_stdout, O_WRONLY, 0)) >= 0
-              && (stdoutfd == STDOUT_FILENO
-                  || (dup2 (stdoutfd, STDOUT_FILENO) >= 0
-                      && close (stdoutfd) >= 0)))))
-    /* The child process doesn't inherit ifd[0], ifd[1], ofd[0], ofd[1],
-       but it inherits all open()ed or dup2()ed file handles (which is what
-       we want in the case of STD*_FILENO).  */
-    /* Use spawnvpe and pass the environment explicitly.  This is needed if
-       the program has modified the environment using putenv() or [un]setenv().
-       On Windows, programs have two environments, one in the "environment
-       block" of the process and managed through SetEnvironmentVariable(), and
-       one inside the process, in the location retrieved by the 'environ'
-       macro.  When using spawnvp() without 'e', the child process inherits a
-       copy of the environment block - ignoring the effects of putenv() and
-       [un]setenv().  */
-    {
-      child = spawnvpe (P_NOWAIT, prog_path, (const char **) prog_argv,
-                        (const char **) environ);
-      if (child < 0 && errno == ENOEXEC)
-        {
-          /* prog is not a native executable.  Try to execute it as a
-             shell script.  Note that prepare_spawn() has already prepended
-             a hidden element "sh.exe" to prog_argv.  */
-          --prog_argv;
-          child = spawnvpe (P_NOWAIT, prog_argv[0], (const char **) prog_argv,
-                            (const char **) environ);
-        }
-    }
-  if (child == -1)
-    saved_errno = errno;
-  if (stdinfd >= 0)
-    close (stdinfd);
-  if (stdoutfd >= 0)
-    close (stdoutfd);
-  if (nulloutfd >= 0)
-    close (nulloutfd);
-
-  /* Restore standard file handles of parent process.  */
-  if (null_stderr)
-    undup_safer_noinherit (orig_stderr, STDERR_FILENO);
-  if (pipe_stdout || prog_stdout != NULL)
-    undup_safer_noinherit (orig_stdout, STDOUT_FILENO);
-  if (pipe_stdin || prog_stdin != NULL)
-    undup_safer_noinherit (orig_stdin, STDIN_FILENO);
-
-  if (pipe_stdin)
-    close (ofd[0]);
-  if (pipe_stdout)
-    close (ifd[1]);
-  if (child == -1)
-    {
-      if (exit_on_error || !null_stderr)
-        error (exit_on_error ? EXIT_FAILURE : 0, saved_errno,
-               _("%s subprocess failed"), progname);
-      if (pipe_stdout)
-        close (ifd[0]);
-      if (pipe_stdin)
-        close (ofd[1]);
-      errno = saved_errno;
-      return -1;
-    }
-
-  if (pipe_stdout)
-    fd[0] = ifd[0];
-  if (pipe_stdin)
-    fd[1] = ofd[1];
-  return child;
-
-#else
-
-  /* Unix API.  */
-  int ifd[2];
-  int ofd[2];
-  sigset_t blocked_signals;
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  posix_spawnattr_t attrs;
-  bool attrs_allocated;
-  int err;
-  pid_t child;
-
-  if (pipe_stdout)
-    if (pipe_safer (ifd) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-  if (pipe_stdin)
-    if (pipe_safer (ofd) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-/* Data flow diagram:
- *
- *           write        system         read
- *    parent  ->   ofd[1]   ->   ofd[0]   ->   child       if pipe_stdin
- *    parent  <-   ifd[0]   <-   ifd[1]   <-   child       if pipe_stdout
- *           read         system         write
- *
- */
-
-  if (slave_process)
-    {
-      sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
-      block_fatal_signals ();
-    }
-  actions_allocated = false;
-  attrs_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (pipe_stdin
-           && (err = posix_spawn_file_actions_adddup2 (&actions,
-                                                       ofd[0], STDIN_FILENO))
-              != 0)
-          || (pipe_stdout
-              && (err = posix_spawn_file_actions_adddup2 (&actions,
-                                                          ifd[1], STDOUT_FILENO))
-                 != 0)
-          || (pipe_stdin
-              && (err = posix_spawn_file_actions_addclose (&actions, ofd[0]))
-                 != 0)
-          || (pipe_stdout
-              && (err = posix_spawn_file_actions_addclose (&actions, ifd[1]))
-                 != 0)
-          || (pipe_stdin
-              && (err = posix_spawn_file_actions_addclose (&actions, ofd[1]))
-                 != 0)
-          || (pipe_stdout
-              && (err = posix_spawn_file_actions_addclose (&actions, ifd[0]))
-                 != 0)
-          || (null_stderr
-              && (err = posix_spawn_file_actions_addopen (&actions,
-                                                          STDERR_FILENO,
-                                                          "/dev/null", O_RDWR,
-                                                          0))
-                 != 0)
-          || (!pipe_stdin
-              && prog_stdin != NULL
-              && (err = posix_spawn_file_actions_addopen (&actions,
-                                                          STDIN_FILENO,
-                                                          prog_stdin, O_RDONLY,
-                                                          0))
-                 != 0)
-          || (!pipe_stdout
-              && prog_stdout != NULL
-              && (err = posix_spawn_file_actions_addopen (&actions,
-                                                          STDOUT_FILENO,
-                                                          prog_stdout, O_WRONLY,
-                                                          0))
-                 != 0)
-          || (slave_process
-              && ((err = posix_spawnattr_init (&attrs)) != 0
-                  || (attrs_allocated = true,
-                      (err = posix_spawnattr_setsigmask (&attrs,
-                                                         &blocked_signals))
-                      != 0
-                      || (err = posix_spawnattr_setflags (&attrs,
-                                                        POSIX_SPAWN_SETSIGMASK))
-                         != 0)))
-          || (err = posix_spawnp (&child, prog_path, &actions,
-                                  attrs_allocated ? &attrs : NULL, prog_argv,
-                                  environ))
-             != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      if (attrs_allocated)
-        posix_spawnattr_destroy (&attrs);
-      if (slave_process)
-        unblock_fatal_signals ();
-      if (exit_on_error || !null_stderr)
-        error (exit_on_error ? EXIT_FAILURE : 0, err,
-               _("%s subprocess failed"), progname);
-      if (pipe_stdout)
-        {
-          close (ifd[0]);
-          close (ifd[1]);
-        }
-      if (pipe_stdin)
-        {
-          close (ofd[0]);
-          close (ofd[1]);
-        }
-      errno = err;
-      return -1;
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  if (attrs_allocated)
-    posix_spawnattr_destroy (&attrs);
-  if (slave_process)
-    {
-      register_slave_subprocess (child);
-      unblock_fatal_signals ();
-    }
-  if (pipe_stdin)
-    close (ofd[0]);
-  if (pipe_stdout)
-    close (ifd[1]);
-
-  if (pipe_stdout)
-    fd[0] = ifd[0];
-  if (pipe_stdin)
-    fd[1] = ofd[1];
-  return child;
-
-#endif
-}
-
-/* Open a bidirectional pipe.
- *
- *           write       system                read
- *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *           read        system                write
- *
- */
-pid_t
-create_pipe_bidi (const char *progname,
-                  const char *prog_path, char **prog_argv,
-                  bool null_stderr,
-                  bool slave_process, bool exit_on_error,
-                  int fd[2])
-{
-  pid_t result = create_pipe (progname, prog_path, prog_argv,
-                              true, true, NULL, NULL,
-                              null_stderr, slave_process, exit_on_error,
-                              fd);
-  return result;
-}
-
-/* Open a pipe for input from a child process.
- * The child's stdin comes from a file.
- *
- *           read        system                write
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *
- */
-pid_t
-create_pipe_in (const char *progname,
-                const char *prog_path, char **prog_argv,
-                const char *prog_stdin, bool null_stderr,
-                bool slave_process, bool exit_on_error,
-                int fd[1])
-{
-  int iofd[2];
-  pid_t result = create_pipe (progname, prog_path, prog_argv,
-                              false, true, prog_stdin, NULL,
-                              null_stderr, slave_process, exit_on_error,
-                              iofd);
-  if (result != -1)
-    fd[0] = iofd[0];
-  return result;
-}
-
-/* Open a pipe for output to a child process.
- * The child's stdout goes to a file.
- *
- *           write       system                read
- *    parent  ->   fd[0]   ->   STDIN_FILENO    ->   child
- *
- */
-pid_t
-create_pipe_out (const char *progname,
-                 const char *prog_path, char **prog_argv,
-                 const char *prog_stdout, bool null_stderr,
-                 bool slave_process, bool exit_on_error,
-                 int fd[1])
-{
-  int iofd[2];
-  pid_t result = create_pipe (progname, prog_path, prog_argv,
-                              true, false, NULL, prog_stdout,
-                              null_stderr, slave_process, exit_on_error,
-                              iofd);
-  if (result != -1)
-    fd[0] = iofd[1];
-  return result;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/spawn-pipe.h gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn-pipe.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/spawn-pipe.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn-pipe.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2003, 2006, 2008-2014 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
-   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 _SPAWN_PIPE_H
-#define _SPAWN_PIPE_H
-
-/* Get pid_t.  */
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <stdbool.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* All these functions create a subprocess and don't wait for its termination.
-   They return the process id of the subprocess.  They also return in fd[]
-   one or two file descriptors for communication with the subprocess.
-   If the subprocess creation fails: if exit_on_error is true, the main
-   process exits with an error message; otherwise, an error message is given
-   if null_stderr is false, then -1 is returned, with errno set, and fd[]
-   remain uninitialized.
-
-   After finishing communication, the caller should call wait_subprocess()
-   to get rid of the subprocess in the process table.
-
-   If slave_process is true, the child process will be terminated when its
-   creator receives a catchable fatal signal or exits normally.  If
-   slave_process is false, the child process will continue running in this
-   case, until it is lucky enough to attempt to communicate with its creator
-   and thus get a SIGPIPE signal.
-
-   If exit_on_error is false, a child process id of -1 should be treated the
-   same way as a subprocess which accepts no input, produces no output and
-   terminates with exit code 127.  Why?  Some errors during posix_spawnp()
-   cause the function posix_spawnp() to return an error code; some other
-   errors cause the subprocess to exit with return code 127.  It is
-   implementation dependent which error is reported which way.  The caller
-   must treat both cases as equivalent.
-
-   It is recommended that no signal is blocked or ignored (i.e. have a
-   signal handler with value SIG_IGN) while any of these functions is called.
-   The reason is that child processes inherit the mask of blocked signals
-   from their parent (both through posix_spawn() and fork()/exec());
-   likewise, signals ignored in the parent are also ignored in the child
-   (except possibly for SIGCHLD).  And POSIX:2001 says [in the description
-   of exec()]:
-       "it should be noted that many existing applications wrongly
-        assume that they start with certain signals set to the default
-        action and/or unblocked. In particular, applications written
-        with a simpler signal model that does not include blocking of
-        signals, such as the one in the ISO C standard, may not behave
-        properly if invoked with some signals blocked. Therefore, it is
-        best not to block or ignore signals across execs without explicit
-        reason to do so, and especially not to block signals across execs
-        of arbitrary (not closely co-operating) programs."  */
-
-/* Open a pipe for output to a child process.
- * The child's stdout goes to a file.
- *
- *           write       system                read
- *    parent  ->   fd[0]   ->   STDIN_FILENO    ->   child
- *
- * Note: When writing to a child process, it is useful to ignore the SIGPIPE
- * signal and the EPIPE error code.
- */
-extern pid_t create_pipe_out (const char *progname,
-                              const char *prog_path, char **prog_argv,
-                              const char *prog_stdout, bool null_stderr,
-                              bool slave_process, bool exit_on_error,
-                              int fd[1]);
-
-/* Open a pipe for input from a child process.
- * The child's stdin comes from a file.
- *
- *           read        system                write
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *
- */
-extern pid_t create_pipe_in (const char *progname,
-                             const char *prog_path, char **prog_argv,
-                             const char *prog_stdin, bool null_stderr,
-                             bool slave_process, bool exit_on_error,
-                             int fd[1]);
-
-/* Open a bidirectional pipe.
- *
- *           write       system                read
- *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *           read        system                write
- *
- * Note: When writing to a child process, it is useful to ignore the SIGPIPE
- * signal and the EPIPE error code.
- *
- * Note: The parent process must be careful to avoid deadlock.
- * 1) If you write more than PIPE_MAX bytes or, more generally, if you write
- *    more bytes than the subprocess can handle at once, the subprocess
- *    may write its data and wait on you to read it, but you are currently
- *    busy writing.
- * 2) When you don't know ahead of time how many bytes the subprocess
- *    will produce, the usual technique of calling read (fd, buf, BUFSIZ)
- *    with a fixed BUFSIZ will, on Linux 2.2.17 and on BSD systems, cause
- *    the read() call to block until *all* of the buffer has been filled.
- *    But the subprocess cannot produce more data until you gave it more
- *    input.  But you are currently busy reading from it.
- */
-extern pid_t create_pipe_bidi (const char *progname,
-                               const char *prog_path, char **prog_argv,
-                               bool null_stderr,
-                               bool slave_process, bool exit_on_error,
-                               int fd[2]);
-
-/* The name of the "always silent" device.  */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Windows API.  */
-# define DEV_NULL "NUL"
-#else
-/* Unix API.  */
-# define DEV_NULL "/dev/null"
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _SPAWN_PIPE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stat.c gettext-0.18.1.1/gettext-tools/gnulib-lib/stat.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/stat.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stat.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,59 +16,27 @@
 
 /* written by Eric Blake */
 
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
-   rpl_stat.  */
-#define __need_system_sys_stat_h
 #include <config.h>
 
 /* Get the original definition of stat.  It might be defined as a macro.  */
+#define __need_system_sys_stat_h
 #include <sys/types.h>
 #include <sys/stat.h>
 #undef __need_system_sys_stat_h
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# if _GL_WINDOWS_64_BIT_ST_SIZE
-#  undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-#  define stat _stati64
-#  define REPLACE_FUNC_STAT_DIR 1
-#  undef REPLACE_FUNC_STAT_FILE
-# elif REPLACE_FUNC_STAT_FILE
-/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a.
-   Bypass it.  */
-#  define stat _stat
-#  define REPLACE_FUNC_STAT_DIR 1
-#  undef REPLACE_FUNC_STAT_FILE
-# endif
-#endif
-
-static int
+static inline int
 orig_stat (const char *filename, struct stat *buf)
 {
   return stat (filename, buf);
 }
 
 /* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-#include "sys/stat.h"
+#include <sys/stat.h>
 
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
-#include "dosname.h"
-#include "verify.h"
-
-#if REPLACE_FUNC_STAT_DIR
-# include "pathmax.h"
-  /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
-     have a constant PATH_MAX.  */
-# ifndef PATH_MAX
-#  error "Please port this replacement to your platform"
-# endif
-#endif
 
 /* Store information about NAME into ST.  Work around bugs with
    trailing slashes.  Mingw has other bugs (such as st_ino always
@@ -94,7 +62,6 @@
     }
 #endif /* REPLACE_FUNC_STAT_FILE */
 #if REPLACE_FUNC_STAT_DIR
-
   if (result == -1 && errno == ENOENT)
     {
       /* Due to mingw's oddities, there are some directories (like
@@ -109,7 +76,6 @@
       char fixed_name[PATH_MAX + 1] = {0};
       size_t len = strlen (name);
       bool check_dir = false;
-      verify (PATH_MAX <= 4096);
       if (PATH_MAX <= len)
         errno = ENAMETOOLONG;
       else if (len)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stdarg.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdarg.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/stdarg.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdarg.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,24 +12,24 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_STDARG_H
+#ifndef _GL_STDARG_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDARG_H@
 
-#ifndef _@GUARD_PREFIX@_STDARG_H
-#define _@GUARD_PREFIX@_STDARG_H
+#ifndef _GL_STDARG_H
+#define _GL_STDARG_H
 
 #ifndef va_copy
 # define va_copy(a,b) ((a) = (b))
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDARG_H */
-#endif /* _@GUARD_PREFIX@_STDARG_H */
+#endif /* _GL_STDARG_H */
+#endif /* _GL_STDARG_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stdbool.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdbool.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/stdbool.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdbool.in.h	2010-05-24 10:59:09.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2010 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
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GL_STDBOOL_H
 #define _GL_STDBOOL_H
@@ -66,19 +67,24 @@
 # undef true
 #endif
 
-#ifdef __cplusplus
-# define _Bool bool
-# define bool bool
-#else
-# if defined __BEOS__ && !defined __HAIKU__
+/* For the sake of symbolic names in gdb, we define true and false as
+   enum constants, not only as macros.
+   It is tempting to write
+      typedef enum { false = 0, true = 1 } _Bool;
+   so that gdb prints values of type 'bool' symbolically. But if we do
+   this, values of type '_Bool' may promote to 'int' or 'unsigned int'
+   (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+   (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+   enum; this ensures that '_Bool' promotes to 'int'.  */
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
   /* A compiler known to have 'bool'.  */
   /* If the compiler already has both 'bool' and '_Bool', we can assume they
      are the same types.  */
-#  if !@HAVE__BOOL@
+# if !@HAVE__BOOL@
 typedef bool _Bool;
-#  endif
-# else
-#  if !defined __GNUC__
+# endif
+#else
+# if !defined __GNUC__
    /* If @HAVE__BOOL@:
         Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
         the built-in _Bool type is used.  See
@@ -98,35 +104,19 @@
           "Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
         The only benefit of the enum, debuggability, is not important
         with these compilers.  So use 'signed char' and no enum.  */
-#   define _Bool signed char
-#  else
+#  define _Bool signed char
+# else
    /* With this compiler, trust the _Bool type if the compiler has it.  */
-#   if !@HAVE__BOOL@
-   /* For the sake of symbolic names in gdb, define true and false as
-      enum constants, not only as macros.
-      It is tempting to write
-         typedef enum { false = 0, true = 1 } _Bool;
-      so that gdb prints values of type 'bool' symbolically.  But then
-      values of type '_Bool' might promote to 'int' or 'unsigned int'
-      (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
-      (see ISO C 99 6.3.1.1.(2)).  So add a negative value to the
-      enum; this ensures that '_Bool' promotes to 'int'.  */
+#  if !@HAVE__BOOL@
 typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
-#   endif
 #  endif
 # endif
-# define bool _Bool
 #endif
+#define bool _Bool
 
 /* The other macros must be usable in preprocessor directives.  */
-#ifdef __cplusplus
-# define false false
-# define true true
-#else
-# define false 0
-# define true 1
-#endif
-
+#define false 0
+#define true 1
 #define __bool_true_false_are_defined 1
 
 #endif /* _GL_STDBOOL_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stddef.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stddef.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/stddef.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stddef.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake.  */
 
@@ -25,7 +26,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_wchar_t || defined __need_size_t  \
   || defined __need_ptrdiff_t || defined __need_NULL \
@@ -37,9 +37,9 @@
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   undef _@GUARD_PREFIX@_STDDEF_H
+#   undef _GL_STDDEF_H
 #   define _GL_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -48,14 +48,14 @@
 #else
 /* Normal invocation convention.  */
 
-# ifndef _@GUARD_PREFIX@_STDDEF_H
+# ifndef _GL_STDDEF_H
 
 /* The include_next requires a split double-inclusion guard.  */
 
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
 
-#  ifndef _@GUARD_PREFIX@_STDDEF_H
-#   define _@GUARD_PREFIX@_STDDEF_H
+#  ifndef _GL_STDDEF_H
+#   define _GL_STDDEF_H
 
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
 #if @REPLACE_NULL@
@@ -81,6 +81,6 @@
 # define wchar_t int
 #endif
 
-#  endif /* _@GUARD_PREFIX@_STDDEF_H */
-# endif /* _@GUARD_PREFIX@_STDDEF_H */
+#  endif /* _GL_STDDEF_H */
+# endif /* _GL_STDDEF_H */
 #endif /* __need_XXX */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stdint.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/stdint.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -13,19 +13,19 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
  * ISO C 99 <stdint.h> for platforms that lack it.
  * <http://www.opengroup.org/susv3xbd/stdint.h.html>
  */
 
-#ifndef _@GUARD_PREFIX@_STDINT_H
+#ifndef _GL_STDINT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* When including a system file that in turn includes <inttypes.h>,
    use the system <inttypes.h>, not our substitute.  This avoids
@@ -33,15 +33,6 @@
    <inttypes.h>.  */
 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
-/* On Android (Bionic libc), <sys/types.h> includes this file before
-   having defined 'time_t'.  Therefore in this case avoid including
-   other system header files; just include the system's <stdint.h>.
-   Ideally we should test __BIONIC__ here, but it is only defined after
-   <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
-#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H
-# @INCLUDE_NEXT@ @NEXT_STDINT_H@
-#else
-
 /* Get those types that are already defined in other system include
    files, so that we can "#define int8_t signed char" below without
    worrying about a later system include file containing a "typedef
@@ -57,40 +48,28 @@
       diagnostics.  */
 #  define __STDINT_H__
 # endif
-
-  /* Some pre-C++11 <stdint.h> implementations need this.  */
-# ifdef __cplusplus
-#  ifndef __STDC_CONSTANT_MACROS
-#   define __STDC_CONSTANT_MACROS 1
-#  endif
-#  ifndef __STDC_LIMIT_MACROS
-#   define __STDC_LIMIT_MACROS 1
-#  endif
-# endif
-
   /* Other systems may have an incomplete or buggy <stdint.h>.
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
-     _@GUARD_PREFIX@_STDINT_H is defined.
+     _GL_STDINT_H is defined.
      The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #endif
 
-#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-#define _@GUARD_PREFIX@_STDINT_H
+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_STDINT_H
 
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
    AIX 5.2 <sys/types.h> isn't needed and causes troubles.
-   Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @NEXT_STDINT_H@.  */
 #if @HAVE_SYS_TYPES_H@ && ! defined _AIX
 # include <sys/types.h>
 #endif
 
-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
-   LONG_MIN, LONG_MAX, ULONG_MAX.  */
+/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 
 #if @HAVE_INTTYPES_H@
@@ -113,7 +92,7 @@
 
 #undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
-/* Minimum and maximum values for an integer type under the usual assumption.
+/* Minimum and maximum values for a integer type under the usual assumption.
    Return an unspecified value if BITS == 0, adding a check to pacify
    picky compilers.  */
 
@@ -128,8 +107,6 @@
         warnings in the signed case.  */ \
      ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
-#if !GNULIB_defined_stdint_types
-
 /* 7.18.1.1. Exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -156,54 +133,40 @@
 #define int32_t gl_int32_t
 #define uint32_t gl_uint32_t
 
-/* If the system defines INT64_MAX, assume int64_t works.  That way,
-   if the underlying platform defines int64_t to be a 64-bit long long
-   int, the code below won't mistakenly define it to be a 64-bit long
-   int, which would mess up C++ name mangling.  We must use #ifdef
-   rather than #if, to avoid an error with HP-UX 10.20 cc.  */
-
-#ifdef INT64_MAX
-# define GL_INT64_T
-#else
 /* Do not undefine int64_t if gnulib is not being used with 64-bit
    types, since otherwise it breaks platforms like Tandem/NSK.  */
-# if LONG_MAX >> 31 >> 31 == 1
-#  undef int64_t
+#if LONG_MAX >> 31 >> 31 == 1
+# undef int64_t
 typedef long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif defined _MSC_VER
-#  undef int64_t
+# define int64_t gl_int64_t
+# define GL_INT64_T
+#elif defined _MSC_VER
+# undef int64_t
 typedef __int64 gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif @HAVE_LONG_LONG_INT@
-#  undef int64_t
+# define int64_t gl_int64_t
+# define GL_INT64_T
+#elif @HAVE_LONG_LONG_INT@
+# undef int64_t
 typedef long long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# endif
+# define int64_t gl_int64_t
+# define GL_INT64_T
 #endif
 
-#ifdef UINT64_MAX
-# define GL_UINT64_T
-#else
-# if ULONG_MAX >> 31 >> 31 >> 1 == 1
-#  undef uint64_t
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# undef uint64_t
 typedef unsigned long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif defined _MSC_VER
-#  undef uint64_t
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+#elif defined _MSC_VER
+# undef uint64_t
 typedef unsigned __int64 gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@
-#  undef uint64_t
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# undef uint64_t
 typedef unsigned long long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# endif
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
 #endif
 
 /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
@@ -246,9 +209,8 @@
 
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-   are taken from the same list of types.  The following code normally
-   uses types consistent with glibc, as that lessens the chance of
-   incompatibility with older GNU hosts.  */
+   are taken from the same list of types.  Assume that 'long int'
+   is fast enough for all narrower integers.  */
 
 #undef int_fast8_t
 #undef uint_fast8_t
@@ -258,21 +220,12 @@
 #undef uint_fast32_t
 #undef int_fast64_t
 #undef uint_fast64_t
-typedef signed char gl_int_fast8_t;
-typedef unsigned char gl_uint_fast8_t;
-
-#ifdef __sun
-/* Define types compatible with SunOS 5.10, so that code compiled under
-   earlier SunOS versions works with code compiled under SunOS 5.10.  */
-typedef int gl_int_fast32_t;
-typedef unsigned int gl_uint_fast32_t;
-#else
+typedef long int gl_int_fast8_t;
+typedef unsigned long int gl_uint_fast8_t;
+typedef long int gl_int_fast16_t;
+typedef unsigned long int gl_uint_fast16_t;
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
-#endif
-typedef gl_int_fast32_t gl_int_fast16_t;
-typedef gl_uint_fast32_t gl_uint_fast16_t;
-
 #define int_fast8_t gl_int_fast8_t
 #define uint_fast8_t gl_uint_fast8_t
 #define int_fast16_t gl_int_fast16_t
@@ -300,49 +253,37 @@
 /* Note: These types are compiler dependent. It may be unwise to use them in
    public header files. */
 
-/* If the system defines INTMAX_MAX, assume that intmax_t works, and
-   similarly for UINTMAX_MAX and uintmax_t.  This avoids problems with
-   assuming one type where another is used by the system.  */
-
-#ifndef INTMAX_MAX
-# undef INTMAX_C
-# undef intmax_t
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#undef intmax_t
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 typedef long long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# elif defined GL_INT64_T
-#  define intmax_t int64_t
-# else
+# define intmax_t gl_intmax_t
+#elif defined GL_INT64_T
+# define intmax_t int64_t
+#else
 typedef long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# endif
+# define intmax_t gl_intmax_t
 #endif
 
-#ifndef UINTMAX_MAX
-# undef UINTMAX_C
-# undef uintmax_t
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#undef uintmax_t
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 typedef unsigned long long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# elif defined GL_UINT64_T
-#  define uintmax_t uint64_t
-# else
+# define uintmax_t gl_uintmax_t
+#elif defined GL_UINT64_T
+# define uintmax_t uint64_t
+#else
 typedef unsigned long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# endif
+# define uintmax_t gl_uintmax_t
 #endif
 
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
    breaks if this is not the case.  If this check fails, the reason is likely
    to be found in the autoconf macros.  */
-typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
-                                ? 1 : -1];
-
-#define GNULIB_defined_stdint_types 1
-#endif /* !GNULIB_defined_stdint_types */
+typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
 
 /* 7.18.2. Limits of specified-width integer types */
 
+#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
+
 /* 7.18.2.1. Limits of exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -369,14 +310,17 @@
 #define INT32_MAX  2147483647
 #define UINT32_MAX  4294967295U
 
-#if defined GL_INT64_T && ! defined INT64_MAX
+#undef INT64_MIN
+#undef INT64_MAX
+#ifdef GL_INT64_T
 /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
    evaluates the latter incorrectly in preprocessor expressions.  */
 # define INT64_MIN  (- INTMAX_C (1) << 63)
 # define INT64_MAX  INTMAX_C (9223372036854775807)
 #endif
 
-#if defined GL_UINT64_T && ! defined UINT64_MAX
+#undef UINT64_MAX
+#ifdef GL_UINT64_T
 # define UINT64_MAX  UINTMAX_C (18446744073709551615)
 #endif
 
@@ -428,29 +372,23 @@
 #undef INT_FAST8_MIN
 #undef INT_FAST8_MAX
 #undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  SCHAR_MIN
-#define INT_FAST8_MAX  SCHAR_MAX
-#define UINT_FAST8_MAX  UCHAR_MAX
+#define INT_FAST8_MIN  LONG_MIN
+#define INT_FAST8_MAX  LONG_MAX
+#define UINT_FAST8_MAX  ULONG_MAX
 
 #undef INT_FAST16_MIN
 #undef INT_FAST16_MAX
 #undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  INT_FAST32_MIN
-#define INT_FAST16_MAX  INT_FAST32_MAX
-#define UINT_FAST16_MAX  UINT_FAST32_MAX
+#define INT_FAST16_MIN  LONG_MIN
+#define INT_FAST16_MAX  LONG_MAX
+#define UINT_FAST16_MAX  ULONG_MAX
 
 #undef INT_FAST32_MIN
 #undef INT_FAST32_MAX
 #undef UINT_FAST32_MAX
-#ifdef __sun
-# define INT_FAST32_MIN  INT_MIN
-# define INT_FAST32_MAX  INT_MAX
-# define UINT_FAST32_MAX  UINT_MAX
-#else
-# define INT_FAST32_MIN  LONG_MIN
-# define INT_FAST32_MAX  LONG_MAX
-# define UINT_FAST32_MAX  ULONG_MAX
-#endif
+#define INT_FAST32_MIN  LONG_MIN
+#define INT_FAST32_MAX  LONG_MAX
+#define UINT_FAST32_MAX  ULONG_MAX
 
 #undef INT_FAST64_MIN
 #undef INT_FAST64_MAX
@@ -475,23 +413,21 @@
 
 /* 7.18.2.5. Limits of greatest-width integer types */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_MIN
-# ifdef INT64_MAX
-#  define INTMAX_MIN  INT64_MIN
-#  define INTMAX_MAX  INT64_MAX
-# else
-#  define INTMAX_MIN  INT32_MIN
-#  define INTMAX_MAX  INT32_MAX
-# endif
+#undef INTMAX_MIN
+#undef INTMAX_MAX
+#ifdef INT64_MAX
+# define INTMAX_MIN  INT64_MIN
+# define INTMAX_MAX  INT64_MAX
+#else
+# define INTMAX_MIN  INT32_MIN
+# define INTMAX_MAX  INT32_MAX
 #endif
 
-#ifndef UINTMAX_MAX
-# ifdef UINT64_MAX
-#  define UINTMAX_MAX  UINT64_MAX
-# else
-#  define UINTMAX_MAX  UINT32_MAX
-# endif
+#undef UINTMAX_MAX
+#ifdef UINT64_MAX
+# define UINTMAX_MAX  UINT64_MAX
+#else
+# define UINTMAX_MAX  UINT32_MAX
 #endif
 
 /* 7.18.3. Limits of other integer types */
@@ -539,16 +475,10 @@
 
 /* wchar_t limits */
 /* Get WCHAR_MIN, WCHAR_MAX.
-   This include is not on the top, above, because on OSF/1 4.0 we have a
-   sequence of nested includes
-   <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+   This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested
+   includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
    <stdint.h> and assumes its types are already defined.  */
-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
-  /* 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 <stdio.h>
-# include <time.h>
+#if ! (defined WCHAR_MIN && defined WCHAR_MAX)
 # define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
 # include <wchar.h>
 # undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
@@ -568,8 +498,12 @@
 #define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
+#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
+
 /* 7.18.4. Macros for integer constants */
 
+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+
 /* 7.18.4.1. Macros for minimum-width integer constants */
 /* According to ISO C 99 Technical Corrigendum 1 */
 
@@ -610,26 +544,25 @@
 
 /* 7.18.4.2. Macros for greatest-width integer constants */
 
-#ifndef INTMAX_C
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define INTMAX_C(x)   x##LL
-# elif defined GL_INT64_T
-#  define INTMAX_C(x)   INT64_C(x)
-# else
-#  define INTMAX_C(x)   x##L
-# endif
+#undef INTMAX_C
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# define INTMAX_C(x)   x##LL
+#elif defined GL_INT64_T
+# define INTMAX_C(x)   INT64_C(x)
+#else
+# define INTMAX_C(x)   x##L
 #endif
 
-#ifndef UINTMAX_C
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define UINTMAX_C(x)  x##ULL
-# elif defined GL_UINT64_T
-#  define UINTMAX_C(x)  UINT64_C(x)
-# else
-#  define UINTMAX_C(x)  x##UL
-# endif
+#undef UINTMAX_C
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# define UINTMAX_C(x)  x##ULL
+#elif defined GL_UINT64_T
+# define UINTMAX_C(x)  UINT64_C(x)
+#else
+# define UINTMAX_C(x)  x##UL
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDINT_H */
-#endif /* !(defined __ANDROID__ && ...) */
-#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
+#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
+
+#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/stdio.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,104 +13,47 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_FILE || defined __need___FILE || defined _GL_ALREADY_INCLUDING_STDIO_H
-/* Special invocation convention:
-   - Inside glibc header files.
-   - On OSF/1 5.1 we have a sequence of nested includes
-     <stdio.h> -> <getopt.h> -> <ctype.h> -> <sys/localedef.h> ->
-     <sys/lc_core.h> -> <nl_types.h> -> <mesg.h> -> <stdio.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
+#if defined __need_FILE || defined __need___FILE
+/* Special invocation convention inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_STDIO_H
-
-#define _GL_ALREADY_INCLUDING_STDIO_H
+#ifndef _GL_STDIO_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
-#undef _GL_ALREADY_INCLUDING_STDIO_H
-
-#ifndef _@GUARD_PREFIX@_STDIO_H
-#define _@GUARD_PREFIX@_STDIO_H
+#ifndef _GL_STDIO_H
+#define _GL_STDIO_H
 
 /* Get va_list.  Needed on many systems, including glibc 2.8.  */
 #include <stdarg.h>
 
 #include <stddef.h>
 
-/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
-   and eglibc 2.11.2.
-   May also define off_t to a 64-bit type on native Windows.  */
+/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8.  */
 #include <sys/types.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_PRINTF
-   indicates to GCC that the function takes a format string and arguments,
-   where the format string directives are the ones standardized by ISO C99
-   and POSIX.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
-#else
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF,
-   except that it indicates to GCC that the supported format string directives
-   are the ones of the system printf(), rather than the ones standardized by
-   ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \
-  _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-
-/* _GL_ATTRIBUTE_FORMAT_SCANF
-   indicates to GCC that the function takes a format string and arguments,
-   where the format string directives are the ones standardized by ISO C99
-   and POSIX.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__gnu_scanf__, formatstring_parameter, first_argument))
-#else
-# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_SCANF,
-   except that it indicates to GCC that the supported format string directives
-   are the ones of the system scanf(), rather than the ones standardized by
-   ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter, first_argument) \
-  _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
-
-/* Solaris 10 declares renameat in <unistd.h>, not in <stdio.h>.  */
-/* But in any case avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \
-    && ! defined __GLIBC__
-# include <unistd.h>
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 
@@ -124,15 +67,6 @@
 #define _GL_STDIO_STRINGIZE(token) #token
 #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token)
 
-/* When also using extern inline, suppress the use of static inline in
-   standard headers of problematic Apple configurations, as Libc at
-   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
-     && defined __GNUC__ && defined __STDC__)
-# undef putc_unlocked
-#endif
 
 #if @GNULIB_DPRINTF@
 # if @REPLACE_DPRINTF@
@@ -140,13 +74,13 @@
 #   define dprintf rpl_dprintf
 #  endif
 _GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...));
 # else
 #  if !@HAVE_DPRINTF@
 _GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...));
@@ -179,26 +113,6 @@
                  "use gnulib module fclose for portable POSIX compliance");
 #endif
 
-#if @GNULIB_FDOPEN@
-# if @REPLACE_FDOPEN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fdopen
-#   define fdopen rpl_fdopen
-#  endif
-_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode)
-                                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
-# else
-_GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
-# endif
-_GL_CXXALIASWARN (fdopen);
-#elif defined GNULIB_POSIXCHECK
-# undef fdopen
-/* Assume fdopen is always declared.  */
-_GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - "
-                 "use gnulib module fdopen for portability");
-#endif
-
 #if @GNULIB_FFLUSH@
 /* Flush all pending data on STREAM according to POSIX rules.  Both
    output and seekable input streams are supported.
@@ -223,34 +137,11 @@
                  "use gnulib module fflush for portable POSIX compliance");
 #endif
 
-#if @GNULIB_FGETC@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fgetc
-#   define fgetc rpl_fgetc
-#  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (fgetc, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fgetc, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (fgetc);
-#endif
-
-#if @GNULIB_FGETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fgets
-#   define fgets rpl_fgets
-#  endif
-_GL_FUNCDECL_RPL (fgets, char *, (char *s, int n, FILE *stream)
-                                 _GL_ARG_NONNULL ((1, 3)));
-_GL_CXXALIAS_RPL (fgets, char *, (char *s, int n, FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fgets, char *, (char *s, int n, FILE *stream));
-# endif
-_GL_CXXALIASWARN (fgets);
-#endif
+/* It is very rare that the developer ever has full control of stdin,
+   so any use of gets warrants an unconditional warning.  Assume it is
+   always declared, since it is required by C89.  */
+#undef gets
+_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 
 #if @GNULIB_FOPEN@
 # if @REPLACE_FOPEN@
@@ -268,26 +159,20 @@
 #elif defined GNULIB_POSIXCHECK
 # undef fopen
 /* Assume fopen is always declared.  */
-_GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - "
+_GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - "
                  "use gnulib module fopen for portability");
 #endif
 
 #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@
 # if (@GNULIB_FPRINTF_POSIX@ && @REPLACE_FPRINTF@) \
-     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fprintf rpl_fprintf
 #  endif
 #  define GNULIB_overrides_fprintf 1
-#  if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((1, 2)));
-#  else
-_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3)
-                                _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...));
 # else
 _GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...));
@@ -333,7 +218,7 @@
 #endif
 
 #if @GNULIB_FPUTC@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fputc
 #   define fputc rpl_fputc
@@ -347,7 +232,7 @@
 #endif
 
 #if @GNULIB_FPUTS@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fputs
 #   define fputs rpl_fputs
@@ -361,21 +246,6 @@
 _GL_CXXALIASWARN (fputs);
 #endif
 
-#if @GNULIB_FREAD@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fread
-#   define fread rpl_fread
-#  endif
-_GL_FUNCDECL_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream)
-                                 _GL_ARG_NONNULL ((4)));
-_GL_CXXALIAS_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream));
-# endif
-_GL_CXXALIASWARN (fread);
-#endif
-
 #if @GNULIB_FREOPEN@
 # if @REPLACE_FREOPEN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -395,27 +265,10 @@
 #elif defined GNULIB_POSIXCHECK
 # undef freopen
 /* Assume freopen is always declared.  */
-_GL_WARN_ON_USE (freopen,
-                 "freopen on native Windows platforms is not POSIX compliant - "
+_GL_WARN_ON_USE (freopen, "freopen on Win32 platforms is not POSIX compatible - "
                  "use gnulib module freopen for portability");
 #endif
 
-#if @GNULIB_FSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fscanf
-#   define fscanf rpl_fscanf
-#  endif
-_GL_FUNCDECL_RPL (fscanf, int, (FILE *stream, const char *format, ...)
-                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3)
-                               _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (fscanf, int, (FILE *stream, const char *format, ...));
-# else
-_GL_CXXALIAS_SYS (fscanf, int, (FILE *stream, const char *format, ...));
-# endif
-_GL_CXXALIASWARN (fscanf);
-#endif
-
 
 /* Set up the following warnings, based on which modules are in use.
    GNU Coding Standards discourage the use of fseek, since it imposes
@@ -483,13 +336,29 @@
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
 # else
-#  if ! @HAVE_DECL_FSEEKO@
+#  if ! @HAVE_FSEEKO@
 _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
                                _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
 # endif
 _GL_CXXALIASWARN (fseeko);
+# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@
+   /* Provide an fseek function that is consistent with fseeko.  */
+   /* In order to avoid that fseek gets defined as a macro here, the
+      developer can request the 'fseek' module.  */
+#  undef fseek
+#  define fseek rpl_fseek
+static inline int _GL_ARG_NONNULL ((1))
+rpl_fseek (FILE *fp, long offset, int whence)
+{
+#  if @REPLACE_FSEEKO@
+  return rpl_fseeko (fp, offset, whence);
+#  else
+  return fseeko (fp, offset, whence);
+#  endif
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FSEEK_WARN /* Category 1, above.  */
 # undef fseek
@@ -543,12 +412,28 @@
 _GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp));
 # else
-#  if ! @HAVE_DECL_FTELLO@
+#  if ! @HAVE_FTELLO@
 _GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
 # endif
 _GL_CXXALIASWARN (ftello);
+# if (@REPLACE_FTELLO@ || !@HAVE_FTELLO@) && !@GNULIB_FTELL@
+   /* Provide an ftell function that is consistent with ftello.  */
+   /* In order to avoid that ftell gets defined as a macro here, the
+      developer can request the 'ftell' module.  */
+#  undef ftell
+#  define ftell rpl_ftell
+static inline long _GL_ARG_NONNULL ((1))
+rpl_ftell (FILE *f)
+{
+#  if @REPLACE_FTELLO@
+  return rpl_ftello (f);
+#  else
+  return ftello (f);
+#  endif
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FTELL_WARN /* Category 1, above.  */
 # undef ftell
@@ -570,7 +455,7 @@
 
 
 #if @GNULIB_FWRITE@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fwrite
 #   define fwrite rpl_fwrite
@@ -583,61 +468,10 @@
 # else
 _GL_CXXALIAS_SYS (fwrite, size_t,
                   (const void *ptr, size_t s, size_t n, FILE *stream));
-
-/* Work around bug 11959 when fortifying glibc 2.4 through 2.15
-   <http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
-   which sometimes causes an unwanted diagnostic for fwrite calls.
-   This affects only function declaration attributes under certain
-   versions of gcc and clang, and is not needed for C++.  */
-#  if (0 < __USE_FORTIFY_LEVEL                                          \
-       && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
-       && 3 < __GNUC__ + (4 <= __GNUC_MINOR__)                          \
-       && !defined __cplusplus)
-#   undef fwrite
-#   undef fwrite_unlocked
-extern size_t __REDIRECT (rpl_fwrite,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite);
-extern size_t __REDIRECT (rpl_fwrite_unlocked,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite_unlocked);
-#   define fwrite rpl_fwrite
-#   define fwrite_unlocked rpl_fwrite_unlocked
-#  endif
 # endif
 _GL_CXXALIASWARN (fwrite);
 #endif
 
-#if @GNULIB_GETC@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getc
-#   define getc rpl_fgetc
-#  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (getc, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (getc);
-#endif
-
-#if @GNULIB_GETCHAR@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getchar
-#   define getchar rpl_getchar
-#  endif
-_GL_FUNCDECL_RPL (getchar, int, (void));
-_GL_CXXALIAS_RPL (getchar, int, (void));
-# else
-_GL_CXXALIAS_SYS (getchar, int, (void));
-# endif
-_GL_CXXALIASWARN (getchar);
-#endif
-
 #if @GNULIB_GETDELIM@
 /* Read input, up to (and including) the next occurrence of DELIMITER, from
    STREAM, store it in *LINEPTR (and NUL-terminate it).
@@ -714,15 +548,6 @@
 # endif
 #endif
 
-/* It is very rare that the developer ever has full control of stdin,
-   so any use of gets warrants an unconditional warning; besides, C11
-   removed it.  */
-#undef gets
-#if HAVE_RAW_DECL_GETS
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-#endif
-
-
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
 struct obstack;
 /* Grow an obstack with formatted output.  Return the number of
@@ -736,7 +561,7 @@
 #  endif
 _GL_FUNCDECL_RPL (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...));
@@ -744,7 +569,7 @@
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (obstack_printf, int,
@@ -757,7 +582,7 @@
 #  endif
 _GL_FUNCDECL_RPL (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args));
@@ -765,7 +590,7 @@
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (obstack_vprintf, int,
@@ -774,20 +599,6 @@
 _GL_CXXALIASWARN (obstack_vprintf);
 #endif
 
-#if @GNULIB_PCLOSE@
-# if !@HAVE_PCLOSE@
-_GL_FUNCDECL_SYS (pclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (pclose, int, (FILE *stream));
-_GL_CXXALIASWARN (pclose);
-#elif defined GNULIB_POSIXCHECK
-# undef pclose
-# if HAVE_RAW_DECL_PCLOSE
-_GL_WARN_ON_USE (pclose, "pclose is unportable - "
-                 "use gnulib module pclose for more portability");
-# endif
-#endif
-
 #if @GNULIB_PERROR@
 /* Print a message to standard error, describing the value of ERRNO,
    (if STRING is not NULL and not empty) prefixed with STRING and ": ",
@@ -819,10 +630,6 @@
                                  _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
 # else
-#  if !@HAVE_POPEN@
-_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode)
-                                 _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
 # endif
 _GL_CXXALIASWARN (popen);
@@ -836,37 +643,25 @@
 
 #if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@
 # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
-     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if defined __GNUC__
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 /* Don't break __attribute__((format(printf,M,N))).  */
 #    define printf __printf__
 #   endif
-#   if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL_1 (__printf__, int,
-                    (const char *format, ...)
-                    __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
-                    _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
-                    _GL_ARG_NONNULL ((1)));
-#   else
 _GL_FUNCDECL_RPL_1 (__printf__, int,
                     (const char *format, ...)
                     __asm__ (@ASM_SYMBOL_PREFIX@
                              _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
-                    _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2)
+                    __attribute__ ((__format__ (__printf__, 1, 2)))
                     _GL_ARG_NONNULL ((1)));
-#   endif
 _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...));
 #  else
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define printf rpl_printf
-#   endif
 _GL_FUNCDECL_RPL (printf, int,
                   (const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+                  __attribute__ ((__format__ (__printf__, 1, 2)))
                   _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (printf, int, (const char *format, ...));
+_GL_CXXALIAS_RPL (printf, printf, int, (const char *format, ...));
 #  endif
 #  define GNULIB_overrides_printf 1
 # else
@@ -885,7 +680,7 @@
 #endif
 
 #if @GNULIB_PUTC@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef putc
 #   define putc rpl_fputc
@@ -899,7 +694,7 @@
 #endif
 
 #if @GNULIB_PUTCHAR@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef putchar
 #   define putchar rpl_putchar
@@ -913,7 +708,7 @@
 #endif
 
 #if @GNULIB_PUTS@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef puts
 #   define puts rpl_puts
@@ -997,37 +792,6 @@
 # endif
 #endif
 
-#if @GNULIB_SCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if defined __GNUC__
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef scanf
-/* Don't break __attribute__((format(scanf,M,N))).  */
-#    define scanf __scanf__
-#   endif
-_GL_FUNCDECL_RPL_1 (__scanf__, int,
-                    (const char *format, ...)
-                    __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf))
-                    _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *format, ...));
-#  else
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef scanf
-#    define scanf rpl_scanf
-#   endif
-_GL_FUNCDECL_RPL (scanf, int, (const char *format, ...)
-                              _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                              _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (scanf, int, (const char *format, ...));
-#  endif
-# else
-_GL_CXXALIAS_SYS (scanf, int, (const char *format, ...));
-# endif
-_GL_CXXALIASWARN (scanf);
-#endif
-
 #if @GNULIB_SNPRINTF@
 # if @REPLACE_SNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1035,7 +799,7 @@
 #  endif
 _GL_FUNCDECL_RPL (snprintf, int,
                   (char *str, size_t size, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  __attribute__ ((__format__ (__printf__, 3, 4)))
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (snprintf, int,
                   (char *str, size_t size, const char *format, ...));
@@ -1043,7 +807,7 @@
 #  if !@HAVE_DECL_SNPRINTF@
 _GL_FUNCDECL_SYS (snprintf, int,
                   (char *str, size_t size, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  __attribute__ ((__format__ (__printf__, 3, 4)))
                   _GL_ARG_NONNULL ((3)));
 #  endif
 _GL_CXXALIAS_SYS (snprintf, int,
@@ -1058,9 +822,9 @@
 # endif
 #endif
 
-/* Some people would argue that all sprintf uses should be warned about
-   (for example, OpenBSD issues a link warning for it),
-   since it can cause security holes due to buffer overruns.
+/* Some people would argue that sprintf should be handled like gets
+   (for example, OpenBSD issues a link warning for both functions),
+   since both can cause security holes due to buffer overruns.
    However, we believe that sprintf can be used safely, and is more
    efficient than snprintf in those safe cases; and as proof of our
    belief, we use sprintf in several gnulib modules.  So this header
@@ -1073,7 +837,7 @@
 #   define sprintf rpl_sprintf
 #  endif
 _GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...));
 # else
@@ -1118,7 +882,7 @@
 #  endif
 _GL_FUNCDECL_RPL (asprintf, int,
                   (char **result, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (asprintf, int,
                   (char **result, const char *format, ...));
@@ -1126,7 +890,7 @@
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (asprintf, int,
                   (char **result, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (asprintf, int,
@@ -1139,7 +903,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args));
@@ -1147,7 +911,7 @@
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (vasprintf, int,
                   (char **result, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (vasprintf, int,
@@ -1162,13 +926,13 @@
 #   define vdprintf rpl_vdprintf
 #  endif
 _GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args));
 # else
 #  if !@HAVE_VDPRINTF@
 _GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((2)));
 #  endif
 /* Need to cast, because on Solaris, the third parameter will likely be
@@ -1187,20 +951,14 @@
 
 #if @GNULIB_VFPRINTF_POSIX@ || @GNULIB_VFPRINTF@
 # if (@GNULIB_VFPRINTF_POSIX@ && @REPLACE_VFPRINTF@) \
-     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vfprintf rpl_vfprintf
 #  endif
 #  define GNULIB_overrides_vfprintf 1
-#  if @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
-                                 _GL_ARG_NONNULL ((1, 2)));
-#  else
 _GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args));
 # else
 /* Need to cast, because on Solaris, the third parameter is
@@ -1221,41 +979,16 @@
                       "POSIX compliance");
 #endif
 
-#if @GNULIB_VFSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef vfscanf
-#   define vfscanf rpl_vfscanf
-#  endif
-_GL_FUNCDECL_RPL (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0)
-                  _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args));
-# else
-_GL_CXXALIAS_SYS (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args));
-# endif
-_GL_CXXALIASWARN (vfscanf);
-#endif
-
 #if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@
 # if (@GNULIB_VPRINTF_POSIX@ && @REPLACE_VPRINTF@) \
-     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vprintf rpl_vprintf
 #  endif
 #  define GNULIB_overrides_vprintf 1
-#  if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0)
+                                __attribute__ ((__format__ (__printf__, 1, 0)))
                                 _GL_ARG_NONNULL ((1)));
-#  else
-_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0)
-                                _GL_ARG_NONNULL ((1)));
-#  endif
 _GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args));
 # else
 /* Need to cast, because on Solaris, the second parameter is
@@ -1275,22 +1008,6 @@
                  "POSIX compliance");
 #endif
 
-#if @GNULIB_VSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef vscanf
-#   define vscanf rpl_vscanf
-#  endif
-_GL_FUNCDECL_RPL (vscanf, int, (const char *format, va_list args)
-                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0)
-                               _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (vscanf, int, (const char *format, va_list args));
-# else
-_GL_CXXALIAS_SYS (vscanf, int, (const char *format, va_list args));
-# endif
-_GL_CXXALIASWARN (vscanf);
-#endif
-
 #if @GNULIB_VSNPRINTF@
 # if @REPLACE_VSNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1298,7 +1015,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  __attribute__ ((__format__ (__printf__, 3, 0)))
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args));
@@ -1306,7 +1023,7 @@
 #  if !@HAVE_DECL_VSNPRINTF@
 _GL_FUNCDECL_SYS (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  __attribute__ ((__format__ (__printf__, 3, 0)))
                   _GL_ARG_NONNULL ((3)));
 #  endif
 _GL_CXXALIAS_SYS (vsnprintf, int,
@@ -1328,7 +1045,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vsprintf, int,
                   (char *str, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vsprintf, int,
                   (char *str, const char *format, va_list args));
@@ -1348,6 +1065,7 @@
                       "POSIX compliance");
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDIO_H */
-#endif /* _@GUARD_PREFIX@_STDIO_H */
+
+#endif /* _GL_STDIO_H */
+#endif /* _GL_STDIO_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stdio-write.c gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio-write.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/stdio-write.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio-write.c	2010-05-24 09:42:46.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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,9 +20,8 @@
 /* Specification.  */
 #include <stdio.h>
 
-/* Replace these functions only if module 'nonblocking' or module 'sigpipe' is
-   requested.  */
-#if GNULIB_NONBLOCKING || GNULIB_SIGPIPE
+/* Replace these functions only if module 'sigpipe' is requested.  */
+#if GNULIB_SIGPIPE
 
 /* On native Windows platforms, SIGPIPE does not exist.  When write() is
    called on a pipe with no readers, WriteFile() fails with error
@@ -39,75 +38,26 @@
 #  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 #  include <windows.h>
 
-#  include "msvc-nothrow.h"
-
-#  if GNULIB_NONBLOCKING
-#   define CLEAR_ERRNO \
-      errno = 0;
-#   define HANDLE_ENOSPC \
-          if (errno == ENOSPC && ferror (stream))                             \
-            {                                                                 \
-              int fd = fileno (stream);                                       \
-              if (fd >= 0)                                                    \
-                {                                                             \
-                  HANDLE h = (HANDLE) _get_osfhandle (fd);                    \
-                  if (GetFileType (h) == FILE_TYPE_PIPE)                      \
-                    {                                                         \
-                      /* h is a pipe or socket.  */                           \
-                      DWORD state;                                            \
-                      if (GetNamedPipeHandleState (h, &state, NULL, NULL,     \
-                                                   NULL, NULL, 0)             \
-                          && (state & PIPE_NOWAIT) != 0)                      \
-                        /* h is a pipe in non-blocking mode.                  \
-                           Change errno from ENOSPC to EAGAIN.  */            \
-                        errno = EAGAIN;                                       \
-                    }                                                         \
-                }                                                             \
-            }                                                                 \
-          else
-#  else
-#   define CLEAR_ERRNO
-#   define HANDLE_ENOSPC
-#  endif
-
-#  if GNULIB_SIGPIPE
-#   define CLEAR_LastError \
-      SetLastError (0);
-#   define HANDLE_ERROR_NO_DATA \
-          if (GetLastError () == ERROR_NO_DATA && ferror (stream))            \
-            {                                                                 \
-              int fd = fileno (stream);                                       \
-              if (fd >= 0                                                     \
-                  && GetFileType ((HANDLE) _get_osfhandle (fd))               \
-                     == FILE_TYPE_PIPE)                                       \
-                {                                                             \
-                  /* Try to raise signal SIGPIPE.  */                         \
-                  raise (SIGPIPE);                                            \
-                  /* If it is currently blocked or ignored, change errno from \
-                     EINVAL to EPIPE.  */                                     \
-                  errno = EPIPE;                                              \
-                }                                                             \
-            }                                                                 \
-          else
-#  else
-#   define CLEAR_LastError
-#   define HANDLE_ERROR_NO_DATA
-#  endif
-
 #  define CALL_WITH_SIGPIPE_EMULATION(RETTYPE, EXPRESSION, FAILED) \
   if (ferror (stream))                                                        \
     return (EXPRESSION);                                                      \
   else                                                                        \
     {                                                                         \
       RETTYPE ret;                                                            \
-      CLEAR_ERRNO                                                             \
-      CLEAR_LastError                                                         \
+      SetLastError (0);                                                       \
       ret = (EXPRESSION);                                                     \
-      if (FAILED)                                                             \
+      if (FAILED && GetLastError () == ERROR_NO_DATA && ferror (stream))      \
         {                                                                     \
-          HANDLE_ENOSPC                                                       \
-          HANDLE_ERROR_NO_DATA                                                \
-          ;                                                                   \
+          int fd = fileno (stream);                                           \
+          if (fd >= 0                                                         \
+              && GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_PIPE)\
+            {                                                                 \
+              /* Try to raise signal SIGPIPE.  */                             \
+              raise (SIGPIPE);                                                \
+              /* If it is currently blocked or ignored, change errno from     \
+                 EINVAL to EPIPE.  */                                         \
+              errno = EPIPE;                                                  \
+            }                                                                 \
         }                                                                     \
       return ret;                                                             \
     }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stdlib.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdlib.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/stdlib.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdlib.in.h	2010-05-24 09:42:46.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,60 +18,43 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
-/* Special invocation conventions inside some gnulib header files,
-   and inside some glibc header files, respectively.  */
+#if defined __need_malloc_and_calloc
+/* Special invocation convention inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_STDLIB_H
+#ifndef _GL_STDLIB_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
-#ifndef _@GUARD_PREFIX@_STDLIB_H
-#define _@GUARD_PREFIX@_STDLIB_H
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
-/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.  */
-#if @GNULIB_SYSTEM_POSIX@ && !defined WEXITSTATUS
-# include <sys/wait.h>
-#endif
-
 /* Solaris declares getloadavg() in <sys/loadavg.h>.  */
 #if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@
 # include <sys/loadavg.h>
 #endif
 
-/* Native Windows platforms declare mktemp() in <io.h>.  */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-#if @GNULIB_RANDOM_R@
-
 /* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
-   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
-   'struct random_data'.  */
-# if @HAVE_RANDOM_H@
-#  include <random.h>
-# endif
+   from <stdlib.h> if _REENTRANT is defined.  Include it always.  */
+#if @HAVE_RANDOM_H@
+# include <random.h>
+#endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
-#  include <stdint.h>
-# endif
+#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@) \
+    || defined GNULIB_POSIXCHECK
+# include <stdint.h>
+#endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@
-/* Define 'struct random_data'.
-   But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
-#  if !GNULIB_defined_struct_random_data
+#if !@HAVE_STRUCT_RANDOM_DATA@
 struct random_data
 {
   int32_t *fptr;                /* Front pointer.  */
@@ -82,29 +65,15 @@
   int rand_sep;                 /* Distance between front and rear.  */
   int32_t *end_ptr;             /* Pointer behind state table.  */
 };
-#   define GNULIB_defined_struct_random_data 1
-#  endif
-# endif
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-/* On Mac OS X 10.3, only <unistd.h> declares mkstemp.  */
-/* On Mac OS X 10.5, only <unistd.h> declares mkstemps.  */
+#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+/* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>
 #endif
 
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The definition of _Noreturn is copied here.  */
-
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -126,30 +95,11 @@
 #endif
 
 
-#if @GNULIB__EXIT@
-/* Terminate the current process with the given return code, without running
-   the 'atexit' handlers.  */
-# if !@HAVE__EXIT@
-_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
-# endif
-_GL_CXXALIAS_SYS (_Exit, void, (int status));
-_GL_CXXALIASWARN (_Exit);
-#elif defined GNULIB_POSIXCHECK
-# undef _Exit
-# if HAVE_RAW_DECL__EXIT
-_GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
-                 "use gnulib module _Exit for portability");
-# endif
-#endif
-
-
 #if @GNULIB_ATOLL@
 /* Parse a signed decimal integer.
    Returns the value of the integer.  Errors are not detected.  */
 # if !@HAVE_ATOLL@
-_GL_FUNCDECL_SYS (atoll, long long, (const char *string)
-                                    _GL_ATTRIBUTE_PURE
-                                    _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (atoll, long long, (const char *string) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (atoll, long long, (const char *string));
 _GL_CXXALIASWARN (atoll);
@@ -162,7 +112,7 @@
 #endif
 
 #if @GNULIB_CALLOC_POSIX@
-# if @REPLACE_CALLOC@
+# if !@HAVE_CALLOC_POSIX@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef calloc
 #   define calloc rpl_calloc
@@ -199,8 +149,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef canonicalize_file_name
 # if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
-_GL_WARN_ON_USE (canonicalize_file_name,
-                 "canonicalize_file_name is unportable - "
+_GL_WARN_ON_USE (canonicalize_file_name, "canonicalize_file_name is unportable - "
                  "use gnulib module canonicalize-lgpl for portability");
 # endif
 #endif
@@ -263,19 +212,14 @@
 #elif defined GNULIB_POSIXCHECK
 # undef grantpt
 # if HAVE_RAW_DECL_GRANTPT
-_GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
+_GL_WARN_ON_USE (ptsname, "grantpt is not portable - "
                  "use gnulib module grantpt for portability");
 # endif
 #endif
 
-/* If _GL_USE_STDLIB_ALLOC is nonzero, the including module does not
-   rely on GNU or POSIX semantics for malloc and realloc (for example,
-   by never specifying a zero size), so it does not need malloc or
-   realloc to be redefined.  */
 #if @GNULIB_MALLOC_POSIX@
-# if @REPLACE_MALLOC@
-#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-        || _GL_USE_STDLIB_ALLOC)
+# if !@HAVE_MALLOC_POSIX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef malloc
 #   define malloc rpl_malloc
 #  endif
@@ -285,28 +229,13 @@
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 # endif
 _GL_CXXALIASWARN (malloc);
-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+#elif defined GNULIB_POSIXCHECK
 # undef malloc
 /* Assume malloc is always declared.  */
 _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
                  "use gnulib module malloc-posix for portability");
 #endif
 
-/* Convert a multibyte character to a wide character.  */
-#if @GNULIB_MBTOWC@
-# if @REPLACE_MBTOWC@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef mbtowc
-#   define mbtowc rpl_mbtowc
-#  endif
-_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-# else
-_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-# endif
-_GL_CXXALIASWARN (mbtowc);
-#endif
-
 #if @GNULIB_MKDTEMP@
 /* Create a unique temporary directory from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
@@ -439,38 +368,13 @@
 # endif
 #endif
 
-#if @GNULIB_POSIX_OPENPT@
-/* Return an FD open to the master side of a pseudo-terminal.  Flags should
-   include O_RDWR, and may also include O_NOCTTY.  */
-# if !@HAVE_POSIX_OPENPT@
-_GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
-# endif
-_GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
-_GL_CXXALIASWARN (posix_openpt);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_openpt
-# if HAVE_RAW_DECL_POSIX_OPENPT
-_GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
-                 "use gnulib module posix_openpt for portability");
-# endif
-#endif
-
 #if @GNULIB_PTSNAME@
 /* Return the pathname of the pseudo-terminal slave associated with
    the master FD is open on, or NULL on errors.  */
-# if @REPLACE_PTSNAME@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ptsname
-#   define ptsname rpl_ptsname
-#  endif
-_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
-_GL_CXXALIAS_RPL (ptsname, char *, (int fd));
-# else
-#  if !@HAVE_PTSNAME@
+# if !@HAVE_PTSNAME@
 _GL_FUNCDECL_SYS (ptsname, char *, (int fd));
-#  endif
-_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 # endif
+_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 _GL_CXXALIASWARN (ptsname);
 #elif defined GNULIB_POSIXCHECK
 # undef ptsname
@@ -480,32 +384,6 @@
 # endif
 #endif
 
-#if @GNULIB_PTSNAME_R@
-/* Set the pathname of the pseudo-terminal slave associated with
-   the master FD is open on and return 0, or set errno and return
-   non-zero on errors.  */
-# if @REPLACE_PTSNAME_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ptsname_r
-#   define ptsname_r rpl_ptsname_r
-#  endif
-_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
-_GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
-# else
-#  if !@HAVE_PTSNAME_R@
-_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
-#  endif
-_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
-# endif
-_GL_CXXALIASWARN (ptsname_r);
-#elif defined GNULIB_POSIXCHECK
-# undef ptsname_r
-# if HAVE_RAW_DECL_PTSNAME_R
-_GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - "
-                 "use gnulib module ptsname_r for portability");
-# endif
-#endif
-
 #if @GNULIB_PUTENV@
 # if @REPLACE_PUTENV@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -520,29 +398,6 @@
 _GL_CXXALIASWARN (putenv);
 #endif
 
-#if @GNULIB_QSORT_R@
-# if @REPLACE_QSORT_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef qsort_r
-#   define qsort_r rpl_qsort_r
-#  endif
-_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
-_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg));
-# else
-_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg));
-# endif
-_GL_CXXALIASWARN (qsort_r);
-#endif
-
 
 #if @GNULIB_RANDOM_R@
 # if !@HAVE_RANDOM_R@
@@ -552,83 +407,12 @@
 # endif
 #endif
 
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (random, long, (void));
-# endif
-_GL_CXXALIAS_SYS (random, long, (void));
-_GL_CXXALIASWARN (random);
-#elif defined GNULIB_POSIXCHECK
-# undef random
-# if HAVE_RAW_DECL_RANDOM
-_GL_WARN_ON_USE (random, "random is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
-# endif
-_GL_CXXALIAS_SYS (srandom, void, (unsigned int seed));
-_GL_CXXALIASWARN (srandom);
-#elif defined GNULIB_POSIXCHECK
-# undef srandom
-# if HAVE_RAW_DECL_SRANDOM
-_GL_WARN_ON_USE (srandom, "srandom is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size)
-                  _GL_ARG_NONNULL ((2)));
-# endif
-_GL_CXXALIAS_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size));
-_GL_CXXALIASWARN (initstate);
-#elif defined GNULIB_POSIXCHECK
-# undef initstate
-# if HAVE_RAW_DECL_INITSTATE_R
-_GL_WARN_ON_USE (initstate, "initstate is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));
-_GL_CXXALIASWARN (setstate);
-#elif defined GNULIB_POSIXCHECK
-# undef setstate
-# if HAVE_RAW_DECL_SETSTATE_R
-_GL_WARN_ON_USE (setstate, "setstate is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef random_r
-#   define random_r rpl_random_r
-#  endif
-_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result)
-                                 _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result)
                                  _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
 # endif
+_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
 _GL_CXXALIASWARN (random_r);
 #elif defined GNULIB_POSIXCHECK
 # undef random_r
@@ -639,25 +423,13 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef srandom_r
-#   define srandom_r rpl_srandom_r
-#  endif
-_GL_FUNCDECL_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state)
                   _GL_ARG_NONNULL ((2)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (srandom_r);
 #elif defined GNULIB_POSIXCHECK
 # undef srandom_r
@@ -668,29 +440,15 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef initstate_r
-#   define initstate_r rpl_initstate_r
-#  endif
-_GL_FUNCDECL_RPL (initstate_r, int,
-                  (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((2, 4)));
-_GL_CXXALIAS_RPL (initstate_r, int,
-                  (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
                    struct random_data *rand_state)
                   _GL_ARG_NONNULL ((2, 4)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
                    struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (initstate_r);
 #elif defined GNULIB_POSIXCHECK
 # undef initstate_r
@@ -701,25 +459,13 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef setstate_r
-#   define setstate_r rpl_setstate_r
-#  endif
-_GL_FUNCDECL_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state)
                   _GL_ARG_NONNULL ((1, 2)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (setstate_r);
 #elif defined GNULIB_POSIXCHECK
 # undef setstate_r
@@ -731,9 +477,8 @@
 
 
 #if @GNULIB_REALLOC_POSIX@
-# if @REPLACE_REALLOC@
-#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-        || _GL_USE_STDLIB_ALLOC)
+# if !@HAVE_REALLOC_POSIX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef realloc
 #   define realloc rpl_realloc
 #  endif
@@ -743,7 +488,7 @@
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 # endif
 _GL_CXXALIASWARN (realloc);
-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+#elif defined GNULIB_POSIXCHECK
 # undef realloc
 /* Assume realloc is always declared.  */
 _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
@@ -790,22 +535,6 @@
 # endif
 #endif
 
-#if @GNULIB_SECURE_GETENV@
-/* Look up NAME in the environment, returning 0 in insecure situations.  */
-# if !@HAVE_SECURE_GETENV@
-_GL_FUNCDECL_SYS (secure_getenv, char *,
-                  (char const *name) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
-_GL_CXXALIASWARN (secure_getenv);
-#elif defined GNULIB_POSIXCHECK
-# undef secure_getenv
-# if HAVE_RAW_DECL_SECURE_GETENV
-_GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
-                 "use gnulib module secure_getenv for portability");
-# endif
-#endif
-
 #if @GNULIB_SETENV@
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
@@ -820,7 +549,7 @@
 _GL_CXXALIAS_RPL (setenv, int,
                   (const char *name, const char *value, int replace));
 # else
-#  if !@HAVE_DECL_SETENV@
+#  if !@HAVE_SETENV@
 _GL_FUNCDECL_SYS (setenv, int,
                   (const char *name, const char *value, int replace)
                   _GL_ARG_NONNULL ((1)));
@@ -828,9 +557,7 @@
 _GL_CXXALIAS_SYS (setenv, int,
                   (const char *name, const char *value, int replace));
 # endif
-# if !(@REPLACE_SETENV@ && !@HAVE_DECL_SETENV@)
 _GL_CXXALIASWARN (setenv);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setenv
 # if HAVE_RAW_DECL_SETENV
@@ -925,7 +652,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef unlockpt
 # if HAVE_RAW_DECL_UNLOCKPT
-_GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - "
+_GL_WARN_ON_USE (ptsname, "unlockpt is not portable - "
                  "use gnulib module unlockpt for portability");
 # endif
 #endif
@@ -940,14 +667,12 @@
 _GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (unsetenv, int, (const char *name));
 # else
-#  if !@HAVE_DECL_UNSETENV@
+#  if !@HAVE_UNSETENV@
 _GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (unsetenv, int, (const char *name));
 # endif
-# if !(@REPLACE_UNSETENV@ && !@HAVE_DECL_UNSETENV@)
 _GL_CXXALIASWARN (unsetenv);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef unsetenv
 # if HAVE_RAW_DECL_UNSETENV
@@ -956,22 +681,7 @@
 # endif
 #endif
 
-/* Convert a wide character to a multibyte character.  */
-#if @GNULIB_WCTOMB@
-# if @REPLACE_WCTOMB@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef wctomb
-#   define wctomb rpl_wctomb
-#  endif
-_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
-_GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
-# else
-_GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
-# endif
-_GL_CXXALIASWARN (wctomb);
-#endif
-
 
-#endif /* _@GUARD_PREFIX@_STDLIB_H */
-#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif /* _GL_STDLIB_H */
+#endif /* _GL_STDLIB_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stpcpy.c gettext-0.18.1.1/gettext-tools/gnulib-lib/stpcpy.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/stpcpy.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stpcpy.c	2010-05-24 09:42:47.000000000 +0000
@@ -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-2014 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2010 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/stpncpy.c gettext-0.18.1.1/gettext-tools/gnulib-lib/stpncpy.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/stpncpy.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stpncpy.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2014 Free Software
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2010 Free Software
  * Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -31,7 +31,7 @@
 /* Copy no more than N bytes of SRC to DST, returning a pointer past the
    last non-NUL byte written into DST.  */
 char *
-(__stpncpy) (char *dest, const char *src, size_t n)
+__stpncpy (char *dest, const char *src, size_t n)
 {
   char c;
   char *s = dest;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strchrnul.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strchrnul.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strchrnul.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strchrnul.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strcspn.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strcspn.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strcspn.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strcspn.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2014 Free
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2010 Free
  * Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/streq.h gettext-0.18.1.1/gettext-tools/gnulib-lib/streq.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/streq.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/streq.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -21,8 +21,8 @@
 
 #include <string.h>
 
-/* STREQ_OPT allows to optimize string comparison with a small literal string.
-     STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+/* STREQ allows to optimize string comparison with a small literal string.
+     STREQ (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
    is semantically equivalent to
      strcmp (s, "EUC-KR") == 0
    just faster.  */
@@ -163,12 +163,12 @@
     return 0;
 }
 
-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
   streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
 
 #else
 
-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
   (strcmp (s1, s2) == 0)
 
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strerror.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strerror.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strerror.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strerror.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,54 +17,331 @@
 
 #include <config.h>
 
-/* Specification.  */
 #include <string.h>
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if REPLACE_STRERROR
 
-#include "intprops.h"
-#include "strerror-override.h"
-#include "verify.h"
+# include <errno.h>
+# include <stdio.h>
 
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef sprintf
+# if GNULIB_defined_ESOCK /* native Windows platforms */
+#  if HAVE_WINSOCK2_H
+#   include <winsock2.h>
+#  endif
+# endif
+
+# include "intprops.h"
+
+# undef strerror
+# if ! HAVE_DECL_STRERROR
+#  define strerror(n) NULL
+# endif
 
 char *
-strerror (int n)
-#undef strerror
+rpl_strerror (int n)
 {
-  static char buf[STACKBUF_LEN];
-  size_t len;
+  char const *msg = NULL;
+  /* These error messages are taken from glibc/sysdeps/gnu/errlist.c.  */
+  switch (n)
+    {
+# if GNULIB_defined_ETXTBSY
+    case ETXTBSY:
+      msg = "Text file busy";
+      break;
+# endif
+
+# if GNULIB_defined_ESOCK /* native Windows platforms */
+    /* EWOULDBLOCK is the same as EAGAIN.  */
+    case EINPROGRESS:
+      msg = "Operation now in progress";
+      break;
+    case EALREADY:
+      msg = "Operation already in progress";
+      break;
+    case ENOTSOCK:
+      msg = "Socket operation on non-socket";
+      break;
+    case EDESTADDRREQ:
+      msg = "Destination address required";
+      break;
+    case EMSGSIZE:
+      msg = "Message too long";
+      break;
+    case EPROTOTYPE:
+      msg = "Protocol wrong type for socket";
+      break;
+    case ENOPROTOOPT:
+      msg = "Protocol not available";
+      break;
+    case EPROTONOSUPPORT:
+      msg = "Protocol not supported";
+      break;
+    case ESOCKTNOSUPPORT:
+      msg = "Socket type not supported";
+      break;
+    case EOPNOTSUPP:
+      msg = "Operation not supported";
+      break;
+    case EPFNOSUPPORT:
+      msg = "Protocol family not supported";
+      break;
+    case EAFNOSUPPORT:
+      msg = "Address family not supported by protocol";
+      break;
+    case EADDRINUSE:
+      msg = "Address already in use";
+      break;
+    case EADDRNOTAVAIL:
+      msg = "Cannot assign requested address";
+      break;
+    case ENETDOWN:
+      msg = "Network is down";
+      break;
+    case ENETUNREACH:
+      msg = "Network is unreachable";
+      break;
+    case ENETRESET:
+      msg = "Network dropped connection on reset";
+      break;
+    case ECONNABORTED:
+      msg = "Software caused connection abort";
+      break;
+    case ECONNRESET:
+      msg = "Connection reset by peer";
+      break;
+    case ENOBUFS:
+      msg = "No buffer space available";
+      break;
+    case EISCONN:
+      msg = "Transport endpoint is already connected";
+      break;
+    case ENOTCONN:
+      msg = "Transport endpoint is not connected";
+      break;
+    case ESHUTDOWN:
+      msg = "Cannot send after transport endpoint shutdown";
+      break;
+    case ETOOMANYREFS:
+      msg = "Too many references: cannot splice";
+      break;
+    case ETIMEDOUT:
+      msg = "Connection timed out";
+      break;
+    case ECONNREFUSED:
+      msg = "Connection refused";
+      break;
+    case ELOOP:
+      msg = "Too many levels of symbolic links";
+      break;
+    case EHOSTDOWN:
+      msg = "Host is down";
+      break;
+    case EHOSTUNREACH:
+      msg = "No route to host";
+      break;
+    case EPROCLIM:
+      msg = "Too many processes";
+      break;
+    case EUSERS:
+      msg = "Too many users";
+      break;
+    case EDQUOT:
+      msg = "Disk quota exceeded";
+      break;
+    case ESTALE:
+      msg = "Stale NFS file handle";
+      break;
+    case EREMOTE:
+      msg = "Object is remote";
+      break;
+#  if HAVE_WINSOCK2_H
+    /* WSA_INVALID_HANDLE maps to EBADF */
+    /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
+    /* WSA_INVALID_PARAMETER maps to EINVAL */
+    case WSA_OPERATION_ABORTED:
+      msg = "Overlapped operation aborted";
+      break;
+    case WSA_IO_INCOMPLETE:
+      msg = "Overlapped I/O event object not in signaled state";
+      break;
+    case WSA_IO_PENDING:
+      msg = "Overlapped operations will complete later";
+      break;
+    /* WSAEINTR maps to EINTR */
+    /* WSAEBADF maps to EBADF */
+    /* WSAEACCES maps to EACCES */
+    /* WSAEFAULT maps to EFAULT */
+    /* WSAEINVAL maps to EINVAL */
+    /* WSAEMFILE maps to EMFILE */
+    /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
+    /* WSAEINPROGRESS is EINPROGRESS */
+    /* WSAEALREADY is EALREADY */
+    /* WSAENOTSOCK is ENOTSOCK */
+    /* WSAEDESTADDRREQ is EDESTADDRREQ */
+    /* WSAEMSGSIZE is EMSGSIZE */
+    /* WSAEPROTOTYPE is EPROTOTYPE */
+    /* WSAENOPROTOOPT is ENOPROTOOPT */
+    /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */
+    /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
+    /* WSAEOPNOTSUPP is EOPNOTSUPP */
+    /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
+    /* WSAEAFNOSUPPORT is EAFNOSUPPORT */
+    /* WSAEADDRINUSE is EADDRINUSE */
+    /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */
+    /* WSAENETDOWN is ENETDOWN */
+    /* WSAENETUNREACH is ENETUNREACH */
+    /* WSAENETRESET is ENETRESET */
+    /* WSAECONNABORTED is ECONNABORTED */
+    /* WSAECONNRESET is ECONNRESET */
+    /* WSAENOBUFS is ENOBUFS */
+    /* WSAEISCONN is EISCONN */
+    /* WSAENOTCONN is ENOTCONN */
+    /* WSAESHUTDOWN is ESHUTDOWN */
+    /* WSAETOOMANYREFS is ETOOMANYREFS */
+    /* WSAETIMEDOUT is ETIMEDOUT */
+    /* WSAECONNREFUSED is ECONNREFUSED */
+    /* WSAELOOP is ELOOP */
+    /* WSAENAMETOOLONG maps to ENAMETOOLONG */
+    /* WSAEHOSTDOWN is EHOSTDOWN */
+    /* WSAEHOSTUNREACH is EHOSTUNREACH */
+    /* WSAENOTEMPTY maps to ENOTEMPTY */
+    /* WSAEPROCLIM is EPROCLIM */
+    /* WSAEUSERS is EUSERS */
+    /* WSAEDQUOT is EDQUOT */
+    /* WSAESTALE is ESTALE */
+    /* WSAEREMOTE is EREMOTE */
+    case WSASYSNOTREADY:
+      msg = "Network subsystem is unavailable";
+      break;
+    case WSAVERNOTSUPPORTED:
+      msg = "Winsock.dll version out of range";
+      break;
+    case WSANOTINITIALISED:
+      msg = "Successful WSAStartup not yet performed";
+      break;
+    case WSAEDISCON:
+      msg = "Graceful shutdown in progress";
+      break;
+    case WSAENOMORE: case WSA_E_NO_MORE:
+      msg = "No more results";
+      break;
+    case WSAECANCELLED: case WSA_E_CANCELLED:
+      msg = "Call was canceled";
+      break;
+    case WSAEINVALIDPROCTABLE:
+      msg = "Procedure call table is invalid";
+      break;
+    case WSAEINVALIDPROVIDER:
+      msg = "Service provider is invalid";
+      break;
+    case WSAEPROVIDERFAILEDINIT:
+      msg = "Service provider failed to initialize";
+      break;
+    case WSASYSCALLFAILURE:
+      msg = "System call failure";
+      break;
+    case WSASERVICE_NOT_FOUND:
+      msg = "Service not found";
+      break;
+    case WSATYPE_NOT_FOUND:
+      msg = "Class type not found";
+      break;
+    case WSAEREFUSED:
+      msg = "Database query was refused";
+      break;
+    case WSAHOST_NOT_FOUND:
+      msg = "Host not found";
+      break;
+    case WSATRY_AGAIN:
+      msg = "Nonauthoritative host not found";
+      break;
+    case WSANO_RECOVERY:
+      msg = "Nonrecoverable error";
+      break;
+    case WSANO_DATA:
+      msg = "Valid name, no data record of requested type";
+      break;
+    /* WSA_QOS_* omitted */
+#  endif
+# endif
+
+# if GNULIB_defined_ENOMSG
+    case ENOMSG:
+      msg = "No message of desired type";
+      break;
+# endif
+
+# if GNULIB_defined_EIDRM
+    case EIDRM:
+      msg = "Identifier removed";
+      break;
+# endif
+
+# if GNULIB_defined_ENOLINK
+    case ENOLINK:
+      msg = "Link has been severed";
+      break;
+# endif
+
+# if GNULIB_defined_EPROTO
+    case EPROTO:
+      msg = "Protocol error";
+      break;
+# endif
+
+# if GNULIB_defined_EMULTIHOP
+    case EMULTIHOP:
+      msg = "Multihop attempted";
+      break;
+# endif
+
+# if GNULIB_defined_EBADMSG
+    case EBADMSG:
+      msg = "Bad message";
+      break;
+# endif
+
+# if GNULIB_defined_EOVERFLOW
+    case EOVERFLOW:
+      msg = "Value too large for defined data type";
+      break;
+# endif
+
+# if GNULIB_defined_ENOTSUP
+    case ENOTSUP:
+      msg = "Not supported";
+      break;
+# endif
+
+# if GNULIB_defined_ESTALE
+    case ESTALE:
+      msg = "Stale NFS file handle";
+      break;
+# endif
+
+# if GNULIB_defined_ECANCELED
+    case ECANCELED:
+      msg = "Operation canceled";
+      break;
+# endif
+    }
 
-  /* Cast away const, due to the historical signature of strerror;
-     callers should not be modifying the string.  */
-  const char *msg = strerror_override (n);
   if (msg)
     return (char *) msg;
 
-  msg = strerror (n);
+  {
+    char *result = strerror (n);
 
-  /* Our strerror_r implementation might use the system's strerror
-     buffer, so all other clients of strerror have to see the error
-     copied into a buffer that we manage.  This is not thread-safe,
-     even if the system strerror is, but portable programs shouldn't
-     be using strerror if they care about thread-safety.  */
-  if (!msg || !*msg)
-    {
-      static char const fmt[] = "Unknown error %d";
-      verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
-      sprintf (buf, fmt, n);
-      errno = EINVAL;
-      return buf;
-    }
-
-  /* Fix STACKBUF_LEN if this ever aborts.  */
-  len = strlen (msg);
-  if (sizeof buf <= len)
-    abort ();
+    if (result == NULL || result[0] == '\0')
+      {
+        static char const fmt[] = "Unknown error (%d)";
+        static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)];
+        sprintf (msg_buf, fmt, n);
+        return msg_buf;
+      }
 
-  return memcpy (buf, msg, len + 1);
+    return result;
+  }
 }
+
+#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strerror-override.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strerror-override.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strerror-override.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strerror-override.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-/* strerror-override.c --- POSIX compatible system error routine
-
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2010.  */
-
-#include <config.h>
-
-#include "strerror-override.h"
-
-#include <errno.h>
-
-#if GNULIB_defined_EWINSOCK /* native Windows platforms */
-# if HAVE_WINSOCK2_H
-#  include <winsock2.h>
-# endif
-#endif
-
-/* If ERRNUM maps to an errno value defined by gnulib, return a string
-   describing the error.  Otherwise return NULL.  */
-const char *
-strerror_override (int errnum)
-{
-  /* These error messages are taken from glibc/sysdeps/gnu/errlist.c.  */
-  switch (errnum)
-    {
-#if REPLACE_STRERROR_0
-    case 0:
-      return "Success";
-#endif
-
-#if GNULIB_defined_ESOCK /* native Windows platforms with older <errno.h> */
-    case EINPROGRESS:
-      return "Operation now in progress";
-    case EALREADY:
-      return "Operation already in progress";
-    case ENOTSOCK:
-      return "Socket operation on non-socket";
-    case EDESTADDRREQ:
-      return "Destination address required";
-    case EMSGSIZE:
-      return "Message too long";
-    case EPROTOTYPE:
-      return "Protocol wrong type for socket";
-    case ENOPROTOOPT:
-      return "Protocol not available";
-    case EPROTONOSUPPORT:
-      return "Protocol not supported";
-    case EOPNOTSUPP:
-      return "Operation not supported";
-    case EAFNOSUPPORT:
-      return "Address family not supported by protocol";
-    case EADDRINUSE:
-      return "Address already in use";
-    case EADDRNOTAVAIL:
-      return "Cannot assign requested address";
-    case ENETDOWN:
-      return "Network is down";
-    case ENETUNREACH:
-      return "Network is unreachable";
-    case ECONNRESET:
-      return "Connection reset by peer";
-    case ENOBUFS:
-      return "No buffer space available";
-    case EISCONN:
-      return "Transport endpoint is already connected";
-    case ENOTCONN:
-      return "Transport endpoint is not connected";
-    case ETIMEDOUT:
-      return "Connection timed out";
-    case ECONNREFUSED:
-      return "Connection refused";
-    case ELOOP:
-      return "Too many levels of symbolic links";
-    case EHOSTUNREACH:
-      return "No route to host";
-    case EWOULDBLOCK:
-      return "Operation would block";
-#endif
-#if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */
-    case ETXTBSY:
-      return "Text file busy";
-    case ENODATA:
-      return "No data available";
-    case ENOSR:
-      return "Out of streams resources";
-    case ENOSTR:
-      return "Device not a stream";
-    case ETIME:
-      return "Timer expired";
-    case EOTHER:
-      return "Other error";
-#endif
-#if GNULIB_defined_EWINSOCK /* native Windows platforms */
-    case ESOCKTNOSUPPORT:
-      return "Socket type not supported";
-    case EPFNOSUPPORT:
-      return "Protocol family not supported";
-    case ESHUTDOWN:
-      return "Cannot send after transport endpoint shutdown";
-    case ETOOMANYREFS:
-      return "Too many references: cannot splice";
-    case EHOSTDOWN:
-      return "Host is down";
-    case EPROCLIM:
-      return "Too many processes";
-    case EUSERS:
-      return "Too many users";
-    case EDQUOT:
-      return "Disk quota exceeded";
-    case ESTALE:
-      return "Stale NFS file handle";
-    case EREMOTE:
-      return "Object is remote";
-# if HAVE_WINSOCK2_H
-      /* WSA_INVALID_HANDLE maps to EBADF */
-      /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
-      /* WSA_INVALID_PARAMETER maps to EINVAL */
-    case WSA_OPERATION_ABORTED:
-      return "Overlapped operation aborted";
-    case WSA_IO_INCOMPLETE:
-      return "Overlapped I/O event object not in signaled state";
-    case WSA_IO_PENDING:
-      return "Overlapped operations will complete later";
-      /* WSAEINTR maps to EINTR */
-      /* WSAEBADF maps to EBADF */
-      /* WSAEACCES maps to EACCES */
-      /* WSAEFAULT maps to EFAULT */
-      /* WSAEINVAL maps to EINVAL */
-      /* WSAEMFILE maps to EMFILE */
-      /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
-      /* WSAEINPROGRESS maps to EINPROGRESS */
-      /* WSAEALREADY maps to EALREADY */
-      /* WSAENOTSOCK maps to ENOTSOCK */
-      /* WSAEDESTADDRREQ maps to EDESTADDRREQ */
-      /* WSAEMSGSIZE maps to EMSGSIZE */
-      /* WSAEPROTOTYPE maps to EPROTOTYPE */
-      /* WSAENOPROTOOPT maps to ENOPROTOOPT */
-      /* WSAEPROTONOSUPPORT maps to EPROTONOSUPPORT */
-      /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
-      /* WSAEOPNOTSUPP maps to EOPNOTSUPP */
-      /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
-      /* WSAEAFNOSUPPORT maps to EAFNOSUPPORT */
-      /* WSAEADDRINUSE maps to EADDRINUSE */
-      /* WSAEADDRNOTAVAIL maps to EADDRNOTAVAIL */
-      /* WSAENETDOWN maps to ENETDOWN */
-      /* WSAENETUNREACH maps to ENETUNREACH */
-      /* WSAENETRESET maps to ENETRESET */
-      /* WSAECONNABORTED maps to ECONNABORTED */
-      /* WSAECONNRESET maps to ECONNRESET */
-      /* WSAENOBUFS maps to ENOBUFS */
-      /* WSAEISCONN maps to EISCONN */
-      /* WSAENOTCONN maps to ENOTCONN */
-      /* WSAESHUTDOWN is ESHUTDOWN */
-      /* WSAETOOMANYREFS is ETOOMANYREFS */
-      /* WSAETIMEDOUT maps to ETIMEDOUT */
-      /* WSAECONNREFUSED maps to ECONNREFUSED */
-      /* WSAELOOP maps to ELOOP */
-      /* WSAENAMETOOLONG maps to ENAMETOOLONG */
-      /* WSAEHOSTDOWN is EHOSTDOWN */
-      /* WSAEHOSTUNREACH maps to EHOSTUNREACH */
-      /* WSAENOTEMPTY maps to ENOTEMPTY */
-      /* WSAEPROCLIM is EPROCLIM */
-      /* WSAEUSERS is EUSERS */
-      /* WSAEDQUOT is EDQUOT */
-      /* WSAESTALE is ESTALE */
-      /* WSAEREMOTE is EREMOTE */
-    case WSASYSNOTREADY:
-      return "Network subsystem is unavailable";
-    case WSAVERNOTSUPPORTED:
-      return "Winsock.dll version out of range";
-    case WSANOTINITIALISED:
-      return "Successful WSAStartup not yet performed";
-    case WSAEDISCON:
-      return "Graceful shutdown in progress";
-    case WSAENOMORE: case WSA_E_NO_MORE:
-      return "No more results";
-    case WSAECANCELLED: case WSA_E_CANCELLED:
-      return "Call was canceled";
-    case WSAEINVALIDPROCTABLE:
-      return "Procedure call table is invalid";
-    case WSAEINVALIDPROVIDER:
-      return "Service provider is invalid";
-    case WSAEPROVIDERFAILEDINIT:
-      return "Service provider failed to initialize";
-    case WSASYSCALLFAILURE:
-      return "System call failure";
-    case WSASERVICE_NOT_FOUND:
-      return "Service not found";
-    case WSATYPE_NOT_FOUND:
-      return "Class type not found";
-    case WSAEREFUSED:
-      return "Database query was refused";
-    case WSAHOST_NOT_FOUND:
-      return "Host not found";
-    case WSATRY_AGAIN:
-      return "Nonauthoritative host not found";
-    case WSANO_RECOVERY:
-      return "Nonrecoverable error";
-    case WSANO_DATA:
-      return "Valid name, no data record of requested type";
-      /* WSA_QOS_* omitted */
-# endif
-#endif
-
-#if GNULIB_defined_ENOMSG
-    case ENOMSG:
-      return "No message of desired type";
-#endif
-
-#if GNULIB_defined_EIDRM
-    case EIDRM:
-      return "Identifier removed";
-#endif
-
-#if GNULIB_defined_ENOLINK
-    case ENOLINK:
-      return "Link has been severed";
-#endif
-
-#if GNULIB_defined_EPROTO
-    case EPROTO:
-      return "Protocol error";
-#endif
-
-#if GNULIB_defined_EMULTIHOP
-    case EMULTIHOP:
-      return "Multihop attempted";
-#endif
-
-#if GNULIB_defined_EBADMSG
-    case EBADMSG:
-      return "Bad message";
-#endif
-
-#if GNULIB_defined_EOVERFLOW
-    case EOVERFLOW:
-      return "Value too large for defined data type";
-#endif
-
-#if GNULIB_defined_ENOTSUP
-    case ENOTSUP:
-      return "Not supported";
-#endif
-
-#if GNULIB_defined_ENETRESET
-    case ENETRESET:
-      return "Network dropped connection on reset";
-#endif
-
-#if GNULIB_defined_ECONNABORTED
-    case ECONNABORTED:
-      return "Software caused connection abort";
-#endif
-
-#if GNULIB_defined_ESTALE
-    case ESTALE:
-      return "Stale NFS file handle";
-#endif
-
-#if GNULIB_defined_EDQUOT
-    case EDQUOT:
-      return "Disk quota exceeded";
-#endif
-
-#if GNULIB_defined_ECANCELED
-    case ECANCELED:
-      return "Operation canceled";
-#endif
-
-#if GNULIB_defined_EOWNERDEAD
-    case EOWNERDEAD:
-      return "Owner died";
-#endif
-
-#if GNULIB_defined_ENOTRECOVERABLE
-    case ENOTRECOVERABLE:
-      return "State not recoverable";
-#endif
-
-#if GNULIB_defined_EILSEQ
-    case EILSEQ:
-      return "Invalid or incomplete multibyte or wide character";
-#endif
-
-    default:
-      return NULL;
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strerror-override.h gettext-0.18.1.1/gettext-tools/gnulib-lib/strerror-override.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/strerror-override.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strerror-override.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* strerror-override.h --- POSIX compatible system error routine
-
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 _GL_STRERROR_OVERRIDE_H
-# define _GL_STRERROR_OVERRIDE_H
-
-# include <errno.h>
-# include <stddef.h>
-
-/* Reasonable buffer size that should never trigger ERANGE; if this
-   proves too small, we intentionally abort(), to remind us to fix
-   this value.  */
-# define STACKBUF_LEN 256
-
-/* If ERRNUM maps to an errno value defined by gnulib, return a string
-   describing the error.  Otherwise return NULL.  */
-# if REPLACE_STRERROR_0 \
-     || GNULIB_defined_ESOCK \
-     || GNULIB_defined_ESTREAMS \
-     || GNULIB_defined_EWINSOCK \
-     || GNULIB_defined_ENOMSG \
-     || GNULIB_defined_EIDRM \
-     || GNULIB_defined_ENOLINK \
-     || GNULIB_defined_EPROTO \
-     || GNULIB_defined_EMULTIHOP \
-     || GNULIB_defined_EBADMSG \
-     || GNULIB_defined_EOVERFLOW \
-     || GNULIB_defined_ENOTSUP \
-     || GNULIB_defined_ENETRESET \
-     || GNULIB_defined_ECONNABORTED \
-     || GNULIB_defined_ESTALE \
-     || GNULIB_defined_EDQUOT \
-     || GNULIB_defined_ECANCELED \
-     || GNULIB_defined_EOWNERDEAD \
-     || GNULIB_defined_ENOTRECOVERABLE \
-     || GNULIB_defined_EILSEQ
-extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
-# else
-#  define strerror_override(ignored) NULL
-# endif
-
-#endif /* _GL_STRERROR_OVERRIDE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/striconv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/striconv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/striconv.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/striconv.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -49,8 +50,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Set to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -82,7 +82,7 @@
             else
               return -1;
           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
         /* Irix iconv() inserts a NUL byte if it cannot convert.
            NetBSD iconv() inserts a question mark if it cannot convert.
            Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -97,8 +97,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     {
       char *outptr = tmpbuf;
       size_t outsize = tmpbufsize;
@@ -132,8 +131,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Return to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -158,7 +156,7 @@
             else
               goto fail;
           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
         /* Irix iconv() inserts a NUL byte if it cannot convert.
            NetBSD iconv() inserts a question mark if it cannot convert.
            Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -172,8 +170,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     {
       size_t res = iconv (cd, NULL, NULL, &outptr, &outsize);
 
@@ -210,7 +207,7 @@
      to a trailing NUL byte in the output.  But not for UTF-7.  So that this
      function is usable for UTF-7, we have to exclude the NUL byte from the
      conversion and add it by hand afterwards.  */
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
   /* Irix iconv() inserts a NUL byte if it cannot convert.
      NetBSD iconv() inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -275,8 +272,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Set to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -328,8 +324,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     for (;;)
       {
         /* Here outptr + outbytes_remaining = result + result_size - 1.  */
@@ -415,8 +410,7 @@
       char *result;
 
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (c_strcasecmp (from_codeset, "EUC-KR") == 0
           || c_strcasecmp (to_codeset, "EUC-KR") == 0)
         {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/striconveha.c gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveha.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/striconveha.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveha.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
@@ -226,9 +226,7 @@
 
   /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
      we want to use transliteration.  */
-#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-     && !defined __UCLIBC__) \
-    || _LIBICONV_VERSION >= 0x0105
+#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   if (transliterate)
     {
       int retval;
@@ -328,9 +326,7 @@
 
   /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
      we want to use transliteration.  */
-#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-     && !defined __UCLIBC__) \
-    || _LIBICONV_VERSION >= 0x0105
+#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   if (transliterate)
     {
       char *result;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/striconveha.h gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveha.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/striconveha.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveha.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/striconveh.c gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveh.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/striconveh.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveh.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
@@ -52,8 +52,7 @@
   iconv_t cd2;
 
   /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
   if (c_strcasecmp (from_codeset, "EUC-KR") == 0
       || c_strcasecmp (to_codeset, "EUC-KR") == 0)
     {
@@ -80,9 +79,7 @@
     }
 
   if (STRCASEEQ (to_codeset, "UTF-8", 'U','T','F','-','8',0,0,0,0)
-# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-      && !defined __UCLIBC__) \
-     || _LIBICONV_VERSION >= 0x0105
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
       || c_strcasecmp (to_codeset, "UTF-8//TRANSLIT") == 0
 # endif
      )
@@ -139,7 +136,7 @@
 /* iconv_carefully is like iconv, except that it stops as soon as it encounters
    a conversion error, and it returns in *INCREMENTED a boolean telling whether
    it has incremented the input pointers past the error location.  */
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
 /* Irix iconv() inserts a NUL byte if it cannot convert.
    NetBSD iconv() inserts a question mark if it cannot convert.
    Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -247,7 +244,7 @@
 
   *inbuf = inptr;
   *inbytesleft = inptr_end - inptr;
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
   /* Irix iconv() inserts a NUL byte if it cannot convert.
      NetBSD iconv() inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -406,8 +403,7 @@
 
     /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     /* Set to the initial state.  */
     iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -535,8 +531,7 @@
   /* Now get the conversion state back to the initial state.
      But avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 #if defined _LIBICONV_VERSION \
-    || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-         || defined __sun)
+    || !((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) || defined __sun)
   for (;;)
     {
       char *outptr = result + length;
@@ -611,8 +606,7 @@
 
     /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     /* Set to the initial state.  */
     if (cd1 != (iconv_t)(-1))
       iconv (cd1, NULL, NULL, NULL, NULL);
@@ -664,8 +658,7 @@
             /* Now get the conversion state of CD1 back to the initial state.
                But avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) || defined __sun)
             if (cd1 != (iconv_t)(-1))
               res1 = iconv (cd1, NULL, NULL, &out1ptr, &out1size);
             else
@@ -747,8 +740,7 @@
                     /* Now get the conversion state of CD1 back to the initial
                        state.  But avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) || defined __sun)
                     if (cd2 != (iconv_t)(-1))
                       res2 = iconv (cd2, NULL, NULL, &out2ptr, &out2size);
                     else
@@ -891,7 +883,7 @@
                               }
                             length = out2ptr - result;
                           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
                         /* Irix iconv() inserts a NUL byte if it cannot convert.
                            NetBSD iconv() inserts a question mark if it cannot
                            convert.
@@ -978,23 +970,19 @@
   if (result == tmpbuf)
     {
       size_t memsize = length + extra_alloc;
+      char *memory;
 
-      if (*resultp != NULL && *lengthp >= memsize)
-        result = *resultp;
+      memory = (char *) malloc (memsize > 0 ? memsize : 1);
+      if (memory != NULL)
+        {
+          memcpy (memory, tmpbuf, length);
+          result = memory;
+        }
       else
         {
-          char *memory;
-
-          memory = (char *) malloc (memsize > 0 ? memsize : 1);
-          if (memory != NULL)
-            result = memory;
-          else
-            {
-              errno = ENOMEM;
-              return -1;
-            }
+          errno = ENOMEM;
+          return -1;
         }
-      memcpy (result, tmpbuf, length);
     }
   else if (result != *resultp && length + extra_alloc < allocated)
     {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/striconveh.h gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveh.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/striconveh.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/striconveh.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 
 #if HAVE_ICONV
 
-/* A conversion descriptor for use by the iconveh functions.  */
+/* An conversion descriptor for use by the iconveh functions.  */
 typedef struct
   {
     /* Conversion descriptor from FROM_CODESET to TO_CODESET, or (iconv_t)(-1)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/striconv.h gettext-0.18.1.1/gettext-tools/gnulib-lib/striconv.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/striconv.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/striconv.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _STRICONV_H
 #define _STRICONV_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/string.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/string.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/string.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/string.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,20 +13,20 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_STRING_H
+#ifndef _GL_STRING_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STRING_H@
 
-#ifndef _@GUARD_PREFIX@_STRING_H
-#define _@GUARD_PREFIX@_STRING_H
+#ifndef _GL_STRING_H
+#define _GL_STRING_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
@@ -36,20 +36,17 @@
 # include <wchar.h>
 #endif
 
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The attribute __pure__ was added in gcc 2.96.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#  define __pure__ /* empty */
+# endif
 #endif
 
-/* NetBSD 5.0 declares strsignal in <unistd.h>, not in <string.h>.  */
-/* But in any case avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \
-    && ! defined __GLIBC__
-# include <unistd.h>
-#endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -58,36 +55,6 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Find the index of the least-significant set bit.  */
-#if @GNULIB_FFSL@
-# if !@HAVE_FFSL@
-_GL_FUNCDECL_SYS (ffsl, int, (long int i));
-# endif
-_GL_CXXALIAS_SYS (ffsl, int, (long int i));
-_GL_CXXALIASWARN (ffsl);
-#elif defined GNULIB_POSIXCHECK
-# undef ffsl
-# if HAVE_RAW_DECL_FFSL
-_GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module");
-# endif
-#endif
-
-
-/* Find the index of the least-significant set bit.  */
-#if @GNULIB_FFSLL@
-# if !@HAVE_FFSLL@
-_GL_FUNCDECL_SYS (ffsll, int, (long long int i));
-# endif
-_GL_CXXALIAS_SYS (ffsll, int, (long long int i));
-_GL_CXXALIASWARN (ffsll);
-#elif defined GNULIB_POSIXCHECK
-# undef ffsll
-# if HAVE_RAW_DECL_FFSLL
-_GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module");
-# endif
-#endif
-
-
 /* Return the first instance of C within N bytes of S, or NULL.  */
 #if @GNULIB_MEMCHR@
 # if @REPLACE_MEMCHR@
@@ -95,13 +62,13 @@
 #   define memchr rpl_memchr
 #  endif
 _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
 # else
 #  if ! @HAVE_MEMCHR@
 _GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1)));
 #  endif
   /* On some systems, this function is defined as an overloaded function:
@@ -111,7 +78,7 @@
                         void *, (void const *__s, int __c, size_t __n),
                         void const *, (void const *__s, int __c, size_t __n));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
 _GL_CXXALIASWARN1 (memchr, void const *,
@@ -135,8 +102,7 @@
 _GL_FUNCDECL_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 3)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
 _GL_CXXALIAS_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len));
@@ -145,8 +111,7 @@
 _GL_FUNCDECL_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 3)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
 #  endif
 _GL_CXXALIAS_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
@@ -187,7 +152,7 @@
 #if @GNULIB_MEMRCHR@
 # if ! @HAVE_DECL_MEMRCHR@
 _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -196,7 +161,7 @@
 _GL_CXXALIAS_SYS_CAST2 (memrchr,
                         void *, (void const *, int, size_t),
                         void const *, (void const *, int, size_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
 _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
@@ -217,7 +182,7 @@
 #if @GNULIB_RAWMEMCHR@
 # if ! @HAVE_RAWMEMCHR@
 _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
+                                     __attribute__ ((__pure__))
                                      _GL_ARG_NONNULL ((1)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -226,7 +191,7 @@
 _GL_CXXALIAS_SYS_CAST2 (rawmemchr,
                         void *, (void const *__s, int __c_in),
                         void const *, (void const *__s, int __c_in));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
 _GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
@@ -264,7 +229,6 @@
 #if @GNULIB_STPNCPY@
 # if @REPLACE_STPNCPY@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef stpncpy
 #   define stpncpy rpl_stpncpy
 #  endif
 _GL_FUNCDECL_RPL (stpncpy, char *,
@@ -306,29 +270,18 @@
 
 /* Find the first occurrence of C in S or the final NUL byte.  */
 #if @GNULIB_STRCHRNUL@
-# if @REPLACE_STRCHRNUL@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define strchrnul rpl_strchrnul
-#  endif
-_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
-                                     _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strchrnul, char *,
-                  (const char *str, int ch));
-# else
-#  if ! @HAVE_STRCHRNUL@
+# if ! @HAVE_STRCHRNUL@
 _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
+                                     __attribute__ ((__pure__))
                                      _GL_ARG_NONNULL ((1)));
-#  endif
+# endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const char * std::strchrnul (const char *, int); }
        extern "C++" { char * std::strchrnul (char *, int); }  */
 _GL_CXXALIAS_SYS_CAST2 (strchrnul,
                         char *, (char const *__s, int __c_in),
                         char const *, (char const *__s, int __c_in));
-# endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
 _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
@@ -353,10 +306,6 @@
 _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strdup, char *, (char const *__s));
 # else
-#  if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup
-    /* strdup exists as a function and as a macro.  Get rid of the macro.  */
-#   undef strdup
-#  endif
 #  if !(@HAVE_DECL_STRDUP@ || defined strdup)
 _GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)));
 #  endif
@@ -429,13 +378,13 @@
 #   define strnlen rpl_strnlen
 #  endif
 _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
 _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
@@ -465,7 +414,7 @@
 #if @GNULIB_STRPBRK@
 # if ! @HAVE_STRPBRK@
 _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -474,7 +423,7 @@
 _GL_CXXALIAS_SYS_CAST2 (strpbrk,
                         char *, (char const *__s, char const *__accept),
                         const char *, (char const *__s, char const *__accept));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
 _GL_CXXALIASWARN1 (strpbrk, char const *,
@@ -565,7 +514,7 @@
 #   define strstr rpl_strstr
 #  endif
 _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
 # else
@@ -576,7 +525,7 @@
                         char *, (const char *haystack, const char *needle),
                         const char *, (const char *haystack, const char *needle));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
 _GL_CXXALIASWARN1 (strstr, const char *,
@@ -607,16 +556,14 @@
 #  endif
 _GL_FUNCDECL_RPL (strcasestr, char *,
                   (const char *haystack, const char *needle)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strcasestr, char *,
                   (const char *haystack, const char *needle));
 # else
 #  if ! @HAVE_STRCASESTR@
 _GL_FUNCDECL_SYS (strcasestr, char *,
                   (const char *haystack, const char *needle)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
 #  endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const char * strcasestr (const char *, const char *); }
@@ -625,7 +572,7 @@
                         char *, (const char *haystack, const char *needle),
                         const char *, (const char *haystack, const char *needle));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
 _GL_CXXALIASWARN1 (strcasestr, const char *,
@@ -724,14 +671,10 @@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbslen rpl_mbslen
 #  endif
-_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string)
-                                  _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string));
 # else
-_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string)
-                                  _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string));
 # endif
 _GL_CXXALIASWARN (mbslen);
@@ -741,7 +684,6 @@
 /* Return the number of multibyte characters in the character string starting
    at STRING and ending at STRING + LEN.  */
 _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1));
 #endif
 
@@ -755,12 +697,10 @@
 #   define mbschr rpl_mbschr /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c)
-                                  _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c));
 # else
 _GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c)
-                                  _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c));
 # endif
@@ -772,17 +712,15 @@
    and return a pointer to it.  Return NULL if C is not found in STRING.
    Unlike strrchr(), this function works correctly in multibyte locales with
    encodings such as GB18030.  */
-# if defined __hpux || defined __INTERIX
+# if defined __hpux
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define mbsrchr rpl_mbsrchr /* avoid collision with system function */
+#   define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c));
 # else
 _GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c));
 # endif
@@ -795,7 +733,6 @@
    Unlike strstr(), this function works correctly in multibyte locales with
    encodings different from UTF-8.  */
 _GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -807,7 +744,6 @@
    different lengths!
    Unlike strcasecmp(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C int mbscasecmp (const char *s1, const char *s2)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -822,21 +758,20 @@
    Unlike strncasecmp(), this function works correctly in multibyte locales.
    But beware that N is not a byte count but a character count!  */
 _GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
 #if @GNULIB_MBSPCASECMP@
 /* Compare the initial segment of the character string STRING consisting of
    at most mbslen (PREFIX) characters with the character string PREFIX,
-   ignoring case.  If the two match, return a pointer to the first byte
-   after this prefix in STRING.  Otherwise, return NULL.
-   Note: This function may, in multibyte locales, return non-NULL if STRING
-   is of smaller length than PREFIX!
+   ignoring case, returning less than, equal to or greater than zero if this
+   initial segment is lexicographically less than, equal to or greater than
+   PREFIX.
+   Note: This function may, in multibyte locales, return 0 if STRING is of
+   smaller length than PREFIX!
    Unlike strncasecmp(), this function works correctly in multibyte
    locales.  */
 _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -847,7 +782,6 @@
    strlen (haystack) < strlen (needle) !
    Unlike strcasestr(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -858,7 +792,6 @@
    if none exists.
    Unlike strcspn(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -872,12 +805,10 @@
 #   define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept));
 # else
 _GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept));
 # endif
@@ -891,7 +822,6 @@
    if none exists.
    Unlike strspn(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C size_t mbsspn (const char *string, const char *reject)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -955,35 +885,6 @@
                  "use gnulib module strerror to guarantee non-NULL result");
 #endif
 
-/* Map any int, typically from errno, into an error message.  Multithread-safe.
-   Uses the POSIX declaration, not the glibc declaration.  */
-#if @GNULIB_STRERROR_R@
-# if @REPLACE_STRERROR_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef strerror_r
-#   define strerror_r rpl_strerror_r
-#  endif
-_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)
-                                   _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen));
-# else
-#  if !@HAVE_DECL_STRERROR_R@
-_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
-                                   _GL_ARG_NONNULL ((2)));
-#  endif
-_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
-# endif
-# if @HAVE_DECL_STRERROR_R@
-_GL_CXXALIASWARN (strerror_r);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef strerror_r
-# if HAVE_RAW_DECL_STRERROR_R
-_GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
-                 "use gnulib module strerror_r-posix for portability");
-# endif
-#endif
-
 #if @GNULIB_STRSIGNAL@
 # if @REPLACE_STRSIGNAL@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1011,7 +912,6 @@
 #if @GNULIB_STRVERSCMP@
 # if !@HAVE_STRVERSCMP@
 _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
 _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
@@ -1025,5 +925,5 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_STRING_H */
-#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _GL_STRING_H */
+#endif /* _GL_STRING_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/str-kmp.h gettext-0.18.1.1/gettext-tools/gnulib-lib/str-kmp.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/str-kmp.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/str-kmp.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,6 +1,6 @@
-/* Substring search in a NUL terminated string of UNIT elements,
+/* Substring search in a NUL terminated string of 'char' elements,
    using the Knuth-Morris-Pratt algorithm.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -14,29 +14,25 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Before including this file, you need to define:
-     UNIT                    The element type of the needle and haystack.
      CANON_ELEMENT(c)        A macro that canonicalizes an element right after
-                             it has been fetched from needle or haystack.
-                             The argument is of type UNIT; the result must be
-                             of type UNIT as well.  */
+                             it has been fetched from one of the two strings.
+                             The argument is an 'unsigned char'; the result
+                             must be an 'unsigned char' as well.  */
 
 /* Knuth-Morris-Pratt algorithm.
    See http://en.wikipedia.org/wiki/Knuth-Morris-Pratt_algorithm
-   HAYSTACK is the NUL terminated string in which to search for.
-   NEEDLE is the string to search for in HAYSTACK, consisting of NEEDLE_LEN
-   units.
    Return a boolean indicating success:
    Return true and set *RESULTP if the search was completed.
    Return false if it was aborted because not enough memory was available.  */
 static bool
-knuth_morris_pratt (const UNIT *haystack,
-                    const UNIT *needle, size_t needle_len,
-                    const UNIT **resultp)
+knuth_morris_pratt_unibyte (const char *haystack, const char *needle,
+                            const char **resultp)
 {
-  size_t m = needle_len;
+  size_t m = strlen (needle);
 
   /* Allocate the table.  */
   size_t *table = (size_t *) nmalloca (m, sizeof (size_t));
@@ -70,14 +66,14 @@
            The inequality needle[x..i-1] != needle[0..i-1-x] is known to hold
            for x < table[i-1], by induction.
            Furthermore, if j>0: needle[i-1-j..i-2] = needle[0..j-1].  */
-        UNIT b = CANON_ELEMENT (needle[i - 1]);
+        unsigned char b = CANON_ELEMENT ((unsigned char) needle[i - 1]);
 
         for (;;)
           {
             /* Invariants: The inequality needle[x..i-1] != needle[0..i-1-x]
                is known to hold for x < i-1-j.
                Furthermore, if j>0: needle[i-1-j..i-2] = needle[0..j-1].  */
-            if (b == CANON_ELEMENT (needle[j]))
+            if (b == CANON_ELEMENT ((unsigned char) needle[j]))
               {
                 /* Set table[i] := i-1-j.  */
                 table[i] = i - ++j;
@@ -112,16 +108,17 @@
   /* Search, using the table to accelerate the processing.  */
   {
     size_t j;
-    const UNIT *rhaystack;
-    const UNIT *phaystack;
+    const char *rhaystack;
+    const char *phaystack;
 
     *resultp = NULL;
     j = 0;
     rhaystack = haystack;
     phaystack = haystack;
     /* Invariant: phaystack = rhaystack + j.  */
-    while (*phaystack != 0)
-      if (CANON_ELEMENT (needle[j]) == CANON_ELEMENT (*phaystack))
+    while (*phaystack != '\0')
+      if (CANON_ELEMENT ((unsigned char) needle[j])
+          == CANON_ELEMENT ((unsigned char) *phaystack))
         {
           j++;
           phaystack++;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strnlen1.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strnlen1.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strnlen1.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strnlen1.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strnlen1.h gettext-0.18.1.1/gettext-tools/gnulib-lib/strnlen1.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/strnlen1.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strnlen1.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,8 +28,7 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
    If no '\0' terminator is found in that many characters, return MAXLEN.  */
 /* This is the same as strnlen (string, maxlen - 1) + 1.  */
-extern size_t strnlen1 (const char *string, size_t maxlen)
-  _GL_ATTRIBUTE_PURE;
+extern size_t strnlen1 (const char *string, size_t maxlen);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strnlen.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strnlen.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strnlen.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strnlen.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strpbrk.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strpbrk.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strpbrk.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strpbrk.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2014 Free Software
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2010 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -15,7 +15,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strstr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strstr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strstr.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strstr.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2014 Free Software
-   Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, 2004, 2007,
+   2008, 2009, 2010 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
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This particular implementation was written by Eric Blake, 2008.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strtol.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strtol.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strtol.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strtol.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,7 +1,7 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005,
+   2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
@@ -40,7 +40,7 @@
 # include "../locale/localeinfo.h"
 #endif
 
-/* Nonzero if we are defining 'strtoul' or 'strtoull', operating on
+/* Nonzero if we are defining `strtoul' or `strtoull', operating on
    unsigned integers.  */
 #ifndef UNSIGNED
 # define UNSIGNED 0
@@ -110,8 +110,8 @@
 # endif
 #endif
 
-/* If QUAD is defined, we are defining 'strtoll' or 'strtoull',
-   operating on 'long long int's.  */
+/* If QUAD is defined, we are defining `strtoll' or `strtoull',
+   operating on `long long int's.  */
 #ifdef QUAD
 # define LONG long long
 # define STRTOL_LONG_MIN LLONG_MIN
@@ -141,11 +141,11 @@
          ? (t) 0 \
          : TYPE_SIGNED_MAGNITUDE (t) \
          ? ~ (t) 0 \
-         : ~ TYPE_MAXIMUM (t)))
+         : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
 # define TYPE_MAXIMUM(t) \
    ((t) (! TYPE_SIGNED (t) \
          ? (t) -1 \
-         : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+         : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 
 # ifndef ULLONG_MAX
 #  define ULLONG_MAX TYPE_MAXIMUM (unsigned long long)
@@ -186,8 +186,9 @@
 # define LOCALE_PARAM_PROTO
 #endif
 
+#include <wchar.h>
+
 #ifdef USE_WIDE_CHAR
-# include <wchar.h>
 # include <wctype.h>
 # define L_(Ch) L##Ch
 # define UCHAR_TYPE wint_t
@@ -227,7 +228,7 @@
 
 
 
-/* Convert NPTR to an 'unsigned long int' or 'long int' in base BASE.
+/* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
    If BASE is 0 the base is determined by the presence of a leading
    zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
    If BASE is < 2 or > 36, it is reset to 10.
@@ -380,7 +381,7 @@
 
 #if !UNSIGNED
   /* Check for a value that is within the range of
-     'unsigned LONG int', but outside the range of 'LONG int'.  */
+     `unsigned LONG int', but outside the range of `LONG int'.  */
   if (overflow == 0
       && i > (negative
               ? -((unsigned LONG int) (STRTOL_LONG_MIN + 1)) + 1
@@ -405,7 +406,7 @@
   /* We must handle a special case here: the base is 0 or 16 and the
      first two characters are '0' and 'x', but the rest are no
      hexadecimal digits.  This is no error case.  We return 0 and
-     ENDPTR points to the 'x'.  */
+     ENDPTR points to the `x`.  */
   if (endptr != NULL)
     {
       if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/strtoul.c gettext-0.18.1.1/gettext-tools/gnulib-lib/strtoul.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/strtoul.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/strtoul.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/str-two-way.h gettext-0.18.1.1/gettext-tools/gnulib-lib/str-two-way.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/str-two-way.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/str-two-way.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
@@ -14,7 +14,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Before including this file, you need to include <config.h> and
    <string.h>, and define:
@@ -43,15 +44,14 @@
 #include <limits.h>
 #include <stdint.h>
 
-/* We use the Two-Way string matching algorithm (also known as
-   Chrochemore-Perrin), which guarantees linear complexity with
-   constant space.  Additionally, for long needles, we also use a bad
-   character shift table similar to the Boyer-Moore algorithm to
-   achieve improved (potentially sub-linear) performance.
-
-   See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260,
-   http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm,
-   http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.34.6641&rep=rep1&type=pdf
+/* We use the Two-Way string matching algorithm, which guarantees
+   linear complexity with constant space.  Additionally, for long
+   needles, we also use a bad character shift table similar to the
+   Boyer-Moore algorithm to achieve improved (potentially sub-linear)
+   performance.
+
+   See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260
+   and http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm
 */
 
 /* Point at which computing a bad-byte shift table is likely to be
@@ -95,14 +95,11 @@
    A critical factorization has the property that the local period
    equals the global period.  All strings have at least one critical
    factorization with the left half smaller than the global period.
-   And while some strings have more than one critical factorization,
-   it is provable that with an ordered alphabet, at least one of the
-   critical factorizations corresponds to a maximal suffix.
 
    Given an ordered alphabet, a critical factorization can be computed
    in linear time, with 2 * NEEDLE_LEN comparisons, by computing the
-   shorter of two ordered maximal suffixes.  The ordered maximal
-   suffixes are determined by lexicographic comparison while tracking
+   larger of two ordered maximal suffixes.  The ordered maximal
+   suffixes are determined by lexicographic comparison of
    periodicity.  */
 static size_t
 critical_factorization (const unsigned char *needle, size_t needle_len,
@@ -115,14 +112,6 @@
   size_t p; /* Intermediate period.  */
   unsigned char a, b; /* Current comparison bytes.  */
 
-  /* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered
-     out 0-length needles.  */
-  if (needle_len < 3)
-    {
-      *period = 1;
-      return needle_len - 1;
-    }
-
   /* Invariants:
      0 <= j < NEEDLE_LEN - 1
      -1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed)
@@ -201,20 +190,8 @@
         }
     }
 
-  /* Choose the shorter suffix.  Return the index of the first byte of
-     the right half, rather than the last byte of the left half.
-
-     For some examples, 'banana' has two critical factorizations, both
-     exposed by the two lexicographic extreme suffixes of 'anana' and
-     'nana', where both suffixes have a period of 2.  On the other
-     hand, with 'aab' and 'bba', both strings have a single critical
-     factorization of the last byte, with the suffix having a period
-     of 1.  While the maximal lexicographic suffix of 'aab' is 'b',
-     the maximal lexicographic suffix of 'bba' is 'ba', which is not a
-     critical factorization.  Conversely, the maximal reverse
-     lexicographic suffix of 'a' works for 'bba', but not 'ab' for
-     'aab'.  The shorter suffix of the two will always be a critical
-     factorization.  */
+  /* Choose the longer suffix.  Return the first byte of the right
+     half, rather than the last byte of the left half.  */
   if (max_suffix_rev + 1 < max_suffix + 1)
     return max_suffix + 1;
   *period = p;
@@ -249,9 +226,9 @@
      first.  */
   if (CMP_FUNC (needle, needle + period, suffix) == 0)
     {
-      /* Entire needle is periodic; a mismatch in the left half can
-         only advance by the period, so use memory to avoid rescanning
-         known occurrences of the period in the right half.  */
+      /* Entire needle is periodic; a mismatch can only advance by the
+         period, so use memory to avoid rescanning known occurrences
+         of the period.  */
       size_t memory = 0;
       j = 0;
       while (AVAILABLE (haystack, haystack_len, j, needle_len))
@@ -353,9 +330,9 @@
      first.  */
   if (CMP_FUNC (needle, needle + period, suffix) == 0)
     {
-      /* Entire needle is periodic; a mismatch in the left half can
-         only advance by the period, so use memory to avoid rescanning
-         known occurrences of the period in the right half.  */
+      /* Entire needle is periodic; a mismatch can only advance by the
+         period, so use memory to avoid rescanning known occurrences
+         of the period.  */
       size_t memory = 0;
       size_t shift;
       j = 0;
@@ -372,8 +349,8 @@
                      a byte out of place, there can be no match until
                      after the mismatch.  */
                   shift = needle_len - period;
+                  memory = 0;
                 }
-              memory = 0;
               j += shift;
               continue;
             }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sys_select.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_select.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sys_select.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_select.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for <sys/select.h>.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,85 +12,46 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 # if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 # endif
-@PRAGMA_COLUMNS@
 
-/* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
-   both include <sys/select.h>.
-   On Cygwin, <sys/time.h> includes <sys/select.h>.
+/* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>.
    Simply delegate to the system's header in this case.  */
-#if (@HAVE_SYS_SELECT_H@                                                \
-     && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H             \
-     && ((defined __osf__ && defined _SYS_TYPES_H_                      \
-          && defined _OSF_SOURCE)                                       \
-         || (defined __sun && defined _SYS_TYPES_H                      \
-             && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE)   \
-                 || defined __EXTENSIONS__))))
+#if @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TYPES_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) && defined _OSF_SOURCE
 
 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
 
-#elif (@HAVE_SYS_SELECT_H@                                              \
-       && (defined _CYGWIN_SYS_TIME_H                                   \
-           || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H       \
-               && ((defined __osf__ && defined _SYS_TIME_H_             \
-                    && defined _OSF_SOURCE)                             \
-                   || (defined __sun && defined _SYS_TIME_H             \
-                       && (! (defined _XOPEN_SOURCE                     \
-                              || defined _POSIX_C_SOURCE)               \
-                           || defined __EXTENSIONS__))))))
+#elif @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TIME_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) && defined _OSF_SOURCE
 
 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
 
-/* On IRIX 6.5, <sys/timespec.h> includes <sys/types.h>, which includes
-   <sys/bsd_types.h>, which includes <sys/select.h>.  At this point we cannot
-   include <signal.h>, because that includes <internal/signal_core.h>, which
-   gives a syntax error because <sys/timespec.h> has not been completely
-   processed.  Simply delegate to the system's header in this case.  */
-#elif @HAVE_SYS_SELECT_H@ && defined __sgi && (defined _SYS_BSD_TYPES_H && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_BSD_TYPES_H)
-
-# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_BSD_TYPES_H
-# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
-
-/* On OpenBSD 5.0, <pthread.h> includes <sys/types.h>, which includes
-   <sys/select.h>.  At this point we cannot include <signal.h>, because that
-   includes gnulib's pthread.h override, which gives a syntax error because
-   /usr/include/pthread.h has not been completely processed.  Simply delegate
-   to the system's header in this case.  */
-#elif @HAVE_SYS_SELECT_H@ && defined __OpenBSD__ && (defined _PTHREAD_H_ && !defined PTHREAD_MUTEX_INITIALIZER)
-
-# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
-
 #else
 
-#ifndef _@GUARD_PREFIX@_SYS_SELECT_H
-
-/* On many platforms, <sys/select.h> assumes prior inclusion of
-   <sys/types.h>.  Also, mingw defines sigset_t there, instead of
-   in <signal.h> where it belongs.  */
-#include <sys/types.h>
+#ifndef _GL_SYS_SELECT_H
 
 #if @HAVE_SYS_SELECT_H@
 
+/* On many platforms, <sys/select.h> assumes prior inclusion of
+   <sys/types.h>.  */
+# include <sys/types.h>
+
 /* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
    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__
 #  include <sys/time.h>
 # endif
 
-/* On AIX 7 and Solaris 10, <sys/select.h> provides an FD_ZERO implementation
+/* On Solaris 10, <sys/select.h> provides an FD_ZERO implementation
    that relies on memset(), but without including <string.h>.
-   But in any case avoid namespace pollution on glibc systems.  */
-# if (defined __OpenBSD__ || defined _AIX || defined __sun || defined __osf__ || defined __BEOS__) \
-     && ! defined __GLIBC__
+   But avoid namespace pollution on glibc systems.  */
+# ifndef __GLIBC__
 #  include <string.h>
 # endif
 
@@ -99,38 +60,12 @@
 
 #endif
 
-/* Get definition of 'sigset_t'.
-   But avoid namespace pollution on glibc systems.
-   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__)
-# include <signal.h>
-#endif
+#ifndef _GL_SYS_SELECT_H
+#define _GL_SYS_SELECT_H
 
-#ifndef _@GUARD_PREFIX@_SYS_SELECT_H
-#define _@GUARD_PREFIX@_SYS_SELECT_H
-
-#if !@HAVE_SYS_SELECT_H@
+#if !@HAVE_SYS_SELECT_H@ || @REPLACE_SELECT@
 /* A platform that lacks <sys/select.h>.  */
-/* Get the 'struct timeval' and 'fd_set' types and the FD_* macros
-   on most platforms.  */
-# include <sys/time.h>
-/* On HP-UX 11, <sys/time.h> provides an FD_ZERO implementation
-   that relies on memset(), but without including <string.h>.  */
-# if defined __hpux
-#  include <string.h>
-# endif
-/* On native Windows platforms:
-   Get the 'fd_set' type.
-   Get the close() declaration before we override it.  */
-# if @HAVE_WINSOCK2_H@
-#  if !defined _GL_INCLUDING_WINSOCK2_H
-#   define _GL_INCLUDING_WINSOCK2_H
-#   include <winsock2.h>
-#   undef _GL_INCLUDING_WINSOCK2_H
-#  endif
-#  include <io.h>
-# endif
+# include <sys/socket.h>
 #endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
@@ -138,152 +73,8 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Fix some definitions from <winsock2.h>.  */
-
-#if @HAVE_WINSOCK2_H@
-
-# if !GNULIB_defined_rpl_fd_isset
-
-/* Re-define FD_ISSET to avoid a WSA call while we are not using
-   network sockets.  */
-static int
-rpl_fd_isset (SOCKET fd, fd_set * set)
-{
-  u_int i;
-  if (set == NULL)
-    return 0;
-
-  for (i = 0; i < set->fd_count; i++)
-    if (set->fd_array[i] == fd)
-      return 1;
-
-  return 0;
-}
-
-#  define GNULIB_defined_rpl_fd_isset 1
-# endif
-
-# undef FD_ISSET
-# define FD_ISSET(fd, set) rpl_fd_isset(fd, set)
-
-#endif
-
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if @HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_UNISTD_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef close
-#   define close close_used_without_including_unistd_h
-#  else
-    _GL_WARN_ON_USE (close,
-                     "close() used without including <unistd.h>");
-#  endif
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gethostname
-#   define gethostname gethostname_used_without_including_unistd_h
-#  else
-    _GL_WARN_ON_USE (gethostname,
-                     "gethostname() used without including <unistd.h>");
-#  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-    _GL_WARN_ON_USE (socket,
-                     "socket() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (connect,
-                     "connect() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (accept,
-                     "accept() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (bind,
-                     "bind() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getpeername,
-                     "getpeername() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockname,
-                     "getsockname() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockopt,
-                     "getsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (listen,
-                     "listen() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recv,
-                     "recv() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (send,
-                     "send() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recvfrom,
-                     "recvfrom() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (sendto,
-                     "sendto() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (setsockopt,
-                     "setsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (shutdown,
-                     "shutdown() used without including <sys/socket.h>");
-#  endif
-# endif
-#endif
-
-
-#if @GNULIB_PSELECT@
-# if @REPLACE_PSELECT@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pselect
-#   define pselect rpl_pselect
-#  endif
-_GL_FUNCDECL_RPL (pselect, int,
-                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
-                   struct timespec const *restrict, const sigset_t *restrict));
-_GL_CXXALIAS_RPL (pselect, int,
-                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
-                   struct timespec const *restrict, const sigset_t *restrict));
-# else
-#  if !@HAVE_PSELECT@
-_GL_FUNCDECL_SYS (pselect, int,
-                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
-                   struct timespec const *restrict, const sigset_t *restrict));
-#  endif
-_GL_CXXALIAS_SYS (pselect, int,
-                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
-                   struct timespec const *restrict, const sigset_t *restrict));
-# endif
-_GL_CXXALIASWARN (pselect);
-#elif defined GNULIB_POSIXCHECK
-# undef pselect
-# if HAVE_RAW_DECL_PSELECT
-_GL_WARN_ON_USE (pselect, "pselect is not portable - "
-                 "use gnulib module pselect for portability");
-# endif
-#endif
-
 #if @GNULIB_SELECT@
-# if @REPLACE_SELECT@
+# if @HAVE_WINSOCK2_H@ || @REPLACE_SELECT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef select
 #   define select rpl_select
@@ -309,6 +100,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SYS_SELECT_H */
-#endif /* _@GUARD_PREFIX@_SYS_SELECT_H */
+#endif /* _GL_SYS_SELECT_H */
+#endif /* _GL_SYS_SELECT_H */
 #endif /* OSF/1 */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sys_socket.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_socket.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sys_socket.in.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_socket.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -0,0 +1,628 @@
+/* Provide a sys/socket header file for systems lacking it (read: MinGW)
+   and for systems where it is incomplete.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
+   Written by Simon Josefsson.
+
+   This 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* This file is supposed to be used on platforms that lack <sys/socket.h>,
+   on platforms where <sys/socket.h> cannot be included standalone, and on
+   platforms where <sys/socket.h> does not provide all necessary definitions.
+   It is intended to provide definitions and prototypes needed by an
+   application.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+
+#if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H
+/* Special invocation convention:
+   - On Cygwin 1.5.x we have a sequence of nested includes
+     <sys/socket.h> -> <cygwin/socket.h> -> <asm/socket.h> -> <cygwin/if.h>,
+     and the latter includes <sys/socket.h>.  In this situation, the functions
+     are not yet declared, therefore we cannot provide the C++ aliases.  */
+
+#@INCLUDE_NEXT@ @NEXT_SYS_SOCKET_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _GL_SYS_SOCKET_H
+
+#if @HAVE_SYS_SOCKET_H@
+
+# define _GL_ALREADY_INCLUDING_SYS_SOCKET_H
+
+/* On many platforms, <sys/socket.h> assumes prior inclusion of
+   <sys/types.h>.  */
+# include <sys/types.h>
+
+/* The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_SYS_SOCKET_H@
+
+# undef _GL_ALREADY_INCLUDING_SYS_SOCKET_H
+
+#endif
+
+#ifndef _GL_SYS_SOCKET_H
+#define _GL_SYS_SOCKET_H
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+#if !@HAVE_SA_FAMILY_T@
+typedef unsigned short  sa_family_t;
+#endif
+
+#if !@HAVE_STRUCT_SOCKADDR_STORAGE@
+# include <alignof.h>
+/* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on
+   2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */
+# define __ss_aligntype unsigned long int
+# define _SS_SIZE 256
+# define _SS_PADSIZE \
+    (_SS_SIZE - ((sizeof (sa_family_t) >= alignof (__ss_aligntype)      \
+                  ? sizeof (sa_family_t)                                \
+                  : alignof (__ss_aligntype))                           \
+                 + sizeof (__ss_aligntype)))
+
+struct sockaddr_storage
+{
+  sa_family_t ss_family;      /* Address family, etc.  */
+  __ss_aligntype __ss_align;  /* Force desired alignment.  */
+  char __ss_padding[_SS_PADSIZE];
+};
+#endif
+
+#if @HAVE_SYS_SOCKET_H@
+
+/* A platform that has <sys/socket.h>.  */
+
+/* For shutdown().  */
+# if !defined SHUT_RD
+#  define SHUT_RD 0
+# endif
+# if !defined SHUT_WR
+#  define SHUT_WR 1
+# endif
+# if !defined SHUT_RDWR
+#  define SHUT_RDWR 2
+# endif
+
+#else
+
+# ifdef __CYGWIN__
+#  error "Cygwin does have a sys/socket.h, doesn't it?!?"
+# endif
+
+/* A platform that lacks <sys/socket.h>.
+
+   Currently only MinGW is supported.  See the gnulib manual regarding
+   Windows sockets.  MinGW has the header files winsock2.h and
+   ws2tcpip.h that declare the sys/socket.h definitions we need.  Note
+   that you can influence which definitions you get by setting the
+   WINVER symbol before including these two files.  For example,
+   getaddrinfo is only available if _WIN32_WINNT >= 0x0501 (that
+   symbol is set indiriectly through WINVER).  You can set this by
+   adding AC_DEFINE(WINVER, 0x0501) to configure.ac.  Note that your
+   code may not run on older Windows releases then.  My Windows 2000
+   box was not able to run the code, for example.  The situation is
+   slightly confusing because:
+   http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/winsock/getaddrinfo_2.asp
+   suggests that getaddrinfo should be available on all Windows
+   releases. */
+
+
+# if @HAVE_WINSOCK2_H@
+#  include <winsock2.h>
+# endif
+# if @HAVE_WS2TCPIP_H@
+#  include <ws2tcpip.h>
+# endif
+
+/* For shutdown(). */
+# if !defined SHUT_RD && defined SD_RECEIVE
+#  define SHUT_RD SD_RECEIVE
+# endif
+# if !defined SHUT_WR && defined SD_SEND
+#  define SHUT_WR SD_SEND
+# endif
+# if !defined SHUT_RDWR && defined SD_BOTH
+#  define SHUT_RDWR SD_BOTH
+# endif
+
+# if @HAVE_WINSOCK2_H@
+/* Include headers needed by the emulation code.  */
+#  include <sys/types.h>
+#  include <io.h>
+
+typedef int socklen_t;
+
+# endif
+
+#endif
+
+#if @HAVE_WINSOCK2_H@
+
+/* Re-define FD_ISSET to avoid a WSA call while we are not using
+   network sockets.  */
+static inline int
+rpl_fd_isset (SOCKET fd, fd_set * set)
+{
+  u_int i;
+  if (set == NULL)
+    return 0;
+
+  for (i = 0; i < set->fd_count; i++)
+    if (set->fd_array[i] == fd)
+      return 1;
+
+  return 0;
+}
+
+# undef FD_ISSET
+# define FD_ISSET(fd, set) rpl_fd_isset(fd, set)
+
+#endif
+
+/* Wrap everything else to use libc file descriptors for sockets.  */
+
+#if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef close
+#  define close close_used_without_including_unistd_h
+# else
+   _GL_WARN_ON_USE (close,
+                    "close() used without including <unistd.h>");
+# endif
+#endif
+
+#if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef gethostname
+#  define gethostname gethostname_used_without_including_unistd_h
+# else
+   _GL_WARN_ON_USE (gethostname,
+                    "gethostname() used without including <unistd.h>");
+# endif
+#endif
+
+#if @GNULIB_SOCKET@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef socket
+#   define socket rpl_socket
+#  endif
+_GL_FUNCDECL_RPL (socket, int, (int domain, int type, int protocol));
+_GL_CXXALIAS_RPL (socket, int, (int domain, int type, int protocol));
+# else
+_GL_CXXALIAS_SYS (socket, int, (int domain, int type, int protocol));
+# endif
+_GL_CXXALIASWARN (socket);
+#elif @HAVE_WINSOCK2_H@
+# undef socket
+# define socket socket_used_without_requesting_gnulib_module_socket
+#elif defined GNULIB_POSIXCHECK
+# undef socket
+# if HAVE_RAW_DECL_SOCKET
+_GL_WARN_ON_USE (socket, "socket is not always POSIX compliant - "
+                 "use gnulib module socket for portability");
+# endif
+#endif
+
+#if @GNULIB_CONNECT@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef connect
+#   define connect rpl_connect
+#  endif
+_GL_FUNCDECL_RPL (connect, int,
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (connect, int,
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen));
+# else
+_GL_CXXALIAS_SYS (connect, int,
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen));
+# endif
+_GL_CXXALIASWARN (connect);
+#elif @HAVE_WINSOCK2_H@
+# undef connect
+# define connect socket_used_without_requesting_gnulib_module_connect
+#elif defined GNULIB_POSIXCHECK
+# undef connect
+# if HAVE_RAW_DECL_CONNECT
+_GL_WARN_ON_USE (connect, "connect is not always POSIX compliant - "
+                 "use gnulib module connect for portability");
+# endif
+#endif
+
+#if @GNULIB_ACCEPT@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef accept
+#   define accept rpl_accept
+#  endif
+_GL_FUNCDECL_RPL (accept, int,
+                  (int fd, struct sockaddr *addr, socklen_t *addrlen));
+_GL_CXXALIAS_RPL (accept, int,
+                  (int fd, struct sockaddr *addr, socklen_t *addrlen));
+# else
+/* Need to cast, because on Solaris 10 systems, the third parameter is
+                                                       void *addrlen.  */
+_GL_CXXALIAS_SYS_CAST (accept, int,
+                       (int fd, struct sockaddr *addr, socklen_t *addrlen));
+# endif
+_GL_CXXALIASWARN (accept);
+#elif @HAVE_WINSOCK2_H@
+# undef accept
+# define accept accept_used_without_requesting_gnulib_module_accept
+#elif defined GNULIB_POSIXCHECK
+# undef accept
+# if HAVE_RAW_DECL_ACCEPT
+_GL_WARN_ON_USE (accept, "accept is not always POSIX compliant - "
+                 "use gnulib module accept for portability");
+# endif
+#endif
+
+#if @GNULIB_BIND@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef bind
+#   define bind rpl_bind
+#  endif
+_GL_FUNCDECL_RPL (bind, int,
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (bind, int,
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen));
+# else
+_GL_CXXALIAS_SYS (bind, int,
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen));
+# endif
+_GL_CXXALIASWARN (bind);
+#elif @HAVE_WINSOCK2_H@
+# undef bind
+# define bind bind_used_without_requesting_gnulib_module_bind
+#elif defined GNULIB_POSIXCHECK
+# undef bind
+# if HAVE_RAW_DECL_BIND
+_GL_WARN_ON_USE (bind, "bind is not always POSIX compliant - "
+                 "use gnulib module bind for portability");
+# endif
+#endif
+
+#if @GNULIB_GETPEERNAME@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getpeername
+#   define getpeername rpl_getpeername
+#  endif
+_GL_FUNCDECL_RPL (getpeername, int,
+                  (int fd, struct sockaddr *addr, socklen_t *addrlen)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (getpeername, int,
+                  (int fd, struct sockaddr *addr, socklen_t *addrlen));
+# else
+/* Need to cast, because on Solaris 10 systems, the third parameter is
+                                                       void *addrlen.  */
+_GL_CXXALIAS_SYS_CAST (getpeername, int,
+                       (int fd, struct sockaddr *addr, socklen_t *addrlen));
+# endif
+_GL_CXXALIASWARN (getpeername);
+#elif @HAVE_WINSOCK2_H@
+# undef getpeername
+# define getpeername getpeername_used_without_requesting_gnulib_module_getpeername
+#elif defined GNULIB_POSIXCHECK
+# undef getpeername
+# if HAVE_RAW_DECL_GETPEERNAME
+_GL_WARN_ON_USE (getpeername, "getpeername is not always POSIX compliant - "
+                 "use gnulib module getpeername for portability");
+# endif
+#endif
+
+#if @GNULIB_GETSOCKNAME@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getsockname
+#   define getsockname rpl_getsockname
+#  endif
+_GL_FUNCDECL_RPL (getsockname, int,
+                  (int fd, struct sockaddr *addr, socklen_t *addrlen)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (getsockname, int,
+                  (int fd, struct sockaddr *addr, socklen_t *addrlen));
+# else
+/* Need to cast, because on Solaris 10 systems, the third parameter is
+                                                       void *addrlen.  */
+_GL_CXXALIAS_SYS_CAST (getsockname, int,
+                       (int fd, struct sockaddr *addr, socklen_t *addrlen));
+# endif
+_GL_CXXALIASWARN (getsockname);
+#elif @HAVE_WINSOCK2_H@
+# undef getsockname
+# define getsockname getsockname_used_without_requesting_gnulib_module_getsockname
+#elif defined GNULIB_POSIXCHECK
+# undef getsockname
+# if HAVE_RAW_DECL_GETSOCKNAME
+_GL_WARN_ON_USE (getsockname, "getsockname is not always POSIX compliant - "
+                 "use gnulib module getsockname for portability");
+# endif
+#endif
+
+#if @GNULIB_GETSOCKOPT@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getsockopt
+#   define getsockopt rpl_getsockopt
+#  endif
+_GL_FUNCDECL_RPL (getsockopt, int, (int fd, int level, int optname,
+                                    void *optval, socklen_t *optlen)
+                                   _GL_ARG_NONNULL ((4, 5)));
+_GL_CXXALIAS_RPL (getsockopt, int, (int fd, int level, int optname,
+                                    void *optval, socklen_t *optlen));
+# else
+/* Need to cast, because on Solaris 10 systems, the fifth parameter is
+                                                       void *optlen.  */
+_GL_CXXALIAS_SYS_CAST (getsockopt, int, (int fd, int level, int optname,
+                                         void *optval, socklen_t *optlen));
+# endif
+_GL_CXXALIASWARN (getsockopt);
+#elif @HAVE_WINSOCK2_H@
+# undef getsockopt
+# define getsockopt getsockopt_used_without_requesting_gnulib_module_getsockopt
+#elif defined GNULIB_POSIXCHECK
+# undef getsockopt
+# if HAVE_RAW_DECL_GETSOCKOPT
+_GL_WARN_ON_USE (getsockopt, "getsockopt is not always POSIX compliant - "
+                 "use gnulib module getsockopt for portability");
+# endif
+#endif
+
+#if @GNULIB_LISTEN@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef listen
+#   define listen rpl_listen
+#  endif
+_GL_FUNCDECL_RPL (listen, int, (int fd, int backlog));
+_GL_CXXALIAS_RPL (listen, int, (int fd, int backlog));
+# else
+_GL_CXXALIAS_SYS (listen, int, (int fd, int backlog));
+# endif
+_GL_CXXALIASWARN (listen);
+#elif @HAVE_WINSOCK2_H@
+# undef listen
+# define listen listen_used_without_requesting_gnulib_module_listen
+#elif defined GNULIB_POSIXCHECK
+# undef listen
+# if HAVE_RAW_DECL_LISTEN
+_GL_WARN_ON_USE (listen, "listen is not always POSIX compliant - "
+                 "use gnulib module listen for portability");
+# endif
+#endif
+
+#if @GNULIB_RECV@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef recv
+#   define recv rpl_recv
+#  endif
+_GL_FUNCDECL_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags)
+                                 _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags));
+# else
+_GL_CXXALIAS_SYS (recv, ssize_t, (int fd, void *buf, size_t len, int flags));
+# endif
+_GL_CXXALIASWARN (recv);
+#elif @HAVE_WINSOCK2_H@
+# undef recv
+# define recv recv_used_without_requesting_gnulib_module_recv
+#elif defined GNULIB_POSIXCHECK
+# undef recv
+# if HAVE_RAW_DECL_RECV
+_GL_WARN_ON_USE (recv, "recv is not always POSIX compliant - "
+                 "use gnulib module recv for portability");
+# endif
+#endif
+
+#if @GNULIB_SEND@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef send
+#   define send rpl_send
+#  endif
+_GL_FUNCDECL_RPL (send, ssize_t,
+                  (int fd, const void *buf, size_t len, int flags)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (send, ssize_t,
+                  (int fd, const void *buf, size_t len, int flags));
+# else
+_GL_CXXALIAS_SYS (send, ssize_t,
+                  (int fd, const void *buf, size_t len, int flags));
+# endif
+_GL_CXXALIASWARN (send);
+#elif @HAVE_WINSOCK2_H@
+# undef send
+# define send send_used_without_requesting_gnulib_module_send
+#elif defined GNULIB_POSIXCHECK
+# undef send
+# if HAVE_RAW_DECL_SEND
+_GL_WARN_ON_USE (send, "send is not always POSIX compliant - "
+                 "use gnulib module send for portability");
+# endif
+#endif
+
+#if @GNULIB_RECVFROM@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef recvfrom
+#   define recvfrom rpl_recvfrom
+#  endif
+_GL_FUNCDECL_RPL (recvfrom, ssize_t,
+                  (int fd, void *buf, size_t len, int flags,
+                   struct sockaddr *from, socklen_t *fromlen)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (recvfrom, ssize_t,
+                  (int fd, void *buf, size_t len, int flags,
+                   struct sockaddr *from, socklen_t *fromlen));
+# else
+/* Need to cast, because on Solaris 10 systems, the sixth parameter is
+                                               void *fromlen.  */
+_GL_CXXALIAS_SYS_CAST (recvfrom, ssize_t,
+                       (int fd, void *buf, size_t len, int flags,
+                        struct sockaddr *from, socklen_t *fromlen));
+# endif
+_GL_CXXALIASWARN (recvfrom);
+#elif @HAVE_WINSOCK2_H@
+# undef recvfrom
+# define recvfrom recvfrom_used_without_requesting_gnulib_module_recvfrom
+#elif defined GNULIB_POSIXCHECK
+# undef recvfrom
+# if HAVE_RAW_DECL_RECVFROM
+_GL_WARN_ON_USE (recvfrom, "recvfrom is not always POSIX compliant - "
+                 "use gnulib module recvfrom for portability");
+# endif
+#endif
+
+#if @GNULIB_SENDTO@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sendto
+#   define sendto rpl_sendto
+#  endif
+_GL_FUNCDECL_RPL (sendto, ssize_t,
+                  (int fd, const void *buf, size_t len, int flags,
+                   const struct sockaddr *to, socklen_t tolen)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (sendto, ssize_t,
+                  (int fd, const void *buf, size_t len, int flags,
+                   const struct sockaddr *to, socklen_t tolen));
+# else
+_GL_CXXALIAS_SYS (sendto, ssize_t,
+                  (int fd, const void *buf, size_t len, int flags,
+                   const struct sockaddr *to, socklen_t tolen));
+# endif
+_GL_CXXALIASWARN (sendto);
+#elif @HAVE_WINSOCK2_H@
+# undef sendto
+# define sendto sendto_used_without_requesting_gnulib_module_sendto
+#elif defined GNULIB_POSIXCHECK
+# undef sendto
+# if HAVE_RAW_DECL_SENDTO
+_GL_WARN_ON_USE (sendto, "sendto is not always POSIX compliant - "
+                 "use gnulib module sendto for portability");
+# endif
+#endif
+
+#if @GNULIB_SETSOCKOPT@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef setsockopt
+#   define setsockopt rpl_setsockopt
+#  endif
+_GL_FUNCDECL_RPL (setsockopt, int, (int fd, int level, int optname,
+                                    const void * optval, socklen_t optlen)
+                                   _GL_ARG_NONNULL ((4)));
+_GL_CXXALIAS_RPL (setsockopt, int, (int fd, int level, int optname,
+                                    const void * optval, socklen_t optlen));
+# else
+_GL_CXXALIAS_SYS (setsockopt, int, (int fd, int level, int optname,
+                                    const void * optval, socklen_t optlen));
+# endif
+_GL_CXXALIASWARN (setsockopt);
+#elif @HAVE_WINSOCK2_H@
+# undef setsockopt
+# define setsockopt setsockopt_used_without_requesting_gnulib_module_setsockopt
+#elif defined GNULIB_POSIXCHECK
+# undef setsockopt
+# if HAVE_RAW_DECL_SETSOCKOPT
+_GL_WARN_ON_USE (setsockopt, "setsockopt is not always POSIX compliant - "
+                 "use gnulib module setsockopt for portability");
+# endif
+#endif
+
+#if @GNULIB_SHUTDOWN@
+# if @HAVE_WINSOCK2_H@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef shutdown
+#   define shutdown rpl_shutdown
+#  endif
+_GL_FUNCDECL_RPL (shutdown, int, (int fd, int how));
+_GL_CXXALIAS_RPL (shutdown, int, (int fd, int how));
+# else
+_GL_CXXALIAS_SYS (shutdown, int, (int fd, int how));
+# endif
+_GL_CXXALIASWARN (shutdown);
+#elif @HAVE_WINSOCK2_H@
+# undef shutdown
+# define shutdown shutdown_used_without_requesting_gnulib_module_shutdown
+#elif defined GNULIB_POSIXCHECK
+# undef shutdown
+# if HAVE_RAW_DECL_SHUTDOWN
+_GL_WARN_ON_USE (shutdown, "shutdown is not always POSIX compliant - "
+                 "use gnulib module shutdown for portability");
+# endif
+#endif
+
+#if @HAVE_WINSOCK2_H@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef select
+#  define select select_used_without_including_sys_select_h
+# else
+   _GL_WARN_ON_USE (select,
+                    "select() used without including <sys/select.h>");
+# endif
+#endif
+
+#if @GNULIB_ACCEPT4@
+/* Accept a connection on a socket, with specific opening flags.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   See also the Linux man page at
+   <http://www.kernel.org/doc/man-pages/online/pages/man2/accept4.2.html>.  */
+# if @HAVE_ACCEPT4@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define accept4 rpl_accept4
+#  endif
+_GL_FUNCDECL_RPL (accept4, int,
+                  (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
+                   int flags));
+_GL_CXXALIAS_RPL (accept4, int,
+                  (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
+                   int flags));
+# else
+_GL_FUNCDECL_SYS (accept4, int,
+                  (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
+                   int flags));
+_GL_CXXALIAS_SYS (accept4, int,
+                  (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
+                   int flags));
+# endif
+_GL_CXXALIASWARN (accept4);
+#elif defined GNULIB_POSIXCHECK
+# undef accept4
+# if HAVE_RAW_DECL_ACCEPT4
+_GL_WARN_ON_USE (accept4, "accept4 is unportable - "
+                 "use gnulib module accept4 for portability");
+# endif
+#endif
+
+#endif /* _GL_SYS_SOCKET_H */
+#endif /* _GL_SYS_SOCKET_H */
+#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sys_stat.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_stat.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sys_stat.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_stat.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
 
@@ -23,7 +24,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_system_sys_stat_h
 /* Special invocation convention.  */
@@ -33,10 +33,9 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
 
-/* Get nlink_t.
-   May also define off_t to a 64-bit type on native Windows.  */
+/* Get nlink_t.  */
 #include <sys/types.h>
 
 /* Get struct timespec.  */
@@ -45,8 +44,8 @@
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
 
-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
-#define _@GUARD_PREFIX@_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
+#define _GL_SYS_STAT_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -55,27 +54,10 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 /* Before doing "#define mkdir rpl_mkdir" below, we need to include all
-   headers that may declare mkdir().  Native Windows platforms declare mkdir
-   in <io.h> and/or <direct.h>, not in <unistd.h>.  */
+   headers that may declare mkdir().  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # include <io.h>     /* mingw32, mingw64 */
-# include <direct.h> /* mingw64, MSVC 9 */
-#endif
-
-/* Native Windows platforms declare umask() in <io.h>.  */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-/* Large File Support on native Windows.  */
-#if @WINDOWS_64_BIT_ST_SIZE@
-# define stat _stati64
-#endif
-
-#ifndef S_IFIFO
-# ifdef _S_IFIFO
-#  define S_IFIFO _S_IFIFO
-# endif
+# include <direct.h> /* mingw64 */
 #endif
 
 #ifndef S_IFMT
@@ -150,10 +132,6 @@
 # endif
 #endif
 
-#ifndef S_ISMPX /* AIX */
-# define S_ISMPX(m) 0
-#endif
-
 #ifndef S_ISNAM /* Xenix */
 # ifdef S_IFNAM
 #  define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM)
@@ -333,28 +311,16 @@
 #endif
 
 
-#if @GNULIB_FSTAT@
-# if @REPLACE_FSTAT@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fstat
-#   define fstat rpl_fstat
-#  endif
+#if @REPLACE_FSTAT@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define fstat rpl_fstat
+# endif
 _GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
-# else
+#else
 _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
-# endif
-_GL_CXXALIASWARN (fstat);
-#elif @WINDOWS_64_BIT_ST_SIZE@
-/* Above, we define stat to _stati64.  */
-# define fstat _fstati64
-#elif defined GNULIB_POSIXCHECK
-# undef fstat
-# if HAVE_RAW_DECL_FSTAT
-_GL_WARN_ON_USE (fstat, "fstat has portability problems - "
-                 "use gnulib module fstat for portability");
-# endif
 #endif
+_GL_CXXALIASWARN (fstat);
 
 
 #if @GNULIB_FSTATAT@
@@ -388,11 +354,7 @@
 
 
 #if @GNULIB_FUTIMENS@
-/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens
-   implementation relies on futimesat, which on Solaris 10 makes an invocation
-   to futimens that is meant to invoke the libc's futimens(), not gnulib's
-   futimens().  */
-# if @REPLACE_FUTIMENS@ || (!@HAVE_FUTIMENS@ && defined __sun)
+# if @REPLACE_FUTIMENS@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef futimens
 #   define futimens rpl_futimens
@@ -405,9 +367,7 @@
 #  endif
 _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
 # endif
-# if @HAVE_FUTIMENS@
 _GL_CXXALIASWARN (futimens);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef futimens
 # if HAVE_RAW_DECL_FUTIMENS
@@ -500,14 +460,11 @@
    which are included above.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-#  if !GNULIB_defined_rpl_mkdir
-static int
+static inline int
 rpl_mkdir (char const *name, mode_t mode)
 {
   return _mkdir (name);
 }
-#   define GNULIB_defined_rpl_mkdir 1
-#  endif
 
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mkdir rpl_mkdir
@@ -592,8 +549,7 @@
 _GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev)
                               _GL_ARG_NONNULL ((1)));
 #  endif
-/* Need to cast, because on OSF/1 5.1, the third parameter is '...'.  */
-_GL_CXXALIAS_SYS_CAST (mknod, int, (char const *file, mode_t mode, dev_t dev));
+_GL_CXXALIAS_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev));
 # endif
 _GL_CXXALIASWARN (mknod);
 #elif defined GNULIB_POSIXCHECK
@@ -628,59 +584,17 @@
 /* We can't use the object-like #define stat rpl_stat, because of
    struct stat.  This means that rpl_stat will not be used if the user
    does (stat)(a,b).  Oh well.  */
-#  if defined _AIX && defined stat && defined _LARGE_FILES
+#  undef stat
+#  ifdef _LARGE_FILES
     /* With _LARGE_FILES defined, AIX (only) defines stat to stat64,
        so we have to replace stat64() instead of stat(). */
+#   define stat stat64
 #   undef stat64
 #   define stat64(name, st) rpl_stat (name, st)
-#  elif @WINDOWS_64_BIT_ST_SIZE@
-    /* Above, we define stat to _stati64.  */
-#   if defined __MINGW32__ && defined _stati64
-#    ifndef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
-#    endif
-#   elif defined _MSC_VER && defined _stati64
-#    ifdef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat32i64.  */
-#     undef _stat32i64
-#     define _stat32i64(name, st) rpl_stat (name, st)
-#    else
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
-#    endif
-#   else
-#    undef _stati64
-#    define _stati64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined __MINGW32__ && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32i64.  */
-#    undef _stat32i64
-#    define _stat32i64(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64.  */
-#    undef _stat64
-#    define _stat64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined _MSC_VER && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32.  */
-#    undef _stat32
-#    define _stat32(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64i32.  */
-#    undef _stat64i32
-#    define _stat64i32(name, st) rpl_stat (name, st)
-#   endif
-#  else /* !(_AIX ||__MINGW32__ ||  _MSC_VER) */
-#   undef stat
+#  else /* !_LARGE_FILES */
 #   define stat(name, st) rpl_stat (name, st)
 #  endif /* !_LARGE_FILES */
-_GL_EXTERN_C int stat (const char *name, struct stat *buf)
-                      _GL_ARG_NONNULL ((1, 2));
+_GL_EXTERN_C int stat (const char *name, struct stat *buf) _GL_ARG_NONNULL ((1, 2));
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef stat
@@ -692,11 +606,7 @@
 
 
 #if @GNULIB_UTIMENSAT@
-/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat
-   implementation relies on futimesat, which on Solaris 10 makes an invocation
-   to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
-   utimensat().  */
-# if @REPLACE_UTIMENSAT@ || (!@HAVE_UTIMENSAT@ && defined __sun)
+# if @REPLACE_UTIMENSAT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef utimensat
 #   define utimensat rpl_utimensat
@@ -715,9 +625,7 @@
 _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
                                    struct timespec const times[2], int flag));
 # endif
-# if @HAVE_UTIMENSAT@
 _GL_CXXALIASWARN (utimensat);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef utimensat
 # if HAVE_RAW_DECL_UTIMENSAT
@@ -727,6 +635,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sys_time.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_time.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sys_time.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_time.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,47 +13,31 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
-
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
-   recursively via <sys/select.h>.
-   Simply delegate to the system's header in this case; it is a no-op.
-   Without this extra ifdef, the C++ gettimeofday declaration below
-   would be a forward declaration in gnulib's nested <sys/time.h>.  */
-#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-#else
+#if defined _GL_SYS_TIME_H
 
-/* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_SYS_TIME_H@
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-#endif
+/* Simply delegate to the system's header, without adding anything.  */
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+# endif
 
-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
-#define _@GUARD_PREFIX@_SYS_TIME_H
+#else
 
-#if ! @HAVE_SYS_TIME_H@
-# include <time.h>
-#endif
+# define _GL_SYS_TIME_H
 
-/* On native Windows with MSVC, get the 'struct timeval' type.
-   Also, on native Windows with a 64-bit time_t, where we are overriding the
-   'struct timeval' type, get all declarations of system functions whose
-   signature contains 'struct timeval'.  */
-#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
-# define _GL_INCLUDING_WINSOCK2_H
-# include <winsock2.h>
-# undef _GL_INCLUDING_WINSOCK2_H
-#endif
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+# else
+#  include <time.h>
+# endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -61,153 +45,51 @@
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 extern "C" {
-#endif
-
-#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
-
-# if @REPLACE_STRUCT_TIMEVAL@
-#  define timeval rpl_timeval
 # endif
 
-# if !GNULIB_defined_struct_timeval
+# if ! @HAVE_STRUCT_TIMEVAL@
 struct timeval
 {
   time_t tv_sec;
   long int tv_usec;
 };
-#  define GNULIB_defined_struct_timeval 1
 # endif
 
-#endif
-
-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif
 
-#if @GNULIB_GETTIMEOFDAY@
-# if @REPLACE_GETTIMEOFDAY@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gettimeofday
-#   define gettimeofday rpl_gettimeofday
-#  endif
+# if @GNULIB_GETTIMEOFDAY@
+#  if @REPLACE_GETTIMEOFDAY@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gettimeofday
+#    define gettimeofday rpl_gettimeofday
+#   endif
 _GL_FUNCDECL_RPL (gettimeofday, int,
                   (struct timeval *restrict, void *restrict)
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (gettimeofday, int,
                   (struct timeval *restrict, void *restrict));
-# else
-#  if !@HAVE_GETTIMEOFDAY@
+#  else
+#   if !@HAVE_GETTIMEOFDAY@
 _GL_FUNCDECL_SYS (gettimeofday, int,
                   (struct timeval *restrict, void *restrict)
                   _GL_ARG_NONNULL ((1)));
-#  endif
+#   endif
 /* Need to cast, because on glibc systems, by default, the second argument is
                                                   struct timezone *.  */
 _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
                        (struct timeval *restrict, void *restrict));
-# endif
+#  endif
 _GL_CXXALIASWARN (gettimeofday);
-#elif defined GNULIB_POSIXCHECK
-# undef gettimeofday
-# if HAVE_RAW_DECL_GETTIMEOFDAY
+# elif defined GNULIB_POSIXCHECK
+#  undef gettimeofday
+#  if HAVE_RAW_DECL_GETTIMEOFDAY
 _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
-                 "use gnulib module gettimeofday for portability");
-# endif
-#endif
-
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if defined _MSC_VER && @HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_UNISTD_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef close
-#   define close close_used_without_including_unistd_h
-#  else
-     _GL_WARN_ON_USE (close,
-                      "close() used without including <unistd.h>");
-#  endif
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gethostname
-#   define gethostname gethostname_used_without_including_unistd_h
-#  else
-     _GL_WARN_ON_USE (gethostname,
-                      "gethostname() used without including <unistd.h>");
-#  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-     _GL_WARN_ON_USE (socket,
-                      "socket() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (connect,
-                      "connect() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (accept,
-                      "accept() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (bind,
-                      "bind() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getpeername,
-                      "getpeername() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockname,
-                      "getsockname() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockopt,
-                      "getsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (listen,
-                      "listen() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recv,
-                      "recv() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (send,
-                      "send() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recvfrom,
-                      "recvfrom() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (sendto,
-                      "sendto() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (setsockopt,
-                      "setsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (shutdown,
-                      "shutdown() used without including <sys/socket.h>");
+		 "use gnulib module gettimeofday for portability");
 #  endif
 # endif
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef select
-#   define select select_used_without_including_sys_select_h
-#  else
-     _GL_WARN_ON_USE (select,
-                      "select() used without including <sys/select.h>");
-#  endif
-# endif
-#endif
 
-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
-#endif /* _CYGWIN_SYS_TIME_H */
-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sys_types.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_types.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sys_types.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_types.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Provide a more complete sys/types.h.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
-
-/* The include_next requires a split double-inclusion guard.  */
-# define _GL_INCLUDING_SYS_TYPES_H
-#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@
-# undef _GL_INCLUDING_SYS_TYPES_H
-
-#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
-#define _@GUARD_PREFIX@_SYS_TYPES_H
-
-/* Override off_t if Large File Support is requested on native Windows.  */
-#if @WINDOWS_64_BIT_OFF_T@
-/* Same as int64_t in <stdint.h>.  */
-# if defined _MSC_VER
-#  define off_t __int64
-# else
-#  define off_t long long int
-# endif
-/* Indicator, for gnulib internal purposes.  */
-# define _GL_WINDOWS_64_BIT_OFF_T 1
-#endif
-
-/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>.  */
-/* But avoid namespace pollution on glibc systems.  */
-#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
-    && ! defined __GLIBC__
-# include <stddef.h>
-#endif
-
-#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
-#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/sys_wait.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_wait.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/sys_wait.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/sys_wait.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* A POSIX-like <sys/wait.h>.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,32 +12,23 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifndef _@GUARD_PREFIX@_SYS_WAIT_H
+#ifndef _GL_SYS_WAIT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 # @INCLUDE_NEXT@ @NEXT_SYS_WAIT_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_SYS_WAIT_H
-#define _@GUARD_PREFIX@_SYS_WAIT_H
-
-/* Get pid_t.  */
-#include <sys/types.h>
-
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
+#ifndef _GL_SYS_WAIT_H
+#define _GL_SYS_WAIT_H
 
 #if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 /* Unix API.  */
@@ -70,20 +61,27 @@
 #  define WEXITSTATUS(x) (((x) >> 8) & 0xff)
 # endif
 
-/* The stopping signal. Only to be accessed if WIFSTOPPED(x) is true.  */
-# ifndef WSTOPSIG
-#  define WSTOPSIG(x) (((x) >> 8) & 0x7f)
-# endif
-
 /* True if the process dumped core.  Not standardized by POSIX.  */
 # ifndef WCOREDUMP
 #  define WCOREDUMP(x) ((x) & 0x80)
 # endif
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* Declarations of functions.  */
+
+# ifdef __cplusplus
+}
+# endif
+
 #else
 /* Native Windows API.  */
 
-# include <signal.h> /* for SIGTERM */
+# include <process.h>
+
+# define waitpid(pid,statusp,options) _cwait (statusp, pid, WAIT_CHILD)
 
 /* The following macros apply to an argument x, that is a status of a process,
    as returned by waitpid() or, equivalently, _cwait() or GetExitCodeProcess().
@@ -99,31 +97,10 @@
 
 # define WEXITSTATUS(x) (x)
 
-/* There are no stopping signals.  */
-# define WSTOPSIG(x) 0
-
 /* There are no core dumps.  */
 # define WCOREDUMP(x) 0
 
 #endif
 
-
-/* Declarations of functions.  */
-
-#if @GNULIB_WAITPID@
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-_GL_FUNCDECL_SYS (waitpid, pid_t, (pid_t pid, int *statusp, int options));
-# endif
-_GL_CXXALIAS_SYS (waitpid, pid_t, (pid_t pid, int *statusp, int options));
-_GL_CXXALIASWARN (waitpid);
-#elif defined GNULIB_POSIXCHECK
-# undef waitpid
-# if HAVE_RAW_DECL_WAITPID
-_GL_WARN_ON_USE (waitpid, "waitpid is unportable - "
-                 "use gnulib module sys_wait for portability");
-# endif
-#endif
-
-
-#endif /* _@GUARD_PREFIX@_SYS_WAIT_H */
-#endif /* _@GUARD_PREFIX@_SYS_WAIT_H */
+#endif /* _GL_SYS_WAIT_H */
+#endif /* _GL_SYS_WAIT_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/tempname.c gettext-0.18.1.1/gettext-tools/gnulib-lib/tempname.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/tempname.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/tempname.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,6 +1,6 @@
 /* tempname.c - generate the name of a temporary file.
 
-   Copyright (C) 1991-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1991-2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -67,8 +67,13 @@
 # define __gettimeofday gettimeofday
 # define __mkdir mkdir
 # define __open open
+# define __open64 open
 # define __lxstat64(version, file, buf) lstat (file, buf)
-# define __secure_getenv secure_getenv
+# define __xstat64(version, file, buf) stat (file, buf)
+#endif
+
+#if ! (HAVE___SECURE_GETENV || _LIBC)
+# define __secure_getenv getenv
 #endif
 
 #ifdef _LIBC
@@ -204,7 +209,7 @@
   /* A lower bound on the number of temporary files to attempt to
      generate.  The maximum total number of temporary file names that
      can exist for a given template is 62**6.  It should never be
-     necessary to try all of these combinations.  Instead if a reasonable
+     necessary to try all these combinations.  Instead if a reasonable
      number of names is tried (we define reasonable as 62**3) fail to
      give the system administrator the chance to remove the problems.  */
 #define ATTEMPTS_MIN (62 * 62 * 62)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/tempname.h gettext-0.18.1.1/gettext-tools/gnulib-lib/tempname.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/tempname.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/tempname.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,6 +1,6 @@
 /* Create a temporary file or directory.
 
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/time.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/time.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/time.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/time.in.h	2010-06-03 21:36:13.000000000 +0000
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,12 +13,12 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
@@ -27,13 +27,13 @@
    without adding our own declarations.  */
 #if (defined __need_time_t || defined __need_clock_t \
      || defined __need_timespec \
-     || defined _@GUARD_PREFIX@_TIME_H)
+     || defined _GL_TIME_H)
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
 #else
 
-# define _@GUARD_PREFIX@_TIME_H
+# define _GL_TIME_H
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
@@ -48,29 +48,33 @@
 
 /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
    Or they define it with the wrong member names or define it in <sys/time.h>
-   (e.g., FreeBSD circa 1997).  Stock Mingw prior to 3.0 does not define it,
-   but the pthreads-win32 library defines it in <pthread.h>.  */
+   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
+   pthreads-win32 library defines it in <pthread.h>.  */
 # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
 #  if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
+/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
+#   undef asctime_r
+#   undef ctime_r
+#   undef gmtime_r
+#   undef localtime_r
+#   undef rand_r
+#   undef strtok_r
 #  else
 
 #   ifdef __cplusplus
 extern "C" {
 #   endif
 
-#   if !GNULIB_defined_struct_timespec
-#    undef timespec
-#    define timespec rpl_timespec
+#   undef timespec
+#   define timespec rpl_timespec
 struct timespec
 {
   time_t tv_sec;
   long int tv_nsec;
 };
-#    define GNULIB_defined_struct_timespec 1
-#   endif
 
 #   ifdef __cplusplus
 }
@@ -79,18 +83,6 @@
 #  endif
 # endif
 
-# if !GNULIB_defined_struct_time_t_must_be_integral
-/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
-   time_t to be an integer type, even though C99 permits floating
-   point.  We don't know of any implementation that uses floating
-   point, and it is much easier to write code that doesn't have to
-   worry about that corner case, so we force the issue.  */
-struct __time_t_must_be_integral {
-  unsigned int __floating_time_t_unsupported : (time_t) 1;
-};
-#  define GNULIB_defined_struct_time_t_must_be_integral 1
-# endif
-
 /* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
    return -1 and store the remaining time into RMTP.  See
    <http://www.opengroup.org/susv3xsh/nanosleep.html>.  */
@@ -145,7 +137,7 @@
 _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  else
-#   if ! @HAVE_DECL_LOCALTIME_R@
+#   if ! @HAVE_LOCALTIME_R@
 _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result)
                                             _GL_ARG_NONNULL ((1, 2)));
@@ -153,9 +145,7 @@
 _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  endif
-#  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (localtime_r);
-#  endif
 #  if @REPLACE_LOCALTIME_R@
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef gmtime_r
@@ -167,7 +157,7 @@
 _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  else
-#   if ! @HAVE_DECL_LOCALTIME_R@
+#   if ! @HAVE_LOCALTIME_R@
 _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result)
                                          _GL_ARG_NONNULL ((1, 2)));
@@ -175,42 +165,7 @@
 _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  endif
-#  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (gmtime_r);
-#  endif
-# endif
-
-/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
-   <http://www.opengroup.org/susv3xsh/localtime.html> and
-   <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
-# if @GNULIB_GETTIMEOFDAY@
-#  if @REPLACE_LOCALTIME@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef localtime
-#    define localtime rpl_localtime
-#   endif
-_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
-		                          _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
-#  else
-_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
-#  endif
-_GL_CXXALIASWARN (localtime);
-# endif
-
-# if @GNULIB_GETTIMEOFDAY@
-#  if @REPLACE_GMTIME@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef gmtime
-#    define gmtime rpl_gmtime
-#   endif
-_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer)
-                                       _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer));
-#  else
-_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer));
-#  endif
-_GL_CXXALIASWARN (gmtime);
 # endif
 
 /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/tmpdir.c gettext-0.18.1.1/gettext-tools/gnulib-lib/tmpdir.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/tmpdir.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/tmpdir.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2002, 2006, 2009-2014 Free Software Foundation,
+/* Copyright (C) 1999, 2001-2002, 2006, 2009-2010 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
@@ -33,35 +33,27 @@
 
 #include <stdio.h>
 #ifndef P_tmpdir
-# ifdef _P_tmpdir /* native Windows */
-#  define P_tmpdir _P_tmpdir
-# else
-#  define P_tmpdir "/tmp"
-# endif
+# define P_tmpdir "/tmp"
 #endif
 
 #include <sys/stat.h>
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-#endif
-
-#include "pathmax.h"
-
 #if _LIBC
 # define struct_stat64 struct stat64
 #else
 # define struct_stat64 struct stat
-# define __libc_secure_getenv secure_getenv
 # define __xstat64(version, path, buf) stat (path, buf)
 #endif
 
+#if ! (HAVE___SECURE_GETENV || _LIBC)
+# define __secure_getenv getenv
+#endif
+
 /* Pathname support.
    ISSLASH(C)           tests whether C is a directory separator character.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #else
   /* Unix */
@@ -89,7 +81,6 @@
 {
   const char *d;
   size_t dlen, plen;
-  bool add_slash;
 
   if (!pfx || !pfx[0])
     {
@@ -105,7 +96,7 @@
 
   if (try_tmpdir)
     {
-      d = __libc_secure_getenv ("TMPDIR");
+      d = __secure_getenv ("TMPDIR");
       if (d != NULL && direxists (d))
         dir = d;
       else if (dir != NULL && direxists (dir))
@@ -115,19 +106,6 @@
     }
   if (dir == NULL)
     {
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-      char dirbuf[PATH_MAX];
-      DWORD retval;
-
-      /* Find Windows temporary file directory.
-         We try this before P_tmpdir because Windows defines P_tmpdir to "\\"
-         and will therefore try to put all temporary files in the root
-         directory (unless $TMPDIR is set).  */
-      retval = GetTempPath (PATH_MAX, dirbuf);
-      if (retval > 0 && retval < PATH_MAX && direxists (dirbuf))
-        dir = dirbuf;
-      else
-#endif
       if (direxists (P_tmpdir))
         dir = P_tmpdir;
       else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
@@ -140,20 +118,16 @@
     }
 
   dlen = strlen (dir);
-#ifdef __VMS
-  add_slash = 0;
-#else
-  add_slash = dlen != 0 && !ISSLASH (dir[dlen - 1]);
-#endif
+  while (dlen >= 1 && ISSLASH (dir[dlen - 1]))
+    dlen--;                     /* remove trailing slashes */
 
   /* check we have room for "${dir}/${pfx}XXXXXX\0" */
-  if (tmpl_len < dlen + add_slash + plen + 6 + 1)
+  if (tmpl_len < dlen + 1 + plen + 6 + 1)
     {
       __set_errno (EINVAL);
       return -1;
     }
 
-  memcpy (tmpl, dir, dlen);
-  sprintf (tmpl + dlen, &"/%.*sXXXXXX"[!add_slash], (int) plen, pfx);
+  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/tmpdir.h gettext-0.18.1.1/gettext-tools/gnulib-lib/tmpdir.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/tmpdir.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/tmpdir.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine a temporary directory.
-   Copyright (C) 2001-2002, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/tparm.c gettext-0.18.1.1/gettext-tools/gnulib-lib/tparm.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/tparm.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/tparm.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,18 +1,20 @@
 /* Substitution of parameters in strings from terminal descriptions.
-   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2006 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Originally by Ross Ridge, Public Domain, 92/02/01 07:30:36 */
 
@@ -243,7 +245,7 @@
 (GNU)   %b      backup to previous parameter
 (GNU)   %f      skip this parameter
 
-  Note the two definitions of %a, the GNU definition is used if the characters
+  Note the two definitions of %a, the GNU defintion is used if the characters
   after the 'a' are valid, otherwise the UW definition is used.
 
   (GNU) used by GNU Emacs termcap libraries
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/tputs.c gettext-0.18.1.1/gettext-tools/gnulib-lib/tputs.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/tputs.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/tputs.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,18 +1,20 @@
 /* Output of string from terminal descriptions.
    Copyright (C) 2006 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/trim.c gettext-0.18.1.1/gettext-tools/gnulib-lib/trim.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/trim.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/trim.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This 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,7 +30,7 @@
 #include "mbiter.h"
 #include "xalloc.h"
 
-/* Use this to suppress gcc's "...may be used before initialized" warnings. */
+/* Use this to suppress gcc's `...may be used before initialized' warnings. */
 #ifdef lint
 # define IF_LINT(Code) Code
 #else
@@ -65,7 +65,7 @@
       /* Trim trailing whitespaces. */
       if (how != TRIM_LEADING)
         {
-          unsigned int state = 0;
+          int state = 0;
           char *r IF_LINT (= NULL); /* used only while state = 2 */
 
           mbi_init (i, d, strlen (d));
@@ -73,7 +73,10 @@
           for (; mbi_avail (i); mbi_advance (i))
             {
               if (state == 0 && mb_isspace (mbi_cur (i)))
-                continue;
+                {
+                  state = 0;
+                  continue;
+                }
 
               if (state == 0 && !mb_isspace (mbi_cur (i)))
                 {
@@ -82,7 +85,10 @@
                 }
 
               if (state == 1 && !mb_isspace (mbi_cur (i)))
-                continue;
+                {
+                  state = 1;
+                  continue;
+                }
 
               if (state == 1 && mb_isspace (mbi_cur (i)))
                 {
@@ -91,7 +97,7 @@
                 }
               else if (state == 2 && mb_isspace (mbi_cur (i)))
                 {
-                  /* empty */
+                  state = 2;
                 }
               else
                 {
@@ -108,22 +114,20 @@
       char *p;
 
       /* Trim leading whitespaces. */
-      if (how != TRIM_TRAILING)
-        {
-          for (p = d; *p && isspace ((unsigned char) *p); p++)
-            ;
+      if (how != TRIM_TRAILING) {
+        for (p = d; *p && isspace ((unsigned char) *p); p++)
+          ;
 
-          memmove (d, p, strlen (p) + 1);
-        }
+        memmove (d, p, strlen (p) + 1);
+      }
 
       /* Trim trailing whitespaces. */
-      if (how != TRIM_LEADING)
-        {
-          for (p = d + strlen (d) - 1;
-               p >= d && isspace ((unsigned char) *p); p--)
-            *p = '\0';
-        }
+      if (how != TRIM_LEADING) {
+        for (p = d + strlen (d) - 1; p >= d && isspace ((unsigned char) *p); p--)
+          *p = '\0';
+      }
     }
 
   return d;
 }
+
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/trim.h gettext-0.18.1.1/gettext-tools/gnulib-lib/trim.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/trim.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/trim.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniconv.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/uniconv.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniconv.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniconv.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversions between Unicode and legacy encodings.
-   Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrkprop1.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrkprop1.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrkprop1.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrkprop1.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,8 +1,8 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Line breaking properties of Unicode characters.  */
-/* Generated automatically by gen-lbrk for Unicode 6.0.0.  */
+/* Generated automatically by gen-lbrk for Unicode 5.1.0.  */
 
-/* Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
 
    This program 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 @@
   {
     int level1[15];
     int level2[4 << 9];
-    unsigned char level3[166 << 7];
+    unsigned char level3[142 << 7];
   }
 lbrkprop_t;
 extern const lbrkprop_t unilbrkprop;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrkprop2.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrkprop2.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrkprop2.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrkprop2.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,8 +1,8 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Line breaking properties of Unicode characters.  */
-/* Generated automatically by gen-lbrk for Unicode 6.0.0.  */
+/* Generated automatically by gen-lbrk for Unicode 5.1.0.  */
 
-/* Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,64 +20,64 @@
 const lbrkprop_t unilbrkprop =
 {
   {
-        0,   512,  1024,  1024,    -1,    -1,    -1,    -1,
+        0,   512,  1024,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,  1536
   },
   {
         0,   128,   256,   256,   256,   384,   512,   640,
       256,   768,   896,  1024,  1152,  1280,  1408,  1536,
-     1664,    -1,  1792,  1920,  2048,  2176,  2304,  2432,
-     2560,  2688,  2816,  2944,  3072,  3200,  3328,  3456,
-     3584,  3712,  3840,  3968,  4096,  4224,  4352,  4480,
-     4608,   256,   256,   256,   256,  4736,  4864,  4992,
-     5120,  5248,  5376,  5504,  5632,  5760,  5888,  6016,
-     6144,  6272,   256,  6400,   256,   256,  6528,  6656,
-     6784,  6912,  7040,  7168,  7296,  7424,  7552,  7680,
-     7808,  7936,  8064,  8192,  8320,  8448,  8576,  8704,
-      256,   256,   256,  8832,   256,   256,  8960,    -1,
-     9088,  9216,  9344,  9472,  9600,  9728,  9856,  9984,
-    10112, 10240, 10368, 10496, 10624, 10752,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856, 10880,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-    11008,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856, 11136,   256,   256, 11264, 11392,   256, 11520,
-    11648, 11776, 11904, 12032, 12160, 12288, 12416, 12544,
-    12672, 12800, 12928, 13056, 13184, 13312, 13440, 12672,
-    12800, 12928, 13056, 13184, 13312, 13440, 12672, 12800,
-    12928, 13056, 13184, 13312, 13440, 12672, 12800, 12928,
-    13056, 13184, 13312, 13440, 12672, 12800, 12928, 13056,
-    13184, 13312, 13440, 12672, 12800, 12928, 13056, 13184,
-    13312, 13440, 12672, 12800, 12928, 13056, 13184, 13312,
-    13440, 12672, 12800, 12928, 13056, 13184, 13312, 13440,
-    12672, 12800, 12928, 13056, 13184, 13312, 13440, 12672,
-    12800, 12928, 13056, 13184, 13312, 13440, 12672, 12800,
-    12928, 13056, 13184, 13312, 13440, 12672, 12800, 12928,
-    13056, 13184, 13312, 13440, 12672, 12800, 12928, 13568,
+       -1,    -1,  1664,  1792,  1920,  2048,  2176,  2304,
+     2432,  2560,  2688,  2816,  2944,  3072,  3200,  3328,
+     3456,  3584,  3712,  3840,  3968,  4096,  4224,  4352,
+     4480,   256,   256,   256,  4608,  4736,  4864,  4992,
+     5120,  5248,  5376,  5504,  5632,    -1,  5760,  5888,
+     6016,    -1,   256,  6144,   256,   256,  6272,  6400,
+     6528,  6656,  6784,  6912,  7040,  7168,  7296,  7424,
+     7552,  7680,  7808,  7936,  8064,  8192,  8320,  8448,
+      256,   256,   256,  8576,   256,   256,  8704,    -1,
+     8832,  8960,  9088,  9216,  9344,  9472,  9600,  9728,
+     9856,  9984, 10112, 10240, 10368, 10496,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600, 10624,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600, 10752,
+    10880,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600, 11008,   256,   256, 11136, 11264,   256, 11392,
+    11520, 11648, 11776,    -1, 11904,    -1,    -1,    -1,
+    12032, 12160, 12288, 12416, 12544, 12672, 12800, 12032,
+    12160, 12288, 12416, 12544, 12672, 12800, 12032, 12160,
+    12288, 12416, 12544, 12672, 12800, 12032, 12160, 12288,
+    12416, 12544, 12672, 12800, 12032, 12160, 12288, 12416,
+    12544, 12672, 12800, 12032, 12160, 12288, 12416, 12544,
+    12672, 12800, 12032, 12160, 12288, 12416, 12544, 12672,
+    12800, 12032, 12160, 12288, 12416, 12544, 12672, 12800,
+    12032, 12160, 12288, 12416, 12544, 12672, 12800, 12032,
+    12160, 12288, 12416, 12544, 12672, 12800, 12032, 12160,
+    12288, 12416, 12544, 12672, 12800, 12032, 12160, 12288,
+    12416, 12544, 12672, 12800, 12032, 12160, 12288, 12928,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -86,22 +86,18 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  9856,  9856,  9856,  9856, 13696, 13824,
-      256,   256, 13952, 14080, 14208, 14336, 14464, 14592,
-    14720, 14848, 14976, 15104,    -1, 15232, 15360, 15488,
-      256, 15616,    -1,    -1,    -1,    -1,    -1,    -1,
-    15744,    -1, 15872,    -1, 16000,    -1, 16128,    -1,
-    16256,    -1,    -1,    -1, 16384,    -1,    -1,    -1,
-    16512, 16640,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  9600,  9600, 13056, 13184, 13312, 13440,
+      256,   256, 13568, 13696, 13824, 13952, 14080, 14208,
+    14336, 14464, 14592, 14720,    -1, 14848, 14976, 15104,
+      256, 15232,    -1,    -1,    -1,    -1,    -1,    -1,
+    15360,    -1, 15488,    -1, 15616,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256,   256,   256, 16768,    -1,
-    16896,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 17024, 17152, 17280,   256,
-    17408,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      256,   256,   256,   256,   256,   256, 15744,    -1,
+    15872,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -114,7 +110,6 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 17536,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -132,7 +127,6 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    17664,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -140,83 +134,89 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256, 17792, 17920, 18048, 18176,    -1, 18304,    -1,
-    18432, 18560, 18688,   256,   256, 18816,   256, 18944,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    19072, 19200, 19328, 19456, 19584,    -1, 19712, 19840,
-    19968, 20096, 20224, 20352, 20480, 20608,  7680,    -1,
+      256, 16000, 16128, 16256, 16384,    -1, 16512,    -1,
+    16640, 16768, 16896,   256,   256, 17024,   256, 17152,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856, 20736,
-    20864,    -1, 20992, 21120,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    17280, 17408,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600, 17536,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     9600,  9600,  9600,  9600, 17664,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    17792,    -1, 17920, 18048,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -287,13 +287,13 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_SP, LBP_EX, LBP_QU, LBP_AL, LBP_PR, LBP_PO, LBP_AL, LBP_QU,
-    LBP_OP, LBP_CP, LBP_AL, LBP_PR, LBP_IS, LBP_HY, LBP_IS, LBP_SY,
+    LBP_OP, LBP_CL, LBP_AL, LBP_PR, LBP_IS, LBP_HY, LBP_IS, LBP_SY,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_IS, LBP_IS, LBP_AL, LBP_AL, LBP_AL, LBP_EX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_PR, LBP_CP, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_PR, LBP_CL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -398,7 +398,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -430,14 +430,14 @@
     LBP_AL, LBP_PO, LBP_PO, LBP_PO, LBP_IS, LBP_IS, LBP_AL, LBP_AL,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_EX, LBP_XX, LBP_XX, LBP_EX, LBP_EX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_PO, LBP_NU, LBP_NU, LBP_AL, LBP_AL, LBP_AL,
     LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -453,7 +453,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_EX, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
@@ -490,38 +490,22 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_IS, LBP_EX, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM,
-    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
+    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_BA, LBP_BA, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -536,8 +520,8 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_AL, LBP_AL, LBP_PO, LBP_PO, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_PO, LBP_AL, LBP_PR, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_PR, LBP_PR, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -584,7 +568,7 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_CM, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
@@ -639,11 +623,11 @@
     LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_CM, LBP_CM,
-    LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_XX,
+    LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
@@ -715,7 +699,7 @@
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_BA,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_BA, LBP_CM, LBP_CM,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
@@ -724,8 +708,8 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_BA, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
-    LBP_BB, LBP_BB, LBP_BA, LBP_BB, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_GL, LBP_GL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_BB, LBP_BB, LBP_BA, LBP_BB, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -749,7 +733,7 @@
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
+    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -773,7 +757,7 @@
     LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
     LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
     LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
+    LBP_JL, LBP_JL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_JL,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
@@ -782,8 +766,7 @@
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
+    LBP_JV, LBP_JV, LBP_JV, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
@@ -794,6 +777,7 @@
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
+    LBP_JT, LBP_JT, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -837,7 +821,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM,
     LBP_AL, LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -858,7 +842,17 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -874,6 +868,12 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -944,15 +944,15 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_CM, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -975,13 +975,13 @@
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA,
+    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -990,24 +990,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_CM,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1029,7 +1013,7 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_BA, LBP_BA, LBP_AL, LBP_BA, LBP_BA, LBP_BA,
+    LBP_NU, LBP_NU, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
     LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1042,14 +1026,14 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1066,22 +1050,6 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_BA,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1097,7 +1065,7 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
@@ -1148,12 +1116,12 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL, LBP_AI,
     LBP_AL, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PO,
     LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR,
-    LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PO, LBP_PR,
-    LBP_PR, LBP_PR, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
@@ -1172,14 +1140,14 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AI, LBP_AI, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AL, LBP_AL, LBP_AI, LBP_AL,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1255,8 +1223,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1341,45 +1309,45 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AL, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI,
-    LBP_AL, LBP_AL, LBP_AL, LBP_QU, LBP_QU, LBP_QU, LBP_QU, LBP_AL,
-    LBP_AL, LBP_AL, LBP_EX, LBP_EX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_QU, LBP_QU, LBP_QU, LBP_QU, LBP_XX,
+    LBP_XX, LBP_AL, LBP_EX, LBP_EX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL,
     LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL,
@@ -1412,8 +1380,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1432,6 +1400,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1445,10 +1415,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
-    LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_EX, LBP_BA, LBP_BA, LBP_BA, LBP_AL, LBP_EX, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1464,8 +1432,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
-    LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
@@ -1488,7 +1456,7 @@
     LBP_OP, LBP_BA, LBP_AL, LBP_AL, LBP_QU, LBP_QU, LBP_AL, LBP_AL,
     LBP_QU, LBP_QU, LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL,
     LBP_OP, LBP_CL, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_EX, LBP_AL,
-    LBP_BA, LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1601,7 +1569,7 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -1618,8 +1586,8 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -1648,8 +1616,8 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1660,6 +1628,22 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_NS, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -1684,12 +1668,12 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_BA,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_EX, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1702,7 +1686,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_AL, LBP_AL,
@@ -1710,24 +1694,20 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_CM, LBP_CM, LBP_AL, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1737,15 +1717,19 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_PO, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1766,10 +1750,10 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_BA, LBP_BA,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1782,22 +1766,6 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA,
-    LBP_BA, LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1814,58 +1782,10 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_AL, LBP_BA, LBP_BA, LBP_BA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_BA, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_H2, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
@@ -1984,16 +1904,48 @@
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2016,10 +1968,10 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2258,10 +2210,10 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_XX, LBP_XX, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_BA,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2269,7 +2221,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_BA,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2294,86 +2246,6 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
     LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_XX, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_BA,
-    LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_BA,
-    LBP_BA, LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2421,102 +2293,6 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_OP, LBP_OP, LBP_OP, LBP_CL, LBP_CL, LBP_CL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL,
-    LBP_OP, LBP_CL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_OP, LBP_CL, LBP_CL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2686,38 +2462,9 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2726,147 +2473,32 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX,
-    LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2874,22 +2506,6 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
     LBP_XX, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrktables.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrktables.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrktables.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrktables.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,35 +23,34 @@
 /* Define unilbrkprop, table of line breaking properties.  */
 #include "unilbrk/lbrkprop2.h"
 
-const unsigned char unilbrk_table[25][25] =
+const unsigned char unilbrk_table[24][24] =
 {
                                 /* after */
-        /* WJ GL B2 BA BB HY CL CP EX IN NS OP QU IS NU PO PR SY AL H2 H3 ID JL JV JT */
-/* WJ */ { P, I, I, I, I, I, P, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* GL */ { P, I, I, I, I, I, P, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* B2 */ { P, I, P, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* BA */ { P, D, D, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* BB */ { P, I, I, I, I, I, P, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* HY */ { P, D, D, I, D, I, P, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
-/* CL */ { P, I, D, I, D, I, P, P, P, D, P, D, I, P, D, I, I, P, D, D, D, D, D, D, D, },
-/* CP */ { P, I, D, I, D, I, P, P, P, D, P, D, I, P, I, I, I, P, I, D, D, D, D, D, D, },
-/* EX */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* IN */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* NS */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* OP */ { P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, },
-/* QU */ { P, I, I, I, I, I, P, P, P, I, I, P, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* IS */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
-/* NU */ { P, I, D, I, D, I, P, P, P, I, I, I, I, P, I, I, I, P, I, D, D, D, D, D, D, },
-/* PO */ { P, I, D, I, D, I, P, P, P, D, I, I, I, P, I, D, D, P, I, D, D, D, D, D, D, },
-/* PR */ { P, I, D, I, D, I, P, P, P, D, I, I, I, P, I, D, D, P, I, I, I, I, I, I, I, },
-/* SY */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
-/* AL */ { P, I, D, I, D, I, P, P, P, I, I, I, I, P, I, D, D, P, I, D, D, D, D, D, D, },
-/* H2 */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
-/* H3 */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
-/* ID */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, D, },
-/* JL */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, I, I, D, I, I, D, },
-/* JV */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
-/* JT */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
+        /* WJ GL B2 BA BB HY CL EX IN NS OP QU IS NU PO PR SY AL H2 H3 ID JL JV JT */
+/* WJ */ { P, I, I, I, I, I, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* GL */ { P, I, I, I, I, I, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* B2 */ { P, I, P, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* BA */ { P, D, D, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* BB */ { P, I, I, I, I, I, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* HY */ { P, D, D, I, D, I, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
+/* CL */ { P, I, D, I, D, I, P, P, D, P, D, I, P, D, I, I, P, D, D, D, D, D, D, D, },
+/* EX */ { P, I, D, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* IN */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* NS */ { P, I, D, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* OP */ { P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, },
+/* QU */ { P, I, I, I, I, I, P, P, I, I, P, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* IS */ { P, I, D, I, D, I, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
+/* NU */ { P, I, D, I, D, I, P, P, I, I, D, I, P, I, I, I, P, I, D, D, D, D, D, D, },
+/* PO */ { P, I, D, I, D, I, P, P, D, I, I, I, P, I, D, D, P, I, D, D, D, D, D, D, },
+/* PR */ { P, I, D, I, D, I, P, P, D, I, I, I, P, I, D, D, P, I, I, I, I, I, I, I, },
+/* SY */ { P, I, D, I, D, I, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
+/* AL */ { P, I, D, I, D, I, P, P, I, I, D, I, P, I, D, D, P, I, D, D, D, D, D, D, },
+/* H2 */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
+/* H3 */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
+/* ID */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, D, },
+/* JL */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, I, I, D, I, I, D, },
+/* JV */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
+/* JT */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
 /* "" */
 /* before */
 };
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrktables.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrktables.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/lbrktables.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/lbrktables.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -21,44 +21,43 @@
 
 enum
 {
-  /* Values >= 25 are resolved at run time. */
-  LBP_BK = 25, /* mandatory break */
+  /* Values >= 24 are resolved at run time. */
+  LBP_BK = 24, /* mandatory break */
 /*LBP_CR,         carriage return - not used here because it's a DOSism */
 /*LBP_LF,         line feed - not used here because it's a DOSism */
-  LBP_CM = 26, /* attached characters and combining marks */
+  LBP_CM = 25, /* attached characters and combining marks */
 /*LBP_NL,         next line - not used here because it's equivalent to LBP_BK */
 /*LBP_SG,         surrogates - not used here because they are not characters */
   LBP_WJ =  0, /* word joiner */
-  LBP_ZW = 27, /* zero width space */
+  LBP_ZW = 26, /* zero width space */
   LBP_GL =  1, /* non-breaking (glue) */
-  LBP_SP = 28, /* space */
+  LBP_SP = 27, /* space */
   LBP_B2 =  2, /* break opportunity before and after */
   LBP_BA =  3, /* break opportunity after */
   LBP_BB =  4, /* break opportunity before */
   LBP_HY =  5, /* hyphen */
-  LBP_CB = 29, /* contingent break opportunity */
+  LBP_CB = 28, /* contingent break opportunity */
   LBP_CL =  6, /* closing punctuation */
-  LBP_CP =  7, /* closing parenthesis */
-  LBP_EX =  8, /* exclamation/interrogation */
-  LBP_IN =  9, /* inseparable */
-  LBP_NS = 10, /* non starter */
-  LBP_OP = 11, /* opening punctuation */
-  LBP_QU = 12, /* ambiguous quotation */
-  LBP_IS = 13, /* infix separator (numeric) */
-  LBP_NU = 14, /* numeric */
-  LBP_PO = 15, /* postfix (numeric) */
-  LBP_PR = 16, /* prefix (numeric) */
-  LBP_SY = 17, /* symbols allowing breaks */
-  LBP_AI = 30, /* ambiguous (alphabetic or ideograph) */
-  LBP_AL = 18, /* ordinary alphabetic and symbol characters */
-  LBP_H2 = 19, /* Hangul LV syllable */
-  LBP_H3 = 20, /* Hangul LVT syllable */
-  LBP_ID = 21, /* ideographic */
-  LBP_JL = 22, /* Hangul L Jamo */
-  LBP_JV = 23, /* Hangul V Jamo */
-  LBP_JT = 24, /* Hangul T Jamo */
-  LBP_SA = 31, /* complex context (South East Asian) */
-  LBP_XX = 32  /* unknown */
+  LBP_EX =  7, /* exclamation/interrogation */
+  LBP_IN =  8, /* inseparable */
+  LBP_NS =  9, /* non starter */
+  LBP_OP = 10, /* opening punctuation */
+  LBP_QU = 11, /* ambiguous quotation */
+  LBP_IS = 12, /* infix separator (numeric) */
+  LBP_NU = 13, /* numeric */
+  LBP_PO = 14, /* postfix (numeric) */
+  LBP_PR = 15, /* prefix (numeric) */
+  LBP_SY = 16, /* symbols allowing breaks */
+  LBP_AI = 29, /* ambiguous (alphabetic or ideograph) */
+  LBP_AL = 17, /* ordinary alphabetic and symbol characters */
+  LBP_H2 = 18, /* Hangul LV syllable */
+  LBP_H3 = 19, /* Hangul LVT syllable */
+  LBP_ID = 20, /* ideographic */
+  LBP_JL = 21, /* Hangul L Jamo */
+  LBP_JV = 22, /* Hangul V Jamo */
+  LBP_JT = 23, /* Hangul T Jamo */
+  LBP_SA = 30, /* complex context (South East Asian) */
+  LBP_XX = 31  /* unknown */
 };
 
 #include "lbrkprop1.h"
@@ -89,7 +88,7 @@
 #define I 2  /* indirect break opportunity, '%' in table 7.3 of UTR #14 */
 #define P 3  /* prohibited break,           '^' in table 7.3 of UTR #14 */
 
-extern const unsigned char unilbrk_table[25][25];
+extern const unsigned char unilbrk_table[24][24];
 
 /* We don't support line breaking of complex-context dependent characters
    (Thai, Lao, Myanmar, Khmer) yet, because it requires dictionary lookup. */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/ulc-common.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/ulc-common.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/ulc-common.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/ulc-common.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/ulc-common.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/ulc-common.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/ulc-common.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/ulc-common.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of strings.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unilbrk.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unilbrk.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of Unicode strings.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniname/uniname.c gettext-0.18.1.1/gettext-tools/gnulib-lib/uniname/uniname.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniname/uniname.c	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniname/uniname.c	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Association between Unicode characters and their names.
-   Copyright (C) 2000-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniname.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/uniname.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniname.in.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniname.in.h	2010-05-24 09:42:47.000000000 +0000
@@ -1,5 +1,5 @@
 /* Association between Unicode characters and their names.
-   Copyright (C) 2000-2002, 2005, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2000-2002, 2005, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -35,8 +35,7 @@
 /* Looks up the Unicode character with a given name, in upper- or lowercase
    ASCII.  Returns the character if found, or UNINAME_INVALID if not found.  */
 extern ucs4_t
-       unicode_name_character (const char *name)
-       _UC_ATTRIBUTE_PURE;
+       unicode_name_character (const char *name);
 #define UNINAME_INVALID ((ucs4_t) 0xFFFF)
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistd.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistd.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
-#include "unistd.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistd--.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd--.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistd--.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd--.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* Like unistd.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistd.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistd.in.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd.in.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,32 +12,34 @@
    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 _@GUARD_PREFIX@_UNISTD_H
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#ifdef _GL_INCLUDING_UNISTD_H
 /* Special invocation convention:
-   - On Mac OS X 10.3.9 we have a sequence of nested includes
-     <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
-
-#@INCLUDE_NEXT@ @NEXT_UNISTD_H@
+   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
+     but we need to ensure that both the system <unistd.h> and <winsock2.h>
+     are completely included before we replace gethostname.  */
+#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
+/* <unistd.h> is being indirectly included for the first time from
+   <winsock2.h>; avoid declaring any overrides.  */
+# if @HAVE_UNISTD_H@
+#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# else
+#  error unexpected; report this to bug-gnulib@gnu.org
+# endif
+# define _GL_WINSOCK2_H_WITNESS
 
-#else
-/* Normal invocation convention.  */
+/* Normal invocation.  */
+#elif !defined _GL_UNISTD_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
-# define _GL_INCLUDING_UNISTD_H
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
-# undef _GL_INCLUDING_UNISTD_H
 #endif
 
 /* Get all possible declarations of gethostname().  */
@@ -48,8 +50,8 @@
 # undef _GL_INCLUDING_WINSOCK2_H
 #endif
 
-#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
-#define _@GUARD_PREFIX@_UNISTD_H
+#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
+#define _GL_UNISTD_H
 
 /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
 #include <stddef.h>
@@ -58,66 +60,32 @@
 /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
-     || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
-         && defined __CYGWIN__)) \
+     || (@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK)) \
     && ! defined __GLIBC__
 # include <stdio.h>
 #endif
 
 /* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
-    && ! defined __GLIBC__
+#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__
 # include <fcntl.h>
 #endif
 
 /* mingw fails to declare _exit in <unistd.h>.  */
-/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
-   <unistd.h>.  */
+/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
 /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
-/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
-   included here.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if !defined __GLIBC__ && !defined __osf__
-# define __need_system_stdlib_h
+#ifndef __GLIBC__
 # include <stdlib.h>
-# undef __need_system_stdlib_h
 #endif
 
-/* Native Windows platforms declare chdir, getcwd, rmdir in
-   <io.h> and/or <direct.h>, not in <unistd.h>.
-   They also declare access(), chmod(), close(), dup(), dup2(), isatty(),
-   lseek(), read(), unlink(), write() in <io.h>.  */
-#if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \
-      || defined GNULIB_POSIXCHECK) \
+/* mingw declares getcwd in <io.h>, not in <unistd.h>.  */
+#if ((@GNULIB_GETCWD@ || defined GNULIB_POSIXCHECK) \
      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-# include <io.h>     /* mingw32, mingw64 */
-# include <direct.h> /* mingw64, MSVC 9 */
-#elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \
-       || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \
-       || defined GNULIB_POSIXCHECK) \
-      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 # include <io.h>
 #endif
 
-/* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
-   NonStop Kernel declares gethostname in <netdb.h>, not in <unistd.h>.  */
-/* But avoid namespace pollution on glibc systems.  */
-#if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \
-     || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \
-    && !defined __GLIBC__
-# include <netdb.h>
-#endif
-
-/* MSVC defines off_t in <sys/types.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
-#if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@
-/* Get off_t.  */
-# include <sys/types.h>
-#endif
-
-#if (@GNULIB_READ@ || @GNULIB_WRITE@ \
-     || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
+#if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
      || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
 /* Get ssize_t.  */
 # include <sys/types.h>
@@ -130,18 +98,9 @@
    gettext-tools/libgettextpo/, but there is only a single
    GNULIB_UNISTD_H_GETOPT variable for both.  */
 #if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
-# define __need_getopt
 # include <getopt.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GL_UNISTD_INLINE
-# define _GL_UNISTD_INLINE _GL_INLINE
-#endif
-
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -149,77 +108,78 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-    _GL_WARN_ON_USE (socket,
-                     "socket() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (connect,
-                     "connect() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (accept,
-                     "accept() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (bind,
-                     "bind() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getpeername,
-                     "getpeername() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockname,
-                     "getsockname() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockopt,
-                     "getsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (listen,
-                     "listen() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recv,
-                     "recv() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (send,
-                     "send() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recvfrom,
-                     "recvfrom() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (sendto,
-                     "sendto() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (setsockopt,
-                     "setsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (shutdown,
-                     "shutdown() used without including <sys/socket.h>");
+#if @GNULIB_GETHOSTNAME@
+/* Get all possible declarations of gethostname().  */
+# if @UNISTD_H_HAVE_WINSOCK2_H@
+#  if !defined _GL_SYS_SOCKET_H
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef socket
+#    define socket              socket_used_without_including_sys_socket_h
+#    undef connect
+#    define connect             connect_used_without_including_sys_socket_h
+#    undef accept
+#    define accept              accept_used_without_including_sys_socket_h
+#    undef bind
+#    define bind                bind_used_without_including_sys_socket_h
+#    undef getpeername
+#    define getpeername         getpeername_used_without_including_sys_socket_h
+#    undef getsockname
+#    define getsockname         getsockname_used_without_including_sys_socket_h
+#    undef getsockopt
+#    define getsockopt          getsockopt_used_without_including_sys_socket_h
+#    undef listen
+#    define listen              listen_used_without_including_sys_socket_h
+#    undef recv
+#    define recv                recv_used_without_including_sys_socket_h
+#    undef send
+#    define send                send_used_without_including_sys_socket_h
+#    undef recvfrom
+#    define recvfrom            recvfrom_used_without_including_sys_socket_h
+#    undef sendto
+#    define sendto              sendto_used_without_including_sys_socket_h
+#    undef setsockopt
+#    define setsockopt          setsockopt_used_without_including_sys_socket_h
+#    undef shutdown
+#    define shutdown            shutdown_used_without_including_sys_socket_h
+#   else
+     _GL_WARN_ON_USE (socket,
+                      "socket() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (connect,
+                      "connect() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (accept,
+                      "accept() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (bind,
+                      "bind() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getpeername,
+                      "getpeername() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockname,
+                      "getsockname() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockopt,
+                      "getsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (listen,
+                      "listen() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recv,
+                      "recv() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (send,
+                      "send() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recvfrom,
+                      "recvfrom() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (sendto,
+                      "sendto() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (setsockopt,
+                      "setsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (shutdown,
+                      "shutdown() used without including <sys/socket.h>");
+#   endif
 #  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef select
-#   define select              select_used_without_including_sys_select_h
-#  else
-    _GL_WARN_ON_USE (select,
-                     "select() used without including <sys/select.h>");
+#  if !defined _GL_SYS_SELECT_H
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef select
+#    define select              select_used_without_including_sys_select_h
+#   else
+     _GL_WARN_ON_USE (select,
+                      "select() used without including <sys/select.h>");
+#   endif
 #  endif
 # endif
 #endif
@@ -255,24 +215,12 @@
 #endif
 
 
-#if @GNULIB_CHDIR@
-_GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIASWARN (chdir);
-#elif defined GNULIB_POSIXCHECK
-# undef chdir
-# if HAVE_RAW_DECL_CHDIR
-_GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - "
-                 "use gnulib module chdir for portability");
-# endif
-#endif
-
-
 #if @GNULIB_CHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/chown.html.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/chown.html>.  */
 # if @REPLACE_CHOWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef chown
@@ -323,32 +271,24 @@
 #endif
 
 
-#if @GNULIB_DUP@
-# if @REPLACE_DUP@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define dup rpl_dup
-#  endif
+#if @REPLACE_DUP@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define dup rpl_dup
+# endif
 _GL_FUNCDECL_RPL (dup, int, (int oldfd));
 _GL_CXXALIAS_RPL (dup, int, (int oldfd));
-# else
+#else
 _GL_CXXALIAS_SYS (dup, int, (int oldfd));
-# endif
-_GL_CXXALIASWARN (dup);
-#elif defined GNULIB_POSIXCHECK
-# undef dup
-# if HAVE_RAW_DECL_DUP
-_GL_WARN_ON_USE (dup, "dup is unportable - "
-                 "use gnulib module dup for portability");
-# endif
 #endif
+_GL_CXXALIASWARN (dup);
 
 
 #if @GNULIB_DUP2@
 /* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
    NEWFD = OLDFD, otherwise close NEWFD first if it is open.
    Return newfd if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup2.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/dup2.html>.  */
 # if @REPLACE_DUP2@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup2 rpl_dup2
@@ -419,7 +359,7 @@
 # endif
 #elif defined GNULIB_POSIXCHECK
 # if HAVE_RAW_DECL_ENVIRON
-_GL_UNISTD_INLINE char ***
+static inline char ***
 rpl_environ (void)
 {
   return &environ;
@@ -477,8 +417,8 @@
 /* Change the process' current working directory to the directory on which
    the given file descriptor is open.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fchdir.html>.  */
 # if ! @HAVE_FCHDIR@
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
 
@@ -489,10 +429,6 @@
 _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
 
-# else
-#  if !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-#  endif
 # endif
 _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
 _GL_CXXALIASWARN (fchdir);
@@ -535,30 +471,11 @@
 #endif
 
 
-#if @GNULIB_FDATASYNC@
-/* Synchronize changes to a file.
-   Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
-# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
-_GL_FUNCDECL_SYS (fdatasync, int, (int fd));
-# endif
-_GL_CXXALIAS_SYS (fdatasync, int, (int fd));
-_GL_CXXALIASWARN (fdatasync);
-#elif defined GNULIB_POSIXCHECK
-# undef fdatasync
-# if HAVE_RAW_DECL_FDATASYNC
-_GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
-                 "use gnulib module fdatasync for portability");
-# endif
-#endif
-
-
 #if @GNULIB_FSYNC@
-/* Synchronize changes, including metadata, to a file.
+/* Synchronize changes to a file.
    Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
+   See POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fsync.html>.  */
 # if !@HAVE_FSYNC@
 _GL_FUNCDECL_SYS (fsync, int, (int fd));
 # endif
@@ -576,21 +493,12 @@
 #if @GNULIB_FTRUNCATE@
 /* Change the size of the file to which FD is opened to become equal to LENGTH.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ftruncate.html>.  */
-# if @REPLACE_FTRUNCATE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ftruncate
-#   define ftruncate rpl_ftruncate
-#  endif
-_GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length));
-_GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length));
-# else
-#  if !@HAVE_FTRUNCATE@
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/ftruncate.html>.  */
+# if !@HAVE_FTRUNCATE@
 _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
-#  endif
-_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 # endif
+_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 _GL_CXXALIASWARN (ftruncate);
 #elif defined GNULIB_POSIXCHECK
 # undef ftruncate
@@ -606,8 +514,8 @@
    of BUF.
    Return BUF if successful, or NULL if the directory couldn't be determined
    or SIZE was too small.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getcwd.html>.
    Additionally, the gnulib module 'getcwd' guarantees the following GNU
    extension: If BUF is NULL, an array is allocated with 'malloc'; the array
    is SIZE bytes long, unless SIZE == 0, in which case it is as big as
@@ -644,21 +552,13 @@
    Null terminate it if the name is shorter than LEN.
    If the NIS domain name is longer than LEN, set errno = EINVAL and return -1.
    Return 0 if successful, otherwise set errno and return -1.  */
-# if @REPLACE_GETDOMAINNAME@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getdomainname
-#   define getdomainname rpl_getdomainname
-#  endif
-_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len)
-                                      _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
-# else
-#  if !@HAVE_DECL_GETDOMAINNAME@
+# if !@HAVE_GETDOMAINNAME@
 _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
                                       _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len));
 # endif
+/* Need to cast, because on MacOS X 10.5 systems, the second parameter is
+                                                        int len.  */
+_GL_CXXALIAS_SYS_CAST (getdomainname, int, (char *name, size_t len));
 _GL_CXXALIASWARN (getdomainname);
 #elif defined GNULIB_POSIXCHECK
 # undef getdomainname
@@ -672,19 +572,10 @@
 #if @GNULIB_GETDTABLESIZE@
 /* Return the maximum number of file descriptors in the current process.
    In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
-# if @REPLACE_GETDTABLESIZE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getdtablesize
-#   define getdtablesize rpl_getdtablesize
-#  endif
-_GL_FUNCDECL_RPL (getdtablesize, int, (void));
-_GL_CXXALIAS_RPL (getdtablesize, int, (void));
-# else
-#  if !@HAVE_GETDTABLESIZE@
+# if !@HAVE_GETDTABLESIZE@
 _GL_FUNCDECL_SYS (getdtablesize, int, (void));
-#  endif
-_GL_CXXALIAS_SYS (getdtablesize, int, (void));
 # endif
+_GL_CXXALIAS_SYS (getdtablesize, int, (void));
 _GL_CXXALIASWARN (getdtablesize);
 #elif defined GNULIB_POSIXCHECK
 # undef getdtablesize
@@ -745,8 +636,7 @@
 _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
 #  endif
-/* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second
-   parameter is
+/* Need to cast, because on Solaris 10 systems, the second parameter is
                                                       int len.  */
 _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
 # endif
@@ -803,22 +693,13 @@
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if @REPLACE_GETLOGIN_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define getlogin_r rpl_getlogin_r
-#  endif
-_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size)
-                                   _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
-# else
-#  if !@HAVE_DECL_GETLOGIN_R@
+# if !@HAVE_DECL_GETLOGIN_R@
 _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
                                    _GL_ARG_NONNULL ((1)));
-#  endif
+# endif
 /* Need to cast, because on Solaris 10 systems, the second argument is
                                                      int size.  */
 _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
-# endif
 _GL_CXXALIASWARN (getlogin_r);
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin_r
@@ -885,14 +766,11 @@
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #     define getpagesize() _gl_getpagesize ()
 #    else
-#     if !GNULIB_defined_getpagesize_function
-_GL_UNISTD_INLINE int
+static inline int
 getpagesize ()
 {
   return _gl_getpagesize ();
 }
-#      define GNULIB_defined_getpagesize_function 1
-#     endif
 #    endif
 #   endif
 #  endif
@@ -959,49 +837,12 @@
 #endif
 
 
-#if @GNULIB_GROUP_MEMBER@
-/* Determine whether group id is in calling user's group list.  */
-# if !@HAVE_GROUP_MEMBER@
-_GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
-# endif
-_GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
-_GL_CXXALIASWARN (group_member);
-#elif defined GNULIB_POSIXCHECK
-# undef group_member
-# if HAVE_RAW_DECL_GROUP_MEMBER
-_GL_WARN_ON_USE (group_member, "group_member is unportable - "
-                 "use gnulib module group-member for portability");
-# endif
-#endif
-
-
-#if @GNULIB_ISATTY@
-# if @REPLACE_ISATTY@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef isatty
-#   define isatty rpl_isatty
-#  endif
-_GL_FUNCDECL_RPL (isatty, int, (int fd));
-_GL_CXXALIAS_RPL (isatty, int, (int fd));
-# else
-_GL_CXXALIAS_SYS (isatty, int, (int fd));
-# endif
-_GL_CXXALIASWARN (isatty);
-#elif defined GNULIB_POSIXCHECK
-# undef isatty
-# if HAVE_RAW_DECL_ISATTY
-_GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
-                 "use gnulib module isatty for portability");
-# endif
-#endif
-
-
 #if @GNULIB_LCHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Do not follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lchown.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lchown.html>.  */
 # if @REPLACE_LCHOWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef lchown
@@ -1030,8 +871,8 @@
 #if @GNULIB_LINK@
 /* Create a new hard link for an existing file.
    Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/link.html>.  */
+   See POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/link.html>.  */
 # if @REPLACE_LINK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define link rpl_link
@@ -1096,8 +937,8 @@
 #if @GNULIB_LSEEK@
 /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
    Return the new offset if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lseek.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lseek.html>.  */
 # if @REPLACE_LSEEK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define lseek rpl_lseek
@@ -1117,24 +958,6 @@
 #endif
 
 
-#if @GNULIB_PIPE@
-/* Create a pipe, defaulting to O_BINARY mode.
-   Store the read-end as fd[0] and the write-end as fd[1].
-   Return 0 upon success, or -1 with errno set upon failure.  */
-# if !@HAVE_PIPE@
-_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
-_GL_CXXALIASWARN (pipe);
-#elif defined GNULIB_POSIXCHECK
-# undef pipe
-# if HAVE_RAW_DECL_PIPE
-_GL_WARN_ON_USE (pipe, "pipe is unportable - "
-                 "use gnulib module pipe-posix for portability");
-# endif
-#endif
-
-
 #if @GNULIB_PIPE2@
 /* Create a pipe, applying the given flags when opening the read-end of the
    pipe and the write-end of the pipe.
@@ -1167,12 +990,10 @@
 #if @GNULIB_PREAD@
 /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET.
    Return the number of bytes placed into BUF if successful, otherwise
-   set errno and return -1.  0 indicates EOF.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pread.html>.  */
+   set errno and return -1.  0 indicates EOF.  See the POSIX:2001
+   specification <http://www.opengroup.org/susv3xsh/pread.html>.  */
 # if @REPLACE_PREAD@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pread
 #   define pread rpl_pread
 #  endif
 _GL_FUNCDECL_RPL (pread, ssize_t,
@@ -1203,11 +1024,10 @@
 /* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET.
    Return the number of bytes written if successful, otherwise
    set errno and return -1.  0 indicates nothing written.  See the
-   POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pwrite.html>.  */
+   POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/pwrite.html>.  */
 # if @REPLACE_PWRITE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pwrite
 #   define pwrite rpl_pwrite
 #  endif
 _GL_FUNCDECL_RPL (pwrite, ssize_t,
@@ -1234,34 +1054,12 @@
 #endif
 
 
-#if @GNULIB_READ@
-/* Read up to COUNT bytes from file descriptor FD into the buffer starting
-   at BUF.  See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/read.html>.  */
-# if @REPLACE_READ@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef read
-#   define read rpl_read
-#  endif
-_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count)
-                                 _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count));
-# else
-/* Need to cast, because on mingw, the third parameter is
-                                                          unsigned int count
-   and the return type is 'int'.  */
-_GL_CXXALIAS_SYS_CAST (read, ssize_t, (int fd, void *buf, size_t count));
-# endif
-_GL_CXXALIASWARN (read);
-#endif
-
-
 #if @GNULIB_READLINK@
 /* Read the contents of the symbolic link FILE and place the first BUFSIZE
    bytes of it into BUF.  Return the number of bytes placed into BUF if
    successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/readlink.html>.  */
 # if @REPLACE_READLINK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define readlink rpl_readlink
@@ -1303,7 +1101,7 @@
 # undef readlinkat
 # if HAVE_RAW_DECL_READLINKAT
 _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - "
-                 "use gnulib module readlinkat for portability");
+                 "use gnulib module symlinkat for portability");
 # endif
 #endif
 
@@ -1329,38 +1127,11 @@
 #endif
 
 
-#if @GNULIB_SETHOSTNAME@
-/* Set the host name of the machine.
-   The host name may or may not be fully qualified.
-
-   Put LEN bytes of NAME into the host name.
-   Return 0 if successful, otherwise, set errno and return -1.
-
-   Platforms with no ability to set the hostname return -1 and set
-   errno = ENOSYS.  */
-# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
-_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
-                                    _GL_ARG_NONNULL ((1)));
-# endif
-/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
-   and FreeBSD 6.4 the second parameter is int.  On Solaris 11
-   2011-10, the first parameter is not const.  */
-_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
-_GL_CXXALIASWARN (sethostname);
-#elif defined GNULIB_POSIXCHECK
-# undef sethostname
-# if HAVE_RAW_DECL_SETHOSTNAME
-_GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
-                 "use gnulib module sethostname for portability");
-# endif
-#endif
-
-
 #if @GNULIB_SLEEP@
 /* Pause the execution of the current thread for N seconds.
    Returns the number of seconds left to sleep.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sleep.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
 # if @REPLACE_SLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef sleep
@@ -1441,7 +1212,7 @@
 _GL_CXXALIAS_RPL (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # else
-#  if !@HAVE_DECL_TTYNAME_R@
+#  if !@HAVE_TTYNAME_R@
 _GL_FUNCDECL_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
 #  endif
@@ -1509,7 +1280,7 @@
 /* Pause the execution of the current thread for N microseconds.
    Returns 0 on completion, or -1 on range error.
    See the POSIX:2001 specification
-   <http://www.opengroup.org/susv3xsh/usleep.html>.  */
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
 # if @REPLACE_USLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef usleep
@@ -1535,9 +1306,9 @@
 
 #if @GNULIB_WRITE@
 /* Write up to COUNT bytes starting at BUF to file descriptor FD.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html>.  */
-# if @REPLACE_WRITE@
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/write.html>.  */
+# if @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef write
 #   define write rpl_write
@@ -1554,8 +1325,6 @@
 _GL_CXXALIASWARN (write);
 #endif
 
-_GL_INLINE_HEADER_END
 
-#endif /* _@GUARD_PREFIX@_UNISTD_H */
-#endif /* _GL_INCLUDING_UNISTD_H */
-#endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _GL_UNISTD_H */
+#endif /* _GL_UNISTD_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistd-safer.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd-safer.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistd-safer.h	2014-10-16 06:00:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistd-safer.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* Invoke unistd-like functions, but avoid some glitches.
 
-   Copyright (C) 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UTF-16 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-16 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-check.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-check.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-check.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-check.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Check UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -27,7 +27,7 @@
 
   while (s < s_end)
     {
-      /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
+      /* Keep in sync with unistr.h and utf8-ucs4.c.  */
       uint8_t c = *s;
 
       if (c < 0x80)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mblen.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mblen.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mblen.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mblen.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2014 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -11,7 +11,7 @@
    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.
+   Lesser 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/>.  */
@@ -26,7 +26,7 @@
 {
   if (n > 0)
     {
-      /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
+      /* Keep in sync with unistr.h and utf8-ucs4.c.  */
       uint8_t c = *s;
 
       if (c < 0x80)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -45,32 +45,21 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
         {
           if (n >= 3)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
             }
@@ -78,45 +67,26 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
         {
           if (n >= 4)
             {
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                 )
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
             }
@@ -124,12 +94,7 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -137,37 +102,16 @@
         {
           if (n >= 5)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
             }
@@ -182,44 +126,18 @@
         {
           if (n >= 6)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
             }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -55,32 +55,21 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
         {
           if (n >= 3)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
             }
@@ -88,45 +77,26 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
         {
           if (n >= 4)
             {
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                 )
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
             }
@@ -134,12 +104,7 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -147,37 +112,16 @@
         {
           if (n >= 5)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
             }
@@ -192,44 +136,18 @@
         {
           if (n >= 6)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
             }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -41,15 +41,13 @@
                          | (unsigned int) (s[1] ^ 0x80);
                   return 2;
                 }
-#if CONFIG_UNICODE_SAFETY
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
@@ -57,39 +55,23 @@
           if (n >= 3)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
+#endif
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
-#endif
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-#if CONFIG_UNICODE_SAFETY
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
@@ -97,51 +79,28 @@
           if (n >= 4)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
+                 )
 #endif
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-#if CONFIG_UNICODE_SAFETY
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -150,42 +109,19 @@
           if (n >= 5)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
+#endif
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
-#endif
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-#if CONFIG_UNICODE_SAFETY
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
@@ -199,49 +135,21 @@
           if (n >= 6)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
+#endif
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
-#endif
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-#if CONFIG_UNICODE_SAFETY
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -52,15 +52,13 @@
                          | (unsigned int) (s[1] ^ 0x80);
                   return 2;
                 }
-#if CONFIG_UNICODE_SAFETY
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
@@ -68,39 +66,23 @@
           if (n >= 3)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
 #endif
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-#if CONFIG_UNICODE_SAFETY
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
@@ -108,51 +90,28 @@
           if (n >= 4)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
+                 )
 #endif
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-#if CONFIG_UNICODE_SAFETY
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -161,42 +120,19 @@
           if (n >= 5)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
 #endif
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-#if CONFIG_UNICODE_SAFETY
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
@@ -210,49 +146,21 @@
           if (n >= 6)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
 #endif
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-#if CONFIG_UNICODE_SAFETY
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-prev.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-prev.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-prev.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-prev.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Iterate over previous character in UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,7 +23,7 @@
 const uint8_t *
 u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start)
 {
-  /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
+  /* Keep in sync with unistr.h and utf8-ucs4.c.  */
   if (s != start)
     {
       uint8_t c_1 = s[-1];
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-uctomb.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-uctomb.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr/u8-uctomb.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr/u8-uctomb.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unistr.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unistr.in.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unistr.in.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -66,20 +66,17 @@
 /* Check whether an UTF-8 string is well-formed.
    Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
 extern const uint8_t *
-       u8_check (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_check (const uint8_t *s, size_t n);
 
 /* Check whether an UTF-16 string is well-formed.
    Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
 extern const uint16_t *
-       u16_check (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_check (const uint16_t *s, size_t n);
 
 /* Check whether an UCS-4 string is well-formed.
    Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
 extern const uint32_t *
-       u32_check (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_check (const uint32_t *s, size_t n);
 
 
 /* Elementary string conversions.  */
@@ -122,14 +119,11 @@
    failure.  */
 /* Similar to mblen(), except that s must not be NULL.  */
 extern int
-       u8_mblen (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_mblen (const uint8_t *s, size_t n);
 extern int
-       u16_mblen (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_mblen (const uint16_t *s, size_t n);
 extern int
-       u32_mblen (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_mblen (const uint32_t *s, size_t n);
 
 /* Return the length (number of units) of the first character in S, putting
    its 'ucs4_t' representation in *PUC.  Upon failure, *PUC is set to 0xfffd,
@@ -140,7 +134,7 @@
 /* The variants with _safe suffix are safe, even if the library is compiled
    without --enable-safety.  */
 
-#if GNULIB_UNISTR_U8_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
        u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n);
@@ -163,7 +157,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U16_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
        u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n);
@@ -186,7 +180,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U32_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
        u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n);
@@ -211,7 +205,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U8_MBTOUC || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_MBTOUC
 # if !HAVE_INLINE
 extern int
        u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n);
@@ -234,7 +228,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U16_MBTOUC || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_MBTOUC
 # if !HAVE_INLINE
 extern int
        u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
@@ -257,7 +251,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U32_MBTOUC || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_MBTOUC
 # if !HAVE_INLINE
 extern int
        u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
@@ -285,17 +279,17 @@
 /* Similar to u*_mbtouc(), except that the return value gives more details
    about the failure, similar to mbrtowc().  */
 
-#if GNULIB_UNISTR_U8_MBTOUCR || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_MBTOUCR
 extern int
        u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n);
 #endif
 
-#if GNULIB_UNISTR_U16_MBTOUCR || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_MBTOUCR
 extern int
        u16_mbtoucr (ucs4_t *puc, const uint16_t *s, size_t n);
 #endif
 
-#if GNULIB_UNISTR_U32_MBTOUCR || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_MBTOUCR
 extern int
        u32_mbtoucr (ucs4_t *puc, const uint32_t *s, size_t n);
 #endif
@@ -306,7 +300,7 @@
 /* Similar to wctomb(), except that s must not be NULL, and the argument n
    must be specified.  */
 
-#if GNULIB_UNISTR_U8_UCTOMB || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_UCTOMB
 /* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr.  */
 extern int
        u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
@@ -328,7 +322,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U16_UCTOMB || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_UCTOMB
 /* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr.  */
 extern int
        u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
@@ -350,7 +344,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U32_UCTOMB || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_UCTOMB
 # if !HAVE_INLINE
 extern int
        u32_uctomb (uint32_t *s, ucs4_t uc, int n);
@@ -406,50 +400,38 @@
 /* Compare S1 and S2, each of length N.  */
 /* Similar to memcmp().  */
 extern int
-       u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n);
 extern int
-       u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n);
 extern int
-       u32_cmp (const uint32_t *s1, const uint32_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_cmp (const uint32_t *s1, const uint32_t *s2, size_t n);
 
 /* Compare S1 and S2.  */
 /* Similar to the gnulib function memcmp2().  */
 extern int
-       u8_cmp2 (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
+       u8_cmp2 (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2);
 extern int
-       u16_cmp2 (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
+       u16_cmp2 (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2);
 extern int
-       u32_cmp2 (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
+       u32_cmp2 (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2);
 
 /* Search the string at S for UC.  */
 /* Similar to memchr().  */
 extern uint8_t *
-       u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u8_chr (const uint8_t *s, size_t n, ucs4_t uc);
 extern uint16_t *
-       u16_chr (const uint16_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u16_chr (const uint16_t *s, size_t n, ucs4_t uc);
 extern uint32_t *
-       u32_chr (const uint32_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u32_chr (const uint32_t *s, size_t n, ucs4_t uc);
 
 /* Count the number of Unicode characters in the N units from S.  */
 /* Similar to mbsnlen().  */
 extern size_t
-       u8_mbsnlen (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_mbsnlen (const uint8_t *s, size_t n);
 extern size_t
-       u16_mbsnlen (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_mbsnlen (const uint16_t *s, size_t n);
 extern size_t
-       u32_mbsnlen (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_mbsnlen (const uint32_t *s, size_t n);
 
 /* Elementary string functions with memory allocation.  */
 
@@ -466,14 +448,11 @@
 /* Return the length (number of units) of the first character in S.
    Return 0 if it is the NUL character.  Return -1 upon failure.  */
 extern int
-       u8_strmblen (const uint8_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u8_strmblen (const uint8_t *s);
 extern int
-       u16_strmblen (const uint16_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u16_strmblen (const uint16_t *s);
 extern int
-       u32_strmblen (const uint32_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u32_strmblen (const uint32_t *s);
 
 /* Return the length (number of units) of the first character in S, putting
    its 'ucs4_t' representation in *PUC.  Return 0 if it is the NUL
@@ -508,26 +487,20 @@
 /* Return the number of units in S.  */
 /* Similar to strlen(), wcslen().  */
 extern size_t
-       u8_strlen (const uint8_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u8_strlen (const uint8_t *s);
 extern size_t
-       u16_strlen (const uint16_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u16_strlen (const uint16_t *s);
 extern size_t
-       u32_strlen (const uint32_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u32_strlen (const uint32_t *s);
 
 /* Return the number of units in S, but at most MAXLEN.  */
 /* Similar to strnlen(), wcsnlen().  */
 extern size_t
-       u8_strnlen (const uint8_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
+       u8_strnlen (const uint8_t *s, size_t maxlen);
 extern size_t
-       u16_strnlen (const uint16_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
+       u16_strnlen (const uint16_t *s, size_t maxlen);
 extern size_t
-       u32_strnlen (const uint32_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
+       u32_strnlen (const uint32_t *s, size_t maxlen);
 
 /* Copy SRC to DEST.  */
 /* Similar to strcpy(), wcscpy().  */
@@ -586,23 +559,12 @@
 
 /* Compare S1 and S2.  */
 /* Similar to strcmp(), wcscmp().  */
-#ifdef __sun
-/* Avoid a collision with the u8_strcmp() function in Solaris 11 libc.  */
 extern int
-       u8_strcmp_gnu (const uint8_t *s1, const uint8_t *s2)
-       _UC_ATTRIBUTE_PURE;
-# define u8_strcmp u8_strcmp_gnu
-#else
+       u8_strcmp (const uint8_t *s1, const uint8_t *s2);
 extern int
-       u8_strcmp (const uint8_t *s1, const uint8_t *s2)
-       _UC_ATTRIBUTE_PURE;
-#endif
-extern int
-       u16_strcmp (const uint16_t *s1, const uint16_t *s2)
-       _UC_ATTRIBUTE_PURE;
+       u16_strcmp (const uint16_t *s1, const uint16_t *s2);
 extern int
-       u32_strcmp (const uint32_t *s1, const uint32_t *s2)
-       _UC_ATTRIBUTE_PURE;
+       u32_strcmp (const uint32_t *s1, const uint32_t *s2);
 
 /* Compare S1 and S2 using the collation rules of the current locale.
    Return -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2.
@@ -618,14 +580,11 @@
 /* Compare no more than N units of S1 and S2.  */
 /* Similar to strncmp(), wcsncmp().  */
 extern int
-       u8_strncmp (const uint8_t *s1, const uint8_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_strncmp (const uint8_t *s1, const uint8_t *s2, size_t n);
 extern int
-       u16_strncmp (const uint16_t *s1, const uint16_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_strncmp (const uint16_t *s1, const uint16_t *s2, size_t n);
 extern int
-       u32_strncmp (const uint32_t *s1, const uint32_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_strncmp (const uint32_t *s1, const uint32_t *s2, size_t n);
 
 /* Duplicate S, returning an identical malloc'd string.  */
 /* Similar to strdup(), wcsdup().  */
@@ -639,98 +598,74 @@
 /* Find the first occurrence of UC in STR.  */
 /* Similar to strchr(), wcschr().  */
 extern uint8_t *
-       u8_strchr (const uint8_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u8_strchr (const uint8_t *str, ucs4_t uc);
 extern uint16_t *
-       u16_strchr (const uint16_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u16_strchr (const uint16_t *str, ucs4_t uc);
 extern uint32_t *
-       u32_strchr (const uint32_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u32_strchr (const uint32_t *str, ucs4_t uc);
 
 /* Find the last occurrence of UC in STR.  */
 /* Similar to strrchr(), wcsrchr().  */
 extern uint8_t *
-       u8_strrchr (const uint8_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u8_strrchr (const uint8_t *str, ucs4_t uc);
 extern uint16_t *
-       u16_strrchr (const uint16_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u16_strrchr (const uint16_t *str, ucs4_t uc);
 extern uint32_t *
-       u32_strrchr (const uint32_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u32_strrchr (const uint32_t *str, ucs4_t uc);
 
 /* Return the length of the initial segment of STR which consists entirely
    of Unicode characters not in REJECT.  */
 /* Similar to strcspn(), wcscspn().  */
 extern size_t
-       u8_strcspn (const uint8_t *str, const uint8_t *reject)
-       _UC_ATTRIBUTE_PURE;
+       u8_strcspn (const uint8_t *str, const uint8_t *reject);
 extern size_t
-       u16_strcspn (const uint16_t *str, const uint16_t *reject)
-       _UC_ATTRIBUTE_PURE;
+       u16_strcspn (const uint16_t *str, const uint16_t *reject);
 extern size_t
-       u32_strcspn (const uint32_t *str, const uint32_t *reject)
-       _UC_ATTRIBUTE_PURE;
+       u32_strcspn (const uint32_t *str, const uint32_t *reject);
 
 /* Return the length of the initial segment of STR which consists entirely
    of Unicode characters in ACCEPT.  */
 /* Similar to strspn(), wcsspn().  */
 extern size_t
-       u8_strspn (const uint8_t *str, const uint8_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u8_strspn (const uint8_t *str, const uint8_t *accept);
 extern size_t
-       u16_strspn (const uint16_t *str, const uint16_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u16_strspn (const uint16_t *str, const uint16_t *accept);
 extern size_t
-       u32_strspn (const uint32_t *str, const uint32_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u32_strspn (const uint32_t *str, const uint32_t *accept);
 
 /* Find the first occurrence in STR of any character in ACCEPT.  */
 /* Similar to strpbrk(), wcspbrk().  */
 extern uint8_t *
-       u8_strpbrk (const uint8_t *str, const uint8_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u8_strpbrk (const uint8_t *str, const uint8_t *accept);
 extern uint16_t *
-       u16_strpbrk (const uint16_t *str, const uint16_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u16_strpbrk (const uint16_t *str, const uint16_t *accept);
 extern uint32_t *
-       u32_strpbrk (const uint32_t *str, const uint32_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u32_strpbrk (const uint32_t *str, const uint32_t *accept);
 
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
 /* Similar to strstr(), wcsstr().  */
 extern uint8_t *
-       u8_strstr (const uint8_t *haystack, const uint8_t *needle)
-       _UC_ATTRIBUTE_PURE;
+       u8_strstr (const uint8_t *haystack, const uint8_t *needle);
 extern uint16_t *
-       u16_strstr (const uint16_t *haystack, const uint16_t *needle)
-       _UC_ATTRIBUTE_PURE;
+       u16_strstr (const uint16_t *haystack, const uint16_t *needle);
 extern uint32_t *
-       u32_strstr (const uint32_t *haystack, const uint32_t *needle)
-       _UC_ATTRIBUTE_PURE;
+       u32_strstr (const uint32_t *haystack, const uint32_t *needle);
 
 /* Test whether STR starts with PREFIX.  */
 extern bool
-       u8_startswith (const uint8_t *str, const uint8_t *prefix)
-       _UC_ATTRIBUTE_PURE;
+       u8_startswith (const uint8_t *str, const uint8_t *prefix);
 extern bool
-       u16_startswith (const uint16_t *str, const uint16_t *prefix)
-       _UC_ATTRIBUTE_PURE;
+       u16_startswith (const uint16_t *str, const uint16_t *prefix);
 extern bool
-       u32_startswith (const uint32_t *str, const uint32_t *prefix)
-       _UC_ATTRIBUTE_PURE;
+       u32_startswith (const uint32_t *str, const uint32_t *prefix);
 
 /* Test whether STR ends with SUFFIX.  */
 extern bool
-       u8_endswith (const uint8_t *str, const uint8_t *suffix)
-       _UC_ATTRIBUTE_PURE;
+       u8_endswith (const uint8_t *str, const uint8_t *suffix);
 extern bool
-       u16_endswith (const uint16_t *str, const uint16_t *suffix)
-       _UC_ATTRIBUTE_PURE;
+       u16_endswith (const uint16_t *str, const uint16_t *suffix);
 extern bool
-       u32_endswith (const uint32_t *str, const uint32_t *suffix)
-       _UC_ATTRIBUTE_PURE;
+       u32_endswith (const uint32_t *str, const uint32_t *suffix);
 
 /* Divide STR into tokens separated by characters in DELIM.
    This interface is actually more similar to wcstok than to strtok.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unitypes.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unitypes.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unitypes.in.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unitypes.in.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
-/* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+/* Elementary types for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,24 +23,4 @@
 /* Type representing a Unicode character.  */
 typedef uint32_t ucs4_t;
 
-/* Attribute of a function whose result depends only on the arguments
-   (not pointers!) and which has no side effects.  */
-#ifndef _UC_ATTRIBUTE_CONST
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#  define _UC_ATTRIBUTE_CONST __attribute__ ((__const__))
-# else
-#  define _UC_ATTRIBUTE_CONST
-# endif
-#endif
-
-/* Attribute of a function whose result depends only on the arguments
-   (possibly pointers) and global memory, and which has no side effects.  */
-#ifndef _UC_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _UC_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _UC_ATTRIBUTE_PURE
-# endif
-#endif
-
 #endif /* _UNITYPES_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniwidth/cjk.h gettext-0.18.1.1/gettext-tools/gnulib-lib/uniwidth/cjk.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniwidth/cjk.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniwidth/cjk.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -22,16 +22,16 @@
 {
   if (0
       /* Legacy Japanese encodings */
-      || STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
+      || STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
       /* Legacy Chinese encodings */
-      || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-      || STREQ_OPT (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
-      || STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
-      || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
+      || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+      || STREQ (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
+      || STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
+      || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
       /* Legacy Korean encodings */
-      || STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-      || STREQ_OPT (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
-      || STREQ_OPT (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
+      || STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+      || STREQ (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
+      || STREQ (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
     return 1;
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniwidth/width.c gettext-0.18.1.1/gettext-tools/gnulib-lib/uniwidth/width.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniwidth/width.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniwidth/width.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -32,7 +32,7 @@
  * - Zero width characters; generated from
  *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
  */
-static const unsigned char nonspacing_table_data[27*64] = {
+static const unsigned char nonspacing_table_data[26*64] = {
   /* 0x0000-0x01ff */
   0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
@@ -62,20 +62,20 @@
   0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
   /* 0x0600-0x07ff */
   0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
-  0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
+  0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
-  0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
+  0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
   0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
   0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */
   /* 0x0800-0x09ff */
-  0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */
-  0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */
-  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */
-  0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */
+  0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
   0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */
   /* 0x0a00-0x0bff */
@@ -103,12 +103,12 @@
   0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
   0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
-  0xdf, 0xe0, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
+  0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
   0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
   /* 0x1000-0x11ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */
   0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */
-  0x64, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
+  0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */
@@ -120,7 +120,7 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
-  0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
+  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
   /* 0x1600-0x17ff */
@@ -143,22 +143,22 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
   /* 0x1a00-0x1bff */
   0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
-  0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
   0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
   0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
   0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */
-  0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */
   /* 0x1c00-0x1dff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
-  0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x00, 0x00, /* 0x1cc0-0x1cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
-  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xf0, /* 0x1dc0-0x1dff */
+  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */
   /* 0x2000-0x21ff */
   0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
   0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */
@@ -172,9 +172,9 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, /* 0x2cc0-0x2cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x2d40-0x2d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */
   /* 0x3000-0x31ff */
@@ -190,7 +190,7 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */
@@ -199,20 +199,20 @@
   0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
-  0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */
   0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
   0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
-  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
   /* 0xaa00-0xabff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */
   0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x00, /* 0xabc0-0xabff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */
   /* 0xfa00-0xfbff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
@@ -249,22 +249,13 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
-  /* 0x11000-0x111ff */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */
-  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11040-0x1107f */
-  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11100-0x1113f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11140-0x1117f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11180-0x111bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */
   /* 0x1d000-0x1d1ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
-  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xf8, 0xff, /* 0x1d140-0x1d17f */
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */
   0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
   /* 0x1d200-0x1d3ff */
@@ -295,7 +286,7 @@
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
   -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
   22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */
-  24, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
@@ -307,7 +298,7 @@
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
-  25, 26, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
+  24, 25, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
 };
 
 /* Determine number of column positions required for UC.  */
@@ -341,8 +332,8 @@
         }
     }
   /* Test for double-width character.
-   * Generated from "grep '^[^;]\{4,5\};[WF]' EastAsianWidth.txt"
-   * and            "grep '^[^;]\{4,5\};[^WF]' EastAsianWidth.txt"
+   * Generated from "grep '^....;[WF]' EastAsianWidth.txt"
+   * and            "grep '^....;[^WF]' EastAsianWidth.txt"
    */
   if (uc >= 0x1100
       && ((uc < 0x1160) /* Hangul Jamo */
@@ -355,8 +346,8 @@
           || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
           || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
           || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
-          || (uc >= 0x20000 && uc <= 0x2ffff) /* Supplementary Ideographic Plane */
-          || (uc >= 0x30000 && uc <= 0x3ffff) /* Tertiary Ideographic Plane */
+          || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
+          || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
      )   )
     return 2;
   /* In ancient CJK encodings, Cyrillic and most other characters are
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/uniwidth.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/uniwidth.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/uniwidth.in.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/uniwidth.in.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -38,31 +38,24 @@
 
 /* Determine number of column positions required for UC.  */
 extern int
-       uc_width (ucs4_t uc, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       uc_width (ucs4_t uc, const char *encoding);
 
 /* Determine number of column positions required for first N units
    (or fewer if S ends before this) in S.  */
 extern int
-       u8_width (const uint8_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u8_width (const uint8_t *s, size_t n, const char *encoding);
 extern int
-       u16_width (const uint16_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u16_width (const uint16_t *s, size_t n, const char *encoding);
 extern int
-       u32_width (const uint32_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u32_width (const uint32_t *s, size_t n, const char *encoding);
 
 /* Determine number of column positions required for S.  */
 extern int
-       u8_strwidth (const uint8_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u8_strwidth (const uint8_t *s, const char *encoding);
 extern int
-       u16_strwidth (const uint16_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u16_strwidth (const uint16_t *s, const char *encoding);
 extern int
-       u32_strwidth (const uint32_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u32_strwidth (const uint32_t *s, const char *encoding);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unlocked-io.h gettext-0.18.1.1/gettext-tools/gnulib-lib/unlocked-io.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/unlocked-io.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unlocked-io.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/unsetenv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/unsetenv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/unsetenv.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/unsetenv.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2010 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
@@ -14,12 +14,12 @@
    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>
+
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the name == NULL test below.  */
 #define _GL_ARG_NONNULL(params)
 
-#include <config.h>
-
 /* Specification.  */
 #include <stdlib.h>
 
@@ -36,7 +36,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of 'environ'.  */
+/* This lock protects against simultaneous modifications of `environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -97,13 +97,6 @@
 #else /* HAVE_UNSETENV */
 
 # undef unsetenv
-# if !HAVE_DECL_UNSETENV
-#  if VOID_UNSETENV
-extern void unsetenv (const char *);
-#  else
-extern int unsetenv (const char *);
-#  endif
-# endif
 
 /* Call the underlying unsetenv, in case there is hidden bookkeeping
    that needs updating beyond just modifying environ.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/vasnprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/vasnprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/vasnprintf.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/vasnprintf.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can be parametrized with the following macros:
      VASNPRINTF         The name of the function being defined.
@@ -87,8 +88,6 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-#include "verify.h"
-
 #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
 # include "float+.h"
@@ -275,10 +274,10 @@
 {
   const char *point;
   /* Determine it in a multithread-safe way.  We know nl_langinfo is
-     multithread-safe on glibc systems and Mac OS X systems, but is not required
+     multithread-safe on glibc systems and MacOS X systems, but is not required
      to be multithread-safe by POSIX.  sprintf(), however, is multithread-safe.
      localeconv() is rarely multithread-safe.  */
-#  if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__))
+#  if HAVE_NL_LANGINFO && (__GLIBC__ || (defined __APPLE__ && defined __MACH__))
   point = nl_langinfo (RADIXCHAR);
 #  elif 1
   char pointbuf[5];
@@ -323,11 +322,11 @@
 
 typedef unsigned int mp_limb_t;
 # define GMP_LIMB_BITS 32
-verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
+typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1];
 
 typedef unsigned long long mp_twolimb_t;
 # define GMP_TWOLIMB_BITS 64
-verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
+typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1];
 
 /* Representation of a bignum >= 0.  */
 typedef struct
@@ -552,61 +551,32 @@
       size_t s;
       {
         mp_limb_t msd = b_ptr[b_len - 1]; /* = b[n-1], > 0 */
-        /* Determine s = GMP_LIMB_BITS - integer_length (msd).
-           Code copied from gnulib's integer_length.c.  */
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-        s = __builtin_clz (msd);
-# else
-#  if defined DBL_EXPBIT0_WORD && defined DBL_EXPBIT0_BIT
-        if (GMP_LIMB_BITS <= DBL_MANT_BIT)
+        s = 31;
+        if (msd >= 0x10000)
           {
-            /* Use 'double' operations.
-               Assumes an IEEE 754 'double' implementation.  */
-#   define DBL_EXP_MASK ((DBL_MAX_EXP - DBL_MIN_EXP) | 7)
-#   define DBL_EXP_BIAS (DBL_EXP_MASK / 2 - 1)
-#   define NWORDS \
-     ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-            union { double value; unsigned int word[NWORDS]; } m;
-
-            /* Use a single integer to floating-point conversion.  */
-            m.value = msd;
-
-            s = GMP_LIMB_BITS
-                - (((m.word[DBL_EXPBIT0_WORD] >> DBL_EXPBIT0_BIT) & DBL_EXP_MASK)
-                   - DBL_EXP_BIAS);
+            msd = msd >> 16;
+            s -= 16;
           }
-        else
-#   undef NWORDS
-#  endif
+        if (msd >= 0x100)
           {
-            s = 31;
-            if (msd >= 0x10000)
-              {
-                msd = msd >> 16;
-                s -= 16;
-              }
-            if (msd >= 0x100)
-              {
-                msd = msd >> 8;
-                s -= 8;
-              }
-            if (msd >= 0x10)
-              {
-                msd = msd >> 4;
-                s -= 4;
-              }
-            if (msd >= 0x4)
-              {
-                msd = msd >> 2;
-                s -= 2;
-              }
-            if (msd >= 0x2)
-              {
-                msd = msd >> 1;
-                s -= 1;
-              }
+            msd = msd >> 8;
+            s -= 8;
+          }
+        if (msd >= 0x10)
+          {
+            msd = msd >> 4;
+            s -= 4;
+          }
+        if (msd >= 0x4)
+          {
+            msd = msd >> 2;
+            s -= 2;
+          }
+        if (msd >= 0x2)
+          {
+            msd = msd >> 1;
+            s -= 1;
           }
-# endif
       }
       /* 0 <= s < GMP_LIMB_BITS.
          Copy b, shifting it left by s bits.  */
@@ -913,9 +883,9 @@
   y = frexpl (x, &exp);
   if (!(y >= 0.0L && y < 1.0L))
     abort ();
-  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * 2^LDBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * LDBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^LDBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * LDBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'long double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'long double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -963,11 +933,11 @@
         abort ();
       m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo;
     }
-#  if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
-           precision.  */
+#if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
+         precision.  */
   if (!(y == 0.0L))
     abort ();
-#  endif
+#endif
   /* Normalise.  */
   while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0)
     m.nlimbs--;
@@ -1001,9 +971,9 @@
   y = frexp (x, &exp);
   if (!(y >= 0.0 && y < 1.0))
     abort ();
-  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * 2^DBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * DBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^DBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * DBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -1530,7 +1500,7 @@
 
 /* Returns the number of TCHAR_T units needed as temporary space for the result
    of sprintf or SNPRINTF of a single conversion directive.  */
-static size_t
+static inline size_t
 MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
                  arg_type type, int flags, size_t width, int has_precision,
                  size_t precision, int pad_ourselves)
@@ -1781,9 +1751,8 @@
     return NULL;
 
 #define CLEANUP() \
-  if (d.dir != d.direct_alloc_dir)                                      \
-    free (d.dir);                                                       \
-  if (a.arg != a.direct_alloc_arg)                                      \
+  free (d.dir);                                                         \
+  if (a.arg)                                                            \
     free (a.arg);
 
   if (PRINTF_FETCHARGS (args, &a) < 0)
@@ -1957,14 +1926,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2072,7 +2042,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2125,7 +2096,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2198,7 +2170,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2251,7 +2224,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2324,7 +2298,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2377,7 +2352,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2428,14 +2404,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2565,7 +2542,8 @@
                       characters = 0;
                     }
 
-                  if (characters < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2626,7 +2604,8 @@
                         }
                     }
 
-                  if (characters < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2642,7 +2621,7 @@
                   size_t characters;
 #  if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
-                  verify (sizeof (TCHAR_T) == 1);
+                  typedef int TCHAR_T_verify[2 * (sizeof (TCHAR_T) == 1) - 1];
                   TCHAR_T *tmpsrc;
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
@@ -2803,7 +2782,7 @@
                   if (has_width)
                     {
 #  if ENABLE_UNISTDIO
-                      /* Outside POSIX, it's preferable to compare the width
+                      /* Outside POSIX, it's preferrable to compare the width
                          against the number of _characters_ of the converted
                          value.  */
                       w = DCHAR_MBSNLEN (result + length, characters);
@@ -2817,7 +2796,8 @@
                     /* w doesn't matter.  */
                     w = 0;
 
-                  if (w < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2900,7 +2880,8 @@
                   length += tmpdst_len;
 #  endif
 
-                  if (w < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2927,16 +2908,17 @@
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
-                size_t count;
                 DCHAR_T tmpbuf[700];
                 DCHAR_T *tmp;
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -2947,14 +2929,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2964,6 +2947,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3339,14 +3323,11 @@
                     abort ();
 # endif
                   }
-
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -3379,26 +3360,28 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
 #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
@@ -3432,8 +3415,8 @@
                 arg_type type = a.arg[dp->arg_index].type;
 # endif
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
-                size_t count;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
@@ -3442,6 +3425,7 @@
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -3452,14 +3436,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -3469,6 +3454,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3908,9 +3894,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
+                                            size_t count = exponent + 1;
                                             /* Note: count <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -3924,10 +3910,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4378,9 +4364,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
-                                            /* Note: ecount <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            size_t count = exponent + 1;
+                                            /* Note: count <= precision = ndigits.  */
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -4394,10 +4380,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4525,11 +4511,9 @@
 
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -4562,36 +4546,36 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
             else
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                int has_width;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                int has_width;
                 size_t width;
 #endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION
@@ -4613,17 +4597,14 @@
                 TCHAR_T *fbp;
                 unsigned int prefix_count;
                 int prefixes[2] IF_LINT (= { 0 });
-                int orig_errno;
 #if !USE_SNPRINTF
                 size_t tmp_length;
                 TCHAR_T tmpbuf[700];
                 TCHAR_T *tmp;
 #endif
 
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                has_width = 0;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -4634,14 +4615,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -4651,9 +4633,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                     has_width = 1;
-#endif
                   }
 #endif
 
@@ -4771,10 +4751,6 @@
                   *fbp++ = ' ';
                 if (flags & FLAG_ALT)
                   *fbp++ = '#';
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-                if (flags & FLAG_LOCALIZED)
-                  *fbp++ = 'I';
-#endif
                 if (!pad_ourselves)
                   {
                     if (flags & FLAG_ZERO)
@@ -4858,21 +4834,20 @@
 #endif
                   *fbp = dp->conversion;
 #if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
                 fbp[1] = '%';
                 fbp[2] = 'n';
                 fbp[3] = '\0';
 # else
                 /* On glibc2 systems from glibc >= 2.3 - probably also older
-                   ones - we know that snprintf's return value conforms to
-                   ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and
-                   gl_SNPRINTF_TRUNCATION_C99 pass.
+                   ones - we know that snprintf's returns value conforms to
+                   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
                    Therefore we can avoid using %n in this situation.
                    On glibc2 systems from 2004-10-18 or newer, the use of %n
                    in format strings in writable memory may crash the program
                    (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
                    in this situation.  */
-                /* On native Windows systems (such as mingw), we can avoid using
+                /* On native Win32 systems (such as mingw), we can avoid using
                    %n because:
                      - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
                        snprintf does not write more than the specified number
@@ -4881,7 +4856,7 @@
                      - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf
                        allows us to recognize the case of an insufficient
                        buffer size: it returns -1 in this case.
-                   On native Windows systems (such as mingw) where the OS is
+                   On native Win32 systems (such as mingw) where the OS is
                    Windows Vista, the use of %n in format strings by default
                    crashes the program. See
                      <http://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
@@ -4925,8 +4900,6 @@
                 *(TCHAR_T *) (result + length) = '\0';
 #endif
 
-                orig_errno = errno;
-
                 for (;;)
                   {
                     int count = -1;
@@ -5141,8 +5114,7 @@
                                 size_t tmp_length =
                                   MAX_ROOM_NEEDED (&a, dp->arg_index,
                                                    dp->conversion, type, flags,
-                                                   width,
-                                                   has_precision,
+                                                   width, has_precision,
                                                    precision, pad_ourselves);
 
                                 if (maxlen < tmp_length)
@@ -5312,7 +5284,8 @@
                         DCHAR_T *tmpdst;
                         size_t tmpdst_len;
                         /* This code assumes that TCHAR_T is 'char'.  */
-                        verify (sizeof (TCHAR_T) == 1);
+                        typedef int TCHAR_T_verify
+                                    [2 * (sizeof (TCHAR_T) == 1) - 1];
 # if USE_SNPRINTF
                         tmpsrc = (TCHAR_T *) (result + length);
 # else
@@ -5405,7 +5378,7 @@
                       {
                         size_t w;
 # if ENABLE_UNISTDIO
-                        /* Outside POSIX, it's preferable to compare the width
+                        /* Outside POSIX, it's preferrable to compare the width
                            against the number of _characters_ of the converted
                            value.  */
                         w = DCHAR_MBSNLEN (result + length, count);
@@ -5525,7 +5498,6 @@
                     length += count;
                     break;
                   }
-                errno = orig_errno;
 #undef pad_ourselves
 #undef prec_ourselves
               }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/vasnprintf.h gettext-0.18.1.1/gettext-tools/gnulib-lib/vasnprintf.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/vasnprintf.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/vasnprintf.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
@@ -23,16 +24,16 @@
 /* Get size_t.  */
 #include <stddef.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
@@ -68,9 +69,9 @@
 # define vasnprintf rpl_vasnprintf
 #endif
 extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
+       __attribute__ ((__format__ (__printf__, 3, 4)));
 extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));
+       __attribute__ ((__format__ (__printf__, 3, 0)));
 
 #ifdef __cplusplus
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/vasprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/vasprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/vasprintf.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/vasprintf.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/verify.h gettext-0.18.1.1/gettext-tools/gnulib-lib/verify.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/verify.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/verify.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,49 +17,21 @@
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
-#ifndef _GL_VERIFY_H
-#define _GL_VERIFY_H
-
-
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
-   This is supported by GCC 4.6.0 and later, in C mode, and its use
-   here generates easier-to-read diagnostics when verify (R) fails.
-
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
-   This will likely be supported by future GCC versions, in C++ mode.
-
-   Use this only with GCC.  If we were willing to slow 'configure'
-   down we could also use it with other compilers, but since this
-   affects only the quality of diagnostics, why bother?  */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
-     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
-     && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
-   first G++ release that supports static_assert.  */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
-#endif
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   system headers, defines a conflicting _Static_assert that is no
-   better than ours; override it.  */
-#ifndef _GL_HAVE_STATIC_ASSERT
-# include <stddef.h>
-# undef _Static_assert
-#endif
+#ifndef VERIFY_H
+# define VERIFY_H 1
 
 /* Each of these macros verifies that its argument R is nonzero.  To
    be portable, R should be an integer constant expression.  Unlike
    assert (R), there is no run-time overhead.
 
-   If _Static_assert works, verify (R) uses it directly.  Similarly,
-   _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct
-   that is an operand of sizeof.
+   There are two macros, since no single macro can be used in all
+   contexts in C.  verify_true (R) is for scalar contexts, including
+   integer constant expression contexts.  verify (R) is for declaration
+   contexts, e.g., the top level.
 
-   The code below uses several ideas for C++ compilers, and for C
-   compilers that do not support _Static_assert:
+   Symbols ending in "__" are private to this header.
+
+   The code below uses several ideas.
 
    * The first step is ((R) ? 1 : -1).  Given an expression R, of
      integral or boolean or floating-point type, this yields an
@@ -67,9 +39,7 @@
      constant and nonnegative.
 
    * Next this expression W is wrapped in a type
-     struct _gl_verify_type {
-       unsigned int _gl_verify_error_if_negative: W;
-     }.
+     struct verify_type__ { unsigned int verify_error_if_negative_size__: W; }.
      If W is negative, this yields a compile-time error.  No compiler can
      deal with a bit-field of negative size.
 
@@ -83,7 +53,7 @@
 
        void function (int n) { verify (n < 0); }
 
-   * For the verify macro, the struct _gl_verify_type will need to
+   * For the verify macro, the struct verify_type__ will need to
      somehow be embedded into a declaration.  To be portable, this
      declaration must declare an object, a constant, a function, or a
      typedef name.  If the declared entity uses the type directly,
@@ -121,11 +91,11 @@
      Which of the following alternatives can be used?
 
        extern int dummy [sizeof (struct {...})];
-       extern int dummy [sizeof (struct _gl_verify_type {...})];
+       extern int dummy [sizeof (struct verify_type__ {...})];
        extern void dummy (int [sizeof (struct {...})]);
-       extern void dummy (int [sizeof (struct _gl_verify_type {...})]);
+       extern void dummy (int [sizeof (struct verify_type__ {...})]);
        extern int (*dummy (void)) [sizeof (struct {...})];
-       extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})];
+       extern int (*dummy (void)) [sizeof (struct verify_type__ {...})];
 
      In the second and sixth case, the struct type is exported to the
      outer scope; two such declarations therefore collide.  GCC warns
@@ -135,145 +105,59 @@
        extern int (*dummy (void)) [sizeof (struct {...})];
 
    * GCC warns about duplicate declarations of the dummy function if
-     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
+     -Wredundant_decls is used.  GCC 4.3 and later have a builtin
      __COUNTER__ macro that can let us generate unique identifiers for
      each dummy function, to suppress this warning.
 
-   * This implementation exploits the fact that older versions of GCC,
-     which do not support _Static_assert, also do not warn about the
-     last declaration mentioned above.
-
-   * GCC warns if -Wnested-externs is enabled and verify() is used
-     within a function body; but inside a function, you can always
-     arrange to use verify_expr() instead.
+   * This implementation exploits the fact that GCC does not warn about
+     the last declaration mentioned above.  If a future version of GCC
+     introduces a warning for this, the problem could be worked around
+     by using code specialized to GCC, just as __COUNTER__ is already
+     being used if available.
+
+       #if 4 <= __GNUC__
+       # define verify(R) [another version to keep GCC happy]
+       #endif
 
    * In C++, any struct definition inside sizeof is invalid.
      Use a template type to work around the problem.  */
 
 /* Concatenate two preprocessor tokens.  */
-#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-#define _GL_CONCAT0(x, y) x##y
+# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+# define _GL_CONCAT0(x, y) x##y
 
 /* _GL_COUNTER is an integer, preferably one that changes each time we
    use it.  Use __COUNTER__ if it works, falling back on __LINE__
    otherwise.  __LINE__ isn't perfect, but it's better than a
    constant.  */
-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-# define _GL_COUNTER __COUNTER__
-#else
-# define _GL_COUNTER __LINE__
-#endif
+# if defined __COUNTER__ && __COUNTER__ != __COUNTER__
+#  define _GL_COUNTER __COUNTER__
+# else
+#  define _GL_COUNTER __LINE__
+# endif
 
 /* Generate a symbol with the given prefix, making it unique if
    possible.  */
-#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
-
-/* Verify requirement R at compile-time, as an integer constant expression
-   that returns 1.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.  */
+# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
 
-#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
-   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
+/* Verify requirement R at compile-time, as an integer constant expression.
+   Return 1.  */
 
-#ifdef __cplusplus
-# if !GNULIB_defined_struct__gl_verify_type
+# ifdef __cplusplus
 template <int w>
-  struct _gl_verify_type {
-    unsigned int _gl_verify_error_if_negative: w;
-  };
-#  define GNULIB_defined_struct__gl_verify_type 1
-# endif
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    _gl_verify_type<(R) ? 1 : -1>
-#elif defined _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
-    }
-#else
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
-#endif
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.
-
-   Unfortunately, unlike C11, this implementation must appear as an
-   ordinary declaration, and cannot appear inside struct { ... }.  */
-
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
-#else
-# define _GL_VERIFY(R, DIAGNOSTIC)				       \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
-      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-#endif
-
-/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
-#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+  struct verify_type__ { unsigned int verify_error_if_negative_size__: w; };
+#  define verify_true(R) \
+     (!!sizeof (verify_type__<(R) ? 1 : -1>))
+# else
+#  define verify_true(R) \
+     (!!sizeof \
+      (struct { unsigned int verify_error_if_negative_size__: (R) ? 1 : -1; }))
 # endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#  define static_assert _Static_assert /* C11 requires this #define.  */
-# endif
-#endif
-
-/* @assert.h omit start@  */
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   There are two macros, since no single macro can be used in all
-   contexts in C.  verify_true (R) is for scalar contexts, including
-   integer constant expression contexts.  verify (R) is for declaration
-   contexts, e.g., the top level.  */
-
-/* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  This is equivalent to verify_expr (R, 1).
-
-   verify_true is obsolescent; please use verify_expr instead.  */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
-/* Verify requirement R at compile-time.  Return the value of the
-   expression E.  */
-
-#define verify_expr(R, E) \
-   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
 
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  */
 
-#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-/* Assume that R always holds.  This lets the compiler optimize
-   accordingly.  R should not have side-effects; it may or may not be
-   evaluated.  Behavior is undefined if R is false.  */
-
-#if (__has_builtin (__builtin_unreachable) \
-     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
-# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
-#elif 1200 <= _MSC_VER
-# define assume(R) __assume (R)
-#elif (defined lint \
-       && (__has_builtin (__builtin_trap) \
-           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
-  /* Doing it this way helps various packages when configured with
-     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
-     when 'assume' silences warnings even with older GCCs.  */
-# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
-#else
-# define assume(R) ((void) (0 && (R)))
-#endif
-
-/* @assert.h omit end@  */
+# define verify(R) \
+    extern int (* _GL_GENSYM (verify_function) (void)) [verify_true (R)]
 
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/vsnprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/vsnprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/vsnprintf.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/vsnprintf.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2010 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
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/w32spawn.h gettext-0.18.1.1/gettext-tools/gnulib-lib/w32spawn.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/w32spawn.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/w32spawn.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
-/* Auxiliary functions for the creation of subprocesses.  Native Windows API.
-   Copyright (C) 2001, 2003-2014 Free Software Foundation, Inc.
+/* Auxiliary functions for the creation of subprocesses.  Native Woe32 API.
+   Copyright (C) 2001, 2003-2010 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,11 +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/>.  */
 
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-/* Get _open_osfhandle().  */
+/* Get _get_osfhandle() and _open_osfhandle().  */
 #include <io.h>
 
 #include <stdbool.h>
@@ -27,9 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-/* Get _get_osfhandle().  */
-#include "msvc-nothrow.h"
-
 #include "cloexec.h"
 #include "xalloc.h"
 
@@ -101,7 +98,7 @@
          v.dwPlatformId == VER_PLATFORM_WIN32_NT;
       }) ? "cmd.exe" : "command.com").
    Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Windows CreateProcess()
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
    interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
    special way:
    - Space and tab are interpreted as delimiters. They are not treated as
@@ -115,15 +112,8 @@
        \" -> "
        \\\" -> \"
        \\\\\" -> \\"
-   - '*', '?' characters may get expanded through wildcard expansion in the
-     callee: By default, in the callee, the initialization code before main()
-     takes the result of GetCommandLine(), wildcard-expands it, and passes it
-     to main(). The exceptions to this rule are:
-       - programs that inspect GetCommandLine() and ignore argv,
-       - 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_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"
 static char **
 prepare_spawn (char **argv)
@@ -143,7 +133,7 @@
      script, not a program.
      On Unix, this would be "/bin/sh". On native Windows, "sh" is actually
      "sh.exe".  We have to omit the directory part and rely on the search in
-     PATH, because the mingw "mount points" are not visible inside Windows
+     PATH, because the mingw "mount points" are not visible inside Win32
      CreateProcess().  */
   *new_argv++ = "sh.exe";
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/waitpid.c gettext-0.18.1.1/gettext-tools/gnulib-lib/waitpid.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/waitpid.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/waitpid.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* Wait for process state change.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <sys/wait.h>
-
-/* Implementation for native Windows systems.  */
-
-#include <process.h> /* for _cwait, WAIT_CHILD */
-
-pid_t
-waitpid (pid_t pid, int *statusp, int options)
-{
-  return _cwait (statusp, pid, WAIT_CHILD);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/wait-process.c gettext-0.18.1.1/gettext-tools/gnulib-lib/wait-process.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/wait-process.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wait-process.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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
@@ -171,7 +171,7 @@
 }
 
 /* Unregister a child from the list of slave subprocesses.  */
-static void
+static inline void
 unregister_slave_subprocess (pid_t child)
 {
   /* The easiest way to remove an entry from a list that can be used by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/wait-process.h gettext-0.18.1.1/gettext-tools/gnulib-lib/wait-process.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/wait-process.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wait-process.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2008-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/wchar.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/wchar.in.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake.  */
 
@@ -28,7 +29,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
 /* Special invocation convention:
@@ -48,25 +48,17 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_WCHAR_H
+#ifndef _GL_WCHAR_H
 
 #define _GL_ALREADY_INCLUDING_WCHAR_H
 
-#if @HAVE_FEATURES_H@
-# include <features.h> /* for __GLIBC__ */
-#endif
-
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
    included before <wchar.h>.
-   In some builds of uClibc, <wchar.h> is nonexistent and wchar_t is defined
-   by <stddef.h>.
    But avoid namespace pollution on glibc systems.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-#endif
 #ifndef __GLIBC__
+# include <stddef.h>
 # include <stdio.h>
 # include <time.h>
 #endif
@@ -80,16 +72,8 @@
 
 #undef _GL_ALREADY_INCLUDING_WCHAR_H
 
-#ifndef _@GUARD_PREFIX@_WCHAR_H
-#define _@GUARD_PREFIX@_WCHAR_H
-
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -105,18 +89,6 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
-#  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
-typedef unsigned int rpl_wint_t;
-#   undef wint_t
-#   define wint_t rpl_wint_t
-#   define GNULIB_defined_wint_t 1
-#  endif
-# endif
 # ifndef WEOF
 #  define WEOF ((wint_t) -1)
 # endif
@@ -127,12 +99,10 @@
    On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
    implementing mbrtowc for encodings like UTF-8.  */
 #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
-# if !GNULIB_defined_mbstate_t
 typedef int rpl_mbstate_t;
-#  undef mbstate_t
-#  define mbstate_t rpl_mbstate_t
-#  define GNULIB_defined_mbstate_t 1
-# endif
+# undef mbstate_t
+# define mbstate_t rpl_mbstate_t
+# define GNULIB_defined_mbstate_t 1
 #endif
 
 
@@ -143,11 +113,11 @@
 #   undef btowc
 #   define btowc rpl_btowc
 #  endif
-_GL_FUNCDECL_RPL (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (btowc, wint_t, (int c));
 _GL_CXXALIAS_RPL (btowc, wint_t, (int c));
 # else
 #  if !@HAVE_BTOWC@
-_GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (btowc, wint_t, (int c));
 #  endif
 _GL_CXXALIAS_SYS (btowc, wint_t, (int c));
 # endif
@@ -168,12 +138,12 @@
 #   undef wctob
 #   define wctob rpl_wctob
 #  endif
-_GL_FUNCDECL_RPL (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc));
 _GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
 # else
 #  if !defined wctob && !@HAVE_DECL_WCTOB@
 /* wctob is provided by gnulib, or wctob exists but is not declared.  */
-_GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc));
 #  endif
 _GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
 # endif
@@ -434,12 +404,12 @@
 #   undef wcwidth
 #   define wcwidth rpl_wcwidth
 #  endif
-_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
 _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 # else
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
-_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
@@ -453,576 +423,6 @@
 #endif
 
 
-/* Search N wide characters of S for C.  */
-#if @GNULIB_WMEMCHR@
-# if !@HAVE_WMEMCHR@
-_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)
-                                      _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wmemchr (const wchar_t *, wchar_t, size_t);
-         wchar_t * std::wmemchr (wchar_t *, wchar_t, size_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wmemchr,
-                        wchar_t *, (const wchar_t *, wchar_t, size_t),
-                        const wchar_t *, (const wchar_t *, wchar_t, size_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-_GL_CXXALIASWARN1 (wmemchr, const wchar_t *,
-                   (const wchar_t *s, wchar_t c, size_t n));
-# else
-_GL_CXXALIASWARN (wmemchr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wmemchr
-# if HAVE_RAW_DECL_WMEMCHR
-_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
-                 "use gnulib module wmemchr for portability");
-# endif
-#endif
-
-
-/* Compare N wide characters of S1 and S2.  */
-#if @GNULIB_WMEMCMP@
-# if !@HAVE_WMEMCMP@
-_GL_FUNCDECL_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wmemcmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemcmp
-# if HAVE_RAW_DECL_WMEMCMP
-_GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
-                 "use gnulib module wmemcmp for portability");
-# endif
-#endif
-
-
-/* Copy N wide characters of SRC to DEST.  */
-#if @GNULIB_WMEMCPY@
-# if !@HAVE_WMEMCPY@
-_GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemcpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wmemcpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemcpy
-# if HAVE_RAW_DECL_WMEMCPY
-_GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
-                 "use gnulib module wmemcpy for portability");
-# endif
-#endif
-
-
-/* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for
-   overlapping memory areas.  */
-#if @GNULIB_WMEMMOVE@
-# if !@HAVE_WMEMMOVE@
-_GL_FUNCDECL_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wmemmove);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemmove
-# if HAVE_RAW_DECL_WMEMMOVE
-_GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
-                 "use gnulib module wmemmove for portability");
-# endif
-#endif
-
-
-/* Set N wide characters of S to C.  */
-#if @GNULIB_WMEMSET@
-# if !@HAVE_WMEMSET@
-_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-_GL_CXXALIASWARN (wmemset);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemset
-# if HAVE_RAW_DECL_WMEMSET
-_GL_WARN_ON_USE (wmemset, "wmemset is unportable - "
-                 "use gnulib module wmemset for portability");
-# endif
-#endif
-
-
-/* Return the number of wide characters in S.  */
-#if @GNULIB_WCSLEN@
-# if !@HAVE_WCSLEN@
-_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s));
-_GL_CXXALIASWARN (wcslen);
-#elif defined GNULIB_POSIXCHECK
-# undef wcslen
-# if HAVE_RAW_DECL_WCSLEN
-_GL_WARN_ON_USE (wcslen, "wcslen is unportable - "
-                 "use gnulib module wcslen for portability");
-# endif
-#endif
-
-
-/* Return the number of wide characters in S, but at most MAXLEN.  */
-#if @GNULIB_WCSNLEN@
-# if !@HAVE_WCSNLEN@
-_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
-_GL_CXXALIASWARN (wcsnlen);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsnlen
-# if HAVE_RAW_DECL_WCSNLEN
-_GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
-                 "use gnulib module wcsnlen for portability");
-# endif
-#endif
-
-
-/* Copy SRC to DEST.  */
-#if @GNULIB_WCSCPY@
-# if !@HAVE_WCSCPY@
-_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcscpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscpy
-# if HAVE_RAW_DECL_WCSCPY
-_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
-                 "use gnulib module wcscpy for portability");
-# endif
-#endif
-
-
-/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST.  */
-#if @GNULIB_WCPCPY@
-# if !@HAVE_WCPCPY@
-_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcpcpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcpcpy
-# if HAVE_RAW_DECL_WCPCPY
-_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
-                 "use gnulib module wcpcpy for portability");
-# endif
-#endif
-
-
-/* Copy no more than N wide characters of SRC to DEST.  */
-#if @GNULIB_WCSNCPY@
-# if !@HAVE_WCSNCPY@
-_GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcsncpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncpy
-# if HAVE_RAW_DECL_WCSNCPY
-_GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
-                 "use gnulib module wcsncpy for portability");
-# endif
-#endif
-
-
-/* Copy no more than N characters of SRC to DEST, returning the address of
-   the last character written into DEST.  */
-#if @GNULIB_WCPNCPY@
-# if !@HAVE_WCPNCPY@
-_GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcpncpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcpncpy
-# if HAVE_RAW_DECL_WCPNCPY
-_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
-                 "use gnulib module wcpncpy for portability");
-# endif
-#endif
-
-
-/* Append SRC onto DEST.  */
-#if @GNULIB_WCSCAT@
-# if !@HAVE_WCSCAT@
-_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcscat);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscat
-# if HAVE_RAW_DECL_WCSCAT
-_GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
-                 "use gnulib module wcscat for portability");
-# endif
-#endif
-
-
-/* Append no more than N wide characters of SRC onto DEST.  */
-#if @GNULIB_WCSNCAT@
-# if !@HAVE_WCSNCAT@
-_GL_FUNCDECL_SYS (wcsncat, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsncat, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcsncat);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncat
-# if HAVE_RAW_DECL_WCSNCAT
-_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
-                 "use gnulib module wcsncat for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2.  */
-#if @GNULIB_WCSCMP@
-# if !@HAVE_WCSCMP@
-_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
-                               _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscmp
-# if HAVE_RAW_DECL_WCSCMP
-_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
-                 "use gnulib module wcscmp for portability");
-# endif
-#endif
-
-
-/* Compare no more than N wide characters of S1 and S2.  */
-#if @GNULIB_WCSNCMP@
-# if !@HAVE_WCSNCMP@
-_GL_FUNCDECL_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsncmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncmp
-# if HAVE_RAW_DECL_WCSNCMP
-_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
-                 "use gnulib module wcsncmp for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2, ignoring case.  */
-#if @GNULIB_WCSCASECMP@
-# if !@HAVE_WCSCASECMP@
-_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscasecmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscasecmp
-# if HAVE_RAW_DECL_WCSCASECMP
-_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - "
-                 "use gnulib module wcscasecmp for portability");
-# endif
-#endif
-
-
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-#if @GNULIB_WCSNCASECMP@
-# if !@HAVE_WCSNCASECMP@
-_GL_FUNCDECL_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsncasecmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncasecmp
-# if HAVE_RAW_DECL_WCSNCASECMP
-_GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - "
-                 "use gnulib module wcsncasecmp for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE
-   category of the current locale.  */
-#if @GNULIB_WCSCOLL@
-# if !@HAVE_WCSCOLL@
-_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
-# endif
-_GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscoll);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscoll
-# if HAVE_RAW_DECL_WCSCOLL
-_GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
-                 "use gnulib module wcscoll for portability");
-# endif
-#endif
-
-
-/* Transform S2 into array pointed to by S1 such that if wcscmp is applied
-   to two transformed strings the result is the as applying 'wcscoll' to the
-   original strings.  */
-#if @GNULIB_WCSXFRM@
-# if !@HAVE_WCSXFRM@
-_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsxfrm);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsxfrm
-# if HAVE_RAW_DECL_WCSXFRM
-_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - "
-                 "use gnulib module wcsxfrm for portability");
-# endif
-#endif
-
-
-/* Duplicate S, returning an identical malloc'd string.  */
-#if @GNULIB_WCSDUP@
-# if !@HAVE_WCSDUP@
-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s));
-# endif
-_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
-_GL_CXXALIASWARN (wcsdup);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsdup
-# if HAVE_RAW_DECL_WCSDUP
-_GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - "
-                 "use gnulib module wcsdup for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence of WC in WCS.  */
-#if @GNULIB_WCSCHR@
-# if !@HAVE_WCSCHR@
-_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
-                                     _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcschr (const wchar_t *, wchar_t);
-         wchar_t * std::wcschr (wchar_t *, wchar_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcschr,
-                        wchar_t *, (const wchar_t *, wchar_t),
-                        const wchar_t *, (const wchar_t *, wchar_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc));
-_GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# else
-_GL_CXXALIASWARN (wcschr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcschr
-# if HAVE_RAW_DECL_WCSCHR
-_GL_WARN_ON_USE (wcschr, "wcschr is unportable - "
-                 "use gnulib module wcschr for portability");
-# endif
-#endif
-
-
-/* Find the last occurrence of WC in WCS.  */
-#if @GNULIB_WCSRCHR@
-# if !@HAVE_WCSRCHR@
-_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
-                                      _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcsrchr (const wchar_t *, wchar_t);
-         wchar_t * std::wcsrchr (wchar_t *, wchar_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcsrchr,
-                        wchar_t *, (const wchar_t *, wchar_t),
-                        const wchar_t *, (const wchar_t *, wchar_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc));
-_GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# else
-_GL_CXXALIASWARN (wcsrchr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcsrchr
-# if HAVE_RAW_DECL_WCSRCHR
-_GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
-                 "use gnulib module wcsrchr for portability");
-# endif
-#endif
-
-
-/* Return the length of the initial segmet of WCS which consists entirely
-   of wide characters not in REJECT.  */
-#if @GNULIB_WCSCSPN@
-# if !@HAVE_WCSCSPN@
-_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject));
-_GL_CXXALIASWARN (wcscspn);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscspn
-# if HAVE_RAW_DECL_WCSCSPN
-_GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
-                 "use gnulib module wcscspn for portability");
-# endif
-#endif
-
-
-/* Return the length of the initial segmet of WCS which consists entirely
-   of wide characters in ACCEPT.  */
-#if @GNULIB_WCSSPN@
-# if !@HAVE_WCSSPN@
-_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)
-                                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
-_GL_CXXALIASWARN (wcsspn);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsspn
-# if HAVE_RAW_DECL_WCSSPN
-_GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - "
-                 "use gnulib module wcsspn for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence in WCS of any character in ACCEPT.  */
-#if @GNULIB_WCSPBRK@
-# if !@HAVE_WCSPBRK@
-_GL_FUNCDECL_SYS (wcspbrk, wchar_t *,
-                  (const wchar_t *wcs, const wchar_t *accept)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcspbrk (const wchar_t *, const wchar_t *);
-         wchar_t * std::wcspbrk (wchar_t *, const wchar_t *);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcspbrk,
-                        wchar_t *, (const wchar_t *, const wchar_t *),
-                        const wchar_t *, (const wchar_t *, const wchar_t *));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcspbrk, wchar_t *,
-                   (wchar_t *wcs, const wchar_t *accept));
-_GL_CXXALIASWARN1 (wcspbrk, const wchar_t *,
-                   (const wchar_t *wcs, const wchar_t *accept));
-# else
-_GL_CXXALIASWARN (wcspbrk);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcspbrk
-# if HAVE_RAW_DECL_WCSPBRK
-_GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
-                 "use gnulib module wcspbrk for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence of NEEDLE in HAYSTACK.  */
-#if @GNULIB_WCSSTR@
-# if !@HAVE_WCSSTR@
-_GL_FUNCDECL_SYS (wcsstr, wchar_t *,
-                  (const wchar_t *haystack, const wchar_t *needle)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *);
-         wchar_t * std::wcsstr (wchar_t *, const wchar_t *);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcsstr,
-                        wchar_t *, (const wchar_t *, const wchar_t *),
-                        const wchar_t *, (const wchar_t *, const wchar_t *));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcsstr, wchar_t *,
-                   (wchar_t *haystack, const wchar_t *needle));
-_GL_CXXALIASWARN1 (wcsstr, const wchar_t *,
-                   (const wchar_t *haystack, const wchar_t *needle));
-# else
-_GL_CXXALIASWARN (wcsstr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcsstr
-# if HAVE_RAW_DECL_WCSSTR
-_GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
-                 "use gnulib module wcsstr for portability");
-# endif
-#endif
-
-
-/* Divide WCS into tokens separated by characters in DELIM.  */
-#if @GNULIB_WCSTOK@
-# if !@HAVE_WCSTOK@
-_GL_FUNCDECL_SYS (wcstok, wchar_t *,
-                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
-# endif
-_GL_CXXALIAS_SYS (wcstok, wchar_t *,
-                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
-_GL_CXXALIASWARN (wcstok);
-#elif defined GNULIB_POSIXCHECK
-# undef wcstok
-# if HAVE_RAW_DECL_WCSTOK
-_GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
-                 "use gnulib module wcstok for portability");
-# endif
-#endif
-
-
-/* Determine number of column positions required for first N wide
-   characters (or fewer if S ends before this) in S.  */
-#if @GNULIB_WCSWIDTH@
-# if @REPLACE_WCSWIDTH@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef wcswidth
-#   define wcswidth rpl_wcswidth
-#  endif
-_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)
-                                 _GL_ATTRIBUTE_PURE);
-_GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n));
-# else
-#  if !@HAVE_WCSWIDTH@
-_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)
-                                 _GL_ATTRIBUTE_PURE);
-#  endif
-_GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n));
-# endif
-_GL_CXXALIASWARN (wcswidth);
-#elif defined GNULIB_POSIXCHECK
-# undef wcswidth
-# if HAVE_RAW_DECL_WCSWIDTH
-_GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
-                 "use gnulib module wcswidth for portability");
-# endif
-#endif
-
-
-#endif /* _@GUARD_PREFIX@_WCHAR_H */
-#endif /* _@GUARD_PREFIX@_WCHAR_H */
+#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/wctype-h.c gettext-0.18.1.1/gettext-tools/gnulib-lib/wctype-h.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/wctype-h.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wctype-h.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-/* Normally this would be wctype.c, but that name's already taken.  */
-#include <config.h>
-#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
-#include "wctype.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/wctype.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/wctype.in.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/wctype.in.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wctype.in.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible and Paul Eggert.  */
 
@@ -25,12 +26,11 @@
  * wctrans_t, and wctype_t are not yet implemented.
  */
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
+#ifndef _GL_WCTYPE_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
@@ -44,13 +44,6 @@
 # include <wchar.h>
 #endif
 
-/* mingw has declarations of towupper and towlower in <ctype.h> as
-   well <wctype.h>.  Include <ctype.h> in advance to avoid rpl_ prefix
-   being added to the declarations.  */
-#ifdef __MINGW32__
-# include <ctype.h>
-#endif
-
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
 /* The include_next requires a split double-inclusion guard.  */
@@ -58,34 +51,13 @@
 # @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
-#define _@GUARD_PREFIX@_WCTYPE_H
-
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GL_WCTYPE_INLINE
-# define _GL_WCTYPE_INLINE _GL_INLINE
-#endif
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
-/* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which
-   #defines a number of identifiers in the application namespace.  Revert
-   these #defines.  */
-#ifdef __sun
-# undef multibyte
-# undef eucw1
-# undef eucw2
-# undef eucw3
-# undef scrw1
-# undef scrw2
-# undef scrw3
-#endif
-
 /* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
 #if !@HAVE_WINT_T@ && !defined wint_t
 # define wint_t int
@@ -93,171 +65,153 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
-#  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
-typedef unsigned int rpl_wint_t;
-#   undef wint_t
-#   define wint_t rpl_wint_t
-#   define GNULIB_defined_wint_t 1
-#  endif
-# endif
 # ifndef WEOF
 #  define WEOF ((wint_t) -1)
 # endif
 #endif
 
 
-#if !GNULIB_defined_wctype_functions
-
 /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
    Linux libc5 has <wctype.h> and the functions but they are broken.
    Assume all 11 functions (all isw* except iswblank) are implemented the
    same way, or not at all.  */
-# if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
+#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
 
 /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
    undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
    refer to system functions like _iswctype that are not in the
    standard C library.  Rather than try to get ancient buggy
    implementations like this to work, just disable them.  */
-#  undef iswalnum
-#  undef iswalpha
-#  undef iswblank
-#  undef iswcntrl
-#  undef iswdigit
-#  undef iswgraph
-#  undef iswlower
-#  undef iswprint
-#  undef iswpunct
-#  undef iswspace
-#  undef iswupper
-#  undef iswxdigit
-#  undef towlower
-#  undef towupper
+# undef iswalnum
+# undef iswalpha
+# undef iswblank
+# undef iswcntrl
+# undef iswdigit
+# undef iswgraph
+# undef iswlower
+# undef iswprint
+# undef iswpunct
+# undef iswspace
+# undef iswupper
+# undef iswxdigit
+# undef towlower
+# undef towupper
 
 /* Linux libc5 has <wctype.h> and the functions but they are broken.  */
-#  if @REPLACE_ISWCNTRL@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define iswalnum rpl_iswalnum
-#    define iswalpha rpl_iswalpha
-#    define iswblank rpl_iswblank
-#    define iswcntrl rpl_iswcntrl
-#    define iswdigit rpl_iswdigit
-#    define iswgraph rpl_iswgraph
-#    define iswlower rpl_iswlower
-#    define iswprint rpl_iswprint
-#    define iswpunct rpl_iswpunct
-#    define iswspace rpl_iswspace
-#    define iswupper rpl_iswupper
-#    define iswxdigit rpl_iswxdigit
-#   endif
-#  endif
-#  if @REPLACE_TOWLOWER@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define towlower rpl_towlower
-#    define towupper rpl_towupper
-#   endif
+# if @REPLACE_ISWCNTRL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define iswalnum rpl_iswalnum
+#   define iswalpha rpl_iswalpha
+#   define iswblank rpl_iswblank
+#   define iswcntrl rpl_iswcntrl
+#   define iswdigit rpl_iswdigit
+#   define iswgraph rpl_iswgraph
+#   define iswlower rpl_iswlower
+#   define iswprint rpl_iswprint
+#   define iswpunct rpl_iswpunct
+#   define iswspace rpl_iswspace
+#   define iswupper rpl_iswupper
+#   define iswxdigit rpl_iswxdigit
+#   define towlower rpl_towlower
+#   define towupper rpl_towupper
 #  endif
+# endif
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswalnum
-#  else
+# else
 iswalnum
-#  endif
+# endif
          (wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
           || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswalpha
-#  else
+# else
 iswalpha
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswblank
-#  else
+# else
 iswblank
-#  endif
+# endif
          (wint_t wc)
 {
   return wc == ' ' || wc == '\t';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswcntrl
-#  else
+# else
 iswcntrl
-#  endif
+# endif
         (wint_t wc)
 {
   return (wc & ~0x1f) == 0 || wc == 0x7f;
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswdigit
-#  else
+# else
 iswdigit
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= '0' && wc <= '9';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswgraph
-#  else
+# else
 iswgraph
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= '!' && wc <= '~';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswlower
-#  else
+# else
 iswlower
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= 'a' && wc <= 'z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswprint
-#  else
+# else
 iswprint
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= ' ' && wc <= '~';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswpunct
-#  else
+# else
 iswpunct
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= '!' && wc <= '~'
@@ -265,78 +219,75 @@
                || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswspace
-#  else
+# else
 iswspace
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc == ' ' || wc == '\t'
           || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswupper
-#  else
+# else
 iswupper
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= 'A' && wc <= 'Z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswxdigit
-#  else
+# else
 iswxdigit
-#  endif
+# endif
           (wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
           || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
 }
 
-_GL_WCTYPE_INLINE wint_t
-#  if @REPLACE_TOWLOWER@
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
 rpl_towlower
-#  else
+# else
 towlower
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
 }
 
-_GL_WCTYPE_INLINE wint_t
-#  if @REPLACE_TOWLOWER@
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
 rpl_towupper
-#  else
+# else
 towupper
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
 }
 
-# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@)
+#elif ! @HAVE_ISWBLANK@
 /* Only the iswblank function is missing.  */
 
-#  if @REPLACE_ISWBLANK@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define iswblank rpl_iswblank
-#   endif
-_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc));
-#  else
-_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
-#  endif
+static inline int
+iswblank (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
 
-# endif
+#endif
 
-# if defined __MINGW32__
+#if defined __MINGW32__
 
 /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t.
    The functions towlower and towupper are implemented in the MSVCRT library
@@ -351,32 +302,30 @@
       result register.  We need to fix this by adding a zero-extend from
       wchar_t to wint_t after the call.  */
 
-_GL_WCTYPE_INLINE wint_t
+static inline wint_t
 rpl_towlower (wint_t wc)
 {
   return (wint_t) (wchar_t) towlower (wc);
 }
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define towlower rpl_towlower
-#  endif
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towlower rpl_towlower
+# endif
 
-_GL_WCTYPE_INLINE wint_t
+static inline wint_t
 rpl_towupper (wint_t wc)
 {
   return (wint_t) (wchar_t) towupper (wc);
 }
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define towupper rpl_towupper
-#  endif
-
-# endif /* __MINGW32__ */
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towupper rpl_towupper
+# endif
 
-# define GNULIB_defined_wctype_functions 1
-#endif
+#endif /* __MINGW32__ */
 
 #if @REPLACE_ISWCNTRL@
 _GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc));
@@ -389,6 +338,7 @@
 #else
 _GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc));
@@ -401,6 +351,7 @@
 #endif
 _GL_CXXALIASWARN (iswalnum);
 _GL_CXXALIASWARN (iswalpha);
+_GL_CXXALIASWARN (iswblank);
 _GL_CXXALIASWARN (iswcntrl);
 _GL_CXXALIASWARN (iswdigit);
 _GL_CXXALIASWARN (iswgraph);
@@ -411,55 +362,7 @@
 _GL_CXXALIASWARN (iswupper);
 _GL_CXXALIASWARN (iswxdigit);
 
-#if @GNULIB_ISWBLANK@
-# if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@
-_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
-# else
-_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
-# endif
-_GL_CXXALIASWARN (iswblank);
-#endif
-
-#if !@HAVE_WCTYPE_T@
-# if !GNULIB_defined_wctype_t
-typedef void * wctype_t;
-#  define GNULIB_defined_wctype_t 1
-# endif
-#endif
-
-/* Get a descriptor for a wide character property.  */
-#if @GNULIB_WCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name));
-# endif
-_GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name));
-_GL_CXXALIASWARN (wctype);
-#elif defined GNULIB_POSIXCHECK
-# undef wctype
-# if HAVE_RAW_DECL_WCTYPE
-_GL_WARN_ON_USE (wctype, "wctype is unportable - "
-                 "use gnulib module wctype for portability");
-# endif
-#endif
-
-/* Test whether a wide character has a given property.
-   The argument WC must be either a wchar_t value or WEOF.
-   The argument DESC must have been returned by the wctype() function.  */
-#if @GNULIB_ISWCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
-# endif
-_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
-_GL_CXXALIASWARN (iswctype);
-#elif defined GNULIB_POSIXCHECK
-# undef iswctype
-# if HAVE_RAW_DECL_ISWCTYPE
-_GL_WARN_ON_USE (iswctype, "iswctype is unportable - "
-                 "use gnulib module iswctype for portability");
-# endif
-#endif
-
-#if @REPLACE_TOWLOWER@ || defined __MINGW32__
+#if @REPLACE_ISWCNTRL@ || defined __MINGW32__
 _GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
 _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));
 #else
@@ -469,46 +372,6 @@
 _GL_CXXALIASWARN (towlower);
 _GL_CXXALIASWARN (towupper);
 
-#if !@HAVE_WCTRANS_T@
-# if !GNULIB_defined_wctrans_t
-typedef void * wctrans_t;
-#  define GNULIB_defined_wctrans_t 1
-# endif
-#endif
-
-/* Get a descriptor for a wide character case conversion.  */
-#if @GNULIB_WCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name));
-# endif
-_GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name));
-_GL_CXXALIASWARN (wctrans);
-#elif defined GNULIB_POSIXCHECK
-# undef wctrans
-# if HAVE_RAW_DECL_WCTRANS
-_GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
-                 "use gnulib module wctrans for portability");
-# endif
-#endif
-
-/* Perform a given case conversion on a wide character.
-   The argument WC must be either a wchar_t value or WEOF.
-   The argument DESC must have been returned by the wctrans() function.  */
-#if @GNULIB_TOWCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
-# endif
-_GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
-_GL_CXXALIASWARN (towctrans);
-#elif defined GNULIB_POSIXCHECK
-# undef towctrans
-# if HAVE_RAW_DECL_TOWCTRANS
-_GL_WARN_ON_USE (towctrans, "towctrans is unportable - "
-                 "use gnulib module towctrans for portability");
-# endif
-#endif
-
-_GL_INLINE_HEADER_END
 
-#endif /* _@GUARD_PREFIX@_WCTYPE_H */
-#endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/wcwidth.c gettext-0.18.1.1/gettext-tools/gnulib-lib/wcwidth.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/wcwidth.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wcwidth.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc.
 
    This 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 @@
 {
   /* In UTF-8 locales, use a Unicode aware width function.  */
   const char *encoding = locale_charset ();
-  if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
+  if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
     {
       /* We assume that in a UTF-8 locale, a wide character is the same as a
          Unicode character.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/write.c gettext-0.18.1.1/gettext-tools/gnulib-lib/write.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/write.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/write.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible write() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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,126 +20,43 @@
 /* Specification.  */
 #include <unistd.h>
 
+/* Replace this function only if module 'sigpipe' is requested.  */
+#if GNULIB_SIGPIPE
+
 /* On native Windows platforms, SIGPIPE does not exist.  When write() is
    called on a pipe with no readers, WriteFile() fails with error
    GetLastError() = ERROR_NO_DATA, and write() in consequence fails with
    error EINVAL.  */
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-# include <errno.h>
-# include <signal.h>
-# include <io.h>
-
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-
-# include "msvc-inval.h"
-# include "msvc-nothrow.h"
-
-# undef write
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static ssize_t
-write_nothrow (int fd, const void *buf, size_t count)
-{
-  ssize_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = write (fd, buf, count);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
+#  include <errno.h>
+#  include <signal.h>
+#  include <io.h>
 
-  return result;
-}
-# else
-#  define write_nothrow write
-# endif
+#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#  include <windows.h>
 
 ssize_t
 rpl_write (int fd, const void *buf, size_t count)
+#undef write
 {
-  for (;;)
-    {
-      ssize_t ret = write_nothrow (fd, buf, count);
+  ssize_t ret = write (fd, buf, count);
 
-      if (ret < 0)
+  if (ret < 0)
+    {
+      if (GetLastError () == ERROR_NO_DATA
+          && GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_PIPE)
         {
-# if GNULIB_NONBLOCKING
-          if (errno == ENOSPC)
-            {
-              HANDLE h = (HANDLE) _get_osfhandle (fd);
-              if (GetFileType (h) == FILE_TYPE_PIPE)
-                {
-                  /* h is a pipe or socket.  */
-                  DWORD state;
-                  if (GetNamedPipeHandleState (h, &state, NULL, NULL, NULL,
-                                               NULL, 0)
-                      && (state & PIPE_NOWAIT) != 0)
-                    {
-                      /* h is a pipe in non-blocking mode.
-                         We can get here in four situations:
-                           1. When the pipe buffer is full.
-                           2. When count <= pipe_buf_size and the number of
-                              free bytes in the pipe buffer is < count.
-                           3. When count > pipe_buf_size and the number of free
-                              bytes in the pipe buffer is > 0, < pipe_buf_size.
-                           4. When count > pipe_buf_size and the pipe buffer is
-                              entirely empty.
-                         The cases 1 and 2 are POSIX compliant.  In cases 3 and
-                         4 POSIX specifies that write() must split the request
-                         and succeed with a partial write.  We fix case 4.
-                         We don't fix case 3 because it is not essential for
-                         programs.  */
-                      DWORD out_size; /* size of the buffer for outgoing data */
-                      DWORD in_size;  /* size of the buffer for incoming data */
-                      if (GetNamedPipeInfo (h, NULL, &out_size, &in_size, NULL))
-                        {
-                          size_t reduced_count = count;
-                          /* In theory we need only one of out_size, in_size.
-                             But I don't know which of the two.  The description
-                             is ambiguous.  */
-                          if (out_size != 0 && out_size < reduced_count)
-                            reduced_count = out_size;
-                          if (in_size != 0 && in_size < reduced_count)
-                            reduced_count = in_size;
-                          if (reduced_count < count)
-                            {
-                              /* Attempt to write only the first part.  */
-                              count = reduced_count;
-                              continue;
-                            }
-                        }
-                      /* Change errno from ENOSPC to EAGAIN.  */
-                      errno = EAGAIN;
-                    }
-                }
-            }
-          else
-# endif
-            {
-# if GNULIB_SIGPIPE
-              if (GetLastError () == ERROR_NO_DATA
-                  && GetFileType ((HANDLE) _get_osfhandle (fd))
-                     == FILE_TYPE_PIPE)
-                {
-                  /* Try to raise signal SIGPIPE.  */
-                  raise (SIGPIPE);
-                  /* If it is currently blocked or ignored, change errno from
-                     EINVAL to EPIPE.  */
-                  errno = EPIPE;
-                }
-# endif
-            }
+          /* Try to raise signal SIGPIPE.  */
+          raise (SIGPIPE);
+          /* If it is currently blocked or ignored, change errno from EINVAL
+             to EPIPE.  */
+          errno = EPIPE;
         }
-      return ret;
     }
+  return ret;
 }
 
+# endif
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xasprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xasprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xasprintf.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xasprintf.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation,
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xconcat-filename.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xconcat-filename.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xconcat-filename.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xconcat-filename.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xmalloca.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xmalloca.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xmalloca.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xmalloca.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xmalloca.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xmalloca.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xmalloca.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xmalloca.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2007, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xmalloc.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xmalloc.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xmalloc.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xmalloc.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007 Free Software Foundation, Inc.
 
    This program 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 @@
 xalloc_die ()
 {
   error (xmalloc_exit_failure, 0, _("memory exhausted"));
-  /* _Noreturn cannot be given to error, since it may return if
+  /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the
      xalloc_die does terminate, call exit. */
   exit (EXIT_FAILURE);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xreadlink.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xreadlink.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xreadlink.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xreadlink.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xreadlink.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xreadlink.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xreadlink.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xreadlink.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* Reading symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -18,6 +18,8 @@
 
 /* Written by Jim Meyering <jim@meyering.net>  */
 
+#include <stddef.h>
+
 extern char *xreadlink (char const *filename);
 
 #if GNULIB_XREADLINKAT
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xsetenv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xsetenv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xsetenv.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xsetenv.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xsetenv.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xsetenv.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xsetenv.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xsetenv.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xsize.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xsize.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xsize.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xsize.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define XSIZE_INLINE _GL_EXTERN_INLINE
-#include "xsize.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xsize.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xsize.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xsize.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xsize.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _XSIZE_H
 #define _XSIZE_H
@@ -27,14 +28,6 @@
 # include <stdint.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef XSIZE_INLINE
-# define XSIZE_INLINE _GL_INLINE
-#endif
-
 /* The size of memory objects is often computed through expressions of
    type size_t. Example:
       void* p = malloc (header_size + n * element_size).
@@ -56,7 +49,7 @@
   ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
 
 /* Sum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -67,7 +60,7 @@
 }
 
 /* Sum of three sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -77,7 +70,7 @@
 }
 
 /* Sum of four sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -87,7 +80,7 @@
 }
 
 /* Maximum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -100,7 +93,7 @@
 
 /* Multiplication of a count with an element size, with overflow check.
    The count must be >= 0 and the element size must be > 0.
-   This is a macro, not a function, so that it works correctly even
+   This is a macro, not an inline function, so that it works correctly even
    when N is of a wider type and N > SIZE_MAX.  */
 #define xtimes(N, ELSIZE) \
   ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
@@ -112,6 +105,4 @@
 #define size_in_bounds_p(SIZE) \
   ((SIZE) != SIZE_MAX)
 
-_GL_INLINE_HEADER_END
-
 #endif /* _XSIZE_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xstriconv.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconv.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xstriconv.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconv.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xstriconveh.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconveh.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xstriconveh.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconveh.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xstriconveh.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconveh.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xstriconveh.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconveh.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xstriconv.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconv.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xstriconv.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xstriconv.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xvasprintf.c gettext-0.18.1.1/gettext-tools/gnulib-lib/xvasprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-lib/xvasprintf.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xvasprintf.c	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-static char *
+static inline char *
 xstrcat (size_t argcount, va_list args)
 {
   char *result;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-lib/xvasprintf.h gettext-0.18.1.1/gettext-tools/gnulib-lib/xvasprintf.h
--- gettext-0.19.3/gettext-tools/gnulib-lib/xvasprintf.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/xvasprintf.h	2010-05-24 09:42:48.000000000 +0000
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,16 +20,16 @@
 /* Get va_list.  */
 #include <stdarg.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
@@ -44,9 +44,9 @@
      - [EILSEQ] error during conversion between wide and multibyte characters,
    return NULL.  */
 extern char *xasprintf (const char *format, ...)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
+       __attribute__ ((__format__ (__printf__, 1, 2)));
 extern char *xvasprintf (const char *format, va_list args)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 0));
+       __attribute__ ((__format__ (__printf__, 1, 0)));
 
 #ifdef __cplusplus
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/00gnulib.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/00gnulib.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/00gnulib.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/00gnulib.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,28 +1,12 @@
-# 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 2
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
-dnl m4_divert semantics.
-
-# Until autoconf 2.63, handling of the diversion stack required m4_init
-# to be called first; but this does not happen with aclocal.  Wrapping
-# the entire execution in another layer of the diversion stack fixes this.
-# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
-# for whether it was FIFO or LIFO; in order to properly balance with
-# m4_init, we need to undo our push just before anything wrapped within
-# the m4_init body.  The way to ensure this is to wrap both sides of
-# m4_init with a one-shot macro that does the pop at the right time.
-m4_ifndef([_m4_divert_diversion],
-[m4_divert_push([KILL])
-m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
-m4_define([m4_init],
-  [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
-
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
 
 # AC_DEFUN_ONCE([NAME], VALUE)
 # ----------------------------
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/absolute-header.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/absolute-header.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/absolute-header.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/absolute-header.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# absolute-header.m4 serial 12
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,20 +10,18 @@
 # ---------------------------------------
 # Find the absolute name of a header file, testing first if the header exists.
 # If the header were sys/inttypes.h, this macro would define
-# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
+# ABSOLUTE_SYS_INTTYPES_H to the `""' quoted absolute name of sys/inttypes.h
 # in config.h
-# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
+# (e.g. `#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
 # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.
 AC_DEFUN([gl_ABSOLUTE_HEADER],
 [AC_REQUIRE([AC_CANONICAL_HOST])
 AC_LANG_PREPROC_REQUIRE()dnl
-dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
-dnl until we can assume autoconf 2.64 or newer.
 m4_foreach_w([gl_HEADER_NAME], [$1],
   [AS_VAR_PUSHDEF([gl_absolute_header],
                   [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
@@ -53,7 +51,6 @@
 #   - it is silent.
 AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
 [
-  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
   dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
   dnl that contain only a #include of other header files and no
@@ -66,37 +63,15 @@
     aix*) gl_absname_cpp="$ac_cpp -C" ;;
     *)    gl_absname_cpp="$ac_cpp" ;;
   esac
-changequote(,)
-  case "$host_os" in
-    mingw*)
-      dnl For the sake of native Windows compilers (excluding gcc),
-      dnl treat backslash as a directory separator, like /.
-      dnl Actually, these compilers use a double-backslash as
-      dnl directory separator, inside the
-      dnl   # line "filename"
-      dnl directives.
-      gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-  dnl A sed expression that turns a string into a basic regular
-  dnl expression, for use within "/.../".
-  gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo '$1' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-changequote([,])
   dnl eval is necessary to expand gl_absname_cpp.
   dnl Ultrix and Pyramid sh refuse to redirect output of eval,
   dnl so use subshell.
   AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
 [`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-  sed -n "$gl_absolute_header_sed"`])
+sed -n '\#/$1#{
+        s#.*"\(.*/$1\)".*#\1#
+        s#^/[^/]#//&#
+        p
+        q
+}'`])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/acl.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/acl.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/acl.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/acl.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,7 +1,7 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 17
+# serial 9
 
-# Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2010 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.
@@ -14,16 +14,16 @@
     AS_HELP_STRING([--disable-acl], [do not support ACLs]),
     , [enable_acl=auto])
 
-  AC_CHECK_FUNCS_ONCE([fchmod])
   LIB_ACL=
   use_acl=0
+  AC_REQUIRE([AC_C_INLINE])
   if test "x$enable_acl" != "xno"; then
     dnl On all platforms, the ACL related API is declared in <sys/acl.h>.
     AC_CHECK_HEADERS([sys/acl.h])
     if test $ac_cv_header_sys_acl_h = yes; then
       ac_save_LIBS=$LIBS
 
-      dnl Test for POSIX-draft-like API (Linux, FreeBSD, Mac OS X, IRIX, Tru64).
+      dnl Test for POSIX-draft-like API (Linux, FreeBSD, MacOS X, IRIX, Tru64).
       dnl -lacl is needed on Linux, -lpacl is needed on OSF/1.
       if test $use_acl = 0; then
         AC_SEARCH_LIBS([acl_get_file], [acl pacl],
@@ -45,23 +45,23 @@
              AC_REPLACE_FUNCS([acl_entries])
              AC_CACHE_CHECK([for ACL_FIRST_ENTRY],
                [gl_cv_acl_ACL_FIRST_ENTRY],
-               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+               [AC_COMPILE_IFELSE(
 [[#include <sys/types.h>
 #include <sys/acl.h>
-int type = ACL_FIRST_ENTRY;]])],
+int type = ACL_FIRST_ENTRY;]],
                   [gl_cv_acl_ACL_FIRST_ENTRY=yes],
                   [gl_cv_acl_ACL_FIRST_ENTRY=no])])
              if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
                AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1],
                  [Define to 1 if the constant ACL_FIRST_ENTRY exists.])
              fi
-             dnl On Mac OS X, other types of ACLs are supported.
+             dnl On MacOS X, other types of ACLs are supported.
              AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
                [gl_cv_acl_ACL_TYPE_EXTENDED],
-               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+               [AC_COMPILE_IFELSE(
 [[#include <sys/types.h>
 #include <sys/acl.h>
-int type = ACL_TYPE_EXTENDED;]])],
+int type = ACL_TYPE_EXTENDED;]],
                   [gl_cv_acl_ACL_TYPE_EXTENDED=yes],
                   [gl_cv_acl_ACL_TYPE_EXTENDED=no])])
              if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
@@ -76,8 +76,8 @@
 
       dnl Test for Solaris API (Solaris, Cygwin).
       if test $use_acl = 0; then
-        AC_CHECK_FUNCS([facl])
-        if test $ac_cv_func_facl = yes; then
+        AC_CHECK_FUNCS([acl])
+        if test $ac_cv_func_acl = yes; then
           AC_SEARCH_LIBS([acl_trivial], [sec],
             [if test "$ac_cv_search_acl_trivial" != "none required"; then
                LIB_ACL=$ac_cv_search_acl_trivial
@@ -89,13 +89,11 @@
       fi
 
       dnl Test for HP-UX API.
-      if test $use_acl = 0; then
+      if test $use_acl = 0 || test "$ac_cv_func_acl" = yes; then
         AC_CHECK_FUNCS([getacl])
         if test $ac_cv_func_getacl = yes; then
           use_acl=1
         fi
-        dnl Test for HP-UX 11.11 API.
-        AC_CHECK_HEADERS([aclv.h], [], [], [#include <sys/types.h>])
       fi
 
       dnl Test for AIX API (AIX 5.3 or newer).
@@ -114,14 +112,6 @@
         fi
       fi
 
-      dnl Test for NonStop Kernel API.
-      if test $use_acl = 0; then
-        AC_CHECK_FUNCS([aclsort])
-        if test $ac_cv_func_aclsort = yes; then
-          use_acl=1
-        fi
-      fi
-
       LIBS=$ac_save_LIBS
     fi
     if test "x$enable_acl$use_acl" = "xyes0"; then
@@ -140,29 +130,24 @@
 
 # gl_ACL_GET_FILE(IF-WORKS, IF-NOT)
 # -------------------------------------
-# If 'acl_get_file' works (does not have a particular bug),
+# If `acl_get_file' works (does not have a particular bug),
 # run IF-WORKS, otherwise, IF-NOT.
-# When building natively, test for a Darwin 8.7.0 bug, whereby acl_get_file
-# returns NULL, but sets errno = ENOENT for an existing file or directory.
-# When cross-compiling, assume that this old bug no longer applies.
+# This tests for a Darwin 8.7.0 bug, whereby acl_get_file returns NULL,
+# but sets errno = ENOENT for an existing file or directory.
 AC_DEFUN([gl_ACL_GET_FILE],
 [
   AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
-    [gl_cv_func_working_acl_get_file=no
-     AC_LINK_IFELSE(
+    [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <sys/types.h>
            #include <sys/acl.h>
            #include <errno.h>
           ]],
-          [[if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
-              return 1;
-            return 0;
-          ]])],
-       [if test $cross_compiling = yes; then
-          gl_cv_func_working_acl_get_file="guessing yes"
-        elif ./conftest$ac_exeext; then
-          gl_cv_func_working_acl_get_file=yes
-        fi])])
-  AS_IF([test "$gl_cv_func_working_acl_get_file" != no], [$1], [$2])
+          [[return !! (!acl_get_file (".", ACL_TYPE_ACCESS)
+                       && errno == ENOENT);]])],
+       [gl_cv_func_working_acl_get_file=yes],
+       [gl_cv_func_working_acl_get_file=no],
+       [gl_cv_func_working_acl_get_file=cross-compiling])])
+
+  AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/alloca.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/alloca.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/alloca.m4	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/alloca.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
-# alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011 Free Software Foundation, Inc.
+# alloca.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,7 +25,6 @@
     ALLOCA_H=alloca.h,
     ALLOCA_H=)
   AC_SUBST([ALLOCA_H])
-  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
 ])
 
 # Prerequisites of lib/alloca.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/ansi-c++.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/ansi-c++.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/ansi-c++.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/ansi-c++.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-# ansi-c++.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 From Bruno Haible.
-
-# Sets CXX_CHOICE to 'yes' or 'no', depending on the preferred use of C++.
-# The default is 'yes'. If the configure.ac contains a definition of the
-# macro gl_CXX_CHOICE_DEFAULT_NO, then the default is 'no'. In both cases,
-# the user can change the value by passing the option --disable-cxx or
-# --enable-cxx, respectively.
-
-AC_DEFUN([gl_CXX_CHOICE],
-[
-  AC_MSG_CHECKING([whether to use C++])
-  dnl Plus signs are supported in AC_ARG_ENABLE starting with autoconf-2.66.
-  m4_version_prereq([2.66],
-    [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
-       [AC_ARG_ENABLE([c++],
-          [  --enable-c++            also build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=no])],
-       [AC_ARG_ENABLE([c++],
-          [  --disable-c++           do not build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=yes])])],
-    [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
-       [AC_ARG_ENABLE([cxx],
-          [  --enable-cxx            also build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=no])],
-       [AC_ARG_ENABLE([cxx],
-          [  --disable-cxx           do not build C++ sources],
-          [CXX_CHOICE="$enableval"],
-          [CXX_CHOICE=yes])])])
-  AC_MSG_RESULT([$CXX_CHOICE])
-  AC_SUBST([CXX_CHOICE])
-])
-
-# gl_PROG_ANSI_CXX([ANSICXX_VARIABLE], [ANSICXX_CONDITIONAL])
-# Sets ANSICXX_VARIABLE to the name of a sufficiently ANSI C++ compliant
-# compiler, or to "no" if none is found.
-# Defines the Automake condition ANSICXX_CONDITIONAL to true if such a compiler
-# was found, or to false if not.
-
-AC_DEFUN([gl_PROG_ANSI_CXX],
-[
-  AC_REQUIRE([gl_CXX_CHOICE])
-  m4_if([$1], [CXX], [],
-    [gl_save_CXX="$CXX"])
-  if test "$CXX_CHOICE" = no; then
-    CXX=no
-  fi
-  if test -z "$CXX"; then
-    if test -n "$CCC"; then
-      CXX="$CCC"
-    else
-      AC_CHECK_TOOLS([CXX],
-                     [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],
-                     [:])
-    fi
-  fi
-  if test "$CXX" != no; then
-    dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit
-    dnl upon failure.
-    AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
-    AC_LANG_PUSH([C++])
-    AC_ARG_VAR([CXX], [C++ compiler command])
-    AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
-    echo 'int main () { return 0; }' > conftest.$ac_ext
-    if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      gl_cv_prog_ansicxx_works=yes
-      if (./conftest; exit) 2>/dev/null; then
-        gl_cv_prog_ansicxx_cross=no
-      else
-        gl_cv_prog_ansicxx_cross=yes
-      fi
-    else
-      gl_cv_prog_ansicxx_works=no
-    fi
-    rm -fr conftest*
-    AC_LANG_POP([C++])
-    AC_MSG_RESULT([$gl_cv_prog_ansicxx_works])
-    if test $gl_cv_prog_ansicxx_works = no; then
-      CXX=no
-    else
-      dnl Test for namespaces.
-      dnl We don't bother supporting pre-ANSI-C++ compilers.
-      AC_MSG_CHECKING([whether the C++ compiler supports namespaces])
-      AC_LANG_PUSH([C++])
-      cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
-      if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-        gl_cv_prog_ansicxx_namespaces=yes
-      else
-        gl_cv_prog_ansicxx_namespaces=no
-      fi
-      rm -fr conftest*
-      AC_LANG_POP([C++])
-      AC_MSG_RESULT([$gl_cv_prog_ansicxx_namespaces])
-      if test $gl_cv_prog_ansicxx_namespaces = no; then
-        CXX=no
-      fi
-    fi
-  fi
-  m4_if([$1], [CXX], [],
-    [$1="$CXX"
-     CXX="$gl_save_CXX"])
-  AC_SUBST([$1])
-
-  AM_CONDITIONAL([$2], [test "$$1" != no])
-
-  if test "$$1" != no; then
-    dnl This macro invocation resolves an automake error:
-    dnl /usr/local/share/automake-1.11/am/depend2.am: am__fastdepCXX does not appear in AM_CONDITIONAL
-    dnl /usr/local/share/automake-1.11/am/depend2.am:   The usual way to define 'am__fastdepCXX' is to add 'AC_PROG_CXX'
-    dnl /usr/local/share/automake-1.11/am/depend2.am:   to 'configure.ac' and run 'aclocal' and 'autoconf' again.
-    _AM_DEPENDENCIES([CXX])
-  else
-    AM_CONDITIONAL([am__fastdepCXX], [false])
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/argmatch.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/argmatch.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/argmatch.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/argmatch.m4	2010-05-24 10:42:19.000000000 +0000
@@ -0,0 +1,10 @@
+#serial 3
+dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_ARGMATCH],
+[
+  AC_LIBOBJ([argmatch])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/asm-underscore.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/asm-underscore.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/asm-underscore.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/asm-underscore.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# asm-underscore.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# asm-underscore.m4 serial 1
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,6 @@
   dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because
   dnl 1. It works only for GCC.
   dnl 2. It is incorrectly defined on some platforms, in some GCC versions.
-  AC_REQUIRE([gl_C_ASM])
   AC_CACHE_CHECK(
     [whether C symbols are prefixed with underscore at the linker level],
     [gl_cv_prog_as_underscore],
@@ -28,8 +27,8 @@
 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
+     AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c) >/dev/null 2>&1
+     if grep _foo conftest.s >/dev/null ; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
@@ -47,25 +46,3 @@
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   AC_SUBST([ASM_SYMBOL_PREFIX])
 ])
-
-# gl_C_ASM
-# Determines how to produce an assembly language file from C source code.
-# Sets the variables:
-#   gl_asmext - the extension of assembly language output,
-#   gl_c_asm_opt - the C compiler option that produces assembly language output.
-
-AC_DEFUN([gl_C_ASM],
-[
-  AC_EGREP_CPP([MicrosoftCompiler],
-    [
-#ifdef _MSC_VER
-MicrosoftCompiler
-#endif
-    ],
-    [gl_asmext='asm'
-     gl_c_asm_opt='-c -Fa'
-    ],
-    [gl_asmext='s'
-     gl_c_asm_opt='-S'
-    ])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/atexit.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/atexit.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/atexit.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/atexit.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,12 +1,15 @@
-# atexit.m4 serial 4
-dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+# atexit.m4 serial 3
+dnl Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_ATEXIT],
 [
-  AC_CHECK_FUNCS([atexit])
+  AC_REPLACE_FUNCS([atexit])
+  if test $ac_cv_func_atexit = no; then
+    gl_PREREQ_ATEXIT
+  fi
 ])
 
 # Prerequisites of lib/atexit.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/bison-i18n.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/bison-i18n.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/bison-i18n.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/bison-i18n.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # bison-i18n.m4 serial 3
-dnl Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/btowc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/btowc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/btowc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/btowc.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-# btowc.m4 serial 10
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_BTOWC],
-[
-  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-
-  dnl Check whether <wchar.h> is usable at all, first. Otherwise the test
-  dnl program below may lead to an endless loop. See
-  dnl <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>.
-  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
-
-  AC_CHECK_FUNCS_ONCE([btowc])
-  if test $ac_cv_func_btowc = no; then
-    HAVE_BTOWC=0
-  else
-
-    AC_REQUIRE([AC_PROG_CC])
-    AC_REQUIRE([gt_LOCALE_FR])
-    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-    dnl Cygwin 1.7.2 btowc('\0') is WEOF, not 0.
-    AC_CACHE_CHECK([whether btowc(0) is correct],
-      [gl_cv_func_btowc_nul],
-      [
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (btowc ('\0') != 0)
-    return 1;
-  return 0;
-}]])],
-          [gl_cv_func_btowc_nul=yes],
-          [gl_cv_func_btowc_nul=no],
-          [
-changequote(,)dnl
-           case "$host_os" in
-                      # Guess no on Cygwin.
-             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
-                      # Guess yes otherwise.
-             *)       gl_cv_func_btowc_nul="guessing yes" ;;
-           esac
-changequote([,])dnl
-          ])
-      ])
-
-    dnl IRIX 6.5 btowc(EOF) is 0xFF, not WEOF.
-    AC_CACHE_CHECK([whether btowc(EOF) is correct],
-      [gl_cv_func_btowc_eof],
-      [
-        dnl Initial guess, used when cross-compiling or when no suitable locale
-        dnl is present.
-changequote(,)dnl
-        case "$host_os" in
-                 # Guess no on IRIX.
-          irix*) gl_cv_func_btowc_eof="guessing no" ;;
-                 # Guess yes otherwise.
-          *)     gl_cv_func_btowc_eof="guessing yes" ;;
-        esac
-changequote([,])dnl
-        if test $LOCALE_FR != none; then
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      if (btowc (EOF) != WEOF)
-        return 1;
-    }
-  return 0;
-}]])],
-            [gl_cv_func_btowc_eof=yes],
-            [gl_cv_func_btowc_eof=no],
-            [:])
-        fi
-      ])
-
-    case "$gl_cv_func_btowc_nul" in
-      *yes) ;;
-      *) REPLACE_BTOWC=1 ;;
-    esac
-    case "$gl_cv_func_btowc_eof" in
-      *yes) ;;
-      *) REPLACE_BTOWC=1 ;;
-    esac
-  fi
-])
-
-# Prerequisites of lib/btowc.c.
-AC_DEFUN([gl_PREREQ_BTOWC], [
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/byteswap.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/byteswap.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/byteswap.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/byteswap.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# byteswap.m4 serial 4
-dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+# byteswap.m4 serial 3
+dnl Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,5 +15,4 @@
     BYTESWAP_H='byteswap.h'
   ])
   AC_SUBST([BYTESWAP_H])
-  AM_CONDITIONAL([GL_GENERATE_BYTESWAP_H], [test -n "$BYTESWAP_H"])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/canonicalize.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/canonicalize.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/canonicalize.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/canonicalize.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-# canonicalize.m4 serial 26
+# canonicalize.m4 serial 16
 
-dnl Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,49 +10,40 @@
 # not provide or fix realpath.
 AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
 [
+  AC_LIBOBJ([canonicalize])
+
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
   AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
-  else
-    case "$gl_cv_func_realpath_works" in
-      *yes) ;;
-      *)    REPLACE_CANONICALIZE_FILE_NAME=1 ;;
-    esac
+  elif test "$gl_cv_func_realpath_works" != yes; then
+    REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 ])
 
 # Provides canonicalize_file_name and realpath.
 AC_DEFUN([gl_CANONICALIZE_LGPL],
 [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
+    AC_LIBOBJ([canonicalize-lgpl])
     if test $ac_cv_func_realpath = no; then
       HAVE_REALPATH=0
-    else
-      case "$gl_cv_func_realpath_works" in
-	*yes) ;;
-	*)    REPLACE_REALPATH=1 ;;
-      esac
+    elif test "$gl_cv_func_realpath_works" != yes; then
+      REPLACE_REALPATH=1
     fi
-  else
-    case "$gl_cv_func_realpath_works" in
-      *yes)
-        ;;
-      *)
-        REPLACE_CANONICALIZE_FILE_NAME=1
-        REPLACE_REALPATH=1
-        ;;
-    esac
+  elif test "$gl_cv_func_realpath_works" != yes; then
+    AC_LIBOBJ([canonicalize-lgpl])
+    REPLACE_REALPATH=1
+    REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 ])
 
 # Like gl_CANONICALIZE_LGPL, except prepare for separate compilation
-# (no REPLACE_CANONICALIZE_FILE_NAME, no REPLACE_REALPATH, no AC_LIBOBJ).
+# (no AC_LIBOBJ).
 AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE],
 [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -68,57 +59,23 @@
 AC_DEFUN([gl_FUNC_REALPATH_WORKS],
 [
   AC_CHECK_FUNCS_ONCE([realpath])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether realpath works], [gl_cv_func_realpath_works], [
     touch conftest.a
-    mkdir conftest.d
     AC_RUN_IFELSE([
       AC_LANG_PROGRAM([[
-        ]GL_NOCRASH[
         #include <stdlib.h>
-        #include <string.h>
       ]], [[
-        int result = 0;
-        {
-          char *name = realpath ("conftest.a", NULL);
-          if (!(name && *name == '/'))
-            result |= 1;
-        }
-        {
-          char *name = realpath ("conftest.b/../conftest.a", NULL);
-          if (name != NULL)
-            result |= 2;
-        }
-        {
-          char *name = realpath ("conftest.a/", NULL);
-          if (name != NULL)
-            result |= 4;
-        }
-        {
-          char *name1 = realpath (".", NULL);
-          char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
-            result |= 8;
-        }
-        return result;
+        char *name1 = realpath ("conftest.a", NULL);
+        char *name2 = realpath ("conftest.b/../conftest.a", NULL);
+        char *name3 = realpath ("conftest.a/", NULL);
+        return !(name1 && *name1 == '/' && !name2 && !name3);
       ]])
-     ],
-     [gl_cv_func_realpath_works=yes],
-     [gl_cv_func_realpath_works=no],
-     [case "$host_os" in
-                       # Guess yes on glibc systems.
-        *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-                       # If we don't know, assume the worst.
-        *)             gl_cv_func_realpath_works="guessing no" ;;
-      esac
-     ])
-    rm -rf conftest.a conftest.d
+    ], [gl_cv_func_realpath_works=yes], [gl_cv_func_realpath_works=no],
+       [gl_cv_func_realpath_works="guessing no"])
   ])
-  case "$gl_cv_func_realpath_works" in
-    *yes)
-      AC_DEFINE([FUNC_REALPATH_WORKS], [1], [Define to 1 if realpath()
-        can malloc memory, always gives an absolute path, and handles
-        trailing slash correctly.])
-      ;;
-  esac
+  if test "$gl_cv_func_realpath_works" = yes; then
+    AC_DEFINE([FUNC_REALPATH_WORKS], [1], [Define to 1 if realpath()
+      can malloc memory, always gives an absolute path, and handles
+      trailing slash correctly.])
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/cloexec.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/cloexec.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/cloexec.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/cloexec.m4	2010-05-24 10:42:19.000000000 +0000
@@ -0,0 +1,10 @@
+#serial 6
+dnl Copyright (C) 2004-2006, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_CLOEXEC],
+[
+  AC_LIBOBJ([cloexec])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/closedir.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/closedir.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/closedir.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/closedir.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# closedir.m4 serial 2
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_CLOSEDIR],
-[
-  AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
-
-  AC_CHECK_FUNCS([closedir])
-  if test $ac_cv_func_closedir = no; then
-    HAVE_CLOSEDIR=0
-  fi
-  dnl Replace closedir() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0; then
-      if test $HAVE_CLOSEDIR = 1; then
-        REPLACE_CLOSEDIR=1
-      fi
-    fi
-  ])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/close.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/close.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/close.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/close.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# close.m4 serial 8
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_CLOSE],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_CLOSE=1
-  fi
-  m4_ifdef([gl_PREREQ_SYS_H_WINSOCK2], [
-    gl_PREREQ_SYS_H_WINSOCK2
-    if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then
-      dnl Even if the 'socket' module is not used here, another part of the
-      dnl application may use it and pass file descriptors that refer to
-      dnl sockets to the close() function. So enable the support for sockets.
-      REPLACE_CLOSE=1
-    fi
-  ])
-  dnl Replace close() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    if test $REPLACE_CLOSE = 0; then
-      gl_TEST_FCHDIR
-      if test $HAVE_FCHDIR = 0; then
-        REPLACE_CLOSE=1
-      fi
-    fi
-  ])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/configmake.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/configmake.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/configmake.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/configmake.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-# configmake.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# gl_CONFIGMAKE_PREP
-# ------------------
-# Guarantee all of the standard directory variables, even when used with
-# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir
-# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b,
-# and runstatedir in 1.14.1).
-AC_DEFUN([gl_CONFIGMAKE_PREP],
-[
-  dnl Technically, datadir should default to datarootdir.  But if
-  dnl autoconf is too old to provide datarootdir, then reversing the
-  dnl definition is a reasonable compromise.  Only AC_SUBST a variable
-  dnl if it was not already defined earlier by autoconf.
-  if test "x$datarootdir" = x; then
-    AC_SUBST([datarootdir], ['${datadir}'])
-  fi
-  dnl Copy the approach used in autoconf 2.60.
-  if test "x$docdir" = x; then
-    AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-      ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-      ['${datarootdir}/doc/${PACKAGE}'])])
-  fi
-  dnl The remaining variables missing from autoconf 2.59 are easier.
-  if test "x$htmldir" = x; then
-    AC_SUBST([htmldir], ['${docdir}'])
-  fi
-  if test "x$dvidir" = x; then
-    AC_SUBST([dvidir], ['${docdir}'])
-  fi
-  if test "x$pdfdir" = x; then
-    AC_SUBST([pdfdir], ['${docdir}'])
-  fi
-  if test "x$psdir" = x; then
-    AC_SUBST([psdir], ['${docdir}'])
-  fi
-  if test "x$lispdir" = x; then
-    AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp'])
-  fi
-  if test "x$localedir" = x; then
-    AC_SUBST([localedir], ['${datarootdir}/locale'])
-  fi
-  dnl Added in autoconf 2.70
-  if test "x$runstatedir" = x; then
-    AC_SUBST([runstatedir], ['${localstatedir}/run'])
-  fi
-
-  dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely
-  dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe.
-  AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}'])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/copy-file.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/copy-file.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/copy-file.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/copy-file.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # copy-file.m4 serial 3
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/csharpcomp.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/csharpcomp.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/csharpcomp.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/csharpcomp.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/csharpexec.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/csharpexec.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/csharpexec.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/csharpexec.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # csharpexec.m4 serial 4
-dnl Copyright (C) 2003-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/csharp.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/csharp.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/csharp.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/csharp.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/dirent_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/dirent_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/dirent_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/dirent_h.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-# dirent_h.m4 serial 16
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 Written by Bruno Haible.
-
-AC_DEFUN([gl_DIRENT_H],
-[
-  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
-  dnl once only, before all statements that occur in other macros.
-  AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
-
-  dnl <dirent.h> is always overridden, because of GNULIB_POSIXCHECK.
-  gl_CHECK_NEXT_HEADERS([dirent.h])
-  if test $ac_cv_header_dirent_h = yes; then
-    HAVE_DIRENT_H=1
-  else
-    HAVE_DIRENT_H=0
-  fi
-  AC_SUBST([HAVE_DIRENT_H])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <dirent.h>
-    ]], [alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir])
-])
-
-AC_DEFUN([gl_DIRENT_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_DIRENT_H_DEFAULTS],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
-  GNULIB_OPENDIR=0;     AC_SUBST([GNULIB_OPENDIR])
-  GNULIB_READDIR=0;     AC_SUBST([GNULIB_READDIR])
-  GNULIB_REWINDDIR=0;   AC_SUBST([GNULIB_REWINDDIR])
-  GNULIB_CLOSEDIR=0;    AC_SUBST([GNULIB_CLOSEDIR])
-  GNULIB_DIRFD=0;       AC_SUBST([GNULIB_DIRFD])
-  GNULIB_FDOPENDIR=0;   AC_SUBST([GNULIB_FDOPENDIR])
-  GNULIB_SCANDIR=0;     AC_SUBST([GNULIB_SCANDIR])
-  GNULIB_ALPHASORT=0;   AC_SUBST([GNULIB_ALPHASORT])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_OPENDIR=1;       AC_SUBST([HAVE_OPENDIR])
-  HAVE_READDIR=1;       AC_SUBST([HAVE_READDIR])
-  HAVE_REWINDDIR=1;     AC_SUBST([HAVE_REWINDDIR])
-  HAVE_CLOSEDIR=1;      AC_SUBST([HAVE_CLOSEDIR])
-  HAVE_DECL_DIRFD=1;    AC_SUBST([HAVE_DECL_DIRFD])
-  HAVE_DECL_FDOPENDIR=1;AC_SUBST([HAVE_DECL_FDOPENDIR])
-  HAVE_FDOPENDIR=1;     AC_SUBST([HAVE_FDOPENDIR])
-  HAVE_SCANDIR=1;       AC_SUBST([HAVE_SCANDIR])
-  HAVE_ALPHASORT=1;     AC_SUBST([HAVE_ALPHASORT])
-  REPLACE_OPENDIR=0;    AC_SUBST([REPLACE_OPENDIR])
-  REPLACE_CLOSEDIR=0;   AC_SUBST([REPLACE_CLOSEDIR])
-  REPLACE_DIRFD=0;      AC_SUBST([REPLACE_DIRFD])
-  REPLACE_FDOPENDIR=0;  AC_SUBST([REPLACE_FDOPENDIR])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/dos.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/dos.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/dos.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/dos.m4	2010-05-24 10:42:19.000000000 +0000
@@ -0,0 +1,71 @@
+#serial 11   -*- autoconf -*-
+
+# Define some macros required for proper operation of code in lib/*.c
+# on MSDOS/Windows systems.
+
+# Copyright (C) 2000-2001, 2004-2006, 2009-2010 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.
+
+# From Jim Meyering.
+
+AC_DEFUN([gl_AC_DOS],
+  [
+    AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
+      [
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
+neither MSDOS nor Windows
+#endif]])],
+        [ac_cv_win_or_dos=yes],
+        [ac_cv_win_or_dos=no])
+      ])
+
+    if test x"$ac_cv_win_or_dos" = xyes; then
+      ac_fs_accepts_drive_letter_prefix=1
+      ac_fs_backslash_is_file_name_separator=1
+      AC_CACHE_CHECK([whether drive letter can start relative path],
+                     [ac_cv_drive_letter_can_be_relative],
+        [
+          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+#if defined __CYGWIN__
+drive letters are always absolute
+#endif]])],
+          [ac_cv_drive_letter_can_be_relative=yes],
+          [ac_cv_drive_letter_can_be_relative=no])
+        ])
+      if test x"$ac_cv_drive_letter_can_be_relative" = xyes; then
+        ac_fs_drive_letter_can_be_relative=1
+      else
+        ac_fs_drive_letter_can_be_relative=0
+      fi
+    else
+      ac_fs_accepts_drive_letter_prefix=0
+      ac_fs_backslash_is_file_name_separator=0
+      ac_fs_drive_letter_can_be_relative=0
+    fi
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
+      $ac_fs_accepts_drive_letter_prefix,
+      [Define on systems for which file names may have a so-called
+       `drive letter' prefix, define this to compute the length of that
+       prefix, including the colon.])
+
+    AH_VERBATIM(ISSLASH,
+    [#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif])
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
+      $ac_fs_backslash_is_file_name_separator,
+      [Define if the backslash character may also serve as a file name
+       component separator.])
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE],
+      $ac_fs_drive_letter_can_be_relative,
+      [Define if a drive letter prefix denotes a relative path if it is
+       not followed by a file name component separator.])
+  ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/double-slash-root.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/double-slash-root.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/double-slash-root.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/double-slash-root.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/dup2.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/dup2.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/dup2.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/dup2.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-#serial 20
-dnl Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+#serial 10
+dnl Copyright (C) 2002, 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,88 +8,51 @@
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS_ONCE([getdtablesize])
-  m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [
-    AC_CHECK_FUNCS_ONCE([dup2])
-    if test $ac_cv_func_dup2 = no; then
-      HAVE_DUP2=0
-    fi
-  ], [
-    AC_DEFINE([HAVE_DUP2], [1], [Define to 1 if you have the 'dup2' function.])
-  ])
-  if test $HAVE_DUP2 = 1; then
+  AC_CHECK_FUNCS_ONCE([dup2])
+  if test $ac_cv_func_dup2 = no; then
+    HAVE_DUP2=0
+    AC_LIBOBJ([dup2])
+  else
     AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works],
       [AC_RUN_IFELSE([
          AC_LANG_PROGRAM([[#include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>]],
-           [int result = 0;
-#ifdef HAVE_GETDTABLESIZE
-            int bad_fd = getdtablesize ();
-#else
-            int bad_fd = 1000000;
-#endif
-#ifdef FD_CLOEXEC
-            if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
-              result |= 1;
-#endif
-            if (dup2 (1, 1) == 0)
-              result |= 2;
-#ifdef FD_CLOEXEC
-            if (fcntl (1, F_GETFD) != FD_CLOEXEC)
-              result |= 4;
-#endif
+           [if (dup2 (1, 1) == 0)
+              return 1;
             close (0);
             if (dup2 (0, 0) != -1)
-              result |= 8;
+              return 2;
             /* Many gnulib modules require POSIX conformance of EBADF.  */
-            if (dup2 (2, bad_fd) == -1 && errno != EBADF)
-              result |= 16;
-            /* Flush out some cygwin core dumps.  */
-            if (dup2 (2, -1) != -1 || errno != EBADF)
-              result |= 32;
-            dup2 (2, 255);
-            dup2 (2, 256);
-            return result;
+            if (dup2 (1, 1000000) == -1 && errno != EBADF)
+              return 3;
+            return 0;
            ])
         ],
         [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
         [case "$host_os" in
            mingw*) # on this platform, dup2 always returns 0 for success
-             gl_cv_func_dup2_works="guessing no" ;;
+             gl_cv_func_dup2_works=no;;
            cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
-             gl_cv_func_dup2_works="guessing no" ;;
+             gl_cv_func_dup2_works=no;;
            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-             gl_cv_func_dup2_works="guessing no" ;;
-           aix* | freebsd*)
-                   # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
-                   # not EBADF.
-             gl_cv_func_dup2_works="guessing no" ;;
-           haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
-             gl_cv_func_dup2_works="guessing no" ;;
-           *) gl_cv_func_dup2_works="guessing yes" ;;
+             gl_cv_func_dup2_works=no;;
+           freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
+             gl_cv_func_dup2_works=no;;
+           *) gl_cv_func_dup2_works=yes;;
          esac])
       ])
-    case "$gl_cv_func_dup2_works" in
-      *yes) ;;
-      *)
-        REPLACE_DUP2=1
-        AC_CHECK_FUNCS([setdtablesize])
-        ;;
-    esac
-  fi
-  dnl Replace dup2() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0; then
-      if test $HAVE_DUP2 = 1; then
-        REPLACE_DUP2=1
-      fi
+    if test "$gl_cv_func_dup2_works" = no; then
+      gl_REPLACE_DUP2
     fi
-  ])
+  fi
 ])
 
-# Prerequisites of lib/dup2.c.
-AC_DEFUN([gl_PREREQ_DUP2], [])
+AC_DEFUN([gl_REPLACE_DUP2],
+[
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  if test $ac_cv_func_dup2 = yes; then
+    REPLACE_DUP2=1
+  fi
+  AC_LIBOBJ([dup2])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/dup.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/dup.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/dup.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/dup.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# dup.m4 serial 3
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_DUP],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_DUP=1
-  fi
-  dnl Replace dup() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0; then
-      REPLACE_DUP=1
-    fi
-  ])
-])
-
-# Prerequisites of lib/dup.c.
-AC_DEFUN([gl_PREREQ_DUP], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/eaccess.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/eaccess.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/eaccess.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/eaccess.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # eaccess.m4 serial 2
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/eealloc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/eealloc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/eealloc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/eealloc.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+# eealloc.m4 serial 2
+dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,7 @@
 [
   AC_REQUIRE([gl_EEMALLOC])
   AC_REQUIRE([gl_EEREALLOC])
+  AC_REQUIRE([AC_C_INLINE])
 ])
 
 AC_DEFUN([gl_EEMALLOC],
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/environ.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/environ.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/environ.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/environ.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+# environ.m4 serial 3
+dnl Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,16 +9,7 @@
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   dnl Persuade glibc <unistd.h> to declare environ.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  gt_CHECK_VAR_DECL(
-    [#if HAVE_UNISTD_H
-     #include <unistd.h>
-     #endif
-     /* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
-     #include <stdlib.h>
-    ],
-    [environ])
+  gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
   if test $gt_cv_var_environ_declaration != yes; then
     HAVE_DECL_ENVIRON=0
   fi
@@ -31,16 +22,14 @@
   define([gt_cv_var], [gt_cv_var_]$2[_declaration])
   AC_MSG_CHECKING([if $2 is properly declared])
   AC_CACHE_VAL([gt_cv_var], [
-    AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[$1
-           extern struct { int foo; } $2;]],
-         [[$2.foo = 1;]])],
-      [gt_cv_var=no],
-      [gt_cv_var=yes])])
+    AC_TRY_COMPILE([$1
+      extern struct { int foo; } $2;],
+      [$2.foo = 1;],
+      gt_cv_var=no,
+      gt_cv_var=yes)])
   AC_MSG_RESULT([$gt_cv_var])
   if test $gt_cv_var = yes; then
-    AC_DEFINE([HAVE_]m4_translit($2, [a-z], [A-Z])[_DECL], 1,
+    AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1,
               [Define if you have the declaration of $2.])
   fi
   undefine([gt_cv_var])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/errno_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/errno_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/errno_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/errno_h.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc.
+# errno_h.m4 serial 6
+dnl Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,9 +10,6 @@
   AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
     AC_EGREP_CPP([booboo],[
 #include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
 #if !defined ENOMSG
 booboo
 #endif
@@ -37,30 +34,12 @@
 #if !defined ENOTSUP
 booboo
 #endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
 #if !defined ESTALE
 booboo
 #endif
-#if !defined EDQUOT
-booboo
-#endif
 #if !defined ECANCELED
 booboo
 #endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
       ],
       [gl_cv_header_errno_h_complete=no],
       [gl_cv_header_errno_h_complete=yes])
@@ -68,11 +47,10 @@
   if test $gl_cv_header_errno_h_complete = yes; then
     ERRNO_H=''
   else
-    gl_NEXT_HEADERS([errno.h])
+    gl_CHECK_NEXT_HEADERS([errno.h])
     ERRNO_H='errno.h'
   fi
   AC_SUBST([ERRNO_H])
-  AM_CONDITIONAL([GL_GENERATE_ERRNO_H], [test -n "$ERRNO_H"])
   gl_REPLACE_ERRNO_VALUE([EMULTIHOP])
   gl_REPLACE_ERRNO_VALUE([ENOLINK])
   gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/error.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/error.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/error.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/error.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-#serial 14
+#serial 12
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8,20 +8,15 @@
 
 AC_DEFUN([gl_ERROR],
 [
-  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
-  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
-  AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <error.h>]],
-          [[error_at_line (0, 0, "", 0, "an error occurred");]])],
-       [ac_cv_lib_error_at_line=yes],
-       [ac_cv_lib_error_at_line=no])])
+  AC_FUNC_ERROR_AT_LINE
+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  gl_PREREQ_ERROR
 ])
 
 # Prerequisites of lib/error.c.
 AC_DEFUN([gl_PREREQ_ERROR],
 [
   AC_REQUIRE([AC_FUNC_STRERROR_R])
+  AC_REQUIRE([AC_C_INLINE])
   :
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/execute.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/execute.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/execute.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/execute.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# execute.m4 serial 5
-dnl Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
+# execute.m4 serial 4
+dnl Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,5 +7,6 @@
 AC_DEFUN([gl_EXECUTE],
 [
   dnl Prerequisites of lib/execute.c.
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_TYPE_MODE_T])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/exponentd.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/exponentd.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/exponentd.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/exponentd.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-# exponentd.m4 serial 3
-dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-AC_DEFUN([gl_DOUBLE_EXPONENT_LOCATION],
-[
-  AC_CACHE_CHECK([where to find the exponent in a 'double'],
-    [gl_cv_cc_double_expbit0],
-    [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-#include <float.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#define NWORDS \
-  ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-typedef union { double value; unsigned int word[NWORDS]; } memory_double;
-static unsigned int ored_words[NWORDS];
-static unsigned int anded_words[NWORDS];
-static void add_to_ored_words (double x)
-{
-  memory_double m;
-  size_t i;
-  /* Clear it first, in case sizeof (double) < sizeof (memory_double).  */
-  memset (&m, 0, sizeof (memory_double));
-  m.value = x;
-  for (i = 0; i < NWORDS; i++)
-    {
-      ored_words[i] |= m.word[i];
-      anded_words[i] &= m.word[i];
-    }
-}
-int main ()
-{
-  size_t j;
-  FILE *fp = fopen ("conftest.out", "w");
-  if (fp == NULL)
-    return 1;
-  for (j = 0; j < NWORDS; j++)
-    anded_words[j] = ~ (unsigned int) 0;
-  add_to_ored_words (0.25);
-  add_to_ored_words (0.5);
-  add_to_ored_words (1.0);
-  add_to_ored_words (2.0);
-  add_to_ored_words (4.0);
-  /* Remove bits that are common (e.g. if representation of the first mantissa
-     bit is explicit).  */
-  for (j = 0; j < NWORDS; j++)
-    ored_words[j] &= ~anded_words[j];
-  /* Now find the nonzero word.  */
-  for (j = 0; j < NWORDS; j++)
-    if (ored_words[j] != 0)
-      break;
-  if (j < NWORDS)
-    {
-      size_t i;
-      for (i = j + 1; i < NWORDS; i++)
-        if (ored_words[i] != 0)
-          {
-            fprintf (fp, "unknown");
-            return (fclose (fp) != 0);
-          }
-      for (i = 0; ; i++)
-        if ((ored_words[j] >> i) & 1)
-          {
-            fprintf (fp, "word %d bit %d", (int) j, (int) i);
-            return (fclose (fp) != 0);
-          }
-    }
-  fprintf (fp, "unknown");
-  return (fclose (fp) != 0);
-}
-        ]])],
-        [gl_cv_cc_double_expbit0=`cat conftest.out`],
-        [gl_cv_cc_double_expbit0="unknown"],
-        [
-          dnl On ARM, there are two 'double' floating-point formats, used by
-          dnl different sets of instructions: The older FPA instructions assume
-          dnl that they are stored in big-endian word order, while the words
-          dnl (like integer types) are stored in little-endian byte order.
-          dnl The newer VFP instructions assume little-endian order
-          dnl consistently.
-          AC_EGREP_CPP([mixed_endianness], [
-#if defined arm || defined __arm || defined __arm__
-  mixed_endianness
-#endif
-            ],
-            [gl_cv_cc_double_expbit0="unknown"],
-            [
-              pushdef([AC_MSG_CHECKING],[:])dnl
-              pushdef([AC_MSG_RESULT],[:])dnl
-              pushdef([AC_MSG_RESULT_UNQUOTED],[:])dnl
-              AC_C_BIGENDIAN(
-                [gl_cv_cc_double_expbit0="word 0 bit 20"],
-                [gl_cv_cc_double_expbit0="word 1 bit 20"],
-                [gl_cv_cc_double_expbit0="unknown"])
-              popdef([AC_MSG_RESULT_UNQUOTED])dnl
-              popdef([AC_MSG_RESULT])dnl
-              popdef([AC_MSG_CHECKING])dnl
-            ])
-        ])
-      rm -f conftest.out
-    ])
-  case "$gl_cv_cc_double_expbit0" in
-    word*bit*)
-      word=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
-      bit=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word.*bit //'`
-      AC_DEFINE_UNQUOTED([DBL_EXPBIT0_WORD], [$word],
-        [Define as the word index where to find the exponent of 'double'.])
-      AC_DEFINE_UNQUOTED([DBL_EXPBIT0_BIT], [$bit],
-        [Define as the bit index in the word where to find bit 0 of the exponent of 'double'.])
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/extensions.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/extensions.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/extensions.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/extensions.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,14 +1,14 @@
-# serial 13  -*- Autoconf -*-
+# serial 9  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2010 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.
 
-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
 # Autoconf.  Perhaps we can remove this once we can assume Autoconf
-# 2.70 or later everywhere, but since Autoconf mutates rapidly
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
 # enough in this area it's likely we'll need to redefine
 # AC_USE_SYSTEM_EXTENSIONS for quite some time.
 
@@ -30,7 +30,6 @@
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
-#
 # Remember that #undef in AH_VERBATIM gets replaced with #define by
 # AC_DEFINE.  The goal here is to define all known feature-enabling
 # macros, then, if reports of conflicts are made, disable macros that
@@ -39,31 +38,35 @@
 [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
   AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
   if test "$MINIX" = yes; then
     AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for 'stat' and other
+      [Define to 1 if you need to in order for `stat' and other
        things to work.])
     AC_DEFINE([_POSIX_1_SOURCE], [2],
       [Define to 2 if the system does not provide POSIX.1 features
        except with this defined.])
     AC_DEFINE([_MINIX], [1],
       [Define to 1 if on MINIX.])
-    AC_DEFINE([_NETBSD_SOURCE], [1],
-      [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
   fi
 
-dnl Use a different key than __EXTENSIONS__, as that name broke existing
-dnl configure.ac when using autoheader 2.62.
-  AH_VERBATIM([USE_SYSTEM_EXTENSIONS],
+  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
+  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
+  dnl provided.
+  case "$host_os" in
+    hpux*)
+      AC_DEFINE([_XOPEN_SOURCE], [500],
+        [Define to 500 only on HP-UX.])
+      ;;
+  esac
+
+  AH_VERBATIM([__EXTENSIONS__],
 [/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
@@ -76,12 +79,6 @@
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
-   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
-   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
-#endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
@@ -98,26 +95,9 @@
   test $ac_cv_safe_to_define___extensions__ = yes &&
     AC_DEFINE([__EXTENSIONS__])
   AC_DEFINE([_ALL_SOURCE])
-  AC_DEFINE([_DARWIN_C_SOURCE])
   AC_DEFINE([_GNU_SOURCE])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
-  AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
-    [ac_cv_should_define__xopen_source],
-    [ac_cv_should_define__xopen_source=no
-     AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[
-          #include <wchar.h>
-          mbstate_t x;]])],
-       [],
-       [AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([[
-             #define _XOPEN_SOURCE 500
-             #include <wchar.h>
-             mbstate_t x;]])],
-          [ac_cv_should_define__xopen_source=yes])])])
-  test $ac_cv_should_define__xopen_source = yes &&
-    AC_DEFINE([_XOPEN_SOURCE], [500])
 ])# AC_USE_SYSTEM_EXTENSIONS
 
 # gl_USE_SYSTEM_EXTENSIONS
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fatal-signal.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fatal-signal.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fatal-signal.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fatal-signal.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,11 +1,12 @@
-# fatal-signal.m4 serial 9
-dnl Copyright (C) 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc.
+# fatal-signal.m4 serial 8
+dnl Copyright (C) 2003-2004, 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FATAL_SIGNAL],
 [
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T])
   AC_CHECK_HEADERS_ONCE([unistd.h])
   gl_PREREQ_SIG_HANDLER_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fcntl_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fcntl_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fcntl_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fcntl_h.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-# serial 15
+# serial 12
 # Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,7 @@
 [
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
   AC_REQUIRE([gl_FCNTL_O_FLAGS])
-  gl_NEXT_HEADERS([fcntl.h])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
+  gl_CHECK_NEXT_HEADERS([fcntl.h])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, if it is not common
@@ -37,14 +31,13 @@
 
 AC_DEFUN([gl_FCNTL_H_DEFAULTS],
 [
-  GNULIB_FCNTL=0;        AC_SUBST([GNULIB_FCNTL])
-  GNULIB_NONBLOCKING=0;  AC_SUBST([GNULIB_NONBLOCKING])
-  GNULIB_OPEN=0;         AC_SUBST([GNULIB_OPEN])
-  GNULIB_OPENAT=0;       AC_SUBST([GNULIB_OPENAT])
+  GNULIB_FCNTL=0;   AC_SUBST([GNULIB_FCNTL])
+  GNULIB_OPEN=0;    AC_SUBST([GNULIB_OPEN])
+  GNULIB_OPENAT=0;  AC_SUBST([GNULIB_OPENAT])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_FCNTL=1;          AC_SUBST([HAVE_FCNTL])
-  HAVE_OPENAT=1;         AC_SUBST([HAVE_OPENAT])
-  REPLACE_FCNTL=0;       AC_SUBST([REPLACE_FCNTL])
-  REPLACE_OPEN=0;        AC_SUBST([REPLACE_OPEN])
-  REPLACE_OPENAT=0;      AC_SUBST([REPLACE_OPENAT])
+  HAVE_FCNTL=1;     AC_SUBST([HAVE_FCNTL])
+  HAVE_OPENAT=1;    AC_SUBST([HAVE_OPENAT])
+  REPLACE_FCNTL=0;  AC_SUBST([REPLACE_FCNTL])
+  REPLACE_OPEN=0;   AC_SUBST([REPLACE_OPEN])
+  REPLACE_OPENAT=0; AC_SUBST([REPLACE_OPENAT])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fcntl.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fcntl.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fcntl.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fcntl.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# fcntl.m4 serial 5
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# fcntl.m4 serial 3
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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,31 +19,16 @@
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS_ONCE([fcntl getdtablesize])
+  AC_CHECK_FUNCS_ONCE([fcntl])
   if test $ac_cv_func_fcntl = no; then
     gl_REPLACE_FCNTL
   else
     dnl cygwin 1.5.x F_DUPFD has wrong errno, and allows negative target
-    dnl haiku alpha 2 F_DUPFD has wrong errno
     AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly],
       [gl_cv_func_fcntl_f_dupfd_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#ifdef HAVE_GETDTABLESIZE
-# include <unistd.h>
-#endif
 #include <fcntl.h>
-#include <errno.h>
-]], [[int result = 0;
-#ifdef HAVE_GETDTABLESIZE
-      int bad_fd = getdtablesize ();
-#else
-      int bad_fd = 1000000;
-#endif
-      if (fcntl (0, F_DUPFD, -1) != -1) result |= 1;
-      if (errno != EINVAL) result |= 2;
-      if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
-      if (errno != EINVAL) result |= 8;
-      return result;
+]], [[return fcntl (0, F_DUPFD, -1) != -1;
          ]])],
          [gl_cv_func_fcntl_f_dupfd_works=yes],
          [gl_cv_func_fcntl_f_dupfd_works=no],
@@ -83,14 +68,6 @@
       dnl No witness macro needed for this bug.
     fi
   fi
-  dnl Replace fcntl() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0; then
-      gl_REPLACE_FCNTL
-    fi
-  ])
 ])
 
 AC_DEFUN([gl_REPLACE_FCNTL],
@@ -102,4 +79,5 @@
   else
     REPLACE_FCNTL=1
   fi
+  AC_LIBOBJ([fcntl])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fdopen.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fdopen.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fdopen.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fdopen.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# fdopen.m4 serial 3
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_FDOPEN],
-[
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_FDOPEN=1
-  else
-    dnl Test whether fdopen() sets errno when it fails due to a bad fd argument.
-    AC_CACHE_CHECK([whether fdopen sets errno], [gl_cv_func_fdopen_works],
-      [
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <errno.h>
-int
-main (void)
-{
-  FILE *fp;
-  errno = 0;
-  fp = fdopen (-1, "r");
-  if (fp == NULL && errno == 0)
-    return 1;
-  return 0;
-}]])],
-          [gl_cv_func_fdopen_works=yes],
-          [gl_cv_func_fdopen_works=no],
-          [case "$host_os" in
-             mingw*) gl_cv_func_fdopen_works="guessing no" ;;
-             *)      gl_cv_func_fdopen_works="guessing yes" ;;
-           esac
-          ])
-      ])
-    case "$gl_cv_func_fdopen_works" in
-      *no) REPLACE_FDOPEN=1 ;;
-    esac
-  fi
-])
-
-dnl Prerequisites of lib/fdopen.c.
-AC_DEFUN([gl_PREREQ_FDOPEN], [])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/findprog.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/findprog.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/findprog.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/findprog.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # findprog.m4 serial 2
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/float_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/float_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/float_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/float_h.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# float_h.m4 serial 9
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+# float_h.m4 serial 3
+dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,90 +9,11 @@
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
   FLOAT_H=
-  REPLACE_FLOAT_LDBL=0
   case "$host_os" in
-    aix* | beos* | openbsd* | mirbsd* | irix*)
+    beos* | openbsd*)
       FLOAT_H=float.h
-      ;;
-    freebsd*)
-      case "$host_cpu" in
-changequote(,)dnl
-        i[34567]86 )
-changequote([,])dnl
-          FLOAT_H=float.h
-          ;;
-        x86_64 )
-          # On x86_64 systems, the C compiler may still be generating
-          # 32-bit code.
-          AC_EGREP_CPP([yes],
-            [#if defined __LP64__ || defined __x86_64__ || defined __amd64__
-             yes
-             #endif],
-            [],
-            [FLOAT_H=float.h])
-          ;;
-      esac
-      ;;
-    linux*)
-      case "$host_cpu" in
-        powerpc*)
-          FLOAT_H=float.h
-          ;;
-      esac
-      ;;
-  esac
-  case "$host_os" in
-    aix* | freebsd* | linux*)
-      if test -n "$FLOAT_H"; then
-        REPLACE_FLOAT_LDBL=1
-      fi
+      gl_CHECK_NEXT_HEADERS([float.h])
       ;;
   esac
-
-  dnl Test against glibc-2.7 Linux/SPARC64 bug.
-  REPLACE_ITOLD=0
-  AC_CACHE_CHECK([whether conversion from 'int' to 'long double' works],
-    [gl_cv_func_itold_works],
-    [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-int i = -1;
-volatile long double ld;
-int main ()
-{
-  ld += i * 1.0L;
-  if (ld > 0)
-    return 1;
-  return 0;
-}]])],
-        [gl_cv_func_itold_works=yes],
-        [gl_cv_func_itold_works=no],
-        [case "$host" in
-           sparc*-*-linux*)
-             AC_EGREP_CPP([yes],
-               [#if defined __LP64__ || defined __arch64__
-                yes
-                #endif],
-               [gl_cv_func_itold_works="guessing no"],
-               [gl_cv_func_itold_works="guessing yes"])
-             ;;
-           *) gl_cv_func_itold_works="guessing yes" ;;
-         esac
-        ])
-    ])
-  case "$gl_cv_func_itold_works" in
-    *no)
-      REPLACE_ITOLD=1
-      dnl We add the workaround to <float.h> but also to <math.h>,
-      dnl to increase the chances that the fix function gets pulled in.
-      FLOAT_H=float.h
-      ;;
-  esac
-
-  if test -n "$FLOAT_H"; then
-    gl_NEXT_HEADERS([float.h])
-  fi
   AC_SUBST([FLOAT_H])
-  AM_CONDITIONAL([GL_GENERATE_FLOAT_H], [test -n "$FLOAT_H"])
-  AC_SUBST([REPLACE_ITOLD])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fnmatch.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fnmatch.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fnmatch.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fnmatch.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-# Check for fnmatch - serial 9.
+# Check for fnmatch - serial 4.
 
-# Copyright (C) 2000-2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2007, 2009-2010 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.
@@ -20,9 +20,7 @@
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   FNMATCH_H=
-  gl_fnmatch_required_lowercase=`
-    echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
-  `
+  gl_fnmatch_required_lowercase=`echo $gl_fnmatch_required | tr 'A-Z' 'a-z'`
   gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
   AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch],
     [$gl_fnmatch_cache_var],
@@ -60,62 +58,33 @@
             static char const a01[] = { 'a' + 1, 0 };
             static char const bs_1[] = { '\\\\' - 1, 0 };
             static char const bs01[] = { '\\\\' + 1, 0 };
-            int result = 0;
-            if (!n ("a*", "", 0))
-              return 1;
-            if (!y ("a*", "abc", 0))
-              return 1;
-            if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
-              return 1;
-            if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
-              return 2;
-            if (!y ("a\\\\bc", "abc", 0))
-              return 3;
-            if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
-              return 3;
-            if (!y ("*x", ".x", 0))
-              return 4;
-            if (!n ("*x", ".x", FNM_PERIOD))
-              return 4;
-            if (!y (Apat, "\\\\", 0))
-              return 5;
-            if (!y (Apat, "A", 0))
-              return 5;
-            if (!y (apat, "\\\\", 0))
-              return 5;
-            if (!y (apat, "a", 0))
-              return 5;
-            if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
-              return 5;
-            if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(y (apat, a01, 0) == ('a' < '\\\\')))
-              return 5;
-            if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
-              return 5;
-            if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
-              return 5;
-            if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
-              return 5;
-            $gl_fnmatch_gnu_start
-            if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
-              result |= 8;
-            if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
-              result |= 16;
-            if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
-              result |= 32;
-            if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
-              result |= 64;
-            if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
-              result |= 64;
-            if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
-              result |= 64;
-            $gl_fnmatch_gnu_end
-            return result;
+            return
+             !(n ("a*", "", 0)
+               && y ("a*", "abc", 0)
+               && n ("d*/*1", "d/s/1", FNM_PATHNAME)
+               && y ("a\\\\bc", "abc", 0)
+               && n ("a\\\\bc", "abc", FNM_NOESCAPE)
+               && y ("*x", ".x", 0)
+               && n ("*x", ".x", FNM_PERIOD)
+               && y (Apat, "\\\\", 0) && y (Apat, "A", 0)
+               && y (apat, "\\\\", 0) && y (apat, "a", 0)
+               && n (Apat, A_1, 0) == ('A' < '\\\\')
+               && n (apat, a_1, 0) == ('a' < '\\\\')
+               && y (Apat, A01, 0) == ('A' < '\\\\')
+               && y (apat, a01, 0) == ('a' < '\\\\')
+               && y (Apat, bs_1, 0) == ('A' < '\\\\')
+               && y (apat, bs_1, 0) == ('a' < '\\\\')
+               && n (Apat, bs01, 0) == ('A' < '\\\\')
+               && n (apat, bs01, 0) == ('a' < '\\\\')
+               $gl_fnmatch_gnu_start
+               && y ("xxXX", "xXxX", FNM_CASEFOLD)
+               && y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)
+               && n ("d*/*1", "d/s/1", FNM_FILE_NAME)
+               && y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)
+               && y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)
+               && y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)
+               $gl_fnmatch_gnu_end
+              );
           ]])],
        [eval "$gl_fnmatch_cache_var=yes"],
        [eval "$gl_fnmatch_cache_var=no"],
@@ -128,9 +97,19 @@
     rm -f "$gl_source_base/fnmatch.h"
   else
     FNMATCH_H=fnmatch.h
+    AC_LIBOBJ([fnmatch])
+    dnl We must choose a different name for our function, since on ELF systems
+    dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
+    dnl compiled into a shared library.
+    AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
+      [Define to a replacement function name for fnmatch().])
+    dnl Prerequisites of lib/fnmatch.c.
+    AC_REQUIRE([AC_TYPE_MBSTATE_T])
+    AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
+    AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
+    AC_CHECK_HEADERS_ONCE([wctype.h])
   fi
   AC_SUBST([FNMATCH_H])
-  AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
 ])
 
 # Request a POSIX compliant fnmatch function with GNU extensions.
@@ -140,17 +119,3 @@
 
   AC_REQUIRE([gl_FUNC_FNMATCH_POSIX])
 ])
-
-AC_DEFUN([gl_PREREQ_FNMATCH],
-[
-  dnl We must choose a different name for our function, since on ELF systems
-  dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
-  dnl compiled into a shared library.
-  AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
-    [Define to a replacement function name for fnmatch().])
-  dnl Prerequisites of lib/fnmatch.c.
-  AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
-  AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
-  AC_CHECK_HEADERS_ONCE([wctype.h])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fopen.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fopen.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fopen.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fopen.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# fopen.m4 serial 9
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# fopen.m4 serial 5
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -21,23 +21,19 @@
       AC_CACHE_CHECK([whether fopen recognizes a trailing slash],
         [gl_cv_func_fopen_slash],
         [
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
+          AC_TRY_RUN([
 #include <stddef.h>
 #include <stdio.h>
 int main ()
 {
   return fopen ("conftest.sl/", "w") != NULL;
-}]])],
-            [gl_cv_func_fopen_slash=yes],
-            [gl_cv_func_fopen_slash=no],
+}], [gl_cv_func_fopen_slash=yes], [gl_cv_func_fopen_slash=no],
             [
 changequote(,)dnl
              case "$host_os" in
-               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-                 gl_cv_func_fopen_slash="guessing no" ;;
-               *)
-                 gl_cv_func_fopen_slash="guessing yes" ;;
+               solaris2.[0-9]*) gl_cv_func_fopen_slash="guessing no" ;;
+               hpux*)           gl_cv_func_fopen_slash="guessing no" ;;
+               *)               gl_cv_func_fopen_slash="guessing yes" ;;
              esac
 changequote([,])dnl
             ])
@@ -52,7 +48,14 @@
       REPLACE_FOPEN=1
       ;;
   esac
+  if test $REPLACE_FOPEN = 1; then
+    AC_LIBOBJ([fopen])
+    gl_PREREQ_FOPEN
+  fi
 ])
 
 # Prerequisites of lib/fopen.c.
-AC_DEFUN([gl_PREREQ_FOPEN], [:])
+AC_DEFUN([gl_PREREQ_FOPEN],
+[
+  AC_REQUIRE([AC_C_INLINE])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fpieee.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fpieee.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fpieee.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fpieee.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-# fpieee.m4 serial 2
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 IEEE 754 standardized three items:
-dnl - The formats of single-float and double-float - nowadays commonly
-dnl   available as 'float' and 'double' in C and C++.
-dnl   No autoconf test needed.
-dnl - The overflow and division by zero behaviour: The result are values
-dnl   '±Inf' and 'NaN', rather than exceptions as it was before.
-dnl   This file provides an autoconf macro for ensuring this behaviour of
-dnl   floating-point operations.
-dnl - A set of conditions (overflow, underflow, inexact, etc.) which can
-dnl   be configured to trigger an exception.
-dnl   This cannot be done in a portable way: it depends on the compiler,
-dnl   libc, kernel, and CPU.  No autoconf macro is provided for this.
-
-dnl Ensure non-trapping behaviour of floating-point overflow and
-dnl floating-point division by zero.
-dnl (For integer overflow, see gcc's -ftrapv option; for integer division by
-dnl zero, see the autoconf macro in intdiv0.m4.)
-
-AC_DEFUN([gl_FP_IEEE],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  # IEEE behaviour is the default on all CPUs except Alpha and SH
-  # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4
-  # and the GCC 4.1.2 manual).
-  case "$host_cpu" in
-    alpha*)
-      # On Alpha systems, a compiler option provides the behaviour.
-      # See the ieee(3) manual page, also available at
-      # <http://h30097.www3.hp.com/docs/base_doc/DOCUMENTATION/V51B_HTML/MAN/MAN3/0600____.HTM>
-      if test -n "$GCC"; then
-        # GCC has the option -mieee.
-        # For full IEEE compliance (rarely needed), use option -mieee-with-inexact.
-        CPPFLAGS="$CPPFLAGS -mieee"
-      else
-        # Compaq (ex-DEC) C has the option -ieee, equivalent to -ieee_with_no_inexact.
-        # For full IEEE compliance (rarely needed), use option -ieee_with_inexact.
-        CPPFLAGS="$CPPFLAGS -ieee"
-      fi
-      ;;
-    sh*)
-      if test -n "$GCC"; then
-        # GCC has the option -mieee.
-        CPPFLAGS="$CPPFLAGS -mieee"
-      fi
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fseeko.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fseeko.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fseeko.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fseeko.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-# fseeko.m4 serial 17
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_FSEEKO],
-[
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([gl_STDIN_LARGE_OFFSET])
-  AC_REQUIRE([gl_SYS_TYPES_H])
-  AC_REQUIRE([AC_PROG_CC])
-
-  dnl Persuade glibc <stdio.h> to declare fseeko().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_CACHE_CHECK([for fseeko], [gl_cv_func_fseeko],
-    [
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-]], [fseeko (stdin, 0, 0);])],
-        [gl_cv_func_fseeko=yes], [gl_cv_func_fseeko=no])
-    ])
-
-  AC_CHECK_DECLS_ONCE([fseeko])
-  if test $ac_cv_have_decl_fseeko = no; then
-    HAVE_DECL_FSEEKO=0
-  fi
-
-  if test $gl_cv_func_fseeko = no; then
-    HAVE_FSEEKO=0
-  else
-    if test $WINDOWS_64_BIT_OFF_T = 1; then
-      REPLACE_FSEEKO=1
-    fi
-    if test $gl_cv_var_stdin_large_offset = no; then
-      REPLACE_FSEEKO=1
-    fi
-    m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
-      gl_FUNC_FFLUSH_STDIN
-      if test $gl_cv_func_fflush_stdin != yes; then
-        REPLACE_FSEEKO=1
-      fi
-    ])
-  fi
-])
-
-dnl Code shared by fseeko and ftello.  Determine if large files are supported,
-dnl but stdin does not start as a large file by default.
-AC_DEFUN([gl_STDIN_LARGE_OFFSET],
-  [
-    AC_CACHE_CHECK([whether stdin defaults to large file offsets],
-      [gl_cv_var_stdin_large_offset],
-      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
-[[#if defined __SL64 && defined __SCLE /* cygwin */
-  /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making
-     fseeko/ftello needlessly fail.  This bug was fixed in 1.5.25, and
-     it is easier to do a version check than building a runtime test.  */
-# include <cygwin/version.h>
-# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)
-  choke me
-# endif
-#endif]])],
-        [gl_cv_var_stdin_large_offset=yes],
-        [gl_cv_var_stdin_large_offset=no])])
-])
-
-# Prerequisites of lib/fseeko.c.
-AC_DEFUN([gl_PREREQ_FSEEKO],
-[
-  dnl Native Windows has the function _fseeki64. mingw hides it, but mingw64
-  dnl makes it usable again.
-  AC_CHECK_FUNCS([_fseeki64])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/fstat.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/fstat.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/fstat.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/fstat.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# fstat.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_FSTAT],
-[
-  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
-
-  AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_FSTAT=1
-  fi
-
-  AC_REQUIRE([gl_HEADER_SYS_STAT_H])
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-    REPLACE_FSTAT=1
-  fi
-
-  dnl Replace fstat() for supporting the gnulib-defined open() on directories.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0; then
-      case "$gl_cv_func_open_directory_works" in
-        *yes) ;;
-        *)
-          REPLACE_FSTAT=1
-          ;;
-      esac
-    fi
-  ])
-])
-
-# Prerequisites of lib/fstat.c.
-AC_DEFUN([gl_PREREQ_FSTAT], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/ftell.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/ftell.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/ftell.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/ftell.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-# ftell.m4 serial 3
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_FTELL],
-[
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_FTELLO])
-  dnl When ftello needs fixes, ftell needs them too.
-  if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
-    REPLACE_FTELL=1
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/ftello.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/ftello.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/ftello.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/ftello.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-# ftello.m4 serial 11
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_FTELLO],
-[
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gl_STDIN_LARGE_OFFSET])
-  AC_REQUIRE([gl_SYS_TYPES_H])
-
-  dnl Persuade glibc <stdio.h> to declare ftello().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_CHECK_DECLS_ONCE([ftello])
-  if test $ac_cv_have_decl_ftello = no; then
-    HAVE_DECL_FTELLO=0
-  fi
-
-  AC_CACHE_CHECK([for ftello], [gl_cv_func_ftello],
-    [
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[#include <stdio.h>]],
-           [[ftello (stdin);]])],
-        [gl_cv_func_ftello=yes],
-        [gl_cv_func_ftello=no])
-    ])
-  if test $gl_cv_func_ftello = no; then
-    HAVE_FTELLO=0
-  else
-    if test $WINDOWS_64_BIT_OFF_T = 1; then
-      REPLACE_FTELLO=1
-    fi
-    if test $gl_cv_var_stdin_large_offset = no; then
-      REPLACE_FTELLO=1
-    fi
-    if test $REPLACE_FTELLO = 0; then
-      dnl Detect bug on Solaris.
-      dnl ftell and ftello produce incorrect results after putc that followed a
-      dnl getc call that reached EOF on Solaris. This is because the _IOREAD
-      dnl flag does not get cleared in this case, even though _IOWRT gets set,
-      dnl and ftell and ftello look whether the _IOREAD flag is set.
-      AC_REQUIRE([AC_CANONICAL_HOST])
-      AC_CACHE_CHECK([whether ftello works],
-        [gl_cv_func_ftello_works],
-        [
-          dnl Initial guess, used when cross-compiling or when /dev/tty cannot
-          dnl be opened.
-changequote(,)dnl
-          case "$host_os" in
-                      # Guess no on Solaris.
-            solaris*) gl_cv_func_ftello_works="guessing no" ;;
-                      # Guess yes otherwise.
-            *)        gl_cv_func_ftello_works="guessing yes" ;;
-          esac
-changequote([,])dnl
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define TESTFILE "conftest.tmp"
-int
-main (void)
-{
-  FILE *fp;
-
-  /* Create a file with some contents.  */
-  fp = fopen (TESTFILE, "w");
-  if (fp == NULL)
-    return 70;
-  if (fwrite ("foogarsh", 1, 8, fp) < 8)
-    return 71;
-  if (fclose (fp))
-    return 72;
-
-  /* The file's contents is now "foogarsh".  */
-
-  /* Try writing after reading to EOF.  */
-  fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    return 73;
-  if (fseek (fp, -1, SEEK_END))
-    return 74;
-  if (!(getc (fp) == 'h'))
-    return 1;
-  if (!(getc (fp) == EOF))
-    return 2;
-  if (!(ftell (fp) == 8))
-    return 3;
-  if (!(ftell (fp) == 8))
-    return 4;
-  if (!(putc ('!', fp) == '!'))
-    return 5;
-  if (!(ftell (fp) == 9))
-    return 6;
-  if (!(fclose (fp) == 0))
-    return 7;
-  fp = fopen (TESTFILE, "r");
-  if (fp == NULL)
-    return 75;
-  {
-    char buf[10];
-    if (!(fread (buf, 1, 10, fp) == 9))
-      return 10;
-    if (!(memcmp (buf, "foogarsh!", 9) == 0))
-      return 11;
-  }
-  if (!(fclose (fp) == 0))
-    return 12;
-
-  /* The file's contents is now "foogarsh!".  */
-
-  return 0;
-}]])],
-            [gl_cv_func_ftello_works=yes],
-            [gl_cv_func_ftello_works=no], [:])
-        ])
-      case "$gl_cv_func_ftello_works" in
-        *yes) ;;
-        *)
-          REPLACE_FTELLO=1
-          AC_DEFINE([FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE], [1],
-            [Define to 1 if the system's ftello function has the Solaris bug.])
-          ;;
-      esac
-    fi
-  fi
-])
-
-# Prerequisites of lib/ftello.c.
-AC_DEFUN([gl_PREREQ_FTELLO],
-[
-  dnl Native Windows has the function _ftelli64. mingw hides it, but mingw64
-  dnl makes it usable again.
-  AC_CHECK_FUNCS([_ftelli64])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/getcwd.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/getcwd.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/getcwd.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/getcwd.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-# getcwd.m4 - check for working getcwd that is compatible with glibc
-
-# Copyright (C) 2001, 2003-2007, 2009-2014 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
-
-AC_DEFUN([gl_FUNC_GETCWD_NULL],
-  [
-   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_HEADERS_ONCE([unistd.h])
-   AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result],
-     [gl_cv_func_getcwd_null],
-     [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#        if HAVE_UNISTD_H
-#         include <unistd.h>
-#        else /* on Windows with MSVC */
-#         include <direct.h>
-#        endif
-#        ifndef getcwd
-         char *getcwd ();
-#        endif
-]], [[
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* mingw cwd does not start with '/', but getcwd does allocate.
-   However, mingw fails to honor non-zero size.  */
-#else
-           if (chdir ("/") != 0)
-             return 1;
-           else
-             {
-               char *f = getcwd (NULL, 0);
-               if (! f)
-                 return 2;
-               if (f[0] != '/')
-                 return 3;
-               if (f[1] != '\0')
-                 return 4;
-               return 0;
-             }
-#endif
-         ]])],
-        [gl_cv_func_getcwd_null=yes],
-        [gl_cv_func_getcwd_null=no],
-        [[case "$host_os" in
-                     # Guess yes on glibc systems.
-            *-gnu*)  gl_cv_func_getcwd_null="guessing yes";;
-                     # Guess yes on Cygwin.
-            cygwin*) gl_cv_func_getcwd_null="guessing yes";;
-                     # If we don't know, assume the worst.
-            *)       gl_cv_func_getcwd_null="guessing no";;
-          esac
-        ]])])
-])
-
-AC_DEFUN([gl_FUNC_GETCWD_SIGNATURE],
-[
-  AC_CACHE_CHECK([for getcwd with POSIX signature],
-    [gl_cv_func_getcwd_posix_signature],
-    [AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[#include <unistd.h>]],
-         [[extern
-           #ifdef __cplusplus
-           "C"
-           #endif
-           char *getcwd (char *, size_t);
-         ]])
-      ],
-      [gl_cv_func_getcwd_posix_signature=yes],
-      [gl_cv_func_getcwd_posix_signature=no])
-   ])
-])
-
-dnl Guarantee that getcwd will malloc with a NULL first argument.  Assumes
-dnl that either the system getcwd is robust, or that calling code is okay
-dnl with spurious failures when run from a directory with an absolute name
-dnl larger than 4k bytes.
-dnl
-dnl Assumes that getcwd exists; if you are worried about obsolete
-dnl platforms that lacked getcwd(), then you need to use the GPL module.
-AC_DEFUN([gl_FUNC_GETCWD_LGPL],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_GETCWD_NULL])
-  AC_REQUIRE([gl_FUNC_GETCWD_SIGNATURE])
-
-  case $gl_cv_func_getcwd_null,$gl_cv_func_getcwd_posix_signature in
-  *yes,yes) ;;
-  *)
-    dnl Minimal replacement lib/getcwd-lgpl.c.
-    REPLACE_GETCWD=1
-    ;;
-  esac
-])
-
-dnl Check for all known getcwd bugs; useful for a program likely to be
-dnl executed from an arbitrary location.
-AC_DEFUN([gl_FUNC_GETCWD],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_GETCWD_NULL])
-  AC_REQUIRE([gl_FUNC_GETCWD_SIGNATURE])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  gl_abort_bug=no
-  case "$host_os" in
-    mingw*)
-      gl_cv_func_getcwd_path_max=yes
-      ;;
-    *)
-      gl_FUNC_GETCWD_PATH_MAX
-      case "$gl_cv_func_getcwd_null" in
-        *yes)
-          gl_FUNC_GETCWD_ABORT_BUG([gl_abort_bug=yes])
-          ;;
-      esac
-      ;;
-  esac
-  dnl Define HAVE_MINIMALLY_WORKING_GETCWD and HAVE_PARTLY_WORKING_GETCWD
-  dnl if appropriate.
-  case "$gl_cv_func_getcwd_path_max" in
-    "no"|"no, it has the AIX bug") ;;
-    *)
-      AC_DEFINE([HAVE_MINIMALLY_WORKING_GETCWD], [1],
-        [Define to 1 if getcwd minimally works, that is, its result can be
-         trusted when it succeeds.])
-      ;;
-  esac
-  case "$gl_cv_func_getcwd_path_max" in
-    "no, but it is partly working")
-      AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], [1],
-        [Define to 1 if getcwd works, except it sometimes fails when it
-         shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT.])
-      ;;
-  esac
-
-  if { case "$gl_cv_func_getcwd_null" in *yes) false;; *) true;; esac; } \
-     || test $gl_cv_func_getcwd_posix_signature != yes \
-     || test "$gl_cv_func_getcwd_path_max" != yes \
-     || test $gl_abort_bug = yes; then
-    REPLACE_GETCWD=1
-  fi
-])
-
-# Prerequisites of lib/getcwd.c, when full replacement is in effect.
-AC_DEFUN([gl_PREREQ_GETCWD],
-[
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/getdelim.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/getdelim.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/getdelim.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/getdelim.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-# getdelim.m4 serial 10
+# getdelim.m4 serial 6
 
-dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2010 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,
@@ -19,7 +19,6 @@
 
   AC_CHECK_FUNCS_ONCE([getdelim])
   if test $ac_cv_func_getdelim = yes; then
-    HAVE_GETDELIM=1
     dnl Found it in some library.  Verify that it works.
     AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim],
     [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -39,7 +38,7 @@
         size_t siz = 0;
         int len = getdelim (&line, &siz, '\n', in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
-          return 2;
+          return 1;
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -47,7 +46,7 @@
         char *line = NULL;
         size_t siz = (size_t)(~0) / 4;
         if (getdelim (&line, &siz, '\n', in) == -1)
-          return 3;
+          return 1;
       }
       return 0;
     }
@@ -58,26 +57,29 @@
          [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
          ],
-         [gl_cv_func_working_getdelim="guessing yes"],
-         [gl_cv_func_working_getdelim="guessing no"])]
+         [gl_cv_func_working_getdelim=yes],
+         [gl_cv_func_working_getdelim=no])]
     )])
-    case "$gl_cv_func_working_getdelim" in
-      *no)
-        REPLACE_GETDELIM=1
-        ;;
-    esac
   else
-    HAVE_GETDELIM=0
+    gl_cv_func_working_getdelim=no
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then
     HAVE_DECL_GETDELIM=0
   fi
+
+  if test $gl_cv_func_working_getdelim = no; then
+    if test $ac_cv_func_getdelim = yes; then
+      REPLACE_GETDELIM=1
+    fi
+    AC_LIBOBJ([getdelim])
+    gl_PREREQ_GETDELIM
+  fi
 ])
 
 # Prerequisites of lib/getdelim.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/getdtablesize.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/getdtablesize.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/getdtablesize.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/getdtablesize.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# getdtablesize.m4 serial 5
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# getdtablesize.m4 serial 1
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,38 +7,9 @@
 AC_DEFUN([gl_FUNC_GETDTABLESIZE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([getdtablesize])
-  if test $ac_cv_func_getdtablesize = yes; then
-    # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit
-    # up to an unchangeable hard limit; all other platforms correctly
-    # require setrlimit before getdtablesize() can report a larger value.
-    AC_CACHE_CHECK([whether getdtablesize works],
-      [gl_cv_func_getdtablesize_works],
-      [AC_RUN_IFELSE([
-        AC_LANG_PROGRAM([[#include <unistd.h>]],
-          [int size = getdtablesize();
-           if (dup2 (0, getdtablesize()) != -1)
-             return 1;
-           if (size != getdtablesize())
-             return 2;
-          ])],
-        [gl_cv_func_getdtablesize_works=yes],
-        [gl_cv_func_getdtablesize_works=no],
-        [case "$host_os" in
-          cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
-            gl_cv_func_getdtablesize_works="guessing no" ;;
-          *) gl_cv_func_getdtablesize_works="guessing yes" ;;
-         esac])
-      ])
-    case "$gl_cv_func_getdtablesize_works" in
-      *yes) ;;
-      *) REPLACE_GETDTABLESIZE=1 ;;
-    esac
-  else
+  if test $ac_cv_func_getdtablesize != yes; then
     HAVE_GETDTABLESIZE=0
+    AC_LIBOBJ([getdtablesize])
   fi
 ])
-
-# Prerequisites of lib/getdtablesize.c.
-AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/getline.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/getline.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/getline.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/getline.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-# getline.m4 serial 26
+# getline.m4 serial 21
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2010 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
@@ -46,7 +46,7 @@
         size_t siz = 0;
         int len = getline (&line, &siz, in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
-          return 2;
+          return 1;
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -54,7 +54,7 @@
         char *line = NULL;
         size_t siz = (size_t)(~0) / 4;
         if (getline (&line, &siz, in) == -1)
-          return 3;
+          return 1;
       }
       return 0;
     }
@@ -65,13 +65,13 @@
          [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+ #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
          ],
-         [am_cv_func_working_getline="guessing yes"],
-         [am_cv_func_working_getline="guessing no"])]
+         [am_cv_func_working_getline=yes],
+         [am_cv_func_working_getline=no])]
     )])
   fi
 
@@ -79,18 +79,19 @@
     HAVE_DECL_GETLINE=0
   fi
 
-  case "$am_cv_func_working_getline" in
-    *no)
-      dnl Set REPLACE_GETLINE always: Even if we have not found the broken
-      dnl getline function among $LIBS, it may exist in libinet and the
-      dnl executable may be linked with -linet.
-      REPLACE_GETLINE=1
-      ;;
-  esac
+  if test $am_cv_func_working_getline = no; then
+    dnl Set REPLACE_GETLINE always: Even if we have not found the broken
+    dnl getline function among $LIBS, it may exist in libinet and the
+    dnl executable may be linked with -linet.
+    REPLACE_GETLINE=1
+    AC_LIBOBJ([getline])
+
+    gl_PREREQ_GETLINE
+  fi
 ])
 
 # Prerequisites of lib/getline.c.
 AC_DEFUN([gl_PREREQ_GETLINE],
 [
-  :
+  gl_FUNC_GETDELIM
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/getopt.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/getopt.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/getopt.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/getopt.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
+# getopt.m4 serial 28
+dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,22 +9,10 @@
 [
   m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX])
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
-  dnl Other modules can request the gnulib implementation of the getopt
-  dnl functions unconditionally, by defining gl_REPLACE_GETOPT_ALWAYS.
-  dnl argp.m4 does this.
-  m4_ifdef([gl_REPLACE_GETOPT_ALWAYS], [
-    REPLACE_GETOPT=1
-  ], [
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
-  ])
-  if test $REPLACE_GETOPT = 1; then
-    dnl Arrange for getopt.h to be created.
-    gl_GETOPT_SUBSTITUTE_HEADER
-  fi
+  gl_GETOPT_IFELSE([
+    gl_REPLACE_GETOPT
+  ],
+  [])
 ])
 
 # Request a POSIX compliant getopt function with GNU extensions (such as
@@ -37,16 +25,37 @@
   AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
 ])
 
+# Request the gnulib implementation of the getopt functions unconditionally.
+# argp.m4 uses this.
+AC_DEFUN([gl_REPLACE_GETOPT],
+[
+  dnl Arrange for getopt.h to be created.
+  gl_GETOPT_SUBSTITUTE_HEADER
+  dnl Arrange for unistd.h to include getopt.h.
+  GNULIB_UNISTD_H_GETOPT=1
+  dnl Arrange to compile the getopt implementation.
+  AC_LIBOBJ([getopt])
+  AC_LIBOBJ([getopt1])
+  gl_PREREQ_GETOPT
+])
+
+# emacs' configure.in uses this.
+AC_DEFUN([gl_GETOPT_IFELSE],
+[
+  AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
+  AS_IF([test -n "$gl_replace_getopt"], [$1], [$2])
+])
+
 # Determine whether to replace the entire getopt facility.
 AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([AC_PROG_AWK]) dnl for awk that supports ENVIRON
 
   dnl Persuade Solaris <unistd.h> to declare optarg, optind, opterr, optopt.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   gl_CHECK_NEXT_HEADERS([getopt.h])
+  AC_CHECK_HEADERS_ONCE([getopt.h])
   if test $ac_cv_header_getopt_h = yes; then
     HAVE_GETOPT_H=1
   else
@@ -66,6 +75,25 @@
     AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes])
   fi
 
+  dnl BSD getopt_long uses an incompatible method to reset option processing.
+  dnl Existence of the variable, in and of itself, is not a reason to replace
+  dnl getopt, but knowledge of the variable is needed to determine how to
+  dnl reset and whether a reset reparses the environment.
+  dnl Solaris supports neither optreset nor optind=0, but keeps no state that
+  dnl needs a reset beyond setting optind=1; detect Solaris by getopt_clip.
+  if test -z "$gl_replace_getopt"; then
+    AC_CHECK_DECLS([optreset], [],
+      [AC_CHECK_DECLS([getopt_clip], [], [],
+        [[#include <getopt.h>]])
+      ],
+      [[#include <getopt.h>]])
+  fi
+
+  dnl mingw's getopt (in libmingwex.a) does weird things when the options
+  dnl strings starts with '+' and it's not the first call.  Some internal state
+  dnl is left over from earlier calls, and neither setting optind = 0 nor
+  dnl setting optreset = 1 get rid of this internal state.
+  dnl POSIX is silent on optind vs. optreset, so we allow either behavior.
   dnl POSIX 2008 does not specify leading '+' behavior, but see
   dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on
   dnl the next version of POSIX.  For now, we only guarantee leading '+'
@@ -74,124 +102,105 @@
     AC_CACHE_CHECK([whether getopt is POSIX compatible],
       [gl_cv_func_getopt_posix],
       [
-        dnl Merging these three different test programs into a single one
-        dnl would require a reset mechanism. On BSD systems, it can be done
-        dnl through 'optreset'; on some others (glibc), it can be done by
-        dnl setting 'optind' to 0; on others again (HP-UX, IRIX, OSF/1,
-        dnl Solaris 9, musl libc), there is no such mechanism.
-        if test $cross_compiling = no; then
-          dnl Sanity check. Succeeds everywhere (except on MSVC,
-          dnl which lacks <unistd.h> and getopt() entirely).
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
+        dnl This test fails on mingw and succeeds on all other platforms.
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 
-int
-main ()
-{
-  static char program[] = "program";
-  static char a[] = "-a";
-  static char foo[] = "foo";
-  static char bar[] = "bar";
-  char *argv[] = { program, a, foo, bar, NULL };
-  int c;
-
-  c = getopt (4, argv, "ab");
-  if (!(c == 'a'))
-    return 1;
-  c = getopt (4, argv, "ab");
-  if (!(c == -1))
-    return 2;
-  if (!(optind == 2))
-    return 3;
-  return 0;
-}
-]])],
-            [gl_cv_func_getopt_posix=maybe],
-            [gl_cv_func_getopt_posix=no])
-          if test $gl_cv_func_getopt_posix = maybe; then
-            dnl Sanity check with '+'. Succeeds everywhere (except on MSVC,
-            dnl which lacks <unistd.h> and getopt() entirely).
-            AC_RUN_IFELSE(
-              [AC_LANG_SOURCE([[
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP
+# define OPTIND_MIN 0
+#else
+# define OPTIND_MIN 1
+#endif
 
 int
 main ()
 {
-  static char program[] = "program";
-  static char donald[] = "donald";
-  static char p[] = "-p";
-  static char billy[] = "billy";
-  static char duck[] = "duck";
-  static char a[] = "-a";
-  static char bar[] = "bar";
-  char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
-  int c;
-
-  c = getopt (7, argv, "+abp:q:");
-  if (!(c == -1))
-    return 4;
-  if (!(strcmp (argv[0], "program") == 0))
-    return 5;
-  if (!(strcmp (argv[1], "donald") == 0))
-    return 6;
-  if (!(strcmp (argv[2], "-p") == 0))
-    return 7;
-  if (!(strcmp (argv[3], "billy") == 0))
-    return 8;
-  if (!(strcmp (argv[4], "duck") == 0))
-    return 9;
-  if (!(strcmp (argv[5], "-a") == 0))
-    return 10;
-  if (!(strcmp (argv[6], "bar") == 0))
-    return 11;
-  if (!(optind == 1))
-    return 12;
-  return 0;
-}
-]])],
-              [gl_cv_func_getopt_posix=maybe],
-              [gl_cv_func_getopt_posix=no])
-          fi
-          if test $gl_cv_func_getopt_posix = maybe; then
-            dnl Detect Mac OS X 10.5, AIX 7.1, mingw bug.
-            AC_RUN_IFELSE(
-              [AC_LANG_SOURCE([[
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "-a";
+    argv[argc++] = "foo";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
+
+    c = getopt (argc, argv, "ab");
+    if (!(c == 'a'))
+      return 1;
+    c = getopt (argc, argv, "ab");
+    if (!(c == -1))
+      return 2;
+    if (!(optind == 2))
+      return 3;
+  }
+  /* Some internal state exists at this point.  */
+  {
+    int argc = 0;
+    char *argv[10];
+    int c;
+
+    argv[argc++] = "program";
+    argv[argc++] = "donald";
+    argv[argc++] = "-p";
+    argv[argc++] = "billy";
+    argv[argc++] = "duck";
+    argv[argc++] = "-a";
+    argv[argc++] = "bar";
+    argv[argc] = NULL;
+    optind = OPTIND_MIN;
+    opterr = 0;
+
+    c = getopt (argc, argv, "+abp:q:");
+    if (!(c == -1))
+      return 4;
+    if (!(strcmp (argv[0], "program") == 0))
+      return 5;
+    if (!(strcmp (argv[1], "donald") == 0))
+      return 6;
+    if (!(strcmp (argv[2], "-p") == 0))
+      return 7;
+    if (!(strcmp (argv[3], "billy") == 0))
+      return 8;
+    if (!(strcmp (argv[4], "duck") == 0))
+      return 9;
+    if (!(strcmp (argv[5], "-a") == 0))
+      return 10;
+    if (!(strcmp (argv[6], "bar") == 0))
+      return 11;
+    if (!(optind == 1))
+      return 12;
+  }
+  /* Detect MacOS 10.5 bug.  */
+  {
+    char *argv[3] = { "program", "-ab", NULL };
+    optind = OPTIND_MIN;
+    opterr = 0;
+    if (getopt (2, argv, "ab:") != 'a')
+      return 13;
+    if (getopt (2, argv, "ab:") != '?')
+      return 14;
+    if (optopt != 'b')
+      return 15;
+    if (optind != 2)
+      return 16;
+  }
 
-int
-main ()
-{
-  static char program[] = "program";
-  static char ab[] = "-ab";
-  char *argv[3] = { program, ab, NULL };
-  if (getopt (2, argv, "ab:") != 'a')
-    return 13;
-  if (getopt (2, argv, "ab:") != '?')
-    return 14;
-  if (optopt != 'b')
-    return 15;
-  if (optind != 2)
-    return 16;
   return 0;
 }
 ]])],
-              [gl_cv_func_getopt_posix=yes],
-              [gl_cv_func_getopt_posix=no])
-          fi
-        else
-          case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
-          esac
-        fi
+          [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no],
+          [case "$host_os" in
+             mingw*) gl_cv_func_getopt_posix="guessing no";;
+             darwin*) gl_cv_func_getopt_posix="guessing no";;
+             *)      gl_cv_func_getopt_posix="guessing yes";;
+           esac
+          ])
       ])
     case "$gl_cv_func_getopt_posix" in
       *no) gl_replace_getopt=yes ;;
@@ -204,154 +213,82 @@
        # optstring is necessary for programs like m4 that have POSIX-mandated
        # semantics for supporting options interspersed with files.
        # Also, since getopt_long is a GNU extension, we require optind=0.
-       # Bash ties 'set -o posix' to a non-exported POSIXLY_CORRECT;
-       # so take care to revert to the correct (non-)export state.
-dnl GNU Coding Standards currently allow awk but not env; besides, env
-dnl is ambiguous with environment values that contain newlines.
-       gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
-       case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
-         xx) gl_had_POSIXLY_CORRECT=exported ;;
-         x)  gl_had_POSIXLY_CORRECT=yes      ;;
-         *)  gl_had_POSIXLY_CORRECT=         ;;
-       esac
+       gl_had_POSIXLY_CORRECT=${POSIXLY_CORRECT:+yes}
        POSIXLY_CORRECT=1
        export POSIXLY_CORRECT
        AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([[#include <getopt.h>
                            #include <stddef.h>
                            #include <string.h>
-           ]GL_NOCRASH[
            ]], [[
-             int result = 0;
-
-             nocrash_init();
-
              /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
-                and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
+                and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
                 OSF/1 5.1, Solaris 10.  */
              {
-               static char conftest[] = "conftest";
-               static char plus[] = "-+";
-               char *argv[3] = { conftest, plus, NULL };
+               char *myargv[3];
+               myargv[0] = "conftest";
+               myargv[1] = "-+";
+               myargv[2] = 0;
                opterr = 0;
-               if (getopt (2, argv, "+a") != '?')
-                 result |= 1;
+               if (getopt (2, myargv, "+a") != '?')
+                 return 1;
              }
              /* This code succeeds on glibc 2.8, mingw,
-                and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
+                and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
                 IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x.  */
              {
-               static char program[] = "program";
-               static char p[] = "-p";
-               static char foo[] = "foo";
-               static char bar[] = "bar";
-               char *argv[] = { program, p, foo, bar, NULL };
+               char *argv[] = { "program", "-p", "foo", "bar", NULL };
 
                optind = 1;
                if (getopt (4, argv, "p::") != 'p')
-                 result |= 2;
-               else if (optarg != NULL)
-                 result |= 4;
-               else if (getopt (4, argv, "p::") != -1)
-                 result |= 6;
-               else if (optind != 2)
-                 result |= 8;
+                 return 2;
+               if (optarg != NULL)
+                 return 3;
+               if (getopt (4, argv, "p::") != -1)
+                 return 4;
+               if (optind != 2)
+                 return 5;
              }
              /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0.  */
              {
-               static char program[] = "program";
-               static char foo[] = "foo";
-               static char p[] = "-p";
-               char *argv[] = { program, foo, p, NULL };
+               char *argv[] = { "program", "foo", "-p", NULL };
                optind = 0;
                if (getopt (3, argv, "-p") != 1)
-                 result |= 16;
-               else if (getopt (3, argv, "-p") != 'p')
-                 result |= 16;
+                 return 6;
+               if (getopt (3, argv, "-p") != 'p')
+                 return 7;
              }
              /* This code fails on glibc 2.11.  */
              {
-               static char program[] = "program";
-               static char b[] = "-b";
-               static char a[] = "-a";
-               char *argv[] = { program, b, a, NULL };
+               char *argv[] = { "program", "-b", "-a", NULL };
                optind = opterr = 0;
                if (getopt (3, argv, "+:a:b") != 'b')
-                 result |= 32;
-               else if (getopt (3, argv, "+:a:b") != ':')
-                 result |= 32;
-             }
-             /* This code dumps core on glibc 2.14.  */
-             {
-               static char program[] = "program";
-               static char w[] = "-W";
-               static char dummy[] = "dummy";
-               char *argv[] = { program, w, dummy, NULL };
-               optind = opterr = 1;
-               if (getopt (3, argv, "W;") != 'W')
-                 result |= 64;
+                 return 8;
+               if (getopt (3, argv, "+:a:b") != ':')
+                 return 9;
              }
-             return result;
+             return 0;
            ]])],
         [gl_cv_func_getopt_gnu=yes],
         [gl_cv_func_getopt_gnu=no],
-        [dnl Cross compiling. Assume the worst, even on glibc platforms.
-         gl_cv_func_getopt_gnu="guessing no"
+        [dnl Cross compiling. Guess based on host and declarations.
+         case $host_os:$ac_cv_have_decl_optreset in
+           *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
+           *:yes)               gl_cv_func_getopt_gnu=no;;
+           *)                   gl_cv_func_getopt_gnu=yes;;
+         esac
         ])
-       case $gl_had_POSIXLY_CORRECT in
-         exported) ;;
-         yes) AS_UNSET([POSIXLY_CORRECT]); POSIXLY_CORRECT=1 ;;
-         *) AS_UNSET([POSIXLY_CORRECT]) ;;
-       esac
+       if test "$gl_had_POSIXLY_CORRECT" != yes; then
+         AS_UNSET([POSIXLY_CORRECT])
+       fi
       ])
-    if test "$gl_cv_func_getopt_gnu" != yes; then
+    if test "$gl_cv_func_getopt_gnu" = "no"; then
       gl_replace_getopt=yes
-    else
-      AC_CACHE_CHECK([for working GNU getopt_long function],
-        [gl_cv_func_getopt_long_gnu],
-        [AC_RUN_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <getopt.h>
-                #include <stddef.h>
-                #include <string.h>
-              ]],
-              [[static const struct option long_options[] =
-                  {
-                    { "xtremely-",no_argument,       NULL, 1003 },
-                    { "xtra",     no_argument,       NULL, 1001 },
-                    { "xtreme",   no_argument,       NULL, 1002 },
-                    { "xtremely", no_argument,       NULL, 1003 },
-                    { NULL,       0,                 NULL, 0 }
-                  };
-                /* This code fails on OpenBSD 5.0.  */
-                {
-                  static char program[] = "program";
-                  static char xtremel[] = "--xtremel";
-                  char *argv[] = { program, xtremel, NULL };
-                  int option_index;
-                  optind = 1; opterr = 0;
-                  if (getopt_long (2, argv, "", long_options, &option_index) != 1003)
-                    return 1;
-                }
-                return 0;
-              ]])],
-           [gl_cv_func_getopt_long_gnu=yes],
-           [gl_cv_func_getopt_long_gnu=no],
-           [dnl Cross compiling. Guess no on OpenBSD, yes otherwise.
-            case "$host_os" in
-              openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
-              *)        gl_cv_func_getopt_long_gnu="guessing yes";;
-            esac
-           ])
-        ])
-      case "$gl_cv_func_getopt_long_gnu" in
-        *yes) ;;
-        *) gl_replace_getopt=yes ;;
-      esac
     fi
   fi
 ])
 
+# emacs' configure.in uses this.
 AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
 [
   GETOPT_H=getopt.h
@@ -362,6 +299,7 @@
 ])
 
 # Prerequisites of lib/getopt*.
+# emacs' configure.in uses this.
 AC_DEFUN([gl_PREREQ_GETOPT],
 [
   AC_CHECK_DECLS_ONCE([getenv])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/getpagesize.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/getpagesize.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/getpagesize.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/getpagesize.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# getpagesize.m4 serial 9
-dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2014 Free Software Foundation,
+# getpagesize.m4 serial 8
+dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2010 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,
@@ -24,6 +24,7 @@
   case "$host_os" in
     mingw*)
       REPLACE_GETPAGESIZE=1
+      AC_LIBOBJ([getpagesize])
       ;;
   esac
   dnl Also check whether it's declared.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/gettimeofday.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/gettimeofday.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/gettimeofday.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/gettimeofday.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,6 +1,6 @@
-# serial 21
+# serial 15
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2010 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.
@@ -17,6 +17,8 @@
   gl_gettimeofday_timezone=void
   if test $ac_cv_func_gettimeofday != yes; then
     HAVE_GETTIMEOFDAY=0
+    AC_LIBOBJ([gettimeofday])
+    gl_PREREQ_GETTIMEOFDAY
   else
     gl_FUNC_GETTIMEOFDAY_CLOBBER
     AC_CACHE_CHECK([for gettimeofday with POSIX signature],
@@ -49,24 +51,9 @@
       gl_gettimeofday_timezone='struct timezone'
     elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
       REPLACE_GETTIMEOFDAY=1
+      AC_LIBOBJ([gettimeofday])
+      gl_PREREQ_GETTIMEOFDAY
     fi
-    dnl If we override 'struct timeval', we also have to override gettimeofday.
-    if test $REPLACE_STRUCT_TIMEVAL = 1; then
-      REPLACE_GETTIMEOFDAY=1
-    fi
-    m4_ifdef([gl_FUNC_TZSET_CLOBBER], [
-      gl_FUNC_TZSET_CLOBBER
-      case "$gl_cv_func_tzset_clobber" in
-        *yes)
-          REPLACE_GETTIMEOFDAY=1
-          gl_GETTIMEOFDAY_REPLACE_LOCALTIME
-          AC_DEFINE([tzset], [rpl_tzset],
-            [Define to rpl_tzset if the wrapper function should be used.])
-          AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1],
-            [Define if tzset clobbers localtime's static buffer.])
-          ;;
-      esac
-    ])
   fi
   AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
     [Define this to 'void' or 'struct timezone' to match the system's
@@ -84,7 +71,6 @@
 AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
 [
  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
  AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer],
   [gl_cv_func_gettimeofday_clobber],
@@ -107,28 +93,24 @@
         ]])],
      [gl_cv_func_gettimeofday_clobber=no],
      [gl_cv_func_gettimeofday_clobber=yes],
-     [# When cross-compiling:
-      case "$host_os" in
-                # Guess all is fine on glibc systems.
-        *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                # If we don't know, assume the worst.
-        *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-      esac
-     ])])
-
- case "$gl_cv_func_gettimeofday_clobber" in
-   *yes)
-     REPLACE_GETTIMEOFDAY=1
-     gl_GETTIMEOFDAY_REPLACE_LOCALTIME
-     AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1],
-       [Define if gettimeofday clobbers the localtime buffer.])
-     ;;
- esac
+     dnl When crosscompiling, assume it is broken.
+     [gl_cv_func_gettimeofday_clobber=yes])])
+
+ if test $gl_cv_func_gettimeofday_clobber = yes; then
+   REPLACE_GETTIMEOFDAY=1
+   gl_GETTIMEOFDAY_REPLACE_LOCALTIME
+   AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1],
+     [Define if gettimeofday clobbers the localtime buffer.])
+ fi
 ])
 
 AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
-  REPLACE_GMTIME=1
-  REPLACE_LOCALTIME=1
+  AC_LIBOBJ([gettimeofday])
+  gl_PREREQ_GETTIMEOFDAY
+  AC_DEFINE([gmtime], [rpl_gmtime],
+    [Define to rpl_gmtime if the replacement function should be used.])
+  AC_DEFINE([localtime], [rpl_localtime],
+    [Define to rpl_localtime if the replacement function should be used.])
 ])
 
 # Prerequisites of lib/gettimeofday.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/gl_list.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/gl_list.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/gl_list.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/gl_list.m4	2010-05-24 10:42:19.000000000 +0000
@@ -0,0 +1,10 @@
+# gl_list.m4 serial 2
+dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LIST],
+[
+  AC_REQUIRE([gl_INLINE])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/gnulib-cache.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/gnulib-cache.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/gnulib-cache.m4	2014-10-16 06:00:44.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/gnulib-cache.m4	2010-06-06 20:10:10.000000000 +0000
@@ -1,51 +1,39 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
-# In projects that use version control, this file is meant to be put under
-# version control, like the configure.ac and various Makefile.am files.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=gettext-tools --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 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 --dir=gettext-tools --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 --makefile-name=Makefile.gnulib --libtool --macro-prefix=gl alloca-opt arg-nonnull atexit backupfile basename binary-io bison-i18n byteswap c++defs c-ctype c-strcase c-strcasestr c-strstr clean-temp 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 openmp ostream pipe pipe-filter-ii progname propername relocatable-prog relocatable-script sh-quote sigpipe sigprocmask 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 unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process warn-on-use wchar wctype write xalloc xconcat-filename xerror xmalloca xsetenv xstriconv xstriconveh xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([../gnulib-local])
 gl_MODULES([
   alloca-opt
-  ansi-c++-opt
+  arg-nonnull
   atexit
   backupfile
   basename
   binary-io
   bison-i18n
   byteswap
+  c++defs
   c-ctype
   c-strcase
   c-strcasestr
   c-strstr
   clean-temp
-  closedir
   closeout
   copy-file
   csharpcomp
@@ -94,23 +82,17 @@
   multiarch
   obstack
   open
-  opendir
   openmp
   ostream
+  pipe
   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
@@ -135,15 +117,15 @@
   unistd
   unistr/u16-mbtouc
   unistr/u8-mbtouc
-  unistr/u8-mbtoucr
   unistr/u8-uctomb
   uniwidth/width
   unlocked-io
   vasprintf
   verify
   wait-process
+  warn-on-use
   wchar
-  wctype-h
+  wctype
   write
   xalloc
   xconcat-filename
@@ -154,7 +136,7 @@
   xstriconveh
   xvasprintf
 ])
-gl_AVOID([ hash-tests unilbrk/u8-possible-linebreaks-tests unilbrk/ulc-width-linebreaks-tests unistr/u8-mbtouc-tests unistr/u8-mbtouc-unsafe-tests uniwidth/width-tests])
+gl_AVOID([hash-tests])
 gl_SOURCE_BASE([gnulib-lib])
 gl_M4_BASE([gnulib-m4])
 gl_PO_BASE([])
@@ -166,4 +148,3 @@
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_MACRO([])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/gnulib-common.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/gnulib-common.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/gnulib-common.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/gnulib-common.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 20
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,25 +12,11 @@
   AC_REQUIRE([gl_COMMON_BODY])
 ])
 AC_DEFUN([gl_COMMON_BODY], [
-  AH_VERBATIM([_Noreturn],
-[/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-])
   AH_VERBATIM([isoc99_inline],
 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
+   __APPLE__ && __MACH__ test for MacOS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
@@ -48,30 +34,6 @@
 /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
-
-/* gcc supports the "unused" attribute on possibly unused labels, and
-   g++ has since version 4.5.  Note to support C++ as well as C,
-   _GL_UNUSED_LABEL should be used with a trailing ;  */
-#if !defined __cplusplus || __GNUC__ > 4 \
-    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-# define _GL_UNUSED_LABEL _GL_UNUSED
-#else
-# define _GL_UNUSED_LABEL
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
 ])
   dnl Preparation for running test programs:
   dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
@@ -85,49 +47,16 @@
 # expands to a C preprocessor expression that evaluates to 1 or 0, depending
 # whether a gnulib module that has been requested shall be considered present
 # or not.
-m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
 
 # gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
 # sets the shell variable that indicates the presence of the given module to
 # a C preprocessor expression that will evaluate to 1.
 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
 [
-  gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
-    [GNULIB_[]m4_translit([[$1]],
-                          [abcdefghijklmnopqrstuvwxyz./-],
-                          [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
-    [gl_MODULE_INDICATOR_CONDITION])
-])
-
-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
-# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
-# The shell variable's value is a C preprocessor expression that evaluates
-# to 0 or 1.
-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
-[
-  m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
-    [
-     dnl Simplify the expression VALUE || 1 to 1.
-     $1=1
-    ],
-    [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
-                                             [gl_MODULE_INDICATOR_CONDITION])])
-])
-
-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
-# modifies the shell variable to include the given condition.  The shell
-# variable's value is a C preprocessor expression that evaluates to 0 or 1.
-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
-[
-  dnl Simplify the expression 1 || CONDITION to 1.
-  if test "$[]$1" != 1; then
-    dnl Simplify the expression 0 || CONDITION to CONDITION.
-    if test "$[]$1" = 0; then
-      $1=$2
-    else
-      $1="($[]$1 || $2)"
-    fi
-  fi
+  GNULIB_[]m4_translit([[$1]],
+    [abcdefghijklmnopqrstuvwxyz./-],
+    [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
 ])
 
 # gl_MODULE_INDICATOR([modulename])
@@ -173,40 +102,6 @@
     [Define to 1 when the gnulib module $1 should be tested.])
 ])
 
-# gl_ASSERT_NO_GNULIB_POSIXCHECK
-# asserts that there will never be a need to #define GNULIB_POSIXCHECK.
-# and thereby enables an optimization of configure and config.h.
-# Used by Emacs.
-AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK],
-[
-  dnl Override gl_WARN_ON_USE_PREPARE.
-  dnl But hide this definition from 'aclocal'.
-  AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
-])
-
-# gl_ASSERT_NO_GNULIB_TESTS
-# asserts that there will be no gnulib tests in the scope of the configure.ac
-# and thereby enables an optimization of config.h.
-# Used by Emacs.
-AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS],
-[
-  dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
-  AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
-])
-
-# Test whether <features.h> exists.
-# Set HAVE_FEATURES_H.
-AC_DEFUN([gl_FEATURES_H],
-[
-  AC_CHECK_HEADERS_ONCE([features.h])
-  if test $ac_cv_header_features_h = yes; then
-    HAVE_FEATURES_H=1
-  else
-    HAVE_FEATURES_H=0
-  fi
-  AC_SUBST([HAVE_FEATURES_H])
-])
-
 # m4_foreach_w
 # is a backport of autoconf-2.59c's m4_foreach_w.
 # Remove this macro when we can assume autoconf >= 2.60.
@@ -222,90 +117,11 @@
 [m4_define([AS_VAR_IF],
 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
 
-# gl_PROG_CC_C99
-# Modifies the value of the shell variable CC in an attempt to make $CC
-# understand ISO C99 source code.
-# This is like AC_PROG_CC_C99, except that
-# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
-# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
-#   but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
-# Remaining problems:
-# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
-#   to CC twice
-#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
-# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
-AC_DEFUN([gl_PROG_CC_C99],
-[
-  dnl Change that version number to the minimum Autoconf version that supports
-  dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
-  m4_version_prereq([9.0],
-    [AC_REQUIRE([AC_PROG_CC_C99])],
-    [AC_REQUIRE([AC_PROG_CC_STDC])])
-])
-
-# gl_PROG_AR_RANLIB
-# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
-# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
-# the values.
-AC_DEFUN([gl_PROG_AR_RANLIB],
-[
-  dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
-  dnl as "cc", and GCC as "gcc". They have different object file formats and
-  dnl library formats. In particular, the GNU binutils programs ar, ranlib
-  dnl produce libraries that work only with gcc, not with cc.
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
-    [
-      AC_EGREP_CPP([Amsterdam],
-        [
-#ifdef __ACK__
-Amsterdam
-#endif
-        ],
-        [gl_cv_c_amsterdam_compiler=yes],
-        [gl_cv_c_amsterdam_compiler=no])
-    ])
-  if test -z "$AR"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      AR='cc -c.a'
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='-o'
-      fi
-    else
-      dnl Use the Automake-documented default values for AR and ARFLAGS,
-      dnl but prefer ${host}-ar over ar (useful for cross-compiling).
-      AC_CHECK_TOOL([AR], [ar], [ar])
-      if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
-      fi
-    fi
-  else
-    if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
-    fi
-  fi
-  AC_SUBST([AR])
-  AC_SUBST([ARFLAGS])
-  if test -z "$RANLIB"; then
-    if test $gl_cv_c_amsterdam_compiler = yes; then
-      RANLIB=':'
-    else
-      dnl Use the ranlib program if it is available.
-      AC_PROG_RANLIB
-    fi
-  fi
-  AC_SUBST([RANLIB])
-])
-
 # AC_PROG_MKDIR_P
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
 # for interoperability with automake-1.9.6 from autoconf-2.62.
 # Remove this macro when we can assume autoconf >= 2.62 or
 # autoconf >= 2.60 && automake >= 1.10.
-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
-m4_ifndef([AC_AUTOCONF_VERSION],[
 m4_ifdef([AC_PROG_MKDIR_P], [
   dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
   m4_define([AC_PROG_MKDIR_P],
@@ -316,31 +132,27 @@
     [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
      MKDIR_P='$(mkdir_p)'
      AC_SUBST([MKDIR_P])])])
-])
 
 # AC_C_RESTRICT
-# This definition is copied from post-2.69 Autoconf and overrides the
-# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
-# once autoconf >= 2.70 can be assumed.  It's painful to check version
-# numbers, and in practice this macro is more up-to-date than Autoconf
-# is, so override Autoconf unconditionally.
+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
+# works.
+# This definition can be removed once autoconf >= 2.62 can be assumed.
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
 AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-	 [[typedef int *int_ptr;
-	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
-	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
-	   int bar (int ip[$ac_kw]) { return ip[0]; }
-	 ]],
-	 [[int s[1];
-	   int *$ac_kw t = s;
-	   t[0] = 0;
-	   return foo (t) + bar (t);
-	 ]])],
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[typedef int * int_ptr;
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
+       }]],
+      [[int s[1];
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)]])],
       [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break
    done
@@ -350,21 +162,21 @@
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
-# define __restrict__
 #endif])
  case $ac_cv_c_restrict in
    restrict) ;;
    no) AC_DEFINE([restrict], []) ;;
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac
-])# AC_C_RESTRICT
+])
+])
 
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
@@ -387,63 +199,3 @@
   AC_CACHE_VAL([$1], [$2])
   as_echo_n="$saved_as_echo_n"
 ])
-
-# AS_VAR_COPY was added in autoconf 2.63b
-m4_define_default([AS_VAR_COPY],
-[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
-
-# AC_PROG_SED was added in autoconf 2.59b
-m4_ifndef([AC_PROG_SED],
-[AC_DEFUN([AC_PROG_SED],
-[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
-    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
-     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
-     ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     AS_UNSET([ac_script])
-     if test -z "$SED"; then
-       ac_path_SED_found=false
-       _AS_PATH_WALK([], [
-         for ac_prog in sed gsed; do
-           for ac_exec_ext in '' $ac_executable_extensions; do
-             ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-             AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
-             case `"$ac_path_SED" --version 2>&1` in
-               *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
-               *)
-                 ac_count=0
-                 _AS_ECHO_N([0123456789]) >conftest.in
-                 while :
-                 do
-                   cat conftest.in conftest.in >conftest.tmp
-                   mv conftest.tmp conftest.in
-                   cp conftest.in conftest.nl
-                   echo >> conftest.nl
-                   "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-                   diff conftest.out conftest.nl >/dev/null 2>&1 || break
-                   ac_count=`expr $ac_count + 1`
-                   if test $ac_count -gt ${ac_path_SED_max-0}; then
-                     # Best so far, but keep looking for better
-                     ac_cv_path_SED=$ac_path_SED
-                     ac_path_SED_max=$ac_count
-                   fi
-                   test $ac_count -gt 10 && break
-                 done
-                 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-             esac
-             $ac_path_SED_found && break 3
-           done
-         done])
-       if test -z "$ac_cv_path_SED"; then
-         AC_ERROR([no acceptable sed could be found in \$PATH])
-       fi
-     else
-       ac_cv_path_SED=$SED
-     fi
- SED="$ac_cv_path_SED"
- AC_SUBST([SED])dnl
- rm -f conftest.sed
-])])])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/gnulib-comp.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/gnulib-comp.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/gnulib-comp.m4	2014-10-16 06:00:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/gnulib-comp.m4	2010-06-06 13:12:21.000000000 +0000
@@ -1,22 +1,10 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -24,8 +12,7 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects that use version control, this file can be treated like
-# other built files.
+# In projects using CVS, this file can be treated like other built files.
 
 
 # This macro should be invoked from gettext-tools/configure.ac, in the section
@@ -37,17 +24,17 @@
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([gl_PROG_AR_RANLIB])
+  AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
-  # Code from module absolute-header:
   # Code from module acl:
   # Code from module acl-tests:
+  # Code from module alignof:
+  # Code from module alignof-tests:
   # Code from module alloca-opt:
   # Code from module alloca-opt-tests:
-  # Code from module allocator:
-  # Code from module ansi-c++-opt:
   # Code from module areadlink:
   # Code from module areadlink-tests:
+  # Code from module arg-nonnull:
   # Code from module argmatch:
   # Code from module argmatch-tests:
   # Code from module array-list:
@@ -59,10 +46,9 @@
   # Code from module binary-io:
   # Code from module binary-io-tests:
   # Code from module bison-i18n:
-  # Code from module btowc:
-  # Code from module btowc-tests:
   # Code from module byteswap:
   # Code from module byteswap-tests:
+  # Code from module c++defs:
   # Code from module c-ctype:
   # Code from module c-ctype-tests:
   # Code from module c-strcase:
@@ -74,14 +60,10 @@
   # Code from module c-strstr-tests:
   # Code from module canonicalize-lgpl:
   # Code from module canonicalize-lgpl-tests:
-  # Code from module careadlinkat:
   # Code from module classpath:
   # Code from module clean-temp:
   # Code from module cloexec:
   # Code from module cloexec-tests:
-  # Code from module close:
-  # Code from module close-tests:
-  # Code from module closedir:
   # Code from module closeout:
   # Code from module concat-filename:
   # Code from module configmake:
@@ -92,12 +74,7 @@
   # Code from module csharpexec:
   # Code from module csharpexec-script:
   # Code from module diffseq:
-  # Code from module dirent:
-  # Code from module dirent-tests:
-  # Code from module dosname:
   # Code from module double-slash-root:
-  # Code from module dup:
-  # Code from module dup-tests:
   # Code from module dup2:
   # Code from module dup2-tests:
   # Code from module environ:
@@ -110,48 +87,27 @@
   # Code from module exitfail:
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  # Code from module extern-inline:
   # Code from module fatal-signal:
   # Code from module fcntl:
   # Code from module fcntl-h:
   # Code from module fcntl-h-tests:
   # Code from module fcntl-tests:
-  # Code from module fd-hook:
   # Code from module fd-ostream:
   # Code from module fd-safer-flag:
-  # Code from module fdopen:
-  # Code from module fdopen-tests:
-  # Code from module fgetc-tests:
   # Code from module file-ostream:
   # Code from module filename:
   # Code from module findprog:
   # Code from module float:
-  # Code from module float-tests:
   # Code from module fnmatch:
   # Code from module fnmatch-tests:
   # Code from module fopen:
   # Code from module fopen-tests:
-  # Code from module fpieee:
-  AC_REQUIRE([gl_FP_IEEE])
-  # Code from module fpucw:
-  # Code from module fputc-tests:
-  # Code from module fread-tests:
-  # Code from module fstat:
-  # Code from module fstat-tests:
   # Code from module fstrcmp:
   # Code from module fstrcmp-tests:
-  # Code from module ftell:
-  # Code from module ftell-tests:
-  # Code from module ftello:
-  AC_REQUIRE([AC_FUNC_FSEEKO])
-  # Code from module ftello-tests:
   # Code from module full-write:
-  # Code from module fwrite-tests:
   # Code from module fwriteerror:
   # Code from module gcd:
   # Code from module gcj:
-  # Code from module getcwd-lgpl:
-  # Code from module getcwd-lgpl-tests:
   # Code from module getdelim:
   # Code from module getdelim-tests:
   # Code from module getdtablesize:
@@ -178,24 +134,15 @@
   # Code from module iconv-tests:
   # Code from module iconv_open:
   # Code from module ignore-value:
-  # Code from module ignore-value-tests:
   # Code from module include_next:
   # Code from module inline:
   # Code from module intprops:
-  # Code from module intprops-tests:
-  # Code from module inttypes:
-  # Code from module inttypes-incomplete:
-  # Code from module inttypes-tests:
-  # Code from module iswblank:
-  # Code from module iswblank-tests:
   # Code from module java:
   # Code from module javacomp:
   # Code from module javacomp-script:
   # Code from module javaexec:
   # Code from module javaexec-script:
   # Code from module javaversion:
-  # Code from module largefile:
-  AC_REQUIRE([AC_SYS_LARGEFILE])
   # Code from module libcroco:
   # Code from module libglib:
   # Code from module libunistring-optional:
@@ -210,8 +157,6 @@
   # Code from module localename-tests:
   # Code from module lock:
   # Code from module lock-tests:
-  # Code from module lseek:
-  # Code from module lseek-tests:
   # Code from module lstat:
   # Code from module lstat-tests:
   # Code from module malloc-posix:
@@ -229,7 +174,6 @@
   # Code from module mbsstr:
   # Code from module mbsstr-tests:
   # Code from module mbswidth:
-  # Code from module mbtowc:
   # Code from module mbuiter:
   # Code from module memchr:
   # Code from module memchr-tests:
@@ -239,31 +183,25 @@
   # Code from module mkdtemp:
   # Code from module moo:
   # Code from module moo-tests:
-  # Code from module msvc-inval:
-  # Code from module msvc-nothrow:
   # Code from module multiarch:
   # Code from module no-c++:
-  # Code from module nocrash:
   # Code from module obstack:
   # Code from module open:
   # Code from module open-tests:
-  # Code from module opendir:
   # Code from module openmp:
   # Code from module ostream:
   # Code from module pathmax:
-  # Code from module pathmax-tests:
+  # Code from module pipe:
   # Code from module pipe-filter-ii:
   # Code from module pipe-filter-ii-tests:
+  # Code from module pipe-tests:
   # Code from module pipe2:
   # Code from module pipe2-safer:
   # Code from module pipe2-tests:
   # Code from module posix_spawn-internal:
   # Code from module posix_spawn_file_actions_addclose:
-  # Code from module posix_spawn_file_actions_addclose-tests:
   # Code from module posix_spawn_file_actions_adddup2:
-  # Code from module posix_spawn_file_actions_adddup2-tests:
   # Code from module posix_spawn_file_actions_addopen:
-  # Code from module posix_spawn_file_actions_addopen-tests:
   # Code from module posix_spawn_file_actions_destroy:
   # Code from module posix_spawn_file_actions_init:
   # Code from module posix_spawnattr_destroy:
@@ -275,20 +213,14 @@
   # Code from module progname:
   # Code from module propername:
   # Code from module putenv:
-  # Code from module qacl:
   # Code from module quote:
   # Code from module quotearg:
   # Code from module quotearg-simple:
   # Code from module quotearg-simple-tests:
-  # Code from module raise:
-  # Code from module raise-tests:
   # Code from module rawmemchr:
   # Code from module rawmemchr-tests:
-  # Code from module read:
   # Code from module read-file:
   # Code from module read-file-tests:
-  # Code from module read-tests:
-  # Code from module readdir:
   # Code from module readlink:
   # Code from module readlink-tests:
   # Code from module realloc-posix:
@@ -302,34 +234,20 @@
   # Code from module same-inode:
   # Code from module sched:
   # Code from module sched-tests:
-  # Code from module secure_getenv:
   # Code from module setenv:
   # Code from module setenv-tests:
-  # Code from module setlocale:
-  # Code from module setlocale-tests:
   # Code from module sh-quote:
-  # Code from module sh-quote-tests:
   # Code from module sigaction:
   # Code from module sigaction-tests:
-  # Code from module signal-h:
-  # Code from module signal-h-tests:
+  # Code from module signal:
+  # Code from module signal-tests:
   # Code from module sigpipe:
   # Code from module sigpipe-tests:
   # Code from module sigprocmask:
-  # Code from module sigprocmask-tests:
   # Code from module size_max:
-  # Code from module sleep:
-  # Code from module sleep-tests:
-  # Code from module snippet/_Noreturn:
-  # Code from module snippet/arg-nonnull:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/unused-parameter:
-  # Code from module snippet/warn-on-use:
   # Code from module snprintf:
   # Code from module snprintf-tests:
   # Code from module spawn:
-  # Code from module spawn-pipe:
-  # Code from module spawn-pipe-tests:
   # Code from module spawn-tests:
   # Code from module ssize_t:
   # Code from module stat:
@@ -337,9 +255,9 @@
   # Code from module stdarg:
   dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
   dnl for the builtin va_copy to work.  With Autoconf 2.60 or later,
-  dnl gl_PROG_CC_C99 arranges for this.  With older Autoconf gl_PROG_CC_C99
+  dnl AC_PROG_CC_STDC arranges for this.  With older Autoconf AC_PROG_CC_STDC
   dnl shouldn't hurt, though installers are on their own to set c99 mode.
-  gl_PROG_CC_C99
+  AC_REQUIRE([AC_PROG_CC_STDC])
   # Code from module stdbool:
   # Code from module stdbool-tests:
   # Code from module stddef:
@@ -357,7 +275,6 @@
   # Code from module strcspn:
   # Code from module streq:
   # Code from module strerror:
-  # Code from module strerror-override:
   # Code from module strerror-tests:
   # Code from module striconv:
   # Code from module striconv-tests:
@@ -368,27 +285,24 @@
   # Code from module string:
   # Code from module string-tests:
   # Code from module strnlen:
-  # Code from module strnlen-tests:
   # Code from module strnlen1:
   # Code from module strpbrk:
   # Code from module strstr:
   # Code from module strstr-simple:
   # Code from module strstr-tests:
   # Code from module strtol:
-  # Code from module strtol-tests:
   # Code from module strtoul:
-  # Code from module strtoul-tests:
   # Code from module styled-ostream:
   # Code from module symlink:
   # Code from module symlink-tests:
   # Code from module sys_select:
   # Code from module sys_select-tests:
+  # Code from module sys_socket:
+  # Code from module sys_socket-tests:
   # Code from module sys_stat:
   # Code from module sys_stat-tests:
   # Code from module sys_time:
   # Code from module sys_time-tests:
-  # Code from module sys_types:
-  # Code from module sys_types-tests:
   # Code from module sys_wait:
   # Code from module sys_wait-tests:
   # Code from module tempname:
@@ -397,10 +311,7 @@
   # Code from module term-styled-ostream:
   # Code from module terminfo:
   # Code from module terminfo-h:
-  # Code from module test-framework-sh:
-  # Code from module test-framework-sh-tests:
   # Code from module thread:
-  # Code from module thread-tests:
   # Code from module threadlib:
   gl_THREADLIB_EARLY
   # Code from module time:
@@ -415,10 +326,12 @@
   # Code from module unilbrk/base:
   # Code from module unilbrk/tables:
   # Code from module unilbrk/u8-possible-linebreaks:
+  # Code from module unilbrk/u8-possible-linebreaks-tests:
   # Code from module unilbrk/u8-width-linebreaks:
   # Code from module unilbrk/u8-width-linebreaks-tests:
   # Code from module unilbrk/ulc-common:
   # Code from module unilbrk/ulc-width-linebreaks:
+  # Code from module unilbrk/ulc-width-linebreaks-tests:
   # Code from module uniname/base:
   # Code from module uniname/uniname:
   # Code from module uniname/uniname-tests:
@@ -436,7 +349,9 @@
   # Code from module unistr/u8-mblen:
   # Code from module unistr/u8-mblen-tests:
   # Code from module unistr/u8-mbtouc:
+  # Code from module unistr/u8-mbtouc-tests:
   # Code from module unistr/u8-mbtouc-unsafe:
+  # Code from module unistr/u8-mbtouc-unsafe-tests:
   # Code from module unistr/u8-mbtoucr:
   # Code from module unistr/u8-mbtoucr-tests:
   # Code from module unistr/u8-prev:
@@ -448,9 +363,11 @@
   # Code from module unitypes:
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
+  # Code from module uniwidth/width-tests:
   # Code from module unlocked-io:
   # Code from module unsetenv:
   # Code from module unsetenv-tests:
+  # Code from module unused-parameter:
   # Code from module vasnprintf:
   # Code from module vasnprintf-tests:
   # Code from module vasprintf:
@@ -460,19 +377,15 @@
   # Code from module vsnprintf:
   # Code from module vsnprintf-tests:
   # Code from module wait-process:
-  # Code from module waitpid:
+  # Code from module warn-on-use:
   # Code from module wchar:
   # Code from module wchar-tests:
-  # Code from module wcrtomb:
-  # Code from module wcrtomb-tests:
   # Code from module wctob:
-  # Code from module wctomb:
-  # Code from module wctype-h:
-  # Code from module wctype-h-tests:
+  # Code from module wctype:
+  # Code from module wctype-tests:
   # Code from module wcwidth:
   # Code from module wcwidth-tests:
   # Code from module write:
-  # Code from module write-tests:
   # Code from module xalloc:
   # Code from module xalloc-die:
   # Code from module xalloc-die-tests:
@@ -504,414 +417,370 @@
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='gnulib-lib'
+  # Code from module acl:
+  gl_FUNC_ACL
+  # Code from module alignof:
+  # Code from module alloca-opt:
   gl_FUNC_ALLOCA
-  gl_PROG_ANSI_CXX([CXX], [ANSICXX])
+  # Code from module areadlink:
+  # Code from module arg-nonnull:
+  # Code from module argmatch:
+  gl_ARGMATCH
+  # Code from module array-list:
+  # Code from module atexit:
   gl_FUNC_ATEXIT
-  if test $ac_cv_func_atexit = no; then
-    AC_LIBOBJ([atexit])
-    gl_PREREQ_ATEXIT
-  fi
+  # Code from module backupfile:
   gt_PREREQ_BACKUPFILE
+  # Code from module basename:
+  # Code from module binary-io:
+  # Code from module bison-i18n:
   BISON_I18N
+  # Code from module byteswap:
   gl_BYTESWAP
+  # Code from module c++defs:
+  # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module c-strcaseeq:
+  # Code from module c-strcasestr:
+  # Code from module c-strstr:
+  # Code from module canonicalize-lgpl:
   gl_CANONICALIZE_LGPL
-  if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
-    AC_LIBOBJ([canonicalize-lgpl])
-  fi
   gl_MODULE_INDICATOR([canonicalize-lgpl])
   gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
   gl_STDLIB_MODULE_INDICATOR([realpath])
-  AC_CHECK_FUNCS_ONCE([readlinkat])
+  # Code from module classpath:
+  # Code from module clean-temp:
   AC_DEFINE([SIGNAL_SAFE_LIST], [1], [Define if lists must be signal-safe.])
+  # Code from module cloexec:
+  gl_CLOEXEC
   gl_MODULE_INDICATOR_FOR_TESTS([cloexec])
-  gl_FUNC_CLOSE
-  if test $REPLACE_CLOSE = 1; then
-    AC_LIBOBJ([close])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([close])
-  gl_FUNC_CLOSEDIR
-  if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
-    AC_LIBOBJ([closedir])
-  fi
-  gl_DIRENT_MODULE_INDICATOR([closedir])
-  gl_CONFIGMAKE_PREP
+  # Code from module closeout:
+  # Code from module concat-filename:
+  # Code from module configmake:
+  # Code from module copy-file:
   gl_COPY_FILE
+  # Code from module csharpcomp:
+  # Code from module csharpcomp-script:
   AC_REQUIRE([gt_CSHARPCOMP])
   AC_CONFIG_FILES([csharpcomp.sh:../build-aux/csharpcomp.sh.in])
+  # Code from module csharpexec:
+  # Code from module csharpexec-script:
   # You need to invoke gt_CSHARPEXEC yourself, possibly with arguments.
   AC_CONFIG_FILES([csharpexec.sh:../build-aux/csharpexec.sh.in])
-  gl_DIRENT_H
+  # Code from module diffseq:
+  # Code from module double-slash-root:
   gl_DOUBLE_SLASH_ROOT
+  # Code from module dup2:
   gl_FUNC_DUP2
-  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
-    AC_LIBOBJ([dup2])
-    gl_PREREQ_DUP2
-  fi
   gl_UNISTD_MODULE_INDICATOR([dup2])
+  # Code from module environ:
   gl_ENVIRON
   gl_UNISTD_MODULE_INDICATOR([environ])
+  # Code from module errno:
   gl_HEADER_ERRNO_H
+  # Code from module error:
   gl_ERROR
-  if test $ac_cv_lib_error_at_line = no; then
-    AC_LIBOBJ([error])
-    gl_PREREQ_ERROR
-  fi
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+  # Code from module error-progname:
+  # Code from module execute:
   gl_EXECUTE
-  AC_REQUIRE([gl_EXTERN_INLINE])
+  # Code from module exitfail:
+  # Code from module extensions:
+  # Code from module fatal-signal:
   gl_FATAL_SIGNAL
+  # Code from module fcntl:
   gl_FUNC_FCNTL
-  if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then
-    AC_LIBOBJ([fcntl])
-  fi
   gl_FCNTL_MODULE_INDICATOR([fcntl])
+  # Code from module fcntl-h:
   gl_FCNTL_H
+  # Code from module fd-ostream:
+  # Code from module fd-safer-flag:
   gl_MODULE_INDICATOR([fd-safer-flag])
+  # Code from module file-ostream:
+  # Code from module filename:
+  # Code from module findprog:
   gl_FINDPROG
+  # Code from module float:
   gl_FLOAT_H
-  if test $REPLACE_FLOAT_LDBL = 1; then
-    AC_LIBOBJ([float])
-  fi
-  if test $REPLACE_ITOLD = 1; then
-    AC_LIBOBJ([itold])
-  fi
+  # Code from module fnmatch:
   gl_FUNC_FNMATCH_POSIX
-  if test -n "$FNMATCH_H"; then
-    AC_LIBOBJ([fnmatch])
-    gl_PREREQ_FNMATCH
-  fi
+  # Code from module fopen:
   gl_FUNC_FOPEN
-  if test $REPLACE_FOPEN = 1; then
-    AC_LIBOBJ([fopen])
-    gl_PREREQ_FOPEN
-  fi
   gl_STDIO_MODULE_INDICATOR([fopen])
-  gl_FUNC_FSTAT
-  if test $REPLACE_FSTAT = 1; then
-    AC_LIBOBJ([fstat])
-    gl_PREREQ_FSTAT
-  fi
-  gl_SYS_STAT_MODULE_INDICATOR([fstat])
+  # Code from module fstrcmp:
+  # Code from module full-write:
+  # Code from module fwriteerror:
   gl_MODULE_INDICATOR([fwriteerror])
+  # Code from module gcd:
+  # Code from module gcj:
   gt_GCJ
+  # Code from module getdelim:
   gl_FUNC_GETDELIM
-  if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
-    AC_LIBOBJ([getdelim])
-    gl_PREREQ_GETDELIM
-  fi
   gl_STDIO_MODULE_INDICATOR([getdelim])
+  # Code from module getdtablesize:
   gl_FUNC_GETDTABLESIZE
-  if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
-    AC_LIBOBJ([getdtablesize])
-    gl_PREREQ_GETDTABLESIZE
-  fi
   gl_UNISTD_MODULE_INDICATOR([getdtablesize])
+  # Code from module getline:
   gl_FUNC_GETLINE
-  if test $REPLACE_GETLINE = 1; then
-    AC_LIBOBJ([getline])
-    gl_PREREQ_GETLINE
-  fi
   gl_STDIO_MODULE_INDICATOR([getline])
+  # Code from module getopt-gnu:
   gl_FUNC_GETOPT_GNU
-  if test $REPLACE_GETOPT = 1; then
-    AC_LIBOBJ([getopt])
-    AC_LIBOBJ([getopt1])
-    gl_PREREQ_GETOPT
-    dnl Arrange for unistd.h to include getopt.h.
-    GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
-  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
   gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
+  # Code from module getopt-posix:
   gl_FUNC_GETOPT_POSIX
-  if test $REPLACE_GETOPT = 1; then
-    AC_LIBOBJ([getopt])
-    AC_LIBOBJ([getopt1])
-    gl_PREREQ_GETOPT
-    dnl Arrange for unistd.h to include getopt.h.
-    GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
-  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
+  # Code from module gettext:
   dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
-  AM_GNU_GETTEXT_VERSION([0.18.1])
+  AM_GNU_GETTEXT_VERSION([0.18])
+  # Code from module gettext-h:
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
+  # Code from module gettext-tools-misc:
+  # Code from module gettimeofday:
   gl_FUNC_GETTIMEOFDAY
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
-    AC_LIBOBJ([gettimeofday])
-    gl_PREREQ_GETTIMEOFDAY
-  fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  # Code from module gperf:
+  # Code from module hash:
+  # Code from module havelib:
+  # Code from module html-ostream:
+  # Code from module html-styled-ostream:
+  # Code from module iconv:
   AM_ICONV
-  m4_ifdef([gl_ICONV_MODULE_INDICATOR],
-    [gl_ICONV_MODULE_INDICATOR([iconv])])
+  # Code from module iconv-h:
   gl_ICONV_H
+  # Code from module iconv_open:
   gl_FUNC_ICONV_OPEN
-  if test $REPLACE_ICONV_OPEN = 1; then
-    AC_LIBOBJ([iconv_open])
-  fi
-  if test $REPLACE_ICONV = 1; then
-    AC_LIBOBJ([iconv])
-    AC_LIBOBJ([iconv_close])
-  fi
+  # Code from module include_next:
+  # Code from module inline:
   gl_INLINE
-  gl_FUNC_ISWBLANK
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-      AC_LIBOBJ([iswblank])
-    fi
-  fi
-  gl_WCTYPE_MODULE_INDICATOR([iswblank])
+  # Code from module intprops:
+  # Code from module java:
   gt_JAVA_CHOICE
+  # Code from module javacomp:
+  # Code from module javacomp-script:
   # You need to invoke gt_JAVACOMP yourself, possibly with arguments.
   AC_CONFIG_FILES([javacomp.sh:../build-aux/javacomp.sh.in])
+  # Code from module javaexec:
+  # Code from module javaexec-script:
   # You need to invoke gt_JAVAEXEC yourself, possibly with arguments.
   AC_CONFIG_FILES([javaexec.sh:../build-aux/javaexec.sh.in])
-  AC_REQUIRE([gl_LARGEFILE])
+  # Code from module javaversion:
+  # Code from module libcroco:
   gl_LIBCROCO
+  # Code from module libglib:
   gl_LIBGLIB
+  # Code from module libunistring-optional:
   gl_LIBUNISTRING_OPTIONAL
+  # Code from module libxml:
   gl_LIBXML
+  # Code from module linkedhash-list:
+  # Code from module list:
+  gl_LIST
+  # Code from module localcharset:
   gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+  # Code from module locale:
   gl_LOCALE_H
+  # Code from module localename:
   gl_LOCALENAME
+  # Code from module lock:
   gl_LOCK
-  gl_MODULE_INDICATOR([lock])
+  # Code from module lstat:
   gl_FUNC_LSTAT
-  if test $REPLACE_LSTAT = 1; then
-    AC_LIBOBJ([lstat])
-    gl_PREREQ_LSTAT
-  fi
   gl_SYS_STAT_MODULE_INDICATOR([lstat])
+  # Code from module malloc-posix:
   gl_FUNC_MALLOC_POSIX
-  if test $REPLACE_MALLOC = 1; then
-    AC_LIBOBJ([malloc])
-  fi
   gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+  # Code from module malloca:
   gl_MALLOCA
+  # Code from module mbchar:
   gl_MBCHAR
+  # Code from module mbiter:
   gl_MBITER
+  # Code from module mbrtowc:
   gl_FUNC_MBRTOWC
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-    AC_LIBOBJ([mbrtowc])
-    gl_PREREQ_MBRTOWC
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
+  # Code from module mbsinit:
   gl_FUNC_MBSINIT
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-    AC_LIBOBJ([mbsinit])
-    gl_PREREQ_MBSINIT
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
+  # Code from module mbslen:
   gl_FUNC_MBSLEN
   gl_STRING_MODULE_INDICATOR([mbslen])
+  # Code from module mbsrtowcs:
   gl_FUNC_MBSRTOWCS
-  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
-    AC_LIBOBJ([mbsrtowcs])
-    AC_LIBOBJ([mbsrtowcs-state])
-    gl_PREREQ_MBSRTOWCS
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbsrtowcs])
+  # Code from module mbsstr:
   gl_STRING_MODULE_INDICATOR([mbsstr])
+  # Code from module mbswidth:
   gl_MBSWIDTH
+  # Code from module mbuiter:
   gl_MBITER
+  # Code from module memchr:
   gl_FUNC_MEMCHR
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-    AC_LIBOBJ([memchr])
-    gl_PREREQ_MEMCHR
-  fi
   gl_STRING_MODULE_INDICATOR([memchr])
+  # Code from module memmove:
   gl_FUNC_MEMMOVE
-  if test $ac_cv_func_memmove = no; then
-    AC_LIBOBJ([memmove])
-    gl_PREREQ_MEMMOVE
-  fi
+  # Code from module memset:
   gl_FUNC_MEMSET
-  if test $ac_cv_func_memset = no; then
-    AC_LIBOBJ([memset])
-    gl_PREREQ_MEMSET
-  fi
+  # Code from module minmax:
   gl_MINMAX
-  gl_FUNC_MKDTEMP
-  if test $HAVE_MKDTEMP = 0; then
-    AC_LIBOBJ([mkdtemp])
-    gl_PREREQ_MKDTEMP
-  fi
+  # Code from module mkdtemp:
+  gt_FUNC_MKDTEMP
   gl_STDLIB_MODULE_INDICATOR([mkdtemp])
+  # Code from module moo:
   gl_MOO
-  gl_MSVC_INVAL
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-inval])
-  fi
-  gl_MSVC_NOTHROW
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-nothrow])
-  fi
+  # Code from module multiarch:
   gl_MULTIARCH
+  # Code from module no-c++:
   gt_NO_CXX
+  # Code from module obstack:
   AC_FUNC_OBSTACK
   dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]).
+  # Code from module open:
   gl_FUNC_OPEN
-  if test $REPLACE_OPEN = 1; then
-    AC_LIBOBJ([open])
-    gl_PREREQ_OPEN
-  fi
   gl_FCNTL_MODULE_INDICATOR([open])
-  gl_FUNC_OPENDIR
-  if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then
-    AC_LIBOBJ([opendir])
-  fi
-  gl_DIRENT_MODULE_INDICATOR([opendir])
+  # Code from module openmp:
   AC_OPENMP
+  # Code from module ostream:
+  # Code from module pathmax:
   gl_PATHMAX
+  # Code from module pipe:
+  gl_PIPE
+  # Code from module pipe-filter-ii:
+  AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_FUNCS_ONCE([select])
+  # Code from module pipe2:
   gl_FUNC_PIPE2
   gl_UNISTD_MODULE_INDICATOR([pipe2])
+  # Code from module pipe2-safer:
   gl_MODULE_INDICATOR([pipe2-safer])
-  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then
+  # Code from module posix_spawn-internal:
+  # Code from module posix_spawn_file_actions_addclose:
+  gl_POSIX_SPAWN
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_addclose])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
-  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then
+  # Code from module posix_spawn_file_actions_adddup2:
+  gl_POSIX_SPAWN
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_adddup2])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2])
-  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then
+  # Code from module posix_spawn_file_actions_addopen:
+  gl_POSIX_SPAWN
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_addopen])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen])
+  # Code from module posix_spawn_file_actions_destroy:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_destroy])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_destroy])
+  # Code from module posix_spawn_file_actions_init:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_init])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_init])
+  # Code from module posix_spawnattr_destroy:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_destroy])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_destroy])
+  # Code from module posix_spawnattr_init:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_init])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_init])
+  # Code from module posix_spawnattr_setflags:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_setflags])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setflags])
+  # Code from module posix_spawnattr_setsigmask:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_setsigmask])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigmask])
+  # Code from module posix_spawnp:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnp])
-    AC_LIBOBJ([spawni])
-    gl_PREREQ_POSIX_SPAWN_INTERNAL
+    gl_POSIX_SPAWN_INTERNAL
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnp])
+  # Code from module progname:
   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+  # Code from module propername:
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'])
      AM_][XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])])
-  gl_FUNC_ACL
+  # Code from module quote:
   gl_QUOTE
+  # Code from module quotearg:
   gl_QUOTEARG
-  gl_FUNC_RAISE
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
-    AC_LIBOBJ([raise])
-    gl_PREREQ_RAISE
-  fi
-  gl_SIGNAL_MODULE_INDICATOR([raise])
+  # Code from module quotearg-simple:
+  # Code from module rawmemchr:
   gl_FUNC_RAWMEMCHR
-  if test $HAVE_RAWMEMCHR = 0; then
-    AC_LIBOBJ([rawmemchr])
-    gl_PREREQ_RAWMEMCHR
-  fi
   gl_STRING_MODULE_INDICATOR([rawmemchr])
-  gl_FUNC_READ
-  if test $REPLACE_READ = 1; then
-    AC_LIBOBJ([read])
-    gl_PREREQ_READ
-  fi
-  gl_UNISTD_MODULE_INDICATOR([read])
-  gl_FUNC_READDIR
-  if test $HAVE_READDIR = 0; then
-    AC_LIBOBJ([readdir])
-  fi
-  gl_DIRENT_MODULE_INDICATOR([readdir])
+  # Code from module readlink:
   gl_FUNC_READLINK
-  if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
-    AC_LIBOBJ([readlink])
-    gl_PREREQ_READLINK
-  fi
   gl_UNISTD_MODULE_INDICATOR([readlink])
+  # Code from module realloc-posix:
   gl_FUNC_REALLOC_POSIX
-  if test $REPLACE_REALLOC = 1; then
-    AC_LIBOBJ([realloc])
-  fi
   gl_STDLIB_MODULE_INDICATOR([realloc-posix])
+  # Code from module relocatable-prog:
   gl_RELOCATABLE([$gl_source_base])
-  if test $RELOCATABLE = yes; then
-    AC_LIBOBJ([progreloc])
-    AC_LIBOBJ([relocatable])
-  fi
+  # Code from module relocatable-prog-wrapper:
   gl_FUNC_READLINK_SEPARATE
   gl_CANONICALIZE_LGPL_SEPARATE
   gl_MALLOCA
-  gl_RELOCATABLE_LIBRARY
+  gl_RELOCATABLE_LIBRARY_SEPARATE
   gl_FUNC_SETENV_SEPARATE
+  gl_FUNC_STRERROR_SEPARATE
+  # Code from module relocatable-script:
   AC_REQUIRE([gl_RELOCATABLE_NOP])
   relocatable_sh=$ac_aux_dir/relocatable.sh.in
   AC_SUBST_FILE([relocatable_sh])
+  # Code from module rmdir:
   gl_FUNC_RMDIR
-  if test $REPLACE_RMDIR = 1; then
-    AC_LIBOBJ([rmdir])
-  fi
   gl_UNISTD_MODULE_INDICATOR([rmdir])
-  gl_PREREQ_SAFE_READ
-  gl_PREREQ_SAFE_WRITE
+  # Code from module safe-read:
+  gl_SAFE_READ
+  # Code from module safe-write:
+  gl_SAFE_WRITE
+  # Code from module sched:
   gl_SCHED_H
-  gl_FUNC_SECURE_GETENV
-  if test $HAVE_SECURE_GETENV = 0; then
-    AC_LIBOBJ([secure_getenv])
-    gl_PREREQ_SECURE_GETENV
-  fi
-  gl_STDLIB_MODULE_INDICATOR([secure_getenv])
+  # Code from module setenv:
   gl_FUNC_SETENV
-  if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
-    AC_LIBOBJ([setenv])
-  fi
   gl_STDLIB_MODULE_INDICATOR([setenv])
-  gl_FUNC_SETLOCALE
-  if test $REPLACE_SETLOCALE = 1; then
-    AC_LIBOBJ([setlocale])
-    gl_PREREQ_SETLOCALE
-  fi
-  gl_LOCALE_MODULE_INDICATOR([setlocale])
+  # Code from module sh-quote:
+  # Code from module sigaction:
   gl_SIGACTION
-  if test $HAVE_SIGACTION = 0; then
-    AC_LIBOBJ([sigaction])
-    gl_PREREQ_SIGACTION
-  fi
   gl_SIGNAL_MODULE_INDICATOR([sigaction])
+  # Code from module signal:
   gl_SIGNAL_H
+  # Code from module sigpipe:
   gl_SIGNAL_SIGPIPE
   dnl Define the C macro GNULIB_SIGPIPE to 1.
   gl_MODULE_INDICATOR([sigpipe])
@@ -920,190 +789,212 @@
   GNULIB_SIGNAL_H_SIGPIPE=1
   dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1.
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
   GNULIB_STDIO_H_SIGPIPE=1
   dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   GNULIB_UNISTD_H_SIGPIPE=1
+  # Code from module sigprocmask:
   gl_SIGNALBLOCKING
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-    AC_LIBOBJ([sigprocmask])
-    gl_PREREQ_SIGPROCMASK
-  fi
   gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
+  # Code from module size_max:
   gl_SIZE_MAX
+  # Code from module snprintf:
   gl_FUNC_SNPRINTF
   gl_STDIO_MODULE_INDICATOR([snprintf])
-  gl_MODULE_INDICATOR([snprintf])
+  # Code from module spawn:
   gl_SPAWN_H
-  gl_SPAWN_PIPE
+  # Code from module ssize_t:
   gt_TYPE_SSIZE_T
+  # Code from module stat:
   gl_FUNC_STAT
-  if test $REPLACE_STAT = 1; then
-    AC_LIBOBJ([stat])
-    gl_PREREQ_STAT
-  fi
   gl_SYS_STAT_MODULE_INDICATOR([stat])
+  # Code from module stdarg:
   gl_STDARG_H
+  # Code from module stdbool:
   AM_STDBOOL_H
+  # Code from module stddef:
   gl_STDDEF_H
+  # Code from module stdint:
   gl_STDINT_H
+  # Code from module stdio:
   gl_STDIO_H
+  # Code from module stdlib:
   gl_STDLIB_H
+  # Code from module stpcpy:
   gl_FUNC_STPCPY
-  if test $HAVE_STPCPY = 0; then
-    AC_LIBOBJ([stpcpy])
-    gl_PREREQ_STPCPY
-  fi
   gl_STRING_MODULE_INDICATOR([stpcpy])
+  # Code from module stpncpy:
   gl_FUNC_STPNCPY
-  if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then
-    AC_LIBOBJ([stpncpy])
-    gl_PREREQ_STPNCPY
-  fi
   gl_STRING_MODULE_INDICATOR([stpncpy])
+  # Code from module strchrnul:
   gl_FUNC_STRCHRNUL
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-    AC_LIBOBJ([strchrnul])
-    gl_PREREQ_STRCHRNUL
-  fi
   gl_STRING_MODULE_INDICATOR([strchrnul])
+  # Code from module strcspn:
   gl_FUNC_STRCSPN
-  if test $ac_cv_func_strcspn = no; then
-    AC_LIBOBJ([strcspn])
-    gl_PREREQ_STRCSPN
-  fi
+  # Code from module streq:
+  # Code from module strerror:
   gl_FUNC_STRERROR
-  if test $REPLACE_STRERROR = 1; then
-    AC_LIBOBJ([strerror])
-  fi
-  gl_MODULE_INDICATOR([strerror])
   gl_STRING_MODULE_INDICATOR([strerror])
-  AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
-    AC_LIBOBJ([strerror-override])
-    gl_PREREQ_SYS_H_WINSOCK2
-  fi
+  # Code from module striconv:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module striconveh:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module striconveha:
+  # Code from module string:
   gl_HEADER_STRING_H
+  # Code from module strnlen:
   gl_FUNC_STRNLEN
-  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
-    AC_LIBOBJ([strnlen])
-    gl_PREREQ_STRNLEN
-  fi
   gl_STRING_MODULE_INDICATOR([strnlen])
+  # Code from module strnlen1:
+  # Code from module strpbrk:
   gl_FUNC_STRPBRK
-  if test $HAVE_STRPBRK = 0; then
-    AC_LIBOBJ([strpbrk])
-    gl_PREREQ_STRPBRK
-  fi
   gl_STRING_MODULE_INDICATOR([strpbrk])
+  # Code from module strstr:
   gl_FUNC_STRSTR
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
+  # Code from module strstr-simple:
   gl_FUNC_STRSTR_SIMPLE
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
   gl_STRING_MODULE_INDICATOR([strstr])
+  # Code from module strtol:
   gl_FUNC_STRTOL
-  if test $ac_cv_func_strtol = no; then
-    AC_LIBOBJ([strtol])
-  fi
+  # Code from module strtoul:
   gl_FUNC_STRTOUL
-  if test $ac_cv_func_strtoul = no; then
-    AC_LIBOBJ([strtoul])
-  fi
+  # Code from module styled-ostream:
+  # Code from module sys_select:
   gl_HEADER_SYS_SELECT
   AC_PROG_MKDIR_P
+  # Code from module sys_socket:
+  gl_HEADER_SYS_SOCKET
+  AC_PROG_MKDIR_P
+  # Code from module sys_stat:
   gl_HEADER_SYS_STAT_H
   AC_PROG_MKDIR_P
+  # Code from module sys_time:
   gl_HEADER_SYS_TIME_H
   AC_PROG_MKDIR_P
-  gl_SYS_TYPES_H
-  AC_PROG_MKDIR_P
+  # Code from module sys_wait:
   gl_SYS_WAIT_H
   AC_PROG_MKDIR_P
+  # Code from module tempname:
   gl_FUNC_GEN_TEMPNAME
+  # Code from module term-ostream:
   gl_TERM_OSTREAM
+  # Code from module term-styled-ostream:
+  # Code from module terminfo:
   gl_TERMINFO
+  # Code from module terminfo-h:
+  # Code from module threadlib:
   gl_THREADLIB
+  # Code from module time:
   gl_HEADER_TIME_H
+  # Code from module tls:
   gl_TLS
+  # Code from module tmpdir:
   gt_TMPDIR
+  # Code from module trim:
+  # Code from module uniconv/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniconv.h])
+  # Code from module uniconv/u8-conv-from-enc:
   gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-from-enc])
+  # Code from module unilbrk/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [unilbrk.h])
+  # Code from module unilbrk/tables:
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unilbrk/u8-possible-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unilbrk/u8-width-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unilbrk/ulc-width-linebreaks])
+  # Code from module unilbrk/u8-possible-linebreaks:
+  gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u8-possible-linebreaks])
+  # Code from module unilbrk/u8-width-linebreaks:
+  gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u8-width-linebreaks])
+  # Code from module unilbrk/ulc-common:
+  # Code from module unilbrk/ulc-width-linebreaks:
+  gl_LIBUNISTRING_MODULE([0.9], [unilbrk/ulc-width-linebreaks])
+  # Code from module uniname/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniname.h])
+  # Code from module uniname/uniname:
   gl_LIBUNISTRING_MODULE([0.9], [uniname/uniname])
+  # Code from module unistd:
   gl_UNISTD_H
+  # Code from module unistd-safer:
   gl_UNISTD_SAFER
+  # Code from module unistr/base:
   gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
+  # Code from module unistr/u16-mbtouc:
   gl_MODULE_INDICATOR([unistr/u16-mbtouc])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtouc])
+  # Code from module unistr/u8-check:
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-check])
+  # Code from module unistr/u8-mblen:
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mblen])
+  # Code from module unistr/u8-mbtouc:
   gl_MODULE_INDICATOR([unistr/u8-mbtouc])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc])
+  # Code from module unistr/u8-mbtouc-unsafe:
   gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc-unsafe])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc-unsafe])
+  # Code from module unistr/u8-mbtoucr:
   gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
+  # Code from module unistr/u8-prev:
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-prev])
+  # Code from module unistr/u8-uctomb:
   gl_MODULE_INDICATOR([unistr/u8-uctomb])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
+  # Code from module unitypes:
   gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+  # Code from module uniwidth/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
-  gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width])
+  # Code from module uniwidth/width:
+  gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width])
+  # Code from module unlocked-io:
   gl_FUNC_GLIBC_UNLOCKED_IO
+  # Code from module unsetenv:
   gl_FUNC_UNSETENV
-  if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
-    AC_LIBOBJ([unsetenv])
-    gl_PREREQ_UNSETENV
-  fi
   gl_STDLIB_MODULE_INDICATOR([unsetenv])
+  # Code from module unused-parameter:
+  # Code from module vasnprintf:
   gl_FUNC_VASNPRINTF
+  # Code from module vasprintf:
   gl_FUNC_VASPRINTF
   gl_STDIO_MODULE_INDICATOR([vasprintf])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
      AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
+  # Code from module verify:
+  # Code from module vsnprintf:
   gl_FUNC_VSNPRINTF
   gl_STDIO_MODULE_INDICATOR([vsnprintf])
+  # Code from module wait-process:
   gl_WAIT_PROCESS
   gt_UNION_WAIT
-  gl_FUNC_WAITPID
-  if test $HAVE_WAITPID = 0; then
-    AC_LIBOBJ([waitpid])
-  fi
-  gl_SYS_WAIT_MODULE_INDICATOR([waitpid])
+  # Code from module warn-on-use:
+  # Code from module wchar:
   gl_WCHAR_H
+  # Code from module wctype:
   gl_WCTYPE_H
+  # Code from module wcwidth:
   gl_FUNC_WCWIDTH
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
-    AC_LIBOBJ([wcwidth])
-  fi
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
+  # Code from module write:
   gl_FUNC_WRITE
-  if test $REPLACE_WRITE = 1; then
-    AC_LIBOBJ([write])
-    gl_PREREQ_WRITE
-  fi
   gl_UNISTD_MODULE_INDICATOR([write])
+  # Code from module xalloc:
+  # Code from module xalloc-die:
+  # Code from module xconcat-filename:
+  # Code from module xerror:
+  # Code from module xlist:
+  gl_LIST
+  # Code from module xmalloca:
+  # Code from module xreadlink:
+  # Code from module xsetenv:
+  # Code from module xsize:
   gl_XSIZE
+  # Code from module xstriconv:
+  # Code from module xstriconveh:
+  # Code from module xvasprintf:
   gl_XVASPRINTF
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])])
@@ -1154,60 +1045,13 @@
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
   AC_CHECK_DECLS_ONCE([alarm])
-  gl_FUNC_BTOWC
-  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-    AC_LIBOBJ([btowc])
-    gl_PREREQ_BTOWC
-  fi
-  gl_WCHAR_MODULE_INDICATOR([btowc])
-  gt_LOCALE_FR
-  gt_LOCALE_FR_UTF8
   gt_LOCALE_FR
   gt_LOCALE_TR_UTF8
-  gl_FUNC_DUP
-  if test $REPLACE_DUP = 1; then
-    AC_LIBOBJ([dup])
-    gl_PREREQ_DUP
-  fi
-  gl_UNISTD_MODULE_INDICATOR([dup])
-  gl_FUNC_FDOPEN
-  if test $REPLACE_FDOPEN = 1; then
-    AC_LIBOBJ([fdopen])
-    gl_PREREQ_FDOPEN
-  fi
-  gl_STDIO_MODULE_INDICATOR([fdopen])
-  gl_FUNC_FTELL
-  if test $REPLACE_FTELL = 1; then
-    AC_LIBOBJ([ftell])
-  fi
-  gl_STDIO_MODULE_INDICATOR([ftell])
-  gl_FUNC_UNGETC_WORKS
-  gl_FUNC_FTELLO
-  if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
-    AC_LIBOBJ([ftello])
-    gl_PREREQ_FTELLO
-  fi
-  gl_STDIO_MODULE_INDICATOR([ftello])
-  gl_FUNC_UNGETC_WORKS
-  gl_FUNC_GETCWD_LGPL
-  if test $REPLACE_GETCWD = 1; then
-    AC_LIBOBJ([getcwd-lgpl])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([getcwd])
   gl_FUNC_GETPAGESIZE
-  if test $REPLACE_GETPAGESIZE = 1; then
-    AC_LIBOBJ([getpagesize])
-  fi
   gl_UNISTD_MODULE_INDICATOR([getpagesize])
-  gl_INTTYPES_H
-  gl_INTTYPES_INCOMPLETE
+  AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_FUNCS_ONCE([newlocale])
   AC_CHECK_FUNCS_ONCE([newlocale])
-  gl_FUNC_LSEEK
-  if test $REPLACE_LSEEK = 1; then
-    AC_LIBOBJ([lseek])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([lseek])
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
   gt_LOCALE_JA
@@ -1219,16 +1063,6 @@
   gt_LOCALE_ZH_CN
   gt_LOCALE_FR_UTF8
   gt_LOCALE_ZH_CN
-  gl_FUNC_MBTOWC
-  if test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
-    gl_PREREQ_MBTOWC
-  fi
-  gl_STDLIB_MODULE_INDICATOR([mbtowc])
-  dnl Check for prerequisites for memory fence checks.
-  gl_FUNC_MMAP_ANON
-  AC_CHECK_HEADERS_ONCE([sys/mman.h])
-  AC_CHECK_FUNCS_ONCE([mprotect])
   AC_EGREP_CPP([notposix], [[
   #if defined _MSC_VER || defined __MINGW32__
     notposix
@@ -1238,74 +1072,25 @@
     [posix_spawn_ported=yes])
   AM_CONDITIONAL([POSIX_SPAWN_PORTED], [test $posix_spawn_ported = yes])
   gl_FUNC_PUTENV
-  if test $REPLACE_PUTENV = 1; then
-    AC_LIBOBJ([putenv])
-    gl_PREREQ_PUTENV
-  fi
   gl_STDLIB_MODULE_INDICATOR([putenv])
-  dnl Check for prerequisites for memory fence checks.
-  dnl FIXME: zerosize-ptr.h requires these: make a module for it
-  gl_FUNC_MMAP_ANON
-  AC_CHECK_HEADERS_ONCE([sys/mman.h])
-  AC_CHECK_FUNCS_ONCE([mprotect])
-  dnl Check for prerequisites for memory fence checks.
-  gl_FUNC_MMAP_ANON
-  AC_CHECK_HEADERS_ONCE([sys/mman.h])
-  AC_CHECK_FUNCS_ONCE([mprotect])
-  gl_PREREQ_READ_FILE
-  gt_LOCALE_FR
-  gt_LOCALE_FR_UTF8
-  gt_LOCALE_JA
-  gt_LOCALE_ZH_CN
-  gl_FUNC_SLEEP
-  if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then
-    AC_LIBOBJ([sleep])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([sleep])
-  AC_CHECK_DECLS_ONCE([alarm])
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
-  AC_REQUIRE([gt_TYPE_WINT_T])
-  dnl Check for prerequisites for memory fence checks.
-  gl_FUNC_MMAP_ANON
-  AC_CHECK_HEADERS_ONCE([sys/mman.h])
-  AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_FUNC_READ_FILE
+  gt_TYPE_WCHAR_T
+  gt_TYPE_WINT_T
   AC_CHECK_DECLS_ONCE([alarm])
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
   gl_FUNC_SYMLINK
-  if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
-    AC_LIBOBJ([symlink])
-  fi
   gl_UNISTD_MODULE_INDICATOR([symlink])
+  AC_CHECK_FUNCS_ONCE([shutdown])
   gl_THREAD
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cmp])
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strlen])
-  gl_FUNC_WCRTOMB
-  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
-    AC_LIBOBJ([wcrtomb])
-    gl_PREREQ_WCRTOMB
-  fi
-  gl_WCHAR_MODULE_INDICATOR([wcrtomb])
-  gt_LOCALE_FR
-  gt_LOCALE_FR_UTF8
-  gt_LOCALE_JA
-  gt_LOCALE_ZH_CN
   gl_FUNC_WCTOB
-  if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
-    AC_LIBOBJ([wctob])
-    gl_PREREQ_WCTOB
-  fi
   gl_WCHAR_MODULE_INDICATOR([wctob])
-  gl_FUNC_WCTOMB
-  if test $REPLACE_WCTOMB = 1; then
-    AC_LIBOBJ([wctomb])
-    gl_PREREQ_WCTOMB
-  fi
-  gl_STDLIB_MODULE_INDICATOR([wctomb])
   gl_YIELD
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(gltests_LIBSOURCES_LIST, [
@@ -1399,6 +1184,8 @@
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
+  build-aux/arg-nonnull.h
+  build-aux/c++defs.h
   build-aux/config.libpath
   build-aux/config.rpath
   build-aux/csharpcomp.sh.in
@@ -1409,20 +1196,15 @@
   build-aux/moopp
   build-aux/reloc-ldflags
   build-aux/relocatable.sh.in
-  build-aux/snippet/_Noreturn.h
-  build-aux/snippet/arg-nonnull.h
-  build-aux/snippet/c++defs.h
-  build-aux/snippet/unused-parameter.h
-  build-aux/snippet/warn-on-use.h
+  build-aux/unused-parameter.h
+  build-aux/warn-on-use.h
   doc/relocatable.texi
-  lib/acl-errno-valid.c
   lib/acl-internal.h
   lib/acl.h
   lib/acl_entries.c
   lib/addext.c
+  lib/alignof.h
   lib/alloca.in.h
-  lib/allocator.c
-  lib/allocator.h
   lib/areadlink.c
   lib/areadlink.h
   lib/argmatch.c
@@ -1434,7 +1216,6 @@
   lib/backupfile.h
   lib/basename.c
   lib/basename.h
-  lib/binary-io.c
   lib/binary-io.h
   lib/byteswap.in.h
   lib/c-ctype.c
@@ -1448,16 +1229,12 @@
   lib/c-strstr.c
   lib/c-strstr.h
   lib/canonicalize-lgpl.c
-  lib/careadlinkat.c
-  lib/careadlinkat.h
   lib/classpath.c
   lib/classpath.h
   lib/clean-temp.c
   lib/clean-temp.h
   lib/cloexec.c
   lib/cloexec.h
-  lib/close.c
-  lib/closedir.c
   lib/closeout.c
   lib/closeout.h
   lib/concat-filename.c
@@ -1471,9 +1248,6 @@
   lib/csharpexec.c
   lib/csharpexec.h
   lib/diffseq.h
-  lib/dirent-private.h
-  lib/dirent.in.h
-  lib/dosname.h
   lib/dup-safer-flag.c
   lib/dup-safer.c
   lib/dup2.c
@@ -1490,8 +1264,6 @@
   lib/fatal-signal.h
   lib/fcntl.c
   lib/fcntl.in.h
-  lib/fd-hook.c
-  lib/fd-hook.h
   lib/fd-ostream.oo.c
   lib/fd-ostream.oo.h
   lib/fd-safer-flag.c
@@ -1503,13 +1275,11 @@
   lib/findprog.c
   lib/findprog.h
   lib/float+.h
-  lib/float.c
   lib/float.in.h
   lib/fnmatch.c
   lib/fnmatch.in.h
   lib/fnmatch_loop.c
   lib/fopen.c
-  lib/fstat.c
   lib/fstrcmp.c
   lib/fstrcmp.h
   lib/full-write.c
@@ -1564,9 +1334,7 @@
   lib/html-ostream.oo.h
   lib/html-styled-ostream.oo.c
   lib/html-styled-ostream.oo.h
-  lib/iconv.c
   lib/iconv.in.h
-  lib/iconv_close.c
   lib/iconv_open-aix.gperf
   lib/iconv_open-hpux.gperf
   lib/iconv_open-irix.gperf
@@ -1574,10 +1342,7 @@
   lib/iconv_open-solaris.gperf
   lib/iconv_open.c
   lib/iconveh.h
-  lib/ignore-value.h
   lib/intprops.h
-  lib/iswblank.c
-  lib/itold.c
   lib/javacomp.c
   lib/javacomp.h
   lib/javaexec.c
@@ -1746,18 +1511,15 @@
   lib/malloca.valgrind
   lib/mbchar.c
   lib/mbchar.h
-  lib/mbiter.c
   lib/mbiter.h
   lib/mbrtowc.c
   lib/mbsinit.c
   lib/mbslen.c
-  lib/mbsrtowcs-impl.h
   lib/mbsrtowcs-state.c
   lib/mbsrtowcs.c
   lib/mbsstr.c
   lib/mbswidth.c
   lib/mbswidth.h
-  lib/mbuiter.c
   lib/mbuiter.h
   lib/memchr.c
   lib/memchr.valgrind
@@ -1766,22 +1528,18 @@
   lib/minmax.h
   lib/mkdtemp.c
   lib/moo.h
-  lib/msvc-inval.c
-  lib/msvc-inval.h
-  lib/msvc-nothrow.c
-  lib/msvc-nothrow.h
   lib/obstack.c
   lib/obstack.h
   lib/open.c
-  lib/opendir.c
   lib/ostream.oo.c
   lib/ostream.oo.h
   lib/pathmax.h
-  lib/pipe-filter-aux.c
   lib/pipe-filter-aux.h
   lib/pipe-filter-ii.c
   lib/pipe-filter.h
   lib/pipe-safer.c
+  lib/pipe.c
+  lib/pipe.h
   lib/pipe2-safer.c
   lib/pipe2.c
   lib/printf-args.c
@@ -1793,16 +1551,12 @@
   lib/progreloc.c
   lib/propername.c
   lib/propername.h
-  lib/qcopy-acl.c
-  lib/qset-acl.c
+  lib/quote.c
   lib/quote.h
   lib/quotearg.c
   lib/quotearg.h
-  lib/raise.c
   lib/rawmemchr.c
   lib/rawmemchr.valgrind
-  lib/read.c
-  lib/readdir.c
   lib/readlink.c
   lib/realloc.c
   lib/ref-add.sin
@@ -1816,21 +1570,16 @@
   lib/safe-write.c
   lib/safe-write.h
   lib/sched.in.h
-  lib/secure_getenv.c
-  lib/set-acl.c
+  lib/set-mode-acl.c
   lib/setenv.c
-  lib/setlocale.c
   lib/sh-quote.c
   lib/sh-quote.h
-  lib/sig-handler.c
   lib/sig-handler.h
   lib/sigaction.c
   lib/signal.in.h
   lib/sigprocmask.c
   lib/size_max.h
   lib/snprintf.c
-  lib/spawn-pipe.c
-  lib/spawn-pipe.h
   lib/spawn.in.h
   lib/spawn_faction_addclose.c
   lib/spawn_faction_adddup2.c
@@ -1860,8 +1609,6 @@
   lib/strchrnul.valgrind
   lib/strcspn.c
   lib/streq.h
-  lib/strerror-override.c
-  lib/strerror-override.h
   lib/strerror.c
   lib/striconv.c
   lib/striconv.h
@@ -1880,9 +1627,9 @@
   lib/styled-ostream.oo.c
   lib/styled-ostream.oo.h
   lib/sys_select.in.h
+  lib/sys_socket.in.h
   lib/sys_stat.in.h
   lib/sys_time.in.h
-  lib/sys_types.in.h
   lib/sys_wait.in.h
   lib/tempname.c
   lib/tempname.h
@@ -1916,7 +1663,6 @@
   lib/uniname/uninames.h
   lib/unistd--.h
   lib/unistd-safer.h
-  lib/unistd.c
   lib/unistd.in.h
   lib/unistr.in.h
   lib/unistr/u16-mbtouc-aux.c
@@ -1945,9 +1691,7 @@
   lib/w32spawn.h
   lib/wait-process.c
   lib/wait-process.h
-  lib/waitpid.c
   lib/wchar.in.h
-  lib/wctype-h.c
   lib/wctype.in.h
   lib/wcwidth.c
   lib/write.c
@@ -1963,7 +1707,6 @@
   lib/xreadlink.h
   lib/xsetenv.c
   lib/xsetenv.h
-  lib/xsize.c
   lib/xsize.h
   lib/xstrdup.c
   lib/xstriconv.c
@@ -1976,26 +1719,22 @@
   m4/absolute-header.m4
   m4/acl.m4
   m4/alloca.m4
-  m4/ansi-c++.m4
+  m4/argmatch.m4
   m4/asm-underscore.m4
   m4/atexit.m4
   m4/backupfile.m4
   m4/bison-i18n.m4
-  m4/btowc.m4
   m4/byteswap.m4
   m4/canonicalize.m4
-  m4/close.m4
-  m4/closedir.m4
+  m4/cloexec.m4
   m4/codeset.m4
-  m4/configmake.m4
   m4/copy-file.m4
   m4/csharp.m4
   m4/csharpcomp.m4
   m4/csharpexec.m4
   m4/curses.m4
-  m4/dirent_h.m4
+  m4/dos.m4
   m4/double-slash-root.m4
-  m4/dup.m4
   m4/dup2.m4
   m4/eaccess.m4
   m4/eealloc.m4
@@ -2003,25 +1742,16 @@
   m4/errno_h.m4
   m4/error.m4
   m4/execute.m4
-  m4/exponentd.m4
   m4/extensions.m4
-  m4/extern-inline.m4
   m4/fatal-signal.m4
   m4/fcntl-o.m4
   m4/fcntl.m4
   m4/fcntl_h.m4
-  m4/fdopen.m4
   m4/findprog.m4
   m4/float_h.m4
   m4/fnmatch.m4
   m4/fopen.m4
-  m4/fpieee.m4
-  m4/fseeko.m4
-  m4/fstat.m4
-  m4/ftell.m4
-  m4/ftello.m4
   m4/gcj.m4
-  m4/getcwd.m4
   m4/getdelim.m4
   m4/getdtablesize.m4
   m4/getline.m4
@@ -2029,6 +1759,7 @@
   m4/getpagesize.m4
   m4/gettext.m4
   m4/gettimeofday.m4
+  m4/gl_list.m4
   m4/glibc2.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
@@ -2044,13 +1775,10 @@
   m4/intmax.m4
   m4/intmax_t.m4
   m4/inttypes-pri.m4
-  m4/inttypes.m4
   m4/inttypes_h.m4
-  m4/iswblank.m4
   m4/java.m4
   m4/javacomp.m4
   m4/javaexec.m4
-  m4/largefile.m4
   m4/lcmessage.m4
   m4/lib-ld.m4
   m4/lib-link.m4
@@ -2070,11 +1798,9 @@
   m4/localename.m4
   m4/lock.m4
   m4/longlong.m4
-  m4/lseek.m4
   m4/lstat.m4
   m4/malloc.m4
   m4/malloca.m4
-  m4/math_h.m4
   m4/mbchar.m4
   m4/mbiter.m4
   m4/mbrtowc.m4
@@ -2083,7 +1809,6 @@
   m4/mbsrtowcs.m4
   m4/mbstate_t.m4
   m4/mbswidth.m4
-  m4/mbtowc.m4
   m4/memchr.m4
   m4/memmove.m4
   m4/memset.m4
@@ -2092,17 +1817,14 @@
   m4/mmap-anon.m4
   m4/mode_t.m4
   m4/moo.m4
-  m4/msvc-inval.m4
-  m4/msvc-nothrow.m4
   m4/multiarch.m4
   m4/nls.m4
   m4/no-c++.m4
-  m4/nocrash.m4
-  m4/off_t.m4
+  m4/onceonly.m4
   m4/open.m4
-  m4/opendir.m4
   m4/openmp.m4
   m4/pathmax.m4
+  m4/pipe.m4
   m4/pipe2.m4
   m4/po.m4
   m4/posix_spawn.m4
@@ -2112,11 +1834,8 @@
   m4/putenv.m4
   m4/quote.m4
   m4/quotearg.m4
-  m4/raise.m4
   m4/rawmemchr.m4
   m4/read-file.m4
-  m4/read.m4
-  m4/readdir.m4
   m4/readlink.m4
   m4/realloc.m4
   m4/relocatable-lib.m4
@@ -2125,18 +1844,15 @@
   m4/safe-read.m4
   m4/safe-write.m4
   m4/sched_h.m4
-  m4/secure_getenv.m4
   m4/setenv.m4
-  m4/setlocale.m4
   m4/sig_atomic_t.m4
   m4/sigaction.m4
   m4/signal_h.m4
   m4/signalblocking.m4
   m4/sigpipe.m4
   m4/size_max.m4
-  m4/sleep.m4
   m4/snprintf.m4
-  m4/spawn-pipe.m4
+  m4/sockpfaf.m4
   m4/spawn_h.m4
   m4/ssize_t.m4
   m4/stat.m4
@@ -2163,7 +1879,6 @@
   m4/sys_socket_h.m4
   m4/sys_stat_h.m4
   m4/sys_time_h.m4
-  m4/sys_types_h.m4
   m4/sys_wait_h.m4
   m4/tempname.m4
   m4/term-ostream.m4
@@ -2174,7 +1889,6 @@
   m4/tls.m4
   m4/tmpdir.m4
   m4/uintmax_t.m4
-  m4/ungetc.m4
   m4/unionwait.m4
   m4/unistd-safer.m4
   m4/unistd_h.m4
@@ -2184,13 +1898,10 @@
   m4/visibility.m4
   m4/vsnprintf.m4
   m4/wait-process.m4
-  m4/waitpid.m4
   m4/warn-on-use.m4
   m4/wchar_h.m4
   m4/wchar_t.m4
-  m4/wcrtomb.m4
   m4/wctob.m4
-  m4/wctomb.m4
   m4/wctype_h.m4
   m4/wcwidth.m4
   m4/wint_t.m4
@@ -2201,6 +1912,7 @@
   tests/init.sh
   tests/macros.h
   tests/signature.h
+  tests/test-alignof.c
   tests/test-alloca-opt.c
   tests/test-areadlink.c
   tests/test-areadlink.h
@@ -2210,9 +1922,6 @@
   tests/test-atexit.sh
   tests/test-binary-io.c
   tests/test-binary-io.sh
-  tests/test-btowc.c
-  tests/test-btowc1.sh
-  tests/test-btowc2.sh
   tests/test-byteswap.c
   tests/test-c-ctype.c
   tests/test-c-strcase.sh
@@ -2222,49 +1931,22 @@
   tests/test-c-strstr.c
   tests/test-canonicalize-lgpl.c
   tests/test-cloexec.c
-  tests/test-close.c
-  tests/test-copy-acl-1.sh
-  tests/test-copy-acl-2.sh
   tests/test-copy-acl.c
   tests/test-copy-acl.sh
-  tests/test-copy-file-1.sh
-  tests/test-copy-file-2.sh
   tests/test-copy-file.c
   tests/test-copy-file.sh
-  tests/test-dirent.c
   tests/test-dup-safer.c
-  tests/test-dup.c
   tests/test-dup2.c
   tests/test-environ.c
   tests/test-errno.c
   tests/test-fcntl-h.c
   tests/test-fcntl.c
-  tests/test-fdopen.c
-  tests/test-fgetc.c
-  tests/test-file-has-acl-1.sh
-  tests/test-file-has-acl-2.sh
   tests/test-file-has-acl.c
   tests/test-file-has-acl.sh
-  tests/test-float.c
   tests/test-fnmatch.c
   tests/test-fopen.c
   tests/test-fopen.h
-  tests/test-fputc.c
-  tests/test-fread.c
-  tests/test-fstat.c
   tests/test-fstrcmp.c
-  tests/test-ftell.c
-  tests/test-ftell.sh
-  tests/test-ftell2.sh
-  tests/test-ftell3.c
-  tests/test-ftello.c
-  tests/test-ftello.sh
-  tests/test-ftello2.sh
-  tests/test-ftello3.c
-  tests/test-ftello4.c
-  tests/test-ftello4.sh
-  tests/test-fwrite.c
-  tests/test-getcwd-lgpl.c
   tests/test-getdelim.c
   tests/test-getdtablesize.c
   tests/test-getline.c
@@ -2274,26 +1956,13 @@
   tests/test-gettimeofday.c
   tests/test-iconv-h.c
   tests/test-iconv.c
-  tests/test-ignore-value.c
-  tests/test-init.sh
-  tests/test-intprops.c
-  tests/test-inttypes.c
-  tests/test-iswblank.c
   tests/test-linkedhash_list.c
   tests/test-locale.c
   tests/test-localename.c
   tests/test-lock.c
-  tests/test-lseek.c
-  tests/test-lseek.sh
   tests/test-lstat.c
   tests/test-lstat.h
   tests/test-malloca.c
-  tests/test-mbrtowc-w32-1.sh
-  tests/test-mbrtowc-w32-2.sh
-  tests/test-mbrtowc-w32-3.sh
-  tests/test-mbrtowc-w32-4.sh
-  tests/test-mbrtowc-w32-5.sh
-  tests/test-mbrtowc-w32.c
   tests/test-mbrtowc.c
   tests/test-mbrtowc1.sh
   tests/test-mbrtowc2.sh
@@ -2325,52 +1994,36 @@
   tests/test-moo-sub2.oo.h
   tests/test-open.c
   tests/test-open.h
-  tests/test-pathmax.c
   tests/test-pipe-filter-ii1.c
   tests/test-pipe-filter-ii1.sh
   tests/test-pipe-filter-ii2-child.c
   tests/test-pipe-filter-ii2-main.c
   tests/test-pipe-filter-ii2.sh
+  tests/test-pipe.c
+  tests/test-pipe.sh
   tests/test-pipe2.c
   tests/test-posix_spawn1.c
   tests/test-posix_spawn1.in.sh
   tests/test-posix_spawn2.c
   tests/test-posix_spawn2.in.sh
-  tests/test-posix_spawn_file_actions_addclose.c
-  tests/test-posix_spawn_file_actions_adddup2.c
-  tests/test-posix_spawn_file_actions_addopen.c
   tests/test-quotearg-simple.c
   tests/test-quotearg.h
-  tests/test-raise.c
   tests/test-rawmemchr.c
   tests/test-read-file.c
-  tests/test-read.c
   tests/test-readlink.c
   tests/test-readlink.h
   tests/test-rmdir.c
   tests/test-rmdir.h
   tests/test-sameacls.c
   tests/test-sched.c
-  tests/test-set-mode-acl-1.sh
-  tests/test-set-mode-acl-2.sh
   tests/test-set-mode-acl.c
   tests/test-set-mode-acl.sh
   tests/test-setenv.c
-  tests/test-setlocale1.c
-  tests/test-setlocale1.sh
-  tests/test-setlocale2.c
-  tests/test-setlocale2.sh
-  tests/test-sh-quote.c
   tests/test-sigaction.c
-  tests/test-signal-h.c
+  tests/test-signal.c
   tests/test-sigpipe.c
   tests/test-sigpipe.sh
-  tests/test-sigprocmask.c
-  tests/test-sleep.c
   tests/test-snprintf.c
-  tests/test-spawn-pipe-child.c
-  tests/test-spawn-pipe-main.c
-  tests/test-spawn-pipe.sh
   tests/test-spawn.c
   tests/test-stat.c
   tests/test-stat.h
@@ -2385,25 +2038,20 @@
   tests/test-striconveh.c
   tests/test-striconveha.c
   tests/test-string.c
-  tests/test-strnlen.c
   tests/test-strstr.c
-  tests/test-strtol.c
-  tests/test-strtoul.c
   tests/test-symlink.c
   tests/test-symlink.h
   tests/test-sys_select.c
+  tests/test-sys_socket.c
   tests/test-sys_stat.c
   tests/test-sys_time.c
-  tests/test-sys_types.c
   tests/test-sys_wait.c
-  tests/test-sys_wait.h
   tests/test-term-ostream-xterm
   tests/test-term-ostream-xterm-16color.out
   tests/test-term-ostream-xterm-256color.out
   tests/test-term-ostream-xterm-88color.out
   tests/test-term-ostream-xterm-8bit.out
   tests/test-term-ostream-xterm-aix51.out
-  tests/test-term-ostream-xterm-basic-italic.out
   tests/test-term-ostream-xterm-basic.out
   tests/test-term-ostream-xterm-irix65.out
   tests/test-term-ostream-xterm-linux-debian.out
@@ -2415,8 +2063,6 @@
   tests/test-term-ostream-xterm-solaris10.out
   tests/test-term-ostream-xterm-xf86-v32.out
   tests/test-term-ostream.c
-  tests/test-thread_create.c
-  tests/test-thread_self.c
   tests/test-time.c
   tests/test-tls.c
   tests/test-unistd.c
@@ -2428,22 +2074,15 @@
   tests/test-verify.sh
   tests/test-vsnprintf.c
   tests/test-wchar.c
-  tests/test-wcrtomb-w32-1.sh
-  tests/test-wcrtomb-w32-2.sh
-  tests/test-wcrtomb-w32-3.sh
-  tests/test-wcrtomb-w32-4.sh
-  tests/test-wcrtomb-w32-5.sh
-  tests/test-wcrtomb-w32.c
-  tests/test-wcrtomb.c
-  tests/test-wcrtomb.sh
-  tests/test-wctype-h.c
+  tests/test-wctype.c
   tests/test-wcwidth.c
-  tests/test-write.c
   tests/test-xalloc-die.c
   tests/test-xalloc-die.sh
   tests/test-xvasprintf.c
   tests/uniconv/test-u8-conv-from-enc.c
+  tests/unilbrk/test-u8-possible-linebreaks.c
   tests/unilbrk/test-u8-width-linebreaks.c
+  tests/unilbrk/test-ulc-width-linebreaks.c
   tests/uniname/UnicodeDataNames.txt
   tests/uniname/test-uninames.c
   tests/uniname/test-uninames.sh
@@ -2453,37 +2092,28 @@
   tests/unistr/test-u8-check.c
   tests/unistr/test-u8-cmp.c
   tests/unistr/test-u8-mblen.c
+  tests/unistr/test-u8-mbtouc-unsafe.c
+  tests/unistr/test-u8-mbtouc.c
+  tests/unistr/test-u8-mbtouc.h
   tests/unistr/test-u8-mbtoucr.c
   tests/unistr/test-u8-prev.c
   tests/unistr/test-u8-strlen.c
   tests/unistr/test-u8-uctomb.c
+  tests/uniwidth/test-uc_width.c
+  tests/uniwidth/test-uc_width2.c
+  tests/uniwidth/test-uc_width2.sh
   tests/zerosize-ptr.h
-  tests=lib/btowc.c
-  tests=lib/dup.c
-  tests=lib/fdopen.c
-  tests=lib/fpucw.h
-  tests=lib/ftell.c
-  tests=lib/ftello.c
-  tests=lib/getcwd-lgpl.c
   tests=lib/getpagesize.c
   tests=lib/glthread/thread.c
   tests=lib/glthread/thread.h
   tests=lib/glthread/yield.h
-  tests=lib/inttypes.in.h
-  tests=lib/lseek.c
-  tests=lib/mbtowc-impl.h
-  tests=lib/mbtowc.c
+  tests=lib/ignore-value.h
   tests=lib/putenv.c
   tests=lib/read-file.c
   tests=lib/read-file.h
   tests=lib/same-inode.h
-  tests=lib/sleep.c
-  tests=lib/stdio-impl.h
   tests=lib/symlink.c
   tests=lib/unistr/u8-cmp.c
   tests=lib/unistr/u8-strlen.c
-  tests=lib/wcrtomb.c
   tests=lib/wctob.c
-  tests=lib/wctomb-impl.h
-  tests=lib/wctomb.c
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/iconv_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/iconv_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/iconv_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/iconv_h.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# iconv_h.m4 serial 6
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,6 @@
 [
   AC_REQUIRE([gl_ICONV_H_DEFAULTS])
   ICONV_H='iconv.h'
-  AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"])
 ])
 
 AC_DEFUN([gl_ICONV_MODULE_INDICATOR],
@@ -30,12 +29,9 @@
 
 AC_DEFUN([gl_ICONV_H_DEFAULTS],
 [
-  GNULIB_ICONV=0;       AC_SUBST([GNULIB_ICONV])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  ICONV_CONST=;         AC_SUBST([ICONV_CONST])
   REPLACE_ICONV=0;      AC_SUBST([REPLACE_ICONV])
   REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN])
   REPLACE_ICONV_UTF=0;  AC_SUBST([REPLACE_ICONV_UTF])
   ICONV_H='';           AC_SUBST([ICONV_H])
-  AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/iconv_open.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/iconv_open.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/iconv_open.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/iconv_open.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# iconv_open.m4 serial 7
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@
     dnl We know that GNU libiconv and GNU libc do.
     AC_EGREP_CPP([gnu_iconv], [
       #include <iconv.h>
-      #if defined _LIBICONV_VERSION || (defined __GLIBC__ && !defined __UCLIBC__)
+      #if defined _LIBICONV_VERSION || defined __GLIBC__
        gnu_iconv
       #endif
       ], [gl_func_iconv_gnu=yes], [gl_func_iconv_gnu=no])
@@ -36,16 +36,6 @@
         gl_REPLACE_ICONV_OPEN
       fi
     fi
-    m4_ifdef([gl_FUNC_ICONV_OPEN_UTF_SUPPORT], [
-      gl_FUNC_ICONV_OPEN_UTF_SUPPORT
-      if test $gl_cv_func_iconv_supports_utf = no; then
-        REPLACE_ICONV_UTF=1
-        AC_DEFINE([REPLACE_ICONV_UTF], [1],
-          [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])
-        REPLACE_ICONV=1
-        gl_REPLACE_ICONV_OPEN
-      fi
-    ])
   fi
 ])
 
@@ -53,4 +43,198 @@
 [
   gl_REPLACE_ICONV_H
   REPLACE_ICONV_OPEN=1
+  AC_LIBOBJ([iconv_open])
+])
+
+AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF],
+[
+  AC_REQUIRE([gl_FUNC_ICONV_OPEN])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+  if test "$am_cv_func_iconv" = yes; then
+    if test -n "$am_cv_proto_iconv_arg1"; then
+      ICONV_CONST="const"
+    else
+      ICONV_CONST=
+    fi
+    AC_SUBST([ICONV_CONST])
+    AC_CACHE_CHECK([whether iconv supports conversion between UTF-8 and UTF-{16,32}{BE,LE}],
+      [gl_cv_func_iconv_supports_utf],
+      [
+        save_LIBS="$LIBS"
+        LIBS="$LIBS $LIBICONV"
+        AC_TRY_RUN([
+#include <iconv.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define ASSERT(expr) if (!(expr)) return 1;
+int main ()
+{
+  /* Test conversion from UTF-8 to UTF-16BE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "\000J\000a\000p\000a\000n\000e\000s\000e\000 \000(\145\345\147\054\212\236\000)\000 \000[\330\065\335\015\330\065\335\036\330\065\335\055\000]";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-16BE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-8 to UTF-16LE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "J\000a\000p\000a\000n\000e\000s\000e\000 \000(\000\345\145\054\147\236\212)\000 \000[\000\065\330\015\335\065\330\036\335\065\330\055\335]\000";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-16LE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-8 to UTF-32BE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "\000\000\000J\000\000\000a\000\000\000p\000\000\000a\000\000\000n\000\000\000e\000\000\000s\000\000\000e\000\000\000 \000\000\000(\000\000\145\345\000\000\147\054\000\000\212\236\000\000\000)\000\000\000 \000\000\000[\000\001\325\015\000\001\325\036\000\001\325\055\000\000\000]";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-32BE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-8 to UTF-32LE with no errors.  */
+  {
+    static const char input[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    static const char expected[] =
+      "J\000\000\000a\000\000\000p\000\000\000a\000\000\000n\000\000\000e\000\000\000s\000\000\000e\000\000\000 \000\000\000(\000\000\000\345\145\000\000\054\147\000\000\236\212\000\000)\000\000\000 \000\000\000[\000\000\000\015\325\001\000\036\325\001\000\055\325\001\000]\000\000\000";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-32LE", "UTF-8");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  /* Test conversion from UTF-16BE to UTF-8 with no errors.
+     This test fails on NetBSD 3.0.  */
+  {
+    static const char input[] =
+      "\000J\000a\000p\000a\000n\000e\000s\000e\000 \000(\145\345\147\054\212\236\000)\000 \000[\330\065\335\015\330\065\335\036\330\065\335\055\000]";
+    static const char expected[] =
+      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
+    iconv_t cd;
+    char buf[100];
+    const char *inptr;
+    size_t inbytesleft;
+    char *outptr;
+    size_t outbytesleft;
+    size_t res;
+    cd = iconv_open ("UTF-8", "UTF-16BE");
+    ASSERT (cd != (iconv_t)(-1));
+    inptr = input;
+    inbytesleft = sizeof (input) - 1;
+    outptr = buf;
+    outbytesleft = sizeof (buf);
+    res = iconv (cd,
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
+    ASSERT (res == 0 && inbytesleft == 0);
+    ASSERT (outptr == buf + (sizeof (expected) - 1));
+    ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
+    ASSERT (iconv_close (cd) == 0);
+  }
+  return 0;
+}], [gl_cv_func_iconv_supports_utf=yes], [gl_cv_func_iconv_supports_utf=no],
+          [
+           dnl We know that GNU libiconv, GNU libc, and Solaris >= 9 do.
+           dnl OSF/1 5.1 has these encodings, but inserts a BOM in the "to"
+           dnl direction.
+           gl_cv_func_iconv_supports_utf=no
+           if test $gl_func_iconv_gnu = yes; then
+             gl_cv_func_iconv_supports_utf=yes
+           else
+changequote(,)dnl
+             case "$host_os" in
+               solaris2.9 | solaris2.1[0-9]) gl_cv_func_iconv_supports_utf=yes ;;
+             esac
+changequote([,])dnl
+           fi
+          ])
+        LIBS="$save_LIBS"
+      ])
+    if test $gl_cv_func_iconv_supports_utf = no; then
+      REPLACE_ICONV_UTF=1
+      AC_DEFINE([REPLACE_ICONV_UTF], [1],
+        [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])
+      REPLACE_ICONV=1
+      gl_REPLACE_ICONV_OPEN
+      AC_LIBOBJ([iconv])
+      AC_LIBOBJ([iconv_close])
+    fi
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/include_next.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/include_next.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/include_next.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/include_next.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# include_next.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# include_next.m4 serial 14
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -24,13 +24,6 @@
 dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
 dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
 dnl of plain '__STDC__'.
-dnl
-dnl PRAGMA_COLUMNS can be used in files that override system header files, so
-dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
-dnl is included by a system header file that does a "#pragma COLUMNS 80" (which
-dnl has the effect of truncating the lines of that file and all files that it
-dnl includes to 80 columns) and the gnulib file has lines longer than 80
-dnl columns.
 
 AC_DEFUN([gl_INCLUDE_NEXT],
 [
@@ -75,11 +68,10 @@
 EOF
      gl_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-dnl We intentionally avoid using AC_LANG_SOURCE here.
-     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+     AC_COMPILE_IFELSE([#include <conftest.h>],
        [gl_cv_have_include_next=yes],
        [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+        AC_COMPILE_IFELSE([#include <conftest.h>],
           [gl_cv_have_include_next=buggy],
           [gl_cv_have_include_next=no])
        ])
@@ -105,24 +97,6 @@
   AC_SUBST([INCLUDE_NEXT])
   AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
   AC_SUBST([PRAGMA_SYSTEM_HEADER])
-  AC_CACHE_CHECK([whether system header files limit the line length],
-    [gl_cv_pragma_columns],
-    [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
-     AC_EGREP_CPP([choke me],
-       [
-#ifdef __TANDEM
-choke me
-#endif
-       ],
-       [gl_cv_pragma_columns=yes],
-       [gl_cv_pragma_columns=no])
-    ])
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
-  AC_SUBST([PRAGMA_COLUMNS])
 ])
 
 # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
@@ -143,81 +117,71 @@
 # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
 # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.
-#
-# This macro also checks whether each header exists, by invoking
-# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument.
 AC_DEFUN([gl_CHECK_NEXT_HEADERS],
 [
-  gl_NEXT_HEADERS_INTERNAL([$1], [check])
-])
-
-# gl_NEXT_HEADERS(HEADER1 HEADER2 ...)
-# ------------------------------------
-# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist.
-# This is suitable for headers like <stddef.h> that are standardized by C89
-# and therefore can be assumed to exist.
-AC_DEFUN([gl_NEXT_HEADERS],
-[
-  gl_NEXT_HEADERS_INTERNAL([$1], [assume])
-])
-
-# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS.
-AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
-[
   AC_REQUIRE([gl_INCLUDE_NEXT])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_HEADERS_ONCE([$1])
 
-  m4_if([$2], [check],
-    [AC_CHECK_HEADERS_ONCE([$1])
-    ])
-
-dnl FIXME: gl_next_header and gl_header_exists must be used unquoted
-dnl until we can assume autoconf 2.64 or newer.
   m4_foreach_w([gl_HEADER_NAME], [$1],
     [AS_VAR_PUSHDEF([gl_next_header],
                     [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
      if test $gl_cv_have_include_next = yes; then
-       AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
      else
        AC_CACHE_CHECK(
          [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
          m4_defn([gl_next_header]),
-         [m4_if([$2], [check],
-            [AS_VAR_PUSHDEF([gl_header_exists],
-                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
-             if test AS_VAR_GET(gl_header_exists) = yes; then
-             AS_VAR_POPDEF([gl_header_exists])
-            ])
-           gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
-           AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
-           AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
-          m4_if([$2], [check],
-            [else
-               AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
-             fi
-            ])
-         ])
+         [AS_VAR_PUSHDEF([gl_header_exists],
+                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+          if test AS_VAR_GET(gl_header_exists) = yes; then
+            AC_LANG_CONFTEST(
+              [AC_LANG_SOURCE(
+                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
+               )])
+            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+            dnl that contain only a #include of other header files and no
+            dnl non-comment tokens of their own. This leads to a failure to
+            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+            dnl and others. The workaround is to force preservation of comments
+            dnl through option -C. This ensures all necessary #line directives
+            dnl are present. GCC supports option -C as well.
+            case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+            dnl eval is necessary to expand gl_absname_cpp.
+            dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+            dnl so use subshell.
+            AS_VAR_SET([gl_next_header],
+              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
+                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'])
+          else
+            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+          fi
+          AS_VAR_POPDEF([gl_header_exists])])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
-       [AS_VAR_GET(gl_next_header)])
+       [AS_VAR_GET([gl_next_header])])
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
        gl_next_as_first_directive='<'gl_HEADER_NAME'>'
      else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=AS_VAR_GET(gl_next_header)
+       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
        [$gl_next_as_first_directive])
      AS_VAR_POPDEF([gl_next_header])])
 ])
-
-# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
-# this fallback is safe for all earlier autoconf versions.
-m4_define_default([AC_LANG_DEFINES_PROVIDED])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/inline.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/inline.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/inline.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/inline.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/intmax_t.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/intmax_t.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/intmax_t.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/intmax_t.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# intmax_t.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2014 Free Software Foundation,
+# intmax_t.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2010 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,
@@ -7,7 +7,7 @@
 
 dnl From Paul Eggert.
 
-AC_PREREQ([2.53])
+AC_PREREQ([2.13])
 
 # Define intmax_t to 'long' or 'long long'
 # if it is not already defined in <stdint.h> or <inttypes.h>.
@@ -38,9 +38,7 @@
   AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
+    [AC_TRY_COMPILE([
 #include <stddef.h>
 #include <stdlib.h>
 #if HAVE_STDINT_H_WITH_UINTMAX
@@ -49,10 +47,7 @@
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-          ]],
-          [[intmax_t x = -1; return !x;]])],
-       [gt_cv_c_intmax_t=yes],
-       [gt_cv_c_intmax_t=no])])
+], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
   if test $gt_cv_c_intmax_t = yes; then
     AC_DEFINE([HAVE_INTMAX_T], [1],
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/inttypes.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/inttypes.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/inttypes.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/inttypes.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-# inttypes.m4 serial 26
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 From Derek Price, Bruno Haible.
-dnl Test whether <inttypes.h> is supported or must be substituted.
-
-AC_DEFUN([gl_INTTYPES_H],
-[
-  AC_REQUIRE([gl_INTTYPES_INCOMPLETE])
-  gl_INTTYPES_PRI_SCN
-])
-
-AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE],
-[
-  AC_REQUIRE([gl_STDINT_H])
-  AC_CHECK_HEADERS_ONCE([inttypes.h])
-
-  dnl Override <inttypes.h> always, so that the portability warnings work.
-  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
-  gl_CHECK_NEXT_HEADERS([inttypes.h])
-
-  AC_REQUIRE([gl_MULTIARCH])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <inttypes.h>
-    ]], [imaxabs imaxdiv strtoimax strtoumax])
-])
-
-# Ensure that the PRI* and SCN* macros are defined appropriately.
-AC_DEFUN([gl_INTTYPES_PRI_SCN],
-[
-  AC_REQUIRE([gt_INTTYPES_PRI])
-
-  PRIPTR_PREFIX=
-  if test -n "$STDINT_H"; then
-    dnl Using the gnulib <stdint.h>. It always defines intptr_t to 'long'.
-    PRIPTR_PREFIX='"l"'
-  else
-    dnl Using the system's <stdint.h>.
-    for glpfx in '' l ll I64; do
-      case $glpfx in
-        '')  gltype1='int';;
-        l)   gltype1='long int';;
-        ll)  gltype1='long long int';;
-        I64) gltype1='__int64';;
-      esac
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[#include <stdint.h>
-           extern intptr_t foo;
-           extern $gltype1 foo;]])],
-        [PRIPTR_PREFIX='"'$glpfx'"'])
-      test -n "$PRIPTR_PREFIX" && break
-    done
-  fi
-  AC_SUBST([PRIPTR_PREFIX])
-
-  gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-    [INT32_MAX_LT_INTMAX_MAX],
-    [defined INT32_MAX && defined INTMAX_MAX],
-    [INT32_MAX < INTMAX_MAX],
-    [sizeof (int) < sizeof (long long int)])
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-      [INT64_MAX_EQ_LONG_MAX],
-      [defined INT64_MAX],
-      [INT64_MAX == LONG_MAX],
-      [sizeof (long long int) == sizeof (long int)])
-  else
-    INT64_MAX_EQ_LONG_MAX=-1
-  fi
-  gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-    [UINT32_MAX_LT_UINTMAX_MAX],
-    [defined UINT32_MAX && defined UINTMAX_MAX],
-    [UINT32_MAX < UINTMAX_MAX],
-    [sizeof (unsigned int) < sizeof (unsigned long long int)])
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-      [UINT64_MAX_EQ_ULONG_MAX],
-      [defined UINT64_MAX],
-      [UINT64_MAX == ULONG_MAX],
-      [sizeof (unsigned long long int) == sizeof (unsigned long int)])
-  else
-    UINT64_MAX_EQ_ULONG_MAX=-1
-  fi
-])
-
-# Define the symbol $1 to be 1 if the condition is true, 0 otherwise.
-# If $2 is true, the condition is $3; otherwise if long long int is supported
-# approximate the condition with $4; otherwise, assume the condition is false.
-# The condition should work on all C99 platforms; the approximations should be
-# good enough to work on all practical pre-C99 platforms.
-# $2 is evaluated by the C preprocessor, $3 and $4 as compile-time constants.
-AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION],
-[
-  AC_CACHE_CHECK([whether $3],
-    [gl_cv_test_$1],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[/* Work also in C++ mode.  */
-            #define __STDC_LIMIT_MACROS 1
-
-            /* Work if build is not clean.  */
-            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-
-            #include <limits.h>
-            #if HAVE_STDINT_H
-             #include <stdint.h>
-            #endif
-
-            #if $2
-             #define CONDITION ($3)
-            #elif HAVE_LONG_LONG_INT
-             #define CONDITION ($4)
-            #else
-             #define CONDITION 0
-            #endif
-            int test[CONDITION ? 1 : -1];]])],
-       [gl_cv_test_$1=yes],
-       [gl_cv_test_$1=no])])
-  if test $gl_cv_test_$1 = yes; then
-    $1=1;
-  else
-    $1=0;
-  fi
-  AC_SUBST([$1])
-])
-
-AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-])
-
-AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
-[
-  GNULIB_IMAXABS=0;      AC_SUBST([GNULIB_IMAXABS])
-  GNULIB_IMAXDIV=0;      AC_SUBST([GNULIB_IMAXDIV])
-  GNULIB_STRTOIMAX=0;    AC_SUBST([GNULIB_STRTOIMAX])
-  GNULIB_STRTOUMAX=0;    AC_SUBST([GNULIB_STRTOUMAX])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_IMAXABS=1;   AC_SUBST([HAVE_DECL_IMAXABS])
-  HAVE_DECL_IMAXDIV=1;   AC_SUBST([HAVE_DECL_IMAXDIV])
-  HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
-  HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
-  REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
-  REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
-  INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
-  INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
-  PRI_MACROS_BROKEN=0;   AC_SUBST([PRI_MACROS_BROKEN])
-  PRIPTR_PREFIX=__PRIPTR_PREFIX;  AC_SUBST([PRIPTR_PREFIX])
-  UINT32_MAX_LT_UINTMAX_MAX=1;  AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX])
-  UINT64_MAX_EQ_ULONG_MAX='defined _LP64';  AC_SUBST([UINT64_MAX_EQ_ULONG_MAX])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/iswblank.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/iswblank.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/iswblank.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/iswblank.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# iswblank.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_ISWBLANK],
-[
-  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
-  AC_REQUIRE([gl_WCTYPE_H])
-  dnl Persuade glibc <wctype.h> to declare iswblank().
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_FUNCS_ONCE([iswblank])
-  AC_CHECK_DECLS([iswblank], , , [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
-]])
-  if test $ac_cv_func_iswblank = no; then
-    HAVE_ISWBLANK=0
-    if test $ac_cv_have_decl_iswblank = yes; then
-      REPLACE_ISWBLANK=1
-    fi
-  fi
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    dnl Redefine all of iswcntrl, ..., towupper in <wctype.h>.
-    :
-  else
-    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-      dnl Redefine only iswblank.
-      :
-    fi
-  fi
-
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/javacomp.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/javacomp.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/javacomp.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/javacomp.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # javacomp.m4 serial 12
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-m4/javaexec.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/javaexec.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/javaexec.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/javaexec.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # javaexec.m4 serial 5
-dnl Copyright (C) 2001-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/largefile.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/largefile.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/largefile.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/largefile.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-# Enable large files on systems where this is not the default.
-
-# Copyright 1992-1996, 1998-2014 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.
-
-# The following implementation works around a problem in autoconf <= 2.69;
-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
-# or configures them incorrectly in some cases.
-m4_version_prereq([2.70], [] ,[
-
-# _AC_SYS_LARGEFILE_TEST_INCLUDES
-# -------------------------------
-m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
-[@%:@include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1]];[]dnl
-])
-
-
-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
-#                               CACHE-VAR,
-#                               DESCRIPTION,
-#                               PROLOGUE, [FUNCTION-BODY])
-# --------------------------------------------------------
-m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
-[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
-[while :; do
-  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
-    [AC_LANG_PROGRAM([$5], [$6])],
-    [$3=no; break])
-  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
-    [AC_LANG_PROGRAM([@%:@define $1 $2
-$5], [$6])],
-    [$3=$2; break])
-  $3=unknown
-  break
-done])
-case $$3 in #(
-  no | unknown) ;;
-  *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
-esac
-rm -rf conftest*[]dnl
-])# _AC_SYS_LARGEFILE_MACRO_VALUE
-
-
-# AC_SYS_LARGEFILE
-# ----------------
-# By default, many hosts won't let programs access large files;
-# one must use special compiler options to get large-file access to work.
-# For more details about this brain damage please see:
-# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html
-AC_DEFUN([AC_SYS_LARGEFILE],
-[AC_ARG_ENABLE(largefile,
-               [  --disable-largefile     omit support for large files])
-if test "$enable_largefile" != no; then
-
-  AC_CACHE_CHECK([for special C compiler options needed for large files],
-    ac_cv_sys_largefile_CC,
-    [ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
-         AC_COMPILE_IFELSE([], [break])
-         CC="$CC -n32"
-         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi])
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-    ac_cv_sys_file_offset_bits,
-    [Number of bits in a file offset, on hosts where this is settable.],
-    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
-      ac_cv_sys_large_files,
-      [Define for large files, on AIX-style hosts.],
-      [_AC_SYS_LARGEFILE_TEST_INCLUDES])
-  fi
-
-  AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1],
-    [Enable large inode numbers on Mac OS X 10.5.])
-fi
-])# AC_SYS_LARGEFILE
-])# m4_version_prereq 2.70
-
-# Enable large files on systems where this is implemented by Gnulib, not by the
-# system headers.
-# Set the variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE if Gnulib
-# overrides ensure that off_t or 'struct size.st_size' are 64-bit, respectively.
-AC_DEFUN([gl_LARGEFILE],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      dnl Native Windows.
-      dnl mingw64 defines off_t to a 64-bit type already, if
-      dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
-      AC_CACHE_CHECK([for 64-bit off_t], [gl_cv_type_off_t_64],
-        [AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <sys/types.h>
-                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
-              ]],
-              [[]])],
-           [gl_cv_type_off_t_64=yes], [gl_cv_type_off_t_64=no])
-        ])
-      if test $gl_cv_type_off_t_64 = no; then
-        WINDOWS_64_BIT_OFF_T=1
-      else
-        WINDOWS_64_BIT_OFF_T=0
-      fi
-      dnl But all native Windows platforms (including mingw64) have a 32-bit
-      dnl st_size member in 'struct stat'.
-      WINDOWS_64_BIT_ST_SIZE=1
-      ;;
-    *)
-      dnl Nothing to do on gnulib's side.
-      dnl A 64-bit off_t is
-      dnl   - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
-      dnl     OSF/1, Cygwin,
-      dnl   - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
-      dnl     glibc, HP-UX, Solaris,
-      dnl   - enabled by _LARGE_FILES=1 (ensured by AC_SYS_LARGEFILE) on AIX,
-      dnl   - impossible to achieve on Minix 3.1.8.
-      WINDOWS_64_BIT_OFF_T=0
-      WINDOWS_64_BIT_ST_SIZE=0
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/lib-ld.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/lib-ld.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/lib-ld.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/lib-ld.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,56 +1,50 @@
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
 
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
+  acl_cv_prog_gnu_ld=yes ;;
 *)
-  acl_cv_prog_gnu_ld=no
-  ;;
+  acl_cv_prog_gnu_ld=no ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-2.4. Sets the variable LD.
+dnl From libtool-1.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
+[AC_ARG_WITH([gnu-ld],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
+  AC_MSG_CHECKING([for ld used by GCC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -60,11 +54,11 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -85,26 +79,23 @@
 fi
 AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
+        test "$with_gnu_ld" != no && break ;;
       *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+        test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
-  IFS="$acl_save_ifs"
+  IFS="$ac_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/lib-link.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/lib-link.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/lib-link.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/lib-link.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,9 +18,9 @@
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
     AC_LIB_LINKFLAGS_BODY([$1], [$2])
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -58,9 +58,9 @@
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
   dnl accordingly.
@@ -85,8 +85,7 @@
       *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
       *)       LIBS="$LIB[]NAME $LIBS" ;;
     esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
+    AC_TRY_LINK([$3], [$4],
       [ac_cv_lib[]Name=yes],
       [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
     LIBS="$ac_save_LIBS"
@@ -116,8 +115,6 @@
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl   acl_libext,
 dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
 dnl   acl_hardcode_libdir_flag_spec,
 dnl   acl_hardcode_libdir_separator,
 dnl   acl_hardcode_direct,
@@ -160,15 +157,15 @@
 dnl macro call that searches for libname.
 AC_DEFUN([AC_LIB_FROMPACKAGE],
 [
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   define([acl_frompackage_]NAME, [$2])
   popdef([NAME])
   pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
   popdef([PACKUP])
   popdef([PACK])
 ])
@@ -181,14 +178,14 @@
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
   dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
@@ -245,7 +242,7 @@
         names_already_handled="$names_already_handled $name"
         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
         dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/lib-prefix.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/lib-prefix.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/lib-prefix.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/lib-prefix.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/libunistring-base.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/libunistring-base.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/libunistring-base.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/libunistring-base.m4	2010-06-04 10:02:46.000000000 +0000
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/libunistring.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/libunistring.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/libunistring.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/libunistring.m4	2010-06-03 21:36:14.000000000 +0000
@@ -1,5 +1,5 @@
-# libunistring.m4 serial 11
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# libunistring.m4 serial 9
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,11 +25,8 @@
   m4_version_prereq([2.64],
     [[AC_DEFUN_ONCE(
         [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
+    [[AC_DEFUN(
+        [$1], [$2])]]))
 gl_libunistring_AC_DEFUN([gl_LIBUNISTRING],
 [
   AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE])
@@ -106,10 +103,9 @@
        dnl Use other tests to distinguish them.
        if test $gl_libunistring_hexversion = 9; then
          dnl Version 0.9.2 introduced the header <unistring/cdefs.h>.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM([[#include <unistring/cdefs.h>]], [[]])],
+         AC_TRY_COMPILE([#include <unistring/cdefs.h>], ,
            [gl_cv_libunistring_version092=true],
-           [gl_cv_libunistring_version092=false])
+           [gl_cv_libunistring_version092=false]);
          if $gl_cv_libunistring_version092; then
            dnl Version 0.9.3 changed a comment in <unistr.h>.
            gl_ABSOLUTE_HEADER_ONE([unistr.h])
@@ -123,11 +119,8 @@
            fi
          else
            dnl Version 0.9.1 introduced the type casing_suffix_context_t.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_PROGRAM(
-                [[#include <unicase.h>
-                  casing_suffix_context_t ct;]],
-                [[]])],
+           AC_TRY_COMPILE([#include <unicase.h>
+                           casing_suffix_context_t ct;], ,
              [gl_cv_libunistring_version091=true],
              [gl_cv_libunistring_version091=false])
            if $gl_cv_libunistring_version091; then
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/libunistring-optional.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/libunistring-optional.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/libunistring-optional.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/libunistring-optional.m4	2010-05-24 10:42:19.000000000 +0000
@@ -1,5 +1,5 @@
 # libunistring-optional.m4 serial 1
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/libxml.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/libxml.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/libxml.m4	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/libxml.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,4 +1,4 @@
-# libxml.m4 serial 6 (gettext-0.18.2)
+# libxml.m4 serial 5 (gettext-0.18)
 dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,16 +36,10 @@
       dnl Don't use xml2-config nor pkg-config, since it doesn't work when
       dnl cross-compiling or when the C compiler in use is different from the
       dnl one that built the library.
-      dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x,
-      dnl libxml2 is built in such a way that uses of xmlFree work fine with
-      dnl -Wl,--enable-auto-import but lead to a link error with
-      dnl -Wl,--disable-auto-import.
       AC_LIB_LINKFLAGS_BODY([xml2])
       LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
-      AC_TRY_LINK([#include <libxml/xmlversion.h>
-                   #include <libxml/xmlmemory.h>
-                  ],
-        [xmlCheckVersion (0); xmlFree ((void *) 0);],
+      AC_TRY_LINK([#include <libxml/xmlversion.h>],
+        [xmlCheckVersion (0);],
         [gl_cv_libxml=yes
          gl_cv_LIBXML="$LIBXML2 $LIBICONV"
          gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -53,10 +47,8 @@
       if test "$gl_cv_libxml" != yes; then
         gl_save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $INCXML2"
-        AC_TRY_LINK([#include <libxml/xmlversion.h>
-                     #include <libxml/xmlmemory.h>
-                    ],
-          [xmlCheckVersion (0); xmlFree ((void *) 0);],
+        AC_TRY_LINK([#include <libxml/xmlversion.h>],
+          [xmlCheckVersion (0);],
           [gl_cv_libxml=yes
            gl_cv_LIBXML="$LIBXML2 $LIBICONV"
            gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -80,10 +72,8 @@
           fi
           if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
-            AC_TRY_LINK([#include <libxml/xmlversion.h>
-                         #include <libxml/xmlmemory.h>
-                        ],
-              [xmlCheckVersion (0); xmlFree ((void *) 0);],
+            AC_TRY_LINK([#include <libxml/xmlversion.h>],
+              [xmlCheckVersion (0);],
               [gl_cv_libxml=yes
                gl_cv_LIBXML="$LIBXML2 $LIBICONV"
                gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/localcharset.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/localcharset.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/localcharset.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/localcharset.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/locale-fr.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-fr.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/locale-fr.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-fr.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-fr.m4 serial 11
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,30 +25,17 @@
 char buf[16];
 int main () {
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -63,67 +50,46 @@
      one byte long. This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr=fr_FR.ISO-8859-1
+        else
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR.ISO8859-1
           else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
+            # Test for the HP-UX locale name.
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.iso88591
             else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
               else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
+                # None found.
+                gt_cv_locale_fr=none
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
   ])
@@ -153,19 +119,9 @@
      variables, and all locales use the UTF-8 encoding.  */
 #if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -191,57 +147,36 @@
       || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
     return 1;
 #endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
      On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
      are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
   return 0;
 }
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_fr_utf8=fr_FR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr.UTF-8
           else
             # None found.
             gt_cv_locale_fr_utf8=none
           fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
   ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/locale_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/locale_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/locale_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/locale_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+# locale_h.m4 serial 10
+dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,30 +10,16 @@
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
 
-  dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_*
-  dnl members of 'struct lconv'.
+  dnl Persuade glibc <locale.h> to define locale_t.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.
   AC_REQUIRE([gl_STDDEF_H])
 
-  dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lconv'
-  dnl only if _LCONV_C99 is defined.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    solaris*)
-      AC_DEFINE([_LCONV_C99], [1], [Define to 1 on Solaris.])
-      ;;
-  esac
-
   AC_CACHE_CHECK([whether locale.h conforms to POSIX:2001],
     [gl_cv_header_locale_h_posix2001],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>
-            int x = LC_MESSAGES;
-            int y = sizeof (((struct lconv *) 0)->decimal_point);]],
-          [[]])],
+    [AC_TRY_COMPILE([#include <locale.h>
+int x = LC_MESSAGES;], [],
        [gl_cv_header_locale_h_posix2001=yes],
        [gl_cv_header_locale_h_posix2001=no])])
 
@@ -42,15 +28,12 @@
   if test $ac_cv_header_xlocale_h = yes; then
     HAVE_XLOCALE_H=1
     dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
-    dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
+    dnl e.g. on MacOS X 10.5. If <locale.h> does not define locale_t by
     dnl itself, we assume that <xlocale.h> will do so.
     AC_CACHE_CHECK([whether locale.h defines locale_t],
       [gl_cv_header_locale_has_locale_t],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <locale.h>
-              locale_t x;]],
-            [[]])],
+      [AC_TRY_COMPILE([#include <locale.h>
+locale_t x;], [],
          [gl_cv_header_locale_has_locale_t=yes],
          [gl_cv_header_locale_has_locale_t=no])
       ])
@@ -65,28 +48,14 @@
   fi
   AC_SUBST([HAVE_XLOCALE_H])
 
-  dnl Check whether 'struct lconv' is complete.
-  dnl Bionic libc's 'struct lconv' is just a dummy.
-  dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin 1.5.x,
-  dnl mingw, MSVC 9, it lacks the int_p_* and int_n_* members.
-  AC_CACHE_CHECK([whether struct lconv is properly defined],
-    [gl_cv_sys_struct_lconv_ok],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>
-            struct lconv l;
-            int x = sizeof (l.decimal_point);
-            int y = sizeof (l.int_p_cs_precedes);]],
-          [[]])],
-       [gl_cv_sys_struct_lconv_ok=yes],
-       [gl_cv_sys_struct_lconv_ok=no])
-    ])
-  if test $gl_cv_sys_struct_lconv_ok = no; then
-    REPLACE_STRUCT_LCONV=1
-  fi
-
   dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.
-  gl_NEXT_HEADERS([locale.h])
+  gl_CHECK_NEXT_HEADERS([locale.h])
+
+  if test -n "$STDDEF_H" \
+     || test $gl_cv_header_locale_h_posix2001 = no \
+     || test $gl_cv_header_locale_h_needs_xlocale_h = yes; then
+    gl_REPLACE_LOCALE_H
+  fi
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
@@ -95,8 +64,14 @@
 #if HAVE_XLOCALE_H
 # include <xlocale.h>
 #endif
-    ]],
-    [setlocale duplocale])
+   ]], [duplocale])
+])
+
+dnl Unconditionally enables the replacement of <locale.h>.
+AC_DEFUN([gl_REPLACE_LOCALE_H],
+[
+  dnl This is a no-op, because <locale.h> is always overridden.
+  :
 ])
 
 AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
@@ -110,13 +85,8 @@
 
 AC_DEFUN([gl_LOCALE_H_DEFAULTS],
 [
-  GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV])
-  GNULIB_SETLOCALE=0;  AC_SUBST([GNULIB_SETLOCALE])
   GNULIB_DUPLOCALE=0;  AC_SUBST([GNULIB_DUPLOCALE])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DUPLOCALE=1;       AC_SUBST([HAVE_DUPLOCALE])
-  REPLACE_LOCALECONV=0;   AC_SUBST([REPLACE_LOCALECONV])
-  REPLACE_SETLOCALE=0;    AC_SUBST([REPLACE_SETLOCALE])
-  REPLACE_DUPLOCALE=0;    AC_SUBST([REPLACE_DUPLOCALE])
-  REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
+  HAVE_DUPLOCALE=1;    AC_SUBST([HAVE_DUPLOCALE])
+  REPLACE_DUPLOCALE=0; AC_SUBST([REPLACE_DUPLOCALE])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/locale-ja.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-ja.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/locale-ja.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-ja.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-ja.m4 serial 7
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -27,30 +27,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -65,7 +52,7 @@
   if (MB_CUR_MAX == 1)
     return 1;
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -76,58 +63,42 @@
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the AIX locale name.
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_ja=ja_JP
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_ja=ja_JP.EUC-JP
+        else
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP.eucJP
           else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
+            # Test for the IRIX, FreeBSD locale name.
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC
             else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja
               else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=ja_JP.eucJP
                 else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
+                  # None found.
+                  gt_cv_locale_ja=none
                 fi
               fi
             fi
           fi
-          ;;
-      esac
+        fi
+      fi
     fi
     rm -fr conftest*
   ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/localename.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/localename.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/localename.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/localename.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/locale-tr.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-tr.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/locale-tr.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-tr.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-tr.m4 serial 10
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-tr.m4 serial 6
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,6 @@
 dnl Determine the name of a turkish locale with UTF-8 encoding.
 AC_DEFUN([gt_LOCALE_TR_UTF8],
 [
-  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CACHE_CHECK([for a turkish Unicode locale], [gt_cv_locale_tr_utf8], [
     AC_LANG_CONFTEST([AC_LANG_SOURCE([
@@ -30,19 +29,9 @@
      implement the Turkish upper-/lowercase mappings.  Therefore, let this
      program return 1 on BeOS.  */
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -77,46 +66,27 @@
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Turkish_Turkey.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_tr_utf8=Turkish_Turkey.65001
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the usual locale name.
+      if (LC_ALL=tr_TR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_tr_utf8=tr_TR
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=tr_TR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_tr_utf8=tr_TR.UTF-8
+        else
+          # Test for the Solaris 7 locale name.
+          if (LC_ALL=tr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_tr_utf8=tr.UTF-8
           else
             # None found.
             gt_cv_locale_tr_utf8=none
           fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=tr_TR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_tr_utf8=tr_TR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=tr_TR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_tr_utf8=tr_TR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=tr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_tr_utf8=tr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_tr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     else
       gt_cv_locale_tr_utf8=none
     fi
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/locale-zh.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-zh.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/locale-zh.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/locale-zh.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+# locale-zh.m4 serial 6
+dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -28,30 +28,17 @@
 {
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
   if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
      succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+     some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
     const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
       return 1;
   }
 #endif
@@ -62,7 +49,7 @@
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
+     This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
   for (p = buf; *p != '\0'; p++)
@@ -77,47 +64,22 @@
 changequote([,])dnl
       ])])
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # configure script would override the LC_ALL setting. Likewise for
+      # LC_CTYPE, which is also set at the beginning of the configure script.
+      # Test for the locale name without encoding suffix.
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+        gt_cv_locale_zh_CN=zh_CN
+      else
+        # Test for the locale name with explicit encoding suffix.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          gt_cv_locale_zh_CN=zh_CN.GB18030
+        else
+          # None found.
           gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
+        fi
+      fi
     else
       # If there was a link error, due to mblen(), the system is so old that
       # it certainly doesn't have a chinese locale.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/lseek.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/lseek.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/lseek.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/lseek.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-# lseek.m4 serial 10
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_LSEEK],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_CACHE_CHECK([whether lseek detects pipes], [gl_cv_func_lseek_pipe],
-    [case "$host_os" in
-       mingw*)
-         dnl Native Windows.
-         dnl The result of lseek (fd, (off_t)0, SEEK_CUR) or
-         dnl SetFilePointer(handle, 0, NULL, FILE_CURRENT)
-         dnl for a pipe depends on the environment: In a Cygwin 1.5
-         dnl environment it succeeds (wrong); in a Cygwin 1.7 environment
-         dnl it fails with a wrong errno value.
-         gl_cv_func_lseek_pipe=no
-         ;;
-       *)
-         if test $cross_compiling = no; then
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/types.h> /* for off_t */
-#include <stdio.h> /* for SEEK_CUR */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#else /* on Windows with MSVC */
-# include <io.h>
-#endif
-]], [[
-  /* Exit with success only if stdin is seekable.  */
-  return lseek (0, (off_t)0, SEEK_CUR) < 0;
-]])],
-             [if test -s conftest$ac_exeext \
-                 && ./conftest$ac_exeext < conftest.$ac_ext \
-                 && test 1 = "`echo hi \
-                   | { ./conftest$ac_exeext; echo $?; cat >/dev/null; }`"; then
-                gl_cv_func_lseek_pipe=yes
-              else
-                gl_cv_func_lseek_pipe=no
-              fi
-             ],
-             [gl_cv_func_lseek_pipe=no])
-         else
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE([[
-#if defined __BEOS__
-/* BeOS mistakenly return 0 when trying to seek on pipes.  */
-  Choke me.
-#endif]])],
-             [gl_cv_func_lseek_pipe=yes], [gl_cv_func_lseek_pipe=no])
-         fi
-         ;;
-     esac
-    ])
-  if test $gl_cv_func_lseek_pipe = no; then
-    REPLACE_LSEEK=1
-    AC_DEFINE([LSEEK_PIPE_BROKEN], [1],
-      [Define to 1 if lseek does not detect pipes.])
-  fi
-
-  AC_REQUIRE([gl_SYS_TYPES_H])
-  if test $WINDOWS_64_BIT_OFF_T = 1; then
-    REPLACE_LSEEK=1
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/lstat.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/lstat.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/lstat.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/lstat.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,6 +1,6 @@
-# serial 26
+# serial 20
 
-# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,59 +15,14 @@
   dnl "#define lstat stat", and lstat.c is a no-op.
   AC_CHECK_FUNCS_ONCE([lstat])
   if test $ac_cv_func_lstat = yes; then
-    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
-    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-      *no)
-        REPLACE_LSTAT=1
-        ;;
-    esac
+    AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+    if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+      dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]).
+      REPLACE_LSTAT=1
+    fi
+    # Prerequisites of lib/lstat.c.
+    AC_REQUIRE([AC_C_INLINE])
   else
     HAVE_LSTAT=0
   fi
 ])
-
-# Prerequisites of lib/lstat.c.
-AC_DEFUN([gl_PREREQ_LSTAT], [:])
-
-AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
-[
-  dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
-  dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
-  AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
-    [gl_cv_func_lstat_dereferences_slashed_symlink],
-    [rm -f conftest.sym conftest.file
-     echo >conftest.file
-     if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-       AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-            [AC_INCLUDES_DEFAULT],
-            [[struct stat sbuf;
-              /* Linux will dereference the symlink and fail, as required by
-                 POSIX.  That is better in the sense that it means we will not
-                 have to compile and use the lstat wrapper.  */
-              return lstat ("conftest.sym/", &sbuf) == 0;
-            ]])],
-         [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
-         [gl_cv_func_lstat_dereferences_slashed_symlink=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
-          esac
-         ])
-     else
-       # If the 'ln -s' command failed, then we probably don't even
-       # have an lstat function.
-       gl_cv_func_lstat_dereferences_slashed_symlink="guessing no"
-     fi
-     rm -f conftest.sym conftest.file
-    ])
-  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-    *yes)
-      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
-        [Define to 1 if 'lstat' dereferences a symlink specified
-         with a trailing slash.])
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/malloca.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/malloca.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/malloca.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/malloca.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-m4/malloc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/malloc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/malloc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/malloc.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,78 +1,25 @@
-# malloc.m4 serial 14
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+# malloc.m4 serial 9
+dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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
-AC_DEFUN([_AC_FUNC_MALLOC_IF],
-[
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-  AC_CHECK_HEADERS([stdlib.h])
-  AC_CACHE_CHECK([for GNU libc compatible malloc],
-    [ac_cv_func_malloc_0_nonnull],
-    [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-            # include <stdlib.h>
-            #else
-            char *malloc ();
-            #endif
-          ]],
-          [[return ! malloc (0);]])
-       ],
-       [ac_cv_func_malloc_0_nonnull=yes],
-       [ac_cv_func_malloc_0_nonnull=no],
-       [case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* \
-          | hpux* | solaris* | cygwin* | mingw*)
-            ac_cv_func_malloc_0_nonnull=yes ;;
-          # If we don't know, assume the worst.
-          *) ac_cv_func_malloc_0_nonnull=no ;;
-        esac
-       ])
-    ])
-  AS_IF([test $ac_cv_func_malloc_0_nonnull = yes], [$1], [$2])
-])# _AC_FUNC_MALLOC_IF
-
-])
-
-# gl_FUNC_MALLOC_GNU
-# ------------------
-# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if
-# it is not.
-AC_DEFUN([gl_FUNC_MALLOC_GNU],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  dnl _AC_FUNC_MALLOC_IF is defined in Autoconf.
-  _AC_FUNC_MALLOC_IF(
-    [AC_DEFINE([HAVE_MALLOC_GNU], [1],
-               [Define to 1 if your system has a GNU libc compatible 'malloc'
-                function, and to 0 otherwise.])],
-    [AC_DEFINE([HAVE_MALLOC_GNU], [0])
-     REPLACE_MALLOC=1
-    ])
-])
-
 # gl_FUNC_MALLOC_POSIX
 # --------------------
 # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
 # fails), and replace malloc if it is not.
 AC_DEFUN([gl_FUNC_MALLOC_POSIX],
 [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
   if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
     AC_DEFINE([HAVE_MALLOC_POSIX], [1],
       [Define if the 'malloc' function is POSIX compliant.])
   else
-    REPLACE_MALLOC=1
+    AC_LIBOBJ([malloc])
+    HAVE_MALLOC_POSIX=0
   fi
+  AC_SUBST([HAVE_MALLOC_POSIX])
 ])
 
 # Test whether malloc, realloc, calloc are POSIX compliant,
@@ -85,14 +32,10 @@
       dnl It is too dangerous to try to allocate a large amount of memory:
       dnl some systems go to their knees when you do that. So assume that
       dnl all Unix implementations of the function are POSIX compliant.
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[]],
-           [[#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-             choke me
-             #endif
-            ]])],
-        [gl_cv_func_malloc_posix=yes],
-        [gl_cv_func_malloc_posix=no])
+      AC_TRY_COMPILE([],
+        [#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+         choke me
+         #endif
+        ], [gl_cv_func_malloc_posix=yes], [gl_cv_func_malloc_posix=no])
     ])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbchar.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbchar.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbchar.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbchar.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+# mbchar.m4 serial 8
+dnl Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,4 +10,5 @@
 AC_DEFUN([gl_MBCHAR],
 [
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([AC_C_INLINE])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbiter.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbiter.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbiter.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbiter.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
+# mbiter.m4 serial 5
+dnl Copyright (C) 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,10 @@
 
 AC_DEFUN([gl_MBITER],
 [
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  dnl The following line is that so the user can test HAVE_MBRTOWC before
+  dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010.
+  AC_REQUIRE([AC_FUNC_MBRTOWC])
   :
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbrtowc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbrtowc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbrtowc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbrtowc.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 26
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation,
+# mbrtowc.m4 serial 17
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2010 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,
@@ -15,41 +15,16 @@
   AC_CHECK_FUNCS_ONCE([mbrtowc])
   if test $ac_cv_func_mbrtowc = no; then
     HAVE_MBRTOWC=0
-    AC_CHECK_DECLS([mbrtowc],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_mbrtowc = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares mbrtowc() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_MBRTOWC=1
-    fi
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBRTOWC=1
     else
-      gl_MBRTOWC_NULL_ARG1
-      gl_MBRTOWC_NULL_ARG2
+      gl_MBRTOWC_NULL_ARG
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
-      gl_MBRTOWC_EMPTY_INPUT
-      case "$gl_cv_func_mbrtowc_null_arg1" in
-        *yes) ;;
-        *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
-             [Define if the mbrtowc function has the NULL pwc argument bug.])
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
-      case "$gl_cv_func_mbrtowc_null_arg2" in
+      case "$gl_cv_func_mbrtowc_null_arg" in
         *yes) ;;
-        *) AC_DEFINE([MBRTOWC_NULL_ARG2_BUG], [1],
+        *) AC_DEFINE([MBRTOWC_NULL_ARG_BUG], [1],
              [Define if the mbrtowc function has the NULL string argument bug.])
            REPLACE_MBRTOWC=1
            ;;
@@ -68,16 +43,13 @@
            REPLACE_MBRTOWC=1
            ;;
       esac
-      case "$gl_cv_func_mbrtowc_empty_input" in
-        *yes) ;;
-        *) AC_DEFINE([MBRTOWC_EMPTY_INPUT_BUG], [1],
-             [Define if the mbrtowc function does not return (size_t) -2
-              for empty input.])
-           REPLACE_MBRTOWC=1
-           ;;
-      esac
     fi
   fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([mbrtowc])
+    gl_PREREQ_MBRTOWC
+  fi
 ])
 
 dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that
@@ -108,6 +80,9 @@
   else
     REPLACE_MBSTATE_T=1
   fi
+  if test $REPLACE_MBSTATE_T = 1; then
+    gl_REPLACE_WCHAR_H
+  fi
 ])
 
 dnl Test whether mbrtowc puts the state into non-initial state when parsing an
@@ -126,24 +101,16 @@
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+              # Guess no on AIX and OSF/1.
+        osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+              # Guess yes otherwise.
+        *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_JA != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -159,7 +126,7 @@
           return 1;
     }
   return 0;
-}]])],
+}],
           [gl_cv_func_mbrtowc_incomplete_state=yes],
           [gl_cv_func_mbrtowc_incomplete_state=no],
           [:])
@@ -189,18 +156,10 @@
       esac
 changequote([,])dnl
       if test $LOCALE_ZH_CN != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -219,7 +178,7 @@
         return 1;
     }
   return 0;
-}]])],
+}],
           [gl_cv_func_mbrtowc_sanitycheck=yes],
           [gl_cv_func_mbrtowc_sanitycheck=no],
           [:])
@@ -227,109 +186,31 @@
     ])
 ])
 
-dnl Test whether mbrtowc supports a NULL pwc argument correctly.
-dnl Result is gl_cv_func_mbrtowc_null_arg1.
-
-AC_DEFUN([gl_MBRTOWC_NULL_ARG1],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument],
-    [gl_cv_func_mbrtowc_null_arg1],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                  # Guess no on Solaris.
-        solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
-                  # Guess yes otherwise.
-        *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
-      esac
-changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  int result = 0;
-
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      char input[] = "\303\237er";
-      mbstate_t state;
-      wchar_t wc;
-      size_t ret;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      wc = (wchar_t) 0xBADFACE;
-      ret = mbrtowc (&wc, input, 5, &state);
-      if (ret != 2)
-        result |= 1;
-      if (!mbsinit (&state))
-        result |= 2;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      ret = mbrtowc (NULL, input, 5, &state);
-      if (ret != 2) /* Solaris 7 fails here: ret is -1.  */
-        result |= 4;
-      if (!mbsinit (&state))
-        result |= 8;
-    }
-  return result;
-}]])],
-          [gl_cv_func_mbrtowc_null_arg1=yes],
-          [gl_cv_func_mbrtowc_null_arg1=no],
-          [:])
-      fi
-    ])
-])
-
 dnl Test whether mbrtowc supports a NULL string argument correctly.
-dnl Result is gl_cv_func_mbrtowc_null_arg2.
+dnl Result is gl_cv_func_mbrtowc_null_arg.
 
-AC_DEFUN([gl_MBRTOWC_NULL_ARG2],
+AC_DEFUN([gl_MBRTOWC_NULL_ARG],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([gt_LOCALE_FR_UTF8])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument],
-    [gl_cv_func_mbrtowc_null_arg2],
+    [gl_cv_func_mbrtowc_null_arg],
     [
       dnl Initial guess, used when cross-compiling or when no suitable locale
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
               # Guess no on OSF/1.
-        osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
+        osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;;
               # Guess yes otherwise.
-        *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
+        *)    gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR_UTF8 != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -347,10 +228,7 @@
         return 1;
     }
   return 0;
-}]])],
-          [gl_cv_func_mbrtowc_null_arg2=yes],
-          [gl_cv_func_mbrtowc_null_arg2=no],
-          [:])
+}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [:])
       fi
     ])
 ])
@@ -365,7 +243,7 @@
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([gt_LOCALE_FR_UTF8])
   AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc has a correct return value],
     [gl_cv_func_mbrtowc_retval],
     [
@@ -373,30 +251,19 @@
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-  int found_some_locale = 0;
   /* This fails on Solaris.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
@@ -409,9 +276,8 @@
         {
           input[1] = '\0';
           if (mbrtowc (&wc, input + 2, 5, &state) != 1)
-            result |= 1;
+            return 1;
         }
-      found_some_locale = 1;
     }
   /* This fails on HP-UX 11.11.  */
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
@@ -425,63 +291,13 @@
         {
           input[1] = '\0';
           if (mbrtowc (&wc, input + 2, 5, &state) != 2)
-            result |= 2;
+            return 1;
         }
-      found_some_locale = 1;
     }
-  /* This fails on native Windows.  */
-  if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL)
-    {
-      char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 4;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL)
-    {
-      char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 8;
-        }
-      found_some_locale = 1;
-    }
-  if (setlocale (LC_ALL, "Chinese_China.936") != NULL)
-    {
-      char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2))
-        {
-          input[3] = '\0';
-          if (mbrtowc (&wc, input + 4, 4, &state) != 1)
-            result |= 16;
-        }
-      found_some_locale = 1;
-    }
-  return (found_some_locale ? result : 77);
-}]])],
+  return 0;
+}],
           [gl_cv_func_mbrtowc_retval=yes],
-          [if test $? != 77; then
-             gl_cv_func_mbrtowc_retval=no
-           fi
-          ],
+          [gl_cv_func_mbrtowc_retval=no],
           [:])
       fi
     ])
@@ -509,17 +325,9 @@
       esac
 changequote([,])dnl
       if test $LOCALE_ZH_CN != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -534,7 +342,7 @@
         return 1;
     }
   return 0;
-}]])],
+}],
           [gl_cv_func_mbrtowc_nul_retval=yes],
           [gl_cv_func_mbrtowc_nul_retval=no],
           [:])
@@ -542,41 +350,6 @@
     ])
 ])
 
-dnl Test whether mbrtowc returns the correct value on empty input.
-
-AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrtowc works on empty input],
-    [gl_cv_func_mbrtowc_empty_input],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                     # Guess no on AIX and glibc systems.
-        aix* | *-gnu*)
-                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
-        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-      esac
-changequote([,])dnl
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-           #include <wchar.h>
-           static wchar_t wc;
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-           }]])],
-        [gl_cv_func_mbrtowc_empty_input=no],
-        [gl_cv_func_mbrtowc_empty_input=yes],
-        [:])
-    ])
-])
-
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
@@ -585,8 +358,10 @@
 
 dnl From Paul Eggert
 
-dnl This is an override of an autoconf macro.
+dnl This override of an autoconf macro can be removed when autoconf 2.60 or
+dnl newer can be assumed everywhere.
 
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.60]),[-1],[
 AC_DEFUN([AC_FUNC_MBRTOWC],
 [
   dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
@@ -594,14 +369,7 @@
     gl_cv_func_mbrtowc,
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-            [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                 included before <wchar.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 <stdio.h>
-              #include <time.h>
-              #include <wchar.h>]],
+            [[#include <wchar.h>]],
             [[wchar_t wc;
               char const s[] = "";
               size_t n = 1;
@@ -614,3 +382,4 @@
       [Define to 1 if mbrtowc and mbstate_t are properly declared.])
   fi
 ])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbsinit.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbsinit.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbsinit.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbsinit.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
+# mbsinit.m4 serial 4
+dnl Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,6 @@
 AC_DEFUN([gl_FUNC_MBSINIT],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   gl_MBSTATE_T_BROKEN
@@ -15,34 +14,16 @@
   AC_CHECK_FUNCS_ONCE([mbsinit])
   if test $ac_cv_func_mbsinit = no; then
     HAVE_MBSINIT=0
-    AC_CHECK_DECLS([mbsinit],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_mbsinit = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares mbsinit() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_MBSINIT=1
-    fi
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBSINIT=1
-    else
-      dnl On mingw, mbsinit() always returns 1, which is inappropriate for
-      dnl states produced by mbrtowc() for an incomplete multibyte character
-      dnl in multibyte locales.
-      case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
-      esac
     fi
   fi
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([mbsinit])
+    gl_PREREQ_MBSINIT
+  fi
 ])
 
 # Prerequisites of lib/mbsinit.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbslen.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbslen.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbslen.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbslen.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # mbslen.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbsrtowcs.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbsrtowcs.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbsrtowcs.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbsrtowcs.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbsrtowcs.m4 serial 13
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# mbsrtowcs.m4 serial 6
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -14,22 +14,6 @@
   AC_CHECK_FUNCS_ONCE([mbsrtowcs])
   if test $ac_cv_func_mbsrtowcs = no; then
     HAVE_MBSRTOWCS=0
-    AC_CHECK_DECLS([mbsrtowcs],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_mbsrtowcs = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares mbsrtowcs() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_MBSRTOWCS=1
-    fi
   else
     if test $REPLACE_MBSTATE_T = 1; then
       REPLACE_MBSRTOWCS=1
@@ -41,6 +25,12 @@
       esac
     fi
   fi
+  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([mbsrtowcs])
+    AC_LIBOBJ([mbsrtowcs-state])
+    gl_PREREQ_MBSRTOWCS
+  fi
 ])
 
 dnl Test whether mbsrtowcs works.
@@ -49,7 +39,6 @@
 AC_DEFUN([gl_MBSRTOWCS_WORKS],
 [
   AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR])
   AC_REQUIRE([gt_LOCALE_FR_UTF8])
   AC_REQUIRE([gt_LOCALE_JA])
   AC_REQUIRE([gt_LOCALE_ZH_CN])
@@ -61,41 +50,19 @@
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, mingw.
-        hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbsrtowcs_works="guessing yes" ;;
+                          # Guess no on HP-UX and Solaris.
+        hpux* | solaris*) gl_cv_func_mbsrtowcs_works="guessing no" ;;
+                          # Guess yes otherwise.
+        *)                gl_cv_func_mbsrtowcs_works="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
+        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
-  int result = 0;
-  /* Test whether the function supports a NULL destination argument.
-     This fails on native Windows.  */
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      const char input[] = "\337er";
-      const char *src = input;
-      mbstate_t state;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbsrtowcs (NULL, &src, 1, &state) != 3
-          || src != input)
-        result |= 1;
-    }
   /* Test whether the function works when started with a conversion state
      in non-initial state.  This fails on HP-UX 11.11 and Solaris 10.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
@@ -109,7 +76,7 @@
           {
             const char *src = input + 2;
             if (mbsrtowcs (NULL, &src, 10, &state) != 4)
-              result |= 2;
+              return 1;
           }
     }
   if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
@@ -123,7 +90,7 @@
           {
             const char *src = input + 4;
             if (mbsrtowcs (NULL, &src, 10, &state) != 3)
-              result |= 4;
+              return 1;
           }
     }
   if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
@@ -137,11 +104,11 @@
           {
             const char *src = input + 2;
             if (mbsrtowcs (NULL, &src, 10, &state) != 4)
-              result |= 8;
+              return 1;
           }
     }
-  return result;
-}]])],
+  return 0;
+}],
           [gl_cv_func_mbsrtowcs_works=yes],
           [gl_cv_func_mbsrtowcs_works=no],
           [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbstate_t.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbstate_t.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbstate_t.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbstate_t.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2014 Free Software Foundation, Inc.
+# mbstate_t.m4 serial 12
+dnl Copyright (C) 2000-2002, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -20,14 +20,7 @@
      [AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM(
            [AC_INCLUDES_DEFAULT[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>]],
+#           include <wchar.h>]],
            [[mbstate_t x; return sizeof x;]])],
         [ac_cv_type_mbstate_t=yes],
         [ac_cv_type_mbstate_t=no])])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbswidth.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbswidth.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbswidth.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbswidth.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mbswidth.m4 serial 18
-dnl Copyright (C) 2000-2002, 2004, 2006-2014 Free Software Foundation, Inc.
+# mbswidth.m4 serial 17
+dnl Copyright (C) 2000-2002, 2004, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,8 @@
   dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth()
   dnl that clashes with ours.
   AC_CACHE_CHECK([whether mbswidth is declared in <wchar.h>],
-    [ac_cv_have_decl_mbswidth],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
+    ac_cv_have_decl_mbswidth,
+    [AC_TRY_COMPILE([
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
@@ -27,13 +25,10 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-          ]],
-          [[
+], [
   char *p = (char *) mbswidth;
   return !p;
-          ]])],
-       [ac_cv_have_decl_mbswidth=yes],
-       [ac_cv_have_decl_mbswidth=no])])
+], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)])
   if test $ac_cv_have_decl_mbswidth = yes; then
     ac_val=1
   else
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mbtowc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mbtowc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mbtowc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mbtowc.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# mbtowc.m4 serial 2
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_MBTOWC],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-
-  if false; then
-    REPLACE_MBTOWC=1
-  fi
-])
-
-# Prerequisites of lib/mbtowc.c.
-AC_DEFUN([gl_PREREQ_MBTOWC], [
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/memchr.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/memchr.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/memchr.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/memchr.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc.
+# memchr.m4 serial 8
+dnl Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,16 +11,10 @@
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
 
+  dnl These days, we assume memchr is present.  But just in case...
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  m4_ifdef([gl_FUNC_MEMCHR_OBSOLETE], [
-    dnl These days, we assume memchr is present.  But if support for old
-    dnl platforms is desired:
-    AC_CHECK_FUNCS_ONCE([memchr])
-    if test $ac_cv_func_memchr = no; then
-      HAVE_MEMCHR=0
-    fi
-  ])
-  if test $HAVE_MEMCHR = 1; then
+  AC_CHECK_FUNCS_ONCE([memchr])
+  if test $ac_cv_func_memchr = yes; then
     # Detect platform-specific bugs in some versions of glibc:
     # memchr should not dereference anything with length 0
     #   http://bugzilla.redhat.com/499689
@@ -41,7 +35,6 @@
 # endif
 #endif
 ]], [[
-  int result = 0;
   char *fence = NULL;
 #if HAVE_SYS_MMAN_H && HAVE_MPROTECT
 # if HAVE_MAP_ANONYMOUS
@@ -65,20 +58,24 @@
   if (fence)
     {
       if (memchr (fence, 0, 0))
-        result |= 1;
+        return 1;
       strcpy (fence - 9, "12345678");
       if (memchr (fence - 9, 0, 79) != fence - 1)
-        result |= 2;
-      if (memchr (fence - 1, 0, 3) != fence - 1)
-        result |= 4;
+        return 2;
     }
-  return result;
+  return 0;
 ]])], [gl_cv_func_memchr_works=yes], [gl_cv_func_memchr_works=no],
       [dnl Be pessimistic for now.
        gl_cv_func_memchr_works="guessing no"])])
     if test "$gl_cv_func_memchr_works" != yes; then
       REPLACE_MEMCHR=1
     fi
+  else
+    HAVE_MEMCHR=0
+  fi
+  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+    AC_LIBOBJ([memchr])
+    gl_PREREQ_MEMCHR
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/memmove.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/memmove.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/memmove.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/memmove.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,12 +1,15 @@
-# memmove.m4 serial 4
-dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+# memmove.m4 serial 3
+dnl Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMMOVE],
 [
-  AC_CHECK_FUNCS([memmove])
+  AC_REPLACE_FUNCS([memmove])
+  if test $ac_cv_func_memmove = no; then
+    gl_PREREQ_MEMMOVE
+  fi
 ])
 
 # Prerequisites of lib/memmove.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/memset.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/memset.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/memset.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/memset.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,12 +1,15 @@
-# memset.m4 serial 4
-dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+# memset.m4 serial 3
+dnl Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMSET],
 [
-  AC_CHECK_FUNCS([memset])
+  AC_REPLACE_FUNCS([memset])
+  if test $ac_cv_func_memset = no; then
+    gl_PREREQ_MEMSET
+  fi
 ])
 
 # Prerequisites of lib/memset.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/minmax.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/minmax.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/minmax.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/minmax.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,10 +1,10 @@
-# minmax.m4 serial 4
-dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+# minmax.m4 serial 3
+dnl Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_PREREQ([2.53])
+AC_PREREQ([2.52])
 
 AC_DEFUN([gl_MINMAX],
 [
@@ -28,11 +28,8 @@
   m4_pushdef([HEADER], AS_TR_CPP([$1]))
   AC_CACHE_CHECK([whether <$1> defines MIN and MAX],
     [gl_cv_minmax_in_]header,
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <$1>
-            int x = MIN (42, 17);]],
-          [[]])],
+    [AC_TRY_COMPILE([#include <$1>
+int x = MIN (42, 17);], [],
        [gl_cv_minmax_in_]header[=yes],
        [gl_cv_minmax_in_]header[=no])])
   if test $gl_cv_minmax_in_[]header = yes; then
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mkdtemp.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mkdtemp.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mkdtemp.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mkdtemp.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,16 +1,17 @@
-# mkdtemp.m4 serial 8
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation,
+# mkdtemp.m4 serial 6
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2010 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.
 
-AC_DEFUN([gl_FUNC_MKDTEMP],
+AC_DEFUN([gt_FUNC_MKDTEMP],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_CHECK_FUNCS([mkdtemp])
+  AC_REPLACE_FUNCS([mkdtemp])
   if test $ac_cv_func_mkdtemp = no; then
     HAVE_MKDTEMP=0
+    gl_PREREQ_MKDTEMP
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mmap-anon.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mmap-anon.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mmap-anon.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mmap-anon.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+# mmap-anon.m4 serial 8
+dnl Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,12 +9,16 @@
 # - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
 #   and MAP_ANON exist and have the same value.
 # - On HP-UX, only MAP_ANONYMOUS exists.
-# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
+# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
 # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
 #   used.
 
 AC_DEFUN([gl_FUNC_MMAP_ANON],
 [
+  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_EGREP])
+
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -27,18 +31,18 @@
   gl_have_mmap_anonymous=no
   if test $gl_have_mmap = yes; then
     AC_MSG_CHECKING([for MAP_ANONYMOUS])
-    AC_EGREP_CPP([I cannot identify this map], [
+    AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>
 #ifdef MAP_ANONYMOUS
-    I cannot identify this map
+    I cant identify this map.
 #endif
 ],
       [gl_have_mmap_anonymous=yes])
     if test $gl_have_mmap_anonymous != yes; then
-      AC_EGREP_CPP([I cannot identify this map], [
+      AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>
 #ifdef MAP_ANON
-    I cannot identify this map
+    I cant identify this map.
 #endif
 ],
         [AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON],
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/mode_t.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/mode_t.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/mode_t.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/mode_t.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # mode_t.m4 serial 2
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/msvc-inval.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/msvc-inval.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/msvc-inval.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/msvc-inval.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MSVC_INVAL],
-[
-  AC_CHECK_FUNCS_ONCE([_set_invalid_parameter_handler])
-  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
-    AC_DEFINE([HAVE_MSVC_INVALID_PARAMETER_HANDLER], [1],
-      [Define to 1 on MSVC platforms that have the "invalid parameter handler"
-       concept.])
-  else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-  fi
-  AC_SUBST([HAVE_MSVC_INVALID_PARAMETER_HANDLER])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/msvc-nothrow.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/msvc-nothrow.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/msvc-nothrow.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/msvc-nothrow.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MSVC_NOTHROW],
-[
-  AC_REQUIRE([gl_MSVC_INVAL])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/multiarch.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/multiarch.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/multiarch.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/multiarch.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,12 +1,12 @@
-# multiarch.m4 serial 7
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# multiarch.m4 serial 5
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 # Determine whether the compiler is or may be producing universal binaries.
 #
-# On Mac OS X 10.5 and later systems, the user can create libraries and
+# On MacOS X 10.5 and later systems, the user can create libraries and
 # executables that work on multiple system types--known as "fat" or
 # "universal" binaries--by specifying multiple '-arch' options to the
 # compiler but only a single '-arch' option to the preprocessor.  Like
@@ -16,7 +16,8 @@
 #                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 #                 CPP="gcc -E" CXXCPP="g++ -E"
 #
-# Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly.
+# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
+# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
 
 AC_DEFUN_ONCE([gl_MULTIARCH],
 [
@@ -54,6 +55,8 @@
      done
     ])
   if test $gl_cv_c_multiarch = yes; then
+    AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1],
+      [Define if the compiler is building for multiple architectures of Apple platforms at once.])
     APPLE_UNIVERSAL_BUILD=1
   else
     APPLE_UNIVERSAL_BUILD=0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/no-c++.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/no-c++.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/no-c++.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/no-c++.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # no-c++.m4 serial 1
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/nocrash.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/nocrash.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/nocrash.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/nocrash.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-# nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 Based on libsigsegv, from Bruno Haible and Paolo Bonzini.
-
-AC_PREREQ([2.13])
-
-dnl Expands to some code for use in .c programs that will cause the configure
-dnl test to exit instead of crashing. This is useful to avoid triggering
-dnl action from a background debugger and to avoid core dumps.
-dnl Usage:   ...
-dnl          ]GL_NOCRASH[
-dnl          ...
-dnl          int main() { nocrash_init(); ... }
-AC_DEFUN([GL_NOCRASH],[[
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-]])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/off_t.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/off_t.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/off_t.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/off_t.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# off_t.m4 serial 1
-dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free 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 Check whether to override the 'off_t' type.
-dnl Set WINDOWS_64_BIT_OFF_T.
-
-AC_DEFUN([gl_TYPE_OFF_T],
-[
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_OFF_T=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_OFF_T])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/onceonly.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/onceonly.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/onceonly.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/onceonly.m4	2010-05-24 10:42:20.000000000 +0000
@@ -0,0 +1,91 @@
+# onceonly.m4 serial 6
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 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
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE          like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE            like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE            like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_FUNC_STRCOLL])  like  AC_FUNC_STRCOLL
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl The original code implemented AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE
+dnl in terms of AC_DEFUN and AC_REQUIRE. This implementation uses diversions to
+dnl named sections DEFAULTS and INIT_PREPARE in order to check all requested
+dnl headers at once, thus reducing the size of 'configure'. It is known to work
+dnl with autoconf 2.57..2.62 at least . The size reduction is ca. 9%.
+
+dnl Autoconf version 2.59 plus gnulib is required; this file is not needed
+dnl with Autoconf 2.60 or greater. But note that autoconf's implementation of
+dnl AC_CHECK_DECLS_ONCE expects a comma-separated list of symbols as first
+dnl argument!
+AC_PREREQ([2.59])
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  m4_foreach_w([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                 [./-], [___])), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
+      gl_HEADERS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [./-], [___])))
+  ])
+])
+m4_define([gl_HEADERS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_header_list=])
+  AC_CHECK_HEADERS([$gl_header_list])
+  m4_define([gl_HEADERS_EXPANSION], [])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  m4_foreach_w([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
+      gl_FUNCS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
+  ])
+])
+m4_define([gl_FUNCS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_func_list=])
+  AC_CHECK_FUNCS([$gl_func_list])
+  m4_define([gl_FUNCS_EXPANSION], [])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  m4_foreach_w([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
+  ])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/opendir.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/opendir.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/opendir.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/opendir.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# opendir.m4 serial 2
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_OPENDIR],
-[
-  AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
-
-  AC_CHECK_FUNCS([opendir])
-  if test $ac_cv_func_opendir = no; then
-    HAVE_OPENDIR=0
-  fi
-  dnl Replace opendir() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0; then
-      if test $HAVE_OPENDIR = 1; then
-        REPLACE_OPENDIR=1
-      fi
-    fi
-  ])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/open.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/open.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/open.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/open.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# open.m4 serial 14
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# open.m4 serial 8
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,7 @@
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
     mingw* | pw*)
-      REPLACE_OPEN=1
+      gl_REPLACE_OPEN
       ;;
     *)
       dnl open("foo/") should not create a file when the file name has a
@@ -22,32 +22,25 @@
             touch conftest.tmp
             ln -s conftest.tmp conftest.lnk
           fi
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
+          AC_TRY_RUN([
 #include <fcntl.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 int main ()
 {
-  int result = 0;
 #if HAVE_LSTAT
-  if (open ("conftest.lnk/", O_RDONLY) != -1)
-    result |= 1;
+  if (open ("conftest.lnk/", O_RDONLY) != -1) return 2;
 #endif
-  if (open ("conftest.sl/", O_CREAT, 0600) >= 0)
-    result |= 2;
-  return result;
-}]])],
-            [gl_cv_func_open_slash=yes],
-            [gl_cv_func_open_slash=no],
+  return open ("conftest.sl/", O_CREAT, 0600) >= 0;
+}], [gl_cv_func_open_slash=yes], [gl_cv_func_open_slash=no],
             [
 changequote(,)dnl
              case "$host_os" in
-               freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-                 gl_cv_func_open_slash="guessing no" ;;
-               *)
-                 gl_cv_func_open_slash="guessing yes" ;;
+               freebsd*)        gl_cv_func_open_slash="guessing no" ;;
+               solaris2.[0-9]*) gl_cv_func_open_slash="guessing no" ;;
+               hpux*)           gl_cv_func_open_slash="guessing no" ;;
+               *)               gl_cv_func_open_slash="guessing yes" ;;
              esac
 changequote([,])dnl
             ])
@@ -57,35 +50,25 @@
         *no)
           AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1],
             [Define to 1 if open() fails to recognize a trailing slash.])
-          REPLACE_OPEN=1
+          gl_REPLACE_OPEN
           ;;
       esac
       ;;
   esac
-  dnl Replace open() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    if test $REPLACE_OPEN = 0; then
-      gl_TEST_FCHDIR
-      if test $HAVE_FCHDIR = 0; then
-        REPLACE_OPEN=1
-      fi
-    fi
-  ])
-  dnl Replace open() for supporting the gnulib-defined O_NONBLOCK flag.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    if test $REPLACE_OPEN = 0; then
-      gl_NONBLOCKING_IO
-      if test $gl_cv_have_open_O_NONBLOCK != yes; then
-        REPLACE_OPEN=1
-      fi
-    fi
-  ])
+])
+
+AC_DEFUN([gl_REPLACE_OPEN],
+[
+  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
+  REPLACE_OPEN=1
+  AC_LIBOBJ([open])
+  gl_PREREQ_OPEN
 ])
 
 # Prerequisites of lib/open.c.
 AC_DEFUN([gl_PREREQ_OPEN],
 [
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
   :
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/pathmax.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/pathmax.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/pathmax.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/pathmax.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
+# pathmax.m4 serial 8
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 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,
@@ -8,35 +8,6 @@
 AC_DEFUN([gl_PATHMAX],
 [
   dnl Prerequisites of lib/pathmax.h.
+  AC_CHECK_FUNCS_ONCE([pathconf])
   AC_CHECK_HEADERS_ONCE([sys/param.h])
 ])
-
-# Expands to a piece of C program that defines PATH_MAX in the same way as
-# "pathmax.h" will do.
-AC_DEFUN([gl_PATHMAX_SNIPPET], [[
-/* Arrange to define PATH_MAX, like "pathmax.h" does. */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <limits.h>
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-#ifdef __hpux
-# undef PATH_MAX
-# define PATH_MAX 1024
-#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# undef PATH_MAX
-# define PATH_MAX 260
-#endif
-]])
-
-# Prerequisites of gl_PATHMAX_SNIPPET.
-AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ],
-[
-  AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/pipe2.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/pipe2.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/pipe2.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/pipe2.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # pipe2.m4 serial 2
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/pipe.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/pipe.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/pipe.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/pipe.m4	2010-05-24 10:42:20.000000000 +0000
@@ -0,0 +1,12 @@
+# pipe.m4 serial 4
+dnl Copyright (C) 2004, 2008, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_PIPE],
+[
+  dnl Prerequisites of lib/pipe.c.
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([AC_TYPE_MODE_T])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/posix_spawn.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/posix_spawn.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/posix_spawn.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/posix_spawn.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# posix_spawn.m4 serial 11
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# posix_spawn.m4 serial 7
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -36,9 +36,6 @@
     gl_POSIX_SPAWN_WORKS
     case "$gl_cv_func_posix_spawn_works" in
       *yes)
-        AC_DEFINE([HAVE_WORKING_POSIX_SPAWN], [1],
-          [Define if you have the posix_spawn and posix_spawnp functions and
-           they work.])
         dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDULER
         dnl evaluates to nonzero.
         dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedpolicy])
@@ -294,7 +291,7 @@
   if (fflush (fp) || fclose (fp))
     {
       perror ("cannot prepare data file");
-      return 2;
+      return 1;
     }
 
   /* Avoid reading from our stdin, as it could block.  */
@@ -312,7 +309,7 @@
         posix_spawn_file_actions_destroy (&actions);
       errno = err;
       perror ("subprocess failed");
-      return 3;
+      return 1;
     }
   posix_spawn_file_actions_destroy (&actions);
   status = 0;
@@ -321,13 +318,13 @@
   if (!WIFEXITED (status))
     {
       fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      return 4;
+      return 1;
     }
   exitstatus = WEXITSTATUS (status);
   if (exitstatus != 0)
     {
       fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      return 5;
+      return 1;
     }
   return 0;
 }
@@ -342,7 +339,7 @@
       && memcmp (buf, "Halle Potta", 11) == 0)
     return 0;
   else
-    return 8;
+    return 2;
 }
 
 static void
@@ -394,134 +391,10 @@
     ])
 ])
 
-# Prerequisites of lib/spawni.c.
-AC_DEFUN([gl_PREREQ_POSIX_SPAWN_INTERNAL],
+AC_DEFUN([gl_POSIX_SPAWN_INTERNAL],
 [
+  AC_LIBOBJ([spawni])
+  dnl Prerequisites of lib/spawni.c.
   AC_CHECK_HEADERS([paths.h])
   AC_CHECK_FUNCS([confstr sched_setparam sched_setscheduler setegid seteuid vfork])
 ])
-
-AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  gl_POSIX_SPAWN
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
-  else
-    dnl On Solaris 11 2011-11, posix_spawn_file_actions_addclose succeeds even
-    dnl if the fd argument is out of range.
-    AC_CACHE_CHECK([whether posix_spawn_file_actions_addclose works],
-      [gl_cv_func_posix_spawn_file_actions_addclose_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addclose (&actions, 10000000) == 0)
-    return 2;
-  return 0;
-}]])],
-         [gl_cv_func_posix_spawn_file_actions_addclose_works=yes],
-         [gl_cv_func_posix_spawn_file_actions_addclose_works=no],
-         [# Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes";;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_posix_spawn_file_actions_addclose_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1 ;;
-    esac
-  fi
-])
-
-AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  gl_POSIX_SPAWN
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
-  else
-    dnl On Solaris 11 2011-11, posix_spawn_file_actions_adddup2 succeeds even
-    dnl if the fd argument is out of range.
-    AC_CACHE_CHECK([whether posix_spawn_file_actions_adddup2 works],
-      [gl_cv_func_posix_spawn_file_actions_adddup2_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_adddup2 (&actions, 10000000, 2) == 0)
-    return 2;
-  return 0;
-}]])],
-         [gl_cv_func_posix_spawn_file_actions_adddup2_works=yes],
-         [gl_cv_func_posix_spawn_file_actions_adddup2_works=no],
-         [# Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_posix_spawn_file_actions_adddup2_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1 ;;
-    esac
-  fi
-])
-
-AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  gl_POSIX_SPAWN
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
-  else
-    dnl On Solaris 11 2011-11, posix_spawn_file_actions_addopen succeeds even
-    dnl if the fd argument is out of range.
-    AC_CACHE_CHECK([whether posix_spawn_file_actions_addopen works],
-      [gl_cv_func_posix_spawn_file_actions_addopen_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
-#include <spawn.h>
-#include <fcntl.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addopen (&actions, 10000000, "foo", 0, O_RDONLY)
-      == 0)
-    return 2;
-  return 0;
-}]])],
-         [gl_cv_func_posix_spawn_file_actions_addopen_works=yes],
-         [gl_cv_func_posix_spawn_file_actions_addopen_works=no],
-         [# Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_posix_spawn_file_actions_addopen_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 ;;
-    esac
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/printf.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/printf.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/printf.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/printf.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# printf.m4 serial 51
-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+# printf.m4 serial 33
+dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,8 +17,7 @@
   AC_CACHE_CHECK([whether printf supports size specifiers as in C99],
     [gl_cv_func_printf_sizes_c99],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
@@ -32,56 +31,53 @@
 static char buf[100];
 int main ()
 {
-  int result = 0;
 #if HAVE_STDINT_H_WITH_UINTMAX || HAVE_INTTYPES_H_WITH_UINTMAX
   buf[0] = '\0';
   if (sprintf (buf, "%ju %d", (uintmax_t) 12345671, 33, 44, 55) < 0
       || strcmp (buf, "12345671 33") != 0)
-    result |= 1;
+    return 1;
 #endif
   buf[0] = '\0';
   if (sprintf (buf, "%zu %d", (size_t) 12345672, 33, 44, 55) < 0
       || strcmp (buf, "12345672 33") != 0)
-    result |= 2;
+    return 1;
   buf[0] = '\0';
   if (sprintf (buf, "%tu %d", (ptrdiff_t) 12345673, 33, 44, 55) < 0
       || strcmp (buf, "12345673 33") != 0)
-    result |= 4;
+    return 1;
   buf[0] = '\0';
   if (sprintf (buf, "%Lg %d", (long double) 1.5, 33, 44, 55) < 0
       || strcmp (buf, "1.5 33") != 0)
-    result |= 8;
-  return result;
-}]])],
-        [gl_cv_func_printf_sizes_c99=yes],
-        [gl_cv_func_printf_sizes_c99=no],
-        [
+    return 1;
+  return 0;
+}], [gl_cv_func_printf_sizes_c99=yes], [gl_cv_func_printf_sizes_c99=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_printf_sizes_c99="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_printf_sizes_c99="guessing no";;
-           darwin*)              gl_cv_func_printf_sizes_c99="guessing yes";;
-                                 # Guess yes on OpenBSD >= 3.9.
-           openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
-                                 gl_cv_func_printf_sizes_c99="guessing no";;
-           openbsd*)             gl_cv_func_printf_sizes_c99="guessing yes";;
-                                 # Guess yes on Solaris >= 2.10.
-           solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";;
-           solaris*)             gl_cv_func_printf_sizes_c99="guessing no";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_printf_sizes_c99="guessing no";;
-           netbsd*)              gl_cv_func_printf_sizes_c99="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_printf_sizes_c99="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_printf_sizes_c99="guessing yes";;
+                               # Guess yes on FreeBSD >= 5.
+         freebsd[1-4]*)        gl_cv_func_printf_sizes_c99="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_printf_sizes_c99="guessing no";;
+         darwin*)              gl_cv_func_printf_sizes_c99="guessing yes";;
+                               # Guess yes on OpenBSD >= 3.9.
+         openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
+                               gl_cv_func_printf_sizes_c99="guessing no";;
+         openbsd*)             gl_cv_func_printf_sizes_c99="guessing yes";;
+                               # Guess yes on Solaris >= 2.10.
+         solaris2.[0-9]*)      gl_cv_func_printf_sizes_c99="guessing no";;
+         solaris*)             gl_cv_func_printf_sizes_c99="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_printf_sizes_c99="guessing no";;
+         netbsd*)              gl_cv_func_printf_sizes_c99="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_printf_sizes_c99="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -96,39 +92,35 @@
   AC_CACHE_CHECK([whether printf supports 'long double' arguments],
     [gl_cv_func_printf_long_double],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[10000];
 int main ()
 {
-  int result = 0;
   buf[0] = '\0';
   if (sprintf (buf, "%Lf %d", 1.75L, 33, 44, 55) < 0
       || strcmp (buf, "1.750000 33") != 0)
-    result |= 1;
+    return 1;
   buf[0] = '\0';
   if (sprintf (buf, "%Le %d", 1.75L, 33, 44, 55) < 0
       || strcmp (buf, "1.750000e+00 33") != 0)
-    result |= 2;
+    return 1;
   buf[0] = '\0';
   if (sprintf (buf, "%Lg %d", 1.75L, 33, 44, 55) < 0
       || strcmp (buf, "1.75 33") != 0)
-    result |= 4;
-  return result;
-}]])],
-        [gl_cv_func_printf_long_double=yes],
-        [gl_cv_func_printf_long_double=no],
-        [
+    return 1;
+  return 0;
+}], [gl_cv_func_printf_long_double=yes], [gl_cv_func_printf_long_double=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-           beos*)        gl_cv_func_printf_long_double="guessing no";;
-           mingw* | pw*) gl_cv_func_printf_long_double="guessing no";;
-           *)            gl_cv_func_printf_long_double="guessing yes";;
-         esac
+       case "$host_os" in
+         beos*)        gl_cv_func_printf_long_double="guessing no";;
+         mingw* | pw*) gl_cv_func_printf_long_double="guessing no";;
+         *)            gl_cv_func_printf_long_double="guessing yes";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -144,8 +136,7 @@
   AC_CACHE_CHECK([whether printf supports infinite 'double' arguments],
     [gl_cv_func_printf_infinite],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static int
@@ -177,68 +168,65 @@
 static double zero = 0.0;
 int main ()
 {
-  int result = 0;
-  if (sprintf (buf, "%f", 1.0 / zero) < 0
+  if (sprintf (buf, "%f", 1.0 / 0.0) < 0
       || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0))
-    result |= 1;
-  if (sprintf (buf, "%f", -1.0 / zero) < 0
+    return 1;
+  if (sprintf (buf, "%f", -1.0 / 0.0) < 0
       || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0))
-    result |= 1;
+    return 1;
   if (sprintf (buf, "%f", zero / zero) < 0
       || !strisnan (buf, 0, strlen (buf)))
-    result |= 2;
-  if (sprintf (buf, "%e", 1.0 / zero) < 0
+    return 1;
+  if (sprintf (buf, "%e", 1.0 / 0.0) < 0
       || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0))
-    result |= 4;
-  if (sprintf (buf, "%e", -1.0 / zero) < 0
+    return 1;
+  if (sprintf (buf, "%e", -1.0 / 0.0) < 0
       || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0))
-    result |= 4;
+    return 1;
   if (sprintf (buf, "%e", zero / zero) < 0
       || !strisnan (buf, 0, strlen (buf)))
-    result |= 8;
-  if (sprintf (buf, "%g", 1.0 / zero) < 0
+    return 1;
+  if (sprintf (buf, "%g", 1.0 / 0.0) < 0
       || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0))
-    result |= 16;
-  if (sprintf (buf, "%g", -1.0 / zero) < 0
+    return 1;
+  if (sprintf (buf, "%g", -1.0 / 0.0) < 0
       || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0))
-    result |= 16;
+    return 1;
   if (sprintf (buf, "%g", zero / zero) < 0
       || !strisnan (buf, 0, strlen (buf)))
-    result |= 32;
+    return 1;
   /* This test fails on HP-UX 10.20.  */
   if (have_minus_zero ())
     if (sprintf (buf, "%g", - zero) < 0
         || strcmp (buf, "-0") != 0)
-    result |= 64;
-  return result;
-}]])],
-        [gl_cv_func_printf_infinite=yes],
-        [gl_cv_func_printf_infinite=no],
-        [
+    return 1;
+  return 0;
+}], [gl_cv_func_printf_infinite=yes], [gl_cv_func_printf_infinite=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_printf_infinite="guessing yes";;
-                                 # Guess yes on FreeBSD >= 6.
-           freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_printf_infinite="guessing no";;
-           darwin*)              gl_cv_func_printf_infinite="guessing yes";;
-                                 # Guess yes on HP-UX >= 11.
-           hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite="guessing no";;
-           hpux*)                gl_cv_func_printf_infinite="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_printf_infinite="guessing no";;
-           netbsd*)              gl_cv_func_printf_infinite="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_printf_infinite="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_printf_infinite="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_printf_infinite="guessing yes";;
+                               # Guess yes on FreeBSD >= 6.
+         freebsd[1-5]*)        gl_cv_func_printf_infinite="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_printf_infinite="guessing no";;
+         darwin*)              gl_cv_func_printf_infinite="guessing yes";;
+                               # Guess yes on HP-UX >= 11.
+         hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite="guessing no";;
+         hpux*)                gl_cv_func_printf_infinite="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_printf_infinite="guessing no";;
+         netbsd*)              gl_cv_func_printf_infinite="guessing yes";;
+                               # Guess yes on BeOS.
+         beos*)                gl_cv_func_printf_infinite="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_printf_infinite="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -251,7 +239,6 @@
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([gl_BIGENDIAN])
-  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   dnl The user can set or unset the variable gl_printf_safe to indicate
   dnl that he wishes a safe handling of non-IEEE-754 'long double' values.
@@ -265,8 +252,7 @@
       AC_CACHE_CHECK([whether printf supports infinite 'long double' arguments],
         [gl_cv_func_printf_infinite_long_double],
         [
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
+          AC_TRY_RUN([
 ]GL_NOCRASH[
 #include <float.h>
 #include <stdio.h>
@@ -293,36 +279,35 @@
 static long double zeroL = 0.0L;
 int main ()
 {
-  int result = 0;
   nocrash_init();
-  if (sprintf (buf, "%Lf", 1.0L / zeroL) < 0
+  if (sprintf (buf, "%Lf", 1.0L / 0.0L) < 0
       || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0))
-    result |= 1;
-  if (sprintf (buf, "%Lf", -1.0L / zeroL) < 0
+    return 1;
+  if (sprintf (buf, "%Lf", -1.0L / 0.0L) < 0
       || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0))
-    result |= 1;
+    return 1;
   if (sprintf (buf, "%Lf", zeroL / zeroL) < 0
       || !strisnan (buf, 0, strlen (buf)))
-    result |= 1;
-  if (sprintf (buf, "%Le", 1.0L / zeroL) < 0
+    return 1;
+  if (sprintf (buf, "%Le", 1.0L / 0.0L) < 0
       || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0))
-    result |= 1;
-  if (sprintf (buf, "%Le", -1.0L / zeroL) < 0
+    return 1;
+  if (sprintf (buf, "%Le", -1.0L / 0.0L) < 0
       || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0))
-    result |= 1;
+    return 1;
   if (sprintf (buf, "%Le", zeroL / zeroL) < 0
       || !strisnan (buf, 0, strlen (buf)))
-    result |= 1;
-  if (sprintf (buf, "%Lg", 1.0L / zeroL) < 0
+    return 1;
+  if (sprintf (buf, "%Lg", 1.0L / 0.0L) < 0
       || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0))
-    result |= 1;
-  if (sprintf (buf, "%Lg", -1.0L / zeroL) < 0
+    return 1;
+  if (sprintf (buf, "%Lg", -1.0L / 0.0L) < 0
       || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0))
-    result |= 1;
+    return 1;
   if (sprintf (buf, "%Lg", zeroL / zeroL) < 0
       || !strisnan (buf, 0, strlen (buf)))
-    result |= 1;
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+    return 1;
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
 /* Representation of an 80-bit 'long double' as an initializer for a sequence
    of 'unsigned int' words.  */
 # ifdef WORDS_BIGENDIAN
@@ -340,13 +325,13 @@
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 2;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 2;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 2;
+      return 1;
   }
   {
     /* Signalling NaN.  */
@@ -354,106 +339,113 @@
       { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 2;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 2;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 2;
+      return 1;
   }
   { /* Pseudo-NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 4;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 4;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 4;
+      return 1;
   }
   { /* Pseudo-Infinity.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 8;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 8;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 8;
+      return 1;
   }
   { /* Pseudo-Zero.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 16;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 16;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 16;
+      return 1;
   }
   { /* Unnormalized number.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 32;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 32;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 32;
+      return 1;
   }
   { /* Pseudo-Denormal.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) };
     if (sprintf (buf, "%Lf", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 64;
+      return 1;
     if (sprintf (buf, "%Le", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 64;
+      return 1;
     if (sprintf (buf, "%Lg", x.value) < 0
         || !strisnan (buf, 0, strlen (buf)))
-      result |= 64;
+      return 1;
   }
 #endif
-  return result;
-}]])],
-            [gl_cv_func_printf_infinite_long_double=yes],
-            [gl_cv_func_printf_infinite_long_double=no],
-            [
+  return 0;
+}],
+          [gl_cv_func_printf_infinite_long_double=yes],
+          [gl_cv_func_printf_infinite_long_double=no],
+          [
 changequote(,)dnl
-             case "$host_cpu" in
-                                     # Guess no on ia64, x86_64, i386.
-               ia64 | x86_64 | i*86) gl_cv_func_printf_infinite_long_double="guessing no";;
-               *)
-                 case "$host_os" in
-                                         # Guess yes on glibc systems.
-                   *-gnu*)               gl_cv_func_printf_infinite_long_double="guessing yes";;
-                                         # Guess yes on FreeBSD >= 6.
-                   freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
-                   freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
-                                         # Guess yes on HP-UX >= 11.
-                   hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
-                   hpux*)                gl_cv_func_printf_infinite_long_double="guessing yes";;
-                                         # If we don't know, assume the worst.
-                   *)                    gl_cv_func_printf_infinite_long_double="guessing no";;
-                 esac
-                 ;;
-             esac
+           case "$host_cpu" in
+                                   # Guess no on ia64, x86_64, i386.
+             ia64 | x86_64 | i*86) gl_cv_func_printf_infinite_long_double="guessing no";;
+             *)
+               case "$host_os" in
+                                       # Guess yes on glibc systems.
+                 *-gnu*)               gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                       # Guess yes on FreeBSD >= 6.
+                 freebsd[1-5]*)        gl_cv_func_printf_infinite_long_double="guessing no";;
+                 freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                       # Guess yes on MacOS X >= 10.3.
+                 darwin[1-6].*)        gl_cv_func_printf_infinite_long_double="guessing no";;
+                 darwin*)              gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                       # Guess yes on HP-UX >= 11.
+                 hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
+                 hpux*)                gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                       # Guess yes on NetBSD >= 3.
+                 netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                                       gl_cv_func_printf_infinite_long_double="guessing no";;
+                 netbsd*)              gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                       # If we don't know, assume the worst.
+                 *)                    gl_cv_func_printf_infinite_long_double="guessing no";;
+               esac
+               ;;
+           esac
 changequote([,])dnl
-            ])
+          ])
         ])
       ;;
     *)
@@ -474,77 +466,72 @@
   AC_CACHE_CHECK([whether printf supports the 'a' and 'A' directives],
     [gl_cv_func_printf_directive_a],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[100];
-static double zero = 0.0;
 int main ()
 {
-  int result = 0;
   if (sprintf (buf, "%a %d", 3.1416015625, 33, 44, 55) < 0
       || (strcmp (buf, "0x1.922p+1 33") != 0
           && strcmp (buf, "0x3.244p+0 33") != 0
           && strcmp (buf, "0x6.488p-1 33") != 0
           && strcmp (buf, "0xc.91p-2 33") != 0))
-    result |= 1;
+    return 1;
   if (sprintf (buf, "%A %d", -3.1416015625, 33, 44, 55) < 0
       || (strcmp (buf, "-0X1.922P+1 33") != 0
           && strcmp (buf, "-0X3.244P+0 33") != 0
           && strcmp (buf, "-0X6.488P-1 33") != 0
           && strcmp (buf, "-0XC.91P-2 33") != 0))
-    result |= 2;
+    return 1;
   /* This catches a FreeBSD 6.1 bug: it doesn't round.  */
   if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0
       || (strcmp (buf, "0x1.83p+0 33") != 0
           && strcmp (buf, "0x3.05p-1 33") != 0
           && strcmp (buf, "0x6.0ap-2 33") != 0
           && strcmp (buf, "0xc.14p-3 33") != 0))
-    result |= 4;
+    return 1;
   /* This catches a FreeBSD 6.1 bug.  See
      <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
-  if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0
+  if (sprintf (buf, "%010a %d", 1.0 / 0.0, 33, 44, 55) < 0
       || buf[0] == '0')
-    result |= 8;
-  /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug.  */
+    return 1;
+  /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug.  */
   if (sprintf (buf, "%.1a", 1.999) < 0
       || (strcmp (buf, "0x1.0p+1") != 0
           && strcmp (buf, "0x2.0p+0") != 0
           && strcmp (buf, "0x4.0p-1") != 0
           && strcmp (buf, "0x8.0p-2") != 0))
-    result |= 16;
-  /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a
+    return 1;
+  /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a
      glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>.  */
   if (sprintf (buf, "%.1La", 1.999L) < 0
       || (strcmp (buf, "0x1.0p+1") != 0
           && strcmp (buf, "0x2.0p+0") != 0
           && strcmp (buf, "0x4.0p-1") != 0
           && strcmp (buf, "0x8.0p-2") != 0))
-    result |= 32;
-  return result;
-}]])],
-        [gl_cv_func_printf_directive_a=yes],
-        [gl_cv_func_printf_directive_a=no],
-        [
-         case "$host_os" in
-                                 # Guess yes on glibc >= 2.5 systems.
-           *-gnu*)
-             AC_EGREP_CPP([BZ2908], [
-               #include <features.h>
-               #ifdef __GNU_LIBRARY__
-                #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2)) && !defined __UCLIBC__
-                 BZ2908
-                #endif
-               #endif
-               ],
-               [gl_cv_func_printf_directive_a="guessing yes"],
-               [gl_cv_func_printf_directive_a="guessing no"])
-             ;;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_printf_directive_a="guessing no";;
-         esac
-        ])
+    return 1;
+  return 0;
+}], [gl_cv_func_printf_directive_a=yes], [gl_cv_func_printf_directive_a=no],
+      [
+       case "$host_os" in
+                               # Guess yes on glibc >= 2.5 systems.
+         *-gnu*)
+           AC_EGREP_CPP([BZ2908], [
+             #include <features.h>
+             #ifdef __GNU_LIBRARY__
+              #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2)
+               BZ2908
+              #endif
+             #endif
+             ],
+             [gl_cv_func_printf_directive_a="guessing yes"],
+             [gl_cv_func_printf_directive_a="guessing no"])
+           ;;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_printf_directive_a="guessing no";;
+       esac
+      ])
     ])
 ])
 
@@ -559,48 +546,43 @@
   AC_CACHE_CHECK([whether printf supports the 'F' directive],
     [gl_cv_func_printf_directive_f],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[100];
-static double zero = 0.0;
 int main ()
 {
-  int result = 0;
   if (sprintf (buf, "%F %d", 1234567.0, 33, 44, 55) < 0
       || strcmp (buf, "1234567.000000 33") != 0)
-    result |= 1;
-  if (sprintf (buf, "%F", 1.0 / zero) < 0
+    return 1;
+  if (sprintf (buf, "%F", 1.0 / 0.0) < 0
       || (strcmp (buf, "INF") != 0 && strcmp (buf, "INFINITY") != 0))
-    result |= 2;
+    return 1;
   /* This catches a Cygwin 1.5.x bug.  */
   if (sprintf (buf, "%.F", 1234.0) < 0
       || strcmp (buf, "1234") != 0)
-    result |= 4;
-  return result;
-}]])],
-        [gl_cv_func_printf_directive_f=yes],
-        [gl_cv_func_printf_directive_f=no],
-        [
+    return 1;
+  return 0;
+}], [gl_cv_func_printf_directive_f=yes], [gl_cv_func_printf_directive_f=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_printf_directive_f="guessing yes";;
-                                 # Guess yes on FreeBSD >= 6.
-           freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_printf_directive_f="guessing no";;
-           darwin*)              gl_cv_func_printf_directive_f="guessing yes";;
-                                 # Guess yes on Solaris >= 2.10.
-           solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";;
-           solaris*)             gl_cv_func_printf_sizes_c99="guessing no";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_printf_directive_f="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_printf_directive_f="guessing yes";;
+                               # Guess yes on FreeBSD >= 6.
+         freebsd[1-5]*)        gl_cv_func_printf_directive_f="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_printf_directive_f="guessing no";;
+         darwin*)              gl_cv_func_printf_directive_f="guessing yes";;
+                               # Guess yes on Solaris >= 2.10.
+         solaris2.[0-9]*)      gl_cv_func_printf_directive_f="guessing no";;
+         solaris*)             gl_cv_func_printf_directive_f="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_printf_directive_f="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -615,30 +597,14 @@
   AC_CACHE_CHECK([whether printf supports the 'n' directive],
     [gl_cv_func_printf_directive_n],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#ifdef _MSC_VER
-/* See page about "Parameter Validation" on msdn.microsoft.com.  */
-static void cdecl
-invalid_parameter_handler (const wchar_t *expression,
-                           const wchar_t *function,
-                           const wchar_t *file, unsigned int line,
-                           uintptr_t dummy)
-{
-  exit (1);
-}
-#endif
 static char fmtstring[10];
 static char buf[100];
 int main ()
 {
   int count = -1;
-#ifdef _MSC_VER
-  _set_invalid_parameter_handler (invalid_parameter_handler);
-#endif
   /* Copy the format string.  Some systems (glibc with _FORTIFY_SOURCE=2)
      support %n in format strings in read-only memory but not in writable
      memory.  */
@@ -648,17 +614,14 @@
       || count != 4)
     return 1;
   return 0;
-}]])],
-        [gl_cv_func_printf_directive_n=yes],
-        [gl_cv_func_printf_directive_n=no],
-        [
+}], [gl_cv_func_printf_directive_n=yes], [gl_cv_func_printf_directive_n=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-           mingw*) gl_cv_func_printf_directive_n="guessing no";;
-           *)      gl_cv_func_printf_directive_n="guessing yes";;
-         esac
+       case "$host_os" in
+         *)     gl_cv_func_printf_directive_n="guessing yes";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -676,8 +639,7 @@
   AC_CACHE_CHECK([whether printf supports the 'ls' directive],
     [gl_cv_func_printf_directive_ls],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -689,7 +651,6 @@
 #include <string.h>
 int main ()
 {
-  int result = 0;
   char buf[100];
   /* Test whether %ls works at all.
      This test fails on OpenBSD 4.0, IRIX 6.5, Solaris 2.6, Haiku, but not on
@@ -699,7 +660,7 @@
     buf[0] = '\0';
     if (sprintf (buf, "%ls", wstring) < 0
         || strcmp (buf, "abc") != 0)
-      result |= 1;
+      return 1;
   }
   /* This test fails on IRIX 6.5, Solaris 2.6, Cygwin 1.5, Haiku (with an
      assertion failure inside libc), but not on OpenBSD 4.0.  */
@@ -708,7 +669,7 @@
     buf[0] = '\0';
     if (sprintf (buf, "%ls", wstring) < 0
         || strcmp (buf, "a") != 0)
-      result |= 2;
+      return 1;
   }
   /* Test whether precisions in %ls are supported as specified in ISO C 99
      section 7.19.6.1:
@@ -723,24 +684,22 @@
     buf[0] = '\0';
     if (sprintf (buf, "%.2ls", wstring) < 0
         || strcmp (buf, "ab") != 0)
-      result |= 8;
+      return 1;
   }
-  return result;
-}]])],
-        [gl_cv_func_printf_directive_ls=yes],
-        [gl_cv_func_printf_directive_ls=no],
-        [
+  return 0;
+}], [gl_cv_func_printf_directive_ls=yes], [gl_cv_func_printf_directive_ls=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-           openbsd*)        gl_cv_func_printf_directive_ls="guessing no";;
-           irix*)           gl_cv_func_printf_directive_ls="guessing no";;
-           solaris*)        gl_cv_func_printf_directive_ls="guessing no";;
-           cygwin*)         gl_cv_func_printf_directive_ls="guessing no";;
-           beos* | haiku*)  gl_cv_func_printf_directive_ls="guessing no";;
-           *)               gl_cv_func_printf_directive_ls="guessing yes";;
-         esac
+       case "$host_os" in
+         openbsd*)        gl_cv_func_printf_directive_ls="guessing no";;
+         irix*)           gl_cv_func_printf_directive_ls="guessing no";;
+         solaris*)        gl_cv_func_printf_directive_ls="guessing no";;
+         cygwin*)         gl_cv_func_printf_directive_ls="guessing no";;
+         beos* | haiku*)  gl_cv_func_printf_directive_ls="guessing no";;
+         *)               gl_cv_func_printf_directive_ls="guessing yes";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -755,8 +714,7 @@
   AC_CACHE_CHECK([whether printf supports POSIX/XSI format strings with positions],
     [gl_cv_func_printf_positions],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 /* The string "%2$d %1$d", with dollar characters protected from the shell's
@@ -767,20 +725,18 @@
 {
   sprintf (buf, format, 33, 55);
   return (strcmp (buf, "55 33") != 0);
-}]])],
-        [gl_cv_func_printf_positions=yes],
-        [gl_cv_func_printf_positions=no],
-        [
+}], [gl_cv_func_printf_positions=yes], [gl_cv_func_printf_positions=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-           netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
-                         gl_cv_func_printf_positions="guessing no";;
-           beos*)        gl_cv_func_printf_positions="guessing no";;
-           mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
-           *)            gl_cv_func_printf_positions="guessing yes";;
-         esac
+       case "$host_os" in
+         netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
+                       gl_cv_func_printf_positions="guessing no";;
+         beos*)        gl_cv_func_printf_positions="guessing no";;
+         mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
+         *)            gl_cv_func_printf_positions="guessing yes";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -795,8 +751,7 @@
   AC_CACHE_CHECK([whether printf supports the grouping flag],
     [gl_cv_func_printf_flag_grouping],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[100];
@@ -806,19 +761,17 @@
       || buf[strlen (buf) - 1] != '9')
     return 1;
   return 0;
-}]])],
-        [gl_cv_func_printf_flag_grouping=yes],
-        [gl_cv_func_printf_flag_grouping=no],
-        [
+}], [gl_cv_func_printf_flag_grouping=yes], [gl_cv_func_printf_flag_grouping=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-           cygwin*)      gl_cv_func_printf_flag_grouping="guessing no";;
-           netbsd*)      gl_cv_func_printf_flag_grouping="guessing no";;
-           mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
-           *)            gl_cv_func_printf_flag_grouping="guessing yes";;
-         esac
+       case "$host_os" in
+         cygwin*)      gl_cv_func_printf_flag_grouping="guessing no";;
+         netbsd*)      gl_cv_func_printf_flag_grouping="guessing no";;
+         mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+         *)            gl_cv_func_printf_flag_grouping="guessing yes";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -834,8 +787,7 @@
   AC_CACHE_CHECK([whether printf supports the left-adjust flag correctly],
     [gl_cv_func_printf_flag_leftadjust],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[100];
@@ -846,7 +798,7 @@
       || strcmp (buf, "ab  c") != 0)
     return 1;
   return 0;
-}]])],
+}],
         [gl_cv_func_printf_flag_leftadjust=yes],
         [gl_cv_func_printf_flag_leftadjust=no],
         [
@@ -876,44 +828,37 @@
   AC_CACHE_CHECK([whether printf supports the zero flag correctly],
     [gl_cv_func_printf_flag_zero],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[100];
-static double zero = 0.0;
 int main ()
 {
-  if (sprintf (buf, "%010f", 1.0 / zero, 33, 44, 55) < 0
+  if (sprintf (buf, "%010f", 1.0 / 0.0, 33, 44, 55) < 0
       || (strcmp (buf, "       inf") != 0
           && strcmp (buf, "  infinity") != 0))
     return 1;
   return 0;
-}]])],
-        [gl_cv_func_printf_flag_zero=yes],
-        [gl_cv_func_printf_flag_zero=no],
-        [
+}], [gl_cv_func_printf_flag_zero=yes], [gl_cv_func_printf_flag_zero=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
-                   # Guess yes on BeOS.
-           beos*)  gl_cv_func_printf_flag_zero="guessing yes";;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_printf_flag_zero="guessing no";;
-         esac
+       case "$host_os" in
+                 # Guess yes on glibc systems.
+         *-gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
+                 # Guess yes on BeOS.
+         beos*)  gl_cv_func_printf_flag_zero="guessing yes";;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_printf_flag_zero="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
 dnl Test whether the *printf family of functions supports large precisions.
 dnl On mingw, precisions larger than 512 are treated like 512, in integer,
-dnl floating-point or pointer output. On Solaris 10/x86, precisions larger
-dnl than 510 in floating-point output crash the program. On Solaris 10/SPARC,
-dnl precisions larger than 510 in floating-point output yield wrong results.
-dnl On AIX 7.1, precisions larger than 998 in floating-point output yield
-dnl wrong results. On BeOS, precisions larger than 1044 crash the program.
+dnl floating-point or pointer output. On BeOS, precisions larger than 1044
+dnl crash the program.
 dnl Result is gl_cv_func_printf_precision.
 
 AC_DEFUN([gl_PRINTF_PRECISION],
@@ -923,43 +868,30 @@
   AC_CACHE_CHECK([whether printf supports large precisions],
     [gl_cv_func_printf_precision],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
 static char buf[5000];
 int main ()
 {
-  int result = 0;
 #ifdef __BEOS__
   /* On BeOS, this would crash and show a dialog box.  Avoid the crash.  */
   return 1;
 #endif
   if (sprintf (buf, "%.4000d %d", 1, 33, 44) < 4000 + 3)
-    result |= 1;
-  if (sprintf (buf, "%.4000f %d", 1.0, 33, 44) < 4000 + 5)
-    result |= 2;
-  if (sprintf (buf, "%.511f %d", 1.0, 33, 44) < 511 + 5
-      || buf[0] != '1')
-    result |= 4;
-  if (sprintf (buf, "%.999f %d", 1.0, 33, 44) < 999 + 5
-      || buf[0] != '1')
-    result |= 4;
-  return result;
-}]])],
-        [gl_cv_func_printf_precision=yes],
-        [gl_cv_func_printf_precision=no],
-        [
+    return 1;
+  return 0;
+}], [gl_cv_func_printf_precision=yes], [gl_cv_func_printf_precision=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-           # Guess no only on Solaris, native Windows, and BeOS systems.
-           solaris*)     gl_cv_func_printf_precision="guessing no" ;;
-           mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;;
-           beos*)        gl_cv_func_printf_precision="guessing no" ;;
-           *)            gl_cv_func_printf_precision="guessing yes" ;;
-         esac
+       case "$host_os" in
+         # Guess no only on native Win32 and BeOS systems.
+         mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;;
+         beos*)        gl_cv_func_printf_precision="guessing no" ;;
+         *)            gl_cv_func_printf_precision="guessing yes" ;;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -1028,9 +960,8 @@
 changequote([,])dnl
           ])])
           if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-            (./conftest 2>&AS_MESSAGE_LOG_FD
+            (./conftest
              result=$?
-             _AS_ECHO_LOG([\$? = $result])
              if test $result != 0 && test $result != 77; then result=1; fi
              exit $result
             ) >/dev/null 2>/dev/null
@@ -1044,7 +975,7 @@
           fi
           rm -fr conftest*
         else
-          dnl A universal build on Apple Mac OS X platforms.
+          dnl A universal build on Apple MacOS X platforms.
           dnl The result would be 'no' in 32-bit mode and 'yes' in 64-bit mode.
           dnl But we need a configuration result that is valid in both modes.
           gl_cv_func_printf_enomem="guessing no"
@@ -1097,80 +1028,61 @@
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([gl_SNPRINTF_PRESENCE])
   AC_CACHE_CHECK([whether snprintf truncates the result as in C99],
     [gl_cv_func_snprintf_truncation_c99],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
-#endif
 static char buf[100];
 int main ()
 {
   strcpy (buf, "ABCDEF");
-  my_snprintf (buf, 3, "%d %d", 4567, 89);
+  snprintf (buf, 3, "%d %d", 4567, 89);
   if (memcmp (buf, "45\0DEF", 6) != 0)
     return 1;
   return 0;
-}]])],
-        [gl_cv_func_snprintf_truncation_c99=yes],
-        [gl_cv_func_snprintf_truncation_c99=no],
-        [
+}], [gl_cv_func_snprintf_truncation_c99=yes], [gl_cv_func_snprintf_truncation_c99=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_snprintf_truncation_c99="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_snprintf_truncation_c99="guessing no";;
-           darwin*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on OpenBSD >= 3.9.
-           openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
-                                 gl_cv_func_snprintf_truncation_c99="guessing no";;
-           openbsd*)             gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5] | solaris2.[0-5].*)
-                                 gl_cv_func_snprintf_truncation_c99="guessing no";;
-           solaris*)             gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_snprintf_truncation_c99="guessing no";;
-           aix*)                 gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on HP-UX >= 11.
-           hpux[7-9]* | hpux10*) gl_cv_func_snprintf_truncation_c99="guessing no";;
-           hpux*)                gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on IRIX >= 6.5.
-           irix6.5)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on OSF/1 >= 5.
-           osf[3-4]*)            gl_cv_func_snprintf_truncation_c99="guessing no";;
-           osf*)                 gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_snprintf_truncation_c99="guessing no";;
-           netbsd*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_snprintf_truncation_c99="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on FreeBSD >= 5.
+         freebsd[1-4]*)        gl_cv_func_snprintf_truncation_c99="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_snprintf_truncation_c99="guessing no";;
+         darwin*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on OpenBSD >= 3.9.
+         openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
+                               gl_cv_func_snprintf_truncation_c99="guessing no";;
+         openbsd*)             gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on Solaris >= 2.6.
+         solaris2.[0-5]*)      gl_cv_func_snprintf_truncation_c99="guessing no";;
+         solaris*)             gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on AIX >= 4.
+         aix[1-3]*)            gl_cv_func_snprintf_truncation_c99="guessing no";;
+         aix*)                 gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on HP-UX >= 11.
+         hpux[7-9]* | hpux10*) gl_cv_func_snprintf_truncation_c99="guessing no";;
+         hpux*)                gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on IRIX >= 6.5.
+         irix6.5)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on OSF/1 >= 5.
+         osf[3-4]*)            gl_cv_func_snprintf_truncation_c99="guessing no";;
+         osf*)                 gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_snprintf_truncation_c99="guessing no";;
+         netbsd*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # Guess yes on BeOS.
+         beos*)                gl_cv_func_snprintf_truncation_c99="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_snprintf_truncation_c99="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -1189,78 +1101,56 @@
 dnl     ---------------------------------------------------------------------
 dnl Result is gl_cv_func_snprintf_retval_c99.
 
-AC_DEFUN_ONCE([gl_SNPRINTF_RETVAL_C99],
+AC_DEFUN([gl_SNPRINTF_RETVAL_C99],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([gl_SNPRINTF_PRESENCE])
   AC_CACHE_CHECK([whether snprintf returns a byte count as in C99],
     [gl_cv_func_snprintf_retval_c99],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
-#endif
 static char buf[100];
 int main ()
 {
   strcpy (buf, "ABCDEF");
-  if (my_snprintf (buf, 3, "%d %d", 4567, 89) != 7)
+  if (snprintf (buf, 3, "%d %d", 4567, 89) != 7)
     return 1;
-  if (my_snprintf (buf, 0, "%d %d", 4567, 89) != 7)
-    return 2;
-  if (my_snprintf (NULL, 0, "%d %d", 4567, 89) != 7)
-    return 3;
   return 0;
-}]])],
-        [gl_cv_func_snprintf_retval_c99=yes],
-        [gl_cv_func_snprintf_retval_c99=no],
-        [
+}], [gl_cv_func_snprintf_retval_c99=yes], [gl_cv_func_snprintf_retval_c99=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
-           darwin*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on OpenBSD >= 3.9.
-           openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
-                                 gl_cv_func_snprintf_retval_c99="guessing no";;
-           openbsd*)             gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on Solaris >= 2.10.
-           solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";;
-           solaris*)             gl_cv_func_printf_sizes_c99="guessing no";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_snprintf_retval_c99="guessing no";;
-           aix*)                 gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_snprintf_retval_c99="guessing no";;
-           netbsd*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_snprintf_retval_c99="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on FreeBSD >= 5.
+         freebsd[1-4]*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+         darwin*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on OpenBSD >= 3.9.
+         openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*)
+                               gl_cv_func_snprintf_retval_c99="guessing no";;
+         openbsd*)             gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on Solaris >= 2.6.
+         solaris2.[0-5]*)      gl_cv_func_snprintf_retval_c99="guessing no";;
+         solaris*)             gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on AIX >= 4.
+         aix[1-3]*)            gl_cv_func_snprintf_retval_c99="guessing no";;
+         aix*)                 gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_snprintf_retval_c99="guessing no";;
+         netbsd*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # Guess yes on BeOS.
+         beos*)                gl_cv_func_snprintf_retval_c99="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_snprintf_retval_c99="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -1272,28 +1162,12 @@
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([gl_SNPRINTF_PRESENCE])
   AC_CACHE_CHECK([whether snprintf fully supports the 'n' directive],
     [gl_cv_func_snprintf_directive_n],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
-#endif
 static char fmtstring[10];
 static char buf[100];
 int main ()
@@ -1303,47 +1177,44 @@
      support %n in format strings in read-only memory but not in writable
      memory.  */
   strcpy (fmtstring, "%d %n");
-  my_snprintf (buf, 4, fmtstring, 12345, &count, 33, 44, 55);
+  snprintf (buf, 4, fmtstring, 12345, &count, 33, 44, 55);
   if (count != 6)
     return 1;
   return 0;
-}]])],
-        [gl_cv_func_snprintf_directive_n=yes],
-        [gl_cv_func_snprintf_directive_n=no],
-        [
+}], [gl_cv_func_snprintf_directive_n=yes], [gl_cv_func_snprintf_directive_n=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_snprintf_directive_n="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_snprintf_directive_n="guessing no";;
-           darwin*)              gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5] | solaris2.[0-5].*)
-                                 gl_cv_func_snprintf_directive_n="guessing no";;
-           solaris*)             gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_snprintf_directive_n="guessing no";;
-           aix*)                 gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on IRIX >= 6.5.
-           irix6.5)              gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on OSF/1 >= 5.
-           osf[3-4]*)            gl_cv_func_snprintf_directive_n="guessing no";;
-           osf*)                 gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_snprintf_directive_n="guessing no";;
-           netbsd*)              gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_snprintf_directive_n="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_snprintf_directive_n="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on FreeBSD >= 5.
+         freebsd[1-4]*)        gl_cv_func_snprintf_directive_n="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_snprintf_directive_n="guessing no";;
+         darwin*)              gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on Solaris >= 2.6.
+         solaris2.[0-5]*)      gl_cv_func_snprintf_directive_n="guessing no";;
+         solaris*)             gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on AIX >= 4.
+         aix[1-3]*)            gl_cv_func_snprintf_directive_n="guessing no";;
+         aix*)                 gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on IRIX >= 6.5.
+         irix6.5)              gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on OSF/1 >= 5.
+         osf[3-4]*)            gl_cv_func_snprintf_directive_n="guessing no";;
+         osf*)                 gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_snprintf_directive_n="guessing no";;
+         netbsd*)              gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # Guess yes on BeOS.
+         beos*)                gl_cv_func_snprintf_directive_n="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_snprintf_directive_n="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -1355,36 +1226,20 @@
 AC_DEFUN([gl_SNPRINTF_SIZE1],
 [
   AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gl_SNPRINTF_PRESENCE])
   AC_CACHE_CHECK([whether snprintf respects a size of 1],
     [gl_cv_func_snprintf_size1],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdio.h>
-#if HAVE_SNPRINTF
-# define my_snprintf snprintf
-#else
-# include <stdarg.h>
-static int my_snprintf (char *buf, int size, const char *format, ...)
-{
-  va_list args;
-  int ret;
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
-  va_end (args);
-  return ret;
-}
-#endif
 int main()
 {
   static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' };
-  my_snprintf (buf, 1, "%d", 12345);
+  snprintf (buf, 1, "%d", 12345);
   return buf[1] != 'E';
-}]])],
-        [gl_cv_func_snprintf_size1=yes],
-        [gl_cv_func_snprintf_size1=no],
-        [gl_cv_func_snprintf_size1="guessing yes"])
+}],
+      [gl_cv_func_snprintf_size1=yes],
+      [gl_cv_func_snprintf_size1=no],
+      [gl_cv_func_snprintf_size1="guessing yes"])
     ])
 ])
 
@@ -1431,8 +1286,7 @@
   AC_CACHE_CHECK([whether vsnprintf respects a zero size as in C99],
     [gl_cv_func_vsnprintf_zerosize_c99],
     [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdarg.h>
 #include <stdio.h>
 static int my_snprintf (char *buf, int size, const char *format, ...)
@@ -1449,44 +1303,43 @@
   static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' };
   my_snprintf (buf, 0, "%d", 12345);
   return buf[0] != 'D';
-}]])],
-        [gl_cv_func_vsnprintf_zerosize_c99=yes],
-        [gl_cv_func_vsnprintf_zerosize_c99=no],
-        [
+}],
+      [gl_cv_func_vsnprintf_zerosize_c99=yes],
+      [gl_cv_func_vsnprintf_zerosize_c99=no],
+      [
 changequote(,)dnl
-         case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu*)               gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Cygwin.
-           cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5] | solaris2.[0-5].*)
-                                 gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           aix*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on IRIX >= 6.5.
-           irix6.5)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
-           netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           netbsd*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on mingw.
-           mingw* | pw*)         gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # If we don't know, assume the worst.
-           *)                    gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-         esac
+       case "$host_os" in
+                               # Guess yes on glibc systems.
+         *-gnu*)               gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on FreeBSD >= 5.
+         freebsd[1-4]*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+         freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on MacOS X >= 10.3.
+         darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+         darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on Cygwin.
+         cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on Solaris >= 2.6.
+         solaris2.[0-5]*)      gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+         solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on AIX >= 4.
+         aix[1-3]*)            gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+         aix*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on IRIX >= 6.5.
+         irix6.5)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on NetBSD >= 3.
+         netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
+                               gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+         netbsd*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on BeOS.
+         beos*)                gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # Guess yes on mingw.
+         mingw* | pw*)         gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                               # If we don't know, assume the worst.
+         *)                    gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+       esac
 changequote([,])dnl
-        ])
+      ])
     ])
 ])
 
@@ -1540,31 +1393,24 @@
 dnl   glibc 2.5                      .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
 dnl   glibc 2.3.6                    .  .  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
 dnl   FreeBSD 5.4, 6.1               .  .  .  .  #  .  .  .  .  .  .  #  .  #  .  .  .  .  .  .
-dnl   Mac OS X 10.5.8                .  .  .  #  #  .  .  .  .  .  .  #  .  .  .  .  .  .  .  .
-dnl   Mac OS X 10.3.9                .  .  .  .  #  .  .  .  .  .  .  #  .  #  .  .  .  .  .  .
+dnl   MacOS X 10.3.9                 .  .  .  .  #  .  .  .  .  .  .  #  .  #  .  .  .  .  .  .
 dnl   OpenBSD 3.9, 4.0               .  .  #  #  #  #  .  #  .  #  .  #  .  #  .  .  .  .  .  .
 dnl   Cygwin 1.7.0 (2009)            .  .  .  #  .  .  .  ?  .  .  .  .  .  ?  .  .  .  .  .  .
 dnl   Cygwin 1.5.25 (2008)           .  .  .  #  #  .  .  #  .  .  .  .  .  #  .  .  .  .  .  .
 dnl   Cygwin 1.5.19 (2006)           #  .  .  #  #  #  .  #  .  #  .  #  #  #  .  .  .  .  .  .
-dnl   Solaris 11 2011-11             .  .  #  #  #  .  .  #  .  .  .  #  .  .  .  .  .  .  .  .
-dnl   Solaris 10                     .  .  #  #  #  .  .  #  .  .  .  #  #  .  .  .  .  .  .  .
-dnl   Solaris 2.6 ... 9              #  .  #  #  #  #  .  #  .  .  .  #  #  .  .  .  #  .  .  .
+dnl   Solaris 10                     .  .  #  #  #  .  .  #  .  .  .  #  .  .  .  .  .  .  .  .
+dnl   Solaris 2.6 ... 9              #  .  #  #  #  #  .  #  .  .  .  #  .  .  .  .  .  .  .  .
 dnl   Solaris 2.5.1                  #  .  #  #  #  #  .  #  .  .  .  #  .  .  #  #  #  #  #  #
-dnl   AIX 7.1                        .  .  #  #  #  .  .  .  .  .  .  #  #  .  .  .  .  .  .  .
 dnl   AIX 5.2                        .  .  #  #  #  .  .  .  .  .  .  #  .  .  .  .  .  .  .  .
-dnl   AIX 4.3.2, 5.1                 #  .  #  #  #  #  .  .  .  .  .  #  .  .  .  .  #  .  .  .
+dnl   AIX 4.3.2, 5.1                 #  .  #  #  #  #  .  .  .  .  .  #  .  .  .  .  .  .  .  .
 dnl   HP-UX 11.31                    .  .  .  .  #  .  .  .  .  .  .  #  .  .  .  .  #  #  .  .
 dnl   HP-UX 11.{00,11,23}            #  .  .  .  #  #  .  .  .  .  .  #  .  .  .  .  #  #  .  #
 dnl   HP-UX 10.20                    #  .  #  .  #  #  .  ?  .  .  #  #  .  .  .  .  #  #  ?  #
 dnl   IRIX 6.5                       #  .  #  #  #  #  .  #  .  .  .  #  .  .  .  .  #  .  .  .
 dnl   OSF/1 5.1                      #  .  #  #  #  #  .  .  .  .  .  #  .  .  .  .  #  .  .  #
 dnl   OSF/1 4.0d                     #  .  #  #  #  #  .  .  .  .  .  #  .  .  #  #  #  #  #  #
-dnl   NetBSD 5.0                     .  .  .  #  #  .  .  .  .  .  .  #  .  #  .  .  .  .  .  .
 dnl   NetBSD 4.0                     .  ?  ?  ?  ?  ?  .  ?  .  ?  ?  ?  ?  ?  .  .  .  ?  ?  ?
 dnl   NetBSD 3.0                     .  .  .  .  #  #  .  ?  #  #  ?  #  .  #  .  .  .  .  .  .
-dnl   Haiku                          .  .  .  #  #  #  .  #  .  .  .  .  .  ?  .  .  ?  .  .  .
-dnl   BeOS                           #  #  .  #  #  #  .  ?  #  .  ?  .  #  ?  .  .  ?  .  .  .
-dnl   old mingw / msvcrt             #  #  #  #  #  #  .  .  #  #  .  #  #  ?  .  #  #  #  .  .
-dnl   MSVC 9                         #  #  #  #  #  #  #  .  #  #  .  #  #  ?  #  #  #  #  .  .
-dnl   mingw 2009-2011                .  #  .  #  .  .  .  .  #  #  .  .  .  ?  .  .  .  .  .  .
-dnl   mingw-w64 2011                 #  #  #  #  #  #  .  .  #  #  .  #  #  ?  .  #  #  #  .  .
+dnl   Haiku                          .  .  .  #  #  #  .  #  .  .  .  .  .  ?  .  .  .  .  .  .
+dnl   BeOS                           #  #  .  #  #  #  .  ?  #  .  ?  .  #  ?  .  .  .  .  .  .
+dnl   mingw                          #  #  #  #  #  #  .  .  #  #  .  #  #  ?  .  #  #  #  .  .
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/putenv.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/putenv.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/putenv.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/putenv.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# putenv.m4 serial 20
-dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# putenv.m4 serial 16
+dnl Copyright (C) 2002-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,7 +12,6 @@
 AC_DEFUN([gl_FUNC_PUTENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
    [gl_cv_func_svid_putenv],
    [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
@@ -22,35 +21,21 @@
 
     /* Try to remove it.  */
     if (putenv ("CONFTEST_putenv"))
-      return 2;
+      return 1;
 
     /* Make sure it was deleted.  */
     if (getenv ("CONFTEST_putenv") != 0)
-      return 3;
+      return 1;
 
     return 0;
               ]])],
              gl_cv_func_svid_putenv=yes,
              gl_cv_func_svid_putenv=no,
              dnl When crosscompiling, assume putenv is broken.
-             [case "$host_os" in
-                        # Guess yes on glibc systems.
-                *-gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
-                        # If we don't know, assume the worst.
-                *)      gl_cv_func_svid_putenv="guessing no" ;;
-              esac
-             ])
+             gl_cv_func_svid_putenv=no)
    ])
-  case "$gl_cv_func_svid_putenv" in
-    *yes) ;;
-    *)
-      REPLACE_PUTENV=1
-      ;;
-  esac
-])
-
-# Prerequisites of lib/putenv.c.
-AC_DEFUN([gl_PREREQ_PUTENV],
-[
-  AC_CHECK_DECLS([_putenv])
+  if test $gl_cv_func_svid_putenv = no; then
+    REPLACE_PUTENV=1
+    AC_LIBOBJ([putenv])
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/quotearg.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/quotearg.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/quotearg.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/quotearg.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,10 +1,9 @@
-# quotearg.m4 serial 9
-dnl Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc.
+# quotearg.m4 serial 8
+dnl Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_QUOTEARG],
 [
-  :
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/quote.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/quote.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/quote.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/quote.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# quote.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
+# quote.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006, 2009, 2010 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,
@@ -9,5 +9,4 @@
 [
   dnl Prerequisites of lib/quote.c.
   dnl (none)
-  :
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/raise.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/raise.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/raise.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/raise.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# raise.m4 serial 3
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_RAISE],
-[
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_MSVC_INVAL])
-  AC_CHECK_FUNCS([raise])
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
-  else
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_RAISE=1
-    fi
-    m4_ifdef([gl_SIGNALBLOCKING], [
-      gl_SIGNALBLOCKING
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-        m4_ifdef([gl_SIGNAL_SIGPIPE], [
-          gl_SIGNAL_SIGPIPE
-          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-            REPLACE_RAISE=1
-          fi
-        ], [:])
-      fi
-    ])
-  fi
-])
-
-# Prerequisites of lib/raise.c.
-AC_DEFUN([gl_PREREQ_RAISE], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/rawmemchr.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/rawmemchr.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/rawmemchr.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/rawmemchr.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# rawmemchr.m4 serial 2
-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+# rawmemchr.m4 serial 1
+dnl Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,9 +10,10 @@
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([rawmemchr])
+  AC_REPLACE_FUNCS([rawmemchr])
   if test $ac_cv_func_rawmemchr = no; then
     HAVE_RAWMEMCHR=0
+    gl_PREREQ_RAWMEMCHR
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/readdir.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/readdir.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/readdir.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/readdir.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-# readdir.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_READDIR],
-[
-  AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
-
-  AC_CHECK_FUNCS([readdir])
-  if test $ac_cv_func_readdir = no; then
-    HAVE_READDIR=0
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/read-file.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/read-file.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/read-file.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/read-file.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,8 +1,15 @@
-# read-file.m4 serial 3
-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
+# read-file.m4 serial 2
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 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.
 
+AC_DEFUN([gl_FUNC_READ_FILE],
+[
+  AC_LIBOBJ([read-file])
+  gl_PREREQ_READ_FILE
+])
+
 # Prerequisites of lib/read-file.c.
 AC_DEFUN([gl_PREREQ_READ_FILE], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/readlink.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/readlink.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/readlink.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/readlink.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
+# readlink.m4 serial 9
+dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,10 +7,11 @@
 AC_DEFUN([gl_FUNC_READLINK],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_FUNCS_ONCE([readlink])
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
+    AC_LIBOBJ([readlink])
+    gl_PREREQ_READLINK
   else
     AC_CACHE_CHECK([whether readlink signature is correct],
       [gl_cv_decl_readlink_works],
@@ -33,31 +34,21 @@
 ]], [[char buf[20];
       return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;]])],
          [gl_cv_func_readlink_works=yes], [gl_cv_func_readlink_works=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_readlink_works="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_readlink_works="guessing no" ;;
-          esac
-         ])
+         [gl_cv_func_readlink_works="guessing no"])
       rm -f conftest.link conftest.lnk2])
-    case "$gl_cv_func_readlink_works" in
-      *yes)
-        if test "$gl_cv_decl_readlink_works" != yes; then
-          REPLACE_READLINK=1
-        fi
-        ;;
-      *)
-        AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
-          fails to recognize a trailing slash.])
-        REPLACE_READLINK=1
-        ;;
-    esac
+    if test "$gl_cv_func_readlink_works" != yes; then
+      AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
+        fails to recognize a trailing slash.])
+      REPLACE_READLINK=1
+      AC_LIBOBJ([readlink])
+    elif test "$gl_cv_decl_readlink_works" != yes; then
+      REPLACE_READLINK=1
+      AC_LIBOBJ([readlink])
+    fi
   fi
 ])
 
-# Like gl_FUNC_READLINK, except prepare for separate compilation
-# (no REPLACE_READLINK, no AC_LIBOBJ).
+# Like gl_FUNC_READLINK, except prepare for separate compilation (no AC_LIBOBJ).
 AC_DEFUN([gl_FUNC_READLINK_SEPARATE],
 [
   AC_CHECK_FUNCS_ONCE([readlink])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/read.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/read.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/read.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/read.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# read.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_READ],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_READ=1
-  fi
-  dnl This ifdef is just an optimization, to avoid performing a configure
-  dnl check whose result is not used. It does not make the test of
-  dnl GNULIB_UNISTD_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_READ=1
-    fi
-  ])
-])
-
-# Prerequisites of lib/read.c.
-AC_DEFUN([gl_PREREQ_READ], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/realloc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/realloc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/realloc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/realloc.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,76 +1,23 @@
-# realloc.m4 serial 13
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+# realloc.m4 serial 9
+dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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
-AC_DEFUN([_AC_FUNC_REALLOC_IF],
-[
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-  AC_CHECK_HEADERS([stdlib.h])
-  AC_CACHE_CHECK([for GNU libc compatible realloc],
-    [ac_cv_func_realloc_0_nonnull],
-    [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-            # include <stdlib.h>
-            #else
-            char *realloc ();
-            #endif
-          ]],
-          [[return ! realloc (0, 0);]])
-       ],
-       [ac_cv_func_realloc_0_nonnull=yes],
-       [ac_cv_func_realloc_0_nonnull=no],
-       [case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* \
-          | hpux* | solaris* | cygwin* | mingw*)
-            ac_cv_func_realloc_0_nonnull=yes ;;
-          # If we don't know, assume the worst.
-          *) ac_cv_func_realloc_0_nonnull=no ;;
-        esac
-       ])
-    ])
-  AS_IF([test $ac_cv_func_realloc_0_nonnull = yes], [$1], [$2])
-])# AC_FUNC_REALLOC
-
-])
-
-# gl_FUNC_REALLOC_GNU
-# -------------------
-# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace
-# realloc if it is not.
-AC_DEFUN([gl_FUNC_REALLOC_GNU],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  dnl _AC_FUNC_REALLOC_IF is defined in Autoconf.
-  _AC_FUNC_REALLOC_IF(
-    [AC_DEFINE([HAVE_REALLOC_GNU], [1],
-               [Define to 1 if your system has a GNU libc compatible 'realloc'
-                function, and to 0 otherwise.])],
-    [AC_DEFINE([HAVE_REALLOC_GNU], [0])
-     REPLACE_REALLOC=1
-    ])
-])# gl_FUNC_REALLOC_GNU
-
 # gl_FUNC_REALLOC_POSIX
 # ---------------------
 # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it
 # fails), and replace realloc if it is not.
 AC_DEFUN([gl_FUNC_REALLOC_POSIX],
 [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
   if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_REALLOC_POSIX=1
     AC_DEFINE([HAVE_REALLOC_POSIX], [1],
       [Define if the 'realloc' function is POSIX compliant.])
   else
-    REPLACE_REALLOC=1
+    AC_LIBOBJ([realloc])
+    HAVE_REALLOC_POSIX=0
   fi
+  AC_SUBST([HAVE_REALLOC_POSIX])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/relocatable-lib.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/relocatable-lib.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/relocatable-lib.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/relocatable-lib.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# relocatable-lib.m4 serial 6
-dnl Copyright (C) 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+# relocatable-lib.m4 serial 5
+dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,9 @@
 AC_DEFUN([gl_RELOCATABLE_LIBRARY],
 [
   AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
+  if test $RELOCATABLE = yes; then
+    AC_LIBOBJ([relocatable])
+  fi
 ])
 AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
 [
@@ -29,6 +32,13 @@
   fi
 ])
 
+dnl Like gl_RELOCATABLE_LIBRARY, except prepare for separate compilation
+dnl (no AC_LIBOBJ).
+AC_DEFUN([gl_RELOCATABLE_LIBRARY_SEPARATE],
+[
+  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
+])
+
 dnl Support for relocatable packages for which it is a nop.
 AC_DEFUN([gl_RELOCATABLE_NOP],
 [
@@ -45,3 +55,4 @@
   AC_SUBST([RELOCATABLE])
   AC_MSG_RESULT([$RELOCATABLE])
 ])
+
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/relocatable.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/relocatable.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/relocatable.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/relocatable.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# relocatable.m4 serial 18
-dnl Copyright (C) 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+# relocatable.m4 serial 15
+dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -14,6 +14,9 @@
 [
   AC_REQUIRE([gl_RELOCATABLE_BODY])
   gl_RELOCATABLE_LIBRARY
+  if test $RELOCATABLE = yes; then
+    AC_LIBOBJ([progreloc])
+  fi
   : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
   RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
   RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
@@ -33,7 +36,6 @@
   AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
   is_noop=no
   use_elf_origin_trick=no
-  use_wrapper=no
   if test $RELOCATABLE = yes; then
     # --enable-relocatable implies --disable-rpath
     enable_rpath=no
@@ -41,7 +43,7 @@
     AC_CHECK_FUNCS([_NSGetExecutablePath])
     case "$host_os" in
       mingw*) is_noop=yes ;;
-      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
+      linux*) use_elf_origin_trick=yes ;;
     esac
     if test $is_noop = yes; then
       RELOCATABLE_LDFLAGS=:
@@ -56,7 +58,6 @@
         RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
         AC_SUBST([RELOCATABLE_LDFLAGS])
       else
-        use_wrapper=yes
         dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
         dnl consisting of more than one word - libtool doesn't support this.
         dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
@@ -72,7 +73,6 @@
   fi
   AM_CONDITIONAL([RELOCATABLE_VIA_LD],
     [test $is_noop = yes || test $use_elf_origin_trick = yes])
-  AM_CONDITIONAL([RELOCATABLE_VIA_WRAPPER], [test $use_wrapper = yes])
 
   dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty.
   AC_SUBST([RELOCATABLE_LIBRARY_PATH])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/rmdir.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/rmdir.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/rmdir.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/rmdir.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,15 +1,14 @@
-# rmdir.m4 serial 13
-dnl Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc.
+# rmdir.m4 serial 8
+dnl Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_RMDIR],
 [
+  AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   dnl Detect cygwin 1.5.x bug.
-  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works],
     [mkdir conftest.dir
      touch conftest.file
@@ -17,33 +16,14 @@
        [AC_LANG_PROGRAM(
          [[#include <stdio.h>
            #include <errno.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <direct.h>
-           #endif
-]], [[int result = 0;
-      if (!rmdir ("conftest.file/"))
-        result |= 1;
-      else if (errno != ENOTDIR)
-        result |= 2;
-      if (!rmdir ("conftest.dir/./"))
-        result |= 4;
-      return result;
-    ]])],
+           #include <unistd.h>
+]], [[return !rmdir ("conftest.file/") || errno != ENOTDIR
+       || !rmdir ("conftest.dir/./");]])],
        [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no],
-       [case "$host_os" in
-                  # Guess yes on glibc systems.
-          *-gnu*) gl_cv_func_rmdir_works="guessing yes" ;;
-                  # If we don't know, assume the worst.
-          *)      gl_cv_func_rmdir_works="guessing no" ;;
-        esac
-       ])
+       [gl_cv_func_rmdir_works="guessing no"])
      rm -rf conftest.dir conftest.file])
-  case "$gl_cv_func_rmdir_works" in
-    *yes) ;;
-    *)
-      REPLACE_RMDIR=1
-      ;;
-  esac
+  if test x"$gl_cv_func_rmdir_works" != xyes; then
+    REPLACE_RMDIR=1
+    AC_LIBOBJ([rmdir])
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/safe-read.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/safe-read.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/safe-read.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/safe-read.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,10 +1,17 @@
-# safe-read.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
+# safe-read.m4 serial 5
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 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.
 
+AC_DEFUN([gl_SAFE_READ],
+[
+  AC_LIBOBJ([safe-read])
+
+  gl_PREREQ_SAFE_READ
+])
+
 # Prerequisites of lib/safe-read.c.
 AC_DEFUN([gl_PREREQ_SAFE_READ],
 [
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/safe-write.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/safe-write.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/safe-write.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/safe-write.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,9 +1,16 @@
-# safe-write.m4 serial 4
-dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+# safe-write.m4 serial 3
+dnl Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
+AC_DEFUN([gl_SAFE_WRITE],
+[
+  AC_LIBOBJ([safe-write])
+
+  gl_PREREQ_SAFE_WRITE
+])
+
 # Prerequisites of lib/safe-write.c.
 AC_DEFUN([gl_PREREQ_SAFE_WRITE],
 [
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sched_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sched_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sched_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sched_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# sched_h.m4 serial 6
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# sched_h.m4 serial 2
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,13 +13,13 @@
        #include <sched.h>
        struct sched_param a;
        int b[] = { SCHED_FIFO, SCHED_RR, SCHED_OTHER };
-       pid_t t1;
      ]])],
     [SCHED_H=''],
     [SCHED_H='sched.h'
 
      gl_CHECK_NEXT_HEADERS([sched.h])
 
+     AC_CHECK_HEADERS_ONCE([sched.h])
      if test $ac_cv_header_sched_h = yes; then
        HAVE_SCHED_H=1
      else
@@ -31,10 +31,6 @@
        [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0],
        [#include <sched.h>])
      AC_SUBST([HAVE_STRUCT_SCHED_PARAM])
-
-     dnl Ensure the type pid_t gets defined.
-     AC_REQUIRE([AC_TYPE_PID_T])
     ])
   AC_SUBST([SCHED_H])
-  AM_CONDITIONAL([GL_GENERATE_SCHED_H], [test -n "$SCHED_H"])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/secure_getenv.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/secure_getenv.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/secure_getenv.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/secure_getenv.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Look up an environment variable more securely.
-dnl Copyright 2013-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_SECURE_GETENV],
-[
-  dnl Persuade glibc <stdlib.h> to declare secure_getenv().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([secure_getenv])
-  if test $ac_cv_func_secure_getenv = no; then
-    HAVE_SECURE_GETENV=0
-  fi
-])
-
-# Prerequisites of lib/secure_getenv.c.
-AC_DEFUN([gl_PREREQ_SECURE_GETENV], [
-  AC_CHECK_FUNCS([__secure_getenv])
-  if test $ac_cv_func___secure_getenv = no; then
-    AC_CHECK_FUNCS([issetugid])
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/setenv.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/setenv.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/setenv.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/setenv.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+# setenv.m4 serial 16
+dnl Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,16 @@
 AC_DEFUN([gl_FUNC_SETENV],
 [
   AC_REQUIRE([gl_FUNC_SETENV_SEPARATE])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  if test $HAVE_SETENV$REPLACE_SETENV != 10; then
+    AC_LIBOBJ([setenv])
+  fi
+])
+
+# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([setenv])
   if test $ac_cv_func_setenv = no; then
     HAVE_SETENV=0
   else
@@ -18,127 +27,69 @@
        #include <errno.h>
        #include <string.h>
       ]], [[
-       int result = 0;
-       {
-         if (setenv ("", "", 0) != -1)
-           result |= 1;
-         else if (errno != EINVAL)
-           result |= 2;
-       }
-       {
-         if (setenv ("a", "=", 1) != 0)
-           result |= 4;
-         else if (strcmp (getenv ("a"), "=") != 0)
-           result |= 8;
-       }
-       return result;
+       if (setenv ("", "", 0) != -1) return 1;
+       if (errno != EINVAL) return 2;
+       if (setenv ("a", "=", 1) != 0) return 3;
+       if (strcmp (getenv ("a"), "=") != 0) return 4;
       ]])],
       [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_setenv_works="guessing no" ;;
-       esac
-      ])])
-    case "$gl_cv_func_setenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_SETENV=1
-        ;;
-    esac
-  fi
-])
-
-# Like gl_FUNC_SETENV, except prepare for separate compilation
-# (no REPLACE_SETENV, no AC_LIBOBJ).
-AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_CHECK_DECLS_ONCE([setenv])
-  if test $ac_cv_have_decl_setenv = no; then
-    HAVE_DECL_SETENV=0
+      [gl_cv_func_setenv_works="guessing no"])])
+    if test "$gl_cv_func_setenv_works" != yes; then
+      REPLACE_SETENV=1
+      AC_LIBOBJ([setenv])
+    fi
   fi
-  AC_CHECK_FUNCS_ONCE([setenv])
   gl_PREREQ_SETENV
 ])
 
 AC_DEFUN([gl_FUNC_UNSETENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CHECK_DECLS_ONCE([unsetenv])
-  if test $ac_cv_have_decl_unsetenv = no; then
-    HAVE_DECL_UNSETENV=0
-  fi
   AC_CHECK_FUNCS([unsetenv])
   if test $ac_cv_func_unsetenv = no; then
     HAVE_UNSETENV=0
+    AC_LIBOBJ([unsetenv])
+    gl_PREREQ_UNSETENV
   else
-    HAVE_UNSETENV=1
     dnl Some BSDs return void, failing to do error checking.
     AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[
-#undef _BSD
-#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 <stdlib.h> */
-#include <stdlib.h>
+      [AC_TRY_COMPILE([#include <stdlib.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
+#if defined(__STDC__) || defined(__cplusplus)
 int unsetenv (const char *name);
-            ]],
-            [[]])],
-         [gt_cv_func_unsetenv_ret='int'],
-         [gt_cv_func_unsetenv_ret='void'])])
+#else
+int unsetenv();
+#endif
+], , gt_cv_func_unsetenv_ret='int', gt_cv_func_unsetenv_ret='void')])
     if test $gt_cv_func_unsetenv_ret = 'void'; then
       AC_DEFINE([VOID_UNSETENV], [1], [Define to 1 if unsetenv returns void
        instead of int.])
       REPLACE_UNSETENV=1
+      AC_LIBOBJ([unsetenv])
     fi
 
     dnl Solaris 10 unsetenv does not remove all copies of a name.
-    dnl Haiku alpha 2 unsetenv gets confused by assignment to environ.
-    dnl OpenBSD 4.7 unsetenv("") does not fail.
-    AC_CACHE_CHECK([whether unsetenv obeys POSIX],
+    AC_CACHE_CHECK([whether unsetenv works on duplicates],
       [gl_cv_func_unsetenv_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
        #include <stdlib.h>
-       #include <errno.h>
-       extern char **environ;
       ]], [[
-       char entry1[] = "a=1";
-       char entry2[] = "b=2";
-       char *env[] = { entry1, entry2, NULL };
+       char entry[] = "b=2";
        if (putenv ((char *) "a=1")) return 1;
-       if (putenv (entry2)) return 2;
-       entry2[0] = 'a';
+       if (putenv (entry)) return 2;
+       entry[0] = 'a';
        unsetenv ("a");
        if (getenv ("a")) return 3;
-       if (!unsetenv ("") || errno != EINVAL) return 4;
-       entry2[0] = 'b';
-       environ = env;
-       if (!getenv ("a")) return 5;
-       entry2[0] = 'a';
-       unsetenv ("a");
-       if (getenv ("a")) return 6;
       ]])],
       [gl_cv_func_unsetenv_works=yes], [gl_cv_func_unsetenv_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_unsetenv_works="guessing no" ;;
-       esac
-      ])])
-    case "$gl_cv_func_unsetenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_UNSETENV=1
-        ;;
-    esac
+      [gl_cv_func_unsetenv_works="guessing no"])])
+    if test "$gl_cv_func_unsetenv_works" != yes; then
+      REPLACE_UNSETENV=1
+      AC_LIBOBJ([unsetenv])
+    fi
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/setlocale.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/setlocale.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/setlocale.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/setlocale.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# setlocale.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_SETLOCALE],
-[
-  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    dnl On native Windows systems, setlocale(category,NULL) does not look at
-    dnl the environment variables LC_ALL, category, and LANG.
-    mingw*) REPLACE_SETLOCALE=1 ;;
-    dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
-    dnl is then still "C".
-    cygwin*)
-      case `uname -r` in
-        1.5.*) REPLACE_SETLOCALE=1 ;;
-      esac
-      ;;
-  esac
-])
-
-# Prerequisites of lib/setlocale.c.
-AC_DEFUN([gl_PREREQ_SETLOCALE],
-[
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sigaction.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sigaction.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sigaction.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sigaction.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# sigaction.m4 serial 7
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# sigaction.m4 serial 5
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,8 @@
     fi
   else
     HAVE_SIGACTION=0
+    AC_LIBOBJ([sigaction])
+    gl_PREREQ_SIGACTION
   fi
 ])
 
@@ -37,4 +39,7 @@
 ])
 
 # Prerequisites of lib/sig-handler.h.
-AC_DEFUN([gl_PREREQ_SIG_HANDLER_H], [:])
+AC_DEFUN([gl_PREREQ_SIG_HANDLER_H],
+[
+  AC_REQUIRE([AC_C_INLINE])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sig_atomic_t.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sig_atomic_t.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sig_atomic_t.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sig_atomic_t.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# sig_atomic_t.m4 serial 3
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+# sig_atomic_t.m4 serial 2
+dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,6 @@
   AC_CHECK_TYPES([sig_atomic_t], ,
     [AC_DEFINE([sig_atomic_t], [int],
        [Define as an integer type suitable for memory locations that can be
-        accessed atomically even in the presence of asynchronous signals.])],
+        accessed atomically even in the presence of asynchnonous signals.])],
     [#include <signal.h>])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/signalblocking.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/signalblocking.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/signalblocking.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/signalblocking.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 14
-dnl Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
+# signalblocking.m4 serial 10
+dnl Copyright (C) 2001-2002, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,14 +12,31 @@
 AC_DEFUN([gl_SIGNALBLOCKING],
 [
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
-  if test $gl_cv_type_sigset_t = yes; then
+  signals_not_posix=
+  AC_EGREP_HEADER([sigset_t], [signal.h], , [signals_not_posix=1])
+  if test -z "$signals_not_posix"; then
     AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1])
   fi
   if test -z "$gl_cv_func_sigprocmask"; then
     HAVE_POSIX_SIGNALBLOCKING=0
+    AC_LIBOBJ([sigprocmask])
+    gl_PREREQ_SIGPROCMASK
   fi
 ])
 
-# Prerequisites of lib/sigprocmask.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])
+# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c.
+AC_DEFUN([gl_PREREQ_SIGPROCMASK],
+[
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+  AC_CHECK_TYPES([sigset_t],
+    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
+    [#include <signal.h>
+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>])
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
+  fi
+  dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has
+  dnl the sigset_t type.
+  AC_SUBST([HAVE_SIGSET_T])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/signal_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/signal_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/signal_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/signal_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# signal_h.m4 serial 18
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# signal_h.m4 serial 11
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,49 +7,22 @@
 AC_DEFUN([gl_SIGNAL_H],
 [
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
-  gl_NEXT_HEADERS([signal.h])
-
+  gl_CHECK_NEXT_HEADERS([signal.h])
 # AIX declares sig_atomic_t to already include volatile, and C89 compilers
 # then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
   AC_CHECK_TYPE([volatile sig_atomic_t], [],
     [HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0], [[
 #include <signal.h>
     ]])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
   AC_REQUIRE([AC_TYPE_UID_T])
 
-  dnl Persuade glibc <signal.h> to define sighandler_t.
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_TYPE([sighandler_t], [], [HAVE_SIGHANDLER_T=0], [[
-#include <signal.h>
-    ]])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <signal.h>
-    ]], [pthread_sigmask sigaction
-    sigaddset sigdelset sigemptyset sigfillset sigismember
+    ]], [sigaction sigaddset sigdelset sigemptyset sigfillset sigismember
     sigpending sigprocmask])
 ])
 
-AC_DEFUN([gl_CHECK_TYPE_SIGSET_T],
-[
-  AC_CHECK_TYPES([sigset_t],
-    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
-    [[
-      #include <signal.h>
-      /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-      #include <sys/types.h>
-    ]])
-  if test $gl_cv_type_sigset_t != yes; then
-    HAVE_SIGSET_T=0
-  fi
-])
-
 AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
@@ -61,15 +34,11 @@
 
 AC_DEFUN([gl_SIGNAL_H_DEFAULTS],
 [
-  GNULIB_PTHREAD_SIGMASK=0;    AC_SUBST([GNULIB_PTHREAD_SIGMASK])
-  GNULIB_RAISE=0;              AC_SUBST([GNULIB_RAISE])
   GNULIB_SIGNAL_H_SIGPIPE=0;   AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE])
   GNULIB_SIGPROCMASK=0;        AC_SUBST([GNULIB_SIGPROCMASK])
   GNULIB_SIGACTION=0;          AC_SUBST([GNULIB_SIGACTION])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING])
-  HAVE_PTHREAD_SIGMASK=1;      AC_SUBST([HAVE_PTHREAD_SIGMASK])
-  HAVE_RAISE=1;                AC_SUBST([HAVE_RAISE])
   HAVE_SIGSET_T=1;             AC_SUBST([HAVE_SIGSET_T])
   HAVE_SIGINFO_T=1;            AC_SUBST([HAVE_SIGINFO_T])
   HAVE_SIGACTION=1;            AC_SUBST([HAVE_SIGACTION])
@@ -77,7 +46,4 @@
                                AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
   HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
                                AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T])
-  HAVE_SIGHANDLER_T=1;         AC_SUBST([HAVE_SIGHANDLER_T])
-  REPLACE_PTHREAD_SIGMASK=0;   AC_SUBST([REPLACE_PTHREAD_SIGMASK])
-  REPLACE_RAISE=0;             AC_SUBST([REPLACE_RAISE])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sigpipe.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sigpipe.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sigpipe.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sigpipe.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # sigpipe.m4 serial 2
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sleep.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sleep.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sleep.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sleep.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-# sleep.m4 serial 7
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_SLEEP],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  dnl We expect to see the declaration of sleep() in a header file.
-  dnl Older versions of mingw have a sleep() function that is an alias to
-  dnl _sleep() in MSVCRT. It has a different signature than POSIX sleep():
-  dnl it takes the number of milliseconds as argument and returns void.
-  dnl mingw does not declare this function.
-  AC_CHECK_DECLS([sleep], , , [[#include <unistd.h>]])
-  AC_CHECK_FUNCS_ONCE([sleep])
-  if test $ac_cv_have_decl_sleep != yes; then
-    HAVE_SLEEP=0
-  else
-    dnl Cygwin 1.5.x has a bug where sleep can't exceed 49.7 days.
-    AC_CACHE_CHECK([for working sleep], [gl_cv_func_sleep_works],
-      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-static void
-handle_alarm (int sig)
-{
-  if (sig != SIGALRM)
-    _exit (2);
-}
-]], [[
-    /* Failure to compile this test due to missing alarm is okay,
-       since all such platforms (mingw) also lack sleep.  */
-    unsigned int pentecost = 50 * 24 * 60 * 60; /* 50 days.  */
-    unsigned int remaining;
-    signal (SIGALRM, handle_alarm);
-    alarm (1);
-    remaining = sleep (pentecost);
-    if (remaining > pentecost)
-      return 3;
-    if (remaining <= pentecost - 10)
-      return 4;
-    return 0;
-    ]])],
-      [gl_cv_func_sleep_works=yes], [gl_cv_func_sleep_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_sleep_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_sleep_works="guessing no" ;;
-       esac
-      ])])
-    case "$gl_cv_func_sleep_works" in
-      *yes) ;;
-      *)
-        REPLACE_SLEEP=1
-        ;;
-    esac
-  fi
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/snprintf.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/snprintf.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/snprintf.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/snprintf.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,13 +1,9 @@
-# snprintf.m4 serial 6
-dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc.
+# snprintf.m4 serial 5
+dnl Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Libintl 0.17 will replace snprintf only if it does not support %1$s,
-dnl but defers to any gnulib snprintf replacements.  Therefore, gnulib
-dnl must guarantee that the decision for replacing snprintf is a superset
-dnl of the reasons checked by libintl.
 AC_DEFUN([gl_FUNC_SNPRINTF],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
@@ -17,17 +13,7 @@
     gl_SNPRINTF_SIZE1
     case "$gl_cv_func_snprintf_size1" in
       *yes)
-        gl_SNPRINTF_RETVAL_C99
-        case "$gl_cv_func_snprintf_retval_c99" in
-          *yes)
-            gl_PRINTF_POSITIONS
-            case "$gl_cv_func_printf_positions" in
-              *yes)
-                gl_cv_func_snprintf_usable=yes
-                ;;
-            esac
-            ;;
-        esac
+        gl_cv_func_snprintf_usable=yes
         ;;
     esac
   fi
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/spawn_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/spawn_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/spawn_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/spawn_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# spawn_h.m4 serial 16
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# spawn_h.m4 serial 11
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,7 @@
   dnl <spawn.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_NEXT_HEADERS([spawn.h])
 
+  AC_CHECK_HEADERS_ONCE([spawn.h])
   if test $ac_cv_header_spawn_h = yes; then
     HAVE_SPAWN_H=1
     AC_CHECK_TYPES([posix_spawnattr_t], [], [HAVE_POSIX_SPAWNATTR_T=0], [[
@@ -28,15 +29,10 @@
     HAVE_SPAWN_H=0
     HAVE_POSIX_SPAWNATTR_T=0
     HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
+    gl_REPLACE_SPAWN_H
   fi
   AC_SUBST([HAVE_SPAWN_H])
 
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
   AC_REQUIRE([gl_HAVE_POSIX_SPAWN])
 
   AC_REQUIRE([AC_C_RESTRICT])
@@ -64,20 +60,19 @@
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
 
-  LIB_POSIX_SPAWN=
-  AC_SUBST([LIB_POSIX_SPAWN])
-  gl_saved_libs=$LIBS
-    AC_SEARCH_LIBS([posix_spawn], [rt],
-                   [test "$ac_cv_search_posix_spawn" = "none required" ||
-                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
-    AC_CHECK_FUNCS([posix_spawn])
-  LIBS=$gl_saved_libs
-
+  AC_CHECK_FUNCS_ONCE([posix_spawn])
   if test $ac_cv_func_posix_spawn != yes; then
     HAVE_POSIX_SPAWN=0
   fi
 ])
 
+dnl Unconditionally enables the replacement of <spawn.h>.
+AC_DEFUN([gl_REPLACE_SPAWN_H],
+[
+  dnl This is a no-op, because <spawn.h> is always overridden.
+  :
+])
+
 AC_DEFUN([gl_SPAWN_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
@@ -116,10 +111,4 @@
   HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1;
                              AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_T])
   REPLACE_POSIX_SPAWN=0;     AC_SUBST([REPLACE_POSIX_SPAWN])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;
-                             AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;
-                             AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;
-                             AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/spawn-pipe.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/spawn-pipe.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/spawn-pipe.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/spawn-pipe.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# spawn-pipe.m4 serial 2
-dnl Copyright (C) 2004, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_SPAWN_PIPE],
-[
-  dnl Prerequisites of lib/spawn-pipe.c.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/ssize_t.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/ssize_t.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/ssize_t.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/ssize_t.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc.
+# ssize_t.m4 serial 4 (gettext-0.15)
+dnl Copyright (C) 2001-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,11 +10,9 @@
 AC_DEFUN([gt_TYPE_SSIZE_T],
 [
   AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>]],
-          [[int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;]])],
+    [AC_TRY_COMPILE([#include <sys/types.h>],
+       [int x = sizeof (ssize_t *) + sizeof (ssize_t);
+        return !x;],
        [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
   if test $gt_cv_ssize_t = no; then
     AC_DEFINE([ssize_t], [int],
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stat.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stat.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stat.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stat.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,6 +1,6 @@
-# serial 11
+# serial 4
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,7 @@
 AC_DEFUN([gl_FUNC_STAT],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([lstat])
   dnl mingw is the only known platform where stat(".") and stat("./") differ
@@ -23,9 +24,8 @@
             mingw*) gl_cv_func_stat_dir_slash="guessing no";;
             *) gl_cv_func_stat_dir_slash="guessing yes";;
           esac])])
-  dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
-  dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
-  dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
+  dnl Solaris 9 mistakenly succeeds on stat("file/")
+  dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/")
   AC_CACHE_CHECK([whether stat handles trailing slashes on files],
       [gl_cv_func_stat_file_slash],
       [touch conftest.tmp
@@ -36,24 +36,14 @@
        AC_RUN_IFELSE(
          [AC_LANG_PROGRAM(
            [[#include <sys/stat.h>
-]], [[int result = 0;
-      struct stat st;
-      if (!stat ("conftest.tmp/", &st))
-        result |= 1;
+]], [[struct stat st;
+      if (!stat ("conftest.tmp/", &st)) return 1;
 #if HAVE_LSTAT
-      if (!stat ("conftest.lnk/", &st))
-        result |= 2;
+      if (!stat ("conftest.lnk/", &st)) return 2;
 #endif
-      return result;
            ]])],
          [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_stat_file_slash="guessing no" ;;
-          esac
-         ])
+         [gl_cv_func_stat_file_slash="guessing no"])
        rm -f conftest.tmp conftest.lnk])
   case $gl_cv_func_stat_dir_slash in
     *no) REPLACE_STAT=1
@@ -65,7 +55,9 @@
       AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
         help when passed a file name with a trailing slash]);;
   esac
+  if test $REPLACE_STAT = 1; then
+    AC_LIBOBJ([stat])
+    dnl Prerequisites of lib/stat.c.
+    AC_REQUIRE([AC_C_INLINE])
+  fi
 ])
-
-# Prerequisites of lib/stat.c.
-AC_DEFUN([gl_PREREQ_STAT], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stdarg.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stdarg.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stdarg.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stdarg.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+# stdarg.m4 serial 3
+dnl Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,20 +9,16 @@
 
 AC_DEFUN([gl_STDARG_H],
 [
-  STDARG_H=''
-  NEXT_STDARG_H='<stdarg.h>'
+  STDARG_H='';                AC_SUBST([STDARG_H])
+  NEXT_STDARG_H='<stdarg.h>'; AC_SUBST([NEXT_STDARG_H])
   AC_MSG_CHECKING([for va_copy])
   AC_CACHE_VAL([gl_cv_func_va_copy], [
-    AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[#include <stdarg.h>]],
-         [[
+    AC_TRY_COMPILE([#include <stdarg.h>], [
 #ifndef va_copy
 void (*func) (va_list, va_list) = va_copy;
 #endif
-         ]])],
-      [gl_cv_func_va_copy=yes],
-      [gl_cv_func_va_copy=no])])
+],
+      [gl_cv_func_va_copy=yes], [gl_cv_func_va_copy=no])])
   AC_MSG_RESULT([$gl_cv_func_va_copy])
   if test $gl_cv_func_va_copy = no; then
     dnl Provide a substitute.
@@ -41,7 +37,7 @@
     if test $gl_aixcc = yes; then
       dnl Provide a substitute <stdarg.h> file.
       STDARG_H=stdarg.h
-      gl_NEXT_HEADERS([stdarg.h])
+      gl_CHECK_NEXT_HEADERS([stdarg.h])
       dnl Fallback for the case when <stdarg.h> contains only macro definitions.
       if test "$gl_cv_next_stdarg_h" = '""'; then
         gl_cv_next_stdarg_h='"///usr/include/stdarg.h"'
@@ -51,16 +47,12 @@
       dnl Provide a substitute in <config.h>, either __va_copy or as a simple
       dnl assignment.
       gl_CACHE_VAL_SILENT([gl_cv_func___va_copy], [
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[#include <stdarg.h>]],
-             [[
+        AC_TRY_COMPILE([#include <stdarg.h>], [
 #ifndef __va_copy
 error, bail out
 #endif
-             ]])],
-          [gl_cv_func___va_copy=yes],
-          [gl_cv_func___va_copy=no])])
+],
+          [gl_cv_func___va_copy=yes], [gl_cv_func___va_copy=no])])
       if test $gl_cv_func___va_copy = yes; then
         AC_DEFINE([va_copy], [__va_copy],
           [Define as a macro for copying va_list variables.])
@@ -72,7 +64,4 @@
       fi
     fi
   fi
-  AC_SUBST([STDARG_H])
-  AM_CONDITIONAL([GL_GENERATE_STDARG_H], [test -n "$STDARG_H"])
-  AC_SUBST([NEXT_STDARG_H])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stdbool.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stdbool.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stdbool.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stdbool.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,17 +1,15 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-#serial 5
-
 # Prepare for substituting <stdbool.h> if it is not supported.
 
 AC_DEFUN([AM_STDBOOL_H],
 [
-  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
+  AC_REQUIRE([AC_HEADER_STDBOOL])
 
   # Define two additional variables used in the Makefile substitution.
 
@@ -21,7 +19,6 @@
     STDBOOL_H='stdbool.h'
   fi
   AC_SUBST([STDBOOL_H])
-  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
 
   if test "$ac_cv_type__Bool" = yes; then
     HAVE__BOOL=1
@@ -34,67 +31,85 @@
 # AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
 AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
 
-# This version of the macro is needed in autoconf <= 2.68.
+# This macro is only needed in autoconf <= 2.59.  Newer versions of autoconf
+# have this macro built-in.
 
-AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
+AC_DEFUN([AC_HEADER_STDBOOL],
   [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
      [ac_cv_header_stdbool_h],
-     [AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { _Bool s: 1; _Bool t; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
-           ]],
-           [[
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
-           ]])],
+     [AC_TRY_COMPILE(
+        [
+          #include <stdbool.h>
+          #ifndef bool
+           "error: bool is not defined"
+          #endif
+          #ifndef false
+           "error: false is not defined"
+          #endif
+          #if false
+           "error: false is not 0"
+          #endif
+          #ifndef true
+           "error: true is not defined"
+          #endif
+          #if true != 1
+           "error: true is not 1"
+          #endif
+          #ifndef __bool_true_false_are_defined
+           "error: __bool_true_false_are_defined is not defined"
+          #endif
+
+          struct s { _Bool s: 1; _Bool t; } s;
+
+          char a[true == 1 ? 1 : -1];
+          char b[false == 0 ? 1 : -1];
+          char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+          char d[(bool) 0.5 == true ? 1 : -1];
+          bool e = &s;
+          char f[(_Bool) 0.0 == false ? 1 : -1];
+          char g[true];
+          char h[sizeof (_Bool)];
+          char i[sizeof s.t];
+          enum { j = false, k = true, l = false * true, m = true * 256 };
+          _Bool n[m];
+          char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+          #if defined __xlc__ || defined __GNUC__
+           /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+              reported by James Lemley on 2005-10-05; see
+              http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+              This test is not quite right, since xlc is allowed to
+              reject this program, as the initializer for xlcbug is
+              not one of the forms that C requires support for.
+              However, doing the test right would require a run-time
+              test, and that would make cross-compilation harder.
+              Let us hope that IBM fixes the xlc bug, and also adds
+              support for this kind of constant expression.  In the
+              meantime, this test will reject xlc, which is OK, since
+              our stdbool.h substitute should suffice.  We also test
+              this with GCC, where it should work, to detect more
+              quickly whether someone messes up the test in the
+              future.  */
+           char digs[] = "0123456789";
+           int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+          #endif
+          /* Catch a bug in an HP-UX C compiler.  See
+             http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+             http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+           */
+          _Bool q = true;
+          _Bool *pq = &q;
+        ],
+        [
+          *pq |= q;
+          *pq |= ! q;
+          /* Refer to every declared value, to avoid compiler optimizations.  */
+          return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                  + !m + !n + !o + !p + !q + !pq);
+        ],
         [ac_cv_header_stdbool_h=yes],
         [ac_cv_header_stdbool_h=no])])
    AC_CHECK_TYPES([_Bool])
-])
+   if test $ac_cv_header_stdbool_h = yes; then
+     AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.])
+   fi])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stddef_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stddef_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stddef_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stddef_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,6 +1,6 @@
 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# stddef_h.m4 serial 2
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,6 @@
 [
   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
-  STDDEF_H=
   if test $gt_cv_c_wchar_t = no; then
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
@@ -25,10 +24,8 @@
     REPLACE_NULL=1
     STDDEF_H=stddef.h
   fi
-  AC_SUBST([STDDEF_H])
-  AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
   if test -n "$STDDEF_H"; then
-    gl_NEXT_HEADERS([stddef.h])
+    gl_CHECK_NEXT_HEADERS([stddef.h])
   fi
 ])
 
@@ -44,4 +41,5 @@
   dnl Assume proper GNU behavior unless another module says otherwise.
   REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
   HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
+  STDDEF_H='';                   AC_SUBST([STDDEF_H])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stdint.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stdint.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stdint.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stdint.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# stdint.m4 serial 43
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# stdint.m4 serial 34
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,7 @@
 dnl From Paul Eggert and Bruno Haible.
 dnl Test whether <stdint.h> is supported or must be substituted.
 
-AC_DEFUN_ONCE([gl_STDINT_H],
+AC_DEFUN([gl_STDINT_H],
 [
   AC_PREREQ([2.59])dnl
 
@@ -27,15 +27,6 @@
   fi
   AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
 
-  dnl Check for <wchar.h>, in the same way as gl_WCHAR_H does.
-  AC_CHECK_HEADERS_ONCE([wchar.h])
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
-  AC_SUBST([HAVE_WCHAR_H])
-
   dnl Check for <inttypes.h>.
   dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
   if test $ac_cv_header_inttypes_h = yes; then
@@ -69,6 +60,8 @@
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
@@ -152,11 +145,9 @@
 
 #include <limits.h> /* for CHAR_BIT */
 #define TYPE_MINIMUM(t) \
-  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
 #define TYPE_MAXIMUM(t) \
-  ((t) ((t) 0 < (t) -1 \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 struct s {
   int check_PTRDIFF:
       PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
@@ -217,6 +208,8 @@
           dnl This detects a bug on HP-UX 11.23/ia64.
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 ]
@@ -266,7 +259,7 @@
           || strncmp (value, "((int)"/*)*/, 6) == 0
           || strncmp (value, "((signed short)"/*)*/, 15) == 0
           || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-        return mv - macro_values + 1;
+        return 1;
     }
   return 0;
 ]])],
@@ -297,11 +290,14 @@
     fi
     AC_SUBST([HAVE_SYS_BITYPES_H])
 
+    dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+    dnl character support).
+    AC_CHECK_HEADERS_ONCE([wchar.h])
+
     gl_STDINT_TYPE_PROPERTIES
     STDINT_H=stdint.h
   fi
   AC_SUBST([STDINT_H])
-  AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
 ])
 
 dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
@@ -313,7 +309,7 @@
   dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+    [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
        [Define to the number of bits in type ']gltype['.])])
   for gltype in $1 ; do
     AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
@@ -338,7 +334,7 @@
     eval BITSIZEOF_${GLTYPE}=\$result
   done
   m4_foreach_w([gltype], [$1],
-    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+    [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])
 
 dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
@@ -351,7 +347,7 @@
   dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+    [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
        [Define to 1 if ']gltype[' is a signed integer type.])])
   for gltype in $1 ; do
     AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
@@ -371,7 +367,7 @@
     fi
   done
   m4_foreach_w([gltype], [$1],
-    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+    [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])
 
 dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
@@ -384,7 +380,7 @@
   dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
+    [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
        [Define to l, ll, u, ul, ull, etc., as suitable for
         constants of type ']gltype['.])])
   for gltype in $1 ; do
@@ -423,7 +419,7 @@
     AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
   done
   m4_foreach_w([gltype], [$1],
-    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
+    [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
 ])
 
 dnl gl_STDINT_INCLUDES
@@ -462,14 +458,6 @@
   fi
   gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
     [gl_STDINT_INCLUDES])
-
-  dnl If wint_t is smaller than 'int', it cannot satisfy the ISO C 99
-  dnl requirement that wint_t is "unchanged by default argument promotions".
-  dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t.
-  dnl Set the variable BITSIZEOF_WINT_T accordingly.
-  if test $BITSIZEOF_WINT_T -lt 32; then
-    BITSIZEOF_WINT_T=32
-  fi
 ])
 
 dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stdio_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stdio_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stdio_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stdio_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# stdio_h.m4 serial 43
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# stdio_h.m4 serial 31
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,32 +7,9 @@
 AC_DEFUN([gl_STDIO_H],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  gl_NEXT_HEADERS([stdio.h])
-
-  dnl No need to create extra modules for these functions. Everyone who uses
-  dnl <stdio.h> likely needs them.
-  GNULIB_FSCANF=1
-  gl_MODULE_INDICATOR([fscanf])
-  GNULIB_SCANF=1
-  gl_MODULE_INDICATOR([scanf])
-  GNULIB_FGETC=1
-  GNULIB_GETC=1
-  GNULIB_GETCHAR=1
-  GNULIB_FGETS=1
-  GNULIB_FREAD=1
-  dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
-  dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-  dnl also an optimization, to avoid performing a configure check whose result
-  dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING
-  dnl or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_STDIO_READ_FUNCS=1
-      AC_LIBOBJ([stdio-read])
-    fi
-  ])
-
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
+  gl_CHECK_NEXT_HEADERS([stdio.h])
   dnl No need to create extra modules for these functions. Everyone who uses
   dnl <stdio.h> likely needs them.
   GNULIB_FPRINTF=1
@@ -45,11 +22,9 @@
   GNULIB_FPUTS=1
   GNULIB_PUTS=1
   GNULIB_FWRITE=1
-  dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c"
-  dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-  dnl also an optimization, to avoid performing a configure check whose result
-  dnl is not used. But it does not make the test of GNULIB_STDIO_H_SIGPIPE or
-  dnl GNULIB_SIGPIPE redundant.
+  dnl This ifdef is just an optimization, to avoid performing a configure
+  dnl check whose result is not used. It does not make the test of
+  dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
   m4_ifdef([gl_SIGNAL_SIGPIPE], [
     gl_SIGNAL_SIGPIPE
     if test $gl_cv_header_signal_h_SIGPIPE != yes; then
@@ -57,25 +32,13 @@
       AC_LIBOBJ([stdio-write])
     fi
   ])
-  dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c"
-  dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-  dnl also an optimization, to avoid performing a configure check whose result
-  dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING
-  dnl or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_STDIO_WRITE_FUNCS=1
-      AC_LIBOBJ([stdio-write])
-    fi
-  ])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
-  dnl guaranteed by both C89 and C11.
+  dnl guaranteed by C89.
   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
-    ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
-    renameat snprintf tmpfile vdprintf vsnprintf])
+    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
+    snprintf tmpfile vdprintf vsnprintf])
 ])
 
 AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
@@ -91,31 +54,23 @@
 [
   GNULIB_DPRINTF=0;              AC_SUBST([GNULIB_DPRINTF])
   GNULIB_FCLOSE=0;               AC_SUBST([GNULIB_FCLOSE])
-  GNULIB_FDOPEN=0;               AC_SUBST([GNULIB_FDOPEN])
   GNULIB_FFLUSH=0;               AC_SUBST([GNULIB_FFLUSH])
-  GNULIB_FGETC=0;                AC_SUBST([GNULIB_FGETC])
-  GNULIB_FGETS=0;                AC_SUBST([GNULIB_FGETS])
   GNULIB_FOPEN=0;                AC_SUBST([GNULIB_FOPEN])
   GNULIB_FPRINTF=0;              AC_SUBST([GNULIB_FPRINTF])
   GNULIB_FPRINTF_POSIX=0;        AC_SUBST([GNULIB_FPRINTF_POSIX])
   GNULIB_FPURGE=0;               AC_SUBST([GNULIB_FPURGE])
   GNULIB_FPUTC=0;                AC_SUBST([GNULIB_FPUTC])
   GNULIB_FPUTS=0;                AC_SUBST([GNULIB_FPUTS])
-  GNULIB_FREAD=0;                AC_SUBST([GNULIB_FREAD])
   GNULIB_FREOPEN=0;              AC_SUBST([GNULIB_FREOPEN])
-  GNULIB_FSCANF=0;               AC_SUBST([GNULIB_FSCANF])
   GNULIB_FSEEK=0;                AC_SUBST([GNULIB_FSEEK])
   GNULIB_FSEEKO=0;               AC_SUBST([GNULIB_FSEEKO])
   GNULIB_FTELL=0;                AC_SUBST([GNULIB_FTELL])
   GNULIB_FTELLO=0;               AC_SUBST([GNULIB_FTELLO])
   GNULIB_FWRITE=0;               AC_SUBST([GNULIB_FWRITE])
-  GNULIB_GETC=0;                 AC_SUBST([GNULIB_GETC])
-  GNULIB_GETCHAR=0;              AC_SUBST([GNULIB_GETCHAR])
   GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
   GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
   GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
   GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
-  GNULIB_PCLOSE=0;               AC_SUBST([GNULIB_PCLOSE])
   GNULIB_PERROR=0;               AC_SUBST([GNULIB_PERROR])
   GNULIB_POPEN=0;                AC_SUBST([GNULIB_POPEN])
   GNULIB_PRINTF=0;               AC_SUBST([GNULIB_PRINTF])
@@ -126,15 +81,11 @@
   GNULIB_REMOVE=0;               AC_SUBST([GNULIB_REMOVE])
   GNULIB_RENAME=0;               AC_SUBST([GNULIB_RENAME])
   GNULIB_RENAMEAT=0;             AC_SUBST([GNULIB_RENAMEAT])
-  GNULIB_SCANF=0;                AC_SUBST([GNULIB_SCANF])
   GNULIB_SNPRINTF=0;             AC_SUBST([GNULIB_SNPRINTF])
   GNULIB_SPRINTF_POSIX=0;        AC_SUBST([GNULIB_SPRINTF_POSIX])
-  GNULIB_STDIO_H_NONBLOCKING=0;  AC_SUBST([GNULIB_STDIO_H_NONBLOCKING])
   GNULIB_STDIO_H_SIGPIPE=0;      AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
   GNULIB_TMPFILE=0;              AC_SUBST([GNULIB_TMPFILE])
   GNULIB_VASPRINTF=0;            AC_SUBST([GNULIB_VASPRINTF])
-  GNULIB_VFSCANF=0;              AC_SUBST([GNULIB_VFSCANF])
-  GNULIB_VSCANF=0;               AC_SUBST([GNULIB_VSCANF])
   GNULIB_VDPRINTF=0;             AC_SUBST([GNULIB_VDPRINTF])
   GNULIB_VFPRINTF=0;             AC_SUBST([GNULIB_VFPRINTF])
   GNULIB_VFPRINTF_POSIX=0;       AC_SUBST([GNULIB_VFPRINTF_POSIX])
@@ -144,8 +95,6 @@
   GNULIB_VSPRINTF_POSIX=0;       AC_SUBST([GNULIB_VSPRINTF_POSIX])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
-  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
-  HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
   HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
   HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
   HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
@@ -154,14 +103,11 @@
   HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
   HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
   HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
-  HAVE_PCLOSE=1;                 AC_SUBST([HAVE_PCLOSE])
-  HAVE_POPEN=1;                  AC_SUBST([HAVE_POPEN])
   HAVE_RENAMEAT=1;               AC_SUBST([HAVE_RENAMEAT])
   HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
   HAVE_VDPRINTF=1;               AC_SUBST([HAVE_VDPRINTF])
   REPLACE_DPRINTF=0;             AC_SUBST([REPLACE_DPRINTF])
   REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
-  REPLACE_FDOPEN=0;              AC_SUBST([REPLACE_FDOPEN])
   REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
   REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
   REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
@@ -182,7 +128,6 @@
   REPLACE_RENAMEAT=0;            AC_SUBST([REPLACE_RENAMEAT])
   REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
   REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
-  REPLACE_STDIO_READ_FUNCS=0;    AC_SUBST([REPLACE_STDIO_READ_FUNCS])
   REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
   REPLACE_TMPFILE=0;             AC_SUBST([REPLACE_TMPFILE])
   REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
@@ -192,3 +137,23 @@
   REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
   REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
 ])
+
+dnl Code shared by fseeko and ftello.  Determine if large files are supported,
+dnl but stdin does not start as a large file by default.
+AC_DEFUN([gl_STDIN_LARGE_OFFSET],
+  [
+    AC_CACHE_CHECK([whether stdin defaults to large file offsets],
+      [gl_cv_var_stdin_large_offset],
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
+[[#if defined __SL64 && defined __SCLE /* cygwin */
+  /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making
+     fseeko/ftello needlessly fail.  This bug was fixed in 1.5.25, and
+     it is easier to do a version check than building a runtime test.  */
+# include <cygwin/version.h>
+# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)
+  choke me
+# endif
+#endif]])],
+        [gl_cv_var_stdin_large_offset=yes],
+        [gl_cv_var_stdin_large_offset=no])])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stdlib_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stdlib_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stdlib_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stdlib_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# stdlib_h.m4 serial 28
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,21 @@
 AC_DEFUN([gl_STDLIB_H],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  gl_NEXT_HEADERS([stdlib.h])
+  gl_CHECK_NEXT_HEADERS([stdlib.h])
+  AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
+  if test $ac_cv_header_random_h = yes; then
+    HAVE_RANDOM_H=1
+  else
+    HAVE_RANDOM_H=0
+  fi
+  AC_SUBST([HAVE_RANDOM_H])
+  AC_CHECK_TYPES([struct random_data],
+    [], [HAVE_STRUCT_RANDOM_DATA=0],
+    [[#include <stdlib.h>
+      #if HAVE_RANDOM_H
+      # include <random.h>
+      #endif
+    ]])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
@@ -19,11 +33,10 @@
 #if HAVE_RANDOM_H
 # include <random.h>
 #endif
-    ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
-    initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
-    posix_openpt ptsname ptsname_r random random_r realpath rpmatch
-    secure_getenv setenv setstate setstate_r srandom srandom_r
-    strtod strtoll strtoull unlockpt unsetenv])
+    ]], [atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp
+    mkostemp mkostemps mkstemp mkstemps ptsname random_r initstat_r srandom_r
+    setstate_r realpath rpmatch setenv strtod strtoll strtoull unlockpt
+    unsetenv])
 ])
 
 AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
@@ -37,7 +50,6 @@
 
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
-  GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
   GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
   GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
   GNULIB_CANONICALIZE_FILE_NAME=0;  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME])
@@ -45,75 +57,54 @@
   GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
   GNULIB_GRANTPT=0;       AC_SUBST([GNULIB_GRANTPT])
   GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
-  GNULIB_MBTOWC=0;        AC_SUBST([GNULIB_MBTOWC])
   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
   GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
   GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
   GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
-  GNULIB_POSIX_OPENPT=0;  AC_SUBST([GNULIB_POSIX_OPENPT])
   GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
-  GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
-  GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
-  GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
   GNULIB_REALPATH=0;      AC_SUBST([GNULIB_REALPATH])
   GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
-  GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
   GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
   GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
   GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
   GNULIB_STRTOULL=0;      AC_SUBST([GNULIB_STRTOULL])
-  GNULIB_SYSTEM_POSIX=0;  AC_SUBST([GNULIB_SYSTEM_POSIX])
   GNULIB_UNLOCKPT=0;      AC_SUBST([GNULIB_UNLOCKPT])
   GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
-  GNULIB_WCTOMB=0;        AC_SUBST([GNULIB_WCTOMB])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
   HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
+  HAVE_CALLOC_POSIX=1;       AC_SUBST([HAVE_CALLOC_POSIX])
   HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
   HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
   HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
   HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
+  HAVE_MALLOC_POSIX=1;       AC_SUBST([HAVE_MALLOC_POSIX])
   HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
   HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
   HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
   HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
   HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
-  HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
   HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
-  HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
-  HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
-  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
+  HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
-  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
   HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
-  HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
   HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
   HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
   HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
   HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
   HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
-  HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
-  REPLACE_CALLOC=0;          AC_SUBST([REPLACE_CALLOC])
+  HAVE_UNSETENV=1;           AC_SUBST([HAVE_UNSETENV])
   REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
-  REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
-  REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
   REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
-  REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
-  REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
   REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
-  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
-  REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
-  REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
   REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
   REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
   REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
   REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
-  REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stpcpy.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stpcpy.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stpcpy.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stpcpy.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# stpcpy.m4 serial 8
-dnl Copyright (C) 2002, 2007, 2009-2014 Free Software Foundation, Inc.
+# stpcpy.m4 serial 7
+dnl Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,9 +13,10 @@
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([stpcpy])
+  AC_REPLACE_FUNCS([stpcpy])
   if test $ac_cv_func_stpcpy = no; then
     HAVE_STPCPY=0
+    gl_PREREQ_STPCPY
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/stpncpy.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/stpncpy.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/stpncpy.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/stpncpy.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# stpncpy.m4 serial 16
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
+# stpncpy.m4 serial 11
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 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,
@@ -25,69 +25,49 @@
   dnl   in AIX:     dest + max(0,n-1)
   dnl Only the glibc return value is useful in practice.
 
-  AC_CHECK_DECLS_ONCE([stpncpy])
   AC_CHECK_FUNCS_ONCE([stpncpy])
   if test $ac_cv_func_stpncpy = yes; then
     AC_CACHE_CHECK([for working stpncpy], [gl_cv_func_stpncpy], [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      AC_TRY_RUN([
 #include <stdlib.h>
 #include <string.h> /* for strcpy */
 /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
-#if !HAVE_DECL_STPNCPY
-extern
-# ifdef __cplusplus
-"C"
-# endif
-char *stpncpy (char *dest, const char *src, size_t n);
-#endif
-int main ()
-{
-  int result = 0;
+extern char *stpncpy (char *dest, const char *src, size_t n);
+int main () {
   const char *src = "Hello";
   char dest[10];
   /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+1 here.  */
-  {
-    strcpy (dest, "\377\377\377\377\377\377");
-    if (stpncpy (dest, src, 2) != dest + 2)
-      result |= 1;
-  }
+  strcpy (dest, "\377\377\377\377\377\377");
+  if (stpncpy (dest, src, 2) != dest + 2) exit(1);
   /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+4 here.  */
-  {
-    strcpy (dest, "\377\377\377\377\377\377");
-    if (stpncpy (dest, src, 5) != dest + 5)
-      result |= 2;
-  }
+  strcpy (dest, "\377\377\377\377\377\377");
+  if (stpncpy (dest, src, 5) != dest + 5) exit(1);
   /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+6 here.  */
-  {
-    strcpy (dest, "\377\377\377\377\377\377");
-    if (stpncpy (dest, src, 7) != dest + 5)
-      result |= 4;
-  }
-  return result;
+  strcpy (dest, "\377\377\377\377\377\377");
+  if (stpncpy (dest, src, 7) != dest + 5) exit(1);
+  exit(0);
 }
-]])],
-        [gl_cv_func_stpncpy=yes],
-        [gl_cv_func_stpncpy=no],
+], [gl_cv_func_stpncpy=yes], [gl_cv_func_stpncpy=no],
         [AC_EGREP_CPP([Thanks for using GNU], [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
   Thanks for using GNU
 #endif
-], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"])
+], [gl_cv_func_stpncpy=yes], [gl_cv_func_stpncpy=no])
         ])
     ])
-    case "$gl_cv_func_stpncpy" in
-      *yes)
-        AC_DEFINE([HAVE_STPNCPY], [1],
-          [Define if you have the stpncpy() function and it works.])
-        ;;
-      *)
-        REPLACE_STPNCPY=1
-        ;;
-    esac
+    if test $gl_cv_func_stpncpy = yes; then
+      AC_DEFINE([HAVE_STPNCPY], [1],
+        [Define if you have the stpncpy() function and it works.])
+    else
+      REPLACE_STPNCPY=1
+      AC_LIBOBJ([stpncpy])
+      gl_PREREQ_STPNCPY
+    fi
   else
     HAVE_STPNCPY=0
+    AC_LIBOBJ([stpncpy])
+    gl_PREREQ_STPNCPY
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strchrnul.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strchrnul.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strchrnul.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strchrnul.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# strchrnul.m4 serial 9
-dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
+# strchrnul.m4 serial 7
+dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,39 +10,10 @@
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([strchrnul])
+  AC_REPLACE_FUNCS([strchrnul])
   if test $ac_cv_func_strchrnul = no; then
     HAVE_STRCHRNUL=0
-  else
-    AC_CACHE_CHECK([whether strchrnul works],
-      [gl_cv_func_strchrnul_works],
-      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include <string.h> /* for strchrnul */
-]], [[const char *buf = "a";
-      return strchrnul (buf, 'b') != buf + 1;
-    ]])],
-        [gl_cv_func_strchrnul_works=yes],
-        [gl_cv_func_strchrnul_works=no],
-        [dnl Cygwin 1.7.9 introduced strchrnul, but it was broken until 1.7.10
-         AC_EGREP_CPP([Lucky user],
-           [
-#if defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 9)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-           ],
-           [gl_cv_func_strchrnul_works="guessing yes"],
-           [gl_cv_func_strchrnul_works="guessing no"])
-        ])
-      ])
-    case "$gl_cv_func_strchrnul_works" in
-      *yes) ;;
-      *) REPLACE_STRCHRNUL=1 ;;
-    esac
+    gl_PREREQ_STRCHRNUL
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strcspn.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strcspn.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strcspn.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strcspn.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,12 +1,15 @@
-# strcspn.m4 serial 4
-dnl Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc.
+# strcspn.m4 serial 3
+dnl Copyright (C) 2002-2003, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRCSPN],
 [
-  AC_CHECK_FUNCS([strcspn])
+  AC_REPLACE_FUNCS([strcspn])
+  if test $ac_cv_func_strcspn = no; then
+    gl_PREREQ_STRCSPN
+  fi
 ])
 
 # Prerequisites of lib/strcspn.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strerror.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strerror.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strerror.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strerror.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,96 +1,68 @@
-# strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc.
+# strerror.m4 serial 9
+dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRERROR],
 [
+  AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
+  if test $REPLACE_STRERROR = 1; then
+    AC_LIBOBJ([strerror])
+    AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
+      [Define this to 1 if strerror is broken.])
+  fi
+])
+
+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
+[
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
-    AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS])
-  ])
-  if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
+  if test -z "$ERRNO_H"; then
     AC_CACHE_CHECK([for working strerror function],
      [gl_cv_func_working_strerror],
      [AC_RUN_IFELSE(
         [AC_LANG_PROGRAM(
            [[#include <string.h>
            ]],
-           [[if (!*strerror (-2)) return 1;]])],
+           [[return !*strerror (-2);]])],
         [gl_cv_func_working_strerror=yes],
         [gl_cv_func_working_strerror=no],
-        [case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_working_strerror="guessing no" ;;
-         esac
-        ])
-    ])
-    case "$gl_cv_func_working_strerror" in
-      *yes) ;;
-      *)
-        dnl The system's strerror() fails to return a string for out-of-range
-        dnl integers. Replace it.
-        REPLACE_STRERROR=1
-        ;;
-    esac
-    m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
-      dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's
-      dnl buffer, we must replace strerror.
-      case "$gl_cv_func_strerror_r_works" in
-        *no) REPLACE_STRERROR=1 ;;
-      esac
+        [dnl Assume crossbuild works if it compiles.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <string.h>
+              ]],
+              [[return !*strerror (-2);]])],
+           [gl_cv_func_working_strerror=yes],
+           [gl_cv_func_working_strerror=no])
+      ])
     ])
+    if test $gl_cv_func_working_strerror = no; then
+      dnl The system's strerror() fails to return a string for out-of-range
+      dnl integers. Replace it.
+      REPLACE_STRERROR=1
+    fi
   else
     dnl The system's strerror() cannot know about the new errno values we add
-    dnl to <errno.h>, or any fix for strerror(0). Replace it.
+    dnl to <errno.h>. Replace it.
     REPLACE_STRERROR=1
   fi
+  if test $REPLACE_STRERROR = 1; then
+    gl_PREREQ_STRERROR
+  fi
 ])
 
-dnl Detect if strerror(0) passes (that is, does not set errno, and does not
-dnl return a string that matches strerror(-1)).
-AC_DEFUN([gl_FUNC_STRERROR_0],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  REPLACE_STRERROR_0=0
-  AC_CACHE_CHECK([whether strerror(0) succeeds],
-   [gl_cv_func_strerror_0_works],
-   [AC_RUN_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[#include <string.h>
-           #include <errno.h>
-         ]],
-         [[int result = 0;
-           char *str;
-           errno = 0;
-           str = strerror (0);
-           if (!*str) result |= 1;
-           if (errno) result |= 2;
-           if (strstr (str, "nknown") || strstr (str, "ndefined"))
-             result |= 4;
-           return result;]])],
-      [gl_cv_func_strerror_0_works=yes],
-      [gl_cv_func_strerror_0_works=no],
-      [case "$host_os" in
-                 # Guess yes on glibc systems.
-         *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_strerror_0_works="guessing no" ;;
-       esac
-      ])
-  ])
-  case "$gl_cv_func_strerror_0_works" in
-    *yes) ;;
-    *)
-      REPLACE_STRERROR_0=1
-      AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
-        does not return a message implying success.])
-      ;;
-  esac
+# Prerequisites of lib/strerror.c.
+AC_DEFUN([gl_PREREQ_STRERROR], [
+  AC_CHECK_DECLS([strerror])
+  AC_CHECK_HEADERS_ONCE([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h != yes; then
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([winsock2.h])
+  fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/string_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/string_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/string_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/string_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,11 +1,11 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 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.
 
-# serial 21
+# serial 17
 
 # Written by Paul Eggert.
 
@@ -20,16 +20,16 @@
 [
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  gl_NEXT_HEADERS([string.h])
+  gl_CHECK_NEXT_HEADERS([string.h])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
   dnl guaranteed by C89.
   gl_WARN_ON_USE_PREPARE([[#include <string.h>
     ]],
-    [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul
-     strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
-     strerror_r strsignal strverscmp])
+    [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup
+     strncat strndup strnlen strpbrk strsep strcasestr strtok_r strsignal
+     strverscmp])
 ])
 
 AC_DEFUN([gl_STRING_MODULE_INDICATOR],
@@ -43,8 +43,6 @@
 
 AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
 [
-  GNULIB_FFSL=0;        AC_SUBST([GNULIB_FFSL])
-  GNULIB_FFSLL=0;       AC_SUBST([GNULIB_FFSLL])
   GNULIB_MEMCHR=0;      AC_SUBST([GNULIB_MEMCHR])
   GNULIB_MEMMEM=0;      AC_SUBST([GNULIB_MEMMEM])
   GNULIB_MEMPCPY=0;     AC_SUBST([GNULIB_MEMPCPY])
@@ -77,13 +75,10 @@
   GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
   GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
   GNULIB_STRERROR=0;    AC_SUBST([GNULIB_STRERROR])
-  GNULIB_STRERROR_R=0;  AC_SUBST([GNULIB_STRERROR_R])
   GNULIB_STRSIGNAL=0;   AC_SUBST([GNULIB_STRSIGNAL])
   GNULIB_STRVERSCMP=0;  AC_SUBST([GNULIB_STRVERSCMP])
   HAVE_MBSLEN=0;        AC_SUBST([HAVE_MBSLEN])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_FFSL=1;                  AC_SUBST([HAVE_FFSL])
-  HAVE_FFSLL=1;                 AC_SUBST([HAVE_FFSLL])
   HAVE_MEMCHR=1;                AC_SUBST([HAVE_MEMCHR])
   HAVE_DECL_MEMMEM=1;           AC_SUBST([HAVE_DECL_MEMMEM])
   HAVE_MEMPCPY=1;               AC_SUBST([HAVE_MEMPCPY])
@@ -99,7 +94,6 @@
   HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
   HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
   HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
-  HAVE_DECL_STRERROR_R=1;       AC_SUBST([HAVE_DECL_STRERROR_R])
   HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
   HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
   REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
@@ -108,9 +102,7 @@
   REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
   REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
   REPLACE_STRCASESTR=0;         AC_SUBST([REPLACE_STRCASESTR])
-  REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
   REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
-  REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
   REPLACE_STRNCAT=0;            AC_SUBST([REPLACE_STRNCAT])
   REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
   REPLACE_STRNLEN=0;            AC_SUBST([REPLACE_STRNLEN])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strnlen.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strnlen.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strnlen.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strnlen.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
+# strnlen.m4 serial 12
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 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,
@@ -16,14 +16,16 @@
   if test $ac_cv_have_decl_strnlen = no; then
     HAVE_DECL_STRNLEN=0
   else
-    m4_pushdef([AC_LIBOBJ], [:])
-    dnl Note: AC_FUNC_STRNLEN does AC_LIBOBJ([strnlen]).
     AC_FUNC_STRNLEN
-    m4_popdef([AC_LIBOBJ])
+    dnl Note: AC_FUNC_STRNLEN does AC_LIBOBJ([strnlen]).
     if test $ac_cv_func_strnlen_working = no; then
       REPLACE_STRNLEN=1
     fi
   fi
+  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
+    AC_LIBOBJ([strnlen])
+    gl_PREREQ_STRNLEN
+  fi
 ])
 
 # Prerequisites of lib/strnlen.c.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strpbrk.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strpbrk.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strpbrk.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strpbrk.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# strpbrk.m4 serial 6
-dnl Copyright (C) 2002-2003, 2007, 2009-2014 Free Software Foundation, Inc.
+# strpbrk.m4 serial 5
+dnl Copyright (C) 2002-2003, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,9 +7,10 @@
 AC_DEFUN([gl_FUNC_STRPBRK],
 [
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([strpbrk])
+  AC_REPLACE_FUNCS([strpbrk])
   if test $ac_cv_func_strpbrk = no; then
     HAVE_STRPBRK=0
+    gl_PREREQ_STRPBRK
   fi
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strstr.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strstr.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strstr.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strstr.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# strstr.m4 serial 16
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# strstr.m4 serial 7
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,51 +11,7 @@
   AC_REQUIRE([gl_FUNC_MEMCHR])
   if test "$gl_cv_func_memchr_works" != yes; then
     REPLACE_STRSTR=1
-  else
-    dnl Detect http://sourceware.org/bugzilla/show_bug.cgi?id=12092.
-    AC_CACHE_CHECK([whether strstr works],
-      [gl_cv_func_strstr_works_always],
-      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include <string.h> /* for strstr */
-#define P "_EF_BF_BD"
-#define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P
-#define NEEDLE P P P P P
-]], [[return !!strstr (HAYSTACK, NEEDLE);
-    ]])],
-        [gl_cv_func_strstr_works_always=yes],
-        [gl_cv_func_strstr_works_always=no],
-        [dnl glibc 2.12 and cygwin 1.7.7 have a known bug.  uClibc is not
-         dnl affected, since it uses different source code for strstr than
-         dnl glibc.
-         dnl Assume that it works on all other platforms, even if it is not
-         dnl linear.
-         AC_EGREP_CPP([Lucky user],
-           [
-#ifdef __GNU_LIBRARY__
- #include <features.h>
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     || defined __UCLIBC__
-  Lucky user
- #endif
-#elif defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-           ],
-           [gl_cv_func_strstr_works_always="guessing yes"],
-           [gl_cv_func_strstr_works_always="guessing no"])
-        ])
-      ])
-    case "$gl_cv_func_strstr_works_always" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
+    AC_LIBOBJ([strstr])
   fi
 ]) # gl_FUNC_STRSTR_SIMPLE
 
@@ -68,18 +24,16 @@
       [gl_cv_func_strstr_linear],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <signal.h> /* for signal */
-#include <string.h> /* for strstr */
+#include <string.h> /* for memmem */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
-]], [[
-    int result = 0;
-    size_t m = 1000000;
+]], [[size_t m = 1000000;
     char *haystack = (char *) malloc (2 * m + 2);
     char *needle = (char *) malloc (m + 2);
+    void *result = 0;
     /* Failure to compile this test due to missing alarm is okay,
        since all such platforms (mingw) also have quadratic strstr.  */
-    signal (SIGALRM, quit);
+    signal (SIGALRM, SIG_DFL);
     alarm (5);
     /* Check for quadratic performance.  */
     if (haystack && needle)
@@ -90,41 +44,36 @@
         memset (needle, 'A', m);
         needle[m] = 'B';
         needle[m + 1] = 0;
-        if (!strstr (haystack, needle))
-          result |= 1;
+        result = strstr (haystack, needle);
       }
-    return result;
-    ]])],
+    return !result;]])],
         [gl_cv_func_strstr_linear=yes], [gl_cv_func_strstr_linear=no],
-        [dnl Only glibc > 2.12 on processors without SSE 4.2 instructions and
-         dnl cygwin > 1.7.7 are known to have a bug-free strstr that works in
-         dnl linear time.
+        [dnl Only glibc >= 2.9 and cygwin >= 1.7.0 are known to have a
+         dnl strstr that works in linear time.
          AC_EGREP_CPP([Lucky user],
            [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     && !(defined __i386__ || defined __x86_64__) \
-     && !defined __UCLIBC__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2)
   Lucky user
  #endif
 #endif
 #ifdef __CYGWIN__
  #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
+ #if CYGWIN_VERSION_DLL_MAJOR >= 1007
   Lucky user
  #endif
 #endif
            ],
-           [gl_cv_func_strstr_linear="guessing yes"],
+           [gl_cv_func_strstr_linear=yes],
            [gl_cv_func_strstr_linear="guessing no"])
         ])
       ])
-    case "$gl_cv_func_strstr_linear" in
-      *yes) ;;
-      *)
-        REPLACE_STRSTR=1
-        ;;
-    esac
+    if test "$gl_cv_func_strstr_linear" != yes; then
+      REPLACE_STRSTR=1
+    fi
+  fi
+  if test $REPLACE_STRSTR = 1; then
+    AC_LIBOBJ([strstr])
   fi
 ]) # gl_FUNC_STRSTR
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strtol.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strtol.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strtol.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strtol.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,10 +1,10 @@
-# strtol.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+# strtol.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOL],
 [
-  AC_CHECK_FUNCS([strtol])
+  AC_REPLACE_FUNCS([strtol])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/strtoul.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/strtoul.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/strtoul.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/strtoul.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,10 +1,10 @@
-# strtoul.m4 serial 5
-dnl Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+# strtoul.m4 serial 4
+dnl Copyright (C) 2002, 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOUL],
 [
-  AC_CHECK_FUNCS([strtoul])
+  AC_REPLACE_FUNCS([strtoul])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/symlink.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/symlink.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/symlink.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/symlink.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,7 +1,7 @@
-# serial 6
+# serial 2
 # See if we need to provide symlink replacement.
 
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,43 +11,28 @@
 AC_DEFUN([gl_FUNC_SYMLINK],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_FUNCS_ONCE([symlink])
   dnl The best we can do on mingw is provide a dummy that always fails, so
-  dnl that compilation can proceed with fewer ifdefs.  On FreeBSD 7.2, AIX 7.1,
-  dnl and Solaris 9, we want to fix a bug with trailing slash handling.
+  dnl that compilation can proceed with fewer ifdefs.  On Solaris 9 and
+  dnl FreeBSD 7.2, we want to fix a bug with trailing slash handling.
   if test $ac_cv_func_symlink = no; then
     HAVE_SYMLINK=0
+    AC_LIBOBJ([symlink])
   else
     AC_CACHE_CHECK([whether symlink handles trailing slash correctly],
       [gl_cv_func_symlink_works],
       [AC_RUN_IFELSE(
          [AC_LANG_PROGRAM(
            [[#include <unistd.h>
-           ]],
-           [[int result = 0;
-             if (!symlink ("a", "conftest.link/"))
-               result |= 1;
-             if (symlink ("conftest.f", "conftest.lnk2"))
-               result |= 2;
-             else if (!symlink ("a", "conftest.lnk2/"))
-               result |= 4;
-             return result;
-           ]])],
+]], [[if (!symlink ("a", "conftest.link/")) return 1;
+      if (symlink ("conftest.f", "conftest.lnk2")) return 2;
+      if (!symlink ("a", "conftest.lnk2/")) return 3;]])],
          [gl_cv_func_symlink_works=yes], [gl_cv_func_symlink_works=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_symlink_works="guessing yes" ;;
-                    # If we don't know, assume the worst.
-            *)      gl_cv_func_symlink_works="guessing no" ;;
-          esac
-         ])
+         [gl_cv_func_symlink_works="guessing no"])
       rm -f conftest.f conftest.link conftest.lnk2])
-    case "$gl_cv_func_symlink_works" in
-      *yes) ;;
-      *)
-        REPLACE_SYMLINK=1
-        ;;
-    esac
+    if test "$gl_cv_func_symlink_works" != yes; then
+      REPLACE_SYMLINK=1
+      AC_LIBOBJ([symlink])
+    fi
   fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sys_select_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_select_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sys_select_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_select_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,12 +1,12 @@
-# sys_select_h.m4 serial 20
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# sys_select_h.m4 serial 14
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_HEADER_SYS_SELECT],
 [
-  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
   AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS])
   AC_CACHE_CHECK([whether <sys/select.h> is self-contained],
     [gl_cv_header_sys_select_h_selfcontained],
@@ -32,18 +32,10 @@
              [AC_LANG_PROGRAM([[#include <sys/select.h>]], [[
                   #undef memset
                   #define memset nonexistent_memset
-                  extern
-                  #ifdef __cplusplus
-                  "C"
-                  #endif
-                  void *memset (void *, int, unsigned long);
+                  extern void *memset (void *, int, unsigned long);
                   #undef bzero
                   #define bzero nonexistent_bzero
-                  extern
-                  #ifdef __cplusplus
-                  "C"
-                  #endif
-                  void bzero (void *, unsigned long);
+                  extern void bzero (void *, unsigned long);
                   fd_set fds;
                   FD_ZERO (&fds);
                 ]])
@@ -53,6 +45,7 @@
           ])
       fi
     ])
+  AC_CHECK_HEADERS_ONCE([sys/select.h])
   dnl <sys/select.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_NEXT_HEADERS([sys/select.h])
   if test $ac_cv_header_sys_select_h = yes; then
@@ -68,11 +61,11 @@
   gl_WARN_ON_USE_PREPARE([[
 /* Some systems require prerequisite headers.  */
 #include <sys/types.h>
-#if !(defined __GLIBC__ && !defined __UCLIBC__) && HAVE_SYS_TIME_H
+#if !defined __GLIBC__ && HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 #include <sys/select.h>
-    ]], [pselect select])
+    ]], [select])
 ])
 
 AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR],
@@ -86,10 +79,7 @@
 
 AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS],
 [
-  GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT])
   GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT])
-  REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT])
   REPLACE_SELECT=0; AC_SUBST([REPLACE_SELECT])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sys_socket_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_socket_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sys_socket_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_socket_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+# sys_socket_h.m4 serial 17
+dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,18 +9,7 @@
 AC_DEFUN([gl_HEADER_SYS_SOCKET],
 [
   AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
-  dnl old-style declarations (with return type 'int' instead of 'ssize_t')
-  dnl unless _POSIX_PII_SOCKET is defined.
-  case "$host_os" in
-    osf*)
-      AC_DEFINE([_POSIX_PII_SOCKET], [1],
-        [Define to 1 in order to get the POSIX compatible declarations
-         of socket functions.])
-      ;;
-  esac
+  AC_REQUIRE([AC_C_INLINE])
 
   AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
     [gl_cv_header_sys_socket_h_selfcontained],
@@ -68,23 +57,6 @@
   if test $ac_cv_type_sa_family_t = no; then
     HAVE_SA_FAMILY_T=0
   fi
-  if test $ac_cv_type_struct_sockaddr_storage != no; then
-    AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
-      [],
-      [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0],
-      [#include <sys/types.h>
-       #ifdef HAVE_SYS_SOCKET_H
-       #include <sys/socket.h>
-       #endif
-       #ifdef HAVE_WS2TCPIP_H
-       #include <ws2tcpip.h>
-       #endif
-      ])
-  fi
-  if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
-     || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
-    SYS_SOCKET_H='sys/socket.h'
-  fi
   gl_PREREQ_SYS_H_WINSOCK2
 
   dnl Check for declarations of anything we want to poison if the
@@ -92,7 +64,10 @@
   gl_WARN_ON_USE_PREPARE([[
 /* Some systems require prerequisite headers.  */
 #include <sys/types.h>
-#include <sys/socket.h>
+#if !defined __GLIBC__ && HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/select.h>
     ]], [socket connect accept bind getpeername getsockname getsockopt
     listen recv send recvfrom sendto setsockopt shutdown accept4])
 ])
@@ -100,13 +75,17 @@
 AC_DEFUN([gl_PREREQ_SYS_H_SOCKET],
 [
   dnl Check prerequisites of the <sys/socket.h> replacement.
-  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
   gl_CHECK_NEXT_HEADERS([sys/socket.h])
   if test $ac_cv_header_sys_socket_h = yes; then
     HAVE_SYS_SOCKET_H=1
     HAVE_WS2TCPIP_H=0
   else
     HAVE_SYS_SOCKET_H=0
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([ws2tcpip.h])
     if test $ac_cv_header_ws2tcpip_h = yes; then
       HAVE_WS2TCPIP_H=1
     else
@@ -169,8 +148,6 @@
   GNULIB_SHUTDOWN=0;    AC_SUBST([GNULIB_SHUTDOWN])
   GNULIB_ACCEPT4=0;     AC_SUBST([GNULIB_ACCEPT4])
   HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
-  HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
-                        AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
   HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
   HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sys_stat_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_stat_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sys_stat_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_stat_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# sys_stat_h.m4 serial 24   -*- Autoconf -*-
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,27 +11,14 @@
 [
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
 
+  dnl For the mkdir substitute.
+  AC_REQUIRE([AC_C_INLINE])
+
   dnl Check for broken stat macros.
   AC_REQUIRE([AC_HEADER_STAT])
 
   gl_CHECK_NEXT_HEADERS([sys/stat.h])
 
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  dnl Whether to override 'struct stat'.
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_ST_SIZE=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_ST_SIZE])
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-    AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1],
-      [Define to 1 if Gnulib overrides 'struct stat' on Windows so that
-       struct stat.st_size becomes 64-bit.])
-  fi
-
   dnl Define types that are supposed to be defined in <sys/types.h> or
   dnl <sys/stat.h>.
   AC_CHECK_TYPE([nlink_t], [],
@@ -43,7 +30,7 @@
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h>
-    ]], [fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat
+    ]], [fchmodat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat
     mknod mknodat stat utimensat])
 ]) # gl_HEADER_SYS_STAT_H
 
@@ -60,7 +47,6 @@
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
   GNULIB_FCHMODAT=0;    AC_SUBST([GNULIB_FCHMODAT])
-  GNULIB_FSTAT=0;       AC_SUBST([GNULIB_FSTAT])
   GNULIB_FSTATAT=0;     AC_SUBST([GNULIB_FSTATAT])
   GNULIB_FUTIMENS=0;    AC_SUBST([GNULIB_FUTIMENS])
   GNULIB_LCHMOD=0;      AC_SUBST([GNULIB_LCHMOD])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sys_time_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_time_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sys_time_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_time_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
-# serial 8
+# serial 6
 
-# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009, 2010 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.
@@ -27,9 +27,6 @@
     HAVE_SYS_TIME_H=0
   fi
 
-  dnl On native Windows with MSVC, 'struct timeval' is defined in <winsock2.h>
-  dnl only. So include that header in the list.
-  gl_PREREQ_SYS_H_WINSOCK2
   AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
@@ -37,46 +34,12 @@
              #include <sys/time.h>
             #endif
             #include <time.h>
-            #if HAVE_WINSOCK2_H
-            # include <winsock2.h>
-            #endif
           ]],
           [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
        [gl_cv_sys_struct_timeval=yes],
-       [gl_cv_sys_struct_timeval=no])
-    ])
+       [gl_cv_sys_struct_timeval=no])])
   if test $gl_cv_sys_struct_timeval != yes; then
     HAVE_STRUCT_TIMEVAL=0
-  else
-    dnl On native Windows with a 64-bit 'time_t', 'struct timeval' is defined
-    dnl (in <sys/time.h> and <winsock2.h> for mingw64, in <winsock2.h> only
-    dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is
-    dnl smaller than the 'time_t' type mandated by POSIX.
-    dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but
-    dnl that is good enough.
-    AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member],
-      [gl_cv_sys_struct_timeval_tv_sec],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#if HAVE_SYS_TIME_H
-               #include <sys/time.h>
-              #endif
-              #include <time.h>
-              #if HAVE_WINSOCK2_H
-              # include <winsock2.h>
-              #endif
-            ]],
-            [[static struct timeval x;
-              typedef int verify_tv_sec_type[
-                sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
-              ];
-            ]])],
-         [gl_cv_sys_struct_timeval_tv_sec=yes],
-         [gl_cv_sys_struct_timeval_tv_sec=no])
-      ])
-    if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
-      REPLACE_STRUCT_TIMEVAL=1
-    fi
   fi
 
   dnl Check for declarations of anything we want to poison if the
@@ -106,5 +69,4 @@
   HAVE_STRUCT_TIMEVAL=1;     AC_SUBST([HAVE_STRUCT_TIMEVAL])
   HAVE_SYS_TIME_H=1;         AC_SUBST([HAVE_SYS_TIME_H])
   REPLACE_GETTIMEOFDAY=0;    AC_SUBST([REPLACE_GETTIMEOFDAY])
-  REPLACE_STRUCT_TIMEVAL=0;  AC_SUBST([REPLACE_STRUCT_TIMEVAL])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sys_types_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_types_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sys_types_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_types_h.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN_ONCE([gl_SYS_TYPES_H],
-[
-  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
-  gl_NEXT_HEADERS([sys/types.h])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  dnl Whether to override the 'off_t' type.
-  AC_REQUIRE([gl_TYPE_OFF_T])
-])
-
-AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
-[
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/sys_wait_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_wait_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/sys_wait_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/sys_wait_h.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# sys_wait_h.m4 serial 6
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# sys_wait_h.m4 serial 4
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,14 +10,6 @@
 
   dnl <sys/wait.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_NEXT_HEADERS([sys/wait.h])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <sys/wait.h>]],
-    [waitpid])
 ])
 
 AC_DEFUN([gl_SYS_WAIT_MODULE_INDICATOR],
@@ -25,12 +17,9 @@
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_SYS_WAIT_H_DEFAULTS])
   gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
 ])
 
 AC_DEFUN([gl_SYS_WAIT_H_DEFAULTS],
 [
-  GNULIB_WAITPID=0; AC_SUBST([GNULIB_WAITPID])
   dnl Assume proper GNU behavior unless another module says otherwise.
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/tempname.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/tempname.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/tempname.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/tempname.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,6 +1,6 @@
-#serial 5
+#serial 3
 
-# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2010 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.
@@ -9,6 +9,9 @@
 # it as a public API, and provide it on systems that are lacking.
 AC_DEFUN([gl_FUNC_GEN_TEMPNAME],
 [
+  AC_REQUIRE([AC_SYS_LARGEFILE])
+
+  AC_LIBOBJ([tempname])
   gl_PREREQ_TEMPNAME
 ])
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/thread.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/thread.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/thread.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/thread.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
-# thread.m4 serial 3
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# thread.m4 serial 2
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,6 +7,7 @@
 AC_DEFUN([gl_THREAD],
 [
   AC_REQUIRE([gl_THREADLIB])
+  AC_REQUIRE([AC_C_INLINE])
 
   if test $gl_threads_api = posix; then
     gl_save_LIBS="$LIBS"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/time_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/time_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/time_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/time_h.m4	2010-06-03 21:36:15.000000000 +0000
@@ -1,8 +1,8 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
-# serial 8
+# serial 2
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,11 +21,11 @@
 [
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
-  gl_NEXT_HEADERS([time.h])
+  gl_CHECK_NEXT_HEADERS([time.h])
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
 ])
 
-dnl Check whether 'struct timespec' is declared
+dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
 dnl in time.h, sys/time.h, or pthread.h.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
@@ -95,7 +95,7 @@
   GNULIB_TIMEGM=0;                       AC_SUBST([GNULIB_TIMEGM])
   GNULIB_TIME_R=0;                       AC_SUBST([GNULIB_TIME_R])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
+  HAVE_LOCALTIME_R=1;                    AC_SUBST([HAVE_LOCALTIME_R])
   HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
   HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
   HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
@@ -106,13 +106,4 @@
   REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
   REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
-
-  dnl Hack so that the time module doesn't depend on the sys_time module.
-  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
-  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
-  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
-  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
-  dnl is no longer a big deal.
-  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
-  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/tls.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/tls.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/tls.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/tls.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 # tls.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/tmpdir.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/tmpdir.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/tmpdir.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/tmpdir.m4	2010-05-24 10:42:20.000000000 +0000
@@ -1,9 +1,12 @@
-# tmpdir.m4 serial 4
-dnl Copyright (C) 2001-2002, 2006, 2009-2014 Free Software Foundation, Inc.
+# tmpdir.m4 serial 3
+dnl Copyright (C) 2001-2002, 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 # Prerequisites for lib/tmpdir.c
 
-AC_DEFUN([gt_TMPDIR], [:])
+AC_DEFUN([gt_TMPDIR],
+[
+  AC_CHECK_FUNCS([__secure_getenv])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/ungetc.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/ungetc.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/ungetc.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/ungetc.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-# ungetc.m4 serial 3
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  AC_CACHE_CHECK([whether ungetc works on arbitrary bytes],
-    [gl_cv_func_ungetc_works],
-    [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include <stdio.h>
-      ]], [FILE *f;
-           if (!(f = fopen ("conftest.tmp", "w+"))) return 1;
-           if (fputs ("abc", f) < 0) return 2;
-           rewind (f);
-           if (fgetc (f) != 'a') return 3;
-           if (fgetc (f) != 'b') return 4;
-           if (ungetc ('d', f) != 'd') return 5;
-           if (ftell (f) != 1) return 6;
-           if (fgetc (f) != 'd') return 7;
-           if (ftell (f) != 2) return 8;
-           if (fseek (f, 0, SEEK_CUR) != 0) return 9;
-           if (ftell (f) != 2) return 10;
-           if (fgetc (f) != 'c') return 11;
-           fclose (f); remove ("conftest.tmp");])],
-        [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
-        [case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_ungetc_works="guessing no" ;;
-         esac
-        ])
-    ])
-  case "$gl_cv_func_ungetc_works" in
-    *yes) ;;
-    *)
-      AC_DEFINE([FUNC_UNGETC_BROKEN], [1],
-        [Define to 1 if ungetc is broken when used on arbitrary bytes.])
-      ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/unistd_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/unistd_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/unistd_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/unistd_h.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 67
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# unistd_h.m4 serial 46
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,8 +11,11 @@
   dnl Use AC_REQUIRE here, so that the default behavior below is expanded
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([AC_C_INLINE])
 
   gl_CHECK_NEXT_HEADERS([unistd.h])
+
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   if test $ac_cv_header_unistd_h = yes; then
     HAVE_UNISTD_H=1
   else
@@ -20,20 +23,11 @@
   fi
   AC_SUBST([HAVE_UNISTD_H])
 
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Determine WINDOWS_64_BIT_OFF_T.
-  AC_REQUIRE([gl_TYPE_OFF_T])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+  gl_WARN_ON_USE_PREPARE([[#include <unistd.h>
 /* Some systems declare various items in the wrong headers.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#ifndef __GLIBC__
 # include <fcntl.h>
 # include <stdio.h>
 # include <stdlib.h>
@@ -41,13 +35,12 @@
 #  include <io.h>
 # endif
 #endif
-    ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
-    fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
-    gethostname getlogin getlogin_r getpagesize
-    getusershell setusershell endusershell
-    group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
-    readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r
-    unlink unlinkat usleep])
+    ]], [chown dup2 dup3 environ euidaccess faccessat fchdir fchownat
+    fsync ftruncate getcwd getdomainname getdtablesize getgroups
+    gethostname getlogin getlogin_r getpagesize getusershell setusershell
+    endusershell lchown link linkat lseek pipe2 pread pwrite readlink
+    readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat
+    usleep])
 ])
 
 AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -61,54 +54,46 @@
 
 AC_DEFUN([gl_UNISTD_H_DEFAULTS],
 [
-  GNULIB_CHDIR=0;                AC_SUBST([GNULIB_CHDIR])
-  GNULIB_CHOWN=0;                AC_SUBST([GNULIB_CHOWN])
-  GNULIB_CLOSE=0;                AC_SUBST([GNULIB_CLOSE])
-  GNULIB_DUP=0;                  AC_SUBST([GNULIB_DUP])
-  GNULIB_DUP2=0;                 AC_SUBST([GNULIB_DUP2])
-  GNULIB_DUP3=0;                 AC_SUBST([GNULIB_DUP3])
-  GNULIB_ENVIRON=0;              AC_SUBST([GNULIB_ENVIRON])
-  GNULIB_EUIDACCESS=0;           AC_SUBST([GNULIB_EUIDACCESS])
-  GNULIB_FACCESSAT=0;            AC_SUBST([GNULIB_FACCESSAT])
-  GNULIB_FCHDIR=0;               AC_SUBST([GNULIB_FCHDIR])
-  GNULIB_FCHOWNAT=0;             AC_SUBST([GNULIB_FCHOWNAT])
-  GNULIB_FDATASYNC=0;            AC_SUBST([GNULIB_FDATASYNC])
-  GNULIB_FSYNC=0;                AC_SUBST([GNULIB_FSYNC])
-  GNULIB_FTRUNCATE=0;            AC_SUBST([GNULIB_FTRUNCATE])
-  GNULIB_GETCWD=0;               AC_SUBST([GNULIB_GETCWD])
-  GNULIB_GETDOMAINNAME=0;        AC_SUBST([GNULIB_GETDOMAINNAME])
-  GNULIB_GETDTABLESIZE=0;        AC_SUBST([GNULIB_GETDTABLESIZE])
-  GNULIB_GETGROUPS=0;            AC_SUBST([GNULIB_GETGROUPS])
-  GNULIB_GETHOSTNAME=0;          AC_SUBST([GNULIB_GETHOSTNAME])
-  GNULIB_GETLOGIN=0;             AC_SUBST([GNULIB_GETLOGIN])
-  GNULIB_GETLOGIN_R=0;           AC_SUBST([GNULIB_GETLOGIN_R])
-  GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
-  GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
-  GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
-  GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
-  GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
-  GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
-  GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
-  GNULIB_LSEEK=0;                AC_SUBST([GNULIB_LSEEK])
-  GNULIB_PIPE=0;                 AC_SUBST([GNULIB_PIPE])
-  GNULIB_PIPE2=0;                AC_SUBST([GNULIB_PIPE2])
-  GNULIB_PREAD=0;                AC_SUBST([GNULIB_PREAD])
-  GNULIB_PWRITE=0;               AC_SUBST([GNULIB_PWRITE])
-  GNULIB_READ=0;                 AC_SUBST([GNULIB_READ])
-  GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
-  GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
-  GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
-  GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
-  GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
-  GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
-  GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
-  GNULIB_TTYNAME_R=0;            AC_SUBST([GNULIB_TTYNAME_R])
-  GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING])
-  GNULIB_UNISTD_H_SIGPIPE=0;     AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
-  GNULIB_UNLINK=0;               AC_SUBST([GNULIB_UNLINK])
-  GNULIB_UNLINKAT=0;             AC_SUBST([GNULIB_UNLINKAT])
-  GNULIB_USLEEP=0;               AC_SUBST([GNULIB_USLEEP])
-  GNULIB_WRITE=0;                AC_SUBST([GNULIB_WRITE])
+  GNULIB_CHOWN=0;            AC_SUBST([GNULIB_CHOWN])
+  GNULIB_CLOSE=0;            AC_SUBST([GNULIB_CLOSE])
+  GNULIB_DUP2=0;             AC_SUBST([GNULIB_DUP2])
+  GNULIB_DUP3=0;             AC_SUBST([GNULIB_DUP3])
+  GNULIB_ENVIRON=0;          AC_SUBST([GNULIB_ENVIRON])
+  GNULIB_EUIDACCESS=0;       AC_SUBST([GNULIB_EUIDACCESS])
+  GNULIB_FACCESSAT=0;        AC_SUBST([GNULIB_FACCESSAT])
+  GNULIB_FCHDIR=0;           AC_SUBST([GNULIB_FCHDIR])
+  GNULIB_FCHOWNAT=0;         AC_SUBST([GNULIB_FCHOWNAT])
+  GNULIB_FSYNC=0;            AC_SUBST([GNULIB_FSYNC])
+  GNULIB_FTRUNCATE=0;        AC_SUBST([GNULIB_FTRUNCATE])
+  GNULIB_GETCWD=0;           AC_SUBST([GNULIB_GETCWD])
+  GNULIB_GETDOMAINNAME=0;    AC_SUBST([GNULIB_GETDOMAINNAME])
+  GNULIB_GETDTABLESIZE=0;    AC_SUBST([GNULIB_GETDTABLESIZE])
+  GNULIB_GETGROUPS=0;        AC_SUBST([GNULIB_GETGROUPS])
+  GNULIB_GETHOSTNAME=0;      AC_SUBST([GNULIB_GETHOSTNAME])
+  GNULIB_GETLOGIN=0;         AC_SUBST([GNULIB_GETLOGIN])
+  GNULIB_GETLOGIN_R=0;       AC_SUBST([GNULIB_GETLOGIN_R])
+  GNULIB_GETPAGESIZE=0;      AC_SUBST([GNULIB_GETPAGESIZE])
+  GNULIB_GETUSERSHELL=0;     AC_SUBST([GNULIB_GETUSERSHELL])
+  GNULIB_LCHOWN=0;           AC_SUBST([GNULIB_LCHOWN])
+  GNULIB_LINK=0;             AC_SUBST([GNULIB_LINK])
+  GNULIB_LINKAT=0;           AC_SUBST([GNULIB_LINKAT])
+  GNULIB_LSEEK=0;            AC_SUBST([GNULIB_LSEEK])
+  GNULIB_PIPE2=0;            AC_SUBST([GNULIB_PIPE2])
+  GNULIB_PREAD=0;            AC_SUBST([GNULIB_PREAD])
+  GNULIB_PWRITE=0;           AC_SUBST([GNULIB_PWRITE])
+  GNULIB_READLINK=0;         AC_SUBST([GNULIB_READLINK])
+  GNULIB_READLINKAT=0;       AC_SUBST([GNULIB_READLINKAT])
+  GNULIB_RMDIR=0;            AC_SUBST([GNULIB_RMDIR])
+  GNULIB_SLEEP=0;            AC_SUBST([GNULIB_SLEEP])
+  GNULIB_SYMLINK=0;          AC_SUBST([GNULIB_SYMLINK])
+  GNULIB_SYMLINKAT=0;        AC_SUBST([GNULIB_SYMLINKAT])
+  GNULIB_TTYNAME_R=0;        AC_SUBST([GNULIB_TTYNAME_R])
+  GNULIB_UNISTD_H_GETOPT=0;  AC_SUBST([GNULIB_UNISTD_H_GETOPT])
+  GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
+  GNULIB_UNLINK=0;           AC_SUBST([GNULIB_UNLINK])
+  GNULIB_UNLINKAT=0;         AC_SUBST([GNULIB_UNLINKAT])
+  GNULIB_USLEEP=0;           AC_SUBST([GNULIB_USLEEP])
+  GNULIB_WRITE=0;            AC_SUBST([GNULIB_WRITE])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_CHOWN=1;           AC_SUBST([HAVE_CHOWN])
   HAVE_DUP2=1;            AC_SUBST([HAVE_DUP2])
@@ -117,39 +102,32 @@
   HAVE_FACCESSAT=1;       AC_SUBST([HAVE_FACCESSAT])
   HAVE_FCHDIR=1;          AC_SUBST([HAVE_FCHDIR])
   HAVE_FCHOWNAT=1;        AC_SUBST([HAVE_FCHOWNAT])
-  HAVE_FDATASYNC=1;       AC_SUBST([HAVE_FDATASYNC])
   HAVE_FSYNC=1;           AC_SUBST([HAVE_FSYNC])
   HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
+  HAVE_GETDOMAINNAME=1;   AC_SUBST([HAVE_GETDOMAINNAME])
   HAVE_GETDTABLESIZE=1;   AC_SUBST([HAVE_GETDTABLESIZE])
   HAVE_GETGROUPS=1;       AC_SUBST([HAVE_GETGROUPS])
   HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
   HAVE_GETLOGIN=1;        AC_SUBST([HAVE_GETLOGIN])
   HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
-  HAVE_GROUP_MEMBER=1;    AC_SUBST([HAVE_GROUP_MEMBER])
   HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
   HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
   HAVE_LINKAT=1;          AC_SUBST([HAVE_LINKAT])
-  HAVE_PIPE=1;            AC_SUBST([HAVE_PIPE])
   HAVE_PIPE2=1;           AC_SUBST([HAVE_PIPE2])
   HAVE_PREAD=1;           AC_SUBST([HAVE_PREAD])
   HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
   HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
-  HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
   HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
   HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
+  HAVE_TTYNAME_R=1;       AC_SUBST([HAVE_TTYNAME_R])
   HAVE_UNLINKAT=1;        AC_SUBST([HAVE_UNLINKAT])
   HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
   HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
-  HAVE_DECL_FCHDIR=1;     AC_SUBST([HAVE_DECL_FCHDIR])
-  HAVE_DECL_FDATASYNC=1;  AC_SUBST([HAVE_DECL_FDATASYNC])
-  HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME])
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
   HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
-  HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
-  HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
   REPLACE_CHOWN=0;        AC_SUBST([REPLACE_CHOWN])
@@ -157,21 +135,15 @@
   REPLACE_DUP=0;          AC_SUBST([REPLACE_DUP])
   REPLACE_DUP2=0;         AC_SUBST([REPLACE_DUP2])
   REPLACE_FCHOWNAT=0;     AC_SUBST([REPLACE_FCHOWNAT])
-  REPLACE_FTRUNCATE=0;    AC_SUBST([REPLACE_FTRUNCATE])
   REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
-  REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
-  REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
-  REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
-  REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
   REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
   REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
   REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
   REPLACE_LSEEK=0;        AC_SUBST([REPLACE_LSEEK])
   REPLACE_PREAD=0;        AC_SUBST([REPLACE_PREAD])
   REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
-  REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
   REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
   REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
   REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/unistd-safer.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/unistd-safer.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/unistd-safer.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/unistd-safer.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-#serial 9
-dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+#serial 8
+dnl Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,4 +7,7 @@
 AC_DEFUN([gl_UNISTD_SAFER],
 [
   AC_CHECK_FUNCS_ONCE([pipe])
+  AC_LIBOBJ([dup-safer])
+  AC_LIBOBJ([fd-safer])
+  AC_LIBOBJ([pipe-safer])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/unlocked-io.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/unlocked-io.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/unlocked-io.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/unlocked-io.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/vasnprintf.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/vasnprintf.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/vasnprintf.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/vasnprintf.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# vasnprintf.m4 serial 36
-dnl Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
+# vasnprintf.m4 serial 31
+dnl Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 @@
   gl_PREREQ_ASNPRINTF
 ])
 
-# Prerequisites of lib/printf-args.h, lib/printf-args.c.
+# Prequisites of lib/printf-args.h, lib/printf-args.c.
 AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 [
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
@@ -37,10 +37,9 @@
   AC_REQUIRE([gt_TYPE_WINT_T])
 ])
 
-# Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
+# Prequisites of lib/printf-parse.h, lib/printf-parse.c.
 AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 [
-  AC_REQUIRE([gl_FEATURES_H])
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
@@ -55,6 +54,7 @@
 # Prerequisites of lib/vasnprintf.c.
 AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
 [
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
@@ -62,10 +62,7 @@
   AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
   dnl Use the _snprintf function only if it is declared (because on NetBSD it
   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  AC_CHECK_DECLS([_snprintf], , , [[#include <stdio.h>]])
-  dnl Knowing DBL_EXPBIT0_WORD and DBL_EXPBIT0_BIT enables an optimization
-  dnl in the code for NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE.
-  AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
+  AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
   dnl We can avoid a lot of code by assuming that snprintf's return value
   dnl conforms to ISO C99. So check that.
   AC_REQUIRE([gl_SNPRINTF_RETVAL_C99])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/vasprintf.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/vasprintf.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/vasprintf.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/vasprintf.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
 # vasprintf.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-m4/vsnprintf.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/vsnprintf.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/vsnprintf.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/vsnprintf.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,13 +1,9 @@
-# vsnprintf.m4 serial 6
-dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc.
+# vsnprintf.m4 serial 5
+dnl Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Libintl 0.17 will replace vsnprintf only if it does not support %1$s,
-dnl but defers to any gnulib vsnprintf replacements.  Therefore, gnulib
-dnl must guarantee that the decision for replacing vsnprintf is a superset
-dnl of the reasons checked by libintl.
 AC_DEFUN([gl_FUNC_VSNPRINTF],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
@@ -17,17 +13,7 @@
     gl_SNPRINTF_SIZE1
     case "$gl_cv_func_snprintf_size1" in
       *yes)
-        gl_SNPRINTF_RETVAL_C99
-        case "$gl_cv_func_snprintf_retval_c99" in
-          *yes)
-            gl_PRINTF_POSITIONS
-            case "$gl_cv_func_printf_positions" in
-              *yes)
-                gl_cv_func_vsnprintf_usable=yes
-                ;;
-            esac
-            ;;
-        esac
+        gl_cv_func_vsnprintf_usable=yes
         ;;
     esac
   fi
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/waitpid.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/waitpid.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/waitpid.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/waitpid.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-# waitpid.m4 serial 2
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_WAITPID],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  HAVE_WAITPID=1
-  case $host_os in
-    mingw*) HAVE_WAITPID=0 ;;
-  esac
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wait-process.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wait-process.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wait-process.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wait-process.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# wait-process.m4 serial 6
-dnl Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
+# wait-process.m4 serial 5
+dnl Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,6 +7,7 @@
 AC_DEFUN([gl_WAIT_PROCESS],
 [
   dnl Prerequisites of lib/wait-process.c.
+  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T])
   AC_CHECK_FUNCS([waitid])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/warn-on-use.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/warn-on-use.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/warn-on-use.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/warn-on-use.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# warn-on-use.m4 serial 2
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,8 +18,8 @@
 # some systems declare functions in the wrong header, then INCLUDES
 # should do likewise.
 #
-# It is generally safe to assume declarations for functions declared
-# in the intersection of C89 and C11 (such as printf) without
+# If you assume C89, then it is generally safe to assume declarations
+# for functions declared in that standard (such as gets) without
 # needing gl_WARN_ON_USE_PREPARE.
 AC_DEFUN([gl_WARN_ON_USE_PREPARE],
 [
@@ -27,8 +27,6 @@
     [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
       [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
        undefining macros.])])dnl
-dnl FIXME: gl_Symbol must be used unquoted until we can assume
-dnl autoconf 2.64 or newer.
   for gl_func in m4_flatten([$2]); do
     AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
     AC_CACHE_CHECK([whether $gl_func is declared without a macro],
@@ -37,8 +35,8 @@
 [@%:@undef $gl_func
   (void) $gl_func;])],
         [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
-    AS_VAR_IF(gl_Symbol, [yes],
-      [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
+     AS_VAR_IF(gl_Symbol, [yes],
+       [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
        dnl shortcut - if the raw declaration exists, then set a cache
        dnl variable to allow skipping any later AC_CHECK_DECL efforts
        eval ac_cv_have_decl_$gl_func=yes])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wchar_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wchar_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wchar_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wchar_h.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,13 +1,13 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Written by Eric Blake.
 
-# wchar_h.m4 serial 39
+# wchar_h.m4 serial 33
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -17,6 +17,7 @@
   dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
   dnl character support).
   dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
+  AC_CHECK_HEADERS_ONCE([wchar.h])
   gl_CHECK_NEXT_HEADERS([wchar.h])
   if test $ac_cv_header_wchar_h = yes; then
     HAVE_WCHAR_H=1
@@ -25,8 +26,6 @@
   fi
   AC_SUBST([HAVE_WCHAR_H])
 
-  AC_REQUIRE([gl_FEATURES_H])
-
   AC_REQUIRE([gt_TYPE_WINT_T])
   if test $gt_cv_c_wint_t = yes; then
     HAVE_WINT_T=1
@@ -38,23 +37,15 @@
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+/* Some systems require additional headers.  */
+#ifndef __GLIBC__
 # include <stddef.h>
 # include <stdio.h>
 # include <time.h>
 #endif
 #include <wchar.h>
-    ]],
-    [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
-     wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset
-     wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp
-     wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr
-     wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth
-    ])
+    ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
+    wcsrtombs wcsnrtombs wcwidth])
 ])
 
 dnl Check whether <wchar.h> is usable at all.
@@ -70,13 +61,6 @@
     [gl_cv_header_wchar_h_correct_inline=yes
      AC_LANG_CONFTEST([
        AC_LANG_SOURCE([[#define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 extern int zero (void);
 int main () { return zero(); }
@@ -85,13 +69,6 @@
        mv conftest.$ac_objext conftest1.$ac_objext
        AC_LANG_CONFTEST([
          AC_LANG_SOURCE([[#define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int zero (void) { return 0; }
 ]])])
@@ -119,6 +96,13 @@
   fi
 ])
 
+dnl Unconditionally enables the replacement of <wchar.h>.
+AC_DEFUN([gl_REPLACE_WCHAR_H],
+[
+  dnl This is a no-op, because <wchar.h> is always overridden.
+  :
+])
+
 AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
@@ -130,45 +114,17 @@
 
 AC_DEFUN([gl_WCHAR_H_DEFAULTS],
 [
-  GNULIB_BTOWC=0;       AC_SUBST([GNULIB_BTOWC])
-  GNULIB_WCTOB=0;       AC_SUBST([GNULIB_WCTOB])
-  GNULIB_MBSINIT=0;     AC_SUBST([GNULIB_MBSINIT])
-  GNULIB_MBRTOWC=0;     AC_SUBST([GNULIB_MBRTOWC])
-  GNULIB_MBRLEN=0;      AC_SUBST([GNULIB_MBRLEN])
-  GNULIB_MBSRTOWCS=0;   AC_SUBST([GNULIB_MBSRTOWCS])
-  GNULIB_MBSNRTOWCS=0;  AC_SUBST([GNULIB_MBSNRTOWCS])
-  GNULIB_WCRTOMB=0;     AC_SUBST([GNULIB_WCRTOMB])
-  GNULIB_WCSRTOMBS=0;   AC_SUBST([GNULIB_WCSRTOMBS])
-  GNULIB_WCSNRTOMBS=0;  AC_SUBST([GNULIB_WCSNRTOMBS])
-  GNULIB_WCWIDTH=0;     AC_SUBST([GNULIB_WCWIDTH])
-  GNULIB_WMEMCHR=0;     AC_SUBST([GNULIB_WMEMCHR])
-  GNULIB_WMEMCMP=0;     AC_SUBST([GNULIB_WMEMCMP])
-  GNULIB_WMEMCPY=0;     AC_SUBST([GNULIB_WMEMCPY])
-  GNULIB_WMEMMOVE=0;    AC_SUBST([GNULIB_WMEMMOVE])
-  GNULIB_WMEMSET=0;     AC_SUBST([GNULIB_WMEMSET])
-  GNULIB_WCSLEN=0;      AC_SUBST([GNULIB_WCSLEN])
-  GNULIB_WCSNLEN=0;     AC_SUBST([GNULIB_WCSNLEN])
-  GNULIB_WCSCPY=0;      AC_SUBST([GNULIB_WCSCPY])
-  GNULIB_WCPCPY=0;      AC_SUBST([GNULIB_WCPCPY])
-  GNULIB_WCSNCPY=0;     AC_SUBST([GNULIB_WCSNCPY])
-  GNULIB_WCPNCPY=0;     AC_SUBST([GNULIB_WCPNCPY])
-  GNULIB_WCSCAT=0;      AC_SUBST([GNULIB_WCSCAT])
-  GNULIB_WCSNCAT=0;     AC_SUBST([GNULIB_WCSNCAT])
-  GNULIB_WCSCMP=0;      AC_SUBST([GNULIB_WCSCMP])
-  GNULIB_WCSNCMP=0;     AC_SUBST([GNULIB_WCSNCMP])
-  GNULIB_WCSCASECMP=0;  AC_SUBST([GNULIB_WCSCASECMP])
-  GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP])
-  GNULIB_WCSCOLL=0;     AC_SUBST([GNULIB_WCSCOLL])
-  GNULIB_WCSXFRM=0;     AC_SUBST([GNULIB_WCSXFRM])
-  GNULIB_WCSDUP=0;      AC_SUBST([GNULIB_WCSDUP])
-  GNULIB_WCSCHR=0;      AC_SUBST([GNULIB_WCSCHR])
-  GNULIB_WCSRCHR=0;     AC_SUBST([GNULIB_WCSRCHR])
-  GNULIB_WCSCSPN=0;     AC_SUBST([GNULIB_WCSCSPN])
-  GNULIB_WCSSPN=0;      AC_SUBST([GNULIB_WCSSPN])
-  GNULIB_WCSPBRK=0;     AC_SUBST([GNULIB_WCSPBRK])
-  GNULIB_WCSSTR=0;      AC_SUBST([GNULIB_WCSSTR])
-  GNULIB_WCSTOK=0;      AC_SUBST([GNULIB_WCSTOK])
-  GNULIB_WCSWIDTH=0;    AC_SUBST([GNULIB_WCSWIDTH])
+  GNULIB_BTOWC=0;      AC_SUBST([GNULIB_BTOWC])
+  GNULIB_WCTOB=0;      AC_SUBST([GNULIB_WCTOB])
+  GNULIB_MBSINIT=0;    AC_SUBST([GNULIB_MBSINIT])
+  GNULIB_MBRTOWC=0;    AC_SUBST([GNULIB_MBRTOWC])
+  GNULIB_MBRLEN=0;     AC_SUBST([GNULIB_MBRLEN])
+  GNULIB_MBSRTOWCS=0;  AC_SUBST([GNULIB_MBSRTOWCS])
+  GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS])
+  GNULIB_WCRTOMB=0;    AC_SUBST([GNULIB_WCRTOMB])
+  GNULIB_WCSRTOMBS=0;  AC_SUBST([GNULIB_WCSRTOMBS])
+  GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS])
+  GNULIB_WCWIDTH=0;    AC_SUBST([GNULIB_WCWIDTH])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
@@ -179,34 +135,6 @@
   HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
   HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
   HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
-  HAVE_WMEMCHR=1;       AC_SUBST([HAVE_WMEMCHR])
-  HAVE_WMEMCMP=1;       AC_SUBST([HAVE_WMEMCMP])
-  HAVE_WMEMCPY=1;       AC_SUBST([HAVE_WMEMCPY])
-  HAVE_WMEMMOVE=1;      AC_SUBST([HAVE_WMEMMOVE])
-  HAVE_WMEMSET=1;       AC_SUBST([HAVE_WMEMSET])
-  HAVE_WCSLEN=1;        AC_SUBST([HAVE_WCSLEN])
-  HAVE_WCSNLEN=1;       AC_SUBST([HAVE_WCSNLEN])
-  HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
-  HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
-  HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
-  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
-  HAVE_WCSCAT=1;        AC_SUBST([HAVE_WCSCAT])
-  HAVE_WCSNCAT=1;       AC_SUBST([HAVE_WCSNCAT])
-  HAVE_WCSCMP=1;        AC_SUBST([HAVE_WCSCMP])
-  HAVE_WCSNCMP=1;       AC_SUBST([HAVE_WCSNCMP])
-  HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
-  HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
-  HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
-  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
-  HAVE_WCSDUP=1;        AC_SUBST([HAVE_WCSDUP])
-  HAVE_WCSCHR=1;        AC_SUBST([HAVE_WCSCHR])
-  HAVE_WCSRCHR=1;       AC_SUBST([HAVE_WCSRCHR])
-  HAVE_WCSCSPN=1;       AC_SUBST([HAVE_WCSCSPN])
-  HAVE_WCSSPN=1;        AC_SUBST([HAVE_WCSSPN])
-  HAVE_WCSPBRK=1;       AC_SUBST([HAVE_WCSPBRK])
-  HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
-  HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
-  HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
   HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
   HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
   REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
@@ -221,5 +149,4 @@
   REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
   REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
   REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
-  REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wcrtomb.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wcrtomb.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wcrtomb.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wcrtomb.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-# wcrtomb.m4 serial 11
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_WCRTOMB],
-[
-  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-
-  AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  gl_MBSTATE_T_BROKEN
-
-  AC_CHECK_FUNCS_ONCE([wcrtomb])
-  if test $ac_cv_func_wcrtomb = no; then
-    HAVE_WCRTOMB=0
-    AC_CHECK_DECLS([wcrtomb],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_wcrtomb = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares wcrtomb() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_WCRTOMB=1
-    fi
-  else
-    if test $REPLACE_MBSTATE_T = 1; then
-      REPLACE_WCRTOMB=1
-    else
-      dnl On AIX 4.3, OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes
-      dnl returns 0 instead of 1.
-      AC_REQUIRE([AC_PROG_CC])
-      AC_REQUIRE([gt_LOCALE_FR])
-      AC_REQUIRE([gt_LOCALE_FR_UTF8])
-      AC_REQUIRE([gt_LOCALE_JA])
-      AC_REQUIRE([gt_LOCALE_ZH_CN])
-      AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-      AC_CACHE_CHECK([whether wcrtomb return value is correct],
-        [gl_cv_func_wcrtomb_retval],
-        [
-          dnl Initial guess, used when cross-compiling or when no suitable locale
-          dnl is present.
-changequote(,)dnl
-          case "$host_os" in
-                                     # Guess no on AIX 4, OSF/1 and Solaris.
-            aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;;
-                                     # Guess yes otherwise.
-            *)                       gl_cv_func_wcrtomb_retval="guessing yes" ;;
-          esac
-changequote([,])dnl
-          if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
-            AC_RUN_IFELSE(
-              [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  int result = 0;
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 1;
-    }
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 2;
-    }
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 4;
-    }
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
-    {
-      if (wcrtomb (NULL, 0, NULL) != 1)
-        result |= 8;
-    }
-  return result;
-}]])],
-              [gl_cv_func_wcrtomb_retval=yes],
-              [gl_cv_func_wcrtomb_retval=no],
-              [:])
-          fi
-        ])
-      case "$gl_cv_func_wcrtomb_retval" in
-        *yes) ;;
-        *) REPLACE_WCRTOMB=1 ;;
-      esac
-    fi
-  fi
-])
-
-# Prerequisites of lib/wcrtomb.c.
-AC_DEFUN([gl_PREREQ_WCRTOMB], [
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wctob.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wctob.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wctob.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wctob.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# wctob.m4 serial 10
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# wctob.m4 serial 5
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,10 +10,11 @@
 
   AC_CHECK_FUNCS_ONCE([wctob])
   if test $ac_cv_func_wctob = no; then
-    HAVE_WCTOB=0
     HAVE_DECL_WCTOB=0
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([wctob])
+    gl_PREREQ_WCTOB
   else
-    HAVE_WCTOB=1
 
     dnl Solaris 9 has the wctob() function but it does not work.
     dnl Cygwin 1.7.2 has the wctob() function but it clobbers caller-owned
@@ -37,16 +38,8 @@
 changequote([,])dnl
         case "$host_os" in
           cygwin*)
-            AC_RUN_IFELSE(
-              [AC_LANG_SOURCE([[
+            AC_TRY_RUN([
 #include <locale.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 
 register long global __asm__ ("%ebx");
@@ -61,24 +54,13 @@
   if (global != 0x12345678)
     return 2;
   return 0;
-}]])],
-              [:],
-              [gl_cv_func_wctob_works=no],
-              [:])
+}], [:], [gl_cv_func_wctob_works=no], [:])
             ;;
         esac
         if test "$gl_cv_func_wctob_works" != no && test $LOCALE_FR != none; then
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
+          AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
 #include <wchar.h>
 int main ()
 {
@@ -91,7 +73,7 @@
           return 1;
     }
   return 0;
-}]])],
+}],
             [gl_cv_func_wctob_works=yes],
             [gl_cv_func_wctob_works=no],
             [:])
@@ -101,10 +83,14 @@
       *yes) ;;
       *) REPLACE_WCTOB=1 ;;
     esac
-    if test $REPLACE_WCTOB = 0; then
+    if test $REPLACE_WCTOB = 1; then
+      gl_REPLACE_WCHAR_H
+      AC_LIBOBJ([wctob])
+      gl_PREREQ_WCTOB
+    else
 
       dnl IRIX 6.5 has the wctob() function but does not declare it.
-      AC_CHECK_DECLS([wctob], [], [], [[
+      AC_CHECK_DECLS([wctob], [], [], [
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
@@ -113,9 +99,10 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-]])
+])
       if test $ac_cv_have_decl_wctob != yes; then
         HAVE_DECL_WCTOB=0
+        gl_REPLACE_WCHAR_H
       fi
     fi
   fi
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wctomb.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wctomb.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wctomb.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wctomb.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# wctomb.m4 serial 2
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_WCTOMB],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-
-  if false; then
-    REPLACE_WCTOMB=1
-  fi
-])
-
-# Prerequisites of lib/wctomb.c.
-AC_DEFUN([gl_PREREQ_WCTOMB], [
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wctype_h.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wctype_h.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wctype_h.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wctype_h.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,8 +1,8 @@
-# wctype_h.m4 serial 18
+# wctype_h.m4 serial 6
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,6 @@
 
 AC_DEFUN([gl_WCTYPE_H],
 [
-  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([iswcntrl])
@@ -21,6 +20,15 @@
     HAVE_ISWCNTRL=0
   fi
   AC_SUBST([HAVE_ISWCNTRL])
+  AC_CHECK_FUNCS_ONCE([iswblank])
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+  else
+    HAVE_ISWBLANK=0
+  fi
+  AC_SUBST([HAVE_ISWBLANK])
+  AC_CHECK_HEADERS_ONCE([wctype.h])
+  AC_REQUIRE([AC_C_INLINE])
 
   AC_REQUIRE([gt_TYPE_WINT_T])
   if test $gt_cv_c_wint_t = yes; then
@@ -30,180 +38,39 @@
   fi
   AC_SUBST([HAVE_WINT_T])
 
-  gl_CHECK_NEXT_HEADERS([wctype.h])
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
       dnl Linux libc5 has an iswprint function that returns 0 for all arguments.
       dnl The other functions are likely broken in the same way.
       AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works],
         [
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
-               /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-                  included before <wchar.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 <stdio.h>
-               #include <time.h>
-               #include <wchar.h>
-               #include <wctype.h>
-               int main () { return iswprint ('x') == 0; }
-            ]])],
+          AC_RUN_IFELSE([AC_LANG_SOURCE([[
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }]])],
             [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no],
             [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
                           #if __GNU_LIBRARY__ == 1
                           Linux libc5 i18n is broken.
                           #endif]], [])],
-              [gl_cv_func_iswcntrl_works="guessing yes"],
-              [gl_cv_func_iswcntrl_works="guessing no"])
+              [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
             ])
         ])
     fi
+    gl_CHECK_NEXT_HEADERS([wctype.h])
     HAVE_WCTYPE_H=1
   else
     HAVE_WCTYPE_H=0
   fi
   AC_SUBST([HAVE_WCTYPE_H])
 
-  case "$gl_cv_func_iswcntrl_works" in
-    *yes) REPLACE_ISWCNTRL=0 ;;
-    *)    REPLACE_ISWCNTRL=1 ;;
-  esac
-  AC_SUBST([REPLACE_ISWCNTRL])
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    dnl Redefine all of iswcntrl, ..., iswxdigit in <wctype.h>.
-    :
-  fi
-
-  if test $REPLACE_ISWCNTRL = 1; then
-    REPLACE_TOWLOWER=1
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
   else
-    AC_CHECK_FUNCS([towlower])
-    if test $ac_cv_func_towlower = yes; then
-      REPLACE_TOWLOWER=0
-    else
-      AC_CHECK_DECLS([towlower],,,
-        [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-             included before <wchar.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 <stdio.h>
-          #include <time.h>
-          #include <wchar.h>
-          #if HAVE_WCTYPE_H
-          # include <wctype.h>
-          #endif
-        ]])
-      if test $ac_cv_have_decl_towlower = yes; then
-        dnl On Minix 3.1.8, the system's <wctype.h> declares towlower() and
-        dnl towupper() although it does not have the functions. Avoid a
-        dnl collision with gnulib's replacement.
-        REPLACE_TOWLOWER=1
-      else
-        REPLACE_TOWLOWER=0
-      fi
-    fi
-  fi
-  AC_SUBST([REPLACE_TOWLOWER])
-
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then
-    dnl Redefine towlower, towupper in <wctype.h>.
-    :
-  fi
-
-  dnl We assume that the wctype() and iswctype() functions exist if and only
-  dnl if the type wctype_t is defined in <wchar.h> or in <wctype.h> if that
-  dnl exists.
-  dnl HP-UX 11.00 declares all these in <wchar.h> and lacks <wctype.h>.
-  AC_CACHE_CHECK([for wctype_t], [gl_cv_type_wctype_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #if HAVE_WCTYPE_H
-            # include <wctype.h>
-            #endif
-            wctype_t a;
-          ]],
-          [[]])],
-       [gl_cv_type_wctype_t=yes],
-       [gl_cv_type_wctype_t=no])
-    ])
-  if test $gl_cv_type_wctype_t = no; then
-    HAVE_WCTYPE_T=0
+    REPLACE_ISWCNTRL=0
   fi
-
-  dnl We assume that the wctrans() and towctrans() functions exist if and only
-  dnl if the type wctrans_t is defined in <wctype.h>.
-  AC_CACHE_CHECK([for wctrans_t], [gl_cv_type_wctrans_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
-               included before <wchar.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 <stdio.h>
-            #include <time.h>
-            #include <wchar.h>
-            #include <wctype.h>
-            wctrans_t a;
-          ]],
-          [[]])],
-       [gl_cv_type_wctrans_t=yes],
-       [gl_cv_type_wctrans_t=no])
-    ])
-  if test $gl_cv_type_wctrans_t = no; then
-    HAVE_WCTRANS_T=0
-  fi
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
-    ]],
-    [wctype iswctype wctrans towctrans
-    ])
-])
-
-AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_WCTYPE_H_DEFAULTS],
-[
-  GNULIB_ISWBLANK=0;    AC_SUBST([GNULIB_ISWBLANK])
-  GNULIB_WCTYPE=0;      AC_SUBST([GNULIB_WCTYPE])
-  GNULIB_ISWCTYPE=0;    AC_SUBST([GNULIB_ISWCTYPE])
-  GNULIB_WCTRANS=0;     AC_SUBST([GNULIB_WCTRANS])
-  GNULIB_TOWCTRANS=0;   AC_SUBST([GNULIB_TOWCTRANS])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_ISWBLANK=1;      AC_SUBST([HAVE_ISWBLANK])
-  HAVE_WCTYPE_T=1;      AC_SUBST([HAVE_WCTYPE_T])
-  HAVE_WCTRANS_T=1;     AC_SUBST([HAVE_WCTRANS_T])
-  REPLACE_ISWBLANK=0;   AC_SUBST([REPLACE_ISWBLANK])
+  AC_SUBST([REPLACE_ISWCNTRL])
 ])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/wcwidth.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/wcwidth.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/wcwidth.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/wcwidth.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# wcwidth.m4 serial 16
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,7 @@
   AC_CHECK_HEADERS_ONCE([wchar.h])
   AC_CHECK_FUNCS_ONCE([wcwidth])
 
-  AC_CHECK_DECLS([wcwidth], [], [], [[
+  AC_CHECK_DECLS([wcwidth], [], [], [
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
 #include <string.h>
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -29,22 +29,19 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-]])
+])
   if test $ac_cv_have_decl_wcwidth != yes; then
     HAVE_DECL_WCWIDTH=0
   fi
 
   if test $ac_cv_func_wcwidth = yes; then
-    HAVE_WCWIDTH=1
-    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 MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
       [
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+        AC_TRY_RUN([
 #include <locale.h>
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
 #include <string.h>
@@ -65,26 +62,17 @@
 #endif
 int main ()
 {
-  int result = 0;
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    {
-      if (wcwidth (0x0301) > 0)
-        result |= 1;
-      if (wcwidth (0x05B0) > 0)
-        result |= 2;
-      if (wcwidth (0x200B) > 0)
-        result |= 4;
-    }
-  return result;
-}]])],
-          [gl_cv_func_wcwidth_works=yes],
-          [gl_cv_func_wcwidth_works=no],
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
+}], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
           [
 changequote(,)dnl
            case "$host_os" in
-                     # Guess yes on glibc and AIX 7 systems.
-             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-             *)                  gl_cv_func_wcwidth_works="guessing no";;
+                     # Guess yes on glibc systems.
+             *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)      gl_cv_func_wcwidth_works="guessing no";;
            esac
 changequote([,])dnl
           ])
@@ -93,8 +81,13 @@
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  else
-    HAVE_WCWIDTH=0
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
+    gl_REPLACE_WCHAR_H
   fi
   dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
   dnl have the wcwidth function, then it does not declare it.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/write.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/write.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/write.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/write.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
-# write.m4 serial 5
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# write.m4 serial 1
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,10 +7,6 @@
 AC_DEFUN([gl_FUNC_WRITE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    REPLACE_WRITE=1
-  fi
   dnl This ifdef is just an optimization, to avoid performing a configure
   dnl check whose result is not used. It does not make the test of
   dnl GNULIB_UNISTD_H_SIGPIPE or GNULIB_SIGPIPE redundant.
@@ -18,15 +14,7 @@
     gl_SIGNAL_SIGPIPE
     if test $gl_cv_header_signal_h_SIGPIPE != yes; then
       REPLACE_WRITE=1
-    fi
-  ])
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_WRITE=1
+      AC_LIBOBJ([write])
     fi
   ])
 ])
-
-# Prerequisites of lib/write.c.
-AC_DEFUN([gl_PREREQ_WRITE], [:])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/xvasprintf.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/xvasprintf.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/xvasprintf.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/xvasprintf.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,8 +1,11 @@
-# xvasprintf.m4 serial 2
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+# xvasprintf.m4 serial 1
+dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free 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 Prerequisites of lib/xvasprintf.c.
-AC_DEFUN([gl_XVASPRINTF], [:])
+AC_DEFUN([gl_XVASPRINTF],
+[
+  dnl Prerequisites of lib/xvasprintf.c.
+  AC_REQUIRE([AC_C_INLINE])
+])
diff -Nru gettext-0.19.3/gettext-tools/gnulib-m4/yield.m4 gettext-0.18.1.1/gettext-tools/gnulib-m4/yield.m4
--- gettext-0.19.3/gettext-tools/gnulib-m4/yield.m4	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-m4/yield.m4	2010-05-24 10:42:21.000000000 +0000
@@ -1,5 +1,5 @@
 # yield.m4 serial 2
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/btowc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/btowc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/btowc.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/btowc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-   This 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>
-
-/* Specification.  */
-#include <wchar.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-wint_t
-btowc (int c)
-{
-  if (c != EOF)
-    {
-      char buf[1];
-      wchar_t wc;
-
-      buf[0] = c;
-      if (mbtowc (&wc, buf, 1) >= 0)
-        return wc;
-    }
-  return WEOF;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/ChangeLog gettext-0.18.1.1/gettext-tools/gnulib-tests/ChangeLog
--- gettext-0.19.3/gettext-tools/gnulib-tests/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,11 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/dup.c gettext-0.18.1.1/gettext-tools/gnulib-tests/dup.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/dup.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/dup.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/* Duplicate an open file descriptor.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <unistd.h>
-
-#include <errno.h>
-
-#include "msvc-inval.h"
-
-#undef dup
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-dup_nothrow (int fd)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = dup (fd);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#else
-# define dup_nothrow dup
-#endif
-
-int
-rpl_dup (int fd)
-{
-  int result = dup_nothrow (fd);
-#if REPLACE_FCHDIR
-  if (result >= 0)
-    result = _gl_register_dup (fd, result);
-#endif
-  return result;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/fdopen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/fdopen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/fdopen.c	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/fdopen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* Open a stream with a given file descriptor.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <errno.h>
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-# include "msvc-inval.h"
-#endif
-
-#undef fdopen
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static FILE *
-fdopen_nothrow (int fd, const char *mode)
-{
-  FILE *result;
-
-  TRY_MSVC_INVAL
-    {
-      result = fdopen (fd, mode);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = NULL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#else
-# define fdopen_nothrow fdopen
-#endif
-
-FILE *
-rpl_fdopen (int fd, const char *mode)
-{
-  int saved_errno = errno;
-  FILE *fp;
-
-  errno = 0;
-  fp = fdopen_nothrow (fd, mode);
-  if (fp == NULL)
-    {
-      if (errno == 0)
-        errno = EBADF;
-    }
-  else
-    errno = saved_errno;
-
-  return fp;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/fpucw.h gettext-0.18.1.1/gettext-tools/gnulib-tests/fpucw.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/fpucw.h	2014-10-16 06:00:36.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/fpucw.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* Manipulating the FPU control word.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2007.
-
-   This 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 _FPUCW_H
-#define _FPUCW_H
-
-/* The i386 floating point hardware (the 387 compatible FPU, not the modern
-   SSE/SSE2 hardware) has a controllable rounding precision.  It is specified
-   through the 'PC' bits in the FPU control word ('fctrl' register).  (See
-   the GNU libc i386 <fpu_control.h> header for details.)
-
-   On some platforms, such as Linux or Solaris, the default precision setting
-   is set to "extended precision".  This means that 'long double' instructions
-   operate correctly, but 'double' computations often produce slightly
-   different results as on strictly IEEE 754 conforming systems.
-
-   On some platforms, such as NetBSD, the default precision is set to
-   "double precision".  This means that 'long double' instructions will operate
-   only as 'double', i.e. lead to wrong results.  Similarly on FreeBSD 6.4, at
-   least for the division of 'long double' numbers.
-
-   The FPU control word is under control of the application, i.e. it is
-   not required to be set either way by the ABI.  (In fact, the i386 ABI
-   http://refspecs.freestandards.org/elf/abi386-4.pdf page 3-12 = page 38
-   is not clear about it.  But in any case, gcc treats the control word
-   like a "preserved" register: it emits code that assumes that the control
-   word is preserved across calls, and it restores the control word at the
-   end of functions that modify it.)
-
-   See Vincent Lefèvre's page http://www.vinc17.org/research/extended.en.html
-   for a good explanation.
-   See http://www.uwsg.iu.edu/hypermail/linux/kernel/0103.0/0453.html for
-   some argumentation which setting should be the default.  */
-
-/* This header file provides the following facilities:
-     fpucw_t                        integral type holding the value of 'fctrl'
-     FPU_PC_MASK                    bit mask denoting the precision control
-     FPU_PC_DOUBLE                  precision control for 53 bits mantissa
-     FPU_PC_EXTENDED                precision control for 64 bits mantissa
-     GET_FPUCW ()                   yields the current FPU control word
-     SET_FPUCW (word)               sets the FPU control word
-     DECL_LONG_DOUBLE_ROUNDING      variable declaration for
-                                    BEGIN/END_LONG_DOUBLE_ROUNDING
-     BEGIN_LONG_DOUBLE_ROUNDING ()  starts a sequence of instructions with
-                                    'long double' safe operation precision
-     END_LONG_DOUBLE_ROUNDING ()    ends a sequence of instructions with
-                                    'long double' safe operation precision
- */
-
-/* Inline assembler like this works only with GNU C.  */
-#if (defined __i386__ || defined __x86_64__) && defined __GNUC__
-
-typedef unsigned short fpucw_t; /* glibc calls this fpu_control_t */
-
-# define FPU_PC_MASK 0x0300
-# define FPU_PC_DOUBLE 0x200    /* glibc calls this _FPU_DOUBLE */
-# define FPU_PC_EXTENDED 0x300  /* glibc calls this _FPU_EXTENDED */
-
-# define GET_FPUCW() \
-  ({ fpucw_t _cw;                                               \
-     __asm__ __volatile__ ("fnstcw %0" : "=m" (*&_cw));         \
-     _cw;                                                       \
-   })
-# define SET_FPUCW(word) \
-  (void)({ fpucw_t _ncw = (word);                               \
-           __asm__ __volatile__ ("fldcw %0" : : "m" (*&_ncw));  \
-         })
-
-# define DECL_LONG_DOUBLE_ROUNDING \
-  fpucw_t oldcw;
-# define BEGIN_LONG_DOUBLE_ROUNDING() \
-  (void)(oldcw = GET_FPUCW (),                                  \
-         SET_FPUCW ((oldcw & ~FPU_PC_MASK) | FPU_PC_EXTENDED))
-# define END_LONG_DOUBLE_ROUNDING() \
-  SET_FPUCW (oldcw)
-
-#else
-
-typedef unsigned int fpucw_t;
-
-# define FPU_PC_MASK 0
-# define FPU_PC_DOUBLE 0
-# define FPU_PC_EXTENDED 0
-
-# define GET_FPUCW() 0
-# define SET_FPUCW(word) (void)(word)
-
-# define DECL_LONG_DOUBLE_ROUNDING
-# define BEGIN_LONG_DOUBLE_ROUNDING()
-# define END_LONG_DOUBLE_ROUNDING()
-
-#endif
-
-#endif /* _FPUCW_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/ftell.c gettext-0.18.1.1/gettext-tools/gnulib-tests/ftell.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/ftell.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/ftell.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* An ftell() function that works around platform bugs.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <errno.h>
-#include <limits.h>
-
-long
-ftell (FILE *fp)
-{
-  /* Use the replacement ftello function with all its workarounds.  */
-  off_t offset = ftello (fp);
-  if (LONG_MIN <= offset && offset <= LONG_MAX)
-    return /* (long) */ offset;
-  else
-    {
-      errno = EOVERFLOW;
-      return -1;
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/ftello.c gettext-0.18.1.1/gettext-tools/gnulib-tests/ftello.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/ftello.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/ftello.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/* An ftello() function that works around platform bugs.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <stdio.h>
-
-/* Get lseek.  */
-#include <unistd.h>
-
-#include "stdio-impl.h"
-
-off_t
-ftello (FILE *fp)
-#undef ftello
-#if !HAVE_FTELLO
-# undef ftell
-# define ftello ftell
-#endif
-#if _GL_WINDOWS_64_BIT_OFF_T
-# undef ftello
-# if HAVE__FTELLI64 /* msvc, mingw64 */
-#  define ftello _ftelli64
-# else /* mingw */
-#  define ftello ftello64
-# endif
-#endif
-{
-#if LSEEK_PIPE_BROKEN
-  /* mingw gives bogus answers rather than failure on non-seekable files.  */
-  if (lseek (fileno (fp), 0, SEEK_CUR) == -1)
-    return -1;
-#endif
-
-#if FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE /* Solaris */
-  /* The Solaris stdio leaves the _IOREAD flag set after reading from a file
-     reaches EOF and the program then starts writing to the file.  ftello
-     gets confused by this.  */
-  if (fp_->_flag & _IOWRT)
-    {
-      off_t pos;
-
-      /* Call ftello nevertheless, for the side effects that it does on fp.  */
-      ftello (fp);
-
-      /* Compute the file position ourselves.  */
-      pos = lseek (fileno (fp), (off_t) 0, SEEK_CUR);
-      if (pos >= 0)
-        {
-          if ((fp_->_flag & _IONBF) == 0 && fp_->_base != NULL)
-            pos += fp_->_ptr - fp_->_base;
-        }
-      return pos;
-    }
-#endif
-
-#if defined __SL64 && defined __SCLE /* Cygwin */
-  if ((fp->_flags & __SL64) == 0)
-    {
-      /* Cygwin 1.5.0 through 1.5.24 failed to open stdin in 64-bit
-         mode; but has an ftello that requires 64-bit mode.  */
-      FILE *tmp = fopen ("/dev/null", "r");
-      if (!tmp)
-        return -1;
-      fp->_flags |= __SL64;
-      fp->_seek64 = tmp->_seek64;
-      fclose (tmp);
-    }
-#endif
-  return ftello (fp);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/getcwd-lgpl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/getcwd-lgpl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/getcwd-lgpl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/getcwd-lgpl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/* Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   This file is part of gnulib.
-
-   This 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>
-
-/* Specification */
-#include <unistd.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if GNULIB_GETCWD
-/* Favor GPL getcwd.c if both getcwd and getcwd-lgpl modules are in use.  */
-typedef int dummy;
-#else
-
-/* Get the name of the current working directory, and put it in SIZE
-   bytes of BUF.  Returns NULL if the directory couldn't be determined
-   (perhaps because the absolute name was longer than PATH_MAX, or
-   because of missing read/search permissions on parent directories)
-   or SIZE was too small.  If successful, returns BUF.  If BUF is
-   NULL, an array is allocated with 'malloc'; the array is SIZE bytes
-   long, unless SIZE == 0, in which case it is as big as
-   necessary.  */
-
-# undef getcwd
-char *
-rpl_getcwd (char *buf, size_t size)
-{
-  char *ptr;
-  char *result;
-
-  /* Handle single size operations.  */
-  if (buf)
-    {
-      if (!size)
-        {
-          errno = EINVAL;
-          return NULL;
-        }
-      return getcwd (buf, size);
-    }
-
-  if (size)
-    {
-      buf = malloc (size);
-      if (!buf)
-        {
-          errno = ENOMEM;
-          return NULL;
-        }
-      result = getcwd (buf, size);
-      if (!result)
-        {
-          int saved_errno = errno;
-          free (buf);
-          errno = saved_errno;
-        }
-      return result;
-    }
-
-  /* Flexible sizing requested.  Avoid over-allocation for the common
-     case of a name that fits within a 4k page, minus some space for
-     local variables, to be sure we don't skip over a guard page.  */
-  {
-    char tmp[4032];
-    size = sizeof tmp;
-    ptr = getcwd (tmp, size);
-    if (ptr)
-      {
-        result = strdup (ptr);
-        if (!result)
-          errno = ENOMEM;
-        return result;
-      }
-    if (errno != ERANGE)
-      return NULL;
-  }
-
-  /* My what a large directory name we have.  */
-  do
-    {
-      size <<= 1;
-      ptr = realloc (buf, size);
-      if (ptr == NULL)
-        {
-          free (buf);
-          errno = ENOMEM;
-          return NULL;
-        }
-      buf = ptr;
-      result = getcwd (buf, size);
-    }
-  while (!result && errno == ERANGE);
-
-  if (!result)
-    {
-      int saved_errno = errno;
-      free (buf);
-      errno = saved_errno;
-    }
-  else
-    {
-      /* Trim to fit, if possible.  */
-      result = realloc (buf, strlen (buf) + 1);
-      if (!result)
-        result = buf;
-    }
-  return result;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/getpagesize.c gettext-0.18.1.1/gettext-tools/gnulib-tests/getpagesize.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/getpagesize.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/getpagesize.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,6 +1,6 @@
 /* getpagesize emulation for systems where it cannot be done in a C macro.
 
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 /* Specification. */
 #include <unistd.h>
 
-/* This implementation is only for native Windows systems.  */
+/* This implementation is only for native Win32 systems.  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
 # define WIN32_LEAN_AND_MEAN
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/glthread/thread.c gettext-0.18.1.1/gettext-tools/gnulib-tests/glthread/thread.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/glthread/thread.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/glthread/thread.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -21,7 +22,6 @@
 #include <config.h>
 
 /* Specification.  */
-# define _GLTHREAD_THREAD_INLINE _GL_EXTERN_INLINE
 #include "glthread/thread.h"
 
 #include <stdlib.h>
@@ -29,21 +29,7 @@
 
 /* ========================================================================= */
 
-#if USE_POSIX_THREADS
-
-#include <pthread.h>
-
-#ifdef PTW32_VERSION
-
-const gl_thread_t gl_null_thread /* = { .p = NULL } */;
-
-#endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
 #include <process.h>
 
@@ -86,7 +72,7 @@
 };
 
 /* Return a real HANDLE object for the current thread.  */
-static HANDLE
+static inline HANDLE
 get_current_thread_handle (void)
 {
   HANDLE this_handle;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/glthread/thread.h gettext-0.18.1.1/gettext-tools/gnulib-tests/glthread/thread.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/glthread/thread.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/glthread/thread.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -46,13 +47,9 @@
        current = gl_thread_self ();
        extern gl_thread_t gl_thread_self (void);
 
-   Getting a reference to the current thread as a pointer, for debugging:
-       ptr = gl_thread_self_pointer ();
-       extern void * gl_thread_self_pointer (void);
-
    Terminating the current thread:
        gl_thread_exit (return_value);
-       extern _Noreturn void gl_thread_exit (void *return_value);
+       extern void gl_thread_exit (void *return_value) __attribute__ ((noreturn));
 
    Requesting custom code to be executed at fork() time(not supported on all
    platforms):
@@ -74,14 +71,6 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GLTHREAD_THREAD_INLINE
-# define _GLTHREAD_THREAD_INLINE _GL_INLINE
-#endif
-
 /* ========================================================================= */
 
 #if USE_POSIX_THREADS
@@ -123,13 +112,7 @@
    address of a function in libpthread that we don't use.  */
 
 #  pragma weak pthread_create
-
-#  ifdef __clang__
-  /* Without this, clang complains that pthread_sigmask is never declared.  */
-#   include <signal.h>
-#  endif
 #  pragma weak pthread_sigmask
-
 #  pragma weak pthread_join
 #  ifndef pthread_self
 #   pragma weak pthread_self
@@ -164,20 +147,8 @@
     (pthread_in_use () ? pthread_sigmask (HOW, SET, OSET) : 0)
 # define glthread_join(THREAD, RETVALP) \
     (pthread_in_use () ? pthread_join (THREAD, RETVALP) : 0)
-# ifdef PTW32_VERSION
-   /* In pthreads-win32, pthread_t is a struct with a pointer field 'p' and
-      other fields.  */
-#  define gl_thread_self() \
-     (pthread_in_use () ? pthread_self () : gl_null_thread)
-#  define gl_thread_self_pointer() \
-     (pthread_in_use () ? pthread_self ().p : NULL)
-extern const gl_thread_t gl_null_thread;
-# else
-#  define gl_thread_self() \
-     (pthread_in_use () ? pthread_self () : (pthread_t) NULL)
-#  define gl_thread_self_pointer() \
-     (pthread_in_use () ? (void *) pthread_self () : NULL)
-# endif
+# define gl_thread_self() \
+    (pthread_in_use () ? (void *) pthread_self () : NULL)
 # define gl_thread_exit(RETVAL) \
     (pthread_in_use () ? pthread_exit (RETVAL) : 0)
 
@@ -234,9 +205,7 @@
 # define glthread_join(THREAD, RETVALP) \
     (pth_in_use () && !pth_join (THREAD, RETVALP) ? errno : 0)
 # define gl_thread_self() \
-    (pth_in_use () ? (void *) pth_self () : NULL)
-# define gl_thread_self_pointer() \
-    gl_thread_self ()
+    (pth_in_use () ? (void *) pth_self () : 0)
 # define gl_thread_exit(RETVAL) \
     (pth_in_use () ? pth_exit (RETVAL) : 0)
 # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0
@@ -288,9 +257,7 @@
 # define glthread_join(THREAD, RETVALP) \
     (thread_in_use () ? thr_join (THREAD, NULL, RETVALP) : 0)
 # define gl_thread_self() \
-    (thread_in_use () ? (void *) thr_self () : NULL)
-# define gl_thread_self_pointer() \
-    gl_thread_self ()
+    (thread_in_use () ? (void *) thr_self () : 0)
 # define gl_thread_exit(RETVAL) \
     (thread_in_use () ? thr_exit (RETVAL) : 0)
 # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0
@@ -303,9 +270,8 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 # ifdef __cplusplus
@@ -332,8 +298,6 @@
     glthread_join_func (THREAD, RETVALP)
 # define gl_thread_self() \
     gl_thread_self_func ()
-# define gl_thread_self_pointer() \
-    gl_thread_self ()
 # define gl_thread_exit(RETVAL) \
     gl_thread_exit_func (RETVAL)
 # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0
@@ -350,7 +314,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
@@ -358,9 +322,7 @@
 # define glthread_create(THREADP, FUNC, ARG) ENOSYS
 # define glthread_sigmask(HOW, SET, OSET) 0
 # define glthread_join(THREAD, RETVALP) 0
-# define gl_thread_self() 0
-# define gl_thread_self_pointer() \
-    ((void *) gl_thread_self ())
+# define gl_thread_self() NULL
 # define gl_thread_exit(RETVAL) 0
 # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0
 
@@ -374,7 +336,7 @@
 extern "C" {
 #endif
 
-_GLTHREAD_THREAD_INLINE gl_thread_t
+static inline gl_thread_t
 gl_thread_create (void *(*func) (void *arg), void *arg)
 {
   gl_thread_t thread;
@@ -411,6 +373,4 @@
 }
 #endif
 
-_GL_INLINE_HEADER_END
-
 #endif /* _GLTHREAD_THREAD_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/glthread/yield.h gettext-0.18.1.1/gettext-tools/gnulib-tests/glthread/yield.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/glthread/yield.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/glthread/yield.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Yielding the processor to other threads and processes.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file contains a primitive for yielding the processor to other threads.
      extern void gl_thread_yield (void);
@@ -88,9 +89,8 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 # ifdef __cplusplus
@@ -108,7 +108,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/ignore-value.h gettext-0.18.1.1/gettext-tools/gnulib-tests/ignore-value.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/ignore-value.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/ignore-value.h	2010-02-16 21:32:26.000000000 +0000
@@ -0,0 +1,37 @@
+/* ignore a function return without a compiler warning
+
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
+
+   This 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.  */
+
+/* Use these functions to avoid a warning when using a function declared with
+   gcc's warn_unused_result attribute, but for which you really do want to
+   ignore the result.  Traditionally, people have used a "(void)" cast to
+   indicate that a function's return value is deliberately unused.  However,
+   if the function is declared with __attribute__((warn_unused_result)),
+   gcc issues a warning even with the cast.
+
+   Caution: most of the time, you really should heed gcc's warning, and
+   check the return value.  However, in those exceptional cases in which
+   you're sure you know what you're doing, use this function.
+
+   For the record, here's one of the ignorable warnings:
+   "copy.c:233: warning: ignoring return value of 'fchown',
+   declared with attribute warn_unused_result".  */
+
+static inline void ignore_value (int i) { (void) i; }
+static inline void ignore_ptr (void* p) { (void) p; }
+/* FIXME: what about aggregate types? */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/init.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/init.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/init.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/init.sh	2010-05-24 10:42:21.000000000 +0000
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -57,55 +57,6 @@
 #   4. Finally
 #   $ exit
 
-ME_=`expr "./$0" : '.*/\(.*\)$'`
-
-# We use a trap below for cleanup.  This requires us to go through
-# hoops to get the right exit status transported through the handler.
-# So use 'Exit STATUS' instead of 'exit STATUS' inside of the tests.
-# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
-# sh inside this function.
-Exit () { set +e; (exit $1); exit $1; }
-
-# Print warnings (e.g., about skipped and failed tests) to this file number.
-# Override by defining to say, 9, in init.cfg, and putting say,
-#   export ...ENVVAR_SETTINGS...; $(SHELL) 9>&2
-# in the definition of TESTS_ENVIRONMENT in your tests/Makefile.am file.
-# This is useful when using automake's parallel tests mode, to print
-# the reason for skip/failure to console, rather than to the .log files.
-: ${stderr_fileno_=2}
-
-# Note that correct expansion of "$*" depends on IFS starting with ' '.
-# Always write the full diagnostic to stderr.
-# When stderr_fileno_ is not 2, also emit the first line of the
-# diagnostic to that file descriptor.
-warn_ ()
-{
-  # If IFS does not start with ' ', set it and emit the warning in a subshell.
-  case $IFS in
-    ' '*) printf '%s\n' "$*" >&2
-          test $stderr_fileno_ = 2 \
-            || { printf '%s\n' "$*" | sed 1q >&$stderr_fileno_ ; } ;;
-    *) (IFS=' '; warn_ "$@");;
-  esac
-}
-fail_ () { warn_ "$ME_: failed test: $@"; Exit 1; }
-skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; }
-fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; }
-framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; }
-
-# Sanitize this shell to POSIX mode, if possible.
-DUALCASE=1; export DUALCASE
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-    *posix*) set -o posix ;;
-  esac
-fi
-
 # We require $(...) support unconditionally.
 # We require a few additional shell features only when $EXEEXT is nonempty,
 # in order to support automatic $EXEEXT emulation:
@@ -117,225 +68,95 @@
 # shells until we find one that passes.  If one is found, re-exec it.
 # If no acceptable shell is found, skip the current test.
 #
-# The "...set -x; P=1 true 2>err..." test is to disqualify any shell that
-# emits "P=1" into err, as /bin/sh from SunOS 5.11 and OpenBSD 4.7 do.
-#
 # Use "9" to indicate success (rather than 0), in case some shell acts
 # like Solaris 10's /bin/sh but exits successfully instead of with status 2.
 
-# Eval this code in a subshell to determine a shell's suitability.
-# 10 - passes all tests; ok to use
-#  9 - ok, but enabling "set -x" corrupts app stderr; prefer higher score
-#  ? - not ok
 gl_shell_test_script_='
 test $(echo y) = y || exit 1
-score_=10
-if test "$VERBOSE" = yes; then
-  test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9
-fi
-test -z "$EXEEXT" && exit $score_
+test -z "$EXEEXT" && exit 9
 shopt -s expand_aliases
 alias a-b="echo zoo"
 v=abx
      test ${v%x} = ab \
   && test ${v#a} = bx \
   && test $(a-b) = zoo \
-  && exit $score_
+  && exit 9
 '
 
 if test "x$1" = "x--no-reexec"; then
   shift
 else
-  # Assume a working shell.  Export to subshells (setup_ needs this).
-  gl_set_x_corrupts_stderr_=false
-  export gl_set_x_corrupts_stderr_
-
-  # Record the first marginally acceptable shell.
-  marginal_=
-
-  # Search for a shell that meets our requirements.
-  for re_shell_ in __current__ "${CONFIG_SHELL:-no_shell}" \
-      /bin/sh bash dash zsh pdksh fail
-  do
-    test "$re_shell_" = no_shell && continue
-
-    # If we've made it all the way to the sentinel, "fail" without
-    # finding even a marginal shell, skip this test.
-    if test "$re_shell_" = fail; then
-      test -z "$marginal_" && skip_ failed to find an adequate shell
-      re_shell_=$marginal_
-      break
-    fi
-
-    # When testing the current shell, simply "eval" the test code.
-    # Otherwise, run it via $re_shell_ -c ...
-    if test "$re_shell_" = __current__; then
-      # 'eval'ing this code makes Solaris 10's /bin/sh exit with
-      # $? set to 2.  It does not evaluate any of the code after the
-      # "unexpected" first '('.  Thus, we must run it in a subshell.
-      ( eval "$gl_shell_test_script_" ) > /dev/null 2>&1
-    else
+  # 'eval'ing the above code makes Solaris 10's /bin/sh exit with $? set to 2.
+  # It does not evaluate any of the code after the "unexpected" `('.  Thus,
+  # we must run it in a subshell.
+  ( eval "$gl_shell_test_script_" ) > /dev/null 2>&1
+  if test $? = 9; then
+    : # The current shell is adequate.  No re-exec required.
+  else
+    # Search for a shell that meets our requirements.
+    for re_shell_ in "${CONFIG_SHELL:-no_shell}" /bin/sh bash dash zsh pdksh fail
+    do
+      test "$re_shell_" = no_shell && continue
+      test "$re_shell_" = fail && skip_ failed to find an adequate shell
       "$re_shell_" -c "$gl_shell_test_script_" 2>/dev/null
-    fi
-
-    st_=$?
-
-    # $re_shell_ works just fine.  Use it.
-    if test $st_ = 10; then
-      gl_set_x_corrupts_stderr_=false
-      break
-    fi
-
-    # If this is our first marginally acceptable shell, remember it.
-    if test "$st_:$marginal_" = 9: ; then
-      marginal_="$re_shell_"
-      gl_set_x_corrupts_stderr_=true
-    fi
-  done
-
-  if test "$re_shell_" != __current__; then
-    # Found a usable shell.  Preserve -v and -x.
-    case $- in
-      *v*x* | *x*v*) opts_=-vx ;;
-      *v*) opts_=-v ;;
-      *x*) opts_=-x ;;
-      *) opts_= ;;
-    esac
-    re_shell=$re_shell_
-    export re_shell
-    exec "$re_shell_" $opts_ "$0" --no-reexec "$@"
-    echo "$ME_: exec failed" 1>&2
-    exit 127
+      if test $? = 9; then
+        # Found an acceptable shell.
+        exec "$re_shell_" "$0" --no-reexec "$@"
+        echo "$ME_: exec failed" 1>&2
+        exit 127
+      fi
+    done
   fi
 fi
 
-# If this is bash, turn off all aliases.
-test -n "$BASH_VERSION" && unalias -a
-
-# Note that when supporting $EXEEXT (transparently mapping from PROG_NAME to
-# PROG_NAME.exe), we want to support hyphen-containing names like test-acos.
-# That is part of the shell-selection test above.  Why use aliases rather
-# than functions?  Because support for hyphen-containing aliases is more
-# widespread than that for hyphen-containing function names.
 test -n "$EXEEXT" && shopt -s expand_aliases
 
 # Enable glibc's malloc-perturbing option.
-# This is useful for exposing code that depends on the fact that
+# This is cheap and useful for exposing code that depends on the fact that
 # malloc-related functions often return memory that is mostly zeroed.
 # If you have the time and cycles, use valgrind to do an even better job.
 : ${MALLOC_PERTURB_=87}
 export MALLOC_PERTURB_
 
-# This is a stub function that is run upon trap (upon regular exit and
-# interrupt).  Override it with a per-test function, e.g., to unmount
-# a partition, or to undo any other global state changes.
-cleanup_ () { :; }
-
-# Emit a header similar to that from diff -u;  Print the simulated "diff"
-# command so that the order of arguments is clear.  Don't bother with @@ lines.
-emit_diff_u_header_ ()
-{
-  printf '%s\n' "diff -u $*" \
-    "--- $1	1970-01-01" \
-    "+++ $2	1970-01-01"
-}
-
-# Arrange not to let diff or cmp operate on /dev/null,
-# since on some systems (at least OSF/1 5.1), that doesn't work.
-# When there are not two arguments, or no argument is /dev/null, return 2.
-# When one argument is /dev/null and the other is not empty,
-# cat the nonempty file to stderr and return 1.
-# Otherwise, return 0.
-compare_dev_null_ ()
-{
-  test $# = 2 || return 2
+# We use a trap below for cleanup.  This requires us to go through
+# hoops to get the right exit status transported through the handler.
+# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
+# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
+# sh inside this function.
+Exit () { set +e; (exit $1); exit $1; }
 
-  if test "x$1" = x/dev/null; then
-    test -s "$2" || return 0
-    emit_diff_u_header_ "$@"; sed 's/^/+/' "$2"
-    return 1
-  fi
+# Print warnings (e.g., about skipped and failed tests) to this file number.
+# Override by defining to say, 9, in init.cfg, and putting say,
+# "export ...ENVVAR_SETTINGS...; exec 9>&2; $(SHELL)" in the definition
+# of TESTS_ENVIRONMENT in your tests/Makefile.am file.
+# This is useful when using automake's parallel tests mode, to print
+# the reason for skip/failure to console, rather than to the .log files.
+: ${stderr_fileno_=2}
 
-  if test "x$2" = x/dev/null; then
-    test -s "$1" || return 0
-    emit_diff_u_header_ "$@"; sed 's/^/-/' "$1"
-    return 1
-  fi
+warn_() { echo "$@" 1>&$stderr_fileno_; }
+fail_() { warn_ "$ME_: failed test: $@"; Exit 1; }
+skip_() { warn_ "$ME_: skipped test: $@"; Exit 77; }
+framework_failure_() { warn_ "$ME_: set-up failure: $@"; Exit 1; }
 
-  return 2
-}
+# This is a stub function that is run upon trap (upon regular exit and
+# interrupt).  Override it with a per-test function, e.g., to unmount
+# a partition, or to undo any other global state changes.
+cleanup_() { :; }
 
-if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
-   && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then
-  # diff accepts the -u option and does not (like AIX 7 'diff') produce an
-  # extra space on column 1 of every content line.
-  if test -z "$diff_out_"; then
-    compare_ () { diff -u "$@"; }
-  else
-    compare_ ()
-    {
-      if diff -u "$@" > diff.out; then
-        # No differences were found, but Solaris 'diff' produces output
-        # "No differences encountered". Hide this output.
-        rm -f diff.out
-        true
-      else
-        cat diff.out
-        rm -f diff.out
-        false
-      fi
-    }
-  fi
-elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
-  if test -z "$diff_out_"; then
-    compare_ () { diff -c "$@"; }
-  else
-    compare_ ()
-    {
-      if diff -c "$@" > 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.
-        rm -f diff.out
-        true
-      else
-        cat diff.out
-        rm -f diff.out
-        false
-      fi
-    }
-  fi
+if ( diff --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
+  compare() { diff -u "$@"; }
 elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
-  compare_ () { cmp -s "$@"; }
+  compare() { cmp -s "$@"; }
 else
-  compare_ () { cmp "$@"; }
+  compare() { cmp "$@"; }
 fi
 
-# Usage: compare EXPECTED ACTUAL
-#
-# Given compare_dev_null_'s preprocessing, defer to compare_ if 2 or more.
-# Otherwise, propagate $? to caller: any diffs have already been printed.
-compare ()
-{
-  # This looks like it can be factored to use a simple "case $?"
-  # after unchecked compare_dev_null_ invocation, but that would
-  # fail in a "set -e" environment.
-  if compare_dev_null_ "$@"; then
-    return 0
-  else
-    case $? in
-      1) return 1;;
-      *) compare_ "$@";;
-    esac
-  fi
-}
-
 # An arbitrary prefix to help distinguish test directories.
-testdir_prefix_ () { printf gt; }
+testdir_prefix_() { printf gt; }
 
 # Run the user-overridable cleanup_ function, remove the temporary
 # directory and exit with the incoming value of $?.
-remove_tmp_ ()
+remove_tmp_()
 {
   __st=$?
   cleanup_
@@ -351,21 +172,13 @@
 # contains only the specified bytes (see the case stmt below), then print
 # a space-separated list of those names and return 0.  Otherwise, don't
 # print anything and return 1.  Naming constraints apply also to DIR.
-find_exe_basenames_ ()
+find_exe_basenames_()
 {
   feb_dir_=$1
   feb_fail_=0
   feb_result_=
   feb_sp_=
   for feb_file_ in $feb_dir_/*.exe; do
-    # If there was no *.exe file, or there existed a file named "*.exe" that
-    # was deleted between the above glob expansion and the existence test
-    # below, just skip it.
-    test "x$feb_file_" = "x$feb_dir_/*.exe" && test ! -f "$feb_file_" \
-      && continue
-    # Exempt [.exe, since we can't create a function by that name, yet
-    # we can't invoke [ by PATH search anyways due to shell builtins.
-    test "x$feb_file_" = "x$feb_dir_/[.exe" && continue
     case $feb_file_ in
       *[!-a-zA-Z/0-9_.+]*) feb_fail_=1; break;;
       *) # Remove leading file name components as well as the .exe suffix.
@@ -383,8 +196,8 @@
 # For each file name of the form PROG.exe, create an alias named
 # PROG that simply invokes PROG.exe, then return 0.  If any selected
 # file name or the directory name, $1, contains an unexpected character,
-# define no alias and return 1.
-create_exe_shims_ ()
+# define no function and return 1.
+create_exe_shims_()
 {
   case $EXEEXT in
     '') return 0 ;;
@@ -393,7 +206,7 @@
   esac
 
   base_names_=`find_exe_basenames_ $1` \
-    || { echo "$0 (exe_shim): skipping directory: $1" 1>&2; return 0; }
+    || { echo "$0 (exe_shim): skipping directory: $1" 1>&2; return 1; }
 
   if test -n "$base_names_"; then
     for base_ in $base_names_; do
@@ -406,14 +219,15 @@
 
 # Use this function to prepend to PATH an absolute name for each
 # specified, possibly-$initial_cwd_-relative, directory.
-path_prepend_ ()
+path_prepend_()
 {
   while test $# != 0; do
     path_dir_=$1
     case $path_dir_ in
       '') fail_ "invalid path dir: '$1'";;
       /*) abs_path_dir_=$path_dir_;;
-      *) abs_path_dir_=$initial_cwd_/$path_dir_;;
+      *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \
+           || fail_ "invalid path dir: $path_dir_";;
     esac
     case $abs_path_dir_ in
       *:*) fail_ "invalid path dir: '$abs_path_dir_'";;
@@ -428,38 +242,21 @@
   export PATH
 }
 
-setup_ ()
+setup_()
 {
-  if test "$VERBOSE" = yes; then
-    # Test whether set -x may cause the selected shell to corrupt an
-    # application's stderr.  Many do, including zsh-4.3.10 and the /bin/sh
-    # from SunOS 5.11, OpenBSD 4.7 and Irix 5.x and 6.5.
-    # If enabling verbose output this way would cause trouble, simply
-    # issue a warning and refrain.
-    if $gl_set_x_corrupts_stderr_; then
-      warn_ "using SHELL=$SHELL with 'set -x' corrupts stderr"
-    else
-      set -x
-    fi
-  fi
+  test "$VERBOSE" = yes && set -x
 
   initial_cwd_=$PWD
-  fail=0
+  ME_=`expr "./$0" : '.*/\(.*\)$'`
 
   pfx_=`testdir_prefix_`
   test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
     || fail_ "failed to create temporary directory in $initial_cwd_"
-  cd "$test_dir_" || fail_ "failed to cd to temporary directory"
+  cd "$test_dir_"
 
-  # As autoconf-generated configure scripts do, ensure that IFS
-  # is defined initially, so that saving and restoring $IFS works.
-  gl_init_sh_nl_='
-'
-  IFS=" ""	$gl_init_sh_nl_"
-
-  # This trap statement, along with a trap on 0 below, ensure that the
-  # temporary directory, $test_dir_, is removed upon exit as well as
-  # upon receipt of any of the listed signals.
+  # These trap statements ensure that the temporary directory, $test_dir_,
+  # is removed upon exit as well as upon receipt of any of the listed signals.
+  trap remove_tmp_ 0
   for sig_ in 1 2 3 13 15; do
     eval "trap 'Exit $(expr $sig_ + 128)' $sig_"
   done
@@ -481,7 +278,7 @@
 #  - make only $MAX_TRIES_ attempts
 
 # Helper function.  Print $N pseudo-random bytes from a-zA-Z0-9.
-rand_bytes_ ()
+rand_bytes_()
 {
   n_=$1
 
@@ -513,11 +310,11 @@
     | LC_ALL=C tr -c $chars_ 01234567$chars_$chars_$chars_
 }
 
-mktempd_ ()
+mktempd_()
 {
   case $# in
   2);;
-  *) fail_ "Usage: mktempd_ DIR TEMPLATE";;
+  *) fail_ "Usage: $ME DIR TEMPLATE";;
   esac
 
   destdir_=$1
@@ -534,12 +331,13 @@
 
   case $template_ in
   *XXXX) ;;
-  *) fail_ \
-       "invalid template: $template_ (must have a suffix of at least 4 X's)";;
+  *) fail_ "invalid template: $template_ (must have a suffix of at least 4 X's)";;
   esac
 
+  fail=0
+
   # First, try to use mktemp.
-  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \
+  d=`unset TMPDIR; mktemp -d -t -p "$destdir_" "$template_" 2>/dev/null` \
     || fail=1
 
   # The resulting name must be in the specified directory.
@@ -586,6 +384,3 @@
   && . "$srcdir/init.cfg"
 
 setup_ "$@"
-# This trap is here, rather than in the setup_ function, because some
-# shells run the exit trap at shell function exit, rather than script exit.
-trap remove_tmp_ 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/inttypes.in.h gettext-0.18.1.1/gettext-tools/gnulib-tests/inttypes.in.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/inttypes.in.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/inttypes.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1140 +0,0 @@
-/* Copyright (C) 2006-2014 Free Software Foundation, Inc.
-   Written by Paul Eggert, Bruno Haible, Derek Price.
-   This file is part of gnulib.
-
-   This 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/>.  */
-
-/*
- * ISO C 99 <inttypes.h> for platforms that lack it.
- * <http://www.opengroup.org/susv3xbd/inttypes.h.html>
- */
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-/* Include the original <inttypes.h> if it exists, and if this file
-   has not been included yet or if this file includes gnulib stdint.h
-   which in turn includes this file.
-   The include_next requires a split double-inclusion guard.  */
-#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
-# if @HAVE_INTTYPES_H@
-
-   /* Some pre-C++11 <stdint.h> implementations need this.  */
-#  if defined __cplusplus && ! defined __STDC_FORMAT_MACROS
-#   define __STDC_FORMAT_MACROS 1
-#  endif
-
-#  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
-# endif
-#endif
-
-#if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
-#define INTTYPES_H
-
-/* Include <stdint.h> or the gnulib replacement.
-   But avoid namespace pollution on glibc systems.  */
-#ifndef __GLIBC__
-# include <stdint.h>
-#endif
-/* Get CHAR_BIT.  */
-#include <limits.h>
-
-#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX)
-# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>."
-#endif
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-/* 7.8.1 Macros for format specifiers */
-
-#if defined _TNS_R_TARGET
-   /* Tandem NonStop R series and compatible platforms released before
-      July 2005 support %Ld but not %lld.  */
-# define _LONG_LONG_FORMAT_PREFIX "L"
-#else
-# define _LONG_LONG_FORMAT_PREFIX "ll"
-#endif
-
-#if !defined PRId8 || @PRI_MACROS_BROKEN@
-# undef PRId8
-# ifdef INT8_MAX
-#  define PRId8 "d"
-# endif
-#endif
-#if !defined PRIi8 || @PRI_MACROS_BROKEN@
-# undef PRIi8
-# ifdef INT8_MAX
-#  define PRIi8 "i"
-# endif
-#endif
-#if !defined PRIo8 || @PRI_MACROS_BROKEN@
-# undef PRIo8
-# ifdef UINT8_MAX
-#  define PRIo8 "o"
-# endif
-#endif
-#if !defined PRIu8 || @PRI_MACROS_BROKEN@
-# undef PRIu8
-# ifdef UINT8_MAX
-#  define PRIu8 "u"
-# endif
-#endif
-#if !defined PRIx8 || @PRI_MACROS_BROKEN@
-# undef PRIx8
-# ifdef UINT8_MAX
-#  define PRIx8 "x"
-# endif
-#endif
-#if !defined PRIX8 || @PRI_MACROS_BROKEN@
-# undef PRIX8
-# ifdef UINT8_MAX
-#  define PRIX8 "X"
-# endif
-#endif
-#if !defined PRId16 || @PRI_MACROS_BROKEN@
-# undef PRId16
-# ifdef INT16_MAX
-#  define PRId16 "d"
-# endif
-#endif
-#if !defined PRIi16 || @PRI_MACROS_BROKEN@
-# undef PRIi16
-# ifdef INT16_MAX
-#  define PRIi16 "i"
-# endif
-#endif
-#if !defined PRIo16 || @PRI_MACROS_BROKEN@
-# undef PRIo16
-# ifdef UINT16_MAX
-#  define PRIo16 "o"
-# endif
-#endif
-#if !defined PRIu16 || @PRI_MACROS_BROKEN@
-# undef PRIu16
-# ifdef UINT16_MAX
-#  define PRIu16 "u"
-# endif
-#endif
-#if !defined PRIx16 || @PRI_MACROS_BROKEN@
-# undef PRIx16
-# ifdef UINT16_MAX
-#  define PRIx16 "x"
-# endif
-#endif
-#if !defined PRIX16 || @PRI_MACROS_BROKEN@
-# undef PRIX16
-# ifdef UINT16_MAX
-#  define PRIX16 "X"
-# endif
-#endif
-#if !defined PRId32 || @PRI_MACROS_BROKEN@
-# undef PRId32
-# ifdef INT32_MAX
-#  define PRId32 "d"
-# endif
-#endif
-#if !defined PRIi32 || @PRI_MACROS_BROKEN@
-# undef PRIi32
-# ifdef INT32_MAX
-#  define PRIi32 "i"
-# endif
-#endif
-#if !defined PRIo32 || @PRI_MACROS_BROKEN@
-# undef PRIo32
-# ifdef UINT32_MAX
-#  define PRIo32 "o"
-# endif
-#endif
-#if !defined PRIu32 || @PRI_MACROS_BROKEN@
-# undef PRIu32
-# ifdef UINT32_MAX
-#  define PRIu32 "u"
-# endif
-#endif
-#if !defined PRIx32 || @PRI_MACROS_BROKEN@
-# undef PRIx32
-# ifdef UINT32_MAX
-#  define PRIx32 "x"
-# endif
-#endif
-#if !defined PRIX32 || @PRI_MACROS_BROKEN@
-# undef PRIX32
-# ifdef UINT32_MAX
-#  define PRIX32 "X"
-# endif
-#endif
-#ifdef INT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
-#  define _PRI64_PREFIX "l"
-# elif defined _MSC_VER || defined __MINGW32__
-#  define _PRI64_PREFIX "I64"
-# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
-# endif
-# if !defined PRId64 || @PRI_MACROS_BROKEN@
-#  undef PRId64
-#  define PRId64 _PRI64_PREFIX "d"
-# endif
-# if !defined PRIi64 || @PRI_MACROS_BROKEN@
-#  undef PRIi64
-#  define PRIi64 _PRI64_PREFIX "i"
-# endif
-#endif
-#ifdef UINT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
-#  define _PRIu64_PREFIX "l"
-# elif defined _MSC_VER || defined __MINGW32__
-#  define _PRIu64_PREFIX "I64"
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
-# endif
-# if !defined PRIo64 || @PRI_MACROS_BROKEN@
-#  undef PRIo64
-#  define PRIo64 _PRIu64_PREFIX "o"
-# endif
-# if !defined PRIu64 || @PRI_MACROS_BROKEN@
-#  undef PRIu64
-#  define PRIu64 _PRIu64_PREFIX "u"
-# endif
-# if !defined PRIx64 || @PRI_MACROS_BROKEN@
-#  undef PRIx64
-#  define PRIx64 _PRIu64_PREFIX "x"
-# endif
-# if !defined PRIX64 || @PRI_MACROS_BROKEN@
-#  undef PRIX64
-#  define PRIX64 _PRIu64_PREFIX "X"
-# endif
-#endif
-
-#if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@
-# undef PRIdLEAST8
-# define PRIdLEAST8 "d"
-#endif
-#if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@
-# undef PRIiLEAST8
-# define PRIiLEAST8 "i"
-#endif
-#if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@
-# undef PRIoLEAST8
-# define PRIoLEAST8 "o"
-#endif
-#if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@
-# undef PRIuLEAST8
-# define PRIuLEAST8 "u"
-#endif
-#if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@
-# undef PRIxLEAST8
-# define PRIxLEAST8 "x"
-#endif
-#if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@
-# undef PRIXLEAST8
-# define PRIXLEAST8 "X"
-#endif
-#if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@
-# undef PRIdLEAST16
-# define PRIdLEAST16 "d"
-#endif
-#if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@
-# undef PRIiLEAST16
-# define PRIiLEAST16 "i"
-#endif
-#if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@
-# undef PRIoLEAST16
-# define PRIoLEAST16 "o"
-#endif
-#if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@
-# undef PRIuLEAST16
-# define PRIuLEAST16 "u"
-#endif
-#if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@
-# undef PRIxLEAST16
-# define PRIxLEAST16 "x"
-#endif
-#if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@
-# undef PRIXLEAST16
-# define PRIXLEAST16 "X"
-#endif
-#if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@
-# undef PRIdLEAST32
-# define PRIdLEAST32 "d"
-#endif
-#if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@
-# undef PRIiLEAST32
-# define PRIiLEAST32 "i"
-#endif
-#if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@
-# undef PRIoLEAST32
-# define PRIoLEAST32 "o"
-#endif
-#if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@
-# undef PRIuLEAST32
-# define PRIuLEAST32 "u"
-#endif
-#if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@
-# undef PRIxLEAST32
-# define PRIxLEAST32 "x"
-#endif
-#if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@
-# undef PRIXLEAST32
-# define PRIXLEAST32 "X"
-#endif
-#ifdef INT64_MAX
-# if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST64
-#  define PRIdLEAST64 PRId64
-# endif
-# if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST64
-#  define PRIiLEAST64 PRIi64
-# endif
-#endif
-#ifdef UINT64_MAX
-# if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST64
-#  define PRIoLEAST64 PRIo64
-# endif
-# if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST64
-#  define PRIuLEAST64 PRIu64
-# endif
-# if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST64
-#  define PRIxLEAST64 PRIx64
-# endif
-# if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST64
-#  define PRIXLEAST64 PRIX64
-# endif
-#endif
-
-#if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@
-# undef PRIdFAST8
-# if INT_FAST8_MAX > INT32_MAX
-#  define PRIdFAST8 PRId64
-# else
-#  define PRIdFAST8 "d"
-# endif
-#endif
-#if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@
-# undef PRIiFAST8
-# if INT_FAST8_MAX > INT32_MAX
-#  define PRIiFAST8 PRIi64
-# else
-#  define PRIiFAST8 "i"
-# endif
-#endif
-#if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@
-# undef PRIoFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define PRIoFAST8 PRIo64
-# else
-#  define PRIoFAST8 "o"
-# endif
-#endif
-#if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@
-# undef PRIuFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define PRIuFAST8 PRIu64
-# else
-#  define PRIuFAST8 "u"
-# endif
-#endif
-#if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@
-# undef PRIxFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define PRIxFAST8 PRIx64
-# else
-#  define PRIxFAST8 "x"
-# endif
-#endif
-#if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@
-# undef PRIXFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define PRIXFAST8 PRIX64
-# else
-#  define PRIXFAST8 "X"
-# endif
-#endif
-#if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@
-# undef PRIdFAST16
-# if INT_FAST16_MAX > INT32_MAX
-#  define PRIdFAST16 PRId64
-# else
-#  define PRIdFAST16 "d"
-# endif
-#endif
-#if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@
-# undef PRIiFAST16
-# if INT_FAST16_MAX > INT32_MAX
-#  define PRIiFAST16 PRIi64
-# else
-#  define PRIiFAST16 "i"
-# endif
-#endif
-#if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@
-# undef PRIoFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define PRIoFAST16 PRIo64
-# else
-#  define PRIoFAST16 "o"
-# endif
-#endif
-#if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@
-# undef PRIuFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define PRIuFAST16 PRIu64
-# else
-#  define PRIuFAST16 "u"
-# endif
-#endif
-#if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@
-# undef PRIxFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define PRIxFAST16 PRIx64
-# else
-#  define PRIxFAST16 "x"
-# endif
-#endif
-#if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@
-# undef PRIXFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define PRIXFAST16 PRIX64
-# else
-#  define PRIXFAST16 "X"
-# endif
-#endif
-#if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@
-# undef PRIdFAST32
-# if INT_FAST32_MAX > INT32_MAX
-#  define PRIdFAST32 PRId64
-# else
-#  define PRIdFAST32 "d"
-# endif
-#endif
-#if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@
-# undef PRIiFAST32
-# if INT_FAST32_MAX > INT32_MAX
-#  define PRIiFAST32 PRIi64
-# else
-#  define PRIiFAST32 "i"
-# endif
-#endif
-#if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@
-# undef PRIoFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define PRIoFAST32 PRIo64
-# else
-#  define PRIoFAST32 "o"
-# endif
-#endif
-#if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@
-# undef PRIuFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define PRIuFAST32 PRIu64
-# else
-#  define PRIuFAST32 "u"
-# endif
-#endif
-#if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@
-# undef PRIxFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define PRIxFAST32 PRIx64
-# else
-#  define PRIxFAST32 "x"
-# endif
-#endif
-#if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@
-# undef PRIXFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define PRIXFAST32 PRIX64
-# else
-#  define PRIXFAST32 "X"
-# endif
-#endif
-#ifdef INT64_MAX
-# if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST64
-#  define PRIdFAST64 PRId64
-# endif
-# if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST64
-#  define PRIiFAST64 PRIi64
-# endif
-#endif
-#ifdef UINT64_MAX
-# if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST64
-#  define PRIoFAST64 PRIo64
-# endif
-# if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST64
-#  define PRIuFAST64 PRIu64
-# endif
-# if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST64
-#  define PRIxFAST64 PRIx64
-# endif
-# if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST64
-#  define PRIXFAST64 PRIX64
-# endif
-#endif
-
-#if !defined PRIdMAX || @PRI_MACROS_BROKEN@
-# undef PRIdMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
-#  define PRIdMAX PRId64
-# else
-#  define PRIdMAX "ld"
-# endif
-#endif
-#if !defined PRIiMAX || @PRI_MACROS_BROKEN@
-# undef PRIiMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
-#  define PRIiMAX PRIi64
-# else
-#  define PRIiMAX "li"
-# endif
-#endif
-#if !defined PRIoMAX || @PRI_MACROS_BROKEN@
-# undef PRIoMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define PRIoMAX PRIo64
-# else
-#  define PRIoMAX "lo"
-# endif
-#endif
-#if !defined PRIuMAX || @PRI_MACROS_BROKEN@
-# undef PRIuMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define PRIuMAX PRIu64
-# else
-#  define PRIuMAX "lu"
-# endif
-#endif
-#if !defined PRIxMAX || @PRI_MACROS_BROKEN@
-# undef PRIxMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define PRIxMAX PRIx64
-# else
-#  define PRIxMAX "lx"
-# endif
-#endif
-#if !defined PRIXMAX || @PRI_MACROS_BROKEN@
-# undef PRIXMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define PRIXMAX PRIX64
-# else
-#  define PRIXMAX "lX"
-# endif
-#endif
-
-#if !defined PRIdPTR || @PRI_MACROS_BROKEN@
-# undef PRIdPTR
-# ifdef INTPTR_MAX
-#  define PRIdPTR @PRIPTR_PREFIX@ "d"
-# endif
-#endif
-#if !defined PRIiPTR || @PRI_MACROS_BROKEN@
-# undef PRIiPTR
-# ifdef INTPTR_MAX
-#  define PRIiPTR @PRIPTR_PREFIX@ "i"
-# endif
-#endif
-#if !defined PRIoPTR || @PRI_MACROS_BROKEN@
-# undef PRIoPTR
-# ifdef UINTPTR_MAX
-#  define PRIoPTR @PRIPTR_PREFIX@ "o"
-# endif
-#endif
-#if !defined PRIuPTR || @PRI_MACROS_BROKEN@
-# undef PRIuPTR
-# ifdef UINTPTR_MAX
-#  define PRIuPTR @PRIPTR_PREFIX@ "u"
-# endif
-#endif
-#if !defined PRIxPTR || @PRI_MACROS_BROKEN@
-# undef PRIxPTR
-# ifdef UINTPTR_MAX
-#  define PRIxPTR @PRIPTR_PREFIX@ "x"
-# endif
-#endif
-#if !defined PRIXPTR || @PRI_MACROS_BROKEN@
-# undef PRIXPTR
-# ifdef UINTPTR_MAX
-#  define PRIXPTR @PRIPTR_PREFIX@ "X"
-# endif
-#endif
-
-#if !defined SCNd8 || @PRI_MACROS_BROKEN@
-# undef SCNd8
-# ifdef INT8_MAX
-#  define SCNd8 "hhd"
-# endif
-#endif
-#if !defined SCNi8 || @PRI_MACROS_BROKEN@
-# undef SCNi8
-# ifdef INT8_MAX
-#  define SCNi8 "hhi"
-# endif
-#endif
-#if !defined SCNo8 || @PRI_MACROS_BROKEN@
-# undef SCNo8
-# ifdef UINT8_MAX
-#  define SCNo8 "hho"
-# endif
-#endif
-#if !defined SCNu8 || @PRI_MACROS_BROKEN@
-# undef SCNu8
-# ifdef UINT8_MAX
-#  define SCNu8 "hhu"
-# endif
-#endif
-#if !defined SCNx8 || @PRI_MACROS_BROKEN@
-# undef SCNx8
-# ifdef UINT8_MAX
-#  define SCNx8 "hhx"
-# endif
-#endif
-#if !defined SCNd16 || @PRI_MACROS_BROKEN@
-# undef SCNd16
-# ifdef INT16_MAX
-#  define SCNd16 "hd"
-# endif
-#endif
-#if !defined SCNi16 || @PRI_MACROS_BROKEN@
-# undef SCNi16
-# ifdef INT16_MAX
-#  define SCNi16 "hi"
-# endif
-#endif
-#if !defined SCNo16 || @PRI_MACROS_BROKEN@
-# undef SCNo16
-# ifdef UINT16_MAX
-#  define SCNo16 "ho"
-# endif
-#endif
-#if !defined SCNu16 || @PRI_MACROS_BROKEN@
-# undef SCNu16
-# ifdef UINT16_MAX
-#  define SCNu16 "hu"
-# endif
-#endif
-#if !defined SCNx16 || @PRI_MACROS_BROKEN@
-# undef SCNx16
-# ifdef UINT16_MAX
-#  define SCNx16 "hx"
-# endif
-#endif
-#if !defined SCNd32 || @PRI_MACROS_BROKEN@
-# undef SCNd32
-# ifdef INT32_MAX
-#  define SCNd32 "d"
-# endif
-#endif
-#if !defined SCNi32 || @PRI_MACROS_BROKEN@
-# undef SCNi32
-# ifdef INT32_MAX
-#  define SCNi32 "i"
-# endif
-#endif
-#if !defined SCNo32 || @PRI_MACROS_BROKEN@
-# undef SCNo32
-# ifdef UINT32_MAX
-#  define SCNo32 "o"
-# endif
-#endif
-#if !defined SCNu32 || @PRI_MACROS_BROKEN@
-# undef SCNu32
-# ifdef UINT32_MAX
-#  define SCNu32 "u"
-# endif
-#endif
-#if !defined SCNx32 || @PRI_MACROS_BROKEN@
-# undef SCNx32
-# ifdef UINT32_MAX
-#  define SCNx32 "x"
-# endif
-#endif
-#ifdef INT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
-#  define _SCN64_PREFIX "l"
-# elif defined _MSC_VER || defined __MINGW32__
-#  define _SCN64_PREFIX "I64"
-# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
-# endif
-# if !defined SCNd64 || @PRI_MACROS_BROKEN@
-#  undef SCNd64
-#  define SCNd64 _SCN64_PREFIX "d"
-# endif
-# if !defined SCNi64 || @PRI_MACROS_BROKEN@
-#  undef SCNi64
-#  define SCNi64 _SCN64_PREFIX "i"
-# endif
-#endif
-#ifdef UINT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
-#  define _SCNu64_PREFIX "l"
-# elif defined _MSC_VER || defined __MINGW32__
-#  define _SCNu64_PREFIX "I64"
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
-# endif
-# if !defined SCNo64 || @PRI_MACROS_BROKEN@
-#  undef SCNo64
-#  define SCNo64 _SCNu64_PREFIX "o"
-# endif
-# if !defined SCNu64 || @PRI_MACROS_BROKEN@
-#  undef SCNu64
-#  define SCNu64 _SCNu64_PREFIX "u"
-# endif
-# if !defined SCNx64 || @PRI_MACROS_BROKEN@
-#  undef SCNx64
-#  define SCNx64 _SCNu64_PREFIX "x"
-# endif
-#endif
-
-#if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@
-# undef SCNdLEAST8
-# define SCNdLEAST8 "hhd"
-#endif
-#if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@
-# undef SCNiLEAST8
-# define SCNiLEAST8 "hhi"
-#endif
-#if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@
-# undef SCNoLEAST8
-# define SCNoLEAST8 "hho"
-#endif
-#if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@
-# undef SCNuLEAST8
-# define SCNuLEAST8 "hhu"
-#endif
-#if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@
-# undef SCNxLEAST8
-# define SCNxLEAST8 "hhx"
-#endif
-#if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@
-# undef SCNdLEAST16
-# define SCNdLEAST16 "hd"
-#endif
-#if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@
-# undef SCNiLEAST16
-# define SCNiLEAST16 "hi"
-#endif
-#if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@
-# undef SCNoLEAST16
-# define SCNoLEAST16 "ho"
-#endif
-#if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@
-# undef SCNuLEAST16
-# define SCNuLEAST16 "hu"
-#endif
-#if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@
-# undef SCNxLEAST16
-# define SCNxLEAST16 "hx"
-#endif
-#if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@
-# undef SCNdLEAST32
-# define SCNdLEAST32 "d"
-#endif
-#if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@
-# undef SCNiLEAST32
-# define SCNiLEAST32 "i"
-#endif
-#if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@
-# undef SCNoLEAST32
-# define SCNoLEAST32 "o"
-#endif
-#if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@
-# undef SCNuLEAST32
-# define SCNuLEAST32 "u"
-#endif
-#if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@
-# undef SCNxLEAST32
-# define SCNxLEAST32 "x"
-#endif
-#ifdef INT64_MAX
-# if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST64
-#  define SCNdLEAST64 SCNd64
-# endif
-# if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST64
-#  define SCNiLEAST64 SCNi64
-# endif
-#endif
-#ifdef UINT64_MAX
-# if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST64
-#  define SCNoLEAST64 SCNo64
-# endif
-# if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST64
-#  define SCNuLEAST64 SCNu64
-# endif
-# if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST64
-#  define SCNxLEAST64 SCNx64
-# endif
-#endif
-
-#if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@
-# undef SCNdFAST8
-# if INT_FAST8_MAX > INT32_MAX
-#  define SCNdFAST8 SCNd64
-# elif INT_FAST8_MAX == 0x7fff
-#  define SCNdFAST8 "hd"
-# elif INT_FAST8_MAX == 0x7f
-#  define SCNdFAST8 "hhd"
-# else
-#  define SCNdFAST8 "d"
-# endif
-#endif
-#if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@
-# undef SCNiFAST8
-# if INT_FAST8_MAX > INT32_MAX
-#  define SCNiFAST8 SCNi64
-# elif INT_FAST8_MAX == 0x7fff
-#  define SCNiFAST8 "hi"
-# elif INT_FAST8_MAX == 0x7f
-#  define SCNiFAST8 "hhi"
-# else
-#  define SCNiFAST8 "i"
-# endif
-#endif
-#if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@
-# undef SCNoFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define SCNoFAST8 SCNo64
-# elif UINT_FAST8_MAX == 0xffff
-#  define SCNoFAST8 "ho"
-# elif UINT_FAST8_MAX == 0xff
-#  define SCNoFAST8 "hho"
-# else
-#  define SCNoFAST8 "o"
-# endif
-#endif
-#if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@
-# undef SCNuFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define SCNuFAST8 SCNu64
-# elif UINT_FAST8_MAX == 0xffff
-#  define SCNuFAST8 "hu"
-# elif UINT_FAST8_MAX == 0xff
-#  define SCNuFAST8 "hhu"
-# else
-#  define SCNuFAST8 "u"
-# endif
-#endif
-#if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@
-# undef SCNxFAST8
-# if UINT_FAST8_MAX > UINT32_MAX
-#  define SCNxFAST8 SCNx64
-# elif UINT_FAST8_MAX == 0xffff
-#  define SCNxFAST8 "hx"
-# elif UINT_FAST8_MAX == 0xff
-#  define SCNxFAST8 "hhx"
-# else
-#  define SCNxFAST8 "x"
-# endif
-#endif
-#if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@
-# undef SCNdFAST16
-# if INT_FAST16_MAX > INT32_MAX
-#  define SCNdFAST16 SCNd64
-# elif INT_FAST16_MAX == 0x7fff
-#  define SCNdFAST16 "hd"
-# else
-#  define SCNdFAST16 "d"
-# endif
-#endif
-#if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@
-# undef SCNiFAST16
-# if INT_FAST16_MAX > INT32_MAX
-#  define SCNiFAST16 SCNi64
-# elif INT_FAST16_MAX == 0x7fff
-#  define SCNiFAST16 "hi"
-# else
-#  define SCNiFAST16 "i"
-# endif
-#endif
-#if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@
-# undef SCNoFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define SCNoFAST16 SCNo64
-# elif UINT_FAST16_MAX == 0xffff
-#  define SCNoFAST16 "ho"
-# else
-#  define SCNoFAST16 "o"
-# endif
-#endif
-#if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@
-# undef SCNuFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define SCNuFAST16 SCNu64
-# elif UINT_FAST16_MAX == 0xffff
-#  define SCNuFAST16 "hu"
-# else
-#  define SCNuFAST16 "u"
-# endif
-#endif
-#if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@
-# undef SCNxFAST16
-# if UINT_FAST16_MAX > UINT32_MAX
-#  define SCNxFAST16 SCNx64
-# elif UINT_FAST16_MAX == 0xffff
-#  define SCNxFAST16 "hx"
-# else
-#  define SCNxFAST16 "x"
-# endif
-#endif
-#if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@
-# undef SCNdFAST32
-# if INT_FAST32_MAX > INT32_MAX
-#  define SCNdFAST32 SCNd64
-# else
-#  define SCNdFAST32 "d"
-# endif
-#endif
-#if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@
-# undef SCNiFAST32
-# if INT_FAST32_MAX > INT32_MAX
-#  define SCNiFAST32 SCNi64
-# else
-#  define SCNiFAST32 "i"
-# endif
-#endif
-#if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@
-# undef SCNoFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define SCNoFAST32 SCNo64
-# else
-#  define SCNoFAST32 "o"
-# endif
-#endif
-#if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@
-# undef SCNuFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define SCNuFAST32 SCNu64
-# else
-#  define SCNuFAST32 "u"
-# endif
-#endif
-#if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@
-# undef SCNxFAST32
-# if UINT_FAST32_MAX > UINT32_MAX
-#  define SCNxFAST32 SCNx64
-# else
-#  define SCNxFAST32 "x"
-# endif
-#endif
-#ifdef INT64_MAX
-# if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST64
-#  define SCNdFAST64 SCNd64
-# endif
-# if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST64
-#  define SCNiFAST64 SCNi64
-# endif
-#endif
-#ifdef UINT64_MAX
-# if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST64
-#  define SCNoFAST64 SCNo64
-# endif
-# if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST64
-#  define SCNuFAST64 SCNu64
-# endif
-# if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST64
-#  define SCNxFAST64 SCNx64
-# endif
-#endif
-
-#if !defined SCNdMAX || @PRI_MACROS_BROKEN@
-# undef SCNdMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
-#  define SCNdMAX SCNd64
-# else
-#  define SCNdMAX "ld"
-# endif
-#endif
-#if !defined SCNiMAX || @PRI_MACROS_BROKEN@
-# undef SCNiMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
-#  define SCNiMAX SCNi64
-# else
-#  define SCNiMAX "li"
-# endif
-#endif
-#if !defined SCNoMAX || @PRI_MACROS_BROKEN@
-# undef SCNoMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define SCNoMAX SCNo64
-# else
-#  define SCNoMAX "lo"
-# endif
-#endif
-#if !defined SCNuMAX || @PRI_MACROS_BROKEN@
-# undef SCNuMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define SCNuMAX SCNu64
-# else
-#  define SCNuMAX "lu"
-# endif
-#endif
-#if !defined SCNxMAX || @PRI_MACROS_BROKEN@
-# undef SCNxMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
-#  define SCNxMAX SCNx64
-# else
-#  define SCNxMAX "lx"
-# endif
-#endif
-
-#if !defined SCNdPTR || @PRI_MACROS_BROKEN@
-# undef SCNdPTR
-# ifdef INTPTR_MAX
-#  define SCNdPTR @PRIPTR_PREFIX@ "d"
-# endif
-#endif
-#if !defined SCNiPTR || @PRI_MACROS_BROKEN@
-# undef SCNiPTR
-# ifdef INTPTR_MAX
-#  define SCNiPTR @PRIPTR_PREFIX@ "i"
-# endif
-#endif
-#if !defined SCNoPTR || @PRI_MACROS_BROKEN@
-# undef SCNoPTR
-# ifdef UINTPTR_MAX
-#  define SCNoPTR @PRIPTR_PREFIX@ "o"
-# endif
-#endif
-#if !defined SCNuPTR || @PRI_MACROS_BROKEN@
-# undef SCNuPTR
-# ifdef UINTPTR_MAX
-#  define SCNuPTR @PRIPTR_PREFIX@ "u"
-# endif
-#endif
-#if !defined SCNxPTR || @PRI_MACROS_BROKEN@
-# undef SCNxPTR
-# ifdef UINTPTR_MAX
-#  define SCNxPTR @PRIPTR_PREFIX@ "x"
-# endif
-#endif
-
-/* 7.8.2 Functions for greatest-width integer types */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if @GNULIB_IMAXABS@
-# if !@HAVE_DECL_IMAXABS@
-extern intmax_t imaxabs (intmax_t);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef imaxabs
-# if HAVE_RAW_DECL_IMAXABS
-_GL_WARN_ON_USE (imaxabs, "imaxabs is unportable - "
-                 "use gnulib module imaxabs for portability");
-# endif
-#endif
-
-#if @GNULIB_IMAXDIV@
-# if !@HAVE_DECL_IMAXDIV@
-#  if !GNULIB_defined_imaxdiv_t
-typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t;
-#   define GNULIB_defined_imaxdiv_t 1
-#  endif
-extern imaxdiv_t imaxdiv (intmax_t, intmax_t);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef imaxdiv
-# if HAVE_RAW_DECL_IMAXDIV
-_GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - "
-                 "use gnulib module imaxdiv for portability");
-# endif
-#endif
-
-#if @GNULIB_STRTOIMAX@
-# if @REPLACE_STRTOIMAX@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef strtoimax
-#   define strtoimax rpl_strtoimax
-#  endif
-_GL_FUNCDECL_RPL (strtoimax, intmax_t,
-                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strtoimax, intmax_t, (const char *, char **, int));
-# else
-#  if !@HAVE_DECL_STRTOIMAX@
-#   undef strtoimax
-_GL_FUNCDECL_SYS (strtoimax, intmax_t,
-                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (strtoimax, intmax_t, (const char *, char **, int));
-# endif
-_GL_CXXALIASWARN (strtoimax);
-#elif defined GNULIB_POSIXCHECK
-# undef strtoimax
-# if HAVE_RAW_DECL_STRTOIMAX
-_GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
-                 "use gnulib module strtoimax for portability");
-# endif
-#endif
-
-#if @GNULIB_STRTOUMAX@
-# if @REPLACE_STRTOUMAX@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef strtoumax
-#   define strtoumax rpl_strtoumax
-#  endif
-_GL_FUNCDECL_RPL (strtoumax, uintmax_t,
-                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strtoumax, uintmax_t, (const char *, char **, int));
-# else
-#  if !@HAVE_DECL_STRTOUMAX@
-#   undef strtoumax
-_GL_FUNCDECL_SYS (strtoumax, uintmax_t,
-                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int));
-# endif
-_GL_CXXALIASWARN (strtoumax);
-#elif defined GNULIB_POSIXCHECK
-# undef strtoumax
-# if HAVE_RAW_DECL_STRTOUMAX
-_GL_WARN_ON_USE (strtoumax, "strtoumax is unportable - "
-                 "use gnulib module strtoumax for portability");
-# endif
-#endif
-
-/* Don't bother defining or declaring wcstoimax and wcstoumax, since
-   wide-character functions like this are hardly ever useful.  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined INTTYPES_H && !defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/lseek.c gettext-0.18.1.1/gettext-tools/gnulib-tests/lseek.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/lseek.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/lseek.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/* An lseek() function that detects pipes.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <unistd.h>
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Windows platforms.  */
-/* Get GetFileType.  */
-# include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
-#else
-# include <sys/stat.h>
-#endif
-#include <errno.h>
-
-#undef lseek
-
-off_t
-rpl_lseek (int fd, off_t offset, int whence)
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* mingw lseek mistakenly succeeds on pipes, sockets, and terminals.  */
-  HANDLE h = (HANDLE) _get_osfhandle (fd);
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      errno = EBADF;
-      return -1;
-    }
-  if (GetFileType (h) != FILE_TYPE_DISK)
-    {
-      errno = ESPIPE;
-      return -1;
-    }
-#else
-  /* BeOS lseek mistakenly succeeds on pipes...  */
-  struct stat statbuf;
-  if (fstat (fd, &statbuf) < 0)
-    return -1;
-  if (!S_ISREG (statbuf.st_mode))
-    {
-      errno = ESPIPE;
-      return -1;
-    }
-#endif
-#if _GL_WINDOWS_64_BIT_OFF_T
-  return _lseeki64 (fd, offset, whence);
-#else
-  return lseek (fd, offset, whence);
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/macros.h gettext-0.18.1.1/gettext-tools/gnulib-tests/macros.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/macros.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/macros.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -48,8 +48,8 @@
     {                                                                        \
       if (!(expr))                                                           \
         {                                                                    \
-          fprintf (ASSERT_STREAM, "%s:%d: assertion '%s' failed\n",     \
-                   __FILE__, __LINE__, #expr);                          \
+          fprintf (ASSERT_STREAM, "%s:%d: assertion failed\n",               \
+                   __FILE__, __LINE__);                                      \
           fflush (ASSERT_STREAM);                                            \
           abort ();                                                          \
         }                                                                    \
@@ -62,12 +62,3 @@
    *not* work for function parameters of array type, because they are actually
    parameters of pointer type.  */
 #define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-
-/* STREQ (str1, str2)
-   Return true if two strings compare equal.  */
-#define STREQ(a, b) (strcmp (a, b) == 0)
-
-/* Some numbers in the interval [0,1).  */
-extern const float randomf[1000];
-extern const double randomd[1000];
-extern const long double randoml[1000];
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/Makefile.gnulib gettext-0.18.1.1/gettext-tools/gnulib-tests/Makefile.gnulib
--- gettext-0.19.3/gettext-tools/gnulib-tests/Makefile.gnulib	2014-10-16 06:00:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/Makefile.gnulib	2010-06-03 21:36:45.000000000 +0000
@@ -1,28 +1,16 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 
-AUTOMAKE_OPTIONS = 1.9.6 foreign subdir-objects
+AUTOMAKE_OPTIONS = 1.5 foreign subdir-objects
 
 SUBDIRS = .
 TESTS =
@@ -60,20 +48,26 @@
 
 ## begin gnulib module acl-tests
 
-TESTS += \
-  test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh \
-  test-set-mode-acl.sh test-set-mode-acl-1.sh test-set-mode-acl-2.sh \
-  test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh
+TESTS += test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-file-has-acl test-set-mode-acl test-copy-acl test-sameacls
 test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL)
 test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
 test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
 test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
-EXTRA_DIST += test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh test-set-mode-acl.sh test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh test-file-has-acl.c test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h
+EXTRA_DIST += test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh test-file-has-acl.c test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h
 
 ## end   gnulib module acl-tests
 
+## begin gnulib module alignof-tests
+
+TESTS += test-alignof
+check_PROGRAMS += test-alignof
+
+EXTRA_DIST += test-alignof.c
+
+## end   gnulib module alignof-tests
+
 ## begin gnulib module alloca-opt-tests
 
 TESTS += test-alloca-opt
@@ -91,6 +85,30 @@
 
 ## end   gnulib module areadlink-tests
 
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/arg-nonnull.h
+
+## end   gnulib module arg-nonnull
+
 ## begin gnulib module argmatch-tests
 
 TESTS += test-argmatch
@@ -114,7 +132,7 @@
 
 TESTS += test-atexit.sh
 check_PROGRAMS += test-atexit
-EXTRA_DIST += signature.h test-atexit.sh test-atexit.c
+EXTRA_DIST += init.sh signature.h test-atexit.sh test-atexit.c
 
 ## end   gnulib module atexit-tests
 
@@ -127,32 +145,37 @@
 
 ## end   gnulib module binary-io-tests
 
-## begin gnulib module btowc
-
-
-EXTRA_DIST += btowc.c
-
-EXTRA_libtests_a_SOURCES += btowc.c
+## begin gnulib module byteswap-tests
 
-## end   gnulib module btowc
+TESTS += test-byteswap
+check_PROGRAMS += test-byteswap
+EXTRA_DIST += test-byteswap.c macros.h
 
-## begin gnulib module btowc-tests
+## end   gnulib module byteswap-tests
 
-TESTS += test-btowc1.sh test-btowc2.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
-check_PROGRAMS += test-btowc
+## begin gnulib module c++defs
 
-EXTRA_DIST += test-btowc1.sh test-btowc2.sh test-btowc.c signature.h 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
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
 
-## end   gnulib module btowc-tests
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
 
-## begin gnulib module byteswap-tests
+CXXDEFS_H=c++defs.h
 
-TESTS += test-byteswap
-check_PROGRAMS += test-byteswap
-EXTRA_DIST += test-byteswap.c macros.h
+EXTRA_DIST += $(top_srcdir)/../build-aux/c++defs.h
 
-## end   gnulib module byteswap-tests
+## end   gnulib module c++defs
 
 ## begin gnulib module c-ctype-tests
 
@@ -206,49 +229,16 @@
 
 ## end   gnulib module cloexec-tests
 
-## begin gnulib module close-tests
-
-TESTS += test-close
-check_PROGRAMS += test-close
-EXTRA_DIST += test-close.c signature.h macros.h
-
-## end   gnulib module close-tests
-
 ## begin gnulib module copy-file-tests
 
-TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh
+TESTS += test-copy-file.sh
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-copy-file
 test_copy_file_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
-EXTRA_DIST += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh test-copy-file.c macros.h
+EXTRA_DIST += test-copy-file.sh test-copy-file.c macros.h
 
 ## end   gnulib module copy-file-tests
 
-## begin gnulib module dirent-tests
-
-TESTS += test-dirent
-check_PROGRAMS += test-dirent
-EXTRA_DIST += test-dirent.c
-
-## end   gnulib module dirent-tests
-
-## begin gnulib module dup
-
-
-EXTRA_DIST += dup.c
-
-EXTRA_libtests_a_SOURCES += dup.c
-
-## end   gnulib module dup
-
-## begin gnulib module dup-tests
-
-TESTS += test-dup
-check_PROGRAMS += test-dup
-EXTRA_DIST += test-dup.c signature.h macros.h
-
-## end   gnulib module dup-tests
-
 ## begin gnulib module dup2-tests
 
 TESTS += test-dup2
@@ -291,39 +281,6 @@
 
 ## end   gnulib module fcntl-tests
 
-## begin gnulib module fdopen
-
-
-EXTRA_DIST += fdopen.c
-
-EXTRA_libtests_a_SOURCES += fdopen.c
-
-## end   gnulib module fdopen
-
-## begin gnulib module fdopen-tests
-
-TESTS += test-fdopen
-check_PROGRAMS += test-fdopen
-EXTRA_DIST += test-fdopen.c signature.h macros.h
-
-## end   gnulib module fdopen-tests
-
-## begin gnulib module fgetc-tests
-
-TESTS += test-fgetc
-check_PROGRAMS += test-fgetc
-EXTRA_DIST += test-fgetc.c signature.h macros.h
-
-## end   gnulib module fgetc-tests
-
-## begin gnulib module float-tests
-
-TESTS += test-float
-check_PROGRAMS += test-float
-EXTRA_DIST += test-float.c macros.h
-
-## end   gnulib module float-tests
-
 ## begin gnulib module fnmatch-tests
 
 TESTS += test-fnmatch
@@ -341,37 +298,6 @@
 
 ## end   gnulib module fopen-tests
 
-## begin gnulib module fpucw
-
-
-EXTRA_DIST += fpucw.h
-
-## end   gnulib module fpucw
-
-## begin gnulib module fputc-tests
-
-TESTS += test-fputc
-check_PROGRAMS += test-fputc
-EXTRA_DIST += test-fputc.c signature.h macros.h
-
-## end   gnulib module fputc-tests
-
-## begin gnulib module fread-tests
-
-TESTS += test-fread
-check_PROGRAMS += test-fread
-EXTRA_DIST += test-fread.c signature.h macros.h
-
-## end   gnulib module fread-tests
-
-## begin gnulib module fstat-tests
-
-TESTS += test-fstat
-check_PROGRAMS += test-fstat
-EXTRA_DIST += test-fstat.c signature.h macros.h
-
-## end   gnulib module fstat-tests
-
 ## begin gnulib module fstrcmp-tests
 
 TESTS += test-fstrcmp
@@ -381,68 +307,6 @@
 
 ## end   gnulib module fstrcmp-tests
 
-## begin gnulib module ftell
-
-
-EXTRA_DIST += ftell.c
-
-EXTRA_libtests_a_SOURCES += ftell.c
-
-## end   gnulib module ftell
-
-## begin gnulib module ftell-tests
-
-TESTS += test-ftell.sh test-ftell2.sh test-ftell3
-check_PROGRAMS += test-ftell test-ftell3
-MOSTLYCLEANFILES += t-ftell3.tmp
-EXTRA_DIST += test-ftell.c test-ftell.sh test-ftell2.sh test-ftell3.c signature.h macros.h
-
-## end   gnulib module ftell-tests
-
-## begin gnulib module ftello
-
-
-EXTRA_DIST += ftello.c stdio-impl.h
-
-EXTRA_libtests_a_SOURCES += ftello.c
-
-## end   gnulib module ftello
-
-## begin gnulib module ftello-tests
-
-TESTS += test-ftello.sh test-ftello2.sh test-ftello3 test-ftello4.sh
-check_PROGRAMS += test-ftello test-ftello3 test-ftello4
-MOSTLYCLEANFILES += t-ftello3.tmp
-EXTRA_DIST += test-ftello.c test-ftello.sh test-ftello2.sh test-ftello3.c test-ftello4.c test-ftello4.sh signature.h macros.h
-
-## end   gnulib module ftello-tests
-
-## begin gnulib module fwrite-tests
-
-TESTS += test-fwrite
-check_PROGRAMS += test-fwrite
-EXTRA_DIST += test-fwrite.c signature.h macros.h
-
-## end   gnulib module fwrite-tests
-
-## begin gnulib module getcwd-lgpl
-
-
-EXTRA_DIST += getcwd-lgpl.c
-
-EXTRA_libtests_a_SOURCES += getcwd-lgpl.c
-
-## end   gnulib module getcwd-lgpl
-
-## begin gnulib module getcwd-lgpl-tests
-
-TESTS += test-getcwd-lgpl
-check_PROGRAMS += test-getcwd-lgpl
-test_getcwd_lgpl_LDADD = $(LDADD) $(LIBINTL)
-EXTRA_DIST += test-getcwd-lgpl.c signature.h macros.h
-
-## end   gnulib module getcwd-lgpl-tests
-
 ## begin gnulib module getdelim-tests
 
 TESTS += test-getdelim
@@ -514,82 +378,11 @@
 
 ## end   gnulib module iconv-tests
 
-## begin gnulib module ignore-value-tests
-
-TESTS += test-ignore-value
-check_PROGRAMS += test-ignore-value
-EXTRA_DIST += test-ignore-value.c
-
-## end   gnulib module ignore-value-tests
-
-## begin gnulib module intprops-tests
-
-TESTS += test-intprops
-check_PROGRAMS += test-intprops
-EXTRA_DIST += test-intprops.c macros.h
-
-## end   gnulib module intprops-tests
-
-## begin gnulib module inttypes-incomplete
+## begin gnulib module ignore-value
 
-BUILT_SOURCES += inttypes.h
+libtests_a_SOURCES += ignore-value.h
 
-# We need the following in order to create <inttypes.h> when the system
-# doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
-	      -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
-	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-	      -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
-	      -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
-	      -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
-	      -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
-	      -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
-	      -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
-	      -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
-	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
-	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
-	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
-	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
-	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
-	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
-	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
-	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/inttypes.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += inttypes.h inttypes.h-t
-
-EXTRA_DIST += inttypes.in.h
-
-## end   gnulib module inttypes-incomplete
-
-## begin gnulib module inttypes-tests
-
-TESTS += test-inttypes
-check_PROGRAMS += test-inttypes
-EXTRA_DIST += test-inttypes.c
-
-## end   gnulib module inttypes-tests
-
-## begin gnulib module iswblank-tests
-
-TESTS += test-iswblank
-check_PROGRAMS += test-iswblank
-EXTRA_DIST += test-iswblank.c macros.h
-
-## end   gnulib module iswblank-tests
+## end   gnulib module ignore-value
 
 ## begin gnulib module linkedhash-list-tests
 
@@ -611,7 +404,7 @@
 
 TESTS += test-localename
 check_PROGRAMS += test-localename
-test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
+test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@
 
 EXTRA_DIST += test-localename.c macros.h
 
@@ -626,23 +419,6 @@
 
 ## end   gnulib module lock-tests
 
-## begin gnulib module lseek
-
-
-EXTRA_DIST += lseek.c
-
-EXTRA_libtests_a_SOURCES += lseek.c
-
-## end   gnulib module lseek
-
-## begin gnulib module lseek-tests
-
-TESTS += test-lseek.sh
-check_PROGRAMS += test-lseek
-EXTRA_DIST += test-lseek.c test-lseek.sh signature.h macros.h
-
-## end   gnulib module lseek-tests
-
 ## begin gnulib module lstat-tests
 
 TESTS += test-lstat
@@ -662,18 +438,15 @@
 
 ## begin gnulib module mbrtowc-tests
 
-TESTS += \
-  test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.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 += test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh
 TESTS_ENVIRONMENT += \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \
   LOCALE_ZH_CN='@LOCALE_ZH_CN@'
-check_PROGRAMS += test-mbrtowc test-mbrtowc-w32
+check_PROGRAMS += test-mbrtowc
 
-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-mbrtowc.c signature.h macros.h
 
 ## end   gnulib module mbrtowc-tests
 
@@ -711,15 +484,6 @@
 
 ## end   gnulib module mbsstr-tests
 
-## begin gnulib module mbtowc
-
-
-EXTRA_DIST += mbtowc-impl.h mbtowc.c
-
-EXTRA_libtests_a_SOURCES += mbtowc.c
-
-## end   gnulib module mbtowc
-
 ## begin gnulib module memchr-tests
 
 TESTS += test-memchr
@@ -757,14 +521,6 @@
 
 ## end   gnulib module open-tests
 
-## begin gnulib module pathmax-tests
-
-TESTS += test-pathmax
-check_PROGRAMS += test-pathmax
-EXTRA_DIST += test-pathmax.c
-
-## end   gnulib module pathmax-tests
-
 ## begin gnulib module pipe-filter-ii-tests
 
 TESTS += test-pipe-filter-ii1.sh test-pipe-filter-ii2.sh
@@ -775,39 +531,23 @@
 
 ## end   gnulib module pipe-filter-ii-tests
 
+## begin gnulib module pipe-tests
+
+TESTS += test-pipe.sh
+check_PROGRAMS += test-pipe
+test_pipe_LDADD = $(LDADD) @LIBINTL@
+EXTRA_DIST += test-pipe.sh test-pipe.c macros.h
+
+## end   gnulib module pipe-tests
+
 ## begin gnulib module pipe2-tests
 
 TESTS += test-pipe2
 check_PROGRAMS += test-pipe2
-test_pipe2_LDADD = $(LDADD) $(LIBSOCKET)
 EXTRA_DIST += test-pipe2.c signature.h macros.h
 
 ## end   gnulib module pipe2-tests
 
-## begin gnulib module posix_spawn_file_actions_addclose-tests
-
-TESTS += test-posix_spawn_file_actions_addclose
-check_PROGRAMS += test-posix_spawn_file_actions_addclose
-EXTRA_DIST += test-posix_spawn_file_actions_addclose.c signature.h macros.h
-
-## end   gnulib module posix_spawn_file_actions_addclose-tests
-
-## begin gnulib module posix_spawn_file_actions_adddup2-tests
-
-TESTS += test-posix_spawn_file_actions_adddup2
-check_PROGRAMS += test-posix_spawn_file_actions_adddup2
-EXTRA_DIST += test-posix_spawn_file_actions_adddup2.c signature.h macros.h
-
-## end   gnulib module posix_spawn_file_actions_adddup2-tests
-
-## begin gnulib module posix_spawn_file_actions_addopen-tests
-
-TESTS += test-posix_spawn_file_actions_addopen
-check_PROGRAMS += test-posix_spawn_file_actions_addopen
-EXTRA_DIST += test-posix_spawn_file_actions_addopen.c signature.h macros.h
-
-## end   gnulib module posix_spawn_file_actions_addopen-tests
-
 ## begin gnulib module posix_spawnp-tests
 
 if POSIX_SPAWN_PORTED
@@ -846,31 +586,24 @@
 TESTS += test-quotearg-simple
 check_PROGRAMS += test-quotearg-simple
 test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@
-EXTRA_DIST += test-quotearg-simple.c test-quotearg.h macros.h zerosize-ptr.h
+EXTRA_DIST += test-quotearg-simple.c test-quotearg.h macros.h
 
 ## end   gnulib module quotearg-simple-tests
 
-## begin gnulib module raise-tests
-
-TESTS += test-raise
-check_PROGRAMS += test-raise
-EXTRA_DIST += test-raise.c signature.h macros.h
-
-## end   gnulib module raise-tests
-
 ## begin gnulib module rawmemchr-tests
 
 TESTS += test-rawmemchr
 check_PROGRAMS += test-rawmemchr
-EXTRA_DIST += test-rawmemchr.c zerosize-ptr.h signature.h macros.h
+EXTRA_DIST += test-rawmemchr.c signature.h macros.h
 
 ## end   gnulib module rawmemchr-tests
 
 ## begin gnulib module read-file
 
-libtests_a_SOURCES += read-file.c
 
-EXTRA_DIST += read-file.h
+EXTRA_DIST += read-file.c read-file.h
+
+EXTRA_libtests_a_SOURCES += read-file.c
 
 ## end   gnulib module read-file
 
@@ -882,14 +615,6 @@
 
 ## end   gnulib module read-file-tests
 
-## begin gnulib module read-tests
-
-TESTS += test-read
-check_PROGRAMS += test-read
-EXTRA_DIST += test-read.c signature.h macros.h
-
-## end   gnulib module read-tests
-
 ## begin gnulib module readlink-tests
 
 TESTS += test-readlink
@@ -929,28 +654,6 @@
 
 ## end   gnulib module setenv-tests
 
-## begin gnulib module setlocale-tests
-
-TESTS += test-setlocale1.sh test-setlocale2.sh
-TESTS_ENVIRONMENT += \
-  LOCALE_FR='@LOCALE_FR@' \
-  LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-  LOCALE_JA='@LOCALE_JA@' \
-  LOCALE_ZH_CN='@LOCALE_ZH_CN@'
-check_PROGRAMS += test-setlocale1 test-setlocale2
-EXTRA_DIST += test-setlocale1.sh test-setlocale1.c test-setlocale2.sh test-setlocale2.c signature.h macros.h
-
-## end   gnulib module setlocale-tests
-
-## begin gnulib module sh-quote-tests
-
-TESTS += test-sh-quote
-check_PROGRAMS += test-sh-quote
-test_sh_quote_LDADD = $(LDADD) @LIBINTL@
-EXTRA_DIST += test-sh-quote.c
-
-## end   gnulib module sh-quote-tests
-
 ## begin gnulib module sigaction-tests
 
 TESTS += test-sigaction
@@ -959,13 +662,13 @@
 
 ## end   gnulib module sigaction-tests
 
-## begin gnulib module signal-h-tests
+## begin gnulib module signal-tests
 
-TESTS += test-signal-h
-check_PROGRAMS += test-signal-h
-EXTRA_DIST += test-signal-h.c
+TESTS += test-signal
+check_PROGRAMS += test-signal
+EXTRA_DIST += test-signal.c
 
-## end   gnulib module signal-h-tests
+## end   gnulib module signal-tests
 
 ## begin gnulib module sigpipe-tests
 
@@ -976,137 +679,6 @@
 
 ## end   gnulib module sigpipe-tests
 
-## begin gnulib module sigprocmask-tests
-
-TESTS += test-sigprocmask
-check_PROGRAMS += test-sigprocmask
-EXTRA_DIST += test-sigprocmask.c signature.h macros.h
-
-## end   gnulib module sigprocmask-tests
-
-## begin gnulib module sleep
-
-
-EXTRA_DIST += sleep.c
-
-EXTRA_libtests_a_SOURCES += sleep.c
-
-## end   gnulib module sleep
-
-## begin gnulib module sleep-tests
-
-TESTS += test-sleep
-check_PROGRAMS += test-sleep
-EXTRA_DIST += test-sleep.c signature.h macros.h
-
-## end   gnulib module sleep-tests
-
-## begin gnulib module snippet/_Noreturn
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-
-_NORETURN_H=$(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-## end   gnulib module snippet/_Noreturn
-
-## begin gnulib module snippet/arg-nonnull
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-
-ARG_NONNULL_H=arg-nonnull.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-
-## end   gnulib module snippet/arg-nonnull
-
-## begin gnulib module snippet/c++defs
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/c++defs.h
-
-## end   gnulib module snippet/c++defs
-
-## begin gnulib module snippet/unused-parameter
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += unused-parameter.h
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
-
-UNUSED_PARAMETER_H=unused-parameter.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-
-## end   gnulib module snippet/unused-parameter
-
-## begin gnulib module snippet/warn-on-use
-
-BUILT_SOURCES += warn-on-use.h
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
-
-WARN_ON_USE_H=warn-on-use.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-
-## end   gnulib module snippet/warn-on-use
-
 ## begin gnulib module snprintf-tests
 
 TESTS += test-snprintf
@@ -1116,19 +688,6 @@
 
 ## end   gnulib module snprintf-tests
 
-## begin gnulib module spawn-pipe-tests
-
-TESTS += test-spawn-pipe.sh
-check_PROGRAMS += test-spawn-pipe-main test-spawn-pipe-child
-test_spawn_pipe_main_LDADD = $(LDADD) @LIBINTL@
-# The test-spawn-pipe-child program must be a real executable, not a libtool
-# wrapper script, and should link against as few libraries as possible.
-# Therefore don't link it against any libraries other than -lc.
-test_spawn_pipe_child_LDADD =
-EXTRA_DIST += test-spawn-pipe.sh test-spawn-pipe-main.c test-spawn-pipe-child.c macros.h
-
-## end   gnulib module spawn-pipe-tests
-
 ## begin gnulib module spawn-tests
 
 TESTS += test-spawn
@@ -1141,7 +700,6 @@
 
 TESTS += test-stat
 check_PROGRAMS += test-stat
-test_stat_LDADD = $(LDADD) $(LIBINTL)
 EXTRA_DIST += test-stat.h test-stat.c signature.h macros.h
 
 ## end   gnulib module stat-tests
@@ -1182,7 +740,7 @@
 
 TESTS += test-stdlib
 check_PROGRAMS += test-stdlib
-EXTRA_DIST += test-stdlib.c test-sys_wait.h
+EXTRA_DIST += test-stdlib.c
 
 ## end   gnulib module stdlib-tests
 
@@ -1216,7 +774,7 @@
 
 TESTS += test-striconveh
 check_PROGRAMS += test-striconveh
-test_striconveh_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_striconveh_LDADD = $(LDADD) @LIBICONV@
 
 EXTRA_DIST += test-striconveh.c macros.h
 
@@ -1226,7 +784,7 @@
 
 TESTS += test-striconveha
 check_PROGRAMS += test-striconveha
-test_striconveha_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_striconveha_LDADD = $(LDADD) @LIBICONV@
 
 EXTRA_DIST += test-striconveha.c macros.h
 
@@ -1240,14 +798,6 @@
 
 ## end   gnulib module string-tests
 
-## begin gnulib module strnlen-tests
-
-TESTS += test-strnlen
-check_PROGRAMS += test-strnlen
-EXTRA_DIST += test-strnlen.c zerosize-ptr.h signature.h macros.h
-
-## end   gnulib module strnlen-tests
-
 ## begin gnulib module strstr-tests
 
 TESTS += test-strstr
@@ -1256,22 +806,6 @@
 
 ## end   gnulib module strstr-tests
 
-## begin gnulib module strtol-tests
-
-TESTS += test-strtol
-check_PROGRAMS += test-strtol
-EXTRA_DIST += test-strtol.c signature.h macros.h
-
-## end   gnulib module strtol-tests
-
-## begin gnulib module strtoul-tests
-
-TESTS += test-strtoul
-check_PROGRAMS += test-strtoul
-EXTRA_DIST += test-strtoul.c signature.h macros.h
-
-## end   gnulib module strtoul-tests
-
 ## begin gnulib module symlink
 
 
@@ -1293,10 +827,18 @@
 
 TESTS += test-sys_select
 check_PROGRAMS += test-sys_select
-EXTRA_DIST += test-sys_select.c signature.h
+EXTRA_DIST += test-sys_select.c
 
 ## end   gnulib module sys_select-tests
 
+## begin gnulib module sys_socket-tests
+
+TESTS += test-sys_socket
+check_PROGRAMS += test-sys_socket
+EXTRA_DIST += test-sys_socket.c
+
+## end   gnulib module sys_socket-tests
+
 ## begin gnulib module sys_stat-tests
 
 TESTS += test-sys_stat
@@ -1313,19 +855,11 @@
 
 ## end   gnulib module sys_time-tests
 
-## begin gnulib module sys_types-tests
-
-TESTS += test-sys_types
-check_PROGRAMS += test-sys_types
-EXTRA_DIST += test-sys_types.c
-
-## end   gnulib module sys_types-tests
-
 ## begin gnulib module sys_wait-tests
 
 TESTS += test-sys_wait
 check_PROGRAMS += test-sys_wait
-EXTRA_DIST += test-sys_wait.c test-sys_wait.h
+EXTRA_DIST += test-sys_wait.c
 
 ## end   gnulib module sys_wait-tests
 
@@ -1335,34 +869,16 @@
 TESTS_ENVIRONMENT += srcdir='$(srcdir)'
 check_PROGRAMS += test-term-ostream
 test_term_ostream_LDADD = $(LIBTERMCAP) $(LDADD)
-EXTRA_DIST += test-term-ostream.c test-term-ostream-xterm test-term-ostream-xterm-r6.out test-term-ostream-xterm-xf86-v32.out test-term-ostream-xterm-basic.out test-term-ostream-xterm-basic-italic.out test-term-ostream-xterm-8bit.out test-term-ostream-xterm-linux-debian.out test-term-ostream-xterm-linux-mandriva.out test-term-ostream-xterm-netbsd3.out test-term-ostream-xterm-solaris10.out test-term-ostream-xterm-aix51.out test-term-ostream-xterm-osf51.out test-term-ostream-xterm-irix65.out test-term-ostream-xterm-mingw.out test-term-ostream-xterm-16color.out test-term-ostream-xterm-88color.out test-term-ostream-xterm-256color.out
+EXTRA_DIST += test-term-ostream.c test-term-ostream-xterm test-term-ostream-xterm-r6.out test-term-ostream-xterm-xf86-v32.out test-term-ostream-xterm-basic.out test-term-ostream-xterm-8bit.out test-term-ostream-xterm-linux-debian.out test-term-ostream-xterm-linux-mandriva.out test-term-ostream-xterm-netbsd3.out test-term-ostream-xterm-solaris10.out test-term-ostream-xterm-aix51.out test-term-ostream-xterm-osf51.out test-term-ostream-xterm-irix65.out test-term-ostream-xterm-mingw.out test-term-ostream-xterm-16color.out test-term-ostream-xterm-88color.out test-term-ostream-xterm-256color.out
 
 ## end   gnulib module term-ostream-tests
 
-## begin gnulib module test-framework-sh-tests
-
-TESTS += test-init.sh
-EXTRA_DIST += init.sh
-EXTRA_DIST += test-init.sh
-
-## end   gnulib module test-framework-sh-tests
-
 ## begin gnulib module thread
 
 libtests_a_SOURCES += glthread/thread.h glthread/thread.c
 
 ## end   gnulib module thread
 
-## begin gnulib module thread-tests
-
-TESTS += test-thread_self test-thread_create
-check_PROGRAMS += test-thread_self test-thread_create
-test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
-test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
-EXTRA_DIST += test-thread_self.c test-thread_create.c macros.h
-
-## end   gnulib module thread-tests
-
 ## begin gnulib module time-tests
 
 TESTS += test-time
@@ -1392,6 +908,16 @@
 
 ## end   gnulib module uniconv/u8-conv-from-enc-tests
 
+## begin gnulib module unilbrk/u8-possible-linebreaks-tests
+
+TESTS += test-u8-possible-linebreaks
+check_PROGRAMS += test-u8-possible-linebreaks
+test_u8_possible_linebreaks_SOURCES = unilbrk/test-u8-possible-linebreaks.c
+test_u8_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
+EXTRA_DIST += unilbrk/test-u8-possible-linebreaks.c macros.h
+
+## end   gnulib module unilbrk/u8-possible-linebreaks-tests
+
 ## begin gnulib module unilbrk/u8-width-linebreaks-tests
 
 TESTS += test-u8-width-linebreaks
@@ -1402,6 +928,17 @@
 
 ## end   gnulib module unilbrk/u8-width-linebreaks-tests
 
+## begin gnulib module unilbrk/ulc-width-linebreaks-tests
+
+TESTS += test-ulc-width-linebreaks
+check_PROGRAMS += test-ulc-width-linebreaks
+test_ulc_width_linebreaks_SOURCES = unilbrk/test-ulc-width-linebreaks.c
+test_ulc_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+
+EXTRA_DIST += unilbrk/test-ulc-width-linebreaks.c macros.h
+
+## end   gnulib module unilbrk/ulc-width-linebreaks-tests
+
 ## begin gnulib module uniname/uniname-tests
 
 TESTS += uniname/test-uninames.sh
@@ -1477,6 +1014,26 @@
 
 ## end   gnulib module unistr/u8-mblen-tests
 
+## begin gnulib module unistr/u8-mbtouc-tests
+
+TESTS += test-u8-mbtouc
+check_PROGRAMS += test-u8-mbtouc
+test_u8_mbtouc_SOURCES = unistr/test-u8-mbtouc.c
+test_u8_mbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
+EXTRA_DIST += unistr/test-u8-mbtouc.c unistr/test-u8-mbtouc.h macros.h
+
+## end   gnulib module unistr/u8-mbtouc-tests
+
+## begin gnulib module unistr/u8-mbtouc-unsafe-tests
+
+TESTS += test-u8-mbtouc-unsafe
+check_PROGRAMS += test-u8-mbtouc-unsafe
+test_u8_mbtouc_unsafe_SOURCES = unistr/test-u8-mbtouc-unsafe.c
+test_u8_mbtouc_unsafe_LDADD = $(LDADD) $(LIBUNISTRING)
+EXTRA_DIST += unistr/test-u8-mbtouc-unsafe.c unistr/test-u8-mbtouc.h macros.h
+
+## end   gnulib module unistr/u8-mbtouc-unsafe-tests
+
 ## begin gnulib module unistr/u8-mbtoucr-tests
 
 TESTS += test-u8-mbtoucr
@@ -1525,6 +1082,18 @@
 
 ## end   gnulib module unistr/u8-uctomb-tests
 
+## begin gnulib module uniwidth/width-tests
+
+TESTS += test-uc_width uniwidth/test-uc_width2.sh
+check_PROGRAMS += test-uc_width test-uc_width2
+test_uc_width_SOURCES = uniwidth/test-uc_width.c
+test_uc_width_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
+test_uc_width2_LDADD = $(LDADD) $(LIBUNISTRING)
+EXTRA_DIST += uniwidth/test-uc_width.c uniwidth/test-uc_width2.c uniwidth/test-uc_width2.sh macros.h
+
+## end   gnulib module uniwidth/width-tests
+
 ## begin gnulib module unsetenv-tests
 
 TESTS += test-unsetenv
@@ -1533,6 +1102,31 @@
 
 ## end   gnulib module unsetenv-tests
 
+## begin gnulib module unused-parameter
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += unused-parameter.h
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/../build-aux/unused-parameter.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+	  < $(top_srcdir)/../build-aux/unused-parameter.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
+
+UNUSED_PARAMETER_H=unused-parameter.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/unused-parameter.h
+
+## end   gnulib module unused-parameter
+
 ## begin gnulib module vasnprintf-tests
 
 TESTS += test-vasnprintf
@@ -1556,7 +1150,7 @@
 TESTS_ENVIRONMENT += MAKE='$(MAKE)'
 TESTS += test-verify test-verify.sh
 check_PROGRAMS += test-verify
-EXTRA_DIST += test-verify.c test-verify.sh
+EXTRA_DIST += test-verify.c test-verify.sh init.sh
 
 ## end   gnulib module verify-tests
 
@@ -1569,39 +1163,32 @@
 
 ## end   gnulib module vsnprintf-tests
 
-## begin gnulib module wchar-tests
-
-TESTS += test-wchar
-check_PROGRAMS += test-wchar
-EXTRA_DIST += test-wchar.c
-
-## end   gnulib module wchar-tests
-
-## begin gnulib module wcrtomb
+## begin gnulib module warn-on-use
 
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
 
-EXTRA_DIST += wcrtomb.c
-
-EXTRA_libtests_a_SOURCES += wcrtomb.c
+WARN_ON_USE_H=warn-on-use.h
 
-## end   gnulib module wcrtomb
+EXTRA_DIST += $(top_srcdir)/../build-aux/warn-on-use.h
 
-## begin gnulib module wcrtomb-tests
+## end   gnulib module warn-on-use
 
-TESTS += \
-  test-wcrtomb.sh \
-  test-wcrtomb-w32-1.sh test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \
-  test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh
-TESTS_ENVIRONMENT += \
-  LOCALE_FR='@LOCALE_FR@' \
-  LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-  LOCALE_JA='@LOCALE_JA@' \
-  LOCALE_ZH_CN='@LOCALE_ZH_CN@'
-check_PROGRAMS += test-wcrtomb test-wcrtomb-w32
+## begin gnulib module wchar-tests
 
-EXTRA_DIST += test-wcrtomb.sh test-wcrtomb.c test-wcrtomb-w32-1.sh test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh test-wcrtomb-w32.c signature.h macros.h
+TESTS += test-wchar
+check_PROGRAMS += test-wchar
+EXTRA_DIST += test-wchar.c
 
-## end   gnulib module wcrtomb-tests
+## end   gnulib module wchar-tests
 
 ## begin gnulib module wctob
 
@@ -1612,22 +1199,13 @@
 
 ## end   gnulib module wctob
 
-## begin gnulib module wctomb
-
-
-EXTRA_DIST += wctomb-impl.h wctomb.c
-
-EXTRA_libtests_a_SOURCES += wctomb.c
+## begin gnulib module wctype-tests
 
-## end   gnulib module wctomb
+TESTS += test-wctype
+check_PROGRAMS += test-wctype
+EXTRA_DIST += test-wctype.c macros.h
 
-## begin gnulib module wctype-h-tests
-
-TESTS += test-wctype-h
-check_PROGRAMS += test-wctype-h
-EXTRA_DIST += test-wctype-h.c macros.h
-
-## end   gnulib module wctype-h-tests
+## end   gnulib module wctype-tests
 
 ## begin gnulib module wcwidth-tests
 
@@ -1638,20 +1216,12 @@
 
 ## end   gnulib module wcwidth-tests
 
-## begin gnulib module write-tests
-
-TESTS += test-write
-check_PROGRAMS += test-write
-EXTRA_DIST += test-write.c signature.h macros.h
-
-## end   gnulib module write-tests
-
 ## begin gnulib module xalloc-die-tests
 
 TESTS += test-xalloc-die.sh
 check_PROGRAMS += test-xalloc-die
 test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
-EXTRA_DIST += test-xalloc-die.c test-xalloc-die.sh
+EXTRA_DIST += test-xalloc-die.c test-xalloc-die.sh init.sh
 
 ## end   gnulib module xalloc-die-tests
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/Makefile.in gettext-0.18.1.1/gettext-tools/gnulib-tests/Makefile.in
--- gettext-0.19.3/gettext-tools/gnulib-tests/Makefile.in	2014-10-16 06:01:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/Makefile.in	2010-06-06 20:12:30.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,24 +15,12 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
-# You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -39,54 +28,10 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -101,161 +46,123 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/../build-aux/mkinstalldirs \
-	$(top_srcdir)/../build-aux/depcomp $(noinst_HEADERS) \
-	$(top_srcdir)/../build-aux/test-driver ChangeLog
-TESTS = test-file-has-acl.sh test-file-has-acl-1.sh \
-	test-file-has-acl-2.sh test-set-mode-acl.sh \
-	test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh \
-	test-copy-acl-1.sh test-copy-acl-2.sh test-alloca-opt$(EXEEXT) \
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in ChangeLog
+TESTS = test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh \
+	test-alignof$(EXEEXT) test-alloca-opt$(EXEEXT) \
 	test-areadlink$(EXEEXT) test-argmatch$(EXEEXT) \
 	test-array_list$(EXEEXT) test-atexit.sh test-binary-io.sh \
-	test-btowc1.sh test-btowc2.sh test-byteswap$(EXEEXT) \
-	test-c-ctype$(EXEEXT) test-c-strcase.sh \
+	test-byteswap$(EXEEXT) test-c-ctype$(EXEEXT) test-c-strcase.sh \
 	test-c-strcasestr$(EXEEXT) test-c-strstr$(EXEEXT) \
 	test-canonicalize-lgpl$(EXEEXT) test-cloexec$(EXEEXT) \
-	test-close$(EXEEXT) test-copy-file.sh test-copy-file-1.sh \
-	test-copy-file-2.sh test-dirent$(EXEEXT) test-dup$(EXEEXT) \
-	test-dup2$(EXEEXT) test-environ$(EXEEXT) test-errno$(EXEEXT) \
-	test-fcntl-h$(EXEEXT) test-fcntl$(EXEEXT) test-fdopen$(EXEEXT) \
-	test-fgetc$(EXEEXT) test-float$(EXEEXT) test-fnmatch$(EXEEXT) \
-	test-fopen$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \
-	test-fstat$(EXEEXT) test-fstrcmp$(EXEEXT) test-ftell.sh \
-	test-ftell2.sh test-ftell3$(EXEEXT) test-ftello.sh \
-	test-ftello2.sh test-ftello3$(EXEEXT) test-ftello4.sh \
-	test-fwrite$(EXEEXT) test-getcwd-lgpl$(EXEEXT) \
-	test-getdelim$(EXEEXT) test-getdtablesize$(EXEEXT) \
-	test-getline$(EXEEXT) test-getopt$(EXEEXT) \
-	test-gettimeofday$(EXEEXT) test-iconv-h$(EXEEXT) \
-	test-iconv$(EXEEXT) test-ignore-value$(EXEEXT) \
-	test-intprops$(EXEEXT) test-inttypes$(EXEEXT) \
-	test-iswblank$(EXEEXT) test-linkedhash_list$(EXEEXT) \
-	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-lock$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
-	test-malloca$(EXEEXT) test-mbrtowc1.sh test-mbrtowc2.sh \
-	test-mbrtowc3.sh test-mbrtowc4.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 test-mbsstr1$(EXEEXT) test-mbsstr2.sh \
-	test-mbsstr3.sh test-memchr$(EXEEXT) test-open$(EXEEXT) \
-	test-pathmax$(EXEEXT) test-pipe-filter-ii1.sh \
-	test-pipe-filter-ii2.sh test-pipe2$(EXEEXT) \
-	test-posix_spawn_file_actions_addclose$(EXEEXT) \
-	test-posix_spawn_file_actions_adddup2$(EXEEXT) \
-	test-posix_spawn_file_actions_addopen$(EXEEXT) $(am__EXEEXT_1) \
-	test-quotearg-simple$(EXEEXT) test-raise$(EXEEXT) \
+	test-copy-file.sh test-dup2$(EXEEXT) test-environ$(EXEEXT) \
+	test-errno$(EXEEXT) test-fcntl-h$(EXEEXT) test-fcntl$(EXEEXT) \
+	test-fnmatch$(EXEEXT) test-fopen$(EXEEXT) \
+	test-fstrcmp$(EXEEXT) test-getdelim$(EXEEXT) \
+	test-getdtablesize$(EXEEXT) test-getline$(EXEEXT) \
+	test-getopt$(EXEEXT) test-gettimeofday$(EXEEXT) \
+	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
+	test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
+	test-localename$(EXEEXT) test-lock$(EXEEXT) \
+	test-lstat$(EXEEXT) test-malloca$(EXEEXT) test-mbrtowc1.sh \
+	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
+	test-mbsinit.sh test-mbsrtowcs1.sh test-mbsrtowcs2.sh \
+	test-mbsrtowcs3.sh test-mbsrtowcs4.sh test-mbsstr1$(EXEEXT) \
+	test-mbsstr2.sh test-mbsstr3.sh test-memchr$(EXEEXT) \
+	test-open$(EXEEXT) test-pipe-filter-ii1.sh \
+	test-pipe-filter-ii2.sh test-pipe.sh test-pipe2$(EXEEXT) \
+	$(am__EXEEXT_1) test-quotearg-simple$(EXEEXT) \
 	test-rawmemchr$(EXEEXT) test-read-file$(EXEEXT) \
-	test-read$(EXEEXT) test-readlink$(EXEEXT) test-rmdir$(EXEEXT) \
-	test-sched$(EXEEXT) test-setenv$(EXEEXT) test-setlocale1.sh \
-	test-setlocale2.sh test-sh-quote$(EXEEXT) \
-	test-sigaction$(EXEEXT) test-signal-h$(EXEEXT) test-sigpipe.sh \
-	test-sigprocmask$(EXEEXT) test-sleep$(EXEEXT) \
-	test-snprintf$(EXEEXT) test-spawn-pipe.sh test-spawn$(EXEEXT) \
-	test-stat$(EXEEXT) test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
-	test-strchrnul$(EXEEXT) test-strerror$(EXEEXT) \
-	test-striconv$(EXEEXT) test-striconveh$(EXEEXT) \
-	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-strnlen$(EXEEXT) test-strstr$(EXEEXT) \
-	test-strtol$(EXEEXT) test-strtoul$(EXEEXT) \
+	test-readlink$(EXEEXT) test-rmdir$(EXEEXT) test-sched$(EXEEXT) \
+	test-setenv$(EXEEXT) test-sigaction$(EXEEXT) \
+	test-signal$(EXEEXT) test-sigpipe.sh test-snprintf$(EXEEXT) \
+	test-spawn$(EXEEXT) test-stat$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
+	test-stdlib$(EXEEXT) test-strchrnul$(EXEEXT) \
+	test-strerror$(EXEEXT) test-striconv$(EXEEXT) \
+	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
+	test-string$(EXEEXT) test-strstr$(EXEEXT) \
 	test-symlink$(EXEEXT) test-sys_select$(EXEEXT) \
-	test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
-	test-sys_types$(EXEEXT) test-sys_wait$(EXEEXT) \
-	test-term-ostream-xterm test-init.sh test-thread_self$(EXEEXT) \
-	test-thread_create$(EXEEXT) test-time$(EXEEXT) \
-	test-tls$(EXEEXT) test-u8-conv-from-enc$(EXEEXT) \
-	test-u8-width-linebreaks$(EXEEXT) uniname/test-uninames.sh \
+	test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \
+	test-sys_time$(EXEEXT) test-sys_wait$(EXEEXT) \
+	test-term-ostream-xterm test-time$(EXEEXT) test-tls$(EXEEXT) \
+	test-u8-conv-from-enc$(EXEEXT) \
+	test-u8-possible-linebreaks$(EXEEXT) \
+	test-u8-width-linebreaks$(EXEEXT) \
+	test-ulc-width-linebreaks$(EXEEXT) uniname/test-uninames.sh \
 	test-dup-safer$(EXEEXT) test-unistd$(EXEEXT) \
 	test-u16-mbtouc$(EXEEXT) test-u8-check$(EXEEXT) \
 	test-u8-cmp$(EXEEXT) test-u8-mblen$(EXEEXT) \
+	test-u8-mbtouc$(EXEEXT) test-u8-mbtouc-unsafe$(EXEEXT) \
 	test-u8-mbtoucr$(EXEEXT) test-u8-prev$(EXEEXT) \
 	test-u8-strlen$(EXEEXT) test-u8-uctomb$(EXEEXT) \
+	test-uc_width$(EXEEXT) uniwidth/test-uc_width2.sh \
 	test-unsetenv$(EXEEXT) test-vasnprintf$(EXEEXT) \
 	test-vasprintf$(EXEEXT) test-verify$(EXEEXT) test-verify.sh \
-	test-vsnprintf$(EXEEXT) test-wchar$(EXEEXT) test-wcrtomb.sh \
-	test-wcrtomb-w32-1.sh test-wcrtomb-w32-2.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-vsnprintf$(EXEEXT) test-wchar$(EXEEXT) \
+	test-wctype$(EXEEXT) test-wcwidth$(EXEEXT) test-xalloc-die.sh \
 	test-xvasprintf$(EXEEXT)
 XFAIL_TESTS =
 noinst_PROGRAMS =
 check_PROGRAMS = test-file-has-acl$(EXEEXT) test-set-mode-acl$(EXEEXT) \
 	test-copy-acl$(EXEEXT) test-sameacls$(EXEEXT) \
-	test-alloca-opt$(EXEEXT) test-areadlink$(EXEEXT) \
-	test-argmatch$(EXEEXT) test-array_list$(EXEEXT) \
-	test-atexit$(EXEEXT) test-binary-io$(EXEEXT) \
-	test-btowc$(EXEEXT) test-byteswap$(EXEEXT) \
+	test-alignof$(EXEEXT) test-alloca-opt$(EXEEXT) \
+	test-areadlink$(EXEEXT) test-argmatch$(EXEEXT) \
+	test-array_list$(EXEEXT) test-atexit$(EXEEXT) \
+	test-binary-io$(EXEEXT) test-byteswap$(EXEEXT) \
 	test-c-ctype$(EXEEXT) test-c-strcasecmp$(EXEEXT) \
 	test-c-strncasecmp$(EXEEXT) test-c-strcasestr$(EXEEXT) \
 	test-c-strstr$(EXEEXT) test-canonicalize-lgpl$(EXEEXT) \
-	test-cloexec$(EXEEXT) test-close$(EXEEXT) \
-	test-copy-file$(EXEEXT) test-dirent$(EXEEXT) test-dup$(EXEEXT) \
+	test-cloexec$(EXEEXT) test-copy-file$(EXEEXT) \
 	test-dup2$(EXEEXT) test-environ$(EXEEXT) test-errno$(EXEEXT) \
-	test-fcntl-h$(EXEEXT) test-fcntl$(EXEEXT) test-fdopen$(EXEEXT) \
-	test-fgetc$(EXEEXT) test-float$(EXEEXT) test-fnmatch$(EXEEXT) \
-	test-fopen$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \
-	test-fstat$(EXEEXT) test-fstrcmp$(EXEEXT) test-ftell$(EXEEXT) \
-	test-ftell3$(EXEEXT) test-ftello$(EXEEXT) \
-	test-ftello3$(EXEEXT) test-ftello4$(EXEEXT) \
-	test-fwrite$(EXEEXT) test-getcwd-lgpl$(EXEEXT) \
-	test-getdelim$(EXEEXT) test-getdtablesize$(EXEEXT) \
-	test-getline$(EXEEXT) test-getopt$(EXEEXT) \
-	test-gettimeofday$(EXEEXT) test-iconv-h$(EXEEXT) \
-	test-iconv$(EXEEXT) test-ignore-value$(EXEEXT) \
-	test-intprops$(EXEEXT) test-inttypes$(EXEEXT) \
-	test-iswblank$(EXEEXT) test-linkedhash_list$(EXEEXT) \
-	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-lock$(EXEEXT) test-lseek$(EXEEXT) test-lstat$(EXEEXT) \
-	test-malloca$(EXEEXT) test-mbrtowc$(EXEEXT) \
-	test-mbrtowc-w32$(EXEEXT) test-mbsinit$(EXEEXT) \
+	test-fcntl-h$(EXEEXT) test-fcntl$(EXEEXT) \
+	test-fnmatch$(EXEEXT) test-fopen$(EXEEXT) \
+	test-fstrcmp$(EXEEXT) test-getdelim$(EXEEXT) \
+	test-getdtablesize$(EXEEXT) test-getline$(EXEEXT) \
+	test-getopt$(EXEEXT) test-gettimeofday$(EXEEXT) \
+	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
+	test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
+	test-localename$(EXEEXT) test-lock$(EXEEXT) \
+	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+	test-mbrtowc$(EXEEXT) test-mbsinit$(EXEEXT) \
 	test-mbsrtowcs$(EXEEXT) test-mbsstr1$(EXEEXT) \
 	test-mbsstr2$(EXEEXT) test-mbsstr3$(EXEEXT) \
-	test-memchr$(EXEEXT) test-open$(EXEEXT) test-pathmax$(EXEEXT) \
+	test-memchr$(EXEEXT) test-open$(EXEEXT) \
 	test-pipe-filter-ii1$(EXEEXT) \
 	test-pipe-filter-ii2-main$(EXEEXT) \
-	test-pipe-filter-ii2-child$(EXEEXT) test-pipe2$(EXEEXT) \
-	test-posix_spawn_file_actions_addclose$(EXEEXT) \
-	test-posix_spawn_file_actions_adddup2$(EXEEXT) \
-	test-posix_spawn_file_actions_addopen$(EXEEXT) $(am__EXEEXT_1) \
-	test-quotearg-simple$(EXEEXT) test-raise$(EXEEXT) \
-	test-rawmemchr$(EXEEXT) test-read-file$(EXEEXT) \
-	test-read$(EXEEXT) test-readlink$(EXEEXT) test-rmdir$(EXEEXT) \
-	test-sched$(EXEEXT) test-setenv$(EXEEXT) \
-	test-setlocale1$(EXEEXT) test-setlocale2$(EXEEXT) \
-	test-sh-quote$(EXEEXT) test-sigaction$(EXEEXT) \
-	test-signal-h$(EXEEXT) test-sigpipe$(EXEEXT) \
-	test-sigprocmask$(EXEEXT) test-sleep$(EXEEXT) \
-	test-snprintf$(EXEEXT) test-spawn-pipe-main$(EXEEXT) \
-	test-spawn-pipe-child$(EXEEXT) test-spawn$(EXEEXT) \
-	test-stat$(EXEEXT) test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
-	test-strchrnul$(EXEEXT) test-strerror$(EXEEXT) \
-	test-striconv$(EXEEXT) test-striconveh$(EXEEXT) \
-	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-strnlen$(EXEEXT) test-strstr$(EXEEXT) \
-	test-strtol$(EXEEXT) test-strtoul$(EXEEXT) \
+	test-pipe-filter-ii2-child$(EXEEXT) test-pipe$(EXEEXT) \
+	test-pipe2$(EXEEXT) $(am__EXEEXT_1) \
+	test-quotearg-simple$(EXEEXT) test-rawmemchr$(EXEEXT) \
+	test-read-file$(EXEEXT) test-readlink$(EXEEXT) \
+	test-rmdir$(EXEEXT) test-sched$(EXEEXT) test-setenv$(EXEEXT) \
+	test-sigaction$(EXEEXT) test-signal$(EXEEXT) \
+	test-sigpipe$(EXEEXT) test-snprintf$(EXEEXT) \
+	test-spawn$(EXEEXT) test-stat$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
+	test-stdlib$(EXEEXT) test-strchrnul$(EXEEXT) \
+	test-strerror$(EXEEXT) test-striconv$(EXEEXT) \
+	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
+	test-string$(EXEEXT) test-strstr$(EXEEXT) \
 	test-symlink$(EXEEXT) test-sys_select$(EXEEXT) \
-	test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
-	test-sys_types$(EXEEXT) test-sys_wait$(EXEEXT) \
-	test-term-ostream$(EXEEXT) test-thread_self$(EXEEXT) \
-	test-thread_create$(EXEEXT) test-time$(EXEEXT) \
+	test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \
+	test-sys_time$(EXEEXT) test-sys_wait$(EXEEXT) \
+	test-term-ostream$(EXEEXT) test-time$(EXEEXT) \
 	test-tls$(EXEEXT) test-u8-conv-from-enc$(EXEEXT) \
-	test-u8-width-linebreaks$(EXEEXT) test-uninames$(EXEEXT) \
+	test-u8-possible-linebreaks$(EXEEXT) \
+	test-u8-width-linebreaks$(EXEEXT) \
+	test-ulc-width-linebreaks$(EXEEXT) test-uninames$(EXEEXT) \
 	test-dup-safer$(EXEEXT) test-unistd$(EXEEXT) \
 	test-u16-mbtouc$(EXEEXT) test-u8-check$(EXEEXT) \
 	test-u8-cmp$(EXEEXT) test-u8-mblen$(EXEEXT) \
+	test-u8-mbtouc$(EXEEXT) test-u8-mbtouc-unsafe$(EXEEXT) \
 	test-u8-mbtoucr$(EXEEXT) test-u8-prev$(EXEEXT) \
 	test-u8-strlen$(EXEEXT) test-u8-uctomb$(EXEEXT) \
+	test-uc_width$(EXEEXT) test-uc_width2$(EXEEXT) \
 	test-unsetenv$(EXEEXT) test-vasnprintf$(EXEEXT) \
 	test-vasprintf$(EXEEXT) test-verify$(EXEEXT) \
 	test-vsnprintf$(EXEEXT) test-wchar$(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-wctype$(EXEEXT) test-wcwidth$(EXEEXT) \
+	test-xalloc-die$(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 \
@@ -270,64 +177,54 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -335,12 +232,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -357,7 +251,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -369,7 +262,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -378,26 +270,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -406,17 +292,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -442,7 +324,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -451,7 +332,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -460,26 +340,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -516,34 +394,41 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR      " $@;
-am__v_AR_1 = 
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libtests_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
-am__libtests_a_SOURCES_DIST = read-file.c glthread/thread.h \
+am__libtests_a_SOURCES_DIST = ignore-value.h glthread/thread.h \
 	glthread/thread.c unistr/u8-cmp.c unistr/u8-strlen.c \
 	glthread/yield.h
 am__dirstamp = $(am__leading_dot)dirstamp
 @LIBUNISTRING_COMPILE_UNISTR_U8_CMP_TRUE@am__objects_1 = unistr/u8-cmp.$(OBJEXT)
 @LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__objects_2 = unistr/u8-strlen.$(OBJEXT)
-am_libtests_a_OBJECTS = read-file.$(OBJEXT) glthread/thread.$(OBJEXT) \
-	$(am__objects_1) $(am__objects_2)
+am_libtests_a_OBJECTS = glthread/thread.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2)
 libtests_a_OBJECTS = $(am_libtests_a_OBJECTS)
 @POSIX_SPAWN_PORTED_TRUE@am__EXEEXT_1 = test-posix_spawn1$(EXEEXT) \
 @POSIX_SPAWN_PORTED_TRUE@	test-posix_spawn2$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
+test_alignof_SOURCES = test-alignof.c
+test_alignof_OBJECTS = test-alignof.$(OBJEXT)
+test_alignof_LDADD = $(LDADD)
+test_alignof_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
+	libtests.a $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 test_alloca_opt_SOURCES = test-alloca-opt.c
 test_alloca_opt_OBJECTS = test-alloca-opt.$(OBJEXT)
 test_alloca_opt_LDADD = $(LDADD)
 test_alloca_opt_DEPENDENCIES = libtests.a \
 	../gnulib-lib/libgettextlib.la libtests.a \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
 test_areadlink_SOURCES = test-areadlink.c
 test_areadlink_OBJECTS = test-areadlink.$(OBJEXT)
 test_areadlink_LDADD = $(LDADD)
@@ -572,11 +457,6 @@
 test_binary_io_DEPENDENCIES = libtests.a \
 	../gnulib-lib/libgettextlib.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_btowc_SOURCES = test-btowc.c
-test_btowc_OBJECTS = test-btowc.$(OBJEXT)
-test_btowc_LDADD = $(LDADD)
-test_btowc_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_byteswap_SOURCES = test-byteswap.c
 test_byteswap_OBJECTS = test-byteswap.$(OBJEXT)
 test_byteswap_LDADD = $(LDADD)
@@ -621,11 +501,6 @@
 test_cloexec_LDADD = $(LDADD)
 test_cloexec_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_close_SOURCES = test-close.c
-test_close_OBJECTS = test-close.$(OBJEXT)
-test_close_LDADD = $(LDADD)
-test_close_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_copy_acl_SOURCES = test-copy-acl.c
 test_copy_acl_OBJECTS = test-copy-acl.$(OBJEXT)
 test_copy_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -634,16 +509,6 @@
 test_copy_file_OBJECTS = test-copy-file.$(OBJEXT)
 test_copy_file_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
-test_dirent_SOURCES = test-dirent.c
-test_dirent_OBJECTS = test-dirent.$(OBJEXT)
-test_dirent_LDADD = $(LDADD)
-test_dirent_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_dup_SOURCES = test-dup.c
-test_dup_OBJECTS = test-dup.$(OBJEXT)
-test_dup_LDADD = $(LDADD)
-test_dup_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_dup_safer_SOURCES = test-dup-safer.c
 test_dup_safer_OBJECTS = test-dup-safer.$(OBJEXT)
 test_dup_safer_LDADD = $(LDADD)
@@ -675,25 +540,10 @@
 test_fcntl_h_LDADD = $(LDADD)
 test_fcntl_h_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_fdopen_SOURCES = test-fdopen.c
-test_fdopen_OBJECTS = test-fdopen.$(OBJEXT)
-test_fdopen_LDADD = $(LDADD)
-test_fdopen_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_fgetc_SOURCES = test-fgetc.c
-test_fgetc_OBJECTS = test-fgetc.$(OBJEXT)
-test_fgetc_LDADD = $(LDADD)
-test_fgetc_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_file_has_acl_SOURCES = test-file-has-acl.c
 test_file_has_acl_OBJECTS = test-file-has-acl.$(OBJEXT)
 test_file_has_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
-test_float_SOURCES = test-float.c
-test_float_OBJECTS = test-float.$(OBJEXT)
-test_float_LDADD = $(LDADD)
-test_float_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_fnmatch_SOURCES = test-fnmatch.c
 test_fnmatch_OBJECTS = test-fnmatch.$(OBJEXT)
 test_fnmatch_LDADD = $(LDADD)
@@ -704,59 +554,10 @@
 test_fopen_LDADD = $(LDADD)
 test_fopen_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_fputc_SOURCES = test-fputc.c
-test_fputc_OBJECTS = test-fputc.$(OBJEXT)
-test_fputc_LDADD = $(LDADD)
-test_fputc_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_fread_SOURCES = test-fread.c
-test_fread_OBJECTS = test-fread.$(OBJEXT)
-test_fread_LDADD = $(LDADD)
-test_fread_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_fstat_SOURCES = test-fstat.c
-test_fstat_OBJECTS = test-fstat.$(OBJEXT)
-test_fstat_LDADD = $(LDADD)
-test_fstat_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_fstrcmp_SOURCES = test-fstrcmp.c
 test_fstrcmp_OBJECTS = test-fstrcmp.$(OBJEXT)
 test_fstrcmp_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
-test_ftell_SOURCES = test-ftell.c
-test_ftell_OBJECTS = test-ftell.$(OBJEXT)
-test_ftell_LDADD = $(LDADD)
-test_ftell_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_ftell3_SOURCES = test-ftell3.c
-test_ftell3_OBJECTS = test-ftell3.$(OBJEXT)
-test_ftell3_LDADD = $(LDADD)
-test_ftell3_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_ftello_SOURCES = test-ftello.c
-test_ftello_OBJECTS = test-ftello.$(OBJEXT)
-test_ftello_LDADD = $(LDADD)
-test_ftello_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_ftello3_SOURCES = test-ftello3.c
-test_ftello3_OBJECTS = test-ftello3.$(OBJEXT)
-test_ftello3_LDADD = $(LDADD)
-test_ftello3_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_ftello4_SOURCES = test-ftello4.c
-test_ftello4_OBJECTS = test-ftello4.$(OBJEXT)
-test_ftello4_LDADD = $(LDADD)
-test_ftello4_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_fwrite_SOURCES = test-fwrite.c
-test_fwrite_OBJECTS = test-fwrite.$(OBJEXT)
-test_fwrite_LDADD = $(LDADD)
-test_fwrite_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_getcwd_lgpl_SOURCES = test-getcwd-lgpl.c
-test_getcwd_lgpl_OBJECTS = test-getcwd-lgpl.$(OBJEXT)
-test_getcwd_lgpl_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
 test_getdelim_SOURCES = test-getdelim.c
 test_getdelim_OBJECTS = test-getdelim.$(OBJEXT)
 test_getdelim_LDADD = $(LDADD)
@@ -790,27 +591,6 @@
 test_iconv_h_LDADD = $(LDADD)
 test_iconv_h_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_ignore_value_SOURCES = test-ignore-value.c
-test_ignore_value_OBJECTS = test-ignore-value.$(OBJEXT)
-test_ignore_value_LDADD = $(LDADD)
-test_ignore_value_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_intprops_SOURCES = test-intprops.c
-test_intprops_OBJECTS = test-intprops.$(OBJEXT)
-test_intprops_LDADD = $(LDADD)
-test_intprops_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_inttypes_SOURCES = test-inttypes.c
-test_inttypes_OBJECTS = test-inttypes.$(OBJEXT)
-test_inttypes_LDADD = $(LDADD)
-test_inttypes_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_iswblank_SOURCES = test-iswblank.c
-test_iswblank_OBJECTS = test-iswblank.$(OBJEXT)
-test_iswblank_LDADD = $(LDADD)
-test_iswblank_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_linkedhash_list_SOURCES = test-linkedhash_list.c
 test_linkedhash_list_OBJECTS = test-linkedhash_list.$(OBJEXT)
 test_linkedhash_list_LDADD = $(LDADD)
@@ -824,16 +604,10 @@
 	libtests.a $(am__DEPENDENCIES_1)
 test_localename_SOURCES = test-localename.c
 test_localename_OBJECTS = test-localename.$(OBJEXT)
-test_localename_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+test_localename_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_lock_SOURCES = test-lock.c
 test_lock_OBJECTS = test-lock.$(OBJEXT)
 test_lock_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_lseek_SOURCES = test-lseek.c
-test_lseek_OBJECTS = test-lseek.$(OBJEXT)
-test_lseek_LDADD = $(LDADD)
-test_lseek_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_lstat_SOURCES = test-lstat.c
 test_lstat_OBJECTS = test-lstat.$(OBJEXT)
 test_lstat_LDADD = $(LDADD)
@@ -849,12 +623,6 @@
 test_mbrtowc_LDADD = $(LDADD)
 test_mbrtowc_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_mbrtowc_w32_SOURCES = test-mbrtowc-w32.c
-test_mbrtowc_w32_OBJECTS = test-mbrtowc-w32.$(OBJEXT)
-test_mbrtowc_w32_LDADD = $(LDADD)
-test_mbrtowc_w32_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
 test_mbsinit_SOURCES = test-mbsinit.c
 test_mbsinit_OBJECTS = test-mbsinit.$(OBJEXT)
 test_mbsinit_LDADD = $(LDADD)
@@ -891,11 +659,9 @@
 test_open_LDADD = $(LDADD)
 test_open_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_pathmax_SOURCES = test-pathmax.c
-test_pathmax_OBJECTS = test-pathmax.$(OBJEXT)
-test_pathmax_LDADD = $(LDADD)
-test_pathmax_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pipe_SOURCES = test-pipe.c
+test_pipe_OBJECTS = test-pipe.$(OBJEXT)
+test_pipe_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_pipe_filter_ii1_SOURCES = test-pipe-filter-ii1.c
 test_pipe_filter_ii1_OBJECTS = test-pipe-filter-ii1.$(OBJEXT)
 test_pipe_filter_ii1_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -912,7 +678,9 @@
 test_pipe_filter_ii2_main_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_pipe2_SOURCES = test-pipe2.c
 test_pipe2_OBJECTS = test-pipe2.$(OBJEXT)
-test_pipe2_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_pipe2_LDADD = $(LDADD)
+test_pipe2_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_posix_spawn1_SOURCES = test-posix_spawn1.c
 test_posix_spawn1_OBJECTS = test-posix_spawn1.$(OBJEXT)
 test_posix_spawn1_LDADD = $(LDADD)
@@ -925,49 +693,15 @@
 test_posix_spawn2_DEPENDENCIES = libtests.a \
 	../gnulib-lib/libgettextlib.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_posix_spawn_file_actions_addclose_SOURCES =  \
-	test-posix_spawn_file_actions_addclose.c
-test_posix_spawn_file_actions_addclose_OBJECTS =  \
-	test-posix_spawn_file_actions_addclose.$(OBJEXT)
-test_posix_spawn_file_actions_addclose_LDADD = $(LDADD)
-test_posix_spawn_file_actions_addclose_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_posix_spawn_file_actions_adddup2_SOURCES =  \
-	test-posix_spawn_file_actions_adddup2.c
-test_posix_spawn_file_actions_adddup2_OBJECTS =  \
-	test-posix_spawn_file_actions_adddup2.$(OBJEXT)
-test_posix_spawn_file_actions_adddup2_LDADD = $(LDADD)
-test_posix_spawn_file_actions_adddup2_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_posix_spawn_file_actions_addopen_SOURCES =  \
-	test-posix_spawn_file_actions_addopen.c
-test_posix_spawn_file_actions_addopen_OBJECTS =  \
-	test-posix_spawn_file_actions_addopen.$(OBJEXT)
-test_posix_spawn_file_actions_addopen_LDADD = $(LDADD)
-test_posix_spawn_file_actions_addopen_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
 test_quotearg_simple_SOURCES = test-quotearg-simple.c
 test_quotearg_simple_OBJECTS = test-quotearg-simple.$(OBJEXT)
 test_quotearg_simple_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_raise_SOURCES = test-raise.c
-test_raise_OBJECTS = test-raise.$(OBJEXT)
-test_raise_LDADD = $(LDADD)
-test_raise_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_rawmemchr_SOURCES = test-rawmemchr.c
 test_rawmemchr_OBJECTS = test-rawmemchr.$(OBJEXT)
 test_rawmemchr_LDADD = $(LDADD)
 test_rawmemchr_DEPENDENCIES = libtests.a \
 	../gnulib-lib/libgettextlib.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_read_SOURCES = test-read.c
-test_read_OBJECTS = test-read.$(OBJEXT)
-test_read_LDADD = $(LDADD)
-test_read_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_read_file_SOURCES = test-read-file.c
 test_read_file_OBJECTS = test-read-file.$(OBJEXT)
 test_read_file_LDADD = $(LDADD)
@@ -1002,48 +736,22 @@
 test_setenv_LDADD = $(LDADD)
 test_setenv_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_setlocale1_SOURCES = test-setlocale1.c
-test_setlocale1_OBJECTS = test-setlocale1.$(OBJEXT)
-test_setlocale1_LDADD = $(LDADD)
-test_setlocale1_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_setlocale2_SOURCES = test-setlocale2.c
-test_setlocale2_OBJECTS = test-setlocale2.$(OBJEXT)
-test_setlocale2_LDADD = $(LDADD)
-test_setlocale2_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_sh_quote_SOURCES = test-sh-quote.c
-test_sh_quote_OBJECTS = test-sh-quote.$(OBJEXT)
-test_sh_quote_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_sigaction_SOURCES = test-sigaction.c
 test_sigaction_OBJECTS = test-sigaction.$(OBJEXT)
 test_sigaction_LDADD = $(LDADD)
 test_sigaction_DEPENDENCIES = libtests.a \
 	../gnulib-lib/libgettextlib.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_signal_h_SOURCES = test-signal-h.c
-test_signal_h_OBJECTS = test-signal-h.$(OBJEXT)
-test_signal_h_LDADD = $(LDADD)
-test_signal_h_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
+test_signal_SOURCES = test-signal.c
+test_signal_OBJECTS = test-signal.$(OBJEXT)
+test_signal_LDADD = $(LDADD)
+test_signal_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
 test_sigpipe_SOURCES = test-sigpipe.c
 test_sigpipe_OBJECTS = test-sigpipe.$(OBJEXT)
 test_sigpipe_LDADD = $(LDADD)
 test_sigpipe_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_sigprocmask_SOURCES = test-sigprocmask.c
-test_sigprocmask_OBJECTS = test-sigprocmask.$(OBJEXT)
-test_sigprocmask_LDADD = $(LDADD)
-test_sigprocmask_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_sleep_SOURCES = test-sleep.c
-test_sleep_OBJECTS = test-sleep.$(OBJEXT)
-test_sleep_LDADD = $(LDADD)
-test_sleep_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_snprintf_SOURCES = test-snprintf.c
 test_snprintf_OBJECTS = test-snprintf.$(OBJEXT)
 test_snprintf_LDADD = $(LDADD)
@@ -1054,15 +762,11 @@
 test_spawn_LDADD = $(LDADD)
 test_spawn_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_spawn_pipe_child_SOURCES = test-spawn-pipe-child.c
-test_spawn_pipe_child_OBJECTS = test-spawn-pipe-child.$(OBJEXT)
-test_spawn_pipe_child_DEPENDENCIES =
-test_spawn_pipe_main_SOURCES = test-spawn-pipe-main.c
-test_spawn_pipe_main_OBJECTS = test-spawn-pipe-main.$(OBJEXT)
-test_spawn_pipe_main_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_stat_SOURCES = test-stat.c
 test_stat_OBJECTS = test-stat.$(OBJEXT)
-test_stat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+test_stat_LDADD = $(LDADD)
+test_stat_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_stdbool_SOURCES = test-stdbool.c
 test_stdbool_OBJECTS = test-stdbool.$(OBJEXT)
 test_stdbool_LDADD = $(LDADD)
@@ -1104,37 +808,20 @@
 test_striconv_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_striconveh_SOURCES = test-striconveh.c
 test_striconveh_OBJECTS = test-striconveh.$(OBJEXT)
-test_striconveh_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+test_striconveh_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_striconveha_SOURCES = test-striconveha.c
 test_striconveha_OBJECTS = test-striconveha.$(OBJEXT)
-test_striconveha_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+test_striconveha_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_string_SOURCES = test-string.c
 test_string_OBJECTS = test-string.$(OBJEXT)
 test_string_LDADD = $(LDADD)
 test_string_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_strnlen_SOURCES = test-strnlen.c
-test_strnlen_OBJECTS = test-strnlen.$(OBJEXT)
-test_strnlen_LDADD = $(LDADD)
-test_strnlen_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_strstr_SOURCES = test-strstr.c
 test_strstr_OBJECTS = test-strstr.$(OBJEXT)
 test_strstr_LDADD = $(LDADD)
 test_strstr_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_strtol_SOURCES = test-strtol.c
-test_strtol_OBJECTS = test-strtol.$(OBJEXT)
-test_strtol_LDADD = $(LDADD)
-test_strtol_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_strtoul_SOURCES = test-strtoul.c
-test_strtoul_OBJECTS = test-strtoul.$(OBJEXT)
-test_strtoul_LDADD = $(LDADD)
-test_strtoul_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_symlink_SOURCES = test-symlink.c
 test_symlink_OBJECTS = test-symlink.$(OBJEXT)
 test_symlink_LDADD = $(LDADD)
@@ -1146,6 +833,12 @@
 test_sys_select_DEPENDENCIES = libtests.a \
 	../gnulib-lib/libgettextlib.la libtests.a \
 	$(am__DEPENDENCIES_1)
+test_sys_socket_SOURCES = test-sys_socket.c
+test_sys_socket_OBJECTS = test-sys_socket.$(OBJEXT)
+test_sys_socket_LDADD = $(LDADD)
+test_sys_socket_DEPENDENCIES = libtests.a \
+	../gnulib-lib/libgettextlib.la libtests.a \
+	$(am__DEPENDENCIES_1)
 test_sys_stat_SOURCES = test-sys_stat.c
 test_sys_stat_OBJECTS = test-sys_stat.$(OBJEXT)
 test_sys_stat_LDADD = $(LDADD)
@@ -1156,12 +849,6 @@
 test_sys_time_LDADD = $(LDADD)
 test_sys_time_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_sys_types_SOURCES = test-sys_types.c
-test_sys_types_OBJECTS = test-sys_types.$(OBJEXT)
-test_sys_types_LDADD = $(LDADD)
-test_sys_types_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
 test_sys_wait_SOURCES = test-sys_wait.c
 test_sys_wait_OBJECTS = test-sys_wait.$(OBJEXT)
 test_sys_wait_LDADD = $(LDADD)
@@ -1170,12 +857,6 @@
 test_term_ostream_SOURCES = test-term-ostream.c
 test_term_ostream_OBJECTS = test-term-ostream.$(OBJEXT)
 test_term_ostream_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_thread_create_SOURCES = test-thread_create.c
-test_thread_create_OBJECTS = test-thread_create.$(OBJEXT)
-test_thread_create_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_thread_self_SOURCES = test-thread_self.c
-test_thread_self_OBJECTS = test-thread_self.$(OBJEXT)
-test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_time_SOURCES = test-time.c
 test_time_OBJECTS = test-time.$(OBJEXT)
 test_time_LDADD = $(LDADD)
@@ -1204,10 +885,25 @@
 test_u8_mblen_OBJECTS = $(am_test_u8_mblen_OBJECTS)
 test_u8_mblen_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
+am_test_u8_mbtouc_OBJECTS = unistr/test-u8-mbtouc.$(OBJEXT)
+test_u8_mbtouc_OBJECTS = $(am_test_u8_mbtouc_OBJECTS)
+test_u8_mbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
+am_test_u8_mbtouc_unsafe_OBJECTS =  \
+	unistr/test-u8-mbtouc-unsafe.$(OBJEXT)
+test_u8_mbtouc_unsafe_OBJECTS = $(am_test_u8_mbtouc_unsafe_OBJECTS)
+test_u8_mbtouc_unsafe_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 am_test_u8_mbtoucr_OBJECTS = unistr/test-u8-mbtoucr.$(OBJEXT)
 test_u8_mbtoucr_OBJECTS = $(am_test_u8_mbtoucr_OBJECTS)
 test_u8_mbtoucr_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
+am_test_u8_possible_linebreaks_OBJECTS =  \
+	unilbrk/test-u8-possible-linebreaks.$(OBJEXT)
+test_u8_possible_linebreaks_OBJECTS =  \
+	$(am_test_u8_possible_linebreaks_OBJECTS)
+test_u8_possible_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 am_test_u8_prev_OBJECTS = unistr/test-u8-prev.$(OBJEXT)
 test_u8_prev_OBJECTS = $(am_test_u8_prev_OBJECTS)
 test_u8_prev_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -1226,6 +922,20 @@
 	$(am_test_u8_width_linebreaks_OBJECTS)
 test_u8_width_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
+am_test_uc_width_OBJECTS = uniwidth/test-uc_width.$(OBJEXT)
+test_uc_width_OBJECTS = $(am_test_uc_width_OBJECTS)
+test_uc_width_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
+am_test_uc_width2_OBJECTS = uniwidth/test-uc_width2.$(OBJEXT)
+test_uc_width2_OBJECTS = $(am_test_uc_width2_OBJECTS)
+test_uc_width2_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
+am_test_ulc_width_linebreaks_OBJECTS =  \
+	unilbrk/test-ulc-width-linebreaks.$(OBJEXT)
+test_ulc_width_linebreaks_OBJECTS =  \
+	$(am_test_ulc_width_linebreaks_OBJECTS)
+test_ulc_width_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 am_test_uninames_OBJECTS = uniname/test-uninames.$(OBJEXT)
 test_uninames_OBJECTS = $(am_test_uninames_OBJECTS)
 test_uninames_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -1268,50 +978,22 @@
 test_wchar_LDADD = $(LDADD)
 test_wchar_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_wcrtomb_SOURCES = test-wcrtomb.c
-test_wcrtomb_OBJECTS = test-wcrtomb.$(OBJEXT)
-test_wcrtomb_LDADD = $(LDADD)
-test_wcrtomb_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
-test_wcrtomb_w32_SOURCES = test-wcrtomb-w32.c
-test_wcrtomb_w32_OBJECTS = test-wcrtomb-w32.$(OBJEXT)
-test_wcrtomb_w32_LDADD = $(LDADD)
-test_wcrtomb_w32_DEPENDENCIES = libtests.a \
-	../gnulib-lib/libgettextlib.la libtests.a \
-	$(am__DEPENDENCIES_1)
-test_wctype_h_SOURCES = test-wctype-h.c
-test_wctype_h_OBJECTS = test-wctype-h.$(OBJEXT)
-test_wctype_h_LDADD = $(LDADD)
-test_wctype_h_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
+test_wctype_SOURCES = test-wctype.c
+test_wctype_OBJECTS = test-wctype.$(OBJEXT)
+test_wctype_LDADD = $(LDADD)
+test_wctype_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
 test_wcwidth_SOURCES = test-wcwidth.c
 test_wcwidth_OBJECTS = test-wcwidth.$(OBJEXT)
 test_wcwidth_LDADD = $(LDADD)
 test_wcwidth_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_write_SOURCES = test-write.c
-test_write_OBJECTS = test-write.$(OBJEXT)
-test_write_LDADD = $(LDADD)
-test_write_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
-	libtests.a $(am__DEPENDENCIES_1)
 test_xalloc_die_SOURCES = test-xalloc-die.c
 test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT)
 test_xalloc_die_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_xvasprintf_SOURCES = test-xvasprintf.c
 test_xvasprintf_OBJECTS = test-xvasprintf.$(OBJEXT)
 test_xvasprintf_DEPENDENCIES = $(am__DEPENDENCIES_2)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -1322,364 +1004,129 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
-	test-alloca-opt.c test-areadlink.c test-argmatch.c \
-	test-array_list.c test-atexit.c test-binary-io.c test-btowc.c \
-	test-byteswap.c test-c-ctype.c test-c-strcasecmp.c \
-	test-c-strcasestr.c test-c-strncasecmp.c test-c-strstr.c \
-	test-canonicalize-lgpl.c test-cloexec.c test-close.c \
-	test-copy-acl.c test-copy-file.c test-dirent.c test-dup.c \
-	test-dup-safer.c test-dup2.c test-environ.c test-errno.c \
-	test-fcntl.c test-fcntl-h.c test-fdopen.c test-fgetc.c \
-	test-file-has-acl.c test-float.c test-fnmatch.c test-fopen.c \
-	test-fputc.c test-fread.c test-fstat.c test-fstrcmp.c \
-	test-ftell.c test-ftell3.c test-ftello.c test-ftello3.c \
-	test-ftello4.c test-fwrite.c test-getcwd-lgpl.c \
+	test-alignof.c test-alloca-opt.c test-areadlink.c \
+	test-argmatch.c test-array_list.c test-atexit.c \
+	test-binary-io.c test-byteswap.c test-c-ctype.c \
+	test-c-strcasecmp.c test-c-strcasestr.c test-c-strncasecmp.c \
+	test-c-strstr.c test-canonicalize-lgpl.c test-cloexec.c \
+	test-copy-acl.c test-copy-file.c test-dup-safer.c test-dup2.c \
+	test-environ.c test-errno.c test-fcntl.c test-fcntl-h.c \
+	test-file-has-acl.c test-fnmatch.c test-fopen.c test-fstrcmp.c \
 	test-getdelim.c test-getdtablesize.c test-getline.c \
 	test-getopt.c test-gettimeofday.c test-iconv.c test-iconv-h.c \
-	test-ignore-value.c test-intprops.c test-inttypes.c \
-	test-iswblank.c test-linkedhash_list.c test-locale.c \
-	test-localename.c test-lock.c test-lseek.c test-lstat.c \
-	test-malloca.c test-mbrtowc.c test-mbrtowc-w32.c \
+	test-linkedhash_list.c test-locale.c test-localename.c \
+	test-lock.c test-lstat.c test-malloca.c test-mbrtowc.c \
 	test-mbsinit.c test-mbsrtowcs.c test-mbsstr1.c test-mbsstr2.c \
-	test-mbsstr3.c test-memchr.c test-open.c test-pathmax.c \
+	test-mbsstr3.c test-memchr.c test-open.c test-pipe.c \
 	test-pipe-filter-ii1.c test-pipe-filter-ii2-child.c \
 	test-pipe-filter-ii2-main.c test-pipe2.c test-posix_spawn1.c \
-	test-posix_spawn2.c test-posix_spawn_file_actions_addclose.c \
-	test-posix_spawn_file_actions_adddup2.c \
-	test-posix_spawn_file_actions_addopen.c test-quotearg-simple.c \
-	test-raise.c test-rawmemchr.c test-read.c test-read-file.c \
-	test-readlink.c test-rmdir.c test-sameacls.c test-sched.c \
-	test-set-mode-acl.c test-setenv.c test-setlocale1.c \
-	test-setlocale2.c test-sh-quote.c test-sigaction.c \
-	test-signal-h.c test-sigpipe.c test-sigprocmask.c test-sleep.c \
-	test-snprintf.c test-spawn.c test-spawn-pipe-child.c \
-	test-spawn-pipe-main.c test-stat.c test-stdbool.c \
-	test-stddef.c test-stdint.c test-stdio.c test-stdlib.c \
-	test-strchrnul.c test-strerror.c test-striconv.c \
-	test-striconveh.c test-striconveha.c test-string.c \
-	test-strnlen.c test-strstr.c test-strtol.c test-strtoul.c \
-	test-symlink.c test-sys_select.c test-sys_stat.c \
-	test-sys_time.c test-sys_types.c test-sys_wait.c \
-	test-term-ostream.c test-thread_create.c test-thread_self.c \
+	test-posix_spawn2.c test-quotearg-simple.c test-rawmemchr.c \
+	test-read-file.c test-readlink.c test-rmdir.c test-sameacls.c \
+	test-sched.c test-set-mode-acl.c test-setenv.c \
+	test-sigaction.c test-signal.c test-sigpipe.c test-snprintf.c \
+	test-spawn.c test-stat.c test-stdbool.c test-stddef.c \
+	test-stdint.c test-stdio.c test-stdlib.c test-strchrnul.c \
+	test-strerror.c test-striconv.c test-striconveh.c \
+	test-striconveha.c test-string.c test-strstr.c test-symlink.c \
+	test-sys_select.c test-sys_socket.c test-sys_stat.c \
+	test-sys_time.c test-sys_wait.c test-term-ostream.c \
 	test-time.c test-tls.c $(test_u16_mbtouc_SOURCES) \
 	$(test_u8_check_SOURCES) $(test_u8_cmp_SOURCES) \
 	$(test_u8_conv_from_enc_SOURCES) $(test_u8_mblen_SOURCES) \
-	$(test_u8_mbtoucr_SOURCES) $(test_u8_prev_SOURCES) \
+	$(test_u8_mbtouc_SOURCES) $(test_u8_mbtouc_unsafe_SOURCES) \
+	$(test_u8_mbtoucr_SOURCES) \
+	$(test_u8_possible_linebreaks_SOURCES) $(test_u8_prev_SOURCES) \
 	$(test_u8_strlen_SOURCES) $(test_u8_uctomb_SOURCES) \
-	$(test_u8_width_linebreaks_SOURCES) $(test_uninames_SOURCES) \
-	test-unistd.c 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_u8_width_linebreaks_SOURCES) $(test_uc_width_SOURCES) \
+	$(test_uc_width2_SOURCES) $(test_ulc_width_linebreaks_SOURCES) \
+	$(test_uninames_SOURCES) test-unistd.c test-unsetenv.c \
+	test-vasnprintf.c test-vasprintf.c test-verify.c \
+	test-vsnprintf.c test-wchar.c test-wctype.c test-wcwidth.c \
+	test-xalloc-die.c test-xvasprintf.c
 DIST_SOURCES = $(am__libtests_a_SOURCES_DIST) \
-	$(EXTRA_libtests_a_SOURCES) test-alloca-opt.c test-areadlink.c \
-	test-argmatch.c test-array_list.c test-atexit.c \
-	test-binary-io.c test-btowc.c test-byteswap.c test-c-ctype.c \
+	$(EXTRA_libtests_a_SOURCES) test-alignof.c test-alloca-opt.c \
+	test-areadlink.c test-argmatch.c test-array_list.c \
+	test-atexit.c test-binary-io.c test-byteswap.c test-c-ctype.c \
 	test-c-strcasecmp.c test-c-strcasestr.c test-c-strncasecmp.c \
 	test-c-strstr.c test-canonicalize-lgpl.c test-cloexec.c \
-	test-close.c test-copy-acl.c test-copy-file.c test-dirent.c \
-	test-dup.c test-dup-safer.c test-dup2.c test-environ.c \
-	test-errno.c test-fcntl.c test-fcntl-h.c test-fdopen.c \
-	test-fgetc.c test-file-has-acl.c test-float.c test-fnmatch.c \
-	test-fopen.c test-fputc.c test-fread.c test-fstat.c \
-	test-fstrcmp.c test-ftell.c test-ftell3.c test-ftello.c \
-	test-ftello3.c test-ftello4.c test-fwrite.c test-getcwd-lgpl.c \
+	test-copy-acl.c test-copy-file.c test-dup-safer.c test-dup2.c \
+	test-environ.c test-errno.c test-fcntl.c test-fcntl-h.c \
+	test-file-has-acl.c test-fnmatch.c test-fopen.c test-fstrcmp.c \
 	test-getdelim.c test-getdtablesize.c test-getline.c \
 	test-getopt.c test-gettimeofday.c test-iconv.c test-iconv-h.c \
-	test-ignore-value.c test-intprops.c test-inttypes.c \
-	test-iswblank.c test-linkedhash_list.c test-locale.c \
-	test-localename.c test-lock.c test-lseek.c test-lstat.c \
-	test-malloca.c test-mbrtowc.c test-mbrtowc-w32.c \
+	test-linkedhash_list.c test-locale.c test-localename.c \
+	test-lock.c test-lstat.c test-malloca.c test-mbrtowc.c \
 	test-mbsinit.c test-mbsrtowcs.c test-mbsstr1.c test-mbsstr2.c \
-	test-mbsstr3.c test-memchr.c test-open.c test-pathmax.c \
+	test-mbsstr3.c test-memchr.c test-open.c test-pipe.c \
 	test-pipe-filter-ii1.c test-pipe-filter-ii2-child.c \
 	test-pipe-filter-ii2-main.c test-pipe2.c test-posix_spawn1.c \
-	test-posix_spawn2.c test-posix_spawn_file_actions_addclose.c \
-	test-posix_spawn_file_actions_adddup2.c \
-	test-posix_spawn_file_actions_addopen.c test-quotearg-simple.c \
-	test-raise.c test-rawmemchr.c test-read.c test-read-file.c \
-	test-readlink.c test-rmdir.c test-sameacls.c test-sched.c \
-	test-set-mode-acl.c test-setenv.c test-setlocale1.c \
-	test-setlocale2.c test-sh-quote.c test-sigaction.c \
-	test-signal-h.c test-sigpipe.c test-sigprocmask.c test-sleep.c \
-	test-snprintf.c test-spawn.c test-spawn-pipe-child.c \
-	test-spawn-pipe-main.c test-stat.c test-stdbool.c \
-	test-stddef.c test-stdint.c test-stdio.c test-stdlib.c \
-	test-strchrnul.c test-strerror.c test-striconv.c \
-	test-striconveh.c test-striconveha.c test-string.c \
-	test-strnlen.c test-strstr.c test-strtol.c test-strtoul.c \
-	test-symlink.c test-sys_select.c test-sys_stat.c \
-	test-sys_time.c test-sys_types.c test-sys_wait.c \
-	test-term-ostream.c test-thread_create.c test-thread_self.c \
+	test-posix_spawn2.c test-quotearg-simple.c test-rawmemchr.c \
+	test-read-file.c test-readlink.c test-rmdir.c test-sameacls.c \
+	test-sched.c test-set-mode-acl.c test-setenv.c \
+	test-sigaction.c test-signal.c test-sigpipe.c test-snprintf.c \
+	test-spawn.c test-stat.c test-stdbool.c test-stddef.c \
+	test-stdint.c test-stdio.c test-stdlib.c test-strchrnul.c \
+	test-strerror.c test-striconv.c test-striconveh.c \
+	test-striconveha.c test-string.c test-strstr.c test-symlink.c \
+	test-sys_select.c test-sys_socket.c test-sys_stat.c \
+	test-sys_time.c test-sys_wait.c test-term-ostream.c \
 	test-time.c test-tls.c $(test_u16_mbtouc_SOURCES) \
 	$(test_u8_check_SOURCES) $(test_u8_cmp_SOURCES) \
 	$(test_u8_conv_from_enc_SOURCES) $(test_u8_mblen_SOURCES) \
-	$(test_u8_mbtoucr_SOURCES) $(test_u8_prev_SOURCES) \
+	$(test_u8_mbtouc_SOURCES) $(test_u8_mbtouc_unsafe_SOURCES) \
+	$(test_u8_mbtoucr_SOURCES) \
+	$(test_u8_possible_linebreaks_SOURCES) $(test_u8_prev_SOURCES) \
 	$(test_u8_strlen_SOURCES) $(test_u8_uctomb_SOURCES) \
-	$(test_u8_width_linebreaks_SOURCES) $(test_uninames_SOURCES) \
-	test-unistd.c 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
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+	$(test_u8_width_linebreaks_SOURCES) $(test_uc_width_SOURCES) \
+	$(test_uc_width2_SOURCES) $(test_ulc_width_linebreaks_SOURCES) \
+	$(test_uninames_SOURCES) test-unistd.c test-unsetenv.c \
+	test-vasnprintf.c test-vasprintf.c test-verify.c \
+	test-vsnprintf.c test-wchar.c test-wctype.c test-wcwidth.c \
+	test-xalloc-die.c test-xvasprintf.c
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
+# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
+# then this fails; a conservative approach.  Of course do not redirect
+# stdout here, just stderr.
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=; \
+test "X$(AM_COLOR_TESTS)" != Xno \
+&& test "X$$TERM" != Xdumb \
+&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
+&& { \
+  red=''; \
+  grn=''; \
+  lgn=''; \
+  blu=''; \
+  std=''; \
 }
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../build-aux/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -1707,7 +1154,6 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -1716,7 +1162,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -1754,7 +1199,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -1791,18 +1235,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -1814,26 +1257,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -1841,8 +1274,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -1854,23 +1285,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -1893,7 +1319,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -1911,18 +1336,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -1947,47 +1367,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -1995,7 +1407,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -2005,21 +1416,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -2031,103 +1438,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -2138,11 +1492,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -2152,6 +1501,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -2164,7 +1514,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -2185,16 +1534,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -2217,48 +1566,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -2281,6 +1615,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -2290,13 +1625,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -2305,47 +1643,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -2360,8 +1667,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -2401,7 +1706,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -2423,8 +1727,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -2432,13 +1736,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -2451,21 +1753,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -2478,9 +1778,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -2504,9 +1804,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -2520,12 +1818,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -2533,8 +1828,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -2546,41 +1839,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -2594,27 +1875,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -2622,34 +1890,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -2665,9 +1924,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -2687,8 +1944,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -2697,8 +1952,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -2713,7 +1966,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -2764,6 +2016,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -2771,7 +2024,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -2783,11 +2035,10 @@
 top_srcdir = @top_srcdir@
 
 # Rules generated and collected by gnulib-tool.
-AUTOMAKE_OPTIONS = 1.9.6 foreign subdir-objects 1.11 color-tests
+AUTOMAKE_OPTIONS = 1.5 foreign subdir-objects 1.11 color-tests
 SUBDIRS = .
 TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' srcdir='$(srcdir)' \
 	USE_ACL=$(USE_ACL) LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
 	LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' USE_ACL=$(USE_ACL) \
 	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
 	LOCALE_JA='@LOCALE_JA@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' \
@@ -2795,113 +2046,74 @@
 	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
 	LOCALE_ZH_CN='@LOCALE_ZH_CN@' \
 	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-	LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
 	LOCALE_ZH_CN='@LOCALE_ZH_CN@' srcdir='$(srcdir)' \
-	MAKE='$(MAKE)' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
-	LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+	MAKE='$(MAKE)'
 noinst_HEADERS = 
 noinst_LIBRARIES = 
 check_LIBRARIES = libtests.a
-EXTRA_DIST = test-file-has-acl.sh test-file-has-acl-1.sh \
-	test-file-has-acl-2.sh test-set-mode-acl.sh \
-	test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh \
-	test-copy-acl-1.sh test-copy-acl-2.sh test-file-has-acl.c \
-	test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h \
+EXTRA_DIST = test-file-has-acl.sh test-set-mode-acl.sh \
+	test-copy-acl.sh test-file-has-acl.c test-set-mode-acl.c \
+	test-copy-acl.c test-sameacls.c macros.h test-alignof.c \
 	test-alloca-opt.c test-areadlink.h test-areadlink.c macros.h \
-	test-argmatch.c macros.h test-array_list.c macros.h \
-	signature.h test-atexit.sh test-atexit.c test-binary-io.sh \
-	test-binary-io.c macros.h btowc.c test-btowc1.sh \
-	test-btowc2.sh test-btowc.c signature.h macros.h \
-	test-byteswap.c macros.h test-c-ctype.c macros.h \
+	$(top_srcdir)/../build-aux/arg-nonnull.h test-argmatch.c \
+	macros.h test-array_list.c macros.h init.sh signature.h \
+	test-atexit.sh test-atexit.c test-binary-io.sh \
+	test-binary-io.c macros.h test-byteswap.c macros.h \
+	$(top_srcdir)/../build-aux/c++defs.h test-c-ctype.c macros.h \
 	test-c-strcase.sh test-c-strcasecmp.c test-c-strncasecmp.c \
 	macros.h test-c-strcasestr.c macros.h test-c-strstr.c macros.h \
 	test-canonicalize-lgpl.c signature.h macros.h test-cloexec.c \
-	macros.h test-close.c signature.h macros.h test-copy-file.sh \
-	test-copy-file-1.sh test-copy-file-2.sh test-copy-file.c \
-	macros.h test-dirent.c dup.c test-dup.c signature.h macros.h \
+	macros.h test-copy-file.sh test-copy-file.c macros.h \
 	test-dup2.c signature.h macros.h test-environ.c test-errno.c \
-	test-fcntl-h.c test-fcntl.c signature.h macros.h fdopen.c \
-	test-fdopen.c signature.h macros.h test-fgetc.c signature.h \
-	macros.h test-float.c macros.h test-fnmatch.c signature.h \
-	macros.h test-fopen.h test-fopen.c signature.h macros.h \
-	fpucw.h test-fputc.c signature.h macros.h test-fread.c \
-	signature.h macros.h test-fstat.c signature.h macros.h \
-	test-fstrcmp.c macros.h ftell.c test-ftell.c test-ftell.sh \
-	test-ftell2.sh test-ftell3.c signature.h macros.h ftello.c \
-	stdio-impl.h test-ftello.c test-ftello.sh test-ftello2.sh \
-	test-ftello3.c test-ftello4.c test-ftello4.sh signature.h \
-	macros.h test-fwrite.c signature.h macros.h getcwd-lgpl.c \
-	test-getcwd-lgpl.c signature.h macros.h test-getdelim.c \
+	test-fcntl-h.c test-fcntl.c signature.h macros.h \
+	test-fnmatch.c signature.h macros.h test-fopen.h test-fopen.c \
+	signature.h macros.h test-fstrcmp.c macros.h test-getdelim.c \
 	signature.h macros.h test-getdtablesize.c signature.h macros.h \
 	test-getline.c signature.h macros.h macros.h signature.h \
 	test-getopt.c test-getopt.h test-getopt_long.h getpagesize.c \
 	signature.h test-gettimeofday.c test-iconv-h.c test-iconv.c \
-	signature.h macros.h test-ignore-value.c test-intprops.c \
-	macros.h inttypes.in.h test-inttypes.c test-iswblank.c \
-	macros.h test-linkedhash_list.c macros.h test-locale.c \
-	test-localename.c macros.h test-lock.c 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-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 \
+	signature.h macros.h test-linkedhash_list.c macros.h \
+	test-locale.c test-localename.c macros.h test-lock.c \
+	test-lstat.h test-lstat.c signature.h macros.h test-malloca.c \
+	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+	test-mbrtowc4.sh test-mbrtowc.c signature.h macros.h \
 	test-mbsinit.sh test-mbsinit.c signature.h macros.h \
 	test-mbsrtowcs1.sh test-mbsrtowcs2.sh test-mbsrtowcs3.sh \
 	test-mbsrtowcs4.sh test-mbsrtowcs.c signature.h macros.h \
 	test-mbsstr1.c test-mbsstr2.sh test-mbsstr2.c test-mbsstr3.sh \
-	test-mbsstr3.c macros.h mbtowc-impl.h mbtowc.c test-memchr.c \
-	zerosize-ptr.h signature.h macros.h test-moo-root.oo.h \
-	test-moo-root.oo.c test-moo-sub1.oo.h test-moo-sub1.oo.c \
-	test-moo-sub2.oo.h test-moo-sub2.oo.c test-moo-aroot.oo.h \
-	test-moo-aroot.oo.c test-moo-asub1.oo.h test-moo-asub1.oo.c \
-	test-moo-assign.c test-open.h test-open.c signature.h macros.h \
-	test-pathmax.c test-pipe-filter-ii1.sh test-pipe-filter-ii1.c \
+	test-mbsstr3.c macros.h test-memchr.c zerosize-ptr.h \
+	signature.h macros.h test-moo-root.oo.h test-moo-root.oo.c \
+	test-moo-sub1.oo.h test-moo-sub1.oo.c test-moo-sub2.oo.h \
+	test-moo-sub2.oo.c test-moo-aroot.oo.h test-moo-aroot.oo.c \
+	test-moo-asub1.oo.h test-moo-asub1.oo.c test-moo-assign.c \
+	test-open.h test-open.c signature.h macros.h \
+	test-pipe-filter-ii1.sh test-pipe-filter-ii1.c \
 	test-vasnprintf-posix.c test-pipe-filter-ii2.sh \
 	test-pipe-filter-ii2-main.c test-pipe-filter-ii2-child.c \
-	macros.h test-pipe2.c signature.h macros.h \
-	test-posix_spawn_file_actions_addclose.c signature.h macros.h \
-	test-posix_spawn_file_actions_adddup2.c signature.h macros.h \
-	test-posix_spawn_file_actions_addopen.c signature.h macros.h \
-	test-posix_spawn1.c test-posix_spawn1.in.sh \
-	test-posix_spawn2.c test-posix_spawn2.in.sh signature.h \
-	putenv.c test-quotearg-simple.c test-quotearg.h macros.h \
-	zerosize-ptr.h test-raise.c signature.h macros.h \
-	test-rawmemchr.c zerosize-ptr.h signature.h macros.h \
-	read-file.h test-read-file.c test-read.c signature.h macros.h \
-	test-readlink.h test-readlink.c signature.h macros.h \
-	test-rmdir.h test-rmdir.c signature.h macros.h same-inode.h \
-	test-sched.c test-setenv.c signature.h macros.h \
-	test-setlocale1.sh test-setlocale1.c test-setlocale2.sh \
-	test-setlocale2.c signature.h macros.h test-sh-quote.c \
-	test-sigaction.c signature.h macros.h test-signal-h.c \
-	test-sigpipe.c test-sigpipe.sh test-sigprocmask.c signature.h \
-	macros.h sleep.c test-sleep.c signature.h macros.h \
-	$(top_srcdir)/../build-aux/snippet/_Noreturn.h \
-	$(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	$(top_srcdir)/../build-aux/snippet/c++defs.h \
-	$(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	$(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	test-snprintf.c signature.h macros.h test-spawn-pipe.sh \
-	test-spawn-pipe-main.c test-spawn-pipe-child.c macros.h \
-	test-spawn.c test-stat.h test-stat.c signature.h macros.h \
-	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
-	test-stdlib.c test-sys_wait.h test-strchrnul.c signature.h \
+	macros.h test-pipe.sh test-pipe.c macros.h test-pipe2.c \
+	signature.h macros.h test-posix_spawn1.c \
+	test-posix_spawn1.in.sh test-posix_spawn2.c \
+	test-posix_spawn2.in.sh signature.h putenv.c \
+	test-quotearg-simple.c test-quotearg.h macros.h \
+	test-rawmemchr.c signature.h macros.h read-file.c read-file.h \
+	test-read-file.c test-readlink.h test-readlink.c signature.h \
+	macros.h test-rmdir.h test-rmdir.c signature.h macros.h \
+	same-inode.h test-sched.c test-setenv.c signature.h macros.h \
+	test-sigaction.c signature.h macros.h test-signal.c \
+	test-sigpipe.c test-sigpipe.sh test-snprintf.c signature.h \
+	macros.h test-spawn.c test-stat.h test-stat.c signature.h \
+	macros.h test-stdbool.c test-stddef.c test-stdint.c \
+	test-stdio.c test-stdlib.c test-strchrnul.c signature.h \
 	macros.h test-strerror.c signature.h macros.h test-striconv.c \
 	macros.h test-striconveh.c macros.h test-striconveha.c \
-	macros.h test-string.c test-strnlen.c zerosize-ptr.h \
-	signature.h macros.h test-strstr.c zerosize-ptr.h signature.h \
-	macros.h test-strtol.c signature.h macros.h test-strtoul.c \
+	macros.h test-string.c test-strstr.c zerosize-ptr.h \
 	signature.h macros.h symlink.c test-symlink.h test-symlink.c \
-	signature.h macros.h test-sys_select.c signature.h \
-	test-sys_stat.c test-sys_time.c test-sys_types.c \
-	test-sys_wait.c test-sys_wait.h test-term-ostream.c \
-	test-term-ostream-xterm test-term-ostream-xterm-r6.out \
+	signature.h macros.h test-sys_select.c test-sys_socket.c \
+	test-sys_stat.c test-sys_time.c test-sys_wait.c \
+	test-term-ostream.c test-term-ostream-xterm \
+	test-term-ostream-xterm-r6.out \
 	test-term-ostream-xterm-xf86-v32.out \
 	test-term-ostream-xterm-basic.out \
-	test-term-ostream-xterm-basic-italic.out \
 	test-term-ostream-xterm-8bit.out \
 	test-term-ostream-xterm-linux-debian.out \
 	test-term-ostream-xterm-linux-mandriva.out \
@@ -2913,29 +2125,32 @@
 	test-term-ostream-xterm-mingw.out \
 	test-term-ostream-xterm-16color.out \
 	test-term-ostream-xterm-88color.out \
-	test-term-ostream-xterm-256color.out init.sh test-init.sh \
-	test-thread_self.c test-thread_create.c macros.h test-time.c \
-	test-tls.c uniconv/test-u8-conv-from-enc.c macros.h \
+	test-term-ostream-xterm-256color.out test-time.c test-tls.c \
+	uniconv/test-u8-conv-from-enc.c macros.h \
+	unilbrk/test-u8-possible-linebreaks.c macros.h \
 	unilbrk/test-u8-width-linebreaks.c macros.h \
+	unilbrk/test-ulc-width-linebreaks.c macros.h \
 	uniname/test-uninames.sh uniname/test-uninames.c \
 	uniname/UnicodeDataNames.txt test-dup-safer.c macros.h \
 	test-unistd.c unistr/test-u16-mbtouc.c \
 	unistr/test-u16-mbtouc.h macros.h unistr/test-u8-check.c \
 	macros.h unistr/test-u8-cmp.c unistr/test-cmp.h zerosize-ptr.h \
 	macros.h unistr/test-u8-mblen.c macros.h \
-	unistr/test-u8-mbtoucr.c macros.h unistr/test-u8-prev.c \
-	macros.h unistr/test-u8-strlen.c macros.h \
-	unistr/test-u8-uctomb.c macros.h test-unsetenv.c signature.h \
-	macros.h test-vasnprintf.c macros.h test-vasprintf.c \
-	signature.h macros.h test-verify.c test-verify.sh \
-	test-vsnprintf.c signature.h macros.h test-wchar.c wcrtomb.c \
-	test-wcrtomb.sh test-wcrtomb.c test-wcrtomb-w32-1.sh \
-	test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \
-	test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh test-wcrtomb-w32.c \
-	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
+	unistr/test-u8-mbtouc.c unistr/test-u8-mbtouc.h macros.h \
+	unistr/test-u8-mbtouc-unsafe.c unistr/test-u8-mbtouc.h \
+	macros.h unistr/test-u8-mbtoucr.c macros.h \
+	unistr/test-u8-prev.c macros.h unistr/test-u8-strlen.c \
+	macros.h unistr/test-u8-uctomb.c macros.h \
+	uniwidth/test-uc_width.c uniwidth/test-uc_width2.c \
+	uniwidth/test-uc_width2.sh macros.h test-unsetenv.c \
+	signature.h macros.h \
+	$(top_srcdir)/../build-aux/unused-parameter.h \
+	test-vasnprintf.c macros.h test-vasprintf.c signature.h \
+	macros.h test-verify.c test-verify.sh init.sh test-vsnprintf.c \
+	signature.h macros.h $(top_srcdir)/../build-aux/warn-on-use.h \
+	test-wchar.c wctob.c test-wctype.c macros.h test-wcwidth.c \
+	signature.h macros.h test-xalloc-die.c test-xalloc-die.sh \
+	init.sh 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
@@ -2951,13 +2166,12 @@
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = inttypes.h $(am__append_3) arg-nonnull.h c++defs.h \
+BUILT_SOURCES = arg-nonnull.h c++defs.h $(am__append_3) \
 	unused-parameter.h warn-on-use.h
 SUFFIXES = 
-MOSTLYCLEANFILES = core *.stackdump 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 \
+MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
+	c++defs.h c++defs.h-t test-getdelim.txt test-getline.txt \
+	$(am__append_4) unused-parameter.h unused-parameter.h-t \
 	warn-on-use.h warn-on-use.h-t
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
@@ -2969,57 +2183,44 @@
 	-I$(srcdir)/.. -I../gnulib-lib -I$(srcdir)/../gnulib-lib \
 	-I../intl
 LDADD = libtests.a ../gnulib-lib/libgettextlib.la libtests.a $(LIBTESTS_LIBDEPS)
-libtests_a_SOURCES = read-file.c glthread/thread.h glthread/thread.c \
-	$(am__append_5) $(am__append_6) glthread/yield.h
+libtests_a_SOURCES = ignore-value.h glthread/thread.h \
+	glthread/thread.c $(am__append_5) $(am__append_6) \
+	glthread/yield.h
 libtests_a_LIBADD = $(gltests_LIBOBJS)
 libtests_a_DEPENDENCIES = $(gltests_LIBOBJS)
-EXTRA_libtests_a_SOURCES = btowc.c dup.c fdopen.c ftell.c ftello.c \
-	getcwd-lgpl.c getpagesize.c lseek.c mbtowc.c putenv.c sleep.c \
-	symlink.c wcrtomb.c wctob.c wctomb.c
+EXTRA_libtests_a_SOURCES = getpagesize.c putenv.c read-file.c \
+	symlink.c wctob.c
 AM_LIBTOOLFLAGS = --preserve-dup-deps
 test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL)
 test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
 test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
 test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
+ARG_NONNULL_H = arg-nonnull.h
 test_argmatch_LDADD = $(LDADD) @LIBINTL@
+CXXDEFS_H = c++defs.h
 test_copy_file_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
 test_fstrcmp_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
-test_getcwd_lgpl_LDADD = $(LDADD) $(LIBINTL)
 test_getopt_LDADD = $(LDADD) $(LIBINTL)
 test_iconv_LDADD = $(LDADD) @LIBICONV@
-test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
+test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@
 test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_pipe_filter_ii1_LDADD = $(LDADD) @LIBINTL@
 test_pipe_filter_ii2_main_LDADD = $(LDADD) @LIBINTL@
-test_pipe2_LDADD = $(LDADD) $(LIBSOCKET)
+test_pipe_LDADD = $(LDADD) @LIBINTL@
 test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@
-test_sh_quote_LDADD = $(LDADD) @LIBINTL@
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-_NORETURN_H = $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-ARG_NONNULL_H = arg-nonnull.h
-CXXDEFS_H = c++defs.h
-UNUSED_PARAMETER_H = unused-parameter.h
-WARN_ON_USE_H = warn-on-use.h
-test_spawn_pipe_main_LDADD = $(LDADD) @LIBINTL@
-# The test-spawn-pipe-child program must be a real executable, not a libtool
-# wrapper script, and should link against as few libraries as possible.
-# Therefore don't link it against any libraries other than -lc.
-test_spawn_pipe_child_LDADD = 
-test_stat_LDADD = $(LDADD) $(LIBINTL)
 test_striconv_LDADD = $(LDADD) @LIBICONV@
-test_striconveh_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_striconveha_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_striconveh_LDADD = $(LDADD) @LIBICONV@
+test_striconveha_LDADD = $(LDADD) @LIBICONV@
 test_term_ostream_LDADD = $(LIBTERMCAP) $(LDADD)
-test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
-test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
 test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c
 test_u8_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_u8_possible_linebreaks_SOURCES = unilbrk/test-u8-possible-linebreaks.c
+test_u8_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_width_linebreaks_SOURCES = unilbrk/test-u8-width-linebreaks.c
 test_u8_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
+test_ulc_width_linebreaks_SOURCES = unilbrk/test-ulc-width-linebreaks.c
+test_ulc_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_uninames_SOURCES = uniname/test-uninames.c
 test_uninames_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@
 test_u16_mbtouc_SOURCES = unistr/test-u16-mbtouc.c
@@ -3030,6 +2231,10 @@
 test_u8_cmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mblen_SOURCES = unistr/test-u8-mblen.c
 test_u8_mblen_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_mbtouc_SOURCES = unistr/test-u8-mbtouc.c
+test_u8_mbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_mbtouc_unsafe_SOURCES = unistr/test-u8-mbtouc-unsafe.c
+test_u8_mbtouc_unsafe_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mbtoucr_SOURCES = unistr/test-u8-mbtoucr.c
 test_u8_mbtoucr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_prev_SOURCES = unistr/test-u8-prev.c
@@ -3038,13 +2243,19 @@
 test_u8_strlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_uctomb_SOURCES = unistr/test-u8-uctomb.c
 test_u8_uctomb_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_width_SOURCES = uniwidth/test-uc_width.c
+test_uc_width_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
+test_uc_width2_LDADD = $(LDADD) $(LIBUNISTRING)
+UNUSED_PARAMETER_H = unused-parameter.h
+WARN_ON_USE_H = warn-on-use.h
 test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
 test_xvasprintf_LDADD = $(LDADD) @LIBINTL@
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -3066,7 +2277,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.gnulib:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3100,8 +2310,7 @@
 	unistr/$(DEPDIR)/$(am__dirstamp)
 unistr/u8-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) $(EXTRA_libtests_a_DEPENDENCIES) 
+libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libtests.a
 	$(AM_V_AR)$(libtests_a_AR) libtests.a $(libtests_a_OBJECTS) $(libtests_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libtests.a
@@ -3123,542 +2332,292 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-
-test-alloca-opt$(EXEEXT): $(test_alloca_opt_OBJECTS) $(test_alloca_opt_DEPENDENCIES) $(EXTRA_test_alloca_opt_DEPENDENCIES) 
+test-alignof$(EXEEXT): $(test_alignof_OBJECTS) $(test_alignof_DEPENDENCIES) 
+	@rm -f test-alignof$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_alignof_OBJECTS) $(test_alignof_LDADD) $(LIBS)
+test-alloca-opt$(EXEEXT): $(test_alloca_opt_OBJECTS) $(test_alloca_opt_DEPENDENCIES) 
 	@rm -f test-alloca-opt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_alloca_opt_OBJECTS) $(test_alloca_opt_LDADD) $(LIBS)
-
-test-areadlink$(EXEEXT): $(test_areadlink_OBJECTS) $(test_areadlink_DEPENDENCIES) $(EXTRA_test_areadlink_DEPENDENCIES) 
+test-areadlink$(EXEEXT): $(test_areadlink_OBJECTS) $(test_areadlink_DEPENDENCIES) 
 	@rm -f test-areadlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_areadlink_OBJECTS) $(test_areadlink_LDADD) $(LIBS)
-
-test-argmatch$(EXEEXT): $(test_argmatch_OBJECTS) $(test_argmatch_DEPENDENCIES) $(EXTRA_test_argmatch_DEPENDENCIES) 
+test-argmatch$(EXEEXT): $(test_argmatch_OBJECTS) $(test_argmatch_DEPENDENCIES) 
 	@rm -f test-argmatch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_argmatch_OBJECTS) $(test_argmatch_LDADD) $(LIBS)
-
-test-array_list$(EXEEXT): $(test_array_list_OBJECTS) $(test_array_list_DEPENDENCIES) $(EXTRA_test_array_list_DEPENDENCIES) 
+test-array_list$(EXEEXT): $(test_array_list_OBJECTS) $(test_array_list_DEPENDENCIES) 
 	@rm -f test-array_list$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_array_list_OBJECTS) $(test_array_list_LDADD) $(LIBS)
-
-test-atexit$(EXEEXT): $(test_atexit_OBJECTS) $(test_atexit_DEPENDENCIES) $(EXTRA_test_atexit_DEPENDENCIES) 
+test-atexit$(EXEEXT): $(test_atexit_OBJECTS) $(test_atexit_DEPENDENCIES) 
 	@rm -f test-atexit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_atexit_OBJECTS) $(test_atexit_LDADD) $(LIBS)
-
-test-binary-io$(EXEEXT): $(test_binary_io_OBJECTS) $(test_binary_io_DEPENDENCIES) $(EXTRA_test_binary_io_DEPENDENCIES) 
+test-binary-io$(EXEEXT): $(test_binary_io_OBJECTS) $(test_binary_io_DEPENDENCIES) 
 	@rm -f test-binary-io$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_binary_io_OBJECTS) $(test_binary_io_LDADD) $(LIBS)
-
-test-btowc$(EXEEXT): $(test_btowc_OBJECTS) $(test_btowc_DEPENDENCIES) $(EXTRA_test_btowc_DEPENDENCIES) 
-	@rm -f test-btowc$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_btowc_OBJECTS) $(test_btowc_LDADD) $(LIBS)
-
-test-byteswap$(EXEEXT): $(test_byteswap_OBJECTS) $(test_byteswap_DEPENDENCIES) $(EXTRA_test_byteswap_DEPENDENCIES) 
+test-byteswap$(EXEEXT): $(test_byteswap_OBJECTS) $(test_byteswap_DEPENDENCIES) 
 	@rm -f test-byteswap$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_byteswap_OBJECTS) $(test_byteswap_LDADD) $(LIBS)
-
-test-c-ctype$(EXEEXT): $(test_c_ctype_OBJECTS) $(test_c_ctype_DEPENDENCIES) $(EXTRA_test_c_ctype_DEPENDENCIES) 
+test-c-ctype$(EXEEXT): $(test_c_ctype_OBJECTS) $(test_c_ctype_DEPENDENCIES) 
 	@rm -f test-c-ctype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_ctype_OBJECTS) $(test_c_ctype_LDADD) $(LIBS)
-
-test-c-strcasecmp$(EXEEXT): $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_DEPENDENCIES) $(EXTRA_test_c_strcasecmp_DEPENDENCIES) 
+test-c-strcasecmp$(EXEEXT): $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_DEPENDENCIES) 
 	@rm -f test-c-strcasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_LDADD) $(LIBS)
-
-test-c-strcasestr$(EXEEXT): $(test_c_strcasestr_OBJECTS) $(test_c_strcasestr_DEPENDENCIES) $(EXTRA_test_c_strcasestr_DEPENDENCIES) 
+test-c-strcasestr$(EXEEXT): $(test_c_strcasestr_OBJECTS) $(test_c_strcasestr_DEPENDENCIES) 
 	@rm -f test-c-strcasestr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strcasestr_OBJECTS) $(test_c_strcasestr_LDADD) $(LIBS)
-
-test-c-strncasecmp$(EXEEXT): $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_DEPENDENCIES) $(EXTRA_test_c_strncasecmp_DEPENDENCIES) 
+test-c-strncasecmp$(EXEEXT): $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_DEPENDENCIES) 
 	@rm -f test-c-strncasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_LDADD) $(LIBS)
-
-test-c-strstr$(EXEEXT): $(test_c_strstr_OBJECTS) $(test_c_strstr_DEPENDENCIES) $(EXTRA_test_c_strstr_DEPENDENCIES) 
+test-c-strstr$(EXEEXT): $(test_c_strstr_OBJECTS) $(test_c_strstr_DEPENDENCIES) 
 	@rm -f test-c-strstr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strstr_OBJECTS) $(test_c_strstr_LDADD) $(LIBS)
-
-test-canonicalize-lgpl$(EXEEXT): $(test_canonicalize_lgpl_OBJECTS) $(test_canonicalize_lgpl_DEPENDENCIES) $(EXTRA_test_canonicalize_lgpl_DEPENDENCIES) 
+test-canonicalize-lgpl$(EXEEXT): $(test_canonicalize_lgpl_OBJECTS) $(test_canonicalize_lgpl_DEPENDENCIES) 
 	@rm -f test-canonicalize-lgpl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_canonicalize_lgpl_OBJECTS) $(test_canonicalize_lgpl_LDADD) $(LIBS)
-
-test-cloexec$(EXEEXT): $(test_cloexec_OBJECTS) $(test_cloexec_DEPENDENCIES) $(EXTRA_test_cloexec_DEPENDENCIES) 
+test-cloexec$(EXEEXT): $(test_cloexec_OBJECTS) $(test_cloexec_DEPENDENCIES) 
 	@rm -f test-cloexec$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_cloexec_OBJECTS) $(test_cloexec_LDADD) $(LIBS)
-
-test-close$(EXEEXT): $(test_close_OBJECTS) $(test_close_DEPENDENCIES) $(EXTRA_test_close_DEPENDENCIES) 
-	@rm -f test-close$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_close_OBJECTS) $(test_close_LDADD) $(LIBS)
-
-test-copy-acl$(EXEEXT): $(test_copy_acl_OBJECTS) $(test_copy_acl_DEPENDENCIES) $(EXTRA_test_copy_acl_DEPENDENCIES) 
+test-copy-acl$(EXEEXT): $(test_copy_acl_OBJECTS) $(test_copy_acl_DEPENDENCIES) 
 	@rm -f test-copy-acl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_copy_acl_OBJECTS) $(test_copy_acl_LDADD) $(LIBS)
-
-test-copy-file$(EXEEXT): $(test_copy_file_OBJECTS) $(test_copy_file_DEPENDENCIES) $(EXTRA_test_copy_file_DEPENDENCIES) 
+test-copy-file$(EXEEXT): $(test_copy_file_OBJECTS) $(test_copy_file_DEPENDENCIES) 
 	@rm -f test-copy-file$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_copy_file_OBJECTS) $(test_copy_file_LDADD) $(LIBS)
-
-test-dirent$(EXEEXT): $(test_dirent_OBJECTS) $(test_dirent_DEPENDENCIES) $(EXTRA_test_dirent_DEPENDENCIES) 
-	@rm -f test-dirent$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_dirent_OBJECTS) $(test_dirent_LDADD) $(LIBS)
-
-test-dup$(EXEEXT): $(test_dup_OBJECTS) $(test_dup_DEPENDENCIES) $(EXTRA_test_dup_DEPENDENCIES) 
-	@rm -f test-dup$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_dup_OBJECTS) $(test_dup_LDADD) $(LIBS)
-
-test-dup-safer$(EXEEXT): $(test_dup_safer_OBJECTS) $(test_dup_safer_DEPENDENCIES) $(EXTRA_test_dup_safer_DEPENDENCIES) 
+test-dup-safer$(EXEEXT): $(test_dup_safer_OBJECTS) $(test_dup_safer_DEPENDENCIES) 
 	@rm -f test-dup-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dup_safer_OBJECTS) $(test_dup_safer_LDADD) $(LIBS)
-
-test-dup2$(EXEEXT): $(test_dup2_OBJECTS) $(test_dup2_DEPENDENCIES) $(EXTRA_test_dup2_DEPENDENCIES) 
+test-dup2$(EXEEXT): $(test_dup2_OBJECTS) $(test_dup2_DEPENDENCIES) 
 	@rm -f test-dup2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dup2_OBJECTS) $(test_dup2_LDADD) $(LIBS)
-
-test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) $(EXTRA_test_environ_DEPENDENCIES) 
+test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) 
 	@rm -f test-environ$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
-
-test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) $(EXTRA_test_errno_DEPENDENCIES) 
+test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) 
 	@rm -f test-errno$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_errno_OBJECTS) $(test_errno_LDADD) $(LIBS)
-
-test-fcntl$(EXEEXT): $(test_fcntl_OBJECTS) $(test_fcntl_DEPENDENCIES) $(EXTRA_test_fcntl_DEPENDENCIES) 
+test-fcntl$(EXEEXT): $(test_fcntl_OBJECTS) $(test_fcntl_DEPENDENCIES) 
 	@rm -f test-fcntl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fcntl_OBJECTS) $(test_fcntl_LDADD) $(LIBS)
-
-test-fcntl-h$(EXEEXT): $(test_fcntl_h_OBJECTS) $(test_fcntl_h_DEPENDENCIES) $(EXTRA_test_fcntl_h_DEPENDENCIES) 
+test-fcntl-h$(EXEEXT): $(test_fcntl_h_OBJECTS) $(test_fcntl_h_DEPENDENCIES) 
 	@rm -f test-fcntl-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fcntl_h_OBJECTS) $(test_fcntl_h_LDADD) $(LIBS)
-
-test-fdopen$(EXEEXT): $(test_fdopen_OBJECTS) $(test_fdopen_DEPENDENCIES) $(EXTRA_test_fdopen_DEPENDENCIES) 
-	@rm -f test-fdopen$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fdopen_OBJECTS) $(test_fdopen_LDADD) $(LIBS)
-
-test-fgetc$(EXEEXT): $(test_fgetc_OBJECTS) $(test_fgetc_DEPENDENCIES) $(EXTRA_test_fgetc_DEPENDENCIES) 
-	@rm -f test-fgetc$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fgetc_OBJECTS) $(test_fgetc_LDADD) $(LIBS)
-
-test-file-has-acl$(EXEEXT): $(test_file_has_acl_OBJECTS) $(test_file_has_acl_DEPENDENCIES) $(EXTRA_test_file_has_acl_DEPENDENCIES) 
+test-file-has-acl$(EXEEXT): $(test_file_has_acl_OBJECTS) $(test_file_has_acl_DEPENDENCIES) 
 	@rm -f test-file-has-acl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_file_has_acl_OBJECTS) $(test_file_has_acl_LDADD) $(LIBS)
-
-test-float$(EXEEXT): $(test_float_OBJECTS) $(test_float_DEPENDENCIES) $(EXTRA_test_float_DEPENDENCIES) 
-	@rm -f test-float$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_float_OBJECTS) $(test_float_LDADD) $(LIBS)
-
-test-fnmatch$(EXEEXT): $(test_fnmatch_OBJECTS) $(test_fnmatch_DEPENDENCIES) $(EXTRA_test_fnmatch_DEPENDENCIES) 
+test-fnmatch$(EXEEXT): $(test_fnmatch_OBJECTS) $(test_fnmatch_DEPENDENCIES) 
 	@rm -f test-fnmatch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fnmatch_OBJECTS) $(test_fnmatch_LDADD) $(LIBS)
-
-test-fopen$(EXEEXT): $(test_fopen_OBJECTS) $(test_fopen_DEPENDENCIES) $(EXTRA_test_fopen_DEPENDENCIES) 
+test-fopen$(EXEEXT): $(test_fopen_OBJECTS) $(test_fopen_DEPENDENCIES) 
 	@rm -f test-fopen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fopen_OBJECTS) $(test_fopen_LDADD) $(LIBS)
-
-test-fputc$(EXEEXT): $(test_fputc_OBJECTS) $(test_fputc_DEPENDENCIES) $(EXTRA_test_fputc_DEPENDENCIES) 
-	@rm -f test-fputc$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fputc_OBJECTS) $(test_fputc_LDADD) $(LIBS)
-
-test-fread$(EXEEXT): $(test_fread_OBJECTS) $(test_fread_DEPENDENCIES) $(EXTRA_test_fread_DEPENDENCIES) 
-	@rm -f test-fread$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fread_OBJECTS) $(test_fread_LDADD) $(LIBS)
-
-test-fstat$(EXEEXT): $(test_fstat_OBJECTS) $(test_fstat_DEPENDENCIES) $(EXTRA_test_fstat_DEPENDENCIES) 
-	@rm -f test-fstat$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fstat_OBJECTS) $(test_fstat_LDADD) $(LIBS)
-
-test-fstrcmp$(EXEEXT): $(test_fstrcmp_OBJECTS) $(test_fstrcmp_DEPENDENCIES) $(EXTRA_test_fstrcmp_DEPENDENCIES) 
+test-fstrcmp$(EXEEXT): $(test_fstrcmp_OBJECTS) $(test_fstrcmp_DEPENDENCIES) 
 	@rm -f test-fstrcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fstrcmp_OBJECTS) $(test_fstrcmp_LDADD) $(LIBS)
-
-test-ftell$(EXEEXT): $(test_ftell_OBJECTS) $(test_ftell_DEPENDENCIES) $(EXTRA_test_ftell_DEPENDENCIES) 
-	@rm -f test-ftell$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ftell_OBJECTS) $(test_ftell_LDADD) $(LIBS)
-
-test-ftell3$(EXEEXT): $(test_ftell3_OBJECTS) $(test_ftell3_DEPENDENCIES) $(EXTRA_test_ftell3_DEPENDENCIES) 
-	@rm -f test-ftell3$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ftell3_OBJECTS) $(test_ftell3_LDADD) $(LIBS)
-
-test-ftello$(EXEEXT): $(test_ftello_OBJECTS) $(test_ftello_DEPENDENCIES) $(EXTRA_test_ftello_DEPENDENCIES) 
-	@rm -f test-ftello$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ftello_OBJECTS) $(test_ftello_LDADD) $(LIBS)
-
-test-ftello3$(EXEEXT): $(test_ftello3_OBJECTS) $(test_ftello3_DEPENDENCIES) $(EXTRA_test_ftello3_DEPENDENCIES) 
-	@rm -f test-ftello3$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ftello3_OBJECTS) $(test_ftello3_LDADD) $(LIBS)
-
-test-ftello4$(EXEEXT): $(test_ftello4_OBJECTS) $(test_ftello4_DEPENDENCIES) $(EXTRA_test_ftello4_DEPENDENCIES) 
-	@rm -f test-ftello4$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ftello4_OBJECTS) $(test_ftello4_LDADD) $(LIBS)
-
-test-fwrite$(EXEEXT): $(test_fwrite_OBJECTS) $(test_fwrite_DEPENDENCIES) $(EXTRA_test_fwrite_DEPENDENCIES) 
-	@rm -f test-fwrite$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fwrite_OBJECTS) $(test_fwrite_LDADD) $(LIBS)
-
-test-getcwd-lgpl$(EXEEXT): $(test_getcwd_lgpl_OBJECTS) $(test_getcwd_lgpl_DEPENDENCIES) $(EXTRA_test_getcwd_lgpl_DEPENDENCIES) 
-	@rm -f test-getcwd-lgpl$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_getcwd_lgpl_OBJECTS) $(test_getcwd_lgpl_LDADD) $(LIBS)
-
-test-getdelim$(EXEEXT): $(test_getdelim_OBJECTS) $(test_getdelim_DEPENDENCIES) $(EXTRA_test_getdelim_DEPENDENCIES) 
+test-getdelim$(EXEEXT): $(test_getdelim_OBJECTS) $(test_getdelim_DEPENDENCIES) 
 	@rm -f test-getdelim$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getdelim_OBJECTS) $(test_getdelim_LDADD) $(LIBS)
-
-test-getdtablesize$(EXEEXT): $(test_getdtablesize_OBJECTS) $(test_getdtablesize_DEPENDENCIES) $(EXTRA_test_getdtablesize_DEPENDENCIES) 
+test-getdtablesize$(EXEEXT): $(test_getdtablesize_OBJECTS) $(test_getdtablesize_DEPENDENCIES) 
 	@rm -f test-getdtablesize$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getdtablesize_OBJECTS) $(test_getdtablesize_LDADD) $(LIBS)
-
-test-getline$(EXEEXT): $(test_getline_OBJECTS) $(test_getline_DEPENDENCIES) $(EXTRA_test_getline_DEPENDENCIES) 
+test-getline$(EXEEXT): $(test_getline_OBJECTS) $(test_getline_DEPENDENCIES) 
 	@rm -f test-getline$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getline_OBJECTS) $(test_getline_LDADD) $(LIBS)
-
-test-getopt$(EXEEXT): $(test_getopt_OBJECTS) $(test_getopt_DEPENDENCIES) $(EXTRA_test_getopt_DEPENDENCIES) 
+test-getopt$(EXEEXT): $(test_getopt_OBJECTS) $(test_getopt_DEPENDENCIES) 
 	@rm -f test-getopt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getopt_OBJECTS) $(test_getopt_LDADD) $(LIBS)
-
-test-gettimeofday$(EXEEXT): $(test_gettimeofday_OBJECTS) $(test_gettimeofday_DEPENDENCIES) $(EXTRA_test_gettimeofday_DEPENDENCIES) 
+test-gettimeofday$(EXEEXT): $(test_gettimeofday_OBJECTS) $(test_gettimeofday_DEPENDENCIES) 
 	@rm -f test-gettimeofday$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_gettimeofday_OBJECTS) $(test_gettimeofday_LDADD) $(LIBS)
-
-test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) $(EXTRA_test_iconv_DEPENDENCIES) 
+test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) 
 	@rm -f test-iconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_OBJECTS) $(test_iconv_LDADD) $(LIBS)
-
-test-iconv-h$(EXEEXT): $(test_iconv_h_OBJECTS) $(test_iconv_h_DEPENDENCIES) $(EXTRA_test_iconv_h_DEPENDENCIES) 
+test-iconv-h$(EXEEXT): $(test_iconv_h_OBJECTS) $(test_iconv_h_DEPENDENCIES) 
 	@rm -f test-iconv-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_h_OBJECTS) $(test_iconv_h_LDADD) $(LIBS)
-
-test-ignore-value$(EXEEXT): $(test_ignore_value_OBJECTS) $(test_ignore_value_DEPENDENCIES) $(EXTRA_test_ignore_value_DEPENDENCIES) 
-	@rm -f test-ignore-value$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ignore_value_OBJECTS) $(test_ignore_value_LDADD) $(LIBS)
-
-test-intprops$(EXEEXT): $(test_intprops_OBJECTS) $(test_intprops_DEPENDENCIES) $(EXTRA_test_intprops_DEPENDENCIES) 
-	@rm -f test-intprops$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_intprops_OBJECTS) $(test_intprops_LDADD) $(LIBS)
-
-test-inttypes$(EXEEXT): $(test_inttypes_OBJECTS) $(test_inttypes_DEPENDENCIES) $(EXTRA_test_inttypes_DEPENDENCIES) 
-	@rm -f test-inttypes$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_inttypes_OBJECTS) $(test_inttypes_LDADD) $(LIBS)
-
-test-iswblank$(EXEEXT): $(test_iswblank_OBJECTS) $(test_iswblank_DEPENDENCIES) $(EXTRA_test_iswblank_DEPENDENCIES) 
-	@rm -f test-iswblank$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_iswblank_OBJECTS) $(test_iswblank_LDADD) $(LIBS)
-
-test-linkedhash_list$(EXEEXT): $(test_linkedhash_list_OBJECTS) $(test_linkedhash_list_DEPENDENCIES) $(EXTRA_test_linkedhash_list_DEPENDENCIES) 
+test-linkedhash_list$(EXEEXT): $(test_linkedhash_list_OBJECTS) $(test_linkedhash_list_DEPENDENCIES) 
 	@rm -f test-linkedhash_list$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_linkedhash_list_OBJECTS) $(test_linkedhash_list_LDADD) $(LIBS)
-
-test-locale$(EXEEXT): $(test_locale_OBJECTS) $(test_locale_DEPENDENCIES) $(EXTRA_test_locale_DEPENDENCIES) 
+test-locale$(EXEEXT): $(test_locale_OBJECTS) $(test_locale_DEPENDENCIES) 
 	@rm -f test-locale$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_locale_OBJECTS) $(test_locale_LDADD) $(LIBS)
-
-test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) $(EXTRA_test_localename_DEPENDENCIES) 
+test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) 
 	@rm -f test-localename$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_localename_OBJECTS) $(test_localename_LDADD) $(LIBS)
-
-test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) $(EXTRA_test_lock_DEPENDENCIES) 
+test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) 
 	@rm -f test-lock$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS)
-
-test-lseek$(EXEEXT): $(test_lseek_OBJECTS) $(test_lseek_DEPENDENCIES) $(EXTRA_test_lseek_DEPENDENCIES) 
-	@rm -f test-lseek$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_lseek_OBJECTS) $(test_lseek_LDADD) $(LIBS)
-
-test-lstat$(EXEEXT): $(test_lstat_OBJECTS) $(test_lstat_DEPENDENCIES) $(EXTRA_test_lstat_DEPENDENCIES) 
+test-lstat$(EXEEXT): $(test_lstat_OBJECTS) $(test_lstat_DEPENDENCIES) 
 	@rm -f test-lstat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lstat_OBJECTS) $(test_lstat_LDADD) $(LIBS)
-
-test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) $(EXTRA_test_malloca_DEPENDENCIES) 
+test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) 
 	@rm -f test-malloca$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_malloca_OBJECTS) $(test_malloca_LDADD) $(LIBS)
-
-test-mbrtowc$(EXEEXT): $(test_mbrtowc_OBJECTS) $(test_mbrtowc_DEPENDENCIES) $(EXTRA_test_mbrtowc_DEPENDENCIES) 
+test-mbrtowc$(EXEEXT): $(test_mbrtowc_OBJECTS) $(test_mbrtowc_DEPENDENCIES) 
 	@rm -f test-mbrtowc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbrtowc_OBJECTS) $(test_mbrtowc_LDADD) $(LIBS)
-
-test-mbrtowc-w32$(EXEEXT): $(test_mbrtowc_w32_OBJECTS) $(test_mbrtowc_w32_DEPENDENCIES) $(EXTRA_test_mbrtowc_w32_DEPENDENCIES) 
-	@rm -f test-mbrtowc-w32$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_mbrtowc_w32_OBJECTS) $(test_mbrtowc_w32_LDADD) $(LIBS)
-
-test-mbsinit$(EXEEXT): $(test_mbsinit_OBJECTS) $(test_mbsinit_DEPENDENCIES) $(EXTRA_test_mbsinit_DEPENDENCIES) 
+test-mbsinit$(EXEEXT): $(test_mbsinit_OBJECTS) $(test_mbsinit_DEPENDENCIES) 
 	@rm -f test-mbsinit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsinit_OBJECTS) $(test_mbsinit_LDADD) $(LIBS)
-
-test-mbsrtowcs$(EXEEXT): $(test_mbsrtowcs_OBJECTS) $(test_mbsrtowcs_DEPENDENCIES) $(EXTRA_test_mbsrtowcs_DEPENDENCIES) 
+test-mbsrtowcs$(EXEEXT): $(test_mbsrtowcs_OBJECTS) $(test_mbsrtowcs_DEPENDENCIES) 
 	@rm -f test-mbsrtowcs$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsrtowcs_OBJECTS) $(test_mbsrtowcs_LDADD) $(LIBS)
-
-test-mbsstr1$(EXEEXT): $(test_mbsstr1_OBJECTS) $(test_mbsstr1_DEPENDENCIES) $(EXTRA_test_mbsstr1_DEPENDENCIES) 
+test-mbsstr1$(EXEEXT): $(test_mbsstr1_OBJECTS) $(test_mbsstr1_DEPENDENCIES) 
 	@rm -f test-mbsstr1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsstr1_OBJECTS) $(test_mbsstr1_LDADD) $(LIBS)
-
-test-mbsstr2$(EXEEXT): $(test_mbsstr2_OBJECTS) $(test_mbsstr2_DEPENDENCIES) $(EXTRA_test_mbsstr2_DEPENDENCIES) 
+test-mbsstr2$(EXEEXT): $(test_mbsstr2_OBJECTS) $(test_mbsstr2_DEPENDENCIES) 
 	@rm -f test-mbsstr2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsstr2_OBJECTS) $(test_mbsstr2_LDADD) $(LIBS)
-
-test-mbsstr3$(EXEEXT): $(test_mbsstr3_OBJECTS) $(test_mbsstr3_DEPENDENCIES) $(EXTRA_test_mbsstr3_DEPENDENCIES) 
+test-mbsstr3$(EXEEXT): $(test_mbsstr3_OBJECTS) $(test_mbsstr3_DEPENDENCIES) 
 	@rm -f test-mbsstr3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsstr3_OBJECTS) $(test_mbsstr3_LDADD) $(LIBS)
-
-test-memchr$(EXEEXT): $(test_memchr_OBJECTS) $(test_memchr_DEPENDENCIES) $(EXTRA_test_memchr_DEPENDENCIES) 
+test-memchr$(EXEEXT): $(test_memchr_OBJECTS) $(test_memchr_DEPENDENCIES) 
 	@rm -f test-memchr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memchr_OBJECTS) $(test_memchr_LDADD) $(LIBS)
-
-test-open$(EXEEXT): $(test_open_OBJECTS) $(test_open_DEPENDENCIES) $(EXTRA_test_open_DEPENDENCIES) 
+test-open$(EXEEXT): $(test_open_OBJECTS) $(test_open_DEPENDENCIES) 
 	@rm -f test-open$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_open_OBJECTS) $(test_open_LDADD) $(LIBS)
-
-test-pathmax$(EXEEXT): $(test_pathmax_OBJECTS) $(test_pathmax_DEPENDENCIES) $(EXTRA_test_pathmax_DEPENDENCIES) 
-	@rm -f test-pathmax$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_pathmax_OBJECTS) $(test_pathmax_LDADD) $(LIBS)
-
-test-pipe-filter-ii1$(EXEEXT): $(test_pipe_filter_ii1_OBJECTS) $(test_pipe_filter_ii1_DEPENDENCIES) $(EXTRA_test_pipe_filter_ii1_DEPENDENCIES) 
+test-pipe$(EXEEXT): $(test_pipe_OBJECTS) $(test_pipe_DEPENDENCIES) 
+	@rm -f test-pipe$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pipe_OBJECTS) $(test_pipe_LDADD) $(LIBS)
+test-pipe-filter-ii1$(EXEEXT): $(test_pipe_filter_ii1_OBJECTS) $(test_pipe_filter_ii1_DEPENDENCIES) 
 	@rm -f test-pipe-filter-ii1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pipe_filter_ii1_OBJECTS) $(test_pipe_filter_ii1_LDADD) $(LIBS)
-
-test-pipe-filter-ii2-child$(EXEEXT): $(test_pipe_filter_ii2_child_OBJECTS) $(test_pipe_filter_ii2_child_DEPENDENCIES) $(EXTRA_test_pipe_filter_ii2_child_DEPENDENCIES) 
+test-pipe-filter-ii2-child$(EXEEXT): $(test_pipe_filter_ii2_child_OBJECTS) $(test_pipe_filter_ii2_child_DEPENDENCIES) 
 	@rm -f test-pipe-filter-ii2-child$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pipe_filter_ii2_child_OBJECTS) $(test_pipe_filter_ii2_child_LDADD) $(LIBS)
-
-test-pipe-filter-ii2-main$(EXEEXT): $(test_pipe_filter_ii2_main_OBJECTS) $(test_pipe_filter_ii2_main_DEPENDENCIES) $(EXTRA_test_pipe_filter_ii2_main_DEPENDENCIES) 
+test-pipe-filter-ii2-main$(EXEEXT): $(test_pipe_filter_ii2_main_OBJECTS) $(test_pipe_filter_ii2_main_DEPENDENCIES) 
 	@rm -f test-pipe-filter-ii2-main$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pipe_filter_ii2_main_OBJECTS) $(test_pipe_filter_ii2_main_LDADD) $(LIBS)
-
-test-pipe2$(EXEEXT): $(test_pipe2_OBJECTS) $(test_pipe2_DEPENDENCIES) $(EXTRA_test_pipe2_DEPENDENCIES) 
+test-pipe2$(EXEEXT): $(test_pipe2_OBJECTS) $(test_pipe2_DEPENDENCIES) 
 	@rm -f test-pipe2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pipe2_OBJECTS) $(test_pipe2_LDADD) $(LIBS)
-
-test-posix_spawn1$(EXEEXT): $(test_posix_spawn1_OBJECTS) $(test_posix_spawn1_DEPENDENCIES) $(EXTRA_test_posix_spawn1_DEPENDENCIES) 
+test-posix_spawn1$(EXEEXT): $(test_posix_spawn1_OBJECTS) $(test_posix_spawn1_DEPENDENCIES) 
 	@rm -f test-posix_spawn1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_posix_spawn1_OBJECTS) $(test_posix_spawn1_LDADD) $(LIBS)
-
-test-posix_spawn2$(EXEEXT): $(test_posix_spawn2_OBJECTS) $(test_posix_spawn2_DEPENDENCIES) $(EXTRA_test_posix_spawn2_DEPENDENCIES) 
+test-posix_spawn2$(EXEEXT): $(test_posix_spawn2_OBJECTS) $(test_posix_spawn2_DEPENDENCIES) 
 	@rm -f test-posix_spawn2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_posix_spawn2_OBJECTS) $(test_posix_spawn2_LDADD) $(LIBS)
-
-test-posix_spawn_file_actions_addclose$(EXEEXT): $(test_posix_spawn_file_actions_addclose_OBJECTS) $(test_posix_spawn_file_actions_addclose_DEPENDENCIES) $(EXTRA_test_posix_spawn_file_actions_addclose_DEPENDENCIES) 
-	@rm -f test-posix_spawn_file_actions_addclose$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn_file_actions_addclose_OBJECTS) $(test_posix_spawn_file_actions_addclose_LDADD) $(LIBS)
-
-test-posix_spawn_file_actions_adddup2$(EXEEXT): $(test_posix_spawn_file_actions_adddup2_OBJECTS) $(test_posix_spawn_file_actions_adddup2_DEPENDENCIES) $(EXTRA_test_posix_spawn_file_actions_adddup2_DEPENDENCIES) 
-	@rm -f test-posix_spawn_file_actions_adddup2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn_file_actions_adddup2_OBJECTS) $(test_posix_spawn_file_actions_adddup2_LDADD) $(LIBS)
-
-test-posix_spawn_file_actions_addopen$(EXEEXT): $(test_posix_spawn_file_actions_addopen_OBJECTS) $(test_posix_spawn_file_actions_addopen_DEPENDENCIES) $(EXTRA_test_posix_spawn_file_actions_addopen_DEPENDENCIES) 
-	@rm -f test-posix_spawn_file_actions_addopen$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn_file_actions_addopen_OBJECTS) $(test_posix_spawn_file_actions_addopen_LDADD) $(LIBS)
-
-test-quotearg-simple$(EXEEXT): $(test_quotearg_simple_OBJECTS) $(test_quotearg_simple_DEPENDENCIES) $(EXTRA_test_quotearg_simple_DEPENDENCIES) 
+test-quotearg-simple$(EXEEXT): $(test_quotearg_simple_OBJECTS) $(test_quotearg_simple_DEPENDENCIES) 
 	@rm -f test-quotearg-simple$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_quotearg_simple_OBJECTS) $(test_quotearg_simple_LDADD) $(LIBS)
-
-test-raise$(EXEEXT): $(test_raise_OBJECTS) $(test_raise_DEPENDENCIES) $(EXTRA_test_raise_DEPENDENCIES) 
-	@rm -f test-raise$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_raise_OBJECTS) $(test_raise_LDADD) $(LIBS)
-
-test-rawmemchr$(EXEEXT): $(test_rawmemchr_OBJECTS) $(test_rawmemchr_DEPENDENCIES) $(EXTRA_test_rawmemchr_DEPENDENCIES) 
+test-rawmemchr$(EXEEXT): $(test_rawmemchr_OBJECTS) $(test_rawmemchr_DEPENDENCIES) 
 	@rm -f test-rawmemchr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_rawmemchr_OBJECTS) $(test_rawmemchr_LDADD) $(LIBS)
-
-test-read$(EXEEXT): $(test_read_OBJECTS) $(test_read_DEPENDENCIES) $(EXTRA_test_read_DEPENDENCIES) 
-	@rm -f test-read$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_read_OBJECTS) $(test_read_LDADD) $(LIBS)
-
-test-read-file$(EXEEXT): $(test_read_file_OBJECTS) $(test_read_file_DEPENDENCIES) $(EXTRA_test_read_file_DEPENDENCIES) 
+test-read-file$(EXEEXT): $(test_read_file_OBJECTS) $(test_read_file_DEPENDENCIES) 
 	@rm -f test-read-file$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_read_file_OBJECTS) $(test_read_file_LDADD) $(LIBS)
-
-test-readlink$(EXEEXT): $(test_readlink_OBJECTS) $(test_readlink_DEPENDENCIES) $(EXTRA_test_readlink_DEPENDENCIES) 
+test-readlink$(EXEEXT): $(test_readlink_OBJECTS) $(test_readlink_DEPENDENCIES) 
 	@rm -f test-readlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_readlink_OBJECTS) $(test_readlink_LDADD) $(LIBS)
-
-test-rmdir$(EXEEXT): $(test_rmdir_OBJECTS) $(test_rmdir_DEPENDENCIES) $(EXTRA_test_rmdir_DEPENDENCIES) 
+test-rmdir$(EXEEXT): $(test_rmdir_OBJECTS) $(test_rmdir_DEPENDENCIES) 
 	@rm -f test-rmdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_rmdir_OBJECTS) $(test_rmdir_LDADD) $(LIBS)
-
-test-sameacls$(EXEEXT): $(test_sameacls_OBJECTS) $(test_sameacls_DEPENDENCIES) $(EXTRA_test_sameacls_DEPENDENCIES) 
+test-sameacls$(EXEEXT): $(test_sameacls_OBJECTS) $(test_sameacls_DEPENDENCIES) 
 	@rm -f test-sameacls$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sameacls_OBJECTS) $(test_sameacls_LDADD) $(LIBS)
-
-test-sched$(EXEEXT): $(test_sched_OBJECTS) $(test_sched_DEPENDENCIES) $(EXTRA_test_sched_DEPENDENCIES) 
+test-sched$(EXEEXT): $(test_sched_OBJECTS) $(test_sched_DEPENDENCIES) 
 	@rm -f test-sched$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sched_OBJECTS) $(test_sched_LDADD) $(LIBS)
-
-test-set-mode-acl$(EXEEXT): $(test_set_mode_acl_OBJECTS) $(test_set_mode_acl_DEPENDENCIES) $(EXTRA_test_set_mode_acl_DEPENDENCIES) 
+test-set-mode-acl$(EXEEXT): $(test_set_mode_acl_OBJECTS) $(test_set_mode_acl_DEPENDENCIES) 
 	@rm -f test-set-mode-acl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_set_mode_acl_OBJECTS) $(test_set_mode_acl_LDADD) $(LIBS)
-
-test-setenv$(EXEEXT): $(test_setenv_OBJECTS) $(test_setenv_DEPENDENCIES) $(EXTRA_test_setenv_DEPENDENCIES) 
+test-setenv$(EXEEXT): $(test_setenv_OBJECTS) $(test_setenv_DEPENDENCIES) 
 	@rm -f test-setenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setenv_OBJECTS) $(test_setenv_LDADD) $(LIBS)
-
-test-setlocale1$(EXEEXT): $(test_setlocale1_OBJECTS) $(test_setlocale1_DEPENDENCIES) $(EXTRA_test_setlocale1_DEPENDENCIES) 
-	@rm -f test-setlocale1$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_setlocale1_OBJECTS) $(test_setlocale1_LDADD) $(LIBS)
-
-test-setlocale2$(EXEEXT): $(test_setlocale2_OBJECTS) $(test_setlocale2_DEPENDENCIES) $(EXTRA_test_setlocale2_DEPENDENCIES) 
-	@rm -f test-setlocale2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_setlocale2_OBJECTS) $(test_setlocale2_LDADD) $(LIBS)
-
-test-sh-quote$(EXEEXT): $(test_sh_quote_OBJECTS) $(test_sh_quote_DEPENDENCIES) $(EXTRA_test_sh_quote_DEPENDENCIES) 
-	@rm -f test-sh-quote$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_sh_quote_OBJECTS) $(test_sh_quote_LDADD) $(LIBS)
-
-test-sigaction$(EXEEXT): $(test_sigaction_OBJECTS) $(test_sigaction_DEPENDENCIES) $(EXTRA_test_sigaction_DEPENDENCIES) 
+test-sigaction$(EXEEXT): $(test_sigaction_OBJECTS) $(test_sigaction_DEPENDENCIES) 
 	@rm -f test-sigaction$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sigaction_OBJECTS) $(test_sigaction_LDADD) $(LIBS)
-
-test-signal-h$(EXEEXT): $(test_signal_h_OBJECTS) $(test_signal_h_DEPENDENCIES) $(EXTRA_test_signal_h_DEPENDENCIES) 
-	@rm -f test-signal-h$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_signal_h_OBJECTS) $(test_signal_h_LDADD) $(LIBS)
-
-test-sigpipe$(EXEEXT): $(test_sigpipe_OBJECTS) $(test_sigpipe_DEPENDENCIES) $(EXTRA_test_sigpipe_DEPENDENCIES) 
+test-signal$(EXEEXT): $(test_signal_OBJECTS) $(test_signal_DEPENDENCIES) 
+	@rm -f test-signal$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_signal_OBJECTS) $(test_signal_LDADD) $(LIBS)
+test-sigpipe$(EXEEXT): $(test_sigpipe_OBJECTS) $(test_sigpipe_DEPENDENCIES) 
 	@rm -f test-sigpipe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sigpipe_OBJECTS) $(test_sigpipe_LDADD) $(LIBS)
-
-test-sigprocmask$(EXEEXT): $(test_sigprocmask_OBJECTS) $(test_sigprocmask_DEPENDENCIES) $(EXTRA_test_sigprocmask_DEPENDENCIES) 
-	@rm -f test-sigprocmask$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_sigprocmask_OBJECTS) $(test_sigprocmask_LDADD) $(LIBS)
-
-test-sleep$(EXEEXT): $(test_sleep_OBJECTS) $(test_sleep_DEPENDENCIES) $(EXTRA_test_sleep_DEPENDENCIES) 
-	@rm -f test-sleep$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_sleep_OBJECTS) $(test_sleep_LDADD) $(LIBS)
-
-test-snprintf$(EXEEXT): $(test_snprintf_OBJECTS) $(test_snprintf_DEPENDENCIES) $(EXTRA_test_snprintf_DEPENDENCIES) 
+test-snprintf$(EXEEXT): $(test_snprintf_OBJECTS) $(test_snprintf_DEPENDENCIES) 
 	@rm -f test-snprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_snprintf_OBJECTS) $(test_snprintf_LDADD) $(LIBS)
-
-test-spawn$(EXEEXT): $(test_spawn_OBJECTS) $(test_spawn_DEPENDENCIES) $(EXTRA_test_spawn_DEPENDENCIES) 
+test-spawn$(EXEEXT): $(test_spawn_OBJECTS) $(test_spawn_DEPENDENCIES) 
 	@rm -f test-spawn$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_spawn_OBJECTS) $(test_spawn_LDADD) $(LIBS)
-
-test-spawn-pipe-child$(EXEEXT): $(test_spawn_pipe_child_OBJECTS) $(test_spawn_pipe_child_DEPENDENCIES) $(EXTRA_test_spawn_pipe_child_DEPENDENCIES) 
-	@rm -f test-spawn-pipe-child$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_spawn_pipe_child_OBJECTS) $(test_spawn_pipe_child_LDADD) $(LIBS)
-
-test-spawn-pipe-main$(EXEEXT): $(test_spawn_pipe_main_OBJECTS) $(test_spawn_pipe_main_DEPENDENCIES) $(EXTRA_test_spawn_pipe_main_DEPENDENCIES) 
-	@rm -f test-spawn-pipe-main$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_spawn_pipe_main_OBJECTS) $(test_spawn_pipe_main_LDADD) $(LIBS)
-
-test-stat$(EXEEXT): $(test_stat_OBJECTS) $(test_stat_DEPENDENCIES) $(EXTRA_test_stat_DEPENDENCIES) 
+test-stat$(EXEEXT): $(test_stat_OBJECTS) $(test_stat_DEPENDENCIES) 
 	@rm -f test-stat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stat_OBJECTS) $(test_stat_LDADD) $(LIBS)
-
-test-stdbool$(EXEEXT): $(test_stdbool_OBJECTS) $(test_stdbool_DEPENDENCIES) $(EXTRA_test_stdbool_DEPENDENCIES) 
+test-stdbool$(EXEEXT): $(test_stdbool_OBJECTS) $(test_stdbool_DEPENDENCIES) 
 	@rm -f test-stdbool$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdbool_OBJECTS) $(test_stdbool_LDADD) $(LIBS)
-
-test-stddef$(EXEEXT): $(test_stddef_OBJECTS) $(test_stddef_DEPENDENCIES) $(EXTRA_test_stddef_DEPENDENCIES) 
+test-stddef$(EXEEXT): $(test_stddef_OBJECTS) $(test_stddef_DEPENDENCIES) 
 	@rm -f test-stddef$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stddef_OBJECTS) $(test_stddef_LDADD) $(LIBS)
-
-test-stdint$(EXEEXT): $(test_stdint_OBJECTS) $(test_stdint_DEPENDENCIES) $(EXTRA_test_stdint_DEPENDENCIES) 
+test-stdint$(EXEEXT): $(test_stdint_OBJECTS) $(test_stdint_DEPENDENCIES) 
 	@rm -f test-stdint$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdint_OBJECTS) $(test_stdint_LDADD) $(LIBS)
-
-test-stdio$(EXEEXT): $(test_stdio_OBJECTS) $(test_stdio_DEPENDENCIES) $(EXTRA_test_stdio_DEPENDENCIES) 
+test-stdio$(EXEEXT): $(test_stdio_OBJECTS) $(test_stdio_DEPENDENCIES) 
 	@rm -f test-stdio$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdio_OBJECTS) $(test_stdio_LDADD) $(LIBS)
-
-test-stdlib$(EXEEXT): $(test_stdlib_OBJECTS) $(test_stdlib_DEPENDENCIES) $(EXTRA_test_stdlib_DEPENDENCIES) 
+test-stdlib$(EXEEXT): $(test_stdlib_OBJECTS) $(test_stdlib_DEPENDENCIES) 
 	@rm -f test-stdlib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdlib_OBJECTS) $(test_stdlib_LDADD) $(LIBS)
-
-test-strchrnul$(EXEEXT): $(test_strchrnul_OBJECTS) $(test_strchrnul_DEPENDENCIES) $(EXTRA_test_strchrnul_DEPENDENCIES) 
+test-strchrnul$(EXEEXT): $(test_strchrnul_OBJECTS) $(test_strchrnul_DEPENDENCIES) 
 	@rm -f test-strchrnul$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strchrnul_OBJECTS) $(test_strchrnul_LDADD) $(LIBS)
-
-test-strerror$(EXEEXT): $(test_strerror_OBJECTS) $(test_strerror_DEPENDENCIES) $(EXTRA_test_strerror_DEPENDENCIES) 
+test-strerror$(EXEEXT): $(test_strerror_OBJECTS) $(test_strerror_DEPENDENCIES) 
 	@rm -f test-strerror$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strerror_OBJECTS) $(test_strerror_LDADD) $(LIBS)
-
-test-striconv$(EXEEXT): $(test_striconv_OBJECTS) $(test_striconv_DEPENDENCIES) $(EXTRA_test_striconv_DEPENDENCIES) 
+test-striconv$(EXEEXT): $(test_striconv_OBJECTS) $(test_striconv_DEPENDENCIES) 
 	@rm -f test-striconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_striconv_OBJECTS) $(test_striconv_LDADD) $(LIBS)
-
-test-striconveh$(EXEEXT): $(test_striconveh_OBJECTS) $(test_striconveh_DEPENDENCIES) $(EXTRA_test_striconveh_DEPENDENCIES) 
+test-striconveh$(EXEEXT): $(test_striconveh_OBJECTS) $(test_striconveh_DEPENDENCIES) 
 	@rm -f test-striconveh$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_striconveh_OBJECTS) $(test_striconveh_LDADD) $(LIBS)
-
-test-striconveha$(EXEEXT): $(test_striconveha_OBJECTS) $(test_striconveha_DEPENDENCIES) $(EXTRA_test_striconveha_DEPENDENCIES) 
+test-striconveha$(EXEEXT): $(test_striconveha_OBJECTS) $(test_striconveha_DEPENDENCIES) 
 	@rm -f test-striconveha$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_striconveha_OBJECTS) $(test_striconveha_LDADD) $(LIBS)
-
-test-string$(EXEEXT): $(test_string_OBJECTS) $(test_string_DEPENDENCIES) $(EXTRA_test_string_DEPENDENCIES) 
+test-string$(EXEEXT): $(test_string_OBJECTS) $(test_string_DEPENDENCIES) 
 	@rm -f test-string$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_string_OBJECTS) $(test_string_LDADD) $(LIBS)
-
-test-strnlen$(EXEEXT): $(test_strnlen_OBJECTS) $(test_strnlen_DEPENDENCIES) $(EXTRA_test_strnlen_DEPENDENCIES) 
-	@rm -f test-strnlen$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_strnlen_OBJECTS) $(test_strnlen_LDADD) $(LIBS)
-
-test-strstr$(EXEEXT): $(test_strstr_OBJECTS) $(test_strstr_DEPENDENCIES) $(EXTRA_test_strstr_DEPENDENCIES) 
+test-strstr$(EXEEXT): $(test_strstr_OBJECTS) $(test_strstr_DEPENDENCIES) 
 	@rm -f test-strstr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strstr_OBJECTS) $(test_strstr_LDADD) $(LIBS)
-
-test-strtol$(EXEEXT): $(test_strtol_OBJECTS) $(test_strtol_DEPENDENCIES) $(EXTRA_test_strtol_DEPENDENCIES) 
-	@rm -f test-strtol$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_strtol_OBJECTS) $(test_strtol_LDADD) $(LIBS)
-
-test-strtoul$(EXEEXT): $(test_strtoul_OBJECTS) $(test_strtoul_DEPENDENCIES) $(EXTRA_test_strtoul_DEPENDENCIES) 
-	@rm -f test-strtoul$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_strtoul_OBJECTS) $(test_strtoul_LDADD) $(LIBS)
-
-test-symlink$(EXEEXT): $(test_symlink_OBJECTS) $(test_symlink_DEPENDENCIES) $(EXTRA_test_symlink_DEPENDENCIES) 
+test-symlink$(EXEEXT): $(test_symlink_OBJECTS) $(test_symlink_DEPENDENCIES) 
 	@rm -f test-symlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_symlink_OBJECTS) $(test_symlink_LDADD) $(LIBS)
-
-test-sys_select$(EXEEXT): $(test_sys_select_OBJECTS) $(test_sys_select_DEPENDENCIES) $(EXTRA_test_sys_select_DEPENDENCIES) 
+test-sys_select$(EXEEXT): $(test_sys_select_OBJECTS) $(test_sys_select_DEPENDENCIES) 
 	@rm -f test-sys_select$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_select_OBJECTS) $(test_sys_select_LDADD) $(LIBS)
-
-test-sys_stat$(EXEEXT): $(test_sys_stat_OBJECTS) $(test_sys_stat_DEPENDENCIES) $(EXTRA_test_sys_stat_DEPENDENCIES) 
+test-sys_socket$(EXEEXT): $(test_sys_socket_OBJECTS) $(test_sys_socket_DEPENDENCIES) 
+	@rm -f test-sys_socket$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_sys_socket_OBJECTS) $(test_sys_socket_LDADD) $(LIBS)
+test-sys_stat$(EXEEXT): $(test_sys_stat_OBJECTS) $(test_sys_stat_DEPENDENCIES) 
 	@rm -f test-sys_stat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_stat_OBJECTS) $(test_sys_stat_LDADD) $(LIBS)
-
-test-sys_time$(EXEEXT): $(test_sys_time_OBJECTS) $(test_sys_time_DEPENDENCIES) $(EXTRA_test_sys_time_DEPENDENCIES) 
+test-sys_time$(EXEEXT): $(test_sys_time_OBJECTS) $(test_sys_time_DEPENDENCIES) 
 	@rm -f test-sys_time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_time_OBJECTS) $(test_sys_time_LDADD) $(LIBS)
-
-test-sys_types$(EXEEXT): $(test_sys_types_OBJECTS) $(test_sys_types_DEPENDENCIES) $(EXTRA_test_sys_types_DEPENDENCIES) 
-	@rm -f test-sys_types$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_sys_types_OBJECTS) $(test_sys_types_LDADD) $(LIBS)
-
-test-sys_wait$(EXEEXT): $(test_sys_wait_OBJECTS) $(test_sys_wait_DEPENDENCIES) $(EXTRA_test_sys_wait_DEPENDENCIES) 
+test-sys_wait$(EXEEXT): $(test_sys_wait_OBJECTS) $(test_sys_wait_DEPENDENCIES) 
 	@rm -f test-sys_wait$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS)
-
-test-term-ostream$(EXEEXT): $(test_term_ostream_OBJECTS) $(test_term_ostream_DEPENDENCIES) $(EXTRA_test_term_ostream_DEPENDENCIES) 
+test-term-ostream$(EXEEXT): $(test_term_ostream_OBJECTS) $(test_term_ostream_DEPENDENCIES) 
 	@rm -f test-term-ostream$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_term_ostream_OBJECTS) $(test_term_ostream_LDADD) $(LIBS)
-
-test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES) 
-	@rm -f test-thread_create$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS)
-
-test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES) 
-	@rm -f test-thread_self$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
-
-test-time$(EXEEXT): $(test_time_OBJECTS) $(test_time_DEPENDENCIES) $(EXTRA_test_time_DEPENDENCIES) 
+test-time$(EXEEXT): $(test_time_OBJECTS) $(test_time_DEPENDENCIES) 
 	@rm -f test-time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_time_OBJECTS) $(test_time_LDADD) $(LIBS)
-
-test-tls$(EXEEXT): $(test_tls_OBJECTS) $(test_tls_DEPENDENCIES) $(EXTRA_test_tls_DEPENDENCIES) 
+test-tls$(EXEEXT): $(test_tls_OBJECTS) $(test_tls_DEPENDENCIES) 
 	@rm -f test-tls$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_tls_OBJECTS) $(test_tls_LDADD) $(LIBS)
 unistr/test-u16-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u16-mbtouc$(EXEEXT): $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_DEPENDENCIES) $(EXTRA_test_u16_mbtouc_DEPENDENCIES) 
+test-u16-mbtouc$(EXEEXT): $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_DEPENDENCIES) 
 	@rm -f test-u16-mbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_LDADD) $(LIBS)
 unistr/test-u8-check.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-check$(EXEEXT): $(test_u8_check_OBJECTS) $(test_u8_check_DEPENDENCIES) $(EXTRA_test_u8_check_DEPENDENCIES) 
+test-u8-check$(EXEEXT): $(test_u8_check_OBJECTS) $(test_u8_check_DEPENDENCIES) 
 	@rm -f test-u8-check$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_check_OBJECTS) $(test_u8_check_LDADD) $(LIBS)
 unistr/test-u8-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-cmp$(EXEEXT): $(test_u8_cmp_OBJECTS) $(test_u8_cmp_DEPENDENCIES) $(EXTRA_test_u8_cmp_DEPENDENCIES) 
+test-u8-cmp$(EXEEXT): $(test_u8_cmp_OBJECTS) $(test_u8_cmp_DEPENDENCIES) 
 	@rm -f test-u8-cmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_cmp_OBJECTS) $(test_u8_cmp_LDADD) $(LIBS)
 uniconv/$(am__dirstamp):
@@ -3669,52 +2628,81 @@
 	@: > uniconv/$(DEPDIR)/$(am__dirstamp)
 uniconv/test-u8-conv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-conv-from-enc$(EXEEXT): $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_DEPENDENCIES) $(EXTRA_test_u8_conv_from_enc_DEPENDENCIES) 
+test-u8-conv-from-enc$(EXEEXT): $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_DEPENDENCIES) 
 	@rm -f test-u8-conv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_LDADD) $(LIBS)
 unistr/test-u8-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-mblen$(EXEEXT): $(test_u8_mblen_OBJECTS) $(test_u8_mblen_DEPENDENCIES) $(EXTRA_test_u8_mblen_DEPENDENCIES) 
+test-u8-mblen$(EXEEXT): $(test_u8_mblen_OBJECTS) $(test_u8_mblen_DEPENDENCIES) 
 	@rm -f test-u8-mblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mblen_OBJECTS) $(test_u8_mblen_LDADD) $(LIBS)
+unistr/test-u8-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mbtouc$(EXEEXT): $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_DEPENDENCIES) 
+	@rm -f test-u8-mbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_LDADD) $(LIBS)
+unistr/test-u8-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mbtouc-unsafe$(EXEEXT): $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_DEPENDENCIES) 
+	@rm -f test-u8-mbtouc-unsafe$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_LDADD) $(LIBS)
 unistr/test-u8-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-mbtoucr$(EXEEXT): $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_DEPENDENCIES) $(EXTRA_test_u8_mbtoucr_DEPENDENCIES) 
+test-u8-mbtoucr$(EXEEXT): $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_DEPENDENCIES) 
 	@rm -f test-u8-mbtoucr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_LDADD) $(LIBS)
+unilbrk/$(am__dirstamp):
+	@$(MKDIR_P) unilbrk
+	@: > unilbrk/$(am__dirstamp)
+unilbrk/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) unilbrk/$(DEPDIR)
+	@: > unilbrk/$(DEPDIR)/$(am__dirstamp)
+unilbrk/test-u8-possible-linebreaks.$(OBJEXT):  \
+	unilbrk/$(am__dirstamp) unilbrk/$(DEPDIR)/$(am__dirstamp)
+test-u8-possible-linebreaks$(EXEEXT): $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_DEPENDENCIES) 
+	@rm -f test-u8-possible-linebreaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_LDADD) $(LIBS)
 unistr/test-u8-prev.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-prev$(EXEEXT): $(test_u8_prev_OBJECTS) $(test_u8_prev_DEPENDENCIES) $(EXTRA_test_u8_prev_DEPENDENCIES) 
+test-u8-prev$(EXEEXT): $(test_u8_prev_OBJECTS) $(test_u8_prev_DEPENDENCIES) 
 	@rm -f test-u8-prev$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_prev_OBJECTS) $(test_u8_prev_LDADD) $(LIBS)
 unistr/test-u8-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-strlen$(EXEEXT): $(test_u8_strlen_OBJECTS) $(test_u8_strlen_DEPENDENCIES) $(EXTRA_test_u8_strlen_DEPENDENCIES) 
+test-u8-strlen$(EXEEXT): $(test_u8_strlen_OBJECTS) $(test_u8_strlen_DEPENDENCIES) 
 	@rm -f test-u8-strlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strlen_OBJECTS) $(test_u8_strlen_LDADD) $(LIBS)
 unistr/test-u8-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-uctomb$(EXEEXT): $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_DEPENDENCIES) $(EXTRA_test_u8_uctomb_DEPENDENCIES) 
+test-u8-uctomb$(EXEEXT): $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_DEPENDENCIES) 
 	@rm -f test-u8-uctomb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_LDADD) $(LIBS)
-unilbrk/$(am__dirstamp):
-	@$(MKDIR_P) unilbrk
-	@: > unilbrk/$(am__dirstamp)
-unilbrk/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) unilbrk/$(DEPDIR)
-	@: > unilbrk/$(DEPDIR)/$(am__dirstamp)
 unilbrk/test-u8-width-linebreaks.$(OBJEXT): unilbrk/$(am__dirstamp) \
 	unilbrk/$(DEPDIR)/$(am__dirstamp)
-
-test-u8-width-linebreaks$(EXEEXT): $(test_u8_width_linebreaks_OBJECTS) $(test_u8_width_linebreaks_DEPENDENCIES) $(EXTRA_test_u8_width_linebreaks_DEPENDENCIES) 
+test-u8-width-linebreaks$(EXEEXT): $(test_u8_width_linebreaks_OBJECTS) $(test_u8_width_linebreaks_DEPENDENCIES) 
 	@rm -f test-u8-width-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_width_linebreaks_OBJECTS) $(test_u8_width_linebreaks_LDADD) $(LIBS)
+uniwidth/$(am__dirstamp):
+	@$(MKDIR_P) uniwidth
+	@: > uniwidth/$(am__dirstamp)
+uniwidth/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) uniwidth/$(DEPDIR)
+	@: > uniwidth/$(DEPDIR)/$(am__dirstamp)
+uniwidth/test-uc_width.$(OBJEXT): uniwidth/$(am__dirstamp) \
+	uniwidth/$(DEPDIR)/$(am__dirstamp)
+test-uc_width$(EXEEXT): $(test_uc_width_OBJECTS) $(test_uc_width_DEPENDENCIES) 
+	@rm -f test-uc_width$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_uc_width_OBJECTS) $(test_uc_width_LDADD) $(LIBS)
+uniwidth/test-uc_width2.$(OBJEXT): uniwidth/$(am__dirstamp) \
+	uniwidth/$(DEPDIR)/$(am__dirstamp)
+test-uc_width2$(EXEEXT): $(test_uc_width2_OBJECTS) $(test_uc_width2_DEPENDENCIES) 
+	@rm -f test-uc_width2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_uc_width2_OBJECTS) $(test_uc_width2_LDADD) $(LIBS)
+unilbrk/test-ulc-width-linebreaks.$(OBJEXT): unilbrk/$(am__dirstamp) \
+	unilbrk/$(DEPDIR)/$(am__dirstamp)
+test-ulc-width-linebreaks$(EXEEXT): $(test_ulc_width_linebreaks_OBJECTS) $(test_ulc_width_linebreaks_DEPENDENCIES) 
+	@rm -f test-ulc-width-linebreaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_ulc_width_linebreaks_OBJECTS) $(test_ulc_width_linebreaks_LDADD) $(LIBS)
 uniname/$(am__dirstamp):
 	@$(MKDIR_P) uniname
 	@: > uniname/$(am__dirstamp)
@@ -3723,98 +2711,80 @@
 	@: > uniname/$(DEPDIR)/$(am__dirstamp)
 uniname/test-uninames.$(OBJEXT): uniname/$(am__dirstamp) \
 	uniname/$(DEPDIR)/$(am__dirstamp)
-
-test-uninames$(EXEEXT): $(test_uninames_OBJECTS) $(test_uninames_DEPENDENCIES) $(EXTRA_test_uninames_DEPENDENCIES) 
+test-uninames$(EXEEXT): $(test_uninames_OBJECTS) $(test_uninames_DEPENDENCIES) 
 	@rm -f test-uninames$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uninames_OBJECTS) $(test_uninames_LDADD) $(LIBS)
-
-test-unistd$(EXEEXT): $(test_unistd_OBJECTS) $(test_unistd_DEPENDENCIES) $(EXTRA_test_unistd_DEPENDENCIES) 
+test-unistd$(EXEEXT): $(test_unistd_OBJECTS) $(test_unistd_DEPENDENCIES) 
 	@rm -f test-unistd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unistd_OBJECTS) $(test_unistd_LDADD) $(LIBS)
-
-test-unsetenv$(EXEEXT): $(test_unsetenv_OBJECTS) $(test_unsetenv_DEPENDENCIES) $(EXTRA_test_unsetenv_DEPENDENCIES) 
+test-unsetenv$(EXEEXT): $(test_unsetenv_OBJECTS) $(test_unsetenv_DEPENDENCIES) 
 	@rm -f test-unsetenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unsetenv_OBJECTS) $(test_unsetenv_LDADD) $(LIBS)
-
-test-vasnprintf$(EXEEXT): $(test_vasnprintf_OBJECTS) $(test_vasnprintf_DEPENDENCIES) $(EXTRA_test_vasnprintf_DEPENDENCIES) 
+test-vasnprintf$(EXEEXT): $(test_vasnprintf_OBJECTS) $(test_vasnprintf_DEPENDENCIES) 
 	@rm -f test-vasnprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vasnprintf_OBJECTS) $(test_vasnprintf_LDADD) $(LIBS)
-
-test-vasprintf$(EXEEXT): $(test_vasprintf_OBJECTS) $(test_vasprintf_DEPENDENCIES) $(EXTRA_test_vasprintf_DEPENDENCIES) 
+test-vasprintf$(EXEEXT): $(test_vasprintf_OBJECTS) $(test_vasprintf_DEPENDENCIES) 
 	@rm -f test-vasprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vasprintf_OBJECTS) $(test_vasprintf_LDADD) $(LIBS)
-
-test-verify$(EXEEXT): $(test_verify_OBJECTS) $(test_verify_DEPENDENCIES) $(EXTRA_test_verify_DEPENDENCIES) 
+test-verify$(EXEEXT): $(test_verify_OBJECTS) $(test_verify_DEPENDENCIES) 
 	@rm -f test-verify$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_verify_OBJECTS) $(test_verify_LDADD) $(LIBS)
-
-test-vsnprintf$(EXEEXT): $(test_vsnprintf_OBJECTS) $(test_vsnprintf_DEPENDENCIES) $(EXTRA_test_vsnprintf_DEPENDENCIES) 
+test-vsnprintf$(EXEEXT): $(test_vsnprintf_OBJECTS) $(test_vsnprintf_DEPENDENCIES) 
 	@rm -f test-vsnprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vsnprintf_OBJECTS) $(test_vsnprintf_LDADD) $(LIBS)
-
-test-wchar$(EXEEXT): $(test_wchar_OBJECTS) $(test_wchar_DEPENDENCIES) $(EXTRA_test_wchar_DEPENDENCIES) 
+test-wchar$(EXEEXT): $(test_wchar_OBJECTS) $(test_wchar_DEPENDENCIES) 
 	@rm -f test-wchar$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wchar_OBJECTS) $(test_wchar_LDADD) $(LIBS)
-
-test-wcrtomb$(EXEEXT): $(test_wcrtomb_OBJECTS) $(test_wcrtomb_DEPENDENCIES) $(EXTRA_test_wcrtomb_DEPENDENCIES) 
-	@rm -f test-wcrtomb$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_wcrtomb_OBJECTS) $(test_wcrtomb_LDADD) $(LIBS)
-
-test-wcrtomb-w32$(EXEEXT): $(test_wcrtomb_w32_OBJECTS) $(test_wcrtomb_w32_DEPENDENCIES) $(EXTRA_test_wcrtomb_w32_DEPENDENCIES) 
-	@rm -f test-wcrtomb-w32$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_wcrtomb_w32_OBJECTS) $(test_wcrtomb_w32_LDADD) $(LIBS)
-
-test-wctype-h$(EXEEXT): $(test_wctype_h_OBJECTS) $(test_wctype_h_DEPENDENCIES) $(EXTRA_test_wctype_h_DEPENDENCIES) 
-	@rm -f test-wctype-h$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_wctype_h_OBJECTS) $(test_wctype_h_LDADD) $(LIBS)
-
-test-wcwidth$(EXEEXT): $(test_wcwidth_OBJECTS) $(test_wcwidth_DEPENDENCIES) $(EXTRA_test_wcwidth_DEPENDENCIES) 
+test-wctype$(EXEEXT): $(test_wctype_OBJECTS) $(test_wctype_DEPENDENCIES) 
+	@rm -f test-wctype$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_wctype_OBJECTS) $(test_wctype_LDADD) $(LIBS)
+test-wcwidth$(EXEEXT): $(test_wcwidth_OBJECTS) $(test_wcwidth_DEPENDENCIES) 
 	@rm -f test-wcwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wcwidth_OBJECTS) $(test_wcwidth_LDADD) $(LIBS)
-
-test-write$(EXEEXT): $(test_write_OBJECTS) $(test_write_DEPENDENCIES) $(EXTRA_test_write_DEPENDENCIES) 
-	@rm -f test-write$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_write_OBJECTS) $(test_write_LDADD) $(LIBS)
-
-test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENCIES) $(EXTRA_test_xalloc_die_DEPENDENCIES) 
+test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENCIES) 
 	@rm -f test-xalloc-die$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xalloc_die_OBJECTS) $(test_xalloc_die_LDADD) $(LIBS)
-
-test-xvasprintf$(EXEEXT): $(test_xvasprintf_OBJECTS) $(test_xvasprintf_DEPENDENCIES) $(EXTRA_test_xvasprintf_DEPENDENCIES) 
+test-xvasprintf$(EXEEXT): $(test_xvasprintf_OBJECTS) $(test_xvasprintf_DEPENDENCIES) 
 	@rm -f test-xvasprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xvasprintf_OBJECTS) $(test_xvasprintf_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f glthread/*.$(OBJEXT)
-	-rm -f uniconv/*.$(OBJEXT)
-	-rm -f unilbrk/*.$(OBJEXT)
-	-rm -f uniname/*.$(OBJEXT)
-	-rm -f unistr/*.$(OBJEXT)
+	-rm -f glthread/thread.$(OBJEXT)
+	-rm -f uniconv/test-u8-conv-from-enc.$(OBJEXT)
+	-rm -f unilbrk/test-u8-possible-linebreaks.$(OBJEXT)
+	-rm -f unilbrk/test-u8-width-linebreaks.$(OBJEXT)
+	-rm -f unilbrk/test-ulc-width-linebreaks.$(OBJEXT)
+	-rm -f uniname/test-uninames.$(OBJEXT)
+	-rm -f unistr/test-u16-mbtouc.$(OBJEXT)
+	-rm -f unistr/test-u8-check.$(OBJEXT)
+	-rm -f unistr/test-u8-cmp.$(OBJEXT)
+	-rm -f unistr/test-u8-mblen.$(OBJEXT)
+	-rm -f unistr/test-u8-mbtouc-unsafe.$(OBJEXT)
+	-rm -f unistr/test-u8-mbtouc.$(OBJEXT)
+	-rm -f unistr/test-u8-mbtoucr.$(OBJEXT)
+	-rm -f unistr/test-u8-prev.$(OBJEXT)
+	-rm -f unistr/test-u8-strlen.$(OBJEXT)
+	-rm -f unistr/test-u8-uctomb.$(OBJEXT)
+	-rm -f unistr/u8-cmp.$(OBJEXT)
+	-rm -f unistr/u8-strlen.$(OBJEXT)
+	-rm -f uniwidth/test-uc_width.$(OBJEXT)
+	-rm -f uniwidth/test-uc_width2.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftell.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftello.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcwd-lgpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-alignof.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-alloca-opt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-areadlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-argmatch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-array_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-atexit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-binary-io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-btowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-byteswap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strcasecmp.Po@am__quote@
@@ -3823,34 +2793,18 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strstr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-canonicalize-lgpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cloexec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-close.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-copy-acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-copy-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dirent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dup-safer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dup2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-environ.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-errno.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fcntl-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fcntl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fdopen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fgetc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-file-has-acl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-float.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fnmatch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fopen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fputc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fstat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fstrcmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ftell.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ftell3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ftello.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ftello3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ftello4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fwrite.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getcwd-lgpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getdelim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getdtablesize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getline.Po@am__quote@
@@ -3858,18 +2812,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gettimeofday.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ignore-value.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-intprops.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-inttypes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iswblank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-linkedhash_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lseek.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lstat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-malloca.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbrtowc-w32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbrtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbsinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbsrtowcs.Po@am__quote@
@@ -3878,38 +2826,26 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbsstr3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-memchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-open.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pathmax.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe-filter-ii1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe-filter-ii2-child.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe-filter-ii2-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn_file_actions_addclose.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn_file_actions_adddup2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn_file_actions_addopen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-quotearg-simple.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-raise.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rawmemchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-read-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rmdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sameacls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sched.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-set-mode-acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setenv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setlocale1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setlocale2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sh-quote.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sigaction.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signal-h.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sigpipe.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sigprocmask.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-snprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spawn-pipe-child.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spawn-pipe-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spawn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdbool.Po@am__quote@
@@ -3923,19 +2859,14 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconveh.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconveha.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-string.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strnlen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strstr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strtol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strtoul.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-symlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_select.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_socket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_time.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_types.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_wait.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-term-ostream.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_create.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_self.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@
@@ -3945,54 +2876,58 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-verify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-vsnprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wchar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcrtomb-w32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcrtomb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wctype-h.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wctype.Po@am__quote@
 @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-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@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/thread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniconv/$(DEPDIR)/test-u8-conv-from-enc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unilbrk/$(DEPDIR)/test-u8-possible-linebreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unilbrk/$(DEPDIR)/test-u8-width-linebreaks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unilbrk/$(DEPDIR)/test-ulc-width-linebreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniname/$(DEPDIR)/test-uninames.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-mbtouc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-check.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-cmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbtouc-unsafe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbtouc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbtoucr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-prev.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strlen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-uctomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-cmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-strlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/test-uc_width.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/test-uc_width2.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -4001,25 +2936,22 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -4034,12 +2966,57 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -4055,7 +3032,12 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -4067,11 +3049,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -4080,1426 +3066,101 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
+	    else \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
 	    else \
-	      color_start= color_end=; \
+	      skipped="($$skip tests were not run)"; \
 	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS:
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-test-file-has-acl.sh.log: test-file-has-acl.sh
-	@p='test-file-has-acl.sh'; \
-	b='test-file-has-acl.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-file-has-acl-1.sh.log: test-file-has-acl-1.sh
-	@p='test-file-has-acl-1.sh'; \
-	b='test-file-has-acl-1.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-file-has-acl-2.sh.log: test-file-has-acl-2.sh
-	@p='test-file-has-acl-2.sh'; \
-	b='test-file-has-acl-2.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-set-mode-acl.sh.log: test-set-mode-acl.sh
-	@p='test-set-mode-acl.sh'; \
-	b='test-set-mode-acl.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-set-mode-acl-1.sh.log: test-set-mode-acl-1.sh
-	@p='test-set-mode-acl-1.sh'; \
-	b='test-set-mode-acl-1.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-set-mode-acl-2.sh.log: test-set-mode-acl-2.sh
-	@p='test-set-mode-acl-2.sh'; \
-	b='test-set-mode-acl-2.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-copy-acl.sh.log: test-copy-acl.sh
-	@p='test-copy-acl.sh'; \
-	b='test-copy-acl.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-copy-acl-1.sh.log: test-copy-acl-1.sh
-	@p='test-copy-acl-1.sh'; \
-	b='test-copy-acl-1.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-copy-acl-2.sh.log: test-copy-acl-2.sh
-	@p='test-copy-acl-2.sh'; \
-	b='test-copy-acl-2.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-alloca-opt.log: test-alloca-opt$(EXEEXT)
-	@p='test-alloca-opt$(EXEEXT)'; \
-	b='test-alloca-opt'; \
-	$(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-areadlink.log: test-areadlink$(EXEEXT)
-	@p='test-areadlink$(EXEEXT)'; \
-	b='test-areadlink'; \
-	$(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-argmatch.log: test-argmatch$(EXEEXT)
-	@p='test-argmatch$(EXEEXT)'; \
-	b='test-argmatch'; \
-	$(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-array_list.log: test-array_list$(EXEEXT)
-	@p='test-array_list$(EXEEXT)'; \
-	b='test-array_list'; \
-	$(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-atexit.sh.log: test-atexit.sh
-	@p='test-atexit.sh'; \
-	b='test-atexit.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-binary-io.sh.log: test-binary-io.sh
-	@p='test-binary-io.sh'; \
-	b='test-binary-io.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-btowc1.sh.log: test-btowc1.sh
-	@p='test-btowc1.sh'; \
-	b='test-btowc1.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-btowc2.sh.log: test-btowc2.sh
-	@p='test-btowc2.sh'; \
-	b='test-btowc2.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-byteswap.log: test-byteswap$(EXEEXT)
-	@p='test-byteswap$(EXEEXT)'; \
-	b='test-byteswap'; \
-	$(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-c-ctype.log: test-c-ctype$(EXEEXT)
-	@p='test-c-ctype$(EXEEXT)'; \
-	b='test-c-ctype'; \
-	$(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-c-strcase.sh.log: test-c-strcase.sh
-	@p='test-c-strcase.sh'; \
-	b='test-c-strcase.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-c-strcasestr.log: test-c-strcasestr$(EXEEXT)
-	@p='test-c-strcasestr$(EXEEXT)'; \
-	b='test-c-strcasestr'; \
-	$(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-c-strstr.log: test-c-strstr$(EXEEXT)
-	@p='test-c-strstr$(EXEEXT)'; \
-	b='test-c-strstr'; \
-	$(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-canonicalize-lgpl.log: test-canonicalize-lgpl$(EXEEXT)
-	@p='test-canonicalize-lgpl$(EXEEXT)'; \
-	b='test-canonicalize-lgpl'; \
-	$(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-cloexec.log: test-cloexec$(EXEEXT)
-	@p='test-cloexec$(EXEEXT)'; \
-	b='test-cloexec'; \
-	$(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-close.log: test-close$(EXEEXT)
-	@p='test-close$(EXEEXT)'; \
-	b='test-close'; \
-	$(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-copy-file.sh.log: test-copy-file.sh
-	@p='test-copy-file.sh'; \
-	b='test-copy-file.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-copy-file-1.sh.log: test-copy-file-1.sh
-	@p='test-copy-file-1.sh'; \
-	b='test-copy-file-1.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-copy-file-2.sh.log: test-copy-file-2.sh
-	@p='test-copy-file-2.sh'; \
-	b='test-copy-file-2.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-dirent.log: test-dirent$(EXEEXT)
-	@p='test-dirent$(EXEEXT)'; \
-	b='test-dirent'; \
-	$(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-dup.log: test-dup$(EXEEXT)
-	@p='test-dup$(EXEEXT)'; \
-	b='test-dup'; \
-	$(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-dup2.log: test-dup2$(EXEEXT)
-	@p='test-dup2$(EXEEXT)'; \
-	b='test-dup2'; \
-	$(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-environ.log: test-environ$(EXEEXT)
-	@p='test-environ$(EXEEXT)'; \
-	b='test-environ'; \
-	$(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-errno.log: test-errno$(EXEEXT)
-	@p='test-errno$(EXEEXT)'; \
-	b='test-errno'; \
-	$(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-fcntl-h.log: test-fcntl-h$(EXEEXT)
-	@p='test-fcntl-h$(EXEEXT)'; \
-	b='test-fcntl-h'; \
-	$(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-fcntl.log: test-fcntl$(EXEEXT)
-	@p='test-fcntl$(EXEEXT)'; \
-	b='test-fcntl'; \
-	$(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-fdopen.log: test-fdopen$(EXEEXT)
-	@p='test-fdopen$(EXEEXT)'; \
-	b='test-fdopen'; \
-	$(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-fgetc.log: test-fgetc$(EXEEXT)
-	@p='test-fgetc$(EXEEXT)'; \
-	b='test-fgetc'; \
-	$(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-float.log: test-float$(EXEEXT)
-	@p='test-float$(EXEEXT)'; \
-	b='test-float'; \
-	$(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-fnmatch.log: test-fnmatch$(EXEEXT)
-	@p='test-fnmatch$(EXEEXT)'; \
-	b='test-fnmatch'; \
-	$(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-fopen.log: test-fopen$(EXEEXT)
-	@p='test-fopen$(EXEEXT)'; \
-	b='test-fopen'; \
-	$(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-fputc.log: test-fputc$(EXEEXT)
-	@p='test-fputc$(EXEEXT)'; \
-	b='test-fputc'; \
-	$(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-fread.log: test-fread$(EXEEXT)
-	@p='test-fread$(EXEEXT)'; \
-	b='test-fread'; \
-	$(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-fstat.log: test-fstat$(EXEEXT)
-	@p='test-fstat$(EXEEXT)'; \
-	b='test-fstat'; \
-	$(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-fstrcmp.log: test-fstrcmp$(EXEEXT)
-	@p='test-fstrcmp$(EXEEXT)'; \
-	b='test-fstrcmp'; \
-	$(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-ftell.sh.log: test-ftell.sh
-	@p='test-ftell.sh'; \
-	b='test-ftell.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-ftell2.sh.log: test-ftell2.sh
-	@p='test-ftell2.sh'; \
-	b='test-ftell2.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-ftell3.log: test-ftell3$(EXEEXT)
-	@p='test-ftell3$(EXEEXT)'; \
-	b='test-ftell3'; \
-	$(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-ftello.sh.log: test-ftello.sh
-	@p='test-ftello.sh'; \
-	b='test-ftello.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-ftello2.sh.log: test-ftello2.sh
-	@p='test-ftello2.sh'; \
-	b='test-ftello2.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-ftello3.log: test-ftello3$(EXEEXT)
-	@p='test-ftello3$(EXEEXT)'; \
-	b='test-ftello3'; \
-	$(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-ftello4.sh.log: test-ftello4.sh
-	@p='test-ftello4.sh'; \
-	b='test-ftello4.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-fwrite.log: test-fwrite$(EXEEXT)
-	@p='test-fwrite$(EXEEXT)'; \
-	b='test-fwrite'; \
-	$(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-getcwd-lgpl.log: test-getcwd-lgpl$(EXEEXT)
-	@p='test-getcwd-lgpl$(EXEEXT)'; \
-	b='test-getcwd-lgpl'; \
-	$(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-getdelim.log: test-getdelim$(EXEEXT)
-	@p='test-getdelim$(EXEEXT)'; \
-	b='test-getdelim'; \
-	$(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-getdtablesize.log: test-getdtablesize$(EXEEXT)
-	@p='test-getdtablesize$(EXEEXT)'; \
-	b='test-getdtablesize'; \
-	$(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-getline.log: test-getline$(EXEEXT)
-	@p='test-getline$(EXEEXT)'; \
-	b='test-getline'; \
-	$(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-getopt.log: test-getopt$(EXEEXT)
-	@p='test-getopt$(EXEEXT)'; \
-	b='test-getopt'; \
-	$(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-gettimeofday.log: test-gettimeofday$(EXEEXT)
-	@p='test-gettimeofday$(EXEEXT)'; \
-	b='test-gettimeofday'; \
-	$(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-iconv-h.log: test-iconv-h$(EXEEXT)
-	@p='test-iconv-h$(EXEEXT)'; \
-	b='test-iconv-h'; \
-	$(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-iconv.log: test-iconv$(EXEEXT)
-	@p='test-iconv$(EXEEXT)'; \
-	b='test-iconv'; \
-	$(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-ignore-value.log: test-ignore-value$(EXEEXT)
-	@p='test-ignore-value$(EXEEXT)'; \
-	b='test-ignore-value'; \
-	$(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-intprops.log: test-intprops$(EXEEXT)
-	@p='test-intprops$(EXEEXT)'; \
-	b='test-intprops'; \
-	$(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-inttypes.log: test-inttypes$(EXEEXT)
-	@p='test-inttypes$(EXEEXT)'; \
-	b='test-inttypes'; \
-	$(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-iswblank.log: test-iswblank$(EXEEXT)
-	@p='test-iswblank$(EXEEXT)'; \
-	b='test-iswblank'; \
-	$(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-linkedhash_list.log: test-linkedhash_list$(EXEEXT)
-	@p='test-linkedhash_list$(EXEEXT)'; \
-	b='test-linkedhash_list'; \
-	$(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-locale.log: test-locale$(EXEEXT)
-	@p='test-locale$(EXEEXT)'; \
-	b='test-locale'; \
-	$(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-localename.log: test-localename$(EXEEXT)
-	@p='test-localename$(EXEEXT)'; \
-	b='test-localename'; \
-	$(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-lock.log: test-lock$(EXEEXT)
-	@p='test-lock$(EXEEXT)'; \
-	b='test-lock'; \
-	$(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-lseek.sh.log: test-lseek.sh
-	@p='test-lseek.sh'; \
-	b='test-lseek.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-lstat.log: test-lstat$(EXEEXT)
-	@p='test-lstat$(EXEEXT)'; \
-	b='test-lstat'; \
-	$(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-malloca.log: test-malloca$(EXEEXT)
-	@p='test-malloca$(EXEEXT)'; \
-	b='test-malloca'; \
-	$(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-mbrtowc1.sh.log: test-mbrtowc1.sh
-	@p='test-mbrtowc1.sh'; \
-	b='test-mbrtowc1.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-mbrtowc2.sh.log: test-mbrtowc2.sh
-	@p='test-mbrtowc2.sh'; \
-	b='test-mbrtowc2.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-mbrtowc3.sh.log: test-mbrtowc3.sh
-	@p='test-mbrtowc3.sh'; \
-	b='test-mbrtowc3.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-mbrtowc4.sh.log: test-mbrtowc4.sh
-	@p='test-mbrtowc4.sh'; \
-	b='test-mbrtowc4.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'; \
-	$(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-2.sh.log: test-mbrtowc-w32-2.sh
-	@p='test-mbrtowc-w32-2.sh'; \
-	b='test-mbrtowc-w32-2.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-3.sh.log: test-mbrtowc-w32-3.sh
-	@p='test-mbrtowc-w32-3.sh'; \
-	b='test-mbrtowc-w32-3.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-4.sh.log: test-mbrtowc-w32-4.sh
-	@p='test-mbrtowc-w32-4.sh'; \
-	b='test-mbrtowc-w32-4.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-5.sh.log: test-mbrtowc-w32-5.sh
-	@p='test-mbrtowc-w32-5.sh'; \
-	b='test-mbrtowc-w32-5.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-mbsinit.sh.log: test-mbsinit.sh
-	@p='test-mbsinit.sh'; \
-	b='test-mbsinit.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-mbsrtowcs1.sh.log: test-mbsrtowcs1.sh
-	@p='test-mbsrtowcs1.sh'; \
-	b='test-mbsrtowcs1.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-mbsrtowcs2.sh.log: test-mbsrtowcs2.sh
-	@p='test-mbsrtowcs2.sh'; \
-	b='test-mbsrtowcs2.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-mbsrtowcs3.sh.log: test-mbsrtowcs3.sh
-	@p='test-mbsrtowcs3.sh'; \
-	b='test-mbsrtowcs3.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-mbsrtowcs4.sh.log: test-mbsrtowcs4.sh
-	@p='test-mbsrtowcs4.sh'; \
-	b='test-mbsrtowcs4.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-mbsstr1.log: test-mbsstr1$(EXEEXT)
-	@p='test-mbsstr1$(EXEEXT)'; \
-	b='test-mbsstr1'; \
-	$(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-mbsstr2.sh.log: test-mbsstr2.sh
-	@p='test-mbsstr2.sh'; \
-	b='test-mbsstr2.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-mbsstr3.sh.log: test-mbsstr3.sh
-	@p='test-mbsstr3.sh'; \
-	b='test-mbsstr3.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-memchr.log: test-memchr$(EXEEXT)
-	@p='test-memchr$(EXEEXT)'; \
-	b='test-memchr'; \
-	$(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-open.log: test-open$(EXEEXT)
-	@p='test-open$(EXEEXT)'; \
-	b='test-open'; \
-	$(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-pathmax.log: test-pathmax$(EXEEXT)
-	@p='test-pathmax$(EXEEXT)'; \
-	b='test-pathmax'; \
-	$(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-pipe-filter-ii1.sh.log: test-pipe-filter-ii1.sh
-	@p='test-pipe-filter-ii1.sh'; \
-	b='test-pipe-filter-ii1.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-pipe-filter-ii2.sh.log: test-pipe-filter-ii2.sh
-	@p='test-pipe-filter-ii2.sh'; \
-	b='test-pipe-filter-ii2.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-pipe2.log: test-pipe2$(EXEEXT)
-	@p='test-pipe2$(EXEEXT)'; \
-	b='test-pipe2'; \
-	$(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-posix_spawn_file_actions_addclose.log: test-posix_spawn_file_actions_addclose$(EXEEXT)
-	@p='test-posix_spawn_file_actions_addclose$(EXEEXT)'; \
-	b='test-posix_spawn_file_actions_addclose'; \
-	$(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-posix_spawn_file_actions_adddup2.log: test-posix_spawn_file_actions_adddup2$(EXEEXT)
-	@p='test-posix_spawn_file_actions_adddup2$(EXEEXT)'; \
-	b='test-posix_spawn_file_actions_adddup2'; \
-	$(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-posix_spawn_file_actions_addopen.log: test-posix_spawn_file_actions_addopen$(EXEEXT)
-	@p='test-posix_spawn_file_actions_addopen$(EXEEXT)'; \
-	b='test-posix_spawn_file_actions_addopen'; \
-	$(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-posix_spawn1.log: test-posix_spawn1$(EXEEXT)
-	@p='test-posix_spawn1$(EXEEXT)'; \
-	b='test-posix_spawn1'; \
-	$(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-posix_spawn2.log: test-posix_spawn2$(EXEEXT)
-	@p='test-posix_spawn2$(EXEEXT)'; \
-	b='test-posix_spawn2'; \
-	$(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-quotearg-simple.log: test-quotearg-simple$(EXEEXT)
-	@p='test-quotearg-simple$(EXEEXT)'; \
-	b='test-quotearg-simple'; \
-	$(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-raise.log: test-raise$(EXEEXT)
-	@p='test-raise$(EXEEXT)'; \
-	b='test-raise'; \
-	$(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-rawmemchr.log: test-rawmemchr$(EXEEXT)
-	@p='test-rawmemchr$(EXEEXT)'; \
-	b='test-rawmemchr'; \
-	$(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-read-file.log: test-read-file$(EXEEXT)
-	@p='test-read-file$(EXEEXT)'; \
-	b='test-read-file'; \
-	$(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-read.log: test-read$(EXEEXT)
-	@p='test-read$(EXEEXT)'; \
-	b='test-read'; \
-	$(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-readlink.log: test-readlink$(EXEEXT)
-	@p='test-readlink$(EXEEXT)'; \
-	b='test-readlink'; \
-	$(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-rmdir.log: test-rmdir$(EXEEXT)
-	@p='test-rmdir$(EXEEXT)'; \
-	b='test-rmdir'; \
-	$(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-sched.log: test-sched$(EXEEXT)
-	@p='test-sched$(EXEEXT)'; \
-	b='test-sched'; \
-	$(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-setenv.log: test-setenv$(EXEEXT)
-	@p='test-setenv$(EXEEXT)'; \
-	b='test-setenv'; \
-	$(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-setlocale1.sh.log: test-setlocale1.sh
-	@p='test-setlocale1.sh'; \
-	b='test-setlocale1.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-setlocale2.sh.log: test-setlocale2.sh
-	@p='test-setlocale2.sh'; \
-	b='test-setlocale2.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-sh-quote.log: test-sh-quote$(EXEEXT)
-	@p='test-sh-quote$(EXEEXT)'; \
-	b='test-sh-quote'; \
-	$(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-sigaction.log: test-sigaction$(EXEEXT)
-	@p='test-sigaction$(EXEEXT)'; \
-	b='test-sigaction'; \
-	$(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-signal-h.log: test-signal-h$(EXEEXT)
-	@p='test-signal-h$(EXEEXT)'; \
-	b='test-signal-h'; \
-	$(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-sigpipe.sh.log: test-sigpipe.sh
-	@p='test-sigpipe.sh'; \
-	b='test-sigpipe.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-sigprocmask.log: test-sigprocmask$(EXEEXT)
-	@p='test-sigprocmask$(EXEEXT)'; \
-	b='test-sigprocmask'; \
-	$(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-sleep.log: test-sleep$(EXEEXT)
-	@p='test-sleep$(EXEEXT)'; \
-	b='test-sleep'; \
-	$(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-snprintf.log: test-snprintf$(EXEEXT)
-	@p='test-snprintf$(EXEEXT)'; \
-	b='test-snprintf'; \
-	$(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-spawn-pipe.sh.log: test-spawn-pipe.sh
-	@p='test-spawn-pipe.sh'; \
-	b='test-spawn-pipe.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-spawn.log: test-spawn$(EXEEXT)
-	@p='test-spawn$(EXEEXT)'; \
-	b='test-spawn'; \
-	$(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-stat.log: test-stat$(EXEEXT)
-	@p='test-stat$(EXEEXT)'; \
-	b='test-stat'; \
-	$(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-stdbool.log: test-stdbool$(EXEEXT)
-	@p='test-stdbool$(EXEEXT)'; \
-	b='test-stdbool'; \
-	$(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-stddef.log: test-stddef$(EXEEXT)
-	@p='test-stddef$(EXEEXT)'; \
-	b='test-stddef'; \
-	$(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-stdint.log: test-stdint$(EXEEXT)
-	@p='test-stdint$(EXEEXT)'; \
-	b='test-stdint'; \
-	$(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-stdio.log: test-stdio$(EXEEXT)
-	@p='test-stdio$(EXEEXT)'; \
-	b='test-stdio'; \
-	$(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-stdlib.log: test-stdlib$(EXEEXT)
-	@p='test-stdlib$(EXEEXT)'; \
-	b='test-stdlib'; \
-	$(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-strchrnul.log: test-strchrnul$(EXEEXT)
-	@p='test-strchrnul$(EXEEXT)'; \
-	b='test-strchrnul'; \
-	$(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-strerror.log: test-strerror$(EXEEXT)
-	@p='test-strerror$(EXEEXT)'; \
-	b='test-strerror'; \
-	$(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-striconv.log: test-striconv$(EXEEXT)
-	@p='test-striconv$(EXEEXT)'; \
-	b='test-striconv'; \
-	$(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-striconveh.log: test-striconveh$(EXEEXT)
-	@p='test-striconveh$(EXEEXT)'; \
-	b='test-striconveh'; \
-	$(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-striconveha.log: test-striconveha$(EXEEXT)
-	@p='test-striconveha$(EXEEXT)'; \
-	b='test-striconveha'; \
-	$(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-string.log: test-string$(EXEEXT)
-	@p='test-string$(EXEEXT)'; \
-	b='test-string'; \
-	$(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-strnlen.log: test-strnlen$(EXEEXT)
-	@p='test-strnlen$(EXEEXT)'; \
-	b='test-strnlen'; \
-	$(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-strstr.log: test-strstr$(EXEEXT)
-	@p='test-strstr$(EXEEXT)'; \
-	b='test-strstr'; \
-	$(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-strtol.log: test-strtol$(EXEEXT)
-	@p='test-strtol$(EXEEXT)'; \
-	b='test-strtol'; \
-	$(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-strtoul.log: test-strtoul$(EXEEXT)
-	@p='test-strtoul$(EXEEXT)'; \
-	b='test-strtoul'; \
-	$(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-symlink.log: test-symlink$(EXEEXT)
-	@p='test-symlink$(EXEEXT)'; \
-	b='test-symlink'; \
-	$(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-sys_select.log: test-sys_select$(EXEEXT)
-	@p='test-sys_select$(EXEEXT)'; \
-	b='test-sys_select'; \
-	$(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-sys_stat.log: test-sys_stat$(EXEEXT)
-	@p='test-sys_stat$(EXEEXT)'; \
-	b='test-sys_stat'; \
-	$(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-sys_time.log: test-sys_time$(EXEEXT)
-	@p='test-sys_time$(EXEEXT)'; \
-	b='test-sys_time'; \
-	$(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-sys_types.log: test-sys_types$(EXEEXT)
-	@p='test-sys_types$(EXEEXT)'; \
-	b='test-sys_types'; \
-	$(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-sys_wait.log: test-sys_wait$(EXEEXT)
-	@p='test-sys_wait$(EXEEXT)'; \
-	b='test-sys_wait'; \
-	$(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-term-ostream-xterm.log: test-term-ostream-xterm
-	@p='test-term-ostream-xterm'; \
-	b='test-term-ostream-xterm'; \
-	$(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-init.sh.log: test-init.sh
-	@p='test-init.sh'; \
-	b='test-init.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-thread_self.log: test-thread_self$(EXEEXT)
-	@p='test-thread_self$(EXEEXT)'; \
-	b='test-thread_self'; \
-	$(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-thread_create.log: test-thread_create$(EXEEXT)
-	@p='test-thread_create$(EXEEXT)'; \
-	b='test-thread_create'; \
-	$(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-time.log: test-time$(EXEEXT)
-	@p='test-time$(EXEEXT)'; \
-	b='test-time'; \
-	$(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-tls.log: test-tls$(EXEEXT)
-	@p='test-tls$(EXEEXT)'; \
-	b='test-tls'; \
-	$(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-u8-conv-from-enc.log: test-u8-conv-from-enc$(EXEEXT)
-	@p='test-u8-conv-from-enc$(EXEEXT)'; \
-	b='test-u8-conv-from-enc'; \
-	$(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-u8-width-linebreaks.log: test-u8-width-linebreaks$(EXEEXT)
-	@p='test-u8-width-linebreaks$(EXEEXT)'; \
-	b='test-u8-width-linebreaks'; \
-	$(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)
-uniname/test-uninames.sh.log: uniname/test-uninames.sh
-	@p='uniname/test-uninames.sh'; \
-	b='uniname/test-uninames.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-dup-safer.log: test-dup-safer$(EXEEXT)
-	@p='test-dup-safer$(EXEEXT)'; \
-	b='test-dup-safer'; \
-	$(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-unistd.log: test-unistd$(EXEEXT)
-	@p='test-unistd$(EXEEXT)'; \
-	b='test-unistd'; \
-	$(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-u16-mbtouc.log: test-u16-mbtouc$(EXEEXT)
-	@p='test-u16-mbtouc$(EXEEXT)'; \
-	b='test-u16-mbtouc'; \
-	$(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-u8-check.log: test-u8-check$(EXEEXT)
-	@p='test-u8-check$(EXEEXT)'; \
-	b='test-u8-check'; \
-	$(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-u8-cmp.log: test-u8-cmp$(EXEEXT)
-	@p='test-u8-cmp$(EXEEXT)'; \
-	b='test-u8-cmp'; \
-	$(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-u8-mblen.log: test-u8-mblen$(EXEEXT)
-	@p='test-u8-mblen$(EXEEXT)'; \
-	b='test-u8-mblen'; \
-	$(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-u8-mbtoucr.log: test-u8-mbtoucr$(EXEEXT)
-	@p='test-u8-mbtoucr$(EXEEXT)'; \
-	b='test-u8-mbtoucr'; \
-	$(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-u8-prev.log: test-u8-prev$(EXEEXT)
-	@p='test-u8-prev$(EXEEXT)'; \
-	b='test-u8-prev'; \
-	$(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-u8-strlen.log: test-u8-strlen$(EXEEXT)
-	@p='test-u8-strlen$(EXEEXT)'; \
-	b='test-u8-strlen'; \
-	$(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-u8-uctomb.log: test-u8-uctomb$(EXEEXT)
-	@p='test-u8-uctomb$(EXEEXT)'; \
-	b='test-u8-uctomb'; \
-	$(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-unsetenv.log: test-unsetenv$(EXEEXT)
-	@p='test-unsetenv$(EXEEXT)'; \
-	b='test-unsetenv'; \
-	$(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-vasnprintf.log: test-vasnprintf$(EXEEXT)
-	@p='test-vasnprintf$(EXEEXT)'; \
-	b='test-vasnprintf'; \
-	$(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-vasprintf.log: test-vasprintf$(EXEEXT)
-	@p='test-vasprintf$(EXEEXT)'; \
-	b='test-vasprintf'; \
-	$(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-verify.log: test-verify$(EXEEXT)
-	@p='test-verify$(EXEEXT)'; \
-	b='test-verify'; \
-	$(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-verify.sh.log: test-verify.sh
-	@p='test-verify.sh'; \
-	b='test-verify.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-vsnprintf.log: test-vsnprintf$(EXEEXT)
-	@p='test-vsnprintf$(EXEEXT)'; \
-	b='test-vsnprintf'; \
-	$(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-wchar.log: test-wchar$(EXEEXT)
-	@p='test-wchar$(EXEEXT)'; \
-	b='test-wchar'; \
-	$(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-wcrtomb.sh.log: test-wcrtomb.sh
-	@p='test-wcrtomb.sh'; \
-	b='test-wcrtomb.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-wcrtomb-w32-1.sh.log: test-wcrtomb-w32-1.sh
-	@p='test-wcrtomb-w32-1.sh'; \
-	b='test-wcrtomb-w32-1.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-wcrtomb-w32-2.sh.log: test-wcrtomb-w32-2.sh
-	@p='test-wcrtomb-w32-2.sh'; \
-	b='test-wcrtomb-w32-2.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-wcrtomb-w32-3.sh.log: test-wcrtomb-w32-3.sh
-	@p='test-wcrtomb-w32-3.sh'; \
-	b='test-wcrtomb-w32-3.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-wcrtomb-w32-4.sh.log: test-wcrtomb-w32-4.sh
-	@p='test-wcrtomb-w32-4.sh'; \
-	b='test-wcrtomb-w32-4.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-wcrtomb-w32-5.sh.log: test-wcrtomb-w32-5.sh
-	@p='test-wcrtomb-w32-5.sh'; \
-	b='test-wcrtomb-w32-5.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-wctype-h.log: test-wctype-h$(EXEEXT)
-	@p='test-wctype-h$(EXEEXT)'; \
-	b='test-wctype-h'; \
-	$(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-wcwidth.log: test-wcwidth$(EXEEXT)
-	@p='test-wcwidth$(EXEEXT)'; \
-	b='test-wcwidth'; \
-	$(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-write.log: test-write$(EXEEXT)
-	@p='test-write$(EXEEXT)'; \
-	b='test-write'; \
-	$(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-xalloc-die.sh.log: test-xalloc-die.sh
-	@p='test-xalloc-die.sh'; \
-	b='test-xalloc-die.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-xvasprintf.log: test-xvasprintf$(EXEEXT)
-	@p='test-xvasprintf$(EXEEXT)'; \
-	b='test-xvasprintf'; \
-	$(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.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -5533,10 +3194,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -5575,20 +3239,12 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -5606,6 +3262,8 @@
 	-rm -f uniname/$(am__dirstamp)
 	-rm -f unistr/$(DEPDIR)/$(am__dirstamp)
 	-rm -f unistr/$(am__dirstamp)
+	-rm -f uniwidth/$(DEPDIR)/$(am__dirstamp)
+	-rm -f uniwidth/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -5620,7 +3278,7 @@
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) uniconv/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) unistr/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) uniconv/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) unistr/$(DEPDIR) uniwidth/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -5666,7 +3324,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) uniconv/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) unistr/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) uniconv/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) unistr/$(DEPDIR) uniwidth/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -5685,60 +3343,42 @@
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) all check check-am install install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	check-am ctags-recursive install install-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-TESTS check-am clean \
+	clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
+	clean-libtool clean-local clean-noinstLIBRARIES \
+	clean-noinstPROGRAMS ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-TESTS check-am clean clean-checkLIBRARIES \
-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
-	clean-noinstLIBRARIES clean-noinstPROGRAMS cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# We need the following in order to create <inttypes.h> when the system
-# doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
-	      -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
-	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-	      -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
-	      -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
-	      -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
-	      -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
-	      -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
-	      -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
-	      -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
-	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
-	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
-	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
-	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
-	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
-	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
-	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
-	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/inttypes.in.h; \
-	} > $@-t && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
 	mv $@-t $@
 
 test-moo-root.h test-moo-root.c root.priv.h root.vt.h : $(top_srcdir)/../build-aux/moopp test-moo-root.oo.h test-moo-root.oo.c
@@ -5763,39 +3403,21 @@
 @POSIX_SPAWN_PORTED_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
 @POSIX_SPAWN_PORTED_TRUE@	cp $(srcdir)/test-posix_spawn2.in.sh $@-t && \
 @POSIX_SPAWN_PORTED_TRUE@	mv $@-t $@
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
 # The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/../build-aux/unused-parameter.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
+	  < $(top_srcdir)/../build-aux/unused-parameter.h \
 	  > $@-t && \
 	mv $@-t $@
 # The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/mbtowc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/mbtowc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/mbtowc.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/mbtowc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* Convert multibyte character to wide character.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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 <stdlib.h>
-
-#include <errno.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "mbtowc-impl.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/mbtowc-impl.h gettext-0.18.1.1/gettext-tools/gnulib-tests/mbtowc-impl.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/mbtowc-impl.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/mbtowc-impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* Convert multibyte character to wide character.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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/>.  */
-
-/* We don't need a static internal state, because the encoding is not state
-   dependent, and when mbrtowc returns (size_t)(-2). we throw the result
-   away. */
-
-int
-mbtowc (wchar_t *pwc, const char *s, size_t n)
-{
-  if (s == NULL)
-    return 0;
-  else
-    {
-      mbstate_t state;
-      wchar_t wc;
-      size_t result;
-
-      memset (&state, 0, sizeof (mbstate_t));
-      result = mbrtowc (&wc, s, n, &state);
-      if (result == (size_t)-1 || result == (size_t)-2)
-        {
-          errno = EILSEQ;
-          return -1;
-        }
-      if (pwc != NULL)
-        *pwc = wc;
-      return (wc == 0 ? 0 : result);
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/putenv.c gettext-0.18.1.1/gettext-tools/gnulib-tests/putenv.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/putenv.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/putenv.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2014 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2010 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
@@ -34,21 +34,14 @@
 #include <string.h>
 #include <unistd.h>
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-#if _LIBC
-# if HAVE_GNU_LD
-#  define environ __environ
-# else
+#if HAVE_GNU_LD
+# define environ __environ
+#else
 extern char **environ;
-# endif
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of 'environ'.  */
+/* This lock protects against simultaneous modifications of `environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -62,9 +55,7 @@
 _unsetenv (const char *name)
 {
   size_t len;
-#if !HAVE_DECL__PUTENV
   char **ep;
-#endif
 
   if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
     {
@@ -74,21 +65,6 @@
 
   len = strlen (name);
 
-#if HAVE_DECL__PUTENV
-  {
-    int putenv_result, putenv_errno;
-    char *name_ = malloc (len + 2);
-    memcpy (name_, name, len);
-    name_[len] = '=';
-    name_[len + 1] = 0;
-    putenv_result = _putenv (name_);
-    putenv_errno = errno;
-    free (name_);
-    __set_errno (putenv_errno);
-    return putenv_result;
-  }
-#else
-
   LOCK;
 
   ep = environ;
@@ -109,17 +85,17 @@
   UNLOCK;
 
   return 0;
-#endif
 }
 
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.
-   If STRING contains no '=', then remove STRING from the environment.  */
+   If STRING contains no `=', then remove STRING from the environment.  */
 int
 putenv (char *string)
 {
-  const char *name_end = strchr (string, '=');
-  char **ep;
+  const char *const name_end = strchr (string, '=');
+  register size_t size;
+  register char **ep;
 
   if (name_end == NULL)
     {
@@ -127,68 +103,30 @@
       return _unsetenv (string);
     }
 
-#if HAVE_DECL__PUTENV
-  /* Rely on _putenv to allocate the new environment.  If other
-     parts of the application use _putenv, the !HAVE_DECL__PUTENV code
-     would fight over who owns the environ vector, causing a crash.  */
-  if (name_end[1])
-    return _putenv (string);
-  else
-    {
-      /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ")
-         to allocate the environ vector and then replace the new
-         entry with "NAME=".  */
-      int putenv_result, putenv_errno;
-      char *name_x = malloc (name_end - string + sizeof "= ");
-      if (!name_x)
-        return -1;
-      memcpy (name_x, string, name_end - string + 1);
-      name_x[name_end - string + 1] = ' ';
-      name_x[name_end - string + 2] = 0;
-      putenv_result = _putenv (name_x);
-      putenv_errno = errno;
-      for (ep = environ; *ep; ep++)
-        if (strcmp (*ep, name_x) == 0)
-          {
-            *ep = string;
-            break;
-          }
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-      if (putenv_result == 0)
-        {
-          /* _putenv propagated "NAME= " into the subprocess environment;
-             fix that by calling SetEnvironmentVariable directly.  */
-          name_x[name_end - string] = 0;
-          putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1;
-          putenv_errno = ENOMEM; /* ENOMEM is the only way to fail.  */
-        }
-# endif
-      free (name_x);
-      __set_errno (putenv_errno);
-      return putenv_result;
-    }
-#else
-  for (ep = environ; *ep; ep++)
-    if (strncmp (*ep, string, name_end - string) == 0
-        && (*ep)[name_end - string] == '=')
+  size = 0;
+  for (ep = environ; *ep != NULL; ++ep)
+    if (!strncmp (*ep, string, name_end - string) &&
+        (*ep)[name_end - string] == '=')
       break;
+    else
+      ++size;
 
-  if (*ep)
-    *ep = string;
-  else
+  if (*ep == NULL)
     {
       static char **last_environ = NULL;
-      size_t size = ep - environ;
-      char **new_environ = malloc ((size + 2) * sizeof *new_environ);
-      if (! new_environ)
+      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
+      if (new_environ == NULL)
         return -1;
-      new_environ[0] = string;
-      memcpy (new_environ + 1, environ, (size + 1) * sizeof *new_environ);
+      (void) memcpy ((void *) new_environ, (void *) environ,
+                     size * sizeof (char *));
+      new_environ[size] = (char *) string;
+      new_environ[size + 1] = NULL;
       free (last_environ);
       last_environ = new_environ;
       environ = new_environ;
     }
+  else
+    *ep = string;
 
   return 0;
-#endif
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/read-file.c gettext-0.18.1.1/gettext-tools/gnulib-tests/read-file.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/read-file.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/read-file.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* read-file.c -- read file contents into a string
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
    Written by Simon Josefsson and Bruno Haible.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,22 +13,14 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
 #include "read-file.h"
 
-/* Get fstat.  */
-#include <sys/stat.h>
-
-/* Get ftello.  */
-#include <stdio.h>
-
-/* Get SIZE_MAX.  */
-#include <stdint.h>
-
-/* Get malloc, realloc, free. */
+/* Get realloc, free. */
 #include <stdlib.h>
 
 /* Get errno. */
@@ -38,87 +30,30 @@
    and set *LENGTH to the length of the string.  The string is
    zero-terminated, but the terminating zero byte is not counted in
    *LENGTH.  On errors, *LENGTH is undefined, errno preserves the
-   values set by system functions (if any), and NULL is returned.  */
+   values set by system functions (if any), and NULL is returned. */
 char *
-fread_file (FILE *stream, size_t *length)
+fread_file (FILE * stream, size_t * length)
 {
   char *buf = NULL;
-  size_t alloc = BUFSIZ;
-
-  /* For a regular file, allocate a buffer that has exactly the right
-     size.  This avoids the need to do dynamic reallocations later.  */
-  {
-    struct stat st;
-
-    if (fstat (fileno (stream), &st) >= 0 && S_ISREG (st.st_mode))
-      {
-        off_t pos = ftello (stream);
-
-        if (pos >= 0 && pos < st.st_size)
-          {
-            off_t alloc_off = st.st_size - pos;
-
-            /* '1' below, accounts for the trailing NUL.  */
-            if (SIZE_MAX - 1 < alloc_off)
-              {
-                errno = ENOMEM;
-                return NULL;
-              }
-
-            alloc = alloc_off + 1;
-          }
-      }
-  }
-
-  if (!(buf = malloc (alloc)))
-    return NULL; /* errno is ENOMEM.  */
-
-  {
-    size_t size = 0; /* number of bytes read so far */
-    int save_errno;
-
-    for (;;)
-      {
-        /* This reads 1 more than the size of a regular file
-           so that we get eof immediately.  */
-        size_t requested = alloc - size;
-        size_t count = fread (buf + size, 1, requested, stream);
-        size += count;
-
-        if (count != requested)
-          {
-            save_errno = errno;
-            if (ferror (stream))
-              break;
+  size_t alloc = 0;
+  size_t size = 0;
+  int save_errno;
 
-            /* Shrink the allocated memory if possible.  */
-            if (size < alloc - 1)
-              {
-                char *smaller_buf = realloc (buf, size + 1);
-                if (smaller_buf != NULL)
-                  buf = smaller_buf;
-              }
-
-            buf[size] = '\0';
-            *length = size;
-            return buf;
-          }
+  for (;;)
+    {
+      size_t count;
+      size_t requested;
 
+      if (size + BUFSIZ + 1 > alloc)
         {
           char *new_buf;
 
-          if (alloc == SIZE_MAX)
-            {
-              save_errno = ENOMEM;
-              break;
-            }
-
-          if (alloc < SIZE_MAX - alloc / 2)
-            alloc = alloc + alloc / 2;
-          else
-            alloc = SIZE_MAX;
+          alloc += alloc / 2;
+          if (alloc < size + BUFSIZ + 1)
+            alloc = size + BUFSIZ + 1;
 
-          if (!(new_buf = realloc (buf, alloc)))
+          new_buf = realloc (buf, alloc);
+          if (!new_buf)
             {
               save_errno = errno;
               break;
@@ -126,16 +61,29 @@
 
           buf = new_buf;
         }
-      }
 
-    free (buf);
-    errno = save_errno;
-    return NULL;
-  }
+      requested = alloc - size - 1;
+      count = fread (buf + size, 1, requested, stream);
+      size += count;
+
+      if (count != requested)
+        {
+          save_errno = errno;
+          if (ferror (stream))
+            break;
+          buf[size] = '\0';
+          *length = size;
+          return buf;
+        }
+    }
+
+  free (buf);
+  errno = save_errno;
+  return NULL;
 }
 
 static char *
-internal_read_file (const char *filename, size_t *length, const char *mode)
+internal_read_file (const char *filename, size_t * length, const char *mode)
 {
   FILE *stream = fopen (filename, mode);
   char *out;
@@ -169,7 +117,7 @@
    undefined, errno preserves the values set by system functions (if
    any), and NULL is returned.  */
 char *
-read_file (const char *filename, size_t *length)
+read_file (const char *filename, size_t * length)
 {
   return internal_read_file (filename, length, "r");
 }
@@ -182,7 +130,7 @@
    preserves the values set by system functions (if any), and NULL is
    returned.  */
 char *
-read_binary_file (const char *filename, size_t *length)
+read_binary_file (const char *filename, size_t * length)
 {
   return internal_read_file (filename, length, "rb");
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/read-file.h gettext-0.18.1.1/gettext-tools/gnulib-tests/read-file.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/read-file.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/read-file.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* read-file.h -- read file contents into a string
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef READ_FILE_H
 #define READ_FILE_H
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/same-inode.h gettext-0.18.1.1/gettext-tools/gnulib-tests/same-inode.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/same-inode.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/same-inode.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,6 +1,6 @@
 /* Determine whether two stat buffers refer to the same file.
 
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,16 +18,8 @@
 #ifndef SAME_INODE_H
 # define SAME_INODE_H 1
 
-# ifdef __VMS
-#  define SAME_INODE(a, b)             \
-    ((a).st_ino[0] == (b).st_ino[0]    \
-     && (a).st_ino[1] == (b).st_ino[1] \
-     && (a).st_ino[2] == (b).st_ino[2] \
-     && (a).st_dev == (b).st_dev)
-# else
-#  define SAME_INODE(a, b)    \
-    ((a).st_ino == (b).st_ino \
-     && (a).st_dev == (b).st_dev)
-# endif
+# define SAME_INODE(Stat_buf_1, Stat_buf_2) \
+   ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
+    && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
 
 #endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/signature.h gettext-0.18.1.1/gettext-tools/gnulib-tests/signature.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/signature.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/signature.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/sleep.c gettext-0.18.1.1/gettext-tools/gnulib-tests/sleep.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/sleep.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/sleep.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/* Pausing execution of the current thread.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2007.
-
-   This 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>
-
-/* Specification.  */
-#include <unistd.h>
-
-#include <limits.h>
-
-#include "verify.h"
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-
-unsigned int
-sleep (unsigned int seconds)
-{
-  unsigned int remaining;
-
-  /* Sleep for 1 second many times, because
-       1. Sleep is not interruptible by Ctrl-C,
-       2. we want to avoid arithmetic overflow while multiplying with 1000.  */
-  for (remaining = seconds; remaining > 0; remaining--)
-    Sleep (1000);
-
-  return remaining;
-}
-
-#elif HAVE_SLEEP
-
-# undef sleep
-
-/* Guarantee unlimited sleep and a reasonable return value.  Cygwin
-   1.5.x rejects attempts to sleep more than 49.7 days (2**32
-   milliseconds), but uses uninitialized memory which results in a
-   garbage answer.  Similarly, Linux 2.6.9 with glibc 2.3.4 has a too
-   small return value when asked to sleep more than 24.85 days.  */
-unsigned int
-rpl_sleep (unsigned int seconds)
-{
-  /* This requires int larger than 16 bits.  */
-  verify (UINT_MAX / 24 / 24 / 60 / 60);
-  const unsigned int limit = 24 * 24 * 60 * 60;
-  while (limit < seconds)
-    {
-      unsigned int result;
-      seconds -= limit;
-      result = sleep (limit);
-      if (result)
-        return seconds + result;
-    }
-  return sleep (seconds);
-}
-
-#else /* !HAVE_SLEEP */
-
- #error "Please port gnulib sleep.c to your platform, possibly using usleep() or select(), then report this to bug-gnulib."
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/stdio-impl.h gettext-0.18.1.1/gettext-tools/gnulib-tests/stdio-impl.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/stdio-impl.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/stdio-impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/* Implementation details of FILE streams.
-   Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-/* Many stdio implementations have the same logic and therefore can share
-   the same implementation of stdio extension API, except that some fields
-   have different naming conventions, or their access requires some casts.  */
-
-
-/* BSD stdio derived implementations.  */
-
-#if defined __NetBSD__                         /* NetBSD */
-/* Get __NetBSD_Version__.  */
-# include <sys/param.h>
-#endif
-
-#include <errno.h>                             /* For detecting Plan9.  */
-
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
-
-# if defined __DragonFly__          /* DragonFly */
-  /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
-#  define fp_ ((struct { struct __FILE_public pub; \
-                         struct { unsigned char *_base; int _size; } _bf; \
-                         void *cookie; \
-                         void *_close; \
-                         void *_read; \
-                         void *_seek; \
-                         void *_write; \
-                         struct { unsigned char *_base; int _size; } _ub; \
-                         int _ur; \
-                         unsigned char _ubuf[3]; \
-                         unsigned char _nbuf[1]; \
-                         struct { unsigned char *_base; int _size; } _lb; \
-                         int _blksize; \
-                         fpos_t _offset; \
-                         /* More fields, not relevant here.  */ \
-                       } *) fp)
-  /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
-#  define _p pub._p
-#  define _flags pub._flags
-#  define _r pub._r
-#  define _w pub._w
-# else
-#  define fp_ fp
-# endif
-
-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
-  /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
-     and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
-  struct __sfileext
-    {
-      struct  __sbuf _ub; /* ungetc buffer */
-      /* More fields, not relevant here.  */
-    };
-#  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
-# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
-#  define fp_ub fp_->_ub
-# endif
-
-# define HASUB(fp) (fp_ub._base != NULL)
-
-#endif
-
-
-/* SystemV derived implementations.  */
-
-#ifdef __TANDEM                     /* NonStop Kernel */
-# ifndef _IOERR
-/* These values were determined by the program 'stdioext-flags' at
-   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
-#  define _IOERR   0x40
-#  define _IOREAD  0x80
-#  define _IOWRT    0x4
-#  define _IORW   0x100
-# endif
-#endif
-
-#if defined _IOERR
-
-# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
-#  define fp_ ((struct { unsigned char *_ptr; \
-                         unsigned char *_base; \
-                         unsigned char *_end; \
-                         long _cnt; \
-                         int _file; \
-                         unsigned int _flag; \
-                       } *) fp)
-# else
-#  define fp_ fp
-# endif
-
-# if defined _SCO_DS                /* OpenServer */
-#  define _cnt __cnt
-#  define _ptr __ptr
-#  define _base __base
-#  define _flag __flag
-# endif
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/symlink.c gettext-0.18.1.1/gettext-tools/gnulib-tests/symlink.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/symlink.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/symlink.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Stub for symlink().
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-alignof.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-alignof.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-alignof.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-alignof.c	2010-02-16 21:32:26.000000000 +0000
@@ -0,0 +1,59 @@
+/* Test of <alignof.h>.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2009.  */
+
+#include <config.h>
+
+#include <alignof.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "verify.h"
+
+typedef long double longdouble;
+typedef struct { char a[1]; } struct1;
+typedef struct { char a[2]; } struct2;
+typedef struct { char a[3]; } struct3;
+typedef struct { char a[4]; } struct4;
+
+#define CHECK(type) \
+  typedef struct { char slot1; type slot2; } type##_helper; \
+  verify (alignof_slot (type) == offsetof (type##_helper, slot2)); \
+  const int type##_slot_alignment = alignof_slot (type); \
+  const int type##_type_alignment = alignof_type (type);
+
+CHECK (char)
+CHECK (short)
+CHECK (int)
+CHECK (long)
+CHECK (float)
+CHECK (double)
+CHECK (longdouble)
+#ifdef INT64_MAX
+CHECK (int64_t)
+#endif
+CHECK (struct1)
+CHECK (struct2)
+CHECK (struct3)
+CHECK (struct4)
+
+int
+main ()
+{
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-alloca-opt.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-alloca-opt.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-alloca-opt.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-alloca-opt.c	2010-05-24 09:42:50.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
     {
       /* Try various values.
          n = 0 gave a crash on Alpha with gcc-2.5.8.
-         Some versions of Mac OS X have a stack size limit of 512 KB.  */
+         Some versions of MacOS X have a stack size limit of 512 KB.  */
       func (34);
       func (134);
       func (399);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-areadlink.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-areadlink.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of areadlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-areadlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-areadlink.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of areadlink and friends.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
   ASSERT (errno == ENOENT);
   errno = 0;
   ASSERT (func ("", 1) == NULL);
-  ASSERT (errno == ENOENT || errno == EINVAL);
+  ASSERT (errno == ENOENT);
   errno = 0;
   ASSERT (func (".", 1) == NULL);
   ASSERT (errno == EINVAL);
@@ -49,7 +49,7 @@
   ASSERT (errno == EINVAL);
   errno = 0;
   ASSERT (func (BASE "file/", 1) == NULL);
-  ASSERT (errno == ENOTDIR || errno == EINVAL); /* AIX yields EINVAL */
+  ASSERT (errno == ENOTDIR);
   ASSERT (unlink (BASE "file") == 0);
 
   /* Now test actual symlinks.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-argmatch.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-argmatch.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-argmatch.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-argmatch.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of exact or abbreviated match search.
-   Copyright (C) 1990, 1998-1999, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,10 +29,7 @@
 /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
    thus must link with a definition of that function.  Provide it here.  */
 #ifdef ARGMATCH_DIE_DECL
-
-_Noreturn ARGMATCH_DIE_DECL;
 ARGMATCH_DIE_DECL { exit (1); }
-
 #endif
 
 enum backup_type
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-array_list.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-array_list.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-array_list.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-array_list.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-atexit.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-atexit.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-atexit.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-atexit.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of execution of program termination handlers.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-atexit.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-atexit.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-atexit.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-atexit.sh	2010-04-25 09:21:49.000000000 +0000
@@ -25,4 +25,4 @@
   Exit 1
 fi
 
-Exit 0
+exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-binary-io.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-binary-io.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-binary-io.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-binary-io.c	2010-02-16 21:32:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2010 Free Software Foundation, Inc.
 
    This 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,40 +30,35 @@
 #include "macros.h"
 
 int
-main (int argc, char *argv[])
+main ()
 {
   /* Test the O_BINARY macro.  */
   {
     int fd =
-      open ("t-bin-out0.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600);
+      open ("t-bin-out2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600);
     if (write (fd, "Hello\n", 6) < 0)
       exit (1);
     close (fd);
   }
   {
     struct stat statbuf;
-    if (stat ("t-bin-out0.tmp", &statbuf) < 0)
+    if (stat ("t-bin-out2.tmp", &statbuf) < 0)
       exit (1);
     ASSERT (statbuf.st_size == 6);
   }
+  unlink ("t-bin-out2.tmp");
 
-  switch (argv[1][0])
-    {
-    case '1':
-      /* Test the set_binary_mode() function.  */
-      set_binary_mode (1, O_BINARY);
-      fputs ("Hello\n", stdout);
-      break;
-
-    case '2':
-      /* Test the SET_BINARY macro.  */
-      SET_BINARY (1);
-      fputs ("Hello\n", stdout);
-      break;
-
-    default:
-      break;
-    }
+  /* Test the SET_BINARY macro.  */
+  SET_BINARY (1);
+  fputs ("Hello\n", stdout);
+  fclose (stdout);
+  fclose (stderr);
+  {
+    struct stat statbuf;
+    if (stat ("t-bin-out1.tmp", &statbuf) < 0)
+      exit (1);
+    ASSERT (statbuf.st_size == 6);
+  }
 
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-binary-io.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-binary-io.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-binary-io.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-binary-io.sh	2009-07-19 20:29:11.000000000 +0000
@@ -3,11 +3,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles t-bin-out0.tmp t-bin-out1.tmp t-bin-out2.tmp"
-./test-binary-io${EXEEXT} 1 > t-bin-out1.tmp || exit 1
-cmp t-bin-out0.tmp t-bin-out1.tmp > /dev/null || exit 1
-./test-binary-io${EXEEXT} 2 > t-bin-out2.tmp || exit 1
-cmp t-bin-out0.tmp t-bin-out2.tmp > /dev/null || exit 1
+tmpfiles="$tmpfiles t-bin-out1.tmp t-bin-out2.tmp"
+./test-binary-io${EXEEXT} > t-bin-out1.tmp || exit 1
 
 rm -fr $tmpfiles
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-btowc1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-btowc1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-btowc1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-btowc1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Test in an ISO-8859-1 or ISO-8859-15 locale.
-: ${LOCALE_FR=fr_FR}
-if test $LOCALE_FR = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no traditional french locale is installed"
-  else
-    echo "Skipping test: no traditional french locale is supported"
-  fi
-  exit 77
-fi
-
-LC_ALL=$LOCALE_FR \
-./test-btowc${EXEEXT} 1
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-btowc2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-btowc2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-btowc2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-btowc2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Test whether a specific UTF-8 locale is installed.
-: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-if test $LOCALE_FR_UTF8 = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no french Unicode locale is installed"
-  else
-    echo "Skipping test: no french Unicode locale is supported"
-  fi
-  exit 77
-fi
-
-LC_ALL=$LOCALE_FR_UTF8 \
-./test-btowc${EXEEXT} 2
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-btowc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-btowc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-btowc.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-btowc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/* Test of conversion of unibyte character to wide character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2008.  */
-
-#include <config.h>
-
-#include <wchar.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (btowc, wint_t, (int));
-
-#include <locale.h>
-#include <stdio.h>
-
-#include "macros.h"
-
-int
-main (int argc, char *argv[])
-{
-  int c;
-
-  /* configure should already have checked that the locale is supported.  */
-  if (setlocale (LC_ALL, "") == NULL)
-    return 1;
-
-  ASSERT (btowc (EOF) == WEOF);
-
-  if (argc > 1)
-    switch (argv[1][0])
-      {
-      case '1':
-        /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
-        for (c = 0; c < 0x80; c++)
-          ASSERT (btowc (c) == c);
-        for (c = 0xA0; c < 0x100; c++)
-          ASSERT (btowc (c) != WEOF);
-        return 0;
-
-      case '2':
-        /* Locale encoding is UTF-8.  */
-        for (c = 0; c < 0x80; c++)
-          ASSERT (btowc (c) == c);
-        for (c = 0x80; c < 0x100; c++)
-          ASSERT (btowc (c) == WEOF);
-        return 0;
-      }
-
-  return 1;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-byteswap.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-byteswap.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-byteswap.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-byteswap.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <byteswap.h> substitute.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c	2010-03-28 18:32:30.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of execution of program termination handlers.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-c-ctype.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-ctype.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-c-ctype.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-ctype.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of character handling in C locale.
-   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-cloexec.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-cloexec.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-cloexec.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-cloexec.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test duplicating non-inheritable file descriptors.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,11 +25,9 @@
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
 #endif
 
 #include "binary-io.h"
@@ -40,7 +38,7 @@
 is_inheritable (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   HANDLE h = (HANDLE) _get_osfhandle (fd);
@@ -78,7 +76,6 @@
   const char *file = "test-cloexec.tmp";
   int fd = creat (file, 0600);
   int fd2;
-  int bad_fd = getdtablesize ();
 
   /* Assume std descriptors were provided by invoker.  */
   ASSERT (STDERR_FILENO < fd);
@@ -121,7 +118,7 @@
   ASSERT (set_cloexec_flag (-1, false) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (set_cloexec_flag (bad_fd, false) == -1);
+  ASSERT (set_cloexec_flag (10000000, false) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (set_cloexec_flag (fd2, false) == -1);
@@ -130,7 +127,7 @@
   ASSERT (dup_cloexec (-1) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (dup_cloexec (bad_fd) == -1);
+  ASSERT (dup_cloexec (10000000) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (dup_cloexec (fd2) == -1);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-close.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-close.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-close.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-close.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* Test closing a file or socket.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (close, int, (int));
-
-#include <errno.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (close (-1) == -1);
-    ASSERT (errno == EBADF);
-  }
-  {
-    close (99);
-    errno = 0;
-    ASSERT (close (99) == -1);
-    ASSERT (errno == EBADF);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl-1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl-1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl-1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl-1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Test copy-acl on the file system of /var/tmp, which usually is a local
-# file system.
-
-if test -d /var/tmp; then
-  TMPDIR=/var/tmp
-else
-  TMPDIR=/tmp
-fi
-export TMPDIR
-
-exec "${srcdir}/test-copy-acl.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl-2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl-2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl-2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl-2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Test copy-acl on the file system of the build directory, which may be
-# a local file system or NFS mounted.
-
-TMPDIR=`pwd`
-export TMPDIR
-
-exec "${srcdir}/test-copy-acl.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-acl.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl.sh	2009-08-30 15:49:52.000000000 +0000
@@ -60,8 +60,8 @@
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none.
-  # TODO: Support also native Windows platforms (mingw).
+  #   linux, cygwin, freebsd, solaris, hpux, osf1, aix, macosx, irix, none.
+  # TODO: Support also native Win32 platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
     # Platforms with the getfacl and setfacl programs.
@@ -88,30 +88,18 @@
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
       # HP-UX, sometimes also IRIX.
-      if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # HP-UX 11.11 or newer.
-        acl_flavor=hpuxjfs
-      else
-        # HP-UX 11.00.
-        acl_flavor=hpux
-      fi
+      acl_flavor=hpux
     else
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # Tru64, NonStop Kernel.
-        if (getacl -m tmpfile0 >/dev/null) 2>/dev/null; then
-          # Tru64.
-          acl_flavor=osf1
-        else
-          # NonStop Kernel.
-          acl_flavor=nsk
-        fi
+        # Tru64.
+        acl_flavor=osf1
       else
         if (aclget tmpfile0 >/dev/null) 2>/dev/null; then
           # AIX.
           acl_flavor=aix
         else
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
-            # Mac OS X.
+            # MacOS X.
             acl_flavor=macosx
           else
             if test -f /sbin/chacl; then
@@ -144,20 +132,7 @@
         cmp tmpaclout1 tmpaclout2 > /dev/null
       }
       ;;
-    hpuxjfs)
-      func_test_same_acls ()
-      {
-        { lsacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
-          lsacl "$2" | sed -e "s/$2/FILENAME/g" > tmpaclout2
-          cmp tmpaclout1 tmpaclout2 > /dev/null
-        } &&
-        { getacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
-          getacl "$2" | sed -e "s/$2/FILENAME/g" > tmpaclout2
-          cmp tmpaclout1 tmpaclout2 > /dev/null
-        }
-      }
-      ;;
-    osf1 | nsk)
+    osf1)
       func_test_same_acls ()
       {
         getacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
@@ -385,62 +360,6 @@
 
         ;;
 
-      hpuxjfs)
-
-        # Set an ACL for a user.
-        orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-        chacl -r "${orig}($auid.%,--x)" tmpfile0 \
-          || setacl -m user:$auid:1 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile2
-
-        # Set an ACL for a group.
-        orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-        chacl -r "${orig}(%.$agid,r--)" tmpfile0 \
-          || setacl -m group:$agid:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile3
-
-        # Set an ACL for other.
-        orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-        chacl -r "${orig}(%.%,r--)" tmpfile0 \
-          || setacl -m other:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile4
-
-        # Remove the ACL for the user.
-        chacl -d "($auid.%,--x)" tmpfile0 \
-          || setacl -d user:$auid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile5
-
-        # Remove the ACL for the group.
-        chacl -d "(%.$agid,r--)" tmpfile0 \
-          || setacl -d group:$agid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile6
-
-        # Delete all optional ACLs.
-        chacl -z tmpfile0 \
-          || { setacl -m user:$auid:1 tmpfile0
-               setacl -s user::6,group::0,class:7,other:0 tmpfile0
-             }
-
-        func_test_copy tmpfile0 tmpfile8
-
-        # Copy ACLs from a file that has no ACLs.
-        echo > tmpfile9
-        chmod a+x tmpfile9
-        orig=`lsacl tmpfile9 | sed -e 's/ tmpfile9$//'`
-        getacl tmpfile9 > tmpaclout0
-        rm -f tmpfile9
-        chacl -r "${orig}" tmpfile0 \
-          || setacl -f tmpaclout0 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile9
-
-        ;;
-
       osf1)
 
         # Set an ACL for a user.
@@ -489,50 +408,6 @@
         rm -f tmpfile9
 
         func_test_copy tmpfile0 tmpfile9
-
-        ;;
-
-      nsk)
-
-        # Set an ACL for a user.
-        setacl -m user:$auid:1 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile2
-
-        # Set an ACL for a group.
-        setacl -m group:$agid:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile3
-
-        # Set an ACL for other.
-        setacl -m other:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile4
-
-        # Remove the ACL for the user.
-        setacl -d user:$auid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile5
-
-        # Remove the ACL for the group.
-        setacl -d group:$agid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile6
-
-        # Delete all optional ACLs.
-        setacl -m user:$auid:1 tmpfile0
-        setacl -s user::6,group::0,class:7,other:0 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile8
-
-        # Copy ACLs from a file that has no ACLs.
-        echo > tmpfile9
-        chmod a+x tmpfile9
-        getacl tmpfile9 > tmpaclout0
-        setacl -f tmpaclout0 tmpfile0
-        rm -f tmpfile9
-
-        func_test_copy tmpfile0 tmpfile9
 
         ;;
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file-1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file-1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file-1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file-1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Test copy-file on the file system of /var/tmp, which usually is a local
-# file system.
-
-if test -d /var/tmp; then
-  TMPDIR=/var/tmp
-else
-  TMPDIR=/tmp
-fi
-export TMPDIR
-
-"${srcdir}/test-copy-file.sh"
-ret1=$?
-NO_STDERR_OUTPUT=1 "${srcdir}/test-copy-file.sh"
-ret2=$?
-case $ret1 in
-  77 ) exit $ret2 ;;
-  * ) exit $ret1 ;;
-esac
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file-2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file-2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file-2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file-2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Test copy-file on the file system of the build directory, which may be
-# a local file system or NFS mounted.
-
-TMPDIR=`pwd`
-export TMPDIR
-
-"${srcdir}/test-copy-file.sh"
-ret1=$?
-NO_STDERR_OUTPUT=1 "${srcdir}/test-copy-file.sh"
-ret2=$?
-case $ret1 in
-  77 ) exit $ret2 ;;
-  * ) exit $ret1 ;;
-esac
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,8 +20,6 @@
 
 #include "copy-file.h"
 
-#include <stdlib.h>
-
 #include "progname.h"
 #include "macros.h"
 
@@ -30,7 +28,6 @@
 {
   const char *file1;
   const char *file2;
-  int null_stderr;
 
   set_program_name (argv[0]);
 
@@ -38,12 +35,8 @@
 
   file1 = argv[1];
   file2 = argv[2];
-  null_stderr = (getenv ("NO_STDERR_OUTPUT") != NULL);
 
-  if (null_stderr)
-    ASSERT (qcopy_file_preserving (file1, file2) == 0);
-  else
-    copy_file_preserving (file1, file2);
+  copy_file_preserving (file1, file2);
 
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-copy-file.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file.sh	2009-08-30 15:49:52.000000000 +0000
@@ -54,8 +54,8 @@
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none.
-  # TODO: Support also native Windows platforms (mingw).
+  #   linux, cygwin, freebsd, solaris, hpux, osf1, aix, macosx, irix, none.
+  # TODO: Support also native Win32 platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
     # Platforms with the getfacl and setfacl programs.
@@ -82,30 +82,18 @@
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
       # HP-UX, sometimes also IRIX.
-      if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # HP-UX 11.11 or newer.
-        acl_flavor=hpuxjfs
-      else
-        # HP-UX 11.00.
-        acl_flavor=hpux
-      fi
+      acl_flavor=hpux
     else
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # Tru64, NonStop Kernel.
-        if (getacl -m tmpfile0 >/dev/null) 2>/dev/null; then
-          # Tru64.
-          acl_flavor=osf1
-        else
-          # NonStop Kernel.
-          acl_flavor=nsk
-        fi
+        # Tru64.
+        acl_flavor=osf1
       else
         if (aclget tmpfile0 >/dev/null) 2>/dev/null; then
           # AIX.
           acl_flavor=aix
         else
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
-            # Mac OS X.
+            # MacOS X.
             acl_flavor=macosx
           else
             if test -f /sbin/chacl; then
@@ -138,20 +126,7 @@
         cmp tmpaclout1 tmpaclout2 > /dev/null
       }
       ;;
-    hpuxjfs)
-      func_test_same_acls ()
-      {
-        { lsacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
-          lsacl "$2" | sed -e "s/$2/FILENAME/g" > tmpaclout2
-          cmp tmpaclout1 tmpaclout2 > /dev/null
-        } &&
-        { getacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
-          getacl "$2" | sed -e "s/$2/FILENAME/g" > tmpaclout2
-          cmp tmpaclout1 tmpaclout2 > /dev/null
-        }
-      }
-      ;;
-    osf1 | nsk)
+    osf1)
       func_test_same_acls ()
       {
         getacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
@@ -379,62 +354,6 @@
 
         ;;
 
-      hpuxjfs)
-
-        # Set an ACL for a user.
-        orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-        chacl -r "${orig}($auid.%,--x)" tmpfile0 \
-          || setacl -m user:$auid:1 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile2
-
-        # Set an ACL for a group.
-        orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-        chacl -r "${orig}(%.$agid,r--)" tmpfile0 \
-          || setacl -m group:$agid:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile3
-
-        # Set an ACL for other.
-        orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-        chacl -r "${orig}(%.%,r--)" tmpfile0 \
-          || setacl -m other:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile4
-
-        # Remove the ACL for the user.
-        chacl -d "($auid.%,--x)" tmpfile0 \
-          || setacl -d user:$auid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile5
-
-        # Remove the ACL for the group.
-        chacl -d "(%.$agid,r--)" tmpfile0 \
-          || setacl -d group:$agid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile6
-
-        # Delete all optional ACLs.
-        chacl -z tmpfile0 \
-          || { setacl -m user:$auid:1 tmpfile0
-               setacl -s user::6,group::0,class:7,other:0 tmpfile0
-             }
-
-        func_test_copy tmpfile0 tmpfile8
-
-        # Copy ACLs from a file that has no ACLs.
-        echo > tmpfile9
-        chmod a+x tmpfile9
-        orig=`lsacl tmpfile9 | sed -e 's/ tmpfile9$//'`
-        getacl tmpfile9 > tmpaclout0
-        rm -f tmpfile9
-        chacl -r "${orig}" tmpfile0 \
-          || setacl -f tmpaclout0 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile9
-
-        ;;
-
       osf1)
 
         # Set an ACL for a user.
@@ -483,50 +402,6 @@
         rm -f tmpfile9
 
         func_test_copy tmpfile0 tmpfile9
-
-        ;;
-
-      nsk)
-
-        # Set an ACL for a user.
-        setacl -m user:$auid:1 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile2
-
-        # Set an ACL for a group.
-        setacl -m group:$agid:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile3
-
-        # Set an ACL for other.
-        setacl -m other:4 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile4
-
-        # Remove the ACL for the user.
-        setacl -d user:$auid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile5
-
-        # Remove the ACL for the group.
-        setacl -d group:$agid tmpfile0
-
-        func_test_copy tmpfile0 tmpfile6
-
-        # Delete all optional ACLs.
-        setacl -m user:$auid:1 tmpfile0
-        setacl -s user::6,group::0,class:7,other:0 tmpfile0
-
-        func_test_copy tmpfile0 tmpfile8
-
-        # Copy ACLs from a file that has no ACLs.
-        echo > tmpfile9
-        chmod a+x tmpfile9
-        getacl tmpfile9 > tmpaclout0
-        setacl -f tmpaclout0 tmpfile0
-        rm -f tmpfile9
-
-        func_test_copy tmpfile0 tmpfile9
 
         ;;
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strcasecmp.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strcasecmp.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strcasecmp.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strcasecmp.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strcasestr.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strcasestr.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strcasestr.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strcasestr.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of case-insensitive searching in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,31 +58,12 @@
     ASSERT (result == input + 11);
   }
 
-  /* Check that a long periodic needle does not cause false positives.  */
-  {
-    const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                          "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                          "_C3_A7_20_EF_BF_BD");
-    const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
-    const char *result = c_strcasestr (input, need);
-    ASSERT (result == NULL);
-  }
-  {
-    const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                          "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                          "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20"
-                          "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD");
-    const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
-    const char *result = c_strcasestr (input, need);
-    ASSERT (result == input + 115);
-  }
-
   /* Check that a very long haystack is handled quickly if the needle is
      short and occurs near the beginning.  */
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *needle =
+    char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaaaaAAAAaaaaaaa"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
@@ -107,7 +88,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *haystack =
+    char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB";
     char *needle = (char *) malloc (m + 1);
@@ -149,93 +130,5 @@
     free (haystack);
   }
 
-  {
-    /* Ensure that with a barely periodic "short" needle, c_strcasestr's
-       search does not mistakenly skip just past the match point.
-       This use of c_strcasestr would mistakenly return NULL before
-       gnulib v0.0-4927.  */
-    const char *haystack =
-      "\n"
-      "with_build_libsubdir\n"
-      "with_local_prefix\n"
-      "with_gxx_include_dir\n"
-      "with_cpp_install_dir\n"
-      "enable_generated_files_in_srcdir\n"
-      "with_gnu_ld\n"
-      "with_ld\n"
-      "with_demangler_in_ld\n"
-      "with_gnu_as\n"
-      "with_as\n"
-      "enable_largefile\n"
-      "enable_werror_always\n"
-      "enable_checking\n"
-      "enable_coverage\n"
-      "enable_gather_detailed_mem_stats\n"
-      "enable_build_with_cxx\n"
-      "with_stabs\n"
-      "enable_multilib\n"
-      "enable___cxa_atexit\n"
-      "enable_decimal_float\n"
-      "enable_fixed_point\n"
-      "enable_threads\n"
-      "enable_tls\n"
-      "enable_objc_gc\n"
-      "with_dwarf2\n"
-      "enable_shared\n"
-      "with_build_sysroot\n"
-      "with_sysroot\n"
-      "with_specs\n"
-      "with_pkgversion\n"
-      "with_bugurl\n"
-      "enable_languages\n"
-      "with_multilib_list\n";
-    const char *needle = "\n"
-      "with_GNU_ld\n";
-    const char* p = c_strcasestr (haystack, needle);
-    ASSERT (p - haystack == 114);
-  }
-
-  {
-    /* Same bug, shorter trigger.  */
-    const char *haystack = "..wi.D.";
-    const char *needle = ".d.";
-    const char* p = c_strcasestr (haystack, needle);
-    ASSERT (p - haystack == 4);
-  }
-
-  {
-    /* Like the above, but trigger the flaw in two_way_long_needle
-       by using a needle of length LONG_NEEDLE_THRESHOLD (32) or greater.
-       Rather than trying to find the right alignment manually, I've
-       arbitrarily chosen the following needle and template for the
-       haystack, and ensure that for each placement of the needle in
-       that haystack, c_strcasestr finds it.  */
-    const char *needle = "\nwith_gnu_ld-extend-to-len-32-b\n";
-    const char *h =
-      "\n"
-      "with_build_libsubdir\n"
-      "with_local_prefix\n"
-      "with_gxx_include_dir\n"
-      "with_cpp_install_dir\n"
-      "with_e_\n"
-      "..............................\n"
-      "with_FGHIJKLMNOPQRSTUVWXYZ\n"
-      "with_567890123456789\n"
-      "with_multilib_list\n";
-    size_t h_len = strlen (h);
-    char *haystack = malloc (h_len + 1);
-    size_t i;
-    ASSERT (haystack);
-    for (i = 0; i < h_len - strlen (needle); i++)
-      {
-        const char *p;
-        memcpy (haystack, h, h_len + 1);
-        memcpy (haystack + i, needle, strlen (needle) + 1);
-        p = c_strcasestr (haystack, needle);
-        ASSERT (p);
-        ASSERT (p - haystack == i);
-      }
-  }
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strncasecmp.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strncasecmp.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strncasecmp.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strncasecmp.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strstr.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strstr.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-c-strstr.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-c-strstr.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *needle =
+    char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
     char *haystack = (char *) malloc (m + 1);
@@ -81,7 +81,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *haystack =
+    char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB";
     char *needle = (char *) malloc (m + 1);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-dirent.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dirent.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-dirent.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dirent.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/* Test of <dirent.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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 Eric Blake <ebb9@byu.net>, 2009.  */
-
-#include <config.h>
-
-#include <dirent.h>
-
-/* Check for existence of required types.  */
-static DIR *dir _GL_UNUSED;
-static struct dirent d;
-static ino_t i;
-
-int
-main (void)
-{
-  return d.d_name[0] + i;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-dup2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dup2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-dup2.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dup2.c	2010-03-28 18:32:30.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test duplicating file descriptors.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,10 +26,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#if HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
 #include "binary-io.h"
 
 #if GNULIB_TEST_CLOEXEC
@@ -37,11 +33,9 @@
 #endif
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
 #endif
 
 #include "macros.h"
@@ -51,7 +45,7 @@
 is_open (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
@@ -69,7 +63,7 @@
 is_inheritable (int fd)
 {
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   HANDLE h = (HANDLE) _get_osfhandle (fd);
@@ -107,7 +101,6 @@
 {
   const char *file = "test-dup2.tmp";
   char buffer[1];
-  int bad_fd = getdtablesize ();
   int fd = open (file, O_CREAT | O_TRUNC | O_RDWR, 0600);
 
   /* Assume std descriptors were provided by invoker.  */
@@ -127,10 +120,6 @@
   errno = 0;
   ASSERT (dup2 (-1, fd) == -1);
   ASSERT (errno == EBADF);
-  close (99);
-  errno = 0;
-  ASSERT (dup2 (99, fd) == -1);
-  ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (dup2 (AT_FDCWD, fd) == -1);
   ASSERT (errno == EBADF);
@@ -150,17 +139,8 @@
   errno = 0;
   ASSERT (dup2 (fd, -2) == -1);
   ASSERT (errno == EBADF);
-  if (bad_fd > 256)
-    {
-      ASSERT (dup2 (fd, 255) == 255);
-      ASSERT (dup2 (fd, 256) == 256);
-      ASSERT (close (255) == 0);
-      ASSERT (close (256) == 0);
-    }
-  ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
-  ASSERT (close (bad_fd - 1) == 0);
   errno = 0;
-  ASSERT (dup2 (fd, bad_fd) == -1);
+  ASSERT (dup2 (fd, 10000000) == -1);
   ASSERT (errno == EBADF);
 
   /* Using dup2 can skip fds.  */
@@ -189,12 +169,7 @@
   ASSERT (dup2 (fd + 1, fd + 1) == fd + 1);
   ASSERT (!is_inheritable (fd + 1));
   ASSERT (dup2 (fd + 1, fd + 2) == fd + 2);
-  ASSERT (!is_inheritable (fd + 1));
   ASSERT (is_inheritable (fd + 2));
-  errno = 0;
-  ASSERT (dup2 (fd + 1, -1) == -1);
-  ASSERT (errno == EBADF);
-  ASSERT (!is_inheritable (fd + 1));
 #endif
 
   /* On systems that distinguish between text and binary mode, dup2
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-dup.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dup.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-dup.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dup.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* Test duplicating a file descriptor.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (dup, int, (int));
-
-#include <errno.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (dup (-1) == -1);
-    ASSERT (errno == EBADF);
-  }
-  {
-    close (99);
-    errno = 0;
-    ASSERT (dup (99) == -1);
-    ASSERT (errno == EBADF);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-dup-safer.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dup-safer.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-dup-safer.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-dup-safer.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test that dup_safer leaves standard fds alone.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,23 +24,23 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "binary-io.h"
 #include "cloexec.h"
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
 #endif
 
 #if !O_BINARY
 # define setmode(f,m) zero ()
 static int zero (void) { return 0; }
 #endif
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
 
 /* This test intentionally closes stderr.  So, we arrange to have fd 10
    (outside the range of interesting fd's during the test) set up to
@@ -57,7 +57,7 @@
 is_open (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
@@ -74,7 +74,7 @@
 is_inheritable (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   HANDLE h = (HANDLE) _get_osfhandle (fd);
@@ -108,7 +108,6 @@
 {
   int i;
   int fd;
-  int bad_fd = getdtablesize ();
 
   /* We close fd 2 later, so save it in fd 10.  */
   if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
@@ -131,7 +130,7 @@
       ASSERT (dup (-1) == -1);
       ASSERT (errno == EBADF);
       errno = 0;
-      ASSERT (dup (bad_fd) == -1);
+      ASSERT (dup (10000000) == -1);
       ASSERT (errno == EBADF);
       close (fd + 1);
       errno = 0;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-environ.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-environ.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-environ.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-environ.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,13 +22,6 @@
 
 #include <string.h>
 
-/* environ is the exported symbol referencing the internal
-   __cygwin_environ variable on cygwin64:
-   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-#if defined __CYGWIN__ && defined __x86_64__
-extern DLL_VARIABLE char **environ;
-#endif
-
 int
 main ()
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-errno.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-errno.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-errno.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-errno.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <errno.h> substitute.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -98,8 +98,6 @@
 int e116 = ESTALE;
 int e122 = EDQUOT;
 int e125 = ECANCELED;
-int e130 = EOWNERDEAD;
-int e131 = ENOTRECOVERABLE;
 
 /* Don't verify that these errno values are all different, except for possibly
    EWOULDBLOCK == EAGAIN.  Even Linux/x86 does not pass this check: it has
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fcntl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fcntl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fcntl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fcntl.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of fcntl(2).
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This 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,16 +31,19 @@
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
 #endif
 
 #include "binary-io.h"
 #include "macros.h"
 
+/* Use O_CLOEXEC if available, but test works without it.  */
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+
 #if !O_BINARY
 # define setmode(f,m) zero ()
 static int zero (void) { return 0; }
@@ -51,7 +54,7 @@
 is_open (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
@@ -68,7 +71,7 @@
 is_inheritable (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   HANDLE h = (HANDLE) _get_osfhandle (fd);
@@ -211,7 +214,6 @@
 {
   const char *file = "test-fcntl.tmp";
   int fd;
-  int bad_fd = getdtablesize ();
 
   /* Sanity check that rpl_fcntl is likely to work.  */
   ASSERT (func2 (1, 2) == 2);
@@ -238,7 +240,7 @@
   ASSERT (fcntl (fd + 1, F_DUPFD, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (bad_fd, F_DUPFD, 0) == -1);
+  ASSERT (fcntl (10000000, F_DUPFD, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (fcntl (-1, F_DUPFD_CLOEXEC, 0) == -1);
@@ -247,21 +249,23 @@
   ASSERT (fcntl (fd + 1, F_DUPFD_CLOEXEC, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (bad_fd, F_DUPFD_CLOEXEC, 0) == -1);
+  ASSERT (fcntl (10000000, F_DUPFD_CLOEXEC, 0) == -1);
   ASSERT (errno == EBADF);
 
   /* For F_DUPFD*, the destination must be valid.  */
+  ASSERT (getdtablesize () < 10000000);
   errno = 0;
   ASSERT (fcntl (fd, F_DUPFD, -1) == -1);
   ASSERT (errno == EINVAL);
   errno = 0;
-  ASSERT (fcntl (fd, F_DUPFD, bad_fd) == -1);
+  ASSERT (fcntl (fd, F_DUPFD, 10000000) == -1);
   ASSERT (errno == EINVAL);
+  ASSERT (getdtablesize () < 10000000);
   errno = 0;
   ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, -1) == -1);
   ASSERT (errno == EINVAL);
   errno = 0;
-  ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, bad_fd) == -1);
+  ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, 10000000) == -1);
   ASSERT (errno == EINVAL);
 
   /* For F_DUPFD*, check for correct inheritance, as well as
@@ -313,7 +317,7 @@
   ASSERT (is_mode (fd + 2, O_TEXT));
   ASSERT (close (fd + 2) == 0);
 
-  /* Test F_GETFD on invalid file descriptors.  */
+  /* Test F_GETFD.  */
   errno = 0;
   ASSERT (fcntl (-1, F_GETFD) == -1);
   ASSERT (errno == EBADF);
@@ -321,10 +325,8 @@
   ASSERT (fcntl (fd + 1, F_GETFD) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (bad_fd, F_GETFD) == -1);
+  ASSERT (fcntl (10000000, F_GETFD) == -1);
   ASSERT (errno == EBADF);
-
-  /* Test F_GETFD, the FD_CLOEXEC bit.  */
   {
     int result = fcntl (fd, F_GETFD);
     ASSERT (0 <= result);
@@ -336,71 +338,6 @@
     ASSERT (close (fd + 1) == 0);
   }
 
-#ifdef F_SETFD
-  /* Test F_SETFD on invalid file descriptors.  */
-  errno = 0;
-  ASSERT (fcntl (-1, F_SETFD, 0) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (fd + 1, F_SETFD, 0) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (bad_fd, F_SETFD, 0) == -1);
-  ASSERT (errno == EBADF);
-#endif
-
-#ifdef F_GETFL
-  /* Test F_GETFL on invalid file descriptors.  */
-  errno = 0;
-  ASSERT (fcntl (-1, F_GETFL) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (fd + 1, F_GETFL) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (bad_fd, F_GETFL) == -1);
-  ASSERT (errno == EBADF);
-#endif
-
-#ifdef F_SETFL
-  /* Test F_SETFL on invalid file descriptors.  */
-  errno = 0;
-  ASSERT (fcntl (-1, F_SETFL, 0) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (fd + 1, F_SETFL, 0) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (bad_fd, F_SETFL, 0) == -1);
-  ASSERT (errno == EBADF);
-#endif
-
-#ifdef F_GETOWN
-  /* Test F_GETOWN on invalid file descriptors.  */
-  errno = 0;
-  ASSERT (fcntl (-1, F_GETOWN) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (fd + 1, F_GETOWN) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (bad_fd, F_GETOWN) == -1);
-  ASSERT (errno == EBADF);
-#endif
-
-#ifdef F_SETOWN
-  /* Test F_SETFL on invalid file descriptors.  */
-  errno = 0;
-  ASSERT (fcntl (-1, F_SETOWN, 0) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (fd + 1, F_SETOWN, 0) == -1);
-  ASSERT (errno == EBADF);
-  errno = 0;
-  ASSERT (fcntl (bad_fd, F_SETOWN, 0) == -1);
-  ASSERT (errno == EBADF);
-#endif
-
   /* Cleanup.  */
   ASSERT (close (fd) == 0);
   ASSERT (unlink (file) == 0);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fcntl-h.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fcntl-h.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fcntl-h.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fcntl-h.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <fcntl.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,110 +21,18 @@
 #include <fcntl.h>
 
 /* Check that the various O_* macros are defined.  */
-int o = (O_DIRECT | O_DIRECTORY | O_DSYNC | O_IGNORE_CTTY | O_NDELAY | O_NOATIME
-	 | O_NONBLOCK | O_NOCTTY | O_NOFOLLOW | O_NOLINK | O_NOLINKS | O_NOTRANS
-	 | O_RSYNC | O_SYNC | O_TTY_INIT | O_BINARY | O_TEXT);
+int o = O_DIRECT | O_DIRECTORY | O_DSYNC | O_NDELAY | O_NOATIME | O_NONBLOCK
+        | O_NOCTTY | O_NOFOLLOW | O_NOLINKS | O_RSYNC | O_SYNC | O_TTY_INIT
+        | O_BINARY | O_TEXT;
 
 /* Check that the various SEEK_* macros are defined.  */
 int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET };
 
 /* Check that the FD_* macros are defined.  */
-int i = FD_CLOEXEC;
-
-/* Check that the types are all defined.  */
-pid_t t1;
-off_t t2;
-mode_t t3;
+int fd = FD_CLOEXEC;
 
 int
 main (void)
 {
-  /* Ensure no overlap in SEEK_*. */
-  switch (0)
-    {
-    case SEEK_CUR:
-    case SEEK_END:
-    case SEEK_SET:
-      ;
-    }
-
-  /* Ensure no dangerous overlap in non-zero gnulib-defined replacements.  */
-  switch (O_RDONLY)
-    {
-      /* Access modes */
-    case O_RDONLY:
-    case O_WRONLY:
-    case O_RDWR:
-#if O_EXEC && O_EXEC != O_RDONLY
-    case O_EXEC:
-#endif
-#if O_SEARCH && O_EXEC != O_SEARCH && O_SEARCH != O_RDONLY
-    case O_SEARCH:
-#endif
-      i = ! (~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH));
-      break;
-
-      /* Everyone should have these */
-    case O_CREAT:
-    case O_EXCL:
-    case O_TRUNC:
-    case O_APPEND:
-      break;
-
-      /* These might be 0 or O_RDONLY, only test non-zero versions.  */
-#if O_CLOEXEC
-    case O_CLOEXEC:
-#endif
-#if O_DIRECT
-    case O_DIRECT:
-#endif
-#if O_DIRECTORY
-    case O_DIRECTORY:
-#endif
-#if O_DSYNC
-    case O_DSYNC:
-#endif
-#if O_IGNORE_CTTY
-    case O_IGNORE_CTTY:
-#endif
-#if O_NOATIME
-    case O_NOATIME:
-#endif
-#if O_NONBLOCK
-    case O_NONBLOCK:
-#endif
-#if O_NOCTTY
-    case O_NOCTTY:
-#endif
-#if O_NOFOLLOW
-    case O_NOFOLLOW:
-#endif
-#if O_NOLINK
-    case O_NOLINK:
-#endif
-#if O_NOLINKS
-    case O_NOLINKS:
-#endif
-#if O_NOTRANS
-    case O_NOTRANS:
-#endif
-#if O_RSYNC && O_RSYNC != O_DSYNC
-    case O_RSYNC:
-#endif
-#if O_SYNC && O_SYNC != O_RSYNC
-    case O_SYNC:
-#endif
-#if O_TTY_INIT
-    case O_TTY_INIT:
-#endif
-#if O_BINARY
-    case O_BINARY:
-#endif
-#if O_TEXT
-    case O_TEXT:
-#endif
-      ;
-    }
-
-  return !i;
+  return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fdopen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fdopen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fdopen.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fdopen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* Test opening a stream with a file descriptor.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (fdopen, FILE *, (int, const char *));
-
-#include <errno.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  /* Test behavior on failure.  POSIX makes it hard to check for
-     failure, since the behavior is not well-defined on invalid file
-     descriptors, so try fdopen 1000 times and if that's not enough to
-     fail due to EMFILE, so be it.  */
-
-  int i;
-  for (i = 0; i < 1000; i++)
-    {
-      errno = 0;
-      if (! fdopen (STDOUT_FILENO, "w"))
-        {
-          ASSERT (errno != 0);
-          break;
-        }
-    }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fgetc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fgetc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fgetc.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fgetc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/* Test of fgetc() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (fgetc, int, (FILE *));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "msvc-inval.h"
-
-#include "macros.h"
-
-int
-main (int argc, char **argv)
-{
-  const char *filename = "test-fgetc.txt";
-
-  /* We don't have an fgetc() function that installs an invalid parameter
-     handler so far.  So install that handler here, explicitly.  */
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-  gl_msvc_inval_ensure_handler ();
-#endif
-
-  /* Prepare a file.  */
-  {
-    const char text[] = "hello world";
-    int fd = open (filename, O_RDWR | O_CREAT | O_TRUNC, 0600);
-    ASSERT (fd >= 0);
-    ASSERT (write (fd, text, sizeof (text)) == sizeof (text));
-    ASSERT (close (fd) == 0);
-  }
-
-  /* Test that fgetc() sets errno if someone else closes the stream
-     fd behind the back of stdio.  */
-  {
-    FILE *fp = fopen (filename, "r");
-    ASSERT (fp != NULL);
-    ASSERT (close (fileno (fp)) == 0);
-    errno = 0;
-    ASSERT (fgetc (fp) == EOF);
-    ASSERT (errno == EBADF);
-    ASSERT (ferror (fp));
-    fclose (fp);
-  }
-
-  /* Test that fgetc() sets errno if the stream was constructed with
-     an invalid file descriptor.  */
-  {
-    FILE *fp = fdopen (-1, "r");
-    if (fp != NULL)
-      {
-        errno = 0;
-        ASSERT (fgetc (fp) == EOF);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-  {
-    FILE *fp;
-    close (99);
-    fp = fdopen (99, "r");
-    if (fp != NULL)
-      {
-        errno = 0;
-        ASSERT (fgetc (fp) == EOF);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-
-  /* Clean up.  */
-  unlink (filename);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl-1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl-1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl-1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl-1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Test file-has-acl on the file system of /var/tmp, which usually is a local
-# file system.
-
-if test -d /var/tmp; then
-  TMPDIR=/var/tmp
-else
-  TMPDIR=/tmp
-fi
-export TMPDIR
-
-exec "${srcdir}/test-file-has-acl.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl-2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl-2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl-2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl-2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Test file-has-acl on the file system of the build directory, which may be
-# a local file system or NFS mounted.
-
-TMPDIR=`pwd`
-export TMPDIR
-
-exec "${srcdir}/test-file-has-acl.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for presence of ACL.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -49,11 +49,8 @@
 #if HAVE_DECL_ALARM
   /* Declare failure if test takes too long, by using default abort
      caused by SIGALRM.  */
-  {
-    int alarm_value = 5;
-    signal (SIGALRM, SIG_DFL);
-    alarm (alarm_value);
-  }
+  signal (SIGALRM, SIG_DFL);
+  alarm (5);
 #endif
 
 #if USE_ACL
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-file-has-acl.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl.sh	2009-08-30 15:49:52.000000000 +0000
@@ -60,8 +60,8 @@
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none.
-  # TODO: Support also native Windows platforms (mingw).
+  #   linux, cygwin, freebsd, solaris, hpux, osf1, aix, macosx, irix, none.
+  # TODO: Support also native Win32 platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
     # Platforms with the getfacl and setfacl programs.
@@ -88,30 +88,18 @@
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
       # HP-UX, sometimes also IRIX.
-      if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # HP-UX 11.11 or newer.
-        acl_flavor=hpuxjfs
-      else
-        # HP-UX 11.00.
-        acl_flavor=hpux
-      fi
+      acl_flavor=hpux
     else
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # Tru64, NonStop Kernel.
-        if (getacl -m tmpfile0 >/dev/null) 2>/dev/null; then
-          # Tru64.
-          acl_flavor=osf1
-        else
-          # NonStop Kernel.
-          acl_flavor=nsk
-        fi
+        # Tru64.
+        acl_flavor=osf1
       else
         if (aclget tmpfile0 >/dev/null) 2>/dev/null; then
           # AIX.
           acl_flavor=aix
         else
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
-            # Mac OS X.
+            # MacOS X.
             acl_flavor=macosx
           else
             if test -f /sbin/chacl; then
@@ -262,7 +250,7 @@
         fi
         ;;
 
-      hpux | hpuxjfs)
+      hpux)
 
         # Set an ACL for a user.
         orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
@@ -275,20 +263,6 @@
 
           func_test_has_acl tmpfile0 no
 
-        else
-          if test $acl_flavor = hpuxjfs; then
-
-            # Set an ACL for a user.
-            setacl -m user:$auid:1 tmpfile0
-
-            func_test_has_acl tmpfile0 yes
-
-            # Remove the ACL for the user.
-            setacl -d user:$auid tmpfile0
-
-            func_test_has_acl tmpfile0 no
-
-          fi
         fi
         ;;
 
@@ -312,20 +286,6 @@
         fi
         ;;
 
-      nsk)
-
-        # Set an ACL for a user.
-        setacl -m user:$auid:1 tmpfile0
-
-        func_test_has_acl tmpfile0 yes
-
-        # Remove the ACL for the user.
-        setacl -d user:$auid tmpfile0
-
-        func_test_has_acl tmpfile0 no
-
-        ;;
-
       aix)
 
         # Set an ACL for a user.
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-float.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-float.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-float.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-float.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,384 +0,0 @@
-/* Test of <float.h> substitute.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#include <config.h>
-
-#include <float.h>
-
-#include "fpucw.h"
-#include "macros.h"
-
-/* Check that FLT_RADIX is a constant expression.  */
-int a[] = { FLT_RADIX };
-
-#if FLT_RADIX == 2
-
-/* Return 2^n.  */
-static float
-pow2f (int n)
-{
-  int k = n;
-  volatile float x = 1;
-  volatile float y = 2;
-  /* Invariant: 2^n == x * y^k.  */
-  if (k < 0)
-    {
-      y = 0.5f;
-      k = - k;
-    }
-  while (k > 0)
-    {
-      if (k != 2 * (k / 2))
-        {
-          x = x * y;
-          k = k - 1;
-        }
-      if (k == 0)
-        break;
-      y = y * y;
-      k = k / 2;
-    }
-  /* Now k == 0, hence x == 2^n.  */
-  return x;
-}
-
-/* Return 2^n.  */
-static double
-pow2d (int n)
-{
-  int k = n;
-  volatile double x = 1;
-  volatile double y = 2;
-  /* Invariant: 2^n == x * y^k.  */
-  if (k < 0)
-    {
-      y = 0.5;
-      k = - k;
-    }
-  while (k > 0)
-    {
-      if (k != 2 * (k / 2))
-        {
-          x = x * y;
-          k = k - 1;
-        }
-      if (k == 0)
-        break;
-      y = y * y;
-      k = k / 2;
-    }
-  /* Now k == 0, hence x == 2^n.  */
-  return x;
-}
-
-/* Return 2^n.  */
-static long double
-pow2l (int n)
-{
-  int k = n;
-  volatile long double x = 1;
-  volatile long double y = 2;
-  /* Invariant: 2^n == x * y^k.  */
-  if (k < 0)
-    {
-      y = 0.5L;
-      k = - k;
-    }
-  while (k > 0)
-    {
-      if (k != 2 * (k / 2))
-        {
-          x = x * y;
-          k = k - 1;
-        }
-      if (k == 0)
-        break;
-      y = y * y;
-      k = k / 2;
-    }
-  /* Now k == 0, hence x == 2^n.  */
-  return x;
-}
-
-/* ----------------------- Check macros for 'float' ----------------------- */
-
-/* Check that the FLT_* macros expand to constant expressions.  */
-int fb[] =
-  {
-    FLT_MANT_DIG, FLT_MIN_EXP, FLT_MAX_EXP,
-    FLT_DIG, FLT_MIN_10_EXP, FLT_MAX_10_EXP
-  };
-float fc[] = { FLT_EPSILON, FLT_MIN, FLT_MAX };
-
-static void
-test_float (void)
-{
-  /* Check that the value of FLT_MIN_EXP is well parenthesized.  */
-  ASSERT ((FLT_MIN_EXP % 101111) == (FLT_MIN_EXP) % 101111);
-
-  /* Check that the value of DBL_MIN_10_EXP is well parenthesized.  */
-  ASSERT ((FLT_MIN_10_EXP % 101111) == (FLT_MIN_10_EXP) % 101111);
-
-  /* Check that 'float' is as specified in IEEE 754.  */
-  ASSERT (FLT_MANT_DIG == 24);
-  ASSERT (FLT_MIN_EXP == -125);
-  ASSERT (FLT_MAX_EXP == 128);
-
-  /* Check the value of FLT_MIN_10_EXP.  */
-  ASSERT (FLT_MIN_10_EXP == - (int) (- (FLT_MIN_EXP - 1) * 0.30103));
-
-  /* Check the value of FLT_DIG.  */
-  ASSERT (FLT_DIG == (int) ((FLT_MANT_DIG - 1) * 0.30103));
-
-  /* Check the value of FLT_MIN_10_EXP.  */
-  ASSERT (FLT_MIN_10_EXP == - (int) (- (FLT_MIN_EXP - 1) * 0.30103));
-
-  /* Check the value of FLT_MAX_10_EXP.  */
-  ASSERT (FLT_MAX_10_EXP == (int) (FLT_MAX_EXP * 0.30103));
-
-  /* Check the value of FLT_MAX.  */
-  {
-    volatile float m = FLT_MAX;
-    int n;
-
-    ASSERT (m + m > m);
-    for (n = 0; n <= 2 * FLT_MANT_DIG; n++)
-      {
-        volatile float pow2_n = pow2f (n); /* 2^n */
-        volatile float x = m + (m / pow2_n);
-        if (x > m)
-          ASSERT (x + x == x);
-        else
-          ASSERT (!(x + x == x));
-      }
-  }
-
-  /* Check the value of FLT_MIN.  */
-  {
-    volatile float m = FLT_MIN;
-    volatile float x = pow2f (FLT_MIN_EXP - 1);
-    ASSERT (m == x);
-  }
-
-  /* Check the value of FLT_EPSILON.  */
-  {
-    volatile float e = FLT_EPSILON;
-    volatile float me;
-    int n;
-
-    me = 1.0f + e;
-    ASSERT (me > 1.0f);
-    ASSERT (me - 1.0f == e);
-    for (n = 0; n <= 2 * FLT_MANT_DIG; n++)
-      {
-        volatile float half_n = pow2f (- n); /* 2^-n */
-        volatile float x = me - half_n;
-        if (x < me)
-          ASSERT (x <= 1.0f);
-      }
-  }
-}
-
-/* ----------------------- Check macros for 'double' ----------------------- */
-
-/* Check that the DBL_* macros expand to constant expressions.  */
-int db[] =
-  {
-    DBL_MANT_DIG, DBL_MIN_EXP, DBL_MAX_EXP,
-    DBL_DIG, DBL_MIN_10_EXP, DBL_MAX_10_EXP
-  };
-double dc[] = { DBL_EPSILON, DBL_MIN, DBL_MAX };
-
-static void
-test_double (void)
-{
-  /* Check that the value of DBL_MIN_EXP is well parenthesized.  */
-  ASSERT ((DBL_MIN_EXP % 101111) == (DBL_MIN_EXP) % 101111);
-
-  /* Check that the value of DBL_MIN_10_EXP is well parenthesized.  */
-  ASSERT ((DBL_MIN_10_EXP % 101111) == (DBL_MIN_10_EXP) % 101111);
-
-  /* Check that 'double' is as specified in IEEE 754.  */
-  ASSERT (DBL_MANT_DIG == 53);
-  ASSERT (DBL_MIN_EXP == -1021);
-  ASSERT (DBL_MAX_EXP == 1024);
-
-  /* Check the value of DBL_MIN_10_EXP.  */
-  ASSERT (DBL_MIN_10_EXP == - (int) (- (DBL_MIN_EXP - 1) * 0.30103));
-
-  /* Check the value of DBL_DIG.  */
-  ASSERT (DBL_DIG == (int) ((DBL_MANT_DIG - 1) * 0.30103));
-
-  /* Check the value of DBL_MIN_10_EXP.  */
-  ASSERT (DBL_MIN_10_EXP == - (int) (- (DBL_MIN_EXP - 1) * 0.30103));
-
-  /* Check the value of DBL_MAX_10_EXP.  */
-  ASSERT (DBL_MAX_10_EXP == (int) (DBL_MAX_EXP * 0.30103));
-
-  /* Check the value of DBL_MAX.  */
-  {
-    volatile double m = DBL_MAX;
-    int n;
-
-    ASSERT (m + m > m);
-    for (n = 0; n <= 2 * DBL_MANT_DIG; n++)
-      {
-        volatile double pow2_n = pow2d (n); /* 2^n */
-        volatile double x = m + (m / pow2_n);
-        if (x > m)
-          ASSERT (x + x == x);
-        else
-          ASSERT (!(x + x == x));
-      }
-  }
-
-  /* Check the value of DBL_MIN.  */
-  {
-    volatile double m = DBL_MIN;
-    volatile double x = pow2d (DBL_MIN_EXP - 1);
-    ASSERT (m == x);
-  }
-
-  /* Check the value of DBL_EPSILON.  */
-  {
-    volatile double e = DBL_EPSILON;
-    volatile double me;
-    int n;
-
-    me = 1.0 + e;
-    ASSERT (me > 1.0);
-    ASSERT (me - 1.0 == e);
-    for (n = 0; n <= 2 * DBL_MANT_DIG; n++)
-      {
-        volatile double half_n = pow2d (- n); /* 2^-n */
-        volatile double x = me - half_n;
-        if (x < me)
-          ASSERT (x <= 1.0);
-      }
-  }
-}
-
-/* -------------------- Check macros for 'long double' -------------------- */
-
-/* Check that the LDBL_* macros expand to constant expressions.  */
-int lb[] =
-  {
-    LDBL_MANT_DIG, LDBL_MIN_EXP, LDBL_MAX_EXP,
-    LDBL_DIG, LDBL_MIN_10_EXP, LDBL_MAX_10_EXP
-  };
-long double lc1 = LDBL_EPSILON;
-long double lc2 = LDBL_MIN;
-#if 0 /* LDBL_MAX is not a constant expression on some platforms.  */
-long double lc3 = LDBL_MAX;
-#endif
-
-static void
-test_long_double (void)
-{
-  /* Check that the value of LDBL_MIN_EXP is well parenthesized.  */
-  ASSERT ((LDBL_MIN_EXP % 101111) == (LDBL_MIN_EXP) % 101111);
-
-  /* Check that the value of LDBL_MIN_10_EXP is well parenthesized.  */
-  ASSERT ((LDBL_MIN_10_EXP % 101111) == (LDBL_MIN_10_EXP) % 101111);
-
-  /* Check that 'long double' is at least as wide as 'double'.  */
-  ASSERT (LDBL_MANT_DIG >= DBL_MANT_DIG);
-  ASSERT (LDBL_MIN_EXP - LDBL_MANT_DIG <= DBL_MIN_EXP - DBL_MANT_DIG);
-  ASSERT (LDBL_MAX_EXP >= DBL_MAX_EXP);
-
-  /* Check the value of LDBL_DIG.  */
-  ASSERT (LDBL_DIG == (int)((LDBL_MANT_DIG - 1) * 0.30103));
-
-  /* Check the value of LDBL_MIN_10_EXP.  */
-  ASSERT (LDBL_MIN_10_EXP == - (int) (- (LDBL_MIN_EXP - 1) * 0.30103));
-
-  /* Check the value of LDBL_MAX_10_EXP.  */
-  ASSERT (LDBL_MAX_10_EXP == (int) (LDBL_MAX_EXP * 0.30103));
-
-  /* Check the value of LDBL_MAX.  */
-  {
-    volatile long double m = LDBL_MAX;
-    int n;
-
-    ASSERT (m + m > m);
-    for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
-      {
-        volatile long double pow2_n = pow2l (n); /* 2^n */
-        volatile long double x = m + (m / pow2_n);
-        if (x > m)
-          ASSERT (x + x == x);
-        else
-          ASSERT (!(x + x == x));
-      }
-  }
-
-  /* Check the value of LDBL_MIN.  */
-  {
-    volatile long double m = LDBL_MIN;
-    volatile long double x = pow2l (LDBL_MIN_EXP - 1);
-    ASSERT (m == x);
-  }
-
-  /* Check the value of LDBL_EPSILON.  */
-  {
-    volatile long double e = LDBL_EPSILON;
-    volatile long double me;
-    int n;
-
-    me = 1.0L + e;
-    ASSERT (me > 1.0L);
-    ASSERT (me - 1.0L == e);
-    for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
-      {
-        volatile long double half_n = pow2l (- n); /* 2^-n */
-        volatile long double x = me - half_n;
-        if (x < me)
-          ASSERT (x <= 1.0L);
-      }
-  }
-}
-
-int
-main ()
-{
-  test_float ();
-  test_double ();
-
-  {
-    DECL_LONG_DOUBLE_ROUNDING
-
-    BEGIN_LONG_DOUBLE_ROUNDING ();
-
-    test_long_double ();
-
-    END_LONG_DOUBLE_ROUNDING ();
-  }
-
-  return 0;
-}
-
-#else
-
-int
-main ()
-{
-  fprintf (stderr, "Skipping test: FLT_RADIX is not 2.\n");
-  return 77;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fnmatch.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fnmatch.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fnmatch.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fnmatch.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of fnmatch string matching function.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,11 +46,5 @@
   ASSERT (res = fnmatch ("foo\\.txt", "foo.txt", 0) == 0);
   ASSERT (res = fnmatch ("foo\\.txt", "foo.txt", FNM_NOESCAPE) == FNM_NOMATCH);
 
-  /* Verify that an unmatched [ is treated as a literal, as POSIX
-     requires.  This test ensures that glibc Bugzilla bug #12378 stays
-     fixed.
-   */
-  ASSERT (res = fnmatch ("[/b", "[/b", 0) == 0);
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fopen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fopen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fopen.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fopen.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fopen.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fopen.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fopen.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fopen.h	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fputc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fputc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fputc.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fputc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/* Test of fputc() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (fputc, int, (int, FILE *));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "msvc-inval.h"
-
-#include "macros.h"
-
-int
-main (int argc, char **argv)
-{
-  const char *filename = "test-fputc.txt";
-
-  /* We don't have an fputc() function that installs an invalid parameter
-     handler so far.  So install that handler here, explicitly.  */
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-  gl_msvc_inval_ensure_handler ();
-#endif
-
-  /* Test that fputc() on an unbuffered stream sets errno if someone else
-     closes the stream fd behind the back of stdio.  */
-  {
-    FILE *fp = fopen (filename, "w");
-    ASSERT (fp != NULL);
-    setvbuf (fp, NULL, _IONBF, 0);
-    ASSERT (close (fileno (fp)) == 0);
-    errno = 0;
-    ASSERT (fputc ('x', fp) == EOF);
-    ASSERT (errno == EBADF);
-    ASSERT (ferror (fp));
-    fclose (fp);
-  }
-
-  /* Test that fputc() on an unbuffered stream sets errno if the stream
-     was constructed with an invalid file descriptor.  */
-  {
-    FILE *fp = fdopen (-1, "w");
-    if (fp != NULL)
-      {
-        setvbuf (fp, NULL, _IONBF, 0);
-        errno = 0;
-        ASSERT (fputc ('x', fp) == EOF);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-  {
-    FILE *fp;
-    close (99);
-    fp = fdopen (99, "w");
-    if (fp != NULL)
-      {
-        setvbuf (fp, NULL, _IONBF, 0);
-        errno = 0;
-        ASSERT (fputc ('x', fp) == EOF);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-
-  /* Clean up.  */
-  unlink (filename);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fread.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fread.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fread.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fread.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-/* Test of fread() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (fread, size_t, (void *, size_t, size_t, FILE *));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "msvc-inval.h"
-
-#include "macros.h"
-
-int
-main (int argc, char **argv)
-{
-  const char *filename = "test-fread.txt";
-
-  /* We don't have an fread() function that installs an invalid parameter
-     handler so far.  So install that handler here, explicitly.  */
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-  gl_msvc_inval_ensure_handler ();
-#endif
-
-  /* Prepare a file.  */
-  {
-    const char text[] = "hello world";
-    int fd = open (filename, O_RDWR | O_CREAT | O_TRUNC, 0600);
-    ASSERT (fd >= 0);
-    ASSERT (write (fd, text, sizeof (text)) == sizeof (text));
-    ASSERT (close (fd) == 0);
-  }
-
-  /* Test that fread() sets errno if someone else closes the stream
-     fd behind the back of stdio.  */
-  {
-    FILE *fp = fopen (filename, "r");
-    char buf[5];
-    ASSERT (fp != NULL);
-    ASSERT (close (fileno (fp)) == 0);
-    errno = 0;
-    ASSERT (fread (buf, 1, sizeof (buf), fp) == 0);
-    ASSERT (errno == EBADF);
-    ASSERT (ferror (fp));
-    fclose (fp);
-  }
-
-  /* Test that fread() sets errno if the stream was constructed with
-     an invalid file descriptor.  */
-  {
-    FILE *fp = fdopen (-1, "r");
-    if (fp != NULL)
-      {
-        char buf[1];
-        errno = 0;
-        ASSERT (fread (buf, 1, 1, fp) == 0);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-  {
-    FILE *fp;
-    close (99);
-    fp = fdopen (99, "r");
-    if (fp != NULL)
-      {
-        char buf[1];
-        errno = 0;
-        ASSERT (fread (buf, 1, 1, fp) == 0);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-
-  /* Clean up.  */
-  unlink (filename);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fstat.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fstat.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fstat.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fstat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* Tests of fstat() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <sys/stat.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (fstat, int, (int, struct stat *));
-
-#include <errno.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-int
-main (int argc, char *argv[])
-{
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    struct stat statbuf;
-
-    errno = 0;
-    ASSERT (fstat (-1, &statbuf) == -1);
-    ASSERT (errno == EBADF);
-  }
-  {
-    struct stat statbuf;
-
-    close (99);
-    errno = 0;
-    ASSERT (fstat (99, &statbuf) == -1);
-    ASSERT (errno == EBADF);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fstrcmp.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fstrcmp.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fstrcmp.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fstrcmp.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of fuzzy string comparison.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec ./test-ftell${EXEEXT} 1 2 < "$srcdir/test-ftell2.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell3.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell3.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell3.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell3.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/* Test of ftell() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* None of the files accessed by this test are large, so disable the
-   fseek link warning if we are not using the gnulib fseek module.  */
-#define _GL_NO_LARGE_FILES
-#include <stdio.h>
-
-#include <string.h>
-
-#include "macros.h"
-
-#define TESTFILE "t-ftell3.tmp"
-
-int
-main (void)
-{
-  FILE *fp;
-
-  /* Create a file with some contents.  */
-  fp = fopen (TESTFILE, "w");
-  if (fp == NULL)
-    goto skip;
-  if (fwrite ("foogarsh", 1, 8, fp) < 8)
-    goto skip;
-  if (fclose (fp))
-    goto skip;
-
-  /* The file's contents is now "foogarsh".  */
-
-  /* Try writing after reading to EOF.  */
-  fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    goto skip;
-  if (fseek (fp, -1, SEEK_END))
-    goto skip;
-  ASSERT (getc (fp) == 'h');
-  ASSERT (getc (fp) == EOF);
-  ASSERT (ftell (fp) == 8);
-  ASSERT (ftell (fp) == 8);
-  ASSERT (putc ('!', fp) == '!');
-  ASSERT (ftell (fp) == 9);
-  ASSERT (fclose (fp) == 0);
-  fp = fopen (TESTFILE, "r");
-  if (fp == NULL)
-    goto skip;
-  {
-    char buf[10];
-    ASSERT (fread (buf, 1, 10, fp) == 9);
-    ASSERT (memcmp (buf, "foogarsh!", 9) == 0);
-  }
-  ASSERT (fclose (fp) == 0);
-
-  /* The file's contents is now "foogarsh!".  */
-
-  remove (TESTFILE);
-  return 0;
-
- skip:
-  fprintf (stderr, "Skipping test: prerequisite file operations failed.\n");
-  remove (TESTFILE);
-  return 77;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/* Test of ftell() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
-
-#include <config.h>
-
-/* None of the files accessed by this test are large, so disable the
-   fseek link warning if we are not using the gnulib fseek module.  */
-#define _GL_NO_LARGE_FILES
-#include <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (ftell, long, (FILE *));
-
-#include "binary-io.h"
-#include "macros.h"
-
-#ifndef FUNC_UNGETC_BROKEN
-# define FUNC_UNGETC_BROKEN 0
-#endif
-
-int
-main (int argc, char **argv)
-{
-  int ch;
-  /* Assume stdin is seekable iff argc > 1.  */
-  if (argc == 1)
-    {
-      ASSERT (ftell (stdin) == -1);
-      return 0;
-    }
-
-  /* mingw ftell is unreliable on text mode input.  */
-  SET_BINARY (0);
-
-  /* Simple tests.  */
-  ASSERT (ftell (stdin) == 0);
-
-  ch = fgetc (stdin);
-  ASSERT (ch == '#');
-  ASSERT (ftell (stdin) == 1);
-
-  /* Test ftell after ungetc of read input.  */
-  ch = ungetc ('#', stdin);
-  ASSERT (ch == '#');
-  ASSERT (ftell (stdin) == 0);
-
-  ch = fgetc (stdin);
-  ASSERT (ch == '#');
-  ASSERT (ftell (stdin) == 1);
-
-  /* Test ftell after fseek.  */
-  ASSERT (fseek (stdin, 2, SEEK_SET) == 0);
-  ASSERT (ftell (stdin) == 2);
-
-  /* Test ftell after random ungetc.  */
-  ch = fgetc (stdin);
-  ASSERT (ch == '/');
-  ch = ungetc ('@', stdin);
-  ASSERT (ch == '@');
-  ASSERT (ftell (stdin) == 2);
-
-  ch = fgetc (stdin);
-  ASSERT (ch == '@');
-  ASSERT (ftell (stdin) == 3);
-
-  if (2 < argc)
-    {
-      if (FUNC_UNGETC_BROKEN)
-        {
-          fputs ("Skipping test: ungetc cannot handle arbitrary bytes\n",
-                 stderr);
-          return 77;
-        }
-      /* Test ftell after ungetc without read.  */
-      ASSERT (fseek (stdin, 0, SEEK_CUR) == 0);
-      ASSERT (ftell (stdin) == 3);
-
-      ch = ungetc ('~', stdin);
-      ASSERT (ch == '~');
-      ASSERT (ftell (stdin) == 2);
-    }
-
-#if !defined __MINT__ /* FreeMiNT has problems seeking past end of file */
-  /* Test ftell beyond end of file.  */
-  ASSERT (fseek (stdin, 0, SEEK_END) == 0);
-  ch = ftell (stdin);
-  ASSERT (fseek (stdin, 10, SEEK_END) == 0);
-  ASSERT (ftell (stdin) == ch + 10);
-#endif
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec ./test-ftello${EXEEXT} 1 2 < "$srcdir/test-ftello2.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello3.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello3.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello3.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello3.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/* Test of ftello() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* None of the files accessed by this test are large, so disable the
-   fseek link warning if we are not using the gnulib fseek module.  */
-#define _GL_NO_LARGE_FILES
-#include <stdio.h>
-
-#include <string.h>
-
-#include "macros.h"
-
-#define TESTFILE "t-ftello3.tmp"
-
-int
-main (void)
-{
-  FILE *fp;
-
-  /* Create a file with some contents.  */
-  fp = fopen (TESTFILE, "w");
-  if (fp == NULL)
-    goto skip;
-  if (fwrite ("foogarsh", 1, 8, fp) < 8)
-    goto skip;
-  if (fclose (fp))
-    goto skip;
-
-  /* The file's contents is now "foogarsh".  */
-
-  /* Try writing after reading to EOF.  */
-  fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    goto skip;
-  if (fseek (fp, -1, SEEK_END))
-    goto skip;
-  ASSERT (getc (fp) == 'h');
-  ASSERT (getc (fp) == EOF);
-  ASSERT (ftello (fp) == 8);
-  ASSERT (ftello (fp) == 8);
-  ASSERT (putc ('!', fp) == '!');
-  ASSERT (ftello (fp) == 9);
-  ASSERT (fclose (fp) == 0);
-  fp = fopen (TESTFILE, "r");
-  if (fp == NULL)
-    goto skip;
-  {
-    char buf[10];
-    ASSERT (fread (buf, 1, 10, fp) == 9);
-    ASSERT (memcmp (buf, "foogarsh!", 9) == 0);
-  }
-  ASSERT (fclose (fp) == 0);
-
-  /* The file's contents is now "foogarsh!".  */
-
-  remove (TESTFILE);
-  return 0;
-
- skip:
-  fprintf (stderr, "Skipping test: prerequisite file operations failed.\n");
-  remove (TESTFILE);
-  return 77;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello4.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello4.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello4.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello4.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* Test of ftello() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <stdio.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-int
-main (int argc, char **argv)
-{
-  const char *filename = argv[1];
-
-  /* Test that ftello() sets errno if someone else closes the stream
-     fd behind the back of stdio.  */
-  {
-    FILE *fp = fopen (filename, "r");
-    ASSERT (fp != NULL);
-    setvbuf (fp, NULL, _IONBF, 0);
-    ASSERT (close (fileno (fp)) == 0);
-    errno = 0;
-    ASSERT (ftello (fp) == (off_t)-1);
-    ASSERT (errno == EBADF);
-    fclose (fp);
-  }
-
-  /* Test that ftello() sets errno if the stream was constructed with
-     an invalid file descriptor.  */
-  {
-    FILE *fp = fdopen (-1, "w");
-    if (fp != NULL)
-      {
-        errno = 0;
-        ASSERT (ftello (fp) == (off_t)-1);
-        ASSERT (errno == EBADF);
-        fclose (fp);
-      }
-  }
-  {
-    FILE *fp;
-    close (99);
-    fp = fdopen (99, "w");
-    if (fp != NULL)
-      {
-        errno = 0;
-        ASSERT (ftello (fp) == (off_t)-1);
-        ASSERT (errno == EBADF);
-        fclose (fp);
-      }
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello4.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello4.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello4.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello4.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./test-ftello4${EXEEXT} "$srcdir/test-ftello4.sh" || exit 1
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/* Test of ftello() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
-
-#include <config.h>
-
-/* None of the files accessed by this test are large, so disable the
-   fseek link warning if we are not using the gnulib fseek module.  */
-#define _GL_NO_LARGE_FILES
-#include <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (ftello, off_t, (FILE *));
-
-#include "binary-io.h"
-#include "macros.h"
-
-#ifndef FUNC_UNGETC_BROKEN
-# define FUNC_UNGETC_BROKEN 0
-#endif
-
-int
-main (int argc, char **argv _GL_UNUSED)
-{
-  int ch;
-  /* Assume stdin is seekable iff argc > 1.  */
-  if (argc == 1)
-    {
-      ASSERT (ftell (stdin) == -1);
-      ASSERT (ftello (stdin) == -1);
-      return 0;
-    }
-
-  /* mingw ftell is unreliable on text mode input.  */
-  SET_BINARY (0);
-
-  /* Simple tests.  For each test, make sure ftell and ftello agree.  */
-  ASSERT (ftell (stdin) == 0);
-  ASSERT (ftello (stdin) == 0);
-
-  ch = fgetc (stdin);
-  ASSERT (ch == '#');
-  ASSERT (ftell (stdin) == 1);
-  ASSERT (ftello (stdin) == 1);
-
-  /* Test ftell after ungetc of read input.  */
-  ch = ungetc ('#', stdin);
-  ASSERT (ch == '#');
-  ASSERT (ftell (stdin) == 0);
-  ASSERT (ftello (stdin) == 0);
-
-  ch = fgetc (stdin);
-  ASSERT (ch == '#');
-  ASSERT (ftell (stdin) == 1);
-  ASSERT (ftello (stdin) == 1);
-
-  /* Test ftell after fseek.  */
-  ASSERT (fseek (stdin, 2, SEEK_SET) == 0);
-  ASSERT (ftell (stdin) == 2);
-  ASSERT (ftello (stdin) == 2);
-
-  /* Test ftell after random ungetc.  */
-  ch = fgetc (stdin);
-  ASSERT (ch == '/');
-  ch = ungetc ('@', stdin);
-  ASSERT (ch == '@');
-  ASSERT (ftell (stdin) == 2);
-  ASSERT (ftello (stdin) == 2);
-
-  ch = fgetc (stdin);
-  ASSERT (ch == '@');
-  ASSERT (ftell (stdin) == 3);
-  ASSERT (ftello (stdin) == 3);
-
-  if (2 < argc)
-    {
-      if (FUNC_UNGETC_BROKEN)
-        {
-          fputs ("Skipping test: ungetc cannot handle arbitrary bytes\n",
-                 stderr);
-          return 77;
-        }
-      /* Test ftell after ungetc without read.  */
-      ASSERT (fseek (stdin, 0, SEEK_CUR) == 0);
-      ASSERT (ftell (stdin) == 3);
-      ASSERT (ftello (stdin) == 3);
-
-      ch = ungetc ('~', stdin);
-      ASSERT (ch == '~');
-      ASSERT (ftell (stdin) == 2);
-      ASSERT (ftello (stdin) == 2);
-    }
-
-#if !defined __MINT__ /* FreeMiNT has problems seeking past end of file */
-  /* Test ftell beyond end of file.  */
-  ASSERT (fseek (stdin, 0, SEEK_END) == 0);
-  ch = ftello (stdin);
-  ASSERT (fseek (stdin, 10, SEEK_END) == 0);
-  ASSERT (ftell (stdin) == ch + 10);
-  ASSERT (ftello (stdin) == ch + 10);
-#endif
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftello.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftello.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./test-ftello${EXEEXT} 1 < "$srcdir/test-ftello.sh" || exit 1
-echo hi | ./test-ftello${EXEEXT} || exit 1
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ftell.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ftell.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./test-ftell${EXEEXT} 1 < "$srcdir/test-ftell.sh" || exit 1
-echo hi | ./test-ftell${EXEEXT} || exit 1
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-fwrite.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fwrite.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-fwrite.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-fwrite.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/* Test of fwrite() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (fwrite, size_t, (const void *, size_t, size_t, FILE *));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "msvc-inval.h"
-
-#include "macros.h"
-
-int
-main (int argc, char **argv)
-{
-  const char *filename = "test-fwrite.txt";
-
-  /* We don't have an fwrite() function that installs an invalid parameter
-     handler so far.  So install that handler here, explicitly.  */
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-  gl_msvc_inval_ensure_handler ();
-#endif
-
-  /* Test that fwrite() on an unbuffered stream sets errno if someone else
-     closes the stream fd behind the back of stdio.  */
-  {
-    FILE *fp = fopen (filename, "w");
-    char buf[5] = "world";
-    ASSERT (fp != NULL);
-    setvbuf (fp, NULL, _IONBF, 0);
-    ASSERT (close (fileno (fp)) == 0);
-    errno = 0;
-    ASSERT (fwrite (buf, 1, sizeof (buf), fp) == 0);
-    ASSERT (errno == EBADF);
-    ASSERT (ferror (fp));
-    fclose (fp);
-  }
-
-  /* Test that fwrite() on an unbuffered stream sets errno if the stream
-     was constructed with an invalid file descriptor.  */
-  {
-    FILE *fp = fdopen (-1, "w");
-    if (fp != NULL)
-      {
-        char buf[5] = "world";
-        setvbuf (fp, NULL, _IONBF, 0);
-        errno = 0;
-        ASSERT (fwrite (buf, 1, sizeof (buf), fp) == 0);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-  {
-    FILE *fp;
-    close (99);
-    fp = fdopen (99, "w");
-    if (fp != NULL)
-      {
-        char buf[5] = "world";
-        setvbuf (fp, NULL, _IONBF, 0);
-        errno = 0;
-        ASSERT (fwrite (buf, 1, sizeof (buf), fp) == 0);
-        ASSERT (errno == EBADF);
-        ASSERT (ferror (fp));
-        fclose (fp);
-      }
-  }
-
-  /* Clean up.  */
-  unlink (filename);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getcwd-lgpl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getcwd-lgpl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getcwd-lgpl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getcwd-lgpl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/* Test of getcwd() function.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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 <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (getcwd, char *, (char *, size_t));
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "macros.h"
-
-int
-main (int argc, char **argv)
-{
-  char *pwd1;
-  char *pwd2;
-  /* If the user provides an argument, attempt to chdir there first.  */
-  if (1 < argc)
-    {
-      if (chdir (argv[1]) == 0)
-        printf ("changed to directory %s\n", argv[1]);
-    }
-
-  pwd1 = getcwd (NULL, 0);
-  ASSERT (pwd1 && *pwd1);
-  if (1 < argc)
-    printf ("cwd=%s\n", pwd1);
-
-  /* Make sure the result is usable.  */
-  ASSERT (chdir (pwd1) == 0);
-  ASSERT (chdir (".//./.") == 0);
-
-  /* Make sure that result is normalized.  */
-  pwd2 = getcwd (NULL, 0);
-  ASSERT (pwd2);
-  ASSERT (strcmp (pwd1, pwd2) == 0);
-  free (pwd2);
-  {
-    size_t len = strlen (pwd1);
-    ssize_t i = len - 10;
-    if (i < 1)
-      i = 1;
-    pwd2 = getcwd (NULL, len + 1);
-    ASSERT (pwd2);
-    free (pwd2);
-    pwd2 = malloc (len + 2);
-    for ( ; i <= len; i++)
-      {
-        char *tmp;
-        errno = 0;
-        ASSERT (getcwd (pwd2, i) == NULL);
-        ASSERT (errno == ERANGE);
-        /* Allow either glibc or BSD behavior, since POSIX allows both.  */
-        errno = 0;
-        tmp = getcwd (NULL, i);
-        if (tmp)
-          {
-            ASSERT (strcmp (pwd1, tmp) == 0);
-            free (tmp);
-          }
-        else
-          {
-            ASSERT (errno == ERANGE);
-          }
-      }
-    ASSERT (getcwd (pwd2, len + 1) == pwd2);
-    pwd2[len] = '/';
-    pwd2[len + 1] = '\0';
-  }
-  ASSERT (strstr (pwd2, "/./") == NULL);
-  ASSERT (strstr (pwd2, "/../") == NULL);
-  ASSERT (strstr (pwd2 + 1 + (pwd2[1] == '/'), "//") == NULL);
-
-  /* Validate a POSIX requirement on size.  */
-  errno = 0;
-  ASSERT (getcwd(pwd2, 0) == NULL);
-  ASSERT (errno == EINVAL);
-
-  free (pwd1);
-  free (pwd2);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getdelim.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getdelim.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getdelim.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getdelim.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of getdelim() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2007.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getdtablesize.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getdtablesize.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getdtablesize.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getdtablesize.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of getdtablesize() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,8 +29,6 @@
 main (int argc, char *argv[])
 {
   ASSERT (getdtablesize () >= 3);
-  ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
-  ASSERT (dup2 (0, getdtablesize()) == -1);
 
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getline.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getline.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getline.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getline.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of getline() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2007.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getopt.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getopt.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getopt.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getopt.c	2010-03-28 18:32:30.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getopt.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getopt.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getopt.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getopt.h	2010-04-25 09:21:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program 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 glibc/gnulib implementation of getopt supports setting optind =
    0, but not all other implementations do.  This matters for getopt.
    But for getopt_long, we require GNU compatibility.  */
-#if defined __GETOPT_PREFIX || (__GLIBC__ >= 2 && !defined __UCLIBC__)
+#if defined __GETOPT_PREFIX || (__GLIBC__ >= 2)
 # define OPTIND_MIN 0
 #elif HAVE_DECL_OPTRESET
 # define OPTIND_MIN (optreset = 1)
@@ -1187,7 +1187,7 @@
       ASSERT (q_value == NULL);
       ASSERT (non_options_count == 0);
       ASSERT (unrecognized == 0);
-      ASSERT (optind == 1);
+      ASSERT (optind = 1);
       ASSERT (!output);
     }
 #endif /* GNULIB_TEST_GETOPT_GNU */
@@ -1365,27 +1365,5 @@
       ASSERT (optind == 3);
       ASSERT (!output);
     }
-
-  /* Check that 'W' does not dump core:
-     http://sourceware.org/bugzilla/show_bug.cgi?id=12922
-     Technically, POSIX says the presence of ';' in the opt-string
-     gives unspecified behavior, so we only test this when GNU compliance
-     is desired.  */
-  for (start = OPTIND_MIN; start <= 1; start++)
-    {
-      int argc = 0;
-      const char *argv[10];
-      int pos = ftell (stderr);
-
-      argv[argc++] = "program";
-      argv[argc++] = "-W";
-      argv[argc++] = "dummy";
-      argv[argc] = NULL;
-      optind = start;
-      opterr = 1;
-      ASSERT (getopt (argc, (char **) argv, "W;") == 'W');
-      ASSERT (ftell (stderr) == pos);
-      ASSERT (optind == 2);
-    }
 #endif /* GNULIB_TEST_GETOPT_GNU */
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-getopt_long.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getopt_long.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-getopt_long.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-getopt_long.h	2010-04-25 09:21:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -314,25 +314,6 @@
       }
   }
 
-  /* Test that 'W' does not dump core:
-     http://sourceware.org/bugzilla/show_bug.cgi?id=12922  */
-  {
-    int argc = 0;
-    const char *argv[10];
-    int option_index;
-    int c;
-
-    argv[argc++] = "program";
-    argv[argc++] = "-W";
-    argv[argc++] = "dummy";
-    argv[argc] = NULL;
-    optind = 1;
-    opterr = 0;
-    c = do_getopt_long (argc, argv, "W;", NULL, &option_index);
-    ASSERT (c == 'W');
-    ASSERT (optind == 2);
-  }
-
   /* Test processing of boolean short options.  */
   for (start = 0; start <= 1; start++)
     {
@@ -1766,7 +1747,7 @@
       ASSERT (q_value == NULL);
       ASSERT (non_options_count == 0);
       ASSERT (unrecognized == 0);
-      ASSERT (optind == 1);
+      ASSERT (optind = 1);
     }
 
   /* Check that the '+' flag has to come first.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-gettimeofday.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-gettimeofday.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-gettimeofday.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-gettimeofday.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
  * Written by Jim Meyering.
  *
  * This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-iconv.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-iconv.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-iconv.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-iconv.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-iconv-h.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-iconv-h.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-iconv-h.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-iconv-h.c	2010-03-28 18:32:30.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <iconv.h> substitute.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,6 +18,10 @@
 
 #if HAVE_ICONV
 # include <iconv.h>
+
+# ifndef ICONV_CONST
+#  define ICONV_CONST /* empty */
+# endif
 #endif
 
 int
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-ignore-value.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ignore-value.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-ignore-value.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-ignore-value.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/* Test the "ignore-value" module.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Eric Blake.  */
-
-#include <config.h>
-
-#include "ignore-value.h"
-
-#include <stdio.h>
-
-#ifndef _GL_ATTRIBUTE_RETURN_CHECK
-# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
-#  define _GL_ATTRIBUTE_RETURN_CHECK
-# else
-#  define _GL_ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__))
-# endif
-#endif
-
-struct s { int i; };
-static char doChar (void) _GL_ATTRIBUTE_RETURN_CHECK;
-static int doInt (void) _GL_ATTRIBUTE_RETURN_CHECK;
-static off_t doOff (void) _GL_ATTRIBUTE_RETURN_CHECK;
-static void *doPtr (void) _GL_ATTRIBUTE_RETURN_CHECK;
-static struct s doStruct (void) _GL_ATTRIBUTE_RETURN_CHECK;
-
-static char
-doChar (void)
-{
-  return 0;
-}
-
-static int
-doInt (void)
-{
-  return 0;
-}
-
-static off_t
-doOff (void)
-{
-  return 0;
-}
-
-static void *
-doPtr (void)
-{
-  return NULL;
-}
-
-static struct s
-doStruct (void)
-{
-  static struct s s1;
-  return s1;
-}
-
-int
-main (void)
-{
-  /* If this test can compile with -Werror and the same warnings as
-     the rest of the project, then we are properly silencing warnings
-     about ignored return values.  */
-  ignore_value (doChar ());
-  ignore_value (doInt ());
-  ignore_value (doOff ());
-  ignore_value (doPtr ());
-  ignore_value (doStruct ());
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-init.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-init.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-init.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-init.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#!/bin/sh
-# Unit tests for init.sh
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-# This file is part of the GNUlib Library.
-#
-# This 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/>.  */
-
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ .
-
-fail=0
-
-test_compare()
-{
-  touch empty || fail=1
-  echo xyz > in || fail=1
-
-  compare /dev/null /dev/null >out 2>err || fail=1
-  test -s out && fail_ "out not empty: $(cat out)"
-  # "err" should be empty, too, but has "set -x" output when VERBOSE=yes
-  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
-
-  compare /dev/null empty >out 2>err || fail=1
-  test -s out && fail_ "out not empty: $(cat out)"
-  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
-
-  compare in in >out 2>err || fail=1
-  test -s out && fail_ "out not empty: $(cat out)"
-  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
-
-  compare /dev/null in >out 2>err && fail=1
-  cat <<\EOF > exp
-diff -u /dev/null in
---- /dev/null	1970-01-01
-+++ in	1970-01-01
-+xyz
-EOF
-  compare exp out || fail=1
-  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
-
-  compare empty in >out 2>err && fail=1
-  # Compare against expected output only if compare is using diff -u.
-  if grep @ out >/dev/null; then
-    # Remove the TAB-date suffix on each --- and +++ line,
-    # for both the expected and the actual output files.
-    # Also remove the @@ line, since Solaris 5.10 and GNU diff formats differ:
-    # -@@ -0,0 +1 @@
-    # +@@ -1,0 +1,1 @@
-    sed 's/	.*//;/^@@/d' out > k && mv k out
-    cat <<\EOF > exp
---- empty
-+++ in
-+xyz
-EOF
-    compare exp out || fail=1
-  fi
-  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
-}
-
-test_compare
-
-Exit $fail
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-intprops.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-intprops.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-intprops.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-intprops.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-/* Test intprops.h.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert.  */
-
-/* Tell gcc not to warn about the many (X < 0) expressions that
-   the overflow macros expand to.  */
-#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
-# pragma GCC diagnostic ignored "-Wtype-limits"
-#endif
-
-#include <config.h>
-
-#include "intprops.h"
-#include "verify.h"
-
-#include <stdbool.h>
-#include <inttypes.h>
-
-#include "macros.h"
-
-/* VERIFY (X) uses a static assertion for compilers that are known to work,
-   and falls back on a dynamic assertion for other compilers.
-   These tests should be checkable via 'verify' rather than 'ASSERT', but
-   using 'verify' would run into a bug with HP-UX 11.23 cc; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>.  */
-#if __GNUC__ || __SUNPRO_C
-# define VERIFY(x) do { verify (x); } while (0)
-#else
-# define VERIFY(x) ASSERT (x)
-#endif
-
-int
-main (void)
-{
-  /* Use VERIFY for tests that must be integer constant expressions,
-     ASSERT otherwise.  */
-
-  /* TYPE_IS_INTEGER.  */
-  ASSERT (TYPE_IS_INTEGER (bool));
-  ASSERT (TYPE_IS_INTEGER (char));
-  ASSERT (TYPE_IS_INTEGER (signed char));
-  ASSERT (TYPE_IS_INTEGER (unsigned char));
-  ASSERT (TYPE_IS_INTEGER (short int));
-  ASSERT (TYPE_IS_INTEGER (unsigned short int));
-  ASSERT (TYPE_IS_INTEGER (int));
-  ASSERT (TYPE_IS_INTEGER (unsigned int));
-  ASSERT (TYPE_IS_INTEGER (long int));
-  ASSERT (TYPE_IS_INTEGER (unsigned long int));
-  ASSERT (TYPE_IS_INTEGER (intmax_t));
-  ASSERT (TYPE_IS_INTEGER (uintmax_t));
-  ASSERT (! TYPE_IS_INTEGER (float));
-  ASSERT (! TYPE_IS_INTEGER (double));
-  ASSERT (! TYPE_IS_INTEGER (long double));
-
-  /* TYPE_SIGNED.  */
-  /* VERIFY (! TYPE_SIGNED (bool)); // not guaranteed by gnulib substitute */
-  VERIFY (TYPE_SIGNED (signed char));
-  VERIFY (! TYPE_SIGNED (unsigned char));
-  VERIFY (TYPE_SIGNED (short int));
-  VERIFY (! TYPE_SIGNED (unsigned short int));
-  VERIFY (TYPE_SIGNED (int));
-  VERIFY (! TYPE_SIGNED (unsigned int));
-  VERIFY (TYPE_SIGNED (long int));
-  VERIFY (! TYPE_SIGNED (unsigned long int));
-  VERIFY (TYPE_SIGNED (intmax_t));
-  VERIFY (! TYPE_SIGNED (uintmax_t));
-  ASSERT (TYPE_SIGNED (float));
-  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))));
-
-  /* TYPE_MINIMUM, TYPE_MAXIMUM.  */
-  VERIFY (TYPE_MINIMUM (char) == CHAR_MIN);
-  VERIFY (TYPE_MAXIMUM (char) == CHAR_MAX);
-  VERIFY (TYPE_MINIMUM (unsigned char) == 0);
-  VERIFY (TYPE_MAXIMUM (unsigned char) == UCHAR_MAX);
-  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 (unsigned short int) == 0);
-  VERIFY (TYPE_MAXIMUM (unsigned short int) == USHRT_MAX);
-  VERIFY (TYPE_MINIMUM (int) == INT_MIN);
-  VERIFY (TYPE_MAXIMUM (int) == INT_MAX);
-  VERIFY (TYPE_MINIMUM (unsigned int) == 0);
-  VERIFY (TYPE_MAXIMUM (unsigned int) == UINT_MAX);
-  VERIFY (TYPE_MINIMUM (long int) == LONG_MIN);
-  VERIFY (TYPE_MAXIMUM (long int) == LONG_MAX);
-  VERIFY (TYPE_MINIMUM (unsigned long int) == 0);
-  VERIFY (TYPE_MAXIMUM (unsigned long int) == ULONG_MAX);
-  VERIFY (TYPE_MINIMUM (intmax_t) == INTMAX_MIN);
-  VERIFY (TYPE_MAXIMUM (intmax_t) == INTMAX_MAX);
-  VERIFY (TYPE_MINIMUM (uintmax_t) == 0);
-  VERIFY (TYPE_MAXIMUM (uintmax_t) == UINTMAX_MAX);
-
-  /* INT_BITS_STRLEN_BOUND.  */
-  VERIFY (INT_BITS_STRLEN_BOUND (1) == 1);
-  VERIFY (INT_BITS_STRLEN_BOUND (2620) == 789);
-
-  /* INT_STRLEN_BOUND, INT_BUFSIZE_BOUND.  */
-  #ifdef INT32_MAX /* POSIX guarantees int32_t; this ports to non-POSIX.  */
-  VERIFY (INT_STRLEN_BOUND (int32_t) == sizeof ("-2147483648") - 1);
-  VERIFY (INT_BUFSIZE_BOUND (int32_t) == sizeof ("-2147483648"));
-  #endif
-  #ifdef INT64_MAX
-  VERIFY (INT_STRLEN_BOUND (int64_t) == sizeof ("-9223372036854775808") - 1);
-  VERIFY (INT_BUFSIZE_BOUND (int64_t) == sizeof ("-9223372036854775808"));
-  #endif
-
-  /* All the INT_<op>_RANGE_OVERFLOW tests are equally valid as
-     INT_<op>_OVERFLOW tests, so define a single macro to do both.  */
-  #define CHECK_BINOP(op, a, b, min, max, overflow)                      \
-    (INT_##op##_RANGE_OVERFLOW (a, b, min, max) == (overflow)            \
-     && INT_##op##_OVERFLOW (a, b) == (overflow))
-  #define CHECK_UNOP(op, a, min, max, overflow)                          \
-    (INT_##op##_RANGE_OVERFLOW (a, min, max) == (overflow)               \
-     && INT_##op##_OVERFLOW (a) == (overflow))
-
-  /* INT_<op>_RANGE_OVERFLOW, INT_<op>_OVERFLOW.  */
-  VERIFY (INT_ADD_RANGE_OVERFLOW (INT_MAX, 1, INT_MIN, INT_MAX));
-  VERIFY (INT_ADD_OVERFLOW (INT_MAX, 1));
-  VERIFY (CHECK_BINOP (ADD, INT_MAX, 1, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (ADD, INT_MAX, -1, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_BINOP (ADD, INT_MIN, 1, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_BINOP (ADD, INT_MIN, -1, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (ADD, UINT_MAX, 1u, 0u, UINT_MAX, true));
-  VERIFY (CHECK_BINOP (ADD, 0u, 1u, 0u, UINT_MAX, false));
-
-  VERIFY (CHECK_BINOP (SUBTRACT, INT_MAX, 1, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_BINOP (SUBTRACT, INT_MAX, -1, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (SUBTRACT, INT_MIN, 1, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (SUBTRACT, INT_MIN, -1, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_BINOP (SUBTRACT, UINT_MAX, 1u, 0u, UINT_MAX, false));
-  VERIFY (CHECK_BINOP (SUBTRACT, 0u, 1u, 0u, UINT_MAX, true));
-
-  VERIFY (CHECK_UNOP (NEGATE, INT_MIN, INT_MIN, INT_MAX,
-                      TYPE_TWOS_COMPLEMENT (int)));
-  VERIFY (CHECK_UNOP (NEGATE, 0, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_UNOP (NEGATE, INT_MAX, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_UNOP (NEGATE, 0u, 0u, UINT_MAX, false));
-  VERIFY (CHECK_UNOP (NEGATE, 1u, 0u, UINT_MAX, true));
-  VERIFY (CHECK_UNOP (NEGATE, UINT_MAX, 0u, UINT_MAX, true));
-
-  VERIFY (CHECK_BINOP (MULTIPLY, INT_MAX, INT_MAX, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (MULTIPLY, INT_MAX, INT_MIN, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (MULTIPLY, INT_MIN, INT_MAX, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (MULTIPLY, INT_MIN, INT_MIN, INT_MIN, INT_MAX, true));
-  VERIFY (CHECK_BINOP (MULTIPLY, -1, INT_MIN, INT_MIN, INT_MAX,
-                       INT_NEGATE_OVERFLOW (INT_MIN)));
-  VERIFY (CHECK_BINOP (MULTIPLY, LONG_MIN / INT_MAX, (long int) INT_MAX,
-                       LONG_MIN, LONG_MIN, false));
-
-  VERIFY (CHECK_BINOP (DIVIDE, INT_MIN, -1, INT_MIN, INT_MAX,
-                       INT_NEGATE_OVERFLOW (INT_MIN)));
-  VERIFY (CHECK_BINOP (DIVIDE, INT_MAX, 1, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_BINOP (DIVIDE, (unsigned int) INT_MIN,
-                       -1u, 0u, UINT_MAX, false));
-
-  VERIFY (CHECK_BINOP (REMAINDER, INT_MIN, -1, INT_MIN, INT_MAX,
-                       INT_NEGATE_OVERFLOW (INT_MIN)));
-  VERIFY (CHECK_BINOP (REMAINDER, INT_MAX, 1, INT_MIN, INT_MAX, false));
-  VERIFY (CHECK_BINOP (REMAINDER, (unsigned int) INT_MIN,
-                       -1u, 0u, UINT_MAX, false));
-
-  VERIFY (CHECK_BINOP (LEFT_SHIFT, UINT_MAX, 1, 0u, UINT_MAX, true));
-  VERIFY (CHECK_BINOP (LEFT_SHIFT, UINT_MAX / 2 + 1, 1, 0u, UINT_MAX, true));
-  VERIFY (CHECK_BINOP (LEFT_SHIFT, UINT_MAX / 2, 1, 0u, UINT_MAX, false));
-
-  /* INT_<op>_OVERFLOW with mixed types.  */
-  #define CHECK_SUM(a, b, overflow)                       \
-    VERIFY (INT_ADD_OVERFLOW (a, b) == (overflow));       \
-    VERIFY (INT_ADD_OVERFLOW (b, a) == (overflow))
-  CHECK_SUM (-1, LONG_MIN, true);
-  CHECK_SUM (-1, UINT_MAX, false);
-  CHECK_SUM (-1L, INT_MIN, INT_MIN == LONG_MIN);
-  CHECK_SUM (0u, -1, true);
-  CHECK_SUM (0u, 0, false);
-  CHECK_SUM (0u, 1, false);
-  CHECK_SUM (1, LONG_MAX, true);
-  CHECK_SUM (1, UINT_MAX, true);
-  CHECK_SUM (1L, INT_MAX, INT_MAX == LONG_MAX);
-  CHECK_SUM (1u, INT_MAX, INT_MAX == UINT_MAX);
-  CHECK_SUM (1u, INT_MIN, true);
-
-  VERIFY (! INT_SUBTRACT_OVERFLOW (INT_MAX, 1u));
-  VERIFY (! INT_SUBTRACT_OVERFLOW (UINT_MAX, 1));
-  VERIFY (! INT_SUBTRACT_OVERFLOW (0u, -1));
-  VERIFY (INT_SUBTRACT_OVERFLOW (UINT_MAX, -1));
-  VERIFY (INT_SUBTRACT_OVERFLOW (INT_MIN, 1u));
-  VERIFY (INT_SUBTRACT_OVERFLOW (-1, 0u));
-
-  #define CHECK_PRODUCT(a, b, overflow)                   \
-    VERIFY (INT_MULTIPLY_OVERFLOW (a, b) == (overflow));   \
-    VERIFY (INT_MULTIPLY_OVERFLOW (b, a) == (overflow))
-
-  CHECK_PRODUCT (-1, 1u, true);
-  CHECK_PRODUCT (-1, INT_MIN, INT_NEGATE_OVERFLOW (INT_MIN));
-  CHECK_PRODUCT (-1, UINT_MAX, true);
-  CHECK_PRODUCT (-12345, LONG_MAX / -12345 - 1, true);
-  CHECK_PRODUCT (-12345, LONG_MAX / -12345, false);
-  CHECK_PRODUCT (0, -1, false);
-  CHECK_PRODUCT (0, 0, false);
-  CHECK_PRODUCT (0, 0u, false);
-  CHECK_PRODUCT (0, 1, false);
-  CHECK_PRODUCT (0, INT_MAX, false);
-  CHECK_PRODUCT (0, INT_MIN, false);
-  CHECK_PRODUCT (0, UINT_MAX, false);
-  CHECK_PRODUCT (0u, -1, false);
-  CHECK_PRODUCT (0u, 0, false);
-  CHECK_PRODUCT (0u, 0u, false);
-  CHECK_PRODUCT (0u, 1, false);
-  CHECK_PRODUCT (0u, INT_MAX, false);
-  CHECK_PRODUCT (0u, INT_MIN, false);
-  CHECK_PRODUCT (0u, UINT_MAX, false);
-  CHECK_PRODUCT (1, INT_MAX, false);
-  CHECK_PRODUCT (1, INT_MIN, false);
-  CHECK_PRODUCT (1, UINT_MAX, false);
-  CHECK_PRODUCT (1u, INT_MIN, true);
-  CHECK_PRODUCT (1u, INT_MAX, UINT_MAX < INT_MAX);
-  CHECK_PRODUCT (INT_MAX, UINT_MAX, true);
-  CHECK_PRODUCT (INT_MAX, ULONG_MAX, true);
-  CHECK_PRODUCT (INT_MIN, LONG_MAX / INT_MIN - 1, true);
-  CHECK_PRODUCT (INT_MIN, LONG_MAX / INT_MIN, false);
-  CHECK_PRODUCT (INT_MIN, UINT_MAX, true);
-  CHECK_PRODUCT (INT_MIN, ULONG_MAX, true);
-
-  VERIFY (INT_DIVIDE_OVERFLOW (INT_MIN, -1L)
-          == (TYPE_TWOS_COMPLEMENT (long int) && INT_MIN == LONG_MIN));
-  VERIFY (! INT_DIVIDE_OVERFLOW (INT_MIN, UINT_MAX));
-  VERIFY (! INT_DIVIDE_OVERFLOW (INTMAX_MIN, UINTMAX_MAX));
-  VERIFY (! INT_DIVIDE_OVERFLOW (INTMAX_MIN, UINT_MAX));
-  VERIFY (INT_DIVIDE_OVERFLOW (-11, 10u));
-  VERIFY (INT_DIVIDE_OVERFLOW (-10, 10u));
-  VERIFY (! INT_DIVIDE_OVERFLOW (-9, 10u));
-  VERIFY (INT_DIVIDE_OVERFLOW (11u, -10));
-  VERIFY (INT_DIVIDE_OVERFLOW (10u, -10));
-  VERIFY (! INT_DIVIDE_OVERFLOW (9u, -10));
-
-  VERIFY (INT_REMAINDER_OVERFLOW (INT_MIN, -1L)
-          == (TYPE_TWOS_COMPLEMENT (long int) && INT_MIN == LONG_MIN));
-  VERIFY (INT_REMAINDER_OVERFLOW (-1, UINT_MAX));
-  VERIFY (INT_REMAINDER_OVERFLOW ((intmax_t) -1, UINTMAX_MAX));
-  VERIFY (INT_REMAINDER_OVERFLOW (INTMAX_MIN, UINT_MAX)
-          == (INTMAX_MAX < UINT_MAX
-              && - (unsigned int) INTMAX_MIN % UINT_MAX != 0));
-  VERIFY (INT_REMAINDER_OVERFLOW (INT_MIN, ULONG_MAX)
-          == (INT_MIN % ULONG_MAX != 1));
-  VERIFY (! INT_REMAINDER_OVERFLOW (1u, -1));
-  VERIFY (! INT_REMAINDER_OVERFLOW (37*39u, -39));
-  VERIFY (INT_REMAINDER_OVERFLOW (37*39u + 1, -39));
-  VERIFY (INT_REMAINDER_OVERFLOW (37*39u - 1, -39));
-  VERIFY (! INT_REMAINDER_OVERFLOW (LONG_MAX, -INT_MAX));
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-inttypes.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-inttypes.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-inttypes.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-inttypes.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
-
-#include <config.h>
-
-#include <inttypes.h>
-
-#include <stddef.h>
-
-/* Tests for macros supposed to be defined in inttypes.h.  */
-
-const char *k = /* implicit string concatenation */
-#ifdef INT8_MAX
-  PRId8 PRIi8
-#endif
-#ifdef UINT8_MAX
-  PRIo8 PRIu8 PRIx8 PRIX8
-#endif
-#ifdef INT16_MAX
-  PRId16 PRIi16
-#endif
-#ifdef UINT16_MAX
-  PRIo16 PRIu16 PRIx16 PRIX16
-#endif
-#ifdef INT32_MAX
-  PRId32 PRIi32
-#endif
-#ifdef UINT32_MAX
-  PRIo32 PRIu32 PRIx32 PRIX32
-#endif
-#ifdef INT64_MAX
-  PRId64 PRIi64
-#endif
-#ifdef UINT64_MAX
-  PRIo64 PRIu64 PRIx64 PRIX64
-#endif
-  PRIdLEAST8 PRIiLEAST8 PRIoLEAST8 PRIuLEAST8 PRIxLEAST8 PRIXLEAST8
-  PRIdLEAST16 PRIiLEAST16 PRIoLEAST16 PRIuLEAST16 PRIxLEAST16 PRIXLEAST16
-  PRIdLEAST32 PRIiLEAST32 PRIoLEAST32 PRIuLEAST32 PRIxLEAST32 PRIXLEAST32
-  PRIdLEAST64 PRIiLEAST64
-  PRIoLEAST64 PRIuLEAST64 PRIxLEAST64 PRIXLEAST64
-  PRIdFAST8 PRIiFAST8 PRIoFAST8 PRIuFAST8 PRIxFAST8 PRIXFAST8
-  PRIdFAST16 PRIiFAST16 PRIoFAST16 PRIuFAST16 PRIxFAST16 PRIXFAST16
-  PRIdFAST32 PRIiFAST32 PRIoFAST32 PRIuFAST32 PRIxFAST32 PRIXFAST32
-  PRIdFAST64 PRIiFAST64
-  PRIoFAST64 PRIuFAST64 PRIxFAST64 PRIXFAST64
-  PRIdMAX PRIiMAX PRIoMAX PRIuMAX PRIxMAX PRIXMAX
-#ifdef INTPTR_MAX
-  PRIdPTR PRIiPTR
-#endif
-#ifdef UINTPTR_MAX
-  PRIoPTR PRIuPTR PRIxPTR PRIXPTR
-#endif
-  ;
-const char *l = /* implicit string concatenation */
-#ifdef INT8_MAX
-  SCNd8 SCNi8
-#endif
-#ifdef UINT8_MAX
-  SCNo8 SCNu8 SCNx8
-#endif
-#ifdef INT16_MAX
-  SCNd16 SCNi16
-#endif
-#ifdef UINT16_MAX
-  SCNo16 SCNu16 SCNx16
-#endif
-#ifdef INT32_MAX
-  SCNd32 SCNi32
-#endif
-#ifdef UINT32_MAX
-  SCNo32 SCNu32 SCNx32
-#endif
-#ifdef INT64_MAX
-  SCNd64 SCNi64
-#endif
-#ifdef UINT64_MAX
-  SCNo64 SCNu64 SCNx64
-#endif
-  SCNdLEAST8 SCNiLEAST8 SCNoLEAST8 SCNuLEAST8 SCNxLEAST8
-  SCNdLEAST16 SCNiLEAST16 SCNoLEAST16 SCNuLEAST16 SCNxLEAST16
-  SCNdLEAST32 SCNiLEAST32 SCNoLEAST32 SCNuLEAST32 SCNxLEAST32
-  SCNdLEAST64 SCNiLEAST64
-  SCNoLEAST64 SCNuLEAST64 SCNxLEAST64
-  SCNdFAST8 SCNiFAST8 SCNoFAST8 SCNuFAST8 SCNxFAST8
-  SCNdFAST16 SCNiFAST16 SCNoFAST16 SCNuFAST16 SCNxFAST16
-  SCNdFAST32 SCNiFAST32 SCNoFAST32 SCNuFAST32 SCNxFAST32
-  SCNdFAST64 SCNiFAST64
-  SCNoFAST64 SCNuFAST64 SCNxFAST64
-  SCNdMAX SCNiMAX SCNoMAX SCNuMAX SCNxMAX
-#ifdef INTPTR_MAX
-  SCNdPTR SCNiPTR
-#endif
-#ifdef UINTPTR_MAX
-  SCNoPTR SCNuPTR SCNxPTR
-#endif
-  ;
-
-int
-main (void)
-{
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-iswblank.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-iswblank.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-iswblank.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-iswblank.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* Test of iswblank() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 <wctype.h>
-
-#include "macros.h"
-
-/* Check that WEOF is defined.  */
-wint_t e = WEOF;
-
-int
-main (void)
-{
-  /* Check that the function exist as a function or as a macro.  */
-  (void) iswblank (0);
-  /* Check that the isw* functions map WEOF to 0.  */
-  ASSERT (!iswblank (e));
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-linkedhash_list.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-linkedhash_list.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-linkedhash_list.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-linkedhash_list.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-locale.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-locale.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-locale.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-locale.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <locale.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,10 +38,6 @@
 locale_t b = LC_GLOBAL_LOCALE;
 #endif
 
-/* Check that the 'struct lconv' type is defined.  */
-struct lconv l;
-int ls;
-
 /* Check that NULL can be passed through varargs as a pointer type,
    per POSIX 2008.  */
 verify (sizeof NULL == sizeof (void *));
@@ -49,31 +45,5 @@
 int
 main ()
 {
-  /* Check that 'struct lconv' has the ISO C and POSIX specified members.  */
-  ls += sizeof (*l.decimal_point);
-  ls += sizeof (*l.thousands_sep);
-  ls += sizeof (*l.grouping);
-  ls += sizeof (*l.mon_decimal_point);
-  ls += sizeof (*l.mon_thousands_sep);
-  ls += sizeof (*l.mon_grouping);
-  ls += sizeof (*l.positive_sign);
-  ls += sizeof (*l.negative_sign);
-  ls += sizeof (*l.currency_symbol);
-  ls += sizeof (l.frac_digits);
-  ls += sizeof (l.p_cs_precedes);
-  ls += sizeof (l.p_sign_posn);
-  ls += sizeof (l.p_sep_by_space);
-  ls += sizeof (l.n_cs_precedes);
-  ls += sizeof (l.n_sign_posn);
-  ls += sizeof (l.n_sep_by_space);
-  ls += sizeof (*l.int_curr_symbol);
-  ls += sizeof (l.int_frac_digits);
-  ls += sizeof (l.int_p_cs_precedes);
-  ls += sizeof (l.int_p_sign_posn);
-  ls += sizeof (l.int_p_sep_by_space);
-  ls += sizeof (l.int_n_cs_precedes);
-  ls += sizeof (l.int_n_sign_posn);
-  ls += sizeof (l.int_n_sep_by_space);
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-localename.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-localename.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-localename.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-localename.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of gl_locale_name function and its variants.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -715,7 +715,7 @@
 
   ASSERT (name != NULL);
 
-  /* Only Mac OS X and Windows have a facility for the user to set the default
+  /* Only MacOS X and Windows have a facility for the user to set the default
      locale.  */
 #if !((defined __APPLE__ && defined __MACH__) || (defined _WIN32 || defined __WIN32__ || defined __CYGWIN__))
   ASSERT (strcmp (name, "C") == 0);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-lock.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lock.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-lock.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lock.c	2010-03-28 18:32:31.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
+#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
 
 #if USE_POSIX_THREADS
 # define TEST_POSIX_THREADS 1
@@ -29,8 +29,8 @@
 #if USE_PTH_THREADS
 # define TEST_PTH_THREADS 1
 #endif
-#if USE_WINDOWS_THREADS
-# define TEST_WINDOWS_THREADS 1
+#if USE_WIN32_THREADS
+# define TEST_WIN32_THREADS 1
 #endif
 
 /* Whether to enable locking.
@@ -69,7 +69,7 @@
 # undef USE_POSIX_THREADS
 # undef USE_SOLARIS_THREADS
 # undef USE_PTH_THREADS
-# undef USE_WINDOWS_THREADS
+# undef USE_WIN32_THREADS
 #endif
 #include "glthread/lock.h"
 
@@ -83,8 +83,8 @@
 # if TEST_PTH_THREADS
 #  define USE_PTH_THREADS 1
 # endif
-# if TEST_WINDOWS_THREADS
-#  define USE_WINDOWS_THREADS 1
+# if TEST_WIN32_THREADS
+#  define USE_WIN32_THREADS 1
 # endif
 #endif
 
@@ -143,9 +143,9 @@
     {
       int i1, i2, value;
 
-      dbgprintf ("Mutator %p before lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before lock\n", gl_thread_self ());
       gl_lock_lock (my_lock);
-      dbgprintf ("Mutator %p after  lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  lock\n", gl_thread_self ());
 
       i1 = random_account ();
       i2 = random_account ();
@@ -153,20 +153,20 @@
       account[i1] += value;
       account[i2] -= value;
 
-      dbgprintf ("Mutator %p before unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before unlock\n", gl_thread_self ());
       gl_lock_unlock (my_lock);
-      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self ());
 
-      dbgprintf ("Mutator %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before check lock\n", gl_thread_self ());
       gl_lock_lock (my_lock);
       check_accounts ();
       gl_lock_unlock (my_lock);
-      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Mutator %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -177,16 +177,16 @@
 {
   while (!lock_checker_done)
     {
-      dbgprintf ("Checker %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p before check lock\n", gl_thread_self ());
       gl_lock_lock (my_lock);
       check_accounts ();
       gl_lock_unlock (my_lock);
-      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Checker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Checker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -233,9 +233,9 @@
     {
       int i1, i2, value;
 
-      dbgprintf ("Mutator %p before wrlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before wrlock\n", gl_thread_self ());
       gl_rwlock_wrlock (my_rwlock);
-      dbgprintf ("Mutator %p after  wrlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  wrlock\n", gl_thread_self ());
 
       i1 = random_account ();
       i2 = random_account ();
@@ -243,14 +243,14 @@
       account[i1] += value;
       account[i2] -= value;
 
-      dbgprintf ("Mutator %p before unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before unlock\n", gl_thread_self ());
       gl_rwlock_unlock (my_rwlock);
-      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Mutator %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -261,16 +261,16 @@
 {
   while (!rwlock_checker_done)
     {
-      dbgprintf ("Checker %p before check rdlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p before check rdlock\n", gl_thread_self ());
       gl_rwlock_rdlock (my_rwlock);
       check_accounts ();
       gl_rwlock_unlock (my_rwlock);
-      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Checker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Checker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -315,9 +315,9 @@
 {
   int i1, i2, value;
 
-  dbgprintf ("Mutator %p before lock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p before lock\n", gl_thread_self ());
   gl_recursive_lock_lock (my_reclock);
-  dbgprintf ("Mutator %p after  lock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p after  lock\n", gl_thread_self ());
 
   i1 = random_account ();
   i2 = random_account ();
@@ -329,9 +329,9 @@
   if (((unsigned int) rand () >> 3) % 2)
     recshuffle ();
 
-  dbgprintf ("Mutator %p before unlock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p before unlock\n", gl_thread_self ());
   gl_recursive_lock_unlock (my_reclock);
-  dbgprintf ("Mutator %p after  unlock\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p after  unlock\n", gl_thread_self ());
 }
 
 static void *
@@ -343,16 +343,16 @@
     {
       recshuffle ();
 
-      dbgprintf ("Mutator %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p before check lock\n", gl_thread_self ());
       gl_recursive_lock_lock (my_reclock);
       check_accounts ();
       gl_recursive_lock_unlock (my_reclock);
-      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Mutator %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Mutator %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Mutator %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -363,16 +363,16 @@
 {
   while (!reclock_checker_done)
     {
-      dbgprintf ("Checker %p before check lock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p before check lock\n", gl_thread_self ());
       gl_recursive_lock_lock (my_reclock);
       check_accounts ();
       gl_recursive_lock_unlock (my_reclock);
-      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self_pointer ());
+      dbgprintf ("Checker %p after  check unlock\n", gl_thread_self ());
 
       yield ();
     }
 
-  dbgprintf ("Checker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Checker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
@@ -444,7 +444,7 @@
         break;
 
       dbgprintf ("Contender %p waiting for signal for round %d\n",
-                 gl_thread_self_pointer (), repeat);
+                 gl_thread_self (), repeat);
 #if ENABLE_LOCKING
       /* Wait for the signal to go.  */
       gl_rwlock_rdlock (fire_signal[repeat]);
@@ -456,7 +456,7 @@
         yield ();
 #endif
       dbgprintf ("Contender %p got the     signal for round %d\n",
-                 gl_thread_self_pointer (), repeat);
+                 gl_thread_self (), repeat);
 
       /* Contend for execution.  */
       gl_once (once_control, once_execute);
@@ -495,7 +495,7 @@
   for (repeat = 0; repeat <= REPEAT_COUNT; repeat++)
     {
       /* Wait until every thread is ready.  */
-      dbgprintf ("Main thread before synchronizing for round %d\n", repeat);
+      dbgprintf ("Main thread before synchonizing for round %d\n", repeat);
       for (;;)
         {
           int ready_count = 0;
@@ -509,7 +509,7 @@
             break;
           yield ();
         }
-      dbgprintf ("Main thread after  synchronizing for round %d\n", repeat);
+      dbgprintf ("Main thread after  synchonizing for round %d\n", repeat);
 
       if (repeat > 0)
         {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-lseek.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lseek.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-lseek.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lseek.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-/* Test of lseek() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Eric Blake, 2007.  */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (lseek, off_t, (int, off_t, int));
-
-#include <errno.h>
-
-#include "macros.h"
-
-/* ARGC must be 2; *ARGV[1] is '0' if stdin and stdout are files, '1'
-   if they are pipes, and '2' if they are closed.  Check for proper
-   semantics of lseek.  */
-int
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    return 2;
-  switch (*argv[1])
-    {
-    case '0': /* regular files */
-      ASSERT (lseek (0, (off_t)2, SEEK_SET) == 2);
-      ASSERT (lseek (0, (off_t)-4, SEEK_CUR) == -1);
-      ASSERT (errno == EINVAL);
-      errno = 0;
-#if ! defined __BEOS__
-      /* POSIX says that the last lseek call, when failing, does not change
-         the current offset.  But BeOS sets it to 0.  */
-      ASSERT (lseek (0, (off_t)0, SEEK_CUR) == 2);
-#endif
-#if 0 /* leads to SIGSYS on IRIX 6.5 */
-      ASSERT (lseek (0, (off_t)0, (SEEK_SET | SEEK_CUR | SEEK_END) + 1) == -1);
-      ASSERT (errno == EINVAL);
-#endif
-      ASSERT (lseek (1, (off_t)2, SEEK_SET) == 2);
-      errno = 0;
-      ASSERT (lseek (1, (off_t)-4, SEEK_CUR) == -1);
-      ASSERT (errno == EINVAL);
-      errno = 0;
-#if ! defined __BEOS__
-      /* POSIX says that the last lseek call, when failing, does not change
-         the current offset.  But BeOS sets it to 0.  */
-      ASSERT (lseek (1, (off_t)0, SEEK_CUR) == 2);
-#endif
-#if 0 /* leads to SIGSYS on IRIX 6.5 */
-      ASSERT (lseek (1, (off_t)0, (SEEK_SET | SEEK_CUR | SEEK_END) + 1) == -1);
-      ASSERT (errno == EINVAL);
-#endif
-      break;
-
-    case '1': /* pipes */
-      errno = 0;
-      ASSERT (lseek (0, (off_t)0, SEEK_CUR) == -1);
-      ASSERT (errno == ESPIPE);
-      errno = 0;
-      ASSERT (lseek (1, (off_t)0, SEEK_CUR) == -1);
-      ASSERT (errno == ESPIPE);
-      break;
-
-    case '2': /* closed */
-      /* Explicitly close file descriptors 0 and 1.  The <&- and >&- in the
-         invoking shell are not enough on HP-UX.  */
-      close (0);
-      close (1);
-
-      errno = 0;
-      ASSERT (lseek (0, (off_t)0, SEEK_CUR) == -1);
-      ASSERT (errno == EBADF);
-
-      errno = 0;
-      ASSERT (lseek (1, (off_t)0, SEEK_CUR) == -1);
-      ASSERT (errno == EBADF);
-
-      /* Test behaviour for invalid file descriptors.  */
-      errno = 0;
-      ASSERT (lseek (-1, (off_t)0, SEEK_CUR) == -1);
-      ASSERT (errno == EBADF);
-
-      close (99);
-      errno = 0;
-      ASSERT (lseek (99, (off_t)0, SEEK_CUR) == -1);
-      ASSERT (errno == EBADF);
-
-      break;
-
-    default:
-      return 1;
-    }
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-lseek.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lseek.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-lseek.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lseek.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-tmpfiles=
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles=t-lseek.tmp
-# seekable files
-./test-lseek${EXEEXT} 0 < "$srcdir/test-lseek.sh" > t-lseek.tmp || exit 1
-
-# pipes
-echo hi | { ./test-lseek${EXEEXT} 1; echo $? > t-lseek.tmp; cat > /dev/null; } | cat
-test "`cat t-lseek.tmp`" = "0" || exit 1
-
-# closed descriptors
-./test-lseek${EXEEXT} 2 <&- >&- || exit 1
-
-rm -rf $tmpfiles
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-lstat.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lstat.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-lstat.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lstat.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-lstat.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lstat.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-lstat.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-lstat.h	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-malloca.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-malloca.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-malloca.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-malloca.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program 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 @@
 {
   void *ptr = malloca (n);
   freea (ptr);
-  safe_alloca (n);
+  ptr = safe_alloca (n);
 }
 
 void (*func) (int) = do_allocation;
@@ -37,15 +37,12 @@
 {
   int i;
 
-  /* This slows down malloc a lot.  */
-  unsetenv ("MALLOC_PERTURB_");
-
   /* Repeat a lot of times, to make sure there's no memory leak.  */
   for (i = 0; i < 50000; i++)
     {
       /* Try various values.
          n = 0 gave a crash on Alpha with gcc-2.5.8.
-         Some versions of Mac OS X have a stack size limit of 512 KB.  */
+         Some versions of MacOS X have a stack size limit of 512 KB.  */
       func (34);
       func (134);
       func (399);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +46,10 @@
     memset (&state, '\0', sizeof (mbstate_t));
     wc = (wchar_t) 0xBADFACE;
     ret = mbrtowc (&wc, "x", 0, &state);
-    ASSERT (ret == (size_t)(-2));
+    /* gnulib's implementation returns (size_t)(-2).
+       The AIX 5.1 implementation returns (size_t)(-1).
+       glibc's implementation returns 0.  */
+    ASSERT (ret == (size_t)(-2) || ret == (size_t)(-1) || ret == 0);
     ASSERT (mbsinit (&state));
   }
 
@@ -140,11 +143,6 @@
           ASSERT (mbsinit (&state));
           input[1] = '\0';
 
-          /* Test support of NULL first argument.  */
-          ret = mbrtowc (NULL, input + 2, 3, &state);
-          ASSERT (ret == 1);
-          ASSERT (mbsinit (&state));
-
           wc = (wchar_t) 0xBADFACE;
           ret = mbrtowc (&wc, input + 2, 3, &state);
           ASSERT (ret == 1);
@@ -194,11 +192,6 @@
           ASSERT (mbsinit (&state));
           input[2] = '\0';
 
-          /* Test support of NULL first argument.  */
-          ret = mbrtowc (NULL, input + 3, 4, &state);
-          ASSERT (ret == 2);
-          ASSERT (mbsinit (&state));
-
           wc = (wchar_t) 0xBADFACE;
           ret = mbrtowc (&wc, input + 3, 4, &state);
           ASSERT (ret == 2);
@@ -257,11 +250,6 @@
           ASSERT (mbsinit (&state));
           input[4] = '\0';
 
-          /* Test support of NULL first argument.  */
-          ret = mbrtowc (NULL, input + 5, 3, &state);
-          ASSERT (ret == 2);
-          ASSERT (mbsinit (&state));
-
           wc = (wchar_t) 0xBADFACE;
           ret = mbrtowc (&wc, input + 5, 3, &state);
           ASSERT (ret == 2);
@@ -305,11 +293,6 @@
           ASSERT (mbsinit (&state));
           input[2] = '\0';
 
-          /* Test support of NULL first argument.  */
-          ret = mbrtowc (NULL, input + 3, 6, &state);
-          ASSERT (ret == 4);
-          ASSERT (mbsinit (&state));
-
           wc = (wchar_t) 0xBADFACE;
           ret = mbrtowc (&wc, input + 3, 6, &state);
           ASSERT (ret == 4);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP1252 locale.
-./test-mbrtowc-w32${EXEEXT} French_France 1252
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP1256 locale.
-./test-mbrtowc-w32${EXEEXT} "Arabic_Saudi Arabia" 1256
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-3.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-3.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-3.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-3.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP932 locale.
-./test-mbrtowc-w32${EXEEXT} Japanese_Japan 932
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-4.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-4.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-4.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-4.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP950 locale.
-./test-mbrtowc-w32${EXEEXT} Chinese_Taiwan 950
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-5.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-5.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32-5.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32-5.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP936 locale.
-./test-mbrtowc-w32${EXEEXT} Chinese_China 936
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbrtowc-w32.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbrtowc-w32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,735 +0,0 @@
-/* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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 <wchar.h>
-
-#include <errno.h>
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "macros.h"
-
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-
-static int
-test_one_locale (const char *name, int codepage)
-{
-  mbstate_t state;
-  wchar_t wc;
-  size_t ret;
-
-# if 1
-  /* Portable code to set the locale.  */
-  {
-    char name_with_codepage[1024];
-
-    sprintf (name_with_codepage, "%s.%d", name, codepage);
-
-    /* Set the locale.  */
-    if (setlocale (LC_ALL, name_with_codepage) == NULL)
-      return 77;
-  }
-# else
-  /* Hacky way to set a locale.codepage combination that setlocale() refuses
-     to set.  */
-  {
-    /* Codepage of the current locale, set with setlocale().
-       Not necessarily the same as GetACP().  */
-    extern __declspec(dllimport) unsigned int __lc_codepage;
-
-    /* Set the locale.  */
-    if (setlocale (LC_ALL, name) == NULL)
-      return 77;
-
-    /* Clobber the codepage and MB_CUR_MAX, both set by setlocale().  */
-    __lc_codepage = codepage;
-    switch (codepage)
-      {
-      case 1252:
-      case 1256:
-        MB_CUR_MAX = 1;
-        break;
-      case 932:
-      case 950:
-      case 936:
-        MB_CUR_MAX = 2;
-        break;
-      case 54936:
-      case 65001:
-        MB_CUR_MAX = 4;
-        break;
-      }
-
-    /* Test whether the codepage is really available.  */
-    memset (&state, '\0', sizeof (mbstate_t));
-    if (mbrtowc (&wc, " ", 1, &state) == (size_t)(-1))
-      return 77;
-  }
-# endif
-
-  /* Test zero-length input.  */
-  {
-    memset (&state, '\0', sizeof (mbstate_t));
-    wc = (wchar_t) 0xBADFACE;
-    ret = mbrtowc (&wc, "x", 0, &state);
-    /* gnulib's implementation returns (size_t)(-2).
-       The AIX 5.1 implementation returns (size_t)(-1).
-       glibc's implementation returns 0.  */
-    ASSERT (ret == (size_t)(-2) || ret == (size_t)(-1) || ret == 0);
-    ASSERT (mbsinit (&state));
-  }
-
-  /* Test NUL byte input.  */
-  {
-    memset (&state, '\0', sizeof (mbstate_t));
-    wc = (wchar_t) 0xBADFACE;
-    ret = mbrtowc (&wc, "", 1, &state);
-    ASSERT (ret == 0);
-    ASSERT (wc == 0);
-    ASSERT (mbsinit (&state));
-    ret = mbrtowc (NULL, "", 1, &state);
-    ASSERT (ret == 0);
-    ASSERT (mbsinit (&state));
-  }
-
-  /* Test single-byte input.  */
-  {
-    int c;
-    char buf[1];
-
-    memset (&state, '\0', sizeof (mbstate_t));
-    for (c = 0; c < 0x100; c++)
-      switch (c)
-        {
-        case '\t': case '\v': case '\f':
-        case ' ': case '!': case '"': case '#': case '%':
-        case '&': case '\'': case '(': case ')': case '*':
-        case '+': case ',': case '-': case '.': case '/':
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case ':': case ';': case '<': case '=': case '>':
-        case '?':
-        case 'A': case 'B': case 'C': case 'D': case 'E':
-        case 'F': case 'G': case 'H': case 'I': case 'J':
-        case 'K': case 'L': case 'M': case 'N': case 'O':
-        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 '^': case '_':
-        case 'a': case 'b': case 'c': case 'd': case 'e':
-        case 'f': case 'g': case 'h': case 'i': case 'j':
-        case 'k': case 'l': case 'm': case 'n': case 'o':
-        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".  */
-          buf[0] = c;
-          wc = (wchar_t) 0xBADFACE;
-          ret = mbrtowc (&wc, buf, 1, &state);
-          ASSERT (ret == 1);
-          ASSERT (wc == c);
-          ASSERT (mbsinit (&state));
-          ret = mbrtowc (NULL, buf, 1, &state);
-          ASSERT (ret == 1);
-          ASSERT (mbsinit (&state));
-          break;
-        }
-  }
-
-  /* Test special calling convention, passing a NULL pointer.  */
-  {
-    memset (&state, '\0', sizeof (mbstate_t));
-    wc = (wchar_t) 0xBADFACE;
-    ret = mbrtowc (&wc, NULL, 5, &state);
-    ASSERT (ret == 0);
-    ASSERT (wc == (wchar_t) 0xBADFACE);
-    ASSERT (mbsinit (&state));
-  }
-
-  switch (codepage)
-    {
-    case 1252:
-      /* Locale encoding is CP1252, an extension of ISO-8859-1.  */
-      {
-        char input[] = "B\374\337er"; /* "Büßer" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'B');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == (unsigned char) '\374');
-        ASSERT (wc == 0x00FC);
-        ASSERT (mbsinit (&state));
-        input[1] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 2, 3, &state);
-        ASSERT (ret == 1);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 2, 3, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == (unsigned char) '\337');
-        ASSERT (wc == 0x00DF);
-        ASSERT (mbsinit (&state));
-        input[2] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 2, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'e');
-        ASSERT (mbsinit (&state));
-        input[3] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 4, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'r');
-        ASSERT (mbsinit (&state));
-      }
-      return 0;
-
-    case 1256:
-      /* Locale encoding is CP1256, not the same as ISO-8859-6.  */
-      {
-        char input[] = "x\302\341\346y"; /* "xآلوy" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'x');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == (unsigned char) '\302');
-        ASSERT (wc == 0x0622);
-        ASSERT (mbsinit (&state));
-        input[1] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 2, 3, &state);
-        ASSERT (ret == 1);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 2, 3, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == (unsigned char) '\341');
-        ASSERT (wc == 0x0644);
-        ASSERT (mbsinit (&state));
-        input[2] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 2, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == (unsigned char) '\346');
-        ASSERT (wc == 0x0648);
-        ASSERT (mbsinit (&state));
-        input[3] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 4, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'y');
-        ASSERT (mbsinit (&state));
-      }
-      return 0;
-
-    case 932:
-      /* Locale encoding is CP932, similar to Shift_JIS.  */
-      {
-        char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == '<');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 2, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x65E5);
-        ASSERT (mbsinit (&state));
-        input[1] = '\0';
-        input[2] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 1, &state);
-        ASSERT (ret == (size_t)(-2));
-        ASSERT (wc == (wchar_t) 0xBADFACE);
-        ASSERT (!mbsinit (&state));
-        input[3] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 4, 4, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x672C);
-        ASSERT (mbsinit (&state));
-        input[4] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 5, 3, &state);
-        ASSERT (ret == 2);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 5, 3, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x8A9E);
-        ASSERT (mbsinit (&state));
-        input[5] = '\0';
-        input[6] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 7, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == '>');
-        ASSERT (mbsinit (&state));
-
-        /* Test some invalid input.  */
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-      }
-      return 0;
-
-    case 950:
-      /* Locale encoding is CP950, similar to Big5.  */
-      {
-        char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == '<');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 2, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x65E5);
-        ASSERT (mbsinit (&state));
-        input[1] = '\0';
-        input[2] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 1, &state);
-        ASSERT (ret == (size_t)(-2));
-        ASSERT (wc == (wchar_t) 0xBADFACE);
-        ASSERT (!mbsinit (&state));
-        input[3] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 4, 4, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x672C);
-        ASSERT (mbsinit (&state));
-        input[4] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 5, 3, &state);
-        ASSERT (ret == 2);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 5, 3, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x8A9E);
-        ASSERT (mbsinit (&state));
-        input[5] = '\0';
-        input[6] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 7, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == '>');
-        ASSERT (mbsinit (&state));
-
-        /* Test some invalid input.  */
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-      }
-      return 0;
-
-    case 936:
-      /* Locale encoding is CP936 = GBK, an extension of GB2312.  */
-      {
-        char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == '<');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 2, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x65E5);
-        ASSERT (mbsinit (&state));
-        input[1] = '\0';
-        input[2] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 1, &state);
-        ASSERT (ret == (size_t)(-2));
-        ASSERT (wc == (wchar_t) 0xBADFACE);
-        ASSERT (!mbsinit (&state));
-        input[3] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 4, 4, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x672C);
-        ASSERT (mbsinit (&state));
-        input[4] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 5, 3, &state);
-        ASSERT (ret == 2);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 5, 3, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x8A9E);
-        ASSERT (mbsinit (&state));
-        input[5] = '\0';
-        input[6] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 7, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == '>');
-        ASSERT (mbsinit (&state));
-
-        /* Test some invalid input.  */
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-      }
-      return 0;
-
-    case 54936:
-      /* Locale encoding is CP54936 = GB18030.  */
-      {
-        char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'B');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 1, &state);
-        ASSERT (ret == (size_t)(-2));
-        ASSERT (wc == (wchar_t) 0xBADFACE);
-        ASSERT (!mbsinit (&state));
-        input[1] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 2, 7, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x00FC);
-        ASSERT (mbsinit (&state));
-        input[2] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 3, 6, &state);
-        ASSERT (ret == 4);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 6, &state);
-        ASSERT (ret == 4);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x00DF);
-        ASSERT (mbsinit (&state));
-        input[3] = '\0';
-        input[4] = '\0';
-        input[5] = '\0';
-        input[6] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 7, 2, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'e');
-        ASSERT (mbsinit (&state));
-        input[5] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 8, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'r');
-        ASSERT (mbsinit (&state));
-
-        /* Test some invalid input.  */
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\201\045", 2, &state); /* 0x81 0x25 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\201\060\377", 3, &state); /* 0x81 0x30 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\201\060\377\064", 4, &state); /* 0x81 0x30 0xFF 0x34 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\201\060\211\072", 4, &state); /* 0x81 0x30 0x89 0x3A */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-      }
-      return 0;
-
-    case 65001:
-      /* Locale encoding is CP65001 = UTF-8.  */
-      {
-        char input[] = "B\303\274\303\237er"; /* "Büßer" */
-        memset (&state, '\0', sizeof (mbstate_t));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'B');
-        ASSERT (mbsinit (&state));
-        input[0] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 1, 1, &state);
-        ASSERT (ret == (size_t)(-2));
-        ASSERT (wc == (wchar_t) 0xBADFACE);
-        ASSERT (!mbsinit (&state));
-        input[1] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 2, 5, &state);
-        ASSERT (ret == 1);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x00FC);
-        ASSERT (mbsinit (&state));
-        input[2] = '\0';
-
-        /* Test support of NULL first argument.  */
-        ret = mbrtowc (NULL, input + 3, 4, &state);
-        ASSERT (ret == 2);
-        ASSERT (mbsinit (&state));
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 3, 4, &state);
-        ASSERT (ret == 2);
-        ASSERT (wctob (wc) == EOF);
-        ASSERT (wc == 0x00DF);
-        ASSERT (mbsinit (&state));
-        input[3] = '\0';
-        input[4] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 5, 2, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'e');
-        ASSERT (mbsinit (&state));
-        input[5] = '\0';
-
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, input + 6, 1, &state);
-        ASSERT (ret == 1);
-        ASSERT (wc == 'r');
-        ASSERT (mbsinit (&state));
-
-        /* Test some invalid input.  */
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\303\300", 2, &state); /* 0xC3 0xC0 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\343\300", 2, &state); /* 0xE3 0xC0 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\343\300\200", 3, &state); /* 0xE3 0xC0 0x80 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\343\200\300", 3, &state); /* 0xE3 0x80 0xC0 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\363\300", 2, &state); /* 0xF3 0xC0 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\363\300\200\200", 4, &state); /* 0xF3 0xC0 0x80 0x80 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\363\200\300", 3, &state); /* 0xF3 0x80 0xC0 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\363\200\300\200", 4, &state); /* 0xF3 0x80 0xC0 0x80 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-
-        memset (&state, '\0', sizeof (mbstate_t));
-        wc = (wchar_t) 0xBADFACE;
-        ret = mbrtowc (&wc, "\363\200\200\300", 4, &state); /* 0xF3 0x80 0x80 0xC0 */
-        ASSERT (ret == (size_t)-1);
-        ASSERT (errno == EILSEQ);
-      }
-      return 0;
-
-    default:
-      return 1;
-    }
-}
-
-int
-main (int argc, char *argv[])
-{
-  int codepage = atoi (argv[argc - 1]);
-  int result;
-  int i;
-
-  result = 77;
-  for (i = 1; i < argc - 1; i++)
-    {
-      int ret = test_one_locale (argv[i], codepage);
-
-      if (ret != 77)
-        result = ret;
-    }
-
-  if (result == 77)
-    {
-      fprintf (stderr, "Skipping test: found no locale with codepage %d\n",
-               codepage);
-    }
-  return result;
-}
-
-#else
-
-int
-main (int argc, char *argv[])
-{
-  fputs ("Skipping test: not a native Windows system\n", stderr);
-  return 77;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsinit.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsinit.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsinit.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsinit.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of test for initial conversion state.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This 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,8 +32,6 @@
 {
   static mbstate_t state;
 
-  ASSERT (mbsinit (NULL));
-
   ASSERT (mbsinit (&state));
 
   if (argc > 1)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsrtowcs.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsrtowcs.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsrtowcs.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsrtowcs.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of conversion of string to wide string.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsstr1.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsstr1.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsstr1.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsstr1.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *needle =
+    char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
     char *haystack = (char *) malloc (m + 1);
@@ -82,7 +82,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *haystack =
+    char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB";
     char *needle = (char *) malloc (m + 1);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsstr2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsstr2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsstr2.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsstr2.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *needle =
+    char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
     char *haystack = (char *) malloc (m + 1);
@@ -91,7 +91,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *haystack =
+    char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "A\303\207A\303\207A\303\207A\303\207A\303\207A\303\207A\303\207"
       "A\303\207A\303\207A\303\207A\303\207A\303\207A\303\207A\303\207"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsstr3.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsstr3.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-mbsstr3.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-mbsstr3.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-memchr.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-memchr.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-memchr.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-memchr.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2010 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
@@ -57,7 +57,6 @@
 
   ASSERT (MEMCHR (input + 1, 'a', n - 1) == input + n - 1);
   ASSERT (MEMCHR (input + 1, 'e', n - 1) == input + n - 2);
-  ASSERT (MEMCHR (input + 1, 0x789abc00 | 'e', n - 1) == input + n - 2);
 
   ASSERT (MEMCHR (input, 'f', n) == NULL);
   ASSERT (MEMCHR (input, '\0', n) == NULL);
@@ -88,37 +87,25 @@
 
   /* Check that memchr() does not read past the first occurrence of the
      byte being searched.  See the Austin Group's clarification
-     <http://www.opengroup.org/austin/docs/austin_454.txt>.
-     Test both '\0' and something else, since some implementations
-     special-case searching for NUL.
-  */
+     <http://www.opengroup.org/austin/docs/austin_454.txt>.  */
   {
     char *page_boundary = (char *) zerosize_ptr ();
-    /* Too small, and we miss cache line boundary tests; too large,
-       and the test takes cubically longer to complete.  */
-    int limit = 257;
 
     if (page_boundary != NULL)
       {
-        for (n = 1; n <= limit; n++)
+        for (n = 1; n <= 500; n++)
           {
             char *mem = page_boundary - n;
             memset (mem, 'X', n);
             ASSERT (MEMCHR (mem, 'U', n) == NULL);
-            ASSERT (MEMCHR (mem, 0, n) == NULL);
 
             {
               size_t i;
-              size_t k;
 
               for (i = 0; i < n; i++)
                 {
                   mem[i] = 'U';
-                  for (k = i + 1; k < n + limit; k++)
-                    ASSERT (MEMCHR (mem, 'U', k) == mem + i);
-                  mem[i] = 0;
-                  for (k = i + 1; k < n + limit; k++)
-                    ASSERT (MEMCHR (mem, 0, k) == mem + i);
+                  ASSERT (MEMCHR (mem, 'U', 4000) == mem + i);
                   mem[i] = 'X';
                 }
             }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-open.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-open.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-open.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-open.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-open.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-open.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-open.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-open.h	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,24 +16,13 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* Make test_open always inline if we're using Fortify, which defines
-   __always_inline to do that.  Do nothing otherwise.  This works
-   around a glibc bug whereby 'open' cannot be used as a function
-   pointer when _FORTIFY_SOURCE is positive.  */
-
-#if __GLIBC__ && defined __always_inline
-# define ALWAYS_INLINE __always_inline
-#else
-# define ALWAYS_INLINE
-#endif
-
 /* This file is designed to test both open(n,buf[,mode]) and
    openat(AT_FDCWD,n,buf[,mode]).  FUNC is the function to test.
    Assumes that BASE and ASSERT are already defined, and that
    appropriate headers are already included.  If PRINT, warn before
    skipping symlink tests with status 77.  */
 
-static ALWAYS_INLINE int
+static int
 test_open (int (*func) (char const *, int, ...), bool print)
 {
   int fd;
@@ -74,12 +63,6 @@
   ASSERT (write (fd, "c", 1) == 1);
   ASSERT (close (fd) == 0);
 
-  /* Although O_NONBLOCK on regular files can be ignored, it must not
-     cause a failure.  */
-  fd = func (BASE "file", O_NONBLOCK | O_RDONLY);
-  ASSERT (0 <= fd);
-  ASSERT (close (fd) == 0);
-
   /* Symlink handling, where supported.  */
   if (symlink (BASE "file", BASE "link") != 0)
     {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pathmax.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pathmax.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pathmax.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pathmax.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/* Test of "pathmax.h".
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#include <config.h>
-
-#include "pathmax.h"
-
-/* Check that PATH_MAX is a constant if it is defined.  */
-#ifdef PATH_MAX
-int a = PATH_MAX;
-#endif
-
-int
-main (void)
-{
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe2.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe2.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of pipe2.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -25,25 +26,20 @@
 #include <stdbool.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
 #endif
 
 #include "binary-io.h"
 #include "macros.h"
-#if GNULIB_NONBLOCKING
-# include "nonblocking.h"
-#endif
 
 /* Return true if FD is open.  */
 static bool
 is_open (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
+  /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
@@ -71,22 +67,19 @@
 #endif
 }
 
-#if ! GNULIB_NONBLOCKING
-static int
-get_nonblocking_flag (int fd)
+/* Return true if FD is in non-blocking mode.  */
+static bool
+is_nonblocking (int fd)
 {
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  /* We don't use the non-blocking mode for sockets here.  */
   return 0;
-# else
-#  ifndef F_GETFL
-#   error Please port fcntl to your platform
-#  endif
+#else
   int flags;
   ASSERT ((flags = fcntl (fd, F_GETFL)) >= 0);
   return (flags & O_NONBLOCK) != 0;
-# endif
-}
 #endif
+}
 
 int
 main ()
@@ -94,17 +87,29 @@
   int use_nonblocking;
   int use_cloexec;
 
-  for (use_nonblocking = 0; use_nonblocking <= !!O_NONBLOCK; use_nonblocking++)
-    for (use_cloexec = 0; use_cloexec <= !!O_CLOEXEC; use_cloexec++)
+#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+  for (use_nonblocking = 0; use_nonblocking <= 1; use_nonblocking++)
+#else
+  use_nonblocking = 0;
+#endif
+#if defined O_CLOEXEC
+    for (use_cloexec = 0; use_cloexec <= 1; use_cloexec++)
+#else
+    use_cloexec = 0;
+#endif
       {
         int o_flags;
         int fd[2];
 
         o_flags = 0;
+#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
         if (use_nonblocking)
           o_flags |= O_NONBLOCK;
+#endif
+#if defined O_CLOEXEC
         if (use_cloexec)
           o_flags |= O_CLOEXEC;
+#endif
 
         fd[0] = -1;
         fd[1] = -1;
@@ -112,8 +117,8 @@
         ASSERT (fd[0] >= 0);
         ASSERT (fd[1] >= 0);
         ASSERT (fd[0] != fd[1]);
-        ASSERT (is_open (fd[0]));
-        ASSERT (is_open (fd[1]));
+        ASSERT (is_open (fd[0]) >= 0);
+        ASSERT (is_open (fd[1]) >= 0);
         if (use_cloexec)
           {
             ASSERT (is_cloexec (fd[0]));
@@ -126,17 +131,14 @@
           }
         if (use_nonblocking)
           {
-            ASSERT (get_nonblocking_flag (fd[0]) == 1);
-            ASSERT (get_nonblocking_flag (fd[1]) == 1);
+            ASSERT (is_nonblocking (fd[0]));
+            ASSERT (is_nonblocking (fd[1]));
           }
         else
           {
-            ASSERT (get_nonblocking_flag (fd[0]) == 0);
-            ASSERT (get_nonblocking_flag (fd[1]) == 0);
+            ASSERT (!is_nonblocking (fd[0]));
+            ASSERT (!is_nonblocking (fd[1]));
           }
-
-        ASSERT (close (fd[0]) == 0);
-        ASSERT (close (fd[1]) == 0);
       }
 
   return 0;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe.c	2010-02-16 21:32:28.000000000 +0000
@@ -0,0 +1,204 @@
+/* Test of create_pipe_bidi/wait_subprocess.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+#include "pipe.h"
+#include "wait-process.h"
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/* Depending on arguments, this test intentionally closes stderr or
+   starts life with stderr closed.  So, we arrange to have fd 10
+   (outside the range of interesting fd's during the test) set up to
+   duplicate the original stderr.  */
+
+#define BACKUP_STDERR_FILENO 10
+#define ASSERT_STREAM myerr
+#include "macros.h"
+
+static FILE *myerr;
+
+/* Code executed by the child process.  argv[1] = "child".  */
+static int
+child_main (int argc, char *argv[])
+{
+  char buffer[2] = { 's', 't' };
+  int fd;
+  int ret;
+
+  ASSERT (argc == 3);
+
+  /* Read one byte from fd 0, and write its value plus one to fd 1.
+     fd 2 should be closed iff the argument is 1.  Check that no other file
+     descriptors leaked.  */
+
+  ASSERT (read (STDIN_FILENO, buffer, 2) == 1);
+
+  buffer[0]++;
+  ASSERT (write (STDOUT_FILENO, buffer, 1) == 1);
+
+  errno = 0;
+  ret = dup2 (STDERR_FILENO, STDERR_FILENO);
+  switch (atoi (argv[2]))
+    {
+    case 0:
+      /* Expect fd 2 is open.  */
+      ASSERT (ret == STDERR_FILENO);
+      break;
+    case 1:
+      /* Expect fd 2 is closed.  */
+      ASSERT (ret == -1);
+      ASSERT (errno == EBADF);
+      break;
+    default:
+      ASSERT (false);
+    }
+
+  for (fd = 3; fd < 7; fd++)
+    {
+      errno = 0;
+      ASSERT (close (fd) == -1);
+      ASSERT (errno == EBADF);
+    }
+
+  return 0;
+}
+
+/* Create a bi-directional pipe to a test child, and validate that the
+   child program returns the expected output.  The child is the same
+   program as the parent ARGV0, but with different arguments.
+   STDERR_CLOSED is true if we have already closed fd 2.  */
+static void
+test_pipe (const char *argv0, bool stderr_closed)
+{
+  int fd[2];
+  char *argv[4];
+  pid_t pid;
+  char buffer[2] = { 'a', 't' };
+
+  /* Set up child.  */
+  argv[0] = (char *) argv0;
+  argv[1] = (char *) "child";
+  argv[2] = (char *) (stderr_closed ? "1" : "0");
+  argv[3] = NULL;
+  pid = create_pipe_bidi (argv0, argv0, argv, false, true, true, fd);
+  ASSERT (0 <= pid);
+  ASSERT (STDERR_FILENO < fd[0]);
+  ASSERT (STDERR_FILENO < fd[1]);
+
+  /* Push child's input.  */
+  ASSERT (write (fd[1], buffer, 1) == 1);
+  ASSERT (close (fd[1]) == 0);
+
+  /* Get child's output.  */
+  ASSERT (read (fd[0], buffer, 2) == 1);
+
+  /* Wait for child.  */
+  ASSERT (wait_subprocess (pid, argv0, true, false, true, true, NULL) == 0);
+  ASSERT (close (fd[0]) == 0);
+
+  /* Check the result.  */
+  ASSERT (buffer[0] == 'b');
+  ASSERT (buffer[1] == 't');
+}
+
+/* Code executed by the parent process.  */
+static int
+parent_main (int argc, char *argv[])
+{
+  int test;
+  int fd;
+
+  ASSERT (argc == 2);
+
+  /* Selectively close various standard fds, to verify the child process is
+     not impacted by this.  */
+  test = atoi (argv[1]);
+  switch (test)
+    {
+    case 0:
+      break;
+    case 1:
+      close (0);
+      break;
+    case 2:
+      close (1);
+      break;
+    case 3:
+      close (0);
+      close (1);
+      break;
+    case 4:
+      close (2);
+      break;
+    case 5:
+      close (0);
+      close (2);
+      break;
+    case 6:
+      close (1);
+      close (2);
+      break;
+    case 7:
+      close (0);
+      close (1);
+      close (2);
+      break;
+    default:
+      ASSERT (false);
+    }
+
+  /* Plug any file descriptor leaks inherited from outside world before
+     starting, so that child has a clean slate (at least for the fds that we
+     might be manipulating).  */
+  for (fd = 3; fd < 7; fd++)
+    close (fd);
+
+  test_pipe (argv[0], test >= 4);
+
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  if (argc < 2)
+    {
+      fprintf (stderr, "%s: need arguments\n", argv[0]);
+      return 2;
+    }
+  if (strcmp (argv[1], "child") == 0)
+    {
+      /* fd 2 might be closed, but fd BACKUP_STDERR_FILENO is the original
+         stderr.  */
+      myerr = fdopen (BACKUP_STDERR_FILENO, "w");
+      if (!myerr)
+        return 2;
+      return child_main (argc, argv);
+    }
+  /* We might close fd 2 later, so save it in fd 10.  */
+  if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
+      || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
+    return 2;
+  return parent_main (argc, argv);
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c	2010-02-16 21:32:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of filtering of data through a subprocess.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 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
@@ -26,9 +26,8 @@
 #include "macros.h"
 
 
-/* Pipe a text file through 'LC_ALL=C tr "[a-z]" "[A-Z]"', or equivalently,
-   'tr "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"', which
-   converts ASCII characters from lower case to upper case.  */
+/* Pipe a text file through 'tr a-z A-Z', which converts ASCII characters from
+   lower case to upper case.  */
 
 struct locals
 {
@@ -120,8 +119,8 @@
     l.nread = 0;
 
     argv[0] = tr_program;
-    argv[1] = "abcdefghijklmnopqrstuvwxyz";
-    argv[2] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    argv[1] = "a-z";
+    argv[2] = "A-Z";
     argv[3] = NULL;
 
     result = pipe_filter_ii_execute ("tr", tr_program, argv, false, true,
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,6 +1,6 @@
 /* Child program invoked by test-pipe-filter-ii2-main.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,6 +1,6 @@
 /* Test harness for pipe-filter-ii.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh	2010-02-16 21:32:28.000000000 +0000
@@ -2,7 +2,7 @@
 
 # pipe-filter test driver.
 #
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-pipe.sh	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-pipe.sh	2009-07-19 20:29:12.000000000 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+st=0
+for i in 0 1 2 3 4 5 6 7 ; do
+  ./test-pipe${EXEEXT} $i \
+    || { echo test-pipe.sh: iteration $i failed >&2; st=1; }
+done
+exit $st
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn1.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn1.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn1.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn1.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@
 int
 main ()
 {
-  char *argv[3] = { (char *) "/bin/sh", (char *) CHILD_PROGRAM_FILENAME, NULL };
+  char *argv[3] = { "/bin/sh", CHILD_PROGRAM_FILENAME, NULL };
   int ifd[2];
   sigset_t blocked_signals;
   sigset_t fatal_signal_set;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn2.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn2.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
 int
 main ()
 {
-  char *argv[3] = { (char *) "/bin/sh", (char *) CHILD_PROGRAM_FILENAME, NULL };
+  char *argv[3] = { "/bin/sh", CHILD_PROGRAM_FILENAME, NULL };
   int ofd[2];
   sigset_t blocked_signals;
   sigset_t fatal_signal_set;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* Test posix_spawn_file_actions_addclose() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawn_file_actions_addclose, int,
-                 (posix_spawn_file_actions_t *, int));
-
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-/* Return a file descriptor that is too big to use.
-   Prefer the smallest such fd, except use OPEN_MAX if it is defined
-   and is greater than getdtablesize (), as that's how OS X works.  */
-static int
-big_fd (void)
-{
-  int fd = getdtablesize ();
-#ifdef OPEN_MAX
-  if (fd < OPEN_MAX)
-    fd = OPEN_MAX;
-#endif
-  return fd;
-}
-
-int
-main (void)
-{
-  posix_spawn_file_actions_t actions;
-
-  ASSERT (posix_spawn_file_actions_init (&actions) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addclose (&actions, -1) == EBADF);
-  }
-  {
-    int bad_fd = big_fd ();
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addclose (&actions, bad_fd) == EBADF);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/* Test posix_spawn_file_actions_adddup2() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawn_file_actions_adddup2, int,
-                 (posix_spawn_file_actions_t *, int, int));
-
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-/* Return a file descriptor that is too big to use.
-   Prefer the smallest such fd, except use OPEN_MAX if it is defined
-   and is greater than getdtablesize (), as that's how OS X works.  */
-static int
-big_fd (void)
-{
-  int fd = getdtablesize ();
-#ifdef OPEN_MAX
-  if (fd < OPEN_MAX)
-    fd = OPEN_MAX;
-#endif
-  return fd;
-}
-
-int
-main (void)
-{
-  int bad_fd = big_fd ();
-  posix_spawn_file_actions_t actions;
-
-  ASSERT (posix_spawn_file_actions_init (&actions) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, -1, 2) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, bad_fd, 2) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, 2, -1) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, 2, bad_fd) == EBADF);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* Test posix_spawn_file_actions_addopen() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawn_file_actions_addopen, int,
-                 (posix_spawn_file_actions_t *, int,
-                  const char *, int, mode_t));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-/* Return a file descriptor that is too big to use.
-   Prefer the smallest such fd, except use OPEN_MAX if it is defined
-   and is greater than getdtablesize (), as that's how OS X works.  */
-static int
-big_fd (void)
-{
-  int fd = getdtablesize ();
-#ifdef OPEN_MAX
-  if (fd < OPEN_MAX)
-    fd = OPEN_MAX;
-#endif
-  return fd;
-}
-
-int
-main (void)
-{
-  posix_spawn_file_actions_t actions;
-
-  ASSERT (posix_spawn_file_actions_init (&actions) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addopen (&actions, -1,
-                                              "foo", 0, O_RDONLY)
-            == EBADF);
-  }
-  {
-    int bad_fd = big_fd ();
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addopen (&actions, bad_fd,
-                                              "foo", 0, O_RDONLY)
-            == EBADF);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-quotearg.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-quotearg.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-quotearg.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-quotearg.h	2010-06-03 21:36:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2008.  */
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-quotearg-simple.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-quotearg-simple.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-quotearg-simple.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-quotearg-simple.c	2010-06-03 21:36:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2008.  */
 
@@ -26,10 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "localcharset.h"
 #include "progname.h"
 #include "macros.h"
-#include "zerosize-ptr.h"
 
 #include "test-quotearg.h"
 
@@ -86,12 +85,12 @@
       "a\\\\b", LQ_ENC RQ_ENC, LQ RQ } },
 
   /* locale_quoting_style */
-  { { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'",
-      "'a:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" },
-    { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'",
-      "'a:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" },
-    { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'",
-      "'a\\:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } },
+  { { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'",
+      "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" },
+    { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'",
+      "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" },
+    { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'",
+      "`a\\:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" } },
 
   /* clocale_quoting_style */
   { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"",
@@ -245,21 +244,13 @@
   ASSERT (!isprint ('\033'));
   for (i = literal_quoting_style; i <= clocale_quoting_style; i++)
     {
-      set_quoting_style (NULL, (enum quoting_style) i);
-      if (!(i == locale_quoting_style || i == clocale_quoting_style)
-          || (strcmp (locale_charset (), "ASCII") == 0
-              || strcmp (locale_charset (), "ANSI_X3.4-1968") == 0))
-        {
-          compare_strings (use_quotearg_buffer, &results_g[i].group1,
-                           ascii_only);
-          compare_strings (use_quotearg, &results_g[i].group2,
-                           ascii_only);
-          if (i == c_quoting_style)
-            compare_strings (use_quote_double_quotes, &results_g[i].group2,
-                             ascii_only);
-          compare_strings (use_quotearg_colon, &results_g[i].group3,
-                           ascii_only);
-        }
+      set_quoting_style (NULL, i);
+      compare_strings (use_quotearg_buffer, &results_g[i].group1, ascii_only);
+      compare_strings (use_quotearg, &results_g[i].group2, ascii_only);
+      if (i == c_quoting_style)
+        compare_strings (use_quote_double_quotes, &results_g[i].group2,
+                         ascii_only);
+      compare_strings (use_quotearg_colon, &results_g[i].group3, ascii_only);
     }
 
   set_quoting_style (NULL, literal_quoting_style);
@@ -298,40 +289,6 @@
                        ascii_only);
     }
 
-  {
-    /* Trigger the bug whereby quotearg_buffer would read beyond the NUL
-       that defines the end of the string being quoted.  Use an input
-       string whose NUL is the last byte before an unreadable page.  */
-    char *z = zerosize_ptr ();
-
-    if (z)
-      {
-        size_t q_len = 1024;
-        char *q = malloc (q_len + 1);
-        char buf[10];
-        memset (q, 'Q', q_len);
-        q[q_len] = 0;
-
-        /* Z points to the boundary between a readable/writable page
-           and one that is neither readable nor writable.  Position
-           our string so its NUL is at the end of the writable one.  */
-        char const *str = "____";
-        size_t s_len = strlen (str);
-        z -= s_len + 1;
-        memcpy (z, str, s_len + 1);
-
-        set_custom_quoting (NULL, q, q);
-        /* Whether this actually triggers a SEGV depends on the
-           implementation of memcmp: whether it compares only byte-at-
-           a-time, and from left to right (no SEGV) or some other way.  */
-        size_t n = quotearg_buffer (buf, sizeof buf, z, SIZE_MAX, NULL);
-        ASSERT (n == s_len + 2 * q_len);
-        ASSERT (memcmp (buf, q, sizeof buf) == 0);
-        free (q);
-      }
-  }
-
   quotearg_free ();
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-raise.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-raise.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-raise.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-raise.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* Test raising a signal.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <signal.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (raise, int, (int));
-
-#include <stdlib.h>
-
-#include "macros.h"
-
-/* It is safe to use _Noreturn here: exit() never returns, and GCC knows that
-   exit() is a non-returning function, even on platforms where its declaration
-   in <stdlib.h> does not have the 'noreturn' attribute.  */
-static _Noreturn void
-handler (int sig)
-{
-  exit (0);
-}
-
-int
-main (void)
-{
-  /* Test behaviour for invalid argument.  */
-  ASSERT (raise (-1) != 0);
-
-  /* Test behaviour for SIGINT.  */
-  ASSERT (signal (SIGINT, handler) != SIG_ERR);
-
-  raise (SIGINT);
-
-  /* We should not get here, because the handler takes away the control.  */
-  exit (1);
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-rawmemchr.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-rawmemchr.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-rawmemchr.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-rawmemchr.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 
 #include <stdlib.h>
 
-#include "zerosize-ptr.h"
 #include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
@@ -54,7 +53,6 @@
 
   ASSERT (RAWMEMCHR (input + 1, 'a') == input + n - 1);
   ASSERT (RAWMEMCHR (input + 1, 'e') == input + n - 2);
-  ASSERT (RAWMEMCHR (input + 1, 0x789abc00 | 'e') == input + n - 2);
 
   ASSERT (RAWMEMCHR (input, '\0') == input + n);
 
@@ -72,20 +70,6 @@
       }
   }
 
-  /* Ensure that no unaligned oversized reads occur.  */
-  {
-    char *page_boundary = (char *) zerosize_ptr ();
-    size_t i;
-
-    if (!page_boundary)
-      page_boundary = input + 4096;
-    memset (page_boundary - 512, '1', 511);
-    page_boundary[-1] = '2';
-    for (i = 1; i <= 512; i++)
-      ASSERT (RAWMEMCHR (page_boundary - i, (i * 0x01010100) | '2')
-              == page_boundary - 1);
-  }
-
   free (input);
 
   return 0;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-read.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-read.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-read.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-read.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/* Test the read() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (read, ssize_t, (int, void *, size_t));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  const char *filename = "test-read.tmp";
-  int fd;
-
-  /* Create a file with a simple contents.  */
-  fd = open (filename, O_CREAT | O_WRONLY, 0600);
-  ASSERT (fd >= 0);
-  ASSERT (write (fd, "Hello World", 11) == 11);
-  ASSERT (close (fd) == 0);
-
-  /* Read from the middle of the file.  */
-  fd = open (filename, O_RDONLY);
-  ASSERT (fd >= 0);
-  ASSERT (lseek (fd, 6, SEEK_SET) == 6);
-  {
-    char buf[10];
-    ssize_t ret = read (fd, buf, 10);
-    ASSERT (ret == 5);
-    ASSERT (memcmp (buf, "World", 5) == 0);
-  }
-  ASSERT (close (fd) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    char byte;
-    errno = 0;
-    ASSERT (read (-1, &byte, 1) == -1);
-    ASSERT (errno == EBADF);
-  }
-  {
-    char byte;
-    close (99);
-    errno = 0;
-    ASSERT (read (99, &byte, 1) == -1);
-    ASSERT (errno == EBADF);
-  }
-
-  /* Clean up.  */
-  unlink (filename);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-read-file.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-read-file.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-read-file.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-read-file.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
@@ -52,23 +52,11 @@
               err = 1;
             }
 
-          if (S_ISREG (statbuf.st_mode))
+          /* Assume FILE1 is a regular file or a symlink to a regular file.  */
+          if (len != statbuf.st_size)
             {
-              /* FILE1 is a regular file or a symlink to a regular file.  */
-              if (len != statbuf.st_size)
-                {
-                  fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1);
-                  err = 1;
-                }
-            }
-          else
-            {
-              /* Assume FILE1 is not empty.  */
-              if (len == 0)
-                {
-                  fprintf (stderr, "Read nothing from %s\n", FILE1);
-                  err = 1;
-                }
+              fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1);
+              err = 1;
             }
           free (out);
         }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-readlink.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-readlink.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of readlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-readlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-readlink.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of readlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
   ASSERT (errno == ENOENT);
   errno = 0;
   ASSERT (func ("", buf, sizeof buf) == -1);
-  ASSERT (errno == ENOENT || errno == EINVAL);
+  ASSERT (errno == ENOENT);
   errno = 0;
   ASSERT (func (".", buf, sizeof buf) == -1);
   ASSERT (errno == EINVAL);
@@ -51,7 +51,7 @@
   ASSERT (errno == EINVAL);
   errno = 0;
   ASSERT (func (BASE "file/", buf, sizeof buf) == -1);
-  ASSERT (errno == ENOTDIR || errno == EINVAL); /* AIX yields EINVAL */
+  ASSERT (errno == ENOTDIR);
 
   /* Now test actual symlinks.  */
   if (symlink (BASE "dir", BASE "link"))
@@ -74,7 +74,7 @@
   ASSERT (symlink (BASE "file", BASE "link2") == 0);
   errno = 0;
   ASSERT (func (BASE "link2/", buf, sizeof buf) == -1);
-  ASSERT (errno == ENOTDIR || errno == EINVAL); /* AIX yields EINVAL */
+  ASSERT (errno == ENOTDIR);
   ASSERT (unlink (BASE "file") == 0);
   ASSERT (unlink (BASE "link2") == 0);
   {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-rmdir.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-rmdir.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-rmdir.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-rmdir.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-rmdir.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-rmdir.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-rmdir.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-rmdir.h	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -66,8 +66,7 @@
   ASSERT (unlink (BASE "dir/file") == 0);
   errno = 0;
   ASSERT (func (BASE "dir/.//") == -1);
-  ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST
-          || errno == ENOTEMPTY);
+  ASSERT (errno == EINVAL || errno == EBUSY);
   ASSERT (func (BASE "dir") == 0);
 
   /* Test symlink behavior.  Specifying trailing slash should remove
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sameacls.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sameacls.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sameacls.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sameacls.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test whether two files have the same ACLs.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,14 +24,10 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#if HAVE_ACL_GET_FILE || HAVE_FACL || HAVE_GETACL || HAVE_ACLX_GET || HAVE_STATACL || HAVE_ACLSORT
+#if HAVE_ACL_GET_FILE || HAVE_ACL || HAVE_ACLX_GET || HAVE_STATACL
 # include <sys/types.h>
 # include <sys/acl.h>
 #endif
-#if HAVE_ACLV_H
-# include <sys/types.h>
-# include <aclv.h>
-#endif
 
 #include "progname.h"
 #include "read-file.h"
@@ -115,11 +111,11 @@
       }
   }
   {
-#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
     static const int types[] =
       {
         ACL_TYPE_ACCESS
-# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
+# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
         , ACL_TYPE_EXTENDED
 # endif
       };
@@ -222,16 +218,12 @@
               }
           }
       }
-#elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+#elif HAVE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
   int count1;
   int count2;
 
   count1 = acl (file1, GETACLCNT, 0, NULL);
-  if (count1 < 0 && errno == ENOSYS) /* Can happen on Solaris 10 with ZFS */
-    count1 = 0;
   count2 = acl (file2, GETACLCNT, 0, NULL);
-  if (count2 < 0 && errno == ENOSYS) /* Can happen on Solaris 10 with ZFS */
-    count2 = 0;
 
   if (count1 < 0)
     {
@@ -257,13 +249,13 @@
       aclent_t *entries2 = XNMALLOC (count2, aclent_t);
       int i;
 
-      if (count1 > 0 && acl (file1, GETACL, count1, entries1) < count1)
+      if (acl (file1, GETACL, count1, entries1) < count1)
         {
           fprintf (stderr, "error retrieving the ACLs of file %s\n", file1);
           fflush (stderr);
           abort ();
         }
-      if (count2 > 0 && acl (file2, GETACL, count2, entries2) < count1)
+      if (acl (file2, GETACL, count2, entries2) < count1)
         {
           fprintf (stderr, "error retrieving the ACLs of file %s\n", file2);
           fflush (stderr);
@@ -310,152 +302,69 @@
       fflush (stderr);
       abort ();
     }
-  {
-    ace_t *entries1 = XNMALLOC (count1, ace_t);
-    ace_t *entries2 = XNMALLOC (count2, ace_t);
-    int ret;
-    int i;
-
-    ret = acl (file1, ACE_GETACL, count1, entries1);
-    if (ret < 0 && errno == EINVAL)
-      count1 = 0;
-    else if (ret < count1)
-      {
-        fprintf (stderr, "error retrieving the ACE-ACLs of file %s\n", file1);
-        fflush (stderr);
-        abort ();
-      }
-    ret = acl (file2, ACE_GETACL, count2, entries2);
-    if (ret < 0 && errno == EINVAL)
-      count2 = 0;
-    else if (ret < count2)
-      {
-        fprintf (stderr, "error retrieving the ACE-ACLs of file %s\n", file2);
-        fflush (stderr);
-        abort ();
-      }
-
-    if (count1 != count2)
-      {
-        fprintf (stderr, "files %s and %s have different number of ACE-ACLs: %d and %d\n",
-                 file1, file2, count1, count2);
-        return 1;
-      }
-
-    for (i = 0; i < count1; i++)
-      {
-        if (entries1[i].a_type != entries2[i].a_type)
-          {
-            fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different types %d and %d\n",
-                     file1, file2, i, entries1[i].a_type, entries2[i].a_type);
-            return 1;
-          }
-        if (entries1[i].a_who != entries2[i].a_who)
-          {
-            fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different ids %d and %d\n",
-                     file1, file2, i, (int)entries1[i].a_who, (int)entries2[i].a_who);
-            return 1;
-          }
-        if (entries1[i].a_access_mask != entries2[i].a_access_mask)
-          {
-            fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different access masks %03o and %03o\n",
-                     file1, file2, i, (unsigned int) entries1[i].a_access_mask, (unsigned int) entries2[i].a_access_mask);
-            return 1;
-          }
-        if (entries1[i].a_flags != entries2[i].a_flags)
-          {
-            fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different flags 0x%x and 0x%x\n",
-                     file1, file2, i, (unsigned int) entries1[i].a_flags, (unsigned int) entries2[i].a_flags);
-            return 1;
-          }
-      }
-  }
-# endif
-#elif HAVE_GETACL /* HP-UX */
-  int count1;
-  int count2;
-
-  count1 = getacl (file1, 0, NULL);
-  if (count1 < 0
-      && (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP))
-    count1 = 0;
-  count2 = getacl (file2, 0, NULL);
-  if (count2 < 0
-      && (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP))
-    count2 = 0;
-
-  if (count1 < 0)
-    {
-      fprintf (stderr, "error accessing the ACLs of file %s\n", file1);
-      fflush (stderr);
-      abort ();
-    }
-  if (count2 < 0)
-    {
-      fprintf (stderr, "error accessing the ACLs of file %s\n", file2);
-      fflush (stderr);
-      abort ();
-    }
   if (count1 != count2)
     {
-      fprintf (stderr, "files %s and %s have different number of ACLs: %d and %d\n",
+      fprintf (stderr, "files %s and %s have different number of ACE-ACLs: %d and %d\n",
                file1, file2, count1, count2);
       return 1;
     }
   else if (count1 > 0)
     {
-      struct acl_entry *entries1 = XNMALLOC (count1, struct acl_entry);
-      struct acl_entry *entries2 = XNMALLOC (count2, struct acl_entry);
+      ace_t *entries1 = XNMALLOC (count1, ace_t);
+      ace_t *entries2 = XNMALLOC (count2, ace_t);
       int i;
 
-      if (getacl (file1, count1, entries1) < count1)
+      if (acl (file1, ACE_GETACL, count1, entries1) < count1)
         {
-          fprintf (stderr, "error retrieving the ACLs of file %s\n", file1);
+          fprintf (stderr, "error retrieving the ACE-ACLs of file %s\n", file1);
           fflush (stderr);
           abort ();
         }
-      if (getacl (file2, count2, entries2) < count1)
+      if (acl (file2, ACE_GETACL, count2, entries2) < count1)
         {
-          fprintf (stderr, "error retrieving the ACLs of file %s\n", file2);
+          fprintf (stderr, "error retrieving the ACE-ACLs of file %s\n", file2);
           fflush (stderr);
           abort ();
         }
       for (i = 0; i < count1; i++)
         {
-          if (entries1[i].uid != entries2[i].uid)
+          if (entries1[i].a_type != entries2[i].a_type)
             {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different uids %d and %d\n",
-                       file1, file2, i, (int)entries1[i].uid, (int)entries2[i].uid);
+              fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different types %d and %d\n",
+                       file1, file2, i, entries1[i].a_type, entries2[i].a_type);
               return 1;
             }
-          if (entries1[i].gid != entries2[i].gid)
+          if (entries1[i].a_who != entries2[i].a_who)
             {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different gids %d and %d\n",
-                       file1, file2, i, (int)entries1[i].gid, (int)entries2[i].gid);
+              fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different ids %d and %d\n",
+                       file1, file2, i, (int)entries1[i].a_who, (int)entries2[i].a_who);
               return 1;
             }
-          if (entries1[i].mode != entries2[i].mode)
+          if (entries1[i].a_access_mask != entries2[i].a_access_mask)
             {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different permissions %03o and %03o\n",
-                       file1, file2, i, (unsigned int) entries1[i].mode, (unsigned int) entries2[i].mode);
+              fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different access masks %03o and %03o\n",
+                       file1, file2, i, (unsigned int) entries1[i].a_access_mask, (unsigned int) entries2[i].a_access_mask);
+              return 1;
+            }
+          if (entries1[i].a_flags != entries2[i].a_flags)
+            {
+              fprintf (stderr, "files %s and %s: different ACE-ACL entry #%d: different flags 0x%x and 0x%x\n",
+                       file1, file2, i, (unsigned int) entries1[i].a_flags, (unsigned int) entries2[i].a_flags);
               return 1;
             }
         }
     }
+# endif
+#elif HAVE_GETACL /* HP-UX */
+  int count1;
+  int count2;
 
-# if HAVE_ACLV_H /* HP-UX >= 11.11 */
-  {
-    struct acl dummy_entries[NACLVENTRIES];
-
-    count1 = acl ((char *) file1, ACL_CNT, NACLVENTRIES, dummy_entries);
-    if (count1 < 0
-        && (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL))
-      count1 = 0;
-    count2 = acl ((char *) file2, ACL_CNT, NACLVENTRIES, dummy_entries);
-    if (count2 < 0
-        && (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL))
-      count2 = 0;
-  }
+  count1 = getacl (file1, 0, NULL);
+  if (count1 < 0 && (errno == ENOSYS || errno == EOPNOTSUPP))
+    count1 = 0;
+  count2 = getacl (file2, 0, NULL);
+  if (count2 < 0 && (errno == ENOSYS || errno == EOPNOTSUPP))
+    count2 = 0;
 
   if (count1 < 0)
     {
@@ -477,17 +386,17 @@
     }
   else if (count1 > 0)
     {
-      struct acl *entries1 = XNMALLOC (count1, struct acl);
-      struct acl *entries2 = XNMALLOC (count2, struct acl);
+      struct acl_entry *entries1 = XNMALLOC (count1, struct acl_entry);
+      struct acl_entry *entries2 = XNMALLOC (count2, struct acl_entry);
       int i;
 
-      if (acl ((char *) file1, ACL_GET, count1, entries1) < count1)
+      if (getacl (file1, count1, entries1) < count1)
         {
           fprintf (stderr, "error retrieving the ACLs of file %s\n", file1);
           fflush (stderr);
           abort ();
         }
-      if (acl ((char *) file2, ACL_GET, count2, entries2) < count1)
+      if (getacl (file2, count2, entries2) < count1)
         {
           fprintf (stderr, "error retrieving the ACLs of file %s\n", file2);
           fflush (stderr);
@@ -495,84 +404,69 @@
         }
       for (i = 0; i < count1; i++)
         {
-          if (entries1[i].a_type != entries2[i].a_type)
+          if (entries1[i].uid != entries2[i].uid)
             {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different types %d and %d\n",
-                       file1, file2, i, entries1[i].a_type, entries2[i].a_type);
+              fprintf (stderr, "files %s and %s: different ACL entry #%d: different uids %d and %d\n",
+                       file1, file2, i, (int)entries1[i].uid, (int)entries2[i].uid);
               return 1;
             }
-          if (entries1[i].a_id != entries2[i].a_id)
+          if (entries1[i].gid != entries2[i].gid)
             {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different ids %d and %d\n",
-                       file1, file2, i, (int)entries1[i].a_id, (int)entries2[i].a_id);
+              fprintf (stderr, "files %s and %s: different ACL entry #%d: different gids %d and %d\n",
+                       file1, file2, i, (int)entries1[i].gid, (int)entries2[i].gid);
               return 1;
             }
-          if (entries1[i].a_perm != entries2[i].a_perm)
+          if (entries1[i].mode != entries2[i].mode)
             {
               fprintf (stderr, "files %s and %s: different ACL entry #%d: different permissions %03o and %03o\n",
-                       file1, file2, i, (unsigned int) entries1[i].a_perm, (unsigned int) entries2[i].a_perm);
+                       file1, file2, i, (unsigned int) entries1[i].mode, (unsigned int) entries2[i].mode);
               return 1;
             }
         }
     }
-# endif
 #elif HAVE_ACLX_GET /* AIX */
   acl_type_t type1;
   char acl1[1000];
   size_t aclsize1 = sizeof (acl1);
   mode_t mode1;
   char text1[1000];
-  size_t textsize1 = sizeof (text1);
   acl_type_t type2;
   char acl2[1000];
   size_t aclsize2 = sizeof (acl2);
   mode_t mode2;
   char text2[1000];
-  size_t textsize2 = sizeof (text2);
 
   /* The docs say that type1 being 0 is equivalent to ACL_ANY, but it is not
      true, in AIX 5.3.  */
   type1.u64 = ACL_ANY;
   if (aclx_get (file1, 0, &type1, acl1, &aclsize1, &mode1) < 0)
     {
-      if (errno == ENOSYS)
-        text1[0] = '\0';
-      else
-        {
-          fprintf (stderr, "error accessing the ACLs of file %s\n", file1);
-          fflush (stderr);
-          abort ();
-        }
+      fprintf (stderr, "error accessing the ACLs of file %s\n", file1);
+      fflush (stderr);
+      abort ();
+    }
+  if (aclx_printStr (text1, sizeof (text1), acl1, aclsize1, type1, file1, 0) < 0)
+    {
+      fprintf (stderr, "cannot convert the ACLs of file %s to text\n", file1);
+      fflush (stderr);
+      abort ();
     }
-  else
-    if (aclx_printStr (text1, &textsize1, acl1, aclsize1, type1, file1, 0) < 0)
-      {
-        fprintf (stderr, "cannot convert the ACLs of file %s to text\n", file1);
-        fflush (stderr);
-        abort ();
-      }
 
   /* The docs say that type2 being 0 is equivalent to ACL_ANY, but it is not
      true, in AIX 5.3.  */
   type2.u64 = ACL_ANY;
   if (aclx_get (file2, 0, &type2, acl2, &aclsize2, &mode2) < 0)
     {
-      if (errno == ENOSYS)
-        text2[0] = '\0';
-      else
-        {
-          fprintf (stderr, "error accessing the ACLs of file %s\n", file2);
-          fflush (stderr);
-          abort ();
-        }
+      fprintf (stderr, "error accessing the ACLs of file %s\n", file2);
+      fflush (stderr);
+      abort ();
+    }
+  if (aclx_printStr (text2, sizeof (text2), acl2, aclsize2, type2, file2, 0) < 0)
+    {
+      fprintf (stderr, "cannot convert the ACLs of file %s to text\n", file2);
+      fflush (stderr);
+      abort ();
     }
-  else
-    if (aclx_printStr (text2, &textsize2, acl2, aclsize2, type2, file2, 0) < 0)
-      {
-        fprintf (stderr, "cannot convert the ACLs of file %s to text\n", file2);
-        fflush (stderr);
-        abort ();
-      }
 
   if (strcmp (text1, text2) != 0)
     {
@@ -626,71 +520,6 @@
                file1, file2);
       return 1;
     }
-#elif HAVE_ACLSORT /* NonStop Kernel */
-  int count1;
-  int count2;
-
-  count1 = acl ((char *) file1, ACL_CNT, NACLENTRIES, NULL);
-  count2 = acl ((char *) file2, ACL_CNT, NACLENTRIES, NULL);
-
-  if (count1 < 0)
-    {
-      fprintf (stderr, "error accessing the ACLs of file %s\n", file1);
-      fflush (stderr);
-      abort ();
-    }
-  if (count2 < 0)
-    {
-      fprintf (stderr, "error accessing the ACLs of file %s\n", file2);
-      fflush (stderr);
-      abort ();
-    }
-  if (count1 != count2)
-    {
-      fprintf (stderr, "files %s and %s have different number of ACLs: %d and %d\n",
-               file1, file2, count1, count2);
-      return 1;
-    }
-  else if (count1 > 0)
-    {
-      struct acl *entries1 = XNMALLOC (count1, struct acl);
-      struct acl *entries2 = XNMALLOC (count2, struct acl);
-      int i;
-
-      if (acl ((char *) file1, ACL_GET, count1, entries1) < count1)
-        {
-          fprintf (stderr, "error retrieving the ACLs of file %s\n", file1);
-          fflush (stderr);
-          abort ();
-        }
-      if (acl ((char *) file2, ACL_GET, count2, entries2) < count1)
-        {
-          fprintf (stderr, "error retrieving the ACLs of file %s\n", file2);
-          fflush (stderr);
-          abort ();
-        }
-      for (i = 0; i < count1; i++)
-        {
-          if (entries1[i].a_type != entries2[i].a_type)
-            {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different types %d and %d\n",
-                       file1, file2, i, entries1[i].a_type, entries2[i].a_type);
-              return 1;
-            }
-          if (entries1[i].a_id != entries2[i].a_id)
-            {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different ids %d and %d\n",
-                       file1, file2, i, (int)entries1[i].a_id, (int)entries2[i].a_id);
-              return 1;
-            }
-          if (entries1[i].a_perm != entries2[i].a_perm)
-            {
-              fprintf (stderr, "files %s and %s: different ACL entry #%d: different permissions %03o and %03o\n",
-                       file1, file2, i, (unsigned int) entries1[i].a_perm, (unsigned int) entries2[i].a_perm);
-              return 1;
-            }
-        }
-    }
 #endif
   }
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sched.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sched.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sched.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sched.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <sched.h> substitute.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,9 +26,6 @@
 /* Check that the SCHED_* macros are defined and compile-time constants.  */
 int b[] = { SCHED_FIFO, SCHED_RR, SCHED_OTHER };
 
-/* Check that the types are all defined.  */
-pid_t t1;
-
 static int f1;
 
 int
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-setenv.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setenv.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-setenv.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setenv.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale1.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale1.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale1.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale1.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/* Test of setting the current locale.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <locale.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (setlocale, char *, (int, const char *));
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "macros.h"
-
-int
-main (int argc, char *argv[])
-{
-  char *name1;
-  char *name2;
-
-  /* Try to set the locale by implicitly looking at the LC_ALL environment
-     variable.
-     configure should already have checked that the locale is supported.  */
-  if (setlocale (LC_ALL, "") == NULL)
-    return 1;
-
-  name1 = strdup (setlocale (LC_ALL, NULL));
-
-  /* Reset the locale.  */
-  if (setlocale (LC_ALL, "C") == NULL)
-    return 1;
-
-  /* Try to set the locale by explicitly looking at the LC_ALL environment
-     variable.
-     configure should already have checked that the locale is supported.  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL)
-    return 1;
-
-  name2 = strdup (setlocale (LC_ALL, NULL));
-
-  /* Test that the two results are the same.  */
-  ASSERT (strcmp (name1, name2) == 0);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-: ${LOCALE_FR=fr_FR}
-: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${LOCALE_JA=ja_JP}
-: ${LOCALE_ZH_CN=zh_CN.GB18030}
-
-if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none \
-   && test $LOCALE_JA = none && test $LOCALE_ZH_CN = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no locale for testing is installed"
-  else
-    echo "Skipping test: no locale for testing is supported"
-  fi
-  exit 77
-fi
-
-if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR      ./test-setlocale1${EXEEXT} || exit 1
-fi
-
-if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./test-setlocale1${EXEEXT} || exit 1
-fi
-
-if test $LOCALE_JA != none; then
-  LC_ALL=$LOCALE_JA      ./test-setlocale1${EXEEXT} || exit 1
-fi
-
-if test $LOCALE_ZH_CN != none; then
-  LC_ALL=$LOCALE_ZH_CN   ./test-setlocale1${EXEEXT} || exit 1
-fi
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale2.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/* Test of setting the current locale.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <locale.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-main ()
-{
-  /* Try to set the locale by implicitly looking at the LC_ALL environment
-     variable.  */
-  if (setlocale (LC_ALL, "") != NULL)
-    /* It was successful.  Check whether LC_CTYPE is non-trivial.  */
-    if (strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-      {
-        fprintf (stderr, "setlocale did not fail for implicit %s\n",
-                 getenv ("LC_ALL"));
-        return 1;
-      }
-
-  /* Reset the locale.  */
-  if (setlocale (LC_ALL, "C") == NULL)
-    return 1;
-
-  /* Try to set the locale by explicitly looking at the LC_ALL environment
-     variable.  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) != NULL)
-    /* It was successful.  Check whether LC_CTYPE is non-trivial.  */
-    if (strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-      {
-        fprintf (stderr, "setlocale did not fail for explicit %s\n",
-                 getenv ("LC_ALL"));
-        return 1;
-      }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-setlocale2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-setlocale2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Test locale names with likely unsupported encoding in Unix syntax.
-for name in ar_SA.ISO-8859-1 fr_FR.CP1251 zh_TW.GB18030 zh_CN.BIG5; do
-  env LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1
-done
-
-# Test locale names with likely unsupported encoding in native Windows syntax.
-for name in "Arabic_Saudi Arabia.1252" "Arabic_Saudi Arabia.65001" \
-            French_France.65001 Japanese_Japan.65001 Turkish_Turkey.65001 \
-            Chinese_Taiwan.65001 Chinese_China.54936 Chinese_China.65001; do
-  # Here we use 'env' to set the LC_ALL environment variable, because on
-  # Solaris 11 2011-11, the /bin/sh refuses to do it for Turkish_Turkey.65001.
-  env LC_ALL="$name" ./test-setlocale2${EXEEXT} 1 || exit 1
-done
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl-1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl-1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl-1.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl-1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Test set-mode-acl on the file system of /var/tmp, which usually is a local
-# file system.
-
-if test -d /var/tmp; then
-  TMPDIR=/var/tmp
-else
-  TMPDIR=/tmp
-fi
-export TMPDIR
-
-exec "${srcdir}/test-set-mode-acl.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl-2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl-2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl-2.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl-2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Test set-mode-acl on the file system of the build directory, which may be
-# a local file system or NFS mounted.
-
-TMPDIR=`pwd`
-export TMPDIR
-
-exec "${srcdir}/test-set-mode-acl.sh"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of setting an ACL equivalent to a mode.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-set-mode-acl.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh	2010-05-09 18:56:36.000000000 +0000
@@ -60,8 +60,8 @@
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none.
-  # TODO: Support also native Windows platforms (mingw).
+  #   linux, cygwin, freebsd, solaris, hpux, osf1, aix, macosx, irix, none.
+  # TODO: Support also native Win32 platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
     # Platforms with the getfacl and setfacl programs.
@@ -88,30 +88,18 @@
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
       # HP-UX, sometimes also IRIX.
-      if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # HP-UX 11.11 or newer.
-        acl_flavor=hpuxjfs
-      else
-        # HP-UX 11.00.
-        acl_flavor=hpux
-      fi
+      acl_flavor=hpux
     else
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
-        # Tru64, NonStop Kernel.
-        if (getacl -m tmpfile0 >/dev/null) 2>/dev/null; then
-          # Tru64.
-          acl_flavor=osf1
-        else
-          # NonStop Kernel.
-          acl_flavor=nsk
-        fi
+        # Tru64.
+        acl_flavor=osf1
       else
         if (aclget tmpfile0 >/dev/null) 2>/dev/null; then
           # AIX.
           acl_flavor=aix
         else
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
-            # Mac OS X.
+            # MacOS X.
             acl_flavor=macosx
           else
             if test -f /sbin/chacl; then
@@ -184,17 +172,9 @@
             orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
             chacl -r "${orig}($auid.%,--x)" tmpfile0
             ;;
-          hpuxjfs)
-            orig=`lsacl tmpfile0 | sed -e 's/ tmpfile0$//'`
-            chacl -r "${orig}($auid.%,--x)" tmpfile0 \
-              || setacl -m user:$auid:1 tmpfile0
-            ;;
           osf1)
             setacl -u user:$auid:1 tmpfile0
             ;;
-          nsk)
-            setacl -m user:$auid:1 tmpfile0
-            ;;
           aix)
             { aclget tmpfile0 | sed -e 's/disabled$/enabled/'; echo "        permit --x u:$auid"; } | aclput tmpfile0
             ;;
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sh-quote.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sh-quote.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sh-quote.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sh-quote.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-/* Test of sh-quote module.
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2012.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "sh-quote.h"
-
-#include <limits.h>
-#include <string.h>
-
-#include "macros.h"
-
-static void
-check_one (const char *input, const char *expected)
-{
-  char buf[1000];
-  size_t output_len;
-  char *output;
-  char *bufend;
-
-  output_len = shell_quote_length (input);
-
-  output = shell_quote (input);
-  ASSERT (strlen (output) == output_len);
-
-  ASSERT (output_len <= sizeof (buf) - 2);
-  memset (buf, '\0', output_len + 1);
-  buf[output_len + 1] = '%';
-  bufend = shell_quote_copy (buf, input);
-  ASSERT (bufend == buf + output_len);
-  ASSERT (memcmp (buf, output, output_len + 1) == 0);
-  ASSERT (buf[output_len + 1] == '%');
-
-  ASSERT (strcmp (output, expected) == 0);
-
-  free (output);
-}
-
-int
-main (void)
-{
-  /* Check the shell_quote_length, shell_quote_copy, shell_quote functions.  */
-  {
-    int c;
-
-    /* Empty argument.  */
-    check_one ("", "''");
-
-    /* Identifier or number.  */
-    check_one ("foo", "foo");
-    check_one ("phr0ck", "phr0ck");
-
-    /* Whitespace would be interpreted as argument separator by the shell.  */
-    check_one ("foo\tbar", "'foo\tbar'");
-    check_one ("foo\nbar", "'foo\nbar'");
-    check_one ("foo\rbar", "'foo\rbar'");
-    check_one ("foo bar", "'foo bar'");
-
-    /* '!' at the beginning of argv[0] would introduce a negated command.  */
-    check_one ("!foo", "'!foo'");
-
-    /* '"' would be interpreted as the start of a string.  */
-    check_one ("\"foo\"bar", "'\"foo\"bar'");
-
-    /* '#' at the beginning of an argument would be interpreted as the start
-       of a comment.  */
-    check_one ("#foo", "'#foo'");
-
-    /* '$' at the beginning of an argument would be interpreted as a variable
-       reference.  */
-    check_one ("$foo", "'$foo'");
-
-    /* '&' at the beginning of an argument would be interpreted as a background
-       task indicator.  */
-    check_one ("&", "'&'");
-
-    /* "'" would be interpreted as the start of a string.  */
-    check_one ("'foo'bar", "''\\''foo'\\''bar'"); /* or "\"'foo'bar\"" */
-
-    /* '(' at the beginning of argv[0] would introduce a subshell command.  */
-    check_one ("(", "'('");
-
-    /* ')' at the beginning of an argument would be interpreted as the end of
-       the command.  */
-    check_one (")", "')'");
-
-    /* '*' would be interpreted as a wildcard character.  */
-    check_one ("*", "'*'");
-    check_one ("*foo", "'*foo'");
-
-    /* ';' at the beginning of an argument would be interpreted as an empty
-       statement in argv[0] and as the end of the command otherwise.  */
-    check_one (";", "';'");
-    check_one ("foo;", "'foo;'");
-
-    /* '<' would be interpreted as a redirection of stdin.  */
-    check_one ("<", "'<'");
-
-    /* '=' inside argv[0] would be interpreted as an environment variable
-       assignment.  */
-    check_one ("foo=bar", "'foo=bar'");
-
-    /* '>' would be interpreted as a redirection of stdout.  */
-    check_one (">", "'>'");
-
-    /* '?' would be interpreted as a wildcard character.  */
-    check_one ("?", "'?'");
-    check_one ("foo?bar", "'foo?bar'");
-
-    /* '^' would be interpreted in old /bin/sh, e.g. SunOS 4.1.4.  */
-    check_one ("^", "'^'");
-
-    /* "[...]" would be interpreted as a wildcard pattern.  */
-    check_one ("[", "'['");
-    check_one ("]", "]"); /* or "']'" */
-
-    /* '\' would be interpreted as an escape character.  */
-    check_one ("\\foo", "'\\foo'");
-
-    /* '`' would be interpreted as the start of a command substitution.  */
-    check_one ("`foo", "'`foo'");
-
-    /* '{' at the beginning of argv[0] would introduce a complex command.  */
-    check_one ("{", "'{'");
-
-    /* '|' at the beginning of an argument would be interpreted as a pipe
-       between commands.  */
-    check_one ("|", "'|'");
-
-    /* '}' at the beginning of an argument would be interpreted as the end of
-       the command.  */
-    check_one ("}", "'}'");
-
-    /* '~' at the beginning of an argument would be interpreted as a reference
-       to a user's home directory.  */
-    check_one ("~", "'~'");
-    check_one ("~foo", "'~foo'");
-
-    /* A string that contains both ' and ".  */
-    check_one ("foo'bar\"baz", "'foo'\\''bar\"baz'"); /* or "\"foo'bar\\\"baz\"" */
-
-    /* All other characters don't need quoting.  */
-    for (c = 1; c <= UCHAR_MAX; c++)
-      if (strchr ("\t\n\r !\"#$&'()*;<=>?^[\\]`{|}~", c) == NULL)
-        {
-          char s[5];
-          s[0] = 'a';
-          s[1] = (char) c;
-          s[2] = 'z';
-          s[3] = (char) c;
-          s[4] = '\0';
-
-          check_one (s, s);
-        }
-  }
-
-  /* Check the shell_quote_argv function.  */
-  {
-    char *argv[1];
-    char *result;
-    argv[0] = NULL;
-    result = shell_quote_argv (argv);
-    ASSERT (strcmp (result, "") == 0);
-    free (result);
-  }
-  {
-    char *argv[2];
-    char *result;
-    argv[0] = (char *) "foo bar/baz";
-    argv[1] = NULL;
-    result = shell_quote_argv (argv);
-    ASSERT (strcmp (result, "'foo bar/baz'") == 0); /* or "\"foo bar/baz\"" */
-    free (result);
-  }
-  {
-    char *argv[3];
-    char *result;
-    argv[0] = (char *) "foo bar/baz";
-    argv[1] = (char *) "$";
-    argv[2] = NULL;
-    result = shell_quote_argv (argv);
-    ASSERT (strcmp (result, "'foo bar/baz' '$'") == 0); /* or "\"foo bar/baz\" \"\\$\"" */
-    free (result);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sigaction.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sigaction.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sigaction.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sigaction.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of sigaction() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,12 +34,6 @@
 #ifndef SA_ONSTACK
 # define SA_ONSTACK 0
 #endif
-#ifndef SA_RESETHAND
-# define SA_RESETHAND 0
-#endif
-#ifndef SA_RESTART
-# define SA_RESTART 0
-#endif
 #ifndef SA_SIGINFO
 # define SA_SIGINFO 0
 #endif
@@ -77,7 +71,7 @@
       /* This assertion fails on glibc-2.3.6 systems with LinuxThreads,
          when this program is linked with -lpthread, due to the sigaction()
          override in libpthread.so.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__)
+#if !defined __GLIBC__
       ASSERT (sa.sa_handler == SIG_DFL);
 #endif
       break;
@@ -107,7 +101,7 @@
   sa.sa_handler = SIG_DFL;
   ASSERT (sigaction (SIGABRT, &sa, &old_sa) == 0);
   ASSERT ((old_sa.sa_flags & SA_SIGINFO) == 0);
-#if !(defined __GLIBC__ || defined __UCLIBC__) /* see above */
+#if !defined __GLIBC__ /* see above */
   ASSERT (old_sa.sa_handler == SIG_DFL);
 #endif
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-signal.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-signal.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-signal.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-signal.c	2010-02-16 21:32:28.000000000 +0000
@@ -0,0 +1,125 @@
+/* Test of <signal.h> substitute.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This 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 Eric Blake <ebb9@byu.net>, 2009.  */
+
+#include <config.h>
+
+#include <signal.h>
+
+/* Check for required types.  */
+struct
+{
+  size_t a;
+  uid_t b;
+  volatile sig_atomic_t c;
+  sigset_t d;
+  pid_t e;
+#if 0
+  /* Not guaranteed by gnulib.  */
+  pthread_t f;
+  struct timespec g;
+#endif
+} s;
+
+int
+main (void)
+{
+  switch (0)
+    {
+      /* The following are guaranteed by C.  */
+    case 0:
+    case SIGABRT:
+    case SIGFPE:
+    case SIGILL:
+    case SIGINT:
+    case SIGSEGV:
+    case SIGTERM:
+      /* The following is guaranteed by gnulib.  */
+#if GNULIB_SIGPIPE || defined SIGPIPE
+    case SIGPIPE:
+#endif
+      /* Ensure no conflict with other standardized names.  */
+#ifdef SIGALRM
+    case SIGALRM:
+#endif
+#ifdef SIGBUS
+    case SIGBUS:
+#endif
+#ifdef SIGCHLD
+    case SIGCHLD:
+#endif
+#ifdef SIGCONT
+    case SIGCONT:
+#endif
+#ifdef SIGHUP
+    case SIGHUP:
+#endif
+#ifdef SIGKILL
+    case SIGKILL:
+#endif
+#ifdef SIGQUIT
+    case SIGQUIT:
+#endif
+#ifdef SIGSTOP
+    case SIGSTOP:
+#endif
+#ifdef SIGTSTP
+    case SIGTSTP:
+#endif
+#ifdef SIGTTIN
+    case SIGTTIN:
+#endif
+#ifdef SIGTTOU
+    case SIGTTOU:
+#endif
+#ifdef SIGUSR1
+    case SIGUSR1:
+#endif
+#ifdef SIGUSR2
+    case SIGUSR2:
+#endif
+#ifdef SIGSYS
+    case SIGSYS:
+#endif
+#ifdef SIGTRAP
+    case SIGTRAP:
+#endif
+#ifdef SIGURG
+    case SIGURG:
+#endif
+#ifdef SIGVTALRM
+    case SIGVTALRM:
+#endif
+#ifdef SIGXCPU
+    case SIGXCPU:
+#endif
+#ifdef SIGXFSZ
+    case SIGXFSZ:
+#endif
+      /* SIGRTMIN and SIGRTMAX need not be compile-time constants.  */
+#if 0
+# ifdef SIGRTMIN
+    case SIGRTMIN:
+# endif
+# ifdef SIGRTMAX
+    case SIGRTMAX:
+# endif
+#endif
+      ;
+    }
+  return s.a + s.b + s.c + s.e;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-signal-h.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-signal-h.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-signal-h.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-signal-h.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/* Test of <signal.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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 Eric Blake <ebb9@byu.net>, 2009.  */
-
-#include <config.h>
-
-#include <signal.h>
-
-/* Check for required types.  */
-struct
-{
-  size_t a;
-  uid_t b;
-  volatile sig_atomic_t c;
-  sigset_t d;
-  pid_t e;
-#if 0
-  /* Not guaranteed by gnulib.  */
-  pthread_t f;
-  struct timespec g;
-#endif
-} s;
-
-/* Check that NSIG is defined.  */
-int nsig = NSIG;
-
-int
-main (void)
-{
-  switch (0)
-    {
-      /* The following are guaranteed by C.  */
-    case 0:
-    case SIGABRT:
-    case SIGFPE:
-    case SIGILL:
-    case SIGINT:
-    case SIGSEGV:
-    case SIGTERM:
-      /* The following is guaranteed by gnulib.  */
-#if GNULIB_SIGPIPE || defined SIGPIPE
-    case SIGPIPE:
-#endif
-      /* Ensure no conflict with other standardized names.  */
-#ifdef SIGALRM
-    case SIGALRM:
-#endif
-      /* On Haiku, SIGBUS is mistakenly equal to SIGSEGV.  */
-#if defined SIGBUS && SIGBUS != SIGSEGV
-    case SIGBUS:
-#endif
-#ifdef SIGCHLD
-    case SIGCHLD:
-#endif
-#ifdef SIGCONT
-    case SIGCONT:
-#endif
-#ifdef SIGHUP
-    case SIGHUP:
-#endif
-#ifdef SIGKILL
-    case SIGKILL:
-#endif
-#ifdef SIGQUIT
-    case SIGQUIT:
-#endif
-#ifdef SIGSTOP
-    case SIGSTOP:
-#endif
-#ifdef SIGTSTP
-    case SIGTSTP:
-#endif
-#ifdef SIGTTIN
-    case SIGTTIN:
-#endif
-#ifdef SIGTTOU
-    case SIGTTOU:
-#endif
-#ifdef SIGUSR1
-    case SIGUSR1:
-#endif
-#ifdef SIGUSR2
-    case SIGUSR2:
-#endif
-#ifdef SIGSYS
-    case SIGSYS:
-#endif
-#ifdef SIGTRAP
-    case SIGTRAP:
-#endif
-#ifdef SIGURG
-    case SIGURG:
-#endif
-#ifdef SIGVTALRM
-    case SIGVTALRM:
-#endif
-#ifdef SIGXCPU
-    case SIGXCPU:
-#endif
-#ifdef SIGXFSZ
-    case SIGXFSZ:
-#endif
-      /* SIGRTMIN and SIGRTMAX need not be compile-time constants.  */
-#if 0
-# ifdef SIGRTMIN
-    case SIGRTMIN:
-# endif
-# ifdef SIGRTMAX
-    case SIGRTMAX:
-# endif
-#endif
-      ;
-    }
-  return s.a + s.b + s.c + s.e;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sigpipe.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sigpipe.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sigpipe.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sigpipe.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of SIGPIPE handling.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sigprocmask.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sigprocmask.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sigprocmask.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sigprocmask.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/* Test of sigprocmask.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#include <config.h>
-
-#include <signal.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (sigprocmask, int, (int, const sigset_t *, sigset_t *));
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
-
-static volatile int sigint_occurred;
-
-static void
-sigint_handler (int sig)
-{
-  sigint_occurred++;
-}
-
-int
-main (int argc, char *argv[])
-{
-  sigset_t set;
-  pid_t pid = getpid ();
-  char command[80];
-
-  if (sizeof (int) < sizeof pid && 0x7fffffff < pid)
-    {
-      fputs ("Skipping test: pid too large\n", stderr);
-      return 77;
-    }
-
-  signal (SIGINT, sigint_handler);
-
-  sigemptyset (&set);
-  sigaddset (&set, SIGINT);
-
-  /* Check error handling.  */
-  ASSERT (sigprocmask (1729, &set, NULL) == -1);
-  ASSERT (errno == EINVAL);
-
-  /* Block SIGINT.  */
-  ASSERT (sigprocmask (SIG_BLOCK, &set, NULL) == 0);
-
-  /* Request a SIGINT signal from outside.  */
-  sprintf (command, "sh -c 'sleep 1; kill -%d %d' &", SIGINT, (int) pid);
-  ASSERT (system (command) == 0);
-
-  /* Wait.  */
-  sleep (2);
-
-  /* The signal should not have arrived yet, because it is blocked.  */
-  ASSERT (sigint_occurred == 0);
-
-  /* Unblock SIGINT.  */
-  ASSERT (sigprocmask (SIG_UNBLOCK, &set, NULL) == 0);
-
-  /* The signal should have arrived now, because POSIX says
-       "If there are any pending unblocked signals after the call to
-        sigprocmask(), at least one of those signals shall be delivered
-        before the call to sigprocmask() returns."  */
-  ASSERT (sigint_occurred == 1);
-
-  return 0;
-}
-
-#else
-
-/* On native Windows, getpid() values and the arguments that are passed to
-   the (Cygwin?) 'kill' program are not necessarily related.  */
-
-int
-main ()
-{
-  fputs ("Skipping test: native Windows platform\n", stderr);
-  return 77;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sleep.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sleep.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sleep.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sleep.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/* Test of sleep() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (sleep, unsigned int, (unsigned int));
-
-#include <signal.h>
-
-#include "macros.h"
-
-#if HAVE_DECL_ALARM
-static void
-handle_alarm (int sig)
-{
-  if (sig != SIGALRM)
-    _exit (1);
-}
-#endif
-
-int
-main (void)
-{
-  ASSERT (sleep (1) <= 1);
-
-  ASSERT (sleep (0) == 0);
-
-#if HAVE_DECL_ALARM
-  {
-    const unsigned int pentecost = 50 * 24 * 60 * 60; /* 50 days.  */
-    unsigned int remaining;
-    signal (SIGALRM, handle_alarm);
-    alarm (1);
-    remaining = sleep (pentecost);
-    ASSERT (pentecost - 10 < remaining && remaining <= pentecost);
-  }
-#endif
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-snprintf.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-snprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-snprintf.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-snprintf.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of snprintf() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,16 +34,15 @@
   int size;
   int retval;
 
-  retval = snprintf (NULL, 0, "%d", 12345);
-  ASSERT (retval == 5);
-
   for (size = 0; size <= 8; size++)
     {
       memcpy (buf, "DEADBEEF", 8);
       retval = snprintf (buf, size, "%d", 12345);
-      ASSERT (retval == 5);
       if (size < 6)
         {
+#if CHECK_SNPRINTF_POSIX
+          ASSERT (retval < 0 || retval >= size);
+#endif
           if (size > 0)
             {
               ASSERT (memcmp (buf, "12345", size - 1) == 0);
@@ -52,21 +51,14 @@
 #if !CHECK_SNPRINTF_POSIX
           if (size > 0)
 #endif
-            ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0);
+            ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
         }
       else
         {
+          ASSERT (retval == 5);
           ASSERT (memcmp (buf, "12345\0EF", 8) == 0);
         }
     }
 
-  /* Test the support of the POSIX/XSI format strings with positions.  */
-  {
-    char result[100];
-    retval = snprintf (result, sizeof (result), "%2$d %1$d", 33, 55);
-    ASSERT (strcmp (result, "55 33") == 0);
-    ASSERT (retval == strlen (result));
-  }
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn.c	2010-03-28 18:32:32.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <spawn.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 Free Software Foundation, Inc.
 
    This 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 +40,7 @@
 int
 main (void)
 {
-  switch (POSIX_SPAWN_RESETIDS)
+  switch (0)
     {
     case POSIX_SPAWN_RESETIDS:
     case POSIX_SPAWN_SETPGROUP:
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn-pipe-child.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn-pipe-child.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn-pipe-child.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn-pipe-child.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-/* Child program invoked by test-spawn-pipe-main.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-/* Depending on arguments, this test intentionally closes stderr or
-   starts life with stderr closed.  So, we arrange to have fd 10
-   (outside the range of interesting fd's during the test) set up to
-   duplicate the original stderr.  */
-
-#define BACKUP_STDERR_FILENO 10
-#define ASSERT_STREAM myerr
-#include "macros.h"
-
-static FILE *myerr;
-
-/* In this file, we use only system functions, no overrides from gnulib.  */
-#undef atoi
-#undef close
-#undef fcntl
-#undef fdopen
-#undef fflush
-#undef fprintf
-#undef read
-#undef write
-
-/* Return non-zero if FD is open.  */
-static int
-is_open (int fd)
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
-     descriptors is that they are open but point to an
-     INVALID_HANDLE_VALUE, and there is no fcntl.  */
-  return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
-#else
-# ifndef F_GETFL
-#  error Please port fcntl to your platform
-# endif
-  return 0 <= fcntl (fd, F_GETFL);
-#endif
-}
-
-int
-main (int argc, char *argv[])
-{
-  char buffer[2] = { 's', 't' };
-  int fd;
-
-  /* fd 2 might be closed, but fd BACKUP_STDERR_FILENO is the original
-     stderr.  */
-  myerr = fdopen (BACKUP_STDERR_FILENO, "w");
-  if (!myerr)
-    return 2;
-
-  ASSERT (argc == 2);
-
-  /* Read one byte from fd 0, and write its value plus one to fd 1.
-     fd 2 should be closed iff the argument is 1.  Check that no other file
-     descriptors leaked.  */
-
-  ASSERT (read (STDIN_FILENO, buffer, 2) == 1);
-
-  buffer[0]++;
-  ASSERT (write (STDOUT_FILENO, buffer, 1) == 1);
-
-  switch (atoi (argv[1]))
-    {
-    case 0:
-      /* Expect fd 2 is open.  */
-      ASSERT (is_open (STDERR_FILENO));
-      break;
-    case 1:
-      /* Expect fd 2 is closed.
-         But on HP-UX 11, fd 2 gets automatically re-opened to /dev/null if it
-         was closed. Future POSIX will allow this, see
-         <http://austingroupbugs.net/view.php?id=173>.  */
-#if !defined __hpux
-      ASSERT (! is_open (STDERR_FILENO));
-#endif
-      break;
-    default:
-      ASSERT (0);
-    }
-
-  for (fd = 3; fd < 7; fd++)
-    {
-      errno = 0;
-      ASSERT (close (fd) == -1);
-      ASSERT (errno == EBADF);
-    }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn-pipe-main.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn-pipe-main.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn-pipe-main.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn-pipe-main.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-/* Test of create_pipe_bidi/wait_subprocess.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-#include "spawn-pipe.h"
-#include "wait-process.h"
-#include "progname.h"
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Depending on arguments, this test intentionally closes stderr or
-   starts life with stderr closed.  So, we arrange to have fd 10
-   (outside the range of interesting fd's during the test) set up to
-   duplicate the original stderr.  */
-
-#define BACKUP_STDERR_FILENO 10
-#define ASSERT_STREAM myerr
-#include "macros.h"
-
-static FILE *myerr;
-
-/* Create a bi-directional pipe to a test child, and validate that the
-   child program returns the expected output.
-   PROG is the program to run in the child process.
-   STDERR_CLOSED is true if we have already closed fd 2.  */
-static void
-test_pipe (const char *prog, bool stderr_closed)
-{
-  int fd[2];
-  char *argv[3];
-  pid_t pid;
-  char buffer[2] = { 'a', 't' };
-
-  /* Set up child.  */
-  argv[0] = (char *) prog;
-  argv[1] = (char *) (stderr_closed ? "1" : "0");
-  argv[2] = NULL;
-  pid = create_pipe_bidi (prog, prog, argv, false, true, true, fd);
-  ASSERT (0 <= pid);
-  ASSERT (STDERR_FILENO < fd[0]);
-  ASSERT (STDERR_FILENO < fd[1]);
-
-  /* Push child's input.  */
-  ASSERT (write (fd[1], buffer, 1) == 1);
-  ASSERT (close (fd[1]) == 0);
-
-  /* Get child's output.  */
-  ASSERT (read (fd[0], buffer, 2) == 1);
-
-  /* Wait for child.  */
-  ASSERT (wait_subprocess (pid, prog, true, false, true, true, NULL) == 0);
-  ASSERT (close (fd[0]) == 0);
-
-  /* Check the result.  */
-  ASSERT (buffer[0] == 'b');
-  ASSERT (buffer[1] == 't');
-}
-
-int
-main (int argc, char *argv[])
-{
-  int test;
-  int fd;
-
-  set_program_name (argv[0]);
-
-  if (argc != 3)
-    {
-      fprintf (stderr, "%s: need 2 arguments\n", argv[0]);
-      return 2;
-    }
-  /* We might close fd 2 later, so save it in fd 10.  */
-  if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
-      || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
-    return 2;
-
-  /* Selectively close various standard fds, to verify the child process is
-     not impacted by this.  */
-  test = atoi (argv[2]);
-  switch (test)
-    {
-    case 0:
-      break;
-    case 1:
-      close (0);
-      break;
-    case 2:
-      close (1);
-      break;
-    case 3:
-      close (0);
-      close (1);
-      break;
-    case 4:
-      close (2);
-      break;
-    case 5:
-      close (0);
-      close (2);
-      break;
-    case 6:
-      close (1);
-      close (2);
-      break;
-    case 7:
-      close (0);
-      close (1);
-      close (2);
-      break;
-    default:
-      ASSERT (false);
-    }
-
-  /* Plug any file descriptor leaks inherited from outside world before
-     starting, so that child has a clean slate (at least for the fds that we
-     might be manipulating).  */
-  for (fd = 3; fd < 7; fd++)
-    close (fd);
-
-  test_pipe (argv[1], test >= 4);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn-pipe.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn-pipe.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-spawn-pipe.sh	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-spawn-pipe.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-st=0
-for i in 0 1 2 3 4 5 6 7 ; do
-  ./test-spawn-pipe-main${EXEEXT} ./test-spawn-pipe-child${EXEEXT} $i \
-    || { echo test-spawn-pipe.sh: iteration $i failed >&2; st=1; }
-done
-exit $st
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stat.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stat.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stat.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stat.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "pathmax.h"
 #include "same-inode.h"
 #include "macros.h"
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stat.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stat.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stat.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stat.h	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,9 +27,9 @@
 {
   struct stat st1;
   struct stat st2;
-  char *cwd = getcwd (NULL, 0);
+  char cwd[PATH_MAX];
 
-  ASSERT (cwd);
+  ASSERT (getcwd (cwd, PATH_MAX) == cwd);
   ASSERT (func (".", &st1) == 0);
   ASSERT (func ("./", &st2) == 0);
   ASSERT (SAME_INODE (st1, st2));
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stdbool.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdbool.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stdbool.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdbool.c	2010-05-24 09:42:51.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,17 +16,6 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* We want this test to succeed even when using gcc's -Werror; but to
-   do that requires a pragma that didn't exist before 4.3.0.  */
-#ifndef __GNUC__
-# define ADDRESS_CHECK_OKAY
-#elif __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-/* No way to silence -Waddress.  */
-#else
-# pragma GCC diagnostic ignored "-Waddress"
-# define ADDRESS_CHECK_OKAY
-#endif
-
 #include <config.h>
 
 #include <stdbool.h>
@@ -50,36 +39,49 @@
  "error: __bool_true_false_are_defined is not defined"
 #endif
 
-/* Several tests cannot be guaranteed with gnulib's <stdbool.h>, at
-   least, not for all compilers and compiler options.  */
-#if HAVE_STDBOOL_H || 3 <= __GNUC__
+#if 0 /* Cannot be guaranteed with gnulib's <stdbool.h>.  */
 struct s { _Bool s: 1; _Bool t; } s;
 #endif
 
 char a[true == 1 ? 1 : -1];
 char b[false == 0 ? 1 : -1];
 char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-#if HAVE_STDBOOL_H || 3 <= __GNUC__ /* See above.  */
+#if 0 /* Cannot be guaranteed with gnulib's <stdbool.h>, at least,
+not for all compilers.  */
 char d[(bool) 0.5 == true ? 1 : -1];
-# ifdef ADDRESS_CHECK_OKAY /* Avoid gcc warning.  */
-/* C99 may plausibly be interpreted as not requiring support for a cast from
-   a variable's address to bool in a static initializer.  So treat it like a
-   GCC extension.  */
-#  ifdef __GNUC__
 bool e = &s;
-#  endif
-# endif
 char f[(_Bool) 0.0 == false ? 1 : -1];
 #endif
 char g[true];
 char h[sizeof (_Bool)];
-#if HAVE_STDBOOL_H || 3 <= __GNUC__ /* See above.  */
+#if 0 /* See above.  */
 char i[sizeof s.t];
 #endif
 enum { j = false, k = true, l = false * true, m = true * 256 };
 _Bool n[m];
 char o[sizeof n == m * sizeof n[0] ? 1 : -1];
 char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+#if 0 /* Cannot be guaranteed with gnulib's <stdbool.h>.  */
+#if defined __xlc__ || defined __GNUC__
+ /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+    reported by James Lemley on 2005-10-05; see
+    http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+    This test is not quite right, since xlc is allowed to
+    reject this program, as the initializer for xlcbug is
+    not one of the forms that C requires support for.
+    However, doing the test right would require a run-time
+    test, and that would make cross-compilation harder.
+    Let us hope that IBM fixes the xlc bug, and also adds
+    support for this kind of constant expression.  In the
+    meantime, this test will reject xlc, which is OK, since
+    our stdbool.h substitute should suffice.  We also test
+    this with GCC, where it should work, to detect more
+    quickly whether someone messes up the test in the
+    future.  */
+ char digs[] = "0123456789";
+ int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+#endif
+#endif
 /* Catch a bug in an HP-UX C compiler.  See
    http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
    http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
@@ -90,29 +92,5 @@
 int
 main ()
 {
-  int error = 0;
-
-#if HAVE_STDBOOL_H || 3 <= __GNUC__ /* See above.  */
-# ifdef ADDRESS_CHECK_OKAY /* Avoid gcc warning.  */
-  /* A cast from a variable's address to bool is valid in expressions.  */
-  {
-    bool e1 = &s;
-    if (!e1)
-      error = 1;
-  }
-# endif
-#endif
-
-  /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-     reported by James Lemley on 2005-10-05; see
-     http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-     This is a runtime test, since a corresponding compile-time
-     test would rely on initializer extensions.  */
-  {
-    char digs[] = "0123456789";
-    if (&(digs + 5)[-2 + (bool) 1] != &digs[4])
-      error = 1;
-  }
-
-  return error;
+  return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stddef.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stddef.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stddef.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stddef.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This 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,20 +31,6 @@
    per POSIX 2008.  */
 verify (sizeof NULL == sizeof (void *));
 
-/* Check that offsetof produces integer constants with correct type.  */
-struct d
-{
-  char e;
-  char f;
-};
-/* Solaris 10 has a bug where offsetof is under-parenthesized, and
-   cannot be used as an arbitrary expression.  However, since it is
-   unlikely to bite real code, we ignore that short-coming.  */
-/* verify (sizeof offsetof (struct d, e) == sizeof (size_t)); */
-verify (sizeof (offsetof (struct d, e)) == sizeof (size_t));
-verify (offsetof (struct d, e) < -1); /* Must be unsigned.  */
-verify (offsetof (struct d, f) == 1);
-
 int
 main (void)
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stdint.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdint.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stdint.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdint.c	2010-04-25 09:21:51.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 /* Whether to enable pedantic checks. */
 #define DO_PEDANTIC 0
 
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* likewise */
 #include <stdint.h>
 
 #include "verify.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stdio.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdio.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stdio.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdio.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <stdio.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-stdlib.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdlib.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-stdlib.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-stdlib.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <stdlib.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,33 +22,22 @@
 
 #include "verify.h"
 
-/* Check that EXIT_SUCCESS is 0, per POSIX.  */
-static int exitcode = EXIT_SUCCESS;
-#if EXIT_SUCCESS
-"oops"
-#endif
-
-/* Check for GNU value (not guaranteed by POSIX, but is guaranteed by
-   gnulib).  */
-#if EXIT_FAILURE != 1
-"oops"
-#endif
+int exitcode;
 
 /* Check that NULL can be passed through varargs as a pointer type,
    per POSIX 2008.  */
 verify (sizeof NULL == sizeof (void *));
 
-#if GNULIB_TEST_SYSTEM_POSIX
-# include "test-sys_wait.h"
-#else
-# define test_sys_wait_macros() 0
-#endif
-
 int
 main (void)
 {
-  if (test_sys_wait_macros ())
-    return 1;
+  /* Check that some macros are defined and different integer constants.  */
+  switch (exitcode)
+    {
+    case EXIT_SUCCESS:
+    case EXIT_FAILURE:
+      break;
+    }
 
-  return exitcode;
+  return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-strchrnul.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strchrnul.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-strchrnul.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strchrnul.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-strerror.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strerror.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-strerror.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strerror.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of strerror() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2007.  */
 
@@ -32,44 +33,25 @@
 {
   char *str;
 
-  errno = 0;
   str = strerror (EACCES);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
 
-  errno = 0;
   str = strerror (ETIMEDOUT);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
 
-  errno = 0;
   str = strerror (EOVERFLOW);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
 
-  /* POSIX requires strerror (0) to succeed.  Reject use of "Unknown
-     error", but allow "Success", "No error", or even Solaris' "Error
-     0" which are distinct patterns from true out-of-range strings.
-     http://austingroupbugs.net/view.php?id=382  */
-  errno = 0;
   str = strerror (0);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
-  ASSERT (strstr (str, "nknown") == NULL);
-  ASSERT (strstr (str, "ndefined") == NULL);
-
-  /* POSIX requires strerror to produce a non-NULL result for all
-     inputs; as an extension, we also guarantee a non-empty result.
-     Reporting EINVAL is optional.  */
-  errno = 0;
+
   str = strerror (-3);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0 || errno == EINVAL);
 
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-striconv.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-striconv.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-striconv.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-striconv.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-striconveha.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-striconveha.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-striconveha.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-striconveha.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of character set conversion with error handling and autodetection.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -401,7 +401,7 @@
     }
 # endif
 
-# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   /* Test conversion from UTF-8 to ISO-8859-1 with transliteration.  */
   for (h = 0; h < SIZEOF (handlers); h++)
     {
@@ -577,7 +577,7 @@
     }
 # endif
 
-# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   /* Test conversion from UTF-8 to ISO-8859-1 with transliteration.  */
   for (h = 0; h < SIZEOF (handlers); h++)
     {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-striconveh.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-striconveh.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-striconveh.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-striconveh.c	2010-06-03 21:36:17.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of character set conversion with error handling.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-string.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-string.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-string.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-string.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <string.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-strnlen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strnlen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-strnlen.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strnlen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2010-2014 Free Software Foundation, Inc.
- * Written by Eric Blake
- *
- * This 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 <string.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (strnlen, size_t, (char const *, size_t));
-
-#include <stdlib.h>
-
-#include "zerosize-ptr.h"
-#include "macros.h"
-
-int
-main (void)
-{
-  size_t i;
-  char *page_boundary = (char *) zerosize_ptr ();
-  if (!page_boundary)
-    {
-      page_boundary = malloc (0x1000);
-      ASSERT (page_boundary);
-      page_boundary += 0x1000;
-    }
-
-  /* Basic behavior tests.  */
-  ASSERT (strnlen ("a", 0) == 0);
-  ASSERT (strnlen ("a", 1) == 1);
-  ASSERT (strnlen ("a", 2) == 1);
-  ASSERT (strnlen ("", 0x100000) == 0);
-
-  /* Memory fence and alignment testing.  */
-  for (i = 0; i < 512; i++)
-    {
-      char *start = page_boundary - i;
-      size_t j = i;
-      memset (start, 'x', i);
-      do
-        {
-          if (i != j)
-            {
-              start[j] = 0;
-              ASSERT (strnlen (start, i + j) == j);
-            }
-          ASSERT (strnlen (start, i) == j);
-          ASSERT (strnlen (start, j) == j);
-        }
-      while (j--);
-    }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-strstr.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strstr.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-strstr.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strstr.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  * Written by Bruno Haible and Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
@@ -37,9 +37,8 @@
      caused by SIGALRM.  All known platforms that lack alarm also have
      a quadratic strstr, and the replacement strstr is known to not
      take too long.  */
-  int alarm_value = 50;
   signal (SIGALRM, SIG_DFL);
-  alarm (alarm_value);
+  alarm (50);
 #endif
 
   {
@@ -92,31 +91,12 @@
     ASSERT (result == input + 11);
   }
 
-  /* Check that a long periodic needle does not cause false positives.  */
-  {
-    const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                         "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                         "_C3_A7_20_EF_BF_BD";
-    const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
-    const char *result = strstr (input, need);
-    ASSERT (result == NULL);
-  }
-  {
-    const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                         "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD"
-                         "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20"
-                         "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
-    const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
-    const char *result = strstr (input, need);
-    ASSERT (result == input + 115);
-  }
-
   /* Check that a very long haystack is handled quickly if the needle is
      short and occurs near the beginning.  */
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *needle =
+    char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
     char *haystack = (char *) malloc (m + 1);
@@ -140,7 +120,7 @@
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    const char *haystack =
+    char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB";
     char *needle = (char *) malloc (m + 1);
@@ -185,94 +165,5 @@
   /* Sublinear speed is only possible in memmem; strstr must examine
      every character of haystack to find its length.  */
 
-
-  {
-    /* Ensure that with a barely periodic "short" needle, strstr's
-       search does not mistakenly skip just past the match point.
-       This use of strstr would mistakenly return NULL before
-       gnulib v0.0-4927.  */
-    const char *haystack =
-      "\n"
-      "with_build_libsubdir\n"
-      "with_local_prefix\n"
-      "with_gxx_include_dir\n"
-      "with_cpp_install_dir\n"
-      "enable_generated_files_in_srcdir\n"
-      "with_gnu_ld\n"
-      "with_ld\n"
-      "with_demangler_in_ld\n"
-      "with_gnu_as\n"
-      "with_as\n"
-      "enable_largefile\n"
-      "enable_werror_always\n"
-      "enable_checking\n"
-      "enable_coverage\n"
-      "enable_gather_detailed_mem_stats\n"
-      "enable_build_with_cxx\n"
-      "with_stabs\n"
-      "enable_multilib\n"
-      "enable___cxa_atexit\n"
-      "enable_decimal_float\n"
-      "enable_fixed_point\n"
-      "enable_threads\n"
-      "enable_tls\n"
-      "enable_objc_gc\n"
-      "with_dwarf2\n"
-      "enable_shared\n"
-      "with_build_sysroot\n"
-      "with_sysroot\n"
-      "with_specs\n"
-      "with_pkgversion\n"
-      "with_bugurl\n"
-      "enable_languages\n"
-      "with_multilib_list\n";
-    const char *needle = "\n"
-      "with_gnu_ld\n";
-    const char* p = strstr (haystack, needle);
-    ASSERT (p - haystack == 114);
-  }
-
-  {
-    /* Same bug, shorter trigger.  */
-    const char *haystack = "..wi.d.";
-    const char *needle = ".d.";
-    const char* p = strstr (haystack, needle);
-    ASSERT (p - haystack == 4);
-  }
-
-  {
-    /* Like the above, but trigger the flaw in two_way_long_needle
-       by using a needle of length LONG_NEEDLE_THRESHOLD (32) or greater.
-       Rather than trying to find the right alignment manually, I've
-       arbitrarily chosen the following needle and template for the
-       haystack, and ensure that for each placement of the needle in
-       that haystack, strstr finds it.  */
-    const char *needle = "\nwith_gnu_ld-extend-to-len-32-b\n";
-    const char *h =
-      "\n"
-      "with_build_libsubdir\n"
-      "with_local_prefix\n"
-      "with_gxx_include_dir\n"
-      "with_cpp_install_dir\n"
-      "with_e_\n"
-      "..............................\n"
-      "with_FGHIJKLMNOPQRSTUVWXYZ\n"
-      "with_567890123456789\n"
-      "with_multilib_list\n";
-    size_t h_len = strlen (h);
-    char *haystack = malloc (h_len + 1);
-    size_t i;
-    ASSERT (haystack);
-    for (i = 0; i < h_len - strlen (needle); i++)
-      {
-        const char *p;
-        memcpy (haystack, h, h_len + 1);
-        memcpy (haystack + i, needle, strlen (needle) + 1);
-        p = strstr (haystack, needle);
-        ASSERT (p);
-        ASSERT (p - haystack == i);
-      }
-  }
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-strtol.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strtol.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-strtol.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strtol.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2011-2014 Free Software Foundation, Inc.
- *
- * This 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 <stdlib.h>
-
-#include "signature.h"
-#ifndef strtol
-SIGNATURE_CHECK (strtol, long, (const char *, char **, int));
-#endif
-
-#include <errno.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  /* Subject sequence empty or invalid.  */
-  {
-    const char input[] = "";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-  {
-    const char input[] = " ";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-  {
-    const char input[] = " +";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-  {
-    const char input[] = " -";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-
-  /* Simple integer values.  */
-  {
-    const char input[] = "0";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input + 1);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "+0";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input + 2);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "-0";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input + 2);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "23";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 23);
-    ASSERT (ptr == input + 2);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = " 23";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 23);
-    ASSERT (ptr == input + 3);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "+23";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 23);
-    ASSERT (ptr == input + 3);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "-23";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == -23);
-    ASSERT (ptr == input + 3);
-    ASSERT (errno == 0);
-  }
-
-  /* Large integer values.  */
-  {
-    const char input[] = "2147483647";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == 2147483647);
-    ASSERT (ptr == input + 10);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "-2147483648";
-    char *ptr;
-    long result;
-    errno = 0;
-    result = strtol (input, &ptr, 10);
-    ASSERT (result == -2147483647 - 1);
-    ASSERT (ptr == input + 11);
-    ASSERT (errno == 0);
-  }
-  if (sizeof (long) > sizeof (int))
-    {
-      const char input[] = "4294967295";
-      char *ptr;
-      long result;
-      errno = 0;
-      result = strtol (input, &ptr, 10);
-      ASSERT (result == 65535L * 65537L);
-      ASSERT (ptr == input + 10);
-      ASSERT (errno == 0);
-    }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-strtoul.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strtoul.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-strtoul.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-strtoul.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2011-2014 Free Software Foundation, Inc.
- *
- * This 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 <stdlib.h>
-
-#include "signature.h"
-#ifndef strtoul
-SIGNATURE_CHECK (strtoul, unsigned long, (const char *, char **, int));
-#endif
-
-#include <errno.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  /* Subject sequence empty or invalid.  */
-  {
-    const char input[] = "";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-  {
-    const char input[] = " ";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-  {
-    const char input[] = " +";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-  {
-    const char input[] = " -";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input);
-    ASSERT (errno == 0 || errno == EINVAL);
-  }
-
-  /* Simple integer values.  */
-  {
-    const char input[] = "0";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input + 1);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "+0";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input + 2);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "-0";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 0);
-    ASSERT (ptr == input + 2);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "23";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 23);
-    ASSERT (ptr == input + 2);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = " 23";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 23);
-    ASSERT (ptr == input + 3);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "+23";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 23);
-    ASSERT (ptr == input + 3);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "-23";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == - 23UL);
-    ASSERT (ptr == input + 3);
-    ASSERT (errno == 0);
-  }
-
-  /* Large integer values.  */
-  {
-    const char input[] = "2147483647";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 2147483647);
-    ASSERT (ptr == input + 10);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "-2147483648";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == - 2147483648UL);
-    ASSERT (ptr == input + 11);
-    ASSERT (errno == 0);
-  }
-  {
-    const char input[] = "4294967295";
-    char *ptr;
-    unsigned long result;
-    errno = 0;
-    result = strtoul (input, &ptr, 10);
-    ASSERT (result == 4294967295U);
-    ASSERT (ptr == input + 10);
-    ASSERT (errno == 0);
-  }
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-symlink.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-symlink.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-symlink.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-symlink.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-symlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-symlink.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-symlink.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-symlink.h	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_select.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_select.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_select.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_select.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <sys/select.h> substitute.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,32 +20,8 @@
 
 #include <sys/select.h>
 
-#include "signature.h"
-
-/* The following may be macros without underlying functions, so only
-   check signature if they are not macros.  */
-#ifndef FD_CLR
-SIGNATURE_CHECK (FD_CLR, void, (int, fd_set *));
-#endif
-#ifndef FD_ISSET
-SIGNATURE_CHECK (FD_ISSET, void, (int, fd_set *));
-#endif
-#ifndef FD_SET
-SIGNATURE_CHECK (FD_SET, int, (int, fd_set *));
-#endif
-#ifndef FD_ZERO
-SIGNATURE_CHECK (FD_ZERO, void, (fd_set *));
-#endif
-
 /* Check that the 'struct timeval' type is defined.  */
-struct timeval a;
-
-/* Check that a.tv_sec is wide enough to hold a time_t, ignoring
-   signedness issues.  */
-typedef int verify_tv_sec_type[sizeof (time_t) <= sizeof (a.tv_sec) ? 1 : -1];
-
-/* Check that sigset_t is defined.  */
-sigset_t t2;
+struct timeval t1;
 
 int
 main (void)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_socket.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_socket.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_socket.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_socket.c	2010-02-16 21:32:28.000000000 +0000
@@ -0,0 +1,53 @@
+/* Test of <sys/socket.h> substitute.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
+
+#include <config.h>
+
+#include <sys/socket.h>
+
+#include <errno.h>
+
+#if HAVE_SHUTDOWN
+/* Check some integer constant expressions.  */
+int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };
+#endif
+
+int
+main (void)
+{
+  struct sockaddr_storage x;
+  sa_family_t i;
+
+  /* Check some errno values.  */
+  switch (0)
+    {
+    case ENOTSOCK:
+    case EADDRINUSE:
+    case ENETRESET:
+    case ECONNABORTED:
+    case ECONNRESET:
+    case ENOTCONN:
+    case ESHUTDOWN:
+      break;
+    }
+
+  x.ss_family = 42;
+  i = 42;
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_stat.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_stat.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_stat.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_stat.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <sys/stat.h> substitute.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,14 +26,11 @@
 int a[] =
   {
     S_IFMT,
-#ifdef S_IFBLK /* missing on MSVC */
-    S_IFBLK,
-#endif
-    S_IFCHR, S_IFDIR, S_IFIFO, S_IFREG,
-#ifdef S_IFLNK /* missing on native Windows and DJGPP */
+    S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFREG,
+#ifdef S_IFLNK /* missing on mingw and djgpp */
     S_IFLNK,
 #endif
-#ifdef S_IFSOCK /* missing on native Windows and DJGPP */
+#ifdef S_IFSOCK /* missing on mingw and djgpp */
     S_IFSOCK,
 #endif
     S_IRWXU, S_IRUSR, S_IWUSR, S_IXUSR,
@@ -49,7 +46,6 @@
     S_ISSOCK (S_IFREG),
     S_ISDOOR (S_IFREG),
     S_ISMPB (S_IFREG),
-    S_ISMPX (S_IFREG),
     S_ISNAM (S_IFREG),
     S_ISNWK (S_IFREG),
     S_ISPORT (S_IFREG),
@@ -65,9 +61,7 @@
 verify (S_IRWXG == (S_IRGRP | S_IWGRP | S_IXGRP));
 verify (S_IRWXO == (S_IROTH | S_IWOTH | S_IXOTH));
 
-#ifdef S_IFBLK
 verify (S_ISBLK (S_IFBLK));
-#endif
 verify (!S_ISBLK (S_IFCHR));
 verify (!S_ISBLK (S_IFDIR));
 verify (!S_ISBLK (S_IFIFO));
@@ -79,9 +73,7 @@
 verify (!S_ISBLK (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISCHR (S_IFBLK));
-#endif
 verify (S_ISCHR (S_IFCHR));
 verify (!S_ISCHR (S_IFDIR));
 verify (!S_ISCHR (S_IFIFO));
@@ -93,9 +85,7 @@
 verify (!S_ISCHR (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISDIR (S_IFBLK));
-#endif
 verify (!S_ISDIR (S_IFCHR));
 verify (S_ISDIR (S_IFDIR));
 verify (!S_ISDIR (S_IFIFO));
@@ -107,9 +97,7 @@
 verify (!S_ISDIR (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISFIFO (S_IFBLK));
-#endif
 verify (!S_ISFIFO (S_IFCHR));
 verify (!S_ISFIFO (S_IFDIR));
 verify (S_ISFIFO (S_IFIFO));
@@ -121,9 +109,7 @@
 verify (!S_ISFIFO (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISREG (S_IFBLK));
-#endif
 verify (!S_ISREG (S_IFCHR));
 verify (!S_ISREG (S_IFDIR));
 verify (!S_ISREG (S_IFIFO));
@@ -135,9 +121,7 @@
 verify (!S_ISREG (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISLNK (S_IFBLK));
-#endif
 verify (!S_ISLNK (S_IFCHR));
 verify (!S_ISLNK (S_IFDIR));
 verify (!S_ISLNK (S_IFIFO));
@@ -149,9 +133,7 @@
 verify (!S_ISLNK (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISSOCK (S_IFBLK));
-#endif
 verify (!S_ISSOCK (S_IFCHR));
 verify (!S_ISSOCK (S_IFDIR));
 verify (!S_ISSOCK (S_IFIFO));
@@ -163,9 +145,7 @@
 verify (S_ISSOCK (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISDOOR (S_IFBLK));
-#endif
 verify (!S_ISDOOR (S_IFCHR));
 verify (!S_ISDOOR (S_IFDIR));
 verify (!S_ISDOOR (S_IFIFO));
@@ -177,9 +157,7 @@
 verify (!S_ISDOOR (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISMPB (S_IFBLK));
-#endif
 verify (!S_ISMPB (S_IFCHR));
 verify (!S_ISMPB (S_IFDIR));
 verify (!S_ISMPB (S_IFIFO));
@@ -191,23 +169,7 @@
 verify (!S_ISMPB (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
-verify (!S_ISMPX (S_IFBLK));
-#endif
-verify (!S_ISMPX (S_IFCHR));
-verify (!S_ISMPX (S_IFDIR));
-verify (!S_ISMPX (S_IFIFO));
-verify (!S_ISMPX (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISMPX (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISMPX (S_IFSOCK));
-#endif
-
-#ifdef S_IFBLK
 verify (!S_ISNAM (S_IFBLK));
-#endif
 verify (!S_ISNAM (S_IFCHR));
 verify (!S_ISNAM (S_IFDIR));
 verify (!S_ISNAM (S_IFIFO));
@@ -219,9 +181,7 @@
 verify (!S_ISNAM (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISNWK (S_IFBLK));
-#endif
 verify (!S_ISNWK (S_IFCHR));
 verify (!S_ISNWK (S_IFDIR));
 verify (!S_ISNWK (S_IFIFO));
@@ -233,9 +193,7 @@
 verify (!S_ISNWK (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISPORT (S_IFBLK));
-#endif
 verify (!S_ISPORT (S_IFCHR));
 verify (!S_ISPORT (S_IFDIR));
 verify (!S_ISPORT (S_IFIFO));
@@ -247,9 +205,7 @@
 verify (!S_ISPORT (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISCTG (S_IFBLK));
-#endif
 verify (!S_ISCTG (S_IFCHR));
 verify (!S_ISCTG (S_IFDIR));
 verify (!S_ISCTG (S_IFIFO));
@@ -261,9 +217,7 @@
 verify (!S_ISCTG (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISOFD (S_IFBLK));
-#endif
 verify (!S_ISOFD (S_IFCHR));
 verify (!S_ISOFD (S_IFDIR));
 verify (!S_ISOFD (S_IFIFO));
@@ -275,9 +229,7 @@
 verify (!S_ISOFD (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISOFL (S_IFBLK));
-#endif
 verify (!S_ISOFL (S_IFCHR));
 verify (!S_ISOFL (S_IFDIR));
 verify (!S_ISOFL (S_IFIFO));
@@ -289,9 +241,7 @@
 verify (!S_ISOFL (S_IFSOCK));
 #endif
 
-#ifdef S_IFBLK
 verify (!S_ISWHT (S_IFBLK));
-#endif
 verify (!S_ISWHT (S_IFCHR));
 verify (!S_ISWHT (S_IFDIR));
 verify (!S_ISWHT (S_IFIFO));
@@ -328,10 +278,8 @@
 
 /* Check the existence of some types.  */
 nlink_t t1;
-off_t t2;
-mode_t t3;
 
-struct timespec st;
+struct timespec t2;
 
 int
 main (void)
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_time.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_time.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_time.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_time.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <sys/time.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,13 +20,8 @@
 
 #include <sys/time.h>
 
-/* Check that the 'struct timeval' type is defined.  */
 struct timeval a;
 
-/* Check that a.tv_sec is wide enough to hold a time_t, ignoring
-   signedness issues.  */
-typedef int verify_tv_sec_type[sizeof (time_t) <= sizeof (a.tv_sec) ? 1 : -1];
-
 int
 main (void)
 {
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_types.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_types.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_types.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_types.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/* Test of <sys/types.h> substitute.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#include <config.h>
-
-#include <sys/types.h>
-
-/* Check that the types are all defined.  */
-pid_t t1;
-size_t t2;
-ssize_t t3;
-off_t t4;
-mode_t t5;
-
-int
-main (void)
-{
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_wait.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_wait.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_wait.c	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_wait.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <sys/wait.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,8 @@
 /* Check for existence of required types.  */
 static pid_t a;
 
-#include "test-sys_wait.h"
-
 int
 main (void)
 {
-  if (test_sys_wait_macros ())
-    return 1;
-
-#if 0
-  switch (WCONTINUED)
-    {
-  /* Gnulib doesn't guarantee these, yet.  */
-    case WCONTINUED:
-    case WEXITED:
-    case WNOWAIT:
-    case WSTOPPED:
-      break;
-    }
-#endif
-
-  return a ? 1 : 0;
+  return a;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_wait.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_wait.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-sys_wait.h	2014-10-16 06:00:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-sys_wait.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Test of macros shared between <sys/wait.h> and <stdlib.h>.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 Eric Blake <ebb9@byu.net>, 2010.  */
-
-static int
-test_sys_wait_macros (void)
-{
-  /* Check subset of <sys/wait.h> macros that must be visible here.
-     Note that some of these macros are only portable when operating
-     on an lvalue.  */
-  int i;
-  for (i = 0; i < 0x8000; i = (i ? i << 1 : 1))
-    {
-      /* POSIX requires that for all valid process statuses, that
-         exactly one of these three macros is true.  But not all
-         possible 16-bit values map to valid process status.
-         Traditionally, 8 of the bits are for WIFEXITED, 7 of the bits
-         to tell between WIFSIGNALED and WIFSTOPPED, and either 0x80
-         or 0x8000 to flag that core was also dumped.  Since we don't
-         know which byte is WIFEXITED, we skip the both possible bits
-         that can signal core dump.  */
-      if (i == 0x80)
-        continue;
-      if (!!WIFSIGNALED (i) + !!WIFEXITED (i) + !!WIFSTOPPED (i) != 1)
-        return 1;
-    }
-  i = WEXITSTATUS (i) + WSTOPSIG (i) + WTERMSIG (i);
-
-  switch (i)
-    {
-#if 0
-  /* Gnulib doesn't guarantee these, yet.  */
-    case WNOHANG:
-    case WUNTRACED:
-#endif
-      break;
-    }
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-term-ostream-xterm gettext-0.18.1.1/gettext-tools/gnulib-tests/test-term-ostream-xterm
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-term-ostream-xterm	2014-10-15 03:43:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-term-ostream-xterm	2010-06-06 12:49:58.000000000 +0000
@@ -22,7 +22,6 @@
    ${DIFF} ${srcdir}/test-term-ostream-xterm-r6.out             out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-xf86-v32.out       out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-basic.out          out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-basic-italic.out   out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-8bit.out           out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-debian.out   out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-mandriva.out out > /dev/null \
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-term-ostream-xterm-basic-italic.out gettext-0.18.1.1/gettext-tools/gnulib-tests/test-term-ostream-xterm-basic-italic.out
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-term-ostream-xterm-basic-italic.out	2014-10-15 03:43:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-term-ostream-xterm-basic-italic.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-Colors (foreground/background):
-       |black  |blue   |green  |cyan   |red    |magenta|yellow |white  |default
-black  | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-blue   | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-green  | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-cyan   | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-red    | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-magenta| Words | Words | Words | Words | Words | Words | Words | Words | Words 
-yellow | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-white  | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-default| Words | Words | Words | Words | Words | Words | Words | Words | Words 
-
-Colors (hue/saturation):
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-
-Weights:
-normal, bold, (Bdefault 
-
-Postures:
-normal, italic, default 
-
-Text decorations:
-normal, underlined, default 
-
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-thread_create.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-thread_create.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-thread_create.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-thread_create.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/* Test of gl_thread_create () macro.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#include <config.h>
-
-#include "glthread/thread.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "macros.h"
-
-static gl_thread_t main_thread_before;
-static gl_thread_t main_thread_after;
-static gl_thread_t worker_thread;
-
-static int dummy;
-static volatile int work_done;
-
-static void *
-worker_thread_func (void *arg)
-{
-  work_done = 1;
-  return &dummy;
-}
-
-int
-main ()
-{
-  main_thread_before = gl_thread_self ();
-
-  if (glthread_create (&worker_thread, worker_thread_func, NULL) == 0)
-    {
-      void *ret;
-
-      /* Check that gl_thread_self () has the same value before than after the
-         first call to gl_thread_create ().  */
-      main_thread_after = gl_thread_self ();
-      ASSERT (memcmp (&main_thread_before, &main_thread_after,
-                      sizeof (gl_thread_t))
-              == 0);
-
-      gl_thread_join (worker_thread, &ret);
-
-      /* Check the return value of the thread.  */
-      ASSERT (ret == &dummy);
-
-      /* Check that worker_thread_func () has finished executing.  */
-      ASSERT (work_done);
-
-      return 0;
-    }
-  else
-    {
-#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
-      fputs ("glthread_create failed\n", stderr);
-      return 1;
-#else
-      fputs ("Skipping test: multithreading not enabled\n", stderr);
-      return 77;
-#endif
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-thread_self.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-thread_self.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-thread_self.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-thread_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/* Test of gl_thread_self () macro.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#include <config.h>
-
-#include "glthread/thread.h"
-
-gl_thread_t main_thread;
-
-int
-main ()
-{
-  /* Check that gl_thread_self () can be used with just $(LIBTHREAD), not
-     $(LIBMULTITHREAD), i.e. in libraries that are multithread-safe but don't
-     create threads themselves.  */
-  main_thread = gl_thread_self ();
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-time.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-time.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-time.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-time.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <time.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,13 +22,7 @@
 
 #include "verify.h"
 
-/* Check that the types are all defined.  */
-struct timespec t1;
-#if 0
-/* POSIX:2008 does not require pid_t in <time.h> unconditionally, and indeed
-   it's missing on Mac OS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw.  */
-pid_t t2;
-#endif
+struct timespec a;
 
 /* Check that NULL can be passed through varargs as a pointer type,
    per POSIX 2008.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-tls.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-tls.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-tls.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-tls.c	2010-03-28 18:32:32.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
+#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
 
 #if USE_POSIX_THREADS
 # define TEST_POSIX_THREADS 1
@@ -29,8 +29,8 @@
 #if USE_PTH_THREADS
 # define TEST_PTH_THREADS 1
 #endif
-#if USE_WINDOWS_THREADS
-# define TEST_WINDOWS_THREADS 1
+#if USE_WIN32_THREADS
+# define TEST_WIN32_THREADS 1
 #endif
 
 /* Whether to help the scheduler through explicit yield().
@@ -66,7 +66,7 @@
 # define yield()
 #endif
 
-static void
+static inline void
 perhaps_yield (void)
 {
   /* Call yield () only with a certain probability, otherwise with GNU Pth
@@ -89,7 +89,7 @@
   int i, j, repeat;
   unsigned int values[KEYS_COUNT];
 
-  dbgprintf ("Worker %p started\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p started\n", gl_thread_self ());
 
   /* Initialize the per-thread storage.  */
   for (i = 0; i < KEYS_COUNT; i++)
@@ -102,28 +102,28 @@
   perhaps_yield ();
 
   /* Verify that the initial value is NULL.  */
-  dbgprintf ("Worker %p before initial verify\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p before initial verify\n", gl_thread_self ());
   for (i = 0; i < KEYS_COUNT; i++)
     if (gl_tls_get (mykeys[i]) != NULL)
       abort ();
-  dbgprintf ("Worker %p after  initial verify\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p after  initial verify\n", gl_thread_self ());
   perhaps_yield ();
 
   /* Initialize the per-thread storage.  */
-  dbgprintf ("Worker %p before first tls_set\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p before first tls_set\n", gl_thread_self ());
   for (i = 0; i < KEYS_COUNT; i++)
     {
       unsigned int *ptr = (unsigned int *) malloc (sizeof (unsigned int));
       *ptr = values[i];
       gl_tls_set (mykeys[i], ptr);
     }
-  dbgprintf ("Worker %p after  first tls_set\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p after  first tls_set\n", gl_thread_self ());
   perhaps_yield ();
 
   /* Shuffle around the pointers.  */
   for (repeat = REPEAT_COUNT; repeat > 0; repeat--)
     {
-      dbgprintf ("Worker %p doing value swapping\n", gl_thread_self_pointer ());
+      dbgprintf ("Worker %p doing value swapping\n", gl_thread_self ());
       i = ((unsigned int) rand () >> 3) % KEYS_COUNT;
       j = ((unsigned int) rand () >> 3) % KEYS_COUNT;
       if (i != j)
@@ -138,14 +138,14 @@
     }
 
   /* Verify that all the values are from this thread.  */
-  dbgprintf ("Worker %p before final verify\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p before final verify\n", gl_thread_self ());
   for (i = 0; i < KEYS_COUNT; i++)
     if ((*(unsigned int *) gl_tls_get (mykeys[i]) % THREAD_COUNT) != id)
       abort ();
-  dbgprintf ("Worker %p after  final verify\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p after  final verify\n", gl_thread_self ());
   perhaps_yield ();
 
-  dbgprintf ("Worker %p dying.\n", gl_thread_self_pointer ());
+  dbgprintf ("Worker %p dying.\n", gl_thread_self ());
   return NULL;
 }
 
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-unistd.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-unistd.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-unistd.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-unistd.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <unistd.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-unsetenv.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-unsetenv.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-unsetenv.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-unsetenv.c	2010-02-16 21:32:28.000000000 +0000
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-vasnprintf.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vasnprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-vasnprintf.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vasnprintf.c	2010-04-25 09:21:51.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@
       ASSERT (length == 5);
       if (size < 6)
         ASSERT (result != buf);
-      ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0);
+      ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
       if (result != buf)
         free (result);
     }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-vasnprintf-posix.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vasnprintf-posix.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-vasnprintf-posix.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vasnprintf-posix.c	2010-04-25 09:21:51.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,8 +29,6 @@
 #include <string.h>
 
 #include "macros.h"
-#include "minus-zero.h"
-#include "infinity.h"
 #include "nan.h"
 
 /* The SGI MIPS floating-point format does not distinguish 0.0 and -0.0.  */
@@ -38,10 +36,30 @@
 have_minus_zero ()
 {
   static double plus_zero = 0.0;
-  double minus_zero = minus_zerod;
+  double minus_zero = - plus_zero;
   return memcmp (&plus_zero, &minus_zero, sizeof (double)) != 0;
 }
 
+/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
+   So we use -zerod instead.  */
+double zerod = 0.0;
+
+/* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
+   So we use minus_zerol instead.
+   IRIX cc can't put -0.0L into .data, but can compute at runtime.
+   Note that the expression -LDBL_MIN * LDBL_MIN does not work on other
+   platforms, such as when cross-compiling to PowerPC on MacOS X 10.5.  */
+#if defined __hpux || defined __sgi
+static long double
+compute_minus_zerol (void)
+{
+  return -LDBL_MIN * LDBL_MIN;
+}
+# define minus_zerol compute_minus_zerol ()
+#else
+long double minus_zerol = -0.0L;
+#endif
+
 /* Representation of an 80-bit 'long double' as an initializer for a sequence
    of 'unsigned int' words.  */
 #ifdef WORDS_BIGENDIAN
@@ -118,7 +136,7 @@
       ASSERT (length == 5);
       if (size < 6)
         ASSERT (result != buf);
-      ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0);
+      ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
       if (result != buf)
         free (result);
     }
@@ -207,7 +225,7 @@
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%a %d", minus_zerod, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%a %d", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0x0p+0 33") == 0);
@@ -218,7 +236,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%a %d", Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%a %d", 1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -228,7 +246,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%a %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%a %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -252,8 +270,7 @@
     char *result =
       my_asnprintf (NULL, &length, "%.0a %d", 1.5, 33, 44, 55);
     ASSERT (result != NULL);
-    ASSERT (strcmp (result, "0x1p+0 33") == 0
-            || strcmp (result, "0x2p+0 33") == 0
+    ASSERT (strcmp (result, "0x2p+0 33") == 0
             || strcmp (result, "0x3p-1 33") == 0
             || strcmp (result, "0x6p-2 33") == 0
             || strcmp (result, "0xcp-3 33") == 0);
@@ -327,7 +344,7 @@
   }
 
   { /* Rounding can turn a ...FFF into a ...000.
-       This shows a Mac OS X 10.3.9 (Darwin 7.9) bug.  */
+       This shows a MacOS X 10.3.9 (Darwin 7.9) bug.  */
     size_t length;
     char *result =
       my_asnprintf (NULL, &length, "%.1a %d", 1.999, 33, 44, 55);
@@ -460,7 +477,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%010a %d", Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%010a %d", 1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     /* "0000000inf 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
@@ -533,7 +550,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%La %d", Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%La %d", 1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -543,7 +560,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%La %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%La %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -561,7 +578,7 @@
     ASSERT (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -742,7 +759,7 @@
   }
 
   { /* Rounding can turn a ...FFF into a ...000.
-       This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a
+       This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a
        glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>.  */
     size_t length;
     char *result =
@@ -876,7 +893,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%010La %d", Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%010La %d", 1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     /* "0000000inf 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
@@ -1035,7 +1052,7 @@
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%f %d", minus_zerod, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%f %d", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1046,7 +1063,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%f %d", Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%f %d", 1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -1057,7 +1074,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%f %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%f %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -1150,7 +1167,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015f %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015f %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -1345,7 +1362,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lf %d", Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lf %d", 1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -1356,7 +1373,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lf %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lf %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -1375,7 +1392,7 @@
     ASSERT (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -1550,7 +1567,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015Lf %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015Lf %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -1645,7 +1662,7 @@
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%F %d", minus_zerod, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%F %d", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1656,7 +1673,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%F %d", Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%F %d", 1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "INF 33") == 0
             || strcmp (result, "INFINITY 33") == 0);
@@ -1667,7 +1684,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%F %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%F %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-INF 33") == 0
             || strcmp (result, "-INFINITY 33") == 0);
@@ -1700,7 +1717,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015F %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015F %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -INF 33") == 0
             || strcmp (result, "      -INFINITY 33") == 0);
@@ -1792,7 +1809,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%LF %d", Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%LF %d", 1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "INF 33") == 0
             || strcmp (result, "INFINITY 33") == 0);
@@ -1803,7 +1820,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%LF %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%LF %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-INF 33") == 0
             || strcmp (result, "-INFINITY 33") == 0);
@@ -1836,7 +1853,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015LF %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015LF %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -INF 33") == 0
             || strcmp (result, "      -INFINITY 33") == 0);
@@ -2022,7 +2039,7 @@
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%e %d", minus_zerod, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%e %d", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000e+00 33") == 0
@@ -2034,7 +2051,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%e %d", Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%e %d", 1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -2045,7 +2062,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%e %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%e %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -2156,7 +2173,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015e %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015e %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -2367,7 +2384,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Le %d", Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Le %d", 1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -2378,7 +2395,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Le %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Le %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -2397,7 +2414,7 @@
     ASSERT (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -2590,7 +2607,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015Le %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015Le %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -2789,7 +2806,7 @@
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%g %d", minus_zerod, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%g %d", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0 33") == 0);
@@ -2800,7 +2817,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%g %d", Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%g %d", 1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -2811,7 +2828,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%g %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%g %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -2915,7 +2932,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015g %d", - Infinityd (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015g %d", -1.0 / 0.0, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -3121,7 +3138,7 @@
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lg %d", Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lg %d", 1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -3132,7 +3149,7 @@
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lg %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lg %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -3151,7 +3168,7 @@
     ASSERT (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -3337,7 +3354,7 @@
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015Lg %d", - Infinityl (), 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015Lg %d", -1.0L / 0.0L, 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -3555,36 +3572,6 @@
   }
 
   {
-    size_t length;
-    char *result =
-      my_asnprintf (NULL, &length, "%.4000f %d", 1.0, 99);
-    size_t i;
-    ASSERT (result != NULL);
-    ASSERT (result[0] == '1');
-    ASSERT (result[1] == '.');
-    for (i = 0; i < 4000; i++)
-      ASSERT (result[2 + i] == '0');
-    ASSERT (strcmp (result + 2 + 4000, " 99") == 0);
-    ASSERT (length == strlen (result));
-    free (result);
-  }
-
-  {
-    size_t length;
-    char *result =
-      my_asnprintf (NULL, &length, "%.511f %d", 1.0, 99);
-    size_t i;
-    ASSERT (result != NULL);
-    ASSERT (result[0] == '1');
-    ASSERT (result[1] == '.');
-    for (i = 0; i < 511; i++)
-      ASSERT (result[2 + i] == '0');
-    ASSERT (strcmp (result + 2 + 511, " 99") == 0);
-    ASSERT (length == strlen (result));
-    free (result);
-  }
-
-  {
     char input[5000];
     size_t length;
     char *result;
@@ -3690,19 +3677,6 @@
       free (result);
   }
 #endif
-
-#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && !defined __UCLIBC__
-  /* Test that the 'I' flag is supported.  */
-  {
-    size_t length;
-    char *result =
-      my_asnprintf (NULL, &length, "%Id %d", 1234567, 99);
-    ASSERT (result != NULL);
-    ASSERT (strcmp (result, "1234567 99") == 0);
-    ASSERT (length == strlen (result));
-    free (result);
-  }
-#endif
 }
 
 static char *
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-vasprintf.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vasprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-vasprintf.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vasprintf.c	2010-04-25 09:21:51.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of vasprintf() and asprintf() functions.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-verify.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-verify.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-verify.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-verify.c	2010-05-09 01:37:17.000000000 +0000
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,8 +42,7 @@
   item = verify_true (1 == 1) * 0 + 17 /* should be ok */
 };
 
-static int
-function (int n)
+int function (int n)
 {
 #if EXP_FAIL == 3
   verify (n >= 0);                  /* should give ERROR: non-constant expression */
@@ -55,9 +54,9 @@
   verify (1 == 1); verify (1 == 1); /* should be ok */
 
   if (n)
-    return ((void) verify_expr (1 == 1, 1), verify_expr (1 == 1, 8)); /* should be ok */
+    return ((void) verify_true (1 == 1), verify_true (1 == 1) + 7); /* should be ok */
 #if EXP_FAIL == 5
-  return verify_expr (1 == 2, 5); /* should give ERROR */
+  return (verify_true (1 == 2), 5); /* should give ERROR */
 #endif
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-vsnprintf.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vsnprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-vsnprintf.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-vsnprintf.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of vsnprintf() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,16 +47,15 @@
   int size;
   int retval;
 
-  retval = my_snprintf (NULL, 0, "%d", 12345);
-  ASSERT (retval == 5);
-
   for (size = 0; size <= 8; size++)
     {
       memcpy (buf, "DEADBEEF", 8);
       retval = my_snprintf (buf, size, "%d", 12345);
-      ASSERT (retval == 5);
       if (size < 6)
         {
+#if CHECK_VSNPRINTF_POSIX
+          ASSERT (retval < 0 || retval >= size);
+#endif
           if (size > 0)
             {
               ASSERT (memcmp (buf, "12345", size - 1) == 0);
@@ -65,21 +64,14 @@
 #if !CHECK_VSNPRINTF_POSIX
           if (size > 0)
 #endif
-            ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0);
+            ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
         }
       else
         {
+          ASSERT (retval == 5);
           ASSERT (memcmp (buf, "12345\0EF", 8) == 0);
         }
     }
 
-  /* Test the support of the POSIX/XSI format strings with positions.  */
-  {
-    char result[100];
-    retval = my_snprintf (result, sizeof (result), "%2$d %1$d", 33, 55);
-    ASSERT (strcmp (result, "55 33") == 0);
-    ASSERT (retval == strlen (result));
-  }
-
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wchar.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wchar.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wchar.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wchar.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of <wchar.h> substitute.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-/* Test of conversion of wide character to multibyte character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2008.  */
-
-#include <config.h>
-
-#include <wchar.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (wcrtomb, size_t, (char *, wchar_t, mbstate_t *));
-
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "macros.h"
-
-/* Check the multibyte character s[0..n-1].  */
-static void
-check_character (const char *s, size_t n)
-{
-  wchar_t wc;
-  char buf[64];
-  int iret;
-  size_t ret;
-
-  wc = (wchar_t) 0xBADFACE;
-  iret = mbtowc (&wc, s, n);
-  ASSERT (iret == n);
-
-  ret = wcrtomb (buf, wc, NULL);
-  ASSERT (ret == n);
-  ASSERT (memcmp (buf, s, n) == 0);
-
-  /* Test special calling convention, passing a NULL pointer.  */
-  ret = wcrtomb (NULL, wc, NULL);
-  ASSERT (ret == 1);
-}
-
-int
-main (int argc, char *argv[])
-{
-  char buf[64];
-  size_t ret;
-
-  /* configure should already have checked that the locale is supported.  */
-  if (setlocale (LC_ALL, "") == NULL)
-    return 1;
-
-  /* Test NUL character.  */
-  {
-    buf[0] = 'x';
-    ret = wcrtomb (buf, 0, NULL);
-    ASSERT (ret == 1);
-    ASSERT (buf[0] == '\0');
-  }
-
-  /* Test single bytes.  */
-  {
-    int c;
-
-    for (c = 0; c < 0x100; c++)
-      switch (c)
-        {
-        case '\t': case '\v': case '\f':
-        case ' ': case '!': case '"': case '#': case '%':
-        case '&': case '\'': case '(': case ')': case '*':
-        case '+': case ',': case '-': case '.': case '/':
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case ':': case ';': case '<': case '=': case '>':
-        case '?':
-        case 'A': case 'B': case 'C': case 'D': case 'E':
-        case 'F': case 'G': case 'H': case 'I': case 'J':
-        case 'K': case 'L': case 'M': case 'N': case 'O':
-        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 '^': case '_':
-        case 'a': case 'b': case 'c': case 'd': case 'e':
-        case 'f': case 'g': case 'h': case 'i': case 'j':
-        case 'k': case 'l': case 'm': case 'n': case 'o':
-        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".  */
-          ret = wcrtomb (buf, btowc (c), NULL);
-          ASSERT (ret == 1);
-          ASSERT (buf[0] == (char) c);
-          break;
-        }
-  }
-
-  /* Test special calling convention, passing a NULL pointer.  */
-  {
-    ret = wcrtomb (NULL, '\0', NULL);
-    ASSERT (ret == 1);
-    ret = wcrtomb (NULL, btowc ('x'), NULL);
-    ASSERT (ret == 1);
-  }
-
-  if (argc > 1)
-    switch (argv[1][0])
-      {
-      case '1':
-        /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
-        {
-          const char input[] = "B\374\337er"; /* "Büßer" */
-
-          check_character (input + 1, 1);
-          check_character (input + 2, 1);
-        }
-        return 0;
-
-      case '2':
-        /* Locale encoding is UTF-8.  */
-        {
-          const char input[] = "B\303\274\303\237er"; /* "Büßer" */
-
-          check_character (input + 1, 2);
-          check_character (input + 3, 2);
-        }
-        return 0;
-
-      case '3':
-        /* Locale encoding is EUC-JP.  */
-        {
-          const char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
-
-          check_character (input + 1, 2);
-          check_character (input + 3, 2);
-          check_character (input + 5, 2);
-        }
-        return 0;
-
-      case '4':
-        /* Locale encoding is GB18030.  */
-        {
-          const char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
-
-          check_character (input + 1, 2);
-          check_character (input + 3, 4);
-        }
-        return 0;
-      }
-
-  return 1;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# Test in an ISO-8859-1 or ISO-8859-15 locale.
-: ${LOCALE_FR=fr_FR}
-if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR \
-  ./test-wcrtomb${EXEEXT} 1 \
-  || exit 1
-fi
-
-# Test whether a specific UTF-8 locale is installed.
-: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 \
-  ./test-wcrtomb${EXEEXT} 2 \
-  || exit 1
-fi
-
-# Test whether a specific EUC-JP locale is installed.
-: ${LOCALE_JA=ja_JP}
-if test $LOCALE_JA != none; then
-  LC_ALL=$LOCALE_JA \
-  ./test-wcrtomb${EXEEXT} 3 \
-  || exit 1
-fi
-
-# Test whether a specific GB18030 locale is installed.
-: ${LOCALE_ZH_CN=zh_CN.GB18030}
-if test $LOCALE_ZH_CN != none; then
-  LC_ALL=$LOCALE_ZH_CN \
-  ./test-wcrtomb${EXEEXT} 4 \
-  || exit 1
-fi
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-1.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-1.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-1.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-1.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP1252 locale.
-./test-wcrtomb-w32${EXEEXT} French_France 1252
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-2.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-2.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP1256 locale.
-./test-wcrtomb-w32${EXEEXT} "Arabic_Saudi Arabia" 1256
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-3.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-3.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-3.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-3.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP932 locale.
-./test-wcrtomb-w32${EXEEXT} Japanese_Japan 932
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-4.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-4.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-4.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-4.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP950 locale.
-./test-wcrtomb-w32${EXEEXT} Chinese_Taiwan 950
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-5.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-5.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32-5.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32-5.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Test a CP936 locale.
-./test-wcrtomb-w32${EXEEXT} Chinese_China 936
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcrtomb-w32.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcrtomb-w32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,332 +0,0 @@
-/* Test of conversion of wide character to multibyte character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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 <wchar.h>
-
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "macros.h"
-
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-
-static int
-test_one_locale (const char *name, int codepage)
-{
-  char buf[64];
-  size_t ret;
-
-# if 1
-  /* Portable code to set the locale.  */
-  {
-    char name_with_codepage[1024];
-
-    sprintf (name_with_codepage, "%s.%d", name, codepage);
-
-    /* Set the locale.  */
-    if (setlocale (LC_ALL, name_with_codepage) == NULL)
-      return 77;
-  }
-# else
-  /* Hacky way to set a locale.codepage combination that setlocale() refuses
-     to set.  */
-  {
-    /* Codepage of the current locale, set with setlocale().
-       Not necessarily the same as GetACP().  */
-    extern __declspec(dllimport) unsigned int __lc_codepage;
-
-    /* Set the locale.  */
-    if (setlocale (LC_ALL, name) == NULL)
-      return 77;
-
-    /* Clobber the codepage and MB_CUR_MAX, both set by setlocale().  */
-    __lc_codepage = codepage;
-    switch (codepage)
-      {
-      case 1252:
-      case 1256:
-        MB_CUR_MAX = 1;
-        break;
-      case 932:
-      case 950:
-      case 936:
-        MB_CUR_MAX = 2;
-        break;
-      case 54936:
-      case 65001:
-        MB_CUR_MAX = 4;
-        break;
-      }
-
-    /* Test whether the codepage is really available.  */
-    {
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, " ", 1, &state) == (size_t)(-1))
-        return 77;
-    }
-  }
-# endif
-
-  /* Test NUL character.  */
-  {
-    buf[0] = 'x';
-    ret = wcrtomb (buf, 0, NULL);
-    ASSERT (ret == 1);
-    ASSERT (buf[0] == '\0');
-  }
-
-  /* Test single bytes.  */
-  {
-    int c;
-
-    for (c = 0; c < 0x100; c++)
-      switch (c)
-        {
-        case '\t': case '\v': case '\f':
-        case ' ': case '!': case '"': case '#': case '%':
-        case '&': case '\'': case '(': case ')': case '*':
-        case '+': case ',': case '-': case '.': case '/':
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case ':': case ';': case '<': case '=': case '>':
-        case '?':
-        case 'A': case 'B': case 'C': case 'D': case 'E':
-        case 'F': case 'G': case 'H': case 'I': case 'J':
-        case 'K': case 'L': case 'M': case 'N': case 'O':
-        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 '^': case '_':
-        case 'a': case 'b': case 'c': case 'd': case 'e':
-        case 'f': case 'g': case 'h': case 'i': case 'j':
-        case 'k': case 'l': case 'm': case 'n': case 'o':
-        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".  */
-          ret = wcrtomb (buf, btowc (c), NULL);
-          ASSERT (ret == 1);
-          ASSERT (buf[0] == (char) c);
-          break;
-        }
-  }
-
-  /* Test special calling convention, passing a NULL pointer.  */
-  {
-    ret = wcrtomb (NULL, '\0', NULL);
-    ASSERT (ret == 1);
-    ret = wcrtomb (NULL, btowc ('x'), NULL);
-    ASSERT (ret == 1);
-  }
-
-  switch (codepage)
-    {
-    case 1252:
-      /* Locale encoding is CP1252, an extension of ISO-8859-1.  */
-      {
-        /* Convert "B\374\337er": "Büßer" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x00FC, NULL);
-        ASSERT (ret == 1);
-        ASSERT (memcmp (buf, "\374", 1) == 0);
-        ASSERT (buf[1] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x00DF, NULL);
-        ASSERT (ret == 1);
-        ASSERT (memcmp (buf, "\337", 1) == 0);
-        ASSERT (buf[1] == 'x');
-      }
-      return 0;
-
-    case 1256:
-      /* Locale encoding is CP1256, not the same as ISO-8859-6.  */
-      {
-        /* Convert "x\302\341\346y": "xآلوy" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x0622, NULL);
-        ASSERT (ret == 1);
-        ASSERT (memcmp (buf, "\302", 1) == 0);
-        ASSERT (buf[1] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x0644, NULL);
-        ASSERT (ret == 1);
-        ASSERT (memcmp (buf, "\341", 1) == 0);
-        ASSERT (buf[1] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x0648, NULL);
-        ASSERT (ret == 1);
-        ASSERT (memcmp (buf, "\346", 1) == 0);
-        ASSERT (buf[1] == 'x');
-      }
-      return 0;
-
-    case 932:
-      /* Locale encoding is CP932, similar to Shift_JIS.  */
-      {
-        /* Convert "<\223\372\226\173\214\352>": "<日本語>" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x65E5, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\223\372", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x672C, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\226\173", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x8A9E, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\214\352", 2) == 0);
-        ASSERT (buf[2] == 'x');
-      }
-      return 0;
-
-    case 950:
-      /* Locale encoding is CP950, similar to Big5.  */
-      {
-        /* Convert "<\244\351\245\273\273\171>": "<日本語>" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x65E5, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\244\351", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x672C, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\245\273", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x8A9E, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\273\171", 2) == 0);
-        ASSERT (buf[2] == 'x');
-      }
-      return 0;
-
-    case 936:
-      /* Locale encoding is CP936 = GBK, an extension of GB2312.  */
-      {
-        /* Convert "<\310\325\261\276\325\132>": "<日本語>" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x65E5, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\310\325", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x672C, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\261\276", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x8A9E, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\325\132", 2) == 0);
-        ASSERT (buf[2] == 'x');
-      }
-      return 0;
-
-    case 54936:
-      /* Locale encoding is CP54936 = GB18030.  */
-      {
-        /* Convert "B\250\271\201\060\211\070er": "Büßer" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x00FC, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\250\271", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x00DF, NULL);
-        ASSERT (ret == 4);
-        ASSERT (memcmp (buf, "\201\060\211\070", 4) == 0);
-        ASSERT (buf[4] == 'x');
-      }
-      return 0;
-
-    case 65001:
-      /* Locale encoding is CP65001 = UTF-8.  */
-      {
-        /* Convert "B\303\274\303\237er": "Büßer" */
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x00FC, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\303\274", 2) == 0);
-        ASSERT (buf[2] == 'x');
-
-        memset (buf, 'x', 8);
-        ret = wcrtomb (buf, 0x00DF, NULL);
-        ASSERT (ret == 2);
-        ASSERT (memcmp (buf, "\303\237", 2) == 0);
-        ASSERT (buf[2] == 'x');
-      }
-      return 0;
-
-    default:
-      return 1;
-    }
-}
-
-int
-main (int argc, char *argv[])
-{
-  int codepage = atoi (argv[argc - 1]);
-  int result;
-  int i;
-
-  result = 77;
-  for (i = 1; i < argc - 1; i++)
-    {
-      int ret = test_one_locale (argv[i], codepage);
-
-      if (ret != 77)
-        result = ret;
-    }
-
-  if (result == 77)
-    {
-      fprintf (stderr, "Skipping test: found no locale with codepage %d\n",
-               codepage);
-    }
-  return result;
-}
-
-#else
-
-int
-main (int argc, char *argv[])
-{
-  fputs ("Skipping test: not a native Windows system\n", stderr);
-  return 77;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wctype.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wctype.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wctype.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wctype.c	2010-03-28 18:32:32.000000000 +0000
@@ -0,0 +1,70 @@
+/* Test of <wctype.h> substitute.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
+
+#include <config.h>
+
+#include <wctype.h>
+
+#include "macros.h"
+
+/* Check that the type wint_t is defined.  */
+wint_t a = 'x';
+/* Check that WEOF is defined.  */
+wint_t e = WEOF;
+
+int
+main (void)
+{
+  /* Check that the isw* functions exist as functions or as macros.  */
+  (void) iswalnum (0);
+  (void) iswalpha (0);
+  (void) iswblank (0);
+  (void) iswcntrl (0);
+  (void) iswdigit (0);
+  (void) iswgraph (0);
+  (void) iswlower (0);
+  (void) iswprint (0);
+  (void) iswpunct (0);
+  (void) iswspace (0);
+  (void) iswupper (0);
+  (void) iswxdigit (0);
+
+  /* Check that the isw* functions map WEOF to 0.  */
+  ASSERT (!iswalnum (e));
+  ASSERT (!iswalpha (e));
+  ASSERT (!iswblank (e));
+  ASSERT (!iswcntrl (e));
+  ASSERT (!iswdigit (e));
+  ASSERT (!iswgraph (e));
+  ASSERT (!iswlower (e));
+  ASSERT (!iswprint (e));
+  ASSERT (!iswpunct (e));
+  ASSERT (!iswspace (e));
+  ASSERT (!iswupper (e));
+  ASSERT (!iswxdigit (e));
+
+  /* Check that the tow* functions exist as functions or as macros.  */
+  (void) towlower (0);
+  (void) towupper (0);
+
+  /* Check that the tow* functions map WEOF to WEOF.  */
+  ASSERT (towlower (e) == e);
+  ASSERT (towupper (e) == e);
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wctype-h.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wctype-h.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wctype-h.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wctype-h.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/* Test of <wctype.h> substitute.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
-
-#include <config.h>
-
-#include <wctype.h>
-
-#include "macros.h"
-
-/* Check that the type wint_t is defined.  */
-wint_t a = 'x';
-/* Check that WEOF is defined.  */
-wint_t e = WEOF;
-
-/* Check that the type wctype_t is defined.  */
-wctype_t p;
-
-/* Check that the type wctrans_t is defined.  */
-wctrans_t q;
-
-int
-main (void)
-{
-  /* Check that the isw* functions exist as functions or as macros.  */
-  (void) iswalnum (0);
-  (void) iswalpha (0);
-  (void) iswcntrl (0);
-  (void) iswdigit (0);
-  (void) iswgraph (0);
-  (void) iswlower (0);
-  (void) iswprint (0);
-  (void) iswpunct (0);
-  (void) iswspace (0);
-  (void) iswupper (0);
-  (void) iswxdigit (0);
-
-  /* Check that the isw* functions map WEOF to 0.  */
-  ASSERT (!iswalnum (e));
-  ASSERT (!iswalpha (e));
-  ASSERT (!iswcntrl (e));
-  ASSERT (!iswdigit (e));
-  ASSERT (!iswgraph (e));
-  ASSERT (!iswlower (e));
-  ASSERT (!iswprint (e));
-  ASSERT (!iswpunct (e));
-  ASSERT (!iswspace (e));
-  ASSERT (!iswupper (e));
-  ASSERT (!iswxdigit (e));
-
-  /* Check that the tow* functions exist as functions or as macros.  */
-  (void) towlower (0);
-  (void) towupper (0);
-
-  /* Check that the tow* functions map WEOF to WEOF.  */
-  ASSERT (towlower (e) == e);
-  ASSERT (towupper (e) == e);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-wcwidth.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcwidth.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-wcwidth.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-wcwidth.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of wcwidth() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-write.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-write.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-write.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-write.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/* Test the write() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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 <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (write, ssize_t, (int, const void *, size_t));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  const char *filename = "test-write.tmp";
-  int fd;
-
-  /* Create a file with a simple contents.  */
-  fd = open (filename, O_CREAT | O_WRONLY, 0600);
-  ASSERT (fd >= 0);
-  ASSERT (write (fd, "Hello World", 11) == 11);
-  ASSERT (close (fd) == 0);
-
-  /* Write into the middle of the file.  */
-  fd = open (filename, O_WRONLY);
-  ASSERT (fd >= 0);
-  ASSERT (lseek (fd, 6, SEEK_SET) == 6);
-  ASSERT (write (fd, "fascination", 11) == 11);
-
-  /* Verify the contents of the file.  */
-  {
-    char buf[64];
-    int rfd = open (filename, O_RDONLY);
-    ASSERT (rfd >= 0);
-    ASSERT (read (rfd, buf, sizeof (buf)) == 17);
-    ASSERT (close (rfd) == 0);
-    ASSERT (memcmp (buf, "Hello fascination", 17) == 0);
-  }
-
-  ASSERT (close (fd) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    char byte = 'x';
-    errno = 0;
-    ASSERT (write (-1, &byte, 1) == -1);
-    ASSERT (errno == EBADF);
-  }
-  {
-    char byte = 'x';
-    close (99);
-    errno = 0;
-    ASSERT (write (99, &byte, 1) == -1);
-    ASSERT (errno == EBADF);
-  }
-
-  /* Clean up.  */
-  unlink (filename);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-xalloc-die.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-xalloc-die.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-xalloc-die.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-xalloc-die.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of xalloc_die() function.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-xalloc-die.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/test-xalloc-die.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-xalloc-die.sh	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-xalloc-die.sh	2010-05-09 01:37:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Test suite for xalloc_die.
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/test-xvasprintf.c gettext-0.18.1.1/gettext-tools/gnulib-tests/test-xvasprintf.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/test-xvasprintf.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-xvasprintf.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of xvasprintf() and xasprintf() functions.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,6 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* Tell GCC not to warn about the specific edge cases tested here.  */
-#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
-# pragma GCC diagnostic ignored "-Wformat-zero-length"
-# pragma GCC diagnostic ignored "-Wformat-nonliteral"
-# pragma GCC diagnostic ignored "-Wformat-security"
-#endif
-
 #include <config.h>
 
 #include "xvasprintf.h"
@@ -62,7 +55,7 @@
 
   {
     /* Silence gcc warning about zero-length format string.  */
-    const char *empty = "";
+    char *empty = "";
     result = my_xasprintf (empty);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "") == 0);
@@ -86,7 +79,7 @@
 }
 
 static void
-test_xasprintf (void)
+test_xasprintf ()
 {
   int repeat;
   char *result;
@@ -100,11 +93,9 @@
     }
 
   {
-    /* Silence gcc warning about zero-length format string,
-       and about "format not a string literal and no format"
-       (whatever that means) .  */
-    const char *empty = "";
-    result = xasprintf (empty, empty);
+    /* Silence gcc warning about zero-length format string.  */
+    char *empty = "";
+    result = xasprintf (empty);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "") == 0);
     free (result);
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unilbrk/test-u8-possible-linebreaks.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unilbrk/test-u8-possible-linebreaks.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unilbrk/test-u8-possible-linebreaks.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unilbrk/test-u8-possible-linebreaks.c	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,78 @@
+/* Test of line breaking of UTF-8 strings.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2008.  */
+
+#include <config.h>
+
+#include "unilbrk.h"
+
+#include <stdlib.h>
+
+#include "macros.h"
+
+int
+main ()
+{
+  /* Test case n = 0.  */
+  u8_possible_linebreaks (NULL, 0, "GB18030", NULL);
+
+  {
+    static const uint8_t input[91] =
+      /* "Grüß Gott. Здравствуйте! x=(-b±sqrt(b²-4ac))/(2a)  日本語,中文,한글" */
+      "Gr\303\274\303\237 Gott. \320\227\320\264\321\200\320\260\320\262\321\201\321\202\320\262\321\203\320\271\321\202\320\265! x=(-b\302\261sqrt(b\302\262-4ac))/(2a)  \346\227\245\346\234\254\350\252\236,\344\270\255\346\226\207,\355\225\234\352\270\200\n";
+
+    {
+      char *p = (char *) malloc (SIZEOF (input));
+      size_t i;
+
+      u8_possible_linebreaks (input, SIZEOF (input), "GB18030", p);
+      for (i = 0; i < 91; i++)
+        {
+          ASSERT (p[i] == (i == 90 ? UC_BREAK_MANDATORY :
+                           i == 7
+                           || i == 13 || i == 39
+                           || i == 41 || i == 43 || i == 44 || i == 50
+                           || i == 61 || i == 67
+                           || i == 70 || i == 73 || i == 77 || i == 80
+                           || i == 84 || i == 87 ? UC_BREAK_POSSIBLE :
+                           UC_BREAK_PROHIBITED));
+        }
+      free (p);
+    }
+
+    {
+      char *p = (char *) malloc (SIZEOF (input));
+      size_t i;
+
+      u8_possible_linebreaks (input, SIZEOF (input), "GB2312", p);
+      for (i = 0; i < 91; i++)
+        {
+          ASSERT (p[i] == (i == 90 ? UC_BREAK_MANDATORY :
+                           i == 7
+                           || i == 13 || i == 39
+                           || i == 41 || i == 43 || i == 44 || i == 50
+                           || i == 52 || i == 61 || i == 67
+                           || i == 70 || i == 73 || i == 77 || i == 80
+                           || i == 84 || i == 87 ? UC_BREAK_POSSIBLE :
+                           UC_BREAK_PROHIBITED));
+        }
+      free (p);
+    }
+  }
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-8 strings.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unilbrk/test-ulc-width-linebreaks.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unilbrk/test-ulc-width-linebreaks.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unilbrk/test-ulc-width-linebreaks.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unilbrk/test-ulc-width-linebreaks.c	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,53 @@
+/* Test of line breaking of strings.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2008.  */
+
+#include <config.h>
+
+#include "unilbrk.h"
+
+#include <stdlib.h>
+
+#include "macros.h"
+
+int
+main ()
+{
+  /* Test case n = 0.  */
+  ulc_width_linebreaks (NULL, 0, 80, 0, 0, NULL, "GB18030", NULL);
+
+#if HAVE_ICONV
+  {
+    static const char input[36] =
+      /* "Grüß Gott. x=(-b±sqrt(b²-4ac))/(2a)" */
+      "Gr\374\337 Gott. x=(-b\261sqrt(b\262-4ac))/(2a)\n";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    ulc_width_linebreaks (input, SIZEOF (input), 12, 0, 0, NULL, "ISO-8859-1", p);
+    for (i = 0; i < 36; i++)
+      {
+        ASSERT (p[i] == (i == 35 ? UC_BREAK_MANDATORY :
+                         i == 11 || i == 21 || i == 31 ? UC_BREAK_POSSIBLE :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+#endif
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/uniname/test-uninames.c gettext-0.18.1.1/gettext-tools/gnulib-tests/uniname/test-uninames.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/uniname/test-uninames.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/uniname/test-uninames.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test the Unicode character name functions.
-   Copyright (C) 2000-2003, 2005, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2000-2003, 2005, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-cmp.h gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-cmp.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-cmp.h	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-cmp.h	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of uN_cmp() functions.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u16_mbtouc() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u16_mbtouc() and u16_mbtouc_unsafe() functions.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-check.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-check.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-check.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-check.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_check() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_cmp() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_mblen() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.c	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,33 @@
+/* Test of u8_mbtouc() function.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2010.  */
+
+#include <config.h>
+
+#include "unistr.h"
+
+#include "macros.h"
+
+#include "test-u8-mbtouc.h"
+
+int
+main ()
+{
+  test_function (u8_mbtouc);
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.h gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.h	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc.h	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,179 @@
+/* Test of u8_mbtouc() and u8_mbtouc_unsafe() functions.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2010.  */
+
+static void
+test_function (int (*my_u8_mbtouc) (ucs4_t *, const uint8_t *, size_t))
+{
+  ucs4_t uc;
+  int ret;
+
+  /* Test NUL unit input.  */
+  {
+    static const uint8_t input[] = "";
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 1);
+    ASSERT (ret == 1);
+    ASSERT (uc == 0);
+  }
+
+  /* Test ISO 646 unit input.  */
+  {
+    ucs4_t c;
+    uint8_t buf[1];
+
+    for (c = 0; c < 0x80; c++)
+      {
+        buf[0] = c;
+        uc = 0xBADFACE;
+        ret = my_u8_mbtouc (&uc, buf, 1);
+        ASSERT (ret == 1);
+        ASSERT (uc == c);
+      }
+  }
+
+  /* Test 2-byte character input.  */
+  {
+    static const uint8_t input[] = { 0xC3, 0x97 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 2);
+    ASSERT (uc == 0x00D7);
+  }
+
+  /* Test 3-byte character input.  */
+  {
+    static const uint8_t input[] = { 0xE2, 0x82, 0xAC };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 3);
+    ASSERT (ret == 3);
+    ASSERT (uc == 0x20AC);
+  }
+
+  /* Test 4-byte character input.  */
+  {
+    static const uint8_t input[] = { 0xF4, 0x8F, 0xBF, 0xBD };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 4);
+    ASSERT (ret == 4);
+    ASSERT (uc == 0x10FFFD);
+  }
+
+  /* Test incomplete/invalid 1-byte input.  */
+  {
+    static const uint8_t input[] = { 0xC1 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 1);
+    ASSERT (ret == 1);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xC3 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 1);
+    ASSERT (ret == 1);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xE2 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 1);
+    ASSERT (ret == 1);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xF4 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 1);
+    ASSERT (ret == 1);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xFE };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 1);
+    ASSERT (ret == 1);
+    ASSERT (uc == 0xFFFD);
+  }
+
+  /* Test incomplete/invalid 2-byte input.  */
+  {
+    static const uint8_t input[] = { 0xE0, 0x9F };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 1 || ret == 2);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xE2, 0x82 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 2);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xE2, 0xD0 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 1 || ret == 2);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xF0, 0x8F };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 1 || ret == 2);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xF3, 0x8F };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 2);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xF3, 0xD0 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 2);
+    ASSERT (ret == 1 || ret == 2);
+    ASSERT (uc == 0xFFFD);
+  }
+
+  /* Test incomplete/invalid 3-byte input.  */
+  {
+    static const uint8_t input[] = { 0xF3, 0x8F, 0xBF };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 3);
+    ASSERT (ret == 3);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xF3, 0xD0, 0xBF };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 3);
+    ASSERT (ret == 1 || ret == 3);
+    ASSERT (uc == 0xFFFD);
+  }
+  {
+    static const uint8_t input[] = { 0xF3, 0x8F, 0xD0 };
+    uc = 0xBADFACE;
+    ret = my_u8_mbtouc (&uc, input, 3);
+    ASSERT (ret == 1 || ret == 3);
+    ASSERT (uc == 0xFFFD);
+  }
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_mbtoucr() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc-unsafe.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc-unsafe.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc-unsafe.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-mbtouc-unsafe.c	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,33 @@
+/* Test of u8_mbtouc_unsafe() function.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2010.  */
+
+#include <config.h>
+
+#include "unistr.h"
+
+#include "macros.h"
+
+#include "test-u8-mbtouc.h"
+
+int
+main ()
+{
+  test_function (u8_mbtouc_unsafe);
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-prev.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-prev.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-prev.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-prev.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_prev() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_strlen() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test of u8_uctomb() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/u8-cmp.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/u8-cmp.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/u8-cmp.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/u8-cmp.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Compare pieces of UTF-8 strings.
-   Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/unistr/u8-strlen.c gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/u8-strlen.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/unistr/u8-strlen.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/unistr/u8-strlen.c	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine length of UTF-8 string.
-   Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.c gettext-0.18.1.1/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.c	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,86 @@
+/* Test of uc_width() function.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2008.  */
+
+#include <config.h>
+
+#include "uniwidth.h"
+
+#include <stdio.h>
+
+#include "macros.h"
+
+/* One of 0, '0', '1', 'A', '2'.  */
+static char current_width;
+/* The interval for which the current_width holds.  */
+static ucs4_t current_start;
+static ucs4_t current_end;
+
+static void
+finish_interval (void)
+{
+  if (current_width != 0)
+    {
+      if (current_start == current_end)
+        printf ("%04X\t\t%c\n", (unsigned) current_start, current_width);
+      else
+        printf ("%04X..%04X\t%c\n", (unsigned) current_start,
+                (unsigned) current_end, current_width);
+      current_width = 0;
+    }
+}
+
+static void
+add_to_interval (ucs4_t uc, char width)
+{
+  if (current_width == width && uc == current_end + 1)
+    current_end = uc;
+  else
+    {
+      finish_interval ();
+      current_width = width;
+      current_start = current_end = uc;
+    }
+}
+
+int
+main ()
+{
+  ucs4_t uc;
+
+  for (uc = 0; uc < 0x110000; uc++)
+    {
+      int w1 = uc_width (uc, "UTF-8");
+      int w2 = uc_width (uc, "GBK");
+      char width =
+        (w1 == 0 && w2 == 0 ? '0' :
+         w1 == 1 && w2 == 1 ? '1' :
+         w1 == 1 && w2 == 2 ? 'A' :
+         w1 == 2 && w2 == 2 ? '2' :
+         0);
+      if (width == 0)
+        {
+          /* uc must be a control character.  */
+          ASSERT (w1 < 0 && w2 < 0);
+        }
+      else
+        add_to_interval (uc, width);
+    }
+  finish_interval ();
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.sh gettext-0.18.1.1/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.sh
--- gettext-0.19.3/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.sh	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/uniwidth/test-uc_width2.sh	2009-07-19 20:29:14.000000000 +0000
@@ -0,0 +1,382 @@
+#!/bin/sh
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles uc_width.out"
+./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out
+
+tmpfiles="$tmpfiles uc_width.ok"
+cat > uc_width.ok <<\EOF
+0000		0
+0020..007E	1
+00A0		1
+00A1..00AC	A
+00AD		0
+00AE..02FF	A
+0300..036F	0
+0370..0482	A
+0483..0489	0
+048A..0590	A
+0591..05BD	0
+05BE		A
+05BF		0
+05C0		A
+05C1..05C2	0
+05C3		A
+05C4..05C5	0
+05C6		A
+05C7		0
+05C8..05FF	A
+0600..0603	0
+0604..060F	A
+0610..061A	0
+061B..064A	A
+064B..065E	0
+065F..066F	A
+0670		0
+0671..06D5	A
+06D6..06E4	0
+06E5..06E6	A
+06E7..06E8	0
+06E9		A
+06EA..06ED	0
+06EE..070E	A
+070F		0
+0710		A
+0711		0
+0712..072F	A
+0730..074A	0
+074B..07A5	A
+07A6..07B0	0
+07B1..07EA	A
+07EB..07F3	0
+07F4..0900	A
+0901..0902	0
+0903..093B	A
+093C		0
+093D..0940	A
+0941..0948	0
+0949..094C	A
+094D		0
+094E..0950	A
+0951..0954	0
+0955..0961	A
+0962..0963	0
+0964..0980	A
+0981		0
+0982..09BB	A
+09BC		0
+09BD..09C0	A
+09C1..09C4	0
+09C5..09CC	A
+09CD		0
+09CE..09E1	A
+09E2..09E3	0
+09E4..0A00	A
+0A01..0A02	0
+0A03..0A3B	A
+0A3C		0
+0A3D..0A40	A
+0A41..0A42	0
+0A43..0A46	A
+0A47..0A48	0
+0A49..0A4A	A
+0A4B..0A4D	0
+0A4E..0A50	A
+0A51		0
+0A52..0A6F	A
+0A70..0A71	0
+0A72..0A74	A
+0A75		0
+0A76..0A80	A
+0A81..0A82	0
+0A83..0ABB	A
+0ABC		0
+0ABD..0AC0	A
+0AC1..0AC5	0
+0AC6		A
+0AC7..0AC8	0
+0AC9..0ACC	A
+0ACD		0
+0ACE..0AE1	A
+0AE2..0AE3	0
+0AE4..0B00	A
+0B01		0
+0B02..0B3B	A
+0B3C		0
+0B3D..0B3E	A
+0B3F		0
+0B40		A
+0B41..0B44	0
+0B45..0B4C	A
+0B4D		0
+0B4E..0B55	A
+0B56		0
+0B57..0B61	A
+0B62..0B63	0
+0B64..0B81	A
+0B82		0
+0B83..0BBF	A
+0BC0		0
+0BC1..0BCC	A
+0BCD		0
+0BCE..0C3D	A
+0C3E..0C40	0
+0C41..0C45	A
+0C46..0C48	0
+0C49		A
+0C4A..0C4D	0
+0C4E..0C54	A
+0C55..0C56	0
+0C57..0C61	A
+0C62..0C63	0
+0C64..0CBB	A
+0CBC		0
+0CBD..0CCB	A
+0CCC..0CCD	0
+0CCE..0CE1	A
+0CE2..0CE3	0
+0CE4..0D40	A
+0D41..0D44	0
+0D45..0D4C	A
+0D4D		0
+0D4E..0D61	A
+0D62..0D63	0
+0D64..0DC9	A
+0DCA		0
+0DCB..0DD1	A
+0DD2..0DD4	0
+0DD5		A
+0DD6		0
+0DD7..0E30	A
+0E31		0
+0E32..0E33	A
+0E34..0E3A	0
+0E3B..0E46	A
+0E47..0E4E	0
+0E4F..0EB0	A
+0EB1		0
+0EB2..0EB3	A
+0EB4..0EB9	0
+0EBA		A
+0EBB..0EBC	0
+0EBD..0EC7	A
+0EC8..0ECD	0
+0ECE..0F17	A
+0F18..0F19	0
+0F1A..0F34	A
+0F35		0
+0F36		A
+0F37		0
+0F38		A
+0F39		0
+0F3A..0F70	A
+0F71..0F7E	0
+0F7F		A
+0F80..0F84	0
+0F85		A
+0F86..0F87	0
+0F88..0F8F	A
+0F90..0F97	0
+0F98		A
+0F99..0FBC	0
+0FBD..0FC5	A
+0FC6		0
+0FC7..102C	A
+102D..1030	0
+1031		A
+1032..1037	0
+1038		A
+1039..103A	0
+103B..103C	A
+103D..103E	0
+103F..1057	A
+1058..1059	0
+105A..105D	A
+105E..1060	0
+1061..1070	A
+1071..1074	0
+1075..1081	A
+1082		0
+1083..1084	A
+1085..1086	0
+1087..108C	A
+108D		0
+108E..10FF	A
+1100..115F	2
+1160..135E	A
+135F		0
+1360..1711	A
+1712..1714	0
+1715..1731	A
+1732..1734	0
+1735..1751	A
+1752..1753	0
+1754..1771	A
+1772..1773	0
+1774..17B3	A
+17B4..17B5	0
+17B6		A
+17B7..17BD	0
+17BE..17C5	A
+17C6		0
+17C7..17C8	A
+17C9..17D3	0
+17D4..17DC	A
+17DD		0
+17DE..180A	A
+180B..180D	0
+180E..18A8	A
+18A9		0
+18AA..191F	A
+1920..1922	0
+1923..1926	A
+1927..1928	0
+1929..1931	A
+1932		0
+1933..1938	A
+1939..193B	0
+193C..1A16	A
+1A17..1A18	0
+1A19..1AFF	A
+1B00..1B03	0
+1B04..1B33	A
+1B34		0
+1B35		A
+1B36..1B3A	0
+1B3B		A
+1B3C		0
+1B3D..1B41	A
+1B42		0
+1B43..1B6A	A
+1B6B..1B73	0
+1B74..1B7F	A
+1B80..1B81	0
+1B82..1BA1	A
+1BA2..1BA5	0
+1BA6..1BA7	A
+1BA8..1BA9	0
+1BAA..1C2B	A
+1C2C..1C33	0
+1C34..1C35	A
+1C36..1C37	0
+1C38..1DBF	A
+1DC0..1DE6	0
+1DE7..1DFD	A
+1DFE..1DFF	0
+1E00..200A	A
+200B..200F	0
+2010..2029	A
+202A..202E	0
+202F..205F	A
+2060..2064	0
+2065..2069	A
+206A..206F	0
+2070..20A8	A
+20A9		1
+20AA..20CF	A
+20D0..20F0	0
+20F1..2328	A
+2329..232A	2
+232B..2DDF	A
+2DE0..2DFF	0
+2E00..2E7F	A
+2E80..3029	2
+302A..302F	0
+3030..303E	2
+303F		A
+3040..3098	2
+3099..309A	0
+309B..4DBF	2
+4DC0..4DFF	A
+4E00..A4CF	2
+A4D0..A66E	A
+A66F..A672	0
+A673..A67B	A
+A67C..A67D	0
+A67E..A801	A
+A802		0
+A803..A805	A
+A806		0
+A807..A80A	A
+A80B		0
+A80C..A824	A
+A825..A826	0
+A827..A8C3	A
+A8C4		0
+A8C5..A925	A
+A926..A92D	0
+A92E..A946	A
+A947..A951	0
+A952..AA28	A
+AA29..AA2E	0
+AA2F..AA30	A
+AA31..AA32	0
+AA33..AA34	A
+AA35..AA36	0
+AA37..AA42	A
+AA43		0
+AA44..AA4B	A
+AA4C		0
+AA4D..ABFF	A
+AC00..D7A3	2
+D7A4..F8FF	A
+F900..FAFF	2
+FB00..FB1D	A
+FB1E		0
+FB1F..FDFF	A
+FE00..FE0F	0
+FE10..FE1F	2
+FE20..FE26	0
+FE27..FE2F	A
+FE30..FE6F	2
+FE70..FEFE	A
+FEFF		0
+FF00..FF60	2
+FF61..FFDF	1
+FFE0..FFE6	2
+FFE7..FFF8	1
+FFF9..FFFB	0
+FFFC..101FC	1
+101FD		0
+101FE..10A00	1
+10A01..10A03	0
+10A04		1
+10A05..10A06	0
+10A07..10A0B	1
+10A0C..10A0F	0
+10A10..10A37	1
+10A38..10A3A	0
+10A3B..10A3E	1
+10A3F		0
+10A40..1D166	1
+1D167..1D169	0
+1D16A..1D17A	1
+1D17B..1D182	0
+1D183..1D184	1
+1D185..1D18B	0
+1D18C..1D1A9	1
+1D1AA..1D1AD	0
+1D1AE..1D241	1
+1D242..1D244	0
+1D245..1FFFF	1
+20000..2A6D6	2
+2A6D7..2F7FF	1
+2F800..2FA1D	2
+2FA1E..E0000	1
+E0001		0
+E0002..E001F	1
+E0020..E007F	0
+E0080..E00FF	1
+E0100..E01EF	0
+E01F0..10FFFF	1
+EOF
+
+: ${DIFF=diff}
+${DIFF} uc_width.ok uc_width.out
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/uniwidth/test-uc_width.c gettext-0.18.1.1/gettext-tools/gnulib-tests/uniwidth/test-uc_width.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/uniwidth/test-uc_width.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/uniwidth/test-uc_width.c	2010-02-16 21:32:29.000000000 +0000
@@ -0,0 +1,56 @@
+/* Test of uc_width() function.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+
+   This 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 Bruno Haible <bruno@clisp.org>, 2007.  */
+
+#include <config.h>
+
+#include "uniwidth.h"
+
+#include "macros.h"
+
+int
+main ()
+{
+  ucs4_t uc;
+
+  /* Test width of ASCII characters.  */
+  for (uc = 0x0020; uc < 0x007F; uc++)
+    ASSERT (uc_width (uc, "ISO-8859-2") == 1);
+
+  /* Test width of some non-spacing characters.  */
+  ASSERT (uc_width (0x0301, "UTF-8") == 0);
+  ASSERT (uc_width (0x05B0, "UTF-8") == 0);
+
+  /* Test width of some format control characters.  */
+  ASSERT (uc_width (0x200E, "UTF-8") == 0);
+  ASSERT (uc_width (0x2060, "UTF-8") == 0);
+  ASSERT (uc_width (0xE0001, "UTF-8") == 0);
+  ASSERT (uc_width (0xE0044, "UTF-8") == 0);
+
+  /* Test width of some zero width characters.  */
+  ASSERT (uc_width (0x200B, "UTF-8") == 0);
+  ASSERT (uc_width (0xFEFF, "UTF-8") == 0);
+
+  /* Test width of some CJK characters.  */
+  ASSERT (uc_width (0x3000, "UTF-8") == 2);
+  ASSERT (uc_width (0xB250, "UTF-8") == 2);
+  ASSERT (uc_width (0xFF1A, "UTF-8") == 2);
+  ASSERT (uc_width (0x20369, "UTF-8") == 2);
+  ASSERT (uc_width (0x2F876, "UTF-8") == 2);
+
+  return 0;
+}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/wcrtomb.c gettext-0.18.1.1/gettext-tools/gnulib-tests/wcrtomb.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/wcrtomb.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/wcrtomb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Convert wide character to multibyte character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-   This 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>
-
-/* Specification.  */
-#include <wchar.h>
-
-#include <errno.h>
-#include <stdlib.h>
-
-
-size_t
-wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
-{
-  /* This implementation of wcrtomb on top of wctomb() supports only
-     stateless encodings.  ps must be in the initial state.  */
-  if (ps != NULL && !mbsinit (ps))
-    {
-      errno = EINVAL;
-      return (size_t)(-1);
-    }
-
-  if (s == NULL)
-    /* We know the NUL wide character corresponds to the NUL character.  */
-    return 1;
-  else
-    {
-      int ret = wctomb (s, wc);
-
-      if (ret >= 0)
-        return ret;
-      else
-        {
-          errno = EILSEQ;
-          return (size_t)(-1);
-        }
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/wctob.c gettext-0.18.1.1/gettext-tools/gnulib-tests/wctob.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/wctob.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/wctob.c	2010-05-09 01:37:17.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert wide character to unibyte character.
-   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010 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 -Nru gettext-0.19.3/gettext-tools/gnulib-tests/wctomb.c gettext-0.18.1.1/gettext-tools/gnulib-tests/wctomb.c
--- gettext-0.19.3/gettext-tools/gnulib-tests/wctomb.c	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/wctomb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* Convert wide character to multibyte character.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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 <stdlib.h>
-
-#include <string.h>
-#include <wchar.h>
-
-#include "wctomb-impl.h"
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/wctomb-impl.h gettext-0.18.1.1/gettext-tools/gnulib-tests/wctomb-impl.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/wctomb-impl.h	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/wctomb-impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/* Convert wide character to multibyte character.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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/>.  */
-
-int
-wctomb (char *s, wchar_t wc)
-{
-  if (s == NULL)
-    return 0;
-  else
-    {
-      mbstate_t state;
-      size_t result;
-
-      memset (&state, 0, sizeof (mbstate_t));
-      result = wcrtomb (s, wc, &state);
-      if (result == (size_t)-1)
-        return -1;
-      return result;
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/gnulib-tests/zerosize-ptr.h gettext-0.18.1.1/gettext-tools/gnulib-tests/zerosize-ptr.h
--- gettext-0.19.3/gettext-tools/gnulib-tests/zerosize-ptr.h	2014-10-16 06:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/zerosize-ptr.h	2010-02-16 21:32:29.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return a pointer to a zero-size object in memory.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/INSTALL gettext-0.18.1.1/gettext-tools/INSTALL
--- gettext-0.19.3/gettext-tools/INSTALL	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/INSTALL	2010-06-06 12:49:57.000000000 +0000
@@ -4,56 +4,56 @@
 =============
 
    This package depends on a few other packages.  They are listed in
-the file ‘DEPENDENCIES’.  It is recommended to install the listed
+the file `DEPENDENCIES'.  It is recommended to install the listed
 packages before installing this package.
 
 Basic Installation
 ==================
 
-   The ‘configure’ shell script attempts to guess correct values for
+   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a ‘Makefile’ in each directory of the package.
-It may also create one or more ‘.h’ files containing system-dependent
-definitions.  Finally, it creates a shell script ‘config.status’ that
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, a file
-‘config.cache’ that saves the results of its tests to speed up
-reconfiguring, and a file ‘config.log’ containing compiler output
-(useful mainly for debugging ‘configure’).
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
 
    If you need to do unusual things to compile the package, please try
-to figure out how ‘configure’ could check whether to do them, and mail
-diffs or instructions to the address given in the ‘README’ so they can
-be considered for the next release.  If at some point ‘config.cache’
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file ‘configure.ac’ is used to create ‘configure’ by a program
-called ‘autoconf’.  You only need ‘configure.ac’ if you want to change
-it or regenerate ‘configure’ using a newer version of ‘autoconf’.
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
-  1. ‘cd’ to the directory containing the package's source code and type
-     ‘./configure’ to configure the package for your system.  If you're
-     using ‘csh’ on an old version of System V, you might need to type
-     ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-     ‘configure’ itself.
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
 
-     Running ‘configure’ takes awhile.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
-  2. Type ‘make’ to compile the package.
+  2. Type `make' to compile the package.
 
-  3. Optionally, type ‘make check’ to run any self-tests that come with
+  3. Optionally, type `make check' to run any self-tests that come with
      the package.
 
-  4. Type ‘make install’ to install the programs and any data files and
+  4. Type `make install' to install the programs and any data files and
      documentation.
 
   5. You can remove the program binaries and object files from the
-     source code directory by typing ‘make clean’.  To also remove the
-     files that ‘configure’ created (so you can compile the package for
-     a different kind of computer), type ‘make distclean’.  There is
-     also a ‘make maintainer-clean’ target, but that is intended mainly
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
@@ -62,7 +62,7 @@
 =====================
 
    Some systems require unusual options for compilation or linking that
-the ‘configure’ script does not know about.  You can give ‘configure’
+the `configure' script does not know about.  You can give `configure'
 initial values for variables as arguments.  You can do it like this:
      ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
@@ -71,16 +71,16 @@
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of ‘make’ that
-supports the ‘VPATH’ variable, such as GNU ‘make’.  ‘cd’ to the
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
-the ‘configure’ script.  ‘configure’ automatically checks for the
-source code in the directory that ‘configure’ is in and in ‘..’.
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a ‘make’ that does not supports the ‘VPATH’
+   If you have to use a `make' that does not supports the `VPATH'
 variable, you have to compile the package for one architecture at a time
 in the source code directory.  After you have installed the package for
-one architecture, use ‘make distclean’ before reconfiguring for another
+one architecture, use `make distclean' before reconfiguring for another
 architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
@@ -100,25 +100,25 @@
 Installation Names
 ==================
 
-   By default, ‘make install’ will install the package's files in
-‘/usr/local/bin’, ‘/usr/local/man’, etc.  You can specify an
-installation prefix other than ‘/usr/local’ by giving ‘configure’ the
-option ‘--prefix=PATH’.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
+give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like ‘--bindir=PATH’ to specify different values for particular
-kinds of files.  Run ‘configure --help’ for a list of the directories
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving ‘configure’ the
-option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
 Enabling Relocatability
 =======================
@@ -127,12 +127,12 @@
 that packages are not relocatable.  It means a user cannot copy a
 program, installed by another user on the same machine, to his home
 directory, and have it work correctly (including i18n).  So many users
-need to go through ‘configure; make; make install’ with all its
+need to go through `configure; make; make install' with all its
 dependencies, options, and hurdles.
 
    Red Hat, Debian, and similar package systems solve the "ease of
-installation" problem, but they hardwire path names, usually to ‘/usr’
-or ‘/usr/local’.  This means that users need root privileges to install
+installation" problem, but they hardwire path names, usually to `/usr'
+or `/usr/local'.  This means that users need root privileges to install
 a binary package, and prevents installing two different versions of the
 same binary package.
 
@@ -142,24 +142,24 @@
 to do the same thing with a hard link _only_ if the hard link file is
 in the same directory as the real program.
 
-   To configure a program to be relocatable, add ‘--enable-relocatable’
-to the ‘configure’ command line.
+   To configure a program to be relocatable, add `--enable-relocatable'
+to the `configure' command line.
 
    On some OSes the executables remember the location of shared
 libraries and prefer them over any other search path.  Therefore, such
 an executable will look for its shared libraries first in the original
 installation directory and only then in the current installation
-directory.  Thus, for reliability, it is best to also give a ‘--prefix’
+directory.  Thus, for reliability, it is best to also give a `--prefix'
 option pointing to a directory that does not exist now and which never
-will be created, e.g.  ‘--prefix=/nonexistent’.  You may use
-‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
+will be created, e.g.  `--prefix=/nonexistent'.  You may use
+`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into
 that directory.
 
    We do not recommend using a prefix writable by unprivileged users
-(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
+(e.g. `/tmp/inst$$') because such a directory can be recreated by an
 unprivileged user after the original directory has been removed.  We
 also do not recommend prefixes that might be behind an automounter
-(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
+(e.g. `$HOME/inst$$') because of the performance impact of directory
 searching.
 
    Here's a sample installation run that takes into account all these
@@ -169,10 +169,10 @@
      make
      make install DESTDIR=/tmp/inst$$
 
-   Installation with ‘--enable-relocatable’ will not work for setuid or
+   Installation with `--enable-relocatable' will not work for setuid or
 setgid executables, because such executables search only system library
 paths for security reasons.  Also, installation with
-‘--enable-relocatable’ might not work on OpenBSD, when the package
+`--enable-relocatable' might not work on OpenBSD, when the package
 contains shared libraries and libtool versions 1.5.xx are used.
 
    The runtime penalty and size penalty are negligible on GNU/Linux
@@ -183,25 +183,25 @@
 Optional Features
 =================
 
-   Some packages pay attention to ‘--enable-FEATURE’ options to
-‘configure’, where FEATURE indicates an optional part of the package.
-They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
-is something like ‘gnu-as’ or ‘x’ (for the X Window System).  The
-‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, ‘configure’ can usually
+   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the ‘configure’ options ‘--x-includes=DIR’ and
-‘--x-libraries=DIR’ to specify their locations.
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
 
    For packages that use the GNU libiconv library, you can use the
-‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
+`configure' option `--with-libiconv-prefix' to specify the prefix you
 used while installing GNU libiconv.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
    For packages that use the GNU libintl library, you can use the
-‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
+`configure' option `--with-libintl-prefix' to specify the prefix you
 used while installing GNU gettext-runtime.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
@@ -217,7 +217,7 @@
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its ‘<wchar.h>’ header file.  The option ‘-nodtk’ can be used as
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
 to try
 
@@ -246,62 +246,62 @@
 Specifying the System Type
 ==========================
 
-   There may be some features ‘configure’ can not figure out
+   There may be some features `configure' can not figure out
 automatically, but needs to determine by the type of host the package
-will run on.  Usually ‘configure’ can figure that out, but if it prints
+will run on.  Usually `configure' can figure that out, but if it prints
 a message saying it can not guess the host type, give it the
-‘--host=TYPE’ option.  TYPE can either be a short name for the system
-type, such as ‘sun4’, or a canonical name with three fields:
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
      CPU-COMPANY-SYSTEM
 
-See the file ‘config.sub’ for the possible values of each field.  If
-‘config.sub’ isn't included in this package, then this package doesn't
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
 need to know the host type.
 
    If you are building compiler tools for cross-compiling, you can also
-use the ‘--target=TYPE’ option to select the type of system they will
-produce code for and the ‘--build=TYPE’ option to select the type of
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
 system on which you are compiling the package.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for ‘configure’ scripts to share,
-you can create a site shell script called ‘config.site’ that gives
-default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
-‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
-‘PREFIX/etc/config.site’ if it exists.  Or, you can set the
-‘CONFIG_SITE’ environment variable to the location of the site script.
-A warning: not all ‘configure’ scripts look for a site script.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
 
 Operation Controls
 ==================
 
-   ‘configure’ recognizes the following options to control how it
+   `configure' recognizes the following options to control how it
 operates.
 
-‘--cache-file=FILE’
+`--cache-file=FILE'
      Use and save the results of the tests in FILE instead of
-     ‘./config.cache’.  Set FILE to ‘/dev/null’ to disable caching, for
-     debugging ‘configure’.
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
 
-‘--help’
-     Print a summary of the options to ‘configure’, and exit.
+`--help'
+     Print a summary of the options to `configure', and exit.
 
-‘--quiet’
-‘--silent’
-‘-q’
+`--quiet'
+`--silent'
+`-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to ‘/dev/null’ (any error
+     suppress all normal output, redirect it to `/dev/null' (any error
      messages will still be shown).
 
-‘--srcdir=DIR’
+`--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     ‘configure’ can determine that directory automatically.
+     `configure' can determine that directory automatically.
 
-‘--version’
-     Print the version of Autoconf used to generate the ‘configure’
+`--version'
+     Print the version of Autoconf used to generate the `configure'
      script, and exit.
 
-‘configure’ also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/asnprintf.c gettext-0.18.1.1/gettext-tools/libgettextpo/asnprintf.c
--- gettext-0.19.3/gettext-tools/libgettextpo/asnprintf.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/asnprintf.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/asprintf.c gettext-0.18.1.1/gettext-tools/libgettextpo/asprintf.c
--- gettext-0.19.3/gettext-tools/libgettextpo/asprintf.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/asprintf.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/basename.c gettext-0.18.1.1/gettext-tools/libgettextpo/basename.c
--- gettext-0.19.3/gettext-tools/libgettextpo/basename.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/basename.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000-2002, 2004, 2006, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002, 2004, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -22,7 +22,7 @@
 /* Specification.  */
 #include "basename.h"
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 
 #include <stdio.h>
 #include <assert.h>
@@ -45,16 +45,16 @@
 #endif
 
 #ifndef _LIBC
-/* We cannot generally use the name 'basename' since XPG defines an unusable
+/* We cannot generally use the name `basename' since XPG defines an unusable
    variant of the function but we cannot use it.  */
 # undef basename
 # define basename gnu_basename
 #endif
 
-/* In general, we can't use the builtin 'basename' function if available,
+/* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
-   In some environments the builtin 'basename' modifies its argument.
-   If NAME is all slashes, be sure to return '/'.  */
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
 basename (char const *name)
@@ -71,7 +71,7 @@
         all_slashes = 0;
     }
 
-  /* If NAME is all slashes, arrange to return '/'.  */
+  /* If NAME is all slashes, arrange to return `/'.  */
   if (*base == '\0' && ISSLASH (*name) && all_slashes)
     --base;
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/basename.h gettext-0.18.1.1/gettext-tools/libgettextpo/basename.h
--- gettext-0.19.3/gettext-tools/libgettextpo/basename.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/basename.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -27,7 +27,7 @@
 #endif
 
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 /* When not using the GNU libc we use the basename implementation we
    provide here.  */
 extern char *gnu_basename (const char *);
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-ctype.c gettext-0.18.1.1/gettext-tools/libgettextpo/c-ctype.c
--- gettext-0.19.3/gettext-tools/libgettextpo/c-ctype.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-ctype.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,6 +1,6 @@
 /* Character handling in C locale.
 
-   Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright 2000-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 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/>.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-ctype.h gettext-0.18.1.1/gettext-tools/libgettextpo/c-ctype.h
--- gettext-0.19.3/gettext-tools/libgettextpo/c-ctype.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-ctype.h	2010-02-16 21:33:13.000000000 +0000
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2010 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,7 +18,8 @@
 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/>.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef C_CTYPE_H
 #define C_CTYPE_H
@@ -117,27 +118,26 @@
          if (c_isalpha (*s)) ...
  */
 
-extern bool c_isascii (int c) _GL_ATTRIBUTE_CONST; /* not locale dependent */
+extern bool c_isascii (int c); /* not locale dependent */
 
-extern bool c_isalnum (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isalpha (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isblank (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_iscntrl (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isdigit (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_islower (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isgraph (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isprint (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_ispunct (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isspace (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isupper (int c) _GL_ATTRIBUTE_CONST;
-extern bool c_isxdigit (int c) _GL_ATTRIBUTE_CONST;
+extern bool c_isalnum (int c);
+extern bool c_isalpha (int c);
+extern bool c_isblank (int c);
+extern bool c_iscntrl (int c);
+extern bool c_isdigit (int c);
+extern bool c_islower (int c);
+extern bool c_isgraph (int c);
+extern bool c_isprint (int c);
+extern bool c_ispunct (int c);
+extern bool c_isspace (int c);
+extern bool c_isupper (int c);
+extern bool c_isxdigit (int c);
 
-extern int c_tolower (int c) _GL_ATTRIBUTE_CONST;
-extern int c_toupper (int c) _GL_ATTRIBUTE_CONST;
+extern int c_tolower (int c);
+extern int c_toupper (int c);
 
 
-#if (defined __GNUC__ && !defined __STRICT_ANSI__ && defined __OPTIMIZE__ \
-     && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS)
+#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS
 
 /* ASCII optimizations. */
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/ChangeLog gettext-0.18.1.1/gettext-tools/libgettextpo/ChangeLog
--- gettext-0.19.3/gettext-tools/libgettextpo/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/ChangeLog	2010-06-06 17:58:06.000000000 +0000
@@ -1,72 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-po.in.h (LIBGETTEXTPO_VERSION): Bump to 0.19.3.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-04-22  Roumen Petrov  <bugtrack@roumenpetrov.info>  (tiny change)
-
-	build: Use Automake 'subdir-objects' option
-	* Makefile.am (AUTOMAKE_OPTIONS): Add 'subdir-objects'.
-
-2013-04-26  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Python brace format.
-	* Makefile.am (libgettextpo_la_AUXSOURCES): Add format-python-brace.c.
-
-2013-04-17  Andreas Stricker  <astricker@futurelab.ch>
-
-	Support for JavaScript.
-	* Makefile.am (libgettextpo_la_AUXSOURCES): Add format-javascript.c.
-
-2013-04-11  Ľubomír Remák  <lubomirr@lubomirr.eu>
-
-	* Makefile.am (libgettextpo_la_AUXSOURCES): Add format-lua.c.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-08  Daiki Ueno  <ueno@unixuser.org>
-
-	* gettext-po.in.h (LIBGETTEXTPO_VERSION): Bump to 0.18.2.
-	* Makefile.am (LTV_CURRENT): Bump to 5:2:5.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	Rename gettext-po.h.in to gettext-po.in.h.
-	* gettext-po.in.h: New file, renamed from gettext-po.h.in.
-	* Makefile.am (EXTRA_DIST, gettext-po.h): Update.
-
-2011-06-07  Bruno Haible  <bruno@clisp.org>
-
-	Rely more on libtool.
-	* Makefile.am (libgettextpo_la_LDFLAGS): Use -no-undefined always.
-	Don't use @LTNOUNDEF@.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	Bug fixes in libgettextpo.
-	* gettext-po.c (po_message_create): Initialize msgstr with the empty
-	string, not with NULL.
-	(po_message_is_range): Assign to output parameters correctly.
-	(po_file_check_all, po_message_check_all): Have check_message_list
-	ignore untranslated and fuzzy messages.
-
 2010-06-06  Bruno Haible  <bruno@clisp.org>
 
 	Avoid link error in programs that use libgettextpo.
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/close.c gettext-0.18.1.1/gettext-tools/libgettextpo/close.c
--- gettext-0.19.3/gettext-tools/libgettextpo/close.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/close.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* close replacement.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <unistd.h>
-
-#include <errno.h>
-
-#include "fd-hook.h"
-#include "msvc-inval.h"
-
-#undef close
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-close_nothrow (int fd)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = close (fd);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#else
-# define close_nothrow close
-#endif
-
-/* Override close() to call into other gnulib modules.  */
-
-int
-rpl_close (int fd)
-{
-#if WINDOWS_SOCKETS
-  int retval = execute_all_close_hooks (close_nothrow, fd);
-#else
-  int retval = close_nothrow (fd);
-#endif
-
-#if REPLACE_FCHDIR
-  if (retval >= 0)
-    _gl_unregister_fd (fd);
-#endif
-
-  return retval;
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/concat-filename.c gettext-0.18.1.1/gettext-tools/libgettextpo/concat-filename.c
--- gettext-0.19.3/gettext-tools/libgettextpo/concat-filename.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/concat-filename.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/concat-filename.h gettext-0.18.1.1/gettext-tools/libgettextpo/concat-filename.h
--- gettext-0.19.3/gettext-tools/libgettextpo/concat-filename.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/concat-filename.h	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/config.charset gettext-0.18.1.1/gettext-tools/libgettextpo/config.charset
--- gettext-0.19.3/gettext-tools/libgettextpo/config.charset	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/config.charset	2010-05-09 01:38:02.000000000 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
@@ -29,8 +30,6 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name              MIME?             used by which systems
-#                                    (darwin = Mac OS X, woe32 = native Windows)
-#
 #   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
 #   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
 #   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-strcasecmp.c gettext-0.18.1.1/gettext-tools/libgettextpo/c-strcasecmp.c
--- gettext-0.19.3/gettext-tools/libgettextpo/c-strcasecmp.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-strcasecmp.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-strcaseeq.h gettext-0.18.1.1/gettext-tools/libgettextpo/c-strcaseeq.h
--- gettext-0.19.3/gettext-tools/libgettextpo/c-strcaseeq.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-strcaseeq.h	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Optimized case-insensitive string comparison in C locale.
-   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-strcase.h gettext-0.18.1.1/gettext-tools/libgettextpo/c-strcase.h
--- gettext-0.19.3/gettext-tools/libgettextpo/c-strcase.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-strcase.h	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef C_STRCASE_H
 #define C_STRCASE_H
@@ -39,13 +40,12 @@
 /* Compare strings S1 and S2, ignoring case, returning less than, equal to or
    greater than zero if S1 is lexicographically less than, equal to or greater
    than S2.  */
-extern int c_strcasecmp (const char *s1, const char *s2) _GL_ATTRIBUTE_PURE;
+extern int c_strcasecmp (const char *s1, const char *s2);
 
 /* Compare no more than N characters of strings S1 and S2, ignoring case,
    returning less than, equal to or greater than zero if S1 is
    lexicographically less than, equal to or greater than S2.  */
-extern int c_strncasecmp (const char *s1, const char *s2, size_t n)
-  _GL_ATTRIBUTE_PURE;
+extern int c_strncasecmp (const char *s1, const char *s2, size_t n);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-strncasecmp.c gettext-0.18.1.1/gettext-tools/libgettextpo/c-strncasecmp.c
--- gettext-0.19.3/gettext-tools/libgettextpo/c-strncasecmp.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-strncasecmp.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-strstr.c gettext-0.18.1.1/gettext-tools/libgettextpo/c-strstr.c
--- gettext-0.19.3/gettext-tools/libgettextpo/c-strstr.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-strstr.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* c-strstr.c -- substring search in C locale
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/c-strstr.h gettext-0.18.1.1/gettext-tools/libgettextpo/c-strstr.h
--- gettext-0.19.3/gettext-tools/libgettextpo/c-strstr.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/c-strstr.h	2010-02-16 21:33:13.000000000 +0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2001-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2009-2010 Free Software Foundation, Inc.
 
    This program 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 @@
         [this restriction is needed because of BIG5, BIG5-HKSCS, GBK, GB18030,
          Shift_JIS, JOHAB], and
      3. does not consist entirely of decimal digits, or has at least length 4
-        [this restriction is needed because of GB18030].
+        [this restricion is needed because of GB18030].
    This function is also safe to be called, even in a multibyte locale, if
    HAYSTACK and NEEDLE are known to both consist solely of printable ASCII
    characters excluding '\\' and '~'.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/diffseq.h gettext-0.18.1.1/gettext-tools/libgettextpo/diffseq.h
--- gettext-0.19.3/gettext-tools/libgettextpo/diffseq.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/diffseq.h	2010-04-25 09:22:38.000000000 +0000
@@ -1,6 +1,6 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2014 Free Software
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,15 +26,18 @@
    distance" in Wikipedia.
 
    The basic algorithm is described in:
-   "An O(ND) Difference Algorithm and its Variations", Eugene W. Myers,
-   Algorithmica Vol. 1, 1986, pp. 251-266,
-   <http://dx.doi.org/10.1007/BF01840446>.
-   See especially section 4.2, which describes the variation used below.
+   "An O(ND) Difference Algorithm and its Variations", Eugene Myers,
+   Algorithmica Vol. 1 No. 2, 1986, pp. 251-266;
+   see especially section 4.2, which describes the variation used below.
 
    The basic algorithm was independently discovered as described in:
-   "Algorithms for Approximate String Matching", Esko Ukkonen,
-   Information and Control Vol. 64, 1985, pp. 100-118,
-   <http://dx.doi.org/10.1016/S0019-9958(85)80046-2>.  */
+   "Algorithms for Approximate String Matching", E. Ukkonen,
+   Information and Control Vol. 64, 1985, pp. 100-118.
+
+   Unless the 'find_minimal' flag is set, this code uses the TOO_EXPENSIVE
+   heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N)
+   at the price of producing suboptimal output for large inputs with
+   many differences.  */
 
 /* Before including this file, you need to define:
      ELEMENT                 The element type of the vectors being compared.
@@ -73,7 +76,7 @@
 # define EARLY_ABORT(ctxt) false
 #endif
 
-/* Use this to suppress gcc's "...may be used before initialized" warnings.
+/* Use this to suppress gcc's `...may be used before initialized' warnings.
    Beware: The Code argument must not contain commas.  */
 #ifndef IF_LINT
 # ifdef lint
@@ -117,13 +120,16 @@
   OFFSET *bdiag;
 
   #ifdef USE_HEURISTIC
-  /* This corresponds to the diff --speed-large-files flag.  With this
-     heuristic, for vectors with a constant small density of changes,
-     the algorithm is linear in the vector size.  */
+  /* This corresponds to the diff -H flag.  With this heuristic, for
+     vectors with a constant small density of changes, the algorithm is
+     linear in the vectors size.  */
   bool heuristic;
   #endif
 
-  /* Snakes bigger than this are considered "big".  */
+  /* Edit scripts longer than this are too expensive to compute.  */
+  OFFSET too_expensive;
+
+  /* Snakes bigger than this are considered `big'.  */
   #define SNAKE_LIMIT 20
 };
 
@@ -132,6 +138,12 @@
   /* Midpoints of this partition.  */
   OFFSET xmid;
   OFFSET ymid;
+
+  /* True if low half will be analyzed minimally.  */
+  bool lo_minimal;
+
+  /* Likewise for high half.  */
+  bool hi_minimal;
 };
 
 
@@ -143,10 +155,17 @@
    When the two searches meet, we have found the midpoint of the shortest
    edit sequence.
 
-   Set *PART to the midpoint (XMID,YMID).  The diagonal number
+   If FIND_MINIMAL is true, find the minimal edit script regardless of
+   expense.  Otherwise, if the search is too expensive, use heuristics to
+   stop the search and report a suboptimal answer.
+
+   Set PART->(xmid,ymid) to the midpoint (XMID,YMID).  The diagonal number
    XMID - YMID equals the number of inserted elements minus the number
    of deleted elements (counting only elements before the midpoint).
 
+   Set PART->lo_minimal to true iff the minimal edit script for the
+   left half of the partition is known; similarly for PART->hi_minimal.
+
    This function assumes that the first elements of the specified portions
    of the two vectors do not match, and likewise that the last elements do not
    match.  The caller must trim matching elements from the beginning and end
@@ -156,7 +175,7 @@
    suboptimal diff output.  It cannot cause incorrect diff output.  */
 
 static void
-diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
+diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
       struct partition *part, struct context *ctxt)
 {
   OFFSET *const fd = ctxt->fdiag;       /* Give the compiler a chance. */
@@ -216,6 +235,7 @@
             {
               part->xmid = x;
               part->ymid = y;
+              part->lo_minimal = part->hi_minimal = true;
               return;
             }
         }
@@ -248,10 +268,14 @@
             {
               part->xmid = x;
               part->ymid = y;
+              part->lo_minimal = part->hi_minimal = true;
               return;
             }
         }
 
+      if (find_minimal)
+        continue;
+
 #ifdef USE_HEURISTIC
       /* Heuristic: check occasionally for a diagonal that has made lots
          of progress compared with the edit distance.  If we have any
@@ -295,7 +319,11 @@
                   }
               }
             if (best > 0)
-	      return;
+              {
+                part->lo_minimal = true;
+                part->hi_minimal = false;
+                return;
+              }
           }
 
           {
@@ -330,10 +358,77 @@
                   }
               }
             if (best > 0)
-	      return;
+              {
+                part->lo_minimal = false;
+                part->hi_minimal = true;
+                return;
+              }
           }
         }
 #endif /* USE_HEURISTIC */
+
+      /* Heuristic: if we've gone well beyond the call of duty, give up
+         and report halfway between our best results so far.  */
+      if (c >= ctxt->too_expensive)
+        {
+          OFFSET fxybest;
+          OFFSET fxbest IF_LINT (= 0);
+          OFFSET bxybest;
+          OFFSET bxbest IF_LINT (= 0);
+
+          /* Find forward diagonal that maximizes X + Y.  */
+          fxybest = -1;
+          for (d = fmax; d >= fmin; d -= 2)
+            {
+              OFFSET x = MIN (fd[d], xlim);
+              OFFSET y = x - d;
+              if (ylim < y)
+                {
+                  x = ylim + d;
+                  y = ylim;
+                }
+              if (fxybest < x + y)
+                {
+                  fxybest = x + y;
+                  fxbest = x;
+                }
+            }
+
+          /* Find backward diagonal that minimizes X + Y.  */
+          bxybest = OFFSET_MAX;
+          for (d = bmax; d >= bmin; d -= 2)
+            {
+              OFFSET x = MAX (xoff, bd[d]);
+              OFFSET y = x - d;
+              if (y < yoff)
+                {
+                  x = yoff + d;
+                  y = yoff;
+                }
+              if (x + y < bxybest)
+                {
+                  bxybest = x + y;
+                  bxbest = x;
+                }
+            }
+
+          /* Use the better of the two diagonals.  */
+          if ((xlim + ylim) - bxybest < fxybest - (xoff + yoff))
+            {
+              part->xmid = fxbest;
+              part->ymid = fxybest - fxbest;
+              part->lo_minimal = true;
+              part->hi_minimal = false;
+            }
+          else
+            {
+              part->xmid = bxbest;
+              part->ymid = bxybest - bxbest;
+              part->lo_minimal = false;
+              part->hi_minimal = true;
+            }
+          return;
+        }
     }
   #undef XREF_YREF_EQUAL
 }
@@ -347,6 +442,9 @@
    Note that XLIM, YLIM are exclusive bounds.  All indices into the vectors
    are origin-0.
 
+   If FIND_MINIMAL, find a minimal difference no matter how
+   expensive it is.
+
    The results are recorded by invoking NOTE_DELETE and NOTE_INSERT.
 
    Return false if terminated normally, or true if terminated through early
@@ -354,7 +452,7 @@
 
 static bool
 compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
-            struct context *ctxt)
+            bool find_minimal, struct context *ctxt)
 {
 #ifdef ELEMENT
   ELEMENT const *xv = ctxt->xvec; /* Help the compiler.  */
@@ -400,12 +498,12 @@
       struct partition part IF_LINT2 (= { .xmid = 0, .ymid = 0 });
 
       /* Find a point of correspondence in the middle of the vectors.  */
-      diag (xoff, xlim, yoff, ylim, &part, ctxt);
+      diag (xoff, xlim, yoff, ylim, find_minimal, &part, ctxt);
 
       /* Use the partitions to split this problem into subproblems.  */
-      if (compareseq (xoff, part.xmid, yoff, part.ymid, ctxt))
+      if (compareseq (xoff, part.xmid, yoff, part.ymid, part.lo_minimal, ctxt))
         return true;
-      if (compareseq (part.xmid, xlim, part.ymid, ylim, ctxt))
+      if (compareseq (part.xmid, xlim, part.ymid, ylim, part.hi_minimal, ctxt))
         return true;
     }
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/dosname.h gettext-0.18.1.1/gettext-tools/libgettextpo/dosname.h
--- gettext-0.19.3/gettext-tools/libgettextpo/dosname.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/dosname.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* File names on MS-DOS/Windows systems.
-
-   Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.
-
-   From Paul Eggert and Jim Meyering.  */
-
-#ifndef _DOSNAME_H
-#define _DOSNAME_H
-
-#if (defined _WIN32 || defined __WIN32__ ||     \
-     defined __MSDOS__ || defined __CYGWIN__ || \
-     defined __EMX__ || defined __DJGPP__)
-   /* This internal macro assumes ASCII, but all hosts that support drive
-      letters use ASCII.  */
-# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a'  \
-                              <= 'z' - 'a')
-# define FILE_SYSTEM_PREFIX_LEN(Filename) \
-          (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
-# ifndef __CYGWIN__
-#  define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
-# endif
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#else
-# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
-# define ISSLASH(C) ((C) == '/')
-#endif
-
-#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
-# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
-#endif
-
-#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
-#  define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
-# else
-#  define IS_ABSOLUTE_FILE_NAME(F)                              \
-     (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0)
-#endif
-#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
-
-#endif /* DOSNAME_H_ */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/errno.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/errno.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/errno.in.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/errno.in.h	2010-04-25 09:22:38.000000000 +0000
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,137 +13,69 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
 
-#ifndef _@GUARD_PREFIX@_ERRNO_H
-#define _@GUARD_PREFIX@_ERRNO_H
+#ifndef _GL_ERRNO_H
+#define _GL_ERRNO_H
 
 
 /* On native Windows platforms, many macros are not defined.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* These are the same values as defined by MSVC 10, for interoperability.  */
+/* POSIX says that EAGAIN and EWOULDBLOCK may have the same value.  */
+#  define EWOULDBLOCK     EAGAIN
 
-#  ifndef ENOMSG
-#   define ENOMSG    122
-#   define GNULIB_defined_ENOMSG 1
-#  endif
-
-#  ifndef EIDRM
-#   define EIDRM     111
-#   define GNULIB_defined_EIDRM 1
-#  endif
-
-#  ifndef ENOLINK
-#   define ENOLINK   121
-#   define GNULIB_defined_ENOLINK 1
-#  endif
-
-#  ifndef EPROTO
-#   define EPROTO    134
-#   define GNULIB_defined_EPROTO 1
-#  endif
-
-#  ifndef EBADMSG
-#   define EBADMSG   104
-#   define GNULIB_defined_EBADMSG 1
-#  endif
-
-#  ifndef EOVERFLOW
-#   define EOVERFLOW 132
-#   define GNULIB_defined_EOVERFLOW 1
-#  endif
-
-#  ifndef ENOTSUP
-#   define ENOTSUP   129
-#   define GNULIB_defined_ENOTSUP 1
-#  endif
-
-#  ifndef ENETRESET
-#   define ENETRESET 117
-#   define GNULIB_defined_ENETRESET 1
-#  endif
-
-#  ifndef ECONNABORTED
-#   define ECONNABORTED 106
-#   define GNULIB_defined_ECONNABORTED 1
-#  endif
-
-#  ifndef ECANCELED
-#   define ECANCELED 105
-#   define GNULIB_defined_ECANCELED 1
-#  endif
-
-#  ifndef EOWNERDEAD
-#   define EOWNERDEAD 133
-#   define GNULIB_defined_EOWNERDEAD 1
-#  endif
-
-#  ifndef ENOTRECOVERABLE
-#   define ENOTRECOVERABLE 127
-#   define GNULIB_defined_ENOTRECOVERABLE 1
-#  endif
-
-#  ifndef EINPROGRESS
-#   define EINPROGRESS     112
-#   define EALREADY        103
-#   define ENOTSOCK        128
-#   define EDESTADDRREQ    109
-#   define EMSGSIZE        115
-#   define EPROTOTYPE      136
-#   define ENOPROTOOPT     123
-#   define EPROTONOSUPPORT 135
-#   define EOPNOTSUPP      130
-#   define EAFNOSUPPORT    102
-#   define EADDRINUSE      100
-#   define EADDRNOTAVAIL   101
-#   define ENETDOWN        116
-#   define ENETUNREACH     118
-#   define ECONNRESET      108
-#   define ENOBUFS         119
-#   define EISCONN         113
-#   define ENOTCONN        126
-#   define ETIMEDOUT       138
-#   define ECONNREFUSED    107
-#   define ELOOP           114
-#   define EHOSTUNREACH    110
-#   define EWOULDBLOCK     140
-#   define GNULIB_defined_ESOCK 1
-#  endif
-
-#  ifndef ETXTBSY
-#   define ETXTBSY         139
-#   define ENODATA         120  /* not required by POSIX */
-#   define ENOSR           124  /* not required by POSIX */
-#   define ENOSTR          125  /* not required by POSIX */
-#   define ETIME           137  /* not required by POSIX */
-#   define EOTHER          131  /* not required by POSIX */
-#   define GNULIB_defined_ESTREAMS 1
-#  endif
+/* Values >= 100 seem safe to use.  */
+#  define ETXTBSY   100
+#  define GNULIB_defined_ETXTBSY 1
 
 /* These are intentionally the same values as the WSA* error numbers, defined
    in <winsock2.h>.  */
+#  define EINPROGRESS     10036
+#  define EALREADY        10037
+#  define ENOTSOCK        10038
+#  define EDESTADDRREQ    10039
+#  define EMSGSIZE        10040
+#  define EPROTOTYPE      10041
+#  define ENOPROTOOPT     10042
+#  define EPROTONOSUPPORT 10043
 #  define ESOCKTNOSUPPORT 10044  /* not required by POSIX */
+#  define EOPNOTSUPP      10045
 #  define EPFNOSUPPORT    10046  /* not required by POSIX */
+#  define EAFNOSUPPORT    10047
+#  define EADDRINUSE      10048
+#  define EADDRNOTAVAIL   10049
+#  define ENETDOWN        10050
+#  define ENETUNREACH     10051
+#  define ENETRESET       10052
+#  define ECONNABORTED    10053
+#  define ECONNRESET      10054
+#  define ENOBUFS         10055
+#  define EISCONN         10056
+#  define ENOTCONN        10057
 #  define ESHUTDOWN       10058  /* not required by POSIX */
 #  define ETOOMANYREFS    10059  /* not required by POSIX */
+#  define ETIMEDOUT       10060
+#  define ECONNREFUSED    10061
+#  define ELOOP           10062
 #  define EHOSTDOWN       10064  /* not required by POSIX */
+#  define EHOSTUNREACH    10065
 #  define EPROCLIM        10067  /* not required by POSIX */
 #  define EUSERS          10068  /* not required by POSIX */
 #  define EDQUOT          10069
 #  define ESTALE          10070
 #  define EREMOTE         10071  /* not required by POSIX */
-#  define GNULIB_defined_EWINSOCK 1
+#  define GNULIB_defined_ESOCK 1
 
 # endif
 
@@ -166,7 +98,6 @@
 
 /* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK,
    EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined.
-   Likewise, on NonStop Kernel, EDQUOT is not defined.
    Define them here.  Values >= 2000 seem safe to use: Solaris ESTALE = 151,
    HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133.
 
@@ -214,66 +145,16 @@
 #  define GNULIB_defined_ENOTSUP 1
 # endif
 
-# ifndef ENETRESET
-#  define ENETRESET 2011
-#  define GNULIB_defined_ENETRESET 1
-# endif
-
-# ifndef ECONNABORTED
-#  define ECONNABORTED 2012
-#  define GNULIB_defined_ECONNABORTED 1
-# endif
-
 # ifndef ESTALE
 #  define ESTALE    2009
 #  define GNULIB_defined_ESTALE 1
 # endif
 
-# ifndef EDQUOT
-#  define EDQUOT 2010
-#  define GNULIB_defined_EDQUOT 1
-# endif
-
 # ifndef ECANCELED
 #  define ECANCELED 2008
 #  define GNULIB_defined_ECANCELED 1
 # endif
 
-/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not
-   defined.  */
-
-# ifndef EOWNERDEAD
-#  if defined __sun
-    /* Use the same values as defined for Solaris >= 8, for
-       interoperability.  */
-#   define EOWNERDEAD      58
-#   define ENOTRECOVERABLE 59
-#  elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-    /* We have a conflict here: pthreads-win32 defines these values
-       differently than MSVC 10.  It's hairy to decide which one to use.  */
-#   if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
-     /* Use the same values as defined by pthreads-win32, for
-        interoperability.  */
-#    define EOWNERDEAD      43
-#    define ENOTRECOVERABLE 44
-#   else
-     /* Use the same values as defined by MSVC 10, for
-        interoperability.  */
-#    define EOWNERDEAD      133
-#    define ENOTRECOVERABLE 127
-#   endif
-#  else
-#   define EOWNERDEAD      2013
-#   define ENOTRECOVERABLE 2014
-#  endif
-#  define GNULIB_defined_EOWNERDEAD 1
-#  define GNULIB_defined_ENOTRECOVERABLE 1
-# endif
-
-# ifndef EILSEQ
-#  define EILSEQ 2015
-#  define GNULIB_defined_EILSEQ 1
-# endif
 
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
-#endif /* _@GUARD_PREFIX@_ERRNO_H */
+#endif /* _GL_ERRNO_H */
+#endif /* _GL_ERRNO_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/error.c gettext-0.18.1.1/gettext-tools/libgettextpo/error.c
--- gettext-0.19.3/gettext-tools/libgettextpo/error.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/error.c	2010-05-09 11:05:00.000000000 +0000
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2010 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
@@ -39,9 +39,6 @@
 # include <stdint.h>
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs
-# define USE_UNLOCKED_IO 0
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
-# define _GL_ARG_NONNULL(a)
 #endif
 
 #if USE_UNLOCKED_IO
@@ -57,7 +54,7 @@
    function without parameters instead.  */
 void (*error_print_progname) (void);
 
-/* This variable is incremented each time 'error' is called.  */
+/* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count;
 
 #ifdef _LIBC
@@ -68,21 +65,21 @@
 # include <limits.h>
 # include <libio/libioP.h>
 
-/* In GNU libc we want do not want to use the common name 'error' directly.
+/* In GNU libc we want do not want to use the common name `error' directly.
    Instead make it a weak alias.  */
 extern void __error (int status, int errnum, const char *message, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __error_at_line (int status, int errnum, const char *file_name,
                              unsigned int line_number, const char *message,
                              ...)
-     __attribute__ ((__format__ (__printf__, 5, 6)));
+     __attribute__ ((__format__ (__printf__, 5, 6)));;
 # define error __error
 # define error_at_line __error_at_line
 
 # include <libio/iolibio.h>
-# define fflush(s) _IO_fflush (s)
+# define fflush(s) INTUSE(_IO_fflush) (s)
 # undef putc
-# define putc(c, fp) _IO_putc (c, fp)
+# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
 
 # include <bits/libc-lock.h>
 
@@ -92,25 +89,19 @@
 # include <unistd.h>
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
+/* Get declarations of the Win32 API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-/* Get _get_osfhandle.  */
-#  include "msvc-nothrow.h"
 # endif
 
 /* The gnulib override of fcntl is not needed in this file.  */
 # undef fcntl
 
-# if !HAVE_DECL_STRERROR_R
+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
 #  endif
-#  if STRERROR_R_CHAR_P
 char *strerror_r ();
-#  else
-int strerror_r ();
-#  endif
 # endif
 
 /* The calling program should define program_name and set it to the
@@ -124,14 +115,13 @@
 
 #if !_LIBC
 /* Return non-zero if FD is open.  */
-static int
+static inline int
 is_open (int fd)
 {
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows: The initial state of unassigned standard file
-     descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
-     There is no fcntl, and the gnulib replacement fcntl does not support
-     F_GETFL.  */
+  /* On Win32: The initial state of unassigned standard file descriptors is
+     that they are open but point to an INVALID_HANDLE_VALUE.  There is no
+     fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
 # else
 #  ifndef F_GETFL
@@ -142,7 +132,7 @@
 }
 #endif
 
-static void
+static inline void
 flush_stdout (void)
 {
 #if !_LIBC
@@ -174,7 +164,7 @@
 
 #if defined HAVE_STRERROR_R || _LIBC
   char errbuf[1024];
-# if _LIBC || STRERROR_R_CHAR_P
+# if STRERROR_R_CHAR_P || _LIBC
   s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else
   if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
@@ -198,12 +188,13 @@
 #endif
 }
 
-static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
+static void
 error_tail (int status, int errnum, const char *message, va_list args)
 {
 #if _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     {
+# define ALLOCA_LIMIT 2000
       size_t len = strlen (message) + 1;
       wchar_t *wmessage = NULL;
       mbstate_t st;
@@ -239,7 +230,7 @@
           if (res != len)
             break;
 
-          if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
+          if (__builtin_expect (len >= SIZE_MAX / 2, 0))
             {
               /* This really should not happen if everything is fine.  */
               res = (size_t) -1;
@@ -344,10 +335,7 @@
 
       if (old_line_number == line_number
           && (file_name == old_file_name
-              || (old_file_name != NULL
-                  && file_name != NULL
-                  && strcmp (old_file_name, file_name) == 0)))
-
+              || strcmp (old_file_name, file_name) == 0))
         /* Simply return and print nothing.  */
         return;
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/error.h gettext-0.18.1.1/gettext-tools/libgettextpo/error.h
--- gettext-0.19.3/gettext-tools/libgettextpo/error.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/error.h	2010-02-16 21:33:13.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 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
@@ -19,48 +19,39 @@
 #ifndef _ERROR_H
 #define _ERROR_H 1
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-#if GNULIB_REPLACE_ERROR
-# undef error_print_progname
-# undef error_message_count
-# undef error_one_per_line
-# define error_print_progname rpl_error_print_progname
-# define error_message_count rpl_error_message_count
-# define error_one_per_line rpl_error_one_per_line
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Print a message with 'fprintf (stderr, FORMAT, ...)';
+/* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
 
 extern void error (int __status, int __errnum, const char *__format, ...)
-     _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
+     __attribute__ ((__format__ (__printf__, 3, 4)));
 
 extern void error_at_line (int __status, int __errnum, const char *__fname,
                            unsigned int __lineno, const char *__format, ...)
-     _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6));
+     __attribute__ ((__format__ (__printf__, 5, 6)));
 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
 extern DLL_VARIABLE void (*error_print_progname) (void);
 
-/* This variable is incremented each time 'error' is called.  */
+/* This variable is incremented each time `error' is called.  */
 extern DLL_VARIABLE unsigned int error_message_count;
 
 /* Sometimes we want to have at most one error per line.  This
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/exitfail.c gettext-0.18.1.1/gettext-tools/libgettextpo/exitfail.c
--- gettext-0.19.3/gettext-tools/libgettextpo/exitfail.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/exitfail.c	2010-02-16 21:33:13.000000000 +0000
@@ -1,6 +1,7 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/exitfail.h gettext-0.18.1.1/gettext-tools/libgettextpo/exitfail.h
--- gettext-0.19.3/gettext-tools/libgettextpo/exitfail.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/exitfail.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fcntl.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/fcntl.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/fcntl.in.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fcntl.in.h	2010-03-28 18:33:17.000000000 +0000
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,12 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_system_fcntl_h
 /* Special invocation convention.  */
 
-/* Needed before <sys/stat.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
 #include <sys/types.h>
-/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
-   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
-   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
-   extern "C" { ... } block, which leads to errors in C++ mode with the
-   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
-   with g++ version >= 4.3.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
+#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <sys/stat.h>
 #endif
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
@@ -42,36 +33,22 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_FCNTL_H
+#ifndef _GL_FCNTL_H
 
-/* Needed before <sys/stat.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
 #include <sys/types.h>
-/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
-   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
-   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
-   extern "C" { ... } block, which leads to errors in C++ mode with the
-   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
-   with g++ version >= 4.3.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
+#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <sys/stat.h>
 #endif
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
 
-#ifndef _@GUARD_PREFIX@_FCNTL_H
-#define _@GUARD_PREFIX@_FCNTL_H
+#ifndef _GL_FCNTL_H
+#define _GL_FCNTL_H
 
 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <unistd.h>
 #endif
 
-/* Native Windows platforms declare open(), creat() in <io.h>.  */
-#if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \
-    && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -117,11 +94,7 @@
 # else
 _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
 # endif
-/* On HP-UX 11, in C++ mode, open() is defined as an inline function with a
-   default argument.  _GL_CXXALIASWARN does not work in this case.  */
-# if !defined __hpux
 _GL_CXXALIASWARN (open);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef open
 /* Assume open is always declared.  */
@@ -186,36 +159,17 @@
 
 /* Fix up the O_* macros.  */
 
-/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT
-   to values outside 'int' range, so omit these misdefinitions.
-   But avoid namespace pollution on non-AIX systems.  */
-#ifdef _AIX
-# include <limits.h>
-# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX)
-#  undef O_CLOEXEC
-# endif
-# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX)
-#  undef O_NOFOLLOW
-# endif
-# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX)
-#  undef O_TTY_INIT
-# endif
-#endif
-
 #if !defined O_DIRECT && defined O_DIRECTIO
-/* Tru64 spells it 'O_DIRECTIO'.  */
+/* Tru64 spells it `O_DIRECTIO'.  */
 # define O_DIRECT O_DIRECTIO
 #endif
 
 #if !defined O_CLOEXEC && defined O_NOINHERIT
-/* Mingw spells it 'O_NOINHERIT'.  */
+/* Mingw spells it `O_NOINHERIT'.  Intentionally leave it
+   undefined if not available.  */
 # define O_CLOEXEC O_NOINHERIT
 #endif
 
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
 #ifndef O_DIRECT
 # define O_DIRECT 0
 #endif
@@ -228,14 +182,6 @@
 # define O_DSYNC 0
 #endif
 
-#ifndef O_EXEC
-# define O_EXEC O_RDONLY /* This is often close enough in older systems.  */
-#endif
-
-#ifndef O_IGNORE_CTTY
-# define O_IGNORE_CTTY 0
-#endif
-
 #ifndef O_NDELAY
 # define O_NDELAY 0
 #endif
@@ -248,19 +194,6 @@
 # define O_NONBLOCK O_NDELAY
 #endif
 
-/* If the gnulib module 'nonblocking' is in use, guarantee a working non-zero
-   value of O_NONBLOCK.  Otherwise, O_NONBLOCK is defined (above) to O_NDELAY
-   or to 0 as fallback.  */
-#if @GNULIB_NONBLOCKING@
-# if O_NONBLOCK
-#  define GNULIB_defined_O_NONBLOCK 0
-# else
-#  define GNULIB_defined_O_NONBLOCK 1
-#  undef O_NONBLOCK
-#  define O_NONBLOCK 0x40000000
-# endif
-#endif
-
 #ifndef O_NOCTTY
 # define O_NOCTTY 0
 #endif
@@ -269,26 +202,14 @@
 # define O_NOFOLLOW 0
 #endif
 
-#ifndef O_NOLINK
-# define O_NOLINK 0
-#endif
-
 #ifndef O_NOLINKS
 # define O_NOLINKS 0
 #endif
 
-#ifndef O_NOTRANS
-# define O_NOTRANS 0
-#endif
-
 #ifndef O_RSYNC
 # define O_RSYNC 0
 #endif
 
-#ifndef O_SEARCH
-# define O_SEARCH O_RDONLY /* This is often close enough in older systems.  */
-#endif
-
 #ifndef O_SYNC
 # define O_SYNC 0
 #endif
@@ -297,11 +218,6 @@
 # define O_TTY_INIT 0
 #endif
 
-#if ~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
-# undef O_ACCMODE
-# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
-#endif
-
 /* For systems that distinguish between text and binary I/O.
    O_BINARY is usually declared in fcntl.h  */
 #if !defined O_BINARY && defined _O_BINARY
@@ -358,6 +274,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_FCNTL_H */
-#endif /* _@GUARD_PREFIX@_FCNTL_H */
+#endif /* _GL_FCNTL_H */
+#endif /* _GL_FCNTL_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fd-hook.c gettext-0.18.1.1/gettext-tools/libgettextpo/fd-hook.c
--- gettext-0.19.3/gettext-tools/libgettextpo/fd-hook.c	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fd-hook.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2014 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
-   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>
-
-/* Specification.  */
-#include "fd-hook.h"
-
-#include <stdlib.h>
-
-/* Currently, this entire code is only needed for the handling of sockets
-   on native Windows platforms.  */
-#if WINDOWS_SOCKETS
-
-/* The first and last link in the doubly linked list.
-   Initially the list is empty.  */
-static struct fd_hook anchor = { &anchor, &anchor, NULL, NULL };
-
-int
-execute_close_hooks (const struct fd_hook *remaining_list, gl_close_fn primary,
-                     int fd)
-{
-  if (remaining_list == &anchor)
-    /* End of list reached.  */
-    return primary (fd);
-  else
-    return remaining_list->private_close_fn (remaining_list->private_next,
-                                             primary, fd);
-}
-
-int
-execute_all_close_hooks (gl_close_fn primary, int fd)
-{
-  return execute_close_hooks (anchor.private_next, primary, fd);
-}
-
-int
-execute_ioctl_hooks (const struct fd_hook *remaining_list, gl_ioctl_fn primary,
-                     int fd, int request, void *arg)
-{
-  if (remaining_list == &anchor)
-    /* End of list reached.  */
-    return primary (fd, request, arg);
-  else
-    return remaining_list->private_ioctl_fn (remaining_list->private_next,
-                                             primary, fd, request, arg);
-}
-
-int
-execute_all_ioctl_hooks (gl_ioctl_fn primary,
-                         int fd, int request, void *arg)
-{
-  return execute_ioctl_hooks (anchor.private_next, primary, fd, request, arg);
-}
-
-void
-register_fd_hook (close_hook_fn close_hook, ioctl_hook_fn ioctl_hook, struct fd_hook *link)
-{
-  if (close_hook == NULL)
-    close_hook = execute_close_hooks;
-  if (ioctl_hook == NULL)
-    ioctl_hook = execute_ioctl_hooks;
-
-  if (link->private_next == NULL && link->private_prev == NULL)
-    {
-      /* Add the link to the doubly linked list.  */
-      link->private_next = anchor.private_next;
-      link->private_prev = &anchor;
-      link->private_close_fn = close_hook;
-      link->private_ioctl_fn = ioctl_hook;
-      anchor.private_next->private_prev = link;
-      anchor.private_next = link;
-    }
-  else
-    {
-      /* The link is already in use.  */
-      if (link->private_close_fn != close_hook
-          || link->private_ioctl_fn != ioctl_hook)
-        abort ();
-    }
-}
-
-void
-unregister_fd_hook (struct fd_hook *link)
-{
-  struct fd_hook *next = link->private_next;
-  struct fd_hook *prev = link->private_prev;
-
-  if (next != NULL && prev != NULL)
-    {
-      /* The link is in use.  Remove it from the doubly linked list.  */
-      prev->private_next = next;
-      next->private_prev = prev;
-      /* Clear the link, to mark it unused.  */
-      link->private_next = NULL;
-      link->private_prev = NULL;
-      link->private_close_fn = NULL;
-      link->private_ioctl_fn = NULL;
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fd-hook.h gettext-0.18.1.1/gettext-tools/libgettextpo/fd-hook.h
--- gettext-0.19.3/gettext-tools/libgettextpo/fd-hook.h	2014-10-16 06:01:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fd-hook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-/* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This 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 FD_HOOK_H
-#define FD_HOOK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Currently, this entire code is only needed for the handling of sockets
-   on native Windows platforms.  */
-#if WINDOWS_SOCKETS
-
-
-/* Type of function that closes FD.  */
-typedef int (*gl_close_fn) (int fd);
-
-/* Type of function that applies a control request to FD.  */
-typedef int (*gl_ioctl_fn) (int fd, int request, void *arg);
-
-/* An element of the list of file descriptor hooks.
-   In CLOS (Common Lisp Object System) speak, it consists of an "around"
-   method for the close() function and an "around" method for the ioctl()
-   function.
-   The fields of this structure are considered private.  */
-struct fd_hook
-{
-  /* Doubly linked list.  */
-  struct fd_hook *private_next;
-  struct fd_hook *private_prev;
-  /* Function that treats the types of FD that it knows about and calls
-     execute_close_hooks (REMAINING_LIST, PRIMARY, FD) as a fallback.  */
-  int (*private_close_fn) (const struct fd_hook *remaining_list,
-                           gl_close_fn primary,
-                           int fd);
-  /* Function that treats the types of FD that it knows about and calls
-     execute_ioctl_hooks (REMAINING_LIST, PRIMARY, FD, REQUEST, ARG) as a
-     fallback.  */
-  int (*private_ioctl_fn) (const struct fd_hook *remaining_list,
-                           gl_ioctl_fn primary,
-                           int fd, int request, void *arg);
-};
-
-/* This type of function closes FD, applying special knowledge for the FD
-   types it knows about, and calls
-   execute_close_hooks (REMAINING_LIST, PRIMARY, FD)
-   for the other FD types.
-   In CLOS speak, REMAINING_LIST is the remaining list of "around" methods,
-   and PRIMARY is the "primary" method for close().  */
-typedef int (*close_hook_fn) (const struct fd_hook *remaining_list,
-                              gl_close_fn primary,
-                              int fd);
-
-/* Execute the close hooks in REMAINING_LIST, with PRIMARY as "primary" method.
-   Return 0 or -1, like close() would do.  */
-extern int execute_close_hooks (const struct fd_hook *remaining_list,
-                                gl_close_fn primary,
-                                int fd);
-
-/* Execute all close hooks, with PRIMARY as "primary" method.
-   Return 0 or -1, like close() would do.  */
-extern int execute_all_close_hooks (gl_close_fn primary, int fd);
-
-/* This type of function applies a control request to FD, applying special
-   knowledge for the FD types it knows about, and calls
-   execute_ioctl_hooks (REMAINING_LIST, PRIMARY, FD, REQUEST, ARG)
-   for the other FD types.
-   In CLOS speak, REMAINING_LIST is the remaining list of "around" methods,
-   and PRIMARY is the "primary" method for ioctl().  */
-typedef int (*ioctl_hook_fn) (const struct fd_hook *remaining_list,
-                              gl_ioctl_fn primary,
-                              int fd, int request, void *arg);
-
-/* Execute the ioctl hooks in REMAINING_LIST, with PRIMARY as "primary" method.
-   Return 0 or -1, like ioctl() would do.  */
-extern int execute_ioctl_hooks (const struct fd_hook *remaining_list,
-                                gl_ioctl_fn primary,
-                                int fd, int request, void *arg);
-
-/* Execute all ioctl hooks, with PRIMARY as "primary" method.
-   Return 0 or -1, like ioctl() would do.  */
-extern int execute_all_ioctl_hooks (gl_ioctl_fn primary,
-                                    int fd, int request, void *arg);
-
-/* Add a function pair to the list of file descriptor hooks.
-   CLOSE_HOOK and IOCTL_HOOK may be NULL, indicating no change.
-   The LINK variable points to a piece of memory which is guaranteed to be
-   accessible until the corresponding call to unregister_fd_hook.  */
-extern void register_fd_hook (close_hook_fn close_hook, ioctl_hook_fn ioctl_hook,
-                              struct fd_hook *link);
-
-/* Removes a hook from the list of file descriptor hooks.  */
-extern void unregister_fd_hook (struct fd_hook *link);
-
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FD_HOOK_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/filename.h gettext-0.18.1.1/gettext-tools/libgettextpo/filename.h
--- gettext-0.19.3/gettext-tools/libgettextpo/filename.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/filename.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/float.c gettext-0.18.1.1/gettext-tools/libgettextpo/float.c
--- gettext-0.19.3/gettext-tools/libgettextpo/float.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/float.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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>
-
-/* Specification.  */
-#include <float.h>
-
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
-const union gl_long_double_union gl_LDBL_MAX =
-  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-#elif defined __i386__
-const union gl_long_double_union gl_LDBL_MAX =
-  { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-#else
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
-#endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/float+.h gettext-0.18.1.1/gettext-tools/libgettextpo/float+.h
--- gettext-0.19.3/gettext-tools/libgettextpo/float+.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/float+.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _FLOATPLUS_H
 #define _FLOATPLUS_H
@@ -140,8 +141,8 @@
 #define SIZEOF_LDBL ((LDBL_TOTAL_BIT + CHAR_BIT - 1) / CHAR_BIT)
 
 /* Verify that SIZEOF_FLT <= sizeof (float) etc.  */
-typedef int verify_sizeof_flt[SIZEOF_FLT <= sizeof (float) ? 1 : -1];
-typedef int verify_sizeof_dbl[SIZEOF_DBL <= sizeof (double) ? 1 : - 1];
-typedef int verify_sizeof_ldbl[SIZEOF_LDBL <= sizeof (long double) ? 1 : - 1];
+typedef int verify_sizeof_flt[2 * (SIZEOF_FLT <= sizeof (float)) - 1];
+typedef int verify_sizeof_dbl[2 * (SIZEOF_DBL <= sizeof (double)) - 1];
+typedef int verify_sizeof_ldbl[2 * (SIZEOF_LDBL <= sizeof (long double)) - 1];
 
 #endif /* _FLOATPLUS_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/float.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/float.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/float.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/float.in.h	2010-04-25 09:22:38.000000000 +0000
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,21 +15,19 @@
    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 _@GUARD_PREFIX@_FLOAT_H
+#ifndef _GL_FLOAT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FLOAT_H@
 
-#ifndef _@GUARD_PREFIX@_FLOAT_H
-#define _@GUARD_PREFIX@_FLOAT_H
+#ifndef _GL_FLOAT_H
+#define _GL_FLOAT_H
 
 /* 'long double' properties.  */
-
 #if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__)
 /* Number of mantissa units, in base FLT_RADIX.  */
 # undef LDBL_MANT_DIG
@@ -60,129 +58,5 @@
 # define LDBL_MAX_10_EXP 4932
 #endif
 
-/* On FreeBSD/x86 6.4, the 'long double' type really has only 53 bits of
-   precision in the compiler but 64 bits of precision at runtime.  See
-   <http://lists.gnu.org/archive/html/bug-gnulib/2008-07/msg00063.html>.  */
-#if defined __i386__ && defined __FreeBSD__
-/* Number of mantissa units, in base FLT_RADIX.  */
-# undef LDBL_MANT_DIG
-# define LDBL_MANT_DIG   64
-/* Number of decimal digits that is sufficient for representing a number.  */
-# undef LDBL_DIG
-# define LDBL_DIG        18
-/* x-1 where x is the smallest representable number > 1.  */
-# undef LDBL_EPSILON
-# define LDBL_EPSILON 1.084202172485504434007452800869941711426e-19L /* 2^-63 */
-/* Minimum e such that FLT_RADIX^(e-1) is a normalized number.  */
-# undef LDBL_MIN_EXP
-# define LDBL_MIN_EXP    (-16381)
-/* Maximum e such that FLT_RADIX^(e-1) is a representable finite number.  */
-# undef LDBL_MAX_EXP
-# define LDBL_MAX_EXP    16384
-/* Minimum positive normalized number.  */
-# undef LDBL_MIN
-# define LDBL_MIN        3.3621031431120935E-4932L /* = 0x1p-16382L */
-/* Maximum representable finite number.  */
-# undef LDBL_MAX
-/* LDBL_MAX is represented as { 0xFFFFFFFF, 0xFFFFFFFF, 32766 }.
-   But the largest literal that GCC allows us to write is
-   0x0.fffffffffffff8p16384L = { 0xFFFFF800, 0xFFFFFFFF, 32766 }.
-   So, define it like this through a reference to an external variable
-
-     const unsigned int LDBL_MAX[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 32766 };
-     extern const long double LDBL_MAX;
-
-   Unfortunately, this is not a constant expression.  */
-union gl_long_double_union
-  {
-    struct { unsigned int lo; unsigned int hi; unsigned int exponent; } xd;
-    long double ld;
-  };
-extern const union gl_long_double_union gl_LDBL_MAX;
-# define LDBL_MAX (gl_LDBL_MAX.ld)
-/* Minimum e such that 10^e is in the range of normalized numbers.  */
-# undef LDBL_MIN_10_EXP
-# define LDBL_MIN_10_EXP (-4931)
-/* Maximum e such that 10^e is in the range of representable finite numbers.  */
-# undef LDBL_MAX_10_EXP
-# define LDBL_MAX_10_EXP 4932
-#endif
-
-/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
-   wrong.
-   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
-#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
-# undef LDBL_MIN_EXP
-# define LDBL_MIN_EXP DBL_MIN_EXP
-# undef LDBL_MIN_10_EXP
-# define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-# undef LDBL_MIN
-# define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
-#endif
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
-# undef LDBL_MAX
-/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
-   It is not easy to define:
-     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
-   is too small, whereas
-     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
-   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
-   Also, I can't get values larger than
-     #define LDBL63 ((long double) (1ULL << 63))
-     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
-   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
-   So, define it like this through a reference to an external variable
-
-     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
-     extern const long double LDBL_MAX;
-
-   or through a pointer cast
-
-     #define LDBL_MAX \
-       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
-
-   Unfortunately, this is not a constant expression, and the latter expression
-   does not work well when GCC is optimizing..  */
-union gl_long_double_union
-  {
-    struct { double hi; double lo; } dd;
-    long double ld;
-  };
-extern const union gl_long_double_union gl_LDBL_MAX;
-# define LDBL_MAX (gl_LDBL_MAX.ld)
-#endif
-
-/* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
-   On IRIX 6.5, with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_EPSILON
-   are wrong.  */
-#if defined __sgi && (LDBL_MANT_DIG >= 106)
-# undef LDBL_MANT_DIG
-# define LDBL_MANT_DIG 106
-# if defined __GNUC__
-#  undef LDBL_MIN_EXP
-#  define LDBL_MIN_EXP DBL_MIN_EXP
-#  undef LDBL_MIN_10_EXP
-#  define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#  undef LDBL_MIN
-#  define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
-#  undef LDBL_EPSILON
-#  define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
-# endif
-#endif
-
-#if @REPLACE_ITOLD@
-/* Pull in a function that fixes the 'int' to 'long double' conversion
-   of glibc 2.7.  */
-extern
-# ifdef __cplusplus
-"C"
-# endif
-void _Qp_itoq (long double *, int);
-static void (*_gl_float_fix_itold) (long double *, int) = _Qp_itoq;
-#endif
-
-#endif /* _@GUARD_PREFIX@_FLOAT_H */
-#endif /* _@GUARD_PREFIX@_FLOAT_H */
+#endif /* _GL_FLOAT_H */
+#endif /* _GL_FLOAT_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fopen.c gettext-0.18.1.1/gettext-tools/libgettextpo/fopen.c
--- gettext-0.19.3/gettext-tools/libgettextpo/fopen.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fopen.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,26 +16,21 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* If the user's config.h happens to include <stdio.h>, let it include only
-   the system's <stdio.h> here, so that orig_fopen doesn't recurse to
-   rpl_fopen.  */
-#define __need_FILE
 #include <config.h>
 
 /* Get the original definition of fopen.  It might be defined as a macro.  */
+#define __need_FILE
 #include <stdio.h>
 #undef __need_FILE
 
-static FILE *
+static inline FILE *
 orig_fopen (const char *filename, const char *mode)
 {
   return fopen (filename, mode);
 }
 
 /* Specification.  */
-/* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates
-   this include because of the preliminary #include <stdio.h> above.  */
-#include "stdio.h"
+#include <stdio.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fstat.c gettext-0.18.1.1/gettext-tools/libgettextpo/fstat.c
--- gettext-0.19.3/gettext-tools/libgettextpo/fstat.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fstat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* fstat() replacement.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_fstat doesn't recurse to
-   rpl_fstat.  */
-#define __need_system_sys_stat_h
-#include <config.h>
-
-/* Get the original definition of fstat.  It might be defined as a macro.  */
-#include <sys/types.h>
-#include <sys/stat.h>
-#if _GL_WINDOWS_64_BIT_ST_SIZE
-# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-# define stat _stati64
-# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-# define fstat _fstati64
-#endif
-#undef __need_system_sys_stat_h
-
-static int
-orig_fstat (int fd, struct stat *buf)
-{
-  return fstat (fd, buf);
-}
-
-/* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-#include "sys/stat.h"
-
-#include <errno.h>
-#include <unistd.h>
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-# include "msvc-inval.h"
-#endif
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-fstat_nothrow (int fd, struct stat *buf)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = orig_fstat (fd, buf);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EBADF;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#else
-# define fstat_nothrow orig_fstat
-#endif
-
-int
-rpl_fstat (int fd, struct stat *buf)
-{
-#if REPLACE_FCHDIR && REPLACE_OPEN_DIRECTORY
-  /* Handle the case when rpl_open() used a dummy file descriptor to work
-     around an open() that can't normally visit directories.  */
-  const char *name = _gl_directory_name (fd);
-  if (name != NULL)
-    return stat (name, buf);
-#endif
-
-  return fstat_nothrow (fd, buf);
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fstrcmp.c gettext-0.18.1.1/gettext-tools/libgettextpo/fstrcmp.c
--- gettext-0.19.3/gettext-tools/libgettextpo/fstrcmp.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fstrcmp.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions to make fuzzy comparisons between strings
-   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2014 Free
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2010 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -13,9 +13,33 @@
    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/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+   Derived from GNU diff 2.7, analyze.c et al.
+
+   The basic idea is to consider two vectors as similar if, when
+   transforming the first vector into the second vector through a
+   sequence of edits (inserts and deletes of one element each),
+   this sequence is short - or equivalently, if the ordered list
+   of elements that are untouched by these edits is long.  For a
+   good introduction to the subject, read about the "Levenshtein
+   distance" in Wikipedia.
+
+   The basic algorithm is described in:
+   "An O(ND) Difference Algorithm and its Variations", Eugene Myers,
+   Algorithmica Vol. 1 No. 2, 1986, pp. 251-266;
+   see especially section 4.2, which describes the variation used below.
+
+   The basic algorithm was independently discovered as described in:
+   "Algorithms for Approximate String Matching", E. Ukkonen,
+   Information and Control Vol. 64, 1985, pp. 100-118.
+
+   Unless the 'find_minimal' flag is set, this code uses the TOO_EXPENSIVE
+   heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N)
+   at the price of producing suboptimal output for large inputs with
+   many differences.  */
+
 #include <config.h>
 
 /* Specification.  */
@@ -179,6 +203,16 @@
   ctxt.xvec = string1;
   ctxt.yvec = string2;
 
+  /* Set TOO_EXPENSIVE to be approximate square root of input size,
+     bounded below by 256.  */
+  ctxt.too_expensive = 1;
+  for (i = xvec_length + yvec_length;
+       i != 0;
+       i >>= 2)
+    ctxt.too_expensive <<= 1;
+  if (ctxt.too_expensive < 256)
+    ctxt.too_expensive = 256;
+
   /* Allocate memory for fdiag and bdiag from a thread-local pool.  */
   fdiag_len = xvec_length + yvec_length + 3;
   gl_once (keys_init_once, keys_init);
@@ -218,7 +252,7 @@
 
   /* Now do the main comparison algorithm */
   ctxt.edit_count = - ctxt.edit_count_limit;
-  if (compareseq (0, xvec_length, 0, yvec_length, &ctxt)) /* Prob: 98% */
+  if (compareseq (0, xvec_length, 0, yvec_length, 0, &ctxt)) /* Prob: 98% */
     /* The edit_count passed the limit.  Hence the result would be
        < lower_bound.  We can return any value < lower_bound instead.  */
     return 0.0;
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fstrcmp.h gettext-0.18.1.1/gettext-tools/libgettextpo/fstrcmp.h
--- gettext-0.19.3/gettext-tools/libgettextpo/fstrcmp.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fstrcmp.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Fuzzy string comparison.
-   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2014 Free Software
+   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2010 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fwriteerror.c gettext-0.18.1.1/gettext-tools/libgettextpo/fwriteerror.c
--- gettext-0.19.3/gettext-tools/libgettextpo/fwriteerror.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fwriteerror.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@
      or if fclose failed, with two exceptions:
        - Ignore an fclose failure if there was no previous error, no data
          remains to be flushed, and fclose failed with EBADF.  That can
-         happen when a program like cp is invoked like this 'cp a b >&-'
+         happen when a program like cp is invoked like this `cp a b >&-'
          (i.e., with standard output closed) and doesn't generate any
          output (hence no previous error and nothing to be flushed).
        - Ignore an fclose failure due to EPIPE.  That can happen when a
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/fwriteerror.h gettext-0.18.1.1/gettext-tools/libgettextpo/fwriteerror.h
--- gettext-0.19.3/gettext-tools/libgettextpo/fwriteerror.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/fwriteerror.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/gcd.c gettext-0.18.1.1/gettext-tools/libgettextpo/gcd.c
--- gettext-0.19.3/gettext-tools/libgettextpo/gcd.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gcd.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/gcd.h gettext-0.18.1.1/gettext-tools/libgettextpo/gcd.h
--- gettext-0.19.3/gettext-tools/libgettextpo/gcd.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gcd.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/getdelim.c gettext-0.18.1.1/gettext-tools/libgettextpo/getdelim.c
--- gettext-0.19.3/gettext-tools/libgettextpo/getdelim.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/getdelim.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,6 +1,6 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008,
+   2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -13,16 +13,18 @@
    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/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Ported from glibc by Simon Josefsson. */
 
+#include <config.h>
+
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below.  */
 #define _GL_ARG_NONNULL(params)
 
-#include <config.h>
-
 #include <stdio.h>
 
 #include <limits.h>
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/getline.c gettext-0.18.1.1/gettext-tools/libgettextpo/getline.c
--- gettext-0.19.3/gettext-tools/libgettextpo/getline.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/getline.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -12,7 +12,9 @@
    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/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Written by Simon Josefsson. */
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gettext.h gettext-0.18.1.1/gettext-tools/libgettextpo/gettext.h
--- gettext-0.19.3/gettext-tools/libgettextpo/gettext.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gettext.h	2009-12-12 11:37:49.000000000 +0000
@@ -1,18 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -52,7 +54,7 @@
    it now, to make later inclusions of <libintl.h> a NOP.  */
 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
 # include <cstdlib>
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
 #  include <libintl.h>
 # endif
 #endif
@@ -79,7 +81,7 @@
     ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
 # undef dcngettext
 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N))
+    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
 # undef textdomain
 # define textdomain(Domainname) ((const char *) (Domainname))
 # undef bindtextdomain
@@ -91,12 +93,6 @@
 
 #endif
 
-/* Prefer gnulib's setlocale override over libintl's setlocale override.  */
-#ifdef GNULIB_defined_setlocale
-# undef setlocale
-# define setlocale rpl_setlocale
-#endif
-
 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
    translation is done at a different place in the code.
@@ -182,12 +178,9 @@
 
 #include <string.h>
 
-#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
-     /* || __STDC_VERSION__ >= 199901L */ )
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
-#else
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
-#endif
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+  (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
+   /* || __STDC_VERSION__ >= 199901L */ )
 
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
 #include <stdlib.h>
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gettext-po.c gettext-0.18.1.1/gettext-tools/libgettextpo/gettext-po.c
--- gettext-0.19.3/gettext-tools/libgettextpo/gettext-po.c	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gettext-po.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 /* Public API for GNU gettext PO files.
-   Copyright (C) 2003-2010 Free Software Foundation, Inc.
+   Copyright (C) 2003-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -392,6 +392,7 @@
           {
             const char *oldvalue_start;
             const char *oldvalue_end;
+            size_t oldvalue_len;
             size_t header_part1_len;
             size_t header_part3_len;
             size_t result_len;
@@ -403,6 +404,7 @@
             oldvalue_end = strchr (oldvalue_start, '\n');
             if (oldvalue_end == NULL)
               oldvalue_end = oldvalue_start + strlen (oldvalue_start);
+            oldvalue_len = oldvalue_end - oldvalue_start;
 
             header_part1_len = oldvalue_start - header;
             header_part3_len = header + header_len - oldvalue_end;
@@ -520,7 +522,7 @@
 {
   lex_pos_ty pos = { NULL, 0 };
 
-  return (po_message_t) message_alloc (NULL, NULL, NULL, xstrdup (""), 1, &pos);
+  return (po_message_t) message_alloc (NULL, NULL, NULL, NULL, 0, &pos);
 }
 
 
@@ -1101,7 +1103,7 @@
   if (has_range_p (mp->range))
     {
       *minp = mp->range.min;
-      *maxp = mp->range.max;
+      *minp = mp->range.max;
       return 1;
     }
   else
@@ -1213,7 +1215,7 @@
 
   mdlp = file->mdlp;
   for (k = 0; k < mdlp->nitems; k++)
-    check_message_list (mdlp->item[k]->messages, 1, 1, 1, 1, 1, 0, 0, 0);
+    check_message_list (mdlp->item[k]->messages, 1, 1, 1, 0, 0, 0);
 
   /* Restore error handler.  */
   po_xerror  = textmode_xerror;
@@ -1274,7 +1276,7 @@
       if (mp != header)
         message_list_append (&ml, mp);
 
-      check_message_list (&ml, 1, 1, 1, 1, 1, 0, 0, 0);
+      check_message_list (&ml, 1, 1, 1, 0, 0, 0);
     }
   }
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gettext-po.h.in gettext-0.18.1.1/gettext-tools/libgettextpo/gettext-po.h.in
--- gettext-0.19.3/gettext-tools/libgettextpo/gettext-po.h.in	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gettext-po.h.in	2010-06-06 12:49:57.000000000 +0000
@@ -0,0 +1,357 @@
+/* Public API for GNU gettext PO files - contained in libgettextpo.
+   Copyright (C) 2003-2008, 2010 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This 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 _GETTEXT_PO_H
+#define _GETTEXT_PO_H 1
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* =========================== Meta Information ============================ */
+
+/* Version number: (major<<16) + (minor<<8) + subminor */
+#define LIBGETTEXTPO_VERSION 0x001201
+extern int libgettextpo_version;
+
+/* ================================= Types ================================= */
+
+/* A po_file_t represents the contents of a PO file.  */
+typedef struct po_file *po_file_t;
+
+/* A po_message_iterator_t represents an iterator through a domain of a
+   PO file.  */
+typedef struct po_message_iterator *po_message_iterator_t;
+
+/* A po_message_t represents a message in a PO file.  */
+typedef struct po_message *po_message_t;
+
+/* A po_filepos_t represents a string's position within a source file.  */
+typedef struct po_filepos *po_filepos_t;
+
+/* A po_error_handler handles error situations.  */
+struct po_error_handler
+{
+  /* Signal an error.  The error message is built from FORMAT and the following
+     arguments.  ERRNUM, if nonzero, is an errno value.
+     Must increment the error_message_count variable declared in error.h.
+     Must not return if STATUS is nonzero.  */
+  void (*error) (int status, int errnum,
+                 const char *format, ...)
+#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
+  __attribute__ ((__format__ (__printf__, 3, 4)))
+#endif
+  ;
+
+  /* Signal an error.  The error message is built from FORMAT and the following
+     arguments.  The error location is at FILENAME line LINENO. ERRNUM, if
+     nonzero, is an errno value.
+     Must increment the error_message_count variable declared in error.h.
+     Must not return if STATUS is nonzero.  */
+  void (*error_at_line) (int status, int errnum,
+                         const char *filename, unsigned int lineno,
+                         const char *format, ...)
+#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
+  __attribute__ ((__format__ (__printf__, 5, 6)))
+#endif
+  ;
+
+  /* Signal a multiline warning.  The PREFIX applies to all lines of the
+     MESSAGE.  Free the PREFIX and MESSAGE when done.  */
+  void (*multiline_warning) (char *prefix, char *message);
+
+  /* Signal a multiline error.  The PREFIX applies to all lines of the
+     MESSAGE.  Free the PREFIX and MESSAGE when done.
+     Must increment the error_message_count variable declared in error.h if
+     PREFIX is non-NULL.  */
+  void (*multiline_error) (char *prefix, char *message);
+};
+typedef const struct po_error_handler *po_error_handler_t;
+
+/* A po_xerror_handler handles warnings, error and fatal error situations.  */
+#define PO_SEVERITY_WARNING     0 /* just a warning, tell the user */
+#define PO_SEVERITY_ERROR       1 /* an error, the operation cannot complete */
+#define PO_SEVERITY_FATAL_ERROR 2 /* an error, the operation must be aborted */
+struct po_xerror_handler
+{
+  /* Signal a problem of the given severity.
+     MESSAGE and/or FILENAME + LINENO indicate where the problem occurred.
+     If FILENAME is NULL, FILENAME and LINENO and COLUMN should be ignored.
+     If LINENO is (size_t)(-1), LINENO and COLUMN should be ignored.
+     If COLUMN is (size_t)(-1), it should be ignored.
+     MESSAGE_TEXT is the problem description (if MULTILINE_P is true,
+     multiple lines of text, each terminated with a newline, otherwise
+     usually a single line).
+     Must not return if SEVERITY is PO_SEVERITY_FATAL_ERROR.  */
+  void (*xerror) (int severity,
+                  po_message_t message,
+                  const char *filename, size_t lineno, size_t column,
+                  int multiline_p, const char *message_text);
+  /* Signal a problem that refers to two messages.
+     Similar to two calls to xerror.
+     If possible, a "..." can be appended to MESSAGE_TEXT1 and prepended to
+     MESSAGE_TEXT2.  */
+  void (*xerror2) (int severity,
+                   po_message_t message1,
+                   const char *filename1, size_t lineno1, size_t column1,
+                   int multiline_p1, const char *message_text1,
+                   po_message_t message2,
+                   const char *filename2, size_t lineno2, size_t column2,
+                   int multiline_p2, const char *message_text2);
+};
+typedef const struct po_xerror_handler *po_xerror_handler_t;
+
+/* Memory allocation:
+   The memory allocations performed by these functions use xmalloc(),
+   therefore will cause a program exit if memory is exhausted.
+   The memory allocated by po_file_read, and implicitly returned through
+   the po_message_* functions, lasts until freed with po_file_free.  */
+
+
+/* ============================= po_file_t API ============================= */
+
+/* Create an empty PO file representation in memory.  */
+extern po_file_t po_file_create (void);
+
+/* Read a PO file into memory.
+   Return its contents.  Upon failure, return NULL and set errno.  */
+#define po_file_read po_file_read_v3
+extern po_file_t po_file_read (const char *filename,
+                               po_xerror_handler_t handler);
+
+/* Write an in-memory PO file to a file.
+   Upon failure, return NULL and set errno.  */
+#define po_file_write po_file_write_v2
+extern po_file_t po_file_write (po_file_t file, const char *filename,
+                                po_xerror_handler_t handler);
+
+/* Free a PO file from memory.  */
+extern void po_file_free (po_file_t file);
+
+/* Return the names of the domains covered by a PO file in memory.  */
+extern const char * const * po_file_domains (po_file_t file);
+
+
+/* =========================== Header entry API ============================ */
+
+/* Return the header entry of a domain of a PO file in memory.
+   The domain NULL denotes the default domain.
+   Return NULL if there is no header entry.  */
+extern const char * po_file_domain_header (po_file_t file, const char *domain);
+
+/* Return the value of a field in a header entry.
+   The return value is either a freshly allocated string, to be freed by the
+   caller, or NULL.  */
+extern char * po_header_field (const char *header, const char *field);
+
+/* Return the header entry with a given field set to a given value.  The field
+   is added if necessary.
+   The return value is a freshly allocated string.  */
+extern char * po_header_set_field (const char *header, const char *field, const char *value);
+
+
+/* ======================= po_message_iterator_t API ======================= */
+
+/* Create an iterator for traversing a domain of a PO file in memory.
+   The domain NULL denotes the default domain.  */
+extern po_message_iterator_t po_message_iterator (po_file_t file, const char *domain);
+
+/* Free an iterator.  */
+extern void po_message_iterator_free (po_message_iterator_t iterator);
+
+/* Return the next message, and advance the iterator.
+   Return NULL at the end of the message list.  */
+extern po_message_t po_next_message (po_message_iterator_t iterator);
+
+/* Insert a message in a PO file in memory, in the domain and at the position
+   indicated by the iterator.  The iterator thereby advances past the freshly
+   inserted message.  */
+extern void po_message_insert (po_message_iterator_t iterator, po_message_t message);
+
+
+/* =========================== po_message_t API ============================ */
+
+/* Return a freshly constructed message.
+   To finish initializing the message, you must set the msgid and msgstr.  */
+extern po_message_t po_message_create (void);
+
+/* Return the context of a message, or NULL for a message not restricted to a
+   context.  */
+extern const char * po_message_msgctxt (po_message_t message);
+
+/* Change the context of a message. NULL means a message not restricted to a
+   context.  */
+extern void po_message_set_msgctxt (po_message_t message, const char *msgctxt);
+
+/* Return the msgid (untranslated English string) of a message.  */
+extern const char * po_message_msgid (po_message_t message);
+
+/* Change the msgid (untranslated English string) of a message.  */
+extern void po_message_set_msgid (po_message_t message, const char *msgid);
+
+/* Return the msgid_plural (untranslated English plural string) of a message,
+   or NULL for a message without plural.  */
+extern const char * po_message_msgid_plural (po_message_t message);
+
+/* Change the msgid_plural (untranslated English plural string) of a message.
+   NULL means a message without plural.  */
+extern void po_message_set_msgid_plural (po_message_t message, const char *msgid_plural);
+
+/* Return the msgstr (translation) of a message.
+   Return the empty string for an untranslated message.  */
+extern const char * po_message_msgstr (po_message_t message);
+
+/* Change the msgstr (translation) of a message.
+   Use an empty string to denote an untranslated message.  */
+extern void po_message_set_msgstr (po_message_t message, const char *msgstr);
+
+/* Return the msgstr[index] for a message with plural handling, or
+   NULL when the index is out of range or for a message without plural.  */
+extern const char * po_message_msgstr_plural (po_message_t message, int index);
+
+/* Change the msgstr[index] for a message with plural handling.
+   Use a NULL value at the end to reduce the number of plural forms.  */
+extern void po_message_set_msgstr_plural (po_message_t message, int index, const char *msgstr);
+
+/* Return the comments for a message.  */
+extern const char * po_message_comments (po_message_t message);
+
+/* Change the comments for a message.
+   comments should be a multiline string, ending in a newline, or empty.  */
+extern void po_message_set_comments (po_message_t message, const char *comments);
+
+/* Return the extracted comments for a message.  */
+extern const char * po_message_extracted_comments (po_message_t message);
+
+/* Change the extracted comments for a message.
+   comments should be a multiline string, ending in a newline, or empty.  */
+extern void po_message_set_extracted_comments (po_message_t message, const char *comments);
+
+/* Return the i-th file position for a message, or NULL if i is out of
+   range.  */
+extern po_filepos_t po_message_filepos (po_message_t message, int i);
+
+/* Remove the i-th file position from a message.
+   The indices of all following file positions for the message are decremented
+   by one.  */
+extern void po_message_remove_filepos (po_message_t message, int i);
+
+/* Add a file position to a message, if it is not already present for the
+   message.
+   file is the file name.
+   start_line is the line number where the string starts, or (size_t)(-1) if no
+   line number is available.  */
+extern void po_message_add_filepos (po_message_t message, const char *file, size_t start_line);
+
+/* Return the previous context of a message, or NULL for none.  */
+extern const char * po_message_prev_msgctxt (po_message_t message);
+
+/* Change the previous context of a message.  NULL is allowed.  */
+extern void po_message_set_prev_msgctxt (po_message_t message, const char *prev_msgctxt);
+
+/* Return the previous msgid (untranslated English string) of a message, or
+   NULL for none.  */
+extern const char * po_message_prev_msgid (po_message_t message);
+
+/* Change the previous msgid (untranslated English string) of a message.
+   NULL is allowed.  */
+extern void po_message_set_prev_msgid (po_message_t message, const char *prev_msgid);
+
+/* Return the previous msgid_plural (untranslated English plural string) of a
+   message, or NULL for none.  */
+extern const char * po_message_prev_msgid_plural (po_message_t message);
+
+/* Change the previous msgid_plural (untranslated English plural string) of a
+   message.  NULL is allowed.  */
+extern void po_message_set_prev_msgid_plural (po_message_t message, const char *prev_msgid_plural);
+
+/* Return true if the message is marked obsolete.  */
+extern int po_message_is_obsolete (po_message_t message);
+
+/* Change the obsolete mark of a message.  */
+extern void po_message_set_obsolete (po_message_t message, int obsolete);
+
+/* Return true if the message is marked fuzzy.  */
+extern int po_message_is_fuzzy (po_message_t message);
+
+/* Change the fuzzy mark of a message.  */
+extern void po_message_set_fuzzy (po_message_t message, int fuzzy);
+
+/* Return true if the message is marked as being a format string of the given
+   type (e.g. "c-format").  */
+extern int po_message_is_format (po_message_t message, const char *format_type);
+
+/* Change the format string mark for a given type of a message.  */
+extern void po_message_set_format (po_message_t message, const char *format_type, /*bool*/int value);
+
+/* If a numeric range of a message is set, return true and store the minimum
+   and maximum value in *MINP and *MAXP.  */
+extern int po_message_is_range (po_message_t message, int *minp, int *maxp);
+
+/* Change the numeric range of a message.  MIN and MAX must be non-negative,
+   with MIN < MAX.  Use MIN = MAX = -1 to remove the numeric range of a
+   message.  */
+extern void po_message_set_range (po_message_t message, int min, int max);
+
+
+/* =========================== po_filepos_t API ============================ */
+
+/* Return the file name.  */
+extern const char * po_filepos_file (po_filepos_t filepos);
+
+/* Return the line number where the string starts, or (size_t)(-1) if no line
+   number is available.  */
+extern size_t po_filepos_start_line (po_filepos_t filepos);
+
+
+/* ============================ Format type API ============================= */
+
+/* Return a NULL terminated array of the supported format types.  */
+extern const char * const * po_format_list (void);
+
+/* Return the pretty name associated with a format type.
+   For example, for "csharp-format", return "C#".
+   Return NULL if the argument is not a supported format type.  */
+extern const char * po_format_pretty_name (const char *format_type);
+
+
+/* ============================= Checking API ============================== */
+
+/* Test whether an entire file PO file is valid, like msgfmt does it.
+   If it is invalid, pass the reasons to the handler.  */
+extern void po_file_check_all (po_file_t file, po_xerror_handler_t handler);
+
+/* Test a single message, to be inserted in a PO file in memory, like msgfmt
+   does it.  If it is invalid, pass the reasons to the handler.  The iterator
+   is not modified by this call; it only specifies the file and the domain.  */
+extern void po_message_check_all (po_message_t message, po_message_iterator_t iterator, po_xerror_handler_t handler);
+
+/* Test whether the message translation is a valid format string if the message
+   is marked as being a format string.  If it is invalid, pass the reasons to
+   the handler.  */
+#define po_message_check_format po_message_check_format_v2
+extern void po_message_check_format (po_message_t message, po_xerror_handler_t handler);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GETTEXT_PO_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gettext-po.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/gettext-po.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/gettext-po.in.h	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gettext-po.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,357 +0,0 @@
-/* Public API for GNU gettext PO files - contained in libgettextpo.
-   Copyright (C) 2003-2008, 2010 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   This 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 _GETTEXT_PO_H
-#define _GETTEXT_PO_H 1
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* =========================== Meta Information ============================ */
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001303
-extern int libgettextpo_version;
-
-/* ================================= Types ================================= */
-
-/* A po_file_t represents the contents of a PO file.  */
-typedef struct po_file *po_file_t;
-
-/* A po_message_iterator_t represents an iterator through a domain of a
-   PO file.  */
-typedef struct po_message_iterator *po_message_iterator_t;
-
-/* A po_message_t represents a message in a PO file.  */
-typedef struct po_message *po_message_t;
-
-/* A po_filepos_t represents a string's position within a source file.  */
-typedef struct po_filepos *po_filepos_t;
-
-/* A po_error_handler handles error situations.  */
-struct po_error_handler
-{
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  ERRNUM, if nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error) (int status, int errnum,
-                 const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 3, 4)))
-#endif
-  ;
-
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  The error location is at FILENAME line LINENO. ERRNUM, if
-     nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error_at_line) (int status, int errnum,
-                         const char *filename, unsigned int lineno,
-                         const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 5, 6)))
-#endif
-  ;
-
-  /* Signal a multiline warning.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.  */
-  void (*multiline_warning) (char *prefix, char *message);
-
-  /* Signal a multiline error.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.
-     Must increment the error_message_count variable declared in error.h if
-     PREFIX is non-NULL.  */
-  void (*multiline_error) (char *prefix, char *message);
-};
-typedef const struct po_error_handler *po_error_handler_t;
-
-/* A po_xerror_handler handles warnings, error and fatal error situations.  */
-#define PO_SEVERITY_WARNING     0 /* just a warning, tell the user */
-#define PO_SEVERITY_ERROR       1 /* an error, the operation cannot complete */
-#define PO_SEVERITY_FATAL_ERROR 2 /* an error, the operation must be aborted */
-struct po_xerror_handler
-{
-  /* Signal a problem of the given severity.
-     MESSAGE and/or FILENAME + LINENO indicate where the problem occurred.
-     If FILENAME is NULL, FILENAME and LINENO and COLUMN should be ignored.
-     If LINENO is (size_t)(-1), LINENO and COLUMN should be ignored.
-     If COLUMN is (size_t)(-1), it should be ignored.
-     MESSAGE_TEXT is the problem description (if MULTILINE_P is true,
-     multiple lines of text, each terminated with a newline, otherwise
-     usually a single line).
-     Must not return if SEVERITY is PO_SEVERITY_FATAL_ERROR.  */
-  void (*xerror) (int severity,
-                  po_message_t message,
-                  const char *filename, size_t lineno, size_t column,
-                  int multiline_p, const char *message_text);
-  /* Signal a problem that refers to two messages.
-     Similar to two calls to xerror.
-     If possible, a "..." can be appended to MESSAGE_TEXT1 and prepended to
-     MESSAGE_TEXT2.  */
-  void (*xerror2) (int severity,
-                   po_message_t message1,
-                   const char *filename1, size_t lineno1, size_t column1,
-                   int multiline_p1, const char *message_text1,
-                   po_message_t message2,
-                   const char *filename2, size_t lineno2, size_t column2,
-                   int multiline_p2, const char *message_text2);
-};
-typedef const struct po_xerror_handler *po_xerror_handler_t;
-
-/* Memory allocation:
-   The memory allocations performed by these functions use xmalloc(),
-   therefore will cause a program exit if memory is exhausted.
-   The memory allocated by po_file_read, and implicitly returned through
-   the po_message_* functions, lasts until freed with po_file_free.  */
-
-
-/* ============================= po_file_t API ============================= */
-
-/* Create an empty PO file representation in memory.  */
-extern po_file_t po_file_create (void);
-
-/* Read a PO file into memory.
-   Return its contents.  Upon failure, return NULL and set errno.  */
-#define po_file_read po_file_read_v3
-extern po_file_t po_file_read (const char *filename,
-                               po_xerror_handler_t handler);
-
-/* Write an in-memory PO file to a file.
-   Upon failure, return NULL and set errno.  */
-#define po_file_write po_file_write_v2
-extern po_file_t po_file_write (po_file_t file, const char *filename,
-                                po_xerror_handler_t handler);
-
-/* Free a PO file from memory.  */
-extern void po_file_free (po_file_t file);
-
-/* Return the names of the domains covered by a PO file in memory.  */
-extern const char * const * po_file_domains (po_file_t file);
-
-
-/* =========================== Header entry API ============================ */
-
-/* Return the header entry of a domain of a PO file in memory.
-   The domain NULL denotes the default domain.
-   Return NULL if there is no header entry.  */
-extern const char * po_file_domain_header (po_file_t file, const char *domain);
-
-/* Return the value of a field in a header entry.
-   The return value is either a freshly allocated string, to be freed by the
-   caller, or NULL.  */
-extern char * po_header_field (const char *header, const char *field);
-
-/* Return the header entry with a given field set to a given value.  The field
-   is added if necessary.
-   The return value is a freshly allocated string.  */
-extern char * po_header_set_field (const char *header, const char *field, const char *value);
-
-
-/* ======================= po_message_iterator_t API ======================= */
-
-/* Create an iterator for traversing a domain of a PO file in memory.
-   The domain NULL denotes the default domain.  */
-extern po_message_iterator_t po_message_iterator (po_file_t file, const char *domain);
-
-/* Free an iterator.  */
-extern void po_message_iterator_free (po_message_iterator_t iterator);
-
-/* Return the next message, and advance the iterator.
-   Return NULL at the end of the message list.  */
-extern po_message_t po_next_message (po_message_iterator_t iterator);
-
-/* Insert a message in a PO file in memory, in the domain and at the position
-   indicated by the iterator.  The iterator thereby advances past the freshly
-   inserted message.  */
-extern void po_message_insert (po_message_iterator_t iterator, po_message_t message);
-
-
-/* =========================== po_message_t API ============================ */
-
-/* Return a freshly constructed message.
-   To finish initializing the message, you must set the msgid and msgstr.  */
-extern po_message_t po_message_create (void);
-
-/* Return the context of a message, or NULL for a message not restricted to a
-   context.  */
-extern const char * po_message_msgctxt (po_message_t message);
-
-/* Change the context of a message. NULL means a message not restricted to a
-   context.  */
-extern void po_message_set_msgctxt (po_message_t message, const char *msgctxt);
-
-/* Return the msgid (untranslated English string) of a message.  */
-extern const char * po_message_msgid (po_message_t message);
-
-/* Change the msgid (untranslated English string) of a message.  */
-extern void po_message_set_msgid (po_message_t message, const char *msgid);
-
-/* Return the msgid_plural (untranslated English plural string) of a message,
-   or NULL for a message without plural.  */
-extern const char * po_message_msgid_plural (po_message_t message);
-
-/* Change the msgid_plural (untranslated English plural string) of a message.
-   NULL means a message without plural.  */
-extern void po_message_set_msgid_plural (po_message_t message, const char *msgid_plural);
-
-/* Return the msgstr (translation) of a message.
-   Return the empty string for an untranslated message.  */
-extern const char * po_message_msgstr (po_message_t message);
-
-/* Change the msgstr (translation) of a message.
-   Use an empty string to denote an untranslated message.  */
-extern void po_message_set_msgstr (po_message_t message, const char *msgstr);
-
-/* Return the msgstr[index] for a message with plural handling, or
-   NULL when the index is out of range or for a message without plural.  */
-extern const char * po_message_msgstr_plural (po_message_t message, int index);
-
-/* Change the msgstr[index] for a message with plural handling.
-   Use a NULL value at the end to reduce the number of plural forms.  */
-extern void po_message_set_msgstr_plural (po_message_t message, int index, const char *msgstr);
-
-/* Return the comments for a message.  */
-extern const char * po_message_comments (po_message_t message);
-
-/* Change the comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_comments (po_message_t message, const char *comments);
-
-/* Return the extracted comments for a message.  */
-extern const char * po_message_extracted_comments (po_message_t message);
-
-/* Change the extracted comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_extracted_comments (po_message_t message, const char *comments);
-
-/* Return the i-th file position for a message, or NULL if i is out of
-   range.  */
-extern po_filepos_t po_message_filepos (po_message_t message, int i);
-
-/* Remove the i-th file position from a message.
-   The indices of all following file positions for the message are decremented
-   by one.  */
-extern void po_message_remove_filepos (po_message_t message, int i);
-
-/* Add a file position to a message, if it is not already present for the
-   message.
-   file is the file name.
-   start_line is the line number where the string starts, or (size_t)(-1) if no
-   line number is available.  */
-extern void po_message_add_filepos (po_message_t message, const char *file, size_t start_line);
-
-/* Return the previous context of a message, or NULL for none.  */
-extern const char * po_message_prev_msgctxt (po_message_t message);
-
-/* Change the previous context of a message.  NULL is allowed.  */
-extern void po_message_set_prev_msgctxt (po_message_t message, const char *prev_msgctxt);
-
-/* Return the previous msgid (untranslated English string) of a message, or
-   NULL for none.  */
-extern const char * po_message_prev_msgid (po_message_t message);
-
-/* Change the previous msgid (untranslated English string) of a message.
-   NULL is allowed.  */
-extern void po_message_set_prev_msgid (po_message_t message, const char *prev_msgid);
-
-/* Return the previous msgid_plural (untranslated English plural string) of a
-   message, or NULL for none.  */
-extern const char * po_message_prev_msgid_plural (po_message_t message);
-
-/* Change the previous msgid_plural (untranslated English plural string) of a
-   message.  NULL is allowed.  */
-extern void po_message_set_prev_msgid_plural (po_message_t message, const char *prev_msgid_plural);
-
-/* Return true if the message is marked obsolete.  */
-extern int po_message_is_obsolete (po_message_t message);
-
-/* Change the obsolete mark of a message.  */
-extern void po_message_set_obsolete (po_message_t message, int obsolete);
-
-/* Return true if the message is marked fuzzy.  */
-extern int po_message_is_fuzzy (po_message_t message);
-
-/* Change the fuzzy mark of a message.  */
-extern void po_message_set_fuzzy (po_message_t message, int fuzzy);
-
-/* Return true if the message is marked as being a format string of the given
-   type (e.g. "c-format").  */
-extern int po_message_is_format (po_message_t message, const char *format_type);
-
-/* Change the format string mark for a given type of a message.  */
-extern void po_message_set_format (po_message_t message, const char *format_type, /*bool*/int value);
-
-/* If a numeric range of a message is set, return true and store the minimum
-   and maximum value in *MINP and *MAXP.  */
-extern int po_message_is_range (po_message_t message, int *minp, int *maxp);
-
-/* Change the numeric range of a message.  MIN and MAX must be non-negative,
-   with MIN < MAX.  Use MIN = MAX = -1 to remove the numeric range of a
-   message.  */
-extern void po_message_set_range (po_message_t message, int min, int max);
-
-
-/* =========================== po_filepos_t API ============================ */
-
-/* Return the file name.  */
-extern const char * po_filepos_file (po_filepos_t filepos);
-
-/* Return the line number where the string starts, or (size_t)(-1) if no line
-   number is available.  */
-extern size_t po_filepos_start_line (po_filepos_t filepos);
-
-
-/* ============================ Format type API ============================= */
-
-/* Return a NULL terminated array of the supported format types.  */
-extern const char * const * po_format_list (void);
-
-/* Return the pretty name associated with a format type.
-   For example, for "csharp-format", return "C#".
-   Return NULL if the argument is not a supported format type.  */
-extern const char * po_format_pretty_name (const char *format_type);
-
-
-/* ============================= Checking API ============================== */
-
-/* Test whether an entire file PO file is valid, like msgfmt does it.
-   If it is invalid, pass the reasons to the handler.  */
-extern void po_file_check_all (po_file_t file, po_xerror_handler_t handler);
-
-/* Test a single message, to be inserted in a PO file in memory, like msgfmt
-   does it.  If it is invalid, pass the reasons to the handler.  The iterator
-   is not modified by this call; it only specifies the file and the domain.  */
-extern void po_message_check_all (po_message_t message, po_message_iterator_t iterator, po_xerror_handler_t handler);
-
-/* Test whether the message translation is a valid format string if the message
-   is marked as being a format string.  If it is invalid, pass the reasons to
-   the handler.  */
-#define po_message_check_format po_message_check_format_v2
-extern void po_message_check_format (po_message_t message, po_xerror_handler_t handler);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GETTEXT_PO_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gettimeofday.c gettext-0.18.1.1/gettext-tools/libgettextpo/gettimeofday.c
--- gettext-0.19.3/gettext-tools/libgettextpo/gettimeofday.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gettimeofday.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-/* Provide gettimeofday for systems that don't have it or for which it's broken.
-
-   Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 Jim Meyering */
-
-#include <config.h>
-
-/* Specification.  */
-#include <sys/time.h>
-
-#include <time.h>
-
-#if HAVE_SYS_TIMEB_H
-# include <sys/timeb.h>
-#endif
-
-#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
-
-/* Work around the bug in some systems whereby gettimeofday clobbers
-   the static buffer that localtime uses for its return value.  The
-   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
-   this problem.  The tzset replacement is necessary for at least
-   Solaris 2.5, 2.5.1, and 2.6.  */
-
-static struct tm tm_zero_buffer;
-static struct tm *localtime_buffer_addr = &tm_zero_buffer;
-
-# undef localtime
-extern struct tm *localtime (time_t const *);
-
-# undef gmtime
-extern struct tm *gmtime (time_t const *);
-
-/* This is a wrapper for localtime.  It is used only on systems for which
-   gettimeofday clobbers the static buffer used for localtime's result.
-
-   On the first call, record the address of the static buffer that
-   localtime uses for its result.  */
-
-struct tm *
-rpl_localtime (time_t const *timep)
-{
-  struct tm *tm = localtime (timep);
-
-  if (localtime_buffer_addr == &tm_zero_buffer)
-    localtime_buffer_addr = tm;
-
-  return tm;
-}
-
-/* Same as above, since gmtime and localtime use the same buffer.  */
-struct tm *
-rpl_gmtime (time_t const *timep)
-{
-  struct tm *tm = gmtime (timep);
-
-  if (localtime_buffer_addr == &tm_zero_buffer)
-    localtime_buffer_addr = tm;
-
-  return tm;
-}
-
-#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
-
-#if TZSET_CLOBBERS_LOCALTIME
-
-# undef tzset
-extern void tzset (void);
-
-/* This is a wrapper for tzset, for systems on which tzset may clobber
-   the static buffer used for localtime's result.  */
-void
-rpl_tzset (void)
-{
-  /* Save and restore the contents of the buffer used for localtime's
-     result around the call to tzset.  */
-  struct tm save = *localtime_buffer_addr;
-  tzset ();
-  *localtime_buffer_addr = save;
-}
-#endif
-
-/* This is a wrapper for gettimeofday.  It is used only on systems
-   that lack this function, or whose implementation of this function
-   causes problems.  */
-
-int
-gettimeofday (struct timeval *restrict tv, void *restrict tz)
-{
-#undef gettimeofday
-#if HAVE_GETTIMEOFDAY
-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
-  /* Save and restore the contents of the buffer used for localtime's
-     result around the call to gettimeofday.  */
-  struct tm save = *localtime_buffer_addr;
-# endif
-
-# if defined timeval /* 'struct timeval' overridden by gnulib?  */
-#  undef timeval
-  struct timeval otv;
-  int result = gettimeofday (&otv, (struct timezone *) tz);
-  if (result == 0)
-    {
-      tv->tv_sec = otv.tv_sec;
-      tv->tv_usec = otv.tv_usec;
-    }
-# else
-  int result = gettimeofday (tv, (struct timezone *) tz);
-# endif
-
-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
-  *localtime_buffer_addr = save;
-# endif
-
-  return result;
-
-#else
-
-# if HAVE__FTIME
-
-  struct _timeb timebuf;
-  _ftime (&timebuf);
-  tv->tv_sec = timebuf.time;
-  tv->tv_usec = timebuf.millitm * 1000;
-
-# else
-
-#  if !defined OK_TO_USE_1S_CLOCK
-#   error "Only 1-second nominal clock resolution found.  Is that intended?" \
-          "If so, compile with the -DOK_TO_USE_1S_CLOCK option."
-#  endif
-  tv->tv_sec = time (NULL);
-  tv->tv_usec = 0;
-
-# endif
-
-  return 0;
-
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/glthread/lock.c gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/lock.c
--- gettext-0.19.3/gettext-tools/libgettextpo/glthread/lock.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/lock.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -629,7 +630,7 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
 /* -------------------------- gl_lock_t datatype -------------------------- */
 
@@ -682,7 +683,7 @@
 /* In this file, the waitqueues are implemented as circular arrays.  */
 #define gl_waitqueue_t gl_carray_waitqueue_t
 
-static void
+static inline void
 gl_waitqueue_init (gl_waitqueue_t *wq)
 {
   wq->array = NULL;
@@ -743,7 +744,7 @@
 }
 
 /* Notifies the first thread from a wait queue and dequeues it.  */
-static void
+static inline void
 gl_waitqueue_notify_first (gl_waitqueue_t *wq)
 {
   SetEvent (wq->array[wq->offset + 0]);
@@ -754,7 +755,7 @@
 }
 
 /* Notifies all threads from a wait queue and dequeues them all.  */
-static void
+static inline void
 gl_waitqueue_notify_all (gl_waitqueue_t *wq)
 {
   unsigned int i;
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/glthread/lock.h gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/lock.h
--- gettext-0.19.3/gettext-tools/libgettextpo/glthread/lock.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/lock.h	2010-03-28 18:33:18.000000000 +0000
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@ -613,17 +614,16 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 # ifdef __cplusplus
 extern "C" {
 # endif
 
-/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
-   Mutex, Semaphore types, because
+/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex,
+   Semaphore types, because
      - we need only to synchronize inside a single process (address space),
        not inter-process locking,
      - we don't need to support trylock operations.  (TryEnterCriticalSection
@@ -709,9 +709,9 @@
 
 /* --------------------- gl_recursive_lock_t datatype --------------------- */
 
-/* The native Windows documentation says that CRITICAL_SECTION already
-   implements a recursive lock.  But we need not rely on it: It's easy to
-   implement a recursive lock without this assumption.  */
+/* The Win32 documentation says that CRITICAL_SECTION already implements a
+   recursive lock.  But we need not rely on it: It's easy to implement a
+   recursive lock without this assumption.  */
 
 typedef struct
         {
@@ -763,7 +763,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/glthread/threadlib.c gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/threadlib.c
--- gettext-0.19.3/gettext-tools/libgettextpo/glthread/threadlib.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/threadlib.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/glthread/tls.c gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/tls.c
--- gettext-0.19.3/gettext-tools/libgettextpo/glthread/tls.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/tls.c	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This 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,7 +54,7 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
 #endif
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/glthread/tls.h gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/tls.h
--- gettext-0.19.3/gettext-tools/libgettextpo/glthread/tls.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/glthread/tls.h	2010-02-16 21:33:14.000000000 +0000
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,9 +220,8 @@
 
 /* ========================================================================= */
 
-#if USE_WINDOWS_THREADS
+#if USE_WIN32_THREADS
 
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
 
 /* ------------------------- gl_tls_key_t datatype ------------------------- */
@@ -242,7 +241,7 @@
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 gettext-0.18.1.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4
--- gettext-0.19.3/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4	2014-10-16 06:01:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4	2010-06-06 20:10:57.000000000 +0000
@@ -1,33 +1,21 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
-# In projects that use version control, this file is meant to be put under
-# version control, like the configure.ac and various Makefile.am files.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgnu --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gtpo basename c-ctype c-strcase c-strstr close error error-progname file-ostream filename fopen fstrcmp fwriteerror gcd getline gettext-h hash iconv libunistring-optional minmax open ostream progname relocatable-lib sigpipe stdbool stdio stdlib strchrnul strerror unilbrk/ulc-width-linebreaks unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf xalloc xconcat-filename xerror xmalloca xstriconv xvasprintf
+#   gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgnu --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --makefile-name=Makefile.gnulib --libtool --macro-prefix=gtpo basename c-ctype c-strcase c-strstr error error-progname file-ostream filename fopen fstrcmp fwriteerror gcd getline gettext-h hash iconv libunistring-optional minmax open ostream progname relocatable-lib sigpipe stdbool stdio stdlib strerror unilbrk/ulc-width-linebreaks unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-uctomb uniwidth/width unlocked-io vasprintf xalloc xconcat-filename xerror xmalloca xstriconv xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([../gnulib-local])
@@ -36,7 +24,6 @@
   c-ctype
   c-strcase
   c-strstr
-  close
   error
   error-progname
   file-ostream
@@ -59,12 +46,10 @@
   stdbool
   stdio
   stdlib
-  strchrnul
   strerror
   unilbrk/ulc-width-linebreaks
   unistr/u16-mbtouc
   unistr/u8-mbtouc
-  unistr/u8-mbtoucr
   unistr/u8-uctomb
   uniwidth/width
   unlocked-io
@@ -87,4 +72,3 @@
 gl_LIBTOOL
 gl_MACRO_PREFIX([gtpo])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_MACRO([])
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 gettext-0.18.1.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4
--- gettext-0.19.3/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4	2014-10-16 06:01:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4	2010-06-03 21:37:16.000000000 +0000
@@ -1,22 +1,10 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -24,8 +12,7 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects that use version control, this file can be treated like
-# other built files.
+# In projects using CVS, this file can be treated like other built files.
 
 
 # This macro should be invoked from gettext-tools/configure.ac, in the section
@@ -37,41 +24,36 @@
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([gl_PROG_AR_RANLIB])
+  AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
-  # Code from module absolute-header:
   # Code from module alloca-opt:
+  # Code from module arg-nonnull:
   # Code from module basename:
+  # Code from module c++defs:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module c-strcaseeq:
   # Code from module c-strstr:
-  # Code from module close:
   # Code from module concat-filename:
   # Code from module configmake:
   # Code from module diffseq:
-  # Code from module dosname:
   # Code from module errno:
   # Code from module error:
   # Code from module error-progname:
   # Code from module exitfail:
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  # Code from module extern-inline:
   # Code from module fcntl-h:
-  # Code from module fd-hook:
   # Code from module file-ostream:
   # Code from module filename:
   # Code from module float:
   # Code from module fopen:
-  # Code from module fstat:
   # Code from module fstrcmp:
   # Code from module fwriteerror:
   # Code from module gcd:
   # Code from module getdelim:
   # Code from module getline:
   # Code from module gettext-h:
-  # Code from module gettimeofday:
   # Code from module gperf:
   # Code from module hash:
   # Code from module havelib:
@@ -81,8 +63,6 @@
   # Code from module include_next:
   # Code from module inline:
   # Code from module intprops:
-  # Code from module largefile:
-  AC_REQUIRE([AC_SYS_LARGEFILE])
   # Code from module libunistring-optional:
   # Code from module localcharset:
   # Code from module lock:
@@ -94,45 +74,32 @@
   # Code from module memchr:
   # Code from module minmax:
   # Code from module moo:
-  # Code from module msvc-inval:
-  # Code from module msvc-nothrow:
   # Code from module multiarch:
   # Code from module obstack:
   # Code from module open:
   # Code from module ostream:
-  # Code from module pathmax:
   # Code from module progname:
-  # Code from module raise:
-  # Code from module rawmemchr:
   # Code from module realloc-posix:
   # Code from module relocatable-lib:
-  # Code from module signal-h:
+  # Code from module signal:
   # Code from module sigpipe:
   # Code from module sigprocmask:
   # Code from module size_max:
-  # Code from module snippet/_Noreturn:
-  # Code from module snippet/arg-nonnull:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/unused-parameter:
-  # Code from module snippet/warn-on-use:
-  # Code from module ssize_t:
   # Code from module stat:
   # Code from module stdarg:
   dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
   dnl for the builtin va_copy to work.  With Autoconf 2.60 or later,
-  dnl gl_PROG_CC_C99 arranges for this.  With older Autoconf gl_PROG_CC_C99
+  dnl AC_PROG_CC_STDC arranges for this.  With older Autoconf AC_PROG_CC_STDC
   dnl shouldn't hurt, though installers are on their own to set c99 mode.
-  gl_PROG_CC_C99
+  AC_REQUIRE([AC_PROG_CC_STDC])
   # Code from module stdbool:
   # Code from module stddef:
   # Code from module stdint:
   # Code from module stdio:
   # Code from module stdlib:
   # Code from module stpcpy:
-  # Code from module strchrnul:
   # Code from module streq:
   # Code from module strerror:
-  # Code from module strerror-override:
   # Code from module striconv:
   # Code from module striconveh:
   # Code from module striconveha:
@@ -140,8 +107,6 @@
   # Code from module strstr:
   # Code from module strstr-simple:
   # Code from module sys_stat:
-  # Code from module sys_time:
-  # Code from module sys_types:
   # Code from module threadlib:
   gl_THREADLIB_EARLY
   # Code from module time:
@@ -168,11 +133,13 @@
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
   # Code from module unlocked-io:
+  # Code from module unused-parameter:
   # Code from module vasnprintf:
   # Code from module vasprintf:
   # Code from module verify:
+  # Code from module warn-on-use:
   # Code from module wchar:
-  # Code from module wctype-h:
+  # Code from module wctype:
   # Code from module wcwidth:
   # Code from module xalloc:
   # Code from module xalloc-die:
@@ -198,153 +165,111 @@
   m4_pushdef([gtpo_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='libgettextpo'
+  # Code from module alloca-opt:
   gl_FUNC_ALLOCA
-  gl_FUNC_CLOSE
-  if test $REPLACE_CLOSE = 1; then
-    AC_LIBOBJ([close])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([close])
-  gl_CONFIGMAKE_PREP
+  # Code from module arg-nonnull:
+  # Code from module basename:
+  # Code from module c++defs:
+  # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module c-strcaseeq:
+  # Code from module c-strstr:
+  # Code from module concat-filename:
+  # Code from module configmake:
+  # Code from module diffseq:
+  # Code from module errno:
   gl_HEADER_ERRNO_H
+  # Code from module error:
   gl_ERROR
-  if test $ac_cv_lib_error_at_line = no; then
-    AC_LIBOBJ([error])
-    gl_PREREQ_ERROR
-  fi
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
-  AC_REQUIRE([gl_EXTERN_INLINE])
+  # Code from module error-progname:
+  # Code from module exitfail:
+  # Code from module extensions:
+  # Code from module fcntl-h:
   gl_FCNTL_H
+  # Code from module file-ostream:
+  # Code from module filename:
+  # Code from module float:
   gl_FLOAT_H
-  if test $REPLACE_FLOAT_LDBL = 1; then
-    AC_LIBOBJ([float])
-  fi
-  if test $REPLACE_ITOLD = 1; then
-    AC_LIBOBJ([itold])
-  fi
+  # Code from module fopen:
   gl_FUNC_FOPEN
-  if test $REPLACE_FOPEN = 1; then
-    AC_LIBOBJ([fopen])
-    gl_PREREQ_FOPEN
-  fi
   gl_STDIO_MODULE_INDICATOR([fopen])
-  gl_FUNC_FSTAT
-  if test $REPLACE_FSTAT = 1; then
-    AC_LIBOBJ([fstat])
-    gl_PREREQ_FSTAT
-  fi
-  gl_SYS_STAT_MODULE_INDICATOR([fstat])
+  # Code from module fstrcmp:
+  # Code from module fwriteerror:
   gl_MODULE_INDICATOR([fwriteerror])
+  # Code from module gcd:
+  # Code from module getdelim:
   gl_FUNC_GETDELIM
-  if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
-    AC_LIBOBJ([getdelim])
-    gl_PREREQ_GETDELIM
-  fi
   gl_STDIO_MODULE_INDICATOR([getdelim])
+  # Code from module getline:
   gl_FUNC_GETLINE
-  if test $REPLACE_GETLINE = 1; then
-    AC_LIBOBJ([getline])
-    gl_PREREQ_GETLINE
-  fi
   gl_STDIO_MODULE_INDICATOR([getline])
+  # Code from module gettext-h:
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
-  gl_FUNC_GETTIMEOFDAY
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
-    AC_LIBOBJ([gettimeofday])
-    gl_PREREQ_GETTIMEOFDAY
-  fi
-  gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  # Code from module gperf:
+  # Code from module hash:
+  # Code from module havelib:
+  # Code from module iconv:
   AM_ICONV
-  m4_ifdef([gl_ICONV_MODULE_INDICATOR],
-    [gl_ICONV_MODULE_INDICATOR([iconv])])
+  # Code from module iconv-h:
   gl_ICONV_H
+  # Code from module iconv_open:
   gl_FUNC_ICONV_OPEN
-  if test $REPLACE_ICONV_OPEN = 1; then
-    AC_LIBOBJ([iconv_open])
-  fi
-  if test $REPLACE_ICONV = 1; then
-    AC_LIBOBJ([iconv])
-    AC_LIBOBJ([iconv_close])
-  fi
+  # Code from module include_next:
+  # Code from module inline:
   gl_INLINE
-  AC_REQUIRE([gl_LARGEFILE])
+  # Code from module intprops:
+  # Code from module libunistring-optional:
   gl_LIBUNISTRING_OPTIONAL
+  # Code from module localcharset:
   gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+  # Code from module lock:
   gl_LOCK
-  gl_MODULE_INDICATOR([lock])
+  # Code from module malloc-posix:
   gl_FUNC_MALLOC_POSIX
-  if test $REPLACE_MALLOC = 1; then
-    AC_LIBOBJ([malloc])
-  fi
   gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+  # Code from module malloca:
   gl_MALLOCA
+  # Code from module mbrtowc:
   gl_FUNC_MBRTOWC
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-    AC_LIBOBJ([mbrtowc])
-    gl_PREREQ_MBRTOWC
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
+  # Code from module mbsinit:
   gl_FUNC_MBSINIT
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-    AC_LIBOBJ([mbsinit])
-    gl_PREREQ_MBSINIT
-  fi
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
+  # Code from module mbswidth:
   gl_MBSWIDTH
+  # Code from module memchr:
   gl_FUNC_MEMCHR
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-    AC_LIBOBJ([memchr])
-    gl_PREREQ_MEMCHR
-  fi
   gl_STRING_MODULE_INDICATOR([memchr])
+  # Code from module minmax:
   gl_MINMAX
+  # Code from module moo:
   gl_MOO
-  gl_MSVC_INVAL
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-inval])
-  fi
-  gl_MSVC_NOTHROW
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-nothrow])
-  fi
+  # Code from module multiarch:
   gl_MULTIARCH
+  # Code from module obstack:
   AC_FUNC_OBSTACK
   dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]).
+  # Code from module open:
   gl_FUNC_OPEN
-  if test $REPLACE_OPEN = 1; then
-    AC_LIBOBJ([open])
-    gl_PREREQ_OPEN
-  fi
   gl_FCNTL_MODULE_INDICATOR([open])
-  gl_PATHMAX
+  # Code from module ostream:
+  # Code from module progname:
   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
-  gl_FUNC_RAISE
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
-    AC_LIBOBJ([raise])
-    gl_PREREQ_RAISE
-  fi
-  gl_SIGNAL_MODULE_INDICATOR([raise])
-  gl_FUNC_RAWMEMCHR
-  if test $HAVE_RAWMEMCHR = 0; then
-    AC_LIBOBJ([rawmemchr])
-    gl_PREREQ_RAWMEMCHR
-  fi
-  gl_STRING_MODULE_INDICATOR([rawmemchr])
+  # Code from module realloc-posix:
   gl_FUNC_REALLOC_POSIX
-  if test $REPLACE_REALLOC = 1; then
-    AC_LIBOBJ([realloc])
-  fi
   gl_STDLIB_MODULE_INDICATOR([realloc-posix])
+  # Code from module relocatable-lib:
   gl_RELOCATABLE_LIBRARY
-  if test $RELOCATABLE = yes; then
-    AC_LIBOBJ([relocatable])
-  fi
+  # Code from module signal:
   gl_SIGNAL_H
+  # Code from module sigpipe:
   gl_SIGNAL_SIGPIPE
   dnl Define the C macro GNULIB_SIGPIPE to 1.
   gl_MODULE_INDICATOR([sigpipe])
@@ -353,122 +278,139 @@
   GNULIB_SIGNAL_H_SIGPIPE=1
   dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1.
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
   GNULIB_STDIO_H_SIGPIPE=1
   dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   GNULIB_UNISTD_H_SIGPIPE=1
+  # Code from module sigprocmask:
   gl_SIGNALBLOCKING
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-    AC_LIBOBJ([sigprocmask])
-    gl_PREREQ_SIGPROCMASK
-  fi
   gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
+  # Code from module size_max:
   gl_SIZE_MAX
-  gt_TYPE_SSIZE_T
+  # Code from module stat:
   gl_FUNC_STAT
-  if test $REPLACE_STAT = 1; then
-    AC_LIBOBJ([stat])
-    gl_PREREQ_STAT
-  fi
   gl_SYS_STAT_MODULE_INDICATOR([stat])
+  # Code from module stdarg:
   gl_STDARG_H
+  # Code from module stdbool:
   AM_STDBOOL_H
+  # Code from module stddef:
   gl_STDDEF_H
+  # Code from module stdint:
   gl_STDINT_H
+  # Code from module stdio:
   gl_STDIO_H
+  # Code from module stdlib:
   gl_STDLIB_H
+  # Code from module stpcpy:
   gl_FUNC_STPCPY
-  if test $HAVE_STPCPY = 0; then
-    AC_LIBOBJ([stpcpy])
-    gl_PREREQ_STPCPY
-  fi
   gl_STRING_MODULE_INDICATOR([stpcpy])
-  gl_FUNC_STRCHRNUL
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-    AC_LIBOBJ([strchrnul])
-    gl_PREREQ_STRCHRNUL
-  fi
-  gl_STRING_MODULE_INDICATOR([strchrnul])
+  # Code from module streq:
+  # Code from module strerror:
   gl_FUNC_STRERROR
-  if test $REPLACE_STRERROR = 1; then
-    AC_LIBOBJ([strerror])
-  fi
-  gl_MODULE_INDICATOR([strerror])
   gl_STRING_MODULE_INDICATOR([strerror])
-  AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
-    AC_LIBOBJ([strerror-override])
-    gl_PREREQ_SYS_H_WINSOCK2
-  fi
+  # Code from module striconv:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module striconveh:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
+  # Code from module striconveha:
+  # Code from module string:
   gl_HEADER_STRING_H
+  # Code from module strstr:
   gl_FUNC_STRSTR
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
+  # Code from module strstr-simple:
   gl_FUNC_STRSTR_SIMPLE
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
   gl_STRING_MODULE_INDICATOR([strstr])
+  # Code from module sys_stat:
   gl_HEADER_SYS_STAT_H
   AC_PROG_MKDIR_P
-  gl_HEADER_SYS_TIME_H
-  AC_PROG_MKDIR_P
-  gl_SYS_TYPES_H
-  AC_PROG_MKDIR_P
+  # Code from module threadlib:
   gl_THREADLIB
+  # Code from module time:
   gl_HEADER_TIME_H
+  # Code from module tls:
   gl_TLS
+  # Code from module uniconv/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniconv.h])
+  # Code from module uniconv/u8-conv-from-enc:
   gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-from-enc])
+  # Code from module unilbrk/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [unilbrk.h])
+  # Code from module unilbrk/tables:
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unilbrk/u8-possible-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unilbrk/u8-width-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unilbrk/ulc-width-linebreaks])
+  # Code from module unilbrk/u8-possible-linebreaks:
+  gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u8-possible-linebreaks])
+  # Code from module unilbrk/u8-width-linebreaks:
+  gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u8-width-linebreaks])
+  # Code from module unilbrk/ulc-common:
+  # Code from module unilbrk/ulc-width-linebreaks:
+  gl_LIBUNISTRING_MODULE([0.9], [unilbrk/ulc-width-linebreaks])
+  # Code from module unistd:
   gl_UNISTD_H
+  # Code from module unistr/base:
   gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
+  # Code from module unistr/u16-mbtouc:
   gl_MODULE_INDICATOR([unistr/u16-mbtouc])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtouc])
+  # Code from module unistr/u8-check:
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-check])
+  # Code from module unistr/u8-mblen:
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mblen])
+  # Code from module unistr/u8-mbtouc:
   gl_MODULE_INDICATOR([unistr/u8-mbtouc])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc])
+  # Code from module unistr/u8-mbtouc-unsafe:
   gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
-  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc-unsafe])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc-unsafe])
+  # Code from module unistr/u8-mbtoucr:
   gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
+  # Code from module unistr/u8-prev:
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-prev])
+  # Code from module unistr/u8-uctomb:
   gl_MODULE_INDICATOR([unistr/u8-uctomb])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
+  # Code from module unitypes:
   gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+  # Code from module uniwidth/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
-  gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width])
+  # Code from module uniwidth/width:
+  gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width])
+  # Code from module unlocked-io:
   gl_FUNC_GLIBC_UNLOCKED_IO
+  # Code from module unused-parameter:
+  # Code from module vasnprintf:
   gl_FUNC_VASNPRINTF
+  # Code from module vasprintf:
   gl_FUNC_VASPRINTF
   gl_STDIO_MODULE_INDICATOR([vasprintf])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
      AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
+  # Code from module verify:
+  # Code from module warn-on-use:
+  # Code from module wchar:
   gl_WCHAR_H
+  # Code from module wctype:
   gl_WCTYPE_H
+  # Code from module wcwidth:
   gl_FUNC_WCWIDTH
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
-    AC_LIBOBJ([wcwidth])
-  fi
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
+  # Code from module xalloc:
+  # Code from module xalloc-die:
+  # Code from module xconcat-filename:
+  # Code from module xerror:
+  # Code from module xmalloca:
+  # Code from module xsize:
   gl_XSIZE
+  # Code from module xstriconv:
+  # Code from module xvasprintf:
   gl_XVASPRINTF
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])])
@@ -608,13 +550,12 @@
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gtpo_FILE_LIST], [
+  build-aux/arg-nonnull.h
+  build-aux/c++defs.h
   build-aux/config.rpath
   build-aux/moopp
-  build-aux/snippet/_Noreturn.h
-  build-aux/snippet/arg-nonnull.h
-  build-aux/snippet/c++defs.h
-  build-aux/snippet/unused-parameter.h
-  build-aux/snippet/warn-on-use.h
+  build-aux/unused-parameter.h
+  build-aux/warn-on-use.h
   doc/relocatable.texi
   lib/alloca.in.h
   lib/asnprintf.c
@@ -629,12 +570,10 @@
   lib/c-strncasecmp.c
   lib/c-strstr.c
   lib/c-strstr.h
-  lib/close.c
   lib/concat-filename.c
   lib/concat-filename.h
   lib/config.charset
   lib/diffseq.h
-  lib/dosname.h
   lib/errno.in.h
   lib/error-progname.c
   lib/error-progname.h
@@ -643,16 +582,12 @@
   lib/exitfail.c
   lib/exitfail.h
   lib/fcntl.in.h
-  lib/fd-hook.c
-  lib/fd-hook.h
   lib/file-ostream.oo.c
   lib/file-ostream.oo.h
   lib/filename.h
   lib/float+.h
-  lib/float.c
   lib/float.in.h
   lib/fopen.c
-  lib/fstat.c
   lib/fstrcmp.c
   lib/fstrcmp.h
   lib/fwriteerror.c
@@ -662,7 +597,6 @@
   lib/getdelim.c
   lib/getline.c
   lib/gettext.h
-  lib/gettimeofday.c
   lib/glthread/lock.c
   lib/glthread/lock.h
   lib/glthread/threadlib.c
@@ -670,9 +604,7 @@
   lib/glthread/tls.h
   lib/hash.c
   lib/hash.h
-  lib/iconv.c
   lib/iconv.in.h
-  lib/iconv_close.c
   lib/iconv_open-aix.gperf
   lib/iconv_open-hpux.gperf
   lib/iconv_open-irix.gperf
@@ -681,7 +613,6 @@
   lib/iconv_open.c
   lib/iconveh.h
   lib/intprops.h
-  lib/itold.c
   lib/libunistring.valgrind
   lib/localcharset.c
   lib/localcharset.h
@@ -697,25 +628,17 @@
   lib/memchr.valgrind
   lib/minmax.h
   lib/moo.h
-  lib/msvc-inval.c
-  lib/msvc-inval.h
-  lib/msvc-nothrow.c
-  lib/msvc-nothrow.h
   lib/obstack.c
   lib/obstack.h
   lib/open.c
   lib/ostream.oo.c
   lib/ostream.oo.h
-  lib/pathmax.h
   lib/printf-args.c
   lib/printf-args.h
   lib/printf-parse.c
   lib/printf-parse.h
   lib/progname.c
   lib/progname.h
-  lib/raise.c
-  lib/rawmemchr.c
-  lib/rawmemchr.valgrind
   lib/realloc.c
   lib/ref-add.sin
   lib/ref-del.sin
@@ -734,11 +657,7 @@
   lib/stdlib.in.h
   lib/stpcpy.c
   lib/str-two-way.h
-  lib/strchrnul.c
-  lib/strchrnul.valgrind
   lib/streq.h
-  lib/strerror-override.c
-  lib/strerror-override.h
   lib/strerror.c
   lib/striconv.c
   lib/striconv.h
@@ -749,8 +668,6 @@
   lib/string.in.h
   lib/strstr.c
   lib/sys_stat.in.h
-  lib/sys_time.in.h
-  lib/sys_types.in.h
   lib/time.in.h
   lib/uniconv.in.h
   lib/uniconv/u8-conv-from-enc.c
@@ -764,7 +681,6 @@
   lib/unilbrk/ulc-common.c
   lib/unilbrk/ulc-common.h
   lib/unilbrk/ulc-width-linebreaks.c
-  lib/unistd.c
   lib/unistd.in.h
   lib/unistr.in.h
   lib/unistr/u16-mbtouc-aux.c
@@ -789,7 +705,6 @@
   lib/vasprintf.c
   lib/verify.h
   lib/wchar.in.h
-  lib/wctype-h.c
   lib/wctype.in.h
   lib/wcwidth.c
   lib/xalloc.h
@@ -800,7 +715,6 @@
   lib/xmalloc.c
   lib/xmalloca.c
   lib/xmalloca.h
-  lib/xsize.c
   lib/xsize.h
   lib/xstrdup.c
   lib/xstriconv.c
@@ -811,23 +725,18 @@
   m4/absolute-header.m4
   m4/alloca.m4
   m4/asm-underscore.m4
-  m4/close.m4
   m4/codeset.m4
-  m4/configmake.m4
+  m4/dos.m4
   m4/eealloc.m4
   m4/errno_h.m4
   m4/error.m4
-  m4/exponentd.m4
   m4/extensions.m4
-  m4/extern-inline.m4
   m4/fcntl-o.m4
   m4/fcntl_h.m4
   m4/float_h.m4
   m4/fopen.m4
-  m4/fstat.m4
   m4/getdelim.m4
   m4/getline.m4
-  m4/gettimeofday.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
   m4/iconv.m4
@@ -837,7 +746,6 @@
   m4/inline.m4
   m4/intmax_t.m4
   m4/inttypes_h.m4
-  m4/largefile.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
@@ -852,7 +760,6 @@
   m4/longlong.m4
   m4/malloc.m4
   m4/malloca.m4
-  m4/math_h.m4
   m4/mbrtowc.m4
   m4/mbsinit.m4
   m4/mbstate_t.m4
@@ -862,22 +769,16 @@
   m4/mmap-anon.m4
   m4/mode_t.m4
   m4/moo.m4
-  m4/msvc-inval.m4
-  m4/msvc-nothrow.m4
   m4/multiarch.m4
-  m4/off_t.m4
+  m4/onceonly.m4
   m4/open.m4
-  m4/pathmax.m4
   m4/printf.m4
-  m4/raise.m4
-  m4/rawmemchr.m4
   m4/realloc.m4
   m4/relocatable-lib.m4
   m4/signal_h.m4
   m4/signalblocking.m4
   m4/sigpipe.m4
   m4/size_max.m4
-  m4/ssize_t.m4
   m4/stat.m4
   m4/stdarg.m4
   m4/stdbool.m4
@@ -887,14 +788,10 @@
   m4/stdio_h.m4
   m4/stdlib_h.m4
   m4/stpcpy.m4
-  m4/strchrnul.m4
   m4/strerror.m4
   m4/string_h.m4
   m4/strstr.m4
-  m4/sys_socket_h.m4
   m4/sys_stat_h.m4
-  m4/sys_time_h.m4
-  m4/sys_types_h.m4
   m4/threadlib.m4
   m4/time_h.m4
   m4/tls.m4
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/hash.h gettext-0.18.1.1/gettext-tools/libgettextpo/hash.h
--- gettext-0.19.3/gettext-tools/libgettextpo/hash.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/hash.h	2009-12-12 11:37:49.000000000 +0000
@@ -1,17 +1,19 @@
 /* Copyright (C) 1995, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
-   This 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.
+   The GNU C Library 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,
+   The GNU C Library 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+   Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _HASH_H
 #define _HASH_H
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/iconv.c gettext-0.18.1.1/gettext-tools/libgettextpo/iconv.c
--- gettext-0.19.3/gettext-tools/libgettextpo/iconv.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/iconv.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <iconv.h>
-
-#include <stddef.h>
-
-#if REPLACE_ICONV_UTF
-# include <errno.h>
-# include <stdint.h>
-# include <stdlib.h>
-# include "unistr.h"
-# ifndef uintptr_t
-#  define uintptr_t unsigned long
-# endif
-#endif
-
-#if REPLACE_ICONV_UTF
-
-/* UTF-{16,32}{BE,LE} converters taken from GNU libiconv 1.11.  */
-
-/* Return code if invalid. (xxx_mbtowc) */
-# define RET_ILSEQ      -1
-/* Return code if no bytes were read. (xxx_mbtowc) */
-# define RET_TOOFEW     -2
-
-/* Return code if invalid. (xxx_wctomb) */
-# define RET_ILUNI      -1
-/* Return code if output buffer is too small. (xxx_wctomb, xxx_reset) */
-# define RET_TOOSMALL   -2
-
-/*
- * UTF-16BE
- */
-
-/* Specification: RFC 2781 */
-
-static int
-utf16be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 2)
-    {
-      ucs4_t wc = (s[0] << 8) + s[1];
-      if (wc >= 0xd800 && wc < 0xdc00)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc2 = (s[2] << 8) + s[3];
-              if (!(wc2 >= 0xdc00 && wc2 < 0xe000))
-                return RET_ILSEQ;
-              *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00);
-              return 4;
-            }
-        }
-      else if (wc >= 0xdc00 && wc < 0xe000)
-        {
-          return RET_ILSEQ;
-        }
-      else
-        {
-          *pwc = wc;
-          return 2;
-        }
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf16be_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (!(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (wc < 0x10000)
-        {
-          if (n >= 2)
-            {
-              r[0] = (unsigned char) (wc >> 8);
-              r[1] = (unsigned char) wc;
-              return 2;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-      else if (wc < 0x110000)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10);
-              ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff);
-              r[0] = (unsigned char) (wc1 >> 8);
-              r[1] = (unsigned char) wc1;
-              r[2] = (unsigned char) (wc2 >> 8);
-              r[3] = (unsigned char) wc2;
-              return 4;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-16LE
- */
-
-/* Specification: RFC 2781 */
-
-static int
-utf16le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 2)
-    {
-      ucs4_t wc = s[0] + (s[1] << 8);
-      if (wc >= 0xd800 && wc < 0xdc00)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc2 = s[2] + (s[3] << 8);
-              if (!(wc2 >= 0xdc00 && wc2 < 0xe000))
-                return RET_ILSEQ;
-              *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00);
-              return 4;
-            }
-        }
-      else if (wc >= 0xdc00 && wc < 0xe000)
-        {
-          return RET_ILSEQ;
-        }
-      else
-        {
-          *pwc = wc;
-          return 2;
-        }
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf16le_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (!(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (wc < 0x10000)
-        {
-          if (n >= 2)
-            {
-              r[0] = (unsigned char) wc;
-              r[1] = (unsigned char) (wc >> 8);
-              return 2;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-      else if (wc < 0x110000)
-        {
-          if (n >= 4)
-            {
-              ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10);
-              ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff);
-              r[0] = (unsigned char) wc1;
-              r[1] = (unsigned char) (wc1 >> 8);
-              r[2] = (unsigned char) wc2;
-              r[3] = (unsigned char) (wc2 >> 8);
-              return 4;
-            }
-          else
-            return RET_TOOSMALL;
-        }
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-32BE
- */
-
-/* Specification: Unicode 3.1 Standard Annex #19 */
-
-static int
-utf32be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 4)
-    {
-      ucs4_t wc = (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3];
-      if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-        {
-          *pwc = wc;
-          return 4;
-        }
-      else
-        return RET_ILSEQ;
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf32be_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (n >= 4)
-        {
-          r[0] = 0;
-          r[1] = (unsigned char) (wc >> 16);
-          r[2] = (unsigned char) (wc >> 8);
-          r[3] = (unsigned char) wc;
-          return 4;
-        }
-      else
-        return RET_TOOSMALL;
-    }
-  return RET_ILUNI;
-}
-
-/*
- * UTF-32LE
- */
-
-/* Specification: Unicode 3.1 Standard Annex #19 */
-
-static int
-utf32le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n)
-{
-  if (n >= 4)
-    {
-      ucs4_t wc = s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24);
-      if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-        {
-          *pwc = wc;
-          return 4;
-        }
-      else
-        return RET_ILSEQ;
-    }
-  return RET_TOOFEW;
-}
-
-static int
-utf32le_wctomb (unsigned char *r, ucs4_t wc, size_t n)
-{
-  if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000))
-    {
-      if (n >= 4)
-        {
-          r[0] = (unsigned char) wc;
-          r[1] = (unsigned char) (wc >> 8);
-          r[2] = (unsigned char) (wc >> 16);
-          r[3] = 0;
-          return 4;
-        }
-      else
-        return RET_TOOSMALL;
-    }
-  return RET_ILUNI;
-}
-
-#endif
-
-size_t
-rpl_iconv (iconv_t cd,
-           ICONV_CONST char **inbuf, size_t *inbytesleft,
-           char **outbuf, size_t *outbytesleft)
-#undef iconv
-{
-#if REPLACE_ICONV_UTF
-  switch ((uintptr_t) cd)
-    {
-      {
-        int (*xxx_wctomb) (unsigned char *, ucs4_t, size_t);
-
-        case (uintptr_t) _ICONV_UTF8_UTF16BE:
-          xxx_wctomb = utf16be_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF16LE:
-          xxx_wctomb = utf16le_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF32BE:
-          xxx_wctomb = utf32be_wctomb;
-          goto loop_from_utf8;
-        case (uintptr_t) _ICONV_UTF8_UTF32LE:
-          xxx_wctomb = utf32le_wctomb;
-          goto loop_from_utf8;
-
-       loop_from_utf8:
-        if (inbuf == NULL || *inbuf == NULL)
-          return 0;
-        {
-          ICONV_CONST char *inptr = *inbuf;
-          size_t inleft = *inbytesleft;
-          char *outptr = *outbuf;
-          size_t outleft = *outbytesleft;
-          size_t res = 0;
-          while (inleft > 0)
-            {
-              ucs4_t uc;
-              int m = u8_mbtoucr (&uc, (const uint8_t *) inptr, inleft);
-              if (m <= 0)
-                {
-                  if (m == -1)
-                    {
-                      errno = EILSEQ;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  if (m == -2)
-                    {
-                      errno = EINVAL;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  abort ();
-                }
-              else
-                {
-                  int n = xxx_wctomb ((uint8_t *) outptr, uc, outleft);
-                  if (n < 0)
-                    {
-                      if (n == RET_ILUNI)
-                        {
-                          errno = EILSEQ;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      if (n == RET_TOOSMALL)
-                        {
-                          errno = E2BIG;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      abort ();
-                    }
-                  else
-                    {
-                      inptr += m;
-                      inleft -= m;
-                      outptr += n;
-                      outleft -= n;
-                    }
-                }
-            }
-          *inbuf = inptr;
-          *inbytesleft = inleft;
-          *outbuf = outptr;
-          *outbytesleft = outleft;
-          return res;
-        }
-      }
-
-      {
-        int (*xxx_mbtowc) (ucs4_t *, const unsigned char *, size_t);
-
-        case (uintptr_t) _ICONV_UTF16BE_UTF8:
-          xxx_mbtowc = utf16be_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF16LE_UTF8:
-          xxx_mbtowc = utf16le_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF32BE_UTF8:
-          xxx_mbtowc = utf32be_mbtowc;
-          goto loop_to_utf8;
-        case (uintptr_t) _ICONV_UTF32LE_UTF8:
-          xxx_mbtowc = utf32le_mbtowc;
-          goto loop_to_utf8;
-
-       loop_to_utf8:
-        if (inbuf == NULL || *inbuf == NULL)
-          return 0;
-        {
-          ICONV_CONST char *inptr = *inbuf;
-          size_t inleft = *inbytesleft;
-          char *outptr = *outbuf;
-          size_t outleft = *outbytesleft;
-          size_t res = 0;
-          while (inleft > 0)
-            {
-              ucs4_t uc;
-              int m = xxx_mbtowc (&uc, (const uint8_t *) inptr, inleft);
-              if (m <= 0)
-                {
-                  if (m == RET_ILSEQ)
-                    {
-                      errno = EILSEQ;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  if (m == RET_TOOFEW)
-                    {
-                      errno = EINVAL;
-                      res = (size_t)(-1);
-                      break;
-                    }
-                  abort ();
-                }
-              else
-                {
-                  int n = u8_uctomb ((uint8_t *) outptr, uc, outleft);
-                  if (n < 0)
-                    {
-                      if (n == -1)
-                        {
-                          errno = EILSEQ;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      if (n == -2)
-                        {
-                          errno = E2BIG;
-                          res = (size_t)(-1);
-                          break;
-                        }
-                      abort ();
-                    }
-                  else
-                    {
-                      inptr += m;
-                      inleft -= m;
-                      outptr += n;
-                      outleft -= n;
-                    }
-                }
-            }
-          *inbuf = inptr;
-          *inbytesleft = inleft;
-          *outbuf = outptr;
-          *outbytesleft = outleft;
-          return res;
-        }
-      }
-    }
-#endif
-  return iconv (cd, inbuf, inbytesleft, outbuf, outbytesleft);
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/iconv_close.c gettext-0.18.1.1/gettext-tools/libgettextpo/iconv_close.c
--- gettext-0.19.3/gettext-tools/libgettextpo/iconv_close.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/iconv_close.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <iconv.h>
-
-#include <stdint.h>
-#ifndef uintptr_t
-# define uintptr_t unsigned long
-#endif
-
-int
-rpl_iconv_close (iconv_t cd)
-#undef iconv_close
-{
-#if REPLACE_ICONV_UTF
-  switch ((uintptr_t) cd)
-    {
-    case (uintptr_t) _ICONV_UTF8_UTF16BE:
-    case (uintptr_t) _ICONV_UTF8_UTF16LE:
-    case (uintptr_t) _ICONV_UTF8_UTF32BE:
-    case (uintptr_t) _ICONV_UTF8_UTF32LE:
-    case (uintptr_t) _ICONV_UTF16BE_UTF8:
-    case (uintptr_t) _ICONV_UTF16LE_UTF8:
-    case (uintptr_t) _ICONV_UTF32BE_UTF8:
-    case (uintptr_t) _ICONV_UTF32LE_UTF8:
-      return 0;
-    }
-#endif
-  return iconv_close (cd);
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/iconveh.h gettext-0.18.1.1/gettext-tools/libgettextpo/iconveh.h
--- gettext-0.19.3/gettext-tools/libgettextpo/iconveh.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/iconveh.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion handler type.
-   Copyright (C) 2001-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/iconv.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/iconv.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/iconv.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/iconv.in.h	2010-04-25 09:22:39.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,20 +13,20 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_ICONV_H
+#ifndef _GL_ICONV_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ICONV_H@
 
-#ifndef _@GUARD_PREFIX@_ICONV_H
-#define _@GUARD_PREFIX@_ICONV_H
+#ifndef _GL_ICONV_H
+#define _GL_ICONV_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -35,24 +35,22 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV_OPEN@
+#if @REPLACE_ICONV_OPEN@
 /* An iconv_open wrapper that supports the IANA standardized encoding names
    ("ISO-8859-1" etc.) as far as possible.  */
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv_open rpl_iconv_open
-#  endif
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv_open rpl_iconv_open
+# endif
 _GL_FUNCDECL_RPL (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv_open, iconv_t,
                   (const char *tocode, const char *fromcode));
-# endif
-_GL_CXXALIASWARN (iconv_open);
 #endif
+_GL_CXXALIASWARN (iconv_open);
 
 #if @REPLACE_ICONV_UTF@
 /* Special constants for supporting UTF-{16,32}{BE,LE} encodings.
@@ -67,11 +65,10 @@
 # define _ICONV_UTF32LE_UTF8 (iconv_t)(-168)
 #endif
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv rpl_iconv
-#  endif
+#if @REPLACE_ICONV@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv rpl_iconv
+# endif
 _GL_FUNCDECL_RPL (iconv, size_t,
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
@@ -80,31 +77,25 @@
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv, size_t,
                   (iconv_t cd,
                    @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
-# endif
-_GL_CXXALIASWARN (iconv);
-# ifndef ICONV_CONST
-#  define ICONV_CONST @ICONV_CONST@
-# endif
 #endif
+_GL_CXXALIASWARN (iconv);
 
-#if @GNULIB_ICONV@
-# if @REPLACE_ICONV@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define iconv_close rpl_iconv_close
-#  endif
+#if @REPLACE_ICONV@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define iconv_close rpl_iconv_close
+# endif
 _GL_FUNCDECL_RPL (iconv_close, int, (iconv_t cd));
 _GL_CXXALIAS_RPL (iconv_close, int, (iconv_t cd));
-# else
+#else
 _GL_CXXALIAS_SYS (iconv_close, int, (iconv_t cd));
-# endif
-_GL_CXXALIASWARN (iconv_close);
 #endif
+_GL_CXXALIASWARN (iconv_close);
 
 
-#endif /* _@GUARD_PREFIX@_ICONV_H */
-#endif /* _@GUARD_PREFIX@_ICONV_H */
+#endif /* _GL_ICONV_H */
+#endif /* _GL_ICONV_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/iconv_open.c gettext-0.18.1.1/gettext-tools/libgettextpo/iconv_open.c
--- gettext-0.19.3/gettext-tools/libgettextpo/iconv_open.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/iconv_open.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -56,7 +57,7 @@
      iconv() to these encoding inserts a BOM, which is wrong.
      We do not need to handle conversion between arbitrary encodings and
      UTF-{16,32}{BE,LE}, because the 'striconveh' module implements two-step
-     conversion through UTF-8.
+     conversion throough UTF-8.
      The _ICONV_* constants are chosen to be disjoint from any iconv_t
      returned by the system's iconv_open() functions.  Recall that iconv_t
      is a scalar type.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/intprops.h gettext-0.18.1.1/gettext-tools/libgettextpo/intprops.h
--- gettext-0.19.3/gettext-tools/libgettextpo/intprops.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/intprops.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,6 +1,7 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,304 +18,66 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _GL_INTPROPS_H
-#define _GL_INTPROPS_H
+#ifndef GL_INTPROPS_H
+# define GL_INTPROPS_H
 
-#include <limits.h>
-
-/* Return an integer value, converted to the same type as the integer
-   expression E after integer type promotion.  V is the unconverted value.  */
-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
-
-/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>.  */
-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
+# include <limits.h>
 
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
 
 /* True if the arithmetic type T is an integer type.  bool counts as
    an integer.  */
-#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
+# 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)
+# 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))
-
-/* Return 1 if the integer expression E, after integer promotion, has
-   a signed type.  */
-#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
+# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-
-/* Minimum and maximum values for integer types and expressions.  These
+/* 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.  */
-
-/* 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_MAXIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) -1                                                        \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-/* The maximum and minimum values for the type of the expression E,
-   after integer promotion.  E should not have side effects.  */
-#define _GL_INT_MINIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
-   : _GL_INT_CONVERT (e, 0))
-#define _GL_INT_MAXIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-   : _GL_INT_NEGATE_CONVERT (e, 1))
-#define _GL_SIGNED_INT_MAXIMUM(e)                                       \
-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-
-
-/* Return 1 if the __typeof__ keyword works.  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__))
-# define _GL_HAVE___TYPEOF__ 1
-#else
-# define _GL_HAVE___TYPEOF__ 0
-#endif
-
-/* Return 1 if the integer type or expression T might be signed.  Return 0
-   if it is definitely unsigned.  This macro does not evaluate its argument,
-   and expands to an integer constant expression.  */
-#if _GL_HAVE___TYPEOF__
-# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
-#else
-# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
-#endif
-
-/* Bound on length of the string representing an unsigned integer
-   value representable in B bits.  log10 (2.0) < 146/485.  The
-   smallest value of B where this bound is not tight is 2621.  */
-#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
+# define TYPE_MINIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+        ? (t) 0 \
+        : TYPE_SIGNED_MAGNITUDE (t) \
+        ? ~ (t) 0 \
+        : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+# define TYPE_MAXIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+        ? (t) -1 \
+        : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+
+/* Return zero if T can be determined to be an unsigned type.
+   Otherwise, return 1.
+   When compiling with GCC, INT_STRLEN_BOUND uses this macro to obtain a
+   tighter bound.  Otherwise, it overestimates the true bound by one byte
+   when applied to unsigned types of size 2, 4, 16, ... bytes.
+   The symbol signed_type_or_expr__ is private to this header file.  */
+# if __GNUC__ >= 2
+#  define signed_type_or_expr__(t) TYPE_SIGNED (__typeof__ (t))
+# else
+#  define signed_type_or_expr__(t) 1
+# endif
 
 /* Bound on length of the string representing an integer type or expression T.
-   Subtract 1 for the sign bit if T is signed, and then add 1 more for
-   a minus sign if needed.
-
-   Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is
-   signed, this macro may overestimate the true bound by one byte when
-   applied to unsigned types of size 2, 4, 16, ... bytes.  */
-#define INT_STRLEN_BOUND(t)                                     \
-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
-   + _GL_SIGNED_TYPE_OR_EXPR (t))
+   Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485;
+   add 1 for integer division truncation; add 1 more for a minus sign
+   if needed.  */
+# define INT_STRLEN_BOUND(t) \
+  ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \
+   + signed_type_or_expr__ (t) + 1)
 
 /* Bound on buffer size needed to represent an integer type or expression T,
    including the terminating null.  */
-#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
-
-
-/* Range overflow checks.
-
-   The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
-   operators might not yield numerically correct answers due to
-   arithmetic overflow.  They do not rely on undefined or
-   implementation-defined behavior.  Their implementations are simple
-   and straightforward, but they are a bit harder to use than the
-   INT_<op>_OVERFLOW macros described below.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   Restrictions on *_RANGE_OVERFLOW macros:
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times,
-   so the arguments should not have side effects.  The arithmetic
-   arguments (including the MIN and MAX arguments) must be of the same
-   integer type after the usual arithmetic conversions, and the type
-   must have minimum value MIN and maximum MAX.  Unsigned types should
-   use a zero MIN of the proper type.
-
-   These macros are tuned for constant MIN and MAX.  For commutative
-   operations such as A + B, they are also tuned for constant B.  */
-
-/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_ADD_RANGE_OVERFLOW(a, b, min, max)          \
-  ((b) < 0                                              \
-   ? (a) < (min) - (b)                                  \
-   : (max) - (b) < (a))
-
-/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? (max) + (b) < (a)                                  \
-   : (a) < (min) + (b))
-
-/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_NEGATE_RANGE_OVERFLOW(a, min, max)          \
-  ((min) < 0                                            \
-   ? (a) < - (max)                                      \
-   : 0 < (a))
-
-/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Avoid && and || as they tickle
-   bugs in Sun C 5.11 2010/08/13 and other compilers; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>.  */
-#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? ((a) < 0                                           \
-      ? (a) < (max) / (b)                               \
-      : (b) == -1                                       \
-      ? 0                                               \
-      : (min) / (b) < (a))                              \
-   : (b) == 0                                           \
-   ? 0                                                  \
-   : ((a) < 0                                           \
-      ? (a) < (min) / (b)                               \
-      : (max) / (b) < (a)))
-
-/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.  */
-#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max)       \
-  ((min) < 0 && (b) == -1 && (a) < - (max))
-
-/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.
-   Mathematically, % should never overflow, but on x86-like hosts
-   INT_MIN % -1 traps, and the C standard permits this, so treat this
-   as an overflow too.  */
-#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max)    \
-  INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
-
-/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Here, MIN and MAX are for A only, and B need
-   not be of the same type as the other arguments.  The C standard says that
-   behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
-   A is negative then A << B has undefined behavior and A >> B has
-   implementation-defined behavior, but do not check these other
-   restrictions.  */
-#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max)   \
-  ((a) < 0                                              \
-   ? (a) < (min) >> (b)                                 \
-   : (max) >> (b) < (a))
-
-
-/* The _GL*_OVERFLOW macros have the same restrictions as the
-   *_RANGE_OVERFLOW macros, except that they do not assume that operands
-   (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-   that the result (e.g., A + B) has that type.  */
-#define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-  ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-   : (a) < 0 ? (b) <= (a) + (b)                                         \
-   : (b) < 0 ? (a) <= (a) + (b)                                         \
-   : (a) + (b) < (b))
-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
-  ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
-   : (a) < 0 ? 1                                                        \
-   : (b) < 0 ? (a) - (b) <= (a)                                         \
-   : (a) < (b))
-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
-  (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
-   || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
-#define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
-   : (b) < 0 && (a) + (b) <= (a))
-#define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
-   : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
-
-/* Return a nonzero value if A is a mathematical multiple of B, where
-   A is unsigned, B is negative, and MAX is the maximum value of A's
-   type.  A's type must be the same as (A % B)'s type.  Normally (A %
-   -B == 0) suffices, but things get tricky if -B would overflow.  */
-#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max)                            \
-  (((b) < -_GL_SIGNED_INT_MAXIMUM (b)                                   \
-    ? (_GL_SIGNED_INT_MAXIMUM (b) == (max)                              \
-       ? (a)                                                            \
-       : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1))   \
-    : (a) % - (b))                                                      \
-   == 0)
-
-
-/* Integer overflow checks.
-
-   The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
-   might not yield numerically correct answers due to arithmetic overflow.
-   They work correctly on all known practical hosts, and do not rely
-   on undefined behavior due to signed arithmetic overflow.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_OVERFLOW (i, j))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times, so the
-   arguments should not have side effects.
-
-   These macros are tuned for their last argument being a constant.
-
-   Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
-   A % B, and A << B would overflow, respectively.  */
-
-#define INT_ADD_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
-#define INT_SUBTRACT_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
-#define INT_NEGATE_OVERFLOW(a) \
-  INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-#define INT_MULTIPLY_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
-#define INT_DIVIDE_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
-#define INT_REMAINDER_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
-#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
-  INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
-                                 _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-
-/* Return 1 if the expression A <op> B would overflow,
-   where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
-   assuming MIN and MAX are the minimum and maximum for the result type.
-   Arguments should be free of side effects.  */
-#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
-  op_result_overflow (a, b,                                     \
-                      _GL_INT_MINIMUM (0 * (b) + (a)),          \
-                      _GL_INT_MAXIMUM (0 * (b) + (a)))
+# define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
 
-#endif /* _GL_INTPROPS_H */
+#endif /* GL_INTPROPS_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/itold.c gettext-0.18.1.1/gettext-tools/libgettextpo/itold.c
--- gettext-0.19.3/gettext-tools/libgettextpo/itold.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/itold.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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>
-
-/* Specification.  */
-#include <float.h>
-
-void
-_Qp_itoq (long double *result, int a)
-{
-  /* Convert from 'int' to 'double', then from 'double' to 'long double'.  */
-  *result = (double) a;
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/localcharset.c gettext-0.18.1.1/gettext-tools/libgettextpo/localcharset.c
--- gettext-0.19.3/gettext-tools/libgettextpo/localcharset.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/localcharset.c	2010-05-09 01:38:03.000000000 +0000
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
@@ -29,12 +30,11 @@
 #include <stdlib.h>
 
 #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
+# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WINDOWS_NATIVE
-# include <locale.h>
+# define WIN32_NATIVE
 #endif
 
 #if defined __EMX__
@@ -44,7 +44,7 @@
 # endif
 #endif
 
-#if !defined WINDOWS_NATIVE
+#if !defined WIN32_NATIVE
 # include <unistd.h>
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
@@ -57,7 +57,7 @@
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 # endif
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -66,11 +66,6 @@
 # include <os2.h>
 #endif
 
-/* For MB_CUR_MAX_L */
-#if defined DARWIN7
-# include <xlocale.h>
-#endif
-
 #if ENABLE_RELOCATABLE
 # include "relocatable.h"
 #else
@@ -88,7 +83,7 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, Cygwin, OS/2, DOS */
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #endif
 
@@ -128,7 +123,7 @@
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
       const char *dir;
       const char *base = "charset.alias";
       char *file_name;
@@ -233,7 +228,8 @@
                         {
                           /* Out of memory. */
                           res_size = 0;
-                          free (old_res_ptr);
+                          if (old_res_ptr != NULL)
+                            free (old_res_ptr);
                           break;
                         }
                       strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
@@ -313,7 +309,7 @@
            "DECKOREAN" "\0" "EUC-KR" "\0";
 # endif
 
-# if defined WINDOWS_NATIVE || defined __CYGWIN__
+# if defined WIN32_NATIVE || defined __CYGWIN__
       /* To avoid the troubles of installing a separate file in the same
          directory as the DLL and of retrieving the DLL's directory at
          runtime, simply inline the aliases here.  */
@@ -365,7 +361,7 @@
   const char *codeset;
   const char *aliases;
 
-#if !(defined WINDOWS_NATIVE || defined OS2)
+#if !(defined WIN32_NATIVE || defined OS2)
 
 # if HAVE_LANGINFO_CODESET
 
@@ -412,10 +408,10 @@
             }
         }
 
-      /* The Windows API has a function returning the locale's codepage as a
-         number: GetACP().  This encoding is used by Cygwin, unless the user
-         has set the environment variable CYGWIN=codepage:oem (which very few
-         people do).
+      /* Woe32 has a function returning the locale's codepage as a number:
+         GetACP().  This encoding is used by Cygwin, unless the user has set
+         the environment variable CYGWIN=codepage:oem (which very few people
+         do).
          Output directed to console windows needs to be converted (to
          GetOEMCP() if the console is using a raster font, or to
          GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
@@ -458,38 +454,18 @@
 
 # endif
 
-#elif defined WINDOWS_NATIVE
+#elif defined WIN32_NATIVE
 
   static char buf[2 + 10 + 1];
 
-  /* The Windows API has a function returning the locale's codepage as
-     a number, but the value doesn't change according to what the
-     'setlocale' call specified.  So we use it as a last resort, in
-     case the string returned by 'setlocale' doesn't specify the
-     codepage.  */
-  char *current_locale = setlocale (LC_ALL, NULL);
-  char *pdot;
-
-  /* If they set different locales for different categories,
-     'setlocale' will return a semi-colon separated list of locale
-     values.  To make sure we use the correct one, we choose LC_CTYPE.  */
-  if (strchr (current_locale, ';'))
-    current_locale = setlocale (LC_CTYPE, NULL);
-
-  pdot = strrchr (current_locale, '.');
-  if (pdot)
-    sprintf (buf, "CP%s", pdot + 1);
-  else
-    {
-      /* The Windows API has a function returning the locale's codepage as a
-        number: GetACP().
-        When the output goes to a console window, it needs to be provided in
-        GetOEMCP() encoding if the console is using a raster font, or in
-        GetConsoleOutputCP() encoding if it is using a TrueType font.
-        But in GUI programs and for output sent to files and pipes, GetACP()
-        encoding is the best bet.  */
-      sprintf (buf, "CP%u", GetACP ());
-    }
+  /* Woe32 has a function returning the locale's codepage as a number:
+     GetACP().
+     When the output goes to a console window, it needs to be provided in
+     GetOEMCP() encoding if the console is using a raster font, or in
+     GetConsoleOutputCP() encoding if it is using a TrueType font.
+     But in GUI programs and for output sent to files and pipes, GetACP()
+     encoding is the best bet.  */
+  sprintf (buf, "CP%u", GetACP ());
   codeset = buf;
 
 #elif defined OS2
@@ -568,12 +544,5 @@
   if (codeset[0] == '\0')
     codeset = "ASCII";
 
-#ifdef DARWIN7
-  /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
-     (the default codeset) does not work when MB_CUR_MAX is 1.  */
-  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
-    codeset = "ASCII";
-#endif
-
   return codeset;
 }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/localcharset.h gettext-0.18.1.1/gettext-tools/libgettextpo/localcharset.h
--- gettext-0.19.3/gettext-tools/libgettextpo/localcharset.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/localcharset.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2010 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
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/Makefile.am gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.am
--- gettext-0.19.3/gettext-tools/libgettextpo/Makefile.am	2014-05-12 03:39:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.am	2010-06-06 17:55:59.000000000 +0000
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 EXTRA_DIST =
 BUILT_SOURCES =
 MOSTLYCLEANFILES = core *.stackdump
@@ -65,13 +65,11 @@
   ../src/format-c.c \
   ../src/format-sh.c \
   ../src/format-python.c \
-  ../src/format-python-brace.c \
   ../src/format-lisp.c \
   ../src/format-elisp.c \
   ../src/format-librep.c \
   ../src/format-scheme.c \
   ../src/format-java.c \
-  ../src/format-javascript.c \
   ../src/format-csharp.c \
   ../src/format-awk.c \
   ../src/format-pascal.c \
@@ -86,7 +84,6 @@
   ../src/format-qt-plural.c \
   ../src/format-kde.c \
   ../src/format-boost.c \
-  ../src/format-lua.c \
   ../src/format.c \
   ../src/plural-exp.c \
   ../src/plural-eval.c \
@@ -95,7 +92,7 @@
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=5
-LTV_REVISION=2
+LTV_REVISION=1
 LTV_AGE=5
 
 # How to build libgettextpo.la.
@@ -105,7 +102,7 @@
 libgettextpo_la_LDFLAGS = \
   -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
   -rpath $(libdir) \
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL
@@ -173,14 +170,14 @@
 
 # Special rules for installable include files that export variables.
 
-EXTRA_DIST += gettext-po.in.h
+EXTRA_DIST += gettext-po.h.in
 BUILT_SOURCES += gettext-po.h
 CLEANFILES += gettext-po.h
-gettext-po.h: gettext-po.in.h
+gettext-po.h: gettext-po.h.in
 if WOE32DLL
-	sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/' $(srcdir)/gettext-po.in.h > gettext-po.h-tmp
+	sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/' $(srcdir)/gettext-po.h.in > gettext-po.h-tmp
 else
-	cp $(srcdir)/gettext-po.in.h gettext-po.h-tmp
+	cp $(srcdir)/gettext-po.h.in gettext-po.h-tmp
 endif
 	mv gettext-po.h-tmp gettext-po.h
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/Makefile.gnulib gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.gnulib
--- gettext-0.19.3/gettext-tools/libgettextpo/Makefile.gnulib	2014-10-16 06:01:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.gnulib	2010-06-03 21:37:14.000000000 +0000
@@ -1,27 +1,15 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgnu --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gtpo basename c-ctype c-strcase c-strstr close error error-progname file-ostream filename fopen fstrcmp fwriteerror gcd getline gettext-h hash iconv libunistring-optional minmax open ostream progname relocatable-lib sigpipe stdbool stdio stdlib strchrnul strerror unilbrk/ulc-width-linebreaks unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf xalloc xconcat-filename xerror xmalloca xstriconv xvasprintf
+# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgnu --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --makefile-name=Makefile.gnulib --libtool --macro-prefix=gtpo basename c-ctype c-strcase c-strstr error error-progname file-ostream filename fopen fstrcmp fwriteerror gcd getline gettext-h hash iconv libunistring-optional minmax open ostream progname relocatable-lib sigpipe stdbool stdio stdlib strerror unilbrk/ulc-width-linebreaks unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-uctomb uniwidth/width unlocked-io vasprintf xalloc xconcat-filename xerror xmalloca xstriconv xvasprintf
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -33,20 +21,6 @@
 libgnu_la_DEPENDENCIES = $(gtpo_LTLIBOBJS)
 EXTRA_libgnu_la_SOURCES =
 libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-libgnu_la_LDFLAGS += -no-undefined
-libgnu_la_LDFLAGS += $(LTLIBICONV)
-libgnu_la_LDFLAGS += $(LTLIBINTL)
-libgnu_la_LDFLAGS += $(LTLIBTHREAD)
-libgnu_la_LDFLAGS += $(LTLIBUNISTRING)
-
-## begin gnulib module absolute-header
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-
-## end   gnulib module absolute-header
 
 ## begin gnulib module alloca-opt
 
@@ -54,29 +28,72 @@
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ALLOCA_H
-alloca.h: alloca.in.h $(top_builddir)/config.status
+alloca.h: alloca.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/alloca.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-else
-alloca.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/arg-nonnull.h
+
+## end   gnulib module arg-nonnull
+
 ## begin gnulib module basename
 
 libgnu_la_SOURCES += basename.h basename.c
 
 ## end   gnulib module basename
 
+## begin gnulib module c++defs
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/c++defs.h
+
+## end   gnulib module c++defs
+
 ## begin gnulib module c-ctype
 
 libgnu_la_SOURCES += c-ctype.h c-ctype.c
@@ -102,15 +119,6 @@
 
 ## end   gnulib module c-strstr
 
-## begin gnulib module close
-
-
-EXTRA_DIST += close.c
-
-EXTRA_libgnu_la_SOURCES += close.c
-
-## end   gnulib module close
-
 ## begin gnulib module concat-filename
 
 libgnu_la_SOURCES += concat-filename.c
@@ -121,8 +129,21 @@
 
 ## begin gnulib module configmake
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
@@ -138,7 +159,6 @@
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -157,7 +177,11 @@
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
 
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
@@ -170,27 +194,17 @@
 
 ## end   gnulib module diffseq
 
-## begin gnulib module dosname
-
-
-EXTRA_DIST += dosname.h
-
-## end   gnulib module dosname
-
 ## begin gnulib module errno
 
 BUILT_SOURCES += $(ERRNO_H)
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-if GL_GENERATE_ERRNO_H
-errno.h: errno.in.h $(top_builddir)/config.status
+errno.h: errno.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
 	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
 	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
@@ -201,10 +215,6 @@
 	      < $(srcdir)/errno.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-errno.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += errno.h errno.h-t
 
 EXTRA_DIST += errno.in.h
@@ -240,18 +250,15 @@
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-	      -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
-	      -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
-	      -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
+	      -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
 	      -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
 	      -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
 	      -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
@@ -269,14 +276,6 @@
 
 ## end   gnulib module fcntl-h
 
-## begin gnulib module fd-hook
-
-libgnu_la_SOURCES += fd-hook.c
-
-EXTRA_DIST += fd-hook.h
-
-## end   gnulib module fd-hook
-
 ## begin gnulib module file-ostream
 
 libgnu_la_SOURCES += file-ostream.c
@@ -319,28 +318,18 @@
 
 # We need the following in order to create <float.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_FLOAT_H
-float.h: float.in.h $(top_builddir)/config.status
+float.h: float.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
-	      -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
 	      < $(srcdir)/float.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-float.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += float.h float.h-t
 
-EXTRA_DIST += float.c float.in.h itold.c
-
-EXTRA_libgnu_la_SOURCES += float.c itold.c
+EXTRA_DIST += float.in.h
 
 ## end   gnulib module float
 
@@ -353,15 +342,6 @@
 
 ## end   gnulib module fopen
 
-## begin gnulib module fstat
-
-
-EXTRA_DIST += fstat.c
-
-EXTRA_libgnu_la_SOURCES += fstat.c
-
-## end   gnulib module fstat
-
 ## begin gnulib module fstrcmp
 
 libgnu_la_SOURCES += fstrcmp.h fstrcmp.c
@@ -404,15 +384,6 @@
 
 ## end   gnulib module gettext-h
 
-## begin gnulib module gettimeofday
-
-
-EXTRA_DIST += gettimeofday.c
-
-EXTRA_libgnu_la_SOURCES += gettimeofday.c
-
-## end   gnulib module gettimeofday
-
 ## begin gnulib module gperf
 
 GPERF = gperf
@@ -438,16 +409,12 @@
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_ICONV_H
-iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-	      -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
 	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
 	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
 	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
@@ -458,10 +425,6 @@
 	      < $(srcdir)/iconv.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-iconv.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += iconv.h iconv.h-t
 
 EXTRA_DIST += iconv.in.h
@@ -490,9 +453,9 @@
 MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 
-EXTRA_DIST += 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
+EXTRA_DIST += iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c
 
-EXTRA_libgnu_la_SOURCES += iconv.c iconv_close.c iconv_open.c
+EXTRA_libgnu_la_SOURCES += iconv_open.c
 
 ## end   gnulib module iconv_open
 
@@ -656,24 +619,6 @@
 
 ## end   gnulib module moo
 
-## begin gnulib module msvc-inval
-
-
-EXTRA_DIST += msvc-inval.c msvc-inval.h
-
-EXTRA_libgnu_la_SOURCES += msvc-inval.c
-
-## end   gnulib module msvc-inval
-
-## begin gnulib module msvc-nothrow
-
-
-EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
-
-EXTRA_libgnu_la_SOURCES += msvc-nothrow.c
-
-## end   gnulib module msvc-nothrow
-
 ## begin gnulib module obstack
 
 
@@ -721,37 +666,12 @@
 
 ## end   gnulib module ostream
 
-## begin gnulib module pathmax
-
-
-EXTRA_DIST += pathmax.h
-
-## end   gnulib module pathmax
-
 ## begin gnulib module progname
 
 libgnu_la_SOURCES += progname.h progname.c
 
 ## end   gnulib module progname
 
-## begin gnulib module raise
-
-
-EXTRA_DIST += raise.c
-
-EXTRA_libgnu_la_SOURCES += raise.c
-
-## end   gnulib module raise
-
-## begin gnulib module rawmemchr
-
-
-EXTRA_DIST += rawmemchr.c rawmemchr.valgrind
-
-EXTRA_libgnu_la_SOURCES += rawmemchr.c
-
-## end   gnulib module rawmemchr
-
 ## begin gnulib module realloc-posix
 
 
@@ -770,36 +690,27 @@
 
 ## end   gnulib module relocatable-lib
 
-## begin gnulib module signal-h
+## begin gnulib module signal
 
 BUILT_SOURCES += signal.h
 
 # We need the following in order to create <signal.h> when the system
 # doesn't have a complete one.
-signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
-	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
+	      -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
+	      -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
 	      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
-	      -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
 	      -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
 	      -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
 	      -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
 	      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
 	      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-	      -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
-	      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -810,16 +721,7 @@
 
 EXTRA_DIST += signal.in.h
 
-## end   gnulib module signal-h
-
-## begin gnulib module sigpipe
-
-
-EXTRA_DIST += stdio-write.c
-
-EXTRA_libgnu_la_SOURCES += stdio-write.c
-
-## end   gnulib module sigpipe
+## end   gnulib module signal
 
 ## begin gnulib module sigprocmask
 
@@ -836,112 +738,6 @@
 
 ## end   gnulib module size_max
 
-## begin gnulib module snippet/_Noreturn
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-
-_NORETURN_H=$(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-
-## end   gnulib module snippet/_Noreturn
-
-## begin gnulib module snippet/arg-nonnull
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-
-ARG_NONNULL_H=arg-nonnull.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-
-## end   gnulib module snippet/arg-nonnull
-
-## begin gnulib module snippet/c++defs
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/c++defs.h
-
-## end   gnulib module snippet/c++defs
-
-## begin gnulib module snippet/unused-parameter
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += unused-parameter.h
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
-
-UNUSED_PARAMETER_H=unused-parameter.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-
-## end   gnulib module snippet/unused-parameter
-
-## begin gnulib module snippet/warn-on-use
-
-BUILT_SOURCES += warn-on-use.h
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
-
-WARN_ON_USE_H=warn-on-use.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-
-## end   gnulib module snippet/warn-on-use
-
 ## begin gnulib module stat
 
 
@@ -957,22 +753,15 @@
 
 # We need the following in order to create <stdarg.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDARG_H
-stdarg.h: stdarg.in.h $(top_builddir)/config.status
+stdarg.h: stdarg.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
 	      < $(srcdir)/stdarg.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdarg.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdarg.h stdarg.h-t
 
 EXTRA_DIST += stdarg.in.h
@@ -985,17 +774,12 @@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-if GL_GENERATE_STDBOOL_H
-stdbool.h: stdbool.in.h $(top_builddir)/config.status
+stdbool.h: stdbool.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdbool.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
 EXTRA_DIST += stdbool.in.h
@@ -1008,24 +792,17 @@
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDDEF_H
-stddef.h: stddef.in.h $(top_builddir)/config.status
+stddef.h: stddef.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
 	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
 	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
 	      < $(srcdir)/stddef.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stddef.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stddef.h stddef.h-t
 
 EXTRA_DIST += stddef.in.h
@@ -1038,21 +815,17 @@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_STDINT_H
-stdint.h: stdint.in.h $(top_builddir)/config.status
+stdint.h: stdint.in.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
 	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
 	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
 	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
 	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
@@ -1072,10 +845,6 @@
 	      < $(srcdir)/stdint.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-stdint.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
 EXTRA_DIST += stdint.in.h
@@ -1088,71 +857,55 @@
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
-	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
-	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
-	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
-	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
-	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
-	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
-	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
-	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
-	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
-	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
-	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
-	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
-	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
-	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
-	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
-	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
-	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
-	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
-	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
-	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
-	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
-	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
-	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
-	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
-	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
-	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
-	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
-	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
-	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
-	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
-	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
-	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
-	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
-	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
-	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
-	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+	      -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+	      -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+	      -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+	      -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+	      -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      < $(srcdir)/stdio.in.h | \
 	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
-	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -1161,14 +914,11 @@
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
 	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
-	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
-	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -1189,7 +939,6 @@
 	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
 	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
@@ -1206,7 +955,9 @@
 	mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
-EXTRA_DIST += stdio.in.h
+EXTRA_DIST += stdio-write.c stdio.in.h
+
+EXTRA_libgnu_la_SOURCES += stdio-write.c
 
 ## end   gnulib module stdio
 
@@ -1216,97 +967,73 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+	      -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+	      -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
 	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
 	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
@@ -1324,15 +1051,6 @@
 
 ## end   gnulib module stpcpy
 
-## begin gnulib module strchrnul
-
-
-EXTRA_DIST += strchrnul.c strchrnul.valgrind
-
-EXTRA_libgnu_la_SOURCES += strchrnul.c
-
-## end   gnulib module strchrnul
-
 ## begin gnulib module streq
 
 
@@ -1349,15 +1067,6 @@
 
 ## end   gnulib module strerror
 
-## begin gnulib module strerror-override
-
-
-EXTRA_DIST += strerror-override.c strerror-override.h
-
-EXTRA_libgnu_la_SOURCES += strerror-override.c
-
-## end   gnulib module strerror-override
-
 ## begin gnulib module striconv
 
 libgnu_la_SOURCES += striconv.h striconv.c
@@ -1390,55 +1099,48 @@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-	      -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-	      -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-	      -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-	      -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-	      -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-	      -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-	      -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-	      -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-	      -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-	      -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-	      -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-	      -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-	      -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-	      -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-	      -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-	      -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-	      -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-	      -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-	      -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-	      -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-	      -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-	      -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-	      -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-	      -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-	      -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-	      -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-	      -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-	      -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-	      -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-	      -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-	      -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-	      -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-	      -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+	  sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -1454,18 +1156,15 @@
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-	      -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
 	      -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
 	      -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -1499,29 +1198,25 @@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+	      -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+	      -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+	      -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+	      -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+	      -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+	      -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+	      -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+	      -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+	      -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+	      -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+	      -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -1555,65 +1250,6 @@
 
 ## end   gnulib module sys_stat
 
-## begin gnulib module sys_time
-
-BUILT_SOURCES += sys/time.h
-
-# We need the following in order to create <sys/time.h> when the system
-# doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
-	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/sys_time.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += sys/time.h sys/time.h-t
-
-EXTRA_DIST += sys_time.in.h
-
-## end   gnulib module sys_time
-
-## begin gnulib module sys_types
-
-BUILT_SOURCES += sys/types.h
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      < $(srcdir)/sys_types.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += sys/types.h sys/types.h-t
-
-EXTRA_DIST += sys_types.in.h
-
-## end   gnulib module sys_types
-
 ## begin gnulib module threadlib
 
 libgnu_la_SOURCES += glthread/threadlib.c
@@ -1628,26 +1264,21 @@
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
-	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
-	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
-	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
-	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+	      -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+	      -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+	      -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+	      -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+	      -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
-	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
-	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -1758,69 +1389,56 @@
 ## begin gnulib module unistd
 
 BUILT_SOURCES += unistd.h
-libgnu_la_SOURCES += unistd.c
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
-	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
-	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
-	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
-	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
-	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
-	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
-	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
-	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
-	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
-	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
-	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
-	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
-	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
-	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
-	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
-	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
-	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
-	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
-	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
-	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
-	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_GTPO_UNISTD_H_GETOPT)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
-	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
-	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
-	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+	      -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+	      -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+	      -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+	      -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+	      -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+	      -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+	      -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+	      -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+	      -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+	      -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+	      -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      < $(srcdir)/unistd.in.h | \
 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -1829,62 +1447,48 @@
 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
-	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
-	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
-	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
-	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
-	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
-	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
@@ -2036,6 +1640,31 @@
 
 ## end   gnulib module unlocked-io
 
+## begin gnulib module unused-parameter
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += unused-parameter.h
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/../build-aux/unused-parameter.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+	  < $(top_srcdir)/../build-aux/unused-parameter.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
+
+UNUSED_PARAMETER_H=unused-parameter.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/unused-parameter.h
+
+## end   gnulib module unused-parameter
+
 ## begin gnulib module vasnprintf
 
 
@@ -2056,68 +1685,54 @@
 
 ## begin gnulib module verify
 
-
-EXTRA_DIST += verify.h
+libgnu_la_SOURCES += verify.h
 
 ## end   gnulib module verify
 
+## begin gnulib module warn-on-use
+
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
+
+WARN_ON_USE_H=warn-on-use.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/warn-on-use.h
+
+## end   gnulib module warn-on-use
+
 ## begin gnulib module wchar
 
 BUILT_SOURCES += wchar.h
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -2127,38 +1742,9 @@
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -2170,10 +1756,10 @@
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
@@ -2182,35 +1768,23 @@
 
 ## end   gnulib module wchar
 
-## begin gnulib module wctype-h
+## begin gnulib module wctype
 
 BUILT_SOURCES += wctype.h
-libgnu_la_SOURCES += wctype-h.c
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
-	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
 	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
-	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/wctype.in.h; \
@@ -2220,7 +1794,7 @@
 
 EXTRA_DIST += wctype.in.h
 
-## end   gnulib module wctype-h
+## end   gnulib module wctype
 
 ## begin gnulib module wcwidth
 
@@ -2261,7 +1835,7 @@
 
 ## begin gnulib module xsize
 
-libgnu_la_SOURCES += xsize.h xsize.c
+libgnu_la_SOURCES += xsize.h
 
 ## end   gnulib module xsize
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/Makefile.in gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.in
--- gettext-0.19.3/gettext-tools/libgettextpo/Makefile.in	2014-10-16 06:01:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.in	2010-06-06 20:12:31.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,79 +15,23 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
-# You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgnu --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gtpo basename c-ctype c-strcase c-strstr close error error-progname file-ostream filename fopen fstrcmp fwriteerror gcd getline gettext-h hash iconv libunistring-optional minmax open ostream progname relocatable-lib sigpipe stdbool stdio stdlib strchrnul strerror unilbrk/ulc-width-linebreaks unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf xalloc xconcat-filename xerror xmalloca xstriconv xvasprintf
+# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgnu --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --makefile-name=Makefile.gnulib --libtool --macro-prefix=gtpo basename c-ctype c-strcase c-strstr error error-progname file-ostream filename fopen fstrcmp fwriteerror gcd getline gettext-h hash iconv libunistring-optional minmax open ostream progname relocatable-lib sigpipe stdbool stdio stdlib strerror unilbrk/ulc-width-linebreaks unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-uctomb uniwidth/width unlocked-io vasprintf xalloc xconcat-filename xerror xmalloca xstriconv xvasprintf
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -106,9 +51,8 @@
 @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
-DIST_COMMON = $(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/../build-aux/mkinstalldirs \
-	$(srcdir)/exported.sh.in ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib \
+	$(srcdir)/Makefile.in $(srcdir)/exported.sh.in ChangeLog
 @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_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__append_6 = unilbrk/u8-possible-linebreaks.c
@@ -127,64 +71,54 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -192,12 +126,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -214,7 +145,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -226,7 +156,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -235,26 +164,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -263,17 +186,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -299,7 +218,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -308,7 +226,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -317,26 +234,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -393,12 +308,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 @WOE32_TRUE@am__DEPENDENCIES_1 = libgettextpo.res.lo
@@ -412,48 +321,37 @@
 	../src/po-lex.c ../src/po-gram-gen.c ../src/read-po.c \
 	../src/read-catalog-abstract.c ../src/read-catalog.c \
 	../src/plural-table.c ../src/format-c.c ../src/format-sh.c \
-	../src/format-python.c ../src/format-python-brace.c \
-	../src/format-lisp.c ../src/format-elisp.c \
-	../src/format-librep.c ../src/format-scheme.c \
-	../src/format-java.c ../src/format-javascript.c \
+	../src/format-python.c ../src/format-lisp.c \
+	../src/format-elisp.c ../src/format-librep.c \
+	../src/format-scheme.c ../src/format-java.c \
 	../src/format-csharp.c ../src/format-awk.c \
 	../src/format-pascal.c ../src/format-ycp.c ../src/format-tcl.c \
 	../src/format-perl.c ../src/format-perl-brace.c \
 	../src/format-php.c ../src/format-gcc-internal.c \
 	../src/format-gfc-internal.c ../src/format-qt.c \
 	../src/format-qt-plural.c ../src/format-kde.c \
-	../src/format-boost.c ../src/format-lua.c ../src/format.c \
-	../src/plural-exp.c ../src/plural-eval.c ../src/msgl-check.c \
+	../src/format-boost.c ../src/format.c ../src/plural-exp.c \
+	../src/plural-eval.c ../src/msgl-check.c \
 	../woe32dll/gettextpo-exports.c
-am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = ../src/str-list.lo ../src/dir-list.lo \
-	../src/message.lo ../src/msgl-ascii.lo ../src/po-error.lo \
-	../src/po-xerror.lo ../src/write-catalog.lo ../src/write-po.lo \
-	../src/open-catalog.lo ../src/po-charset.lo ../src/po-lex.lo \
-	../src/po-gram-gen.lo ../src/read-po.lo \
-	../src/read-catalog-abstract.lo ../src/read-catalog.lo \
-	../src/plural-table.lo ../src/format-c.lo ../src/format-sh.lo \
-	../src/format-python.lo ../src/format-python-brace.lo \
-	../src/format-lisp.lo ../src/format-elisp.lo \
-	../src/format-librep.lo ../src/format-scheme.lo \
-	../src/format-java.lo ../src/format-javascript.lo \
-	../src/format-csharp.lo ../src/format-awk.lo \
-	../src/format-pascal.lo ../src/format-ycp.lo \
-	../src/format-tcl.lo ../src/format-perl.lo \
-	../src/format-perl-brace.lo ../src/format-php.lo \
-	../src/format-gcc-internal.lo ../src/format-gfc-internal.lo \
-	../src/format-qt.lo ../src/format-qt-plural.lo \
-	../src/format-kde.lo ../src/format-boost.lo \
-	../src/format-lua.lo ../src/format.lo ../src/plural-exp.lo \
-	../src/plural-eval.lo ../src/msgl-check.lo
-@WOE32DLL_TRUE@am__objects_2 = ../woe32dll/gettextpo-exports.lo
+am__objects_1 = str-list.lo dir-list.lo message.lo msgl-ascii.lo \
+	po-error.lo po-xerror.lo write-catalog.lo write-po.lo \
+	open-catalog.lo po-charset.lo po-lex.lo po-gram-gen.lo \
+	read-po.lo read-catalog-abstract.lo read-catalog.lo \
+	plural-table.lo format-c.lo format-sh.lo format-python.lo \
+	format-lisp.lo format-elisp.lo format-librep.lo \
+	format-scheme.lo format-java.lo format-csharp.lo format-awk.lo \
+	format-pascal.lo format-ycp.lo format-tcl.lo format-perl.lo \
+	format-perl-brace.lo format-php.lo format-gcc-internal.lo \
+	format-gfc-internal.lo format-qt.lo format-qt-plural.lo \
+	format-kde.lo format-boost.lo format.lo plural-exp.lo \
+	plural-eval.lo msgl-check.lo
+@WOE32DLL_TRUE@am__objects_2 = gettextpo-exports.lo
 am_libgettextpo_la_OBJECTS = gettext-po.lo $(am__objects_1) \
 	$(am__objects_2)
 libgettextpo_la_OBJECTS = $(am_libgettextpo_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 libgettextpo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libgettextpo_la_LDFLAGS) $(LDFLAGS) \
@@ -461,75 +359,64 @@
 am__libgnu_la_SOURCES_DIST = basename.h basename.c c-ctype.h c-ctype.c \
 	c-strcase.h c-strcasecmp.c c-strncasecmp.c c-strstr.h \
 	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 localcharset.h localcharset.c glthread/lock.h \
+	error-progname.c exitfail.c file-ostream.c fstrcmp.h fstrcmp.c \
+	fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h hash.h \
+	hash.c localcharset.h localcharset.c glthread/lock.h \
 	glthread/lock.c malloca.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 uniconv/u8-conv-from-enc.c unilbrk/lbrktables.c \
 	unilbrk/u8-possible-linebreaks.c unilbrk/u8-width-linebreaks.c \
-	unilbrk/ulc-common.c unilbrk/ulc-width-linebreaks.c unistd.c \
+	unilbrk/ulc-common.c unilbrk/ulc-width-linebreaks.c \
 	unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c unistr/u8-check.c \
 	unistr/u8-mblen.c unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c \
 	unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c \
 	unistr/u8-mbtoucr.c unistr/u8-prev.c unistr/u8-uctomb.c \
-	unistr/u8-uctomb-aux.c uniwidth/width.c wctype-h.c xalloc.h \
+	unistr/u8-uctomb-aux.c uniwidth/width.c verify.h xalloc.h \
 	xmalloc.c xstrdup.c xconcat-filename.c xerror.h xerror.c \
-	xmalloca.c xsize.h xsize.c xstriconv.h xstriconv.c \
-	xvasprintf.h xvasprintf.c xasprintf.c
-@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__objects_3 = uniconv/u8-conv-from-enc.lo
-@LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__objects_4 = unilbrk/u8-possible-linebreaks.lo
-@LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE@am__objects_5 = unilbrk/u8-width-linebreaks.lo
-@LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE@am__objects_6 = unilbrk/ulc-width-linebreaks.lo
-@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@am__objects_7 = unistr/u16-mbtouc.lo \
-@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@	unistr/u16-mbtouc-aux.lo
+	xmalloca.c xsize.h xstriconv.h xstriconv.c xvasprintf.h \
+	xvasprintf.c xasprintf.c
+@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__objects_3 = u8-conv-from-enc.lo
+@LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__objects_4 = u8-possible-linebreaks.lo
+@LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE@am__objects_5 = u8-width-linebreaks.lo
+@LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE@am__objects_6 = ulc-width-linebreaks.lo
+@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@am__objects_7 =  \
+@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@	u16-mbtouc.lo \
+@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@	u16-mbtouc-aux.lo
 @LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__objects_8 =  \
-@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@	unistr/u8-check.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@	u8-check.lo
 @LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__objects_9 =  \
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@	unistr/u8-mblen.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__objects_10 = unistr/u8-mbtouc.lo \
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@	unistr/u8-mbtouc-aux.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__objects_11 = unistr/u8-mbtouc-unsafe.lo \
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@	unistr/u8-mbtouc-unsafe-aux.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_12 = unistr/u8-mbtoucr.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__objects_13 =  \
-@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@	unistr/u8-prev.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_14 = unistr/u8-uctomb.lo \
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	unistr/u8-uctomb-aux.lo
-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_15 =  \
-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@	uniwidth/width.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@	u8-mblen.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__objects_10 =  \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@	u8-mbtouc.lo \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@	u8-mbtouc-aux.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__objects_11 = u8-mbtouc-unsafe.lo \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@	u8-mbtouc-unsafe-aux.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_12 =  \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@	u8-mbtoucr.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__objects_13 = u8-prev.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_14 =  \
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	u8-uctomb.lo \
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	u8-uctomb-aux.lo
+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_15 = width.lo
 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 localcharset.lo \
-	glthread/lock.lo malloca.lo mbswidth.lo ostream.lo progname.lo \
-	striconv.lo striconveh.lo striconveha.lo glthread/threadlib.lo \
-	glthread/tls.lo $(am__objects_3) unilbrk/lbrktables.lo \
-	$(am__objects_4) $(am__objects_5) unilbrk/ulc-common.lo \
-	$(am__objects_6) unistd.lo $(am__objects_7) $(am__objects_8) \
-	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
-	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
-	$(am__objects_15) wctype-h.lo xmalloc.lo xstrdup.lo \
-	xconcat-filename.lo xerror.lo xmalloca.lo xsize.lo \
-	xstriconv.lo xvasprintf.lo xasprintf.lo
+	error-progname.lo exitfail.lo file-ostream.lo fstrcmp.lo \
+	fwriteerror.lo gcd.lo hash.lo localcharset.lo lock.lo \
+	malloca.lo mbswidth.lo ostream.lo progname.lo striconv.lo \
+	striconveh.lo striconveha.lo threadlib.lo tls.lo \
+	$(am__objects_3) lbrktables.lo $(am__objects_4) \
+	$(am__objects_5) ulc-common.lo $(am__objects_6) \
+	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
+	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+	$(am__objects_13) $(am__objects_14) $(am__objects_15) \
+	xmalloc.lo xstrdup.lo xconcat-filename.lo xerror.lo \
+	xmalloca.lo xstriconv.lo xvasprintf.lo xasprintf.lo
 libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
 libgnu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgnu_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -539,49 +426,30 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgettextpo_la_SOURCES) $(libgnu_la_SOURCES) \
 	$(EXTRA_libgnu_la_SOURCES)
 DIST_SOURCES = $(am__libgettextpo_la_SOURCES_DIST) \
 	$(am__libgnu_la_SOURCES_DIST) $(EXTRA_libgnu_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 HEADERS = $(nodist_include_HEADERS) $(nodist_noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -590,7 +458,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -628,7 +495,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -665,18 +531,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -688,26 +553,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -715,8 +570,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -728,23 +581,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -767,7 +615,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -785,18 +632,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -821,47 +663,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -869,7 +703,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -879,21 +712,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -905,103 +734,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -1012,11 +788,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -1026,6 +797,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -1038,7 +810,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1059,16 +830,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -1091,48 +862,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -1155,6 +911,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1164,13 +921,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1179,47 +939,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1234,8 +963,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1275,7 +1002,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1297,8 +1023,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1306,13 +1032,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1325,21 +1049,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1352,9 +1074,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1378,9 +1100,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1394,12 +1114,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1407,8 +1124,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1420,41 +1135,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1468,27 +1171,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1496,34 +1186,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1539,9 +1220,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1561,8 +1240,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1571,8 +1248,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1587,7 +1262,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1638,6 +1312,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1645,7 +1320,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1655,54 +1329,46 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
 # Version information according to Woe32 conventions.
 
 # Special rules for installable include files that export variables.
 
 # Allow users to use "gnulib-tool --update".
-EXTRA_DIST = libgettextpo.rc gettext-po.in.h gnulib-m4/gnulib-cache.m4 \
-	alloca.in.h c-strcaseeq.h close.c concat-filename.h dosname.h \
-	errno.in.h error.c error.h exitfail.h fcntl.in.h fd-hook.h \
-	file-ostream.h file-ostream.c file_ostream.priv.h \
+EXTRA_DIST = libgettextpo.rc gettext-po.h.in gnulib-m4/gnulib-cache.m4 \
+	alloca.in.h $(top_srcdir)/../build-aux/arg-nonnull.h \
+	$(top_srcdir)/../build-aux/c++defs.h c-strcaseeq.h \
+	concat-filename.h errno.in.h error.c error.h exitfail.h \
+	fcntl.in.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 \
+	filename.h float.in.h fopen.c getdelim.c getline.c \
 	$(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 \
-	iconv_open-aix.gperf iconv_open-hpux.gperf \
-	iconv_open-irix.gperf iconv_open-osf.gperf \
-	iconv_open-solaris.gperf iconv_open.c intprops.h \
-	libunistring.valgrind config.charset ref-add.sin ref-del.sin \
-	malloc.c malloca.h malloca.valgrind mbrtowc.c mbsinit.c \
-	memchr.c memchr.valgrind moo.h \
-	$(top_srcdir)/../build-aux/moopp msvc-inval.c msvc-inval.h \
-	msvc-nothrow.c msvc-nothrow.h obstack.c obstack.h open.c \
+	iconv_open-osf.h iconv_open-solaris.h iconv_open-aix.gperf \
+	iconv_open-hpux.gperf iconv_open-irix.gperf \
+	iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c \
+	intprops.h libunistring.valgrind config.charset ref-add.sin \
+	ref-del.sin malloc.c malloca.h malloca.valgrind mbrtowc.c \
+	mbsinit.c memchr.c memchr.valgrind moo.h \
+	$(top_srcdir)/../build-aux/moopp obstack.c obstack.h open.c \
 	ostream.h ostream.c ostream.priv.h ostream.vt.h ostream.oo.c \
-	ostream.oo.h pathmax.h raise.c rawmemchr.c rawmemchr.valgrind \
-	realloc.c relocatable.c relocatable.h signal.in.h \
-	stdio-write.c sigprocmask.c \
-	$(top_srcdir)/../build-aux/snippet/_Noreturn.h \
-	$(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	$(top_srcdir)/../build-aux/snippet/c++defs.h \
-	$(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	$(top_srcdir)/../build-aux/snippet/warn-on-use.h stat.c \
-	stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \
-	stdlib.in.h stpcpy.c strchrnul.c strchrnul.valgrind streq.h \
-	strerror.c strerror-override.c strerror-override.h iconveh.h \
-	string.in.h str-two-way.h strstr.c sys_stat.in.h sys_time.in.h \
-	sys_types.in.h $(top_srcdir)/../build-aux/config.rpath \
+	ostream.oo.h realloc.c relocatable.c relocatable.h signal.in.h \
+	sigprocmask.c stat.c stdarg.in.h stdbool.in.h stddef.in.h \
+	stdint.in.h stdio-write.c stdio.in.h stdlib.in.h stpcpy.c \
+	streq.h strerror.c iconveh.h string.in.h str-two-way.h \
+	strstr.c sys_stat.in.h $(top_srcdir)/../build-aux/config.rpath \
 	time.in.h iconveh.h localcharset.h striconveha.h uniconv.in.h \
 	unilbrk.in.h unilbrk/lbrkprop1.h unilbrk/lbrkprop2.h \
 	unilbrk/lbrktables.h uniwidth/cjk.h unilbrk/ulc-common.h \
 	unistd.in.h unistr.in.h unitypes.in.h localcharset.h \
-	uniwidth.in.h uniwidth/cjk.h unlocked-io.h asnprintf.c \
+	uniwidth.in.h uniwidth/cjk.h unlocked-io.h \
+	$(top_srcdir)/../build-aux/unused-parameter.h asnprintf.c \
 	float+.h printf-args.c printf-args.h printf-parse.c \
 	printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \
-	vasprintf.c verify.h wchar.in.h wctype.in.h wcwidth.c \
-	concat-filename.h xmalloca.h xalloc.h
+	vasprintf.c $(top_srcdir)/../build-aux/warn-on-use.h \
+	wchar.in.h wctype.in.h wcwidth.c concat-filename.h xmalloca.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
@@ -1718,33 +1384,31 @@
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = gettext-po.h $(ALLOCA_H) configmake.h $(ERRNO_H) \
-	fcntl.h file-ostream.h file-ostream.c file_ostream.priv.h \
-	file_ostream.vt.h $(FLOAT_H) $(ICONV_H) iconv_open-aix.h \
-	iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h \
-	iconv_open-solaris.h ostream.h ostream.c ostream.priv.h \
-	ostream.vt.h signal.h arg-nonnull.h c++defs.h \
-	unused-parameter.h warn-on-use.h $(STDARG_H) $(STDBOOL_H) \
+BUILT_SOURCES = gettext-po.h $(ALLOCA_H) arg-nonnull.h c++defs.h \
+	configmake.h $(ERRNO_H) fcntl.h file-ostream.h file-ostream.c \
+	file_ostream.priv.h file_ostream.vt.h $(FLOAT_H) $(ICONV_H) \
+	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
+	iconv_open-osf.h iconv_open-solaris.h ostream.h ostream.c \
+	ostream.priv.h ostream.vt.h signal.h $(STDARG_H) $(STDBOOL_H) \
 	$(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h sys/stat.h \
-	sys/time.h sys/types.h time.h $(LIBUNISTRING_UNICONV_H) \
-	$(LIBUNISTRING_UNILBRK_H) unistd.h $(LIBUNISTRING_UNISTR_H) \
-	$(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) wchar.h \
-	wctype.h
+	time.h $(LIBUNISTRING_UNICONV_H) $(LIBUNISTRING_UNILBRK_H) \
+	unistd.h $(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \
+	$(LIBUNISTRING_UNIWIDTH_H) unused-parameter.h warn-on-use.h \
+	wchar.h wctype.h
 MOSTLYCLEANFILES = core *.stackdump $(am__append_3) 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 \
-	iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t \
-	signal.h signal.h-t 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 stdarg.h stdarg.h-t stdbool.h \
-	stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \
-	stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h \
-	sys/stat.h-t sys/time.h sys/time.h-t sys/types.h sys/types.h-t \
-	time.h time.h-t uniconv.h uniconv.h-t unilbrk.h unilbrk.h-t \
-	unistd.h unistd.h-t unistr.h unistr.h-t unitypes.h \
-	unitypes.h-t uniwidth.h uniwidth.h-t wchar.h wchar.h-t \
-	wctype.h wctype.h-t
+	config.h-t core *.stackdump alloca.h alloca.h-t arg-nonnull.h \
+	arg-nonnull.h-t c++defs.h c++defs.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 iconv_open-irix.h-t \
+	iconv_open-osf.h-t iconv_open-solaris.h-t signal.h signal.h-t \
+	stdarg.h stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t \
+	stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t \
+	string.h string.h-t sys/stat.h sys/stat.h-t time.h time.h-t \
+	uniconv.h uniconv.h-t unilbrk.h unilbrk.h-t unistd.h \
+	unistd.h-t unistr.h unistr.h-t unitypes.h unitypes.h-t \
+	uniwidth.h uniwidth.h-t unused-parameter.h \
+	unused-parameter.h-t warn-on-use.h warn-on-use.h-t wchar.h \
+	wchar.h-t wctype.h wctype.h-t
 MOSTLYCLEANDIRS = sys
 CLEANFILES = gettext-po.h configmake.h configmake.h-t charset.alias \
 	ref-add.sed ref-del.sed
@@ -1790,13 +1454,11 @@
   ../src/format-c.c \
   ../src/format-sh.c \
   ../src/format-python.c \
-  ../src/format-python-brace.c \
   ../src/format-lisp.c \
   ../src/format-elisp.c \
   ../src/format-librep.c \
   ../src/format-scheme.c \
   ../src/format-java.c \
-  ../src/format-javascript.c \
   ../src/format-csharp.c \
   ../src/format-awk.c \
   ../src/format-pascal.c \
@@ -1811,7 +1473,6 @@
   ../src/format-qt-plural.c \
   ../src/format-kde.c \
   ../src/format-boost.c \
-  ../src/format-lua.c \
   ../src/format.c \
   ../src/plural-exp.c \
   ../src/plural-eval.c \
@@ -1821,7 +1482,7 @@
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT = 5
-LTV_REVISION = 2
+LTV_REVISION = 1
 LTV_AGE = 5
 
 # How to build libgettextpo.la.
@@ -1830,57 +1491,42 @@
 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 @LTNOUNDEF@ $(am__append_2)
 @WOE32_FALSE@WOE32_LIBADD = 
 @WOE32_TRUE@WOE32_LIBADD = libgettextpo.res.lo
 libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \
 	c-strcase.h c-strcasecmp.c c-strncasecmp.c c-strstr.h \
 	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 localcharset.h localcharset.c glthread/lock.h \
+	error-progname.c exitfail.c file-ostream.c fstrcmp.h fstrcmp.c \
+	fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h hash.h \
+	hash.c localcharset.h localcharset.c glthread/lock.h \
 	glthread/lock.c malloca.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) unilbrk/lbrktables.c \
 	$(am__append_6) $(am__append_7) unilbrk/ulc-common.c \
-	$(am__append_8) unistd.c $(am__append_9) $(am__append_10) \
+	$(am__append_8) $(am__append_9) $(am__append_10) \
 	$(am__append_11) $(am__append_12) $(am__append_13) \
 	$(am__append_14) $(am__append_15) $(am__append_16) \
-	$(am__append_17) wctype-h.c xalloc.h xmalloc.c xstrdup.c \
+	$(am__append_17) verify.h xalloc.h xmalloc.c xstrdup.c \
 	xconcat-filename.c xerror.h xerror.c xmalloca.c xsize.h \
-	xsize.c xstriconv.h xstriconv.c xvasprintf.h xvasprintf.c \
-	xasprintf.c
+	xstriconv.h xstriconv.c xvasprintf.h xvasprintf.c xasprintf.c
 libgnu_la_LIBADD = $(gtpo_LTLIBOBJS)
 libgnu_la_DEPENDENCIES = $(gtpo_LTLIBOBJS)
-EXTRA_libgnu_la_SOURCES = close.c error.c file-ostream.oo.c float.c \
-	itold.c fopen.c fstat.c getdelim.c getline.c gettimeofday.c \
-	iconv.c iconv_close.c iconv_open.c malloc.c mbrtowc.c \
-	mbsinit.c memchr.c msvc-inval.c msvc-nothrow.c obstack.c \
-	open.c ostream.oo.c raise.c rawmemchr.c realloc.c \
-	relocatable.c stdio-write.c sigprocmask.c stat.c stpcpy.c \
-	strchrnul.c strerror.c strerror-override.c strstr.c \
-	asnprintf.c printf-args.c printf-parse.c vasnprintf.c \
+EXTRA_libgnu_la_SOURCES = error.c file-ostream.oo.c fopen.c getdelim.c \
+	getline.c iconv_open.c malloc.c mbrtowc.c mbsinit.c memchr.c \
+	obstack.c open.c ostream.oo.c realloc.c relocatable.c \
+	sigprocmask.c stat.c stdio-write.c stpcpy.c strerror.c \
+	strstr.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)
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+libgnu_la_LDFLAGS = $(AM_LDFLAGS) $(am__append_4)
+ARG_NONNULL_H = arg-nonnull.h
+CXXDEFS_H = c++defs.h
 GPERF = gperf
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 MOOPPFLAGS = 
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-_NORETURN_H = $(top_srcdir)/../build-aux/snippet/_Noreturn.h
-ARG_NONNULL_H = arg-nonnull.h
-CXXDEFS_H = c++defs.h
 UNUSED_PARAMETER_H = unused-parameter.h
 WARN_ON_USE_H = warn-on-use.h
 all: $(BUILT_SOURCES)
@@ -1909,7 +1555,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.gnulib:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1921,9 +1566,9 @@
 $(am__aclocal_m4_deps):
 exported.sh: $(top_builddir)/config.status $(srcdir)/exported.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -1931,8 +1576,6 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -1948,169 +1591,313 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-../src/$(am__dirstamp):
-	@$(MKDIR_P) ../src
-	@: > ../src/$(am__dirstamp)
-../src/str-list.lo: ../src/$(am__dirstamp)
-../src/dir-list.lo: ../src/$(am__dirstamp)
-../src/message.lo: ../src/$(am__dirstamp)
-../src/msgl-ascii.lo: ../src/$(am__dirstamp)
-../src/po-error.lo: ../src/$(am__dirstamp)
-../src/po-xerror.lo: ../src/$(am__dirstamp)
-../src/write-catalog.lo: ../src/$(am__dirstamp)
-../src/write-po.lo: ../src/$(am__dirstamp)
-../src/open-catalog.lo: ../src/$(am__dirstamp)
-../src/po-charset.lo: ../src/$(am__dirstamp)
-../src/po-lex.lo: ../src/$(am__dirstamp)
-../src/po-gram-gen.lo: ../src/$(am__dirstamp)
-../src/read-po.lo: ../src/$(am__dirstamp)
-../src/read-catalog-abstract.lo: ../src/$(am__dirstamp)
-../src/read-catalog.lo: ../src/$(am__dirstamp)
-../src/plural-table.lo: ../src/$(am__dirstamp)
-../src/format-c.lo: ../src/$(am__dirstamp)
-../src/format-sh.lo: ../src/$(am__dirstamp)
-../src/format-python.lo: ../src/$(am__dirstamp)
-../src/format-python-brace.lo: ../src/$(am__dirstamp)
-../src/format-lisp.lo: ../src/$(am__dirstamp)
-../src/format-elisp.lo: ../src/$(am__dirstamp)
-../src/format-librep.lo: ../src/$(am__dirstamp)
-../src/format-scheme.lo: ../src/$(am__dirstamp)
-../src/format-java.lo: ../src/$(am__dirstamp)
-../src/format-javascript.lo: ../src/$(am__dirstamp)
-../src/format-csharp.lo: ../src/$(am__dirstamp)
-../src/format-awk.lo: ../src/$(am__dirstamp)
-../src/format-pascal.lo: ../src/$(am__dirstamp)
-../src/format-ycp.lo: ../src/$(am__dirstamp)
-../src/format-tcl.lo: ../src/$(am__dirstamp)
-../src/format-perl.lo: ../src/$(am__dirstamp)
-../src/format-perl-brace.lo: ../src/$(am__dirstamp)
-../src/format-php.lo: ../src/$(am__dirstamp)
-../src/format-gcc-internal.lo: ../src/$(am__dirstamp)
-../src/format-gfc-internal.lo: ../src/$(am__dirstamp)
-../src/format-qt.lo: ../src/$(am__dirstamp)
-../src/format-qt-plural.lo: ../src/$(am__dirstamp)
-../src/format-kde.lo: ../src/$(am__dirstamp)
-../src/format-boost.lo: ../src/$(am__dirstamp)
-../src/format-lua.lo: ../src/$(am__dirstamp)
-../src/format.lo: ../src/$(am__dirstamp)
-../src/plural-exp.lo: ../src/$(am__dirstamp)
-../src/plural-eval.lo: ../src/$(am__dirstamp)
-../src/msgl-check.lo: ../src/$(am__dirstamp)
-../woe32dll/$(am__dirstamp):
-	@$(MKDIR_P) ../woe32dll
-	@: > ../woe32dll/$(am__dirstamp)
-../woe32dll/gettextpo-exports.lo: ../woe32dll/$(am__dirstamp)
-
-libgettextpo.la: $(libgettextpo_la_OBJECTS) $(libgettextpo_la_DEPENDENCIES) $(EXTRA_libgettextpo_la_DEPENDENCIES) 
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libgettextpo.la: $(libgettextpo_la_OBJECTS) $(libgettextpo_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgettextpo_la_LINK) -rpath $(libdir) $(libgettextpo_la_OBJECTS) $(libgettextpo_la_LIBADD) $(LIBS)
-glthread/$(am__dirstamp):
-	@$(MKDIR_P) glthread
-	@: > glthread/$(am__dirstamp)
-glthread/lock.lo: glthread/$(am__dirstamp)
-glthread/threadlib.lo: glthread/$(am__dirstamp)
-glthread/tls.lo: glthread/$(am__dirstamp)
-uniconv/$(am__dirstamp):
-	@$(MKDIR_P) uniconv
-	@: > uniconv/$(am__dirstamp)
-uniconv/u8-conv-from-enc.lo: uniconv/$(am__dirstamp)
-unilbrk/$(am__dirstamp):
-	@$(MKDIR_P) unilbrk
-	@: > unilbrk/$(am__dirstamp)
-unilbrk/lbrktables.lo: unilbrk/$(am__dirstamp)
-unilbrk/u8-possible-linebreaks.lo: unilbrk/$(am__dirstamp)
-unilbrk/u8-width-linebreaks.lo: unilbrk/$(am__dirstamp)
-unilbrk/ulc-common.lo: unilbrk/$(am__dirstamp)
-unilbrk/ulc-width-linebreaks.lo: unilbrk/$(am__dirstamp)
-unistr/$(am__dirstamp):
-	@$(MKDIR_P) unistr
-	@: > unistr/$(am__dirstamp)
-unistr/u16-mbtouc.lo: unistr/$(am__dirstamp)
-unistr/u16-mbtouc-aux.lo: unistr/$(am__dirstamp)
-unistr/u8-check.lo: unistr/$(am__dirstamp)
-unistr/u8-mblen.lo: unistr/$(am__dirstamp)
-unistr/u8-mbtouc.lo: unistr/$(am__dirstamp)
-unistr/u8-mbtouc-aux.lo: unistr/$(am__dirstamp)
-unistr/u8-mbtouc-unsafe.lo: unistr/$(am__dirstamp)
-unistr/u8-mbtouc-unsafe-aux.lo: unistr/$(am__dirstamp)
-unistr/u8-mbtoucr.lo: unistr/$(am__dirstamp)
-unistr/u8-prev.lo: unistr/$(am__dirstamp)
-unistr/u8-uctomb.lo: unistr/$(am__dirstamp)
-unistr/u8-uctomb-aux.lo: unistr/$(am__dirstamp)
-uniwidth/$(am__dirstamp):
-	@$(MKDIR_P) uniwidth
-	@: > uniwidth/$(am__dirstamp)
-uniwidth/width.lo: uniwidth/$(am__dirstamp)
-
-libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES) 
+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgnu_la_LINK)  $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../src/*.$(OBJEXT)
-	-rm -f ../src/*.lo
-	-rm -f ../woe32dll/*.$(OBJEXT)
-	-rm -f ../woe32dll/*.lo
-	-rm -f glthread/*.$(OBJEXT)
-	-rm -f glthread/*.lo
-	-rm -f uniconv/*.$(OBJEXT)
-	-rm -f uniconv/*.lo
-	-rm -f unilbrk/*.$(OBJEXT)
-	-rm -f unilbrk/*.lo
-	-rm -f unistr/*.$(OBJEXT)
-	-rm -f unistr/*.lo
-	-rm -f uniwidth/*.$(OBJEXT)
-	-rm -f uniwidth/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
+
+str-list.lo: ../src/str-list.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o str-list.lo `test -f '../src/str-list.c' || echo '$(srcdir)/'`../src/str-list.c
+
+dir-list.lo: ../src/dir-list.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir-list.lo `test -f '../src/dir-list.c' || echo '$(srcdir)/'`../src/dir-list.c
+
+message.lo: ../src/message.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o message.lo `test -f '../src/message.c' || echo '$(srcdir)/'`../src/message.c
+
+msgl-ascii.lo: ../src/msgl-ascii.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgl-ascii.lo `test -f '../src/msgl-ascii.c' || echo '$(srcdir)/'`../src/msgl-ascii.c
+
+po-error.lo: ../src/po-error.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o po-error.lo `test -f '../src/po-error.c' || echo '$(srcdir)/'`../src/po-error.c
+
+po-xerror.lo: ../src/po-xerror.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o po-xerror.lo `test -f '../src/po-xerror.c' || echo '$(srcdir)/'`../src/po-xerror.c
+
+write-catalog.lo: ../src/write-catalog.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o write-catalog.lo `test -f '../src/write-catalog.c' || echo '$(srcdir)/'`../src/write-catalog.c
+
+write-po.lo: ../src/write-po.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o write-po.lo `test -f '../src/write-po.c' || echo '$(srcdir)/'`../src/write-po.c
+
+open-catalog.lo: ../src/open-catalog.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o open-catalog.lo `test -f '../src/open-catalog.c' || echo '$(srcdir)/'`../src/open-catalog.c
+
+po-charset.lo: ../src/po-charset.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o po-charset.lo `test -f '../src/po-charset.c' || echo '$(srcdir)/'`../src/po-charset.c
+
+po-lex.lo: ../src/po-lex.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o po-lex.lo `test -f '../src/po-lex.c' || echo '$(srcdir)/'`../src/po-lex.c
+
+po-gram-gen.lo: ../src/po-gram-gen.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o po-gram-gen.lo `test -f '../src/po-gram-gen.c' || echo '$(srcdir)/'`../src/po-gram-gen.c
+
+read-po.lo: ../src/read-po.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read-po.lo `test -f '../src/read-po.c' || echo '$(srcdir)/'`../src/read-po.c
+
+read-catalog-abstract.lo: ../src/read-catalog-abstract.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read-catalog-abstract.lo `test -f '../src/read-catalog-abstract.c' || echo '$(srcdir)/'`../src/read-catalog-abstract.c
+
+read-catalog.lo: ../src/read-catalog.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read-catalog.lo `test -f '../src/read-catalog.c' || echo '$(srcdir)/'`../src/read-catalog.c
+
+plural-table.lo: ../src/plural-table.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plural-table.lo `test -f '../src/plural-table.c' || echo '$(srcdir)/'`../src/plural-table.c
+
+format-c.lo: ../src/format-c.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-c.lo `test -f '../src/format-c.c' || echo '$(srcdir)/'`../src/format-c.c
+
+format-sh.lo: ../src/format-sh.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-sh.lo `test -f '../src/format-sh.c' || echo '$(srcdir)/'`../src/format-sh.c
+
+format-python.lo: ../src/format-python.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-python.lo `test -f '../src/format-python.c' || echo '$(srcdir)/'`../src/format-python.c
+
+format-lisp.lo: ../src/format-lisp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-lisp.lo `test -f '../src/format-lisp.c' || echo '$(srcdir)/'`../src/format-lisp.c
+
+format-elisp.lo: ../src/format-elisp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-elisp.lo `test -f '../src/format-elisp.c' || echo '$(srcdir)/'`../src/format-elisp.c
+
+format-librep.lo: ../src/format-librep.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-librep.lo `test -f '../src/format-librep.c' || echo '$(srcdir)/'`../src/format-librep.c
+
+format-scheme.lo: ../src/format-scheme.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-scheme.lo `test -f '../src/format-scheme.c' || echo '$(srcdir)/'`../src/format-scheme.c
+
+format-java.lo: ../src/format-java.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-java.lo `test -f '../src/format-java.c' || echo '$(srcdir)/'`../src/format-java.c
+
+format-csharp.lo: ../src/format-csharp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-csharp.lo `test -f '../src/format-csharp.c' || echo '$(srcdir)/'`../src/format-csharp.c
+
+format-awk.lo: ../src/format-awk.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-awk.lo `test -f '../src/format-awk.c' || echo '$(srcdir)/'`../src/format-awk.c
+
+format-pascal.lo: ../src/format-pascal.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-pascal.lo `test -f '../src/format-pascal.c' || echo '$(srcdir)/'`../src/format-pascal.c
+
+format-ycp.lo: ../src/format-ycp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-ycp.lo `test -f '../src/format-ycp.c' || echo '$(srcdir)/'`../src/format-ycp.c
+
+format-tcl.lo: ../src/format-tcl.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-tcl.lo `test -f '../src/format-tcl.c' || echo '$(srcdir)/'`../src/format-tcl.c
+
+format-perl.lo: ../src/format-perl.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-perl.lo `test -f '../src/format-perl.c' || echo '$(srcdir)/'`../src/format-perl.c
+
+format-perl-brace.lo: ../src/format-perl-brace.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-perl-brace.lo `test -f '../src/format-perl-brace.c' || echo '$(srcdir)/'`../src/format-perl-brace.c
+
+format-php.lo: ../src/format-php.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-php.lo `test -f '../src/format-php.c' || echo '$(srcdir)/'`../src/format-php.c
+
+format-gcc-internal.lo: ../src/format-gcc-internal.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-gcc-internal.lo `test -f '../src/format-gcc-internal.c' || echo '$(srcdir)/'`../src/format-gcc-internal.c
+
+format-gfc-internal.lo: ../src/format-gfc-internal.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-gfc-internal.lo `test -f '../src/format-gfc-internal.c' || echo '$(srcdir)/'`../src/format-gfc-internal.c
+
+format-qt.lo: ../src/format-qt.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-qt.lo `test -f '../src/format-qt.c' || echo '$(srcdir)/'`../src/format-qt.c
+
+format-qt-plural.lo: ../src/format-qt-plural.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-qt-plural.lo `test -f '../src/format-qt-plural.c' || echo '$(srcdir)/'`../src/format-qt-plural.c
+
+format-kde.lo: ../src/format-kde.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-kde.lo `test -f '../src/format-kde.c' || echo '$(srcdir)/'`../src/format-kde.c
+
+format-boost.lo: ../src/format-boost.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format-boost.lo `test -f '../src/format-boost.c' || echo '$(srcdir)/'`../src/format-boost.c
+
+format.lo: ../src/format.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o format.lo `test -f '../src/format.c' || echo '$(srcdir)/'`../src/format.c
+
+plural-exp.lo: ../src/plural-exp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plural-exp.lo `test -f '../src/plural-exp.c' || echo '$(srcdir)/'`../src/plural-exp.c
+
+plural-eval.lo: ../src/plural-eval.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plural-eval.lo `test -f '../src/plural-eval.c' || echo '$(srcdir)/'`../src/plural-eval.c
+
+msgl-check.lo: ../src/msgl-check.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgl-check.lo `test -f '../src/msgl-check.c' || echo '$(srcdir)/'`../src/msgl-check.c
+
+gettextpo-exports.lo: ../woe32dll/gettextpo-exports.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gettextpo-exports.lo `test -f '../woe32dll/gettextpo-exports.c' || echo '$(srcdir)/'`../woe32dll/gettextpo-exports.c
+
+lock.lo: glthread/lock.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lock.lo `test -f 'glthread/lock.c' || echo '$(srcdir)/'`glthread/lock.c
+
+threadlib.lo: glthread/threadlib.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o threadlib.lo `test -f 'glthread/threadlib.c' || echo '$(srcdir)/'`glthread/threadlib.c
+
+tls.lo: glthread/tls.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tls.lo `test -f 'glthread/tls.c' || echo '$(srcdir)/'`glthread/tls.c
+
+u8-conv-from-enc.lo: uniconv/u8-conv-from-enc.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-conv-from-enc.lo `test -f 'uniconv/u8-conv-from-enc.c' || echo '$(srcdir)/'`uniconv/u8-conv-from-enc.c
+
+lbrktables.lo: unilbrk/lbrktables.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbrktables.lo `test -f 'unilbrk/lbrktables.c' || echo '$(srcdir)/'`unilbrk/lbrktables.c
+
+u8-possible-linebreaks.lo: unilbrk/u8-possible-linebreaks.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-possible-linebreaks.lo `test -f 'unilbrk/u8-possible-linebreaks.c' || echo '$(srcdir)/'`unilbrk/u8-possible-linebreaks.c
+
+u8-width-linebreaks.lo: unilbrk/u8-width-linebreaks.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-width-linebreaks.lo `test -f 'unilbrk/u8-width-linebreaks.c' || echo '$(srcdir)/'`unilbrk/u8-width-linebreaks.c
+
+ulc-common.lo: unilbrk/ulc-common.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ulc-common.lo `test -f 'unilbrk/ulc-common.c' || echo '$(srcdir)/'`unilbrk/ulc-common.c
+
+ulc-width-linebreaks.lo: unilbrk/ulc-width-linebreaks.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ulc-width-linebreaks.lo `test -f 'unilbrk/ulc-width-linebreaks.c' || echo '$(srcdir)/'`unilbrk/ulc-width-linebreaks.c
+
+u16-mbtouc.lo: unistr/u16-mbtouc.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u16-mbtouc.lo `test -f 'unistr/u16-mbtouc.c' || echo '$(srcdir)/'`unistr/u16-mbtouc.c
+
+u16-mbtouc-aux.lo: unistr/u16-mbtouc-aux.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u16-mbtouc-aux.lo `test -f 'unistr/u16-mbtouc-aux.c' || echo '$(srcdir)/'`unistr/u16-mbtouc-aux.c
+
+u8-check.lo: unistr/u8-check.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-check.lo `test -f 'unistr/u8-check.c' || echo '$(srcdir)/'`unistr/u8-check.c
+
+u8-mblen.lo: unistr/u8-mblen.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mblen.lo `test -f 'unistr/u8-mblen.c' || echo '$(srcdir)/'`unistr/u8-mblen.c
+
+u8-mbtouc.lo: unistr/u8-mbtouc.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtouc.lo `test -f 'unistr/u8-mbtouc.c' || echo '$(srcdir)/'`unistr/u8-mbtouc.c
+
+u8-mbtouc-aux.lo: unistr/u8-mbtouc-aux.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtouc-aux.lo `test -f 'unistr/u8-mbtouc-aux.c' || echo '$(srcdir)/'`unistr/u8-mbtouc-aux.c
+
+u8-mbtouc-unsafe.lo: unistr/u8-mbtouc-unsafe.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtouc-unsafe.lo `test -f 'unistr/u8-mbtouc-unsafe.c' || echo '$(srcdir)/'`unistr/u8-mbtouc-unsafe.c
+
+u8-mbtouc-unsafe-aux.lo: unistr/u8-mbtouc-unsafe-aux.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtouc-unsafe-aux.lo `test -f 'unistr/u8-mbtouc-unsafe-aux.c' || echo '$(srcdir)/'`unistr/u8-mbtouc-unsafe-aux.c
+
+u8-mbtoucr.lo: unistr/u8-mbtoucr.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtoucr.lo `test -f 'unistr/u8-mbtoucr.c' || echo '$(srcdir)/'`unistr/u8-mbtoucr.c
+
+u8-prev.lo: unistr/u8-prev.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-prev.lo `test -f 'unistr/u8-prev.c' || echo '$(srcdir)/'`unistr/u8-prev.c
+
+u8-uctomb.lo: unistr/u8-uctomb.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-uctomb.lo `test -f 'unistr/u8-uctomb.c' || echo '$(srcdir)/'`unistr/u8-uctomb.c
+
+u8-uctomb-aux.lo: unistr/u8-uctomb-aux.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8-uctomb-aux.lo `test -f 'unistr/u8-uctomb-aux.c' || echo '$(srcdir)/'`unistr/u8-uctomb-aux.c
+
+width.lo: uniwidth/width.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o width.lo `test -f 'uniwidth/width.c' || echo '$(srcdir)/'`uniwidth/width.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-	-rm -rf ../src/.libs ../src/_libs
-	-rm -rf ../woe32dll/.libs ../woe32dll/_libs
-	-rm -rf glthread/.libs glthread/_libs
-	-rm -rf uniconv/.libs uniconv/_libs
-	-rm -rf unilbrk/.libs unilbrk/_libs
-	-rm -rf unistr/.libs unistr/_libs
-	-rm -rf uniwidth/.libs uniwidth/_libs
 install-nodist_includeHEADERS: $(nodist_include_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -2124,17 +1911,30 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -2146,11 +1946,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -2159,21 +1963,6 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -2227,15 +2016,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -2245,13 +2029,6 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../src/$(am__dirstamp)
-	-rm -f ../woe32dll/$(am__dirstamp)
-	-rm -f glthread/$(am__dirstamp)
-	-rm -f uniconv/$(am__dirstamp)
-	-rm -f unilbrk/$(am__dirstamp)
-	-rm -f unistr/$(am__dirstamp)
-	-rm -f uniwidth/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -2331,21 +2108,21 @@
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-html install-html-am install-info install-info-am \
+	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man \
 	install-nodist_includeHEADERS install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-libLTLIBRARIES uninstall-local \
 	uninstall-nodist_includeHEADERS
 
@@ -2397,24 +2174,51 @@
 	    exit 1; \
 	  fi \
 	fi
-gettext-po.h: gettext-po.in.h
-@WOE32DLL_TRUE@	sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/' $(srcdir)/gettext-po.in.h > gettext-po.h-tmp
-@WOE32DLL_FALSE@	cp $(srcdir)/gettext-po.in.h gettext-po.h-tmp
+gettext-po.h: gettext-po.h.in
+@WOE32DLL_TRUE@	sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/' $(srcdir)/gettext-po.h.in > gettext-po.h-tmp
+@WOE32DLL_FALSE@	cp $(srcdir)/gettext-po.h.in gettext-po.h-tmp
 	mv gettext-po.h-tmp gettext-po.h
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ALLOCA_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_ALLOCA_H_TRUE@	  cat $(srcdir)/alloca.in.h; \
-@GL_GENERATE_ALLOCA_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ALLOCA_H_TRUE@	mv -f $@-t $@
-@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
-@GL_GENERATE_ALLOCA_H_FALSE@	rm -f $@
+alloca.h: alloca.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/../build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/../build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
@@ -2430,7 +2234,6 @@
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -2449,44 +2252,41 @@
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ERRNO_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ERRNO_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
-@GL_GENERATE_ERRNO_H_TRUE@	      < $(srcdir)/errno.in.h; \
-@GL_GENERATE_ERRNO_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ERRNO_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status
-@GL_GENERATE_ERRNO_H_FALSE@	rm -f $@
+errno.h: errno.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
+	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
+	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
+	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
+	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
+	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
+	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
+	      < $(srcdir)/errno.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-	      -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
-	      -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
-	      -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
+	      -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
 	      -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
 	      -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
 	      -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
@@ -2517,44 +2317,34 @@
 
 # We need the following in order to create <float.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_FLOAT_H_TRUE@float.h: float.in.h $(top_builddir)/config.status
-@GL_GENERATE_FLOAT_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_FLOAT_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_FLOAT_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
-@GL_GENERATE_FLOAT_H_TRUE@	      < $(srcdir)/float.in.h; \
-@GL_GENERATE_FLOAT_H_TRUE@	} > $@-t && \
-@GL_GENERATE_FLOAT_H_TRUE@	mv $@-t $@
-@GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status
-@GL_GENERATE_FLOAT_H_FALSE@	rm -f $@
+float.h: float.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
+	      < $(srcdir)/float.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@GL_GENERATE_ICONV_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_ICONV_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_ICONV_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-@GL_GENERATE_ICONV_H_TRUE@	      < $(srcdir)/iconv.in.h; \
-@GL_GENERATE_ICONV_H_TRUE@	} > $@-t && \
-@GL_GENERATE_ICONV_H_TRUE@	mv $@-t $@
-@GL_GENERATE_ICONV_H_FALSE@iconv.h: $(top_builddir)/config.status
-@GL_GENERATE_ICONV_H_FALSE@	rm -f $@
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
+	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
+	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
+	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
+	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/iconv.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
@@ -2649,222 +2439,147 @@
 
 # We need the following in order to create <signal.h> when the system
 # doesn't have a complete one.
-signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
-	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
+	      -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
+	      -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
 	      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
-	      -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
 	      -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
 	      -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
 	      -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
 	      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
 	      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-	      -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
-	      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/signal.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/../build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/../build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
 
 # We need the following in order to create <stdarg.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDARG_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDARG_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_STDARG_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
-@GL_GENERATE_STDARG_H_TRUE@	      < $(srcdir)/stdarg.in.h; \
-@GL_GENERATE_STDARG_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDARG_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status
-@GL_GENERATE_STDARG_H_FALSE@	rm -f $@
+stdarg.h: stdarg.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
+	      < $(srcdir)/stdarg.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDBOOL_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDBOOL_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_STDBOOL_H_TRUE@	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
-@GL_GENERATE_STDBOOL_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDBOOL_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status
-@GL_GENERATE_STDBOOL_H_FALSE@	rm -f $@
+stdbool.h: stdbool.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDDEF_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDDEF_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-@GL_GENERATE_STDDEF_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
-@GL_GENERATE_STDDEF_H_TRUE@	      < $(srcdir)/stddef.in.h; \
-@GL_GENERATE_STDDEF_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDDEF_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status
-@GL_GENERATE_STDDEF_H_FALSE@	rm -f $@
+stddef.h: stddef.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+	      < $(srcdir)/stddef.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDINT_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_STDINT_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_STDINT_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-@GL_GENERATE_STDINT_H_TRUE@	      < $(srcdir)/stdint.in.h; \
-@GL_GENERATE_STDINT_H_TRUE@	} > $@-t && \
-@GL_GENERATE_STDINT_H_TRUE@	mv $@-t $@
-@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status
-@GL_GENERATE_STDINT_H_FALSE@	rm -f $@
+stdint.h: stdint.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
-	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
-	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
-	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
-	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
-	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
-	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
-	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
-	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
-	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
-	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
-	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
-	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
-	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
-	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
-	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
-	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
-	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
-	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
-	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
-	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
-	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
-	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
-	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
-	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
-	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
-	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
-	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
-	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
-	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
-	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
-	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
-	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
-	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
-	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
-	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
-	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+	      -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+	      -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+	      -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+	      -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+	      -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      < $(srcdir)/stdio.in.h | \
 	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
-	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -2873,14 +2588,11 @@
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
 	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
-	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
-	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -2901,7 +2613,6 @@
 	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
 	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
@@ -2919,151 +2630,120 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+	      -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+	      -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+	      -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
 	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
 	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-	      -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-	      -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-	      -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-	      -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-	      -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-	      -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-	      -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-	      -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-	      -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-	      -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-	      -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-	      -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-	      -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-	      -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-	      -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-	      -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-	      -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-	      -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-	      -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-	      -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-	      -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-	      -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-	      -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-	      -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-	      -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-	      -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-	      -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-	      -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-	      -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-	      -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-	      -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-	      -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-	      -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-	      -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+	  sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -3079,18 +2759,15 @@
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-	      -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
 	      -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
 	      -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -3106,29 +2783,25 @@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+	      -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+	      -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+	      -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+	      -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+	      -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+	      -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+	      -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+	      -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+	      -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+	      -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+	      -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -3156,69 +2829,23 @@
 	} > $@-t && \
 	mv $@-t $@
 
-# We need the following in order to create <sys/time.h> when the system
-# doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
-	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(srcdir)/sys_time.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) sys
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      < $(srcdir)/sys_types.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
-	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
-	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
-	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
-	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
+	      -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+	      -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+	      -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+	      -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+	      -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+	      -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
-	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
-	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -3249,65 +2876,53 @@
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
-	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
-	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
-	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
-	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
-	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
-	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
-	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
-	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
-	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
-	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
-	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
-	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
-	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
-	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
-	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
-	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
-	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
-	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
-	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
-	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
-	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_GTPO_UNISTD_H_GETOPT)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
-	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
-	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
-	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+	      -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+	      -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+	      -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+	      -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+	      -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+	      -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+	      -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+	      -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+	      -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+	      -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+	      -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+	      -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      < $(srcdir)/unistd.in.h | \
 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -3316,62 +2931,48 @@
 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
-	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
-	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
-	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
-	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
-	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
-	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
@@ -3409,60 +3010,45 @@
 	  cat $(srcdir)/uniwidth.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/../build-aux/unused-parameter.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+	  < $(top_srcdir)/../build-aux/unused-parameter.h \
+	  > $@-t && \
+	mv $@-t $@
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-	      -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-	      -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-	      -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-	      -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-	      -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-	      -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-	      -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-	      -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-	      -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-	      -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-	      -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-	      -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-	      -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-	      -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-	      -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-	      -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-	      -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-	      -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-	      -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-	      -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-	      -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-	      -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-	      -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-	      -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-	      -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-	      -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-	      -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-	      -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-	      -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-	      -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -3472,38 +3058,9 @@
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-	      -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-	      -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-	      -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-	      -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-	      -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-	      -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-	      -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-	      -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-	      -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-	      -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-	      -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-	      -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-	      -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-	      -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-	      -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-	      -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-	      -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -3515,37 +3072,26 @@
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GTPO|g' \
-	      -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
-	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-	      -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-	      -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
 	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-	      -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
-	      -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-	      -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/wctype.in.h; \
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/malloca.c gettext-0.18.1.1/gettext-tools/libgettextpo/malloca.c
--- gettext-0.19.3/gettext-tools/libgettextpo/malloca.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/malloca.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,18 +13,14 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
 #include "malloca.h"
 
-#include <stdint.h>
-
-#include "verify.h"
-
 /* The speed critical point in this file is freea() applied to an alloca()
    result: it must be fast, to match the speed of alloca().  The speed of
    mmalloca() and freea() in the other case are not critical, because they
@@ -49,18 +45,13 @@
 #define MAGIC_SIZE sizeof (int)
 /* This is how the header info would look like without any alignment
    considerations.  */
-struct preliminary_header { void *next; int magic; };
+struct preliminary_header { void *next; char room[MAGIC_SIZE]; };
 /* But the header's size must be a multiple of sa_alignment_max.  */
 #define HEADER_SIZE \
   (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
-union header {
-  void *next;
-  struct {
-    char room[HEADER_SIZE - MAGIC_SIZE];
-    int word;
-  } magic;
-};
-verify (HEADER_SIZE == sizeof (union header));
+struct header { void *next; char room[HEADER_SIZE - sizeof (struct preliminary_header) + MAGIC_SIZE]; };
+/* Verify that HEADER_SIZE == sizeof (struct header).  */
+typedef int verify1[2 * (HEADER_SIZE == sizeof (struct header)) - 1];
 /* We make the hash table quite big, so that during lookups the probability
    of empty hash buckets is quite high.  There is no need to make the hash
    table resizable, because when the hash table gets filled so much that the
@@ -80,21 +71,20 @@
 
   if (nplus >= n)
     {
-      void *p = malloc (nplus);
+      char *p = (char *) malloc (nplus);
 
       if (p != NULL)
         {
           size_t slot;
-          union header *h = p;
 
-          p = h + 1;
+          p += HEADER_SIZE;
 
           /* Put a magic number into the indicator word.  */
-          h->magic.word = MAGIC_NUMBER;
+          ((int *) p)[-1] = MAGIC_NUMBER;
 
           /* Enter p into the hash table.  */
-          slot = (uintptr_t) p % HASH_TABLE_SIZE;
-          h->next = mmalloca_results[slot];
+          slot = (unsigned long) p % HASH_TABLE_SIZE;
+          ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
           mmalloca_results[slot] = p;
 
           return p;
@@ -126,21 +116,19 @@
         {
           /* Looks like a mmalloca() result.  To see whether it really is one,
              perform a lookup in the hash table.  */
-          size_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
+          size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
           void **chain = &mmalloca_results[slot];
           for (; *chain != NULL;)
             {
-              union header *h = p;
               if (*chain == p)
                 {
                   /* Found it.  Remove it from the hash table and free it.  */
-                  union header *p_begin = h - 1;
-                  *chain = p_begin->next;
+                  char *p_begin = (char *) p - HEADER_SIZE;
+                  *chain = ((struct header *) p_begin)->next;
                   free (p_begin);
                   return;
                 }
-              h = *chain;
-              chain = &h[-1].next;
+              chain = &((struct header *) ((char *) *chain - HEADER_SIZE))->next;
             }
         }
       /* At this point, we know it was not a mmalloca() result.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/malloca.h gettext-0.18.1.1/gettext-tools/libgettextpo/malloca.h
--- gettext-0.19.3/gettext-tools/libgettextpo/malloca.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/malloca.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MALLOCA_H
 #define _MALLOCA_H
@@ -42,7 +43,7 @@
    and a page size can be as small as 4096 bytes.  So we cannot safely
    allocate anything larger than 4096 bytes.  Also care for the possibility
    of a few compiler-allocated temporary stack slots.
-   This must be a macro, not a function.  */
+   This must be a macro, not an inline function.  */
 # define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
 #else
 # define safe_alloca(N) ((void) (N), NULL)
@@ -92,7 +93,7 @@
 /* ------------------- Auxiliary, non-public definitions ------------------- */
 
 /* Determine the alignment of a type at compile time.  */
-#if defined __GNUC__ || defined __IBM__ALIGNOF__
+#if defined __GNUC__
 # define sa_alignof __alignof__
 #elif defined __cplusplus
   template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/malloc.c gettext-0.18.1.1/gettext-tools/libgettextpo/malloc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/malloc.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/malloc.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,25 +13,26 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering and Bruno Haible */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 /* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
 #ifdef malloc
-# define NEED_MALLOC_GNU 1
+# define NEED_MALLOC_GNU
 # undef malloc
-/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
-#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU
-# define NEED_MALLOC_GNU 1
 #endif
 
+/* Specification.  */
 #include <stdlib.h>
 
 #include <errno.h>
 
+/* Call the system's malloc below.  */
+#undef malloc
+
 /* Allocate an N-byte block of memory from the heap.
    If N is zero, allocate a 1-byte block.  */
 
@@ -40,7 +41,7 @@
 {
   void *result;
 
-#if NEED_MALLOC_GNU
+#ifdef NEED_MALLOC_GNU
   if (n == 0)
     n = 1;
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/mbrtowc.c gettext-0.18.1.1/gettext-tools/libgettextpo/mbrtowc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/mbrtowc.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/mbrtowc.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -40,6 +40,9 @@
 {
   char *pstate = (char *)ps;
 
+  if (pstate == NULL)
+    pstate = internal_state;
+
   if (s == NULL)
     {
       pwc = NULL;
@@ -51,10 +54,6 @@
     return (size_t)(-2);
 
   /* Here n > 0.  */
-
-  if (pstate == NULL)
-    pstate = internal_state;
-
   {
     size_t nstate = pstate[0];
     char buf[4];
@@ -92,7 +91,7 @@
 
     /* Here m > 0.  */
 
-# if __GLIBC__ || defined __UCLIBC__
+# if __GLIBC__
     /* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
     mbtowc (NULL, NULL, 0);
 # endif
@@ -128,7 +127,7 @@
       {
         const char *encoding = locale_charset ();
 
-        if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+        if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
           {
             /* Cf. unistr/u8-mblen.c.  */
             unsigned char c = (unsigned char) p[0];
@@ -185,8 +184,7 @@
         /* As a reference for this code, you can use the GNU libiconv
            implementation.  Look for uses of the RET_TOOFEW macro.  */
 
-        if (STREQ_OPT (encoding,
-                       "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
+        if (STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
           {
             if (m == 1)
               {
@@ -209,12 +207,9 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-            || STREQ_OPT (encoding,
-                          "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-            || STREQ_OPT (encoding,
-                          "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
+        if (STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+            || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+            || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
           {
             if (m == 1)
               {
@@ -225,8 +220,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
+        if (STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
           {
             if (m == 1)
               {
@@ -244,8 +238,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding,
-                       "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
+        if (STREQ (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
           {
             if (m == 1)
               {
@@ -278,7 +271,7 @@
               }
             goto invalid;
           }
-        if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
+        if (STREQ (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
           {
             if (m == 1)
               {
@@ -328,7 +321,7 @@
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
-# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
+# if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG
   if (s == NULL)
     {
       pwc = NULL;
@@ -337,16 +330,11 @@
     }
 # endif
 
-# if MBRTOWC_EMPTY_INPUT_BUG
-  if (n == 0)
-    return (size_t) -2;
-# endif
-
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
 
-    /* Override mbrtowc's internal state.  We cannot call mbsinit() on the
+    /* Override mbrtowc's internal state.  We can not call mbsinit() on the
        hidden internal state, but we can call it on our variable.  */
     if (ps == NULL)
       ps = &internal_state;
@@ -391,16 +379,7 @@
     return ret;
   }
 # else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
-
-    return mbrtowc (pwc, s, n, ps);
-  }
+  return mbrtowc (pwc, s, n, ps);
 # endif
 }
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/mbsinit.c gettext-0.18.1.1/gettext-tools/libgettextpo/mbsinit.c
--- gettext-0.19.3/gettext-tools/libgettextpo/mbsinit.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/mbsinit.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,18 +22,6 @@
 
 #include "verify.h"
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-
-/* On native Windows, 'mbstate_t' is defined as 'int'.  */
-
-int
-mbsinit (const mbstate_t *ps)
-{
-  return ps == NULL || *ps == 0;
-}
-
-#else
-
 /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
    and wcrtomb(), wcsrtombs().
    We assume that
@@ -55,7 +43,5 @@
 {
   const char *pstate = (const char *)ps;
 
-  return pstate == NULL || pstate[0] == 0;
+  return pstate[0] == 0;
 }
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/mbswidth.c gettext-0.18.1.1/gettext-tools/libgettextpo/mbswidth.c
--- gettext-0.19.3/gettext-tools/libgettextpo/mbswidth.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/mbswidth.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,14 +35,12 @@
 /* Get iswcntrl().  */
 #include <wctype.h>
 
-/* Get INT_MAX.  */
-#include <limits.h>
-
 /* Returns the number of columns needed to represent the multibyte
    character string pointed to by STRING.  If a non-printable character
    occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.
    With flags = MBSW_REJECT_INVALID | MBSW_REJECT_UNPRINTABLE, this is
-   the multibyte analogue of the wcswidth function.  */
+   the multibyte analogue of the wcswidth function.
+   If STRING is not of length < INT_MAX / 2, integer overflow can occur.  */
 int
 mbswidth (const char *string, int flags)
 {
@@ -52,7 +50,8 @@
 /* Returns the number of columns needed to represent the multibyte
    character string pointed to by STRING of length NBYTES.  If a
    non-printable character occurs, and MBSW_REJECT_UNPRINTABLE is
-   specified, -1 is returned.  */
+   specified, -1 is returned.
+   If NBYTES is not < INT_MAX / 2, integer overflow can occur.  */
 int
 mbsnwidth (const char *string, size_t nbytes, int flags)
 {
@@ -136,22 +135,11 @@
                     w = wcwidth (wc);
                     if (w >= 0)
                       /* A printable multibyte character.  */
-                      {
-                        if (w > INT_MAX - width)
-                          goto overflow;
-                        width += w;
-                      }
+                      width += w;
                     else
                       /* An unprintable multibyte character.  */
                       if (!(flags & MBSW_REJECT_UNPRINTABLE))
-                        {
-                          if (!iswcntrl (wc))
-                            {
-                              if (width == INT_MAX)
-                                goto overflow;
-                              width++;
-                            }
-                        }
+                        width += (iswcntrl (wc) ? 0 : 1);
                       else
                         return -1;
 
@@ -169,25 +157,11 @@
       unsigned char c = (unsigned char) *p++;
 
       if (isprint (c))
-        {
-          if (width == INT_MAX)
-            goto overflow;
-          width++;
-        }
+        width++;
       else if (!(flags & MBSW_REJECT_UNPRINTABLE))
-        {
-          if (!iscntrl (c))
-            {
-              if (width == INT_MAX)
-                goto overflow;
-              width++;
-            }
-        }
+        width += (iscntrl (c) ? 0 : 1);
       else
         return -1;
     }
   return width;
-
- overflow:
-  return INT_MAX;
 }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/mbswidth.h gettext-0.18.1.1/gettext-tools/libgettextpo/mbswidth.h
--- gettext-0.19.3/gettext-tools/libgettextpo/mbswidth.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/mbswidth.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2004, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/memchr.c gettext-0.18.1.1/gettext-tools/libgettextpo/memchr.c
--- gettext-0.19.3/gettext-tools/libgettextpo/memchr.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/memchr.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2010
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/minmax.h gettext-0.18.1.1/gettext-tools/libgettextpo/minmax.h
--- gettext-0.19.3/gettext-tools/libgettextpo/minmax.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/minmax.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009, 2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MINMAX_H
 #define _MINMAX_H
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/moo.h gettext-0.18.1.1/gettext-tools/libgettextpo/moo.h
--- gettext-0.19.3/gettext-tools/libgettextpo/moo.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/moo.h	2009-07-19 20:30:11.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file defines minimal facilities for object-oriented programming
    style in ANSI C.
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/msvc-inval.c gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-inval.c
--- gettext-0.19.3/gettext-tools/libgettextpo/msvc-inval.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-inval.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "msvc-inval.h"
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && !(MSVC_INVALID_PARAMETER_HANDLING == SANE_LIBRARY_HANDLING)
-
-/* Get _invalid_parameter_handler type and _set_invalid_parameter_handler
-   declaration.  */
-# include <stdlib.h>
-
-# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-}
-
-# else
-
-/* Get declarations of the native Windows API functions.  */
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-
-#  if defined _MSC_VER
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-  RaiseException (STATUS_GNULIB_INVALID_PARAMETER, 0, 0, NULL);
-}
-
-#  else
-
-/* An index to thread-local storage.  */
-static DWORD tls_index;
-static int tls_initialized /* = 0 */;
-
-/* Used as a fallback only.  */
-static struct gl_msvc_inval_per_thread not_per_thread;
-
-struct gl_msvc_inval_per_thread *
-gl_msvc_inval_current (void)
-{
-  if (!tls_initialized)
-    {
-      tls_index = TlsAlloc ();
-      tls_initialized = 1;
-    }
-  if (tls_index == TLS_OUT_OF_INDEXES)
-    /* TlsAlloc had failed.  */
-    return &not_per_thread;
-  else
-    {
-      struct gl_msvc_inval_per_thread *pointer =
-        (struct gl_msvc_inval_per_thread *) TlsGetValue (tls_index);
-      if (pointer == NULL)
-        {
-          /* First call.  Allocate a new 'struct gl_msvc_inval_per_thread'.  */
-          pointer =
-            (struct gl_msvc_inval_per_thread *)
-            malloc (sizeof (struct gl_msvc_inval_per_thread));
-          if (pointer == NULL)
-            /* Could not allocate memory.  Use the global storage.  */
-            pointer = &not_per_thread;
-          TlsSetValue (tls_index, pointer);
-        }
-      return pointer;
-    }
-}
-
-static void __cdecl
-gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                   const wchar_t *function,
-                                   const wchar_t *file,
-                                   unsigned int line,
-                                   uintptr_t dummy)
-{
-  struct gl_msvc_inval_per_thread *current = gl_msvc_inval_current ();
-  if (current->restart_valid)
-    longjmp (current->restart, 1);
-  else
-    /* An invalid parameter notification from outside the gnulib code.
-       Give the caller a chance to intervene.  */
-    RaiseException (STATUS_GNULIB_INVALID_PARAMETER, 0, 0, NULL);
-}
-
-#  endif
-
-# endif
-
-static int gl_msvc_inval_initialized /* = 0 */;
-
-void
-gl_msvc_inval_ensure_handler (void)
-{
-  if (gl_msvc_inval_initialized == 0)
-    {
-      _set_invalid_parameter_handler (gl_msvc_invalid_parameter_handler);
-      gl_msvc_inval_initialized = 1;
-    }
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/msvc-inval.h gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-inval.h
--- gettext-0.19.3/gettext-tools/libgettextpo/msvc-inval.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-inval.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +0,0 @@
-/* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _MSVC_INVAL_H
-#define _MSVC_INVAL_H
-
-/* With MSVC runtime libraries with the "invalid parameter handler" concept,
-   functions like fprintf(), dup2(), or close() crash when the caller passes
-   an invalid argument.  But POSIX wants error codes (such as EINVAL or EBADF)
-   instead.
-   This file defines macros that turn such an invalid parameter notification
-   into a non-local exit.  An error code can then be produced at the target
-   of this exit.  You can thus write code like
-
-     TRY_MSVC_INVAL
-       {
-         <Code that can trigger an invalid parameter notification
-          but does not do 'return', 'break', 'continue', nor 'goto'.>
-       }
-     CATCH_MSVC_INVAL
-       {
-         <Code that handles an invalid parameter notification
-          but does not do 'return', 'break', 'continue', nor 'goto'.>
-       }
-     DONE_MSVC_INVAL;
-
-   This entire block expands to a single statement.
-
-   The handling of invalid parameters can be done in three ways:
-
-     * The default way, which is reasonable for programs (not libraries):
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [DEFAULT_HANDLING])
-
-     * The way for libraries that make "hairy" calls (like close(-1), or
-       fclose(fp) where fileno(fp) is closed, or simply getdtablesize()):
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [HAIRY_LIBRARY_HANDLING])
-
-     * The way for libraries that make no "hairy" calls:
-       AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [SANE_LIBRARY_HANDLING])
- */
-
-#define DEFAULT_HANDLING       0
-#define HAIRY_LIBRARY_HANDLING 1
-#define SANE_LIBRARY_HANDLING  2
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \
-    && !(MSVC_INVALID_PARAMETER_HANDLING == SANE_LIBRARY_HANDLING)
-/* A native Windows platform with the "invalid parameter handler" concept,
-   and either DEFAULT_HANDLING or HAIRY_LIBRARY_HANDLING.  */
-
-# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-/* Default handling.  */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-/* Ensure that the invalid parameter handler in installed that just returns.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-#  ifdef __cplusplus
-}
-#  endif
-
-#  define TRY_MSVC_INVAL \
-     do                                                                        \
-       {                                                                       \
-         gl_msvc_inval_ensure_handler ();                                      \
-         if (1)
-#  define CATCH_MSVC_INVAL \
-         else
-#  define DONE_MSVC_INVAL \
-       }                                                                       \
-     while (0)
-
-# else
-/* Handling for hairy libraries.  */
-
-#  include <excpt.h>
-
-/* Gnulib can define its own status codes, as described in the page
-   "Raising Software Exceptions" on microsoft.com
-   <http://msdn.microsoft.com/en-us/library/het71c37.aspx>.
-   Our status codes are composed of
-     - 0xE0000000, mandatory for all user-defined status codes,
-     - 0x474E550, a API identifier ("GNU"),
-     - 0, 1, 2, ..., used to distinguish different status codes from the
-       same API.  */
-#  define STATUS_GNULIB_INVALID_PARAMETER (0xE0000000 + 0x474E550 + 0)
-
-#  if defined _MSC_VER
-/* A compiler that supports __try/__except, as described in the page
-   "try-except statement" on microsoft.com
-   <http://msdn.microsoft.com/en-us/library/s58ftw19.aspx>.
-   With __try/__except, we can use the multithread-safe exception handling.  */
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-/* Ensure that the invalid parameter handler in installed that raises a
-   software exception with code STATUS_GNULIB_INVALID_PARAMETER.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#   define TRY_MSVC_INVAL \
-      do                                                                       \
-        {                                                                      \
-          gl_msvc_inval_ensure_handler ();                                     \
-          __try
-#   define CATCH_MSVC_INVAL \
-          __except (GetExceptionCode () == STATUS_GNULIB_INVALID_PARAMETER     \
-                    ? EXCEPTION_EXECUTE_HANDLER                                \
-                    : EXCEPTION_CONTINUE_SEARCH)
-#   define DONE_MSVC_INVAL \
-        }                                                                      \
-      while (0)
-
-#  else
-/* Any compiler.
-   We can only use setjmp/longjmp.  */
-
-#   include <setjmp.h>
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-struct gl_msvc_inval_per_thread
-{
-  /* The restart that will resume execution at the code between
-     CATCH_MSVC_INVAL and DONE_MSVC_INVAL.  It is enabled only between
-     TRY_MSVC_INVAL and CATCH_MSVC_INVAL.  */
-  jmp_buf restart;
-
-  /* Tells whether the contents of restart is valid.  */
-  int restart_valid;
-};
-
-/* Ensure that the invalid parameter handler in installed that passes
-   control to the gl_msvc_inval_restart if it is valid, or raises a
-   software exception with code STATUS_GNULIB_INVALID_PARAMETER otherwise.
-   Because we assume no other part of the program installs a different
-   invalid parameter handler, this solution is multithread-safe.  */
-extern void gl_msvc_inval_ensure_handler (void);
-
-/* Return a pointer to the per-thread data for the current thread.  */
-extern struct gl_msvc_inval_per_thread *gl_msvc_inval_current (void);
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#   define TRY_MSVC_INVAL \
-      do                                                                       \
-        {                                                                      \
-          struct gl_msvc_inval_per_thread *msvc_inval_current;                 \
-          gl_msvc_inval_ensure_handler ();                                     \
-          msvc_inval_current = gl_msvc_inval_current ();                       \
-          /* First, initialize gl_msvc_inval_restart.  */                      \
-          if (setjmp (msvc_inval_current->restart) == 0)                       \
-            {                                                                  \
-              /* Then, mark it as valid.  */                                   \
-              msvc_inval_current->restart_valid = 1;
-#   define CATCH_MSVC_INVAL \
-              /* Execution completed.                                          \
-                 Mark gl_msvc_inval_restart as invalid.  */                    \
-              msvc_inval_current->restart_valid = 0;                           \
-            }                                                                  \
-          else                                                                 \
-            {                                                                  \
-              /* Execution triggered an invalid parameter notification.        \
-                 Mark gl_msvc_inval_restart as invalid.  */                    \
-              msvc_inval_current->restart_valid = 0;
-#   define DONE_MSVC_INVAL \
-            }                                                                  \
-        }                                                                      \
-      while (0)
-
-#  endif
-
-# endif
-
-#else
-/* A platform that does not need to the invalid parameter handler,
-   or when SANE_LIBRARY_HANDLING is desired.  */
-
-/* The braces here avoid GCC warnings like
-   "warning: suggest explicit braces to avoid ambiguous 'else'".  */
-# define TRY_MSVC_INVAL \
-    do                                                                         \
-      {                                                                        \
-        if (1)
-# define CATCH_MSVC_INVAL \
-        else
-# define DONE_MSVC_INVAL \
-      }                                                                        \
-    while (0)
-
-#endif
-
-#endif /* _MSVC_INVAL_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/msvc-nothrow.c gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-nothrow.c
--- gettext-0.19.3/gettext-tools/libgettextpo/msvc-nothrow.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-nothrow.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* Wrappers that don't throw invalid parameter notifications
-   with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "msvc-nothrow.h"
-
-/* Get declarations of the native Windows API functions.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "msvc-inval.h"
-
-#undef _get_osfhandle
-
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-intptr_t
-_gl_nothrow_get_osfhandle (int fd)
-{
-  intptr_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = _get_osfhandle (fd);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = (intptr_t) INVALID_HANDLE_VALUE;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/msvc-nothrow.h gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-nothrow.h
--- gettext-0.19.3/gettext-tools/libgettextpo/msvc-nothrow.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/msvc-nothrow.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* Wrappers that don't throw invalid parameter notifications
-   with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _MSVC_NOTHROW_H
-#define _MSVC_NOTHROW_H
-
-/* With MSVC runtime libraries with the "invalid parameter handler" concept,
-   functions like fprintf(), dup2(), or close() crash when the caller passes
-   an invalid argument.  But POSIX wants error codes (such as EINVAL or EBADF)
-   instead.
-   This file defines wrappers that turn such an invalid parameter notification
-   into an error code.  */
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Get original declaration of _get_osfhandle.  */
-# include <io.h>
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-
-/* Override _get_osfhandle.  */
-extern intptr_t _gl_nothrow_get_osfhandle (int fd);
-#  define _get_osfhandle _gl_nothrow_get_osfhandle
-
-# endif
-
-#endif
-
-#endif /* _MSVC_NOTHROW_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/obstack.c gettext-0.18.1.1/gettext-tools/libgettextpo/obstack.c
--- gettext-0.19.3/gettext-tools/libgettextpo/obstack.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/obstack.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,21 +1,21 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-2014 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
-   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.
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free Software
+   Foundation, Inc.
+
+   This 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   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 _LIBC
 # include <obstack.h>
@@ -36,7 +36,7 @@
    C Library, but also included in many other GNU distributions.  Compiling
    and linking in this code is a waste when using the GNU C library
    (especially if it is a shared library).  Rather than having every GNU
-   program understand 'configure --with-gnu-libc' and omit the object
+   program understand `configure --with-gnu-libc' and omit the object
    files, it is simpler to just do this in the source for each such file.  */
 
 #include <stdio.h>              /* Random thing to get __GNU_LIBRARY__.  */
@@ -51,7 +51,6 @@
 
 #ifndef ELIDE_CODE
 
-
 # include <stdint.h>
 
 /* Determine default alignment.  */
@@ -70,30 +69,30 @@
    But in fact it might be less smart and round addresses to as much as
    DEFAULT_ROUNDING.  So we prepare for it to do that.  */
 enum
-{
-  DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
-  DEFAULT_ROUNDING = sizeof (union fooround)
-};
+  {
+    DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
+    DEFAULT_ROUNDING = sizeof (union fooround)
+  };
 
 /* When we copy a long block of data, this is the unit to do it with.
    On some machines, copying successive ints does not work;
-   in such a case, redefine COPYING_UNIT to 'long' (if that works)
-   or 'char' as a last resort.  */
+   in such a case, redefine COPYING_UNIT to `long' (if that works)
+   or `char' as a last resort.  */
 # ifndef COPYING_UNIT
 #  define COPYING_UNIT int
 # endif
 
 
-/* The functions allocating more room by calling 'obstack_chunk_alloc'
-   jump to the handler pointed to by 'obstack_alloc_failed_handler'.
+/* The functions allocating more room by calling `obstack_chunk_alloc'
+   jump to the handler pointed to by `obstack_alloc_failed_handler'.
    This can be set to a user defined function which should either
    abort gracefully or use longjump - but shouldn't return.  This
    variable by default points to the internal function
-   'print_and_abort'.  */
-static _Noreturn void print_and_abort (void);
+   `print_and_abort'.  */
+static void print_and_abort (void);
 void (*obstack_alloc_failed_handler) (void) = print_and_abort;
 
-/* Exit value used when 'print_and_abort' is used.  */
+/* Exit value used when `print_and_abort' is used.  */
 # include <stdlib.h>
 # ifdef _LIBC
 int obstack_exit_failure = EXIT_FAILURE;
@@ -107,7 +106,7 @@
 /* A looong time ago (before 1994, anyway; we're not sure) this global variable
    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
    library still exports it because somebody might use it.  */
-struct obstack *_obstack_compat = 0;
+struct obstack *_obstack_compat;
 compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
 #  endif
 # endif
@@ -119,19 +118,19 @@
    do not allow (expr) ? void : void.  */
 
 # define CALL_CHUNKFUN(h, size) \
-  (((h)->use_extra_arg)							      \
-   ? (*(h)->chunkfun)((h)->extra_arg, (size))				      \
-   : (*(struct _obstack_chunk *(*)(long))(h)->chunkfun)((size)))
+  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
 
 # define CALL_FREEFUN(h, old_chunk) \
   do { \
-      if ((h)->use_extra_arg)						      \
-        (*(h)->freefun)((h)->extra_arg, (old_chunk));			      \
-      else								      \
-        (*(void (*)(void *))(h)->freefun)((old_chunk));			      \
-    } while (0)
-
+    if ((h) -> use_extra_arg) \
+      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+    else \
+      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
+  } while (0)
 
+
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
    Objects start on multiples of ALIGNMENT (0 means use default).
    CHUNKFUN is the function to use to allocate chunks,
@@ -146,7 +145,7 @@
                 void *(*chunkfun) (long),
                 void (*freefun) (void *))
 {
-  struct _obstack_chunk *chunk; /* points to new chunk */
+  register struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -167,19 +166,19 @@
       size = 4096 - extra;
     }
 
-  h->chunkfun = (struct _obstack_chunk * (*) (void *, long)) chunkfun;
+  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
   h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->use_extra_arg = 0;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
   h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
                                                alignment - 1);
   h->chunk_limit = chunk->limit
-                     = (char *) chunk + h->chunk_size;
+    = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
   /* The initial chunk now contains no empty object.  */
   h->maybe_empty_object = 0;
@@ -193,7 +192,7 @@
                   void (*freefun) (void *, void *),
                   void *arg)
 {
-  struct _obstack_chunk *chunk; /* points to new chunk */
+  register struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -221,13 +220,13 @@
   h->extra_arg = arg;
   h->use_extra_arg = 1;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
   h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
                                                alignment - 1);
   h->chunk_limit = chunk->limit
-                     = (char *) chunk + h->chunk_size;
+    = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
   /* The initial chunk now contains no empty object.  */
   h->maybe_empty_object = 0;
@@ -244,11 +243,11 @@
 void
 _obstack_newchunk (struct obstack *h, int length)
 {
-  struct _obstack_chunk *old_chunk = h->chunk;
-  struct _obstack_chunk *new_chunk;
-  long new_size;
-  long obj_size = h->next_free - h->object_base;
-  long i;
+  register struct _obstack_chunk *old_chunk = h->chunk;
+  register struct _obstack_chunk *new_chunk;
+  register long new_size;
+  register long obj_size = h->next_free - h->object_base;
+  register long i;
   long already;
   char *object_base;
 
@@ -260,7 +259,7 @@
   /* Allocate and initialize the new chunk.  */
   new_chunk = CALL_CHUNKFUN (h, new_size);
   if (!new_chunk)
-    (*obstack_alloc_failed_handler)();
+    (*obstack_alloc_failed_handler) ();
   h->chunk = new_chunk;
   new_chunk->prev = old_chunk;
   new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
@@ -276,8 +275,8 @@
     {
       for (i = obj_size / sizeof (COPYING_UNIT) - 1;
            i >= 0; i--)
-        ((COPYING_UNIT *) object_base)[i]
-          = ((COPYING_UNIT *) h->object_base)[i];
+        ((COPYING_UNIT *)object_base)[i]
+          = ((COPYING_UNIT *)h->object_base)[i];
       /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
          but that can cross a page boundary on a machine
          which does not do strict alignment for COPYING_UNITS.  */
@@ -292,7 +291,7 @@
   /* If the object just copied was the only data in OLD_CHUNK,
      free that chunk and remove it from the chain.
      But not if that chunk might contain an empty object.  */
-  if (!h->maybe_empty_object
+  if (! h->maybe_empty_object
       && (h->object_base
           == __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
                           h->alignment_mask)))
@@ -316,13 +315,13 @@
 
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
    obstack.h because it is just for debugging.  */
-int _obstack_allocated_p (struct obstack *h, void *obj) __attribute_pure__;
+int _obstack_allocated_p (struct obstack *h, void *obj);
 
 int
 _obstack_allocated_p (struct obstack *h, void *obj)
 {
-  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
-  struct _obstack_chunk *plp;   /* point to previous chunk if any */
+  register struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;  /* point to previous chunk if any */
 
   lp = (h)->chunk;
   /* We use >= rather than > since the object cannot be exactly at
@@ -335,7 +334,7 @@
     }
   return lp != 0;
 }
-
+
 /* Free objects in obstack H, including OBJ and everything allocate
    more recently than OBJ.  If OBJ is zero, free everything in H.  */
 
@@ -344,8 +343,8 @@
 void
 __obstack_free (struct obstack *h, void *obj)
 {
-  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
-  struct _obstack_chunk *plp;   /* point to previous chunk if any */
+  register struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;  /* point to previous chunk if any */
 
   lp = h->chunk;
   /* We use >= because there cannot be an object at the beginning of a chunk.
@@ -376,12 +375,12 @@
    called by non-GCC compilers.  */
 strong_alias (obstack_free, _obstack_free)
 # endif
-
+
 int
 _obstack_memory_used (struct obstack *h)
 {
-  struct _obstack_chunk *lp;
-  int nbytes = 0;
+  register struct _obstack_chunk* lp;
+  register int nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
@@ -389,7 +388,7 @@
     }
   return nbytes;
 }
-
+
 /* Define the error handler.  */
 # ifdef _LIBC
 #  include <libintl.h>
@@ -404,7 +403,15 @@
 #  include <libio/iolibio.h>
 # endif
 
-static _Noreturn void
+# ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#   define __attribute__(Spec) /* empty */
+#  endif
+# endif
+
+static void
+__attribute__ ((noreturn))
 print_and_abort (void)
 {
   /* Don't change any of these strings.  Yes, it would be possible to add
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/obstack.h gettext-0.18.1.1/gettext-tools/libgettextpo/obstack.h
--- gettext-0.19.3/gettext-tools/libgettextpo/obstack.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/obstack.h	2010-03-28 18:33:19.000000000 +0000
@@ -1,90 +1,90 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988-2014 Free Software Foundation, Inc.
+   Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2010 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
-   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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Summary:
 
-   All the apparent functions defined here are macros. The idea
-   is that you would use these pre-tested macros to solve a
-   very specific set of problems, and they would run fast.
-   Caution: no side-effects in arguments please!! They may be
-   evaluated MANY times!!
-
-   These macros operate a stack of objects.  Each object starts life
-   small, and may grow to maturity.  (Consider building a word syllable
-   by syllable.)  An object can move while it is growing.  Once it has
-   been "finished" it never changes address again.  So the "top of the
-   stack" is typically an immature growing object, while the rest of the
-   stack is of mature, fixed size and fixed address objects.
-
-   These routines grab large chunks of memory, using a function you
-   supply, called 'obstack_chunk_alloc'.  On occasion, they free chunks,
-   by calling 'obstack_chunk_free'.  You must define them and declare
-   them before using any obstack macros.
-
-   Each independent stack is represented by a 'struct obstack'.
-   Each of the obstack macros expects a pointer to such a structure
-   as the first argument.
-
-   One motivation for this package is the problem of growing char strings
-   in symbol tables.  Unless you are "fascist pig with a read-only mind"
-   --Gosper's immortal quote from HAKMEM item 154, out of context--you
-   would not like to put any arbitrary upper limit on the length of your
-   symbols.
-
-   In practice this often means you will build many short symbols and a
-   few long symbols.  At the time you are reading a symbol you don't know
-   how long it is.  One traditional method is to read a symbol into a
-   buffer, realloc()ating the buffer every time you try to read a symbol
-   that is longer than the buffer.  This is beaut, but you still will
-   want to copy the symbol from the buffer to a more permanent
-   symbol-table entry say about half the time.
-
-   With obstacks, you can work differently.  Use one obstack for all symbol
-   names.  As you read a symbol, grow the name in the obstack gradually.
-   When the name is complete, finalize it.  Then, if the symbol exists already,
-   free the newly read name.
-
-   The way we do this is to take a large chunk, allocating memory from
-   low addresses.  When you want to build a symbol in the chunk you just
-   add chars above the current "high water mark" in the chunk.  When you
-   have finished adding chars, because you got to the end of the symbol,
-   you know how long the chars are, and you can create a new object.
-   Mostly the chars will not burst over the highest address of the chunk,
-   because you would typically expect a chunk to be (say) 100 times as
-   long as an average object.
-
-   In case that isn't clear, when we have enough chars to make up
-   the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
-   so we just point to it where it lies.  No moving of chars is
-   needed and this is the second win: potentially long strings need
-   never be explicitly shuffled. Once an object is formed, it does not
-   change its address during its lifetime.
-
-   When the chars burst over a chunk boundary, we allocate a larger
-   chunk, and then copy the partly formed object from the end of the old
-   chunk to the beginning of the new larger chunk.  We then carry on
-   accreting characters to the end of the object as we normally would.
-
-   A special macro is provided to add a single char at a time to a
-   growing object.  This allows the use of register variables, which
-   break the ordinary 'growth' macro.
+All the apparent functions defined here are macros. The idea
+is that you would use these pre-tested macros to solve a
+very specific set of problems, and they would run fast.
+Caution: no side-effects in arguments please!! They may be
+evaluated MANY times!!
+
+These macros operate a stack of objects.  Each object starts life
+small, and may grow to maturity.  (Consider building a word syllable
+by syllable.)  An object can move while it is growing.  Once it has
+been "finished" it never changes address again.  So the "top of the
+stack" is typically an immature growing object, while the rest of the
+stack is of mature, fixed size and fixed address objects.
+
+These routines grab large chunks of memory, using a function you
+supply, called `obstack_chunk_alloc'.  On occasion, they free chunks,
+by calling `obstack_chunk_free'.  You must define them and declare
+them before using any obstack macros.
+
+Each independent stack is represented by a `struct obstack'.
+Each of the obstack macros expects a pointer to such a structure
+as the first argument.
+
+One motivation for this package is the problem of growing char strings
+in symbol tables.  Unless you are "fascist pig with a read-only mind"
+--Gosper's immortal quote from HAKMEM item 154, out of context--you
+would not like to put any arbitrary upper limit on the length of your
+symbols.
+
+In practice this often means you will build many short symbols and a
+few long symbols.  At the time you are reading a symbol you don't know
+how long it is.  One traditional method is to read a symbol into a
+buffer, realloc()ating the buffer every time you try to read a symbol
+that is longer than the buffer.  This is beaut, but you still will
+want to copy the symbol from the buffer to a more permanent
+symbol-table entry say about half the time.
+
+With obstacks, you can work differently.  Use one obstack for all symbol
+names.  As you read a symbol, grow the name in the obstack gradually.
+When the name is complete, finalize it.  Then, if the symbol exists already,
+free the newly read name.
+
+The way we do this is to take a large chunk, allocating memory from
+low addresses.  When you want to build a symbol in the chunk you just
+add chars above the current "high water mark" in the chunk.  When you
+have finished adding chars, because you got to the end of the symbol,
+you know how long the chars are, and you can create a new object.
+Mostly the chars will not burst over the highest address of the chunk,
+because you would typically expect a chunk to be (say) 100 times as
+long as an average object.
+
+In case that isn't clear, when we have enough chars to make up
+the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
+so we just point to it where it lies.  No moving of chars is
+needed and this is the second win: potentially long strings need
+never be explicitly shuffled. Once an object is formed, it does not
+change its address during its lifetime.
+
+When the chars burst over a chunk boundary, we allocate a larger
+chunk, and then copy the partly formed object from the end of the old
+chunk to the beginning of the new larger chunk.  We then carry on
+accreting characters to the end of the object as we normally would.
+
+A special macro is provided to add a single char at a time to a
+growing object.  This allows the use of register variables, which
+break the ordinary 'growth' macro.
 
-   Summary:
+Summary:
         We allocate large chunks.
         We carve out one object at a time from the current chunk.
         Once carved, an object never moves.
@@ -93,17 +93,17 @@
         Exactly one object is growing in an obstack at any one time.
         You can run one obstack per control block.
         You may have as many control blocks as you dare.
-        Because of the way we do it, you can "unwind" an obstack
+        Because of the way we do it, you can `unwind' an obstack
           back to a previous state. (You may remove objects much
           as you would with a stack.)
- */
+*/
 
 
 /* Don't do the contents of this file more than once.  */
 
 #ifndef _OBSTACK_H
 #define _OBSTACK_H 1
-
+
 /* We need the type of a pointer subtraction.  If __PTRDIFF_TYPE__ is
    defined, as with GNU C, use that; that way we don't pollute the
    namespace with <stddef.h>'s symbols.  Otherwise, include <stddef.h>
@@ -122,90 +122,86 @@
 
 #define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))
 
-/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case
+/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case
    where pointers can be converted to integers, aligned as integers,
    and converted back again.  If PTR_INT_TYPE is narrower than a
    pointer (e.g., the AS/400), play it safe and compute the alignment
    relative to B.  Otherwise, use the faster strategy of computing the
    alignment relative to 0.  */
 
-#define __PTR_ALIGN(B, P, A)						      \
+#define __PTR_ALIGN(B, P, A)                                                \
   __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
                 P, A)
 
 #include <string.h>
 
-#ifndef __attribute_pure__
-# define __attribute_pure__ _GL_ATTRIBUTE_PURE
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct _obstack_chunk           /* Lives at front of each chunk. */
 {
-  char *limit;                  /* 1 past end of this chunk */
+  char  *limit;                 /* 1 past end of this chunk */
   struct _obstack_chunk *prev;  /* address of prior chunk or NULL */
-  char contents[4];             /* objects begin here */
+  char  contents[4];            /* objects begin here */
 };
 
 struct obstack          /* control current object in current chunk */
 {
-  long chunk_size;              /* preferred size to allocate chunks in */
+  long  chunk_size;             /* preferred size to allocate chunks in */
   struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */
-  char *object_base;            /* address of object we are building */
-  char *next_free;              /* where to add next char to current object */
-  char *chunk_limit;            /* address of char after current chunk */
+  char  *object_base;           /* address of object we are building */
+  char  *next_free;             /* where to add next char to current object */
+  char  *chunk_limit;           /* address of char after current chunk */
   union
   {
     PTR_INT_TYPE tempint;
     void *tempptr;
   } temp;                       /* Temporary for some macros.  */
-  int alignment_mask;           /* Mask of alignment for each object. */
-  /* These prototypes vary based on 'use_extra_arg', and we use
+  int   alignment_mask;         /* Mask of alignment for each object. */
+  /* These prototypes vary based on `use_extra_arg', and we use
      casts to the prototypeless function type in all assignments,
      but having prototypes here quiets -Wstrict-prototypes.  */
   struct _obstack_chunk *(*chunkfun) (void *, long);
   void (*freefun) (void *, struct _obstack_chunk *);
   void *extra_arg;              /* first arg for chunk alloc/dealloc funcs */
-  unsigned use_extra_arg : 1;     /* chunk alloc/dealloc funcs take extra arg */
-  unsigned maybe_empty_object : 1; /* There is a possibility that the current
-                                      chunk contains a zero-length object.  This
-                                      prevents freeing the chunk if we allocate
-                                      a bigger chunk to replace it. */
-  unsigned alloc_failed : 1;      /* No longer used, as we now call the failed
-                                     handler on error, but retained for binary
-                                     compatibility.  */
+  unsigned use_extra_arg:1;     /* chunk alloc/dealloc funcs take extra arg */
+  unsigned maybe_empty_object:1;/* There is a possibility that the current
+                                   chunk contains a zero-length object.  This
+                                   prevents freeing the chunk if we allocate
+                                   a bigger chunk to replace it. */
+  unsigned alloc_failed:1;      /* No longer used, as we now call the failed
+                                   handler on error, but retained for binary
+                                   compatibility.  */
 };
 
 /* Declare the external functions we use; they are in obstack.c.  */
 
 extern void _obstack_newchunk (struct obstack *, int);
 extern int _obstack_begin (struct obstack *, int, int,
-                           void *(*)(long), void (*)(void *));
+                            void *(*) (long), void (*) (void *));
 extern int _obstack_begin_1 (struct obstack *, int, int,
-                             void *(*)(void *, long),
-                             void (*)(void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *) __attribute_pure__;
+                             void *(*) (void *, long),
+                             void (*) (void *, void *), void *);
+extern int _obstack_memory_used (struct obstack *);
 
 /* The default name of the function for freeing a chunk is 'obstack_free',
    but gnulib users can override this by defining '__obstack_free'.  */
 #ifndef __obstack_free
 # define __obstack_free obstack_free
 #endif
-extern void __obstack_free (struct obstack *, void *);
-
+extern void __obstack_free (struct obstack *obstack, void *block);
 
-/* Error handler called when 'obstack_chunk_alloc' failed to allocate
+
+/* Error handler called when `obstack_chunk_alloc' failed to allocate
    more memory.  This can be set to a user defined function which
    should either abort gracefully or use longjump - but shouldn't
    return.  The default action is to print a message and abort.  */
 extern DLL_VARIABLE void (*obstack_alloc_failed_handler) (void);
 
-/* Exit value used when 'print_and_abort' is used.  */
+/* Exit value used when `print_and_abort' is used.  */
 extern DLL_VARIABLE int obstack_exit_failure;
-
+
 /* Pointer to beginning of object being allocated or to be allocated next.
    Note that this might not be the final address of the object
    because a new chunk might be needed to hold the final size.  */
@@ -225,202 +221,203 @@
 #define obstack_alignment_mask(h) ((h)->alignment_mask)
 
 /* To prevent prototype warnings provide complete argument list.  */
-#define obstack_init(h)							      \
-  _obstack_begin ((h), 0, 0,						      \
-                  (void *(*)(long))obstack_chunk_alloc,			      \
-                  (void (*)(void *))obstack_chunk_free)
-
-#define obstack_begin(h, size)						      \
-  _obstack_begin ((h), (size), 0,					      \
-                  (void *(*)(long))obstack_chunk_alloc,			      \
-                  (void (*)(void *))obstack_chunk_free)
+#define obstack_init(h)                                         \
+  _obstack_begin ((h), 0, 0,                                    \
+                  (void *(*) (long)) obstack_chunk_alloc,       \
+                  (void (*) (void *)) obstack_chunk_free)
+
+#define obstack_begin(h, size)                                  \
+  _obstack_begin ((h), (size), 0,                               \
+                  (void *(*) (long)) obstack_chunk_alloc,       \
+                  (void (*) (void *)) obstack_chunk_free)
 
 #define obstack_specify_allocation(h, size, alignment, chunkfun, freefun)  \
-  _obstack_begin ((h), (size), (alignment),				      \
-                  (void *(*)(long))(chunkfun),				      \
-                  (void (*)(void *))(freefun))
+  _obstack_begin ((h), (size), (alignment),                                \
+                  (void *(*) (long)) (chunkfun),                           \
+                  (void (*) (void *)) (freefun))
 
 #define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment),				      \
-                    (void *(*)(void *, long))(chunkfun),		      \
-                    (void (*)(void *, void *))(freefun), (arg))
+  _obstack_begin_1 ((h), (size), (alignment),                           \
+                    (void *(*) (void *, long)) (chunkfun),              \
+                    (void (*) (void *, void *)) (freefun), (arg))
 
 #define obstack_chunkfun(h, newchunkfun) \
-  ((h)->chunkfun = (struct _obstack_chunk *(*)(void *, long))(newchunkfun))
+  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
 
 #define obstack_freefun(h, newfreefun) \
-  ((h)->freefun = (void (*)(void *, struct _obstack_chunk *))(newfreefun))
+  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
 
-#define obstack_1grow_fast(h, achar) (*((h)->next_free)++ = (achar))
+#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
 
-#define obstack_blank_fast(h, n) ((h)->next_free += (n))
+#define obstack_blank_fast(h,n) ((h)->next_free += (n))
 
 #define obstack_memory_used(h) _obstack_memory_used (h)
-
-#if defined __GNUC__
-# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__))
+
+#if defined __GNUC__ && defined __STDC__ && __STDC__
+/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+   does not implement __extension__.  But that compiler doesn't define
+   __GNUC_MINOR__.  */
+# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
 #  define __extension__
 # endif
 
 /* For GNU C, if not -traditional,
    we can define these macros to compute all args only once
    without using a global variable.
-   Also, we can avoid using the 'temp' slot, to make faster code.  */
+   Also, we can avoid using the `temp' slot, to make faster code.  */
 
-# define obstack_object_size(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (unsigned) (__o->next_free - __o->object_base); })
-
-# define obstack_room(OBSTACK)						      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (unsigned) (__o->chunk_limit - __o->next_free); })
-
-# define obstack_make_room(OBSTACK, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->chunk_limit - __o->next_free < __len)			      \
-         _obstack_newchunk (__o, __len);				      \
-       (void) 0; })
-
-# define obstack_empty_p(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (__o->chunk->prev == 0						      \
-        && __o->next_free == __PTR_ALIGN ((char *) __o->chunk,		      \
-                                          __o->chunk->contents,		      \
-                                          __o->alignment_mask)); })
-
-# define obstack_grow(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->next_free + __len > __o->chunk_limit)			      \
-         _obstack_newchunk (__o, __len);				      \
-       memcpy (__o->next_free, where, __len);				      \
-       __o->next_free += __len;						      \
-       (void) 0; })
-
-# define obstack_grow0(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->next_free + __len + 1 > __o->chunk_limit)		      \
-         _obstack_newchunk (__o, __len + 1);				      \
-       memcpy (__o->next_free, where, __len);				      \
-       __o->next_free += __len;						      \
-       *(__o->next_free)++ = 0;						      \
-       (void) 0; })
-
-# define obstack_1grow(OBSTACK, datum)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + 1 > __o->chunk_limit)			      \
-         _obstack_newchunk (__o, 1);					      \
-       obstack_1grow_fast (__o, datum);					      \
-       (void) 0; })
+# define obstack_object_size(OBSTACK)                                   \
+  __extension__                                                         \
+  ({ struct obstack const *__o = (OBSTACK);                             \
+     (unsigned) (__o->next_free - __o->object_base); })
+
+# define obstack_room(OBSTACK)                                          \
+  __extension__                                                         \
+  ({ struct obstack const *__o = (OBSTACK);                             \
+     (unsigned) (__o->chunk_limit - __o->next_free); })
+
+# define obstack_make_room(OBSTACK,length)                              \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->chunk_limit - __o->next_free < __len)                       \
+     _obstack_newchunk (__o, __len);                                    \
+   (void) 0; })
+
+# define obstack_empty_p(OBSTACK)                                       \
+  __extension__                                                         \
+  ({ struct obstack const *__o = (OBSTACK);                             \
+     (__o->chunk->prev == 0                                             \
+      && __o->next_free == __PTR_ALIGN ((char *) __o->chunk,            \
+                                        __o->chunk->contents,           \
+                                        __o->alignment_mask)); })
+
+# define obstack_grow(OBSTACK,where,length)                             \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->next_free + __len > __o->chunk_limit)                       \
+     _obstack_newchunk (__o, __len);                                    \
+   memcpy (__o->next_free, where, __len);                               \
+   __o->next_free += __len;                                             \
+   (void) 0; })
+
+# define obstack_grow0(OBSTACK,where,length)                            \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->next_free + __len + 1 > __o->chunk_limit)                   \
+     _obstack_newchunk (__o, __len + 1);                                \
+   memcpy (__o->next_free, where, __len);                               \
+   __o->next_free += __len;                                             \
+   *(__o->next_free)++ = 0;                                             \
+   (void) 0; })
+
+# define obstack_1grow(OBSTACK,datum)                                   \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   if (__o->next_free + 1 > __o->chunk_limit)                           \
+     _obstack_newchunk (__o, 1);                                        \
+   obstack_1grow_fast (__o, datum);                                     \
+   (void) 0; })
 
 /* These assume that the obstack alignment is good enough for pointers
    or ints, and that the data added so far to the current object
    shares that much alignment.  */
 
-# define obstack_ptr_grow(OBSTACK, datum)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + sizeof (void *) > __o->chunk_limit)		      \
-         _obstack_newchunk (__o, sizeof (void *));			      \
-       obstack_ptr_grow_fast (__o, datum); })				      \
-
-# define obstack_int_grow(OBSTACK, datum)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + sizeof (int) > __o->chunk_limit)		      \
-         _obstack_newchunk (__o, sizeof (int));				      \
-       obstack_int_grow_fast (__o, datum); })
-
-# define obstack_ptr_grow_fast(OBSTACK, aptr)				      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__p1 = __o1->next_free;					      \
-       *(const void **) __p1 = (aptr);					      \
-       __o1->next_free += sizeof (const void *);			      \
-       (void) 0; })
-
-# define obstack_int_grow_fast(OBSTACK, aint)				      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__p1 = __o1->next_free;					      \
-       *(int *) __p1 = (aint);						      \
-       __o1->next_free += sizeof (int);					      \
-       (void) 0; })
-
-# define obstack_blank(OBSTACK, length)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->chunk_limit - __o->next_free < __len)			      \
-         _obstack_newchunk (__o, __len);				      \
-       obstack_blank_fast (__o, __len);					      \
-       (void) 0; })
-
-# define obstack_alloc(OBSTACK, length)					      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_blank (__h, (length));					      \
-       obstack_finish (__h); })
-
-# define obstack_copy(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_grow (__h, (where), (length));				      \
-       obstack_finish (__h); })
-
-# define obstack_copy0(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_grow0 (__h, (where), (length));				      \
-       obstack_finish (__h); })
+# define obstack_ptr_grow(OBSTACK,datum)                                \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   if (__o->next_free + sizeof (void *) > __o->chunk_limit)             \
+     _obstack_newchunk (__o, sizeof (void *));                          \
+   obstack_ptr_grow_fast (__o, datum); })                               \
+
+# define obstack_int_grow(OBSTACK,datum)                                \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   if (__o->next_free + sizeof (int) > __o->chunk_limit)                \
+     _obstack_newchunk (__o, sizeof (int));                             \
+   obstack_int_grow_fast (__o, datum); })
+
+# define obstack_ptr_grow_fast(OBSTACK,aptr)                            \
+__extension__                                                           \
+({ struct obstack *__o1 = (OBSTACK);                                    \
+   *(const void **) __o1->next_free = (aptr);                           \
+   __o1->next_free += sizeof (const void *);                            \
+   (void) 0; })
+
+# define obstack_int_grow_fast(OBSTACK,aint)                            \
+__extension__                                                           \
+({ struct obstack *__o1 = (OBSTACK);                                    \
+   *(int *) __o1->next_free = (aint);                                   \
+   __o1->next_free += sizeof (int);                                     \
+   (void) 0; })
+
+# define obstack_blank(OBSTACK,length)                                  \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   int __len = (length);                                                \
+   if (__o->chunk_limit - __o->next_free < __len)                       \
+     _obstack_newchunk (__o, __len);                                    \
+   obstack_blank_fast (__o, __len);                                     \
+   (void) 0; })
+
+# define obstack_alloc(OBSTACK,length)                                  \
+__extension__                                                           \
+({ struct obstack *__h = (OBSTACK);                                     \
+   obstack_blank (__h, (length));                                       \
+   obstack_finish (__h); })
+
+# define obstack_copy(OBSTACK,where,length)                             \
+__extension__                                                           \
+({ struct obstack *__h = (OBSTACK);                                     \
+   obstack_grow (__h, (where), (length));                               \
+   obstack_finish (__h); })
+
+# define obstack_copy0(OBSTACK,where,length)                            \
+__extension__                                                           \
+({ struct obstack *__h = (OBSTACK);                                     \
+   obstack_grow0 (__h, (where), (length));                              \
+   obstack_finish (__h); })
 
 /* The local variable is named __o1 to avoid a name conflict
    when obstack_blank is called.  */
-# define obstack_finish(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__value = (void *) __o1->object_base;			      \
-       if (__o1->next_free == __value)					      \
-         __o1->maybe_empty_object = 1;					      \
-       __o1->next_free							      \
-         = __PTR_ALIGN (__o1->object_base, __o1->next_free,		      \
-                        __o1->alignment_mask);				      \
-       if (__o1->next_free - (char *) __o1->chunk			      \
-           > __o1->chunk_limit - (char *) __o1->chunk)			      \
-         __o1->next_free = __o1->chunk_limit;				      \
-       __o1->object_base = __o1->next_free;				      \
-       __value; })
-
-# define obstack_free(OBSTACK, OBJ)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       void *__obj = (OBJ);						      \
-       if (__obj > (void *) __o->chunk && __obj < (void *) __o->chunk_limit)  \
-         __o->next_free = __o->object_base = (char *) __obj;		      \
-       else (__obstack_free) (__o, __obj); })
-
-#else /* not __GNUC__ */
+# define obstack_finish(OBSTACK)                                        \
+__extension__                                                           \
+({ struct obstack *__o1 = (OBSTACK);                                    \
+   void *__value = (void *) __o1->object_base;                          \
+   if (__o1->next_free == __value)                                      \
+     __o1->maybe_empty_object = 1;                                      \
+   __o1->next_free                                                      \
+     = __PTR_ALIGN (__o1->object_base, __o1->next_free,                 \
+                    __o1->alignment_mask);                              \
+   if (__o1->next_free - (char *)__o1->chunk                            \
+       > __o1->chunk_limit - (char *)__o1->chunk)                       \
+     __o1->next_free = __o1->chunk_limit;                               \
+   __o1->object_base = __o1->next_free;                                 \
+   __value; })
+
+# define obstack_free(OBSTACK, OBJ)                                     \
+__extension__                                                           \
+({ struct obstack *__o = (OBSTACK);                                     \
+   void *__obj = (OBJ);                                                 \
+   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
+     __o->next_free = __o->object_base = (char *)__obj;                 \
+   else (__obstack_free) (__o, __obj); })
+
+#else /* not __GNUC__ or not __STDC__ */
 
 # define obstack_object_size(h) \
-  (unsigned) ((h)->next_free - (h)->object_base)
+ (unsigned) ((h)->next_free - (h)->object_base)
 
-# define obstack_room(h)						      \
-  (unsigned) ((h)->chunk_limit - (h)->next_free)
+# define obstack_room(h)                \
+ (unsigned) ((h)->chunk_limit - (h)->next_free)
 
 # define obstack_empty_p(h) \
-  ((h)->chunk->prev == 0						      \
-   && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,		      \
-                                     (h)->chunk->contents,		      \
-                                     (h)->alignment_mask))
+ ((h)->chunk->prev == 0                                                 \
+  && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,                \
+                                    (h)->chunk->contents,               \
+                                    (h)->alignment_mask))
 
 /* Note that the call to _obstack_newchunk is enclosed in (..., 0)
    so that we can avoid having void expressions
@@ -428,85 +425,85 @@
    Casting the third operand to void was tried before,
    but some compilers won't accept it.  */
 
-# define obstack_make_room(h, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
+# define obstack_make_room(h,length)                                    \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)              \
    ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0))
 
-# define obstack_grow(h, where, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-   (h)->next_free += (h)->temp.tempint)
-
-# define obstack_grow0(h, where, length)				      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),		      \
-   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-   (h)->next_free += (h)->temp.tempint,					      \
-   *((h)->next_free)++ = 0)
-
-# define obstack_1grow(h, datum)					      \
-  ((((h)->next_free + 1 > (h)->chunk_limit)				      \
-    ? (_obstack_newchunk ((h), 1), 0) : 0),				      \
-   obstack_1grow_fast (h, datum))
-
-# define obstack_ptr_grow(h, datum)					      \
-  ((((h)->next_free + sizeof (char *) > (h)->chunk_limit)		      \
-    ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		      \
-   obstack_ptr_grow_fast (h, datum))
-
-# define obstack_int_grow(h, datum)					      \
-  ((((h)->next_free + sizeof (int) > (h)->chunk_limit)			      \
-    ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			      \
-   obstack_int_grow_fast (h, datum))
+# define obstack_grow(h,where,length)                                   \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)              \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),              \
+  memcpy ((h)->next_free, where, (h)->temp.tempint),                    \
+  (h)->next_free += (h)->temp.tempint)
+
+# define obstack_grow0(h,where,length)                                  \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)          \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),          \
+  memcpy ((h)->next_free, where, (h)->temp.tempint),                    \
+  (h)->next_free += (h)->temp.tempint,                                  \
+  *((h)->next_free)++ = 0)
+
+# define obstack_1grow(h,datum)                                         \
+( (((h)->next_free + 1 > (h)->chunk_limit)                              \
+   ? (_obstack_newchunk ((h), 1), 0) : 0),                              \
+  obstack_1grow_fast (h, datum))
+
+# define obstack_ptr_grow(h,datum)                                      \
+( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)                \
+   ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),                \
+  obstack_ptr_grow_fast (h, datum))
+
+# define obstack_int_grow(h,datum)                                      \
+( (((h)->next_free + sizeof (int) > (h)->chunk_limit)                   \
+   ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),                   \
+  obstack_int_grow_fast (h, datum))
 
-# define obstack_ptr_grow_fast(h, aptr)					      \
+# define obstack_ptr_grow_fast(h,aptr)                                  \
   (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
 
-# define obstack_int_grow_fast(h, aint)					      \
+# define obstack_int_grow_fast(h,aint)                                  \
   (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint))
 
-# define obstack_blank(h, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-   obstack_blank_fast (h, (h)->temp.tempint))
-
-# define obstack_alloc(h, length)					      \
-  (obstack_blank ((h), (length)), obstack_finish ((h)))
-
-# define obstack_copy(h, where, length)					      \
-  (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_copy0(h, where, length)				      \
-  (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_finish(h)						      \
-  (((h)->next_free == (h)->object_base					      \
-    ? (((h)->maybe_empty_object = 1), 0)				      \
-    : 0),								      \
-   (h)->temp.tempptr = (h)->object_base,				      \
-   (h)->next_free							      \
-     = __PTR_ALIGN ((h)->object_base, (h)->next_free,			      \
-                    (h)->alignment_mask),				      \
-   (((h)->next_free - (char *) (h)->chunk				      \
-     > (h)->chunk_limit - (char *) (h)->chunk)				      \
-   ? ((h)->next_free = (h)->chunk_limit) : 0),				      \
-   (h)->object_base = (h)->next_free,					      \
-   (h)->temp.tempptr)
-
-# define obstack_free(h, obj)						      \
-  ((h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,		      \
-   ((((h)->temp.tempint > 0						      \
-      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))	      \
-    ? (void) ((h)->next_free = (h)->object_base				      \
-                          = (h)->temp.tempint + (char *) (h)->chunk)	      \
-    : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk)))
+# define obstack_blank(h,length)                                        \
+( (h)->temp.tempint = (length),                                         \
+  (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)              \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),              \
+  obstack_blank_fast (h, (h)->temp.tempint))
+
+# define obstack_alloc(h,length)                                        \
+ (obstack_blank ((h), (length)), obstack_finish ((h)))
+
+# define obstack_copy(h,where,length)                                   \
+ (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_copy0(h,where,length)                                  \
+ (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_finish(h)                                              \
+( ((h)->next_free == (h)->object_base                                   \
+   ? (((h)->maybe_empty_object = 1), 0)                                 \
+   : 0),                                                                \
+  (h)->temp.tempptr = (h)->object_base,                                 \
+  (h)->next_free                                                        \
+    = __PTR_ALIGN ((h)->object_base, (h)->next_free,                    \
+                   (h)->alignment_mask),                                \
+  (((h)->next_free - (char *) (h)->chunk                                \
+    > (h)->chunk_limit - (char *) (h)->chunk)                           \
+   ? ((h)->next_free = (h)->chunk_limit) : 0),                          \
+  (h)->object_base = (h)->next_free,                                    \
+  (h)->temp.tempptr)
+
+# define obstack_free(h,obj)                                            \
+( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,             \
+  ((((h)->temp.tempint > 0                                              \
+    && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))     \
+   ? (int) ((h)->next_free = (h)->object_base                           \
+            = (h)->temp.tempint + (char *) (h)->chunk)                  \
+   : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
 
-#endif /* not __GNUC__ */
+#endif /* not __GNUC__ or not __STDC__ */
 
 #ifdef __cplusplus
 }       /* C++ */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/open.c gettext-0.18.1.1/gettext-tools/libgettextpo/open.c
--- gettext-0.19.3/gettext-tools/libgettextpo/open.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/open.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,27 +16,22 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* If the user's config.h happens to include <fcntl.h>, let it include only
-   the system's <fcntl.h> here, so that orig_open doesn't recurse to
-   rpl_open.  */
-#define __need_system_fcntl_h
 #include <config.h>
 
 /* Get the original definition of open.  It might be defined as a macro.  */
+#define __need_system_fcntl_h
 #include <fcntl.h>
-#include <sys/types.h>
 #undef __need_system_fcntl_h
+#include <sys/types.h>
 
-static int
+static inline int
 orig_open (const char *filename, int flags, mode_t mode)
 {
   return open (filename, flags, mode);
 }
 
 /* Specification.  */
-/* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
-   this include because of the preliminary #include <fcntl.h> above.  */
-#include "fcntl.h"
+#include <fcntl.h>
 
 #include <errno.h>
 #include <stdarg.h>
@@ -68,15 +63,6 @@
       va_end (arg);
     }
 
-#if GNULIB_defined_O_NONBLOCK
-  /* The only known platform that lacks O_NONBLOCK is mingw, but it
-     also lacks named pipes and Unix sockets, which are the only two
-     file types that require non-blocking handling in open().
-     Therefore, it is safe to ignore O_NONBLOCK here.  It is handy
-     that mingw also lacks openat(), so that is also covered here.  */
-  flags &= ~O_NONBLOCK;
-#endif
-
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   if (strcmp (filename, "/dev/null") == 0)
     filename = "NUL";
@@ -125,8 +111,7 @@
      override fstat() in fchdir.c to hide the fact that we have a
      dummy.  */
   if (REPLACE_OPEN_DIRECTORY && fd < 0 && errno == EACCES
-      && ((flags & O_ACCMODE) == O_RDONLY
-          || (O_SEARCH != O_RDONLY && (flags & O_ACCMODE) == O_SEARCH)))
+      && (flags & O_ACCMODE) == O_RDONLY)
     {
       struct stat statbuf;
       if (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/pathmax.h gettext-0.18.1.1/gettext-tools/libgettextpo/pathmax.h
--- gettext-0.19.3/gettext-tools/libgettextpo/pathmax.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/pathmax.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software
-   Foundation, Inc.
-
-   This 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/>.  */
-
-#ifndef _PATHMAX_H
-# define _PATHMAX_H
-
-/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,
-   including the terminating NUL byte.
-   <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>
-   PATH_MAX is not defined on systems which have no limit on filename length,
-   such as GNU/Hurd.
-
-   This file does *not* define PATH_MAX always.  Programs that use this file
-   can handle the GNU/Hurd case in several ways:
-     - Either with a package-wide handling, or with a per-file handling,
-     - Either through a
-         #ifdef PATH_MAX
-       or through a fallback like
-         #ifndef PATH_MAX
-         # define PATH_MAX 8192
-         #endif
-       or through a fallback like
-         #ifndef PATH_MAX
-         # define PATH_MAX pathconf ("/", _PC_PATH_MAX)
-         #endif
- */
-
-# include <unistd.h>
-
-# include <limits.h>
-
-# ifndef _POSIX_PATH_MAX
-#  define _POSIX_PATH_MAX 256
-# endif
-
-/* Don't include sys/param.h if it already has been.  */
-# if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-#  include <sys/param.h>
-# endif
-
-# if !defined PATH_MAX && defined MAXPATHLEN
-#  define PATH_MAX MAXPATHLEN
-# endif
-
-# ifdef __hpux
-/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,
-   *not* including the terminating NUL byte, and is set to 1023.
-   Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is
-   not defined at all any more.  */
-#  undef PATH_MAX
-#  define PATH_MAX 1024
-# endif
-
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,
-   section "Maximum Path Length Limitation",
-   <http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx#maxpath>
-   explains that the maximum size of a filename, including the terminating
-   NUL byte, is 260 = 3 + 256 + 1.
-   This is the same value as
-     - FILENAME_MAX in <stdio.h>,
-     - _MAX_PATH in <stdlib.h>,
-     - MAX_PATH in <windef.h>.
-   Undefine the original value, because mingw's <limits.h> gets it wrong.  */
-#  undef PATH_MAX
-#  define PATH_MAX 260
-# endif
-
-#endif /* _PATHMAX_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/printf-args.c gettext-0.18.1.1/gettext-tools/libgettextpo/printf-args.c
--- gettext-0.19.3/gettext-tools/libgettextpo/printf-args.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/printf-args.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2014 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can be parametrized with the following macros:
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/printf-args.h gettext-0.18.1.1/gettext-tools/libgettextpo/printf-args.h
--- gettext-0.19.3/gettext-tools/libgettextpo/printf-args.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/printf-args.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2014 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
@@ -135,14 +136,10 @@
 }
 argument;
 
-/* Number of directly allocated arguments (no malloc() needed).  */
-#define N_DIRECT_ALLOC_ARGUMENTS 7
-
 typedef struct
 {
   size_t count;
   argument *arg;
-  argument direct_alloc_arg[N_DIRECT_ALLOC_ARGUMENTS];
 }
 arguments;
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/printf-parse.c gettext-0.18.1.1/gettext-tools/libgettextpo/printf-parse.c
--- gettext-0.19.3/gettext-tools/libgettextpo/printf-parse.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/printf-parse.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can be parametrized with the following macros:
      CHAR_T             The element type of the format string.
@@ -62,9 +63,6 @@
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
 
-/* memcpy().  */
-#include <string.h>
-
 /* errno.  */
 #include <errno.h>
 
@@ -82,20 +80,23 @@
 int
 PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 {
-  const CHAR_T *cp = format;    /* pointer into format */
+  const CHAR_T *cp = format;            /* pointer into format */
   size_t arg_posn = 0;          /* number of regular arguments consumed */
-  size_t d_allocated;           /* allocated elements of d->dir */
-  size_t a_allocated;           /* allocated elements of a->arg */
+  size_t d_allocated;                   /* allocated elements of d->dir */
+  size_t a_allocated;                   /* allocated elements of a->arg */
   size_t max_width_length = 0;
   size_t max_precision_length = 0;
 
   d->count = 0;
-  d_allocated = N_DIRECT_ALLOC_DIRECTIVES;
-  d->dir = d->direct_alloc_dir;
+  d_allocated = 1;
+  d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE));
+  if (d->dir == NULL)
+    /* Out of memory.  */
+    goto out_of_memory_1;
 
   a->count = 0;
-  a_allocated = N_DIRECT_ALLOC_ARGUMENTS;
-  a->arg = a->direct_alloc_arg;
+  a_allocated = 0;
+  a->arg = NULL;
 
 #define REGISTER_ARG(_index_,_type_) \
   {                                                                     \
@@ -112,14 +113,12 @@
         if (size_overflow_p (memory_size))                              \
           /* Overflow, would lead to out of memory.  */                 \
           goto out_of_memory;                                           \
-        memory = (argument *) (a->arg != a->direct_alloc_arg            \
+        memory = (argument *) (a->arg                                   \
                                ? realloc (a->arg, memory_size)          \
                                : malloc (memory_size));                 \
         if (memory == NULL)                                             \
           /* Out of memory.  */                                         \
           goto out_of_memory;                                           \
-        if (a->arg == a->direct_alloc_arg)                              \
-          memcpy (memory, a->arg, a->count * sizeof (argument));        \
         a->arg = memory;                                                \
       }                                                                 \
     while (a->count <= n)                                               \
@@ -207,13 +206,6 @@
                   dp->flags |= FLAG_ZERO;
                   cp++;
                 }
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-              else if (*cp == 'I')
-                {
-                  dp->flags |= FLAG_LOCALIZED;
-                  cp++;
-                }
-#endif
               else
                 break;
             }
@@ -401,7 +393,7 @@
                       cp++;
                     }
 #if defined __APPLE__ && defined __MACH__
-                  /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
+                  /* On MacOS X 10.3, PRIdMAX is defined as "qd".
                      We cannot change it to "lld" because PRIdMAX must also
                      be understood by the system's printf routines.  */
                   else if (*cp == 'q')
@@ -420,7 +412,7 @@
                     }
 #endif
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-                  /* On native Windows, PRIdMAX is defined as "I64d".
+                  /* On native Win32, PRIdMAX is defined as "I64d".
                      We cannot change it to "lld" because PRIdMAX must also
                      be understood by the system's printf routines.  */
                   else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4')
@@ -589,14 +581,10 @@
               if (size_overflow_p (memory_size))
                 /* Overflow, would lead to out of memory.  */
                 goto out_of_memory;
-              memory = (DIRECTIVE *) (d->dir != d->direct_alloc_dir
-                                      ? realloc (d->dir, memory_size)
-                                      : malloc (memory_size));
+              memory = (DIRECTIVE *) realloc (d->dir, memory_size);
               if (memory == NULL)
                 /* Out of memory.  */
                 goto out_of_memory;
-              if (d->dir == d->direct_alloc_dir)
-                memcpy (memory, d->dir, d->count * sizeof (DIRECTIVE));
               d->dir = memory;
             }
         }
@@ -615,18 +603,19 @@
   return 0;
 
 error:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
   errno = EINVAL;
   return -1;
 
 out_of_memory:
-  if (a->arg != a->direct_alloc_arg)
+  if (a->arg)
     free (a->arg);
-  if (d->dir != d->direct_alloc_dir)
+  if (d->dir)
     free (d->dir);
+out_of_memory_1:
   errno = ENOMEM;
   return -1;
 }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/printf-parse.h gettext-0.18.1.1/gettext-tools/libgettextpo/printf-parse.h
--- gettext-0.19.3/gettext-tools/libgettextpo/printf-parse.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/printf-parse.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2014 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PRINTF_PARSE_H
 #define _PRINTF_PARSE_H
@@ -22,10 +23,6 @@
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.
      STATIC             Set to 'static' to declare the function static.  */
 
-#if HAVE_FEATURES_H
-# include <features.h> /* for __GLIBC__, __UCLIBC__ */
-#endif
-
 #include "printf-args.h"
 
 
@@ -36,9 +33,6 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
-#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)
@@ -46,9 +40,6 @@
 /* xxx_directive: A parsed directive.
    xxx_directives: A parsed format string.  */
 
-/* Number of directly allocated directives (no malloc() needed).  */
-#define N_DIRECT_ALLOC_DIRECTIVES 7
-
 /* A parsed directive.  */
 typedef struct
 {
@@ -73,7 +64,6 @@
   char_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  char_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 char_directives;
 
@@ -103,7 +93,6 @@
   u8_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  u8_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 u8_directives;
 
@@ -131,7 +120,6 @@
   u16_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  u16_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 u16_directives;
 
@@ -159,7 +147,6 @@
   u32_directive *dir;
   size_t max_width_length;
   size_t max_precision_length;
-  u32_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
 }
 u32_directives;
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/progname.c gettext-0.18.1.1/gettext-tools/libgettextpo/progname.c
--- gettext-0.19.3/gettext-tools/libgettextpo/progname.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/progname.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/progname.h gettext-0.18.1.1/gettext-tools/libgettextpo/progname.h
--- gettext-0.19.3/gettext-tools/libgettextpo/progname.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/progname.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/raise.c gettext-0.18.1.1/gettext-tools/libgettextpo/raise.c
--- gettext-0.19.3/gettext-tools/libgettextpo/raise.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/raise.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/* Provide a non-threads replacement for the POSIX raise function.
-
-   Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
-
-   This 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 and Bruno Haible */
-
-#include <config.h>
-
-/* Specification.  */
-#include <signal.h>
-
-#if HAVE_RAISE
-/* Native Windows platform.  */
-
-# include <errno.h>
-
-# include "msvc-inval.h"
-
-# undef raise
-
-# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-raise_nothrow (int sig)
-{
-  int result;
-
-  TRY_MSVC_INVAL
-    {
-      result = raise (sig);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = -1;
-      errno = EINVAL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# else
-#  define raise_nothrow raise
-# endif
-
-#else
-/* An old Unix platform.  */
-
-# include <unistd.h>
-
-# define rpl_raise raise
-
-#endif
-
-int
-rpl_raise (int sig)
-{
-#if GNULIB_defined_signal_blocking && GNULIB_defined_SIGPIPE
-  if (sig == SIGPIPE)
-    return _gl_raise_SIGPIPE ();
-#endif
-
-#if HAVE_RAISE
-  return raise_nothrow (sig);
-#else
-  return kill (getpid (), sig);
-#endif
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/rawmemchr.c gettext-0.18.1.1/gettext-tools/libgettextpo/rawmemchr.c
--- gettext-0.19.3/gettext-tools/libgettextpo/rawmemchr.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/rawmemchr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-/* Searching in a string.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <string.h>
-
-/* Find the first occurrence of C in S.  */
-void *
-rawmemchr (const void *s, int c_in)
-{
-  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
-     long instead of a 64-bit uintmax_t tends to give better
-     performance.  On 64-bit hardware, unsigned long is generally 64
-     bits already.  Change this typedef to experiment with
-     performance.  */
-  typedef unsigned long int longword;
-
-  const unsigned char *char_ptr;
-  const longword *longword_ptr;
-  longword repeated_one;
-  longword repeated_c;
-  unsigned char c;
-
-  c = (unsigned char) c_in;
-
-  /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s;
-       (size_t) char_ptr % sizeof (longword) != 0;
-       ++char_ptr)
-    if (*char_ptr == c)
-      return (void *) char_ptr;
-
-  longword_ptr = (const longword *) char_ptr;
-
-  /* All these elucidatory comments refer to 4-byte longwords,
-     but the theory applies equally well to any size longwords.  */
-
-  /* Compute auxiliary longword values:
-     repeated_one is a value which has a 1 in every byte.
-     repeated_c has c in every byte.  */
-  repeated_one = 0x01010101;
-  repeated_c = c | (c << 8);
-  repeated_c |= repeated_c << 16;
-  if (0xffffffffU < (longword) -1)
-    {
-      repeated_one |= repeated_one << 31 << 1;
-      repeated_c |= repeated_c << 31 << 1;
-      if (8 < sizeof (longword))
-        {
-          size_t i;
-
-          for (i = 64; i < sizeof (longword) * 8; i *= 2)
-            {
-              repeated_one |= repeated_one << i;
-              repeated_c |= repeated_c << i;
-            }
-        }
-    }
-
-  /* Instead of the traditional loop which tests each byte, we will
-     test a longword at a time.  The tricky part is testing if *any of
-     the four* bytes in the longword in question are equal to NUL or
-     c.  We first use an xor with repeated_c.  This reduces the task
-     to testing whether *any of the four* bytes in longword1 is zero.
-
-     We compute tmp =
-       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
-     That is, we perform the following operations:
-       1. Subtract repeated_one.
-       2. & ~longword1.
-       3. & a mask consisting of 0x80 in every byte.
-     Consider what happens in each byte:
-       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
-         and step 3 transforms it into 0x80.  A carry can also be propagated
-         to more significant bytes.
-       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
-         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
-         the byte ends in a single bit of value 0 and k bits of value 1.
-         After step 2, the result is just k bits of value 1: 2^k - 1.  After
-         step 3, the result is 0.  And no carry is produced.
-     So, if longword1 has only non-zero bytes, tmp is zero.
-     Whereas if longword1 has a zero byte, call j the position of the least
-     significant zero byte.  Then the result has a zero at positions 0, ...,
-     j-1 and a 0x80 at position j.  We cannot predict the result at the more
-     significant bytes (positions j+1..3), but it does not matter since we
-     already have a non-zero bit at position 8*j+7.
-
-     The test whether any byte in longword1 is zero is equivalent
-     to testing whether tmp is nonzero.
-
-     This test can read beyond the end of a string, depending on where
-     C_IN is encountered.  However, this is considered safe since the
-     initialization phase ensured that the read will be aligned,
-     therefore, the read will not cross page boundaries and will not
-     cause a fault.  */
-
-  while (1)
-    {
-      longword longword1 = *longword_ptr ^ repeated_c;
-
-      if ((((longword1 - repeated_one) & ~longword1)
-           & (repeated_one << 7)) != 0)
-        break;
-      longword_ptr++;
-    }
-
-  char_ptr = (const unsigned char *) longword_ptr;
-
-  /* At this point, we know that one of the sizeof (longword) bytes
-     starting at char_ptr is == c.  On little-endian machines, we
-     could determine the first such byte without any further memory
-     accesses, just by looking at the tmp result from the last loop
-     iteration.  But this does not work on big-endian machines.
-     Choose code that works in both cases.  */
-
-  char_ptr = (unsigned char *) longword_ptr;
-  while (*char_ptr != c)
-    char_ptr++;
-  return (void *) char_ptr;
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/rawmemchr.valgrind gettext-0.18.1.1/gettext-tools/libgettextpo/rawmemchr.valgrind
--- gettext-0.19.3/gettext-tools/libgettextpo/rawmemchr.valgrind	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/rawmemchr.valgrind	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# Suppress a valgrind message about use of uninitialized memory in rawmemchr().
-# This use is OK because it provides only a speedup.
-{
-    rawmemchr-value4
-    Memcheck:Value4
-    fun:rawmemchr
-}
-{
-    rawmemchr-value8
-    Memcheck:Value8
-    fun:rawmemchr
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/realloc.c gettext-0.18.1.1/gettext-tools/libgettextpo/realloc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/realloc.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/realloc.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,6 +1,6 @@
 /* realloc() function that is glibc compatible.
 
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2014 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -18,27 +18,36 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
 #ifdef realloc
 # define NEED_REALLOC_GNU 1
-/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU.  */
-#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU
-# define NEED_REALLOC_GNU 1
 #endif
 
 /* Infer the properties of the system's malloc function.
-   The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
-#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU
+   Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
+#if GNULIB_MALLOC_GNU && !defined malloc
 # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
 #endif
 
+/* Below we want to call the system's malloc and realloc.
+   Undefine the symbols here so that including <stdlib.h> provides a
+   declaration of malloc(), not of rpl_malloc(), and likewise for realloc.  */
+#undef malloc
+#undef realloc
+
+/* Specification.  */
 #include <stdlib.h>
 
 #include <errno.h>
 
+/* Below we want to call the system's malloc and realloc.
+   Undefine the symbols, if they were defined by gnulib's <stdlib.h>
+   replacement.  */
+#undef malloc
+#undef realloc
+
 /* Change the size of an allocated block of memory P to N bytes,
    with error checking.  If N is zero, change it to 1.  If P is NULL,
    use malloc.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/ref-add.sin gettext-0.18.1.1/gettext-tools/libgettextpo/ref-add.sin
--- gettext-0.19.3/gettext-tools/libgettextpo/ref-add.sin	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/ref-add.sin	2010-02-16 21:33:15.000000000 +0000
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/ref-del.sin gettext-0.18.1.1/gettext-tools/libgettextpo/ref-del.sin
--- gettext-0.19.3/gettext-tools/libgettextpo/ref-del.sin	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/ref-del.sin	2010-02-16 21:33:15.000000000 +0000
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 #   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/>.
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/relocatable.c gettext-0.18.1.1/gettext-tools/libgettextpo/relocatable.c
--- gettext-0.19.3/gettext-tools/libgettextpo/relocatable.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/relocatable.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 
 /* Tell glibc's <stdio.h> to provide a prototype for getline().
@@ -23,7 +25,6 @@
 # define _GNU_SOURCE 1
 #endif
 
-#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -42,7 +43,7 @@
 # include "xalloc.h"
 #endif
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -69,8 +70,8 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Native Windows, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -85,19 +86,6 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Whether to enable the more costly support for relocatable libraries.
-   It allows libraries to be have been installed with a different original
-   prefix than the program.  But it is quite costly, especially on Cygwin
-   platforms, see below.  Therefore we enable it by default only on native
-   Windows platforms.  */
-#ifndef ENABLE_COSTLY_RELOCATABLE
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-#  define ENABLE_COSTLY_RELOCATABLE 1
-# else
-#  define ENABLE_COSTLY_RELOCATABLE 0
-# endif
-#endif
-
 /* Original installation prefix.  */
 static char *orig_prefix;
 static size_t orig_prefix_len;
@@ -167,7 +155,7 @@
 #endif
 }
 
-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
 
 /* Convenience function:
    Computes the current installation prefix, based on the original
@@ -249,7 +237,7 @@
                often case-insensitive.  It's better to accept the comparison
                if the difference is only in case, rather than to fail.  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-            /* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
+            /* Win32, Cygwin, OS/2, DOS - case insignificant file system */
             if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
                 != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
               break;
@@ -297,17 +285,12 @@
 
 #endif /* !IN_LIBRARY || PIC */
 
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
 
 /* Full pathname of shared library, or NULL.  */
 static char *shared_library_fullname;
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-/* Native Windows only.
-   On Cygwin, it is better to use the Cygwin provided /proc interface, than
-   to use native Windows API and cygwin_conv_to_posix_path, because it
-   supports longer file names
-   (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 
 /* Determine the full pathname of the shared library when it is loaded.  */
 
@@ -329,23 +312,37 @@
         /* Shouldn't happen.  */
         return FALSE;
 
-      shared_library_fullname = strdup (location);
+      {
+#if defined __CYGWIN__
+        /* On Cygwin, we need to convert paths coming from Win32 system calls
+           to the Unix-like slashified notation.  */
+        static char location_as_posix_path[2 * MAX_PATH];
+        /* There's no error return defined for cygwin_conv_to_posix_path.
+           See cygwin-api/func-cygwin-conv-to-posix-path.html.
+           Does it overflow the buffer of expected size MAX_PATH or does it
+           truncate the path?  I don't know.  Let's catch both.  */
+        cygwin_conv_to_posix_path (location, location_as_posix_path);
+        location_as_posix_path[MAX_PATH - 1] = '\0';
+        if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+          /* A sign of buffer overflow or path truncation.  */
+          return FALSE;
+        shared_library_fullname = strdup (location_as_posix_path);
+#else
+        shared_library_fullname = strdup (location);
+#endif
+      }
     }
 
   return TRUE;
 }
 
-#else /* Unix */
+#else /* Unix except Cygwin */
 
 static void
 find_shared_library_fullname ()
 {
-#if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
-  /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
-     function.
-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
-     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
-     Cygwin 1.7.  */
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */
@@ -390,15 +387,15 @@
 #endif
 }
 
-#endif /* Native Windows / Unix */
+#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin, and native Windows.  */
+   Guaranteed to work only on Linux, Cygwin and Woe32.  */
 static char *
 get_shared_library_fullname ()
 {
-#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
   static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)
     {
@@ -418,7 +415,7 @@
 const char *
 relocate (const char *pathname)
 {
-#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+#if defined PIC && defined INSTALLDIR
   static int initialized;
 
   /* Initialization code for a shared library.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/relocatable.h gettext-0.18.1.1/gettext-tools/libgettextpo/relocatable.h
--- gettext-0.19.3/gettext-tools/libgettextpo/relocatable.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/relocatable.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,19 +1,21 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library 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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _RELOCATABLE_H
 #define _RELOCATABLE_H
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/signal.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/signal.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/signal.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/signal.in.h	2010-03-28 18:33:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,51 +18,22 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
-/* Special invocation convention:
-   - Inside glibc header files.
-   - On glibc systems we have a sequence of nested includes
-     <signal.h> -> <ucontext.h> -> <signal.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.
-   - On glibc systems with GCC 4.3 we have a sequence of nested includes
-     <csignal> -> </usr/include/signal.h> -> <sys/ucontext.h> -> <signal.h>.
-     In this situation, some of the functions are not yet declared, therefore
-     we cannot provide the C++ aliases.  */
+#if defined __need_sig_atomic_t || defined __need_sigset_t
+/* Special invocation convention inside glibc header files.  */
 
 # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_SIGNAL_H
-
-#define _GL_ALREADY_INCLUDING_SIGNAL_H
-
-/* Define pid_t, uid_t.
-   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.
-   On Solaris 10, <signal.h> includes <sys/types.h>, which eventually includes
-   us; so include <sys/types.h> now, before the second inclusion guard.  */
-#include <sys/types.h>
+#ifndef _GL_SIGNAL_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
-#undef _GL_ALREADY_INCLUDING_SIGNAL_H
-
-#ifndef _@GUARD_PREFIX@_SIGNAL_H
-#define _@GUARD_PREFIX@_SIGNAL_H
-
-/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
-   pthread_sigmask in <pthread.h>, not in <signal.h>.
-   But avoid namespace pollution on glibc systems.*/
-#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
-    && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
-    && ! defined __GLIBC__
-# include <pthread.h>
-#endif
+#ifndef _GL_SIGNAL_H
+#define _GL_SIGNAL_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -70,38 +41,22 @@
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
+/* Define pid_t, uid_t.
+   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+#include <sys/types.h>
+
 /* On AIX, sig_atomic_t already includes volatile.  C99 requires that
    'volatile sig_atomic_t' ignore the extra modifier, but C89 did not.
    Hence, redefine this to a non-volatile type as needed.  */
 #if ! @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
-# if !GNULIB_defined_sig_atomic_t
 typedef int rpl_sig_atomic_t;
-#  undef sig_atomic_t
-#  define sig_atomic_t rpl_sig_atomic_t
-#  define GNULIB_defined_sig_atomic_t 1
-# endif
+# undef sig_atomic_t
+# define sig_atomic_t rpl_sig_atomic_t
 #endif
 
 /* A set or mask of signals.  */
 #if !@HAVE_SIGSET_T@
-# if !GNULIB_defined_sigset_t
 typedef unsigned int sigset_t;
-#  define GNULIB_defined_sigset_t 1
-# endif
-#endif
-
-/* Define sighandler_t, the type of signal handlers.  A GNU extension.  */
-#if !@HAVE_SIGHANDLER_T@
-# ifdef __cplusplus
-extern "C" {
-# endif
-# if !GNULIB_defined_sighandler_t
-typedef void (*sighandler_t) (int);
-#  define GNULIB_defined_sighandler_t 1
-# endif
-# ifdef __cplusplus
-}
-# endif
 #endif
 
 
@@ -116,102 +71,22 @@
 #endif
 
 
-/* Maximum signal number + 1.  */
-#ifndef NSIG
-# if defined __TANDEM
-#  define NSIG 32
-# endif
-#endif
-
-
-#if @GNULIB_PTHREAD_SIGMASK@
-# if @REPLACE_PTHREAD_SIGMASK@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pthread_sigmask
-#   define pthread_sigmask rpl_pthread_sigmask
-#  endif
-_GL_FUNCDECL_RPL (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-_GL_CXXALIAS_RPL (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-# else
-#  if !@HAVE_PTHREAD_SIGMASK@
-_GL_FUNCDECL_SYS (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-#  endif
-_GL_CXXALIAS_SYS (pthread_sigmask, int,
-                  (int how, const sigset_t *new_mask, sigset_t *old_mask));
-# endif
-_GL_CXXALIASWARN (pthread_sigmask);
-#elif defined GNULIB_POSIXCHECK
-# undef pthread_sigmask
-# if HAVE_RAW_DECL_PTHREAD_SIGMASK
-_GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - "
-                 "use gnulib module pthread_sigmask for portability");
-# endif
-#endif
-
-
-#if @GNULIB_RAISE@
-# if @REPLACE_RAISE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef raise
-#   define raise rpl_raise
-#  endif
-_GL_FUNCDECL_RPL (raise, int, (int sig));
-_GL_CXXALIAS_RPL (raise, int, (int sig));
-# else
-#  if !@HAVE_RAISE@
-_GL_FUNCDECL_SYS (raise, int, (int sig));
-#  endif
-_GL_CXXALIAS_SYS (raise, int, (int sig));
-# endif
-_GL_CXXALIASWARN (raise);
-#elif defined GNULIB_POSIXCHECK
-# undef raise
-/* Assume raise is always declared.  */
-_GL_WARN_ON_USE (raise, "raise can crash on native Windows - "
-                 "use gnulib module raise for portability");
-#endif
-
-
 #if @GNULIB_SIGPROCMASK@
 # if !@HAVE_POSIX_SIGNALBLOCKING@
 
-#  ifndef GNULIB_defined_signal_blocking
-#   define GNULIB_defined_signal_blocking 1
-#  endif
-
 /* Maximum signal number + 1.  */
 #  ifndef NSIG
 #   define NSIG 32
 #  endif
 
 /* This code supports only 32 signals.  */
-#  if !GNULIB_defined_verify_NSIG_constraint
-typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1];
-#   define GNULIB_defined_verify_NSIG_constraint 1
-#  endif
+typedef int verify_NSIG_constraint[2 * (NSIG <= 32) - 1];
 
 # endif
 
-/* When also using extern inline, suppress the use of static inline in
-   standard headers of problematic Apple configurations, as Libc at
-   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
-     && (defined __i386__ || defined __x86_64__))
-# undef sigaddset
-# undef sigdelset
-# undef sigemptyset
-# undef sigfillset
-# undef sigismember
-#endif
-
 /* Test whether a given signal is contained in a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigismember
 #  endif
@@ -224,7 +99,7 @@
 
 /* Initialize a signal set to the empty set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigemptyset
 #  endif
@@ -236,7 +111,7 @@
 
 /* Add a signal to a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigaddset
 #  endif
@@ -249,7 +124,7 @@
 
 /* Remove a signal from a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigdelset
 #  endif
@@ -262,7 +137,7 @@
 
 /* Fill a signal set with all possible signals.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on Mac OS X.  */
+/* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigfillset
 #  endif
@@ -300,10 +175,7 @@
 # ifdef __cplusplus
 extern "C" {
 # endif
-# if !GNULIB_defined_function_taking_int_returning_void_t
 typedef void (*_gl_function_taking_int_returning_void_t) (int);
-#  define GNULIB_defined_function_taking_int_returning_void_t 1
-# endif
 # ifdef __cplusplus
 }
 # endif
@@ -321,10 +193,18 @@
 # endif
 _GL_CXXALIASWARN (signal);
 
+/* Raise signal SIG.  */
 # if !@HAVE_POSIX_SIGNALBLOCKING@ && GNULIB_defined_SIGPIPE
-/* Raise signal SIGPIPE.  */
-_GL_EXTERN_C int _gl_raise_SIGPIPE (void);
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef raise
+#   define raise rpl_raise
+#  endif
+_GL_FUNCDECL_RPL (raise, int, (int sig));
+_GL_CXXALIAS_RPL (raise, int, (int sig));
+# else
+_GL_CXXALIAS_SYS (raise, int, (int sig));
 # endif
+_GL_CXXALIASWARN (raise);
 
 #elif defined GNULIB_POSIXCHECK
 # undef sigaddset
@@ -369,9 +249,6 @@
 # if !@HAVE_SIGACTION@
 
 #  if !@HAVE_SIGINFO_T@
-
-#   if !GNULIB_defined_siginfo_types
-
 /* Present to allow compilation, but unsupported by gnulib.  */
 union sigval
 {
@@ -393,17 +270,11 @@
   union sigval si_value;
 };
 typedef struct siginfo_t siginfo_t;
-
-#    define GNULIB_defined_siginfo_types 1
-#   endif
-
 #  endif /* !@HAVE_SIGINFO_T@ */
 
 /* We assume that platforms which lack the sigaction() function also lack
    the 'struct sigaction' type, and vice versa.  */
 
-#  if !GNULIB_defined_struct_sigaction
-
 struct sigaction
 {
   union
@@ -419,15 +290,12 @@
   /* Not all POSIX flags are supported.  */
   int sa_flags;
 };
-#   define sa_handler _sa_func._sa_handler
-#   define sa_sigaction _sa_func._sa_sigaction
+#  define sa_handler _sa_func._sa_handler
+#  define sa_sigaction _sa_func._sa_sigaction
 /* Unsupported flags are not present.  */
-#   define SA_RESETHAND 1
-#   define SA_NODEFER 2
-#   define SA_RESTART 4
-
-#   define GNULIB_defined_struct_sigaction 1
-#  endif
+#  define SA_RESETHAND 1
+#  define SA_NODEFER 2
+#  define SA_RESTART 4
 
 _GL_FUNCDECL_SYS (sigaction, int, (int, const struct sigaction *restrict,
                                    struct sigaction *restrict));
@@ -456,6 +324,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/sigprocmask.c gettext-0.18.1.1/gettext-tools/libgettextpo/sigprocmask.c
--- gettext-0.19.3/gettext-tools/libgettextpo/sigprocmask.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/sigprocmask.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,15 +24,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-# include "msvc-inval.h"
-#endif
-
 /* We assume that a platform without POSIX signal blocking functions
    also does not have the POSIX sigaction() function, only the
    signal() function.  We also assume signal() has SysV semantics,
    where any handler is uninstalled prior to being invoked.  This is
-   true for native Windows platforms.  */
+   true for Woe32 platforms.  */
 
 /* We use raw signal(), but also provide a wrapper rpl_signal() so
    that applications can query or change a blocked signal.  */
@@ -62,28 +58,6 @@
 
 typedef void (*handler_t) (int);
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static handler_t
-signal_nothrow (int sig, handler_t handler)
-{
-  handler_t result;
-
-  TRY_MSVC_INVAL
-    {
-      result = signal (sig, handler);
-    }
-  CATCH_MSVC_INVAL
-    {
-      result = SIG_ERR;
-      errno = EINVAL;
-    }
-  DONE_MSVC_INVAL;
-
-  return result;
-}
-# define signal signal_nothrow
-#endif
-
 /* Handling of gnulib defined signals.  */
 
 #if GNULIB_defined_SIGPIPE
@@ -106,7 +80,6 @@
       return signal (sig, handler);
     }
 }
-# undef signal
 # define signal ext_signal
 #endif
 
@@ -330,20 +303,27 @@
 }
 
 #if GNULIB_defined_SIGPIPE
-/* Raise the signal SIGPIPE.  */
+/* Raise the signal SIG.  */
 int
-_gl_raise_SIGPIPE (void)
+rpl_raise (int sig)
+# undef raise
 {
-  if (blocked_set & (1U << SIGPIPE))
-    pending_array[SIGPIPE] = 1;
-  else
+  switch (sig)
     {
-      handler_t handler = SIGPIPE_handler;
-      if (handler == SIG_DFL)
-        exit (128 + SIGPIPE);
-      else if (handler != SIG_IGN)
-        (*handler) (SIGPIPE);
+    case SIGPIPE:
+      if (blocked_set & (1U << sig))
+        pending_array[sig] = 1;
+      else
+        {
+          handler_t handler = SIGPIPE_handler;
+          if (handler == SIG_DFL)
+            exit (128 + SIGPIPE);
+          else if (handler != SIG_IGN)
+            (*handler) (sig);
+        }
+      return 0;
+    default: /* System defined signal */
+      return raise (sig);
     }
-  return 0;
 }
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/size_max.h gettext-0.18.1.1/gettext-tools/libgettextpo/size_max.h
--- gettext-0.19.3/gettext-tools/libgettextpo/size_max.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/size_max.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef GNULIB_SIZE_MAX_H
 #define GNULIB_SIZE_MAX_H
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stat.c gettext-0.18.1.1/gettext-tools/libgettextpo/stat.c
--- gettext-0.19.3/gettext-tools/libgettextpo/stat.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stat.c	2010-02-16 21:33:15.000000000 +0000
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,59 +16,27 @@
 
 /* written by Eric Blake */
 
-/* If the user's config.h happens to include <sys/stat.h>, let it include only
-   the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
-   rpl_stat.  */
-#define __need_system_sys_stat_h
 #include <config.h>
 
 /* Get the original definition of stat.  It might be defined as a macro.  */
+#define __need_system_sys_stat_h
 #include <sys/types.h>
 #include <sys/stat.h>
 #undef __need_system_sys_stat_h
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# if _GL_WINDOWS_64_BIT_ST_SIZE
-#  undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
-#  define stat _stati64
-#  define REPLACE_FUNC_STAT_DIR 1
-#  undef REPLACE_FUNC_STAT_FILE
-# elif REPLACE_FUNC_STAT_FILE
-/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a.
-   Bypass it.  */
-#  define stat _stat
-#  define REPLACE_FUNC_STAT_DIR 1
-#  undef REPLACE_FUNC_STAT_FILE
-# endif
-#endif
-
-static int
+static inline int
 orig_stat (const char *filename, struct stat *buf)
 {
   return stat (filename, buf);
 }
 
 /* Specification.  */
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-#include "sys/stat.h"
+#include <sys/stat.h>
 
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
-#include "dosname.h"
-#include "verify.h"
-
-#if REPLACE_FUNC_STAT_DIR
-# include "pathmax.h"
-  /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
-     have a constant PATH_MAX.  */
-# ifndef PATH_MAX
-#  error "Please port this replacement to your platform"
-# endif
-#endif
 
 /* Store information about NAME into ST.  Work around bugs with
    trailing slashes.  Mingw has other bugs (such as st_ino always
@@ -94,7 +62,6 @@
     }
 #endif /* REPLACE_FUNC_STAT_FILE */
 #if REPLACE_FUNC_STAT_DIR
-
   if (result == -1 && errno == ENOENT)
     {
       /* Due to mingw's oddities, there are some directories (like
@@ -109,7 +76,6 @@
       char fixed_name[PATH_MAX + 1] = {0};
       size_t len = strlen (name);
       bool check_dir = false;
-      verify (PATH_MAX <= 4096);
       if (PATH_MAX <= len)
         errno = ENAMETOOLONG;
       else if (len)
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stdarg.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdarg.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/stdarg.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdarg.in.h	2010-04-25 09:22:40.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,24 +12,24 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_STDARG_H
+#ifndef _GL_STDARG_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDARG_H@
 
-#ifndef _@GUARD_PREFIX@_STDARG_H
-#define _@GUARD_PREFIX@_STDARG_H
+#ifndef _GL_STDARG_H
+#define _GL_STDARG_H
 
 #ifndef va_copy
 # define va_copy(a,b) ((a) = (b))
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDARG_H */
-#endif /* _@GUARD_PREFIX@_STDARG_H */
+#endif /* _GL_STDARG_H */
+#endif /* _GL_STDARG_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stdbool.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdbool.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/stdbool.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdbool.in.h	2010-04-25 09:22:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2010 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
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GL_STDBOOL_H
 #define _GL_STDBOOL_H
@@ -66,19 +67,24 @@
 # undef true
 #endif
 
-#ifdef __cplusplus
-# define _Bool bool
-# define bool bool
-#else
-# if defined __BEOS__ && !defined __HAIKU__
+/* For the sake of symbolic names in gdb, we define true and false as
+   enum constants, not only as macros.
+   It is tempting to write
+      typedef enum { false = 0, true = 1 } _Bool;
+   so that gdb prints values of type 'bool' symbolically. But if we do
+   this, values of type '_Bool' may promote to 'int' or 'unsigned int'
+   (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+   (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+   enum; this ensures that '_Bool' promotes to 'int'.  */
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
   /* A compiler known to have 'bool'.  */
   /* If the compiler already has both 'bool' and '_Bool', we can assume they
      are the same types.  */
-#  if !@HAVE__BOOL@
+# if !@HAVE__BOOL@
 typedef bool _Bool;
-#  endif
-# else
-#  if !defined __GNUC__
+# endif
+#else
+# if !defined __GNUC__
    /* If @HAVE__BOOL@:
         Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
         the built-in _Bool type is used.  See
@@ -98,35 +104,19 @@
           "Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
         The only benefit of the enum, debuggability, is not important
         with these compilers.  So use 'signed char' and no enum.  */
-#   define _Bool signed char
-#  else
+#  define _Bool signed char
+# else
    /* With this compiler, trust the _Bool type if the compiler has it.  */
-#   if !@HAVE__BOOL@
-   /* For the sake of symbolic names in gdb, define true and false as
-      enum constants, not only as macros.
-      It is tempting to write
-         typedef enum { false = 0, true = 1 } _Bool;
-      so that gdb prints values of type 'bool' symbolically.  But then
-      values of type '_Bool' might promote to 'int' or 'unsigned int'
-      (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
-      (see ISO C 99 6.3.1.1.(2)).  So add a negative value to the
-      enum; this ensures that '_Bool' promotes to 'int'.  */
+#  if !@HAVE__BOOL@
 typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
-#   endif
 #  endif
 # endif
-# define bool _Bool
 #endif
+#define bool _Bool
 
 /* The other macros must be usable in preprocessor directives.  */
-#ifdef __cplusplus
-# define false false
-# define true true
-#else
-# define false 0
-# define true 1
-#endif
-
+#define false 0
+#define true 1
 #define __bool_true_false_are_defined 1
 
 #endif /* _GL_STDBOOL_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stddef.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stddef.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/stddef.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stddef.in.h	2010-02-16 21:33:15.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake.  */
 
@@ -25,7 +26,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_wchar_t || defined __need_size_t  \
   || defined __need_ptrdiff_t || defined __need_NULL \
@@ -37,9 +37,9 @@
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   undef _@GUARD_PREFIX@_STDDEF_H
+#   undef _GL_STDDEF_H
 #   define _GL_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -48,14 +48,14 @@
 #else
 /* Normal invocation convention.  */
 
-# ifndef _@GUARD_PREFIX@_STDDEF_H
+# ifndef _GL_STDDEF_H
 
 /* The include_next requires a split double-inclusion guard.  */
 
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
 
-#  ifndef _@GUARD_PREFIX@_STDDEF_H
-#   define _@GUARD_PREFIX@_STDDEF_H
+#  ifndef _GL_STDDEF_H
+#   define _GL_STDDEF_H
 
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
 #if @REPLACE_NULL@
@@ -81,6 +81,6 @@
 # define wchar_t int
 #endif
 
-#  endif /* _@GUARD_PREFIX@_STDDEF_H */
-# endif /* _@GUARD_PREFIX@_STDDEF_H */
+#  endif /* _GL_STDDEF_H */
+# endif /* _GL_STDDEF_H */
 #endif /* __need_XXX */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stdint.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/stdint.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h	2010-04-25 09:22:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -13,19 +13,19 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
  * ISO C 99 <stdint.h> for platforms that lack it.
  * <http://www.opengroup.org/susv3xbd/stdint.h.html>
  */
 
-#ifndef _@GUARD_PREFIX@_STDINT_H
+#ifndef _GL_STDINT_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* When including a system file that in turn includes <inttypes.h>,
    use the system <inttypes.h>, not our substitute.  This avoids
@@ -33,15 +33,6 @@
    <inttypes.h>.  */
 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
-/* On Android (Bionic libc), <sys/types.h> includes this file before
-   having defined 'time_t'.  Therefore in this case avoid including
-   other system header files; just include the system's <stdint.h>.
-   Ideally we should test __BIONIC__ here, but it is only defined after
-   <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
-#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H
-# @INCLUDE_NEXT@ @NEXT_STDINT_H@
-#else
-
 /* Get those types that are already defined in other system include
    files, so that we can "#define int8_t signed char" below without
    worrying about a later system include file containing a "typedef
@@ -57,40 +48,28 @@
       diagnostics.  */
 #  define __STDINT_H__
 # endif
-
-  /* Some pre-C++11 <stdint.h> implementations need this.  */
-# ifdef __cplusplus
-#  ifndef __STDC_CONSTANT_MACROS
-#   define __STDC_CONSTANT_MACROS 1
-#  endif
-#  ifndef __STDC_LIMIT_MACROS
-#   define __STDC_LIMIT_MACROS 1
-#  endif
-# endif
-
   /* Other systems may have an incomplete or buggy <stdint.h>.
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
-     _@GUARD_PREFIX@_STDINT_H is defined.
+     _GL_STDINT_H is defined.
      The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #endif
 
-#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-#define _@GUARD_PREFIX@_STDINT_H
+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_STDINT_H
 
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
    AIX 5.2 <sys/types.h> isn't needed and causes troubles.
-   Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @NEXT_STDINT_H@.  */
 #if @HAVE_SYS_TYPES_H@ && ! defined _AIX
 # include <sys/types.h>
 #endif
 
-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
-   LONG_MIN, LONG_MAX, ULONG_MAX.  */
+/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 
 #if @HAVE_INTTYPES_H@
@@ -113,7 +92,7 @@
 
 #undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
-/* Minimum and maximum values for an integer type under the usual assumption.
+/* Minimum and maximum values for a integer type under the usual assumption.
    Return an unspecified value if BITS == 0, adding a check to pacify
    picky compilers.  */
 
@@ -128,8 +107,6 @@
         warnings in the signed case.  */ \
      ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
-#if !GNULIB_defined_stdint_types
-
 /* 7.18.1.1. Exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -156,54 +133,40 @@
 #define int32_t gl_int32_t
 #define uint32_t gl_uint32_t
 
-/* If the system defines INT64_MAX, assume int64_t works.  That way,
-   if the underlying platform defines int64_t to be a 64-bit long long
-   int, the code below won't mistakenly define it to be a 64-bit long
-   int, which would mess up C++ name mangling.  We must use #ifdef
-   rather than #if, to avoid an error with HP-UX 10.20 cc.  */
-
-#ifdef INT64_MAX
-# define GL_INT64_T
-#else
 /* Do not undefine int64_t if gnulib is not being used with 64-bit
    types, since otherwise it breaks platforms like Tandem/NSK.  */
-# if LONG_MAX >> 31 >> 31 == 1
-#  undef int64_t
+#if LONG_MAX >> 31 >> 31 == 1
+# undef int64_t
 typedef long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif defined _MSC_VER
-#  undef int64_t
+# define int64_t gl_int64_t
+# define GL_INT64_T
+#elif defined _MSC_VER
+# undef int64_t
 typedef __int64 gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif @HAVE_LONG_LONG_INT@
-#  undef int64_t
+# define int64_t gl_int64_t
+# define GL_INT64_T
+#elif @HAVE_LONG_LONG_INT@
+# undef int64_t
 typedef long long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# endif
+# define int64_t gl_int64_t
+# define GL_INT64_T
 #endif
 
-#ifdef UINT64_MAX
-# define GL_UINT64_T
-#else
-# if ULONG_MAX >> 31 >> 31 >> 1 == 1
-#  undef uint64_t
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# undef uint64_t
 typedef unsigned long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif defined _MSC_VER
-#  undef uint64_t
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+#elif defined _MSC_VER
+# undef uint64_t
 typedef unsigned __int64 gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@
-#  undef uint64_t
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# undef uint64_t
 typedef unsigned long long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# endif
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
 #endif
 
 /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
@@ -246,9 +209,8 @@
 
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-   are taken from the same list of types.  The following code normally
-   uses types consistent with glibc, as that lessens the chance of
-   incompatibility with older GNU hosts.  */
+   are taken from the same list of types.  Assume that 'long int'
+   is fast enough for all narrower integers.  */
 
 #undef int_fast8_t
 #undef uint_fast8_t
@@ -258,21 +220,12 @@
 #undef uint_fast32_t
 #undef int_fast64_t
 #undef uint_fast64_t
-typedef signed char gl_int_fast8_t;
-typedef unsigned char gl_uint_fast8_t;
-
-#ifdef __sun
-/* Define types compatible with SunOS 5.10, so that code compiled under
-   earlier SunOS versions works with code compiled under SunOS 5.10.  */
-typedef int gl_int_fast32_t;
-typedef unsigned int gl_uint_fast32_t;
-#else
+typedef long int gl_int_fast8_t;
+typedef unsigned long int gl_uint_fast8_t;
+typedef long int gl_int_fast16_t;
+typedef unsigned long int gl_uint_fast16_t;
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
-#endif
-typedef gl_int_fast32_t gl_int_fast16_t;
-typedef gl_uint_fast32_t gl_uint_fast16_t;
-
 #define int_fast8_t gl_int_fast8_t
 #define uint_fast8_t gl_uint_fast8_t
 #define int_fast16_t gl_int_fast16_t
@@ -300,49 +253,37 @@
 /* Note: These types are compiler dependent. It may be unwise to use them in
    public header files. */
 
-/* If the system defines INTMAX_MAX, assume that intmax_t works, and
-   similarly for UINTMAX_MAX and uintmax_t.  This avoids problems with
-   assuming one type where another is used by the system.  */
-
-#ifndef INTMAX_MAX
-# undef INTMAX_C
-# undef intmax_t
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#undef intmax_t
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 typedef long long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# elif defined GL_INT64_T
-#  define intmax_t int64_t
-# else
+# define intmax_t gl_intmax_t
+#elif defined GL_INT64_T
+# define intmax_t int64_t
+#else
 typedef long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# endif
+# define intmax_t gl_intmax_t
 #endif
 
-#ifndef UINTMAX_MAX
-# undef UINTMAX_C
-# undef uintmax_t
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#undef uintmax_t
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 typedef unsigned long long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# elif defined GL_UINT64_T
-#  define uintmax_t uint64_t
-# else
+# define uintmax_t gl_uintmax_t
+#elif defined GL_UINT64_T
+# define uintmax_t uint64_t
+#else
 typedef unsigned long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# endif
+# define uintmax_t gl_uintmax_t
 #endif
 
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
    breaks if this is not the case.  If this check fails, the reason is likely
    to be found in the autoconf macros.  */
-typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
-                                ? 1 : -1];
-
-#define GNULIB_defined_stdint_types 1
-#endif /* !GNULIB_defined_stdint_types */
+typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
 
 /* 7.18.2. Limits of specified-width integer types */
 
+#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
+
 /* 7.18.2.1. Limits of exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -369,14 +310,17 @@
 #define INT32_MAX  2147483647
 #define UINT32_MAX  4294967295U
 
-#if defined GL_INT64_T && ! defined INT64_MAX
+#undef INT64_MIN
+#undef INT64_MAX
+#ifdef GL_INT64_T
 /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
    evaluates the latter incorrectly in preprocessor expressions.  */
 # define INT64_MIN  (- INTMAX_C (1) << 63)
 # define INT64_MAX  INTMAX_C (9223372036854775807)
 #endif
 
-#if defined GL_UINT64_T && ! defined UINT64_MAX
+#undef UINT64_MAX
+#ifdef GL_UINT64_T
 # define UINT64_MAX  UINTMAX_C (18446744073709551615)
 #endif
 
@@ -428,29 +372,23 @@
 #undef INT_FAST8_MIN
 #undef INT_FAST8_MAX
 #undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  SCHAR_MIN
-#define INT_FAST8_MAX  SCHAR_MAX
-#define UINT_FAST8_MAX  UCHAR_MAX
+#define INT_FAST8_MIN  LONG_MIN
+#define INT_FAST8_MAX  LONG_MAX
+#define UINT_FAST8_MAX  ULONG_MAX
 
 #undef INT_FAST16_MIN
 #undef INT_FAST16_MAX
 #undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  INT_FAST32_MIN
-#define INT_FAST16_MAX  INT_FAST32_MAX
-#define UINT_FAST16_MAX  UINT_FAST32_MAX
+#define INT_FAST16_MIN  LONG_MIN
+#define INT_FAST16_MAX  LONG_MAX
+#define UINT_FAST16_MAX  ULONG_MAX
 
 #undef INT_FAST32_MIN
 #undef INT_FAST32_MAX
 #undef UINT_FAST32_MAX
-#ifdef __sun
-# define INT_FAST32_MIN  INT_MIN
-# define INT_FAST32_MAX  INT_MAX
-# define UINT_FAST32_MAX  UINT_MAX
-#else
-# define INT_FAST32_MIN  LONG_MIN
-# define INT_FAST32_MAX  LONG_MAX
-# define UINT_FAST32_MAX  ULONG_MAX
-#endif
+#define INT_FAST32_MIN  LONG_MIN
+#define INT_FAST32_MAX  LONG_MAX
+#define UINT_FAST32_MAX  ULONG_MAX
 
 #undef INT_FAST64_MIN
 #undef INT_FAST64_MAX
@@ -475,23 +413,21 @@
 
 /* 7.18.2.5. Limits of greatest-width integer types */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_MIN
-# ifdef INT64_MAX
-#  define INTMAX_MIN  INT64_MIN
-#  define INTMAX_MAX  INT64_MAX
-# else
-#  define INTMAX_MIN  INT32_MIN
-#  define INTMAX_MAX  INT32_MAX
-# endif
+#undef INTMAX_MIN
+#undef INTMAX_MAX
+#ifdef INT64_MAX
+# define INTMAX_MIN  INT64_MIN
+# define INTMAX_MAX  INT64_MAX
+#else
+# define INTMAX_MIN  INT32_MIN
+# define INTMAX_MAX  INT32_MAX
 #endif
 
-#ifndef UINTMAX_MAX
-# ifdef UINT64_MAX
-#  define UINTMAX_MAX  UINT64_MAX
-# else
-#  define UINTMAX_MAX  UINT32_MAX
-# endif
+#undef UINTMAX_MAX
+#ifdef UINT64_MAX
+# define UINTMAX_MAX  UINT64_MAX
+#else
+# define UINTMAX_MAX  UINT32_MAX
 #endif
 
 /* 7.18.3. Limits of other integer types */
@@ -539,16 +475,10 @@
 
 /* wchar_t limits */
 /* Get WCHAR_MIN, WCHAR_MAX.
-   This include is not on the top, above, because on OSF/1 4.0 we have a
-   sequence of nested includes
-   <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+   This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested
+   includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
    <stdint.h> and assumes its types are already defined.  */
-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
-  /* 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 <stdio.h>
-# include <time.h>
+#if ! (defined WCHAR_MIN && defined WCHAR_MAX)
 # define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
 # include <wchar.h>
 # undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
@@ -568,8 +498,12 @@
 #define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
+#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
+
 /* 7.18.4. Macros for integer constants */
 
+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+
 /* 7.18.4.1. Macros for minimum-width integer constants */
 /* According to ISO C 99 Technical Corrigendum 1 */
 
@@ -610,26 +544,25 @@
 
 /* 7.18.4.2. Macros for greatest-width integer constants */
 
-#ifndef INTMAX_C
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define INTMAX_C(x)   x##LL
-# elif defined GL_INT64_T
-#  define INTMAX_C(x)   INT64_C(x)
-# else
-#  define INTMAX_C(x)   x##L
-# endif
+#undef INTMAX_C
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# define INTMAX_C(x)   x##LL
+#elif defined GL_INT64_T
+# define INTMAX_C(x)   INT64_C(x)
+#else
+# define INTMAX_C(x)   x##L
 #endif
 
-#ifndef UINTMAX_C
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define UINTMAX_C(x)  x##ULL
-# elif defined GL_UINT64_T
-#  define UINTMAX_C(x)  UINT64_C(x)
-# else
-#  define UINTMAX_C(x)  x##UL
-# endif
+#undef UINTMAX_C
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# define UINTMAX_C(x)  x##ULL
+#elif defined GL_UINT64_T
+# define UINTMAX_C(x)  UINT64_C(x)
+#else
+# define UINTMAX_C(x)  x##UL
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDINT_H */
-#endif /* !(defined __ANDROID__ && ...) */
-#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
+#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
+
+#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stdio.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/stdio.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2010-05-17 19:58:03.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,104 +13,47 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_FILE || defined __need___FILE || defined _GL_ALREADY_INCLUDING_STDIO_H
-/* Special invocation convention:
-   - Inside glibc header files.
-   - On OSF/1 5.1 we have a sequence of nested includes
-     <stdio.h> -> <getopt.h> -> <ctype.h> -> <sys/localedef.h> ->
-     <sys/lc_core.h> -> <nl_types.h> -> <mesg.h> -> <stdio.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
+#if defined __need_FILE || defined __need___FILE
+/* Special invocation convention inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_STDIO_H
-
-#define _GL_ALREADY_INCLUDING_STDIO_H
+#ifndef _GL_STDIO_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
-#undef _GL_ALREADY_INCLUDING_STDIO_H
-
-#ifndef _@GUARD_PREFIX@_STDIO_H
-#define _@GUARD_PREFIX@_STDIO_H
+#ifndef _GL_STDIO_H
+#define _GL_STDIO_H
 
 /* Get va_list.  Needed on many systems, including glibc 2.8.  */
 #include <stdarg.h>
 
 #include <stddef.h>
 
-/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
-   and eglibc 2.11.2.
-   May also define off_t to a 64-bit type on native Windows.  */
+/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8.  */
 #include <sys/types.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_PRINTF
-   indicates to GCC that the function takes a format string and arguments,
-   where the format string directives are the ones standardized by ISO C99
-   and POSIX.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
-#else
-# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF,
-   except that it indicates to GCC that the supported format string directives
-   are the ones of the system printf(), rather than the ones standardized by
-   ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \
-  _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-
-/* _GL_ATTRIBUTE_FORMAT_SCANF
-   indicates to GCC that the function takes a format string and arguments,
-   where the format string directives are the ones standardized by ISO C99
-   and POSIX.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__gnu_scanf__, formatstring_parameter, first_argument))
-#else
-# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
-   _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
-#endif
-
-/* _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_SCANF,
-   except that it indicates to GCC that the supported format string directives
-   are the ones of the system scanf(), rather than the ones standardized by
-   ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter, first_argument) \
-  _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
-
-/* Solaris 10 declares renameat in <unistd.h>, not in <stdio.h>.  */
-/* But in any case avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \
-    && ! defined __GLIBC__
-# include <unistd.h>
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 
@@ -124,15 +67,6 @@
 #define _GL_STDIO_STRINGIZE(token) #token
 #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token)
 
-/* When also using extern inline, suppress the use of static inline in
-   standard headers of problematic Apple configurations, as Libc at
-   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
-     && defined __GNUC__ && defined __STDC__)
-# undef putc_unlocked
-#endif
 
 #if @GNULIB_DPRINTF@
 # if @REPLACE_DPRINTF@
@@ -140,13 +74,13 @@
 #   define dprintf rpl_dprintf
 #  endif
 _GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...));
 # else
 #  if !@HAVE_DPRINTF@
 _GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...));
@@ -179,26 +113,6 @@
                  "use gnulib module fclose for portable POSIX compliance");
 #endif
 
-#if @GNULIB_FDOPEN@
-# if @REPLACE_FDOPEN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fdopen
-#   define fdopen rpl_fdopen
-#  endif
-_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode)
-                                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
-# else
-_GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
-# endif
-_GL_CXXALIASWARN (fdopen);
-#elif defined GNULIB_POSIXCHECK
-# undef fdopen
-/* Assume fdopen is always declared.  */
-_GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - "
-                 "use gnulib module fdopen for portability");
-#endif
-
 #if @GNULIB_FFLUSH@
 /* Flush all pending data on STREAM according to POSIX rules.  Both
    output and seekable input streams are supported.
@@ -223,34 +137,11 @@
                  "use gnulib module fflush for portable POSIX compliance");
 #endif
 
-#if @GNULIB_FGETC@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fgetc
-#   define fgetc rpl_fgetc
-#  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (fgetc, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fgetc, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (fgetc);
-#endif
-
-#if @GNULIB_FGETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fgets
-#   define fgets rpl_fgets
-#  endif
-_GL_FUNCDECL_RPL (fgets, char *, (char *s, int n, FILE *stream)
-                                 _GL_ARG_NONNULL ((1, 3)));
-_GL_CXXALIAS_RPL (fgets, char *, (char *s, int n, FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fgets, char *, (char *s, int n, FILE *stream));
-# endif
-_GL_CXXALIASWARN (fgets);
-#endif
+/* It is very rare that the developer ever has full control of stdin,
+   so any use of gets warrants an unconditional warning.  Assume it is
+   always declared, since it is required by C89.  */
+#undef gets
+_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 
 #if @GNULIB_FOPEN@
 # if @REPLACE_FOPEN@
@@ -268,26 +159,20 @@
 #elif defined GNULIB_POSIXCHECK
 # undef fopen
 /* Assume fopen is always declared.  */
-_GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - "
+_GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - "
                  "use gnulib module fopen for portability");
 #endif
 
 #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@
 # if (@GNULIB_FPRINTF_POSIX@ && @REPLACE_FPRINTF@) \
-     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fprintf rpl_fprintf
 #  endif
 #  define GNULIB_overrides_fprintf 1
-#  if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((1, 2)));
-#  else
-_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3)
-                                _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...));
 # else
 _GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...));
@@ -333,7 +218,7 @@
 #endif
 
 #if @GNULIB_FPUTC@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fputc
 #   define fputc rpl_fputc
@@ -347,7 +232,7 @@
 #endif
 
 #if @GNULIB_FPUTS@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fputs
 #   define fputs rpl_fputs
@@ -361,21 +246,6 @@
 _GL_CXXALIASWARN (fputs);
 #endif
 
-#if @GNULIB_FREAD@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fread
-#   define fread rpl_fread
-#  endif
-_GL_FUNCDECL_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream)
-                                 _GL_ARG_NONNULL ((4)));
-_GL_CXXALIAS_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream));
-# endif
-_GL_CXXALIASWARN (fread);
-#endif
-
 #if @GNULIB_FREOPEN@
 # if @REPLACE_FREOPEN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -395,27 +265,10 @@
 #elif defined GNULIB_POSIXCHECK
 # undef freopen
 /* Assume freopen is always declared.  */
-_GL_WARN_ON_USE (freopen,
-                 "freopen on native Windows platforms is not POSIX compliant - "
+_GL_WARN_ON_USE (freopen, "freopen on Win32 platforms is not POSIX compatible - "
                  "use gnulib module freopen for portability");
 #endif
 
-#if @GNULIB_FSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fscanf
-#   define fscanf rpl_fscanf
-#  endif
-_GL_FUNCDECL_RPL (fscanf, int, (FILE *stream, const char *format, ...)
-                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3)
-                               _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (fscanf, int, (FILE *stream, const char *format, ...));
-# else
-_GL_CXXALIAS_SYS (fscanf, int, (FILE *stream, const char *format, ...));
-# endif
-_GL_CXXALIASWARN (fscanf);
-#endif
-
 
 /* Set up the following warnings, based on which modules are in use.
    GNU Coding Standards discourage the use of fseek, since it imposes
@@ -483,13 +336,29 @@
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
 # else
-#  if ! @HAVE_DECL_FSEEKO@
+#  if ! @HAVE_FSEEKO@
 _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
                                _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
 # endif
 _GL_CXXALIASWARN (fseeko);
+# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@
+   /* Provide an fseek function that is consistent with fseeko.  */
+   /* In order to avoid that fseek gets defined as a macro here, the
+      developer can request the 'fseek' module.  */
+#  undef fseek
+#  define fseek rpl_fseek
+static inline int _GL_ARG_NONNULL ((1))
+rpl_fseek (FILE *fp, long offset, int whence)
+{
+#  if @REPLACE_FSEEKO@
+  return rpl_fseeko (fp, offset, whence);
+#  else
+  return fseeko (fp, offset, whence);
+#  endif
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FSEEK_WARN /* Category 1, above.  */
 # undef fseek
@@ -543,12 +412,28 @@
 _GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp));
 # else
-#  if ! @HAVE_DECL_FTELLO@
+#  if ! @HAVE_FTELLO@
 _GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
 # endif
 _GL_CXXALIASWARN (ftello);
+# if (@REPLACE_FTELLO@ || !@HAVE_FTELLO@) && !@GNULIB_FTELL@
+   /* Provide an ftell function that is consistent with ftello.  */
+   /* In order to avoid that ftell gets defined as a macro here, the
+      developer can request the 'ftell' module.  */
+#  undef ftell
+#  define ftell rpl_ftell
+static inline long _GL_ARG_NONNULL ((1))
+rpl_ftell (FILE *f)
+{
+#  if @REPLACE_FTELLO@
+  return rpl_ftello (f);
+#  else
+  return ftello (f);
+#  endif
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FTELL_WARN /* Category 1, above.  */
 # undef ftell
@@ -570,7 +455,7 @@
 
 
 #if @GNULIB_FWRITE@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fwrite
 #   define fwrite rpl_fwrite
@@ -583,61 +468,10 @@
 # else
 _GL_CXXALIAS_SYS (fwrite, size_t,
                   (const void *ptr, size_t s, size_t n, FILE *stream));
-
-/* Work around bug 11959 when fortifying glibc 2.4 through 2.15
-   <http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
-   which sometimes causes an unwanted diagnostic for fwrite calls.
-   This affects only function declaration attributes under certain
-   versions of gcc and clang, and is not needed for C++.  */
-#  if (0 < __USE_FORTIFY_LEVEL                                          \
-       && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
-       && 3 < __GNUC__ + (4 <= __GNUC_MINOR__)                          \
-       && !defined __cplusplus)
-#   undef fwrite
-#   undef fwrite_unlocked
-extern size_t __REDIRECT (rpl_fwrite,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite);
-extern size_t __REDIRECT (rpl_fwrite_unlocked,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite_unlocked);
-#   define fwrite rpl_fwrite
-#   define fwrite_unlocked rpl_fwrite_unlocked
-#  endif
 # endif
 _GL_CXXALIASWARN (fwrite);
 #endif
 
-#if @GNULIB_GETC@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getc
-#   define getc rpl_fgetc
-#  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (getc, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (getc);
-#endif
-
-#if @GNULIB_GETCHAR@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getchar
-#   define getchar rpl_getchar
-#  endif
-_GL_FUNCDECL_RPL (getchar, int, (void));
-_GL_CXXALIAS_RPL (getchar, int, (void));
-# else
-_GL_CXXALIAS_SYS (getchar, int, (void));
-# endif
-_GL_CXXALIASWARN (getchar);
-#endif
-
 #if @GNULIB_GETDELIM@
 /* Read input, up to (and including) the next occurrence of DELIMITER, from
    STREAM, store it in *LINEPTR (and NUL-terminate it).
@@ -714,15 +548,6 @@
 # endif
 #endif
 
-/* It is very rare that the developer ever has full control of stdin,
-   so any use of gets warrants an unconditional warning; besides, C11
-   removed it.  */
-#undef gets
-#if HAVE_RAW_DECL_GETS
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-#endif
-
-
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
 struct obstack;
 /* Grow an obstack with formatted output.  Return the number of
@@ -736,7 +561,7 @@
 #  endif
 _GL_FUNCDECL_RPL (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...));
@@ -744,7 +569,7 @@
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_printf, int,
                   (struct obstack *obs, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (obstack_printf, int,
@@ -757,7 +582,7 @@
 #  endif
 _GL_FUNCDECL_RPL (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args));
@@ -765,7 +590,7 @@
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_vprintf, int,
                   (struct obstack *obs, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (obstack_vprintf, int,
@@ -774,20 +599,6 @@
 _GL_CXXALIASWARN (obstack_vprintf);
 #endif
 
-#if @GNULIB_PCLOSE@
-# if !@HAVE_PCLOSE@
-_GL_FUNCDECL_SYS (pclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (pclose, int, (FILE *stream));
-_GL_CXXALIASWARN (pclose);
-#elif defined GNULIB_POSIXCHECK
-# undef pclose
-# if HAVE_RAW_DECL_PCLOSE
-_GL_WARN_ON_USE (pclose, "pclose is unportable - "
-                 "use gnulib module pclose for more portability");
-# endif
-#endif
-
 #if @GNULIB_PERROR@
 /* Print a message to standard error, describing the value of ERRNO,
    (if STRING is not NULL and not empty) prefixed with STRING and ": ",
@@ -819,10 +630,6 @@
                                  _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
 # else
-#  if !@HAVE_POPEN@
-_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode)
-                                 _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
 # endif
 _GL_CXXALIASWARN (popen);
@@ -836,37 +643,25 @@
 
 #if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@
 # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
-     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if defined __GNUC__
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 /* Don't break __attribute__((format(printf,M,N))).  */
 #    define printf __printf__
 #   endif
-#   if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL_1 (__printf__, int,
-                    (const char *format, ...)
-                    __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
-                    _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
-                    _GL_ARG_NONNULL ((1)));
-#   else
 _GL_FUNCDECL_RPL_1 (__printf__, int,
                     (const char *format, ...)
                     __asm__ (@ASM_SYMBOL_PREFIX@
                              _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
-                    _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2)
+                    __attribute__ ((__format__ (__printf__, 1, 2)))
                     _GL_ARG_NONNULL ((1)));
-#   endif
 _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...));
 #  else
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define printf rpl_printf
-#   endif
 _GL_FUNCDECL_RPL (printf, int,
                   (const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+                  __attribute__ ((__format__ (__printf__, 1, 2)))
                   _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (printf, int, (const char *format, ...));
+_GL_CXXALIAS_RPL (printf, printf, int, (const char *format, ...));
 #  endif
 #  define GNULIB_overrides_printf 1
 # else
@@ -885,7 +680,7 @@
 #endif
 
 #if @GNULIB_PUTC@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef putc
 #   define putc rpl_fputc
@@ -899,7 +694,7 @@
 #endif
 
 #if @GNULIB_PUTCHAR@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef putchar
 #   define putchar rpl_putchar
@@ -913,7 +708,7 @@
 #endif
 
 #if @GNULIB_PUTS@
-# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef puts
 #   define puts rpl_puts
@@ -997,37 +792,6 @@
 # endif
 #endif
 
-#if @GNULIB_SCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if defined __GNUC__
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef scanf
-/* Don't break __attribute__((format(scanf,M,N))).  */
-#    define scanf __scanf__
-#   endif
-_GL_FUNCDECL_RPL_1 (__scanf__, int,
-                    (const char *format, ...)
-                    __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf))
-                    _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *format, ...));
-#  else
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef scanf
-#    define scanf rpl_scanf
-#   endif
-_GL_FUNCDECL_RPL (scanf, int, (const char *format, ...)
-                              _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                              _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (scanf, int, (const char *format, ...));
-#  endif
-# else
-_GL_CXXALIAS_SYS (scanf, int, (const char *format, ...));
-# endif
-_GL_CXXALIASWARN (scanf);
-#endif
-
 #if @GNULIB_SNPRINTF@
 # if @REPLACE_SNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1035,7 +799,7 @@
 #  endif
 _GL_FUNCDECL_RPL (snprintf, int,
                   (char *str, size_t size, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  __attribute__ ((__format__ (__printf__, 3, 4)))
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (snprintf, int,
                   (char *str, size_t size, const char *format, ...));
@@ -1043,7 +807,7 @@
 #  if !@HAVE_DECL_SNPRINTF@
 _GL_FUNCDECL_SYS (snprintf, int,
                   (char *str, size_t size, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  __attribute__ ((__format__ (__printf__, 3, 4)))
                   _GL_ARG_NONNULL ((3)));
 #  endif
 _GL_CXXALIAS_SYS (snprintf, int,
@@ -1058,9 +822,9 @@
 # endif
 #endif
 
-/* Some people would argue that all sprintf uses should be warned about
-   (for example, OpenBSD issues a link warning for it),
-   since it can cause security holes due to buffer overruns.
+/* Some people would argue that sprintf should be handled like gets
+   (for example, OpenBSD issues a link warning for both functions),
+   since both can cause security holes due to buffer overruns.
    However, we believe that sprintf can be used safely, and is more
    efficient than snprintf in those safe cases; and as proof of our
    belief, we use sprintf in several gnulib modules.  So this header
@@ -1073,7 +837,7 @@
 #   define sprintf rpl_sprintf
 #  endif
 _GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                __attribute__ ((__format__ (__printf__, 2, 3)))
                                 _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...));
 # else
@@ -1118,7 +882,7 @@
 #  endif
 _GL_FUNCDECL_RPL (asprintf, int,
                   (char **result, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (asprintf, int,
                   (char **result, const char *format, ...));
@@ -1126,7 +890,7 @@
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (asprintf, int,
                   (char **result, const char *format, ...)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  __attribute__ ((__format__ (__printf__, 2, 3)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (asprintf, int,
@@ -1139,7 +903,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args));
@@ -1147,7 +911,7 @@
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (vasprintf, int,
                   (char **result, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (vasprintf, int,
@@ -1162,13 +926,13 @@
 #   define vdprintf rpl_vdprintf
 #  endif
 _GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args));
 # else
 #  if !@HAVE_VDPRINTF@
 _GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((2)));
 #  endif
 /* Need to cast, because on Solaris, the third parameter will likely be
@@ -1187,20 +951,14 @@
 
 #if @GNULIB_VFPRINTF_POSIX@ || @GNULIB_VFPRINTF@
 # if (@GNULIB_VFPRINTF_POSIX@ && @REPLACE_VFPRINTF@) \
-     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vfprintf rpl_vfprintf
 #  endif
 #  define GNULIB_overrides_vfprintf 1
-#  if @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
-                                 _GL_ARG_NONNULL ((1, 2)));
-#  else
 _GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
-                                 _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0)
+                                 __attribute__ ((__format__ (__printf__, 2, 0)))
                                  _GL_ARG_NONNULL ((1, 2)));
-#  endif
 _GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args));
 # else
 /* Need to cast, because on Solaris, the third parameter is
@@ -1221,41 +979,16 @@
                       "POSIX compliance");
 #endif
 
-#if @GNULIB_VFSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef vfscanf
-#   define vfscanf rpl_vfscanf
-#  endif
-_GL_FUNCDECL_RPL (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0)
-                  _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args));
-# else
-_GL_CXXALIAS_SYS (vfscanf, int,
-                  (FILE *stream, const char *format, va_list args));
-# endif
-_GL_CXXALIASWARN (vfscanf);
-#endif
-
 #if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@
 # if (@GNULIB_VPRINTF_POSIX@ && @REPLACE_VPRINTF@) \
-     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vprintf rpl_vprintf
 #  endif
 #  define GNULIB_overrides_vprintf 1
-#  if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0)
+                                __attribute__ ((__format__ (__printf__, 1, 0)))
                                 _GL_ARG_NONNULL ((1)));
-#  else
-_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
-                                _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0)
-                                _GL_ARG_NONNULL ((1)));
-#  endif
 _GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args));
 # else
 /* Need to cast, because on Solaris, the second parameter is
@@ -1275,22 +1008,6 @@
                  "POSIX compliance");
 #endif
 
-#if @GNULIB_VSCANF@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef vscanf
-#   define vscanf rpl_vscanf
-#  endif
-_GL_FUNCDECL_RPL (vscanf, int, (const char *format, va_list args)
-                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0)
-                               _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (vscanf, int, (const char *format, va_list args));
-# else
-_GL_CXXALIAS_SYS (vscanf, int, (const char *format, va_list args));
-# endif
-_GL_CXXALIASWARN (vscanf);
-#endif
-
 #if @GNULIB_VSNPRINTF@
 # if @REPLACE_VSNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1298,7 +1015,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  __attribute__ ((__format__ (__printf__, 3, 0)))
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args));
@@ -1306,7 +1023,7 @@
 #  if !@HAVE_DECL_VSNPRINTF@
 _GL_FUNCDECL_SYS (vsnprintf, int,
                   (char *str, size_t size, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  __attribute__ ((__format__ (__printf__, 3, 0)))
                   _GL_ARG_NONNULL ((3)));
 #  endif
 _GL_CXXALIAS_SYS (vsnprintf, int,
@@ -1328,7 +1045,7 @@
 #  endif
 _GL_FUNCDECL_RPL (vsprintf, int,
                   (char *str, const char *format, va_list args)
-                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  __attribute__ ((__format__ (__printf__, 2, 0)))
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vsprintf, int,
                   (char *str, const char *format, va_list args));
@@ -1348,6 +1065,7 @@
                       "POSIX compliance");
 #endif
 
-#endif /* _@GUARD_PREFIX@_STDIO_H */
-#endif /* _@GUARD_PREFIX@_STDIO_H */
+
+#endif /* _GL_STDIO_H */
+#endif /* _GL_STDIO_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stdio-write.c gettext-0.18.1.1/gettext-tools/libgettextpo/stdio-write.c
--- gettext-0.19.3/gettext-tools/libgettextpo/stdio-write.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio-write.c	2010-05-17 19:58:03.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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,9 +20,8 @@
 /* Specification.  */
 #include <stdio.h>
 
-/* Replace these functions only if module 'nonblocking' or module 'sigpipe' is
-   requested.  */
-#if GNULIB_NONBLOCKING || GNULIB_SIGPIPE
+/* Replace these functions only if module 'sigpipe' is requested.  */
+#if GNULIB_SIGPIPE
 
 /* On native Windows platforms, SIGPIPE does not exist.  When write() is
    called on a pipe with no readers, WriteFile() fails with error
@@ -39,75 +38,26 @@
 #  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 #  include <windows.h>
 
-#  include "msvc-nothrow.h"
-
-#  if GNULIB_NONBLOCKING
-#   define CLEAR_ERRNO \
-      errno = 0;
-#   define HANDLE_ENOSPC \
-          if (errno == ENOSPC && ferror (stream))                             \
-            {                                                                 \
-              int fd = fileno (stream);                                       \
-              if (fd >= 0)                                                    \
-                {                                                             \
-                  HANDLE h = (HANDLE) _get_osfhandle (fd);                    \
-                  if (GetFileType (h) == FILE_TYPE_PIPE)                      \
-                    {                                                         \
-                      /* h is a pipe or socket.  */                           \
-                      DWORD state;                                            \
-                      if (GetNamedPipeHandleState (h, &state, NULL, NULL,     \
-                                                   NULL, NULL, 0)             \
-                          && (state & PIPE_NOWAIT) != 0)                      \
-                        /* h is a pipe in non-blocking mode.                  \
-                           Change errno from ENOSPC to EAGAIN.  */            \
-                        errno = EAGAIN;                                       \
-                    }                                                         \
-                }                                                             \
-            }                                                                 \
-          else
-#  else
-#   define CLEAR_ERRNO
-#   define HANDLE_ENOSPC
-#  endif
-
-#  if GNULIB_SIGPIPE
-#   define CLEAR_LastError \
-      SetLastError (0);
-#   define HANDLE_ERROR_NO_DATA \
-          if (GetLastError () == ERROR_NO_DATA && ferror (stream))            \
-            {                                                                 \
-              int fd = fileno (stream);                                       \
-              if (fd >= 0                                                     \
-                  && GetFileType ((HANDLE) _get_osfhandle (fd))               \
-                     == FILE_TYPE_PIPE)                                       \
-                {                                                             \
-                  /* Try to raise signal SIGPIPE.  */                         \
-                  raise (SIGPIPE);                                            \
-                  /* If it is currently blocked or ignored, change errno from \
-                     EINVAL to EPIPE.  */                                     \
-                  errno = EPIPE;                                              \
-                }                                                             \
-            }                                                                 \
-          else
-#  else
-#   define CLEAR_LastError
-#   define HANDLE_ERROR_NO_DATA
-#  endif
-
 #  define CALL_WITH_SIGPIPE_EMULATION(RETTYPE, EXPRESSION, FAILED) \
   if (ferror (stream))                                                        \
     return (EXPRESSION);                                                      \
   else                                                                        \
     {                                                                         \
       RETTYPE ret;                                                            \
-      CLEAR_ERRNO                                                             \
-      CLEAR_LastError                                                         \
+      SetLastError (0);                                                       \
       ret = (EXPRESSION);                                                     \
-      if (FAILED)                                                             \
+      if (FAILED && GetLastError () == ERROR_NO_DATA && ferror (stream))      \
         {                                                                     \
-          HANDLE_ENOSPC                                                       \
-          HANDLE_ERROR_NO_DATA                                                \
-          ;                                                                   \
+          int fd = fileno (stream);                                           \
+          if (fd >= 0                                                         \
+              && GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_PIPE)\
+            {                                                                 \
+              /* Try to raise signal SIGPIPE.  */                             \
+              raise (SIGPIPE);                                                \
+              /* If it is currently blocked or ignored, change errno from     \
+                 EINVAL to EPIPE.  */                                         \
+              errno = EPIPE;                                                  \
+            }                                                                 \
         }                                                                     \
       return ret;                                                             \
     }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stdlib.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdlib.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/stdlib.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdlib.in.h	2010-04-25 09:22:40.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,60 +18,43 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
-/* Special invocation conventions inside some gnulib header files,
-   and inside some glibc header files, respectively.  */
+#if defined __need_malloc_and_calloc
+/* Special invocation convention inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_STDLIB_H
+#ifndef _GL_STDLIB_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
-#ifndef _@GUARD_PREFIX@_STDLIB_H
-#define _@GUARD_PREFIX@_STDLIB_H
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
-/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.  */
-#if @GNULIB_SYSTEM_POSIX@ && !defined WEXITSTATUS
-# include <sys/wait.h>
-#endif
-
 /* Solaris declares getloadavg() in <sys/loadavg.h>.  */
 #if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@
 # include <sys/loadavg.h>
 #endif
 
-/* Native Windows platforms declare mktemp() in <io.h>.  */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-#if @GNULIB_RANDOM_R@
-
 /* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
-   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
-   'struct random_data'.  */
-# if @HAVE_RANDOM_H@
-#  include <random.h>
-# endif
+   from <stdlib.h> if _REENTRANT is defined.  Include it always.  */
+#if @HAVE_RANDOM_H@
+# include <random.h>
+#endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
-#  include <stdint.h>
-# endif
+#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@) \
+    || defined GNULIB_POSIXCHECK
+# include <stdint.h>
+#endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@
-/* Define 'struct random_data'.
-   But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
-#  if !GNULIB_defined_struct_random_data
+#if !@HAVE_STRUCT_RANDOM_DATA@
 struct random_data
 {
   int32_t *fptr;                /* Front pointer.  */
@@ -82,29 +65,15 @@
   int rand_sep;                 /* Distance between front and rear.  */
   int32_t *end_ptr;             /* Pointer behind state table.  */
 };
-#   define GNULIB_defined_struct_random_data 1
-#  endif
-# endif
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-/* On Mac OS X 10.3, only <unistd.h> declares mkstemp.  */
-/* On Mac OS X 10.5, only <unistd.h> declares mkstemps.  */
+#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+/* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>
 #endif
 
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The definition of _Noreturn is copied here.  */
-
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -126,30 +95,11 @@
 #endif
 
 
-#if @GNULIB__EXIT@
-/* Terminate the current process with the given return code, without running
-   the 'atexit' handlers.  */
-# if !@HAVE__EXIT@
-_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
-# endif
-_GL_CXXALIAS_SYS (_Exit, void, (int status));
-_GL_CXXALIASWARN (_Exit);
-#elif defined GNULIB_POSIXCHECK
-# undef _Exit
-# if HAVE_RAW_DECL__EXIT
-_GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
-                 "use gnulib module _Exit for portability");
-# endif
-#endif
-
-
 #if @GNULIB_ATOLL@
 /* Parse a signed decimal integer.
    Returns the value of the integer.  Errors are not detected.  */
 # if !@HAVE_ATOLL@
-_GL_FUNCDECL_SYS (atoll, long long, (const char *string)
-                                    _GL_ATTRIBUTE_PURE
-                                    _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (atoll, long long, (const char *string) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (atoll, long long, (const char *string));
 _GL_CXXALIASWARN (atoll);
@@ -162,7 +112,7 @@
 #endif
 
 #if @GNULIB_CALLOC_POSIX@
-# if @REPLACE_CALLOC@
+# if !@HAVE_CALLOC_POSIX@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef calloc
 #   define calloc rpl_calloc
@@ -199,8 +149,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef canonicalize_file_name
 # if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
-_GL_WARN_ON_USE (canonicalize_file_name,
-                 "canonicalize_file_name is unportable - "
+_GL_WARN_ON_USE (canonicalize_file_name, "canonicalize_file_name is unportable - "
                  "use gnulib module canonicalize-lgpl for portability");
 # endif
 #endif
@@ -263,19 +212,14 @@
 #elif defined GNULIB_POSIXCHECK
 # undef grantpt
 # if HAVE_RAW_DECL_GRANTPT
-_GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
+_GL_WARN_ON_USE (ptsname, "grantpt is not portable - "
                  "use gnulib module grantpt for portability");
 # endif
 #endif
 
-/* If _GL_USE_STDLIB_ALLOC is nonzero, the including module does not
-   rely on GNU or POSIX semantics for malloc and realloc (for example,
-   by never specifying a zero size), so it does not need malloc or
-   realloc to be redefined.  */
 #if @GNULIB_MALLOC_POSIX@
-# if @REPLACE_MALLOC@
-#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-        || _GL_USE_STDLIB_ALLOC)
+# if !@HAVE_MALLOC_POSIX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef malloc
 #   define malloc rpl_malloc
 #  endif
@@ -285,28 +229,13 @@
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 # endif
 _GL_CXXALIASWARN (malloc);
-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+#elif defined GNULIB_POSIXCHECK
 # undef malloc
 /* Assume malloc is always declared.  */
 _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
                  "use gnulib module malloc-posix for portability");
 #endif
 
-/* Convert a multibyte character to a wide character.  */
-#if @GNULIB_MBTOWC@
-# if @REPLACE_MBTOWC@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef mbtowc
-#   define mbtowc rpl_mbtowc
-#  endif
-_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-# else
-_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
-# endif
-_GL_CXXALIASWARN (mbtowc);
-#endif
-
 #if @GNULIB_MKDTEMP@
 /* Create a unique temporary directory from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
@@ -439,38 +368,13 @@
 # endif
 #endif
 
-#if @GNULIB_POSIX_OPENPT@
-/* Return an FD open to the master side of a pseudo-terminal.  Flags should
-   include O_RDWR, and may also include O_NOCTTY.  */
-# if !@HAVE_POSIX_OPENPT@
-_GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
-# endif
-_GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
-_GL_CXXALIASWARN (posix_openpt);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_openpt
-# if HAVE_RAW_DECL_POSIX_OPENPT
-_GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
-                 "use gnulib module posix_openpt for portability");
-# endif
-#endif
-
 #if @GNULIB_PTSNAME@
 /* Return the pathname of the pseudo-terminal slave associated with
    the master FD is open on, or NULL on errors.  */
-# if @REPLACE_PTSNAME@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ptsname
-#   define ptsname rpl_ptsname
-#  endif
-_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
-_GL_CXXALIAS_RPL (ptsname, char *, (int fd));
-# else
-#  if !@HAVE_PTSNAME@
+# if !@HAVE_PTSNAME@
 _GL_FUNCDECL_SYS (ptsname, char *, (int fd));
-#  endif
-_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 # endif
+_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 _GL_CXXALIASWARN (ptsname);
 #elif defined GNULIB_POSIXCHECK
 # undef ptsname
@@ -480,32 +384,6 @@
 # endif
 #endif
 
-#if @GNULIB_PTSNAME_R@
-/* Set the pathname of the pseudo-terminal slave associated with
-   the master FD is open on and return 0, or set errno and return
-   non-zero on errors.  */
-# if @REPLACE_PTSNAME_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ptsname_r
-#   define ptsname_r rpl_ptsname_r
-#  endif
-_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
-_GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
-# else
-#  if !@HAVE_PTSNAME_R@
-_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
-#  endif
-_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
-# endif
-_GL_CXXALIASWARN (ptsname_r);
-#elif defined GNULIB_POSIXCHECK
-# undef ptsname_r
-# if HAVE_RAW_DECL_PTSNAME_R
-_GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - "
-                 "use gnulib module ptsname_r for portability");
-# endif
-#endif
-
 #if @GNULIB_PUTENV@
 # if @REPLACE_PUTENV@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -520,29 +398,6 @@
 _GL_CXXALIASWARN (putenv);
 #endif
 
-#if @GNULIB_QSORT_R@
-# if @REPLACE_QSORT_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef qsort_r
-#   define qsort_r rpl_qsort_r
-#  endif
-_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
-_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg));
-# else
-_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                  int (*compare) (void const *, void const *,
-                                                  void *),
-                                  void *arg));
-# endif
-_GL_CXXALIASWARN (qsort_r);
-#endif
-
 
 #if @GNULIB_RANDOM_R@
 # if !@HAVE_RANDOM_R@
@@ -552,83 +407,12 @@
 # endif
 #endif
 
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (random, long, (void));
-# endif
-_GL_CXXALIAS_SYS (random, long, (void));
-_GL_CXXALIASWARN (random);
-#elif defined GNULIB_POSIXCHECK
-# undef random
-# if HAVE_RAW_DECL_RANDOM
-_GL_WARN_ON_USE (random, "random is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
-# endif
-_GL_CXXALIAS_SYS (srandom, void, (unsigned int seed));
-_GL_CXXALIASWARN (srandom);
-#elif defined GNULIB_POSIXCHECK
-# undef srandom
-# if HAVE_RAW_DECL_SRANDOM
-_GL_WARN_ON_USE (srandom, "srandom is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size)
-                  _GL_ARG_NONNULL ((2)));
-# endif
-_GL_CXXALIAS_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size));
-_GL_CXXALIASWARN (initstate);
-#elif defined GNULIB_POSIXCHECK
-# undef initstate
-# if HAVE_RAW_DECL_INITSTATE_R
-_GL_WARN_ON_USE (initstate, "initstate is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));
-_GL_CXXALIASWARN (setstate);
-#elif defined GNULIB_POSIXCHECK
-# undef setstate
-# if HAVE_RAW_DECL_SETSTATE_R
-_GL_WARN_ON_USE (setstate, "setstate is unportable - "
-                 "use gnulib module random for portability");
-# endif
-#endif
-
-
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef random_r
-#   define random_r rpl_random_r
-#  endif
-_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result)
-                                 _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result)
                                  _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
 # endif
+_GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
 _GL_CXXALIASWARN (random_r);
 #elif defined GNULIB_POSIXCHECK
 # undef random_r
@@ -639,25 +423,13 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef srandom_r
-#   define srandom_r rpl_srandom_r
-#  endif
-_GL_FUNCDECL_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state)
                   _GL_ARG_NONNULL ((2)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (srandom_r);
 #elif defined GNULIB_POSIXCHECK
 # undef srandom_r
@@ -668,29 +440,15 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef initstate_r
-#   define initstate_r rpl_initstate_r
-#  endif
-_GL_FUNCDECL_RPL (initstate_r, int,
-                  (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((2, 4)));
-_GL_CXXALIAS_RPL (initstate_r, int,
-                  (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
                    struct random_data *rand_state)
                   _GL_ARG_NONNULL ((2, 4)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
                    struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (initstate_r);
 #elif defined GNULIB_POSIXCHECK
 # undef initstate_r
@@ -701,25 +459,13 @@
 #endif
 
 #if @GNULIB_RANDOM_R@
-# if @REPLACE_RANDOM_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef setstate_r
-#   define setstate_r rpl_setstate_r
-#  endif
-_GL_FUNCDECL_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state)
-                  _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state));
-# else
-#  if !@HAVE_RANDOM_R@
+# if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state)
                   _GL_ARG_NONNULL ((1, 2)));
-#  endif
+# endif
 _GL_CXXALIAS_SYS (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state));
-# endif
 _GL_CXXALIASWARN (setstate_r);
 #elif defined GNULIB_POSIXCHECK
 # undef setstate_r
@@ -731,9 +477,8 @@
 
 
 #if @GNULIB_REALLOC_POSIX@
-# if @REPLACE_REALLOC@
-#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-        || _GL_USE_STDLIB_ALLOC)
+# if !@HAVE_REALLOC_POSIX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef realloc
 #   define realloc rpl_realloc
 #  endif
@@ -743,7 +488,7 @@
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 # endif
 _GL_CXXALIASWARN (realloc);
-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+#elif defined GNULIB_POSIXCHECK
 # undef realloc
 /* Assume realloc is always declared.  */
 _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
@@ -790,22 +535,6 @@
 # endif
 #endif
 
-#if @GNULIB_SECURE_GETENV@
-/* Look up NAME in the environment, returning 0 in insecure situations.  */
-# if !@HAVE_SECURE_GETENV@
-_GL_FUNCDECL_SYS (secure_getenv, char *,
-                  (char const *name) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
-_GL_CXXALIASWARN (secure_getenv);
-#elif defined GNULIB_POSIXCHECK
-# undef secure_getenv
-# if HAVE_RAW_DECL_SECURE_GETENV
-_GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
-                 "use gnulib module secure_getenv for portability");
-# endif
-#endif
-
 #if @GNULIB_SETENV@
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
@@ -820,7 +549,7 @@
 _GL_CXXALIAS_RPL (setenv, int,
                   (const char *name, const char *value, int replace));
 # else
-#  if !@HAVE_DECL_SETENV@
+#  if !@HAVE_SETENV@
 _GL_FUNCDECL_SYS (setenv, int,
                   (const char *name, const char *value, int replace)
                   _GL_ARG_NONNULL ((1)));
@@ -828,9 +557,7 @@
 _GL_CXXALIAS_SYS (setenv, int,
                   (const char *name, const char *value, int replace));
 # endif
-# if !(@REPLACE_SETENV@ && !@HAVE_DECL_SETENV@)
 _GL_CXXALIASWARN (setenv);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setenv
 # if HAVE_RAW_DECL_SETENV
@@ -925,7 +652,7 @@
 #elif defined GNULIB_POSIXCHECK
 # undef unlockpt
 # if HAVE_RAW_DECL_UNLOCKPT
-_GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - "
+_GL_WARN_ON_USE (ptsname, "unlockpt is not portable - "
                  "use gnulib module unlockpt for portability");
 # endif
 #endif
@@ -940,14 +667,12 @@
 _GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (unsetenv, int, (const char *name));
 # else
-#  if !@HAVE_DECL_UNSETENV@
+#  if !@HAVE_UNSETENV@
 _GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (unsetenv, int, (const char *name));
 # endif
-# if !(@REPLACE_UNSETENV@ && !@HAVE_DECL_UNSETENV@)
 _GL_CXXALIASWARN (unsetenv);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef unsetenv
 # if HAVE_RAW_DECL_UNSETENV
@@ -956,22 +681,7 @@
 # endif
 #endif
 
-/* Convert a wide character to a multibyte character.  */
-#if @GNULIB_WCTOMB@
-# if @REPLACE_WCTOMB@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef wctomb
-#   define wctomb rpl_wctomb
-#  endif
-_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
-_GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
-# else
-_GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
-# endif
-_GL_CXXALIASWARN (wctomb);
-#endif
-
 
-#endif /* _@GUARD_PREFIX@_STDLIB_H */
-#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif /* _GL_STDLIB_H */
+#endif /* _GL_STDLIB_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/stpcpy.c gettext-0.18.1.1/gettext-tools/libgettextpo/stpcpy.c
--- gettext-0.19.3/gettext-tools/libgettextpo/stpcpy.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stpcpy.c	2010-02-16 21:33:16.000000000 +0000
@@ -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-2014 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2010 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/strchrnul.c gettext-0.18.1.1/gettext-tools/libgettextpo/strchrnul.c
--- gettext-0.19.3/gettext-tools/libgettextpo/strchrnul.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/strchrnul.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-/* Searching in a string.
-   Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <string.h>
-
-/* Find the first occurrence of C in S or the final NUL byte.  */
-char *
-strchrnul (const char *s, int c_in)
-{
-  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
-     long instead of a 64-bit uintmax_t tends to give better
-     performance.  On 64-bit hardware, unsigned long is generally 64
-     bits already.  Change this typedef to experiment with
-     performance.  */
-  typedef unsigned long int longword;
-
-  const unsigned char *char_ptr;
-  const longword *longword_ptr;
-  longword repeated_one;
-  longword repeated_c;
-  unsigned char c;
-
-  c = (unsigned char) c_in;
-  if (!c)
-    return rawmemchr (s, 0);
-
-  /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s;
-       (size_t) char_ptr % sizeof (longword) != 0;
-       ++char_ptr)
-    if (!*char_ptr || *char_ptr == c)
-      return (char *) char_ptr;
-
-  longword_ptr = (const longword *) char_ptr;
-
-  /* All these elucidatory comments refer to 4-byte longwords,
-     but the theory applies equally well to any size longwords.  */
-
-  /* Compute auxiliary longword values:
-     repeated_one is a value which has a 1 in every byte.
-     repeated_c has c in every byte.  */
-  repeated_one = 0x01010101;
-  repeated_c = c | (c << 8);
-  repeated_c |= repeated_c << 16;
-  if (0xffffffffU < (longword) -1)
-    {
-      repeated_one |= repeated_one << 31 << 1;
-      repeated_c |= repeated_c << 31 << 1;
-      if (8 < sizeof (longword))
-        {
-          size_t i;
-
-          for (i = 64; i < sizeof (longword) * 8; i *= 2)
-            {
-              repeated_one |= repeated_one << i;
-              repeated_c |= repeated_c << i;
-            }
-        }
-    }
-
-  /* Instead of the traditional loop which tests each byte, we will
-     test a longword at a time.  The tricky part is testing if *any of
-     the four* bytes in the longword in question are equal to NUL or
-     c.  We first use an xor with repeated_c.  This reduces the task
-     to testing whether *any of the four* bytes in longword1 or
-     longword2 is zero.
-
-     Let's consider longword1.  We compute tmp =
-       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
-     That is, we perform the following operations:
-       1. Subtract repeated_one.
-       2. & ~longword1.
-       3. & a mask consisting of 0x80 in every byte.
-     Consider what happens in each byte:
-       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
-         and step 3 transforms it into 0x80.  A carry can also be propagated
-         to more significant bytes.
-       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
-         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
-         the byte ends in a single bit of value 0 and k bits of value 1.
-         After step 2, the result is just k bits of value 1: 2^k - 1.  After
-         step 3, the result is 0.  And no carry is produced.
-     So, if longword1 has only non-zero bytes, tmp is zero.
-     Whereas if longword1 has a zero byte, call j the position of the least
-     significant zero byte.  Then the result has a zero at positions 0, ...,
-     j-1 and a 0x80 at position j.  We cannot predict the result at the more
-     significant bytes (positions j+1..3), but it does not matter since we
-     already have a non-zero bit at position 8*j+7.
-
-     The test whether any byte in longword1 or longword2 is zero is equivalent
-     to testing whether tmp1 is nonzero or tmp2 is nonzero.  We can combine
-     this into a single test, whether (tmp1 | tmp2) is nonzero.
-
-     This test can read more than one byte beyond the end of a string,
-     depending on where the terminating NUL is encountered.  However,
-     this is considered safe since the initialization phase ensured
-     that the read will be aligned, therefore, the read will not cross
-     page boundaries and will not cause a fault.  */
-
-  while (1)
-    {
-      longword longword1 = *longword_ptr ^ repeated_c;
-      longword longword2 = *longword_ptr;
-
-      if (((((longword1 - repeated_one) & ~longword1)
-            | ((longword2 - repeated_one) & ~longword2))
-           & (repeated_one << 7)) != 0)
-        break;
-      longword_ptr++;
-    }
-
-  char_ptr = (const unsigned char *) longword_ptr;
-
-  /* At this point, we know that one of the sizeof (longword) bytes
-     starting at char_ptr is == 0 or == c.  On little-endian machines,
-     we could determine the first such byte without any further memory
-     accesses, just by looking at the tmp result from the last loop
-     iteration.  But this does not work on big-endian machines.
-     Choose code that works in both cases.  */
-
-  char_ptr = (unsigned char *) longword_ptr;
-  while (*char_ptr && (*char_ptr != c))
-    char_ptr++;
-  return (char *) char_ptr;
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/strchrnul.valgrind gettext-0.18.1.1/gettext-tools/libgettextpo/strchrnul.valgrind
--- gettext-0.19.3/gettext-tools/libgettextpo/strchrnul.valgrind	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/strchrnul.valgrind	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# Suppress a valgrind message about use of uninitialized memory in strchrnul().
-# This use is OK because it provides only a speedup.
-{
-    strchrnul-value4
-    Memcheck:Value4
-    fun:strchrnul
-}
-{
-    strchrnul-value8
-    Memcheck:Value8
-    fun:strchrnul
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/streq.h gettext-0.18.1.1/gettext-tools/libgettextpo/streq.h
--- gettext-0.19.3/gettext-tools/libgettextpo/streq.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/streq.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -21,8 +21,8 @@
 
 #include <string.h>
 
-/* STREQ_OPT allows to optimize string comparison with a small literal string.
-     STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+/* STREQ allows to optimize string comparison with a small literal string.
+     STREQ (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
    is semantically equivalent to
      strcmp (s, "EUC-KR") == 0
    just faster.  */
@@ -163,12 +163,12 @@
     return 0;
 }
 
-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
   streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
 
 #else
 
-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
   (strcmp (s1, s2) == 0)
 
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/strerror.c gettext-0.18.1.1/gettext-tools/libgettextpo/strerror.c
--- gettext-0.19.3/gettext-tools/libgettextpo/strerror.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/strerror.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,54 +17,331 @@
 
 #include <config.h>
 
-/* Specification.  */
 #include <string.h>
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if REPLACE_STRERROR
 
-#include "intprops.h"
-#include "strerror-override.h"
-#include "verify.h"
+# include <errno.h>
+# include <stdio.h>
 
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef sprintf
+# if GNULIB_defined_ESOCK /* native Windows platforms */
+#  if HAVE_WINSOCK2_H
+#   include <winsock2.h>
+#  endif
+# endif
+
+# include "intprops.h"
+
+# undef strerror
+# if ! HAVE_DECL_STRERROR
+#  define strerror(n) NULL
+# endif
 
 char *
-strerror (int n)
-#undef strerror
+rpl_strerror (int n)
 {
-  static char buf[STACKBUF_LEN];
-  size_t len;
+  char const *msg = NULL;
+  /* These error messages are taken from glibc/sysdeps/gnu/errlist.c.  */
+  switch (n)
+    {
+# if GNULIB_defined_ETXTBSY
+    case ETXTBSY:
+      msg = "Text file busy";
+      break;
+# endif
+
+# if GNULIB_defined_ESOCK /* native Windows platforms */
+    /* EWOULDBLOCK is the same as EAGAIN.  */
+    case EINPROGRESS:
+      msg = "Operation now in progress";
+      break;
+    case EALREADY:
+      msg = "Operation already in progress";
+      break;
+    case ENOTSOCK:
+      msg = "Socket operation on non-socket";
+      break;
+    case EDESTADDRREQ:
+      msg = "Destination address required";
+      break;
+    case EMSGSIZE:
+      msg = "Message too long";
+      break;
+    case EPROTOTYPE:
+      msg = "Protocol wrong type for socket";
+      break;
+    case ENOPROTOOPT:
+      msg = "Protocol not available";
+      break;
+    case EPROTONOSUPPORT:
+      msg = "Protocol not supported";
+      break;
+    case ESOCKTNOSUPPORT:
+      msg = "Socket type not supported";
+      break;
+    case EOPNOTSUPP:
+      msg = "Operation not supported";
+      break;
+    case EPFNOSUPPORT:
+      msg = "Protocol family not supported";
+      break;
+    case EAFNOSUPPORT:
+      msg = "Address family not supported by protocol";
+      break;
+    case EADDRINUSE:
+      msg = "Address already in use";
+      break;
+    case EADDRNOTAVAIL:
+      msg = "Cannot assign requested address";
+      break;
+    case ENETDOWN:
+      msg = "Network is down";
+      break;
+    case ENETUNREACH:
+      msg = "Network is unreachable";
+      break;
+    case ENETRESET:
+      msg = "Network dropped connection on reset";
+      break;
+    case ECONNABORTED:
+      msg = "Software caused connection abort";
+      break;
+    case ECONNRESET:
+      msg = "Connection reset by peer";
+      break;
+    case ENOBUFS:
+      msg = "No buffer space available";
+      break;
+    case EISCONN:
+      msg = "Transport endpoint is already connected";
+      break;
+    case ENOTCONN:
+      msg = "Transport endpoint is not connected";
+      break;
+    case ESHUTDOWN:
+      msg = "Cannot send after transport endpoint shutdown";
+      break;
+    case ETOOMANYREFS:
+      msg = "Too many references: cannot splice";
+      break;
+    case ETIMEDOUT:
+      msg = "Connection timed out";
+      break;
+    case ECONNREFUSED:
+      msg = "Connection refused";
+      break;
+    case ELOOP:
+      msg = "Too many levels of symbolic links";
+      break;
+    case EHOSTDOWN:
+      msg = "Host is down";
+      break;
+    case EHOSTUNREACH:
+      msg = "No route to host";
+      break;
+    case EPROCLIM:
+      msg = "Too many processes";
+      break;
+    case EUSERS:
+      msg = "Too many users";
+      break;
+    case EDQUOT:
+      msg = "Disk quota exceeded";
+      break;
+    case ESTALE:
+      msg = "Stale NFS file handle";
+      break;
+    case EREMOTE:
+      msg = "Object is remote";
+      break;
+#  if HAVE_WINSOCK2_H
+    /* WSA_INVALID_HANDLE maps to EBADF */
+    /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
+    /* WSA_INVALID_PARAMETER maps to EINVAL */
+    case WSA_OPERATION_ABORTED:
+      msg = "Overlapped operation aborted";
+      break;
+    case WSA_IO_INCOMPLETE:
+      msg = "Overlapped I/O event object not in signaled state";
+      break;
+    case WSA_IO_PENDING:
+      msg = "Overlapped operations will complete later";
+      break;
+    /* WSAEINTR maps to EINTR */
+    /* WSAEBADF maps to EBADF */
+    /* WSAEACCES maps to EACCES */
+    /* WSAEFAULT maps to EFAULT */
+    /* WSAEINVAL maps to EINVAL */
+    /* WSAEMFILE maps to EMFILE */
+    /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
+    /* WSAEINPROGRESS is EINPROGRESS */
+    /* WSAEALREADY is EALREADY */
+    /* WSAENOTSOCK is ENOTSOCK */
+    /* WSAEDESTADDRREQ is EDESTADDRREQ */
+    /* WSAEMSGSIZE is EMSGSIZE */
+    /* WSAEPROTOTYPE is EPROTOTYPE */
+    /* WSAENOPROTOOPT is ENOPROTOOPT */
+    /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */
+    /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
+    /* WSAEOPNOTSUPP is EOPNOTSUPP */
+    /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
+    /* WSAEAFNOSUPPORT is EAFNOSUPPORT */
+    /* WSAEADDRINUSE is EADDRINUSE */
+    /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */
+    /* WSAENETDOWN is ENETDOWN */
+    /* WSAENETUNREACH is ENETUNREACH */
+    /* WSAENETRESET is ENETRESET */
+    /* WSAECONNABORTED is ECONNABORTED */
+    /* WSAECONNRESET is ECONNRESET */
+    /* WSAENOBUFS is ENOBUFS */
+    /* WSAEISCONN is EISCONN */
+    /* WSAENOTCONN is ENOTCONN */
+    /* WSAESHUTDOWN is ESHUTDOWN */
+    /* WSAETOOMANYREFS is ETOOMANYREFS */
+    /* WSAETIMEDOUT is ETIMEDOUT */
+    /* WSAECONNREFUSED is ECONNREFUSED */
+    /* WSAELOOP is ELOOP */
+    /* WSAENAMETOOLONG maps to ENAMETOOLONG */
+    /* WSAEHOSTDOWN is EHOSTDOWN */
+    /* WSAEHOSTUNREACH is EHOSTUNREACH */
+    /* WSAENOTEMPTY maps to ENOTEMPTY */
+    /* WSAEPROCLIM is EPROCLIM */
+    /* WSAEUSERS is EUSERS */
+    /* WSAEDQUOT is EDQUOT */
+    /* WSAESTALE is ESTALE */
+    /* WSAEREMOTE is EREMOTE */
+    case WSASYSNOTREADY:
+      msg = "Network subsystem is unavailable";
+      break;
+    case WSAVERNOTSUPPORTED:
+      msg = "Winsock.dll version out of range";
+      break;
+    case WSANOTINITIALISED:
+      msg = "Successful WSAStartup not yet performed";
+      break;
+    case WSAEDISCON:
+      msg = "Graceful shutdown in progress";
+      break;
+    case WSAENOMORE: case WSA_E_NO_MORE:
+      msg = "No more results";
+      break;
+    case WSAECANCELLED: case WSA_E_CANCELLED:
+      msg = "Call was canceled";
+      break;
+    case WSAEINVALIDPROCTABLE:
+      msg = "Procedure call table is invalid";
+      break;
+    case WSAEINVALIDPROVIDER:
+      msg = "Service provider is invalid";
+      break;
+    case WSAEPROVIDERFAILEDINIT:
+      msg = "Service provider failed to initialize";
+      break;
+    case WSASYSCALLFAILURE:
+      msg = "System call failure";
+      break;
+    case WSASERVICE_NOT_FOUND:
+      msg = "Service not found";
+      break;
+    case WSATYPE_NOT_FOUND:
+      msg = "Class type not found";
+      break;
+    case WSAEREFUSED:
+      msg = "Database query was refused";
+      break;
+    case WSAHOST_NOT_FOUND:
+      msg = "Host not found";
+      break;
+    case WSATRY_AGAIN:
+      msg = "Nonauthoritative host not found";
+      break;
+    case WSANO_RECOVERY:
+      msg = "Nonrecoverable error";
+      break;
+    case WSANO_DATA:
+      msg = "Valid name, no data record of requested type";
+      break;
+    /* WSA_QOS_* omitted */
+#  endif
+# endif
+
+# if GNULIB_defined_ENOMSG
+    case ENOMSG:
+      msg = "No message of desired type";
+      break;
+# endif
+
+# if GNULIB_defined_EIDRM
+    case EIDRM:
+      msg = "Identifier removed";
+      break;
+# endif
+
+# if GNULIB_defined_ENOLINK
+    case ENOLINK:
+      msg = "Link has been severed";
+      break;
+# endif
+
+# if GNULIB_defined_EPROTO
+    case EPROTO:
+      msg = "Protocol error";
+      break;
+# endif
+
+# if GNULIB_defined_EMULTIHOP
+    case EMULTIHOP:
+      msg = "Multihop attempted";
+      break;
+# endif
+
+# if GNULIB_defined_EBADMSG
+    case EBADMSG:
+      msg = "Bad message";
+      break;
+# endif
+
+# if GNULIB_defined_EOVERFLOW
+    case EOVERFLOW:
+      msg = "Value too large for defined data type";
+      break;
+# endif
+
+# if GNULIB_defined_ENOTSUP
+    case ENOTSUP:
+      msg = "Not supported";
+      break;
+# endif
+
+# if GNULIB_defined_ESTALE
+    case ESTALE:
+      msg = "Stale NFS file handle";
+      break;
+# endif
+
+# if GNULIB_defined_ECANCELED
+    case ECANCELED:
+      msg = "Operation canceled";
+      break;
+# endif
+    }
 
-  /* Cast away const, due to the historical signature of strerror;
-     callers should not be modifying the string.  */
-  const char *msg = strerror_override (n);
   if (msg)
     return (char *) msg;
 
-  msg = strerror (n);
+  {
+    char *result = strerror (n);
 
-  /* Our strerror_r implementation might use the system's strerror
-     buffer, so all other clients of strerror have to see the error
-     copied into a buffer that we manage.  This is not thread-safe,
-     even if the system strerror is, but portable programs shouldn't
-     be using strerror if they care about thread-safety.  */
-  if (!msg || !*msg)
-    {
-      static char const fmt[] = "Unknown error %d";
-      verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
-      sprintf (buf, fmt, n);
-      errno = EINVAL;
-      return buf;
-    }
-
-  /* Fix STACKBUF_LEN if this ever aborts.  */
-  len = strlen (msg);
-  if (sizeof buf <= len)
-    abort ();
+    if (result == NULL || result[0] == '\0')
+      {
+        static char const fmt[] = "Unknown error (%d)";
+        static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)];
+        sprintf (msg_buf, fmt, n);
+        return msg_buf;
+      }
 
-  return memcpy (buf, msg, len + 1);
+    return result;
+  }
 }
+
+#endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/strerror-override.c gettext-0.18.1.1/gettext-tools/libgettextpo/strerror-override.c
--- gettext-0.19.3/gettext-tools/libgettextpo/strerror-override.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/strerror-override.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-/* strerror-override.c --- POSIX compatible system error routine
-
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2010.  */
-
-#include <config.h>
-
-#include "strerror-override.h"
-
-#include <errno.h>
-
-#if GNULIB_defined_EWINSOCK /* native Windows platforms */
-# if HAVE_WINSOCK2_H
-#  include <winsock2.h>
-# endif
-#endif
-
-/* If ERRNUM maps to an errno value defined by gnulib, return a string
-   describing the error.  Otherwise return NULL.  */
-const char *
-strerror_override (int errnum)
-{
-  /* These error messages are taken from glibc/sysdeps/gnu/errlist.c.  */
-  switch (errnum)
-    {
-#if REPLACE_STRERROR_0
-    case 0:
-      return "Success";
-#endif
-
-#if GNULIB_defined_ESOCK /* native Windows platforms with older <errno.h> */
-    case EINPROGRESS:
-      return "Operation now in progress";
-    case EALREADY:
-      return "Operation already in progress";
-    case ENOTSOCK:
-      return "Socket operation on non-socket";
-    case EDESTADDRREQ:
-      return "Destination address required";
-    case EMSGSIZE:
-      return "Message too long";
-    case EPROTOTYPE:
-      return "Protocol wrong type for socket";
-    case ENOPROTOOPT:
-      return "Protocol not available";
-    case EPROTONOSUPPORT:
-      return "Protocol not supported";
-    case EOPNOTSUPP:
-      return "Operation not supported";
-    case EAFNOSUPPORT:
-      return "Address family not supported by protocol";
-    case EADDRINUSE:
-      return "Address already in use";
-    case EADDRNOTAVAIL:
-      return "Cannot assign requested address";
-    case ENETDOWN:
-      return "Network is down";
-    case ENETUNREACH:
-      return "Network is unreachable";
-    case ECONNRESET:
-      return "Connection reset by peer";
-    case ENOBUFS:
-      return "No buffer space available";
-    case EISCONN:
-      return "Transport endpoint is already connected";
-    case ENOTCONN:
-      return "Transport endpoint is not connected";
-    case ETIMEDOUT:
-      return "Connection timed out";
-    case ECONNREFUSED:
-      return "Connection refused";
-    case ELOOP:
-      return "Too many levels of symbolic links";
-    case EHOSTUNREACH:
-      return "No route to host";
-    case EWOULDBLOCK:
-      return "Operation would block";
-#endif
-#if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */
-    case ETXTBSY:
-      return "Text file busy";
-    case ENODATA:
-      return "No data available";
-    case ENOSR:
-      return "Out of streams resources";
-    case ENOSTR:
-      return "Device not a stream";
-    case ETIME:
-      return "Timer expired";
-    case EOTHER:
-      return "Other error";
-#endif
-#if GNULIB_defined_EWINSOCK /* native Windows platforms */
-    case ESOCKTNOSUPPORT:
-      return "Socket type not supported";
-    case EPFNOSUPPORT:
-      return "Protocol family not supported";
-    case ESHUTDOWN:
-      return "Cannot send after transport endpoint shutdown";
-    case ETOOMANYREFS:
-      return "Too many references: cannot splice";
-    case EHOSTDOWN:
-      return "Host is down";
-    case EPROCLIM:
-      return "Too many processes";
-    case EUSERS:
-      return "Too many users";
-    case EDQUOT:
-      return "Disk quota exceeded";
-    case ESTALE:
-      return "Stale NFS file handle";
-    case EREMOTE:
-      return "Object is remote";
-# if HAVE_WINSOCK2_H
-      /* WSA_INVALID_HANDLE maps to EBADF */
-      /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
-      /* WSA_INVALID_PARAMETER maps to EINVAL */
-    case WSA_OPERATION_ABORTED:
-      return "Overlapped operation aborted";
-    case WSA_IO_INCOMPLETE:
-      return "Overlapped I/O event object not in signaled state";
-    case WSA_IO_PENDING:
-      return "Overlapped operations will complete later";
-      /* WSAEINTR maps to EINTR */
-      /* WSAEBADF maps to EBADF */
-      /* WSAEACCES maps to EACCES */
-      /* WSAEFAULT maps to EFAULT */
-      /* WSAEINVAL maps to EINVAL */
-      /* WSAEMFILE maps to EMFILE */
-      /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
-      /* WSAEINPROGRESS maps to EINPROGRESS */
-      /* WSAEALREADY maps to EALREADY */
-      /* WSAENOTSOCK maps to ENOTSOCK */
-      /* WSAEDESTADDRREQ maps to EDESTADDRREQ */
-      /* WSAEMSGSIZE maps to EMSGSIZE */
-      /* WSAEPROTOTYPE maps to EPROTOTYPE */
-      /* WSAENOPROTOOPT maps to ENOPROTOOPT */
-      /* WSAEPROTONOSUPPORT maps to EPROTONOSUPPORT */
-      /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
-      /* WSAEOPNOTSUPP maps to EOPNOTSUPP */
-      /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
-      /* WSAEAFNOSUPPORT maps to EAFNOSUPPORT */
-      /* WSAEADDRINUSE maps to EADDRINUSE */
-      /* WSAEADDRNOTAVAIL maps to EADDRNOTAVAIL */
-      /* WSAENETDOWN maps to ENETDOWN */
-      /* WSAENETUNREACH maps to ENETUNREACH */
-      /* WSAENETRESET maps to ENETRESET */
-      /* WSAECONNABORTED maps to ECONNABORTED */
-      /* WSAECONNRESET maps to ECONNRESET */
-      /* WSAENOBUFS maps to ENOBUFS */
-      /* WSAEISCONN maps to EISCONN */
-      /* WSAENOTCONN maps to ENOTCONN */
-      /* WSAESHUTDOWN is ESHUTDOWN */
-      /* WSAETOOMANYREFS is ETOOMANYREFS */
-      /* WSAETIMEDOUT maps to ETIMEDOUT */
-      /* WSAECONNREFUSED maps to ECONNREFUSED */
-      /* WSAELOOP maps to ELOOP */
-      /* WSAENAMETOOLONG maps to ENAMETOOLONG */
-      /* WSAEHOSTDOWN is EHOSTDOWN */
-      /* WSAEHOSTUNREACH maps to EHOSTUNREACH */
-      /* WSAENOTEMPTY maps to ENOTEMPTY */
-      /* WSAEPROCLIM is EPROCLIM */
-      /* WSAEUSERS is EUSERS */
-      /* WSAEDQUOT is EDQUOT */
-      /* WSAESTALE is ESTALE */
-      /* WSAEREMOTE is EREMOTE */
-    case WSASYSNOTREADY:
-      return "Network subsystem is unavailable";
-    case WSAVERNOTSUPPORTED:
-      return "Winsock.dll version out of range";
-    case WSANOTINITIALISED:
-      return "Successful WSAStartup not yet performed";
-    case WSAEDISCON:
-      return "Graceful shutdown in progress";
-    case WSAENOMORE: case WSA_E_NO_MORE:
-      return "No more results";
-    case WSAECANCELLED: case WSA_E_CANCELLED:
-      return "Call was canceled";
-    case WSAEINVALIDPROCTABLE:
-      return "Procedure call table is invalid";
-    case WSAEINVALIDPROVIDER:
-      return "Service provider is invalid";
-    case WSAEPROVIDERFAILEDINIT:
-      return "Service provider failed to initialize";
-    case WSASYSCALLFAILURE:
-      return "System call failure";
-    case WSASERVICE_NOT_FOUND:
-      return "Service not found";
-    case WSATYPE_NOT_FOUND:
-      return "Class type not found";
-    case WSAEREFUSED:
-      return "Database query was refused";
-    case WSAHOST_NOT_FOUND:
-      return "Host not found";
-    case WSATRY_AGAIN:
-      return "Nonauthoritative host not found";
-    case WSANO_RECOVERY:
-      return "Nonrecoverable error";
-    case WSANO_DATA:
-      return "Valid name, no data record of requested type";
-      /* WSA_QOS_* omitted */
-# endif
-#endif
-
-#if GNULIB_defined_ENOMSG
-    case ENOMSG:
-      return "No message of desired type";
-#endif
-
-#if GNULIB_defined_EIDRM
-    case EIDRM:
-      return "Identifier removed";
-#endif
-
-#if GNULIB_defined_ENOLINK
-    case ENOLINK:
-      return "Link has been severed";
-#endif
-
-#if GNULIB_defined_EPROTO
-    case EPROTO:
-      return "Protocol error";
-#endif
-
-#if GNULIB_defined_EMULTIHOP
-    case EMULTIHOP:
-      return "Multihop attempted";
-#endif
-
-#if GNULIB_defined_EBADMSG
-    case EBADMSG:
-      return "Bad message";
-#endif
-
-#if GNULIB_defined_EOVERFLOW
-    case EOVERFLOW:
-      return "Value too large for defined data type";
-#endif
-
-#if GNULIB_defined_ENOTSUP
-    case ENOTSUP:
-      return "Not supported";
-#endif
-
-#if GNULIB_defined_ENETRESET
-    case ENETRESET:
-      return "Network dropped connection on reset";
-#endif
-
-#if GNULIB_defined_ECONNABORTED
-    case ECONNABORTED:
-      return "Software caused connection abort";
-#endif
-
-#if GNULIB_defined_ESTALE
-    case ESTALE:
-      return "Stale NFS file handle";
-#endif
-
-#if GNULIB_defined_EDQUOT
-    case EDQUOT:
-      return "Disk quota exceeded";
-#endif
-
-#if GNULIB_defined_ECANCELED
-    case ECANCELED:
-      return "Operation canceled";
-#endif
-
-#if GNULIB_defined_EOWNERDEAD
-    case EOWNERDEAD:
-      return "Owner died";
-#endif
-
-#if GNULIB_defined_ENOTRECOVERABLE
-    case ENOTRECOVERABLE:
-      return "State not recoverable";
-#endif
-
-#if GNULIB_defined_EILSEQ
-    case EILSEQ:
-      return "Invalid or incomplete multibyte or wide character";
-#endif
-
-    default:
-      return NULL;
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/strerror-override.h gettext-0.18.1.1/gettext-tools/libgettextpo/strerror-override.h
--- gettext-0.19.3/gettext-tools/libgettextpo/strerror-override.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/strerror-override.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* strerror-override.h --- POSIX compatible system error routine
-
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
-
-   This 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 _GL_STRERROR_OVERRIDE_H
-# define _GL_STRERROR_OVERRIDE_H
-
-# include <errno.h>
-# include <stddef.h>
-
-/* Reasonable buffer size that should never trigger ERANGE; if this
-   proves too small, we intentionally abort(), to remind us to fix
-   this value.  */
-# define STACKBUF_LEN 256
-
-/* If ERRNUM maps to an errno value defined by gnulib, return a string
-   describing the error.  Otherwise return NULL.  */
-# if REPLACE_STRERROR_0 \
-     || GNULIB_defined_ESOCK \
-     || GNULIB_defined_ESTREAMS \
-     || GNULIB_defined_EWINSOCK \
-     || GNULIB_defined_ENOMSG \
-     || GNULIB_defined_EIDRM \
-     || GNULIB_defined_ENOLINK \
-     || GNULIB_defined_EPROTO \
-     || GNULIB_defined_EMULTIHOP \
-     || GNULIB_defined_EBADMSG \
-     || GNULIB_defined_EOVERFLOW \
-     || GNULIB_defined_ENOTSUP \
-     || GNULIB_defined_ENETRESET \
-     || GNULIB_defined_ECONNABORTED \
-     || GNULIB_defined_ESTALE \
-     || GNULIB_defined_EDQUOT \
-     || GNULIB_defined_ECANCELED \
-     || GNULIB_defined_EOWNERDEAD \
-     || GNULIB_defined_ENOTRECOVERABLE \
-     || GNULIB_defined_EILSEQ
-extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
-# else
-#  define strerror_override(ignored) NULL
-# endif
-
-#endif /* _GL_STRERROR_OVERRIDE_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/striconv.c gettext-0.18.1.1/gettext-tools/libgettextpo/striconv.c
--- gettext-0.19.3/gettext-tools/libgettextpo/striconv.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/striconv.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
@@ -49,8 +50,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Set to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -82,7 +82,7 @@
             else
               return -1;
           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
         /* Irix iconv() inserts a NUL byte if it cannot convert.
            NetBSD iconv() inserts a question mark if it cannot convert.
            Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -97,8 +97,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     {
       char *outptr = tmpbuf;
       size_t outsize = tmpbufsize;
@@ -132,8 +131,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Return to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -158,7 +156,7 @@
             else
               goto fail;
           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
         /* Irix iconv() inserts a NUL byte if it cannot convert.
            NetBSD iconv() inserts a question mark if it cannot convert.
            Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -172,8 +170,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     {
       size_t res = iconv (cd, NULL, NULL, &outptr, &outsize);
 
@@ -210,7 +207,7 @@
      to a trailing NUL byte in the output.  But not for UTF-7.  So that this
      function is usable for UTF-7, we have to exclude the NUL byte from the
      conversion and add it by hand afterwards.  */
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
   /* Irix iconv() inserts a NUL byte if it cannot convert.
      NetBSD iconv() inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -275,8 +272,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   /* Set to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -328,8 +324,7 @@
       }
     /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     for (;;)
       {
         /* Here outptr + outbytes_remaining = result + result_size - 1.  */
@@ -415,8 +410,7 @@
       char *result;
 
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (c_strcasecmp (from_codeset, "EUC-KR") == 0
           || c_strcasecmp (to_codeset, "EUC-KR") == 0)
         {
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/striconveha.c gettext-0.18.1.1/gettext-tools/libgettextpo/striconveha.c
--- gettext-0.19.3/gettext-tools/libgettextpo/striconveha.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/striconveha.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
@@ -226,9 +226,7 @@
 
   /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
      we want to use transliteration.  */
-#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-     && !defined __UCLIBC__) \
-    || _LIBICONV_VERSION >= 0x0105
+#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   if (transliterate)
     {
       int retval;
@@ -328,9 +326,7 @@
 
   /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
      we want to use transliteration.  */
-#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-     && !defined __UCLIBC__) \
-    || _LIBICONV_VERSION >= 0x0105
+#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   if (transliterate)
     {
       char *result;
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/striconveha.h gettext-0.18.1.1/gettext-tools/libgettextpo/striconveha.h
--- gettext-0.19.3/gettext-tools/libgettextpo/striconveha.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/striconveha.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/striconveh.c gettext-0.18.1.1/gettext-tools/libgettextpo/striconveh.c
--- gettext-0.19.3/gettext-tools/libgettextpo/striconveh.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/striconveh.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
@@ -52,8 +52,7 @@
   iconv_t cd2;
 
   /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
   if (c_strcasecmp (from_codeset, "EUC-KR") == 0
       || c_strcasecmp (to_codeset, "EUC-KR") == 0)
     {
@@ -80,9 +79,7 @@
     }
 
   if (STRCASEEQ (to_codeset, "UTF-8", 'U','T','F','-','8',0,0,0,0)
-# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
-      && !defined __UCLIBC__) \
-     || _LIBICONV_VERSION >= 0x0105
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
       || c_strcasecmp (to_codeset, "UTF-8//TRANSLIT") == 0
 # endif
      )
@@ -139,7 +136,7 @@
 /* iconv_carefully is like iconv, except that it stops as soon as it encounters
    a conversion error, and it returns in *INCREMENTED a boolean telling whether
    it has incremented the input pointers past the error location.  */
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
 /* Irix iconv() inserts a NUL byte if it cannot convert.
    NetBSD iconv() inserts a question mark if it cannot convert.
    Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -247,7 +244,7 @@
 
   *inbuf = inptr;
   *inbytesleft = inptr_end - inptr;
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
   /* Irix iconv() inserts a NUL byte if it cannot convert.
      NetBSD iconv() inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -406,8 +403,7 @@
 
     /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     /* Set to the initial state.  */
     iconv (cd, NULL, NULL, NULL, NULL);
 # endif
@@ -535,8 +531,7 @@
   /* Now get the conversion state back to the initial state.
      But avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 #if defined _LIBICONV_VERSION \
-    || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-         || defined __sun)
+    || !((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) || defined __sun)
   for (;;)
     {
       char *outptr = result + length;
@@ -611,8 +606,7 @@
 
     /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
     /* Set to the initial state.  */
     if (cd1 != (iconv_t)(-1))
       iconv (cd1, NULL, NULL, NULL, NULL);
@@ -664,8 +658,7 @@
             /* Now get the conversion state of CD1 back to the initial state.
                But avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) || defined __sun)
             if (cd1 != (iconv_t)(-1))
               res1 = iconv (cd1, NULL, NULL, &out1ptr, &out1size);
             else
@@ -747,8 +740,7 @@
                     /* Now get the conversion state of CD1 back to the initial
                        state.  But avoid glibc-2.1 bug and Solaris 2.7 bug.  */
 # if defined _LIBICONV_VERSION \
-     || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-          || defined __sun)
+     || !((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) || defined __sun)
                     if (cd2 != (iconv_t)(-1))
                       res2 = iconv (cd2, NULL, NULL, &out2ptr, &out2size);
                     else
@@ -891,7 +883,7 @@
                               }
                             length = out2ptr - result;
                           }
-# if !defined _LIBICONV_VERSION && !(defined __GLIBC__ && !defined __UCLIBC__)
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
                         /* Irix iconv() inserts a NUL byte if it cannot convert.
                            NetBSD iconv() inserts a question mark if it cannot
                            convert.
@@ -978,23 +970,19 @@
   if (result == tmpbuf)
     {
       size_t memsize = length + extra_alloc;
+      char *memory;
 
-      if (*resultp != NULL && *lengthp >= memsize)
-        result = *resultp;
+      memory = (char *) malloc (memsize > 0 ? memsize : 1);
+      if (memory != NULL)
+        {
+          memcpy (memory, tmpbuf, length);
+          result = memory;
+        }
       else
         {
-          char *memory;
-
-          memory = (char *) malloc (memsize > 0 ? memsize : 1);
-          if (memory != NULL)
-            result = memory;
-          else
-            {
-              errno = ENOMEM;
-              return -1;
-            }
+          errno = ENOMEM;
+          return -1;
         }
-      memcpy (result, tmpbuf, length);
     }
   else if (result != *resultp && length + extra_alloc < allocated)
     {
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/striconveh.h gettext-0.18.1.1/gettext-tools/libgettextpo/striconveh.h
--- gettext-0.19.3/gettext-tools/libgettextpo/striconveh.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/striconveh.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 
 #if HAVE_ICONV
 
-/* A conversion descriptor for use by the iconveh functions.  */
+/* An conversion descriptor for use by the iconveh functions.  */
 typedef struct
   {
     /* Conversion descriptor from FROM_CODESET to TO_CODESET, or (iconv_t)(-1)
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/striconv.h gettext-0.18.1.1/gettext-tools/libgettextpo/striconv.h
--- gettext-0.19.3/gettext-tools/libgettextpo/striconv.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/striconv.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _STRICONV_H
 #define _STRICONV_H
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/string.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/string.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/string.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/string.in.h	2010-04-25 09:22:40.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,20 +13,20 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _@GUARD_PREFIX@_STRING_H
+#ifndef _GL_STRING_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STRING_H@
 
-#ifndef _@GUARD_PREFIX@_STRING_H
-#define _@GUARD_PREFIX@_STRING_H
+#ifndef _GL_STRING_H
+#define _GL_STRING_H
 
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
@@ -36,20 +36,17 @@
 # include <wchar.h>
 #endif
 
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The attribute __pure__ was added in gcc 2.96.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#  define __pure__ /* empty */
+# endif
 #endif
 
-/* NetBSD 5.0 declares strsignal in <unistd.h>, not in <string.h>.  */
-/* But in any case avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \
-    && ! defined __GLIBC__
-# include <unistd.h>
-#endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -58,36 +55,6 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Find the index of the least-significant set bit.  */
-#if @GNULIB_FFSL@
-# if !@HAVE_FFSL@
-_GL_FUNCDECL_SYS (ffsl, int, (long int i));
-# endif
-_GL_CXXALIAS_SYS (ffsl, int, (long int i));
-_GL_CXXALIASWARN (ffsl);
-#elif defined GNULIB_POSIXCHECK
-# undef ffsl
-# if HAVE_RAW_DECL_FFSL
-_GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module");
-# endif
-#endif
-
-
-/* Find the index of the least-significant set bit.  */
-#if @GNULIB_FFSLL@
-# if !@HAVE_FFSLL@
-_GL_FUNCDECL_SYS (ffsll, int, (long long int i));
-# endif
-_GL_CXXALIAS_SYS (ffsll, int, (long long int i));
-_GL_CXXALIASWARN (ffsll);
-#elif defined GNULIB_POSIXCHECK
-# undef ffsll
-# if HAVE_RAW_DECL_FFSLL
-_GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module");
-# endif
-#endif
-
-
 /* Return the first instance of C within N bytes of S, or NULL.  */
 #if @GNULIB_MEMCHR@
 # if @REPLACE_MEMCHR@
@@ -95,13 +62,13 @@
 #   define memchr rpl_memchr
 #  endif
 _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
 # else
 #  if ! @HAVE_MEMCHR@
 _GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1)));
 #  endif
   /* On some systems, this function is defined as an overloaded function:
@@ -111,7 +78,7 @@
                         void *, (void const *__s, int __c, size_t __n),
                         void const *, (void const *__s, int __c, size_t __n));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
 _GL_CXXALIASWARN1 (memchr, void const *,
@@ -135,8 +102,7 @@
 _GL_FUNCDECL_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 3)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
 _GL_CXXALIAS_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len));
@@ -145,8 +111,7 @@
 _GL_FUNCDECL_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
                    void const *__needle, size_t __needle_len)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 3)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
 #  endif
 _GL_CXXALIAS_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
@@ -187,7 +152,7 @@
 #if @GNULIB_MEMRCHR@
 # if ! @HAVE_DECL_MEMRCHR@
 _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -196,7 +161,7 @@
 _GL_CXXALIAS_SYS_CAST2 (memrchr,
                         void *, (void const *, int, size_t),
                         void const *, (void const *, int, size_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
 _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
@@ -217,7 +182,7 @@
 #if @GNULIB_RAWMEMCHR@
 # if ! @HAVE_RAWMEMCHR@
 _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
+                                     __attribute__ ((__pure__))
                                      _GL_ARG_NONNULL ((1)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -226,7 +191,7 @@
 _GL_CXXALIAS_SYS_CAST2 (rawmemchr,
                         void *, (void const *__s, int __c_in),
                         void const *, (void const *__s, int __c_in));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
 _GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
@@ -264,7 +229,6 @@
 #if @GNULIB_STPNCPY@
 # if @REPLACE_STPNCPY@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef stpncpy
 #   define stpncpy rpl_stpncpy
 #  endif
 _GL_FUNCDECL_RPL (stpncpy, char *,
@@ -306,29 +270,18 @@
 
 /* Find the first occurrence of C in S or the final NUL byte.  */
 #if @GNULIB_STRCHRNUL@
-# if @REPLACE_STRCHRNUL@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define strchrnul rpl_strchrnul
-#  endif
-_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
-                                     _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strchrnul, char *,
-                  (const char *str, int ch));
-# else
-#  if ! @HAVE_STRCHRNUL@
+# if ! @HAVE_STRCHRNUL@
 _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
-                                     _GL_ATTRIBUTE_PURE
+                                     __attribute__ ((__pure__))
                                      _GL_ARG_NONNULL ((1)));
-#  endif
+# endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const char * std::strchrnul (const char *, int); }
        extern "C++" { char * std::strchrnul (char *, int); }  */
 _GL_CXXALIAS_SYS_CAST2 (strchrnul,
                         char *, (char const *__s, int __c_in),
                         char const *, (char const *__s, int __c_in));
-# endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
 _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
@@ -353,10 +306,6 @@
 _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strdup, char *, (char const *__s));
 # else
-#  if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup
-    /* strdup exists as a function and as a macro.  Get rid of the macro.  */
-#   undef strdup
-#  endif
 #  if !(@HAVE_DECL_STRDUP@ || defined strdup)
 _GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)));
 #  endif
@@ -429,13 +378,13 @@
 #   define strnlen rpl_strnlen
 #  endif
 _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
 _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
@@ -465,7 +414,7 @@
 #if @GNULIB_STRPBRK@
 # if ! @HAVE_STRPBRK@
 _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
-                                   _GL_ATTRIBUTE_PURE
+                                   __attribute__ ((__pure__))
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -474,7 +423,7 @@
 _GL_CXXALIAS_SYS_CAST2 (strpbrk,
                         char *, (char const *__s, char const *__accept),
                         const char *, (char const *__s, char const *__accept));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
 _GL_CXXALIASWARN1 (strpbrk, char const *,
@@ -565,7 +514,7 @@
 #   define strstr rpl_strstr
 #  endif
 _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle)
-                                  _GL_ATTRIBUTE_PURE
+                                  __attribute__ ((__pure__))
                                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
 # else
@@ -576,7 +525,7 @@
                         char *, (const char *haystack, const char *needle),
                         const char *, (const char *haystack, const char *needle));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
 _GL_CXXALIASWARN1 (strstr, const char *,
@@ -607,16 +556,14 @@
 #  endif
 _GL_FUNCDECL_RPL (strcasestr, char *,
                   (const char *haystack, const char *needle)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strcasestr, char *,
                   (const char *haystack, const char *needle));
 # else
 #  if ! @HAVE_STRCASESTR@
 _GL_FUNCDECL_SYS (strcasestr, char *,
                   (const char *haystack, const char *needle)
-                  _GL_ATTRIBUTE_PURE
-                  _GL_ARG_NONNULL ((1, 2)));
+                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
 #  endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const char * strcasestr (const char *, const char *); }
@@ -625,7 +572,7 @@
                         char *, (const char *haystack, const char *needle),
                         const char *, (const char *haystack, const char *needle));
 # endif
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
 _GL_CXXALIASWARN1 (strcasestr, const char *,
@@ -724,14 +671,10 @@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbslen rpl_mbslen
 #  endif
-_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string)
-                                  _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string));
 # else
-_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string)
-                                  _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string));
 # endif
 _GL_CXXALIASWARN (mbslen);
@@ -741,7 +684,6 @@
 /* Return the number of multibyte characters in the character string starting
    at STRING and ending at STRING + LEN.  */
 _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1));
 #endif
 
@@ -755,12 +697,10 @@
 #   define mbschr rpl_mbschr /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c)
-                                  _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c));
 # else
 _GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c)
-                                  _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c));
 # endif
@@ -772,17 +712,15 @@
    and return a pointer to it.  Return NULL if C is not found in STRING.
    Unlike strrchr(), this function works correctly in multibyte locales with
    encodings such as GB18030.  */
-# if defined __hpux || defined __INTERIX
+# if defined __hpux
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define mbsrchr rpl_mbsrchr /* avoid collision with system function */
+#   define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c));
 # else
 _GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c));
 # endif
@@ -795,7 +733,6 @@
    Unlike strstr(), this function works correctly in multibyte locales with
    encodings different from UTF-8.  */
 _GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -807,7 +744,6 @@
    different lengths!
    Unlike strcasecmp(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C int mbscasecmp (const char *s1, const char *s2)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -822,21 +758,20 @@
    Unlike strncasecmp(), this function works correctly in multibyte locales.
    But beware that N is not a byte count but a character count!  */
 _GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
 #if @GNULIB_MBSPCASECMP@
 /* Compare the initial segment of the character string STRING consisting of
    at most mbslen (PREFIX) characters with the character string PREFIX,
-   ignoring case.  If the two match, return a pointer to the first byte
-   after this prefix in STRING.  Otherwise, return NULL.
-   Note: This function may, in multibyte locales, return non-NULL if STRING
-   is of smaller length than PREFIX!
+   ignoring case, returning less than, equal to or greater than zero if this
+   initial segment is lexicographically less than, equal to or greater than
+   PREFIX.
+   Note: This function may, in multibyte locales, return 0 if STRING is of
+   smaller length than PREFIX!
    Unlike strncasecmp(), this function works correctly in multibyte
    locales.  */
 _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -847,7 +782,6 @@
    strlen (haystack) < strlen (needle) !
    Unlike strcasestr(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -858,7 +792,6 @@
    if none exists.
    Unlike strcspn(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -872,12 +805,10 @@
 #   define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
 #  endif
 _GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept));
 # else
 _GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept));
 # endif
@@ -891,7 +822,6 @@
    if none exists.
    Unlike strspn(), this function works correctly in multibyte locales.  */
 _GL_EXTERN_C size_t mbsspn (const char *string, const char *reject)
-     _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
 #endif
 
@@ -955,35 +885,6 @@
                  "use gnulib module strerror to guarantee non-NULL result");
 #endif
 
-/* Map any int, typically from errno, into an error message.  Multithread-safe.
-   Uses the POSIX declaration, not the glibc declaration.  */
-#if @GNULIB_STRERROR_R@
-# if @REPLACE_STRERROR_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef strerror_r
-#   define strerror_r rpl_strerror_r
-#  endif
-_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)
-                                   _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen));
-# else
-#  if !@HAVE_DECL_STRERROR_R@
-_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
-                                   _GL_ARG_NONNULL ((2)));
-#  endif
-_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
-# endif
-# if @HAVE_DECL_STRERROR_R@
-_GL_CXXALIASWARN (strerror_r);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef strerror_r
-# if HAVE_RAW_DECL_STRERROR_R
-_GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
-                 "use gnulib module strerror_r-posix for portability");
-# endif
-#endif
-
 #if @GNULIB_STRSIGNAL@
 # if @REPLACE_STRSIGNAL@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1011,7 +912,6 @@
 #if @GNULIB_STRVERSCMP@
 # if !@HAVE_STRVERSCMP@
 _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
-                                   _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
 _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
@@ -1025,5 +925,5 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_STRING_H */
-#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _GL_STRING_H */
+#endif /* _GL_STRING_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/strstr.c gettext-0.18.1.1/gettext-tools/libgettextpo/strstr.c
--- gettext-0.19.3/gettext-tools/libgettextpo/strstr.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/strstr.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2014 Free Software
-   Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, 2004, 2007,
+   2008, 2009, 2010 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
@@ -13,7 +13,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This particular implementation was written by Eric Blake, 2008.  */
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/str-two-way.h gettext-0.18.1.1/gettext-tools/libgettextpo/str-two-way.h
--- gettext-0.19.3/gettext-tools/libgettextpo/str-two-way.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/str-two-way.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
@@ -14,7 +14,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Before including this file, you need to include <config.h> and
    <string.h>, and define:
@@ -43,15 +44,14 @@
 #include <limits.h>
 #include <stdint.h>
 
-/* We use the Two-Way string matching algorithm (also known as
-   Chrochemore-Perrin), which guarantees linear complexity with
-   constant space.  Additionally, for long needles, we also use a bad
-   character shift table similar to the Boyer-Moore algorithm to
-   achieve improved (potentially sub-linear) performance.
-
-   See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260,
-   http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm,
-   http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.34.6641&rep=rep1&type=pdf
+/* We use the Two-Way string matching algorithm, which guarantees
+   linear complexity with constant space.  Additionally, for long
+   needles, we also use a bad character shift table similar to the
+   Boyer-Moore algorithm to achieve improved (potentially sub-linear)
+   performance.
+
+   See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260
+   and http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm
 */
 
 /* Point at which computing a bad-byte shift table is likely to be
@@ -95,14 +95,11 @@
    A critical factorization has the property that the local period
    equals the global period.  All strings have at least one critical
    factorization with the left half smaller than the global period.
-   And while some strings have more than one critical factorization,
-   it is provable that with an ordered alphabet, at least one of the
-   critical factorizations corresponds to a maximal suffix.
 
    Given an ordered alphabet, a critical factorization can be computed
    in linear time, with 2 * NEEDLE_LEN comparisons, by computing the
-   shorter of two ordered maximal suffixes.  The ordered maximal
-   suffixes are determined by lexicographic comparison while tracking
+   larger of two ordered maximal suffixes.  The ordered maximal
+   suffixes are determined by lexicographic comparison of
    periodicity.  */
 static size_t
 critical_factorization (const unsigned char *needle, size_t needle_len,
@@ -115,14 +112,6 @@
   size_t p; /* Intermediate period.  */
   unsigned char a, b; /* Current comparison bytes.  */
 
-  /* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered
-     out 0-length needles.  */
-  if (needle_len < 3)
-    {
-      *period = 1;
-      return needle_len - 1;
-    }
-
   /* Invariants:
      0 <= j < NEEDLE_LEN - 1
      -1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed)
@@ -201,20 +190,8 @@
         }
     }
 
-  /* Choose the shorter suffix.  Return the index of the first byte of
-     the right half, rather than the last byte of the left half.
-
-     For some examples, 'banana' has two critical factorizations, both
-     exposed by the two lexicographic extreme suffixes of 'anana' and
-     'nana', where both suffixes have a period of 2.  On the other
-     hand, with 'aab' and 'bba', both strings have a single critical
-     factorization of the last byte, with the suffix having a period
-     of 1.  While the maximal lexicographic suffix of 'aab' is 'b',
-     the maximal lexicographic suffix of 'bba' is 'ba', which is not a
-     critical factorization.  Conversely, the maximal reverse
-     lexicographic suffix of 'a' works for 'bba', but not 'ab' for
-     'aab'.  The shorter suffix of the two will always be a critical
-     factorization.  */
+  /* Choose the longer suffix.  Return the first byte of the right
+     half, rather than the last byte of the left half.  */
   if (max_suffix_rev + 1 < max_suffix + 1)
     return max_suffix + 1;
   *period = p;
@@ -249,9 +226,9 @@
      first.  */
   if (CMP_FUNC (needle, needle + period, suffix) == 0)
     {
-      /* Entire needle is periodic; a mismatch in the left half can
-         only advance by the period, so use memory to avoid rescanning
-         known occurrences of the period in the right half.  */
+      /* Entire needle is periodic; a mismatch can only advance by the
+         period, so use memory to avoid rescanning known occurrences
+         of the period.  */
       size_t memory = 0;
       j = 0;
       while (AVAILABLE (haystack, haystack_len, j, needle_len))
@@ -353,9 +330,9 @@
      first.  */
   if (CMP_FUNC (needle, needle + period, suffix) == 0)
     {
-      /* Entire needle is periodic; a mismatch in the left half can
-         only advance by the period, so use memory to avoid rescanning
-         known occurrences of the period in the right half.  */
+      /* Entire needle is periodic; a mismatch can only advance by the
+         period, so use memory to avoid rescanning known occurrences
+         of the period.  */
       size_t memory = 0;
       size_t shift;
       j = 0;
@@ -372,8 +349,8 @@
                      a byte out of place, there can be no match until
                      after the mismatch.  */
                   shift = needle_len - period;
+                  memory = 0;
                 }
-              memory = 0;
               j += shift;
               continue;
             }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/sys_stat.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/sys_stat.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/sys_stat.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/sys_stat.in.h	2010-04-25 09:22:40.000000000 +0000
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
 
@@ -23,7 +24,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_system_sys_stat_h
 /* Special invocation convention.  */
@@ -33,10 +33,9 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
 
-/* Get nlink_t.
-   May also define off_t to a 64-bit type on native Windows.  */
+/* Get nlink_t.  */
 #include <sys/types.h>
 
 /* Get struct timespec.  */
@@ -45,8 +44,8 @@
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
 
-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
-#define _@GUARD_PREFIX@_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
+#define _GL_SYS_STAT_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -55,27 +54,10 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 /* Before doing "#define mkdir rpl_mkdir" below, we need to include all
-   headers that may declare mkdir().  Native Windows platforms declare mkdir
-   in <io.h> and/or <direct.h>, not in <unistd.h>.  */
+   headers that may declare mkdir().  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # include <io.h>     /* mingw32, mingw64 */
-# include <direct.h> /* mingw64, MSVC 9 */
-#endif
-
-/* Native Windows platforms declare umask() in <io.h>.  */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-/* Large File Support on native Windows.  */
-#if @WINDOWS_64_BIT_ST_SIZE@
-# define stat _stati64
-#endif
-
-#ifndef S_IFIFO
-# ifdef _S_IFIFO
-#  define S_IFIFO _S_IFIFO
-# endif
+# include <direct.h> /* mingw64 */
 #endif
 
 #ifndef S_IFMT
@@ -150,10 +132,6 @@
 # endif
 #endif
 
-#ifndef S_ISMPX /* AIX */
-# define S_ISMPX(m) 0
-#endif
-
 #ifndef S_ISNAM /* Xenix */
 # ifdef S_IFNAM
 #  define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM)
@@ -333,28 +311,16 @@
 #endif
 
 
-#if @GNULIB_FSTAT@
-# if @REPLACE_FSTAT@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef fstat
-#   define fstat rpl_fstat
-#  endif
+#if @REPLACE_FSTAT@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define fstat rpl_fstat
+# endif
 _GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
-# else
+#else
 _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
-# endif
-_GL_CXXALIASWARN (fstat);
-#elif @WINDOWS_64_BIT_ST_SIZE@
-/* Above, we define stat to _stati64.  */
-# define fstat _fstati64
-#elif defined GNULIB_POSIXCHECK
-# undef fstat
-# if HAVE_RAW_DECL_FSTAT
-_GL_WARN_ON_USE (fstat, "fstat has portability problems - "
-                 "use gnulib module fstat for portability");
-# endif
 #endif
+_GL_CXXALIASWARN (fstat);
 
 
 #if @GNULIB_FSTATAT@
@@ -388,11 +354,7 @@
 
 
 #if @GNULIB_FUTIMENS@
-/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens
-   implementation relies on futimesat, which on Solaris 10 makes an invocation
-   to futimens that is meant to invoke the libc's futimens(), not gnulib's
-   futimens().  */
-# if @REPLACE_FUTIMENS@ || (!@HAVE_FUTIMENS@ && defined __sun)
+# if @REPLACE_FUTIMENS@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef futimens
 #   define futimens rpl_futimens
@@ -405,9 +367,7 @@
 #  endif
 _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
 # endif
-# if @HAVE_FUTIMENS@
 _GL_CXXALIASWARN (futimens);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef futimens
 # if HAVE_RAW_DECL_FUTIMENS
@@ -500,14 +460,11 @@
    which are included above.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-#  if !GNULIB_defined_rpl_mkdir
-static int
+static inline int
 rpl_mkdir (char const *name, mode_t mode)
 {
   return _mkdir (name);
 }
-#   define GNULIB_defined_rpl_mkdir 1
-#  endif
 
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mkdir rpl_mkdir
@@ -592,8 +549,7 @@
 _GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev)
                               _GL_ARG_NONNULL ((1)));
 #  endif
-/* Need to cast, because on OSF/1 5.1, the third parameter is '...'.  */
-_GL_CXXALIAS_SYS_CAST (mknod, int, (char const *file, mode_t mode, dev_t dev));
+_GL_CXXALIAS_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev));
 # endif
 _GL_CXXALIASWARN (mknod);
 #elif defined GNULIB_POSIXCHECK
@@ -628,59 +584,17 @@
 /* We can't use the object-like #define stat rpl_stat, because of
    struct stat.  This means that rpl_stat will not be used if the user
    does (stat)(a,b).  Oh well.  */
-#  if defined _AIX && defined stat && defined _LARGE_FILES
+#  undef stat
+#  ifdef _LARGE_FILES
     /* With _LARGE_FILES defined, AIX (only) defines stat to stat64,
        so we have to replace stat64() instead of stat(). */
+#   define stat stat64
 #   undef stat64
 #   define stat64(name, st) rpl_stat (name, st)
-#  elif @WINDOWS_64_BIT_ST_SIZE@
-    /* Above, we define stat to _stati64.  */
-#   if defined __MINGW32__ && defined _stati64
-#    ifndef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
-#    endif
-#   elif defined _MSC_VER && defined _stati64
-#    ifdef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat32i64.  */
-#     undef _stat32i64
-#     define _stat32i64(name, st) rpl_stat (name, st)
-#    else
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
-#    endif
-#   else
-#    undef _stati64
-#    define _stati64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined __MINGW32__ && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32i64.  */
-#    undef _stat32i64
-#    define _stat32i64(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64.  */
-#    undef _stat64
-#    define _stat64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined _MSC_VER && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32.  */
-#    undef _stat32
-#    define _stat32(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64i32.  */
-#    undef _stat64i32
-#    define _stat64i32(name, st) rpl_stat (name, st)
-#   endif
-#  else /* !(_AIX ||__MINGW32__ ||  _MSC_VER) */
-#   undef stat
+#  else /* !_LARGE_FILES */
 #   define stat(name, st) rpl_stat (name, st)
 #  endif /* !_LARGE_FILES */
-_GL_EXTERN_C int stat (const char *name, struct stat *buf)
-                      _GL_ARG_NONNULL ((1, 2));
+_GL_EXTERN_C int stat (const char *name, struct stat *buf) _GL_ARG_NONNULL ((1, 2));
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef stat
@@ -692,11 +606,7 @@
 
 
 #if @GNULIB_UTIMENSAT@
-/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat
-   implementation relies on futimesat, which on Solaris 10 makes an invocation
-   to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
-   utimensat().  */
-# if @REPLACE_UTIMENSAT@ || (!@HAVE_UTIMENSAT@ && defined __sun)
+# if @REPLACE_UTIMENSAT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef utimensat
 #   define utimensat rpl_utimensat
@@ -715,9 +625,7 @@
 _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
                                    struct timespec const times[2], int flag));
 # endif
-# if @HAVE_UTIMENSAT@
 _GL_CXXALIASWARN (utimensat);
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef utimensat
 # if HAVE_RAW_DECL_UTIMENSAT
@@ -727,6 +635,6 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/sys_time.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/sys_time.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/sys_time.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/sys_time.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,213 +0,0 @@
-/* Provide a more complete sys/time.h.
-
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
-
-   This 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 Paul Eggert.  */
-
-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
-   recursively via <sys/select.h>.
-   Simply delegate to the system's header in this case; it is a no-op.
-   Without this extra ifdef, the C++ gettimeofday declaration below
-   would be a forward declaration in gnulib's nested <sys/time.h>.  */
-#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-#else
-
-/* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_SYS_TIME_H@
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-#endif
-
-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
-#define _@GUARD_PREFIX@_SYS_TIME_H
-
-#if ! @HAVE_SYS_TIME_H@
-# include <time.h>
-#endif
-
-/* On native Windows with MSVC, get the 'struct timeval' type.
-   Also, on native Windows with a 64-bit time_t, where we are overriding the
-   'struct timeval' type, get all declarations of system functions whose
-   signature contains 'struct timeval'.  */
-#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
-# define _GL_INCLUDING_WINSOCK2_H
-# include <winsock2.h>
-# undef _GL_INCLUDING_WINSOCK2_H
-#endif
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
-
-# if @REPLACE_STRUCT_TIMEVAL@
-#  define timeval rpl_timeval
-# endif
-
-# if !GNULIB_defined_struct_timeval
-struct timeval
-{
-  time_t tv_sec;
-  long int tv_usec;
-};
-#  define GNULIB_defined_struct_timeval 1
-# endif
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#if @GNULIB_GETTIMEOFDAY@
-# if @REPLACE_GETTIMEOFDAY@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gettimeofday
-#   define gettimeofday rpl_gettimeofday
-#  endif
-_GL_FUNCDECL_RPL (gettimeofday, int,
-                  (struct timeval *restrict, void *restrict)
-                  _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gettimeofday, int,
-                  (struct timeval *restrict, void *restrict));
-# else
-#  if !@HAVE_GETTIMEOFDAY@
-_GL_FUNCDECL_SYS (gettimeofday, int,
-                  (struct timeval *restrict, void *restrict)
-                  _GL_ARG_NONNULL ((1)));
-#  endif
-/* Need to cast, because on glibc systems, by default, the second argument is
-                                                  struct timezone *.  */
-_GL_CXXALIAS_SYS_CAST (gettimeofday, int,
-                       (struct timeval *restrict, void *restrict));
-# endif
-_GL_CXXALIASWARN (gettimeofday);
-#elif defined GNULIB_POSIXCHECK
-# undef gettimeofday
-# if HAVE_RAW_DECL_GETTIMEOFDAY
-_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
-                 "use gnulib module gettimeofday for portability");
-# endif
-#endif
-
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if defined _MSC_VER && @HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_UNISTD_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef close
-#   define close close_used_without_including_unistd_h
-#  else
-     _GL_WARN_ON_USE (close,
-                      "close() used without including <unistd.h>");
-#  endif
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gethostname
-#   define gethostname gethostname_used_without_including_unistd_h
-#  else
-     _GL_WARN_ON_USE (gethostname,
-                      "gethostname() used without including <unistd.h>");
-#  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-     _GL_WARN_ON_USE (socket,
-                      "socket() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (connect,
-                      "connect() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (accept,
-                      "accept() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (bind,
-                      "bind() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getpeername,
-                      "getpeername() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockname,
-                      "getsockname() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockopt,
-                      "getsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (listen,
-                      "listen() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recv,
-                      "recv() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (send,
-                      "send() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recvfrom,
-                      "recvfrom() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (sendto,
-                      "sendto() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (setsockopt,
-                      "setsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (shutdown,
-                      "shutdown() used without including <sys/socket.h>");
-#  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef select
-#   define select select_used_without_including_sys_select_h
-#  else
-     _GL_WARN_ON_USE (select,
-                      "select() used without including <sys/select.h>");
-#  endif
-# endif
-#endif
-
-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
-#endif /* _CYGWIN_SYS_TIME_H */
-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/sys_types.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/sys_types.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/sys_types.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/sys_types.in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Provide a more complete sys/types.h.
-
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-
-   This 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/>.  */
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
-
-/* The include_next requires a split double-inclusion guard.  */
-# define _GL_INCLUDING_SYS_TYPES_H
-#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@
-# undef _GL_INCLUDING_SYS_TYPES_H
-
-#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
-#define _@GUARD_PREFIX@_SYS_TYPES_H
-
-/* Override off_t if Large File Support is requested on native Windows.  */
-#if @WINDOWS_64_BIT_OFF_T@
-/* Same as int64_t in <stdint.h>.  */
-# if defined _MSC_VER
-#  define off_t __int64
-# else
-#  define off_t long long int
-# endif
-/* Indicator, for gnulib internal purposes.  */
-# define _GL_WINDOWS_64_BIT_OFF_T 1
-#endif
-
-/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>.  */
-/* But avoid namespace pollution on glibc systems.  */
-#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
-    && ! defined __GLIBC__
-# include <stddef.h>
-#endif
-
-#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
-#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/time.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/time.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/time.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/time.in.h	2010-06-03 21:37:07.000000000 +0000
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,12 +13,12 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
@@ -27,13 +27,13 @@
    without adding our own declarations.  */
 #if (defined __need_time_t || defined __need_clock_t \
      || defined __need_timespec \
-     || defined _@GUARD_PREFIX@_TIME_H)
+     || defined _GL_TIME_H)
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
 #else
 
-# define _@GUARD_PREFIX@_TIME_H
+# define _GL_TIME_H
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
@@ -48,29 +48,33 @@
 
 /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
    Or they define it with the wrong member names or define it in <sys/time.h>
-   (e.g., FreeBSD circa 1997).  Stock Mingw prior to 3.0 does not define it,
-   but the pthreads-win32 library defines it in <pthread.h>.  */
+   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
+   pthreads-win32 library defines it in <pthread.h>.  */
 # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
 #  if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
+/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
+#   undef asctime_r
+#   undef ctime_r
+#   undef gmtime_r
+#   undef localtime_r
+#   undef rand_r
+#   undef strtok_r
 #  else
 
 #   ifdef __cplusplus
 extern "C" {
 #   endif
 
-#   if !GNULIB_defined_struct_timespec
-#    undef timespec
-#    define timespec rpl_timespec
+#   undef timespec
+#   define timespec rpl_timespec
 struct timespec
 {
   time_t tv_sec;
   long int tv_nsec;
 };
-#    define GNULIB_defined_struct_timespec 1
-#   endif
 
 #   ifdef __cplusplus
 }
@@ -79,18 +83,6 @@
 #  endif
 # endif
 
-# if !GNULIB_defined_struct_time_t_must_be_integral
-/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
-   time_t to be an integer type, even though C99 permits floating
-   point.  We don't know of any implementation that uses floating
-   point, and it is much easier to write code that doesn't have to
-   worry about that corner case, so we force the issue.  */
-struct __time_t_must_be_integral {
-  unsigned int __floating_time_t_unsupported : (time_t) 1;
-};
-#  define GNULIB_defined_struct_time_t_must_be_integral 1
-# endif
-
 /* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
    return -1 and store the remaining time into RMTP.  See
    <http://www.opengroup.org/susv3xsh/nanosleep.html>.  */
@@ -145,7 +137,7 @@
 _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  else
-#   if ! @HAVE_DECL_LOCALTIME_R@
+#   if ! @HAVE_LOCALTIME_R@
 _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result)
                                             _GL_ARG_NONNULL ((1, 2)));
@@ -153,9 +145,7 @@
 _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  endif
-#  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (localtime_r);
-#  endif
 #  if @REPLACE_LOCALTIME_R@
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef gmtime_r
@@ -167,7 +157,7 @@
 _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  else
-#   if ! @HAVE_DECL_LOCALTIME_R@
+#   if ! @HAVE_LOCALTIME_R@
 _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result)
                                          _GL_ARG_NONNULL ((1, 2)));
@@ -175,42 +165,7 @@
 _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  endif
-#  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (gmtime_r);
-#  endif
-# endif
-
-/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
-   <http://www.opengroup.org/susv3xsh/localtime.html> and
-   <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
-# if @GNULIB_GETTIMEOFDAY@
-#  if @REPLACE_LOCALTIME@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef localtime
-#    define localtime rpl_localtime
-#   endif
-_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
-		                          _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
-#  else
-_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
-#  endif
-_GL_CXXALIASWARN (localtime);
-# endif
-
-# if @GNULIB_GETTIMEOFDAY@
-#  if @REPLACE_GMTIME@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef gmtime
-#    define gmtime rpl_gmtime
-#   endif
-_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer)
-                                       _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer));
-#  else
-_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer));
-#  endif
-_GL_CXXALIASWARN (gmtime);
 # endif
 
 /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c gettext-0.18.1.1/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/uniconv.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/uniconv.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/uniconv.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/uniconv.in.h	2010-05-17 19:58:03.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversions between Unicode and legacy encodings.
-   Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrkprop1.h gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrkprop1.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrkprop1.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrkprop1.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,8 +1,8 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Line breaking properties of Unicode characters.  */
-/* Generated automatically by gen-lbrk for Unicode 6.0.0.  */
+/* Generated automatically by gen-lbrk for Unicode 5.1.0.  */
 
-/* Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
 
    This program 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 @@
   {
     int level1[15];
     int level2[4 << 9];
-    unsigned char level3[166 << 7];
+    unsigned char level3[142 << 7];
   }
 lbrkprop_t;
 extern const lbrkprop_t unilbrkprop;
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrkprop2.h gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrkprop2.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrkprop2.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrkprop2.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,8 +1,8 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Line breaking properties of Unicode characters.  */
-/* Generated automatically by gen-lbrk for Unicode 6.0.0.  */
+/* Generated automatically by gen-lbrk for Unicode 5.1.0.  */
 
-/* Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,64 +20,64 @@
 const lbrkprop_t unilbrkprop =
 {
   {
-        0,   512,  1024,  1024,    -1,    -1,    -1,    -1,
+        0,   512,  1024,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,  1536
   },
   {
         0,   128,   256,   256,   256,   384,   512,   640,
       256,   768,   896,  1024,  1152,  1280,  1408,  1536,
-     1664,    -1,  1792,  1920,  2048,  2176,  2304,  2432,
-     2560,  2688,  2816,  2944,  3072,  3200,  3328,  3456,
-     3584,  3712,  3840,  3968,  4096,  4224,  4352,  4480,
-     4608,   256,   256,   256,   256,  4736,  4864,  4992,
-     5120,  5248,  5376,  5504,  5632,  5760,  5888,  6016,
-     6144,  6272,   256,  6400,   256,   256,  6528,  6656,
-     6784,  6912,  7040,  7168,  7296,  7424,  7552,  7680,
-     7808,  7936,  8064,  8192,  8320,  8448,  8576,  8704,
-      256,   256,   256,  8832,   256,   256,  8960,    -1,
-     9088,  9216,  9344,  9472,  9600,  9728,  9856,  9984,
-    10112, 10240, 10368, 10496, 10624, 10752,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856, 10880,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-    11008,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856, 11136,   256,   256, 11264, 11392,   256, 11520,
-    11648, 11776, 11904, 12032, 12160, 12288, 12416, 12544,
-    12672, 12800, 12928, 13056, 13184, 13312, 13440, 12672,
-    12800, 12928, 13056, 13184, 13312, 13440, 12672, 12800,
-    12928, 13056, 13184, 13312, 13440, 12672, 12800, 12928,
-    13056, 13184, 13312, 13440, 12672, 12800, 12928, 13056,
-    13184, 13312, 13440, 12672, 12800, 12928, 13056, 13184,
-    13312, 13440, 12672, 12800, 12928, 13056, 13184, 13312,
-    13440, 12672, 12800, 12928, 13056, 13184, 13312, 13440,
-    12672, 12800, 12928, 13056, 13184, 13312, 13440, 12672,
-    12800, 12928, 13056, 13184, 13312, 13440, 12672, 12800,
-    12928, 13056, 13184, 13312, 13440, 12672, 12800, 12928,
-    13056, 13184, 13312, 13440, 12672, 12800, 12928, 13568,
+       -1,    -1,  1664,  1792,  1920,  2048,  2176,  2304,
+     2432,  2560,  2688,  2816,  2944,  3072,  3200,  3328,
+     3456,  3584,  3712,  3840,  3968,  4096,  4224,  4352,
+     4480,   256,   256,   256,  4608,  4736,  4864,  4992,
+     5120,  5248,  5376,  5504,  5632,    -1,  5760,  5888,
+     6016,    -1,   256,  6144,   256,   256,  6272,  6400,
+     6528,  6656,  6784,  6912,  7040,  7168,  7296,  7424,
+     7552,  7680,  7808,  7936,  8064,  8192,  8320,  8448,
+      256,   256,   256,  8576,   256,   256,  8704,    -1,
+     8832,  8960,  9088,  9216,  9344,  9472,  9600,  9728,
+     9856,  9984, 10112, 10240, 10368, 10496,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600, 10624,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600, 10752,
+    10880,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600, 11008,   256,   256, 11136, 11264,   256, 11392,
+    11520, 11648, 11776,    -1, 11904,    -1,    -1,    -1,
+    12032, 12160, 12288, 12416, 12544, 12672, 12800, 12032,
+    12160, 12288, 12416, 12544, 12672, 12800, 12032, 12160,
+    12288, 12416, 12544, 12672, 12800, 12032, 12160, 12288,
+    12416, 12544, 12672, 12800, 12032, 12160, 12288, 12416,
+    12544, 12672, 12800, 12032, 12160, 12288, 12416, 12544,
+    12672, 12800, 12032, 12160, 12288, 12416, 12544, 12672,
+    12800, 12032, 12160, 12288, 12416, 12544, 12672, 12800,
+    12032, 12160, 12288, 12416, 12544, 12672, 12800, 12032,
+    12160, 12288, 12416, 12544, 12672, 12800, 12032, 12160,
+    12288, 12416, 12544, 12672, 12800, 12032, 12160, 12288,
+    12416, 12544, 12672, 12800, 12032, 12160, 12288, 12928,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -86,22 +86,18 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  9856,  9856,  9856,  9856, 13696, 13824,
-      256,   256, 13952, 14080, 14208, 14336, 14464, 14592,
-    14720, 14848, 14976, 15104,    -1, 15232, 15360, 15488,
-      256, 15616,    -1,    -1,    -1,    -1,    -1,    -1,
-    15744,    -1, 15872,    -1, 16000,    -1, 16128,    -1,
-    16256,    -1,    -1,    -1, 16384,    -1,    -1,    -1,
-    16512, 16640,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  9600,  9600, 13056, 13184, 13312, 13440,
+      256,   256, 13568, 13696, 13824, 13952, 14080, 14208,
+    14336, 14464, 14592, 14720,    -1, 14848, 14976, 15104,
+      256, 15232,    -1,    -1,    -1,    -1,    -1,    -1,
+    15360,    -1, 15488,    -1, 15616,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256,   256,   256, 16768,    -1,
-    16896,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 17024, 17152, 17280,   256,
-    17408,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      256,   256,   256,   256,   256,   256, 15744,    -1,
+    15872,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -114,7 +110,6 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 17536,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -132,7 +127,6 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    17664,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -140,83 +134,89 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256, 17792, 17920, 18048, 18176,    -1, 18304,    -1,
-    18432, 18560, 18688,   256,   256, 18816,   256, 18944,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    19072, 19200, 19328, 19456, 19584,    -1, 19712, 19840,
-    19968, 20096, 20224, 20352, 20480, 20608,  7680,    -1,
+      256, 16000, 16128, 16256, 16384,    -1, 16512,    -1,
+    16640, 16768, 16896,   256,   256, 17024,   256, 17152,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856,  9856,
-     9856,  9856,  9856,  9856,  9856,  9856,  9856, 20736,
-    20864,    -1, 20992, 21120,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    17280, 17408,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600,  9600,  9600,  9600,
+     9600,  9600,  9600,  9600,  9600, 17536,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     9600,  9600,  9600,  9600, 17664,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    17792,    -1, 17920, 18048,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -287,13 +287,13 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_SP, LBP_EX, LBP_QU, LBP_AL, LBP_PR, LBP_PO, LBP_AL, LBP_QU,
-    LBP_OP, LBP_CP, LBP_AL, LBP_PR, LBP_IS, LBP_HY, LBP_IS, LBP_SY,
+    LBP_OP, LBP_CL, LBP_AL, LBP_PR, LBP_IS, LBP_HY, LBP_IS, LBP_SY,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_IS, LBP_IS, LBP_AL, LBP_AL, LBP_AL, LBP_EX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_PR, LBP_CP, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_PR, LBP_CL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -398,7 +398,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -430,14 +430,14 @@
     LBP_AL, LBP_PO, LBP_PO, LBP_PO, LBP_IS, LBP_IS, LBP_AL, LBP_AL,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_EX, LBP_XX, LBP_XX, LBP_EX, LBP_EX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_PO, LBP_NU, LBP_NU, LBP_AL, LBP_AL, LBP_AL,
     LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -453,7 +453,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_EX, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
@@ -490,38 +490,22 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_IS, LBP_EX, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM,
-    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
+    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_BA, LBP_BA, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -536,8 +520,8 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_AL, LBP_AL, LBP_PO, LBP_PO, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_PO, LBP_AL, LBP_PR, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_PR, LBP_PR, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -584,7 +568,7 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_CM, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
@@ -639,11 +623,11 @@
     LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_CM, LBP_CM,
-    LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_XX,
+    LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
@@ -715,7 +699,7 @@
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_BA,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_BA, LBP_CM, LBP_CM,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
@@ -724,8 +708,8 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_BA, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
-    LBP_BB, LBP_BB, LBP_BA, LBP_BB, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_GL, LBP_GL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_BB, LBP_BB, LBP_BA, LBP_BB, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -749,7 +733,7 @@
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
+    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -773,7 +757,7 @@
     LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
     LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
     LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
+    LBP_JL, LBP_JL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_JL,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
@@ -782,8 +766,7 @@
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
     LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
+    LBP_JV, LBP_JV, LBP_JV, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
@@ -794,6 +777,7 @@
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
     LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
+    LBP_JT, LBP_JT, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -837,7 +821,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM,
     LBP_AL, LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -858,7 +842,17 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -874,6 +868,12 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -944,15 +944,15 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_CM, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -975,13 +975,13 @@
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
     LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA,
+    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -990,24 +990,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_CM,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1029,7 +1013,7 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_BA, LBP_BA, LBP_AL, LBP_BA, LBP_BA, LBP_BA,
+    LBP_NU, LBP_NU, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
     LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1042,14 +1026,14 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1066,22 +1050,6 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_BA,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1097,7 +1065,7 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
@@ -1148,12 +1116,12 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL, LBP_AI,
     LBP_AL, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PO,
     LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR,
-    LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PO, LBP_PR,
-    LBP_PR, LBP_PR, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_PR, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
@@ -1172,14 +1140,14 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AI, LBP_AI, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AL, LBP_AL, LBP_AI, LBP_AL,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1255,8 +1223,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1341,45 +1309,45 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AL, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI,
-    LBP_AL, LBP_AL, LBP_AL, LBP_QU, LBP_QU, LBP_QU, LBP_QU, LBP_AL,
-    LBP_AL, LBP_AL, LBP_EX, LBP_EX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_QU, LBP_QU, LBP_QU, LBP_QU, LBP_XX,
+    LBP_XX, LBP_AL, LBP_EX, LBP_EX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL,
     LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
     LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL,
@@ -1412,8 +1380,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1432,6 +1400,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1445,10 +1415,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
-    LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_EX, LBP_BA, LBP_BA, LBP_BA, LBP_AL, LBP_EX, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1464,8 +1432,8 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
-    LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
@@ -1488,7 +1456,7 @@
     LBP_OP, LBP_BA, LBP_AL, LBP_AL, LBP_QU, LBP_QU, LBP_AL, LBP_AL,
     LBP_QU, LBP_QU, LBP_OP, LBP_CL, LBP_OP, LBP_CL, LBP_OP, LBP_CL,
     LBP_OP, LBP_CL, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_EX, LBP_AL,
-    LBP_BA, LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1601,7 +1569,7 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -1618,8 +1586,8 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -1648,8 +1616,8 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1660,6 +1628,22 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_NS, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -1684,12 +1668,12 @@
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_BA,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_EX, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1702,7 +1686,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_AL, LBP_AL,
@@ -1710,24 +1694,20 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_CM, LBP_CM, LBP_AL, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1737,15 +1717,19 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_PO, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1766,10 +1750,10 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_BA, LBP_BA,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1782,22 +1766,6 @@
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL,
-    LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_JL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_BA,
-    LBP_BA, LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1814,58 +1782,10 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_AL, LBP_BA, LBP_BA, LBP_BA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_SA, LBP_SA, LBP_SA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_SA, LBP_SA, LBP_SA, LBP_SA, LBP_SA,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_BA, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_H2, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
@@ -1984,16 +1904,48 @@
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_H3,
     LBP_H3, LBP_H3, LBP_H3, LBP_H3, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV,
-    LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_JV, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_JT,
-    LBP_JT, LBP_JT, LBP_JT, LBP_JT, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2016,10 +1968,10 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2258,10 +2210,10 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_XX, LBP_XX, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_BA,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2269,7 +2221,7 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_BA,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_BA,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2294,86 +2246,6 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
     LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_XX, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_BA,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_BA,
-    LBP_BA, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_NU, LBP_NU,
-    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_BA, LBP_BA,
-    LBP_BA, LBP_BA, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2421,102 +2293,6 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_OP, LBP_OP, LBP_OP, LBP_CL, LBP_CL, LBP_CL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CL, LBP_AL, LBP_AL, LBP_AL, LBP_OP, LBP_CL,
-    LBP_OP, LBP_CL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_OP, LBP_CL, LBP_CL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2686,38 +2462,9 @@
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AL, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI, LBP_AI,
-    LBP_AI, LBP_AI, LBP_AI, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2726,147 +2473,32 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX,
-    LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2874,22 +2506,6 @@
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
     LBP_XX, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrktables.c gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrktables.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrktables.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrktables.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,35 +23,34 @@
 /* Define unilbrkprop, table of line breaking properties.  */
 #include "unilbrk/lbrkprop2.h"
 
-const unsigned char unilbrk_table[25][25] =
+const unsigned char unilbrk_table[24][24] =
 {
                                 /* after */
-        /* WJ GL B2 BA BB HY CL CP EX IN NS OP QU IS NU PO PR SY AL H2 H3 ID JL JV JT */
-/* WJ */ { P, I, I, I, I, I, P, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* GL */ { P, I, I, I, I, I, P, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* B2 */ { P, I, P, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* BA */ { P, D, D, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* BB */ { P, I, I, I, I, I, P, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* HY */ { P, D, D, I, D, I, P, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
-/* CL */ { P, I, D, I, D, I, P, P, P, D, P, D, I, P, D, I, I, P, D, D, D, D, D, D, D, },
-/* CP */ { P, I, D, I, D, I, P, P, P, D, P, D, I, P, I, I, I, P, I, D, D, D, D, D, D, },
-/* EX */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* IN */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* NS */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
-/* OP */ { P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, },
-/* QU */ { P, I, I, I, I, I, P, P, P, I, I, P, I, P, I, I, I, P, I, I, I, I, I, I, I, },
-/* IS */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
-/* NU */ { P, I, D, I, D, I, P, P, P, I, I, I, I, P, I, I, I, P, I, D, D, D, D, D, D, },
-/* PO */ { P, I, D, I, D, I, P, P, P, D, I, I, I, P, I, D, D, P, I, D, D, D, D, D, D, },
-/* PR */ { P, I, D, I, D, I, P, P, P, D, I, I, I, P, I, D, D, P, I, I, I, I, I, I, I, },
-/* SY */ { P, I, D, I, D, I, P, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
-/* AL */ { P, I, D, I, D, I, P, P, P, I, I, I, I, P, I, D, D, P, I, D, D, D, D, D, D, },
-/* H2 */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
-/* H3 */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
-/* ID */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, D, },
-/* JL */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, I, I, D, I, I, D, },
-/* JV */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
-/* JT */ { P, I, D, I, D, I, P, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
+        /* WJ GL B2 BA BB HY CL EX IN NS OP QU IS NU PO PR SY AL H2 H3 ID JL JV JT */
+/* WJ */ { P, I, I, I, I, I, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* GL */ { P, I, I, I, I, I, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* B2 */ { P, I, P, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* BA */ { P, D, D, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* BB */ { P, I, I, I, I, I, P, P, I, I, I, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* HY */ { P, D, D, I, D, I, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
+/* CL */ { P, I, D, I, D, I, P, P, D, P, D, I, P, D, I, I, P, D, D, D, D, D, D, D, },
+/* EX */ { P, I, D, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* IN */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* NS */ { P, I, D, I, D, I, P, P, D, I, D, I, P, D, D, D, P, D, D, D, D, D, D, D, },
+/* OP */ { P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, P, },
+/* QU */ { P, I, I, I, I, I, P, P, I, I, P, I, P, I, I, I, P, I, I, I, I, I, I, I, },
+/* IS */ { P, I, D, I, D, I, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
+/* NU */ { P, I, D, I, D, I, P, P, I, I, D, I, P, I, I, I, P, I, D, D, D, D, D, D, },
+/* PO */ { P, I, D, I, D, I, P, P, D, I, I, I, P, I, D, D, P, I, D, D, D, D, D, D, },
+/* PR */ { P, I, D, I, D, I, P, P, D, I, I, I, P, I, D, D, P, I, I, I, I, I, I, I, },
+/* SY */ { P, I, D, I, D, I, P, P, D, I, D, I, P, I, D, D, P, D, D, D, D, D, D, D, },
+/* AL */ { P, I, D, I, D, I, P, P, I, I, D, I, P, I, D, D, P, I, D, D, D, D, D, D, },
+/* H2 */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
+/* H3 */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
+/* ID */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, D, },
+/* JL */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, I, I, D, I, I, D, },
+/* JV */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, I, I, },
+/* JT */ { P, I, D, I, D, I, P, P, I, I, D, I, P, D, I, D, P, D, D, D, D, D, D, I, },
 /* "" */
 /* before */
 };
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrktables.h gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrktables.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/lbrktables.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/lbrktables.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -21,44 +21,43 @@
 
 enum
 {
-  /* Values >= 25 are resolved at run time. */
-  LBP_BK = 25, /* mandatory break */
+  /* Values >= 24 are resolved at run time. */
+  LBP_BK = 24, /* mandatory break */
 /*LBP_CR,         carriage return - not used here because it's a DOSism */
 /*LBP_LF,         line feed - not used here because it's a DOSism */
-  LBP_CM = 26, /* attached characters and combining marks */
+  LBP_CM = 25, /* attached characters and combining marks */
 /*LBP_NL,         next line - not used here because it's equivalent to LBP_BK */
 /*LBP_SG,         surrogates - not used here because they are not characters */
   LBP_WJ =  0, /* word joiner */
-  LBP_ZW = 27, /* zero width space */
+  LBP_ZW = 26, /* zero width space */
   LBP_GL =  1, /* non-breaking (glue) */
-  LBP_SP = 28, /* space */
+  LBP_SP = 27, /* space */
   LBP_B2 =  2, /* break opportunity before and after */
   LBP_BA =  3, /* break opportunity after */
   LBP_BB =  4, /* break opportunity before */
   LBP_HY =  5, /* hyphen */
-  LBP_CB = 29, /* contingent break opportunity */
+  LBP_CB = 28, /* contingent break opportunity */
   LBP_CL =  6, /* closing punctuation */
-  LBP_CP =  7, /* closing parenthesis */
-  LBP_EX =  8, /* exclamation/interrogation */
-  LBP_IN =  9, /* inseparable */
-  LBP_NS = 10, /* non starter */
-  LBP_OP = 11, /* opening punctuation */
-  LBP_QU = 12, /* ambiguous quotation */
-  LBP_IS = 13, /* infix separator (numeric) */
-  LBP_NU = 14, /* numeric */
-  LBP_PO = 15, /* postfix (numeric) */
-  LBP_PR = 16, /* prefix (numeric) */
-  LBP_SY = 17, /* symbols allowing breaks */
-  LBP_AI = 30, /* ambiguous (alphabetic or ideograph) */
-  LBP_AL = 18, /* ordinary alphabetic and symbol characters */
-  LBP_H2 = 19, /* Hangul LV syllable */
-  LBP_H3 = 20, /* Hangul LVT syllable */
-  LBP_ID = 21, /* ideographic */
-  LBP_JL = 22, /* Hangul L Jamo */
-  LBP_JV = 23, /* Hangul V Jamo */
-  LBP_JT = 24, /* Hangul T Jamo */
-  LBP_SA = 31, /* complex context (South East Asian) */
-  LBP_XX = 32  /* unknown */
+  LBP_EX =  7, /* exclamation/interrogation */
+  LBP_IN =  8, /* inseparable */
+  LBP_NS =  9, /* non starter */
+  LBP_OP = 10, /* opening punctuation */
+  LBP_QU = 11, /* ambiguous quotation */
+  LBP_IS = 12, /* infix separator (numeric) */
+  LBP_NU = 13, /* numeric */
+  LBP_PO = 14, /* postfix (numeric) */
+  LBP_PR = 15, /* prefix (numeric) */
+  LBP_SY = 16, /* symbols allowing breaks */
+  LBP_AI = 29, /* ambiguous (alphabetic or ideograph) */
+  LBP_AL = 17, /* ordinary alphabetic and symbol characters */
+  LBP_H2 = 18, /* Hangul LV syllable */
+  LBP_H3 = 19, /* Hangul LVT syllable */
+  LBP_ID = 20, /* ideographic */
+  LBP_JL = 21, /* Hangul L Jamo */
+  LBP_JV = 22, /* Hangul V Jamo */
+  LBP_JT = 23, /* Hangul T Jamo */
+  LBP_SA = 30, /* complex context (South East Asian) */
+  LBP_XX = 31  /* unknown */
 };
 
 #include "lbrkprop1.h"
@@ -89,7 +88,7 @@
 #define I 2  /* indirect break opportunity, '%' in table 7.3 of UTR #14 */
 #define P 3  /* prohibited break,           '^' in table 7.3 of UTR #14 */
 
-extern const unsigned char unilbrk_table[25][25];
+extern const unsigned char unilbrk_table[24][24];
 
 /* We don't support line breaking of complex-context dependent characters
    (Thai, Lao, Myanmar, Khmer) yet, because it requires dictionary lookup. */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/ulc-common.c gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/ulc-common.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/ulc-common.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/ulc-common.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/ulc-common.h gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/ulc-common.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/ulc-common.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/ulc-common.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of strings.
-   Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unilbrk.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unilbrk.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unilbrk.in.h	2010-05-17 19:58:03.000000000 +0000
@@ -1,5 +1,5 @@
 /* Line breaking of Unicode strings.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistd.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistd.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistd.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
-#include "unistd.h"
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistd.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/unistd.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unistd.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistd.in.h	2010-05-09 11:05:02.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,32 +12,34 @@
    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 _@GUARD_PREFIX@_UNISTD_H
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
-#ifdef _GL_INCLUDING_UNISTD_H
 /* Special invocation convention:
-   - On Mac OS X 10.3.9 we have a sequence of nested includes
-     <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
-
-#@INCLUDE_NEXT@ @NEXT_UNISTD_H@
+   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
+     but we need to ensure that both the system <unistd.h> and <winsock2.h>
+     are completely included before we replace gethostname.  */
+#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
+/* <unistd.h> is being indirectly included for the first time from
+   <winsock2.h>; avoid declaring any overrides.  */
+# if @HAVE_UNISTD_H@
+#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# else
+#  error unexpected; report this to bug-gnulib@gnu.org
+# endif
+# define _GL_WINSOCK2_H_WITNESS
 
-#else
-/* Normal invocation convention.  */
+/* Normal invocation.  */
+#elif !defined _GL_UNISTD_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
-# define _GL_INCLUDING_UNISTD_H
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
-# undef _GL_INCLUDING_UNISTD_H
 #endif
 
 /* Get all possible declarations of gethostname().  */
@@ -48,8 +50,8 @@
 # undef _GL_INCLUDING_WINSOCK2_H
 #endif
 
-#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
-#define _@GUARD_PREFIX@_UNISTD_H
+#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
+#define _GL_UNISTD_H
 
 /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
 #include <stddef.h>
@@ -58,66 +60,32 @@
 /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
-     || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
-         && defined __CYGWIN__)) \
+     || (@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK)) \
     && ! defined __GLIBC__
 # include <stdio.h>
 #endif
 
 /* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
-    && ! defined __GLIBC__
+#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__
 # include <fcntl.h>
 #endif
 
 /* mingw fails to declare _exit in <unistd.h>.  */
-/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
-   <unistd.h>.  */
+/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>.  */
 /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
-/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
-   included here.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if !defined __GLIBC__ && !defined __osf__
-# define __need_system_stdlib_h
+#ifndef __GLIBC__
 # include <stdlib.h>
-# undef __need_system_stdlib_h
 #endif
 
-/* Native Windows platforms declare chdir, getcwd, rmdir in
-   <io.h> and/or <direct.h>, not in <unistd.h>.
-   They also declare access(), chmod(), close(), dup(), dup2(), isatty(),
-   lseek(), read(), unlink(), write() in <io.h>.  */
-#if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \
-      || defined GNULIB_POSIXCHECK) \
+/* mingw declares getcwd in <io.h>, not in <unistd.h>.  */
+#if ((@GNULIB_GETCWD@ || defined GNULIB_POSIXCHECK) \
      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-# include <io.h>     /* mingw32, mingw64 */
-# include <direct.h> /* mingw64, MSVC 9 */
-#elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \
-       || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \
-       || defined GNULIB_POSIXCHECK) \
-      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 # include <io.h>
 #endif
 
-/* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
-   NonStop Kernel declares gethostname in <netdb.h>, not in <unistd.h>.  */
-/* But avoid namespace pollution on glibc systems.  */
-#if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \
-     || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \
-    && !defined __GLIBC__
-# include <netdb.h>
-#endif
-
-/* MSVC defines off_t in <sys/types.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
-#if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@
-/* Get off_t.  */
-# include <sys/types.h>
-#endif
-
-#if (@GNULIB_READ@ || @GNULIB_WRITE@ \
-     || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
+#if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
      || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
 /* Get ssize_t.  */
 # include <sys/types.h>
@@ -130,18 +98,9 @@
    gettext-tools/libgettextpo/, but there is only a single
    GNULIB_UNISTD_H_GETOPT variable for both.  */
 #if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
-# define __need_getopt
 # include <getopt.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GL_UNISTD_INLINE
-# define _GL_UNISTD_INLINE _GL_INLINE
-#endif
-
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -149,77 +108,78 @@
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
 
-/* Hide some function declarations from <winsock2.h>.  */
-
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef socket
-#   define socket              socket_used_without_including_sys_socket_h
-#   undef connect
-#   define connect             connect_used_without_including_sys_socket_h
-#   undef accept
-#   define accept              accept_used_without_including_sys_socket_h
-#   undef bind
-#   define bind                bind_used_without_including_sys_socket_h
-#   undef getpeername
-#   define getpeername         getpeername_used_without_including_sys_socket_h
-#   undef getsockname
-#   define getsockname         getsockname_used_without_including_sys_socket_h
-#   undef getsockopt
-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
-#   undef listen
-#   define listen              listen_used_without_including_sys_socket_h
-#   undef recv
-#   define recv                recv_used_without_including_sys_socket_h
-#   undef send
-#   define send                send_used_without_including_sys_socket_h
-#   undef recvfrom
-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
-#   undef sendto
-#   define sendto              sendto_used_without_including_sys_socket_h
-#   undef setsockopt
-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
-#   undef shutdown
-#   define shutdown            shutdown_used_without_including_sys_socket_h
-#  else
-    _GL_WARN_ON_USE (socket,
-                     "socket() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (connect,
-                     "connect() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (accept,
-                     "accept() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (bind,
-                     "bind() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getpeername,
-                     "getpeername() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockname,
-                     "getsockname() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (getsockopt,
-                     "getsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (listen,
-                     "listen() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recv,
-                     "recv() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (send,
-                     "send() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (recvfrom,
-                     "recvfrom() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (sendto,
-                     "sendto() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (setsockopt,
-                     "setsockopt() used without including <sys/socket.h>");
-    _GL_WARN_ON_USE (shutdown,
-                     "shutdown() used without including <sys/socket.h>");
+#if @GNULIB_GETHOSTNAME@
+/* Get all possible declarations of gethostname().  */
+# if @UNISTD_H_HAVE_WINSOCK2_H@
+#  if !defined _GL_SYS_SOCKET_H
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef socket
+#    define socket              socket_used_without_including_sys_socket_h
+#    undef connect
+#    define connect             connect_used_without_including_sys_socket_h
+#    undef accept
+#    define accept              accept_used_without_including_sys_socket_h
+#    undef bind
+#    define bind                bind_used_without_including_sys_socket_h
+#    undef getpeername
+#    define getpeername         getpeername_used_without_including_sys_socket_h
+#    undef getsockname
+#    define getsockname         getsockname_used_without_including_sys_socket_h
+#    undef getsockopt
+#    define getsockopt          getsockopt_used_without_including_sys_socket_h
+#    undef listen
+#    define listen              listen_used_without_including_sys_socket_h
+#    undef recv
+#    define recv                recv_used_without_including_sys_socket_h
+#    undef send
+#    define send                send_used_without_including_sys_socket_h
+#    undef recvfrom
+#    define recvfrom            recvfrom_used_without_including_sys_socket_h
+#    undef sendto
+#    define sendto              sendto_used_without_including_sys_socket_h
+#    undef setsockopt
+#    define setsockopt          setsockopt_used_without_including_sys_socket_h
+#    undef shutdown
+#    define shutdown            shutdown_used_without_including_sys_socket_h
+#   else
+     _GL_WARN_ON_USE (socket,
+                      "socket() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (connect,
+                      "connect() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (accept,
+                      "accept() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (bind,
+                      "bind() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getpeername,
+                      "getpeername() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockname,
+                      "getsockname() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (getsockopt,
+                      "getsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (listen,
+                      "listen() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recv,
+                      "recv() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (send,
+                      "send() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (recvfrom,
+                      "recvfrom() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (sendto,
+                      "sendto() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (setsockopt,
+                      "setsockopt() used without including <sys/socket.h>");
+     _GL_WARN_ON_USE (shutdown,
+                      "shutdown() used without including <sys/socket.h>");
+#   endif
 #  endif
-# endif
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef select
-#   define select              select_used_without_including_sys_select_h
-#  else
-    _GL_WARN_ON_USE (select,
-                     "select() used without including <sys/select.h>");
+#  if !defined _GL_SYS_SELECT_H
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef select
+#    define select              select_used_without_including_sys_select_h
+#   else
+     _GL_WARN_ON_USE (select,
+                      "select() used without including <sys/select.h>");
+#   endif
 #  endif
 # endif
 #endif
@@ -255,24 +215,12 @@
 #endif
 
 
-#if @GNULIB_CHDIR@
-_GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIASWARN (chdir);
-#elif defined GNULIB_POSIXCHECK
-# undef chdir
-# if HAVE_RAW_DECL_CHDIR
-_GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - "
-                 "use gnulib module chdir for portability");
-# endif
-#endif
-
-
 #if @GNULIB_CHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/chown.html.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/chown.html>.  */
 # if @REPLACE_CHOWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef chown
@@ -323,32 +271,24 @@
 #endif
 
 
-#if @GNULIB_DUP@
-# if @REPLACE_DUP@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define dup rpl_dup
-#  endif
+#if @REPLACE_DUP@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define dup rpl_dup
+# endif
 _GL_FUNCDECL_RPL (dup, int, (int oldfd));
 _GL_CXXALIAS_RPL (dup, int, (int oldfd));
-# else
+#else
 _GL_CXXALIAS_SYS (dup, int, (int oldfd));
-# endif
-_GL_CXXALIASWARN (dup);
-#elif defined GNULIB_POSIXCHECK
-# undef dup
-# if HAVE_RAW_DECL_DUP
-_GL_WARN_ON_USE (dup, "dup is unportable - "
-                 "use gnulib module dup for portability");
-# endif
 #endif
+_GL_CXXALIASWARN (dup);
 
 
 #if @GNULIB_DUP2@
 /* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
    NEWFD = OLDFD, otherwise close NEWFD first if it is open.
    Return newfd if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup2.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/dup2.html>.  */
 # if @REPLACE_DUP2@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup2 rpl_dup2
@@ -419,7 +359,7 @@
 # endif
 #elif defined GNULIB_POSIXCHECK
 # if HAVE_RAW_DECL_ENVIRON
-_GL_UNISTD_INLINE char ***
+static inline char ***
 rpl_environ (void)
 {
   return &environ;
@@ -477,8 +417,8 @@
 /* Change the process' current working directory to the directory on which
    the given file descriptor is open.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fchdir.html>.  */
 # if ! @HAVE_FCHDIR@
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
 
@@ -489,10 +429,6 @@
 _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
 
-# else
-#  if !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-#  endif
 # endif
 _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
 _GL_CXXALIASWARN (fchdir);
@@ -535,30 +471,11 @@
 #endif
 
 
-#if @GNULIB_FDATASYNC@
-/* Synchronize changes to a file.
-   Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
-# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
-_GL_FUNCDECL_SYS (fdatasync, int, (int fd));
-# endif
-_GL_CXXALIAS_SYS (fdatasync, int, (int fd));
-_GL_CXXALIASWARN (fdatasync);
-#elif defined GNULIB_POSIXCHECK
-# undef fdatasync
-# if HAVE_RAW_DECL_FDATASYNC
-_GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
-                 "use gnulib module fdatasync for portability");
-# endif
-#endif
-
-
 #if @GNULIB_FSYNC@
-/* Synchronize changes, including metadata, to a file.
+/* Synchronize changes to a file.
    Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
+   See POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fsync.html>.  */
 # if !@HAVE_FSYNC@
 _GL_FUNCDECL_SYS (fsync, int, (int fd));
 # endif
@@ -576,21 +493,12 @@
 #if @GNULIB_FTRUNCATE@
 /* Change the size of the file to which FD is opened to become equal to LENGTH.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ftruncate.html>.  */
-# if @REPLACE_FTRUNCATE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef ftruncate
-#   define ftruncate rpl_ftruncate
-#  endif
-_GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length));
-_GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length));
-# else
-#  if !@HAVE_FTRUNCATE@
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/ftruncate.html>.  */
+# if !@HAVE_FTRUNCATE@
 _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
-#  endif
-_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 # endif
+_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 _GL_CXXALIASWARN (ftruncate);
 #elif defined GNULIB_POSIXCHECK
 # undef ftruncate
@@ -606,8 +514,8 @@
    of BUF.
    Return BUF if successful, or NULL if the directory couldn't be determined
    or SIZE was too small.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getcwd.html>.
    Additionally, the gnulib module 'getcwd' guarantees the following GNU
    extension: If BUF is NULL, an array is allocated with 'malloc'; the array
    is SIZE bytes long, unless SIZE == 0, in which case it is as big as
@@ -644,21 +552,13 @@
    Null terminate it if the name is shorter than LEN.
    If the NIS domain name is longer than LEN, set errno = EINVAL and return -1.
    Return 0 if successful, otherwise set errno and return -1.  */
-# if @REPLACE_GETDOMAINNAME@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getdomainname
-#   define getdomainname rpl_getdomainname
-#  endif
-_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len)
-                                      _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
-# else
-#  if !@HAVE_DECL_GETDOMAINNAME@
+# if !@HAVE_GETDOMAINNAME@
 _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
                                       _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len));
 # endif
+/* Need to cast, because on MacOS X 10.5 systems, the second parameter is
+                                                        int len.  */
+_GL_CXXALIAS_SYS_CAST (getdomainname, int, (char *name, size_t len));
 _GL_CXXALIASWARN (getdomainname);
 #elif defined GNULIB_POSIXCHECK
 # undef getdomainname
@@ -672,19 +572,10 @@
 #if @GNULIB_GETDTABLESIZE@
 /* Return the maximum number of file descriptors in the current process.
    In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
-# if @REPLACE_GETDTABLESIZE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef getdtablesize
-#   define getdtablesize rpl_getdtablesize
-#  endif
-_GL_FUNCDECL_RPL (getdtablesize, int, (void));
-_GL_CXXALIAS_RPL (getdtablesize, int, (void));
-# else
-#  if !@HAVE_GETDTABLESIZE@
+# if !@HAVE_GETDTABLESIZE@
 _GL_FUNCDECL_SYS (getdtablesize, int, (void));
-#  endif
-_GL_CXXALIAS_SYS (getdtablesize, int, (void));
 # endif
+_GL_CXXALIAS_SYS (getdtablesize, int, (void));
 _GL_CXXALIASWARN (getdtablesize);
 #elif defined GNULIB_POSIXCHECK
 # undef getdtablesize
@@ -745,8 +636,7 @@
 _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
 #  endif
-/* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second
-   parameter is
+/* Need to cast, because on Solaris 10 systems, the second parameter is
                                                       int len.  */
 _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
 # endif
@@ -803,22 +693,13 @@
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if @REPLACE_GETLOGIN_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define getlogin_r rpl_getlogin_r
-#  endif
-_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size)
-                                   _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
-# else
-#  if !@HAVE_DECL_GETLOGIN_R@
+# if !@HAVE_DECL_GETLOGIN_R@
 _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
                                    _GL_ARG_NONNULL ((1)));
-#  endif
+# endif
 /* Need to cast, because on Solaris 10 systems, the second argument is
                                                      int size.  */
 _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
-# endif
 _GL_CXXALIASWARN (getlogin_r);
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin_r
@@ -885,14 +766,11 @@
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #     define getpagesize() _gl_getpagesize ()
 #    else
-#     if !GNULIB_defined_getpagesize_function
-_GL_UNISTD_INLINE int
+static inline int
 getpagesize ()
 {
   return _gl_getpagesize ();
 }
-#      define GNULIB_defined_getpagesize_function 1
-#     endif
 #    endif
 #   endif
 #  endif
@@ -959,49 +837,12 @@
 #endif
 
 
-#if @GNULIB_GROUP_MEMBER@
-/* Determine whether group id is in calling user's group list.  */
-# if !@HAVE_GROUP_MEMBER@
-_GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
-# endif
-_GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
-_GL_CXXALIASWARN (group_member);
-#elif defined GNULIB_POSIXCHECK
-# undef group_member
-# if HAVE_RAW_DECL_GROUP_MEMBER
-_GL_WARN_ON_USE (group_member, "group_member is unportable - "
-                 "use gnulib module group-member for portability");
-# endif
-#endif
-
-
-#if @GNULIB_ISATTY@
-# if @REPLACE_ISATTY@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef isatty
-#   define isatty rpl_isatty
-#  endif
-_GL_FUNCDECL_RPL (isatty, int, (int fd));
-_GL_CXXALIAS_RPL (isatty, int, (int fd));
-# else
-_GL_CXXALIAS_SYS (isatty, int, (int fd));
-# endif
-_GL_CXXALIASWARN (isatty);
-#elif defined GNULIB_POSIXCHECK
-# undef isatty
-# if HAVE_RAW_DECL_ISATTY
-_GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
-                 "use gnulib module isatty for portability");
-# endif
-#endif
-
-
 #if @GNULIB_LCHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Do not follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lchown.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lchown.html>.  */
 # if @REPLACE_LCHOWN@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef lchown
@@ -1030,8 +871,8 @@
 #if @GNULIB_LINK@
 /* Create a new hard link for an existing file.
    Return 0 if successful, otherwise -1 and errno set.
-   See POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/link.html>.  */
+   See POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/link.html>.  */
 # if @REPLACE_LINK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define link rpl_link
@@ -1096,8 +937,8 @@
 #if @GNULIB_LSEEK@
 /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
    Return the new offset if successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lseek.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lseek.html>.  */
 # if @REPLACE_LSEEK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define lseek rpl_lseek
@@ -1117,24 +958,6 @@
 #endif
 
 
-#if @GNULIB_PIPE@
-/* Create a pipe, defaulting to O_BINARY mode.
-   Store the read-end as fd[0] and the write-end as fd[1].
-   Return 0 upon success, or -1 with errno set upon failure.  */
-# if !@HAVE_PIPE@
-_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
-# endif
-_GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
-_GL_CXXALIASWARN (pipe);
-#elif defined GNULIB_POSIXCHECK
-# undef pipe
-# if HAVE_RAW_DECL_PIPE
-_GL_WARN_ON_USE (pipe, "pipe is unportable - "
-                 "use gnulib module pipe-posix for portability");
-# endif
-#endif
-
-
 #if @GNULIB_PIPE2@
 /* Create a pipe, applying the given flags when opening the read-end of the
    pipe and the write-end of the pipe.
@@ -1167,12 +990,10 @@
 #if @GNULIB_PREAD@
 /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET.
    Return the number of bytes placed into BUF if successful, otherwise
-   set errno and return -1.  0 indicates EOF.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pread.html>.  */
+   set errno and return -1.  0 indicates EOF.  See the POSIX:2001
+   specification <http://www.opengroup.org/susv3xsh/pread.html>.  */
 # if @REPLACE_PREAD@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pread
 #   define pread rpl_pread
 #  endif
 _GL_FUNCDECL_RPL (pread, ssize_t,
@@ -1203,11 +1024,10 @@
 /* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET.
    Return the number of bytes written if successful, otherwise
    set errno and return -1.  0 indicates nothing written.  See the
-   POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pwrite.html>.  */
+   POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/pwrite.html>.  */
 # if @REPLACE_PWRITE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef pwrite
 #   define pwrite rpl_pwrite
 #  endif
 _GL_FUNCDECL_RPL (pwrite, ssize_t,
@@ -1234,34 +1054,12 @@
 #endif
 
 
-#if @GNULIB_READ@
-/* Read up to COUNT bytes from file descriptor FD into the buffer starting
-   at BUF.  See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/read.html>.  */
-# if @REPLACE_READ@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef read
-#   define read rpl_read
-#  endif
-_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count)
-                                 _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count));
-# else
-/* Need to cast, because on mingw, the third parameter is
-                                                          unsigned int count
-   and the return type is 'int'.  */
-_GL_CXXALIAS_SYS_CAST (read, ssize_t, (int fd, void *buf, size_t count));
-# endif
-_GL_CXXALIASWARN (read);
-#endif
-
-
 #if @GNULIB_READLINK@
 /* Read the contents of the symbolic link FILE and place the first BUFSIZE
    bytes of it into BUF.  Return the number of bytes placed into BUF if
    successful, otherwise -1 and errno set.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/readlink.html>.  */
 # if @REPLACE_READLINK@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define readlink rpl_readlink
@@ -1303,7 +1101,7 @@
 # undef readlinkat
 # if HAVE_RAW_DECL_READLINKAT
 _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - "
-                 "use gnulib module readlinkat for portability");
+                 "use gnulib module symlinkat for portability");
 # endif
 #endif
 
@@ -1329,38 +1127,11 @@
 #endif
 
 
-#if @GNULIB_SETHOSTNAME@
-/* Set the host name of the machine.
-   The host name may or may not be fully qualified.
-
-   Put LEN bytes of NAME into the host name.
-   Return 0 if successful, otherwise, set errno and return -1.
-
-   Platforms with no ability to set the hostname return -1 and set
-   errno = ENOSYS.  */
-# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
-_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
-                                    _GL_ARG_NONNULL ((1)));
-# endif
-/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
-   and FreeBSD 6.4 the second parameter is int.  On Solaris 11
-   2011-10, the first parameter is not const.  */
-_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
-_GL_CXXALIASWARN (sethostname);
-#elif defined GNULIB_POSIXCHECK
-# undef sethostname
-# if HAVE_RAW_DECL_SETHOSTNAME
-_GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
-                 "use gnulib module sethostname for portability");
-# endif
-#endif
-
-
 #if @GNULIB_SLEEP@
 /* Pause the execution of the current thread for N seconds.
    Returns the number of seconds left to sleep.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sleep.html>.  */
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
 # if @REPLACE_SLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef sleep
@@ -1441,7 +1212,7 @@
 _GL_CXXALIAS_RPL (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # else
-#  if !@HAVE_DECL_TTYNAME_R@
+#  if !@HAVE_TTYNAME_R@
 _GL_FUNCDECL_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
 #  endif
@@ -1509,7 +1280,7 @@
 /* Pause the execution of the current thread for N microseconds.
    Returns 0 on completion, or -1 on range error.
    See the POSIX:2001 specification
-   <http://www.opengroup.org/susv3xsh/usleep.html>.  */
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
 # if @REPLACE_USLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef usleep
@@ -1535,9 +1306,9 @@
 
 #if @GNULIB_WRITE@
 /* Write up to COUNT bytes starting at BUF to file descriptor FD.
-   See the POSIX:2008 specification
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html>.  */
-# if @REPLACE_WRITE@
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/write.html>.  */
+# if @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef write
 #   define write rpl_write
@@ -1554,8 +1325,6 @@
 _GL_CXXALIASWARN (write);
 #endif
 
-_GL_INLINE_HEADER_END
 
-#endif /* _@GUARD_PREFIX@_UNISTD_H */
-#endif /* _GL_INCLUDING_UNISTD_H */
-#endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _GL_UNISTD_H */
+#endif /* _GL_UNISTD_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UTF-16 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u16-mbtouc.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u16-mbtouc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u16-mbtouc.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u16-mbtouc.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-16 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-check.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-check.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-check.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-check.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Check UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -27,7 +27,7 @@
 
   while (s < s_end)
     {
-      /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
+      /* Keep in sync with unistr.h and utf8-ucs4.c.  */
       uint8_t c = *s;
 
       if (c < 0x80)
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mblen.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mblen.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mblen.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mblen.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2014 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -11,7 +11,7 @@
    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.
+   Lesser 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/>.  */
@@ -26,7 +26,7 @@
 {
   if (n > 0)
     {
-      /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
+      /* Keep in sync with unistr.h and utf8-ucs4.c.  */
       uint8_t c = *s;
 
       if (c < 0x80)
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -45,32 +45,21 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
         {
           if (n >= 3)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
             }
@@ -78,45 +67,26 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
         {
           if (n >= 4)
             {
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                 )
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
             }
@@ -124,12 +94,7 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -137,37 +102,16 @@
         {
           if (n >= 5)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
             }
@@ -182,44 +126,18 @@
         {
           if (n >= 6)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
             }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -55,32 +55,21 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
         {
           if (n >= 3)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
             }
@@ -88,45 +77,26 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
         {
           if (n >= 4)
             {
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                 )
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
             }
@@ -134,12 +104,7 @@
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -147,37 +112,16 @@
         {
           if (n >= 5)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
             }
@@ -192,44 +136,18 @@
         {
           if (n >= 6)
             {
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
             }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -41,15 +41,13 @@
                          | (unsigned int) (s[1] ^ 0x80);
                   return 2;
                 }
-#if CONFIG_UNICODE_SAFETY
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
@@ -57,39 +55,23 @@
           if (n >= 3)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
+#endif
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
-#endif
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-#if CONFIG_UNICODE_SAFETY
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
@@ -97,51 +79,28 @@
           if (n >= 4)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
+                 )
 #endif
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-#if CONFIG_UNICODE_SAFETY
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -150,42 +109,19 @@
           if (n >= 5)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
+#endif
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
-#endif
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-#if CONFIG_UNICODE_SAFETY
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
@@ -199,49 +135,21 @@
           if (n >= 6)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
+#endif
                 {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
-#endif
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-#if CONFIG_UNICODE_SAFETY
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -52,15 +52,13 @@
                          | (unsigned int) (s[1] ^ 0x80);
                   return 2;
                 }
-#if CONFIG_UNICODE_SAFETY
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              return 1;
+              return n;
             }
         }
       else if (c < 0xf0)
@@ -68,39 +66,23 @@
           if (n >= 3)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((c >= 0xe1 || s[1] >= 0xa0)
-                          && (c != 0xed || s[1] < 0xa0))
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
 #endif
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s[1] ^ 0x80) << 6)
-                                 | (unsigned int) (s[2] ^ 0x80);
-                          return 3;
-                        }
-#if CONFIG_UNICODE_SAFETY
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x0f) << 12)
+                         | ((unsigned int) (s[1] ^ 0x80) << 6)
+                         | (unsigned int) (s[2] ^ 0x80);
+                  return 3;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else
-                return 2;
+              return n;
             }
         }
       else if (c < 0xf8)
@@ -108,51 +90,28 @@
           if (n >= 4)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((c >= 0xf1 || s[1] >= 0x90)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-                              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-                             )
+                 )
 #endif
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s[1] ^ 0x80) << 12)
-                                     | ((unsigned int) (s[2] ^ 0x80) << 6)
-                                     | (unsigned int) (s[3] ^ 0x80);
-                              return 4;
-                            }
-#if CONFIG_UNICODE_SAFETY
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  *puc = 0xfffd;
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x07) << 18)
+                         | ((unsigned int) (s[1] ^ 0x80) << 12)
+                         | ((unsigned int) (s[2] ^ 0x80) << 6)
+                         | (unsigned int) (s[3] ^ 0x80);
+                  return 4;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
               /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s[1] ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s[2] ^ 0x80) >= 0x40)
-                return 2;
-              else
-                return 3;
+              return n;
             }
         }
 #if 0
@@ -161,42 +120,19 @@
           if (n >= 5)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if (c >= 0xf9 || s[1] >= 0x88)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
 #endif
-                                {
-                                  *puc = ((unsigned int) (c & 0x03) << 24)
-                                         | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                         | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                         | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                         | (unsigned int) (s[4] ^ 0x80);
-                                  return 5;
-                                }
-#if CONFIG_UNICODE_SAFETY
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x03) << 24)
+                         | ((unsigned int) (s[1] ^ 0x80) << 18)
+                         | ((unsigned int) (s[2] ^ 0x80) << 12)
+                         | ((unsigned int) (s[3] ^ 0x80) << 6)
+                         | (unsigned int) (s[4] ^ 0x80);
+                  return 5;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
@@ -210,49 +146,21 @@
           if (n >= 6)
             {
 #if CONFIG_UNICODE_SAFETY
-              if ((s[1] ^ 0x80) < 0x40)
-                {
-                  if ((s[2] ^ 0x80) < 0x40)
-                    {
-                      if ((s[3] ^ 0x80) < 0x40)
-                        {
-                          if ((s[4] ^ 0x80) < 0x40)
-                            {
-                              if ((s[5] ^ 0x80) < 0x40)
-                                {
-                                  if (c >= 0xfd || s[1] >= 0x84)
+              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (s[5] ^ 0x80) < 0x40
+                  && (c >= 0xfd || s[1] >= 0x84))
 #endif
-                                    {
-                                      *puc = ((unsigned int) (c & 0x01) << 30)
-                                             | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                             | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                             | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                             | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                             | (unsigned int) (s[5] ^ 0x80);
-                                      return 6;
-                                    }
-#if CONFIG_UNICODE_SAFETY
-                                  /* invalid multibyte character */
-                                  *puc = 0xfffd;
-                                  return 6;
-                                }
-                              /* invalid multibyte character */
-                              *puc = 0xfffd;
-                              return 5;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
-                          return 4;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
-                      return 3;
-                    }
-                  /* invalid multibyte character */
-                  return 2;
+                {
+                  *puc = ((unsigned int) (c & 0x01) << 30)
+                         | ((unsigned int) (s[1] ^ 0x80) << 24)
+                         | ((unsigned int) (s[2] ^ 0x80) << 18)
+                         | ((unsigned int) (s[3] ^ 0x80) << 12)
+                         | ((unsigned int) (s[4] ^ 0x80) << 6)
+                         | (unsigned int) (s[5] ^ 0x80);
+                  return 6;
                 }
               /* invalid multibyte character */
-#endif
             }
           else
             {
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-prev.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-prev.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-prev.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-prev.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Iterate over previous character in UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,7 +23,7 @@
 const uint8_t *
 u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start)
 {
-  /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
+  /* Keep in sync with unistr.h and utf8-ucs4.c.  */
   if (s != start)
     {
       uint8_t c_1 = s[-1];
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-uctomb.c gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-uctomb.c
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr/u8-uctomb.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr/u8-uctomb.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unistr.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/unistr.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unistr.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unistr.in.h	2010-05-17 19:58:03.000000000 +0000
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -66,20 +66,17 @@
 /* Check whether an UTF-8 string is well-formed.
    Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
 extern const uint8_t *
-       u8_check (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_check (const uint8_t *s, size_t n);
 
 /* Check whether an UTF-16 string is well-formed.
    Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
 extern const uint16_t *
-       u16_check (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_check (const uint16_t *s, size_t n);
 
 /* Check whether an UCS-4 string is well-formed.
    Return NULL if valid, or a pointer to the first invalid unit otherwise.  */
 extern const uint32_t *
-       u32_check (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_check (const uint32_t *s, size_t n);
 
 
 /* Elementary string conversions.  */
@@ -122,14 +119,11 @@
    failure.  */
 /* Similar to mblen(), except that s must not be NULL.  */
 extern int
-       u8_mblen (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_mblen (const uint8_t *s, size_t n);
 extern int
-       u16_mblen (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_mblen (const uint16_t *s, size_t n);
 extern int
-       u32_mblen (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_mblen (const uint32_t *s, size_t n);
 
 /* Return the length (number of units) of the first character in S, putting
    its 'ucs4_t' representation in *PUC.  Upon failure, *PUC is set to 0xfffd,
@@ -140,7 +134,7 @@
 /* The variants with _safe suffix are safe, even if the library is compiled
    without --enable-safety.  */
 
-#if GNULIB_UNISTR_U8_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
        u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n);
@@ -163,7 +157,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U16_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
        u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n);
@@ -186,7 +180,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U32_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
        u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n);
@@ -211,7 +205,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U8_MBTOUC || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_MBTOUC
 # if !HAVE_INLINE
 extern int
        u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n);
@@ -234,7 +228,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U16_MBTOUC || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_MBTOUC
 # if !HAVE_INLINE
 extern int
        u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
@@ -257,7 +251,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U32_MBTOUC || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_MBTOUC
 # if !HAVE_INLINE
 extern int
        u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
@@ -285,17 +279,17 @@
 /* Similar to u*_mbtouc(), except that the return value gives more details
    about the failure, similar to mbrtowc().  */
 
-#if GNULIB_UNISTR_U8_MBTOUCR || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_MBTOUCR
 extern int
        u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n);
 #endif
 
-#if GNULIB_UNISTR_U16_MBTOUCR || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_MBTOUCR
 extern int
        u16_mbtoucr (ucs4_t *puc, const uint16_t *s, size_t n);
 #endif
 
-#if GNULIB_UNISTR_U32_MBTOUCR || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_MBTOUCR
 extern int
        u32_mbtoucr (ucs4_t *puc, const uint32_t *s, size_t n);
 #endif
@@ -306,7 +300,7 @@
 /* Similar to wctomb(), except that s must not be NULL, and the argument n
    must be specified.  */
 
-#if GNULIB_UNISTR_U8_UCTOMB || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U8_UCTOMB
 /* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr.  */
 extern int
        u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
@@ -328,7 +322,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U16_UCTOMB || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U16_UCTOMB
 /* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr.  */
 extern int
        u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
@@ -350,7 +344,7 @@
 # endif
 #endif
 
-#if GNULIB_UNISTR_U32_UCTOMB || HAVE_LIBUNISTRING
+#ifdef GNULIB_UNISTR_U32_UCTOMB
 # if !HAVE_INLINE
 extern int
        u32_uctomb (uint32_t *s, ucs4_t uc, int n);
@@ -406,50 +400,38 @@
 /* Compare S1 and S2, each of length N.  */
 /* Similar to memcmp().  */
 extern int
-       u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n);
 extern int
-       u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n);
 extern int
-       u32_cmp (const uint32_t *s1, const uint32_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_cmp (const uint32_t *s1, const uint32_t *s2, size_t n);
 
 /* Compare S1 and S2.  */
 /* Similar to the gnulib function memcmp2().  */
 extern int
-       u8_cmp2 (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
+       u8_cmp2 (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2);
 extern int
-       u16_cmp2 (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
+       u16_cmp2 (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2);
 extern int
-       u32_cmp2 (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2)
-       _UC_ATTRIBUTE_PURE;
+       u32_cmp2 (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2);
 
 /* Search the string at S for UC.  */
 /* Similar to memchr().  */
 extern uint8_t *
-       u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u8_chr (const uint8_t *s, size_t n, ucs4_t uc);
 extern uint16_t *
-       u16_chr (const uint16_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u16_chr (const uint16_t *s, size_t n, ucs4_t uc);
 extern uint32_t *
-       u32_chr (const uint32_t *s, size_t n, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u32_chr (const uint32_t *s, size_t n, ucs4_t uc);
 
 /* Count the number of Unicode characters in the N units from S.  */
 /* Similar to mbsnlen().  */
 extern size_t
-       u8_mbsnlen (const uint8_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_mbsnlen (const uint8_t *s, size_t n);
 extern size_t
-       u16_mbsnlen (const uint16_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_mbsnlen (const uint16_t *s, size_t n);
 extern size_t
-       u32_mbsnlen (const uint32_t *s, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_mbsnlen (const uint32_t *s, size_t n);
 
 /* Elementary string functions with memory allocation.  */
 
@@ -466,14 +448,11 @@
 /* Return the length (number of units) of the first character in S.
    Return 0 if it is the NUL character.  Return -1 upon failure.  */
 extern int
-       u8_strmblen (const uint8_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u8_strmblen (const uint8_t *s);
 extern int
-       u16_strmblen (const uint16_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u16_strmblen (const uint16_t *s);
 extern int
-       u32_strmblen (const uint32_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u32_strmblen (const uint32_t *s);
 
 /* Return the length (number of units) of the first character in S, putting
    its 'ucs4_t' representation in *PUC.  Return 0 if it is the NUL
@@ -508,26 +487,20 @@
 /* Return the number of units in S.  */
 /* Similar to strlen(), wcslen().  */
 extern size_t
-       u8_strlen (const uint8_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u8_strlen (const uint8_t *s);
 extern size_t
-       u16_strlen (const uint16_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u16_strlen (const uint16_t *s);
 extern size_t
-       u32_strlen (const uint32_t *s)
-       _UC_ATTRIBUTE_PURE;
+       u32_strlen (const uint32_t *s);
 
 /* Return the number of units in S, but at most MAXLEN.  */
 /* Similar to strnlen(), wcsnlen().  */
 extern size_t
-       u8_strnlen (const uint8_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
+       u8_strnlen (const uint8_t *s, size_t maxlen);
 extern size_t
-       u16_strnlen (const uint16_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
+       u16_strnlen (const uint16_t *s, size_t maxlen);
 extern size_t
-       u32_strnlen (const uint32_t *s, size_t maxlen)
-       _UC_ATTRIBUTE_PURE;
+       u32_strnlen (const uint32_t *s, size_t maxlen);
 
 /* Copy SRC to DEST.  */
 /* Similar to strcpy(), wcscpy().  */
@@ -586,23 +559,12 @@
 
 /* Compare S1 and S2.  */
 /* Similar to strcmp(), wcscmp().  */
-#ifdef __sun
-/* Avoid a collision with the u8_strcmp() function in Solaris 11 libc.  */
 extern int
-       u8_strcmp_gnu (const uint8_t *s1, const uint8_t *s2)
-       _UC_ATTRIBUTE_PURE;
-# define u8_strcmp u8_strcmp_gnu
-#else
+       u8_strcmp (const uint8_t *s1, const uint8_t *s2);
 extern int
-       u8_strcmp (const uint8_t *s1, const uint8_t *s2)
-       _UC_ATTRIBUTE_PURE;
-#endif
-extern int
-       u16_strcmp (const uint16_t *s1, const uint16_t *s2)
-       _UC_ATTRIBUTE_PURE;
+       u16_strcmp (const uint16_t *s1, const uint16_t *s2);
 extern int
-       u32_strcmp (const uint32_t *s1, const uint32_t *s2)
-       _UC_ATTRIBUTE_PURE;
+       u32_strcmp (const uint32_t *s1, const uint32_t *s2);
 
 /* Compare S1 and S2 using the collation rules of the current locale.
    Return -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2.
@@ -618,14 +580,11 @@
 /* Compare no more than N units of S1 and S2.  */
 /* Similar to strncmp(), wcsncmp().  */
 extern int
-       u8_strncmp (const uint8_t *s1, const uint8_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u8_strncmp (const uint8_t *s1, const uint8_t *s2, size_t n);
 extern int
-       u16_strncmp (const uint16_t *s1, const uint16_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u16_strncmp (const uint16_t *s1, const uint16_t *s2, size_t n);
 extern int
-       u32_strncmp (const uint32_t *s1, const uint32_t *s2, size_t n)
-       _UC_ATTRIBUTE_PURE;
+       u32_strncmp (const uint32_t *s1, const uint32_t *s2, size_t n);
 
 /* Duplicate S, returning an identical malloc'd string.  */
 /* Similar to strdup(), wcsdup().  */
@@ -639,98 +598,74 @@
 /* Find the first occurrence of UC in STR.  */
 /* Similar to strchr(), wcschr().  */
 extern uint8_t *
-       u8_strchr (const uint8_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u8_strchr (const uint8_t *str, ucs4_t uc);
 extern uint16_t *
-       u16_strchr (const uint16_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u16_strchr (const uint16_t *str, ucs4_t uc);
 extern uint32_t *
-       u32_strchr (const uint32_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u32_strchr (const uint32_t *str, ucs4_t uc);
 
 /* Find the last occurrence of UC in STR.  */
 /* Similar to strrchr(), wcsrchr().  */
 extern uint8_t *
-       u8_strrchr (const uint8_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u8_strrchr (const uint8_t *str, ucs4_t uc);
 extern uint16_t *
-       u16_strrchr (const uint16_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u16_strrchr (const uint16_t *str, ucs4_t uc);
 extern uint32_t *
-       u32_strrchr (const uint32_t *str, ucs4_t uc)
-       _UC_ATTRIBUTE_PURE;
+       u32_strrchr (const uint32_t *str, ucs4_t uc);
 
 /* Return the length of the initial segment of STR which consists entirely
    of Unicode characters not in REJECT.  */
 /* Similar to strcspn(), wcscspn().  */
 extern size_t
-       u8_strcspn (const uint8_t *str, const uint8_t *reject)
-       _UC_ATTRIBUTE_PURE;
+       u8_strcspn (const uint8_t *str, const uint8_t *reject);
 extern size_t
-       u16_strcspn (const uint16_t *str, const uint16_t *reject)
-       _UC_ATTRIBUTE_PURE;
+       u16_strcspn (const uint16_t *str, const uint16_t *reject);
 extern size_t
-       u32_strcspn (const uint32_t *str, const uint32_t *reject)
-       _UC_ATTRIBUTE_PURE;
+       u32_strcspn (const uint32_t *str, const uint32_t *reject);
 
 /* Return the length of the initial segment of STR which consists entirely
    of Unicode characters in ACCEPT.  */
 /* Similar to strspn(), wcsspn().  */
 extern size_t
-       u8_strspn (const uint8_t *str, const uint8_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u8_strspn (const uint8_t *str, const uint8_t *accept);
 extern size_t
-       u16_strspn (const uint16_t *str, const uint16_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u16_strspn (const uint16_t *str, const uint16_t *accept);
 extern size_t
-       u32_strspn (const uint32_t *str, const uint32_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u32_strspn (const uint32_t *str, const uint32_t *accept);
 
 /* Find the first occurrence in STR of any character in ACCEPT.  */
 /* Similar to strpbrk(), wcspbrk().  */
 extern uint8_t *
-       u8_strpbrk (const uint8_t *str, const uint8_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u8_strpbrk (const uint8_t *str, const uint8_t *accept);
 extern uint16_t *
-       u16_strpbrk (const uint16_t *str, const uint16_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u16_strpbrk (const uint16_t *str, const uint16_t *accept);
 extern uint32_t *
-       u32_strpbrk (const uint32_t *str, const uint32_t *accept)
-       _UC_ATTRIBUTE_PURE;
+       u32_strpbrk (const uint32_t *str, const uint32_t *accept);
 
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
 /* Similar to strstr(), wcsstr().  */
 extern uint8_t *
-       u8_strstr (const uint8_t *haystack, const uint8_t *needle)
-       _UC_ATTRIBUTE_PURE;
+       u8_strstr (const uint8_t *haystack, const uint8_t *needle);
 extern uint16_t *
-       u16_strstr (const uint16_t *haystack, const uint16_t *needle)
-       _UC_ATTRIBUTE_PURE;
+       u16_strstr (const uint16_t *haystack, const uint16_t *needle);
 extern uint32_t *
-       u32_strstr (const uint32_t *haystack, const uint32_t *needle)
-       _UC_ATTRIBUTE_PURE;
+       u32_strstr (const uint32_t *haystack, const uint32_t *needle);
 
 /* Test whether STR starts with PREFIX.  */
 extern bool
-       u8_startswith (const uint8_t *str, const uint8_t *prefix)
-       _UC_ATTRIBUTE_PURE;
+       u8_startswith (const uint8_t *str, const uint8_t *prefix);
 extern bool
-       u16_startswith (const uint16_t *str, const uint16_t *prefix)
-       _UC_ATTRIBUTE_PURE;
+       u16_startswith (const uint16_t *str, const uint16_t *prefix);
 extern bool
-       u32_startswith (const uint32_t *str, const uint32_t *prefix)
-       _UC_ATTRIBUTE_PURE;
+       u32_startswith (const uint32_t *str, const uint32_t *prefix);
 
 /* Test whether STR ends with SUFFIX.  */
 extern bool
-       u8_endswith (const uint8_t *str, const uint8_t *suffix)
-       _UC_ATTRIBUTE_PURE;
+       u8_endswith (const uint8_t *str, const uint8_t *suffix);
 extern bool
-       u16_endswith (const uint16_t *str, const uint16_t *suffix)
-       _UC_ATTRIBUTE_PURE;
+       u16_endswith (const uint16_t *str, const uint16_t *suffix);
 extern bool
-       u32_endswith (const uint32_t *str, const uint32_t *suffix)
-       _UC_ATTRIBUTE_PURE;
+       u32_endswith (const uint32_t *str, const uint32_t *suffix);
 
 /* Divide STR into tokens separated by characters in DELIM.
    This interface is actually more similar to wcstok than to strtok.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unitypes.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/unitypes.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unitypes.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unitypes.in.h	2010-05-17 19:58:03.000000000 +0000
@@ -1,5 +1,5 @@
-/* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+/* Elementary types for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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.
+   Lesser 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/>.  */
@@ -23,24 +23,4 @@
 /* Type representing a Unicode character.  */
 typedef uint32_t ucs4_t;
 
-/* Attribute of a function whose result depends only on the arguments
-   (not pointers!) and which has no side effects.  */
-#ifndef _UC_ATTRIBUTE_CONST
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#  define _UC_ATTRIBUTE_CONST __attribute__ ((__const__))
-# else
-#  define _UC_ATTRIBUTE_CONST
-# endif
-#endif
-
-/* Attribute of a function whose result depends only on the arguments
-   (possibly pointers) and global memory, and which has no side effects.  */
-#ifndef _UC_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _UC_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _UC_ATTRIBUTE_PURE
-# endif
-#endif
-
 #endif /* _UNITYPES_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/uniwidth/cjk.h gettext-0.18.1.1/gettext-tools/libgettextpo/uniwidth/cjk.h
--- gettext-0.19.3/gettext-tools/libgettextpo/uniwidth/cjk.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/uniwidth/cjk.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -22,16 +22,16 @@
 {
   if (0
       /* Legacy Japanese encodings */
-      || STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
+      || STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
       /* Legacy Chinese encodings */
-      || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-      || STREQ_OPT (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
-      || STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
-      || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
+      || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+      || STREQ (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
+      || STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
+      || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
       /* Legacy Korean encodings */
-      || STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-      || STREQ_OPT (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
-      || STREQ_OPT (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
+      || STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+      || STREQ (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
+      || STREQ (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
     return 1;
   return 0;
 }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/uniwidth/width.c gettext-0.18.1.1/gettext-tools/libgettextpo/uniwidth/width.c
--- gettext-0.19.3/gettext-tools/libgettextpo/uniwidth/width.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/uniwidth/width.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2010 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
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -32,7 +32,7 @@
  * - Zero width characters; generated from
  *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
  */
-static const unsigned char nonspacing_table_data[27*64] = {
+static const unsigned char nonspacing_table_data[26*64] = {
   /* 0x0000-0x01ff */
   0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
@@ -62,20 +62,20 @@
   0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
   /* 0x0600-0x07ff */
   0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
-  0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
+  0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
-  0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
+  0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
   0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
   0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */
   /* 0x0800-0x09ff */
-  0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */
-  0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */
-  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */
-  0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */
+  0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
   0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */
   /* 0x0a00-0x0bff */
@@ -103,12 +103,12 @@
   0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
   0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
-  0xdf, 0xe0, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
+  0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
   0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
   /* 0x1000-0x11ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */
   0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */
-  0x64, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
+  0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */
@@ -120,7 +120,7 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
-  0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
+  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
   /* 0x1600-0x17ff */
@@ -143,22 +143,22 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
   /* 0x1a00-0x1bff */
   0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
-  0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
   0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
   0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
   0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */
-  0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */
   /* 0x1c00-0x1dff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
-  0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x00, 0x00, /* 0x1cc0-0x1cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
-  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xf0, /* 0x1dc0-0x1dff */
+  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */
   /* 0x2000-0x21ff */
   0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
   0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */
@@ -172,9 +172,9 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, /* 0x2cc0-0x2cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x2d40-0x2d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */
   /* 0x3000-0x31ff */
@@ -190,7 +190,7 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */
@@ -199,20 +199,20 @@
   0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
-  0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */
   0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
   0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
-  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
   /* 0xaa00-0xabff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */
   0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x00, /* 0xabc0-0xabff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */
   /* 0xfa00-0xfbff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
@@ -249,22 +249,13 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
-  /* 0x11000-0x111ff */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */
-  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11040-0x1107f */
-  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11100-0x1113f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11140-0x1117f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11180-0x111bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */
   /* 0x1d000-0x1d1ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
-  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xf8, 0xff, /* 0x1d140-0x1d17f */
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */
   0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
   /* 0x1d200-0x1d3ff */
@@ -295,7 +286,7 @@
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
   -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
   22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */
-  24, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
@@ -307,7 +298,7 @@
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
-  25, 26, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
+  24, 25, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
 };
 
 /* Determine number of column positions required for UC.  */
@@ -341,8 +332,8 @@
         }
     }
   /* Test for double-width character.
-   * Generated from "grep '^[^;]\{4,5\};[WF]' EastAsianWidth.txt"
-   * and            "grep '^[^;]\{4,5\};[^WF]' EastAsianWidth.txt"
+   * Generated from "grep '^....;[WF]' EastAsianWidth.txt"
+   * and            "grep '^....;[^WF]' EastAsianWidth.txt"
    */
   if (uc >= 0x1100
       && ((uc < 0x1160) /* Hangul Jamo */
@@ -355,8 +346,8 @@
           || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
           || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
           || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
-          || (uc >= 0x20000 && uc <= 0x2ffff) /* Supplementary Ideographic Plane */
-          || (uc >= 0x30000 && uc <= 0x3ffff) /* Tertiary Ideographic Plane */
+          || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
+          || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
      )   )
     return 2;
   /* In ancient CJK encodings, Cyrillic and most other characters are
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/uniwidth.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/uniwidth.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/uniwidth.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/uniwidth.in.h	2010-05-17 19:58:04.000000000 +0000
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
@@ -10,7 +10,7 @@
    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.
+   Lesser 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/>.  */
@@ -38,31 +38,24 @@
 
 /* Determine number of column positions required for UC.  */
 extern int
-       uc_width (ucs4_t uc, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       uc_width (ucs4_t uc, const char *encoding);
 
 /* Determine number of column positions required for first N units
    (or fewer if S ends before this) in S.  */
 extern int
-       u8_width (const uint8_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u8_width (const uint8_t *s, size_t n, const char *encoding);
 extern int
-       u16_width (const uint16_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u16_width (const uint16_t *s, size_t n, const char *encoding);
 extern int
-       u32_width (const uint32_t *s, size_t n, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u32_width (const uint32_t *s, size_t n, const char *encoding);
 
 /* Determine number of column positions required for S.  */
 extern int
-       u8_strwidth (const uint8_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u8_strwidth (const uint8_t *s, const char *encoding);
 extern int
-       u16_strwidth (const uint16_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u16_strwidth (const uint16_t *s, const char *encoding);
 extern int
-       u32_strwidth (const uint32_t *s, const char *encoding)
-       _UC_ATTRIBUTE_PURE;
+       u32_strwidth (const uint32_t *s, const char *encoding);
 
 
 #ifdef __cplusplus
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/unlocked-io.h gettext-0.18.1.1/gettext-tools/libgettextpo/unlocked-io.h
--- gettext-0.19.3/gettext-tools/libgettextpo/unlocked-io.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/unlocked-io.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/vasnprintf.c gettext-0.18.1.1/gettext-tools/libgettextpo/vasnprintf.c
--- gettext-0.19.3/gettext-tools/libgettextpo/vasnprintf.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/vasnprintf.c	2010-05-09 11:05:02.000000000 +0000
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can be parametrized with the following macros:
      VASNPRINTF         The name of the function being defined.
@@ -87,8 +88,6 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-#include "verify.h"
-
 #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
 # include "float+.h"
@@ -275,10 +274,10 @@
 {
   const char *point;
   /* Determine it in a multithread-safe way.  We know nl_langinfo is
-     multithread-safe on glibc systems and Mac OS X systems, but is not required
+     multithread-safe on glibc systems and MacOS X systems, but is not required
      to be multithread-safe by POSIX.  sprintf(), however, is multithread-safe.
      localeconv() is rarely multithread-safe.  */
-#  if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__))
+#  if HAVE_NL_LANGINFO && (__GLIBC__ || (defined __APPLE__ && defined __MACH__))
   point = nl_langinfo (RADIXCHAR);
 #  elif 1
   char pointbuf[5];
@@ -323,11 +322,11 @@
 
 typedef unsigned int mp_limb_t;
 # define GMP_LIMB_BITS 32
-verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
+typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1];
 
 typedef unsigned long long mp_twolimb_t;
 # define GMP_TWOLIMB_BITS 64
-verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
+typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1];
 
 /* Representation of a bignum >= 0.  */
 typedef struct
@@ -552,61 +551,32 @@
       size_t s;
       {
         mp_limb_t msd = b_ptr[b_len - 1]; /* = b[n-1], > 0 */
-        /* Determine s = GMP_LIMB_BITS - integer_length (msd).
-           Code copied from gnulib's integer_length.c.  */
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-        s = __builtin_clz (msd);
-# else
-#  if defined DBL_EXPBIT0_WORD && defined DBL_EXPBIT0_BIT
-        if (GMP_LIMB_BITS <= DBL_MANT_BIT)
+        s = 31;
+        if (msd >= 0x10000)
           {
-            /* Use 'double' operations.
-               Assumes an IEEE 754 'double' implementation.  */
-#   define DBL_EXP_MASK ((DBL_MAX_EXP - DBL_MIN_EXP) | 7)
-#   define DBL_EXP_BIAS (DBL_EXP_MASK / 2 - 1)
-#   define NWORDS \
-     ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-            union { double value; unsigned int word[NWORDS]; } m;
-
-            /* Use a single integer to floating-point conversion.  */
-            m.value = msd;
-
-            s = GMP_LIMB_BITS
-                - (((m.word[DBL_EXPBIT0_WORD] >> DBL_EXPBIT0_BIT) & DBL_EXP_MASK)
-                   - DBL_EXP_BIAS);
+            msd = msd >> 16;
+            s -= 16;
           }
-        else
-#   undef NWORDS
-#  endif
+        if (msd >= 0x100)
           {
-            s = 31;
-            if (msd >= 0x10000)
-              {
-                msd = msd >> 16;
-                s -= 16;
-              }
-            if (msd >= 0x100)
-              {
-                msd = msd >> 8;
-                s -= 8;
-              }
-            if (msd >= 0x10)
-              {
-                msd = msd >> 4;
-                s -= 4;
-              }
-            if (msd >= 0x4)
-              {
-                msd = msd >> 2;
-                s -= 2;
-              }
-            if (msd >= 0x2)
-              {
-                msd = msd >> 1;
-                s -= 1;
-              }
+            msd = msd >> 8;
+            s -= 8;
+          }
+        if (msd >= 0x10)
+          {
+            msd = msd >> 4;
+            s -= 4;
+          }
+        if (msd >= 0x4)
+          {
+            msd = msd >> 2;
+            s -= 2;
+          }
+        if (msd >= 0x2)
+          {
+            msd = msd >> 1;
+            s -= 1;
           }
-# endif
       }
       /* 0 <= s < GMP_LIMB_BITS.
          Copy b, shifting it left by s bits.  */
@@ -913,9 +883,9 @@
   y = frexpl (x, &exp);
   if (!(y >= 0.0L && y < 1.0L))
     abort ();
-  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * 2^LDBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * LDBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^LDBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * LDBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'long double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'long double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -963,11 +933,11 @@
         abort ();
       m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo;
     }
-#  if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
-           precision.  */
+#if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess
+         precision.  */
   if (!(y == 0.0L))
     abort ();
-#  endif
+#endif
   /* Normalise.  */
   while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0)
     m.nlimbs--;
@@ -1001,9 +971,9 @@
   y = frexp (x, &exp);
   if (!(y >= 0.0 && y < 1.0))
     abort ();
-  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * 2^DBL_MANT_BIT), and the
+  /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * DBL_MANT_BIT), and the
      latter is an integer.  */
-  /* Convert the mantissa (y * 2^DBL_MANT_BIT) to a sequence of limbs.
+  /* Convert the mantissa (y * DBL_MANT_BIT) to a sequence of limbs.
      I'm not sure whether it's safe to cast a 'double' value between
      2^31 and 2^32 to 'unsigned int', therefore play safe and cast only
      'double' values between 0 and 2^16 (to 'unsigned int' or 'int',
@@ -1530,7 +1500,7 @@
 
 /* Returns the number of TCHAR_T units needed as temporary space for the result
    of sprintf or SNPRINTF of a single conversion directive.  */
-static size_t
+static inline size_t
 MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
                  arg_type type, int flags, size_t width, int has_precision,
                  size_t precision, int pad_ourselves)
@@ -1781,9 +1751,8 @@
     return NULL;
 
 #define CLEANUP() \
-  if (d.dir != d.direct_alloc_dir)                                      \
-    free (d.dir);                                                       \
-  if (a.arg != a.direct_alloc_arg)                                      \
+  free (d.dir);                                                         \
+  if (a.arg)                                                            \
     free (a.arg);
 
   if (PRINTF_FETCHARGS (args, &a) < 0)
@@ -1957,14 +1926,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2072,7 +2042,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2125,7 +2096,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2198,7 +2170,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2251,7 +2224,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2324,7 +2298,8 @@
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && !(dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2377,7 +2352,8 @@
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (has_width && width > characters
+                          && (dp->flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2428,14 +2404,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2565,7 +2542,8 @@
                       characters = 0;
                     }
 
-                  if (characters < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2626,7 +2604,8 @@
                         }
                     }
 
-                  if (characters < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > characters
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2642,7 +2621,7 @@
                   size_t characters;
 #  if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
-                  verify (sizeof (TCHAR_T) == 1);
+                  typedef int TCHAR_T_verify[2 * (sizeof (TCHAR_T) == 1) - 1];
                   TCHAR_T *tmpsrc;
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
@@ -2803,7 +2782,7 @@
                   if (has_width)
                     {
 #  if ENABLE_UNISTDIO
-                      /* Outside POSIX, it's preferable to compare the width
+                      /* Outside POSIX, it's preferrable to compare the width
                          against the number of _characters_ of the converted
                          value.  */
                       w = DCHAR_MBSNLEN (result + length, characters);
@@ -2817,7 +2796,8 @@
                     /* w doesn't matter.  */
                     w = 0;
 
-                  if (w < width && !(dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && !(dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2900,7 +2880,8 @@
                   length += tmpdst_len;
 #  endif
 
-                  if (w < width && (dp->flags & FLAG_LEFT))
+                  if (has_width && width > w
+                      && (dp->flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2927,16 +2908,17 @@
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
-                size_t count;
                 DCHAR_T tmpbuf[700];
                 DCHAR_T *tmp;
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -2947,14 +2929,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -2964,6 +2947,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3339,14 +3323,11 @@
                     abort ();
 # endif
                   }
-
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -3379,26 +3360,28 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
 #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
@@ -3432,8 +3415,8 @@
                 arg_type type = a.arg[dp->arg_index].type;
 # endif
                 int flags = dp->flags;
+                int has_width;
                 size_t width;
-                size_t count;
                 int has_precision;
                 size_t precision;
                 size_t tmp_length;
@@ -3442,6 +3425,7 @@
                 DCHAR_T *pad_ptr;
                 DCHAR_T *p;
 
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -3452,14 +3436,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -3469,6 +3454,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    has_width = 1;
                   }
 
                 has_precision = 0;
@@ -3908,9 +3894,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
+                                            size_t count = exponent + 1;
                                             /* Note: count <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -3924,10 +3910,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4378,9 +4364,9 @@
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
-                                            /* Note: ecount <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
+                                            size_t count = exponent + 1;
+                                            /* Note: count <= precision = ndigits.  */
+                                            for (; count > 0; count--)
                                               *p++ = digits[--ndigits];
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
@@ -4394,10 +4380,10 @@
                                           }
                                         else
                                           {
-                                            size_t ecount = -exponent - 1;
+                                            size_t count = -exponent - 1;
                                             *p++ = '0';
                                             *p++ = decimal_point_char ();
-                                            for (; ecount > 0; ecount--)
+                                            for (; count > 0; count--)
                                               *p++ = '0';
                                             while (ndigits > nzeroes)
                                               {
@@ -4525,11 +4511,9 @@
 
                 /* The generated string now extends from tmp to p, with the
                    zero padding insertion point being at pad_ptr.  */
-                count = p - tmp;
-
-                if (count < width)
+                if (has_width && p - tmp < width)
                   {
-                    size_t pad = width - count;
+                    size_t pad = width - (p - tmp);
                     DCHAR_T *end = p + pad;
 
                     if (flags & FLAG_LEFT)
@@ -4562,36 +4546,36 @@
                     p = end;
                   }
 
-                count = p - tmp;
+                {
+                  size_t count = p - tmp;
 
-                if (count >= tmp_length)
-                  /* tmp_length was incorrectly calculated - fix the
-                     code above!  */
-                  abort ();
+                  if (count >= tmp_length)
+                    /* tmp_length was incorrectly calculated - fix the
+                       code above!  */
+                    abort ();
 
-                /* Make room for the result.  */
-                if (count >= allocated - length)
-                  {
-                    size_t n = xsum (length, count);
+                  /* Make room for the result.  */
+                  if (count >= allocated - length)
+                    {
+                      size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
-                  }
+                      ENSURE_ALLOCATION (n);
+                    }
 
-                /* Append the result.  */
-                memcpy (result + length, tmp, count * sizeof (DCHAR_T));
-                if (tmp != tmpbuf)
-                  free (tmp);
-                length += count;
+                  /* Append the result.  */
+                  memcpy (result + length, tmp, count * sizeof (DCHAR_T));
+                  if (tmp != tmpbuf)
+                    free (tmp);
+                  length += count;
+                }
               }
 #endif
             else
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                int has_width;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                int has_width;
                 size_t width;
 #endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION
@@ -4613,17 +4597,14 @@
                 TCHAR_T *fbp;
                 unsigned int prefix_count;
                 int prefixes[2] IF_LINT (= { 0 });
-                int orig_errno;
 #if !USE_SNPRINTF
                 size_t tmp_length;
                 TCHAR_T tmpbuf[700];
                 TCHAR_T *tmp;
 #endif
 
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
-                has_width = 0;
-#endif
 #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                has_width = 0;
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -4634,14 +4615,15 @@
                         if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
                           abort ();
                         arg = a.arg[dp->width_arg_index].a.a_int;
-                        width = arg;
                         if (arg < 0)
                           {
                             /* "A negative field width is taken as a '-' flag
                                 followed by a positive field width."  */
                             flags |= FLAG_LEFT;
-                            width = -width;
+                            width = (unsigned int) (-arg);
                           }
+                        else
+                          width = arg;
                       }
                     else
                       {
@@ -4651,9 +4633,7 @@
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                     has_width = 1;
-#endif
                   }
 #endif
 
@@ -4771,10 +4751,6 @@
                   *fbp++ = ' ';
                 if (flags & FLAG_ALT)
                   *fbp++ = '#';
-#if __GLIBC__ >= 2 && !defined __UCLIBC__
-                if (flags & FLAG_LOCALIZED)
-                  *fbp++ = 'I';
-#endif
                 if (!pad_ourselves)
                   {
                     if (flags & FLAG_ZERO)
@@ -4858,21 +4834,20 @@
 #endif
                   *fbp = dp->conversion;
 #if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
                 fbp[1] = '%';
                 fbp[2] = 'n';
                 fbp[3] = '\0';
 # else
                 /* On glibc2 systems from glibc >= 2.3 - probably also older
-                   ones - we know that snprintf's return value conforms to
-                   ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and
-                   gl_SNPRINTF_TRUNCATION_C99 pass.
+                   ones - we know that snprintf's returns value conforms to
+                   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
                    Therefore we can avoid using %n in this situation.
                    On glibc2 systems from 2004-10-18 or newer, the use of %n
                    in format strings in writable memory may crash the program
                    (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
                    in this situation.  */
-                /* On native Windows systems (such as mingw), we can avoid using
+                /* On native Win32 systems (such as mingw), we can avoid using
                    %n because:
                      - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
                        snprintf does not write more than the specified number
@@ -4881,7 +4856,7 @@
                      - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf
                        allows us to recognize the case of an insufficient
                        buffer size: it returns -1 in this case.
-                   On native Windows systems (such as mingw) where the OS is
+                   On native Win32 systems (such as mingw) where the OS is
                    Windows Vista, the use of %n in format strings by default
                    crashes the program. See
                      <http://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
@@ -4925,8 +4900,6 @@
                 *(TCHAR_T *) (result + length) = '\0';
 #endif
 
-                orig_errno = errno;
-
                 for (;;)
                   {
                     int count = -1;
@@ -5141,8 +5114,7 @@
                                 size_t tmp_length =
                                   MAX_ROOM_NEEDED (&a, dp->arg_index,
                                                    dp->conversion, type, flags,
-                                                   width,
-                                                   has_precision,
+                                                   width, has_precision,
                                                    precision, pad_ourselves);
 
                                 if (maxlen < tmp_length)
@@ -5312,7 +5284,8 @@
                         DCHAR_T *tmpdst;
                         size_t tmpdst_len;
                         /* This code assumes that TCHAR_T is 'char'.  */
-                        verify (sizeof (TCHAR_T) == 1);
+                        typedef int TCHAR_T_verify
+                                    [2 * (sizeof (TCHAR_T) == 1) - 1];
 # if USE_SNPRINTF
                         tmpsrc = (TCHAR_T *) (result + length);
 # else
@@ -5405,7 +5378,7 @@
                       {
                         size_t w;
 # if ENABLE_UNISTDIO
-                        /* Outside POSIX, it's preferable to compare the width
+                        /* Outside POSIX, it's preferrable to compare the width
                            against the number of _characters_ of the converted
                            value.  */
                         w = DCHAR_MBSNLEN (result + length, count);
@@ -5525,7 +5498,6 @@
                     length += count;
                     break;
                   }
-                errno = orig_errno;
 #undef pad_ourselves
 #undef prec_ourselves
               }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/vasnprintf.h gettext-0.18.1.1/gettext-tools/libgettextpo/vasnprintf.h
--- gettext-0.19.3/gettext-tools/libgettextpo/vasnprintf.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/vasnprintf.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
@@ -23,16 +24,16 @@
 /* Get size_t.  */
 #include <stddef.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
@@ -68,9 +69,9 @@
 # define vasnprintf rpl_vasnprintf
 #endif
 extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
+       __attribute__ ((__format__ (__printf__, 3, 4)));
 extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));
+       __attribute__ ((__format__ (__printf__, 3, 0)));
 
 #ifdef __cplusplus
 }
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/vasprintf.c gettext-0.18.1.1/gettext-tools/libgettextpo/vasprintf.c
--- gettext-0.19.3/gettext-tools/libgettextpo/vasprintf.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/vasprintf.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
    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/>.  */
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/verify.h gettext-0.18.1.1/gettext-tools/libgettextpo/verify.h
--- gettext-0.19.3/gettext-tools/libgettextpo/verify.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/verify.h	2010-05-09 11:05:02.000000000 +0000
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,49 +17,21 @@
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
-#ifndef _GL_VERIFY_H
-#define _GL_VERIFY_H
-
-
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
-   This is supported by GCC 4.6.0 and later, in C mode, and its use
-   here generates easier-to-read diagnostics when verify (R) fails.
-
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
-   This will likely be supported by future GCC versions, in C++ mode.
-
-   Use this only with GCC.  If we were willing to slow 'configure'
-   down we could also use it with other compilers, but since this
-   affects only the quality of diagnostics, why bother?  */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
-     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
-     && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
-   first G++ release that supports static_assert.  */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
-#endif
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   system headers, defines a conflicting _Static_assert that is no
-   better than ours; override it.  */
-#ifndef _GL_HAVE_STATIC_ASSERT
-# include <stddef.h>
-# undef _Static_assert
-#endif
+#ifndef VERIFY_H
+# define VERIFY_H 1
 
 /* Each of these macros verifies that its argument R is nonzero.  To
    be portable, R should be an integer constant expression.  Unlike
    assert (R), there is no run-time overhead.
 
-   If _Static_assert works, verify (R) uses it directly.  Similarly,
-   _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct
-   that is an operand of sizeof.
+   There are two macros, since no single macro can be used in all
+   contexts in C.  verify_true (R) is for scalar contexts, including
+   integer constant expression contexts.  verify (R) is for declaration
+   contexts, e.g., the top level.
 
-   The code below uses several ideas for C++ compilers, and for C
-   compilers that do not support _Static_assert:
+   Symbols ending in "__" are private to this header.
+
+   The code below uses several ideas.
 
    * The first step is ((R) ? 1 : -1).  Given an expression R, of
      integral or boolean or floating-point type, this yields an
@@ -67,9 +39,7 @@
      constant and nonnegative.
 
    * Next this expression W is wrapped in a type
-     struct _gl_verify_type {
-       unsigned int _gl_verify_error_if_negative: W;
-     }.
+     struct verify_type__ { unsigned int verify_error_if_negative_size__: W; }.
      If W is negative, this yields a compile-time error.  No compiler can
      deal with a bit-field of negative size.
 
@@ -83,7 +53,7 @@
 
        void function (int n) { verify (n < 0); }
 
-   * For the verify macro, the struct _gl_verify_type will need to
+   * For the verify macro, the struct verify_type__ will need to
      somehow be embedded into a declaration.  To be portable, this
      declaration must declare an object, a constant, a function, or a
      typedef name.  If the declared entity uses the type directly,
@@ -121,11 +91,11 @@
      Which of the following alternatives can be used?
 
        extern int dummy [sizeof (struct {...})];
-       extern int dummy [sizeof (struct _gl_verify_type {...})];
+       extern int dummy [sizeof (struct verify_type__ {...})];
        extern void dummy (int [sizeof (struct {...})]);
-       extern void dummy (int [sizeof (struct _gl_verify_type {...})]);
+       extern void dummy (int [sizeof (struct verify_type__ {...})]);
        extern int (*dummy (void)) [sizeof (struct {...})];
-       extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})];
+       extern int (*dummy (void)) [sizeof (struct verify_type__ {...})];
 
      In the second and sixth case, the struct type is exported to the
      outer scope; two such declarations therefore collide.  GCC warns
@@ -135,145 +105,59 @@
        extern int (*dummy (void)) [sizeof (struct {...})];
 
    * GCC warns about duplicate declarations of the dummy function if
-     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
+     -Wredundant_decls is used.  GCC 4.3 and later have a builtin
      __COUNTER__ macro that can let us generate unique identifiers for
      each dummy function, to suppress this warning.
 
-   * This implementation exploits the fact that older versions of GCC,
-     which do not support _Static_assert, also do not warn about the
-     last declaration mentioned above.
-
-   * GCC warns if -Wnested-externs is enabled and verify() is used
-     within a function body; but inside a function, you can always
-     arrange to use verify_expr() instead.
+   * This implementation exploits the fact that GCC does not warn about
+     the last declaration mentioned above.  If a future version of GCC
+     introduces a warning for this, the problem could be worked around
+     by using code specialized to GCC, just as __COUNTER__ is already
+     being used if available.
+
+       #if 4 <= __GNUC__
+       # define verify(R) [another version to keep GCC happy]
+       #endif
 
    * In C++, any struct definition inside sizeof is invalid.
      Use a template type to work around the problem.  */
 
 /* Concatenate two preprocessor tokens.  */
-#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-#define _GL_CONCAT0(x, y) x##y
+# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+# define _GL_CONCAT0(x, y) x##y
 
 /* _GL_COUNTER is an integer, preferably one that changes each time we
    use it.  Use __COUNTER__ if it works, falling back on __LINE__
    otherwise.  __LINE__ isn't perfect, but it's better than a
    constant.  */
-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-# define _GL_COUNTER __COUNTER__
-#else
-# define _GL_COUNTER __LINE__
-#endif
+# if defined __COUNTER__ && __COUNTER__ != __COUNTER__
+#  define _GL_COUNTER __COUNTER__
+# else
+#  define _GL_COUNTER __LINE__
+# endif
 
 /* Generate a symbol with the given prefix, making it unique if
    possible.  */
-#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
-
-/* Verify requirement R at compile-time, as an integer constant expression
-   that returns 1.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.  */
+# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
 
-#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
-   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
+/* Verify requirement R at compile-time, as an integer constant expression.
+   Return 1.  */
 
-#ifdef __cplusplus
-# if !GNULIB_defined_struct__gl_verify_type
+# ifdef __cplusplus
 template <int w>
-  struct _gl_verify_type {
-    unsigned int _gl_verify_error_if_negative: w;
-  };
-#  define GNULIB_defined_struct__gl_verify_type 1
-# endif
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    _gl_verify_type<(R) ? 1 : -1>
-#elif defined _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
-    }
-#else
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
-#endif
-
-/* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.
-
-   Unfortunately, unlike C11, this implementation must appear as an
-   ordinary declaration, and cannot appear inside struct { ... }.  */
-
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
-#else
-# define _GL_VERIFY(R, DIAGNOSTIC)				       \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
-      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-#endif
-
-/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
-#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+  struct verify_type__ { unsigned int verify_error_if_negative_size__: w; };
+#  define verify_true(R) \
+     (!!sizeof (verify_type__<(R) ? 1 : -1>))
+# else
+#  define verify_true(R) \
+     (!!sizeof \
+      (struct { unsigned int verify_error_if_negative_size__: (R) ? 1 : -1; }))
 # endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#  define static_assert _Static_assert /* C11 requires this #define.  */
-# endif
-#endif
-
-/* @assert.h omit start@  */
-
-/* Each of these macros verifies that its argument R is nonzero.  To
-   be portable, R should be an integer constant expression.  Unlike
-   assert (R), there is no run-time overhead.
-
-   There are two macros, since no single macro can be used in all
-   contexts in C.  verify_true (R) is for scalar contexts, including
-   integer constant expression contexts.  verify (R) is for declaration
-   contexts, e.g., the top level.  */
-
-/* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  This is equivalent to verify_expr (R, 1).
-
-   verify_true is obsolescent; please use verify_expr instead.  */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
-/* Verify requirement R at compile-time.  Return the value of the
-   expression E.  */
-
-#define verify_expr(R, E) \
-   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
 
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  */
 
-#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-/* Assume that R always holds.  This lets the compiler optimize
-   accordingly.  R should not have side-effects; it may or may not be
-   evaluated.  Behavior is undefined if R is false.  */
-
-#if (__has_builtin (__builtin_unreachable) \
-     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
-# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
-#elif 1200 <= _MSC_VER
-# define assume(R) __assume (R)
-#elif (defined lint \
-       && (__has_builtin (__builtin_trap) \
-           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
-  /* Doing it this way helps various packages when configured with
-     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
-     when 'assume' silences warnings even with older GCCs.  */
-# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
-#else
-# define assume(R) ((void) (0 && (R)))
-#endif
-
-/* @assert.h omit end@  */
+# define verify(R) \
+    extern int (* _GL_GENSYM (verify_function) (void)) [verify_true (R)]
 
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/wchar.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/wchar.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h	2010-05-09 01:38:04.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake.  */
 
@@ -28,7 +29,6 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
 /* Special invocation convention:
@@ -48,25 +48,17 @@
 #else
 /* Normal invocation convention.  */
 
-#ifndef _@GUARD_PREFIX@_WCHAR_H
+#ifndef _GL_WCHAR_H
 
 #define _GL_ALREADY_INCLUDING_WCHAR_H
 
-#if @HAVE_FEATURES_H@
-# include <features.h> /* for __GLIBC__ */
-#endif
-
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
    included before <wchar.h>.
-   In some builds of uClibc, <wchar.h> is nonexistent and wchar_t is defined
-   by <stddef.h>.
    But avoid namespace pollution on glibc systems.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-#endif
 #ifndef __GLIBC__
+# include <stddef.h>
 # include <stdio.h>
 # include <time.h>
 #endif
@@ -80,16 +72,8 @@
 
 #undef _GL_ALREADY_INCLUDING_WCHAR_H
 
-#ifndef _@GUARD_PREFIX@_WCHAR_H
-#define _@GUARD_PREFIX@_WCHAR_H
-
-/* The __attribute__ feature is available in gcc versions 2.5 and later.
-   The attribute __pure__ was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -105,18 +89,6 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
-#  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
-typedef unsigned int rpl_wint_t;
-#   undef wint_t
-#   define wint_t rpl_wint_t
-#   define GNULIB_defined_wint_t 1
-#  endif
-# endif
 # ifndef WEOF
 #  define WEOF ((wint_t) -1)
 # endif
@@ -127,12 +99,10 @@
    On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
    implementing mbrtowc for encodings like UTF-8.  */
 #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
-# if !GNULIB_defined_mbstate_t
 typedef int rpl_mbstate_t;
-#  undef mbstate_t
-#  define mbstate_t rpl_mbstate_t
-#  define GNULIB_defined_mbstate_t 1
-# endif
+# undef mbstate_t
+# define mbstate_t rpl_mbstate_t
+# define GNULIB_defined_mbstate_t 1
 #endif
 
 
@@ -143,11 +113,11 @@
 #   undef btowc
 #   define btowc rpl_btowc
 #  endif
-_GL_FUNCDECL_RPL (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (btowc, wint_t, (int c));
 _GL_CXXALIAS_RPL (btowc, wint_t, (int c));
 # else
 #  if !@HAVE_BTOWC@
-_GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (btowc, wint_t, (int c));
 #  endif
 _GL_CXXALIAS_SYS (btowc, wint_t, (int c));
 # endif
@@ -168,12 +138,12 @@
 #   undef wctob
 #   define wctob rpl_wctob
 #  endif
-_GL_FUNCDECL_RPL (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc));
 _GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
 # else
 #  if !defined wctob && !@HAVE_DECL_WCTOB@
 /* wctob is provided by gnulib, or wctob exists but is not declared.  */
-_GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc));
 #  endif
 _GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
 # endif
@@ -434,12 +404,12 @@
 #   undef wcwidth
 #   define wcwidth rpl_wcwidth
 #  endif
-_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
 _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 # else
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
-_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
@@ -453,576 +423,6 @@
 #endif
 
 
-/* Search N wide characters of S for C.  */
-#if @GNULIB_WMEMCHR@
-# if !@HAVE_WMEMCHR@
-_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)
-                                      _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wmemchr (const wchar_t *, wchar_t, size_t);
-         wchar_t * std::wmemchr (wchar_t *, wchar_t, size_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wmemchr,
-                        wchar_t *, (const wchar_t *, wchar_t, size_t),
-                        const wchar_t *, (const wchar_t *, wchar_t, size_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-_GL_CXXALIASWARN1 (wmemchr, const wchar_t *,
-                   (const wchar_t *s, wchar_t c, size_t n));
-# else
-_GL_CXXALIASWARN (wmemchr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wmemchr
-# if HAVE_RAW_DECL_WMEMCHR
-_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
-                 "use gnulib module wmemchr for portability");
-# endif
-#endif
-
-
-/* Compare N wide characters of S1 and S2.  */
-#if @GNULIB_WMEMCMP@
-# if !@HAVE_WMEMCMP@
-_GL_FUNCDECL_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wmemcmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemcmp
-# if HAVE_RAW_DECL_WMEMCMP
-_GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
-                 "use gnulib module wmemcmp for portability");
-# endif
-#endif
-
-
-/* Copy N wide characters of SRC to DEST.  */
-#if @GNULIB_WMEMCPY@
-# if !@HAVE_WMEMCPY@
-_GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemcpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wmemcpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemcpy
-# if HAVE_RAW_DECL_WMEMCPY
-_GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
-                 "use gnulib module wmemcpy for portability");
-# endif
-#endif
-
-
-/* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for
-   overlapping memory areas.  */
-#if @GNULIB_WMEMMOVE@
-# if !@HAVE_WMEMMOVE@
-_GL_FUNCDECL_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wmemmove);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemmove
-# if HAVE_RAW_DECL_WMEMMOVE
-_GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
-                 "use gnulib module wmemmove for portability");
-# endif
-#endif
-
-
-/* Set N wide characters of S to C.  */
-#if @GNULIB_WMEMSET@
-# if !@HAVE_WMEMSET@
-_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
-_GL_CXXALIASWARN (wmemset);
-#elif defined GNULIB_POSIXCHECK
-# undef wmemset
-# if HAVE_RAW_DECL_WMEMSET
-_GL_WARN_ON_USE (wmemset, "wmemset is unportable - "
-                 "use gnulib module wmemset for portability");
-# endif
-#endif
-
-
-/* Return the number of wide characters in S.  */
-#if @GNULIB_WCSLEN@
-# if !@HAVE_WCSLEN@
-_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s));
-_GL_CXXALIASWARN (wcslen);
-#elif defined GNULIB_POSIXCHECK
-# undef wcslen
-# if HAVE_RAW_DECL_WCSLEN
-_GL_WARN_ON_USE (wcslen, "wcslen is unportable - "
-                 "use gnulib module wcslen for portability");
-# endif
-#endif
-
-
-/* Return the number of wide characters in S, but at most MAXLEN.  */
-#if @GNULIB_WCSNLEN@
-# if !@HAVE_WCSNLEN@
-_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
-_GL_CXXALIASWARN (wcsnlen);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsnlen
-# if HAVE_RAW_DECL_WCSNLEN
-_GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
-                 "use gnulib module wcsnlen for portability");
-# endif
-#endif
-
-
-/* Copy SRC to DEST.  */
-#if @GNULIB_WCSCPY@
-# if !@HAVE_WCSCPY@
-_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcscpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscpy
-# if HAVE_RAW_DECL_WCSCPY
-_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
-                 "use gnulib module wcscpy for portability");
-# endif
-#endif
-
-
-/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST.  */
-#if @GNULIB_WCPCPY@
-# if !@HAVE_WCPCPY@
-_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcpcpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcpcpy
-# if HAVE_RAW_DECL_WCPCPY
-_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
-                 "use gnulib module wcpcpy for portability");
-# endif
-#endif
-
-
-/* Copy no more than N wide characters of SRC to DEST.  */
-#if @GNULIB_WCSNCPY@
-# if !@HAVE_WCSNCPY@
-_GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcsncpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncpy
-# if HAVE_RAW_DECL_WCSNCPY
-_GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
-                 "use gnulib module wcsncpy for portability");
-# endif
-#endif
-
-
-/* Copy no more than N characters of SRC to DEST, returning the address of
-   the last character written into DEST.  */
-#if @GNULIB_WCPNCPY@
-# if !@HAVE_WCPNCPY@
-_GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcpncpy);
-#elif defined GNULIB_POSIXCHECK
-# undef wcpncpy
-# if HAVE_RAW_DECL_WCPNCPY
-_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
-                 "use gnulib module wcpncpy for portability");
-# endif
-#endif
-
-
-/* Append SRC onto DEST.  */
-#if @GNULIB_WCSCAT@
-# if !@HAVE_WCSCAT@
-_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
-# endif
-_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
-_GL_CXXALIASWARN (wcscat);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscat
-# if HAVE_RAW_DECL_WCSCAT
-_GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
-                 "use gnulib module wcscat for portability");
-# endif
-#endif
-
-
-/* Append no more than N wide characters of SRC onto DEST.  */
-#if @GNULIB_WCSNCAT@
-# if !@HAVE_WCSNCAT@
-_GL_FUNCDECL_SYS (wcsncat, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsncat, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
-_GL_CXXALIASWARN (wcsncat);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncat
-# if HAVE_RAW_DECL_WCSNCAT
-_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
-                 "use gnulib module wcsncat for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2.  */
-#if @GNULIB_WCSCMP@
-# if !@HAVE_WCSCMP@
-_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
-                               _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscmp
-# if HAVE_RAW_DECL_WCSCMP
-_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
-                 "use gnulib module wcscmp for portability");
-# endif
-#endif
-
-
-/* Compare no more than N wide characters of S1 and S2.  */
-#if @GNULIB_WCSNCMP@
-# if !@HAVE_WCSNCMP@
-_GL_FUNCDECL_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsncmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncmp
-# if HAVE_RAW_DECL_WCSNCMP
-_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
-                 "use gnulib module wcsncmp for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2, ignoring case.  */
-#if @GNULIB_WCSCASECMP@
-# if !@HAVE_WCSCASECMP@
-_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscasecmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscasecmp
-# if HAVE_RAW_DECL_WCSCASECMP
-_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - "
-                 "use gnulib module wcscasecmp for portability");
-# endif
-#endif
-
-
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-#if @GNULIB_WCSNCASECMP@
-# if !@HAVE_WCSNCASECMP@
-_GL_FUNCDECL_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsncasecmp);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsncasecmp
-# if HAVE_RAW_DECL_WCSNCASECMP
-_GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - "
-                 "use gnulib module wcsncasecmp for portability");
-# endif
-#endif
-
-
-/* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE
-   category of the current locale.  */
-#if @GNULIB_WCSCOLL@
-# if !@HAVE_WCSCOLL@
-_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
-# endif
-_GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
-_GL_CXXALIASWARN (wcscoll);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscoll
-# if HAVE_RAW_DECL_WCSCOLL
-_GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
-                 "use gnulib module wcscoll for portability");
-# endif
-#endif
-
-
-/* Transform S2 into array pointed to by S1 such that if wcscmp is applied
-   to two transformed strings the result is the as applying 'wcscoll' to the
-   original strings.  */
-#if @GNULIB_WCSXFRM@
-# if !@HAVE_WCSXFRM@
-_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
-# endif
-_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
-_GL_CXXALIASWARN (wcsxfrm);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsxfrm
-# if HAVE_RAW_DECL_WCSXFRM
-_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - "
-                 "use gnulib module wcsxfrm for portability");
-# endif
-#endif
-
-
-/* Duplicate S, returning an identical malloc'd string.  */
-#if @GNULIB_WCSDUP@
-# if !@HAVE_WCSDUP@
-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s));
-# endif
-_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
-_GL_CXXALIASWARN (wcsdup);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsdup
-# if HAVE_RAW_DECL_WCSDUP
-_GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - "
-                 "use gnulib module wcsdup for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence of WC in WCS.  */
-#if @GNULIB_WCSCHR@
-# if !@HAVE_WCSCHR@
-_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
-                                     _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcschr (const wchar_t *, wchar_t);
-         wchar_t * std::wcschr (wchar_t *, wchar_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcschr,
-                        wchar_t *, (const wchar_t *, wchar_t),
-                        const wchar_t *, (const wchar_t *, wchar_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc));
-_GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# else
-_GL_CXXALIASWARN (wcschr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcschr
-# if HAVE_RAW_DECL_WCSCHR
-_GL_WARN_ON_USE (wcschr, "wcschr is unportable - "
-                 "use gnulib module wcschr for portability");
-# endif
-#endif
-
-
-/* Find the last occurrence of WC in WCS.  */
-#if @GNULIB_WCSRCHR@
-# if !@HAVE_WCSRCHR@
-_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
-                                      _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcsrchr (const wchar_t *, wchar_t);
-         wchar_t * std::wcsrchr (wchar_t *, wchar_t);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcsrchr,
-                        wchar_t *, (const wchar_t *, wchar_t),
-                        const wchar_t *, (const wchar_t *, wchar_t));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc));
-_GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# else
-_GL_CXXALIASWARN (wcsrchr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcsrchr
-# if HAVE_RAW_DECL_WCSRCHR
-_GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
-                 "use gnulib module wcsrchr for portability");
-# endif
-#endif
-
-
-/* Return the length of the initial segmet of WCS which consists entirely
-   of wide characters not in REJECT.  */
-#if @GNULIB_WCSCSPN@
-# if !@HAVE_WCSCSPN@
-_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)
-                                   _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject));
-_GL_CXXALIASWARN (wcscspn);
-#elif defined GNULIB_POSIXCHECK
-# undef wcscspn
-# if HAVE_RAW_DECL_WCSCSPN
-_GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
-                 "use gnulib module wcscspn for portability");
-# endif
-#endif
-
-
-/* Return the length of the initial segmet of WCS which consists entirely
-   of wide characters in ACCEPT.  */
-#if @GNULIB_WCSSPN@
-# if !@HAVE_WCSSPN@
-_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)
-                                  _GL_ATTRIBUTE_PURE);
-# endif
-_GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
-_GL_CXXALIASWARN (wcsspn);
-#elif defined GNULIB_POSIXCHECK
-# undef wcsspn
-# if HAVE_RAW_DECL_WCSSPN
-_GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - "
-                 "use gnulib module wcsspn for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence in WCS of any character in ACCEPT.  */
-#if @GNULIB_WCSPBRK@
-# if !@HAVE_WCSPBRK@
-_GL_FUNCDECL_SYS (wcspbrk, wchar_t *,
-                  (const wchar_t *wcs, const wchar_t *accept)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcspbrk (const wchar_t *, const wchar_t *);
-         wchar_t * std::wcspbrk (wchar_t *, const wchar_t *);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcspbrk,
-                        wchar_t *, (const wchar_t *, const wchar_t *),
-                        const wchar_t *, (const wchar_t *, const wchar_t *));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcspbrk, wchar_t *,
-                   (wchar_t *wcs, const wchar_t *accept));
-_GL_CXXALIASWARN1 (wcspbrk, const wchar_t *,
-                   (const wchar_t *wcs, const wchar_t *accept));
-# else
-_GL_CXXALIASWARN (wcspbrk);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcspbrk
-# if HAVE_RAW_DECL_WCSPBRK
-_GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
-                 "use gnulib module wcspbrk for portability");
-# endif
-#endif
-
-
-/* Find the first occurrence of NEEDLE in HAYSTACK.  */
-#if @GNULIB_WCSSTR@
-# if !@HAVE_WCSSTR@
-_GL_FUNCDECL_SYS (wcsstr, wchar_t *,
-                  (const wchar_t *haystack, const wchar_t *needle)
-                  _GL_ATTRIBUTE_PURE);
-# endif
-  /* On some systems, this function is defined as an overloaded function:
-       extern "C++" {
-         const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *);
-         wchar_t * std::wcsstr (wchar_t *, const wchar_t *);
-       }  */
-_GL_CXXALIAS_SYS_CAST2 (wcsstr,
-                        wchar_t *, (const wchar_t *, const wchar_t *),
-                        const wchar_t *, (const wchar_t *, const wchar_t *));
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-_GL_CXXALIASWARN1 (wcsstr, wchar_t *,
-                   (wchar_t *haystack, const wchar_t *needle));
-_GL_CXXALIASWARN1 (wcsstr, const wchar_t *,
-                   (const wchar_t *haystack, const wchar_t *needle));
-# else
-_GL_CXXALIASWARN (wcsstr);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef wcsstr
-# if HAVE_RAW_DECL_WCSSTR
-_GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
-                 "use gnulib module wcsstr for portability");
-# endif
-#endif
-
-
-/* Divide WCS into tokens separated by characters in DELIM.  */
-#if @GNULIB_WCSTOK@
-# if !@HAVE_WCSTOK@
-_GL_FUNCDECL_SYS (wcstok, wchar_t *,
-                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
-# endif
-_GL_CXXALIAS_SYS (wcstok, wchar_t *,
-                  (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
-_GL_CXXALIASWARN (wcstok);
-#elif defined GNULIB_POSIXCHECK
-# undef wcstok
-# if HAVE_RAW_DECL_WCSTOK
-_GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
-                 "use gnulib module wcstok for portability");
-# endif
-#endif
-
-
-/* Determine number of column positions required for first N wide
-   characters (or fewer if S ends before this) in S.  */
-#if @GNULIB_WCSWIDTH@
-# if @REPLACE_WCSWIDTH@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef wcswidth
-#   define wcswidth rpl_wcswidth
-#  endif
-_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)
-                                 _GL_ATTRIBUTE_PURE);
-_GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n));
-# else
-#  if !@HAVE_WCSWIDTH@
-_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)
-                                 _GL_ATTRIBUTE_PURE);
-#  endif
-_GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n));
-# endif
-_GL_CXXALIASWARN (wcswidth);
-#elif defined GNULIB_POSIXCHECK
-# undef wcswidth
-# if HAVE_RAW_DECL_WCSWIDTH
-_GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
-                 "use gnulib module wcswidth for portability");
-# endif
-#endif
-
-
-#endif /* _@GUARD_PREFIX@_WCHAR_H */
-#endif /* _@GUARD_PREFIX@_WCHAR_H */
+#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/wctype-h.c gettext-0.18.1.1/gettext-tools/libgettextpo/wctype-h.c
--- gettext-0.19.3/gettext-tools/libgettextpo/wctype-h.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wctype-h.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-/* Normally this would be wctype.c, but that name's already taken.  */
-#include <config.h>
-#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
-#include "wctype.h"
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/wctype.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/wctype.in.h
--- gettext-0.19.3/gettext-tools/libgettextpo/wctype.in.h	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wctype.in.h	2010-04-25 09:22:41.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible and Paul Eggert.  */
 
@@ -25,12 +26,11 @@
  * wctrans_t, and wctype_t are not yet implemented.
  */
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
+#ifndef _GL_WCTYPE_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 #if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
@@ -44,13 +44,6 @@
 # include <wchar.h>
 #endif
 
-/* mingw has declarations of towupper and towlower in <ctype.h> as
-   well <wctype.h>.  Include <ctype.h> in advance to avoid rpl_ prefix
-   being added to the declarations.  */
-#ifdef __MINGW32__
-# include <ctype.h>
-#endif
-
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
 /* The include_next requires a split double-inclusion guard.  */
@@ -58,34 +51,13 @@
 # @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
-#define _@GUARD_PREFIX@_WCTYPE_H
-
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef _GL_WCTYPE_INLINE
-# define _GL_WCTYPE_INLINE _GL_INLINE
-#endif
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
-/* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which
-   #defines a number of identifiers in the application namespace.  Revert
-   these #defines.  */
-#ifdef __sun
-# undef multibyte
-# undef eucw1
-# undef eucw2
-# undef eucw3
-# undef scrw1
-# undef scrw2
-# undef scrw3
-#endif
-
 /* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
 #if !@HAVE_WINT_T@ && !defined wint_t
 # define wint_t int
@@ -93,171 +65,153 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
-#  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
-typedef unsigned int rpl_wint_t;
-#   undef wint_t
-#   define wint_t rpl_wint_t
-#   define GNULIB_defined_wint_t 1
-#  endif
-# endif
 # ifndef WEOF
 #  define WEOF ((wint_t) -1)
 # endif
 #endif
 
 
-#if !GNULIB_defined_wctype_functions
-
 /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
    Linux libc5 has <wctype.h> and the functions but they are broken.
    Assume all 11 functions (all isw* except iswblank) are implemented the
    same way, or not at all.  */
-# if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
+#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
 
 /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
    undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
    refer to system functions like _iswctype that are not in the
    standard C library.  Rather than try to get ancient buggy
    implementations like this to work, just disable them.  */
-#  undef iswalnum
-#  undef iswalpha
-#  undef iswblank
-#  undef iswcntrl
-#  undef iswdigit
-#  undef iswgraph
-#  undef iswlower
-#  undef iswprint
-#  undef iswpunct
-#  undef iswspace
-#  undef iswupper
-#  undef iswxdigit
-#  undef towlower
-#  undef towupper
+# undef iswalnum
+# undef iswalpha
+# undef iswblank
+# undef iswcntrl
+# undef iswdigit
+# undef iswgraph
+# undef iswlower
+# undef iswprint
+# undef iswpunct
+# undef iswspace
+# undef iswupper
+# undef iswxdigit
+# undef towlower
+# undef towupper
 
 /* Linux libc5 has <wctype.h> and the functions but they are broken.  */
-#  if @REPLACE_ISWCNTRL@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define iswalnum rpl_iswalnum
-#    define iswalpha rpl_iswalpha
-#    define iswblank rpl_iswblank
-#    define iswcntrl rpl_iswcntrl
-#    define iswdigit rpl_iswdigit
-#    define iswgraph rpl_iswgraph
-#    define iswlower rpl_iswlower
-#    define iswprint rpl_iswprint
-#    define iswpunct rpl_iswpunct
-#    define iswspace rpl_iswspace
-#    define iswupper rpl_iswupper
-#    define iswxdigit rpl_iswxdigit
-#   endif
-#  endif
-#  if @REPLACE_TOWLOWER@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define towlower rpl_towlower
-#    define towupper rpl_towupper
-#   endif
+# if @REPLACE_ISWCNTRL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define iswalnum rpl_iswalnum
+#   define iswalpha rpl_iswalpha
+#   define iswblank rpl_iswblank
+#   define iswcntrl rpl_iswcntrl
+#   define iswdigit rpl_iswdigit
+#   define iswgraph rpl_iswgraph
+#   define iswlower rpl_iswlower
+#   define iswprint rpl_iswprint
+#   define iswpunct rpl_iswpunct
+#   define iswspace rpl_iswspace
+#   define iswupper rpl_iswupper
+#   define iswxdigit rpl_iswxdigit
+#   define towlower rpl_towlower
+#   define towupper rpl_towupper
 #  endif
+# endif
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswalnum
-#  else
+# else
 iswalnum
-#  endif
+# endif
          (wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
           || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswalpha
-#  else
+# else
 iswalpha
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswblank
-#  else
+# else
 iswblank
-#  endif
+# endif
          (wint_t wc)
 {
   return wc == ' ' || wc == '\t';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswcntrl
-#  else
+# else
 iswcntrl
-#  endif
+# endif
         (wint_t wc)
 {
   return (wc & ~0x1f) == 0 || wc == 0x7f;
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswdigit
-#  else
+# else
 iswdigit
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= '0' && wc <= '9';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswgraph
-#  else
+# else
 iswgraph
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= '!' && wc <= '~';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswlower
-#  else
+# else
 iswlower
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= 'a' && wc <= 'z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswprint
-#  else
+# else
 iswprint
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= ' ' && wc <= '~';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswpunct
-#  else
+# else
 iswpunct
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= '!' && wc <= '~'
@@ -265,78 +219,75 @@
                || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswspace
-#  else
+# else
 iswspace
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc == ' ' || wc == '\t'
           || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswupper
-#  else
+# else
 iswupper
-#  endif
+# endif
          (wint_t wc)
 {
   return wc >= 'A' && wc <= 'Z';
 }
 
-_GL_WCTYPE_INLINE int
-#  if @REPLACE_ISWCNTRL@
+static inline int
+# if @REPLACE_ISWCNTRL@
 rpl_iswxdigit
-#  else
+# else
 iswxdigit
-#  endif
+# endif
           (wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
           || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
 }
 
-_GL_WCTYPE_INLINE wint_t
-#  if @REPLACE_TOWLOWER@
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
 rpl_towlower
-#  else
+# else
 towlower
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
 }
 
-_GL_WCTYPE_INLINE wint_t
-#  if @REPLACE_TOWLOWER@
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
 rpl_towupper
-#  else
+# else
 towupper
-#  endif
+# endif
          (wint_t wc)
 {
   return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
 }
 
-# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@)
+#elif ! @HAVE_ISWBLANK@
 /* Only the iswblank function is missing.  */
 
-#  if @REPLACE_ISWBLANK@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define iswblank rpl_iswblank
-#   endif
-_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc));
-#  else
-_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
-#  endif
+static inline int
+iswblank (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
 
-# endif
+#endif
 
-# if defined __MINGW32__
+#if defined __MINGW32__
 
 /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t.
    The functions towlower and towupper are implemented in the MSVCRT library
@@ -351,32 +302,30 @@
       result register.  We need to fix this by adding a zero-extend from
       wchar_t to wint_t after the call.  */
 
-_GL_WCTYPE_INLINE wint_t
+static inline wint_t
 rpl_towlower (wint_t wc)
 {
   return (wint_t) (wchar_t) towlower (wc);
 }
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define towlower rpl_towlower
-#  endif
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towlower rpl_towlower
+# endif
 
-_GL_WCTYPE_INLINE wint_t
+static inline wint_t
 rpl_towupper (wint_t wc)
 {
   return (wint_t) (wchar_t) towupper (wc);
 }
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define towupper rpl_towupper
-#  endif
-
-# endif /* __MINGW32__ */
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towupper rpl_towupper
+# endif
 
-# define GNULIB_defined_wctype_functions 1
-#endif
+#endif /* __MINGW32__ */
 
 #if @REPLACE_ISWCNTRL@
 _GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc));
 _GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc));
@@ -389,6 +338,7 @@
 #else
 _GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc));
 _GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc));
@@ -401,6 +351,7 @@
 #endif
 _GL_CXXALIASWARN (iswalnum);
 _GL_CXXALIASWARN (iswalpha);
+_GL_CXXALIASWARN (iswblank);
 _GL_CXXALIASWARN (iswcntrl);
 _GL_CXXALIASWARN (iswdigit);
 _GL_CXXALIASWARN (iswgraph);
@@ -411,55 +362,7 @@
 _GL_CXXALIASWARN (iswupper);
 _GL_CXXALIASWARN (iswxdigit);
 
-#if @GNULIB_ISWBLANK@
-# if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@
-_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
-# else
-_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
-# endif
-_GL_CXXALIASWARN (iswblank);
-#endif
-
-#if !@HAVE_WCTYPE_T@
-# if !GNULIB_defined_wctype_t
-typedef void * wctype_t;
-#  define GNULIB_defined_wctype_t 1
-# endif
-#endif
-
-/* Get a descriptor for a wide character property.  */
-#if @GNULIB_WCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name));
-# endif
-_GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name));
-_GL_CXXALIASWARN (wctype);
-#elif defined GNULIB_POSIXCHECK
-# undef wctype
-# if HAVE_RAW_DECL_WCTYPE
-_GL_WARN_ON_USE (wctype, "wctype is unportable - "
-                 "use gnulib module wctype for portability");
-# endif
-#endif
-
-/* Test whether a wide character has a given property.
-   The argument WC must be either a wchar_t value or WEOF.
-   The argument DESC must have been returned by the wctype() function.  */
-#if @GNULIB_ISWCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
-# endif
-_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
-_GL_CXXALIASWARN (iswctype);
-#elif defined GNULIB_POSIXCHECK
-# undef iswctype
-# if HAVE_RAW_DECL_ISWCTYPE
-_GL_WARN_ON_USE (iswctype, "iswctype is unportable - "
-                 "use gnulib module iswctype for portability");
-# endif
-#endif
-
-#if @REPLACE_TOWLOWER@ || defined __MINGW32__
+#if @REPLACE_ISWCNTRL@ || defined __MINGW32__
 _GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
 _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));
 #else
@@ -469,46 +372,6 @@
 _GL_CXXALIASWARN (towlower);
 _GL_CXXALIASWARN (towupper);
 
-#if !@HAVE_WCTRANS_T@
-# if !GNULIB_defined_wctrans_t
-typedef void * wctrans_t;
-#  define GNULIB_defined_wctrans_t 1
-# endif
-#endif
-
-/* Get a descriptor for a wide character case conversion.  */
-#if @GNULIB_WCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name));
-# endif
-_GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name));
-_GL_CXXALIASWARN (wctrans);
-#elif defined GNULIB_POSIXCHECK
-# undef wctrans
-# if HAVE_RAW_DECL_WCTRANS
-_GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
-                 "use gnulib module wctrans for portability");
-# endif
-#endif
-
-/* Perform a given case conversion on a wide character.
-   The argument WC must be either a wchar_t value or WEOF.
-   The argument DESC must have been returned by the wctrans() function.  */
-#if @GNULIB_TOWCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
-# endif
-_GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
-_GL_CXXALIASWARN (towctrans);
-#elif defined GNULIB_POSIXCHECK
-# undef towctrans
-# if HAVE_RAW_DECL_TOWCTRANS
-_GL_WARN_ON_USE (towctrans, "towctrans is unportable - "
-                 "use gnulib module towctrans for portability");
-# endif
-#endif
-
-_GL_INLINE_HEADER_END
 
-#endif /* _@GUARD_PREFIX@_WCTYPE_H */
-#endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/wcwidth.c gettext-0.18.1.1/gettext-tools/libgettextpo/wcwidth.c
--- gettext-0.19.3/gettext-tools/libgettextpo/wcwidth.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wcwidth.c	2010-04-25 09:22:41.000000000 +0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc.
 
    This 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 @@
 {
   /* In UTF-8 locales, use a Unicode aware width function.  */
   const char *encoding = locale_charset ();
-  if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
+  if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
     {
       /* We assume that in a UTF-8 locale, a wide character is the same as a
          Unicode character.  */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xasprintf.c gettext-0.18.1.1/gettext-tools/libgettextpo/xasprintf.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xasprintf.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xasprintf.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation,
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xconcat-filename.c gettext-0.18.1.1/gettext-tools/libgettextpo/xconcat-filename.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xconcat-filename.c	2014-10-16 06:01:06.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xconcat-filename.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc.
 
    This 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/xmalloca.c gettext-0.18.1.1/gettext-tools/libgettextpo/xmalloca.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xmalloca.c	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xmalloca.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/xmalloca.h gettext-0.18.1.1/gettext-tools/libgettextpo/xmalloca.h
--- gettext-0.19.3/gettext-tools/libgettextpo/xmalloca.h	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xmalloca.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2007, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/libgettextpo/xmalloc.c gettext-0.18.1.1/gettext-tools/libgettextpo/xmalloc.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xmalloc.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xmalloc.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007 Free Software Foundation, Inc.
 
    This program 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 @@
 xalloc_die ()
 {
   error (xmalloc_exit_failure, 0, _("memory exhausted"));
-  /* _Noreturn cannot be given to error, since it may return if
+  /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the
      xalloc_die does terminate, call exit. */
   exit (EXIT_FAILURE);
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xsize.c gettext-0.18.1.1/gettext-tools/libgettextpo/xsize.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xsize.c	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xsize.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#include <config.h>
-#define XSIZE_INLINE _GL_EXTERN_INLINE
-#include "xsize.h"
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xsize.h gettext-0.18.1.1/gettext-tools/libgettextpo/xsize.h
--- gettext-0.19.3/gettext-tools/libgettextpo/xsize.h	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xsize.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _XSIZE_H
 #define _XSIZE_H
@@ -27,14 +28,6 @@
 # include <stdint.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef XSIZE_INLINE
-# define XSIZE_INLINE _GL_INLINE
-#endif
-
 /* The size of memory objects is often computed through expressions of
    type size_t. Example:
       void* p = malloc (header_size + n * element_size).
@@ -56,7 +49,7 @@
   ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
 
 /* Sum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -67,7 +60,7 @@
 }
 
 /* Sum of three sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -77,7 +70,7 @@
 }
 
 /* Sum of four sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -87,7 +80,7 @@
 }
 
 /* Maximum of two sizes, with overflow check.  */
-XSIZE_INLINE size_t
+static inline size_t
 #if __GNUC__ >= 3
 __attribute__ ((__pure__))
 #endif
@@ -100,7 +93,7 @@
 
 /* Multiplication of a count with an element size, with overflow check.
    The count must be >= 0 and the element size must be > 0.
-   This is a macro, not a function, so that it works correctly even
+   This is a macro, not an inline function, so that it works correctly even
    when N is of a wider type and N > SIZE_MAX.  */
 #define xtimes(N, ELSIZE) \
   ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
@@ -112,6 +105,4 @@
 #define size_in_bounds_p(SIZE) \
   ((SIZE) != SIZE_MAX)
 
-_GL_INLINE_HEADER_END
-
 #endif /* _XSIZE_H */
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xstriconv.c gettext-0.18.1.1/gettext-tools/libgettextpo/xstriconv.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xstriconv.c	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xstriconv.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xstriconv.h gettext-0.18.1.1/gettext-tools/libgettextpo/xstriconv.h
--- gettext-0.19.3/gettext-tools/libgettextpo/xstriconv.h	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xstriconv.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xvasprintf.c gettext-0.18.1.1/gettext-tools/libgettextpo/xvasprintf.c
--- gettext-0.19.3/gettext-tools/libgettextpo/xvasprintf.c	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xvasprintf.c	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-static char *
+static inline char *
 xstrcat (size_t argcount, va_list args)
 {
   char *result;
diff -Nru gettext-0.19.3/gettext-tools/libgettextpo/xvasprintf.h gettext-0.18.1.1/gettext-tools/libgettextpo/xvasprintf.h
--- gettext-0.19.3/gettext-tools/libgettextpo/xvasprintf.h	2014-10-16 06:01:07.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/xvasprintf.h	2010-02-16 21:33:16.000000000 +0000
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,16 +20,16 @@
 /* Get va_list.  */
 #include <stdarg.h>
 
+#ifndef __attribute__
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The __-protected variants of the attributes 'format' and 'printf' are
    accepted by gcc versions 2.6.4 (effectively 2.7) and later.
-   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   We enable __attribute__ only if these are supported too, because
    gnulib and libintl do '#define printf __printf__' when they override
    the 'printf' function.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
 #endif
 
 #ifdef __cplusplus
@@ -44,9 +44,9 @@
      - [EILSEQ] error during conversion between wide and multibyte characters,
    return NULL.  */
 extern char *xasprintf (const char *format, ...)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
+       __attribute__ ((__format__ (__printf__, 1, 2)));
 extern char *xvasprintf (const char *format, va_list args)
-       _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 0));
+       __attribute__ ((__format__ (__printf__, 1, 0)));
 
 #ifdef __cplusplus
 }
diff -Nru gettext-0.19.3/gettext-tools/libgrep/btowc.c gettext-0.18.1.1/gettext-tools/libgrep/btowc.c
--- gettext-0.19.3/gettext-tools/libgrep/btowc.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/btowc.c	2010-05-24 14:49:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010 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 -Nru gettext-0.19.3/gettext-tools/libgrep/ChangeLog gettext-0.18.1.1/gettext-tools/libgrep/ChangeLog
--- gettext-0.19.3/gettext-tools/libgrep/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,38 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-04-22  Roumen Petrov  <bugtrack@roumenpetrov.info>  (tiny change)
-
-	build: Use Automake 'subdir-objects' option
-	* Makefile.am (AUTOMAKE_OPTIONS): Add 'subdir-objects'.
-
-2013-12-05  Ivailo  <xakepa10@gmail.com>  (tiny change)
-
-	libgrep: Fix issues detected by gcc -Wformat-security
-	* m-fgrep.c (Fcompile): Supply FORMAT argument of error.
-	* m-regex.c (compile): Likewise.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-06-03  Jim Meyering  <jim@meyering.net>
-
-	* kwset.c: Spelling fixes.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/libgrep/dummy.c gettext-0.18.1.1/gettext-tools/libgrep/dummy.c
--- gettext-0.19.3/gettext-tools/libgrep/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/dummy.c	2010-05-24 14:49:26.000000000 +0000
@@ -0,0 +1,42 @@
+/* A dummy file, to prevent empty libraries from breaking builds.
+   Copyright (C) 2004, 2007, 2009, 2010 Free Software Foundation, Inc.
+
+   This 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/>.  */
+
+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
+   libraries without any object files.  You might get an error like:
+
+   > ar cru .libs/libgl.a
+   > ar: no archive members specified
+
+   Compiling this file, and adding its object file to the library, will
+   prevent the library from being empty.  */
+
+/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries
+   that don't export any symbol.  You might get an error like:
+
+   > cc ... libgnu.a
+   > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a
+
+   Compiling this file, and adding its object file to the library, will
+   prevent the library from exporting no symbols.  */
+
+#ifdef __sun
+/* This declaration ensures that the library will export at least 1 symbol.  */
+int gl_dummy_symbol;
+#else
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;
+#endif
diff -Nru gettext-0.19.3/gettext-tools/libgrep/glthread/lock.c gettext-0.18.1.1/gettext-tools/libgrep/glthread/lock.c
--- gettext-0.19.3/gettext-tools/libgrep/glthread/lock.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/glthread/lock.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1057 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-#include <config.h>
-
-#include "glthread/lock.h"
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  if !defined PTHREAD_RWLOCK_INITIALIZER
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_rwlock_init (&lock->rwlock, NULL);
-  if (err != 0)
-    return err;
-  lock->initialized = 1;
-  return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_rwlock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_rwlock_rdlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_rwlock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_rwlock_wrlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    return EINVAL;
-  return pthread_rwlock_unlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  if (!lock->initialized)
-    return EINVAL;
-  err = pthread_rwlock_destroy (&lock->rwlock);
-  if (err != 0)
-    return err;
-  lock->initialized = 0;
-  return 0;
-}
-
-#  endif
-
-# else
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_init (&lock->lock, NULL);
-  if (err != 0)
-    return err;
-  err = pthread_cond_init (&lock->waiting_readers, NULL);
-  if (err != 0)
-    return err;
-  err = pthread_cond_init (&lock->waiting_writers, NULL);
-  if (err != 0)
-    return err;
-  lock->waiting_writers_count = 0;
-  lock->runcount = 0;
-  return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  /* POSIX says: "It is implementation-defined whether the calling thread
-     acquires the lock when a writer does not hold the lock and there are
-     writers blocked on the lock."  Let's say, no: give the writers a higher
-     priority.  */
-  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_readers.  */
-      err = pthread_cond_wait (&lock->waiting_readers, &lock->lock);
-      if (err != 0)
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return err;
-        }
-    }
-  lock->runcount++;
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  /* Test whether no readers or writers are currently running.  */
-  while (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_writers.  */
-      lock->waiting_writers_count++;
-      err = pthread_cond_wait (&lock->waiting_writers, &lock->lock);
-      if (err != 0)
-        {
-          lock->waiting_writers_count--;
-          pthread_mutex_unlock (&lock->lock);
-          return err;
-        }
-      lock->waiting_writers_count--;
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return EINVAL;
-        }
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return EINVAL;
-        }
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-         locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers_count > 0)
-        {
-          /* Wake up one of the waiting writers.  */
-          err = pthread_cond_signal (&lock->waiting_writers);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->lock);
-              return err;
-            }
-        }
-      else
-        {
-          /* Wake up all waiting readers.  */
-          err = pthread_cond_broadcast (&lock->waiting_readers);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->lock);
-              return err;
-            }
-        }
-    }
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_destroy (&lock->lock);
-  if (err != 0)
-    return err;
-  err = pthread_cond_destroy (&lock->waiting_readers);
-  if (err != 0)
-    return err;
-  err = pthread_cond_destroy (&lock->waiting_writers);
-  if (err != 0)
-    return err;
-  return 0;
-}
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-  int err;
-
-  err = pthread_mutexattr_init (&attributes);
-  if (err != 0)
-    return err;
-  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutex_init (lock, &attributes);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutexattr_destroy (&attributes);
-  if (err != 0)
-    return err;
-  return 0;
-}
-
-#  else
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-  int err;
-
-  err = pthread_mutexattr_init (&attributes);
-  if (err != 0)
-    return err;
-  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutex_init (&lock->recmutex, &attributes);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutexattr_destroy (&attributes);
-  if (err != 0)
-    return err;
-  lock->initialized = 1;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_recursive_lock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_mutex_lock (&lock->recmutex);
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    return EINVAL;
-  return pthread_mutex_unlock (&lock->recmutex);
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  if (!lock->initialized)
-    return EINVAL;
-  err = pthread_mutex_destroy (&lock->recmutex);
-  if (err != 0)
-    return err;
-  lock->initialized = 0;
-  return 0;
-}
-
-#  endif
-
-# else
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_init (&lock->mutex, NULL);
-  if (err != 0)
-    return err;
-  lock->owner = (pthread_t) 0;
-  lock->depth = 0;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_t self = pthread_self ();
-  if (lock->owner != self)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->mutex);
-      if (err != 0)
-        return err;
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    {
-      lock->depth--;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != pthread_self ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (pthread_t) 0;
-      return pthread_mutex_unlock (&lock->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (pthread_t) 0)
-    return EBUSY;
-  return pthread_mutex_destroy (&lock->mutex);
-}
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
-
-int
-glthread_once_singlethreaded (pthread_once_t *once_control)
-{
-  /* We don't know whether pthread_once_t is an integer type, a floating-point
-     type, a pointer type, or a structure type.  */
-  char *firstbyte = (char *)once_control;
-  if (*firstbyte == *(const char *)&fresh_once)
-    {
-      /* First time use of once_control.  Invert the first byte.  */
-      *firstbyte = ~ *(const char *)&fresh_once;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static void
-glthread_once_call (void *arg)
-{
-  void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
-  void (*initfunction) (void) = *gl_once_temp_addr;
-  initfunction ();
-}
-
-int
-glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void))
-{
-  void (*temp) (void) = initfunction;
-  return (!pth_once (once_control, glthread_once_call, &temp) ? errno : 0);
-}
-
-int
-glthread_once_singlethreaded (pth_once_t *once_control)
-{
-  /* We know that pth_once_t is an integer type.  */
-  if (*once_control == PTH_ONCE_INIT)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      *once_control = ~ PTH_ONCE_INIT;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  err = mutex_init (&lock->mutex, USYNC_THREAD, NULL);
-  if (err != 0)
-    return err;
-  lock->owner = (thread_t) 0;
-  lock->depth = 0;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  thread_t self = thr_self ();
-  if (lock->owner != self)
-    {
-      int err;
-
-      err = mutex_lock (&lock->mutex);
-      if (err != 0)
-        return err;
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    {
-      lock->depth--;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != thr_self ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (thread_t) 0;
-      return mutex_unlock (&lock->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (thread_t) 0)
-    return EBUSY;
-  return mutex_destroy (&lock->mutex);
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-int
-glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (!once_control->inited)
-    {
-      int err;
-
-      /* Use the mutex to guarantee that if another thread is already calling
-         the initfunction, this thread waits until it's finished.  */
-      err = mutex_lock (&once_control->mutex);
-      if (err != 0)
-        return err;
-      if (!once_control->inited)
-        {
-          once_control->inited = 1;
-          initfunction ();
-        }
-      return mutex_unlock (&once_control->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_once_singlethreaded (gl_once_t *once_control)
-{
-  /* We know that gl_once_t contains an integer type.  */
-  if (!once_control->inited)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      once_control->inited = ~ 0;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-void
-glthread_lock_init_func (gl_lock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-int
-glthread_lock_lock_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_lock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_lock_unlock_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_lock_destroy_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* In this file, the waitqueues are implemented as circular arrays.  */
-#define gl_waitqueue_t gl_carray_waitqueue_t
-
-static void
-gl_waitqueue_init (gl_waitqueue_t *wq)
-{
-  wq->array = NULL;
-  wq->count = 0;
-  wq->alloc = 0;
-  wq->offset = 0;
-}
-
-/* Enqueues the current thread, represented by an event, in a wait queue.
-   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
-static HANDLE
-gl_waitqueue_add (gl_waitqueue_t *wq)
-{
-  HANDLE event;
-  unsigned int index;
-
-  if (wq->count == wq->alloc)
-    {
-      unsigned int new_alloc = 2 * wq->alloc + 1;
-      HANDLE *new_array =
-        (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
-      if (new_array == NULL)
-        /* No more memory.  */
-        return INVALID_HANDLE_VALUE;
-      /* Now is a good opportunity to rotate the array so that its contents
-         starts at offset 0.  */
-      if (wq->offset > 0)
-        {
-          unsigned int old_count = wq->count;
-          unsigned int old_alloc = wq->alloc;
-          unsigned int old_offset = wq->offset;
-          unsigned int i;
-          if (old_offset + old_count > old_alloc)
-            {
-              unsigned int limit = old_offset + old_count - old_alloc;
-              for (i = 0; i < limit; i++)
-                new_array[old_alloc + i] = new_array[i];
-            }
-          for (i = 0; i < old_count; i++)
-            new_array[i] = new_array[old_offset + i];
-          wq->offset = 0;
-        }
-      wq->array = new_array;
-      wq->alloc = new_alloc;
-    }
-  /* Whether the created event is a manual-reset one or an auto-reset one,
-     does not matter, since we will wait on it only once.  */
-  event = CreateEvent (NULL, TRUE, FALSE, NULL);
-  if (event == INVALID_HANDLE_VALUE)
-    /* No way to allocate an event.  */
-    return INVALID_HANDLE_VALUE;
-  index = wq->offset + wq->count;
-  if (index >= wq->alloc)
-    index -= wq->alloc;
-  wq->array[index] = event;
-  wq->count++;
-  return event;
-}
-
-/* Notifies the first thread from a wait queue and dequeues it.  */
-static void
-gl_waitqueue_notify_first (gl_waitqueue_t *wq)
-{
-  SetEvent (wq->array[wq->offset + 0]);
-  wq->offset++;
-  wq->count--;
-  if (wq->count == 0 || wq->offset == wq->alloc)
-    wq->offset = 0;
-}
-
-/* Notifies all threads from a wait queue and dequeues them all.  */
-static void
-gl_waitqueue_notify_all (gl_waitqueue_t *wq)
-{
-  unsigned int i;
-
-  for (i = 0; i < wq->count; i++)
-    {
-      unsigned int index = wq->offset + i;
-      if (index >= wq->alloc)
-        index -= wq->alloc;
-      SetEvent (wq->array[index]);
-    }
-  wq->count = 0;
-  wq->offset = 0;
-}
-
-void
-glthread_rwlock_init_func (gl_rwlock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  gl_waitqueue_init (&lock->waiting_readers);
-  gl_waitqueue_init (&lock->waiting_writers);
-  lock->runcount = 0;
-  lock->guard.done = 1;
-}
-
-int
-glthread_rwlock_rdlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_rwlock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  if (!(lock->runcount + 1 > 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_readers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
-      if (event != INVALID_HANDLE_VALUE)
-        {
-          DWORD result;
-          LeaveCriticalSection (&lock->lock);
-          /* Wait until another thread signals this event.  */
-          result = WaitForSingleObject (event, INFINITE);
-          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-            abort ();
-          CloseHandle (event);
-          /* The thread which signalled the event already did the bookkeeping:
-             removed us from the waiting_readers, incremented lock->runcount.  */
-          if (!(lock->runcount > 0))
-            abort ();
-          return 0;
-        }
-      else
-        {
-          /* Allocation failure.  Weird.  */
-          do
-            {
-              LeaveCriticalSection (&lock->lock);
-              Sleep (1);
-              EnterCriticalSection (&lock->lock);
-            }
-          while (!(lock->runcount + 1 > 0));
-        }
-    }
-  lock->runcount++;
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_wrlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_rwlock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether no readers or writers are currently running.  */
-  if (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_writers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
-      if (event != INVALID_HANDLE_VALUE)
-        {
-          DWORD result;
-          LeaveCriticalSection (&lock->lock);
-          /* Wait until another thread signals this event.  */
-          result = WaitForSingleObject (event, INFINITE);
-          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-            abort ();
-          CloseHandle (event);
-          /* The thread which signalled the event already did the bookkeeping:
-             removed us from the waiting_writers, set lock->runcount = -1.  */
-          if (!(lock->runcount == -1))
-            abort ();
-          return 0;
-        }
-      else
-        {
-          /* Allocation failure.  Weird.  */
-          do
-            {
-              LeaveCriticalSection (&lock->lock);
-              Sleep (1);
-              EnterCriticalSection (&lock->lock);
-            }
-          while (!(lock->runcount == 0));
-        }
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_unlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  EnterCriticalSection (&lock->lock);
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-        abort ();
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-        {
-          LeaveCriticalSection (&lock->lock);
-          return EPERM;
-        }
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-         locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers.count > 0)
-        {
-          /* Wake up one of the waiting writers.  */
-          lock->runcount--;
-          gl_waitqueue_notify_first (&lock->waiting_writers);
-        }
-      else
-        {
-          /* Wake up all waiting readers.  */
-          lock->runcount += lock->waiting_readers.count;
-          gl_waitqueue_notify_all (&lock->waiting_readers);
-        }
-    }
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_destroy_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  if (lock->runcount != 0)
-    return EBUSY;
-  DeleteCriticalSection (&lock->lock);
-  if (lock->waiting_readers.array != NULL)
-    free (lock->waiting_readers.array);
-  if (lock->waiting_writers.array != NULL)
-    free (lock->waiting_writers.array);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-void
-glthread_recursive_lock_init_func (gl_recursive_lock_t *lock)
-{
-  lock->owner = 0;
-  lock->depth = 0;
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-int
-glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_recursive_lock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  {
-    DWORD self = GetCurrentThreadId ();
-    if (lock->owner != self)
-      {
-        EnterCriticalSection (&lock->lock);
-        lock->owner = self;
-      }
-    if (++(lock->depth) == 0) /* wraparound? */
-      {
-        lock->depth--;
-        return EAGAIN;
-      }
-  }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != GetCurrentThreadId ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = 0;
-      LeaveCriticalSection (&lock->lock);
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != 0)
-    return EBUSY;
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once_func (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (once_control->inited <= 0)
-    {
-      if (InterlockedIncrement (&once_control->started) == 0)
-        {
-          /* This thread is the first one to come to this once_control.  */
-          InitializeCriticalSection (&once_control->lock);
-          EnterCriticalSection (&once_control->lock);
-          once_control->inited = 0;
-          initfunction ();
-          once_control->inited = 1;
-          LeaveCriticalSection (&once_control->lock);
-        }
-      else
-        {
-          /* Undo last operation.  */
-          InterlockedDecrement (&once_control->started);
-          /* Some other thread has already started the initialization.
-             Yield the CPU while waiting for the other thread to finish
-             initializing and taking the lock.  */
-          while (once_control->inited < 0)
-            Sleep (0);
-          if (once_control->inited <= 0)
-            {
-              /* Take the lock.  This blocks until the other thread has
-                 finished calling the initfunction.  */
-              EnterCriticalSection (&once_control->lock);
-              LeaveCriticalSection (&once_control->lock);
-              if (!(once_control->inited > 0))
-                abort ();
-            }
-        }
-    }
-}
-
-#endif
-
-/* ========================================================================= */
diff -Nru gettext-0.19.3/gettext-tools/libgrep/glthread/lock.h gettext-0.18.1.1/gettext-tools/libgrep/glthread/lock.h
--- gettext-0.19.3/gettext-tools/libgrep/glthread/lock.h	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/glthread/lock.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,927 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-/* This file contains locking primitives for use with a given thread library.
-   It does not contain primitives for creating threads or for other
-   synchronization primitives.
-
-   Normal (non-recursive) locks:
-     Type:                gl_lock_t
-     Declaration:         gl_lock_define(extern, name)
-     Initializer:         gl_lock_define_initialized(, name)
-     Initialization:      gl_lock_init (name);
-     Taking the lock:     gl_lock_lock (name);
-     Releasing the lock:  gl_lock_unlock (name);
-     De-initialization:   gl_lock_destroy (name);
-   Equivalent functions with control of error handling:
-     Initialization:      err = glthread_lock_init (&name);
-     Taking the lock:     err = glthread_lock_lock (&name);
-     Releasing the lock:  err = glthread_lock_unlock (&name);
-     De-initialization:   err = glthread_lock_destroy (&name);
-
-   Read-Write (non-recursive) locks:
-     Type:                gl_rwlock_t
-     Declaration:         gl_rwlock_define(extern, name)
-     Initializer:         gl_rwlock_define_initialized(, name)
-     Initialization:      gl_rwlock_init (name);
-     Taking the lock:     gl_rwlock_rdlock (name);
-                          gl_rwlock_wrlock (name);
-     Releasing the lock:  gl_rwlock_unlock (name);
-     De-initialization:   gl_rwlock_destroy (name);
-   Equivalent functions with control of error handling:
-     Initialization:      err = glthread_rwlock_init (&name);
-     Taking the lock:     err = glthread_rwlock_rdlock (&name);
-                          err = glthread_rwlock_wrlock (&name);
-     Releasing the lock:  err = glthread_rwlock_unlock (&name);
-     De-initialization:   err = glthread_rwlock_destroy (&name);
-
-   Recursive locks:
-     Type:                gl_recursive_lock_t
-     Declaration:         gl_recursive_lock_define(extern, name)
-     Initializer:         gl_recursive_lock_define_initialized(, name)
-     Initialization:      gl_recursive_lock_init (name);
-     Taking the lock:     gl_recursive_lock_lock (name);
-     Releasing the lock:  gl_recursive_lock_unlock (name);
-     De-initialization:   gl_recursive_lock_destroy (name);
-   Equivalent functions with control of error handling:
-     Initialization:      err = glthread_recursive_lock_init (&name);
-     Taking the lock:     err = glthread_recursive_lock_lock (&name);
-     Releasing the lock:  err = glthread_recursive_lock_unlock (&name);
-     De-initialization:   err = glthread_recursive_lock_destroy (&name);
-
-  Once-only execution:
-     Type:                gl_once_t
-     Initializer:         gl_once_define(extern, name)
-     Execution:           gl_once (name, initfunction);
-   Equivalent functions with control of error handling:
-     Execution:           err = glthread_once (&name, initfunction);
-*/
-
-
-#ifndef _LOCK_H
-#define _LOCK_H
-
-#include <errno.h>
-#include <stdlib.h>
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# include <pthread.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The pthread_in_use() detection needs to be done at runtime.  */
-#  define pthread_in_use() \
-     glthread_in_use ()
-extern int glthread_in_use (void);
-
-# endif
-
-# if USE_POSIX_THREADS_WEAK
-
-/* Use weak references to the POSIX threads library.  */
-
-/* Weak references avoid dragging in external libraries if the other parts
-   of the program don't use them.  Here we use them, because we don't want
-   every program that uses libintl to depend on libpthread.  This assumes
-   that libpthread would not be loaded after libintl; i.e. if libintl is
-   loaded first, by an executable that does not depend on libpthread, and
-   then a module is dynamically loaded that depends on libpthread, libintl
-   will not be multithread-safe.  */
-
-/* The way to test at runtime whether libpthread is present is to test
-   whether a function pointer's value, such as &pthread_mutex_init, is
-   non-NULL.  However, some versions of GCC have a bug through which, in
-   PIC mode, &foo != NULL always evaluates to true if there is a direct
-   call to foo(...) in the same function.  To avoid this, we test the
-   address of a function in libpthread that we don't use.  */
-
-#  pragma weak pthread_mutex_init
-#  pragma weak pthread_mutex_lock
-#  pragma weak pthread_mutex_unlock
-#  pragma weak pthread_mutex_destroy
-#  pragma weak pthread_rwlock_init
-#  pragma weak pthread_rwlock_rdlock
-#  pragma weak pthread_rwlock_wrlock
-#  pragma weak pthread_rwlock_unlock
-#  pragma weak pthread_rwlock_destroy
-#  pragma weak pthread_once
-#  pragma weak pthread_cond_init
-#  pragma weak pthread_cond_wait
-#  pragma weak pthread_cond_signal
-#  pragma weak pthread_cond_broadcast
-#  pragma weak pthread_cond_destroy
-#  pragma weak pthread_mutexattr_init
-#  pragma weak pthread_mutexattr_settype
-#  pragma weak pthread_mutexattr_destroy
-#  ifndef pthread_self
-#   pragma weak pthread_self
-#  endif
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   pragma weak pthread_cancel
-#   define pthread_in_use() (pthread_cancel != NULL)
-#  endif
-
-# else
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   define pthread_in_use() 1
-#  endif
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pthread_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    PTHREAD_MUTEX_INITIALIZER
-# define glthread_lock_init(LOCK) \
-    (pthread_in_use () ? pthread_mutex_init (LOCK, NULL) : 0)
-# define glthread_lock_lock(LOCK) \
-    (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
-# define glthread_lock_unlock(LOCK) \
-    (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
-# define glthread_lock_destroy(LOCK) \
-    (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  ifdef PTHREAD_RWLOCK_INITIALIZER
-
-typedef pthread_rwlock_t gl_rwlock_t;
-#   define gl_rwlock_define(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_rwlock_t NAME;
-#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer;
-#   define gl_rwlock_initializer \
-      PTHREAD_RWLOCK_INITIALIZER
-#   define glthread_rwlock_init(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0)
-#   define glthread_rwlock_rdlock(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_rdlock (LOCK) : 0)
-#   define glthread_rwlock_wrlock(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_wrlock (LOCK) : 0)
-#   define glthread_rwlock_unlock(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_unlock (LOCK) : 0)
-#   define glthread_rwlock_destroy(LOCK) \
-      (pthread_in_use () ? pthread_rwlock_destroy (LOCK) : 0)
-
-#  else
-
-typedef struct
-        {
-          int initialized;
-          pthread_mutex_t guard;   /* protects the initialization */
-          pthread_rwlock_t rwlock; /* read-write lock */
-        }
-        gl_rwlock_t;
-#   define gl_rwlock_define(STORAGECLASS, NAME) \
-      STORAGECLASS gl_rwlock_t NAME;
-#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-#   define gl_rwlock_initializer \
-      { 0, PTHREAD_MUTEX_INITIALIZER }
-#   define glthread_rwlock_init(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_rdlock(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_wrlock(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_unlock(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
-#   define glthread_rwlock_destroy(LOCK) \
-      (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
-
-#  endif
-
-# else
-
-typedef struct
-        {
-          pthread_mutex_t lock; /* protects the remaining fields */
-          pthread_cond_t waiting_readers; /* waiting readers */
-          pthread_cond_t waiting_writers; /* waiting writers */
-          unsigned int waiting_writers_count; /* number of waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
-# define glthread_rwlock_init(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
-# define glthread_rwlock_rdlock(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_wrlock(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_unlock(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_destroy(LOCK) \
-    (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-
-typedef pthread_mutex_t gl_recursive_lock_t;
-#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_mutex_t NAME;
-#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer;
-#   ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#    define gl_recursive_lock_initializer \
-       PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#   else
-#    define gl_recursive_lock_initializer \
-       PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#   endif
-#   define glthread_recursive_lock_init(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_lock(LOCK) \
-      (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
-#   define glthread_recursive_lock_unlock(LOCK) \
-      (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
-#   define glthread_recursive_lock_destroy(LOCK) \
-      (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-
-#  else
-
-typedef struct
-        {
-          pthread_mutex_t recmutex; /* recursive mutex */
-          pthread_mutex_t guard;    /* protects the initialization */
-          int initialized;
-        }
-        gl_recursive_lock_t;
-#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
-      STORAGECLASS gl_recursive_lock_t NAME;
-#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-#   define gl_recursive_lock_initializer \
-      { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 }
-#   define glthread_recursive_lock_init(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_lock(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_unlock(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-#   define glthread_recursive_lock_destroy(LOCK) \
-      (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-#  endif
-
-# else
-
-/* Old versions of POSIX threads on Solaris did not have recursive locks.
-   We have to implement them ourselves.  */
-
-typedef struct
-        {
-          pthread_mutex_t mutex;
-          pthread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
-#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
-     STORAGECLASS gl_recursive_lock_t NAME;
-#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-#  define gl_recursive_lock_initializer \
-     { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 }
-#  define glthread_recursive_lock_init(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-#  define glthread_recursive_lock_lock(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-#  define glthread_recursive_lock_unlock(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-#  define glthread_recursive_lock_destroy(LOCK) \
-     (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pthread_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (pthread_in_use ()                                                         \
-     ? pthread_once (ONCE_CONTROL, INITFUNCTION)                               \
-     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_singlethreaded (pthread_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-# include <pth.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_PTH_THREADS_WEAK
-
-/* Use weak references to the GNU Pth threads library.  */
-
-#  pragma weak pth_mutex_init
-#  pragma weak pth_mutex_acquire
-#  pragma weak pth_mutex_release
-#  pragma weak pth_rwlock_init
-#  pragma weak pth_rwlock_acquire
-#  pragma weak pth_rwlock_release
-#  pragma weak pth_once
-
-#  pragma weak pth_cancel
-#  define pth_in_use() (pth_cancel != NULL)
-
-# else
-
-#  define pth_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pth_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS pth_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS pth_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    PTH_MUTEX_INIT
-# define glthread_lock_init(LOCK) \
-    (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
-# define glthread_lock_lock(LOCK) \
-    (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
-# define glthread_lock_unlock(LOCK) \
-    (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
-# define glthread_lock_destroy(LOCK) \
-    ((void)(LOCK), 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef pth_rwlock_t gl_rwlock_t;
-#  define gl_rwlock_define(STORAGECLASS, NAME) \
-     STORAGECLASS pth_rwlock_t NAME;
-#  define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer;
-#  define gl_rwlock_initializer \
-     PTH_RWLOCK_INIT
-#  define glthread_rwlock_init(LOCK) \
-     (pth_in_use () && !pth_rwlock_init (LOCK) ? errno : 0)
-#  define glthread_rwlock_rdlock(LOCK) \
-     (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RD, 0, NULL) ? errno : 0)
-#  define glthread_rwlock_wrlock(LOCK) \
-     (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RW, 0, NULL) ? errno : 0)
-#  define glthread_rwlock_unlock(LOCK) \
-     (pth_in_use () && !pth_rwlock_release (LOCK) ? errno : 0)
-#  define glthread_rwlock_destroy(LOCK) \
-     ((void)(LOCK), 0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* In Pth, mutexes are recursive by default.  */
-typedef pth_mutex_t gl_recursive_lock_t;
-#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
-     STORAGECLASS pth_mutex_t NAME;
-#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer;
-#  define gl_recursive_lock_initializer \
-     PTH_MUTEX_INIT
-#  define glthread_recursive_lock_init(LOCK) \
-     (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
-#  define glthread_recursive_lock_lock(LOCK) \
-     (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
-#  define glthread_recursive_lock_unlock(LOCK) \
-     (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
-#  define glthread_recursive_lock_destroy(LOCK) \
-     ((void)(LOCK), 0)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pth_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (pth_in_use ()                                                             \
-     ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)                \
-     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (pth_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-# include <thread.h>
-# include <synch.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_SOLARIS_THREADS_WEAK
-
-/* Use weak references to the old Solaris threads library.  */
-
-#  pragma weak mutex_init
-#  pragma weak mutex_lock
-#  pragma weak mutex_unlock
-#  pragma weak mutex_destroy
-#  pragma weak rwlock_init
-#  pragma weak rw_rdlock
-#  pragma weak rw_wrlock
-#  pragma weak rw_unlock
-#  pragma weak rwlock_destroy
-#  pragma weak thr_self
-
-#  pragma weak thr_suspend
-#  define thread_in_use() (thr_suspend != NULL)
-
-# else
-
-#  define thread_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    DEFAULTMUTEX
-# define glthread_lock_init(LOCK) \
-    (thread_in_use () ? mutex_init (LOCK, USYNC_THREAD, NULL) : 0)
-# define glthread_lock_lock(LOCK) \
-    (thread_in_use () ? mutex_lock (LOCK) : 0)
-# define glthread_lock_unlock(LOCK) \
-    (thread_in_use () ? mutex_unlock (LOCK) : 0)
-# define glthread_lock_destroy(LOCK) \
-    (thread_in_use () ? mutex_destroy (LOCK) : 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef rwlock_t gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    DEFAULTRWLOCK
-# define glthread_rwlock_init(LOCK) \
-    (thread_in_use () ? rwlock_init (LOCK, USYNC_THREAD, NULL) : 0)
-# define glthread_rwlock_rdlock(LOCK) \
-    (thread_in_use () ? rw_rdlock (LOCK) : 0)
-# define glthread_rwlock_wrlock(LOCK) \
-    (thread_in_use () ? rw_wrlock (LOCK) : 0)
-# define glthread_rwlock_unlock(LOCK) \
-    (thread_in_use () ? rw_unlock (LOCK) : 0)
-# define glthread_rwlock_destroy(LOCK) \
-    (thread_in_use () ? rwlock_destroy (LOCK) : 0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* Old Solaris threads did not have recursive locks.
-   We have to implement them ourselves.  */
-
-typedef struct
-        {
-          mutex_t mutex;
-          thread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
-    { DEFAULTMUTEX, (thread_t) 0, 0 }
-# define glthread_recursive_lock_init(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_lock(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_unlock(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_destroy(LOCK) \
-    (thread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
-        {
-          volatile int inited;
-          mutex_t mutex;
-        }
-        gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX };
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (thread_in_use ()                                                          \
-     ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)                \
-     : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (gl_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
-
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
-   Mutex, Semaphore types, because
-     - we need only to synchronize inside a single process (address space),
-       not inter-process locking,
-     - we don't need to support trylock operations.  (TryEnterCriticalSection
-       does not work on Windows 95/98/ME.  Packages that need trylock usually
-       define their own mutex type.)  */
-
-/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
-   to be done lazily, once only.  For this we need spinlocks.  */
-
-typedef struct { volatile int done; volatile long started; } gl_spinlock_t;
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          CRITICAL_SECTION lock;
-        }
-        gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_lock_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    { { 0, -1 } }
-# define glthread_lock_init(LOCK) \
-    (glthread_lock_init_func (LOCK), 0)
-# define glthread_lock_lock(LOCK) \
-    glthread_lock_lock_func (LOCK)
-# define glthread_lock_unlock(LOCK) \
-    glthread_lock_unlock_func (LOCK)
-# define glthread_lock_destroy(LOCK) \
-    glthread_lock_destroy_func (LOCK)
-extern void glthread_lock_init_func (gl_lock_t *lock);
-extern int glthread_lock_lock_func (gl_lock_t *lock);
-extern int glthread_lock_unlock_func (gl_lock_t *lock);
-extern int glthread_lock_destroy_func (gl_lock_t *lock);
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* It is impossible to implement read-write locks using plain locks, without
-   introducing an extra thread dedicated to managing read-write locks.
-   Therefore here we need to use the low-level Event type.  */
-
-typedef struct
-        {
-          HANDLE *array; /* array of waiting threads, each represented by an event */
-          unsigned int count; /* number of waiting threads */
-          unsigned int alloc; /* length of allocated array */
-          unsigned int offset; /* index of first waiting thread in array */
-        }
-        gl_carray_waitqueue_t;
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          CRITICAL_SECTION lock; /* protects the remaining fields */
-          gl_carray_waitqueue_t waiting_readers; /* waiting readers */
-          gl_carray_waitqueue_t waiting_writers; /* waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    { { 0, -1 } }
-# define glthread_rwlock_init(LOCK) \
-    (glthread_rwlock_init_func (LOCK), 0)
-# define glthread_rwlock_rdlock(LOCK) \
-    glthread_rwlock_rdlock_func (LOCK)
-# define glthread_rwlock_wrlock(LOCK) \
-    glthread_rwlock_wrlock_func (LOCK)
-# define glthread_rwlock_unlock(LOCK) \
-    glthread_rwlock_unlock_func (LOCK)
-# define glthread_rwlock_destroy(LOCK) \
-    glthread_rwlock_destroy_func (LOCK)
-extern void glthread_rwlock_init_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock);
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* The native Windows documentation says that CRITICAL_SECTION already
-   implements a recursive lock.  But we need not rely on it: It's easy to
-   implement a recursive lock without this assumption.  */
-
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          DWORD owner;
-          unsigned long depth;
-          CRITICAL_SECTION lock;
-        }
-        gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
-    { { 0, -1 }, 0, 0 }
-# define glthread_recursive_lock_init(LOCK) \
-    (glthread_recursive_lock_init_func (LOCK), 0)
-# define glthread_recursive_lock_lock(LOCK) \
-    glthread_recursive_lock_lock_func (LOCK)
-# define glthread_recursive_lock_unlock(LOCK) \
-    glthread_recursive_lock_unlock_func (LOCK)
-# define glthread_recursive_lock_destroy(LOCK) \
-    glthread_recursive_lock_destroy_func (LOCK)
-extern void glthread_recursive_lock_init_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
-        {
-          volatile int inited;
-          volatile long started;
-          CRITICAL_SECTION lock;
-        }
-        gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = { -1, -1 };
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (glthread_once_func (ONCE_CONTROL, INITFUNCTION), 0)
-extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (void));
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
-
-/* Provide dummy implementation if threads are not supported.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef int gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME)
-# define gl_lock_define_initialized(STORAGECLASS, NAME)
-# define glthread_lock_init(NAME) 0
-# define glthread_lock_lock(NAME) 0
-# define glthread_lock_unlock(NAME) 0
-# define glthread_lock_destroy(NAME) 0
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef int gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME)
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME)
-# define glthread_rwlock_init(NAME) 0
-# define glthread_rwlock_rdlock(NAME) 0
-# define glthread_rwlock_wrlock(NAME) 0
-# define glthread_rwlock_unlock(NAME) 0
-# define glthread_rwlock_destroy(NAME) 0
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-typedef int gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME)
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME)
-# define glthread_recursive_lock_init(NAME) 0
-# define glthread_recursive_lock_lock(NAME) 0
-# define glthread_recursive_lock_unlock(NAME) 0
-# define glthread_recursive_lock_destroy(NAME) 0
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef int gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = 0;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (*(ONCE_CONTROL) == 0 ? (*(ONCE_CONTROL) = ~ 0, INITFUNCTION (), 0) : 0)
-
-#endif
-
-/* ========================================================================= */
-
-/* Macros with built-in error handling.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-#define gl_lock_init(NAME) \
-   do                                  \
-     {                                 \
-       if (glthread_lock_init (&NAME)) \
-         abort ();                     \
-     }                                 \
-   while (0)
-#define gl_lock_lock(NAME) \
-   do                                  \
-     {                                 \
-       if (glthread_lock_lock (&NAME)) \
-         abort ();                     \
-     }                                 \
-   while (0)
-#define gl_lock_unlock(NAME) \
-   do                                    \
-     {                                   \
-       if (glthread_lock_unlock (&NAME)) \
-         abort ();                       \
-     }                                   \
-   while (0)
-#define gl_lock_destroy(NAME) \
-   do                                     \
-     {                                    \
-       if (glthread_lock_destroy (&NAME)) \
-         abort ();                        \
-     }                                    \
-   while (0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-#define gl_rwlock_init(NAME) \
-   do                                    \
-     {                                   \
-       if (glthread_rwlock_init (&NAME)) \
-         abort ();                       \
-     }                                   \
-   while (0)
-#define gl_rwlock_rdlock(NAME) \
-   do                                      \
-     {                                     \
-       if (glthread_rwlock_rdlock (&NAME)) \
-         abort ();                         \
-     }                                     \
-   while (0)
-#define gl_rwlock_wrlock(NAME) \
-   do                                      \
-     {                                     \
-       if (glthread_rwlock_wrlock (&NAME)) \
-         abort ();                         \
-     }                                     \
-   while (0)
-#define gl_rwlock_unlock(NAME) \
-   do                                      \
-     {                                     \
-       if (glthread_rwlock_unlock (&NAME)) \
-         abort ();                         \
-     }                                     \
-   while (0)
-#define gl_rwlock_destroy(NAME) \
-   do                                       \
-     {                                      \
-       if (glthread_rwlock_destroy (&NAME)) \
-         abort ();                          \
-     }                                      \
-   while (0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-#define gl_recursive_lock_init(NAME) \
-   do                                            \
-     {                                           \
-       if (glthread_recursive_lock_init (&NAME)) \
-         abort ();                               \
-     }                                           \
-   while (0)
-#define gl_recursive_lock_lock(NAME) \
-   do                                            \
-     {                                           \
-       if (glthread_recursive_lock_lock (&NAME)) \
-         abort ();                               \
-     }                                           \
-   while (0)
-#define gl_recursive_lock_unlock(NAME) \
-   do                                              \
-     {                                             \
-       if (glthread_recursive_lock_unlock (&NAME)) \
-         abort ();                                 \
-     }                                             \
-   while (0)
-#define gl_recursive_lock_destroy(NAME) \
-   do                                               \
-     {                                              \
-       if (glthread_recursive_lock_destroy (&NAME)) \
-         abort ();                                  \
-     }                                              \
-   while (0)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-#define gl_once(NAME, INITFUNCTION) \
-   do                                           \
-     {                                          \
-       if (glthread_once (&NAME, INITFUNCTION)) \
-         abort ();                              \
-     }                                          \
-   while (0)
-
-/* ========================================================================= */
-
-#endif /* _LOCK_H */
diff -Nru gettext-0.19.3/gettext-tools/libgrep/glthread/threadlib.c gettext-0.18.1.1/gettext-tools/libgrep/glthread/threadlib.c
--- gettext-0.19.3/gettext-tools/libgrep/glthread/threadlib.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/glthread/threadlib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/* Multithreading primitives.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
-   This 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 Bruno Haible <bruno@clisp.org>, 2005.  */
-
-#include <config.h>
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# include <pthread.h>
-# include <stdlib.h>
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
-{
-  return arg;
-}
-
-int
-glthread_in_use (void)
-{
-  static int tested;
-  static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-  if (!tested)
-    {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-        /* Thread creation failed.  */
-        result = 0;
-      else
-        {
-          /* Thread creation works.  */
-          void *retval;
-          if (pthread_join (thread, &retval) != 0)
-            abort ();
-          result = 1;
-        }
-      tested = 1;
-    }
-  return result;
-}
-
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/btowc.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/btowc.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/btowc.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/btowc.m4	2010-06-04 10:27:10.000000000 +0000
@@ -0,0 +1,107 @@
+# btowc.m4 serial 6
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_BTOWC],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  dnl Check whether <wchar.h> is usable at all, first. Otherwise the test
+  dnl program below may lead to an endless loop. See
+  dnl <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>.
+  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
+
+  AC_CHECK_FUNCS_ONCE([btowc])
+  if test $ac_cv_func_btowc = no; then
+    HAVE_BTOWC=0
+  else
+
+    AC_REQUIRE([AC_PROG_CC])
+    AC_REQUIRE([gt_LOCALE_FR])
+    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+    dnl Cygwin 1.7.2 btowc('\0') is WEOF, not 0.
+    AC_CACHE_CHECK([whether btowc(0) is correct],
+      [gl_cv_func_btowc_nul],
+      [
+        AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+int main ()
+{
+  if (btowc ('\0') != 0)
+    return 1;
+  return 0;
+}],
+          [gl_cv_func_btowc_nul=yes],
+          [gl_cv_func_btowc_nul=no],
+          [
+changequote(,)dnl
+           case "$host_os" in
+                      # Guess no on Cygwin.
+             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+                      # Guess yes otherwise.
+             *)       gl_cv_func_btowc_nul="guessing yes" ;;
+           esac
+changequote([,])dnl
+          ])
+      ])
+
+    dnl IRIX 6.5 btowc(EOF) is 0xFF, not WEOF.
+    AC_CACHE_CHECK([whether btowc(EOF) is correct],
+      [gl_cv_func_btowc_eof],
+      [
+        dnl Initial guess, used when cross-compiling or when no suitable locale
+        dnl is present.
+changequote(,)dnl
+        case "$host_os" in
+                 # Guess no on IRIX.
+          irix*) gl_cv_func_btowc_eof="guessing no" ;;
+                 # Guess yes otherwise.
+          *)     gl_cv_func_btowc_eof="guessing yes" ;;
+        esac
+changequote([,])dnl
+        if test $LOCALE_FR != none; then
+          AC_TRY_RUN([
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+int main ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      if (btowc (EOF) != WEOF)
+        return 1;
+    }
+  return 0;
+}],
+            [gl_cv_func_btowc_eof=yes],
+            [gl_cv_func_btowc_eof=no],
+            [:])
+        fi
+      ])
+
+    case "$gl_cv_func_btowc_nul" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+    case "$gl_cv_func_btowc_eof" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+  fi
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([btowc])
+    gl_PREREQ_BTOWC
+  fi
+])
+
+# Prerequisites of lib/btowc.c.
+AC_DEFUN([gl_PREREQ_BTOWC], [
+  :
+])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4	2010-06-06 20:10:34.000000000 +0000
@@ -1,41 +1,28 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
-# In projects that use version control, this file is meant to be put under
-# version control, like the configure.ac and various Makefile.am files.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=alloca-opt --avoid=extensions --avoid=gettext-h --avoid=include_next --avoid=locale --avoid=localcharset --avoid=malloc-posix --avoid=mbrtowc --avoid=mbsinit --avoid=multiarch --avoid=ssize_t --avoid=stdbool --avoid=stddef --avoid=stdint --avoid=stdlib --avoid=streq --avoid=unistd --avoid=verify --avoid=wchar --avoid=wctype-h --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=grgl --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP mbrlen regex
+#   gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=alloca-opt --avoid=extensions --avoid=gettext-h --avoid=include_next --avoid=localcharset --avoid=malloc-posix --avoid=mbrtowc --avoid=mbsinit --avoid=multiarch --avoid=ssize_t --avoid=stdbool --avoid=stddef --avoid=stdint --avoid=stdlib --avoid=streq --avoid=unistd --avoid=verify --avoid=wchar --avoid=wctype --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=grgl regex
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([../gnulib-local])
 gl_MODULES([
-  mbrlen
   regex
 ])
-gl_AVOID([ alloca-opt extensions gettext-h include_next locale localcharset malloc-posix mbrtowc mbsinit multiarch ssize_t stdbool stddef stdint stdlib streq unistd verify wchar wctype-h])
+gl_AVOID([alloca-opt extensions gettext-h include_next localcharset malloc-posix mbrtowc mbsinit multiarch ssize_t stdbool stddef stdint stdlib streq unistd verify wchar wctype])
 gl_SOURCE_BASE([libgrep])
 gl_M4_BASE([libgrep/gnulib-m4])
 gl_PO_BASE([])
@@ -45,4 +32,3 @@
 gl_MAKEFILE_NAME([Makefile.gnulib])
 gl_MACRO_PREFIX([grgl])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_MACRO([IN_GETTEXT_TOOLS_LIBGREP])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4	2014-10-16 06:01:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4	2010-06-04 10:27:11.000000000 +0000
@@ -1,22 +1,10 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -24,8 +12,7 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects that use version control, this file can be treated like
-# other built files.
+# In projects using CVS, this file can be treated like other built files.
 
 
 # This macro should be invoked from gettext-tools/configure.ac, in the section
@@ -37,21 +24,13 @@
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([gl_PROG_AR_RANLIB])
-  AC_REQUIRE([AM_PROG_CC_C_O])
+  AC_REQUIRE([AC_PROG_RANLIB])
   # Code from module btowc:
-  # Code from module havelib:
+  # Code from module c++defs:
   # Code from module langinfo:
-  # Code from module localeconv:
-  # Code from module lock:
-  # Code from module mbrlen:
-  # Code from module mbtowc:
   # Code from module nl_langinfo:
   # Code from module regex:
-  # Code from module snippet/c++defs:
-  # Code from module snippet/warn-on-use:
-  # Code from module threadlib:
-  gl_THREADLIB_EARLY
+  # Code from module warn-on-use:
   # Code from module wcrtomb:
 ])
 
@@ -71,52 +50,22 @@
   m4_pushdef([grgl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='libgrep'
-  m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [IN_GETTEXT_TOOLS_LIBGREP])
+  # Code from module btowc:
   gl_FUNC_BTOWC
-  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-    AC_LIBOBJ([btowc])
-    gl_PREREQ_BTOWC
-  fi
   gl_WCHAR_MODULE_INDICATOR([btowc])
+  # Code from module c++defs:
+  # Code from module langinfo:
   gl_LANGINFO_H
-  gl_FUNC_LOCALECONV
-  if test $REPLACE_LOCALECONV = 1; then
-    AC_LIBOBJ([localeconv])
-    gl_PREREQ_LOCALECONV
-  fi
-  gl_LOCALE_MODULE_INDICATOR([localeconv])
-  gl_LOCK
-  gl_MODULE_INDICATOR([lock])
-  gl_FUNC_MBRLEN
-  if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
-    AC_LIBOBJ([mbrlen])
-    gl_PREREQ_MBRLEN
-  fi
-  gl_WCHAR_MODULE_INDICATOR([mbrlen])
-  gl_FUNC_MBTOWC
-  if test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
-    gl_PREREQ_MBTOWC
-  fi
-  gl_STDLIB_MODULE_INDICATOR([mbtowc])
+  # Code from module nl_langinfo:
   gl_FUNC_NL_LANGINFO
-  if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
-    AC_LIBOBJ([nl_langinfo])
-  fi
   gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
+  # Code from module regex:
   gl_REGEX
-  if test $ac_use_included_regex = yes; then
-    AC_LIBOBJ([regex])
-    gl_PREREQ_REGEX
-  fi
-  gl_THREADLIB
+  # Code from module warn-on-use:
+  # Code from module wcrtomb:
   gl_FUNC_WCRTOMB
-  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
-    AC_LIBOBJ([wcrtomb])
-    gl_PREREQ_WCRTOMB
-  fi
   gl_WCHAR_MODULE_INDICATOR([wcrtomb])
-  m4_popdef([gl_MODULE_INDICATOR_CONDITION])
+  # Code from module dummy:
   # End of code from modules
   m4_ifval(grgl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([grgl_LIBSOURCES_DIR])[ ||
@@ -257,18 +206,11 @@
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([grgl_FILE_LIST], [
-  build-aux/config.rpath
-  build-aux/snippet/c++defs.h
-  build-aux/snippet/warn-on-use.h
+  build-aux/c++defs.h
+  build-aux/warn-on-use.h
   lib/btowc.c
-  lib/glthread/lock.c
-  lib/glthread/lock.h
-  lib/glthread/threadlib.c
+  lib/dummy.c
   lib/langinfo.in.h
-  lib/localeconv.c
-  lib/mbrlen.c
-  lib/mbtowc-impl.h
-  lib/mbtowc.c
   lib/nl_langinfo.c
   lib/regcomp.c
   lib/regex.c
@@ -280,24 +222,16 @@
   m4/00gnulib.m4
   m4/btowc.m4
   m4/codeset.m4
-  m4/eealloc.m4
   m4/gnulib-common.m4
   m4/langinfo_h.m4
-  m4/lib-ld.m4
-  m4/lib-link.m4
-  m4/lib-prefix.m4
   m4/locale-fr.m4
   m4/locale-ja.m4
   m4/locale-zh.m4
-  m4/localeconv.m4
-  m4/lock.m4
-  m4/mbrlen.m4
   m4/mbrtowc.m4
   m4/mbstate_t.m4
-  m4/mbtowc.m4
   m4/nl_langinfo.m4
+  m4/onceonly.m4
   m4/regex.m4
-  m4/threadlib.m4
   m4/warn-on-use.m4
   m4/wcrtomb.m4
 ])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/langinfo_h.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/langinfo_h.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/langinfo_h.m4	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/langinfo_h.m4	2010-06-04 10:27:10.000000000 +0000
@@ -1,5 +1,5 @@
-# langinfo_h.m4 serial 7
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# langinfo_h.m4 serial 6
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,14 +16,12 @@
 
   dnl Determine whether <langinfo.h> exists. It is missing on mingw and BeOS.
   HAVE_LANGINFO_CODESET=0
-  HAVE_LANGINFO_T_FMT_AMPM=0
   HAVE_LANGINFO_ERA=0
-  HAVE_LANGINFO_YESEXPR=0
   AC_CHECK_HEADERS_ONCE([langinfo.h])
   if test $ac_cv_header_langinfo_h = yes; then
     HAVE_LANGINFO_H=1
     dnl Determine what <langinfo.h> defines. CODESET and ERA etc. are missing
-    dnl on OpenBSD 3.8. T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3.
+    dnl on OpenBSD 3.8.
     AC_CACHE_CHECK([whether langinfo.h defines CODESET],
       [gl_cv_header_langinfo_codeset],
       [AC_COMPILE_IFELSE(
@@ -36,18 +34,6 @@
     if test $gl_cv_header_langinfo_codeset = yes; then
       HAVE_LANGINFO_CODESET=1
     fi
-    AC_CACHE_CHECK([whether langinfo.h defines T_FMT_AMPM],
-      [gl_cv_header_langinfo_t_fmt_ampm],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([[#include <langinfo.h>
-int a = T_FMT_AMPM;
-]])],
-         [gl_cv_header_langinfo_t_fmt_ampm=yes],
-         [gl_cv_header_langinfo_t_fmt_ampm=no])
-      ])
-    if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
-      HAVE_LANGINFO_T_FMT_AMPM=1
-    fi
     AC_CACHE_CHECK([whether langinfo.h defines ERA],
       [gl_cv_header_langinfo_era],
       [AC_COMPILE_IFELSE(
@@ -60,26 +46,12 @@
     if test $gl_cv_header_langinfo_era = yes; then
       HAVE_LANGINFO_ERA=1
     fi
-    AC_CACHE_CHECK([whether langinfo.h defines YESEXPR],
-      [gl_cv_header_langinfo_yesexpr],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([[#include <langinfo.h>
-int a = YESEXPR;
-]])],
-         [gl_cv_header_langinfo_yesexpr=yes],
-         [gl_cv_header_langinfo_yesexpr=no])
-      ])
-    if test $gl_cv_header_langinfo_yesexpr = yes; then
-      HAVE_LANGINFO_YESEXPR=1
-    fi
   else
     HAVE_LANGINFO_H=0
   fi
   AC_SUBST([HAVE_LANGINFO_H])
   AC_SUBST([HAVE_LANGINFO_CODESET])
-  AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
   AC_SUBST([HAVE_LANGINFO_ERA])
-  AC_SUBST([HAVE_LANGINFO_YESEXPR])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/localeconv.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/localeconv.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/localeconv.m4	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/localeconv.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# localeconv.m4 serial 1
-dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_LOCALECONV],
-[
-  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-  AC_REQUIRE([gl_LOCALE_H])
-
-  if test $REPLACE_STRUCT_LCONV = 1; then
-    REPLACE_LOCALECONV=1
-  fi
-])
-
-# Prerequisites of lib/localeconv.c.
-AC_DEFUN([gl_PREREQ_LOCALECONV],
-[
-  AC_CHECK_MEMBERS([struct lconv.decimal_point], [], [],
-    [[#include <locale.h>]])
-])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/mbrlen.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/mbrlen.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/mbrlen.m4	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/mbrlen.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,267 +0,0 @@
-# mbrlen.m4 serial 9
-dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_MBRLEN],
-[
-  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-
-  AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  AC_REQUIRE([gl_FUNC_MBRTOWC])
-  AC_CHECK_FUNCS_ONCE([mbrlen])
-  if test $ac_cv_func_mbrlen = no; then
-    HAVE_MBRLEN=0
-    AC_CHECK_DECLS([mbrlen],,, [[
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
-    if test $ac_cv_have_decl_mbrlen = yes; then
-      dnl On Minix 3.1.8, the system's <wchar.h> declares mbrlen() although
-      dnl it does not have the function. Avoid a collision with gnulib's
-      dnl replacement.
-      REPLACE_MBRLEN=1
-    fi
-  else
-    dnl Most bugs affecting the system's mbrtowc function also affect the
-    dnl mbrlen function. So override mbrlen whenever mbrtowc is overridden.
-    dnl We could also run the individual tests below; the results would be
-    dnl the same.
-    if test $REPLACE_MBRTOWC = 1; then
-      REPLACE_MBRLEN=1
-    fi
-  fi
-])
-
-dnl Test whether mbrlen puts the state into non-initial state when parsing an
-dnl incomplete multibyte character.
-dnl Result is gl_cv_func_mbrlen_incomplete_state.
-
-AC_DEFUN([gl_MBRLEN_INCOMPLETE_STATE],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrlen handles incomplete characters],
-    [gl_cv_func_mbrlen_incomplete_state],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrlen_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrlen_incomplete_state="guessing yes" ;;
-      esac
-changequote([,])dnl
-      if test $LOCALE_JA != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
-      mbstate_t state;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrlen (input + 1, 1, &state) == (size_t)(-2))
-        if (mbsinit (&state))
-          return 1;
-    }
-  return 0;
-}]])],
-          [gl_cv_func_mbrlen_incomplete_state=yes],
-          [gl_cv_func_mbrlen_incomplete_state=no],
-          [])
-      fi
-    ])
-])
-
-dnl Test whether mbrlen, when parsing the end of a multibyte character,
-dnl correctly returns the number of bytes that were needed to complete the
-dnl character (not the total number of bytes of the multibyte character).
-dnl Result is gl_cv_func_mbrlen_retval.
-
-AC_DEFUN([gl_MBRLEN_RETVAL],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
-  AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrlen has a correct return value],
-    [gl_cv_func_mbrlen_retval],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                          # Guess no on HP-UX and Solaris.
-        hpux* | solaris*) gl_cv_func_mbrlen_retval="guessing no" ;;
-                          # Guess yes otherwise.
-        *)                gl_cv_func_mbrlen_retval="guessing yes" ;;
-      esac
-changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  int result = 0;
-  /* This fails on Solaris.  */
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
-    {
-      char input[] = "B\303\274\303\237er"; /* "Büßer" */
-      mbstate_t state;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrlen (input + 1, 1, &state) == (size_t)(-2))
-        {
-          input[1] = '\0';
-          if (mbrlen (input + 2, 5, &state) != 1)
-            result |= 1;
-        }
-    }
-  /* This fails on HP-UX 11.11.  */
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
-      mbstate_t state;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrlen (input + 1, 1, &state) == (size_t)(-2))
-        {
-          input[1] = '\0';
-          if (mbrlen (input + 2, 5, &state) != 2)
-            result |= 2;
-        }
-    }
-  return result;
-}]])],
-          [gl_cv_func_mbrlen_retval=yes],
-          [gl_cv_func_mbrlen_retval=no],
-          [])
-      fi
-    ])
-])
-
-dnl Test whether mbrlen, when parsing a NUL character, correctly returns 0.
-dnl Result is gl_cv_func_mbrlen_nul_retval.
-
-AC_DEFUN([gl_MBRLEN_NUL_RETVAL],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_ZH_CN])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrlen returns 0 when parsing a NUL character],
-    [gl_cv_func_mbrlen_nul_retval],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                    # Guess no on Solaris 9.
-        solaris2.9) gl_cv_func_mbrlen_nul_retval="guessing no" ;;
-                    # Guess yes otherwise.
-        *)          gl_cv_func_mbrlen_nul_retval="guessing yes" ;;
-      esac
-changequote([,])dnl
-      if test $LOCALE_ZH_CN != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.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 <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  /* This crashes on Solaris 9 inside __mbrtowc_dense_gb18030.  */
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
-    {
-      mbstate_t state;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrlen ("", 1, &state) != 0)
-        return 1;
-    }
-  return 0;
-}]])],
-          [gl_cv_func_mbrlen_nul_retval=yes],
-          [gl_cv_func_mbrlen_nul_retval=no],
-          [])
-      fi
-    ])
-])
-
-dnl Test whether mbrlen returns the correct value on empty input.
-
-AC_DEFUN([gl_MBRLEN_EMPTY_INPUT],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether mbrlen works on empty input],
-    [gl_cv_func_mbrlen_empty_input],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                     # Guess no on AIX and glibc systems.
-        aix* | *-gnu*)
-                    gl_cv_func_mbrlen_empty_input="guessing no" ;;
-        *)          gl_cv_func_mbrlen_empty_input="guessing yes" ;;
-      esac
-changequote([,])dnl
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-           #include <wchar.h>
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrlen ("", 0, &mbs) == (size_t) -2;
-           }]])],
-        [gl_cv_func_mbrlen_empty_input=no],
-        [gl_cv_func_mbrlen_empty_input=yes],
-        [:])
-    ])
-])
-
-# Prerequisites of lib/mbrlen.c.
-AC_DEFUN([gl_PREREQ_MBRLEN], [
-  :
-])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4	2010-06-04 10:27:10.000000000 +0000
@@ -1,5 +1,5 @@
-# nl_langinfo.m4 serial 5
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# nl_langinfo.m4 serial 3
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,42 +9,17 @@
   AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
   AC_REQUIRE([gl_LANGINFO_H])
   AC_CHECK_FUNCS_ONCE([nl_langinfo])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   if test $ac_cv_func_nl_langinfo = yes; then
-    # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken.
-    AC_CACHE_CHECK([whether YESEXPR works],
-      [gl_cv_func_nl_langinfo_yesexpr_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM([[#include <langinfo.h>
-]], [[return !*nl_langinfo(YESEXPR);
-]])],
-         [gl_cv_func_nl_langinfo_yesexpr_works=yes],
-         [gl_cv_func_nl_langinfo_yesexpr_works=no],
-         [
-         case "$host_os" in
-                   # Guess no on irix systems.
-           irix*)  gl_cv_func_nl_langinfo_yesexpr_works="guessing no";;
-                   # Guess yes elsewhere.
-           *)      gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";;
-         esac
-         ])
-      ])
-    case $gl_cv_func_nl_langinfo_yesexpr_works in
-      *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;;
-      *)    FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;;
-    esac
-    AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS],
-      [$FUNC_NL_LANGINFO_YESEXPR_WORKS],
-      [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.])
-    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \
-        && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
+    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then
       :
     else
       REPLACE_NL_LANGINFO=1
       AC_DEFINE([REPLACE_NL_LANGINFO], [1],
         [Define if nl_langinfo exists but is overridden by gnulib.])
+      AC_LIBOBJ([nl_langinfo])
     fi
   else
     HAVE_NL_LANGINFO=0
+    AC_LIBOBJ([nl_langinfo])
   fi
 ])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/regex.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/regex.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/regex.m4	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/regex.m4	2010-06-04 10:27:10.000000000 +0000
@@ -1,6 +1,7 @@
-# serial 65
+# serial 56
 
-# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13,6 +14,8 @@
 
 AC_DEFUN([gl_REGEX],
 [
+  AC_CHECK_HEADERS_ONCE([locale.h])
+
   AC_ARG_WITH([included-regex],
     [AS_HELP_STRING([--without-included-regex],
                     [don't compile regex; this is the default on systems
@@ -27,59 +30,31 @@
     # following run test, then default to *not* using the included regex.c.
     # If cross compiling, assume the test would fail and use the included
     # regex.c.
-    AC_CHECK_DECLS_ONCE([alarm])
-    AC_CHECK_HEADERS_ONCE([malloc.h])
     AC_CACHE_CHECK([for working re_compile_pattern],
                    [gl_cv_func_re_compile_pattern_working],
       [AC_RUN_IFELSE(
         [AC_LANG_PROGRAM(
-          [[#include <regex.h>
-
+          [AC_INCLUDES_DEFAULT[
+           #if HAVE_LOCALE_H
             #include <locale.h>
-            #include <limits.h>
-            #include <string.h>
-
-            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
-            # include <signal.h>
-            # include <unistd.h>
-            #endif
-
-            #if HAVE_MALLOC_H
-            # include <malloc.h>
-            #endif
-
-            #ifdef M_CHECK_ACTION
-            /* Exit with distinguishable exit code.  */
-            static void sigabrt_no_core (int sig) { raise (SIGTERM); }
-            #endif
-          ]],
-          [[int result = 0;
-            static struct re_pattern_buffer regex;
+           #endif
+           #include <limits.h>
+           #include <regex.h>
+           ]],
+          [[static struct re_pattern_buffer regex;
             unsigned char folded_chars[UCHAR_MAX + 1];
             int i;
             const char *s;
             struct re_registers regs;
 
-            /* Some builds of glibc go into an infinite loop on this
-               test.  Use alarm to force death, and mallopt to avoid
-               malloc recursion in diagnosing the corrupted heap. */
-#if HAVE_DECL_ALARM
-            signal (SIGALRM, SIG_DFL);
-            alarm (2);
-#endif
-#ifdef M_CHECK_ACTION
-            signal (SIGABRT, sigabrt_no_core);
-            mallopt (M_CHECK_ACTION, 2);
-#endif
-
-            if (setlocale (LC_ALL, "en_US.UTF-8"))
-              {
+            #if HAVE_LOCALE_H
+              /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+                 This test needs valgrind to catch the bug on Debian
+                 GNU/Linux 3.1 x86, but it might catch the bug better
+                 on other platforms and it shouldn't hurt to try the
+                 test here.  */
+              if (setlocale (LC_ALL, "en_US.UTF-8"))
                 {
-                  /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
-                     This test needs valgrind to catch the bug on Debian
-                     GNU/Linux 3.1 x86, but it might catch the bug better
-                     on other platforms and it shouldn't hurt to try the
-                     test here.  */
                   static char const pat[] = "insert into";
                   static char const data[] =
                     "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
@@ -88,57 +63,26 @@
                   memset (&regex, 0, sizeof regex);
                   s = re_compile_pattern (pat, sizeof pat - 1, &regex);
                   if (s)
-                    result |= 1;
-                  else if (re_search (&regex, data, sizeof data - 1,
-                                      0, sizeof data - 1, &regs)
-                           != -1)
-                    result |= 1;
+                    return 1;
+                  if (re_search (&regex, data, sizeof data - 1,
+                                 0, sizeof data - 1, &regs)
+                      != -1)
+                    return 1;
+                  if (! setlocale (LC_ALL, "C"))
+                    return 1;
                 }
-
-                {
-                  /* This test is from glibc bug 15078.
-                     The test case is from Andreas Schwab in
-                     <http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html>.
-                     */
-                  static char const pat[] = "[^x]x";
-                  static char const data[] =
-                    /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
-                    "\xe1\x80\x80"
-                    "\xe1\x80\xbb"
-                    "\xe1\x80\xbd"
-                    "\xe1\x80\x94"
-                    "\xe1\x80\xba"
-                    "\xe1\x80\xaf"
-                    "\xe1\x80\x95"
-                    "\xe1\x80\xba"
-                    "x";
-                  re_set_syntax (0);
-                  memset (&regex, 0, sizeof regex);
-                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
-                  if (s)
-                    result |= 1;
-                  else
-                    {
-                      i = re_search (&regex, data, sizeof data - 1,
-                                     0, sizeof data - 1, 0);
-                      if (i != 0 && i != 21)
-                        result |= 1;
-                    }
-                }
-
-                if (! setlocale (LC_ALL, "C"))
-                  return 1;
-              }
+            #endif
 
             /* This test is from glibc bug 3957, reported by Andrew Mackey.  */
             re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE);
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("a[^x]b", 6, &regex);
             if (s)
-              result |= 2;
+              return 1;
+
             /* This should fail, but succeeds for glibc-2.5.  */
-            else if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
-              result |= 2;
+            if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
+              return 1;
 
             /* This regular expression is from Spencer ere test number 75
                in grep-2.3.  */
@@ -150,7 +94,7 @@
             s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, &regex);
             /* This should fail with _Invalid character class name_ error.  */
             if (!s)
-              result |= 4;
+              return 1;
 
             /* Ensure that [b-a] is diagnosed as invalid, when
                using RE_NO_EMPTY_RANGES. */
@@ -158,31 +102,34 @@
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("a[b-a]", 6, &regex);
             if (s == 0)
-              result |= 8;
+              return 1;
 
             /* This should succeed, but does not for glibc-2.1.3.  */
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("{1", 2, &regex);
+
             if (s)
-              result |= 8;
+              return 1;
 
             /* The following example is derived from a problem report
                against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("[an\371]*n", 7, &regex);
             if (s)
-              result |= 8;
+              return 1;
+
             /* This should match, but does not for glibc-2.2.1.  */
-            else if (re_match (&regex, "an", 2, 0, &regs) != 2)
-              result |= 8;
+            if (re_match (&regex, "an", 2, 0, &regs) != 2)
+              return 1;
 
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("x", 1, &regex);
             if (s)
-              result |= 8;
+              return 1;
+
             /* glibc-2.2.93 does not work with a negative RANGE argument.  */
-            else if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
-              result |= 8;
+            if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
+              return 1;
 
             /* The version of regex.c in older versions of gnulib
                ignored RE_ICASE.  Detect that problem too.  */
@@ -190,9 +137,10 @@
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("x", 1, &regex);
             if (s)
-              result |= 16;
-            else if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
-              result |= 16;
+              return 1;
+
+            if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
+              return 1;
 
             /* Catch a bug reported by Vin Shelton in
                http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html
@@ -203,27 +151,21 @@
             memset (&regex, 0, sizeof regex);
             s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, &regex);
             if (s)
-              result |= 32;
+              return 1;
 
             /* REG_STARTEND was added to glibc on 2004-01-15.
                Reject older versions.  */
             if (! REG_STARTEND)
-              result |= 64;
+              return 1;
 
-#if 0
-            /* It would be nice to reject hosts whose regoff_t values are too
-               narrow (including glibc on hosts with 64-bit ptrdiff_t and
-               32-bit int), but we should wait until glibc implements this
-               feature.  Otherwise, support for equivalence classes and
-               multibyte collation symbols would always be broken except
-               when compiling --without-included-regex.   */
+            /* Reject hosts whose regoff_t values are too narrow.
+               These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
+               and 32-bit int.  */
             if (sizeof (regoff_t) < sizeof (ptrdiff_t)
                 || sizeof (regoff_t) < sizeof (ssize_t))
-              result |= 64;
-#endif
+              return 1;
 
-            return result;
-          ]])],
+            return 0;]])],
        [gl_cv_func_re_compile_pattern_working=yes],
        [gl_cv_func_re_compile_pattern_working=no],
        dnl When crosscompiling, assume it is not working.
@@ -238,9 +180,6 @@
   esac
 
   if test $ac_use_included_regex = yes; then
-    AC_DEFINE([_REGEX_INCLUDE_LIMITS_H], [1],
-      [Define if you want <regex.h> to include <limits.h>, so that it
-       consistently overrides <limits.h>'s RE_DUP_MAX.])
     AC_DEFINE([_REGEX_LARGE_OFFSETS], [1],
       [Define if you want regoff_t to be at least as wide POSIX requires.])
     AC_DEFINE([re_syntax_options], [rpl_re_syntax_options],
@@ -273,6 +212,8 @@
       [Define to rpl_regerror if the replacement should be used.])
     AC_DEFINE([regfree], [rpl_regfree],
       [Define to rpl_regfree if the replacement should be used.])
+    AC_LIBOBJ([regex])
+    gl_PREREQ_REGEX
   fi
 ])
 
@@ -283,9 +224,7 @@
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  AC_REQUIRE([gl_EEMALLOC])
-  AC_REQUIRE([gl_GLIBC21])
   AC_CHECK_HEADERS([libintl.h])
-  AC_CHECK_FUNCS_ONCE([isblank iswctype])
-  AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
+  AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll])
+  AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/wcrtomb.m4 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/wcrtomb.m4
--- gettext-0.19.3/gettext-tools/libgrep/gnulib-m4/wcrtomb.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/wcrtomb.m4	2010-06-04 10:27:10.000000000 +0000
@@ -0,0 +1,93 @@
+# wcrtomb.m4 serial 5
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_WCRTOMB],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+
+  AC_CHECK_FUNCS_ONCE([wcrtomb])
+  if test $ac_cv_func_wcrtomb = no; then
+    HAVE_WCRTOMB=0
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_WCRTOMB=1
+    else
+      dnl On AIX 4.3, OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes
+      dnl returns 0 instead of 1.
+      AC_REQUIRE([AC_PROG_CC])
+      AC_REQUIRE([gt_LOCALE_FR])
+      AC_REQUIRE([gt_LOCALE_FR_UTF8])
+      AC_REQUIRE([gt_LOCALE_JA])
+      AC_REQUIRE([gt_LOCALE_ZH_CN])
+      AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+      AC_CACHE_CHECK([whether wcrtomb return value is correct],
+        [gl_cv_func_wcrtomb_retval],
+        [
+          dnl Initial guess, used when cross-compiling or when no suitable locale
+          dnl is present.
+changequote(,)dnl
+          case "$host_os" in
+                                     # Guess no on AIX 4, OSF/1 and Solaris.
+            aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;;
+                                     # Guess yes otherwise.
+            *)                       gl_cv_func_wcrtomb_retval="guessing yes" ;;
+          esac
+changequote([,])dnl
+          if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
+            AC_TRY_RUN([
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+int main ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        return 1;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        return 1;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        return 1;
+    }
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      if (wcrtomb (NULL, 0, NULL) != 1)
+        return 1;
+    }
+  return 0;
+}],
+              [gl_cv_func_wcrtomb_retval=yes],
+              [gl_cv_func_wcrtomb_retval=no],
+              [:])
+          fi
+        ])
+      case "$gl_cv_func_wcrtomb_retval" in
+        *yes) ;;
+        *) REPLACE_WCRTOMB=1 ;;
+      esac
+    fi
+  fi
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+    gl_REPLACE_WCHAR_H
+    AC_LIBOBJ([wcrtomb])
+    gl_PREREQ_WCRTOMB
+  fi
+])
+
+# Prerequisites of lib/wcrtomb.c.
+AC_DEFUN([gl_PREREQ_WCRTOMB], [
+  :
+])
diff -Nru gettext-0.19.3/gettext-tools/libgrep/kwset.c gettext-0.18.1.1/gettext-tools/libgrep/kwset.c
--- gettext-0.19.3/gettext-tools/libgrep/kwset.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/kwset.c	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 /* kwset.c - search for any of a set of keywords.
-   Copyright 1989, 1998, 2000, 2005-2006, 2010, 2012 Free Software Foundation, Inc.
+   Copyright 1989, 1998, 2000, 2005-2006, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation. */
 
-/* The algorithm implemented by these routines bears a startling resemblance
+/* The algorithm implemented by these routines bears a startling resemblence
    to one discovered by Beate Commentz-Walter, although it is not identical.
    See "A String Matching Algorithm Fast on the Average," Technical Report,
    IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900
@@ -438,7 +438,7 @@
           /* Update the delta table for the descendents of this node. */
           treedelta (curr->links, curr->depth, delta);
 
-          /* Compute the failure function for the descendants of this node. */
+          /* Compute the failure function for the decendents of this node. */
           treefails (curr->links, curr->fail, kwset->trie);
 
           /* Update the shifts at each node in the current node's chain
diff -Nru gettext-0.19.3/gettext-tools/libgrep/langinfo.in.h gettext-0.18.1.1/gettext-tools/libgrep/langinfo.in.h
--- gettext-0.19.3/gettext-tools/libgrep/langinfo.in.h	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/langinfo.in.h	2010-05-24 14:49:26.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <langinfo.h>.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,27 +12,27 @@
    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/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
  * POSIX <langinfo.h> for platforms that lack it or have an incomplete one.
  * <http://www.opengroup.org/onlinepubs/9699919799/basedefs/langinfo.h.html>
  */
 
-#ifndef _@GUARD_PREFIX@_LANGINFO_H
+#ifndef _GL_LANGINFO_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
-@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_LANGINFO_H@
 # @INCLUDE_NEXT@ @NEXT_LANGINFO_H@
 #endif
 
-#ifndef _@GUARD_PREFIX@_LANGINFO_H
-#define _@GUARD_PREFIX@_LANGINFO_H
+#ifndef _GL_LANGINFO_H
+#define _GL_LANGINFO_H
 
 
 #if !@HAVE_LANGINFO_H@
@@ -40,19 +40,13 @@
 /* A platform that lacks <langinfo.h>.  */
 
 /* Assume that it also lacks <nl_types.h> and the nl_item type.  */
-# if !GNULIB_defined_nl_item
 typedef int nl_item;
-#  define GNULIB_defined_nl_item 1
-# endif
 
 /* nl_langinfo items of the LC_CTYPE category */
 # define CODESET     10000
 /* nl_langinfo items of the LC_NUMERIC category */
 # define RADIXCHAR   10001
-# define DECIMAL_POINT RADIXCHAR
 # define THOUSEP     10002
-# define THOUSANDS_SEP THOUSEP
-# define GROUPING    10114
 /* nl_langinfo items of the LC_TIME category */
 # define D_T_FMT     10003
 # define D_FMT       10004
@@ -105,21 +99,6 @@
 # define ALT_DIGITS  10051
 /* nl_langinfo items of the LC_MONETARY category */
 # define CRNCYSTR    10052
-# define CURRENCY_SYMBOL   CRNCYSTR
-# define INT_CURR_SYMBOL   10100
-# define MON_DECIMAL_POINT 10101
-# define MON_THOUSANDS_SEP 10102
-# define MON_GROUPING      10103
-# define POSITIVE_SIGN     10104
-# define NEGATIVE_SIGN     10105
-# define FRAC_DIGITS       10106
-# define INT_FRAC_DIGITS   10107
-# define P_CS_PRECEDES     10108
-# define N_CS_PRECEDES     10109
-# define P_SEP_BY_SPACE    10110
-# define N_SEP_BY_SPACE    10111
-# define P_SIGN_POSN       10112
-# define N_SIGN_POSN       10113
 /* nl_langinfo items of the LC_MESSAGES category */
 # define YESEXPR     10053
 # define NOEXPR      10054
@@ -133,11 +112,6 @@
 #  define GNULIB_defined_CODESET 1
 # endif
 
-# if !@HAVE_LANGINFO_T_FMT_AMPM@
-#  define T_FMT_AMPM  10006
-#  define GNULIB_defined_T_FMT_AMPM 1
-# endif
-
 # if !@HAVE_LANGINFO_ERA@
 #  define ERA         10047
 #  define ERA_D_FMT   10048
@@ -147,12 +121,6 @@
 #  define GNULIB_defined_ERA 1
 # endif
 
-# if !@HAVE_LANGINFO_YESEXPR@
-#  define YESEXPR     10053
-#  define NOEXPR      10054
-#  define GNULIB_defined_YESEXPR 1
-# endif
-
 #endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
@@ -190,5 +158,5 @@
 #endif
 
 
-#endif /* _@GUARD_PREFIX@_LANGINFO_H */
-#endif /* _@GUARD_PREFIX@_LANGINFO_H */
+#endif /* _GL_LANGINFO_H */
+#endif /* _GL_LANGINFO_H */
diff -Nru gettext-0.19.3/gettext-tools/libgrep/localeconv.c gettext-0.18.1.1/gettext-tools/libgrep/localeconv.c
--- gettext-0.19.3/gettext-tools/libgrep/localeconv.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/localeconv.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-/* Query locale dependent information for formatting numbers.
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
-
-   This 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>
-
-/* Specification.  */
-#include <locale.h>
-
-#if HAVE_STRUCT_LCONV_DECIMAL_POINT
-
-/* Override for platforms where 'struct lconv' lacks the int_p_*, int_n_*
-   members.  */
-
-struct lconv *
-localeconv (void)
-{
-  static struct lconv result;
-# undef lconv
-# undef localeconv
-  struct lconv *sys_result = localeconv ();
-
-  result.decimal_point = sys_result->decimal_point;
-  result.thousands_sep = sys_result->thousands_sep;
-  result.grouping = sys_result->grouping;
-  result.mon_decimal_point = sys_result->mon_decimal_point;
-  result.mon_thousands_sep = sys_result->mon_thousands_sep;
-  result.mon_grouping = sys_result->mon_grouping;
-  result.positive_sign = sys_result->positive_sign;
-  result.negative_sign = sys_result->negative_sign;
-  result.currency_symbol = sys_result->currency_symbol;
-  result.frac_digits = sys_result->frac_digits;
-  result.p_cs_precedes = sys_result->p_cs_precedes;
-  result.p_sign_posn = sys_result->p_sign_posn;
-  result.p_sep_by_space = sys_result->p_sep_by_space;
-  result.n_cs_precedes = sys_result->n_cs_precedes;
-  result.n_sign_posn = sys_result->n_sign_posn;
-  result.n_sep_by_space = sys_result->n_sep_by_space;
-  result.int_curr_symbol = sys_result->int_curr_symbol;
-  result.int_frac_digits = sys_result->int_frac_digits;
-  result.int_p_cs_precedes = sys_result->p_cs_precedes;
-  result.int_p_sign_posn = sys_result->p_sign_posn;
-  result.int_p_sep_by_space = sys_result->p_sep_by_space;
-  result.int_n_cs_precedes = sys_result->n_cs_precedes;
-  result.int_n_sign_posn = sys_result->n_sign_posn;
-  result.int_n_sep_by_space = sys_result->n_sep_by_space;
-
-  return &result;
-}
-
-#else
-
-/* Override for platforms where 'struct lconv' is a dummy.  */
-
-# include <limits.h>
-
-struct lconv *
-localeconv (void)
-{
-  static /*const*/ struct lconv result =
-    {
-      /* decimal_point */ ".",
-      /* thousands_sep */ "",
-      /* grouping */ "",
-      /* mon_decimal_point */ "",
-      /* mon_thousands_sep */ "",
-      /* mon_grouping */ "",
-      /* positive_sign */ "",
-      /* negative_sign */ "",
-      /* currency_symbol */ "",
-      /* frac_digits */ CHAR_MAX,
-      /* p_cs_precedes */ CHAR_MAX,
-      /* p_sign_posn */ CHAR_MAX,
-      /* p_sep_by_space */ CHAR_MAX,
-      /* n_cs_precedes */ CHAR_MAX,
-      /* n_sign_posn */ CHAR_MAX,
-      /* n_sep_by_space */ CHAR_MAX,
-      /* int_curr_symbol */ "",
-      /* int_frac_digits */ CHAR_MAX,
-      /* int_p_cs_precedes */ CHAR_MAX,
-      /* int_p_sign_posn */ CHAR_MAX,
-      /* int_p_sep_by_space */ CHAR_MAX,
-      /* int_n_cs_precedes */ CHAR_MAX,
-      /* int_n_sign_posn */ CHAR_MAX,
-      /* int_n_sep_by_space */ CHAR_MAX
-    };
-
-  return &result;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/libgrep/Makefile.am gettext-0.18.1.1/gettext-tools/libgrep/Makefile.am
--- gettext-0.19.3/gettext-tools/libgrep/Makefile.am	2014-05-12 03:39:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -16,7 +16,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 EXTRA_DIST =
 BUILT_SOURCES =
 MOSTLYCLEANFILES = core *.stackdump
diff -Nru gettext-0.19.3/gettext-tools/libgrep/Makefile.gnulib gettext-0.18.1.1/gettext-tools/libgrep/Makefile.gnulib
--- gettext-0.19.3/gettext-tools/libgrep/Makefile.gnulib	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/Makefile.gnulib	2010-06-04 10:11:59.000000000 +0000
@@ -1,33 +1,19 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=alloca-opt --avoid=extensions --avoid=gettext-h --avoid=include_next --avoid=locale --avoid=localcharset --avoid=malloc-posix --avoid=mbrtowc --avoid=mbsinit --avoid=multiarch --avoid=ssize_t --avoid=stdbool --avoid=stddef --avoid=stdint --avoid=stdlib --avoid=streq --avoid=unistd --avoid=verify --avoid=wchar --avoid=wctype-h --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=grgl --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP mbrlen regex
+# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=alloca-opt --avoid=extensions --avoid=gettext-h --avoid=include_next --avoid=localcharset --avoid=malloc-posix --avoid=mbrtowc --avoid=mbsinit --avoid=multiarch --avoid=ssize_t --avoid=stdbool --avoid=stddef --avoid=stdint --avoid=stdlib --avoid=streq --avoid=unistd --avoid=verify --avoid=wchar --avoid=wctype --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=grgl regex
 
 
 MOSTLYCLEANFILES += core *.stackdump
 
-AM_CPPFLAGS += -DIN_GETTEXT_TOOLS_LIBGREP=1
-
 noinst_LIBRARIES += libgrep.a
 
 libgrep_a_SOURCES =
@@ -44,12 +30,29 @@
 
 ## end   gnulib module btowc
 
-## begin gnulib module havelib
+## begin gnulib module c++defs
 
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
 
-EXTRA_DIST += $(top_srcdir)/../build-aux/config.rpath
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
 
-## end   gnulib module havelib
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/../build-aux/c++defs.h
+
+## end   gnulib module c++defs
 
 ## begin gnulib module langinfo
 
@@ -57,20 +60,16 @@
 
 # We need the following in order to create an empty placeholder for
 # <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GRGL|g' \
-	      -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+	  sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
-	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
+	      -e 's|@''GNULIB_NL_LANGINFO''@|$(GNULIB_NL_LANGINFO)|g' \
 	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
 	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
 	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
 	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -84,39 +83,6 @@
 
 ## end   gnulib module langinfo
 
-## begin gnulib module localeconv
-
-
-EXTRA_DIST += localeconv.c
-
-EXTRA_libgrep_a_SOURCES += localeconv.c
-
-## end   gnulib module localeconv
-
-## begin gnulib module lock
-
-libgrep_a_SOURCES += glthread/lock.h glthread/lock.c
-
-## end   gnulib module lock
-
-## begin gnulib module mbrlen
-
-
-EXTRA_DIST += mbrlen.c
-
-EXTRA_libgrep_a_SOURCES += mbrlen.c
-
-## end   gnulib module mbrlen
-
-## begin gnulib module mbtowc
-
-
-EXTRA_DIST += mbtowc-impl.h mbtowc.c
-
-EXTRA_libgrep_a_SOURCES += mbtowc.c
-
-## end   gnulib module mbtowc
-
 ## begin gnulib module nl_langinfo
 
 
@@ -135,57 +101,24 @@
 
 ## end   gnulib module regex
 
-## begin gnulib module snippet/c++defs
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/c++defs.h
-
-## end   gnulib module snippet/c++defs
-
-## begin gnulib module snippet/warn-on-use
+## begin gnulib module warn-on-use
 
 BUILT_SOURCES += warn-on-use.h
 # The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
 
 WARN_ON_USE_H=warn-on-use.h
 
-EXTRA_DIST += $(top_srcdir)/../build-aux/snippet/warn-on-use.h
+EXTRA_DIST += $(top_srcdir)/../build-aux/warn-on-use.h
 
-## end   gnulib module snippet/warn-on-use
-
-## begin gnulib module threadlib
-
-libgrep_a_SOURCES += glthread/threadlib.c
-
-EXTRA_DIST += $(top_srcdir)/../build-aux/config.rpath
-
-## end   gnulib module threadlib
+## end   gnulib module warn-on-use
 
 ## begin gnulib module wcrtomb
 
@@ -196,6 +129,12 @@
 
 ## end   gnulib module wcrtomb
 
+## begin gnulib module dummy
+
+libgrep_a_SOURCES += dummy.c
+
+## end   gnulib module dummy
+
 
 mostlyclean-local: mostlyclean-generic
 	@for dir in '' $(MOSTLYCLEANDIRS); do \
diff -Nru gettext-0.19.3/gettext-tools/libgrep/Makefile.in gettext-0.18.1.1/gettext-tools/libgrep/Makefile.in
--- gettext-0.19.3/gettext-tools/libgrep/Makefile.in	2014-10-16 06:01:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/Makefile.in	2010-06-06 20:12:31.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,78 +15,22 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file 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.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
-# You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=alloca-opt --avoid=extensions --avoid=gettext-h --avoid=include_next --avoid=locale --avoid=localcharset --avoid=malloc-posix --avoid=mbrtowc --avoid=mbsinit --avoid=multiarch --avoid=ssize_t --avoid=stdbool --avoid=stddef --avoid=stdint --avoid=stdlib --avoid=streq --avoid=unistd --avoid=verify --avoid=wchar --avoid=wctype-h --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=grgl --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP mbrlen regex
+# Reproduce by: gnulib-tool --import --dir=gettext-tools --local-dir=gnulib-local --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=alloca-opt --avoid=extensions --avoid=gettext-h --avoid=include_next --avoid=localcharset --avoid=malloc-posix --avoid=mbrtowc --avoid=mbsinit --avoid=multiarch --avoid=ssize_t --avoid=stdbool --avoid=stddef --avoid=stdint --avoid=stdlib --avoid=streq --avoid=unistd --avoid=verify --avoid=wchar --avoid=wctype --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=grgl regex
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -100,71 +45,60 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/../build-aux/mkinstalldirs \
-	ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib \
+	$(srcdir)/Makefile.in ChangeLog
 subdir = libgrep
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -172,12 +106,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -194,7 +125,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -206,7 +136,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -215,26 +144,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -243,17 +166,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -279,7 +198,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -288,7 +206,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -297,26 +214,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -353,82 +268,48 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR      " $@;
-am__v_AR_1 = 
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libgrep_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
-am__dirstamp = $(am__leading_dot)dirstamp
-am_libgrep_a_OBJECTS = glthread/lock.$(OBJEXT) \
-	glthread/threadlib.$(OBJEXT) kwset.$(OBJEXT) m-fgrep.$(OBJEXT) \
-	m-regex.$(OBJEXT)
+am_libgrep_a_OBJECTS = dummy.$(OBJEXT) kwset.$(OBJEXT) \
+	m-fgrep.$(OBJEXT) m-regex.$(OBJEXT)
 libgrep_a_OBJECTS = $(am_libgrep_a_OBJECTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgrep_a_SOURCES) $(EXTRA_libgrep_a_SOURCES)
 DIST_SOURCES = $(libgrep_a_SOURCES) $(EXTRA_libgrep_a_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -437,7 +318,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -475,7 +355,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -512,18 +391,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -535,26 +413,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -562,8 +430,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -575,23 +441,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -614,7 +475,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -632,18 +492,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -668,47 +523,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -716,7 +563,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -726,21 +572,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -752,103 +594,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -859,11 +648,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -873,6 +657,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -885,7 +670,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -906,16 +690,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -938,48 +722,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -1002,6 +771,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1011,13 +781,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1026,47 +799,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1081,8 +823,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1122,7 +862,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1144,8 +883,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1153,13 +892,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1172,21 +909,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1199,9 +934,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1225,9 +960,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1241,12 +974,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1254,8 +984,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1267,41 +995,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1315,27 +1031,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1343,34 +1046,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1386,9 +1080,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1408,8 +1100,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1418,8 +1108,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1434,7 +1122,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1485,6 +1172,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1492,7 +1180,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1502,45 +1189,39 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
 # Allow users to use "gnulib-tool --update".
-EXTRA_DIST = btowc.c $(top_srcdir)/../build-aux/config.rpath \
-	langinfo.in.h localeconv.c mbrlen.c mbtowc-impl.h mbtowc.c \
-	nl_langinfo.c regcomp.c regex.c regex.h regex_internal.c \
-	regex_internal.h regexec.c \
-	$(top_srcdir)/../build-aux/snippet/c++defs.h \
-	$(top_srcdir)/../build-aux/snippet/warn-on-use.h \
-	$(top_srcdir)/../build-aux/config.rpath wcrtomb.c \
+EXTRA_DIST = btowc.c $(top_srcdir)/../build-aux/c++defs.h \
+	langinfo.in.h nl_langinfo.c regcomp.c regex.c regex.h \
+	regex_internal.c regex_internal.h regexec.c \
+	$(top_srcdir)/../build-aux/warn-on-use.h wcrtomb.c \
 	gnulib-m4/gnulib-cache.m4
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = langinfo.h c++defs.h warn-on-use.h
-MOSTLYCLEANFILES = core *.stackdump core *.stackdump langinfo.h \
-	langinfo.h-t c++defs.h c++defs.h-t warn-on-use.h \
+BUILT_SOURCES = c++defs.h langinfo.h warn-on-use.h
+MOSTLYCLEANFILES = core *.stackdump core *.stackdump c++defs.h \
+	c++defs.h-t langinfo.h langinfo.h-t warn-on-use.h \
 	warn-on-use.h-t
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
 noinst_LIBRARIES = libgrep.a
-AM_CPPFLAGS = -I.. -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \
-	-I../intl -DIN_GETTEXT_TOOLS_LIBGREP=1
+AM_CPPFLAGS = -I.. -I../gnulib-lib -I$(top_srcdir)/gnulib-lib -I../intl
 
 # Rules generated and collected by gnulib-tool, for building libgrep.a.
 
 # Sources that are compiled on all platforms.
-libgrep_a_SOURCES = glthread/lock.h glthread/lock.c \
-	glthread/threadlib.c libgrep.h kwset.h kwset.c m-fgrep.c \
+libgrep_a_SOURCES = dummy.c libgrep.h kwset.h kwset.c m-fgrep.c \
 	m-regex.c
 libgrep_a_LIBADD = $(grgl_LIBOBJS)
 libgrep_a_DEPENDENCIES = $(grgl_LIBOBJS)
-EXTRA_libgrep_a_SOURCES = btowc.c localeconv.c mbrlen.c mbtowc.c \
-	nl_langinfo.c regcomp.c regex.c regex_internal.c regexec.c \
-	wcrtomb.c
+EXTRA_libgrep_a_SOURCES = btowc.c nl_langinfo.c regcomp.c regex.c \
+	regex_internal.c regexec.c wcrtomb.c
 CXXDEFS_H = c++defs.h
 WARN_ON_USE_H = warn-on-use.h
 all: $(BUILT_SOURCES)
@@ -1569,7 +1250,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.gnulib:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1582,32 +1262,28 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-glthread/$(am__dirstamp):
-	@$(MKDIR_P) glthread
-	@: > glthread/$(am__dirstamp)
-glthread/lock.$(OBJEXT): glthread/$(am__dirstamp)
-glthread/threadlib.$(OBJEXT): glthread/$(am__dirstamp)
-
-libgrep.a: $(libgrep_a_OBJECTS) $(libgrep_a_DEPENDENCIES) $(EXTRA_libgrep_a_DEPENDENCIES) 
+libgrep.a: $(libgrep_a_OBJECTS) $(libgrep_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libgrep.a
 	$(AM_V_AR)$(libgrep_a_AR) libgrep.a $(libgrep_a_OBJECTS) $(libgrep_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libgrep.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f glthread/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1615,15 +1291,26 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1635,11 +1322,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1648,21 +1339,6 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1713,15 +1389,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -1731,7 +1402,6 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f glthread/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -1810,37 +1480,41 @@
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am
 
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/../build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/../build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
 
 # We need the following in order to create an empty placeholder for
 # <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL_GRGL|g' \
-	      -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+	  sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
-	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
+	      -e 's|@''GNULIB_NL_LANGINFO''@|$(GNULIB_NL_LANGINFO)|g' \
 	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
 	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
 	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
 	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -1848,21 +1522,12 @@
 	      < $(srcdir)/langinfo.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/../build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
 # The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/../build-aux/snippet/warn-on-use.h
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/../build-aux/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/../build-aux/snippet/warn-on-use.h \
+	  < $(top_srcdir)/../build-aux/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 
diff -Nru gettext-0.19.3/gettext-tools/libgrep/mbrlen.c gettext-0.18.1.1/gettext-tools/libgrep/mbrlen.c
--- gettext-0.19.3/gettext-tools/libgrep/mbrlen.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/mbrlen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/* Recognize multibyte character.
-   Copyright (C) 1999-2000, 2008-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-   This 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>
-
-/* Specification.  */
-#include <wchar.h>
-
-
-static mbstate_t internal_state;
-
-size_t
-mbrlen (const char *s, size_t n, mbstate_t *ps)
-{
-  if (ps == NULL)
-    ps = &internal_state;
-  return mbrtowc (NULL, s, n, ps);
-}
diff -Nru gettext-0.19.3/gettext-tools/libgrep/mbtowc.c gettext-0.18.1.1/gettext-tools/libgrep/mbtowc.c
--- gettext-0.19.3/gettext-tools/libgrep/mbtowc.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/mbtowc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* Convert multibyte character to wide character.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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 <stdlib.h>
-
-#include <errno.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "mbtowc-impl.h"
diff -Nru gettext-0.19.3/gettext-tools/libgrep/mbtowc-impl.h gettext-0.18.1.1/gettext-tools/libgrep/mbtowc-impl.h
--- gettext-0.19.3/gettext-tools/libgrep/mbtowc-impl.h	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/mbtowc-impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* Convert multibyte character to wide character.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This 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/>.  */
-
-/* We don't need a static internal state, because the encoding is not state
-   dependent, and when mbrtowc returns (size_t)(-2). we throw the result
-   away. */
-
-int
-mbtowc (wchar_t *pwc, const char *s, size_t n)
-{
-  if (s == NULL)
-    return 0;
-  else
-    {
-      mbstate_t state;
-      wchar_t wc;
-      size_t result;
-
-      memset (&state, 0, sizeof (mbstate_t));
-      result = mbrtowc (&wc, s, n, &state);
-      if (result == (size_t)-1 || result == (size_t)-2)
-        {
-          errno = EILSEQ;
-          return -1;
-        }
-      if (pwc != NULL)
-        *pwc = wc;
-      return (wc == 0 ? 0 : result);
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/libgrep/m-fgrep.c gettext-0.18.1.1/gettext-tools/libgrep/m-fgrep.c
--- gettext-0.19.3/gettext-tools/libgrep/m-fgrep.c	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/m-fgrep.c	2010-06-06 12:49:57.000000000 +0000
@@ -106,7 +106,7 @@
       for (lim = beg; lim < pattern + pattern_size && *lim != '\n'; ++lim)
         ;
       if ((err = kwsincr (ckwset->kwset, beg, lim - beg)) != NULL)
-        error (exit_failure, 0, "%s", err);
+        error (exit_failure, 0, err);
       if (lim < pattern + pattern_size)
         ++lim;
       beg = lim;
@@ -114,7 +114,7 @@
   while (beg < pattern + pattern_size);
 
   if ((err = kwsprep (ckwset->kwset)) != NULL)
-    error (exit_failure, 0, "%s", err);
+    error (exit_failure, 0, err);
   return ckwset;
 }
 
diff -Nru gettext-0.19.3/gettext-tools/libgrep/m-regex.c gettext-0.18.1.1/gettext-tools/libgrep/m-regex.c
--- gettext-0.19.3/gettext-tools/libgrep/m-regex.c	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/m-regex.c	2010-06-06 12:49:57.000000000 +0000
@@ -106,7 +106,7 @@
 
         if ((err = re_compile_pattern (motif, len,
                                        &cregex->patterns[cregex->pcount].regexbuf)) != NULL)
-          error (exit_failure, 0, "%s", err);
+          error (exit_failure, 0, err);
         cregex->pcount++;
 
         motif = sep;
diff -Nru gettext-0.19.3/gettext-tools/libgrep/nl_langinfo.c gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c
--- gettext-0.19.3/gettext-tools/libgrep/nl_langinfo.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c	2010-05-24 14:49:26.000000000 +0000
@@ -1,6 +1,6 @@
 /* nl_langinfo() replacement: query locale dependent information.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,72 +20,13 @@
 /* Specification.  */
 #include <langinfo.h>
 
-#include <locale.h>
-#include <string.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-# include <windows.h>
-# include <stdio.h>
-#endif
-
-/* Return the codeset of the current locale, if this is easily deducible.
-   Otherwise, return "".  */
-static char *
-ctype_codeset (void)
-{
-  static char buf[2 + 10 + 1];
-  size_t buflen = 0;
-  char const *locale = setlocale (LC_CTYPE, NULL);
-  char *codeset = buf;
-  size_t codesetlen;
-  codeset[0] = '\0';
-
-  if (locale && locale[0])
-    {
-      /* If the locale name contains an encoding after the dot, return it.  */
-      char *dot = strchr (locale, '.');
-
-      if (dot)
-        {
-          /* Look for the possible @... trailer and remove it, if any.  */
-          char *codeset_start = dot + 1;
-          char const *modifier = strchr (codeset_start, '@');
-
-          if (! modifier)
-            codeset = codeset_start;
-          else
-            {
-              codesetlen = modifier - codeset_start;
-              if (codesetlen < sizeof buf)
-                {
-                  codeset = memcpy (buf, codeset_start, codesetlen);
-                  codeset[codesetlen] = '\0';
-                }
-            }
-        }
-    }
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* If setlocale is successful, it returns the number of the
-     codepage, as a string.  Otherwise, fall back on Windows API
-     GetACP, which returns the locale's codepage as a number (although
-     this doesn't change according to what the 'setlocale' call specified).
-     Either way, prepend "CP" to make it a valid codeset name.  */
-  codesetlen = strlen (codeset);
-  if (0 < codesetlen && codesetlen < sizeof buf - 2)
-    memmove (buf + 2, codeset, codesetlen + 1);
-  else
-    sprintf (buf + 2, "%u", GetACP ());
-  codeset = memcpy (buf, "CP", 2);
-#endif
-  return codeset;
-}
-
-
 #if REPLACE_NL_LANGINFO
 
 /* Override nl_langinfo with support for added nl_item values.  */
 
+# include <locale.h>
+# include <string.h>
+
 # undef nl_langinfo
 
 char *
@@ -95,11 +36,36 @@
     {
 # if GNULIB_defined_CODESET
     case CODESET:
-      return ctype_codeset ();
-# endif
-# if GNULIB_defined_T_FMT_AMPM
-    case T_FMT_AMPM:
-      return "%I:%M:%S %p";
+      {
+        const char *locale;
+        static char buf[2 + 10 + 1];
+
+        locale = setlocale (LC_CTYPE, NULL);
+        if (locale != NULL && locale[0] != '\0')
+          {
+            /* If the locale name contains an encoding after the dot, return
+               it.  */
+            const char *dot = strchr (locale, '.');
+
+            if (dot != NULL)
+              {
+                const char *modifier;
+
+                dot++;
+                /* Look for the possible @... trailer and remove it, if any.  */
+                modifier = strchr (dot, '@');
+                if (modifier == NULL)
+                  return dot;
+                if (modifier - dot < sizeof (buf))
+                  {
+                    memcpy (buf, dot, modifier - dot);
+                    buf [modifier - dot] = '\0';
+                    return buf;
+                  }
+              }
+          }
+        return "";
+      }
 # endif
 # if GNULIB_defined_ERA
     case ERA:
@@ -127,12 +93,6 @@
          strings, appended in memory.  */
       return "\0\0\0\0\0\0\0\0\0\0";
 # endif
-# if GNULIB_defined_YESEXPR || !FUNC_NL_LANGINFO_YESEXPR_WORKS
-    case YESEXPR:
-      return "^[yY]";
-    case NOEXPR:
-      return "^[nN]";
-# endif
     default:
       break;
     }
@@ -141,28 +101,41 @@
 
 #else
 
-/* Provide nl_langinfo from scratch, either for native MS-Windows, or
-   for old Unix platforms without locales, such as Linux libc5 or
-   BeOS.  */
+/* Provide nl_langinfo from scratch.  */
+
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-# include <time.h>
+/* Native Windows platforms.  */
+
+#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#  include <windows.h>
+
+#  include <stdio.h>
+
+# else
+
+/* An old Unix platform without locales, such as Linux libc5 or BeOS.  */
+
+# endif
+
+# include <locale.h>
 
 char *
 nl_langinfo (nl_item item)
 {
-  static char nlbuf[100];
-  struct tm tmm = { 0 };
-
   switch (item)
     {
     /* nl_langinfo items of the LC_CTYPE category */
     case CODESET:
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
       {
-        char *codeset = ctype_codeset ();
-        if (*codeset)
-          return codeset;
+        static char buf[2 + 10 + 1];
+
+        /* Woe32 has a function returning the locale's codepage as a number.  */
+        sprintf (buf, "CP%u", GetACP ());
+        return buf;
       }
-# ifdef __BEOS__
+# elif defined __BEOS__
       return "UTF-8";
 # else
       return "ISO-8859-1";
@@ -172,8 +145,6 @@
       return localeconv () ->decimal_point;
     case THOUSEP:
       return localeconv () ->thousands_sep;
-    case GROUPING:
-      return localeconv () ->grouping;
     /* nl_langinfo items of the LC_TIME category.
        TODO: Really use the locale.  */
     case D_T_FMT:
@@ -188,126 +159,93 @@
     case T_FMT_AMPM:
       return "%I:%M:%S %p";
     case AM_STR:
-      if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
-        return "AM";
-      return nlbuf;
+      return "AM";
     case PM_STR:
-      tmm.tm_hour = 12;
-      if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
-        return "PM";
-      return nlbuf;
+      return "PM";
     case DAY_1:
+      return "Sunday";
     case DAY_2:
+      return "Monday";
     case DAY_3:
+      return "Tuesday";
     case DAY_4:
+      return "Wednesday";
     case DAY_5:
+      return "Thursday";
     case DAY_6:
+      return "Friday";
     case DAY_7:
-      {
-        static char const days[][sizeof "Wednesday"] = {
-          "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-          "Friday", "Saturday"
-        };
-        tmm.tm_wday = item - DAY_1;
-        if (!strftime (nlbuf, sizeof nlbuf, "%A", &tmm))
-          return (char *) days[item - DAY_1];
-        return nlbuf;
-      }
+      return "Saturday";
     case ABDAY_1:
+      return "Sun";
     case ABDAY_2:
+      return "Mon";
     case ABDAY_3:
+      return "Tue";
     case ABDAY_4:
+      return "Wed";
     case ABDAY_5:
+      return "Thu";
     case ABDAY_6:
+      return "Fri";
     case ABDAY_7:
-      {
-        static char const abdays[][sizeof "Sun"] = {
-          "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-        };
-        tmm.tm_wday = item - ABDAY_1;
-        if (!strftime (nlbuf, sizeof nlbuf, "%a", &tmm))
-          return (char *) abdays[item - ABDAY_1];
-        return nlbuf;
-      }
+      return "Sat";
     case MON_1:
+      return "January";
     case MON_2:
+      return "February";
     case MON_3:
+      return "March";
     case MON_4:
+      return "April";
     case MON_5:
+      return "May";
     case MON_6:
+      return "June";
     case MON_7:
+      return "July";
     case MON_8:
+      return "August";
     case MON_9:
+      return "September";
     case MON_10:
+      return "October";
     case MON_11:
+      return "November";
     case MON_12:
-      {
-        static char const months[][sizeof "September"] = {
-          "January", "February", "March", "April", "May", "June", "July",
-          "September", "October", "November", "December"
-        };
-        tmm.tm_mon = item - MON_1;
-        if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm))
-          return (char *) months[item - MON_1];
-        return nlbuf;
-      }
+      return "December";
     case ABMON_1:
+      return "Jan";
     case ABMON_2:
+      return "Feb";
     case ABMON_3:
+      return "Mar";
     case ABMON_4:
+      return "Apr";
     case ABMON_5:
+      return "May";
     case ABMON_6:
+      return "Jun";
     case ABMON_7:
+      return "Jul";
     case ABMON_8:
+      return "Aug";
     case ABMON_9:
+      return "Sep";
     case ABMON_10:
+      return "Oct";
     case ABMON_11:
+      return "Nov";
     case ABMON_12:
-      {
-        static char const abmonths[][sizeof "Jan"] = {
-          "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
-          "Sep", "Oct", "Nov", "Dec"
-        };
-        tmm.tm_mon = item - ABMON_1;
-        if (!strftime (nlbuf, sizeof nlbuf, "%b", &tmm))
-          return (char *) abmonths[item - ABMON_1];
-        return nlbuf;
-      }
+      return "Dec";
     case ERA:
       return "";
     case ALT_DIGITS:
       return "\0\0\0\0\0\0\0\0\0\0";
-    /* nl_langinfo items of the LC_MONETARY category.  */
+    /* nl_langinfo items of the LC_MONETARY category
+       TODO: Really use the locale. */
     case CRNCYSTR:
-      return localeconv () ->currency_symbol;
-    case INT_CURR_SYMBOL:
-      return localeconv () ->int_curr_symbol;
-    case MON_DECIMAL_POINT:
-      return localeconv () ->mon_decimal_point;
-    case MON_THOUSANDS_SEP:
-      return localeconv () ->mon_thousands_sep;
-    case MON_GROUPING:
-      return localeconv () ->mon_grouping;
-    case POSITIVE_SIGN:
-      return localeconv () ->positive_sign;
-    case NEGATIVE_SIGN:
-      return localeconv () ->negative_sign;
-    case FRAC_DIGITS:
-      return & localeconv () ->frac_digits;
-    case INT_FRAC_DIGITS:
-      return & localeconv () ->int_frac_digits;
-    case P_CS_PRECEDES:
-      return & localeconv () ->p_cs_precedes;
-    case N_CS_PRECEDES:
-      return & localeconv () ->n_cs_precedes;
-    case P_SEP_BY_SPACE:
-      return & localeconv () ->p_sep_by_space;
-    case N_SEP_BY_SPACE:
-      return & localeconv () ->n_sep_by_space;
-    case P_SIGN_POSN:
-      return & localeconv () ->p_sign_posn;
-    case N_SIGN_POSN:
-      return & localeconv () ->n_sign_posn;
+      return "-";
     /* nl_langinfo items of the LC_MESSAGES category
        TODO: Really use the locale. */
     case YESEXPR:
diff -Nru gettext-0.19.3/gettext-tools/libgrep/regcomp.c gettext-0.18.1.1/gettext-tools/libgrep/regcomp.c
--- gettext-0.19.3/gettext-tools/libgrep/regcomp.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/regcomp.c	2010-05-24 14:49:27.000000000 +0000
@@ -1,21 +1,22 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
-   The GNU C Library 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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
 					  size_t length, reg_syntax_t syntax);
@@ -94,20 +95,20 @@
 				      bitset_t sbcset,
 				      re_charset_t *mbcset,
 				      Idx *char_class_alloc,
-				      const char *class_name,
+				      const unsigned char *class_name,
 				      reg_syntax_t syntax);
 #else  /* not RE_ENABLE_I18N */
 static reg_errcode_t build_equiv_class (bitset_t sbcset,
 					const unsigned char *name);
 static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
 				      bitset_t sbcset,
-				      const char *class_name,
+				      const unsigned char *class_name,
 				      reg_syntax_t syntax);
 #endif /* not RE_ENABLE_I18N */
 static bin_tree_t *build_charclass_op (re_dfa_t *dfa,
 				       RE_TRANSLATE_TYPE trans,
-				       const char *class_name,
-				       const char *extra,
+				       const unsigned char *class_name,
+				       const unsigned char *extra,
 				       bool non_match, reg_errcode_t *err);
 static bin_tree_t *create_tree (re_dfa_t *dfa,
 				bin_tree_t *left, bin_tree_t *right,
@@ -206,7 +207,7 @@
    compiles PATTERN (of length LENGTH) and puts the result in BUFP.
    Returns 0 if the pattern was valid, otherwise an error string.
 
-   Assumes the 'allocated' (and perhaps 'buffer') and 'translate' fields
+   Assumes the `allocated' (and perhaps `buffer') and `translate' fields
    are set in BUFP on entry.  */
 
 #ifdef _LIBC
@@ -241,7 +242,7 @@
 weak_alias (__re_compile_pattern, re_compile_pattern)
 #endif
 
-/* Set by 're_set_syntax' to the current regexp syntax to recognize.  Can
+/* Set by `re_set_syntax' to the current regexp syntax to recognize.  Can
    also be assigned to arbitrarily: each pattern buffer stores its own
    syntax, so it can be changed between regex compilations.  */
 /* This has no initializer because initialized variables in Emacs
@@ -273,7 +274,7 @@
 re_compile_fastmap (bufp)
     struct re_pattern_buffer *bufp;
 {
-  re_dfa_t *dfa = bufp->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
   char *fastmap = bufp->fastmap;
 
   memset (fastmap, '\0', sizeof (char) * SBC_MAX);
@@ -292,7 +293,7 @@
 #endif
 
 static inline void
-__attribute__ ((always_inline))
+__attribute ((always_inline))
 re_set_fastmap (char *fastmap, bool icase, int ch)
 {
   fastmap[ch] = 1;
@@ -307,7 +308,7 @@
 re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
 			 char *fastmap)
 {
-  re_dfa_t *dfa = bufp->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
   Idx node_cnt;
   bool icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE));
   for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt)
@@ -439,15 +440,15 @@
    PREG is a regex_t *.  We do not expect any fields to be initialized,
    since POSIX says we shouldn't.  Thus, we set
 
-     'buffer' to the compiled pattern;
-     'used' to the length of the compiled pattern;
-     'syntax' to RE_SYNTAX_POSIX_EXTENDED if the
+     `buffer' to the compiled pattern;
+     `used' to the length of the compiled pattern;
+     `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
        REG_EXTENDED bit in CFLAGS is set; otherwise, to
        RE_SYNTAX_POSIX_BASIC;
-     'newline_anchor' to REG_NEWLINE being set in CFLAGS;
-     'fastmap' to an allocated space for the fastmap;
-     'fastmap_accurate' to zero;
-     're_nsub' to the number of subexpressions in PATTERN.
+     `newline_anchor' to REG_NEWLINE being set in CFLAGS;
+     `fastmap' to an allocated space for the fastmap;
+     `fastmap_accurate' to zero;
+     `re_nsub' to the number of subexpressions in PATTERN.
 
    PATTERN is the address of the pattern string.
 
@@ -586,23 +587,19 @@
 static const bitset_t utf8_sb_map =
 {
   /* Set the first 128 bits.  */
-# if defined __GNUC__ && !defined __STRICT_ANSI__
-  [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
-# else
-#  if 4 * BITSET_WORD_BITS < ASCII_CHARS
-#   error "bitset_word_t is narrower than 32 bits"
-#  elif 3 * BITSET_WORD_BITS < ASCII_CHARS
+# if 4 * BITSET_WORD_BITS < ASCII_CHARS
+#  error "bitset_word_t is narrower than 32 bits"
+# elif 3 * BITSET_WORD_BITS < ASCII_CHARS
   BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX,
-#  elif 2 * BITSET_WORD_BITS < ASCII_CHARS
+# elif 2 * BITSET_WORD_BITS < ASCII_CHARS
   BITSET_WORD_MAX, BITSET_WORD_MAX,
-#  elif 1 * BITSET_WORD_BITS < ASCII_CHARS
+# elif 1 * BITSET_WORD_BITS < ASCII_CHARS
   BITSET_WORD_MAX,
-#  endif
+# endif
   (BITSET_WORD_MAX
    >> (SBC_MAX % BITSET_WORD_BITS == 0
        ? 0
        : BITSET_WORD_BITS - SBC_MAX % BITSET_WORD_BITS))
-# endif
 };
 #endif
 
@@ -661,12 +658,9 @@
 regfree (preg)
     regex_t *preg;
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   if (BE (dfa != NULL, 1))
-    {
-      lock_fini (dfa->lock);
-      free_dfa_content (dfa);
-    }
+    free_dfa_content (dfa);
   preg->buffer = NULL;
   preg->allocated = 0;
 
@@ -725,7 +719,7 @@
 				 + __re_error_msgid_idx[(int) REG_ESPACE]);
     }
 
-  /* Since 're_exec' always passes NULL for the 'regs' argument, we
+  /* Since `re_exec' always passes NULL for the `regs' argument, we
      don't need to initialize the pattern buffer fields which affect it.  */
 
   /* Match anchors at newlines.  */
@@ -736,7 +730,7 @@
   if (!ret)
     return NULL;
 
-  /* Yes, we're discarding 'const' here if !HAVE_LIBINTL.  */
+  /* Yes, we're discarding `const' here if !HAVE_LIBINTL.  */
   return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
 }
 
@@ -771,7 +765,7 @@
   preg->regs_allocated = REGS_UNALLOCATED;
 
   /* Initialize the dfa.  */
-  dfa = preg->buffer;
+  dfa = (re_dfa_t *) preg->buffer;
   if (BE (preg->allocated < sizeof (re_dfa_t), 0))
     {
       /* If zero allocated, but buffer is non-null, try to realloc
@@ -782,13 +776,11 @@
       if (dfa == NULL)
 	return REG_ESPACE;
       preg->allocated = sizeof (re_dfa_t);
-      preg->buffer = dfa;
+      preg->buffer = (unsigned char *) dfa;
     }
   preg->used = sizeof (re_dfa_t);
 
   err = init_dfa (dfa, length);
-  if (BE (err == REG_NOERROR && lock_init (dfa->lock) != 0, 0))
-    err = REG_ESPACE;
   if (BE (err != REG_NOERROR, 0))
     {
       free_dfa_content (dfa);
@@ -802,6 +794,8 @@
   strncpy (dfa->re_str, pattern, length + 1);
 #endif
 
+  __libc_lock_init (dfa->lock);
+
   err = re_string_construct (&regexp, pattern, length, preg->translate,
 			     (syntax & RE_ICASE) != 0, dfa);
   if (BE (err != REG_NOERROR, 0))
@@ -809,7 +803,6 @@
     re_compile_internal_free_return:
       free_workarea_compile (preg);
       re_string_destruct (&regexp);
-      lock_fini (dfa->lock);
       free_dfa_content (dfa);
       preg->buffer = NULL;
       preg->allocated = 0;
@@ -842,7 +835,6 @@
 
   if (BE (err != REG_NOERROR, 0))
     {
-      lock_fini (dfa->lock);
       free_dfa_content (dfa);
       preg->buffer = NULL;
       preg->allocated = 0;
@@ -859,7 +851,7 @@
 {
   __re_size_t table_size;
 #ifndef _LIBC
-  const char *codeset_name;
+  char *codeset_name;
 #endif
 #ifdef RE_ENABLE_I18N
   size_t max_i18n_object_size = MAX (sizeof (wchar_t), sizeof (wctype_t));
@@ -882,7 +874,7 @@
      calculation below, and for similar doubling calculations
      elsewhere.  And it's <= rather than <, because some of the
      doubling calculations add 1 afterwards.  */
-  if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) / 2 <= pat_len, 0))
+  if (BE (SIZE_MAX / max_object_size / 2 <= pat_len, 0))
     return REG_ESPACE;
 
   dfa->nodes_alloc = pat_len + 1;
@@ -905,10 +897,8 @@
 		       != 0);
 #else
   codeset_name = nl_langinfo (CODESET);
-  if ((codeset_name[0] == 'U' || codeset_name[0] == 'u')
-      && (codeset_name[1] == 'T' || codeset_name[1] == 't')
-      && (codeset_name[2] == 'F' || codeset_name[2] == 'f')
-      && strcmp (codeset_name + 3 + (codeset_name[3] == '-'), "8") == 0)
+  if (strcasecmp (codeset_name, "UTF-8") == 0
+      || strcasecmp (codeset_name, "UTF8") == 0)
     dfa->is_utf8 = 1;
 
   /* We check exhaustively in the loop below if this charset is a
@@ -958,43 +948,9 @@
 internal_function
 init_word_char (re_dfa_t *dfa)
 {
-  int i = 0;
-  int j;
-  int ch = 0;
+  int i, j, ch;
   dfa->word_ops_used = 1;
-  if (BE (dfa->map_notascii == 0, 1))
-    {
-      bitset_word_t bits0 = 0x00000000;
-      bitset_word_t bits1 = 0x03ff0000;
-      bitset_word_t bits2 = 0x87fffffe;
-      bitset_word_t bits3 = 0x07fffffe;
-      if (BITSET_WORD_BITS == 64)
-	{
-	  dfa->word_char[0] = bits1 << 31 << 1 | bits0;
-	  dfa->word_char[1] = bits3 << 31 << 1 | bits2;
-	  i = 2;
-	}
-      else if (BITSET_WORD_BITS == 32)
-	{
-	  dfa->word_char[0] = bits0;
-	  dfa->word_char[1] = bits1;
-	  dfa->word_char[2] = bits2;
-	  dfa->word_char[3] = bits3;
-	  i = 4;
-	}
-      else
-        goto general_case;
-      ch = 128;
-
-      if (BE (dfa->is_utf8, 1))
-	{
-	  memset (&dfa->word_char[i], '\0', (SBC_MAX - ch) / 8);
-	  return;
-	}
-    }
-
- general_case:
-  for (; i < BITSET_WORDS; ++i)
+  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
     for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
       if (isalnum (ch) || ch == '_')
 	dfa->word_char[i] |= (bitset_word_t) 1 << j;
@@ -1005,7 +961,7 @@
 static void
 free_workarea_compile (regex_t *preg)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_storage_t *storage, *next;
   for (storage = dfa->str_tree_storage; storage; storage = next)
     {
@@ -1189,7 +1145,7 @@
 static reg_errcode_t
 analyze (regex_t *preg)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   reg_errcode_t ret;
 
   /* Allocate arrays.  */
@@ -1370,7 +1326,7 @@
 static bin_tree_t *
 lower_subexp (reg_errcode_t *err, regex_t *preg, bin_tree_t *node)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *body = node->left;
   bin_tree_t *op, *cls, *tree1, *tree;
 
@@ -1704,7 +1660,7 @@
       /* If we have already calculated, skip it.  */
       if (dfa->eclosures[node_idx].nelem != 0)
 	continue;
-      /* Calculate epsilon closure of 'node_idx'.  */
+      /* Calculate epsilon closure of `node_idx'.  */
       err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, true);
       if (BE (err != REG_NOERROR, 0))
 	return err;
@@ -1754,14 +1710,14 @@
       {
 	re_node_set eclosure_elem;
 	Idx edest = dfa->edests[node].elems[i];
-	/* If calculating the epsilon closure of 'edest' is in progress,
+	/* If calculating the epsilon closure of `edest' is in progress,
 	   return intermediate result.  */
 	if (dfa->eclosures[edest].nelem == REG_MISSING)
 	  {
 	    incomplete = true;
 	    continue;
 	  }
-	/* If we haven't calculated the epsilon closure of 'edest' yet,
+	/* If we haven't calculated the epsilon closure of `edest' yet,
 	   calculate now. Otherwise use calculated epsilon closure.  */
 	if (dfa->eclosures[edest].nelem == 0)
 	  {
@@ -1771,11 +1727,11 @@
 	  }
 	else
 	  eclosure_elem = dfa->eclosures[edest];
-	/* Merge the epsilon closure of 'edest'.  */
+	/* Merge the epsilon closure of `edest'.  */
 	err = re_node_set_merge (&eclosure, &eclosure_elem);
 	if (BE (err != REG_NOERROR, 0))
 	  return err;
-	/* If the epsilon closure of 'edest' is incomplete,
+	/* If the epsilon closure of `edest' is incomplete,
 	   the epsilon closure of this node is also incomplete.  */
 	if (dfa->eclosures[edest].nelem == 0)
 	  {
@@ -2137,7 +2093,7 @@
 
 /* Entry point of the parser.
    Parse the regular expression REGEXP and return the structure tree.
-   If an error occurs, ERR is set by error code, and return NULL.
+   If an error is occured, ERR is set by error code, and return NULL.
    This function build the following tree, from regular expression <reg_exp>:
 	   CAT
 	   / \
@@ -2151,7 +2107,7 @@
 parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax,
        reg_errcode_t *err)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree, *eor, *root;
   re_token_t current_token;
   dfa->syntax = syntax;
@@ -2179,13 +2135,13 @@
 	  /   \
    <branch1> <branch2>
 
-   ALT means alternative, which represents the operator '|'.  */
+   ALT means alternative, which represents the operator `|'.  */
 
 static bin_tree_t *
 parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
 	       reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree, *branch = NULL;
   tree = parse_branch (regexp, preg, token, syntax, nest, err);
   if (BE (*err != REG_NOERROR && tree == NULL, 0))
@@ -2199,11 +2155,7 @@
 	{
 	  branch = parse_branch (regexp, preg, token, syntax, nest, err);
 	  if (BE (*err != REG_NOERROR && branch == NULL, 0))
-	    {
-	      if (tree != NULL)
-		postorder (tree, free_tree, NULL);
-	      return NULL;
-	    }
+	    return NULL;
 	}
       else
 	branch = NULL;
@@ -2231,7 +2183,7 @@
 	      reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
 {
   bin_tree_t *tree, *expr;
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   tree = parse_expression (regexp, preg, token, syntax, nest, err);
   if (BE (*err != REG_NOERROR && tree == NULL, 0))
     return NULL;
@@ -2242,21 +2194,16 @@
       expr = parse_expression (regexp, preg, token, syntax, nest, err);
       if (BE (*err != REG_NOERROR && expr == NULL, 0))
 	{
-	  if (tree != NULL)
-	    postorder (tree, free_tree, NULL);
 	  return NULL;
 	}
       if (tree != NULL && expr != NULL)
 	{
-	  bin_tree_t *newtree = create_tree (dfa, tree, expr, CONCAT);
-	  if (newtree == NULL)
+	  tree = create_tree (dfa, tree, expr, CONCAT);
+	  if (tree == NULL)
 	    {
-	      postorder (expr, free_tree, NULL);
-	      postorder (tree, free_tree, NULL);
 	      *err = REG_ESPACE;
 	      return NULL;
 	    }
-	  tree = newtree;
 	}
       else if (tree == NULL)
 	tree = expr;
@@ -2275,7 +2222,7 @@
 parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
 		  reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree;
   switch (token->type)
     {
@@ -2431,8 +2378,8 @@
     case OP_WORD:
     case OP_NOTWORD:
       tree = build_charclass_op (dfa, regexp->trans,
-				 "alnum",
-				 "_",
+				 (const unsigned char *) "alnum",
+				 (const unsigned char *) "_",
 				 token->type == OP_NOTWORD, err);
       if (BE (*err != REG_NOERROR && tree == NULL, 0))
 	return NULL;
@@ -2440,8 +2387,8 @@
     case OP_SPACE:
     case OP_NOTSPACE:
       tree = build_charclass_op (dfa, regexp->trans,
-				 "space",
-				 "",
+				 (const unsigned char *) "space",
+				 (const unsigned char *) "",
 				 token->type == OP_NOTSPACE, err);
       if (BE (*err != REG_NOERROR && tree == NULL, 0))
 	return NULL;
@@ -2464,22 +2411,14 @@
   while (token->type == OP_DUP_ASTERISK || token->type == OP_DUP_PLUS
 	 || token->type == OP_DUP_QUESTION || token->type == OP_OPEN_DUP_NUM)
     {
-      bin_tree_t *dup_tree = parse_dup_op (tree, regexp, dfa, token,
-					   syntax, err);
-      if (BE (*err != REG_NOERROR && dup_tree == NULL, 0))
-	{
-	  if (tree != NULL)
-	    postorder (tree, free_tree, NULL);
-	  return NULL;
-	}
-      tree = dup_tree;
+      tree = parse_dup_op (tree, regexp, dfa, token, syntax, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
       /* In BRE consecutive duplications are not allowed.  */
       if ((syntax & RE_CONTEXT_INVALID_DUP)
 	  && (token->type == OP_DUP_ASTERISK
 	      || token->type == OP_OPEN_DUP_NUM))
 	{
-	  if (tree != NULL)
-	    postorder (tree, free_tree, NULL);
 	  *err = REG_BADRPT;
 	  return NULL;
 	}
@@ -2499,7 +2438,7 @@
 parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
 	       reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
 {
-  re_dfa_t *dfa = preg->buffer;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree;
   size_t cur_nsub;
   cur_nsub = preg->re_nsub++;
@@ -2513,11 +2452,7 @@
     {
       tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
       if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
-	{
-	  if (tree != NULL)
-	    postorder (tree, free_tree, NULL);
-	  *err = REG_EPAREN;
-	}
+	*err = REG_EPAREN;
       if (BE (*err != REG_NOERROR, 0))
 	return NULL;
     }
@@ -2595,12 +2530,6 @@
 	  *err = REG_BADBR;
 	  return NULL;
 	}
-
-      if (BE (RE_DUP_MAX < (end == REG_MISSING ? start : end), 0))
-	{
-	  *err = REG_ESIZE;
-	  return NULL;
-	}
     }
   else
     {
@@ -2635,18 +2564,13 @@
 
       /* Duplicate ELEM before it is marked optional.  */
       elem = duplicate_tree (elem, dfa);
-      if (BE (elem == NULL, 0))
-        goto parse_dup_op_espace;
       old_tree = tree;
     }
   else
     old_tree = NULL;
 
   if (elem->token.type == SUBEXP)
-    {
-      uintptr_t subidx = elem->token.opr.idx;
-      postorder (elem, mark_opt_subexp, (void *) subidx);
-    }
+    postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx);
 
   tree = create_tree (dfa, elem, NULL,
 		      (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT));
@@ -2692,7 +2616,7 @@
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
-     mbcset->range_ends, is a pointer argument since we may
+     mbcset->range_ends, is a pointer argument sinse we may
      update it.  */
 
 static reg_errcode_t
@@ -2731,6 +2655,7 @@
     wchar_t wc;
     wint_t start_wc;
     wint_t end_wc;
+    wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
 
     start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch
 		: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
@@ -2744,7 +2669,11 @@
 	      ? __btowc (end_ch) : 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))
+    cmp_buf[0] = start_wc;
+    cmp_buf[4] = end_wc;
+
+    if (BE ((syntax & RE_NO_EMPTY_RANGES)
+            && wcscoll (cmp_buf, cmp_buf + 4) > 0, 0))
       return REG_ERANGE;
 
     /* Got valid collation sequence values, add them as a new entry.
@@ -2785,7 +2714,9 @@
     /* Build the table for single byte characters.  */
     for (wc = 0; wc < SBC_MAX; ++wc)
       {
-	if (start_wc <= wc && wc <= end_wc)
+	cmp_buf[2] = wc;
+	if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
+	    && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
 	  bitset_set (sbcset, wc);
       }
   }
@@ -2819,12 +2750,11 @@
 
 static reg_errcode_t
 internal_function
+build_collating_symbol (bitset_t sbcset,
 # ifdef RE_ENABLE_I18N
-build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
-			Idx *coll_sym_alloc, const unsigned char *name)
-# else /* not RE_ENABLE_I18N */
-build_collating_symbol (bitset_t sbcset, const unsigned char *name)
-# endif /* not RE_ENABLE_I18N */
+			re_charset_t *mbcset, Idx *coll_sym_alloc,
+# endif
+			const unsigned char *name)
 {
   size_t name_len = strlen ((const char *) name);
   if (BE (name_len != 1, 0))
@@ -2852,31 +2782,42 @@
   const int32_t *symb_table;
   const unsigned char *extra;
 
-  /* Local function for parse_bracket_exp used in _LIBC environment.
-     Seek the collating symbol entry corresponding to NAME.
-     Return the index of the symbol in the SYMB_TABLE,
-     or -1 if not found.  */
+  /* Local function for parse_bracket_exp used in _LIBC environement.
+     Seek the collating symbol entry correspondings to NAME.
+     Return the index of the symbol in the SYMB_TABLE.  */
 
   auto inline int32_t
-  __attribute__ ((always_inline))
-  seek_collating_symbol_entry (const unsigned char *name, size_t name_len)
-    {
-      int32_t elem;
+  __attribute ((always_inline))
+  seek_collating_symbol_entry (name, name_len)
+	 const unsigned char *name;
+	 size_t name_len;
+    {
+      int32_t hash = elem_hash ((const char *) name, name_len);
+      int32_t elem = hash % table_size;
+      if (symb_table[2 * elem] != 0)
+	{
+	  int32_t second = hash % (table_size - 2) + 1;
+
+	  do
+	    {
+	      /* First compare the hashing value.  */
+	      if (symb_table[2 * elem] == hash
+		  /* Compare the length of the name.  */
+		  && name_len == extra[symb_table[2 * elem + 1]]
+		  /* Compare the name.  */
+		  && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
+			     name_len) == 0)
+		{
+		  /* Yep, this is the entry.  */
+		  break;
+		}
 
-      for (elem = 0; elem < table_size; elem++)
-	if (symb_table[2 * elem] != 0)
-	  {
-	    int32_t idx = symb_table[2 * elem + 1];
-	    /* Skip the name of collating element name.  */
-	    idx += 1 + extra[idx];
-	    if (/* Compare the length of the name.  */
-		name_len == extra[idx]
-		/* Compare the name.  */
-		&& memcmp (name, &extra[idx + 1], name_len) == 0)
-	      /* Yep, this is the entry.  */
-	      return elem;
-	  }
-      return -1;
+	      /* Next entry.  */
+	      elem += second;
+	    }
+	  while (symb_table[2 * elem] != 0);
+	}
+      return elem;
     }
 
   /* Local function for parse_bracket_exp used in _LIBC environment.
@@ -2884,8 +2825,9 @@
      Return the value if succeeded, UINT_MAX otherwise.  */
 
   auto inline unsigned int
-  __attribute__ ((always_inline))
-  lookup_collation_sequence_value (bracket_elem_t *br_elem)
+  __attribute ((always_inline))
+  lookup_collation_sequence_value (br_elem)
+	 bracket_elem_t *br_elem;
     {
       if (br_elem->type == SB_CHAR)
 	{
@@ -2913,7 +2855,7 @@
 	      int32_t elem, idx;
 	      elem = seek_collating_symbol_entry (br_elem->opr.name,
 						  sym_name_len);
-	      if (elem != -1)
+	      if (symb_table[2 * elem] != 0)
 		{
 		  /* We found the entry.  */
 		  idx = symb_table[2 * elem + 1];
@@ -2931,7 +2873,7 @@
 		  /* Return the collation sequence value.  */
 		  return *(unsigned int *) (extra + idx);
 		}
-	      else if (sym_name_len == 1)
+	      else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
 		{
 		  /* No valid character.  Match it as a single byte
 		     character.  */
@@ -2944,17 +2886,20 @@
       return UINT_MAX;
     }
 
-  /* Local function for parse_bracket_exp used in _LIBC environment.
+  /* Local function for parse_bracket_exp used in _LIBC environement.
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
-     mbcset->range_ends, is a pointer argument since we may
+     mbcset->range_ends, is a pointer argument sinse we may
      update it.  */
 
   auto inline reg_errcode_t
-  __attribute__ ((always_inline))
-  build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,
-		   bracket_elem_t *start_elem, bracket_elem_t *end_elem)
+  __attribute ((always_inline))
+  build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
+	 re_charset_t *mbcset;
+	 Idx *range_alloc;
+	 bitset_t sbcset;
+	 bracket_elem_t *start_elem, *end_elem;
     {
       unsigned int ch;
       uint32_t start_collseq;
@@ -2967,7 +2912,6 @@
 	      0))
 	return REG_ERANGE;
 
-      /* FIXME: Implement rational ranges here, too.  */
       start_collseq = lookup_collation_sequence_value (start_elem);
       end_collseq = lookup_collation_sequence_value (end_elem);
       /* Check start/end collation sequence values.  */
@@ -3026,30 +2970,33 @@
       return REG_NOERROR;
     }
 
-  /* Local function for parse_bracket_exp used in _LIBC environment.
+  /* Local function for parse_bracket_exp used in _LIBC environement.
      Build the collating element which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
-     pointer argument since we may update it.  */
+     pointer argument sinse we may update it.  */
 
   auto inline reg_errcode_t
-  __attribute__ ((always_inline))
-  build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
-			  Idx *coll_sym_alloc, const unsigned char *name)
+  __attribute ((always_inline))
+  build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
+	 re_charset_t *mbcset;
+	 Idx *coll_sym_alloc;
+	 bitset_t sbcset;
+	 const unsigned char *name;
     {
       int32_t elem, idx;
       size_t name_len = strlen ((const char *) name);
       if (nrules != 0)
 	{
 	  elem = seek_collating_symbol_entry (name, name_len);
-	  if (elem != -1)
+	  if (symb_table[2 * elem] != 0)
 	    {
 	      /* We found the entry.  */
 	      idx = symb_table[2 * elem + 1];
 	      /* Skip the name of collating element name.  */
 	      idx += 1 + extra[idx];
 	    }
-	  else if (name_len == 1)
+	  else if (symb_table[2 * elem] == 0 && name_len == 1)
 	    {
 	      /* No valid character, treat it as a normal
 		 character.  */
@@ -3129,10 +3076,6 @@
   if (BE (sbcset == NULL, 0))
 #endif /* RE_ENABLE_I18N */
     {
-      re_free (sbcset);
-#ifdef RE_ENABLE_I18N
-      re_free (mbcset);
-#endif
       *err = REG_ESPACE;
       return NULL;
     }
@@ -3292,8 +3235,7 @@
 #ifdef RE_ENABLE_I18N
 				      mbcset, &char_class_alloc,
 #endif /* RE_ENABLE_I18N */
-				      (const char *) start_elem.opr.name,
-				      syntax);
+				      start_elem.opr.name, syntax);
 	      if (BE (*err != REG_NOERROR, 0))
 	       goto parse_bracket_exp_free_return;
 	      break;
@@ -3472,7 +3414,7 @@
      Build the equivalence class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
-     is a pointer argument since we may update it.  */
+     is a pointer argument sinse we may update it.  */
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
@@ -3503,18 +3445,19 @@
 						   _NL_COLLATE_EXTRAMB);
       indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
 						_NL_COLLATE_INDIRECTMB);
-      idx1 = findidx (&cp, -1);
-      if (BE (idx1 == 0 || *cp != '\0', 0))
+      idx1 = findidx (&cp);
+      if (BE (idx1 == 0 || cp < name + strlen ((const char *) name), 0))
 	/* This isn't a valid character.  */
 	return REG_ECOLLATE;
 
-      /* Build single byte matching table for this equivalence class.  */
+      /* Build single byte matcing table for this equivalence class.  */
+      char_buf[1] = (unsigned char) '\0';
       len = weights[idx1 & 0xffffff];
       for (ch = 0; ch < SBC_MAX; ++ch)
 	{
 	  char_buf[0] = ch;
 	  cp = char_buf;
-	  idx2 = findidx (&cp, 1);
+	  idx2 = findidx (&cp);
 /*
 	  idx2 = table[ch];
 */
@@ -3567,20 +3510,20 @@
      Build the character class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
-     is a pointer argument since we may update it.  */
+     is a pointer argument sinse we may update it.  */
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
 build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
 		 re_charset_t *mbcset, Idx *char_class_alloc,
-		 const char *class_name, reg_syntax_t syntax)
+		 const unsigned char *class_name, reg_syntax_t syntax)
 #else /* not RE_ENABLE_I18N */
 build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
-		 const char *class_name, reg_syntax_t syntax)
+		 const unsigned char *class_name, reg_syntax_t syntax)
 #endif /* not RE_ENABLE_I18N */
 {
   int i;
-  const char *name = class_name;
+  const char *name = (const char *) class_name;
 
   /* In case of REG_ICASE "upper" and "lower" match the both of
      upper and lower cases.  */
@@ -3654,8 +3597,8 @@
 
 static bin_tree_t *
 build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
-		    const char *class_name,
-		    const char *extra, bool non_match,
+		    const unsigned char *class_name,
+		    const unsigned char *extra, bool non_match,
 		    reg_errcode_t *err)
 {
   re_bitset_ptr_t sbcset;
@@ -3761,9 +3704,8 @@
 }
 
 /* This is intended for the expressions like "a{1,3}".
-   Fetch a number from 'input', and return the number.
+   Fetch a number from `input', and return the number.
    Return REG_MISSING 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.  */
 
 static Idx
@@ -3782,9 +3724,8 @@
       num = ((token->type != CHARACTER || c < '0' || '9' < c
 	      || num == REG_ERROR)
 	     ? REG_ERROR
-	     : num == REG_MISSING
-	     ? c - '0'
-	     : MIN (RE_DUP_MAX + 1, num * 10 + c - '0'));
+	     : ((num == REG_MISSING) ? c - '0' : num * 10 + c - '0'));
+      num = (num > RE_DUP_MAX) ? REG_ERROR : num;
     }
   return num;
 }
@@ -3858,7 +3799,7 @@
 static reg_errcode_t
 mark_opt_subexp (void *extra, bin_tree_t *node)
 {
-  Idx idx = (uintptr_t) extra;
+  Idx idx = (Idx) (long) extra;
   if (node->token.type == SUBEXP && node->token.opr.idx == idx)
     node->token.opt_subexp = 1;
 
diff -Nru gettext-0.19.3/gettext-tools/libgrep/regex.c gettext-0.18.1.1/gettext-tools/libgrep/regex.c
--- gettext-0.19.3/gettext-tools/libgrep/regex.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/regex.c	2010-06-03 21:36:52.000000000 +0000
@@ -1,35 +1,26 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
-   The GNU C Library 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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifndef _LIBC
-# include <config.h>
+#include <config.h>
 
-# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-#  pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
-# endif
-# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
-#  pragma GCC diagnostic ignored "-Wold-style-definition"
-#  pragma GCC diagnostic ignored "-Wtype-limits"
-# endif
-#endif
-
-/* Make sure no one compiles this code with a C++ compiler.  */
+/* Make sure noone compiles this code with a C++ compiler.  */
 #if defined __cplusplus && defined _LIBC
 # error "This is C code, use a C compiler"
 #endif
diff -Nru gettext-0.19.3/gettext-tools/libgrep/regexec.c gettext-0.18.1.1/gettext-tools/libgrep/regexec.c
--- gettext-0.19.3/gettext-tools/libgrep/regexec.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/regexec.c	2010-05-24 14:49:27.000000000 +0000
@@ -1,21 +1,22 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
-   The GNU C Library 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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
 				     Idx n) internal_function;
@@ -51,8 +52,9 @@
 				regoff_t range, Idx stop,
 				struct re_registers *regs,
 				bool ret_len) internal_function;
-static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
-                              Idx nregs, int regs_allocated) internal_function;
+static unsigned int re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
+				  Idx nregs, int regs_allocated)
+     internal_function;
 static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx)
      internal_function;
 static Idx check_matching (re_match_context_t *mctx, bool fl_longest_match,
@@ -199,7 +201,7 @@
 static bool check_node_accept (const re_match_context_t *mctx,
 			       const re_token_t *node, Idx idx)
      internal_function;
-static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
+static reg_errcode_t extend_buffers (re_match_context_t *mctx)
      internal_function;
 
 /* Entry point for POSIX code.  */
@@ -208,11 +210,11 @@
    string STRING.
 
    If NMATCH is zero or REG_NOSUB was set in the cflags argument to
-   'regcomp', we ignore PMATCH.  Otherwise, we assume PMATCH has at
+   `regcomp', we ignore PMATCH.  Otherwise, we assume PMATCH has at
    least NMATCH elements, and we set them to the offsets of the
    corresponding matched substrings.
 
-   EFLAGS specifies "execution flags" which affect matching: if
+   EFLAGS specifies `execution flags' which affect matching: if
    REG_NOTBOL is set, then ^ does not match at the beginning of the
    string; if REG_NOTEOL is set, then $ does not match at the end.
 
@@ -228,7 +230,9 @@
 {
   reg_errcode_t err;
   Idx start, length;
-  re_dfa_t *dfa = preg->buffer;
+#ifdef _LIBC
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+#endif
 
   if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND))
     return REG_BADPAT;
@@ -244,14 +248,14 @@
       length = strlen (string);
     }
 
-  lock_lock (dfa->lock);
+  __libc_lock_lock (dfa->lock);
   if (preg->no_sub)
     err = re_search_internal (preg, string, length, start, length,
 			      length, 0, NULL, eflags);
   else
     err = re_search_internal (preg, string, length, start, length,
 			      length, nmatch, pmatch, eflags);
-  lock_unlock (dfa->lock);
+  __libc_lock_unlock (dfa->lock);
   return err != REG_NOERROR;
 }
 
@@ -362,6 +366,7 @@
 #endif
 
 static regoff_t
+internal_function
 re_search_2_stub (struct re_pattern_buffer *bufp,
 		  const char *string1, Idx length1,
 		  const char *string2, Idx length2,
@@ -409,6 +414,7 @@
    otherwise the position of the match is returned.  */
 
 static regoff_t
+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,
@@ -419,7 +425,9 @@
   Idx nregs;
   regoff_t rval;
   int eflags = 0;
-  re_dfa_t *dfa = bufp->buffer;
+#ifdef _LIBC
+  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
+#endif
   Idx last_start = start + range;
 
   /* Check for out-of-range.  */
@@ -430,7 +438,7 @@
   else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0))
     last_start = 0;
 
-  lock_lock (dfa->lock);
+  __libc_lock_lock (dfa->lock);
 
   eflags |= (bufp->not_bol) ? REG_NOTBOL : 0;
   eflags |= (bufp->not_eol) ? REG_NOTEOL : 0;
@@ -470,9 +478,9 @@
 
   rval = 0;
 
-  /* I hope we needn't fill their regs with -1's when no match was found.  */
+  /* I hope we needn't fill ther regs with -1's when no match was found.  */
   if (result != REG_NOERROR)
-    rval = result == REG_NOMATCH ? -1 : -2;
+    rval = -1;
   else if (regs != NULL)
     {
       /* If caller wants register contents data back, copy them.  */
@@ -494,18 +502,19 @@
     }
   re_free (pmatch);
  out:
-  lock_unlock (dfa->lock);
+  __libc_lock_unlock (dfa->lock);
   return rval;
 }
 
-static unsigned
+static unsigned int
+internal_function
 re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
 	      int regs_allocated)
 {
   int rval = REGS_REALLOCATE;
   Idx i;
   Idx need_regs = nregs + 1;
-  /* We need one extra element beyond 'num_regs' for the '-1' marker GNU code
+  /* We need one extra element beyond `num_regs' for the `-1' marker GNU code
      uses.  */
 
   /* Have the register data arrays been allocated?  */
@@ -628,7 +637,7 @@
    (0 <= LAST_START && LAST_START <= LENGTH)  */
 
 static reg_errcode_t
-__attribute_warn_unused_result__
+internal_function __attribute_warn_unused_result__
 re_search_internal (const regex_t *preg,
 		    const char *string, Idx length,
 		    Idx start, Idx last_start, Idx stop,
@@ -636,7 +645,7 @@
 		    int eflags)
 {
   reg_errcode_t err;
-  const re_dfa_t *dfa = preg->buffer;
+  const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;
   Idx left_lim, right_lim;
   int incr;
   bool fl_longest_match;
@@ -711,8 +720,7 @@
   if (nmatch > 1 || dfa->has_mb_node)
     {
       /* Avoid overflow.  */
-      if (BE ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
-               <= mctx.input.bufs_len), 0))
+      if (BE (SIZE_MAX / sizeof (re_dfastate_t *) <= mctx.input.bufs_len, 0))
 	{
 	  err = REG_ESPACE;
 	  goto free_return;
@@ -732,7 +740,7 @@
   mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
 			   : CONTEXT_NEWLINE | CONTEXT_BEGBUF;
 
-  /* Check incrementally whether the input string matches.  */
+  /* Check incrementally whether of not the input string match.  */
   incr = (last_start < start) ? -1 : 1;
   left_lim = (last_start < start) ? last_start : start;
   right_lim = (last_start < start) ? start : last_start;
@@ -914,7 +922,7 @@
 	    goto free_return;
 	}
 
-      /* At last, add the offset to each register, since we slid
+      /* At last, add the offset to the each registers, since we slided
 	 the buffers so that we could assume that the matching starts
 	 from 0.  */
       for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
@@ -964,7 +972,7 @@
 }
 
 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;
@@ -980,7 +988,7 @@
   halt_node = mctx->last_node;
 
   /* Avoid overflow.  */
-  if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) <= match_last, 0))
+  if (BE (SIZE_MAX / sizeof (re_dfastate_t *) <= match_last, 0))
     return REG_ESPACE;
 
   sifted_states = re_malloc (re_dfastate_t *, match_last + 1);
@@ -1060,7 +1068,7 @@
    since initial states may have constraints like "\<", "^", etc..  */
 
 static inline re_dfastate_t *
-__attribute__ ((always_inline)) internal_function
+__attribute ((always_inline)) internal_function
 acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
 			    Idx idx)
 {
@@ -1098,7 +1106,7 @@
    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.
-   Note that the matcher assumes that the matching starts from the current
+   Note that the matcher assume that the maching starts from the current
    index of the buffer.  */
 
 static Idx
@@ -1167,12 +1175,11 @@
       re_dfastate_t *old_state = cur_state;
       Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1;
 
-      if ((BE (next_char_idx >= mctx->input.bufs_len, 0)
-	   && mctx->input.bufs_len < mctx->input.len)
+      if (BE (next_char_idx >= mctx->input.bufs_len, 0)
 	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
 	      && mctx->input.valid_len < mctx->input.len))
 	{
-	  err = extend_buffers (mctx, next_char_idx + 1);
+	  err = extend_buffers (mctx);
 	  if (BE (err != REG_NOERROR, 0))
 	    {
 	      assert (err == REG_ESPACE);
@@ -1429,7 +1436,7 @@
 set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
 	  regmatch_t *pmatch, bool fl_backtrack)
 {
-  const re_dfa_t *dfa = preg->buffer;
+  const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;
   Idx idx, cur_node;
   re_node_set eps_via_nodes;
   struct re_fail_stack_t *fs;
@@ -1601,21 +1608,21 @@
    and sift the nodes in each states according to the following rules.
    Updated state_log will be wrote to STATE_LOG.
 
-   Rules: We throw away the Node 'a' in the STATE_LOG[STR_IDX] if...
+   Rules: We throw away the Node `a' in the STATE_LOG[STR_IDX] if...
      1. When STR_IDX == MATCH_LAST(the last index in the state_log):
-	If 'a' isn't the LAST_NODE and 'a' can't epsilon transit to
-	the LAST_NODE, we throw away the node 'a'.
-     2. When 0 <= STR_IDX < MATCH_LAST and 'a' accepts
-	string 's' and transit to 'b':
+	If `a' isn't the LAST_NODE and `a' can't epsilon transit to
+	the LAST_NODE, we throw away the node `a'.
+     2. When 0 <= STR_IDX < MATCH_LAST and `a' accepts
+	string `s' and transit to `b':
 	i. If 'b' isn't in the STATE_LOG[STR_IDX+strlen('s')], we throw
-	   away the node 'a'.
+	   away the node `a'.
 	ii. If 'b' is in the STATE_LOG[STR_IDX+strlen('s')] but 'b' is
-	    thrown away, we throw away the node 'a'.
+	    thrown away, we throw away the node `a'.
      3. When 0 <= STR_IDX < MATCH_LAST and 'a' epsilon transit to 'b':
 	i. If 'b' isn't in the STATE_LOG[STR_IDX], we throw away the
-	   node 'a'.
+	   node `a'.
 	ii. If 'b' is in the STATE_LOG[STR_IDX] but 'b' is thrown away,
-	    we throw away the node 'a'.  */
+	    we throw away the node `a'.  */
 
 #define STATE_NODE_CONTAINS(state,node) \
   ((state) != NULL && re_node_set_contains (&(state)->nodes, node))
@@ -1688,11 +1695,11 @@
   Idx i;
 
   /* Then build the next sifted state.
-     We build the next sifted state on 'cur_dest', and update
-     'sifted_states[str_idx]' with 'cur_dest'.
+     We build the next sifted state on `cur_dest', and update
+     `sifted_states[str_idx]' with `cur_dest'.
      Note:
-     'cur_dest' is the sifted state from 'state_log[str_idx + 1]'.
-     'cur_src' points the node_set of the old 'state_log[str_idx]'
+     `cur_dest' is the sifted state from `state_log[str_idx + 1]'.
+     `cur_src' points the node_set of the old `state_log[str_idx]'
      (with the epsilon nodes pre-filtered out).  */
   for (i = 0; i < cur_src->nelem; i++)
     {
@@ -1705,7 +1712,7 @@
       assert (!IS_EPSILON_NODE (type));
 #endif
 #ifdef RE_ENABLE_I18N
-      /* If the node may accept "multi byte".  */
+      /* If the node may accept `multi byte'.  */
       if (dfa->nodes[prev_node].accept_mb)
 	naccepted = sift_states_iter_mb (mctx, sctx, prev_node,
 					 str_idx, sctx->last_str_idx);
@@ -1746,13 +1753,12 @@
 {
   Idx top = mctx->state_log_top;
 
-  if ((next_state_log_idx >= mctx->input.bufs_len
-       && mctx->input.bufs_len < mctx->input.len)
+  if (next_state_log_idx >= mctx->input.bufs_len
       || (next_state_log_idx >= mctx->input.valid_len
 	  && mctx->input.valid_len < mctx->input.len))
     {
       reg_errcode_t err;
-      err = extend_buffers (mctx, next_state_log_idx + 1);
+      err = extend_buffers (mctx);
       if (BE (err != REG_NOERROR, 0))
 	return err;
     }
@@ -2262,17 +2268,17 @@
 {
   const re_dfa_t *const dfa = mctx->dfa;
   int naccepted;
-  /* Check the node can accept "multi byte".  */
+  /* Check the node can accept `multi byte'.  */
   naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx);
   if (naccepted > 0 && str_idx + naccepted <= max_str_idx &&
       !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted],
 			    dfa->nexts[node_idx]))
-    /* The node can't accept the "multi byte", or the
+    /* The node can't accept the `multi byte', or the
        destination was already thrown away, then the node
-       could't accept the current input "multi byte".   */
+       could't accept the current input `multi byte'.   */
     naccepted = 0;
   /* Otherwise, it is sure that the node could accept
-     'naccepted' bytes input.  */
+     `naccepted' bytes input.  */
   return naccepted;
 }
 #endif /* RE_ENABLE_I18N */
@@ -2451,7 +2457,7 @@
 /* From the node set CUR_NODES, pick up the nodes whose types are
    OP_OPEN_SUBEXP and which have corresponding back references in the regular
    expression. And register them to use them later for evaluating the
-   corresponding back references.  */
+   correspoding back references.  */
 
 static reg_errcode_t
 internal_function
@@ -2562,7 +2568,7 @@
       if (naccepted == 0)
 	continue;
 
-      /* The node can accepts 'naccepted' bytes.  */
+      /* The node can accepts `naccepted' bytes.  */
       dest_idx = re_string_cur_idx (&mctx->input) + naccepted;
       mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted
 			       : mctx->max_mb_elem_len);
@@ -2614,7 +2620,7 @@
       const re_token_t *node = dfa->nodes + node_idx;
       re_node_set *new_dest_nodes;
 
-      /* Check whether 'node' is a backreference or not.  */
+      /* Check whether `node' is a backreference or not.  */
       if (node->type != OP_BACK_REF)
 	continue;
 
@@ -2626,14 +2632,14 @@
 	    continue;
 	}
 
-      /* 'node' is a backreference.
+      /* `node' is a backreference.
 	 Check the substring which the substring matched.  */
       bkc_idx = mctx->nbkref_ents;
       err = get_subexp (mctx, node_idx, cur_str_idx);
       if (BE (err != REG_NOERROR, 0))
 	goto free_return;
 
-      /* And add the epsilon closures (which is 'new_dest_nodes') of
+      /* 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);
@@ -2657,7 +2663,7 @@
 	  dest_state = mctx->state_log[dest_str_idx];
 	  prev_nelem = ((mctx->state_log[cur_str_idx] == NULL) ? 0
 			: mctx->state_log[cur_str_idx]->nodes.nelem);
-	  /* Add 'new_dest_node' to state_log.  */
+	  /* Add `new_dest_node' to state_log.  */
 	  if (dest_state == NULL)
 	    {
 	      mctx->state_log[dest_str_idx]
@@ -2809,7 +2815,7 @@
 		  if (bkref_str_off >= mctx->input.len)
 		    break;
 
-		  err = extend_buffers (mctx, bkref_str_off + 1);
+		  err = extend_buffers (mctx);
 		  if (BE (err != REG_NOERROR, 0))
 		    return err;
 
@@ -2931,12 +2937,9 @@
     {
       re_dfastate_t **new_array;
       Idx old_alloc = path->alloc;
-      Idx incr_alloc = last_str + mctx->max_mb_elem_len + 1;
-      Idx new_alloc;
-      if (BE (IDX_MAX - old_alloc < incr_alloc, 0))
-	return REG_ESPACE;
-      new_alloc = old_alloc + incr_alloc;
-      if (BE (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc, 0))
+      Idx new_alloc = old_alloc + last_str + mctx->max_mb_elem_len + 1;
+      if (BE (new_alloc < old_alloc, 0)
+	  || BE (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc, 0))
 	return REG_ESPACE;
       new_array = re_realloc (path->array, re_dfastate_t *, new_alloc);
       if (BE (new_array == NULL, 0))
@@ -3099,7 +3102,7 @@
       assert (!IS_EPSILON_NODE (type));
 #endif
 #ifdef RE_ENABLE_I18N
-      /* If the node may accept "multi byte".  */
+      /* If the node may accept `multi byte'.  */
       if (dfa->nodes[cur_node].accept_mb)
 	{
 	  naccepted = check_node_accept_bytes (dfa, cur_node, &mctx->input,
@@ -3356,7 +3359,7 @@
   bitset_word_t elem, mask;
   bool dests_node_malloced = false;
   bool dest_states_malloced = false;
-  Idx ndests; /* Number of the destination states from 'state'.  */
+  Idx ndests; /* Number of the destination states from `state'.  */
   re_dfastate_t **trtable;
   re_dfastate_t **dest_states = NULL, **dest_states_word, **dest_states_nl;
   re_node_set follows, *dests_node;
@@ -3370,8 +3373,8 @@
   } *dests_alloc;
 
   /* We build DFA states which corresponds to the destination nodes
-     from 'state'.  'dests_node[i]' represents the nodes which i-th
-     destination state contains, and 'dests_ch[i]' represents the
+     from `state'.  `dests_node[i]' represents the nodes which i-th
+     destination state contains, and `dests_ch[i]' represents the
      characters which i-th destination state accepts.  */
   if (__libc_use_alloca (sizeof (struct dests_alloc)))
     dests_alloc = (struct dests_alloc *) alloca (sizeof (struct dests_alloc));
@@ -3385,23 +3388,20 @@
   dests_node = dests_alloc->dests_node;
   dests_ch = dests_alloc->dests_ch;
 
-  /* Initialize transition table.  */
+  /* Initialize transiton table.  */
   state->word_trtable = state->trtable = NULL;
 
-  /* At first, group all nodes belonging to 'state' into several
+  /* 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 (dests_node_malloced)
 	free (dests_alloc);
-      /* Return false in case of an error, true otherwise.  */
       if (ndests == 0)
 	{
 	  state->trtable = (re_dfastate_t **)
 	    calloc (sizeof (re_dfastate_t *), SBC_MAX);
-          if (BE (state->trtable == NULL, 0))
-            return false;
 	  return true;
 	}
       return false;
@@ -3591,13 +3591,13 @@
   reg_errcode_t err;
   bool ok;
   Idx i, j, k;
-  Idx ndests; /* Number of the destinations from 'state'.  */
+  Idx ndests; /* Number of the destinations from `state'.  */
   bitset_t accepts; /* Characters a node can accept.  */
   const re_node_set *cur_nodes = &state->nodes;
   bitset_empty (accepts);
   ndests = 0;
 
-  /* For all the nodes belonging to 'state',  */
+  /* For all the nodes belonging to `state',  */
   for (i = 0; i < cur_nodes->nelem; ++i)
     {
       re_token_t *node = &dfa->nodes[cur_nodes->elems[i]];
@@ -3640,7 +3640,7 @@
       else
 	continue;
 
-      /* Check the 'accepts' and sift the characters which are not
+      /* Check the `accepts' and sift the characters which are not
 	 match it the context.  */
       if (constraint)
 	{
@@ -3699,7 +3699,7 @@
 	    }
 	}
 
-      /* Then divide 'accepts' into DFA states, or create a new
+      /* Then divide `accepts' into DFA states, or create a new
 	 state.  Above, we make sure that accepts is not empty.  */
       for (j = 0; j < ndests; ++j)
 	{
@@ -3712,7 +3712,7 @@
 	  if (type == CHARACTER && !bitset_contain (dests_ch[j], node->opr.c))
 	    continue;
 
-	  /* Enumerate the intersection set of this state and 'accepts'.  */
+	  /* Enumerate the intersection set of this state and `accepts'.  */
 	  has_intersec = 0;
 	  for (k = 0; k < BITSET_WORDS; ++k)
 	    has_intersec |= intersec[k] = accepts[k] & dests_ch[j][k];
@@ -3720,7 +3720,7 @@
 	  if (!has_intersec)
 	    continue;
 
-	  /* Then check if this state is a subset of 'accepts'.  */
+	  /* Then check if this state is a subset of `accepts'.  */
 	  not_subset = not_consumed = 0;
 	  for (k = 0; k < BITSET_WORDS; ++k)
 	    {
@@ -3728,8 +3728,8 @@
 	      not_consumed |= accepts[k] = accepts[k] & ~dests_ch[j][k];
 	    }
 
-	  /* If this state isn't a subset of 'accepts', create a
-	     new group state, which has the 'remains'. */
+	  /* If this state isn't a subset of `accepts', create a
+	     new group state, which has the `remains'. */
 	  if (not_subset)
 	    {
 	      bitset_copy (dests_ch[ndests], remains);
@@ -3768,7 +3768,7 @@
 }
 
 #ifdef RE_ENABLE_I18N
-/* Check how many bytes the node 'dfa->nodes[node_idx]' accepts.
+/* Check how many bytes the node `dfa->nodes[node_idx]' accepts.
    Return the number of the bytes the node accepts.
    STR_IDX is the current index of the input string.
 
@@ -3895,6 +3895,7 @@
 	  const int32_t *table, *indirect;
 	  const unsigned char *weights, *extra;
 	  const char *collseqwc;
+	  int32_t idx;
 	  /* This #include defines a local function!  */
 #  include <locale/weight.h>
 
@@ -3932,7 +3933,6 @@
 		in_collseq = find_collation_sequence_value (pin, elem_len);
 	    }
 	  /* match with range expression?  */
-	  /* FIXME: Implement rational ranges here, too.  */
 	  for (i = 0; i < cset->nranges; ++i)
 	    if (cset->range_starts[i] <= in_collseq
 		&& in_collseq <= cset->range_ends[i])
@@ -3953,7 +3953,7 @@
 		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
 	      indirect = (const int32_t *)
 		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
-	      int32_t idx = findidx (&cp, elem_len);
+	      int32_t idx = findidx (&cp);
 	      if (idx > 0)
 		for (i = 0; i < cset->nequiv_classes; ++i)
 		  {
@@ -3984,9 +3984,18 @@
 # endif /* _LIBC */
 	{
 	  /* match with range expression?  */
+#if __GNUC__ >= 2 && ! (__STDC_VERSION__ < 199901L && __STRICT_ANSI__)
+	  wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'};
+#else
+	  wchar_t cmp_buf[] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
+	  cmp_buf[2] = wc;
+#endif
 	  for (i = 0; i < cset->nranges; ++i)
 	    {
-	      if (cset->range_starts[i] <= wc && wc <= cset->range_ends[i])
+	      cmp_buf[0] = cset->range_starts[i];
+	      cmp_buf[4] = cset->range_ends[i];
+	      if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
+		  && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
 		{
 		  match_len = char_len;
 		  goto check_node_accept_bytes_match;
@@ -4056,7 +4065,7 @@
 	  /* Skip the collation sequence value.  */
 	  idx += sizeof (uint32_t);
 	  /* Skip the wide char sequence of the collating element.  */
-	  idx = idx + sizeof (uint32_t) * (*(int32_t *) (extra + idx) + 1);
+	  idx = idx + sizeof (uint32_t) * (extra[idx] + 1);
 	  /* If we found the entry, return the sequence value.  */
 	  if (found)
 	    return *(uint32_t *) (extra + idx);
@@ -4124,20 +4133,17 @@
 
 static reg_errcode_t
 internal_function __attribute_warn_unused_result__
-extend_buffers (re_match_context_t *mctx, int min_len)
+extend_buffers (re_match_context_t *mctx)
 {
   reg_errcode_t ret;
   re_string_t *pstr = &mctx->input;
 
   /* Avoid overflow.  */
-  if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2
-          <= pstr->bufs_len, 0))
+  if (BE (SIZE_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
     return REG_ESPACE;
 
-  /* Double the lengths of the buffers, but allocate at least MIN_LEN.  */
-  ret = re_string_realloc_buffers (pstr,
-				   MAX (min_len,
-					MIN (pstr->len, pstr->bufs_len * 2)));
+  /* Double the lengthes of the buffers.  */
+  ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
   if (BE (ret != REG_NOERROR, 0))
     return ret;
 
@@ -4200,7 +4206,7 @@
       size_t max_object_size =
 	MAX (sizeof (struct re_backref_cache_entry),
 	     sizeof (re_sub_match_top_t *));
-      if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n, 0))
+      if (BE (SIZE_MAX / max_object_size < n, 0))
 	return REG_ESPACE;
 
       mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n);
diff -Nru gettext-0.19.3/gettext-tools/libgrep/regex.h gettext-0.18.1.1/gettext-tools/libgrep/regex.h
--- gettext-0.19.3/gettext-tools/libgrep/regex.h	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/regex.h	2010-06-03 21:36:52.000000000 +0000
@@ -1,22 +1,23 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998,
+   2000, 2001, 2002, 2003, 2005, 2006, 2009, 2010 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
-   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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
@@ -28,10 +29,13 @@
 extern "C" {
 #endif
 
-/* Define __USE_GNU to declare GNU extensions that violate the
+/* Define __USE_GNU_REGEX to declare GNU extensions that violate the
    POSIX name space rules.  */
-#ifdef _GNU_SOURCE
-# define __USE_GNU 1
+#undef __USE_GNU_REGEX
+#if (defined _GNU_SOURCE					\
+     || (!defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE	\
+	 && !defined _XOPEN_SOURCE))
+# define __USE_GNU_REGEX 1
 #endif
 
 #ifdef _REGEX_LARGE_OFFSETS
@@ -42,6 +46,16 @@
    supported within glibc itself, and glibc users should not define
    _REGEX_LARGE_OFFSETS.  */
 
+/* The type of the offset of a byte within a string.
+   For historical reasons POSIX 1003.1-2004 requires that regoff_t be
+   at least as wide as off_t.  However, many common POSIX platforms set
+   regoff_t to the more-sensible ssize_t and the Open Group has
+   signalled its intention to change the requirement to be that
+   regoff_t be at least as wide as ptrdiff_t and ssize_t; see XBD ERN
+   60 (2005-08-25).  We don't know of any hosts where ssize_t or
+   ptrdiff_t is wider than ssize_t, so ssize_t is safe.  */
+typedef ssize_t regoff_t;
+
 /* 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.  */
@@ -56,8 +70,10 @@
 
 #else
 
-/* The traditional GNU regex implementation mishandles strings longer
-   than INT_MAX.  */
+/* Use types that are binary-compatible with the traditional GNU regex
+   implementation, which mishandles strings longer than INT_MAX.  */
+
+typedef int regoff_t;
 typedef int __re_idx_t;
 typedef unsigned int __re_size_t;
 typedef unsigned long int __re_long_size_t;
@@ -78,7 +94,8 @@
    add or remove a bit, only one other definition need change.  */
 typedef unsigned long int reg_syntax_t;
 
-#ifdef __USE_GNU
+#ifdef __USE_GNU_REGEX
+
 /* If this bit is not set, then \ inside a bracket expression is literal.
    If set, then such a \ quotes the following character.  */
 # define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
@@ -97,10 +114,10 @@
 /* If this bit is set, then ^ and $ are always anchors (outside bracket
      expressions, of course).
    If this bit is not set, then it depends:
-	^  is an anchor if it is at the beginning of a regular
-	   expression or after an open-group or an alternation operator;
-	$  is an anchor if it is at the end of a regular expression, or
-	   before a close-group or an alternation operator.
+        ^  is an anchor if it is at the beginning of a regular
+           expression or after an open-group or an alternation operator;
+        $  is an anchor if it is at the end of a regular expression, or
+           before a close-group or an alternation operator.
 
    This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
    POSIX draft 11.2 says that * etc. in leading positions is undefined.
@@ -145,9 +162,9 @@
    If not set, newline is literal.  */
 # define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
 
-/* If this bit is set, then '{...}' defines an interval, and \{ and \}
+/* If this bit is set, then `{...}' defines an interval, and \{ and \}
      are literals.
-  If not set, then '\{...\}' defines an interval.  */
+  If not set, then `\{...\}' defines an interval.  */
 # define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
 
 /* If this bit is set, (...) defines a group, and \( and \) are literals.
@@ -202,14 +219,15 @@
    whether ^ should be special.  */
 # define RE_CARET_ANCHORS_HERE (RE_ICASE << 1)
 
-/* If this bit is set, then \{ cannot be first in a regex or
-   immediately after an alternation, open-group or \} operator.  */
+/* If this bit is set, then \{ cannot be first in an bre or
+   immediately after an alternation or begin-group operator.  */
 # define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1)
 
 /* If this bit is set, then no_sub will be set to 1 during
    re_compile_pattern.  */
 # define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1)
-#endif
+
+#endif /* defined __USE_GNU_REGEX */
 
 /* This global variable defines the particular regexp syntax to use (for
    some interfaces).  When a regexp is compiled, the syntax used is
@@ -217,7 +235,7 @@
    already-compiled regexps.  */
 extern reg_syntax_t re_syntax_options;
 
-#ifdef __USE_GNU
+#ifdef __USE_GNU_REGEX
 /* Define combinations of the above bits for the standard possibilities.
    (The [[[ comments delimit what gets put into the Texinfo file, so
    don't delete them!)  */
@@ -229,19 +247,16 @@
    | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
    | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
    | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
-   | RE_CHAR_CLASSES							\
    | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
 
 # define RE_SYNTAX_GNU_AWK						\
-  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-    | RE_INVALID_INTERVAL_ORD)						\
-   & ~(RE_DOT_NOT_NULL | RE_CONTEXT_INDEP_OPS				\
-      | RE_CONTEXT_INVALID_OPS ))
+  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG)	\
+   & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS		\
+       | RE_CONTEXT_INVALID_OPS ))
 
 # define RE_SYNTAX_POSIX_AWK						\
   (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-   | RE_INTERVALS	    | RE_NO_GNU_OPS				\
-   | RE_INVALID_INTERVAL_ORD)
+   | RE_INTERVALS	    | RE_NO_GNU_OPS)
 
 # define RE_SYNTAX_GREP							\
   (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
@@ -292,12 +307,13 @@
    | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
 /* [[[end syntaxes]]] */
 
+#endif /* defined __USE_GNU_REGEX */
+
+#ifdef __USE_GNU_REGEX
+
 /* Maximum number of duplicates an interval can allow.  POSIX-conforming
    systems might define this in <limits.h>, but we want our
    value, so remove any previous define.  */
-# ifdef _REGEX_INCLUDE_LIMITS_H
-#  include <limits.h>
-# endif
 # ifdef RE_DUP_MAX
 #  undef RE_DUP_MAX
 # endif
@@ -305,15 +321,16 @@
 /* RE_DUP_MAX is 2**15 - 1 because an earlier implementation stored
    the counter as a 2-byte signed integer.  This is no longer true, so
    RE_DUP_MAX could be increased to (INT_MAX / 10 - 1), or to
-   ((SIZE_MAX - 9) / 10) if _REGEX_LARGE_OFFSETS is defined.
+   ((SIZE_MAX - 2) / 10 - 1) if _REGEX_LARGE_OFFSETS is defined.
    However, there would be a huge performance problem if someone
    actually used a pattern like a\{214748363\}, so RE_DUP_MAX retains
    its historical value.  */
 # define RE_DUP_MAX (0x7fff)
-#endif
 
+#endif /* defined __USE_GNU_REGEX */
 
-/* POSIX 'cflags' bits (i.e., information for 'regcomp').  */
+
+/* POSIX `cflags' bits (i.e., information for `regcomp').  */
 
 /* If this bit is set, then use extended regular expression syntax.
    If not set, then use basic regular expression syntax.  */
@@ -333,7 +350,7 @@
 #define REG_NOSUB (1 << 3)
 
 
-/* POSIX 'eflags' bits (i.e., information for regexec).  */
+/* POSIX `eflags' bits (i.e., information for regexec).  */
 
 /* If this bit is set, then the beginning-of-line operator doesn't match
      the beginning of the string (presumably because it's not the
@@ -351,7 +368,7 @@
 
 
 /* If any error codes are removed, changed, or added, update the
-   '__re_error_msgid' table in regcomp.c.  */
+   `__re_error_msgid' table in regcomp.c.  */
 
 typedef enum
 {
@@ -376,11 +393,11 @@
 
   /* Error codes we've added.  */
   _REG_EEND,		/* Premature end.  */
-  _REG_ESIZE,		/* Too large (e.g., repeat count too large).  */
+  _REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
   _REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
 } reg_errcode_t;
 
-#if defined _XOPEN_SOURCE || defined __USE_XOPEN2K
+#ifdef _XOPEN_SOURCE
 # define REG_ENOSYS	_REG_ENOSYS
 #endif
 #define REG_NOERROR	_REG_NOERROR
@@ -401,127 +418,126 @@
 #define REG_ESIZE	_REG_ESIZE
 #define REG_ERPAREN	_REG_ERPAREN
 
-/* This data structure represents a compiled pattern.  Before calling
-   the pattern compiler, the fields 'buffer', 'allocated', 'fastmap',
-   and 'translate' can be set.  After the pattern has been compiled,
-   the fields 're_nsub', 'not_bol' and 'not_eol' are available.  All
-   other fields are private to the regex routines.  */
-
-#ifndef RE_TRANSLATE_TYPE
-# define __RE_TRANSLATE_TYPE unsigned char *
-# ifdef __USE_GNU
-#  define RE_TRANSLATE_TYPE __RE_TRANSLATE_TYPE
-# endif
+/* struct re_pattern_buffer normally uses member names like `buffer'
+   that POSIX does not allow.  In POSIX mode these members have names
+   with leading `re_' (e.g., `re_buffer').  */
+#ifdef __USE_GNU_REGEX
+# define _REG_RE_NAME(id) id
+# define _REG_RM_NAME(id) id
+#else
+# define _REG_RE_NAME(id) re_##id
+# define _REG_RM_NAME(id) rm_##id
 #endif
 
-#ifdef __USE_GNU
-# define __REPB_PREFIX(name) name
+/* The user can specify the type of the re_translate member by
+   defining the macro RE_TRANSLATE_TYPE, which defaults to unsigned
+   char *.  This pollutes the POSIX name space, so in POSIX mode just
+   use unsigned char *.  */
+#ifdef __USE_GNU_REGEX
+# ifndef RE_TRANSLATE_TYPE
+#  define RE_TRANSLATE_TYPE unsigned char *
+# endif
+# define REG_TRANSLATE_TYPE RE_TRANSLATE_TYPE
 #else
-# define __REPB_PREFIX(name) __##name
+# define REG_TRANSLATE_TYPE unsigned char *
 #endif
 
+/* This data structure represents a compiled pattern.  Before calling
+   the pattern compiler, the fields `buffer', `allocated', `fastmap',
+   `translate', and `no_sub' can be set.  After the pattern has been
+   compiled, the `re_nsub' field is available.  All other fields are
+   private to the regex routines.  */
+
 struct re_pattern_buffer
 {
-  /* Space that holds the compiled pattern.  The type
-     'struct re_dfa_t' is private and is not declared here.  */
-  struct re_dfa_t *__REPB_PREFIX(buffer);
+  /* Space that holds the compiled pattern.  It is declared as
+     `unsigned char *' because its elements are sometimes used as
+     array indexes.  */
+  unsigned char *_REG_RE_NAME (buffer);
 
-  /* Number of bytes to which 'buffer' points.  */
-  __re_long_size_t __REPB_PREFIX(allocated);
+  /* Number of bytes to which `buffer' points.  */
+  __re_long_size_t _REG_RE_NAME (allocated);
 
-  /* Number of bytes actually used in 'buffer'.  */
-  __re_long_size_t __REPB_PREFIX(used);
+  /* Number of bytes actually used in `buffer'.  */
+  __re_long_size_t _REG_RE_NAME (used);
 
   /* Syntax setting with which the pattern was compiled.  */
-  reg_syntax_t __REPB_PREFIX(syntax);
+  reg_syntax_t _REG_RE_NAME (syntax);
 
   /* Pointer to a fastmap, if any, otherwise zero.  re_search uses the
      fastmap, if there is one, to skip over impossible starting points
      for matches.  */
-  char *__REPB_PREFIX(fastmap);
+  char *_REG_RE_NAME (fastmap);
 
   /* Either a translate table to apply to all characters before
      comparing them, or zero for no translation.  The translation is
      applied to a pattern when it is compiled and to a string when it
      is matched.  */
-  __RE_TRANSLATE_TYPE __REPB_PREFIX(translate);
+  REG_TRANSLATE_TYPE _REG_RE_NAME (translate);
 
   /* Number of subexpressions found by the compiler.  */
   size_t re_nsub;
 
   /* Zero if this pattern cannot match the empty string, one else.
-     Well, in truth it's used only in 're_search_2', to see whether or
+     Well, in truth it's used only in `re_search_2', to see whether or
      not we should use the fastmap, so we don't set this absolutely
-     perfectly; see 're_compile_fastmap' (the "duplicate" case).  */
-  unsigned __REPB_PREFIX(can_be_null) : 1;
+     perfectly; see `re_compile_fastmap' (the `duplicate' case).  */
+  unsigned int _REG_RE_NAME (can_be_null) : 1;
 
-  /* If REGS_UNALLOCATED, allocate space in the 'regs' structure
-     for 'max (RE_NREGS, re_nsub + 1)' groups.
+  /* If REGS_UNALLOCATED, allocate space in the `regs' structure
+     for `max (RE_NREGS, re_nsub + 1)' groups.
      If REGS_REALLOCATE, reallocate space if necessary.
      If REGS_FIXED, use what's there.  */
-#ifdef __USE_GNU
+#ifdef __USE_GNU_REGEX
 # define REGS_UNALLOCATED 0
 # define REGS_REALLOCATE 1
 # define REGS_FIXED 2
 #endif
-  unsigned __REPB_PREFIX(regs_allocated) : 2;
+  unsigned int _REG_RE_NAME (regs_allocated) : 2;
 
-  /* Set to zero when 're_compile_pattern' compiles a pattern; set to
-     one by 're_compile_fastmap' if it updates the fastmap.  */
-  unsigned __REPB_PREFIX(fastmap_accurate) : 1;
+  /* Set to zero when `regex_compile' compiles a pattern; set to one
+     by `re_compile_fastmap' if it updates the fastmap.  */
+  unsigned int _REG_RE_NAME (fastmap_accurate) : 1;
 
-  /* If set, 're_match_2' does not return information about
+  /* If set, `re_match_2' does not return information about
      subexpressions.  */
-  unsigned __REPB_PREFIX(no_sub) : 1;
+  unsigned int _REG_RE_NAME (no_sub) : 1;
 
   /* If set, a beginning-of-line anchor doesn't match at the beginning
      of the string.  */
-  unsigned __REPB_PREFIX(not_bol) : 1;
+  unsigned int _REG_RE_NAME (not_bol) : 1;
 
   /* Similarly for an end-of-line anchor.  */
-  unsigned __REPB_PREFIX(not_eol) : 1;
+  unsigned int _REG_RE_NAME (not_eol) : 1;
 
   /* If true, an anchor at a newline matches.  */
-  unsigned __REPB_PREFIX(newline_anchor) : 1;
+  unsigned int _REG_RE_NAME (newline_anchor) : 1;
+
+/* [[[end pattern_buffer]]] */
 };
 
 typedef struct re_pattern_buffer regex_t;
 
-/* Type for byte offsets within the string.  POSIX mandates this.  */
-#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.  */
-typedef ssize_t regoff_t;
-#else
-/* The traditional GNU regex implementation mishandles strings longer
-   than INT_MAX.  */
-typedef int regoff_t;
-#endif
-
-
-#ifdef __USE_GNU
 /* This is the structure we store register match data in.  See
    regex.texinfo for a full description of what registers match.  */
 struct re_registers
 {
-  __re_size_t num_regs;
-  regoff_t *start;
-  regoff_t *end;
+  __re_size_t _REG_RM_NAME (num_regs);
+  regoff_t *_REG_RM_NAME (start);
+  regoff_t *_REG_RM_NAME (end);
 };
 
 
-/* If 'regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
-   're_match_2' returns information about at least this many registers
-   the first time a 'regs' structure is passed.  */
-# ifndef RE_NREGS
-#  define RE_NREGS 30
-# endif
+/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
+   `re_match_2' returns information about at least this many registers
+   the first time a `regs' structure is passed.  */
+#if !defined RE_NREGS && defined __USE_GNU_REGEX
+# define RE_NREGS 30
 #endif
 
 
 /* POSIX specification for registers.  Aside from the different names than
-   're_registers', POSIX uses an array of structures, instead of a
+   `re_registers', POSIX uses an array of structures, instead of a
    structure of arrays.  */
 typedef struct
 {
@@ -531,19 +547,13 @@
 
 /* Declarations for routines.  */
 
-#ifdef __USE_GNU
 /* Sets the current default syntax to SYNTAX, and return the old syntax.
-   You can also simply assign to the 're_syntax_options' variable.  */
+   You can also simply assign to the `re_syntax_options' variable.  */
 extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
 
 /* Compile the regular expression PATTERN, with length LENGTH
-   and syntax given by the global 're_syntax_options', into the buffer
-   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
-   'regcomp', with a malloc'ed value, or set to NULL before calling
-   'regfree'.  */
+   and syntax given by the global `re_syntax_options', into the buffer
+   BUFFER.  Return NULL if successful, and an error string if not.  */
 extern const char *re_compile_pattern (const char *__pattern, size_t __length,
 				       struct re_pattern_buffer *__buffer);
 
@@ -565,7 +575,7 @@
 			   struct re_registers *__regs);
 
 
-/* Like 're_search', but search in the concatenation of STRING1 and
+/* 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,
@@ -575,14 +585,14 @@
 			     __re_idx_t __stop);
 
 
-/* Like 're_search', but return how many characters in STRING the regexp
+/* 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);
 
 
-/* Relates to 're_match' as 're_search_2' relates to 're_search'.  */
+/* 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,
@@ -593,22 +603,21 @@
 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and
    ENDS.  Subsequent matches using BUFFER and REGS will use this memory
    for recording register information.  STARTS and ENDS must be
-   allocated with malloc, and must each be at least 'NUM_REGS * sizeof
+   allocated with malloc, and must each be at least `NUM_REGS * sizeof
    (regoff_t)' bytes long.
 
    If NUM_REGS == 0, then subsequent matches should allocate their own
    register data.
 
    Unless this function is called, the first search or match using
-   BUFFER will allocate its own register data, without
+   PATTERN_BUFFER will allocate its own register data, without
    freeing the old data.  */
 extern void re_set_registers (struct re_pattern_buffer *__buffer,
 			      struct re_registers *__regs,
 			      __re_size_t __num_regs,
 			      regoff_t *__starts, regoff_t *__ends);
-#endif	/* Use GNU */
 
-#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC)
+#if defined _REGEX_RE_COMP || defined _LIBC
 # ifndef _CRAY
 /* 4.2 bsd compatibility.  */
 extern char *re_comp (const char *);
@@ -636,7 +645,7 @@
 #ifndef _Restrict_arr_
 # if ((199901L <= __STDC_VERSION__					\
        || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))	\
-	   && !defined __STRICT_ANSI__))					\
+	   && !__STRICT_ANSI__))					\
       && !defined __GNUG__)
 #  define _Restrict_arr_ _Restrict_
 # else
diff -Nru gettext-0.19.3/gettext-tools/libgrep/regex_internal.c gettext-0.18.1.1/gettext-tools/libgrep/regex_internal.c
--- gettext-0.19.3/gettext-tools/libgrep/regex_internal.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/regex_internal.c	2010-05-24 14:49:27.000000000 +0000
@@ -1,21 +1,22 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
-   The GNU C Library 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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 static void re_string_construct_common (const char *str, Idx len,
 					re_string_t *pstr,
@@ -134,9 +135,9 @@
     {
       wint_t *new_wcs;
 
-      /* Avoid overflow in realloc.  */
-      const size_t max_object_size = MAX (sizeof (wint_t), sizeof (Idx));
-      if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_buf_len, 0))
+      /* Avoid overflow.  */
+      size_t max_object_size = MAX (sizeof (wint_t), sizeof (Idx));
+      if (BE (SIZE_MAX / max_object_size < new_buf_len, 0))
 	return REG_ESPACE;
 
       new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
@@ -236,8 +237,13 @@
       else
 	p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx;
       mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
-      if (BE (mbclen == (size_t) -1 || mbclen == 0
-	      || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len), 0))
+      if (BE (mbclen == (size_t) -2, 0))
+	{
+	  /* The buffer doesn't have enough space, finish to build.  */
+	  pstr->cur_state = prev_st;
+	  break;
+	}
+      else if (BE (mbclen == (size_t) -1 || mbclen == 0, 0))
 	{
 	  /* We treat these cases as a singlebyte character.  */
 	  mbclen = 1;
@@ -246,12 +252,6 @@
 	    wc = pstr->trans[wc];
 	  pstr->cur_state = prev_st;
 	}
-      else if (BE (mbclen == (size_t) -2, 0))
-	{
-	  /* The buffer doesn't have enough space, finish to build.  */
-	  pstr->cur_state = prev_st;
-	  break;
-	}
 
       /* Write wide character and padding.  */
       pstr->wcs[byte_idx++] = wc;
@@ -311,11 +311,12 @@
 			       + byte_idx), remain_len, &pstr->cur_state);
 	  if (BE (mbclen < (size_t) -2, 1))
 	    {
-	      wchar_t wcu = towupper (wc);
-	      if (wcu != wc)
+	      wchar_t wcu = wc;
+	      if (iswlower (wc))
 		{
 		  size_t mbcdlen;
 
+		  wcu = towupper (wc);
 		  mbcdlen = wcrtomb (buf, wcu, &prev_st);
 		  if (BE (mbclen == mbcdlen, 1))
 		    memcpy (pstr->mbs + byte_idx, buf, mbclen);
@@ -333,11 +334,9 @@
 	      for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
 		pstr->wcs[byte_idx++] = WEOF;
 	    }
-	  else if (mbclen == (size_t) -1 || mbclen == 0
-		   || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len))
+	  else if (mbclen == (size_t) -1 || mbclen == 0)
 	    {
-	      /* It is an invalid character, an incomplete character
-		 at the end of the string, or '\0'.  Just use the byte.  */
+	      /* It is an invalid character or '\0'.  Just use the byte.  */
 	      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
 	      pstr->mbs[byte_idx] = ch;
 	      /* And also cast it to wide char.  */
@@ -380,11 +379,12 @@
 	mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
 	if (BE (mbclen < (size_t) -2, 1))
 	  {
-	    wchar_t wcu = towupper (wc);
-	    if (wcu != wc)
+	    wchar_t wcu = wc;
+	    if (iswlower (wc))
 	      {
 		size_t mbcdlen;
 
+		wcu = towupper (wc);
 		mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
 		if (BE (mbclen == mbcdlen, 1))
 		  memcpy (pstr->mbs + byte_idx, buf, mbclen);
@@ -449,8 +449,7 @@
 	    for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
 	      pstr->wcs[byte_idx++] = WEOF;
 	  }
-	else if (mbclen == (size_t) -1 || mbclen == 0
-		 || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len))
+	else if (mbclen == (size_t) -1 || mbclen == 0)
 	  {
 	    /* It is an invalid character or '\0'.  Just use the byte.  */
 	    int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx];
@@ -497,7 +496,8 @@
        rawbuf_idx < new_raw_idx;)
     {
       wchar_t wc2;
-      Idx remain_len = pstr->raw_len - rawbuf_idx;
+      Idx remain_len;
+      remain_len = pstr->len - rawbuf_idx;
       prev_st = pstr->cur_state;
       mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx,
 			  remain_len, &pstr->cur_state);
@@ -536,7 +536,10 @@
       int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
       if (BE (pstr->trans != NULL, 0))
 	ch = pstr->trans[ch];
-      pstr->mbs[char_idx] = toupper (ch);
+      if (islower (ch))
+	pstr->mbs[char_idx] = toupper (ch);
+      else
+	pstr->mbs[char_idx] = ch;
     }
   pstr->valid_len = char_idx;
   pstr->valid_raw_len = char_idx;
@@ -677,7 +680,7 @@
 			 pstr->valid_len - offset);
 	      pstr->valid_len -= offset;
 	      pstr->valid_raw_len -= offset;
-#if defined DEBUG && DEBUG
+#if DEBUG
 	      assert (pstr->valid_len > 0);
 #endif
 	    }
@@ -733,18 +736,16 @@
 			  unsigned char buf[6];
 			  size_t mbclen;
 
-			  const unsigned char *pp = p;
 			  if (BE (pstr->trans != NULL, 0))
 			    {
 			      int i = mlen < 6 ? mlen : 6;
 			      while (--i >= 0)
 				buf[i] = pstr->trans[p[i]];
-			      pp = buf;
 			    }
 			  /* XXX Don't use mbrtowc, we know which conversion
 			     to use (UTF-8 -> UCS4).  */
 			  memset (&cur_state, 0, sizeof (cur_state));
-			  mbclen = __mbrtowc (&wc2, (const char *) pp, mlen,
+			  mbclen = __mbrtowc (&wc2, (const char *) p, mlen,
 					      &cur_state);
 			  if (raw + offset - p <= mbclen
 			      && mbclen < (size_t) -2)
@@ -829,7 +830,7 @@
 }
 
 static unsigned char
-internal_function __attribute__ ((pure))
+internal_function __attribute ((pure))
 re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
 {
   int ch;
@@ -866,7 +867,7 @@
 }
 
 static unsigned char
-internal_function
+internal_function __attribute ((pure))
 re_string_fetch_byte_case (re_string_t *pstr)
 {
   if (BE (!pstr->mbs_allocated, 1))
@@ -936,7 +937,7 @@
       Idx wc_idx = idx;
       while(input->wcs[wc_idx] == WEOF)
 	{
-#if defined DEBUG && DEBUG
+#ifdef DEBUG
 	  /* It must not happen.  */
 	  assert (REG_VALID_INDEX (wc_idx));
 #endif
@@ -969,7 +970,7 @@
   set->alloc = size;
   set->nelem = 0;
   set->elems = re_malloc (Idx, size);
-  if (BE (set->elems == NULL, 0) && (MALLOC_0_IS_NONNULL || size != 0))
+  if (BE (set->elems == NULL, 0))
     return REG_ESPACE;
   return REG_NOERROR;
 }
@@ -1349,7 +1350,7 @@
    Return true if SET1 and SET2 are equivalent.  */
 
 static bool
-internal_function __attribute__ ((pure))
+internal_function __attribute ((pure))
 re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
 {
   Idx i;
@@ -1364,7 +1365,7 @@
 /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */
 
 static Idx
-internal_function __attribute__ ((pure))
+internal_function __attribute ((pure))
 re_node_set_contains (const re_node_set *set, Idx elem)
 {
   __re_size_t idx, right, mid;
@@ -1410,12 +1411,13 @@
       Idx *new_nexts, *new_indices;
       re_node_set *new_edests, *new_eclosures;
       re_token_t *new_nodes;
+      size_t max_object_size =
+	MAX (sizeof (re_token_t),
+	     MAX (sizeof (re_node_set),
+		  sizeof (Idx)));
 
-      /* Avoid overflows in realloc.  */
-      const size_t max_object_size = MAX (sizeof (re_token_t),
-					  MAX (sizeof (re_node_set),
-					       sizeof (Idx)));
-      if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
+      /* Avoid overflows.  */
+      if (BE (SIZE_MAX / 2 / max_object_size < dfa->nodes_alloc, 0))
 	return REG_MISSING;
 
       new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
@@ -1438,9 +1440,11 @@
   dfa->nodes[dfa->nodes_len] = token;
   dfa->nodes[dfa->nodes_len].constraint = 0;
 #ifdef RE_ENABLE_I18N
+  {
+  int type = token.type;
   dfa->nodes[dfa->nodes_len].accept_mb =
-    ((token.type == OP_PERIOD && dfa->mb_cur_max > 1)
-     || token.type == COMPLEX_BRACKET);
+    (type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET;
+  }
 #endif
   dfa->nexts[dfa->nodes_len] = REG_MISSING;
   re_node_set_init_empty (dfa->edests + dfa->nodes_len);
@@ -1448,7 +1452,7 @@
   return dfa->nodes_len++;
 }
 
-static re_hashval_t
+static inline re_hashval_t
 internal_function
 calc_state_hash (const re_node_set *nodes, unsigned int context)
 {
@@ -1545,7 +1549,7 @@
 	  && re_node_set_compare (state->entrance_nodes, nodes))
 	return state;
     }
-  /* There are no appropriate state in 'dfa', create the new one.  */
+  /* There are no appropriate state in `dfa', create the new one.  */
   new_state = create_cd_newstate (dfa, nodes, context, hash);
   if (BE (new_state == NULL, 0))
     *err = REG_ESPACE;
@@ -1574,7 +1578,7 @@
     {
       Idx elem = newstate->nodes.elems[i];
       if (!IS_EPSILON_NODE (dfa->nodes[elem].type))
-	if (! re_node_set_insert_last (&newstate->non_eps_nodes, elem))
+	if (BE (! re_node_set_insert_last (&newstate->non_eps_nodes, elem), 0))
 	  return REG_ESPACE;
     }
 
@@ -1609,7 +1613,7 @@
   re_free (state);
 }
 
-/* Create the new state which is independent of contexts.
+/* Create the new state which is independ of contexts.
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
diff -Nru gettext-0.19.3/gettext-tools/libgrep/regex_internal.h gettext-0.18.1.1/gettext-tools/libgrep/regex_internal.h
--- gettext-0.19.3/gettext-tools/libgrep/regex_internal.h	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/regex_internal.h	2010-05-24 14:49:27.000000000 +0000
@@ -1,81 +1,50 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
-   The GNU C Library 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 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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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.
+   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 the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifndef _REGEX_INTERNAL_H
 #define _REGEX_INTERNAL_H 1
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <langinfo.h>
-#include <locale.h>
+#ifndef _LIBC
+# include "localcharset.h"
+#endif
+#if defined HAVE_LOCALE_H || defined _LIBC
+# include <locale.h>
+#endif
+
 #include <wchar.h>
 #include <wctype.h>
-#include <stdbool.h>
 #include <stdint.h>
-
-#ifdef _LIBC
+#if defined _LIBC
 # include <bits/libc-lock.h>
-# define lock_define(name) __libc_lock_define (, name)
-# define lock_init(lock) (__libc_lock_init (lock), 0)
-# define lock_fini(lock) 0
-# define lock_lock(lock) __libc_lock_lock (lock)
-# define lock_unlock(lock) __libc_lock_unlock (lock)
-#elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO
-# include "glthread/lock.h"
-  /* Use gl_lock_define if empty macro arguments are known to work.
-     Otherwise, fall back on less-portable substitutes.  */
-# if ((defined __GNUC__ && !defined __STRICT_ANSI__) \
-      || (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__))
-#  define lock_define(name) gl_lock_define (, name)
-# elif USE_POSIX_THREADS
-#  define lock_define(name) pthread_mutex_t name;
-# elif USE_PTH_THREADS
-#  define lock_define(name) pth_mutex_t name;
-# elif USE_SOLARIS_THREADS
-#  define lock_define(name) mutex_t name;
-# elif USE_WINDOWS_THREADS
-#  define lock_define(name) gl_lock_t name;
-# else
-#  define lock_define(name)
-# endif
-# define lock_init(lock) glthread_lock_init (&(lock))
-# define lock_fini(lock) glthread_lock_destroy (&(lock))
-# define lock_lock(lock) glthread_lock_lock (&(lock))
-# define lock_unlock(lock) glthread_lock_unlock (&(lock))
-#elif defined GNULIB_PTHREAD && !defined USE_UNLOCKED_IO
-# include <pthread.h>
-# define lock_define(name) pthread_mutex_t name;
-# define lock_init(lock) pthread_mutex_init (&(lock), 0)
-# define lock_fini(lock) pthread_mutex_destroy (&(lock))
-# define lock_lock(lock) pthread_mutex_lock (&(lock))
-# define lock_unlock(lock) pthread_mutex_unlock (&(lock))
 #else
-# define lock_define(name)
-# define lock_init(lock) 0
-# define lock_fini(lock) ((void) 0)
-  /* The 'dfa' avoids an "unused variable 'dfa'" warning from GCC.  */
-# define lock_lock(lock) ((void) dfa)
-# define lock_unlock(lock) ((void) 0)
+# define __libc_lock_init(NAME) do { } while (0)
+# define __libc_lock_lock(NAME) do { } while (0)
+# define __libc_lock_unlock(NAME) do { } while (0)
 #endif
 
 /* In case that the system doesn't have isblank().  */
@@ -98,7 +67,7 @@
 # ifdef _LIBC
 #  undef gettext
 #  define gettext(msgid) \
-  __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
+  INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES)
 # endif
 #else
 # define gettext(msgid) (msgid)
@@ -110,7 +79,12 @@
 # define gettext_noop(String) String
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC
+/* For loser systems without the definition.  */
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
 # define RE_ENABLE_I18N
 #endif
 
@@ -118,6 +92,9 @@
 # define BE(expr, val) __builtin_expect (expr, val)
 #else
 # define BE(expr, val) (expr)
+# ifdef _LIBC
+#  define inline
+# endif
 #endif
 
 /* Number of ASCII characters.  */
@@ -134,27 +111,22 @@
 
 /* Rename to standard API for using out of glibc.  */
 #ifndef _LIBC
-# undef __wctype
-# undef __iswctype
 # define __wctype wctype
 # define __iswctype iswctype
 # define __btowc btowc
-# define __mbrtowc mbrtowc
 # define __wcrtomb wcrtomb
+# define __mbrtowc mbrtowc
 # define __regfree regfree
 # define attribute_hidden
 #endif /* not _LIBC */
 
-#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1)
-# define __attribute__(arg)
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# define __attribute(arg) __attribute__ (arg)
+#else
+# 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)
@@ -365,7 +337,7 @@
     Idx idx;			/* for BACK_REF */
     re_context_type ctx_type;	/* for ANCHOR */
   } opr;
-#if __GNUC__ >= 2 && !defined __STRICT_ANSI__
+#if __GNUC__ >= 2 && !__STRICT_ANSI__
   re_token_type_t type : 8;
 #else
   re_token_type_t type;
@@ -446,24 +418,26 @@
 typedef struct re_dfa_t re_dfa_t;
 
 #ifndef _LIBC
-# define internal_function
+# if defined __i386__ && !defined __EMX__
+#  define internal_function   __attribute ((regparm (3), stdcall))
+# else
+#  define internal_function
+# endif
 #endif
 
-#ifndef NOT_IN_libc
 static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
 						Idx new_buf_len)
      internal_function;
-# ifdef RE_ENABLE_I18N
+#ifdef RE_ENABLE_I18N
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
 static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
-  internal_function;
-# endif /* RE_ENABLE_I18N */
+     internal_function;
+#endif /* RE_ENABLE_I18N */
 static void build_upper_buffer (re_string_t *pstr) internal_function;
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;
 static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
 					  int eflags)
-     internal_function __attribute__ ((pure));
-#endif
+     internal_function __attribute ((pure));
 #define re_string_peek_byte(pstr, offset) \
   ((pstr)->mbs[(pstr)->cur_idx + offset])
 #define re_string_fetch_byte(pstr) \
@@ -481,9 +455,7 @@
 #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
 #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
 
-#if defined _LIBC || HAVE_ALLOCA
-# include <alloca.h>
-#endif
+#include <alloca.h>
 
 #ifndef _LIBC
 # if HAVE_ALLOCA
@@ -500,18 +472,9 @@
 # endif
 #endif
 
-#ifdef _LIBC
-# define MALLOC_0_IS_NONNULL 1
-#elif !defined MALLOC_0_IS_NONNULL
-# define MALLOC_0_IS_NONNULL 0
-#endif
-
 #ifndef MAX
 # define MAX(a,b) ((a) < (b) ? (b) : (a))
 #endif
-#ifndef MIN
-# define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
 
 #define re_malloc(t,n) ((t *) malloc ((n) > 0 ? (n) * sizeof (t) : 1))
 #define re_realloc(p,t,n) ((t *) realloc (p, (n) * sizeof (t)))
@@ -527,8 +490,8 @@
 
   re_token_t token;
 
-  /* 'node_idx' is the index in dfa->nodes, if 'type' == 0.
-     Otherwise 'type' indicate the type of this node.  */
+  /* `node_idx' is the index in dfa->nodes, if `type' == 0.
+     Otherwise `type' indicate the type of this node.  */
   Idx node_idx;
 };
 typedef struct bin_tree_t bin_tree_t;
@@ -581,9 +544,9 @@
   struct re_dfastate_t **trtable, **word_trtable;
   unsigned int context : 4;
   unsigned int halt : 1;
-  /* If this state can accept "multi byte".
+  /* If this state can accept `multi byte'.
      Note that we refer to multibyte characters, and multi character
-     collating elements as "multi byte".  */
+     collating elements as `multi byte'.  */
   unsigned int accept_mb : 1;
   /* If this state has backreference node(s).  */
   unsigned int has_backref : 1;
@@ -712,7 +675,7 @@
   re_bitset_ptr_t sb_char;
   int str_tree_storage_idx;
 
-  /* number of subexpressions 're_nsub' is in regex_t.  */
+  /* number of subexpressions `re_nsub' is in regex_t.  */
   re_hashval_t state_hash_mask;
   Idx init_node;
   Idx nbackref; /* The number of backreference in this dfa.  */
@@ -736,7 +699,9 @@
 #ifdef DEBUG
   char* re_str;
 #endif
-  lock_define (lock)
+#ifdef _LIBC
+  __libc_lock_define (, lock)
+#endif
 };
 
 #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))
@@ -767,33 +732,33 @@
 } bracket_elem_t;
 
 
-/* Functions for bitset_t operation.  */
+/* Inline functions for bitset_t operation.  */
 
-static void
+static inline void
 bitset_set (bitset_t set, Idx i)
 {
   set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS;
 }
 
-static void
+static inline void
 bitset_clear (bitset_t set, Idx i)
 {
   set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS);
 }
 
-static bool
+static inline bool
 bitset_contain (const bitset_t set, Idx i)
 {
   return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1;
 }
 
-static void
+static inline void
 bitset_empty (bitset_t set)
 {
   memset (set, '\0', sizeof (bitset_t));
 }
 
-static void
+static inline void
 bitset_set_all (bitset_t set)
 {
   memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS));
@@ -802,13 +767,13 @@
       ((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1;
 }
 
-static void
+static inline void
 bitset_copy (bitset_t dest, const bitset_t src)
 {
   memcpy (dest, src, sizeof (bitset_t));
 }
 
-static void __attribute__ ((unused))
+static inline void
 bitset_not (bitset_t set)
 {
   int bitset_i;
@@ -820,7 +785,7 @@
        & ~set[BITSET_WORDS - 1]);
 }
 
-static void __attribute__ ((unused))
+static inline void
 bitset_merge (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
@@ -828,7 +793,7 @@
     dest[bitset_i] |= src[bitset_i];
 }
 
-static void __attribute__ ((unused))
+static inline void
 bitset_mask (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
@@ -837,9 +802,9 @@
 }
 
 #ifdef RE_ENABLE_I18N
-/* Functions for re_string.  */
-static int
-internal_function __attribute__ ((pure, unused))
+/* Inline functions for re_string.  */
+static inline int
+internal_function __attribute ((pure))
 re_string_char_size_at (const re_string_t *pstr, Idx idx)
 {
   int byte_idx;
@@ -851,8 +816,8 @@
   return byte_idx;
 }
 
-static wint_t
-internal_function __attribute__ ((pure, unused))
+static inline wint_t
+internal_function __attribute ((pure))
 re_string_wchar_at (const re_string_t *pstr, Idx idx)
 {
   if (pstr->mb_cur_max == 1)
@@ -860,15 +825,15 @@
   return (wint_t) pstr->wcs[idx];
 }
 
-# ifndef NOT_IN_libc
 static int
-internal_function __attribute__ ((pure, unused))
+internal_function __attribute ((pure))
 re_string_elem_size_at (const re_string_t *pstr, Idx idx)
 {
-#  ifdef _LIBC
+# ifdef _LIBC
   const unsigned char *p, *extra;
   const int32_t *table, *indirect;
-#   include <locale/weight.h>
+  int32_t tmp;
+#  include <locale/weight.h>
   uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
 
   if (nrules != 0)
@@ -879,14 +844,13 @@
       indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
 						_NL_COLLATE_INDIRECTMB);
       p = pstr->mbs + idx;
-      findidx (&p, pstr->len - idx);
+      tmp = findidx (&p);
       return p - pstr->mbs - idx;
     }
   else
-#  endif /* _LIBC */
+# endif /* _LIBC */
     return 1;
 }
-# endif
 #endif /* RE_ENABLE_I18N */
 
 #ifndef __GNUC_PREREQ
diff -Nru gettext-0.19.3/gettext-tools/libgrep/wcrtomb.c gettext-0.18.1.1/gettext-tools/libgrep/wcrtomb.c
--- gettext-0.19.3/gettext-tools/libgrep/wcrtomb.c	2014-10-16 06:00:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/libgrep/wcrtomb.c	2010-05-24 14:49:27.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 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 -Nru gettext-0.19.3/gettext-tools/m4/ChangeLog gettext-0.18.1.1/gettext-tools/m4/ChangeLog
--- gettext-0.19.3/gettext-tools/m4/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/m4/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,30 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2013-12-17  Daiki Ueno  <ueno@gnu.org>
-
-	Add missing extern-inline.m4 into archive.
-	Problem reported by Reuben Thomas in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00010.html>.
-	* Makefile.am (aclocal_DATA): Add extern-inline.m4.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/m4/Makefile.am gettext-0.18.1.1/gettext-tools/m4/Makefile.am
--- gettext-0.19.3/gettext-tools/m4/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/m4/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -8,7 +8,6 @@
   ../../gettext-runtime/gnulib-m4/lib-link.m4 \
   ../../gettext-runtime/gnulib-m4/lib-prefix.m4 \
   ../../gettext-runtime/m4/codeset.m4 \
-  ../../gettext-runtime/m4/extern-inline.m4 \
   ../../gettext-runtime/m4/fcntl-o.m4 \
   ../../gettext-runtime/m4/gettext.m4 \
   ../../gettext-runtime/m4/glibc2.m4 \
diff -Nru gettext-0.19.3/gettext-tools/m4/Makefile.in gettext-0.18.1.1/gettext-tools/m4/Makefile.in
--- gettext-0.19.3/gettext-tools/m4/Makefile.in	2014-10-16 06:01:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/m4/Makefile.in	2010-06-06 20:12:31.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -17,54 +18,10 @@
 # Files installed for use by gettextize.
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -80,69 +37,59 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog README
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -150,12 +97,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -172,7 +116,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -184,7 +127,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -193,26 +135,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -221,17 +157,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -257,7 +189,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -266,7 +197,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -275,26 +205,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -330,25 +258,14 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -370,18 +287,10 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(aclocaldir)" \
 	"$(DESTDIR)$(examplesbuildauxdir)"
 DATA = $(aclocal_DATA) $(examplesbuildaux_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -390,7 +299,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -428,7 +336,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -465,18 +372,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -488,26 +394,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -515,8 +411,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -528,23 +422,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -567,7 +456,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -585,18 +473,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -621,47 +504,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -669,7 +544,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -679,21 +553,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -705,103 +575,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -812,11 +629,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -826,6 +638,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -838,7 +651,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -859,16 +671,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -891,48 +703,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -955,6 +752,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -964,13 +762,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -979,47 +780,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1034,8 +804,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1075,7 +843,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1097,8 +864,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1106,13 +873,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1125,21 +890,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1152,9 +915,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1178,9 +941,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1194,12 +955,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1207,8 +965,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1220,41 +976,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1268,27 +1012,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1296,34 +1027,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1339,9 +1061,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1361,8 +1081,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1371,8 +1089,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1387,7 +1103,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1438,6 +1153,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1445,7 +1161,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1460,7 +1175,6 @@
   ../../gettext-runtime/gnulib-m4/lib-link.m4 \
   ../../gettext-runtime/gnulib-m4/lib-prefix.m4 \
   ../../gettext-runtime/m4/codeset.m4 \
-  ../../gettext-runtime/m4/extern-inline.m4 \
   ../../gettext-runtime/m4/fcntl-o.m4 \
   ../../gettext-runtime/m4/gettext.m4 \
   ../../gettext-runtime/m4/glibc2.m4 \
@@ -1546,11 +1260,8 @@
 	-rm -rf .libs _libs
 install-aclocalDATA: $(aclocal_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(aclocaldir)"
 	@list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1564,14 +1275,13 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(aclocaldir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(aclocaldir)" && rm -f $$files
 install-examplesbuildauxDATA: $(examplesbuildaux_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(examplesbuildauxdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesbuildauxdir)"
 	@list='$(examplesbuildaux_DATA)'; test -n "$(examplesbuildauxdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(examplesbuildauxdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(examplesbuildauxdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1585,12 +1295,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(examplesbuildaux_DATA)'; test -n "$(examplesbuildauxdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(examplesbuildauxdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(examplesbuildauxdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(examplesbuildauxdir)" && rm -f $$files
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1640,15 +1352,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1729,17 +1436,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-aclocalDATA install-am install-data \
-	install-data-am install-dvi install-dvi-am \
-	install-examplesbuildauxDATA install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-aclocalDATA uninstall-am \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-aclocalDATA \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-examplesbuildauxDATA install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
+	uninstall-aclocalDATA uninstall-am \
 	uninstall-examplesbuildauxDATA
 
 
diff -Nru gettext-0.19.3/gettext-tools/Makefile.am gettext-0.18.1.1/gettext-tools/Makefile.am
--- gettext-0.19.3/gettext-tools/Makefile.am	2014-05-01 09:37:33.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -17,6 +17,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
 
 SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
@@ -58,9 +59,3 @@
 # Cygwin support.
 
 EXTRA_DIST += woe32dll/export.h
-
-maintainer-update-po: $(top_builddir)/config.status
-	$(SHELL) ./config.status --recheck
-	$(SHELL) ./config.status po/Makefile.in po-directories
-	cd po && $(MAKE) update-po
-	cd examples && $(MAKE) maintainer-update-po
diff -Nru gettext-0.19.3/gettext-tools/Makefile.in gettext-0.18.1.1/gettext-tools/Makefile.in
--- gettext-0.19.3/gettext-tools/Makefile.in	2014-10-16 06:01:37.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/Makefile.in	2010-06-06 20:12:33.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -16,54 +17,10 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -79,87 +36,80 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/../build-aux/mkinstalldirs \
+DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../build-aux/compile \
+	$(srcdir)/../build-aux/config.guess \
+	$(srcdir)/../build-aux/config.rpath \
+	$(srcdir)/../build-aux/config.sub \
+	$(srcdir)/../build-aux/install-sh \
+	$(srcdir)/../build-aux/ltmain.sh \
+	$(srcdir)/../build-aux/missing \
+	$(srcdir)/../build-aux/mkinstalldirs $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/../build-aux/csharpcomp.sh.in \
 	$(top_srcdir)/../build-aux/csharpexec.sh.in \
 	$(top_srcdir)/../build-aux/javacomp.sh.in \
 	$(top_srcdir)/../build-aux/javaexec.sh.in \
-	$(top_srcdir)/../gettext-runtime/intl/Makefile.in ABOUT-NLS \
-	COPYING ../build-aux/compile ../build-aux/config.guess \
-	../build-aux/config.rpath ../build-aux/config.sub \
-	../build-aux/install-sh ../build-aux/missing \
-	../build-aux/mkinstalldirs ../build-aux/texinfo.tex \
-	../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
-	$(top_srcdir)/../build-aux/config.guess \
-	$(top_srcdir)/../build-aux/config.rpath \
-	$(top_srcdir)/../build-aux/config.sub \
-	$(top_srcdir)/../build-aux/install-sh \
-	$(top_srcdir)/../build-aux/ltmain.sh \
-	$(top_srcdir)/../build-aux/missing
+	$(top_srcdir)/../gettext-runtime/intl/Makefile.in \
+	$(top_srcdir)/configure ../build-aux/compile \
+	../build-aux/config.guess ../build-aux/config.rpath \
+	../build-aux/config.sub ../build-aux/depcomp \
+	../build-aux/elisp-comp ../build-aux/install-sh \
+	../build-aux/ltmain.sh ../build-aux/mdate-sh \
+	../build-aux/missing ../build-aux/mkinstalldirs \
+	../build-aux/texinfo.tex ../build-aux/ylwrap ABOUT-NLS AUTHORS \
+	COPYING ChangeLog INSTALL NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -167,12 +117,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -189,7 +136,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -201,7 +147,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -210,26 +155,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -238,17 +177,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -274,7 +209,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -283,7 +217,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -292,26 +225,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -371,85 +302,42 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(gettextsrcdir)" \
 	"$(DESTDIR)$(examplesbuildauxdir)"
 SCRIPTS = $(gettextsrc_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 depcomp =
 am__depfiles_maybe =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 DATA = $(examplesbuildaux_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -477,13 +365,9 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-pkglibexecdir = @pkglibexecdir@
-ACLOCAL = @ACLOCAL@
+ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
@@ -491,7 +375,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -529,7 +412,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -566,18 +448,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -589,26 +470,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -616,8 +487,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -629,23 +498,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -668,7 +532,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -686,18 +549,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -722,47 +580,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -770,7 +620,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -780,21 +629,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -806,103 +651,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -913,11 +705,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -927,6 +714,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -939,7 +727,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -960,16 +747,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -992,48 +779,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -1056,6 +828,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1065,13 +838,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1080,47 +856,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1135,8 +880,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1176,7 +919,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1198,8 +940,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1207,13 +949,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1226,21 +966,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1253,9 +991,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1279,9 +1017,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1295,12 +1031,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1308,8 +1041,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1321,41 +1052,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1369,27 +1088,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1397,34 +1103,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1440,9 +1137,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1462,8 +1157,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1472,8 +1165,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1488,7 +1179,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1539,6 +1229,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1546,7 +1237,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1583,7 +1273,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -1619,8 +1309,10 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -1644,11 +1336,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-gettextsrcSCRIPTS: $(gettextsrc_SCRIPTS)
 	@$(NORMAL_INSTALL)
+	test -z "$(gettextsrcdir)" || $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)"
 	@list='$(gettextsrc_SCRIPTS)'; test -n "$(gettextsrcdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gettextsrcdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -1676,7 +1365,9 @@
 	@list='$(gettextsrc_SCRIPTS)'; test -n "$(gettextsrcdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(gettextsrcdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gettextsrcdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gettextsrcdir)" && rm -f $$files
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1688,11 +1379,8 @@
 	-rm -f libtool config.lt
 install-examplesbuildauxDATA: $(examplesbuildaux_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(examplesbuildauxdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesbuildauxdir)"
 	@list='$(examplesbuildaux_DATA)'; test -n "$(examplesbuildauxdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(examplesbuildauxdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(examplesbuildauxdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1706,28 +1394,27 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(examplesbuildaux_DATA)'; test -n "$(examplesbuildauxdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(examplesbuildauxdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(examplesbuildauxdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(examplesbuildauxdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -1742,12 +1429,57 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1763,7 +1495,12 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1775,11 +1512,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1788,31 +1529,9 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -1848,10 +1567,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1880,42 +1602,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -1926,8 +1642,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1937,20 +1653,18 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    --with-included-gettext \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1973,21 +1687,13 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -2021,15 +1727,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -2114,12 +1815,13 @@
 uninstall-am: uninstall-examplesbuildauxDATA \
 	uninstall-gettextsrcSCRIPTS
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local am--refresh check check-am clean \
+	clean-generic clean-libtool ctags ctags-recursive dist \
+	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
 	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
@@ -2131,8 +1833,8 @@
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-examplesbuildauxDATA \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-examplesbuildauxDATA \
 	uninstall-gettextsrcSCRIPTS
 
 
@@ -2142,12 +1844,6 @@
 $(srcdir)/ABOUT-NLS: $(srcdir)/../gettext-runtime/ABOUT-NLS
 	cp $(srcdir)/../gettext-runtime/ABOUT-NLS $(srcdir)/ABOUT-NLS
 
-maintainer-update-po: $(top_builddir)/config.status
-	$(SHELL) ./config.status --recheck
-	$(SHELL) ./config.status po/Makefile.in po-directories
-	cd po && $(MAKE) update-po
-	cd examples && $(MAKE) maintainer-update-po
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru gettext-0.19.3/gettext-tools/man/autopoint.1 gettext-0.18.1.1/gettext-tools/man/autopoint.1
--- gettext-0.19.3/gettext-tools/man/autopoint.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/autopoint.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOPOINT "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH AUTOPOINT "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 autopoint \- copies standard gettext infrastructure
 .SH SYNOPSIS
@@ -27,8 +27,8 @@
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .PP
-Uses a versions archive in dirxz format.
-Copyright (C) 2002-2013 Free Software Foundation, Inc.
+Uses a versions archive in git format.
+Copyright (C) 2002-2010 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff -Nru gettext-0.19.3/gettext-tools/man/autopoint.1.html gettext-0.18.1.1/gettext-tools/man/autopoint.1.html
--- gettext-0.19.3/gettext-tools/man/autopoint.1.html	2014-10-16 06:03:19.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/autopoint.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>AUTOPOINT</title>
-
 </head>
 <body>
 
-<h1 align="center">AUTOPOINT</h1>
-
+<h1 align=center>AUTOPOINT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,112 +17,173 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">autopoint
-&minus; copies standard gettext infrastructure</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>autopoint &minus; copies standard gettext
+infrastructure</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>autopoint</b>
-[<i>OPTION</i>]...</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>autopoint</b> [<i>OPTION</i>]...</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copies standard
-gettext infrastructure files into a source package.</p>
-
-<h2>OPTIONS
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copies standard gettext infrastructure files into a
+source package.</p>
+</td>
+</table>
 <a name="OPTIONS"></a>
-</h2>
-
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>OPTIONS</h2>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
-
-<p style="margin-top: 1em"><b>&minus;&minus;help</b></p></td>
-<td width="2%"></td>
-<td width="36%">
-
+<td width="8%">
 
-<p style="margin-top: 1em">print this help and exit</p></td>
-<td width="42%">
-</td></tr>
+<p><b>&minus;&minus;help</b></p>
+</td>
+<td width="13%"></td>
+<td width="35%">
+
+<p>print this help and exit</p>
+</td>
+<td width="30%">
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>, <b>&minus;&minus;force</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>force overwriting of files that already exist</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;dry&minus;run</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print modifications but don&rsquo;t perform them</p>
+</td>
 </table>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">print version information and
-exit</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;force</b></p>
-
-<p style="margin-left:22%;">force overwriting of files that
-already exist</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;dry&minus;run</b></p>
-
-<p style="margin-left:22%;">print modifications but
-don&rsquo;t perform them</p>
-
-<h2>AUTHOR
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Uses a versions
-archive in dirxz format. Copyright (C) 2002-2013 Free
-Software Foundation, Inc. License GPLv3+: GNU GPL version 3
-or later &lt;http://gnu.org/licenses/gpl.html&gt; This is
-free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.</p>
-
-<h2>SEE ALSO
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+<!-- INDENTATION -->
+<p>Uses a versions archive in git format. Copyright (C)
+2002-2010 Free Software Foundation, Inc. License GPLv3+: GNU
+GPL version 3 or later
+&lt;http://gnu.org/licenses/gpl.html&gt; This is free
+software: you are free to change and redistribute it. There
+is NO WARRANTY, to the extent permitted by law.</p>
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>autopoint</b> is maintained as a
-Texinfo manual. If the <b>info</b> and <b>autopoint</b>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>autopoint</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>autopoint</b>
 programs are properly installed at your site, the
 command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-autopoint</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info autopoint</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/ChangeLog gettext-0.18.1.1/gettext-tools/man/ChangeLog
--- gettext-0.19.3/gettext-tools/man/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,45 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-19  Daiki Ueno  <ueno@gnu.org>
-
-	build: Simplify man and HTML documentation generation
-	Problem reported by Santiago Vila in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00024.html>.
-	* Makefile.am (man_MAN1SRC): New variable; rename from man_MAN1OTHER.
-	(man_MAN1MISC): New variable; split from man_MAN1OTHER.
-	(gt_man2html): New variable; don't overwrite output if groff fails.
-	($(man_MAN1SRC)): Factor out the common generation logic.
-	($(man_MAN1MISC)): Likewise.
-	($(man_HTML)): Rewrite using $(gt_man2html).
-
-2014-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Refer to .version instead of version.sh.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/man/gettextize.1 gettext-0.18.1.1/gettext-tools/man/gettextize.1
--- gettext-0.19.3/gettext-tools/man/gettextize.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/gettextize.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXTIZE "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH GETTEXTIZE "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 gettextize \- install or upgrade gettext infrastructure
 .SH SYNOPSIS
@@ -39,7 +39,7 @@
 .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-2010 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 -Nru gettext-0.19.3/gettext-tools/man/gettextize.1.html gettext-0.18.1.1/gettext-tools/man/gettextize.1.html
--- gettext-0.19.3/gettext-tools/man/gettextize.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/gettextize.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>GETTEXTIZE</title>
-
 </head>
 <body>
 
-<h1 align="center">GETTEXTIZE</h1>
-
+<h1 align=center>GETTEXTIZE</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -29,153 +18,248 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">gettextize
-&minus; install or upgrade gettext infrastructure</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>gettextize &minus; install or upgrade gettext
+infrastructure</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>gettextize</b>
-[<i>OPTION</i>]... [<i>package-dir</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>gettextize</b> [<i>OPTION</i>]...
+[<i>package-dir</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Prepares a
-source package to use gettext.</p>
-
-<h2>OPTIONS
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Prepares a source package to use gettext.</p>
+</td>
+</table>
 <a name="OPTIONS"></a>
-</h2>
-
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>OPTIONS</h2>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
-
-<p style="margin-top: 1em"><b>&minus;&minus;help</b></p></td>
-<td width="2%"></td>
-<td width="36%">
-
+<td width="8%">
 
-<p style="margin-top: 1em">print this help and exit</p></td>
-<td width="42%">
-</td></tr>
+<p><b>&minus;&minus;help</b></p>
+</td>
+<td width="13%"></td>
+<td width="35%">
+
+<p>print this help and exit</p>
+</td>
+<td width="30%">
+</td>
 </table>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">print version information and
-exit</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;force</b></p>
-
-<p style="margin-left:22%;">force writing of new files even
-if old exist</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>, <b>&minus;&minus;force</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>force writing of new files even if old exist</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
-
-<p><b>&minus;&minus;intl</b></p></td>
-<td width="2%"></td>
-<td width="70%">
-
-
-<p>install libintl in a subdirectory (deprecated)</p></td>
 <td width="8%">
-</td></tr>
-</table>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;po&minus;dir</b>=<i>DIR</i></p>
-
-<p style="margin-left:22%;">specify directory with PO
-files</p>
-
 
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;changelog</b></p>
+<p><b>&minus;&minus;intl</b></p>
+</td>
+<td width="13%"></td>
+<td width="66%">
 
-<p style="margin-left:22%;">don&rsquo;t update or create
-ChangeLog files</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;symlink</b></p>
-
-<p style="margin-left:22%;">make symbolic links instead of
-copying files</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;dry&minus;run</b></p>
-
-<p style="margin-left:22%;">print modifications but
-don&rsquo;t perform them</p>
-
-<h2>AUTHOR
+<p>install libintl in a subdirectory (deprecated)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;po&minus;dir</b>=<i>DIR</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify directory with PO files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;changelog</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>don&rsquo;t update or create ChangeLog files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;symlink</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>make symbolic links instead of copying files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;dry&minus;run</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print modifications but don&rsquo;t perform them</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Ulrich Drepper</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Ulrich Drepper</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2013 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>gettextize</b> is maintained as a
-Texinfo manual. If the <b>info</b> and <b>gettextize</b>
-programs are properly installed at your site, the
-command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-gettextize</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>gettextize</b> is
+maintained as a Texinfo manual. If the <b>info</b> and
+<b>gettextize</b> programs are properly installed at your
+site, the command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info gettextize</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/Makefile.am gettext-0.18.1.1/gettext-tools/man/Makefile.am
--- gettext-0.19.3/gettext-tools/man/Makefile.am	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -26,32 +26,29 @@
 
 man_aux = \
 msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \
-msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x \
-msggrep.x msginit.x msguniq.x \
+msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x \
 recode-sr-latin.x \
 gettextize.x autopoint.x
 
 # Likewise.
 
-man_MAN1SRC = \
+man_MAN1OTHER = \
 msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
-msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 \
-msggrep.1 msginit.1 msguniq.1 \
-recode-sr-latin.1
-man_MAN1MISC = \
+msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1 \
+recode-sr-latin.1 \
 gettextize.1 autopoint.1
-man_MAN1 = $(man_MAN1SRC) $(man_MAN1MISC)
+man_MAN1 = $(man_MAN1OTHER)
 man_MANS = $(man_MAN1)
 
-man_HTML = \
+man_HTMLOTHER = \
 msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
-msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html \
-msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
+msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
 recode-sr-latin.1.html \
 gettextize.1.html autopoint.1.html
+man_HTML = $(man_HTMLOTHER)
 
-EXTRA_DIST += help2man $(man_aux) $(man_MANS) $(man_HTML) ChangeLog.0
-MAINTAINERCLEANFILES = $(man_MANS) $(man_HTML)
+EXTRA_DIST += help2man $(man_aux) $(man_MAN1OTHER) $(man_HTMLOTHER) ChangeLog.0
+MAINTAINERCLEANFILES = $(man_MAN1OTHER) $(man_HTMLOTHER)
 
 PERL = @PERL@
 RM = rm -f
@@ -62,17 +59,6 @@
 # groff 1.17 or newer.
 MAN2HTML = groff -mandoc -Thtml
 
-UPDATEMODE =
-
-
-gt_man2html = \
-	if test -f $${srcdir}$$m; then \
-	  $(MAN2HTML) $${srcdir}$$m > t-$@ && \
-	  sed -e '/CreationDate:/d' < t-$@ > t2-$@ && \
-	  mv t2-$@ $@; \
-	  rm -f t-$@ t2-$@; \
-	fi
-
 
 # We distribute both the man pages and their HTML equivalent.
 # The user can generate the parts, via
@@ -88,80 +74,127 @@
 # Man pages.
 
 # The progname.x files contain some extra information not found in the
-# "progname --help" output.  progname.1 depends on the source, not the
-# binary; we don't need to regenerate the binary when any source file
-# changes, only the main one.
-
-$(man_MAN1SRC): help2man $(top_srcdir)/../.version
-	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
-	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
-	  ../src/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
-
-msgcmp.1: msgcmp.x ../src/msgcmp.c
-msgfmt.1: msgfmt.x ../src/msgfmt.c
-msgmerge.1: msgmerge.x ../src/msgmerge.c
-msgunfmt.1: msgunfmt.x ../src/msgunfmt.c
-xgettext.1: xgettext.x ../src/xgettext.c
-msgattrib.1: msgattrib.x ../src/msgattrib.c
-msgcat.1: msgcat.x ../src/msgcat.c
-msgcomm.1: msgcomm.x ../src/msgcomm.c
-msgconv.1: msgconv.x ../src/msgconv.c
-msgen.1: msgen.x ../src/msgen.c
-msgexec.1: msgexec.x ../src/msgexec.c
-msgfilter.1: msgfilter.x ../src/msgfilter.c
-msggrep.1: msggrep.x ../src/msggrep.c
-msginit.1: msginit.x ../src/msginit.c
-msguniq.1: msguniq.x ../src/msguniq.c
-recode-sr-latin.1: recode-sr-latin.x ../src/recode-sr-latin.c
-
-$(man_MAN1MISC): help2man $(top_srcdir)/../.version
-	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
-	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
-	  ../misc/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
+# "progname --help" output.
 
-gettextize.1: gettextize.x ../misc/gettextize.in
-autopoint.1: autopoint.x ../misc/autopoint.in
+msgcmp.1: msgcmp.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcmp$(EXEEXT) $(srcdir)/msgcmp.x msgcmp.1
+msgfmt.1: msgfmt.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfmt$(EXEEXT) $(srcdir)/msgfmt.x msgfmt.1
+msgmerge.1: msgmerge.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgmerge$(EXEEXT) $(srcdir)/msgmerge.x msgmerge.1
+msgunfmt.1: msgunfmt.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgunfmt$(EXEEXT) $(srcdir)/msgunfmt.x msgunfmt.1
+xgettext.1: xgettext.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/xgettext$(EXEEXT) $(srcdir)/xgettext.x xgettext.1
+msgattrib.1: msgattrib.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgattrib$(EXEEXT) $(srcdir)/msgattrib.x msgattrib.1
+msgcat.1: msgcat.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcat$(EXEEXT) $(srcdir)/msgcat.x msgcat.1
+msgcomm.1: msgcomm.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcomm$(EXEEXT) $(srcdir)/msgcomm.x msgcomm.1
+msgconv.1: msgconv.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgconv$(EXEEXT) $(srcdir)/msgconv.x msgconv.1
+msgen.1: msgen.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgen$(EXEEXT) $(srcdir)/msgen.x msgen.1
+msgexec.1: msgexec.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1
+msgfilter.1: msgfilter.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfilter$(EXEEXT) $(srcdir)/msgfilter.x msgfilter.1
+msggrep.1: msggrep.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1
+msginit.1: msginit.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msginit$(EXEEXT) $(srcdir)/msginit.x msginit.1
+msguniq.1: msguniq.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1
+recode-sr-latin.1: recode-sr-latin.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/recode-sr-latin$(EXEEXT) $(srcdir)/recode-sr-latin.x recode-sr-latin.1
+
+gettextize.1: gettextize.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/gettextize $(srcdir)/gettextize.x gettextize.1
+autopoint.1: autopoint.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1
+
+# Depend on version.sh to get version number changes.
+$(man_MAN1): help2man $(top_srcdir)/../version.sh
+
+# Update them also during "make dist", in order to propagate added command
+# line options that were added, even if version.sh didn't change.
+UPDATEMODE =
+update-man1:
+	$(MAKE) $(man_MAN1) UPDATEMODE=--update
+	$(MAKE)
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: update-man1
 
 
 # Man pages in HTML format.
 
 html-local: $(man_HTML)
 
-$(man_HTML):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.1\.html$$//'`; \
-	m=$${progname}.1; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
-
 msgcmp.1.html: msgcmp.1
+	$(MAN2HTML) `if test -f msgcmp.1; then echo .; else echo $(srcdir); fi`/msgcmp.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgfmt.1.html: msgfmt.1
+	$(MAN2HTML) `if test -f msgfmt.1; then echo .; else echo $(srcdir); fi`/msgfmt.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgmerge.1.html: msgmerge.1
+	$(MAN2HTML) `if test -f msgmerge.1; then echo .; else echo $(srcdir); fi`/msgmerge.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgunfmt.1.html: msgunfmt.1
+	$(MAN2HTML) `if test -f msgunfmt.1; then echo .; else echo $(srcdir); fi`/msgunfmt.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 xgettext.1.html: xgettext.1
+	$(MAN2HTML) `if test -f xgettext.1; then echo .; else echo $(srcdir); fi`/xgettext.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgattrib.1.html: msgattrib.1
+	$(MAN2HTML) `if test -f msgattrib.1; then echo .; else echo $(srcdir); fi`/msgattrib.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgcat.1.html: msgcat.1
+	$(MAN2HTML) `if test -f msgcat.1; then echo .; else echo $(srcdir); fi`/msgcat.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgcomm.1.html: msgcomm.1
+	$(MAN2HTML) `if test -f msgcomm.1; then echo .; else echo $(srcdir); fi`/msgcomm.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgconv.1.html: msgconv.1
+	$(MAN2HTML) `if test -f msgconv.1; then echo .; else echo $(srcdir); fi`/msgconv.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgen.1.html: msgen.1
+	$(MAN2HTML) `if test -f msgen.1; then echo .; else echo $(srcdir); fi`/msgen.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgexec.1.html: msgexec.1
+	$(MAN2HTML) `if test -f msgexec.1; then echo .; else echo $(srcdir); fi`/msgexec.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgfilter.1.html: msgfilter.1
+	$(MAN2HTML) `if test -f msgfilter.1; then echo .; else echo $(srcdir); fi`/msgfilter.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msggrep.1.html: msggrep.1
+	$(MAN2HTML) `if test -f msggrep.1; then echo .; else echo $(srcdir); fi`/msggrep.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msginit.1.html: msginit.1
+	$(MAN2HTML) `if test -f msginit.1; then echo .; else echo $(srcdir); fi`/msginit.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msguniq.1.html: msguniq.1
+	$(MAN2HTML) `if test -f msguniq.1; then echo .; else echo $(srcdir); fi`/msguniq.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 recode-sr-latin.1.html: recode-sr-latin.1
+	$(MAN2HTML) `if test -f recode-sr-latin.1; then echo .; else echo $(srcdir); fi`/recode-sr-latin.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 gettextize.1.html: gettextize.1
+	$(MAN2HTML) `if test -f gettextize.1; then echo .; else echo $(srcdir); fi`/gettextize.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 autopoint.1.html: autopoint.1
+	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 install-html-local:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	for file in $(man_HTML); do \
 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
 	done
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html:
 	for file in $(man_HTML); do \
diff -Nru gettext-0.19.3/gettext-tools/man/Makefile.in gettext-0.18.1.1/gettext-tools/man/Makefile.in
--- gettext-0.19.3/gettext-tools/man/Makefile.in	2014-10-16 06:01:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/Makefile.in	2010-06-06 20:12:31.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,54 +15,10 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,70 +34,59 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = man
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs $(srcdir)/x-to-1.in \
-	ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/x-to-1.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -148,12 +94,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -170,7 +113,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -182,7 +124,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -191,26 +132,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -219,17 +154,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -255,7 +186,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -264,7 +194,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -273,26 +202,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -328,25 +255,14 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = x-to-1
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -368,19 +284,11 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
 MANS = $(man_MANS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -389,7 +297,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -427,7 +334,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -464,18 +370,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -487,26 +392,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -514,8 +409,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -527,23 +420,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -566,7 +454,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -584,18 +471,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -620,47 +502,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -668,7 +542,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -678,21 +551,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -704,103 +573,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -811,11 +627,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -825,6 +636,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -837,7 +649,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -858,16 +669,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -890,48 +701,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -954,6 +750,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -963,13 +760,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -978,47 +778,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1033,8 +802,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1074,7 +841,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1096,8 +862,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1105,13 +871,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1124,21 +888,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1151,9 +913,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1177,9 +939,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1193,12 +953,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1206,8 +963,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1219,41 +974,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1267,27 +1010,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1295,34 +1025,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1338,9 +1059,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1360,8 +1079,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1370,8 +1087,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1386,7 +1101,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1437,6 +1151,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1444,7 +1159,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1455,38 +1169,35 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.2 gnits
-EXTRA_DIST = help2man $(man_aux) $(man_MANS) $(man_HTML) ChangeLog.0
+EXTRA_DIST = help2man $(man_aux) $(man_MAN1OTHER) $(man_HTMLOTHER) \
+	ChangeLog.0
 
 # A manual page for each of the bin_PROGRAMS in src/Makefile.am
 # and for each of the bin_SCRIPTS in misc/Makefile.am.
 man_aux = \
 msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \
-msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x \
-msggrep.x msginit.x msguniq.x \
+msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x \
 recode-sr-latin.x \
 gettextize.x autopoint.x
 
 
 # Likewise.
-man_MAN1SRC = \
+man_MAN1OTHER = \
 msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
-msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 \
-msggrep.1 msginit.1 msguniq.1 \
-recode-sr-latin.1
-
-man_MAN1MISC = \
+msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1 \
+recode-sr-latin.1 \
 gettextize.1 autopoint.1
 
-man_MAN1 = $(man_MAN1SRC) $(man_MAN1MISC)
+man_MAN1 = $(man_MAN1OTHER)
 man_MANS = $(man_MAN1)
-man_HTML = \
+man_HTMLOTHER = \
 msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
-msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html \
-msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
+msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
 recode-sr-latin.1.html \
 gettextize.1.html autopoint.1.html
 
-MAINTAINERCLEANFILES = $(man_MANS) $(man_HTML)
+man_HTML = $(man_HTMLOTHER)
+MAINTAINERCLEANFILES = $(man_MAN1OTHER) $(man_HTMLOTHER)
 RM = rm -f
 
 # help2man 1.24 or newer.
@@ -1494,15 +1205,10 @@
 
 # groff 1.17 or newer.
 MAN2HTML = groff -mandoc -Thtml
-UPDATEMODE = 
-gt_man2html = \
-	if test -f $${srcdir}$$m; then \
-	  $(MAN2HTML) $${srcdir}$$m > t-$@ && \
-	  sed -e '/CreationDate:/d' < t-$@ > t2-$@ && \
-	  mv t2-$@ $@; \
-	  rm -f t-$@ t2-$@; \
-	fi
 
+# Update them also during "make dist", in order to propagate added command
+# line options that were added, even if version.sh didn't change.
+UPDATEMODE = 
 all: all-am
 
 .SUFFIXES:
@@ -1546,18 +1252,11 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -1586,15 +1285,30 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+tags: TAGS
+TAGS:
 
-ctags CTAGS:
-
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1641,15 +1355,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1733,19 +1442,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am html-local info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-html-local install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-local \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-local uninstall-man \
-	uninstall-man1
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am html-local info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-html-local install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-local maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local uninstall-man uninstall-man1
 
 
 # We distribute both the man pages and their HTML equivalent.
@@ -1761,79 +1469,122 @@
 # Man pages.
 
 # The progname.x files contain some extra information not found in the
-# "progname --help" output.  progname.1 depends on the source, not the
-# binary; we don't need to regenerate the binary when any source file
-# changes, only the main one.
-
-$(man_MAN1SRC): help2man $(top_srcdir)/../.version
-	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
-	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
-	  ../src/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
-
-msgcmp.1: msgcmp.x ../src/msgcmp.c
-msgfmt.1: msgfmt.x ../src/msgfmt.c
-msgmerge.1: msgmerge.x ../src/msgmerge.c
-msgunfmt.1: msgunfmt.x ../src/msgunfmt.c
-xgettext.1: xgettext.x ../src/xgettext.c
-msgattrib.1: msgattrib.x ../src/msgattrib.c
-msgcat.1: msgcat.x ../src/msgcat.c
-msgcomm.1: msgcomm.x ../src/msgcomm.c
-msgconv.1: msgconv.x ../src/msgconv.c
-msgen.1: msgen.x ../src/msgen.c
-msgexec.1: msgexec.x ../src/msgexec.c
-msgfilter.1: msgfilter.x ../src/msgfilter.c
-msggrep.1: msggrep.x ../src/msggrep.c
-msginit.1: msginit.x ../src/msginit.c
-msguniq.1: msguniq.x ../src/msguniq.c
-recode-sr-latin.1: recode-sr-latin.x ../src/recode-sr-latin.c
-
-$(man_MAN1MISC): help2man $(top_srcdir)/../.version
-	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
-	IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
-	  ../misc/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
+# "progname --help" output.
 
-gettextize.1: gettextize.x ../misc/gettextize.in
-autopoint.1: autopoint.x ../misc/autopoint.in
+msgcmp.1: msgcmp.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcmp$(EXEEXT) $(srcdir)/msgcmp.x msgcmp.1
+msgfmt.1: msgfmt.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfmt$(EXEEXT) $(srcdir)/msgfmt.x msgfmt.1
+msgmerge.1: msgmerge.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgmerge$(EXEEXT) $(srcdir)/msgmerge.x msgmerge.1
+msgunfmt.1: msgunfmt.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgunfmt$(EXEEXT) $(srcdir)/msgunfmt.x msgunfmt.1
+xgettext.1: xgettext.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/xgettext$(EXEEXT) $(srcdir)/xgettext.x xgettext.1
+msgattrib.1: msgattrib.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgattrib$(EXEEXT) $(srcdir)/msgattrib.x msgattrib.1
+msgcat.1: msgcat.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcat$(EXEEXT) $(srcdir)/msgcat.x msgcat.1
+msgcomm.1: msgcomm.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcomm$(EXEEXT) $(srcdir)/msgcomm.x msgcomm.1
+msgconv.1: msgconv.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgconv$(EXEEXT) $(srcdir)/msgconv.x msgconv.1
+msgen.1: msgen.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgen$(EXEEXT) $(srcdir)/msgen.x msgen.1
+msgexec.1: msgexec.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1
+msgfilter.1: msgfilter.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfilter$(EXEEXT) $(srcdir)/msgfilter.x msgfilter.1
+msggrep.1: msggrep.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1
+msginit.1: msginit.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msginit$(EXEEXT) $(srcdir)/msginit.x msginit.1
+msguniq.1: msguniq.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1
+recode-sr-latin.1: recode-sr-latin.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/recode-sr-latin$(EXEEXT) $(srcdir)/recode-sr-latin.x recode-sr-latin.1
+
+gettextize.1: gettextize.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/gettextize $(srcdir)/gettextize.x gettextize.1
+autopoint.1: autopoint.x
+	$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1
+
+# Depend on version.sh to get version number changes.
+$(man_MAN1): help2man $(top_srcdir)/../version.sh
+update-man1:
+	$(MAKE) $(man_MAN1) UPDATEMODE=--update
+	$(MAKE)
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: update-man1
 
 # Man pages in HTML format.
 
 html-local: $(man_HTML)
 
-$(man_HTML):
-	srcdir=''; \
-	progname=`echo $@ | sed -e 's/\.1\.html$$//'`; \
-	m=$${progname}.1; \
-	test -f ./$$m || srcdir=$(srcdir)/; \
-	$(gt_man2html)
-
 msgcmp.1.html: msgcmp.1
+	$(MAN2HTML) `if test -f msgcmp.1; then echo .; else echo $(srcdir); fi`/msgcmp.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgfmt.1.html: msgfmt.1
+	$(MAN2HTML) `if test -f msgfmt.1; then echo .; else echo $(srcdir); fi`/msgfmt.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgmerge.1.html: msgmerge.1
+	$(MAN2HTML) `if test -f msgmerge.1; then echo .; else echo $(srcdir); fi`/msgmerge.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgunfmt.1.html: msgunfmt.1
+	$(MAN2HTML) `if test -f msgunfmt.1; then echo .; else echo $(srcdir); fi`/msgunfmt.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 xgettext.1.html: xgettext.1
+	$(MAN2HTML) `if test -f xgettext.1; then echo .; else echo $(srcdir); fi`/xgettext.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgattrib.1.html: msgattrib.1
+	$(MAN2HTML) `if test -f msgattrib.1; then echo .; else echo $(srcdir); fi`/msgattrib.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgcat.1.html: msgcat.1
+	$(MAN2HTML) `if test -f msgcat.1; then echo .; else echo $(srcdir); fi`/msgcat.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgcomm.1.html: msgcomm.1
+	$(MAN2HTML) `if test -f msgcomm.1; then echo .; else echo $(srcdir); fi`/msgcomm.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgconv.1.html: msgconv.1
+	$(MAN2HTML) `if test -f msgconv.1; then echo .; else echo $(srcdir); fi`/msgconv.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgen.1.html: msgen.1
+	$(MAN2HTML) `if test -f msgen.1; then echo .; else echo $(srcdir); fi`/msgen.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgexec.1.html: msgexec.1
+	$(MAN2HTML) `if test -f msgexec.1; then echo .; else echo $(srcdir); fi`/msgexec.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msgfilter.1.html: msgfilter.1
+	$(MAN2HTML) `if test -f msgfilter.1; then echo .; else echo $(srcdir); fi`/msgfilter.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msggrep.1.html: msggrep.1
+	$(MAN2HTML) `if test -f msggrep.1; then echo .; else echo $(srcdir); fi`/msggrep.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msginit.1.html: msginit.1
+	$(MAN2HTML) `if test -f msginit.1; then echo .; else echo $(srcdir); fi`/msginit.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 msguniq.1.html: msguniq.1
+	$(MAN2HTML) `if test -f msguniq.1; then echo .; else echo $(srcdir); fi`/msguniq.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 recode-sr-latin.1.html: recode-sr-latin.1
+	$(MAN2HTML) `if test -f recode-sr-latin.1; then echo .; else echo $(srcdir); fi`/recode-sr-latin.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 gettextize.1.html: gettextize.1
+	$(MAN2HTML) `if test -f gettextize.1; then echo .; else echo $(srcdir); fi`/gettextize.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 autopoint.1.html: autopoint.1
+	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 
 install-html-local:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 	for file in $(man_HTML); do \
 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
 	done
 
 installdirs-html:
-	$(MKDIR_P) $(DESTDIR)$(htmldir)
+	$(mkdir_p) $(DESTDIR)$(htmldir)
 
 uninstall-html:
 	for file in $(man_HTML); do \
diff -Nru gettext-0.19.3/gettext-tools/man/msgattrib.1 gettext-0.18.1.1/gettext-tools/man/msgattrib.1
--- gettext-0.19.3/gettext-tools/man/msgattrib.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgattrib.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGATTRIB "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgattrib \- attribute matching and manipulation on message catalog
 .SH SYNOPSIS
@@ -61,16 +61,9 @@
 \fB\-\-clear\-obsolete\fR
 set all messages non-obsolete
 .TP
-\fB\-\-previous\fR
-when setting 'fuzzy', keep previous msgids
-of translated messages.
-.TP
 \fB\-\-clear\-previous\fR
 remove the "previous msgid" from all messages
 .TP
-\fB\-\-empty\fR
-when removing 'fuzzy', also set msgstr empty
-.TP
 \fB\-\-only\-file\fR=\fIFILE\fR.po
 manipulate only entries listed in FILE.po
 .TP
diff -Nru gettext-0.19.3/gettext-tools/man/msgattrib.1.html gettext-0.18.1.1/gettext-tools/man/msgattrib.1.html
--- gettext-0.19.3/gettext-tools/man/msgattrib.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgattrib.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGATTRIB</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGATTRIB</h1>
-
+<h1 align=center>MSGATTRIB</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,336 +17,855 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgattrib
-&minus; attribute matching and manipulation on message
-catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgattrib &minus; attribute matching and manipulation on
+message catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgattrib</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgattrib</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Filters the
-messages of a translation catalog according to their
-attributes, and manipulates the attributes.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE</p>
-
-<p style="margin-left:22%;">input PO file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Message
-selection: <br>
-&minus;&minus;translated</b></p>
-
-<p style="margin-left:22%;">keep translated, remove
-untranslated messages</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;untranslated</b></p>
-
-<p style="margin-left:22%;">keep untranslated, remove
-translated messages</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">remove &rsquo;fuzzy&rsquo;
-marked messages</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;only&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">keep &rsquo;fuzzy&rsquo; marked
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Filters the messages of a translation catalog according
+to their attributes, and manipulates the attributes.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Message selection:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;translated</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>keep translated, remove untranslated messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;untranslated</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>keep untranslated, remove translated messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>remove &rsquo;fuzzy&rsquo; marked messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;only&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>keep &rsquo;fuzzy&rsquo; marked messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;obsolete</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>remove obsolete #~ messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;only&minus;obsolete</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>keep obsolete #~ messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Attribute manipulation:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;set&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set all messages &rsquo;fuzzy&rsquo;</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;clear&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set all messages non-&rsquo;fuzzy&rsquo;</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;set&minus;obsolete</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set all messages obsolete</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;clear&minus;obsolete</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set all messages non-obsolete</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;clear&minus;previous</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>remove the &quot;previous msgid&quot; from all
 messages</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;obsolete</b></p>
-
-<p style="margin-left:22%;">remove obsolete #~ messages</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;only&minus;obsolete</b></p>
-
-<p style="margin-left:22%;">keep obsolete #~ messages</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Attribute
-manipulation: <br>
-&minus;&minus;set&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">set all messages
-&rsquo;fuzzy&rsquo;</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;clear&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">set all messages
-non-&rsquo;fuzzy&rsquo;</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;set&minus;obsolete</b></p>
-
-<p style="margin-left:22%;">set all messages obsolete</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;clear&minus;obsolete</b></p>
-
-<p style="margin-left:22%;">set all messages
-non-obsolete</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;previous</b></p>
-
-<p style="margin-left:22%;">when setting
-&rsquo;fuzzy&rsquo;, keep previous msgids of translated
-messages.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;clear&minus;previous</b></p>
-
-<p style="margin-left:22%;">remove the &quot;previous
-msgid&quot; from all messages</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;empty</b></p>
-
-<p style="margin-left:22%;">when removing
-&rsquo;fuzzy&rsquo;, also set msgstr empty</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;only&minus;file</b>=<i>FILE</i>.po</p>
-
-<p style="margin-left:22%;">manipulate only entries listed
-in FILE.po</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;ignore&minus;file</b>=<i>FILE</i>.po</p>
-
-<p style="margin-left:22%;">manipulate only entries not
-listed in FILE.po</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">synonym for
-<b>&minus;&minus;only&minus;fuzzy
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+
+<p><b>&minus;&minus;only&minus;file</b>=<i>FILE</i>.po</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>manipulate only entries listed in FILE.po</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+
+<p><b>&minus;&minus;ignore&minus;file</b>=<i>FILE</i>.po</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>manipulate only entries not listed in FILE.po</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>synonym for <b>&minus;&minus;only&minus;fuzzy
 &minus;&minus;clear&minus;fuzzy</b></p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;obsolete</b></p>
-
-<p style="margin-left:22%;">synonym for
-<b>&minus;&minus;only&minus;obsolete
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;obsolete</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>synonym for <b>&minus;&minus;only&minus;obsolete
 &minus;&minus;clear&minus;obsolete</b></p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write the .po file using indented style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not write &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">write the .po file using
-indented style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">do not write &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">generate &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">write out strict Uniforum
-conforming .po file</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out strict Uniforum conforming .po file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgattrib</b> is maintained as a
-Texinfo manual. If the <b>info</b> and <b>msgattrib</b>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgattrib</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgattrib</b>
 programs are properly installed at your site, the
 command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgattrib</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgattrib</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgcat.1 gettext-0.18.1.1/gettext-tools/man/msgcat.1
--- gettext-0.19.3/gettext-tools/man/msgcat.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgcat.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCAT "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGCAT "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgcat \- combines several message catalogs
 .SH SYNOPSIS
@@ -14,9 +14,9 @@
 before messages are printed.  Conversely, the \fB\-\-less\-than\fR option may be
 used to specify less commonality before messages are printed (i.e.
 \fB\-\-less\-than\fR=\fI2\fR will only print the unique messages).  Translations,
-comments, extracted comments, and file positions will be cumulated, except
-that if \fB\-\-use\-first\fR is specified, they will be taken from the first PO file
-to define them.
+comments and extract comments will be cumulated, except that if \fB\-\-use\-first\fR
+is specified, they will be taken from the first PO file to define them.
+File positions from all PO files will be cumulated.
 .PP
 Mandatory arguments to long options are mandatory for short options too.
 .SS "Input file location:"
diff -Nru gettext-0.19.3/gettext-tools/man/msgcat.1.html gettext-0.18.1.1/gettext-tools/man/msgcat.1.html
--- gettext-0.19.3/gettext-tools/man/msgcat.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgcat.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGCAT</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGCAT</h1>
-
+<h1 align=center>MSGCAT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,285 +17,724 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgcat &minus;
-combines several message catalogs</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgcat &minus; combines several message catalogs</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgcat</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]...</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgcat</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]...</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Concatenates
-and merges the specified PO files. Find messages which are
-common to two or more of the specified PO files. By using
-the <b>&minus;&minus;more&minus;than</b> option, greater
-commonality may be requested before messages are printed.
-Conversely, the <b>&minus;&minus;less&minus;than</b> option
-may be used to specify less commonality before messages are
-printed (i.e. <b>&minus;&minus;less&minus;than</b>=<i>2</i>
-will only print the unique messages). Translations,
-comments, extracted comments, and file positions will be
-cumulated, except that if
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Concatenates and merges the specified PO files. Find
+messages which are common to two or more of the specified PO
+files. By using the <b>&minus;&minus;more&minus;than</b>
+option, greater commonality may be requested before messages
+are printed. Conversely, the
+<b>&minus;&minus;less&minus;than</b> option may be used to
+specify less commonality before messages are printed (i.e.
+<b>&minus;&minus;less&minus;than</b>=<i>2</i> will only
+print the unique messages). Translations, comments and
+extract comments will be cumulated, except that if
 <b>&minus;&minus;use&minus;first</b> is specified, they will
-be taken from the first PO file to define them.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE ...</p>
-
-<p style="margin-left:22%;">input files</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;files&minus;from</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">get list of input files from
-FILE</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If input file
-is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Message
-selection:</b> <br>
--&lt;,
-<b>&minus;&minus;less&minus;than</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">print messages with less than
-this many definitions, defaults to infinite if not set</p>
-
-<p style="margin-left:11%;">-&gt;,
-<b>&minus;&minus;more&minus;than</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">print messages with more than
-this many definitions, defaults to 0 if not set</p>
-
-<p style="margin-left:11%;"><b>&minus;u</b>,
-<b>&minus;&minus;unique</b></p>
-
-<p style="margin-left:22%;">shorthand for
+be taken from the first PO file to define them. File
+positions from all PO files will be cumulated.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE ...</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>,
+<b>&minus;&minus;files&minus;from</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>get list of input files from FILE</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If input file is -, standard input is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Message selection:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>-&lt;,
+<b>&minus;&minus;less&minus;than</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print messages with less than this many definitions,
+defaults to infinite if not set</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>-&gt;,
+<b>&minus;&minus;more&minus;than</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print messages with more than this many definitions,
+defaults to 0 if not set</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;u</b>, <b>&minus;&minus;unique</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>shorthand for
 <b>&minus;&minus;less&minus;than</b>=<i>2</i>, requests that
 only unique messages be printed</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;t</b>,
-<b>&minus;&minus;to&minus;code</b>=<i>NAME</i></p>
-
-<p style="margin-left:22%;">encoding for output</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;use&minus;first</b></p>
-
-<p style="margin-left:22%;">use first available translation
-for each message, don&rsquo;t merge several translations</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;lang</b>=<i>CATALOGNAME</i></p>
-
-<p style="margin-left:22%;">set &rsquo;Language&rsquo;
-field in the header entry</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;t</b>,
+<b>&minus;&minus;to&minus;code</b>=<i>NAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>encoding for output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;use&minus;first</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use first available translation for each message,
+don&rsquo;t merge several translations</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;lang</b>=<i>CATALOGNAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set &rsquo;Language&rsquo; field in the header entry</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write the .po file using indented style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not write &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">write the .po file using
-indented style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">do not write &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">generate &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">write out strict Uniforum
-conforming .po file</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out strict Uniforum conforming .po file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgcat</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgcat</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgcat</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgcat</b> is maintained as
+a Texinfo manual. If the <b>info</b> and <b>msgcat</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgcat</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgcmp.1 gettext-0.18.1.1/gettext-tools/man/msgcmp.1
--- gettext-0.19.3/gettext-tools/man/msgcmp.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgcmp.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCMP "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGCMP "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgcmp \- compare message catalog and template
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-tools/man/msgcmp.1.html gettext-0.18.1.1/gettext-tools/man/msgcmp.1.html
--- gettext-0.19.3/gettext-tools/man/msgcmp.1.html	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgcmp.1.html	2010-06-06 18:39:07.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGCMP</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGCMP</h1>
-
+<h1 align=center>MSGCMP</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,166 +17,342 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgcmp &minus;
-compare message catalog and template</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgcmp &minus; compare message catalog and template</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgcmp</b>
-[<i>OPTION</i>] <i>def.po ref.pot</i></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgcmp</b> [<i>OPTION</i>] <i>def.po ref.pot</i></p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Compare two
-Uniforum style .po files to check that both contain the same
-set of msgid strings. The def.po file is an existing PO file
-with the translations. The ref.pot file is the last created
-PO file, or a PO Template file (generally created by
-xgettext). This is useful for checking that you have
-translated each and every message in your program. Where an
-exact match cannot be found, fuzzy matching is used to
-produce better diagnostics.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b></p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Compare two Uniforum style .po files to check that both
+contain the same set of msgid strings. The def.po file is an
+existing PO file with the translations. The ref.pot file is
+the last created PO file, or a PO Template file (generally
+created by xgettext). This is useful for checking that you
+have translated each and every message in your program.
+Where an exact match cannot be found, fuzzy matching is used
+to produce better diagnostics.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
+<td width="8%">
 
-<p>def.po</p></td>
-<td width="2%"></td>
-<td width="18%">
-
-
-<p>translations</p></td>
-<td width="60%">
-</td></tr>
+<p>def.po</p>
+</td>
+<td width="13%"></td>
+<td width="17%">
+
+<p>translations</p>
+</td>
+<td width="48%">
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>ref.pot</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>references to the sources</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation modifiers:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;m</b>,
+<b>&minus;&minus;multi&minus;domain</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>apply ref.pot to each of the domains in def.po</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;N</b>,
+<b>&minus;&minus;no&minus;fuzzy&minus;matching</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use fuzzy matching</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;use&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>consider fuzzy entries</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;use&minus;untranslated</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>consider untranslated entries</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
 </table>
-
-<p style="margin-left:11%;">ref.pot</p>
-
-<p style="margin-left:22%;">references to the sources</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-modifiers: <br>
-&minus;m</b>, <b>&minus;&minus;multi&minus;domain</b></p>
-
-<p style="margin-left:22%;">apply ref.pot to each of the
-domains in def.po</p>
-
-<p style="margin-left:11%;"><b>&minus;N</b>,
-<b>&minus;&minus;no&minus;fuzzy&minus;matching</b></p>
-
-<p style="margin-left:22%;">do not use fuzzy matching</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;use&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">consider fuzzy entries</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;use&minus;untranslated</b></p>
-
-<p style="margin-left:22%;">consider untranslated
-entries</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Peter Miller.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Peter Miller.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgcmp</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgcmp</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgcmp</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgcmp</b> is maintained as
+a Texinfo manual. If the <b>info</b> and <b>msgcmp</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgcmp</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgcomm.1 gettext-0.18.1.1/gettext-tools/man/msgcomm.1
--- gettext-0.19.3/gettext-tools/man/msgcomm.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgcomm.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCOMM "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGCOMM "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgcomm \- match two message catalogs
 .SH SYNOPSIS
@@ -13,7 +13,7 @@
 before messages are printed.  Conversely, the \fB\-\-less\-than\fR option may be
 used to specify less commonality before messages are printed (i.e.
 \fB\-\-less\-than\fR=\fI2\fR will only print the unique messages).  Translations,
-comments and extracted comments will be preserved, but only from the first
+comments and extract comments will be preserved, but only from the first
 PO file to define them.  File positions from all PO files will be
 cumulated.
 .PP
@@ -111,7 +111,7 @@
 sort output by file location
 .TP
 \fB\-\-omit\-header\fR
-don't write header with 'msgid ""' entry
+don't write header with `msgid ""' entry
 .SS "Informative output:"
 .TP
 \fB\-h\fR, \fB\-\-help\fR
diff -Nru gettext-0.19.3/gettext-tools/man/msgcomm.1.html gettext-0.18.1.1/gettext-tools/man/msgcomm.1.html
--- gettext-0.19.3/gettext-tools/man/msgcomm.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgcomm.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGCOMM</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGCOMM</h1>
-
+<h1 align=center>MSGCOMM</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,273 +17,687 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgcomm &minus;
-match two message catalogs</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgcomm &minus; match two message catalogs</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgcomm</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]...</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgcomm</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]...</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Find messages
-which are common to two or more of the specified PO files.
-By using the <b>&minus;&minus;more&minus;than</b> option,
-greater commonality may be requested before messages are
-printed. Conversely, the
-<b>&minus;&minus;less&minus;than</b> option may be used to
-specify less commonality before messages are printed (i.e.
-<b>&minus;&minus;less&minus;than</b>=<i>2</i> will only
-print the unique messages). Translations, comments and
-extracted comments will be preserved, but only from the
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Find messages which are common to two or more of the
+specified PO files. By using the
+<b>&minus;&minus;more&minus;than</b> option, greater
+commonality may be requested before messages are printed.
+Conversely, the <b>&minus;&minus;less&minus;than</b> option
+may be used to specify less commonality before messages are
+printed (i.e. <b>&minus;&minus;less&minus;than</b>=<i>2</i>
+will only print the unique messages). Translations, comments
+and extract comments will be preserved, but only from the
 first PO file to define them. File positions from all PO
 files will be cumulated.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE ...</p>
-
-<p style="margin-left:22%;">input files</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;files&minus;from</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">get list of input files from
-FILE</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If input file
-is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Message
-selection:</b> <br>
--&lt;,
-<b>&minus;&minus;less&minus;than</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">print messages with less than
-this many definitions, defaults to infinite if not set</p>
-
-<p style="margin-left:11%;">-&gt;,
-<b>&minus;&minus;more&minus;than</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">print messages with more than
-this many definitions, defaults to 1 if not set</p>
-
-<p style="margin-left:11%;"><b>&minus;u</b>,
-<b>&minus;&minus;unique</b></p>
-
-<p style="margin-left:22%;">shorthand for
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE ...</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>,
+<b>&minus;&minus;files&minus;from</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>get list of input files from FILE</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If input file is -, standard input is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Message selection:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>-&lt;,
+<b>&minus;&minus;less&minus;than</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print messages with less than this many definitions,
+defaults to infinite if not set</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>-&gt;,
+<b>&minus;&minus;more&minus;than</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print messages with more than this many definitions,
+defaults to 1 if not set</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;u</b>, <b>&minus;&minus;unique</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>shorthand for
 <b>&minus;&minus;less&minus;than</b>=<i>2</i>, requests that
 only unique messages be printed</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write the .po file using indented style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not write &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">write the .po file using
-indented style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">do not write &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">generate &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">write out strict Uniforum
-conforming .po file</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;omit&minus;header</b></p>
-
-<p style="margin-left:22%;">don&rsquo;t write header with
-&rsquo;msgid &quot;&quot;&rsquo; entry</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out strict Uniforum conforming .po file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;omit&minus;header</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>don&rsquo;t write header with &lsquo;msgid
+&quot;&quot;&rsquo; entry</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Peter Miller.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Peter Miller.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgcomm</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgcomm</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgcomm</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgcomm</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgcomm</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgcomm</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgconv.1 gettext-0.18.1.1/gettext-tools/man/msgconv.1
--- gettext-0.19.3/gettext-tools/man/msgconv.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgconv.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCONV "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGCONV "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgconv \- character set conversion for message catalog
 .SH SYNOPSIS
@@ -67,7 +67,7 @@
 \fB\-\-no\-location\fR
 suppress '#: filename:line' lines
 .TP
-\fB\-n\fR, \fB\-\-add\-location\fR
+\fB\-\-add\-location\fR
 preserve '#: filename:line' lines (default)
 .TP
 \fB\-\-strict\fR
diff -Nru gettext-0.19.3/gettext-tools/man/msgconv.1.html gettext-0.18.1.1/gettext-tools/man/msgconv.1.html
--- gettext-0.19.3/gettext-tools/man/msgconv.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgconv.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGCONV</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGCONV</h1>
-
+<h1 align=center>MSGCONV</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,239 +17,614 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgconv &minus;
-character set conversion for message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgconv &minus; character set conversion for message
+catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgconv</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgconv</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Converts a
-translation catalog to a different character encoding.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE</p>
-
-<p style="margin-left:22%;">input PO file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Conversion
-target: <br>
-&minus;t</b>,
-<b>&minus;&minus;to&minus;code</b>=<i>NAME</i></p>
-
-<p style="margin-left:22%;">encoding for output</p>
-
-<p style="margin-left:11%; margin-top: 1em">The default
-encoding is the current locale&rsquo;s encoding.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Converts a translation catalog to a different character
+encoding.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Conversion target:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;t</b>,
+<b>&minus;&minus;to&minus;code</b>=<i>NAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>encoding for output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The default encoding is the current locale&rsquo;s
+encoding.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>indented output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>preserve &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">indented output style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">suppress &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">preserve &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">strict Uniforum output
-style</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>strict Uniforum output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgconv</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgconv</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgconv</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgconv</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgconv</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgconv</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgen.1 gettext-0.18.1.1/gettext-tools/man/msgen.1
--- gettext-0.19.3/gettext-tools/man/msgen.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgen.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEN "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGEN "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgen \- create English message catalog
 .SH SYNOPSIS
@@ -67,7 +67,7 @@
 \fB\-\-no\-location\fR
 suppress '#: filename:line' lines
 .TP
-\fB\-n\fR, \fB\-\-add\-location\fR
+\fB\-\-add\-location\fR
 preserve '#: filename:line' lines (default)
 .TP
 \fB\-\-strict\fR
diff -Nru gettext-0.19.3/gettext-tools/man/msgen.1.html gettext-0.18.1.1/gettext-tools/man/msgen.1.html
--- gettext-0.19.3/gettext-tools/man/msgen.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgen.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGEN</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGEN</h1>
-
+<h1 align=center>MSGEN</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,237 +17,595 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgen &minus;
-create English message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgen &minus; create English message catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgen</b>
-[<i>OPTION</i>] <i>INPUTFILE</i></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgen</b> [<i>OPTION</i>] <i>INPUTFILE</i></p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Creates an
-English translation catalog. The input file is the last
-created English PO file, or a PO Template file (generally
-created by xgettext). Untranslated entries are assigned a
-translation that is identical to the msgid.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE</p>
-
-<p style="margin-left:22%;">input PO or POT file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If input file
-is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;lang</b>=<i>CATALOGNAME</i></p>
-
-<p style="margin-left:22%;">set &rsquo;Language&rsquo;
-field in the header entry</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Creates an English translation catalog. The input file is
+the last created English PO file, or a PO Template file
+(generally created by xgettext). Untranslated entries are
+assigned a translation that is identical to the msgid.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO or POT file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If input file is -, standard input is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;lang</b>=<i>CATALOGNAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set &rsquo;Language&rsquo; field in the header entry</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>indented output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>preserve &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">indented output style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">suppress &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">preserve &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">strict Uniforum output
-style</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>strict Uniforum output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgen</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgen</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgen</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgen</b> is maintained as
+a Texinfo manual. If the <b>info</b> and <b>msgen</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgen</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgexec.1 gettext-0.18.1.1/gettext-tools/man/msgexec.1
--- gettext-0.19.3/gettext-tools/man/msgexec.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgexec.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEXEC "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGEXEC "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgexec \- process translations of message catalog
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-tools/man/msgexec.1.html gettext-0.18.1.1/gettext-tools/man/msgexec.1.html
--- gettext-0.19.3/gettext-tools/man/msgexec.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgexec.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGEXEC</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGEXEC</h1>
-
+<h1 align=center>MSGEXEC</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,133 +17,263 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgexec &minus;
-process translations of message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgexec &minus; process translations of message
+catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgexec</b>
-[<i>OPTION</i>] <i>COMMAND</i> [<i>COMMAND-OPTION</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgexec</b> [<i>OPTION</i>] <i>COMMAND</i>
+[<i>COMMAND-OPTION</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Applies a
-command to all translations of a translation catalog. The
-COMMAND can be any program that reads a translation from
-standard input. It is invoked once for each translation. Its
-output becomes msgexec&rsquo;s output. msgexec&rsquo;s
-return code is the maximum return code across all
-invocations.</p>
-
-<p style="margin-left:11%; margin-top: 1em">A special
-builtin command called &rsquo;0&rsquo; outputs the
-translation, followed by a null byte. The output of
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Applies a command to all translations of a translation
+catalog. The COMMAND can be any program that reads a
+translation from standard input. It is invoked once for each
+translation. Its output becomes msgexec&rsquo;s output.
+msgexec&rsquo;s return code is the maximum return code
+across all invocations.</p>
+<!-- INDENTATION -->
+<p>A special builtin command called &rsquo;0&rsquo; outputs
+the translation, followed by a null byte. The output of
 &quot;msgexec 0&quot; is suitable as input for &quot;xargs
 <b>&minus;0</b>&quot;.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location: <br>
-&minus;i</b>,
-<b>&minus;&minus;input</b>=<i>INPUTFILE</i></p>
-
-<p style="margin-left:22%;">input PO file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>,
+<b>&minus;&minus;input</b>=<i>INPUTFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgexec</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgexec</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgexec</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgexec</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgexec</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgexec</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgfilter.1 gettext-0.18.1.1/gettext-tools/man/msgfilter.1
--- gettext-0.19.3/gettext-tools/man/msgfilter.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgfilter.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFILTER "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGFILTER "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgfilter \- edit translations of message catalog
 .SH SYNOPSIS
@@ -78,7 +78,7 @@
 \fB\-\-no\-location\fR
 suppress '#: filename:line' lines
 .TP
-\fB\-n\fR, \fB\-\-add\-location\fR
+\fB\-\-add\-location\fR
 preserve '#: filename:line' lines (default)
 .TP
 \fB\-\-strict\fR
diff -Nru gettext-0.19.3/gettext-tools/man/msgfilter.1.html gettext-0.18.1.1/gettext-tools/man/msgfilter.1.html
--- gettext-0.19.3/gettext-tools/man/msgfilter.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgfilter.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGFILTER</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGFILTER</h1>
-
+<h1 align=center>MSGFILTER</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,262 +17,664 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgfilter
-&minus; edit translations of message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgfilter &minus; edit translations of message
+catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgfilter</b>
-[<i>OPTION</i>] <i>FILTER</i> [<i>FILTER-OPTION</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgfilter</b> [<i>OPTION</i>] <i>FILTER</i>
+[<i>FILTER-OPTION</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Applies a
-filter to all translations of a translation catalog.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location: <br>
-&minus;i</b>,
-<b>&minus;&minus;input</b>=<i>INPUTFILE</i></p>
-
-<p style="margin-left:22%;">input PO file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em">The FILTER can
-be any program that reads a translation from standard input
-and writes a modified translation to standard output.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Useful
-FILTER-OPTIONs when the FILTER is &rsquo;sed&rsquo;: <br>
-&minus;e</b>,
-<b>&minus;&minus;expression</b>=<i>SCRIPT</i></p>
-
-<p style="margin-left:22%;">add SCRIPT to the commands to
-be executed</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;file</b>=<i>SCRIPTFILE</i></p>
-
-<p style="margin-left:22%;">add the contents of SCRIPTFILE
-to the commands to be executed</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;quiet</b>, <b>&minus;&minus;silent</b></p>
-
-<p style="margin-left:22%;">suppress automatic printing of
-pattern space</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Applies a filter to all translations of a translation
+catalog.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>,
+<b>&minus;&minus;input</b>=<i>INPUTFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+<!-- INDENTATION -->
+<p>The FILTER can be any program that reads a translation
+from standard input and writes a modified translation to
+standard output.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Useful FILTER-OPTIONs when the FILTER is
+&rsquo;sed&rsquo;:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;expression</b>=<i>SCRIPT</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add SCRIPT to the commands to be executed</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>,
+<b>&minus;&minus;file</b>=<i>SCRIPTFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add the contents of SCRIPTFILE to the commands to be
+executed</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>, <b>&minus;&minus;quiet</b>,
+<b>&minus;&minus;silent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress automatic printing of pattern space</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>indented output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;keep&minus;header</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>keep header entry unmodified, don&rsquo;t filter it</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>preserve &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">indented output style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;keep&minus;header</b></p>
-
-<p style="margin-left:22%;">keep header entry unmodified,
-don&rsquo;t filter it</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">suppress &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">preserve &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">strict Uniforum output
-style</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>strict Uniforum output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgfilter</b> is maintained as a
-Texinfo manual. If the <b>info</b> and <b>msgfilter</b>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgfilter</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgfilter</b>
 programs are properly installed at your site, the
 command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgfilter</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgfilter</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgfmt.1 gettext-0.18.1.1/gettext-tools/man/msgfmt.1
--- gettext-0.19.3/gettext-tools/man/msgfmt.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgfmt.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFMT "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGFMT "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgfmt \- compile message catalog to binary format
 .SH SYNOPSIS
@@ -40,9 +40,6 @@
 .TP
 \fB\-\-qt\fR
 Qt mode: generate a Qt .qm file
-.TP
-\fB\-\-desktop\fR
-Desktop Entry mode: generate a .desktop file
 .SS "Output file location:"
 .TP
 \fB\-o\fR, \fB\-\-output\-file\fR=\fIFILE\fR
@@ -60,9 +57,6 @@
 \fB\-l\fR, \fB\-\-locale\fR=\fILOCALE\fR
 locale name, either language or language_COUNTRY
 .TP
-\fB\-\-source\fR
-produce a .java file, instead of a .class file
-.TP
 \fB\-d\fR DIRECTORY
 base directory of classes directory hierarchy
 .PP
@@ -92,28 +86,6 @@
 .PP
 The \fB\-l\fR and \fB\-d\fR options are mandatory.  The .msg file is written in the
 specified directory.
-.SS "Desktop Entry mode options:"
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fILOCALE\fR
-locale name, either language or language_COUNTRY
-.TP
-\fB\-o\fR, \fB\-\-output\-file\fR=\fIFILE\fR
-write output to specified file
-.TP
-\fB\-\-template\fR=\fITEMPLATE\fR
-a .desktop file used as a template
-.TP
-\fB\-d\fR DIRECTORY
-base directory of .po files
-.TP
-\fB\-kWORD\fR, \fB\-\-keyword\fR=\fIWORD\fR
-look for WORD as an additional keyword
-.TP
-\fB\-k\fR, \fB\-\-keyword\fR
-do not to use default keywords
-.PP
-The \fB\-l\fR, \fB\-o\fR, and \fB\-\-template\fR options are mandatory.  If \fB\-D\fR is specified, input
-files are read from the directory instead of the command line arguments.
 .SS "Input file syntax:"
 .TP
 \fB\-P\fR, \fB\-\-properties\-input\fR
@@ -152,10 +124,6 @@
 \fB\-a\fR, \fB\-\-alignment\fR=\fINUMBER\fR
 align strings to NUMBER bytes (default: 1)
 .TP
-\fB\-\-endianness\fR=\fIBYTEORDER\fR
-write out 32-bit numbers in the given byte order
-(big or little, default depends on platform)
-.TP
 \fB\-\-no\-hash\fR
 binary file will not include the hash table
 .SS "Informative output:"
diff -Nru gettext-0.19.3/gettext-tools/man/msgfmt.1.html gettext-0.18.1.1/gettext-tools/man/msgfmt.1.html
--- gettext-0.19.3/gettext-tools/man/msgfmt.1.html	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgfmt.1.html	2010-06-06 18:39:07.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGFMT</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGFMT</h1>
-
+<h1 align=center>MSGFMT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,384 +17,822 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgfmt &minus;
-compile message catalog to binary format</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgfmt &minus; compile message catalog to binary
+format</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgfmt</b>
-[<i>OPTION</i>] <i>filename.po</i> ...</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgfmt</b> [<i>OPTION</i>] <i>filename.po</i> ...</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Generate binary
-message catalog from textual translation description.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too. Similarly for optional arguments.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-filename.po ...</p>
-
-<p style="margin-left:22%;">input files</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If input file
-is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-mode: <br>
-&minus;j</b>, <b>&minus;&minus;java</b></p>
-
-<p style="margin-left:22%;">Java mode: generate a Java
-ResourceBundle class</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;java2</b></p>
-
-<p style="margin-left:22%;">like <b>&minus;&minus;java</b>,
-and assume Java2 (JDK 1.2 or higher)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;csharp</b></p>
-
-<p style="margin-left:22%;">C# mode: generate a .NET .dll
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;csharp&minus;resources</b></p>
-
-<p style="margin-left:22%;">C# resources mode: generate a
-.NET .resources file</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Generate binary message catalog from textual translation
+description.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too. Similarly for optional arguments.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>filename.po ...</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If input file is -, standard input is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;j</b>, <b>&minus;&minus;java</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>Java mode: generate a Java ResourceBundle class</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;java2</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>like <b>&minus;&minus;java</b>, and assume Java2 (JDK 1.2
+or higher)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;csharp</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>C# mode: generate a .NET .dll file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;csharp&minus;resources</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>C# resources mode: generate a .NET .resources file</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="7%">
 
+<p><b>&minus;&minus;tcl</b></p>
+</td>
+<td width="11%"></td>
+<td width="61%">
 
-<p><b>&minus;&minus;tcl</b></p></td>
-<td width="4%"></td>
-<td width="63%">
-
-
-<p>Tcl mode: generate a tcl/msgcat .msg file</p></td>
-<td width="15%">
-</td></tr>
+<p>Tcl mode: generate a tcl/msgcat .msg file</p>
+</td>
+<td width="7%">
+</td>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="7%">
 
+<p><b>&minus;&minus;qt</b></p>
+</td>
+<td width="11%"></td>
+<td width="61%">
 
-<p><b>&minus;&minus;qt</b></p></td>
+<p>Qt mode: generate a Qt .qm file</p>
+</td>
+<td width="7%">
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
 <td width="4%"></td>
-<td width="63%">
-
-
-<p>Qt mode: generate a Qt .qm file</p></td>
-<td width="15%">
-</td></tr>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
 </table>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;desktop</b></p>
-
-<p style="margin-left:22%;">Desktop Entry mode: generate a
-.desktop file</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">enable strict Uniforum mode</p>
-
-<p style="margin-left:11%; margin-top: 1em">If output file
-is -, output is written to standard output.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location in Java mode: <br>
-&minus;r</b>,
-<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p>
-
-<p style="margin-left:22%;">resource name</p>
-
-<p style="margin-left:11%;"><b>&minus;l</b>,
-<b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;source</b></p>
-
-<p style="margin-left:22%;">produce a .java file, instead
-of a .class file</p>
-
-<p style="margin-left:11%;"><b>&minus;d</b> DIRECTORY</p>
-
-<p style="margin-left:22%;">base directory of classes
-directory hierarchy</p>
-
-<p style="margin-left:11%; margin-top: 1em">The class name
-is determined by appending the locale name to the resource
-name, separated with an underscore. The <b>&minus;d</b>
-option is mandatory. The class is written under the
-specified directory.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location in C# mode: <br>
-&minus;r</b>,
-<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p>
-
-<p style="margin-left:22%;">resource name</p>
-
-<p style="margin-left:11%;"><b>&minus;l</b>,
-<b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-<p style="margin-left:11%;"><b>&minus;d</b> DIRECTORY</p>
-
-<p style="margin-left:22%;">base directory for locale
-dependent .dll files</p>
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>&minus;l</b> and <b>&minus;d</b> options are mandatory.
-The .dll file is written in a subdirectory of the specified
-directory whose name depends on the locale.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location in Tcl mode: <br>
-&minus;l</b>, <b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-<p style="margin-left:11%;"><b>&minus;d</b> DIRECTORY</p>
-
-<p style="margin-left:22%;">base directory of .msg message
-catalogs</p>
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>&minus;l</b> and <b>&minus;d</b> options are mandatory.
-The .msg file is written in the specified directory.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Desktop
-Entry mode options: <br>
-&minus;l</b>, <b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-<p style="margin-left:11%;"><b>&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;template</b>=<i>TEMPLATE</i></p>
-
-<p style="margin-left:22%;">a .desktop file used as a
-template</p>
-
-<p style="margin-left:11%;"><b>&minus;d</b> DIRECTORY</p>
-
-<p style="margin-left:22%;">base directory of .po files</p>
-
-<p style="margin-left:11%;"><b>&minus;kWORD</b>,
-<b>&minus;&minus;keyword</b>=<i>WORD</i></p>
-
-<p style="margin-left:22%;">look for WORD as an additional
-keyword</p>
-
-<p style="margin-left:11%;"><b>&minus;k</b>,
-<b>&minus;&minus;keyword</b></p>
-
-<p style="margin-left:22%;">do not to use default
-keywords</p>
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>&minus;l</b>, <b>&minus;o</b>, and
-<b>&minus;&minus;template</b> options are mandatory. If
-<b>&minus;D</b> is specified, input files are read from the
-directory instead of the command line arguments.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-interpretation: <br>
-&minus;c</b>, <b>&minus;&minus;check</b></p>
-
-<p style="margin-left:22%;">perform all the checks implied
-by <b>&minus;&minus;check&minus;format</b>,
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>enable strict Uniforum mode</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If output file is -, output is written to standard
+output.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location in Java mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;r</b>,
+<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>resource name</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LOCALE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>locale name, either language or language_COUNTRY</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b> DIRECTORY</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>base directory of classes directory hierarchy</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The class name is determined by appending the locale name
+to the resource name, separated with an underscore. The
+<b>&minus;d</b> option is mandatory. The class is written
+under the specified directory.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location in C# mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;r</b>,
+<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>resource name</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LOCALE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>locale name, either language or language_COUNTRY</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b> DIRECTORY</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>base directory for locale dependent .dll files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>&minus;l</b> and <b>&minus;d</b> options are
+mandatory. The .dll file is written in a subdirectory of the
+specified directory whose name depends on the locale.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location in Tcl mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LOCALE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>locale name, either language or language_COUNTRY</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b> DIRECTORY</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>base directory of .msg message catalogs</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>&minus;l</b> and <b>&minus;d</b> options are
+mandatory. The .msg file is written in the specified
+directory.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file interpretation:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;c</b>, <b>&minus;&minus;check</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>perform all the checks implied by
+<b>&minus;&minus;check&minus;format</b>,
 <b>&minus;&minus;check&minus;header</b>,
 <b>&minus;&minus;check&minus;domain</b></p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;check&minus;format</b></p>
-
-<p style="margin-left:22%;">check language dependent format
-strings</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;check&minus;header</b></p>
-
-<p style="margin-left:22%;">verify presence and contents of
-the header entry</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;check&minus;domain</b></p>
-
-<p style="margin-left:22%;">check for conflicts between
-domain directives and the
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;check&minus;format</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>check language dependent format strings</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;check&minus;header</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>verify presence and contents of the header entry</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;check&minus;domain</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>check for conflicts between domain directives and the
 <b>&minus;&minus;output&minus;file</b> option</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;C</b>,
+<b>&minus;&minus;check&minus;compatibility</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>check that GNU msgfmt behaves like X/Open msgfmt</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
 
-<p style="margin-left:11%;"><b>&minus;C</b>,
-<b>&minus;&minus;check&minus;compatibility</b></p>
-
-<p style="margin-left:22%;">check that GNU msgfmt behaves
-like X/Open msgfmt</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;check&minus;accelerators</b>[=<i>CHAR</i>]</p>
-
-<p style="margin-left:22%;">check presence of keyboard
-accelerators for menu items</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;use&minus;fuzzy</b></p>
-
-<p style="margin-left:22%;">use fuzzy entries in output</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;a</b>,
-<b>&minus;&minus;alignment</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">align strings to NUMBER bytes
-(default: 1)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;endianness</b>=<i>BYTEORDER</i></p>
-
-<p style="margin-left:22%;">write out 32-bit numbers in the
-given byte order (big or little, default depends on
-platform)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;hash</b></p>
-
-<p style="margin-left:22%;">binary file will not include
-the hash table</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;statistics</b></p>
-
-<p style="margin-left:22%;">print statistics about
-translations</p>
-
-<p style="margin-left:11%;"><b>&minus;v</b>,
-<b>&minus;&minus;verbose</b></p>
-
-<p style="margin-left:22%;">increase verbosity level</p>
-
-<h2>AUTHOR
+<p><b>&minus;&minus;check&minus;accelerators</b>[=<i>CHAR</i>]</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>check presence of keyboard accelerators for menu
+items</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>,
+<b>&minus;&minus;use&minus;fuzzy</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use fuzzy entries in output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;a</b>,
+<b>&minus;&minus;alignment</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>align strings to NUMBER bytes (default: 1)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;hash</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>binary file will not include the hash table</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;statistics</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print statistics about translations</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;v</b>, <b>&minus;&minus;verbose</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>increase verbosity level</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Ulrich Drepper.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Ulrich Drepper.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgfmt</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgfmt</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgfmt</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgfmt</b> is maintained as
+a Texinfo manual. If the <b>info</b> and <b>msgfmt</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgfmt</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msggrep.1 gettext-0.18.1.1/gettext-tools/man/msggrep.1
--- gettext-0.19.3/gettext-tools/man/msggrep.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msggrep.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGGREP "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGGREP "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msggrep \- pattern matching on message catalog
 .SH SYNOPSIS
@@ -126,7 +126,7 @@
 \fB\-\-no\-location\fR
 suppress '#: filename:line' lines
 .TP
-\fB\-n\fR, \fB\-\-add\-location\fR
+\fB\-\-add\-location\fR
 preserve '#: filename:line' lines (default)
 .TP
 \fB\-\-strict\fR
diff -Nru gettext-0.19.3/gettext-tools/man/msggrep.1.html gettext-0.18.1.1/gettext-tools/man/msggrep.1.html
--- gettext-0.19.3/gettext-tools/man/msggrep.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msggrep.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGGREP</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGGREP</h1>
-
+<h1 align=center>MSGGREP</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,343 +17,870 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msggrep &minus;
-pattern matching on message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msggrep &minus; pattern matching on message catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msggrep</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msggrep</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Extracts all
-messages of a translation catalog that match a given pattern
-or belong to some given source files.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE</p>
-
-<p style="margin-left:22%;">input PO file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Message
-selection:</b></p>
-
-<p style="margin-left:22%;">[-N SOURCEFILE]... [-M
-DOMAINNAME]... [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T
-MSGSTR-PATTERN] [-C COMMENT-PATTERN] [-X
-EXTRACTED-COMMENT-PATTERN]</p>
-
-<p style="margin-left:11%; margin-top: 1em">A message is
-selected if it comes from one of the specified source files,
-or if it comes from one of the specified domains, or if
-<b>&minus;J</b> is given and its context (msgctxt) matches
-MSGCTXT-PATTERN, or if <b>&minus;K</b> is given and its key
-(msgid or msgid_plural) matches MSGID-PATTERN, or if
-<b>&minus;T</b> is given and its translation (msgstr)
-matches MSGSTR-PATTERN, or if <b>&minus;C</b> is given and
-the translator&rsquo;s comment matches COMMENT-PATTERN, or
-if <b>&minus;X</b> is given and the extracted comment
-matches EXTRACTED-COMMENT-PATTERN.</p>
-
-<p style="margin-left:11%; margin-top: 1em">When more than
-one selection criterion is specified, the set of selected
-messages is the union of the selected messages of each
-criterion.</p>
-
-
-<p style="margin-left:11%; margin-top: 1em">MSGCTXT-PATTERN
-or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or
-EXTRACTED-COMMENT-PATTERN syntax:</p>
-
-<p style="margin-left:22%; margin-top: 1em">[-E |
-<b>&minus;F]</b> [-e PATTERN | <b>&minus;f</b> FILE]...</p>
-
-<p style="margin-left:11%; margin-top: 1em">PATTERNs are
-basic regular expressions by default, or extended regular
-expressions if <b>&minus;E</b> is given, or fixed strings if
-<b>&minus;F</b> is given. <b><br>
-&minus;N</b>,
-<b>&minus;&minus;location</b>=<i>SOURCEFILE</i></p>
-
-<p style="margin-left:22%;">select messages extracted from
-SOURCEFILE</p>
-
-<p style="margin-left:11%;"><b>&minus;M</b>,
-<b>&minus;&minus;domain</b>=<i>DOMAINNAME</i></p>
-
-<p style="margin-left:22%;">select messages belonging to
-domain DOMAINNAME</p>
-
-<p style="margin-left:11%;"><b>&minus;J</b>,
-<b>&minus;&minus;msgctxt</b></p>
-
-<p style="margin-left:22%;">start of patterns for the
-msgctxt</p>
-
-<p style="margin-left:11%;"><b>&minus;K</b>,
-<b>&minus;&minus;msgid</b></p>
-
-<p style="margin-left:22%;">start of patterns for the
-msgid</p>
-
-<p style="margin-left:11%;"><b>&minus;T</b>,
-<b>&minus;&minus;msgstr</b></p>
-
-<p style="margin-left:22%;">start of patterns for the
-msgstr</p>
-
-<p style="margin-left:11%;"><b>&minus;C</b>,
-<b>&minus;&minus;comment</b></p>
-
-<p style="margin-left:22%;">start of patterns for the
-translator&rsquo;s comment</p>
-
-<p style="margin-left:11%;"><b>&minus;X</b>,
-<b>&minus;&minus;extracted&minus;comment</b></p>
-
-<p style="margin-left:22%;">start of patterns for the
-extracted comment</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;extended&minus;regexp</b></p>
-
-<p style="margin-left:22%;">PATTERN is an extended regular
-expression</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;fixed&minus;strings</b></p>
-
-<p style="margin-left:22%;">PATTERN is a set of
-newline-separated strings</p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;regexp</b>=<i>PATTERN</i></p>
-
-<p style="margin-left:22%;">use PATTERN as a regular
-expression</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">obtain PATTERN from FILE</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;ignore&minus;case</b></p>
-
-<p style="margin-left:22%;">ignore case distinctions</p>
-
-<p style="margin-left:11%;"><b>&minus;v</b>,
-<b>&minus;&minus;invert&minus;match</b></p>
-
-<p style="margin-left:22%;">output only the messages that
-do not match any selection criterion</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Extracts all messages of a translation catalog that match
+a given pattern or belong to some given source files.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Message selection:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p>[-N SOURCEFILE]... [-M DOMAINNAME]... [-J
+MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C
+COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>A message is selected if it comes from one of the
+specified source files, or if it comes from one of the
+specified domains, or if <b>&minus;J</b> is given and its
+context (msgctxt) matches MSGCTXT-PATTERN, or if
+<b>&minus;K</b> is given and its key (msgid or msgid_plural)
+matches MSGID-PATTERN, or if <b>&minus;T</b> is given and
+its translation (msgstr) matches MSGSTR-PATTERN, or if
+<b>&minus;C</b> is given and the translator&rsquo;s comment
+matches COMMENT-PATTERN, or if <b>&minus;X</b> is given and
+the extracted comment matches EXTRACTED-COMMENT-PATTERN.</p>
+<!-- INDENTATION -->
+<p>When more than one selection criterion is specified, the
+set of selected messages is the union of the selected
+messages of each criterion.</p>
+<!-- INDENTATION -->
+<p>MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or
+COMMENT-PATTERN or EXTRACTED-COMMENT-PATTERN syntax:</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p>[-E | <b>&minus;F]</b> [-e PATTERN | <b>&minus;f</b>
+FILE]...</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>PATTERNs are basic regular expressions by default, or
+extended regular expressions if <b>&minus;E</b> is given, or
+fixed strings if <b>&minus;F</b> is given.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;N</b>,
+<b>&minus;&minus;location</b>=<i>SOURCEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>select messages extracted from SOURCEFILE</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;M</b>,
+<b>&minus;&minus;domain</b>=<i>DOMAINNAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>select messages belonging to domain DOMAINNAME</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;J</b>, <b>&minus;&minus;msgctxt</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>start of patterns for the msgctxt</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;K</b>, <b>&minus;&minus;msgid</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>start of patterns for the msgid</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;T</b>, <b>&minus;&minus;msgstr</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>start of patterns for the msgstr</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;C</b>, <b>&minus;&minus;comment</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>start of patterns for the translator&rsquo;s comment</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;X</b>,
+<b>&minus;&minus;extracted&minus;comment</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>start of patterns for the extracted comment</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>,
+<b>&minus;&minus;extended&minus;regexp</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>PATTERN is an extended regular expression</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;fixed&minus;strings</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>PATTERN is a set of newline-separated strings</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;regexp</b>=<i>PATTERN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use PATTERN as a regular expression</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>,
+<b>&minus;&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>obtain PATTERN from FILE</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>,
+<b>&minus;&minus;ignore&minus;case</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>ignore case distinctions</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;v</b>,
+<b>&minus;&minus;invert&minus;match</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output only the messages that do not match any selection
+criterion</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>indented output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>preserve &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">indented output style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">suppress &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">preserve &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">strict Uniforum output
-style</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>strict Uniforum output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msggrep</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msggrep</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msggrep</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msggrep</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msggrep</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msggrep</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msginit.1 gettext-0.18.1.1/gettext-tools/man/msginit.1
--- gettext-0.19.3/gettext-tools/man/msginit.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msginit.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGINIT "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGINIT "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msginit \- initialize a message catalog
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-tools/man/msginit.1.html gettext-0.18.1.1/gettext-tools/man/msginit.1.html
--- gettext-0.19.3/gettext-tools/man/msginit.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msginit.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGINIT</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGINIT</h1>
-
+<h1 align=center>MSGINIT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,186 +17,441 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msginit &minus;
-initialize a message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msginit &minus; initialize a message catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msginit</b>
-[<i>OPTION</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msginit</b> [<i>OPTION</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Creates a new
-PO file, initializing the meta information with values from
-the user&rsquo;s environment.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location: <br>
-&minus;i</b>,
-<b>&minus;&minus;input</b>=<i>INPUTFILE</i></p>
-
-<p style="margin-left:22%;">input POT file</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given, the current directory is searched for the POT
-file. If it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified PO
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no output
-file is given, it depends on the <b>&minus;&minus;locale</b>
-option or the user&rsquo;s locale setting. If it is -, the
-results are written to standard output.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;l</b>, <b>&minus;&minus;locale</b>=<i>LL_CC</i></p>
-
-<p style="margin-left:22%;">set target locale</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;translator</b></p>
-
-<p style="margin-left:22%;">assume the PO file is
-automatically generated</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Creates a new PO file, initializing the meta information
+with values from the user&rsquo;s environment.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>,
+<b>&minus;&minus;input</b>=<i>INPUTFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input POT file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given, the current directory is
+searched for the POT file. If it is -, standard input is
+read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no output file is given, it depends on the
+<b>&minus;&minus;locale</b> option or the user&rsquo;s
+locale setting. If it is -, the results are written to
+standard output.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LL_CC</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set target locale</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;translator</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>assume the PO file is automatically generated</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msginit</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msginit</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msginit</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msginit</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msginit</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msginit</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgmerge.1 gettext-0.18.1.1/gettext-tools/man/msgmerge.1
--- gettext-0.19.3/gettext-tools/man/msgmerge.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgmerge.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGMERGE "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGMERGE "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgmerge \- merge message catalog and template
 .SH SYNOPSIS
@@ -70,7 +70,7 @@
 simple, never
 always make simple backups
 .PP
-The backup suffix is '~', unless set with \fB\-\-suffix\fR or the SIMPLE_BACKUP_SUFFIX
+The backup suffix is `~', unless set with \fB\-\-suffix\fR or the SIMPLE_BACKUP_SUFFIX
 environment variable.
 .SS "Operation modifiers:"
 .TP
@@ -120,7 +120,7 @@
 \fB\-\-no\-location\fR
 suppress '#: filename:line' lines
 .TP
-\fB\-n\fR, \fB\-\-add\-location\fR
+\fB\-\-add\-location\fR
 preserve '#: filename:line' lines (default)
 .TP
 \fB\-\-strict\fR
diff -Nru gettext-0.19.3/gettext-tools/man/msgmerge.1.html gettext-0.18.1.1/gettext-tools/man/msgmerge.1.html
--- gettext-0.19.3/gettext-tools/man/msgmerge.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgmerge.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGMERGE</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGMERGE</h1>
-
+<h1 align=center>MSGMERGE</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,343 +17,880 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgmerge
-&minus; merge message catalog and template</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgmerge &minus; merge message catalog and template</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgmerge</b>
-[<i>OPTION</i>] <i>def.po ref.pot</i></p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgmerge</b> [<i>OPTION</i>] <i>def.po ref.pot</i></p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Merges two
-Uniforum style .po files together. The def.po file is an
-existing PO file with translations which will be taken over
-to the newly created file as long as they still match;
-comments will be preserved, but extracted comments and file
-positions will be discarded. The ref.pot file is the last
-created PO file with up-to-date source references but old
-translations, or a PO Template file (generally created by
-xgettext); any translations or comments in the file will be
-discarded, however dot comments and file positions will be
-preserved. Where an exact match cannot be found, fuzzy
-matching is used to produce better results.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b></p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Merges two Uniforum style .po files together. The def.po
+file is an existing PO file with translations which will be
+taken over to the newly created file as long as they still
+match; comments will be preserved, but extracted comments
+and file positions will be discarded. The ref.pot file is
+the last created PO file with up-to-date source references
+but old translations, or a PO Template file (generally
+created by xgettext); any translations or comments in the
+file will be discarded, however dot comments and file
+positions will be preserved. Where an exact match cannot be
+found, fuzzy matching is used to produce better results.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
-
+<td width="8%">
 
-<p>def.po</p></td>
-<td width="2%"></td>
-<td width="56%">
-
-
-<p>translations referring to old sources</p></td>
-<td width="22%">
-</td></tr>
+<p>def.po</p>
+</td>
+<td width="13%"></td>
+<td width="54%">
+
+<p>translations referring to old sources</p>
+</td>
+<td width="11%">
+</td>
 </table>
-
-<p style="margin-left:11%;">ref.pot</p>
-
-<p style="margin-left:22%;">references to new sources</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%;"><b>&minus;C</b>,
-<b>&minus;&minus;compendium</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">additional library of message
-translations, may be specified more than once</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-mode: <br>
-&minus;U</b>, <b>&minus;&minus;update</b></p>
-
-<p style="margin-left:22%;">update def.po, do nothing if
-def.po already up to date</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Output file
-location in update mode: The result is written back to
-def.po. <b><br>
-&minus;&minus;backup</b>=<i>CONTROL</i></p>
-
-<p style="margin-left:22%;">make a backup of def.po</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;suffix</b>=<i>SUFFIX</i></p>
-
-<p style="margin-left:22%;">override the usual backup
-suffix</p>
-
-<p style="margin-left:11%; margin-top: 1em">The version
-control method may be selected via the
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>ref.pot</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>references to new sources</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;C</b>,
+<b>&minus;&minus;compendium</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>additional library of message translations, may be
+specified more than once</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;U</b>, <b>&minus;&minus;update</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>update def.po, do nothing if def.po already up to
+date</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+<!-- INDENTATION -->
+<p>Output file location in update mode: The result is
+written back to def.po.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;backup</b>=<i>CONTROL</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>make a backup of def.po</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;suffix</b>=<i>SUFFIX</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>override the usual backup suffix</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The version control method may be selected via the
 <b>&minus;&minus;backup</b> option or through the
-VERSION_CONTROL environment variable. Here are the values:
-<br>
-none, off</p>
-
-<p style="margin-left:22%;">never make backups (even if
-<b>&minus;&minus;backup</b> is given)</p>
-
-<p style="margin-left:11%;">numbered, t</p>
-
-<p style="margin-left:22%;">make numbered backups</p>
-
-<p style="margin-left:11%;">existing, nil</p>
-
-<p style="margin-left:22%;">numbered if numbered backups
-exist, simple otherwise</p>
-
-<p style="margin-left:11%;">simple, never</p>
-
-<p style="margin-left:22%;">always make simple backups</p>
-
-<p style="margin-left:11%; margin-top: 1em">The backup
-suffix is &rsquo;~&rsquo;, unless set with
+VERSION_CONTROL environment variable. Here are the
+values:</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>none, off</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>never make backups (even if <b>&minus;&minus;backup</b>
+is given)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>numbered, t</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>make numbered backups</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>existing, nil</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>numbered if numbered backups exist, simple otherwise</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>simple, never</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>always make simple backups</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The backup suffix is &lsquo;~&rsquo;, unless set with
 <b>&minus;&minus;suffix</b> or the SIMPLE_BACKUP_SUFFIX
 environment variable.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-modifiers: <br>
-&minus;m</b>, <b>&minus;&minus;multi&minus;domain</b></p>
-
-<p style="margin-left:22%;">apply ref.pot to each of the
-domains in def.po</p>
-
-<p style="margin-left:11%;"><b>&minus;N</b>,
-<b>&minus;&minus;no&minus;fuzzy&minus;matching</b></p>
-
-<p style="margin-left:22%;">do not use fuzzy matching</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;previous</b></p>
-
-<p style="margin-left:22%;">keep previous msgids of
-translated messages</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input files are in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;lang</b>=<i>CATALOGNAME</i></p>
-
-<p style="margin-left:22%;">set &rsquo;Language&rsquo;
-field in the header entry</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation modifiers:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;m</b>,
+<b>&minus;&minus;multi&minus;domain</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>apply ref.pot to each of the domains in def.po</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;N</b>,
+<b>&minus;&minus;no&minus;fuzzy&minus;matching</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use fuzzy matching</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;previous</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>keep previous msgids of translated messages</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files are in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;lang</b>=<i>CATALOGNAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set &rsquo;Language&rsquo; field in the header entry</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>indented output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>preserve &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">indented output style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">suppress &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">preserve &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">strict Uniforum output
-style</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<p style="margin-left:11%;"><b>&minus;v</b>,
-<b>&minus;&minus;verbose</b></p>
-
-<p style="margin-left:22%;">increase verbosity level</p>
-
-<p style="margin-left:11%;"><b>&minus;q</b>,
-<b>&minus;&minus;quiet</b>, <b>&minus;&minus;silent</b></p>
-
-<p style="margin-left:22%;">suppress progress
-indicators</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>strict Uniforum output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;v</b>, <b>&minus;&minus;verbose</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>increase verbosity level</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;q</b>, <b>&minus;&minus;quiet</b>,
+<b>&minus;&minus;silent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>suppress progress indicators</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Peter Miller.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Peter Miller.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgmerge</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgmerge</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgmerge</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgmerge</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgmerge</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgmerge</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msgunfmt.1 gettext-0.18.1.1/gettext-tools/man/msgunfmt.1
--- gettext-0.19.3/gettext-tools/man/msgunfmt.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgunfmt.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGUNFMT "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msgunfmt \- uncompile message catalog from binary format
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-tools/man/msgunfmt.1.html gettext-0.18.1.1/gettext-tools/man/msgunfmt.1.html
--- gettext-0.19.3/gettext-tools/man/msgunfmt.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msgunfmt.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGUNFMT</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGUNFMT</h1>
-
+<h1 align=center>MSGUNFMT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,289 +17,738 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msgunfmt
-&minus; uncompile message catalog from binary format</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msgunfmt &minus; uncompile message catalog from binary
+format</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msgunfmt</b>
-[<i>OPTION</i>] [<i>FILE</i>]...</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msgunfmt</b> [<i>OPTION</i>] [<i>FILE</i>]...</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Convert binary
-message catalog to Uniforum style .po file.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-mode: <br>
-&minus;j</b>, <b>&minus;&minus;java</b></p>
-
-<p style="margin-left:22%;">Java mode: input is a Java
-ResourceBundle class</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;csharp</b></p>
-
-<p style="margin-left:22%;">C# mode: input is a .NET .dll
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;csharp&minus;resources</b></p>
-
-<p style="margin-left:22%;">C# resources mode: input is a
-.NET .resources file</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Convert binary message catalog to Uniforum style .po
+file.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;j</b>, <b>&minus;&minus;java</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>Java mode: input is a Java ResourceBundle class</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;csharp</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>C# mode: input is a .NET .dll file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;csharp&minus;resources</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>C# resources mode: input is a .NET .resources file</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="5" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="7%">
 
+<p><b>&minus;&minus;tcl</b></p>
+</td>
+<td width="13%"></td>
+<td width="60%">
 
-<p><b>&minus;&minus;tcl</b></p></td>
+<p>Tcl mode: input is a tcl/msgcat .msg file</p>
+</td>
+<td width="7%">
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
 <td width="4%"></td>
-<td width="63%">
-
-
-<p>Tcl mode: input is a tcl/msgcat .msg file</p></td>
-<td width="15%">
-</td></tr>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
 </table>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-FILE ...</p>
-
-<p style="margin-left:22%;">input .mo files</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location in Java mode: <br>
-&minus;r</b>,
-<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p>
-
-<p style="margin-left:22%;">resource name</p>
-
-<p style="margin-left:11%;"><b>&minus;l</b>,
-<b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-<p style="margin-left:11%; margin-top: 1em">The class name
-is determined by appending the locale name to the resource
-name, separated with an underscore. The class is located
-using the CLASSPATH.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location in C# mode: <br>
-&minus;r</b>,
-<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p>
-
-<p style="margin-left:22%;">resource name</p>
-
-<p style="margin-left:11%;"><b>&minus;l</b>,
-<b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-<p style="margin-left:11%;"><b>&minus;d</b> DIRECTORY</p>
-
-<p style="margin-left:22%;">base directory for locale
-dependent .dll files</p>
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>&minus;l</b> and <b>&minus;d</b> options are mandatory.
-The .dll file is located in a subdirectory of the specified
-directory whose name depends on the locale.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location in Tcl mode: <br>
-&minus;l</b>, <b>&minus;&minus;locale</b>=<i>LOCALE</i></p>
-
-<p style="margin-left:22%;">locale name, either language or
-language_COUNTRY</p>
-
-<p style="margin-left:11%;"><b>&minus;d</b> DIRECTORY</p>
-
-<p style="margin-left:22%;">base directory of .msg message
-catalogs</p>
-
-<p style="margin-left:11%; margin-top: 1em">The
-<b>&minus;l</b> and <b>&minus;d</b> options are mandatory.
-The .msg file is located in the specified directory.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>FILE ...</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input .mo files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location in Java mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;r</b>,
+<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>resource name</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LOCALE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>locale name, either language or language_COUNTRY</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The class name is determined by appending the locale name
+to the resource name, separated with an underscore. The
+class is located using the CLASSPATH.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location in C# mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;r</b>,
+<b>&minus;&minus;resource</b>=<i>RESOURCE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>resource name</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LOCALE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>locale name, either language or language_COUNTRY</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b> DIRECTORY</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>base directory for locale dependent .dll files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>&minus;l</b> and <b>&minus;d</b> options are
+mandatory. The .dll file is located in a subdirectory of the
+specified directory whose name depends on the locale.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location in Tcl mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;l</b>,
+<b>&minus;&minus;locale</b>=<i>LOCALE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>locale name, either language or language_COUNTRY</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b> DIRECTORY</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>base directory of .msg message catalogs</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The <b>&minus;l</b> and <b>&minus;d</b> options are
+mandatory. The .msg file is located in the specified
+directory.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
-(default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">write indented output style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">write strict uniforum style</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<p style="margin-left:11%;"><b>&minus;v</b>,
-<b>&minus;&minus;verbose</b></p>
-
-<p style="margin-left:22%;">increase verbosity level</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write indented output style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write strict uniforum style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;v</b>, <b>&minus;&minus;verbose</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>increase verbosity level</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Ulrich Drepper.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Ulrich Drepper.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msgunfmt</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msgunfmt</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msgunfmt</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msgunfmt</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msgunfmt</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msgunfmt</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/msguniq.1 gettext-0.18.1.1/gettext-tools/man/msguniq.1
--- gettext-0.19.3/gettext-tools/man/msguniq.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msguniq.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH MSGUNIQ "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 msguniq \- unify duplicate translations in message catalog
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-tools/man/msguniq.1.html gettext-0.18.1.1/gettext-tools/man/msguniq.1.html
--- gettext-0.19.3/gettext-tools/man/msguniq.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/msguniq.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>MSGUNIQ</title>
-
 </head>
 <body>
 
-<h1 align="center">MSGUNIQ</h1>
-
+<h1 align=center>MSGUNIQ</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,32 +17,39 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">msguniq &minus;
-unify duplicate translations in message catalog</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>msguniq &minus; unify duplicate translations in message
+catalog</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>msguniq</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>msguniq</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Unifies
-duplicate translations in a translation catalog. Finds
-duplicate translations of the same message ID. Such
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Unifies duplicate translations in a translation catalog.
+Finds duplicate translations of the same message ID. Such
 duplicates are invalid input for other programs like msgfmt,
 msgmerge or msgcat. By default, duplicates are merged
 together. When using the <b>&minus;&minus;repeated</b>
@@ -64,228 +60,624 @@
 be taken from the first translation. File positions will be
 cumulated. When using the <b>&minus;&minus;unique</b>
 option, duplicates are discarded.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE</p>
-
-<p style="margin-left:22%;">input PO file</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If no input
-file is given or if it is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;o</b>,
-<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%; margin-top: 1em">The results are
-written to standard output if no output file is specified or
-if it is -.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Message
-selection: <br>
-&minus;d</b>, <b>&minus;&minus;repeated</b></p>
-
-<p style="margin-left:22%;">print only duplicates</p>
-
-<p style="margin-left:11%;"><b>&minus;u</b>,
-<b>&minus;&minus;unique</b></p>
-
-<p style="margin-left:22%;">print only unique messages,
-discard duplicates</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-syntax: <br>
-&minus;P</b>,
-<b>&minus;&minus;properties&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in Java
-.properties syntax</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;input</b></p>
-
-<p style="margin-left:22%;">input file is in
-NeXTstep/GNUstep .strings syntax</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;t</b>,
-<b>&minus;&minus;to&minus;code</b>=<i>NAME</i></p>
-
-<p style="margin-left:22%;">encoding for output</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;use&minus;first</b></p>
-
-<p style="margin-left:22%;">use first available translation
-for each message, don&rsquo;t merge several translations</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input PO file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If no input file is given or if it is -, standard input
+is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output&minus;file</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The results are written to standard output if no output
+file is specified or if it is -.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Message selection:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b>, <b>&minus;&minus;repeated</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print only duplicates</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;u</b>, <b>&minus;&minus;unique</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>print only unique messages, discard duplicates</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file syntax:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;P</b>,
+<b>&minus;&minus;properties&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in Java .properties syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;input</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input file is in NeXTstep/GNUstep .strings syntax</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output details:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;t</b>,
+<b>&minus;&minus;to&minus;code</b>=<i>NAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>encoding for output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;use&minus;first</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use first available translation for each message,
+don&rsquo;t merge several translations</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write the .po file using indented style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not write &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate &rsquo;#: filename:line&rsquo; lines
 (default)</p>
-
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">write the .po file using
-indented style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">do not write &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">generate &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">write out strict Uniforum
-conforming .po file</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out strict Uniforum conforming .po file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2001-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>msguniq</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>msguniq</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-msguniq</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>msguniq</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>msguniq</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info msguniq</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/recode-sr-latin.1 gettext-0.18.1.1/gettext-tools/man/recode-sr-latin.1
--- gettext-0.19.3/gettext-tools/man/recode-sr-latin.1	2014-10-16 06:03:17.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/recode-sr-latin.1	2010-06-06 18:39:07.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH RECODE-SR-LATIN "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH RECODE-SR-LATIN "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 recode-sr-latin \- convert Serbian text from Cyrillic to Latin script
 .SH SYNOPSIS
diff -Nru gettext-0.19.3/gettext-tools/man/recode-sr-latin.1.html gettext-0.18.1.1/gettext-tools/man/recode-sr-latin.1.html
--- gettext-0.19.3/gettext-tools/man/recode-sr-latin.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/recode-sr-latin.1.html	2010-06-06 18:39:09.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>RECODE-SR-LATIN</title>
-
 </head>
 <body>
 
-<h1 align="center">RECODE-SR-LATIN</h1>
-
+<h1 align=center>RECODE-SR-LATIN</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,94 +17,154 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em">recode-sr-latin
-&minus; convert Serbian text from Cyrillic to Latin
-script</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>recode-sr-latin &minus; convert Serbian text from
+Cyrillic to Latin script</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>recode-sr-latin</b>
-[<i>OPTION</i>]</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>recode-sr-latin</b> [<i>OPTION</i>]</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Recode Serbian
-text from Cyrillic to Latin script. The input text is read
-from standard input. The converted text is output to
-standard output.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
-
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
-
-<p style="margin-left:22%;">output version information and
-exit</p>
-
-<h2>AUTHOR
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Recode Serbian text from Cyrillic to Latin script. The
+input text is read from standard input. The converted text
+is output to standard output.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Danilo Segan and Bruno Haible.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Danilo Segan and Bruno Haible.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2006-2007 Free Software Foundation, Inc. License
-GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 2006-2007 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>recode-sr-latin</b> is maintained as a
-Texinfo manual. If the <b>info</b> and
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>recode-sr-latin</b> is
+maintained as a Texinfo manual. If the <b>info</b> and
 <b>recode-sr-latin</b> programs are properly installed at
 your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-recode-sr-latin</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info recode-sr-latin</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/man/xgettext.1 gettext-0.18.1.1/gettext-tools/man/xgettext.1
--- gettext-0.19.3/gettext-tools/man/xgettext.1	2014-10-16 06:03:16.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/xgettext.1	2010-06-06 18:39:06.000000000 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH XGETTEXT "1" "October 2014" "GNU gettext-tools 0.19.3" GNU
+.TH XGETTEXT "1" "June 2010" "GNU gettext-tools 0.18.1" GNU
 .SH NAME
 xgettext \- extract gettext strings from source
 .SH SYNOPSIS
@@ -43,8 +43,7 @@
 (C, C++, ObjectiveC, PO, Shell, Python, Lisp,
 EmacsLisp, librep, Scheme, Smalltalk, Java,
 JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,
-GCC-source, NXStringTable, RST, Glade, Lua,
-JavaScript, Vala, Desktop)
+GCC-source, NXStringTable, RST, Glade)
 .TP
 \fB\-C\fR, \fB\-\-c\fR++
 shorthand for \fB\-\-language\fR=\fIC\fR++
@@ -78,8 +77,7 @@
 extract all strings
 (only languages C, C++, ObjectiveC, Shell,
 Python, Lisp, EmacsLisp, librep, Scheme, Java,
-C#, awk, Tcl, Perl, PHP, GCC-source, Glade,
-Lua, JavaScript, Vala)
+C#, awk, Tcl, Perl, PHP, GCC-source, Glade)
 .TP
 \fB\-kWORD\fR, \fB\-\-keyword\fR=\fIWORD\fR
 look for WORD as an additional keyword
@@ -88,8 +86,7 @@
 do not to use default keywords
 (only languages C, C++, ObjectiveC, Shell,
 Python, Lisp, EmacsLisp, librep, Scheme, Java,
-C#, awk, Tcl, Perl, PHP, GCC-source, Glade,
-Lua, JavaScript, Vala, Desktop)
+C#, awk, Tcl, Perl, PHP, GCC-source, Glade)
 .TP
 \fB\-\-flag\fR=\fIWORD\fR:ARG:FLAG
 additional flag for strings inside the argument
@@ -97,8 +94,7 @@
 .IP
 (only languages C, C++, ObjectiveC, Shell,
 Python, Lisp, EmacsLisp, librep, Scheme, Java,
-C#, awk, YCP, Tcl, Perl, PHP, GCC-source,
-Lua, JavaScript, Vala)
+C#, awk, YCP, Tcl, Perl, PHP, GCC-source)
 .TP
 \fB\-T\fR, \fB\-\-trigraphs\fR
 understand ANSI C trigraphs for input
@@ -171,7 +167,7 @@
 sort output by file location
 .TP
 \fB\-\-omit\-header\fR
-don't write header with 'msgid ""' entry
+don't write header with `msgid ""' entry
 .TP
 \fB\-\-copyright\-holder\fR=\fISTRING\fR
 set copyright holder in output
@@ -207,7 +203,7 @@
 .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-2010 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 -Nru gettext-0.19.3/gettext-tools/man/xgettext.1.html gettext-0.18.1.1/gettext-tools/man/xgettext.1.html
--- gettext-0.19.3/gettext-tools/man/xgettext.1.html	2014-10-16 06:03:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/man/xgettext.1.html	2010-06-06 18:39:08.000000000 +0000
@@ -1,24 +1,13 @@
-<!-- Creator     : groff version 1.22.2 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!-- Creator     : groff version 1.18.1 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <meta name="Content-Style" content="text/css">
-<style type="text/css">
-       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
-       h1      { text-align: center }
-</style>
 <title>XGETTEXT</title>
-
 </head>
 <body>
 
-<h1 align="center">XGETTEXT</h1>
-
+<h1 align=center>XGETTEXT</h1>
 <a href="#NAME">NAME</a><br>
 <a href="#SYNOPSIS">SYNOPSIS</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
@@ -28,416 +17,1079 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-
-
-<h2>NAME
 <a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">xgettext
-&minus; extract gettext strings from source</p>
-
-<h2>SYNOPSIS
+<h2>NAME</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>xgettext &minus; extract gettext strings from source</p>
+</td>
+</table>
 <a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>xgettext</b>
-[<i>OPTION</i>] [<i>INPUTFILE</i>]...</p>
-
-<h2>DESCRIPTION
+<h2>SYNOPSIS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>xgettext</b> [<i>OPTION</i>] [<i>INPUTFILE</i>]...</p>
+</td>
+</table>
 <a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Extract
-translatable strings from given input files.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Mandatory
-arguments to long options are mandatory for short options
-too. Similarly for optional arguments.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-location:</b> <br>
-INPUTFILE ...</p>
-
-<p style="margin-left:22%;">input files</p>
-
-<p style="margin-left:11%;"><b>&minus;f</b>,
-<b>&minus;&minus;files&minus;from</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">get list of input files from
-FILE</p>
-
-<p style="margin-left:11%;"><b>&minus;D</b>,
-<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p>
-
-<p style="margin-left:22%;">add DIRECTORY to list for input
-files search</p>
-
-<p style="margin-left:11%; margin-top: 1em">If input file
-is -, standard input is read.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output file
-location: <br>
-&minus;d</b>,
-<b>&minus;&minus;default&minus;domain</b>=<i>NAME</i></p>
-
-<p style="margin-left:22%;">use NAME.po for output (instead
-of messages.po)</p>
-
-<p style="margin-left:11%;"><b>&minus;o</b>,
-<b>&minus;&minus;output</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">write output to specified
-file</p>
-
-<p style="margin-left:11%;"><b>&minus;p</b>,
-<b>&minus;&minus;output&minus;dir</b>=<i>DIR</i></p>
-
-<p style="margin-left:22%;">output files will be placed in
-directory DIR</p>
-
-<p style="margin-left:11%; margin-top: 1em">If output file
-is -, output is written to standard output.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Choice of
-input file language: <br>
-&minus;L</b>, <b>&minus;&minus;language</b>=<i>NAME</i></p>
-
-<p style="margin-left:22%;">recognise the specified
-language (C, C++, ObjectiveC, PO, Shell, Python, Lisp,
-EmacsLisp, librep, Scheme, Smalltalk, Java, JavaProperties,
-C#, awk, YCP, Tcl, Perl, PHP, GCC-source, NXStringTable,
-RST, Glade, Lua, JavaScript, Vala, Desktop)</p>
-
-<p style="margin-left:11%;"><b>&minus;C</b>,
-<b>&minus;&minus;c</b>++</p>
-
-<p style="margin-left:22%;">shorthand for
+<h2>DESCRIPTION</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Extract translatable strings from given input files.</p>
+<!-- INDENTATION -->
+<p>Mandatory arguments to long options are mandatory for
+short options too. Similarly for optional arguments.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>INPUTFILE ...</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>input files</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;f</b>,
+<b>&minus;&minus;files&minus;from</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>get list of input files from FILE</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;D</b>,
+<b>&minus;&minus;directory</b>=<i>DIRECTORY</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>add DIRECTORY to list for input files search</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If input file is -, standard input is read.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Output file location:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;d</b>,
+<b>&minus;&minus;default&minus;domain</b>=<i>NAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use NAME.po for output (instead of messages.po)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;o</b>,
+<b>&minus;&minus;output</b>=<i>FILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write output to specified file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;p</b>,
+<b>&minus;&minus;output&minus;dir</b>=<i>DIR</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output files will be placed in directory DIR</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>If output file is -, output is written to standard
+output.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Choice of input file language:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;L</b>,
+<b>&minus;&minus;language</b>=<i>NAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>recognise the specified language (C, C++, ObjectiveC, PO,
+Shell, Python, Lisp, EmacsLisp, librep, Scheme, Smalltalk,
+Java, JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,
+GCC-source, NXStringTable, RST, Glade)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;C</b>, <b>&minus;&minus;c</b>++</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>shorthand for
 <b>&minus;&minus;language</b>=<i>C</i>++</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>By default the language is guessed depending on the input
+file name extension.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Input file interpretation:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
 
-<p style="margin-left:11%; margin-top: 1em">By default the
-language is guessed depending on the input file name
-extension.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Input file
-interpretation: <br>
-&minus;&minus;from&minus;code</b>=<i>NAME</i></p>
-
-<p style="margin-left:22%;">encoding of input files (except
-for Python, Tcl, Glade)</p>
-
-<p style="margin-left:11%; margin-top: 1em">By default the
-input files are assumed to be in ASCII.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Operation
-mode: <br>
-&minus;j</b>, <b>&minus;&minus;join&minus;existing</b></p>
-
-<p style="margin-left:22%;">join messages with existing
-file</p>
-
-<p style="margin-left:11%;"><b>&minus;x</b>,
-<b>&minus;&minus;exclude&minus;file</b>=<i>FILE</i>.po</p>
-
-<p style="margin-left:22%;">entries from FILE.po are not
-extracted</p>
-
-<p style="margin-left:11%;"><b>&minus;cTAG</b>,
-<b>&minus;&minus;add&minus;comments</b>=<i>TAG</i></p>
-
-<p style="margin-left:22%;">place comment blocks starting
-with TAG and preceding keyword lines in output file</p>
-
-<p style="margin-left:11%;"><b>&minus;c</b>,
-<b>&minus;&minus;add&minus;comments</b></p>
-
-<p style="margin-left:22%;">place all comment blocks
-preceding keyword lines in output file</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Language
-specific options: <br>
-&minus;a</b>, <b>&minus;&minus;extract&minus;all</b></p>
-
-<p style="margin-left:22%;">extract all strings (only
-languages C, C++, ObjectiveC, Shell, Python, Lisp,
-EmacsLisp, librep, Scheme, Java, C#, awk, Tcl, Perl, PHP,
-GCC-source, Glade, Lua, JavaScript, Vala)</p>
-
-<p style="margin-left:11%;"><b>&minus;kWORD</b>,
-<b>&minus;&minus;keyword</b>=<i>WORD</i></p>
-
-<p style="margin-left:22%;">look for WORD as an additional
-keyword</p>
-
-<p style="margin-left:11%;"><b>&minus;k</b>,
-<b>&minus;&minus;keyword</b></p>
-
-<p style="margin-left:22%;">do not to use default keywords
-(only languages C, C++, ObjectiveC, Shell, Python, Lisp,
-EmacsLisp, librep, Scheme, Java, C#, awk, Tcl, Perl, PHP,
-GCC-source, Glade, Lua, JavaScript, Vala, Desktop)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;flag</b>=<i>WORD</i>:ARG:FLAG</p>
-
-<p style="margin-left:22%;">additional flag for strings
-inside the argument number ARG of keyword WORD</p>
-
-<p style="margin-left:22%; margin-top: 1em">(only languages
-C, C++, ObjectiveC, Shell, Python, Lisp, EmacsLisp, librep,
-Scheme, Java, C#, awk, YCP, Tcl, Perl, PHP, GCC-source, Lua,
-JavaScript, Vala)</p>
-
-<p style="margin-left:11%;"><b>&minus;T</b>,
-<b>&minus;&minus;trigraphs</b></p>
-
-<p style="margin-left:22%;">understand ANSI C trigraphs for
-input (only languages C, C++, ObjectiveC)</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
+<p><b>&minus;&minus;from&minus;code</b>=<i>NAME</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>encoding of input files (except for Python, Tcl,
+Glade)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>By default the input files are assumed to be in
+ASCII.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Operation mode:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;j</b>,
+<b>&minus;&minus;join&minus;existing</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>join messages with existing file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;x</b>,
+<b>&minus;&minus;exclude&minus;file</b>=<i>FILE</i>.po</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>entries from FILE.po are not extracted</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;cTAG</b>,
+<b>&minus;&minus;add&minus;comments</b>=<i>TAG</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>place comment blocks starting with TAG and preceding
+keyword lines in output file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;c</b>,
+<b>&minus;&minus;add&minus;comments</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>place all comment blocks preceding keyword lines in
+output file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Language specific options:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;a</b>,
+<b>&minus;&minus;extract&minus;all</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>extract all strings (only languages C, C++, ObjectiveC,
+Shell, Python, Lisp, EmacsLisp, librep, Scheme, Java, C#,
+awk, Tcl, Perl, PHP, GCC-source, Glade)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;kWORD</b>,
+<b>&minus;&minus;keyword</b>=<i>WORD</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>look for WORD as an additional keyword</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;k</b>, <b>&minus;&minus;keyword</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not to use default keywords (only languages C, C++,
+ObjectiveC, Shell, Python, Lisp, EmacsLisp, librep, Scheme,
+Java, C#, awk, Tcl, Perl, PHP, GCC-source, Glade)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;flag</b>=<i>WORD</i>:ARG:FLAG</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>additional flag for strings inside the argument number
+ARG of keyword WORD</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p>(only languages C, C++, ObjectiveC, Shell, Python, Lisp,
+EmacsLisp, librep, Scheme, Java, C#, awk, YCP, Tcl, Perl,
+PHP, GCC-source)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;T</b>, <b>&minus;&minus;trigraphs</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>understand ANSI C trigraphs for input (only languages C,
+C++, ObjectiveC)</p>
+</td>
+</table>
+<!-- TABS -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="7%">
 
+<p><b>&minus;&minus;qt</b></p>
+</td>
+<td width="11%"></td>
+<td width="69%">
 
-<p><b>&minus;&minus;qt</b></p></td>
-<td width="4%"></td>
-<td width="76%">
-
-
-<p>recognize Qt format strings (only language C++)</p></td>
-<td width="2%">
-</td></tr>
+<p>recognize Qt format strings (only language C++)</p>
+</td>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="7%">
 
+<p><b>&minus;&minus;kde</b></p>
+</td>
+<td width="11%"></td>
+<td width="69%">
 
-<p><b>&minus;&minus;kde</b></p></td>
+<p>recognize KDE 4 format strings (only language C++)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;boost</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>recognize Boost format strings (only language C++)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;debug</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>more detailed formatstring recognition result</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
 <td width="4%"></td>
-<td width="76%">
-
-
-<p>recognize KDE 4 format strings (only language C++)</p></td>
-<td width="2%">
-</td></tr>
+<td width="95%">
+<p><b>Output details:</b></p></td>
 </table>
-
-<p style="margin-left:11%;"><b>&minus;&minus;boost</b></p>
-
-<p style="margin-left:22%;">recognize Boost format strings
-(only language C++)</p>
-
-<p style="margin-left:11%;"><b>&minus;&minus;debug</b></p>
-
-<p style="margin-left:22%;">more detailed formatstring
-recognition result</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Output
-details: <br>
-&minus;&minus;color</b></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes always</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;color</b>=<i>WHEN</i></p>
-
-<p style="margin-left:22%;">use colors and other text
-attributes if WHEN. WHEN may be &rsquo;always&rsquo;,
-&rsquo;never&rsquo;, &rsquo;auto&rsquo;, or
-&rsquo;html&rsquo;.</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p>
-
-<p style="margin-left:22%;">specify CSS style rule file for
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes always</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;color</b>=<i>WHEN</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use colors and other text attributes if WHEN. WHEN may be
+&rsquo;always&rsquo;, &rsquo;never&rsquo;,
+&rsquo;auto&rsquo;, or &rsquo;html&rsquo;.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;style</b>=<i>STYLEFILE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>specify CSS style rule file for
 <b>&minus;&minus;color</b></p>
-
-<p style="margin-left:11%;"><b>&minus;e</b>,
-<b>&minus;&minus;no&minus;escape</b></p>
-
-<p style="margin-left:22%;">do not use C escapes in output
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;e</b>,
+<b>&minus;&minus;no&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not use C escapes in output (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;E</b>, <b>&minus;&minus;escape</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use C escapes in output, no extended chars</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;force&minus;po</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write PO file even if empty</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;i</b>, <b>&minus;&minus;indent</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write the .po file using indented style</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not write &rsquo;#: filename:line&rsquo; lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;n</b>,
+<b>&minus;&minus;add&minus;location</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate &rsquo;#: filename:line&rsquo; lines
 (default)</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;strict</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out strict Uniforum conforming .po file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;properties&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a Java .properties file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;stringtable&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>write out a NeXTstep/GNUstep .strings file</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;w</b>,
+<b>&minus;&minus;width</b>=<i>NUMBER</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set output page width</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;no&minus;wrap</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>do not break long message lines, longer than the output
+page width, into several lines</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;s</b>,
+<b>&minus;&minus;sort&minus;output</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>generate sorted output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;F</b>,
+<b>&minus;&minus;sort&minus;by&minus;file</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>sort output by file location</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;omit&minus;header</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>don&rsquo;t write header with &lsquo;msgid
+&quot;&quot;&rsquo; entry</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
 
-<p style="margin-left:11%;"><b>&minus;E</b>,
-<b>&minus;&minus;escape</b></p>
-
-<p style="margin-left:22%;">use C escapes in output, no
-extended chars</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;force&minus;po</b></p>
-
-<p style="margin-left:22%;">write PO file even if empty</p>
-
-<p style="margin-left:11%;"><b>&minus;i</b>,
-<b>&minus;&minus;indent</b></p>
-
-<p style="margin-left:22%;">write the .po file using
-indented style</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;location</b></p>
-
-<p style="margin-left:22%;">do not write &rsquo;#:
-filename:line&rsquo; lines</p>
-
-<p style="margin-left:11%;"><b>&minus;n</b>,
-<b>&minus;&minus;add&minus;location</b></p>
-
-<p style="margin-left:22%;">generate &rsquo;#:
-filename:line&rsquo; lines (default)</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;strict</b></p>
-
-<p style="margin-left:22%;">write out strict Uniforum
-conforming .po file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;properties&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a Java .properties
-file</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;stringtable&minus;output</b></p>
-
-<p style="margin-left:22%;">write out a NeXTstep/GNUstep
-.strings file</p>
-
-<p style="margin-left:11%;"><b>&minus;w</b>,
-<b>&minus;&minus;width</b>=<i>NUMBER</i></p>
-
-<p style="margin-left:22%;">set output page width</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;no&minus;wrap</b></p>
-
-<p style="margin-left:22%;">do not break long message
-lines, longer than the output page width, into several
-lines</p>
-
-<p style="margin-left:11%;"><b>&minus;s</b>,
-<b>&minus;&minus;sort&minus;output</b></p>
-
-<p style="margin-left:22%;">generate sorted output</p>
-
-<p style="margin-left:11%;"><b>&minus;F</b>,
-<b>&minus;&minus;sort&minus;by&minus;file</b></p>
-
-<p style="margin-left:22%;">sort output by file
-location</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;omit&minus;header</b></p>
-
-<p style="margin-left:22%;">don&rsquo;t write header with
-&rsquo;msgid &quot;&quot;&rsquo; entry</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;copyright&minus;holder</b>=<i>STRING</i></p>
-
-<p style="margin-left:22%;">set copyright holder in
-output</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;foreign&minus;user</b></p>
-
-<p style="margin-left:22%;">omit FSF copyright in output
-for foreign user</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;package&minus;name</b>=<i>PACKAGE</i></p>
-
-<p style="margin-left:22%;">set package name in output</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;package&minus;version</b>=<i>VERSION</i></p>
-
-<p style="margin-left:22%;">set package version in
-output</p>
-
-
-<p style="margin-left:11%;"><b>&minus;&minus;msgid&minus;bugs&minus;address</b>=<i>EMAIL</i>@ADDRESS</p>
-
-<p style="margin-left:22%;">set report address for msgid
-bugs</p>
-
-<p style="margin-left:11%;"><b>&minus;m[STRING]</b>,
-<b>&minus;&minus;msgstr&minus;prefix</b>[=<i>STRING</i>]</p>
-
-<p style="margin-left:22%;">use STRING or &quot;&quot; as
-prefix for msgstr values</p>
-
-<p style="margin-left:11%;"><b>&minus;M[STRING]</b>,
-<b>&minus;&minus;msgstr&minus;suffix</b>[=<i>STRING</i>]</p>
-
-<p style="margin-left:22%;">use STRING or &quot;&quot; as
-suffix for msgstr values</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>Informative
-output: <br>
-&minus;h</b>, <b>&minus;&minus;help</b></p>
-
-<p style="margin-left:22%;">display this help and exit</p>
+<p><b>&minus;&minus;copyright&minus;holder</b>=<i>STRING</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set copyright holder in output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;&minus;foreign&minus;user</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>omit FSF copyright in output for foreign user</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
 
-<p style="margin-left:11%;"><b>&minus;V</b>,
-<b>&minus;&minus;version</b></p>
+<p><b>&minus;&minus;package&minus;name</b>=<i>PACKAGE</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set package name in output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
 
-<p style="margin-left:22%;">output version information and
-exit</p>
+<p><b>&minus;&minus;package&minus;version</b>=<i>VERSION</i></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set package version in output</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
 
-<h2>AUTHOR
+<p><b>&minus;&minus;msgid&minus;bugs&minus;address</b>=<i>EMAIL</i>@ADDRESS</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>set report address for msgid bugs</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;m[STRING]</b>,
+<b>&minus;&minus;msgstr&minus;prefix</b>[=<i>STRING</i>]</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use STRING or &quot;&quot; as prefix for msgstr
+values</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;M[STRING]</b>,
+<b>&minus;&minus;msgstr&minus;suffix</b>[=<i>STRING</i>]</p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>use STRING or &quot;&quot; as suffix for msgstr
+values</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="4%"></td>
+<td width="95%">
+<p><b>Informative output:</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;h</b>, <b>&minus;&minus;help</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>display this help and exit</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p><b>&minus;V</b>, <b>&minus;&minus;version</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td>
+<td width="77%">
+<p>output version information and exit</p>
+</td>
+</table>
 <a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Written by
-Ulrich Drepper.</p>
-
-<h2>REPORTING BUGS
+<h2>AUTHOR</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Written by Ulrich Drepper.</p>
+</td>
+</table>
 <a name="REPORTING BUGS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Report bugs to
-&lt;bug-gnu-gettext@gnu.org&gt;.</p>
-
-<h2>COPYRIGHT
+<h2>REPORTING BUGS</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Report bugs to &lt;bug-gnu-gettext@gnu.org&gt;.</p>
+</td>
+</table>
 <a name="COPYRIGHT"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2013 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later
-&lt;http://gnu.org/licenses/gpl.html&gt; <br>
+<h2>COPYRIGHT</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>Copyright &copy; 1995-1998, 2000-2010 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
 redistribute it. There is NO WARRANTY, to the extent
 permitted by law.</p>
-
-<h2>SEE ALSO
+</td>
+</table>
 <a name="SEE ALSO"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The full
-documentation for <b>xgettext</b> is maintained as a Texinfo
-manual. If the <b>info</b> and <b>xgettext</b> programs are
-properly installed at your site, the command</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>info
-xgettext</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">should give you
-access to the complete manual.</p>
+<h2>SEE ALSO</h2>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>The full documentation for <b>xgettext</b> is maintained
+as a Texinfo manual. If the <b>info</b> and <b>xgettext</b>
+programs are properly installed at your site, the
+command</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="20%"></td>
+<td width="79%">
+<p><b>info xgettext</b></p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td>
+<td width="89%">
+<p>should give you access to the complete manual.</p>
+</td>
+</table>
 <hr>
 </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/misc/add-to-archive gettext-0.18.1.1/gettext-tools/misc/add-to-archive
--- gettext-0.19.3/gettext-tools/misc/add-to-archive	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/add-to-archive	2010-06-06 12:49:57.000000000 +0000
@@ -18,7 +18,7 @@
 
 # Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
 # Adds the infrastructure files for gettext version 0.xx.yy to the reposutory
-# in the archive.dir.tar file.
+# in the archive.dir.tar.gz file.
 
 if test $# != 1; then
   echo "Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz"
@@ -87,10 +87,10 @@
 
 # Add the contents of this directory to the repository.
 mkdir autopoint-files
-(cd autopoint-files && tar xf ../archive.dir.tar)
+(cd autopoint-files && tar xfz ../archive.dir.tar.gz)
 mkdir autopoint-files/$pack_ver
 (cd "$work_archive" && tar cf - .) | (cd autopoint-files/$pack_ver && tar xf -)
-(cd autopoint-files && tar cf ../archive.dir.tar --owner=root --group=root *)
+(cd autopoint-files && tar cfz ../archive.dir.tar.gz --owner=root --group=root *)
 
 # Clean up.
 rm -rf autopoint-files
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/misc/archive.dir.tar and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/misc/archive.dir.tar differ
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/misc/archive.dir.tar.gz and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/misc/archive.dir.tar.gz differ
diff -Nru gettext-0.19.3/gettext-tools/misc/autopoint.in gettext-0.18.1.1/gettext-tools/misc/autopoint.in
--- gettext-0.19.3/gettext-tools/misc/autopoint.in	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/autopoint.in	2010-06-06 12:49:57.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,11 +25,10 @@
 version=@VERSION@
 
 # Set variables
-# - gettext_datadir     directory where the data files are stored.
+# - gettext_dir     directory where the sources are stored.
 prefix="@prefix@"
 datarootdir="@datarootdir@"
-: ${gettext_datadir="@datadir@/gettext"}
-: ${AUTOM4TE=autom4te}
+gettext_dir="@datadir@/gettext"
 
 # func_tmpdir
 # creates a temporary directory.
@@ -70,7 +69,18 @@
   case "$curr_executable" in
     */* | *\\*) ;;
     *) # Need to look in the PATH.
-      save_IFS="$IFS"; IFS="${PATH_SEPARATOR='@PATH_SEPARATOR@'}"
+      if test "${PATH_SEPARATOR+set}" != set; then
+        func_tmpdir
+        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
+        chmod +x "$tmp"/conf.sh
+        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
+          PATH_SEPARATOR=';'
+        else
+          PATH_SEPARATOR=:
+        fi
+        rm -rf "$tmp"
+      fi
+      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
       for dir in $PATH; do
         IFS="$save_IFS"
         test -z "$dir" && dir=.
@@ -134,50 +144,9 @@
   func_find_curr_installdir # determine curr_installdir
   func_find_prefixes
   # Relocate the directory variables that we use.
-  gettext_datadir=`echo "$gettext_datadir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
+  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
 fi
 
-# func_trace_autoconf macro configure.ac
-# traces an Autoconf macro call and outputs the arguments to stdout,
-# using autom4te.
-func_trace_autoconf ()
-{
-  echo '\
-dnl replace macros which may abort autom4te with a no-op variant
-m4_pushdef([m4_assert])
-m4_pushdef([m4_fatal])
-m4_pushdef([m4_warn])
-m4_pushdef([m4_errprintn])
-m4_pushdef([m4_exit])
-m4_pushdef([m4_include])
-m4_pushdef([m4_esyscmd])
-' \
-  | "$AUTOM4TE" --no-cache --language=Autoconf-without-aclocal-m4 \
-    --trace="$1":\$% - "$2" 2>/dev/null
-}
-
-# func_trace_sed macro configure.ac
-# traces an Autoconf macro call and outputs the arguments to stdout,
-# using sed.
-func_trace_sed ()
-{
-  sed_extract_arguments='
-s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
-/'"$1"'(/ {
-  ta
-  :a
-    s/)/)/
-    tb
-    s/\\$//
-    N
-    ba
-  :b
-  s,^.*'"$1"'([[ ]*\([^]"$`\\)]*\).*$,\1,p
-}
-d'
-  sed -e "$sed_extract_arguments" "$2"
-}
-
 # func_usage
 # outputs to stdout the --help usage message.
 func_usage ()
@@ -205,7 +174,7 @@
 {
   echo "$progname (GNU $package) $version"
   echo "Uses a versions archive in @ARCHIVE_FORMAT@ format."
-  echo "Copyright (C) 2002-2013 Free Software Foundation, Inc.
+  echo "Copyright (C) 2002-2010 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law."
@@ -221,13 +190,6 @@
   exit 1
 }
 
-# Nuisances.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
 # Command-line option processing.
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - force           yes if --force was given, empty otherwise
@@ -303,22 +265,11 @@
   fi
 fi
 
-# Select the method for Autoconf macro tracing.  func_trace_autoconf
-# is more accurate than func_trace_sed, but it only works with
-# autoconf >= 2.69.
-if echo "AC_PREREQ([2.69])" \
-  | "$AUTOM4TE" --no-cache --language=Autoconf-without-aclocal-m4 - 2>&1; then
-  func_trace=func_trace_autoconf
-else
-  func_trace=func_trace_sed
-fi
-
 # Check whether the -V option and the version number in configure.in match.
 # At least one of the two must be given. If both are given, they must agree.
-
-# Need to use func_trace_sed instead of $func_trace, since
-# AM_GNU_GETTEXT_VERSION is not a standard Autoconf trace.
-xver=`func_trace_sed AM_GNU_GETTEXT_VERSION "$configure_in"`
+sed_extract_AM_GNU_GETTEXT_VERSION_argument='s/^AM_GNU_GETTEXT_VERSION(\([^()]*\)).*$/\1/'
+sed_remove_outer_brackets='s/^\[\(.*\)\]$/\1/'
+xver=`cat "$configure_in" | grep '^AM_GNU_GETTEXT_VERSION(' | sed -n -e "$sed_extract_AM_GNU_GETTEXT_VERSION_argument"p | sed -e "$sed_remove_outer_brackets" | sed -e 1q`
 if test -z "$xver" && test -f intl/VERSION; then
   xver=`cat intl/VERSION | LC_ALL=C sed -n -e 's/^.*gettext-\([-+_.0-9A-Za-z]*\).*$/\1/p'`
 fi
@@ -346,8 +297,7 @@
   0.15 | \
   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.18 | 0.18.1 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
@@ -357,22 +307,14 @@
 esac
 
 # Check in which directory config.rpath, mkinstalldirs etc. belong.
-auxdir=`"$func_trace" AC_CONFIG_AUX_DIR "$configure_in"`
+auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
 if test -n "$auxdir"; then
   auxdir="$auxdir/"
 fi
 
 # Check in which directory the *.m4 macros belong.
-macrodirs=`"$func_trace" AC_CONFIG_MACRO_DIR_TRACE "$configure_in"`
-if test -z "$macrodirs"; then
-  macrodirs=`"$func_trace" AC_CONFIG_MACRO_DIR "$configure_in"`
-fi
-for arg in $macrodirs; do
-  m4dir="$arg"
-  break
-done
-
-if test -z "$m4dir" && test -f Makefile.am; then
+m4dir=m4
+if test -f Makefile.am; then
   # A package using automake.
   # Extract the macro directory name from Makefile.am.
   aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
@@ -391,26 +333,26 @@
   done
 fi
 
-if test -z "$m4dir"; then
-  m4dir=m4
-fi
-
 # Check whether to omit the intl/ directory.
-omitintl=
-# Need to use func_trace_sed instead of $func_trace, since
-# AM_GNU_GETTEXT is not a standard Autoconf trace.
-xargs=`func_trace_sed AM_GNU_GETTEXT "$configure_in"`
-save_IFS="$IFS"; IFS=:
-for arg in $xargs; do
-  if test 'external' = "$arg"; then
-    omitintl=yes
-    break
-  fi
-done
-IFS="$save_IFS"
+omitintl=`cat "$configure_in" | grep '^AM_GNU_GETTEXT' | sed -n -e 's/^AM_GNU_GETTEXT(\([^(),]*\).*$/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
+omitintl=`if test 'external' = "$omitintl"; then echo yes; fi`
 
 # Check in which directory or directories the po/* infrastructure belongs.
-configfiles=`"$func_trace" AC_CONFIG_FILES "$configure_in"`
+sed_extract_config_files='s,#.*$,,
+s,^dnl .*$,,
+s, dnl .*$,,
+/AC_CONFIG_FILES(/ {
+  ta
+  :a
+    s/)/)/
+    tb
+    s/\\$//
+    N
+    ba
+  :b
+  s,^.*AC_CONFIG_FILES([[ ]*\([^]"$`\\)]*\).*$,\1,p
+}'
+configfiles=`cat "$configure_in" | sed -n -e "$sed_extract_config_files"`
 # PO directories have a Makefile.in generated from Makefile.in.in.
 # Treat a directory as a PO directory if and only if it has a
 # POTFILES.in file. This allows packages to have multiple PO
@@ -445,15 +387,10 @@
 # -------+-----------------------------+--------------------+
 
 case "@ARCHIVE_FORMAT@" in
-  dir*)
-    # The archive of different versions is very large (unless xz compression is
-    # used), but using it does not require special tools.
-    case "@ARCHIVE_FORMAT@" in
-      dirgz) gzip -d -c < "$gettext_datadir/archive.dir.tar.gz" ;;
-      dirbz2) bzip2 -d -c < "$gettext_datadir/archive.dir.tar.bz2" ;;
-      dirxz) xz -d -c < "$gettext_datadir/archive.dir.tar.xz" ;;
-    esac \
-      | (cd "$work_dir" && tar xf - "gettext-$ver")
+  dir)
+    # The archive of different versions is very large, but using it does not
+    # require special tools.
+    gzip -d -c < "$gettext_dir/archive.dir.tar.gz" | (cd "$work_dir" && tar xf - "gettext-$ver")
     if test `find "$work_dir" -type f -print | wc -l` = 0; then
       rm -rf "$work_dir"
       func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
@@ -512,7 +449,7 @@
 
     # Set up a temporary CVS repository.
     # We need the temporary CVS repository because any checkout needs write
-    # access to the CVSROOT/history file, so it cannot be under $gettext_datadir.
+    # access to the CVSROOT/history file, so it cannot be under $gettext_dir.
     # We need the temporary checkout directory because when --force was not
     # given, we need to compare the existing files with the checked out ones.
     # Set variables
@@ -554,7 +491,7 @@
     # Need to pass -d "$CVSROOT", because there may be a CVS directory in the
     # current directory.
     cvs -d "$CVSROOT" init
-    gzip -d -c < "$gettext_datadir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
+    gzip -d -c < "$gettext_dir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
 
     cd "$work_dir"
     cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
@@ -578,7 +515,7 @@
     # Check availability of the git program.
     (git --version) >/dev/null 2>/dev/null || func_fatal_error "git program not found"
     mkdir "$work_dir/archive"
-    gzip -d -c < "$gettext_datadir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
+    gzip -d -c < "$gettext_dir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
     (cd "$work_dir/archive" && git checkout -q "gettext-$ver") || {
       rm -rf "$work_dir"
       func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
diff -Nru gettext-0.19.3/gettext-tools/misc/ChangeLog gettext-0.18.1.1/gettext-tools/misc/ChangeLog
--- gettext-0.19.3/gettext-tools/misc/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,239 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Update for 0.19.3.
-
-2014-10-10  Eric Blake  <eblake@redhat.com>
-
-	autopoint: Fix infinite recursion when tracing configure.ac
-	Reported by Andreas Henriksson at:
-	<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580>
-	* autopoint.in (func_trace_autoconf): Temporarily redefine
-	built-in macros, instead of undefining.
-	* gettextize.in: Likewise.
-
-2014-09-01  Daiki Ueno  <ueno@gnu.org>
-
-	* convert-archive.in: Don't use non-portable 'if ! COMMAND'.
-	Reported by Stefano Lattarini in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2011-07/msg00002.html>.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	autopoint: Fix the last change
-	* autopoint.in: Use func_trace_sed for AM_GNU_GETTEXT and
-	AM_GNU_GETTEXT_VERSION, as they are not an Autoconf trace.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	autopoint: Select macro tracing method by Autoconf version
-	Reported and analyzed by Pádraig Brady in:
-	<http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00071.html>.
-	* autopoint.in (func_trace_autoconf): Rename from func_trace.
-	($func_trace): Set to func_trace_autoconf if Autoconf >= 2.69 is
-	available, otherwise to func_trace_sed.
-	* gettextize.in: Likewise.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-04-23  Daiki Ueno  <ueno@gnu.org>
-
-	autopoint: Unset variables known to interfere with common tools
-	Reported by Jan Cholasta at:
-	<https://bugzilla.redhat.com/show_bug.cgi?id=801374>.
-	* autopoint.in: Unset CDPATH, CLICOLOR_FORCE, and GREP_OPTIONS.
-	* gettextize.in: Unset CLICOLOR_FORCE and GREP_OPTIONS.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Rename gettext_dir to gettext_datadir.
-	* gettextize.in: Likewise.
-
-2014-03-27  Daiki Ueno  <ueno@gnu.org>
-
-	autopoint: Use SED-based trace for non-standard Autoconf macros
-	Reported by Sean McGovern in <https://savannah.gnu.org/bugs/?41913>.
-	* autopoint.in (func_trace_sed): New function; use it to trace
-	AM_GNU_GETTEXT and AM_GNU_GETTEXT_VERSION.
-	* gettextize.in (func_trace_sed): New function; use it to trace
-	AM_GNU_GETTEXT.
-
-2014-03-26  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Allow user to specify the directory in which
-	archive belongs, through $gettext_dir envvar.
-	* gettextize.in: Likewise.
-
-2013-12-05  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in (func_trace): Allow user to specify autom4te
-	executable name through $AUTOM4TE envvar.
-	* gettextize.in (func_trace): Likewise.
-	Suggested by Eric Blake at
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00006.html>.
-
-2013-11-19  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in (func_trace): Disable m4_include and m4_esyscmd.
-	* gettextize.in (func_trace): Likewise.
-	Reported by Bernhard Voelker
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-11/msg00011.html>
-	and suggested by Eric Blake at <https://savannah.gnu.org/bugs/?40083>.
-
-2013-10-16  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Use 'm4' as the default macro directory if it is
-	not specified in configure.ac nor Makefile.am.
-	Reported by Michał Górny in
-	<http://savannah.gnu.org/bugs/?40278>.
-
-2013-09-24  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in (func_trace): Discard stderr of autom4te.
-	* gettextize.in (func_trace): Likewise.
-	Reported by Gary V. Vaughan in
-	<http://savannah.gnu.org/bugs/?40083>.
-
-2013-09-24  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Recognize multiple arguments of AM_GNU_GETTEXT
-	when tracing.
-	* gettextize.in: Likewise.
-	Reported by Gary V. Vaughan in
-	<http://savannah.gnu.org/bugs/?40082>.
-
-2013-08-12  Daiki Ueno  <ueno@gnu.org>
-
-	autopoint: make macro trace in autom4te robuster
-	* autopoint.in (func_trace): Ignore M4sugar macros which may abort
-	autom4te and read gettext.m4 to trace AM_GNU_GETTEXT_* macros.
-	* gettextize.in (func_trace): New function ported from autopoint.in.
-	Reported by Sami Kerola in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-07/msg00002.html>.
-
-2013-07-29  Jan Djärv  <jan.h.d@swipnet.se>  (tiny change)
-
-	* po-mode.el (po-send-mail): Don't include original uncompressed
-	text in the mail.
-
-2013-07-21  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in (omitintl): Don't set it 'no' when no
-	AM_GNU_GETTEXT call is found.
-	Reported by Sebastien Helleu in <http://savannah.gnu.org/bugs/?39536>.
-
-2013-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in (func_trace): New function; use it all in places
-	where Autoconf macro trace is needed.
-	(func_version): Bump copyright year.
-	* gettextize.in (func_version): Bump copyright year.
-
-2013-03-05  Daiki Ueno  <ueno@gnu.org>
-
-	* po-mode.el (po-font-lock-keywords): Properly highlight C format
-	strings with parameter positions.
-	Reported at
-	<https://savannah.gnu.org/bugs/index.php?33552>.
-
-2013-03-05  Ævar Arnfjörð Bjarmason  <avarab@gmail.com>  (tiny change)
-
-	* po-mode.el (po-auto-update-file-header): New user option.
-	(po-check-file-header): Respect 'po-auto-update-file-header'.
-
-2013-03-04  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Handle macro directories specified in configure.ac.
-	Reported by Pavel Raiskup in
-	<http://lists.gnu.org/archive/html/bug-gettext/2013-02/msg00017.html>.
-
-2013-03-04  Daiki Ueno  <ueno@gnu.org>
-
-	* gettextize.in: Use autoconf trace to detect auxdir and m4dir.
-
-2013-03-04  Daiki Ueno  <ueno@gnu.org>
-
-	* gettextize.in: Don't add redundant "-I m4" if
-	AC_CONFIG_MACRO_DIR{,S} is not specified.
-
-2013-03-01  Daiki Ueno  <ueno@gnu.org>
-
-	* gettextize.in: Handle macro directories specified in configure.ac.
-	Reported by Pavel Raiskup in
-	<http://lists.gnu.org/archive/html/bug-gettext/2013-02/msg00017.html>.
-
-2013-02-28  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in (gettext_dir): Substitute PATH_SEPARATOR at
-	configure time.
-	* gettextize.in (gettext_dir): Substitute PATH_SEPARATOR at
-	configure time.
-	Suggested by Stefano Lattarini in
-	<http://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00066.html>.
-
-2013-01-07  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Extract version number from configure.ac in a more
-	robust way.
-	Reported by Tom G. Christensen in
-	<http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00053.html>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint.in: Update for 0.18.2.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2010-08-30  Bruno Haible  <bruno@clisp.org>
-
-	Improve interopability with Emacs 23.
-	* po-compat.el (po-find-file-coding-system-guts): Don't use codepages
-	API in Emacs >= 23.
-	* po-mode.el (po-mode-version-string): Bump to 2.21.
-	(po-ediff-buffers-exit-recursive, po-send-mail): Use
-	insert-buffer-substring instead of insert-buffer.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	New options --with-xz and --with-bzip2 for compressing the archive.
-	* autopoint.in: Handle the archive formats dirgz, dirbz2, dirxz instead
-	of dir.
-	* convert-archive.in: Handle the archive formats dirgz, dirbz2, dirxz
-	like dir. Format 'dir' is now without compression.
-	* Makefile.am (MOSTLYCLEANFILES): New variable.
-	(CLEANFILES): Add archive.dir.tar.gz, archive.dir.tar.bz2,
-	archive.dir.tar.xz.
-	(EXTRA_DIST): Add archive.dir.tar. Remove archive.dir.tar.gz.
-	(ARCHIVE_dirgz, ARCHIVE_dirbz2, ARCHIVE_dirxz, ARCHIVE_git,
-	ARCHIVE_cvs): New variables.
-	(gettextsrc_DATA): Use them.
-	(archive.dir.tar): Renamed from archive.dir.tar.gz. Look for an
-	installed .tar.bzip2 or .tar.xz as well.
-	(archive.dir.tar.gz, archive.dir.tar.bz2, archive.dir.tar.xz): New
-	rules.
-	(archive.git.tar.gz, archive.cvs.tar.gz): Update.
-	* add-to-archive: Read and write an uncompressed archive.dir.tar.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	Make 'convert-archive' less verbose.
-	* convert-archive.in: Avoid all output from "git commit".
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/misc/convert-archive.in gettext-0.18.1.1/gettext-tools/misc/convert-archive.in
--- gettext-0.19.3/gettext-tools/misc/convert-archive.in	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/convert-archive.in	2010-06-06 12:49:57.000000000 +0000
@@ -17,8 +17,8 @@
 #
 
 # Usage: convert-archive FROM TO [FROMFILE [TOFILE]]
-# where FROM is dir or dirgz or dirbz2 or dirxz or cvs or git
-# and   TO   is dir or dirgz or dirbz2 or dirxz or cvs or git
+# where FROM is dir or cvs or git
+# and   TO   is dir or cvs or git
 # This will read FROMFILE (default: archive.$FROM.tar.gz)
 # and produce TOFILE (default: archive.$TO.tar.gz).
 
@@ -64,11 +64,9 @@
 
 # Command-line option processing.
 
-if { { test $# = 2 || test $# = 3 || test $# = 4; } \
+if ! { { test $# = 2 || test $# = 3 || test $# = 4; } \
        && case "$1" in dir | cvs | git ) true;; *) false;; esac \
        && case "$2" in dir | cvs | git ) true;; *) false;; esac; }; then
-  :
-else
   echo "Usage: convert-archive {dir|cvs|git} {dir|cvs|git} [fromfile [tofile]]"
   exit 1
 fi
@@ -91,15 +89,8 @@
 
 # Unpack the original archive.
 case "$from" in
-  dir*)
-    { case "$from" in
-        dir) cat < "$fromfile" ;;
-        dirgz) gzip -d -c < "$fromfile" ;;
-        dirbz2) bzip2 -d -c < "$fromfile" ;;
-        dirxz) xz -d -c < "$fromfile" ;;
-      esac
-    } \
-      | (cd "$unpacked" && tar xf -) \
+  dir)
+    gzip -d -c < "$fromfile" | (cd "$unpacked" && tar xf -) \
       || func_fatal_error "file copy failed"
     ;;
 
@@ -243,15 +234,9 @@
 
 # Create the target archive.
 case "$to" in
-  dir*)
+  dir)
     (cd "$unpacked" && $TAR cf - $TAR_OPTIONS *) \
-      | { case "$to" in
-            dir) cat > "$tofile" ;;
-            dirgz) gzip -c -9 > "$tofile" ;;
-            dirbz2) bzip2 -c -9 > "$tofile" ;;
-            dirxz) xz -c -5 > "$tofile" ;;
-          esac
-        } \
+      | gzip -c -9 > "$tofile" \
       || func_fatal_error "archive creation failed"
     ;;
 
@@ -327,7 +312,8 @@
       touch .gitignore
       git add .
       git commit --author="Bruno Haible <bruno@clisp.org>" \
-                 --message="Empty directory" 2>&1 >/dev/null
+                 --message="Empty directory" 2>&1 \
+        | grep -v '^ '
       git tag empty
     }) || func_fatal_error "git init failed"
     sed_remove_leading_dot='s,^\./,,'
@@ -343,7 +329,8 @@
          tar xf -
          git add .
          git commit --author="Bruno Haible <bruno@clisp.org>" \
-                    --message="Import $version" 2>&1 >/dev/null
+                    --message="Import $version" 2>&1 \
+           | grep -v '^ '
          git tag "$version"
        }) || func_fatal_error "file copy into git repository failed"
      done
diff -Nru gettext-0.19.3/gettext-tools/misc/gettextize.in gettext-0.18.1.1/gettext-tools/misc/gettextize.in
--- gettext-0.19.3/gettext-tools/misc/gettextize.in	2014-10-10 03:57:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/gettextize.in	2010-06-06 12:49:57.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 1995-1998, 2000-2014 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,11 +25,10 @@
 version=@VERSION@
 
 # Set variables
-# - gettext_datadir     directory where the data files are stored.
+# - gettext_dir     directory where the sources are stored.
 prefix="@prefix@"
 datarootdir="@datarootdir@"
-: ${gettext_datadir="@datadir@/gettext"}
-: ${AUTOM4TE=autom4te}
+gettext_dir="@datadir@/gettext"
 
 # func_tmpdir
 # creates a temporary directory.
@@ -70,7 +69,18 @@
   case "$curr_executable" in
     */* | *\\*) ;;
     *) # Need to look in the PATH.
-      save_IFS="$IFS"; IFS="${PATH_SEPARATOR='@PATH_SEPARATOR@'}"
+      if test "${PATH_SEPARATOR+set}" != set; then
+        func_tmpdir
+        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
+        chmod +x "$tmp"/conf.sh
+        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
+          PATH_SEPARATOR=';'
+        else
+          PATH_SEPARATOR=:
+        fi
+        rm -rf "$tmp"
+      fi
+      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
       for dir in $PATH; do
         IFS="$save_IFS"
         test -z "$dir" && dir=.
@@ -134,50 +144,9 @@
   func_find_curr_installdir # determine curr_installdir
   func_find_prefixes
   # Relocate the directory variables that we use.
-  gettext_datadir=`echo "$gettext_datadir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
+  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
 fi
 
-# func_trace_autoconf macro configure.ac
-# traces an Autoconf macro call and outputs the arguments to stdout,
-# using autom4te.
-func_trace_autoconf ()
-{
-  echo '\
-dnl replace macros which may abort autom4te with a no-op variant
-m4_pushdef([m4_assert])
-m4_pushdef([m4_fatal])
-m4_pushdef([m4_warn])
-m4_pushdef([m4_errprintn])
-m4_pushdef([m4_exit])
-m4_pushdef([m4_include])
-m4_pushdef([m4_esyscmd])
-' \
-  | "$AUTOM4TE" --no-cache --language=Autoconf-without-aclocal-m4 \
-    --trace="$1":\$% - "$2" 2>/dev/null
-}
-
-# func_trace_sed macro configure.ac
-# traces an Autoconf macro call and outputs the arguments to stdout,
-# using sed.
-func_trace_sed ()
-{
-  sed_extract_arguments='
-s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
-/'"$1"'(/ {
-  ta
-  :a
-    s/)/)/
-    tb
-    s/\\$//
-    N
-    ba
-  :b
-  s,^.*'"$1"'([[ ]*\([^]"$`\\)]*\).*$,\1,p
-}
-d'
-  sed -e "$sed_extract_arguments" "$2"
-}
-
 # func_usage
 # outputs to stdout the --help usage message.
 func_usage ()
@@ -205,7 +174,7 @@
 func_version ()
 {
   echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 1995-1998, 2000-2013 Free Software Foundation, Inc.
+  echo "Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law."
@@ -224,10 +193,6 @@
 # Nuisances.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
 # Command-line option processing.
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - force           1 if --force was given, 0 otherwise
@@ -354,35 +319,15 @@
   fi
 fi
 
-# Select the method for Autoconf macro tracing.  func_trace_autoconf
-# is more accurate than func_trace_sed, but it only works with
-# autoconf >= 2.69.
-if echo "AC_PREREQ([2.69])" \
-  | "$AUTOM4TE" --no-cache --language=Autoconf-without-aclocal-m4 - 2>&1; then
-  func_trace=func_trace_autoconf
-else
-  func_trace=func_trace_sed
-fi
-
 # Check in which directory config.rpath etc. belong.
-auxdir=`"$func_trace" AC_CONFIG_AUX_DIR "$configure_in"`
+auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
 if test -n "$auxdir"; then
   auxdir="$auxdir/"
 fi
 
-# Check in which directory gettext.m4 etc. belong.
-macrodirs=`"$func_trace" AC_CONFIG_MACRO_DIR_TRACE "$configure_in"`
-if test -z "$macrodirs"; then
-  macrodirs=`"$func_trace" AC_CONFIG_MACRO_DIR "$configure_in"`
-fi
-for arg in $macrodirs; do
-  m4dir="$arg"
-  break
-done
-
 # For simplicity we change to the gettext source directory.
-cd "$gettext_datadir" ||
-  func_fatal_error "gettext source directory '${gettext_datadir}' doesn't exist"
+cd "$gettext_dir" ||
+  func_fatal_error "gettext source directory '${gettext_dir}' doesn't exist"
 
 # Variables which keep track what has been modified.
 added_directories=
@@ -677,7 +622,7 @@
 for file in *; do
   case $file in
     ABOUT-NLS)
-      func_linkorcopy $file "$gettext_datadir/$file" $file
+      func_linkorcopy $file "$gettext_dir/$file" $file
       ;;
     config.rpath)
       if test -f "$srcdir/$auxdir$file"; then
@@ -685,7 +630,7 @@
       else
         added_extradist="$added_extradist $auxdir$file"
       fi
-      func_linkorcopy $file "$gettext_datadir/$file" "$auxdir$file"
+      func_linkorcopy $file "$gettext_dir/$file" "$auxdir$file"
       ;;
   esac
 done
@@ -696,7 +641,7 @@
   for file in *; do
     if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
       if test $file != plural.c; then
-        func_linkorcopy $file "$gettext_datadir/intl/$file" intl/$file
+        func_linkorcopy $file "$gettext_dir/intl/$file" intl/$file
       else
         # plural.c is a generated file; it must be copied and touched.
         func_copy $file intl/$file
@@ -710,19 +655,9 @@
 else
   echo "Not copying intl/ directory."
   # Tell the user what to put into configure.ac, if it is not already there.
-  external=
-  # Need to use func_trace_sed instead of $func_trace, since
-  # AM_GNU_GETTEXT is not a standard Autoconf trace.
-  xargs=`func_trace_sed AM_GNU_GETTEXT "$srcdir/$configure_in"`
-  save_IFS="$IFS"; IFS=:
-  for arg in $xargs; do
-    if test 'external' = "$arg"; then
-      external=yes
-      break
-    fi
-  done
-  IFS="$save_IFS"
-  if test -z "$external"; then
+  if grep '^AM_GNU_GETTEXT([[]\?external[]]\?[ 	]*[,)]' "$srcdir/$configure_in" > /dev/null; then
+    :
+  else
     please="$please
 Please use AM_GNU_GETTEXT([external]) in order to cause autoconfiguration
 to look for an external libintl.
@@ -751,7 +686,7 @@
       fi
     fi
     func_backup "$podir/$file"
-    func_linkorcopy $file "$gettext_datadir/po/$file" "$podir/$file"
+    func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
   done
   for file in *; do
     case $file in
@@ -759,7 +694,7 @@
         # Already handled above.
         ;;
       Makevars.template)
-        func_linkorcopy Makevars.template "$gettext_datadir/po/Makevars.template" "$podir/Makevars.template"
+        func_linkorcopy Makevars.template "$gettext_dir/po/Makevars.template" "$podir/Makevars.template"
         if test -f "$srcdir/po/Makevars"; then
           LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp1"
           LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars.template" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp2"
@@ -794,7 +729,7 @@
           fi
         fi
         func_backup "$podir/$file"
-        func_linkorcopy $file "$gettext_datadir/po/$file" "$podir/$file"
+        func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
         ;;
     esac
   done
@@ -861,39 +796,31 @@
     esac
   fi
 
-  if test -z "$m4dir"; then
-    # Extract the macro directory name from Makefile.am.
-    aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-    m4dir_is_next=
-    for arg in $aclocal_amflags; do
-      if test -n "$m4dir_is_next"; then
-        # Ignore absolute directory pathnames, like /usr/local/share/aclocal.
-        case "$arg" in
-          /*) ;;
-          *)
-            test -z "$m4dir" || m4dir="$arg"
-            macrodirs="$macrodirs $arg"
-            ;;
-        esac
-        m4dir_is_next=
+  # Extract the macro directory name from Makefile.am.
+  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
+  m4dir=m4
+  m4dir_defaulted=yes
+  m4dir_is_next=
+  for arg in $aclocal_amflags; do
+    if test -n "$m4dir_is_next"; then
+      # Ignore absolute directory pathnames, like /usr/local/share/aclocal.
+      case "$arg" in
+        /*) ;;
+        *)
+          m4dir="$arg"
+          m4dir_defaulted=
+          break
+          ;;
+      esac
+      m4dir_is_next=
+    else
+      if test "X$arg" = "X-I"; then
+        m4dir_is_next=yes
       else
-        if test "X$arg" = "X-I"; then
-          m4dir_is_next=yes
-        else
-          m4dir_is_next=
-        fi
+        m4dir_is_next=
       fi
-    done
-    for arg in $macrodirs; do
-      m4dir="$arg"
-      break
-    done
-  fi
-
-  if test -z "$m4dir"; then
-    m4dir=m4
-    m4dir_defaulted=yes
-  fi
+    fi
+  done
 
   # Decide whether to use $m4dir/ChangeLog, or to use ChangeLog instead.
   if test -d "$srcdir/$m4dir" && test -f "$srcdir/ChangeLog" && test ! -f "$srcdir/$m4dir/ChangeLog"; then
@@ -1099,9 +1026,20 @@
     fi
   fi
   # Extract the aclocal options name from Makefile.am.
+  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
   aclocal_options=
-  for arg in $macrodirs; do
-    aclocal_options="$aclocal_options -I $arg"
+  m4dir_is_next=
+  for arg in $aclocal_amflags; do
+    if test -n "$m4dir_is_next"; then
+      aclocal_options="$aclocal_options -I $arg"
+      m4dir_is_next=
+    else
+      if test "X$arg" = "X-I"; then
+        m4dir_is_next=yes
+      else
+        m4dir_is_next=
+      fi
+    fi
   done
   please="$please
 Please run 'aclocal$aclocal_options' to regenerate the aclocal.m4 file.
@@ -1320,7 +1258,7 @@
 if $doit; then
   echo "$please"
   echo "You might also want to copy the convenience header file gettext.h"
-  echo "from the $gettext_datadir directory into your package."
+  echo "from the $gettext_dir directory into your package."
   echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls"
   echo "option."
   echo
diff -Nru gettext-0.19.3/gettext-tools/misc/Makefile.am gettext-0.18.1.1/gettext-tools/misc/Makefile.am
--- gettext-0.19.3/gettext-tools/misc/Makefile.am	2013-06-10 07:06:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -18,7 +18,6 @@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 EXTRA_DIST =
-MOSTLYCLEANFILES =
 CLEANFILES =
 DISTCLEANFILES =
 
@@ -29,87 +28,38 @@
 
 DISTCLEANFILES += gettextize autopoint convert-archive
 
-CLEANFILES += \
-  archive.dir.tar.gz \
-  archive.dir.tar.bz2 \
-  archive.dir.tar.xz \
-  archive.cvs.tar.gz \
-  archive.git.tar.gz
+CLEANFILES += archive.cvs.tar.gz archive.git.tar.gz
 
-EXTRA_DIST += add-to-archive cvsuser.c archive.dir.tar
+EXTRA_DIST += add-to-archive cvsuser.c archive.dir.tar.gz
 
 gettextsrcdir = $(datadir)/gettext
-gettextsrc_DATA = $(ARCHIVE_@ARCHIVE_FORMAT@)
-ARCHIVE_dirgz = archive.dir.tar.gz
-ARCHIVE_dirbz2 = archive.dir.tar.bz2
-ARCHIVE_dirxz = archive.dir.tar.xz
-ARCHIVE_git = archive.git.tar.gz
-ARCHIVE_cvs = archive.cvs.tar.gz
+gettextsrc_DATA = archive.@ARCHIVE_FORMAT@.tar.gz
 
-# The archive.dir.tar is not in the CVS. Alpha-testers must use the one from
+# The archive.dir.tar.gz is not in the CVS. Alpha-testers must use the one from
 # an already installed release.
-archive.dir.tar:
+archive.dir.tar.gz:
 	if test -f $(gettextsrcdir)/archive.dir.tar.gz; then \
-	  gzip -d -c < $(gettextsrcdir)/archive.dir.tar.gz > $@-t && mv $@-t $@; \
+	  cp -p $(gettextsrcdir)/archive.dir.tar.gz $@; \
 	else \
-	  if test -f $(gettextsrcdir)/archive.dir.tar.bz2; then \
-	    bzip2 -d -c < $(gettextsrcdir)/archive.dir.tar.bz2 > $@-t && mv $@-t $@; \
-	  else \
-	    if test -f $(gettextsrcdir)/archive.dir.tar.xz; then \
-	      xz -d -c < $(gettextsrcdir)/archive.dir.tar.xz > $@-t && mv $@-t $@; \
-	    else \
-	      echo "archive.dir.tar is not under version control. Please copy the archive.dir.tar.{gz,bz2,xz} from an already installed release to gettext-tools/misc/ and decompress it there." 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
+	  echo "archive.dir.tar.gz is not under version control. Please copy the archive.dir.tar.gz from an already installed release to gettext-tools/misc/." 1>&2; \
+	  exit 1; \
 	fi
-MOSTLYCLEANFILES += archive.dir.tar-t
 
-# The archive.dir.tar.gz is generated from archive.dir.tar.
-archive.dir.tar.gz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
+# The archive.git.tar.gz is generated from archive.dir.tar.gz.
+archive.git.tar.gz: archive.dir.tar.gz
+	if test -f archive.dir.tar.gz; then \
+	  inputfile=archive.dir.tar.gz; \
 	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
-	fi; \
-	gzip -c -9 < "$$inputfile" > $@-t && mv $@-t $@
-MOSTLYCLEANFILES += archive.dir.tar.gz-t
-
-# The archive.dir.tar.bz2 is generated from archive.dir.tar.
-archive.dir.tar.bz2: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
-	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
-	fi; \
-	bzip2 -c -9 < "$$inputfile" > $@-t && mv $@-t $@
-MOSTLYCLEANFILES += archive.dir.tar.bz2-t
-
-# The archive.dir.tar.xz is generated from archive.dir.tar.
-archive.dir.tar.xz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
-	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
-	fi; \
-	xz -c -5 < "$$inputfile" > $@-t && mv $@-t $@
-MOSTLYCLEANFILES += archive.dir.tar.xz-t
-
-# The archive.git.tar.gz is generated from archive.dir.tar.
-archive.git.tar.gz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
-	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
+	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
 	fi; \
 	./convert-archive dir git "$$inputfile" $@
 
-# The archive.cvs.tar.gz is generated from archive.dir.tar.
-archive.cvs.tar.gz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
+# The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
+archive.cvs.tar.gz: archive.dir.tar.gz
+	if test -f archive.dir.tar.gz; then \
+	  inputfile=archive.dir.tar.gz; \
 	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
+	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
 	fi; \
 	./convert-archive dir cvs "$$inputfile" $@
 
diff -Nru gettext-0.19.3/gettext-tools/misc/Makefile.in gettext-0.18.1.1/gettext-tools/misc/Makefile.in
--- gettext-0.19.3/gettext-tools/misc/Makefile.in	2014-10-16 06:01:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/Makefile.in	2010-06-06 20:12:31.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -17,54 +18,10 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -80,71 +37,60 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = misc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs \
-	$(srcdir)/gettextize.in $(srcdir)/autopoint.in \
-	$(srcdir)/convert-archive.in ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/autopoint.in $(srcdir)/convert-archive.in \
+	$(srcdir)/gettextize.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -152,12 +98,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -174,7 +117,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -186,7 +128,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -195,26 +136,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -223,17 +158,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -259,7 +190,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -268,7 +198,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -277,26 +206,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -353,61 +280,25 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lispdir)" \
 	"$(DESTDIR)$(gettextsrcdir)"
 SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 lispLISP_INSTALL = $(INSTALL_DATA)
 LISP = $(lisp_LISP)
 am__ELFILES = po-compat.el po-mode.el start-po.el
 am__ELCFILES = $(am__ELFILES:.el=.elc)
 ELCFILES = $(LISP:.el=.elc)
+elisp_comp = $(top_srcdir)/../build-aux/elisp-comp
 DATA = $(gettextsrc_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -416,7 +307,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -454,7 +344,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -491,18 +380,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -514,26 +402,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -541,8 +419,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -554,23 +430,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -593,7 +464,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -611,18 +481,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -647,47 +512,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -695,7 +552,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -705,21 +561,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -731,103 +583,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -838,11 +637,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -852,6 +646,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -864,7 +659,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -885,16 +679,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -917,48 +711,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -981,6 +760,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -990,13 +770,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1005,47 +788,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1060,8 +812,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1101,7 +851,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1123,8 +872,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1132,13 +881,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1151,21 +898,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1178,9 +923,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1204,9 +949,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1220,12 +963,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1233,8 +973,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1246,41 +984,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1294,27 +1020,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1322,34 +1035,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1365,9 +1069,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1387,8 +1089,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1397,8 +1097,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1413,7 +1111,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1464,6 +1161,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1471,7 +1169,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1482,29 +1179,20 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.2 gnits
-EXTRA_DIST = add-to-archive cvsuser.c archive.dir.tar $(lisp_LISP)
-MOSTLYCLEANFILES = archive.dir.tar-t archive.dir.tar.gz-t \
-	archive.dir.tar.bz2-t archive.dir.tar.xz-t
-CLEANFILES = archive.dir.tar.gz archive.dir.tar.bz2 archive.dir.tar.xz \
-	archive.cvs.tar.gz archive.git.tar.gz
+EXTRA_DIST = add-to-archive cvsuser.c archive.dir.tar.gz $(lisp_LISP)
+CLEANFILES = archive.cvs.tar.gz archive.git.tar.gz
 DISTCLEANFILES = gettextize autopoint convert-archive
 
 # Scripts for maintainers.
 bin_SCRIPTS = gettextize autopoint
 gettextsrcdir = $(datadir)/gettext
-gettextsrc_DATA = $(ARCHIVE_@ARCHIVE_FORMAT@)
-ARCHIVE_dirgz = archive.dir.tar.gz
-ARCHIVE_dirbz2 = archive.dir.tar.bz2
-ARCHIVE_dirxz = archive.dir.tar.xz
-ARCHIVE_git = archive.git.tar.gz
-ARCHIVE_cvs = archive.cvs.tar.gz
+gettextsrc_DATA = archive.@ARCHIVE_FORMAT@.tar.gz
 
 # Emacs Lisp code.
 lisp_LISP = start-po.el po-mode.el po-compat.el
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .el .elc
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -1543,11 +1231,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -1575,7 +1260,9 @@
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 installcheck-binSCRIPTS: $(bin_SCRIPTS)
 	bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \
@@ -1598,30 +1285,36 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-.el.elc:
-	if test "$(EMACS)" != "no"; then \
-	  am__dir=. am__subdir_includes=''; \
-	  case $@ in */*) \
-	    am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
-	    am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
-	  esac; \
-	  test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
-	  $(EMACS) --batch \
-	    $(AM_ELCFLAGS) $(ELCFLAGS) \
-	    $$am__subdir_includes -L $(builddir) -L $(srcdir) \
-	    --eval "(defun byte-compile-dest-file (f) \"$@\")" \
-	    --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
-	else :; fi
-
+elc-stamp: $(LISP)
+	@echo 'WARNING: Warnings can be ignored. :-)'
+	@rm -f elc-temp && touch elc-temp
+	if test "$(EMACS)" != no; then \
+	  set x; \
+	  list='$(LISP)'; for p in $$list; do \
+	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	    set x "$$@" "$$d$$p"; shift; \
+	  done; \
+	  shift; \
+	  EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
+	else : ; fi
+	@mv -f elc-temp $@
+$(am__ELCFILES): elc-stamp
+	@if test "$(EMACS)" != no && test ! -f $@; then \
+	  trap 'rm -rf elc-lock elc-stamp' 1 2 13 15; \
+	  if mkdir elc-lock 2>/dev/null; then \
+	    rm -f elc-stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) elc-stamp; \
+	    rmdir elc-lock; \
+	  else \
+	    while test -d elc-lock; do sleep 1; done; \
+	    test -f elc-stamp; exit $$?; \
+	  fi; \
+	else : ; fi
 install-lispLISP: $(lisp_LISP) $(ELCFILES)
 	@$(NORMAL_INSTALL)
 	@if test "$(EMACS)" != no && test -n "$(lispdir)"; then \
-	  list='$(lisp_LISP)'; \
-	  if test -n "$$list"; then \
-	    echo " $(MKDIR_P) '$(DESTDIR)$(lispdir)'"; \
-	    $(MKDIR_P) "$(DESTDIR)$(lispdir)" || exit 1; \
-	  fi; \
-	  for p in $$list; do \
+	  $(MKDIR_P) "$(DESTDIR)$(lispdir)"; \
+	  list='$(lisp_LISP)'; for p in $$list; do \
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	    $(am__strip_dir) \
 	    echo " $(lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \
@@ -1638,18 +1331,19 @@
 	@test "$(EMACS)" != no && test -n "$(lispdir)" || exit 0; \
 	list='$(lisp_LISP)'; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	files="$$files "`echo "$$files" | sed 's|$$|c|'`; \
-	dir='$(DESTDIR)$(lispdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	filesc=`echo "$$files" | sed 's|$$|c|'`; \
+	echo " ( cd '$(DESTDIR)$(lispdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(lispdir)" && rm -f $$files || exit $$?; \
+	echo " ( cd '$(DESTDIR)$(lispdir)' && rm -f" $$filesc ")"; \
+	cd "$(DESTDIR)$(lispdir)" && rm -f $$filesc
 
 clean-lisp:
-	-rm -f $(ELCFILES)
+	-rm -f elc-stamp $(ELCFILES)
 install-gettextsrcDATA: $(gettextsrc_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(gettextsrcdir)" || $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)"
 	@list='$(gettextsrc_DATA)'; test -n "$(gettextsrcdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gettextsrcdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gettextsrcdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1663,59 +1357,15 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gettextsrc_DATA)'; test -n "$(gettextsrcdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(gettextsrcdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gettextsrcdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gettextsrcdir)" && rm -f $$files
+tags: TAGS
+TAGS:
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
+ctags: CTAGS
+CTAGS:
 
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1764,17 +1414,11 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -1793,7 +1437,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -1856,9 +1500,8 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-lisp cscopelist-am ctags ctags-am \
-	distclean distclean-generic distclean-libtool distclean-tags \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-lisp distclean distclean-generic distclean-libtool \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-binSCRIPTS install-data install-data-am \
 	install-dvi install-dvi-am install-exec install-exec-am \
@@ -1868,71 +1511,36 @@
 	install-strip installcheck installcheck-am \
 	installcheck-binSCRIPTS installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-binSCRIPTS uninstall-gettextsrcDATA \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-gettextsrcDATA \
 	uninstall-lispLISP
 
 
-# The archive.dir.tar is not in the CVS. Alpha-testers must use the one from
+# The archive.dir.tar.gz is not in the CVS. Alpha-testers must use the one from
 # an already installed release.
-archive.dir.tar:
+archive.dir.tar.gz:
 	if test -f $(gettextsrcdir)/archive.dir.tar.gz; then \
-	  gzip -d -c < $(gettextsrcdir)/archive.dir.tar.gz > $@-t && mv $@-t $@; \
+	  cp -p $(gettextsrcdir)/archive.dir.tar.gz $@; \
 	else \
-	  if test -f $(gettextsrcdir)/archive.dir.tar.bz2; then \
-	    bzip2 -d -c < $(gettextsrcdir)/archive.dir.tar.bz2 > $@-t && mv $@-t $@; \
-	  else \
-	    if test -f $(gettextsrcdir)/archive.dir.tar.xz; then \
-	      xz -d -c < $(gettextsrcdir)/archive.dir.tar.xz > $@-t && mv $@-t $@; \
-	    else \
-	      echo "archive.dir.tar is not under version control. Please copy the archive.dir.tar.{gz,bz2,xz} from an already installed release to gettext-tools/misc/ and decompress it there." 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
+	  echo "archive.dir.tar.gz is not under version control. Please copy the archive.dir.tar.gz from an already installed release to gettext-tools/misc/." 1>&2; \
+	  exit 1; \
 	fi
 
-# The archive.dir.tar.gz is generated from archive.dir.tar.
-archive.dir.tar.gz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
-	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
-	fi; \
-	gzip -c -9 < "$$inputfile" > $@-t && mv $@-t $@
-
-# The archive.dir.tar.bz2 is generated from archive.dir.tar.
-archive.dir.tar.bz2: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
-	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
-	fi; \
-	bzip2 -c -9 < "$$inputfile" > $@-t && mv $@-t $@
-
-# The archive.dir.tar.xz is generated from archive.dir.tar.
-archive.dir.tar.xz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
-	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
-	fi; \
-	xz -c -5 < "$$inputfile" > $@-t && mv $@-t $@
-
-# The archive.git.tar.gz is generated from archive.dir.tar.
-archive.git.tar.gz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
+# The archive.git.tar.gz is generated from archive.dir.tar.gz.
+archive.git.tar.gz: archive.dir.tar.gz
+	if test -f archive.dir.tar.gz; then \
+	  inputfile=archive.dir.tar.gz; \
 	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
+	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
 	fi; \
 	./convert-archive dir git "$$inputfile" $@
 
-# The archive.cvs.tar.gz is generated from archive.dir.tar.
-archive.cvs.tar.gz: archive.dir.tar
-	if test -f archive.dir.tar; then \
-	  inputfile=archive.dir.tar; \
+# The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
+archive.cvs.tar.gz: archive.dir.tar.gz
+	if test -f archive.dir.tar.gz; then \
+	  inputfile=archive.dir.tar.gz; \
 	else \
-	  inputfile='$(srcdir)'/archive.dir.tar; \
+	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
 	fi; \
 	./convert-archive dir cvs "$$inputfile" $@
 
diff -Nru gettext-0.19.3/gettext-tools/misc/po-compat.el gettext-0.18.1.1/gettext-tools/misc/po-compat.el
--- gettext-0.19.3/gettext-tools/misc/po-compat.el	2013-01-16 02:06:53.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/po-compat.el	2010-06-06 12:49:57.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; po-compat.el --- basic support of PO translation files -*- coding: latin-1; -*-
 
-;; Copyright (C) 1995-1999, 2000-2002, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
 
 ;; Authors: Fran�ois Pinard <pinard@iro.umontreal.ca>,
 ;;          Greg McGary <gkm@magilla.cichlid.com>,
@@ -20,8 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, see
-;; <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -200,7 +201,6 @@
                 (list (cond ((and try-symbol (coding-system-p try-symbol))
                              try-symbol)
                             ((and po-EMACS20
-                                  (not (string-lessp "23" emacs-version))
                                   (string-match "\\`cp[1-9][0-9][0-9]?\\'"
                                                 try-string)
                                   (assoc (substring try-string 2)
diff -Nru gettext-0.19.3/gettext-tools/misc/po-mode.el gettext-0.18.1.1/gettext-tools/misc/po-mode.el
--- gettext-0.19.3/gettext-tools/misc/po-mode.el	2014-05-12 08:13:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/po-mode.el	2010-06-06 12:49:57.000000000 +0000
@@ -62,7 +62,7 @@
 
 ;;; Code:
 
-(defconst po-mode-version-string "2.22" "\
+(defconst po-mode-version-string "2.2" "\
 Version number of this version of po-mode.el.")
 
 ;;; Emacs portability matters - part I.
@@ -130,13 +130,6 @@
   :type 'boolean
   :group 'po)
 
-(defcustom po-auto-update-file-header t
-  "*Automatically revise headers.  Value is nil, t, or ask."
-  :type '(choice (const nil)
-                 (const t)
-                 (const ask))
-  :group 'po)
-
 (defcustom po-auto-replace-revision-date t
   "*Automatically revise date in headers.  Value is nil, t, or ask."
   :type '(choice (const nil)
@@ -1064,7 +1057,7 @@
     ;;  '("msgctxt " "msgid " "msgid_plural " "msgstr " "msgstr[0] " "msgstr[1] "))
     ("^\\(\\(msg\\(ctxt\\|id\\(_plural\\)?\\|str\\(\\[[0-9]\\]\\)?\\)\\) \\)?\"\\|\"$"
      . font-lock-keyword-face)
-    ("\\\\.\\|%[*$-.0-9ul]*[a-zA-Z]" . font-lock-variable-name-face)
+    ("\\\\.\\|%\\*?[-.0-9ul]*[a-zA-Z]" . font-lock-variable-name-face)
     ("^# .*\\|^#[:,]?" . font-lock-comment-face)
     ("^#:\\(.*\\)" 1 font-lock-reference-face)
     ;; The following line does not work, and I wonder why.
@@ -1363,47 +1356,42 @@
 ;;; Processing the PO file header entry.
 
 (defun po-check-file-header ()
-  "Create a missing PO mode file header, or replace an oldish one.
-Can be customized with the `po-auto-update-file-header' variable."
-  (if (or (eq po-auto-update-file-header t)
-          (and (eq po-auto-update-file-header 'ask)
-               (y-or-n-p (_"May I update the PO Header Entry? "))))
-      (save-excursion
-        (save-restriction
-          (widen) ; in case of a narrowed view to the buffer
-          (let ((buffer-read-only po-read-only)
-                insert-flag end-of-header)
-            (goto-char (point-min))
-            (if (re-search-forward po-any-msgstr-block-regexp nil t)
-                (progn
-                  ;; There is at least one entry.
-                  (goto-char (match-beginning 0))
-                  (forward-line -1)
-                  (setq end-of-header (match-end 0))
-                  (if (looking-at "msgid \"\"\n")
-                      ;; There is indeed a PO file header.
-                      (if (re-search-forward "\n\"PO-Revision-Date: "
-                                             end-of-header t)
-                          nil
-                        ;; This is an oldish header.  Replace it all.
-                        (goto-char end-of-header)
-                        (while (> (point) (point-min))
-                          (forward-line -1)
-                          (insert "#~ ")
-                          (beginning-of-line))
-                        (beginning-of-line)
-                        (setq insert-flag t))
-                    ;; The first entry is not a PO file header, insert one.
-                    (setq insert-flag t)))
-              ;; Not a single entry found.
-              (setq insert-flag t))
-            (goto-char (point-min))
-            (if insert-flag
-                (progn
-                  (insert po-default-file-header)
-                  (if (not (eobp))
-                      (insert "\n")))))))
-    (message (_"PO Header Entry was not updated..."))))
+  "Create a missing PO mode file header, or replace an oldish one."
+  (save-excursion
+    (save-restriction
+      (widen) ; in case of a narrowed view to the buffer
+      (let ((buffer-read-only po-read-only)
+            insert-flag end-of-header)
+        (goto-char (point-min))
+        (if (re-search-forward po-any-msgstr-block-regexp nil t)
+            (progn
+              ;; There is at least one entry.
+              (goto-char (match-beginning 0))
+              (forward-line -1)
+              (setq end-of-header (match-end 0))
+              (if (looking-at "msgid \"\"\n")
+                  ;; There is indeed a PO file header.
+                  (if (re-search-forward "\n\"PO-Revision-Date: "
+                                         end-of-header t)
+                      nil
+                    ;; This is an oldish header.  Replace it all.
+                    (goto-char end-of-header)
+                    (while (> (point) (point-min))
+                      (forward-line -1)
+                      (insert "#~ ")
+                      (beginning-of-line))
+                    (beginning-of-line)
+                    (setq insert-flag t))
+                ;; The first entry is not a PO file header, insert one.
+                (setq insert-flag t)))
+          ;; Not a single entry found.
+          (setq insert-flag t))
+        (goto-char (point-min))
+        (if insert-flag
+            (progn
+              (insert po-default-file-header)
+              (if (not (eobp))
+                  (insert "\n"))))))))
 
 (defun po-replace-revision-date ()
   "Replace the revision date by current time in the PO file header."
@@ -2287,7 +2275,7 @@
   (recursive-edit)
   (pop-to-buffer oldbuf)
   (delete-region (point-min) end)
-  (insert-buffer-substring b2)
+  (insert-buffer b2)
   (mapc 'kill-buffer `(,b1 ,b2))
   (display-buffer entry-buffer t))
 
@@ -3506,10 +3494,10 @@
             (re-search-forward
              (concat "^" (regexp-quote mail-header-separator) "\n"))
             (save-excursion
-              (insert-buffer-substring buffer)
+              (insert-buffer buffer)
               (shell-command-on-region
                (region-beginning) (region-end)
-               (concat po-gzip-uuencode-command " " name ".gz") t t))))))
+               (concat po-gzip-uuencode-command " " name ".gz") t))))))
   (message ""))
 
 (defun po-confirm-and-quit ()
diff -Nru gettext-0.19.3/gettext-tools/misc/start-po.el gettext-0.18.1.1/gettext-tools/misc/start-po.el
--- gettext-0.19.3/gettext-tools/misc/start-po.el	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/misc/start-po.el	2010-06-06 12:49:57.000000000 +0000
@@ -15,8 +15,9 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, see
-;; <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/be.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/be.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/be.po gettext-0.18.1.1/gettext-tools/po/be.po
--- gettext-0.19.3/gettext-tools/po/be.po	2014-10-16 06:10:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/be.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -28,27 +28,28 @@
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргумэнты:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "немагчыма стварыць часовую дырэкторыю,\n"
 "выкарыстоўвываючы ўзор \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -59,38 +60,37 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "памылка чытаньня \"%s\""
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "памылка запісу файла \"%s\""
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "памылка пасля чытаньня \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -108,98 +108,98 @@
 msgstr ""
 "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s падпрацэс спынены з-за памылкі"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "памылка ў час запісу файла \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
@@ -210,96 +210,58 @@
 msgstr ""
 "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "падпрацэс %s, памылка ўводу-вываду"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "памяць вычарпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "памылка запісу ў падпрацэс %s"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "памылка чытаньня з падпрацэса %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+msgid "cannot create pipe"
+msgstr "не магчыма стварыць канвеэр"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "не магчыма стварыць канвеэр"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "немагчыма стварыць файл вываду \"%s\""
@@ -315,20 +277,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "памылка ў час чытаньня файла \"%s\""
-
-#: src/format.c:151
+#: src/format.c:148
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -337,19 +292,17 @@
 msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
@@ -359,26 +312,24 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
@@ -464,16 +415,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -596,7 +537,6 @@
 "%u parameters."
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
@@ -658,9 +598,7 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
@@ -680,8 +618,7 @@
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr ""
-"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
+msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
 #: src/format-python.c:437
 #, fuzzy, c-format
@@ -703,32 +640,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -770,11 +681,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -783,58 +694,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Аўтар %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "вельмі шмат аргумэнтаў"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Друкуе назву вузла.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, fuzzy, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -847,34 +758,34 @@
 "                        назву маёнтка й прозьвішчы\n"
 "  -i, --ip-address      адрас для вузла\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -886,41 +797,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s і %s узаема выключны"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -929,40 +842,40 @@
 "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
 "узьдзейнічае на іх\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, fuzzy, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
@@ -970,24 +883,24 @@
 "  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, fuzzy, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -998,145 +911,132 @@
 "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
 "зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1145,119 +1045,133 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, c-format
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
+"Дэталі вываду:\n"
+"  -e, --no-escape          не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+"                           вывадзе (звычайна)\n"
+"  -E, --escape             выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
+"                           без дадатковых сімвалаў\n"
+"      --force-po           запісваць PO-файл, нават калі ён пусты\n"
+"  -i, --indent             запісваць .po файл, выкарыстоўвываючы водступы\n"
+"      --strict             запісваць .po файл, жорстка адпавядаючы\n"
+"                           пагадненьню Uniforum\n"
+"  -w, --width=ШЫРЫНЯ       усталёўваць шырыню вывадзімай старонкі\n"
+"      --no-wrap            не разьбіваць доўгія радкі з паведамлеьнямі,\n"
+"\n"
+"                           даўжэй чым шырыня, на некалькі радкоў\n"
+"  -s, --sort-output        ствараць упарадкаваны вывад\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1265,9 +1179,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Злучае й аб'ядноўвае зададзеныя PO-файлы.\n"
 "Шукае паведамленьніе якія вызначаны ў двух ці больш PO-файлах.\n"
@@ -1280,92 +1194,92 @@
 "будуць узяты  з першага PO-файла.\n"
 "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "не зададзены ўводзячыя файлы"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "патрабуецца менавіта 2 уводзячых файла"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
@@ -1398,12 +1312,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, fuzzy, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1413,15 +1327,18 @@
 "  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 
 #: src/msgcmp.c:245
-#, c-format
+#, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
 #: src/msgcmp.c:247
 #, c-format
@@ -1438,17 +1355,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...але гэта вызначэньне падобна"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
@@ -1458,7 +1375,7 @@
 msgid "warning: this message is not used"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1466,20 +1383,20 @@
 msgstr[1] "знойдзена %d фатальныя памылкі"
 msgstr[2] "знойдзена %d фатальных памылак"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "неабходна задаць не менш двух файлаў"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1492,30 +1409,30 @@
 "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
 "вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, fuzzy, c-format
 msgid "Conversion target:\n"
 msgstr "памылка пераўтварэньня"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, fuzzy, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
@@ -1523,46 +1440,46 @@
 "  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
 "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "патрабуецца менавіта адзін уваходзячы файл"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1575,7 +1492,7 @@
 "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
 "пазначаюцца як недакладныя (fuzzy).\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1613,7 +1530,7 @@
 "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
 "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1623,27 +1540,32 @@
 msgid "write to stdout failed"
 msgstr "памылка запісу ў stdout"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "памылка запісу ў падпрацэс %s"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "прапушчана назва фільтра"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1653,18 +1575,18 @@
 "ўводу\n"
 "й запісвае зьмененыя пераклады ў стандартны вывад.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1672,94 +1594,73 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s і %s узаема выключны"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1767,7 +1668,7 @@
 msgstr[1] "%d паведамленьні перакладзена"
 msgstr[2] "%d паведамленьняў перакладзена"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1781,7 +1682,7 @@
 ",\n"
 "%d недакладных перакладаў"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1795,17 +1696,17 @@
 ",\n"
 "%d неперакладзеных паведамленьняў"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1814,101 +1715,97 @@
 "Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
 "і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
-#, c-format
+#: src/msgfmt.c:679
+#, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:805
-#, c-format
+#: src/msgfmt.c:681
+#, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
-#, c-format
+#: src/msgfmt.c:685
+#, fuzzy, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1926,78 +1823,48 @@
 "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
 "зададзеную дырэкторыю.\n"
 
-#: src/msgfmt.c:839
-#, c-format
+#: src/msgfmt.c:711
+#, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
-msgstr ""
+msgstr "невызначан уваходзячы файл"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2005,33 +1872,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2039,12 +1906,12 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2054,16 +1921,7 @@
 "%d)\n"
 "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2073,91 +1931,80 @@
 "%d)\n"
 "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
 "будзе выкарыстаны прэфікс"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "дырэктыва `domain %s' ігнаруецца"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў час чытаньня \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2165,14 +2012,14 @@
 msgstr ""
 "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2212,30 +2059,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2246,12 +2093,12 @@
 "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
 "ці .po файл вываду з дапамогай выбару --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створан %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2260,43 +2107,50 @@
 "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
 "карыстальніка.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
-#, c-format
+#: src/msginit.c:379
+#, fuzzy, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
+"Файл уводу:\n"
+"  ФАЙЛ ...                 .mo файлы\n"
+"Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
-#, c-format
+#: src/msginit.c:387
+#, fuzzy, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
+"Файл вываду:\n"
+"  -o, --output-file=ФАЙЛ      запісвае вывад у зададзены файл\n"
+"      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
+"Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2304,12 +2158,12 @@
 "Знойдзен больш чым адзін .pot файл.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "памылка чытаньня бягучай дырэкторыі"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2317,14 +2171,14 @@
 "Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
-#, c-format
+#, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr ""
+msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2336,7 +2190,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Беларускі пераклад для %s"
@@ -2352,9 +2206,9 @@
 msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
@@ -2362,7 +2216,7 @@
 #: src/msgl-cat.c:207
 #, fuzzy, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
@@ -2374,8 +2228,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "увага: "
@@ -2475,110 +2329,117 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "нерэчаіснае значэньне nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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 форму множнага ліку"
+msgstr[0] ""
+"...але некаторыя паведамленьні маюць толькі адну форму множнага ліку"
 msgstr[1] "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
 msgstr[2] ""
 "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
+msgstr[0] "...але некаторыя паведамленьні маюць адну форму множнага ліку"
 msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
 msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
+#, fuzzy
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr ""
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
 msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2594,13 +2455,15 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
-#, c-format
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
+#, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
+"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
+"але iconv() не падтрымлівае \"%s\".\n"
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2609,25 +2472,27 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
-#, c-format
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
+#, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
+"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
+"Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s рэчаісны толькі з %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
-#, c-format, no-wrap
+#: src/msgmerge.c:485
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -2639,52 +2504,59 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
+"Параўноўвае два Uniforum .po файла, каб удакладніць, што абодва зьмяшчаюць\n"
+"аднолькавыя мноствы радкоў msgid.  Файл def.po - гэта існуючы PO файл зь\n"
+"перакладамі.  Файл ref.po - гэта апошні створаны PO файл, ці PO шаблён\n"
+"(звычайна створаны праграмай xgettext).  Гэта карысна для праверкі, што ў\n"
+"вас перакладзена кожнае паведамленьне з вашае праграмы.  Там, дзе дакладнае\n"
+"супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
+"лепшай праверкі.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2696,36 +2568,39 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
-#, c-format
+#: src/msgmerge.c:552
+#, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2734,7 +2609,7 @@
 "%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
 "прапушчана %ld, састарэлых %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2766,16 +2641,22 @@
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
 #: src/msgunfmt.c:442
-#, c-format
+#, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
-
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
+
 #: src/msgunfmt.c:444
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
 #: src/msgunfmt.c:446
 #, fuzzy, c-format
@@ -2797,17 +2678,26 @@
 msgstr ""
 
 #: src/msgunfmt.c:462
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
+"Файл вываду ў рэжыме Java:\n"
+"  -r, --resource=СРОДАК       назва сродка\n"
+"  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
+"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя гіэрархіі дырэкторый "
+"клясаў\n"
+"Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы "
+"сродка\n"
+"абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
+"зададзеную дырэкторыю.\n"
 
 #: src/msgunfmt.c:467
-#, c-format
+#, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
-msgstr ""
+msgstr "невызначан уваходзячы файл"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -2838,7 +2728,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2851,12 +2741,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, fuzzy, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2880,7 +2770,7 @@
 "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
 "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2889,7 +2779,7 @@
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2897,15 +2787,15 @@
 "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
 "павінна выправіць гэту праблему.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Працяг выкананьня..."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2914,7 +2804,7 @@
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2928,27 +2818,27 @@
 msgid "inconsistent use of #~"
 msgstr "несумяшчальнае ўжываньне #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "прапушчана секцыя \"msgstr[]\""
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "прапушчана секцыя \"msgid_plural\""
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "прапушчана секцыя \"msgstr\""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "першая форма ліку мае ненулявы індэкс"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "формы множнага ліку маюць дрэнныі індэкс"
@@ -2958,7 +2848,7 @@
 msgid "too many errors, aborting"
 msgstr "вельмі шмат памылак..."
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "нерэчаісная шматсімвальная паслядоўнасць"
@@ -3002,16 +2892,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "двайное вызначэньне паведамленьня"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...гэта месцазнаходжаньне першага вызначэньня"
@@ -3037,8 +2927,9 @@
 msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
+msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
 #: src/read-stringtable.c:802
 #, fuzzy
@@ -3048,7 +2939,7 @@
 #: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
-msgstr "увага: "
+msgstr "%s: увага: "
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
@@ -3056,12 +2947,14 @@
 msgstr "%s:%d: увага: незавершаны радок"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr ""
+msgstr "%s:%d: увага: незавершаны радок"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
+msgstr "%s:%d: увага: незавершаны радок"
 
 #: src/recode-sr-latin.c:116
 #, fuzzy, c-format
@@ -3088,12 +2981,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "памылка ў час чытаньня файла \"%s\""
@@ -3115,21 +3008,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "памылка чытаньня \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "памылка запісу ў stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "памылка пасля чытаньня \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3158,10 +3041,11 @@
 msgstr ""
 
 #: src/write-catalog.c:162
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
-msgstr ""
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3201,21 +3085,23 @@
 #: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+msgstr ""
+"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
+"ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "нерэчаісная назва Java-класа: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3227,19 +3113,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "нерэчаісная шматсімвальная паслядоўнасць"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3253,7 +3134,7 @@
 "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3294,22 +3175,25 @@
 msgstr "памылка ў час запісу файла \"%s\""
 
 #: src/write-resources.c:131
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
-msgstr ""
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
 #: src/write-resources.c:150
+#, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
-msgstr ""
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
 #: src/write-tcl.c:157
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
-msgstr ""
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
 #: src/write-tcl.c:176
 msgid ""
@@ -3317,7 +3201,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: увага: незавершаны радок"
@@ -3327,22 +3211,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3374,7 +3253,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "памылка iconv"
@@ -3386,7 +3265,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
@@ -3394,7 +3273,7 @@
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
+msgstr "%s:%d: увага: незавершаны радок"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
@@ -3406,22 +3285,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3435,60 +3304,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: увага: незавершаны радок"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3524,13 +3339,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3538,7 +3353,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3546,7 +3361,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3554,7 +3369,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3562,7 +3377,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3570,7 +3385,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3597,60 +3412,50 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3659,45 +3464,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3707,37 +3511,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3745,85 +3545,93 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
-#, c-format
+#: src/xgettext.c:911
+#, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:962
-#, c-format
+#: src/xgettext.c:919
+#, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3831,7 +3639,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3839,52 +3647,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: увага: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
-#, c-format
+#: src/xgettext.c:2104
+#, fuzzy, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
-msgstr ""
+msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3893,7 +3701,7 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3903,37 +3711,37 @@
 "gettext(\"\") вяртае загаловак зь\n"
 "метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:3006
-#, c-format
+#: src/xgettext.c:2861
+#, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
+msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:3031
-#, c-format
+#: src/xgettext.c:2886
+#, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
+msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "невядомая мова `%s'"
 
 #: libgettextpo/gettext-po.c:84
@@ -3943,6 +3751,25 @@
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: несапраўдны выбар -- %c\n"
 
+#, fuzzy
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "памылка чытаньня з падпрацэса %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -3955,64 +3782,33 @@
 #~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
 #~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
 
-#~ msgid "missing arguments"
-#~ msgstr "прапушчаны аргумэнты"
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
-#~ "or:    %s [OPTION] -s [MSGID]...\n"
-#~ msgstr ""
-#~ "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
-#~ "        ці:    %s [ВЫБАР] -s [MSGID]...\n"
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#~ msgid "Display native language translation of a textual message.\n"
-#~ msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
+#~ msgid "%s: warning: "
+#~ msgstr "%s: увага: "
 
-#~ msgid ""
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-#~ "  -e                        enable expansion of some escape sequences\n"
-#~ "  -E                        (ignored for compatibility)\n"
-#~ "  -h, --help                display this help and exit\n"
-#~ "  -n                        suppress trailing newline\n"
-#~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-#~ "                            to MSGID from TEXTDOMAIN\n"
-#~ msgstr ""
-#~ "  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з "
-#~ "TEXTDOMAIN\n"
-#~ "  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
-#~ "  -E                        (ігнаруецца для сумяшчальнасьці)\n"
-#~ "  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
-#~ "  -n                        стрымлівае цягнучыеся новыя радкі\n"
-#~ "  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
-#~ "  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
-#~ "                            MSGID з TEXTDOMAIN\n"
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
 
-#~ 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"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' "
-#~ "command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those "
-#~ "messages\n"
-#~ "found in the selected catalog are translated.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "Калі параметар TEXTDOMAIN не зададзен, маёнтак вызначаецца з пераменнай\n"
-#~ "асяроддзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у "
-#~ "звычайнай\n"
-#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-#~ "асяроддзя TEXTDOMAINDIR.\n"
-#~ "Калі выкарыстоўвываецца разам з выбарам -s, праграма паводзіць сабе як\n"
-#~ "каманда `echo', але яна ня проста капіруе свае аргумэнты ў stdout, яна\n"
-#~ "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу "
-#~ "перакладзеныя.\n"
-#~ "Стандартная дырэкторыя для пошуку: %s\n"
+#, fuzzy
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%d: увага: незавершаны радок"
+
+#~ msgid "conversion failure"
+#~ msgstr "памылка пераўтварэньня"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "памылка запісу ў падпрацэс grep"
 
 #~ msgid ""
 #~ "Input file location:\n"
@@ -4030,35 +3826,27 @@
 #~ "ўвод.\n"
 
 #~ msgid ""
-#~ "Message selection:\n"
-#~ "      --translated            keep translated, remove untranslated "
-#~ "messages\n"
-#~ "      --untranslated          keep untranslated, remove translated "
-#~ "messages\n"
-#~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-#~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-#~ "      --no-obsolete           remove obsolete #~ messages\n"
-#~ "      --only-obsolete         keep obsolete #~ messages\n"
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
+#~ "or if it is -.\n"
 #~ msgstr ""
-#~ "Выбар паведамленьня:\n"
-#~ "      --translated            пакідае перакладзеныя, прымае "
-#~ "неперакладзеныя\n"
-#~ "                              паведамленьні\n"
-#~ "      --untranslated          пакідае неперакладзеныя, прымае "
-#~ "перакладзеныя\n"
-#~ "                              паведамленьні\n"
-#~ "      --no-fuzzy              прымае паведамленьні, азначаныя як 'fuzzy'\n"
-#~ "      --only-fuzzy            пакідае паведамленьні, азначаныя як "
-#~ "'fuzzy'\n"
-#~ "      --no-obsolete           прымае састарэлыя #~ паведамленьні\n"
-#~ "      --only-obsolete         пакіде састарэлыя #~ паведамленьні\n"
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ      запісваць вывад у зададзены файл\n"
+#~ "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
+#~ "зададзена, ці замест яго -.\n"
 
+#, fuzzy
 #~ msgid ""
 #~ "Attribute manipulation:\n"
 #~ "      --set-fuzzy             set all messages 'fuzzy'\n"
 #~ "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 #~ "      --set-obsolete          set all messages obsolete\n"
 #~ "      --clear-obsolete        set all messages non-obsolete\n"
+#~ "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+#~ "      --ignore-file=FILE.po   manipulate only entries not listed in FILE."
+#~ "po\n"
 #~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 #~ "      --obsolete              synonym for --only-obsolete --clear-"
 #~ "obsolete\n"
@@ -4074,61 +3862,6 @@
 #~ "obsolete\n"
 
 #~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "  -i, --indent                write the .po file using indented style\n"
-#~ "      --no-location           do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location          generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer "
-#~ "than\n"
-#~ "                              the output page width, into several lines\n"
-#~ "  -s, --sort-output           generate sorted output\n"
-#~ "  -F, --sort-by-file          sort output by file location\n"
-#~ msgstr ""
-#~ "Дэталі вываду:\n"
-#~ "  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-#~ "                              вывадзе (звычайна)\n"
-#~ "  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў "
-#~ "вывадзе;\n"
-#~ "                              без дадатковых сімвалаў\n"
-#~ "      --force-po              запісваць PO-файл, нават калі ён пусты\n"
-#~ "  -i, --indent                запісваць .po файл, выкарыстоўвываючы "
-#~ "водступы\n"
-#~ "      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
-#~ "  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі "
-#~ "(гэты\n"
-#~ "                              выбар выкарыстоўваецца паўмаўчаньню)\n"
-#~ "      --strict                запісваць .po файл, жорстка адпавядаючы\n"
-#~ "                              пагадненьню Uniforum\n"
-#~ "  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
-#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
-#~ "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню "
-#~ "файла\n"
-
-#~ msgid ""
-#~ "Input file location:\n"
-#~ "  INPUTFILE ...                  input files\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "If input file is -, standard input is read.\n"
-#~ msgstr ""
-#~ "Файл уводу:\n"
-#~ "  УВАХОДЗЯЧЫ_ФАЙЛ ...            уваходзячыя файлы\n"
-#~ "  -f, --files-from=ФАЙЛ          атрымліваць сьпіс уваходзячый файлаў з "
-#~ "ФАЙЛА\n"
-#~ "  -D, --directory=ДЫРЭКТОРЫЯ     дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку "
-#~ "ўваходзячых\n"
-#~ "                                 файлаў\n"
-#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
-
-#~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE         write output to specified file\n"
 #~ "The results are written to standard output if no output file is "
@@ -4141,76 +3874,6 @@
 #~ "замест яго -.\n"
 
 #~ msgid ""
-#~ "Message selection:\n"
-#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if "
-#~ "not\n"
-#~ "                                 set\n"
-#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
-#~ "                                 definitions, defaults to 0 if not set\n"
-#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
-#~ "                                 that only unique messages be printed\n"
-#~ msgstr ""
-#~ "Выбар паведамленьняў:\n"
-#~ "  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць "
-#~ "меньш\n"
-#~ "                                 вызначэньняў, чым зададзена; звычайна "
-#~ "не\n"
-#~ "                                 абмежавана\n"
-#~ "  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць "
-#~ "больш\n"
-#~ "                                 вызначэньняў, чым зададзена; звычайна 0\n"
-#~ "  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
-#~ "                                 непаўторныя паведамленьні будуць "
-#~ "надрукаваны\n"
-
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for "
-#~ "each\n"
-#~ "                                 message, don't merge several "
-#~ "translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer "
-#~ "than\n"
-#~ "                                 the output page width, into several "
-#~ "lines\n"
-#~ "  -s, --sort-output              generate sorted output\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ msgstr ""
-#~ "Дэталі вываду:\n"
-#~ "  -e, --no-escape                не выкарыстоўваць ESC-пасьлядоўнасьці ў\n"
-#~ "                                 вывадзе (звычайна)\n"
-#~ "  -E, --escape                   выкарыстоўваць ESC пасьлядоўнасьці ў "
-#~ "вывадзе,\n"
-#~ "                                 без дадатковых сімвалаў\n"
-#~ "      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
-#~ "  -i, --indent                   запісваць .po файл, выкарыстоўвываючы "
-#~ "водступы\n"
-#~ "      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
-#~ "  -n, --add-location             ствараць радкі '#: імя_файла:радок' "
-#~ "радкі (гэты\n"
-#~ "                                 выбар выкарыстоўваецца паўмаўчаньню)\n"
-#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-#~ "                                 пагадненьню Uniforum\n"
-#~ "  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
-#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
-#~ "  -F, --sort-by-file             упарадкоўваць вывад па месцазнаходжаньню "
-#~ "файла\n"
-
-#~ msgid ""
 #~ "Informative output:\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -V, --version                  output version information and exit\n"
@@ -4234,115 +3897,6 @@
 #~ "ўводу\n"
 
 #~ msgid ""
-#~ "Message selection:\n"
-#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if "
-#~ "not\n"
-#~ "                                 set\n"
-#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
-#~ "                                 definitions, defaults to 1 if not set\n"
-#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
-#~ "                                 that only unique messages be printed\n"
-#~ msgstr ""
-#~ "Выбар паведамленьняў:\n"
-#~ "  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць "
-#~ "меньш\n"
-#~ "                                 вызначэньняў, чым зададзена; звычайна "
-#~ "не\n"
-#~ "                                 абмежавана\n"
-#~ "  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць "
-#~ "больш\n"
-#~ "                                 вызначэньняў, чым зададзена; звычайна 1\n"
-#~ "  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
-#~ "                                 непаўторныя паведамленьні будуць "
-#~ "надрукаваны\n"
-
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer "
-#~ "than\n"
-#~ "                                 the output page width, into several "
-#~ "lines\n"
-#~ "  -s, --sort-output              generate sorted output\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ msgstr ""
-#~ "Падрабязнасьці вываду:n  -e, --no-escape                не выкарыстоўваць "
-#~ "Сі ESC-пасьлядоўнасьці ў\n"
-#~ "                                 вывадзе (звычайна)\n"
-#~ "  -E, --escape                   выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-#~ "                                 вывадзе замест дадатковых сымбаляў\n"
-#~ "      --force-po                 запісваць PO файл, нават калі ён "
-#~ "парожні\n"
-#~ "  -i, --indent                   запісваць .po f файл з водступамі\n"
-#~ "      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
-#~ "  -n, --add-location             ствараць радкі '#: імя_файла:радок' "
-#~ "радкі\n"
-#~ "                                 (гэты выбар выкарыстоўваецца "
-#~ "неабумоўленым)\n"
-#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-#~ "                                 пагадненьню Uniforum\n"
-#~ "  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
-#~ "      --no-wrap                  не разьбіваць радкі доўгіх "
-#~ "паведамленьняў,\n"
-#~ "                                 даўжэйшыя за шырыню старонкі вываду, на\n"
-#~ "                                 некалькі радкоў\n"
-#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
-#~ "  -F, --sort-by-file             упарадкоўваць вывад па шляху да файлу\n"
-#~ "      --omit-header              не запісваць загаловак з `msgid \"\"' "
-#~ "запісам\n"
-
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "  -i, --indent                indented output style\n"
-#~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                strict Uniforum output style\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer "
-#~ "than\n"
-#~ "                              the output page width, into several lines\n"
-#~ "  -s, --sort-output           generate sorted output\n"
-#~ "  -F, --sort-by-file          sort output by file location\n"
-#~ msgstr ""
-#~ "Дэталі вываду:\n"
-#~ "  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-#~ "                              вывадзе (звычайна)\n"
-#~ "  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў "
-#~ "вывадзе,\n"
-#~ "                              без дадатковых сімвалаў\n"
-#~ "      --force-po              запісваць PO-файл, нават калі ён пусты\n"
-#~ "  -i, --indent                запісваць .po файл, выкарыстоўвываючы "
-#~ "водступы\n"
-#~ "      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
-#~ "  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі "
-#~ "(гэты\n"
-#~ "                              выбар выкарыстоўваецца паўмаўчаньню)\n"
-#~ "      --strict                запісваць .po файл, жорстка адпавядаючы\n"
-#~ "                              пагадненьню Uniforum\n"
-#~ "  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
-#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
-#~ "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню "
-#~ "файла\n"
-
-#~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO or POT file\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -4425,20 +3979,6 @@
 #~ "  -F, --sort-by-file          упарадкоўваць вывад па назьве файла\n"
 
 #~ msgid ""
-#~ "Input file location:\n"
-#~ "  filename.po ...             input files\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "If input file is -, standard input is read.\n"
-#~ msgstr ""
-#~ "Файл уводу:\n"
-#~ "  файл.po ...                 файл уводу\n"
-#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку "
-#~ "ўваходзячых\n"
-#~ "                              файлаў\n"
-#~ "Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n"
-
-#~ msgid ""
 #~ "Operation mode:\n"
 #~ "  -j, --java                  Java mode: generate a Java ResourceBundle "
 #~ "class\n"
@@ -4481,62 +4021,16 @@
 #~ "Выбары -l і -d абавязковыя.  Файл .msg запісваецца ў зададзеную "
 #~ "дырэкторыю.\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "Input file interpretation:\n"
-#~ "  -c, --check                 perform all the checks implied by\n"
-#~ "                                --check-format, --check-header, --check-"
-#~ "domain\n"
-#~ "      --check-format          check language dependent format strings\n"
-#~ "      --check-header          verify presence and contents of the header "
-#~ "entry\n"
-#~ "      --check-domain          check for conflicts between domain "
-#~ "directives\n"
-#~ "                                and the --output-file option\n"
-#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
-#~ "msgfmt\n"
-#~ "      --check-accelerators[=CHAR]  check presence of keyboard "
-#~ "accelerators for\n"
-#~ "                                menu items\n"
-#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
-#~ msgstr ""
-#~ "Успрыняцьце файла ўводу:\n"
-#~ "  -c, --check                 perform all the checks implied by\n"
-#~ "                                --check-format, --check-header, --check-"
-#~ "domain\n"
-#~ "      --check-format          check language dependent format strings\n"
-#~ "      --check-header          verify presence and contents of the header "
-#~ "entry\n"
-#~ "      --check-domain          check for conflicts between domain "
-#~ "directives\n"
-#~ "                                and the --output-file option\n"
-#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
-#~ "msgfmt\n"
-#~ "      --check-accelerators[=CHAR]  check presence of keyboard "
-#~ "accelerators for\n"
-#~ "                                menu items\n"
-#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
-
-#~ msgid ""
-#~ "Informative output:\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "      --statistics            print statistics about translations\n"
-#~ "  -v, --verbose               increase verbosity level\n"
+#~ "Operation modifiers:\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#~ "po\n"
+#~ "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 #~ msgstr ""
-#~ "Інфармацыйны вывад:\n"
-#~ "  -h, --help                  адлюстроўвае гэтую дапамогу й выходзіць\n"
-#~ "  -V, --version               выводзіць зьвесткі аб вэрсіі й выходзіць\n"
-#~ "      --statistics            друкуе статыстыку аб перакладах\n"
-#~ "  -v, --verbose               павялічвае ўзровень шматслоўнасьці\n"
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "памылка запісу ў падпрацэс grep"
+#~ "Зьмяняльнікі:\n"
+#~ "  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def."
+#~ "po\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -4552,35 +4046,6 @@
 #~ "  -q, --quiet, --silent       забараняць паказальнікі дасягненьняў\n"
 
 #~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
-#~ "  -E, --escape             use C escapes in output, no extended chars\n"
-#~ "      --force-po           write PO file even if empty\n"
-#~ "  -i, --indent             write indented output style\n"
-#~ "      --strict             write strict uniforum style\n"
-#~ "  -w, --width=NUMBER       set output page width\n"
-#~ "      --no-wrap            do not break long message lines, longer than\n"
-#~ "                           the output page width, into several lines\n"
-#~ "  -s, --sort-output        generate sorted output\n"
-#~ msgstr ""
-#~ "Дэталі вываду:\n"
-#~ "  -e, --no-escape          не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-#~ "                           вывадзе (звычайна)\n"
-#~ "  -E, --escape             выкарыстоўваць Сі ESC пасьлядоўнасьці ў "
-#~ "вывадзе,\n"
-#~ "                           без дадатковых сімвалаў\n"
-#~ "      --force-po           запісваць PO-файл, нават калі ён пусты\n"
-#~ "  -i, --indent             запісваць .po файл, выкарыстоўвываючы "
-#~ "водступы\n"
-#~ "      --strict             запісваць .po файл, жорстка адпавядаючы\n"
-#~ "                           пагадненьню Uniforum\n"
-#~ "  -w, --width=ШЫРЫНЯ       усталёўваць шырыню вывадзімай старонкі\n"
-#~ "      --no-wrap            не разьбіваць доўгія радкі з паведамлеьнямі,\n"
-#~ "\n"
-#~ "                           даўжэй чым шырыня, на некалькі радкоў\n"
-#~ "  -s, --sort-output        ствараць упарадкаваны вывад\n"
-
-#~ msgid ""
 #~ "Informative output:\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -V, --version            output version information and exit\n"
@@ -4591,36 +4056,21 @@
 #~ "  -V, --version            выводзіць зьвесткі аб версіі й выходзіць\n"
 #~ "  -v, --verbose            павялічыць узровень шматслоўнасьці\n"
 
-#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-
-#~ msgid ""
-#~ "Display native language translation of a textual message whose "
-#~ "grammatical\n"
-#~ "form depends on a number.\n"
-#~ msgstr ""
-#~ "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
-#~ "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
-
+#, fuzzy
 #~ 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"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "Standard search directory: %s\n"
+#~ "Output file location:\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "If output file is -, output is written to standard output.\n"
 #~ msgstr ""
-#~ "Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
-#~ "асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у "
-#~ "звычайнай\n"
-#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-#~ "асяроддзя TEXTDOMAINDIR.\n"
-#~ "Стандартная дырэкторыя для пошуку: %s\n"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ      запісвае вывад у зададзены файл\n"
+#~ "      --strict                уключае рэжым жорсткага адпавяданьня "
+#~ "Uniforum\n"
+#~ "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
 
 #~ msgid ""
 #~ "Language=C/C++ specific options:\n"
@@ -4669,6 +4119,8 @@
 #~ "      --copyright-holder=STRING  set copyright holder in output\n"
 #~ "      --foreign-user             omit FSF copyright in output for foreign "
 #~ "user\n"
+#~ "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid "
+#~ "bugs\n"
 #~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
 #~ "entries\n"
 #~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
@@ -4703,3 +4155,90 @@
 #~ "entries\n"
 #~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
 #~ "entries\n"
+
+#~ msgid "missing arguments"
+#~ msgstr "прапушчаны аргумэнты"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+#~ "or:    %s [OPTION] -s [MSGID]...\n"
+#~ msgstr ""
+#~ "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
+#~ "        ці:    %s [ВЫБАР] -s [MSGID]...\n"
+
+#~ msgid "Display native language translation of a textual message.\n"
+#~ msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
+
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з "
+#~ "TEXTDOMAIN\n"
+#~ "  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
+#~ "  -E                        (ігнаруецца для сумяшчальнасьці)\n"
+#~ "  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
+#~ "  -n                        стрымлівае цягнучыеся новыя радкі\n"
+#~ "  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
+#~ "  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
+#~ "                            MSGID з TEXTDOMAIN\n"
+
+#~ 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"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Калі параметар TEXTDOMAIN не зададзен, маёнтак вызначаецца з пераменнай\n"
+#~ "асяроддзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у "
+#~ "звычайнай\n"
+#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+#~ "асяроддзя TEXTDOMAINDIR.\n"
+#~ "Калі выкарыстоўвываецца разам з выбарам -s, праграма паводзіць сабе як\n"
+#~ "каманда `echo', але яна ня проста капіруе свае аргумэнты ў stdout, яна\n"
+#~ "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу "
+#~ "перакладзеныя.\n"
+#~ "Стандартная дырэкторыя для пошуку: %s\n"
+
+#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+
+#~ msgid ""
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
+#~ "form depends on a number.\n"
+#~ msgstr ""
+#~ "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
+#~ "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
+
+#~ 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"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
+#~ "асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у "
+#~ "звычайнай\n"
+#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+#~ "асяроддзя TEXTDOMAINDIR.\n"
+#~ "Стандартная дырэкторыя для пошуку: %s\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/bg.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/bg.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/bg.po gettext-0.18.1.1/gettext-tools/po/bg.po
--- gettext-0.19.3/gettext-tools/po/bg.po	2014-10-16 06:04:19.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/bg.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,16 +1,16 @@
 # 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.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 14:09+0300\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-11 11:46+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,26 +28,27 @@
 msgstr "двусмислен аргумент %s за %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Правилни аргументи са:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "не можа да се намери временна директория, да се опита с задаване на $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "не можа да се създаде временна директория използвайки за пример \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "не можа да се изтрие временен файл %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "не можа да се изтрие временна директория %s"
@@ -56,151 +57,150 @@
 msgid "write error"
 msgstr "грешка при запис"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "запазване на правата върху %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "грешка при отваряне за четене на %s"
+msgid "error while opening \"%s\" for reading"
+msgstr "грешка при отваряне за четене на \"%s\""
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "не можа да се отвори за запис резервно копие %s"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "не можа да се отвори за запис резервно копие \"%s\""
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "грешка при четене от %s"
+msgid "error reading \"%s\""
+msgstr "грешка при четене \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "грешка при записване в %s"
+msgid "error writing \"%s\""
+msgstr "грешка при записване \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "грешка след прочитане на %s"
+msgid "error after reading \"%s\""
+msgstr "грешка след прочитане на \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
-msgstr "fdopen() пропадна"
+msgstr "fdopen() не успя"
 
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "не е намерен компилатор за C#, да се опита при инсталиран pnet"
+msgstr "не е намерен C# компилатор, да се опита при инсталиран pnet"
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "не е намерена виртуална машина за C#, да се опита при инсталиран pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "пропадна подпроцес %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмислена опция '%s', възможности:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: двусмислена опция '%s'\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опцията '--%s' е без аргументи\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опцията '%c%s' е без аргументи\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опцията '--%s' изисква аргумент\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: неразпозната опция '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: неразпозната опция '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправилна опция -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: двусмислена опция '-W %s'\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опцията '-W %s' е без аргументи\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: опцията '-W %s' изисква аргумент\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "неправилен аргумент за \"версия на източник\"за compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "неправилен аргумент за \"версия на резултат\" за compile_java_class"
+msgstr "неправлен аргумент за \"версия на резултат\" за compile_java_class"
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "пропадна създаването на \"%s\""
+msgstr "не успя създаването на \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "грешка при записване на файл \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"не е намерен компилатор за Java, да се опита с инсталиран gcj или със "
-"задаване на $JAVAC"
+"не е намерен Java компилатор, да се опита с инсталиран gcj или със задаване "
+"на $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
@@ -209,99 +209,61 @@
 "не е намерена виртуална машина за Java, да се опита с инсталиран gcj или със "
 "задаване на $JAVAC"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s В/И грешка при подпроцес"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr "пропадна създаването на клас нишки(threads)"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "write to %s subprocess failed"
-msgstr "пропадна записването към подпроцес %s "
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "пропадна четенето от подпроцес %s "
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "не може да се зададе неблокиран В/И към подпроцес %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "пропадна връзката с подпроцес %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "подпроцесът %s приключи с код за изход %d"
+msgid "cannot create pipe"
+msgstr "не можа да се създаде канал"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "“"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "не можа да се създаде канал"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle пропадна"
+msgstr "_open_osfhandle не успя"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "не можа да се възстанови описанието на файл %d, dup2 пропадна"
+msgstr "не можа да се възстанови описание на файл %d, dup2 не успя"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -312,43 +274,34 @@
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "подпроцес %s получи пагубен сигнал %d"
-
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "грешка при отваряне за четене на \"%s\""
+msgstr "подпроцес %s получи смъртоносен сигнал %d"
 
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' е неправилен %s форматиращ низ, за разлика от '%s'. Причина: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "указаният формат за аргумент %u, както е в '%s', не съществува за '%s'"
+msgstr "указания формат за аргумент %u, както е в '%s', не съществува за '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "указаният формат за аргумент %u не съществува за '%s'"
+msgstr "указания формат за аргумент %u не съществува за '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "не са еднакви указаните формати при '%s' и при '%s' за аргумент %u"
@@ -358,28 +311,26 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Директива номер %u започва с |, но не завършва с |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 "При директива номер %u, частта след '<' не е име на форматиращ макрос. "
-"Правилните имена на макроси са изброени в ИСО Си 99 дял 7.8.1."
+"Правилните имена на макроси са изброени в ИСО Си 99 секция 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "В директива номер %u, частта след '<' не е завършена с '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Низът указва към аргумент номер %u, но пренебрегва аргумент номер  %u."
+msgstr "Низа указва към аргумент номер %u, но пренебрегва аргумент номер  %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не съвпада указания брой на формати при '%s' и при '%s'"
@@ -467,16 +418,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s' не използва %%m, а '%s' използва %%m"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' използва %%C, но '%s' не"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' не използва %%C, но '%s' използва %%C"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Низът завършва в средата на директива."
@@ -486,8 +427,8 @@
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"Низът указва аргументи и чрез номер на аргумент, и чрез неномерирано "
-"задаване на аргумент."
+"Низа указва аргументи и чрез номер на аргумент, и чрез неномерирано задаване "
+"на аргумент."
 
 #: src/format-invalid.h:28
 #, c-format
@@ -531,7 +472,7 @@
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Низът указва към аргумент с номер %u по несъвместим начин."
+msgstr "Низа указва към аргумент номер %u по несъвместим начин."
 
 #: src/format-java.c:240
 #, c-format
@@ -579,12 +520,12 @@
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"указаният формат за аргумент {%u}, както е при '%s', не съществува в '%s'"
+"указания формат за аргумент {%u}, както е при '%s', не съществува в '%s'"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "указаният формат за аргумент {%u} не съществува в '%s'"
+msgstr "указания формат за аргумент {%u} не съществува в '%s'"
 
 #: src/format-java.c:776
 #, c-format
@@ -659,7 +600,7 @@
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Низът указва към някои аргументи по несъвместими начини."
+msgstr "Низа указва към някои аргументи по несъвместими начини."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
@@ -678,25 +619,21 @@
 "conversion specifier '%c'."
 msgstr "При директива номер %u, размерът не е съвместим с превръщането '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "указаният формат за аргумент '%s' не съществува при '%s'"
+msgstr "указания формат за аргумент '%s' не съществува при '%s'"
 
 #: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
-msgstr ""
-"Низът указва към аргументи и чрез име на аргумент, и чрез безименно указване "
-"на аргументи."
+msgstr "Низа указва към аргументи и чрез име на аргумент, и чрез "
 
 #: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Низът указва към аргумент с име '%s' по несъвместими начини."
+msgstr "Низа указва към аргумент с име '%s' по несъвместими начини."
 
 #: src/format-python.c:430
 #, c-format
@@ -719,7 +656,7 @@
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
-"указаният формат за аргумент '%s', като при '%s', не съществува при '%s'"
+"указания формат за аргумент '%s', като при '%s', не съществува при '%s'"
 
 #: src/format-python.c:494
 #, c-format
@@ -727,34 +664,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "не са еднакви указаните формати при '%s' и при '%s' за аргумент %s"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "При директива номер %u, с '%c' не може да се започне име на поле."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "При директива номер %u, с '%c' не може да се започне getattr аргумент."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "При директива номер %u, с '%c' не може да се започне getitem аргумент."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"При директива номер %u, не са разререни повече влагания при указание за "
-"формат."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "При директива номер %u, не е завършено указанието за форматиране."
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -766,14 +675,14 @@
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Низът указва към променлива от обкръжението, която не е с ASCII име."
+msgstr "Низа указва към променлива от обкръжението, която не е с ASCII име."
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Низът указва към променлива от обкръжението, чрез сложен израз в скоби. Това "
+"Низа указа към променлива от обкръжението, чрез сложен израз в скоби. Това "
 "не се поддържа от съображения за сигурност."
 
 #: src/format-sh.c:83
@@ -781,12 +690,12 @@
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"Низът указва към променлива от обкръжението, чиято стойност може да е "
-"различна в функции на обвивката."
+"Низа указа към променлива от обкръжението, чиято стойност може да е различна "
+"в функции на обвивката."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Низът указва към променлива от обкръжението с \"празно\" име"
+msgstr "Низа указа към променлива от обкръжението с \"празно\" име"
 
 #: src/format-ycp.c:90
 #, c-format
@@ -802,11 +711,11 @@
 "1 and 9."
 msgstr "Знакът, който прекратява директива номер %u, не е число между 1 и 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -819,58 +728,58 @@
 "Това е свободен програмен продукт: свободни сте да го променяте и разпространявате.\n"
 "Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Създадена от %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Бруно Хаибле"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "твърде много аргументи"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "За повече сведения, опитайте '%s --help'.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "За повече информация, опитайте '%s --help'.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Извежда мрежовото име на машината.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Формати за извеждане:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 кратко мрежово име\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -881,79 +790,81 @@
 "интернет\n"
 "                                област(domain) и синоними\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреси за мрежово име\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Осведомително извеждане:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  извеждане на тази помощ и изход\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               извеждане на сведение за версия и изход\n"
+msgstr "  -V, --version               извеждане на информация за версия и изход\n"
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
 "а за грешки в превода на <dict@fsa-bg.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "не можа да се определи мрежовото име"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "позволява се най-много един входящ файл"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s са взаимоизключващи се"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -962,10 +873,10 @@
 "Прецежда съобщенията от каталога с преводи според техните атрибути и \n"
 "обработва атрибутите.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -973,23 +884,23 @@
 "Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" "
 "опции.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Местоположение на входящ файл:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХФАЙЛ                      входящ PO файл\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -997,33 +908,33 @@
 "  -D, --directory=ДИР         добавя директория ДИР към списъка за търсене "
 "на входящи файлове\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния "
 "вход.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Местоположение на резултатата:\n"
+msgstr "Местоположение на резултата:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=ФАЙЛ      записване на резултата в зададения файл\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1032,12 +943,12 @@
 "Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис "
 "или той е -\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор на съобщения:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1045,82 +956,72 @@
 "      --translated            запазване на преведените, изтриване на "
 "непреведените съобщения\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          запазване на непреведените, изтриване на "
-"преведените съобщения\n"
+"преведение съобщения\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              изтриване на съобщенията отбелязани като "
 "мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            запазване на на съобщенията отбелязани като "
 "мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           изтриване на остарялите #~ съобщения\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         запазване на остарялите #~ съобщения\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Управление на атрибутите:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
-"      --set-fuzzy             установяване на всички съобщения като "
-"мъгляви('fuzzy')\n"
+"      --set-fuzzy             установяване на всички съобщения като мъгляви"
+"('fuzzy')\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           установяване на всички съобщения да не са "
 "мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          установяване на всички съобщения като "
 "остаряли\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        установяване на всички съобщения да не са "
 "остаряли\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              при отбелязване като 'мъгляв', да се запазват\n"
-"                              предишните msgid-та, на преведените "
-"съобщения.\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1129,22 +1030,14 @@
 "      --clear-previous        изтрива \"предишния\" msgid от всички "
 "съобщения\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 при изтриване на мъгляви('fuzzy'), да се "
-"зададе празен \"msgstr\"\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ФАЙЛ.po     управлява само записите изброени в ФАЙЛ.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1152,28 +1045,28 @@
 "      --ignore-file=ФАЙЛ.po   управлява само записите, които не са изброени "
 "в ФАЙЛ.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 синоним за --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              синоним за --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис на входящия файл:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1181,8 +1074,8 @@
 "  -P, --properties-input      входящия файл е със синтаксис на Java ."
 "properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1191,17 +1084,17 @@
 "      --stringtable-input     входящия файл е със синтаксис на NeXTstep/"
 "GNUstep .низове\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробности за извеждане:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1216,16 +1109,16 @@
 "                              КОГА може да бъде 'always', 'never', 'auto', "
 "или 'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=СТИЛФАЙЛ        задава CSS правила за --color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1233,9 +1126,9 @@
 "  -e, --no-escape             без използване на Си освобождаващи "
 "последователности в резултата (по подразбиране)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1243,30 +1136,30 @@
 "  -E, --escape                използване на Си освобождаващи "
 "последователности в резултата, без разширени знаци\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              записване на PO файл, дори ако е празен\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                записване на .po файл в стил с отмествания\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           без записване на редове '#: filename:line'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1274,8 +1167,8 @@
 "  -n, --add-location          създаване на редове '#: filename:line' (по "
 "подразбиране)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1283,34 +1176,34 @@
 "      --strict                записва строго отговарящ за уеднаквяване .po "
 "файл\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записване на Java .properties файл\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    записване на NeXTstep/GNUstep .strings файл\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=ЦЯЛО            установяване на ширината на изходящата "
 "страница\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1319,32 +1212,32 @@
 "      --no-wrap               без разделяне на няколко реда на съобщения,\n"
 "                              по-дълги от ширината на изходящата страница\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           резултатът да е подреден\n"
+msgstr "  -s, --sort-output           резултата да е подреден\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          подреждане на резултата по място на файла\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "избран е невъзможен критерии за избор (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1353,39 +1246,39 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Съединява и смесва указаните PO файлове.\n"
 "Намира съобщения, които са общи за два или повече от указаните PO файлове.\n"
 "При използване на --more-than опцията, може да се поиска по-голямо сходство,\n"
 "преди съобщенията да се изведат.  Обратно, опцията --less-than, може да\n"
 "се използва, за да се укаже по-малко сходство преди съобщенията да се\n"
-"изведат, т.е. --less-than=2 ще изведе само неповтарящи се съобщения.\n"
-"Преводите, коментарите, извлечените коментари и местоположението във файла\n"
-"ще се натрупат, освен ако е зададено --use-first, като тогава ще се вземат\n"
-"от първия PO файл, който ги определя.\n"
+"изведат, т.е. --less-than=2 ще изведе само неповтарящи се съобщения.  Преводите,\n"
+"коментарите и извлечените коментари ще се натрупат, освен ако е зададено\n"
+"--use-first, като тогава ще се вземат от първия PO файл, който ги определя.\n"
+"От всички PO файлове ще се натрупат позициите във файловете.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХФАЙЛ ...                  входящи файлове\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=ФАЙЛ       получаване на списъка с входящи файлове от "
 "ФАЙЛ\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ако входящия файл е -, се чете от стандартния вход.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1396,7 +1289,7 @@
 "                              По-поразбиране безкрайност, ако не е "
 "установено\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1406,7 +1299,7 @@
 "това\n"
 "                              По-поразбиране 0, ако не е установено\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1415,8 +1308,8 @@
 "  -u, --unique                съкращения за --less-than=2, поисква се\n"
 "                              извеждане на неповтарящите се съобщения\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1424,8 +1317,8 @@
 "  -P, --properties-input      входящите файлове са с Java .properties "
 "синтаксис\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1435,12 +1328,12 @@
 "strings\n"
 "                              синтаксис\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЕ           кодировка при извеждане\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1449,7 +1342,7 @@
 "      --use-first             използване на първия наличен превод за всяко\n"
 "                              съобщение, без сливане на отделни преводи\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1457,21 +1350,21 @@
 "      --lang=ИМЕКАТАЛОГ       задава поле 'Language' за заглавния блок\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Петер Милер"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "не е зададен входящ файл"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "точно 2 входящи файла са необходими"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Употреба: %s [ОПЦИЯ] def.po ref.pot\n"
@@ -1503,12 +1396,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     препратки към източници\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Уточняване на операциите:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1517,7 +1410,7 @@
 "  -m, --multi-domain          приложи ref.pot за всяка от областите в def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     да не се използва размито съвпадение\n"
@@ -1542,17 +1435,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "съобщението трябва да се прегледа от преводача"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "съобщението се използва, но не е определено..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...но определението е подобно"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "съобщението се използва, но не е определено в %s"
@@ -1562,19 +1455,19 @@
 msgid "warning: this message is not used"
 msgstr "предупреждение: съобщението не се използва"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "открита е %d пагубна грешка"
 msgstr[1] "открити са %d пагубни грешки"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "най-малко два реда трябва да се зададат"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1582,7 +1475,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1590,12 +1483,12 @@
 "При използване на --more-than опция, може да се поиска по-голямо сходство,\n"
 "преди съобщенията да се изведат.  Обратно, опцията --less-than, може да\n"
 "се използва, за да се укаже по-малко сходство, преди съобщенията да се\n"
-"изведат, т.е. --less-than=2 ще изведе само неповтарящи съобщения.\n"
-"Преводите, коментарите и извлечените коментари ще се запазят, но само от\n"
-"първия PO файл, който ги определя.  От всички PO файлове ще се натрупат\n"
-"местоположенията във файловете.\n"
+"изведат, т.е. --less-than=2 ще изведа само неповтарящи съобщения.  Преводите,\n"
+"коментарите и извлечените коментари ще се натрупат, освен ако е зададено\n"
+"--use-first, като тогава ще се вземат от първия PO файл, който ги определя.\n"
+"От всички PO файлове ще се натрупат позициите във файловете.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1605,71 +1498,71 @@
 "това\n"
 "                              По-поразбиране 1, ако не е установено\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           без записване на заглавен 'msgid \"\"' запис\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Преобразува каталог с преводи в различна кодировка за знаци.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Цел за преобразуване:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Кодировка по подразбиране е текущата кодировка на локала.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                резултат в стил с отместване\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           подтискане на редове '#: filename:line'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          запазване на редове '#: файл:ред' (по "
+"      --add-location          запазване на редове '#: filename:line' (по "
 "подразбиране)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                строг уеднаквен стил за резултат\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "не е зададен входящ файл"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "необходим е точно един входящ файл"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Употреба: %s [ОПЦИЯ] ВХФАЙЛ\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1682,7 +1575,7 @@
 "създаден от xgettext).  На непреведените записи се присвоява превод,\n"
 "който е еднакъв с msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХФАЙЛ                      входящ PO или POT файл\n"
@@ -1721,7 +1614,7 @@
 "Специална вградена команда наречена '0' извежда преводите последвани от \n"
 "<NULL> байт.  Резултата от \"msgexec 0\" е подходящ като входящ за \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=ВХФАЙЛ          входящ PO файл\n"
@@ -1731,27 +1624,32 @@
 msgid "write to stdout failed"
 msgstr "пропадна записването на стандартния изход"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "пропадна записването към подпроцес %s "
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "липсва име на филтър"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "трябва да се зададе най-малко един sed скрипт"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ] ФИЛТЪР [ФИЛТЪРНА-ОПЦИЯ]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прилагане на филтър към всички преводи от каталога с преводи.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1760,19 +1658,19 @@
 "ФИЛТЪР може е всяка програма, която чете превод от стандартния вход\n"
 "и записва променения превод на стандартния изход.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Полезни ФИЛТЪР-ОПЦИИ, когато ФИЛТЪР е 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=СКРИПТ     добавя СКРИПТ към командите за изпълнение\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1783,7 +1681,7 @@
 "командите\n"
 "                                за изпълнение\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1791,7 +1689,7 @@
 "  -n, --quiet, --silent       подтискане на автоматичното извеждане на "
 "пространството от образи\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1799,12 +1697,12 @@
 "      --no-escape             без използване на Си освобождаващи "
 "последователности в резултата (по подразбиране)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                резултат в стил с отместване\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1812,104 +1710,83 @@
 "      --keep-header           запазване на заглавни записи без промяна, да "
 "не се филтрират\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумента на %s трябва да е единичен препинателен знак"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправилно име за начин на подреждане на байтове: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "не са задава входящ файл, ако са зададени %s и %s"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s изисква указване на \"-d директория\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s изисква указване на \"-l локал\""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s изисква указване на \"\"--template пример\""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s изисква указване на \"-o файл\""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s и %s са взаимоизключващи се при %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s е правилен само с %s или %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s е правилен само с %s, %s или %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d преведено съобщение"
 msgstr[1] "%d преведени съобщения"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d мъгляв превод"
 msgstr[1] ", %d мъгляви преводи"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d непреведено съобщение"
 msgstr[1] ", %d непреведени съобщения"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЯ] имефайл.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Създаване на двоичен каталог със съобщения от текстово описание на "
 "преводите.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1918,26 +1795,26 @@
 "Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" опции.\n"
 "Също така за незадължителните аргументи.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  имефайл.po ...              входящи файлове\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режими на работа:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Java режим: създаване на клас за Java "
-"ResourceBundle\n"
+"  -j, --java                  Java режим: създаване на Java ResourceBundle "
+"клас\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1946,12 +1823,12 @@
 "      --java2                 като --java и се подразбира Java2 (JDK 1.2 или "
 "по-нова)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# режим: създаване на .NET .dll файл\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1960,48 +1837,40 @@
 "      --csharp-resources      C# ресурс режим: създаване на .NET .resources "
 "файл\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: създаване на tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt режим: създаване на Qt .qm файл\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               Режим \"Работен плот\": създаване на .desktop "
-"файл\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                разрешава стриктен уеднаквен режим\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Ако изходящия файл е -, резултатът се записва на стандартния изход.\n"
+msgstr "Ако изходящия файл е -, резултата се записва на стандартния изход.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Местоположение на резултата при Java режим:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       име на ресурс\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2009,21 +1878,14 @@
 msgstr ""
 "  -l, --locale=ЛОКАЛ          име на локал, или език, или език_ДЪРЖАВА\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr "      --source                създава .java файл, вместо .class файл\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ДИРЕКТОРИЯ               основна директория с йерархията на класовете\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2036,12 +1898,12 @@
 "разделени с долна черта.  Опцията -d е задължителна.  Класът се записва в\n"
 "зададената директория.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Местоположение на резултата при C# режим:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2050,7 +1912,7 @@
 "  -d ДИРЕКТОРИЯ               основна директория за зависими от локал .dll "
 "файлове\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2059,19 +1921,19 @@
 "Опциите -l и -d са задължителни.  .dll файла се записва в поддиректория\n"
 "на указаната, чието име зависи от локала.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Местоположение на резултата при Tcl режим:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d ДИРЕКТОРИЯ               основна директория за каталози с .msg "
 "съобщения\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2080,47 +1942,12 @@
 "Опциите -l и -d са задължителни.  .msg файла се записва в указаната\n"
 "директория.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Опции за режим \"Работен плот\":\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=ПРИМЕР           .desktop-файл използван като пример\n"
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d ДИРЕКТОРИЯ               основна директория от .po-фаилове\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kДУМА, --keyword=ДУМА      търсене по ДУМА като допълнителен ключ\n"
-"  -k, --keyword               да не се използва ключ по подразбиране\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Опциите -l, -o, и --template са задължителни.  Ако е зададено -D, то "
-"входящите\n"
-"файлове се четат от тази директория, вместо от командния ред.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Тълкувания за входящия файл:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2132,14 +1959,14 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          проверка на езиково зависимите форматиращи "
 "низове\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2148,7 +1975,7 @@
 "      --check-header          проверка на наличието и съдържанието на "
 "заглавни записи\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2158,7 +1985,7 @@
 "област\n"
 "                                и опцията --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2167,7 +1994,7 @@
 "  -C, --check-compatibility   проверка дали ГНУ msgfmt се държи като X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2178,14 +2005,14 @@
 "клавиши\n"
 "                                за елементи на меню\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             използване на мъгляви(fuzzy) записи при "
 "извеждане\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2193,120 +2020,96 @@
 "  -a, --alignment=БРОЙ        подравнява низовете до БРОЙ байтове (по "
 "подразбиране: %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=ПОДРБАЙТ   извежда 32-битови числа в зададената подредба "
-"на байтове\n"
-"                                (старши или младши, по подразбиране зависи "
-"от процесора)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               двоичният файл няма да съдържа хеш-таблица\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            извежда статистика за преводите\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               увеличава нивото на подробност\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "предупреждение: заглавието на PO файла липсва или не е правилно\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "предупреждение: няма да работи превръщането м/у кодировки\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "предупреждение: заглавието на PO файла е мъгляво\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "предупреждение: стари версии на msgfmt ще дадат грешка за това\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "името на област \"%s\" не е подходящо за име на файл"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "името на област  \"%s\" не е подходящо за име на файл: ще се използва "
 "представка"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "пренебрегната директива 'област %s'"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "пренебрегнат празен 'msgstr' запис"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "пренебрегнат мъгляв(fuzzy) 'msgstr' запис"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: файла източник съдържа мъгляви преводи"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s не съществува"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s съществува, но е нечетим"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при четене на \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"опцията '%c' не може да се използва преди да се зададе 'J', 'K', 'T', 'C', "
-"или 'X'"
+"опцията '%c' не може да се използва преди да се зададе или 'J', или 'K', или "
+"'T', или 'C', или 'X'"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2315,7 +2118,7 @@
 "Извличане на всички съобщения от каталога с преводи, които съвпадат с даден образ\n"
 "или принадлежат на дадени файлове източници.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2390,7 +2193,7 @@
 "  -v, --invert-match          извеждане на съобщенията, които не съвпадат със никой\n"
 "                              от критериите за избор\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2398,18 +2201,18 @@
 "      --escape                резултат с използване на Си освобождаващи "
 "последователности, без разширени знаци\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           резултатът да е подреден\n"
+msgstr "      --sort-output           резултата да е подреден\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          подреждане на резултата по място на файла\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2419,7 +2222,7 @@
 "от обкръжението LANG, като е описано в файла ABOUT-NLS.  Това е\n"
 "необходимо, за да се тества превода.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2430,12 +2233,12 @@
 "Да се зададе локал, чрез опцията --locale или .po файл за резултат, \n"
 "чрез опцията --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Създаден %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2444,12 +2247,12 @@
 "Създаване на нов PO файл, запълвайки метаинформацията със стойности\n"
 "от потребителското обкръжение.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХФАЙЛ          входящ POT файл\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2459,35 +2262,35 @@
 "Ако не е зададен входящ файл, текущата директория се претърсва за POT файл.\n"
 "Ако той е -, се чете от стандартния вход.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=ФАЙЛ      записване на резултата в указания PO файл\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 "Ако не е зададен файл за резултат, той зависи от опцията --locale или от\n"
-"потребителските настройки за локал.  Ако той е -, резултатът се извежда на\n"
+"потребителските настройки за локал.  Ако той е -, резултата се извежда на\n"
 "стандартния изход.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          задаване на целевия локал\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         приема се, че PO файла се създава автоматично\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2495,12 +2298,12 @@
 "Намерен е повече от един .pot файл.\n"
 "Да се зададе входящ .pot файл с опцията --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "грешка при четене на текущата директория"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2508,14 +2311,14 @@
 "Не е намерен .pot файл в текущата директория.\n"
 "Да се зададе входящ .pot файл с опцията --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "пропадна подпроцесът %s и той излезе с код %d"
+msgstr "пропадна подпроцес %s и излезе с код %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2533,7 +2336,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Български превод за пакет %s"
@@ -2541,36 +2344,37 @@
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "текущата кодировка, \"%s\", не е с преносимо име"
+msgstr "текущото кодово множество \"%s\" не е с преносимо име"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "входящия файл е с две различни кодировки - \"%s\" и \"%s\""
+msgstr "входящия файл е с две различни кодови множества \"%s\" и \"%s\""
 
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "входящия файл '%s', не съдържа заглавен запис с указание за кодировка"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"входящия файл '%s' не съдържа заглавен запис с указано кодово множество"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"областта \"%s\", във входящия файл '%s', не съдържа заглавен запис за "
-"указаване на кодировка"
+"областта \"%s\" в входящия файл '%s' не съдържа заглавен запис с указано "
+"кодово множество"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "целевата кодировка, \"%s\", не е с преносимо име"
+msgstr "целевото кодово множество \"%s\" не е с преносимо име"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
@@ -2620,8 +2424,8 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Кодировката на локала, \"%s\", е различна от кодировката на\n"
-"входящия файл, \"%s\",.\n"
+"Кодовото множество на локала \"%s\" в различно от кодовото множество на\n"
+"входящия файл \"%s\".\n"
 "Резултата на '%s' може да не е коректен.\n"
 "Възможни заобикаляния са:\n"
 
@@ -2637,9 +2441,9 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Преобразуване на каталога с преводи, използвайки 'msgconv', в %s\n"
+"- Преобразуване на каталога с преводи в %s използвайки 'msgconv',\n"
 "  после прилагане на '%s',\n"
-"  после обратно преобразуване, използвайки 'msgconv', към %s.\n"
+"  после обратно преобразуване към %s използвайки 'msgconv'.\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2650,9 +2454,9 @@
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 "- Установяване на  LC_ALL към локал с кодировка %s,\n"
-"  преобразуване на каталога с преводи, използвайки 'msgconv', към %s\n"
+"  преобразуване на каталога с преводи към %s използвайки 'msgconv',\n"
 "  после прилагане на '%s',\n"
-"  после обратно преобразуване, използвайки 'msgconv', към %s.\n"
+"  после обратно преобразуване към %s използвайки 'msgconv'.\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2661,7 +2465,7 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Кодовото множество, \"%s\", на локала не е преносимо име на кодировка.\n"
+"Кодовото множество \"%s\" на локала не е преносимо име на кодировка.\n"
 "Резултата от '%s' може да не е правилен.\n"
 "Възможно заобикаляне е да се установи LC_ALL=C.\n"
 
@@ -2697,102 +2501,112 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Да се опита следното, правилно за  %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr "каталогът със съобщенията съдържа преводи за множествено число"
+msgstr "каталога със съобщенията съдържа преводи за множествено число"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "но в заглавния блок липсва запис \"plural=ИЗРАЗ\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "но в заглавния блок липсва запис \"nplurals=ЦЯЛО\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "неправилна стойност за nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "неправилен израз за множествено число"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"каталогът със съобщения съдържа форми за множествено число, но липсва "
+"каталога със съобщения съдържа форми за множествено число, но липсва "
 "заглавен запис с \"Plural-Forms: nplurals=ЦЯЛО; plural=ИЗРАЗ;\""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "и двата записа, 'msgid' и 'msgid_plural', не започват с '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "и двата записа 'msgid' и 'msgid_plural' не започват с '\\n'"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "и двата записа, 'msgid' и 'msgstr[%u]', не започват с '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "и двата записа 'msgid' и 'msgstr[%u]' не започват с '\\n'"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "и двата записа, 'msgid' и '`msgstr', не започват с '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "и двата записа 'msgid' и '`msgstr' не започват с '\\n'"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "и двата записа, 'msgid' и 'msgid_plural', не завършват с '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "и двата записа  'msgid' и 'msgid_plural' не завършват с '\\n'"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "и двата записа, 'msgid' и 'msgstr[%u]', не завършват с '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "и двата записа  'msgid' и 'msgstr[%u]' не завършват с '\\n'"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "и двата записа, 'msgid' и 'msgstr', не завършват с '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "и двата записа 'msgid' и 'msgstr' не завършват с '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "поддръжката на множествено число е допълнение на ГНУ gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr е без отбелязване за ускорена клавишна комбинация '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr е отбелязан с твърде много отметки за клавишни комбинации '%c'"
+msgstr "msgstr е отбелязан с твърде много ускорени клавишни комбинации '%c'"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "все още заглавното поле '%s' е с началната стойност по подразбиране\n"
+msgid "header field `%s' missing in header\n"
+msgstr "в заглавния блок липсва поле '%s'\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "в заглавния блок липсва поле '%s'\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "заглавно поле '%s' трябва да започне от началото на реда\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+"все още някой заглавни полета са с началните стойност по подразбиране\n"
+
+#: src/msgl-check.c:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "все още заглавното поле '%s' е с началната стойност по подразбиране\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2806,10 +2620,10 @@
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "входящия файл не съдържа запис указващ кодировка"
+msgstr "входящия файл не съдържа запис указващ знаково множество"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2827,8 +2641,8 @@
 "Превръщането от \"%s\" към \"%s\" създаде повторения: някой различни msgids "
 "се получиха еднакви."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2837,16 +2651,16 @@
 "Не може да се превърне от \"%s\" към \"%s\". %s използва iconv(). Тази "
 "версия е създадена без iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s е правилно само с %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "тип на резервно копие"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2870,18 +2684,18 @@
 "съвпадение, за получаван на по-добри резултати ще се използват размити\n"
 "(fuzzy) съвпадения\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      преводи препращащи към на старите източници\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     препратки към новите източници\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2891,7 +2705,7 @@
 "съобщения,\n"
 "                              може да се укаже повече от веднъж\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2900,27 +2714,27 @@
 "  -U, --update                обнови def.po,\n"
 "                              не прави нищо, ако def.po е осъвременен\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Място на изходящия файл при обновяване:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Резултата се записва обратно в def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=КОНТРОЛ        създаване на резервно копие на def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=НАСТ           задава наставка за резервно копие\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2938,17 +2752,17 @@
 "  existing, nil   номериран, ако съществува такъв, иначе обикновен\n"
 "  simple, never   винаги се създава обикновено резервно копие\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Наставката за резервно копие е `~', освен ако е зададена с --suffix или с\n"
+"Наставката за резервно копие е `~', освен ако е зададен с --suffix или с\n"
 "променливата на обкръжението SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2956,23 +2770,23 @@
 "      --previous              запазване на предишните msgid-ита на "
 "преведените съобщения\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 "  -q, --quiet, --silent       подтискане на показването ход на процеса\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "това съобщение трябва да зададе форми за множествено число"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "това съобщение не трябва да зададе форми за множествено число"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2981,7 +2795,7 @@
 "%sПрочетени %ld стари + %ld препратки, сляти %ld, мъгляви %ld, липсващи %ld, "
 "остаряли %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3010,8 +2824,7 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Java режим: входящ е клас за Java "
-"ResourceBundle\n"
+"  -j, --java                  Java режим: входящ е Java ResourceBundle клас\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -3094,7 +2907,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                записване в стриктен уеднаквен стил\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3115,12 +2928,12 @@
 "като тогава ще се вземат от първия превод. Позициите във файловете ще се натрупат.\n"
 "Ако се използва --unique, повторенията ще се отхвърлят.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              извежда само повторенията\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3140,11 +2953,11 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Кодовото множество, \"%s\", не е с преносимо име за кодировка.\n"
-"Преобразуването на съобщенията към потребителското кодовото множество може "
-"да не работи.\n"
+"Кодовото множество \"%s\" не е с преносимо име за кодировка.\n"
+"Преобразуването на съобщенията в потребителското кодовото множество може да "
+"не работи.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3153,7 +2966,7 @@
 "Кодовото множество \"%s\" не се поддържа. %s използва iconv(),\n"
 "и iconv() не поддържа \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3161,15 +2974,15 @@
 "Инсталирането на ГНУ libiconv е след това преинсталирането на ГНУ gettext\n"
 "ще оправи този проблем.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Продължаване във всеки случай, очакват се грешки при разбора."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Продължаване във всеки случай."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3178,40 +2991,40 @@
 "Кодовото множество \"%s\" не се поддържа. %s използва iconv().\n"
 "Тази версия е създадена без iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"В заглавието липсва кодировка.\n"
-"Преобразуването на съобщенията към потребителска кодировка няма да работи.\n"
+"В заглавието липсва кодово множество.\n"
+"Преобразуването на съобщенията в потребителско множество няма да работи.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "противоречиво използване на #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "липсва дял 'msgstr[]'"
+msgid "missing `msgstr[]' section"
+msgstr "липсва секция 'msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "липсва дял 'msgid_plural'"
+msgid "missing `msgid_plural' section"
+msgstr "липсва секция 'msgid_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "липсва дял 'msgstr'"
+msgid "missing `msgstr' section"
+msgstr "липсва секция 'msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "първата форма за множествено число не е с нулев индекс"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "формата за множествено число с грешен индекс"
@@ -3221,20 +3034,20 @@
 msgid "too many errors, aborting"
 msgstr "твърде много грешки, прекратяване"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "неправилно многобайтова последователност"
+msgstr "неправилно много-байтова последователност"
 
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "незавършена многобайтова последователност в края на файла"
+msgstr "незавършена много-байтова последователност в края на файла"
 
 #: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "незавършена многобайтова последователност в края на реда"
+msgstr "незавършена много-байтова последователност в края на реда"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
@@ -3265,16 +3078,16 @@
 msgid "context separator <EOT> within string"
 msgstr "разделител на съдържание <EOT> в низ"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "този файл май не съдържа директиви за област"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "повторно определение на съобщение"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "това е мястото на първото определение"
 
@@ -3349,12 +3162,12 @@
 "Входящия текст се чете от стандартния вход.  Преобразувания текст се извежда\n"
 "на стандартния изход.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "входните данни не са правилни при кодировка \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка при преобразуване от кодировка \"%s\" към кодировка \"%s\""
@@ -3378,21 +3191,11 @@
 "Донася и извежда съдържанието на URL. Ако URL не е достъпен, то се използва\n"
 "достъпен локално ФАЙЛ\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "грешка при четене \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "грешка за записване на стандартния изход"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "грешка след прочитане на \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3406,14 +3209,14 @@
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " пропадна.\n"
+msgstr " не успя.\n"
 
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"При указаният формат, в един файл не може да се получи резултат с много "
+"При указания формат, в един файл не може да се получи резултат с много "
 "области за превод. В замяна да се опита със синтаксис на PO файл."
 
 #: src/write-catalog.c:129
@@ -3421,7 +3224,7 @@
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"При указаният формат, в един файл не може да се получи резултат с много "
+"При указания формат, в един файл не може да се получи резултат с много "
 "области за превод."
 
 #: src/write-catalog.c:162
@@ -3429,7 +3232,7 @@
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"каталогът със съобщенията съдържа преводи в зависимост от текста, но формата "
+"каталога със съобщенията съдържа преводи в зависимост от текста, но формата "
 "за резултат не ги поддържа."
 
 #: src/write-catalog.c:197
@@ -3438,8 +3241,8 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"каталогът със съобщенията съдържа преводи в множествено число, но формата за "
-"резултат не ги поддържа. Да се опита създаване на клас за Java, използвайки "
+"каталога със съобщенията съдържа преводи в множествено число, но формата за "
+"резултат не ги поддържа.Да се опита създаване на Java клас използвайки "
 "\"msgfmt --java\", в замяна на .properties файл."
 
 #: src/write-catalog.c:202
@@ -3447,7 +3250,7 @@
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"каталогът със съобщенията съдържа преводи в множествено число, но формата за "
+"каталога със съобщенията съдържа преводи в множествено число, но формата за "
 "резултат не ги поддържа."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
@@ -3462,55 +3265,49 @@
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "пропадна създаването на директория \"%s\""
+msgstr "не можа да се създаде директория \"%s\""
 
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "пропадна компилирането на клас на C#, да се опита --verbose"
+msgstr "пропадна компилирането на C# клас, да се опита --verbose"
 
 #: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
-msgstr "пропадна компилирането на клас на C#"
+msgstr "пропадна компилирането на C# клас"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "неправилно име за клас на Java: %s"
+msgstr "неправилно име на Java клас: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
-"пропадна компилирането на клас на Java, да се опита --verbose или да се "
+"пропадна компилирането на Java клас, да се опита --verbose или да се "
 "установи $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"пропадна компилирането на клас на Java, да се опита с установяване $JAVAC"
+msgstr "пропадна компилирането на Java клас, да се опита с установяване $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка при отваряне на \"%s\" за запис"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "неправилно многобайтова последователност"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"съобщения за превод не трябва да съдържат освобождаваща последователност '\\"
-"%c'"
+"съобщения за превод не би трябвало да съдържат '\\%c' освобождаваща "
+"последователност"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3523,7 +3320,7 @@
 "кодировка. Да се обмисли използването на чисто ASCII msgid.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3541,7 +3338,7 @@
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"каталогът със съобщенията съдържа преводи в множествено число,\n"
+"каталога със съобщенията съдържа преводи в множествено число,\n"
 "но не се поддържат от Qt каталог със съобщения\n"
 
 #: src/write-qt.c:693
@@ -3551,7 +3348,7 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"каталогът със съобщенията съдържа в msgctxt букви извън ISO-8859-1,\n"
+"каталога със съобщенията съдържа в msgctxt букви извън ISO-8859-1,\n"
 "но формата на Qt каталог със съобщения поддържа уникод само за\n"
 "преведените низове, не не и в низовете за обстоятелство\n"
 
@@ -3561,7 +3358,7 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"каталогът със съобщенията съдържа msgid низове букви извън ISO-8859-1,\n"
+"каталога със съобщенията съдържа msgid низове букви извън ISO-8859-1,\n"
 "но формата на Qt каталог със съобщения поддържа уникод само за\n"
 "преведените низове, не не и за непреведените\n"
 
@@ -3575,7 +3372,7 @@
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"каталогът със съобщенията съдържа преводи в зависимост от обстоятелство,\n"
+"каталога със съобщенията съдържа преводи в зависимост от обстоятелство,\n"
 "но формата на C# .resources не ги поддържа\n"
 "но не се поддържат от C# .resources\n"
 
@@ -3584,7 +3381,7 @@
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"каталогът със съобщенията съдържа преводи в множествено число,\n"
+"каталога със съобщенията съдържа преводи в множествено число,\n"
 "но не се поддържат от C# .resources\n"
 
 #: src/write-tcl.c:157
@@ -3592,7 +3389,7 @@
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"каталогът със съобщенията съдържа преводи в зависимост от текста,\n"
+"каталога със съобщенията съдържа преводи в зависимост от текста,\n"
 "но не се поддържат от Tcl каталог със съобщения\n"
 
 #: src/write-tcl.c:176
@@ -3600,35 +3397,30 @@
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"каталогът със съобщенията съдържа преводи в множествено число,\n"
+"каталога със съобщенията съдържа преводи в множествено число,\n"
 "но те не се поддържат от Tcl каталог със съобщения\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: предупреждение: незавършен низ"
 
 #: src/x-awk.c:592
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: предупреждение: незавършен регулярен израз"
-
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "предупреждение: неправилен знак на Uникод"
+msgstr "%s:%d: предупреждение: незавършен регулярен израз\n"
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: предупреждение: незавършена константа за буква"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: предупреждение: незавършен заместител на низ"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Да се зададе кодировка на източника чрез --from-code."
 
@@ -3638,7 +3430,7 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неправилна многобайтова последователност.\n"
+"%s:%d: Неправилна много-байтова последователност.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
 #: src/x-csharp.c:285
@@ -3647,7 +3439,7 @@
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Непълна многобайтова последователност.\n"
+"%s:%d: Непълна много-байтова последователност.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
 #: src/x-csharp.c:297
@@ -3656,7 +3448,7 @@
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Непълна многобайтова последователност в края на файла.\n"
+"%s:%d: Непълна много-байтова последователност в края на файла.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
 #: src/x-csharp.c:306
@@ -3665,13 +3457,13 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Непълна многобайтова последователност в края на реда.\n"
+"%s:%d: Непълна много-байтова последователност в края на реда.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: неуспех на iconv"
+msgstr "%s:%d: iconv не успя"
 
 #: src/x-csharp.c:338
 #, c-format
@@ -3679,10 +3471,10 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неправилна многобайтова последователност.\n"
+"%s:%d: Неправилна много-байтова последователност.\n"
 "Да се зададе кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: предупреждение: неправилен знак на уникод"
@@ -3702,22 +3494,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: предупреждение: намерено е '}', където се очаква ')'"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Липсва обкръжение за низ извлечен от елемент '%s'"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Главният елемент <%s> не е разрешен в правилен Glade файл"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3731,70 +3513,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: предупреждение: самотен заместител U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Да се зададе кодировка на източника чрез --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неправилна многобайтова последователност.\n"
-"Да се зададе правилна кодировка на източника чрез --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Непълна многобайтова последователност.\n"
-"Да се зададе правилна кодировка на източника чрез --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Непълна многобайтова последователност в края на файла.\n"
-"Да се зададе правилна кодировка на източника чрез --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Непълна многобайтова последователност в края на реда.\n"
-"Да се зададе правилна кодировка на източника чрез --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неправилна многобайтова последователност.\n"
-"Да се зададе кодировка на източника чрез --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: предупреждение: %s не е допустим"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: предупреждение: незавършено XML изразяване"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3832,7 +3550,7 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\U\") на 8-битова буква \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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"
@@ -3840,62 +3558,62 @@
 "Да се зададе кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Неправилна многобайтова последователност.\n"
+"%s:%d: Неправилна много-байтова последователност.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Незавършена многобайтова последователност.\n"
+"%s:%d: Незавършена много-байтова последователност.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: Незавършена многобайтова последователност в края на файла.\n"
+"%s:%d: Незавършена много-байтова последователност в края на файла.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Непълна многобайтова последователност в края на реда.\n"
+"%s:%d: Непълна много-байтова последователност в края на реда.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Неправилна многобайтова последователност.\n"
+"%s:%d: Неправилна много-байтова последователност.\n"
 "Да се зададе кодиране на източника чрез --from-code или чрез коментар,\n"
 "като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Неизвестно кодиране \"%s\". Продължаване на работата с ASCII."
@@ -3924,41 +3642,29 @@
 "%s:%lu: предупреждение: синтаксиса $\"...\" е забранен от съображения за "
 "сигурност, вместо това да се използва eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
-
-#: src/xgettext.c:545
-#, 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:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
-"--join-existing не може да се използва, когато резултата се записва на "
+"--join-existing не може да се използва когато резултата се записва на "
 "стандартния изход"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да работи без ключове за търсене"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извличане на низовете за превод от зададените входящи файлове.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3967,13 +3673,13 @@
 "  -d, --default-domain=ИМЕ   използване на ИМЕ.po за изходящ (вместо "
 "messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3981,12 +3687,12 @@
 "  -p, --output-dir=ДИР        изходящите файлове да се запишат в директория "
 "ДИР\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избиране на език на входящия файл:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3995,24 +3701,22 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=ИМЕ          приемане на указания език\n"
+"  -L, --language=ИМЕ         приемане на указания език\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
 "Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua)\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   за краткост на --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4021,7 +3725,7 @@
 "По подразбиране езикът се отгатва в зависимост от окончанието на входящия "
 "файл.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4030,23 +3734,23 @@
 "      --from-code=NAME        кодиране на входящите файлове\n"
 "                                (без Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "По подразбиране входящите файлове са в ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         добавя съобщенията към съществуващ файл\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4060,47 +3764,39 @@
 "  -c, --add-comments            в резултата се поставят всички блокове с\n"
 "                                коментар от редовете преди ключа\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Опции за определен език:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извличане на всички низове\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (само езиците  C, C++, ObjectiveC, Shell,\n"
+"                                (само езици C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (само езиците  C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kДУМА, --keyword=ДУМА      търсене по ДУМА като допълнителен ключ\n"
+"  -k, --keyword               да не се използва ключ по подразбиране\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4110,54 +3806,52 @@
 "      --flag=ДУМА:АРГ:ФЛАГ    допълнителен флаг за низове при номер на\n"
 "                              аргумент АРГ за ключ ДУМА\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (само езиците C, C++, ObjectiveC, Shell,\n"
+"                                (само езици C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             разпознаване на ANSI Си тризнаци в входните "
 "данни\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (само езици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    разпознава Qt формат за низове\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (само език C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   разпознава KDE 4 формат за низове\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 разпознава Boost формат за низове\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4165,19 +3859,19 @@
 "      --debug                 по-подробен резултат как е разпознато "
 "съобщението като вид формат\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     записва Java .properties файл\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=НИЗ     задава носител на авторско право в "
 "резултата\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4185,17 +3879,17 @@
 "      --foreign-user          резултат без авторско право на ФСС за\n"
 "                              чуждестранни потребители\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=ПАКЕТ    задава име на пакет в резултата\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=ВЕРСИЯ   задава версия на пакета в резултата\n"
+msgstr "      --package-version=ВЕРСИЯ   задава версия на паката в резултата\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4203,7 +3897,7 @@
 "      --msgid-bugs-address=ПОЩА@АДРЕС     задава адрес за рапортуване на "
 "грешки при msgid\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4214,7 +3908,7 @@
 "представка за\n"
 "                                стойностите на msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4225,38 +3919,38 @@
 "за\n"
 "                                стойности на msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "Аргумента --flag не е с <ключ>:<ном_арг>:[pass-]<флаг> синтаксис: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандартен изход"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Знак извън ASCII кодиране при %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Коментар, който е извън ASCII кодиране, при или преди %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Низ извън ASCII кодиране при %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: предупреждение: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4265,7 +3959,7 @@
 "Макар че е използван в място за низове за формат, %s не е правилен низ за %s "
 "формат. Причина: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4274,7 +3968,7 @@
 "Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4287,7 +3981,7 @@
 "Да се обмисли използването на низ за формат с именувани аргументи и \n"
 "привързване, вместо последователност за аргументите.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4297,50 +3991,43 @@
 "gettext(\"\") връща заглавен запис с метаинформация,\n"
 "а не празен низ.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "двусмислено зададен аргумент за ключ '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "предупреждение: липсва съдържание за ключ '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "предупреждение: липсва съдържание за множествено число на ключ '%.*s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Несъответствие на съдържание м/у единствено и множествено число"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "Опцията --msgid-bugs-address не е зададена.\n"
 "Ако се използва файл 'Makevars', тук се задава\n"
 "MSGID_BUGS_ADDRESS променлива, иначе се задава\n"
-", на командния ред, опция --msgid-bugs-address.\n"
+"опция --msgid-bugs-address на командния ред.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "непознат език '%s'"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<неназован>"
-
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "заглавно поле '%s' трябва да започне от началото на реда\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "все още някой заглавни полета са с началните стойност по подразбиране\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/ca.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/ca.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/ca.po gettext-0.18.1.1/gettext-tools/po/ca.po
--- gettext-0.19.3/gettext-tools/po/ca.po	2014-10-16 06:04:19.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/ca.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,59 +1,57 @@
 # Catalan messages for GNU gettext-tools.
-# Copyright (C) 2001, 2002, 2003, 2007, 2014 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
 #
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2013, 2014.
+# Sóc Ivan, aquestes són les convencions que adopte per a la 0.15-pre5:
+#   * Sempre que es puga s’usaran els caràcters adequats per al text en català:
+#     l’apòstrof (’), ela geminada (ŀ, Ŀ), cometes («, », “, ”, ‘, ’, en aquest
+#     ordre de d’aparició), guionet (‐), guionet dur (‑), guió (—) i punts
+#     suspensius (…).  Compte, perquè *cap*, repetesc, *CAP* dels anteriors és
+#     el caràcter que s’obté teclejant directament; vegeu
+#     http://www.selidor.net/~ivan/blog/bits/20060304T0023-ortotipografia.html.
+#   * Use 2 espais després d’un punt.
+#   * Missatges d’ajuda:
+#       * Forma d’ús: …
+#               o bé: …
+#       * ARGUMENT_COMPOST, però ARGCOMP
+#       * FILE(s) -> cada FITXER (si és possible)
+#       * Cada línia de descripció d’una opció comença en la columna 24, i
+#         sempre es manté com a mínim a 4 espais del nom de l’opció.  Quan
+#         l’opció arriba a la columna 24, la descripció comença en la línia
+#         inferior.  Les descripcions que no caben en una línia es parteixen i
+#         continuen en la columna 24 de la línia següent.
+#       * Les descripcions d’ítems que no són opcions es mantenen alineades a
+#         4 espais de l’ítem més llarg del bloc.  Les que no caben en una línia
+#         es parteixen i continuen en la mateixa columna on comencen.
+#       o Excepció: ajudes de «pr», quin format vos agrada més?
+#   * Errors i avisos:
+#       * no és igual «no es pot obrir» que «no s’ha pogut obrir»
+#       * no és igual «s’està obrint X» que «en obrir X» (error)
+#       * «avís:» comença amb minúscula, la cadena següent també
+#       * sempre van en una sola línia, a no ser que els retorns importen; en
+#         aquest cas, les noves línies comencen amb un caràcter de tabulació
+#   * VARIABLE_ENTORN, però «valor de variable»
+#   * Noms de funció: printf()
+#   * Noms de fitxer: «fitxer»
+#   * Noms d’opcions: «--opció=ARGUMENT»
+#   * El text com a molt arriba a la columna 78, amb el caràcter de nova línia
+#     en la 79.  Les línies es parteixen de forma automàtica (no per a que quede
+#     bonic, excepte quan quede realment horrend o porte a confusió).
+#   * Els missatges marcats com a multilínia només arriben fins a la columna
+#     70.  A sovint contenen marques de format; en aquest cas s’hi inserta una
+#     nova línia perquè no hi ha forma de saber com serà de llarga la línia.
 #
-# Sóc Ivan, aquestes són les convencions que adopte per a la 0.19-rc1:
-#
-# - Sempre que es puga s’usaran els caràcters adequats per al text en català:
-#   l’apòstrof (’), ela geminada (l·l, L·L), cometes («, », “, ”, ‘, ’, en
-#   aquest ordre de d’aparició), guionet (‐), guionet dur (‑), guió (—) i punts
-#   suspensius (…).  Compte, perquè alguns dels caràcters anteriors no són els
-#   que s’obtenen teclejant directament; vegeu
-#   https://elvil.net/blog/ca/ortotipografia
-# - Use 2 espais després d’un punt.
-# - Missatges d’ajuda:
-#   - Forma d’ús: …
-#           o bé: …
-#   - ARGUMENT_COMPOST, però ARGCOMP
-#   - FILE(s) -> cada FITXER (si és possible)
-#   - Cada línia de descripció d’una opció comença en la columna 24, i sempre es
-#     manté com a mínim a 4 espais del nom de l’opció.  Quan l’opció arriba a la
-#     columna 24, la descripció comença en la línia inferior.  Les descripcions
-#     que no caben en una línia es parteixen i continuen en la columna 24 de la
-#     línia següent.
-#   - Les descripcions d’ítems que no són opcions es mantenen alineades a 4
-#     espais de l’ítem més llarg del bloc.  Les que no caben en una línia es
-#     parteixen i continuen en la mateixa columna on comencen.
-#     - Excepció: ajudes de «pr», quin format vos agrada més?
-# - Errors i avisos:
-#   - no és igual «no es pot obrir» que «no s’ha pogut obrir»
-#   - no és igual «s’està obrint X» que «en obrir X» (error)
-#   - «avís:» comença amb minúscula, la cadena següent també
-#   - sempre van en una sola línia, a no ser que els retorns importen; en
-#     aquest cas, les noves línies comencen amb un caràcter de tabulació
-# - VARIABLE_ENTORN, però «valor de variable»
-# - Noms de funció: printf()
-# - Noms de fitxer: «fitxer»
-# - Noms d’opcions: «--opció=ARGUMENT»
-# - El text com a molt arriba a la columna 78, amb el caràcter de nova línia en
-#   la 79.  Les línies es parteixen de forma automàtica (no per a que quede
-#   bonic, excepte quan quede realment horrend o porte a confusió).
-# - Els missatges marcats com a multilínia només arriben fins a la columna 70.
-#   A sovint contenen marques de format; en aquest cas s’hi inserta una nova
-#   línia perquè no hi ha forma de saber com serà de llarga la línia.
-#
-# FIXME: Lots of strings should be marked «no-wrap», not only those which are
-# split between lines in English, but also those which would need to be splitted
-# in its translation into other languages (this includes lines describing single
-# options).  Also strings used in multiline error and warning messages.  ivb
+# FIXME: Lots of strings should be marked «no-wrap», not only those which
+#   are split between lines in English, but also those which would need to
+#   be splitted in its translation into other languages (this includes lines
+#   describing single options).  Also strings used in multiline error and
+#   warning messages.  ivb
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 21:36+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-28 18:06+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -75,10 +73,11 @@
 msgstr "l’argument %s és ambigu per a %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Els arguments vàlids són:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
@@ -86,19 +85,19 @@
 "TMPDIR"
 
 # No usa quote().  ivb
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "no s’ha pogut crear un directori temporal amb la plantilla «%s»"
 
 # No usa quote().  ivb
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "no s’ha pogut eliminar el fitxer temporal «%s»"
 
 # No usa quote().  ivb
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "no s’ha pogut eliminar el directori temporal «%s»"
@@ -107,44 +106,37 @@
 msgid "write error"
 msgstr "error d’escriptura"
 
-# Condició d’error.  Usa quote().  ivb
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "en preservar els permissos de %s"
-
-# Usa quote().  ivb
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "error en obrir %s per a llegir"
+msgid "error while opening \"%s\" for reading"
+msgstr "error en obrir «%s» per a llegir"
 
-# Usa quote().  ivb
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "no s’ha pogut obrir el fitxer còpia de seguretat %s per a escriure"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "no s’ha pogut obrir el fitxer còpia de seguretat «%s» per a escriure"
 
-# Usa quote().  ivb
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "error en llegir %s"
+msgid "error reading \"%s\""
+msgstr "error en llegir «%s»"
 
-# Usa quote().  ivb
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "error en escriure %s"
+msgid "error writing \"%s\""
+msgstr "error en escriure «%s»"
 
-# Usa quote().  ivb
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "error després d’haver llegit %s"
+msgid "error after reading \"%s\""
+msgstr "error després d’haver llegit «%s»"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -154,213 +146,174 @@
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "no s’ha trobat cap compil·lador de C#, instal·leu «pnet»"
+msgstr "no s’ha trobat cap compiŀlador de C#, instaŀleu «pnet»"
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "no s’ha trobat cap màquina virtual de C#, instal·leu «pnet»"
+msgstr "no s’ha trobat cap màquina virtual de C#, instaŀleu «pnet»"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "el subprocés «%s» ha fallat"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: l’opció «%s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l’opció «--%s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l’opció «%c%s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: l’opció «--%s» necessita un argument\n"
+msgstr "%s: l’opció «%s» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: l’opció «--%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: l’opció «%c%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l’opció «%c» no és vàlida\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l’opció «%c» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l’opció «-W %s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l’opció «-W %s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l’opció «-W %s» necessita un argument\n"
+msgstr "%s: l’opció «%s» necessita un argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "l’argument «source_version» passat a compile_java_class() no és vàlid"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "no s’ha pogut crear «%s»"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error en escriure el fitxer «%s»"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"no s’ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu la "
+"no s’ha trobat cap compiŀlador de Java, instaŀleu «gcj» o establiu la "
 "variable d’entorn JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"no s’ha trobat cap màquina virtual de Java, instal·leu «gij» o establiu la "
+"no s’ha trobat cap màquina virtual de Java, instaŀleu «gij» o establiu la "
 "variable d’entorn JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error d’E/S amb el subprocés «%s»"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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:417
-#, 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
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "la comunicació amb el subprocés «%s» ha fallat"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
+msgid "cannot create pipe"
+msgstr "no s’ha pogut crear una canonada"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "«"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "»"
 
-# Condició d’error.  Usa quote().  ivb
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "no s’ha pogut crear una canonada"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ha fallat _open_osfhandle()"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "no s’ha pogut restaurar el descriptor %d: ha fallat dup2()"
+msgstr "no s’ha pogut crear el fitxer d’eixida «%s»"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -373,52 +326,45 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error en obrir «%s» per a llegir"
-
 # ivb (2002/12/16)
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgstr» o «msgstr[n]».  ivb
 # El motiu està traduït.  ivb
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"«%s» no és una cadena vàlida de format de %s, com la de «%s».  Motiu: %s"
+"«%s» no és una cadena vàlida de format de %s, com la de «msgid».  Motiu: %s"
 
+# «%s» és «msgstr».  ivb
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "no existeix, com en «%2$s», una especificació de format de l’argument %1$u "
-"en «%3$s»"
+"en «msgid»"
 
+# «%s» és «msgstr».  ivb
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"les especificacions de format en «%s» i «%s» de l’argument %u no són les "
+"les especificacions de format en «msgid» i «%s» de l’argument %u no són les "
 "mateixes"
 
 #: src/format-boost.c:449
@@ -426,7 +372,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "La directiva número %u comença amb «|» però no acaba en «|»."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -436,25 +382,23 @@
 "macro d’especificació de format.  Els noms vàlids de macro es troben "
 "llistats en ISO C 99, secció 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "A la directiva número %u, el component que segueix «<» no està seguit de «>»."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "La cadena es refereix a l’argument número %u però passa per alt l’argument "
 "número %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr "el nombre d’especificacions de format en «msgid» i «%s» no coincideix"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -537,24 +481,14 @@
 msgstr "A la directiva número %u, no es permeten indicadors abans de «%c»."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "«%s» empra «%%m» però «%s» no ho fa"
+msgstr "«msgid» empra %%m però «%s» no ho fa"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "«%s» no empra «%%m» però «%s» empra «%%m»"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "«%s» empra «%%C» però «%s» no ho fa"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "«%s» no empra «%%m» però «%s» empra «%%m»"
+msgstr "«msgid» no empra %%m però «%s» empra %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -599,8 +533,8 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"A la directiva número %u, el caràcter «%c» no és una especificació de "
-"conversió vàlida."
+"A la directiva número %u, el caràcter «%c» no és un especificador de "
+"conversió vàlid."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -608,8 +542,8 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"El caràcter que termina la directiva número %u no és una especificació de "
-"conversió vàlida."
+"El caràcter que termina la directiva número %u no és un especificador de "
+"conversió vàlid."
 
 #: src/format-invalid.h:40
 #, c-format
@@ -662,12 +596,12 @@
 "està seguit per «<», «#» o «%s»."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"no existeix, com en «%2$s», una especificació de format de l’argument {%1$u} "
-"en «%3$s»"
+"no existeix una especificació de format de l’argument {%u} en «msgid», com "
+"en «%s»"
 
 #: src/format-java.c:756
 #, c-format
@@ -675,12 +609,12 @@
 msgstr "no existeix una especificació de format de l’argument {%u} en «%s»"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"les especificacions de format de l’argument {%3$u} en «%1$s» i «%2$s» no són "
-"les mateixes"
+"les especificacions de format de l’argument {%2$u} en «msgid» i «%1$s» no "
+"són les mateixes"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -755,15 +689,15 @@
 msgstr "La cadena es refereix a algun argument de formes incompatibles."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "les especificacions de format en «%s» i «%s» no són equivalents"
+msgstr "les especificacions de format en «msgid» i «%s» no són equivalents"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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»"
+"les especificacions de format de «%s» no són un subconjunt de les de «msgid»"
 
 #: src/format-perl.c:433
 #, c-format
@@ -771,12 +705,10 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"A la directiva número %u, l’especificació de mida no és compatible amb "
-"l’especificació de conversió «%c»."
+"A la directiva número %u, l’especificador de mida no és compatible amb "
+"l’especificador de conversió «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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»"
@@ -796,76 +728,45 @@
 "La cadena es refereix a l’argument anomenat «%s» de formes incompatibles."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"les especificacions de format de «%s» necessiten un mapa, les de «%s» una "
+"les especificacions de format de «msgid» necessiten un mapa, les de «%s» una "
 "tupla"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"les especificacions de format de «%s» necessiten una tupla, les de «%s» un "
-"mapa"
+"les especificacions de format de «msgid» necessiten una tupla, les de «%s» "
+"un mapa"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
-"no existeix, com en «%2$s», una especificació de format de l’argument «%1$s» "
-"en «%3$s»"
+"no existeix una especificació de format de l’argument «%s» en «msgid», com "
+"en «%s»"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"les especificacions de format de l’argument «%3$s» en «%1$s» i «%2$s» no són "
-"les mateixes"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"A la directiva número %u, no s’admet més niament en l’especificació de "
-"format."
-
-#: src/format-python-brace.c:270
-#, 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."
+"les especificacions de format de l’argument «%2$s» en «msgid» i «%1$s» no "
+"són les mateixes"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"«%s» és una cadena de format simple, però «%s» no ho és: conté un indicador "
-"«L» o un número d’argument amb un dígit doble"
+"«msgid» és una cadena de format simple, però «%s» no ho és: conté un "
+"indicador «L» o un número d’argument amb un dígit doble"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -906,11 +807,11 @@
 msgstr ""
 "El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -923,58 +824,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "sobren arguments"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Mostra el nom d’estació de la màquina.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de l’eixida:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short          Nom curt de l’estació.\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -984,34 +885,34 @@
 "  -f, --fqdn, --long    Nom llarg de l’estació, inclou el nom de domini\n"
 "                       completament qualificat i els àlies.\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address     Adreces corresponents al nom d’estació.\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Eixida informativa:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
@@ -1020,41 +921,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "no s’ha pogut obtenir el nom d’estació"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "es permet com a molt un fitxer d’entrada"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "«%s» i «%s» són mútuament excloents"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1063,10 +966,10 @@
 "Filtra els missatges d’un catàleg de traduccions segons els seus atributs, i\n"
 "manipula aquests atributs.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1074,23 +977,23 @@
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ubicació del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FITXER_ENTRADA       Fitxer PO d’entrada.\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1099,34 +1002,34 @@
 "                       Afegeix el DIRECTORI a la llista de cerca de fitxers\n"
 "                       d’entrada.\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Si no s’especifica cap fitxer d’entrada, o si aquest és «-», es llegirà\n"
 "l’entrada estàndard.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ubicació del fitxer d’eixida:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FITXER\n"
 "                       Escriu l’eixida al fitxer especificat.\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1136,12 +1039,12 @@
 "fitxer\n"
 "d’eixida, o si aquest és «-».\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecció dels missatges:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1149,7 +1052,7 @@
 "      --translated     Manté els missatges traduïts, elimina els no "
 "traduïts.\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1157,62 +1060,53 @@
 "      --untranslated    Manté els missatges no traduïts, elimina els "
 "traduïts.\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy       Elimina els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy     Manté els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete    Elimina els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete    Manté els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulació dels atributs:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy      Marca tots els missatges com a «fuzzy».\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy    Marca tots els missatges com a no‐«fuzzy».\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete    Marca tots els missatges com a obsolets.\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete    Marca tots els missatges com a no obsolets.\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous       En marcar els missatges com a «fuzzy», manté els\n"
-"                       «msgid» anteriors dels missatges traduïts.\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1221,15 +1115,7 @@
 "      --clear-previous    Elimina de tots els missatges el comentari amb el\n"
 "                       «msgid» anterior.\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty          En eliminar la marca «fuzzy» també deixa buit el\n"
-"                       «msgstr» corresponent.\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1238,7 +1124,7 @@
 "                       Només manipula les entrades llistades al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1248,27 +1134,27 @@
 "po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy          Equival a «--only-fuzzy --clear-fuzzy».\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete       Equival a «--only-obsolete --clear-obsolete».\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxi del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1278,8 +1164,8 @@
 "de\n"
 "                       Java.\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1289,17 +1175,17 @@
 "                       El fitxer d’entrada segueix la sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalls de l’eixida:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1314,18 +1200,18 @@
 "«html»\n"
 "                       (sempre, mai, automàtic, HTML).\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1333,9 +1219,9 @@
 "  -e, --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1343,27 +1229,27 @@
 "  -E, --escape         Empra seqüències d’escapada de C a l’eixida, en lloc\n"
 "                       de caràcters estesos.\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1371,8 +1257,8 @@
 "  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1380,18 +1266,18 @@
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1400,16 +1286,16 @@
 "                       Genera un fitxer amb sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1418,27 +1304,27 @@
 "      --no-wrap        No parteix les línies de missatge més llargues que\n"
 "                       l’amplada de pàgina.\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
@@ -1446,7 +1332,7 @@
 # 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:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1455,38 +1341,39 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Concatena i mescla els fitxers PO especificats.  Troba els missatges comuns\n"
 "entre dos o més dels fitxers PO especificats.  Amb l’opció «--more-than» podeu\n"
 "requerir un nombre mínim de coincidències per a escriure els missatges.\n"
 "Inversament, podeu emprar l’opció «--less-than» per a limitar el nombre màxim\n"
 "de coincidències per a escriure un missatge (i.e. «--less-than=2» només\n"
-"mostrarà els missatges únics).  Les traduccions, comentaris, comentaris\n"
-"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"
+"mostrarà els missatges únics).  Les traduccions, comentaris i comentaris\n"
+"extrets s’acumularan, a no ser que especifiqueu «--use-first», al qual cas es\n"
+"treuran del primer fitxer PO que els definesca.  Les posicions de fitxer de\n"
+"tots els fitxers PO s’acumularan.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FITXER_ENTRADA…      Fitxers d’entrada.\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1496,7 +1383,7 @@
 "                       Escriu els missatges amb menys de NÚMERO definicions\n"
 "                       (per defecte infinites).\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1507,7 +1394,7 @@
 "(per\n"
 "                       defecte 0).\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1517,8 +1404,8 @@
 "s’escriguen\n"
 "                       els missatges únics.\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1528,8 +1415,8 @@
 "properties»\n"
 "                       de Java.\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1540,12 +1427,12 @@
 "de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOM    Codificació de l’eixida.\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1555,31 +1442,28 @@
 "mescla\n"
 "                       diverses traduccions.\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"     --lang=NOM_DE_CATÀLEG\n"
-"                       Estableix el camp «Language» en l’entrada de "
-"capçalera.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "cal que especifiqueu exactament dos fitxers d’entrada"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Forma d’ús: %s [OPCIÓ] def.po ref.pot\n"
@@ -1612,12 +1496,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot              Referències al codi font.\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadors del funcionament:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1626,7 +1510,7 @@
 "  -m, --multi-domain    Aplica «ref.pot» a cadascun dels dominis de «def."
 "po».\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1655,17 +1539,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "aquest missatge ha de ser revisat pel traductor"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "aquest missatge s’empra però no s’ha definit…"
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "…però aquesta definició és similar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "aquest missatge s’empra però no s’ha definit en «%s»"
@@ -1675,14 +1559,14 @@
 msgid "warning: this message is not used"
 msgstr "avís: aquest missatge no s’empra"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cal que especifiqueu almenys dos fitxers"
@@ -1690,7 +1574,7 @@
 # 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:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1698,7 +1582,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1711,7 +1595,7 @@
 "que els definesca.  Les posicions de fitxer de tots els fitxers PO\n"
 "s’acumularan.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1722,74 +1606,74 @@
 "(per\n"
 "                       defecte 1).\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header    No escriu la capçalera amb l’entrada «msgid \"\"».\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Converteix un catàleg de traduccions a una codificació de caràcters "
 "diferent.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Objectiu de la conversió:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "La codificació per defecte és la del locale actual.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location    No escriu les línies «#: nom_fitxer:línia».\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
+"      --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "cal que especifiqueu exactament un fitxer d’entrada"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Forma d’ús: %s [OPCIÓ] FITXER_ENTRADA\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1802,7 +1686,7 @@
 "amb «xgettext»).  S’assignarà a les entrades no traduïdes una traducció igual\n"
 "al «msgid» corresponent.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FITXER_ENTRADA       Fitxer d’entrada PO o POT.\n"
@@ -1841,7 +1725,7 @@
 "L’ordre incorporada «0» genera la traducció seguida d’un octet nul.  L’eixida\n"
 "de «msgexec 0» és adequada com a entrada per a «xargs -0».\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1853,27 +1737,32 @@
 msgid "write to stdout failed"
 msgstr "no s’ha pogut escriure a l’eixida estàndard"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "no s’ha pogut escriure al subprocés «%s»"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "manca el nom d’un filtre"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cal que especifiqueu almenys un guió de «sed»"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] FILTRE [OPCIÓ_DE_FILTRE]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplica un filtre a cada traducció d’un catàleg de traduccions.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1882,18 +1771,18 @@
 "El FILTRE pot ser qualsevol programa que llija una traducció de l’entrada\n"
 "estàndard i n’escriga una de modificada a l’eixida estàndard.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPCIONS_DE_FILTRE útils quan el FILTRE és «sed»:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=GUIÓ    Afegeix el GUIÓ a les ordres a executar.\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1905,7 +1794,7 @@
 "a\n"
 "                       executar.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1913,7 +1802,7 @@
 "  -n, --quiet, --silent    Evita la impressió automàtica de l’espai de "
 "patró.\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1921,12 +1810,12 @@
 "      --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1934,109 +1823,87 @@
 "      --keep-header    Manté intacta l’entrada de capçalera, sense filtrar‐"
 "la.\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-# No empra quote().  ivb
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "«%s» necessita una especificació «-d DIRECTORI»"
+msgstr "«%s» necessita una especificació «-d directori»"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "«%s» necessita una especificació «-l LOCALE»"
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "«%s» necessita una especificació «--template PLANTILLA»"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "«%s» necessita una especificació «-o FITXER»"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "«%s» i «%s» són mútuament excloents en emprar «%s»"
+msgstr "«%s» necessita una especificació «-l locale»"
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, 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:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "«%s» només és vàlida amb «%s», «%s» o «%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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, 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:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducció difusa"
 msgstr[1] ", %d traduccions difuses"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] nom_fitxer.po…\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2045,17 +1912,17 @@
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.  El mateix ocorre amb els arguments opcionals.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nom_fitxer.po…       Fitxers d’entrada.\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode de funcionament:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2064,7 +1931,7 @@
 "  -j, --java           Mode Java: genera una classe «ResourceBundle» de "
 "Java.\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2073,13 +1940,13 @@
 "      --java2          Com «--java», però assumeix Java2 (JDK 1.2 o "
 "superior).\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2091,7 +1958,7 @@
 "                       .NET.\n"
 
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2099,41 +1966,35 @@
 "      --tcl            Mode Tcl: genera un fitxer «.msg» per a «msgcat» de\n"
 "                       Tcl.\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop        Mode Desktop: genera un fitxer «.desktop».\n"
-
 # Ull!  En aquest cas no és un fitxer PO!  ivb
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict         Genera un fitxer estrictament conforme amb Uniforum.\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURS    Nom del recurs.\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2141,15 +2002,7 @@
 msgstr ""
 "  -l, --locale=LOCALE    Nom del locale, bé «idioma» o bé «idioma_PAÍS».\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source         Produeix un fitxer «.java» en lloc d’un «.class».\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2157,7 +2010,7 @@
 "  -d DIRECTORI         Directori base de la jerarquia de directoris de les\n"
 "                       classes.\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2170,12 +2023,12 @@
 "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:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2184,7 +2037,7 @@
 "  -d DIRECTORI         Directori base dels fitxers «.dll» dependents del\n"
 "                       locale.\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2195,18 +2048,18 @@
 "subdirectori del directori especificat.  El nom del subdirectori depén del\n"
 "locale.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2216,50 +2069,12 @@
 "el\n"
 "directori especificat.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Opcions del mode Desktop:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORI         Directori base dels fitxers PO.\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kPARAULA, --keyword=PARAULA\n"
-"                       Cerca també la PARAULA clau indicada.\n"
-"  -k, --keyword        No cerca les paraules clau per defecte.\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Les opcions «-l», «-o» i «--template» són obligatòries.  Si s’especifica «-"
-"D»\n"
-"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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretació del fitxer d’entrada:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2271,14 +2086,14 @@
 "domain».\n"
 
 # Segons la doc, quan ací diu «language» es refereix a un de programació.  ivb
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2288,7 +2103,7 @@
 "                       capçalera.\n"
 
 # La directiva s’anomena «domain».  ivb
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2297,7 +2112,7 @@
 "      --check-domain    Comprova si hi ha conflictes entre les directives\n"
 "                       «domain» i l’opció «--output-file».\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2307,7 +2122,7 @@
 "                       Comprova si el «msgfmt» de GNU es comporta com el\n"
 "                       «msgfmt» d’X/Open.\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2318,12 +2133,12 @@
 "                       Comprova la presència d’acceleradors de teclat per a\n"
 "                       ítems de menú.\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2331,21 +2146,7 @@
 "  -a, --alignment=NÚMERO\n"
 "                       Alinea les cadenes a NÚMERO octets (%d per defecte).\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"     --endianness=ORDENACIÓ\n"
-"                       Escriu els números de 32 bits amb l’ordenació "
-"d’octets\n"
-"                       indicada (big-endian o little-endian, el valor per\n"
-"                       defecte depèn de la plataforma).\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2353,93 +2154,80 @@
 "      --no-hash        Fa que el fitxer binari no incloga la taula de\n"
 "                       dispersió.\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics     Mostra estadístiques sobre les traduccions.\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose        Augmenta el nivell de descripció.\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, 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:1050
+#: src/msgfmt.c:903
 #, 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:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "es descarta la directiva «domain %s»"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» buida"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» difusa"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, 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:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "«%s» no existeix"
-
-# No empra quote().  ivb
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "«%s» existeix però no s’ha pogut llegir"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2447,7 +2235,7 @@
 msgstr ""
 "no es pot emprar l’opció «%c» abans d’especificar «J», «K», «T», «C» o «X»"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2456,7 +2244,7 @@
 "Extrau d’un catàleg de traduccions tots els missatges que concorden amb\n"
 "un patró especificat o que pertanyen a uns fitxers font indicats.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2537,7 +2325,7 @@
 "  -v, --invert-match    Només tria els missatges que no concorden amb cap\n"
 "                       criteri de selecció.\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2546,19 +2334,19 @@
 "de\n"
 "                       caràcters estesos.\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file    Ordena les eixides per llurs ubicacions en fitxer.\n"
 
 # Multilínia.  ivb
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2570,7 +2358,7 @@
 "vostres traduccions.\n"
 
 # Multilínia.  ivb
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2581,12 +2369,12 @@
 "Per favor, especifiqueu el locale mitjançant l’opció «--locale» o el\n"
 "fitxer PO d’eixida mitjançant l’opció «--output-file».\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "S’ha creat «%s».\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2595,14 +2383,14 @@
 "Crea un fitxer PO nou, inicialitzant‐ne la metainformació amb valors obtesos\n"
 "de l’entorn de l’usuari.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 "  -i, --input=FITXER_ENTRADA\n"
 "                       Fitxer POT d’entrada.\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2613,14 +2401,14 @@
 "directori\n"
 "actual.  Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FITXER\n"
 "                       Escriu l’eixida al fitxer PO especificat.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2632,13 +2420,13 @@
 "s’escriuran a l’eixida estàndard.\n"
 
 # Espere que s’entenga…  ivb
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 "  -l, --locale=ii_PP    Estableix el locale objectiu (idioma i país).\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2646,7 +2434,7 @@
 "      --no-translator    Assumeix que el fitxer PO és generat "
 "automàticament.\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2654,13 +2442,13 @@
 "S’ha trobat més d’un fitxer «.pot».\n"
 "Per favor, especifiqueu el fitxer POT d’entrada amb l’opció «--input».\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error en llegir el directori actual"
 
 # Multilínia.  ivb
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2668,7 +2456,7 @@
 "No s’ha trobat cap fitxer «.pot» al directori actual.  Per favor,\n"
 "especifiqueu el fitxer POT d’entrada amb l’opció «--input».\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
@@ -2676,7 +2464,7 @@
 msgstr "el subprocés «%s» ha fallat amb codi d’eixida %d"
 
 # Aquest missatge va directament per pantalla…  ivb
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2694,7 +2482,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduccions al català del paquet «%s»"
@@ -2712,7 +2500,7 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "el fitxer d’entrada «%s» no conté una entrada de capçalera amb una "
 "especificació de joc de caràcters"
@@ -2720,7 +2508,7 @@
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "el domini «%s» del fitxer d’entrada «%s» no conté una entrada de capçalera "
@@ -2733,8 +2521,8 @@
 "el joc de caràcters destinació, «%s», no és un nom portable de codificació"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "avís: "
@@ -2875,46 +2663,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Proveu d’emprar açò, vàlid per a l’idioma «%s»:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "el catàleg de missatges té traduccions amb forma plural"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 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:384
+#: src/msgl-check.c:378
 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:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "el valor d’«nplurals» no és vàlid"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "l’expressió de «plural» no és vàlida"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "«nplurals» és %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2922,55 +2710,66 @@
 "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:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, 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:740
+#: src/msgl-check.c:730
 #, 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:814
-#, 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:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "manca el camp de capçalera «%s» a la capçalera\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "manca el camp de capçalera «%s» a la capçalera\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "cal que el camp de capçalera «%s» comence a l’inici de la línia\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+"alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2988,8 +2787,8 @@
 "el fitxer d’entrada no conté una entrada de capçalera amb una especificació "
 "de joc de caràcters"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3008,8 +2807,8 @@
 "La conversió de «%s» a «%s» crea duplicats: alguns msgid diferents esdevenen "
 "iguals."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3020,16 +2819,16 @@
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "«%s» només és vàlida amb «%s»"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipus de còpia de seguretat"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -3053,17 +2852,17 @@
 "Quan no es puga trobar una coincidència exacta s’emprarà una comparació difusa\n"
 "per a produir uns resultats millors.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po               Traduccions referents al codi font antic.\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot              Referències al nou codi font.\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -3074,7 +2873,7 @@
 "es\n"
 "                       pot especificar diverses voltes.\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -3084,29 +2883,29 @@
 "troba\n"
 "                       actualitzat.\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode d’actualització:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "El resultat es torna a escriure sobre «def.po».\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL    Crea una còpia de seguretat de «def.po».\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFIX    Substitueix el sufix habitual de còpia de "
 "seguretat.\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -3127,10 +2926,10 @@
 "                   simples en cas contrari.\n"
 "  simple, never    Fa còpies de seguretat simples sempre.\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
@@ -3138,24 +2937,24 @@
 "amb\n"
 "la variable d’entorn SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous       Manté els «msgid» anteriors dels missatges traduïts.\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent    No mostra els indicadors de progrés.\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "cal definir formes plurals d’aquest missatge"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "no s’han de definir formes plurals d’aquest missatge"
@@ -3164,7 +2963,7 @@
 # ivb  Pense que «aprofitades» queda més clar que «mesclades»; es refereix
 # ivb  a les traduccions obteses directament de «def.po».  El primer «%s» és
 # ivb  (o no) una nova línia.
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3175,7 +2974,7 @@
 
 # ivb (2002/01/08)
 # ivb  Indica el final del processament, el gènere i nombre no són importants.
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3300,7 +3099,7 @@
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3322,12 +3121,12 @@
 "de la primera traducció.  Les posicions de fitxer s’acumularan.  Quan useu\n"
 "l’opció «--unique» es descartaran els duplicats.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated       Només mostra els missatges duplicats.\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3354,7 +3153,7 @@
 "l’usuari no funcione.\n"
 
 # Multilínia.  ivb
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3364,24 +3163,24 @@
 "iconv(), i aquesta funció no permet l’ús de «%s».\n"
 
 # Multilínia.  ivb
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Instal·lar «libiconv» de GNU i reinstal·lar «gettext» de GNU resoldria\n"
+"Instaŀlar «libiconv» de GNU i reinstaŀlar «gettext» de GNU resoldria\n"
 "aquest problema.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Es continua de totes formes, espereu errors d’interpretació."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Es continua de totes formes."
 
 # Multilínia.  ivb
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3392,7 +3191,7 @@
 
 # Multilínia.  ivb
 # Es refereix a tots els missatges -> plural.  ivb
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3405,27 +3204,27 @@
 msgid "inconsistent use of #~"
 msgstr "l’ús de «#~» no és consistent"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "manca la secció «msgstr[]»"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "manca la secció «msgid_plural»"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "manca la secció «msgstr»"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la primera forma plural no té índex zero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la forma plural té un índex incorrecte"
@@ -3435,7 +3234,7 @@
 msgid "too many errors, aborting"
 msgstr "hi ha massa errors, s’avorta"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "la seqüència multioctet no és vàlida"
@@ -3481,16 +3280,16 @@
 msgid "context separator <EOT> within string"
 msgstr "s’ha trobat un separador de context «EOT» enmig de la cadena"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "aquest fitxer no ha de contenir directives «domain»"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "la definició del missatge és duplicada"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "aquesta és la ubicació de la primera definició"
 
@@ -3556,7 +3355,7 @@
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Recodifica un text en serbi de l’alfabet ciríl·lic al llatí.\n"
+msgstr "Recodifica un text en serbi de l’alfabet ciríŀlic al llatí.\n"
 
 # Missatge d’ajuda.  ivb
 #: src/recode-sr-latin.c:156
@@ -3568,12 +3367,12 @@
 "El text d’entrada es llegeix de l’entrada estàndard.  El text convertit\n"
 "s’escriu a l’eixida estàndard.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "l’entrada no és vàlida segons la codificació «%s»"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error en convertir de la condificació «%s» a la codificació «%s»"
@@ -3597,36 +3396,25 @@
 "Obté i mostra el contingut d’una URL.  Si no es pot accedir a la URL,\n"
 "s’emprarà el FITXER accessible localment en lloc d’aquella.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "error en llegir «%s»"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error en escriure a l’eixida estàndard"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "error després d’haver llegit «%s»"
-
-# És un URL.
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "S’està obtenint %s…"
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " ha expirat.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " ha fallat.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3687,30 +3475,30 @@
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "no s’ha pogut compil·lar la classe C#, per favor useu «--verbose»"
+msgstr "no s’ha pogut compiŀlar la classe C#, per favor useu «--verbose»"
 
 #: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
-msgstr "no s’ha pogut compil·lar la classe C#"
+msgstr "no s’ha pogut compiŀlar la classe C#"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, 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:1210
+#: src/write-java.c:1165
 #, 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 "
+"no s’ha pogut compiŀlar la classe Java, per favor useu «--verbose» o "
 "establiu la variable d’entorn JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
-"no s’ha pogut compil·lar la classe Java, per favor establiu la variable "
+"no s’ha pogut compiŀlar la classe Java, per favor establiu la variable "
 "d’entorn JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
@@ -3718,21 +3506,16 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "error en obrir «%s» per a escriure"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "la seqüència multioctet no és vàlida"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "els missatges internacionalitzats no han de contenir la seqüència d’escapada "
 "«%c»"
 
 # Multilínia.  ivb
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3746,7 +3529,7 @@
 "%s\n"
 
 # Multilínia.  ivb
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3835,7 +3618,7 @@
 "format de catàleg de missatges de Tcl no permet el tractament de\n"
 "plurals.\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avís: la cadena no està terminada"
@@ -3845,25 +3628,24 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avís: l’expressió regular no està terminada"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "avís: el caràcter Unicode no és vàlid"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: avís: la constant caràcter no està terminada"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avís: el literal cadena no està terminat"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+# Multilínia.  ivb
+# Cadena amb format «nom_fitxer:línia».  ivb
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code»."
+"Hi ha una cadena no‐ASCII en «%s%s».\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
 #: src/x-csharp.c:269
@@ -3907,7 +3689,7 @@
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # La funció.  ivb
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ha fallat iconv()"
@@ -3922,7 +3704,7 @@
 "%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:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
@@ -3942,24 +3724,14 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avís: s’ha trobat «}» on s’esperava «)»"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "manca el context de la cadena extreta de l’element «%s»"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "no es permet l’element arrel «%s» en un fitxer Glade vàlid"
-
 # Crec que no hauria de tenir traducció.  ivb
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
 # Multilínia.  L’argument és el nom del programa.  ivb
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3973,78 +3745,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: avís: el punt de codi surrogat U+%04X està solt"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
-
-# Multilínia.  ivb
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: La seqüència multioctet no és vàlida.\n"
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
-
-# Multilínia.  ivb
-# Hau!  ivb
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: La seqüència multioctet llarga no és completa.\n"
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
-
-# Multilínia.  ivb
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Hi ha una seqüència multioctet incompleta al final del fitxer.\n"
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
-
-# Multilínia.  ivb
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Hi ha una seqüència multioctet incompleta al final de la línia.\n"
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
-
-# Multilínia.  ivb
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-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-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
-
-# No empra quote().  ivb
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: avís: no es permet «%s»"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: avís: l’etiquetatge XML no està terminat"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -4088,17 +3788,19 @@
 
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
+"Hi ha una cadena no‐ASCII en «%s%s».\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
 "«--from-code» o mitjançant un comentari com es descriu en\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4112,7 +3814,7 @@
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4125,7 +3827,7 @@
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4138,7 +3840,7 @@
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4151,7 +3853,7 @@
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4164,7 +3866,7 @@
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # No multilínia.  ivb
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "la codificació «%s» no és coneguda, s’emprarà ASCII al seu lloc"
@@ -4194,40 +3896,29 @@
 "%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; "
 "useu «eval_gettext» al seu lloc"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
-
-#: src/xgettext.c:545
-#, 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"
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "«xgettext» no funciona sense paraules clau que cercar"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4237,12 +3928,12 @@
 "                       Empra «NOM.po» com a eixida (en lloc de «messages."
 "po»).\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4251,12 +3942,12 @@
 "                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
 
 # Es refereix al llenguatge de programació.  ivb
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4265,8 +3956,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NOM    Reconeix el llenguatge especificat (C, C++,\n"
 "                       ObjectiveC, PO, Shell, Python, Lisp, EmacsLisp, "
@@ -4274,15 +3964,14 @@
 "                       Scheme, Smalltalk, Java, JavaProperties, C#, awk, "
 "YCP,\n"
 "                       Tcl, Perl, PHP, GCC-source, NXStringTable, RST, "
-"Glade,\n"
-"                       Lua, JavaScript, Vala, Desktop).\n"
+"Glade).\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++            Equival a «--language=C++».\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4292,7 +3981,7 @@
 "fitxer\n"
 "d’entrada.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4301,20 +3990,20 @@
 "      --from-code=NOM    Codificació dels fitxers d’entrada (excepte per a\n"
 "                       Python, Tcl i Glade).\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
@@ -4322,8 +4011,8 @@
 "                       No extreu les entrades que ja es troben al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4331,60 +4020,50 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cETIQUETA, --add-comments=ETIQUETA\n"
-"                       Inclou al fitxer d’eixida els blocs de comentaris "
-"que\n"
-"                       comencen amb l’ETIQUETA i que precedeixen les línies\n"
-"                       amb una paraula clau.\n"
-"  -c, --add-comments    Inclou al fitxer d’eixida tots els blocs de "
-"comentaris\n"
-"                       que precedeixen les línies amb una paraula clau.\n"
+"  -c, --add-comments[=ETIQUETA]\n"
+"                       Inclou els blocs de comentaris marcats amb "
+"l’ETIQUETA,\n"
+"                       o aquells que precedeixen les línies amb una paraula\n"
+"                       clau, al fitxer d’eixida.\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcions específiques del llenguatge:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, 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:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++, ObjectiveC, "
 "Shell,\n"
 "                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
 "awk,\n"
-"                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
-"                       Vala.)\n"
+"                       Tcl, Perl, PHP, GCC-source i Glade.)\n"
 
-# No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:937
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, "
-"Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
-"awk,\n"
-"                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
-"                       Vala, Desktop.)\n"
+"  -k, --keyword[=PARAULA]\n"
+"                       Paraula clau addicional a cercar (si no s’especifica "
+"la\n"
+"                       PARAULA no s’empraran les paraules clau per "
+"defecte).\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4397,58 +4076,56 @@
 "                       l’argument ARG de la paraula clau PARAULA.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++, ObjectiveC, "
 "Shell,\n"
 "                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
 "awk,\n"
-"                       YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript i\n"
-"                       Vala.)\n"
+"                       YCP, Tcl, Perl, PHP i GCC-source.)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, 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:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                       (Només per al llenguatge C++.)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde            Reconeix les cadenes de format de KDE 4.\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, 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:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4457,14 +4134,14 @@
 "de\n"
 "                       cadenes de format.\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4472,7 +4149,7 @@
 "                       Estableix a l’eixida la propietària o propietari del\n"
 "                       copyright.\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4481,21 +4158,21 @@
 "a\n"
 "                       uns usuaris diferents.\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4505,31 +4182,30 @@
 "cadenes\n"
 "                       «msgid».\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[CADENA], --msgstr-prefix[=CADENA]\n"
-"                       Empra la CADENA (o la cadena buida) com a prefix "
-"dels\n"
-"                       valors les entrades «msgstr».\n"
+"  -m, --msgstr-prefix[=CADENA]\n"
+"                       Empra la CADENA, o «», com a prefix de les entrades\n"
+"                       «msgstr».\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[CADENA], --msgstr-suffix[=CADENA]\n"
-"                       Empra la CADENA (o la cadena buida) com a sufix dels\n"
-"                       valors les entrades «msgstr».\n"
+"  -M, --msgstr-suffix[=CADENA]\n"
+"                       Empra la CADENA, o «», com a sufix de les entrades\n"
+"                       «msgstr».\n"
 
 # Missatge d’error.  ivb
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4537,29 +4213,26 @@
 msgstr ""
 "Un argument de «--flag» no té la sintaxi «PARCLAU:NUMARG:[pass-]INDIC»: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada estàndard"
 
-# Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Hi ha un caràcter no‐ASCII en «%s%s»."
+msgstr ""
 
-# Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Hi ha un comentari no‐ASCII en o abans de «%s%s»."
+msgstr ""
 
-# Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Hi ha una cadena no‐ASCII en «%s%s»."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avís: "
@@ -4569,7 +4242,7 @@
 # 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:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4583,7 +4256,7 @@
 # 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4593,7 +4266,7 @@
 "Motiu: %s\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4607,7 +4280,7 @@
 "arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4617,32 +4290,32 @@
 "«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
 "cadena buida.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, 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:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "avís: manca el context de la paraula clau «%.*s»"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, 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:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4652,11 +4325,35 @@
 "d’ordres.\n"
 
 # Llenguatge de programació.  ivb
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "el llenguatge «%s» no és conegut"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<sense nom>"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: no es permet l’opció «%c»\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle() ha fallat amb el codi d’error 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Encara no s’ha implementat."
+
+#~ 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»"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "la comunicació amb el subprocés «%s» ha fallat"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "no s’ha pogut llegir del subprocés «%s»"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "el camp «%s» encara té el valor inicial per defecte\n"
diff -Nru gettext-0.19.3/gettext-tools/po/ChangeLog gettext-0.18.1.1/gettext-tools/po/ChangeLog
--- gettext-0.19.3/gettext-tools/po/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/ChangeLog	2010-06-06 12:49:57.000000000 +0000
@@ -1,179 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* es.po: Update.
-
-2014-10-08  Daiki Ueno  <ueno@gnu.org>
-
-	* Makevars (MSGINIT_OPTIONS): New variable.
-	* Makevars.template (MSGINIT_OPTIONS): Likewise.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	po: Sync gettext-tools/po/Makevars with gettext-runtime/po/Makevars
-	* Makevars (PACKAGE_GNU, PO_DEPENDS_ON_POT)
-	(DIST_DEPENDS_ON_UPDATE_PO): New variables.
-	* Makevars.template (PACKAGE_GNU, PO_DEPENDS_ON_POT)
-	(DIST_DEPENDS_ON_UPDATE_PO): New variables.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	* Rules-quot: Use built-in filter if possible.
-
-2014-04-02  Daiki Ueno  <ueno@gnu.org>
-
-	* Rules-quot: Add a license notice.
-
-2013-07-04  Daiki Ueno  <ueno@gnu.org>
-
-	* bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
-	* de.po: Update from Jakob Kramer <jakob.kramer@gmx.de>.
-	* fi.po: Update from Jorma Karvonen <karvonen.jorma@gmail.com>.
-	* it.po: Update from Marco Colombo <m.colombo@ed.ac.uk>.
-	* ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
-	* ko.po: Update from Changwoo Ryu <cwryu@debian.org>.
-	* pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>.
-	* pt_BR.po: Update from Rafael Ferreira <rafael.f.f1@gmail.com>.
-	* sl.po: Update from Primoz PETERLIN <primozz.peterlin@gmail.com>.
-	* sk.po: Update from Marcel Telka <marcel@telka.sk>.
-	* sv.po: Update from Jan Djärv <jan.h.d@swipnet.se>.
-	* uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
-	* vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-	* zh_CN.po: Update from Ji ZhengYu <zhengyuji@gmail.com>.
-
-2013-06-25  Daiki Ueno  <ueno@gnu.org>
-
-	Allow user to supply custom sed command when generating en@quot.po.
-	This is necessary because BSD Sed is known not to work well with
-	an input not ending with a newline.
-	* Makefile.in.in (SED): Define using @SED@.
-	* Rules-quot: Use '$(SED)' instead of 'sed' as the FILTER argument
-	of msgfilter.
-	Reported by Mats Erik Andersson in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00028.html>.
-
-2013-06-04  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Vala.
-	* POTFILES.in: Add src/x-vala.c.
-
-2013-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	* POTFILES.in: Add src/format-javascript.c, src/format-lua.c,
-	src/format-python-brace.c, src/x-javascript.c, and src/x-lua.c.
-
-2013-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* POTFILES.in: Add gnulib-lib/set-acl.c.  Remove
-	gnulib-lib/set-mode-acl.c.
-
-2013-03-02  Bruno Haible  <bruno@clisp.org>
-
-	* bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
-	* ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
-	* pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>.
-	* uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
-	* vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-07  Bruno Haible  <bruno@clisp.org>
-
-	* de.po: Update from Karl Eichwalder <ke@suse.de>.
-	* gl.po: Update from Leandro Regueiro <leandro.regueiro@gmail.com>.
-	* ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
-	* pa.po: New file, from A S Alam <aalam@users.sf.net>.
-	* sk.po: Update from Marcel Telka <marcel@telka.sk>.
-	* uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
-	* vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
-	* LINGUAS: Add pa.
-
-2012-02-19  Bruno Haible  <bruno@clisp.org>
-
-	Rules.quot: Reenable use of build gettext tools in gettext package.
-	* Rules-quot (.insert-header.po-update-en): Augment PATH in the
-	gettext-tools package.
-
-2011-08-11  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Makefile.in.in: fix make -q problem
-	* build-aux/po/Makefile.in.in (check-macro-version): Remove this
-	rule, since there's no file named 'check-macro-version' and its
-	use as a file breaks make -q.
-	(all): Don't depend on check-macro-version.
-	(CHECK_MACRO_VERSION): New macro.
-	(stamp-po): Use it.
-
-2011-08-28  Bruno Haible  <bruno@clisp.org>
-
-	* ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	* POTFILES.in: Add src/format-gfc-internal.c, src/format-qt-plural.c.
-
-2011-01-18  Bruno Haible  <bruno@clisp.org>
-
-	* da.po: Update from Keld Simonsen <keld@keldix.com>.
-	* sl.po: Update from Primoz Peterlin <primozz.peterlin@gmail.com>.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* POTFILES.in: Add gnulib-lib/copy-acl.c, gnulib-lib/pipe-filter-ii.c,
-	gnulib-lib/set-mode-acl.c, gnulib-lib/spawn-pipe.c. Remove
-	gnulib-lib/pipe.c.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	* POTFILES.in: Add src/format-c-parse.h.
-
-2010-10-10  Bruno Haible  <bruno@clisp.org>
-
-	* bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
-
-2010-08-23  Bruno Haible  <bruno@clisp.org>
-
-	* fi.po: Update from Jorma Karvonen <karvonen.jorma@gmail.com>.
-	* it.po: Update from Marco Colombo <m.colombo@ed.ac.uk>.
-
-2010-07-27  Bruno Haible  <bruno@clisp.org>
-
-	* fr.po: Update from Christophe Combelles <ccomb@free.fr>.
-
-2010-07-02  Bruno Haible  <bruno@clisp.org>
-
-	* zh_CN.po: Update from Ji ZhengYu <zhengyuji@gmail.com>.
-
-2010-06-12  Bruno Haible  <bruno@clisp.org>
-
-	* Makefile.in.in ($(DOMAIN).pot-update): When GNU find is available,
-	avoid grepping through monster files.
-	Reported by Jim Meyering <jim@meyering.net>.
-
-2010-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Offer more choices in the Makevars template.
-	* Makevars.template (USE_MSGCTXT, MSGMERGE_OPTIONS): New variables.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/cs.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/cs.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/cs.po gettext-0.18.1.1/gettext-tools/po/cs.po
--- gettext-0.19.3/gettext-tools/po/cs.po	2014-10-16 06:10:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/cs.po	2010-06-06 12:49:57.000000000 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -35,72 +35,75 @@
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
-#, c-format
+# src/message.c:1115
+#: gnulib-lib/clean-temp.c:335
+#, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+# src/message.c:1115
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr ""
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-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
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
+#, c-format
+msgid "error while opening \"%s\" for reading"
 msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
 
-#: gnulib-lib/copy-file.c:193
-#, c-format
-msgid "cannot open backup file %s for writing"
-msgstr ""
+# src/msgfmt.c:321
+#: gnulib-lib/copy-file.c:74
+#, fuzzy, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "chyba p�i �ten� \"%s\""
 
 # src/message.c:1182
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "chyba p�i z�pisu do souboru \"%s\""
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "chyba p�i �ten� \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -118,110 +121,110 @@
 msgstr ""
 
 # lib/error.c:91
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 # lib/getopt.c:628
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: p�ep�na� `%s' nen� jednozna�n�\n"
 
 # lib/getopt.c:652
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: p�ep�na� `--%s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:657
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: p�ep�na� `%c%s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
 
 # lib/getopt.c:703
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nezn�m� p�ep�na� `--%s'\n"
 
 # lib/getopt.c:707
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nezn�m� p�ep�na� `%c%s'\n"
 
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nezn�m� p�ep�na� -- %c\n"
 
 # lib/getopt.c:766 lib/getopt.c:896
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: p�ep�na� vy�aduje argument -- %c\n"
 
 # lib/getopt.c:813
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: p�ep�na� `-W %s' nen� jednozna�n�\n"
 
 # lib/getopt.c:831
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: p�ep�na� ` -W %s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 # src/message.c:1182
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba p�i z�pisu do souboru \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -231,99 +234,61 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 # lib/xmalloc.c:82
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pam� vy�erp�na"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+# src/message.c:1115
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
 # src/message.c:1115
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
@@ -339,23 +304,14 @@
 msgid "%s subprocess got fatal signal %d"
 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:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 # src/msgfmt.c:909
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -365,7 +321,7 @@
 
 # src/msgfmt.c:909
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
@@ -373,12 +329,10 @@
 msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
 
 # src/msgfmt.c:909
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
@@ -388,27 +342,25 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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�"
@@ -494,16 +446,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -628,7 +570,6 @@
 "%u parameters."
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
@@ -672,11 +613,11 @@
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-# src/msgfmt.c:909
+# src/msgfmt.c:892
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
 
 # src/msgfmt.c:909
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
@@ -692,9 +633,7 @@
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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�"
@@ -710,17 +649,19 @@
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
+# src/msgfmt.c:892
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr ""
+msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
 
+# src/msgfmt.c:892
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr ""
+msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
 
 # src/msgfmt.c:909
 #: src/format-python.c:460 src/format-sh.c:297
@@ -736,32 +677,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -803,11 +718,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -818,61 +733,61 @@
 
 # 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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
 # src/gettextp.c:164
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "p��li� mnoho argument�"
 
 # 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/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "V�ce informac� z�sk�te p��kazem `%s --help'.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -880,34 +795,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -918,11 +833,11 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
@@ -930,241 +845,231 @@
 "(pouze\n"
 "anglicky), p�ipom�nky k p�ekladu zas�lejte na adresu <cs@li.org> (�esky).\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
-#, c-format
+# src/msgcmp.c:165 src/msgmerge.c:272
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#, fuzzy, c-format
 msgid "at most one input file allowed"
-msgstr ""
+msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s se vz�jemn� vylu�uj�"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "vstupn� soubor nen� zad�n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1173,118 +1078,135 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, c-format
+# src/msgunfmt.c:215
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
+"Pou�it�: %s [P�EP�NA�] [SOUBOR]...\n"
+"  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+"kr�tk�\n"
+"formy.\n"
+"\n"
+"  -e, --no-escape          nepou��v� C escape sekvence ve v�stupu "
+"(implicitn�)\n"
+"  -E, --escape             pou��v� C escape sekvence ve v�stupu, bez\n"
+"                           roz���en�ch znak�\n"
+"      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+"  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+"  -i, --indent             odsazen� v�stupn� styl\n"
+"  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+"      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+"  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+"  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1293,9 +1215,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
 "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
@@ -1313,94 +1235,94 @@
 "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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
 # src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "vstupn� soubory nejsou zad�ny"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1441,19 +1363,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1480,19 +1402,19 @@
 msgstr ""
 
 # src/msgcmp.c:259 src/msgmerge.c:711
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "tato zpr�va je pou�ita, ale nikoli definov�na..."
 
 # src/msgcmp.c:261 src/msgmerge.c:713
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale tato definice je podobn�"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
@@ -1504,7 +1426,7 @@
 msgstr "upozorn�n�: tato zpr�va nen� pou�ita"
 
 # src/po-lex.c:84
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1512,12 +1434,12 @@
 msgstr[1] "nalezeny %d z�va�n� chyby"
 msgstr[2] "nalezeno %d z�va�n�ch chyb"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, 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:364
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1525,7 +1447,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1545,76 +1467,76 @@
 "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:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "vstupn� soubor nen� zad�n"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1623,15 +1545,16 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
+# src/gettextp.c:154
 #: src/msgexec.c:196
-#, c-format
+#, fuzzy, c-format
 msgid "missing command name"
-msgstr ""
+msgstr "chyb� argumenty"
 
 #: src/msgexec.c:257
 #, c-format
@@ -1655,7 +1578,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1665,46 +1588,51 @@
 msgid "write to stdout failed"
 msgstr ""
 
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
 # src/gettextp.c:154
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "chyb� argumenty"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1712,96 +1640,74 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-# src/xgettext.c:378 src/xgettext.c:382
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s a %s se vz�jemn� vylu�uj�"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
 # src/msgfmt.c:343
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1810,7 +1716,7 @@
 msgstr[2] "%d p�elo�en�ch zpr�v"
 
 # src/msgfmt.c:345
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1819,7 +1725,7 @@
 msgstr[2] ", %d ne�pln�ch p�eklad�"
 
 # src/msgfmt.c:347
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1827,118 +1733,105 @@
 msgstr[1] ", %d nep�elo�en� zpr�vy"
 msgstr[2] ", %d nep�elo�en�ch zpr�v"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1947,78 +1840,49 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
-#, c-format
+# src/msgfmt.c:273 src/xgettext.c:410
+#: src/msgfmt.c:711
+#, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
-msgstr ""
+msgstr "vstupn� soubor nen� zad�n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2026,33 +1890,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2060,72 +1924,67 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
-#, c-format
+#: src/msgfmt.c:890
+#, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
+"%s: upozorn�n�: chyb� hlavi�ka PO souboru (ne�pln� nebo neplatn�)\n"
+"%*s  upozorn�n�: p�evod znakov� sady nebude fungovat"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, 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:1050
-#, c-format
+#: src/msgfmt.c:903
+#, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
+"%s: upozorn�n�: chyb� hlavi�ka PO souboru (ne�pln� nebo neplatn�)\n"
+"%*s  upozorn�n�: p�evod znakov� sady nebude fungovat"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 # src/msgfmt.c:471
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -2133,67 +1992,56 @@
 "p�edpona"
 
 # src/msgfmt.c:489
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "p��kaz `domain %s' ignorov�n"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "pr�zdn� polo�ka `msgstr' ignorov�na"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ne�pln� polo�ka `msgstr' ignorov�na"
 
 # src/msgfmt.c:668
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, 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:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba p�i �ten� \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2233,30 +2081,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2264,24 +2112,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2289,54 +2137,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2348,7 +2196,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2366,13 +2214,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2382,8 +2230,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: upozorn�n�: "
@@ -2480,116 +2328,129 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 # src/po-lex.c:332
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "neplatn� ��d�c� sekvence"
 
-#: src/msgl-check.c:442
+# src/po-lex.c:332
+#: src/msgl-check.c:436
+#, fuzzy
 msgid "invalid plural expression"
-msgstr ""
+msgstr "neplatn� ��d�c� sekvence"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+# src/po-lex.c:332
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr ""
+msgstr "neplatn� ��d�c� sekvence"
 
-#: src/msgl-check.c:474
-#, c-format
+# src/msgcmp.c:267 src/msgmerge.c:740
+#: src/msgl-check.c:468
+#, fuzzy, 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] ""
-msgstr[2] ""
+msgstr[0] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+msgstr[1] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+msgstr[2] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
 
-#: src/msgl-check.c:490
-#, c-format
+# src/msgcmp.c:267 src/msgmerge.c:740
+#: src/msgl-check.c:484
+#, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+msgstr[1] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
+msgstr[2] "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 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:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgstr' nekon�� '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-# src/msgfmt.c:573
-#: src/msgl-check.c:814
+# src/msgfmt.c:561
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
+
+# src/msgfmt.c:564
+#: src/msgl-check.c:784
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
+
+# src/msgfmt.c:573
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have 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:831
+# src/msgfmt.c:573
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
+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/msgl-iconv.c:65
 #, c-format
@@ -2607,8 +2468,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2624,8 +2485,8 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2634,17 +2495,17 @@
 "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
 "Tato verze byla kompilov�na bez iconv().\n"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
 # src/msgmerge.c:321
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2669,51 +2530,51 @@
 "z�klad� podobnosti vzor�. T�m je dosa�eno lep��ho slit� obou katalog�.\n"
 "  Nen�-li v�stupn� soubor ur�en, v�sledek bude vypisov�n na standardn� v�stup.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2725,39 +2586,39 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
 
 # src/msgmerge.c:769
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2767,7 +2628,7 @@
 "chyb� %ld, zastaral�ch %ld.\n"
 
 # src/msgmerge.c:775
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2832,10 +2693,11 @@
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
+# src/msgfmt.c:273 src/xgettext.c:410
 #: src/msgunfmt.c:467
-#, c-format
+#, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
-msgstr ""
+msgstr "vstupn� soubor nen� zad�n"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -2866,7 +2728,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2879,12 +2741,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2905,7 +2767,7 @@
 "Ozna�en� znakov� sady \"%s\" nen� portabiln� n�zev k�dov�n�. \n"
 "P�evod znak� do u�ivatelsk� znakov� sady nebude fungovat.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2914,7 +2776,7 @@
 "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2922,15 +2784,15 @@
 "Instalace GNU libiconv a n�sledn� reinstalace GNU gettextu\n"
 "m��e napravit tento probl�m.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Pokra�uji, p�edpokl�d�na chyba parsingu."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Pokra�uji."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2939,7 +2801,7 @@
 "Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
 "Tato verze byla kompilov�na bez iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2953,29 +2815,29 @@
 msgstr "nekonzistentn� pou�it� #~"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "chyb� sekce `msgstr[]'"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "chyb� sekce `msgid_plural'"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "chyb� sekce `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "prvn� mno�n� ��slo m� nenulov� index"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "mno�n� ��slo m� chybn� index"
@@ -2986,7 +2848,7 @@
 msgid "too many errors, aborting"
 msgstr "p��li� mnoho chyb, kon��m"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatn� v�ceznakov� sekvence"
@@ -3035,18 +2897,18 @@
 msgstr ""
 
 # src/xgettext.c:658 src/xgettext.c:968
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento soubor nem��e obsahovat p��kazy pro dom�nu"
 
 # src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "dvojn�sobn� definice zpr�vy"
 
 # src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...toto je um�st�n� prvn� definice"
@@ -3075,9 +2937,11 @@
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
 
+# src/xget-lex.c:892
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
+msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
 
 # src/xget-lex.c:914
 #: src/read-stringtable.c:802
@@ -3085,9 +2949,11 @@
 msgid "warning: unterminated string"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
+# src/xget-lex.c:914
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr ""
+msgstr "%s:%d: upozorn�n�: kl��ov� slovo uhn�zd�no v argumentu kl��ov�ho slova"
 
 # src/xget-lex.c:914
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
@@ -3095,13 +2961,17 @@
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
+# src/xget-lex.c:914
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr ""
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
+# src/xget-lex.c:914
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
+msgstr "%s:%d: upozorn�n�: kl��ov� slovo uhn�zd�no v argumentu kl��ov�ho slova"
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
@@ -3130,14 +3000,14 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "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/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
@@ -3160,24 +3030,12 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "chyba p�i �ten� \"%s\""
-
 # src/message.c:1182
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "chyba p�i z�pisu do souboru \"%s\""
 
-# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "chyba p�i �ten� \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3250,17 +3108,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3271,19 +3129,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "neplatn� v�ceznakov� sekvence"
-
 # src/message.c:784
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "zpr�vy katalogu nesm� obsahovat escape sekvenci `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3292,7 +3145,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3353,7 +3206,7 @@
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
@@ -3364,24 +3217,19 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
-
 # src/xget-lex.c:892
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
 
 # src/xget-lex.c:914
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3413,7 +3261,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3426,16 +3274,16 @@
 msgstr ""
 
 # src/xget-lex.c:892
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
 
-# src/xget-lex.c:892
+# src/xget-lex.c:914
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
@@ -3447,22 +3295,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3477,63 +3315,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-# src/xget-lex.c:914
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-# src/msgcmp.c:281
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "upozorn�n�: tato zpr�va nen� pou�ita"
-
-# src/xget-lex.c:914
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3570,13 +3351,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3584,7 +3365,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3592,7 +3373,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3600,7 +3381,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3608,7 +3389,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3616,7 +3397,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3631,10 +3412,11 @@
 msgid "%s:%d: missing number after #"
 msgstr ""
 
+# src/xget-lex.c:914
 #: src/x-rst.c:207
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
-msgstr ""
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3643,64 +3425,53 @@
 "use eval_gettext instead"
 msgstr ""
 
-# src/xget-lex.c:914
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
 # src/xgettext.c:386
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:501
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "vstupn� soubor nen� zad�n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3709,45 +3480,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3757,37 +3527,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3795,85 +3561,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3881,7 +3646,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3889,7 +3654,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3897,45 +3662,45 @@
 msgstr ""
 
 # src/xget-lex.c:150
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardn� vstup"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: upozorn�n�: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3944,45 +3709,45 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "jazyk `%s' nen� zn�m"
 
 #: libgettextpo/gettext-po.c:84
@@ -3993,6 +3758,11 @@
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: nezn�m� p�ep�na� -- %c\n"
 
+# src/msgfmt.c:583
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
+
 # src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
 # src/msgunfmt.c:175 src/xgettext.c:394
 #~ msgid ""
@@ -4009,236 +3779,133 @@
 #~ "Z�RUKY,\n"
 #~ "a to i bez z�ruky PRODEJNOSTI nebo VHODNOSTI PRO N�JAK� KONKR�TN� ��EL.\n"
 
-# src/gettextp.c:233
-#~ msgid ""
-#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-#~ "  -e                        enable expansion of some escape sequences\n"
-#~ "  -E                        (ignored for compatibility)\n"
-#~ "  -h, --help                display this help and exit\n"
-#~ "  -n                        suppress trailing newline\n"
-#~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-#~ "                            to MSGID from TEXTDOMAIN\n"
-#~ msgstr ""
-#~ "Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID ] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=TEXTOV�DOM�NA nastav� textovou dom�nu, ze kter� je MSGID\n"
-#~ "  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
-#~ "  -E                         (ignorov�n - kv�li kompatibilit�)\n"
-#~ "  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
-#~ "  -n                         potla�� nov� ��dky na konci zpr�vy\n"
-#~ "  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
-#~ "  [TEXTOV�DOM�NA] MSGID      vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
-#~ "                             MSGID z TEXTOV�DOM�NY\n"
-
-# src/gettextp.c:245
-#~ msgid ""
-#~ "\n"
-#~ "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"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' "
-#~ "command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those "
-#~ "messages\n"
-#~ "found in the selected catalog are translated.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
-#~ "prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
-#~ "v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, "
-#~ "zadan�m\n"
-#~ "v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
-#~ "  Je-li pou�it argument -s, program se chov� jako p��kaz `echo'. M�sto "
-#~ "toto,\n"
-#~ "aby pouze kop�roval svoje argumenty do stdout, vyp��e p�eklad zpr�v ze\n"
-#~ "zvolen�ho katalogu. \n"
-#~ "\n"
-#~ "  Standardn� prohled�van� adres��: %s\n"
+#~ msgid "%s: warning: "
+#~ msgstr "%s: upozorn�n�: "
 
-# src/msgcmp.c:396 src/msgmerge.c:539
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "tato zpr�va nem� ��dnou definici v dom�n� \"%s\""
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
 
-# src/xgettext.c:340 src/xgettext.c:1256
-#~ msgid "while preparing output"
-#~ msgstr "p�i p��prav� v�stupu"
+# src/xget-lex.c:914
+#, fuzzy
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
-# src/xgettext.c:537
+# src/msgmerge.c:303
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] INPUTFILE ...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
-#~ "search\n"
+#~ "Output details:\n"
 #~ "  -e, --no-escape                do not use C escapes in output "
 #~ "(default)\n"
 #~ "  -E, --escape                   use C escapes in output, no extended "
 #~ "chars\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "  -h, --help                     display this help and exit\n"
-#~ msgstr ""
-#~ "Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
-#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
-#~ "kr�tk�\n"
-#~ "formy.\n"
-#~ "\n"
-#~ "  -d, --default-domain=JM�NO  zap��e v�stup do JM�NO.po (m�sto do "
-#~ "messages.po)\n"
-#~ "  -D, --directory=ADRES��     p�id� ADRES�� do seznamu adres��� pro "
-#~ "hled�n�\n"
-#~ "                              vstupn�ch soubor�\n"
-#~ "  -e, --no-escape             nepou��v� escape sekvence z C ve v�stupu\n"
-#~ "                              (implicitn�)\n"
-#~ "  -E, --escape                pou��v� C escape sekvence ve v�stupu, bez\n"
-#~ "                              roz���en�ch znak�\n"
-#~ "  -f, --files-from=SOUBOR     vezme seznam vstupn�ch soubor� ze SOUBORu\n"
-#~ "      --force-po              vyp��e .po soubor, i kdy� je pr�zdn�\n"
-#~ "  -F, --sort-by-file          se�ad� v�stup podle um�st�n� zpr�v ve "
-#~ "zdrojov�ch\n"
-#~ "                              souborech\n"
-#~ "  -h, --help                  vyp��e tuto n�pov�du a ukon�� se\n"
-
-# src/xgettext.c:569
-#~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ "  -n, --add-location             generate '#: filename:line' lines "
 #~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
 #~ "      --strict                   write out strict Uniforum conforming .po "
 #~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
-#~ "                                 that only unique messages be printed\n"
-#~ msgstr ""
-#~ "  -i, --indent                vyp��e .po soubor odsazovac�m stylem\n"
-#~ "      --no-location           nevytv��� ��dky '#: filename:line'\n"
-#~ "  -n, --add-location          vytv��� ��dky '#: jm�no_souboru:��dka' "
-#~ "��dky\n"
-#~ "                              (implicitn�)\n"
-#~ "      --omit-header           nevypisuje hlavi�ku s `msgid \"\"' "
-#~ "polo�kou\n"
-#~ "  -o, --output=SOUBOR         zap��e v�stup do ur�en�ho souboru\n"
-#~ "  -p, --output-dir=ADRES��    v�stupn� soubory budou um�st�ny do tohoto\n"
-#~ "                              adres��e\n"
-#~ "  -s, --sort-output           generuje se�azen� v�stup bez duplicitn�ch "
-#~ "zpr�v\n"
-#~ "      --strict                vytvo�� v�stupn� soubor ve stylu Uniforum\n"
-#~ "  -T, --trigraphs             rozum� ANSI C `trigraphs' na vstupu\n"
-#~ "  -u, --unique                zkratka pro --less-than=2, v�stupem budou "
-#~ "pouze\n"
-#~ "                              zpr�vy obsa�en� v katalog�ch pouze jednou\n"
-
-# src/msgfmt.c:366
-#~ msgid ""
-#~ "Usage: %s [OPTION] filename.po ...\n"
-#~ "Generate binary message catalog from textual translation description.\n"
-#~ "\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
-#~ "%d)\n"
-#~ "  -c, --check                 perform language dependent checks on "
-#~ "strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash "
-#~ "table\n"
-#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
-#~ "      --statistics            print statistics about translations\n"
-#~ "      --strict                enable strict Uniforum mode\n"
-#~ "  -v, --verbose               list input file anomalies\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "\n"
-#~ "Giving the -v option more than once increases the verbosity level.\n"
-#~ "\n"
-#~ "If input file is -, standard input is read.  If output file is -,\n"
-#~ "output is written to standard output.\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
-#~ "Pou�it�: %s [P�EP�NA�] soubor.po ...\n"
-#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro "
-#~ "odpov�daj�c�\n"
-#~ "kr�tk� formy.\n"
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
 #~ "\n"
-#~ "  -a, --alignment=��SLO    zarovn� �et�zce do ��SLO bajt� (implicitn�: "
-#~ "%d)\n"
-#~ "  -c, --check              vykon� jazykov� z�visl� kontroly �et�zc�\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
 #~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
 #~ "                           vstupn�ch soubor�\n"
-#~ "  -f, --use-fuzzy          ve v�stupu pou�ije i ne�pln� p�eklady\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
 #~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
-#~ "      --no-hash            bin�rn� soubor nebude obsahovat ha�ovac� "
-#~ "tabulku\n"
-#~ "  -o, --output-file=SOUBOR zap��e v�stup do souboru SOUBOR\n"
-#~ "      --statistics         vyp��e statistiky o p�ekladech\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
 #~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
-#~ "  -v, --verbose            vyp��e seznam neobvyklost� ve vstupn�m "
-#~ "souboru\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
 #~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
-#~ "\n"
-#~ "  Zad�n�m p�ep�na�e -v v�ce ne� jednou, zv���te podrobnost v�pis�.\n"
-#~ "\n"
-#~ "  Bude-li vstupn� soubor -, bude �ten standardn� vstup. Jestli�e "
-#~ "v�stupn�\n"
-#~ "soubor bude -, v�stup bude vypisov�n do standardn�ho v�stupu.\n"
-
-# src/msgfmt.c:407
-#~ msgid "while creating hash table"
-#~ msgstr "p�i tvorb� ha�ovac� tabulky"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
+# src/msgmerge.c:303
+#, fuzzy
 #~ msgid ""
-#~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
-#~ "%*s  warning: charset conversion will not work"
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "%s: upozorn�n�: chyb� hlavi�ka PO souboru (ne�pln� nebo neplatn�)\n"
-#~ "%*s  upozorn�n�: p�evod znakov� sady nebude fungovat"
-
-# src/msgfmt.c:564
-#~ msgid "header field `%s' should start at beginning of line"
-#~ msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
-
-# src/msgfmt.c:583
-#~ msgid "field `%s' still has initial default value"
-#~ msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
 # src/msgmerge.c:303
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] def.po ref.po\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -C, --compendium=FILE       additional library of message "
-#~ "translations,\n"
-#~ "                              may be specified more than once\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "      --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "  -i, --indent                indented output style\n"
-#~ "  -o, --output-file=FILE      result will be written to FILE\n"
+#~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
 #~ "      --add-location          preserve '#: filename:line' lines "
 #~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
-#~ "  -v, --verbose               increase verbosity level\n"
-#~ "  -V, --version               output version information and exit\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "      --sort-output           generate sorted output\n"
+#~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
 #~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
@@ -4267,19 +3934,18 @@
 #~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
 # src/msgunfmt.c:215
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] [FILE]...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "Output details:\n"
 #~ "  -e, --no-escape          do not use C escapes in output (default)\n"
 #~ "  -E, --escape             use C escapes in output, no extended chars\n"
 #~ "      --force-po           write PO file even if empty\n"
-#~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
-#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
-#~ "  -V, --version            output version information and exit\n"
 #~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
 #~ "Pou�it�: %s [P�EP�NA�] [SOUBOR]...\n"
 #~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
@@ -4298,56 +3964,95 @@
 #~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
 #~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
-# src/msgunfmt.c:229
+# src/msgmerge.c:303
+#, fuzzy
 #~ msgid ""
-#~ "\n"
-#~ "Convert binary .mo files to Uniforum style .po files.\n"
-#~ "Both little-endian and big-endian .mo files are handled.\n"
-#~ "If no input file is given or it is -, standard input is read.\n"
-#~ "By default the output is written to standard output.\n"
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid "
+#~ "bugs\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
+#~ "kr�tk�\n"
+#~ "formy.\n"
 #~ "\n"
-#~ "  P�ev�d� bin�rn� .mo soubory do .po soubor� stylu Uniforum. Oba typy ."
-#~ "mo\n"
-#~ "soubor� little-endian a big-endian jsou akceptov�ny.\n"
-#~ "  Nebude-li vstupn� soubor zad�n, nebo bude-li -, bude �ten standardn� "
-#~ "vstup.\n"
-#~ "Implicitn� je v�stup zapisov�n do standardn�ho v�stupu.\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t "
+#~ "zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu "
+#~ "(implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:"
+#~ "��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
-# src/msgunfmt.c:298
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
+# src/gettextp.c:154
+#~ msgid "missing arguments"
+#~ msgstr "chyb� argumenty"
 
 # src/gettextp.c:233
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 #~ "  -e                        enable expansion of some escape sequences\n"
 #~ "  -E                        (ignored for compatibility)\n"
 #~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
 #~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
-#~ "(plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this "
-#~ "value\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
 #~ msgstr ""
-#~ "Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID MSGID-PLURAL PO�ET\n"
-#~ "  -d, --domain=TEXTOV�DOM�NA p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
+#~ "Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID ] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=TEXTOV�DOM�NA nastav� textovou dom�nu, ze kter� je MSGID\n"
 #~ "  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
 #~ "  -E                         (ignorov�n - kv�li kompatibilit�)\n"
 #~ "  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
 #~ "  -n                         potla�� nov� ��dky na konci zpr�vy\n"
 #~ "  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
-#~ "  [TEXTOV�DOM�NA]            p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
-#~ "  MSGID MSGID-PLURAL         vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
-#~ "                             MSGID / MSGID-PLURAL\n"
-#~ "  PO�ET                      na z�klad� t�to hodnoty vybere odpov�daj�c�\n"
-#~ "                             p�eklad\n"
+#~ "  [TEXTOV�DOM�NA] MSGID      vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
+#~ "                             MSGID z TEXTOV�DOM�NY\n"
 
 # src/gettextp.c:245
+#, fuzzy
 #~ msgid ""
-#~ "\n"
 #~ "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 "
@@ -4355,6 +4060,11 @@
 #~ "regular directory, another location can be specified with the "
 #~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
@@ -4363,149 +4073,71 @@
 #~ "v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, "
 #~ "zadan�m\n"
 #~ "v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
-#~ "  Adres��, ve kter�m se hled�: %s\n"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#~ "  Je-li pou�it argument -s, program se chov� jako p��kaz `echo'. M�sto "
+#~ "toto,\n"
+#~ "aby pouze kop�roval svoje argumenty do stdout, vyp��e p�eklad zpr�v ze\n"
+#~ "zvolen�ho katalogu. \n"
+#~ "\n"
+#~ "  Standardn� prohled�van� adres��: %s\n"
 
-# src/xgettext.c:537
+# src/gettextp.c:245
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] INPUTFILE ...\n"
-#~ "Extract translatable string from given input files.\n"
-#~ "\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --extract-all              extract all strings\n"
-#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
-#~ "                                 preceding keyword lines) in output file\n"
-#~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision "
-#~ "result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign "
-#~ "user\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "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"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
 #~ msgstr ""
-#~ "Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
-#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich "
-#~ "kr�tk�\n"
-#~ "formy.\n"
 #~ "\n"
-#~ "  -a, --extract-all             extrahuje v�echny �et�zce\n"
-#~ "  -c, --add-comments[=JMENOVKA] um�st� blok koment��e se JMENOVKOU (nebo "
-#~ "ty,\n"
-#~ "                                kter� p�edch�zej� ��dku s kl��ov�m "
-#~ "slovem)\n"
-#~ "                                do v�stupn�ho souboru\n"
-#~ "  -C, --c++                     zkratka pro --language=C++\n"
-#~ "      --debug                   detailn�j�� informace o rozpozn�v�n�\n"
-#~ "                                form�tovac�ch �et�zc�\n"
-#~ "  -d, --default-domain=JM�NO    pou�ije JM�NO.po pro v�stup (m�sto "
-#~ "messages.po)\n"
-#~ "  -D, --directory=ADRES��       p�id� ADRES�� do seznamu adres���, ve "
-#~ "kter�ch\n"
-#~ "                                se hledaj� vstupn� soubory\n"
-#~ "  -e, --no-escape               nepou��v� C escape sekvence ve v�stupu\n"
-#~ "                                (implicitn�)\n"
-#~ "  -E, --escape                  pou��v� C escape sekvence ve v�stupu, "
-#~ "bez\n"
-#~ "                                roz���en�ch znak�\n"
-#~ "  -f, --files-from=SOUBOR       seznam vstupn�ch soubor� bude �ten ze "
-#~ "SOUBORu\n"
-#~ "      --force-po                zap��e .po soubor, i kdy� bude pr�zdn�\n"
-#~ "      --foreign-user            vynech� copyright FSF ve v�stupu \n"
-#~ "  -F, --sort-by-file            se�ad� v�stup podle um�st�n� zpr�v\n"
-#~ "                                ve zdrojov�ch souborech\n"
+#~ "  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
+#~ "prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
+#~ "v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, "
+#~ "zadan�m\n"
+#~ "v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
+#~ "  Adres��, ve kter�m se hled�: %s\n"
 
-# src/xgettext.c:555
-#~ msgid ""
-#~ "  -h, --help                     display this help and exit\n"
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
-#~ "(without\n"
-#~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C+"
-#~ "+, PO),\n"
-#~ "                                 otherwise is guessed from file "
-#~ "extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
-#~ "entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
-#~ "entries\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ msgstr ""
-#~ "  -h, --help                    vyp��e tuto n�pov�du a ukon�� se\n"
-#~ "  -i, --indent                  ve v�stupn�m .po souboru pou�ije odsazen� "
-#~ "styl\n"
-#~ "  -j, --join-existing           spoj� zpr�vy z existuj�c�ch soubor�\n"
-#~ "  -k, --keyword[=SLOVO]         dodate�n� kl��ov� slovo, kter� bude "
-#~ "hled�no\n"
-#~ "                                (bez SLOVA, znamen� nepou�it� "
-#~ "implicitn�ch\n"
-#~ "                                kl��ov�ch slov)\n"
-#~ "  -L, --language=N�ZEV          zad�n� jazyka (C, C++)           \n"
-#~ "  -m, --msgstr-prefix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p�edponu "
-#~ "pro\n"
-#~ "                                polo�ky msgstr\n"
-#~ "  -M, --msgstr-suffix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p��ponu "
-#~ "pro\n"
-#~ "                                polo�ky msgstr\n"
-#~ "      --no-location             potla�� ��dky '#: jm�no_souboru:��dek'\n"
+# src/msgunfmt.c:373
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+#~ msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
 
-# src/xgettext.c:569
-#~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -V, --version                  output version information and exit\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
-#~ "\n"
-#~ "If INPUTFILE is -, standard input is read.\n"
-#~ msgstr ""
-#~ "  -n, --add-location            vytv��� ��dky '#: jm�no_souboru:"
-#~ "��dek' (impl.)\n"
-#~ "      --omit-header             nezapisuje hlavi�ku s `msgid \"\"' "
-#~ "polo�kou\n"
-#~ "  -o, --output=SOUBOR           zap��e v�stup do ur�en�ho souboru\n"
-#~ "  -p, --output-dir=ADRES��      v�stupn� soubory budou um�st�ny do "
-#~ "adres��e\n"
-#~ "                                ADRES��\n"
-#~ "  -s, --sort-output             generuje se�azen� v�stup bez duplicitn�ch "
-#~ "zpr�v\n"
-#~ "      --strict                  v�stupn� soubor bude stylu Uniforum\n"
-#~ "  -T, --trigraphs               zapne podporu ANSI C `trigraphs' na "
-#~ "vstupu\n"
-#~ "  -V, --version                 vyp��e ozna�en� verze a ukon�� se\n"
-#~ "  -w, --width=��SLO             nastav� v�stupn� ���ku str�nky\n"
-#~ "  -x, --exclude-file=SOUBOR     soubory ze SOUBORu nebudou zpracov�ny \n"
-#~ "\n"
-#~ "  Bude-li VSTUPN�SOUBOR -, bude �ten standardn� vstup.\n"
+# src/msgunfmt.c:298
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
 
-# src/xget-lex.c:914
-#~ msgid "%s:%d: warning: keyword nested in keyword arg"
-#~ msgstr ""
-#~ "%s:%d: upozorn�n�: kl��ov� slovo uhn�zd�no v argumentu kl��ov�ho slova"
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
 
-#~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
+# src/msgfmt.c:407
+#~ msgid "while creating hash table"
+#~ msgstr "p�i tvorb� ha�ovac� tabulky"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: keyword between outer keyword and its arg"
 #~ msgstr ""
 #~ "%s:%d: upozorn�n�: kl��ov� slovo mezi krajn�m kl��ov�m slovem\n"
 #~ "a jeho argumentem"
+
+# src/xgettext.c:340 src/xgettext.c:1256
+#~ msgid "while preparing output"
+#~ msgstr "p�i p��prav� v�stupu"
+
+# src/msgcmp.c:396 src/msgmerge.c:539
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "tato zpr�va nem� ��dnou definici v dom�n� \"%s\""
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/da.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/da.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/da.po gettext-0.18.1.1/gettext-tools/po/da.po
--- gettext-0.19.3/gettext-tools/po/da.po	2014-10-16 06:04:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/da.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,94 +1,94 @@
 # gettext-0.10/po/da.po - initial revision  -*- po -*-
 # Copyright (C) 1996 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Keld Simonsen <keld@keldix.com>, 2001-2011.
+# Keld Simonsen <keld@dkuug.dk>, 2001-2002.
 # Thorbj�rn Ravn Andersen <ravn@unixsnedkeren.dk>, 1996.
 #
 # Reviewed: 2001-08-31 olau@hardworking.dk
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.18\n"
+"Project-Id-Version: gettext-tools 0.12-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2011-01-10 23:48+0100\n"
-"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2003-03-08 19:32+0200\n"
+"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/argmatch.c:133
-#, c-format
+#, fuzzy, c-format
 msgid "invalid argument %s for %s"
-msgstr "Ugyldigt argument %s for %s"
+msgstr "Ugyldigt argument '%s' for '%s'"
 
 #: gnulib-lib/argmatch.c:134
-#, c-format
+#, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "flertydigt argument %s for %s"
+msgstr "flertydigt argument '%s' for '%s'"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke finde et midlertidigt katalog, pr�v at s�tte $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 
-#: gnulib-lib/clean-temp.c:435
-#, c-format
+#: gnulib-lib/clean-temp.c:445
+#, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "kan ikke fjerne midlertidig fil %s"
+msgstr "kan ikke oprette uddatafil '%s'"
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "kan ikke fjerne midlertidigt katalog %s"
+msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "skrivefejl"
-
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
+#, c-format
+msgid "error while opening \"%s\" for reading"
 msgstr "fejl ved l�se-�bning af '%s'"
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "Kan ikke �bne sikkerhedskopi-fil '%s' for skrivning"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "fejl efter l�sning af '%s'"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -96,107 +96,108 @@
 msgstr "fdopen() mislykkedes"
 
 #: gnulib-lib/csharpcomp.c:571
-#, c-format
+#, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "C#-overs�tter ikke fundet, fors�g at installere pnet"
+msgstr "Javakompilator ikke fundet, fors�g at installere gcj eller s�t $JAVAC"
 
 #: gnulib-lib/csharpexec.c:343
-#, c-format
+#, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "C# virtuel maskine ikke fundet, fors�g at installere pnet"
+msgstr ""
+"Virtuel Javamaskine ikke fundet, fors�g at installere gij eller s�t $JAVA"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-underproces mislykkedes"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: tilvalget '%c%s' tillader ikke et argument\n"
+msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tilvalget '--%s' kr�ver et argument\n"
+msgstr "%s: tilvalget `%s' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukendt tilvalg '--%s'\n"
+msgstr "%s: ukendt tilvalg `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukendt tilvalg '%c%s'\n"
+msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ugyldigt tilvalg -- '%c'\n"
+msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: tilvalget kr�ver et argument -- '%c'\n"
+msgstr "%s: tilvalget '%c' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tilvalget '-W %s' kr�ver et argument\n"
+msgstr "%s: tilvalget `%s' kr�ver et argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "ugyldigt source_version argument til compile_java_class"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "ugyldigt target_version argument til compile_java_clas"
+msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator ikke fundet, fors�g at installere gcj eller s�t $JAVAC"
@@ -207,99 +208,61 @@
 msgstr ""
 "Virtuel Javamaskine ikke fundet, fors�g at installere gij eller s�t $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fejl i %s-underproces"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
-msgid "creation of threads failed"
-msgstr "overs�ttelse af C#-klasse mislykkedes"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, 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:417
-#, fuzzy, c-format
-msgid "read from %s subprocess failed"
-msgstr "skrivning til %s-underproces mislykkedes"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
-msgid "communication with %s subprocess failed"
-msgstr "skrivning til %s-underproces mislykkedes"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, fuzzy, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s-underproces fejlede med slutstatus %d"
+msgid "cannot create pipe"
+msgstr "kan ikke oprette datakanal '%s'"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "'"
+msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "'"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke oprette datakanal"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle mislykkedes"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan ikke genskabe filnummer %d: dup2 mislykkedes"
+msgstr "kan ikke oprette uddatafil '%s'"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -312,135 +275,118 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s underproces fik et d�deligt signal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "fejl ved l�se-�bning af '%s'"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr ""
-"'%s' er ikke en gyldig %s-formatstreng, til forskel fra '%s'. �rsag: %s"
+msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"et formateringsdirektiv for argument '%u', som i '%s', findes ikke i '%s'"
+"formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i \"msgid"
+"\""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "formateringsdirektiv for argument %u findes ikke i '%s'"
+msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "formatangivelser i '%s' og '%s' for argument %u er ikke ens"
+msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Direktiv nummer %u begynder med | men afsluttes ikke med |."
+msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"I direktiv nummer %u er symbolet efter '<' ikke navnet p� en "
-"formateringsmakro. Gyldige mmakroeravne er definerede i ISO C 99, kapitel "
-"7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "I direktiv nummer %u f�lges symbolet efter '<' ikke af '>'."
+msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
-"Strengen refererer til argument nummer %u men ignorerer argument nummer %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "I direktiv nummer %u f�lges '{' ikke af et argumentnummer."
+msgstr ""
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "I direktiv nummer %u f�lges ikke ',' af et nummer."
+msgstr ""
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"Strengen slutter midt i et direktiv:fandthittade '{' uden tillh�rende '}'."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Direktiv nummer %u afsluttes med det ugyldige tegnet '%c' i stedet for '}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Direktiv nummer %u afsluttes med et ugyldigt tegn i stedet for '}'."
+msgstr ""
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
-msgstr "Strengen starter midt i et direktiv: fandt '}' uden tillh�rende '{'."
+msgstr ""
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Strengen indeholder et enligt '}' efter direktiv nummer %u."
+msgstr ""
 
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "I direktiv nummer %u er flagkombinationen ikke tilladt."
+msgstr ""
 
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "I direktiv nummer %u: en precision er ikke tilladt f�r '%c'."
+msgstr ""
 
 #: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
-msgstr "I direktiv nummer %u skal argumentnumret for precisionen v�re lig %u."
+msgstr ""
 
 #: src/format-gcc-internal.c:398
 #, c-format
@@ -448,55 +394,42 @@
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"I direktiv nummer %u er en precisionsspecifikation ikke tilladt f�r '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "I direktiv nummer %u er precisionsspecifikationen ugyldig."
+msgstr ""
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "I direktiv nummer %u er flag ikke tilladte f�r '%c'."
+msgstr ""
 
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'%s' bruger %%m men '%s' g�r ikke det"
+msgstr ""
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'%s' bruger ikke %%m men '%s' bruger %%m"
-
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' bruger %%m men '%s' g�r ikke det"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' bruger ikke %%m men '%s' bruger %%m"
+msgstr ""
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "Strengen afsluttes midt i et direktiv."
+msgstr ""
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"Strengen refererer til argumenter b�de via absolutte argumentnummre og via "
-"unummererede argumentspecifikationer."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "I direktiv nummer %u er argument nummer 0 ikke et positivt heltal."
+msgstr ""
 
 #: src/format-invalid.h:30
 #, c-format
@@ -504,7 +437,6 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"I direktiv nummer %u er breddens argument nummer 0 ikke et positivt heltal."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -512,15 +444,13 @@
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
-"I direktiv nummer %u er precisionens argument nummer 0 ikke et positivt "
-"heltal."
 
 #: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
-msgstr "I direktiv nummer %u er tegnet '%c' ikke en gyldig konvertering."
+msgstr ""
 
 #: src/format-invalid.h:37
 #, c-format
@@ -528,31 +458,29 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"Tegnet som afslutter direktiv nummer %u er ikke en gyldig "
-"konverteringsangivelse."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Strengen refererer til argument nummer %u p� inkompatibel m�de."
+msgstr ""
 
 #: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
-msgstr "I direktiv nummer %u er delstrengen '%s' ikke en gyldig dato/tid-stil."
+msgstr ""
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "I direktiv nummer %u f�lges '%s' ikke af et komma."
+msgstr ""
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "I direktiv nummer %u er delstrengen '%s' ikke en gyldig nummerstil."
+msgstr ""
 
 #: src/format-java.c:323
 #, c-format
@@ -560,13 +488,11 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"I direktiv nummer %u f�lges argumentnummret ikke af et komma og en af '%s', "
-"'%s', '%s', '%s'."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "I direktiv nummer %u indeholder et valg intet nummer."
+msgstr ""
 
 #: src/format-java.c:583
 #, c-format
@@ -574,26 +500,24 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"I direktiv nummer %u indeholder et valg et nummer som ikke f�lges af '<', "
-"'#' eller '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"et formateringsdirektiv for argument {%u}, som i '%s', findes ikke i '%s'"
+"formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i \"msgid\""
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "et formateringsdirektiv for argument {%u} findes ikke i '%s'"
+msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\""
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "formatangivelser i '%s' og '%s' for argument {%u} er ikke det samme"
+msgstr "formatangivelser i 'msgid' og '%s' for argument {%u} er ikke det samme"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -602,8 +526,6 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"I direktiv nummer %u har parameter %u type '%s' men en parameter af type "
-"'%s' forventedes."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -614,37 +536,33 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"I direktiv nummer %u er der givet for mange parametre, forventede h�jst %u "
-"parrameter."
 msgstr[1] ""
-"I direktiv nummer %u er der givet for mange parametre, forventede h�jst %u "
-"parrametre."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "I direktiv nummer %u f�lges '%c' ikke af et ciffer."
+msgstr ""
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "I direktiv nummer %u er argument %d negativt."
+msgstr ""
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "Strengen afsluttes midt i et direktiv af type ~/.../."
+msgstr ""
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Fandt '~%c' uden tillh�rende '%c'."
+msgstr ""
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "I direktiv nummer %u angives b�de modificererne @ og :."
+msgstr ""
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -652,26 +570,25 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"I direktiv nummer %u f�lges '~:[' ikke af to s�tninger separerede med '~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "I direktiv nummer %u bruges '~;' i en fejlagtig position."
+msgstr ""
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Strengen refererer til et argument p� inkompatible m�de."
+msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "formatangivelser i '%s' og '%s' er ikke de samme"
+msgstr "formatangivelser i 'msgid' og '%s' er ikke de samme"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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'"
+msgstr "formateringsdirektiv i \"%s\" er ikke en delm�ngde af dem i \"msgid\""
 
 #: src/format-perl.c:433
 #, c-format
@@ -679,81 +596,53 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"I direktiv nummer %u er st�rrelsesangiveren inkompatibel med konverteringen "
-"'%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "et formateringsdirektiv for argument '%s' findes ikke i '%s'"
+msgstr "formateringsdirektiv for argument \"%s\" findes ikke i \"%s\""
 
 #: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
-"Strengen refererer til argumenter b�de via argumentnavne og via navnl�se "
-"argumentspecifikationer."
 
 #: 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."
+msgstr ""
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, 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"
+"formateringsdirektiv i \"msgid\" tager en afbildning, dem i \"%s\" tager en "
+"tuppel"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, 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"
+"formateringsdirektiv i \"msgid\" tager en tuppel, de i \"%s\" tager en "
+"afbildning"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, 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'"
+"formateringsdirektiv for argument \"%s\", som i \"%s\", findes ikke i \"msgid"
+"\""
 
 #: src/format-python.c:494
-#, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "formateringsdirektiver i '%s' og '%s' for argument '%s' er ikke ens"
-
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, 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:165
-#, 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:185
 #, 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:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "I direktiv nummer %u er argument %d negativt."
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens"
 
 #: src/format-qt.c:152
 #, c-format
@@ -761,39 +650,33 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"'%s' er en simpel formatstreng, men '%s' er det ikke; den indeholder et 'L'-"
-"flag eller et tocifret argumentantal"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Strengen refererer til en skalvariabel med et navn udenfor ASCII."
+msgstr ""
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Strengen refererer til en skalvariabel med kompleks kr�lleparentessyntaks.  "
-"Denne syntaks underst�ttes ikke her af sikkerheds�rsager."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"Strengen refererer til en skalvariabel hvis v�rdi kan v�re anderledes inde i "
-"skalfunktioner."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Strengen refererer til en skalvariabel uden navn."
+msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "I direktiv nummer %u er tegnet '%c' ikke et ciffer mellem 1 og 9."
+msgstr ""
 
 #: src/format-ycp.c:91
 #, c-format
@@ -801,13 +684,12 @@
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
-"Tegnet som afslutter direktiv nummer %u er ikke et ciffer mellem 1 og 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -815,143 +697,147 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright � %s Free Software Foundation, Inc.\n"
-"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>\n"
-"Dette program er frit programmel.  Du kan �ndre og distribuere det.\n"
-"Det er ikke NOGEN SOM HELST GARANTI, i det omfang som lov tillader.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Brug: %s [TILVALG]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Skriv maskinens v�rtsnavn.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "Resultatformat:\n"
+msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 kort v�rtsnavn\n"
+msgstr ""
 
-#: src/hostname.c:224
-#, c-format
+#: src/hostname.c:222
+#, fuzzy, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          langt v�rtsnavn, indholder fuldt kvalificeret\n"
-"                                dom�nenavn og aliaser\n"
+"Resultatformat:\n"
+"  -s, --short           kort v�rtsnavn\n"
+"  -f, --fqdn, --long    langt v�rtsnavn, indholder hele dom�nenavnet og "
+"alias\n"
+"  -i, --ip-address      adresser for v�rtsnavnet\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            adresser for v�rtsnavnet\n"
+msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Informativt uddata:\n"
+msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  vis denne hj�lp og afslut\n"
+msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
-#, c-format, no-wrap
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
+#, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               vis versionsinformation og afslut\n"
+msgstr ""
+"Informativt uddata:\n"
+"  -h, --help                  vis denne hj�lp og afslut\n"
+"  -V, --version               vis versionsinformation og afslut\n"
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "kunne ikke hente v�rtsnavn"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "H�jst �n inddatalinje tilladt"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -960,10 +846,10 @@
 "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
 "manipulerer attributterne.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -972,217 +858,191 @@
 "tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
-#, c-format
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
+#, fuzzy, c-format
 msgid "Input file location:\n"
-msgstr "Placering for indfil:\n"
+msgstr "ingen inddatafil angivet"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  INFIL                       PO-indfil\n"
+msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=KATALOG     s�g ogs� efter indfiler i KATALOG\n"
+msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
-#, c-format
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#, fuzzy, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+msgstr ""
+"Placering for indfil:\n"
+"  FIL ...                  .mo-infiler\n"
+"Hvis ingen indfil er givet eller hvis den er - l�ses standard-ind.\n"
+
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Placering af uddatafil:\n"
+msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=FIL       uddata skrives til FIL\n"
+msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
-#, c-format
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
+#, fuzzy, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
+"Placering af uddatafil:\n"
+"  -o, --output-file=FIL    uddata skrives til FIL\n"
 "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
 "eller hvis den er angivet til - .\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Meddelelsevalg:\n"
+msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            behold oversatte, fjern uoversatte "
-"meddelelser\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --translated            behold uoversatte, fjern oversatte "
-"meddelelser\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
-"      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
-"      --only-fuzzy            behold meddelelser markerede som 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           fjern for�ldede #~ meddelelser\n"
+msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         behold for�ldede #~ meddelelsen\n"
+msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Attributmanipulation:\n"
+msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             mark�r alle meddelelser som 'fuzzy'\n"
+msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
-"      --clear-fuzzy           fjern 'fuzzy'-markering fra alle meddelelser\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          mark�r alle meddelelser som for�ldede\n"
+msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
-"      --clear-obsolete        fjern for�ldelsesmarkering fra alle "
-"meddelelser\n"
-
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              behold tidligere 'msgid' for oversatte "
-"meddelelser\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
-"      --clear-previous        fjern 'previous msgid' fra alle meddelelser\n"
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=FIL.po      bearbejd kun poster som findes i FIL.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=FIL.po    bearbejd kun poster som ikke findes i FIL.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 samme som --only-fuzzy --clear-fuzzy\n"
+msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              samme som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Syntaks p� indfil:\n"
+msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      indfil har 'Java .properties'-syntaks\n"
+msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input     indfil har NeXTstep/GNUstep '.strings'-"
-"syntaks\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
-msgstr "Resultatdetaljer:\n"
+msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1190,136 +1050,126 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 brug altid farver og andre tekstattributter\n"
-"      --color=VILK�R          brug farver og andre textattributter afh�ngig "
-"af\n"
-"                              VILK�R, som kan v�re 'always', 'never', "
-"'auto'\n"
-"                              eller 'html'.\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=STILSKABELON    angiv CSS stilskabel�nfil for --color\n"
+msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             brug ikke C-kontrolsekvenser i resultatet\n"
-"                                (normaltilstand)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                brug C-kontrolsekvenser i resultatet, men\n"
-"                              ikke \\v eller \\a\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              skriv PO-fil selv hvis den er tom\n"
+msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                lav indrykningsst�l i .po-fil\n"
+msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          skriv linjer med '#: filnavn:"
-"linje' (normaltilstand)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
+msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output     skriv en 'Java .properties'-fil\n"
+msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=ANTAL           s�t sidebredde for uddata\n"
+msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, c-format
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
+"Uddatadetaljer:\n"
+"  -l, --locale=LL_CC          s�t m�llocale\n"
+"      --no-translator         antag at PO-filen er automatgenereret\n"
+"  -w, --width=ANTAL           s�t sidebredde for uddata\n"
 "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
 "                              uddatasidens bredde, til flere linjer\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           sort�r resultatet\n"
+msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          sort�r resultatet efter filposition\n"
+msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Umuligt udv�lgelseskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1327,9 +1177,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Sammenl�gger og fletter de angivne PO-filer.\n"
 "Find beskeder som er f�lles for to eller flere af de angivne PO-filer.\n"
@@ -1340,103 +1190,92 @@
 "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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  INFIL ...                   indfiler\n"
+msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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"
+msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
-msgstr "Hvis indfil er -, l�ses standard ind.\n"
+msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"  -<, --less-than=ANTAL       skriv meddelelser med mindre end ANTAL\n"
-"                              definitioner. Standardv�rdi: uendeligt\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
-"                              definitioner. Standardv�rdi: 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                samme som --less-than=2, anfordrer at\n"
-"                              kun unikke meddelelser skrives\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      indfiler har 'Java .properties'-syntaks\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     indfiler har NeXTstep/GNUstep '.strings'-"
-"syntaks\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=NAVN          kodning for resultatet\n"
+msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             anvend f�rst fundne overs�ttelse for hver\n"
-"                              meddelelse, sammenflet ikke overs�ttelser\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=KATALOGNAVN      s�t 'Language'-feltet i hovedet\n"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "Peter Miller"
+msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ingen filer angivet som inddata"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "der kr�ves netop to inddatafiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
@@ -1463,61 +1302,68 @@
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      overs�ttelser\n"
+msgstr ""
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     referencer til kildetekst\n"
+msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "Bearbejdningsvarianter:\n"
+msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
-#, c-format
+#: src/msgcmp.c:241 src/msgmerge.c:548
+#, fuzzy, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
-msgstr "  -m, --multi-domain          brug ref.pot til hvert dom�ne i def.po\n"
+msgstr ""
+"Bearbejdningsvarianter:\n"
+"  -m, --multi-domain          brug ref.pot til hvert dom�ne i def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     brug ikke upr�cis sammenligning\n"
+msgstr ""
 
 #: src/msgcmp.c:245
-#, c-format
+#, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             brug upr�cise poster i resultatet\n"
-
-#: src/msgcmp.c:247
-#, c-format
-msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      brug uoversatte meddelelser\n"
+msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/msgcmp.c:324
+#: src/msgcmp.c:247
 #, c-format
+msgid "      --use-untranslated      consider untranslated entries\n"
+msgstr ""
+
+#: src/msgcmp.c:324
+#, fuzzy, c-format
 msgid "this message is untranslated"
-msgstr "advarsel: denne tekst er uoversat"
+msgstr "advarsel: denne tekst bliver ikke brugt"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "denne meddelelse b�r gennemses af overs�tteren"
+msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne tekst bruges, men er ikke erkl�ret..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denne tekst ligner"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne tekst er brugt, men ikke erkl�ret i %s"
@@ -1527,27 +1373,27 @@
 msgid "warning: this message is not used"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Mindst to filer skal angives"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1559,94 +1405,93 @@
 "men kun fra den f�rste PO-fil, der definerer dem. Filpositioner fra alle PO-filer\n"
 "vil blive sammenbragt.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
-"                              definitioner. Standardv�rdi: 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           udskriv ikke hovedet med 'msgid \"\"'\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
 
-#: src/msgconv.c:335
-#, c-format
+#: src/msgconv.c:330
+#, fuzzy, c-format
 msgid "Conversion target:\n"
-msgstr "Konverteringsm�l:\n"
+msgstr "konverteringsfejl"
 
-#: src/msgconv.c:339
-#, c-format
+#: src/msgconv.c:334
+#, fuzzy, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Standardindkodning er nuv�rende locales indkodning.\n"
+msgstr ""
+"Konverteringsm�l:\n"
+"  -t, --to-code=NAVN          Kodning for uddata\n"
+"Standardv�rdi er nuv�rende locales kodning.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                lav indrykningsst�l i resultatet\n"
+msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           skriv ikke linjer med '#: filnavn:linje'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"      --add-location          bevar linjer med '#: filnavn:"
-"linje' (normaltilstand)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
+msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "der kr�ves pr�cist �n inddatafil"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Brug: %s [FLAG] INDFIL\n"
 
-#: src/msgen.c:309
-#, c-format, no-wrap
+#: src/msgen.c:303
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
 "created English PO file, or a PO Template file (generally created by\n"
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Opretter et engelsk beskedskatalog.Indfilen er den senest oprettede\n"
+"Opretter et engelsk beskedskatalog. Indfilen er den senest oprettede\n"
 "engelske PO-fil eller en PO-skabelonsfil (normalt lavet med xgettext).\n"
-"Uoversatte poster gives en overs�ttelse som er identisk med msgid.\n"
+"Uoversatte poster gives en overs�ttelse som er identisk med msgid og\n"
+"markeres som uafklaret.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  INFIL                       PO- eller POT-indfil\n"
+msgstr ""
 
 #: src/msgexec.c:196
 #, c-format
@@ -1679,41 +1524,46 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"En speciel indbygget kommando som hedder '0' udskriver beskeden fulgt\n"
-"af et nultegn. Uddata for 'msgexec 0' er brugbart som inddata for\n"
-"'xargs -O'\n"
+"En speciel indbygget kommando som heder \"0\" skriver ud beskeden fulgt\n"
+"af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n"
+"\"xargs -O\"\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=INFIL           PO-indfil\n"
+msgstr ""
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "skrivning til standard ud mislykkedes"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "skrivning til %s-underproces mislykkedes"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "filternavn mangler"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "mindst et sed-skript skal angives"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Udf�rer et filter p� alle overs�ttelser i et beskedskatalog.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1722,155 +1572,124 @@
 "FILTER kan v�re hvilket som helst program som l�ser en overs�ttelse fra\n"
 "standard ind og skriver den �ndrede overs�ttelse til standard ud.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Brugbare FILTERFLAG n�r FILTER er 'sed':\n"
+msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
-"  -e, --expression=SKRIPT     tilf�j SKRIPT til kommandoerne som skal "
-"udf�res\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=SKRIPTFIL        tilf�j indeholdet i SKRIPTFIL til "
-"kommandoerne\n"
-"                                som skal udf�res\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       undertryk automatisk udskrift af "
-"m�nsteromr�det\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             brug ikke C-kontrolsekvenser i resultatet\n"
-"                                (normaltilstand)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                lav indrykningsst�l i resultatet\n"
+msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           bevar headerlinjer u�ndrede, filtr�r dem ikke\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "ugyldig byteorden: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
-
-#: src/msgfmt.c:439
-#, 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"
+msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "%s kr�ver at '-d katalog' angives"
+msgstr "%s kr�ver at \"-d katalog\" angives"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s kr�ver en '-l lokale'-angivelse"
-
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s kr�ver en '-l lokale'-angivelse"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s kr�ver en '-l lokale'-angivelse"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s og %s udelukker hinanden"
+msgstr "%s kr�ver en \"-l lokale\"-angivelse"
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
-#, c-format
+#: src/msgfmt.c:484 src/msgfmt.c:490
+#, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s er kun gyldig med %s, %s eller %s"
+msgstr "%s er kun gyldig med %s eller %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversat tekst"
 msgstr[1] "%d oversatte tekster"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, 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:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversat tekst"
 msgstr[1] ", %d uoversatte tekster"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Brug: %s [FLAG] filnavn.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1880,380 +1699,308 @@
 "korte tilvalg.\n"
 "Tilvarende g�lder for valgfri argumenter.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  filnavn.po ...              indfiler\n"
+msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
-msgstr "K�rselstilstand:\n"
+msgstr ""
 
-#: src/msgfmt.c:799
-#, c-format
+#: src/msgfmt.c:675
+#, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Javatilstand: gener�r en Java ResourceBundle-"
+"K�rselstilstand:\n"
+"  -j, --java               Javatilstand: gener�r en Java ResourceBundle-"
 "klasse\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 som --java, og antag Java2 (JDK 1.2 eller "
-"h�jere)\n"
 
-#: src/msgfmt.c:803
-#, c-format
+#: src/msgfmt.c:679
+#, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C#-tilstand: gener�r en .NET .dll-fil\n"
+msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/msgfmt.c:805
-#, c-format
+#: src/msgfmt.c:681
+#, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C#-ressurcetilstand: gener�r en .NET ."
-"resources-fil\n"
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Tcl-tilstand: gener�r en .msg-fil af tcl/"
-"msgcat-type\n"
-
-#: src/msgfmt.c:809
-#, 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:811
+#: src/msgfmt.c:685
 #, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt-tilstand: gener�r en Qt .qm-fil\n"
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
+msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Hvis UDFIL er -, skrives resultatet til standard ud.\n"
+msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "Placering af uddatafil i Javatilstand:\n"
+msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=RESSOURCE    ressourcenavn\n"
+msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
-"fil\n"
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d KATALOG                  startkatalog for klassers katalogtr�\n"
+msgstr ""
 
-#: src/msgfmt.c:833
-#, c-format
+#: src/msgfmt.c:705
+#, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
+"Placering af uddatafil i Javatilstand:\n"
+"  -r, --resource=RESSOURCE    ressourcenavn\n"
+"  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
+"  -d KATALOG                  startkatalog for klassers katalogtr�\n"
 "Klassenavnet bestemmes ved at tilf�je localenavnet til ressourcenavnet\n"
 "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
 "i det opgivne katalog.\n"
 
-#: src/msgfmt.c:839
-#, c-format
+#: src/msgfmt.c:711
+#, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "Placering for udfil i C#-tilstand:\n"
+msgstr "ingen inddatafil angivet"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
-"  -d KATALOG                  startkatalog for localeafh�ngige .dll-filer\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Placering for udfil i Tcl-tilstand:\n"
+msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
-"  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"Flagene -l og -d er obligatoriske. .msg filen bliver skrevet i det\n"
-"angivne katalog.\n"
-
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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�g efter ORD som et ekstra n�gleord\n"
-"  -k, --keyword               brug ikke standardn�gleord\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Tolkning af indfil:\n"
+msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
 "domain\n"
 msgstr ""
-"  -c, --check                 udf�r alle kontroller som bestemmes af\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
-"      --check-format          kontroll�r sprogafh�ngige formatstrenge\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
-"      --check-header          verific�r tilstedev�relse og indhold af "
-"headerlinjen\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          kontroll�r for konflikter mellem "
-"dom�nedirektiver\n"
-"                                og flaget --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   kontroll�r at GNU msgfmt opf�rer sig som\n"
-"                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=TKN]   kontroll�r tilstedev�relsen af "
-"kortvejskommandoer\n"
-"                                for menuer\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             brug upr�cise poster i resultatet\n"
+msgstr ""
 
-#: src/msgfmt.c:908
-#, c-format
+#: src/msgfmt.c:763
+#, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
+"Uddatadetaljer:\n"
 "  -a, --alignment=TAL         l�g strenge p� lige TAL byte (normalt: %d)\n"
+"      --no-hash               bin�rfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
-#, c-format
+#: src/msgfmt.c:765
+#, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               bin�rfil indholder ikke hashtabellen\n"
+msgstr ""
+"Uddatadetaljer:\n"
+"  -a, --alignment=TAL         l�g strenge p� lige TAL byte (normalt: %d)\n"
+"      --no-hash               bin�rfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            udskriv statistik om overs�ttelserne\n"
+msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
-"  -v, --verbose               �g m�ngden af information i meddelelsen\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegns�tskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dom�net '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
-msgstr "'domain %s'-kommando ignoreres"
-
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "tom 'msgstr'-kommando ignoreret"
-
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "'fuzzy' 'msgstr'-tekst ignoreret"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
+msgstr "`domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1008
 #, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr ""
-"%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (fuzzy)"
+msgid "empty `msgstr' entry ignored"
+msgstr "tom `msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:1323
+#: src/msgfmt.c:1009
 #, c-format
-msgid "%s does not exist"
-msgstr ""
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1334
+#: src/msgfmt.c:1058
 #, c-format
-msgid "%s exists but cannot read"
+msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
+"%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (fuzzy)"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
-#: src/msggrep.c:501
-#, c-format
+#: src/msggrep.c:496
+#, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"flaget '%c' kan ikke bruges f�rend 'J' eller 'K' eller 'T' eller 'C' eller "
-"'X' er blevet angivet"
+"flaget \"%c\" kan ikke bruges f�rend \"K\" eller \"T\" er blevet angivet"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2262,8 +2009,8 @@
 "Udtr�kker alle beskeder i et beskedskatalog som matcher et vist\n"
 "m�nster eller h�rer til en given kildetekstfil.\n"
 
-#: src/msggrep.c:547
-#, c-format, no-wrap
+#: src/msggrep.c:542
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -2303,60 +2050,49 @@
 msgstr ""
 "Udv�lgelse af besked:\n"
 "  [-N KILDETEKSTFIL]... [-M DOM�NENAVN]...\n"
-"  [-J MSGCTXT-M�NSTER] [-K MSGID-M�NSTER] [-T MSGSTR-M�NSTER]\n"
-"  [-C KOMMENTARM�NSTER] [-X EKSTRAHERET-KOMMENTARM�NSTER]\n"
+"  [-K MSGID-M�NSTER] [-T MSGSTR-M�NSTER] [-C KOMMENTAR-M�NSTER]\n"
 "En besked v�lges hvis den kommer fra en af de angivne kildetekstfiler\n"
 "eller hvis den kommer fra en af de angivne dom�ner,\n"
-"eller hvis -J angives og konteksten (msgctxt) matcher MSGCTXT-M�NSTER,\n"
 "eller hvis -K angives og n�glen (msgid eller msgid_plural) matcher MSGID-M�NSTER,\n"
 "eller hvis -T angives og overs�ttelsen (msgstr) matcher MSGSTR-M�NSTER,\n"
-"eller hvis -C angives og overs�tterens kommentar matcher KOMMENTARM�NSTER\n"
-"eller hvis -X angives og den esktraherede kommentar matcher EKSTRAHERET-KOMMENTARM�NSTER.\n"
+"eller hvis -C angives og overs�tterens kommentar matcher KOMMENTAR-M�NSTER.\n"
 "\n"
 "N�r mere end et udv�lgelseskriterium angives er m�ngden af valgte beskeder\n"
 "foreningsm�ngden af udvalgte beskeder for hvert enkelt kriterium.\n"
 "\n"
-"Syntaks for MSGCTXT-M�NSTER, MSGID-M�NSTER, MSGSTR-M�NSTER, KOMMENTARM�NSTER\n"
-"eller EKSTRAHERET-KOMMENTARM�NSTER:\n"
+"Syntaks for MSGID-M�NSTER eller MSGSTR-M�NSTER:\n"
 "  [-E | -F] [-e M�NSTER | -f FIL]...\n"
 "M�NSTER er normale regul�re udtryk,\n"
-"eller udvidede regul�re udtryk hvis -E angives\n"
+"eller udvidede regul�re udtryk hvis -E angives,\n"
 "eller almindelige strenge hvis -F angives.\n"
 "\n"
 "  -N, --location=KILDETEKSTFIL v�lg beskeder udtrukket fra KILDETEKSTFIL\n"
 "  -M, --domain=DOM�NENAVN     v�lg beskeder som h�rer til dom�net DOM�NENAVN\n"
-"  -J, --msgctxt               start af m�nster for kontekst (msgctxt)\n"
 "  -K, --msgid                 start af m�nster for id (msgid)\n"
 "  -T, --msgstr                start af m�nster for overs�ttelse (msgstr)\n"
-"  -C, --comment               start af m�nster for overs�tterens kommentarer\n"
-"  -X, --extracted-comment     start af m�nster for udtrukket kommentar\n"
 "  -E, --extended-regexp       M�NSTER er et udvidet regul�rt udtryk\n"
 "  -F, --fixed-strings         M�NSTER er en m�ngde af nylinjeseparerede strenge\n"
 "  -e, --regexp=M�NSTER        brug M�NSTER som et regul�rt udtryk\n"
 "  -f, --file=FIL              hent M�NSTER fra FIL\n"
-"  -i, --ignore-case           store og sm� bogstaver betragtes ens\n"
-"  -v, --invert-match          udskriv kun de beskeder som ikke matcher\n"
-"                              noget udv�lgelseskriterium.\n"
+"  -i, --ignore-case           versaluf�lsomt\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                brug C-kontrolsekvenser i resultatet, men\n"
-"                                ikke \\v eller \\a\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           sort�r resultatet\n"
+msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          sort�r resultatet efter filposition\n"
+msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2366,7 +2102,7 @@
 "LANG som beskrevet i filen ABOUT-NLS. Dette er n�dvendigt for at\n"
 "du kan teste dine overs�ttelser.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2377,12 +2113,12 @@
 "Angiv locale med flaget --locale eller\n"
 ".po-udfilen med flaget --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Oprettede %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2391,48 +2127,52 @@
 "Opretter en ny PO-fil og initierer metainformation med v�rdier fra\n"
 "brugerens milj�variabler.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=INDFIL          POT-indfil\n"
+msgstr ""
 
-#: src/msginit.c:380
-#, c-format
+#: src/msginit.c:379
+#, fuzzy, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
+"Placering af inddatafil:\n"
+"  -i, --input=INDFIL          POT-indfil\n"
 "Hvis ingen indfil angives, s�ges efter POT-filen i aktuelt katalog.\n"
-"Hvis den er -, l�ses standard ind.\n"
+"Hvis den er - l�ses standard ind.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=FIL       uddata skrives til den sngivne PO-fil\n"
+msgstr ""
 
-#: src/msginit.c:388
-#, c-format
+#: src/msginit.c:387
+#, fuzzy, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
+"Placering af uddatafil:\n"
+"  -o, --output-file=FIL       uddata skrives til FIL\n"
 "Hvis ingen udfil er angivet, afh�nger det af --locale tilvalget eller "
 "brugerens\n"
-"indstilling af locale. Hvis den er -, skrives resultaterne p� standard ud.\n"
+"indstilling af locale. Hvis den er - skrives resultaterne p� standard ud.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          s�t m�llocale\n"
+msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         antag at PO-filen er automatgenereret\n"
+msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2440,12 +2180,12 @@
 "Fandt mere end en .pot-fil.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "fejl ved l�sning af aktuelt katalog"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2453,14 +2193,14 @@
 "Fandt ingen .pot-fil i aktuelt katalog.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-underproces fejlede med slutstatus %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2475,7 +2215,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Danske overs�ttelser for pakke %s"
@@ -2483,36 +2223,36 @@
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 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"
+msgstr "nuv�rende tegns�t \"%s\" er ikke et portabelt kodningsnavn"
 
 #: src/msgl-cat.c:188 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"
+msgstr "to forskellige tegns�t \"%s\" og \"%s\" i indfilen"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "indfilen '%s' mangler en indgang i hovedet med angivelse af tegns�t"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegns�t"
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"dom�ne '%s' i indfil '%s' mangler en indgang i hovedet med angivelse af "
+"dom�ne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse af "
 "tegns�t"
 
 #: src/msgl-cat.c:391 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"
+msgstr "m�ltegns�t \"%s\" er ikke et portabelt kodningsnavn"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
@@ -2546,12 +2286,6 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"Konvertering af filen %s fra tegnkodning %s til tegnkodning %s �ndrer\n"
-"nogle msgid'er eller msgctxt'er.\n"
-"Enten �ndrer du alle msgid'er og msgctxt'er til at kun ineholde ASCII\n"
-"eller s�rg for at de er UTF-8-kodede fra begyndelsen, d.v.s. allerede i "
-"dine\n"
-"kildetekstsfiler.\n"
 
 #: src/msgl-charset.c:93
 #, c-format
@@ -2561,9 +2295,9 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Localetegns�ttet '%s' er forskelligt fra\n"
-"indfilens tegns�t '%s'.\n"
-"Resultatet for '%s' kan blive forkert.\n"
+"Localetegns�ttet \"%s\" er forskelligt fra\n"
+"indfilens tegns�t \"%s\".\n"
+"Resultatet for \"%s\" kan blive forkert.\n"
 "Mulige m�der at omg� problemet er:\n"
 
 #: src/msgl-charset.c:100
@@ -2578,9 +2312,9 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Konvert�r beskedskataloget til %s med 'msgconv',\n"
-"  udf�r derefter '%s',\n"
-"  konvert�r s� tilbage til %s med 'msgconv'.\n"
+"- Konvert�r beskedskataloget til %s med \"msgconv\",\n"
+"  udf�r derefter \"%s\",\n"
+"  konvert�r s� tilbage til %s med \"msgconv\".\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2591,9 +2325,9 @@
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 "- S�t LC_ALL til et locale med kodning %s,\n"
-"  konvert�r beskedskataloget til %s med 'msgconv',\n"
-"  udf�r derefter '%s'\n"
-"  konvert�r s� tilbage til %s med 'msgconv'.\n"
+"  konvert�r beskedskataloget til %s med \"msgconv\",\n"
+"  udf�r derefter \"%s\"\n"
+"  konvert�r s� tilbage til %s med \"msgconv\".\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2602,8 +2336,8 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Localetegns�t '%s' er ikke et portabelt kodningsnavn.\n"
-"Resultatet for '%s' kan blive forkert.\n"
+"Localetegns�t \"%s\" er ikke et portabelt kodningsnavn.\n"
+"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:130
@@ -2630,128 +2364,135 @@
 msgstr "flertalsudtryk kan give aritmetiske fejl, m�ske division med nul"
 
 #: src/msgl-check.c:266
-#, c-format
+#, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "Pr�v at bruge det f�lgende, g�ldende for %s:"
+msgstr "Pr�v at bruge det f�lgende, g�ldende for %s:\n"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
+#, fuzzy
 msgid "message catalog has plural form translations"
-msgstr "tekstkatalog har overs�ttelser med flertalsform"
+msgstr "tekstkatalog har overs�ttelser med flertalsform..."
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
+#, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "men headerindgange mangler attribut af type 'plurals=UDTRYK'"
+msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
+#, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "men headerindgange mangler attribut af type 'plurals=HELTAL'"
+msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-v�rdi"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr "nplurals = %lu"
+msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, fuzzy, 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"
+msgstr[0] "...men nogen tekster har kun �n flertalsform"
+msgstr[1] "...men nogen tekster har kun %lu flertalsformer"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, 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"
+msgstr[0] "...men nogen tekster har �n flertalsform"
+msgstr[1] "...men nogen tekster har %lu flertalsformer"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 "beskedkatalog har overs�ttelser med flertalsformer, men mangler en "
-"headerindgang med 'Plural-Forms: nplurals=HELTAL; plural=UDTRYK;'"
+"headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\""
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, 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:625
+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:652
-#, 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:643
+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:660
-#, 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:651
+#, 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:675
-#, 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:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr mangler m�rket '%c' for tastaturgenvej"
+msgstr "msgstr mangler m�rket \"%c\" for tastaturgenvej"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr har for mange m�rker '%c' for tastaturgenveje"
+msgstr "msgstr har for mange m�rker \"%c\" for tastaturgenveje"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, 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"
+msgid "header field `%s' missing in header\n"
+msgstr "feltet `%s' mangler i hovedet\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "feltet '%s' i hovedet b�r starte ved linjens begyndelse\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "nogle felter i hovedet har stadig den oprindelige standardv�rdi\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "feltet '%s' mangler i hovedet\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nogle felter i hovedet har stadig den oprindelige standardv�rdi\n"
 
 #: 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'"
+msgstr ""
 
 #: src/msgl-iconv.c:69
-#, c-format
+#, fuzzy, 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'"
+msgstr "fejl ved l�se-�bning af '%s'"
 
 #: 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2766,11 +2507,9 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Konvertering fra '%s' til '%s' giver dubletter: nogle msgid'er som er "
-"forskellige bliver ens."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2779,16 +2518,16 @@
 "Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(). Denne version "
 "er bygget uden iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s er kun gyldig med %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "sikkerhedskopitype"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2801,7 +2540,7 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Kombinerer to .po filer i Uniforum-stil. 'gammel.po' filen (som allerede findes)\n"
+"Kombinerer to .po filer i Uniforum-stil. `gammel.po' filen (som allerede findes)\n"
 "indholder gamle overs�ttelser som vil blive overf�rt til den nye PO-fil under\n"
 "foruds�tning af at de stadig passer; kommentarer vil blive bevaret, mens\n"
 "fil-udtr�kskommentarer og filpositioner fjernes. 'ref.pot' filen er den\n"
@@ -2812,59 +2551,56 @@
 "overensstemmelse, vil 'l�s s�gning' (fuzzy matching) blive brugt til at give\n"
 "bedre resultater.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
-"  def.po                      overs�ttelser som refererer til gamle "
-"kildetekster\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     referencer til ny kildetekst\n"
+msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FIL        yderligere kataloger med overs�ttelser,\n"
-"                              kan angives flere gange\n"
 
-#: src/msgmerge.c:532
-#, c-format
+#: src/msgmerge.c:514
+#, fuzzy, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
+"K�rselstilstand:\n"
 "  -U, --update                opdat�r def.po,\n"
 "                              g�r ingenting hvis def.po allerede er "
 "opdateret\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Placering af udfil i opdateringstilstand:\n"
+msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "Resultatet skrives tilbage til def.po.\n"
+msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=KONTROL        lav en sikkerhedskopi af def.po\n"
+msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=ENDELSE        brug en anden endelse end den normale\n"
+msgstr ""
 
-#: src/msgmerge.c:552
-#, c-format
+#: src/msgmerge.c:534
+#, fuzzy, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
 "through\n"
@@ -2874,6 +2610,10 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
+"Placering af udfil i opdateringstilstand:\n"
+"Resultatet skrives tilbage til def.po.\n"
+"      --backup=KONTROL        lav en sikkerhedskopi af def.po\n"
+"      --suffix=ENDELSE        brug en anden endelse end den normale\n"
 "Versionsh�ndteringen kan styres med --backup eller milj�variablen\n"
 "VERSION_CONTROL.  Her er v�rdierne:\n"
 "  none, off       lav aldrig sikkerhedskopier (selv hvis --backup angives)\n"
@@ -2881,42 +2621,45 @@
 "  existing, nil   nummererede sikkerhedskopier hvis der findes s�danne, "
 "ellers simple\n"
 "  simple, never   lav altid simple sikkerhedskopier\n"
+"Endelse for sikkerhedskopier er \"~\", hvis den ikke s�ttes med --suffix "
+"eller\n"
+"milj�variablen SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:559
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Endelse for sikkerhedskopier er '~', hvis den ikke s�ttes med --suffix "
-"eller\n"
-"milj�variablen SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
-#, c-format
+#: src/msgmerge.c:552
+#, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              behold tidligere 'msgid' for oversatte "
-"meddelelser\n"
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       vis ikke forl�bsindikatorer\n"
+msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "denne tekst burde definere flertalsformer"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "denne tekst burde ikke definere flertalsformer"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2925,7 +2668,7 @@
 "%sL�ste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler "
 "%ld, for�ldede %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2947,61 +2690,75 @@
 msgstr "Konvert�r et bin�r beskedskatalog til en .po-fil af Uniforum-type\n"
 
 #: src/msgunfmt.c:440
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Javatilstand: inddata er en Java "
-"ResourceBundle-klasse\n"
+"K�rselstilstand:\n"
+"  -j, --java               Javatilstand: gener�r en Java ResourceBundle-"
+"klasse\n"
 
 #: src/msgunfmt.c:442
-#, c-format
+#, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
-"      --csharp                C#-tilstand: inddata er en .NET .dll-fil\n"
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
 #: src/msgunfmt.c:444
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C#-ressurcetilstand: inddata er en .NET ."
-"resources-fil\n"
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
 #: src/msgunfmt.c:446
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  FIL ...                     .mo-indfiler\n"
+msgstr ""
 
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "Placering for indfil i Javatilstand:\n"
+msgstr ""
 
 #: src/msgunfmt.c:462
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
+"Placering for indfil i Javatilstand:\n"
+"  -r, --resource=RESSOURCE    ressourcenavn\n"
+"  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
 "Klassenavnet bestemmes ved at tilf�je localenavnet til ressourcenavnet\n"
 "adskilt med en understreg. Klassen findes med hj�lp af CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
-#, c-format
+#, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Placering af indfil i C#-tilstand:\n"
+msgstr "ingen inddatafil angivet"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3009,13 +2766,11 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Flagene -l og -d er obligatoriske. .dll filen er placeret i et\n"
-"underkatalog af det angivne katalog, hvis navn afh�nger af localet.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Placering af indfil i Tcl-tilstand:\n"
+msgstr ""
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3023,20 +2778,18 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Flagene -l og -d er obligatoriske. .msg filen er placeret i det\n"
-"angivne katalog.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                lav indrykningsst�l i resultatet\n"
+msgstr ""
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
+msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3058,18 +2811,21 @@
 "overs�ttelse. Filpositioner samles sammen.\n"
 "N�r flaget --unique angives fjernes alle gentagede.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              skriv kun gentagede beskeder\n"
+msgstr ""
 
-#: src/msguniq.c:366
-#, c-format
+#: src/msguniq.c:365
+#, fuzzy, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                skriv kun unikke beskeder, gentagede fjernes\n"
+"Beskedsvalg:\n"
+"  -d, --repeated                 skriv kun gentagede beskeder\n"
+"  -u, --unique                   skriv kun unikke beskeder, gentagede "
+"fjernes\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3085,7 +2841,7 @@
 "Tegns�t '%s' er ikke et flytbart kodningsnavn.\n"
 "Tekstkonvertering til brugers tegns�t virker muligvis ikke.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3094,7 +2850,7 @@
 "Tegns�t '%s' er ikke underst�ttet. %s bygger p� iconv(),\n"
 "og iconv() underst�tter ikke '%s'.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3102,15 +2858,15 @@
 "Installering af GNU libiconv og geninstallering af GNU gettext\n"
 "vil l�se dette problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Forts�tter alligevel, forvent fortolkningsfejl."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Forts�tter alligevel."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3119,7 +2875,7 @@
 "Tegns�t '%s' er ikke underst�ttet. %s bygger p� iconv(),\n"
 "Denne version er bygget uden iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3132,27 +2888,27 @@
 msgid "inconsistent use of #~"
 msgstr "inkonsistent brug af #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "'msgstr[]'-afsnit mangler"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "'msgstr_plural'-afsnit mangler"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "'msgstr'-afsnit mangler"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "f�rste flertalsform har indeks, der ikke er nul"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "flertalsform har forkert indeks"
@@ -3162,7 +2918,7 @@
 msgid "too many errors, aborting"
 msgstr "afbryder k�rslen p� grund af for mange fejl"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Ugyldig multibytesekvens"
@@ -3204,20 +2960,21 @@
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "kontekstseparator <EOT> inde i streng"
+msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil m� ikke indeholde 'domain'-kommandoer"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "tekst erkl�ret mere end en gang"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
+#, fuzzy
 msgid "this is the location of the first definition"
-msgstr "dette er placeringen af den f�rste erkl�ring"
+msgstr "... her er den f�rste erkl�ring"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
@@ -3240,33 +2997,39 @@
 msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "advarsel: ugyldig \\uxxxx-syntaks for ISO 10646-tegn"
+msgstr "%s:%d: advarsel: ugyldigt ISO 10646-tegn"
 
 #: src/read-stringtable.c:802
+#, fuzzy
 msgid "warning: unterminated string"
-msgstr "advarsel: streng ikke afsluttet"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr "advarsel: syntaksfejl"
+msgstr "%s%s: advarsel: "
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "advarsel: uafsluttet n�gke/v�rdi-par"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr "advarsel: syntaksfejl, ';' forventedes efter streng"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "advarsel: syntaksfejl, '=' eller ';' forventedes efter streng"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
 #: src/recode-sr-latin.c:116
-#, c-format
+#, fuzzy, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Skrevet af %s og %s.\n"
+msgstr "Skrevet af %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3274,12 +3037,12 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Danilo Segan"
+msgstr ""
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Omkod serbisk tekst fra kyrillisk til latinsk kodning.\n"
+msgstr ""
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3287,18 +3050,16 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"Inddatateksten l�ses fra standard ind. Den konverterede tekst skrives til\n"
-"standard ud.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "inddata er ikke gyldig i indkodningen '%s'"
+msgstr ""
 
-#: src/recode-sr-latin.c:367
-#, c-format
+#: src/recode-sr-latin.c:366
+#, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "fejl ved konvertering fra '%s' indkodning til '%s' indkodning"
+msgstr "fejl ved l�se-�bning af '%s'"
 
 #: src/urlget.c:159
 #, c-format
@@ -3319,59 +3080,46 @@
 "Henter og udskriver indholdet af en URL. Hvis URL'en ikke kan hentes bruges\n"
 "den lokale fil FIL i stedet.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "fejl ved l�sning af '%s'"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fejl ved skrivning af standard-uddata"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "fejl efter l�sning af '%s'"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Henter %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " tiden udl�b.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " mislykkedes.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"Kan ikke udskrive flere overs�ttelsesdom�ner til en enkelt fil med det "
-"angivne resultatformat. Fors�g at bruge PO-filsyntaks i stedet."
 
 #: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"Kan ikke udskrive flere overs�ttelsesdom�ner til en enkelt fil med det "
-"angivne resultatformat."
 
 #: src/write-catalog.c:162
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"beskedkatalog har sammenh�ngsafh�ngige overs�ttelser, men uddata-formatet "
-"underst�tter dem ikke."
+"beskedkatalog har overs�ttelser med flertalsformer,\n"
+"men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3379,19 +3127,15 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"meddelelsekatalog har overs�ttelser med flertalsformer, men "
-"resultatformatet\n"
-"underst�tter dem ikke. Fors�g at generere en Java-klasse med 'msgfmt --"
-"java'\n"
-"i stedet for en 'properties'-fil."
 
 #: src/write-catalog.c:202
+#, fuzzy
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"beskedkatalog har overs�ttelser med flertalsformer, men uddata-formatet "
-"underst�tter dem ikke."
+"beskedkatalog har overs�ttelser med flertalsformer,\n"
+"men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
@@ -3403,67 +3147,68 @@
 msgstr "standard-uddata"
 
 #: src/write-csharp.c:703
-#, c-format
+#, fuzzy, c-format
 msgid "failed to create directory \"%s\""
-msgstr "kunne ikke oprette katalog '%s'"
+msgstr "kunne ikke oprette '%s'"
 
 #: src/write-csharp.c:766
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "overs�ttelse af C?-klasse mislykkedes, pr�v gerne --verbose"
+msgstr ""
+"overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t "
+"$JAVAC"
 
 #: src/write-csharp.c:768
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "overs�ttelse af C#-klasse mislykkedes"
+msgstr ""
+"overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t "
+"$JAVAC"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
-#, c-format
+#: src/write-java.c:1168
+#, fuzzy, 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"
+msgstr ""
+"overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t "
+"$JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opst�et ved skrive-�bning af '%s'"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "Ugyldig multibytesekvens"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "overs�ttelige tekster m� ikke indeholde `\\%c'-escapesekvensen"
 
-#: src/write-po.c:1335 src/write-po.c:1459
-#, c-format
+#: src/write-po.c:1253 src/write-po.c:1382
+#, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
 "This will cause problems to translators who use a character encoding\n"
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"F�lgende msgctxt indholder tegn som ikke er ASCII.\n"
+"F�lgende besked-id (msgid) indholder tegn som ikke er ASCII.\n"
 "Dette bevirker problemer for overs�ttere som bruger et tegns�t\n"
-"som er et andet end dit. Fors�g at bruge en ren ASCII-msgctxt i stedet.\n"
+"som er et andet end dit. Fors�g at bruge en ren ASCII-msgid i stedet.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3477,12 +3222,13 @@
 "%s\n"
 
 #: src/write-qt.c:667
+#, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 "beskedkatalog har overs�ttelser med flertalsformer,\n"
-"men Qt-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
+"men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
 #: src/write-qt.c:693
 msgid ""
@@ -3491,9 +3237,6 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"meddelelsekataloget har msgctxt-strenge med tegn udenfor ISO-8859-1\n"
-"men formatet for meddelelsekataloger i Qt underst�tter kun UCS i de\n"
-"oversatte strengen, ikke i kontekststrengene.\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3501,38 +3244,38 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"meddelelsekataloget har msgid-strenge med tegn udenfor ISO-8859-1\n"
-"men formatet for meddelelsekataloger i Qt underst�tter kun UCS i de\n"
-"oversatte strenge, ikke i de uoversatta strenge\n"
 
 #: src/write-resources.c:94
-#, c-format
+#, fuzzy, c-format
 msgid "error while writing to %s subprocess"
-msgstr "fejl ved skrivning til underproces '%s'"
+msgstr "fejl ved skrivning til filen '%s'"
 
 #: src/write-resources.c:131
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"beskedkatalog har sammenh�ngsafh�ngige overs�ttelser,\n"
-"men C#-formatet for ressourcer underst�tter ikke sammenh�ng\n"
+"beskedkatalog har overs�ttelser med flertalsformer,\n"
+"men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
 #: src/write-resources.c:150
+#, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 "beskedkatalog har overs�ttelser med flertalsformer,\n"
-"men C#-formatet for ressourcer underst�tter ikke flertalsformer\n"
+"men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
 #: src/write-tcl.c:157
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"beskedkatalog har sammenh�ngsafh�ngige overs�ttelser,\n"
-"men Tcl-formatet for beskedskataloger underst�tter ikke sammenh�nge\n"
+"beskedkatalog har overs�ttelser med flertalsformer,\n"
+"men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
 #: src/write-tcl.c:176
 msgid ""
@@ -3542,7 +3285,7 @@
 "beskedkatalog har overs�ttelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
@@ -3552,111 +3295,99 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: regul�rt udtryk ikke afsluttet"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Angiv venligst indkodning af kildetekst via --from-code."
+msgstr ""
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
 #: src/x-csharp.c:269
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Ugyldig multibyte-sekvens.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
 #: src/x-csharp.c:285
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Lang ufuldst�ndug multibyte-sekvens.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
 #: src/x-csharp.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� fil.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
 #: src/x-csharp.c:306
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� linje.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
-#, c-format
+#: src/x-csharp.c:315 src/x-python.c:332
+#, fuzzy, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: iconv-fejl"
+msgstr "iconv-fejl"
 
 #: src/x-csharp.c:338
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Ugyldig multibyte-sekvens.\n"
-"Angiv venligst indkodning af kildetekst via --from-code.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
+msgstr "%s:%d: advarsel: ugyldigt ISO 10646-tegn"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: advarsel: ')' blev fundet hvor '}' forventedes"
+msgstr ""
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: advarsel: '}' blev fundet hvor ')' forventedes"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
 msgstr ""
 
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
+#: src/x-glade.c:623 src/x-glade.c:630
+#, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3666,177 +3397,108 @@
 "Denne version er bygget uden expat.\n"
 
 #: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: advarsel: ensom surrogat U+%04X"
-
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Angiv venligst indkodning af kildetekst via --from-code."
-
-#: src/x-javascript.c:275
 #, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ugyldig multibyte-sekvens.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Lang ufuldst�ndug multibyte-sekvens.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� fil.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� linje.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
-
-#: src/x-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ugyldig multibyte-sekvens.\n"
-"Angiv venligst indkodning af kildetekst via --from-code.\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
+msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: finder ikke strengafslutningen '%s' nogetsteds f�r filslut"
+msgstr ""
 
 #: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: h�jre kr�lleparentes mangler i \\x{HEXNUMMER}"
+msgstr ""
 
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: ugyldig sekvens ('\\l') for 8bit-tegnet '%c'"
+msgstr ""
 
 #: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: ugyldig sekvens ('\\u') for 8bit-tegnet '%c'"
+msgstr ""
 
 #: src/x-perl.c:1217
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: ugyldig variabel-interpolation ved '%c'"
+msgstr "%s:%d: ugyldig streng-definition"
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: ugyldig interpolation ('\\L') for 8bit-tegnet '%c'"
+msgstr ""
 
 #: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: ugyldig interpolation ('\\U') for 8bit-tegnet '%c'"
+msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
-"Angiv kildeindkodning med --from-code eller med en kommentar if�lge\n"
-"http://www.python.org/peps/pep-0263.html.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:282
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Ugyldig multibytesekvens.\n"
-"Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
-"http://www.python.org/peps/pep-0263.html.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:299
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Lang ufuldst�ndig multibytesekvens.\n"
-"Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
-"http://www.python.org/peps/pep-0263.html.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:312
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: Ufuldst�ndig multibytesekvens ved filslut.\n"
-"Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
-"http://www.python.org/peps/pep-0263.html.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:322
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Ufuldst�ndig multibytesekvens ved linjeslut.\n"
-"Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
-"http://www.python.org/peps/pep-0263.html.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Ugyldig multibytesekvens.\n"
-"Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
-"http://www.python.org/peps/pep-0263.html.\n"
+"Ikke-ASCII streng ved %s%s.\n"
+"Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Ukendt kodning '%s'. Forts�tter med ASCII i stedet."
+msgstr ""
 
 #: src/x-rst.c:108
 #, c-format
@@ -3859,66 +3521,53 @@
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
-"%s:%lu: advarsel: syntaksen $\"...\" vil fremover blive fjernet af "
-"sikkerheds�rsager; brug eval_gettext i stedet"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtr�k overs�ttelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=NAVN  brug NAVN.po som udfil (i st.f. messages.po) \n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=FIL            skriv resultatet til FIL\n"
+msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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"
+msgstr ""
 
-#: src/xgettext.c:891
-#, c-format
+#: src/xgettext.c:852
+#, fuzzy, c-format
 msgid "Choice of input file language:\n"
-msgstr "Valg af sprog for indfil\n"
+msgstr "ingen inddatafil angivet"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3927,56 +3576,56 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
-msgstr ""
-"  -L, --language=NAVN         genkend det angivne sprog\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
+msgstr ""
+"Valg af sprog for indfil:\n"
+"  -L, --language=NAVN            genkend det angivne sprog\n"
+"                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
+"                                   EmacsLisp, librep, Smalltalk, Java, awk,\n"
+"                                   YCP, Tcl, PHP, RST, Glade)\n"
+"  -C, --c++                      kort skrivem�de for --language=C++\n"
+"Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   kort skrivem�de for --language=C++\n"
+msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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"
+msgstr ""
 
-#: src/xgettext.c:907
-#, c-format
+#: src/xgettext.c:867
+#, fuzzy, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=NAVN        kodning af inddatafiler\n"
-"                                (undtagen for Python, Tcl, Glade)\n"
+"Fortolkning af inddatafil:\n"
+"      --from-code=NAVN           kodning af inddatafiler\n"
+"                                   (undtagen for Python, Tcl, Glade)\n"
+"Som standard antages inddatafilerne at v�re i ASCII.\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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"
+msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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"
+msgstr ""
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -3984,219 +3633,213 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cM�RKE, --add-comments=M�RKE  skriv kommentarsblokke som begynder med "
-"M�RKE\n"
-"                                 og foreg�ende n�gleordslinjer til "
-"resultatfilen\n"
-"  -c, --add-comments             skriv alle kommentarsblokke f�r "
-"n�gleordslinjer\n"
-"                                 til resultatfilen\n"
+"  -j, --join-existing            kombiner tekster med eksisterende fil\n"
+"  -x, --exclude-file=FIL.po      tekster i FIL.po benyttes ikke\n"
+"  -c, --add-comments[=M�RKE]     plac�r kommentarafsnit for M�RKE (eller \n"
+"                                 de foreg�ende n�gleordslinjer) i uddata\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Sprogspecifikke valg:\n"
+msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           uddrag alle strenge\n"
+msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+msgstr ""
+"Valg af sprog for indfil:\n"
+"  -L, --language=NAVN            genkend det angivne sprog\n"
+"                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
+"                                   EmacsLisp, librep, Smalltalk, Java, awk,\n"
+"                                   YCP, Tcl, PHP, RST, Glade)\n"
+"  -C, --c++                      kort skrivem�de for --language=C++\n"
+"Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
 
-#: src/xgettext.c:937
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=ORD:NR:FLAG      ekstra FLAG for strenge inde i argument\n"
-"                              nummer NR for n�gleord ORD\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+msgstr ""
+"Valg af sprog for indfil:\n"
+"  -L, --language=NAVN            genkend det angivne sprog\n"
+"                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
+"                                   EmacsLisp, librep, Smalltalk, Java, awk,\n"
+"                                   YCP, Tcl, PHP, RST, Glade)\n"
+"  -C, --c++                      kort skrivem�de for --language=C++\n"
+"Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (kun sprogene C, C++, ObjectiveC)\n"
+msgstr ""
 
-#: src/xgettext.c:954
-#, c-format
+#: src/xgettext.c:911
+#, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    genkend Qt-formatstrenge\n"
+msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (kun sproget C++)\n"
+msgstr ""
 
-#: src/xgettext.c:958
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   genkend KDE 4-formatstrenge\n"
+msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/xgettext.c:962
-#, c-format
+#: src/xgettext.c:919
+#, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 genkend Boost-formatstrenge\n"
+msgstr ""
+"K�rselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 mere detaljeret genkendelse af formatstrenge\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     skriv en 'Java .properties'-fil\n"
+msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRENG  s�t copyrightindehaver i resultatet\n"
+msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          udelad FSF-copyrighttekst i resultatet\n"
+msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=PAKKE    s�t pakkenavn i uddata\n"
+msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSION  s�t pakkeversion i uddata\n"
+msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=EPOST@ADRESSE  s�t modtager for msgid-"
-"fejlrapporter\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG "
-"eller \"\"\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG "
-"eller \"\"\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Et '--flag'-argument har ikke <n�gleord>:<nummer>:[pass-]<flag> syntaks: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Ikke-ASCII-tegn ved %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Ikke-ASCII-kommentar ved eller f�r %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Ikke-ASCII-streng ved %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
-"%s er ikke en gyldig formatstreng for %s selvom den bruges i en "
-"formatstrengsposition. �rsag: %s\n"
 
-#: src/xgettext.c:2190
-#, c-format
+#: src/xgettext.c:2104
+#, fuzzy, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
-msgstr ""
-"%s er ikke en gyldig formatstreng for %s selvom den er deklareret som en. "
-"�rsag: %s\n"
+msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4204,13 +3847,8 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"Formatstrengen '%s' med ikke-navngivne argumenter kan ikke overs�ttes fuldt "
-"ud:\n"
-"Overs�tteren kan ikke omordne argumenterne.\n"
-"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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4220,32 +3858,30 @@
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:2979
-#, c-format
+#: src/xgettext.c:2834
+#, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "flertydig argumentangivelse for n�gleord '%.*s'"
+msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:3006
-#, c-format
+#: src/xgettext.c:2861
+#, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "advarsel: kontekst mangles for n�gleordet '%.*s'"
+msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:3031
-#, c-format
+#: src/xgettext.c:2886
+#, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"advarsel: kontekst mangles for flertalsargumentet til n�gleordet '%.*s'"
+msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "kontekst passer ikke mellem entals- og flertalsformen"
+msgstr ""
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4254,17 +3890,650 @@
 "variablen MSGID_BUGS_ADDRESS d�r; ellers angiv\n"
 "tilvalget --msgid-bugs-address p� kommandolinjen.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "ukendt sprog '%s'"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
-msgstr "<uden navn>"
+msgstr ""
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovligt tilvalg -- %c\n"
+
+#, fuzzy
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "%s-underproces fejlede med slutstatus %d"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "kan ikke ops�tte ikke-blokerende I/O til %s-underproces"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "kommunikation med %s-underproces mislykkedes"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "l�sning fra %s-underproces mislykkedes"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s-underproces afsluttede med slutstatus %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet `%s' har stadig den oprindelige standardv�rdi\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright � %s Free Software Foundation, Inc.\n"
+#~ "Dette er frit programmel; se kildekoden for kopieringsbetingelser.  Der "
+#~ "er\n"
+#~ "INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET "
+#~ "S�RLIGT\n"
+#~ "FORM�L.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "beskedkatalog har overs�ttelser med flertalsformer,\n"
+#~ "men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "beskedkatalog har overs�ttelser med flertalsformer,\n"
+#~ "men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: advarsel: "
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%d: advarsel: streng ikke afsluttet"
+
+#~ msgid "conversion failure"
+#~ msgstr "konverteringsfejl"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "skrivning til grep-underproces mislykkedes"
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "feltet '%s' i hovedet b�r starte ved linjens begyndelse\n"
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  INDDATAFIL                   PO inddatafil\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis ingen inddatafil er angivet eller den er -, l�ses fra standard-"
+#~ "inddata.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL       uddata skrives til FIL\n"
+#~ "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er "
+#~ "angivet,\n"
+#~ "eller hvis den er angivet som - .\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "      --translated            keep translated, remove untranslated "
+#~ "messages\n"
+#~ "      --untranslated          keep untranslated, remove translated "
+#~ "messages\n"
+#~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+#~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+#~ "      --no-obsolete           remove obsolete #~ messages\n"
+#~ "      --only-obsolete         keep obsolete #~ messages\n"
+#~ msgstr ""
+#~ "Beskedsvalg:\n"
+#~ "      --translated            behold oversatte, fjern uoversatte "
+#~ "beskeder\n"
+#~ "      --untranslated          behold uoversatte, fjern oversatte "
+#~ "beskeder\n"
+#~ "      --no-fuzzy              fjern beskeder markerede som \"fuzzy\"\n"
+#~ "      --only-fuzzy            behold beskeder markerede som \"fuzzy\"\n"
+#~ "      --no-obsolete           fjern for�ldede #~ beskeder\n"
+#~ "      --only-obsolete         behold for�ldede #~ beskeder\n"
+
+#~ msgid ""
+#~ "Attribute manipulation:\n"
+#~ "      --set-fuzzy             set all messages 'fuzzy'\n"
+#~ "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+#~ "      --set-obsolete          set all messages obsolete\n"
+#~ "      --clear-obsolete        set all messages non-obsolete\n"
+#~ "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+#~ "      --ignore-file=FILE.po   manipulate only entries not listed in FILE."
+#~ "po\n"
+#~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-"
+#~ "obsolete\n"
+#~ msgstr ""
+#~ "Attributmanipulation:\n"
+#~ "      --set-fuzzy             mark�r alle beskeder som \"fuzzy\"\n"
+#~ "      --clear-fuzzy           fjern \"fuzzy\"-markering fra alle "
+#~ "beskeder\n"
+#~ "      --set-obsolete          mark�r alle beskeder som for�ldede\n"
+#~ "      --clear-obsolete        fjern for�ldet-markering fra alle beskeder\n"
+#~ "      --only-file=FIL.po      behandl kun indgange listet i FIL.po\n"
+#~ "      --ignore-file=FIL.po    behandl kun indgange ikke listet i FIL.po\n"
+#~ "      --fuzzy                 samme som --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              samme som --only-obsolete --clear-obsolete\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE ...                  input files\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  INDDATAFIL ...                 inddatafiler\n"
+#~ "  -f, --files-from=FIL           hent inddatafilliste fra FIL\n"
+#~ "  -D, --directory=FILKATALOG     gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis inddatafilen er -, l�ses fra standard-inddata.\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE         write output to specified file\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL          uddata skrives til FIL\n"
+#~ "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er "
+#~ "angivet\n"
+#~ "eller hvis den er angivet som - .\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 0 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Udv�lgelse af tekster:\n"
+#~ "  -<, --less-than=TAL            udskriv beskeder med mindre end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er uendelig hvis ikke sat\n"
+#~ "  ->, --more-than=TAL            udskriv beskeder med flere end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er 0 hvis ikke sat\n"
+#~ "  -u, --unique                   kort skrivem�de for --less-than=2, "
+#~ "foranlediger\n"
+#~ "                                 at kun unikke beskeder udskrives\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                     vis denne hj�lp og afslut\n"
+#~ "  -V, --version                  vis versionsinformation og afslut\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  def.po                      translations\n"
+#~ "  ref.pot                     references to the sources\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  def.po                      overs�ttelser\n"
+#~ "  ref.pot                     referencer til kildeteksterne\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 1 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Udv�lgelse af tekster:\n"
+#~ "  -<, --less-than=TAL            udskriv beskeder med mindre end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er uendelig hvis ikke sat\n"
+#~ "  ->, --more-than=TAL            udskriv beskeder med flere end dette "
+#~ "antal\n"
+#~ "                                 definitioner, er 1 hvis ikke sat\n"
+#~ "  -u, --unique                   kort skrivem�de for --less-than=2, "
+#~ "foranlediger\n"
+#~ "                                 at kun unikke beskeder udskrives\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape             brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po              skriv PO-filen selv om den er tom\n"
+#~ "  -i, --indent                benyt indrykket stil for uddata\n"
+#~ "      --no-location           undertryk '#: filnavn:linje' linjer\n"
+#~ "      --add-location          bevar '#: filnavn:linje' linjer (standard)\n"
+#~ "      --strict                benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL             s�t udskrivningsbredde\n"
+#~ "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                              uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output           gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file          sort�r uddata efter filplacering\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO or POT file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddata:\n"
+#~ "  INDDATAFIL                  PO- eller POT-inddatafil\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis inddatafilen er -, l�ses fra standard-input.\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  -i, --input=INPUTFILE       input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddata:\n"
+#~ "  -i, --input=INDDATAFIL      PO-inddatafil\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis ingen inddatafil  er angivet, eller er -, l�ses fra standard-input.\n"
+
+#~ msgid ""
+#~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+#~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+#~ "commands\n"
+#~ "                                to be executed\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern "
+#~ "space\n"
+#~ msgstr ""
+#~ "Nyttige FILTERFLAG n�r FILTER er \"sed\":\n"
+#~ "  -e, --expression=SKRIPT     tilf�j SKRIPT til kommandoen der skal "
+#~ "udf�res\n"
+#~ "  -f, --file=SKRIPTFIL        tilf�j indholdet i SKRIPTFIL til "
+#~ "kommandoen\n"
+#~ "                                der skal udf�res\n"
+#~ "  -n, --quiet, --silent       undertryk automatisk udskrift af resultat\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  filename.po ...             input files\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Placering af inddata:\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "Hvis inddatafilen er -, l�ses fra standard-input.\n"
+
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle "
+#~ "class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+#~ "higher)\n"
+#~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+#~ msgstr ""
+#~ "K�rselstilstand:\n"
+#~ "  -j, --java                  Javatilstand: gener�r en Java "
+#~ "ResourceBundle-klasse\n"
+#~ "      --java2                 som --java, og antag Java2 (JDK 1.2 eller "
+#~ "h�jere)\n"
+#~ "      --tcl                   Tcl-tilstand: gener�r en tcl/msgcat .msg-"
+#~ "fil\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "If output file is -, output is written to standard output.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil:\n"
+#~ "  -o, --output-file=FIL       uddata skrives til FIL\n"
+#~ "Hvis uddatafilen er -, skrives uddata til standard-ud.\n"
+
+#~ msgid ""
+#~ "Output file location in Tcl mode:\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
+#~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
+#~ "specified directory.\n"
+#~ msgstr ""
+#~ "Placering af uddatafil i Tcl-tilstand:\n"
+#~ "  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
+#~ "  -d KATALOG                  startkatalog for .msg-beskedskataloger\n"
+#~ "Flagene -l og -d er obligatoriske. .msg-filen skrives\n"
+#~ "i det opgivne katalog.\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                  vis denne hj�lp og afslut\n"
+#~ "  -V, --version               vis versionsinformation og afslut\n"
+#~ "      --statistics            udskriv statistik over overs�ttelser\n"
+#~ "  -v, --verbose               for�g udskreven information\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  def.po                      translations referring to old sources\n"
+#~ "  ref.pot                     references to new sources\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
+#~ "                              may be specified more than once\n"
+#~ msgstr ""
+#~ "Placering af inddatafil:\n"
+#~ "  def.po                      overs�ttelser svarende til gamle "
+#~ "kildetekster\n"
+#~ "  ref.pot                     referencer til nye kildetekster\n"
+#~ "  -D, --directory=FILKATALOG  gennems�g ogs� FILKATALOG efter "
+#~ "inddatafiler\n"
+#~ "  -C, --compendium=FIL        yderligere bibliotek af tekst-"
+#~ "overs�ttelser,\n"
+#~ "                              kan angives mere end �n gang\n"
+
+#~ msgid ""
+#~ "Operation modifiers:\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#~ "po\n"
+#~ "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+#~ msgstr ""
+#~ "Bearbejdningsvarianter:\n"
+#~ "  -m, --multi-domain          brug ref.pot til hvert dom�ne i def.po\n"
+#~ "  -N, --no-fuzzy-matching     brug ikke fuzzy matchning\n"
+
+#~ msgid ""
+#~ "Input file location in Tcl mode:\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY             base directory of .msg message catalogs\n"
+#~ "The -l and -d options are mandatory.  The .msg file is located in the\n"
+#~ "specified directory.\n"
+#~ msgstr ""
+#~ "Placering af inddatafil i Tcl-tilstand:\n"
+#~ "  -l, --locale=LOCALE      localenavn, enten sprog eller sprog_LAND\n"
+#~ "  -d KATALOG               startkatalog for .msg-beskedskataloger\n"
+#~ "Flagene -l og -d er obligatoriske. .msg-filen skrives\n"
+#~ "i det opgivne katalog.\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape          brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape             brug C-escapesekvenser i uddata. Ingen "
+#~ "specialtegn\n"
+#~ "      --force-po           skriv PO-fil selv om den er tom\n"
+#~ "  -i, --indent             benyt indrykket stil for uddata\n"
+#~ "      --strict             benyt 'streng Uniforum'-st�l for uddata\n"
+#~ "  -w, --width=TAL          angiv udskrivningsbredde\n"
+#~ "      --no-wrap            ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                           uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output        gener�r sorteret uddata\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help               display this help and exit\n"
+#~ "  -V, --version            output version information and exit\n"
+#~ "  -v, --verbose            increase verbosity level\n"
+#~ msgstr ""
+#~ "Informativt uddata:\n"
+#~ "  -h, --help                  vis denne hj�lp og afslut\n"
+#~ "  -V, --version               vis versionsinformation og afslut\n"
+#~ "  -v, --verbose               for�g udskreven information\n"
+
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "If output file is -, output is written to standard output.\n"
+#~ msgstr ""
+#~ "Placering af udfil:\n"
+#~ "  -d, --default-domain=NAVN      send uddata til NAVN.po (i stedet for "
+#~ "messages.po)\n"
+#~ "  -o, --output=FIL               uddata skrives til FIL\n"
+#~ "  -p, --output-dir=FILKATALOG    uddatafiler placeres i FILKATALOG\n"
+#~ "Hvis uddatafilen er -, skrives uddata til standard-ud.\n"
+
+#~ msgid ""
+#~ "Language=C/C++ specific options:\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for "
+#~ "(without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "      --debug                    more detailed formatstring recognition "
+#~ "result\n"
+#~ msgstr ""
+#~ "Language=C/C++ specifikke tilvalg:\n"
+#~ "  -a, --extract-all              udtr�k alle tekster\n"
+#~ "  -k, --keyword[=ORD]            s�g efter yderligere n�gleord (hvis ORD "
+#~ "ikke \n"
+#~ "                                 angives, bruges standard-n�gleord "
+#~ "ikke).\n"
+#~ "  -T, --trigraphs                forst� ISO C-trigrafer i inddata\n"
+#~ "      --debug                    mere detaljeret resultat af "
+#~ "strenggenkendelse\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid "
+#~ "bugs\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ msgstr ""
+#~ "Detaljer for uddata:\n"
+#~ "  -e, --no-escape                brug ikke C-escapesekvenser i uddata "
+#~ "(standard)\n"
+#~ "  -E, --escape                   brug C-escapesekvenser i uddata uden "
+#~ "specialtegn\n"
+#~ "      --force-po                 skriv PO-filen selv om den er tom\n"
+#~ "  -i, --indent                   benyt indrykket stil for uddata\n"
+#~ "      --no-location              undertryk '#: filnavn:linje' linjer\n"
+#~ "  -n, --add-location             gener�r '#: filnavn:linje' linjer "
+#~ "(standard)\n"
+#~ "      --strict                   benyt 'streng Uniforum' stil for .po-"
+#~ "uddata\n"
+#~ "  -w, --width=TAL                s�t udskrivningsbredde\n"
+#~ "      --no-wrap                  ombryd ikke lange beskeder, l�ngere end\n"
+#~ "                                 uddatasidens bredde, til flere linjer\n"
+#~ "  -s, --sort-output              gener�r sorteret uddata\n"
+#~ "  -F, --sort-by-file             sort�r uddata efter filplacering\n"
+#~ "      --omit-header              skriv ikke header med 'msgid \"\"' "
+#~ "indgang\n"
+#~ "      --copyright-holder=STRENG  s�t ophavsrettighedsindehaver i uddata\n"
+#~ "      --foreign-user             undlad FSF-ophavsret i uddata for "
+#~ "fremmed bruger\n"
+#~ "      --msgid-bugs-address=EMAIL@ADRESSE  s�t rapporteringsadresse for "
+#~ "msgid-fejl\n"
+#~ "  -m, --msgstr-prefix[=STRENG]   brug STRING eller \"\" som forstavelse "
+#~ "for msgstr-indgange\n"
+#~ "  -M, --msgstr-suffix[=STRENG]   brug STRING eller \"\" som endelse for "
+#~ "msgstr-indgange\n"
+
+#~ msgid "missing arguments"
+#~ msgstr "argumenter mangler"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+#~ "or:    %s [OPTION] -s [MSGID]...\n"
+#~ msgstr ""
+#~ "Brug:  %s [TILVALG] [[TEKSTDOM�NE] TEKSTID]\n"
+#~ "eller: %s [TILVALG] -s [TEKSTID]...\n"
+
+#~ msgid "Display native language translation of a textual message.\n"
+#~ msgstr "Vis ikke-engelsk overs�ttelse af en tekstbesked.\n"
+
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOM�NE  hent oversatte tekster fra TEKSTDOM�NE\n"
+#~ "  -e                        aktiv�r fortolkning af visse escape-"
+#~ "sekvenser\n"
+#~ "  -E                        (ignoreret af hensyn til kompatibilitet)\n"
+#~ "  -h, --help                vis denne hj�lp og afslut\n"
+#~ "  -V, --version             vis versionsinformation og afslut\n"
+#~ "  [TEKSTDOM�NE] TEKSTID     hent den oversatte tekst svarende til\n"
+#~ "                            TEKSTID fra TEKSTDOM�NE\n"
+
+#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ msgstr "Brug: %s [TILVALG] [TEKSTDOM�NE] TEKSTID TEKSTID-FLERTAL ANTAL\n"
+
+#~ msgid ""
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
+#~ "form depends on a number.\n"
+#~ msgstr ""
+#~ "Vis overs�ttelser i det lokale sprog af tekstbeskeder hvis grammatiske\n"
+#~ "form beror p� et tal.\n"
+
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOM�NE  hent oversatte tekster fra TEKSTDOM�NE\n"
+#~ "  -e                        aktiv�r fortolkning af visse escape-"
+#~ "sekvenser\n"
+#~ "  -E                        (ignoreret af hensyn til kompatibilitet)\n"
+#~ "  -h, --help                vis denne hj�lp og afslut\n"
+#~ "  -V, --version             vis versionsinformation og afslut\n"
+#~ "  [TEKSTDOM�NE]             hent den oversatte tekst fra TEKSTDOM�NE\n"
+#~ "  TEKSTID TEKSTID-FLERTAL   overs�t TEKSTID (ental) / TEKSTID-FLERTAL "
+#~ "(flertal)\n"
+#~ "  COUNT                     v�lg ental/flertalsform ud fra denne v�rdi\n"
+
+#~ 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"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Hvis TEKSTDOM�NE-parameteren ikke angives, bestemmes dom�net ud fra "
+#~ "v�rdien af\n"
+#~ "milj�variablen TEXTDOMAIN. Hvis tekstkataloget ikke kan findes i det\n"
+#~ "s�dvanlige filkatalog, kan en anden placering angives vha milj�variablen\n"
+#~ "TEXTDOMAINDIR.\n"
+#~ "Standard-filkataloget for s�gning er: %s\n"
 
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "nogle felter i hovedet har stadig den oprindelige standardv�rdi\n"
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek '%s' offset %ld mislykkedes"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/de.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/de.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/de.po gettext-0.18.1.1/gettext-tools/po/de.po
--- gettext-0.19.3/gettext-tools/po/de.po	2014-10-16 06:04:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/de.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,12 +1,11 @@
 # German translations for GNU gettext-tools package.
-# Copyright © 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2012, 2013 Free Software Foundation, Inc.
+# Copyright © 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Karl Eichwalder <ke@suse.de>, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2012.
-# Philipp Thomas <pth@suse.de>, 2012
+# Karl Eichwalder <ke@suse.de>, 2001, 2002, 2003, 2004, 2005, 2006, 2009.
 # Ulrich Drepper <drepper@gnu.org>, 1995-1997.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 #
+# 2003-05-06 22:23:59 CEST: start updating, many a lot msgs still to be
+# 	   	    	  recovered -ke-
 #
 # Wörterbuch:
 # message catalog     - Katalog (mit Meldungen)
@@ -27,13 +26,11 @@
 # convert: z. Zt. "konvertieren"; besser (um)wandeln?
 # mandatory: z. Zt. "notwendig"; besser: verbindlich?
 # write: z. Zt. "schreiben"; besser an manchen Stellen: "speichern"?
-# details: Details (nicht "Einzelheiten", es sei denn, es muss sein)
+# details: Details (nicht "Einzelheiten", es sei denn, es muß sein)
 # accelerator: Accelerator (oder: Beschleuniger?)
 # keyboard accelerator: Tastatur-Accelerator (oder T.-Beschleuniger,
 #                       Tastenkürzel, Tastatur-Kürzel)
-#                       Bitte *nicht* Beschleuniger! Ein »keyboard accelerator«
-#                       beschleunigt nichts, sondern stellt einen Schnellzugriff
-#                       bereit. -mb
+#
 # Host name/hostname - Rechnername
 #
 # I/O error          -  Ein/Ausgabefehler
@@ -48,7 +45,7 @@
 #   INPUTFILE     - EINGABEDATEI (EINGABE_DATEI?)
 #   OUTPUTFILE    - AUSGABEDATEI (AUSGABE_DATEI?)
 #   SOURCEFILE    - QUELLDATEI (QUELL_DATEI?)
-#   BACKUP        - Sicherungskopie (-datei, Sicherheitsdatei, etc....)
+#   BACKUP	- Sicherungskopie (-datei, Sicherheitsdatei, etc....)
 #   CHAR          - ZEICHEN
 #   SUFFIX        - SUFFIX
 #   CONTROL       - KONTROLLE (vgl. 'cp', Art der Sicherung); besser ART?
@@ -59,7 +56,7 @@
 #   FILTER-OPTION - FILTER-OPTION
 #   TAG           - KENNUNG
 #   RESOURCE      - RESSOURCE
-#   LOCALE        - LOKALE
+#   LOCALE	- LOKALE
 #   NAME          - NAME
 #   EXPRESSION    - AUSDRUCK
 #   NUMBER        - ZAHL bzw. ANZAHL
@@ -67,7 +64,7 @@
 #   PATTERN       - MUSTER
 #   STRING        - ZEICHENKETTE (KETTE oder ZKETTE?)
 #   WORD          - WORT
-#   DATE          - DATUM
+#   DATE		- DATUM
 #   DOMAIN        - BEREICH
 #   TEXTDOMAIN    - TEXTBEREICH
 #   MSGID         - SCHLÜSSEL (oder KENNUNG)
@@ -83,18 +80,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-10 18:01+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2009-07-24 09:27+0200\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -107,67 +103,67 @@
 msgstr "mehrdeutiges Argument %s für %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Gültige Argumente sind:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "temporäres Verzeichnis ist nicht zu finden; bitte setzen Sie $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "es ist nicht möglich, ein temporäres Verzeichnis mittels\n"
 "der Vorlage »%s« anzulegen"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Temporäre Datei %s kann nicht entfernt werden"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "Temporäres Verzeichnis %s kann nicht entfernt werden"
+msgstr "Temporäres Verz/Verzeichnis %s kann nicht entfernt werden"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr "Berechtigungen für %s werden beibehalten"
-
-#: gnulib-lib/copy-file.c:189
-#, c-format
-msgid "error while opening %s for reading"
-msgstr "Öffnen der Datei %s zum Lesen fehlgeschlagen"
+msgid "error while opening \"%s\" for reading"
+msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "Öffnen der Sicherungsdatei %s zum Schreiben fehlgeschlagen"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "Öffnen der Sicherungsdatei »%s« zum Schreiben fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "Fehler beim Lesen von %s"
+msgid "error reading \"%s\""
+msgstr "Fehler beim Lesen von »%s«"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "Fehler beim Schreiben von %s"
+msgid "error writing \"%s\""
+msgstr "Fehler beim Schreiben von »%s«"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "Fehler nach dem Lesen von %s"
+msgid "error after reading \"%s\""
+msgstr "Fehler nach dem Lesen von »%s«"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -184,98 +180,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuelle C#-Maschine nicht gefunden; bitte »pnet« installieren"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "Subprozess %s fehlgeschlagen"
+msgstr "Subprozeß %s fehlgeschlagen"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Option »--%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option »-W %s« erwartet ein Argument\n"
+msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ungültiges Argument source_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen von »%s«"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Fehler beim Schreiben von Datei »%s«"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -288,162 +284,113 @@
 "Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n"
 "$JAVA setzen"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "Subprozess %s mit Ein-/Ausgabefehler"
+msgstr "Subprozeß %s mit Ein-/Ausgabefehler"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr "Speicher aufgebraucht"
-
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Lesen vom Subprozess %s fehlgeschlagen"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "Kommunikation mit dem Subprozess %s fehlgeschlagen"
+msgstr "virtueller Speicher aufgebraucht"
 
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "Subprozess %s wurde mit dem Exit-Code %d beendet"
+msgid "cannot create pipe"
+msgstr "Es ist nicht möglich, eine Pipe zu einzurichten"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "Es ist nicht möglich, eine Pipe einzurichten"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fehlgeschlagen"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-"Dateideskriptor %d kann nicht wiederhergestellt werden: dup2 scheiterte"
+msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "Subprozess %s"
+msgstr "Subprozeß %s"
 
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "Subprozess %s hat das fatale Signal %d erhalten"
+msgstr "Subprozeß %s hat das fatale Signal %d erhalten"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"im Gegensatz zu »%3$s« ist »%1$s« kein gültiges %2$s Format-Element. Der "
-"Grund ist: %4$s"
+"»%s« ist ein ungültiges Formatelement %s, im Vergleich zu »msgid«. Der "
+"Grund: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, 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«"
+msgstr ""
+"eine Formatspezifikation für Argument %u, wie in »%s«, fehlt in »msgid«"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"Formatspezifikation in »%s« und »%s« für Argument %u sind nicht identisch"
+"Formatspezifikation in »msgid« und »%s« für Argument %u sind nicht identisch"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Die %u. Formatanweisung beginnt mit |, aber endet nicht mit |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -453,25 +400,23 @@
 "einer Formatspezifikation. Die gültigen Makronamen sind in ISO C 99 "
 "Abschnitt 7.8.1 aufgeführt."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "In der %u. Formatanweisung folgt dem Wort nach »<« kein »>«."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Die Zeichenkette bezieht sich auf das %u. Argument, ignoriert aber das %u. "
 "Argument."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
-"die Anzahl der Formatspezifikationen in »%s« und »%s« stimmt nicht überein"
+"Anzahl der Formatspezifikationen in »msgid« und »%s« stimmt nicht überein"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -495,14 +440,14 @@
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Die %u. Formatanweisung endet mit dem ungültigen Zeichen »%c« anstatt einer\n"
-"»}«."
+"Die %u. Formatanweisung endet mit dem ungültigen Zeichen '%c' anstatt einer\n"
+"'}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
-"Die %u. Formatanweisung endet mit einem ungültigen Zeichen anstatt einer »}«."
+"Die %u. Formatanweisung endet mit einem ungültigen Zeichen anstatt einer '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
@@ -516,7 +461,7 @@
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
-"Die Zeichenkette beinhaltet eine einzelne »}« nach der %u. Formatanweisung."
+"Die Zeichenkette beinhaltet eine einzelne '}' nach der %u. Formatanweisung."
 
 #: src/format-gcc-internal.c:255
 #, c-format
@@ -558,24 +503,14 @@
 msgstr "In der %u. Formatanweisung sind Flags vor »%c« nicht erlaubt."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "»%s« verwendet %%m, aber »%s« tut dies nicht"
+msgstr "»msgid« verwendet %%m, aber »%s« nicht"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "»%s« verwendet %%m nicht, aber »%s« verwendet %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "»%s« verwendet %%C, aber »%s« tut dies nicht"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "»%s« verwendet %%C nicht, aber »%s« verwendet %%C"
+msgstr "»msgid« verwendet nicht %%m, aber »%s« verwendet %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -673,7 +608,7 @@
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "In der %u. Formatanweisung beinhaltet eine Auswahl keine Zahl."
+msgstr "In der %u. Formatanweisung beinhaltet eine Choice keine Zahl."
 
 #: src/format-java.c:583
 #, c-format
@@ -681,14 +616,15 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"In der %u. Formatanweisung beinhaltet eine Auswahl eine Zahl, der weder »<«, "
-"»#« noch »%s« folgt."
+"In der %u. Formatanweisung beinhaltet eine Choice eine Zahl der keins von "
+"'<', '#' or '%s' folgt."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, 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«"
+msgstr ""
+"eine Formatspezifikation für Argument {%u}, wie in »%s«, fehlt in »msgid«"
 
 #: src/format-java.c:756
 #, c-format
@@ -696,11 +632,12 @@
 msgstr "eine Formatspezifikation für Argument {%u} fehlt in »%s«"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"Formatspezifikationen in »%s« und »%s« für Argument {%u} sind nicht identisch"
+"Formatspezifikationen in »msgid« und »%s« für Argument {%u} sind nicht "
+"identisch"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -709,8 +646,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"In der %u. Formatanweisung ist der %u. Parameter vom Typ »%s«, aber es wird "
-"ein Parameter vom Typ »%s« erwartet."
+"In der %u. Formatanweisung ist der %u. Parameter vom Typ '%s', aber es wird "
+"ein Parameter vom Typ '%s' erwartet."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -721,16 +658,16 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"In der %u. Formatanweisung sind zu viele Parameter angegeben; es wird "
+"In der %u. Formatanweisung sind zo viele Parameter angegeben; es wird "
 "höchstens %u Parameter erwartet."
 msgstr[1] ""
-"In der %u. Formatanweisung sind zu viele Parameter angegeben; es werden "
+"In der %u. Formatanweisung sind zo viele Parameter angegeben; es werden "
 "höchstens %u Parameter erwartet."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "In der %u. Formatanweisung folgt dem »%c« keine Ziffer."
+msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
@@ -741,13 +678,13 @@
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Die Zeichenkette endet mitten in einer ~/.../-Anweisung."
 
-# Bezieht sich auf Klammernpaare -ke-
+# Bezieht sich auf Klammenpaare -ke-
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "»~%c« ohne zugehörige »~%c« gefunden."
+msgstr "'~%c' ohne zugehörige '~%c' gefunden."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
@@ -760,14 +697,14 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"In der %u. Formatanweisung folgen dem »~:[« keine zwei Clausen, abgetrennt "
-"durch »~;«."
+"In der %u. Formatanweisung folgen dem '~:[' keine zwei Clausen, abgetrennt "
+"durch '~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
-"In der %u. Formatanweisung wird »~;« an einer ungültigen Stelle verwendet."
+"In der %u. Formatanweisung wird '~;' an einer ungültigen Stelle verwendet."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
@@ -775,15 +712,15 @@
 "Die Zeichenkette bezieht sich in nicht kompatibler Weise auf ein Argument."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "die Formatspezifikationen in »%s« und »%s« sind nicht gleichbedeutend"
+msgstr "Formatspezifikationen in »msgid« und »%s« sind nicht gleichbedeutend"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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«"
+"Formatspezifikationen in »%s« sind keine Untermenge von deren in »msgid«"
 
 #: src/format-perl.c:433
 #, c-format
@@ -794,9 +731,7 @@
 "In der %u. Formatanweisung ist die Größenspezifikation mit der "
 "Konvertierungsspezifikation »%c« nicht kompatibel."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%s« fehlt in »%s«"
@@ -818,84 +753,50 @@
 
 # CHECKIT
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"Formatspezifikationen in »%s« erwarten ein Mapping, die in »%s« jedoch ein "
-"Tupel"
+"Formatspezifikationen in »msgid« erwarten ein Mapping, die in »%s« jedoch "
+"ein Tuple"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"die Formatspezifikationen in »%s« erwarten ein Tupel, die in »%s« jedoch "
-"ein\n"
+"Formatspezifikationen in »msgid« erwarten ein Tuple, die in »%s« jedoch ein\n"
 "Mapping"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, 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«"
+msgstr ""
+"eine Formatspezifikation für Argument »%s«, wie in »%s«, fehlt in »msgid«"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"Formatspezifikationen in »%s« und »%s« für Argument »%s« stimmen nicht "
+"Formatspezifikationen in »msgid« und »%s« für Argument »%s« stimmen nicht "
 "überein"
 
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"In der %u. Formatanweisung ist in einem Formatbezeichner keine weitere "
-"Verschachtelung erlaubt."
-
-#: src/format-python-brace.c:270
-#, 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-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"»%s« ist ein einfaches Formatelement, aber »%s« ist es nicht: es enthält ein "
-"»L«-Flag oder eine doppelstellige Argumentenanzahl"
+"'msgid' ist ein einfaches Formatelement, aber '%s' ist es nicht: es weist "
+"ein 'L'-Flag oder eine Double-Zahl als Argument auf"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
-"Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, der "
-"nicht ASCII-kodiert ist."
+"Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, "
+"dernicht ASCII-kodiert ist."
 
 #: src/format-sh.c:81
 msgid ""
@@ -925,8 +826,8 @@
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
-"In der %u. Formatanweisung ist das Zeichen »%c« keine Ziffer zwischen 1 und "
-"9."
+"In der %u. Formatanweisung ist das Zeichen '%c' ist keine Ziffer zwischen 1 "
+"und 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -937,11 +838,11 @@
 "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer "
 "zwischen 1 und 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -950,64 +851,64 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright © %s Free Software Foundation, Inc.\n"
-"Lizenz GPLv3: GNU GPL Version 3 oder neuer <http://gnu.org/licenses/gpl.html>\n"
+"Lizenz GPLv3: GNU GPL Version 3 oder später <http://gnu.org/licenses/gpl.html>\n"
 "\n"
 "Dies ist freie Software; es steht Ihnen frei, sie zu verändern und\n"
 "weiterzugeben.\n"
-"Es gibt KEINE GARANTIE, soweit gesetzlich zulässig.\n"
+"Es gibt KEINE GARANTIE, soweit als vom Gesetz erlaubt.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Aufruf: %s [OPTION]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Rechnernamen (Hostname) ausgeben.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format der Ausgabe:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           kurzer Rechnername\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -1017,34 +918,34 @@
 "  -f, --fqdn, --long    langer Rechnername, einschließlich des\n"
 "                          vollqualifizierten Domainnamen (FQDN) und Aliasse\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
@@ -1053,11 +954,11 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -1065,33 +966,35 @@
 "Für die deutsche Übersetzung sind die Übersetzer der Mailingliste\n"
 "<translation-team-de@lists.sourceforge.net> zuständig.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "es ist nicht möglich, den Rechnernamen (Hostname) zu ermitteln"
+msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "höchstens eine Eingabedatei erlaubt"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1100,10 +1003,10 @@
 "Meldungen eines Katalogs mit Übersetzungen anhand von Attributen filtern und\n"
 "Attribute der Meldungen bearbeiten.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1111,56 +1014,56 @@
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Angaben zu Eingabedateien:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  EINGABEDATEI                PO-Eingabedatei\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=VERZ        VERZ der Liste der Eingabedateien hinzufügen\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Angaben zu Ausgabedateien:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1170,141 +1073,123 @@
 "oder\n"
 "»-« angegeben ist.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Auswahl der Meldungen:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            übersetzte übernehmen, unübersetzte verwerfen\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          unübersetzte übernehmen, übersetzte verwerfen\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              mit »fuzzy« markierte verwerfen\n"
+msgstr "      --no-fuzzy              mit 'fuzzy' markierte verwerfen\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            mit »fuzzy« markierte übernehmen\n"
+msgstr "      --only-fuzzy            mit 'fuzzy' markierte übernehmen\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           obsolete Meldungen (#~) verwerfen\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         obsolete Meldungen (#~) übernehmen\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute verändern:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             alle Meldungen auf »fuzzy« setzen\n"
+msgstr "      --set-fuzzy              alle Meldungen auf 'fuzzy' setzen\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
-"      --clear-fuzzy           »fuzzy«-Markierung von allen Meldungen "
+"      --clear-fuzzy            'fuzzy'-Markierung von allen Meldungen "
 "entfernen\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          alle Meldungen obsolet machen\n"
+msgstr "      --set-obsolete           alle Meldungen obsolet machen\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        alle Meldungen nicht-obsolet machen\n"
-
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              wenn auf »fuzzy« gesetzt, die vorherigen "
-"Schlüssel\n"
-"                               der übersetzten Meldungen beibehalten\n"
+msgstr "      --clear-obsolete         alle Meldungen nicht-obsolet machen\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
-"      --clear-previous        »previous msgid« von allen Meldungen "
+"      --clear-previous            »previous msgid« von allen Meldungen "
 "entfernen\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 beim Entfernen der »fuzzy«-Markierung auch\n"
-"                                »msgstr« leeren\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=DATEI.po   nur die Einträge  manipulieren, die in DATEI."
+"      --only-file=DATEI.po     nur die Einträge  manipulieren, die in DATEI."
 "po\n"
 "                                 gelistet sind\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=DATEI.po  nur die Einträge  manipulieren, die in DATEI."
+"      --ignore-file=DATEI.po   nur die Einträge  manipulieren, die in DATEI."
 "po\n"
 "                                 nicht gelistet sind\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
-"      --fuzzy                 Synonym für »--only-fuzzy --clear-fuzzy«\n"
+"      --fuzzy                  Synonym für »--only-fuzzy --clear-fuzzy«\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              Synonym für »--only-obsolete --clear-"
+"      --obsolete               Synonym für »--only-obsolete --clear-"
 "obsolete«\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax der Eingabedatei:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1312,8 +1197,8 @@
 "  -P, --properties-input      Eingabedatei folgt der .properties-Syntax von\n"
 "                                Java\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1322,17 +1207,17 @@
 "      --stringtable-input     Eingabedatei folgt der .strings-Syntax von\n"
 "                                Nextstep/Gnustep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Details zur Ausgabe:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1344,143 +1229,140 @@
 "verwenden\n"
 "      --color=BEI             Farben und andere Text-Attribute verwenden, "
 "wenn BEI.\n"
-"                              Bei kann »always«, »never«, »auto« oder »html« "
+"                              Bei kann 'always', 'never', 'auto' oder 'html' "
 "sein.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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"
+"      --style=STYLEDATEI      CSS-Datei mit Style-Regel für --color angeben\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             keine C-Escape-Sequenzen in Ausgabe verwenden\n"
+"  -e, --no-escape           keine C-Escape-Sequenzen in Ausgabe verwenden\n"
 "                              (Vorgabe)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                C-Escape-Sequenzen und keine erweiterten\n"
+"  -E, --escape              C-Escape-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
-"      --force-po              PO-Datei erstellen, auch wenn sie leer ist\n"
+"      --force-po            PO-Datei erstellen, auch wenn sie leer ist\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
+msgstr "  -i, --indent              Ausgabe eingerückt darstellen\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht "
-"schreiben\n"
+"      --no-location         Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          Zeilen mit »#: Datei:Zeilennr.« erhalten "
+"  -n, --add-location        Zeilen mit »#: Datei:Zeilennr.« erhalten "
 "(Vorgabe)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                .po-Datei streng nach Uniforum-Format "
-"erstellen\n"
+"      --strict              .po-Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
-"  -p, --properties-output     Datei in der .properties-Syntax von Java\n"
+"  -p, --properties-output   Datei in der .properties-Syntax von Java\n"
 "                              ausgeben\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-output    eine ».strings«-Datei von Nextstep/Gnustep\n"
+"      --stringtable-output   eine ».strings«-Datei von Nextstep/Gnustep\n"
 "                               erstellen\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
-"  -w, --width=ANZAHL          Breite der Ausgabe auf ANZAHL Spalten "
-"festlegen\n"
+"  -w, --width=ANZAHL        Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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               lange Zeilen in Meldungen, die länger als die\n"
-"                               Breite der Ausgabe sind, nicht auf mehrere\n"
-"                               Zeilen umbrechen\n"
-
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+"      --no-wrap             lange Zeilen in Meldungen, die länger als die\n"
+"                              Breite der Ausgabe sind, nicht auf mehrere\n"
+"                              Zeilen umbrechen\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           sortierte Ausgabe erstellen\n"
+msgstr "  -s, --sort-output         sortierte Ausgabe erstellen\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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"
+"  -F, --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1489,39 +1371,40 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "PO-Dateien aneinanderfügen und zusammenziehen.\n"
 "Meldungen suchen, die in zwei oder mehr der angegebenen PO-Dateien vorkommen.\n"
-"Wenn die Option »--more-than« verwendet wird, kann häufigeres Vorkommen gefordert\n"
+"Wenn die Option »--more-than« verwendet wird, kann höheres Vorkommen gefordert\n"
 "werden, bevor Meldungen ausgegeben werden.  Andererseits können mit\n"
-"»--less-than« nur Meldungen mit seltenerem Vorkommen berücksichtigt werden\n"
+"»--less-than« nur Meldungen mit niedrigerem Vorkommen berücksichtigt werden\n"
 "(z. B. wird »--less-than=2« nur Meldungen ausgeben, die nur einmal vorkommen).\n"
-"Übersetzungen, Kommentare, extrahierte Kommentare und Stellenangaben werden\n"
-"kumuliert, außer wenn --use-first angegeben ist; in diesem Fall wird der\n"
-"entsprechende Eintrag nur von der ersten PO-Datei berücksichtigt, in der der\n"
-"Eintrag vorkommt.\n"
+"Übersetzungen, Kommentare und extrahierte Kommentare werden kumuliert, außer\n"
+"wenn --use-first angegeben ist; in diesem Fall wird der entsprechende Eintrag\n"
+"nur von der ersten PO-Datei berücksichtigt, in der der Eintrag vorkommt.\n"
+"Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
+"kumuliert.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  EINGABEDATEI...             Eingabedateien\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1530,7 +1413,7 @@
 "  -<, --less-than=ANZAHL     Meldungen mit weniger als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: unendlich)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1539,7 +1422,7 @@
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: 0)\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1548,8 +1431,8 @@
 "  -u, --unique               Abkürzung für »--less-than=2«; Meldungen\n"
 "                             anfordern, die nur einmal vorkommen\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1558,8 +1441,8 @@
 "von\n"
 "                              Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1569,44 +1452,43 @@
 "Syntax\n"
 "                              für .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, 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:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             die zuerst vorkommende Übersetzung für jede\n"
-"                               Meldung verwenden, nicht mehrere\n"
-"                               Übersetzungen zusammenziehen\n"
+"      --use-first               die zuerst vorkommende Übersetzung für jede\n"
+"                                Meldung verwenden, nicht mehrere\n"
+"                                Übersetzungen zusammenziehen\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --lang=KATALOGNAME      »Language«-Feld in dem Kopfeintrag setzen\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "keine Eingabedateien angegeben"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "es werden genau zwei Eingabedateien benötigt"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n"
@@ -1621,14 +1503,14 @@
 "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 ""
-"Zwei .po-Dateien im Uniforum-Format vergleichen, um sicherzustellen, dass\n"
+"Zwei .po-Dateien im Uniforum-Format vergleichen um zu sicherzustellen, dass\n"
 "beide die gleichen »msgid«-Einträge enthalten.\n"
-"Die Datei Def.po ist eine bereits vorhandene PO-Datei mit den Übersetzungen.\n"
+"Die Datei Def.po ist eine bereits vorhandene PO-Dateien mit den Übersetzungen.\n"
 "Die Datei Ref.po ist die zuletzt erstellte PO- oder POT-Datei (Vorlage, i. A.\n"
-"von xgettext erstellt).  Hiermit lässt sich also überprüfen, ob die für das\n"
-"Programm notwendigen Meldungen übersetzt wurden. Wenn keine exakte Überein-\n"
-"stimmung gefunden wurde, wird mittels nicht-exakter Suche versucht, eine bessere\n"
-"Hilfestellung zu geben.\n"
+"von xgettext erstellt).  Hiermit lässt sich also überprüfen, ob für das Programm\n"
+"notwendige Meldung übersetzt wurde.  Wenn keine exakte Übereinstimmung gefunden\n"
+"wurde, wird mittels nicht-exakter Suche versucht, eine bessere Hilfestellung zu\n"
+"geben.\n"
 "\n"
 
 #: src/msgcmp.c:232
@@ -1641,12 +1523,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  Ref.pot                       Referenzen auf die Quelldateien\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Optionen, die Verarbeitungen modifizieren:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1654,7 +1536,7 @@
 msgstr ""
 "  -m, --multi-domain          Ref.pot auf jeden Bereich in Def.po anwenden\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     fuzzy-Übereinstimmung nicht verwenden\n"
@@ -1679,17 +1561,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "diese Meldung muss vom Übersetzer geprüft werden"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "diese Meldung kommt vor, ist aber nicht definiert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...diese Definition ist ähnlich"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
@@ -1699,19 +1581,19 @@
 msgid "warning: this message is not used"
 msgstr "Warnung: diese Meldung kommt nicht vor"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "es müssen mindestens zwei Dateien angegeben werden"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1719,102 +1601,101 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 "Meldungen suchen, die in zwei oder mehr der PO-Dateien vorkommen.\n"
-"Wenn die Option »--more-than« verwendet wird, kann häufigeres Vorkommen gefordert\n"
-"werden, bevor Meldungen ausgegeben werden. Andererseits können mit\n"
-"»--less-than« nur Meldungen mit seltenerem Vorkommen berücksichtigt werden\n"
+"Wenn die Option »--more-than« verwendet wird, kann höheres Vorkommen gefordert\n"
+"werden, bevor Meldungen ausgegeben werden.  Andererseits können mit\n"
+"»--less-than« nur Meldungen mit niedrigerem Vorkommen berücksichtigt werden\n"
 "(z. B. wird »--less-than=2« nur Meldungen ausgeben, die nur einmal vorkommen).\n"
 "Übersetzungen, Kommentare und extrahierte Kommentare werden beibehalten, aber\n"
 "nur von der ersten PO-Datei, in der der entsprechende Eintrag vorkommt.\n"
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=ANZAHL      Meldungen mit mehr als ANZAHL Definitionen\n"
+"  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                               anzeigen (Vorgabe: 1)\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header            »msgid \"\"«-Eintrag im Kopfteil nicht "
+"      --omit-header             »msgid \"\"«-Eintrag im Kopfteil nicht "
 "erstellen\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Einen Katalog mit Übersetzungen in eine andere Zeichensatz-Kodierung\n"
 "konvertieren.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Zielformat der Konvertierung:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
-"Die Vorgabe für die Kodierung ist die Kodierung der aktuellen\n"
-"Spracheinstellung.\n"
+"Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
+msgstr "  -i, --indent                  Ausgabe eingerückt darstellen\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht "
+"      --no-location             Zeilen mit »#: Datei:Zeilennr.« nicht "
 "schreiben\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"      --add-location          Zeilen mit »#: Dateiname:Zeilennr.« erhalten\n"
+"      --add-location            Zeilen mit »#: Datei:Zeilennr.« erhalten\n"
 "                                  (Vorgabe)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
-"      --strict                .po-Datei streng nach Uniforum-Format "
+"      --strict                  .po-Datei streng nach Uniforum-Format "
 "erstellen\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "es wird genau eine Eingabedatei benötigt"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Aufruf: %s [OPTION] EINGABEDATEI\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1827,7 +1708,7 @@
 "i. A. von xgettext erstellt).  Unübersetzte Einträge bekommen eine Übersetzung\n"
 "zugewiesen, die mit der msgid identisch ist.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  EINGABEDATEI                PO- oder POT-Eingabedatei\n"
@@ -1864,11 +1745,11 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Der besondere eingebaute Befehl »0« gibt die Übersetzung aus, jeweils beendet\n"
+"Der besondere eingebaute Befehl '0' gibt die Übersetzung aus, jeweils beendet\n"
 "von einem Nullbyte-Zeichen.  Die Ausgabe von »msgexec 0« ist geeignet als\n"
 "Eingabe für »xargs -0«.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=EINGABEDATEI    PO-Eingabedatei\n"
@@ -1878,29 +1759,34 @@
 msgid "write to stdout failed"
 msgstr "Schreiben nach Standardausgabe fehlgeschlagen"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "Schreiben zum Subprozeß %s fehlgeschlagen"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "Name des Filters fehlt"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "es muss mindestens ein sed-Skript angegeben werden"
+msgstr "es muß mindestens ein sed-Skript angegeben werden"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen "
 "anwenden.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1911,19 +1797,19 @@
 "Standardausgabe\n"
 "schreibt.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Nützliche FILTER-OPTIONen, wenn »sed« der FILTER ist:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SKRIPT     SKRIPT den auszuführenden Befehlen hinzufügen\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1933,176 +1819,153 @@
 "  -f, --file=SKRIPT_DATEI     Inhalt der SKRIPT_DATEI den auszuführenden\n"
 "                                Befehlen hinzufügen\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       »Pattern-Space« nicht automatisch ausgeben\n"
+"  -n, --quiet, --silent       \"Pattern-Space\" nicht automatisch ausgeben\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             keine C-Escape-Sequenzen in Ausgabe\n"
-"                               verwenden (Vorgabe)\n"
+"      --no-escape                   keine C-Escape-Sequenzen in Ausgabe\n"
+"                                      verwenden (Vorgabe)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                Ausgabe eingerückt darstellen\n"
+msgstr "      --indent               Ausgabe eingerückt darstellen\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           Kopfeintrag unverändert übernehmen, nicht "
+"      --keep-header          Kopfeintrag unverändert übernehmen, nicht "
 "filtern\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "das Argument für %s sollte ein einzelnes Interpunktionszeichen sein"
+msgstr "das Argument für %s sollte ein einfaches Punktzeichen sein"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-d Verzeichnis«"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s erfordert eine Angabe in der Art »-l Spracheinstellung«"
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s erfordert eine Angabe in der Art »--template Vorlage«"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s erfordert eine Angabe in der Art »-o Datei«"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s und %s schließen sich in %s gegenseitig aus"
+msgstr "%s erfordert eine Angabe in der Art »-l Lokale«"
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ist nur mit %s oder %s gültig"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s ist nur mit %s, %s oder %s gültig"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d übersetzte Meldung"
 msgstr[1] "%d übersetzte Meldungen"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ungenaue Übersetzung"
 msgstr[1] ", %d ungenaue Übersetzungen"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Aufruf: %s [OPTION] Datei.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
-"notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n"
+"notwendig.  Dies gilt in gleicher Weise für optionale Argumente.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  Datei.po ...                Eingabedateien\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Java-Modus: eine ResourceBundle-Klasse für "
-"Java\n"
-"                               erstellen\n"
+"  -j, --java               Java-Modus: eine ResourceBundle-Klasse für Java\n"
+"                             erstellen\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 wie --java, aber Java2 (JDK 1.2 oder höher) "
+"      --java2              wie --java, aber Java2 (JDK 1.2 oder höher) "
 "annehmen\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2111,82 +1974,63 @@
 "      --csharp-resources      C#-Ressourcenmodus: eine .resources-Datei für\n"
 "                                .NET erstellen\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Tcl-Modus: eine .msg-Datei für tcl/msgcat "
+"      --tcl                Tcl-Modus: eine .msg-Datei für tcl/msgcat "
 "erstellen\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               Desktopeintrag-Modus: erzeugt eine .desktop-"
-"Datei\n"
+msgstr "      --qt                 Qt-Modus: eine .qm-Datei für Qt erstellen\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict             Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Angaben zu Ausgabedateien im Java-Modus:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    Name der Ressource\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=LOKALE         Name der Spracheinstellung, entweder "
-"»Sprache«\n"
-"                               (z. B. »de«) oder »Sprache_LAND\" (z. B. "
-"»de_DE«)\n"
+"  -l, --locale=LOKALE         Name der Lokale, entweder »sprache« (z. B. "
+"»de«)\n"
+"                                oder »sprache_LAND\" (z. B. »de_DE«)\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                erstellt eine .java-Datei anstelle einer ."
-"class-Datei\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d VERZEICHNIS              Basis-Verzeichnis der Verzeichnis-Hierarchie "
 "mit\n"
-"                               den Klassen\n"
+"                                den Klassen\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2194,30 +2038,29 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Der Name der Klasse wird durch das Anhängen des Namens der Spracheinstellung "
-"an\n"
-"den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich "
-"(»_«).\n"
-"Die Option »-d« ist notwendig.  Die Klasse wird unter dem angegebenen "
-"Verzeichnis\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der Lokale an den "
+"Namen\n"
+"der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).  Die "
+"Option\n"
+"»-d« ist notwendig.  Die Klasse wird unter dem angegebenen Verzeichnis\n"
 "geschrieben.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
-"  -d VERZEICHNIS              Basis-Verzeichnis der von der "
-"Spracheinstellung\n"
-"                               abhängigen .dll-Dateien\n"
+"  -d VERZEICHNIS              Basis-Verzeichnis der von der Lokale "
+"abhängigen\n"
+"                                .dll-Dateien\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2226,21 +2069,21 @@
 "Die Optionen »-l« und »-d« sind notwendig.  Die .dll-Datei wird in ein\n"
 "Unterverzeichnis des angegebenen Verzeichnisses geschrieben, dessen Name "
 "von\n"
-"der Spracheinstellung abhängig ist.\n"
+"der Lokale abhängig ist.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2249,52 +2092,12 @@
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Optionen für Desktopeintrag-Modus:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d VERZEICHNIS              Basisverzeichnis der .po-Dateien\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=WORT      zusätzliches Schlüsselwort, nach dem gesucht\n"
-"                              wird.\n"
-"  -k, --keyword               es wird nicht nach den vorgegebenen\n"
-"                              Schlüsselwörtern gesucht\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Die Optionen -l, -o und --template sind obligatorisch. Falls -D angegeben "
-"ist,\n"
-"werden Dateien aus dem Verzeichnis anstelle der Befehlszeilenargumente "
-"gelesen.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Überprüfung der Eingabedatei:\n"
+msgstr "Überprüfung der Eingebedatei:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2305,13 +2108,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          sprachabhängige Formatelemente überprüfen\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2320,7 +2123,7 @@
 "      --check-header          Existenz und Inhalt des Kopfeintrags "
 "verifizieren\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2330,7 +2133,7 @@
 "die\n"
 "                                Option --output-file hin überprüfen\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2340,141 +2143,118 @@
 "Open\n"
 "                                msgfmt verhält\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=ZEICHEN]\n"
-"                                Vorhandensein des Tastatur-Accelerators\n"
-"                                 für Menüeinträge überprüfen\n"
+"      --check-accelerators[=ZEICHEN]   Vorhandensein des Tastatur-"
+"Accelerators\n"
+"                                für Menüeinträge überprüfen\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=ZAHL        Ausgaben an ZAHL (Vorgabe: %d) Bytegrenze\n"
-"                               ausrichten\n"
-
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEFOLGE  32-Bit-Zahlen in der angegebenen "
-"Bytereihenfolge\n"
-"                                (»big« oder »little«, Standard von Plattform "
-"abhängig)\n"
+"  -a, --alignment=ZAHL          Ausgaben an ZAHL (Vorgabe: %d) Bytegrenze\n"
+"                                  ausrichten\n"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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"
+"      --no-hash                 Binärdatei soll keine Hash-Tabelle "
+"enthalten\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
-"      --statistics            Statistik zu den Übersetzungen anzeigen\n"
+"      --statistics             Statistik zu den Übersetzungen anzeigen\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
-"  -v, --verbose               mehr Hinweise während der Verarbeitung geben\n"
+"  -v, --verbose                mehr Hinweise während der Verarbeitung geben\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "»domain %s«-Anweisung wird ignoriert"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "leerer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s existiert nicht"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s existiert, aber kann nicht gelesen werden"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2483,7 +2263,7 @@
 "Option »%c« kann nicht verwendet werden, bevor »J«, »K«, »T«, »C« oder »X« "
 "festgelegt ist"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2494,7 +2274,7 @@
 
 # To avoid confusion, let msgid and msgstr untranslated here!
 # 2001-11-04 11:16:55 CET -ke-
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2577,26 +2357,26 @@
 "  -v, --invert-match          Nur die Meldungen ausgeben, die nicht mit einem\n"
 "                                Auswahlkriterium übereinstimmen\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                C-Escape-Sequenzen und keine erweiterten\n"
-"                               Zeichen in Ausgabe verwenden\n"
+"      --escape              C-Escape-Sequenzen und keine erweiterten\n"
+"                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           sortierte Ausgabe erstellen\n"
+msgstr "      --sort-output         sortierte Ausgabe erstellen\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
-"      --sort-by-file          Ausgabe gemäß Vorkommen in Dateien erstellen\n"
+"      --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2604,27 +2384,26 @@
 msgstr ""
 "Ihre Sprachumgebung ist nicht bestimmt.\n"
 "Bitte setzen Sie die Umgebungsvariable LANG, wie in der Datei ABOUT-NLS\n"
-"beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
+"beschrieben.  Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
 "können.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 msgstr ""
-"Ausgabedatei »%s« ist bereits vorhanden.\n"
-"Bitte legen Sie die Spracheinstellung mit der Option »--locale«\n"
-"oder die .po-Datei für die Ausgabe mit der Option »--output-file«\n"
-"fest.\n"
+"Ausgabedateien »%s« ist bereits vorhanden.\n"
+"Bitte legen Sie die Lokale mit der Option »--locale« oder\n"
+"die .po-Datei für die Ausgabe mit der Option »--output-file« fest.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s wurde erstellt.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2633,12 +2412,12 @@
 "Neue PO-Datei erstellen und die Meta-Informationen mit Werten der Umgebung des\n"
 "Benutzers initialisieren.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=EINGABEDATEI    POT-Eingabedatei\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2650,13 +2429,13 @@
 "POT-Datei gesucht.  Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2667,19 +2446,19 @@
 "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
 "ist.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          Lokale für die Ausgabe setzen\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2687,12 +2466,12 @@
 "Mehr als eine .pot-Datei gefunden.\n"
 "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "Fehler beim Lesen des aktuellen Verzeichnisses"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2700,14 +2479,14 @@
 "Keine .pot-Datei im aktuellen Verzeichnis gefunden.\n"
 "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "Subprozess %s mit dem Exit-Code %d fehlgeschlagen"
+msgstr "Subprozeß %s mit dem Exitcode %d fehlgeschlagen"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2715,7 +2494,7 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Der neue Katalog mit den Meldungen sollte Ihre E-Mail-Adresse enthalten, "
+"Der neue Katalog mit den Meldungen soll Ihre E-Mail-Adresse enthalten, "
 "damit\n"
 "Benutzer Ihnen Rückmeldungen zur Übersetzung schicken oder Programmautoren "
 "im\n"
@@ -2724,10 +2503,10 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "German translation for %s"
+msgstr "German messages for %s"
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
@@ -2742,14 +2521,14 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei Eingabedatei »%s« fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n"
@@ -2761,8 +2540,8 @@
 msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
@@ -2801,7 +2580,7 @@
 "Die Konvertierung der Datei %s von der Kodierung %s nach der\n"
 "Kodierung %s ändert einige msgids oder msgctxts.\n"
 "Ändern Sie entweder alle msgids und msgctxts zu reinem ASCII oder stellen\n"
-"Sie sicher, dass sie von vornherein UTF-8-kodiert sind; ändern Sie dazu die\n"
+"Sie sicher, daß sie von vornherein UTF-8-kodiert sind; ändern Sie dazu die\n"
 "Quellcodedateien.\n"
 
 #: src/msgl-charset.c:93
@@ -2814,13 +2593,13 @@
 msgstr ""
 "Zeichensatz »%s« der Lokale weicht vom\n"
 "Zeichensatz »%s« der Eingabedatei ab.\n"
-"Ausgabe von »%s« könnte nicht korrekt sein.\n"
+"Ausgabe von '%s' könnte nicht korrekt sein.\n"
 "Mögliche Abhilfen:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "· LC_ALL auf eine Spracheinstellung mit der Kodierung »%s« setzen.\n"
+msgstr "· LC_ALL auf eine Lokale mit der Kodierung »%s« setzen.\n"
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2829,9 +2608,9 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"· Katalog mit den Übersetzungen nach »%s« mittels »msgconv« konvertieren,\n"
-"  dann »%s« anwenden,\n"
-"  dann nach »%s« mittels »msgconv« zurück konvertieren.\n"
+"· Katalog mit den Übersetzungen nach »%s« mittels 'msgconv' konvertieren,\n"
+"  dann '%s' anwenden,\n"
+"  dann nach »%s« mittels 'msgconv' zurück konvertieren.\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2841,10 +2620,10 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"· LC_ALL auf eine Spracheinstellung mit der Kodierung »%s« setzen,\n"
-"  Katalog mit den Übersetzungen nach »%s« mittels »msgconv« konvertieren,\n"
-"  dann »%s« anwenden,\n"
-"  dann nach »%s« mittels »msgconv« zurück konvertieren.\n"
+"· LC_ALL auf eine Lokale mit der Kodierung »%s« setzen,\n"
+"  Katalog mit den Übersetzungen nach »%s« mittels 'msgconv' konvertieren,\n"
+"  dann '%s' anwenden,\n"
+"  dann nach »%s« mittels 'msgconv' zurück konvertieren.\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2853,8 +2632,8 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Zeichensatz »%s« der Spracheinstellung ist kein Name für eine\n"
-"portable Kodierung. Die Ausgabe von »%s« könnte nicht korrekt sein.\n"
+"Zeichensatz »%s« der Lokale ist kein Name für eine portable Kodierung\n"
+"Ausgabe von '%s' könnte nicht korrekt sein.\n"
 "Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n"
 
 #: src/msgl-check.c:130
@@ -2888,46 +2667,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Bitte das Folgende versuchen; gültig für %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »plural=AUSDRUCK«"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »nplurals=GANZZAHL«"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ungültige Pluralwerte"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ungültiger Pluralausdruck"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2936,63 +2715,72 @@
 "Kopfeintrag fehlt die Zeile:\n"
 "»Plural-Forms: nplurals=GANZZAHL; plural=AUSDRUCK;«"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Schnellzugriff"
+msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Accelerator"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, 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"
+"»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Accelerator auf"
+
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
 msgstr ""
-"Das Feld »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
+"Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-check.c:831
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
 
 #: 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"
+msgstr "%s: Eingabe ist nicht gültig in der Kodierung »%s«"
 
 #: src/msgl-iconv.c:69
 #, c-format
@@ -3006,8 +2794,8 @@
 msgstr ""
 "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3025,8 +2813,8 @@
 "Konvertierung »%s« nach »%s« führt zu doppelten Einträgen: unterschiedliche "
 "msgids werden gleich."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3035,16 +2823,16 @@
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab.  Diese Version wurde ohne iconv() erstellt."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ist nur mit %s gültig"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "Art der Sicherung"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -3058,70 +2846,70 @@
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 "Zwei Uniforum-konforme .po-Dateien zusammenziehen.\n"
-"Die Datei Def.po ist eine PO-Datei mit alten Übersetzungen, die – solange sie\n"
-"immer noch passen – in die neu zu erstellende Datei übernommen werden.\n"
+"Die Datei Def.po ist eine PO-Datei mit alten Übersetzungen, die - solange sie\n"
+"immer noch passen - in die neu zu erstellende Datei übernommen werden;\n"
 "Kommentare des Übersetzers werden übernommen, aber extrahierte Kommentare und\n"
-"Stellenangaben werden verworfen. Die Datei Ref.pot ist die zuletzt erstellte\n"
+"Stellenangaben werden verworfen.  Die Datei Ref.pot ist die zuletzt erstellte\n"
 "PO- oder POT-Datei mit Verweisen auf die Quellen (Vorlage, i. A. von xgettext\n"
-"erstellt). Übersetzungen und Übersetzerkommentare werden verworfen, die mit\n"
-"#. und #: gekennzeichneten Kommentare werden aber übernommen. Wo es keine\n"
+"erstellt).  Übersetzungen und Übersetzerkommentare werden verworfen, die mit\n"
+"#. und #: gekennzeichneten Kommentare werden aber übernommen.  Wo es keine\n"
 "exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n"
 "versucht, ein besseres Ergebnis zu erzielen.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
-"  Def.po                      Übersetzungen, die sich auf die alten Quellen\n"
-"                               beziehen\n"
+"  Def.po                   Übersetzungen, die sich auf die alten Quellen\n"
+"                             beziehen\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  Ref.pot                     Referenzen aus den neuen Quellen\n"
+msgstr "  Ref.pot                  Referenzen aus den neuen Quellen\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=DATEI     zusätzliche Bibliothek mit Übersetzungen, es\n"
-"                              können mehrere angegeben werden\n"
+"  -C, --compendium=DATEI   zusätzliche Bibliothek mit Übersetzungen, es\n"
+"                             können mehrere angegeben werden\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                Def.po aktualisieren; nichts unternehmen,\n"
-"                               wenn Def.po bereits aktuell ist\n"
+"                                wenn Def.po bereits aktuell ist\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Angaben zu Ausgabedateien im Aktualisierungsmodus:\n"
+msgstr "Angaben zu Ausgabedateien beim Aktualisieren (Update):\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 "      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFFIX         Das übliche Suffix der Sicherungskopie\n"
-"                               überschreiben\n"
+"                                überschreiben\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -3134,7 +2922,7 @@
 msgstr ""
 "Die Art der Versionskontrolle kann mit --backup oder mit der "
 "Umgebungsvariablen\n"
-"VERSION_CONTROL gewählt werden. Mögliche Werte sind:\n"
+"VERSION_CONTROL gewählt werden.  Mögliche Werte sind:\n"
 "  none, off       niemals Sicherungskopien erstellen (selbst wenn --backup\n"
 "                    angegeben ist)\n"
 "  numbered, t     nummerierte Sicherungskopien erstellen\n"
@@ -3143,41 +2931,41 @@
 "                    andernfalls einfache.\n"
 "  simple, never   immer einfache Sicherungskopien erstellen\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
 "Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous             die vorherigen Schlüssel der übersetzten "
+"      --previous           die vorherigen Schlüssel der übersetzten "
 "Meldungen\n"
-"                              beibehalten\n"
+"                             beibehalten\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       Fortschrittsanzeige unterdrücken\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "diese Meldung sollte Pluralformen definieren"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "diese Meldung sollte keine Pluralformen definieren"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3186,7 +2974,7 @@
 "%s%ld alte + %ld Referenzeinträge gelesen,\n"
 "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3215,9 +3003,9 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Java-Modus: Eingabe ist eine ResourceBundle-"
+"  -j, --java               Java-Modus: Eingabe ist eine ResourceBundle-"
 "Klasse\n"
-"                               für Java\n"
+"                             für Java erstellen\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -3230,21 +3018,21 @@
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C#-Ressourcenmodus: Eingabedatei ist\n"
-"                                eine .NET-.resources-Datei\n"
+"      --csharp-resources      C#-Ressourcenmodus: .NET-.resources-Datei ist\n"
+"                                eine eingabedatei\n"
 
 #: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-"
+"      --tcl                Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-"
 "Datei\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  DATEI ...                   .mo-Eingabedateien\n"
+msgstr "  DATEI ...                     .mo-Eingabedateien\n"
 
 #: src/msgunfmt.c:456
 #, c-format
@@ -3258,11 +3046,11 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Der Name der Klasse wird durch das Anhängen des Namens der "
-"Spracheinstellung\n"
-"an den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich "
-"(»_«).\n"
-"Die Option »-d« ist notwendig. Die Klasse wird mittels CLASSPATH gesucht.\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der Lokale an den "
+"Namen\n"
+"der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).  Die "
+"Option\n"
+"»-d« ist notwendig.  Die Klasse mittels CLASSPATH gesucht.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
@@ -3275,9 +3063,10 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Die Optionen »-l« und »-d« sind notwendig. Die .dll-Datei ist in einem\n"
-"Unterverzeichnis des angegebenen Verzeichnisses platziert, dessen\n"
-"Name von der Spracheinstellung abhängig ist.\n"
+"Die Optionen »-l« und »-d« sind notwendig.  Die .dll-Datei ist in einem\n"
+"Unterverzeichnis des angegebenen Verzeichnisses geschrieben plaziert, "
+"dessen\n"
+"Name von der Lokale abhängig ist.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
@@ -3290,22 +3079,21 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Die Optionen »-l« und »-d« sind notwendig. Die .msg-Datei wird in das\n"
+"Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
+msgstr "  -i, --indent              Ausgabe eingerückt darstellen\n"
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
-"      --strict                .po-Datei streng nach Uniforum-Format "
-"erstellen\n"
+"      --strict              .po-Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3318,30 +3106,30 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 "Doppelte Einträge in einem Katalog mit Übersetzungen beseitigen.\n"
-"msguniq findet doppelte Übersetzungen derselben Kennung (msgid). Doppelte\n"
+"msguniq findet doppelte Übersetzungen derselben Kennung (msgid).  Doppelte\n"
 "Einträge stellen eine ungültige Eingabe für andere Programme wie msgfmt,\n"
-"msgmerge oder msgcat dar. Gemäß Voreinstellung werden doppelte Einträge\n"
-"zusammengezogen. Bei Verwendung der Option --repeated werden doppelte Einträge\n"
-"ausgegeben, alle anderen Meldungen werden verworfen. Kommentare und\n"
+"msgmerge oder msgcat dar.  Gemäß Voreinstellung werden doppelte Einträge\n"
+"zusammengezogen.  Bei Verwendung der Option --repeated werden doppelte Einträge\n"
+"ausgegeben, alle anderen Meldungen werden verworfen.  Kommentare und\n"
 "extrahierte Kommentare werden kumuliert, außer wenn --use-first angegeben ist;\n"
 "bei --use-first wird jeweils nur die zuerst vorkommende Übersetzung genommen.\n"
-"Stellenangaben der Meldungen in den Quellen werden kumuliert. Bei Verwendung\n"
+"Stellenangaben der Meldungen in den Quellen werden kumuliert.  Bei Verwendung\n"
 "der Option --unique werden doppelte Einträge verworfen.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              nur doppelte Einträge ausgeben\n"
+msgstr "  -d, --repeated                 nur doppelte Einträge ausgeben\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                nur nicht-doppelte Einträge ausgeben, "
+"  -u, --unique                   nur nicht-doppelte Einträge ausgeben, "
 "doppelte\n"
-"                               verwerfen\n"
+"                                   verwerfen\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3358,16 +3146,16 @@
 "Konvertierung der Meldungen in den Zeichensatz des Anwenders\n"
 "könnte fehlschlagen.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab,\n"
+"Zeichensatz »%s« wird nicht unterstützt.  %s hängt von iconv() ab,\n"
 "und iconv() unterstützt »%s« nicht.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3375,24 +3163,24 @@
 "Dieses Problem lässt sich beheben, wenn Sie GNU libiconv installieren\n"
 "und dann GNU gettext erneut installieren.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Gleichwohl Fortsetzung; Verarbeitungsfehler sind zu erwarten."
+msgstr "Gleichwohl Fortsetzung; Parsing-Fehler sind zu erwarten."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Gleichwohl Fortsetzung."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab.\n"
+"Zeichensatz »%s« wird nicht unterstützt.  %s hängt von iconv() ab.\n"
 "Diese Version wurde ohne iconv() erstellt.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3406,27 +3194,27 @@
 msgid "inconsistent use of #~"
 msgstr "Nicht konsistente Verwendung von #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "»msgstr[]«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "»msgid_plural«-Abschnitt fehlt"
+msgid "missing `msgid_plural' section"
+msgstr "»msgstr[]«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "»msgstr«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "erste Pluralform hat einen Index ungleich Null"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "Pluralform hat einen falschen Index"
@@ -3436,7 +3224,7 @@
 msgid "too many errors, aborting"
 msgstr "zu viele Fehler: Abbruch"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ungültige Multibyte-Sequenz"
@@ -3480,16 +3268,16 @@
 msgid "context separator <EOT> within string"
 msgstr "Kontext-Trenner <EOT> innerhalb einer Zeichenkette"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "Mehrfachdefinition der Meldung"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "dies ist die Stelle der ersten Definition"
 
@@ -3531,11 +3319,11 @@
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "Warnung: Syntaxfehler, »;« nach der Zeichenkette erwartet"
+msgstr "Warnung: Syntaxfehler, ';' nach der Zeichenkette erwartet"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "Warnung: Syntaxfehler, »=« oder »;« nach der Zeichenkette erwartet"
+msgstr "Warnung: Syntaxfehler, '=' or ';' nach der Zeichenkette erwartet"
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -3553,7 +3341,7 @@
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Serbischen Text von kyrillischer nach lateinischer Schreibweise umkodieren.\n"
+msgstr "Serbischen Text von kyrillischer nach lateinischer Schreibart umkodieren.\n"
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3561,15 +3349,15 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"Der Eingabetext wird von der Standardeingabe gelesen  Der umgewandelte Text\n"
+"Der Eingabetext wird von der Standardeingabe gelesen.  Der umgewandelte Text\n"
 "wird nach der Standardausgabe ausgegeben.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "Eingabe ist in der Kodierung »%s« nicht gültig"
+msgstr "Eingabe ist nicht gültig in der Kodierung »%s«"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
@@ -3591,38 +3379,28 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
-"URL holen und Inhalt ausgeben. Wenn auf den URL nicht zugegriffen werden kann,\n"
+"URL holen und Inhalt ausgeben.  Wenn auf den URL nicht zugegriffen werden kann,\n"
 "wird die lokal zugängliche Datei stattdessen verwendet.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "Fehler beim Lesen von »%s«"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
-msgstr "Fehler beim Schreiben in die Standardausgabe"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "Fehler nach dem Lesen von »%s«"
+msgstr "Fehler beim Schreiben von Standardausgabe"
 
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "%s wird geholt..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " Zeitlimit überschritten.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " fehlgeschlagen.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3630,7 +3408,7 @@
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 "Es ist nicht möglich, mehrere Übersetzungsbereiche in eine Datei mit dem "
-"angegebenen Ausgabeformat auszugeben. Versuchen Sie als Ersatz auf die PO-"
+"angegebenen Ausgabeformat auszugeben.  Versuchen Sie als Ersatz auf die PO-"
 "Dateien-Syntax auszuweichen."
 
 #: src/write-catalog.c:129
@@ -3655,8 +3433,8 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"Der Katalog mit den Meldungen weist Übersetzungen mit Pluralformen auf, aber "
-"das Ausgabeformat unterstützt solche nicht. Versuchen Sie, eine Java-Klasse "
+"der Katalog mit den Meldungen weist Übersetzungen mit Pluralformen auf, aber "
+"das Ausgabeformat unterstützt solche nicht.  Versuchen Sie, eine Java-Klasse "
 "mit »msgfmt --java« zu erstellen und keine »properties«-Datei."
 
 #: src/write-catalog.c:202
@@ -3679,7 +3457,7 @@
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "Fehler beim Anlegen des Verzeichnisses »%s«"
+msgstr "Fehler beim Anlegen von Verzeichnis »%s«"
 
 #: src/write-csharp.c:766
 #, c-format
@@ -3692,19 +3470,19 @@
 msgid "compilation of C# class failed"
 msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kein gültiger Name einer Java-Klasse: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3715,21 +3493,16 @@
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
+msgstr "Fehler beim Öffnen von  »%s« zum Schreiben"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "ungültige Multibyte-Sequenz"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3738,12 +3511,12 @@
 "%s\n"
 msgstr ""
 "Der folgende msgctxt enthält Zeichen, die nicht ASCII-kodiert sind.\n"
-"Dies kann Übersetzern Schwierigkeiten bereiten, wenn diese eine andere\n"
-"Zeichen-Kodierung als Sie verwenden. Bitte auf einen msgctxt\n"
+"Dies kann Übersetzer Schwierigkeiten bereiten, wenn die eine andere\n"
+"Zeichen-Kodierung als Sie verwenden.  Bitte auf einen msgctxt\n"
 "ausweichen, der stattdessen nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3754,7 +3527,7 @@
 "Die folgende msgid enthält Zeichen, die nicht ASCII-kodiert sind.\n"
 "Dies kann bei den Übersetzungen Schwierigkeiten bereiten, wenn die "
 "Übersetzer\n"
-"eine andere Zeichen-Kodierung als Sie verwenden. Bitte auf eine msgid\n"
+"eine andere Zeichen-Kodierung als Sie verwenden.  Bitte auf eine msgid\n"
 "ausweichen, die nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
@@ -3785,7 +3558,7 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"Katalog mit Meldungen weist msgid-Zeichenketten auf, deren Zeichen außerhalb "
+"Katalog mit Meldungen weist msgid-Zeichenketten auf, die Zeichen außerhalb "
 "von\n"
 "ISO-8859-1 liegen, aber das Qt-Format für Kataloge mit Meldungen "
 "unterstützt\n"
@@ -3795,7 +3568,7 @@
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "Fehler beim Schreiben zum Subprozess %s"
+msgstr "Fehler beim Schreiben zum Subprozeß %s"
 
 #: src/write-resources.c:131
 msgid ""
@@ -3829,7 +3602,7 @@
 "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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
@@ -3839,24 +3612,22 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: Warnung: regulärer Ausdruck nicht korrekt terminiert"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "Warnung: ungültiges Unicode-Zeichen"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben."
+msgstr ""
+"Zeichenkette bei %s%s ist nicht ASCII-kodiert.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3894,7 +3665,7 @@
 "%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: Fehler von iconv"
@@ -3908,7 +3679,7 @@
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
@@ -3921,36 +3692,26 @@
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: Warnung: »)« gefunden, wo »}« erwartet wurde"
+msgstr "%s:%d: Warnung: ')' gefunden, wo '}' erwartet wurde"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: Warnung: »}« gefunden, wo »)« erwartet wurde"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Kontext für die aus dem Element »%s« extrahierte Zeichenkette fehlt"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Das Root-Element <%s> ist in einer Glade-Datei nicht zulässig"
+msgstr "%s:%d: Warnung: '}' gefunden, wo ')' erwartet wurde"
 
 # CHECKIT
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"Die Sprache »glade« wird nicht unterstützt. %s hängt von expat ab.\n"
+"Die Sprache »glade« wird nicht unterstützt.  %s hängt von expat ab.\n"
 "Diese Version wurde ohne expat erstellt.\n"
 
 #: src/x-java.c:494
@@ -3958,70 +3719,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: Warnung: Einzelnes Surrogat U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ungültige Multibyte-Sequenz.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-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-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ungültige Multibyte-Sequenz.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: Warnung: RegExp-Literal wurde zu früh terminiert"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: Warnung: %s ist nicht erlaubt"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: Warnung: nicht geschlossene XML-Sequenz"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -4058,17 +3755,19 @@
 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:278
+#: src/x-python.c:236
+#, 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 ""
+"Zeichenkette bei %s%s ist nicht ASCII-kodiert.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
 "Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4078,10 +3777,10 @@
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
 "Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4091,10 +3790,10 @@
 "%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
 "Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4104,10 +3803,10 @@
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
 "Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4117,10 +3816,10 @@
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
 "Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4133,7 +3832,7 @@
 "angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
@@ -4162,70 +3861,58 @@
 "%s:%lu: Warnung: die Syntax $\"...\" ist aus Sicherheitsgründen als veraltet "
 "zu betrachten; verwenden Sie stattdessen use eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: Warnung: Literal des regulären Ausdrucks zu früh terminiert"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=NAME   Ausgabe in NAME.po (anstatt in messages.po)\n"
+"  -d, --default-domain=NAME  Ausgabe in NAME.po (anstatt in messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
-"  -o, --output=DATEI          Ausgabe in die angegebene DATEI schreiben\n"
+"  -o, --output=DATEI         Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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"
+"  -p, --output-dir=VERZ      Ausgabedateien in Verzeichnis VERZ ablegen\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wahl der Sprache für die Eingabedatei:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4234,24 +3921,21 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=NAME          erkennt die angegebene Programmiersprache\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"  -L, --language=NAME            angegebene Programmiersprache erkennen\n"
+"                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
+"                                   EmacsLisp, librep, Smalltalk, Java,\n"
+"                                   JavaProperties, C#, awk, YCP, Tcl, Perl,\n"
+"                                   PHP, GCC-source, NXStringTable, RST, "
+"Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   Abkürzung für --language=C++\n"
+msgstr "  -C, --c++                      Abkürzung für --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4261,34 +3945,34 @@
 "Eingabedatei\n"
 "geraten.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=NAME        Kodierung der Eingabedateien\n"
-"                               (außer für Python, Tcl, Glade)\n"
+"      --from-code=NAME           Kodierung der Eingebedateien\n"
+"                                   (außer für Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
-"  -j, --join-existing         Meldungen an existierende Datei anhängen\n"
+"  -j, --join-existing            Meldungen an existierende Datei anhängen\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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"
+"  -x, --exclude-file=DATEI.po    Einträge aus DATEI.po nicht herausholen\n"
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4296,58 +3980,44 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cKENNUNG, --add-comments=KENNUNG\n"
-"                              Kommentare, die mit KENNUNG beginnen und "
-"welche\n"
-"                               einer Zeile mit Schlüsselworten vorausgehen "
-"in\n"
-"                               die Ausgabedatei schreiben.\n"
-"  -c, --add-comments          Alle Kommentarblöcke, die einer Zeile mit\n"
-"                               Schlüsselworten vorausgehen, in die\n"
-"                               Ausgabedatei schreiben.\n"
+"  -c, --add-comments[=KENNUNG]   Kommentare mit KENNUNG (oder die aus "
+"Zeilen\n"
+"                                   vor einem Schlüsselwort) herausschreiben\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Besondere Optionen bei »Language«:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (nur die Programmiersprachen C, C++,\n"
-"                                ObjectiveC, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java, C#, awk,\n"
-"                                Tcl, Perl, PHP, GCC-source, Glade\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                 (nur die Programmiersprachen C, C++,\n"
+"                                 ObjectiveC, Shell, Python, Lisp,\n"
+"                                 EmacsLisp, librep, Scheme, Java, C#, awk,\n"
+"                                 Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (nur die Sprachen C, C++, ObjectiveC, "
-"Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-Source, Glade\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -k, --keyword[=WORT]       zusätzliches Schlüsselwort, nach dem gesucht\n"
+"                               wird (ohne WORT-Angabe wird nicht nach den\n"
+"                               vorgegebenen Schlüsselwörtern gesucht)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4356,127 +4026,125 @@
 msgstr ""
 "      --flag=WORT:ARG:FLAG    zusätzliches Flag für Zeichenketten innerhalb "
 "der\n"
-"                               Argumentzahl ARG des Schlüsselworts WORT\n"
+"                                der Argumentzahl ARG des Schlüsselworts "
+"WORT\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (nur die Programmiersprachen C, C++,\n"
-"                                ObjectiveC, Shell, Python, Lisp, EmacsLisp,\n"
-"                                librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
-"                                Perl, PHP, GCC-source\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                   (nur die Programmiersprachen C, C++,\n"
+"                                   ObjectiveC, Shell, Python, Lisp, "
+"EmacsLisp,\n"
+"                                   librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
+"                                   Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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"
+"                               erkennen\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
-"                                (nur die Programmiersprachen C, C++,\n"
-"                                 ObjectiveC)\n"
+"                                   (nur die Programmiersprachen C, C++,\n"
+"                                   ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    Zeichenketten im Qt-Format erkennen\n"
+msgstr "      --qt                     Zeichenketten im Qt-Format erkennen\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (nur die Programmiersprache C++)\n"
+msgstr "                                 (nur die Programmiersprache C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   Zeichenketten im KDE 4-Format erkennen\n"
+msgstr ""
+"      --kde                     Zeichenketten im KDE 4-Format erkennen\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 Zeichenketten im Boost-Format erkennen\n"
+msgstr ""
+"      --boost                  Zeichenketten im Boost-Format erkennen\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 detaillierteres Ergebnis bei Erkennung der\n"
+"  --debug                    detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
-"      --copyright-holder=KETTE   Uhrheberrechtsinhaber in Ausgabe setzen\n"
+"      --copyright-holder=KETTE  Halter des Copyrights in Ausgabe setzen\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          keine Zeile mit FSF-Copyright in Ausgabe\n"
-"                               einfügen\n"
+"      --foreign-user            keine Zeile mit FSF-Copyright in Ausgabe\n"
+"                                  einfügen\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  Paketversion in Ausgabe setzen\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, 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:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[ZEICHENKETTE], --msgstr-prefix[=ZEICHENKETTE]\n"
-"                                ZEICHENKETTE oder \"\" als Präfix für "
-"msgstr\n"
-"                                 nehmen\n"
+"  -m, --msgstr-prefix[=KETTE]   KETTE oder \"\" als Präfix für msgstr "
+"nehmen\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[ZEICHENKETTE], --msgstr-suffix[=ZEICHENKETTE]\n"
-"                                ZEICHENKETTE oder \"\" als Suffix für "
-"msgstr\n"
-"                                 nehmen\n"
+"  -M, --msgstr-suffix[=KETTE]   KETTE oder \"\" als Suffix für msgstr "
+"nehmen\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4485,49 +4153,49 @@
 "Ein --flag-Argument folgt nicht der <keyword>:<argnum>:[pass-]<flag>-Syntax: "
 "%s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Nicht in ASCII kodiertes Zeichen bei %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Nicht in ASCII kodierter Kommentar bei oder vor %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Nicht in ASCII kodierte Zeichenkette bei oder vor %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: Warnung: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
-"Obwohl es an der Position eines Formatelements verwendet wird, ist %s kein "
-"gültiges %s Formatelement. Der Grund: %s\n"
+"Obwohl das Formatelement an der Position eines Formatelements verwendet "
+"wird, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
-"Obwohl es so deklariert wurde, ist %s kein gültiges %s Formatelement. Der "
-"Grund: %s\n"
+"Obwohl es als Formatelement deklariert wurde, ist %s kein gültiges %s "
+"Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4539,9 +4207,9 @@
 "geeigneter Form lokalisiert werden:\n"
 "Die Übersetzerin kann die Argumente nicht umsortieren.\n"
 "Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
-"und einem Mapping anstelle eines Tupels für die Argumente.\n"
+"und einem Mapping anstelle eines Tuples für die Argumente.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4551,31 +4219,31 @@
 "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
 "zurück, keine leere Zeichenkette.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4584,32 +4252,39 @@
 "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:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "Einige Felder im Kopfeintrag haben immer noch den anfänglichen "
-#~ "Vorgabewert\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: unzulässige Option -- %c\n"
 
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle ist mit dem Exit-Code 0x%08x fehlgeschlagen"
+#~ msgstr "DuplicateHandle ist mit dem Exitcode 0x%08x fehlgeschlagen"
 
 #~ msgid "Not yet implemented."
 #~ msgstr "Noch nicht implementiert."
 
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr ""
+#~ "es ist nicht möglich, eine nicht-blockierende Ein/Ausgabe zum Subprozeß "
+#~ "%s\n"
+#~ "zu setzen"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "Kommunikation mit dem Subprozeß %s fehlgeschlagen"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "Lesen vorm Subprozeß %s fehlgeschlagen"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "Subprozeß %s wurde mit dem Exitcode %d beendet"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "Feld »%s« hat immer noch den anfänglichen Vorgabewert\n"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/el.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/el.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/el.po gettext-0.18.1.1/gettext-tools/po/el.po
--- gettext-0.19.3/gettext-tools/po/el.po	2014-10-16 06:04:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/el.po	2010-06-06 12:49:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -27,29 +27,30 @@
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "�������� ���������� ��� �������� \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "�������� ���������� ��� �������� \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "�������� ����������� ������� ������ \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "�������� ���������� ��� �������� \"%s\""
@@ -58,43 +59,42 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
 #
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
+#, c-format
+msgid "error while opening \"%s\" for reading"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
 #
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
 
 #
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -112,110 +112,110 @@
 msgstr ""
 
 #
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 #
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: � ������� `%s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: � ������� `--%s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: � ������� `%c%s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: � ������� `%s' ������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: �� ������������ ������� `--%s'\n"
 
 #
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: �� ������������ ������� `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: �� ������ ������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: � ������� ������� ��������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: � ������� `-W %s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: � ������� `-W %s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: � ������� `%s' ������� ���������\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -225,99 +225,61 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ����� �����������"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "�������� ����������� ������� ������ \"%s\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "�������� ����������� ������� ������ \"%s\""
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
 #
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "�������� ����������� ������� ������ \"%s\""
@@ -333,22 +295,14 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -358,7 +312,7 @@
 
 #
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
@@ -366,12 +320,10 @@
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
@@ -381,27 +333,25 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -488,16 +438,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -686,9 +626,7 @@
 msgstr ""
 
 #
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
@@ -734,32 +672,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -801,11 +713,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -815,60 +727,60 @@
 msgstr ""
 
 #
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�������� ��� ���/��� %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "���� ����� ��������"
 
 #
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "��������� `%s --help' ��� ������������ �����������.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -876,34 +788,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -913,251 +825,240 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "������� �������� ��������� ��� <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
 #
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "����������� ������� ��� ������ �������"
 
 #
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "�� %s ��� %s ����� �������� ������������"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1166,88 +1067,88 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1265,33 +1166,33 @@
 "  -S, --strict             ����� ������ �� ������� Uniforum\n"
 "  -V, --version            �������� ����������� ������� ��� ������\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
 #
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "���� ��������� ������� �������� �������� (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
 #
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1300,9 +1201,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "  -V, --version                  �������� ����������� ������� ������������\n"
 "                                   ��� ������\n"
@@ -1321,94 +1222,94 @@
 "����� ������ PO ��� �� ���� ������. �� ������ ������� ��� ��� �� ������ PO\n"
 "�� �����������.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
 #
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "��� ������������ ������ �������"
 
 #
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "����������� ������� ��� ������ �������"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1450,19 +1351,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1489,19 +1390,19 @@
 msgstr ""
 
 #
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "���� �� ������ ��������������, ���� ��� ��������..."
 
 #
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...���� ����� � ������� ����� ���������"
 
 #
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
@@ -1513,20 +1414,20 @@
 msgstr "�������������: ���� �� ������ ��� ��������������"
 
 #
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "�������� %d ������ ��������"
 
 #
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "������ �� �������� ����������� ��� ������"
 
 #
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1534,7 +1435,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1555,76 +1456,76 @@
 "����� ������ PO ��� �� ���� ������. �� ������ ������� ��� ��� �� ������ PO\n"
 "�� �����������.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 #
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "��� ������ ������ �������"
 
 #
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "����������� ������� ��� ������ �������"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1633,7 +1534,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1666,7 +1567,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1676,47 +1577,52 @@
 msgid "write to stdout failed"
 msgstr ""
 
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
 #
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "������������ ��������"
 
 #
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "������ �� �������� ����������� ��� ������"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1724,227 +1630,192 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "�� %s ��� %s ����� �������� ������������"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
 #
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ������������ ��������"
 
 #
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d �������������� �����������"
 
 #
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d �� ������������ ��������"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1954,78 +1825,48 @@
 msgstr ""
 
 #
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2033,33 +1874,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2067,76 +1908,67 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
 #
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
 #
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�� ����� ��� �� ������� \"%s\" ��� ����� ��������� ��� ����� �������"
 
 #
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -2144,68 +1976,57 @@
 "����� ����� ����������"
 
 #
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "� ������ `domain %s' ���������"
 
 #
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "� ���� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "� ������������� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2245,30 +2066,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2276,24 +2097,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2301,54 +2122,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2360,7 +2181,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2378,13 +2199,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2394,8 +2215,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2492,38 +2313,38 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2531,80 +2352,90 @@
 msgstr[1] "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 #
-#: src/msgl-check.c:611
+#: src/msgl-check.c:602
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� �������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� �������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� �������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:652
+#: src/msgl-check.c:643
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� ���������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� ���������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� ���������� ��� �� ��� �� '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
+
+#
+#: src/msgl-check.c:784
+#, fuzzy, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
+
+#
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
 msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
 
 #
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2621,8 +2452,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2636,25 +2467,25 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
 #
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2680,51 +2511,51 @@
 "�� ������������ ��������� ���� �������� ����� ����� ��� �� ��������\n"
 "������ ������ ������.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2736,39 +2567,39 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 #
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2778,7 +2609,7 @@
 "����� ���������� %d, �������������� %d.\n"
 
 #
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2878,7 +2709,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2891,12 +2722,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2917,28 +2748,28 @@
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2946,7 +2777,7 @@
 msgstr ""
 
 #
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2960,29 +2791,29 @@
 msgstr ""
 
 #
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "������ ������� `msgstr'"
 
 #
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "������ ������� `msgstr'"
 
 #
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "������ ������� `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
@@ -2994,7 +2825,7 @@
 msgstr "���� ����� ��������, �����������"
 
 #
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "�� �������� ����� ���������� ��������"
@@ -3045,18 +2876,18 @@
 msgstr ""
 
 #
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���� �� ������ ��� ������ �� �������� ������� ��� �� �������"
 
 #
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "����������������� ������� ���������"
 
 #
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "���� ����� � ���� ��� ������ �������"
 
@@ -3146,13 +2977,13 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
@@ -3176,23 +3007,11 @@
 msgstr ""
 
 #
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "������ ���� �������� ��� \"%s\""
-
-#
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "������ ���� �������� ��� \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3266,17 +3085,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3288,21 +3107,15 @@
 msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
 
 #
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "�� �������� ����� ���������� ��������"
-
-#
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "�� �������� ���� ��������� ��� ������ �� ��������� �� ��������� �������� `\\"
 "%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3311,7 +3124,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3372,7 +3185,7 @@
 msgstr ""
 
 #
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �������������: �� ������������ �������������"
@@ -3384,24 +3197,18 @@
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: �������������: �� ������������ ������� ����������"
-
-#
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
 
 #
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3433,7 +3240,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3446,7 +3253,7 @@
 msgstr ""
 
 #
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
@@ -3467,22 +3274,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3495,63 +3292,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: �������������: �� ������������ ������� ����������"
-
-#
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3588,13 +3328,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3602,7 +3342,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3610,7 +3350,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3618,7 +3358,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3626,7 +3366,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3634,7 +3374,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3663,66 +3403,55 @@
 msgstr ""
 
 #
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "�� --join-existing �� ������ �� �������������� ���� � ������ �������� ���� "
 "�������� �����"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
 #
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "�������������: �� ������ `%s' �� �������� `%s' ����� ������� �� ���������� C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3731,45 +3460,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3779,37 +3507,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3817,85 +3541,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3903,7 +3626,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3911,7 +3634,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3919,45 +3642,45 @@
 msgstr ""
 
 #
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "�������� �������"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3966,45 +3689,45 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
 #
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "� ������ `%s' ����� �������"
 
 #: libgettextpo/gettext-po.c:84
@@ -4017,11 +3740,6 @@
 
 #
 #, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
-
-#
-#, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "�� ����� `%s' ���� ����� ��� ������ �� ������� ����"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/en@boldquot.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/en@boldquot.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/en@boldquot.po gettext-0.18.1.1/gettext-tools/po/en@boldquot.po
--- gettext-0.19.3/gettext-tools/po/en@boldquot.po	2014-10-16 06:04:21.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/en@boldquot.po	2010-06-03 23:57:28.000000000 +0000
@@ -1,7 +1,7 @@
 # English translations for gettext-tools package.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2014.
+# Automatically generated, 2010.
 #
 # 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.3\n"
+"Project-Id-Version: gettext-tools 0.18.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-06-04 01:57+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@boldquot\n"
@@ -53,25 +53,26 @@
 msgstr "ambiguous argument %s for %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "cannot find a temporary directory, try setting $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "cannot create a temporary directory using template “%s”"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "cannot remove temporary file %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "cannot remove temporary directory %s"
@@ -80,38 +81,37 @@
 msgid "write error"
 msgstr "write error"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "preserving permissions for %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
+msgstr "error while opening “%s” for reading"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "cannot open backup file “%s” for writing"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "error reading %s"
+msgid "error reading \"%s\""
+msgstr "error reading “%s”"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "error writing %s"
+msgid "error writing \"%s\""
+msgstr "error writing “%s”"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "error after reading %s"
+msgid "error after reading \"%s\""
+msgstr "error after reading “%s”"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -128,98 +128,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# virtual machine not found, try installing pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subprocess failed"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: option ‘--%s’ requires an argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: option ‘-W %s’ requires an argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "invalid source_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
@@ -229,96 +229,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "read from %s subprocess failed"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "communication with %s subprocess failed"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s subprocess terminated with exit code %d"
+msgid "cannot create pipe"
+msgstr "cannot create pipe"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "cannot create pipe"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "cannot restore fd %d: dup2 failed"
@@ -334,43 +296,34 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error while opening “%s” for reading"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "‘%s’ is not a valid %s format string, unlike '%s'. Reason: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"a format specification for argument %u, as in '%s', doesn't exist in ‘"
-"%s’"
+"a format specification for argument %u, as in '%s', doesn't exist in ‘%s"
+"[0m’"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -382,7 +335,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "The directive number %u starts with | but does not end with |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -392,21 +345,19 @@
 "format specifier macro. The valid macro names are listed in ISO C 99 section "
 "7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "In the directive number %u, the token after ‘<’ is not followed by '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "The string refers to argument number %u but ignores argument number %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -504,16 +455,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "‘%s’ does not use %%m but ‘%s’ uses %%m"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "‘%s’ uses %%C but ‘%s’ doesn't"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "‘%s’ does not use %%C but ‘%s’ uses %%C"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "The string ends in the middle of a directive."
@@ -624,8 +565,8 @@
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in ‘"
-"%s’"
+"a format specification for argument {%u}, as in '%s', doesn't exist in ‘%s"
+"[0m’"
 
 #: src/format-java.c:756
 #, c-format
@@ -729,9 +670,7 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -772,8 +711,8 @@
 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’"
+"a format specification for argument '%s', as in '%s', doesn't exist in ‘%s"
+"[0m’"
 
 #: src/format-python.c:494
 #, c-format
@@ -783,35 +722,6 @@
 "format specifications in ‘%s’ and ‘%s’ for argument ‘%s’ "
 "are not the same"
 
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -863,11 +773,11 @@
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -880,58 +790,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Print the machine's hostname.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Output format:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 short host name\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -942,34 +852,34 @@
 "domain\n"
 "                                name, and aliases\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
@@ -978,41 +888,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "could not get host name"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1021,63 +933,63 @@
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1086,80 +998,71 @@
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            keep translated, remove untranslated messages\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              remove ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            keep ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           remove obsolete #~ messages\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         keep obsolete #~ messages\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute manipulation:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set all messages ‘fuzzy’\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set all messages obsolete\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set all messages non-obsolete\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1168,57 +1071,50 @@
 "      --clear-previous        remove the “previous msgid” from all "
 "messages\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Input file syntax:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1227,17 +1123,17 @@
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1250,55 +1146,55 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, 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:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, 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:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1306,40 +1202,40 @@
 "  -n, --add-location          generate ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, 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:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1348,31 +1244,31 @@
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1381,9 +1277,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1391,27 +1287,27 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1420,7 +1316,7 @@
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1429,7 +1325,7 @@
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1438,16 +1334,16 @@
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1456,12 +1352,12 @@
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1470,7 +1366,7 @@
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1479,21 +1375,21 @@
 "entry\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "no input files given"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exactly 2 input files required"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage: %s [OPTION] def.po ref.pot\n"
@@ -1525,12 +1421,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     references to the sources\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operation modifiers:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1539,7 +1435,7 @@
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
@@ -1564,17 +1460,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "this message needs to be reviewed by the translator"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "this message is used but not defined..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...but this definition is similar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "this message is used but not defined in %s"
@@ -1584,19 +1480,19 @@
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1604,7 +1500,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1613,11 +1509,11 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1626,72 +1522,72 @@
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           don't write header with ‘msgid \"\"’ "
 "entry\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Conversion target:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indented output style\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           suppress ‘#: filename:line’ lines\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          preserve ‘#: filename:line’ lines "
+"      --add-location          preserve ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "exactly one input file required"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1704,7 +1600,7 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   input PO or POT file\n"
@@ -1743,7 +1639,7 @@
 "A special builtin command called ‘0’ outputs the translation, followed by a\n"
 "null byte.  The output of “msgexec 0” is suitable as input for “xargs -0”.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       input PO file\n"
@@ -1753,27 +1649,32 @@
 msgid "write to stdout failed"
 msgstr "write to stdout failed"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "write to %s subprocess failed"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "missing filter name"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "at least one sed script must be specified"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Applies a filter to all translations of a translation catalog.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1782,19 +1683,19 @@
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1805,129 +1706,108 @@
 "commands\n"
 "                                to be executed\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indented output style\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory” specification"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale” specification"
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s requires a “--template template” specification"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s requires a “-o file” specification"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s and %s are mutually exclusive in %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1936,17 +1816,17 @@
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1955,7 +1835,7 @@
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1964,12 +1844,12 @@
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1978,47 +1858,40 @@
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2027,23 +1900,14 @@
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2056,12 +1920,12 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2070,7 +1934,7 @@
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2079,18 +1943,18 @@
 "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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2099,47 +1963,12 @@
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Desktop Entry mode options:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORY                base directory of .po files\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2150,13 +1979,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2165,7 +1994,7 @@
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2174,7 +2003,7 @@
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2183,7 +2012,7 @@
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2194,121 +2023,97 @@
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, 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:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s does not exist"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s exists but cannot read"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2317,7 +2122,7 @@
 "option ‘%c’ cannot be used before ‘J’ or ‘K’ or ‘T’ "
 "or ‘C’ or ‘X’ has been specified"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2326,7 +2131,7 @@
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2401,24 +2206,24 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                use C escapes in output, no extended chars\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generate sorted output\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort output by file location\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2428,7 +2233,7 @@
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2439,12 +2244,12 @@
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Created %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2453,12 +2258,12 @@
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       input POT file\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2469,12 +2274,12 @@
 "file.\n"
 "If it is -, standard input is read.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      write output to specified PO file\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2483,19 +2288,19 @@
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target locale\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         assume the PO file is automatically generated\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2503,12 +2308,12 @@
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error reading current directory"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2516,14 +2321,14 @@
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subprocess failed with exit code %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2540,7 +2345,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
@@ -2558,7 +2363,7 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
@@ -2566,7 +2371,7 @@
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry "
@@ -2578,8 +2383,8 @@
 msgstr "target charset “%s” is not a portable encoding name."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "warning: "
@@ -2703,46 +2508,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Try using the following, valid for %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "message catalog has plural form translations"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "but header entry lacks a “plural=EXPRESSION” attribute"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "but header entry lacks a “nplurals=INTEGER” attribute"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2750,64 +2555,73 @@
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
-"‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘"
-"\\n’"
+"‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n"
+"[0m’"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
-"‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘"
-"\\n’"
+"‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n"
+"[0m’"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
-"‘msgid’ and ‘msgid_plural’ entries do not both end with ‘"
-"\\n’"
+"‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n"
+"[0m’"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "header field ‘%s’ still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "header field ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "header field ‘%s’ missing in header\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "header field ‘%s’ should start at beginning of line\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "some header fields still have the initial default value\n"
+
+#: src/msgl-check.c:826
+#, 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-iconv.c:65
 #, c-format
@@ -2824,15 +2638,15 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"Cannot convert from “%s” to “%s”. %s relies on iconv(), and "
-"iconv() does not support this conversion."
+"Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv"
+"() does not support this conversion."
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2843,8 +2657,8 @@
 "Conversion from “%s” to “%s” introduces duplicates: some "
 "different msgids become equal."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2853,16 +2667,16 @@
 "Cannot convert from “%s” to “%s”. %s relies on iconv(). This "
 "version was built without iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is only valid with %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "backup type"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2885,17 +2699,17 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      translations referring to old sources\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     references to new sources\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2904,7 +2718,7 @@
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2913,27 +2727,27 @@
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Output file location in update mode:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "The result is written back to def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        make a backup of def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         override the usual backup suffix\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2952,40 +2766,40 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is ‘~’, unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              keep previous msgids of translated messages\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suppress progress indicators\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "this message should define plural forms"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "this message should not define plural forms"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2994,7 +2808,7 @@
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3104,7 +2918,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                write strict uniforum style\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3125,12 +2939,12 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              print only duplicates\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3153,7 +2967,7 @@
 "Charset “%s” is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3162,7 +2976,7 @@
 "Charset “%s” is not supported. %s relies on iconv(),\n"
 "and iconv() does not support “%s”.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3170,15 +2984,15 @@
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuing anyway, expect parse errors."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Continuing anyway."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3187,7 +3001,7 @@
 "Charset “%s” is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3200,27 +3014,27 @@
 msgid "inconsistent use of #~"
 msgstr "inconsistent use of #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "missing ‘msgstr[]’ section"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "missing ‘msgid_plural’ section"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "missing ‘msgstr’ section"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "first plural form has nonzero index"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural form has wrong index"
@@ -3230,7 +3044,7 @@
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
@@ -3274,16 +3088,16 @@
 msgid "context separator <EOT> within string"
 msgstr "context separator <EOT> within string"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "this is the location of the first definition"
 
@@ -3358,12 +3172,12 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "input is not valid in “%s” encoding"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error while converting from “%s” encoding to “%s” encoding"
@@ -3387,21 +3201,11 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "error reading “%s”"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error writing stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "error after reading “%s”"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3483,17 +3287,17 @@
 msgid "compilation of C# class failed"
 msgstr "compilation of C# class failed"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "not a valid Java class name: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "compilation of Java class failed, please try to set $JAVAC"
@@ -3503,19 +3307,15 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:821
-msgid "incomplete multibyte sequence"
-msgstr "incomplete multibyte sequence"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape "
 "sequence"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3528,7 +3328,7 @@
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3608,7 +3408,7 @@
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: warning: unterminated string"
@@ -3618,22 +3418,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: warning: unterminated regular expression"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "warning: invalid Unicode character"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: warning: unterminated character constant"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Please specify the source encoding through --from-code."
 
@@ -3673,7 +3468,7 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv failure"
@@ -3687,7 +3482,7 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: warning: invalid Unicode character"
@@ -3707,22 +3502,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: warning: ‘}’ found where ‘)’ was expected"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Missing context for the string extracted from ‘%s’ element"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "The root element <%s> is not allowed in a valid Glade file"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3736,70 +3521,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: warning: lone surrogate U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Please specify the source encoding through --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: warning: RegExp literal terminated too early"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: warning: %s is not allowed"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: warning: unterminated XML markup"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3839,7 +3560,7 @@
 msgstr ""
 "%s:%d: invalid interpolation (“\\U”) of 8bit character “%c”"
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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"
@@ -3847,7 +3568,7 @@
 "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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3858,7 +3579,7 @@
 "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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3869,7 +3590,7 @@
 "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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3880,7 +3601,7 @@
 "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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3891,7 +3612,7 @@
 "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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3902,7 +3623,7 @@
 "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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unknown encoding “%s”. Proceeding with ASCII instead."
@@ -3931,37 +3652,27 @@
 "%s:%lu: warning: the syntax $“...” is deprecated due to security "
 "reasons; use eval_gettext instead"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: warning: regular expression literal terminated too early"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3970,24 +3681,24 @@
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3996,8 +3707,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4005,15 +3715,14 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4022,7 +3731,7 @@
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4031,22 +3740,22 @@
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4061,47 +3770,39 @@
 "lines\n"
 "                                in output file\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4112,93 +3813,91 @@
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   recognize KDE 4 format strings\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, 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:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4209,7 +3908,7 @@
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4220,7 +3919,7 @@
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4229,31 +3928,31 @@
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Non-ASCII character at %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Non-ASCII comment at or before %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Non-ASCII string at %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4262,7 +3961,7 @@
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4271,7 +3970,7 @@
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4285,7 +3984,7 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4295,30 +3994,30 @@
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4327,9 +4026,9 @@
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
 
 #: libgettextpo/gettext-po.c:84
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/en@quot.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/en@quot.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/en@quot.po gettext-0.18.1.1/gettext-tools/po/en@quot.po
--- gettext-0.19.3/gettext-tools/po/en@quot.po	2014-10-16 06:04:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/en@quot.po	2010-06-03 23:57:27.000000000 +0000
@@ -1,7 +1,7 @@
 # English translations for gettext-tools package.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2014.
+# Automatically generated, 2010.
 #
 # 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.3\n"
+"Project-Id-Version: gettext-tools 0.18.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-06-04 01:57+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -50,25 +50,26 @@
 msgstr "ambiguous argument %s for %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "cannot find a temporary directory, try setting $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "cannot create a temporary directory using template “%s”"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "cannot remove temporary file %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "cannot remove temporary directory %s"
@@ -77,38 +78,37 @@
 msgid "write error"
 msgstr "write error"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "preserving permissions for %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
+msgstr "error while opening “%s” for reading"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "cannot open backup file “%s” for writing"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "error reading %s"
+msgid "error reading \"%s\""
+msgstr "error reading “%s”"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "error writing %s"
+msgid "error writing \"%s\""
+msgstr "error writing “%s”"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "error after reading %s"
+msgid "error after reading \"%s\""
+msgstr "error after reading “%s”"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -125,98 +125,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# virtual machine not found, try installing pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subprocess failed"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: option ‘--%s’ requires an argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: option ‘-W %s’ requires an argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "invalid source_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
@@ -226,96 +226,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "read from %s subprocess failed"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "communication with %s subprocess failed"
-
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s subprocess terminated with exit code %d"
+msgid "cannot create pipe"
+msgstr "cannot create pipe"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "cannot create pipe"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "cannot restore fd %d: dup2 failed"
@@ -331,20 +293,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error while opening “%s” for reading"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "‘%s’ is not a valid %s format string, unlike '%s'. Reason: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -354,19 +309,17 @@
 "a format specification for argument %u, as in '%s', doesn't exist in ‘%s’"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -377,7 +330,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "The directive number %u starts with | but does not end with |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -386,21 +339,19 @@
 "In the directive number %u, the token after ‘<’ is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "In the directive number %u, the token after ‘<’ is not followed by '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "The string refers to argument number %u but ignores argument number %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -494,16 +445,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "‘%s’ does not use %%m but ‘%s’ uses %%m"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "‘%s’ uses %%C but ‘%s’ doesn't"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "‘%s’ does not use %%C but ‘%s’ uses %%C"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "The string ends in the middle of a directive."
@@ -715,9 +656,7 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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’"
@@ -763,33 +702,6 @@
 msgstr ""
 "format specifications in ‘%s’ and ‘%s’ for argument ‘%s’ are not the same"
 
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -841,11 +753,11 @@
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -858,58 +770,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Print the machine's hostname.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Output format:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 short host name\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -920,34 +832,34 @@
 "domain\n"
 "                                name, and aliases\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
@@ -956,41 +868,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "could not get host name"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -999,63 +913,63 @@
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1064,80 +978,71 @@
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            keep translated, remove untranslated messages\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              remove ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            keep ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           remove obsolete #~ messages\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         keep obsolete #~ messages\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute manipulation:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set all messages ‘fuzzy’\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set all messages obsolete\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set all messages non-obsolete\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1145,57 +1050,50 @@
 msgstr ""
 "      --clear-previous        remove the “previous msgid” from all messages\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Input file syntax:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1204,17 +1102,17 @@
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1227,94 +1125,94 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, 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:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, 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:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, 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:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1323,31 +1221,31 @@
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1356,9 +1254,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1366,27 +1264,27 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1395,7 +1293,7 @@
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1404,7 +1302,7 @@
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1413,16 +1311,16 @@
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1431,12 +1329,12 @@
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1445,7 +1343,7 @@
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1453,21 +1351,21 @@
 "      --lang=CATALOGNAME      set ‘Language’ field in the header entry\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "no input files given"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exactly 2 input files required"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage: %s [OPTION] def.po ref.pot\n"
@@ -1499,12 +1397,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     references to the sources\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operation modifiers:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1513,7 +1411,7 @@
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
@@ -1538,17 +1436,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "this message needs to be reviewed by the translator"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "this message is used but not defined..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...but this definition is similar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "this message is used but not defined in %s"
@@ -1558,19 +1456,19 @@
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1578,7 +1476,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1587,11 +1485,11 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1600,69 +1498,69 @@
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           don't write header with ‘msgid \"\"’ entry\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Conversion target:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indented output style\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           suppress ‘#: filename:line’ lines\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          preserve ‘#: filename:line’ lines (default)\n"
+"      --add-location          preserve ‘#: filename:line’ lines (default)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "exactly one input file required"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1675,7 +1573,7 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   input PO or POT file\n"
@@ -1714,7 +1612,7 @@
 "A special builtin command called ‘0’ outputs the translation, followed by a\n"
 "null byte.  The output of “msgexec 0” is suitable as input for “xargs -0”.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       input PO file\n"
@@ -1724,27 +1622,32 @@
 msgid "write to stdout failed"
 msgstr "write to stdout failed"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "write to %s subprocess failed"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "missing filter name"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "at least one sed script must be specified"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Applies a filter to all translations of a translation catalog.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1753,19 +1656,19 @@
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1776,129 +1679,108 @@
 "commands\n"
 "                                to be executed\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indented output style\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory” specification"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale” specification"
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s requires a “--template template” specification"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s requires a “-o file” specification"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s and %s are mutually exclusive in %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1907,17 +1789,17 @@
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1926,7 +1808,7 @@
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1935,12 +1817,12 @@
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1949,47 +1831,40 @@
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1998,23 +1873,14 @@
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2027,12 +1893,12 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2041,7 +1907,7 @@
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2050,18 +1916,18 @@
 "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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2070,47 +1936,12 @@
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Desktop Entry mode options:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORY                base directory of .po files\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2121,13 +1952,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2136,7 +1967,7 @@
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2145,7 +1976,7 @@
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2154,7 +1985,7 @@
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2165,121 +1996,97 @@
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, 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:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s does not exist"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s exists but cannot read"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2288,7 +2095,7 @@
 "option ‘%c’ cannot be used before ‘J’ or ‘K’ or ‘T’ or ‘C’ or ‘X’ has been "
 "specified"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2297,7 +2104,7 @@
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2372,24 +2179,24 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                use C escapes in output, no extended chars\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generate sorted output\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort output by file location\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2399,7 +2206,7 @@
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2410,12 +2217,12 @@
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Created %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2424,12 +2231,12 @@
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       input POT file\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2440,12 +2247,12 @@
 "file.\n"
 "If it is -, standard input is read.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      write output to specified PO file\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2454,19 +2261,19 @@
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target locale\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         assume the PO file is automatically generated\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2474,12 +2281,12 @@
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error reading current directory"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2487,14 +2294,14 @@
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subprocess failed with exit code %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2511,7 +2318,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
@@ -2529,14 +2336,14 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset specification"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry with a charset "
@@ -2548,8 +2355,8 @@
 msgstr "target charset “%s” is not a portable encoding name."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "warning: "
@@ -2673,46 +2480,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Try using the following, valid for %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "message catalog has plural form translations"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "but header entry lacks a “plural=EXPRESSION” attribute"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "but header entry lacks a “nplurals=INTEGER” attribute"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2720,55 +2527,64 @@
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "header field ‘%s’ still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "header field ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "header field ‘%s’ missing in header\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "header field ‘%s’ should start at beginning of line\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "some header fields still have the initial default value\n"
+
+#: src/msgl-check.c:826
+#, 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-iconv.c:65
 #, c-format
@@ -2784,8 +2600,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2803,8 +2619,8 @@
 "Conversion from “%s” to “%s” introduces duplicates: some different msgids "
 "become equal."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2813,16 +2629,16 @@
 "Cannot convert from “%s” to “%s”. %s relies on iconv(). This version was "
 "built without iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is only valid with %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "backup type"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2845,17 +2661,17 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      translations referring to old sources\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     references to new sources\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2864,7 +2680,7 @@
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2873,27 +2689,27 @@
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Output file location in update mode:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "The result is written back to def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        make a backup of def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         override the usual backup suffix\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2912,40 +2728,40 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is ‘~’, unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              keep previous msgids of translated messages\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suppress progress indicators\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "this message should define plural forms"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "this message should not define plural forms"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2954,7 +2770,7 @@
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3064,7 +2880,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                write strict uniforum style\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3085,12 +2901,12 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              print only duplicates\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3113,7 +2929,7 @@
 "Charset “%s” is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3122,7 +2938,7 @@
 "Charset “%s” is not supported. %s relies on iconv(),\n"
 "and iconv() does not support “%s”.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3130,15 +2946,15 @@
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuing anyway, expect parse errors."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Continuing anyway."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3147,7 +2963,7 @@
 "Charset “%s” is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3160,27 +2976,27 @@
 msgid "inconsistent use of #~"
 msgstr "inconsistent use of #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "missing ‘msgstr[]’ section"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "missing ‘msgid_plural’ section"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "missing ‘msgstr’ section"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "first plural form has nonzero index"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural form has wrong index"
@@ -3190,7 +3006,7 @@
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
@@ -3234,16 +3050,16 @@
 msgid "context separator <EOT> within string"
 msgstr "context separator <EOT> within string"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "this is the location of the first definition"
 
@@ -3318,12 +3134,12 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "input is not valid in “%s” encoding"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error while converting from “%s” encoding to “%s” encoding"
@@ -3347,21 +3163,11 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "error reading “%s”"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error writing stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "error after reading “%s”"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3443,17 +3249,17 @@
 msgid "compilation of C# class failed"
 msgstr "compilation of C# class failed"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "not a valid Java class name: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "compilation of Java class failed, please try to set $JAVAC"
@@ -3463,18 +3269,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:821
-msgid "incomplete multibyte sequence"
-msgstr "incomplete multibyte sequence"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape sequence"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3487,7 +3289,7 @@
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3567,7 +3369,7 @@
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: warning: unterminated string"
@@ -3577,22 +3379,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: warning: unterminated regular expression"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "warning: invalid Unicode character"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: warning: unterminated character constant"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Please specify the source encoding through --from-code."
 
@@ -3632,7 +3429,7 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv failure"
@@ -3646,7 +3443,7 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: warning: invalid Unicode character"
@@ -3666,22 +3463,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: warning: ‘}’ found where ‘)’ was expected"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Missing context for the string extracted from ‘%s’ element"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "The root element <%s> is not allowed in a valid Glade file"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3695,70 +3482,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: warning: lone surrogate U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Please specify the source encoding through --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: warning: RegExp literal terminated too early"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: warning: %s is not allowed"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: warning: unterminated XML markup"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3794,7 +3517,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:278
+#: src/x-python.c:236
 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"
@@ -3802,7 +3525,7 @@
 "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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3813,7 +3536,7 @@
 "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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3824,7 +3547,7 @@
 "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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3835,7 +3558,7 @@
 "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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3846,7 +3569,7 @@
 "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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3857,7 +3580,7 @@
 "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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unknown encoding “%s”. Proceeding with ASCII instead."
@@ -3886,37 +3609,27 @@
 "%s:%lu: warning: the syntax $“...” is deprecated due to security reasons; "
 "use eval_gettext instead"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: warning: regular expression literal terminated too early"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3925,24 +3638,24 @@
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3951,8 +3664,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3960,15 +3672,14 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3977,7 +3688,7 @@
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3986,22 +3697,22 @@
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4016,47 +3727,39 @@
 "lines\n"
 "                                in output file\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4067,93 +3770,91 @@
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   recognize KDE 4 format strings\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, 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:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4164,7 +3865,7 @@
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4175,7 +3876,7 @@
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4184,31 +3885,31 @@
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Non-ASCII character at %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Non-ASCII comment at or before %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Non-ASCII string at %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4217,7 +3918,7 @@
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4226,7 +3927,7 @@
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4239,7 +3940,7 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4249,30 +3950,30 @@
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4281,9 +3982,9 @@
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
 
 #: libgettextpo/gettext-po.c:84
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/es.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/es.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/es.po gettext-0.18.1.1/gettext-tools/po/es.po
--- gettext-0.19.3/gettext-tools/po/es.po	2014-10-16 06:04:21.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/es.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,27 +1,26 @@
-# Mensajes en español para GNU gettext.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2013, 2014 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2013, 2014
+# Mensajes en espa�ol para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Max de Mendiz�bal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000,
+# 2001, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-07-22 08:10+0200\n"
-"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@tp.org.es>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2005-06-27 17:09-0500\n"
+"Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "el argumento %s es inválido para %s"
+msgstr "el argumento %s es inv�lido para %s"
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
@@ -29,65 +28,65 @@
 msgstr "el argumento %s es ambiguo para %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "Los argumentos válidos son:"
+msgstr "Los argumentos v�lidos son:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
-#, c-format
+#: gnulib-lib/clean-temp.c:445
+#, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "no se puede borrar el fichero temporal %s"
+msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "no se puede borrar el directory temporal %s"
+msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "error de escritura"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "preservando los permisos para %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "error al abrir el fichero %s para lectura"
+msgid "error while opening \"%s\" for reading"
+msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "no se puede abrir el fichero de respaldo %s para escritura"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "error al leer %s"
+msgid "error reading \"%s\""
+msgstr "error al leer \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "error al escribir %s"
+msgid "error writing \"%s\""
+msgstr "error al escribir \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "error después de leer %s"
+msgid "error after reading \"%s\""
+msgstr "error despu�s de leer \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -97,212 +96,174 @@
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "No se encontró el compilador de C#, intente instalar pnet"
+msgstr "No se encontr� al compilador de C#, intente instalar pnet"
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "No se encontró la máquina virtual de C#, intente instalar pnet"
+msgstr "No se encontr� a la m�quina virtual de C#, intente instalar pnet"
 
-# Nota: El error es del sistema, pero no se sabe cuál es el error,
-# por eso es (además) desconocido.
-#: gnulib-lib/error.c:191
+# Nota: El error es del sistema, pero no se sabe cu�l es el error,
+# por eso es (adem�s) desconocido.
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "fallo en el subproceso %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la opción '%s' es ambigua; posibilidades:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: la opci�n `%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la opción '--%s' no admite ningún argumento\n"
+msgstr "%s: la opci�n `--%s' no admite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
+msgstr "%s: la opci�n `%c%s' no admite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la opción '%s' requiere un argumento\n"
+msgstr "%s: la opci�n `%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
+msgstr "%s: opci�n no reconocida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
+msgstr "%s: opci�n no reconocida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opción inválida -- '%c'\n"
+msgstr "%s: opci�n inv�lida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: la opción requiere un argumento -- '%c'\n"
+msgstr "%s: la opci�n requiere un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
+msgstr "%s: la opci�n `-W %s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
+msgstr "%s: la opci�n `-W %s' no admite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la opción '%s' requiere un argumento\n"
+msgstr "%s: la opci�n `%s' requiere un argumento\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "argumento source_version no válido para compile_java_class"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "argumento target_version no válido para compile_java_class"
+msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
+"No se encuentr� al compilador de Java, intente instalar gcj o poner $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"No se encontró a la máquina virtual de Java, intente instalar gij o poner "
+"No se encontr� a la m�quina virtual de Java, intente instalar gij o poner "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error de E/S en el subproceso %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "fallo en la lectura del subproceso %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "fallo en la comunicación con el subproceso %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "el subproceso %s terminó con un código de salida %d"
+msgid "cannot create pipe"
+msgstr "no se puede crear la tuber�a"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "«"
+msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "»"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "no se puede crear la tubería"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "fallo en _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "no se puede restaurar fd %d: fallo en dup2"
+msgstr "no se puede crear el fichero de salida \"%s\""
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -313,104 +274,94 @@
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "el subproceso %s ha recibido una señal fatal %d"
+msgstr "el subproceso %s tiene una se�al fatal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error al abrir el fichero \"%s\" para lectura"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"'%s' no es un formato de cadena válido %s, a diferencia de '%s'. Motivo: %s"
+"'%s' no es un formato de cadena v�lido %s, a diferencia de 'msgid'. Raz�n: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"una especificación de formato para el argumento %u, como en '%s', no existe "
-"en '%s'"
+"una especificaci�n de formato para el argumento %u, como en '%s', no existe "
+"en 'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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'"
+msgstr "una especificaci�n de formato para el argumento %u no existe en '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"las especificaciones de formato en '%s' y '%s' para el argumento %u no son "
-"las mismas"
+"las especificaciones de formato en 'msgid' y '%s' para el argumento %u no "
+"son las mismas"
 
 #: src/format-boost.c:449
-#, c-format
+#, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "La instrucción número %u comienza con | pero no ternina con |."
+msgstr ""
+"La instrucci�n n�mero %u termina con un car�cter inv�lido en vez de un '}'."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"En la instrucción número %u, el token posterior a '<' no es el nombre de un "
-"macro especificador de formato. Los nombres de macro válidos están listados "
-"en el ISO C 99 sección 7.8.1."
+"En la instrucci�n n�mero %u, el token posterior a '<' no es el nombre de un "
+"macro especificador de formato. Los nombres de macro v�lidos est�n listados "
+"en el ISO C 99 secci�n 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
-"En la instrucción número %u, el token posterior a '<' no está seguido por "
+"En la instrucci�n n�mero %u, el token posterior a '<' no est� seguido por "
 "'>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
-"La cadena se refiere al argumento número %u, pero ignora el argumento número "
+"La cadena se refiere al argumento n�mero %u, pero ignora el argumento n�mero "
 "%u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr "el n�mero de especificaciones de formato en `msgid' y '%s' no coincide"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
-"En la instrucción número %u, '{' no está seguido de un número de argumento."
+"En la instrucci�n n�mero %u, '{' no est� seguido de un n�mero de argumento."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "En la instrucción número %u, ',' no está seguida de un número."
+msgstr "En la instrucci�n n�mero %u, ',' no est� seguida de un n�mero."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"La cadena termina en medio de una instrucción: se encontró un '{' sin su '}' "
+"La cadena termina en medio de una instrucci�n: se encontr� un '{' sin su '}' "
 "correspondiente. "
 
 #: src/format-csharp.c:139
@@ -418,107 +369,95 @@
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"La instrucción número %u termina con un carácter inválido '%c' en vez de un "
+"La instrucci�n n�mero %u termina con un car�cter inv�lido '%c' en vez de un "
 "'}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
-"La instrucción número %u termina con un carácter inválido en vez de un '}'."
+"La instrucci�n n�mero %u termina con un car�cter inv�lido en vez de un '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"La cadena comienza en medio de una instrucción: se encontró un '}' sin su "
+"La cadena comienza en medio de una instrucci�n: se encontr� un '}' sin su "
 "'{' correspondiente."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "La cadena contiene un '}' solitario posterior a la instrucción %u."
+msgstr "La cadena contiene un '}' solitario posterior a la instrucci�n %u."
 
 #: src/format-gcc-internal.c:255
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "En la instrucción número %u, la combinación de banderas no es válida."
+msgstr "En la instrucci�n n�mero %u, el argumento %d es negativo."
 
 #: src/format-gcc-internal.c:292
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
-"En la instrucción número %u, la precisión no está permitida antes de '%c'."
+"En la instrucci�n n�mero %u, las banderas no est�n permitidas antes de '%c'."
 
 #: src/format-gcc-internal.c:334
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
-"En la instrucción número %u, el número de argumento de la precisión debe ser "
-"igual a %u."
+"En la instrucci�n n�mero %u, el n�mero de argumento 0 no es un entero "
+"positivo."
 
 #: src/format-gcc-internal.c:398
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"En la instrucción número %u, la especificación de la precisión no está "
-"permitida antes de '%c'."
+"En la instrucci�n n�mero %u, las banderas no est�n permitidas antes de '%c'."
 
 #: src/format-gcc-internal.c:406
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr ""
-"En la instrucción número %u, la especificación de la precisión no es válida."
+msgstr "En la instrucci�n n�mero %u, el argumento %d es negativo."
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
-"En la instrucción número %u, las banderas no están permitidas antes de '%c'."
+"En la instrucci�n n�mero %u, las banderas no est�n permitidas antes de '%c'."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'%s' utiliza %%m pero '%s' no"
+msgstr "'msgid' utiliza %%m pero '%s' no"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'%s' no utiliza %%m pero '%s' utiliza %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' utiliza %%C pero '%s' no"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' no utiliza %%C pero '%s' utiliza %%C"
+msgstr "'msgid' no utiliza %%m pero '%s' utiliza %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "La cadena termina en medio de una instrucción."
+msgstr "La cadena termina en medio de una instrucci�n."
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 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."
+"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-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
-"En la instrucción número %u, el número de argumento 0 no es un entero "
+"En la instrucci�n n�mero %u, el n�mero de argumento 0 no es un entero "
 "positivo."
 
 #: src/format-invalid.h:30
@@ -527,7 +466,7 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"En la instrucción número %u, la anchura del argumento número 0 no es un "
+"En la instrucci�n n�mero %u, la anchura del argumento n�mero 0 no es un "
 "entero positivo."
 
 #: src/format-invalid.h:32
@@ -536,7 +475,7 @@
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
-"En la instrucción número %u, la precisión del argumento número 0 no es un "
+"En la instrucci�n n�mero %u, la precisi�n del argumento n�mero 0 no es un "
 "entero positivo."
 
 #: src/format-invalid.h:36
@@ -545,8 +484,8 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"En la instrucción número %u, el carácter '%c' no es un especificador de "
-"conversión válido."
+"En la instrucci�n n�mero %u, el car�cter '%c' no es un especificador de "
+"conversi�n v�lido."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -554,14 +493,14 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"El carácter que termina la instrucción número %u no es un especificador de "
-"conversión válido."
+"El car�cter que termina la instrucci�n n�mero %u no es un especificador de "
+"conversi�n v�lido."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
-"La cadena se refiere al número de argumento %u de formas incompatibles."
+"La cadena se refiere al n�mero de argumento %u de formas incompatibles."
 
 #: src/format-java.c:240
 #, c-format
@@ -569,21 +508,21 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"En la instrucción número %u, la subcadena \"%s\" no está en un estilo de "
-"fecha/hora válido."
+"En la instrucci�n n�mero %u, la subcadena \"%s\" no est� en un estilo de "
+"fecha/hora v�lido."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "En la instrucción número %u, \"%s\" no está seguido de una coma."
+msgstr "En la instrucci�n n�mero %u, \"%s\" no est� seguido de una coma."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
-"En la instrucción número %u, la subcadena \"%s\" no es un estilo de número "
-"válido."
+"En la instrucci�n n�mero %u, la subcadena \"%s\" no es un estilo de n�mero "
+"v�lido."
 
 #: src/format-java.c:323
 #, c-format
@@ -591,13 +530,13 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"En la instrucción número %u, el número de argumento no está seguido por una "
+"En la instrucci�n n�mero %u, el n�mero de argumento no est� seguido por una "
 "coma y uno de los siguientes \"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "En la instrucción número %u, una opción contiene un valor no numérico."
+msgstr "En la instrucci�n n�mero %u, una opci�n contiene un valor no num�rico."
 
 #: src/format-java.c:583
 #, c-format
@@ -605,29 +544,29 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"En la instrucción número %u, una opción contiene un número que no está "
+"En la instrucci�n n�mero %u, una opci�n contiene un n�mero que no est� "
 "seguido por '<', '#' o '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"una especificación de formato para el argumento {%u}, como en '%s', no "
-"existe en '%s'"
+"una especificaci�n de formato para el argumento {%u}, como en '%s', no "
+"existe en 'msgid'"
 
 #: src/format-java.c:756
 #, 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'"
+msgstr "una especificaci�n de formato para el argumento {%u} no existe en '%s'"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"las especificaciones de formato en '%s' y '%s' para el argumento {%u} no son "
-"las mismas"
+"las especificaciones de formato en 'msgid' y '%s' para el argumento {%u} no "
+"son las mismas"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -636,8 +575,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"En la instrucción número %u, el parámetro %u es de tipo '%s', pero se "
-"requiere de un parámetro de tipo '%s'."
+"En la instrucci�n n�mero %u, el par�metro %u es de tipo '%s', pero se "
+"requiere de un par�metro de tipo '%s'."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -648,37 +587,37 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"En la instrucción número %u se dieron demasiados parámetros; se espera a lo "
-"más %u parámetro."
+"En la instrucci�n n�mero %u se dieron demasiados par�metros; se espera a lo "
+"m�s %u par�metro."
 msgstr[1] ""
-"En la instrucción número %u se dieron demasiados parámetros; se esperan a lo "
-"más %u parámetros."
+"En la instrucci�n n�mero %u se dieron demasiados par�metros; se esperan a lo "
+"m�s %u par�metros."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "En la instrucción número %u, '%c' no está seguida de un dígito."
+msgstr "En la instrucci�n n�mero %u, '%c' no est� seguida de un d�gito."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "En la instrucción número %u, el argumento %d es negativo."
+msgstr "En la instrucci�n n�mero %u, el argumento %d es negativo."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "La cadena termina en medio de una instrucción ~/.../."
+msgstr "La cadena termina en medio de una instrucci�n ~/.../."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Se encontró '~%c' sin su '~%c' correspondiente."
+msgstr "Se encontr� '~%c' sin su '~%c' correspondiente."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "En la instrucción número %u, deben darse los modificadores @ y :."
+msgstr "En la instrucci�n n�mero %u, deben darse los modificadores @ y :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -686,29 +625,29 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"En la instrucción número %u, '~:[' no está seguido de dos cláusulas "
+"En la instrucci�n n�mero %u, '~:[' no est� seguido de dos cl�usulas "
 "separadas por '~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "En la instrucción número %u, '~;' se utilizó en una posición inválida."
+msgstr "En la instrucci�n n�mero %u, '~;' se utiliz� en una posici�n inv�lida."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "La cadena se refiere a algún argumento de forma incompatible."
+msgstr "La cadena se refiere a alg�n argumento de forma incompatible."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "las especificaciones de formato en `%s' y '%s' no son equivalentes"
+msgstr "las especificaciones de formato en `msgid' y '%s' no son equivalentes"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
-"las especificaciones de formato en '%s' no son un subconjunto de las que hay "
-"en '%s'"
+"las especificaciones de formato en '%s' no son un subconjunto de aquellas en "
+"'msgid'"
 
 #: src/format-perl.c:433
 #, c-format
@@ -716,23 +655,21 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"En la instrucción número %u, el  tamaño del especificador es incompatible "
-"con el especificador de conversión '%c'."
+"En la instrucci�n n�mero %u, el  tama�o del especificador es incompatible "
+"con el especificador de conversi�n '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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'"
+msgstr "una especificaci�n de formato para el argumento '%s' no existe en '%s'"
 
 #: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 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."
+"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:354
 #, c-format
@@ -741,66 +678,36 @@
 "La cadena se refiere al argumento denominado '%s' en formas incompatibles."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"las especificaciones de formato en '%s' requieren una asociación, y aquellas "
-"en '%s' requieren una tupla"
+"las especificaciones de formato en `msgid' requieren un mapeo, y aquellas en "
+"'%s' requieren una tupla"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"las especificaciones de formato en '%s' requieren una tupla y aquellas en "
-"'%s' requieren una asociación"
+"las especificaciones de formato en `msgid' requieren una tupla y aquellas en "
+"'%s' requieren un mapeo"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
-"una especificación de formato para el argumento '%s', como en '%s', no "
-"existe en '%s'"
+"una especificaci�n de formato para el argumento '%s', como en '%s', no "
+"existe en 'msgid'"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"las especificaciones de formato en '%s' y '%s' para el argumento '%s' no son "
-"las mismas"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"En la instrucción número %u, no se permite más anidamiento en un "
-"especificador de formato."
-
-#: src/format-python-brace.c:270
-#, 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."
+"las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no "
+"son las mismas"
 
 #: src/format-qt.c:152
 #, c-format
@@ -808,8 +715,6 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"'%s' es una cadena de formato simple, pero '%s' no lo es: contiene una "
-"bandera 'L' o un número de argumentos de dos dígitos"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -821,20 +726,20 @@
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"La cadena se refiere a una variable de entorno con una sintaxis compleja. "
-"Esta sintaxis no se admite aquí debido a potenciales problemas de seguridad."
+"La cadena se refiere a una variable de entorno con una sint�xis compleja. "
+"Esta sint�xis no se admite aqu� debido a potenciales problemas de seguridad."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"La cadena se refiere a una variable de entorno cuyo valor podría ser "
-"distinto dentro de las funciones del intérprete de comandos."
+"La cadena se refiere a una variable de entorno cuyo valor podr�a ser "
+"distinto dentro de las funciones del int�rprete de comandos."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "La cadena se refiere a una variable de entorno con un nombre vacío."
+msgstr "La cadena se refiere a una variable de entrono con un nombre vac�o."
 
 #: src/format-ycp.c:90
 #, c-format
@@ -842,7 +747,7 @@
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
-"En la instrucción número %u, el carácter '%c' no es un dígito entre 1 y 9."
+"En la instrucci�n n�mero %u, el car�cter '%c' no es un d�gito entre 1 y 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -850,13 +755,13 @@
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
-"El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
+"El car�cter que termina la instrucci�n n�mero %u no es un d�gito entre 1 y 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -864,239 +769,237 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licencia GPLv3+: GNU GPL versión 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
-"Esto es software libre: es usted libre de cambiarlo y redistribuirlo.\n"
-"SIN NINGUNA GARANTÍA, dentro de los límites legales.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Pruebe '%s --help' para más información.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pruebe `%s --help' para m�s informaci�n.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "Modo de empleo: %s [OPCIÓN]\n"
+msgstr "Modo de empleo: %s [OPCI�N]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "Muestra el nombre de la máquina.\n"
+msgstr "Muestra el nombre de la m�quina.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato de salida:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 nombre de corto de la máquina\n"
+msgstr "  -s, --short                 nombre de corto de la m�quina\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"   -f, --fqdn, --long          nombre largo de la máquina, incluye el "
+"   -f, --fqdn, --long          nombre largo de la m�quina, incluye el "
 "nombre\n"
-"                               completo del dominio y los alias,\n"
+"                               completo del dominio calificado,\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
-"  -i, --ip-address            direcciones para el nombre de la máquina\n"
+"  -i, --ip-address            direcciones para el nombre de la m�quina\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra esta ayuda y finaliza\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               muestra la versión y finaliza\n"
+msgstr "  -V, --version               muestra la versi�n y finaliza\n"
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "no se pudo obtener el nombre de la máquina"
+msgstr "no se pudo obtener el nombre de la m�quina"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
-msgstr "solo se permite un fichero de entrada máximo"
+msgstr "s�lo se permite un fichero de entrada m�ximo"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
+msgstr "Modo de empleo: %s [OPCI�N] [FICHEROENTRADA]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n"
+"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:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Los argumentos obligatorios para las opciones largas también son "
+"Los argumentos obligatorios para las opciones largas tambi�n son "
 "obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
-msgstr "Localización del fichero de entrada:\n"
+msgstr "Localizaci�n del fichero de entrada:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  FICHEROENTRADA              fichero PO de entrada\n"
+msgstr "  FICHERODEENTRADA            fichero PO de entrada\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=DIRECTORIO  añade al DIRECTORIO a la lista de búsqueda de "
+"  -D, --directory=DIRECTORIO  a�ade al DIRECTORIO a la lista de b�squeda de "
 "ficheros\n"
 "                              de entrada\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Si no se especifica un fichero de entrada o si es -, se lee la entrada "
-"estándar.\n"
+"est�ndar.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Localización del fichero de salida:\n"
+msgstr "Localizaci�n del fichero de salida:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Los resultados se escriben a la salida estándar si no se especifica ningún\n"
+"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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Selección de mensaje:\n"
+msgstr "Selecci�n de mensaje:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            mantiene lo traducido, elimina los mensajes "
+"     --translated             mantiene lo traducido, elimina los mensajes "
 "sin traducir\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1104,153 +1007,135 @@
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              elimina los mensajes difusos marcados como "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene los mensajes difusos marcados con "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           elimina los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Manipulación de atributos:\n"
+msgstr "Manipulaci�n de atributos:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marca todos los mensajes como obsoletos\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              cuando se configura 'fuzzy', mantiene los "
-"msgids\n"
-"                              anteriores de los mensajes traducidos.\n"
-
-#: src/msgattrib.c:478
-#, c-format
+#: src/msgattrib.c:461
+#, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
-"      --clear-previous        elimina el \"msgid anterior\" de todos los "
-"mensajes\n"
-
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 cuando elimina los mensajes difusos 'fuzzy', "
-"también deja msgstr vacío\n"
+"      --clear-fuzzy           marca todos los mensajes como no difusos "
+"(no-'fuzzy')\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=FICHERO.po  manipula solo las entradas que se encuentran "
-"en FICHERO.po\n"
+"      --only-file=FICHERO.po  manipula s�lo las entradas enlistadas en el "
+"FICHERO.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=FICHERO.po  manipula solo las entradas no listadas en "
+"      --ignore-file=FICHERO.po  manipula s�lo las entradas no listadas en "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 sinónimo de --only-fuzzy --clear-fuzzy\n"
+msgstr "      --fuzzy                 sin�nimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
+"      --obsolete              sin�nimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Sintaxis del fichero de entrada:\n"
+msgstr "Sint�xis del fichero de entrada:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      el fichero de entrada sigue la misma sintaxis "
-"que .properties de Java\n"
+"  -P, --properties-input      el fichero de entrada est� en la sint�xis de ."
+"properties de Java\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input     el fichero de entrada sigue la sintaxis de ."
+"    --stringtable-input     el fichero de entrada est� en la sint�xis de ."
 "strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1258,143 +1143,136 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 utiliza siempre colores y otros atributos de "
-"texto\n"
-"      --color=CUANDO          utiliza colores y otros atributos de texto si "
-"se cumple CUANDO.\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             no utiliza escapes de C en la salida (por "
-"omisión)\n"
+"omisi�n)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                utiliza escapes de C en la salida, sin "
-"caracteres extendidos\n"
+"car�cteres extendidos\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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"
+"      --force-po              escribe un fichero PO a�n si est� vac�o\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           no escribe las líneas '#: fichero:línea'\n"
+"      --no-location           no escribe las l�neas '#: fichero:l�nea'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          genera líneas '#: fichero:línea' (por "
-"omisión)\n"
+"  -n, --add-location       genera l�neas '#: fichero:l�nea' (por omisi�n)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, 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:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-output    escribe un fichero .strings de NeXTstep/"
+"     --stringtable-output     escribe un fichero .strings de NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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"
+msgstr "  -w, --width=N�MERO          pone la anchura de la p�gina de salida\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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               no divide a las líneas de los mensajes, "
+"      --no-wrap               no divide a las l�neas de los mensajes, "
 "aunque\n"
-"                              sean mayores a la anchura de la página de "
+"                              sean mayores a la anchura de la p�gina de "
 "salida\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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"
+"  -F, --sort-by-file          ordena la salida por ubicaci�n de fichero\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
+msgstr "se especific� un criterio de selecci�n imposible (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
+msgstr "Modo de empleo: %s [OPCI�N] [FICHEROENTRADA]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1403,128 +1281,129 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Concatena y mezcla los ficheros PO especificados.\n"
-"Encuentra los mensajes que son comunes a dos o más de los ficheros PO especificados.\n"
-"Si se utiliza la opción --more-than, se pueden solicitar mayor número\n"
-"de elementos en común antes de que los mensajes sean mostrados.  De\n"
-"forma similar, la opción --less-than puede ser utilizada para\n"
-"especificar el mínimo de mensajes en común que serán mostrados (i.e.\n"
-"--less-than=2 solo mostrará los mensajes únicos). Las traducciones, los\n"
-"comentarios, los comentarios extraídos y la posición en los ficheros serán acumulados, excepto si\n"
-"se especifica --use-first, en cuyo caso serán tomados del primer\n"
-"fichero PO para definirlos.\n"
+"Encuentra los mensajes que son comunes a dos o m�s de los ficheros PO\n"
+"especificados.\n"
+"Si se utiliza la opci�n --more-than, se pueden solicitar mayor n�mero\n"
+"de elementos en com�n antes de que los mensajes sean mostrados.  De\n"
+"forma similar, la opci�n --less-than puede ser utilizada para\n"
+"especificar el m�nimo de mensajes en com�n que ser�n mostrados (i.e.\n"
+"--less-than=2 s�lo mostr� los mensajes �nicos). Las traducciones, los\n"
+"comentarios y los comentarios extra�dos ser�n conservados, excepto si\n"
+"se especifica --use-first, en donde ser�n tomados desde el primer\n"
+"fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
+"los ficheros PO se conservar�n.  \n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  FICHEROENTRADA ...          ficheros de entrada\n"
+msgstr "  FICHERODEENTRADA ...        ficheros de entrada\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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"
+msgstr "Si el fichero de entrada es -, se lee la entrada est�ndar.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"  -<, --less-than=NÚMERO      imprime los mensajes con menos que este NÚMERO "
+"  -<, --less-than=N�MERO      imprime los mensajes con menos que este N�MERO "
 "de \n"
-"                              definiciones; si no se especifica, es "
+"                              definiciones, si no se especifica, es "
 "infinito\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  ->, --more-than=NÚMERO      imprime los mensajes con más de este NÚMERO "
+"  ->, --more-than=N�MERO      imprime los mensajes con m�s de este N�MERO "
 "de\n"
-"                              definiciones; si no se pone, utiliza 0\n"
+"                              definiciones, si no se pone, utiliza 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 "  -u, --unique                abreviatura de --less-than=2, solicita\n"
-"                              que solo se impriman los mensajes únicos\n"
+"                              que s�lo se impriman los mensajes �nicos\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      los ficheros de entrada siguen la misma "
-"sintaxis que .properties de Java\n"
+"  -P, --properties-input      los ficheros de entrada est�n en la sint�xis ."
+"properties de Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     los ficheros de entrada están en la sintaxis\n"
+"      --stringtable-input     los ficheros de entrada est�n en la sint�xis\n"
 "                              .strings de NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=NOMBRE        codificación de la salida\n"
+msgstr "  -t, --to-code=NOMBRE        codifica para la salida\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             utiliza la primera traducción disponible para\n"
+"      -use-first              utiliza la primera traducci�n disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "Peter Miller"
+msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "no se especificaron ficheros de entrada"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "se requieren exactamente 2 ficheros de entrada"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
+msgstr "Modo de empleo: %s [OPCI�N] def.po ref.pot\n"
 
 # Sugerencia: verificar -> comprobar
 # Sugerencia: revisar   -> comprobar
@@ -1533,8 +1412,8 @@
 # primer "verificar". sv
 # ok. aceptada.
 #
-# Max, yo decía al revés, el primero, verificar, el segundo comprobar. sv
-# Pero bueno, no voy a discutir por algo tan pequeño. sv
+# Max, yo dec�a al rev�s, el primero, verificar, el segundo comprobar. sv
+# Pero bueno, no voy a discutir por algo tan peque�o. sv
 # ok. mm
 #
 # sugerencia: concordancia -> coincidencia.   sv
@@ -1542,8 +1421,8 @@
 # coinciden. Creo que el programa quiere decir concordancia no
 # coincidencia. mm
 # A ver si te convenzo: concordancia se aplica a cosas distintas que deben
-# relacionarse de acuerdo con ciertas reglas, por ejemplo, el artículo y
-# el nombre deben concordar en género y número.
+# relacionarse de acuerdo con ciertas reglas, por ejemplo, el art�culo y
+# el nombre deben concordar en g�nero y n�mero.
 # Coincidencia se aplica a cosas de la misma especie que pueden ser iguales
 # o no ser iguales.
 # Todos los msgid son del mismo tipo. No los hay de tipo "nombre" o de tipo
@@ -1552,40 +1431,40 @@
 # iguales. sv
 #
 # (uf, menuda parrafada). sv
-# ¡Eres duro de pelar! tienes razón. mm
+# �Eres duro de pelar! tienes raz�n. mm
 #
-# Otra vez lo mismo 'informa de la versión y ... " em
-# Y otra cosa ... si llamas una vez ficheros .po , sigue haciéndolo así
-# siempre. y no una vez .po y otra PO . Ficheros PO me parece tan óptimo
-# como ficheros .po . También he corregido un fallo de tecleo en la
-# última línea ( .. el la precisión de diagnóstico ... ) . em
-# tienes razón. Buscaré uniformizar los ficheros a .po (es más discreto)
-# No. Ya revisé cuál fue la razón de traducir así: el original
-# Esto es, respeté la norma seguida del original en inglés. De todas
-# formas no me parece insensato modificar este extraño comportamiento
-# en el momento de traducir. ¿Qué opinas? mm
+# Otra vez lo mismo 'informa de la versi�n y ... " em
+# Y otra cosa ... si llamas una vez ficheros .po , sigue haci�ndolo as�
+# siempre. y no una vez .po y otra PO . Ficheros PO me parece tan �ptimo
+# como ficheros .po . Tambi�n he corregido un fallo de tecleo en la
+# �ltima l�nea ( .. el la precisi�n de diagn�stico ... ) . em
+# tienes raz�n. Buscar� uniformizar los ficheros a .po (es m�s discreto)
+# No. Ya revis� cu�l fue la raz�n de traducir as�: el original
+# Esto es, respet� la norma seguida del original en ingl�s. De todas
+# formas no me parece insensato modificar este extra�o comportamiento
+# en el momento de traducir. �Qu� opinas? mm
 #
-# La terminología en cuanto a los ficheros .po ha cambiado mucho. Al principio
-# eran ficheros .pot , así que imagínate. Ahora definitivamente son
-# ficheros .po , y así se nombran en los documentos. Acabo de ver la faq de
-# fr@es.li y así es como lo llaman tambien;
-# L'ensemble des fichiers « .po » déjà  ... em+
+# La terminolog�a en cuanto a los ficheros .po ha cambiado mucho. Al principio
+# eran ficheros .pot , as� que imag�nate. Ahora definitivamente son
+# ficheros .po , y as� se nombran en los documentos. Acabo de ver la faq de
+# fr@es.li y as� es como lo llaman tambien;
+# L'ensemble des fichiers ��.po�� d�j�  ... em+
 # ok. Modifico todos los PO por .po que es mas ligero y mejor. mm+
 #
 # Dos comentarios: Enrique debe andar algo despistado:
 # Un fichero .pot es una "plantilla" (de "template") de un fichero .po
-# Así que no es que cambie la nomenclatura, es que son dos cosas
-# distintas. De hecho, los ficheros .po vacíos con los que comenzamos
-# una traducción son casi idénticos a los ficheros .pot originales. sv
+# As� que no es que cambie la nomenclatura, es que son dos cosas
+# distintas. De hecho, los ficheros .po vac�os con los que comenzamos
+# una traducci�n son casi id�nticos a los ficheros .pot originales. sv
 #
-# Y otra cosa: Lo del .po .PO. Habrá que respetar el original inglés, ¿no?
+# Y otra cosa: Lo del .po .PO. Habr� que respetar el original ingl�s, �no?
 #
-# Otra cosa: Se puede decir "también son" o "son también"
+# Otra cosa: Se puede decir "tambi�n son" o "son tambi�n"
 # (lo tengo de una forma en recode y de otra en wdiff). Elige...
 # (a ver si me aclaro). O a lo mejor en unos casos es mejor de una forma
 # y en otros de otra (la frase no era exactamente igual).
-# 11061996mm: En particular en gettext el letrero es estándar, por lo que
-# prefiero "también son" que, creo suena mejor. Homogeinizo todo.
+# 11061996mm: En particular en gettext el letrero es est�ndar, por lo que
+# prefiero "tambi�n son" que, creo suena mejor. Homogeinizo todo.
 #: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
@@ -1599,11 +1478,11 @@
 "Compara dos ficheros .po de estilo Uniforum para comprobar que ambos\n"
 "contienen el mismo conjunto de cadenas de mensajes (msgid). El fichero\n"
 "def.po es un fichero existente de tipo .po con las traducciones\n"
-"antiguas. El fichero ref.po es el último fichero .po creado\n"
-"(generalmente por xgettext). Esto es útil para verificar que se han\n"
+"antiguas. El fichero ref.po es el �ltimo fichero .po creado\n"
+"(generalmente por xgettext). Esto es �til para verificar que se han\n"
 "traducido todos y cada uno de los mensajes del programa. Cuando no\n"
-"se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
-"tal forma que la precisión del diagnóstico sea mejor.\n"
+"se encuentre un resultado exacto, se utilizar� coincidencia difusa, de\n"
+"tal forma que la precisi�n del diagn�stico sea mejor.\n"
 
 #: src/msgcmp.c:232
 #, c-format
@@ -1613,14 +1492,14 @@
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     referencias a las fuentes\n"
+msgstr "  ref.po                      referencias a las fuentes\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "Modificadores de operación:\n"
+msgstr "Modificadores de operaci�n:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1629,88 +1508,88 @@
 "  -m, --multi-domain          aplica ref.pot a cada uno de los dominios en\n"
 "                              def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     no utiliza la coincidencia difusa\n"
 
 #: src/msgcmp.c:245
-#, c-format
+#, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
-"      --use-fuzzy             utiliza entradas difusas para la salida\n"
+"  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
 #: src/msgcmp.c:247
-#, c-format
+#, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
-"      --use-untranslated      utiliza las entradas no traducidas\n"
+"      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
 #: src/msgcmp.c:324
-#, c-format
+#, fuzzy, c-format
 msgid "this message is untranslated"
-msgstr "este mensaje no está traducido"
+msgstr "atenci�n: este mensaje no se utiliza"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "este mensaje debe ser revisado por el traductor"
+msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "este mensaje se usa pero no está definido..."
+msgstr "este mensaje se usa pero no est� definido..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...pero esta definición es parecida"
+msgstr "...pero esta definici�n es parecida"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "este mensaje se usa pero no está definido en %s"
+msgstr "este mensaje se usa pero no est� definido en %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "atención: este mensaje no se utiliza"
+msgstr "atenci�n: este mensaje no se utiliza"
 
-#  Jeje. Bueno , esto me recuerda a una canción de Burning, digo lo
-#  de fatal. Fatal en Castellano es muy malo, o peligrosísimo ... creo que
-#  habrá que dejarlo así, es más convincente. Perdona por estas 3 lineas em
+#  Jeje. Bueno , esto me recuerda a una canci�n de Burning, digo lo
+#  de fatal. Fatal en Castellano es muy malo, o peligros�simo ... creo que
+#  habr� que dejarlo as�, es m�s convincente. Perdona por estas 3 lineas em
 #
-# ¿Burning? Mi incultura es grave ¿quiénes son esos? mm
+# �Burning? Mi incultura es grave �qui�nes son esos? mm
 #
-# Son los que cantan lo de 'qué hace una chica como tú en un sitio como este'
-# en una parte de la canción repiten: 'mujer fatal ... ' :) em+
+# Son los que cantan lo de 'qu� hace una chica como t� en un sitio como este'
+# en una parte de la canci�n repiten: 'mujer fatal ... ' :) em+
 #
-# ¡Ah! Dirán que soy pocho pero oigo muy poca música en castellano, a lo
-# más que llego es a Sabina y a Mecano y la Orquesta Mondragón cuando
-# existía. Volviendo a la discusión, prefiero lo de fatal: tiene mucho
-# peso. Aunque ... ¿qué tal 'errores imperdonables'? mm+
+# �Ah! Dir�n que soy pocho pero oigo muy poca m�sica en castellano, a lo
+# m�s que llego es a Sabina y a Mecano y la Orquesta Mondrag�n cuando
+# exist�a. Volviendo a la discusi�n, prefiero lo de fatal: tiene mucho
+# peso. Aunque ... �qu� tal 'errores imperdonables'? mm+
 #
 # Tal y como yo lo veo, "Error fatal" es el que obliga al programa a detenerse.
-# En inglés se utiliza esta palabra con ese significado.
-# A menos que veamos un libro en español que utilice una palabra distinta
-# para referirse a lo mismo, sugiero dejarlo como está. sv
+# En ingl�s se utiliza esta palabra con ese significado.
+# A menos que veamos un libro en espa�ol que utilice una palabra distinta
+# para referirse a lo mismo, sugiero dejarlo como est�. sv
 #
 # 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:553 src/msgfmt.c:652 src/msgfmt.c:1446
+# aventura. Quiz� no sea tan malo como dice Enrique, a menos que...
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
-msgstr[0] "se encontró %d error fatal"
+msgstr[0] "se encontr� el error fatal %d"
 msgstr[1] "se encontraron %d errores fatales"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "se deben especificar por lo menos dos ficheros"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1718,102 +1597,100 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Busca los mensajes que son comunes a dos o más de los ficheros PO\n"
-"especificados.  Si se utiliza la opción --more-than, se pueden\n"
-"solicitar mayor número de elementos en común antes de que los mensajes\n"
-"sean mostrados.  De forma similar, la opción --less-than puede\n"
-"utilizarse para especificar el mínimo de mensajes en común que serán\n"
-"mostrados (i.e.  --less-than=2 solo mostrará los mensajes únicos). Las\n"
-"traducciones, los comentarios y los comentarios extraídos serán\n"
-"conservados, pero solo los del primer fichero PO que los\n"
+"Busca los mensajes que son comunes a dos o m�s de los ficheros PO\n"
+"especificados.  Si se utiliza la opci�n --more-than, se pueden\n"
+"solicitar mayor n�mero de elementos en com�n antes de que los mensajes\n"
+"sean mostrados.  De forma similar, la opci�n --less-than puede ser\n"
+"utilizada para especificar el m�nimo de mensajes en com�n que ser�n\n"
+"mostrados (i.e.  --less-than=2 s�lo mostr� los mensajes �nicos). Las\n"
+"traducciones, los comentarios y los comentarios extra�dos ser�n\n"
+"conservados, pero s�lo los que provengan del primer fichero PO que los\n"
 "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
-"acumularán.\n"
+"conservar�n.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=NÚMERO      muestra los mensajes cuyo número de "
-"definiciones\n"
-"                              sea mayor que NÚMERO; si no se pone,\n"
-"                              el valor por omisión es 1\n"
+"  ->, --more-than=N�MERO      muestra los mensajes con m�s de este\n"
+"                              n�mero de definiciones, si no se pone,\n"
+"                              el valor por omisi�n es 0\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           no escribe la línea de encabezado con la "
-"entrada 'msgid \"\"'\n"
+"     --omit-header          no escribe la l�nea de encabezado `msgid \"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
-"Convierte un catálogo de traducción a una codificación de caracteres "
+"Convierte un cat�logo de traducci�n a una codificaci�n de car�cteres "
 "distinta.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
-msgstr "Objetivo de conversión:\n"
+msgstr "Blanco de conversi�n:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
-"La codificación por omisión es la que está en uso por la funcion locale.\n"
+"La codificaci�n por omisi�n es la que est� en uso por la funcion locale.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                estilo de salida con sangrías\n"
+msgstr "  -i, --indent                estilo de salida con sangr�as\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           no escribe las líneas '#: fichero:línea'\n"
+"      --no-location           no escribe las l�neas '#: fichero:l�nea'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          genera líneas '#: fichero:línea' (por "
-"omisión)\n"
+"      --add-location          genera l�neas '#: fichero:l�nea' (por "
+"omisi�n)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 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:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
-msgstr "no se especificó el fichero de entrada"
+msgstr "no se especific� el fichero de entrada"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
-msgstr "se requiere exactamente un fichero de entrada"
+msgstr "se requieren exactamente un ficheros de entrada"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
+msgstr "Modo de empleo: %s [OPCI�N] FICHEROENTRADA\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1821,12 +1698,12 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Genera un catálogo de traducción inglesa. El fichero de entrada es el\n"
-"último fichero PO creado en inglés, o un fichero plantilla PO\n"
+"Genera un cat�logo de traducci�n inglesa. El fichero de entrada es el\n"
+"�ltimo fichero PO creado en ingl�s, o un fichero plantilla PO\n"
 "(generalmente creado por xgettext). Las entradas no traducidas son\n"
-"asignadas a una traducción que es idéntica a la del msgid.\n"
+"asignadas a una traducci�n que es id�ntica a la del msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHEROENTRADA              fichero de entrada PO o POT\n"
@@ -1834,12 +1711,12 @@
 #: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr "Se omitió el nombre de la instrucción"
+msgstr "Se omiti� el nombre de la instrucci�n"
 
 #: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Modo de empleo: %s [OPCIÓN] INSTRUCCIÓN [OPCIONES-DE-LA-INSTRUCCIÓN]\n"
+msgstr "Modo de empleo: %s [OPCI�N] INSTRUCCI�N [OPCIONES-DE-LA-INSTRUCCI�N]\n"
 
 #: src/msgexec.c:262
 #, c-format, no-wrap
@@ -1850,11 +1727,11 @@
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"Aplica una instrucción a todas las traducciones de un catálogo de traducción.\n"
-"La INSTRUCCIÓN puede ser cualquier programa que lea una traducción de la\n"
-"entrada estándar. Se invoca una vez por cada traducción. Su salida se \n"
-"convierte en la salida del programa msgexec. El código de retorno del \n"
-"msgexec es el máximo de los códigos de retornos obtenidos a lo largo de \n"
+"Aplica una instrucci�n a todas las traducciones de un cat�logo de traducci�n.\n"
+"La INSTRUCCI�N puede ser cualquier programa que lea una traducci�n de la\n"
+"entrada est�ndar. Se invoca una vez por cada traducci�n. Su salida se \n"
+"convierte en la salida del programa msgexec. El c�digo de retorno del \n"
+"msgexec es el m�ximo de los c�digos de retornos obtenidos a lo largo de \n"
 "todas las invocaciones.\n"
 
 #: src/msgexec.c:271
@@ -1863,10 +1740,11 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Una instrucción especial llamada '0' genera la traducción, seguido de un byte nulo.\n"
-"La salida de \"msgexec 0\" se puede utilizar como entrada para \"xargs -0\".\n"
+"Una instrucci�n especial interconstruida llamada '0' genera la salida de la \n"
+"traducci�n, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n"
+"utilizar como entrada para \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero PO de entrada\n"
@@ -1874,209 +1752,193 @@
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "fallo en la escritura a la salida estándar"
+msgstr "fallo en la escritura a la salida est�ndar"
+
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "fallo en la escritura la subproceso %s"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "falta el nombre del filtro"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "se debe especificar al menos un guión de sed"
+msgstr "se debe especificar al menos un gui�n de sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
+msgstr "Modo de empleo: %s [OPCI�N] FILTRO [OPCIONES-DEL-FILTRO]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
-"Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
+"Aplica un filtro a todas las traducciones de un cat�logo de traducci�n.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n"
-"estándar y escriba una traducción modificada a la salida estándar.\n"
+"El FILTRO puede ser cualquier programa que lea una traducci�n de la entrada\n"
+"est�ndar y escriba una traducci�n modificada a la salida est�ndar.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Algunas OPCIONES-DEL-FILTRO cuando el FILTRO es 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
-"  -e, --expression=GUIÓN      añade un GUIÓN a las instrucciones que serán\n"
-"                              ejecutadas\n"
+"  -e, --expression=GUI�N       a�ade un GUI�N a las instrucciones que ser�n\n"
+"                               ejecutadas\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=FICHEROGUIÓN     añade el contenido del FICHEROGUIÓN a las\n"
-"                              instrucciones que serán ejecutadas\n"
+"  -f, --file=FICHEROGUI�N     a�ade el contenido del FICHEROGUI�N a las\n"
+"                              instrucciones que ser�n ejecutadas\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       elimina la impresión automática del espacio\n"
-"                              de patrones\n"
+"  -n, --quiet, --silent        elimina la impresi�n autom�tica del espacio\n"
+"                               de patrones\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             no utiliza las secuencias de escape tipo C\n"
-"                              en la salida (por omisión)\n"
+"                              en la salida (por omisi�n)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
-"      --indent                escribe el fichero .po utilizando sangrías\n"
+"      --indent                escribe el fichero .po utilizando sangr�as\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           conserva la línea de encabezado sin "
-"modificación,\n"
+"      --keep-header           conserva la l�nea de encabezado sin "
+"modificaci�n,\n"
 "                              es decir, no la filtra\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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"
+msgstr "el argumento a %s debe ser un solo car�cter de puntuaci�n"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "«Endianness» no válida: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
-
-#: src/msgfmt.c:439
-#, 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"
+msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requiere que se especifique un \"-d directorio\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s requiere que se especifique un \"-l locale\""
+msgstr "%s requiere que se especifique un \"-l local\""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s requiere que se especifique un \"--template plantilla\""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s requiere que se especifique un \"-o fichero\""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s y %s son mutuamente excluyentes en %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s solo es válido con %s o %s"
+msgstr "%s s�lo es v�lido con %s o %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s solo es válido con %s, %s o %s"
+msgstr "%s s�lo es v�lido con %s, %s o %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaje traducido"
 msgstr[1] "%d mensajes traducidos"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d traducción difusa"
+msgstr[0] ", %d traducci�n difusa"
 msgstr[1] ", %d traducciones difusas"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
+msgstr "Modo de empleo: %s [OPCI�N] fichero.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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"
+"Genera un cat�logo binario de mensajes a partir de la descripci�n de la "
+"traducci�n textual.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"Los argumentos obligatorios en las opciones largas también lo son para las \n"
+"Los argumentos obligatorios en las opciones largas tambi�n lo son para las \n"
 "opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  fichero.po ...              ficheros de entrada\n"
+msgstr "  fichero.po ...             ficheros de entrada\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
-msgstr "Modo de operación:\n"
+msgstr "Modo de operaci�n:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2085,7 +1947,7 @@
 "  -j, --java                  Modo Java: la entrada es una clase de Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2094,13 +1956,13 @@
 "      --java2                 como --java, y supone el uso de Java2\n"
 "                              (JDK 1.2 o superior)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2109,48 +1971,40 @@
 "      --csharp-resources      modo de recursos C#: genera un fichero ."
 "resources de .NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               Modo entrada de escritorio: genera un fichero ."
-"desktop\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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"
+msgstr "Si el fichero de salida es -,  se escribe en la salida est�ndar.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "Localización del fichero de salida en modo Java:\n"
+msgstr "Localizaci�n del fichero de salida en modo Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nombre del recurso\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2158,23 +2012,14 @@
 msgstr ""
 "  -l, --locale=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                produce un fichero .java en lugar de un "
-"fichero .class\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
-"  -d DIRECTORIO               directorio base de la jerarquía de clases\n"
+"  -d DIRECTORIO               directorio base de la jerarqu�a de clases\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2182,16 +2027,16 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"El nombre de la clase se determina añadiendo el nombre local al nombre del\n"
-"recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
+"El nombre de la clase se determina a�adiendo el nombre local al nombre del\n"
+"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:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "Localización del fichero de salida en modo C#:\n"
+msgstr "Localizaci�n del fichero de salida en modo C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2200,81 +2045,43 @@
 "  -d DIRECTORIO               directorio base de los ficheros .dll de "
 "dependencias locales\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"Las opciones -l y -d son obligatorias. El fichero .dll será escrito en\n"
-"un subdirectorio del directorio especificado cuyo nombre dependerá de la "
-"localización.\n"
+"Las opciones -l y -d son obligatorias. El fichero .dll ser� escrito en\n"
+"un subdirectorio del directorio especificado cuyo nombre depender� de la "
+"localizaci�n.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Localización del fichero de salida en modo Tcl:\n"
+msgstr "Localizaci�n del fichero de salida en modo Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
-"  -d DIRECTORIO               directorio base de los catálogos de\n"
+"  -d DIRECTORIO               directorio base de los cat�logos de\n"
 "                              mensajes .msg\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
+"Las opciones -l y -d son obligatorias. El fichero .msg ser� escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Opciones del modo de entrada de escritorio:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORIO               directorio base de los ficheros .po\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=PALABRA   busca PALABRA a modo de palabra clave "
-"adicional\n"
-"  -k, --keyword               no usa las palabras clave por omisión\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Las opciones -l, -o y --template son obligatorias. Si se especifica -D, los "
-"ficheros de\n"
-"entrada se leen del directorio en lugar de los argumentos de la línea de "
-"órdenes.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Interpretación del fichero de entrada:\n"
+msgstr "Interpretaci�n del fichero de entrada:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2285,7 +2092,7 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
@@ -2293,16 +2100,16 @@
 "del\n"
 "                              idioma\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 "      --check-header          verifica la presencia y contenido de la\n"
-"                              línea de encabezado\n"
+"                              l�nea de encabezado\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2310,9 +2117,9 @@
 msgstr ""
 "      --check-domain          revisa si hay conflictos entre las "
 "instrucciones\n"
-"                              del dominio y la opción --output-file\n"
+"                              del dominio y la opci�n --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2322,164 +2129,140 @@
 "el\n"
 "                              msgfmt de X/Open\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CAR]   revisa la presencia de aceleradores de\n"
-"                                   teclado para los elementos del menú\n"
+"       --check-accelerators[=CAR]  revisa la presencia de aceleradores de\n"
+"                                   teclado para los elementos del men�\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"   -a, --alignment=NÚMERO      alinea las cadenas al NÚMERO de bytes\n"
-"                               (por omisión es: %d)\n"
+"   -a, --alignment=N�MERO      alinea las cadenas al N�MERO de bytes\n"
+"                               (por omisi�n es: %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=ORDENBYTES escribe números de 32 bits en el orden de "
-"bytes especificado\n"
-"                                (que el «endianness» predefinido sea «big» o "
-"«little» depende de la plataforma)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
-"      --no-hash               el fichero binario no incluirá la tabla de "
+"      --no-hash               el fichero binario no incluir� la tabla de "
 "hash\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
-"      --statistics            muestra las estadísticas sobre las "
+"      --statistics            muestra las estad�sticas sobre las "
 "traducciones\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               aumenta la cantidad de mensajes\n"
+msgstr "  -v, --verbose               aumenta el cantidad de mensajes\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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"
+msgstr "atenci�n: el encabezado del fichero PO no existe o es inv�lido\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
+msgstr "atenci�n: la conversi�n del conjunto de caracteres no funcionar�\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr "atención: el encabezado del fichero PO está difuso\n"
+msgstr "atenci�n: el encabezado del fichero PO est� difuso\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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"
+"atenci�n: las versiones anteriores de msgfmt producir�n un error en esto\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, 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"
+msgstr "el nombre de dominio \"%s\" no es v�lido como nombre de fichero"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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"
+"el nombre del dominio \"%s\" no es v�lido como nombre de fichero:\n"
+"se utilizar� un prefijo"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "la instrucción 'domain %s' no tiene efecto"
+msgid "`domain %s' directive ignored"
+msgstr "la instrucci�n `domain %s' no tiene efecto"
 
-# Nunca me gustó ignorar para "to ignore".
+# Nunca me gust� ignorar para "to ignore".
 # 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:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "se descarta la línea vacía 'msgstr'"
+msgid "empty `msgstr' entry ignored"
+msgstr "se descarta la l�nea vac�a `msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "se descarta la línea difusa 'msgstr'"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "se descarta la l�nea difusa `msgstr'"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, 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:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s no existe"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s existe pero no se puede leer"
+msgstr "%s: atenci�n: el fichero fuente contiene una traducci�n difusa"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/msggrep.c:501
-#, c-format
+#: src/msggrep.c:496
+#, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"la opción '%c' no se puede usar antes de que 'J', 'K', 'T', 'C' o 'X' hayan "
-"sido especificadas"
+"la opci�n '%c' no se puede usar antes de que 'K', 'T' o 'C' hayan sido "
+"especificadas"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
-"Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
-"patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
+"Extrae todos los mensajes de un cat�logo de traducci�n que coincidan con un\n"
+"patr�n dado o pertenezcan a algunos de los ficheros fuente dados.\n"
 
-#: src/msggrep.c:547
-#, c-format, no-wrap
+#: src/msggrep.c:542
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -2517,53 +2300,43 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 msgstr ""
-"Selección de mensaje:\n"
-"  [-N FICHEROFUENTE]... [-M NOMBREDEDOMINIO]...\n"
-"  [-J PATRÓN-MSGCTCT] [-K PATRÓN-MSGID] [-T PATRÓN-MSGSTR]\n"
-"  [-C PATRÓN-COMENTARIO] [-X PATRÓN-COMENTARIO-EXTRAÍDO]\n"
-"Un mensaje es seleccionado si proviene de uno de los ficheros fuente especificados,\n"
+"Selecci�n de mensaje:\n"
+"   [-N FICHEROFUENTE]... [-M NOMBREDEDOMINIO]...\n"
+"   [-K PATR�N-MSGID] [-T PATR�N-MSGSTR] [-C PATR�N-COMENTARIO]\n"
+"Un mensaje es seleccionado si proviene de uno de los ficheros fuente especificados \n"
 "o si proviene de uno de los dominios especificados,\n"
-"o si la opción -J es seleccionada y su contexto (msgctxt) coincide con\n"
-"                PATRÓN-MSGCTXT,\n"
-"o si la opción -K es seleccionada y su clave (msgid o msgid_plural) coincide\n"
-"                con el PATRÓN-MSGID,\n"
-"o si la opción -T es seleccionada y su traducción (msgstr) coincide con el \n"
-"                PATRÓN-MSGSTR,\n"
-"o si la opción -C es seleccionada y el comentario del traductor coincide con \n"
-"                el PATRÓN-COMENTARIO,\n"
-"o si la opción -X es seleccionada y el comentario extraído coincide con \n"
-"                el PATRÓN-COMENTARIO-EXTRAÍDO.\n"
+"o si la opci�n -K es seleccionada y su llave (msgid o msgid_plural) coincide\n"
+"                con el PATR�N-MSGID, \n"
+"o si la opci�n -T es seleccionada y su traducci�n (msgstr) coincide con el \n"
+"                PATR�N-MSGSTR, \n"
+"o si la opci�n -C es seleccionada y el comentario del traductor coincide con \n"
+"                el PATR�N-COMENTARIO.\n"
 "\n"
-"Cuando se ha especificado más de un criterio de selección, el conjunto de\n"
-"mensajes seleccionados es la unión de los mensajes seleccionados de cada \n"
+"Cuando m�s de un criterio de selecci�n ha sido especificado, el conjunto de\n"
+"mensajes seleccionados es la uni�n de los mensajes seleccionados de cada \n"
 "criterio.\n"
 "\n"
-"Sintaxis de PATRÓN-MSGCTXT, PATRÓN-MSGID, PATRÓN-MSGSTR, PATRÓN-COMENTARIO o\n"
-"PATRÓN-COMENTARIO-EXTRAÍDO:\n"
-"   [-E | -F] [-e PATRÓN | -f FICHERO]...\n"
-"Los PATRONes son, por omisión, expresiones regulares básicas, o expresiones\n"
-"regulares extendidas si se especifica la opción -E, o cadenas fijas si se\n"
-"especifica la opción -F.\n"
+"Sint�xis de PATR�N-MSGID o PATR�N-MSGSTR o PATR�N-COMENTARIO:\n"
+"   [-E | -F] [-e PATR�N | -f FICHERO]...\n"
+"Los PATRONes son, por omisi�n, expresiones regulares b�sicas, o expresiones\n"
+"regulares extendidas si se especifica la opci�n -E, o cadenas fijas si se\n"
+"especifica la opci�n -F.\n"
 "\n"
-"  -N, --location=FICHEROFUENTE selecciona los mensajes extraídos de FICHEROFUENTE\n"
-"  -M, --domain=NOMBREDEDOMINIO selecciona los mensajes que pertenecen al dominio\n"
-"                               NOMBREDEDOMINIO\n"
-"  -J, --msgctxt                comienzo de los patrones para el msgctxt\n"
-"  -K, --msgid                  comienzo de los patrones para el msgid\n"
-"  -T, --msgstr                 comienzo de los patrones para el msgstr\n"
-"  -C, --comment                comienzo de los patrones para el comentario del\n"
-"                               traductor\n"
-"  -X, --extracted-comment      comienzo de los patrones para el comentario extraído\n"
-"  -E, --extended-regexp        el PATRÓN es una expresión regular extendida\n"
-"  -F, --fixed-strings          el PATRÓN es un conjunto de cadenas separadas\n"
-"                               por saltos de línea\n"
-"  -e, --regexp=PATRÓN          utiliza el PATRÓN como una expresión regular\n"
-"  -f, --file=FICHERO           obtiene al PATRÓN del FICHERO\n"
-"  -i, --ignore-case            indistingue si es mayúsculas o minúsculas\n"
-"  -v, --invert-match           muestra solo quellos mensajes que no coinciden con\n"
-"                               ningún criterio de selección\n"
+"-N, --location=FICHEROFUENTE selecciona los mensajes extraidos de FICHEROFUENTE\n"
+"-M, --domain=NOMBREDEDOMINIO selecciona los mensajes que pertenecen al dominio\n"
+"                             NOMBREDEDOMINIO\n"
+"-K, --msgid                  comienzo de los patrones para el msgid\n"
+"-T, --msgstr                 comienzo de los patrones para el msgstr\n"
+"-C, --comment                comienzo de los patrones para el comentario del\n"
+"                             traductor\n"
+"-E, --extended-regexp        el PATR�N es una expresi�n regular extendida\n"
+"-F, --fixed-strings          el PATR�N es un conjunto de cadenas separadas\n"
+"                             por saltos de l�nea\n"
+"-e, --regexp=PATR�N          utiliza el PATR�N como una expresi�n regular\n"
+"-f, --file=FICHERO           obtiene al PATR�N del FICHERO\n"
+"-i, --ignore-case            indistingue si es may�sculas o min�sculas\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2572,59 +2345,58 @@
 "caracteres\n"
 "                              extendidos\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera una salida ordenada\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
-"      --sort-by-file          ordena la salida por localización de ficheros\n"
+"      --sort-by-file          ordena la salida por localizaci�n de ficheros\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"Se encuentra en un entorno indiferente al idioma. Por favor ponga su "
-"variable\n"
+"Est�s en un entorno indiferente al idioma. Por favor pon tu variable\n"
 "de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
 "es necesario para que se puedan probar las traducciones.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 msgstr ""
-"El fichero de salida %s ya existe.\n"
-"Especifique el formato local a través de la opción --locale o\n"
-"el fichero de salida .po a través de la opción --output-file.\n"
+"El fichero de salida %s existe.\n"
+"Favor de especificar el formato local a trav�s de la opci�n --locale o\n"
+"el fichero de salida .po a trav�s de la opci�n --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creado %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
-"Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
+"Crea un nuevo fichero PO, inicializando la metainformaci�n con valores\n"
 "tomados del entorno del usuario.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero de entrada POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2632,68 +2404,69 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 "Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
-"actual. Si es -, se lee la entrada estándar.\n"
+"actual. Si es -, se lee la entrada est�ndar.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"Si no se especifica el fichero de salida, dependerá de la opción --locale o\n"
-"de la selección local del usuario. Si es -, los resultados se escriben en\n"
-"la salida estándar.\n"
+"Si no se especifica el fichero de salida, depender� de la opci�n --locale o\n"
+"de la selecci�n local del usuario. Si es -, los resultados se escriben en\n"
+"la salida est�ndar.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          configura el locale de destino\n"
+msgstr ""
+"   -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         supone que el fichero PO será generado\n"
-"                              automáticamente\n"
+"      --no-translator         supone que el fichero PO ser� generado\n"
+"                              autom�ticamente\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Se ha encontrado más de un fichero .pot\n"
-"Favor de especificar el fichero .pot de entrada utilizando la opción --"
+"Se ha encontrado m�s de un fichero .pot\n"
+"Favor de especificar el fichero .pot de entrada utilizando la opci�n --"
 "input\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error en la lectura del directorio actual"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "No se encuentra el fichero .pot en el directorio actual.\n"
-"Favor de especificar el fichero .pot de entrada utilizando la opción --"
+"Favor de especificar el fichero .pot de entrada utilizando la opci�n --"
 "input\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "fallo en el subproceso %s con código de salida %d"
+msgstr "fallo en el subproceso %s con c�digo de salida %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2701,25 +2474,25 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"El nuevo catálogo de mensajes debería contener su dirección de correo \n"
-"electrónico, de tal forma que los usuarios puedan retroalimentarlo sobre\n"
+"El nuevo cat�logo de mensajes deber�a contener su direcci�n de correo \n"
+"electr�nico, de tal forma que los usuarios puedan retroalimentarlo sobre\n"
 "las traducciones, y el personal de mantenimiento pueda contactarlo \n"
-"en caso de tener problemas técnicos inesperados.\n"
+"en caso de tener problemas t�cnicos inesperados.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "Traducciones al español para el paquete %s"
+msgstr "Traducciones al espa�ol para el paquete %s"
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 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"
+"el conjunto de caracteres actual \"%s\" no es un nombre de codificaci�n "
+"port�til"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
@@ -2731,33 +2504,33 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
-"el fichero de entrada '%s' no contiene una línea de encabezado con la "
-"especificación del conjunto de caracteres"
+"el fichero de entrada `%s' no contiene una l�nea de encabezado con la "
+"especificaci�n del conjunto de caracteres"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 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"
+"el dominio \"%s\" en el fichero de entrada `%s' no contiene una l�nea de\n"
+"encabezado con la especificaci�n del conjunto de caracteres"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
-"el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
-"portátil."
+"el conjunto de caracteres destino \"%s\" no es un nombre de codificaci�n "
+"port�til."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
-msgstr "atención: "
+msgstr "atenci�n: "
 
 #: src/msgl-cat.c:443
 #, c-format
@@ -2788,11 +2561,6 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"La conversión del fichero %s de la codificación %s a la codificación %s\n"
-"altera algunos msgids o msgctxts.\n"
-"Bien cambie todos los msgids y msgctxts a ASCII puro, bien asegúrese de que\n"
-"estén codificados en UTF-8 desde el principio, es decir, en sus ficheros de "
-"código fuente.\n"
 
 #: src/msgl-charset.c:93
 #, c-format
@@ -2804,13 +2572,13 @@
 msgstr ""
 "El conjunto de caracteres local \"%s\" es diferente del\n"
 "conjunto de caracteres del fichero de entrada \"%s\".\n"
-"La salida de '%s' podría ser incorrecta.\n"
+"La salida de '%s' podr�a ser incorrecta.\n"
 "Las posibles alternativas son:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Poner LC_ALL como local con la codificación %s.\n"
+msgstr "- Poner LC_ALL como local con la codificaci�n %s.\n"
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2819,7 +2587,7 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Convertir el catálogo de traducciones a %s utilizando 'msgconv',\n"
+"- Convertir el cat�logo de traducciones a %s utilizando 'msgconv',\n"
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
@@ -2831,8 +2599,8 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Poner LC_ALL al formato local con la codificación %s,\n"
-"  convertir el catálogo de traducción a %s utilizando 'msgconv',\n"
+"- Poner LC_ALL al formato local con la codificaci�n %s,\n"
+"  convertir el cat�logo de traducci�n a %s utilizando 'msgconv',\n"
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
@@ -2843,14 +2611,14 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"El conjunto de caracteres local \"%s\" no es un nombre de codificación "
-"portátil.\n"
-"La salida de '%s' podría ser incorrecta.\n"
+"El conjunto de caracteres local \"%s\" no es un nombre de codificaci�n "
+"port�til.\n"
+"La salida de '%s' podr�a ser incorrecta.\n"
 "Una alternativa posible s poner LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
-msgstr "la expresión plural puede producir resultados negativos"
+msgstr "la expresi�n plural puede producir resultados negativos"
 
 #: src/msgl-check.c:141
 #, c-format
@@ -2861,202 +2629,216 @@
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
-msgstr "la expresión plural puede producir una división por cero"
+msgstr "la expresi�n plural puede producir una divisi�n por cero"
 
 #: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
-msgstr "la expresión plural puede producir desbordamiento de número entero"
+msgstr "la expresi�n plural puede producir un sobreflujo entero"
 
 #: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
-"la expresión plural puede producir excepciones aritméticas, posiblemente una "
-"división por cero"
+"la expresi�n plural puede producir excepciones aritm�ticas, posiblemente una "
+"divisi�n por cero"
 
 #: src/msgl-check.c:266
-#, c-format
+#, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "Pruebe utilizando lo siguiente, válido para %s:"
+msgstr "Pruebe utilizando lo siguiente, v�lido para %s:\n"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
+#, fuzzy
 msgid "message catalog has plural form translations"
-msgstr "el catálogo de mensajes tiene formas plurales en las traducciones"
+msgstr "el cat�logo de mensajes tiene formas plurales en las traducciones..."
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
+#, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
+msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESI�N\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
+#, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
+msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
-msgstr "valor inválido de nplurals"
+msgstr "valor inv�lido de nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
-msgstr "expresión plural inválida"
+msgstr "expresi�n plural inv�lida"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr "nplurals = %lu"
+msgstr "nplurals = %lu ..."
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, fuzzy, 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"
+msgstr[0] "... pero algunos mensajes s�lo tienen solo una forma plural"
+msgstr[1] "... pero algunos mensajes s�lo tienen %lu formas plurales"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, 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"
+msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
+msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero no "
-"tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESIÓN;\""
+"el cat�logo de mensajes tiene traducciones con formas plurales, pero no "
+"tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESI�N;\""
 
-# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# �qu� les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
 # Bien. Mejora. mm
 #
 #
-# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
-# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# Bien, antes dec�a "las l�neas `msgid' y `msgstr' no comienzan con `\\n'"
+# No s� qu� es mejor pero no me acaba de gustar: La idea es que *no ambas*
 # comienzan por \\n, no que tengan que hacerlo las dos.
 # Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
-# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
-# "ambas", o algo así.
-# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
-# Que te parece a alguna de las líneas ... mm
+# otra. Yo podnr�a aqu� algo m�s parecido a lo de antes, pero a�adiendo
+# "ambas", o algo as�.
+# por ejemplo: "las l�neas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las l�neas ... mm
 #
 # 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:611
-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'"
+# "Una de las l�neas msgid y msgstr comienza con `\\n' y la otra no" sv+
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr ""
+"a alguna de las l�neas `msgid' y `msgid_plural' les falta el `\\n' inicial"
 
-# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# �qu� les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
 # Bien. Mejora. mm
 #
 #
-# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
-# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# Bien, antes dec�a "las l�neas `msgid' y `msgstr' no comienzan con `\\n'"
+# No s� qu� es mejor pero no me acaba de gustar: La idea es que *no ambas*
 # comienzan por \\n, no que tengan que hacerlo las dos.
 # Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
-# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
-# "ambas", o algo así.
-# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
-# Que te parece a alguna de las líneas ... mm
+# otra. Yo podnr�a aqu� algo m�s parecido a lo de antes, pero a�adiendo
+# "ambas", o algo as�.
+# por ejemplo: "las l�neas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las l�neas ... mm
 #
 # 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:619
+# "Una de las l�neas msgid y msgstr comienza con `\\n' y la otra no" sv+
+#: src/msgl-check.c:610
 #, 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'"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr ""
+"a alguna de las l�neas `msgid' y `msgstr[%u]' les falta el `\\n' inicial"
 
-# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# �qu� les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
 # Bien. Mejora. mm
 #
 #
-# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
-# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# Bien, antes dec�a "las l�neas `msgid' y `msgstr' no comienzan con `\\n'"
+# No s� qu� es mejor pero no me acaba de gustar: La idea es que *no ambas*
 # comienzan por \\n, no que tengan que hacerlo las dos.
 # Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
-# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
-# "ambas", o algo así.
-# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
-# Que te parece a alguna de las líneas ... mm
+# otra. Yo podnr�a aqu� algo m�s parecido a lo de antes, pero a�adiendo
+# "ambas", o algo as�.
+# por ejemplo: "las l�neas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las l�neas ... mm
 #
 # 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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "las líneas 'msgid' y 'msgstr' no comienzan ambas con '\\n'"
+# "Una de las l�neas msgid y msgstr comienza con `\\n' y la otra no" sv+
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "a alguna de las l�neas `msgid' y `msgstr' les falta el `\\n' inicial"
 
 # 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:652
-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'"
+# y la otra no, as� de sencillo. sv+
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+"a alguna de las l�neas `msgid' y `msgid_plural' les falta el `\\n' final"
 
 # 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:660
+# y la otra no, as� de sencillo. sv+
+#: src/msgl-check.c:651
 #, 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'"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "a alguna de las l�neas `msgid' y `msgstr[%u]' les falta el `\\n' final"
 
 # 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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "las líneas 'msgid' y 'msgstr' no terminan ambas con '\\n'"
+# y la otra no, as� de sencillo. sv+
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "a alguna de las l�neas `msgid' y `msgstr' les falta el `\\n' final"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr "el manejo del plural es una extensión del gettext de GNU"
+msgstr "el manejo del plural es una extensi�n del gettext de GNU"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, 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:740
+#: src/msgl-check.c:730
 #, 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:814
-#, 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"
+msgstr "msgstr tiene demasiadas marcas de aceleraci�n de teclado '%c'"
 
-#: src/msgl-check.c:831
-#, 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:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "no existe el campo `%s' en la cabecera\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "el campo de encabezado `%s' debe comenzar al principio de la l�nea\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "algunos campos de cabecera a�n tienen el valor inicial por omisi�n\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "algunos campos de cabecera a�n tienen el valor inicial por omisi�n\n"
 
 #: 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\""
+msgstr ""
 
 #: src/msgl-iconv.c:69
-#, c-format
+#, fuzzy, 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\""
+msgstr "error al abrir el fichero \"%s\" para lectura"
 
 #: 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 "
+"El fichero de entrada no contiene una l�nea de encabezado que especifique el "
 "conjunto de caracteres"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv() "
-"no soporta este tipo de conversión."
+"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
+"no soporta este tipo de conversi�n."
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -3064,29 +2846,29 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
+"La conversi�n de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
 "distintos se vuelven iguales."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(). Esta "
-"versión fue construida sin iconv()."
+"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n"
+"Esta versi�n fue construida sin iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s solo es válido con %s"
+msgstr "%s s�lo es v�lido con %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipo de respaldo"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -3101,66 +2883,66 @@
 msgstr ""
 "Mezcla dos ficheros .po de estilo Uniforum en uno solo. El fichero def.po\n"
 "es un fichero existente de tipo .po con las traducciones anteriores que se\n"
-"conservarán siempre y cuando coincidan; los comentarios se conservarán,\n"
-"pero los comentarios extraídos y las posiciones del fichero no lo serán.\n"
-"El fichero ref.pot es el último fichero .po creado (generalmente con xgettext),\n"
-"cualquier traducción o comentario se eliminará; sin embargo, los comentarios\n"
-"puntuales y las posiciones dentro del fichero se conservarán. En donde no\n"
-"haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
+"conservar�n siempre y cuando coincidan; los comentarios se conservar�n,\n"
+"pero los comentarios extra�dos y las posiciones del fichero no lo ser�n.\n"
+"El fichero ref.pot es el �ltimo fichero .po creado (generalmente con xgettext),\n"
+"cualquier traducci�n o comentario se eliminar�, sin embargo los comentarios\n"
+"puntuales y las posiciones dentro del fichero se conservar�n. En donde no\n"
+"haya una coincidencia exacta, se utilizar� el m�todo de comparaci�n difusa\n"
 "para obtener mejores resultados.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traducciones que se refieren a las viejas "
 "fuentes\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referencias a las nuevas fuentes\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FICHERO    biblioteca adicional de traducción de "
+"  -C, --compendium=FICHERO    biblioteca adicional de traducci�n de "
 "mensajes,\n"
-"                              puede ser especificada más de una vez\n"
+"                              puede ser especificada m�s de una vez\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "   -U, --update                actualiza def.po,\n"
-"                               no hace nada si def.po ya está actualizado\n"
+"                               no hace nada si def.po ya est� actualizado\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Localización del fichero de salida en modo de actualización:\n"
+msgstr "Localizaci�n del fichero de salida en modo de actualizaci�n:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "El resultado se escribió sobre def.po.\n"
+msgstr "El resultado se escribi� sobre def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        hace un respado de def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIJO         sobreescribe el sufijo de respaldo\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -3171,60 +2953,60 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"El método de control de versiones puede ser seleccionado vía la opción\n"
-"--backup o a través de la variable de entorno VERSION_CONTROL. \n"
+"El m�todo de control de versiones puede ser seleccionado v�a la opci�n\n"
+"--backup o a trav�s de la variable de entorno VERSION_CONTROL. \n"
 "Estos son los valores permitidos:\n"
-"   none, off       nunca hace respaldos (aún si se especifica --backup)\n"
+"   none, off       nunca hace respaldos (a�n si se especifica --backup)\n"
 "   numbered, t     hace respaldos numerados\n"
 "   existing, nil   numerados si existen los backups numerados, o sencillos "
 "si\n"
-"                   no es así\n"
+"                   no es as�\n"
 "   simple, never   siempre hace backups sencillos\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"El sufijo del respaldo es '~', a menos que se modifique con --suffix o con\n"
+"El sufijo del respaldo es `~', a menos que se modifique con --suffix o con\n"
 "la variable de entorno SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:570
-#, c-format
+#: src/msgmerge.c:552
+#, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              conserva los msgids anteriores de los mensajes "
-"traducidos\n"
+"     --translated             mantiene lo traducido, elimina los mensajes "
+"sin traducir\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprime los indicadores de progreso\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
-msgstr "este mensaje debería definir las formas plurales"
+msgstr "este mensaje deber�a definir las formas plurales"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
-msgstr "este mensaje no debería definir las formas plurales"
+msgstr "este mensaje no deber�a definir las formas plurales"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sleídos %ld mensajes antiguos + %ld mensajes de referencia\n"
+"%sle�dos %ld mensajes antiguos + %ld mensajes de referencia\n"
 "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
 
 # Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3233,18 +3015,18 @@
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes"
+msgstr "%s y los nombres de ficheros expl�citos son mutuamente excluyentes"
 
 #: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
+msgstr "Modo de empleo: %s [OPCI�N] [FICHERO]...\n"
 
 #: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
-"Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
+"Convierte el cat�logo de mensajes binarios al fichero de estilo Uniforum ."
 "po.\n"
 
 #: src/msgunfmt.c:440
@@ -3288,7 +3070,7 @@
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "Localización del fichero de entrada en modo Java:\n"
+msgstr "Localizaci�n del fichero de entrada en modo Java:\n"
 
 #: src/msgunfmt.c:462
 #, c-format
@@ -3297,14 +3079,14 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"El nombre de la clase se determina añadiendo el nombre local al nombre del\n"
-"recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
+"El nombre de la clase se determina a�adiendo el nombre local al nombre del\n"
+"recurso, separado por un gui�n bajo. La clase se localiza utilizando la\n"
 "variable de entorno CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Localización del fichero de entrada en modo C#:\n"
+msgstr "Localizaci�n del fichero de entrada en modo C#:\n"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3312,14 +3094,14 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Las opciones -l y -d son obligatorias. El fichero .dll será escrito en\n"
+"Las opciones -l y -d son obligatorias. El fichero .dll ser� escrito en\n"
 "un subdirectorio del directorio especificado cuyo nombre depende de la "
-"configuración local.\n"
+"configuraci�n local.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Localización del fichero de entrada en modo Tcl:\n"
+msgstr "Localizaci�n del fichero de entrada en modo Tcl:\n"
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3327,21 +3109,21 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
+"Las opciones -l y -d son obligatorias. El fichero .msg ser� escrito en\n"
 "el directorio especificado.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
-"  -i, --indent                escribe el fichero .po utilizando sangrías\n"
+"  -i, --indent                escribe el fichero .po utilizando sangr�as\n"
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3353,30 +3135,31 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"Unifica las traducciones duplicadas en catálogo de traducción.\n"
+"Unifica las traducciones duplicadas en cat�logo de traducci�n.\n"
 "Encuentra las traducciones duplicadas de el mismo identificador de mensajes.\n"
-"Dichos duplicados son una entrada inválida para otros programas tales como \n"
-"msgfmt, msgmerge o msgcat. Por omisión, los duplicados se mezclan juntos.\n"
-"Cuando se utiliza la opción --repeated solo los duplicados conforman la salida\n"
+"Dichos duplicados son una entrada inv�lida para otros programas tales como \n"
+"msgfmt, msgmerge o msgcat. Por omisi�n, los duplicados se mezclan juntos.\n"
+"Cuando se utiliza la opci�n --repeated s�lo los duplicados conforman la salida\n"
 "y los otros mensajes son descartados. Los comentarios y los comentarios \n"
-"extraidos serán acumulados, excepto si se especifica la opción --use-first, en\n"
-"cuyo caso serán tomados de la primera traducción. Las posiciones de los \n"
-"ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n"
+"extraidos ser�n acumulados, excepto si se especifica la opci�n --use-first, en\n"
+"cuyo caso ser�n tomados de la primera traducci�n. Las posiciones de los \n"
+"ficheros ser�n acumuladas. Cuando se utiliza la opci�n --unique, los \n"
 "duplicados se descartan.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              muestra únicamente los duplicados\n"
+msgstr "  -d, --repeated              muestra �nicamente los duplicados\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                muestra solo los mensajes únicos, descarta los "
-"duplicados\n"
+"   -u, --unique                   muestra s�lo los mensajes �nicos, descarta "
+"a\n"
+"                                  los duplicados\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3389,135 +3172,135 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"El conjunto de caracteres \"%s\" no es un nombre de codificación portátil.\n"
-"La conversión de mensajes al conjunto de caracteres del usuario podría no "
+"El conjunto de caracteres \"%s\" no es un nombre de codificaci�n port�til.\n"
+"La conversi�n de mensajes al conjunto de caracteres del usuario podr�a no "
 "funcionar.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n"
+"El conjunto de caracteres \"%s\" no est� soportado. %s se basa en iconv(),\n"
 "e iconv() no soporta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Instalar GNU libiconv y luego reinstalar GNU gettext\n"
-"podría arreglar este problema.\n"
+"Instalando GNU libiconv y luego reinstalando GNU gettext\n"
+"podr�a arreglar este problema.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Se continúa de todas formas, aunque habrá errores de parseo."
+msgstr "Se contin�a de todas formas, aunque habr� errores de parseo."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
-msgstr "Se continúa de todas formas."
+msgstr "Se contin�a de todas formas."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n"
-"Esta versión fue construida sin iconv().\n"
+"El conjunto de caracteres \"%s\" no est� soportado. %s se basa en iconv().\n"
+"Esta versi�n fue construida sin iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "No hay un conjunto de caracteres especificado en el encabezado.\n"
-"La conversión de mensajes al conjunto de caracteres del usuario no "
-"funcionará.\n"
+"La conversi�n de mensajes al conjunto de caracteres del usuario no "
+"funcionar�.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "la sección 'msgstr[]' no está presente"
+msgid "missing `msgstr[]' section"
+msgstr "no hay secci�n `msgstr'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "la sección 'msgid_plural' no está presente"
+msgid "missing `msgid_plural' section"
+msgstr "no hay secci�n `msgstr'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "la sección 'msgstr' no está presente"
+msgid "missing `msgstr' section"
+msgstr "no hay secci�n `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "la primera forma del plural tiene un índice distinto de cero"
+msgstr "la primera forma del plural tiene un �ndice distinto a cero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "la primera forma del plural tiene un índice incorrecto"
+msgstr "la primera forma del plural tiene un �ndice incorrecto"
 
-# Abortando queda un poco feo. ¿qué se podría poner en su lugar?
+# Abortando queda un poco feo. �qu� se podr�a poner en su lugar?
 # Aterrizaje forzoso! el programa no puede continuar. Que te parece? mm.
 #
 # un poco exagerado... sv. A ver si a Enrique se le ocurre algo, y si no
 # lo dejaremos en "abortado" sv
 #
-# ¿qué les parece `por exceso de errores, finaliza el programa'? mm
+# �qu� les parece `por exceso de errores, finaliza el programa'? mm
 #
-# a mí abortando no me parece mal. Quizá 'programa interrumpido' em
+# a m� abortando no me parece mal. Quiz� 'programa interrumpido' em
 #
-# ¿Qué tal `por exceso de errores el programa no puede continuar'? mm
+# �Qu� tal `por exceso de errores el programa no puede continuar'? mm
 #
 # Perfecto em+
 #
 # ok. corregido. mm+
 #
-# ¡Vaya!, pues a mí no me gusta nada, pero nada. Me explico:
-# No es fiel: El programa sí puede continuar, pero *no quiere*, que es
-# distinto. Seguro que hay un parámetro de compilación que especifica
-# el número de errores que deben aparecer para que el programa dé el
-# mensaje en cuestión. Propongo: "demasiados errores: programa interrumpido"
-# o algo así. sv
+# �Vaya!, pues a m� no me gusta nada, pero nada. Me explico:
+# No es fiel: El programa s� puede continuar, pero *no quiere*, que es
+# distinto. Seguro que hay un par�metro de compilaci�n que especifica
+# el n�mero de errores que deben aparecer para que el programa d� el
+# mensaje en cuesti�n. Propongo: "demasiados errores: programa interrumpido"
+# o algo as�. sv
 #
 # 07061996mm: Propongo "demasiados errores, no tiene caso continuar"
 #
-# 08061996sv: Uf, eso en España suena rarísimo. ¿Podrías proponer otra cosa?
+# 08061996sv: Uf, eso en Espa�a suena rar�simo. �Podr�as proponer otra cosa?
 #
-# 11061996mm: Ok. Hasta no pensar un poco más, adopto como buena tu propuesta
+# 11061996mm: Ok. Hasta no pensar un poco m�s, adopto como buena tu propuesta
 #
-# 19071996cb: "demasiados errores, abandono la ejecución" cb
-# 20071996sv: Eso no seguiría la regla implícita de que el programa no debe
+# 19071996cb: "demasiados errores, abandono la ejecuci�n" cb
+# 20071996sv: Eso no seguir�a la regla impl�cita de que el programa no debe
 # hablar en primera persona sino en estilo impersonal.
-# (Esta regla estará en el manual de Enrique, con toda seguridad).
+# (Esta regla estar� en el manual de Enrique, con toda seguridad).
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados errores, programa interrumpido"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "sucesión de multibyte inválida"
+msgstr "sucesi�n de multibyte inv�lida"
 
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "sucesión de multibyte inválida al final del fichero"
+msgstr "sucesi�n de multibyte inv�lida al final del fichero"
 
 #: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "sucesión de multibyte inválida al final de la línea"
+msgstr "sucesi�n de multibyte inv�lida al final de la l�nea"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
@@ -3541,20 +3324,20 @@
 #: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr "fin de línea dentro de una cadena"
+msgstr "fin de l�nea dentro de una cadena"
 
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "separador de contexto <EOT> dentro de una cadena"
+msgstr ""
 
 # sospecho que lo que en realidad ocurre es que "no debe". sv
-# Miraremos el código fuente. sv
+# Miraremos el c�digo fuente. sv
 #
-# ok. aquí está el fuente. Tengo la impresión de que estoy en
+# ok. aqu� est� el fuente. Tengo la impresi�n de que estoy en
 # lo correcto: es decir que es necesario que tenga al menos
-# una instrucción de dominio.
-# por cierto traduje directive por instrucción aunque con las
+# una instrucci�n de dominio.
+# por cierto traduje directive por instrucci�n aunque con las
 # series de TV gringas acostumbran mal traducir a "directivas". mm.
 #
 # exclude_directive_domain (pop, name)
@@ -3564,7 +3347,7 @@
 #   po_gram_error (_("this file may not contain domain directives"));
 # }
 #
-# Me lo pones más claro: el mensaje está dentro de una función llamada
+# Me lo pones m�s claro: el mensaje est� dentro de una funci�n llamada
 # "exclude_directive_domain". Probablemente porque *no* debe haber
 # "domain directives", no porque posiblemente no las haya.
 #
@@ -3572,31 +3355,32 @@
 # significa "should not".
 #
 # Sigo pensando igual que antes, aunque no estoy seguro del todo. sv
-# ¿Qué opinas Enrique? mm
-# Pues después de ver los fuentes no consigo estar seguro. Pero
-# definitivamente no optaría por 'no debería' , sino por 'no puede' , por
-# el nombre de la función está claro que es lo que se pretende.  Afortunada-
-# mente el verbo poder en Castellano es mucho más flexible que en otros
+# �Qu� opinas Enrique? mm
+# Pues despu�s de ver los fuentes no consigo estar seguro. Pero
+# definitivamente no optar�a por 'no deber�a' , sino por 'no puede' , por
+# el nombre de la funci�n est� claro que es lo que se pretende.  Afortunada-
+# 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:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
 
-# Nota: es la definición la que está duplicada.
-#: src/read-catalog.c:363
+# Nota: es la definici�n la que est� duplicada.
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "definición del mensaje duplicada"
+msgstr "definici�n del mensaje duplicada"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
+#, fuzzy
 msgid "this is the location of the first definition"
-msgstr "esta es la localización de la primera definición"
+msgstr "...aqu� est� la primera definici�n"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "el fichero \"%s\" está truncado"
+msgstr "el fichero \"%s\" est� truncado"
 
 #: src/read-mo.c:129
 #, c-format
@@ -3606,7 +3390,7 @@
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
+msgstr "el fichero \"%s\" no est� en el formato .mo de GNU"
 
 #: src/read-mo.c:178
 #, c-format
@@ -3614,34 +3398,42 @@
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "atención: sintaxis \\uxxxx no válida para carácter Unicode"
+msgstr "%s:%lu: atenci�n: \\uxxxx sint�xis no v�lida para car�cter Unicode"
 
 #: src/read-stringtable.c:802
+#, fuzzy
 msgid "warning: unterminated string"
-msgstr "atención: cadena no finalizada"
+msgstr "%s:%d: atenci�n: cadena no finalizada"
 
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr "atención: error de sintaxis"
+msgstr "%s%lu: atenci�n: error de sint�xis"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "atención: par llave/valor no finalizado"
+msgstr "%s:%lu: atenci�n: par llave/valor no finalizado"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr "atención: error de sintaxis; se espera un ';' después de la cadena"
+msgstr ""
+"%s:%lu: atenci�n: error de sint�xis, se espera un ';' despu�s de la cadena"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
-"atención: error de sintaxis; se espera un '=' o un ';' después de la cadena"
+"%s:%lu: atenci�n: error de sint�xis, se espera un '=' o un ';' despu�s de la "
+"cadena"
 
 #: src/recode-sr-latin.c:116
-#, c-format
+#, fuzzy, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Escrito por %s y %s.\n"
+msgstr "Escrito por %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3649,12 +3441,12 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Danilo Segan"
+msgstr ""
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Recodifica el texto serbio de escritura cirílica a latina.\n"
+msgstr ""
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3662,18 +3454,16 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"El fichero de entrada se lee de la entrada estándar.  El texto convertido se saca por\n"
-"la salida estándar.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "la entrada no es válida con la codificación \"%s\""
+msgstr ""
 
-#: src/recode-sr-latin.c:367
-#, c-format
+#: src/recode-sr-latin.c:366
+#, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "error al convertir de la codificación \"%s\" a la codificación \"%s\""
+msgstr "error al abrir el fichero \"%s\" para lectura"
 
 #: src/urlget.c:159
 #, c-format
@@ -3683,7 +3473,7 @@
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n"
+msgstr "Modo de empleo: %s [OPCI�N] URL FICHEROENTRADA\n"
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3694,59 +3484,52 @@
 "Trae y muestra el contenido de una URL. Si la URL no puede ser accesada,\n"
 "se utiliza el FICHERO local.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "error al leer \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
-msgstr "error al escribir la salida estándar"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "error después de leer \"%s\""
+msgstr "error al escribir la salida est�ndar"
 
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Recuperando %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " tiempo agotado.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " ha fallado.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
+#, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"No se pueden mostrar varios dominios de traducción en un solo fichero con el "
-"formato de salida especificado. Intente usar la sintaxis de los ficheros PO."
+"No se pueden mostrar varios dominios de traducci�n en un s�lo fichero en la\n"
+"sint�xis .properties de Java. Intente usar la sint�xis de los ficheros PO."
 
 #: src/write-catalog.c:129
+#, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"No se pueden mostrar varios dominios de traducción en un solo fichero con el "
-"formato de salida especificado."
+"No se pueden mostrar varios dominios de traducci�n en un s�lo fichero en la\n"
+"sint�xis .strings de NeXTstep/GNUstep."
 
 #: src/write-catalog.c:162
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
-"el formato de salida no las admite."
+"el cat�logo de mensajes tiene traducciones con formas plurales, pero el "
+"cat�logo de mensajes no admite el trato plural"
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3754,7 +3537,7 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"el catálogo de mensajes tiene traducciones en forma plural, pero el formato "
+"el cat�logo de mensajes tiene traducciones en forma plural, pero el formato "
 "de salida no lo soporta. Se puede intentar generar una clase Java utilizando "
 "\"msgfmt --java\" en vez del fichero de propiedades."
 
@@ -3763,8 +3546,8 @@
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero el "
-"catálogo de mensajes no admite el trato plural"
+"el cat�logo de mensajes tiene traducciones con formas plurales, pero el "
+"cat�logo de mensajes no admite el trato plural"
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
@@ -3773,7 +3556,7 @@
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
-msgstr "salida estándar"
+msgstr "salida est�ndar"
 
 #: src/write-csharp.c:703
 #, c-format
@@ -3783,61 +3566,57 @@
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "fallo en la compilación de la clase C#, intente --verbose"
+msgstr "fallo en la compilaci�n de la clase C#, intente --verbose"
 
 #: src/write-csharp.c:768
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "fallo en la compilación de la clase C#"
+msgstr "fallo en la compilaci�n de la clase C#, intente --verbose"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "no es un nombre de clase Java válido: %s"
+msgstr "no es un nombre de clase Java v�lido: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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"
+"fallo en la compilaci�n de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-java.c:1213
-#, c-format
+#: src/write-java.c:1168
+#, fuzzy, 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"
+msgstr ""
+"fallo en la compilaci�n de la clase Java, intente --verbose o poner $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "sucesión de multibyte inválida"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"Los mensajes internacionalizados no deben contener la secuencia de escape '\\"
+"Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
 "%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
-#, c-format
+#: src/write-po.c:1253 src/write-po.c:1382
+#, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
 "This will cause problems to translators who use a character encoding\n"
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"El siguiente msgctxt contiene caracteres que no son ASCII.\n"
-"Esto causará problemas a los traductores que utlicen una codificación de\n"
-"caracteres diferente a la suya. Considere la opción de utilizar un msgctxt\n"
+"El siguiente msgid contiene caracteres que no son ASCII.\n"
+"Esto causar� problemas a los traductores que utlicen una codificaci�n de\n"
+"caracteres diferente a la suya. Considere la opci�n de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3846,8 +3625,8 @@
 "%s\n"
 msgstr ""
 "El siguiente msgid contiene caracteres que no son ASCII.\n"
-"Esto causará problemas a los traductores que utlicen una codificación de\n"
-"caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
+"Esto causar� problemas a los traductores que utlicen una codificaci�n de\n"
+"caracteres diferente a la suya. Considere la opci�n de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
 #: src/write-qt.c:667
@@ -3855,20 +3634,21 @@
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"catálogo de mensajes de Qt no soporta el trato plural\n"
+"el cat�logo de mensajes tiene traducciones con formas plurales, pero el \n"
+"cat�logo de mensajes de Qt no soporta el trato plural\n"
 
 #: src/write-qt.c:693
+#, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside "
 "ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"el catálogo de mensajes tiene cadenas msgctxt que contienen caracteres fuera "
-"del ISO-8859-1,\n"
-"pero el formato del catálogo de mensajes de Qt admite Unicode\n"
-"solo en las cadenas traducidas, no en las cadenas del contexto\n"
+"el cat�logo de mensajes tiene cadenas msgid que contienen caracteres\n"
+"fuera del ISO-8859-1, pero el formato del cat�logo de mensajes de Qt\n"
+"admite Unicode s�lo en las cadenas traducidas, pero no en las que a�n\n"
+"no lo est�n\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3876,10 +3656,10 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"el catálogo de mensajes tiene cadenas msgid que contienen caracteres\n"
-"fuera del ISO-8859-1, pero el formato del catálogo de mensajes de Qt\n"
-"admite Unicode solo en las cadenas traducidas, no en las que aún\n"
-"no lo están\n"
+"el cat�logo de mensajes tiene cadenas msgid que contienen caracteres\n"
+"fuera del ISO-8859-1, pero el formato del cat�logo de mensajes de Qt\n"
+"admite Unicode s�lo en las cadenas traducidas, pero no en las que a�n\n"
+"no lo est�n\n"
 
 #: src/write-resources.c:94
 #, c-format
@@ -3887,67 +3667,65 @@
 msgstr "hubo un error al escribir al subproceso %s"
 
 #: src/write-resources.c:131
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
-"el \n"
-"formato de los recursos de C# no admite contextos\n"
+"el cat�logo de mensajes tiene traducciones con formas plurales, pero el \n"
+"formato de los recursos de C# no tiene implementado el trato plural\n"
 
 #: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
+"el cat�logo de mensajes tiene traducciones con formas plurales, pero el \n"
 "formato de los recursos de C# no tiene implementado el trato plural\n"
 
 #: src/write-tcl.c:157
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
-"el \n"
-"catálogo de mensajes de Tcl no admite contextos\n"
+"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/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 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"
+"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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: atención: cadena no finalizada"
+msgstr "%s:%d: atenci�n: cadena no finalizada"
 
 #: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: atención: expresión regular no finalizada"
-
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "atención: carácter Unicode inválido"
+msgstr "%s:%d: atenci�n: expresi�n regular no finalizada"
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
+msgstr "%s:%d: atenci�n: constante de tipo car�cter no finalizada"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: atención: literal de cadena no finalizada"
+msgstr "%s:%d: atenci�n: literal de cadena no finalizada"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Especifique la codificación del código fuente utilizando --from-code."
+msgstr ""
+"Hay una cadena que no est� en ASCII en %s%s.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3955,8 +3733,8 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Secuencia multibyte inválida.\n"
-"Especifique la codificación del código fuente utilizando --from-code.\n"
+"%s:%d: Secuencia multibyte inv�lida.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
 #: src/x-csharp.c:285
 #, c-format
@@ -3965,7 +3743,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificación del código fuente utilizando --from-code.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
 #: src/x-csharp.c:297
 #, c-format
@@ -3974,7 +3752,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificación del código fuente utilizando --from-code.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
 #: src/x-csharp.c:306
 #, c-format
@@ -3982,10 +3760,10 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 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"
+"%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo en iconv"
@@ -3996,251 +3774,163 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Hay una secuencia multibyte inválida.\n"
-"Especifique la codificación del código fuente utilizando --from-code.\n"
+"%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:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: atención: carácter Unicode inválido"
+msgstr "%s:%d: atenci�n: car�cter Unicode inv�lido"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: atención: cadena constante no finalizada"
+msgstr "%s:%d: atenci�n: cadena constante no finalizada"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
+msgstr "%s:%d: cuidado: se encontr� un ')' en donde se esperaba un '}'"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
+msgstr "%s:%d: cuidado: se encontr� un '}' en donde se esperaba un ')'"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "No hay contexto para la cadena extraída del elemento '%s'"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "El elemento raíz <%s> no se permite en un fichero Glade válido"
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
+#: src/x-glade.c:623 src/x-glade.c:630
+#, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"El lenguaje \"glade\" no está soportado. %s se basa en expat.\n"
-"Esta versión fue construida sin expat.\n"
+"El lenguaje \"glade\" no est� soportado. %s se basa en expat.\n"
+"Esta versi�n fue construida sin expat.\n"
 
 #: src/x-java.c:494
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: atención: sustitución aislada U+%04X"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Especifique la codificación del código fuente utilizando --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Secuencia multibyte inválida.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Hay una secuencia multibyte inválida.\n"
-"Especifique la codificación del código fuente utilizando --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: atención: literal RegExp finalizada demasiado pronto"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: atención: %s no está permitido"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: atención: marca XML no finalizada"
+msgstr "%s:%d: atenci�n: cadena no finalizada"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
-"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
+"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ning�n lugar "
 "antes del fin del fichero"
 
 #: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: falta una llave derecha en \\x{NÚMEROHEX}"
+msgstr "%s:%d: falta una llave derecha en \\x{N�MEROHEX}"
 
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolación no válida (\"\\l\") del caracter de 8 bits \"%c\""
+msgstr "%s:%d: interpolaci�n no v�lida (\"\\l\") del caracter de 8 bits \"%c\""
 
 #: src/x-perl.c:1183
 #, c-format
 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\""
+msgstr "%s:%d: interpolaci�n no v�lida (\"\\u\") del caracter de 8 bits \"%c\""
 
 #: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: interpolación de variable no válida en \"%c\""
+msgstr "%s:%d: interpolaci�n de variable no v�lida en \"%c\""
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
+msgstr "%s%d: interpolaci�n no v�lida (\"\\L\") del caracter de 8 bits \"%c\""
 
 #: src/x-perl.c:1247
 #, c-format
 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\""
+msgstr "%s:%d: interpolaci�n no v�lida (\"\\U\") del caracter de 8 bits \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
-"Especifique la codificación del código fuente utilizando --from-code o "
-"mediante un comentario\n"
-"como se indica en http://www.python.org/peps/pep-0263.html.\n"
+"Hay una cadena que no est� en ASCII en %s%s.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:282
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Secuencia multibyte inválida.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code o mediante un comentario\n"
-"como se indica en http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Secuencia multibyte inv�lida.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:299
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code o mediante un comentario\n"
-"como se indica en http://www.python.org/peps/pep-0263.html.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:312
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code o mediante un comentario\n"
-"como se indica en http://www.python.org/peps/pep-0263.html.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:322
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-"
-"code o mediante un comentario\n"
-"como se indica en http://www.python.org/peps/pep-0263.html.\n"
+"%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-python.c:397
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Hay una secuencia multibyte inválida.\n"
-"Especifique la codificación del código fuente utilizando --from-code o "
-"mediante un comentario\n"
-"como se indica en http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Hay una secuencia multibyte inv�lida.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Codificación desconocida \"%s\". Se procederá con ASCII en su lugar."
+msgstr ""
 
 #: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: definición de cadena inválida"
+msgstr "%s:%d: definici�n de cadena inv�lida"
 
 #: 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 #"
+msgstr "%s:%d: falta un n�mero despu�s del s�mbolo #"
 
 #: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: expresión de cadena inválida"
+msgstr "%s:%d: expresi�n de cadena inv�lida"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -4248,77 +3938,64 @@
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
-"%s:%lu: cuidado: la sintaxis $\"...\" se desaconseja por razones de "
-"seguridad; mejor utilice eval_gettext"
+"%s:%lu: cuidado: la sint�xis $\"...\" se desaconseja debido a cuestiones de "
+"seguiridad; mejor utilice eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-"%s:%d: atención: literal de expresión regular finalizada demasiado pronto"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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)"
+"salida est�ndar (stdout)"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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"
+"atenci�n: el fichero `%s' con extensi�n `%s'\n"
+"es desconocido; se intentar� tipo C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=NOMBRE utiliza NOMBRE.po para la salida (en vez de\n"
-"                              mensajes.po)\n"
+"  -d, --default-domain=NOMBRE   utiliza NOMBRE.po para la salida (en vez de\n"
+"                                mensajes.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"  -p, --output-dir=DIR        los ficheros de salida se pondrán en el\n"
+"  -p, --output-dir=DIR        los ficheros de salida se pondr�n en el\n"
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
-msgstr "Selección del lenguaje del fichero de entrada:\n"
+msgstr "Selecci�n del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4327,33 +4004,32 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=NOMBRE       reconoce el lenguaje especificado\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"   -L, --language=NOMBRE        reconoce el lenguaje especificado\n"
+"                                  (C, C++, ObjectiveC, PO, Shell, Python, "
 "Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"                                  EmacsLisp, librep, Scheme, Smalltalk, "
+"Java,\n"
+"                                  JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                  fuente-GCC, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
-"Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero "
+"Por omisi�n, el lenguaje se adivina dependiendo de la extensi�n del fichero "
 "de entrada.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4362,26 +4038,26 @@
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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"
+"Por omisi�n, los ficheros de entrada se presupone que est�n en ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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"
+"  -x, --exclude-file=FICHERO.po  las l�neas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4389,56 +4065,47 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=ETIQUETA  coloca los bloques de comentarios "
-"iniciándolos con ETIQUETA y \n"
-"                                delante de las líneas de palabras clave en "
-"el fichero de salida\n"
-"  -c, --add-comments          coloca todos los bloques de comentarios "
-"delante de las líneas de palabras clave\n"
+"  -c, --add-comments[=ETIQUETA]  comenta un bloque con la ETIQUETA (o\n"
+"                                 aquellas l�neas que preceden a la palabra\n"
+"                                 clave) en el fichero de salida\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Opciones específicas del lenguaje:\n"
+msgstr "Opciones espec�ficas del lenguaje:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (solo los lenguajes C, C++, ObjectiveC, "
+"                                (s�lo los lenguajes C, C++, ObjectiveC, "
 "Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, fuente-GCC, Glade)\n"
 
-#: src/xgettext.c:937
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (solo los lenguajes C, C++, ObjectiveC, "
-"Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"   -k, --keyword[=PALABRA]     una palabra clabe adicional que se debe "
+"buscar \n"
+"                               (sin la PALABRA, significa que se deben "
+"utilizar \n"
+"                               las palabras clave por omisi�n)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4446,81 +4113,78 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=PALABRA:ARG:BANDERA  bandera adicional para las cadenas que "
-"están\n"
-"                                  dentro del argumento número ARG de la "
+"est�n\n"
+"                                  dentro del argumento n�mero ARG de la "
 "palabra\n"
 "                                  clave PALABRA\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (solo los lenguajes C, C++, ObjectiveC, "
+"                                (S�lo los lenguajes C, C++, ObjectiveC, "
 "Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, fuente-GCC)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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"
+"  -T, --trigraphs              entiende los tr�grafos de ANSI C para la\n"
 "                               entrada\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
-"                                (solo en lenguajes C, C++, ObjectiveC)\n"
+"                                (s�lo en lenguajes C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (solo lenguaje C++)\n"
+msgstr "                                (s�lo lenguaje C++)\n"
 
-#: src/xgettext.c:958
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   reconoce los 4 formatos de cadena KDE\n"
+msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:962
-#, c-format
+#: src/xgettext.c:919
+#, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 reconoce los formatos de cadena Boost\n"
+msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 muestra con más detalle el resultado del "
-"reconocimiento\n"
-"                              de las cadenas de formato\n"
+"      --debug                  muestra con m�s detalle el reconocimiento\n"
+"                               de las cadenas de formato\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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"
+"      --copyright-holder=CADENA  pone al due�o del copyright en la salida\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4528,100 +4192,99 @@
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
-#, c-format
+#: src/xgettext.c:969
+#, fuzzy, 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"
+"      --copyright-holder=CADENA  pone al due�o del copyright en la salida\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=DIRECCION@DECORREO  pone la dirección de correo \n"
+"      --msgid-bugs-address=DIRECCION@DECORREO  pone la direcci�n de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[CADENA], --msgstr-prefix[=CADENA]  utiliza CADENA o \"\" como prefijo "
-"para las\n"
-"                                  líneas del msgstr\n"
+"   -m, --msgstr-prefix[=CADENA]   utiliza la CADENA o \"\" como prefijo para "
+"las\n"
+"                                  l�neas del msgstr\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[CADENA], --msgstr-suffix[=CADENA]  utiliza CADENA o \"\" como sufijo "
-"para las\n"
-"                                líneas del msgstr\n"
+"  -M, --msgstr-suffix[=CADENA]  utiliza la CADENA o \"\" como sufijo para "
+"las\n"
+"                                l�neas del msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Un argumento --flag no tiene la sintaxis <palabraclave>:<númarg>:"
-"[pass-]<bandera>: %s"
+"Un argumento --flag no tiene la sint�xis <palabraclave>:<n�marg>:[pass-]"
+"<bandera>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
-msgstr "entrada estándar"
+msgstr "entrada est�ndar"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Carácter no ASCII en %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Comentario no ASCII en o precediendo %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Cadena no ASCII en %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
-msgstr "%s%s: atención: "
+msgstr "%s%s: atenci�n: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 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"
+"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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
-"Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
+"Aunque as� est� declarado, '%s' no es un formato de cadena v�lido %s. Raz�n: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4629,61 +4292,172 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"la cadena de formato '%s' con argumentos sin nombre no se puede localizar "
-"adecuadamente:\n"
-"El traductor no puede reordenar los argumentos.\n"
-"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:2283
+#: src/xgettext.c:2197
 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 ""
-"msgid vacío. Está reservado por el gettext de GNU:\n"
-"gettext(\"\") regresa la línea de encabezado con la\n"
-"metainformación, no una cadena vacía.\n"
+"msgid vac�o. Est� reservado por el gettext de GNU:\n"
+"gettext(\"\") regresa la l�nea de encabezado con la\n"
+"metainformaci�n, no una cadena vac�a.\n"
 
-#: src/xgettext.c:2979
-#, c-format
+#: src/xgettext.c:2834
+#, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "la especificación de argumento es ambigua para la palabra clave '%.*s'"
+msgstr "el argumento %s es ambiguo para %s"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "atención: no está presente el contexto para la palabra clave '%.*s'"
+msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "discordancia de contexto entre las formas de singular y plural"
+msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"La opción --msgid-bugs-address no se especificó.\n"
-"Si se está usando un fichero 'Makevars', especifique\n"
-"allí la variable MSGID_BUGS_ADDRESS; en caso contrario,\n"
-"debe especificar la opción de línea de órdenes --msgid-bugs-address\n"
+"La opci�n --msgid-bugs-address no se especific�.\n"
+"Si se est� usando un fichero `Makevars', especifique\n"
+"all� la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
+"debe se poner la opci�n --msgid-bugs-address\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "idioma '%s' desconocido"
+msgid "language `%s' unknown"
+msgstr "idioma `%s' desconocido"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<sinnombrar>"
+
+# acepto la sugerencia de em en cuanto a que inv�lida parece c�rcel
+# o in�til pero mejor puse inv�lida
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opci�n inv�lida -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr ""
+#~ "fallo de duplicaci�n de manejador (DuplicateHandle) con c�digo de error 0x"
+#~ "%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "A�n no est� implementado."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "fallo en la comunicaci�n con el subproceso %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "fallo en la lectura del subproceso %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "el subproceso %s termin� con un c�digo de salida %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "el campo `%s' a�n tiene el valor inicial por omisi�n\n"
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Referencias m�ltiples a %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Esto es software libre; vea el c�digo fuente para las condiciones de "
+#~ "copia.\n"
+#~ "No hay NINGUNA garant�a; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
+#~ "UN\n"
+#~ "FIN DETERMINADO.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "el cat�logo de mensajes tiene traducciones con formas plurales, pero el \n"
+#~ "formato de los recursos de C# no tiene implementado el trato plural\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "el cat�logo de mensajes tiene traducciones con formas plurales, pero el \n"
+#~ "formato de los recursos de C# no tiene implementado el trato plural\n"
+
+#~ msgid "The %%J directive is only allowed at the beginning of the string."
+#~ msgstr "La instrucci�n %%J s�lo se permite al principio de la cadena."
+
+#~ msgid "The %%J directive does not support flags."
+#~ msgstr "La instrucci�n %%J no acepta ninguna bandera."
+
+#~ msgid "Which is your email address?"
+#~ msgstr "�Cu�l es tu direcci�n de correo electr�nico?"
+
+#~ msgid "Please choose the number, or enter your email address."
+#~ msgstr "Selecciona el n�mero, o escribe tu direcci�n de correo electr�nico."
+
+#~ msgid "Invalid email address: invalid character."
+#~ msgstr "Direcci�n de correo electr�nico incorrecta: caracter inv�lido."
+
+#~ msgid ""
+#~ "Invalid email address: need a fully qualified host name or domain name."
+#~ msgstr ""
+#~ "Direcci�n de correo electr�nico inv�lido: se necesita un nombre de "
+#~ "m�quina o dominio totalmente calificado."
+
+#~ msgid "Invalid email address: missing @"
+#~ msgstr "Direcci�n de correo electr�nico incorrecta: falta la @"
+
+#~ msgid "Is the following your email address?"
+#~ msgstr "�Es �sta tu direcci�n de correo electr�nico?"
+
+#~ msgid "Please confirm by pressing Return, or enter your email address."
+#~ msgstr ""
+#~ "Confirma presionando Return, o escribe tu direcci�n de correo electr�nico."
+
+#~ msgid "Couldn't find out about your email address."
+#~ msgstr "No se puede encontrar tu direcci�n de correo electr�nico."
+
+#~ msgid "Please enter your email address."
+#~ msgstr "Por favor escribe tu direcci�n de correo electr�nico."
+
+#~ msgid "conversion failure"
+#~ msgstr "falla de conversi�n"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: atenci�n: "
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: atenci�n: cadena no finalizada"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr ""
+#~ "%s:%d: error grave: el mensaje en plural se vi� antes del mensaje en "
+#~ "singular\n"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "fallo en la escritura al subproceso grep"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/et.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/et.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/et.po gettext-0.18.1.1/gettext-tools/po/et.po
--- gettext-0.19.3/gettext-tools/po/et.po	2014-10-16 06:04:21.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/et.po	2010-06-06 12:49:57.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -26,25 +26,26 @@
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
@@ -53,38 +54,37 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -101,98 +101,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: v�ti `%s' on mitmet�henduslik\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `--%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: v�tme `%s' j�rel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tundmatu v�ti `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tundmatu v�ti `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: vigane v�ti -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: v�tme j�rel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: v�ti `-W %s' on mitmet�henduslik\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `-W %s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: v�tme `%s' j�rel peab olema argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -202,96 +202,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "m�lu sai otsa"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "ei suuda luua v�ljundfaili \"%s\""
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
@@ -307,20 +269,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "viga faili \"%s\" avamisel (lugemiseks)"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -329,19 +284,17 @@
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
@@ -351,26 +304,24 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
@@ -456,16 +407,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -647,9 +588,7 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
@@ -689,32 +628,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -756,11 +669,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -769,58 +682,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "T�iendava info saamiseks proovi `%s --help'.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -828,34 +741,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -864,248 +777,237 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s on vastastikku v�listavad"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1114,87 +1016,87 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1215,31 +1117,31 @@
 "  -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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1248,9 +1150,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "  -V, --version               v�ljastab versiooniinfo ja l�petab programmi t��\n"
 "  -w, --width=NUMBER          m��rab v�ljastatava lehek�lje laiuse\n"
@@ -1267,92 +1169,92 @@
 "comments) j�etakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused v�etakse ja s�ilitatakse k�ikidest PO failidest.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "sisendfailid on m��ramata"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1393,19 +1295,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1430,17 +1332,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "see teade on kasutusel, kuid kirjeldamata..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...kuid see kirjeldus on sarnane"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
@@ -1450,19 +1352,19 @@
 msgid "warning: this message is not used"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "v�hemalt kaks faili peab olema ette antud"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1470,7 +1372,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1489,74 +1391,74 @@
 "comments) j�etakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused v�etakse ja s�ilitatakse k�ikidest PO failidest.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1565,7 +1467,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1597,7 +1499,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1607,45 +1509,50 @@
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumendid on puudu"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "v�hemalt kaks faili peab olema ette antud"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1653,226 +1560,192 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s ja %s on vastastikku v�listavad"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, 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:749
+#: src/msgfmt.c:625
 #, 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:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1881,78 +1754,48 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1960,33 +1803,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1994,135 +1837,115 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, 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:1050
+#: src/msgfmt.c:903
 #, 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:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "ignoreerin t�hja `msgstr' kirjet"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: l�htefail sisaldab kahtlast t�lget"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2162,30 +1985,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2193,24 +2016,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2218,54 +2041,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2277,7 +2100,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2295,13 +2118,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2311,8 +2134,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: hoiatus: "
@@ -2409,106 +2232,112 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "p�ise kirjest on puudu v�li `%s'"
+
+#: src/msgl-check.c:784
+#, fuzzy, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "p�ise kirjes peab v�li `%s' algama rea algusest"
+
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
 msgstr "m�ned p�ise kirjes olevad v�ljad sisaldavad ikka veel algseid v��rtusi"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "p�ise kirjest on puudu v�li `%s'"
+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-iconv.c:65
 #, c-format
@@ -2524,8 +2353,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2541,8 +2370,8 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2551,16 +2380,16 @@
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2587,51 +2416,51 @@
 "kahtlased. Kui v�ljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
 "standardv�ljunisse.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2643,36 +2472,36 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2681,7 +2510,7 @@
 "%sLoetud %ld vana + %ld viidet, �hendatud %ld, kahtlaseid %ld, puuduvaid "
 "%ld, vananenuid %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2779,7 +2608,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2792,12 +2621,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2818,7 +2647,7 @@
 "Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n"
 "Teadete t�lkimine kasutaja kooditabeli j�rgi v�ib mitte toimida.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2827,7 +2656,7 @@
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2836,15 +2665,15 @@
 "GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
 "GNU gettext\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "J�tkan siiski, vaatamate parsimisvigadele."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "J�tkan siiski."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2853,7 +2682,7 @@
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2866,27 +2695,27 @@
 msgid "inconsistent use of #~"
 msgstr "vastuoluline #~ kasutamine"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "puudub `msgstr[]' sektsioon"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "puudub `msgid_plural' sektsioon"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "puudub `msgstr' sektsioon"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "esimene mitmuse vormi indeks erineb nullist"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "mitmuse vorm omab vale indeksit"
@@ -2896,7 +2725,7 @@
 msgid "too many errors, aborting"
 msgstr "liiga palju vigu, katkestan t��"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "vigane multibait jada"
@@ -2940,16 +2769,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "teade on kirjeldatud kaks korda"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...see on esimese kirjelduse asukoht"
@@ -3029,12 +2858,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
@@ -3056,21 +2885,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "viga \"%s\" lugemisel"
-
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "viga \"%s\" lugemisel"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3141,17 +2960,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3161,18 +2980,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "vigane multibait jada"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "t�lgitud teated peaksid mitte sisaldama `\\%c' erim�rgijada"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3181,7 +2995,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3240,7 +3054,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: hoiatus: l�petamata string"
@@ -3250,22 +3064,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: l�petamata s�mbolkonstant"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: l�petamata s�mbolkonstant"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3297,7 +3106,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3309,7 +3118,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: l�petamata s�mbolkonstant"
@@ -3329,22 +3138,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3358,60 +3157,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: l�petamata s�mbolkonstant"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3447,13 +3192,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3461,7 +3206,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3469,7 +3214,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3477,7 +3222,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3485,7 +3230,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3493,7 +3238,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3520,62 +3265,52 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei t��ta ilma vajalike v�tmes�nadeta"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3584,45 +3319,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3632,37 +3366,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3670,85 +3400,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3756,7 +3485,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3764,52 +3493,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3818,44 +3547,44 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "tundmatu keel `%s'"
 
 #: libgettextpo/gettext-po.c:84
@@ -3866,10 +3595,6 @@
 #~ msgstr "%s: lubamatu v�ti -- %c\n"
 
 #, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "p�ise kirjes peab v�li `%s' algama rea algusest"
-
-#, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "v�li `%s' sisaldab ikka veel algset v��rtust"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/eu.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/eu.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/eu.po gettext-0.18.1.1/gettext-tools/po/eu.po
--- gettext-0.19.3/gettext-tools/po/eu.po	2014-10-16 06:10:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/eu.po	2010-06-06 12:49:57.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -29,25 +29,26 @@
 msgstr "%s argumentu anbiguoa %s-rentzat"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Argumentu erabilgarria:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ezin da aldiroko direktorioa aurkitu, saiatu $TMPDIR ezartzen"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ezin da \"%s\" txantiloia erabiliaz aldiroko direktorioa sortu"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ezin da aldiroko %s fitxategia ezabatu"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ezin da aldiroko %s direktorioa ezabatu"
@@ -56,38 +57,37 @@
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "ezin da \"%s\" babeskopia fitxategia idazketarako ireki"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "errorea \"%s\" idaztean"
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "errorea \"%s\" irakurri ondoren"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,98 +104,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Ez da C# makina birtualik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s azpirpozesuak huts egin du"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: `--%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: `%c%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: aukera baliogabea -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: -- %c aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Huts \"%s\" sortzerakoan"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errorea \"%s\" fitxategia idazterakoan"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -208,96 +208,58 @@
 "ez da java makina birtualik aurkitu, saiatu gcj instalatuaz edo $JAVAC "
 "ezarriaz"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s azpiprozesu S/I errorea"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Huts %s azpiprozesua irakurtzerakoan"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
+msgid "cannot create pipe"
+msgstr "ezin da tutua sortu"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "ezin da tutua sortu"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle -ek huts egin du"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
@@ -313,20 +275,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s azpiprozesua %d seinale konponezina jaso du"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
-
-#: src/format.c:151
+#: src/format.c:148
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' ez da baliozko %s formatu katea, ez 'msgid' bezala. Arrazoia: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -335,19 +290,17 @@
 msgstr "a formateatu - u in s t in"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -358,7 +311,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "%u direktiba | -rekin hasten da baina ez | -rekin amaitzen."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -368,22 +321,20 @@
 "makro izena. Baliozko makro izenak  ISO C 99 7.8.1. atalean daude "
 "zerrendaturik."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "%u zenbakiko direktiban, '<' ondorengo elementua ez dago '>'-rekin jarraitua."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Kateak %u argumentuaz ari da baina %u argumentu zenbakia alde batetara uzten "
 "du."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -474,16 +425,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Katea direktibaren erdian amaitzen da."
@@ -686,9 +627,7 @@
 "conversion specifier '%c'."
 msgstr "Handiagotu u tamaina da honekin k."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a formateatu - s t in s"
@@ -729,33 +668,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formateatu in eta s - s"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Handiagotu u k da Bielorrusiarra a."
-
-#: src/format-python-brace.c:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Handiagotu u l da."
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -801,11 +713,11 @@
 "1 and 9."
 msgstr "u da a eta."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -814,58 +726,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s-ek idatzia.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' erabili argibide gehiagorako.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Erabilera: %s [AUKERA]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Makinaren ostalari izena inprimatu.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Irteera formatua:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 ostalari izen laburra\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -876,34 +788,34 @@
 "domeinu\n"
 "                                izena eta ezizena berne\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
@@ -912,41 +824,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "ezind a ostalari izena eskuratu"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "behintzat sarrera fitxategi bat onartu da"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s eta %s ez dira bateragarriak"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Erabilera: %s [AUKERA] [SARFITXATEGIA]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -955,10 +869,10 @@
 "Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
 "eta beren atributuak eraldatu.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -966,23 +880,23 @@
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera "
 "laburrentzat ere.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -990,32 +904,32 @@
 "  -D, --directory=DIRECTORIOA Gehitu DIRECTORIOA sarrera fitxategiak "
 "bilatzeko zerrendara\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
 "irakurriko da.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1025,12 +939,12 @@
 "bada\n"
 "edo berau - bada.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Mezu hautapena:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1038,7 +952,7 @@
 "      --translated            mantendu itzulitakoak, ezabatu itzuli gabeko "
 "mezuak\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1046,63 +960,55 @@
 "      --untranslated          mantendu itzuli gabekoak, ezabatu itzulitako "
 "mezuak\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantendu zalantza bezala markaturiko kateka\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantendu zaharkituriko #~ mezuak\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Atributu manipulazioa:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ezarri kate guztiak zalantza bezala\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           zalantza bandera kendu kate guztiei\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ezarri mezu guztiak zaharkituak bezala\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        ezarri mezu guztiak ez-zaharkituk bezala\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1110,14 +1016,7 @@
 msgstr ""
 "      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1125,7 +1024,7 @@
 "      --only-file=FITX.po     FITX.po fitxategian zerrendaturiko sarrerak "
 "bakarrik eraldatu\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1133,13 +1032,13 @@
 "      --ignore-file=FILE.po   FITX.po fitxategian ez zerrendaturiko sarrerak "
 "bakarrik eraldatu\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 --only-fuzzy --clear-fuzzy -ren sinonimo\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1147,16 +1046,16 @@
 "      --obsolete              --only-obsolete --clear-obsolete -ren "
 "sinonimo\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sarrera fitxategi sintaxia:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1164,8 +1063,8 @@
 "  -P, --properties-input      sarrera fitxategia Java .properties sintaxian "
 "dago\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1174,17 +1073,17 @@
 "      --stringtable-input     sarrera fitxategia NeXTstep/GNUstep .strings "
 "sintaxian dago\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1193,25 +1092,25 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, 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:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1219,97 +1118,97 @@
 "  -E, --escape                C ihesak erabili irteeran, ez hedatutako "
 "karaktereak\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ZENBAKIA        irteera orri zabalera ezarri\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1318,52 +1217,52 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1371,8 +1270,8 @@
 "  -P, --properties-input      sarrera fixtategiak Java .properties sintasian "
 "daude\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1381,40 +1280,40 @@
 "      --stringtable-input     sarrera fitxategiak NeXTstep/GNUstep .strings\n"
 "                              sintaxian daude\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=IZENA         irteeraren kodeketa\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "zehazki 2 sarrera fitxategi behar dira"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Erabilera: %s [AUKERA] def.po ref.pot\n"
@@ -1440,12 +1339,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     iturburura erreferentziak\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operazio aldagaiak:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1453,7 +1352,7 @@
 msgstr ""
 "  -m, --multi-domain          ref.pot ezarri def.po-ko domeinu bakoitzean\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ez erabili zalantza parekatzea\n"
@@ -1478,17 +1377,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "mezu hau itzultzaile batek gainbegiratu behar du"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "mezu hau erabilia baina definitu gabe daago..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...baina definizio hau oso antzekoa da"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "mezu hau erabilia dago baina ez dago %s-en ezarria"
@@ -1498,19 +1397,19 @@
 msgid "warning: this message is not used"
 msgstr "oharra: mezu hau ez da erabiltzen"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "behintza bi fitxategi ezarri behar dira"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1518,83 +1417,82 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --keep-header           utzi goiburua eraldatu gabe, ez berau iragazi\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Itzulpen katalogo bat karaktere kodeketa ezberdin batera bihurtzen du.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Bihurtze helburua:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Lehenetsiriko kodeketa uneko lokalaren kodeketa da.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kokadun irteera estiloa\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           kendu '#: filename:line' lerroak\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          mantendu '#: filename:line' lerroak "
 "(lehenetsia)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "zehazki sarrera fitxategi bat behar da"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Erabilera: %s [AUKERA] SAR_FITXATEGIA\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1603,7 +1501,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   sarrera PO edo POT fitxategia\n"
@@ -1635,7 +1533,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       sarrera PO fitxategia\n"
@@ -1645,45 +1543,50 @@
 msgid "write to stdout failed"
 msgstr "huts irteera estandarrean idaztean"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "huts %s azpiprozesuan idaztean"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "iragazki izena falta da"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] IRAGAZKIA [IRAGAZKI-AUKERA]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "IRagazkia ezarri itzulpen guztiei edo itzulpen katalogo bati.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1691,129 +1594,106 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             ez erabili C ihesak irteeran (lehenespena)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           utzi goiburua eraldatu gabe, ez berau iragazi\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s-ek \"-d directory\" ezarpen bat behar du"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s eta %s ez dira bateragarriak"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s bakarrik %s edo %s-rekin da erabilgarria"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s bakarrik %s, %s edo %s-rekin da erabilgarria"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "itzulitako kate %d"
 msgstr[1] "%d itzulitako kate"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", zalantzan kate %d"
 msgstr[1] ", %d kate zalantzan"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1822,17 +1702,17 @@
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
 "Antzekoa aukerako argumentuentzat.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1841,7 +1721,7 @@
 "  -j, --java                  Java modua: Java ResourceBundle klase bat "
 "sortu\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1850,20 +1730,20 @@
 "      --java2                 --java bezala ,  bain Java2 erabiliaz (JDK 1.2 "
 "edo altuagoa)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1871,39 +1751,33 @@
 "      --tcl                   Tcl modua: tcl/msgcat .msg fitxategi bat "
 "sortu\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Irteera fitxategi kokapena java moduan:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1912,16 +1786,7 @@
 "  -l, --locale=LAKALA         lokal izena, edo hizkunzta edo "
 "hizkutza_NAZIOA\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
-"bat da\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -1929,7 +1794,7 @@
 "  -d DIRECTORY                klse direktorio ierarkiaren oinarri "
 "direktorioa\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1943,37 +1808,37 @@
 "azpian\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Irteera fitxategi kokalekua C# moduan:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Irteera fitxategi kokapena Tcl moduan:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1983,43 +1848,12 @@
 "direktorioan\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2027,33 +1861,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2061,27 +1895,18 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             zalantzazko kateak erabili irteeran\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2089,91 +1914,80 @@
 "      --no-hash               fitxategi bitarrak ez du hash taula "
 "barneratuko\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            itzulpenaren estatistikak inprimatu\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               handitu argibide maila\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "oharra: PO fitxategi goiburua falta edo baliogabea da\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "oharra: karaktere joko bihurketak ez du funtzionatuko\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "oharra: PO fitxategi burua nahasirik\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "\"%s\" domeinu izena ez da fixtategi izen bezala erabili"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "`domain %s' direktiba alde batetara utziko da"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "hutsik dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2182,14 +1996,14 @@
 "'%c' aukera ezin da erabili 'J' , 'K' , 'T' , 'C' edo 'X' ezarria izan "
 "ondoren"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2229,7 +2043,7 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2237,17 +2051,17 @@
 "      --escape                C ihesak erabili irteeran, ez hedatutako "
 "karaktereak\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          fitxategi kokapenez ordenatu\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2257,7 +2071,7 @@
 "ezarri LANG ingurune aldagaia, ABOUT-NLS fitxategian azaltzen\n"
 "den moduan.  HAu beharrezkoa da itzulpenak probatu ahal izateko.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2268,12 +2082,12 @@
 "Mesedez ezarri locale-a --locale aukeraren bidez edo irteera\n"
 ".po fitxategia --output-file fitxategiaren bidez.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s-ek sortua .\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2282,12 +2096,12 @@
 "PO fitxategi berri bat sortu, meta informazioa erabiltzailearen inguruneko balioez\n"
 "abiarazten.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=SAR_FITXATEGIA       sarrera POT fitxategia\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2298,26 +2112,26 @@
 "fitxategiaren bila.\n"
 "berau - bada, sarrera estandarra irakurriko da\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FITXATEGIA      idatzi irteera ezarritako PO "
 "fitxategian\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          helburu locale-a ezarri\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2325,7 +2139,7 @@
 "      --no-translator         PO fitxategia automatikoki sortu dela "
 "pentsatu\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2333,12 +2147,12 @@
 ".pot fitxategi bat baino gehiago topatu da.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "errorea uneko direkotrioa irakurtzerakoan"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2346,14 +2160,14 @@
 "Ez da uneko direkotrioan .pot fitxategirik aurkitu.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s azpiprozesuak %d irteera kodeaz huts egin du"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2370,7 +2184,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketearen Ingelesezko itzulpena"
@@ -2386,15 +2200,15 @@
 msgstr "bi karaktere joko ezberdin \"%s\" eta \"%s\" sarrera fitxategian"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "`%s' sarrera fitxategiak ez du karaktere joko ezarpena duen goibururik"
 
 #: src/msgl-cat.c:207
 #, fuzzy, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "s in s t a goiburua honekin a"
 
@@ -2404,8 +2218,8 @@
 msgstr "s da a."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
@@ -2527,46 +2341,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Hurrengoa erabiliaz saiatu, %s-rentzat baliagarria:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "mezu katalogoak plural moduko itzulpenak ditu"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "baina goiburuak ez du \"plural=ESPRESIOA\" atributurik"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "baina goiburuak ez du \"nplurals=ZENBAKI_OSO\" atributurik"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nplurals balio baliogabea"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "plural espresio baliogabea"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2574,59 +2388,64 @@
 "mezu katalogoak plural moduko iztuilpenak ditu, baina ez du \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" goiburuan"
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural kudeaketa GNU gettext hedapen bat da"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "`%s' goiburu eremua falta da goiburuan\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
 msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "`%s' goiburu eremua falta da goiburuan\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2643,8 +2462,8 @@
 msgstr ""
 "sarrera fitxategiak ez du karaktere jokoa ezartzen duen goiburu sarrerarik"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2660,8 +2479,8 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2670,16 +2489,16 @@
 "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
 "oinarriturik dago. Bertsio hau iconv() gabe erabili zen."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s %s-rekin bakarrik da baliozkoa"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "babeskopia mota"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2693,24 +2512,24 @@
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2720,27 +2539,27 @@
 "                              ez egin ezer def.po dagoeneko eguneraturik "
 "badago\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Irteera fitxategi kokapena eguneraketa moduan:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Emaiztak berriz def.po fitxategian idatziko dira.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po-ren babeskopia bat egin\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AURRIZKI      gainidatzi babeskopia aurrizki arrunta\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2752,44 +2571,44 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       kendu aurrerapen erakusleak\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "mezu honek plural moduak ezarri behar ditu"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "uneko"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2892,7 +2711,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                idatzi uniforum zehatz estiloan\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2905,13 +2724,13 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 "  -d, --repeated              errepikaturiko mezuak bakarrik inprimatu\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2934,7 +2753,7 @@
 "\"%s\" karaktere jokoa ez da kodeketa izen aldagarri bat.\n"
 "Mezu bihurtzeak ez du funtzionatuko erabiltzailearen karaktere jokoarekin.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2944,7 +2763,7 @@
 "dago,\n"
 "eta iconv() -ek ez du \"%s\" onartzen.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2952,15 +2771,15 @@
 "GNU libiconv instalatu ondoren GNU gettext berrinstalatzeak\n"
 "arazo hau konpon dezake.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Jarraitu ala ere, analisi erroreak itxoin"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Jarraitu ala ere."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2969,7 +2788,7 @@
 "Ez da \"%s\" karaktere jokoa onartzen %s iconv() -en oinarritua dago.\n"
 "Bertsio hau iconv() gabe eraiki zen.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2982,27 +2801,27 @@
 msgid "inconsistent use of #~"
 msgstr "#~ -ren erabilera okerra"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' atala falta da"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "`msgid_plural' atala falta da"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "`msgstr' atala falta da"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "lehen plural moduak zero ez den indize bat du"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural moduak okerreko indize bat du"
@@ -3012,7 +2831,7 @@
 msgid "too many errors, aborting"
 msgstr "errore gehiegi, uzten"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "multibyte sekuentzia baliogabea"
@@ -3056,16 +2875,16 @@
 msgid "context separator <EOT> within string"
 msgstr "kontestu bereizlea <EOT> katerik gabe"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "bikoizturiko mezu definizioa"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "hau da lehen definizioaren kokalekua"
 
@@ -3140,12 +2959,12 @@
 "Sarrera testua sarrera estandarretik irakurtzen da. Bihurturiko testua\n"
 "irteera estandarrera aterako da\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "sarrera ez da baliozkoa \"%s\" kodeketan"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "errorea \"%s\" kodeketatik  \"%s\" kodeketara formatua bihurtzean"
@@ -3169,21 +2988,11 @@
 "URL batetako edukiak eskuratu eta atera.  URL-a ezin bada ebatzi,\n"
 "lokalki eskuragarri dagoen FITXATEGIA erabiliko da.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "errorea \"%s\" irakurtzean"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "errorea irteera estandarrean idazterakoan"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "errorea \"%s\" irakurri ondoren"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3260,19 +3069,19 @@
 msgid "compilation of C# class failed"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ez da baliozko java klase izena: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3284,18 +3093,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "multibyte sekuentzia baliogabea"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internazionalizatutako kateek ezin dute `\\%c' ihes sekuentzia eduki"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3309,7 +3113,7 @@
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3381,7 +3185,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "formateatu t n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
@@ -3391,22 +3195,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "s l"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr "ASCII katea s s Nork n"
@@ -3439,7 +3238,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
@@ -3451,7 +3250,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
@@ -3471,22 +3270,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3500,61 +3289,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "s l katea"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "ASCII katea s s Nork n"
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr "s l Baliogabea Nork n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr "s l osatu gabea Nork n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr "s l Osatugabea - Nork n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr "s l Osatugabea - Nork n"
-
-#: src/x-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr "s l Baliogabea Nork n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "s l katea"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "s l katea"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3591,14 +3325,14 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\U\") 8bit-eko karakterean\"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 #, 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:324
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3606,7 +3340,7 @@
 "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:341
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3614,7 +3348,7 @@
 "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:354
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3622,7 +3356,7 @@
 "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:364
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3630,7 +3364,7 @@
 "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:397
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3638,7 +3372,7 @@
 "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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
@@ -3667,38 +3401,28 @@
 "%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
 "arrazoiegatik ; eval_gettext erabili horren ordez"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "s l katea"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3707,12 +3431,12 @@
 "  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po "
 "ordez)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3720,13 +3444,13 @@
 "  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko "
 "dira\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3734,8 +3458,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=IZENA        ezarritako hizkuntza ezagutu\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3745,12 +3468,12 @@
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3759,7 +3482,7 @@
 "Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
 "da.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3768,24 +3491,24 @@
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3795,24 +3518,23 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Java,C#, awk, "
@@ -3820,22 +3542,14 @@
 "                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:937
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java,C#, awk, "
-"Tcl,\n"
-"                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
-"bakarrik)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3843,14 +3557,13 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Java,C#, awk, "
@@ -3858,38 +3571,38 @@
 "                                Tcl, Perl, PHP, GCC-source hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3897,17 +3610,17 @@
 "      --debug                 kate formatu atzemateari buruzko informazio "
 "hedatuagoa\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3915,17 +3628,17 @@
 "      --foreign-user          alde batera utzi FSF copyright-a kanpoko "
 "erabiltzaileen irteeran\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3933,7 +3646,7 @@
 "      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte "
 "helbidea ezarri\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3943,7 +3656,7 @@
 "  -M, --msgstr-prefix[=KATEA]  KATEA erabili edo \"\" aurrizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3953,7 +3666,7 @@
 "  -M, --msgstr-suffix[=KATEA]  KATEA erabili edo \"\" atzizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3961,45 +3674,45 @@
 msgstr ""
 "--flag argumentuak ez du <hitz-ako>:<argzenb>:[pasa-]<badera> sintasia: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: oharra: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4008,7 +3721,7 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4018,32 +3731,31 @@
 "gettext(\"\")-ek meta informazioa duen goiburua\n"
 "itzultzen du, ez date hutsa.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4052,9 +3764,9 @@
 "MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
 "--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
 
 #: libgettextpo/gettext-po.c:84
@@ -4067,6 +3779,21 @@
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
 
+#~ msgid "Not yet implemented."
+#~ msgstr "Oraindik ez da onartzen."
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "Huts %s azpiprozesua irakurtzerakoan"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' eremuak oraindik hasierako balioa du\n"
+
 #, fuzzy
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Anizkoitza nori k."
@@ -4084,15 +3811,6 @@
 #~ "ezta EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO "
 #~ "ERABILTZEKO.\n"
 
-#~ msgid "Not yet implemented."
-#~ msgstr "Oraindik ez da onartzen."
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "`%s' eremuak oraindik hasierako balioa du\n"
-
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the C# .dll format doesn't support contexts\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/fi.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/fi.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/fi.po gettext-0.18.1.1/gettext-tools/po/fi.po
--- gettext-0.19.3/gettext-tools/po/fi.po	2014-10-16 06:04:21.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/fi.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,17 +1,16 @@
 # Finnish translations for GNU Gettext package.
 # This file is distributed under the same license as the gettext package.
-# Copyright © 2002, 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+# Copyright © 2002, 2009 Free Software Foundation, Inc.
 # Sami J. Laine <sami.laine@iki.fi>, 2002
 # Lauri Nurmi <lanurmi@iki.fi>, 2009
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010, 2013-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-06-22 14:08+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2009-06-06 20:36+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -22,75 +21,75 @@
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "virheellinen argumentti %s kontekstille %s"
+msgstr "virheellinen argumentti %s %s:lle"
 
+# Vähän huono käyttää taivutuspäätettä, mutta jälkimmäinen %s voinee
+# viitata moneenkin asiaan.
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "argumentti %s kontekstille %s ei ole yksiselitteinen"
+msgstr "moniselitteinen argumentti %s %s:lle"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Kelvolliset argumentit ovat:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
-"tilapäisen hakemiston löytäminen epäonnistui, yritä asettaa $TMPDIR-muuttuja"
 
-#: gnulib-lib/clean-temp.c:339
-#, c-format
+#: gnulib-lib/clean-temp.c:349
+#, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr ""
-"tilapäisen hakemiston luominen mallinnetta ”%s” käyttämällä epäonnistui"
+msgstr "ei voi luoda putkea"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
-msgstr "väliaikaistiedoston %s poistaminen epäonnistui"
+msgstr "väliaikaistiedostoa %s ei voi poistaa"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "tilapäisen hakemiston %s poistaminen epäonnistui"
+msgstr ""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "kirjoitusvirhe"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr "säilytetään käyttöoikeudet kohteelle %s"
-
-#: gnulib-lib/copy-file.c:189
-#, c-format
-msgid "error while opening %s for reading"
-msgstr "virhe avattaessa tiedostoa %s lukemista varten"
+msgid "error while opening \"%s\" for reading"
+msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "varmuuskopiotiedoston %s avaaminen kirjoittamista varten epäonnistui"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "ei voida avata varmuuskopiotiedostoa ”%s” kirjoittamista varten"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "virhe luettaessa tiedostoa %s"
+msgid "error reading \"%s\""
+msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "virhe kirjoitettaessa tiedostoa %s"
+msgid "error writing \"%s\""
+msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "virhe tiedoston %s lukemisen jälkeen"
+msgid "error after reading \"%s\""
+msgstr "virhe tiedoston ”%s” lukemisen jälkeen"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -107,203 +106,162 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: valitsin ”%s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
+msgstr "%s: valitsin ”%c%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tunnistamaton valitsin ’--%s’\n"
+msgstr "%s: tuntematon valitsin ”--%s”\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
+msgstr "%s: tuntematon valitsin ”%c%s”\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: virheellinen valitsin -- ’%c’\n"
+msgstr "%s: virheellinen valitsin – %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
+msgstr "%s: valitsin vaatii argumentin – %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
+msgstr "%s: valitsin ”-W %s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
+msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
+msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "tiedoston ”%s” luominen epäonnistui"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
-#, c-format
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
+#, fuzzy, c-format
 msgid "error while writing \"%s\" file"
-msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
+msgstr "virhe kirjoitettaessa ”%s”"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr ""
-"Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta muuttuja $JAVAC"
+msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr ""
-"Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta muuttuja $JAVA"
+msgstr "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
-#, c-format
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
+#, fuzzy, c-format
 msgid "%s subprocess I/O error"
-msgstr "%s aliprosessisiirräntävirhe"
+msgstr "%s aliprosessi"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr "muisti loppui"
-
-#  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "lukeminen aliprosessista %s epäonnistui"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "viestintä aliprosessin %s kanssa epäonnistui"
+msgstr "muisti loppu"
 
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s aliprosessi päättyi poistumiskoodilla %d"
+msgid "cannot create pipe"
+msgstr "ei voi luoda putkea"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "”"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "putken luominen epäonnistui"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle epäonnistui"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "epäonnistunut tiedostotunnisteen %d palautus: dup2 epäonnistui"
+msgstr "ei voi luoda putkea"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -316,139 +274,110 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "’%s’ ei ole kelvollinen %s-muotomerkkijono, toisin kuin ’%s’. Syy: %s"
+msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"muotomäärittelyä argumentille %u sellaisena kuin merkkijonossa ’%s’, ei ole "
-"olemassa merkkijonossa ’%s’"
+msgstr "muotomäärittelyä argumentille %u ei ole olemassa 'msgid':lle '%s':ssä"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "muotomäärittelyä argumentille %u ei ole merkkijonossa ’%s’"
+msgstr "muotomäärittely argumentille %u ei ole '%s':ssä"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
-"argumentille %u"
+"muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä argumentille %u ei ole sama"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Direktiivinumero %u alkaa merkillä | mutta ei pääty merkkeihin |."
+msgstr ""
 
-#  Sanalla token on eri merkityksiä eri asiayhteyksissä. Tässä otaksun, että kyse on merkkijonosta, joka ei sisällä tyhjemerkkejä (välilyöntejä)
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"Direktiivinumerossa %u merkkijono merkin ’<’ jäljessä ei ole "
-"muotomääritemakron nimi. Kelvolliset makronimet luetellaan ISO C 99 luvussa "
-"7.8.1"
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
-"Direktiivissä numero %u merkin ’<’ jäljessä olevaa merkkijonoa ei seuraa "
-"merkki ’>’."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
-"Merkkijono viittaa argumenttiin numero %u, mutta ohittaa argumentin numero "
-"%u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr ""
-"muotomäärittelyiden määrä merkkijonossa ’%s’ ja merkkijonossa ’%s’ ei täsmää"
+msgstr "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä ei täsmää"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Direktiivissä numero %u argumenttinumeroa ei ole merkin ’{’ jäljessä."
+msgstr ""
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "Direktiivissä numero %u numeroa ei ole merkin ’,’ jäljessä."
+msgstr ""
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"Merkkijono loppuu keskellä direktiiviä: löytyi ’{’ ilman päättävää suljetta "
-"’}’."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Direktiivi numero %u päättyy virheelliseen merkkiin ’%c’ eikä sulkeeseen ’}’."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
-"Direktiivi numero %u päättyy virheelliseen merkkiin eikä sulkeeseen ’}’."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"Merkkijono alkaa keskeltä direktiiviä: löytyi ’}’ ilman alkusuljetta ’{’."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
-"Merkkijono sisältää yksinäisen ’}’-merkin direktiivinumeron %u jäljessä."
 
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "Direktiivissä numero %u lippuyhdistelmä on virheellinen."
+msgstr ""
 
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "Direktiivissä numero %u tarkkuus ei ole sallittu ennen merkkiä ’%c’."
+msgstr ""
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -456,7 +385,6 @@
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
-"Direktiivissä numero %u argumenttinumeron tarkkuuden on oltava sama kuin %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
@@ -464,57 +392,42 @@
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"Direktiivissä numero %u tarkkuusmäärittely ei ole sallittu ennen merkkiä "
-"’%c’."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "Direktiivissä numero %u tarkkuusmäärittely on virheellinen."
+msgstr ""
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "Direktiivissä numero %u lippuja ei sallita ennen merkkiä ’%c’."
+msgstr ""
 
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "’%s’ käyttää %%m, mutta ’%s’ ei käytä"
+msgstr ""
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "’%s’ ei käytä %%m, mutta ’%s’ käyttää %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "’%s’ käyttää %%C, mutta ’%s’ ei käytä"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "’%s’ ei käytä %%C, mutta ’%s’ käyttää %%C"
+msgstr ""
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "Merkkijono loppuu keskellä direktiiviä."
+msgstr ""
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"Merkkijono viittaa argumentteihin sekä absoluuttisien argumenttinumeroiden "
-"avulla että numeroimattomien argumenttimäärittelyjen avulla."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
-"Direktiivissä numero %u argumenttinumero 0 ei ole positiivinen kokonaisluku."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -522,8 +435,6 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"Direktiivissä numero %u leveyden argumenttinumero 0 ei ole positiivinen "
-"kokonaisluku."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -531,15 +442,13 @@
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
-"Direktiivissä numero %u tarkkuuden argumenttinumero 0 ei ole positiivinen "
-"kokonaisluku."
 
 #: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
-msgstr "Direktiivissä numero %u merkki ’%c’ ei ole kelvollinen muunnosmäärite."
+msgstr ""
 
 #: src/format-invalid.h:37
 #, c-format
@@ -547,14 +456,11 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"Merkki, joka päättää direktiivin numeron %u ei ole kelvollinen "
-"muunnosmäärite."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
-"Merkkijono viittaa argumenttinumeroon %u yhteensopimattomilla tavoilla."
 
 #: src/format-java.c:240
 #, c-format
@@ -562,20 +468,17 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen päivämäärä- "
-"tai aikatyyli."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "Direktiivissä numero %u pilkku ei seuraa merkkijonoa ”%s”."
+msgstr ""
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
-"Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen numerotyyli."
 
 #: src/format-java.c:323
 #, c-format
@@ -583,13 +486,11 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"Direktiivissä numero %u argumenttinumeroa ei seuraa pilkku tai yksi "
-"seuraavista: ”%s”, ”%s”, ”%s”, ”%s”."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "Direktiivissä numero %u valinta ei sisällä numeroa."
+msgstr ""
 
 #: src/format-java.c:583
 #, c-format
@@ -597,29 +498,24 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"Direktiivissä numero %u valinta sisältää numeron, jota ei seuraa ’<’, ’#’ "
-"eikä ’%s’."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"muotomäärittelyä argumentille {%u}, kuten merkkijonossa ’%s’, ei ole "
-"merkkijonossa ’%s’"
+msgstr "muotomäärittely argumentille {%u}, kuten '%s':ssä, ei ole 'msgid':ssä"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "muotomäärittelyä argumentille {%u} ei ole merkkijonossa ’%s’"
+msgstr "muotomäärittely argumentille {%u} ei ole '%s':ssä"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
-"argumentille {%u}"
+"muotomäärittelyt 'msgid':ssä ja '%s':ssä argumentille {%u} eivät ole samat"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -628,8 +524,6 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"Direktiivissä numero %u parametri %u on ’%s’-tyyppinen, mutta odotettiin "
-"’%s’-tyyppistä parametriä."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -640,37 +534,33 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"Direktiivissä numero %u annettiin liian monia parametreja; odotettiin "
-"korkeintaan %u parametri."
 msgstr[1] ""
-"Direktiivissä numero %u annettiin liian monia parametreja; odotettiin "
-"korkeintaan %u parametria."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "Direktiivissä numero %u merkkiä ’%c’ ei seuraa luku."
+msgstr ""
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "Direktiivissä numero %u argumentti %d on negatiivinen."
+msgstr ""
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "Merkkijono loppuu keskellä ~/.../-direktiiviä."
+msgstr ""
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Löytyi ’~%c’ ilman täsmäävää ’~%c’."
+msgstr ""
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "Direktiivissä numero %u annettiin sekä @- että :-määritteet."
+msgstr ""
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -678,33 +568,26 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"Direktiivissä numero %u merkkien ’~:[’ jäljessä ei ole kaksi lausetta, jotka "
-"on eroteltu merkeillä ’~;’."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
-"Direktiivissä numero %u merkkejä ’~;’ käytetään virheellisessä paikassa."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
-"Merkkijono viittaa johonkin argumenttiin yhteensopimattomilla tavoilla."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr ""
-"muotomäärittelyt merkkijonossa ’%s’ ja merkkijonossa ’%s’ eivät ole "
-"yhdenmukaiset"
+msgstr "muotomäärittelyt 'msgid' ja '%s' eivät ole yhdenmukaiset"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
-"muotomäärittelyt merkkijonossa ’%s’ eivät ole merkkijonon ’%s’ "
-"muotomäärittelyiden osajoukko"
+"muotomäärittelyt '%s':ssä eivät ole 'msgid':n muotomäärittelyiden osajoukko"
 
 #: src/format-perl.c:433
 #, c-format
@@ -712,90 +595,51 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"Direktiivissä numero %u kokomäärittelijä on yhteensopimaton "
-"muunnosmäärittelijän ’%c’ kanssa."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "muotomäärittelyä argumentille ’%s’ ei löydy merkkijonosta ’%s’"
+msgstr "muotomäärittelyä argumentille '%s' ei löyty '%s':stä"
 
 #: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
-"Merkkijono viittaa argumentteihin sekä argumenttinimien että nimettömien "
-"argumenttimäärittelyjen avulla."
 
 #: 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:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta, "
-"muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa"
+"muotomäärittelyt 'mdgid':ssä edellyttävät kartoitusta, määrittelyt '%s':ssä "
+"edellyttävät "
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa, "
-"muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta"
+"muotomäärittelyt 'msgid':ss' edellyttävät järjestettyä joukkoa, määrittelyt "
+"'%s':ss' edellyttävät "
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr ""
-"muotomäärittelyä argumentille ’%s’, kuten merkkijonossa ’%s’:ssä, ei löydy "
-"merkkijonosta ’%s’"
+msgstr "muotomäärittelyä argumentille '%s', kuten '%s':ssä, ei löydy "
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
-"argumentille ’%s’"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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."
+"muotomäärittely 'msgid':ssä ja '%s':ssä argumentille '%s' eivät ole samat"
 
 #: src/format-qt.c:152
 #, c-format
@@ -803,53 +647,47 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"’%s’ on yksinkertainen muotomerkkijono, mutta ’%s’ ei ole: se sisältää ’L’-"
-"lipun tai kaksilukuisen argumenttinumeron"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jolla on ei-ASCII-nimi."
+msgstr ""
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Merkkijono viittaa komentoikkunamuuttujaan, jolla on mutkikas "
-"aaltosulkusyntaksi. Tämä syntaksi on tukematon turvallisuussyistä."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"Merkkijono viittaa komentoikkunamuuttujaan, jonka arvo saattaa olla "
-"erilainen komentoikkunafunktioiden sisällä."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jolla on tyhjä nimi."
+msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "Direktiivissä numero %u merkki ’%c’ ei ole luku välillä 1...9."
+msgstr ""
 
 #: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
-msgstr "Merkki, joka päättää direktivin numero %u ei ole luku välillä 1...9."
+msgstr ""
 
 # Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -857,101 +695,103 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
+"Tekijänoikeudet © %s Free Software Foundation, Inc.\n"
 "Lisenssi GPLv3+: GNU GPL versio 3 tai myöhempi <http://gnu.org/licenses/gpl.html>\n"
 "Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
 "Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Kirjoittanut %s.\n"
+msgstr "Kirjoittanut %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Komento ’%s --help’ antaa lisää tietoja.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Komento ”%s --help” antaa lisää tietoja.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Näytä laitteen konenimi.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Tulosteen muoto:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 lyhyt tietokonenimi\n"
+msgstr ""
 
-#: src/hostname.c:224
-#, c-format
+#: src/hostname.c:222
+#, fuzzy, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          pitkä tietokonenimi, sisältää kokonaan "
-"kelpuutetun\n"
-"                                verkkoaluenimen ja aliakset\n"
+"Tulostuksen muoto:\n"
+"  -s, --short           lyhyt isäntänimi\n"
+"  -f, --fqdn, --long    pitkä isäntänimi, sisältää täyden domain-nimen ja\n"
+"                        sen mahdolliset lisänimet\n"
+"  -i, --ip-address      osoitteet isäntänimelle\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            osoitteet tietokoneelle\n"
+msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Selittävä tuloste:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, 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/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
@@ -960,279 +800,240 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
-"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
-"org>.\n"
-"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists."
-"sourceforge.net>.\n"
+"Ilmoita ohjelmiston vioista osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
+"Ilmoita suomennoksen vioista listalle <translation-team-fi@lists.sourceforge."
+"net>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "ei saatu tietokonenimeä"
+msgstr "ei saatu isäntänimeä"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
+msgstr "%s ja %s ovat toisensa poissulkevia"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"Suodattaa käännösluettelon viestit niiden attribuuttien mukaan,\n"
-"ja manipuloi attribuutteja.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
-msgstr "Syötetiedostosijainti:\n"
+msgstr ""
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  SYÖTETIEDOSTO               syötteen PO-tiedosto\n"
+msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=HAKEMISTO   lisää HAKEMISTO syötetiedostojen "
-"hakuluetteloon\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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"
+msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Tulostetiedostosijainti:\n"
+msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Tulokset kirjoitetaan vakiotulosteeseen, jos tulostetiedostoa ei ole "
-"määritelty\n"
-"tai jos se on -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Viestivalinta:\n"
+msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            pidä käännetyt, poista kääntämättömät viestit\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          pidä kääntämättömät, poista käännetyt viestit\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              poista ’fuzzy’-merkityt vajaat viestit\n"
+msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            pidä ’fuzzy’-merkityt vajaat viestit\n"
+msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           poista vanhentuneet #~ -viestit\n"
+msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         pidä vanhentuneet #~ -viestit\n"
+msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Attribuuttimanipulointi:\n"
+msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             aseta kaikki viestit vajaiksi\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           aseta kaikki viestit epävajaiksi\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          aseta kaikki viestit vanhentuneiksi\n"
+msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        aseta kaikki sanomat ei-vanhentuneiksi\n"
-
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
 msgstr ""
-"      --previous              kun asetetaan vajaiksi, säilytä käännettyjen\n"
-"                              viestien aikaisemmat msgid-merkkijonot\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
-"      --clear-previous        poista \"previous msgid\" kaikista viesteistä\n"
-
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 poistettaessa ’fuzzy’-merkityt vajaat viestit "
-"poista myös tyhjä msgstr\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=TIEDOSTO.po manipuloi vain rivejä, jotka on luetteloitu "
-"tiedostossa TIEDOSTO.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=TIEDOSTO.po manipuloi vain rivejä, joita ei ole "
-"luetteloitu tiedostossa TIEDOSTO.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
-"      --fuzzy                 synonyymi valitsimelle --only-fuzzy --clear-"
-"fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              synonyymi valitsimelle --only-obsolete --clear-"
-"obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syötetiedoston syntaksi:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      syötetiedosto on Java .properties -"
-"syntaksissa\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input     syötetiedosto on NeXTstep/GNUstep .strings -"
-"syntaksissa\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Tulosteen yksityiskohdat:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1240,144 +1041,119 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 käytä aina värejä ja muita "
-"tekstiattribuutteja\n"
-"      --color=MILLOIN         käytä värejä ja muita tekstiattribuutteja, jos "
-"MILLOIN.\n"
-"                              MILLOIN saattaa olla ’always’, ’never’, "
-"’auto’, tai ’html’.\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa "
-"(oletus)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei "
-"laajennettuja merkkejä\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           älä kirjoita ’#: filename:line’ -rivejä\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                luo tiukasti Uniforum-yhteensopiva .po-"
-"tiedosto\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output     luo Java .properties -tiedosto\n"
+msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=NUMERO          aseta tulostesivun leveys\n"
+msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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               älä katkaise pitkiä viestirivejä, pitempiä "
-"kuin\n"
-"                              tulostesivun leveys, useammalle riville\n"
-
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           tuota lajiteltu tuloste\n"
+msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "määritelty mahdoton valintakriteeri (%d < n < %d)"
+msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, 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:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1386,130 +1162,100 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"Liittää ja yhdistää määritellyt PO-tiedostot.\n"
-"Etsii viestejä, jotka ovat yhteisiä kahdelle tai useammille määritellyille\n"
-"PO-tiedostoille. Käyttämällä valitsinta --more-than voidaan pyytää suurempaa\n"
-"yhteistä ominaisuutta ennen viestien tulostamista. Toisinpäin, valitsinta\n"
-"--less-than voidaan käyttää määrittelemään pienempää yhteistä ominaisuutta\n"
-"ennen tulostusta (ts. valitsin --less-than=2 tulostaa vain uniikit viestit).\n"
-"Käännökset, kommentit ja pistekommentit kumuloituvat, paitsi jos valitsin\n"
-"--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
-"joka on määritellyt ne.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  SYÖTETIEDOSTO ...           syötetiedostot\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"  -<, --less-than=NUMERO      tulosta viestit, joissa on vähemmän kuin näin "
-"monta\n"
-"                              määrittelyä. Oletus ääretön, jos ei ole "
-"asetettu\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  ->, --more-than=NUMERO      tulosta viestit, jossa on enemmän kuin näin "
-"monta\n"
-"                              määrittelyä. Oletus 0, jos ei ole asetettu\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                pikavalitsin valitsimelle --less-than=2, "
-"pyynnöille\n"
-"                              että vain uniikkeja viestejä tulostetaan\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      syötetiedostot ovat Java .properties -"
-"syntaksissa\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     syötetiedostot ovat NeXTstep/GNUstep .strings\n"
-"                              -syntaksissa\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=NIMI          koodaus tulosteelle\n"
+msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             käytä ensimmäistä käytettävissä olevaa "
-"käännöstä\n"
-"                              jokaiselle viestille, älä yhdistä useita "
-"käännöksiä\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=LUETTELONIMI     aseta ’Language’-kenttä otsakkeessa\n"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "syötetiedostoja ei annettu"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tarvitaan täsmälleen kaksi syötetiedostoa"
 
-#  Tiedostoihin ref.pot ja def.po viitataan muissa teksteissä, joten ne on paras jättää suomentamatta.
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Käyttö: %s [VALITSIN] def.po ref.pot\n"
+msgstr "Käyttö: %s [VALITSIN] tiedosto.po referenssi.pot\n"
 
 #: src/msgcmp.c:218
 #, c-format, no-wrap
@@ -1521,52 +1267,43 @@
 "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 ""
-"Vertaa kaksi Uniforum-tyylistä .po-tiedostoa tarkistaakseen, että molemmat\n"
-"sisältävät saman msgid-merkkijonojen joukon. Tiedosto def.po on olemassaoleva\n"
-"PO-tiedosto käännöksineen. Tiedosto ref.pot on viimeisin luotu PO-tiedosto, tai\n"
-"PO-mallinnetiedosto (jonka yleensä xgettext-ohjelma luo). Tämä on hyödyllinen\n"
-"tarkistettaessa että olet kääntänyt jokaisen viestin ohjelmassasi. Siellä missä\n"
-"ei löydetä tarkkaa täsmäystä, käytetään vajaustäsmäystä tuottamaan parempi\n"
-"diagnostiikka.\n"
 
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      käännökset\n"
+msgstr ""
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     viitteet lähteisiin\n"
+msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "Toimintomääreet:\n"
+msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
-"  -m, --multi-domain          käytä ref.pot-tiedostoa jokaiselle "
-"nimiavaruudelle tiedostossa def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     älä käytä vajaustäsmäystä\n"
+msgstr ""
 
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             ota huomioon vajausrivit\n"
+msgstr ""
 
 #: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      ota huomioon kääntämättömät rivit\n"
+msgstr ""
 
 #: src/msgcmp.c:324
 #, c-format
@@ -1576,42 +1313,41 @@
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "kääntäjän on katselmoitava tämä viesti"
+msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty..."
+msgstr ""
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...mutta tämä määrittely on samanlainen"
+msgstr ""
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
-"tätä viestiä käytetään, mutta sitä ei ole määritelty nimiavaruudessa %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "varoitus: tätä viestiä ei käytetä"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "on annettava vähintään kaksi tiedostoa"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1619,94 +1355,79 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Etsii viestejä, jotka ovat yhteisiä kahdelle tai useammille määritellyille\n"
-"PO-tiedostoille. Käyttämällä valitsinta --more-than voidaan pyytää suurempaa\n"
-"yhteistä ominaisuutta ennen viestien tulostamista. Toisinpäin, valitsinta\n"
-"--less-than voidaan käyttää määrittelemään pienempää yhteistä ominaisuutta\n"
-"ennen tulostusta (ts. valitsin --less-than=2 tulostaa vain uniikit viestit).\n"
-"Käännökset, kommentit ja pistekommentit säilytetään, paitsi jos valitsin\n"
-"--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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=NUMERO      tulostaa viestejä, joissa on enemmän kuin "
-"näin\n"
-"                              monta määrittelyä. Oletus 1, jos ei ole "
-"asetettu\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           älä kirjoita otsaketta, jossa on ’msgid \"\"’ -"
-"rivi\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Muuntaa käännösluettelon eri merkkikoodaukseen.\n"
+msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
-msgstr "Muunnoskohde:\n"
+msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Oletuskoodaus on nykyisen paikallisasetuksen koodaus.\n"
+msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                sisennetty tulostetyyli\n"
+msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           vaienna ’#: filename:line’ -rivit\n"
+msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          säilytä ’#: filename:line’ -rivit (oletus)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                tiukka Uniforum-tulostetyyli\n"
+msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "syötetiedostoa ei annettu"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tarvitaan täsmälleen yksi syötetiedosto"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Käyttö: %s [VALITSIN] SYÖTETIEDOSTO\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1714,20 +1435,16 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Luo englanninkielisen käännösluettelon. Syötetiedosto on viimeksi luotu\n"
-"englanninkielinen PO-tiedosto, tai PO-mallinnetiedosto (yleensä xgettext-\n"
-"ohjelman luoma). Kääntämättömät rivit liitetään käännökseen, joka on\n"
-"identtinen msgid-merkkijonolle.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  SYÖTETIEDOSTO               syötteen PO- tai POT-tiedosto\n"
+msgstr ""
 
 #: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr "puuttuva komentonimi"
+msgstr "puuttuva komento"
 
 #: src/msgexec.c:257
 #, c-format
@@ -1743,11 +1460,6 @@
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"Käyttää komentoa käännösluettelon kaikkiin käännöksiin.\n"
-"KOMENTO voi olla mikä tahansa ohjelma, joka lukee käännöksen\n"
-"vakiosyötteestä. Se kutsutaan kerran jokaisen käännöksen aikana.\n"
-"Se tulosteesta tulee msgexec-tuloste. Paluukoodi msgexec-ohjelmalle\n"
-"on kaikkien kutsujen maksimipaluukoodi.\n"
 
 #: src/msgexec.c:271
 #, c-format, no-wrap
@@ -1755,40 +1467,45 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Erityinen sisäinen komento nimeltä ’0’ tulostaa käännöksen ja nollatavun.\n"
+"Erityinen sisäinen komento nimeltä ”0” tulostaa käännöksen ja nollatavun.\n"
 "”msgexec 0”:n tuloste kelpaa syötteeksi ”xargs -0”:lle.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=SYÖTETIEDOSTO   syöte-PO-tiedosto\n"
+msgstr "  -i, --input=SYÖTETIED       syöte-PO-tiedosto\n"
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: src/msgfilter.c:298
-#, c-format
+#: src/msgexec.c:389
+#, fuzzy, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s aliprosessi epäonnistui"
+
+#: src/msgfilter.c:289
+#, fuzzy, c-format
 msgid "missing filter name"
-msgstr "puuttuva suodatinnimi"
+msgstr "ei riittävästi argumentteja"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "vähintään yksi sed-skripti on määriteltävä"
+msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] SUODATIN [SUODATTIMEN VALITSIN]\n"
 
-#: src/msgfilter.c:411
-#, c-format
+#: src/msgfilter.c:392
+#, fuzzy, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Soveltaa suodatinta kaikkiin käännösluettelon käännöksiin.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1798,154 +1515,125 @@
 "vakiosyötteestä\n"
 "ja kirjoittaa muutetun käännöksen vakiotulosteeseen.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Hyödylliset SUODATTIMEN VALITSIN-asetukset kun SUODATIN on ’sed’:\n"
+msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
-"  -e, --expression=SKRIPTI    lisää SKRIPTI suoritettaviin komentoihin\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=SKRIPTITIEDOSTO  lisää SKRIPTITIEDOSTOn sisältö suoritettaviin\n"
-"                                komentoihin\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       vaienna mallitilan automaattinen tulostus\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa "
-"(oletus)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                sisennetty tulostetyyli\n"
+msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           pidä otsake muokkaamattomana, älä suodata "
-"sitä\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "argumentti valitsimeen %s pitäisi olla yksittäinen välimerkki"
+msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "virheellinen endian-tyyppi: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "valitsin %s vaatii ”-d directory”-määrittelyn"
+msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "valitsin %s vaatii ”--template template”-määrittelyn"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "valitsin %s vaatii ”-o file”-määrittelyn"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "valitsimet %s ja %s ovat toisensa poissulkevia kohteessa %s"
+msgstr ""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
-#, c-format
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#, fuzzy, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "valitsin %s on kelvollinen vain valitsimen %s tai %s kanssa"
+msgstr "virheellinen argumentti ”%s” ”%s”:lle"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
-#, c-format
+#: src/msgfmt.c:484 src/msgfmt.c:490
+#, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "valitsin %s on kelvollinen vain valitsimen %s, %s tai %s kanssa"
+msgstr "virheellinen argumentti ”%s” ”%s”:lle"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, 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:749
+#: src/msgfmt.c:625
 #, 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:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
-"Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta "
+"Luo binäärimuotoisia viestiluetteloita tekstimuotoisesta "
 "käännöskuvauksesta.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1954,88 +1642,75 @@
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 "Valinnaiset argumentit vastaavasti.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Toimintatila:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Java-tila: tuota Java ResourceBundle -luokka\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 kuten --java, ja otaksu Java2 (JDK 1.2 tai "
-"uudempi)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C#-tila: tuota .NET .dll -tiedosto\n"
+msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C#-resurssitila: tuota .NET .resources -"
-"tiedosto\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
-
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               Työpöytä-syöttötila: tuota .desktop -tiedosto\n"
+msgstr "      --qt                    Qt-tila: luo Qt:n .qm-tiedosto\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                ota käyttöön tiukka Uniforum-tila\n"
+msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "Tulostetiedostosijainti Java-tilassa:\n"
+msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=RESURSSI     resurssinimi\n"
+msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2043,22 +1718,13 @@
 msgstr ""
 "  -l, --locale=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                tuota .java-tiedosto, eikä .class -tiedostoa\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
-"  -d HAKEMISTO                luokkien hakemistohierarkian perushakemisto\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2066,285 +1732,193 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Luokkanimi on määritelty liittämällä paikallisasetusnimi resurssinimeen ja\n"
-"erottamalla ne alaviivalla.  Valitsin -d on pakollinen.  Luokka on\n"
-"kirjoitettu määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "Tulostetiedostosijainti C#-tilassa:\n"
+msgstr ""
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
-"  -d HAKEMISTO                perushakemisto paikallisasetuksista "
-"riippuville .dll-tiedostoille\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"Valitsimet -l ja -d ovat pakollisia. Tiedosto .dll kirjoitetaan "
-"määriteltyyn\n"
-"alihakemistoon, jonka nimi riippuu paikallisasetuksesta.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Tulostetiedostosijainti Tcl-tilassa:\n"
+msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d HAKEMISTO                perushakemisto .msg-viestiluetteloille\n"
+msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg kirjoitetaan\n"
-"määriteltyyn hakemistoon.\n"
-
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Työpyötäsyöttötilan valitsimet:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d HAKEMISTO                .po-tiedostojen perushakemisto\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=WORD      etsi WORD-argumentti lisäavainsanana\n"
-"  -k, --keyword               älä käytä oletusavainsanoja\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Valitsimet -l, -o, ja --template ovat pakollisia.  Jos valitsin -D "
-"määritellään,\n"
-"syötetiedostot luetaan hakemistosta eikä komentoriviargumentteina.\n"
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Syötetiedoston tulkinta:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
 "domain\n"
 msgstr ""
-"  -c, --check                 suorita kaikki tarkistukset, jotka tehdään "
-"valitsimilla\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
-"      --check-format          tarkista kieliriippuvaiset muotomerkkijonot\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
-"      --check-header          tarkista otsakkeen olemassaolo ja sisältö\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          tarkista nimiavaruusdirektiivien ja "
-"valitsimen\n"
-"                                --output-file väliset ristiriidat\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   tarkista, että GNU msgfmt käyttäytyy kuin X/"
-"Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]  tarkista näppäimistöpikavalitsimien "
-"olemassaolo\n"
-"                                valikkoriveillä\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             käytä vajausmerkintöjä tulosteessa\n"
+msgstr "  -f, --use-fuzzy             käytä vajavuusmerkintöjä tulosteessa\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=NUMERO      tasaa merkkijonot NUMEROon tavuun (oletus: "
-"%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDER  kirjoita 32-bittisiä numeroita annetussa "
-"endian-\n"
-"                                tavujärjestyksessä (big tai little, oletus "
-"riippuu\n"
-"                                alustasta)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               binaaritiedosto ei sisällä hash-taulua\n"
+msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            tulosta tilastot käännöksistä\n"
+msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               kasvata laveustasoa\n"
+msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varoitus: PO-tiedoston otsake puuttuu tai on virheellinen\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "varoitus: merkistömuunnos ei tule toimimaan\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä"
+msgstr ""
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä: käyttää etuliitettä"
+msgstr ""
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "’nimiavaruus %s’-direktiivi ohitetaan"
+msgid "`domain %s' directive ignored"
+msgstr ""
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "tyhjä ’msgstr’-merkkijono jätetty huomioimatta"
+msgid "empty `msgstr' entry ignored"
+msgstr "tyhjä ”msgstr”-merkintä jätetty huomioimatta"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "vajaa ’msgstr’-merkkijono jätetty huomioimatta"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "vajaa ”msgstr”-merkintä jätetty huomioimatta"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s ei ole olemassa"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s on olemassa, mutta sen lukeminen epäonnistui"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"valitsinta ’%c’ ei voida käyttää ennen kuin ’J’ tai ’K’ tai ’T’ tai ’C’ tai "
-"’X’ on määritelty"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
-"Poimii käännösluettelosta kaikki viestit, jotka täsmäävät annettuun malliin\n"
-"tai kuuluvat johonkin annetuista lähdetiedostoista.\n"
 
-#  Pistekommentti viittaan kommenttiriviin, joka alkaa merkeillä "#. "
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2383,170 +1957,111 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 msgstr ""
-"Viestivalinta:\n"
-"  [-N LÄHDETIEDOSTO]... [-M NIMIAVARUUSNIMI]...\n"
-"  [-J MSGCTXT-MALLI] [-K MSGID-MALLI] [-T MSGSTR-MALLI]\n"
-"  [-C KOMMENTTIMALLI] [-X PISTEKOMMENTTIMALLI]\n"
-"Viesti on valittu, jos se tulee yhdestä määritellystä lähdetiedostoista,\n"
-"tai jos se tulee yhdestä määritellyistä nimiavaruuksista,\n"
-"tai jos -J on annettu ja sen konteksti (msgctxt) täsmää MSGCTXT-MALLIn kanssa,\n"
-"tai jos -K on annettu ja sen avain (msgid tai msgid_plural) täsmää MSGID-MALLIn kanssa,\n"
-"tai jos -T on annettu ja sen käännös (msgstr) täsmää MSGSTR-MALLIn kanssa,\n"
-"tai jos -C on annettu ja kääntäjän kommentti täsmää KOMMENTTIMALLIn kanssa,\n"
-"tai jos -X on annettu ja pistekommentti täsmää PISTEKOMMENTTIMALLIn kanssa.\n"
-"\n"
-"Kun useampi kuin yksi valintakriteeri määritellään, valittujen viestien\n"
-"joukko on valittujen viestien joka kriteerin yhdistelmä.\n"
-"\n"
-"MSGCTXT-MALLI tai MSGID-MALLI tai MSGSTR-MALLI tai KOMMENTTIMALLI tai\n"
-"PISTEKOMMENTTIMALLI -syntaksi:\n"
-"  [-E | -F] [-e MALLI | -f TIEDOSTO]...\n"
-"MALLIt ovat oletuksena perusäännöllisiä lausekkeita, tai laajennettuja\n"
-"säännöllisiä lausekkeita, jos valitsin -E on annettu, tai kiinteitä\n"
-"merkkijonoja, jos valitsin -F on annettu.\n"
-"\n"
-"  -N, --location=LÄHDETIED    valitse tiedostosta LÄHDETIED poimitut viestit\n"
-"  -M, --domain=NIMIAVARUUS    valitse kohteesen NIMIAVARUUS kuuluvat viestit\n"
-"  -J, --msgctxt               mallien alku msgctxt-merkkijonolle\n"
-"  -K, --msgid                 mallien alku msgid-merkkijonolle\n"
-"  -T, --msgstr                mallien alku msgstr-merkkijonolle\n"
-"  -C, --comment               mallien alku kääntäjän kommentille\n"
-"  -X, --extracted-comment     mallien alku pistekommentille\n"
-"  -E, --extended-regexp       MALLI on laajennettu säännöllinen lauseke\n"
-"  -F, --fixed-strings         MALLI on joukko rivinvaihdolla eroteltuja merkkijonoja\n"
-"  -e, --regexp=MALLI          käytä MALLIa säännöllisenä lausekkeena\n"
-"  -f, --file=TIEDOSTO         hanki MALLI TIEDOSTOsta\n"
-"  -i, --ignore-case           ohita erilainen kirjainkoko\n"
-"  -v, --invert-match          tulosta vain viestit, jotka eivät täsmää mihinkään\n"
-"                              valintakriteeriin\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei "
-"laajennettuja merkkejä\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           tuota lajiteltu tuloste\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
-"      --sort-by-file          lajitttele tuloste tiedoston sijainnin "
-"perusteella\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"Olet kielessä, joka poikkea ympäristöstäsi. Aseta LANG-\n"
-"ympäristömuuttuja, kuten kuvaillaan ABOUT-NLS-tiedostossa.\n"
-"Se on välttämätöntä, jotta voit testata käännöksiäsi.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 msgstr ""
-"Tulostetiedosto %s on jo olemassa.\n"
-"Määritä paikallisasetus valitsimen --locale tai\n"
-"tulosteen .po-tiedosot valitsimen --output-file avulla .\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
-msgstr "Luotu %s.\n"
+msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
-msgstr "Luo uuden PO-tiedoston alustaen meta-tiedot arvoilla käyttäjän ympäristöstä.\n"
+msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=SYÖTETIEDOSTO   syötteen POT-tiedosto\n"
+msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Jos syötetiedostoa ei anneta, nykyisestä hakemistosta etsitään POT-"
-"tiedosto.\n"
-"Jos se on -, luetaan vakiosyöte.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
-"  -o, --output-file=TIEDOSTO  kirjoita tuloste määriteltyyn PO-tiedostoon\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"Jos tulostetiedostoa ei ole annettu, se riippuu valitsimesta --locale tai "
-"käyttäjän\n"
-"paikkallisasetuksista. Jos se on -, tulokset kirjoitetaan "
-"vakiotulosteeseen.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          aseta kohdepaikallisasetus\n"
+msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         otaksu PO-tiedosto tuotetuksi automaattisesti\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Löytyi useampi kuin yksi .pot-tiedosto.\n"
-"Määritä syötteen .pot-tiedosto valitsimella --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
-msgstr "virhe luettaessa nykyistä hakemistoa"
+msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Nykyisestä hakemistosta ei löytynyt .pot-tiedostoa.\n"
-"Määritä syötteen .pot-tiedosto valitsimella --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
-#, c-format
+#, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "%s aliprosessi epäonnistui poistumiskoodilla %d"
+msgstr "%s aliprosessi epäonnistui"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2554,16 +2069,11 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Uuden viestiluettelon pitäisi sisältää sähköpostiosoitteesi, jotta käyttäjät "
-"voivat\n"
-"antaa sinulle palautetta käännöksistä, ja jotta ylläpitäjät voivat ottaa "
-"yhteyttä\n"
-"odottamattomissa teknisissä pulmissa.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Suomenkielinen käännös %s-paketille"
@@ -2571,36 +2081,34 @@
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 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"
+msgstr ""
 
 #: src/msgl-cat.c:188 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"
+msgstr ""
 
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "syötetiedostossa ’%s’ ei ole otsaketta, jossa on merkistömäärittely"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"nimiavaruus ”%s” syötetiedostossa ’%s’ ei sisällä otsaketta, jossa on "
-"merkistömäärittely"
 
 #: src/msgl-cat.c:391 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."
+msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "varoitus: "
@@ -2622,10 +2130,6 @@
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Syötetiedostot sisältävät viestejä eri koodauksista, %s ja %s muiden "
-"muassa.\n"
-"Muunnetaan tuloste UTF-8 -koodaukseen.\n"
-"Eri tulostekoodauksen valitsemiseksi käytä valitsinta --to-code.\n"
 
 #: src/msgl-cat.c:488
 #, c-format
@@ -2635,11 +2139,6 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"Tiedoston %s muunnos koodauksesta %s koodaukseen %s\n"
-"muuttaa joitakin msgid-merkkijonoja ja msgctxt-merkkijonoja.\n"
-"Vaihda joko kaikki msgid-merkkijonot ja msgctxt-merkkijonot puhtaaksi\n"
-"ASCII-tekstiksi, tai varmista että ne ovat UTF-8 -koodausta alusta alkaen,\n"
-"ts. jo lähdekooditiedostoissa.\n"
 
 #: src/msgl-charset.c:93
 #, c-format
@@ -2649,15 +2148,11 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Paikallisasetuksen merkistö \"%s\" eroaa\n"
-"syötetiedoston merkistöstä \"%s\".\n"
-"Tuloste ’%s’ saattaisi olla virheellinen.\n"
-"Mahdollisia kiertokeinoja ovat:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Aseta LC_ALL paikallisasetukseen, jonka koodaus on %s.\n"
+msgstr ""
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2666,11 +2161,6 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Muunna käännösluettelo po-tiedoston paikallisasetukseen %s käyttäen "
-"ohjelmaa 'msgconv',\n"
-"  käytä sitten ohjelmaa ’%s’,\n"
-"  muunna sitten takaisin po-tiedoston paikallisasetukseen %s käyttäen "
-"ohjelmaa 'msgconv'.\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2680,11 +2170,6 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Aseta muuttuja LC_ALL paikallisasetukseen koodauksella %s,\n"
-"  muunna käännösluettelo koodaukseen %s käyttäen ohjelmaa 'msgconv',\n"
-"  käytä sitten ohjelmaa ’%s’,\n"
-"  muunna sitten takaisin po-tiedoston merkistöön %s käyttäen ohjelmaa "
-"'msgconv'.\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2693,9 +2178,6 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Paikallisasetusmerkistö \"%s\" ei ole siirrettävä koodausnimi.\n"
-"’%s’-tuloste saattaa olla virheellinen.\n"
-"Mahdollinen kiertokeino on asettaa muuttujaan LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
@@ -2725,128 +2207,133 @@
 #: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "Yritä käyttää seuraavaa, kelvollinen kohteelle %s:"
+msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr "viestiluettelossa on monikkomuotoisia käännöksiä"
+msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "mutta otsakkeesta puuttuu attribuutti \"plural=LAUSEKE\""
+msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "mutta otsakkeesta puuttuu \"nplurals=KOKONAISLUKU\"-attribuutti"
+msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "virheellinen nplurals-arvo"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "virheellinen monikkolauseke"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"viestiluettelossa on monikkomuotoisia käännöksiä, mutta siitä puuttuu "
-"otsakerivi \"Plural-Forms: nplurals=KOKONAISLUKU; plural=LAUSEKE;\""
 
-#: src/msgl-check.c:611
-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:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, 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’"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:634
-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:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:652
-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:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, 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’"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:675
-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:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
+msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr-merkkijonossa on liian monta pikanäppäinmerkkiä ’%c’"
+msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "otsakekenttä ’%s’ on edelleen oletusarvossaan\n"
+msgid "header field `%s' missing in header\n"
+msgstr ""
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr ""
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "kenttä ”%s” on edelleen oletusarvossaan\n"
 
 #: 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"
+msgstr ""
 
 #: src/msgl-iconv.c:69
-#, c-format
+#, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: virhe muunnettaessa ”%s”-koodauksesta ”%s”-koodaukseen"
+msgstr "virhe avattaessa ”%s” lukemista varten"
 
 #: 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"
+msgstr "syötetiedosto ei sisällä merkistön määrittelevää otsakeriviä"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää "
-"funktiota iconv(), ja iconv() ei tue tätä muunnosta."
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2854,29 +2341,25 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Muunnos koodauksesta ”%s” koodaukseen ”%s” esitteli kaksoiskappaleita: "
-"jotkut eri msgid-merkkijonot ovat samoja."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää "
-"funktiota iconv(). Tämä versio on rakennettu ilman funktiota iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "valitsin %s on kelvollinen vain valitsimen %s kanssa"
+msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
-msgstr "varmuuskopiotyyppi"
+msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2889,69 +2372,52 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Yhdistää kaksi Uniform-tyylistä .po-tiedostoa.  Tiedosto def.po on\n"
-"olemassa oleva PO-tiedosto käännöksillä, jotka siirretään uudelleen\n"
-"luotuun tiedostoon niin kauan kuin ne täsmäävät; kommentit säilytetään,\n"
-"mutta pistekommentit ja tiedostosijainnit hylätään.  Tiedosto ref.pot\n"
-"on viimeisin luotu PO-tiedosto ajantasaisilla lähdekoodiviittauksilla, mutta\n"
-"vanhoilla käännöksillä, tai PO-mallinnetiedosto (jonka yleensä luo xgettext);\n"
-"kaikki käännökset ja kommentit tiedostossa hylätään, kuitenkin piste-\n"
-"kommentit ja tiedostosijainnit säilytetään.  Siellä missä ei löydetä\n"
-"tarkkaa täsmäystä, käytetään vajaustäsmäystä paremman tuloksen tuottamiseksi.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
-"  def.po                      käännökset, jotka viittaavat vanhoihin "
-"lähdekoodeihin\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     viittaa uusiin lähdekoodeihin\n"
+msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=TIEDOSTO   viestikäännösten lisäkirjasto,\n"
-"                              saatetaan määritellä useammin kuin kerran\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                päivitä tiedosto def.po,\n"
-"                              älä tee mitään, jos tiedosto def.po on jo ajan "
-"tasalla\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Tulostetiedostosijainti päivitystilassa:\n"
+msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "Tulos kirjoitetaan takaisin tiedostoon def.po.\n"
+msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=CONTROL        tee tiedoston def.po varmuuskopio\n"
+msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
-"      --suffix=LOPPULIITE     korvaa tavallisen varmuuskopioloppuliitteen\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2962,70 +2428,53 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Versionhallintamenetelmä voidaan valita valitsimen --backup tai\n"
-"ympäristömuuttujan VERSION_CONTROL avulla.  Tässä ovat arvot:\n"
-"  none, off       varmuuskopioita ei tehdä koskaan (vieläpä kun valitsin --"
-"backup on annettu)\n"
-"  numbered, t     tee numeroituja varmuuskopioita\n"
-"  existing, nil   numeroidaan, jos numeroituja varmuuskopioita esiintyy, "
-"muussa tapauksessa\n"
-"                  yksinkertainen\n"
-"  simple, never   tee aina yksinkertaisia varmuuskopioita\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Varmuuskopioloppuliite on ’~’, ellei ole asetettu valitsimella --suffix tai\n"
-"ympäristömuuttujalla SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              säilytä käännettyjen viestien aikaisemmat "
-"msgid-merkkijonot\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       vaienna edistymisindikaattorit\n"
+msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
-msgstr "tämän viestin pitäisi määritellä monikkomuodot"
+msgstr ""
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
-msgstr "tämän viestin ei pitäisi määritellä monikkomuotoja"
+msgstr ""
 
-#  Ensimmäinen parametri on joko tyhjä merkkijono tai rivinvaihto
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLuettu %ld vanhaa + %ld viitettä, yhdistettyjä %ld, vajaita %ld, puuttuvia "
-"%ld, vanhentuneita %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
 msgstr " valmis.\n"
 
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
-#, c-format
+#, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr ""
-"valitsin %s ja eksplisiittiset tiedostonimet ovat toisensa poissulkevia"
+msgstr "%s ja %s ovat toisensa poissulkevia"
 
 #: src/msgunfmt.c:427
 #, c-format
@@ -3044,13 +2493,11 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Java-tila: syöte on Java ResourceBundle -"
-"luokka\n"
 
 #: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                C#-tila: syöte on .NET .dll -tiedosto\n"
+msgstr ""
 
 #: src/msgunfmt.c:444
 #, c-format
@@ -3058,25 +2505,22 @@
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C#-resurssitila: syöte on .NET .resources -"
-"tiedosto\n"
 
 #: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Tcl-tila: syöte on tcl/msgcat .msg -tiedosto\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  TIEDOSTO ...                syötteen .mo -tiedostot\n"
+msgstr ""
 
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "Syötetiedostosijainti Java-tilassa:\n"
+msgstr ""
 
 #: src/msgunfmt.c:462
 #, c-format
@@ -3085,13 +2529,11 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Luokkanimi määritellään liittämällä paikallisasetuksen nimi resurssinimeen,\n"
-"erotettun alaviivalla. Luokka sijoitetaan käyttäen muuttujaa CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Syötetiedostosijainti C#-tilassa:\n"
+msgstr ""
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3099,13 +2541,11 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Valitsimet -l ja -d ovat pakollisia.  Tiedosto .dll sijoitetaan sellaisen\n"
-"hakemiston alihakemistoon, jonka nimi riippuu paikallisasetuksesta.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Syötetiedostosijainti Tcl-tilassa:\n"
+msgstr ""
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3113,20 +2553,18 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg sijaitsee määritellyssä\n"
-"hakemistossa.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                kirjoita sisennettyä tulostetyyliä\n"
+msgstr ""
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                kirjoita tiukkaa uniforum-tyyliä\n"
+msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3138,29 +2576,18 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"Yhdistää kaksoiskappalekäännöksen käännösluettelossa.\n"
-"Löytää saman viestitunnuksen käännösten kaksoiskappaleet. Sellaisia\n"
-"kaksoiskappaleita ovat muiden ohjelmien kuin msgfmt, msgmerge tai msgcat\n"
-"virheellinen syöte. Oletuksena kaksoiskappaleet yhdistetään toisiinsa. Kun\n"
-"käytetään valitsinta --repeated, vain kaksoiskappaleet tulostetaan, ja kaikki\n"
-"muut viestit hylätään. Kommentit ja pistekommentit kumuloituvat, paitsi\n"
-"jos on määritelty valitsin --use-first, jolloin ne otetaan ensimmäisestä\n"
-"käännöksestä.  Tiedostosijainnit kumuloituvat. Kun käytetään valitsinta\n"
-"--unique, kaksoiskappaleet hylätään.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              tulosta vain kaksoiskappaleet\n"
+msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                tulosta vain uniikit viestit, hylkää "
-"kaksoiskappaleet\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3173,19 +2600,15 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Merkistö \"%s\" ei ole siirrettävä koodausnimi.\n"
-"Viestimuunnos käyttäjän merkistöön ei ehkä toimi.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Merkistöä \"%s\" ei tueta. %s käyttää iconv()-funktiota,\n"
-"ja iconv() ei tue kohdetta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3193,94 +2616,90 @@
 "GNU libiconvin asennus ja GNU gettextin uudelleenasennus\n"
 "sen jälkeen korjaisi tämän ongelman.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Jatketaan kuitenkin, oleta jäsennysvirheitä."
+msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
-msgstr "Jatketaan kuitenkin."
+msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Merkistöä \"%s\" ei tueta. %s käyttää iconv()-funktiota.\n"
-"Tämä versio rakennettiin ilman iconv()-funktiota.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"Merkistö puuttuu otsakkeessa.\n"
-"Viestimuunnos käyttäjän merkistöön ei toimi.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
-msgstr "epäjohdonmukainen #~ -käyttö"
+msgstr ""
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "puuttuva ’msgid_plural[]’-rivi"
+msgid "missing `msgstr[]' section"
+msgstr "puuttuva ”msgid_plural[]”-osio"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "puuttuva ’msgid_plural’-rivi"
+msgid "missing `msgid_plural' section"
+msgstr "puuttuva ”msgid_plural”-osio"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "puuttuva ’msgstr’-rivi"
+msgid "missing `msgstr' section"
+msgstr "puuttuva ”msgstr”-osio"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "ensimmäisellä monikkomuodolla on nollasta poikkeava indeksi"
+msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "monikkomuodolla on väärä indeksi"
+msgstr ""
 
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
-msgstr "liian monia virheitä, keskeytetään"
+msgstr ""
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "virheellinen monitavusekvenssi"
+msgstr ""
 
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "vaillinainen monitavusekvenssi tiedoston lopussa"
+msgstr ""
 
 #: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "vaillinainen monitavusekvenssi rivin lopussa"
+msgstr ""
 
 #: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "iconv-häiriö"
+msgstr ""
 
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "avainsana ”%s” tuntematon"
+msgstr ""
 
 #: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
-msgstr "virheellinen ohjainsekvenssi"
+msgstr ""
 
 #: src/po-lex.c:981
 #, c-format
@@ -3295,30 +2714,30 @@
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "kontekstierotin <EOT> merkkijonon sisällä"
+msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "tämä tiedosto ei ehkä sisällä nimiavaruusdirektiivejä"
+msgstr ""
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "kaksinkertainen viestimäärittely"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "ensimmäinen määrittely täällä"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "tiedosto ”%s” typistetään"
+msgstr ""
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "tiedosto ”%s” sisältää merkkijonon, jota ei ole päätetty NUL-merkillä"
+msgstr ""
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
@@ -3329,12 +2748,10 @@
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
-"tiedosto ”%s” sisältää osoitteessa %s merkkijonon, jota ei ole päätetty NUL-"
-"merkillä"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "varoitus: virheellinen \\uxxxx -syntaksi Unicode-merkkille"
+msgstr ""
 
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
@@ -3350,11 +2767,11 @@
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "varoitus: syntaksivirhe, odotettiin ’;’ merkkijonon jälkeen"
+msgstr ""
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "varoitus: syntaksivirhe, odotettiin ’=’ tai ’;’ merkkijonon jälkeen"
+msgstr ""
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -3369,11 +2786,10 @@
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#  Vai tarkoittaako tämä, että käytetään recode-ohjelmaa?
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Koodaa uudelleen serbiankielinen teksti kyrillisestä latinalaismerkkiseksi skriptiksi.\n"
+msgstr ""
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3381,18 +2797,16 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"Syöteteksti luetaan vakiosyötteestä.  Muunnettu teksti tulostetaan\n"
-"vakiotulosteeseen.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "syöte ei ole kelvollinen ”%s”-koodauksessa"
+msgstr ""
 
-#: src/recode-sr-latin.c:367
-#, c-format
+#: src/recode-sr-latin.c:366
+#, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "virhe muunnettaessa ”%s”-koodauksesta ”%s”-koodaukseen"
+msgstr "virhe avattaessa ”%s” lukemista varten"
 
 #: src/urlget.c:159
 #, c-format
@@ -3402,7 +2816,7 @@
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Käyttö: %s [VALITSIN] VERKKO-OSOITE TIEDOSTO\n"
+msgstr "Käyttö: %s [VALITSIN] URL TIEDOSTO\n"
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3410,62 +2824,44 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
-"Noutaa ja tulostaa verkko-osoitteen sisällön.  Jos verkko-osoitetta ei saada,\n"
-"käytetään sen sijaan paikallisesti haettua TIEDOSTOa.\n"
-
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "virhe luettaessa tiedostoa ”%s”"
 
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "virhe kirjoitettaessa vakiotulosteeseen"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "virhe tiedoston ”%s” lukemisen jälkeen"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Noudetaan %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " aikavalvonta toimi.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " epäonnistui.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyssä "
-"tulostemuodossa epäonnistui. Yritä käyttää sen sijaan PO-tiedostosyntaksia."
 
 #: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyllä "
-"tulostemuodolla epäonnistui."
 
 #: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"viestiluettelossa on kontekstista riippuvia käännöksiä, mutta tulostemuoto "
-"ei tue niitä."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3473,22 +2869,17 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"viestiluettelossa on monikkkomuotokäännöksiä, mutta tulostemuoto ei tue "
-"niitä. Yritä tuottaa Java-luokka käyttäen komentoa \"msgfmt --java\", eikä "
-"ominaisuustiedostoa."
 
 #: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"viestiluettelossa on monikkomuotoisia käännöksiä, mutta tulostemuoto ei tue "
-"niitä."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
-#, c-format
+#, fuzzy, c-format
 msgid "cannot create output file \"%s\""
-msgstr "tulostetiedoston ”%s” luominen epäonnistui"
+msgstr "ei voi luoda putkea"
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
@@ -3497,57 +2888,45 @@
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "hakemiston ”%s” luominen epäonnistui"
+msgstr ""
 
-#  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "epäonnistunut C#-luokan kääntäminen, yritä valitsinta --verbose"
+msgstr ""
 
-#  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
 #: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
-msgstr "epäonnistunut C#-luokan kääntäminen"
+msgstr "C#-luokan kääntäminen epäonnistui"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "kelvoton Java-luokkanimi: %s"
+msgstr ""
 
-#  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
-"epäonnistunut Java-luokan kääntäminen, yritä valitsinta --verbose tai aseta "
-"muuttuja $JAVAC"
 
-#  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, 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"
+msgstr ""
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
+#, fuzzy, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "virheellinen monitavusekvenssi"
+msgstr "virhe avattaessa ”%s” lukemista varten"
 
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"paikallistettujen viestien ei pitäisi sisältää ’\\%c’-koodinvaihtosekvenssiä"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3555,13 +2934,8 @@
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"Seuraava msgctxt-merkkijono sisältää ei-ASCII-merkkejä.\n"
-"Tämä aiheuttaa pulmia kääntäjille, jotka käyttävät erilaista\n"
-"merkkikoodausta kuin sinä. Harkitse sen sijaan puhtaan ASCII-\n"
-"msgctxt-merkkijonon käyttämistä.\n"
-"%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3569,19 +2943,12 @@
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"Seuraava msgid-merkkijono sisältää ei-ASCII-merkkejä.\n"
-"Tämä aiheuttaa pulmia kääntäjille, jotka käyttävät erilaista\n"
-"merkkikoodausta kuin sinä. Harkitse sen sijaan puhtaan ASCII-\n"
-"msgid-merkkijonon käyttämistä.\n"
-"%s\n"
 
 #: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"viestiluettelossa on monikkomuotoisia käännöksiä\n"
-"mutta Qt-viestiluettelomuoto ei tue monikkojen käsittelyä\n"
 
 #: src/write-qt.c:693
 msgid ""
@@ -3590,11 +2957,6 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"viestiluettelossa on msgctxt-merkkijonoja, jotka sisältävät koodauksen "
-"ISO-8859-1\n"
-"ulkopuolisia merkkejä, mutta Qt-viestiluettelomuoto tukee Unicode-merkkejä "
-"vain\n"
-"käännetyissä merkkijonoissa, ei kontekstimerkkijonoissa\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3602,77 +2964,59 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"viestiluettelossa on msgid-merkkijonoja, jotka sisältävät koodauksen "
-"ISO-8859-1\n"
-"ulkopuolisia merkkejä, mutta Qt-viestiluettelomuoto tukee Unicode-merkkejä "
-"vain\n"
-"käännetyissä merkkijonoissa, ei kääntämättömissä merkkijonoissa\n"
 
 #: src/write-resources.c:94
-#, c-format
+#, fuzzy, c-format
 msgid "error while writing to %s subprocess"
-msgstr "virhe kirjoitettaessa aliprosessiin %s"
+msgstr "virhe kirjoitettaessa ”%s”"
 
 #: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"viestiluettelossa on kontekstiriippuvaisia käännöksiä\n"
-"mutta C# .resources -muoto ei tue konteksteja\n"
 
 #: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"viestiluettelossa on monikkomuotoisia käännöksiä\n"
-"mutta C# .resources -muoto ei tue monikkokäsittelyä\n"
 
 #: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"viestiluettelossa on kontekstiriippuvaisia käännöksiä\n"
-"mutta Tcl-viestiluettelomuoto ei tue konteksteja\n"
 
 #: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"viestiluettelossa on monikkomuotoisia käännöksiä\n"
-"mutta Tcl-viestiluettelomuoto ei tule monikkokäsittelyä\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: varoitus: päättämätön merkkijono"
+msgstr ""
 
 #: 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"
-
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "varoitus: virheellinen Unicode-merkki"
+msgstr ""
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: varoitus: päättämätön merkkivakio"
+msgstr ""
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
+msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
-msgstr "Määritä lähdekoodaus valitsimen --from-code avulla."
+msgstr ""
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3680,8 +3024,6 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Virheellinen monitavusekvenssi.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
 #: src/x-csharp.c:285
 #, c-format
@@ -3689,8 +3031,6 @@
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
 #: src/x-csharp.c:297
 #, c-format
@@ -3698,8 +3038,6 @@
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
 #: src/x-csharp.c:306
 #, c-format
@@ -3707,13 +3045,11 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: iconv-häiriö"
+msgstr ""
 
 #: src/x-csharp.c:338
 #, c-format
@@ -3721,241 +3057,144 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Virheellinen monitavusekvenssi.\n"
-"Määritä lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
+msgstr ""
 
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: varoitus: päättämätön merkkijonovakio"
+msgstr ""
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: varoitus: ’)’ löytyi kun ’}’ odotettiin"
+msgstr ""
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: varoitus: ’}’ löytyi kun ’)’ odotettiin"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Puuttuva asiayhteys merkkijonolle, joka poimittiin elementistä ’%s’"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Juurielementti <%s> ei ole sallittu virheettömässä Glade-tiedostossa"
+msgstr ""
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"Kieltä ”glade” ei tueta. %s turvautuu expat-ohjelmaan.\n"
-"Tämä versio on rakennettu ilman expat-ohjelmaa.\n"
 
 #: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: varoitus: yksinäinen sijainen U+%04X"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Määritä lähdekoodaus valitsimen --from-code avulla\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
 msgstr ""
-"%s:%d: Virheellinen monitavusekvenssi.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Virheellinen monitavusekvenssi.\n"
-"Määritä lähdekoodikoodaus valitsimen --from-code avulla\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: varoitus: RegExp-merkkijonoliteraali päättyi liian aikaisin"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: varoitus: %s ei ole sallittu"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: varoitus: päättämätön XML-merkkaus"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
-"%s:%d: ei löydetä merkkijonopäättämismerkkiä ”%s” mistään ennen EOF-"
-"tiedostonloppumerkkiä"
 
 #: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: puuttuu oikea aaltosulje kohteessa \\x{HEXNUMBER}"
+msgstr ""
 
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\l”)"
+msgstr ""
 
 #: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\u”)"
+msgstr ""
 
 #: src/x-perl.c:1217
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: virheellinen muuttujainterpolaatio osoitteessa ”%c”"
+msgstr "%s: virheellinen valitsin – %c\n"
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: virheellinen 8-bitisen merkin ”%c” interpolaatio (”\\L”)"
+msgstr ""
 
 #: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\U”)"
+msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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 ""
-"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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Virheellinen monitavusekvenssi.\n"
-"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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
-"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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
-"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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
-"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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Virheellinen monitavusekvenssi.\n"
-"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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Tuntematon koodaus ”%s”. Jatketaan sen sijaan ASCII-koodauksella."
+msgstr ""
 
 #: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: virheellinen merkkijonomäärittely"
+msgstr ""
 
 #: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
-msgstr "%s:%d: numero puuttuu merkin # jäljestä"
+msgstr ""
 
 #: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: virheellinen merkkijonolauseke"
+msgstr ""
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3963,74 +3202,51 @@
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
-"%s:%lu: varoitus: syntaksi $\"...\" on vanhentunut turvallisuussyistä; käytä "
-"sen sijaan funktiota eval_gettext"
-
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-"%s:%d: varoitus: säännöllisen lausekkeen merkkijonoliteraali päättyi liian "
-"aikaisin"
 
-#: src/xgettext.c:545
-#, 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:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext ei voi työskennellä ilman etsittäviä avainsanoja"
+msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "Poimi käännettävät merkkijonot annetuista syötetiedostoista.\n"
+msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=NIMI   käytä tiedostoa NIMI.po tulostukseen (eikä "
-"tiedostoa messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
-msgstr "Syötetiedoston kielen valinta:\n"
+msgstr ""
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4039,59 +3255,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=NIMI         tunnista määritelty kieli\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
-"  -C, --c++                   pikavalitsin valitsimelle --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
-"Oletuksena kieli on arvattu riippuen syötetiedostonimen tarkentimesta.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=NIMI        syötetiedostojen koodaus\n"
-"                                (paitsi kielille Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "Oletuksen syötetiedostojen otaksutaan olevan ASCII-tekstiä.\n"
+msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
-"  -j, --join-existing         liitä viesti oleamssaolevaan tiedostoon\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4100,228 +3301,180 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   sijoita TAG-alkuiset kommenttilohkot ja\n"
-"                                edeltävät avainsanarivit tulostetiedostoon\n"
-"  -c, --add-comments          sijoita kaikkia kommenttilohkoja edeltävät "
-"avainsana-\n"
-"                                rivit tulostetiedostoon\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Kielikohtaiset valitsimet:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           pura kaikki merkkijonot\n"
+msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (vain kielet C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (vain kielet C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=WORD:ARG:FLAG    lisälippu merkkijonoille avainsanan WORD "
-"argumentti-\n"
-"                              numeron ARG sisällä\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (vain kielille C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (vain kielet C, C++, ObjectiveC)\n"
+msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    tunnista Qt-muotoiset merkkijonot\n"
+msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (vain C++-kieli)\n"
+msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   tunnista KDE 4 -muotoiset merkkijonot\n"
+msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
+msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 yksityiskohtaisempi "
-"muotomerkkijonotunnistustulos\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     luo Java .properties -tiedoston\n"
+msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
-"      --copyright-holder=STRING  aseta copyright-omistajan tulosteessa\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          ohita FSF copyright-tulosteessa "
-"vieraskieliselle käyttäjälle\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=PACKAGE  aseta pakkausnimi tulosteessa\n"
+msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSION  aseta pakkausversio tulosteessa\n"
+msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=EMAIL@ADDRESS  aseta ilmoitusosoite msgid-"
-"vikailmoituksia varten\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRING], --msgstr-prefix[=STRING]  käytä merkkijonoa STRING tai ”” "
-"etuliitteenä msgstr-\n"
-"                                merkkijonon arvoille\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRING], --msgstr-suffix[=STRING]  käytä merkkijonoa STRING tai ”” "
-"loppuliitteenä msgstr-\n"
-"                                merkkijonon arvoille\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Argumentilla --flag ei ole <avainsana>:<argumenttinumero>:[pass-]<lippu> -"
-"syntaksia: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
-msgstr "vakiosyöte"
+msgstr ""
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Ei-ASCII-merkki osoitteessa %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Ei-ASCII-kommentti osoitteessa tai ennen osoitetta %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varoitus: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
-"Vaikka käytetty muotomerkkijonopaikassa, merkkijono %s ei ole kelvollinen %s-"
-"muotomerkkijono. Syy: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
-"Vaikka esitelty sellaisena, merkkijono %s ei ole kelvollinen %s-"
-"muotomerkkijono. Syy: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4329,78 +3482,69 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"’%s’-muotomerkkijonon kotoistaminen oikein nimeättömillä argumenteilla "
-"epäonnistui:\n"
-"Kääntäjän argumenttien uudelleenjärjestäminen epäonnistui.\n"
-"Harkitse muotomerkkijonon käyttämistä nimetyillä argumenteilla,\n"
-"ja kartoittamalla eikä argumenttien monilla.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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 ""
-"Tyhjä msgid-merkkijono.  GNU gettext on varannut sen:\n"
-"gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
-"ei tyhjää merkkijonoa.\n"
 
-#: src/xgettext.c:2979
-#, c-format
+#: src/xgettext.c:2834
+#, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
+msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:3006
-#, c-format
+#: src/xgettext.c:2861
+#, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
+msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:3031
-#, c-format
+#: src/xgettext.c:2886
+#, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "varoitus: puuttuva konteksti avainsanan ’%.*s’ monikkoargumentille"
+msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "kontekstitäsmäämättömyys yksikkö- ja monikkomuotojen välillä"
+msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"Valitsinta --msgid-bugs-address ei määritelty.\n"
-"Jos käytät ’Makevars’-tiedostoa, määritä siinä\n"
-"MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
-"määritä komentorivivalitsin --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "kieli ’%s’ on tuntematon"
+msgid "language `%s' unknown"
+msgstr "kieli ”%s” on tuntematon"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "otsakekentän ’%s’ pitäisi alkaa rivin alusta\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "joillakin otsakekentillä on yhä alustava oletusarvo\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: virheellinen valitsin – %c\n"
 
+#, fuzzy
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle epäonnistui virhekoodilla 0x%08x"
+#~ msgstr "%s aliprosessi epäonnistui"
 
 #~ msgid "Not yet implemented."
 #~ msgstr "Ei vielä toteutettu."
 
+#, fuzzy
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s aliprosessi epäonnistui"
+
+#, fuzzy
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s aliprosessi epäonnistui"
+
 #~ msgid "missing arguments"
 #~ msgstr "ei riittävästi argumentteja"
 
@@ -4631,16 +3775,18 @@
 #~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
 #~ "PURPOSE.\n"
 #~ msgstr ""
-#~ "Copyright © %s Free Software Foundation, Inc.\n"
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. "
-#~ "Ohjelmistolle\n"
+#~ "Ohjelmisolle\n"
 #~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE "
 #~ "TIETTYYN\n"
 #~ "tarkoitukseen.\n"
 
+#, fuzzy
 #~ msgid "write to grep subprocess failed"
-#~ msgstr "kirjoitus grep-aliprosessiin epäonnistui"
+#~ msgstr "%s aliprosessi epäonnistui"
 
+#, fuzzy
 #~ msgid ""
 #~ "Informative output:\n"
 #~ "  -h, --help                     display this help and exit\n"
@@ -4649,8 +3795,10 @@
 #~ "Tietoja antavat tulosteet:\n"
 #~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
+#~ "                              suorituksen\n"
 
+#, fuzzy
 #~ msgid ""
 #~ "Informative output:\n"
 #~ "  -h, --help                  display this help and exit\n"
@@ -4661,10 +3809,10 @@
 #~ "Tietoja antavat tulosteet:\n"
 #~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
-#~ "      --statistics            tulostaa tilastot käännöksistä\n"
-#~ "  -v, --verbose               kasvata laveustasoa\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
+#~ "                              suorituksen\n"
 
+#, fuzzy
 #~ msgid ""
 #~ "Informative output:\n"
 #~ "  -h, --help                  display this help and exit\n"
@@ -4675,10 +3823,10 @@
 #~ "Tietoja antavat tulosteet:\n"
 #~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
-#~ "  -v, --verbose               kasvata laveustasoa\n"
-#~ "  -q, --quiet, --silent       vaienna edistymisindikaattorit\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
+#~ "                              suorituksen\n"
 
+#, fuzzy
 #~ msgid ""
 #~ "Informative output:\n"
 #~ "  -h, --help               display this help and exit\n"
@@ -4688,5 +3836,5 @@
 #~ "Tietoja antavat tulosteet:\n"
 #~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
-#~ "  -v, --verbose               kasvata laveustasoa\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
+#~ "                              suorituksen\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/fr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/fr.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/fr.po gettext-0.18.1.1/gettext-tools/po/fr.po
--- gettext-0.19.3/gettext-tools/po/fr.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/fr.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,17 +1,17 @@
 # Messages français pour GNU gettext.
-# Copyright © 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
+# Copyright © 2006 Free Software Foundation, Inc.
 # François Pinard <pinard@iro.umontreal.ca>, 1996.
 # Il a été le traducteur jusqu'en 2001.
 # Michel Robitaille <robitail@iro.umontreal.ca>, traducteur depuis/since 1996.
-# Christophe Combelles <ccomb@free.fr>, 2006, 2007, 2008, 2009, 2010
+# Christophe Combelles <ccomb@free.fr>, 2006
+#
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18\n"
+"Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2010-07-23 01:47+0100\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-27 13:35+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -31,28 +31,29 @@
 msgstr "Argument ambigu %s pour %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Les arguments valides sont :"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "Impossible de trouver un répertoire temporaire. Essayez de définir la "
 "variable $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "Impossible de créer un répertoire temporaire en utilisant le modèle « %s »"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Impossible de supprimer le fichier temporaire « %s »"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Impossible de supprimer le dossier temporaire « %s »"
@@ -61,38 +62,37 @@
 msgid "write error"
 msgstr "Erreur d'écriture"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "Erreur lors de l'ouverture de « %s » en lecture "
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "Erreur d'ouverture du fichier d'archive « %s » en écriture"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "Erreur de lecture de « %s »"
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "Erreur d'écriture de « %s »"
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "Erreur après la lecture de « %s »"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -109,98 +109,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "La machine virtuelle C# est introuvable. Essayez d'installer « pnet »"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Échec du sous-processus %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s : l'option « --%s » requiert un argument\n"
+msgstr "%s : l'option « %s » requiert un argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : l'option « --%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : l'option « %c%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s : option non valable -- '%c'\n"
+msgstr "%s : l'option « --%c » n'est pas valide\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s : l'option exige un argument -- '%c'\n"
+msgstr "%s : l'option « --%c » exige un argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s : l'option « -W %s » requiert un argument\n"
+msgstr "%s : l'option « %s » requiert un argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argument source_version invalide pour compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, 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:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Erreur pendant l'écriture du fichier « %s »"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -214,101 +214,61 @@
 "La machine virtuelle Java est introuvable. Essayez d'installer « gij » ou de "
 "définir la variable d'environnement $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Erreur d'E/S du sous-processus %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
-msgid "creation of threads failed"
-msgstr "Échec de compilation de la classe C#"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Échec de lecture depuis le sous-processus %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "Échec de communication avec le sous-processus %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "Sous-processus %s terminé avec le code de sortie %d"
+msgid "cannot create pipe"
+msgstr "Création du tube impossible"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "Création du tube impossible"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Échec de la fonction « _open_osfhandle »"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "Impossible de restorer le descripteur de fichier %d : dup2 a échoué"
+msgstr "Impossible de créer le fichier « %s »"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -321,49 +281,40 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "Le sous-processus %s a reçu le signal fatal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "Erreur lors de l'ouverture de « %s » en lecture "
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"« %s » n'est pas une chaîne de format %s valide, contrairement à « %s ». "
+"« %s » n'est pas une chaîne de format %s valide, contrairement à « msgid ». "
 "Raison : %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"Une spécification de format pour l'argument «·%u·», comme dans « %s », "
-"n'existe pas dans « %s »"
+"Le format de l'argument «·%u·» dans la chaîne « msgid » n'a pas été "
+"spécifié, comme dans « %s »."
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"Les spécifications de format dans « %s » et « %s » pour l'argument %u ne "
+"Les spécifications de format entre « msgid » et « %s » de l'argument %u ne "
 "sont pas identiques"
 
 #: src/format-boost.c:449
@@ -372,7 +323,7 @@
 msgstr ""
 "La directive numéro %u commence par « | » mais ne se termine pas par « | »."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -382,26 +333,24 @@
 "nom d'une macro de spécification de format. Les noms valides de macro sont "
 "listés dans la norme ISO C 99 section 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "Dans la directive numéro %u, le mot après le symbole « < » n'est pas suivi "
 "par « > »."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "La chaîne fait appel à l'argument numéro %u mais ignore l'argument numéro %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
-"Il n'y a pas le même nombre de spécifications de format entre « %s » et "
+"Il n'y a pas le même nombre de spécifications de format entre « msgid » et "
 "« %s »."
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -493,24 +442,14 @@
 "Dans la directive numéro %u, les drapeaux ne sont pas permis avant « %c »."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "« %s » utilise %%m mais « %s » ne l'utilise pas"
+msgstr "'msgid' utilise %%m mais '%s' ne l'utilise pas"
 
 #: src/format-gcc-internal.c:680
-#, c-format
-msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "« %s » n'utilise pas %%m mais « %s » utilise %%m"
-
-#: src/format-gfc-internal.c:383
 #, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "« %s » utilise %%m mais « %s » ne l'utilise pas"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "« %s » n'utilise pas %%m mais « %s » utilise %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr "'msgid' n'utilise pas %%m mais '%s' utilise %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -621,12 +560,12 @@
 "suivi par « < », « # » ou « %s »."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"Une spécification de format pour l'argument {%u}, comme dans « %s ». "
-"n'existe pas dans « %s »"
+"Une spécification de format pour l'argument {%u} dans la chaîne « msgid » "
+"n'est pas spécifié, comme dans « %s »."
 
 #: src/format-java.c:756
 #, c-format
@@ -634,12 +573,12 @@
 msgstr "Le format de l'argument {%u} dans la chaîne « %s » n'est pas spécifié."
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"Les spécifications de format dans « %s » et « %s » pour l'argument {%u} ne "
-"sont pas les mêmes"
+"Les spécifications de format dans la chaîne « msgid » et dans « %s ».ne sont "
+"pas les mêmes pour l'argument {%u}."
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -714,17 +653,18 @@
 msgstr "La chaîne fait référence à un argument de manière incompatible."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
-"Les spécifications de format dans « %s » et « %s » ne sont pas équivalentes"
+"Les spécifications de format dans la chaîne « msgid » et dans « %s » ne sont "
+"pas équivalentes"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "Les spécifications de format dans « %s » ne sont pas un sous-ensemble de "
-"celles de « %s »."
+"celles de la chaîne « msgid »."
 
 #: src/format-perl.c:433
 #, c-format
@@ -735,9 +675,7 @@
 "Dans la directive numéro %u, l'indicateur de taille est incompatible avec "
 "l'indicateur de conversion « %c »."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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é."
@@ -756,74 +694,46 @@
 msgstr "La chaîne fait référence à l'argument « %s » de manière incompatible."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"Les spécifications de format dans « %s » requièrent une carte de "
+"Les spécifications de format de « msgid » requièrent une carte de "
 "correspondance, celles de « %s » requièrent un n-uplet."
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"Les spécifications de format dans « %s » requièrent un n-uplet (tuple), "
+"Les spécifications de format de « msgid » requièrent un n-uplet (tuple), "
 "celles de « %s » requièrent une carte de correspondance (mapping)."
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
-"Une spécification de format pour l'argument « %s », comme dans « %s », "
-"n'existe pas dans « %s »"
+"Le format de l'argument « %s » dans la chaîne « msgid » n'est pas spécifié, "
+"comme dans « %s »."
 
 #: src/format-python.c:494
-#, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr ""
-"Les spécifications de format dans « %s » et « %s » pour l'argument « %s » ne "
-"sont pas les mêmes"
-
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Dans la directive numéro %u, « %c » n'est pas suivi par un chiffre."
-
-#: src/format-python-brace.c:150
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-"Dans la directive numéro %u, le symbole « { » n'est pas suivi par un numéro "
-"d'argument."
-
-#: src/format-python-brace.c:165
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "Dans la directive numéro %u, « %c » n'est pas suivi par un chiffre."
-
-#: src/format-python-brace.c:185
 #, fuzzy, c-format
 msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"Dans la directive numéro %u, une précision n'est pas permise avant « %c »."
-
-#: src/format-python-brace.c:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Dans la directive numéro %u, l'argument %d est négatif."
+"Les spécifications de format dans la chaîne « msgid » et « %s » pour "
+"l'argument « %s » ne sont pas les mêmes."
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"« %s » est une simple chaîne de format, mais « %s » n'en est pas une : elle "
-"contient un drapeau « L » ou un nombre d'arguments à deux chiffres"
+"La chaîne « msgid » est une chaîne de format simple, mais « %s » n'en est "
+"pas une : elle contient un drapeau « L » ou un nombre d'arguments à deux "
+"chiffres"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -870,11 +780,11 @@
 "Le caractère qui termine la directive numéro %u n'est pas un chiffre compris "
 "entre 1 et 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -887,58 +797,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "Trop d'arguments"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage : %s [OPTION]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Ce programme affiche le nom de machine.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de sortie :\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nom de machine court\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -949,34 +859,34 @@
 "domaine pleinement qualifié\n"
 "                              et les alias\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresses IP du nom de machine\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, 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/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
@@ -985,41 +895,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "Impossible d'obtenir le nom de machine"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "Un seul fichier est permis en entrée"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s et %s s'excluent mutuellement"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1028,10 +940,10 @@
 "msgattrib permet de filtrer les messages d'un catalogue de traduction selon leurs attributs\n"
 "et de manipuler les attributs.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1040,23 +952,23 @@
 "également\n"
 "obligatoires pour les formes courtes correspondantes.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Emplacement du fichier d'entrée :\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHIER ...                 fichier PO d'entrée\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1064,32 +976,32 @@
 "  -D, --directory=DOSSIER     ajouter le DOSSIER pour la recherche des "
 "fichiers d'entrée\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Emplacement du fichier de sortie :\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1098,12 +1010,12 @@
 "  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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Sélection des messages :\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1111,7 +1023,7 @@
 "      --translated            conserver les messages traduit, retirer les "
 "messages non traduits\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1119,70 +1031,61 @@
 "      --untranslated          conserver les messages non traduits, retirer "
 "les messages traduits\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            conserver seulement les messages marqués "
 "« fuzzy »\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           retirer les messages obsolètes « #~ »\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         conserver seulement les messages obsolètes "
 "« #~ »\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulation d'attribut :\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             placer tous les messages dans l'état "
 "« fuzzy »\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marquer tous les messages comme obsolètes\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              conserver les précédentes chaînes « msgid » "
-"des messages traduits\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1191,13 +1094,7 @@
 "      --clear-previous        retirer la chaîne « previous msgid » de tous "
 "les messages\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1205,7 +1102,7 @@
 "      --only-file=FICHIER.po  manipuler seulement les entrées listées dans "
 "le FICHIER.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1213,13 +1110,13 @@
 "      --ignore-file=FICHIER.po  manipuler seulement les entrées qui ne sont "
 "pas listées dans le FICHIER.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 identique à « --only-fuzzy --clear-fuzzy »\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1227,16 +1124,16 @@
 "      --obsolete              identique à « --only-obsolete --clear-"
 "obsolete »\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntaxe du fichier d'entrée :\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1244,8 +1141,8 @@
 "  -P, --properties-input      la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1254,17 +1151,17 @@
 "      --stringtable-input     la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Détails des données de sortie :\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1279,18 +1176,18 @@
 "                              QUAND peut être « always », « never », « auto "
 "», or « html ».\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1298,9 +1195,9 @@
 "  -e, --no-escape             ne pas utiliser de séquences d'échappement C "
 "dans la sortie (par défaut)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1308,31 +1205,31 @@
 "  -E, --escape                utiliser des séquences d'échappements C dans "
 "la sortie, sans caractère étendu\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1340,8 +1237,8 @@
 "  -n, --add-location          créer des commentaires de numérotation du type "
 "« #: fichier:ligne » (par défaut)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1349,17 +1246,17 @@
 "      --strict                créer des fichier .po strictement conformes à "
 "l'Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1367,16 +1264,16 @@
 "      --stringtable-output    créer un fichier « .strings » de type NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1386,34 +1283,34 @@
 "plus longues\n"
 "                              que la largeur des pages de sortie.\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           trier les données de sortie\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Critère de sélection irréalisable (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1421,9 +1318,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "msgcat permet de concaténer et de fusionner des fichiers .po spécifiés\n"
 "et de trouver les messages communs à plusieurs d'entre eux.\n"
@@ -1434,27 +1331,27 @@
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 "Les indications de position de tous les fichiers .po seront accumulées.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1463,7 +1360,7 @@
 "  -<, --less-than=N           afficher les messages définis moins de N fois\n"
 "                              (sans limite par défaut)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1472,7 +1369,7 @@
 "  ->, --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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1481,8 +1378,8 @@
 "  -u, --unique                Afficher les messages uniques (identique à « --"
 "less-than=2 »)\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1490,8 +1387,8 @@
 "  -P, --properties-input      la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1500,12 +1397,12 @@
 "      --stringtable-input     la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ENCODAGE      encodage de sortie\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1516,29 +1413,28 @@
 "                              message ; ne pas faire la fusion de plusieurs "
 "traductions\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "Fichiers d'entrée non spécifiés"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Deux fichiers sont requis en entrée"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage : %s [OPTION] def.po ref.pot\n"
@@ -1572,12 +1468,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     références aux sources\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificateurs d'opération:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1586,7 +1482,7 @@
 "  -m, --multi-domain          appliquer ref.pot à chaque domaine défini dans "
 "def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1614,17 +1510,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "ce message doit être révisé par le traducteur"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "Ce message est utilisé mais non défini..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais cette définition est semblable"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "Ce message est utilisé mais non défini dans « %s »"
@@ -1634,27 +1530,27 @@
 msgid "warning: this message is not used"
 msgstr "AVERTISSEMENT : ce message n'est pas utilisé"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Il faut indiquer au moins deux fichiers"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1666,7 +1562,7 @@
 "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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1676,78 +1572,78 @@
 "N\n"
 "                              définitions (1 par défaut)\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           ne pas créer d'en-têtes de la forme « msgid "
 "\"\" »' \n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "msgconv permet de modifier l'encodage utilisé dans un catalogue de "
 "traduction.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cible de conversion :\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "L'encodage par défaut est l'encodage de « locale » actuellement utilisé.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indenter les données de sortie\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           supprimer les commentaires du type « #: "
 "fichier:ligne »\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          conserver les commentaires du type « #: "
 "fichier:ligne » (par défaut)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                créer une sortie strictement conforme à "
 "l'Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "Aucun fichier d'entrée n'a été fourni"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "Un (et un seul) fichier d'entrée doit être fourni"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage : %s [OPTION] FICHIER_ENTRÉE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1761,7 +1657,7 @@
 "Le texte original anglais du champ « msgid » est alors utilisé\n"
 "comme traduction pour les messages non traduits.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHIER ...                 fichiers d'entrée .po ou .pot\n"
@@ -1800,7 +1696,7 @@
 "Une commande interne spéciale appelée « 0 » renvoie la traduction suivie par un\n"
 "octet nul.  La sortie de « msgexec 0 » peut être utilisée comme entrée pour « xargs -0 ».\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHIER         fichier .po d'entrée\n"
@@ -1810,29 +1706,34 @@
 msgid "write to stdout failed"
 msgstr "Échec d'écriture sur la sortie standard"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "Échec d'écriture sur le sous-processus %s"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "Il manque le nom du filtre"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "Un script « sed » doit au moins être spécifié"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage : %s [OPTION] FILTRE [OPTION_DU_FILTRE]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "msgfilter permet d'appliquer un filtre à toutes les traductions d'un "
 "catalogue.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1842,19 +1743,19 @@
 "l'entrée standard et qui renvoie une traduction modifiée sur la sortie "
 "standard.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Options de filtrage utiles lorsque le FILTRE est « sed » :\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à exécuter\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1864,7 +1765,7 @@
 "  -f, --file=FICHIER_SCRIPT   ajouter le contenu du FICHIER_SCRIPT aux "
 "commandes à exécuter\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1872,7 +1773,7 @@
 "  -n, --quiet, --silent       demander à « sed »  de ne pas afficher son "
 "espace de travail (pattern space)\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1880,117 +1781,94 @@
 "      --no-escape             ne pas utiliser de séquences d'échappement C "
 "dans la sortie (par défaut)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indenter la sortie\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           ne pas filtrer ni modifier l'en-tête\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-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/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s a besoin de l'option « -d DOSSIER »"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s a besoin de l'option « -l locale »"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s a besoin de l'option « -l locale »"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s a besoin de l'option « -l locale »"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s et %s s'excluent mutuellement"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s n'est valide qu'avec %s ou %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s n'est valide qu'avec %s, %s ou %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s : "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d message traduit"
 msgstr[1] "%d messages traduits"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduction approximative"
 msgstr[1] ", %d traductions approximatives"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage : %s [OPTION] fichier.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1999,17 +1877,17 @@
 "Les arguments obligatoires pour les formes longues des options sont également\n"
 "obligatoires pour les formes courtes correspondantes. (idem options factultatives)\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichier.po ...              fichiers d'entrée\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2018,7 +1896,7 @@
 "  -j, --java                  mode JAVA : produire une classe Java "
 "« ResourceBundle »\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2027,14 +1905,14 @@
 "      --java2                 identique à --java, mais pour Java2 (JDK 1.2 "
 "ou plus récent)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2043,7 +1921,7 @@
 "      --csharp-resources      mode C# : produire un fichier « .resources » "
 "de type .NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2051,47 +1929,39 @@
 "      --tcl                   mode TCL : produire un fichier « .msg » de "
 "type tcl/msgcat\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --tcl                   mode QT : produire un fichier « .qm » de type "
-"Qt\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                active le mode de conformité stricte à "
 "l'Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Java :\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    nom de la ressource\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2100,16 +1970,7 @@
 "  -l, --locale=LOCALE         nom de la « locale » (par exemple « fr » ou "
 "« fr_FR »)\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                mode Tcl :  l'entrée est un fichier « .msg » de "
-"type tcl/msgcat\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2117,7 +1978,7 @@
 "  -d DOSSIER                  répertoire de base de la hiérarchie des "
 "classes\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2131,12 +1992,12 @@
 "obligatoire. La classe est créée\n"
 "  dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Emplacement du fichier de sortie en mode C# :\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2145,7 +2006,7 @@
 "  -d DOSSIER                  répertoire de base pour les fichiers .dll "
 "dépendants de la « locale »\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2155,19 +2016,19 @@
 "  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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Tcl :\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2176,46 +2037,12 @@
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier .msg est créé dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DOSSIER                  répertoire de base des catalogues de messages "
-"de type « .msg »\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interprétation du fichier d'entrée :\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2227,14 +2054,14 @@
 "                              --check-format, --check-header et --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2243,7 +2070,7 @@
 "      --check-header          vérifier la présence et le contenu de l'en-"
 "tête\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2253,7 +2080,7 @@
 "domaine\n"
 "                              et l'option « --output-file »\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2262,7 +2089,7 @@
 "  -C, --check-compatibility   vérifier que le « msgfmt » de GNU se comporte "
 "comme celui de X/Open\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2273,14 +2100,14 @@
 "clavier\n"
 "                                   pour les éléments de menu\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2288,16 +2115,7 @@
 "  -a, --alignment=N           effectuer un alignement des chaînes à N octets "
 "(%d par défaut)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2305,96 +2123,85 @@
 "      --no-hash               ne pas inclure la table de hachage dans le "
 "fichier binaire\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            afficher les statistiques de traduction\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               afficher plus d'informations\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "AVERTISSEMENT : la conversion d'encodage ne fonctionnera pas\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, 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:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "La directive « domain %s » a été ignorée"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "Une chaîne vide « msgstr » a été ignorée"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "Une chaîne « msgstr » approximative (fuzzy) a été ignorée"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s : AVERTISSEMENT : le fichier source contient des traductions "
 "approximatives"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Erreur lors de la lecture de « %s »"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2403,7 +2210,7 @@
 "L'option « %c » ne peut être utilisée avant que « J », « K », « T », « C » "
 "ou « X » n'ait été spécifié"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2412,7 +2219,7 @@
 "msggrep permet d'extraire tous les messages d'un catalogue de traduction qui concordent avec\n"
 "un motif particulier ou qui appartiennent à des fichiers sources donnés.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2487,7 +2294,7 @@
 "  -v, --invert-match          récupère seulement les messages qui ne concordent avec\n"
 "                              aucun critère de sélection\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2495,19 +2302,19 @@
 "      --escape                utiliser les séquences d'échappements C dans "
 "la sortie, sans caractère étendu\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           trier les données en sortie\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          trier la sortie selon l'emplacement des "
 "fichiers\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2518,7 +2325,7 @@
 "le fichier ABOUT-NLS. Ceci est nécessaire pour pouvoir tester vos "
 "traductions.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2529,12 +2336,12 @@
 "Veuillez définir la langue à l'aide de l'option « --locale »\n"
 "ou le fichier de sortie .po à l'aide de l'option « --output-file ».\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s a été créé.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2543,12 +2350,12 @@
 "msginit permet de créer un nouveau fichier .po en initialisant les informations de contexte\n"
 "avec des valeurs provenant de l'environnement de l'utilisateur.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr " -i, --input=FICHIER_ENTRÉE   fichier .pot d'entrée\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2558,14 +2365,14 @@
 "  Si le nom du fichier d'entrée est « - » ou s'il n'est pas spécifié, les "
 "données sont lues depuis l'entrée standard.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FICHIER   écrire les données en sortie dans le FICHIER "
 "spécifié\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2577,12 +2384,12 @@
 "fichier de sortie\n"
 "  est « - », les données sont envoyées vers la sortie standard.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          définir la langue cible\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2590,7 +2397,7 @@
 "      --no-translator         supposer que le fichier .po est produit de "
 "manière automatique\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2599,12 +2406,12 @@
 "Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --"
 "input ».\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "Erreur de lecture du dossier actuel"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2613,14 +2420,14 @@
 "Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --"
 "input ».\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "Échec du sous-processus %s avec le code de sortie %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2636,7 +2443,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traductions françaises du paquet %s"
@@ -2655,17 +2462,17 @@
 "« %s »"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "Aucun jeu de caractères n'est spécifié dans l'en-tête du fichier d'entrée "
 "« %s »"
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "Aucun jeu de caractères n'est spécifié pour le domaine « %s » dans l'en-tête "
@@ -2678,8 +2485,8 @@
 "Le jeu de caractères cible « %s » n'est pas un nom d'encodage portable."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
@@ -2810,47 +2617,47 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Essayez d'utiliser ce qui suit, valable pour %s :"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 "Le catalogue de messages contient des traductions d'expressions au pluriel"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 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:384
+#: src/msgl-check.c:378
 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:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "Valeur « nplurals » invalide"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "Expression au pluriel invalide"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2859,73 +2666,78 @@
 "il manque une entrée « Plural-Forms: nplurals=INTEGER; plural=EXPRESSION; » "
 "dans l'en-tête"
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 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:729
+#: src/msgl-check.c:720
 #, 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:740
+#: src/msgl-check.c:730
 #, 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:814
+#: src/msgl-check.c:776
 #, fuzzy, 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"
+msgid "header field `%s' missing in header\n"
+msgstr "Le champ « %s » est absent de l'en-tête\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "Le champ d'en-tête « %s » devrait être au début de la ligne\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
+
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "Le champ « %s » est absent de l'en-tête\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2944,8 +2756,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2963,8 +2775,8 @@
 "La conversion de « %s » vers « %s » introduit des doublons : certaines "
 "chaînes « msgids » différentes deviennent identiques."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2973,16 +2785,16 @@
 "Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv(), et "
 "cette version a été compilée sans iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s est valable seulement avec %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "Type de sauvegarde"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -3008,18 +2820,18 @@
 "Lorsqu'une correspondance exacte n'est pas possible,\n"
 " une correspondance floue (fuzzy) est utilisée pour produire un meilleur résultat. \n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traduction des anciens messages sources\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     messages sources actuels à traduire\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -3029,7 +2841,7 @@
 "traduction,\n"
 "                              peut être spécifié plusieurs fois\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -3039,28 +2851,28 @@
 "                              ne rien faire si le fichier def.po est déjà à "
 "jour\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Emplacement du fichier de sortie en mode mise à jour :\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "  Le résultat est réécrit dans le fichier def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTRÔLE       créer une sauvegarde de def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFFIXE        choisir un suffixe différent de sauvegarde\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -3083,10 +2895,10 @@
 "                              sinon effectuer des sauvegardes simples\n"
 "  simple, never               toujours créer des sauvegardes simples\n"
 
-#: src/msgmerge.c:559
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
@@ -3094,7 +2906,7 @@
 "l'option «--suffix »\n"
 "ou par la variable d'environnement SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -3102,22 +2914,22 @@
 "      --previous              conserver les précédentes chaînes « msgid » "
 "des messages traduits\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       supprimer le témoin de progression\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "Ce message devrait définir des formes au pluriel"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "Ce message ne devrait pas définir de forme au pluriel"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3126,7 +2938,7 @@
 "%s lues %ld anciennes + %ld références, %ld fusionnées, %ld approximatives, "
 "%ld manquantes, %ld périmées.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3247,7 +3059,7 @@
 "      --strict                produire une sortie strictement conforme à "
 "l'Uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3268,12 +3080,12 @@
 "Si l'option « --use-first » est spécifiée, seuls ceux de la première traduction seront utilisés.\n"
 "Les commentaires de position sont cumulés.   Lorsque l'option « --unique » est utilisée, seuls les messages uniques sont conservés.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              afficher seulement les doublons\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3297,7 +3109,7 @@
 "La conversion vers le jeu de caractères de l'utilisateur peut ne pas "
 "fonctionner.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3306,7 +3118,7 @@
 "Le jeu de caractères « %s » n'est pas supporté. %s utilise iconv(),\n"
 "et iconv() ne supporte pas « %s ».\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3314,17 +3126,17 @@
 "L'installation de GNU libiconv suivi de la réinstallation de GNU gettext\n"
 "devrait corriger ce problème.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 "On continue quand même... attendez-vous à des erreurs d'interprétation du "
 "fichier."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "On continue quand même."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3333,7 +3145,7 @@
 "Le jeu de caractères « %s » n'est pas supporté. %s utilise iconv(),\n"
 "Cette version a été compilée sans iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3347,27 +3159,27 @@
 msgid "inconsistent use of #~"
 msgstr "Utilisation incohérente de #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "Section « msgstr[] » absente"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "Section « msgstr_plural » absente"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "Section « msgstr » absente"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "La première forme du pluriel a un indice non nul"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "La forme du pluriel a un indice erroné"
@@ -3377,7 +3189,7 @@
 msgid "too many errors, aborting"
 msgstr "Trop d'erreurs, on abandonne"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Séquence d'octets multiples invalide"
@@ -3421,16 +3233,16 @@
 msgid "context separator <EOT> within string"
 msgstr "séparateur de contexte <EOT> à l'intérieur d'une chaîne"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "Ce fichier peut ne pas contenir de directive de domaine"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "Double définition de message"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "voici l'endroit de la première occurence"
 
@@ -3507,12 +3319,12 @@
 "Le texte est lu depuis l'entrée standard.  Le texte converti est envoyé\n"
 " vers la sortie standard.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "l'entrée n'est pas valide en encodage %s"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
@@ -3537,35 +3349,25 @@
 "urlget permet de récupérer et d'afficher le contenu d'une URL.\n"
 "Si l'URL ne peut être atteintte, le FICHIER local est utilisé.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "Erreur de lecture de « %s »"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "Erreur d'écriture sur la sortie standard"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "Erreur après la lecture de « %s »"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Récupération de %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " délai expiré.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " échoué.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3634,19 +3436,19 @@
 msgid "compilation of C# class failed"
 msgstr "Échec de compilation de la classe C#"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, 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:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, 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"
@@ -3656,19 +3458,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "Erreur lors de l'ouverture de « %s » en écriture"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "Séquence d'octets multiples invalide"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "un message à traduire ne doit pas contenir de séquence d'échappement « \\%c »"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3681,7 +3478,7 @@
 "différent du vôtre. Vous devriez utiliser un msgctxt en pur ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3767,7 +3564,7 @@
 "mais le format de catalogue de type Tcl ne supporte pas les formes au "
 "pluriel\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
@@ -3777,25 +3574,22 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d : AVERTISSEMENT : expression rationnelle non terminée"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d : AVERTISSEMENT : constante caractère sans terminaison"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
+"Chaîne non-ASCII repérée à %s%s.\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3833,7 +3627,7 @@
 "%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d : Échec de « iconv »"
@@ -3847,7 +3641,7 @@
 "%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:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
@@ -3867,22 +3661,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « } » trouvé à la place de « ) »"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3896,72 +3680,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d : AVERTISSEMENT : substitut isolé U+%04X"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-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-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d : séquence longue d'octets multiples incomplète.\n"
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d : séquence d'octets multiples incomplète à la fin du fichier.\n"
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-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-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-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-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -4003,16 +3721,18 @@
 msgstr ""
 "%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
+"Chaîne non-ASCII repérée à %s%s.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4024,7 +3744,7 @@
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4036,7 +3756,7 @@
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4048,7 +3768,7 @@
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4060,7 +3780,7 @@
 "avec un commentaire\n"
 "comme spécifié sur la page : http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4072,7 +3792,7 @@
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Encodage « %s » inconnu. Traitement effectué en ASCII."
@@ -4101,43 +3821,33 @@
 "%s:%lu : AVERTISSEMENT : la syntaxe « $\"...\" » ne doit pas être utilisée "
 "pour des raisons de sécurité. Utilisez plutôt « eval_gettext »"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4146,13 +3856,13 @@
 "  -d, --default-domain=NOM    utiliser NOM.po pour la sortie (au lieu de "
 "messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4160,13 +3870,13 @@
 "  -p, --output-dir=RÉP        créer les fichiers de sortie dans le "
 "répertoire spécifié\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choix du langage du fichier d'entrée :\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4174,8 +3884,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NOM          reconnaître le langage spécifié\n"
 "                              (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
@@ -4183,12 +3892,12 @@
 "                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                              GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   identique à « --language=C++ »\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4196,7 +3905,7 @@
 msgstr ""
 "  Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4205,26 +3914,26 @@
 "      --from-code=NOM         encodage des fichiers d'entrée\n"
 "                              (sauf pour Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4232,32 +3941,28 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   ajouter les blocs de commentaires débutant "
-"avec TAG et\n"
-"                                précédant les lignes de mot clé dans le "
-"fichier de sortie\n"
-"  -c, --add-comments          ajouter tous les blocs de commentaires "
-"précédant les lignes de mots clés\n"
-"                                dans le fichier de sortie\n"
+"  -c, --add-comments[=REPÈRE]    ajouter un bloc de commentaire avec un "
+"REPÈRE,\n"
+"                                 (ou ceux précédant les lignes mots clés) "
+"dans le fichier de sortie\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Options spécifiques au langage:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extraire toutes les chaînes\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                              (seulement les langages C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4265,22 +3970,17 @@
 "C#, awk,\n"
 "                              awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                              (seulement les langages C, C++, ObjectiveC, "
-"Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java, "
-"C#, awk,\n"
-"                              awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -k, --keyword[=MOT]         MOT clé additionnel à rechercher (sans\n"
+"                              MOT clé signifie : ne pas utiliser des mots "
+"clés par défaut)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4291,14 +3991,13 @@
 "l'intérieur de\n"
 "                              l'argument numéro ARG du MOT clé\n"
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                              (seulement les langages C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4306,42 +4005,42 @@
 "Java,\n"
 "                              C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                              (seuls les langages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconnaître les chaînes au format Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                              (seulement le langage C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, 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:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 "      --boost                 reconnaître les chaînes au format Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4349,19 +4048,19 @@
 "      --debug                 mieux détailler la reconnaissance des chaînes "
 "de format\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4369,18 +4068,18 @@
 "      --foreign-user          omettre le copyright FSF dans la sortie pour "
 "les utilisateurs étrangers\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4388,62 +4087,60 @@
 "      --msgid-bugs-address=ADRESSE@COURRIEL  adresse de courriel pour les "
 "rapport d'anomalie des msgid\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[CHAINE], --msgstr-prefix[=CHAINE]  utiliser la CHAINE ou \"\" comme "
-"préfixe aux valeurs\n"
-"                                msgstr\n"
+"  -m, --msgstr-prefix[=PREFIXE]  utiliser un PREFIXE ou « \"\" » pour les "
+"entrées msgstr\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[CHAINE], --msgstr-suffix[=CHAINE]  utiliser la CHAINE ou \"\" comme "
-"suffixe aux valeurs\n"
-"                                msgstr\n"
+"  -m, --msgstr-prefix[=SUFFIXE]  utiliser un SUFFIXE ou « \"\"»  pour les "
+"entrées msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:"
-"[pass-]<drapeau>:%s"
+"Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:[pass-]"
+"<drapeau>:%s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrée standard"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Caractère non-ASCII à %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Commentaire non-ASCII à (ou avant) %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Chaîne non-ASCII à %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s : AVERTISSEMENT : "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4452,7 +4149,7 @@
 "Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison "
 "est :%s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4461,7 +4158,7 @@
 "Malgré sa déclaration, %s n'est pas une chaîne de format %s valide. La "
 "raison est :%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4475,7 +4172,7 @@
 "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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4485,34 +4182,33 @@
 "GNU gettext : gettext(\"\") retourne l'en-tête\n"
 "avec les informations de contexte, pas une chaîne vide.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "Argument ambigu pour le mot clé « %.*s »"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, 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:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4521,22 +4217,15 @@
 "la variable MSGID_BUGS_ADDRESS à cet endroit. Sinon, veuillez\n"
 "utiliser l'option « --msgid-bugs-address » en ligne de commande.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "langage « %s » inconnu"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<sans nom>"
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "Le champ d'en-tête « %s » devrait être au début de la ligne\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s : l'option « --%c » n'est pas permise\n"
 
@@ -4547,6 +4236,20 @@
 #~ msgid "Not yet implemented."
 #~ msgstr "Pas encore implanté"
 
+#~ 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"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "Échec de communication avec le sous-processus %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "Échec de lecture depuis le sous-processus %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "Sous-processus %s terminé avec le code de sortie %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "Le champ « %s » a encore sa valeur initiale par défaut\n"
 
diff -Nru gettext-0.19.3/gettext-tools/po/gettext-tools.pot gettext-0.18.1.1/gettext-tools/po/gettext-tools.pot
--- gettext-0.19.3/gettext-tools/po/gettext-tools.pot	2014-10-16 06:04:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/gettext-tools.pot	2010-06-06 12:49:57.000000000 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.3\n"
+"Project-Id-Version: gettext-tools 0.18.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -29,25 +29,26 @@
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -56,38 +57,37 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr ""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr ""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,98 +104,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -205,96 +205,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
+msgid "cannot create pipe"
 msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr ""
@@ -310,20 +272,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr ""
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -332,19 +287,17 @@
 msgstr ""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -354,26 +307,24 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -459,16 +410,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -650,9 +591,7 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -692,32 +631,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -759,11 +672,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -772,58 +685,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr ""
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -831,34 +744,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -867,247 +780,236 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1116,118 +1018,118 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1236,97 +1138,97 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr ""
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr ""
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1352,19 +1254,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1389,17 +1291,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr ""
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr ""
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
@@ -1409,19 +1311,19 @@
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1429,79 +1331,79 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr ""
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr ""
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1510,7 +1412,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1542,7 +1444,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1552,45 +1454,50 @@
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr ""
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1598,226 +1505,192 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr ""
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1826,78 +1699,48 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1905,33 +1748,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1939,129 +1782,109 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2101,30 +1924,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2132,24 +1955,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2157,54 +1980,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2216,7 +2039,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2234,13 +2057,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2250,8 +2073,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2348,99 +2171,108 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
 msgstr ""
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr ""
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+
+#: src/msgl-check.c:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
 msgstr ""
 
 #: src/msgl-iconv.c:65
@@ -2457,8 +2289,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2472,24 +2304,24 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2503,51 +2335,51 @@
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2559,43 +2391,43 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2693,7 +2525,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2706,12 +2538,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2730,35 +2562,35 @@
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2769,27 +2601,27 @@
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr ""
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr ""
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
@@ -2799,7 +2631,7 @@
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
@@ -2843,16 +2675,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr ""
 
@@ -2925,12 +2757,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
@@ -2952,21 +2784,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr ""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr ""
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr ""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3037,17 +2859,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3057,17 +2879,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr ""
 
-#: src/write-po.c:821
-msgid "incomplete multibyte sequence"
-msgstr ""
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3076,7 +2894,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3135,7 +2953,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
@@ -3145,22 +2963,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3192,7 +3005,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3204,7 +3017,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3224,22 +3037,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3251,60 +3054,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr ""
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr ""
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr ""
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr ""
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3340,13 +3089,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3354,7 +3103,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3362,7 +3111,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3370,7 +3119,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3378,7 +3127,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3386,7 +3135,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3413,60 +3162,50 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3475,45 +3214,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3523,37 +3261,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3561,85 +3295,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3647,7 +3380,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3655,52 +3388,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3709,44 +3442,44 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr ""
 
 #: libgettextpo/gettext-po.c:84
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/gl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/gl.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/gl.po gettext-0.18.1.1/gettext-tools/po/gl.po
--- gettext-0.19.3/gettext-tools/po/gl.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/gl.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,396 +1,337 @@
 # Galician translation of gettext.
-# This file is distributed under the same license as the gettext package.
 # Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-# Copyright (C) 2012, 2014 Leandro Regueiro.
+# Jes�s Bravo �lvarez <jba@pobox.com>, 1999-2001.
 #
-# Jesús Bravo Álvarez <jba@pobox.com>, 1999-2001.
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2012, 2014.
+# Proxecto Trasno - Adaptaci�n do software libre � lingua galega:  Se desexas
+# colaborar connosco, podes atopar m�is informaci�n en http://trasno.gpul.org
 #
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
+# First Version: 1999-09-05 20:58+0200
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext 0.10.39\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+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"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2001-07-28 17:00+0200\n"
+"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
+"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "argumento incorrecto %s para %s"
+msgstr ""
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "argumento %s ambiguo para %s"
+msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "Os argumentos válidos son:"
+msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
-#, c-format
+#: gnulib-lib/clean-temp.c:335
+#, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"non foi posíbel atopar ningún directorio temporal, probe a definir $TMPDIR"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:339
-#, c-format
+#: gnulib-lib/clean-temp.c:349
+#, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "non é posíbel crear un directorio temporal empregando o patrón «%s»"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
-#, c-format
+#: gnulib-lib/clean-temp.c:445
+#, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "non é posíbel retirar o ficheiro temporal %s"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "non é posíbel retirar o directorio temporal %s"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "erro de escritura"
-
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "conservando os permisos de %s"
+msgstr ""
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "produciuse un erro ao abrir «%s» para lectura"
+msgid "error while opening \"%s\" for reading"
+msgstr "erro ao abrir \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:193
-#, c-format
-msgid "cannot open backup file %s for writing"
-msgstr ""
-"non é posíbel abrir o ficheiro de copia de seguridade «%s» para escribir"
+#: gnulib-lib/copy-file.c:74
+#, fuzzy, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "erro ao abrir \"%s\" para escribir"
 
-#: gnulib-lib/copy-file.c:197
-#, c-format
-msgid "error reading %s"
-msgstr "produciuse un erro ao ler «%s»"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, fuzzy, c-format
+msgid "error reading \"%s\""
+msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/copy-file.c:201
-#, c-format
-msgid "error writing %s"
-msgstr "produciuse un erro ao escribir «%s»"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, fuzzy, c-format
+msgid "error writing \"%s\""
+msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: gnulib-lib/copy-file.c:205
-#, c-format
-msgid "error after reading %s"
-msgstr "produciuse un erro despois de ler «%s»"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, fuzzy, c-format
+msgid "error after reading \"%s\""
+msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
-msgstr "fdopen() fallou"
+msgstr ""
 
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "Non se atopou ningún compilador de C#, probe a instalar pnet"
+msgstr ""
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "Non se atopou a máquina virtual de C#, probe a instalar pnet"
+msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Erro de sistema descoñecido"
+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/wait-process.c:282 gnulib-lib/wait-process.c:356
-#, fuzzy, c-format
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
+#, c-format
 msgid "%s subprocess failed"
-msgstr "fallou o subproceso %s"
+msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opción «%s» é ambigua; as posibilidades son:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: a opci�n `%s' � ambigua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a opción «--%s» non permite ningún argumento\n"
+msgstr "%s: a opci�n `--%s' non permite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a opción «%c%s» non permite un argumento\n"
+msgstr "%s: a opci�n `%c%s' non permite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a opción «--%s» require un argumento\n"
+msgstr "%s: a opci�n `%s' require un argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción «--%s» non recoñecida\n"
+msgstr "%s: opci�n `--%s' desco�ecida\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción «%c%s» non recoñecida\n"
+msgstr "%s: opci�n `%c%s' desco�ecida\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opción incorrecta -- «%c»\n"
+msgstr "%s: opci�n non v�lida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: a opción require un argumento -- «%c»\n"
+msgstr "%s: a opci�n require un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a opción «-W %s» é ambigua\n"
+msgstr "%s: a opci�n `-W %s' � ambigua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a opción «-W %s» non permite un argumento\n"
+msgstr "%s: a opci�n `-W %s' non permite ning�n argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a opción «-W %s» require un argumento\n"
+msgstr "%s: a opci�n `%s' require un argumento\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "produciuse un erro ao crear «%s»"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "produciuse un erro ao escribir o ficheiro «%s»"
+msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"Non se atopou o compilador de Java, probe a instalar gcj ou definir $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"Non se atopou a máquina virtual de Java, probe a instalar gij ou definir "
-"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "Erro de E/S do subproceso %s"
+msgstr ""
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "produciuse un erro ao ler do subproceso %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "«"
+msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "»"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "non é posíbel crear a canalización"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle fallou"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "non foi posíbel restaurar o fd %d: dup2 fallou"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "subproceso %s"
+msgstr ""
 
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "produciuse un erro ao abrir «%s» para lectura"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"unha especificación de formato para o argumento %u, como en «%s», non existe "
-"en «%s»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
-#, c-format
+#, fuzzy, 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»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr ""
-"as especificacións de formato en «%s» e «%s» para o argumento %u non son as "
-"mesmas"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr ""
+"o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -466,22 +407,12 @@
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "«%s» usa %%m pero «%s» non o fai"
+msgstr ""
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "«%s» non usa %%m pero «%s» usa %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "«%s» usa %%C pero «%s» non o fai"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "«%s» non usa %%C pero «%s» usa %%C"
+msgstr ""
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -570,26 +501,21 @@
 msgstr ""
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"unha especificación de formato para o argumento {%u}, como en «%s», non "
-"existe en «%s»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-java.c:756
-#, c-format
+#, fuzzy, 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»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr ""
-"as especificacións de formato en «%s» e «%s» para o argumento {%u} non son "
-"as mesmas"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -653,15 +579,15 @@
 msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "as especificacións de formato en «%s» e «%s» non son equivalentes"
+msgstr ""
+"o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-perl.c:433
 #, c-format
@@ -670,13 +596,10 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
-#, c-format
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr ""
-"unha especificación de formato para o argumento «%s» non existe en «%s»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-python.c:115
 msgid ""
@@ -690,58 +613,30 @@
 msgstr ""
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
+"o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
+"o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr ""
-"unha especificación de formato para o argumento «%s», como en «%s», non "
-"existe en «%s»"
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr ""
-"as especificacións de formato en «%s» e «%s» para o argumento «%s» non son "
-"as mesmas"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
+msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
 
 #: src/format-qt.c:152
 #, c-format
@@ -784,11 +679,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -797,58 +692,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Use «%s --help» para obter máis información.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Use `%s --help' para m�is informaci�n.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "Uso: %s [OPCIÓN]\n"
+msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "Formato de saída:\n"
+msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -856,283 +751,273 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Saída informativa:\n"
+msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
+msgstr ""
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
+#, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Comunique os erros a <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
-#, c-format
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#, fuzzy, c-format
 msgid "at most one input file allowed"
-msgstr "permítese un ficheiro de entrada como moito"
+msgstr "prec�sanse exactamente dous ficheiros de entrada"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s e %s son mutuamente excluíntes"
+msgstr "%s e %s son mutuamente exclu�ntes"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Uso: %s [OPCIÓN] [FICHEIRO_ENTRADA]\n"
+msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
-#, c-format
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
+#, fuzzy, c-format
 msgid "Input file location:\n"
-msgstr ""
+msgstr "non se indicou ning�n ficheiro de entrada"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Selección de mensaxes:\n"
+msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1141,118 +1026,133 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, c-format
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#, fuzzy, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+"Uso: %s [OPCI�N] [FICHEIRO]...\n"
+"Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
+"para\n"
+"as opci�ns curtas.\n"
+"  -e, --no-escape          non usar secuencias de escape de C na sa�da (por\n"
+"                           defecto)\n"
+"  -E, --escape             usar secuencias de escape de C na sa�da, sen\n"
+"                           caracteres estendidos\n"
+"      --force-po           escribi-lo ficheiro PO a�nda que estea baleiro\n"
+"  -h, --help               amosar esta axuda e sa�r\n"
+"  -i, --indent             escribi-la sa�da cun estilo indentado\n"
+"  -o, --output-file=FICH   escribi-la sa�da en FICH en vez da sa�da "
+"est�ndar\n"
+"  -V, --version            amosa-la informaci�n da versi�n e sa�r\n"
+"  -w, --width=N�MERO       establece-la anchura da p�xina de sa�da\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "o criterio de selección indicado é imposíbel (%d < n < %d)"
+msgstr "o criterio de selecci�n indicado � imposible (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1261,111 +1161,119 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"Atopar mensaxes que son comúns a dous ou máis dos ficheiros PO indicados.\n"
-"Usando a opción --more-than, pódese requirir a concorrencia en máis ficheiros\n"
-"antes de escribir as mensaxes. Do mesmo xeito, coa opción --less-than pódese\n"
-"requirir a concorrencia en menos ficheiros antes de escribir as mensaxes\n"
-"(i.e. --less-than=2 só escribe as mensaxes únicas). As traducións,\n"
-"comentarios e comentarios de extracción consérvanse, pero só do primeiro\n"
-"ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
-"os ficheiros PO.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
+"  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+"  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+"  -<, --less-than=N�MERO         escribi-las mensaxes que te�an menos\n"
+"                                 deste n�mero de definici�ns.  Se non se\n"
+"                                 indica, � infinito\n"
+"  ->, --more-than=N�MERO         escribi-las mensaxes que te�an m�is\n"
+"                                 deste n�mero de definici�ns.  Se non se\n"
+"                                 indica, � 1\n"
+"\n"
+"Atopar mensaxes que son com�ns a dous ou m�is dos ficheiros PO indicados.\n"
+"Usando a opci�n --more-than, p�dese requiri-la concorrencia en m�is ficheiros\n"
+"antes de escribi-las mensaxes.  Do mesmo xeito, coa opci�n --less-than p�dese\n"
+"requiri-la concorrencia en menos ficheiros antes de escribir-las mensaxes\n"
+"(i.e. --less-than=2 s� escribe as mensaxes �nicas).  As traducci�ns,\n"
+"comentarios e comentarios de extracci�n mant��ense, pero s� do primeiro\n"
+"ficheiro para definilos.  Mant��ense as posici�ns de t�dolos ficheiros PO.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "Peter Miller"
+msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
-msgstr "non se indicou ningún ficheiro de entrada"
+msgstr "non se indicou ning�n ficheiro de entrada"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "requírense exactamente dous ficheiros de entrada"
+msgstr "prec�sanse exactamente dous ficheiros de entrada"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 #: src/msgcmp.c:218
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
@@ -1374,37 +1282,45 @@
 "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 ""
-"Compara dous ficheiros .po de estilo Uniforum para comprobar que os dous\n"
-"conteñen o mesmo conxunto de cadeas msgid. O ficheiro def.po é un ficheiro\n"
-"PO existente, coas traducións antigas. O ficheiro ref.pot é o último\n"
-"ficheiro PO creado, ou un ficheiro PO Template (xeralmente por xgettext).\n"
-"Isto é útil para comprobar que todas as mensaxes do programa están\n"
-" traducidas. Cando non é posíbel atopar unha coincidencia exacta, úsase\n"
-"coincidencia difusa, de xeito que se produza un mellor diagnóstico.\n"
+"Uso: %s [OPCI�N] def.po ref.po\n"
+"Os argumentos obrigatorios para as opci�ns longas son tam�n obligatorios para\n"
+"as opci�ns curtas.\n"
+"  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de ficheiros\n"
+"                              de entrada\n"
+"  -h, --help                  amosar esta axuda e sa�r\n"
+"  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+"\n"
+"Compara dous ficheiros .po de estilo Uniforum para verificar que os dous\n"
+"conte�en o mesmo conxunto de cadeas msgid.  O ficheiro def.po � un ficheiro\n"
+"PO existente, coas traducci�ns antigas.  O ficheiro ref.po � o �ltimo\n"
+"ficheiro PO creado (xeralmente por xgettext).  Isto � �til para verificar\n"
+"que t�dalas mensaxes do programa est�n traducidas.  Cando non se pode atopar\n"
+"un emparellamento exacto, �sase coincidencia difusa, de xeito que se produza\n"
+"un mellor diagn�stico.\n"
 
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      traducións\n"
+msgstr ""
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "Modificadores de operación:\n"
+msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1420,48 +1336,48 @@
 msgstr ""
 
 #: src/msgcmp.c:324
-#, c-format
+#, fuzzy, c-format
 msgid "this message is untranslated"
-msgstr "esta mensaxe está sen traducir"
+msgstr "aviso: esta mensaxe non se usa"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "esta mensaxe ten que ser revisada polo tradutor"
+msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "esta mensaxe úsase mais non está definida..."
+msgstr "esta mensaxe �sase mais non est� definida..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...mais esta definición é semellante"
+msgstr "...mais esta definici�n � semellante"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "esta mensaxe úsase mais non está definida en %s"
+msgstr "esta mensaxe �sase mais non est� definida en %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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"
+msgstr[1] "atop�ronse %d erros graves"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
-msgstr "téñense que indicar polo menos dous ficheiros"
+msgstr "t��ense que indicar polo menos dous ficheiros"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1469,87 +1385,95 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Atopar mensaxes que son comúns a dous ou máis dos ficheiros PO indicados.\n"
-"Usando a opción --more-than, pódese requirir a concorrencia en máis ficheiros\n"
-"antes de escribir as mensaxes. Do mesmo xeito, coa opción --less-than pódese\n"
-"requirir a concorrencia en menos ficheiros antes de escribir as mensaxes\n"
-"(i.e. --less-than=2 só escribe as mensaxes únicas). As traducións,\n"
-"comentarios e comentarios de extracción consérvanse, pero só do primeiro\n"
-"ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
-"os ficheiros PO.\n"
+"  -V, --version                  amosa-la informaci�n da versi�n e sa�r\n"
+"  -w, --width=N�MERO             establece-la anchura da p�xina de sa�da\n"
+"  -<, --less-than=N�MERO         escribi-las mensaxes que te�an menos\n"
+"                                 deste n�mero de definici�ns.  Se non se\n"
+"                                 indica, � infinito\n"
+"  ->, --more-than=N�MERO         escribi-las mensaxes que te�an m�is\n"
+"                                 deste n�mero de definici�ns.  Se non se\n"
+"                                 indica, � 1\n"
+"\n"
+"Atopar mensaxes que son com�ns a dous ou m�is dos ficheiros PO indicados.\n"
+"Usando a opci�n --more-than, p�dese requiri-la concorrencia en m�is ficheiros\n"
+"antes de escribi-las mensaxes.  Do mesmo xeito, coa opci�n --less-than p�dese\n"
+"requiri-la concorrencia en menos ficheiros antes de escribir-las mensaxes\n"
+"(i.e. --less-than=2 s� escribe as mensaxes �nicas).  As traducci�ns,\n"
+"comentarios e comentarios de extracci�n mant��ense, pero s� do primeiro\n"
+"ficheiro para definilos.  Mant��ense as posici�ns de t�dolos ficheiros PO.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
-msgstr "non se indicou ningún ficheiro de entrada"
+msgstr "non se indicou ning�n ficheiro de entrada"
 
-#: src/msgen.c:263
-#, c-format
+#: src/msgen.c:253
+#, fuzzy, c-format
 msgid "exactly one input file required"
-msgstr "requírese exactamente un ficheiro de entrada"
+msgstr "prec�sanse exactamente dous ficheiros de entrada"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Uso: %s [OPCIÓN] FICHEIRO_ENTRADA\n"
+msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1558,15 +1482,15 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 #: src/msgexec.c:196
-#, c-format
+#, fuzzy, c-format
 msgid "missing command name"
-msgstr "falta o nome da orde"
+msgstr "faltan argumentos"
 
 #: src/msgexec.c:257
 #, c-format
@@ -1590,7 +1514,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1598,47 +1522,52 @@
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "produciuse un erro ao escribir a stdout"
+msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
 #, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
+#, fuzzy, c-format
 msgid "missing filter name"
-msgstr "falta o nome do filtro"
+msgstr "faltan argumentos"
 
-#: src/msgfilter.c:318
-#, c-format
+#: src/msgfilter.c:313
+#, fuzzy, c-format
 msgid "at least one sed script must be specified"
-msgstr "tense que indicar polo menos un script de sed"
+msgstr "t��ense que indicar polo menos dous ficheiros"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1646,226 +1575,192 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
-
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s e %s son mutuamente excluíntes en %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaxe traducida"
 msgstr[1] "%d mensaxes traducidas"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d tradución dubidosa"
-msgstr[1] ", %d traducións dubidosas"
+msgstr[0] ", %d traducci�n difusa"
+msgstr[1] ", %d traducci�ns difusas"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
-msgstr "Modo de operación:\n"
+msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1874,112 +1769,82 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
-#, c-format
+#: src/msgfmt.c:711
+#, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
-msgstr ""
+msgstr "non se indicou ning�n ficheiro de entrada"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
-msgid "Desktop Entry mode options:\n"
+msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:743
 #, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgid ""
+"  -c, --check                 perform all the checks implied by\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:746
 #, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
+msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:871 src/xgettext.c:934
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 
-#: src/msgfmt.c:874
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
+"      --check-domain          check for conflicts between domain directives\n"
+"                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:886 src/xgettext.c:905
-#, c-format
-msgid "Input file interpretation:\n"
-msgstr ""
-
-#: src/msgfmt.c:888
-#, c-format
-msgid ""
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
-msgstr ""
-
-#: src/msgfmt.c:891
-#, c-format
-msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-
-#: src/msgfmt.c:893
-#, c-format
-msgid ""
-"      --check-header          verify presence and contents of the header "
-"entry\n"
-msgstr ""
-
-#: src/msgfmt.c:895
-#, c-format
-msgid ""
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-msgstr ""
-
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1987,131 +1852,117 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
-#, c-format
+#: src/msgfmt.c:890
+#, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
+"%s: aviso: a cabeceira do ficheiro PO non existe, � 'fuzzy' ou � inv�lida\n"
+"%*s  aviso: a conversi�n de c�digo de caracteres non vai funcionar"
 
-#: src/msgfmt.c:1040
-#, c-format
+#: src/msgfmt.c:893
+#, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "aviso: a conversión de xogo de caracteres non vai funcionar\n"
+msgstr ""
+"Falta o c�digo de caracteres na cabeceira.\n"
+"A conversi�n da mensaxe ao c�digo do usuario non vai funcionar.\n"
 
-#: src/msgfmt.c:1050
-#, c-format
+#: src/msgfmt.c:903
+#, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
+"%s: aviso: a cabeceira do ficheiro PO non existe, � 'fuzzy' ou � inv�lida\n"
+"%*s  aviso: a conversi�n de c�digo de caracteres non vai funcionar"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "o nome de dominio «%s» non é axeitado para nome de ficheiro"
+msgstr "o nome de dominio \"%s\" non � axeitado para nome de ficheiro"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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"
+"o nome de dominio \"%s\" non � axeitado como nome de ficheiro:\n"
 "empregarase un prefixo"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "ignorouse a directiva «domain %s»"
+msgid "`domain %s' directive ignored"
+msgstr "directiva `domain %s' ignorada"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "ignorouse a entrada «msgstr» baleira"
+msgid "empty `msgstr' entry ignored"
+msgstr "entrada `msgstr' baleira ignorada"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "ignorouse a entrada «msgstr» dubidosa"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "entrada `msgstr' difusa ignorada"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: aviso: o ficheiro fonte contén traducións dubidosas"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
+msgstr "%s: aviso: o ficheiro fonte cont�n traducci�ns difusas"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "produciuse un erro ao ler «%s»"
+msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2151,30 +2002,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2182,24 +2033,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2207,54 +2058,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2266,7 +2117,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2284,13 +2135,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2300,11 +2151,11 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
-#, c-format
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
+#, fuzzy, c-format
 msgid "warning: "
-msgstr "aviso: "
+msgstr "%s: aviso: "
 
 #: src/msgl-cat.c:443
 #, c-format
@@ -2398,102 +2249,114 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
+#, fuzzy
 msgid "invalid nplurals value"
-msgstr "valor de nplurals incorrecto"
+msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
+#, fuzzy
 msgid "invalid plural expression"
-msgstr ""
+msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr "nplurals = %lu"
+msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, fuzzy, 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"
+msgstr[0] "esta mensaxe �sase mais non est� definida en %s"
+msgstr[1] "esta mensaxe �sase mais non est� definida en %s"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "esta mensaxe �sase mais non est� definida en %s"
+msgstr[1] "esta mensaxe �sase mais non est� definida en %s"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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»"
+"as entradas `msgid' e `msgid_plural' non comezan �mbalas d�as con '\\n'"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, 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»"
+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:634
-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:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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»"
+"as entradas `msgid' e `msgid_plural' non rematan �mbalas d�as con '\\n'"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, 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»"
+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:675
-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:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
-#, 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:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "falta o campo `%s' na cabeceira"
 
-#: src/msgl-check.c:831
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "falta o campo «%s» na cabeceira\n"
+#: src/msgl-check.c:784
+#, fuzzy, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "o campo `%s' da cabeceira ter�a que comezar ao principio da li�a"
+
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
+msgstr "alg�ns campos da cabeceira a�nda te�en o valor inicial por defecto"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "alg�ns campos da cabeceira a�nda te�en o valor inicial por defecto"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2501,25 +2364,23 @@
 msgstr ""
 
 #: src/msgl-iconv.c:69
-#, c-format
+#, fuzzy, 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»"
+msgstr "erro ao abrir \"%s\" para lectura"
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
-#, c-format
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
+#, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"Non é posíbel converter desde «%s» a «%s». %s depende de iconv(), e iconv() "
-"non admite esta conversión."
+"O c�digo de caracteres \"%s\" non est� soportado. %s depende de\n"
+"iconv(), e iconv() non soporta \"%s\".\n"
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2528,27 +2389,28 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
-#, c-format
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
+#, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Non é posíbel converter desde «%s» a «%s». %s depende de iconv(). Esta "
-"versión compilouse sen iconv()."
+"O c�digo de caracteres \"%s\" non est� soportado. %s depende de iconv().\n"
+"Esta versi�n foi compilada sen iconv().\n"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s só é válido con %s"
+msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
-#, c-format, no-wrap
+# src/msgmerge.c:324
+#: src/msgmerge.c:485
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -2560,62 +2422,63 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Combina dous ficheiros .po de estilo Uniforum nun só. O ficheiro def.po é\n"
-"un ficheiro PO existente coas traducións antigas, que se manterán no novo\n"
-"ficheiro se coinciden; os comentarios conservaranse, mais os comentarios\n"
-"e as posicións nos ficheiros hanse desbotar. O ficheiro ref.pot é o último\n"
-"ficheiro PO creado con referencias de orixe actualizadas pero con traducións\n"
-"antigas, ou un ficheiro PO Template (xeralmente creado por xgettext);\n"
-"calquera tradución ou comentario no ficheiro hase desbotar, mentres os\n"
-"comentarios de punto e as posicións nos ficheiros hanse conservar. Onde\n"
-"non se atope ningunha coincidencia exacta, empregarase coincidencia difusa\n"
-"para producir mellores resultados.\n"
+"\n"
+"Mestura dous ficheiros .po de estilo Uniforum nun s�.  O ficheiro def.po �\n"
+"un ficheiro PO existente coas traducci�ns antigas, que se manter�n no novo\n"
+"ficheiro se coinciden; os comentarios manter�nse, mais os comentarios e as\n"
+"posici�ns nos ficheiros ser�n eliminados.  O ficheiro ref.po � o �ltimo\n"
+"ficheiro PO creado (xeralmente polo xgettext), calquera traducci�n ou\n"
+"comentario no ficheiro ser� eliminado, mentres os comentarios de punto e\n"
+"as posici�ns nos ficheiros manter�nse.  Onde non se atope ning�n\n"
+"emparellamento exacto, empregarase o m�todo de comparaci�n difusa,\n"
+"para producir mellores resultados.  Os resultados escr�bense na sa�da\n"
+"est�ndar a menos que se indique un ficheiro de sa�da.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2627,54 +2490,54 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
-#, c-format
+#: src/msgmerge.c:1604
+#, fuzzy, c-format
 msgid "this message should define plural forms"
-msgstr "esta mensaxe debe definir formas plurais"
+msgstr "esta mensaxe �sase mais non est� definida en %s"
 
-#: src/msgmerge.c:1645
-#, c-format
+#: src/msgmerge.c:1627
+#, fuzzy, c-format
 msgid "this message should not define plural forms"
-msgstr "esta mensaxe non debe definir formas plurais"
+msgstr "esta mensaxe �sase mais non est� definida en %s"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLeronse %ld antigas + %ld referencias, mesturadas %ld, dubidosas %ld, "
-"faltan %ld, obsoletas %ld.\n"
+"%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan "
+"%ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
 msgstr " rematado.\n"
 
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
-#, c-format
+#, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s e nomes de ficheiro explícitos son mutuamente excluíntes"
+msgstr "%s e %s son mutuamente exclu�ntes"
 
 #: src/msgunfmt.c:427
 #, c-format
@@ -2730,9 +2593,9 @@
 msgstr ""
 
 #: src/msgunfmt.c:467
-#, c-format
+#, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
-msgstr ""
+msgstr "non se indicou ning�n ficheiro de entrada"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -2763,7 +2626,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2776,12 +2639,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2799,115 +2662,114 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"O xogo de caracteres «%s» non ten un nome de codificación portábel.\n"
-"A conversión da mensaxe ao xogo de caracteres do usuario podería non "
-"funcionar.\n"
+"O c�digo de caracteres \"%s\" non ten un nome portable.\n"
+"A conversi�n da mensaxe ao c�digo do usuario poder�a non funcionar.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"O código de caracteres «%s» non está admitido. %s depende de\n"
-"iconv(), e iconv() non admite «%s».\n"
+"O c�digo de caracteres \"%s\" non est� soportado. %s depende de\n"
+"iconv(), e iconv() non soporta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Se instala GNU libiconv e logo reinstala GNU gettext\n"
-"podería arranxarse o problema.\n"
+"Se instala GNU libiconv e logo reinstala o GNU gettext\n"
+"poder�a arranxarse o problema.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Continuando de calquera xeito, espere erros de análise."
+msgstr "Continuando de calquera xeito, espere atopar erros de an�lise."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Continuando de calquera xeito."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"O xogo de caracteres «%s» non está admitido. %s depende de iconv().\n"
-"Esta versión compilouse sen iconv().\n"
+"O c�digo de caracteres \"%s\" non est� soportado. %s depende de iconv().\n"
+"Esta versi�n foi compilada sen iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"Falta o xogo de caracteres na cabeceira.\n"
-"A conversión da mensaxe ao xogo de caracteres do usuario non vai funcionar.\n"
+"Falta o c�digo de caracteres na cabeceira.\n"
+"A conversi�n da mensaxe ao c�digo do usuario non vai funcionar.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "falta a sección «msgstr[]»"
+msgid "missing `msgstr[]' section"
+msgstr "falta a secci�n `msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "falta a sección «msgid_plural»"
+msgid "missing `msgid_plural' section"
+msgstr "falta a secci�n `msgid_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "falta a sección «msgstr»"
+msgid "missing `msgstr' section"
+msgstr "falta a secci�n `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "a primeira forma do plural ten un índice distinto a cero"
+msgstr "a primera forma do plural ten un �ndice distinto a cero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "a forma do plural ten un índice erróneo"
+msgstr "a forma do plural ten un �ndice err�neo"
 
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "secuencia multibyte non válida"
+msgstr "secuencia multibyte non v�lida"
 
 #: src/po-lex.c:465
-#, c-format
+#, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "secuencia multibyte incompleta ao final do ficheiro"
+msgstr "secuencia multibyte non v�lida"
 
 #: src/po-lex.c:475
-#, c-format
+#, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "secuencia multibyte incompleta ao final da liña"
+msgstr "secuencia multibyte non v�lida"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "fallo de iconv"
+msgstr ""
 
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "palabra clave «%s» descoñecida"
+msgstr "palabra chave \"%s\" desco�ecida"
 
 #: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
-msgstr "secuencia de control incorrecta"
+msgstr "secuencia de control ilegal"
 
 #: src/po-lex.c:981
 #, c-format
@@ -2917,74 +2779,81 @@
 #: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr "fin de liña nunha cadea"
+msgstr "fin de li�a nunha cadea"
 
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "definición de mensaxe duplicada"
+msgstr "definici�n de mensaxe duplicada"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
+#, fuzzy
 msgid "this is the location of the first definition"
-msgstr "este é o lugar da primeira definición"
+msgstr "...este � o lugar da primeira definici�n"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
-#, c-format
+#, fuzzy, c-format
 msgid "file \"%s\" is truncated"
-msgstr "o ficheiro «%s» está truncado"
+msgstr "ficheiro \"%s\" truncado"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL"
+msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "o ficheiro «%s» non está no formato .mo de GNU"
+msgstr "o ficheiro \"%s\" non est� no formato .mo de GNU"
 
 #: src/read-mo.c:178
-#, c-format
+#, fuzzy, 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"
+msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
+msgstr "%s:%d: aviso: constante de tipo car�cter non rematada"
 
 #: src/read-stringtable.c:802
+#, fuzzy
 msgid "warning: unterminated string"
-msgstr "aviso: cadea non rematada"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr "aviso: erro de sintaxe"
+msgstr "%s:%d: aviso: palabra chave ani�ada no argumento de palabra chave"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr ""
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr ""
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
+msgstr "%s:%d: aviso: palabra chave ani�ada no argumento de palabra chave"
 
 #: src/recode-sr-latin.c:116
-#, c-format
+#, fuzzy, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Escrito por %s e %s.\n"
+msgstr "Escrito por %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -2992,7 +2861,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Danilo Segan"
+msgstr ""
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
@@ -3006,26 +2875,25 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
-#, c-format
+#: src/recode-sr-latin.c:366
+#, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr ""
-"produciuse un erro ao converter desde a codificación «%s» á codificación «%s»"
+msgstr "erro ao abrir \"%s\" para lectura"
 
 #: src/urlget.c:159
-#, c-format
+#, fuzzy, c-format
 msgid "expected two arguments"
-msgstr "agardábanse dous argumentos"
+msgstr "demasiados argumentos"
 
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Uso: %s [OPCIÓN] URL FICHEIRO\n"
+msgstr ""
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3034,25 +2902,15 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "produciuse un erro ao ler «%s»"
-
 #: src/urlget.c:234
-#, c-format
+#, fuzzy, c-format
 msgid "error writing stdout"
-msgstr "produciuse un erro ao escribir en stdout"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "produciuse un erro despois de ler «%s»"
+msgstr "erro ao escribi-lo ficheiro \"%s\""
 
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Obtendo %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
@@ -3062,7 +2920,7 @@
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " fallou.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3098,16 +2956,16 @@
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "non é posíbel crear o ficheiro de saída «%s»"
+msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
-msgstr "saída estándar"
+msgstr "sa�da est�ndar"
 
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "produciuse un erro ao crear o directorio «%s»"
+msgstr ""
 
 #: src/write-csharp.c:766
 #, c-format
@@ -3119,17 +2977,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "non é un nome de clase Java válido: %s"
+msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3137,21 +2995,16 @@
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "produciuse un erro ao abrir «%s» para escribir"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "secuencia multibyte non válida"
+msgstr "erro ao abrir \"%s\" para escribir"
 
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"as mensaxes internacionalizadas non deben conter a secuencia de escape «\\%c»"
+"as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3160,7 +3013,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3191,9 +3044,9 @@
 msgstr ""
 
 #: src/write-resources.c:94
-#, c-format
+#, fuzzy, c-format
 msgid "error while writing to %s subprocess"
-msgstr "produciuse un erro ao escribir ao subproceso %s"
+msgstr "erro ao escribi-lo ficheiro \"%s\""
 
 #: src/write-resources.c:131
 msgid ""
@@ -3219,32 +3072,27 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
-#, c-format
+#: src/x-awk.c:341 src/x-python.c:1074
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: aviso: cadea non rematada"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/x-awk.c:592
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: aviso: expresión regular non rematada"
-
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "aviso: carácter Unicode incorrecto"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
+msgstr "%s:%d: aviso: constante de tipo car�cter non rematada"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3276,10 +3124,10 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: fallo de iconv"
+msgstr ""
 
 #: src/x-csharp.c:338
 #, c-format
@@ -3288,15 +3136,15 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
+#: src/x-csharp.c:1390 src/x-python.c:1281
+#, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: aviso: carácter Unicode incorrecto"
+msgstr "%s:%d: aviso: constante de tipo car�cter non rematada"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: aviso: constante de cadea non rematada"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
@@ -3308,88 +3156,24 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
-#, c-format
+#: src/x-glade.c:657
+#, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"A linguaxe «glade» non está admitida. %s depende de expat.\n"
-"Esta versión compilouse sen expat.\n"
+"O c�digo de caracteres \"%s\" non est� soportado. %s depende de iconv().\n"
+"Esta versi�n foi compilada sen iconv().\n"
 
 #: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr ""
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr ""
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr ""
-
-#: src/x-javascript.c:1069
 #, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: aviso: cadea non rematada"
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/x-perl.c:308
 #, c-format
@@ -3412,9 +3196,9 @@
 msgstr ""
 
 #: src/x-perl.c:1217
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr ""
+msgstr "%s: opci�n non v�lida -- %c\n"
 
 #: src/x-perl.c:1230
 #, c-format
@@ -3426,13 +3210,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3440,7 +3224,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3448,7 +3232,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3456,7 +3240,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3464,7 +3248,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3472,7 +3256,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3488,9 +3272,9 @@
 msgstr ""
 
 #: src/x-rst.c:207
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
-msgstr ""
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3499,61 +3283,50 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: aviso: literal de cadea non rematada"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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"
+msgstr "non se pode usar --join-existing cando a sa�da se escribe en stdout"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext non funciona sen palabras clave polas que buscar"
+msgstr "xgettext non funciona sen palabras chave polas que buscar"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, 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"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "aviso: o ficheiro `%s' coa extensi�n `%s' � desco�ecido; tentar�se C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
-#, c-format
+#: src/xgettext.c:852
+#, fuzzy, c-format
 msgid "Choice of input file language:\n"
-msgstr ""
+msgstr "non se indicou ning�n ficheiro de entrada"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3562,45 +3335,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3610,37 +3382,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3648,85 +3416,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (só linguaxe C++)\n"
+msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3734,7 +3501,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3742,52 +3509,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
-msgstr "entrada estándar"
+msgstr "entrada est�ndar"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
-#, c-format
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
+#, fuzzy, c-format
 msgid "%s%s: warning: "
-msgstr "%s%s: aviso: "
+msgstr "%s: aviso: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3796,59 +3563,56 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "linguaxe «%s» descoñecida"
+msgid "language `%s' unknown"
+msgstr "linguaxe `%s' desco�ecida"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "o campo «%s» da cabeceira tería que comezar ao principio da liña\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "algúns campos da cabeceira aínda teñen o valor inicial predefinido\n"
-
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opción ilegal -- %c\n"
+#~ msgstr "%s: opci�n ilegal -- %c\n"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "o campo `%s' a�nda ten o valor inicial por defecto"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -3858,338 +3622,216 @@
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Isto é software libre; vexa o código para as condicións de copia.  NON "
+#~ "Isto � software libre; vexa o c�digo para as condici�ns de copia.  NON "
 #~ "hai\n"
-#~ "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
+#~ "ningunha garant�a; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
 #~ "FIN DETERMINADO.\n"
 
-#~ msgid ""
-#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-#~ "  -e                        enable expansion of some escape sequences\n"
-#~ "  -E                        (ignored for compatibility)\n"
-#~ "  -h, --help                display this help and exit\n"
-#~ "  -n                        suppress trailing newline\n"
-#~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-#~ "                            to MSGID from TEXTDOMAIN\n"
-#~ msgstr ""
-#~ "Uso: %s [OPCIÓN] [[DOMINIO] MSGID | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=DOMINIO      obte-las mensaxes traducidas do DOMINIO\n"
-#~ "  -e                        permiti-la expansión dalgunhas secuencias de "
-#~ "escape\n"
-#~ "  -E                        (ignorado por compatibilidade)\n"
-#~ "  -h, --help                mostrar esta axuda e saír\n"
-#~ "  -n                        suprimi-lo carácter de nova liña\n"
-#~ "  -V, --version             amosa-la información da versión e saír\n"
-#~ "  [DOMINIO] MSGID           obte-la mensaxe traducida correspondente a\n"
-#~ "                            MSGID do DOMINIO\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "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"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' "
-#~ "command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those "
-#~ "messages\n"
-#~ "found in the selected catalog are translated.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Se non se indica o parámetro DOMINIO, o dominio obténse da variable de "
-#~ "ambiente\n"
-#~ "TEXTDOMAIN.  Se o catálogo de mensaxes non está no directorio habitual,\n"
-#~ "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n"
-#~ "Cando se usa a opción -s, o programa compórtase como o comando `echo'.\n"
-#~ "Pero non só copia os argumentos á saída, senón que traduce as mensaxes\n"
-#~ "que atopa no catálogo escollido.\n"
-#~ "Directorio estándar de busca: %s\n"
+#~ msgid "%s: warning: "
+#~ msgstr "%s: aviso: "
 
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "esta mensaxe non ten definición no dominio \"%s\""
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
 
-#~ msgid "while preparing output"
-#~ msgstr "ao preparar a saída"
+#, fuzzy
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%d: aviso: literal de cadea non rematada"
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] INPUTFILE ...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
 #~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "  -h, --help                     display this help and exit\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] FICHEIRO ...\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
-#~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -d, --default-domain=NOME      usar NOME.po para a saída (en vez de\n"
-#~ "                                 messages.po)\n"
-#~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO á lista de busca de\n"
-#~ "                                 ficheiros de entrada\n"
-#~ "  -e, --no-escape                non usar secuencias de escape de C na "
-#~ "saída\n"
-#~ "                                 (opción por defecto)\n"
-#~ "  -E, --escape                   usar secuencias de escape de C na "
-#~ "saída,\n"
-#~ "                                 sen caracteres estendidos\n"
-#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
-#~ "do\n"
-#~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea "
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
 #~ "baleiro\n"
-#~ "  -F, --sort-by-file             ordena-la saída pola posición do "
-#~ "ficheiro\n"
-#~ "  -h, --help                     amosar esta axuda e saír\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
 #~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
-#~ "                                 that only unique messages be printed\n"
-#~ msgstr ""
-#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
-#~ "indentado\n"
-#~ "      --no-location              non escribi-las liñas '#: ficheiro:"
-#~ "liña'\n"
-#~ "  -n, --add-location             xera-las liñas '#: ficheiro:"
-#~ "liña' (defecto)\n"
-#~ "      --omit-header              non escribi-la entrada `msgid \"\"' na\n"
-#~ "                                 cabeceira\n"
-#~ "  -o, --output=FICHEIRO          escribi-la saída ao ficheiro indicado\n"
-#~ "  -p, --output-dir=DIRECTORIO    pó-los ficheiros de saída no DIRECTORIO\n"
-#~ "  -s, --sort-output              ordena-la saída e quita-los duplicados\n"
-#~ "      --strict                   escribi-lo ficheiro .po de tipo "
-#~ "Uniforum\n"
-#~ "                                 estricto\n"
-#~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
-#~ "  -u, --unique                   atallo para --less-than=2, só escribi-"
-#~ "las\n"
-#~ "                                 mensaxes únicas\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] filename.po ...\n"
-#~ "Generate binary message catalog from textual translation description.\n"
-#~ "\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
-#~ "%d)\n"
-#~ "  -c, --check                 perform language dependent checks on "
-#~ "strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash "
-#~ "table\n"
-#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
-#~ "      --statistics            print statistics about translations\n"
-#~ "      --strict                enable strict Uniforum mode\n"
-#~ "  -v, --verbose               list input file anomalies\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "\n"
-#~ "Giving the -v option more than once increases the verbosity level.\n"
-#~ "\n"
-#~ "If input file is -, standard input is read.  If output file is -,\n"
-#~ "output is written to standard output.\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] ficheiro.po ...\n"
-#~ "Xera un catálogo de mensaxes binario a partir da descripción textual da\n"
-#~ "traducción.\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
-#~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -a, --alignment=NÚMERO      aliña-las cadeas a NÚMERO bytes (defecto: "
-#~ "%d)\n"
-#~ "  -c, --check                 facer comprobacións dependentes da "
-#~ "linguaxe\n"
-#~ "                              nas cadeas\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
+#~ "mensaxes,\n"
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
 #~ "ficheiros\n"
 #~ "                              de entrada\n"
-#~ "  -f, --use-fuzzy             utiliza-las entradas fuzzy na saída\n"
-#~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "      --no-hash               non incluí-la tabla \"hash\" no ficheiro "
-#~ "binario\n"
-#~ "  -o, --output-file=FICHEIRO  especifica-lo nome do ficheiro de saída\n"
-#~ "      --statictics            escribi-las estatísticas das traduccións\n"
-#~ "      --strict                emprega-lo modo Uniforum estricto\n"
-#~ "  -v, --verbose               amosa-las anomalías do ficheiro de entrada\n"
-#~ "  -V, --version               amosa-la información da versión e saír\n"
-#~ "\n"
-#~ "Empregando a opción -v máis dunha vez, o nivel de detalle increméntase.\n"
-#~ "\n"
-#~ "Se o ficheiro de entrada é -, lese da entrada estándar.  Se o ficheiro de "
-#~ "saída\n"
-#~ "é -, o resultado escríbese na saída estándar.\n"
-
-#~ msgid "while creating hash table"
-#~ msgstr "ao crea-la táboa `hash'"
-
-#~ msgid ""
-#~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
-#~ "%*s  warning: charset conversion will not work"
-#~ msgstr ""
-#~ "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é "
-#~ "inválida\n"
-#~ "%*s  aviso: a conversión de código de caracteres non vai funcionar"
-
-#~ msgid "field `%s' still has initial default value"
-#~ msgstr "o campo `%s' aínda ten o valor inicial por defecto"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
+#~ "sen\n"
+#~ "                              caracteres estendidos\n"
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
+#~ "baleiro\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
+#~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
+#~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] def.po ref.po\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -C, --compendium=FILE       additional library of message "
-#~ "translations,\n"
-#~ "                              may be specified more than once\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "      --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "  -i, --indent                indented output style\n"
-#~ "  -o, --output-file=FILE      result will be written to FILE\n"
+#~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
 #~ "      --add-location          preserve '#: filename:line' lines "
 #~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
-#~ "  -v, --verbose               increase verbosity level\n"
-#~ "  -V, --version               output version information and exit\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "      --sort-output           generate sorted output\n"
+#~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] def.po ref.po\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios\n"
-#~ "para as opcións curtas.\n"
-#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traduccións de "
+#~ "Uso: %s [OPCI�N] def.po ref.po\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios\n"
+#~ "para as opci�ns curtas.\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traducci�ns de "
 #~ "mensaxes,\n"
-#~ "                              pode ser indicada máis dunha vez\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "                              pode ser indicada m�is dunha vez\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
 #~ "ficheiros\n"
 #~ "                              de entrada\n"
 #~ "  -e, --no-escape             non usar secuencias de escape de C na "
-#~ "saída\n"
-#~ "                              (opción por defecto)\n"
-#~ "  -E, --escape                usar secuencias de escape de C na saída, "
+#~ "sa�da\n"
+#~ "                              (opci�n por defecto)\n"
+#~ "  -E, --escape                usar secuencias de escape de C na sa�da, "
 #~ "sen\n"
 #~ "                              caracteres estendidos\n"
-#~ "      --force-po              escribi-lo ficheiro po aínda que estea "
+#~ "      --force-po              escribi-lo ficheiro po a�nda que estea "
 #~ "baleiro\n"
-#~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "  -i, --indent                estilo de saída indentado\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "  -i, --indent                estilo de sa�da indentado\n"
 #~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
-#~ "      --no-location           suprimi-las liñas '#: ficheiro:liña'\n"
-#~ "      --add-location          mante-las liñas '#: ficheiro:liña' (por "
-#~ "omisión)\n"
-#~ "      --strict                estilo de saída Uniforum estricto\n"
+#~ "      --no-location           suprimi-las li�as '#: ficheiro:li�a'\n"
+#~ "      --add-location          mante-las li�as '#: ficheiro:li�a' (por "
+#~ "omisi�n)\n"
+#~ "      --strict                estilo de sa�da Uniforum estricto\n"
 #~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
-#~ "  -V, --version               amosa-la información da versión e saír\n"
-#~ "  -w, --width=NÚMERO          establece-la anchura da páxina de saída\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO          establece-la anchura da p�xina de sa�da\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] [FILE]...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "Output details:\n"
 #~ "  -e, --no-escape          do not use C escapes in output (default)\n"
 #~ "  -E, --escape             use C escapes in output, no extended chars\n"
 #~ "      --force-po           write PO file even if empty\n"
-#~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
-#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
-#~ "  -V, --version            output version information and exit\n"
 #~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] [FICHEIRO]...\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
+#~ "Uso: %s [OPCI�N] [FICHEIRO]...\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
 #~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -e, --no-escape          non usar secuencias de escape de C na saída "
+#~ "as opci�ns curtas.\n"
+#~ "  -e, --no-escape          non usar secuencias de escape de C na sa�da "
 #~ "(por\n"
 #~ "                           defecto)\n"
-#~ "  -E, --escape             usar secuencias de escape de C na saída, sen\n"
+#~ "  -E, --escape             usar secuencias de escape de C na sa�da, sen\n"
 #~ "                           caracteres estendidos\n"
-#~ "      --force-po           escribi-lo ficheiro PO aínda que estea "
+#~ "      --force-po           escribi-lo ficheiro PO a�nda que estea "
 #~ "baleiro\n"
-#~ "  -h, --help               amosar esta axuda e saír\n"
-#~ "  -i, --indent             escribi-la saída cun estilo indentado\n"
-#~ "  -o, --output-file=FICH   escribi-la saída en FICH en vez da saída "
-#~ "estándar\n"
-#~ "  -V, --version            amosa-la información da versión e saír\n"
-#~ "  -w, --width=NÚMERO       establece-la anchura da páxina de saída\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Convert binary .mo files to Uniforum style .po files.\n"
-#~ "Both little-endian and big-endian .mo files are handled.\n"
-#~ "If no input file is given or it is -, standard input is read.\n"
-#~ "By default the output is written to standard output.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Converte ficheiros .mo binarios en ficheiros .po de estilo Uniforum.\n"
-#~ "Manéxanse ficheiros .po little-endian e big-endian.\n"
-#~ "Se non se indicou un ficheiro de entrada, ou é -, lese a entrada "
-#~ "estándar\n"
-#~ "Por defecto a saída escríbese na saída estándar.\n"
-
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "fallo ao desprazarse á posición %2$ld de \"%1$s\""
+#~ "  -h, --help               amosar esta axuda e sa�r\n"
+#~ "  -i, --indent             escribi-la sa�da cun estilo indentado\n"
+#~ "  -o, --output-file=FICH   escribi-la sa�da en FICH en vez da sa�da "
+#~ "est�ndar\n"
+#~ "  -V, --version            amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  -w, --width=N�MERO       establece-la anchura da p�xina de sa�da\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 #~ "  -e                        enable expansion of some escape sequences\n"
 #~ "  -E                        (ignored for compatibility)\n"
 #~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
 #~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
-#~ "(plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this "
-#~ "value\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
 #~ msgstr ""
-#~ "Uso: %s [OPCIÓN] [DOMINIO] MSGID MSGID-PLURAL CONTADOR\n"
-#~ "  -d, --domain=DOMINIO      obte-la mensaxe traducida do DOMINIO\n"
-#~ "  -e                        permiti-la expansión dalgunhas secuencias de "
+#~ "Uso: %s [OPCI�N] [[DOMINIO] MSGID | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=DOMINIO      obte-las mensaxes traducidas do DOMINIO\n"
+#~ "  -e                        permiti-la expansi�n dalgunhas secuencias de "
 #~ "escape\n"
-#~ "  -E                        (ignorada por compatibilidade)\n"
-#~ "  -h, --help                amosar esta axuda e saír\n"
-#~ "  -V, --version             amosa-la información da versión e saír\n"
-#~ "  [DOMINIO]                 obte-la mensaxe traducida do DOMINIO\n"
-#~ "  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL "
-#~ "(plural)\n"
-#~ "  CONTADOR                  escoller a forma singular/plural segundo este "
-#~ "valor\n"
+#~ "  -E                        (ignorado por compatibilidade)\n"
+#~ "  -h, --help                mostrar esta axuda e sa�r\n"
+#~ "  -n                        suprimi-lo car�cter de nova li�a\n"
+#~ "  -V, --version             amosa-la informaci�n da versi�n e sa�r\n"
+#~ "  [DOMINIO] MSGID           obte-la mensaxe traducida correspondente a\n"
+#~ "                            MSGID do DOMINIO\n"
 
+#, fuzzy
 #~ msgid ""
-#~ "\n"
 #~ "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 "
@@ -4200,153 +3842,97 @@
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Se non se indica o parámetro DOMINIO, o dominio obtense da variable de "
+#~ "Se non se indica o par�metro DOMINIO, o dominio obtense da variable de "
 #~ "ambiente\n"
-#~ "TEXTDOMAIN.  Se o catálogo de mensaxes non está no directorio habitual,\n"
-#~ "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n"
-#~ "Directorio estándar de busca: %s\n"
+#~ "TEXTDOMAIN.  Se o cat�logo de mensaxes non est� no directorio habitual,\n"
+#~ "p�dese especificar outro mediante a variable TEXTDOMAINDIR.\n"
+#~ "Directorio est�ndar de busca: %s\n"
 
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+#~ msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "fallo ao desprazarse � posici�n %2$ld de \"%1$s\""
+
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
+
+#~ msgid "while creating hash table"
+#~ msgstr "ao crea-la t�boa `hash'"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: keyword between outer keyword and its arg"
+#~ msgstr ""
+#~ "%s:%d: aviso: palabra chave entre a palabra externa e o seu argumento"
+
+#~ msgid "while preparing output"
+#~ msgstr "ao preparar a sa�da"
+
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "esta mensaxe non ten definici�n no dominio \"%s\""
 
 #~ msgid ""
-#~ "Usage: %s [OPTION] INPUTFILE ...\n"
-#~ "Extract translatable string from given input files.\n"
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --extract-all              extract all strings\n"
-#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
-#~ "                                 preceding keyword lines) in output file\n"
-#~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision "
-#~ "result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ "  -c, --check                 perform language dependent checks on "
+#~ "strings\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
 #~ "search\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign "
-#~ "user\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ msgstr ""
-#~ "Uso: %s [OPCIÓN] FICHEIRO_ENTRADA ...\n"
-#~ "Extrae as cadeas traducibles dos ficheiros de entrada indicados.\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
+#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "  -v, --verbose               list input file anomalies\n"
+#~ "  -V, --version               output version information and exit\n"
 #~ "\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
-#~ "para\n"
-#~ "as opcións curtas.\n"
-#~ "  -a, --extract-all              extraer tódalas cadeas\n"
-#~ "  -c, --add-comments[=ETIQUETA]  poñe-los bloques de comentarios con\n"
-#~ "                                 ETIQUETA (ou os que preceden ás liñas "
-#~ "de\n"
-#~ "                                 palabras chave) no ficheiro de saída\n"
-#~ "  -C, --c++                      atallo para --language=C++\n"
-#~ "      --debug                    producir resultados máis detallados do\n"
-#~ "                                 recoñecemento das cadeas de formato\n"
-#~ "  -d, --default-domain=NOME      usar NOME.po para a saída (en vez de\n"
-#~ "                                 messages.po)\n"
-#~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO á lista de busca de\n"
-#~ "                                 ficheiros de entrada\n"
-#~ "  -e, --no-escape                non usar secuencias de escape de C na "
-#~ "saída\n"
-#~ "                                 (opción por defecto)\n"
-#~ "  -E, --escape                   usar secuencias de escape de C na saída, "
-#~ "sen\n"
-#~ "                                 caracteres estendidos\n"
-#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
-#~ "de\n"
-#~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea "
-#~ "baleiro\n"
-#~ "      --foreign-user             non amosa-lo copyright da FSF para os\n"
-#~ "                                 usuarios non ingleses\n"
-#~ "  -F, --sort-by-file             ordena-la saída pola localización do "
-#~ "ficheiro\n"
-
-#~ msgid ""
-#~ "  -h, --help                     display this help and exit\n"
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
-#~ "(without\n"
-#~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C+"
-#~ "+, PO),\n"
-#~ "                                 otherwise is guessed from file "
-#~ "extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
-#~ "entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
-#~ "entries\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ msgstr ""
-#~ "  -h, --help                     amosar esta axuda e saír\n"
-#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
-#~ "indentado\n"
-#~ "  -j, --join-existing            mestura-las mensaxes co ficheiro "
-#~ "existente\n"
-#~ "  -k, --keyword[=PALABRA]        buscar palabra chave adicional (sen "
-#~ "PALABRA\n"
-#~ "                                 indica que non se usen as palabras "
-#~ "chave\n"
-#~ "                                 por defecto)\n"
-#~ "  -L, --language=NOME            recoñece-la linguaxe indicada (C, C++, "
-#~ "PO),\n"
-#~ "                                 doutro xeito adivíñase a partir da "
-#~ "extensión\n"
-#~ "                                 do ficheiro\n"
-#~ "  -m, --msgstr-prefix[=CADEA]    usar CADEA ou \"\" como prefixo para as\n"
-#~ "                                 entradas msgstr\n"
-#~ "  -M, --msgstr-suffix[=CADEA]    usar CADEA ou \"\" como sufixo para as\n"
-#~ "                                 entradas msgstr\n"
-#~ "      --no-location              non escribi-las liñas '#: ficheiro:"
-#~ "liña'\n"
-
-#~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -V, --version                  output version information and exit\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
 #~ "\n"
-#~ "If INPUTFILE is -, standard input is read.\n"
+#~ "If input file is -, standard input is read.  If output file is -,\n"
+#~ "output is written to standard output.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             xera-las liñas '#: ficheiro:"
-#~ "liña' (defecto)\n"
-#~ "      --omit-header              non escribi-la cabeceira coa entrada\n"
-#~ "                                 `msgid \"\"'\n"
-#~ "  -o, --output=FICHEIRO          escribi-la saída no ficheiro indicado\n"
-#~ "  -p, --output-dir=DIRECTORIO    pó-los ficheiros de saída no DIRECTORIO\n"
-#~ "  -s, --sort-output              ordena-la saída e quita-los duplicados\n"
-#~ "      --strict                   escribi-lo ficheiro .po de tipo "
-#~ "Uniforum\n"
-#~ "                                 estricto\n"
-#~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
-#~ "  -V, --version                  amosa-la información da versión e saír\n"
-#~ "  -w, --width=NÚMERO             establece-la anchura da páxina de saída\n"
-#~ "  -x, --exclude-file=FICHEIRO    non extrae-las entradas indicadas en "
-#~ "FICHEIRO\n"
+#~ "Uso: %s [OPCI�N] ficheiro.po ...\n"
+#~ "Xera un cat�logo de mensaxes binario a partir da descripci�n textual da\n"
+#~ "traducci�n.\n"
+#~ "Os argumentos obrigatorios para as opci�ns longas son tam�n obrigatorios "
+#~ "para\n"
+#~ "as opci�ns curtas.\n"
+#~ "  -a, --alignment=N�MERO      ali�a-las cadeas a N�MERO bytes (defecto: "
+#~ "%d)\n"
+#~ "  -c, --check                 facer comprobaci�ns dependentes da "
+#~ "linguaxe\n"
+#~ "                              nas cadeas\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO � lista de busca de "
+#~ "ficheiros\n"
+#~ "                              de entrada\n"
+#~ "  -f, --use-fuzzy             utiliza-las entradas fuzzy na sa�da\n"
+#~ "  -h, --help                  amosar esta axuda e sa�r\n"
+#~ "      --no-hash               non inclu�-la tabla \"hash\" no ficheiro "
+#~ "binario\n"
+#~ "  -o, --output-file=FICHEIRO  especifica-lo nome do ficheiro de sa�da\n"
+#~ "      --statictics            escribi-las estat�sticas das traducci�ns\n"
+#~ "      --strict                emprega-lo modo Uniforum estricto\n"
+#~ "  -v, --verbose               amosa-las anomal�as do ficheiro de entrada\n"
+#~ "  -V, --version               amosa-la informaci�n da versi�n e sa�r\n"
 #~ "\n"
-#~ "Se o FICHEIRO_ENTRADA é -, lese a entrada estándar.\n"
-
-#~ msgid "%s:%d: warning: keyword nested in keyword arg"
-#~ msgstr "%s:%d: aviso: palabra chave aniñada no argumento de palabra chave"
-
-#~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
-#~ msgstr ""
-#~ "%s:%d: aviso: palabra chave entre a palabra externa e o seu argumento"
+#~ "Empregando a opci�n -v m�is dunha vez, o nivel de detalle increm�ntase.\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada � -, lese da entrada est�ndar.  Se o ficheiro de "
+#~ "sa�da\n"
+#~ "� -, o resultado escr�bese na sa�da est�ndar.\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/id.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/id.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/id.po gettext-0.18.1.1/gettext-tools/po/id.po
--- gettext-0.19.3/gettext-tools/po/id.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/id.po	2010-06-06 12:49:57.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -29,27 +29,28 @@
 msgstr "argumen %s ambigu untuk %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Argumen yang valid adalah:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "tidak dapat menemukan direktori sementara, coba set konfigurasi $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "tidak dapat membuat sebuah direktori sementara menggunakan template \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "tidak dapat menghapus berkas sementara %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "tidak dapat menghapus direktori sementara %s"
@@ -58,38 +59,37 @@
 msgid "write error"
 msgstr "tulis error"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "error ketika membuka \"%s\" untuk dibaca"
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "tidak dapat membuka berkas backup \"%s\" untuk ditulis"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "error ketika membaca \"%s\""
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "error ketika menulis \"%s\""
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "error setelah membaca \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -106,98 +106,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# mesin maya tidak ditemukan, coba pasang pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subproses gagal"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pilihan '--%s' membutuhkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tidak diketahui '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tidak diketahui '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan '-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argumen source_version tidak valid untuk compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "gagal untuk membuat \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error ketika menulis berkas \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Kompiler java tidak ditemukan, coba pasang gcj atau set $JAVAC"
@@ -207,96 +207,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Mesin maya java tidak ditemukan, coba pasang gij atau set $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subproses I/O error"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "baca dari %s subproses gagal"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "komunikasi dengan %s subproses gagal"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s subproses berakhir dengan kode keluar %d"
+msgid "cannot create pipe"
+msgstr "tidak dapat membuat pipe"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "tidak dapat membuat pipe"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gagal"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "tidak dapat mengembalikan deskripsi berkas %d: dup2 gagal"
@@ -312,21 +274,14 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subproses mendapatkan sinyal fatal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error ketika membuka \"%s\" untuk dibaca"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' bukan sebuah format string %s yang sah, tidak seperti '%s'. Karena: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -337,19 +292,17 @@
 "dalam '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen %u tidak sama"
@@ -359,7 +312,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktif nomor %u berawal dengan | tetapi tidak berakhir dengan |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -369,21 +322,19 @@
 "penspesifikasi makor. Nama makro yang valid terdaftar dalam ISO C 99 bagian "
 "7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "Dalam direktif nomor %u, token setelah '<' tidak diikuti dengan '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "String yang mereferensi ke argumen nomor %u tetapi mengabaikan argumen nomor "
 "%u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam '%s' dan '%s' tidak cocok"
@@ -480,16 +431,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s' tidak digunakan %%m tetapi '%s' menggunakan %%m"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' menggunakan %%m tetapi '%s' tidak"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' tidak digunakan %%m tetapi '%s' menggunakan %%m"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "String berakhir ditengan dari sebuah direktif."
@@ -702,9 +643,7 @@
 "Dalam direktif nomor %u, ukuran penspesifikasi tidak kompatibel dengan "
 "penspesifkasi konversi '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen '%s' tidak ada dalam '%s'"
@@ -754,33 +693,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen '%s' tidak sama"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -833,11 +745,11 @@
 "Karakter yang mengakhiri nomor direktif %u bukan sebuah angka diantara 1 dan "
 "9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -850,58 +762,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Tampilkan nama host mesin.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format keluaran:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nama pendek host\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -912,34 +824,34 @@
 "domain\n"
 "                                nama, dan aliases\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            alamat untuk hostname\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
@@ -948,41 +860,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "tidak dapat mendapatkan nama host"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "di paling tidak satu berkas masukan diijinkan"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -991,33 +905,33 @@
 "Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
 "dan manipulasi atribut.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek juga.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1025,34 +939,34 @@
 "  -D, --directory=DIREKTORI   tambahkan DIREKTORI ke daftar pencarian "
 "masukan berkas\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
 "masukan yang dibaca.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=BERKAS    tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1061,12 +975,12 @@
 "Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
 "dispesifikasikan atau jika ini adalah -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Pemilihan pesan:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1074,7 +988,7 @@
 "      --translated            simpan terjemahan, hapus pesan tidak "
 "diterjemahkan\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1082,61 +996,52 @@
 "      --untranslated          simpan tidak terjemahkan, hapus pesan "
 "terjemahan\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            simpan pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           hapus pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         simpan pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulasi atribut:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set seluruh pesan 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "     --clear-fuzzy            set seluruh pesan non-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set seluruh pesan sudah ditinggalkan\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set seluruh pesan tidak ditinggalkan\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              simpan msgids sebelumnya dari pesan yang "
-"diterjemahkan\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1144,13 +1049,7 @@
 msgstr ""
 "      --clear-previous        hapus \"previous msgid\" dari seluruh pesan\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1158,7 +1057,7 @@
 "      --only-file=BERKAS.po   hanya manipulasi masukan terdaftar dalam "
 "BERKAS.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1166,13 +1065,13 @@
 "      --ignore-file=BERKAS.po hanya manipulasi masukan tidak terdaftar dalam "
 "BERKAS.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim untuk --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1180,16 +1079,16 @@
 "      --obsolete               sinonim untuk --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaks berkas masukan:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1197,8 +1096,8 @@
 "  -P, --properties-input      berkas masukan berada dalam .properties "
 "sintaks Java\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1207,17 +1106,17 @@
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NexTstep/GNUstep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1231,27 +1130,27 @@
 "                              KETIKA dapat berupa 'always', 'never', 'auto', "
 "atau 'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, 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:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1259,69 +1158,69 @@
 "  -E, --escape                gunakan C escape dalam keluaran, bukan "
 "karakter ekstensi\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                tulis strict Uniforum konform berkas .po\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANGKA           set keluaran lebar halaman\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1332,34 +1231,34 @@
 "                              dari lebar halaman keluaran, dalam beberapa "
 "beris\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 "kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1367,9 +1266,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Potong dan gabungkan berkas PO yang dispesifikasikan.\n"
 "Temukan pesan yang umum di antara dua/lebih berkas PO yang dispesifikasikan.\n"
@@ -1380,25 +1279,25 @@
 "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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1408,7 +1307,7 @@
 "                              definisi ini, baku ke tidak terhingga jika "
 "tidak diset\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1417,7 +1316,7 @@
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih besar dari \n"
 "                              definisi ini, baku ke 0 jika tidak diset\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1426,8 +1325,8 @@
 "  -u, --unique                kependekan untuk --less-than=2, diminta\n"
 "                              hanya pesan unik untuk ditampilkan\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1435,8 +1334,8 @@
 "  -P, --properties-input      berkas masukan berada dalam sintaks ."
 "properties Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1445,12 +1344,12 @@
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMA          pengkodean untuk keluaran\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1461,7 +1360,7 @@
 "                              setiap pesan, jangan gabungkan beberapa "
 "terjemahan.\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1469,21 +1368,21 @@
 "      --lang=NAMAKATALOG      isi baris 'Language' dalam masukan header\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter MIller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "dibutuhkan tepat 2 berkas input"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Penggunaan: %s [PILIHAN] def.po ref.pot\n"
@@ -1515,12 +1414,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referensi ke sumber\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operasi pemodifikasi:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1529,7 +1428,7 @@
 "  -m, --multi-domain          aplikasikan ref.pot ke setiap dari domain "
 "dalam def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     jangan gunakan fuzzy matching\n"
@@ -1555,17 +1454,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "pesan ini butuh untuk diulas oleh penerjemah"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "pesan ini digunakan tapi tidak didefinisikan..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...tetapi definisi ini serupa"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
@@ -1575,27 +1474,27 @@
 msgid "warning: this message is not used"
 msgstr "peringatan: pesan ini tidak digunakan"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "paling tidak dua berkas harus dispesifikasikan"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1607,7 +1506,7 @@
 "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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1616,71 +1515,71 @@
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           jangan tulis header dengan masukan `msgid "
 "\"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Target konversi:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Pengkodean baku adalah pengkodean lokal sekarang.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                gaya keluaran terindentasi\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           tekan '#: nama berkas:baris' baris\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          simpan '#: nama berkas: baris' baris (baku)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tepatnya sebuah berkas masukan dibutuhkan"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Penggunaan: %s [PILIHAN] BERKAS MASUKAN\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1693,7 +1592,7 @@
 "(secara umum dibuat oleh xgettext). Masukan yang tidak diterjemahkan diberikan\n"
 "sebuah terjemahan yang identik dengan msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO atau POT\n"
@@ -1732,7 +1631,7 @@
 "Sebuah perintah bawaan dipanggil '0' mengeluarkan terjemahan, diikuti oleh sebuah\n"
 "null byte. Keluaran dari \"msgexec 0\" cocok sebagai sebuah masukan untuk \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  masukan berkas PO\n"
@@ -1742,29 +1641,34 @@
 msgid "write to stdout failed"
 msgstr "penulisan ke stdout gagal"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "tulis ke %s subproses gagal"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "hilang nama penyaring"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "paling tidak sebuah script sed harus dispesifikasikan"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN] PENYARING [PILIHAN-PENYARING]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog "
 "terjemahan.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1774,19 +1678,19 @@
 "standar masukan\n"
 "dan menulis sebuah terjemahan termodifikasi ke standar keluaran.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Sangat berguna FILTER-OPTIONs ketika PENYARING adalah 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     tambahkan SCRIPT ke perintah yang dijalankan\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1796,14 +1700,14 @@
 "  -f, --file=SCRIPTFILE       tambahkan isi dari SCRIPTFILE ke perintah\n"
 "                                untuk dijalankan\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       tekan pencetakan otomatis dari ruang pola\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1811,12 +1715,12 @@
 "      --no-escape             jangan gunakan C escapes dalam keluaran "
 "(baku)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1824,104 +1728,81 @@
 "      --keep-header           simpan masukan header tidak termodifikasi, "
 "janya saring itu\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-d direktori\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s dan %s adalah mutually exclusive"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s hanya valid dengan %s atau %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s hanya valid dengan %s, %s atau %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d pesan diterjemahkan"
 msgstr[1] "%d pesan diterjemahkan"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d terjemahan fuzzy"
 msgstr[1] ", %d terjemahan fuzzy"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1930,17 +1811,17 @@
 "Argumen wajib ke pilihan panjang juga wajib untuk pilihan pendek juga.\n"
 "Sama untuk opsional argumen.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1949,7 +1830,7 @@
 "  -j, --java                  Mode: java menghasilkan sebuah class Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1958,13 +1839,13 @@
 "      --java2                 seperti --java, dan asumsikan Java2 (JDK 1.2 "
 "atau lebih tinggi)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1973,45 +1854,39 @@
 "      --csharp-resources      mode resources C#: hasilkan sbeuah berkas ."
 "resources .NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     nama resource\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2019,23 +1894,14 @@
 msgstr ""
 "  -l, --locale=LOKAL          nama lokal, baik bahasa atau bahasa_NEGARA\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   mode Tcl: masukan adalah sebuah berkas .msg "
-"tcl/msgcat\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2048,12 +1914,12 @@
 "dibawah\n"
 "direktoris yang dispesifikasikan.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2062,7 +1928,7 @@
 "  -d DIREKTORI                basis direktori untuk lokal dependen berkas ."
 "dll\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2071,18 +1937,18 @@
 "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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2091,45 +1957,12 @@
 "Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
 "dispesifikasikan.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, 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:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
-"  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2141,13 +1974,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          periksa format string tergantung bahasa\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2156,7 +1989,7 @@
 "      --check-header          verifikasi keberadaan dan isi dari masukan "
 "header\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2166,7 +1999,7 @@
 "domain\n"
 "                               dan pilihan --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2175,7 +2008,7 @@
 "  -C, --check-compatibility   periksa GNU msgfmt berlaku seperti X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2185,28 +2018,19 @@
 "      --check-accelerators[=CHAR]  periksa keberadaan dari akselerator\n"
 "                                keyboard untuk item menu\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, 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:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2214,93 +2038,82 @@
 "      --no-hash               berkas binari tidak akan dimasukan dalam tabel "
 "hash\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            tampilkan statistik mengenai terjemahan\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               naikan tingkat keramaian\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "peringatan: header berkas PO hilang atau tidak valid\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "peringatan: konversi set karakter tidak akan bekerja\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "peringatan: header berkas PO fuzzy\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "direktif `domain %s' diabaikan"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2309,7 +2122,7 @@
 "pilihan '%c' tidak dapat digunakan sebelum 'J' atau 'K' atau 'T' atau 'C' "
 "atau 'X' telah dispesifikasikan"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2318,7 +2131,7 @@
 "Ekstrak seluruh pesan dari sebuah katalog terjemahan yang cocok dengan pola\n"
 "yang diberikan atau milik dari beberapa berkas sumber yang diberikan.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2393,7 +2206,7 @@
 "  -v, --invert-match          keluarkan hanya pesan yang tidak cocok dengan\n"
 "                              kriteria pemilihan apapun\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2401,18 +2214,18 @@
 "      --escape                gunakan C escapes dalam keluaran, tidak ada "
 "karakter ekstensi\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2422,7 +2235,7 @@
 "variabel lingkungan LANG anda, seperti dijelaskan dalam berkas ABOUT-NLS.\n"
 "Ini diperlukan sehingga anda dapat memeriksa terjemahan anda.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2433,12 +2246,12 @@
 "Mohon spesifikasikan lokal melalui pilihan --locale atau\n"
 "berkas keluaran .po melalui pilihan --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Dibuat %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2447,12 +2260,12 @@
 "Dibuat sebuah berkas PO baru, menginisialisasi informasi meta dengan nilai\n"
 "lingkungan pengguna.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  berkas masukan POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2463,14 +2276,14 @@
 "untuk\n"
 "berkas POT. Jika ini adalah -, standar masukan dibaca.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=BERKAS    tulis keluaran ke berkas PO yang "
 "dispesifikasikan\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2480,12 +2293,12 @@
 "--locale atau konfigurasi lokal pengguna. Jika ini adalah -, hasil akan\n"
 "ditulis ke standar keluaran.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target lokal\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2493,7 +2306,7 @@
 "      --no-translator         asumsikan berkas PO secara otomatis "
 "dihasilkan\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2501,12 +2314,12 @@
 "Ditemukan lebih dari satu berkas .pot.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui pilihan --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error membaca direktori disini"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2514,14 +2327,14 @@
 "Tidak ditemukan berkas .pot dalam direktori ini.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui pilihan --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subproses gagal dengan kode keluar %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2537,7 +2350,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Terjemahan bahasa inggris untuk paket %s"
@@ -2554,17 +2367,17 @@
 msgstr "dua set karakter berbeda \"%s\" dan \"%s\" dalam berkas masukan"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "berkas masukan `%s' tidak berisi sebuah masukan header dengan sebuah "
 "spesifikasi set karakter"
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "domain \"%s\" dalam berkas masukan `%s' tidak berisi sebuah masukan header "
@@ -2576,8 +2389,8 @@
 msgstr "target set karakter \"%s\" bukan sebuah nama pengkodean yang portabel."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
@@ -2704,46 +2517,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Coba gunakan berikut, valid untuk %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalog pesan memiliki bentuk terjemahan plural"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plural=EKSPRESI\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plurals=BILANGAN BULAT\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nilai nplurals tidak valid"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ekspresi plural tidak valid"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2752,61 +2565,66 @@
 "masukan header dengan \"Plural-Forms: nplurals=BILANG BULAT; plural=EKSPRESI;"
 "\""
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "penanganan plural adalah sebuah ekstensi GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr kuran tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr memiliki terlalu banyak tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:814
-#, 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:831
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
+#: src/msgl-check.c:776
+#, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "header field `%s' hilang dalam header\n"
 
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "header field `%s' seharusnya dimulai di awal baris\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "beberapa field header masih memiliki nilai baku awal\n"
+
+#: src/msgl-check.c:826
+#, 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-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2823,8 +2641,8 @@
 "berkas masukan tidak berisi sebuah masukan header dengan sebuah spesifikasi "
 "set karakter"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2842,8 +2660,8 @@
 "Pengubahan dari \"%s\" ke \"%s\" menghadirkan duplikasi: beberapa msgids "
 "berbeda menjadi sama."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2852,16 +2670,16 @@
 "Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(). Versi "
 "ini dibuat tanpa iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s hanya valid dengan %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipe backup"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2883,18 +2701,18 @@
 "digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
 "ke stdout kecuali diberikan sebuah output berkas.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      terjemahan mereferensikan ke sumber lama\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referensi ke sumber baru\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2903,7 +2721,7 @@
 "  -C, --compendium=BERKAS     perpustakaan tambahan dari pesan terjemahan,\n"
 "                              mungkin dispesifikasikan lebih dari sekali.\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2912,27 +2730,27 @@
 "  -U, --update                perbarui def.po,\n"
 "                              jangan lakukan apapun jika def.po telah baru\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode perbarui:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Hasil ditulis kembali ke def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        buat sebuah backup dari def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AKHIRAN        override akhiran backup biasa\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2952,17 +2770,17 @@
 "ada\n"
 "  simple, never   selalu membuat backup sederhana\n"
 
-#: src/msgmerge.c:559
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Akhiran backup adalah `~', kecuali diset dengan --suffix atau "
 "SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2970,22 +2788,22 @@
 "      --previous              simpan msgids sebelumnya dari pesan yang "
 "diterjemahkan\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       tekan indikator perkembangan\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pesan ini seharusnya mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pesan ini seharusnya tidak mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2994,7 +2812,7 @@
 "%sMembaca %ld lama + %ld referensi, digabung %ld, fuzzy %ld, hilang %ld, "
 "sudah ditinggalkan %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3108,7 +2926,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                tulis gaya strict uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3129,12 +2947,12 @@
 ", mereka akan diambil dari terjemahan pertama. Posisi berkas akan dijaga.\n"
 "Ketika menggunakan pilihan --unique, duplikasi diabaikan.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              tampilkan hanya duplikasi\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3156,7 +2974,7 @@
 "Set karakter \"%s\" bukan sebuah nama pengkodean yang portabel.\n"
 "Konversi pesan ke set karakter pengguna mungkin tidak bekerja.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3165,7 +2983,7 @@
 "Set karakter \"%s\" tidak didukung. %s tergantung pada iconv(),\n"
 "dan iconv() tidak mendukung \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3173,15 +2991,15 @@
 "Memasang GNU libiconv dan memasang ulang GNU gettext mungkin akan\n"
 "menyelesaikan masalah ini.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Tetap lanjutkan saja, diduga parse errors."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Tetap lanjutkan saja."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3190,7 +3008,7 @@
 "Set karakter \"%s\" tidak didukung. %s tergantung pada iconv().\n"
 "Konversi ini dibuat tanpa iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3203,27 +3021,27 @@
 msgid "inconsistent use of #~"
 msgstr "penggunaan tidak konsisten dari #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "bagian `msgstr[]' hilang"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "bagian `msgid_plural' hilang"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "bagian `msgstr' hilang"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "bentuk plural pertama memiliki indeks bukan nol"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "bentuk plural memiliki indeks salah"
@@ -3233,7 +3051,7 @@
 msgid "too many errors, aborting"
 msgstr "terlalu banyak kesalahan, membatalkan"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "urutan multibyte tidak valid"
@@ -3277,16 +3095,16 @@
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplikasi definisi pesan"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "ini adalah lokasi dari definisi pertama"
 
@@ -3361,12 +3179,12 @@
 "Teks masukan dibaca dari standar masukan. Teks terkonversi dikeluarkan ke\n"
 "standar keluaran.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "masukan tidak berada dalam pengkodean \"%s\" yang valid"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
@@ -3390,21 +3208,11 @@
 "Ambil dan keluarkan isi dari sebuah URL. Jika URL tidak dapat diakses,\n"
 "BERKAS lokal yang dapat diakses akan digunakan.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "error ketika membaca \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error menulis stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "error setelah membaca \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3487,17 +3295,17 @@
 msgid "compilation of C# class failed"
 msgstr "kompilasi dari kelas C# gagal"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "bukan sebuah nama kelas Java yang valid: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
@@ -3507,18 +3315,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "error ketika membuka \"%s\" untuk ditulis"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "urutan multibyte tidak valid"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3532,7 +3335,7 @@
 "berbeda dengan anda. Pertimbangkan menggunakan sebuah msgctxt ASCII murni.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3612,7 +3415,7 @@
 "katalog pesan memiliki bentuk terjemahan plural\n"
 "tetapi format katalog pesan Tcl tidak mendukung penanganan plural\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: peringatan: string tidak terselesaikan"
@@ -3622,22 +3425,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: peringatan: ekspresi biasa tidak terselesaikan"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
 
@@ -3677,7 +3475,7 @@
 "%s:%d: Urutan multibyte tidak lengkap diakhir dari baris.\n"
 "Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv gagal"
@@ -3691,7 +3489,7 @@
 "%s:%d: Urutan multibyte tidak valid.\n"
 "Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
@@ -3711,22 +3509,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: peringatan: '}' ditemukan dimana ')' diduga"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3740,71 +3528,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: peringatan: surrogate U+%04X sendiri"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: urutan multibyte tidak valid.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Urutan panjang multibyte tidak lengkap.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Urutan multibyte tidak lengkap diakhir dari berkas.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Urutan multibyte tidak lengkap diakhir dari baris.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
-
-#: src/x-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Urutan multibyte tidak valid.\n"
-"Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: peringatan: string literal yang unterminated"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: peringatan: string tidak terselesaikan"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3841,7 +3564,7 @@
 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:278
+#: src/x-python.c:236
 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"
@@ -3850,7 +3573,7 @@
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3863,7 +3586,7 @@
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3876,7 +3599,7 @@
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3889,7 +3612,7 @@
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3902,7 +3625,7 @@
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3914,7 +3637,7 @@
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Pengkodean \"%s\" tidak dikenal. Lebih baik melanjutkan dengan ASCII."
@@ -3943,38 +3666,28 @@
 "%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan "
 "keamanan; lebih baik gunakan eval_gettext"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: peringatan: string literal yang unterminated"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3983,14 +3696,14 @@
 "  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada "
 "messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3998,13 +3711,13 @@
 "  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam "
 "direktori DIR\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4012,8 +3725,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NAMA         kenali bahasa yang dispesifikasikan\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4023,12 +3735,12 @@
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4036,7 +3748,7 @@
 msgstr ""
 "Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4045,24 +3757,24 @@
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4079,45 +3791,39 @@
 "kata kunci\n"
 "                              dalam berkas keluaran\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Pilihan spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
+"  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4127,70 +3833,69 @@
 "      --flag=WORD:ARG:FLAG    simbol tambahan untuk string didalam argumen\n"
 "                              nomor ARG dari kata kunci KATA\n"
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 lebih detil hasil pengenalan format string\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4198,17 +3903,17 @@
 "      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk "
 "pengguna luar negri\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4216,7 +3921,7 @@
 "      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid "
 "bugs\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4227,7 +3932,7 @@
 "awalan\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4238,7 +3943,7 @@
 "akhiran\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4247,31 +3952,31 @@
 "Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
 "sintaks: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Karakter bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "String bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: peringatan: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4280,7 +3985,7 @@
 "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
 "format string %s valid. Karena: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4289,7 +3994,7 @@
 "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang "
 "valid. Karena: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4304,7 +4009,7 @@
 "bernama,\n"
 "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4314,31 +4019,30 @@
 "gettext(\"\") mengembalikan masukan header dengan\n"
 "informasi meta, bukan string kosong.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "konteks tidak cocok diantara bentuk singular dan plural"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4347,21 +4051,15 @@
 "variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
 "sebuah pilihan baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<tidak bernama>"
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "header field `%s' seharusnya dimulai di awal baris\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "beberapa field header masih memiliki nilai baku awal\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: pilihan tidak legal -- %c\n"
 
@@ -4371,6 +4069,18 @@
 #~ msgid "Not yet implemented."
 #~ msgstr "Belum terimplementasi."
 
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "tidak dapat mengkonfigurasikan nonblocking I/O ke %s subproses"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "komunikasi dengan %s subproses gagal"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "baca dari %s subproses gagal"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s subproses berakhir dengan kode keluar %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "field `%s' masih memiliki nilai baku awal\n"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/it.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/it.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/it.po gettext-0.18.1.1/gettext-tools/po/it.po
--- gettext-0.19.3/gettext-tools/po/it.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/it.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,15 +1,15 @@
 # Italian messages for gettext-tools.
-# Copyright (C) 1997, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Marco Colombo <m.colombo@ed.ac.uk>, 2005, 2006, 2007, 2010, 2013.
+# Marco Colombo <m.colombo@ed.ac.uk>, 2005, 2006, 2007.
 # Giovanni Bortolozzo <borto@pluto.linux.it>, 1997.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-07-01 12:47+0100\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-30 17:52+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -29,26 +29,27 @@
 msgstr "argomento %s ambiguo per %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Sono argomenti validi:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "impossibile trovare una directory temporanea, provare a impostare $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "impossibile creare la directory temporanea usando il modello \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "impossibile rimuovere il file temporaneo \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "impossibile rimuovere la directory temporanea \"%s\""
@@ -57,38 +58,37 @@
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "permessi mantenuti per %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "errore durante l'apertura di \"%s\" in lettura"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "impossibile aprire il file di backup \"%s\" in scrittura"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "errore durante la scrittura di \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "errore dopo la lettura di \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -105,98 +105,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Macchina virtuale C# non trovata, provare a installare pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "sottoprocesso %s non riuscito"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione \"%s\" è ambigua; scelte:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: l'opzione \"%s\" è ambigua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opzione \"--%s\" non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opzione non valida -- \"%c\"\n"
+msgstr "%s: opzione non valida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'opzione richiede un argomento -- \"%c\"\n"
+msgstr "%s: l'opzione richiede un argomento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"-W %s\" non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argomento source_version di compile_java_class non valido"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "creazione di \"%s\" non riuscita"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -209,99 +209,61 @@
 "Macchina virtuale Java non trovata, provare a installare gij o a impostare "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "errore di I/O nel sottoprocesso %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "lettura dal sottoprocesso %s non riuscita"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunicazione col sottoprocesso %s non riuscita"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "sottoprocesso %s terminato con codice d'uscita %d"
+msgid "cannot create pipe"
+msgstr "impossibile creare la pipe"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "\""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "impossibile creare la pipe"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle non riuscito"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "impossibile ripristinare il fd %d: dup2 non riuscito"
+msgstr "impossibile creare il file di output \"%s\""
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -314,57 +276,48 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "il sottoprocesso %s ha ricevuto il segnale fatale %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "errore durante l'apertura di \"%s\" in lettura"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"\"%s\" non è una stringa di formato %s valida, diversamente da \"%s\". "
+"\"%s\" non è una stringa di formato %s valida, diversamente da \"msgid\". "
 "Motivo: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"una specifica di formato per l'argomento %u, come in \"%s\", non esiste in "
-"\"%s\""
+"la specifica di formato per l'argomento %u, come in \"%s\", non esiste in "
+"\"msgid\""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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\""
+msgstr "la specifica di formato per l'argomento %u non esiste in \"%s\""
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"le specifiche di formato in \"%s\" e \"%s\" per l'argomento %u non "
-"corrispondono"
+"le specifiche di formato in \"msgid\" e \"%s\" per l'argomento %u non sono "
+"le stesse"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "La direttiva numero %u comincia con \"|\" ma non termina con \"|\"."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -374,25 +327,24 @@
 "di specificazione di formato. I nomi di macro validi sono elencati nella "
 "sezione 7.8.1 dell'ISO C 99."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "Nella direttiva numero %u, il termine dopo \"<\" non è seguito da \">\"."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "La stringa fa riferimento all'argomento numero %u ma ignora l'argomento "
 "numero %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr ""
+"il numero di specifiche di formato in \"msgid\" e \"%s\" non corrisponde"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -479,24 +431,14 @@
 msgstr "Nella direttiva numero %u, non sono ammesse opzioni prima di \"%c\"."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "\"%s\" usa %%m ma \"%s\" non lo usa"
+msgstr "\"msgid\" usa %%m ma \"%s\" non lo usa"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "\"%s\" non usa %%m ma \"%s\" usa %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "\"%s\" usa %%C ma \"%s\" non lo usa"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "\"%s\" non usa %%C ma \"%s\" usa %%C"
+msgstr "\"msgid\" non usa %%m ma \"%s\" usa %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -605,25 +547,25 @@
 "\", \"#\" o \"%s\"."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"una specifica di formato per l'argomento {%u}, come in \"%s\", non esiste in "
-"\"%s\""
+"la specifica di formato per l'argomento {%u}, come in \"%s\", non esiste in "
+"\"msgid\""
 
 #: src/format-java.c:756
 #, 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\""
+msgstr "la specifica di formato per l'argomento {%u}, non esiste in \"%s\""
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"le specifiche di formato in \"%s\" e \"%s\" per l'argomento {%u} non "
-"corrispondono"
+"la specifica di formato in \"msgid\" e \"%s\" per l'argomento {%u} non sono "
+"le stesse"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -697,16 +639,16 @@
 msgstr "La stringa fa riferimento a qualche argomento in modi incompatibili."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "le specifiche di formato in \"%s\" e \"%s\" non sono equivalenti"
+msgstr "le specifiche di formato in \"msgid\" e \"%s\" non sono equivalenti"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
-"le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in \"%s"
-"\""
+"le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in "
+"\"msgid\""
 
 #: src/format-perl.c:433
 #, c-format
@@ -717,9 +659,7 @@
 "Nella direttiva %u, lo specificatore di dimensione è incompatibile con lo "
 "specificatore di conversione \"%c\"."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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\""
@@ -740,76 +680,44 @@
 "incompatibili."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"le specifiche di formato in \"%s\" prevedono una mappatura, quelle in \"%s\" "
-"prevedono una tupla"
+"le specifiche di formato in \"msgid\" prevedono una mappatura, quelle in \"%s"
+"\" prevedono una tupla"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"le specifiche di formato in \"%s\" prevedono una tupla, quelle in \"%s\" "
+"le specifiche di formato in \"msgid\" prevedono una tupla, quelle in \"%s\" "
 "prevedono una mappatura"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
-"una specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste "
-"in \"%s\""
+"la specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste "
+"in \"msgid\""
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"le specifiche di formato in \"%s\" e \"%s\" per l'argomento \"%s\" non "
-"corrispondono"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"Nella direttiva numero %u, non è ammesso ulteriore nesting nel formato di "
-"specificazione."
-
-#: src/format-python-brace.c:270
-#, 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."
+"le specifiche di formato in \"msgid\" e \"%s\" per l'argomento \"%s\" non "
+"sono le stesse"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"\"%s\" è una stringa di formato semplice, ma \"%s\" non lo è: contiene una "
+"'msgid' è una stringa di formato semplice, ma '%s' non lo è: contiene una "
 "flag 'L' o un argomento numerico a due cifre"
 
 #: src/format-sh.c:79
@@ -853,11 +761,11 @@
 msgstr ""
 "Il carattere che termina la direttiva numero %u  non è una cifra tra 1 e 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -871,58 +779,58 @@
 "Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
 "NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uso: %s [OPZIONE]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Stampa il nome dell'host.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato dell'output:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nome corto dell'host\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -933,34 +841,34 @@
 "dominio\n"
 "                                completo e gli alias\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            indirizzi per il nome dell'host\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               mostra le informazioni sulla versione ed esce\n"
@@ -969,41 +877,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "impossibile ottenere il nome dell'host"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "è permesso al massimo un file di input"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s sono mutuamente esclusive"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1012,10 +922,10 @@
 "Filtra i messaggi di un catalogo di traduzioni in base ai loro attributi,\n"
 "e manipola gli attributi.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1023,23 +933,23 @@
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
 "corte.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Posizione del file di input:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FILEINPUT                   file PO di input\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1048,31 +958,31 @@
 "file\n"
 "                              di input\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Posizione del file di output:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1081,12 +991,12 @@
 "I risultati vengono scritti su standard output quando nessun file di output\n"
 "è specificato o è -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selezione dei messaggi:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1095,7 +1005,7 @@
 "messaggi\n"
 "                              non tradotti\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1103,64 +1013,54 @@
 "      --untranslated          mantiene i messaggi non tradotti, rimuove i\n"
 "                              messaggi tradotti\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              rimuove i messaggi marcati come \"fuzzy\"\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene i messaggi marcati come \"fuzzy\"\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           rimuove i messaggi  #~ obsoleti\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene i messaggi #~ obsoleti\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipolazione degli attributi:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             rende \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           rende non \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          rende obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        rende non obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              quando si imposta \"fuzzy\", mantiene i "
-"precedenti\n"
-"                              msgid dei messaggi tradotti\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1169,49 +1069,42 @@
 "      --clear-previous        elimina i \"previous msgid\" da tutti i "
 "messaggi\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              rimuove i messaggi marcati come \"fuzzy\"\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipola solo le voci elencate in FILE.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipola solo le voci non elencate in FILE.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinonimo di --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              sinonimo di --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintassi del file di input:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1219,8 +1112,8 @@
 "  -P, --properties-input      il file di input usa la sintassi Java ."
 "properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1230,17 +1123,17 @@
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Dettagli di output:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1253,17 +1146,17 @@
 "                              QUANDO può essere 'always', 'never', 'auto', o "
 "'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1271,9 +1164,9 @@
 "  -e, --no-escape             non usa gli escape del C nell'output "
 "(predefinito)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1282,29 +1175,29 @@
 "carattere\n"
 "                              esteso\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1313,40 +1206,40 @@
 "\" (predefinito)\n"
 "\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, 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:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          imposta la larghezza della pagina\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1356,33 +1249,35 @@
 "lunghe\n"
 "                              della larghezza della pagina\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera un output ordinato\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+# ******************* parte 2 inizia qui *********************
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]...\n"
 
-#: src/msgcat.c:372
+# FIXME: commonality: somiglianza?
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1391,38 +1286,38 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Concatena e unisce i file PO indicati.\n"
 "Trova i messaggi che sono comuni a due o più file PO indicati.\n"
 "Usando l'opzione --more-than, una maggiore somiglianza può essere richiesta\n"
 "prima che i messaggi vengano stampati. Altrimenti, l'opzione --less-than può\n"
 "essere usata per specificare una minore somiglianza prima di stampare i\n"
-"messaggi (es: --less-than=2 stampa solo i messaggi unici). Traduzioni,\n"
-"commenti, commenti di estrazione e posizioni dei file vengono accumulati, a\n"
-"meno che sia specificata l'opzione --use-first, nel qual caso vengono usati\n"
-"solo quelli nel primo file PO.\n"
+"messaggi (es: --less-than=2 stampa solo i messaggi unici). Traduzioni, commenti\n"
+"e commenti di estrazione vengono accumulati, a meno che l'opzione --use-first\n"
+"è usata, nel qual caso solo quelli nel primo file PO vengono usati.\n"
+"Le posizioni nei file da tutti i file PO vengono accumulate.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FILEINPUT ...               file di input\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1431,7 +1326,7 @@
 "  -<, --less-than=NUMERO      stampa i messaggi with con meno di NUMERO\n"
 "                              definizioni, è predefinito a 1\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1441,7 +1336,7 @@
 "definizioni,\n"
 "                              è predefinito a 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1451,8 +1346,8 @@
 "messaggi\n"
 "                              unici vengono stampati\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1460,8 +1355,8 @@
 "  -P, --properties-input      i file di input usano la sintassi Java ."
 "properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1471,12 +1366,12 @@
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codifica dell'output\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1485,29 +1380,28 @@
 "      --use-first             usa la prima traduzione disponibile per ogni\n"
 "                              messaggio, non unisce diverse traduzioni\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --lang=NOMECATALOGO     imposta il campo 'Language' nell'intestazione\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "non sono specificati file d'ingresso"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sono richiesti esattamente 2 file d'ingresso"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uso: %s [OPZIONE] def.po ref.pot\n"
@@ -1541,12 +1435,12 @@
 msgstr "  ref.pot                     riferimenti alle fonti\n"
 
 # FIXME
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori di operazione:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1555,7 +1449,7 @@
 "  -m, --multi-domain          applica ref.pot a ciascuno dei domini in def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     non usa le corrispondenze fuzzy\n"
@@ -1580,17 +1474,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "questo messaggio deve essere controllato dal traduttore"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "questo messaggio è usato ma non definito..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ma questa definizione è simile"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "questo messaggio è usato ma non è definito in %s"
@@ -1600,19 +1494,19 @@
 msgid "warning: this message is not used"
 msgstr "attenzione: questo messaggio non è usato"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "devono essere specificati almeno due file"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1620,19 +1514,19 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 "Trova i messaggi comuni a due o più dei file PO specificati. Usando l'opzione\n"
 "--more-than, una maggiore somiglianza può essere richiesta prima che qualche\n"
-"messaggio venga mostrato. Altrimenti, l'opzione --less-than può essere usata\n"
+"messaggio venga mostrato.  Viceversa, l'opzione --less-than può essere usata\n"
 "per specificare una minore somiglianza prima che venga stampato un messaggio\n"
 "(es. --less-than=2 mostrerà solo i messaggi unici). Traduzioni, commenti e\n"
 "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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1642,73 +1536,73 @@
 "definizioni,\n"
 "                              è predefinito a 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           non scrive l'intestazione con la voce 'msgid "
 "\"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converte un catalogo di traduzioni in una diversa codifica.\n"
 
 # FIXME
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Obiettivo di conversione:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "La codifica predefinita è la codifica della locale corrente.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                stile di output indentato\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           sopprime le righe \"#: nomefile:riga\"\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          preserva le righe \"#: nomefile:riga"
 "\" (predefinito)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                stile di output Uniforum strict\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "non è specificato nessun file d'ingresso"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "è richiesto esattamente un file d'ingresso"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uso: %s [OPZIONE] FILEINPUT\n"
 
 # FIXME
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1721,7 +1615,7 @@
 "xgettext). Alle voci non tradotte è fornita una traduzione identica\n"
 "al msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FILEINPUT                   file PO o POT di input\n"
@@ -1760,7 +1654,7 @@
 "Uno speciale comando interno chiamato \"0\" stampa la traduzione, seguita da\n"
 "un byte null. L'output di \"msgexec 0\" è valido come input per \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FILEINPUT       file PO di input\n"
@@ -1770,28 +1664,33 @@
 msgid "write to stdout failed"
 msgstr "scrittura su standard output non riuscita"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "scrittura sul sottoprocesso %s non riuscita"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "nome di filtro mancante"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "deve essere specificato almeno uno script sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uso: %s [OPZIONE] FILTRO [OPZIONE-FILTRO]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Applica un filtro a tutte le traduzioni di un catalogo di traduzioni.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1800,18 +1699,18 @@
 "Un FILTRO può essere qualunque programma che legge una traduzione dallo\n"
 "standard input e scrive una traduzione modificata sullo standard output.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPZIONI-FILTRO utili quando FILTRO è \"sed\":\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT     aggiunge SCRIPT ai comandi da eseguire\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1822,7 +1721,7 @@
 "                              da eseguire\n"
 
 # FIXME
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1831,7 +1730,7 @@
 "dei\n"
 "                              modelli\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1839,118 +1738,96 @@
 "      --no-escape             non usa gli escape del C nell'output "
 "(predefinito)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                stile di output indentato\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           non modifica l'intestazione, non la filtra\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-"Se nessun file di input è indicato o è -, viene letto lo standard input.\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s richiede una specificazione \"-d directory\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s richiede una specificazione \"-l locale\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s richiede una specificazione \"-l locale\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s richiede una specificazione \"-l locale\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s e %s sono mutuamente esclusive"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s è valido solo con %s o %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s è valido solo con %s, %s o %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d messaggio tradotto"
 msgstr[1] "%d messaggi tradotti"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduzione fuzzy"
 msgstr[1] ", %d traduzioni fuzzy"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
 
 # FIXME
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1959,17 +1836,17 @@
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
 "Similmente per gli argomenti opzionali.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             file di input\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo di operazione:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1978,7 +1855,7 @@
 "  -j, --java                  modo Java: genera una classe Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1987,12 +1864,12 @@
 "      --java2                 come --java, e assume Java2 (JDK 1.2 o "
 "superiore)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2001,48 +1878,42 @@
 "      --csharp-resources      modo risorse C#: genera un file .NET ."
 "resources\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    modo Qt: genera un file Qt .qm\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                abilita il modo Uniforum strict\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Posizione del file di output in modo Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RISORSA      nome della risorsa\n"
 
 # FIXME
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2050,16 +1921,8 @@
 msgstr ""
 "  -l, --locale=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   modo Tcl: l'input è un file tcl/msgcat .msg\n"
-
 # FIXME
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2068,7 +1931,7 @@
 "delle\n"
 "                              classi\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2080,12 +1943,12 @@
 "della risorsa, separata da una sottolineatura. L'opzione -d è obbligatoria.\n"
 "La classe viene scritta nella directory specificata.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Posizione del file di output in modo C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2095,7 +1958,7 @@
 "dalla\n"
 "                              locale\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2104,18 +1967,18 @@
 "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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Posizione del file di output in modo Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2124,45 +1987,12 @@
 "Le opzioni -l e -d sono obbligatorie. Il file .msg viene scritto nella\n"
 "directory indicata.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIRECTORY                directory base dei cataloghi di messaggi .msg\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kPAROLA, --keyword=PAROLA  cerca PAROLA come parola chiave aggiuntiva\n"
-"  -k, --keyword               non usa le parole chiave predefinite\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretazione del file di input:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2173,14 +2003,14 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2189,7 +2019,7 @@
 "      --check-header          verifica l'esistenza e il contenuto\n"
 "                              dell'intestazione\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2199,7 +2029,7 @@
 "dominio\n"
 "                              e l'opzione --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2208,7 +2038,7 @@
 "  -C, --check-compatibility   controlla che GNU msgfmt si comporti come\n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2218,12 +2048,12 @@
 "      --check-accelerators[=CAR]  controlla la presenza degli acceleratori\n"
 "                                da tastiera per le voci di menù\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2231,112 +2061,89 @@
 "  -a, --alignment=NUMERO      allinea le stringhe a NUMERO byte\n"
 "                              (predefinito: %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDER  scrive numeri a 32 bit con l'ordine dei byte\n"
-"                              richiesto (big o little, predefinito: dipende\n"
-"                              dall'architettura)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            stampa statistiche sulle traduzioni\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta il livello di prolissità\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "attenzione: la conversione del set di caratteri non riuscirà\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "attenzione: intestazione fuzzy del file PO\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "direttiva di dominio \"%s\" ignorata"
+msgid "`domain %s' directive ignored"
+msgstr "direttiva \"domain %s\" ignorata"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" vuota"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" fuzzy"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni fuzzy"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2345,7 +2152,7 @@
 "l'opzione \"%c\" non può essere usata prima di aver specificato \"J\", \"K"
 "\", \"T\", \"C\" o \"X\"."
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2354,7 +2161,7 @@
 "Estrae tutti i messaggi di un catalogo di traduzioni che corrispondono a un\n"
 "modello indicato o appartengono a qualche file sorgente specificato.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2430,7 +2237,7 @@
 "  -v, --invert-match          emette solo i messaggi che non corrispondono ad\n"
 "                              alcun criterio di selezione\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2439,20 +2246,20 @@
 "carattere\n"
 "                              esteso\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera un output ordinato\n"
 
 # FIXME
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          ordina l'output in base alla posizione nel "
 "file\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2462,7 +2269,7 @@
 "variabile d'ambiente LANG, come descritto nel file ABOUT-NLS. Questo\n"
 "è necessario per verificare le proprie traduzioni.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2473,12 +2280,12 @@
 "Specificare la locale attraverso l'opzione --locale o\n"
 "il file .po di output attraverso l'opzione --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creato %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2487,12 +2294,12 @@
 "Crea un nuovo file PO, inizializzando le meta informazioni con valori\n"
 "dall'ambiente dell'utente.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FILEINPUT       file POT di input\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2503,12 +2310,12 @@
 "directory\n"
 "corrente. Se è -, viene letto lo standard input.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      scrive output sul file PO specificato\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2518,12 +2325,12 @@
 "dalle impostazioni della locale dell'utente. Se è -, i risultati vengono\n"
 "scritti sullo standard output.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          imposta la locale obiettivo\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2531,7 +2338,7 @@
 "      --no-translator         assume che il file PO sia generato "
 "automaticamente\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2539,12 +2346,12 @@
 "Più di un file .pot trovato.\n"
 "Specificare il file .pot di input con l'opzione --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "errore durante la lettura della directory corrente"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2552,7 +2359,7 @@
 "Nessun file .pot trovato nella directory corrente.\n"
 "Specificare il file .pot di input con l'opzione --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
@@ -2560,7 +2367,7 @@
 msgstr "sottoprocesso %s non riuscito con codice d'uscita %d"
 
 # FIXME
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2577,7 +2384,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduzioni italiane per il pacchetto %s."
@@ -2596,7 +2403,7 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "l'intestazione del file di input \"%s\" non contiene una specificazione del "
 "set di caratteri"
@@ -2604,7 +2411,7 @@
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "il dominio \"%s\" nel file di input \"%s\" non contiene un'intestazione con "
@@ -2617,8 +2424,8 @@
 "il set di caratteri obiettivo \"%s\" non è un nome di codifica portabile"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "attenzione: "
@@ -2743,46 +2550,46 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Provare ad usare il seguente, valido per %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "il catalogo dei messaggi contiene traduzioni di forme plurali"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=ESPRESSIONE\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=INTERO\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "valore di nplurals non valido"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "espressione plurale non valida"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2791,59 +2598,70 @@
 "l'intestazione non contiene \"Plural-Forms: nplurals=INTERO; "
 "plural=ESPRESSIONE;\""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "la gestione del plurale è un'estensione di GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, 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:740
+#: src/msgl-check.c:730
 #, 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:814
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "campo \"%s\" mancante nell'intestazione\n"
+
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
-"il campo di intestazione \"%s\" è ancora al valore iniziale predefinito\n"
+"il campo \"%s\" dell'intestazione dovrebbe cominciare all'inizio della riga\n"
 
-#: src/msgl-check.c:831
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "campo \"%s\" mancante nell'intestazione\n"
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+"alcuni campi dell'intestazione sono ancora al valore iniziale predefinito\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"alcuni campi dell'intestazione sono ancora al valore iniziale predefinito\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2862,8 +2680,8 @@
 "il file di input non contiene un'intestazione con una specificazione del set "
 "di caratteri"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2882,8 +2700,8 @@
 "diventano\n"
 "uguali."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2892,17 +2710,17 @@
 "Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(). Questa "
 "versione è stata compilata senza iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s è valido solamente con %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipo di backup"
 
 # FIXME UPSTREAM
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2927,19 +2745,19 @@
 "Quando è impossibile trovare una corrispondenza esatta, una corrispondenza\n"
 "approssimativa (fuzzy) è usata per ottenere i migliori risultati.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traduzioni che si riferiscono alle vecchie "
 "fonti\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     riferimenti alle nuove fonti\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2949,7 +2767,7 @@
 "messaggi,\n"
 "                              può essere specificata più di una volta\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2958,28 +2776,28 @@
 "  -U, --update                aggiorna il file def.po,\n"
 "                              non fa niente se def.po è già aggiornato\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Posizione del file di output in modalità di aggiornamento:\n"
 
 # FIXME
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Il risultato è riscritto in def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROLLO      fa il backup di def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFISSO       cambia il solito suffisso dei backup\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2998,17 +2816,17 @@
 "  existing, nil   numerati se esistono backup numerati, altrimenti semplici\n"
 "  simple, never   fa sempre backup semplici\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Il suffisso dei backup è \"~\", a meno che sia impostato con --suffix o la\n"
 "variabile d'ambiente SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -3016,22 +2834,22 @@
 "      --previous              mantiene i precedenti msgid dei messaggi "
 "tradotti\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       sopprime gli indicatori di avanzamento\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "questo messaggio dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "questo messaggio non dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3040,7 +2858,7 @@
 "%sLetti %ld vecchi + %ld riferimenti, fusi %ld, fuzzy %ld, persi %ld, "
 "obsoleti %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3153,7 +2971,7 @@
 msgstr "      --strict                scrive in stile Uniforum strict\n"
 
 # FIXME UPSTREAM
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3176,12 +2994,12 @@
 "traduzione. Le posizioni dei file vengono accumulate. Quando si usa l'opzione\n"
 "--unique, i duplicati vengono scartati.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              stampa solo i duplicati\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3205,7 +3023,7 @@
 "La conversione del messaggio nel set di caratteri dell'utente potrebbe "
 "fallire.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3214,7 +3032,7 @@
 "Il charset \"%s\" non è gestito. %s si basa su iconv(),\n"
 "e iconv() non gestisce \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3223,15 +3041,15 @@
 "reinstallando\n"
 "GNU gettext.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Si continua comunque, ma si prevedono errori di comprensione."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Si continua comunque."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3240,7 +3058,7 @@
 "Il charset \"%s\" non è gestito. %s si basa su iconv().\n"
 "Questa versione è stata compilata senza iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3254,27 +3072,27 @@
 msgid "inconsistent use of #~"
 msgstr "uso improprio di #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "manca la sezione \"msgstr[]\""
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "manca la sezione \"msgid_plural\""
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "manca la sezione \"msgstr\""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la prima forma plurale ha indice diverso da zero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la forma plurale ha indice non corretto"
@@ -3284,7 +3102,7 @@
 msgid "too many errors, aborting"
 msgstr "troppi errori, interrotto"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequenza multibyte non valida"
@@ -3328,16 +3146,16 @@
 msgid "context separator <EOT> within string"
 msgstr "separatore di contesto <EOT> all'interno di una stringa"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "questo file potrebbe non contenere direttive di dominio"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definizione del messaggio duplicata"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "questa è la posizione della prima definizione"
 
@@ -3411,12 +3229,12 @@
 "standard output.\n"
 msgstr "Il testo di input è letto dallo standard input. Il testo convertito è stampato su standard output.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "l'input non è valido in codifica \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
@@ -3441,35 +3259,25 @@
 "Scarica e mostra i contenuti di un URL. Se non è possibile accedere all'URL,\n"
 "viene usato il FILE locale al suo posto.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "errore durante la lettura di \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "errore durante la scrittura su standard output"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "errore dopo la lettura di \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Scaricamento di %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " tempo scaduto.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " non riuscito\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3539,19 +3347,19 @@
 msgid "compilation of C# class failed"
 msgstr "compilazione della classe C# non riuscita"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nome di classe Java non valido: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3562,20 +3370,15 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "errore durante l'apertura di \"%s\" in scrittura"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "sequenza multibyte non valida"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "i messaggi internazionalizzati non devono contenere la sequenza di escape "
 "\"\\%c\""
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3588,7 +3391,7 @@
 "diversa dalla propria. Considerare l'uso di un msgctxt in puro ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3674,7 +3477,7 @@
 "formato\n"
 "dei cataloghi Tcl non le gestisce.\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: attenzione: stringa non terminata"
@@ -3684,24 +3487,22 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: attenzione: espressione regolare non terminata"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: attenzione: carattere Unicode non valido"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: attenzione: costante carattere non terminata"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Specificare la codifica del sorgente usando --from-code."
+msgstr ""
+"Stringa non ASCII in %s%s.\n"
+"Specificare la codifica del sorgente usando --from-code.\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3739,7 +3540,7 @@
 "%s:%d: sequenza multibyte incompleta alla fine della riga.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv non riuscita"
@@ -3753,7 +3554,7 @@
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: attenzione: carattere Unicode non valido"
@@ -3773,22 +3574,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: attenzione: trovata \"}\" dove era prevista \")\""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Contesto mancante per la stringa estratta dall'elemento \"%s\""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "L'elemento radice <%s> non è ammesso in un file di Glade valido"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3803,70 +3594,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: attenzione: lone surrogate U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Specificare la codifica del sorgente usando --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: sequenza multibyte non valida.\n"
-"Indicare la corretta codifica del sorgente usando --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: sequenza multibyte lunga incompleta.\n"
-"Indicare la corretta codifica del sorgente usando --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: sequenza multibyte incompleta alla fine del file.\n"
-"Indicare la corretta codifica del sorgente usando --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: sequenza multibyte incompleta alla fine della riga.\n"
-"Indicare la corretta codifica del sorgente usando --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: sequenza multibyte non valida.\n"
-"Indicare la codifica del sorgente usando --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: attenzione: costante RegExp terminata troppo presto"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: attenzione: carattere Unicode non valido"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: attenzione: stringa non terminata"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3903,15 +3630,17 @@
 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:278
+#: src/x-python.c:236
+#, 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 ""
+"Stringa non ASCII in %s%s.\n"
 "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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3923,7 +3652,7 @@
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3935,7 +3664,7 @@
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3947,7 +3676,7 @@
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3959,7 +3688,7 @@
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3970,7 +3699,7 @@
 "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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codifica \"%s\" sconosciuta. Si continua con ASCII."
@@ -3999,40 +3728,30 @@
 "%s:%lu: attenzione: la sintassi $\"...\" è deprecata per motivi di "
 "sicurezza; usare eval_gettext al suo posto"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: attenzione: espressione regolare terminata troppo presto"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non può operare senza parole chiavi da ricercare"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4041,12 +3760,12 @@
 "  -d, --default-domain=NOME   usa NOME.po per l'output (invece di messages."
 "po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4054,13 +3773,13 @@
 "  -p, --output-dir=DIR        i file di output saranno posizionati nella\n"
 "                              directory DIR\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Scelta del linguaggio del file di input:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4068,8 +3787,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NOME         riconosce i linguaggi specificati\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4077,15 +3795,14 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4094,7 +3811,7 @@
 "Come impostazione predefinita, la scelta del linguaggio si basa "
 "sull'estensione del file di input.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4103,24 +3820,24 @@
 "      --from-code=NOME        codifica dei file di input\n"
 "                                (ad eccezione di Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4128,56 +3845,46 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   mette il blocco di commenti che contiene TAG "
-"e\n"
-"                                che precedono le righe di parole chiave nel\n"
-"                                file di output \n"
-"  -c, --add-comments          mette tutti i blocchi di commenti che "
-"precedono\n"
-"                                le righe di parole chiave nel file di "
-"output\n"
+"  -c, --add-comments[=TAG]    mette il blocco di commenti che contiene TAG\n"
+"                              (o le righe di parole chiave che le "
+"precedono)\n"
+"                              nel file di output \n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opzioni di linguaggio specifiche:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           estrae tutte le stringhe\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"  -k, --keyword[=PAROLA]      parola chiave aggiuntiva da cercare (senza "
+"PAROLA\n"
+"                              indica di non usare le parole chiave "
+"predefinite)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4188,52 +3895,50 @@
 "nell'argomento\n"
 "                              numero ARG della parola chiave PAROLA\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (solo linguaggi C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    riconosce le stringhe di formato Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (solo linguaggio C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   riconosce le stringhe di formato KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4242,12 +3947,12 @@
 "del\n"
 "                              riconoscimento della stringa di formato\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrive un file .properties Java\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4255,7 +3960,7 @@
 "output\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4263,20 +3968,20 @@
 "      --foreign-user          omette dall'output il copyright della FSF per\n"
 "                              gli utenti non GNU\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4285,30 +3990,28 @@
 "segnalare\n"
 "                              errori nelle voci msgid\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRINGA], --msgstr-prefix[=STRINGA]  usa STRINGA o \"\" come prefisso "
-"nelle\n"
-"                                voci msgstr\n"
+"  -m, --msgstr-prefix[=STRINGA] usa STRINGA o \"\" come prefisso delle voci "
+"msgstr\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRINGA], --msgstr-suffix[=STRINGA]  usa STRINGA o \"\" come suffisso "
-"nelle\n"
-"                                voci msgstr\n"
+"  -M, --msgstr-suffix[=STRINGA] usa STRINGA o \"\" come suffisso delle voci "
+"msgstr\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4317,31 +4020,31 @@
 "Un argomento di --flag non usa la sintassi <parolachiave>:<num-arg>:[pass-]"
 "[flag]: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Carattere non ASCII in %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Commento non ASCII in o prima di %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Stringa non ASCII in %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: attenzione: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4350,7 +4053,7 @@
 "Sebbene usata dove dovrebbe esserci una stringa di formato, %s non è una "
 "stringa di formato %s valida. Motivo: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4360,7 +4063,7 @@
 "Motivo: %s\n"
 
 # FIXME
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4374,7 +4077,7 @@
 "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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4384,32 +4087,32 @@
 "gettext(\"\") restituisce l'intestazione con\n"
 "le metainformazioni, non la stringa vuota.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, 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:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4418,11 +4121,45 @@
 "variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
 "l'opzione --msgid-bugs-address da riga di comando.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "linguaggio \"%s\" sconosciuto"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<senza nome>"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opzione illecita -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle fallito con codice di errore 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Non ancora implementato."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "impossibile impostare un I/O non bloccante per il sottoprocesso %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "comunicazione col sottoprocesso %s non riuscita"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "lettura dal sottoprocesso %s non riuscita"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "sottoprocesso %s terminato con codice d'uscita %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "il campo \"%s\" ha ancora il valore iniziale predefinito\n"
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Riferimenti multipli a %%%c."
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: attenzione: stringa non terminata"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr ""
+#~ "%s:%d: fatale: messaggio plurale visto prima del messaggio singolare\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/ja.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/ja.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/ja.po gettext-0.18.1.1/gettext-tools/po/ja.po
--- gettext-0.19.3/gettext-tools/po/ja.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/ja.po	2010-06-06 12:49:57.000000000 +0000
@@ -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 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2014.
+# Masahito Yamaga <ma@yama-ga.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 13:39+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-10 18:11+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -28,25 +28,26 @@
 msgstr "%2$s ���Ф������ %1$s ��ۣ��Ǥ�"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "����������:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "����ǥ��쥯�ȥ���դ����ޤ���. $TMPDIR �����ꤷ�ƤߤƤ�������"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "�ƥ�ץ졼�� \"%s\" ��Ȥäư���ǥ��쥯�ȥ���뤳�Ȥ��Ǥ��ޤ���"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "����ե����� \"%s\" �����Ǥ��ޤ���"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "����ǥ��쥯�ȥ� %s �����Ǥ��ޤ���"
@@ -55,38 +56,37 @@
 msgid "write error"
 msgstr "�񤭹��ߥ��顼"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "%s ���Ф��륢����������ݻ�"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "%s ���ɤ߹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
+msgid "error while opening \"%s\" for reading"
+msgstr "\"%s\" ���ɤ߹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "�Хå����åץե����� %s ��񤭹����Ѥ˳������Ȥ��Ǥ��ޤ���"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "�Хå����åץե����� \"%s\" ��񤭹����Ѥ˳������Ȥ��Ǥ��ޤ���"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "%s ���ɤ߹�����˥��顼��ȯ�����ޤ���"
+msgid "error reading \"%s\""
+msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "%s ��񤭹�����˥��顼��ȯ�����ޤ���"
+msgid "error writing \"%s\""
+msgstr "\"%s\" ��񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "%s ���ɤ߹������˥��顼��ȯ�����ޤ���"
+msgid "error after reading \"%s\""
+msgstr "\"%s\" ���ɤ߹������˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -103,98 +103,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# ���ۥޥ��󤬸��Ĥ���ޤ���. pnet �򥤥󥹥ȡ��뤷�ƤߤƤ�������"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ���֥ץ����������Ԥ��ޤ���"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: ���ץ���� '%s' ��ۣ��. �����ǽ�ʤ��:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: ���ץ���� '%s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '--%s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '%c%s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ���ץ���� '--%s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ���ץ���� `--%s' ���Բ�\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ���ץ���� '%c%s' ���Բ�\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ̵���ʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ������ɬ�פʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ���ץ���� '-W %s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '-W %s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: ���ץ���� '-W %s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class ���Ф���̵���� source_version ����"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" �������˼��Ԥ��ޤ���"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" �ե������񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -208,96 +208,58 @@
 "Java ���ۥޥ��󤬸��Ĥ���ޤ���. gij �򥤥󥹥ȡ��뤹�뤫 $JAVA �����ꤷ�Ƥ�"
 "������"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ���֥ץ����������ϥ��顼"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "�����Ȥ��̤����ޤ���"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr "����åɤ������˼���"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s �ؽ񤭽Ф����֥ץ����������Ԥ��ޤ���"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s ���֥ץ�����������ɤ߹��ߤ˼���"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "%s ���֥ץ������˥֥��å��󥰤��ʤ������Ϥ�����Ǥ��ޤ���"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s ���֥ץ������Ȥ��̿��˼���"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s ���֥ץ���������λ������ %d �ǽ�λ"
+msgid "cannot create pipe"
+msgstr "�ѥ��פ��뤳�Ȥ��Ǥ��ޤ���"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "�ѥ��פ��뤳�Ȥ��Ǥ��ޤ���"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ����"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "fd %d �������Ǥ��ޤ���: dup2 ����"
@@ -313,20 +275,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s ���֥ץ���������̿Ū�ʥ����ʥ� %d ��������ޤ���"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "\"%s\" ���ɤ߹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' �������� %s ������ʸ����ǤϤʤ�, '%s' �Ȥϰ㤤�ޤ�. ��ͳ: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -335,19 +290,17 @@
 msgstr "���� %u ���Ф�������λ��꤬ '%s' �Τ褦�� '%s' ��¸�ߤ��ޤ���"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "���� %u ���Ф�������λ��꤬ '%s' ��¸�ߤ��ޤ���"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "���� %3$u ���Ф��� '%1$s' �� '%2$s' �Ǥη����λ��꤬Ʊ���ǤϤ���ޤ���"
@@ -357,7 +310,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "̿���ֹ� %u ��, | �ǻϤޤäƤ��ޤ��� | �ǽ���äƤ��ޤ���."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -366,19 +319,17 @@
 "̿���ֹ� %u �Ǥ�, '<' �θ�Υȡ�����ϥե����ޥåȵ��һҥޥ���̾�ǤϤ���ޤ�"
 "��. �������ޥ���̾�� ISO C 99 �� 7.8.1 ��˰���������ޤ�."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "̿���ֹ� %u �Ǥ�, '<' �θ�Υȡ�����θ�� '>' ����뤳�ȤϤ���ޤ���."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "ʸ����ϰ����ֹ� %u �򻲾Ȥ��Ƥ��ޤ��������ֹ� %u ��̵�뤷�Ƥ��ޤ�."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'%s' �� '%s' �ǻ��ꤷ�������ο�����äƤ��ޤ���"
@@ -464,16 +415,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s' �� %%m ��Ȥ��ޤ��� '%s' �� %%m ��Ȥ��ޤ�"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' �� %%C ��Ȥ��ޤ��� '%s' �ϻȤ��ޤ���"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' �� %%C ��Ȥ��ޤ��� '%s' �� %%C ��Ȥ��ޤ�"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "ʸ����̿�������ǽ���äƤ��ޤ�."
@@ -664,9 +605,7 @@
 "conversion specifier '%c'."
 msgstr "̿���ֹ� %u �Ǥ�, ������������Ѵ����� '%c' �ȸߴ��ǤϤ���ޤ���."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "���� '%s' ���Ф���������꤬ '%s' ��¸�ߤ��ޤ���"
@@ -707,32 +646,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "���� '%3$s' ���Ф��� '%1$s' �� '%2$s' �Ǥη������꤬Ʊ���ǤϤ���ޤ���"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "̿���ֹ� %u �Ǥ�, '%c' �ǥե������̾��Ϥ���뤳�Ȥ��Ǥ��ޤ���."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "̿���ֹ� %u �Ǥ�, '%c' �� getattr �ΰ�����Ϥ���뤳�Ȥ��Ǥ��ޤ���."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "̿���ֹ� %u �Ǥ�, '%c' �� getitem �ΰ�����Ϥ���뤳�Ȥ��Ǥ��ޤ���."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "̿���ֹ� %u �Ǥ�, �ե����ޥåȼ��̻ҤǤ���ʾ�Υͥ��ȤϤǤ��ޤ���."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "̿���ֹ� %u ��, ��üʸ���Τʤ��ե����ޥå�̿�᤬����ޤ�."
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -779,11 +692,11 @@
 "1 and 9."
 msgstr "̿���ֹ� %u �ν�üʸ���� 1 ���� 9 �δ֤ο����ǤϤ���ޤ���."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -800,58 +713,58 @@
 "����ϥե꡼�����եȥ������Ǥ��Τ��ѹ��Ⱥ����ۤϼ�ͳ�Ǥ�.\n"
 "������ˡΧ�������ϰϤ�̵�ݾڤǤ�.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "��� %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "������¿�����ޤ�"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "���¿���ξ�������뤿��ˤ� '%s --help' �����Ϥ��Ƥ�������.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "���¿���ξ�������뤿��ˤ� `%s --help' �����Ϥ��Ƥ�������.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "����ˡ: %s [���ץ����]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "�ޥ���Υۥ���̾��ɽ��.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "���Ϸ���:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 û���ۥ���̾\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -862,34 +775,34 @@
 "Name)\n"
 "                                ����̾ (�����ꥢ��) ��ޤ�\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            �ۥ���̾���Ф��륢�ɥ쥹\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "�������:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ���Υإ�פ�ɽ�����ƽ�λ\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               �С����������ɽ�����ƽ�λ\n"
@@ -898,104 +811,106 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "�Х���ݡ��Ȥ� <bug-gnu-gettext@gnu.org> �ޤ�.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "�ۥ���̾������Ǥ��ޤ���Ǥ���"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "���� 1�Ĥ����ϥե����뤬������ޤ�"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s �� %s ����ȿ�Ǥ�"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "����ˡ: %s [���ץ����] [���ϥե�����]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "°���˽��ä��������������Υ�å����������̤�, °���򤦤ޤ����ޤ�.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Ĺ�����ץ�����ɬ�ܤΰ�����û�����ץ����ˤ�ɬ�ܤǤ�.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "���ϥե�����λ���:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ���� PO �ե�����\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   ���ϥե�����θ����ꥹ�Ȥ� DIRECTORY ���ɲ�\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "���ϥե�����λ���:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      ���ꤷ���ե�����˽���\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1004,19 +919,19 @@
 "���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ����Ϥ˷�̤��񤭽Ф����"
 "��.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "����������:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            �������줿��å�������Ĥ�, ̤��������\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1024,62 +939,53 @@
 "      --untranslated          ̤�����Υ�å�������Ĥ�, �������줿��Τ��"
 "��\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' �ޡ����դ��Υ�å���������\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' �ޡ����դ��Υ�å�������Ĥ�\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           �Ѥ줿 #~ ��å���������\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         �Ѥ줿 #~ ��å�������Ĥ�\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "°�����:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ���ƤΥ�å������� 'fuzzy' ������\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           ���ƤΥ�å������� '�� fuzzy' ������\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ���ƤΥ�å������� '�Ѥ줿' ���֤�����\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        ���ƤΥ�å��������� '�Ѥ줿' ���֤�����\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              'fuzzy'�����ꤹ���, �������줿��å�������\n"
-"                              ���� msgid ��Ĥ�\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1087,53 +993,47 @@
 msgstr ""
 "      --clear-previous        ���ƤΥ�å��������� \"���� msgid\" ����\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 'fuzzy' ������ msgstr ���������\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     FILE.po �ˤ��륨��ȥ�Τ߽���\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=FILE.po   FILE.po �ˤʤ�����ȥ�Τ߽���\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy ��Ʊ��\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete ��Ʊ��\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "���ϥե������ʸˡ:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1142,17 +1042,17 @@
 "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
 "ˡ\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "���Ϥξܺ�:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1165,26 +1065,26 @@
 "                              WHEN �� 'always', 'never', 'auto', �ޤ��� "
 "'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=STYLEFILE       --color ���Ф��� CSS ��������롼������\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1192,68 +1092,68 @@
 "  -E, --escape                ���Ϥ� C ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ���Ǥ��äƤ� PO �ե������񤭽Ф�\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                ������������ .po �ե���������\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: �ե�����̾:���ֹ�' �ιԤ����� (ɸ��)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                ��̩�� Uniforum ������ .po �ե���������\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     Java .properties �ե���������\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    NeXTstep/GNUstep .strings �ե���������\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          ���ϥڡ�������������\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1262,31 +1162,31 @@
 "      --no-wrap               ���ϥڡ����������Ĺ����å������Ԥ���Ԥ���"
 "��\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           �����Ȥ��줿���Ϥ�����\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          �ե�����ǽ��Ϥ򥽡���\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "���ꤵ�줿������ (%d < n < %d) ���Բ�ǽ�Ǥ�"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "����ˡ: %s [���ץ����] [���ϥե�����]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1295,9 +1195,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "���ꤵ�줿 PO �ե������Ϣ�뤷���ޡ������ޤ�.\n"
 "2�Ĥޤ��Ϥ���ʾ�λ��ꤵ�줿 PO �ե�����Ƕ��̤ʥ�å������򸫤Ĥ��ޤ�.\n"
@@ -1305,26 +1205,27 @@
 "���ꤹ�뤳�Ȥ��Ǥ��ޤ�. �դ�, --less-than ���ץ�����ɽ�������å�������\n"
 "���������㤯���ꤹ�뤳�Ȥ��Ǥ��ޤ� (�Ĥޤ�, --less-than=2 �� 1�Ĥ����ʤ�\n"
 "��å������Τߤ���Ϥ���Ȥ������Ȥˤʤ�ޤ�). �����䥳����, ��Ф��줿\n"
-"������, �ե�����ΰ��֤Ϥ��Τޤ޻Ĥ���ޤ�. ������ --use-first �����ꤵ�줿\n"
-"���ˤ�, ����餬������줿�ǽ�� PO �ե�����Τ�Τ����Τޤ޻Ĥ���ޤ�.\n"
+"�����ȤϤ��Τޤ޻Ĥ���ޤ�. ������ --use-first �����ꤵ�줿���ˤ�, �����\n"
+"��������줿�ǽ�� PO �ե�����Τ�Τ����Τޤ޻Ĥ���ޤ�. �ޤ��ե�����ΰ���\n"
+"�����Ƥ� PO �ե����뤫�餽�Τޤ޻Ĥ���ޤ�.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ���ϥե�����\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "���ϥե����뤬 - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1333,7 +1234,7 @@
 "  -<, --less-than=NUMBER      NUMBER ��꾯�ʤ��������������줿��å�����\n"
 "                              �����. ���ꤵ��ʤ�����ɸ���̵�¸�\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1342,7 +1243,7 @@
 "  ->, --more-than=NUMBER      NUMBER ���¿��������줿��å����������\n"
 "                              ���ꤵ��ʤ�����ɸ��� 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1351,15 +1252,15 @@
 "  -u, --unique                --less-than=2 ��û�̷�. 1�Ĥ����ʤ���å�����\n"
 "                              �Τߤ�ɽ��\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1368,12 +1269,12 @@
 "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
 "ˡ\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          ���ϤΥ��󥳡��ǥ���\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1382,28 +1283,28 @@
 "      --use-first             �ơ��Υ�å������κǽ��ͭ����������Ȥ�\n"
 "                              ʣ����������ޡ������ʤ�\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "���ϥե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "���Τ� 2�Ĥ����ϥե����뤬ɬ�פǤ�"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "����ˡ: %s [���ץ����] def.po ref.pot\n"
@@ -1436,12 +1337,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     �������ؤλ���\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "������:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1449,7 +1350,7 @@
 msgstr ""
 "  -m, --multi-domain          ref.pot �� def.po ��Υɥᥤ��γơ���Ŭ��\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     �����ޤ�������Ԥ�ʤ�\n"
@@ -1474,17 +1375,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "���Υ�å������������Ԥˤ���ӥ塼��ɬ�פǤ�"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "���Υ�å������ϻȤ��ޤ����������Ƥ��ޤ���..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...������������������Ƥ��ޤ�"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "���Υ�å������ϻȤ��ޤ��� %s �Ǥ��������Ƥ��ޤ���"
@@ -1494,18 +1395,18 @@
 msgid "warning: this message is not used"
 msgstr "�ٹ�: ���Υ�å������ϻȤ��ޤ���"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d �Ĥ���̿Ū���顼�����Ĥ���ޤ���"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "���ʤ��Ȥ� 2�ĤΥե��������ꤷ�ʤ���Ф����ޤ���"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1513,7 +1414,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1525,7 +1426,7 @@
 "�����Ȥ�, ����餬������줿�ǽ�� PO �ե�����Τ�ΤΤߤ��Τޤ޻Ĥ���ޤ�.\n"
 "�ޤ��ե�����ΰ��֤����Ƥ� PO �ե����뤫�餽�Τޤ޻Ĥ���ޤ�.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1534,68 +1435,68 @@
 "  ->, --more-than=NUMBER      NUMBER ���¿��������줿��å����������\n"
 "                              ���ꤵ��ʤ�����ɸ��� 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           'msgid \"\"' ��ޤ���إå�����Ϥ��ʤ�\n"
+"      --omit-header           `msgid \"\"' ��ޤ���إå�����Ϥ��ʤ�\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "��������������ۤʤä�ʸ�����󥳡��ǥ��󥰤��Ѵ�.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "�Ѵ��о�:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ɸ��Υ��󥳡��ǥ��󥰤ϸ��ߤΥ�������Υ��󥳡��ǥ��󥰤Ǥ�.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                �������������\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           '#: filename:line' �ιԤ���Ϥ��ʤ�\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          '#: filename:line' �ιԤ��ݻ� (ɸ��)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr "      --add-location          '#: filename:line' �ιԤ��ݻ� (ɸ��)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                ��̩�� Uniforum ���Ϸ���\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "���ϥե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "���Τ� 1�Ĥ����ϥե����뤬ɬ�פǤ�"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "����ˡ: %s [���ץ����] INPUTFILE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1607,7 +1508,7 @@
 "PO �ƥ�ץ졼�ȥե����� (���̤� xgettext �ˤ�ä�����) �Ǥ�. ̤�����Υ���ȥ�\n"
 "�� msgid ��Ʊ�������˳�����Ƥ��ޤ�.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   ���Ϥ��� PO �ޤ��� POT �ե�����\n"
@@ -1646,7 +1547,7 @@
 "'0' �Ȥ������̤��Ȥ߹��ߥ��ޥ�ɤϺǸ�˥̥�ʸ�����դ�����������Ϥ��ޤ�.\n"
 "\"msgexec 0\" �ν��Ϥ� \"xargs -0\" �ؤ����Ϥ�Ŭ���Ƥ��ޤ�.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       ���Ϥ��� PO �ե�����\n"
@@ -1656,27 +1557,32 @@
 msgid "write to stdout failed"
 msgstr "ɸ����Ϥؤν񤭽Ф������Ԥ��ޤ���"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s �ؽ񤭽Ф����֥ץ����������Ԥ��ޤ���"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "�ե��륿̾������ޤ���"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "���ʤ��Ȥ� 1�Ĥ� sed ������ץȤ���ꤷ�ʤ���Ф����ޤ���"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "����ˡ: %s [���ץ����] �ե��륿 [�ե��륿���ץ����]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "�����������������Ƥ������˥ե��륿��Ŭ��.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1686,18 +1592,18 @@
 "��\n"
 "Ǥ�դΥץ���������ꤹ�뤳�Ȥ��Ǥ��ޤ�.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "FILTER �� 'sed' ��������� FILTER-OPTION:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT     �¹Ԥ���륳�ޥ�ɤ� SCRIPT ���ɲ�\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1706,123 +1612,102 @@
 msgstr ""
 "  -f, --file=SCRIPTFILE       SCRIPTFILE �����Ƥ�¹Ԥ���륳�ޥ�ɤ��ɲ�\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       �ѥ����󥹥ڡ����μ�ưŪ��ɽ��������\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                �������������\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           �إå��Υ���ȥ�����������ݻ�\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s �ؤΰ�����ñ��ζ��ڤ�ʸ���Ǥ���٤��Ǥ�"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "̵���ʥ���ǥ�����: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "%s �� %s ����ꤹ��������ϥե��������ꤷ�Ƥ��Ϥ����ޤ���"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s �ˤ� \"-d �ǥ��쥯�ȥ�\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s �ˤ� \"-l ��������\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s �ˤ� \"--template �ƥ�ץ졼��\" �λ��꤬ɬ�פǤ�"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s �ˤ� \"-o �ե�����\" �λ��꤬ɬ�פǤ�"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s �� %s �� %s �ˤ�������ȿ�Ǥ�"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s �� %s �ޤ��� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s �� %s, %s �ޤ��� %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d �Ĥ�������å�����"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d �ĤΤ����ޤ�������"
+msgstr[0] ", %d �Ĥ������������ޤ��Ǥ�"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d �Ĥ�̤���Υ�å�����"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "����ˡ: %s [���ץ����] filename.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "�Х��ʥ��å���������������ʸ�������ε��Ҥ�������.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1831,17 +1716,17 @@
 "Ĺ�����ץ�����ɬ�ܤΰ�����û�����ץ����ˤ�ɬ�ܤǤ�.\n"
 "ɬ�ܤǤʤ�������Ʊ���Ǥ�.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ���ϥե�����\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "���⡼��:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1849,7 +1734,7 @@
 msgstr ""
 "  -j, --java                  Java �⡼��: Java ResourceBundle ���饹������\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1857,12 +1742,12 @@
 msgstr ""
 "      --java2                 --java ��Ʊ���� Java2 (JDK 1.2 �ʹ�) ����\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# �⡼��: .NET .dll �ե����������\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1871,71 +1756,55 @@
 "      --csharp-resources      C# resources �⡼��: .NET .resources �ե������"
 "����\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl �⡼��: tcl/msgcat .msg �ե����������\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt �⡼��: Qt .qm �ե����������\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               Desktop Entry �⡼��: .desktop �ե����������\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ��̩�� Uniforum �⡼�ɤ�ͭ����\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "���ϥե����뤬 - �ξ���ɸ����Ϥ˷�̤��񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     �꥽����̾\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=LOCALE          ��������̾. ����̾�⤷���� \"����̾_��̾\"\n"
-
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                .class �ե����������� .java �ե�������"
-"��\n"
+"  -l, --locae=LOCALE          ��������̾. ����̾�⤷���� \"����̾_��̾\"\n"
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                ���饹�ǥ��쥯�ȥ�γ��ؤδ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1949,12 +1818,12 @@
 "��\n"
 "�񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1963,7 +1832,7 @@
 "  -d DIRECTORY                ���������¸�� .dll �ե�����δ��ܥǥ��쥯��"
 "��\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1972,18 +1841,18 @@
 "-l �� -d ���ץ�����ɬ�ܤǤ�. .dll �ե�����ϥ�������˰�¸����̾�������\n"
 "���ꤵ�줿�ǥ��쥯�ȥ�Υ��֥ǥ��쥯�ȥ�˽񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                .msg ��å��������������δ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1992,46 +1861,12 @@
 "-l �� -d ���ץ�����ɬ�ܤǤ�. .msg �ե�����ϻ��ꤵ�줿�ǥ��쥯�ȥ�˽�\n"
 "�Ф���ޤ�.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Desktop Entry �⡼�ɤΥ��ץ����:\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=TEMPLATE         .desktop �ե������ƥ�ץ졼�Ȥ˻���\n"
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORY                .po �ե�����δ��ܥǥ��쥯�ȥ�\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=WORD      �ɲå�����ɤȤ��� WORD �򸡺�\n"
-"  -k, --keyword               ɸ��Υ�����ɤϻȤ�ʤ�\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"-l, -o, ����� --template ���ץ�����ɬ�ܤǤ�. -D �����ꤵ�줿���, ����\n"
-"�ե�����ϥ��ޥ�ɥ饤�����������ˤ��Υǥ��쥯�ȥ꤫���ɤ߹��ޤ�ޤ�.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "���ϥե�����β��:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2042,20 +1877,20 @@
 "domain\n"
 "                              �ǻ��ꤵ������ƤΥ����å���Ԥʤ�\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          �إå����ܤ�¸�ߤ����Ƥ��ǧ\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2064,7 +1899,7 @@
 "      --check-domain          �ɥᥤ��̿��� --output-file ���ץ����δ֤�\n"
 "                              ̷�⤬�ʤ��������å�\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2072,7 +1907,7 @@
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt �� X/Open msgfmt �Ȥθߴ������ǧ\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2081,122 +1916,98 @@
 msgstr ""
 "      --check-accelerators[=ʸ��]  ��˥塼���ܤؤΥ���������Ƥ�����å�\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             fuzzy (�����ޤ�) ���ܤ���Ϥ˻Ȥ�\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      ʸ����� NUMBER �Х��Ȥ�·���� (ɸ��: %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDER  ���ꤵ�줿�Х��ȥ�������32�ӥåȤο��ͤ�񤭽�"
-"��\n"
-"                                (ɸ��ϥץ�åȥե�����ˤ�� big �� "
-"little)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               �Х��ʥ�ե�����ϥϥå���ơ��֥��ޤޤʤ�\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            �����˴ؤ������׾����ɽ��\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ���ǥ�٥��夲��\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "�ٹ�: PO �ե�����Υإå����ʤ�, �⤷���������Ǥ�\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "�ٹ�: ʸ�����åȤ��Ѵ�����ǽ���ޤ���\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "�ٹ�: PO �ե�����إå��������ޤ��Ǥ�\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "�ٹ�: msgfmt �ΰ����ΥС������ǤϤ����ǥ��顼�ˤʤ�ޤ�\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "'�ɥᥤ�� %s' ̿���̵�뤵��ޤ�"
+msgid "`domain %s' directive ignored"
+msgstr "`�ɥᥤ�� %s' ̿���̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "���� 'msgstr' ����ȥ��̵�뤵��ޤ�"
+msgid "empty `msgstr' entry ignored"
+msgstr "���� `msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "�����ޤ� (fuzzy) �� 'msgstr' ����ȥ��̵�뤵��ޤ�"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "�����ޤ� (fuzzy) �� `msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: �ٹ�: �������ե�����ˤ����ޤ� (fuzzy) ������������ޤ�"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s ��¸�ߤ��ޤ���"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s ��¸�ߤ��ޤ����ɤ߹���ޤ���"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2205,7 +2016,7 @@
 "���ץ���� '%c' �� 'J' �� 'K' �� 'T' �� 'C' �� 'X' �����ꤵ������˻Ȥ����Ȥ�"
 "�Ǥ��ޤ���"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2214,7 +2025,7 @@
 "���������������椫��, ���ꤵ�줿�ѥ�����˰��פ���, �⤷���ϻ��ꤵ�줿������\n"
 "���Υ������ե�����˴ޤޤ�����ƤΥ�å���������Ф��ޤ�.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2289,7 +2100,7 @@
 "  -i, --ignore-case           ��ʸ����ʸ������̤��ʤ�\n"
 "  -v, --invert-match          �ɤ�������ˤ���פ��ʤ���å������Τߤ����\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2297,17 +2108,17 @@
 "      --escape                ���Ϥ� C ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           �����Ȥ��줿���Ϥ�����\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          �ե�����ǽ��Ϥ򥽡���\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2316,7 +2127,7 @@
 "���ʤ��ϸ���˴ؤ��Τʤ��Ķ��ˤ��ޤ�. ABOUT-NLS �˵��Ҥ��줿�褦��\n"
 "�Ķ��ѿ� LANG ����ꤷ�Ƥ�������. �����������ƥ��Ȥ��뤳�Ȥ��Ǥ��ޤ�.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2327,24 +2138,24 @@
 "--locale ���ץ����ǥ����������ꤹ�뤫, --output-file ���ץ�����\n"
 "���Ϥ��� .po �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s ������.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "������ PO �ե���������. �桼���Ķ�������ͤǥ᥿������������ޤ�.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       ���Ϥ��� POT �ե�����\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2354,12 +2165,12 @@
 "���ϥե����뤬���ꤵ��ʤ����ϥ����ȥǥ��쥯�ȥ�� POT �ե����뤬����\n"
 "����ޤ�. �⤷���ϥե����뤬 - �ʤ��ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      ���ꤵ�줿 PO �ե�����˽���\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2369,18 +2180,18 @@
 "��\n"
 "������������˰�¸���ޤ�. �⤷ - �ʤ�з�̤�ɸ����Ϥ˽��Ϥ���ޤ�.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          �оݤȤʤ�������������\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         PO �ե����뤬��ư���������Ȳ���\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2388,12 +2199,12 @@
 "1�İʾ�� .pot �ե�����򸫤Ĥ��ޤ���.\n"
 "--input ���ץ��������Ϥ��� .pot �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "�����ȥǥ��쥯�ȥ���ɤ߹��ߥ��顼"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2401,14 +2212,14 @@
 "�����ȥǥ��쥯�ȥ�� .pot �ե����뤬���Ĥ���ޤ���Ǥ���.\n"
 "--input ���ץ��������Ϥ��� .pot �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s ���֥ץ���������, ��λ������ %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2425,7 +2236,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s �ѥå��������Ф������"
@@ -2443,16 +2254,16 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "���ϥե����� '%s' ��ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "���ϥե����� `%s' ��ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"���ϥե����� '%2$s' ��Υɥᥤ�� \"%1$s\" �ˤ�ʸ�����åȤ���ꤹ��إå�����"
+"���ϥե����� `%2$s' ��Υɥᥤ�� \"%1$s\" �ˤ�ʸ�����åȤ���ꤹ��إå�����"
 "������ޤ���"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
@@ -2462,8 +2273,8 @@
 "�оݤȤʤ�ʸ�����å� \"%s\" �ϲ������Τ��륨�󥳡��ǥ���̾�ǤϤ���ޤ���"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "�ٹ�: "
@@ -2588,44 +2399,44 @@
 msgid "Try using the following, valid for %s:"
 msgstr "%s �ˤȤä�ͭ����, ����ȤäƤߤƤ�������:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "��å���������������ʣ����������������ޤ�"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "�������إå�����ȥ�� \"plural=EXPRESSION\" °��������ޤ���"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "�������إå�����ȥ�� \"nplurals=INTEGER\" °��������ޤ���"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "������ nplurals ����"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "������ʣ�� (plural) ɽ��"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2633,58 +2444,67 @@
 "��å��������������ˤ�ʣ����������������ޤ�. ������ \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" �Ȥ����إå�����ȥ꤬����ޤ���"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
-"'msgid' �� 'msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
+"`msgid' �� `msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "'msgid' �� 'msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' �� `msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "'msgid' �� 'msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid' �� `msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
-"'msgid' �� 'msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
+"`msgid' �� `msgstr_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "'msgid' �� 'msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' �� `msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "'msgid' �� 'msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "`msgid' �� `msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "ʣ����������� GNU gettext �γ�ĥ�Ǥ�"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr �ˤϥ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ���"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "msgstr �ˤϤ��ޤ��¿���Υ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ�"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "�إå����� '%s' �����ɸ���ͤΤޤޤǤ�\n"
+msgid "header field `%s' missing in header\n"
+msgstr "�إå����� `%s' ���إå�����ˤ���ޤ���\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "�إå����� '%s' ���إå�����ˤ���ޤ���\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "�إå����� `%s' �Ϲ�Ƭ�ˤʤ���Ф����ޤ���\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "�����Ĥ��Υإå����󤬽��ɸ���ͤΤޤޤǤ�\n"
+
+#: src/msgl-check.c:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "�إå����� `%s' �����ɸ���ͤΤޤޤǤ�\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2702,15 +2522,15 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "���ϥե������ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, 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() �Ϥ����Ѵ���������Ƥ��ޤ���."
+"\"%s\" ���� \"%s\" ���Ѵ��Ǥ��ޤ���. %s �� iconv() �˰�¸���Ƥ��ޤ���,iconv"
+"() �Ϥ����Ѵ���������Ƥ��ޤ���."
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2721,8 +2541,8 @@
 "\"%s\" ���� \"%s\" �ؤ��Ѵ�����ʣ, �����Ĥ��ΰۤʤä� msgid ���������ʤäƤ�"
 "�ޤ�."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2731,16 +2551,16 @@
 "\"%s\" ���� \"%s\" ���Ѵ��Ǥ��ޤ���. %s �� iconv() �˰�¸���Ƥ��ޤ�.���ΥС�"
 "������ iconv() �ʤ��Ǻ���Ƥ��ޤ�."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s �� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "�Хå����åץ�����"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2756,23 +2576,23 @@
 "2�Ĥ� Uniforum ������ .po �ե������ 1�Ĥ˥ޡ������ޤ�. def.po �ե������\n"
 "���������������Ҥ��줿 PO �ե������, ���פ���¤꿷�������줿�ե������\n"
 "���Ƥ������Ѥ���ޤ�. �ޤ������ȤϤ��Τޤ޻Ĥ���ޤ���, ����������\n"
-"ȴ���Ф��줿�����Ȥȥե�����ΰ��֤��˴�����ޤ�. ref.pot �ե������\n"
+"ȴ���Ф��줿�����Ȥȥե�����ΰ��֤��˴�����ޤ�. ref.po �ե������\n"
 "�ǿ��� PO �ե����� (xgettext �ˤ������) ��, ���Υե�������Τ����ʤ�������\n"
 "�����Ȥ��˴�����ޤ�. �������ɥåȥ����Ȥȥե�����ΰ��֤Ϥ��Τޤ�\n"
 "�Ĥ���ޤ�. ���Τ˰��פ��Ƥ���Ľ꤬���Ĥ���ʤ�����, �����ޤ� (fuzzy)\n"
 "������Ȥ��Ȥ���ɤ���̤�����Ǥ��礦. \n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      �Ť����������Ф��뻲������\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ���������������Ф��뻲��\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2781,7 +2601,7 @@
 "  -C, --compendium=FILE       ��å������������ɲ�ʸ��\n"
 "                              1��ʾ���ꤵ����ǽ������\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2790,27 +2610,27 @@
 "  -U, --update                def.po �򹹿�\n"
 "                              def.po �����˺ǿ��ǤǤ���в��⤷�ʤ�\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "�����⡼�ɤǤν��ϥե�����ξ��:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "��̤� def.po �˽��ᤵ��ޤ�.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        def.po �ΥХå����åפ����\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         �̾�ΥХå����å�����������\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2830,39 +2650,39 @@
 "��\n"
 "  simple, never   ���ñ������ΥХå����åפ����\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "--suffix ��Ķ��ѿ� SIMPLE_BACKUP_SUFFIX �����ꤵ��Ƥ��ʤ����,\n"
-"�Хå����å��������� '~' �Ǥ�.\n"
+"�Хå����å��������� `~' �Ǥ�.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              �������줿��å����������� msgid ��Ĥ�\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       �ʹԾ�����ɽ�����ʤ�\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "���Υ�å�������ʣ������������٤��Ǥ�"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "���Υ�å�������ʣ������������٤��ǤϤ���ޤ���"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2871,7 +2691,7 @@
 "%s %ld(������) + %ld(����) ���ɤ߹��� (�ޡ��� %ld, �����ޤ� %ld, ���� %ld, ��"
 "�� %ld).\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2981,7 +2801,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                ��̩�� Uniforum �����ǽ���\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3002,12 +2822,12 @@
 "�ǽ������������Ф���ޤ�. �ե�����ΰ��֤Ϥ��Τޤ޻Ĥ�ޤ�. --unique\n"
 "���ץ�����Ȥ��Ƚ�ʣ��̵�뤵��ޤ�.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              ��ʣ���Ƥ����ΤΤߤ�ɽ��\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3029,7 +2849,7 @@
 "ʸ�����å� \"%s\" �����ѤΥ��󥳡��ǥ���̾�ǤϤ���ޤ���.\n"
 "�桼����ʸ�����åȤؤΥ�å��������Ѵ��Ϥ��ޤ�Ư���ʤ������Τ�ޤ���.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3038,7 +2858,7 @@
 "ʸ�����å� \"%s\" �ϼ�������Ƥ��ޤ���. %s �� iconv() �˰�¸���ޤ���,\n"
 "iconv() �� \"%s\" ��������Ƥ��ޤ���.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3046,15 +2866,15 @@
 "GNU libiconv �򥤥󥹥ȡ��뤷�Ƥ��� GNU gettext ��ƥ��󥹥ȡ��뤹���\n"
 "��������ϲ�褹��Ǥ��礦.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "�Ȥˤ���³���ޤ���, ʸˡ���顼�򵯤����Ǥ��礦."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "�Ȥˤ���³���ޤ�."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3063,7 +2883,7 @@
 "ʸ�����å� \"%s\" �ϼ�������Ƥ��ޤ���. %s �� iconv() �˰�¸���ޤ�.\n"
 "���ΥС������� iconv() ̵���Ǻ���ޤ���.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3076,27 +2896,27 @@
 msgid "inconsistent use of #~"
 msgstr "��Ӥ��Ƥ��ʤ� #~ �λ���"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "'msgstr[]' �ιब����ޤ���"
+msgid "missing `msgstr[]' section"
+msgstr "`msgstr[]' �ιब����ޤ���"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "'msgid_plural' �ιब����ޤ���"
+msgid "missing `msgid_plural' section"
+msgstr "`msgstr_plural' �ιब����ޤ���"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "'msgstr' �ιब����ޤ���"
+msgid "missing `msgstr' section"
+msgstr "`msgstr' �ιब����ޤ���"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "�ǽ��ʣ�������󥼥��κ���������ޤ�"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "ʣ�����˴ְ�ä�����������ޤ�"
@@ -3106,7 +2926,7 @@
 msgid "too many errors, aborting"
 msgstr "���顼��¿�᤮��Τ�, �������Ǥ��ڤ�ޤ�"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "������ʣ���Х��ȤΥ�������"
@@ -3150,16 +2970,16 @@
 msgid "context separator <EOT> within string"
 msgstr "ʸ�������ʸ̮���ѥ졼�� <EOT>"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���Υե�����ϥɥᥤ��̿���ޤ�Ǥ��ʤ��褦�Ǥ�"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "��å���������Ť��������Ƥ��ޤ�"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "����Ϻǽ������ξ��Ǥ�"
 
@@ -3234,12 +3054,12 @@
 "���ϥƥ����Ȥ�ɸ�����Ϥ����ɤ߹��ޤ�ޤ�. �Ѵ����줿�ƥ����Ȥ�ɸ����Ϥؽ���\n"
 "����ޤ�.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "���Ϥ� \"%s\" ���󥳡��ǥ��󥰤ˤ�����ͭ���ǤϤ���ޤ���"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
@@ -3265,21 +3085,11 @@
 "URL �����Ƥ���������Ϥ��ޤ�. �⤷���� URL �˥��������Ǥ��ʤ����,\n"
 "��������˥���������ǽ�� FILE ������˻Ȥ��ޤ�.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "ɸ����Ϥ˽񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "\"%s\" ���ɤ߹������˥��顼��ȯ�����ޤ���"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3361,18 +3171,18 @@
 msgid "compilation of C# class failed"
 msgstr "C# ���饹�Υ���ѥ���˼���"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "������ Java ���饹̾�ǤϤ���ޤ���: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java ���饹�Υ���ѥ���˼���. --verbose ���� $JAVAC �����ꤷ�Ƥ�������"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Java ���饹�Υ���ѥ���˼���. $JAVAC �����ꤷ�ƤߤƤ�������"
@@ -3382,20 +3192,15 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" �˽񤭹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "������ʣ���Х��ȤΥ�������"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"��ݲ����줿��å������� '\\%c' �Ȥ������������ץ������󥹤�ޤ�ǤϤ����ޤ�"
+"��ݲ����줿��å������� `\\%c' �Ȥ������������ץ������󥹤�ޤ�ǤϤ����ޤ�"
 "��"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3409,7 +3214,7 @@
 "��Ƥ���Ƥ�������.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3491,7 +3296,7 @@
 "��å��������������ˤ�ʣ����������������ޤ�.\n"
 "������ Tcl ��å�������������������ʣ�����ν�����������Ƥ��ޤ���\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
@@ -3501,22 +3306,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: �ٹ�: ����ɽ���˽�ü������ޤ���"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "�ٹ�: ������ Unicode ʸ��"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �ٹ�: ʸ������˽�ü������ޤ���"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������."
 
@@ -3556,7 +3356,7 @@
 "%s:%d: �����������ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ���"
@@ -3570,7 +3370,7 @@
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: �ٹ�: ������ Unicode ʸ��"
@@ -3590,22 +3390,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: �ٹ�: ')' ������٤��Ȥ����� '}' ������ޤ�"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "'%s' ���Ǥ�����Ф���ʸ������Ф��륳��ƥ����Ȥ�����ޤ���"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "�롼������ <%s> ��ͭ���� Glade �ե����������뤳�ȤϤǤ��ޤ���"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3619,70 +3409,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: �ٹ�: Ĺ������������ U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: �����ʥޥ���Х��ȥ�������.\n"
-"--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ĺ���Դ����ʥޥ���Х��ȥ�������.\n"
-"--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: �ե�����κǸ���Դ����ʥޥ���Х��ȥ�������.\n"
-"--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: �����������ʥޥ���Х��ȥ�������.\n"
-"--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: �����ʥޥ���Х��ȥ�������.\n"
-"--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: �ٹ�: RegExp ��ƥ��ν�ü����᤮�ޤ�"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: �ٹ�: %s �ϵ��Ĥ���Ƥ��ޤ���"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: �ٹ�: ��ü�Τʤ� XML �ޡ������å�"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3718,7 +3444,7 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\U\") 8bit ʸ�� \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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"
@@ -3727,7 +3453,7 @@
 "��\n"
 "�Ȥä����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3739,7 +3465,7 @@
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3751,7 +3477,7 @@
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3763,7 +3489,7 @@
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3775,19 +3501,19 @@
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: ̵���ʥޥ���Х��ȥ�������.\n"
+"%s:%d: ̵���ʤʥޥ���Х��ȥ�������.\n"
 "--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "̤�ΤΥ��󥳡��ǥ��� \"%s\". ����� ASCII �Ȥ��ƿʤ�ޤ�."
@@ -3816,37 +3542,27 @@
 "%s:%lu: �ٹ�: ʸˡ $\"...\" �ϥ������ƥ������ͳ�ǿ侩����ޤ���. ����� "
 "eval_gettext ��ȤäƤ�������"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: �ٹ�: ����ɽ����ƥ��ν�ü����᤮�ޤ�"
-
-#: src/xgettext.c:545
-#, 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:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing �Ͻ����褬ɸ����Ϥξ��ˤϻȤ��ޤ���"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext �ϸ������륭����ɤ��ʤ����ư���ޤ���"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "�ٹ�: �ե����� '%s' (��ĥ�� '%s') ��̤�Τη����ʤΤ� C ������ޤ�"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "�ٹ�: �ե����� `%s' (��ĥ�� `%s') ��̤�Τη����ʤΤ� C ������ޤ�"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Ϳ����줿���ϥե����뤫��������ǽ��ʸ�������Ф��ޤ�.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3854,23 +3570,23 @@
 msgstr ""
 "  -d, --default-domain=NAME   ���Ϥ� NAME.po ����� (message.po ������)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           ���ꤵ�줿�ե�����˽���\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "���ϥե�������������:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3879,8 +3595,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NAME         ���ꤵ�줿�����ǧ��\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3888,22 +3603,21 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ��û�̷�\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ɸ��Ǹ�������ϥե�����γ�ĥ�ҤǼ��̤���ޤ�.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3912,22 +3626,22 @@
 "      --from-code=NAME           ���ϥե�����Υ��󥳡��ǥ���\n"
 "                                         (Python, Tcl, Glade �ʳ�)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ɸ��Ǥ�, ���ϥե������ ASCII �Ȳ��ꤵ��ޤ�.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ¸�ߤ���ե�����ȥ�å���������\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3941,47 +3655,40 @@
 "  -c, --add-comments[=TAG]    ������ɹԤޤǤ����ƤΥ�������ʬ��\n"
 "                                ���ϥե�����������\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "������ꥪ�ץ����:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ���Ƥ�ʸ��������\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala �����)\n"
+"                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade ��"
+"���)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (������: C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      �ɲå�����ɤȤ��� WORD �򸡺�\n"
+"  -k, --keyword               ɸ��Υ�����ɤϻȤ�ʤ�\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3992,93 +3699,91 @@
 "����\n"
 "                              �ղåե饰\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala �����)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC������ ����"
+"�Τ�)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ���Ϥ��줿 ANSI C �ȥ饤����դ�ǧ��\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (C, C++, ObjectiveC �����)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ �����)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ���ܺ٤ʥե����ޥå�ʸ�����ǧ�����\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     Java .properties �ե���������\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  �����ͭ�Ԥ���Ϥ�����\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          GNU �ץ��������Ȱʳ��Υ桼�������˽������ FSF "
-"������ά\n"
+"      --foreign-user          ¾��Υ桼�������˽������ FSF ������ά\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  �ѥå�����̾����Ϥ�����\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  �ѥå������С���������Ϥ�����\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4089,7 +3794,7 @@
 "\"\"\n"
 "                                �����\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4100,7 +3805,7 @@
 "\"\"\n"
 "                                �����\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4108,31 +3813,31 @@
 msgstr ""
 "--flag ������ <keyword>:<argnum>:[pass-]<flag> ʸˡ����äƤ��ޤ���: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "ɸ������"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s ����ASCIIʸ��."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s �ޤ��Ϥ���������ASCII������."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s ����ASCIIʸ����."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: �ٹ�: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4141,7 +3846,7 @@
 "�ե����ޥå�ʸ����ΰ��֤ǻȤ��Ƥ��ޤ���, %s �������� %s �ե����ޥå�ʸ����"
 "�ǤϤ���ޤ���. ��ͳ: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4150,7 +3855,7 @@
 "���Τ褦���������Ƥ��ޤ���, '%s' �������� %s ������ʸ����ǤϤ���ޤ���. ��"
 "ͳ: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4159,57 +3864,81 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 "̵̾�������Τ��� '%s' �ե����ޥå�ʸ�����Ŭ�ڤ����ꤹ�뤳�Ȥ��Ǥ��ޤ���:\n"
-"�����Ԥϰ����ν�����Ѥ��뤳�Ȥ��Ǥ��ޤ���.\n"
+"�����Ԥϰ�����������ľ�����Ȥ��Ǥ��ޤ���.\n"
 "̾���դ������Τ���ե����ޥå�ʸ�����Ȥ�����, ��İ������Ф����� (tuple)\n"
 "������˥ޥåԥ󥰤�Ȥ����Ȥ�Ƥ���Ƥ�������.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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 ""
 "���� msgid. GNU gettext ��ͽ�󤵤�Ƥ��ޤ�:\n"
-"gettext(\"\") �ϥ᥿������դ����إå�����ȥ���֤��ޤ���\n"
+"gettxt(\"\") �ϥ᥿������դ����إå�����ȥ���֤��ޤ���\n"
 "����ʸ������֤��ޤ���.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "������� '%.*s' ���Ф���������꤬ۣ��Ǥ�"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "�ٹ�: ������� '%.*s' ���Ф���ʸ̮������ޤ���"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "�ٹ�: ������� '%.*s' ��ʣ����������ʸ̮������ޤ���"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ʸ̮��ñ���Ϥ�ʣ�����ǰ��פ��ޤ���"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "���ץ���� --msgid-bugs-address �����ꤵ��Ƥ��ޤ���.\n"
-"'Makevars' �ե������ȤäƤ������ MSGID_BUGS_ADDRESS �ѿ�����ꤷ�Ƥ�����"
+"`Makevar' �ե������ȤäƤ������ MSGID_BUGS_ADDRESS �ѿ�����ꤷ�Ƥ�����"
 "��.\n"
 "�⤷����, ���ޥ�ɥ饤�󥪥ץ���� --msgid-bugs-address ����ꤷ�Ƥ�������.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "���� '%s' ���Τ�ޤ���"
+msgid "language `%s' unknown"
+msgstr "���� `%s' ���Τ�ޤ���"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<̾���ʤ�>"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: �����ʥ��ץ���� -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "���顼������ 0x%08x �� DuplicateHandle ����"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "̤����."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "%s ���֥ץ������˥֥��å��󥰤��ʤ������Ϥ�����Ǥ��ޤ���"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s ���֥ץ������Ȥ��̿��˼���"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s ���֥ץ�����������ɤ߹��ߤ˼���"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s ���֥ץ���������λ������ %d �ǽ�λ"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "���� `%s' �����ɸ���ͤΤޤޤǤ�\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/ko.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/ko.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/ko.po gettext-0.18.1.1/gettext-tools/po/ko.po
--- gettext-0.19.3/gettext-tools/po/ko.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/ko.po	2010-06-06 12:49:57.000000000 +0000
@@ -1,22 +1,22 @@
 # gettext-tools
-# Copyright (C) 1996-1997, 2001-2005, 2007, 2009-2010, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 # 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-2014.
+# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 06:21+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-15 23:48+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/argmatch.c:133
@@ -30,25 +30,26 @@
 msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 애매합니다"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "올바른 인자는 다음과 같습니다:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "임시 디렉터리가 없습니다, $TMPDIR 환경변수를 세팅하십시오"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "서식 \"%s\"을(를) 이용해 임시 디렉터리를 만들 수 없습니다"
+msgstr "틀 \"%s\"을(를) 이용해 임시 디렉터리를 만들 수 없습니다"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "임시 파일 %s을(를) 지울 수 없습니다"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
@@ -57,38 +58,37 @@
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "%s에 대한 권한 보존"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "읽으려고 %s 파일을 여는 동안 오류 발생"
+msgid "error while opening \"%s\" for reading"
+msgstr "읽기 위해 \"%s\"을(를) 여는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "%s 백업 파일을 위해 열지 못했습니다"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "백업 파일 \"%s\"을(를) 쓰기 위해 열지 못했습니다"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "%s 파일을 읽는 동안 오류 발생"
+msgid "error reading \"%s\""
+msgstr "\"%s\" 파일을 읽는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "%s 파일을 쓰는 동안 오류 발생"
+msgid "error writing \"%s\""
+msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "%s 파일을 읽은 후에 오류 발생"
+msgid "error after reading \"%s\""
+msgstr "\"%s\" 파일을 읽은 후에 오류 발생"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -105,98 +105,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# 가상기계가 없습니다. pnet을 설치해 보십시오"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 하위 프로세스가 실패했습니다"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: '%s' 옵션은 모호한 옵션입니다. 가능한 옵션은:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: '%s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: '--%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: '%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: '--%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 부적절한 옵션 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 이 옵션은 인수가 필요합니다 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: '-W %s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class에 대한 source_version 인자가 잘못되었습니다"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\"을(를) 만드는 데 실패했습니다"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -208,96 +208,58 @@
 msgstr ""
 "자바 가상기계가 없습니다. gij를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 하위 프로세스 입출력 오류"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr "스레드 만들기에 실패했습니다"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s 하위 프로세스에 쓰기가 실패했습니다"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s 하위 프로세스에서 읽기에 실패했습니다"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "%s 하위 프로세스에 넌블로킹 입출력을 준비할 수 없습니다"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s 하위 프로세스에 통신이 실패했습니다"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 하위 프로세스가 종료 코드 %d번으로 끝났습니다"
+msgid "cannot create pipe"
+msgstr "파이프를 만들 수 없습니다"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "파이프를 만들 수 없습니다"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 실패"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "파일 디스크립터 %d번을 복구할 수 없습니다: dup2 실패"
@@ -314,21 +276,14 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 하위 프로세스가 치명적인 시그널 %d번을 받았습니다"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "읽으려고 \"%s\"을(를) 여는 동안 오류 발생"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%3$s'와는 달리, '%1$s'은(는) 올바른 %2$s 형식 문자열이 아닙니다. 이유: %4$s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -337,29 +292,27 @@
 msgstr "'%2$s' 안에 있는, 인자 %1$u에 대한 서식 지정이 '%3$s'에 없습니다"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "인자 %u에 대한 서식 지정이 '%s'에 없습니다"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "'%s'과(와) '%s'에 쓰인 인자 %u에 대한 서식 지정이 같지 않습니다"
+msgstr "'%s'와 '%s'에 쓰인 인자 %u에 대한 서식 지정이 같지 않습니다"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "지시자 %u번이 |로 시작하지만 |로 끝나지 않습니다."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -368,22 +321,20 @@
 "지시자 %u번에서, '<' 뒤의 토큰이 포맷을 지정하는 매크로 이름이 아닙니다. 올바"
 "른 매크로 이름은 ISO C 99 섹션 7.8.1에 열거되어 있습니다."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "지시자 %u번에서, '<' 뒤의 토큰 다음에 '>'가 오지 않습니다."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "문자열이 인자 번호  %u을(를) 참조하지만 인자 번호 %u을(를) 무시합니다."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "'%s'과(와) '%s'에 쓰인 서식 지정자의 개수가 일치하지 않습니다"
+msgstr "'%s'와 '%s'에 쓰인 서식 지정자의 개수가 일치하지 않습니다"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -468,16 +419,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s'이(가) %%m 포맷을 사용하지 않지만 '%s'은(는) %%m 포맷을 사용합니다"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s'이(가) %%C 포맷을 사용하지만 '%s'은(는) 사용하지 않습니다"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s'이(가) %%C 포맷을 사용하지 않지만 '%s'은(는) %%C 포맷을 사용합니다"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "지시자 중간에서 문자열이 끝납니다."
@@ -587,7 +528,7 @@
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "인자 {%3$u}에 대한 '%1$s'과(와) '%2$s'의 서식 지정이 같지 않습니다"
+msgstr "인자 {%3$u}에 대한 '%1$s'와 '%2$s'의 서식 지정이 같지 않습니다"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -607,7 +548,7 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"지시자 %u번에서, 매개변수가 너무 많습니다. 매개변수는 최대 %u개만 올 수 있습"
+"지시자 %u번에서, 매개변수가 너무 많습니다; 최대 %u개의 매개변수만 올 수 있습"
 "니다."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
@@ -658,7 +599,7 @@
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "'%s'과(와) '%s'의 서식 지정이 동등하지 않습니다"
+msgstr "'%s'와 '%s'의 서식 지정이 동등하지 않습니다"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
@@ -672,9 +613,7 @@
 "conversion specifier '%c'."
 msgstr "지시자 %u번에서, 크기 지정은 '%c' 변환 지정과 호환되지 않습니다."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "인자 '%s'에 대한 서식 지정이 '%s'에 없습니다"
@@ -715,33 +654,7 @@
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "인자 '%s'에 대한 '%s'과(와) '%s'의 서식 지정이 같지 않습니다"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "지시자 %u번에서, 필드 이름이 '%c' 문자로 시작할 수 없습니다."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "지시자 %u번에서, getattr 인자가 '%c' 문자로 시작할 수 없습니다."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "지시자 %u번에서, getitem 인자가 '%c' 문자로 시작할 수 없습니다."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "지시자 %u번에서, 포맷 지정에서 더 이상은 네스팅을 허용하지 않습니다."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "지시자 %u번에서, 포맷 지시자를 마치지 않았습니다."
+msgstr "인자 '%s'에 대한 '%s'와 '%s'의 서식 지정이 같지 않습니다"
 
 #: src/format-qt.c:152
 #, c-format
@@ -788,11 +701,11 @@
 "1 and 9."
 msgstr "지시자 %u번을 끝마치는 문자가 1과 9 사이의 숫자가 아닙니다."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -805,58 +718,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s이(가) 만들었습니다.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "브루노 헤이블(Bruno Haible)"
+msgstr "브루노 헤이블 (Bruno Haible)"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "인수가 너무 많음"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "사용법: %s [<옵션>]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "이 기계의 호스트이름을 표시합니다.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "출력 형식:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           짧은 호스트이름\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -866,34 +779,34 @@
 "  -f, --fqdn, --long    긴 호스트이름, 완전 공인 도메인이름(Fully Qualified\n"
 "                          Domain Name) 및 별명(alias)들을 모두 포함\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      호스트이름에 대한 주소\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "정보 출력:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  이 도움말을 보여주고 끝납니다\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
@@ -902,103 +815,107 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "호스트이름을 알아낼 수 없습니다"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "최대 한 개의 입력파일만이 허용됩니다"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s과(와) %s은(는) 서로 배타적입니다"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "사용법: %s [옵션] [입력파일]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
-msgstr "번역 메시지를 그 속성에 따라 걸러내고, 그 속성을 조작합니다.\n"
+msgstr ""
+"번역 메시지들을 그 속성에 따라 걸러내고, 그 속성을 조작합니다.\n"
+"\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "입력 파일 위치:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  <입력파일>                     입력 PO 파일\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=<디렉터리>  입력 파일 탐색 명단에 <디렉터리>를 추가합니다\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "입력 파일이 주어지지 않거나 \"-\"이면, 표준 입력에서 읽습니다.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "출력 파일 위치:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=<파일>   지정한 파일로 출력합니다\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1007,12 +924,12 @@
 "만약 출력 파일이 지정되지 않았거나 \"-\"인 경우, 결과물을 표준 출력으로 \n"
 "출력합니다.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "메시지 선택:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1020,7 +937,7 @@
 "      --translated            번역되었으면 놔 두고, 번역되지 않았으면 지웁니"
 "다\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1028,63 +945,54 @@
 "      --untranslated          번역되지 않았으면 놔 두고, 번역되었으면 지웁니"
 "다\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy'로 표시된 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy'로 표시된 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           없어진 #~ 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         없어진 #~ 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "속성 조작:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             모든 메시지를 'fuzzy'로 만듭니다\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          모든 메시지를 없는 메시지로 만듭니다\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              'fuzzy'로 설정할 때, 이전에 번역한 메시지의\n"
-"                              msgid를 놔 둡니다\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1092,33 +1000,27 @@
 msgstr ""
 "      --clear-previous        모든 메시지에서 \"이전의 msgid\"를 지웁니다\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 'fuzzy'를 제거할 때, msgstr도 비웁니다\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=<파일>.po   <파일>.po에 들어 있는 항목만 조작합니다\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=<파일>.po <파일>.po에 들어 있지 않은 항목만 조작합니다\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 \"--only-fuzzy --clear-fuzzy\"와 동일합니다\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1126,24 +1028,24 @@
 "      --obsolete              \"--only-obsolete --clear-obsolete\"와 동일합니"
 "다\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "입력 파일 문법:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      입력 파일이 자바 .properties 문법입니다\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1152,17 +1054,17 @@
 "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
 "다\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "출력 상세:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1175,26 +1077,26 @@
 "                              <상황>은 'always', 'never', 'auto', 혹은 "
 "'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
+"  -e, --no-escape             출력에 C 이스케이프를 쓰지 않습니다 (기본값)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1202,68 +1104,68 @@
 "  -E, --escape                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않"
 "습니다\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              비어 있는 파일이라도 PO 파일로 씁니다\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                들여쓰기된 스타일로 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           '#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
+"      --no-location           '#: 파일이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          '#: 파일_이름:줄번호' 줄을 만듭니다(기본값)\n"
+"  -n, --add-location          '#: 파일이름:줄번호' 줄을 만듭니다 (기본값)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output     NeXTstep/GNUstep .strings 파일을 씁니다\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=<숫자>          출력 페이지의 너비를 지정합니다\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1272,31 +1174,31 @@
 "      --no-wrap               출력 페이지 폭보다 긴 메시지 라인을 여러 줄로\n"
 "                              자르지 않습니다.\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           정렬된 출력을 만들어 냅니다\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          파일 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "불가능한 선택 조건을 지정하였습니다(%d < n < %d)"
+msgstr "불가능한 선택 조건을 지정하였습니다 (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "사용법: %s [<옵션>] [<입력파일>]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1305,36 +1207,37 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"지정한 PO 파일을 연결하고 합칩니다.\n"
-"두 개 혹은 그 이상의 PO 파일에서 공통적으로 들어 있는 메시지를 찾습니다.\n"
-"--more-than 옵션을 사용하면 같은 메시지가 많은 메시지가 출력됩니다. 그 반대로,\n"
-"--less-than 옵션은 같은 메시지가 더 적은 메시지가 출력됩니다. (예를 들어\n"
-"--less-than=2 옵션은 유일한 메시지만을 출력합니다). 번역문, 주석문과 소스에서\n"
-"추출된 주석문은 모두 누적되지만, --user-first 옵션을 사용하면 그 메시지가\n"
-"나타나는 가장 첫 번째 PO 파일에 들어 있는 모든 PO 파일에서 파일 위치는 그대로\n"
-"유지됩니다.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
+"지정한 PO 파일들을 연결하고 합칩니다.\n"
+"두 개 혹은 그 이상의 PO 파일에서 공통적으로 들어 있는 메시지를 \n"
+"찾습니다. --more-than 옵션을 사용하면 같은 메시지가 많은 메시지가 \n"
+"출력될 것입니다. 그 반대로, --less-than 옵션은 같은 메시지가 더 \n"
+"적은 메시지들이 출력되게 됩니다 (예를 들어 --less-than은 유일한 \n"
+"메시지만을 출력합니다). 번역문, 주석문과 소스에서 추출된 주석문은 \n"
+"모두 유지될 것이지만, --user-first 옵션을 사용하면 그 메시지가 \n"
+"나타나는 가장 첫 번째 PO 파일에 들어 있는  모든 PO 파일에서 파일 \n"
+"위치는 그대로 유지될 것입니다.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  입력파일 ...                입력 파일\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=<파일>     입력 파일의 목록을 <파일>에서 읽습니다\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "입력 파일이 -이면, 표준 입력을 읽습니다.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1343,7 +1246,7 @@
 "  -<, --less-than=<크기>      지정한 것보다 적은 메시지만을 출력합니다.\n"
 "                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1352,7 +1255,7 @@
 "  -<, --less-than=<크기>      지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1361,8 +1264,8 @@
 "  -u, --unique                --less-than=2를 짧게 쓴 것입니다.\n"
 "                              유일한 메시지만을 출력합니다.\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1370,8 +1273,8 @@
 "  -P, --properties-input      입력 파일이 자바 .properties 문법으로 되어 있습"
 "니다\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1380,12 +1283,12 @@
 "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
 "다\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=<이름>          출력의 인코딩\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1394,28 +1297,28 @@
 "      --use-first               각 메시지중에서 첫번째로 나타나는 번역문만\n"
 "                                사용하고, 여러 번역문을 합치지 않습니다\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "피터 밀러(Peter Miller)"
+msgstr "피터 밀러 (Peter Miller)"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "정확히 2개의 입력 파일이 필요합니다"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "사용법: %s [<옵션>] def.po ref.pot\n"
@@ -1430,12 +1333,12 @@
 "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 ""
-"같은 내용의 msgid 문자열이 들어 있는지 확인하려고 Uniforum 형태의 두 .po\n"
-"파일을 비교합니다. def.po 파일은 이미 존재하는 파일이며 예전에 번역된 메시지를\n"
-"담고 있습니다. ref.po 파일은 최근에 만들어진 PO 파일이거나 PO 서식 파일입니다.\n"
-"(일반적으로 xgettext에서 만듭니다.) 이 프로그램은 프로그램 내에 있는 각각의\n"
-"메시지가 번역되었는지 확인할 때 유용합니다. 정확한 짝을 찾지 못할 경우, 보다\n"
-"나은 결과를 얻으려고 퍼지 매칭이 사용됩니다.\n"
+"같은 내용의 msgid 문자열을 포함하고 있는지 확인하기 위해 Uniforum 형태의 \n"
+"두 .po 파일을 비교합니다. def.po 파일은 이미 존재하는 파일이며 예전에 \n"
+"번역된 메시지를 담고 있습니다. ref.po 파일은 최근에 만들어진 PO 파일이거나 \n"
+"PO 틀 파일입니다(일반적으로 xgettext에 의해 만들어집니다). 이 프로그램은\n"
+"프로그램 내에 있는 각각의 메시지들이 번역되었는지 확인할 때 유용합니다.\n"
+"정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻기 위해 퍼지 매칭이 사용됩니다.\n"
 
 #: src/msgcmp.c:232
 #, c-format
@@ -1447,12 +1350,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     소스를 참조\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "동작 변경:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1461,7 +1364,7 @@
 "  -m, --multi-domain          ref.pot 파일을 def.po의 각 도메인에 적용합니"
 "다\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     퍼지 매칭을 하지 않습니다\n"
@@ -1486,17 +1389,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "이 메시지는 번역자의 검토가 필요합니다"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "이 메시지는 사용되지만 정의되지 않았습니다..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...하지만 이 정의는 유사합니다"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
@@ -1506,18 +1409,18 @@
 msgid "warning: this message is not used"
 msgstr "경고: 이 메시지는 사용되지 않습니다"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
-msgstr[0] "치명적인 오류 %d개를 찾았습니다"
+msgstr[0] "%d개의 치명적인 오류를 찾았습니다"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
-msgstr "최소한 파일 두 개를 지정해야 합니다"
+msgstr "최소한 두 개의 파일을 지정해야 합니다"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1525,18 +1428,20 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"두 개 혹은 그 이상의 PO 파일에서 공통적으로 들어 있는 메시지를 찾습니다. \n"
-"--more-than 옵션을 사용하면 같은 메시지가 많은 메시지가 출력됩니다. 그 반대로,\n"
-"--less-than 옵션은 같은 메시지가 더 적은 메시지가 출력됩니다. (예를 들어 \n"
-"--less-than=2 옵션은 유일한 메시지만을 출력합니다.) 번역문, 주석문과 소스에서 추출된\n"
-"주석문은 모두 유지될 것이지만, 정의하려면 첫 번째 PO 파일에서만 유지됩니다. 모든\n"
-"PO 파일에서 파일 위치는 누적됩니다.\n"
+"두 개 혹은 그 이상의 PO 파일에서 공통적으로 들어 있는 메시지를 \n"
+"찾습니다. --more-than 옵션을 사용하면 같은 메시지가 많은 메시지가 \n"
+"출력될 것입니다. 그 반대로, --less-than 옵션은 같은 메시지가 더 \n"
+"적은 메시지들이 출력되게 됩니다 (예를 들어 --less-than은 유일한 \n"
+"메시지만을 출력합니다). 번역문, 주석문과 소스에서 추출된 주석문은 \n"
+"모두 유지될 것이지만, --user-first 옵션을 사용하면 그 메시지가 \n"
+"나타나는 가장 첫 번째 PO 파일에 들어 있는  모든 PO 파일에서 파일 \n"
+"위치는 그대로 유지될 것입니다.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1545,70 +1450,70 @@
 "  ->, --more-than=<크기>         지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                                 이 옵션이 없을 경우에 기본값은 1입니다.\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           헤더에 'msgid \"\"' 항목을 쓰지 않습니다\n"
+"      --omit-header              헤더에 `msgid \"\"' 항목을 쓰지 않습니다\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "번역 목록을 다른 문자 인코딩으로 변환합니다.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "변환 목표:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "기본 인코딩은 현재 로캘의 인코딩입니다.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                들여쓰기된 출력 형태\n"
+msgstr "  -i, --indent                   들여쓰기된 출력 형태\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
+"      --no-location              ''#: 파일이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
+"      --add-location          '#: filename:line' 줄을 만듭니다 (기본값)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
+msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "정확히 한 개의 입력 파일이 필요합니다"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "사용법: %s [<옵션>] <입력파일>\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1616,11 +1521,12 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"영어 번역 목록을 만듭니다. 입력 파일은 최근에 만들어진 영어 PO 파일이거나, PO\n"
-"서식 파일입니다. (일반적으로 xgettext로 만듭니다.) 번역되지 않은 항목은\n"
-"msgid와 동일한 번역문이 할당되고, 퍼지로 표시됩니다.\n"
+"영어 번역 목록을 만듭니다. 입력 파일은 최근에 만들어진 영어\n"
+"PO 파일이거나, PO 틀 파일입니다 (일반적으로 xgettext로 만듭니다).\n"
+"번역되지 않은 항목은 msgid와 동일한 번역문이 할당될 것이고,\n"
+"퍼지로 표시될 것입니다.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  <입력파일>                   입력 PO 파일 혹은 POT 파일\n"
@@ -1659,7 +1565,7 @@
 "특별히 내부 명령어 '0'은 번역문을 그대로 출력하고, 맨 끝에 0 널 바이트를 \n"
 "출력합니다. \"msgexec 0\"의 출력물은 \"xargs -0\"의 입력으로 사용하기에 적합합니다\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=<입력파일>       입력 PO 파일\n"
@@ -1669,27 +1575,32 @@
 msgid "write to stdout failed"
 msgstr "표준 출력에 쓰기가 실패했습니다"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s 하위 프로세스에 쓰기가 실패했습니다"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "필터 이름이 빠졌습니다"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "최소한 한 개의 sed 스크립트를 지정해야 합니다"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "사용법: %s [<옵션>] <필터> [<필터-옵션>]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "번역 목록의 모든 번역문에 대하여 필터를 적용합니다.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1698,19 +1609,19 @@
 "\"필터\"는 표준 입력에서 번역문을 읽어서 수정된 번역문을 표준 출력으로\n"
 "출력하는 프로그램이면 어떤 프로그램이든 가능합니다.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=<스크립트> 실행할 명령어에 <스크립트>를 추가합니다\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1720,26 +1631,26 @@
 "  -f, --file=<스크립트파일>   <스크립트파일>의 내용을 실행할 명령어에\n"
 "                              추가합니다.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       패턴 공백을 자동으로 출력하지 않도록 합니다\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
+"      --no-escape             출력에 C 이스케이프를 쓰지 않습니다 (기본값)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                들여 쓰기된 출력 스타일\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1747,99 +1658,78 @@
 "      --keep-header           헤더 항목을 수정하지 않습니다. 필터링하지 않습"
 "니다.\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s의 인자는 한 개의 구두점 문자여야 합니다"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "엔디안이 틀렸습니다: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "울리히 드레퍼(Ulrich Drepper)"
-
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "%s 및 %s 옵션을 사용하면 입력 파일을 지정하지 않아야 합니다"
+msgstr "울리히 드레퍼 (Ulrich Drepper)"
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "%s 옵션은 \"-d <디렉터리>\" 지정이 필요합니다"
+msgstr "%s은(는) \"-d 디렉터리\" 지정이 필요합니다"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s 옵션은 \"-d <로캘>\" 지정이 필요합니다"
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s 옵션은 \"--template <서식>\" 지정이 필요합니다"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s 옵션은 \"-o <파일>\" 지정이 필요합니다"
+msgstr "%s은(는) \"-d 로캘\" 지정이 필요합니다"
 
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s 및 %s 옵션은 %s에서 서로 배타적입니다"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s 옵션은 %s 혹은 %s 옵션과 함께 써야만 효과가 있습니다"
+msgstr "%s은(는) %s 혹은 %s과(와) 함께 써야만 효과가 있습니다"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s 옵션은 %s, %s 또는 %s 옵션과 함께 써야만 효과가 있습니다"
+msgstr "%s은(는) %s, %s 혹은 %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "번역된 메시지 %d개"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", 퍼지 번역문 %d개"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", 번역되지 않은 메시지 %d개"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "사용법: %s [<옵션>] <파일이름>.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "주어진 번역문에서 이진 메시지 목록 파일을 만들어 냅니다.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1848,17 +1738,17 @@
 "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
 "없어도 되는 인자도 마찬가지입니다.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  <파일이름>.po ...             입력 파일\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "동작 모드:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1867,7 +1757,7 @@
 "  -j, --java                  자바 모드: 자바 ResourceBundle 클래스를 만듭니"
 "다\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1876,12 +1766,12 @@
 "      --java2                 --java와 같지만, Java2를 가정합니다(JDK 1.2 이"
 "상)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 모드: .NET .dll 파일을 만듭니다\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1890,67 +1780,53 @@
 "      --csharp-resources      C# 리소스 모드: .NET .resources 파일을 만듭니"
 "다\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 모드: Qt .qm 파일을 만듭니다\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               desktop 항목 모드: .desktop 파일을 만듭니다\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "자바 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=<리소스>     리소스 이름\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=<로캘>         로캘 이름, 언어 혹은 언어_국가\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr "      --source                .class 파일 대신 .java 파일을 만듭니다\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d <디렉터리>               클래스 디렉터리 구조의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1962,87 +1838,50 @@
 "이름으로 결정됩니다. -d 옵션은 꼭 필요합니다. 클래스는 지정한 디렉터리\n"
 "아래에 출력됩니다.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr "  -d <디렉터리>               로캘 의존  .dll 파일의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의(로캘에 따라 달라"
+"-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의 (로캘에 따라 달라"
 "지는 이름의) 아래 디렉터리에 씁니다.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d <디렉터리>               .msg 메시지 목록의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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"
 
-# freedesktop.org desktop을 말한다
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "desktop 항목 모드 옵션:\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=<서식>           .desktop 파일을 서식으로 사용\n"
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d <디렉터리>               .po 파일의 베이스 디렉터리\n"
-"\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -k<단어>, --keyword=<단어>     <단어>를 추가 키워드로 찾습니다\n"
-"  -k, --keyword                  기본 키워드를 사용하지 않습니다\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"-l, -o 및 --template 옵션은 필수입니다. -D 옵션을 사용하면 입력 파일을 명령"
-"행 대신 디렉터리에서 읽습니다.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "입력 파일 해석:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2053,12 +1892,12 @@
 "                              --check-domain에서 하는 검사를 모두 수행합니"
 "다\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          언어에 따라 포맷 문자열을 검사합니다\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2066,7 +1905,7 @@
 msgstr ""
 "      --check-header          헤더 항목이 있는지와 그 내용을 검사합니다\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2075,7 +1914,7 @@
 "      --check-domain          도메인 지정과 --output-file 옵션의 도메인이\n"
 "                              충돌하지 않는지 검사합니다\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2083,22 +1922,22 @@
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt이 X/Open의 msgfmt처럼 검사합니다\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]  메뉴 항목에 키보드 단축글쇠가 있는지 \n"
+"      --check-accelerators[=CHAR]  메뉴 아이템에 키보드 단축글쇠가 있는지 \n"
 "                              검사합니다\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             출력에 퍼지 항목을 사용합니다\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2106,109 +1945,87 @@
 "  -a, --alignment=<크기>      문자열을 <크기> 바이트에 정렬합니다(기본값: "
 "%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=<바이트순> 32비트 수를 주어진 바이트 순서로 씁니다\n"
-"                                (big 또는 little, 기본값은 플랫폼에 따라)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               이진 파일에 해쉬 테이블을 넣지 않습니다\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            번역에 대한 통계를 표시합니다\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               더 자세히 출력합니다\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "경고: PO 파일 헤더가 빠졌거나 잘못되었습니다\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "경고: 문자셋 변환이 동작하지 않습니다\n"
+msgstr "경고: 문자셋 변환이 동작하지 않을 것입니다\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "경고: PO 파일 헤더가 퍼지입니다\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "경고: 과거 버전의 msgfmt은 여기에 오류를 낼 것입니다\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "도메인이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
-"도메인 이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다. 그러므로 접두사를\n"
-"사용합니다"
+"도메인이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다. 그러므로 접두사를\n"
+"사용할 것입니다"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "'domain %s' 지시자는 무시됨"
+msgid "`domain %s' directive ignored"
+msgstr "`domain %s' 지시자는 무시됨"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "빈 'msgstr' 항목은 무시됨"
+msgid "empty `msgstr' entry ignored"
+msgstr "빈 `msgstr' 항목은 무시됨"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "퍼지 'msgstr' 항목은 무시됨"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "퍼지 `msgstr' 항목은 무시됨"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: 경고: 소스 파일에 퍼지 번역문이 들어 있습니다"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s 파일이 없습니다"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s 파일이 있지만 읽을 수 없습니다"
+msgstr "%s: 경고: 소스 파일이 퍼지 번역문을 포함하고 있습니다"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2216,7 +2033,7 @@
 msgstr ""
 "'%c' 옵션은 'J'나 'K'나 'T'나 'C'나 'X'가 지정되기 전에는 쓸 수 없습니다"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2225,7 +2042,7 @@
 "번역 목록에서 주어진 패턴에 맞는 메시지 혹은 주어진 소스 파일에 들어 있는\n"
 "메시지만을 뽑아 냅니다.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2277,7 +2094,7 @@
 "혹은 -X 옵션을 쓴다면 그 추출한 주석이 \"추출한-주석-패턴\"과 맞는 경우.\n"
 "\n"
 "선택하는 방법이 여러 개 지정되는 경우, 선택되는 메시지는 각 선택하는\n"
-"방법으로 선택된 메시지의 공집합니다.\n"
+"방법으로 선택된 메시지들의 공집합니다.\n"
 "\n"
 "\"MSGCTXT-패턴\" 혹은 \"MSGID-패턴\" 혹은 \"MSGSTR-패턴\" 혹은 \"주석-패턴\" 혹은\n"
 "\"추출한-주석-패턴\"의 형식:\n"
@@ -2299,24 +2116,24 @@
 "  -i, --ignore-case           대소문자 구별을 하지 않습니다\n"
 "  -v, --invert-match          지정한 옵션에 맞지 않는 메시지만을 출력합니다\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                확장 문자 없이, 출력에 C 이스케이프를 씁니다\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           정렬된 출력을 만듭니다\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          파일의 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2326,7 +2143,7 @@
 "여러분의 LANG 환경변수를 세팅하십시오. 세팅해야만이 여러분의\n"
 "번역문을 테스트할 수 있습니다.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2337,24 +2154,26 @@
 "--locale 옵션으로 로캘을 지정하거나 --output-file 옵션으로\n"
 "출력 .po 파일을 지정하십시오.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s을(를) 만들었습니다.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
-msgstr "새로운 PO 파일을 만들고, 사용자의 환경에서 메타 정보를 초기화합니다\n"
+msgstr ""
+"새로운 PO 파일을 만들고, 사용자의 환경에서 메타 정보들을\n"
+"초기화합니다\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=<입력파일>       입력 POT 파일\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2364,12 +2183,12 @@
 "만약 입력 파일이 주어지지 않으면, 현재 디렉터리에서 POT 파일을 찾습니다.\n"
 "입력 파일이 \"-\"이면, 표준 입력을 읽습니다.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=<파일>    지정한 PO 파일로 출력합니다\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2378,19 +2197,19 @@
 "만약 출력 파일이 주어지지 않으면, --locale 옵션이나 사용자의 로캘 세팅에\n"
 "따라 결정됩니다. 출력 파일이 \"-\"이면, 표준 출력에 씁니다.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          목표 로캘을 지정합니다\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         PO 파일이 자동으로 만들어졌다고 가정합니다\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2398,12 +2217,12 @@
 "두 개 이상의 .pot 파일을 찾았습니다.\n"
 "입력 .pot 파일을 --input 옵션으로 지정하십시오.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "현재 디렉터리를 읽는 데 오류가 발생했습니다"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2411,14 +2230,14 @@
 "현재 디렉터리에서 .pot 파일을 찾을 수 없습니다.\n"
 "--input 옵션으로 입력 .pot 파일을 지정하십시오.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 하위 프로세스가 종료 코드 %d 번으로 실패했습니다"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2426,14 +2245,14 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"새로운 메시지 목록에는 반드시 여러분 전자메일 주소가 들어가 있어야 합니다.\n"
-"그래야만 사용자가 번역에 대한 피드백을 줄 수도 있고, 갑작스런 기술적\n"
-"문제가 발생했을 때 메인테이너가 여러분에게 연락을 할 수 있습니다.\n"
+"새로운 메시지 목록에는 반드시 여러분의 이메일 주소가 들어가 있어야 합니다.\n"
+"그래야만 사용자가 번역에 대한 피드백을 줄 수 있고, 메인테이너가 갑작스런 \n"
+"기술적 문제가 발생했을 때 여러분에게 연락을 할 수 있습니다.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 패키지에 대한 한국어 번역문"
@@ -2451,16 +2270,16 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "입력 파일 '%s'에는 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "입력 파일 `%s'에는 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"입력 파일 '%2$s'의 도메인 \"%1$s\"에는 문자셋을 지정하는 헤더 항목이 들어 있"
+"입력 파일 `%2$s'의 도메인 \"%1$s\"에는 문자셋을 지정하는 헤더 항목이 들어 있"
 "지 않습니다"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
@@ -2469,8 +2288,8 @@
 msgstr "목표 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름이 아닙니다."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "경고: "
@@ -2506,7 +2325,7 @@
 msgstr ""
 "%s 파일을 %s 인코딩에서 %s 인코딩으로 변환하면 일부 msgid와 msgctxt를 바꾸게 "
 "됩니다.\n"
-"모든 msgid와 msgctxt를 순수 ASCII로 바꾸거나, 처음부터(소스코드부터) UTF-8\n"
+"모든 msgid와 msgctxt를 순수 ASCII로 바꾸거나, 처음부터 (소스코드부터) UTF-8\n"
 "인코딩으로 만드십시오.\n"
 
 #: src/msgl-charset.c:93
@@ -2592,44 +2411,44 @@
 msgid "Try using the following, valid for %s:"
 msgstr "다음을 사용해 보십시오. %s에 대해서 올바름:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "메시지 목록은 복수형 번역이 들어 있습니다"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "하지만 헤더 항목에는 \"plural=표현식\" 속성이 들어 있지 않습니다"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "하지만 헤더 항목에는 \"nplurals=정수\" 속성이 들어 있지 않습니다"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nplurals 값이 잘못되었습니다"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "잘못된 복수 표현식"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "하지만 어떤 메시지는 복수형이 %lu개 밖에 없습니다"
+msgstr[0] "하지만 어떤 메시지는 %lu개의 복수 형밖에 없습니다"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "하지만 어떤 메시지는 복수형이 %lu개 있습니다"
+msgstr[0] "하지만 어떤 메시지는 %lu개의 복수 형이 있습니다"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2637,55 +2456,64 @@
 "메시지 목록에 복수형 번역이 들어 있지만, 헤더 항목에 \"Plural-Forms: "
 "nplurals=정수; plural=표현식;\"이 없습니다"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "'msgid'와 'msgstr_plural' 항목이 모두 '\\n'으로 시작하지 않습니다"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid'와 `msgstr_plural' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "'msgid'와 'msgstr[%u]' 항목이 모두 '\\n'으로 시작하지 않습니다"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid'와 `msgstr[%u]' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "'msgid'와 'msgstr' 항목이 모두 '\\n'으로 시작하지 않습니다"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid'와 `msgstr' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "'msgid'와 'msgid_plural' 항목이 모두 '\\n'으로 끝나지 않습니다"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid'와 `msgid_plural' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "'msgid'와 'msgstr[%u]' 항목이 모두 '\\n'으로 끝나지 않습니다"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid'와 `msgstr[%u]' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "'msgid'와 'msgstr' 항목이 모두 '\\n'으로 끝나지 않습니다"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "`msgid'와 `msgstr' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "복수 처리는 GNU gettext 확장 기능입니다"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr에 키보드 단축키 '%c'에 대한 표시가 없습니다"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr에 키보드 단축키 '%c' 표시가 너무 많습니다"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "'%s' 헤더 필드가 아직도 초기의 기본값을 가지고 있습니다\n"
+msgid "header field `%s' missing in header\n"
+msgstr "헤더에 헤더 필드 `%s'이(가) 빠졌음\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "헤더 필드 `%s'은(는) 행의 처음부터 시작해야 합니다\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "몇몇 헤더 필드가 아직도 초기의 기본값을 가지고 있습니다\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "헤더에 헤더 필드 '%s'이(가) 빠졌음\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "'%s' 헤더 필드가 아직도 초기의 기본값을 가지고 있습니다\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2701,8 +2529,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "입력 파일은 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2720,8 +2548,8 @@
 "\"%s\"에서 \"%s\"(으)로 변환하면 중복됩니다: 다른 두 개 이상의 msgid가 똑같"
 "아 집니다."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2730,16 +2558,16 @@
 "\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, "
 "이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s은(는) %s과(와) 함께 써야만 효과가 있습니다"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "백업 종류"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2752,27 +2580,27 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Uniforum 형태의 두 파일을 하나로 합칩니다. def.po 파일은 이미 존재하는\n"
-"파일이며 예전에 번역된 메시지를 담고 있습니다. 이 번역문은 짝이 있는\n"
-"것에 한해 새롭게 만들어진 파일의 것으로 대체됩니다. 주석은 보존되지만\n"
-"추출 주석과 파일 위치는 제거됩니다. ref.pot 파일은 최근에\n"
-"만들어졌으면서 최신의 소스를 참조해서 만들어 졌지만 과거의 번역문을\n"
-"가진 파일이거나, PO 서식 파일입니다. (일반적으로 xgettext로 만듭니다.)\n"
-"파일 내의 모든 번역문이나 주석은 제거되지만 점 주석과 파일 위치는\n"
-"보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻으려고 퍼지\n"
+"Uniforum 형태의 두 파일을 하나로 합칩니다. def.po 파일은 이미 \n"
+"존재하는 파일이며 예전에 번역된 메시지를 담고 있습니다. 이 번역문들은\n"
+"짝이 있는 것에 한해 새롭게 만들어진 파일의 것으로 대체됩니다; 주석은 \n"
+"보존되지만 추출 주석과 파일 위치는 제거됩니다. ref.pot 파일은 최근에\n"
+"만들어졌으면서 최신의 소스를 참조해서 만들어 졌지만 과거의 번역문을 가진 \n"
+"파일이거나, PO 틀 파일입니다 (일반적으로 xgettext에 의해 만들어집니다); \n"
+"파일 내의 모든 번역문이나 주석은 제거되지만 점 주석과 파일 위치는 \n"
+"보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻기 위해 퍼지 \n"
 "매칭이 사용됩니다.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      과거 소스를 참조하는 번역문\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     새로운 소스를 참조\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2781,7 +2609,7 @@
 "  -C, --compendium=<파일>      메시지 번역 라이브러리 추가,\n"
 "                               두 개 이상 지정할 수 있습니다\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2791,28 +2619,28 @@
 "                              이미 def.po를 업데이트했다면 아무 것도 안 합니"
 "다\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "업데이트 모드에서 출력 파일 위치:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "결과물은 def.po파일로 다시 쓰여집니다.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=<컨트롤>       def.po의 백업을 만듭니다\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2825,54 +2653,54 @@
 msgstr ""
 "버전 컨트롤 방법은 --backup 옵션이나 VERSION_CONTROL 환경 변수로 \n"
 "선택할 수 있습니다. 다음의 값을 쓸 수 있습니다:\n"
-"  none, off       백업을 만들지 않습니다(--backup 옵션이 있어도)\n"
+"  none, off       백업을 만들지 않습니다 (--backup 옵션이 있을지라도)\n"
 "  nummbered, t    번호를 붙인 백업을 만듭니다\n"
 "  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단"
 "히\n"
 "  simple, never   간단한 백업만을 만듭니다\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접"
 "미어는 '~'입니다.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              이전에 번역한 메시지의 msgid를 놔 둡니다\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       진행상태 표시를 하지 않습니다\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "이 메시지는 복수형을 지정해야만 합니다"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"예전 %s%ld + 참조문 %ld, 결합 %ld, 퍼지 %ld, 빠짐 %ld, 쓸모없음 %ld개를 읽었"
-"습니다.\n"
+"%s%ld개의 예전 것 + %ld개의 참조문, 결합된 것 %ld, 퍼지 %ld, 빠진 것 %ld, 쓸"
+"모없는 것 %ld개를 읽었습니다.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2955,7 +2783,7 @@
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 "-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의 아래\n"
-"디렉터리에(디렉터리 이름은 로캘에 따라 달라집니다) 들어 있습니다.\n"
+"디렉터리에 (디렉터리 이름은 로캘에 따라 달라집니다) 들어 있습니다.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
@@ -2981,7 +2809,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2993,21 +2821,21 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"번역 목록에서 중복된 번역문을 하나로 만듭니다. 같은 메시지 ID를 가진\n"
-"중복된 번역문을 찾습니다. 이렇게 중복된 번역문은 msgfmt, msgmerge나\n"
-"msgcat같은 프로그램에서 잘못된 입력이 됩니다. 기본값으로, 중복된\n"
-"번역문은 하나로 합쳐집니다. --repeated 옵션을 사용하면, 중복된\n"
-"메시지만이 출력되고, 다른 메시지를 버립니다. 주석문과 추출된 주석문은\n"
-"모두 유지될 것이지만, --use-first를 지정하면 첫 번째 번역문에 있는\n"
-"것만을 쓰게 됩니다. 파일의 위치는 모두 유지됩니다. --unique 옵션을\n"
-"사용할 때, 중복된 메시지를 버립니다.\n"
+"번역 목록에서 중복된 번역문을 하나로 만듭니다.\n"
+"같은 메시지 ID를 가진 중복된 번역문을 찾습니다. 이렇게 중복된 번역문은\n"
+"msgfmt, msgmerge나 msgcat같은 프로그램들에서 잘못된 입력이 됩니다.\n"
+"기본값으로, 중복된 번역문은 하나로 합쳐집니다. --repeated 옵션을 사용하면,\n"
+"중복된 메시지만이 출력되고, 다른 메시지들을 버립니다. 주석문과 \n"
+"추출된 주석문은 모두 유지될 것이지만, --use-first를 지정하면 첫 번째\n"
+"번역문에 있는 것만을 쓰게 됩니다. 파일의 위치는 모두 유지될 것입니다.\n"
+"--unique 옵션을 사용할 때, 중복된 메시지들을  버립니다.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 중복된 메시지만을 출력합니다\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3027,10 +2855,10 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"문자셋 \"%s\"이(가) 공통적으로 이용하는 인코딩 이름이 아닙니다. 사용자의\n"
-"문자셋으로의 메시지 변환은 하지 않습니다.\n"
+"문자셋 \"%s\"이(가) 공통적으로 이용하는 인코딩 이름이 아닙니다.\n"
+"사용자의 문자셋으로의 메시지 변환은 하지 않을 것입니다.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3039,23 +2867,23 @@
 "문자셋 \"%s\"은(는) 지원되지 않습니다. %s은(는) iconv()에 의존하지만,\n"
 "iconv()는 %s을(를) 지원하지 않습니다.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"GNU libiconv를 설치하고 GNU gettext를 다시 설치하면 이 문제가\n"
-"없습니다.\n"
+"GNU libiconv를 설치하고 GNU gettext를 다시 설치하면 이\n"
+"문제가 없을 것입니다.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "어쨌든 계속합니다. 문법 애러가 타나납니다."
+msgstr "어쨌든 계속합니다. 문법 애러가 타나날 것입니다."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "어쨌든 계속합니다."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3064,7 +2892,7 @@
 "문자셋 \"%s\"은(는) 지원되지 않습니다. %s은(는) iconv()에 의존하지만,\n"
 "이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3077,27 +2905,27 @@
 msgid "inconsistent use of #~"
 msgstr "#~가 모순되게 이용되었습니다"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "'msgstr[]' 부분이 빠졌습니다"
+msgid "missing `msgstr[]' section"
+msgstr "`msgstr[]' 부분이 빠졌습니다"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "'msgstr_plural' 부분이 빠졌습니다"
+msgid "missing `msgid_plural' section"
+msgstr "`msgstr_plural' 부분이 빠졌습니다"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "'msgstr' 부분이 빠졌습니다"
+msgid "missing `msgstr' section"
+msgstr "`msgstr' 부분이 빠졌습니다"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "첫 번째 복수형의 인덱스가 0이 아닙니다"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "복수형의 인덱스가 잘못되었습니다"
@@ -3107,7 +2935,7 @@
 msgid "too many errors, aborting"
 msgstr "오류가 너무 많아서 중단합니다"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "잘못된 가변바이트 문자열"
@@ -3151,16 +2979,16 @@
 msgid "context separator <EOT> within string"
 msgstr "문자열 안에 컨텍스트 구분 <EOT>가 있습니다."
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "이 파일은 도메인 지시자가 안 들어 있을 수도 있습니다"
+msgstr "이 파일은 도메인 지시자를 포함하고 있지 않을 수도 있습니다"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "중복된 메시지 정의"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "여기는 첫번째 정의의 위치입니다"
 
@@ -3219,7 +3047,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "다닐로 세이건(Danilo Segan)"
+msgstr "다닐로 세이건 (Danilo Segan)"
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
@@ -3233,12 +3061,12 @@
 "standard output.\n"
 msgstr "입력 텍스트는 표준 입력에서 읽습니다. 변환한 텍스트는 표준 출력으로 출력합니다.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "입력이 \"%s\" 인코딩에서 올바르지 않습니다"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" 인코딩에서 \"%s\" 인코딩으로 변환하는 동안 오류 발생"
@@ -3262,21 +3090,11 @@
 "URL의 내용을 가져와서 출력합니다. <URL>에 접근할 수 없는 경우에는, 로칼에서 접근할 수 있는\n"
 "<파일>이 대신 사용됩니다.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "\"%s\" 파일을 읽는 동안 오류 발생"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "표준 출력에 쓰는 동안 오류 발생"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "\"%s\" 파일을 읽은 후에 오류 발생"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3356,19 +3174,19 @@
 msgid "compilation of C# class failed"
 msgstr "C# 클래스 컴파일에 실패했습니다"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수"
 "를 세팅하십시오"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를 세팅하십시오"
@@ -3376,20 +3194,15 @@
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "쓰려고 \"%s\"을(를) 여는 동안 오류 발생"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "잘못된 가변바이트 문자열"
+msgstr "쓰기 위해 \"%s\"을(를) 여는 동안 오류 발생"
 
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "국제화된 메시지에는 '\\%c' 이스케이프 순서열이 들어 있으면 안 됩니다"
+"internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "국제화된 메시지는 `\\%c' 이스케이프 순서열을 포함할 수 없습니다"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3402,7 +3215,7 @@
 "발생할 수 있습니다. 순수한 ASCII msgctxt만을 사용하도록 하십시오.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3485,7 +3298,7 @@
 "메시지 목록에 복수형 번역이 들어 있지만, \n"
 "Tcl 메시지 목록 형식은 복수형을 지원하지 않습니다\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 경고: 완결되지 않은 문자열"
@@ -3495,22 +3308,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 경고: 완결되지 않은 정규식"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "경고: 잘못된 유니코드 문자"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: 경고: 완결되지 않은 문자 상수"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "소스 인코딩을 --from-code 옵션으로 지정하십시오."
 
@@ -3550,7 +3358,7 @@
 "%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 실패"
@@ -3564,7 +3372,7 @@
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 경고: 잘못된 유니코드 문자"
@@ -3584,24 +3392,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 경고: ')가 와야 하는 곳에 '}'가 발견되었습니다"
 
-# XML 엘리먼트를 말한다
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "'%s' 엘리먼트에서 뽑아낸 문자열에 대한 컨텍스트가 없습니다"
-
-# XML 엘리먼트를 말한다
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "글레이드 파일에서 최상위 엘리먼트로 <%s>은(는) 허용하지 않습니다"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3615,70 +3411,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: 경고: U+%04X 서로게이트 문자가 단독으로 있습니다"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 잘못된 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 길고 불완전한 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 잘못된 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: 경고: 정규식 문자열이 너무 빨리 끝났습니다"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: 경고: %s은(는) 허용하지 않습니다"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: 경고: 완결되지 XML 마크업"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3715,7 +3447,7 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\U\")이 잘못되었습니다"
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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"
@@ -3723,7 +3455,7 @@
 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3734,7 +3466,7 @@
 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3745,7 +3477,7 @@
 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3756,7 +3488,7 @@
 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3767,7 +3499,7 @@
 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3778,7 +3510,7 @@
 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3808,63 +3540,53 @@
 "%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다; 대신에 "
 "eval_gettext를 사용하십시오"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: 경고: 정규식 문자열이 너무 빨리 끝났습니다"
-
-#: src/xgettext.c:545
-#, 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:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-exeisting은 출력이 표준출력에 쓰여질 때 사용될 수 없습니다"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "경고: '%s' 파일의 확장자 '%s'을(를) 알 수 없습니다; C 형식으로 간주함"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "경고: `%s' 파일의 확장자 `%s'을(를) 알 수 없습니다; C 형식으로 간주함"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니다.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=<이름>    출력에(messages.po 대신) <이름>.po를 씁니"
+"  -d, --default-domain=<이름>    출력에 (messages.po 대신) <이름>.po를 씁니"
 "다\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=<파일>            지정된 파일에 출력합니다\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=<디렉터리>    출력 파일을 <디렉터리> 디렉터리에 놓습니다\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "입력 파일의 언어 선택:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3873,8 +3595,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=<이름>          지정한 언어로 인식하도록 합니다\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3882,15 +3603,14 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP, \n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3898,7 +3618,7 @@
 msgstr ""
 "기본적으로 입력 파일의 확장자에 따라 어떤 언어를 사용할 지 짐작합니다.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3907,24 +3627,24 @@
 "      --from-code=<이름>      입력 파일의 인코딩\n"
 "                                (Python, Tcl, Glade 제외)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "기본값으로 입력 파일은 ASCII로 인코딩되어 있다고 가정합니다.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing            현존하는 파일과 메시지를 합칩니다\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3938,49 +3658,40 @@
 "  -c, --add-comments                 키워드 줄 앞에 모든 주석 부분을 출력\n"
 "                                     파일에 씁니다\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language 관련 옵션:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              모든 문자열을 뽑아 냅니다\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (다음 언어만 지원: C, C++, ObjectiveC, "
 "Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (다음 언어만 지원: C, C++, ObjectiveC, "
-"Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -k<단어>, --keyword=<단어>     <단어>를 추가 키워드로 찾습니다\n"
+"  -k, --keyword                  기본 키워드를 사용하지 않습니다\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3990,72 +3701,70 @@
 "      --flag=WORD:ARG:FLAG    키워드 WORD의 인자 번호 ARG안에 있는 문자열의\n"
 "                              추가 플래그\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (다음 언어만 지원: C, C++, ObjectiveC, "
 "Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs                입력에서 ANSI C 삼중자(trigraph)를 인식합니"
 "다\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++만 지원)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                    더 자세한 형식문자열 인식 결과\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=<문자열> 출력할 저작권 소유자를 지정합니다\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4063,25 +3772,25 @@
 "      --foreign-user             외부 사용자를 위해 FSF 저작권 표시를 뺍니"
 "다\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=<패키지> 출력에서 패키지 이름을 지정합니다\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=<버전>   출력에서 패키지 버전을 지정합니다\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=전자메일@주소   msgid 버그를 보고할 주소를 지정합"
+"      --msgid-bugs-address=이메일@주소     msgid 버그를 보고할 주소를 지정합"
 "니다\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4092,7 +3801,7 @@
 "\"\"을 \n"
 "                                            접두어로 사용합니다\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4103,38 +3812,38 @@
 "\"\"을 \n"
 "                                            접미어로 사용합니다\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, 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:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "표준 입력"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s에 ASCII가 아닌 문자열이 있습니다."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s에 또는 그 앞에 ASCII가 아닌 문자열이 있습니다."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s에 시작하는 ASCII가 아닌 문자열이 있습니다."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 경고: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4143,7 +3852,7 @@
 "형식 문자열에 위치 지정을 사용했지만, %s은(는) 잘못된 %s 형식 문자열입니다. "
 "이유: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4151,7 +3860,7 @@
 msgstr ""
 "선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4164,7 +3873,7 @@
 "이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
 "아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4174,42 +3883,42 @@
 "gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
 "헤더 항목을 리턴합니다.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "단수형과 복수형 사이에 컨텍스트가 다릅니다"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "--msgid-bugs-address 옵션이 지정되지 않았습니다.\n"
-"'Makevars' 파일을 사용할 경우, MSGID_BUGS_ADDRESS\n"
+"`Makevars' 파일을 사용할 경우, MSGID_BUGS_ADDRESS\n"
 "변수를 지정하십시오; 그렇지 않으면 --msgid-bugs-address\n"
 "명령행 옵션을 사용하십시오.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "'%s' 언어를 알 수 없습니다"
+msgid "language `%s' unknown"
+msgstr "\"%s\" 파일에 NUL로 끝나지 않는 sysdep 세그먼트가 있습니다"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
diff -Nru gettext-0.19.3/gettext-tools/po/LINGUAS gettext-0.18.1.1/gettext-tools/po/LINGUAS
--- gettext-0.19.3/gettext-tools/po/LINGUAS	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/LINGUAS	2010-06-06 12:49:57.000000000 +0000
@@ -1,2 +1,2 @@
 # Set of available languages.
-be bg ca cs da de el en@quot en@boldquot es et eu fi fr gl id it ja ko nb nl nn pa pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_TW
+be bg ca cs da de el en@quot en@boldquot es et eu fi fr gl id it ja ko nb nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_TW
diff -Nru gettext-0.19.3/gettext-tools/po/Makefile.in.in gettext-0.18.1.1/gettext-tools/po/Makefile.in.in
--- gettext-0.19.3/gettext-tools/po/Makefile.in.in	2014-09-29 01:43:44.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/Makefile.in.in	2010-06-06 12:49:57.000000000 +0000
@@ -8,14 +8,13 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.19
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
-SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -77,16 +76,6 @@
 
 CATALOGS = @CATALOGS@
 
-POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
-POFILESDEPS_yes = $(POFILESDEPS_)
-POFILESDEPS_no =
-POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
-DISTFILESDEPS_ = update-po
-DISTFILESDEPS_yes = $(DISTFILESDEPS_)
-DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
-
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -107,14 +96,14 @@
 	mv t-$@ $@
 
 
-all: all-@USE_NLS@
+all: check-macro-version all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-CHECK_MACRO_VERSION = \
-	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
 	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
 	       exit 1; \
 	     }
@@ -134,7 +123,6 @@
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -149,29 +137,11 @@
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-# The determination of whether the package xyz is a GNU one is based on the
-# heuristic whether some file in the top level directory mentions "GNU xyz".
-# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	package_gnu="$(PACKAGE_GNU)"; \
-	test -n "$$package_gnu" || { \
-	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
-			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
-			       /dev/null '{}' ';' 2>/dev/null; \
-	       else \
-		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-	       fi; \
-	     } | grep -v 'libtool:' >/dev/null; then \
-	     package_gnu=yes; \
-	   else \
-	     package_gnu=no; \
-	   fi; \
-	}; \
-	if test "$$package_gnu" = "yes"; then \
-	  package_prefix='GNU '; \
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
 	else \
-	  package_prefix=''; \
+	  package_gnu=''; \
 	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -191,7 +161,7 @@
 	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_prefix}@PACKAGE@" \
+	      --package-name="$${package_gnu}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
 	    ;; \
@@ -219,10 +189,9 @@
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(POFILESDEPS)
+$(POFILES): $(srcdir)/$(DOMAIN).pot
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
@@ -383,7 +352,7 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)
diff -Nru gettext-0.19.3/gettext-tools/po/Makevars gettext-0.18.1.1/gettext-tools/po/Makevars
--- gettext-0.19.3/gettext-tools/po/Makevars	2014-10-08 07:17:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/Makevars	2010-06-06 12:49:57.000000000 +0000
@@ -27,13 +27,6 @@
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU =
-
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -65,21 +58,3 @@
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = yes
diff -Nru gettext-0.19.3/gettext-tools/po/Makevars.template gettext-0.18.1.1/gettext-tools/po/Makevars.template
--- gettext-0.19.3/gettext-tools/po/Makevars.template	2014-10-08 07:17:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/Makevars.template	2010-06-06 12:49:57.000000000 +0000
@@ -20,13 +20,6 @@
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU =
-
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -46,33 +39,3 @@
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = yes
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/nb.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/nb.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/nb.po gettext-0.18.1.1/gettext-tools/po/nb.po
--- gettext-0.19.3/gettext-tools/po/nb.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/nb.po	2010-06-06 12:49:58.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -27,25 +27,26 @@
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke opprette utfilen �%s�"
@@ -54,38 +55,37 @@
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "feil under �pning av �%s� for lesing"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "feil under �pning av �%s� for skriving"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "feil under lesing av �%s�"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "feil under skriving av filen �%s�"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "feil under lesing av �%s�"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -102,98 +102,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: flagget �%s� er flertydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flagget �--%s� tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget �%c%s� tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flagget �%s� krever et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukjent flagg �--%s�\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukjent flagg �%c%s�\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flagg krever et argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flagg �-W %s� er flertydig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg �-W %s� tillater ikke et argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flagget �%s� krever et argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av filen �%s�"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -203,96 +203,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "kan ikke opprette utfilen �%s�"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke opprette utfilen �%s�"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke opprette utfilen �%s�"
@@ -308,20 +270,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "feil under �pning av �%s� for lesing"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -330,19 +285,17 @@
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
@@ -352,26 +305,24 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -457,16 +408,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -648,9 +589,7 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
@@ -690,32 +629,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -757,11 +670,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -770,58 +683,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v �%s --help� for mer informasjon.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -829,34 +742,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -865,248 +778,237 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "trenger n�yaktig to innfiler"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1115,87 +1017,87 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1214,31 +1116,31 @@
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1247,9 +1149,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "  -V, --version                  skrive ut programversjon og avslutte\n"
 "  -w, --width=ANTALL             sett sidebredden i utdata\n"
@@ -1268,92 +1170,92 @@
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ingen innfiler angitt"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "trenger n�yaktig to innfiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1391,19 +1293,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1428,17 +1330,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldingen er brukt, men ikke definert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen ligner"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
@@ -1448,19 +1350,19 @@
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst to filer m� angis"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1468,7 +1370,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1489,74 +1391,74 @@
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "trenger n�yaktig to innfiler"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1565,7 +1467,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1597,7 +1499,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1607,45 +1509,50 @@
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "mangler argumenter"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "minst to filer m� angis"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1653,226 +1560,192 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s og %s utelukker hverandre"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversatt melding"
 msgstr[1] "%d oversatte meldinger"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d antatt oversettelse"
 msgstr[1] ", %d antatte oversettelser"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversatt melding"
 msgstr[1] ", %d uoversatte meldinger"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1881,78 +1754,48 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1960,33 +1803,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1994,135 +1837,115 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, 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:1050
+#: src/msgfmt.c:903
 #, 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:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet �%s� passer ikke som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "n�kkelord �domain %s� ignorert"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "tom �msgstr�-linje ignorert"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "antatt �msgstr�-linje ignorert"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av �%s�"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2162,30 +1985,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2193,24 +2016,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2218,54 +2041,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2277,7 +2100,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2295,13 +2118,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2311,8 +2134,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: advarsel: "
@@ -2409,106 +2232,113 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "�msgid�- og �msgstr�-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:652
+#: src/msgl-check.c:643
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "�msgid�- og �msgstr�-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "filhodefelt �%s� mangler i filhode"
+
+#: src/msgl-check.c:784
+#, fuzzy, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "filhodefelt �%s� skulle ha startet ved begynnelsen av linjen"
+
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "filhodefelt �%s� mangler i filhode"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2524,8 +2354,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2541,8 +2371,8 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2551,16 +2381,16 @@
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2585,51 +2415,51 @@
 "resultater.  Resultatet blir skrevet til standard ut, med mindre en utfil\n"
 "er spesifisert.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2641,36 +2471,36 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2679,7 +2509,7 @@
 "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
 "foreldete %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2777,7 +2607,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2790,12 +2620,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2816,7 +2646,7 @@
 "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2825,7 +2655,7 @@
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv(),\n"
 "og iconv() st�tter ikke \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2833,15 +2663,15 @@
 "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
 "vil rette dette problemet.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsetter likevel, forvent parsefeil."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Fortsetter likevel."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2850,7 +2680,7 @@
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2863,27 +2693,27 @@
 msgid "inconsistent use of #~"
 msgstr "inkonsistent bruk av #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "mangler �msgstr[]�-seksjon"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "mangler �msgid_plural�-seksjon"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "mangler �msgstr�-seksjon"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "f�rste flertallsform har en ikke-null indeks"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "flertallsform har feil indeks"
@@ -2893,7 +2723,7 @@
 msgid "too many errors, aborting"
 msgstr "for mange feil, avbryter"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"
@@ -2937,16 +2767,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplisert definisjon av melding"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "... dette er lokasjonen til den f�rste definisjonen"
@@ -3026,12 +2856,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under �pning av �%s� for lesing"
@@ -3053,21 +2883,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "feil under lesing av �%s�"
-
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av filen �%s�"
 
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "feil under lesing av �%s�"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3138,17 +2958,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3158,19 +2978,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under �pning av �%s� for skriving"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "ulovlig multibytesekvens"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldinger b�r ikke inneholde escape-sekvensen �\\%c�"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3179,7 +2994,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3238,7 +3053,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
@@ -3248,22 +3063,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3295,7 +3105,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3307,7 +3117,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
@@ -3327,22 +3137,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3356,60 +3156,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3445,13 +3191,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3459,7 +3205,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3467,7 +3213,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3475,7 +3221,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3483,7 +3229,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3491,7 +3237,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3518,61 +3264,51 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten � finne n�kkelord"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3581,45 +3317,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3629,37 +3364,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3667,85 +3398,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3753,7 +3483,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3761,52 +3491,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: advarsel: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3815,44 +3545,44 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "spr�ket �%s� er ukjent"
 
 #: libgettextpo/gettext-po.c:84
@@ -3863,10 +3593,6 @@
 #~ msgstr "%s: ulovlig flagg -- %c\n"
 
 #, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "filhodefelt �%s� skulle ha startet ved begynnelsen av linjen"
-
-#, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "feltet �%s� har fremdeles sin forvalgte verdi"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/nl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/nl.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/nl.po gettext-0.18.1.1/gettext-tools/po/nl.po
--- gettext-0.19.3/gettext-tools/po/nl.po	2014-10-16 06:04:22.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/nl.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,25 +1,24 @@
 # Dutch translations for gettext-tools.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2009 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.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools-0.19-rc1\n"
+"Project-Id-Version: gettext-tools-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-06-06 11:36+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2009-03-10 12:48+0100\n"
+"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Launchpad-Export-Date: 2008-06-30 19:52+0000\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -32,25 +31,26 @@
 msgstr "argument %s van %s is niet eenduidig"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Geldige argumenten zijn:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan geen tijdelijke map vinden; zet $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan met sjabloon '%s' geen tijdelijke map aanmaken"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan tijdelijk bestand '%s' niet verwijderen"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan tijdelijke map '%s' niet verwijderen"
@@ -59,38 +59,37 @@
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr "behouden van toegangsrechten van %s"
-
-#: gnulib-lib/copy-file.c:189
-#, c-format
-msgid "error while opening %s for reading"
-msgstr "fout bij openen van %s voor lezen"
+msgid "error while opening \"%s\" for reading"
+msgstr "fout bij openen van '%s' voor lezen"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "kan reservekopiebestand %s niet openen voor schrijven"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "kan reservebestand '%s' niet openen voor schrijven"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "fout bij lezen van %s"
+msgid "error reading \"%s\""
+msgstr "fout bij lezen van '%s'"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "fout bij schrijven van %s"
+msgid "error writing \"%s\""
+msgstr "fout bij schrijven van '%s'"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "fout na lezen van %s"
+msgid "error after reading \"%s\""
+msgstr "fout na lezen van '%s'"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -107,98 +106,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "virtuele C#-machine is niet gevonden; installeer 'pnet'"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "subproces %s is mislukt"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: optie '--%s' vereist een argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ongeldige optie -- '%c'\n"
+msgstr "%s: ongeldige optie -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: optie vereist een argument -- '%c'\n"
+msgstr "%s: optie vereist een argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: optie '-W %s' vereist een argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "aanmaken van '%s' is mislukt"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fout bij schrijven van bestand '%s'"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
@@ -208,99 +207,61 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Virtuele Java-machine is niet gevonden; installeer 'gcj' of zet $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "In-/uitvoerfout in subproces %s"
+msgstr "I/O-fout in subproces %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "lezen uit subproces %s is mislukt"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "communicatie met subproces %s is mislukt"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "subproces %s is geëindigd met afsluitwaarde %d"
+msgid "cannot create pipe"
+msgstr "kan geen pijp aanmaken"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "‘"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "’"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan geen pijp aanmaken"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle() is mislukt"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
+msgstr "kan uitvoerbestand '%s' niet aanmaken"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -313,88 +274,77 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "subproces %s ontving het fatale signaal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "fout bij openen van '%s' voor lezen"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "'%s' is geen geldige opmaakreeks voor %s, anders dan '%s'.  Reden: %s"
+msgstr ""
+"'%s' is geen geldige opmaakreeks voor %s, anders dan 'msgid'.  Reden: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in '%s'"
+msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in 'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "opmaakcode voor argument %u komt niet voor in '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "opmaakcodes in '%s' en '%s' voor argument %u zijn niet hetzelfde"
+msgstr "opmaakcodes in 'msgid' en '%s' voor argument %u zijn niet hetzelfde"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Directief nummer %u begint met | maar eindigt niet op |."
+msgstr "Directiefnummer %u begint met | maar eindigt niet op |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"In directief nummer %u is de tekenreeks na '<' niet de naam van een "
-"opmaakcodemacro.  Geldige macronamen staan opgesomd in ISO C 99, paragraaf "
-"7.8.1."
+"In directiefnummer %u is de tekenreeks na '<' niet de naam van macro met een "
+"opmaakcode. Juiste macronamen staan opgesomd in ISO C 99, paragraaf 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
-"In directief nummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
+"In directiefnummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "De tekenreeks verwijst naar argumentnummer %u maar negeert argumentnummer %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr "het aantal opmaakcodes in 'msgid' en '%s' is niet gelijk"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "In directief nummer %u wordt '{' niet gevolgd door een argumentnummer."
+msgstr "In directiefnummer %u wordt '{' niet gevolgd door een argumentnummer."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "In directief nummer %u wordt ',' niet gevolgd door een nummer."
+msgstr "In directiefnummer %u wordt ',' niet gevolgd door een nummer."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
@@ -408,13 +358,14 @@
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Het directief nummer %u eindigt op ongeldig teken '%c' in plaats van '}'."
+"Het directiefnummer %u eindigt op een ongeldig karakter '%c' in plaats van "
+"'}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
-"Het directief nummer %u eindigt op een ongeldig teken in plaats van '}'."
+"Het directiefnummer %u eindigt op een ongeldig karakter in plaats van '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
@@ -427,19 +378,18 @@
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "De tekenreeks bevat een ongepaarde '}' na directief nummer %u."
+msgstr "De tekenreeks bevat een ongepaarde '}' na directiefnummer %u."
 
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "In directief nummer %u is de combinatie van vlaggen ongeldig."
+msgstr "In directiefnummer %u is de combinatie van vlaggen ongeldig."
 
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
-"In directief nummer %u is geen nauwkeurigheidsaanduiding voor '%c' "
-"toegestaan."
+"In directiefnummer %u is geen nauwkeurigheidsaanduiding voor '%c' toegestaan."
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -447,7 +397,7 @@
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
-"In directief nummer %u moet het argumentnummer voor de nauwkeurigheid gelijk "
+"In directiefnummer %u moet het argumentnummer voor de nauwkeurigheid gelijk "
 "zijn aan %u."
 
 #: src/format-gcc-internal.c:398
@@ -456,39 +406,29 @@
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"In directief nummer %u is geen nauwkeurigheidsspecificatie toegestaan voor "
+"In directiefnummer %u is geen nauwkeurigheidsspecificatie toegestaan voor "
 "'%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "In directief nummer %u is de nauwkeurigheidsspecificatie ongeldig."
+msgstr "In directiefnummer %u is de nauwkeurigheidsspecificatie ongeldig."
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
-"In directief nummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
+"In directiefnummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'%s' gebruikt %%m, maar '%s' niet"
+msgstr "'msgid' gebruikt %%m, maar '%s' niet"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'%s' gebruikt geen %%m, maar '%s' gebruikt %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' gebruikt %%C, maar '%s' niet"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' gebruikt geen %%C, maar '%s' gebruikt %%C"
+msgstr "'msgid' gebruikt geen %%m, maar '%s' gebruikt %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -506,7 +446,7 @@
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "In directief nummer %u is argumentnummer 0 geen positief geheel getal."
+msgstr "In directiefnummer %u is argumentnummer 0 geen positief geheel getal."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -514,7 +454,7 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"In directief nummer %u is de breedte's argumentnummer 0 geen positief geheel "
+"In directiefnummer %u is de breedte's argumentnummer 0 geen positief geheel "
 "getal."
 
 #: src/format-invalid.h:32
@@ -523,7 +463,7 @@
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
-"In directief nummer %u is de nauwkeurigheid's argumentnummer 0 geen positief "
+"In directiefnummer %u is de nauwkeurigheid's argumentnummer 0 geen positief "
 "geheel getal."
 
 #: src/format-invalid.h:36
@@ -532,7 +472,7 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"In directief nummer %u is teken '%c' geen geldige conversiespecificatie."
+"In directiefnummer %u is karakter '%c' geen geldige conversiespecificatie."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -540,7 +480,7 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"Het teken waarmee directief nummer %u afsluit is geen geldige "
+"Het karakter waarmee directiefnummer %u afsluit is geen geldige "
 "conversiespecificatie."
 
 #: src/format-invalid.h:40
@@ -555,19 +495,19 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"In directief nummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
+"In directiefnummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "In directief nummer %u wordt \"%s\" niet gevolgd door een komma."
+msgstr "In directiefnummer %u wordt \"%s\" niet gevolgd door een komma."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
-"In directief nummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
+"In directiefnummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
 
 #: src/format-java.c:323
 #, c-format
@@ -575,13 +515,13 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"In directief nummer %u wordt het argumentnummer niet gevolgd door een komma "
+"In directiefnummer %u wordt het argumentnummer niet gevolgd door een komma "
 "en één van \"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "In directief nummer %u bevat een keuze geen getal."
+msgstr "In directiefnummer %u bevat een keuze geen getal."
 
 #: src/format-java.c:583
 #, c-format
@@ -589,14 +529,14 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"In directief nummer %u bevat een keuze een getal dat niet gevolgd wordt door "
+"In directiefnummer %u bevat een keuze een getal dat niet gevolgd wordt door "
 "'<', '#' of '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "opmaakcode voor argument {%u}, als in '%s', komt niet voor in '%s'"
+msgstr "opmaakcode voor argument {%u}, als in '%s', komt niet voor in 'msgid'"
 
 #: src/format-java.c:756
 #, c-format
@@ -604,10 +544,10 @@
 msgstr "opmaakcode voor argument {%u} komt niet voor in '%s'"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "opmaakcodes in '%s' en '%s' voor argument {%u} zijn niet hetzelfde"
+msgstr "opmaakcodes in 'msgid' en '%s' voor argument {%u} zijn niet hetzelfde"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -616,8 +556,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"In directief nummer %u is parameter %u van type '%s' maar wordt een "
-"parameter van type '%s' verwacht."
+"In directiefnummer %u is parameter %u van type '%s' maar wordt een parameter "
+"van type '%s' verwacht."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -628,21 +568,21 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"In directief nummer %u zijn te veel parameters opgegeven; maximaal %u "
+"In directiefnummer %u zijn teveel parameters opgegeven; maximaal %u "
 "parameter wordt verwacht."
 msgstr[1] ""
-"In directief nummer %u zijn te veel parameters opgegeven; maximaal %u "
+"In directiefnummer %u zijn teveel parameters opgegeven; maximaal %u "
 "parameters worden verwacht."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "In directief nummer %u wordt '%c' niet gevolgd door een cijfer."
+msgstr "In directiefnummer %u wordt '%c' niet gevolgd door een cijfer."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "In directief nummer %u is argument %d negatief."
+msgstr "In directiefnummer %u is argument %d negatief."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
@@ -658,7 +598,7 @@
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "In directief nummer %u zijn zowel de @- en de :-aanpastekens gegeven."
+msgstr "In directiefnummer %u zijn zowel de @- en de :-aanpastekens gegeven."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -666,13 +606,13 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"In directief nummer %u is '~:[' niet gevolgd door twee clausules, gescheiden "
+"In directiefnummer %u is '~:[' niet gevolgd door twee clausules, gescheiden "
 "door een '~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "In directief nummer %u is '~;' gebruikt op een onjuiste positie."
+msgstr "In directiefnummer %u is '~;' gebruikt op een onjuiste positie."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
@@ -680,14 +620,14 @@
 "De tekenreeks verwijst naar enig argument op niet-compatibele manieren."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "de opmaakcodes in '%s' en '%s' zijn niet gelijkwaardig"
+msgstr "de opmaakcodes in 'msgid' en '%s' zijn niet gelijkwaardig"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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'"
+msgstr "de opmaakcodes in '%s' zijn geen subset van die in 'msgid'"
 
 #: src/format-perl.c:433
 #, c-format
@@ -695,12 +635,10 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"In directief nummer %u is de groottespecificatie niet-compatibel met de "
+"In directiefnummer %u is de groottespecificatie niet-compatibel met de "
 "conversiespecificatie '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s' komt niet voor in '%s'"
@@ -721,99 +659,69 @@
 "wijze."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, 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"
+"de opmaakcodes in 'msgid' verwachten een afbeelding, die in '%s' verwachten "
+"een tupel"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, 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"
+"opmaakcodes in 'msgid' verwachten een tuple, terwijl die in '%s' een "
+"afbeelding verwachten"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, 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'"
+msgstr "opmaakcode voor argument '%s', als in '%s', komt niet voor in 'msgid'"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "de opmaakcodes in '%s' en '%s' voor argument '%s' zijn niet hetzelfde"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "In directief nummer %u is er een onafgemaakte opmaakcode."
+"de opmaakcodes in 'msgid' en '%s' voor argument '%s' zijn niet hetzelfde"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"'%s' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een 'L'-"
-"vlag of een argumentnummer met dubbele cijfers"
+"'msgid' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een "
+"'L'-vlag of een argumentnummer met dubbele cijfers."
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
-"De tekenreeks verwijst naar een shell-variabele met een niet-ASCII-naam."
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"De tekenreeks verwijst naar een shell-variabele met een een gecompliceerde "
-"accolade-expansie.  Om veiligheidsredenen wordt deze syntax hier niet "
-"ondersteund."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"De tekenreeks verwijst naar een shell-variabele waarvan de waarde binnen "
-"shell-functies kan wijzigen."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "De tekenreeks verwijst naar een shell-variabele met een lege naam."
+msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "In directief nummer %u is teken '%c' geen cijfer tussen 1 en 9."
+msgstr ""
 
 #: src/format-ycp.c:91
 #, c-format
@@ -821,13 +729,12 @@
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
-"Het teken waarmee directief nummer %u afsluit is geen cijfer tussen 1 en 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -841,58 +748,58 @@
 "zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "De hostnaam van de machine tonen.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Opmaak van de uitvoer:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 korte hostnaam\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -900,34 +807,34 @@
 "                                name, and aliases\n"
 msgstr "  -f, --fqdn, --long          lange hostnaam: FQDN plus aliassen\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            IP-adressen behorend bij de hostnaam\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version       programmaversie tonen en stoppen\n"
@@ -936,281 +843,239 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 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/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "kan hostnaam niet verkrijgen"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "hoogstens één invoerbestand is toegestaan"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s en %s sluiten elkaar uit"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"Filtert de berichten van een vertalingenbestand aan de hand van hun\n"
-"eigenschappen, en manipuleert die eigenschappen.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locatie van invoerbestand:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INVOERBESTAND               in te lezen PO-bestand\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=MAP         deze map toevoegen aan lijst van te doorzoeken "
-"mappen\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locatie van uitvoerbestand:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"De resultaten worden naar standaarduitvoer geschreven als er geen "
-"uitvoerbestand\n"
-"gegeven is of als deze '-' is.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Berichtenselectie:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            vertaalde berichten behouden, onvertaalde "
-"weglaten\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          onvertaalde berichten behouden, vertaalde "
-"weglaten\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
-"      --no-fuzzy              de met 'fuzzy' gemarkeerde berichten weglaten\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
-"      --only-fuzzy            alleen met 'fuzzy' gemarkeerde berichten "
-"behouden\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           verouderder berichten (#~) weglaten\n"
+msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
-"      --only-obsolete         alleen verouderde berichten (#~) behouden\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Manipulatie van eigenschappen:\n"
+msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             alle berichten met 'fuzzy' markeren\n"
+msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
-"      --clear-fuzzy           bij alle berichten eventuele 'fuzzy' weghalen\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
-"      --set-obsolete          alle berichten als verouderd (#~) markeren\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        bij alle berichten '#~' weghalen\n"
-
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
 msgstr ""
-"      --previous              bij het markeren met 'fuzzy', de msgid die "
-"echt\n"
-"                                bij de msgstr hoorde behouden\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
-msgstr "      --clear-previous        eventuele originele msgids weglaten\n"
-
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
-"      --empty                 bij weglaten van 'fuzzy' ook de msgstr "
-"leegmaken\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=BESTAND.po  alleen items manipuleren die in dit bestand "
-"staan\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=BESTAND.po  alleen items manipuleren die in dit bestand\n"
-"                                  niet voorkomen\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
-"      --fuzzy                 hetzelfde als '--only-fuzzy --clear-fuzzy'\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              hetzelfde als '--only-obsolete --clear-"
-"obsolete'\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Syntax van invoerbestand:\n"
+msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Uitvoerdetails:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1219,118 +1084,118 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1339,97 +1204,97 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INVOERBESTAND...            invoerbestanden\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "geen invoerbestanden gegeven"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "precies twee invoerbestanden zijn vereist"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Gebruik:  %s [OPTIE...] bestaande.po referentie.pot\n"
@@ -1462,19 +1327,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  referentie.pot              verwijzingen naar de programmatekst\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1499,17 +1364,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "dit bericht moet door een vertaler gecontroleerd worden"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...maar de definitie is gelijksoortig"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
@@ -1519,19 +1384,19 @@
 msgid "warning: this message is not used"
 msgstr "waarschuwing: dit bericht wordt niet gebruikt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "er moeten minstens twee bestanden opgegeven worden"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1539,79 +1404,79 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "geen invoerbestand gegeven"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "precies één invoerbestand is vereist"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Gebruik:  %s [OPTIE...] INVOERBESTAND\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1620,7 +1485,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1652,7 +1517,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1662,47 +1527,52 @@
 msgid "write to stdout failed"
 msgstr "schrijven naar standaarduitvoer is mislukt"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "schrijven naar subproces %s is mislukt"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "ontbrekende filternaam"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "er moet minstens één sed-script gegeven worden"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...] FILTER [FILTEROPTIE...]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Past een filter toe op alle vertalingen in een PO-bestand.\n"
+msgstr "Een filter toepassen op alle vertalingen in een PO-bestand.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"Het FILTER kan elk programma zijn dat een bericht van standaardinvoer leest\n"
+"Het FILTER kan elk programma zijn dat een bericht leest van standaardinvoer\n"
 "en een gewijzigd bericht naar standaarduitvoer schrijft.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Nuttige FILTEROPTIEs als het FILTER 'sed' is:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1710,125 +1580,104 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "het argument van %s dient één enkel interpunctieteken te zijn"
+msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "ongeldige endian-waarde: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s en %s sluiten elkaar uit in %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s is alleen geldig samen met %s of %s"
+msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s is alleen geldig samen met %s, %s of %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d vertaald bericht"
 msgstr[1] "%d vertaalde berichten"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d vage gelijkenis"
 msgstr[1] ", %d vage gelijkenissen"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d onvertaald bericht"
 msgstr[1] ", %d onvertaalde berichten"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Genereert een binaire berichtencatalogus uit een vertalingenbestand.\n"
+msgstr "Uit een vertalingenbestand een binaire berichtencatalogus genereren.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1837,102 +1686,88 @@
 "Een verplicht of optioneel argument bij een lange optie\n"
 "geldt ook voor de korte vorm.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  bestandsnaam.po...          invoerbestanden\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Locatie van uitvoerbestand in Java-modus:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1941,78 +1776,48 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Locatie van uitvoerbestand in C#-modus:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locatie van uitvoerbestand in Tcl-modus:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2020,33 +1825,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2054,117 +1859,97 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "waarschuwing: PO-kopregels ontbreken of zijn ongeldig\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "waarschuwing: tekensetconversie zal niet werken\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "waarschuwing: PO-kopregels zijn gemarkeerd als 'fuzzy'\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "directief 'domain %s' is genegeerd"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "leeg 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "fuzzy 'msgstr'-item is genegeerd"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "vaag 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: waarschuwing: bronbestand bevat fuzzy vertaling"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s bestaat niet"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s bestaat maar kan deze niet lezen"
+msgstr "%s: waarschuwing: bronbestand bevat vage vertaling"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2173,14 +1958,14 @@
 "optie '%c' kan niet gebruikt worden voordat\n"
 "'J' of 'K' of 'T' of 'C' of 'X' gegeven is"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2220,30 +2005,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2251,24 +2036,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Aangemaakt op %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2276,54 +2061,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "fout bij lezen van huidige map"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "subproces %s is mislukt met afsluitwaarde %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2335,7 +2120,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Nederlandse vertalingen voor het pakket %s"
@@ -2353,26 +2138,24 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "invoerbestand '%s' bevat geen kopregel met een tekensetspecificatie"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"domein '%s' in invoerbestand '%s' bevat geen kopregel met een "
-"tekensetspecificatie"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "doeltekenset '%s' is geen overdraagbare codering"
+msgstr "doeltekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "waarschuwing: "
@@ -2472,100 +2255,109 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ongeldige waarde van 'nplurals'"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ongeldige meervoudsexpressie"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "aantal meervouden = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgstr' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgstr' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "meervoudsvormen zijn een uitbreiding van GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
 
-#: src/msgl-check.c:814
-#, 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:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "kopveld '%s' moet aan het begin van de regel beginnen\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2581,8 +2373,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2596,24 +2388,24 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is alleen geldig met %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2637,52 +2429,52 @@
 "Wanneer er geen exacte overeenkomst is, wordt er ook naar vage gelijkenissen\n"
 "gekeken, om een beter resultaat te produceren.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  bestaande.po                bestaand bestand met oude vertalingen\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 "  referentie.pot              verwijzingen naar nieuwe programmatekst\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Locatie van uitvoerbestand in update-modus:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Het resultaat wordt teruggeschreven naar bestaande.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2694,36 +2486,36 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "dit bericht dient meervouden te definiëren"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "dit bericht dient geen meervouden te definiëren"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2732,7 +2524,7 @@
 "%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, "
 "%ld vervanderd, %ld ontbreken, %ld verouderd.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2830,7 +2622,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2843,12 +2635,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2869,7 +2661,7 @@
 "Tekensetnaam '%s' is geen overdraagbare coderingsnaam.\n"
 "Conversie van berichten naar een andere tekenset kan mislukken.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2878,21 +2670,21 @@
 "Tekenset '%s' wordt niet ondersteund -- %s gebruikt iconv(),\n"
 "en iconv() ondersteunt '%s' niet.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Toch doorgegaan -- verwacht ontledingsfouten."
+msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
-msgstr "Toch doorgegaan."
+msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2901,7 +2693,7 @@
 "Tekenset '%s' wordt niet ondersteund -- %s steunt op iconv(),\n"
 "en deze versie is gecompileerd zonder iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2914,27 +2706,27 @@
 msgid "inconsistent use of #~"
 msgstr "inconsistent gebruik van '#~'"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "ontbrekende 'msgstr[]'-sectie"
+msgid "missing `msgstr[]' section"
+msgstr "ontbrekende 'msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "ontbrekende 'msgid_plural'-sectie"
+msgid "missing `msgid_plural' section"
+msgstr "ontbrekende 'msgid_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "ontbrekende 'msgstr'-sectie"
+msgid "missing `msgstr' section"
+msgstr "ontbrekende 'msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "eerste meervoudsvorm heeft een index ongelijk aan nul"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "meervoudsvorm heeft een onjuiste index"
@@ -2944,7 +2736,7 @@
 msgid "too many errors, aborting"
 msgstr "te veel fouten -- gestopt"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ongeldige multibyte-sequentie"
@@ -2988,16 +2780,16 @@
 msgid "context separator <EOT> within string"
 msgstr "tekstscheidingteken <EOT> IN een tekenreeks"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domeindirectieven bevatten"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "dubbele definitie van een bericht"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "dit is de plek van de eerste definitie"
 
@@ -3042,11 +2834,11 @@
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "waarschuwing: syntaxfout -- na een tekenreeks werd ';' verwacht"
+msgstr "waarschuwing: syntaxfout -- na tekenreeks werd ';' verwacht"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "waarschuwing: syntaxfout -- na een tekenreeks werd '=' of ';' verwacht"
+msgstr "waarschuwing: syntaxfout -- na tekenreeks werd '=' of ';' verwacht"
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -3064,7 +2856,7 @@
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Hercodeert Servische tekst van Cyrillisch naar Latijns schrift.\n"
+msgstr ""
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3073,12 +2865,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fout tijdens omzetten van codering '%s' naar '%s'"
@@ -3100,35 +2892,25 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "fout bij lezen van '%s'"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fout bij schrijven naar standaarduitvoer"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "fout na lezen van '%s'"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Ophalen van %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " duurde te lang.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " is mislukt.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3185,17 +2967,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3205,19 +2987,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "fout bij openen van '%s' voor schrijven"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "ongeldige multibyte-sequentie"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "geïnternationaliseerde berichten horen geen '\\%c'-stuurcodes te bevatten"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3226,7 +3003,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3285,7 +3062,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
@@ -3295,22 +3072,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: waarschuwing: onafgesloten reguliere expressie"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "waarschuwing: ongeldig Unicode-teken"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenconstante"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3342,7 +3114,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3354,7 +3126,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: waarschuwing: ongeldig Unicode-teken"
@@ -3374,22 +3146,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: waarschuwing: '}' gevonden waar ')' werd verwacht"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3401,60 +3163,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: waarschuwing: losse U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: waarschuwing: %s is niet toegestaan"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: waarschuwing: onafgesloten XML-opmaak"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3490,13 +3198,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3504,7 +3212,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3512,7 +3220,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3520,7 +3228,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3528,7 +3236,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3536,10 +3244,10 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Onbekende codering '%s'.  Verdergegaan met ASCII."
+msgstr ""
 
 #: src/x-rst.c:108
 #, c-format
@@ -3563,64 +3271,54 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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"
+"'--join-existing' kan niet gebruikt worden wanneer uitvoer naar "
+"standaarduitvoer wordt geschreven"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "Extraheert vertaalbare berichten uit de gegeven invoerbestanden.\n"
+msgstr "Vertaalbare berichten extraheren uit de gegeven invoerbestanden.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3629,45 +3327,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3677,37 +3374,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3715,85 +3408,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3801,7 +3493,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3809,52 +3501,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standaardinvoer"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: waarschuwing: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3863,44 +3555,44 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "taal '%s' is onbekend"
 
 #: libgettextpo/gettext-po.c:84
@@ -3916,5 +3608,14 @@
 #~ msgid "Not yet implemented."
 #~ msgstr "Nog niet geïmplementeerd."
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "kopveld '%s' moet aan het begin van de regel beginnen\n"
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "communicatie met subproces %s is mislukt"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "lezen van subproces %s is mislukt"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "subproces %s is geëindigd met afsluitwaarde %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/nn.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/nn.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/nn.po gettext-0.18.1.1/gettext-tools/po/nn.po
--- gettext-0.19.3/gettext-tools/po/nn.po	2014-10-16 06:04:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/nn.po	2010-06-06 12:49:58.000000000 +0000
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -30,25 +30,26 @@
 msgstr "Fleirtydig argument %s for %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Gyldige argument er:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "Finn inga mellombels mappe. Prøv å velja «$TMPDIR»"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "Klarer ikkje laga mellombels mappe med malen «%s»"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Klarer ikkje fjerna mellombelsfila «%s»"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
@@ -57,38 +58,37 @@
 msgid "write error"
 msgstr "Skrivefeil"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "Feil ved opning av fila «%s» for lesing"
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "Klarer ikkje opna reservekopien «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "Feil ved lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "Feil ved skriving til «%s»"
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "Feil etter lesing av «%s»"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -105,98 +105,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Fann ikkje virtuell maskin for C#. Prøv å installera «pnet»."
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Underprosessen %s var mislukka"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Flagget «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Flagget «--%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Flagget «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Flagget «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: Flagget «--%s» er ukjent\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: Flagget «%c%s» er ukjent\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: Flagget «--%s» er ugyldig\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Flagget treng eit argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Flagget «-W %s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Flagget «-W %s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: Flagget «%s» treng eit argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Klarte ikkje oppretta «%s»"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Feil under skriving av fila «%s»"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -210,96 +210,58 @@
 "Fann ikkje virtuell maskin for Java. Prøv å installera «gij» eller vel "
 "«$JAVA»."
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Inn/ut-feil i underprosessen %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Tomt for minne"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+msgid "cannot create pipe"
+msgstr "Klarer ikkje oppretta røyr"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "'"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "Klarer ikkje oppretta røyr"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "«_open_osfhandle» mislukkast"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikkje opprette utfila \"%s\""
@@ -315,14 +277,7 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "Underprosessen %s fekk det alvorlege signalet %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "Feil ved opning av fila «%s» for lesing"
-
-#: src/format.c:151
+#: src/format.c:148
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
@@ -330,7 +285,7 @@
 "Årsak: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -341,19 +296,17 @@
 "«msgid»"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -364,7 +317,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktivnummeret %u startar, men sluttar ikkje, med |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -374,22 +327,20 @@
 "formatspesifikasjonsmakro. Gyldige makronamn kan ein finne i ISO C 99, "
 "avsnitt 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "I direktivnummer %u er symbolet etter «<» ikkje etterfølgt av «>»."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Strengen viser til argumentnummer %u, men tek ikkje omsyn til argumentnummer "
 "%u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -484,16 +435,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "«msgid» brukar ikkje %%m, men «%s» brukar %%m"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "«msgid» brukar %%m, men «%s» gjer det ikkje"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "«msgid» brukar ikkje %%m, men «%s» brukar %%m"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Strengen sluttar midt i eit direktiv."
@@ -705,9 +646,7 @@
 "Storleiksspesifikasjonen i direktivnummer %u er ikkje gyldig med "
 "omgjeringsspesifikasjonen «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "Ein formatspesifikasjon for argument «%s» finst ikkje i «%s»"
@@ -753,32 +692,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -820,11 +733,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -837,58 +750,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrive av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argument"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Bruk: %s [VAL]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -896,34 +809,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -932,247 +845,236 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1181,118 +1083,118 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1301,97 +1203,97 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, fuzzy, c-format
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1428,19 +1330,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1465,17 +1367,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
@@ -1485,19 +1387,19 @@
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1505,79 +1407,79 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1586,7 +1488,7 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1618,7 +1520,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1628,45 +1530,50 @@
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1674,226 +1581,192 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s og %s utelukker kvarandre"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1902,78 +1775,48 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1981,33 +1824,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2015,129 +1858,109 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2177,30 +2000,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2208,24 +2031,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2233,54 +2056,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2292,7 +2115,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2310,13 +2133,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2326,8 +2149,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2424,104 +2247,114 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
+#: src/msgl-check.c:602
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+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:619
+#: src/msgl-check.c:610
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
+#: src/msgl-check.c:625
 #, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+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:652
+#: src/msgl-check.c:643
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+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:660
+#: src/msgl-check.c:651
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
+#: src/msgl-check.c:666
 #, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "filhovud-feltet «%s» manglar i filhovud"
+
+#: src/msgl-check.c:784
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
+
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
 msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "filhovud-feltet «%s» manglar i filhovud"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2537,8 +2370,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2552,24 +2385,24 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2594,51 +2427,51 @@
 "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
 "spesifisert.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2650,36 +2483,36 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2688,7 +2521,7 @@
 "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
 "utdaterte %d.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2786,7 +2619,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2799,12 +2632,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2823,35 +2656,35 @@
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2862,27 +2695,27 @@
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
@@ -2892,7 +2725,7 @@
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
@@ -2936,16 +2769,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "den første definisjonen finst her"
@@ -3019,12 +2852,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
@@ -3046,21 +2879,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "Feil ved lesing av «%s»"
-
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "Feil etter lesing av «%s»"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3131,17 +2954,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3151,18 +2974,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-po.c:821
-msgid "incomplete multibyte sequence"
-msgstr ""
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3171,7 +2990,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3230,7 +3049,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "advarsel: denne meldinga er ikkje brukt"
@@ -3240,22 +3059,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3287,7 +3101,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3299,7 +3113,7 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3319,22 +3133,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3346,60 +3150,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr ""
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3435,13 +3185,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3449,7 +3199,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3457,7 +3207,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3465,7 +3215,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3473,7 +3223,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3481,7 +3231,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3508,61 +3258,51 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3571,45 +3311,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3619,37 +3358,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3657,85 +3392,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3743,7 +3477,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3751,52 +3485,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3805,44 +3539,44 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr ""
 
 #: libgettextpo/gettext-po.c:84
@@ -3856,10 +3590,6 @@
 #~ msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
 
 #, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
-
-#, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "feltet «%s» har framleis sin forvalgte verdi"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/pa.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/pa.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/pa.po gettext-0.18.1.1/gettext-tools/po/pa.po
--- gettext-0.19.3/gettext-tools/po/pa.po	2014-10-16 06:04:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/pa.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3790 +0,0 @@
-# Punjabi Translation for gettext-tools
-# Copyright (C) 2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
-# A S Alam <aalam@users.sf.net>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: gettext-tools 0.18\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+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"
-"Language: pa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.4\n"
-
-#: gnulib-lib/argmatch.c:133
-#, c-format
-msgid "invalid argument %s for %s"
-msgstr "%2$s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ %1$s"
-
-#: gnulib-lib/argmatch.c:134
-#, c-format
-msgid "ambiguous argument %s for %s"
-msgstr ""
-
-#: gnulib-lib/argmatch.c:153
-msgid "Valid arguments are:"
-msgstr "ਠੀਕ ਆਰਗੂਮੈਂਟ ਹਨ:"
-
-#: gnulib-lib/clean-temp.c:325
-#, c-format
-msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਭੀ ਜਾ ਸਕਦੀ, $TMPDIR ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: gnulib-lib/clean-temp.c:339
-#, c-format
-msgid "cannot create a temporary directory using template \"%s\""
-msgstr "ਟੈਪਲੇਟ \"%s\" ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: gnulib-lib/clean-temp.c:435
-#, c-format
-msgid "cannot remove temporary file %s"
-msgstr "ਆਰਜ਼ੀ ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: gnulib-lib/clean-temp.c:450
-#, c-format
-msgid "cannot remove temporary directory %s"
-msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: gnulib-lib/closeout.c:66
-msgid "write error"
-msgstr "ਲਿਖਣ ਗਲਤੀ"
-
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
-msgstr "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "ਲਿਖਣ ਲਈ ਬੈਕਅੱਪ ਫਾਇਲ \"%s\" ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
-msgstr "\"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
-
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
-#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
-#: src/read-tcl.c:110 src/write-resources.c:77
-#, c-format
-msgid "fdopen() failed"
-msgstr "fdopen() ਫੇਲ੍ਹ ਹੈ"
-
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr "C# ਕੰਪਾਇਲਰ ਨਹੀਂ ਲੱਭਿਆ, pnet ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
-
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
-
-#: gnulib-lib/error.c:191
-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/wait-process.c:282 gnulib-lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ ਫੇਲ੍ਹ ਹੋਇਆ"
-
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: ਚੋਣ '%s' ਗਲਤ ਹੈ\n"
-
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: ਚੋਣ '--%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
-
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: ਚੋਣ '%c%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
-
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: ਚੋਣ '--%s' ਲਈ ਇੱਕ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ\n"
-
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ਅਣਜਾਣ ਚੋਣ '--%s'\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ਅਣਜਾਣ ਚੋਣ '%c%s'\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ਗਲਤ ਚੋਣ -- '%c'\n"
-
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ --'%c'\n"
-
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: ਚੋਣ '-W %s' ਸਧਾਰਨ ਹੈ।\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: ਚੋਣ '-W %s' ਲਈ ਕੋਈ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਚਾਹੀਦਾ\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr ""
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
-#, c-format
-msgid "invalid source_version argument to compile_java_class"
-msgstr ""
-
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
-#, c-format
-msgid "invalid target_version argument to compile_java_class"
-msgstr ""
-
-#: 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:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "ਫਾਇਲ \"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: gnulib-lib/javacomp.c:2338
-#, c-format
-msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr ""
-
-#: gnulib-lib/javaexec.c:417
-#, c-format
-msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr ""
-
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ I/O ਗਲਤੀ"
-
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
-#, c-format
-msgid "memory exhausted"
-msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋਈ"
-
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, fuzzy, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, fuzzy, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#. TRANSLATORS:
-#. Get translations for open and closing quotation marks.
-#. The message catalog should translate "`" to a left
-#. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
-#.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
-#.
-#. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
-#. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
-msgid "`"
-msgstr "`"
-
-#: gnulib-lib/quotearg.c:313
-msgid "'"
-msgstr "'"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: gnulib-lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle ਫੇਲ੍ਹ ਹੈ"
-
-#: gnulib-lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "fd %d ਰੀਸਟੋਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: dup2 ਫੇਲ੍ਹ ਹੈ"
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ"
-
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/format.c:151
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr ""
-
-#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr ""
-
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr ""
-
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
-#: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr ""
-
-#: src/format-boost.c:449
-#, c-format
-msgid "The directive number %u starts with | but does not end with |."
-msgstr ""
-
-#: src/format-c.c:36
-#, c-format
-msgid ""
-"In the directive number %u, the token after '<' is not the name of a format "
-"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr ""
-
-#: src/format-c.c:39
-#, c-format
-msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr ""
-
-#: src/format-c.c:42 src/format-gfc-internal.c:289
-#, c-format
-msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr ""
-
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
-msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr ""
-
-#: src/format-csharp.c:88 src/format-java.c:205
-#, c-format
-msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr ""
-
-#: src/format-csharp.c:109
-#, c-format
-msgid "In the directive number %u, ',' is not followed by a number."
-msgstr ""
-
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid ""
-"The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr ""
-
-#: src/format-csharp.c:139
-#, c-format
-msgid ""
-"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr ""
-
-#: src/format-csharp.c:140
-#, c-format
-msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr ""
-
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid ""
-"The string starts in the middle of a directive: found '}' without matching "
-"'{'."
-msgstr ""
-
-#: src/format-csharp.c:162
-#, c-format
-msgid "The string contains a lone '}' after directive number %u."
-msgstr ""
-
-#: src/format-gcc-internal.c:255
-#, c-format
-msgid "In the directive number %u, the flags combination is invalid."
-msgstr ""
-
-#: src/format-gcc-internal.c:292
-#, c-format
-msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr ""
-
-#: src/format-gcc-internal.c:334
-#, c-format
-msgid ""
-"In the directive number %u, the argument number for the precision must be "
-"equal to %u."
-msgstr ""
-
-#: src/format-gcc-internal.c:398
-#, c-format
-msgid ""
-"In the directive number %u, a precision specification is not allowed before "
-"'%c'."
-msgstr ""
-
-#: src/format-gcc-internal.c:406
-#, c-format
-msgid "In the directive number %u, the precision specification is invalid."
-msgstr ""
-
-#: src/format-gcc-internal.c:463
-#, c-format
-msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr ""
-
-#: src/format-gcc-internal.c:677
-#, c-format
-msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
-
-#: src/format-gcc-internal.c:680
-#, c-format
-msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr ""
-
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
-
-#: src/format-invalid.h:22
-msgid "The string ends in the middle of a directive."
-msgstr ""
-
-#: src/format-invalid.h:25
-msgid ""
-"The string refers to arguments both through absolute argument numbers and "
-"through unnumbered argument specifications."
-msgstr ""
-
-#: src/format-invalid.h:28
-#, c-format
-msgid ""
-"In the directive number %u, the argument number 0 is not a positive integer."
-msgstr ""
-
-#: src/format-invalid.h:30
-#, c-format
-msgid ""
-"In the directive number %u, the width's argument number 0 is not a positive "
-"integer."
-msgstr ""
-
-#: src/format-invalid.h:32
-#, c-format
-msgid ""
-"In the directive number %u, the precision's argument number 0 is not a "
-"positive integer."
-msgstr ""
-
-#: src/format-invalid.h:36
-#, c-format
-msgid ""
-"In the directive number %u, the character '%c' is not a valid conversion "
-"specifier."
-msgstr ""
-
-#: src/format-invalid.h:37
-#, c-format
-msgid ""
-"The character that terminates the directive number %u is not a valid "
-"conversion specifier."
-msgstr ""
-
-#: src/format-invalid.h:40
-#, c-format
-msgid "The string refers to argument number %u in incompatible ways."
-msgstr ""
-
-#: src/format-java.c:240
-#, c-format
-msgid ""
-"In the directive number %u, the substring \"%s\" is not a valid date/time "
-"style."
-msgstr ""
-
-#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
-#, c-format
-msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr ""
-
-#: src/format-java.c:274
-#, c-format
-msgid ""
-"In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr ""
-
-#: src/format-java.c:323
-#, c-format
-msgid ""
-"In the directive number %u, the argument number is not followed by a comma "
-"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr ""
-
-#: src/format-java.c:572
-#, c-format
-msgid "In the directive number %u, a choice contains no number."
-msgstr ""
-
-#: src/format-java.c:583
-#, c-format
-msgid ""
-"In the directive number %u, a choice contains a number that is not followed "
-"by '<', '#' or '%s'."
-msgstr ""
-
-#: src/format-java.c:745
-#, c-format
-msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr ""
-
-#: src/format-java.c:756
-#, c-format
-msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr ""
-
-#: src/format-java.c:776
-#, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr ""
-
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
-#, c-format
-msgid ""
-"In the directive number %u, parameter %u is of type '%s' but a parameter of "
-"type '%s' is expected."
-msgstr ""
-
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
-#, c-format
-msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
-msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
-#, c-format
-msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr ""
-
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
-#, c-format
-msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
-
-#: src/format-lisp.c:2805
-msgid "The string ends in the middle of a ~/.../ directive."
-msgstr ""
-
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
-#, c-format
-msgid "Found '~%c' without matching '~%c'."
-msgstr "'~%c' ਮਿਲਿਆ '~%c' ਮਿਲਣ ਦੇ ਬਿਨਾਂ।"
-
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
-#, c-format
-msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr ""
-
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
-#, c-format
-msgid ""
-"In the directive number %u, '~:[' is not followed by two clauses, separated "
-"by '~;'."
-msgstr ""
-
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
-#, c-format
-msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr ""
-
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
-msgid "The string refers to some argument in incompatible ways."
-msgstr ""
-
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr ""
-
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-
-#: src/format-perl.c:433
-#, c-format
-msgid ""
-"In the directive number %u, the size specifier is incompatible with the "
-"conversion specifier '%c'."
-msgstr ""
-
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
-#, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr ""
-
-#: 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:354
-#, c-format
-msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr ""
-
-#: 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:437
-#, c-format
-msgid ""
-"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr ""
-
-#: src/format-python.c:460 src/format-sh.c:297
-#, c-format
-msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr ""
-
-#: src/format-python.c:494
-#, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr ""
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
-#: src/format-qt.c:152
-#, c-format
-msgid ""
-"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
-"a double-digit argument number"
-msgstr ""
-
-#: src/format-sh.c:79
-msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr ""
-
-#: src/format-sh.c:81
-msgid ""
-"The string refers to a shell variable with complex shell brace syntax. This "
-"syntax is unsupported here due to security reasons."
-msgstr ""
-
-#: src/format-sh.c:83
-msgid ""
-"The string refers to a shell variable whose value may be different inside "
-"shell functions."
-msgstr ""
-
-#: src/format-sh.c:85
-msgid "The string refers to a shell variable with an empty name."
-msgstr ""
-
-#: src/format-ycp.c:90
-#, c-format
-msgid ""
-"In the directive number %u, the character '%c' is not a digit between 1 and "
-"9."
-msgstr ""
-
-#: src/format-ycp.c:91
-#, c-format
-msgid ""
-"The character that terminates the directive number %u is not a digit between "
-"1 and 9."
-msgstr ""
-
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
-#, c-format, no-wrap
-msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"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"
-msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc।\n"
-"License GPLv3+: GNU GPL version 3 ਜਾਂ ਨਵਾਂ <http://gnu.org/licenses/gpl.html>\n"
-"ਇਹ ਮੁਕਤ/ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਹ ਬਦਲਣ ਅਤੇ ਮੁੜ-ਵੰਡਣ ਲਈ ਮੁਕਤ ਹੋ।\n"
-"ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮੁਤਾਬਕ।\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
-#, c-format
-msgid "Written by %s.\n"
-msgstr "%s ਵਲੋਂ ਲਿਖਿਆ।\n"
-
-#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
-#: src/urlget.c:149
-msgid "Bruno Haible"
-msgstr "ਬਰੁਨੋ ਹਏਬਲੇ"
-
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
-#, c-format
-msgid "too many arguments"
-msgstr "ਬਹੁਤ ਸਾਰੇ ਆਰਗੂਮੈਂਟ"
-
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s --help' ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\n"
-
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION]\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION]\n"
-
-#: src/hostname.c:217
-#, c-format
-msgid "Print the machine's hostname.\n"
-msgstr "ਮਸ਼ੀਨ ਦਾ ਹੋਸਟ ਨਾਂ ਪ੍ਰਿੰਟ ਕਰੋ।\n"
-
-#: src/hostname.c:220
-#, c-format
-msgid "Output format:\n"
-msgstr "ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ:\n"
-
-#: src/hostname.c:222
-#, c-format
-msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 ਛੋਟਾ ਹੋਸਟ ਨਾਂ\n"
-
-#: src/hostname.c:224
-#, c-format
-msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified "
-"domain\n"
-"                                name, and aliases\n"
-msgstr ""
-
-#: src/hostname.c:227
-#, c-format
-msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            ਹੋਸਟ-ਨਾਂ ਲਈ ਐਡਰੈਸ\n"
-
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਆਉਟਪੁੱਟ:\n"
-
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
-
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               ਆਉਟਪੁੱਟ ਵਰਜਨ ਜਾਣਕਾਰੀ ਅਤੇ ਬੰਦ ਕਰੋ\n"
-
-#. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org> ਨੂੰ ਭੇਜੋ।\n"
-
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
-#, c-format
-msgid "could not get host name"
-msgstr "ਹੋਸਟ ਨਾਂ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
-#, c-format
-msgid "at most one input file allowed"
-msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਇੱਕ ਇੰਪੁੱਟ ਫਾਇਲ ਮਨਜ਼ੂਰ ਹੈ"
-
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
-#, c-format
-msgid "%s and %s are mutually exclusive"
-msgstr ""
-
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
-#, c-format
-msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]\n"
-
-#: src/msgattrib.c:426
-#, c-format, no-wrap
-msgid ""
-"Filters the messages of a translation catalog according to their attributes,\n"
-"and manipulates the attributes.\n"
-msgstr ""
-
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
-#, c-format
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr ""
-
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
-#, c-format
-msgid "Input file location:\n"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
-#, c-format
-msgid "  INPUTFILE                   input PO file\n"
-msgstr "  INPUTFILE                   ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
-
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
-#, c-format
-msgid ""
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr ""
-
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
-#, c-format
-msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
-#, c-format
-msgid "Output file location:\n"
-msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
-#, c-format
-msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=FILE      ਆਉਟਪੁੱਟ ਦਿੱਤੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖੋ\n"
-
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
-#, c-format
-msgid ""
-"The results are written to standard output if no output file is specified\n"
-"or if it is -.\n"
-msgstr ""
-
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
-#, c-format
-msgid "Message selection:\n"
-msgstr "ਸੁਨੇਹਾ ਚੋਣ:\n"
-
-#: src/msgattrib.c:452
-#, c-format
-msgid ""
-"      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            ਕੀਤਾ ਅਨੁਵਾਦ ਰੱਖੋ, ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਓ\n"
-
-#: src/msgattrib.c:454
-#, c-format
-msgid ""
-"      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          ਨਾ-ਅਨੁਵਾਦ ਰੱਖੋ, ਕੀਤਾ ਅਨੁਵਾਦ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-
-#: src/msgattrib.c:456
-#, c-format
-msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-
-#: src/msgattrib.c:458
-#, c-format
-msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr ""
-
-#: src/msgattrib.c:460
-#, c-format
-msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           ਬਰਤਰਫ਼ #~ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-
-#: src/msgattrib.c:462
-#, c-format
-msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr ""
-
-#: src/msgattrib.c:465
-#, c-format
-msgid "Attribute manipulation:\n"
-msgstr ""
-
-#: src/msgattrib.c:467
-#, c-format
-msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             ਸਭ ਸੁਨੇਹੇ ਅਸਪਸ਼ਟ ('fuzzy') ਬਣਾਓ\n"
-
-#: src/msgattrib.c:469
-#, c-format
-msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr ""
-
-#: src/msgattrib.c:471
-#, c-format
-msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr ""
-
-#: src/msgattrib.c:473
-#, c-format
-msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr ""
-
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
-#, c-format
-msgid ""
-"      --clear-previous        remove the \"previous msgid\" from all "
-"messages\n"
-msgstr ""
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-
-#: src/msgattrib.c:482
-#, c-format
-msgid ""
-"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr ""
-
-#: src/msgattrib.c:484
-#, c-format
-msgid ""
-"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr ""
-
-#: src/msgattrib.c:486
-#, c-format
-msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr ""
-
-#: src/msgattrib.c:488
-#, c-format
-msgid ""
-"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr ""
-
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
-#, c-format
-msgid "Input file syntax:\n"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਸੰਟੈਕਸ:\n"
-
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
-#, c-format
-msgid ""
-"  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr ""
-
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
-#, c-format
-msgid ""
-"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
-"syntax\n"
-msgstr ""
-
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
-#, c-format
-msgid "Output details:\n"
-msgstr "ਆਉਟਪੁੱਟ ਵੇਰਵਾ:\n"
-
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
-#, c-format
-msgid ""
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
-#, c-format
-msgid ""
-"  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr ""
-
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
-#, c-format
-msgid "      --force-po              write PO file even if empty\n"
-msgstr ""
-
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
-#, c-format
-msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr ""
-
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
-#, c-format
-msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
-#, c-format
-msgid ""
-"  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr ""
-
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
-#, c-format
-msgid ""
-"      --strict                write out strict Uniforum conforming .po file\n"
-msgstr ""
-
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
-#, c-format
-msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr ""
-
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
-#, c-format
-msgid ""
-"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr ""
-
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
-#, c-format
-msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr ""
-
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
-#, c-format
-msgid "  -s, --sort-output           generate sorted output\n"
-msgstr ""
-
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
-#, c-format
-msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-
-#: src/msgcat.c:322 src/msgcomm.c:327
-#, c-format
-msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr ""
-
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
-#, c-format
-msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]...\n"
-
-#: src/msgcat.c:372
-#, c-format, no-wrap
-msgid ""
-"Concatenates and merges the specified PO files.\n"
-"Find messages which are common to two or more of the specified PO files.\n"
-"By using the --more-than option, greater commonality may be requested\n"
-"before messages are printed.  Conversely, the --less-than option may be\n"
-"used to specify less commonality before messages are printed (i.e.\n"
-"--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
-#, c-format
-msgid "  INPUTFILE ...               input files\n"
-msgstr "  INPUTFILE ...               ਇੰਪੁੱਟ ਫਾਇਲਾਂ\n"
-
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
-#, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
-#, c-format
-msgid "If input file is -, standard input is read.\n"
-msgstr ""
-
-#: 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: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: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:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
-#, c-format
-msgid ""
-"  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr ""
-
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
-#, c-format
-msgid ""
-"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
-"                              syntax\n"
-msgstr ""
-
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
-#, c-format
-msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr ""
-
-#: src/msgcat.c:430 src/msguniq.c:380
-#, c-format
-msgid ""
-"      --use-first             use first available translation for each\n"
-"                              message, don't merge several translations\n"
-msgstr ""
-
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
-#, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
-msgid "Peter Miller"
-msgstr "ਪੀਟਰ ਮਿੱਲਰ"
-
-#: src/msgcmp.c:189 src/msgmerge.c:373
-#, c-format
-msgid "no input files given"
-msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਨਹੀਂ ਦਿੱਤੀਆਂ ਗਈਆਂ"
-
-#: src/msgcmp.c:194 src/msgmerge.c:378
-#, c-format
-msgid "exactly 2 input files required"
-msgstr "ਠੀਕ 2 ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਹੀ ਚਾਹੀਦੀਆਂ ਹਨ"
-
-#: src/msgcmp.c:213 src/msgmerge.c:498
-#, c-format
-msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "ਵਰਤੋ: %s [OPTION] def.po ref.pot\n"
-
-#: src/msgcmp.c:218
-#, c-format, no-wrap
-msgid ""
-"Compare two Uniforum style .po files to check that both contain the same\n"
-"set of msgid strings.  The def.po file is an existing PO file with the\n"
-"translations.  The ref.pot file is the last created PO file, or a PO Template\n"
-"file (generally created by xgettext).  This is useful for checking that\n"
-"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 ""
-
-#: src/msgcmp.c:232
-#, c-format
-msgid "  def.po                      translations\n"
-msgstr "  def.po                      ਅਨੁਵਾਦ\n"
-
-#: src/msgcmp.c:234
-#, c-format
-msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     ਸਰੋਤ ਲਈ ਹਵਾਲਾ/ਰੈਫਰੈਂਸ\n"
-
-#: src/msgcmp.c:239 src/msgmerge.c:564
-#, c-format
-msgid "Operation modifiers:\n"
-msgstr "ਓਪਰੇਸ਼ਨ ਮਾਡੀਫਾਇਰ:\n"
-
-#: src/msgcmp.c:241 src/msgmerge.c:566
-#, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-
-#: src/msgcmp.c:243 src/msgmerge.c:568
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
-#, c-format
-msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             fuzzy ਐਂਟਰੀਆਂ ਮੰਨੋ\n"
-
-#: src/msgcmp.c:247
-#, c-format
-msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr ""
-
-#: src/msgcmp.c:324
-#, c-format
-msgid "this message is untranslated"
-msgstr "ਇਹ ਸੁਨੇਹੇ ਨਾ-ਅਨੁਵਾਦਿਤ ਹੈ"
-
-#: src/msgcmp.c:330
-#, c-format
-msgid "this message needs to be reviewed by the translator"
-msgstr "ਇਹ ਸੁਨੇਹੇ ਨੂੰ ਅਨੁਵਾਦਕ ਵਲੋਂ ਰੀਵਿਊ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgcmp.c:369 src/msgmerge.c:1518
-#, c-format
-msgid "this message is used but not defined..."
-msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਗਿਆ ਹੈ, ਪਰ ਦਿੱਤਾ ਕੀਤੇ ਨਹੀਂ ਗਿਆ..."
-
-#: src/msgcmp.c:372 src/msgmerge.c:1521
-#, c-format
-msgid "...but this definition is similar"
-msgstr "...ਇਹ ਪ੍ਰੀਭਾਸ਼ਾ ਰਲਦੀ ਮਿਲਦੀ ਹੈ"
-
-#: src/msgcmp.c:377 src/msgmerge.c:1549
-#, c-format
-msgid "this message is used but not defined in %s"
-msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, ਪਰ %s ਵਿੱਚ ਪਰਿਭਾਸ਼ਿਤ ਨਹੀਂ ਹੈ"
-
-#: src/msgcmp.c:546
-#, c-format
-msgid "warning: this message is not used"
-msgstr "ਸਾਵਧਾਨ: ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਨਹੀਂ ਗਿਆ ਹੈ"
-
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
-#, c-format
-msgid "found %d fatal error"
-msgid_plural "found %d fatal errors"
-msgstr[0] "%d ਘਾਤਕ ਗਲਤੀ ਲੱਭੀ"
-msgstr[1] "%d ਘਾਤਕ ਗਲਤੀਆਂ ਲੱਭੀਆਂ"
-
-#: src/msgcomm.c:316
-#, c-format
-msgid "at least two files must be specified"
-msgstr "ਘੱਟੋ-ਘੱਟ ਦੋ ਫਾਇਲਾਂ ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgcomm.c:364
-#, c-format, no-wrap
-msgid ""
-"Find messages which are common to two or more of the specified PO files.\n"
-"By using the --more-than option, greater commonality may be requested\n"
-"before messages are printed.  Conversely, the --less-than option may be\n"
-"used to specify less commonality before messages are printed (i.e.\n"
-"--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
-"PO file to define them.  File positions from all PO files will be\n"
-"cumulated.\n"
-msgstr ""
-
-#: 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:452 src/xgettext.c:1004
-#, c-format
-msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr ""
-
-#: src/msgconv.c:311
-#, c-format
-msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr ""
-
-#: src/msgconv.c:335
-#, c-format
-msgid "Conversion target:\n"
-msgstr "ਕਨਵਰਜ਼ਨ ਟਾਰਗੇਟ:\n"
-
-#: src/msgconv.c:339
-#, c-format
-msgid "The default encoding is the current locale's encoding.\n"
-msgstr "ਡਿਫਾਲਟ ਇੰਕੋਡਿੰਗ ਮੌਜੂਦਾ ਲੋਕੇਲ ਦੀ ਇੰਕੋਡਿੰਗ ਹੈ।\n"
-
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
-#, c-format
-msgid "  -i, --indent                indented output style\n"
-msgstr ""
-
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
-#, c-format
-msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr ""
-
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
-#, c-format
-msgid "      --strict                strict Uniforum output style\n"
-msgstr ""
-
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
-#, c-format
-msgid "no input file given"
-msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ"
-
-#: src/msgen.c:263
-#, c-format
-msgid "exactly one input file required"
-msgstr "ਠੀਕ ਇੱਕ ਇੰਪੁੱਟ ਫਾਇਲ ਚਾਹੀਦੀ ਹੈ"
-
-#: src/msgen.c:304
-#, c-format
-msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] INPUTFILE\n"
-
-#: src/msgen.c:309
-#, c-format, no-wrap
-msgid ""
-"Creates an English translation catalog.  The input file is the last\n"
-"created English PO file, or a PO Template file (generally created by\n"
-"xgettext).  Untranslated entries are assigned a translation that is\n"
-"identical to the msgid.\n"
-msgstr ""
-
-#: src/msgen.c:321
-#, c-format
-msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  INPUTFILE                   ਇੰਪੁੱਟ PO ਜਾਂ POT ਫਾਇਲ\n"
-
-#: src/msgexec.c:196
-#, c-format
-msgid "missing command name"
-msgstr "ਗੁੰਮ ਕਮਾਂਡ ਨਾਂ"
-
-#: src/msgexec.c:257
-#, c-format
-msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-
-#: src/msgexec.c:262
-#, c-format, no-wrap
-msgid ""
-"Applies a command to all translations of a translation catalog.\n"
-"The COMMAND can be any program that reads a translation from standard\n"
-"input.  It is invoked once for each translation.  Its output becomes\n"
-"msgexec's output.  msgexec's return code is the maximum return code\n"
-"across all invocations.\n"
-msgstr ""
-
-#: src/msgexec.c:271
-#, c-format, no-wrap
-msgid ""
-"A special builtin command called '0' outputs the translation, followed by a\n"
-"null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
-msgstr ""
-
-#: src/msgexec.c:281 src/msgfilter.c:420
-#, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
-
-#: src/msgexec.c:345
-#, c-format
-msgid "write to stdout failed"
-msgstr "stdout ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-
-#: src/msgfilter.c:298
-#, c-format
-msgid "missing filter name"
-msgstr "ਗੁੰਮ ਫਿਲਟਰ ਨਾਂ"
-
-#: src/msgfilter.c:318
-#, c-format
-msgid "at least one sed script must be specified"
-msgstr ""
-
-#: src/msgfilter.c:407
-#, c-format
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] FILTER [FILTER-OPTION]\n"
-
-#: src/msgfilter.c:411
-#, c-format
-msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "ਅਨੁਵਾਦ ਕੈਟਾਲਾਗ ਲਈ ਸਭ ਅਨੁਵਾਦ ਉੱਤੇ ਇੱਕ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ।\n"
-
-#: src/msgfilter.c:435
-#, c-format
-msgid ""
-"The FILTER can be any program that reads a translation from standard input\n"
-"and writes a modified translation to standard output.\n"
-msgstr ""
-
-#: src/msgfilter.c:440
-#, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr ""
-
-#: src/msgfilter.c:442
-#, c-format
-msgid ""
-"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:444
-#, c-format
-msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
-"commands\n"
-"                                to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:447
-#, c-format
-msgid ""
-"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-
-#: src/msgfilter.c:465 src/msggrep.c:600
-#, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-
-#: src/msgfilter.c:471 src/msggrep.c:606
-#, c-format
-msgid "      --indent                indented output style\n"
-msgstr ""
-
-#: src/msgfilter.c:473
-#, c-format
-msgid ""
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr ""
-
-#: src/msgfmt.c:345
-#, c-format
-msgid "the argument to %s should be a single punctuation character"
-msgstr ""
-
-#: src/msgfmt.c:392
-#, c-format
-msgid "invalid endianness: %s"
-msgstr "ਗਲਤ ਅੰਤ(endianness): %s"
-
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
-msgstr "ਉਲਰਿਚ ਡਰਿੱਪਰ"
-
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
-#, c-format
-msgid "%s requires a \"-d directory\" specification"
-msgstr "%s ਲਈ ਇੱਕ \"-d directory\" ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
-#, c-format
-msgid "%s requires a \"-l locale\" specification"
-msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr ""
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
-#, c-format
-msgid "%s is only valid with %s or %s"
-msgstr "%s ਕੇਵਲ %s ਜਾਂ %s ਲਈ ਹੀ ਢੁੱਕਵਾਂ ਹੈ"
-
-#: src/msgfmt.c:571 src/msgfmt.c:577
-#, c-format
-msgid "%s is only valid with %s, %s or %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:740
-#, c-format
-msgid "%s: "
-msgstr "%s: "
-
-#: src/msgfmt.c:744
-#, c-format
-msgid "%d translated message"
-msgid_plural "%d translated messages"
-msgstr[0] "%d ਅਨੁਵਾਦ ਕੀਤਾ ਸੁਨੇਹਾ"
-msgstr[1] "%d ਅਨੁਵਾਦ ਕੀਤੇ ਸੁਨੇਹੇ"
-
-#: src/msgfmt.c:749
-#, c-format
-msgid ", %d fuzzy translation"
-msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
-msgstr[1] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
-
-#: src/msgfmt.c:754
-#, c-format
-msgid ", %d untranslated message"
-msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਾ"
-msgstr[1] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹੇ"
-
-#: src/msgfmt.c:774
-#, c-format
-msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] ਫਾਇਲ-ਨਾਂ.po ...\n"
-
-#: src/msgfmt.c:778
-#, c-format
-msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "ਟੈਕਸਟ ਅਨੁਵਾਦ ਵੇਰਵੇ ਤੋਂ ਬਾਈਨਰੀ ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਤਿਆਰ ਕਰੋ।\n"
-
-#: src/msgfmt.c:783 src/xgettext.c:864
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:790
-#, c-format
-msgid "  filename.po ...             input files\n"
-msgstr "  filename.po ...             ਇੰਪੁੱਟ ਫਾਇਲ ਨਾਂ\n"
-
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
-#, c-format
-msgid "Operation mode:\n"
-msgstr "ਓਪਰੇਸ਼ਨ ਮੋਡ:\n"
-
-#: src/msgfmt.c:799
-#, c-format
-msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
-msgstr ""
-
-#: src/msgfmt.c:801
-#, c-format
-msgid ""
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
-"higher)\n"
-msgstr ""
-
-#: src/msgfmt.c:803
-#, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-
-#: src/msgfmt.c:805
-#, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:807
-#, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-
-#: src/msgfmt.c:809
-#, c-format
-msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
-
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
-#, c-format
-msgid "      --strict                enable strict Uniforum mode\n"
-msgstr ""
-
-#: src/msgfmt.c:820 src/xgettext.c:888
-#, c-format
-msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
-
-#: src/msgfmt.c:823
-#, c-format
-msgid "Output file location in Java mode:\n"
-msgstr "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
-#, c-format
-msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=RESOURCE     ਸਰੋਤ ਨਾਂ\n"
-
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
-#, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr "  -l, --locale=LOCALE         ਲੋਕੇਲ ਨਾਂ, ਜਾਂ ਭਾਸ਼ਾ ਨਾਂ ਜਾਂ ਭਾਸ਼ਾ_ਦੇਸ਼ \n"
-
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
-
-#: src/msgfmt.c:833
-#, c-format
-msgid ""
-"The class name is determined by appending the locale name to the resource "
-"name,\n"
-"separated with an underscore.  The -d option is mandatory.  The class is\n"
-"written under the specified directory.\n"
-msgstr ""
-
-#: src/msgfmt.c:839
-#, c-format
-msgid "Output file location in C# mode:\n"
-msgstr "C# ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgfmt.c:845 src/msgunfmt.c:473
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory for locale dependent .dll "
-"files\n"
-msgstr ""
-
-#: src/msgfmt.c:847
-#, 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:851
-#, c-format
-msgid "Output file location in Tcl mode:\n"
-msgstr "Tcl ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgfmt.c:855 src/msgunfmt.c:483
-#, c-format
-msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr ""
-
-#: src/msgfmt.c:857
-#, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
-#, c-format
-msgid "Input file interpretation:\n"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਇੰਟਰਪਰੇਟੇਸ਼ਨ:\n"
-
-#: src/msgfmt.c:888
-#, c-format
-msgid ""
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
-msgstr ""
-
-#: src/msgfmt.c:891
-#, c-format
-msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-
-#: src/msgfmt.c:893
-#, c-format
-msgid ""
-"      --check-header          verify presence and contents of the header "
-"entry\n"
-msgstr ""
-
-#: src/msgfmt.c:895
-#, c-format
-msgid ""
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-msgstr ""
-
-#: src/msgfmt.c:898
-#, c-format
-msgid ""
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
-"msgfmt\n"
-msgstr ""
-
-#: src/msgfmt.c:900
-#, c-format
-msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
-"for\n"
-"                                menu items\n"
-msgstr ""
-
-#: src/msgfmt.c:903
-#, c-format
-msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             ਆਉਟਪੁੱਟ ਵਿੱਚ ਅਸਪਸ਼ਟ (fuzzy) ਐਂਟਰੀਆਂ ਵਰਤੋਂ\n"
-
-#: src/msgfmt.c:908
-#, c-format
-msgid ""
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr ""
-
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
-#, c-format
-msgid ""
-"      --no-hash               binary file will not include the hash table\n"
-msgstr ""
-
-#: src/msgfmt.c:922
-#, c-format
-msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            ਅਨੁਵਾਦ ਬਾਰੇ ਅੰਕੜੇ ਪੇਸ਼ ਕਰੋ\n"
-
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
-#, c-format
-msgid "  -v, --verbose               increase verbosity level\n"
-msgstr ""
-
-#: src/msgfmt.c:1037
-#, c-format
-msgid "warning: PO file header missing or invalid\n"
-msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਗੁੰਮ ਹੈ ਜਾਂ ਗਲਤ ਹੈ\n"
-
-#: src/msgfmt.c:1040
-#, c-format
-msgid "warning: charset conversion will not work\n"
-msgstr "ਸਾਵਧਾਨ: charset ਬਦਲਣਾ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ\n"
-
-#: src/msgfmt.c:1050
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਅਸਪਸ਼ਟ ਹੈ\n"
-
-#: src/msgfmt.c:1052
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "ਸਾਵਧਾਨ: msgfmt ਦਾ ਪੁਰਾਣਾ ਵਰਜਨ ਇਸ ਉੱਤੇ ਗਲਤੀ ਦੇਵੇਗਾ\n"
-
-#: src/msgfmt.c:1076
-#, c-format
-msgid "domain name \"%s\" not suitable as file name"
-msgstr "ਡੋਮੇਨ ਨਾਂ \"%s\" ਫਾਇਲ ਨਾਂ ਲਈ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ"
-
-#: src/msgfmt.c:1081
-#, c-format
-msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr ""
-
-#: src/msgfmt.c:1095
-#, c-format
-msgid "'domain %s' directive ignored"
-msgstr ""
-
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "ਖਾਲੀ `msgstr' ਐਂਟਰੀ ਅਣ-ਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
-
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "ਅਸਪਸ਼ਟ `msgstr' ਐਂਟਰੀ ਅਣਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
-
-#: src/msgfmt.c:1205
-#, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: ਸਾਵਧਾਨ: ਸਰੋਤ ਫਾਇਲ ਵਿੱਚ ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ ਹੋ ਸਕਦਾ ਹੈ"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
-#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/msggrep.c:501
-#, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-
-#: src/msggrep.c:521
-#, c-format, no-wrap
-msgid ""
-"Extracts all messages of a translation catalog that match a given pattern\n"
-"or belong to some given source files.\n"
-msgstr ""
-
-#: src/msggrep.c:547
-#, c-format, no-wrap
-msgid ""
-"Message selection:\n"
-"  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
-"  [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN]\n"
-"  [-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]\n"
-"A message is selected if it comes from one of the specified source files,\n"
-"or if it comes from one of the specified domains,\n"
-"or if -J is given and its context (msgctxt) matches MSGCTXT-PATTERN,\n"
-"or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
-"or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
-"or if -C is given and the translator's comment matches COMMENT-PATTERN,\n"
-"or if -X is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN.\n"
-"\n"
-"When more than one selection criterion is specified, the set of selected\n"
-"messages is the union of the selected messages of each criterion.\n"
-"\n"
-"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
-"EXTRACTED-COMMENT-PATTERN syntax:\n"
-"  [-E | -F] [-e PATTERN | -f FILE]...\n"
-"PATTERNs are basic regular expressions by default, or extended regular\n"
-"expressions if -E is given, or fixed strings if -F is given.\n"
-"\n"
-"  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
-"  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
-"  -J, --msgctxt               start of patterns for the msgctxt\n"
-"  -K, --msgid                 start of patterns for the msgid\n"
-"  -T, --msgstr                start of patterns for the msgstr\n"
-"  -C, --comment               start of patterns for the translator's comment\n"
-"  -X, --extracted-comment     start of patterns for the extracted comment\n"
-"  -E, --extended-regexp       PATTERN is an extended regular expression\n"
-"  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
-"  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
-"  -f, --file=FILE             obtain PATTERN from FILE\n"
-"  -i, --ignore-case           ignore case distinctions\n"
-"  -v, --invert-match          output only the messages that do not match any\n"
-"                              selection criterion\n"
-msgstr ""
-
-#: src/msggrep.c:602
-#, c-format
-msgid ""
-"      --escape                use C escapes in output, no extended chars\n"
-msgstr ""
-
-#: src/msggrep.c:623
-#, c-format
-msgid "      --sort-output           generate sorted output\n"
-msgstr ""
-
-#: src/msggrep.c:625
-#, c-format
-msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          ਆਉਟਪੁੱਟ ਨੂੰ ਫਾਇਲ ਟਿਕਾਣੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ\n"
-
-#: src/msginit.c:298
-msgid ""
-"You are in a language indifferent environment.  Please set\n"
-"your LANG environment variable, as described in the ABOUT-NLS\n"
-"file.  This is necessary so you can test your translations.\n"
-msgstr ""
-
-#: src/msginit.c:322
-#, c-format
-msgid ""
-"Output file %s already exists.\n"
-"Please specify the locale through the --locale option or\n"
-"the output .po file through the --output-file option.\n"
-msgstr ""
-"ਆਉਟਪੁੱਟ ਫਾਇਲ %s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n"
-"--locale ਚੋਣ ਰਾਹੀਂ ਲੋਕਲ ਦਿਉ ਜੀ ਜਾਂ\n"
-"--output-file ਚੋਣ ਰਾਹੀਂ output.po ਫਾਇਲ ਦਿਉ।\n"
-
-#: src/msginit.c:348
-#, c-format
-msgid "Created %s.\n"
-msgstr "%s ਬਣਾਈ।\n"
-
-#: src/msginit.c:368
-#, c-format, no-wrap
-msgid ""
-"Creates a new PO file, initializing the meta information with values from the\n"
-"user's environment.\n"
-msgstr ""
-"ਨਵੀਂ PO ਫਾਇਲ ਬਣਾਉ, ਯੂਜ਼ਰ ਦੇ ਇੰਵਾਇਰਨਮੈਂਟ ਤੋਂ ਮੁੱਲ ਲੈ ਕੇ ਮੇਟਾ ਜਾਣਕਾਰੀ ਸ਼ੁਰੂ\n"
-" ਕਰੋ।\n"
-
-#: src/msginit.c:378
-#, c-format
-msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ POT ਫਾਇਲ\n"
-
-#: src/msginit.c:380
-#, c-format
-msgid ""
-"If no input file is given, the current directory is searched for the POT "
-"file.\n"
-"If it is -, standard input is read.\n"
-msgstr ""
-
-#: src/msginit.c:386
-#, c-format
-msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-
-#: src/msginit.c:388
-#, c-format
-msgid ""
-"If no output file is given, it depends on the --locale option or the user's\n"
-"locale setting.  If it is -, the results are written to standard output.\n"
-msgstr ""
-
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          ਟਾਰਗੇਟ ਲੋਕੇਲ ਸੈੱਟ ਕਰੋ\n"
-
-#: src/msginit.c:403
-#, c-format
-msgid ""
-"      --no-translator         assume the PO file is automatically generated\n"
-msgstr ""
-
-#: src/msginit.c:469
-msgid ""
-"Found more than one .pot file.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-"ਇੱਕ ਤੋਂ ਵੱਧ .pot ਫਾਇਲਾਂ ਲੱਭੀਆਂ।\n"
-"--input ਚੋਣ ਰਾਹੀਂ input.pot ਫਾਇਲ ਦਿਉ ਜੀ।\n"
-
-#: src/msginit.c:477 src/msginit.c:482
-#, c-format
-msgid "error reading current directory"
-msgstr "ਮੌਜੂਦਾ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/msginit.c:490
-msgid ""
-"Found no .pot file in the current directory.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-"ਮੌਜੂਦਾ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਕੋਈ ਵੀ .pot ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ।\n"
-"--input ਚੋਣ ਰਾਹੀਂ input.pot ਫਾਇਲ ਦਿਉ ਜੀ।\n"
-
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
-#, c-format
-msgid "%s subprocess failed with exit code %d"
-msgstr ""
-
-#: src/msginit.c:1119
-msgid ""
-"The new message catalog should contain your email address, so that users "
-"can\n"
-"give you feedback about the translations, and so that maintainers can "
-"contact\n"
-"you in case of unexpected technical problems.\n"
-msgstr ""
-
-#. TRANSLATORS: "English" needs to be replaced by your language.
-#. For example in it.po write "Traduzioni italiani ...",
-#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
-#, c-format
-msgid "English translations for %s package"
-msgstr "%s ਪੈਕੇਜ ਲਈ ਅੰਗਰੇਜ਼ੀ ਅਨੁਵਾਦ"
-
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
-#, c-format
-msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-
-#: src/msgl-cat.c:188 src/msgl-iconv.c:259
-#, c-format
-msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਵਿੱਚ ਦੋ ਵੱਖ ਵੱਖ charsets \"%s\" ਅਤੇ \"%s\""
-
-#: src/msgl-cat.c:203
-#, fuzzy, c-format
-msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
-
-#: src/msgl-cat.c:207
-#, fuzzy, c-format
-msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
-"charset specification"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
-
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
-#, c-format
-msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
-
-#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
-#, c-format
-msgid "warning: "
-msgstr "ਸਾਵਧਾਨ: "
-
-#: src/msgl-cat.c:443
-#, c-format
-msgid ""
-"Input files contain messages in different encodings, UTF-8 among others.\n"
-"Converting the output to UTF-8.\n"
-msgstr ""
-"ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਲਈ ਵੱਖ ਵੱਖ ਇੰਕੋਡਿੰਗ ਹਨ, UTF-8 ਸਮੇਤ ਹੋਰ।\n"
-"ਆਉਟਪੁੱਟ ਨੂੰ UTF-8 ਵਿੱਚ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ।\n"
-
-#: src/msgl-cat.c:449
-#, c-format
-msgid ""
-"Input files contain messages in different encodings, %s and %s among "
-"others.\n"
-"Converting the output to UTF-8.\n"
-"To select a different output encoding, use the --to-code option.\n"
-msgstr ""
-
-#: src/msgl-cat.c:488
-#, c-format
-msgid ""
-"Conversion of file %s from %s encoding to %s encoding\n"
-"changes some msgids or msgctxts.\n"
-"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
-"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
-msgstr ""
-
-#: src/msgl-charset.c:93
-#, c-format
-msgid ""
-"Locale charset \"%s\" is different from\n"
-"input file charset \"%s\".\n"
-"Output of '%s' might be incorrect.\n"
-"Possible workarounds are:\n"
-msgstr ""
-"ਲੋਕੇਲ charset \"%s\" ਇੰਪੁੱਟ ਫਾਇਲ\n"
-"charset \"%s\" ਤੋਂ ਵੱਖਰਾ ਹੈ।\n"
-"'%s' ਦੀ ਆਉਟਪੁੱਟ ਗਲਤ ਹੋ ਸਕਦੀ ਹੈ।\n"
-"ਸੰਭਵ ਹੱਲ ਹਨ:\n"
-
-#: src/msgl-charset.c:100
-#, c-format
-msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr ""
-
-#: src/msgl-charset.c:105
-#, c-format
-msgid ""
-"- Convert the translation catalog to %s using 'msgconv',\n"
-"  then apply '%s',\n"
-"  then convert back to %s using 'msgconv'.\n"
-msgstr ""
-
-#: src/msgl-charset.c:114
-#, c-format
-msgid ""
-"- Set LC_ALL to a locale with encoding %s,\n"
-"  convert the translation catalog to %s using 'msgconv',\n"
-"  then apply '%s',\n"
-"  then convert back to %s using 'msgconv'.\n"
-msgstr ""
-
-#: src/msgl-charset.c:128
-#, c-format
-msgid ""
-"Locale charset \"%s\" is not a portable encoding name.\n"
-"Output of '%s' might be incorrect.\n"
-"A possible workaround is to set LC_ALL=C.\n"
-msgstr ""
-
-#: src/msgl-check.c:130
-msgid "plural expression can produce negative values"
-msgstr ""
-
-#: src/msgl-check.c:141
-#, c-format
-msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-
-#: src/msgl-check.c:187
-msgid "plural expression can produce division by zero"
-msgstr ""
-
-#: src/msgl-check.c:192
-msgid "plural expression can produce integer overflow"
-msgstr ""
-
-#: src/msgl-check.c:197
-msgid ""
-"plural expression can produce arithmetic exceptions, possibly division by "
-"zero"
-msgstr ""
-
-#: src/msgl-check.c:266
-#, c-format
-msgid "Try using the following, valid for %s:"
-msgstr "ਅੱਗੇ ਦਿੱਤੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਸਿਸ਼ ਕਰੋ, %s ਲਈ ਠੀਕ:"
-
-#: src/msgl-check.c:358 src/msgl-check.c:382
-msgid "message catalog has plural form translations"
-msgstr "ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਵਿੱਚ ਬਹੁਵਚਨ ਰੂਪ ਵਿੱਚ ਅਨੁਵਾਦ ਹੈ"
-
-#: src/msgl-check.c:360
-msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "ਪਰ ਹੈੱਡਰ ਐਂਟਰੀ ਵਿੱਚ \"plural=EXPRESSION\" ਗੁਣ ਨਹੀਂ ਹੈ"
-
-#: src/msgl-check.c:384
-msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr ""
-
-#: src/msgl-check.c:420
-msgid "invalid nplurals value"
-msgstr "ਗਲਤ nplurals ਮੁੱਲ"
-
-#: src/msgl-check.c:442
-msgid "invalid plural expression"
-msgstr "ਗਲਤ ਬਹੁਵਚਨ ਸਮੀਕਰਨ"
-
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
-msgid "nplurals = %lu"
-msgstr "nplurals = %lu"
-
-#: src/msgl-check.c:474
-#, 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:490
-#, 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:514
-msgid ""
-"message catalog has plural form translations, but lacks a header entry with "
-"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr ""
-
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "`msgid' and `msgid_plural' ਐਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ"
-
-#: src/msgl-check.c:619
-#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
-
-#: src/msgl-check.c:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "`msgid' and `msgid_plural' ਐਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ"
-
-#: src/msgl-check.c:660
-#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
-
-#: src/msgl-check.c:687
-msgid "plural handling is a GNU gettext extension"
-msgstr "ਬਹੁਵਚਨ ਹੈਡਲਿੰਗ ਗਨੂ gettext ਇਕਸਟੈਨਸ਼ਨ ਹੈ"
-
-#: src/msgl-check.c:729
-#, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr ਵਿੱਚ ਕੀਬੋਰਡ ਐਕਸਰਲੇਟਰ ਮਾਰਕ '%c' ਦੀ ਕਮੀ ਹੈ"
-
-#: src/msgl-check.c:740
-#, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr ""
-
-#: src/msgl-check.c:814
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
-
-#: src/msgl-check.c:831
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "ਹੈੱਡਰ ਵਿੱਚ `%s' ਹੈੱਡਰ ਖੇਤਰ ਗੁੰਮ ਹੈ\n"
-
-#: src/msgl-iconv.c:65
-#, c-format
-msgid "%s: input is not valid in \"%s\" encoding"
-msgstr ""
-
-#: src/msgl-iconv.c:69
-#, c-format
-msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr ""
-
-#: src/msgl-iconv.c:290
-msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
-
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
-#, 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:335
-#, c-format
-msgid ""
-"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
-"msgids become equal."
-msgstr ""
-
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
-#, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
-"built without iconv()."
-msgstr ""
-
-#: src/msgmerge.c:405 src/msgmerge.c:411
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s ਕੇਵਲ %s ਨਾਲ ਠੀਕ ਹੈ"
-
-#: src/msgmerge.c:466
-msgid "backup type"
-msgstr "ਬੈਕਅੱਪ ਕਿਸਮ"
-
-#: src/msgmerge.c:503
-#, c-format, no-wrap
-msgid ""
-"Merges two Uniforum style .po files together.  The def.po file is an\n"
-"existing PO file with translations which will be taken over to the newly\n"
-"created file as long as they still match; comments will be preserved,\n"
-"but extracted comments and file positions will be discarded.  The ref.pot\n"
-"file is the last created PO file with up-to-date source references but\n"
-"old translations, or a PO Template file (generally created by xgettext);\n"
-"any translations or comments in the file will be discarded, however dot\n"
-"comments and file positions will be preserved.  Where an exact match\n"
-"cannot be found, fuzzy matching is used to produce better results.\n"
-msgstr ""
-
-#: src/msgmerge.c:520
-#, c-format
-msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      ਪੁਰਾਣੇ ਸੋਰਤ ਲਈ ਰੈਫਰੈਂਸ ਅਨੁਵਾਦ\n"
-
-#: src/msgmerge.c:522
-#, c-format
-msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     ਨਵੇਂ ਸਰੋਤ ਲਈ ਰੈਫਰੈਂਸ\n"
-
-#: src/msgmerge.c:526
-#, c-format
-msgid ""
-"  -C, --compendium=FILE       additional library of message translations,\n"
-"                              may be specified more than once\n"
-msgstr ""
-
-#: src/msgmerge.c:532
-#, c-format
-msgid ""
-"  -U, --update                update def.po,\n"
-"                              do nothing if def.po already up to date\n"
-msgstr ""
-
-#: src/msgmerge.c:544
-#, c-format
-msgid "Output file location in update mode:\n"
-msgstr "ਆਉਟਪੁੱਟ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgmerge.c:546
-#, c-format
-msgid "The result is written back to def.po.\n"
-msgstr ""
-
-#: src/msgmerge.c:548
-#, c-format
-msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr ""
-
-#: src/msgmerge.c:550
-#, c-format
-msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-
-#: src/msgmerge.c:552
-#, c-format
-msgid ""
-"The version control method may be selected via the --backup option or "
-"through\n"
-"the VERSION_CONTROL environment variable.  Here are the values:\n"
-"  none, off       never make backups (even if --backup is given)\n"
-"  numbered, t     make numbered backups\n"
-"  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-"  simple, never   always make simple backups\n"
-msgstr ""
-
-#: src/msgmerge.c:559
-#, c-format
-msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
-"SIMPLE_BACKUP_SUFFIX\n"
-"environment variable.\n"
-msgstr ""
-
-#: src/msgmerge.c:570
-#, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-
-#: src/msgmerge.c:627 src/urlget.c:192
-#, c-format
-msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr ""
-
-#: src/msgmerge.c:1622
-#, c-format
-msgid "this message should define plural forms"
-msgstr "ਇਹ ਸੁਨੇਹਾ ਬਹੁਵਚਨ ਰੂਪ ਦਰਸਾਉਂਦਾ ਹੈ"
-
-#: src/msgmerge.c:1645
-#, c-format
-msgid "this message should not define plural forms"
-msgstr ""
-
-#: src/msgmerge.c:2048
-#, c-format
-msgid ""
-"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
-"obsolete %ld.\n"
-msgstr ""
-
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
-msgid " done.\n"
-msgstr " ਮੁਕੰਮਲ।\n"
-
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
-#, c-format
-msgid "%s and explicit file names are mutually exclusive"
-msgstr ""
-
-#: src/msgunfmt.c:427
-#, c-format
-msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] [FILE]...\n"
-
-#: src/msgunfmt.c:431
-#, c-format
-msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr ""
-
-#: src/msgunfmt.c:440
-#, c-format
-msgid ""
-"  -j, --java                  Java mode: input is a Java ResourceBundle "
-"class\n"
-msgstr ""
-
-#: src/msgunfmt.c:442
-#, c-format
-msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr ""
-
-#: src/msgunfmt.c:444
-#, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: input is a .NET .resources "
-"file\n"
-msgstr ""
-
-#: src/msgunfmt.c:446
-#, c-format
-msgid ""
-"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr ""
-
-#: src/msgunfmt.c:451
-#, c-format
-msgid "  FILE ...                    input .mo files\n"
-msgstr "  FILE ...                    ਇੰਪੁੱਟ .mo ਫਾਇਲਾਂ\n"
-
-#: src/msgunfmt.c:456
-#, c-format
-msgid "Input file location in Java mode:\n"
-msgstr "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgunfmt.c:462
-#, c-format
-msgid ""
-"The class name is determined by appending the locale name to the resource "
-"name,\n"
-"separated with an underscore.  The class is located using the CLASSPATH.\n"
-msgstr ""
-
-#: src/msgunfmt.c:467
-#, c-format
-msgid "Input file location in C# mode:\n"
-msgstr "C# ਮੋਡ ਵਿੱਚ ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgunfmt.c:475
-#, c-format
-msgid ""
-"The -l and -d options are mandatory.  The .dll file is located in a\n"
-"subdirectory of the specified directory whose name depends on the locale.\n"
-msgstr ""
-
-#: src/msgunfmt.c:479
-#, c-format
-msgid "Input file location in Tcl mode:\n"
-msgstr "Tcl ਮੋਡ ਵਿੱਚ ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-
-#: src/msgunfmt.c:485
-#, c-format
-msgid ""
-"The -l and -d options are mandatory.  The .msg file is located in the\n"
-"specified directory.\n"
-msgstr ""
-
-#: src/msgunfmt.c:511
-#, c-format
-msgid "  -i, --indent                write indented output style\n"
-msgstr ""
-
-#: src/msgunfmt.c:513
-#, c-format
-msgid "      --strict                write strict uniforum style\n"
-msgstr ""
-
-#: src/msguniq.c:331
-#, c-format, no-wrap
-msgid ""
-"Unifies duplicate translations in a translation catalog.\n"
-"Finds duplicate translations of the same message ID.  Such duplicates are\n"
-"invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
-"default, duplicates are merged together.  When using the --repeated option,\n"
-"only duplicates are output, and all other messages are discarded.  Comments\n"
-"and extracted comments will be cumulated, except that if --use-first is\n"
-"specified, they will be taken from the first translation.  File positions\n"
-"will be cumulated.  When using the --unique option, duplicates are discarded.\n"
-msgstr ""
-
-#: src/msguniq.c:364
-#, c-format
-msgid "  -d, --repeated              print only duplicates\n"
-msgstr ""
-
-#: src/msguniq.c:366
-#, c-format
-msgid ""
-"  -u, --unique                print only unique messages, discard "
-"duplicates\n"
-msgstr ""
-
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
-#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
-msgid "<stdin>"
-msgstr "<stdin>"
-
-#: src/po-charset.c:489
-#, c-format
-msgid ""
-"Charset \"%s\" is not a portable encoding name.\n"
-"Message conversion to user's charset might not work.\n"
-msgstr ""
-
-#: src/po-charset.c:557
-#, c-format
-msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv(),\n"
-"and iconv() does not support \"%s\".\n"
-msgstr ""
-
-#: src/po-charset.c:564 src/po-charset.c:612
-msgid ""
-"Installing GNU libiconv and then reinstalling GNU gettext\n"
-"would fix this problem.\n"
-msgstr ""
-
-#: src/po-charset.c:578 src/po-charset.c:616
-msgid "Continuing anyway, expect parse errors."
-msgstr "ਪਾਰਸ ਗਲਤੀਆਂ ਨੂੰ ਛੱਡ ਕੇ, ਕਿਵੇਂ ਵੀ ਜਾਰੀ ਰੱਖੋ।"
-
-#: src/po-charset.c:580
-msgid "Continuing anyway."
-msgstr "ਕਿਵੇਂ ਵੀ ਜਾਰੀ ਰੱਖੋ।"
-
-#: src/po-charset.c:607
-#, c-format
-msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv().\n"
-"This version was built without iconv().\n"
-msgstr ""
-
-#: src/po-charset.c:644
-msgid ""
-"Charset missing in header.\n"
-"Message conversion to user's charset will not work.\n"
-msgstr ""
-"ਹੈੱਡਰ ਵਿੱਚ Charset ਮੌਜੂਦ ਨਹੀਂ।\n"
-"ਯੂਜ਼ਰ ਦੇ charset ਵਿੱਚ ਸੁਨੇਹਾ ਬਦਲਣ ਨਾਲ ਕੰਮ ਨਹੀਂ ਚੱਲੇਗਾ।\n"
-
-#: src/po-gram-gen.y:93
-#, c-format
-msgid "inconsistent use of #~"
-msgstr "#~ ਦੀ ਅਨਿਯਮਤ ਵਰਤੋਂ"
-
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "`msgstr[]' ਭਾਗ ਮੌਜੂਦ ਨਹੀਂ"
-
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "ਨਾ-ਮੌਜੂਦ `msgid_plural' ਭਾਗ"
-
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
-msgstr "ਨਾ-ਮੌਜੂਦ `msgstr' ਭਾਗ"
-
-#: src/po-gram-gen.y:399
-#, c-format
-msgid "first plural form has nonzero index"
-msgstr ""
-
-#: src/po-gram-gen.y:401
-#, c-format
-msgid "plural form has wrong index"
-msgstr "ਬਹੁਵਚਨ ਰੂਪ ਦਾ ਗਲਤ ਇੰਡੈਕਸ"
-
-#: src/po-lex.c:90 src/po-lex.c:109
-#, c-format
-msgid "too many errors, aborting"
-msgstr "ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤੀਆਂ, ਅਧੂਰਾ ਛੱਡਿਆ"
-
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
-#, c-format
-msgid "invalid multibyte sequence"
-msgstr "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
-
-#: src/po-lex.c:465
-#, c-format
-msgid "incomplete multibyte sequence at end of file"
-msgstr ""
-
-#: src/po-lex.c:475
-#, c-format
-msgid "incomplete multibyte sequence at end of line"
-msgstr ""
-
-#: src/po-lex.c:487
-msgid "iconv failure"
-msgstr "iconv ਫੇਲ੍ਹ"
-
-#: src/po-lex.c:744
-#, c-format
-msgid "keyword \"%s\" unknown"
-msgstr "ਕੀਬੋਰਡ \"%s\" ਅਣਜਾਣ"
-
-#: src/po-lex.c:854
-#, c-format
-msgid "invalid control sequence"
-msgstr "ਗਲਤ ਕੰਟਰੋਲ ਲੜੀ"
-
-#: src/po-lex.c:981
-#, c-format
-msgid "end-of-file within string"
-msgstr ""
-
-#: src/po-lex.c:987
-#, c-format
-msgid "end-of-line within string"
-msgstr ""
-
-#: src/po-lex.c:1008
-#, c-format
-msgid "context separator <EOT> within string"
-msgstr ""
-
-#: src/read-catalog.c:318 src/xgettext.c:1046
-#, c-format
-msgid "this file may not contain domain directives"
-msgstr ""
-
-#: src/read-catalog.c:363
-msgid "duplicate message definition"
-msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹਾ ਪ੍ਰੀਭਾਸ਼ਾ"
-
-#: src/read-catalog.c:365
-msgid "this is the location of the first definition"
-msgstr ""
-
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
-#, c-format
-msgid "file \"%s\" is truncated"
-msgstr "ਫਾਇਲ \"%s\" ਕੱਟੀ-ਵੱਢੀ ਹੈ"
-
-#: src/read-mo.c:129
-#, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
-msgstr ""
-
-#: src/read-mo.c:165 src/read-mo.c:274
-#, c-format
-msgid "file \"%s\" is not in GNU .mo format"
-msgstr "ਫਾਇਲ \"%s\" GNU .mo ਫਾਰਮੈਟ ਨਹੀਂ ਹੈ"
-
-#: src/read-mo.c:178
-#, c-format
-msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr ""
-
-#: src/read-properties.c:227
-msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "ਸਾਵਧਾਨ: ਯੂਨੀਕੋਡ ਅੱਖਰ ਲਈ ਗਲਤ \\uxxxx ਸੰਟੈਕਸ"
-
-#: src/read-stringtable.c:802
-msgid "warning: unterminated string"
-msgstr ""
-
-#: src/read-stringtable.c:810
-msgid "warning: syntax error"
-msgstr "ਸਾਵਧਾਨ: ਸੰਟੈਕਸ ਗਲਤੀ"
-
-#: src/read-stringtable.c:871 src/read-stringtable.c:893
-msgid "warning: unterminated key/value pair"
-msgstr ""
-
-#: src/read-stringtable.c:939
-msgid "warning: syntax error, expected ';' after string"
-msgstr ""
-
-#: src/read-stringtable.c:948
-msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
-
-#: src/recode-sr-latin.c:116
-#, c-format
-msgid "Written by %s and %s.\n"
-msgstr "%s ਅਤੇ %s ਵਲੋਂ ਲਿਖਿਆ।\n"
-
-#. TRANSLATORS: This is a proper name. The last name is
-#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
-#. "&Scaron;egan".
-#. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
-msgid "Danilo Segan"
-msgstr "ਡਾਂਇਲੋ ਸਿਗਨ"
-
-#: src/recode-sr-latin.c:153
-#, c-format, no-wrap
-msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
-
-#: src/recode-sr-latin.c:156
-#, c-format, no-wrap
-msgid ""
-"The input text is read from standard input.  The converted text is output to\n"
-"standard output.\n"
-msgstr ""
-
-#: src/recode-sr-latin.c:339
-#, c-format
-msgid "input is not valid in \"%s\" encoding"
-msgstr "ਇੰਪੁੱਟ \"%s\" ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਠੀਕ ਨਹੀਂ ਹੈ"
-
-#: src/recode-sr-latin.c:367
-#, c-format
-msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "\"%s\" ਇੰਕੋਡਿੰਗ ਤੋਂ \"%s\" ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/urlget.c:159
-#, c-format
-msgid "expected two arguments"
-msgstr "ਦੋ ਆਰਗੂਮੈਂਟ ਲੋੜੀਦੇ ਹਨ"
-
-#: src/urlget.c:176
-#, c-format
-msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "ਵਰਤੋਂ: %s [OPTION] URL FILE\n"
-
-#: src/urlget.c:181
-#, c-format, no-wrap
-msgid ""
-"Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
-"the locally accessible FILE is used instead.\n"
-msgstr ""
-
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/urlget.c:234
-#, c-format
-msgid "error writing stdout"
-msgstr "stdout ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr "%s ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr " ਟਾਈਮ-ਆਉਟ।\n"
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr " ਫੇਲ੍ਹ ਹੈ।\n"
-
-#: src/write-catalog.c:126
-msgid ""
-"Cannot output multiple translation domains into a single file with the "
-"specified output format. Try using PO file syntax instead."
-msgstr ""
-
-#: src/write-catalog.c:129
-msgid ""
-"Cannot output multiple translation domains into a single file with the "
-"specified output format."
-msgstr ""
-
-#: src/write-catalog.c:162
-msgid ""
-"message catalog has context dependent translations, but the output format "
-"does not support them."
-msgstr ""
-
-#: src/write-catalog.c:197
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them. Try generating a Java class using \"msgfmt --java\", instead "
-"of a properties file."
-msgstr ""
-
-#: src/write-catalog.c:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
-
-#: src/write-catalog.c:231 src/write-catalog.c:275
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ \"%s\" ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
-
-#: src/write-catalog.c:239 src/write-catalog.c:283
-msgid "standard output"
-msgstr "ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ"
-
-#: src/write-csharp.c:703
-#, c-format
-msgid "failed to create directory \"%s\""
-msgstr "ਡਾਇਰੈਕਟਰੀ \"%s\" ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
-
-#: src/write-csharp.c:766
-#, c-format
-msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-
-#: src/write-csharp.c:768
-#, c-format
-msgid "compilation of C# class failed"
-msgstr ""
-
-#: src/write-java.c:1091
-#, c-format
-msgid "not a valid Java class name: %s"
-msgstr "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
-
-#: src/write-java.c:1210
-#, c-format
-msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-
-#: src/write-java.c:1213
-#, c-format
-msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "ਲਿਖਣ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
-
-#: src/write-po.c:884
-#, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr ""
-
-#: src/write-po.c:1335 src/write-po.c:1459
-#, c-format
-msgid ""
-"The following msgctxt contains non-ASCII characters.\n"
-"This will cause problems to translators who use a character encoding\n"
-"different from yours. Consider using a pure ASCII msgctxt instead.\n"
-"%s\n"
-msgstr ""
-
-#: src/write-po.c:1347 src/write-po.c:1471
-#, c-format
-msgid ""
-"The following msgid contains non-ASCII characters.\n"
-"This will cause problems to translators who use a character encoding\n"
-"different from yours. Consider using a pure ASCII msgid instead.\n"
-"%s\n"
-msgstr ""
-
-#: src/write-qt.c:667
-msgid ""
-"message catalog has plural form translations\n"
-"but the Qt message catalog format doesn't support plural handling\n"
-msgstr ""
-
-#: src/write-qt.c:693
-msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
-"but the Qt message catalog format supports Unicode only in the translated\n"
-"strings, not in the context strings\n"
-msgstr ""
-
-#: src/write-qt.c:717
-msgid ""
-"message catalog has msgid strings containing characters outside ISO-8859-1\n"
-"but the Qt message catalog format supports Unicode only in the translated\n"
-"strings, not in the untranslated strings\n"
-msgstr ""
-
-#: src/write-resources.c:94
-#, c-format
-msgid "error while writing to %s subprocess"
-msgstr ""
-
-#: src/write-resources.c:131
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .resources format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-resources.c:150
-msgid ""
-"message catalog has plural form translations\n"
-"but the C# .resources format doesn't support plural handling\n"
-msgstr ""
-
-#: src/write-tcl.c:157
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Tcl message catalog format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-tcl.c:176
-msgid ""
-"message catalog has plural form translations\n"
-"but the Tcl message catalog format doesn't support plural handling\n"
-msgstr ""
-
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
-#, c-format
-msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/x-awk.c:592
-#, c-format
-msgid "%s:%d: warning: unterminated regular expression"
-msgstr ""
-
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "ਸਾਵਧਾਨ: ਯੂਨੀਕੋਡ ਅੱਖਰ ਲਈ ਗਲਤ \\uxxxx ਸੰਟੈਕਸ"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
-#, c-format
-msgid "%s:%d: warning: unterminated character constant"
-msgstr ""
-
-#: src/x-c.c:1348 src/x-vala.c:755
-#, c-format
-msgid "%s:%d: warning: unterminated string literal"
-msgstr ""
-
-#: src/x-csharp.c:224 src/xgettext.c:2106
-msgid "Please specify the source encoding through --from-code."
-msgstr ""
-
-#: src/x-csharp.c:269
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code.\n"
-msgstr ""
-
-#: src/x-csharp.c:285
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code.\n"
-msgstr ""
-
-#: src/x-csharp.c:297
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code.\n"
-msgstr ""
-
-#: src/x-csharp.c:306
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code.\n"
-msgstr ""
-
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
-#, c-format
-msgid "%s:%d: iconv failure"
-msgstr "%s:%d: iconv ਫੇਲ੍ਹ"
-
-#: src/x-csharp.c:338
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code.\n"
-msgstr ""
-
-#: src/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-csharp.c:1512 src/x-java.c:875
-#, c-format
-msgid "%s:%d: warning: unterminated string constant"
-msgstr ""
-
-#: src/x-csharp.c:2020 src/x-java.c:1369
-#, c-format
-msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr ""
-
-#: src/x-csharp.c:2054 src/x-java.c:1403
-#, c-format
-msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr ""
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
-
-#: src/x-glade.c:606
-#, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr ""
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/x-perl.c:308
-#, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-
-#: src/x-perl.c:1043
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr ""
-
-#: src/x-perl.c:1163
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1183
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1217
-#, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1230
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1247
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr ""
-
-#: 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:324
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"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"
-msgstr ""
-
-#: src/x-python.c:341
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"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"
-msgstr ""
-
-#: src/x-python.c:354
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"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"
-msgstr ""
-
-#: src/x-python.c:364
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"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"
-msgstr ""
-
-#: src/x-python.c:397
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"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:722
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
-
-#: src/x-rst.c:108
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: ਗਲਤ ਲਾਈਨ ਪ੍ਰੀਭਾਸ਼ਾ"
-
-#: src/x-rst.c:172
-#, c-format
-msgid "%s:%d: missing number after #"
-msgstr ""
-
-#: src/x-rst.c:207
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr ""
-
-#: src/x-sh.c:1074
-#, c-format
-msgid ""
-"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
-"use eval_gettext instead"
-msgstr ""
-
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
-#, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-
-#: src/xgettext.c:653
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
-
-#: src/xgettext.c:808
-#, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-
-#: src/xgettext.c:859
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr ""
-
-#: src/xgettext.c:882
-#, c-format
-msgid ""
-"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
-"po)\n"
-msgstr ""
-
-#: src/xgettext.c:884
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-
-#: src/xgettext.c:886
-#, c-format
-msgid ""
-"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr ""
-
-#: src/xgettext.c:891
-#, c-format
-msgid "Choice of input file language:\n"
-msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਲੈਗੂਇਜ਼ ਦੀ ਚੋਣ:\n"
-
-#: src/xgettext.c:893
-#, c-format
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
-msgstr ""
-
-#: src/xgettext.c:900
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-
-#: src/xgettext.c:902
-#, c-format
-msgid ""
-"By default the language is guessed depending on the input file name "
-"extension.\n"
-msgstr ""
-
-#: src/xgettext.c:907
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-
-#: src/xgettext.c:910
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr ""
-
-#: src/xgettext.c:915
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-
-#: src/xgettext.c:917
-#, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-
-#: src/xgettext.c:919
-#, c-format
-msgid ""
-"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
-"                                preceding keyword lines in output file\n"
-"  -c, --add-comments          place all comment blocks preceding keyword "
-"lines\n"
-"                                in output file\n"
-msgstr ""
-
-#: src/xgettext.c:925
-#, c-format
-msgid "Language specific options:\n"
-msgstr "ਲੈਗੂਇਜ਼ ਖਾਸ ਚੋਣਾਂ:\n"
-
-#: src/xgettext.c:927
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           ਸਭ ਲਾਇਨਾਂ ਕੱਢੋ\n"
-
-#: src/xgettext.c:929
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-
-#: src/xgettext.c:937
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
-msgstr ""
-
-#: src/xgettext.c:942
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
-"argument\n"
-"                              number ARG of keyword WORD\n"
-msgstr ""
-
-#: src/xgettext.c:945
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-
-#: src/xgettext.c:950
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-
-#: src/xgettext.c:952
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr ""
-
-#: src/xgettext.c:954
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr ""
-
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
-
-#: src/xgettext.c:958
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr ""
-
-#: src/xgettext.c:962
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr ""
-
-#: src/xgettext.c:966
-#, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-
-#: src/xgettext.c:991
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-
-#: src/xgettext.c:1006
-#, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-
-#: src/xgettext.c:1008
-#, c-format
-msgid ""
-"      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-
-#: src/xgettext.c:1010
-#, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=PACKAGE  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਨਾਂ ਦਿਓ\n"
-
-#: src/xgettext.c:1012
-#, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSION  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਵਰਜਨ ਦਿਓ\n"
-
-#: src/xgettext.c:1014
-#, 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:1016
-#, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1019
-#, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1840
-#, c-format
-msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
-"%s"
-msgstr ""
-
-#: src/xgettext.c:1965
-msgid "standard input"
-msgstr "ਸਟੈਂਡਰਡ ਇੰਪੁੱਟ"
-
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: ਸਾਵਧਾਨ: "
-
-#: src/xgettext.c:2189
-#, 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:2190
-#, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
-msgstr ""
-
-#: src/xgettext.c:2221
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-
-#: src/xgettext.c:2283
-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 ""
-"ਖਾਲੀ msgid ਹੈ। ਇਹ ਗਨੂ gettext ਵਲੋਂ ਰਾਖਵਾਂ ਹੈ।\n"
-"gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾਏ\n"
-"ਹੈੱਡਰ ਐਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
-
-#: src/xgettext.c:2979
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3006
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ੍ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
-
-#: src/xgettext.c:3031
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3052
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr ""
-
-#: src/xgettext.c:3419
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
-msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<ਬਿਨ-ਨਾਂ>"
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਲਾਈਨ ਦੇ ਸ਼ੁਰੂ ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "ਕੁਝ ਹੈੱਡਰ ਖੇਤਰ ਹਾਲੇ ਵੀ ਮੁੱਢਲੇ ਮੁੱਲ ਰੱਖਦੇ ਹਨ\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/pl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/pl.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/pl.po gettext-0.18.1.1/gettext-tools/po/pl.po
--- gettext-0.19.3/gettext-tools/po/pl.po	2014-10-16 06:04:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/pl.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,23 +1,22 @@
 # 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 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
+# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010	„”
 # 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
-# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010, 2013, 2014
+# Jakub Bogusz <qboosh@pld.org.pl>, 2002, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-06-03 23:13+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-10 13:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -32,65 +31,65 @@
 msgstr "niejednoznaczny argument %s opcji %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Prawidłowe argumenty to:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nie można znaleźć katalogu tymczasowego - należy ustawić $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "nie można utworzyć katalogu tymczasowego przy użyciu szablonu \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nie można usunąć pliku tymczasowego %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "nie można usunąć katalogu tymczasowego %s"
+msgstr "nie można usunąć katalogu tymczasowego przy %s"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "błąd zapisu"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "zachowanie uprawnień do %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "błąd w czasie otwierania %s do czytania"
+msgid "error while opening \"%s\" for reading"
+msgstr "błąd w czasie otwierania \"%s\" do czytania"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "błąd otwarcia kopii zapasowej %s do pisania"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "błąd otwarcia kopii zapasowej \"%s\" do pisania"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "błąd czytania %s"
+msgid "error reading \"%s\""
+msgstr "błąd czytania \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "błąd pisania do %s"
+msgid "error writing \"%s\""
+msgstr "błąd pisania do \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "błąd po przeczytaniu %s"
+msgid "error after reading \"%s\""
+msgstr "błąd po przeczytaniu \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -107,98 +106,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Nie znaleziono maszyny wirtualnej C#, proszę zainstalować pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "niepowodzenie podprocesu %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcja: „%s” jest niejednoznaczna; możliwości: "
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: opcja: '%s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcja „--%s” nie może mieć argumentu\n"
+msgstr "%s: opcja '--%s' nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opcja „%c%s” nie może mieć argumentu\n"
+msgstr "%s: opcja '%c%s' nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcja „--%s” wymaga argumentu\n"
+msgstr "%s: opcja '--%s' wymaga argumentu\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nierozpoznana opcja „--%s”\n"
+msgstr "%s: nierozpoznana opcja '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nierozpoznana opcja „%c%s”\n"
+msgstr "%s: nierozpoznana opcja '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: błędna opcja -- „%c”\n"
+msgstr "%s: błędna opcja -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcja wymaga argumentu -- „%c”\n"
+msgstr "%s: opcja wymaga argumentu -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
+msgstr "%s: opcja '-W %s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcja „-W %s” nie może mieć argumentu\n"
+msgstr "%s: opcja '-W %s' nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcja „-W %s” wymaga argumentu\n"
+msgstr "%s: opcja '-W %s' wymaga argumentu\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "błędny argument source_version do compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tworzenie \"%s\" nie powiodło się"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "błąd podczas pisania do pliku \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -211,96 +210,58 @@
 "Nie znaleziono maszyny wirtualnej Javy, proszę zainstalować gij lub ustawić "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "błąd wejścia/wyjścia podprocesu %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "czytanie z podprocesu %s nie powiodło się"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "nie można ustawić nieblokującego we/wy dla podprocesu %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "komunikacja z podprocesem %s nie powiodła się"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "podproces %s zakończony z kodem wyjścia %d"
+msgid "cannot create pipe"
+msgstr "nie można utworzyć potoku"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 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
-#, c-format
-msgid "cannot create pipe"
-msgstr "nie można utworzyć potoku"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "błąd _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nie można odtworzyć deskryptora pliku nr %d: niepowodzenie dup2()"
@@ -316,131 +277,120 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s otrzymał krytyczny sygnał %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "błąd w czasie otwierania \"%s\" do czytania"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"'%s' nie jest poprawnym formatem %s w przeciwieństwie do „%s”.\n"
+"'%s' nie jest poprawnym formatem %s w przeciwieństwie do '%s'.\n"
 "Powód: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"specyfikacja formatu dla argumentu %u, obecna w „%s”, nie istnieje w „%s”"
+"specyfikacja formatu dla argumentu %u, obecna w '%s', nie istnieje w '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "specyfikacja formatu dla argumentu %u nie istnieje w „%s”"
+msgstr "specyfikacja formatu dla argumentu %u nie istnieje w '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "różniące się specyfikacje formatu w „%s” i „%s” dla argumentu %u"
+msgstr "różniące się specyfikacje formatu w '%s' i '%s' dla argumentu %u"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Dyrektywa numer %u zaczyna się od |, ale nie kończy |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"W dyrektywie numer %u oznaczenie po „<” nie jest nazwą makra specyfikującego "
+"W dyrektywie numer %u oznaczenie po '<' nie jest nazwą makra specyfikującego "
 "format. Poprawne nazwy makr są podane w rozdziale 7.8.1 ISO C 99."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "W dyrektywie numer %u oznaczenie po „<” nie jest zakończone przez „>”."
+msgstr "W dyrektywie numer %u oznaczenie po '<' nie jest zakończone przez '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Napis odwołuje się do argumentu numer %u, ale ignoruje argument numer %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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”"
+msgstr "nie zgadza się liczba specyfikacji formatu w '%s' i w '%s'"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "W dyrektywie numer %u po „{” nie występuje numer argumentu."
+msgstr "W dyrektywie numer %u po '{' nie występuje numer argumentu."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "W dyrektywie numer %u po „,” nie występuje liczba."
+msgstr "W dyrektywie numer %u po ',' nie występuje liczba."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"Łańcuch kończy się w środku dyrektywy: znaleziono „{” bez odpowiadającego "
-"„}”."
+"Łańcuch kończy się w środku dyrektywy: znaleziono '{' bez odpowiadającego "
+"'}'."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Dyrektywa numer %u kończy się błędnym znakiem „%c” zamiast „}”."
+msgstr "Dyrektywa numer %u kończy się błędnym znakiem '%c' zamiast '}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Dyrektywa numer %u kończy się błędnym znakiem zamiast „}”."
+msgstr "Dyrektywa numer %u kończy się błędnym znakiem zamiast '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"Łańcuch zaczyna się w środku dyrektywy: znaleziono „}” bez odpowiadającego "
-"„{”."
+"Łańcuch zaczyna się w środku dyrektywy: znaleziono '}' bez odpowiadającego "
+"'{'."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Łańcuch zawiera samotny „}” po numerze dyrektywy %u."
+msgstr "Łańcuch zawiera samotny '}' po numerze dyrektywy %u."
 
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "Błędne połączenie flag w dyrektywie numer %u."
+msgstr "Błędny połączenie flag w dyrektywie numer %u."
 
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
-"W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed „%c”."
+"W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed '%c'."
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -457,7 +407,7 @@
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed „%c”."
+"W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -467,27 +417,17 @@
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "W dyrektywie numer %u flagi nie są dozwolone przed „%c”."
+msgstr "W dyrektywie numer %u flagi nie są dozwolone przed '%c'."
 
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "„%s” zawiera %%m, a „%s” nie"
+msgstr "'%s' zawiera %%m, a '%s' nie"
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "„%s” nie zawiera %%m, a „%s” zawiera %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "„%s” zawiera %%C, ale „%s” nie"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "„%s” nie zawiera %%C, a „%s” zawiera %%C"
+msgstr "'%s' nie zawiera %%m, a '%s' zawiera %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -532,7 +472,7 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"W dyrektywie numer %u znak „%c” nie jest poprawną specyfikacją konwersji."
+"W dyrektywie numer %u znak '%c' nie jest poprawną specyfikacją konwersji."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -586,27 +526,27 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"W dyrektywie numer %u wybór zawiera liczbę, po której nie występuje „<”, „#” "
-"ani „%s”."
+"W dyrektywie numer %u wybór zawiera liczbę, po której nie występuje '<', '#' "
+"ani '%s'."
 
 #: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"specyfikacja formatu dla argumentu {%u} obecna w „%s” nie istnieje w „%s”"
+"specyfikacja formatu dla argumentu {%u} obecna w '%s' nie istnieje w '%s'"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "specyfikacja formatu dla argumentu {%u} nie istnieje w „%s”"
+msgstr "specyfikacja formatu dla argumentu {%u} nie istnieje w '%s'"
 
 #: src/format-java.c:776
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"specyfikacje formatu w „%s” i w „%s” dla argumentu {%u} nie są takie same"
+"specyfikacje formatu w '%s' i w '%s' dla argumentu {%u} nie są takie same"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -615,7 +555,7 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"W dyrektywie numer %u parametr %u jest typu „%s” zamiast oczekiwanego „%s”."
+"W dyrektywie numer %u parametr %u jest typu '%s' zamiast oczekiwanego '%s'."
 
 # plural
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
@@ -636,7 +576,7 @@
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "W dyrektywie numer %u po „%c” nie występuje cyfra."
+msgstr "W dyrektywie numer %u po '%c' nie występuje cyfra."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
@@ -652,7 +592,7 @@
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Znaleziono „~%c” bez odpowiadającego „~%c”."
+msgstr "Znaleziono '~%c' bez odpowiadającego '~%c'."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
@@ -665,13 +605,13 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"W dyrektywie numer %u po „~:[” nie występują dwa wyrażenia oddzielone przez "
-"„~;”."
+"W dyrektywie numer %u po '~:[' nie występują dwa wyrażenia oddzielone przez "
+"'~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "W dyrektywie numer %u „~;” jest użyte w złym miejscu."
+msgstr "W dyrektywie numer %u '~;' jest użyte w złym miejscu."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
@@ -680,12 +620,12 @@
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "specyfikacje formatu w „%s” i w „%s” nie są równoważne"
+msgstr "specyfikacje formatu w '%s' i w '%s' nie są równoważne"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "specyfikacje formatu w „%s” nie są podzbiorem tych z „%s”"
+msgstr "specyfikacje formatu w '%s' nie są podzbiorem tych z '%s'"
 
 #: src/format-perl.c:433
 #, c-format
@@ -694,14 +634,12 @@
 "conversion specifier '%c'."
 msgstr ""
 "W dyrektywie numer %u specyfikacja rozmiaru jest niezgodna ze specyfikacją "
-"konwersji „%c”."
+"conwersji '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "specyfikacja formatu dla argumentu „%s” nie istnieje w „%s”"
+msgstr "specyfikacja formatu dla argumentu '%s' nie istnieje w '%s'"
 
 #: src/format-python.c:115
 msgid ""
@@ -715,14 +653,14 @@
 #, 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."
+"Łańcuch odwołuje się do argumentu o nazwie '%s' na niekompatybilne sposoby."
 
 #: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"specyfikacje formatu w „%s” potrzebują mapowania, a te w „%s” potrzebują "
+"specyfikacje formatu w '%s' potrzebują mapowania, a te w '%s' potrzebują "
 "krotki"
 
 #: src/format-python.c:437
@@ -730,7 +668,7 @@
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"specyfikacje formatu w „%s” potrzebują krotki, a te w „%s” potrzebują "
+"specyfikacje formatu w '%s' potrzebują krotki, a te w '%s' potrzebują "
 "mapowania"
 
 #: src/format-python.c:460 src/format-sh.c:297
@@ -738,42 +676,14 @@
 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”"
+"specyfikacja formatu dla argumentu '%s', obecna w '%s', nie istnieje w '%s'"
 
 #: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"specyfikacje formatu w „%s” i w „%s” dla argumentu „%s” nie są takie same"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"W dyrektywie numer %u w specyfikacji formatu nie może być więcej poziomów "
-"zagłębień."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "W dyrektywie numer %u jest niezakończona dyrektywa formatu."
+"specyfikacje formatu w '%s' i w '%s' dla argumentu '%s' nie są takie same"
 
 #: src/format-qt.c:152
 #, c-format
@@ -781,7 +691,7 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"„%s” jest w prostym formacie, a „%s” nie jest: zawiera flagę „L” albo "
+"'%s' jest w prostym formacie, a '%s' nie jest: zawiera flagę 'L' albo "
 "dwucyfrową liczbę argumentów"
 
 #: src/format-sh.c:79
@@ -815,7 +725,7 @@
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "W dyrektywie numer %u znak „%c” nie jest cyfrą od 1 do 9."
+msgstr "W dyrektywie numer %u znak '%c' nie jest cyfrą od 1 do 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -824,11 +734,11 @@
 "1 and 9."
 msgstr "Znak kończący dyrektywę %u nie jest cyfrą od 1 do 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -841,58 +751,58 @@
 "To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
 "Autorzy NIE DAJĄ GWARANCJI, na ile pozwala na to prawo.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Program napisał %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "za dużo argumentów"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Napisz „%s --help” żeby otrzymać więcej informacji.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Polecenie `%s --help' poda więcej informacji.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Składnia: %s [OPCJA]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Wypisanie nazwy komputera.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format wyjścia:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 krótka nazwa komputera\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -903,34 +813,34 @@
 "nazwę\n"
 "                                domeny i aliasy\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy komputera\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informacje:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, 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/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
@@ -939,41 +849,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 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/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "nie można odczytać nazwy komputera"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dozwolony najwyżej jeden plik wejściowy"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s i %s wzajemnie się wykluczają"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -982,65 +894,65 @@
 "Filtrowanie komunikatów z katalogu tłumaczeń zgodnie z ich atrybutami oraz\n"
 "manipulowanie atrybutami.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
+"Argumenty obowiązkowe dla opcji długich są obowiązkowe także dla krótkich.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Położenie pliku wejściowego:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  PLIK-WEJŚCIOWY              wczytanie pliku PO\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=KATALOG     dodanie KATALOGU do listy poszukiwania plików\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Jeśli nie podano pliku wejściowego lub plik to -, czytane jest standardowe\n"
 "wejście.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Położenie pliku wyjściowego:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1050,95 +962,85 @@
 "podany\n"
 "plik to -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Wybór komunikatów:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            zachowanie przetłumaczonych, usunięcie\n"
-"                                nieprzetłumaczonych\n"
+"      --translated            zachowanie przetłumaczonych, usunięcie nie\n"
+"                                przetłumaczonych\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          zachowanie nieprzetłumaczonych, usunięcie\n"
+"      --untranslated          zachowanie nie przetłumaczonych, usunięcie\n"
 "                                przetłumaczonych\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
-"      --no-fuzzy              usunięcie komunikatów oznaczonych „fuzzy”\n"
+"      --no-fuzzy              usunięcie komunikatów oznaczonych 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
-"      --only-fuzzy            zachowanie komunikatów oznaczonych „fuzzy”\n"
+"      --only-fuzzy            zachowanie komunikatów oznaczonych 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 "      --no-obsolete           usunięcie przestarzałych komunikatów #~\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         zachowanie przestarzałych komunikatów #~\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulowanie atrybutami:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             oznaczenie wszystkich komunikatów jako "
-"„fuzzy”\n"
+"'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           oznaczenie wszystkich komunikatów jako\n"
-"                                nie-„fuzzy”\n"
+"                                nie-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          oznaczenie wszystkich komunikatów jako\n"
 "                                przestarzałe\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        oznaczenie wszystkich komunikatów jako nie\n"
 "                                przestarzałe\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              zachowanie poprzednich identyfikatorów\n"
-"                              przetłumaczonych komunikatów przy zaznaczaniu\n"
-"                              jako „fuzzy”\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1147,60 +1049,51 @@
 "      --clear-previous        usunięcie \"previous msgid\" z wszystkich "
 "komunikatów\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 zmiana zawartości msgstr na pustą przy "
-"usuwaniu\n"
-"                                komunikatów oznaczonych „fuzzy”\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=PLIK.po     modyfikacja tylko wpisów obecnych w PLIKU.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=PLIK.po   modyfikacja tylko wpisów nieobecnych w PLIKU."
+"      --ignore-file=PLIK.po   modyfikacja tylko wpisów nie obecnych w PLIKU."
 "po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonim dla --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonim dla --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Składnia pliku wejściowego:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      plik wejściowy ma składnię .properties Javy\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1209,17 +1102,17 @@
 "      --stringtable-input     plik wejściowy ma składnię .string z\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Szczegóły dotyczące wyjścia:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1231,21 +1124,21 @@
 "tekstu\n"
 "      --color=WARUNEK         używanie kolorów i innych atrybutów jeżeli\n"
 "                              zachodzi WARUNEK, który może mieć wartości:\n"
-"                              „always” (zawsze), „never” (nigdy), „auto” "
+"                              'always' (zawsze), 'never' (nigdy), 'auto' "
 "albo\n"
-"                              „html”.\n"
+"                              'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1253,9 +1146,9 @@
 "  -e, --no-escape             nie używanie sekwencji C na wyjściu "
 "(domyślne)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1263,37 +1156,37 @@
 "  -E, --escape                używanie sekwencji C, bez znaków "
 "rozszerzonych\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           nie zapisywanie linii „#: plik:linia”\n"
+msgstr "      --no-location           nie zapisywanie linii '#: plik:linia'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          generowanie linii „#: plik:linia” (domyślne)\n"
+"  -n, --add-location          generowanie linii '#: plik:linia' (domyślne)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1301,33 +1194,33 @@
 "      --strict                zapisanie pliku .po ściśle zgodnego z "
 "Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1337,32 +1230,32 @@
 "dłuższych\n"
 "                                niż szerokość strony\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generowanie posortowanego wyjścia\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "podane niemożliwe kryteria selekcji (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1371,37 +1264,38 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Łączenie i zespalanie podanych plików PO.\n"
 "Znajduje komunikaty wspólne dla dwóch lub więcej podanych plików PO.\n"
 "Można zażądać większego uwspólnienia przed wypisaniem komunikatów używając\n"
 "opcji --more-than. Odpowiednio opcja --less-than może być użyta dla ustalenia\n"
 "mniejszego uwspólnienia pomiędzy komunikatami (np. --less-than=2 wypisze tylko\n"
-"unikalne komunikaty). Tłumaczenia, komentarze tłumaczeń, wydobyte komentarze\n"
-"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"
+"unikalne komunikaty). Tłumaczenia, komentarze tłumaczeń i wydobyte zostaną\n"
+"zgromadzone, chyba że zostanie podana opcja --use-first, wtedy będą skopiowane\n"
+"tylko z pierwszego definiującego je pliku PO. Pozycje w plikach dla wszystkich\n"
+"plików PO zostaną zgromadzone.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  PLIK-WEJŚCIOWY ...          pliki wejściowe\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1411,7 +1305,7 @@
 "                                mniejszą od LICZBY, domyślnie "
 "nieskończoności\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1420,7 +1314,7 @@
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
 "                                większą od LICZBY, domyślnie 1\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1429,8 +1323,8 @@
 "  -u, --unique                skrót dla --less-than=2, żądanie wypisania\n"
 "                                wyłącznie unikalnych komunikatów\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1438,8 +1332,8 @@
 "  -P, --properties-input      pliki wejściowe mają składnię .properties "
 "Javy\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1448,42 +1342,42 @@
 "      --stringtable-input     pliki wejściowe mają składnię .strings\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAZWA         kodowanie dla wyjścia\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             użycie pierwszego dostępnego tłumaczenia\n"
+"      --use-first             użycie pierwszego dostępnego tłumaczenia dla\n"
 "                                każdego komunikatu zamiast łączenia wielu\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=NAZWA_KATALOGU   ustawienie pola „Language” w nagłówku\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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "nie podano plików wejściowych"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "wymagane są dokładnie dwa pliki wejściowe"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Składnia: %s [OPCJA] def.po ref.pot\n"
@@ -1516,12 +1410,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odniesienia do źródeł\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modyfikatory operacji:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1530,7 +1424,7 @@
 "  -m, --multi-domain          zastosowanie ref.pot dla wszystkich domen def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     nie używanie dopasowywania rozmytego\n"
@@ -1545,39 +1439,40 @@
 #: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      użycie nieprzetłumaczonych komunikatów\n"
+msgstr ""
+"      --use-untranslated      użycie nie przetłumaczonych komunikatów\n"
 
 #: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
-msgstr "ten komunikat jest nieprzetłumaczony"
+msgstr "uwaga: ten komunikat nie jest przetłumaczony"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "ten komunikat powinien być sprawdzony przez tłumacza"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany..."
+msgstr "ten komunikat jest użyty, ale nie zdefiniowany..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale ta definicja jest podobna"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany w %s"
+msgstr "ten komunikat jest użyty, ale nie zdefiniowany w %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "uwaga: ten komunikat nie został użyty"
+msgstr "uwaga: ten komunikat nie jest użyty"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1585,12 +1480,12 @@
 msgstr[1] "znaleziono %d błędy krytyczne"
 msgstr[2] "znaleziono %d błędów krytycznych"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "muszą być podane przynajmniej dwa pliki"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1598,7 +1493,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1606,11 +1501,11 @@
 "Można zażądać większego uwspólnienia przed wypisaniem komunikatów używając\n"
 "opcji --more-than. Odpowiednio opcja --less-than może być użyta dla ustalenia\n"
 "mniejszego uwspólnienia pomiędzy komunikatami (np. --less-than=2 wypisze tylko\n"
-"unikalne komunikaty). Tłumaczenia, komentarze tłumaczeń i wydobyte komentarze\n"
-"zostaną zachowane, ale tylko z pierwszego definiującego je pliku PO. Pozycje\n"
-"w plikach dla wszystkich plików PO zostaną zgromadzone.\n"
+"unikalne komunikaty). Tłumaczenia, komentarze tłumaczeń i wydobyte zostaną\n"
+"zachowane, ale tylko z pierwszego definiującego je pliku PO. Pozycje w plikach\n"
+"dla wszystkich plików PO zostaną zgromadzone.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1619,73 +1514,73 @@
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
 "                                większą od LICZBY, domyślnie 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           nie zapisywanie nagłówka z wpisem „msgid "
-"\"\"”\n"
+"      --omit-header           nie zapisywanie nagłówka z wpisem `msgid "
+"\"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konwersja katalogu tłumaczeń na inne kodowanie znaków.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cel konwersji:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Domyślnym kodowaniem jest kodowanie dla aktualnej lokalizacji.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 "  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           pominięcie linii „#: plik:linia”\n"
+msgstr "      --no-location           pominięcie linii '#: plik:linia'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          zachowanie linii „#: plik:linia” (domyślne)\n"
+"  -n, --add-location          zachowanie linii '#: plik:linia' (domyślne)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                zapisanie pliku .po ściśle zgodnego z "
 "Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nie podano nazwy pliku wejściowego"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "wymagany jest dokładnie jeden plik wejściowy"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Składnia: %s [OPCJA] PLIK-WEJŚCIOWY\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1695,10 +1590,10 @@
 msgstr ""
 "Tworzy plik tłumaczeń angielskich. Plikiem wejściowym jest ostatnio\n"
 "tworzony angielski plik PO lub plik PO Template (zazwyczaj stworzony przez\n"
-"xgettext). Nieprzetłumaczonym wpisom są przypisywane tłumaczenia identyczne\n"
+"xgettext). Nie przetłumaczonym wpisom są przypisywane tłumaczenia identyczne\n"
 "z msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  PLIK-WEJŚCIOWY              plik wejściowy PO lub POT\n"
@@ -1734,10 +1629,10 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Specjalne wbudowane polecenie o nazwie „0” wypisuje tłumaczenie zakończone\n"
-"bajtem 0. Wyjście „msgexec 0” może być wejściem dla „xargs -0”.\n"
+"Specjalne wbudowane polecenie o nazwie '0' wypisuje tłumaczenie zakończone\n"
+"bajtem 0. Wyjście \"msgexec 0\" może być wejściem dla \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=PLIK-WEJŚCIOWY  plik wejściowy PO\n"
@@ -1747,28 +1642,33 @@
 msgid "write to stdout failed"
 msgstr "pisanie na standardowe wyjście nie powiodło się"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "pisanie do podprocesu %s nie powiodło się"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "brak nazwy filtru"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musi być podany przynajmniej jeden skrypt seda"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Składnia: %s [OPCJA] FILTR [OPCJA-FILTRA]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Zastosowanie filtru na wszystkich tłumaczeniach z katalogu tłumaczeń.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1777,19 +1677,19 @@
 "FILTR może być dowolnym programem czytającym tłumaczenie ze standardowego\n"
 "wejścia i wypisującym zmodyfikowane tłumaczenie na standardowym wyjściu.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Przydatne OPCJE-FILTRA jeśli FILTREM jest „sed”:\n"
+msgstr "Przydatne OPCJE-FILTRA jeśli FILTREM jest 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expresion=SKRYPT      dodanie SKRYPTU do wykonywanych poleceń\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1800,13 +1700,13 @@
 "wykonywanych\n"
 "                                poleceń\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       nie wypisywanie zawartości wzorca\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1814,83 +1714,62 @@
 "      --no-escape             nie używanie sekwencji C na wyjściu "
 "(domyślne)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                zapisanie pliku w stylu z wcięciami\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           zachowanie nagłówka z pominięciem filtra\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "argument %s powinien być pojedynczym znakiem przestankowym"
+msgstr "argument dla %s powinien być pojedynczym znakiem przestankowym"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s wymaga podania \"-d katalog\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s wymaga podania \"-l lokalizacja\""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s wymaga podania \"--template wzorzec\""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s wymaga podania \"-o plik\""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s i %s wykluczają się wzajemnie w %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s jest prawidłowe tylko z %s lub %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s jest prawidłowe tylko z %s, %s albo z %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1898,7 +1777,7 @@
 msgstr[1] "%d przetłumaczone komunikaty"
 msgstr[2] "%d przetłumaczonych komunikatów"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1906,45 +1785,45 @@
 msgstr[1] ", %d tłumaczenia budzą wątpliwości"
 msgstr[2] ", %d tłumaczeń budzi wątpliwości"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d nieprzetłumaczony komunikat"
-msgstr[1] ", %d nieprzetłumaczone komunikaty"
-msgstr[2] ", %d nieprzetłumaczonych komunikatów"
+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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Składnia: %s [OPCJA] nazwa-pliku.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
+"Argumenty obowiązkowe dla długich opcji są obowiązkowe także dla krótkich.\n"
 "Podobnie dla argumentów opcjonalnych.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nazwa-pliku.po ...          pliki wejściowe\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Tryb działania:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1953,7 +1832,7 @@
 "  -j, --java                  tryb Javy: generowanie klas Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1961,12 +1840,12 @@
 msgstr ""
 "      --java2                 jak --java dla Javy 2 (JDK 1.2 i nowsze)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1975,51 +1854,44 @@
 "      --csharp-resources      tryb zasobów C#: generowanie pliku .resources ."
 "NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    tryb Qt: generowanie pliku .qm\n"
-
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
-"      --desktop               tryb Elementu Pulpitu: generowanie pliku ."
-"desktop\n"
+"      --qt                    tryb Qt: generowanie pliku .qm formatu Qt\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                włączenie trybu ścisłej zgodności z Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie Javy:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZASÓB        nazwa zasobu\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2027,21 +1899,14 @@
 msgstr ""
 "  -l, --locale=LOKALIZACJA    nazwa lokalizacji - język lub język_KRAJ\n"
 
-#: src/msgfmt.c:829
-#, 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:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2054,12 +1919,12 @@
 "Klasa\n"
 "jest zapisywana w podanym katalogu.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2068,7 +1933,7 @@
 "  -d KATALOG                  katalog bazowy plików .dll zależnych od "
 "locale\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2078,18 +1943,18 @@
 "podanego\n"
 "katalogu, którego nazwa zależy od locale.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2097,48 +1962,12 @@
 msgstr ""
 "Opcje -l i -d są obowiązkowe. Plik .msg jest zapisywany w podanym katalogu.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Opcje trybu Elementu Pulpitu (Desktop Entry):\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d KATALOG                  bazowy katalog plików .po\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Opcje -l, -o i --template są obowiązkowe. Jeżeli podana jest opcja -D, "
-"pliki\n"
-"wejściowe są szukane w podanym katalogu zamiast pośród argumentów "
-"polecenia.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacja pliku wejściowego:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2149,14 +1978,14 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2165,7 +1994,7 @@
 "      --check-header          sprawdzenie obecności i zawartości wpisu "
 "nagłówka\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2174,7 +2003,7 @@
 "      --check-domain          sprawdzenie konfliktów między dyrektywami\n"
 "                                dotyczącymi domeny i opcją --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2183,7 +2012,7 @@
 "  -C, --check-compatibility   kontrola czy GNU msgfmt działa jak X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2194,13 +2023,13 @@
 "klawiszowych\n"
 "                                dla opcji w menu\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2209,20 +2038,7 @@
 "(domyślnie:\n"
 "                              %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=KOLEJBAJTÓW  zapisanie liczb 32-bitowych w podanej\n"
-"                                kolejności bajtów (big albo little, "
-"domyślna\n"
-"                                kolejność zależy od platformy\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2230,100 +2046,89 @@
 "      --no-hash               tworzenie pliku binarnego bez tablicy "
 "haszującej\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            wypisanie statystyk dotyczących tłumaczeń\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               zwiększenie ilości podawanych informacji\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, 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:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uwaga: nagłówek pliku PO jest niepewny (fuzzy)\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nazwa domeny \"%s\" nie jest odpowiednią nazwa pliku"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "dyrektywa „domain %s” zignorowana"
+msgid "`domain %s' directive ignored"
+msgstr "dyrektywa `domain %s' zignorowana"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "zignorowana pusta wartość „msgstr”"
+msgid "empty `msgstr' entry ignored"
+msgstr "zignorowana pusta wartość `msgstr'"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "zignorowana niepewna (fuzzy) wartość „msgstr”"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "zignorowana niepewna (fuzzy) wartość `msgstr'"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, 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:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s nie istnieje"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s istnieje, ale nie może zostać przeczytany"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "błąd w czasie czytania \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"opcja „%c” nie może być użyta przed podaniem „J”, „K”, „T”, „C” lub „X”"
+"opcja '%c' nie może być użyta przed podaniem 'J', 'K', 'T', 'C' lub 'X'"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2332,7 +2137,7 @@
 "Wyciągnięcie z katalogu tłumaczeń wszystkich komunikatów pasujących do podanego\n"
 "wzorca lub należących do podanego pliku źródłowego.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2377,10 +2182,10 @@
 "  [-C WZORZEC-KOMENTARZA] [-X WZORZEC-WYDOB-KOMENTARZA]\n"
 "Komunikat jest wybierany jeśli pochodzi z jednego z podanych plików\n"
 "źródłowych lub pochodzi z jednej z podanych domen,\n"
-"lub, jeśli podano -J i kontekst (msgctxt) pasuje do WZORCA-KONTEKST,\n"
+"lub, jeśli podano -J i kontekst (msgctxt) pasuje do WZORCA-KONTEKST\n"
 "lub, jeśli podano -K i klucz (msgid lub msgid_plural), pasuje do WZORCA-MSGID,\n"
 "lub, jeśli podano -T i to tłumaczenie (msgstr) pasuje do WZORCA-MSGSTR,\n"
-"lub, jeśli podano -C i komentarz tłumacza pasuje do WZORCA-KOMENTARZA,\n"
+"lub, jeśli podano -C i komentarz tłumacza pasuje do WZORCA-KOMENTARZA.\n"
 "lub, jeśli podano -X i wydobyty komentarz pasuje do WZORCA-WYDOB-KOMENTARZA.\n"
 "\n"
 "Jeśli podano więcej niż jedno kryterium wyboru, zbiór wybranych komunikatów\n"
@@ -2394,7 +2199,7 @@
 "\n"
 "  -N, --location=PLIK-ŹRÓDŁ   wybranie komunikatów wydobytych z PLIKU-ŹRÓDŁ\n"
 "  -M, --domain=DOMENA         wybranie komunikatów należących do DOMENY\n"
-"  -J, --msgctxt               początek wzorców dla msgctxt\n"
+"  -J, --msgctxt               początek wzorców msgctxt\n"
 "  -K, --msgid                 początek wzorców dla msgid\n"
 "  -T, --msgstr                początek wzorców dla msgstr\n"
 "  -C, --comment               początek wzorców dla komentarza tłumacza\n"
@@ -2407,7 +2212,7 @@
 "  -v, --invert-match          wypisanie tylko komunikatów, które nie pasują do\n"
 "                              kryteriów wyboru\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2415,18 +2220,18 @@
 "      --escape                używanie sekwencji C, bez znaków "
 "rozszerzonych\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generowanie posortowanego wyjścia\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          sortowanie wyjścia według położenia pliku\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2436,7 +2241,7 @@
 "środowiskową LANG zgodnie z opisem w pliku ABOUT-NLS. Jest to\n"
 "niezbędne do testowania tłumaczeń.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2447,12 +2252,12 @@
 "Proszę podać lokalizację za pomocą opcji --locale lub plik\n"
 "wyjściowy .po za pomocą opcji --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Utworzono %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2461,12 +2266,12 @@
 "Stworzenie nowego pliku PO, inicjalizując meta-informacje wartościami ze\n"
 "środowiska użytkownika.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input-PLIK-WEJŚCIOWY  plik wejściowy POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2477,12 +2282,12 @@
 "katalogu.\n"
 "Jeśli plik to -, czytane jest standardowe wejście.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=PLIK      zapisanie wyniku do podanego pliku PO\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2492,12 +2297,12 @@
 "ustawień lokalizacji użytkownika. Jeśli plik to -, wyniki są wypisywane na\n"
 "standardowym wyjściu.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=JJ_KK          ustawienie docelowej lokalizacji\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2505,7 +2310,7 @@
 "      --no-translator         uznanie, że plik PO jest generowany "
 "automatycznie\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2513,12 +2318,12 @@
 "Znaleziono więcej niż jeden plik .pot.\n"
 "Proszę podać plik .pot za pomocą opcji --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "błąd podczas czytania bieżącego katalogu"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2526,14 +2331,14 @@
 "Nie znaleziono pliku .pot w katalogu bieżącym.\n"
 "Proszę podać plik .pot za pomocą opcji --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zawiódł z kodem wyjścia %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2549,7 +2354,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Polskie tłumaczenia dla pakietu %s"
@@ -2567,17 +2372,17 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
-"plik wejściowy „%s” nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
+"plik wejściowy `%s' nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"domena \"%s\" w pliku wejściowym „%s” nie zawiera wpisu nagłówka ze "
+"domena \"%s\" w pliku wejściowym `%s' nie zawiera wpisu nagłówka ze "
 "specyfikacją zestawu znaków"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
@@ -2586,8 +2391,8 @@
 msgstr "docelowy zestaw znaków \"%s\" nie jest przenośną nazwą kodowania."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "uwaga: "
@@ -2624,7 +2429,7 @@
 "Konwersja pliku %s z kodowania %s do kodowania %s\n"
 "zmienia niektóre identyfikatory msgid albo msgctxt.\n"
 "Zmień wszystkie identyfikatory msgid i msgctxt tak, żeby były wyłącznie\n"
-"w ASCII albo upewnij się, że są od początku, już w plikach źródłowych,\n"
+"w ASCII albo upewnij się, że są od początku, już w plikach źródłówych,\n"
 "zakodowane w UTF-8.\n"
 
 #: src/msgl-charset.c:93
@@ -2637,7 +2442,7 @@
 msgstr ""
 "Lokalny zestaw znaków \"%s\" jest różny od\n"
 "zestawu znaków pliku wejściowego \"%s\".\n"
-"Wyjście „%s” może być niepoprawne.\n"
+"Wyjście '%s' może być niepoprawne.\n"
 "Możliwe obejścia problemu to:\n"
 
 #: src/msgl-charset.c:100
@@ -2652,9 +2457,9 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Przekonwertowanie katalogu tłumaczeń do %s przy użyciu „msgconv”,\n"
-"  potem wykonanie „%s”,\n"
-"  a następnie przekonwertowanie z powrotem do %s przy użyciu „msgconv”.\n"
+"- Przekonwertowanie katalogu tłumaczeń do %s przy użyciu 'msgconv',\n"
+"  a następnie wykonanie '%s',\n"
+"  a następnie przekonwertowanie z powrotem do %s przy użyciu 'msgconv'.\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2665,9 +2470,9 @@
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 "- Ustawienie LC_ALL na lokalizację z kodowaniem %s,\n"
-"  przekonwertowanie katalogu tłumaczeń do %s przy użyciu „msgconv”,\n"
-"  potem wykonanie „%s”,\n"
-"  a następnie przekonwertowanie z powrotem do %s przy użyciu „msgconv”.\n"
+"  przekonwertowanie katalogu tłumaczeń do %s przy użyciu 'msgconv',\n"
+"  a następnie wykonanie '%s',\n"
+"  a następnie przekonwertowanie z powrotem do %s przy użyciu 'msgconv'.\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2677,7 +2482,7 @@
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 "Lokalny zestaw znaków \"%s\" nie jest przenośną nazwą kodowania.\n"
-"Wyjście „%s” może być niepoprawne.\n"
+"Wyjście '%s' może być niepoprawne.\n"
 "Możliwym obejściem problemu jest ustawienie LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
@@ -2713,32 +2518,32 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Proszę spróbować tego, poprawnego dla %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalog komunikatów zawiera tłumaczenia form mnogich"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ale wpis nagłówka nie ma atrybutu \"plural=WYRAŻENIE\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ale wpis nagłówka nie ma atrybutu \"nplurals=LICZBA\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "błędna wartość nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "błędne wyrażenie do wyliczania liczby mnogiej"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2746,7 +2551,7 @@
 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:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2754,7 +2559,7 @@
 msgstr[1] "ale niektóre komunikaty mają %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty mają %lu form mnogich"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2762,55 +2567,64 @@
 "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:611
-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:602
+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:619
+#: src/msgl-check.c:610
 #, 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”`"
+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:634
-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:625
+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:652
-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:643
+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:660
+#: src/msgl-check.c:651
 #, 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”"
+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:675
-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:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "obsługa form mnogich jest rozszerzeniem gettexta GNU"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego „%c”"
+msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr zawiera zbyt dużo oznaczeń skrótów klawiszowych „%c”"
+msgstr "msgstr zawiera zbyt dużo oznaczeń skrótów klawiszowych '%c'"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, 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"
+msgid "header field `%s' missing in header\n"
+msgstr "w nagłówku brakuje pola '%s'\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "w nagłówku brakuje pola „%s”\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "pole nagłówka `%s' powinno się zaczynać na początku linii\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "niektóre pola nagłówka nadal zawierają początkowe wartości domyślne\n"
+
+#: src/msgl-check.c:826
+#, 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-iconv.c:65
 #, c-format
@@ -2827,8 +2641,8 @@
 msgstr ""
 "plik wejściowy nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2846,8 +2660,8 @@
 "Konwersja z \"%s\" do \"%s\" wprowadza duplikaty: niektóre różniące się "
 "msgid stają się identyczne."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2856,16 +2670,16 @@
 "Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(). Ta "
 "wersja została zbudowana bez iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s jest prawidłowe tylko z %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "typ zapasowy"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2885,20 +2699,20 @@
 "ostatnio utworzonym plikiem PO Template (zwykle tworzonym przez xgettext),\n"
 "tłumaczenia i komentarze w nim zawarte będą zignorowane, ale komentarze z\n"
 "kropką i pozycje w plikach będą zachowane. Tam, gdzie nie można dopasować\n"
-"dokładnie, używane jest dopasowanie rozmyte dla lepszych wyników.\n"
+"dokładnie, używane jest dopasowanie rozmyte, dla lepszych wyników.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      tłumaczenia odnoszące się do starych źródeł\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odniesienia do nowych źródeł\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2907,7 +2721,7 @@
 "  -C, --compendium=PLIK       dodatkowa biblioteka tłumaczeń komunikatów,\n"
 "                                może być podana więcej niż raz\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2916,28 +2730,28 @@
 "  -U, --update                uaktualnienie def.po, nie wykonywanie\n"
 "                                niczego jeśli def.po jest już aktualny\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie uaktualniania:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Wynik jest zapisywany z powrotem do def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROLA       utworzenie kopii zapasowej def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=KOŃCÓWKA       zmiana domyślnej końcówki kopii zapasowej\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2957,17 +2771,17 @@
 "  existing, nil   numerowanie jeśli istnieją numerowane, proste jeśli nie\n"
 "  simple, never   tworzenie zawsze prostych kopii zapasowych\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Końcówka nazwy kopii zapasowej to „~”, o ile nie ustawiono przez --suffix\n"
-"lub zmienną środowiskową SIMPLE_BACKUP_SUFFIX.\n"
+"Końcówka kopii zapasowej to `~', o ile nie ustawiono przez --suffix lub\n"
+"zmienną środowiskową SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2975,22 +2789,22 @@
 "      --previous              zachowanie poprzednich identyfikatorów\n"
 "                                przetłumaczonych komunikatów\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       pominięcie znaczników postępu\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ten komunikat powinien definiować formy mnogie"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ten komunikat nie powinien definiować form mnogich"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2999,7 +2813,7 @@
 "%sPrzeczytane %ld starych + %ld odnośników, %ld dołączonych, %ld "
 "niedokładnych, %ld brakujących, %ld przestarzałych.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3113,7 +2927,7 @@
 msgstr ""
 "      --strict                zapisanie pliku ściśle zgodnego z Uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3135,12 +2949,12 @@
 "w plikach zostaną zgromadzone. W przypadku użycia opcji --unique, duplikaty\n"
 "zostaną usunięte.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              wypisanie tylko duplikatów\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3162,7 +2976,7 @@
 "Zestaw znaków \"%s\" nie jest przenośną nazwą kodowania.\n"
 "Przekodowanie na zestaw znaków użytkownika może nie działać.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3171,7 +2985,7 @@
 "Kodowanie \"%s\" nie jest obsługiwane. %s opiera się na iconv(),\n"
 "a iconv() nie obsługuje \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3179,15 +2993,15 @@
 "Problem można rozwiązać instalując libiconv GNU i instalując\n"
 "ponownie gettext GNU.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Kontynuacja mimo wszystko, można oczekiwać błędów analizy składni."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Kontynuacja mimo wszystko."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3196,7 +3010,7 @@
 "Kodowanie \"%s\" nie jest obsługiwane. %s opiera się na iconv().\n"
 "Ta wersja została skompilowana bez iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3209,27 +3023,27 @@
 msgid "inconsistent use of #~"
 msgstr "niekonsekwentne użycie #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "brak części „msgstr[]”"
+msgid "missing `msgstr[]' section"
+msgstr "brak częsci `msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "brak części „msgstr_plural”"
+msgid "missing `msgid_plural' section"
+msgstr "brak częsci `msgstr_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "brak części „msgstr”"
+msgid "missing `msgstr' section"
+msgstr "brak częsci `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "pierwsza forma mnoga ma niezerowy indeks"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma mnoga ma zły indeks"
@@ -3239,7 +3053,7 @@
 msgid "too many errors, aborting"
 msgstr "za dużo błędów, przerwanie wykonywania"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "błędna sekwencja wielobajtowa"
@@ -3283,16 +3097,16 @@
 msgid "context separator <EOT> within string"
 msgstr "separator kontekstu <EOT> wewnątrz napisu"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ten plik nie może zawierać dyrektyw domain"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "podwójna definicja komunikatu"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "to jest położenie pierwszej definicji"
 
@@ -3314,7 +3128,7 @@
 #: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "plik \"%s\" zawiera napis niezakończony znakiem NUL pod %s"
+msgstr "plik \"%s\" zawiera napis nie zakończony znakiem NUL pod %s"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3334,11 +3148,11 @@
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "uwaga: błąd składniowy, oczekiwano „;” po napisie"
+msgstr "uwaga: błąd składniowy, oczekiwano ';' po napisie"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "uwaga: błąd składniowy, oczekiwano „=” albo „;” po napisie"
+msgstr "uwaga: błąd skłądniowy, oczekiwano '=' albo ';' po napisie"
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -3351,7 +3165,7 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Danilo Šegana"
+msgstr "Danilo Segana"
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
@@ -3367,12 +3181,12 @@
 "Tekst wejściowy jest czytany ze standardowego wejścia. Tekst przekształcony\n"
 "jest wysyłany do standardowego wyjścia.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "dane wejściowe są błędne jeżeli kodowanie to \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "błąd w czasie zmiany kodowania z \"%s\" na \"%s\""
@@ -3396,21 +3210,11 @@
 "Pobranie i wypisanie zawartości URL-a. Jeśli URL jest niedostępny, używany jest\n"
 "lokalnie dostępny PLIK.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "błąd czytania \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "błąd podczas pisania na standardowe wyjście"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "błąd po przeczytaniu \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3447,8 +3251,8 @@
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"katalog komunikatów ma tłumaczenia zależne od kontekstu, ale nie mogą być "
-"zapisane w podanym formacie wyjściowym."
+"katalog komunikatów ma formy mnogie, ale nie mogą być zapisane w podanym "
+"formacie wyjściowym."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3491,18 +3295,18 @@
 msgid "compilation of C# class failed"
 msgstr "kompilacja klasy C# nie udała się"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "niepoprawna nazwa klasy Javy: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilacja klasy Javy nie udała się, proszę ustawić $JAVAC"
@@ -3512,18 +3316,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "błąd otwarcia \"%s\" do pisania"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "błędna sekwencja wielobajtowa"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "umiędzynaradawiane komunikaty nie powinny zawierać sekwencji „\\%c”"
+"internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "umiędzynaradawiane komunikaty nie powinny zawierać sekwencji `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3536,7 +3335,7 @@
 "innego niż ty. Rozważ używanie w nazwach msgctxt wyłącznie znaków ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3589,7 +3388,7 @@
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 "katalog komunikatów ma tłumaczenia zależne od kontekstu,\n"
-"ale format .resources języka C# nie pozwala używać kontekstów\n"
+"ale format C# .resources nie pozwala używać kontekstów\n"
 
 #: src/write-resources.c:150
 msgid ""
@@ -3597,7 +3396,7 @@
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 "katalog komunikatów ma formy mnogie,\n"
-"ale format .resources języka C# nie pozwala ich używać\n"
+"ale katalog komunikatów C# nie pozwala ich używać\n"
 
 #: src/write-tcl.c:157
 msgid ""
@@ -3605,7 +3404,7 @@
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 "katalog komunikatów zawiera tłumaczenia zależne od kontekstu,\n"
-"ale format katalogu komunikatów Tcl-a nie pozwala używać kontekstów\n"
+"ale format katalogu komunikatów Tcl-a nie pozwala zmieniać kontekstów\n"
 
 #: src/write-tcl.c:176
 msgid ""
@@ -3615,7 +3414,7 @@
 "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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uwaga: niezakończony napis"
@@ -3625,22 +3424,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uwaga: niezakończone wyrażenie regularne"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "uwaga: błędny znak unikodowy"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uwaga: niezakończona stała znakowa"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Proszę podać kodowanie źródła przy pomocy --from-code ."
 
@@ -3650,7 +3444,7 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Błędna sekwencja wielobajtowa.\n"
+"%s:%d: Błędna sekwensja wielobajtowa.\n"
 "Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code .\n"
 
 #: src/x-csharp.c:285
@@ -3680,7 +3474,7 @@
 "%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: błąd iconv"
@@ -3694,7 +3488,7 @@
 "%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
 "Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uwaga: błędny znak unikodowy"
@@ -3707,29 +3501,19 @@
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: uwaga: znaleziono „)”, oczekiwano „}”"
+msgstr "%s:%d: uwaga: znaleziono ')', oczekiwano '}'"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: uwaga: znaleziono „}”, oczekiwano „)”"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Brakuje kontekstu dla łańcucha znaków wydobytego z elementu „%s”"
+msgstr "%s:%d: uwaga: znaleziono '}', oczekiwano ')'"
 
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Element główny <%s> nie jest dozwolony w prawidłowym pliku Glade"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3743,70 +3527,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: uwaga: niezakończony napis U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Proszę podać kodowanie źródła przy pomocy --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Błędna sekwencja wielobajtowa.\n"
-"Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Niekompletna długa sekwencja wielobajtowa.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Niekompletna sekwencja wielobajtowa na końcu pliku.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-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-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa RegExp"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: uwaga: %s nie jest dozwolone"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: uwaga: niezakończony element składniowy XML"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3842,7 +3562,7 @@
 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:278
+#: src/x-python.c:236
 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"
@@ -3850,18 +3570,18 @@
 "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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Błędna sekwencja wielobajtowa.\n"
+"%s:%d: Błędna sekwensja wielobajtowa.\n"
 "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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3873,7 +3593,7 @@
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3885,7 +3605,7 @@
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3897,7 +3617,7 @@
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3909,7 +3629,7 @@
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Nieznane kodowanie \"%s\". Użyte będzie kodowanie ASCII."
@@ -3938,38 +3658,28 @@
 "%s:%lu: uwaga: składnia $\"...\" nie jest używana ze względu na "
 "bezpieczeństwo; użyj eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa wyrażenia regularnego"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
+#: src/xgettext.c:769
 #, 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"
+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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3977,24 +3687,24 @@
 msgstr ""
 "  -d, --default-domain=NAZWA  użycie NAZWA.po (nie messages.po) dla wyjścia\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wybór języka pliku wejściowego:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4003,8 +3713,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NAZWA        rozpoznawanie podanego języka\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4012,15 +3721,14 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skrót dla --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4028,7 +3736,7 @@
 msgstr ""
 "Domyślnie język jest zgadywany na podstawie rozszerzenia pliku wejściowego.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4037,23 +3745,23 @@
 "      --from-code=NAZWA       kodowanie plików wejściowych\n"
 "                                (oprócz Pythona, Tcl-a, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4073,47 +3781,39 @@
 "kluczowym)\n"
 "                                w pliku wyjściowym\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcje specyficzne dla języka:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           wyciągnięcie wszystkich napisów\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (tylko języki C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (tylko języki C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kSŁOWO, --keyword=SŁOWO    dodatkowe słowo kluczowe do poszukiwania\n"
+"  -k, --keyword               bez używania domyślnych słów kluczowych\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4124,53 +3824,51 @@
 "numer\n"
 "                              ARG słowa kluczowego SŁOWO\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (tylko języki C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (tylko języki C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozpoznawanie napisów w formacie Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (tylko język C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozpoznawanie napisów w formacie KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4178,44 +3876,43 @@
 "      --debug                 więcej szczegółów o rozpoznawaniu formatów\n"
 "                              napisów\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapisanie pliku .properties Javy\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          pominięcie na wyjściu informacji o prawach FSF "
-"dla\n"
+"      --foreign-user          pominięcie na wyjściu copyrightu FSF dla\n"
 "                                zewnętrznych projektów\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4225,7 +3922,7 @@
 "  -m[NAPIS], --msgstr-prefix[=NAPIS]    użycie NAPISU lub \"\" jako\n"
 "                                przedrostka wpisów msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4236,7 +3933,7 @@
 "przyrostka\n"
 "                                wpisów msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4244,31 +3941,31 @@
 msgstr ""
 "Argument opcji --flag nie ma składni <keyword>:<argnum>:[pass-]<flag>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardowe wejście"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Znak nie-ASCII w %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, 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:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Napis nie-ASCII przy %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uwaga: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4277,7 +3974,7 @@
 "Chociaż %s jest użyte w formacie położenia napisu, %s nie jest prawidłowym "
 "formatem. Powód: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4286,7 +3983,7 @@
 "%s nie jest prawidłowym formatem napisu %s, mimo że jest tak zadeklarowany. "
 "Powód: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4294,13 +3991,13 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"Łańcuch formatu „%s” z nienazwanymi argumentami nie może być poprawnie "
+"Łańcuch formatu '%s' z nienazwanymi argumentami nie może być poprawnie "
 "przetłumaczony:\n"
 "Tłumacz nie może uporządkować argumentów.\n"
 "Rozważ użycie formatu z nazwami argumentów i mapowania zamiast\n"
 "zestawu argumentów.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4310,43 +4007,67 @@
 "gettext(\"\") zwraca wpis nagłówka z meta-informacjami,\n"
 "a nie pusty napis.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "niejednoznaczna specyfikacja argumentu słowa kluczowego „%.*s”"
+msgstr "niejednoznaczna specyfikacja argumentu słowa kluczowego '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "uwaga: brak kontekstu słowa kluczowego „%.*s”"
+msgstr "uwaga: brak kontekstu słowa kluczowego '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "uwaga: brak kontekstu dla mnogiego argumentu słowa kluczowego „%.*s”"
+msgstr "uwaga: brak kontekstu dla mnogiego argumentu słowa kluczowego '%.*s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "pomieszanie kontekstów między formą pojedynczą i mnogą"
+msgstr "pomieszanie kontekstów między formą pojedyńczą i mnogą"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "Opcja --msgid-bugs-address nie została podana.\n"
-"Jeśli jest używany plik „Makevars”, proszę podać w nim\n"
+"Jeśli jest używany plik `Makevars', proszę podać w nim\n"
 "zmienną MSGID_BUGS_ADDRESS; w przeciwnym wypadku proszę\n"
 "podać opcję --msgid-bugs-address z linii poleceń.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "nieznany język „%s”"
+msgid "language `%s' unknown"
+msgstr "nieznany język `%s'"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<nienazwany>"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: niedozwolona opcja -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "błąd DuplicateHandle, kod 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Jeszcze nie zaimplementowane."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "nie można ustawić nieblokującego we/wy dla podprocesu %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "komunikacja z podprocesem %s nie powiodła się"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "czytanie z podprocesu %s nie powiodło się"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "podproces %s zakończony z kodem wyjścia %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "pole `%s' ma nadal początkową wartość domyślną\n"
diff -Nru gettext-0.19.3/gettext-tools/po/POTFILES.in gettext-0.18.1.1/gettext-tools/po/POTFILES.in
--- gettext-0.19.3/gettext-tools/po/POTFILES.in	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/POTFILES.in	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1995, 1998, 2001-2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1998, 2001-2006 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]
@@ -8,7 +8,6 @@
 gnulib-lib/argmatch.c
 gnulib-lib/clean-temp.c
 gnulib-lib/closeout.c
-gnulib-lib/copy-acl.c
 gnulib-lib/copy-file.c
 gnulib-lib/csharpcomp.c
 gnulib-lib/csharpexec.c
@@ -19,10 +18,8 @@
 gnulib-lib/javaexec.c
 gnulib-lib/javaversion.c
 gnulib-lib/obstack.c
-gnulib-lib/pipe-filter-ii.c
+gnulib-lib/pipe.c
 gnulib-lib/quotearg.c
-gnulib-lib/set-acl.c
-gnulib-lib/spawn-pipe.c
 gnulib-lib/w32spawn.h
 gnulib-lib/wait-process.c
 gnulib-lib/xmalloc.c
@@ -34,25 +31,19 @@
 src/format-awk.c
 src/format-boost.c
 src/format-c.c
-src/format-c-parse.h
 src/format-csharp.c
 src/format-elisp.c
 src/format-gcc-internal.c
-src/format-gfc-internal.c
 src/format-invalid.h
 src/format-java.c
-src/format-javascript.c
 src/format-librep.c
 src/format-lisp.c
-src/format-lua.c
 src/format-pascal.c
 src/format-perl.c
 src/format-perl-brace.c
 src/format-php.c
 src/format-python.c
-src/format-python-brace.c
 src/format-qt.c
-src/format-qt-plural.c
 src/format-scheme.c
 src/format-sh.c
 src/format-tcl.c
@@ -105,10 +96,8 @@
 src/x-elisp.c
 src/x-glade.c
 src/x-java.c
-src/x-javascript.c
 src/x-librep.c
 src/x-lisp.c
-src/x-lua.c
 src/x-perl.c
 src/x-php.c
 src/x-po.c
@@ -118,7 +107,6 @@
 src/x-sh.c
 src/x-smalltalk.c
 src/x-tcl.c
-src/x-vala.c
 src/x-ycp.c
 src/xgettext.c
 src/user-email.sh.in
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/pt_BR.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/pt_BR.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/pt_BR.po gettext-0.18.1.1/gettext-tools/po/pt_BR.po
--- gettext-0.19.3/gettext-tools/po/pt_BR.po	2014-10-16 06:04:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/pt_BR.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,454 +1,381 @@
-# Brazilian Portuguese translation of the gettext messages
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
+# Brazilian Portuguese translation of the "gettext" messages
+# Copyright (C) 2001 Free Software Foundation, Inc.
 # Sandro Nunes Henrique <sandro@conectiva.com.br>, 1998
 # Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
-# Flávio Bruno Leitner <flavio@conectiva.com.br>, 2001.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
+# Fl�vio Bruno Leitner <flavio@conectiva.com.br>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext 0.10.36\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2001-04-03 08:25+02:00\n"
+"Last-Translator: Fl�vio Bruno Leitner <flavio@conectiva.com.br>\n"
+"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "argumento inválido %s para %s"
+msgstr ""
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "argumento ambíguo %s para %s"
+msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "Argumentos válidos são:"
+msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
-#, c-format
+#: gnulib-lib/clean-temp.c:335
+#, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"não foi possível localizar um diretório temporário, tente definir $TMPDIR"
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:339
-#, c-format
+#: gnulib-lib/clean-temp.c:349
+#, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "não foi possível criar um diretório temporário usando o modelo \"%s\""
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
-#, c-format
+#: gnulib-lib/clean-temp.c:445
+#, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "não foi possível remover arquivo temporário %s"
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "não foi possível remover diretório temporário %s"
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "erro de escrita"
-
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "preservando permissões para %s"
+msgstr ""
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "erro ao abrir %s para leitura"
+msgid "error while opening \"%s\" for reading"
+msgstr "erro ao abrir \"%s\" para leitura"
 
-#: gnulib-lib/copy-file.c:193
-#, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "não foi possível abrir arquivo backup %s para gravação"
+#: gnulib-lib/copy-file.c:74
+#, fuzzy, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "erro ao abrir o arquivo \"%s\" para grava��o"
 
-#: gnulib-lib/copy-file.c:197
-#, c-format
-msgid "error reading %s"
-msgstr "erro ao ler %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, fuzzy, c-format
+msgid "error reading \"%s\""
+msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/copy-file.c:201
-#, c-format
-msgid "error writing %s"
-msgstr "erro ao escrever %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, fuzzy, c-format
+msgid "error writing \"%s\""
+msgstr "erro ao gravar o arquivo \"%s\""
 
-#: gnulib-lib/copy-file.c:205
-#, c-format
-msgid "error after reading %s"
-msgstr "erro após leitura de %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, fuzzy, c-format
+msgid "error after reading \"%s\""
+msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
-msgstr "fdopen() falhou"
+msgstr ""
 
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "Compilador C# não encontrado, tente instalar pnet"
+msgstr ""
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "Máquina virtual C# não encontrada, tente instalar pnet"
+msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "subprocesso de %s falhou"
+msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opção \"%s\" é ambígua; possibilidades:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: op��o `%s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opção \"--%s\" não aceita um argumento\n"
+msgstr "%s: op��o `--%s' n�o aceita par�metros\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opção \"%c%s\" não aceita um argumento\n"
+msgstr "%s: op��o `%c%s' n�o aceita par�metros\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opção \"%s\" requer um argumento\n"
+msgstr "%s: op��o `%s' requer um argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opção não reconhecida \"--%s\"\n"
+msgstr "%s: op��o n�o reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opção não reconhecida \"%c%s\"\n"
+msgstr "%s: op��o n�o reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opção inválida -- \"%c\"\n"
+msgstr "%s: op��o inv�lida -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opção requer um argumento -- \"%c\"\n"
+msgstr "%s: op��o requer um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opção \"-W %s\" é ambígua\n"
+msgstr "%s: op��o `-W %s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opção \"-W %s\" não aceita um argumento\n"
+msgstr "%s: op��o `-W %s' n�o aceita par�metros\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opção \"-W %s\" requer um argumento\n"
+msgstr "%s: op��o `%s' requer um argumento\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "argumento source_version inválido para compile_java_class"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "argumento target_version inválido para compile_java_class"
+msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "falha ao criar \"%s\""
+msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"compilador de Java não encontrado, tente instalar gcj ou definir $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"máquina virtual Java não encontrada, tente instalar gij ou definir $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "erro de E/S no subprocesso de %s"
+msgstr ""
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr "memória insuficiente"
-
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "escrita para subprocesso %s falhou"
+msgstr "Mem�ria insuficiente"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "leitura do subprocesso %s falhou"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunicação com subprocesso %s falhou"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "subprocesso de %s terminado com código de saída %d"
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "\""
+msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "\""
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "não foi possível criar redirecionamento (pipe)"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle falhou"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "não foi possível restaurar fd %d dup2 falhou"
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "subprocesso de %s"
+msgstr ""
 
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "subprocesso de %s recebeu o sinal fatal %d"
-
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "erro ao abrir \"%s\" para leitura"
+msgstr ""
 
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"\"%s\" não é um formato de string %s válido, ao contrário de \"%s\". Motivo: "
-"%s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"uma especificação de formato para o argumento %u, como em \"%s\", não existe "
-"em \"%s\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
-#, c-format
+#, fuzzy, 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\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr ""
-"especificações de formato em \"%s\" e \"%s\", para argumento %u, não são o "
-"mesmo"
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "A diretiva número %u inicia com |, mas não termina com |."
+msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"Na diretiva número %u, o token após \"<\" não é o nome de uma macro "
-"especificadora de formato. Os nomes de macro válidos são listados na ISO C "
-"99 seção 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "Na diretiva número %u, o token após \"<\" não está seguido por \">\"."
+msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
-"A string refere-se ao argumento número %u, mas ignora o argumento número %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr ""
+"n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
-"Na diretiva número %u, \"{\" não está seguido por um número de argumento."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "Na diretiva número %u, \",\" não está seguido por um número."
+msgstr ""
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"A string termina no meio de uma diretriz: encontrado \"{\" sem a \"}\" "
-"correspondente."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"A diretiva número %u termina com um caractere inválido \"%c\" ao invés de "
-"\"}\"."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
-"A diretiva número %u termina com um caractere inválido ao invés de \"}\"."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"A string inicia no meio de uma diretiva: encontrado \"}\" sem \"{\" "
-"correspondente."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "A string contém \"}\" sozinho após diretiva de número %u."
+msgstr ""
 
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "Na diretiva de número %u, a combinação de flags é inválida."
+msgstr ""
 
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "Na diretiva de número %u, a precisão não é permitida antes \"%c\"."
+msgstr ""
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -456,8 +383,6 @@
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
-"Na diretiva de número %u, o número do argumento da precisão deve ser igual a "
-"%u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
@@ -465,57 +390,42 @@
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"Na diretiva de número %u, uma especificação de precisão não é permitida "
-"antes de \"%c\"."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "Na diretiva de número %u, uma especificação de precisão é inválida."
+msgstr ""
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "Na diretiva de número %u, flags não são permitidas antes de \"%c\"."
+msgstr ""
 
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "\"%s\" usa %%m, mas \"%s\" não usa"
+msgstr ""
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "\"%s\" não usa %%m, mas \"%s\" usa %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "\"%s\" usa %%C, mas \"%s\" não usa"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "\"%s\" não usa %%C, mas \"%s\" usa %%C"
+msgstr ""
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "A string termina no meio de uma diretiva."
+msgstr ""
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"A string faz referência a argumentos por meio de números de argumento "
-"absoluto e por especificações de argumento sem número."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
-"Na diretiva número %u, o argumento de número 0 não é um inteiro positivo."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -523,8 +433,6 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"Na diretiva de número %u, o argumento de número 0 da largura não é um "
-"inteiro positivo."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -532,8 +440,6 @@
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
-"Na diretiva de número %u, o argumento de número 0 da precisão é não um "
-"inteiro positivo."
 
 #: src/format-invalid.h:36
 #, c-format
@@ -541,8 +447,6 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"Na diretiva de número %u, o caractere \"%c\" não é uma especificação de "
-"conversão válida."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -550,14 +454,11 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"O caractere que termina a diretiva de número %u não é uma especificação de "
-"conversão válida."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
-"A string faz referência ao argumento de número %u de formas incompatíveis."
 
 #: src/format-java.c:240
 #, c-format
@@ -565,21 +466,17 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"Na diretiva de número %u, a sub-string \"%s\" não é um estilo de data/hora "
-"válido."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "Na diretiva número %u, \"%s\" não está seguido por uma vírgula."
+msgstr ""
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
-"Na diretiva de número %u, a sub-string \"%s\" não é um estilo de número "
-"válido."
 
 #: src/format-java.c:323
 #, c-format
@@ -587,13 +484,11 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"Na diretiva de número %u, o argumento de número não é seguido por uma "
-"vírgula e um de \"%s\", \"%s\", \"%s\" e \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "Na diretiva de número %u, uma escolha contém nenhum número."
+msgstr ""
 
 #: src/format-java.c:583
 #, c-format
@@ -601,30 +496,23 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"Na diretiva de número %u, uma escolha contém um número que não é seguido por "
-"\"<\", \"#\" ou \"%s\"."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"uma especificação de formato para o argumento {%u}, como em \"%s\", não "
-"existe em \"%s\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-java.c:756
-#, c-format
+#, fuzzy, 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\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr ""
-"especificações de formato em \"%s\" e \"%s\", para argumento {%u}, não são o "
-"mesmo"
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -633,8 +521,6 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"Na diretiva de número %u, parâmetro %u é do tipo \"%s\", mas um parâmetro do "
-"tipo \"%s\" é esperado."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -645,37 +531,33 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"Na diretiva de número %u, parâmetros demais foram passados; esperava no "
-"máximo %u parâmetro."
 msgstr[1] ""
-"Na diretiva de número %u, parâmetros demais foram passados; esperava no "
-"máximo %u parâmetros."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "Na diretiva número %u, \"%c\" não está seguido por um dígito."
+msgstr ""
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "Na diretiva número %u, o argumento %d é negativo."
+msgstr ""
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "A string termina no meio de uma diretiva ~/.../ ."
+msgstr ""
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Encontrado \"~%c\" sem \"~%c\" correspondente."
+msgstr ""
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "Na diretiva de número %u, os modificadores @ e : foram passados."
+msgstr ""
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -683,28 +565,26 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"Na diretiva de número %u, \"~:[\" não é seguido por duas cláusulas, "
-"separadas por \"~;\"."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "Na diretiva de número %u, \"~;\" é usado em uma posição inválida."
+msgstr ""
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "A string faz referência a alguns argumentos em formas incompatíveis."
+msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "especificações de formato em \"%s\" e \"%s\" não são equivalentes"
+msgstr ""
+"n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-perl.c:433
 #, c-format
@@ -712,90 +592,48 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"Na diretiva de número %u, a especificação do tamanho é incompatível com a "
-"especificação da conversão \"%c\"."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
-#, c-format
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr ""
-"uma especificação de formato para o argumento \"%s\" não existe em \"%s\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
-"A string faz referência a argumentos de tanto nomes de argumentos quanto "
-"especificações de argumentos sem nome."
 
 #: 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:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"especificações de formatos em \"%s\" esperam um mapeamento, enquanto aqueles "
-"em \"%s\" esperam uma tupla"
+"n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"especificações de formatos em \"%s\" esperam um tupla, enquanto aqueles em "
-"\"%s\" esperam um mapeamento"
+"n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr ""
-"uma especificação de formato para o argumento \"%s\", como em \"%s\", não "
-"existe em \"%s\""
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr ""
-"especificações de formato em \"%s\" e \"%s\" para o argumento \"%s\" não são "
-"o mesmo"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"Na diretiva de número %u, não é mais permitido empilhamento em um "
-"especificador de formato."
-
-#: src/format-python-brace.c:270
-#, 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."
+msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #: src/format-qt.c:152
 #, c-format
@@ -803,32 +641,26 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"\"%s\" é um formato de string simples, mas \"%s\" não é: ele contém uma flag "
-"\"L\" ou um número de argumento de dois dígitos"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "A string faz referência a uma variável shell com um nome não ASCII."
+msgstr ""
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"A string faz referência a uma variável shell com sintaxe com braçadeiras de "
-"shell complexas. Não há suporte a esta sintaxe devido a motivos de segurança."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"A string faz referência a uma variável shell cujo valor pode ser diferente "
-"dentro de funções shell."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "A string faz referência a uma variável shell com um nome vazio."
+msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
@@ -836,7 +668,6 @@
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
-"Na diretiva de número %u, o caractere \"%c\" não é um dígito entre 1 e 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -844,13 +675,12 @@
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
-"O caractere que termina a diretiva de número %u não é um dígito entre 1 e 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -858,385 +688,333 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
-"Este é um software livre: você é livre para alterar e redistribui-lo.\n"
-"NÃO HÁ GARANTIA, à extensão permitida pela lei.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "Bruno Haible"
+msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
-msgstr "excesso de argumentos"
+msgstr "excesso de par�metros"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Tente \"%s --help\" para mais informações.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Tente `%s --help' para maiores informa��es\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "Uso: %s [OPÇÃO]\n"
+msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "Emite o nome da máquina.\n"
+msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "Formato da saída:\n"
+msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 nome de máquina curto\n"
+msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          nome de máquina longo, inclui fully qualified\n"
-"                              domain e apelidos (aliases)\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            endereços para o nome da máquina\n"
+msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Saída informativa:\n"
+msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  exibe essa ajuda e sai\n"
+msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
+msgstr ""
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
+#, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Reporte bugs para <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "não foi possível obter nome de máquina"
+msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
-#, c-format
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#, fuzzy, c-format
 msgid "at most one input file allowed"
-msgstr "no máximo um arquivo é permitido"
+msgstr "s�o necess�rios 2 arquivos de entrada"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s e %s são mutuamente exclusivos"
+msgstr "%s e %s s�o mutuamente exclusivos"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]\n"
+msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"Filtra as mensagens de um catálogo de tradução de acordo com seus atributos\n"
-"e manipula-os.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Argumentos obrigatórios para opções longas também o são para opções curtas.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
-#, c-format
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
+#, fuzzy, c-format
 msgid "Input file location:\n"
-msgstr "Localização do arquivo de entrada:\n"
+msgstr "n�o foi informado o arquivo de entrada"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  ARQUIVO-ENTRADA             arquivo PO de entrada\n"
+msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=DIRETÓRIO   adiciona DIRETÓRIO à lista de arquivos de\n"
-"                              entrada para pesquisar\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
-"Se nenhum arquivo de entrada for passado ou se for -, a entrada padrão é "
-"lida.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Localização do arquivo de saída:\n"
+msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Os resultados são escritos para a saída padrão se nenhum arquivo de saída "
-"for\n"
-"especificado ou se ele for -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Seleção de mensagem:\n"
+msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            mantém as traduzidas, remove as mensagens não\n"
-"                              traduzidas\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          mantém as não traduzidas, remove as mensagens\n"
-"                              traduzidas\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
-"      --no-fuzzy              remove as mensagens marcadas com \"fuzzy\"\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
-"      --only-fuzzy            mantém as mensagens marcadas com \"fuzzy\"\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           remove mensagens obsoletas (#~)\n"
+msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         mantém mensagens obsoletas (#~)\n"
+msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Manipulação de atributo:\n"
+msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             define \"fuzzy\" em todas as mensagens\n"
+msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           apaga \"fuzzy\" de todas as mensagens\n"
+msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
-"      --set-obsolete          define como obsoletas todas as mensagens\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
-"      --clear-obsolete        define como não obsoletas todas as mensagens\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              ao definir \"fuzzy\", mantém msgids "
-"anteriores\n"
-"                              de mensagens traduzidas.\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
-"      --clear-previous        remove a \"previous msgid\" de todas as\n"
-"                              mensagens\n"
-
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 ao remover os \"fuzzy\", também esvazia a "
-"msgstr\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=ARQUIVO.po  manipula apenas entradas listadas no ARQUIVO."
-"po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=ARQUIVO.po\n"
-"                              manipula apenas entradas não listadas no\n"
-"                              ARQUIVO.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 sinônimo de --only-fuzzy --clear-fuzzy\n"
+msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              sinônimo de --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Sintaxe do arquivo de entrada:\n"
+msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      arquivo de entrada está em sintaxe de\n"
-"                              .properties Java\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input     arquivo de entrada está em sintaxe de\n"
-"                              .strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
-msgstr "Detalhes de entrada:\n"
+msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1244,147 +1022,133 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 usa sempre cores e outros atributos de "
-"atributos\n"
-"      --color=QUANDO          usa cores e outros atributos de texto se "
-"QUANDO.\n"
-"                              QUANDO pode ser \"always\", \"never\", \"auto"
-"\" ou\n"
-"                              \"html\".\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
-"      --style=ARQUIVO-ESTILO  especifica arquivo de regras de estilo CSS "
-"para\n"
-"                              --color\n"
-
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, 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"
+msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                usa escapes de C na saída, nenhum caractere\n"
-"                              estendido\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              escreve um arquivo PO mesmo se vazio\n"
+msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          gera linhas \"#: nome-de-arquivo:"
-"linha' (padrão)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                escreve um arquivo .po em conformidade com\n"
-"                              com Uniforum estrito\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output     escreve em arquivo .properties de Java\n"
+msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-output    escreve um arquivo .strings de NeXTstep/"
-"GNUstep\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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"
+msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, c-format
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#, fuzzy, 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ão quebra linhas de mensagens longas, "
-"maiores\n"
-"                              do que a largura da página de saída, em "
-"várias\n"
-"                              linhas\n"
-
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+"Uso: %s [OP��O] [ARQUIVO]...\n"
+"Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios para\n"
+"as op��es curtas\n"
+"  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+"  -E, --escape             usar escapes C na sa�da sem caracteres "
+"estendidos\n"
+"      --force-po           grava o arquivo .po mesmo que vazio\n"
+"  -h, --help               apresenta esta ajuda e finaliza\n"
+"  -i, --indent             estilo de sa�da indentado\n"
+"  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
+"      --strict             habilita o modo Uniforum estrito\n"
+"  -V, --version            apresenta informa��es de vers�o e finaliza\n"
+"  -w, --width=N�MERO       configura largura da p�gina de sa�da\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           gera uma saída ordenada\n"
+msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "critério de seleção especificado impossível (%d < n < %d)"
+msgstr "crit�rio de sele��o especificado imposs�vel (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]...\n"
+msgstr ""
 
-#: src/msgcat.c:372
-#, c-format, no-wrap
+#: src/msgcat.c:371
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1392,127 +1156,119 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"Concatena e mescla os arquivos PO especificados.\n"
-"Localiza mensagens que são comuns a dois ou mais arquivos PO especificados.\n"
-"Ao usar a opção --more-than, um maior nível de ocorrência em comum pode ser\n"
-"exigida antes das mensagens serem exibidas. Por outro lado, a --less-than pode\n"
-"ser usada para especificar menor ocorrência em comum antes das mensagens serem\n"
-"exibidas (isto é, --less-than=2 vai exibir apenas as mensagens únicas).\n"
-"Traduções, comentários e extração de comentários serão cumulados, exceto se\n"
-"--use-first for especificado, eles vão ser obtidos do primeiro arquivo PO para\n"
-"defini-los.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
+"  -V, --version                  mostra informa��es de vers�o e sai\n"
+"  -w, --width=NUMBER             configura a largura de p�gina de sa�da\n"
+"  -<, --less-than=N�MERO         mostra mensagens menores que este n�mero\n"
+"                                 o padr�o � infinito\n"
+"  ->, --more-than=N�MERO         mostra mensagens maiores que este n�mero\n"
+"                                 o padr�o � infinito\n"
+"\n"
+"Descobre mensagens que s�o comuns a dois ou mais do arquivos PO\n"
+"especificados. Usando a op��o --more-than, a maior parte das\n"
+"ocorr�ncias podem ser solicitadas antes das mensagens serem impressas.\n"
+"De modo contr�rio, a op��o --less-than pode ser usada para especificar\n"
+"menos ocorr�ncias antes das mensagens serem exibidas (i.e., \n"
+"--less-than=2 ir� exibir apenas as mensagens exclusivas). Tradu��es,\n"
+"coment�rios e coment�rios de extra��o ser�o preservados, mas apenas do\n"
+"primeiro arquivo PO que os definirem. As posi��es de arquivo de todos\n"
+"os arquivos PO ser�o preservados.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  ARQUIVO-ENTRADA ...         arquivos de entrada\n"
+msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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"
+msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 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:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                abreviação para --less-than=2, requer que\n"
-"                              apenas mensagens únicas sejam exibidas\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      arquivos de entrada estão em sintaxe \n"
-"                              .properties do Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     arquivos de entrada estão em sintaxe .strings\n"
-"                              do NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=NOME          codificação da saída\n"
+msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 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:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --lang=NOME-CATÁLOGO    define o campo \"Language\" na mensagem de \n"
-"                              cabeçalho\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "Peter Miller"
+msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
-msgstr "nenhum arquivo de entrada informado"
+msgstr "arquivos de entrada n�o informados"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "são necessários 2 arquivos de entrada"
+msgstr "s�o necess�rios 2 arquivos de entrada"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Uso: %s [OPÇÃO] def.po ref.pot\n"
+msgstr ""
 
 #: src/msgcmp.c:218
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
@@ -1521,196 +1277,197 @@
 "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 ""
-"Compara dois arquivos .po de estilo Uniforum para verificar se ambos contêm\n"
-"o mesmo conjunto de strings msgid. O arquivo def.po é um arquivo PO existente\n"
-"com as traduções. O arquivo ref.pot é o último arquivo PO criado ou um arquivo\n"
-"modelo de PO (geralmente criado por xgettext). Isso é útil para conferir se\n"
-"você traduziu toda e cada mensagem no seu programa. Onde não se encontrar uma\n"
-"coincidência exata, é marcado como aproximada (fuzzy) para se ter melhor\n"
-"diagnóstico.\n"
+"Uso: %s [OP��O] def.po ref.po\n"
+"Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+"para as op��es curtas\n"
+"  -D, --directory=DIRET�RIO  adiciona DIRET�RIO na lista de pesquisa dos \n"
+"                             arquivos de entrada\n"
+"  -h, --help                 apresenta esta ajuda e finaliza\n"
+"  -V, --version              apresenta informa��es da vers�o e finaliza\n"
+"\n"
+"Compara dois arquivos .po de estilo Uniforum para checar se ambos cont�m o\n"
+"mesmo conjunto de strings msgid. O arquivo def.po deve ser um arquivo PO\n"
+"existente com as tradu��es antigas. O arquivo ref.po � o �ltimo arquivo PO\n"
+"criado (geralmente pelo xgettext). Isto � �til para comparar se todas as\n"
+"mensagens do programa foram traduzidas. Onde uma igualdade n�o puder ser\n"
+"encontrada uma aproxima��o � utilizada para produzir um melhor diagn�stico.\n"
 
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      traduções\n"
+msgstr ""
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     referências para as fontes\n"
+msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "Modificadores de operação:\n"
+msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
-"  -m, --multi-domain          aplica ref.pot a cada um dos domínios em def."
-"po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     não usa marcação de aproximada\n"
+msgstr ""
 
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             considera entradas aproximadas\n"
+msgstr ""
 
 #: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      considera entradas não traduzidas\n"
+msgstr ""
 
 #: src/msgcmp.c:324
-#, c-format
+#, fuzzy, c-format
 msgid "this message is untranslated"
-msgstr "esta mensagem está não traduzida"
+msgstr "aten��o: esta mensagem n�o � utilizada"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "esta mensagem precisa ser revisada pelo tradutor"
+msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "esta mensagem é usada, mas não foi definida..."
+msgstr "esta mensagem � utilizada, mas n�o foi definida..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...mas esta definição é similar"
+msgstr "...mas esta defini��o � similar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "esta mensagem é utilizada mas não definida em %s"
+msgstr "esta mensagem � utilizada mas n�o definida em %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "atenção: esta mensagem não é utilizada"
+msgstr "aten��o: esta mensagem n�o � utilizada"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgcomm.c:364
-#, c-format, no-wrap
+#: src/msgcomm.c:363
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Localiza mensagens que são comuns a dois ou mais arquivos PO especificados.\n"
-"Usando a opção --more-than, maior ocorrência em comum pode ser exigida antes\n"
-"das mensagens serem exibidas. Por outro lado, a --less-than é uma opção que\n"
-"pode ser usada para especificar menor ocorrência em comum antes das mensagens\n"
-"serem exibidas (isto é, --less-than=2 vai exibir apenas as mensagens únicas).\n"
-"Traduções, comentários e extração de comentários serão preservados, mas apenas\n"
-"do primeiro arquivo PO a defini-los. Posições de arquivos de todos\n"
-"os arquivos PO serão cumulados.\n"
+"  -V, --version                  mostra informa��es de vers�o e sai\n"
+"  -w, --width=NUMBER             configura a largura de p�gina de sa�da\n"
+"  -<, --less-than=N�MERO         mostra mensagens menores que este n�mero\n"
+"                                 o padr�o � infinito\n"
+"  ->, --more-than=N�MERO         mostra mensagens maiores que este n�mero\n"
+"                                 o padr�o � infinito\n"
+"\n"
+"Descobre mensagens que s�o comuns a dois ou mais do arquivos PO\n"
+"especificados. Usando a op��o --more-than, a maior parte das\n"
+"ocorr�ncias podem ser solicitadas antes das mensagens serem impressas.\n"
+"De modo contr�rio, a op��o --less-than pode ser usada para especificar\n"
+"menos ocorr�ncias antes das mensagens serem exibidas (i.e., \n"
+"--less-than=2 ir� exibir apenas as mensagens exclusivas). Tradu��es,\n"
+"coment�rios e coment�rios de extra��o ser�o preservados, mas apenas do\n"
+"primeiro arquivo PO que os definirem. As posi��es de arquivo de todos\n"
+"os arquivos PO ser�o preservados.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=NÚMERO      imprime mensagens com mais do que estas "
-"várias\n"
-"                              definições, sendo 1 se não for definida\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           não escreve um cabeçalho com a entrada 'msgid"
-"\"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
-"Converte um catálogo de tradução para uma codificação de caracteres "
-"diferente.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
-msgstr "Alvo de conversão:\n"
+msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "A codificação padrão é a codificação do local atual.\n"
+msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                estilo de saída com recuo\n"
+msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           suprime as linhas \"#: nome-de-arquivo:linha"
-"\"\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          preserva as linhas \"#: nome-de-arquivo:linha"
-"\"\n"
-"                              (padrão)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                estilo de saída Uniform estrito\n"
+msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
-msgstr "nenhum arquivo de entrada fornecido"
+msgstr "n�o foi informado o arquivo de entrada"
 
-#: src/msgen.c:263
-#, c-format
+#: src/msgen.c:253
+#, fuzzy, c-format
 msgid "exactly one input file required"
-msgstr "exatamente um arquivo de entrada é necessário"
+msgstr "s�o necess�rios 2 arquivos de entrada"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Uso: %s [OPÇÃO] ARQUIVO-ENTRADA\n"
+msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1718,24 +1475,21 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Cria um catálogo de tradução do inglês. O arquivo de entrada é o último arquivo\n"
-"PO em inglês criado ou arquivo POT (geralmente criado por xgettext). Entradas\n"
-"não traduzidas estão assinadas um tradução que é idêntica no msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  ARQUIVO-ENTRADA             entrada de arquivo PO ou POT\n"
+msgstr ""
 
 #: src/msgexec.c:196
-#, c-format
+#, fuzzy, c-format
 msgid "missing command name"
-msgstr "faltando o nome do comando"
+msgstr "par�metros n�o informados"
 
 #: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Uso: %s [OPÇÃO] COMANDO [OPÇÃO-DO-COMANDO]\n"
+msgstr ""
 
 #: src/msgexec.c:262
 #, c-format, no-wrap
@@ -1746,328 +1500,261 @@
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"Aplica um comando a todas as traduções de um catálogo de traduções.\n"
-"O COMANDO pode ser qualquer um programa que lê uma tradução da entrada\n"
-"padrão. Ele é chamado uma vez para cada tradução. Sua saída se torna a\n"
-"saída do msgexec. O código de retorno do msgexec é o código de retorno\n"
-"máximo de todas as chamadas.\n"
 
 #: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
-msgstr "Um comando especial embutido chamado \"0\" retorna a tradução, seguida por um byte nulo. A saída de \"msgexec 0\" serve como entrada para \"xargs -0\".\n"
+msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
-"  -i, --input=ARQUIVO-ENTRADA\n"
-"                              arquivo PO de entrada\n"
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "Escrita para a saída padrão falhou"
+msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
 #, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
+#, fuzzy, c-format
 msgid "missing filter name"
-msgstr "faltando o nome do filtro"
+msgstr "par�metros n�o informados"
 
-#: src/msgfilter.c:318
-#, c-format
+#: src/msgfilter.c:313
+#, fuzzy, c-format
 msgid "at least one sed script must be specified"
-msgstr "pelo menos um script sed deve ser especificado"
+msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Uso: %s [OPÇÃO] FILTRO [OPÇÃO-DO-FILTRO]\n"
+msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Aplica um filtro em todas as traduções de um catálogo de tradução.\n"
+msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"O FILTRO pode ser qualquer programa que lê uma tradução da entrada padrão\n"
-"e escreve uma tradução modificada para a saída padrão.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Lista de OPÇÃO-DE-FILTROs úteis para quando o FILTRO é \"sed\":\n"
+msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
-"  -e, --expression=SCRIPT     adiciona SCRIPT aos comandos a serem "
-"executados\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=ARQUIVO-SCRIPT\n"
-"                              adiciona o conteúdo do ARQUIVO-SCRIPT aos\n"
-"                              comandos a serem executados\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       suprime impressão automática do espaço de "
-"padrão\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             não usa escapes de C na saída (padrão)\n"
+msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                estilo de saída com recuo\n"
+msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           mantém mensagem de cabeçalho não modificada,\n"
-"                              não a filtra\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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"
+msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "extremidade inválida: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper"
-
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "%s requer especificação de um \"-d diretório\""
+msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s requer especificação de um \"-l local\""
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s requer especificação de um \"--template modelo\""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s requer especificação de um \"-o arquivo\""
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s e %s são mutuamente exclusivos em %s"
+msgstr ""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s é válido apenas com %s ou %s"
+msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s é válido apenas com %s, %s ou %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagem traduzida"
 msgstr[1] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, 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)"
+msgstr[0] ", %d tradu��o aproximada (fuzzy)"
+msgstr[1] ", %d tradu��es aproximadas (fuzzy)"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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"
+msgstr[0] ", %d mensagem n�o traduzida"
+msgstr[1] ", %d mensagens n�o traduzidas"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "Uso: %s [OPÇÕES] arquivo.po ...\n"
+msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"Argumentos obrigatórios para opções longas também são para as curtas.\n"
-"Da mesma forma para argumentos opcionais.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  arquivo.po ...              arquivos de entrada\n"
+msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
-msgstr "Modo de operação:\n"
+msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  modo Java: gera uma classe ResourceBundle de "
-"Java\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 semelhante a --java, e supõe Java2 (JDK 1.2 "
-"+)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                modo C#: gera um arquivo .dll de .NET\n"
+msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      modo de recursos C#: gera um arquivo ."
-"resources de .NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                habilita modo Uniforum estrito\n"
+msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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"
+msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "Localização do arquivo de saída em modo Java:\n"
+msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=RECURSO      nome do recurso\n"
+msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=LOCALIZAÇÃO    nome da localização, podendo ser o idioma ou\n"
-"                              também idioma_PAÍS\n"
-
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                produz um arquivo .java, ao invés de um "
-"arquivo\n"
-"                              .class\n"
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
-"  -d DIRETÓRIO                diretório base de hierarquia de diretório de\n"
-"                              classes\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2075,291 +1762,201 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"O nome da classe é determinada pelo anexo do nome da localização ao\n"
-"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:839
-#, c-format
+#: src/msgfmt.c:711
+#, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "Localização do arquivo de saída em modo C#:\n"
+msgstr "n�o foi informado o arquivo de entrada"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
-"  -d DIRETÓRIO                diretório base para arquivos .dll dependentes\n"
-"                              da localização\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Localização do arquivo de saída em modo Tcl:\n"
+msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"As opções -l e -d são obrigatórias. O arquivo .msg é escrito no\n"
-"diretório especificado.\n"
-
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Opções de modo Desktop Entry:\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-"  --template=MODELEO          um arquivo .desktop usado como um modelo\n"
-
-#: src/msgfmt.c:869
-#, 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:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kPALAVRA, --keyword=PALAVRA\n"
-"                              procura por PALAVRA como uma palavra-chave\n"
-"                              adicional\n"
-"  -k, --keyword               não usa palavras-chaves padrões\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"As opções -l, -o e --template são obrigatórias. Se -D for especificada, os\n"
-"arquivos de entrada são lidos do diretório ao invés dos argumentos da linha\n"
-"de comando.\n"
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Interpretação do arquivo de entrada:\n"
+msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
 "domain\n"
-msgstr ""
-"  -c, --check                 realiza todas as verificações implicadas por\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
+msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
-"      --check-header          verifica presença e conteúdo da mensagem\n"
-"                              de cabeçalho\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          verifica conflitos entre diretivas de "
-"domínios\n"
-"                              e a opção --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   verifica se o GNU msgfmt se comporta como\n"
-"                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]\n"
-"                              verifica a presença de aceleradores de\n"
-"                              teclado para itens de menu\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
-#, c-format
-msgid ""
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 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:910
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"      --endianness=ORDEM-DE-BYTES\n"
-"                              escreve números 32-bit na ordem de bytes dada\n"
-"                              (\"big\" ou \"little\", dependendo da "
-"plataforma)\n"
 
-# "binary" de binário (compilado, .mo), e não de executável
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            imprime estatísticas sobre traduções\n"
+msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               aumenta o nível de detalhamento\n"
+msgstr ""
 
-#: src/msgfmt.c:1037
-#, c-format
+#: src/msgfmt.c:890
+#, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr "aviso: cabeçalho do arquivo PO faltando ou inválido\n"
+msgstr ""
+"%s: aviso: Cabe�alho do arquivo PO esquecido, aproximado ou inv�lido\n"
+"%*s aviso: convers�o de charset n�o vai funcionar"
 
-#: src/msgfmt.c:1040
-#, c-format
+#: src/msgfmt.c:893
+#, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "aviso: conversão de codificação de caracteres não vai funcionar\n"
+msgstr ""
+"%s: aviso: falta o cabe�alho relativo ao charset\n"
+"%*s aviso: convers�o de charset n�o vai funcionar"
 
-#: src/msgfmt.c:1050
-#, c-format
+#: src/msgfmt.c:903
+#, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr "aviso: cabeçalho de arquivo PO como tradução aproximada (fuzzy)\n"
+msgstr ""
+"%s: aviso: Cabe�alho do arquivo PO esquecido, aproximado ou inv�lido\n"
+"%*s aviso: convers�o de charset n�o vai funcionar"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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"
+msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, 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"
+msgstr "nome do dom�nio \"%s\" n�o � v�lido como nome de arquivo"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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 "
+"nome do dom�nio \"%s\" n�o � v�lido como nome de arquivo: ser� usado um "
 "prefixo"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "diretiva \"domain %s\" ignorada"
+msgid "`domain %s' directive ignored"
+msgstr "`domain %s': diretiva ignorada"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "mensagem \"msgstr\" vazia ignorada"
+msgid "empty `msgstr' entry ignored"
+msgstr "`msgstr' vazia: mensagem ignorada"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "mensagem \"msgstr\" aproximada (fuzzy) ignorada"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s não existe"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s existe, mas não pode ler"
+msgstr "%s: aviso: arquivo fonte cont�m tradu��es aproximadas"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"opção \"%c\" não pode ser usada antes de \"J\", \"K\", \"T\", \"C\" ou \"X"
-"\"  ser especificada"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
-"Extrai todas as mensagens de um catálogo de tradução que corresponde ao\n"
-"padrão fornecido ou pertence a alguns dos arquivos fontes fornecidos.\n"
 
-# Separei as frases (ou..ou...ou..) por ponto-e-vírgula denotando enumeração. Dadas as condições dessa string, penso ficar mais organizado assim - Rafael
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2398,181 +1995,111 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 msgstr ""
-"Seleção de mensagem:\n"
-"  [-N ARQUIVO-FONTE]... [-M NOME-DE-DOMÍNIO]...\n"
-"  [-J PADRÃO-MSGCTXT] [-K PADRÃO-MSGID] [-T PADRÃO-MSGSTR]\n"
-"  [-C PADRÃO-COMENTÁRIO] [-X PADRÃO-COMENTÁRIO-EXTRAÍDO]\n"
-"Uma mensagem é selecionada se ela vier de um dos arquivos fonte especificados;\n"
-"ou se vier de um dos domínios especificados;\n"
-"ou se -J for fornecido e o contexto (msgctxt) corresponder a PADRÃO-MSGCTXT;\n"
-"ou se -K for fornecido e sua chave (msgid ou msgid_plural) corresponder\n"
-"   a PADRÃO-MSGID;\n"
-"ou se -T for fornecido e sua tradução (msgstr) corresponder a PADRÃO-MSGSTR;\n"
-"ou se -C for fornecido e o comentário do tradutor corresponder\n"
-"   a PADRÃO-COMENTÁRIO;\n"
-"ou se -X for fornecido e o comentário extraído corresponder\n"
-"   a PADRÃO-COMENTÁRIO-EXTRAÍDO.\n"
-"\n"
-"Quando mais de um critério de seleção é especificado, o conjunto de mensagens\n"
-"selecionadas é a união das mensagens selecionadas de cada critério.\n"
-"\n"
-"Sintaxe de PADRÃO-MSGCTXT, PADRÃO-MSGID, PADRÃO-MSGSTR, PADRÃO-COMENTÁRIO,\n"
-"PADRÃO-COMENTÁRIO-EXTRAÍDO:\n"
-"  [-E | -F] [-e PADRÃO | -f ARQUIVO]...\n"
-"Os valores PADRÃO pode ser: expressões regulares básicas por padrão; \n"
-"ou expressões regulares estendidas, se -E for fornecido; ou strings fixas,\n"
-"se -F for fornecido.\n"
-"\n"
-"  -N, --location=ARQUIVO-DE-FONTE                              seleciona mensagens extraídas do ARQUIVO-FONTE\n"
-"  -M, --domain=NOME-DE-DOMÍNIO                              seleciona mensagens pertencentes ao\n"
-"                              domínio NOME-DE-DOMÍNIO\n"
-"  -J, --msgctxt               começo de padrões para o msgctxt\n"
-"  -K, --msgid                 começo de padrões para o msgid\n"
-"  -T, --msgstr                começo de padrões para o msgstr\n"
-"  -C, --comment               começo de padrões para o comentário do tradutor\n"
-"  -X, --extracted-comment     começo de padrões para o comentário extraído\n"
-"  -E, --extended-regexp       PADRÃO é uma expressão regular estendida\n"
-"  -F, --fixed-strings         PADRÃO é um conjunto de strings separadas por\n"
-"                              novas linhas\n"
-"  -e, --regexp=PADRÃO         usa PADRÃO como uma expressão regular\n"
-"  -f, --file=ARQUIVO          obtém PADRÃO de ARQUIVO\n"
-"  -i, --ignore-case           ignora diferenciação de maiúsculas e minúsculas\n"
-"  -v, --invert-match          exibe apenas mensagens que não corresponderem\n"
-"                              a qualquer critério de seleção\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                usa escapes de C na saída, nenhum caractere\n"
-"                              estendido\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           gera uma saída ordenada\n"
+msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
-"      --sort-by-file          ordena a saída por localização de arquivo\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"Você está em um ambiente indiferente quanto a idioma. Por favor, defina a\n"
-"sua variável de ambiente LANG, como descrita no arquivo ABOUT-NLS. Isso é\n"
-"necessário para que você possa testar suas traduções.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 msgstr ""
-"Arquivo de saída %s já existe.\n"
-"Por favor, especifique a localização por meio da opção --locale\n"
-"ou do arquivo de saída .po através da opção --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
-msgstr "Criado %s.\n"
+msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
-"Cria um novo arquivo PO, inicializando as informações meta com valores do\n"
-"ambiente do usuário.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
-"  -i, --input=ARQUIVO-ENTRADA\n"
-"                              arquivo POT de entrada\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Se nenhum arquivo de entrada for fornecido, o diretório atual é pesquisado\n"
-"pelo arquivo POT.\n"
-"Se ele for -, a entrada padrão é lida.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
-"  -o, --output-file=ARQUIVO   escreve a saída para o arquivo PO "
-"especificado\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"Se nenhum arquivo de entrada for fornecido, ele vai depender da opção --"
-"locale\n"
-"ou da configuração de localização do usuário. Se ele for -, os resultados "
-"são\n"
-"escritos para a saída padrão.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          define a localização alvo\n"
+msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         pressupõe que o arquivo PO é gerado "
-"automaticamente\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Encontrado mais de um arquivo .pot.\n"
-"Por favor, especifique o arquivo .pot de entrada por meio da opção --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
-msgstr "erro ao ler o diretório atual"
+msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Encontrado nenhum arquivo .pot no diretório atual.\n"
-"Por favor, especifique o arquivo .pot de entrada por meio da opção --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "subprocesso de %s falhou com código de saída %d"
+msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2580,61 +2107,49 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"O novo catálogo de mensagens deveria conter seu endereço de e-mail para que\n"
-"os usuários possam fornecer um feedback sobre as traduções e para que os\n"
-"mantenedores possam contactá-lo no caso de problemas técnicos inesperados.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "Traduções em português brasileiro para o pacote %s"
+msgstr ""
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
-#, c-format
+#, fuzzy, 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"
+msgstr "%s: aviso: charset \"%s\" n�o � suportado pelo iconv%s"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
-"duas codificações de caracteres diferentes \"%s\" e \"%s\" no arquivo de "
-"entrada"
 
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
-"arquivo de entrada \"%s\" não contém uma entrada de cabeçalho com uma "
-"especificação de codificação de caracteres"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 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:391 src/msgl-iconv.c:375
-#, c-format
+#, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
-"o conjunto de caracteres alvo \"%s\" não é um nome de codificação portável."
+msgstr "%s: aviso: charset \"%s\" n�o � suportado pelo iconv%s"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
-msgstr "aviso: "
+msgstr ""
 
 #: src/msgl-cat.c:443
 #, c-format
@@ -2642,9 +2157,6 @@
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Arquivos de entrada contêm mensagens em codificações distintas, UTF-8 "
-"junto.\n"
-"Convertendo a saída para UTF-8.\n"
 
 #: src/msgl-cat.c:449
 #, c-format
@@ -2654,10 +2166,6 @@
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Arquivos de entrada contêm mensagens em codificações distintas, %s e %s "
-"junto.\n"
-"Convertendo a saída para UTF-8.\n"
-"Para selecionar uma codificação diferente, use a opção --to-code.\n"
 
 #: src/msgl-cat.c:488
 #, c-format
@@ -2667,12 +2175,6 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"Conversão de arquivo %s da codificação %s para %s\n"
-"altera alguns msgids ou msgctxts.\n"
-"Altere todas as msgids e msgctxts para ASCII puro ou certifique-se de que "
-"elas\n"
-"estão codificadas em UTF-8 desde o começo, isto é, já em seus arquivos do\n"
-"código fonte.\n"
 
 #: src/msgl-charset.c:93
 #, c-format
@@ -2682,15 +2184,11 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Codificação de caracteres \"%s\" é diferente da codificação\n"
-"de caracteres do arquivo de entrada \"%s\".\n"
-"Saída de \"%s\" pode estar incorreta.\n"
-"Soluções possíveis são:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Definir LC_ALL com uma localização com codificação %s.\n"
+msgstr ""
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2699,9 +2197,6 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Converter o catálogo de tradução para %s usando \"msgconv\",\n"
-"  aplicar \"%s\" e,\n"
-"  então, converter de volta para %s usando \"msgconv\".\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2711,10 +2206,6 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Definir LC_ALL com uma localização com codificação %s.\n"
-"  converter o catálogo de tradução para %s usando \"msgconv\",\n"
-"  aplicar \"%s\" e,\n"
-"  então, converter de volta para %s usando \"msgconv\".\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2723,165 +2214,163 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Codificação de caractere de localização \"%s\" não é um\n"
-"nome de codificação portável.\n"
-"Saída de \"%s\" pode estar incorreta.\n"
-"Uma solução possível é definir LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
-msgstr "expressões de plural podem produzir valores negativos"
+msgstr ""
 
 #: src/msgl-check.c:141
 #, 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:187
 msgid "plural expression can produce division by zero"
-msgstr "expressão de plural pode produzir divisão por zero"
+msgstr ""
 
 #: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
-msgstr "expressão de plural pode produzir sobrecarga de inteiro"
+msgstr ""
 
 #: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
-"expressão de plural pode produzir exceções aritméticas, possivelmente "
-"divisão por zero"
 
 #: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "Tente usar o seguinte, válido para %s:"
+msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr "catálogo de mensagens possui traduções em forma de plural"
+msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "mas o cabeçalho não possui um atributo \"plural=EXPRESSÃO\""
+msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "mas o cabeçalho não possui um atributo \"nplurals=INTEIRO\""
+msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
+#, fuzzy
 msgid "invalid nplurals value"
-msgstr "valor de nplurals inválido"
+msgstr "seq��ncia de controle ilegal"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
+#, fuzzy
 msgid "invalid plural expression"
-msgstr "valor de plural inválido"
+msgstr "seq��ncia de controle ilegal"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr "nplurals = %lu"
+msgstr "seq��ncia de controle ilegal"
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, fuzzy, 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"
+msgstr[0] "esta mensagem � utilizada mas n�o definida em %s"
+msgstr[1] "esta mensagem � utilizada mas n�o definida em %s"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, 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"
+msgstr[0] "esta mensagem � utilizada mas n�o definida em %s"
+msgstr[1] "esta mensagem � utilizada mas n�o definida em %s"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 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:611
-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:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid' e `msgstr' n�o come�am com '\\n'"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, 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\"'"
+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:634
-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:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid' e `msgstr' n�o come�am com '\\n'"
 
-#: src/msgl-check.c:652
-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:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' e `msgstr' n�o terminam com '\\n'"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "\"msgid\" e \"msgstr[%u]\" não terminam com \"\\n\"'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "\"msgid\" e \"msgstr\" não terminam com \"\\n\"'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "`msgid' e `msgstr' n�o terminam com '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr "manipulação de plural é uma extensão do GNU gettext"
+msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr não possui a marca de acelerador de teclado \"%c\""
+msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr possui marcas de aceleradores de teclado \"%c\" demais"
+msgstr ""
 
-#: src/msgl-check.c:814
-#, 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:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "campo `%s' faltando no cabe�alho"
+
+#: src/msgl-check.c:784
+#, fuzzy, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "campo `%s' deve iniciar no come�o da linha"
 
-#: src/msgl-check.c:831
-#, 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:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
+msgstr "alguns campos do cabe�alho ainda possuem os valores iniciais padr�es"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "alguns campos do cabe�alho ainda possuem os valores iniciais padr�es"
 
 #: 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\""
+msgstr ""
 
 #: src/msgl-iconv.c:69
-#, c-format
+#, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: erro ao converter da codificação \"%s\" para \"%s\""
+msgstr "erro ao abrir \"%s\" para leitura"
 
 #: 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 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:335
 #, c-format
@@ -2889,30 +2378,26 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Conversão de \"%s\" para \"%s\" introduz duplicatas: algumas msgids "
-"diferentes ficaram equal."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(). "
-"Esta versão foi compilada sem iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s é válida apenas com %s"
+msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
-msgstr "tipo de cópia de segurança"
+msgstr ""
 
-#: src/msgmerge.c:503
-#, c-format, no-wrap
+#: src/msgmerge.c:485
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -2924,66 +2409,63 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Mescla dois arquivos .po de estilos Uniforum. O arquivo def.po é um arquivo\n"
-"PO existente com traduções que será levado para o novo arquivo criado desde\n"
-"que eles ainda coincidam; comentários são preservados, mas comentários \n"
-"extraídos e posições de arquivos serão descartados. O arquivo ref.pot é o\n"
-"último arquivo PO criado com referências fontes atualizadas, mas com traduções\n"
-"antigas ou um arquivo modelo de PO (geralmente criado com xgettext); qualquer\n"
-"tradução ou comentário no arquivo será descartado, mas comentários e posições\n"
-"de arquivos serão preservados. Onde não se encontrar uma coincidência exata, é\n"
-"marcado como aproximada (fuzzy) para se ter melhores resultados.\n"
+"\n"
+"Unifica dois arquivos .po de estilo Uniforum. O arquivo def.po � um\n"
+"arquivo PO existente com as tradu��es antigas que ser�o utilizadas no novo\n"
+"arquivo, enquanto elas coincidirem; coment�rios s�o preservados, por�m\n"
+"coment�rios extra�dos e posi��es de arquivos ser�o descartados.\n"
+"O arquivo ref.po � o �ltimo arquivo PO criado (geralmente pelo xgettext),\n"
+"em que qualquer tradu��o ou coment�rio s�o descartados, exceto coment�rios\n"
+"\"ponto\" e posi��es de arquivo. Onde as igualdades n�o forem exatas,\n"
+"aproxima��es podem ser utilizadas para produzirem melhores resultados.\n"
+"Os resultados ser�o gravados na sa�da padr�o, a menos que um arquivo de\n"
+"sa�da seja especificado.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      traduções referindo a fontes antigas\n"
+msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     referências a fontes novas\n"
+msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=ARQUIVO    biblioteca adicional de traduções de "
-"mensagens\n"
-"                              pode ser especificada mais de uma vez\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                atualiza def.po,\n"
-"                              faz nada se def.po estiver atualizado\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Localização de arquivo de saída no modo de atualização:\n"
+msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "O resultado é escrito de volta no def.po.\n"
+msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=CONTROLE       faz um backup do def.po\n"
+msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=SUFIXO         sobrescreve o sufixo padrão do backup\n"
+msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2994,77 +2476,65 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"O método de controle de versão pode ser selecionado via opção --backup ou "
-"pela\n"
-"variável de ambiente VERSION_CONTROL. Aqui estão os valores:\n"
-"  none, off       nunca faz backups (mesmo se --backup for fornecido)\n"
-"  numbered, t     faz backups numerados\n"
-"  existing, nil   numerado se backups numerados existirem; Se não, simples\n"
-"  simple, never   sempre faz backups simples\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"O sufixo de backup é '~', a menos que seja definido com --suffix ou com a\n"
-"variável de ambiente SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              mantém msgids anteriores de mensagens "
-"traduzidas\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       suprime indicadores de progresso\n"
+msgstr ""
 
-#: src/msgmerge.c:1622
-#, c-format
+#: src/msgmerge.c:1604
+#, fuzzy, c-format
 msgid "this message should define plural forms"
-msgstr "esta mensagem deveria definir formas de plural"
+msgstr "esta mensagem � utilizada mas n�o definida em %s"
 
-#: src/msgmerge.c:1645
-#, c-format
+#: src/msgmerge.c:1627
+#, fuzzy, c-format
 msgid "this message should not define plural forms"
-msgstr "esta mensagem não deveria definir formas de plural"
+msgstr "esta mensagem � utilizada mas n�o definida em %s"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLeu %ld antigas + %ld referências, mesclou %ld, marcou como aproximadas "
-"%ld, perdidas %ld, obsoletas %ld.\n"
+"%sLido %ld antigas + %ld refer�ncia, concatenadas %ld, aproximadas %ld, "
+"perdidas %ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
 msgstr " feito.\n"
 
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
-#, c-format
+#, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s e nomes de arquivos explícitos são mutualmente exclusivos"
+msgstr "%s e %s s�o mutuamente exclusivos"
 
 #: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Uso: %s [OPÇÃO] [ARQUIVO]...\n"
+msgstr ""
 
 #: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
-"Converte catálogo de mensagens binário em arquivo .po estilo Uniforum.\n"
 
 #: src/msgunfmt.c:440
 #, c-format
@@ -3072,14 +2542,11 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  modo Java: entrada é uma classe\n"
-"                              ResourceBundle de Java\n"
 
 #: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
-"      --csharp                modo C#: entrada é um arquivo .dll de .NET\n"
 
 #: src/msgunfmt.c:444
 #, c-format
@@ -3087,26 +2554,22 @@
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      modo de recursos C#: entrada é um arquivo\n"
-"                              .resources de .NET\n"
 
 #: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   modo Tcl: entrada é um arquivo .msg de tcl/"
-"msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  ARQUIVO ...                 arquivos .mo de entrada\n"
+msgstr ""
 
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "Localização do arquivo de entrada em modo Java:\n"
+msgstr ""
 
 #: src/msgunfmt.c:462
 #, c-format
@@ -3115,14 +2578,11 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"O nome da classe é determinada pelo anexo do nome da localização ao\n"
-"nome do recurso, separados por um sublinhado. A classe é localizada\n"
-"usando a CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
-#, c-format
+#, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Localização do arquivo de entrada em modo C#:\n"
+msgstr "n�o foi informado o arquivo de entrada"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3130,13 +2590,11 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"As opções -l e -d são obrigatórias. O arquivo .dll está localizado em um\n"
-"subdiretório do diretório especificado, cujo nome depende da localização.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Localização do arquivo de entrada em modo Tcl:\n"
+msgstr ""
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3144,21 +2602,18 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"As opções -l e -d são obrigatórias. O arquivo .msg está localizado no\n"
-"diretório especificado.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                escreve um estilo de saída com recuo\n"
+msgstr ""
 
-# Deixei maiúsculo foi todas outras ocorrências de Uniforum estão em assim. - Rafael
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                escreve em estilo Uniforum estrito\n"
+msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3170,29 +2625,18 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"Unifica traduções duplicadas em um catálogo de tradução.\n"
-"Localiza traduções duplicadas no mesmo ID de mensagem. Tais duplicatas\n"
-"são entradas inválidas para outros programas, como msgfmt, msgmerge,\n"
-"msgcat. Por padrão, duplicatas são mescladas. Quando se está usando a\n"
-"opção --repeated, apenas duplicatas são retornadas e todas as outras\n"
-"mensagens são descartadas. Comentários e comentários extraídos serão\n"
-"cumulados, exceto que, se --use-first for especificado, caso em que eles\n"
-"serão retirados da primeira tradução. Posições de arquivos serão cumuladas.\n"
-"Quando se está usando a opção --unique, duplicatas são descartadas.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              exibe apenas duplicados\n"
+msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                exibe apenas mensagens únicas, descarta\n"
-"                              duplicatas\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3200,196 +2644,198 @@
 msgstr "<stdin>"
 
 #: src/po-charset.c:489
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Codificação de caracteres \"%s\" não é um nome de codificação portável\n"
-"Conversão da mensagem para a codificação do usuário pode não funcionar.\n"
+"%s: aviso: charset \"%s\" n�o � um encoding port�vel\n"
+"%*s aviso: convers�o de charset pode n�o funcionar"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Não há suporte a codificação de caracteres \"%s\". %s depende do iconv(),\n"
-"e iconv() não tem suporte a \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Instalar o GNU libiconv e, então, reinstalar o GNU gettext\n"
-"deveria corrigir este problema.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Continuando mesmo assim, esperava erros de análise."
+msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
-msgstr "Continuando mesmo assim."
+msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Não há suporte a codificação de caracteres \"%s\". %s depende do iconv().\n"
-"Esta versão foi compilada sem iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
+#, fuzzy
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"Faltando codificação de caracteres no cabeçalho.\n"
-"Conversão da mensagem para a codificação do usuário pode não funcionar.\n"
+"%s: aviso: falta o cabe�alho relativo ao charset\n"
+"%*s aviso: convers�o de charset n�o vai funcionar"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "seção \"msgstr[]\" não localizada"
+msgid "missing `msgstr[]' section"
+msgstr "se��o `msgstr[]' n�o localizada"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "seção \"msgid_plural\" não localizada"
+msgid "missing `msgid_plural' section"
+msgstr "se��o `msgid_plural' n�o localizada"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "seção \"msgstr\" não localizada"
+msgid "missing `msgstr' section"
+msgstr "se��o `msgstr' n�o localizada"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "primeira forma em plural tem o índice diferente de zero"
+msgstr "primeira forma em plural tem o �ndice diferente de zero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "forma plural tem o índice errado"
+msgstr "forma plural tem o �ndice errado"
 
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
-msgstr "excesso de erros - abortando"
+msgstr "excesso de erros - finalizando"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "sequência multi-byte inválida"
+msgstr "sequ�ncia multibyte inv�lido"
 
 #: src/po-lex.c:465
-#, c-format
+#, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "sequência de multi-byte incompleta no final do arquivo"
+msgstr "sequ�ncia multibyte inv�lido"
 
 #: src/po-lex.c:475
-#, c-format
+#, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "sequência de multi-byte incompleta no final da linha"
+msgstr "sequ�ncia multibyte inv�lido"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "falha no iconv"
+msgstr ""
 
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "palavra-chave \"%s\" desconhecida"
+msgstr "palavra chave \"%s\" desconhecida"
 
 #: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
-msgstr "sequência de controle ilegal"
+msgstr "seq��ncia de controle ilegal"
 
 #: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
-msgstr "fim de arquivo dentro de string"
+msgstr "fim de arquivo sem string"
 
 #: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr "fim de linha dentro de string"
+msgstr "fim de linha sem string"
 
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "separador de contexto <EOT> dentro de string"
+msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "este arquivo parece não conter diretivas de domínio"
+msgstr "este arquivo parece n�o conter diretivas de dom�nio"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "definição duplicada de mensagem"
+msgstr "defini��o duplicada de mensagem"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
+#, fuzzy
 msgid "this is the location of the first definition"
-msgstr "esta é a localização da primeira definição"
+msgstr "...esta � a localiza��o da primeira defini��o"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
-#, c-format
+#, fuzzy, c-format
 msgid "file \"%s\" is truncated"
-msgstr "arquivo \"%s\" está truncado"
+msgstr "arquivo \"%s\" truncado"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "arquivo \"%s\" contém string não terminada em NUL"
+msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "arquivo \"%s\" não está no formato .mo de GNU"
+msgstr "arquivo \"%s\" n�o est� no formato GNU .mo"
 
 #: src/read-mo.c:178
-#, c-format
+#, fuzzy, 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"
+msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "aviso: sintaxe \\uxxxx inválida para caractere Unicode"
+msgstr "%s:%d: aviso: caractere constante indeterminado"
 
 #: src/read-stringtable.c:802
+#, fuzzy
 msgid "warning: unterminated string"
-msgstr "aviso: string não terminada"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr "aviso: erro de sintaxe"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "aviso: par chave/valor não terminado"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr "aviso: erro de sintaxe, esperava \";\" após string"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "aviso: erro de sintaxe, esperada \"=\" ou \";\" após string"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/recode-sr-latin.c:116
-#, c-format
+#, fuzzy, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Escrito por %s e %s.\n"
+msgstr "Escrito por %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3397,12 +2843,12 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Danilo Segan"
+msgstr ""
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Re-codifica texto sérvio de script em cirílico para latim.\n"
+msgstr ""
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3410,28 +2856,26 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"O texto de entrada é lido da entrada padrão. O texto convertido é enviado para\n"
-"a saída padrão.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "entrada não é válida na codificação \"%s\""
+msgstr ""
 
-#: src/recode-sr-latin.c:367
-#, c-format
+#: src/recode-sr-latin.c:366
+#, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "erro ao converter da codificação \"%s\" para \"%s\""
+msgstr "erro ao abrir \"%s\" para leitura"
 
 #: src/urlget.c:159
-#, c-format
+#, fuzzy, c-format
 msgid "expected two arguments"
-msgstr "esperava dois argumentos"
+msgstr "excesso de par�metros"
 
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Uso: %s [OPÇÃO] URL ARQUIVO\n"
+msgstr ""
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3439,63 +2883,44 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
-"Obtém e envia o conteúdo de uma URL. Se a URL não puder ser acessada,\n"
-"o ARQUIVO acessível localmente é usado.\n"
-
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "erro ao ler \"%s\""
 
 #: src/urlget.c:234
-#, c-format
+#, fuzzy, c-format
 msgid "error writing stdout"
-msgstr "erro ao escrever na saída padrão"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "erro após leitura de \"%s\""
+msgstr "erro ao gravar o arquivo \"%s\""
 
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Obtendo %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " tempo esgotado.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " falhou.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"Não foi possível enviar múltiplos domínios de tradução em um único arquivo "
-"com o formato de saída especificado. Ao invés, tente usar sintaxe de arquivo "
-"PO."
 
 #: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"Não foi possível enviar múltiplos domínios de tradução em um único arquivo "
-"com o formato de saída especificado."
 
 #: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"catálogo de mensagens possui traduções dependentes de contexto, mas o "
-"formato de saída não tem suporte a elas."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3503,77 +2928,65 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"catálogo de mensagens possui traduções dependentes de contexto, mas o "
-"formato de saída não tem suporte a elas. Tente gerar uma classe Java usando "
-"\"msgfmt --java\", ao invés de um arquivo de propriedades."
 
 #: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"catálogo de mensagens possui traduções em forma de plural, mas o formato de "
-"saída não tem suporte a elas."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "não foi possível criar o arquivo de saída \"%s\""
+msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
-msgstr "saída padrão"
+msgstr "sa�da padr�o"
 
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "falha ao criar o diretório \"%s\""
+msgstr ""
 
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "compilação de classe C# falhou, por favor tente --verbose"
+msgstr ""
 
 #: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
-msgstr "compilação de classe C# falhou"
+msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "não é um nome de classe Java válido: %s"
+msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, 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"
+msgstr ""
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "erro ao abrir o arquivo \"%s\" para gravação"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "sequência multi-byte inválida"
+msgstr "erro ao abrir o arquivo \"%s\" para grava��o"
 
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"mensagens internacionalizadas não devem conter o caractere de escape \"\\%c\""
+"mensagens internacionalizadas n�o devem conter o caractere de escape `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3581,12 +2994,8 @@
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"O seguinte msgctxt contém caracteres não ASCII.\n"
-"Isso vai causar problemas a tradutores que usem uma codificação de\n"
-"caracteres diferente da sua. Considere usar um msgctxt ASCII puro.\n"
-"%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3594,19 +3003,12 @@
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"O seguinte msgid contém caracteres não ASCII.\n"
-"Isso vai causar problemas a tradutores que usem uma codificação de\n"
-"caracteres diferente da sua. Considere usar um msgid ASCII puro.\n"
-"%s\n"
 
 #: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"catálogo de mensagens possui traduções em forma de plural,\n"
-"mas o formato de catálogo de mensagens Qt não tem suporte a manipular "
-"plural\n"
 
 #: src/write-qt.c:693
 msgid ""
@@ -3615,10 +3017,6 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"catálogo de mensagens tem strings msgctxt contendo caracteres não "
-"ISO-8859-1\n"
-"mas o formato de catálogo de mensagens tem suporte a Unicode apenas nas\n"
-"strings traduzidas, não em strings de contexto\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3626,76 +3024,59 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"catálogo de mensagens tem strings msgid contendo caracteres não ISO-8859-1\n"
-"mas o formato de catálogo de mensagens tem suporte a Unicode apenas nas\n"
-"strings traduzidas, não em strings não traduzidas\n"
 
 #: src/write-resources.c:94
-#, c-format
+#, fuzzy, c-format
 msgid "error while writing to %s subprocess"
-msgstr "erro ao gravar no subprocesso de %s"
+msgstr "erro ao gravar o arquivo \"%s\""
 
 #: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"catálogo de mensagens possui traduções dependente de contexto\n"
-"mas o formato .resources C# não tem suporte a contextos\n"
 
 #: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"catálogo de mensagens possui traduções em forma de plural,\n"
-"mas o formato de .resources C# não tem suporte a manipular plural\n"
 
 #: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"catálogo de mensagens possui traduções dependente de contexto\n"
-"mas o formato de catálogo de mensagens Tcl não tem suporte a contextos\n"
 
 #: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"catálogo de mensagens possui traduções em forma de plural,\n"
-"mas o formato de catálogo de mensagens Tcl não tem suporte a manipular "
-"plural\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
-#, c-format
+#: src/x-awk.c:341 src/x-python.c:1074
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: aviso: string não terminada"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/x-awk.c:592
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: aviso: expressão regular não terminada"
-
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "aviso: caractere Unicode inválido"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: aviso: constante de caractere não terminada"
+msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: aviso: string literal não terminada"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
-msgstr "Por favor, especifique a codificação fonte por meio de --from-code"
+msgstr ""
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3703,8 +3084,6 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Sequência multi-byte inválida.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
 #: src/x-csharp.c:285
 #, c-format
@@ -3712,8 +3091,6 @@
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Sequência multi-byte longa e inválida.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
 #: src/x-csharp.c:297
 #, c-format
@@ -3721,8 +3098,6 @@
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Sequência multi-byte incompleta ao finado do arquivo.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
 #: src/x-csharp.c:306
 #, c-format
@@ -3730,13 +3105,11 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: falha no iconv"
+msgstr ""
 
 #: src/x-csharp.c:338
 #, c-format
@@ -3744,246 +3117,144 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 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:1390 src/x-python.c:1138
-#, c-format
+#: src/x-csharp.c:1390 src/x-python.c:1281
+#, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: aviso: caractere Unicode inválido"
+msgstr "%s:%d: aviso: caractere constante indeterminado"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: aviso: constante de caractere não terminada"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: aviso: \")\" encontrado quando \"}\" era esperado"
+msgstr ""
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: aviso: \"}\" encontrado quando \")\" era esperado"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Faltando contexto para a string extraída do elemento \"%s\""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "O elemento raiz <%s> não é permitido em um arquivo Glade válido"
+msgstr ""
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"Não há suporte à linguagem \"glade\". %s depende do expat.\n"
-"Esta versão foi compilada sem expat.\n"
 
 #: src/x-java.c:494
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: aviso: substituto solitário U+%04X"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Por favor, especifique a codificação fonte por meio de --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Sequência multi-byte inválida.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Sequência multi-byte longa e inválida.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Sequência multi-byte incompleta ao final do arquivo.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Sequência multi-byte incompleta ao final da linha.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-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-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: aviso: RegExp literal terminada muito cedo"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: aviso: %s não é permitido"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: aviso: marcação XML indeterminada"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
-"%s:%d: não foi possível localizar terminador de string \"%s\" em lugar "
-"nenhum antes do fim do arquivo"
 
 #: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: faltando chave da direita em \\x{HEXNUMBER}"
+msgstr ""
 
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolação (\"\\l\") inválida de caractere de 8bit \"%c\""
+msgstr ""
 
 #: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolação (\"\\u\") inválida de caractere de 8bit \"%c\""
+msgstr ""
 
 #: src/x-perl.c:1217
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: interpolação de variável inválida em \"%c\""
+msgstr "%s: op��o inv�lida -- %c\n"
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolação (\"\\L\") inválida de caractere de 8bit \"%c\""
+msgstr ""
 
 #: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolação (\"\\U\") inválida de caractere de 8bit \"%c\""
+msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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 ""
-"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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Sequência multi-byte inválida.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code\n"
-"ou um comentário, como especificado em\n"
-"http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Sequência longa de multi-byte incompleta.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code\n"
-"ou um comentário, como especificado em\n"
-"http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: Sequência multi-byte incompleta ao final do arquivo.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code\n"
-"ou um comentário, como especificado em\n"
-"http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Sequência multi-byte incompleta ao final da linha.\n"
-"Por favor, especifique a codificação fonte correta por meio de --from-code\n"
-"ou um comentário, como especificado em\n"
-"http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Sequência multi-byte inválida.\n"
-"Por favor, especifique a codificação fonte por meio de --from-code\n"
-"ou um comentário, como especificado em\n"
-"http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Codificação desconhecida \"%s\". Procedendo com ASCII."
+msgstr ""
 
 #: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: definição de string inválida"
+msgstr ""
 
 #: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
-msgstr "%s:%d: faltando número após #"
+msgstr ""
 
 #: src/x-rst.c:207
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: expressão de string inválida"
+msgstr "%s:%d: aviso: string literal indeterminada"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3991,71 +3262,52 @@
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
-"%s:%lu: aviso: a sintaxe $\"...\" está obsoleta por motivos de segurança; ao "
-"invés disso, use eval_gettext"
-
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: aviso: expressão regular literal terminada muito cedo"
 
-#: src/xgettext.c:545
-#, 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:621
 #, 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"
+"--join-existing n�o pode ser usado enquanto a sa�da � escrita na sa�da padr�o"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext não pode funcionar sem as teclas para procurar"
+msgstr "xgettext n�o pode funcionar sem as teclas para procurar"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "aviso: arquivo \"%s\", extensão \"%s\" é desconhecida; tentarei C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "aviso: arquivo `%s' extens�o `%s' � desconhecida; tentarei C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "Extrai strings traduzíveis dos arquivos de entrada passados.\n"
+msgstr ""
 
-# "messages.po" é, de fato, um nome de um arquivo; não mude isso.
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=NOME   usa NOME.po para saída (ao invés de messages."
-"po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"  -p, --output-dir=DIR        saída de arquivos serão colocados no\n"
-"                              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:891
-#, c-format
+#: src/xgettext.c:852
+#, fuzzy, c-format
 msgid "Choice of input file language:\n"
-msgstr "Escolha da linguagem do arquivo de entrada:\n"
+msgstr "n�o foi informado o arquivo de entrada"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4064,61 +3316,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=NOME         reconhece a linguagem especificada\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
-"                                 EmacsLisp, librep, Scheme, Smalltalk, "
-"Java,\n"
-"                                 JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
-"                                 GCC-source, NXStringTable, RST, Glade, "
-"Lua,\n"
-"                                 JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   abreviação para --language=C++\n"
+msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
-"Por padrão, a linguagem é adivinhada dependendo da extensão do nome do\n"
-"arquivo de entrada.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=NOME        codificação dos arquivos de entrada\n"
-"                                (exceto para Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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"
+msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         junta mensagens com arquivo existente\n"
+msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4127,246 +3362,180 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   coloca blocos de comentários começando com TAG "
-"e\n"
-"                              precedendo linhas de palavras-chaves no "
-"arquivo\n"
-"                              de saída\n"
-"  -c, --add-comments          coloca todos os blocos de comentários "
-"precedendo\n"
-"                              as linhas de palavras-chaves no arquivo de "
-"saída\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Opções específicas de linguagens:\n"
+msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           extrai todas as strings\n"
+msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC, "
-"Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC, "
-"Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=PALAVRA:ARG:FLAG\n"
-"                              flag adicional para strings dentro do "
-"argumento\n"
-"                              de número ARG da palavra-chave PALAVRA\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC, "
-"Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                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:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    reconhece strings no formato Qt\n"
+msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (apenas a linguagem C++)\n"
+msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   reconhece as strings de formato KDE 4\n"
+msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 reconhece strings no formato Boost\n"
+msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 resultado de reconhecimento de string de\n"
-"                              formato mais detalhado\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
-"      --copyright-holder=STRING\n"
-"                              define o detentor dos direitos autorais\n"
-"                              na saída\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          omite direitos autorais da FSF na saída para\n"
-"                              usuários de fora\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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"
+msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=E-MAIL@ENDEREÇO\n"
-"                              define o endereço para relatar erros de\n"
-"                              msgid\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRING], --msgstr-prefix[=STRING]\n"
-"                              usa STRING ou \"\" como prefixo para valores "
-"de\n"
-"                              msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRING], --msgstr-suffix[=STRING]\n"
-"                              usa STRING ou \"\" como sufixo para valores "
-"de\n"
-"                              msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Um argumento de --flag não possui a sintaxe <palavra-chave>:<argnum>:"
-"[pass-]<flag>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
-msgstr "entrada padrão"
+msgstr "entrada padr�o"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Caractere não-ASCII em %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Comentário não ASCII em ou antes de %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "String não-ASCII em %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
-msgstr "%s%s: aviso: "
+msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
-"Apesar de estar declarada assim, o %s não é uma string de formato válida de "
-"%s. Motivo: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4374,74 +3543,53 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"String de formato de \"%s\" com argumentos sem nome não podem ser "
-"localizada\n"
-"adequadamente:\n"
-"O tradutor não pode reordenar os argumentos.\n"
-"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:2283
+#: src/xgettext.c:2197
 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 ""
-"msgid vazio. Ele está reservado pelo GNU gettext:\n"
-"gettext(\"\") retorna a entrada de cabeçalho com\n"
-"informações meta, e não a string vazia.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "especificação de argumento ambíguo para a palavra-chave \"%.*s\""
+msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
+msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "contexto não confere para formas singular e plural"
+msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"A opção --msgid-bugs-address não foi especificada.\n"
-"Se você está usando um arquivo \"Makevars\", por favor\n"
-"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:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "idioma \"%s\" desconhecido"
+msgid "language `%s' unknown"
+msgstr "idioma `%s' desconhecido"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
-msgstr "<sem nome>"
-
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "campo de cabeçalho \"%s\" deveria começar no início da linha\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "alguns campos do cabeçalho ainda possuem os valores iniciais padrões\n"
+msgstr ""
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opção ilegal -- %c\n"
+#~ msgstr "%s: op��o ilegal -- %c\n"
 
 #, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
@@ -4455,7 +3603,7 @@
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não "
+#~ "Este � um sofware livre; veja os fontes para condi��es de c�pia.  N�o "
 #~ "existe\n"
 #~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA "
 #~ "FINALIDADE.\n"
@@ -4482,26 +3630,26 @@
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] def.po ref.po\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
+#~ "Uso: %s [OP��O] def.po ref.po\n"
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "  -e, --no-escape          n�o utilizar escapes C na sa�da (padr�o)\n"
+#~ "  -E, --escape             usar escapes C na sa�da sem caracteres "
 #~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "  -i, --indent             estilo de saída indentado\n"
-#~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
+#~ "  -i, --indent             estilo de sa�da indentado\n"
+#~ "  -o, --output-file=ARQ    resultado ser� gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
 #~ "      --add-location       preserva as linhas '#: arquivo:"
-#~ "linha' (padrão)\n"
+#~ "linha' (padr�o)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 
 #~ msgid "missing arguments"
-#~ msgstr "parâmetros não informados"
+#~ msgstr "par�metros n�o informados"
 
 #, fuzzy
 #~ msgid ""
@@ -4514,17 +3662,17 @@
 #~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 #~ "                            to MSGID from TEXTDOMAIN\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] [[[DOMÍNIO] MSGID] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-#~ "  -e                        permite a expansão de alguns caracteres de "
+#~ "Uso: %s [OP��O] [[[DOM�NIO] MSGID] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=DOM�NIO      recupera mensagens traduzidas em DOM�NIO\n"
+#~ "  -e                        permite a expans�o de alguns caracteres de "
 #~ "escape\n"
 #~ "  -E                        (ignorado para compatibilidade)\n"
 #~ "  -h, --help                apresenta esta ajuda e finaliza\n"
 #~ "  -n                        suprime caractere de nova linha\n"
-#~ "  -v, --version             apresenta versão e finaliza\n"
-#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas "
+#~ "  -v, --version             apresenta vers�o e finaliza\n"
+#~ "  [DOM�NIO] MSGID           recupera mensagens traduzidas "
 #~ "correspondentes\n"
-#~ "                            para MSGID no DOMÍNIO\n"
+#~ "                            para MSGID no DOM�NIO\n"
 
 #, fuzzy
 #~ msgid ""
@@ -4543,18 +3691,18 @@
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Caso o parâmetro DOMÍNIO não seja informado este será determinado através "
+#~ "Caso o par�metro DOM�NIO n�o seja informado este ser� determinado atrav�s "
 #~ "da\n"
-#~ "variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens não for "
+#~ "vari�vel de ambiente TEXTDOMAIN. Se o cat�logo de mensagens n�o for "
 #~ "encontrado\n"
-#~ "no diretório padrão, outra localização pode ser especificada na variável\n"
+#~ "no diret�rio padr�o, outra localiza��o pode ser especificada na vari�vel\n"
 #~ "TEXTDOMAINDIR.\n"
-#~ "Quando utilizado com a opção -s o programa comporta-se como um comando "
+#~ "Quando utilizado com a op��o -s o programa comporta-se como um comando "
 #~ "echo.\n"
-#~ "Mas não somente copiando seus parâmetros para stdout, e sim traduzindo "
+#~ "Mas n�o somente copiando seus par�metros para stdout, e sim traduzindo "
 #~ "as\n"
-#~ "mensagens encontradas no catálogo selecionado\n"
-#~ "Diretório de pesquisa padrão: %s\n"
+#~ "mensagens encontradas no cat�logo selecionado\n"
+#~ "Diret�rio de pesquisa padr�o: %s\n"
 
 #, fuzzy
 #~ msgid ""
@@ -4569,45 +3717,45 @@
 #~ "  COUNT                     choose singular/plural form based on this "
 #~ "value\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO] [[[DOMÍNIO] MSGID] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-#~ "  -e                        permite a expansão de alguns caracteres de "
+#~ "Uso: %s [OP��O] [[[DOM�NIO] MSGID] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=DOM�NIO      recupera mensagens traduzidas em DOM�NIO\n"
+#~ "  -e                        permite a expans�o de alguns caracteres de "
 #~ "escape\n"
 #~ "  -E                        (ignorado para compatibilidade)\n"
 #~ "  -h, --help                apresenta esta ajuda e finaliza\n"
 #~ "  -n                        suprime caractere de nova linha\n"
-#~ "  -v, --version             apresenta versão e finaliza\n"
-#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas "
+#~ "  -v, --version             apresenta vers�o e finaliza\n"
+#~ "  [DOM�NIO] MSGID           recupera mensagens traduzidas "
 #~ "correspondentes\n"
-#~ "                            para MSGID no DOMÍNIO\n"
+#~ "                            para MSGID no DOM�NIO\n"
 
 #, fuzzy
 #~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "arquivo \"%s\" contém string não terminada em NULL"
+#~ msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "falha na pesquisa \"%s\" offset %ld"
 
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #, fuzzy
 #~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+#~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
 
 #~ msgid "while creating hash table"
 #~ msgstr "enquanto criando tabela hash"
 
 #~ msgid "while preparing output"
-#~ msgstr "enquanto preparando a saída"
+#~ msgstr "enquanto preparando a sa�da"
 
 #~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "esta mensagem não tem definição no domínio \"%s\""
+#~ msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] filename.po ...\n"
@@ -4635,34 +3783,34 @@
 #~ "If input file is -, standard input is read.  If output file is -,\n"
 #~ "output is written to standard output.\n"
 #~ msgstr ""
-#~ "Uso: %s [OPÇÃO]  arquivo.po ...\n"
-#~ "Gera catálogo de mensagens binárias a partir da descrição de tradução de "
+#~ "Uso: %s [OP��O]  arquivo.po ...\n"
+#~ "Gera cat�logo de mensagens bin�rias a partir da descri��o de tradu��o de "
 #~ "texto.\n"
 #~ "\n"
-#~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
-#~ "para as opções curtas\n"
-#~ "  -a, --alignment=NÚMERO   alinha strings em um NÚMERO de bytes (padrão: "
+#~ "Par�metros obrigat�rios para op��es longas s�o tamb�m obrigat�rios\n"
+#~ "para as op��es curtas\n"
+#~ "  -a, --alignment=N�MERO   alinha strings em um N�MERO de bytes (padr�o: "
 #~ "%d)\n"
-#~ "  -c, --check              executa conferências dependentes de linguagem "
+#~ "  -c, --check              executa confer�ncias dependentes de linguagem "
 #~ "em strings\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
 #~ "arquivos de entrada\n"
-#~ "  -f, --use-fuzzy          use entradas aproximadas (fuzzy) na saída\n"
+#~ "  -f, --use-fuzzy          use entradas aproximadas (fuzzy) na sa�da\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "      --no-hash            arquivos binários não serão incluídos na "
+#~ "      --no-hash            arquivos bin�rios n�o ser�o inclu�dos na "
 #~ "tabela hash\n"
-#~ "  -o, --output-file=ARQ    especifica o nome do arquivo de saída ARQ\n"
-#~ "      --statistics         mostra estatísticas das traduções\n"
+#~ "  -o, --output-file=ARQ    especifica o nome do arquivo de sa�da ARQ\n"
+#~ "      --statistics         mostra estat�sticas das tradu��es\n"
 #~ "      --strict             habilita o modo Uniforum estrito\n"
 #~ "  -v, --verbose            lista problemas do arquivo de entrada\n"
-#~ "  -V, --version            apresenta informações de versão e finaliza\n"
+#~ "  -V, --version            apresenta informa��es de vers�o e finaliza\n"
 #~ "\n"
-#~ "Informando a opção -v mais que uma vez as mensagens de saída são "
+#~ "Informando a op��o -v mais que uma vez as mensagens de sa�da s�o "
 #~ "incrementadas\n"
 #~ "\n"
-#~ "Se o arquivo de entrada é -, a entrada padrão é lida. Caso o arquivo de "
-#~ "saída\n"
-#~ "seja - as mensagens serão geradas na saída padrão\n"
+#~ "Se o arquivo de entrada � -, a entrada padr�o � lida. Caso o arquivo de "
+#~ "sa�da\n"
+#~ "seja - as mensagens ser�o geradas na sa�da padr�o\n"
 
 #~ msgid ""
 #~ "  -n, --add-location             generate '#: filename:line' lines "
@@ -4685,36 +3833,36 @@
 #~ msgstr ""
 #~ "  -n, --add-location             adicionar linhas '#: arquivo:"
 #~ "linha' (default)\n"
-#~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
-#~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
-#~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "      --omit-header              n�o gravar cabe�alho com `msgid \"\"' \n"
+#~ "  -o, --output=ARQ               grava sa�da para o arquivo especificado\n"
+#~ "  -p, --output-dir=DIR           arquivos de sa�da ser�o gravados em DIR\n"
+#~ "  -s, --sort-output              gera sa�da ordenada, removendo "
 #~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
-#~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
-#~ "  -V, --version                  apresenta informação de versão e sai\n"
+#~ "  -T, --trigraphs                entende tr�grafos ANSI C na entrada\n"
+#~ "  -V, --version                  apresenta informa��o de vers�o e sai\n"
 #~ "  -n, --add-location             adicionar linhas '#: arquivo:"
 #~ "linha' (default)\n"
-#~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
-#~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
-#~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "      --omit-header              n�o gravar cabe�alho com `msgid \"\"' \n"
+#~ "  -o, --output=ARQ               grava sa�da para o arquivo especificado\n"
+#~ "  -p, --output-dir=DIR           arquivos de sa�da ser�o gravados em DIR\n"
+#~ "  -s, --sort-output              gera sa�da ordenada, removendo "
 #~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
-#~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
-#~ "  -V, --version                  apresenta informação de versão e sai\n"
-#~ "  -w, width=NÚMERO               configura a largura da página de saída\n"
-#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ não são "
-#~ "extraídas\n"
+#~ "  -T, --trigraphs                entende tr�grafos ANSI C na entrada\n"
+#~ "  -V, --version                  apresenta informa��o de vers�o e sai\n"
+#~ "  -w, width=N�MERO               configura a largura da p�gina de sa�da\n"
+#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ n�o s�o "
+#~ "extra�das\n"
 #~ "\n"
-#~ "Se ARQUIVO DE ENTRADA é -, a entrada padrão é lida.\n"
+#~ "Se ARQUIVO DE ENTRADA � -, a entrada padr�o � lida.\n"
 
 #~ msgid ""
 #~ "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 #~ "%*s  warning: consider installing GNU libiconv and then\n"
 #~ "%*s           reinstalling GNU gettext"
 #~ msgstr ""
-#~ "%s: aviso: charset \"%s\" não é suportado pelo iconv%s\n"
+#~ "%s: aviso: charset \"%s\" n�o � suportado pelo iconv%s\n"
 #~ "%*s aviso: Instale a biblioteca GNU libiconv e depois\n"
 #~ "%*s        reinstale o GNU gettext"
 
@@ -4723,6 +3871,6 @@
 #~ "%*s  warning: consider installing GNU libiconv and then\n"
 #~ "%*s           reinstalling GNU gettext"
 #~ msgstr ""
-#~ "%s: aviso: charset \"%s\" não é suportado sem o iconv%s\n"
+#~ "%s: aviso: charset \"%s\" n�o � suportado sem o iconv%s\n"
 #~ "%*s aviso: considere instalar a biblioteca GNU libiconv e depois\n"
 #~ "%*s        reinstale o GNU gettext"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/pt.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/pt.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/pt.po gettext-0.18.1.1/gettext-tools/po/pt.po
--- gettext-0.19.3/gettext-tools/po/pt.po	2014-10-16 06:10:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/pt.po	2010-06-06 12:49:58.000000000 +0000
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 0.10.23\n"
+"Project-Id-Version: GNU gettext 0.10.23\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -26,65 +26,65 @@
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:325
-#, c-format
+#: gnulib-lib/clean-temp.c:335
+#, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
+msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr ""
+msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: gnulib-lib/copy-file.c:193
-#, c-format
-msgid "cannot open backup file %s for writing"
-msgstr ""
+#: gnulib-lib/copy-file.c:74
+#, fuzzy, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -101,98 +101,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: a op��o `%s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a op��o `--%s' n�o permite um argumento\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a op��o `%c%s' n�o permite um argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a op��o `%s' requere um argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: op��o n�o reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: op��o n�o reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: op��o ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: op��o requere um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a op��o `%s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: a op��o `--%s' n�o permite um argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: a op��o `%s' requere um argumento\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -202,96 +202,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "mem�ria exausta"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, 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:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
@@ -307,20 +269,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "erro durante a abertura de \"%s\" para leitura"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -329,19 +284,17 @@
 msgstr "as especifica��es do argumento %u s�o diferentes"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "as especifica��es do argumento %u s�o diferentes"
@@ -351,26 +304,24 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -456,16 +407,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
@@ -633,7 +574,7 @@
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "as especifica��es do argumento %u s�o diferentes"
+msgstr "o n�mero de especifica��es em `msgid' e `msgstr' � diferente"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
@@ -647,9 +588,7 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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"
@@ -666,16 +605,16 @@
 msgstr ""
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr ""
+msgstr "o n�mero de especifica��es em `msgid' e `msgstr' � diferente"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr ""
+msgstr "o n�mero de especifica��es em `msgid' e `msgstr' � diferente"
 
 #: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
@@ -689,32 +628,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "as especifica��es do argumento %u s�o diferentes"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -756,11 +669,11 @@
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -769,58 +682,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informa��o\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -828,34 +741,34 @@
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -864,247 +777,236 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
-#, c-format
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#, fuzzy, c-format
 msgid "at most one input file allowed"
-msgstr ""
+msgstr "s�o necess�rios exactamente 2 ficheiros"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s s�o mutuamente exclusivas"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1113,118 +1015,133 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
-#, c-format
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
+"Utiliza��o: %s [OP��O] [FICHEIRO]...\n"
+"Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+"obrigat�rios para as op��es curtas.\n"
+"  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+"                              (op��o por defeito)\n"
+"  -E, --escape                usa sequ�ncias de escape do C na sa�da, n�o\n"
+"                              usando caracteres especiais\n"
+"  -h, --help                  mostra esta ajuda e sai\n"
+"  -i, --indent                usa o modo de sa�da alinhado\n"
+"  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+"FICHEIRO\n"
+"                              em vez do canal de sa�da por defeito (stdout)\n"
+"      --strict                usa o modo de sa�da Uniforum estrito\n"
+"  -V, --version               mostra a informa��o de vers�o e sai\n"
+"  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1233,97 +1150,97 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, 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:411
+#: src/msgcat.c:410
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ficheiros de entrada n�o fornecidos"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "s�o necess�rios exactamente 2 ficheiros"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1365,19 +1282,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1402,17 +1319,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensagem � usada mas n�o definida..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mas esta defini��o � semelhante"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensagem � usada mas n�o definida em %s"
@@ -1422,19 +1339,18 @@
 msgid "warning: this message is not used"
 msgstr "aten��o: esta mensagem n�o � usada"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1442,79 +1358,79 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "s�o necess�rios exactamente 2 ficheiros"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1523,15 +1439,15 @@
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 #: src/msgexec.c:196
-#, c-format
+#, fuzzy, c-format
 msgid "missing command name"
-msgstr ""
+msgstr "argumentos insuficientes"
 
 #: src/msgexec.c:257
 #, c-format
@@ -1555,7 +1471,7 @@
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1565,45 +1481,50 @@
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumentos insuficientes"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1611,226 +1532,189 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s e %s s�o mutuamente exclusivas"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, 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:749
+#: src/msgfmt.c:625
 #, 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:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1839,78 +1723,48 @@
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
-#, c-format
+#: src/msgfmt.c:711
+#, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
-msgstr ""
+msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1918,33 +1772,33 @@
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1952,131 +1806,111 @@
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
-#, c-format
+#: src/msgfmt.c:890
+#, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr ""
+msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
-#: src/msgfmt.c:1040
-#, c-format
+#: src/msgfmt.c:893
+#, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr ""
+msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
-#: src/msgfmt.c:1050
-#, c-format
+#: src/msgfmt.c:903
+#, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr ""
+msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "directiva `dom�nio %s' ignorada"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2116,30 +1950,30 @@
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2147,24 +1981,24 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2172,54 +2006,54 @@
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2231,7 +2065,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2249,13 +2083,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
@@ -2265,8 +2099,8 @@
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2363,104 +2197,116 @@
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
+#, fuzzy
 msgid "invalid nplurals value"
-msgstr ""
+msgstr "sequ�ncia de controlo ilegal"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
+#, fuzzy
 msgid "invalid plural expression"
-msgstr ""
+msgstr "sequ�ncia de controlo ilegal"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr ""
+msgstr "sequ�ncia de controlo ilegal"
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, fuzzy, 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] ""
+msgstr[0] "esta mensagem � usada mas n�o definida em %s"
+msgstr[1] "esta mensagem � usada mas n�o definida em %s"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "esta mensagem � usada mas n�o definida em %s"
+msgstr[1] "esta mensagem � usada mas n�o definida em %s"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
+#: src/msgl-check.c:602
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+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:619
+#: src/msgl-check.c:610
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
+#: src/msgl-check.c:625
 #, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+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:652
+#: src/msgl-check.c:643
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+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:660
+#: src/msgl-check.c:651
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
+#: src/msgl-check.c:666
 #, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "o campo `%s' falta no cabe�alho"
+
+#: src/msgl-check.c:784
+#, fuzzy, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "o campo `%s' do cabe�alho deve come�ar no in�cio da linha"
+
+#: src/msgl-check.c:809
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabe�alho ainda t�m o valor inicial por defeito"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "o campo `%s' falta no cabe�alho"
+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-iconv.c:65
 #, c-format
@@ -2476,8 +2322,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2491,24 +2337,24 @@
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2535,51 +2381,51 @@
 "resultados ser�o escritos no canal de sa�da por defeito (stdout) a\n"
 "menos que seja especificado um ficheiro de sa�da.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2591,36 +2437,36 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensagem � usada mas n�o definida em %s"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensagem � usada mas n�o definida em %s"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2629,7 +2475,7 @@
 "%sLidas %d antigas + %d refer�ncias, combinadas %d, aproximadas %d, faltam "
 "%d, obsoletas %d.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2694,9 +2540,9 @@
 msgstr ""
 
 #: src/msgunfmt.c:467
-#, c-format
+#, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
-msgstr ""
+msgstr "nenhum ficheiro de entrada fornecido"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -2727,7 +2573,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2740,12 +2586,12 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2758,72 +2604,73 @@
 msgstr ""
 
 #: src/po-charset.c:489
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
-msgstr ""
+msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
+#, fuzzy
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
-msgstr ""
+msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "falta a sec��o `msgstr'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "falta a sec��o `msgstr'"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "falta a sec��o `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
@@ -2833,20 +2680,20 @@
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
-#, c-format
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
+#, fuzzy, c-format
 msgid "invalid multibyte sequence"
-msgstr ""
+msgstr "sequ�ncia de controlo ilegal"
 
 #: src/po-lex.c:465
-#, c-format
+#, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr ""
+msgstr "sequ�ncia de controlo ilegal"
 
 #: src/po-lex.c:475
-#, c-format
+#, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr ""
+msgstr "sequ�ncia de controlo ilegal"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
@@ -2877,16 +2724,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro n�o pode conter directivas de dom�nio"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "defini��o de mensagem duplicada"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "este � o local da primeira defini��o"
 
@@ -2906,33 +2753,39 @@
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-mo.c:178
-#, c-format
+#, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-stringtable.c:802
+#, fuzzy
 msgid "warning: unterminated string"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -2959,12 +2812,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro durante a abertura de \"%s\" para leitura"
@@ -2986,21 +2839,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "erro durante a leitura de \"%s\""
-
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "erro durante a leitura de \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3071,17 +2914,17 @@
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3091,19 +2934,15 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: src/write-po.c:821
-msgid "incomplete multibyte sequence"
-msgstr ""
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "as mensagens de internacionaliza��o n�o devem conter\n"
 "a sequ�ncia de escape `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3112,7 +2951,7 @@
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3171,32 +3010,27 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "cuidado: nenhum elemento encontrado no cabe�alho"
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/x-awk.c:592
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr ""
-
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
-#, c-format
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/x-c.c:1348 src/x-vala.c:755
-#, c-format
+#: src/x-c.c:1247
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3228,7 +3062,7 @@
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3240,15 +3074,15 @@
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
+#: src/x-csharp.c:1390 src/x-python.c:1281
+#, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr ""
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
@@ -3260,22 +3094,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3283,63 +3107,9 @@
 msgstr ""
 
 #: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr ""
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr ""
-
-#: src/x-javascript.c:1055
 #, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "aten��o: esta mensagem n�o � usada"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr ""
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
 #: src/x-perl.c:308
 #, c-format
@@ -3376,13 +3146,13 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3390,7 +3160,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3398,7 +3168,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3406,7 +3176,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3414,7 +3184,7 @@
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3422,7 +3192,7 @@
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3449,64 +3219,54 @@
 "use eval_gettext instead"
 msgstr ""
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3515,45 +3275,44 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3563,37 +3322,33 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3601,85 +3356,84 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3687,7 +3441,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3695,52 +3449,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada standard"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3749,44 +3503,44 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr ""
 
 #: libgettextpo/gettext-po.c:84
@@ -3796,8 +3550,226 @@
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: op��o ilegal -- %c\n"
 
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "o campo `%s' ainda tem o valor por defeito inicial"
+
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...este � o local da primeira defini��o"
+
+#, fuzzy
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -t, --to-code=NAME             encoding for output\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "      --strict                modo de sa�da Uniforum estrito\n"
+#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
+#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
+#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "      --strict                modo de sa�da Uniforum estrito\n"
+#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
+#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
+#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "      --strict                modo de sa�da Uniforum estrito\n"
+#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
+#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
+#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "      --strict                modo de sa�da Uniforum estrito\n"
+#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
+#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
+#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "      --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "      --sort-output           generate sorted output\n"
+#~ "      --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "      --strict                modo de sa�da Uniforum estrito\n"
+#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
+#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
+#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
+
+#, fuzzy
 #~ msgid ""
-#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 #~ "  -e                        enable expansion of some escape sequences\n"
 #~ "  -E                        (ignored for compatibility)\n"
@@ -3818,8 +3790,32 @@
 #~ " [DIALECTO] MSGID          obt�m a mensagem traduzida correspondente a\n"
 #~ "                           MSGID do DIALECTO\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] [[[DIALECTO] MSGID] | [-s [MSGID]...]]\n"
+#~ " -d, --domain=DIALECTO     obt�m as mensagems traduzidas do DIALECTO\n"
+#~ " -e                        permite a expans�o de algumas sequ�ncias de "
+#~ "escape\n"
+#~ " -E                        (ignorado para compatibilidade)\n"
+#~ " -h, --help                mostra esta ajuda e sai\n"
+#~ " -n                        suprime o newline final\n"
+#~ " -V, --version             mostra a informa��o de vers�o e sai\n"
+#~ " [DIALECTO] MSGID          obt�m a mensagem traduzida correspondente a\n"
+#~ "                           MSGID do DIALECTO\n"
+
+#, fuzzy
 #~ msgid ""
-#~ "\n"
 #~ "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 "
@@ -3827,11 +3823,6 @@
 #~ "regular directory, another location can be specified with the "
 #~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' "
-#~ "command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those "
-#~ "messages\n"
-#~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
@@ -3845,99 +3836,34 @@
 #~ "s�o traduzidas.\n"
 #~ "Direct�rio standard de pesquisa: %s\n"
 
-#~ msgid "...this is the location of the first definition"
-#~ msgstr "...este � o local da primeira defini��o"
+#, fuzzy
+#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+#~ msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
+#, fuzzy
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek \"%s\" offset %ld falhou"
 
-#~ msgid "while preparing output"
-#~ msgstr "durante a prepara��o da sa�da"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "as especifica��es do argumento %u s�o diferentes"
 
 #, fuzzy
-#~ msgid ""
-#~ "Usage: %s [OPTION] INPUTFILE ...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "  -h, --help                     display this help and exit\n"
-#~ msgstr ""
-#~ "Utiliza��o: %s [OP��O] FICHEIRODEENTRADA...\n"
-#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-#~ "obrigat�rios para as op��es curtas.\n"
-#~ "  -a, --extract-all              extrai todas as cadeias\n"
-#~ "  -c, --add-comments[=TAG]       coloca o bloco comentado com TAG (ou as\n"
-#~ "                                 linhas de cabe�alho precedentes) no "
-#~ "ficheiro\n"
-#~ "                                 de sa�da.\n"
-#~ "  -C, --c++                      reconhece coment�rios do tipo C++\n"
-#~ "      --debug                    produz resultados mais detalhados do\n"
-#~ "                                 reconhecimento das cadeias de "
-#~ "formata��o\n"
-#~ "  -d, --default-domain=NOME      usa NOME.po para a sa�da (em vez de\n"
-#~ "                                 messages.po)\n"
-#~ "  -D, --directory=DIRECT�RIO     adiciona DIRECT�RIO � lista de procura "
-#~ "para\n"
-#~ "   \"                             os ficheiros de entrada\n"
-#~ "  -e, --no-escape                n�o usa sequ�ncias de escape do C na "
-#~ "sa�da\n"
-#~ "                                 (op��o por defeito)\n"
-#~ "  -E, --escape                   usa sequ�ncias de escape do C na sa�da, "
-#~ "n�o\n"
-#~ "                                 usando caracteres especiais\n"
-#~ "  -f, --files-from=FICHEIRO      obt�m lista de ficheiros de entrada de\n"
-#~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escreve o ficheiro PO mesmo se este "
-#~ "estiver\n"
-#~ "                                 vazio\n"
-#~ "  -F, --sort-by-file             ordena a sa�da pela localiza��o dos "
-#~ "ficheiros\n"
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "as especifica��es do argumento %u s�o diferentes"
 
 #, fuzzy
-#~ msgid ""
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
-#~ "                                 that only unique messages be printed\n"
-#~ msgstr ""
-#~ " -n, --add-location             gera linhas do tipo '#: filename:line'\n"
-#~ "                                (op��o utilizada por defeito)\n"
-#~ "     --omit-header              n�o escreve cabe�alhos com campos `msgid"
-#~ "\"\"'\n"
-#~ " -p, --output-dir=DIR           os ficheiros de sa�da ser�o colocados no\n"
-#~ "                                direct�rio DIR\n"
-#~ " -s, --sort-output              gera resultados ordenados, removendo os\n"
-#~ "                                duplicados\n"
-#~ "     --strict                   escreve um ficheiro .po de acordo com o\n"
-#~ "                                modo Uniforum estrito\n"
-#~ " -T, --trigraphs                entende trigrafos ANSI C na entrada\n"
-#~ " -V, --version                  mostra a informa��o de vers�o e sai\n"
-#~ " -w, --width=N�MERO             especifica a largura de p�gina na sa�da\n"
-#~ " -x, --exclude-file=FICHEIRO    os campos do FICHEIRO n�o s�o extra�dos\n"
-#~ "\n"
-#~ "Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) �\n"
-#~ "usado.\n"
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "as especifica��es do argumento %u s�o diferentes"
+
+#~ msgid "while creating hash table"
+#~ msgstr "durante a cria��o da tabela de dispers�o"
+
+#~ msgid "while preparing output"
+#~ msgstr "durante a prepara��o da sa�da"
+
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
 
 #, fuzzy
 #~ msgid ""
@@ -3992,88 +3918,6 @@
 #~ "Se o ficheiro de entrada � -, � usado o canal de entrada stdin. Se o\n"
 #~ "ficheiro de sa�da � -, a sa�da � escrita no canal de sa�da stdout.\n"
 
-#~ msgid "while creating hash table"
-#~ msgstr "durante a cria��o da tabela de dispers�o"
-
-#~ msgid "header field `%s' should start at beginning of line"
-#~ msgstr "o campo `%s' do cabe�alho deve come�ar no in�cio da linha"
-
-#~ msgid "field `%s' still has initial default value"
-#~ msgstr "o campo `%s' ainda tem o valor por defeito inicial"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s [OPTION] def.po ref.po\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
-#~ "search\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "  -h, --help                  display this help and exit\n"
-#~ "  -i, --indent                indented output style\n"
-#~ "  -o, --output-file=FILE      result will be written to FILE\n"
-#~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                strict Uniforum output style\n"
-#~ "  -v, --verbose               increase verbosity level\n"
-#~ "  -V, --version               output version information and exit\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
-#~ msgstr ""
-#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
-#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-#~ "obrigat�rios para as op��es curtas.\n"
-#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
-#~ "para\n"
-#~ "                              os ficheiros de entrada\n"
-#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
-#~ "                              (op��o por defeito)\n"
-#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
-#~ "n�o\n"
-#~ "                              usando caracteres especiais\n"
-#~ "  -h, --help                  mostra esta ajuda e sai\n"
-#~ "  -i, --indent                modo de sa�da alinhado\n"
-#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
-#~ "FICHEIRO\n"
-#~ "      --strict                modo de sa�da Uniforum estrito\n"
-#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
-#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
-#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s [OPTION] [FILE]...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
-#~ "  -E, --escape             use C escapes in output, no extended chars\n"
-#~ "      --force-po           write PO file even if empty\n"
-#~ "  -h, --help               display this help and exit\n"
-#~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
-#~ "output\n"
-#~ "      --strict             write strict uniforum style\n"
-#~ "  -V, --version            output version information and exit\n"
-#~ "  -w, --width=NUMBER       set output page width\n"
-#~ msgstr ""
-#~ "Utiliza��o: %s [OP��O] [FICHEIRO]...\n"
-#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-#~ "obrigat�rios para as op��es curtas.\n"
-#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
-#~ "                              (op��o por defeito)\n"
-#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
-#~ "n�o\n"
-#~ "                              usando caracteres especiais\n"
-#~ "  -h, --help                  mostra esta ajuda e sai\n"
-#~ "  -i, --indent                usa o modo de sa�da alinhado\n"
-#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
-#~ "FICHEIRO\n"
-#~ "                              em vez do canal de sa�da por defeito "
-#~ "(stdout)\n"
-#~ "      --strict                usa o modo de sa�da Uniforum estrito\n"
-#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
-#~ "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Convert binary .mo files to Uniforum style .po files.\n"
@@ -4089,10 +3933,6 @@
 #~ "stdout.\n"
 
 #, fuzzy
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "seek \"%s\" offset %ld falhou"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Extract translatable string from given input files.\n"
@@ -4157,8 +3997,6 @@
 #~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
 #~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER "
-#~ "instead %u\n"
 #~ "  -L, --language=NAME            recognise the specified language (C, C+"
 #~ "+, PO),\n"
 #~ "                                 otherwise is guessed from file "
@@ -4191,41 +4029,25 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory "
-#~ "DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove "
-#~ "duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "  -V, --version                  output version information and exit\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
-#~ "\n"
-#~ "If INPUTFILE is -, standard input is read.\n"
-#~ msgstr ""
-#~ " -n, --add-location             gera linhas do tipo '#: filename:line'\n"
-#~ "                                (op��o utilizada por defeito)\n"
-#~ "     --omit-header              n�o escreve cabe�alhos com campos `msgid"
-#~ "\"\"'\n"
-#~ " -p, --output-dir=DIR           os ficheiros de sa�da ser�o colocados no\n"
-#~ "                                direct�rio DIR\n"
-#~ " -s, --sort-output              gera resultados ordenados, removendo os\n"
-#~ "                                duplicados\n"
-#~ "     --strict                   escreve um ficheiro .po de acordo com o\n"
-#~ "                                modo Uniforum estrito\n"
-#~ " -T, --trigraphs                entende trigrafos ANSI C na entrada\n"
-#~ " -V, --version                  mostra a informa��o de vers�o e sai\n"
-#~ " -w, --width=N�MERO             especifica a largura de p�gina na sa�da\n"
-#~ " -x, --exclude-file=FICHEIRO    os campos do FICHEIRO n�o s�o extra�dos\n"
-#~ "\n"
-#~ "Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) �\n"
-#~ "usado.\n"
+#~ "%s: warning: charset \"%s\" is not supported by iconv%s\n"
+#~ "%*s  warning: consider installing GNU libiconv and then\n"
+#~ "%*s           reinstalling GNU gettext"
+#~ msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s: warning: charset \"%s\" is not supported without iconv%s\n"
+#~ "%*s  warning: consider installing GNU libiconv and then\n"
+#~ "%*s           reinstalling GNU gettext"
+#~ msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
+
+#, fuzzy
+#~ msgid "Memory exhausted"
+#~ msgstr "mem�ria exausta"
+
+#, fuzzy
+#~ msgid "%s: warning: no header entry found"
+#~ msgstr "cuidado: nenhum elemento encontrado no cabe�alho"
 
 #~ msgid "duplicate message ID"
 #~ msgstr "ID de mensagem duplicada"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/ro.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/ro.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/ro.po gettext-0.18.1.1/gettext-tools/po/ro.po
--- gettext-0.19.3/gettext-tools/po/ro.po	2014-10-16 06:10:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/ro.po	2010-06-06 12:49:58.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -28,26 +28,27 @@
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Parametrii valizi sunt: "
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nu se poate g�si un director temporar, �ncerca�i s� seta�i $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "nu se poate crea un director temporar folosind modelul(template) \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -57,38 +58,37 @@
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "nu se poate deschide fi�ierul de backup \"%s\" pentru scriere"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "eroare �n citirea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "eroare �n scrierea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "eroare dup� citirea lui \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -109,98 +109,98 @@
 "Nu a fost g�sit� ma�ina virtual� Java, �ncerca�i s� instala�i gij sau s� "
 "seta�i $JAVA"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprocesul %s a e�uat"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `--%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: op�iune necunoscut� `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: op�iune necunoscut� `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: optiune invalid� -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: op�iunea necesit� un parametru -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: op�iunea `-W %s' este ambigu�\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "eroare �n crearea \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "eroare �n scrierea fi�ierului \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -214,96 +214,58 @@
 "Nu a fost g�sit� ma�ina virtual� Java, �ncerca�i s� instala�i gij sau s� "
 "seta�i $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "eroare I/O a subprocesului %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plin�"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "citirea din subprocesul %s a e�uat"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunica�ia cu subprocesul %s a e�uat"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "subprocesul %s s-a terminat cu cod de ie�ire %d"
+msgid "cannot create pipe"
+msgstr "nu se poate crea leg�tura(pipe)"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "nu se poate crea leg�tura(pipe)"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle a e�uat"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
@@ -319,21 +281,14 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "subprocesul %s a primit semnalul fatal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
-
-#: src/format.c:151
+#: src/format.c:148
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' nu este un format valid de �ir %s, spre deosebire de 'msgid'. Motiv: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -344,19 +299,17 @@
 "'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -366,11 +319,9 @@
 #: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr ""
-"�n num�rul de directiv� %u, num�rul m�rimii argumentului 0 nu este un �ntreg "
-"pozitiv."
+msgstr "�n directiva num�rul %u  '~,' este folosit� �ntr-o pozi�ie invalid�."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -380,21 +331,19 @@
 "macro de formatare specificat. Numele valide de macro-uri sunt listate �n "
 "ISO C 99 sec�iunea 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "�n directiva num�rul %u, marcajul(token) de dup� '<' nu este urmat de '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "�irul are referire la argumentul num�rul %u dar ignor� argumentul num�rul %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -488,16 +437,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "�irul se termin� �n mijlocul directivei."
@@ -712,9 +651,7 @@
 "�n directiva num�rul %u, specificatorul de m�rime este incompatibil cu "
 "specificatorul de conversie '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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'"
@@ -764,33 +701,6 @@
 "specifica�iile de formatare din 'msgid' �i '%s' pentru argumentul '%s' nu "
 "sunt la fel"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -838,11 +748,11 @@
 msgstr ""
 "Caracterul care termin� directiva num�rul %u nu este un digit �ntre 1 �i 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -851,58 +761,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "prea mul�i parametri"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Afi�eaz� numele de host al ma�inii.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de ie�ire(output):\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           nume de host scurtat\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -913,34 +823,34 @@
 "complet calificat,\n"
 "                          �i aliasurile\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Ie�ire(output) informativ�:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
@@ -949,41 +859,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporta�i bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "nu s-a putut afla numele de host"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cel mult un fi�ier de intrare(input) este permis"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s �i %s se exclud reciproc"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -992,10 +904,10 @@
 "Filtreaz� mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "�i manipuleaz� atributele.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1003,23 +915,23 @@
 "Parametrii obligatorii la op�iunile lungi sunt obligatorii �i la op�iunile "
 "scurte.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Loca�ie fi�ier intrare(input):\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FI�IER_INTRARE                   fi�ier de intrare(input) PO\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1027,33 +939,33 @@
 "  -D, --directory=DIRECTOR   adaug� DIRECTOR �n lista de c�utare a "
 "fi�ierelor de intrare\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
-"Dac� nu este dat nici un fi�ier de intrare sau este -, se va citi "
-"intrarea(input) standard.\n"
+"Dac� nu este dat nici un fi�ier de intrare sau este -, se va citi intrarea"
+"(input) standard.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Loca�ie fi�ier ie�ire(output):\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1063,12 +975,12 @@
 "fi�ier\n"
 "de ie�ire(output) sau dac� acesta este -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selec�ie mesaje:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1076,7 +988,7 @@
 "      --translated            p�streaz� pe cele traduse, �terge mesajele "
 "netraduse\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1084,74 +996,59 @@
 "      --untranslated          p�streaz� pe cele netraduse, �terge mesajele "
 "traduse\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            p�streaz� mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           �terge mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         p�streaz� mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulare de atribute:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             seteaz� toate mesajele 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           seteaz� toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          seteaz� toate mesajele �nvechite\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        seteaz� toate mesajele non-�nvechite\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"  -u, --unique                   scurt�tur� pentru --less-than=2, solicit�\n"
-"                                 ca doar mesajele unice s� fie tip�rite\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           seteaz� toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1159,7 +1056,7 @@
 "      --only-file=FI�IER.po     manipuleaz� doar intr�rile listate �n FI�IER."
 "po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1167,13 +1064,13 @@
 "      --ignore-file=FI�IER.po   manipuleaz� doar intr�rile nelistate �n "
 "FI�IER.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim pentru --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1181,16 +1078,16 @@
 "      --obsolete              sinonim pentru --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintax� fi�ier de intrare(input:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1198,8 +1095,8 @@
 "  -P, --properties-input     fi�ierul de intrare(input) este �n sintax� "
 "Java .properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1208,17 +1105,17 @@
 "      --stringtable-input     fi�ierul de intrare(input) este �n sintax� \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1227,24 +1124,24 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, 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:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1252,28 +1149,28 @@
 "  -E, --escape                folose�te escape-uri C �n output, f�r� "
 "caractere extinse\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1281,39 +1178,39 @@
 "  -n, --add-location          genereaz� liniile '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1324,33 +1221,33 @@
 "                              dec�t l��imea paginii de output,�n c�teva "
 "linii\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereaz� output sortat\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "criteriu de selec�ie specificat imposibil (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1358,9 +1255,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Concateneaz� �i �mbin�(merge) fi�ierele PO specificate.\n"
 "G�se�te mesajele care sunt comune a dou� sau mai multe fi�iere PO specificate.\n"
@@ -1373,26 +1270,26 @@
 "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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FI�IER_INTRARE ...                  fi�iere de intrare(input)\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1403,7 +1300,7 @@
 "este\n"
 "                                 infinit\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1413,7 +1310,7 @@
 "                                 defini�ii, dac� nu este setat implicit este "
 "0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1422,8 +1319,8 @@
 "  -u, --unique                   scurt�tur� pentru --less-than=2, solicit�\n"
 "                                 ca doar mesajele unice s� fie tip�rite\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1431,8 +1328,8 @@
 "  -P, --properties-input     fi�ierele de intrare(input) sunt �n sintax� ."
 "properties Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1441,13 +1338,13 @@
 "      --stringtable-input     fi�ierele de intrare(input) sunt �n sintax� \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, 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:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1458,28 +1355,28 @@
 "                                 fiecare mesaj, nu �mbin� mai multe "
 "traduceri\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "nu au fost date fi�iere de intrare(input)"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sunt necesare exact 2 fi�iere de intrare(input)"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Folosire: %s [OP�IUNE] def.po ref.pot\n"
@@ -1512,12 +1409,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referin�e la surse\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori de opera�ie:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1525,7 +1422,7 @@
 msgstr ""
 "  -m, --multi-domain          aplic� ref.pot pe fiecare domeniu din def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1535,8 +1432,8 @@
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
-"  -f, --use-fuzzy             folose�te intr�ri par�ial traduse la "
-"ie�ire(output)\n"
+"  -f, --use-fuzzy             folose�te intr�ri par�ial traduse la ie�ire"
+"(output)\n"
 
 #: src/msgcmp.c:247
 #, fuzzy, c-format
@@ -1555,17 +1452,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "acest mesaj este folosit dar nu este definit..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...dar defini�ia este similar�"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "acest mesaj este folosit dar nu �i definit �n %s"
@@ -1575,27 +1472,27 @@
 msgid "warning: this message is not used"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cel pu�in dou� fi�iere trebuie specificate"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1608,7 +1505,7 @@
 "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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1618,76 +1515,76 @@
 "                                 defini�ii, dac� nu este setat implicit este "
 "1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header              nu include �n header intrarea `msgid \"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Face conversia unui catalog de traduceri �ntr-o alt� codare(encoding) de "
 "caractere.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "�int� conversie:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "Codarea(encoding) implicit� este codarea(encoding) localiz�rii curente.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 "      --force-po                 scrie fi�ierul PO chiar dac� este vid\n"
 "  -i, --indent                   scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location              nu scrie linii '#: filename:line'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location             genereaz� linii '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                   scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fi�ier de intrare"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "este solicitat exact un singur fi�ier de intrare"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Folosire: %s [OP�IUNE] FI�IER_INTRARE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1700,7 +1597,7 @@
 "(�n general creat de xgettext).  Intr�rilor netraduse le sunt asignate traduceri care\n"
 "sunt identice cu msgid, �i care vor fi marcate fuzzy.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1741,7 +1638,7 @@
 "un octet null.  Rezultatul(output) \"msgexec 0\" este potrivit ca intrare(input)\n"
 "pentru \"xargs - 0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1752,27 +1649,32 @@
 msgid "write to stdout failed"
 msgstr "scriere la stdout e�uat�"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "scrierea �n subprocesul %s e�uat�"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "lipse�te numele de filtru"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cel pu�in un script sed trebuie specificat"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE] FILTRU [OP�IUNE-FILTRU]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplic� un filtru pe toate traducerile unui catalog de traduceri.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1781,12 +1683,12 @@
 "FILTRU poate fi orice program care cite�te de la intrarea(input) standard\n"
 "�i scrie traducerea modificat� la ie�irea(output) standard.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OP�IUNi de FILTRU folositoare atunci c�nd FILTRU este 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1794,7 +1696,7 @@
 "  -e, --expression=SCRIPT     adaug� SCRIPTul la comenzile ce vor fi "
 "executate\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1804,15 +1706,15 @@
 "  -f, --file=FI�IERSCRIPT       adaug� con�inutul FI�IERSCRIPT la comenzile\n"
 "                                ce vor fi executate\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       suprim� tip�rirea automat� a spa�iului "
-"model(pattern)\n"
+"  -n, --quiet, --silent       suprim� tip�rirea automat� a spa�iului model"
+"(pattern)\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1820,13 +1722,13 @@
 "     --no-escape                nu folose�te escape-uri C �n output "
 "(implicit)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 "      --indent                   scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1834,105 +1736,82 @@
 "      --keep-header           p�streaz� headerul nemodificat, nu �l "
 "filtreaz�\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s necesit� specificarea \"-d director\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s necesit� specificarea \"-l localizare\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s necesit� specificarea \"-l localizare\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s necesit� specificarea \"-l localizare\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s �i %s se exclud reciproc"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s e valid doar cu %s sau cu %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mesaj tradus"
 msgstr[1] "%d mesaje traduse"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, 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:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mesaj netradus"
 msgstr[1] ", %d mesaje netraduse"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Folosire: %s [OP�IUNE] numefi�ier.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1941,17 +1820,17 @@
 "Argumentele obligatorii pentru op�iunile lungi sunt obligatorii �i pentru op�iunile\n"
 "scurte. Similar pentru argumentele op�ionale.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  numefi�ier.po ...             fi�iere de intrare(input)\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1960,7 +1839,7 @@
 "  -j, --java                  Mod Java: genereaz� o clas� Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1969,60 +1848,54 @@
 "      --java2                 precum --java, �i presupune Java2 (JDK 1.2 sau "
 "ulterior)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
-#, c-format
+#: src/msgfmt.c:681
+#, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
-msgstr ""
+msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeaz� modul strict Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURS�     nume resurs�\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2031,23 +1904,14 @@
 "  -l, --locale=LOCALIZARE         nume localizare, fie limb�, "
 "fie                                                 limb�_�AR�\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/"
-"msgcat .msg\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2060,12 +1924,12 @@
 "separat� de liniu��_jos.  Op�iunea -d este obligatorie.  Clasa este\n"
 "scris� �n directorul specificat.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Tcl:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, fuzzy, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2073,7 +1937,7 @@
 msgstr ""
 "  -d DIRECTOR                 directorul de baz� al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, fuzzy, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2083,19 +1947,19 @@
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2105,48 +1969,12 @@
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, 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:871 src/xgettext.c:934
-#, fuzzy, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -k, --keyword[=CUV�NT]        cuvinte cheie de c�utat (f�r�\n"
-"                                  CUV�NT �nseamn� neutilizarea "
-"cuvintelor_cheie\n"
-"                                  implicite)\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretare fi�ier de intrarea(input):\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2157,13 +1985,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          verific� �irurile format dependent de limbaj\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2171,7 +1999,7 @@
 msgstr ""
 "      --check-header          verific� prezen�a �i con�inutul header-ului\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2181,7 +2009,7 @@
 "directivele\n"
 "                                de domenii �i op�iunea --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2190,7 +2018,7 @@
 "  -C, --check-compatibility   verific� dac� GNU msgfmt se comport� ca X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2201,14 +2029,14 @@
 "tastatur�\n"
 "                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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"
+"  -f, --use-fuzzy             folose�te intr�ri par�ial traduse la ie�ire"
+"(output)\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2216,108 +2044,88 @@
 "  -a, --alignment=NUM�R      aliniaz� �irurile la NUM�R octe�i (implicit: "
 "%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            afi�eaz� statistici despre traduceri\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               m�re�te nivelul de detaliere\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avertisment: conversia setului de caractere nu va func�iona\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "avertisment: headerul fi�ierului PO este neclar(fuzzy)\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorat�"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "intrarea `msgstr' vid� ignorat�"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "intrarea `msgstr' neclar�(fuzzy) ignorat�"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avertisment: fi�ierul surs� con�ine traduceri aproximative(fuzzy)"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare �n timpul citirii \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2325,7 +2133,7 @@
 msgstr ""
 "op�iunea '%c' nu poate fi folosit� �nainte ca 'K' sau 'T' s� fie specificate"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2334,7 +2142,7 @@
 "Extrage toate mesajele unui catalog care se potrive�te unui tipar dat\n"
 "sau care e dependent de fi�iere surs� date.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2400,7 +2208,7 @@
 "  -f, --file=FI�IER             ob�ine TIPAR din FI�IER\n"
 "  -i, --ignore-case           ignor� distinc�ia de caz\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2408,18 +2216,18 @@
 "      --escape                   folose�te escape-uri C �n output, nu \n"
 "caractere extinse\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "       --sort-output           genereaz� output sortat\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "       --sort-by-file          sorteaz� output-ul dup� loca�ia fi�ierului\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2429,7 +2237,7 @@
 "variabila voastr� de mediu LANG, �n modul �n care este descris �n fi�ierul\n"
 "ABOUT-NLS.  Aceasta este necesar pentru a v� testa traducerile.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2440,12 +2248,12 @@
 "Specifica�i localizarea prin op�iunea --locale sau\n"
 "fi�ierul de ie�ire(output) .po prin op�iunea --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "S-a creat %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2454,12 +2262,12 @@
 "Creaz� un nou fi�er PO, ini�ializ�nd informa�iile meta cu valori pentru\n"
 "mediul utilizatorului.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FI�IER_INTRARE       fi�ierul de intrare POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2471,13 +2279,13 @@
 "fi�ierul POT.\n"
 "Dac� acesta este -, se va citi intrarea(input) standard.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FI�IER      scrie output-ul spre fi�ierul PO specificat\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2488,12 +2296,12 @@
 "sau de set�rile de localizare ale utilizatorului.\n"
 "Dac� este -, rezultatele vor fi scrise la ie�irea(output) standard.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          seteaz� localizarea �int�\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2501,7 +2309,7 @@
 "      --no-translator         se presupune c� fi�ierul PO este generat "
 "automat\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2509,12 +2317,12 @@
 "S-a g�sit mai mult de un fi�ier .pot.\n"
 "Specifica�i fi�ierul de intrare .pot prin op�iunea --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "eroare �n citirea directorului curent"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2522,14 +2330,14 @@
 "Nu s-a g�sit nici un fi�ier .pot �n directorul curent.\n"
 "V� rug�m specifica�i fi�ierul de intrare .pot prin op�iunea --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "subprocesul %s a e�uat cu cod de ie�ire %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2539,14 +2347,14 @@
 msgstr ""
 "Catalogul nou de mesaje ar trebui s� con�in� adresa voastr� de e-mail, "
 "astfel �nc�t\n"
-"utilizatorii s� poat� da un feedback despre traduceri, �i ca "
-"�ntre�in�torii(maintainers)\n"
+"utilizatorii s� poat� da un feedback despre traduceri, �i ca �ntre�in�torii"
+"(maintainers)\n"
 "s� v� poat� contacta �n caz de probleme tehnice nea�teptate.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducerea �n limba rom�n� pentru pachetul %s"
@@ -2562,21 +2370,21 @@
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
-"dou� seturi diferite de caractere \"%s\" �i \"%s\" �n fi�ierul de "
-"intrare(input)"
+"dou� seturi diferite de caractere \"%s\" �i \"%s\" �n fi�ierul de intrare"
+"(input)"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "fi�ierul de intrare(input) `%s' nu con�ine un header cu specifica�ie de set "
 "de caractere"
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "domeniu \"%s\" din fi�ierul de intrare `%s' nu con�ine un header cu o "
@@ -2589,8 +2397,8 @@
 "setul de caractere �int� \"%s\" nu este un nume de codare(encoding) portabil."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
@@ -2678,8 +2486,8 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Setul de caractere al localiz�rii \"%s\" nu este un nume portabil de "
-"codare(encoding).\n"
+"Setul de caractere al localiz�rii \"%s\" nu este un nume portabil de codare"
+"(encoding).\n"
 "Output-ul lui '%s' poate fi incorect.\n"
 "O posibil� solu�ie(workaround) este setarea LC_ALL=C.\n"
 
@@ -2712,49 +2520,49 @@
 msgid "Try using the following, valid for %s:"
 msgstr "�ncerca�i s� folosi�i urm�toarele, valide pentru %s:\n"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "catalogul de mesaje are traduceri �n forme plurale..."
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...dar header-ului �i lipse�te atributul \"plural=EXPRESSION\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...dar header-ului �i lipse�te atributul \"plural=INTEGER\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "valoare nplurals invalid�"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "expresie plural� invalid�"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2762,60 +2570,66 @@
 "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:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "manipularea de plurale este o extensie a GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr nu are marcaj de accelerator de tastatur� '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, 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:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "c�mpul header '%s' lipse�te din header\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "c�mpul header `%s' ar trebui s� �nceap� la �nceputul liniei\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have 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:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "c�mpul header '%s' lipse�te din header\n"
+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-iconv.c:65
 #, c-format
@@ -2833,8 +2647,8 @@
 "fi�ierul de intrare(input) nu con�ine un header cu specifica�ia unui set de "
 "caractere"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2852,8 +2666,8 @@
 "Conversia din \"%s\" �n \"%s\" introduce duplicate: anumite msgid-uri "
 "diferite devin egale."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2862,16 +2676,16 @@
 "Nu se poate converti din \"%s\" �n \"%s\". %s se bazeaz� pe iconv(). Aceast� "
 "versiune a fost construit�(built) f�r� inconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s e valid doar cu %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tip de backup"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2895,17 +2709,17 @@
 "exact�, se va folosi potrivirea aproximativ�(fuzzy) pentru a produce rezultate\n"
 "mai bune.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      traducerile referitoare la surse vechi\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referin�e la surse noi\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2915,7 +2729,7 @@
 "mesaje,\n"
 "                              poate fi specificat� de mai multe ori\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2925,27 +2739,27 @@
 "                              nu face nimic dac� def.po este deja adus la "
 "zi\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Loca�ie fi�iere de ie�ire(output) �n modul aducerii la zi(update):\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultatele vor fi scrise �n def.po:\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        se creaz� un backup al def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIX         suprascrie sufixul obi�nuit de backup\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2965,10 +2779,10 @@
 "  existing, nil   numerotate dac� exist� backup-uri, simple �n caz contrar\n"
 "  simple, never   creaz� �ntotdeauna backup-uri simple\n"
 
-#: src/msgmerge.c:559
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
@@ -2976,7 +2790,7 @@
 "cu\n"
 "variabila de mediu SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2984,22 +2798,22 @@
 "      --translated            p�streaz� pe cele traduse, �terge mesajele "
 "netraduse\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprim� indicatorii de progres\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "acest mesaj ar trebui s� defineasc� formele plurale"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "acest mesaj nu ar trebui s� defineasc� formele plurale"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3008,7 +2822,7 @@
 "%sCitite %ld vechi + %ld referin�e, unite %ld, aproxim�ri %ld, lips� %ld, "
 "�nvechite %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3046,11 +2860,13 @@
 "msgcat .msg\n"
 
 #: src/msgunfmt.c:444
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
+"      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/"
+"msgcat .msg\n"
 
 #: src/msgunfmt.c:446
 #, c-format
@@ -3122,7 +2938,7 @@
 msgstr ""
 "      --strict                   scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3144,12 +2960,12 @@
 "Pozi�iile din fi�ier vor fi cumulate.  Dac� se folose�te op�iunea --unique,\n"
 "duplicatele vor fi omise.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 afi�eaz� doar duplicatele\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3174,7 +2990,7 @@
 "nu\n"
 "func�ioneze.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3183,7 +2999,7 @@
 "Setul de caractere \"%s\" nu este suportat. %s se bazeaz� pe iconv(),\n"
 "iar iconv() nu suport� \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3191,15 +3007,15 @@
 "Instalarea GNU libiconv �i apoi reinstalarea GNU gettext\n"
 "va rezolva aceast� problem�.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Se continu� oricum, se a�teapt� analiza(parse) erorilor."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Se continu� oricum."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3208,7 +3024,7 @@
 "Setul de caractere \"%s\" nu este suportat. %s se bazeaz� pe iconv().\n"
 "Aceast� versiune a fost construit�(built) f�r� iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3222,27 +3038,27 @@
 msgid "inconsistent use of #~"
 msgstr "folosire inconsistent� a #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "lipse�te sec�iunea `msgstr[]'"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "lipse�te sec�iunea `msgid_plural[]'"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "lipse�te sec�iunea `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "primul plural are index nonzero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma plural� are index gre�it"
@@ -3252,7 +3068,7 @@
 msgid "too many errors, aborting"
 msgstr "prea multe erori, se renun��"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secven�� multibyte invalid�"
@@ -3296,16 +3112,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "acest fi�ier poate s� nu con�in� directive de domeniu"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "defini�ie duplicat� de mesaj"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...aceasta este loca�ia primei defini�ii"
@@ -3386,12 +3202,12 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
@@ -3415,21 +3231,11 @@
 "Aduce(fetches) �i afi�eaz�(outputs) con�inutul unui URL.  Dac� URL-ul nu poate\n"
 "fi accesat, se va folosi �n loc FI�IERul accesibil local.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "eroare �n citirea lui \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "eroare �n scrierea stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "eroare dup� citirea lui \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3469,8 +3275,8 @@
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
-"ie�ire(output) nu le suport�."
+"catalogul de mesaje are traduceri �n form� plural�, dar formatul de ie�ire"
+"(output) nu le suport�."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3478,8 +3284,8 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
-"ie�ire(output) nu le suport�. �ncerca�i generarea unei clase Java folosing "
+"catalogul de mesaje are traduceri �n form� plural�, dar formatul de ie�ire"
+"(output) nu le suport�. �ncerca�i generarea unei clase Java folosing "
 "\"msgfmt --java\", �n locul unui fi�ier de propriet��i."
 
 #: src/write-catalog.c:202
@@ -3487,8 +3293,8 @@
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
-"ie�ire(output) nu le suport�."
+"catalogul de mesaje are traduceri �n form� plural�, dar formatul de ie�ire"
+"(output) nu le suport�."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
@@ -3514,21 +3320,23 @@
 #: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "comunica�ia cu subprocesul %s a e�uat"
+msgstr ""
+"compilarea clasei Java a e�uat, v� rug�m �ncerca�i --verbose sau seta�i "
+"$JAVAC"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nu este un nume valid de clas� Java: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3540,19 +3348,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "eroare �n deschiderea \"%s\" pentru scriere"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "secven�� multibyte invalid�"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mesajele interna�ionalizate nu ar trebui s� con�in� secven�a de escape `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3567,7 +3370,7 @@
 "pur ASCII �n loc.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3627,8 +3430,8 @@
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
-"ie�ire(output) nu le suport�."
+"catalogul de mesaje are traduceri �n form� plural�,\n"
+"dar formatul catalogului de mesaje Qt nu suport� manipularea pluralelor\n"
 
 #: src/write-resources.c:150
 #, fuzzy
@@ -3656,7 +3459,7 @@
 "catalogul de mesaje are traduceri �n form� plural�,\n"
 "dar formatul catalogului de mesaje Tcl nu suport� manipularea pluralelor\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avertisment: �ir neterminat"
@@ -3666,22 +3469,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulat� neterminat�"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: avertisment: caracter Unicode invalid"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: avertisment: constant� caracter neterminat�"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3724,7 +3522,7 @@
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "eroare iconv"
@@ -3738,7 +3536,7 @@
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avertisment: caracter Unicode invalid"
@@ -3758,22 +3556,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avertisment: s-a g�sit '}' unde se a�tepta ')'"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3787,73 +3575,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: avertisment: �ir neterminat"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: avertisment: �ir literal neterminat"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%lu: avertisment: eroare de sintax�"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: avertisment: �ir neterminat"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3890,53 +3611,66 @@
 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:278
+#: src/x-python.c:236
+#, 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 ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:282
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:299
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:312
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:322
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3965,40 +3699,30 @@
 "%s:%lu: avertisment: sintaxa $\"...\" nu se mai folose�te din motive de "
 "securitate; �nlocui�i cu eval_gettext"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: avertisment: �ir literal neterminat"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4007,13 +3731,13 @@
 "  -d, --default-domain=NUME      folose�te NUME.po pentru output \n"
 "(�n loc de messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4022,12 +3746,12 @@
 "�n \n"
 "directorul DIR\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fi�ierelor de intrare(input):\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4036,8 +3760,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NUME            recunoa�te limbajul specificat\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4046,12 +3769,12 @@
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurt�tur� pentru --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4061,7 +3784,7 @@
 "intrare \n"
 "(input)\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4070,25 +3793,25 @@
 "      --from-code=NUME        codare pentru fi�ierele de intrare(input)\n"
 "                                (except�nd Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4100,46 +3823,43 @@
 "  -c, --add-comments[=ETICHET�]       plaseaz� blocul de comentarii cu\n"
 "                                 ETICHET� (sau pe acelea care preced liniile "
 "cu\n"
-"                                 cuvinte cheie) �n fi�ierul de "
-"ie�ire(output)\n"
+"                                 cuvinte cheie) �n fi�ierul de ie�ire"
+"(output)\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Op�iuni specifice limbajului:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate �irurile\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-surs�, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
-"                                Tcl, Perl, PHP, GCC-surs�, Glade)\n"
+"  -k, --keyword[=CUV�NT]        cuvinte cheie de c�utat (f�r�\n"
+"                                  CUV�NT �nseamn� neutilizarea "
+"cuvintelor_cheie\n"
+"                                  implicite)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4150,20 +3870,19 @@
 "argumentul\n"
 "                              num�rul ARG al cuv�ntului cheie CUV�NT\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                YCP, Tcl, Perl, PHP, GCC-surs�)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
@@ -4171,32 +3890,32 @@
 "pentru intrare\n"
 "                                     (input)\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4204,19 +3923,19 @@
 "      --debug                    rezultat mai detaliat al recunoa�terii "
 "formatstring\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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"
+"      --copyright-holder=�IR  seteaz� de�in�torul copyright-ului la ie�ire"
+"(output)\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4224,19 +3943,19 @@
 "      --foreign-user          omite copyright FSF la ie�ire pentru user "
 "str�in(foreign)\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, 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"
+"      --copyright-holder=�IR  seteaz� de�in�torul copyright-ului la ie�ire"
+"(output)\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4244,7 +3963,7 @@
 "      --msgid-bugs-address=EMAIL@ADRES�  seteaz� adresa de reportare a\n"
 "bug-urilor msgid\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4254,7 +3973,7 @@
 "  -m, --msgstr-prefix[=�IR]  folose�te �IR sau \"\" ca prefix pentru "
 "intr�rile msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4264,7 +3983,7 @@
 "  -M, --msgstr-suffix[=�IR]  folose�te �IR sau \"\" ca suefix pentru "
 "intr�rile msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4272,31 +3991,31 @@
 msgstr ""
 "Un argument --flag nu are sintaxa <keyword>:<argnum>:[pass-]<flag> : %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avertisment: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4305,7 +4024,7 @@
 "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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4314,7 +4033,7 @@
 "De�i este declarat astfel, %s nu este un format al �irului valid %s: Motiv:\n"
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4323,7 +4042,7 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4333,31 +4052,30 @@
 "gettext(\"\") returneaz� header-ul cu informa�ii\n"
 "meta, nu cu �irul vid.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:3006
-#, c-format
+#: src/xgettext.c:2861
+#, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
+msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:3031
-#, c-format
+#: src/xgettext.c:2886
+#, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
+msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4366,9 +4084,9 @@
 "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:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
 
 #: libgettextpo/gettext-po.c:84
@@ -4381,6 +4099,24 @@
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle a e�uat cu cod de eroare 0x%08x"
 
+#~ msgid "Not yet implemented."
+#~ msgstr "Neimplimentat �nc�."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "comunica�ia cu subprocesul %s a e�uat"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "citirea din subprocesul %s a e�uat"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "subprocesul %s s-a terminat cu cod de ie�ire %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "c�mpul `%s' �nc� are valoarea implicit� ini�ial�\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Referin�e multiple la % % %c."
 
@@ -4397,32 +4133,21 @@
 #~ "garan�ie; nici m�car pentru VANDABILITATE sau MODIFICARE �NTR-UN SCOP "
 #~ "PRIVAT.\n"
 
-#~ msgid "Not yet implemented."
-#~ msgstr "Neimplimentat �nc�."
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "c�mpul header `%s' ar trebui s� �nceap� la �nceputul liniei\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "c�mpul `%s' �nc� are valoarea implicit� ini�ial�\n"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "scrierea �n subprocesul grep a e�uat"
-
-#~ msgid "conversion failure"
-#~ msgstr "eroare de conversie"
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: avertisment: "
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: avertisment: �ir neterminat"
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "catalogul de mesaje are traduceri �n form� plural�,\n"
+#~ "dar formatul catalogului de mesaje Qt nu suport� manipularea pluralelor\n"
 
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: fatal: mesaj plural �nt�lnit �nainte de mesajul singular\n"
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "catalogul de mesaje are traduceri �n form� plural�,\n"
+#~ "dar formatul catalogului de mesaje Qt nu suport� manipularea pluralelor\n"
 
 #~ msgid "Which is your email address?"
 #~ msgstr "Care este adresa voastr� de email?"
@@ -4456,3 +4181,21 @@
 
 #~ msgid "Please enter your email address."
 #~ msgstr "V� rug�m introduce�i adresa voastr� de email."
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: avertisment: "
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: avertisment: �ir neterminat"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: fatal: mesaj plural �nt�lnit �nainte de mesajul singular\n"
+
+#~ msgid "conversion failure"
+#~ msgstr "eroare de conversie"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "scrierea �n subprocesul grep a e�uat"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/ru.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/ru.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/Rules-quot gettext-0.18.1.1/gettext-tools/po/Rules-quot
--- gettext-0.19.3/gettext-tools/po/Rules-quot	2014-10-08 07:17:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/Rules-quot	2010-06-06 12:49:57.000000000 +0000
@@ -1,4 +1,3 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -15,23 +14,13 @@
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
-	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
-	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
-	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
-	       ;; \
-	     *) \
-	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
-	       ;; \
-	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
-	     ; then \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
diff -Nru gettext-0.19.3/gettext-tools/po/ru.po gettext-0.18.1.1/gettext-tools/po/ru.po
--- gettext-0.19.3/gettext-tools/po/ru.po	2014-10-16 06:04:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/ru.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,444 +1,391 @@
-# Локализация для gettext
+# ����������� ��� gettext
 # Copyright (C) 1998 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
 # Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001-2007.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 13:59+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-06-14 10:41+0400\n"
+"Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=koi8-r\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"
-"X-Generator: Lokalize 1.5\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "неверный аргумент %s для %s"
+msgstr "�������� �������� %s ��� %s"
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "неоднозначный аргумент %s для %s"
+msgstr "������������� �������� %s ��� %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "Допустимые аргументы:"
+msgstr "���������� ���������:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "невозможно найти временный каталог, попробуйте установить $TMPDIR"
+msgstr "���������� ����� ��������� �������, ���������� ���������� $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "невозможно создать временный каталог с помощью шаблона «%s»"
+msgstr "���������� ������� ��������� ������� � ������� ������� \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
-msgstr "невозможно удалить временный файл %s"
+msgstr "���������� ������� ��������� ���� %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "невозможно удалить временный каталог %s"
+msgstr "���������� ������� ��������� ������� %s"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "ошибка записи"
-
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "сохранение прав доступа для %s"
+msgstr "������ ������"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "ошибка при открытии файла %s для чтения"
+msgid "error while opening \"%s\" for reading"
+msgstr "������ �������� ����� \"%s\" ��� ������"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "не удалось открыть файл резервной копии %s для записи"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "������ �������� ���������� ����� \"%s\" ��� ������"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "ошибка чтения %s"
+msgid "error reading \"%s\""
+msgstr "������ ������ \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "ошибка записи %s"
+msgid "error writing \"%s\""
+msgstr "������ ������ \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "ошибка после чтения %s"
+msgid "error after reading \"%s\""
+msgstr "������ ����� ������ \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
-msgstr "ошибка при вызовы fdopen()"
+msgstr "����� fdopen() ���������� ���������"
 
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "Не найден компилятор C#, попробуйте поставить pnet"
+msgstr "�� ������ ���������� C#, ���������� ��������� pnet"
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "Не найдена виртуальная машина C#, попробуйте поставить pnet"
+msgstr "�� ������� ����������� ������ C#, ���������� ��������� pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Неизвестная системная ошибка"
+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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "дочерний процесс %s завершился неуспехом"
+msgstr "�������� ������� %s ���������� ���������"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: ������������� ���� `%s'\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: у параметра «--%s» не может быть аргумента\n"
+msgstr "%s: ���� `--%s' ������ �������������� ��� ���������\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: у параметра «%c%s» не может быть аргумента\n"
+msgstr "%s: ���� `%c%s' ������ �������������� ��� ���������\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: для параметра «--%s» требуется аргумент\n"
+msgstr "%s: ���� `%s' ������ �������������� c ����������\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: неизвестный параметр «--%s»\n"
+msgstr "%s: ����������� ���� `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: неизвестный параметр «%c%s»\n"
+msgstr "%s: ����������� ���� `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: недопустимый параметр — «%c»\n"
+msgstr "%s: �������� ���� -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: для параметра требуется аргумент — «%c»\n"
+msgstr "%s: ���� %c ������ �� �������������� c ����������\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмысленный параметр «-W %s»\n"
+msgstr "%s: ������������� ���� `-W %s'\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
+msgstr "%s: ���� `-W %s' ������ �������������� ��� ���������\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: для параметра «-W %s» требуется аргумент\n"
+msgstr "%s: ���� `%s' ������ �������������� c ����������\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "неправильный аргумент source_version для compile_java_class"
+msgstr "������������ �������� source_version ��� compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "неправильный аргумент target_version для compile_java_class"
+msgstr "������������ �������� target_version ��� compile_java_class"
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "ошибка при создании «%s»"
+msgstr "������� �������� \"%s\" ����������� ���������"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "ошибка записи файла «%s»"
+msgstr "������ ������ ����� \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"Не найден компилятор Java, поставьте gcj или установите переменную $JAVAC"
+"�� ������ ���������� Java, ��������� gcj ��� ���������� ���������� $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"Не найдена виртуальная машина Java, поставьте gij или установите переменную "
+"�� ������� ����������� ������ Java, ��������� gij ��� ���������� ���������� "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "ошибка ввода/вывода в дочернем процессе %s"
+msgstr "������ �����/������ � �������� �������� %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr "память исчерпана"
+msgstr "����������� ������ ���������"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "creation of threads failed"
-msgstr "ошибка при создании нитей"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "ошибка при записи в дочерний процесс %s"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "ошибка при чтении из дочернего процесса %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"невозможно организовать неблокирующий ввод/вывод для дочернего процесса %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "ошибка при попытке связи с дочерним процессом %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "дочерний процесс %s завершился с выходным кодом %d"
+msgid "cannot create pipe"
+msgstr "���������� ������� �����"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "«"
+msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "»"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "невозможно создать канал"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "ошибка при _open_osfhandle"
+msgstr "�������� _open_osfhandle ���������"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "не удалось восстановить fd %d: ошибка dup2"
+msgstr "���������� ������� ���� ������ \"%s\""
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "дочерний процесс %s"
+msgstr "�������� ������� %s"
 
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "дочерний процесс %s получил фатальный сигнал %d"
-
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "ошибка открытия файла «%s» для чтения"
+msgstr "�������� ������� %s ������� ��������� ������ %d"
 
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"Строка «%s» не подходит под формат %s, в отличие от исходной «%s». Причина: "
-"%s"
+"'%s' �� �������� ���������� ��������� ������� %s � ������� �� 'msgid'.  "
+"�������: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "спецификация формата аргумента %u в «%s» не существует в «%s»"
+msgstr "� 'msgid' ��� ������������ ������� ��� ��������� '%u' ��� � '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "спецификация формата аргумента %u не существует в «%s»"
+msgstr "��� ��������� %u � '%s' ��� ������������ �������"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "спецификации формата в «%s» и «%s» не совпадают для аргумента %u"
+msgstr "� `msgid' � `%s' �� ��������� ������������ ������� ��� ��������� %u"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Директива номер %u начинается с |, но не заканчивается на |."
+msgstr "��������� ����� %u ���������� � |, �� �� ������������� �� |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"В директиве номер %u лексема после «<» не является именем макроса-"
-"спецификации формата. Допустимые имена макросов перечислены в ISO C 99, "
-"раздел 7.8.1."
+"� ��������� ����� %u ������� ����� '<' �� �������� ������ �������-"
+"������������ �������.  ���������� ����� �������� ����������� � ISO C 99, "
+"������  7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
-"В директиве номер %u после лексемы, стоящей за «<», нет закрывающего «>»."
+"� ��������� ����� %u ����� �������, ������� �� '<', ��� ������������ '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
-"Строка ссылается на аргумент номер %u, но игнорирует аргумент номер %u."
+"������ ��������� �� �������� ����� %u, �� ���������� �������� ����� %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "не совпадает количество спецификаций формата в «%s» и «%s»"
+msgstr "�� ��������� ����� ������������ ������� ������ � `msgid' � `%s'"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "В директиве номер %u после «{» не стоит номер аргумента."
+msgstr "� ��������� ����� %u ����� '{' �� ����� ����� ���������."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "В директиве номер %u после «,» не стоит число."
+msgstr "� ��������� ����� %u ����� ',' �� ����� �����."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"Строка обрывается посреди директивы: найдена «{» без соответствующей «}»."
+"������ ���������� ������� ���������: ������� '{' ��� ��������������� '}'."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Директива номер %u заканчивается на неверный символ «%c», а не на «}»."
+msgstr "��������� ����� %u ������������� �� �������� ���� '%c', � �� �� '}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Директива номер %u заканчивается на неверный символ, а не на «}»."
+msgstr "��������� ����� %u ������������� �� �������� ����, � �� �� '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"Строка начинается посреди директивы: найдена «}» без соответствующей «{»."
+"������ ���������� ������� ���������: ������� '}' ��� ��������������� '{'."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Строка содержит непарную «}» после директивы номер %u."
+msgstr "������ �������� �������� '}' ����� ��������� ����� %u."
 
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "В директиве номер %u неверная комбинация флагов."
+msgstr "� ��������� ����� %u �������� ���������� ������."
 
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "В директиве номер %u перед «%c» нельзя указывать точность."
+msgstr "� ��������� ����� %u ����� '%c' ������ ��������� ��������."
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -446,65 +393,52 @@
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
-"В директиве номер %u номер аргумента для точности должен быть равно %u."
+"� ��������� ����� %u ����� ��������� ��� �������� ������ ���� ������ %u."
 
 #: src/format-gcc-internal.c:398
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
-msgstr ""
-"В директиве номер %u перед «%c» нельзя указывать спецификацию точности."
+msgstr "� ��������� ����� %u ����� '%c' ������ ��������� ��������."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "В директиве номер %u неверная спецификация точности."
+msgstr "� ��������� ����� %u �������� ������������ ��������."
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "В директиве номер %u перед «%c» нельзя писать флаги."
+msgstr "� ��������� ����� %u ����� '%c' ������ ������ �����."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "В «%s» используется %%m, но в «%s» нет"
+msgstr "� 'msgid' ������������ %%m, �� � '%s' ���"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "В «%s» не используется %%m, но в «%s» используется %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "В «%s» используется %%C, но в «%s» нет"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "В «%s» не используется %%C, но в «%s» используется %%C"
+msgstr "� 'msgid' �� ������������ %%m, �� � '%s' ������������"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "Строка обрывается посреди директивы."
+msgstr "������ ���������� ������� ���������."
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"Строка ссылается на аргументы как по абсолютным номерам, так и через "
-"ненумерованные спецификации аргументов."
+"������ ��������� �� ��������� ��� �� ���������� �������, ��� � ����� "
+"��������������� ������������ ����������."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
-"В директиве номер %u аргумент с номером 0 не является положительным целым "
-"числом."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -512,8 +446,6 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"В директиве номер %u ширина аргумента с номером 0 не является положительным "
-"целым числом."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -521,8 +453,6 @@
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
-"В директиве номер %u точность аргумента с номером 0 не является "
-"положительным целым числом."
 
 #: src/format-invalid.h:36
 #, c-format
@@ -530,8 +460,7 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"В директиве номер %u символ «%c» не является верным спецификатором "
-"преобразования."
+"� ��������� %u ���� '%c' �� �������� ������ �������������� ��������������."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -539,13 +468,13 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"Символ, завершающий директиву номер %u не является верным спецификатором "
-"преобразования."
+"����, ����������� ��������� ����� %u �� �������� ������ �������������� "
+"��������������."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Строка ссылается на аргумент номер %u несовместимым образом."
+msgstr "������ ��������� �� �������� ����� %u ������������� �������."
 
 #: src/format-java.c:240
 #, c-format
@@ -553,18 +482,18 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"В директиве номер %u подстрока «%s» не является верным стилем даты/времени."
+"� ��������� ����� %u ��������� \"%s\" �� �������� ������ ������ ����/�������."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "В директиве номер %u после «%s» не стоит запятая."
+msgstr "� ��������� ����� %u ����� \"%s\" �� ����� �������."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "В директиве номер %u подстрока «%s» не является верным стилем числа."
+msgstr "� ��������� ����� %u ��������� \"%s\" �� �������� ������ ������ �����."
 
 #: src/format-java.c:323
 #, c-format
@@ -572,13 +501,13 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"В директиве номер %u после номера аргумента не стоит запятая и одно из «%s», "
-"«%s», «%s», «%s»."
+"� ��������� ����� %u ����� ������ �������� �� ����� ������� � ���� �� \"%s"
+"\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "В директиве номер %u оператор выбора не содержит номера."
+msgstr "� ��������� ����� %u �������� ������ �� �������� ������."
 
 #: src/format-java.c:583
 #, c-format
@@ -586,25 +515,25 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"В директиве номер %u оператор выбора содержит число, за которым не следует "
-"«<», «#» или «%s»."
+"� ��������� ����� %u �������� ������ �������� �����, �� ������� �� ������� "
+"'<', '#' ��� '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "спецификация формата аргумента {%u} в «%s» не существует в «%s»"
+msgstr "��� ��������� '%u' � 'msgid' ��� ������������ ������� ��� � '%s'"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "для аргумента {%u} нет спецификации формата в «%s»"
+msgstr "��� ��������� {%u} ��� ������������ ������� � '%s'"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "в «%s» и «%s» не совпадают спецификации формата для аргумента {%u}"
+msgstr "� 'msgid' � '%s' �� ��������� ������������ ������� ��� ��������� {%u}"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -613,8 +542,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"В директиве номер %u параметр %u принадлежит типу «%s», но ожидается "
-"параметр типа «%s»."
+"� ��������� ����� %u �������� %u ����������� ���� '%s', �� ��������� "
+"�������� ���� '%s'."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -625,40 +554,33 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"В директиве номер %u указано слишком много параметров; ожидалось не более %u "
-"параметра"
 msgstr[1] ""
-"В директиве номер %u указано слишком много параметров; ожидалось не более %u "
-"параметров"
-msgstr[2] ""
-"В директиве номер %u указано слишком много параметров; ожидалось не более %u "
-"параметров"
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "В директиве номер %u после «%c» не стоит цифра."
+msgstr "� ��������� ����� %u ����� '%c' �� ����� �����."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "В директиве номер %u аргумент %d отрицателен."
+msgstr "� ��������� ����� %u �������� %d �����������."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "Строка обрывается посреди директивы ~/.../."
+msgstr "������ ���������� ������� ��������� ~/.../."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Встречено «~%c» без соответствующего «~%c»."
+msgstr "��������� '~%c' ��� ���������������� '~%c'."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "В директиве номер %u одновременно заданы модификаторы @ и :."
+msgstr "� ��������� ����� %u ������������ ������ ������������ @ � :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -666,27 +588,28 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"В директиве номер %u после «~:[» не стоят два предложения, разделенные «~;»."
+"� ��������� ����� %u ����� '~:[' �� ����� ��� �����������, ����������� '~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "В директиве номер %u «~;» использована в неверном месте."
+msgstr "� ��������� ����� %u '~;' ������������ � �������� �����."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Строка ссылается на какой-то аргумент несовместимым образом."
+msgstr "������ ��������� �� �����-�� �������� ������������� �������."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "спецификации формата в «%s» и «%s» не эквивалентны"
+msgstr "������������ ������� � `msgid' � `%s' �� ������������"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
-"спецификации формата в «%s» не являются подмножеством спецификаций из «%s»"
+"������������ ������� � '%s' �� �������� ������������� ������������ �� "
+"'msgid' "
 
 #: src/format-perl.c:433
 #, c-format
@@ -694,80 +617,50 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"В директиве номер %u спецификатор размера несовместим со спецификатором "
-"преобразования «%c»."
+"� ��������� ����� %u ������������ ������� ����������� �� �������������� "
+"�������������� '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "для аргумента «%s» нет спецификации формата в «%s»"
+msgstr "��� ��������� '%s' ��� ������������ ������� � '%s'"
 
 #: 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:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Строка ссылается на аргумент по имени «%s» несовместимым образом."
+msgstr "������ ��������� �� �������� �� ����� '%s' ������������� �������."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "спецификация формата в «%s» ожидает отображение, а в «%s» — кортеж"
+msgstr "������������ ������� � 'msgid' ������� �����������, � � '%s' -- ������"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "спецификация формата в «%s» ожидает кортеж, а в «%s» — отображение"
+msgstr "������������ ������� � 'msgid' ������� ������, � � '%s' -- �����������"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "спецификация формата аргумента «%s» в «%s» не существует в «%s»"
+msgstr "� 'msgid' ��� ������������ ������� ��� ��������� '%s', ��� � '%s'"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "в «%s» и «%s» не совпадают спецификации формата для аргумента «%s»"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "В директиве номер %u с «%c» не может начинаться имя поля."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "В директиве номер %u с «%c» не может начинаться аргумент getattr."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "В директиве номер %u с «%c» не может начинаться аргумент getitem."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"В директиве номер %u в спецификаторе формата невозможно указать большую "
-"вложенность."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "В директиве номер %u есть незавершённая директива формата."
+msgstr "� 'msgid' � '%s' �� ��������� ������������ ������� ��� ��������� %s"
 
 #: src/format-qt.c:152
 #, c-format
@@ -775,54 +668,52 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"«%s» является простой строкой формата, но «%s» нет: в ней содержится флаг "
-"«L» или аргумент с числом из двух цифр"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
-"Строка ссылается на переменную оболочки с именем, не представимым в ASCII."
+"������ ��������� �� ���������� �������� � ������, �� ������������ � ASCII."
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Строка ссылается на переменную оболочки со сложным синтактисом фигурных "
-"скобок.  Этот синтактис не поддерживается в этой программе по соображениям "
-"безопасности."
+"������ ��������� �� ���������� �������� �� ������� ����������� �������� "
+"������.  ���� ��������� �� �������������� � ���� ��������� �� ������������ "
+"������������."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"Строка ссылается на переменную оболочки, чье значение может оказаться иным "
-"внутри функций оболочки."
+"������ ��������� �� ���������� ��������, ��� �������� ����� ��������� ���� "
+"������ ������� ��������."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Строка ссылается на переменную оболочки с пустым именем."
+msgstr "������ ��������� �� ���������� �������� � ������ ������."
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "В директиве номер %u символ «%c» не является цифрой между 1 и 9."
+msgstr "� ��������� ����� %u ���� '%c' �� �������� ������ ����� 1 � 9."
 
 #: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
-msgstr "Символ, завершающий директиву номер %u не является цифрой между 1 и 9."
+msgstr "����, ����������� ��������� ����� %u �� �������� ������ ����� 1 � 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -830,377 +721,358 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>\n"
-"Это свободное ПО: вы можете продавать и распространять его.\n"
-"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Автор программы — %s.\n"
+msgstr "����� ��������� -- %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "Бруно Хайбл"
+msgstr "����� ������"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
-msgstr "слишком много аргументов"
+msgstr "������� ����� ����������"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "���������� `%s --help' ��� ��������� ����� ���������� ��������.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "Использование: %s [ПАРАМЕТР]\n"
+msgstr "�������������: %s [����]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "Печатает имя данной машины.\n"
+msgstr "�������� ��� ������ ������.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "Формат вывода:\n"
+msgstr "������ ������:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 короткое имя машины\n"
+msgstr "  -s, --short                 �������� ��� ������\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          длинное имя машины, включает полностью\n"
-"                                заданное доменное имя и псевдонимы\n"
+"  -f, --fqdn, --long          ������� ��� ������, �������� ��������� "
+"��������\n"
+"                                �������� ��� � ����������\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            адреса для заданного имени машины\n"
+msgstr "  -i, --ip-address            ������ ��� ��������� ����� ������\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Информационный вывод:\n"
+msgstr "�������������� �����:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  показать эту справку и выйти\n"
+msgstr "  -h, --help                  �������� ��� ������� � �����\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               показать информацию о версии и выйти\n"
+msgstr "  -V, --version               �������� ���������� � ������ � �����\n"
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
+msgstr "�� ������� ��������� �� ������ <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "невозможно получить имя машины"
+msgstr "���������� �������� ��� ������"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
-msgstr "принимается не более одного входного файла"
+msgstr "����������� �� ����� ������ �������� �����"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s и %s взаимно исключают друг друга"
+msgstr "%s � %s ������� ��������� ���� �����"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Использование: %s [ПАРАМЕТР] [ВХОДНОЙ-ФАЙЛ]\n"
+msgstr "�������������: %s [����] [�������-����]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"Фильтрует сообщения каталога переводов в соответствии с их атрибутами\n"
-"и манипулирует этими атрибутами.\n"
+"��������� ��������� �������� ��������� � ������������ � �� ����������\n"
+"� ������������ ����� ����������.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
+"���������, ������������ ��� ������� ������, ����������� � ��� ��������.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
-msgstr "Нахождение входного файла:\n"
+msgstr "���������� �������� �����:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  ВХОДНОЙ-ФАЙЛ                входной PO-файл\n"
+msgstr "  �������-����                ������� PO-����\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=КАТАЛОГ     добавить КАТАЛОГ к пути поиска входных файлов\n"
+"  -D, --directory=�������     �������� ������� � ���� ������ ������� ������\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
-"Если входной файл не задан или задан как -, читается стандартный ввод.\n"
+"���� ������� ���� �� ����� ��� ����� ��� -, �������� ����������� ����.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Нахождение выходного файла:\n"
+msgstr "���������� ��������� �����:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=ФАЙЛ      записать вывод в указанный файл\n"
+msgstr "  -o, --output-file=����      �������� ����� � ��������� ����\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Результаты выводятся на стандартный вывод, если выходной файл не задан\n"
-"или задан как -.\n"
+"���������� ��������� �� ����������� �����, ���� �������� ���� �� �����\n"
+"��� ����� ��� -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Выбор сообщений:\n"
+msgstr "����� ���������:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            сохранить переведенные, удалить "
-"непереведённые\n"
+"      --translated            ��������� ������������, ������� "
+"��������������\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          сохранить непереведённые, удалить "
-"переведенные\n"
+"      --untranslated          ��������� ��������������, ������� "
+"������������\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
-"      --no-fuzzy              удалить сообщения помеченные как «неточные»\n"
+"      --no-fuzzy              ������� ��������� ���������� ��� '��������'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
-"      --only-fuzzy            сохранить сообщения помеченные как «неточные»\n"
+"      --only-fuzzy            ��������� ��������� ���������� ��� '��������'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
-"      --no-obsolete           удалить сообщения, помеченные как «старые»\n"
+"      --no-obsolete           ������� ���������, ���������� ��� '������'\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
-"      --only-obsolete         сохранить сообщения, помеченные как «старые»\n"
+"      --only-obsolete         ��������� ���������, ���������� ��� '������'\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Операции с атрибутами:\n"
+msgstr "����������� ����������:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             пометить все сообщения как «неточные»\n"
+msgstr "      --set-fuzzy             �������� ��� ��������� ��� '��������'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           снять все пометки «неточное»\n"
+msgstr "      --clear-fuzzy           ����� ��� ������� '��������'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          пометить все сообщения как «старые»\n"
+msgstr "      --set-obsolete          �������� ��� ��������� ��� '������'\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        снять все пометки «старое»\n"
+msgstr "      --clear-obsolete        ����� ��� ������� '������'\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              если пометка «неточное», то сохранить\n"
-"                              предыдущие msgid переведённых сообщений\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
-msgstr ""
-"      --clear-previous        удалить «предыдущий msgid» из всех сообщений\n"
-
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 при удалении «неточных», также делать\n"
-"                              msgstr пустой\n"
+msgstr "      --clear-previous        ����� ��� ������� '���������� msgid'\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=ФАЙЛ.po     обработать сообщения, перечисленные в ФАЙЛЕ."
+"      --only-file=����.po     ���������� ���������, ������������� � �����."
 "po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=ФАЙЛ.po   обработать сообщения, не перечисленные\n"
-"                              в ФАЙЛЕ.po\n"
+"      --ignore-file=����.po   ���������� ���������, �� ������������� � �����."
+"po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 синоним для --only-fuzzy --clear-fuzzy\n"
+msgstr "      --fuzzy                 ������� ��� --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              синоним для --only-obsolete --clear-obsolete\n"
+"      --obsolete              ������� ��� --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Синтаксис входного файла:\n"
+msgstr "��������� �������� �����:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      входной файл имеет синтаксис Java .properties\n"
+"  -P, --properties-input      ������� ���� ����� ��������� Java .properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input     входной файл имеет синтаксис NeXTstep/GNUstep ."
+"      --stringtable-input     ������� ���� ����� ��������� NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
-msgstr "Подробности выходного формата:\n"
+msgstr "����������� ��������� �������:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1208,139 +1080,133 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 всегда использовать цвета и другие\n"
-"                              текстовые атрибуты\n"
-"      --color=КОГДА           использовать цвета и другие "
-"текстовые                               атрибуты в соответствии с КОГДА\n"
-"                              КОГДА может быть: «always» (всегда),\n"
-"                              «never» (никогда), «auto» или «html»\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
-"      --style=ФАЙЛ_СТИЛЯ      указать файл правил стилей CSS для --color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             не использовать при выводе экранирующие\n"
-"                              последовательности языка C (по умолчанию)\n"
-
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+"  -e, --no-escape             �� ������������ ��� ������\n"
+"                                escape-������������������ ����� C (�� "
+"���������)\n"
+
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                использовать экранирующие последовательности,\n"
-"                              а не расширенные символы\n"
+"  -E, --escape                ������������ escape-������������������, � ��\n"
+"                                ����������� �����\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              записать PO-файл, даже если он пуст\n"
+msgstr "      --force-po              �������� PO-����, ���� ���� �� ����\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
-"  -i, --indent                форматировать PO-файл, используя отступы\n"
+"  -i, --indent                ������������� PO-����, ��������� �������\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           не писать строки «#: файл:строка»\n"
+msgstr "      --no-location           �� ������ ������ '#: ����:������'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          генерировать строки «#: файл:строка»\n"
-"                              (по умолчанию)\n"
+"  -n, --add-location          ������������ ������ '#: ����:������' (�� "
+"���������)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                вывод в режиме строгого соответствия "
-"стандарту\n"
+"      --strict                ����� � ������ �������� ������������ "
+"���������\n"
 "                                Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output     записать .properties-файл Java\n"
+msgstr "  -p, --properties-output     �������� .properties-���� Java\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-output    записать .strings-файл NeXTstep/GNUstep\n"
+"      --stringtable-output    �������� .strings-���� NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=ЧИСЛО           задает ширину выходной страницы\n"
+msgstr "  -w, --width=�����           ������ ������ �������� ��������\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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"
-"                              ширины выходной страницы\n"
+"      --no-wrap               �� ��������� ������� ������, ������� ������\n"
+"                              ������ �������� ��������\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           сортировать вывод\n"
+msgstr "  -s, --sort-output           ����������� �����\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          сортировать вывод по именам файлов\n"
+msgstr "  -F, --sort-by-file          ����������� ����� �� ������ ������\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "задан недопустимый критерий выбора (%d < n < %d)"
+msgstr "����� ������������ �������� ������ (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Использование: %s [ПАРАМЕТР] [ВХОДНОЙ-ФАЙЛ]…\n"
+msgstr "�������������: %s [����] [�������-����]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1349,125 +1215,129 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"Сцепляет и объединяет заданные PO-файлы.\n"
-"Находит одинаковые сообщения в двух или более указанных PO-файлах.\n"
-"С помощью параметра --more-than можно затребовать вывод сообщений,\n"
-"встречающихся чаще других. И обратно, --less-than может быть\n"
-"использован для получения редко встречающихся сообщений\n"
-"(т. е. --less-than=2 выведет только уникальные сообщения). Переводы,\n"
-"комментарии, извлечённые комментарии и положение в файле сохраняются,\n"
-"но если задан параметр --use-first, то они берутся из первого PO-файла,\n"
-"в котором были определены.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
+"�������� � ���������� �������� PO-�����.\n"
+"������� ���������� ��������� � ���� ��� ����� ��������� PO-������.  �\n"
+"������� ����� --more-than ����� ����������� ����� ���������,\n"
+"������������� ���� ������.  � �������, --less-than ����� ����\n"
+"����������� ��� ��������� ����� ����� ������������� ���������\n"
+"(�.�. --less-than=2 ������� ������ ���������� ���������).  ��������,\n"
+"����������� � ����������� ����������� �����������, �� ���� ����� ����\n"
+"--use-first, ����������� ������� �� ������� PO-�����, � ������� ���\n"
+"���� ����������.  �����������, ���������� ��� ����� � ����� ������\n"
+"����������� ��� ���� PO-������.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  ВХОДНОЙ-ФАЙЛ...             входные файлы\n"
+msgstr "  �������-����...             ������� �����\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
-"  -f, --files-from=ФАЙЛ       получить список входных файлов из ФАЙЛА\n"
+"  -f, --files-from=����       �������� ������ ������� ������ �� �����\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
-msgstr "Если входной файл задан как -, читается стандартный ввод.\n"
+msgstr "���� ������� ���� ����� ��� -, �������� ����������� ����.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"  -<, --less-than=ЧИСЛО       вывести те сообщения, для которых число\n"
-"                              определений меньше заданного ЧИСЛА\n"
-"                              (по умолчанию не ограничено)\n"
+"  -<, --less-than=�����        ������� �� ���������, ��� ������� �����\n"
+"                               ����������� ������ �������� ����� (�� "
+"���������\n"
+"                               �� ����������)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  ->, --more-than=ЧИСЛО       вывести те сообщения, для которых число\n"
-"                              определений больше заданного ЧИСЛА\n"
-"                              (по умолчанию больше нуля)\n"
+"  ->, --more-than=�����       ������� �� ���������, ��� ������� �����\n"
+"                              ����������� ������ �������� ����� (�� "
+"���������\n"
+"                              ������ ����)\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                сокращение для --less-than=2, запрашивает\n"
-"                              печать только уникальных сообщений\n"
+"  -u, --unique                ���������� ��� --less-than=2, �����������\n"
+"                              ������ ������ ���������� ���������\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      входные файлы имеют синтаксис Java ."
+"  -P, --properties-input      ������� ����� ����� ��������� Java ."
 "properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     входные файлы имеют синтаксис NeXTstep/"
+"      --stringtable-input     ������� ����� ����� ��������� NeXTstep/"
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=ИМЯ           выходная кодировка\n"
+msgstr "  -t, --to-code=���           �������� ���������\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             использовать первый доступный перевод для\n"
-"                              каждого сообщения, не объединять переводы\n"
+"      --use-first             ������������ ������ ��������� ������� ��� "
+"�������\n"
+"                              ���������, �� ���������� ��������\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=ИМЯ_КАТАЛОГА     задать поле «Language» в заголовке\n"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "Питер Миллер"
+msgstr "����� ������"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
-msgstr "не заданы входные файлы"
+msgstr "�� ������ ������� �����"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "необходимо задать два входных файла"
+msgstr "���������� ������ ��� ������� �����"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, 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:218
 #, c-format, no-wrap
@@ -1479,96 +1349,96 @@
 "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 ""
-"Сравнивает два .po-файла в формате Uniforum, чтобы узнать, содержат ли\n"
-"они одинаковый набор строк, подлежащих переводу.  Файл def.po — это\n"
-"файл со старыми переводами; ref.po — это вновь созданный PO-файл или\n"
-"POT-файл (обычно производимый программой xgettext).  Это полезно,\n"
-"если вы хотите убедиться, что перевели каждое сообщение в программе.\n"
-"Для улучшения диагностики используется приблизительное сравнение, если\n"
-"нельзя найти точное совпадение.\n"
+"���������� ��� .po-����� � ������� Uniforum, ����� ������, �������� ��\n"
+"��� ���������� ����� �����, ���������� ��������.  ���� def.po -- ���\n"
+"���� �� ������� ����������; ref.po -- ��� ����� ��������� PO-���� ���\n"
+"POT-���� (������ ������������ ���������� xgettext).  ��� �������,\n"
+"���� �� ������ ���������, ��� �������� ������ ��������� � ���������.\n"
+"��� ��������� ����������� ������������ ��������������� ���������, ����\n"
+"������ ����� ������ ����������.\n"
 
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      переводы\n"
+msgstr "  def.po                      ��������\n"
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     ссылки на исходники\n"
+msgstr "  ref.pot                     ������ �� ���������\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "Модификаторы режима работы:\n"
+msgstr "������������ ������ ������:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
-"  -m, --multi-domain          применить ref.pot ко всем доменам из def.po\n"
+"  -m, --multi-domain          ��������� ref.pot �� ���� ������� �� def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     не применять нечеткое сопоставление\n"
+msgstr "  -N, --no-fuzzy-matching     �� ��������� �������� �������������\n"
 
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             использовать неточные записи\n"
+msgstr "      --use-fuzzy             ������������ �������� ������\n"
 
 #: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      использовать непереведённые записи\n"
+msgstr "      --use-untranslated      ������������ �������������� ������\n"
 
 #: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
-msgstr "это сообщение не переведено"
+msgstr "��� ��������� �� ����������"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "это сообщение должно быть проверено переводчиком"
+msgstr "��� ��������� ������ ���� ��������� ������������"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "это сообщение используется программой, но не было определено..."
+msgstr "��� ��������� ������������ ����������, �� �� ���� ����������..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...однако здесь определено похожее сообщение"
+msgstr "...������ ����� ���������� ������� ���������"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "это сообщение не было определено в %s"
+msgstr "��� ��������� �� ���� ���������� � %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "предупреждение: это сообщение не используется"
+msgstr "��������������: ��� ��������� �� ������������"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
-msgstr[0] "найдена %d критическая ошибка"
-msgstr[1] "найдено %d критические ошибки"
-msgstr[2] "найдено %d критических ошибок"
+msgstr[0] "������� %d ����������� ������"
+msgstr[1] "������� %d ����������� ������"
+msgstr[2] "������� %d ����������� ������"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
-msgstr "необходимо задать не менее двух файлов"
+msgstr "���������� ������ �� ����� ���� ������"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1576,94 +1446,95 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Находит одинаковые сообщения в двух или более указанных PO-файлах.\n"
-"С помощью параметра --more-than можно затребовать вывод сообщений,\n"
-"встречающихся чаще других. И обратно, --less-than может быть использован\n"
-"для получения редко встречающихся сообщений (т. е. --less-than=2 выведет\n"
-"только уникальные сообщения).  Переводы, комментарии и извлеченные\n"
-"комментарии сохраняются, но только из первого PO-файла, в котором они\n"
-"были определены. Положения в файлах сохраняются из всех PO-файлов.\n"
+"������� ���������� ��������� � ���� ��� ����� ��������� PO-������.\n"
+"� ������� ����� --more-than ����� ����������� ����� ���������, �������������\n"
+"���� ������.  � �������, --less-than ����� ���� ����������� ��� ��������� �����\n"
+"����� ������������� ��������� (�.�. --less-than=2 ������� ������ ����������\n"
+"���������).  ��������, ����������� � ����������� ����������� �����������, ��\n"
+"������ �� ������� PO-�����, � ������� ��� ���� ����������.  �����������,\n"
+"���������� ��� ����� � ����� ������ ����������� ��� ���� PO-������.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=ЧИСЛО       вывести те сообщения, для которых количество\n"
-"                              определений больше заданного ЧИСЛА\n"
-"                              (по умолчанию больше одного)\n"
+"  ->, --more-than=�����       ������� �� ���������, ��� ������� �����\n"
+"                              ����������� ������ �������� ����� (�� "
+"���������\n"
+"                              ������ ������)\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           не выводить заголовок с полем «msgid \"\"»\n"
+"      --omit-header           �� �������� ��������� � ����� `msgid \"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Преобразует каталог переводов в другую кодировку.\n"
+msgstr "����������� ������� ��������� � ������ ���������.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
-msgstr "Цель преобразования:\n"
+msgstr "���� ��������������:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "По умолчанию используется кодировка текущей локали.\n"
+msgstr "�� ��������� ������������ ��������� ������� ������.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                использовать на выводе отступы\n"
+msgstr "  -i, --indent                ������������ �� ������ �������\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           убрать строки «#: файл:строка»\n"
+msgstr "      --no-location           ������ ������ '#: ����:������'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          сохранять строки «#: файл:строка»\n"
-"                              (по умолчанию)\n"
+"      --add-location          ��������� ������ '#: ����:������' (�� "
+"���������)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
-"      --strict                выводить в строгом соответствии\n"
-"                              стандарту Uniforum\n"
+"      --strict                �������� � ������� ������������ ��������� "
+"Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
-msgstr "не задан входной файл"
+msgstr "�� ����� ������� ����"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
-msgstr "необходимо задать ровно один входной файл"
+msgstr "���������� ������ ����� ���� ������� ����"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Использование: %s [ПАРАМЕТР] ВХОДНОЙ-ФАЙЛ\n"
+msgstr "�������������: %s [����] �������-����\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1671,25 +1542,25 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Создает каталог английских переводов.  Входной файл — это последний\n"
-"созданный английский PO-файл или шаблон PO-файла (обычно создаваемый\n"
-"программой xgettext).  Непереведённым сообщениям дается перевод,\n"
-"совпадающий с msgid.\n"
+"������� ������� ���������� ���������.  ������� ���� -- ��� ���������\n"
+"��������� ���������� PO-���� ��� ������ PO-����� (������ �����������\n"
+"���������� xgettext).  �������������� ���������� ������ �������,\n"
+"����������� � msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  ВХОДНОЙ-ФАЙЛ                входной PO- или POT-файл\n"
+msgstr "  �������-����                ������� PO- ��� POT-����\n"
 
 #: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr "не задана команда"
+msgstr "�� ������ �������"
 
 #: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Использование: %s [ПАРАМЕТР] КОМАНДА [ПАРАМЕТР-КОМАНДЫ]\n"
+msgstr "�������������: %s [����] ������� [����-�������]\n"
 
 #: src/msgexec.c:262
 #, c-format, no-wrap
@@ -1700,11 +1571,11 @@
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"Применяет указанную команду ко всем переводам из каталога.\n"
-"КОМАНДА может быть любой программой, которая считывает перевод со\n"
-"стандартного ввода. Она вызывается один раз для каждого перевода.  Её\n"
-"вывод отправляется на выход msgexec. Значение, возвращаемое msgexec —\n"
-"это максимальный код возврата среди всех вызовов.\n"
+"��������� ��������� ������� �� ���� ��������� �� ��������.\n"
+"������� ����� ���� ����� ����������, ������� ��������� ������� ��\n"
+"������������ �����.  ��� ���������� ���� ��� ��� ������� ��������.  ��\n"
+"����� ������������ �� ����� msgexec.  ��������, ������������ msgexec --\n"
+"��� ������������ ��� �������� ����� ���� �������.\n"
 
 #: src/msgexec.c:271
 #, c-format, no-wrap
@@ -1712,314 +1583,282 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Специальная встроенная команда «0» выводит перевод и за ним нулевой\n"
-"байт.  Вывод «msgexec 0» подходит для передачи на вход «xargs -0».\n"
+"����������� ���������� ������� '0' ������� ������� � �� ��� �������\n"
+"����.  ����� \"msgexec 0\" �������� ��� �������� �� ���� \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=ВХОДНОЙ-ФАЙЛ    входной PO-файл\n"
+msgstr "  -i, --input=�������-����    ������� PO-����\n"
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "запись на стандартный вывод завершилась с ошибкой"
+msgstr "������ �� ����������� ����� ���������"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "������ ��������� �������� %s ���������"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
-msgstr "не задано имя фильтра"
+msgstr "�� ������ ��� �������"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "необходимо задать хотя бы один сценарий sed"
+msgstr "���������� ������ ���� �� ���� �������� sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Использование: %s [ПАРАМЕТР] ФИЛЬТР [ПАРАМЕТР-ФИЛЬТРА]\n"
+msgstr "�������������: %s [����] ������ [����-�������]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Применяет фильтр ко всем переводам каталога.\n"
+msgstr "��������� ������ �� ���� ��������� ��������.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"Фильтр может быть любой программой, читающей перевод со стандартного ввода "
-"и\n"
-"печатающей измененный перевод на стандартный вывод.\n"
+"������ ����� ���� ����� ����������, �������� ������� �� ������������ ����� "
+"�\n"
+"���������� ���������� ������� �� ����������� �����.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Полезные ПАРАМЕТРЫ-ФИЛЬТРА в случае, если ФИЛЬТРОМ является «sed»:\n"
+msgstr "�������� �����-������� � ������, ���� �������� �������� 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=СЦЕН       добавить СЦЕН к выполняемым командам\n"
+msgstr "  -e, --expression=����       �������� ���� � ����������� ��������\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=ФАЙЛ-СЦЕН        добавить содержимое файла ФАЙЛ-СЦЕН к\n"
-"                                выполняемым командам\n"
+"  -f, --file=����-����        �������� ���������� ����� ����-���� �\n"
+"                                ����������� ��������\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       выключить автоматическую печать образца\n"
+"  -n, --quiet, --silent       ��������� �������������� ������ �������\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             не использовать при выводе\n"
-"                                escape-последовательности языка C (по "
-"умолчанию)\n"
+"      --no-escape             �� ������������ ��� ������\n"
+"                                escape-������������������ ����� C (�� "
+"���������)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                использовать на выводе отступы\n"
+msgstr "      --indent                ������������ �� ������ �������\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           сохранить заголовок как есть, не фильтровать "
-"его\n"
+"      --keep-header           ��������� ��������� ��� ����, �� ����������� "
+"���\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "аргумент %s должен быть одиночным знаком пунктуации"
+msgstr "�������� %s ������ ���� ��������� �������������� ������"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "неверный порядок байт: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "Ульрих Дреппер"
+msgstr "������ �������"
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "нельзя указывать входной файл, если задан %s или %s"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "для %s требуется указать «-d каталог»"
+msgstr "%s ������� �������� \"-d �������\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "для %s требуется указать «-l локаль»"
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "для %s требуется указать «--template шаблон»"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "для %s требуется указать «-o файл»"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s и %s взаимно исключают друг друга в %s"
+msgstr "%s ������� �������� \"-l ������\""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s допустимо только с %s или %s"
+msgstr "%s ��������� ������ � %s ��� %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s допустимо только с %s, %s или %s"
+msgstr "%s ��������� ������ � %s, %s ��� %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
-msgstr[0] "%d переведённое сообщение"
-msgstr[1] "%d переведённых сообщения"
-msgstr[2] "%d переведённых сообщений"
+msgstr[0] "%d ������������ ���������"
+msgstr[1] "%d ������������ ���������"
+msgstr[2] "%d ������������ ���������"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d неточный перевод"
-msgstr[1] ", %d неточных перевода"
-msgstr[2] ", %d неточных переводов"
+msgstr[0] ", %d �������� �������"
+msgstr[1] ", %d �������� ��������"
+msgstr[2] ", %d �������� ���������"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d непереведённое сообщение"
-msgstr[1] ", %d непереведённых сообщения"
-msgstr[2] ", %d непереведённых сообщений"
+msgstr[0] ", %d �������������� ���������"
+msgstr[1] ", %d �������������� ���������"
+msgstr[2] ", %d �������������� ���������"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "Использование: %s [ПАРАМЕТР] имя-файла.po …\n"
+msgstr "�������������: %s [����] ���-�����.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Создаёт двоичный каталог сообщений из текстового описания переводов.\n"
+msgstr "������� �������� ������� ��������� �� ���������� �������� ���������.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
-"То же и для необязательных аргументов.\n"
+"���������, ������������ ��� ������� ������, ����������� � ��� ��������.\n"
+"�� �� � ��� �������������� ����������.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  имя-файл.po ...             входные файлы\n"
+msgstr "  ���-����.po ...             ������� �����\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
-msgstr "Режим работы:\n"
+msgstr "����� ������:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  режим Java: создает Java-класс ResourceBundle\n"
+"  -j, --java                  ����� Java: ������� Java-����� ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 как --java, но предполагает Java2 (JDK 1.2 или "
-"выше)\n"
+"      --java2                 ��� --java, �� ������������ Java2 (JDK 1.2 ��� "
+"����)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                режим C#: генерировать .dll-файл .NET\n"
+msgstr "      --csharp                ����� C#: ������������ .dll-���� .NET\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources    режим ресурсов C#: генерировать .resources-файл ."
+"      --csharp-resources    ����� �������� C#: ������������ .resources-���� ."
 "NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   режим Tcl: создает .msg-файл для tcl/msgcat\n"
+"      --tcl                   ����� Tcl: ������� .msg-���� ��� tcl/msgcat\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    режим Qt: генерировать .qm-файл Qt\n"
+msgstr "      --qt                    ����� Qt: ������������ .qm-���� Qt\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               режим Desktop Entry: генерировать файл ."
-"desktop\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
-"      --strict                строго соответствовать стандарту Uniforum\n"
+"      --strict                ������ ��������������� ��������� Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
-"Если выходной файл задан как -, результаты выводятся на стандартный вывод.\n"
+"���� �������� ���� ����� ��� -, ���������� ��������� �� ����������� �����.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "Нахождение выходного файла в режиме Java:\n"
+msgstr "���������� ��������� ����� � ������ Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=РЕСУРС       имя ресурса\n"
+msgstr "  -r, --resource=������       ��� �������\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=ЛОКАЛЬ         имя локали, это либо язык, либо язык_СТРАНА\n"
-
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                создавать файл .java, вместо файла .class\n"
+"  -l, --locale=������         ��� ������, ��� ���� ����, ���� ����_������\n"
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
-"  -d КАТАЛОГ                  корневой каталог иерархии каталогов классов\n"
+"  -d �������                  �������� ������� �������� ��������� �������\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2027,287 +1866,230 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Имя класса определяется путём добавления имени локали к имени ресурса после\n"
-"символа подчеркивания. Параметр -d обязателен. Класс записывается в "
-"указанный\n"
-"каталог.\n"
+"��� ������ ������������ ����� ���������� ����� ������ � ����� ������� "
+"����� \n"
+"����� �������������.  ���� -d ����������.  ����� ������������ � ���������\n"
+"�������.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "Нахождение выходного файла в режиме C#:\n"
+msgstr "���������� ��������� ����� � ������ C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
-"  -d КАТАТОГ                 базовый каталог для зависящих от локали .dll-"
-"файлов\n"
+"  -d �������                 ������� ������� ��� ��������� �� ������ .dll-"
+"������\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"Параметры -l и -d обязательны. Выходной .dll-файл записывается в\n"
-"подкаталог указанного каталога, имя этого подкаталога зависит от\n"
-"локали.\n"
+"����� -l � -d �����������.  �������� .dll-���� ������������ �\n"
+"���������� ���������� ��������, ��� ����� ����������� ������� ��\n"
+"������.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Нахождение входного файла в режиме Tcl:\n"
+msgstr "���������� �������� ����� � ������ Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d КАТАЛОГ                  корневой каталог иерархии .msg-файлов\n"
+msgstr "  -d �������                  �������� ������� �������� .msg-������\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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"
+"����� -l � -d �����������.  �������� .msg-���� ������������ � ��������� "
+"�������.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Параметры режима Desktop Entry:\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-"  --template=ШАБЛОН           в качестве шаблона использовать файл .desktop\n"
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d КАТАЛОГ                  корневой каталог файлов .po\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -k, --keyword[=СЛОВО]       дополнительное ключевое слово для поиска\n"
-"  -k, --keyword               не использовать ключевые слова по умолчанию\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Параметры -l, -o и --template обязательны. Если указан -D, то входные\n"
-"файлы читаются из каталога, а не берутся из аргументов командной строки.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Интерпретация входного файла:\n"
+msgstr "������������� �������� �����:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
 "domain\n"
 msgstr ""
-"  -c, --check                 произвести все проверки, подразумеваемые\n"
-"                              параметрами --check-format, --check-header,\n"
-"                              --check-domain\n"
+"  -c, --check                 ���������� ��� ��������, ��������������� "
+"�������\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
-"      --check-format          проверить зависящие от языка форматные строки\n"
+"      --check-format          ��������� ��������� �� ����� ��������� ������\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
-"      --check-header          проверить наличие и содержимое заголовка\n"
+"      --check-header          ��������� ������� � ���������� ���������\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          проверить на конфликты между директивами "
-"домена\n"
-"                                и параметром --output-file\n"
+"      --check-domain          ��������� �� ��������� ����� ����������� "
+"������ \n"
+"                                � ������ --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   проверить, что GNU msgfmt ведет себя так же, \n"
-"                                как X/Open msgfmt\n"
+"  -C, --check-compatibility   ���������, ��� GNU msgfmt ����� ���� ��� ��, \n"
+"                                ��� X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=СИМВОЛ]\n"
-"                              проверить наличие клавиатурных\n"
-"                              эквивалентов для пунктов меню\n"
+"      --check-accelerators[=����]  ��������� ������� ������������ "
+"������������ \n"
+"                                ��� ������� ����\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
-"  -f, --use-fuzzy             использовать при выводе неточные переводы\n"
+"  -f, --use-fuzzy             ������������ ��� ������ �������� ��������\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=ЧИСЛО       выравнивать строки по ЧИСЛУ байт (по "
-"умолчанию: %d)\n"
-
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=П_БАЙТ     записывать 32-битные числа в заданном\n"
-"                              порядке байт (big или little, значение по\n"
-"                              умолчанию зависит от платформы)\n"
+"  -a, --alignment=�����       ����������� ������ �� ����� ���� (�� "
+"���������: %d)\n"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
-"      --no-hash               двоичный файл не будет включать хэш-таблицу\n"
+"      --no-hash               �������� ���� �� ����� �������� ���-�������\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            напечатать статистику о переводах\n"
+msgstr "      --statistics            ���������� ���������� � ���������\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
-"  -v, --verbose               увеличить подробность диагностических "
-"сообщений\n"
+"  -v, --verbose               ��������� ����������� ��������������� "
+"���������\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr "предупреждение: заголовок PO-файла отсутствует или неправилен\n"
+msgstr "��������������: ��������� PO-����� ����������� ��� ����������\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "предупреждение: преобразование кодировок не будет работать\n"
+msgstr "��������������: �������������� ��������� �� ����� ��������\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr "предупреждение: заголовок PO-файла помечен как неточный\n"
+msgstr "��������������: ��������� PO-����� ������� ��� ��������\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "предупреждение: более старые версии msgfmt выдадут здесь ошибку\n"
+msgstr "��������������: ����� ������ ������ msgfmt ������� ����� ������\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "имя домена «%s» не может быть использовано в качестве имени файла"
+msgstr "��� ������ \"%s\" �� ����� ���� ������������ � �������� ����� �����"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
-"имя домена «%s» недопустимо в качестве имени файла, будет использовано\n"
-"частично усеченное имя домена"
+"��� ������ \"%s\" ����������� � �������� ����� �����, ����� ������������\n"
+"�������� ��������� ��� ������"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "директива «domain %s» игнорируется"
+msgid "`domain %s' directive ignored"
+msgstr "��������� `domain %s' ������������"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "пустая запись «msgstr» игнорируется"
+msgid "empty `msgstr' entry ignored"
+msgstr "������ ��������� `msgstr' ������������"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "неточная запись «msgstr» игнорируется"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "�������� ��������� `msgstr' ������������"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: предупреждение: исходный файл содержит неточные переводы"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s не существует"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s существует, но недоступен для чтения"
+msgstr "%s: ��������������: �������� ���� �������� �������� ��������"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "ошибка чтения «%s»"
+msgstr "������ ������ \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"параметр «%c» нельзя использовать до того, как заданы «J», «K», «T», «C» или "
-"«X»"
+"���� '%c' ������ ������������ �� ����, ��� ������ 'J', 'K', 'T', 'C' ��� 'X'"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
-"Извлекает из каталога переводов все сообщения, которые соответствуют\n"
-"заданному образцу или принадлежат заданным исходным файлам.\n"
+"��������� �� �������� ��������� ��� ���������, ������� �������������\n"
+"��������� ������� ��� ����������� �������� �������� ������.\n"
+"\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2346,179 +2128,179 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 msgstr ""
-"Выбор сообщений:\n"
-"  [-N ИСХ-ФАЙЛ]... [-M ИМЯ-ДОМЕНА]...\n"
-"  [-J ОБРАЗЕЦ-MSGCTXT] [-K ОБРАЗЕЦ-MSGID] [-T ОБРАЗЕЦ-MSGSTR]\n"
-"  [-C ОБРАЗЕЦ-КОММЕНТАРИЯ] [-X ОБРАЗЕЦ-ИЗВЛЕКАЕМОГО-КОММЕНТАРИЯ]\n"
-"Сообщение выбирается, если оно содержится в одном из указанных\n"
-"исходных файлов, \n"
-"или если оно содержится в одном из указанных доменов,\n"
-"или если задан параметр -J, и контекст сообщения (msgctxt) соответствует\n"
-"ОБРАЗЦУ-MSGCTXT,\n"
-"или если задан параметр -K, и ключ сообщения (msgid или msgid_plural)\n"
-"соответствует ОБРАЗЦУ-MSGID,\n"
-"или если задан параметр -K, и ключ сообщения (msgid или msgid_plural)\n"
-"соответствует ОБРАЗЦУ-MSGID,\n"
-"или если задан параметр -T, и перевод сообщения (msgstr) соответствует\n"
-"ОБРАЗЦУ-MSGSTR,\n"
-"или если задан параметр -C, а комментарий для переводчика соответствует\n"
-"ОБРАЗЦУ-КОММЕНТАРИЯ,\n"
-"или если задан параметр -X, а комментарий для переводчика соответствует\n"
-"ОБРАЗЦУ-ИЗВЛЕКАЕМОГО-КОММЕНТАРИЯ.\n"
+"����� ���������:\n"
+"  [-N ���-����]... [-M ���-������]...\n"
+"  [-J �������-MSGCTXT] [-K �������-MSGID] [-T �������-MSGSTR]\n"
+"  [-C �������-�����������] [-X �������-������������-�����������]\n"
+"��������� ����������, ���� ��� ���������� � ����� �� ���������\n"
+"�������� ������, \n"
+"��� ���� ��� ���������� � ����� �� ��������� �������,\n"
+"��� ���� ����� ���� -J, � �������� ��������� (msgctxt) �������������\n"
+"�������-MSGCTXT,\n"
+"��� ���� ����� ���� -K, � ���� ��������� (msgid ��� msgid_plural)\n"
+"������������� �������-MSGID,\n"
+"��� ���� ����� ���� -K, � ���� ��������� (msgid ��� msgid_plural)\n"
+"������������� �������-MSGID,\n"
+"��� ���� ����� ���� -T, � ������� ��������� (msgstr) �������������\n"
+"�������-MSGSTR,\n"
+"��� ���� ����� ���� -C, � ����������� ��� ����������� �������������\n"
+"�������-�����������,\n"
+"��� ���� ����� ���� -X, � ����������� ��� ����������� �������������\n"
+"�������-������������-�����������.\n"
 "\n"
 "\n"
-"Когда задано несколько критериев выбора, то множество выбранных\n"
-"сообщений будет объединением сообщений, выбранных по каждому\n"
-"критерию.\n"
+"����� ������ ��������� ��������� ������, �� ��������� ���������\n"
+"��������� ����� ������������ ���������, ��������� �� �������\n"
+"��������.\n"
 "\n"
-"Синтаксис ОБРАЗЦА-MSGID, ОБРАЗЦА-MSGSTR, ОБРАЗЦА-КОММЕНТАРИЯ или\n"
-"ОБРАЗЦА-ИЗВЛЕКАЕМОГО-КОММЕНТАРИЯ:\n"
-"  [-E | -F] [-e ОБРАЗЕЦ | -f ФАЙЛ]...\n"
-"ОБРАЗЦЫ — это по умолчанию базовые регулярные выражения, либо\n"
-"расширенные регулярные выражения, если задан параметр -E, либо\n"
-"фиксированные строки, если задан параметр -F.\n"
+"��������� �������-MSGID, �������-MSGSTR, �������-����������� ���\n"
+"�������-������������-�����������:\n"
+"  [-E | -F] [-e ������� | -f ����]...\n"
+"������� -- ��� �� ��������� ������� ���������� ���������, ����\n"
+"����������� ���������� ���������, ���� ����� ���� -E, ����\n"
+"������������� ������, ���� ����� ���� -F.\n"
 "\n"
-"  -N, --location=ИСХ-ФАЙЛ     выбрать сообщения, извлеченные из ИСХ-ФАЙЛ\n"
-"  -M, --domain=ИМЯ-ДОМЕНА     выбрать сообщения, принадлежащие домену\n"
-"  -J, --msgctxt               начало образцов msgctxt\n"
-"  -K, --msgid                 начало образцов msgid\n"
-"  -T, --msgstr                начало образцов msgstr\n"
-"  -C, --comment               начало образцов комментариев для переводчика\n"
-"  -X, --extracted-comment     начало образцов извлекаемого комментария\n"
-"  -E, --extended-regexp       ОБРАЗЕЦ является расширенным рег. выражением\n"
-"  -F, --fixed-strings         ОБРАЗЕЦ является набором строк,\n"
-"                              разделённых символами перевода строки\n"
-"  -e, --regexp=ОБРАЗЕЦ        использовать ОБРАЗЕЦ в качестве рег. выражения\n"
-"  -f, --file=ФАЙЛ             получить ОБРАЗЕЦ из ФАЙЛА\n"
-"  -i, --ignore-case           игнорировать регистр букв\n"
-"  -v, --invert-match          выводить только сообщения, которые не\n"
-"                              соответствуют ни одному критерию выбора\n"
+"  -N, --location=���-����     ������� ���������, ����������� �� ���-����\n"
+"  -M, --domain=���-������     ������� ���������, ������������� ������\n"
+"  -J, --msgctxt               ������ �������� msgctxt\n"
+"  -K, --msgid                 ������ �������� msgid\n"
+"  -T, --msgstr                ������ �������� msgstr\n"
+"  -C, --comment               ������ �������� ������������ ��� �����������\n"
+"  -X, --extracted-comment     ������ �������� ������������ �����������\n"
+"  -E, --extended-regexp       ������� �������� ����������� ���. ����������\n"
+"  -F, --fixed-strings         ������� �������� ������� �����,\n"
+"                              ���������� ������� �������� ������\n"
+"  -e, --regexp=�������        ������������ ������� � �������� ���. ���������\n"
+"  -f, --file=����             �������� ������� �� �����\n"
+"  -i, --ignore-case           ������������ ������� ����\n"
+"  -v, --invert-match          �������� ������ ���������, ������� ��\n"
+"                              ������������� �� ������ �������� ������\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                использовать экранирующие последовательности,\n"
-"                                а не расширенные символы\n"
+"      --escape                ������������ escape-������������������, � ��\n"
+"                                ����������� �����\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           сортировать вывод\n"
+msgstr "      --sort-output           ����������� �����\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          сортировать вывод по именам файлов\n"
+msgstr "      --sort-by-file          ����������� ����� �� ������ ������\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"В вашем окружении не определён предпочтительный язык.\n"
-"Установите переменную окружения LANG как описано в файле ABOUT-NLS. Это\n"
-"необходимо, чтобы вы могли проверить свои переводы.\n"
+"���� ����� �� ���������� ���������������� ����.  �����������,\n"
+"���������� ���������� ����� LANG ��� ������� � ����� ABOUT-NLS.  ���\n"
+"����������, ����� �� ����� ��������� ���� ��������.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 msgstr ""
-"Выходной файл %s уже существует.\n"
-"Укажите локаль с помощью параметра --locale или выходной\n"
-"po-файл с помощью параметра --output-file.\n"
+"�������� ���� %s ��� ����������.  \n"
+"�����������, ������� ������ � ������� ����� --locale ��� ��������\n"
+"po-���� � ������� ����� --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
-msgstr "Создано %s.\n"
+msgstr "������� %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
-"Создаёт новый PO-файл, инициализируя метаинформацию на основе\n"
-"пользовательского окружения.\n"
+"������� ����� PO-����, ������������� �������������� ������ ��\n"
+"���������������� �����.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=ВХОДНОЙ-ФАЙЛ    входной POT-файл\n"
+msgstr "  -i, --input=�������-����    ������� POT-����\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Если входной файл не задан, он ищется в текущем каталоге.\n"
-"Если входной файл задан как -, читается стандартный ввод.\n"
+"���� ������� ���� �� �����, �� ������ � ������� ��������.\n"
+"���� ������� ���� ����� ��� -, �������� ����������� ����.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=ФАЙЛ      записать вывод в указанный файл\n"
+msgstr "  -o, --output-file=����      �������� ����� � ��������� ����\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"Если выходной файл не задан, он зависит от параметра --locale или от\n"
-"установленной локали.  Если он задан как -, результаты выводятся на\n"
-"стандартный вывод.\n"
+"���� �������� ���� �� �����, �� ������� �� ����� --locale ��� ��\n"
+"������������� ������.  ���� �� ����� ��� -, ���������� ��������� ��\n"
+"����������� �����.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=ЯЯ_СС          задает целевую локаль\n"
+msgstr "  -l, --locale=��_��          ������ ������� ������\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         предполагать, что PO-файл сгенерирован "
-"автоматически\n"
+"      --no-translator         ������������, ��� PO-���� ������������ "
+"�������������\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Найдено более одного pot-файла.\n"
-"Укажите входной pot-файл с помощью параметра --input.\n"
+"������� ����� ������ pot-�����.\n"
+"����������, ������� ������� pot-���� � ������� ����� --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
-msgstr "ошибка при чтении текущего каталога"
+msgstr "������ ��� ������ �������� ��������"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"В текущем каталоге не найден pot-файл.\n"
-"Укажите входной pot-файл с помощью параметра --input.\n"
+"� ������� �������� �� ������ pot-����.\n"
+"����������, ������� ������� pot-���� � ������� ����� --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "дочерний процесс %s завершился неуспехом с выходным кодом %d"
+msgstr "�������� ������� %s ���������� ��������� � �������� ����� %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2526,55 +2308,55 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Новый каталог сообщений должен содержать ваш адрес электронной почты,\n"
-"чтобы пользователи могли присылать свои замечания по поводу ваших\n"
-"передов, а также чтобы сопроводители программ могли связаться с вами в\n"
-"том случае, если возникнут непредвиденные технические проблемы.\n"
+"����� ������� ��������� ������ ��������� ��� ����� ����������� �����,\n"
+"����� ������������ ����� ��������� ���� ��������� �� ������ �����\n"
+"�������, � ����� ����� ������������� �������� ����� ��������� � ���� �\n"
+"��� ������, ���� ��������� �������������� ����������� ��������.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "Английские переводы для пакета %s"
+msgstr "���������� �������� ��� ������ %s"
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "текущая кодировка «%s» не является переносимым именем кодировки"
+msgstr "������� ��������� \"%s\" �� �������� ����������� ������ ���������"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "во входном файле две разные кодировки «%s» и «%s»"
+msgstr "�� ������� ����� ��� ������ ��������� \"%s\" � \"%s\""
 
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "входной файл «%s» не содержит запись заголовка с описанием кодировки"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "������� ���� `%s' �� �������� ���� ��������� � ��������� ���������"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"домен «%s» во входном файле «%s» не содержит запись заголовка с описанием "
-"кодировки"
+"����� \"%s\" �� ������� ����� `%s' �� �������� ���� ��������� � ��������� "
+"���������"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "целевая кодировка «%s» не является переносимым именем кодировки."
+msgstr "������� ��������� \"%s\" �� �������� ����������� ������ ���������."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
-msgstr "предупреждение: "
+msgstr "��������������: "
 
 #: src/msgl-cat.c:443
 #, c-format
@@ -2582,8 +2364,8 @@
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Входные файлы содержат сообщения в разных кодировках, в том числе в\n"
-"UTF-8. Вывод преобразуется к UTF-8.\n"
+"������� ����� �������� ��������� � ������ ����������, � ��� ����� �\n"
+"UTF-8.  ����� ������������� � UTF-8.\n"
 
 #: src/msgl-cat.c:449
 #, c-format
@@ -2593,10 +2375,10 @@
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Входные файлы содержат сообщения в разных кодировках, в том числе в %s и "
+"������� ����� �������� ��������� � ������ ����������, � ��� ����� � %s � "
 "%s.\n"
-"Вывод преобразуется к UTF-8.  Чтобы выбрать другую выходную кодировку,\n"
-"используйте параметр --to-code.\n"
+"����� ������������� � UTF-8.  ����� ������� ������ �������� ���������,\n"
+"����������� ���� --to-code.\n"
 
 #: src/msgl-cat.c:488
 #, c-format
@@ -2606,11 +2388,11 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"Преобразование файла %s из кодировки %s в кодировку %s\n"
-"изменяет некоторые msgid или msgctxt.\n"
-"Вы должно переписать все msgid и msgctxt в чистом ASCII либо убедиться, что "
-"они\n"
-"изначально представлены в UTF-8, например в исходных файлах программы.\n"
+"�������������� ����� %s �� ��������� %s � ��������� %s\n"
+"�������� ��������� msgid ��� msgctxt.\n"
+"�� ������ ���������� ��� msgid � msgctxt � ������ ASCII ���� ���������, ��� "
+"���\n"
+"���������� ������������ � UTF-8, �������� � �������� ������ ���������.\n"
 
 #: src/msgl-charset.c:93
 #, c-format
@@ -2620,14 +2402,14 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Кодировка локали «%s» отличается входной кодировки «%s».\n"
-"Вывод «%s» может быть неправильным.\n"
-"Возможные методы обойти эту ситуацию:\n"
+"��������� ������ \"%s\" ���������� ������� ��������� \"%s\".\n"
+"����� '%s' ����� ���� ������������.\n"
+"��������� ������ ������ ��� ��������:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Установить LC_ALL равной локали с кодировкой %s.\n"
+msgstr "- ���������� LC_ALL ������ ������ � ���������� %s.\n"
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2636,9 +2418,9 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Преобразовать каталог переводов к %s с помощью «msgconv»,\n"
-"  затем применить «%s»,\n"
-"  затем преобразовать обратно к %s с помощью «msgconv».\n"
+"- ������������� ������� ��������� � %s � ������� 'msgconv',\n"
+"  ����� ��������� '%s',\n"
+"  ����� ������������� ������� � %s � ������� 'msgconv'.\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2648,10 +2430,10 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Установить LC_ALL равной локали с кодировкой %s,\n"
-"  преобразовать каталог переводов к %s с помощью «msgconv»,\n"
-"  затем применить «%s»,\n"
-"  затем преобразовать обратно к %s с помощью «msgconv».\n"
+"- ���������� LC_ALL ������ ������ � ���������� %s,\n"
+"  ������������� ������� ��������� � %s � ������� 'msgconv',\n"
+"  ����� ��������� '%s',\n"
+"  ����� ������������� ������� � %s � ������� 'msgconv'.\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2660,165 +2442,186 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Кодировка локали «%s» не является переносимым именем кодировки.\n"
-"Вывод «%s» может быть неправильным.\n"
-"Возможный метод обойти эту ситуацию — установить LC_ALL=C.\n"
+"��������� ������ \"%s\" �� �������� ����������� ������ ���������.\n"
+"����� '%s' ����� ���� ������������.\n"
+"��������� ����� ������ ��� �������� -- ���������� LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
-msgstr "выражение во множественном числе может давать отрицательные значения"
+msgstr "��������� �� ������������� ����� ����� ������ ������������� ��������"
 
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
-"nplurals = %lu, но выражение во множественном числе может давать значения до "
+"nplurals = %lu, �� ��������� �� ������������� ����� ����� ������ �������� �� "
 "%lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
-msgstr "выражение во множественном числе может давать деление на ноль"
+msgstr "��������� �� ������������� ����� ����� ������ ������� �� ����"
 
 #: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
-msgstr "выражение во множественном числе может дать переполнение целого"
+msgstr "��������� �� ������������� ����� ����� ���� ���������� ������"
 
 #: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
-"выражение во множественном числе может давать исключительные ситуации в "
-"арифметике, возможно, деление на ноль"
+"��������� �� ������������� ����� ����� ������ �������������� �������� � "
+"����������, ��������, ������� �� ����"
 
 #: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "Попробуйте следующее, подходит для %s:"
+msgstr "���������� ���������, �������� ��� %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr "каталог сообщений содержит переводы во множественном числе"
+msgstr "������� ��������� �������� �������� �� ������������� �����"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "но в заголовке нет атрибута «plural=ВЫРАЖЕНИЕ»"
+msgstr "�� � ��������� ��� �������� \"plural=���������\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "но в заголовке нет атрибута «nplurals=ЦЕЛОЕ»"
+msgstr "�� � ��������� ��� �������� \"nplurals=�����\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
-msgstr "неверная значение nplurals"
+msgstr "�������� �������� nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
-msgstr "неверное выражение во множественном числе"
+msgstr "�������� ��������� �� ������������� �����"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, 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 форма во множественном числе"
-msgstr[1] "но в некоторых сообщениях только %lu формы во множественном числе"
-msgstr[2] "но в некоторых сообщениях только %lu форм во множественном числе"
+msgstr[0] "�� � ��������� ���������� ������ ���� ����� �� ������������� �����"
+msgstr[1] "�� � ��������� ���������� ������ %lu ����� �� ������������� �����"
+msgstr[2] "�� � ��������� ���������� ������ %lu ���� �� ������������� �����"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "но в некоторых сообщениях есть %lu форма во множественном числе"
-msgstr[1] "но в некоторых сообщениях есть %lu формы во множественном числе"
-msgstr[2] "но в некоторых сообщениях есть %lu форм во множественном числе"
+msgstr[0] "�� � ��������� ���������� ���� ���� ����� �� ������������� �����"
+msgstr[1] "�� � ��������� ���������� ���� %lu ����� �� ������������� �����"
+msgstr[2] "�� � ��������� ���������� ���� %lu ���� �� ������������� �����"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"каталог сообщений содержит переводы во множественном числе, но в нем "
-"заголовка с «Plural-Forms: nplurals=ЦЕЛОЕ; plural=ВЫРАЖЕНИЕ;»"
+"������� ��������� �������� �������� �� ������������� �����, �� � ��� "
+"��������� � \"Plural-Forms: nplurals=�����; plural=���������;\""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "поля «msgid» и «msgid_plural» не начинаются с «\\n»"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr ""
+"���� �� ����� `msgid' ��� `msgid_plural' ���������� � '\\n', ����� ��� "
+"������ -- ���"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "поля «msgid» и «msgstr[%u]» не начинаются с «\\n»"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr ""
+"���� �� ����� `msgid' ��� `msgstr[%u]' ���������� � '\\n', ����� ��� ������ "
+"-- ���"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "поля «msgid» и «msgstr» не начинаются с «\\n»"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr ""
+"���� �� ����� `msgid' ��� `msgstr' ���������� � '\\n', ����� ��� ������ -- "
+"���"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "поля «msgid» и «msgid_plural» не заканчиваются «\\n»"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+"���� �� ����� `msgid' ��� `msgid_plural' ����������� '\\n', ����� ��� ������ "
+"-- ���"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "поля «msgid» и «msgstr[%u]» не заканчиваются «\\n»"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr ""
+"���� �� ����� `msgid' ��� `msgstr[%u]' ����������� '\\n', ����� ��� ������ "
+"-- ���"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "поля «msgid» и «msgstr» не заканчиваются «\\n»"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr ""
+"���� �� ����� `msgid' ��� `msgstr' ����������� '\\n', ����� ��� ������ -- ���"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr "обработка форм во множественном числе является расширением GNU gettext"
+msgstr "��������� ���� �� ������������� ����� �������� ����������� GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "в msgstr недостает отметки клавиатурного эквивалента «%c»"
+msgstr "� msgstr ��������� ������� ������������� ����������� '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "в msgstr слишком много отметок клавиатурных эквивалентов «%c»"
+msgstr "� msgstr ������� ����� ������� ������������ ������������ '%c'"
+
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "� ��������� ��������� ���� `%s'\n"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "���� ��������� `%s' ������ ���������� � ����� ������\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
 msgstr ""
-"поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
+"��������� ���� ��������� ��� ��� ����� �������������� ��������� ��������\n"
 
-#: src/msgl-check.c:831
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "в заголовке отсутствует поле «%s»\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"��������� ���� ��������� ��� ��� ����� �������������� ��������� ��������\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: неверные данные для кодировки «%s»"
+msgstr "%s: �������� ���� ��� ��������� \"%s\""
 
 #: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: ошибка при преобразовании из кодировки «%s» в кодировку «%s»"
+msgstr "%s: ������ ��� �������������� �� ��������� \"%s\" � ��������� \"%s\""
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "входной файл не содержит поле заголовка с описанием кодировки"
+msgstr "������� ���� �� �������� ���� ��������� � ��������� ���������"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, 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() не поддерживает это преобразование."
+"���������� ������������� �� \"%s\" � \"%s\".  %s ���������� �� iconv(), �� "
+"iconv() �� ������������ ��� ��������������."
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2826,29 +2629,29 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Преобразование из «%s» в «%s» порождает дубликаты: некоторые различающиеся "
-"оригиналы сообщений становятся одинаковыми."
+"�������������� �� \"%s\" � \"%s\" ��������� ���������: ��������� "
+"������������� ��������� ��������� ���������� �����������."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Невозможно преобразовать из «%s» в «%s».  %s полагается на iconv(). Эта "
-"версия была собрана без iconv()."
+"���������� ������������� �� \"%s\" � \"%s\".  %s ���������� �� iconv().  ��� "
+"������ ���� ������� ��� iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s допустимо только с %s"
+msgstr "%s ��������� ������ � %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
-msgstr "тип резервного копирования"
+msgstr "��� ���������� �����������"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2861,70 +2664,70 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Объединяет два PO-файла в стиле Uniforum в один.  Файл def.po — это\n"
-"существующий РО-файл со переводами, которые будут перенесены в новый\n"
-"файл, если они еще верны.  Комментарии сохраняются, кроме\n"
-"комментариев, извлеченных из исходного текста программы или содержащих\n"
-"имя файла и номер строки.  Файл ref.pot — новый файл со свежими\n"
-"ссылками на исходные тексты, но устаревшими переводами, либо это\n"
-"PO-файл-шаблон (обычно производимый программой xgettext).  В этом\n"
-"файле игнорируются все комментарии, кроме начинающихся с точки или\n"
-"содержащих имя файла и номер строки.  Для улучшения результата\n"
-"используется приблизительное сравнение, если нельзя найти точное\n"
-"совпадение.\n"
+"���������� ��� PO-����� � ����� Uniforum � ����.  ���� def.po -- ���\n"
+"������������ ��-���� �� ����������, ������� ����� ���������� � �����\n"
+"����, ���� ��� ��� �����.  ����������� �����������, �����\n"
+"������������, ����������� �� ��������� ������ ��������� ��� ����������\n"
+"��� ����� � ����� ������.  ���� ref.pot -- ����� ���� �� �������\n"
+"�������� �� �������� ������, �� ����������� ����������, ���� ���\n"
+"PO-����-������ (������ ������������ ���������� xgettext).  � ����\n"
+"����� ������������ ��� �����������, ����� ������������ � ����� ���\n"
+"���������� ��� ����� � ����� ������.  ��� ��������� ����������\n"
+"������������ ��������������� ���������, ���� ������ ����� ������\n"
+"����������.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
-"  def.po                      переводы, ссылающиеся на старые исходники\n"
+"  def.po                      ��������, ����������� �� ������ ���������\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     ссылки на новые исходники\n"
+msgstr "  ref.pot                     ������ �� ����� ���������\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=ФАЙЛ       дополнительная библиотека переводов "
-"сообщений, \n"
-"                              можно указывать несколько раз\n"
+"  -C, --compendium=����       �������������� ���������� ��������� "
+"���������, \n"
+"                              ����� ��������� ��������� ���\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                обновить def.po,\n"
-"                              ничего не делать, если def.po уже обновлен\n"
+"  -U, --update                �������� def.po,\n"
+"                              ������ �� ������, ���� def.po ��� ��������\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Нахождение выходного файла в режиме обновления:\n"
+msgstr "���������� ��������� ����� � ������ ����������:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "Результат записывается обратно в def.po.\n"
+msgstr "��������� ������������ ������� � def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=МЕТОД          сделать резервную копию def.po\n"
+msgstr "      --backup=�����          ������� ��������� ����� def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
-"      --suffix=СУФФИКС        перекрыть обычный суффикс резервной копии\n"
+"      --suffix=�������        ��������� ������� ������� ��������� �����\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2935,78 +2738,77 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Метод управления версиями можно выбрать с помощью параметра --backup или\n"
-"через переменную среды VERSION_CONTROL. Вот допустимые значения:\n"
-"  none, off       не делать резервных копий (даже если задан параметр --"
-"backup)\n"
-"  numbered, t     делать нумерованные резервные копии\n"
-"  existing, nil   нумерованные, если такие уже есть, и простые, если нет\n"
-"  simple, never   всегда делать простые резервные копии\n"
+"����� ���������� �������� ����� ������� � ������� ����� --backup ���\n"
+"����� ���������� ����� VERSION_CONTROL.  ��� ���������� ��������:\n"
+"  none, off       �� ������ ��������� ����� (���� ���� ����� ���� --backup)\n"
+"  numbered, t     ������ ������������ ��������� �����\n"
+"  existing, nil   ������������, ���� ����� ��� ����, � �������, ���� ���\n"
+"  simple, never   ������ ������ ������� ��������� �����\n"
 "\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"В качестве суффикса резервных копий используется «~», если не\n"
-"установлен иной с помощью параметра --suffix или переменной окружения\n"
+"� �������� �������� ��������� ����� ������������ `~', ���� ��\n"
+"���������� ���� � ������� ����� --suffix ��� ���������� �����\n"
 "SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              сохранить предыдущие msgid переведённых\n"
-"                              сообщений\n"
+"      --previous              ��������� ���������� msgid ������������ "
+"���������\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       не выводить индикатор хода выполнения\n"
+msgstr "  -q, --quiet, --silent       �� �������� ��������� ���������\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
-msgstr "данное сообщение должно определять формы во множественном числе"
+msgstr "������ ��������� ������ ���������� ����� �� ������������� �����"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
-msgstr "данное сообщение не должно определять формы во множественном числе"
+msgstr "������ ��������� �� ������ ���������� ����� �� ������������� �����"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sПрочитано сообщений: старых %ld + новых %ld; объединено %ld, помечено "
-"неточными %ld, недостающих %ld, недействительных %ld.\n"
+"%s��������� ���������: ������ %ld + ����� %ld; ���������� %ld, �������� "
+"��������� %ld, ����������� %ld, ���������������� %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
-msgstr " завершено.\n"
+msgstr " ���������.\n"
 
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s и явно заданное имя файла взаимно исключают друг друга"
+msgstr "%s � ���� �������� ��� ����� ������� ��������� ���� �����"
 
 #: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Использование: %s [ПАРАМЕТР] [ФАЙЛ]…\n"
+msgstr "�������������: %s [����] [����]...\n"
 
 #: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Преобразует двоичный каталог сообщений в .po-файл в стиле Uniforum.\n"
+msgstr "����������� �������� ������� ��������� � .po-���� � ����� Uniforum.\n"
 
 #: src/msgunfmt.c:440
 #, c-format
@@ -3014,13 +2816,13 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  режим Java: на входе Java-класс "
+"  -j, --java                  ����� Java: �� ����� Java-����� "
 "ResourceBundle\n"
 
 #: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                режим C#: на входе .dll-файл .NET\n"
+msgstr "      --csharp                ����� C#: �� ����� .dll-���� .NET\n"
 
 #: src/msgunfmt.c:444
 #, c-format
@@ -3028,7 +2830,7 @@
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      режим ресурсов C#: на входе .resources-файл ."
+"      --csharp-resources      ����� �������� C#: �� ����� .resources-���� ."
 "NET\n"
 
 #: src/msgunfmt.c:446
@@ -3036,17 +2838,17 @@
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   режим Tcl: на входе .msg-файл для tcl/msgcat\n"
+"      --tcl                   ����� Tcl: �� ����� .msg-���� ��� tcl/msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  ФАЙЛ ...                    входные .mo-файлы\n"
+msgstr "  ���� ...                    ������� .mo-�����\n"
 
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "Нахождение входного файла в режиме Java:\n"
+msgstr "���������� �������� ����� � ������ Java:\n"
 
 #: src/msgunfmt.c:462
 #, c-format
@@ -3055,13 +2857,13 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Имя класса определяется путем добавления имени локали к имени ресурса после\n"
-"символа подчеркивания. Класс ищется с помощью CLASSPATH.\n"
+"��� ������ ������������ ����� ���������� ����� ������ � ����� ������� �����\n"
+"����� �������������.  ����� ������ � ������� CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Нахождение входного файла в режиме C#:\n"
+msgstr "���������� �������� ����� � ������ C#:\n"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3069,13 +2871,13 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Параметры -l и -d обязательны. Входной .dll-файл ищется в подкаталоге\n"
-"указанного каталога, имя этого подкаталога зависит от локали.\n"
+"����� -l � -d �����������.  ������� .dll-���� ������ � �����������\n"
+"���������� ��������, ��� ����� ����������� ������� �� ������.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Нахождение входного файла в режиме Tcl:\n"
+msgstr "���������� �������� ����� � ������ Tcl:\n"
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3083,22 +2885,21 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Параметры -l и -d обязательны. Входной .msg-файл ищется в указанном "
-"каталоге.\n"
+"����� -l � -d �����������.  ������� .msg-���� ������ � ��������� ��������.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                использовать на выводе отступы\n"
+msgstr "  -i, --indent                ������������ �� ������ �������\n"
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
-"      --strict                выводить в строгом соответствии стандарту "
+"      --strict                �������� � ������� ������������ ��������� "
 "Uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3110,35 +2911,35 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"Убирает дублированные переводы из каталога сообщений.\n"
-"Находит дублированные переводы с одинаковым ID сообщения.  Подобные\n"
-"дубликаты являются недопустимым вводом для других программ, таких как\n"
-"msgfmt, msgmerge или msgcat.  По умолчанию дубликаты сливаются.  При\n"
-"использовании параметра --repeated, выводятся только дублированные\n"
-"сообщения, а все остальные отбрасываются.  Комментарии и извлеченные\n"
-"комментарии сливаются, если только не задан параметр --use-first, в этом\n"
-"случае они берутся из первого перевода.  Позиции в файлах сливаются.\n"
-"При использовании параметра --unique, отбрасываются дублированные\n"
-"сообщения.\n"
+"������� ������������� �������� �� �������� ���������.\n"
+"������� ������������� �������� � ���������� ID ���������.  ��������\n"
+"��������� �������� ������������ ������ ��� ������ ��������, ����� ���\n"
+"msgfmt, msgmerge ��� msgcat.  �� ��������� ��������� ���������.  ���\n"
+"������������� ����� --repeated, ��������� ������ �������������\n"
+"���������, � ��� ��������� �������������.  ����������� � �����������\n"
+"����������� ���������, ���� ������ �� ����� ���� --use-first, � ����\n"
+"������ ��� ������� �� ������� ��������.  ������� � ������ ���������.\n"
+"��� ������������� ����� --unique, ������������� �������������\n"
+"���������.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              печатать только дубликаты\n"
+msgstr "  -d, --repeated              �������� ������ ���������\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                печатать только уникальные, пропуская "
-"дубликаты\n"
+"  -u, --unique                �������� ������ ����������, ��������� "
+"���������\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
-msgstr "<стандартный ввод>"
+msgstr "<����������� ����>"
 
 #: src/po-charset.c:489
 #, c-format
@@ -3146,193 +2947,193 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Имя «%s» не является переносимым названием кодировки.\n"
-"Преобразование сообщений к кодировке пользователя может не сработать.\n"
+"\"%s\" �� �������� ����������� ��������� ���������.\n"
+"�������������� ��������� � ��������� ������������ ����� �� ���������.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Кодировка «%s» не поддерживается. %s полагается на iconv(), но iconv() не "
-"поддерживает «%s».\n"
+"�������� \"%s\" �� ��������������.  %s ���������� �� iconv(), �� iconv() �� "
+"������������ \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Чтобы решить эту проблему, установите GNU libiconv и переустановите GNU "
+"����� ������ ��� ��������, ���������� GNU libiconv � �������������� GNU "
 "gettext.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Выполнение продолжается, будут ошибки разбора."
+msgstr "���������� ������������, ����� ������ �������."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
-msgstr "Выполнение продолжается."
+msgstr "���������� ������������."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Кодировка «%s» не поддерживается. %s полагается на iconv().\n"
-"Эта версия собрана без iconv().\n"
+"�������� \"%s\" �� ��������������.  %s ���������� �� iconv().\n"
+"��� ������ ������� ��� iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"В заголовке не указана кодировка.\n"
-"Преобразование сообщений к кодировке пользователя не сработает.\n"
+"� ��������� �� ������� ���������.\n"
+"�������������� ��������� � ��������� ������������ �� ���������.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
-msgstr "непоследовательное применение #~"
+msgstr "������������������ ���������� #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "пропущена секция «msgstr[]»"
+msgid "missing `msgstr[]' section"
+msgstr "��������� ������ `msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "пропущена секция «msgid_plural»"
+msgid "missing `msgid_plural' section"
+msgstr "��������� ������ `msgid_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "пропущена секция «msgstr»"
+msgid "missing `msgstr' section"
+msgstr "��������� ������ `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "первая форма множественного числа имеет ненулевой индекс"
+msgstr "������ ����� �������������� ����� ����� ��������� ������"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "форма множественного числа имеет неправильный индекс"
+msgstr "����� �������������� ����� ����� ������������ ������"
 
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
-msgstr "слишком много ошибок, завершение"
+msgstr "������� ����� ������, ����������"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "неверная многобайтовая последовательность"
+msgstr "�������� ������������� ������������������"
 
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "неполная многобайтовая последовательность в конце файла"
+msgstr "�������� ������������� ������������������ � ����� �����"
 
 #: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "неполная многобайтовая последовательность в конце строки"
+msgstr "�������� ������������� ������������������ � ����� ������"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "вызов iconv завершился неуспехом"
+msgstr "����� iconv ���������� ���������"
 
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "неизвестное ключевое слово «%s»"
+msgstr "����������� �������� ����� \"%s\""
 
 #: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
-msgstr "неверная управляющая последовательность"
+msgstr "�������� ����������� ������������������"
 
 #: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
-msgstr "символ конца файла встречен внутри строки"
+msgstr "������ ����� ����� �������� ������ ������"
 
 #: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr "символ конца строки встречен внутри строки"
+msgstr "������ ����� ������ �������� ������ ������"
 
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "разделитель контекста <EOT> внутри строки"
+msgstr "����������� ��������� <EOT> ������ ������"
 
-# это сообщение пока не используется
-#: src/read-catalog.c:318 src/xgettext.c:1046
+# ��� ��������� ���� �� ������������
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "этот файл не может содержать директивы домена"
+msgstr "���� ���� �� ����� ��������� ��������� ������"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "повторное определение сообщения"
+msgstr "��������� ����������� ���������"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
-msgstr "место появления первого определения"
+msgstr "����� ��������� ������� �����������"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "файл «%s» усечён"
+msgstr "���� \"%s\" ������"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "файл «%s» содержит строку, не завершённую нулем"
+msgstr "���� \"%s\" �������� ������, �� ����������� �����"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "файл «%s» не в соответствует формату GNU .mo"
+msgstr "���� \"%s\" �� � ������������� ������� GNU .mo"
 
 #: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "файл «%s» содержит строку, не завершённую нулем, в позиции %s"
+msgstr "���� \"%s\" �������� ������, �� ����������� �����, � ������� %s"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "предупреждение: неверный синтаксис \\uxxxx для символа Unicode"
+msgstr "��������������: �������� ��������� \\uxxxx ��� ����� Unicode"
 
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
-msgstr "предупреждение: незавершенная строка"
+msgstr "��������������: ������������� ������"
 
 #: src/read-stringtable.c:810
 msgid "warning: syntax error"
-msgstr "предупреждение: синтаксическая ошибка"
+msgstr "��������������: �������������� ������"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
-msgstr "предупреждение: незавершенная пара ключ/значение"
+msgstr "��������������: ������������� ���� ����/��������"
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "предупреждение: синтаксическая ошибка, после строки ожидается «;»"
+msgstr "��������������: �������������� ������, ����� ������ ��������� ';'"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
-"предупреждение: синтаксическая ошибка, после строки ожидается «=» или «;»"
+"��������������: �������������� ������, ����� ������ ��������� '=' ��� ';'"
 
 #: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Авторы программы — %s и %s.\n"
+msgstr "������ ��������� -- %s � %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3340,12 +3141,12 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Данило Шеган"
+msgstr "������ �����"
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Перекодирует сербский текст из кириллицы в латиницу.\n"
+msgstr "������������ �������� ����� �� ��������� � ��������.\n"
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3353,28 +3154,28 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"Входной текст читается со стандартного ввода.  Преобразованный текст\n"
-"печатается на стандартный вывод.\n"
+"������� ����� �������� �� ������������ �����.  ��������������� �����\n"
+"���������� �� ����������� �����.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "неверный вход для кодировки «%s»"
+msgstr "�������� ���� ��� ��������� \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "ошибка при преобразовании из кодировки «%s» в кодировку «%s»"
+msgstr "������ ��� �������������� �� ��������� \"%s\" � ��������� \"%s\""
 
 #: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
-msgstr "ожидается два аргумента"
+msgstr "��������� ��� ���������"
 
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Использование: %s [ПАРАМЕТР] URL ФАЙЛ\n"
+msgstr "�������������: %s [����] URL ����\n"
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3382,62 +3183,52 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
-"Получает и выводит содержимое заданного URL.  Если к URL невозможно\n"
-"получить доступ, вместо него используется указанный локальный ФАЙЛ.\n"
-
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "ошибка чтения «%s»"
+"�������� � ������� ���������� ��������� URL.  ���� � URL ����������\n"
+"�������� ������, ������ ���� ������������ ��������� ��������� ����.\n"
 
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
-msgstr "ошибка записи на стандартный вывод"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "ошибка после чтения «%s»"
+msgstr "������ ������ �� ����������� �����"
 
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Получение %s…"
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " время ожидания истекло.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " завершилась с ошибкой.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"Невозможно вывести несколько доменов перевода в единый файл указанного "
-"формата.  Попробуйте применить синтаксис PO-файлов."
+"���������� ������� ��������� ������� �������� � ������ ���� ���������� "
+"�������.  ���������� ��������� ��������� PO-������."
 
 #: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"Невозможно вывести несколько доменов перевода в единый файл указанного "
-"формата."
+"���������� ������� ��������� ������� �������� � ������ ���� ���������� "
+"�������."
 
 #: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"каталог сообщений содержит переводы с контекстом, но выходной формат их не "
-"поддерживает."
+"������� ��������� �������� �������� � ����������, �� �������� ������ �� �� "
+"������������."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3445,79 +3236,74 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"каталог сообщений содержит переводы во множественном числе, но выходной "
-"формат не поддерживает их.  Попробуйте сгенерировать Java-класс с помощью "
-"«msgfmt --java», а не файл properties."
+"������� ��������� �������� �������� �� ������������� �����, �� �������� "
+"������ �� ������������ ��.  ���������� ������������� Java-����� � ������� "
+"\"msgfmt --java\", � �� ���� properties."
 
 #: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"каталог сообщений содержит переводы во множественном числе, но выходной "
-"формат их не поддерживает."
+"������� ��������� �������� �������� �� ������������� �����, �� �������� "
+"������ �� �� ������������."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "невозможно создать файл вывода «%s»"
+msgstr "���������� ������� ���� ������ \"%s\""
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
-msgstr "стандартный вывод"
+msgstr "����������� �����"
 
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "не удалось создать каталог «%s»"
+msgstr "�� ������� ������� ������� \"%s\""
 
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "компиляция C#-класса завершилась неуспехом, попробуйте --verbose"
+msgstr "���������� C#-������ ����������� ���������, ���������� --verbose"
 
 #: src/write-csharp.c:768
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "компиляция класса C# завершилась с ошибкой"
+msgstr "���������� C#-������ ����������� ���������, ���������� --verbose"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "%s не является верным именем класса Java"
+msgstr "%s �� �������� ������ ������ ������ Java"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
-"компиляция класса Java завершилась с ошибкой, попробуйте --verbose или "
-"установите $JAVAC"
+"���������� Java-������ ����������� ���������, ���������� --verbose ��� "
+"���������� $JAVAC"
 
-#: src/write-java.c:1213
-#, c-format
+#: src/write-java.c:1168
+#, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
-"компиляция класса Java завершилась с ошибкой, попробуйте установить $JAVAC"
+"���������� Java-������ ����������� ���������, ���������� --verbose ��� "
+"���������� $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "ошибка открытия «%s» для записи"
+msgstr "������ �������� ����� \"%s\" ��� ������"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "неверная многобайтовая последовательность"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"переводимые сообщения не должны содержать экранирующую последовательность «\\"
-"%c»"
+"����������� ��������� �� ������ ��������� escape-������������������ `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3525,12 +3311,12 @@
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"Следующий msgctxt содержит не ASCII символы.\n"
-"Это вызовет проблемы у переводчиков, которые не используют ту же\n"
-"кодировку, что и вы. Подумайте об использовании в msgctxt только ASCII.\n"
+"��������� msgctxt �������� ��-ASCII-�����.\n"
+"��� ������� �������� � ������������, ������� �� ���������� �� ��\n"
+"���������, ��� � ��.  ��������� �� ������������� � msgctxt ������ ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3538,9 +3324,9 @@
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"Следующий msgid содержит не ASCII символы.\n"
-"Это вызовет проблемы у переводчиков, которые не используют ту же\n"
-"кодировку, что и вы. Подумайте об использовании в msgid только ASCII.\n"
+"��������� msgid �������� ��-ASCII-�����.\n"
+"��� ������� �������� � ������������, ������� �� ���������� �� ��\n"
+"���������, ��� � ��.  ��������� �� ������������� � msgid ������ ASCII.\n"
 "%s\n"
 
 #: src/write-qt.c:667
@@ -3548,9 +3334,9 @@
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"каталог сообщений содержит переводы во множественном числе, но формат\n"
-"каталогов сообщений Qt не поддерживает обработку множественного\n"
-"числа\n"
+"������� ��������� �������� �������� �� ������������� �����, �� ������\n"
+"��������� ��������� Qt �� ������������ ��������� ��������������\n"
+"�����\n"
 
 #: src/write-qt.c:693
 msgid ""
@@ -3559,9 +3345,9 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"каталог сообщений содержит строки msgctxt с символами не из ISO-8859-1,\n"
-"но формат каталога сообщений Qt поддерживает Unicode только в\n"
-"переведенных строках, но не в контекстах\n"
+"������� ��������� �������� ������ msgctxt �� ������� �� �� ISO-8859-1,\n"
+"�� ������ �������� ��������� Qt ������������ Unicode ������ �\n"
+"������������ �������, �� �� � ����������\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3569,76 +3355,74 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"каталог сообщений содержит строки msgid с символами не из ISO-8859-1,\n"
-"но формат каталога сообщений Qt поддерживает Unicode только в\n"
-"переведенных строках, но не в оригиналах\n"
+"������� ��������� �������� ������ msgid �� ������� �� �� ISO-8859-1,\n"
+"�� ������ �������� ��������� Qt ������������ Unicode ������ �\n"
+"������������ �������, �� �� � ����������\n"
 
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "ошибка при записи в дочерний процесс %s"
+msgstr "������ ��� ������ ��������� �������� \"%s\""
 
 #: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"каталог сообщений содержит переводы с контекстом, но формат\n"
-".resources C# не поддерживает контексты\n"
+"������� ��������� �������� �������� � ����������, �� ������\n"
+".resources C# �� ������������ ���������\n"
 
 #: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"каталог сообщений содержит переводы во множественном числе, но формат\n"
-".resources C# не поддерживает обработку множественного числа\n"
+"������� ��������� �������� �������� �� ������������� �����, �� ������\n"
+".resources C# �� ������������ ��������� �������������� �����\n"
 
 #: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"каталог сообщений содержит переводы с контекстом, но формат\n"
-"каталогов сообщений для Tcl не поддерживает контексты\n"
+"������� ��������� �������� �������� � ����������, �� ������\n"
+"��������� ��������� ��� Tcl �� ������������ ���������\n"
 
 #: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"каталог сообщений содержит переводы во множественном числе, но формат\n"
-"каталогов сообщений для Tcl не поддерживает обработку множественного\n"
-"числа\n"
+"������� ��������� �������� �������� �� ������������� �����, �� ������\n"
+"��������� ��������� ��� Tcl �� ������������ ��������� ��������������\n"
+"�����\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: предупреждение: незавершенная строка"
+msgstr "%s:%d: ��������������: ������������� ������"
 
 #: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: предупреждение: незавершенное регулярное выражение"
+msgstr "%s:%d: ��������������: ������������� ���������� ���������"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "предупреждение: неверный символ Unicode"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: предупреждение: незавершенная символьная константа"
+msgstr "%s:%d: ��������������: ������������� ���������� ���������"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: предупреждение: незавершенная строка"
+msgstr "%s:%d: ��������������: ������������� ������"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Укажите входную кодировку с помощью параметра --from-code."
+msgstr ""
+"��-ASCII-������ � %s%s.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3646,8 +3430,8 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code.\n"
+"%s:%d: �������� ������������� ������������������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
 #: src/x-csharp.c:285
 #, c-format
@@ -3655,8 +3439,8 @@
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Длинная неполная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code.\n"
+"%s:%d: ������� �������� ������������� ������������������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
 #: src/x-csharp.c:297
 #, c-format
@@ -3664,8 +3448,8 @@
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
-"Укажите входную кодировку с помощью параметра --from-code.\n"
+"%s:%d: �������� ������������� ������������������ � ����� �����.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
 #: src/x-csharp.c:306
 #, c-format
@@ -3673,13 +3457,13 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
-"Укажите входную кодировку с помощью параметра --from-code.\n"
+"%s:%d: �������� ������������� ������������������ � ����� ������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: вызов iconv завершился с ошибкой"
+msgstr "%s:%d: ����� iconv ���������� ���������"
 
 #: src/x-csharp.c:338
 #, c-format
@@ -3687,239 +3471,174 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code.\n"
+"%s:%d: �������� ������������� ������������������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: предупреждение: неверный символ Unicode"
+msgstr "%s:%d: ��������������: �������� Unicode-����"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: предупреждение: незавершенная строковая константа"
+msgstr "%s:%d: ��������������: ������������� ��������� ���������"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: предупреждение: встречена «)», где ожидается «}»"
+msgstr "%s:%d: ��������������: ��������� ')', ��� ��������� '}'"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: предупреждение: встречена «}», где ожидается «)»"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Отсутствует контекст для строки, извлечённой из элемента «%s»"
+msgstr "%s:%d: ��������������: ��������� '}', ��� ��������� ')'"
 
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Корневой элемент <%s> недопустим в корректном файле Glade"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 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"
+"���� \"glade\" �� ��������������.  %s ���������� �� expat.\n"
+"��� ������ ������� ��� expat.\n"
 
 #: src/x-java.c:494
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: предупреждение: одиночный заменитель U+%04X"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Укажите входную кодировку с помощью параметра --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Длинная неполная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
-"Укажите входную кодировку с помощью параметра --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
-"Укажите входную кодировку с помощью параметра --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: предупреждение: литерал RegExp завершился слишком рано"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: предупреждение: %s не допускается"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: предупреждение: незавершенная разметка XML"
+msgstr "%s:%d: ��������������: ������������� ������"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: не удалось найти ограничитель строки «%s» вплоть до конца файла"
+msgstr ""
+"%s:%d: �� ������� ����� ������������ ������ \"%s\" ������ �� ����� �����"
 
 #: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: пропущена закрывающая фигурная скобка в \\x{HEXNUMBER}"
+msgstr "%s:%d: ��������� ����������� �������� ������ � \\x{HEXNUMBER}"
 
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: неверная интерполяция («\\l») восьмибитного символа «%c»"
+msgstr "%s:%d: �������� ������������ (\"\\l\") ������������� ����� \"%c\""
 
 #: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: неверная интерполяция («\\u») восьмибитного символа «%c»"
+msgstr "%s:%d: �������� ������������ (\"\\u\") ������������� ����� \"%c\""
 
 #: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: неверная интерполяция переменной в «%c»"
+msgstr "%s:%d: �������� ������������ ���������� � \"%c\""
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: неверная интерполяция («\\L») восьмибитного символа «%c»"
+msgstr "%s:%d: �������� ������������ (\"\\L\") ������������� ����� \"%c\""
 
 #: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: неверная интерполяция («\\U») восьмибитного символа «%c»"
+msgstr "%s:%d: �������� ������������ (\"\\U\") ������������� ����� \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
-"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
-"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
+"��-ASCII-������ � %s%s.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code ��� � "
+"�������\n"
+"����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
-"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: �������� ������������� ������������������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code ��� � "
+"�������\n"
+"����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Длинная неполная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
-"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: ������� �������� ������������� ������������������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code ��� � "
+"�������\n"
+"����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
-"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
-"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: �������� ������������� ������������������ � ����� �����.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code ��� � "
+"�������\n"
+"����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
-"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
-"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: �������� ������������� ������������������ � ����� ������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code ��� � "
+"�������\n"
+"����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
-"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
-"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: �������� ������������� ������������������.\n"
+"����������, ������� ������� ��������� � ������� ����� --from-code ��� � "
+"�������\n"
+"����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Кодировка «%s» неизвестна. Вместо неё используем ASCII."
+msgstr "��������� \"%s\" ����������.  ����������� ������ � ASCII."
 
 #: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: неверное определение строки"
+msgstr "%s:%d: �������� ����������� ������"
 
 #: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
-msgstr "%s:%d: пропущено число после #"
+msgstr "%s:%d: ��������� ����� ����� #"
 
 #: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: неверное строковое выражение"
+msgstr "%s:%d: �������� ��������� ���������"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3927,68 +3646,56 @@
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
-"%s:%lu: предупреждение: синтаксис $\"...\" запрещен по соображениям "
-"безопасности; используйте eval_gettext"
-
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-"%s:%d: предупреждение: литерал регулярного выражения завершился слишком рано"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "«%s» не является корректным именем кодировки. Используется ASCII.\n"
+"%s:%lu: ��������������: ��������� $\"...\" �������� �� ������������ "
+"������������; ����������� eval_gettext"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
-"параметр --join-existing не может быть использован при записи в стандартный "
-"вывод"
+"���� --join-existing �� ����� ���� ����������� ��� ������ � ����������� �����"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext не может работать, не зная искомых ключевых слов"
+msgstr "xgettext �� ����� ��������, �� ���� ������� �������� ����"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
-"предупреждение: файл «%s» имеет неизвестное расширение «%s»; трактуется как C"
+"��������������: ���� `%s' ����� ����������� ���������� `%s'; ���������� ��� C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "Извлекает переводимые строки из указанных входных файлов.\n"
+msgstr "��������� ����������� ������ �� ��������� ������� ������.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, 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"
+"  -d, --default-domain=���    �������� � ���� ���.po (������ messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=ФАЙЛ           записать вывод в указанный файл\n"
+msgstr "  -o, --output=����           �������� ����� � ��������� ����\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=КАТ        поместить выходные файлы в каталог КАТ\n"
+msgstr "  -p, --output-dir=���        ��������� �������� ����� � ������� ���\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
-msgstr "Выбор языка входного файла:\n"
+msgstr "����� ����� �������� �����:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3997,54 +3704,54 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=ИМЯ          распознавать указанный язык\n"
-"                              (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                              EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                              GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                              JavaScript, Vala, Desktop)\n"
+"  -L, --language=���          ������������ ��������� ����\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   синоним --language=C++\n"
+msgstr "  -C, --c++                   ������� --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
-msgstr "По умолчанию язык определяется по расширению входного файла.\n"
+msgstr "�� ��������� ���� ������������ �� ���������� �������� �����.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=ИМЯ            кодировка входных файлов\n"
-"                                   (кроме Python, Tcl, Glade)\n"
+"      --from-code=���            ��������� ������� ������\n"
+"                                   (����� Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "По умолчанию считается, что входные файлы содержат только ASCII.\n"
+msgstr "�� ��������� ���������, ��� ������� ����� �������� ������ ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         слить сообщения с существующим файлом\n"
+msgstr "  -j, --join-existing         ����� ��������� � ������������ ������\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=ФАЙЛ.po  не извлекать вхождения из ФАЙЛА.po\n"
+msgstr "  -x, --exclude-file=����.po  �� ��������� ��������� �� �����.po\n"
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4052,230 +3759,220 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cТЕГ, --add-comments[=ТЕГ] записать блоки комментариев, начиная с ТЕГА и\n"
-"                              предшествующих ключевых строк в выходной файл\n"
-"  -c, --add-comments          записать все блоки комментариев, начиная с\n"
-"                              предшествующих ключевых строк в выходной файл\n"
+"  -c, --add-comments[=���]    �������� � �������� ���� ���� ����������� �\n"
+"                              ����� (��� � �������������, ���������������\n"
+"                              �������� ������)\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Параметры для конкретных языков:\n"
+msgstr "����� ��� ���������� ������:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           извлечь все строки\n"
+msgstr "  -a, --extract-all           ������� ��� ������\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (только языки C, C++, ObjectiveC, Shell,\n"
+"                                (������ ����� C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (только языки C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -k, --keyword[=�����]       �������������� �������� ����� ��� ������ (���\n"
+"                              ������� ����� ����������, ��� �� ����� \n"
+"                              ������������ �������� ����� �� ���������)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=СЛОВО:АРГ:ФЛАГ   дополнительный флаг для строк внутри "
-"аргумента\n"
-"                              номер АРГ ключевого слова СЛОВО\n"
+"      --flag=�����:���:����   �������������� ���� ��� ����� ������ "
+"���������\n"
+"                              ����� ��� ��������� ����� �����\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (только языки C, C++, ObjectiveC, Shell,\n"
+"                                (������ ����� C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             понимать на входе триграфы ANSI C\n"
+msgstr "  -T, --trigraphs             �������� �� ����� �������� ANSI C\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (только языки C, C++, ObjectiveC)\n"
+msgstr "                                (������ ����� C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    распознавать форматные строки Qt\n"
+msgstr "      --qt                    ������������ ��������� ������ Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (только язык C++)\n"
+msgstr "                                (������ ���� C++)\n"
 
-#: src/xgettext.c:958
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   распознавать форматные строки KDE 4\n"
+msgstr "      --qt                    ������������ ��������� ������ Qt\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 распознавать форматные строки Boost\n"
+msgstr "      --boost                 ������������ ��������� ������ Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 более подробный результат разбора форматной "
-"строки\n"
+"      --debug                 ����� ��������� ��������� ������� ��������� "
+"������\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     записать .properties-файл Java\n"
+msgstr "      --properties-output     �������� .properties-���� Java\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
-"      --copyright-holder=СТРОКА\n"
-"                      задает наименование обладателя авторских прав\n"
+"      --copyright-holder=������\n"
+"                      ������ ������������ ���������� ��������� ����\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          не выводить уведомление об авторских правах "
+"      --foreign-user          �� �������� ����������� �� ��������� ������ "
 "FSF\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=ПАКЕТ    задать имя пакета для вывода\n"
+msgstr ""
 
-#: src/xgettext.c:1012
-#, c-format
+#: src/xgettext.c:969
+#, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
-"      --package-version=ВЕРСИЯ\n"
-"                              задать версию пакета для вывода\n"
+"      --copyright-holder=������\n"
+"                      ������ ������������ ���������� ��������� ����\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=АДРЕС@ЭЛЕКТРОННОЙ.ПОЧТЫ\n"
-"                      задает адрес, куда следует отправлять отчет об "
-"ошибках\n"
+"      --msgid-bugs-address=�����@�����������.�����\n"
+"                      ������ �����, ���� ������� ���������� ����� �� "
+"�������\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[СТРОКА], --msgstr-prefix[=СТРОКА]\n"
-"                              использовать СТРОКУ или «» как префикс\n"
-"                              к значениям msgstr\n"
+"  -m, --msgstr-prefix[=������]\n"
+"                      ������������ ������ ��� \"\" ��� ������� � ���������� "
+"msgstr\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[СТРОКА], --msgstr-suffix[=СТРОКА]\n"
-"                              использовать СТРОКУ или «» как суффикс\n"
-"                              к значениям msgstr\n"
+"  -M, --msgstr-suffix[=������]\n"
+"                      ������������ ������ ��� \"\" ��� ������� � ���������� "
+"msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Аргумент --flag не соответствует синтаксису <ключевое-слово>:<номер-арг>:"
-"[pass-]<флаг>: %s"
+"�������� --flag �� ������������� ���������� <��������-�����>:<�����-���>:"
+"[pass-]<����>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
-msgstr "стандартный ввод"
+msgstr "����������� ����"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Не ASCII-символ у %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Не ASCII-комментарий у или перед %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Не ASCII-строка у %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
-msgstr "%s%s: предупреждение: "
+msgstr "%s%s: ��������������: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
-"Несмотря на использование в месте, где предполагается форматная строка, %s "
-"не является верной форматной строкой %s. Причина: %s\n"
+"�������� �� ������������� � �����, ��� �������������� ��������� ������, %s "
+"�� �������� ������ ��������� ������� %s.  �������: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
-"Строка %s не является верной форматной строкой %s, хотя и объявлена как "
-"таковая. Причина: %s\n"
+"������ %s �� �������� ������ ��������� ������� %s, ���� � ��������� ��� "
+"�������.  �������: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4283,73 +3980,93 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"Форматная строка «%s» с безымянными аргументами не может быть\n"
-"правильно локализована: переводчик не может поменять местами\n"
-"аргументы.\n"
-"Используйте форматную строку с именованными аргументами и\n"
-"отображение вместо кортежа для аргументов.\n"
+"��������� ������ '%s' � ����������� ����������� �� ����� ����\n"
+"��������� ������������: ���������� �� ����� �������� �������\n"
+"���������.\n"
+"����������, ����������� ��������� ������ � ������������ ����������� �\n"
+"����������� ������ ������� ��� ����������.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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 ""
-"Пустой msgid. Он зарезервирован для GNU gettext:\n"
-"gettext(\"\") возвращает текст заголовка с метаинформацией,\n"
-"а не пустую строку.\n"
+"������ msgid.  �� �������������� ��� GNU gettext:\n"
+"gettext(\"\") ���������� ����� ��������� � ���������������,\n"
+"� �� ������ ������.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "неоднозначная спецификация аргумента для ключевого слова «%.*s»"
+msgstr "������������� ������������ ��������� ��� ��������� ����� '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "предупреждение: не указан контекст для ключевого слова «%.*s»"
+msgstr "��������������: �� ������ �������� ��� ��������� ����� '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
-"предупреждение: не указан контекст для аргумента во множественном числе у "
-"ключевого слова «%.*s»"
+"��������������: �� ������ �������� ��� ��������� �� ������������� ����� � "
+"��������� ����� '%.*s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "не совпадают контексты у форм в единственном и множественном числе"
+msgstr "�� ��������� ��������� � ���� � ������������ � ������������� �����"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"Не задан параметр --msgid-bugs-address. Если вы используете файл\n"
-"«Makevars», установите в нём переменную MSGID_BUGS_ADDRESS, в\n"
-"противном случае задайте в командной строке параметр --msgid-bugs-address.\n"
+"�� ����� ���� --msgid-bugs-address.  ���� �� ����������� ����\n"
+"`Makevars', ���������� � ��� ���������� MSGID_BUGS_ADDRESS, �\n"
+"��������� ������ ������� � ��������� ������ ���� --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "язык «%s» неизвестен"
+msgid "language `%s' unknown"
+msgstr "���� `%s' ����������"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
-msgstr "<без имени>"
+msgstr "<��� �����>"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: недопустимый ключ -- %c\n"
+#~ msgstr "%s: ������������ ���� -- %c\n"
 
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr ""
-#~ "операция DuplicateHandle завершилась неуспехом с выходным кодом 0x%08x"
+#~ "�������� DuplicateHandle ����������� ��������� � �������� ����� 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "��� �� �����������."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr ""
+#~ "���������� ������������ ������������� ����/����� ��� ��������� �������� %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "������� ����� � �������� ��������� %s ���������"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "������ �� ��������� �������� %s ���������"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "�������� ������� %s ���������� � �������� ����� %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr ""
+#~ "���� ��������� `%s' ��� ��� ����� �������������� ��������� ��������\n"
 
 #~ msgid "Multiple references to %%%c."
-#~ msgstr "Множественные ссылки на %%%c."
+#~ msgstr "������������� ������ �� %%%c."
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -4359,31 +4076,21 @@
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Это свободная программа; подробности об условиях распространения "
-#~ "смотрите\n"
-#~ "в исходном тексте.  Мы НЕ предоставляем гарантий; даже гарантий\n"
-#~ "КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ.\n"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "Еще не реализовано."
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "поле заголовка `%s' должно начинаться с новой строки\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr ""
-#~ "поле заголовка `%s' все еще имеет первоначальное шаблонное значение\n"
+#~ "��� ��������� ���������; ����������� �� �������� ��������������� "
+#~ "��������\n"
+#~ "� �������� ������.  �� �� ������������� ��������; ���� ��������\n"
+#~ "������������ �������� ��� ����������� ��� ���������� ����.\n"
 
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the C# .dll format doesn't support contexts\n"
 #~ msgstr ""
-#~ "каталог сообщений содержит переводы с контекстом, но формат\n"
-#~ ".dll C# не поддерживает контексты\n"
+#~ "������� ��������� �������� �������� � ����������, �� ������\n"
+#~ ".dll C# �� ������������ ���������\n"
 
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the Java ResourceBundle format doesn't support contexts\n"
 #~ msgstr ""
-#~ "каталог сообщений содержит переводы с контекстом, но формат\n"
-#~ "Java ResourceBundle не поддерживает контексты\n"
+#~ "������� ��������� �������� �������� � ����������, �� ������\n"
+#~ "Java ResourceBundle �� ������������ ���������\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/sk.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/sk.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/sk.po gettext-0.18.1.1/gettext-tools/po/sk.po
--- gettext-0.19.3/gettext-tools/po/sk.po	2014-10-16 06:04:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/sk.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,15 +1,15 @@
 # Slovak translations for GNU gettext-tools package.
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010 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.
+# Marcel Telka <marcel@telka.sk>, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-10 17:44+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-10 12:48+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
@@ -29,25 +29,26 @@
 msgstr "nejednoznačný parameter %s pre %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Platné parametre sú:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nemožno nájsť dočasný adresár, skúste nastaviť $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "nemožno vytvoriť dočasný adresár so šablónou \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nemožno odstrániť dočasný súbor %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "nemožno odstrániť dočasný adresár %s"
@@ -56,38 +57,37 @@
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "zachovanie oprávnení pre %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "chyba pri otváraní %s na čítanie"
+msgid "error while opening \"%s\" for reading"
+msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "nemožno otvoriť záložný súbor %s na zápis"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "nemožno otvoriť záložný súbor \"%s\" na zápis"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "chyba pri čítaní %s"
+msgid "error reading \"%s\""
+msgstr "chyba pri čítaní \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "chyba pri zápise %s"
+msgid "error writing \"%s\""
+msgstr "chyba pri zápise \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "chyba po čítaní %s"
+msgid "error after reading \"%s\""
+msgstr "chyba po čítaní \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,98 +104,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuálny stroj C# nebol nájdený. Skúste nainštalovať pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces zlyhal"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: voľba '%s' nie je jednoznačná; možnosti:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: voľba '%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: voľba '--%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba '%c%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: voľba '--%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznáma voľba '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznáma voľba '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje parameter -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: voľba '-W %s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "neplatný parameter source_version pre compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba počas zápisu do súboru \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -208,96 +208,58 @@
 "Virtuálny stroj Javy nebol nájdený. Skúste nainštalovať gij alebo nastavte "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/V chyba podprocesu %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pamäť je vyčerpaná"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "čítanie z podprocesu %s zlyhalo"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "komunikácia s podprocesom %s zlyhala"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "podproces %s skončil s ukončovacím kódom %d"
+msgid "cannot create pipe"
+msgstr "nemožno vytvoriť rúru"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "“"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "nemožno vytvoriť rúru"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "zlyhalo _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nemožno obnoviť fd %d: zlyhalo dup2"
@@ -313,21 +275,14 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s podproces dostal kritický signál %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' nie je platný formátovací reťazec %s, na rozdiel od '%s'. Dôvod: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -336,19 +291,17 @@
 msgstr "formátovacia značka pre parameter %u v '%s' nie je v '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "formátovacie značky v '%s' a '%s' pre parameter %u nie sú rovnaké"
@@ -358,7 +311,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktíva číslo %u začína znakom |, ale nekončí znakom |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -367,20 +320,18 @@
 "V direktíve číslo %u, token za '<' nie je názov makra špecifikujúceho "
 "formát. Platné názvy makier sú uvedené v ISO C 99 kapitola 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "V direktíve číslo %u, token za '<' nie je nasledovaný znakom '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Reťazec sa odkazuje na parameter číslo %u, ale ignoruje parameter číslo %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -467,16 +418,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s' nepoužíva %%m, ale '%s' používa %%m"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' používa %%C, ale '%s' nie"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' nepoužíva %%C, ale '%s' používa %%C"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Reťazec končí v strede direktívy."
@@ -679,9 +620,7 @@
 "V direktíve číslo %u, určenie veľkosti nie je kompatibilné so zadanou "
 "konverziou '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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'"
@@ -728,33 +667,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formátovacie značky v '%s' a '%s' pre parameter '%s' nie sú rovnaké"
 
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -804,11 +716,11 @@
 "1 and 9."
 msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je číslica medzi 1 a 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -821,58 +733,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "príliš veľa parametrov"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Skúste '%s --help' a dozviete sa viac informácií.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Použitie: %s [VOĽBA]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Zobraziť hostiteľské meno stroja.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Výstupný formát:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 krátke meno hostiteľa\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -883,34 +795,34 @@
 "kvalifikovaného\n"
 "                                doménového mena a prezývok\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy pre meno hostiteľa\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatívny výstup:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, 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/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
@@ -919,11 +831,11 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 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 "
@@ -931,33 +843,35 @@
 "Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux."
 "sk>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "Nemôžem získať meno hostiteľa"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "povolený najviac jeden vstupný súbor"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzájom vylučujú"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -966,32 +880,32 @@
 "Filtruje správy z prekladového katalógu podľa ich vlastností a mení tieto\n"
 "vlastnosti.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 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:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Umiestnenie vstupného súboru:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO súbor\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -999,31 +913,31 @@
 "  -D, --directory=ADRESÁR     pridať ADRESÁR do zoznamu pre vyhľadávané\n"
 "                              vstupné súbory\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Umiestnenie výstupného súboru:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1032,12 +946,12 @@
 "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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Výber správy:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1045,7 +959,7 @@
 "      --translated            zachovať preložené, odstrániť nepreložené "
 "správy\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1053,64 +967,54 @@
 "      --untranslated          zachovať nepreložené, odstrániť preložené "
 "správy\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              odstrániť nepresné preklady\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            zachovať nepresné preklady\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           odstrániť zastarané správy označené #~\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zachovať zastarané správy označené #~\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Úprava vlastností:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             nastaviť všetky správy ako nepresné\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           nastaviť všetky správy ako nie nepresné\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          nastaviť všetky správy ako zastarané\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        nastaviť všetky správy ako nie zastarané\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              keď je nastavené 'fuzzy', zachovať "
-"predchádzajúce\n"
-"                              msgid preložených správ.\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1119,37 +1023,27 @@
 "      --clear-previous        odstrániť \"predchádzajúce msgid\" zo všetkých "
 "správ\n"
 
-# c-format
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 pri odstraňovaní nepresných prekladov "
-"nastaviť\n"
-"                              prázdne msgstr\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=SÚBOR.po    spracovať len položky uvedené v SÚBOR.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=SÚBOR.po  spracovať len položky neuvedené v SÚBOR.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 synonymum pre --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1157,24 +1051,24 @@
 "      --obsolete              synonymum pre --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax vstupného súboru:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupný súbor má syntax Java .properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1183,17 +1077,17 @@
 "      --stringtable-input     vstupný súbor má syntax NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti výstupu:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1207,16 +1101,16 @@
 "'never' (nikdy),\n"
 "                              'auto' (automaticky) alebo 'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1224,9 +1118,9 @@
 "  -e, --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1235,29 +1129,29 @@
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1265,8 +1159,8 @@
 "  -n, --add-location          generovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1274,32 +1168,32 @@
 "      --strict                zapísať .po súbor presne dodržiavajúci štýl\n"
 "                              Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ČÍSLO           nastaviť šírku výstupnej strany\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1308,32 +1202,32 @@
 "      --no-wrap               nezalamovať riadky správ dlhšie ako šírka\n"
 "                              výstupnej strany do viacerých riadkov\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1342,38 +1236,38 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Zlúči zadané PO súbory.\n"
 "Nájde správy, ktoré sú spoločné pre dva alebo viac zadaných PO súborov.\n"
 "S použitím voľby --more-than môže byť požadovaná väčšia zhodnosť pred\n"
 "výpisom správ. Naopak, voľba --less-than môže byť použitá na dosiahnutie\n"
 "menšej zhodnosti pred výpisom správ (t.j. pri zadaní --less-than=2,\n"
-"budú vypísané iba jedinečné správy). Preklady, komentáre, extrahované\n"
-"komentáre a pozície v súboroch budú zlúčené; výnimkou je použitie voľby\n"
-"--use-first, ktorá zabezpečí ich zachovanie iba z prvého PO súboru, ktorý\n"
-"ich definuje.\n"
+"budú vypísané iba jedinečné správy). Preklady, komentáre a extrahované\n"
+"komentáre budú zlúčené; výnimkou je použitie voľby --use-first, ktorá\n"
+"zabezpečí ich zachovanie iba z prvého PO súboru, ktorý ich definuje.\n"
+"Pozície v zdrojových súboroch budú zlúčené zo všetkých PO súborov.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  VSTUPNÝSÚBOR ...            vstupné súbory\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1382,7 +1276,7 @@
 "  -<, --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:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1391,7 +1285,7 @@
 "  ->, --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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1400,16 +1294,16 @@
 "  -u, --unique                skratka pre --less-than=2, nastavuje výpis\n"
 "                              len unikátnych správ\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupné súbory májú syntax Java .properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1418,12 +1312,12 @@
 "      --stringtable-input     vstupné súbory majú syntax NeXTstep-GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, 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:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1433,7 +1327,7 @@
 "správu,\n"
 "                              nezlučovať viacero prekladov\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1441,21 +1335,21 @@
 "      --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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "neboli zadané vstupné súbory"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebné sú presne 2 vstupné súbory"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Použitie: %s [VOĽBA] def.po ref.pot\n"
@@ -1487,12 +1381,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odkazy na zdrojové súbory\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikátory operácie:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1500,7 +1394,7 @@
 msgstr ""
 "  -m, --multi-domain          použije ref.pot na všetky domény v def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1527,17 +1421,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "táto správa musí byť skontrolovaná prekladateľom"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "táto správa je použitá, ale nie je definovaná..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale táto definícia je podobná"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "táto správa je použitá, ale nie je definovaná v %s"
@@ -1547,7 +1441,7 @@
 msgid "warning: this message is not used"
 msgstr "upozornenie: táto správa nie je použitá"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1555,12 +1449,12 @@
 msgstr[1] "nájdená %d závažná chyba"
 msgstr[2] "nájdené %d závažné chyby"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musia byť uvedené minimálne dva súbory"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1568,7 +1462,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1580,7 +1474,7 @@
 "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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1589,71 +1483,71 @@
 "  ->, --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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           nezapisovať hlavičku s položkou 'msgid \"\"'\n"
+"      --omit-header           nezapisovať hlavičku s položkou `msgid \"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konvertovať prekladový katalóg do iného kódovania znakov.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cieľ konverzie:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Predvolené kódovanie je kódovanie aktuálneho národného prostredia.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          zachovať riadky '#: meno_súboru:riadok'\n"
+"      --add-location          zachovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                presné dodržiavanie štýlu Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nie sú zadané vstupné súbory"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "potrebné je presne jeden vstupný súbor"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Použitie: %s [VOĽBA] VSTUPNÝSÚBOR\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1666,7 +1560,7 @@
 "programom xgettext). Nepreloženým položkám je priradený preklad\n"
 "zhodný s msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO alebo POT súbor\n"
@@ -1705,7 +1599,7 @@
 "Špeciálny vstavaný príkaz s názvom '0' vypisuje preklad nasledovaný nulovým\n"
 "bajtom. Výstup príkazu \"msgexec 0\" je použiteľný ako vstup pre \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný PO súbor\n"
@@ -1715,27 +1609,32 @@
 msgid "write to stdout failed"
 msgstr "zápis na štandardný výstup zlyhal"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "zápis do podprocesu %s zlyhal"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "chýbajúci názov filtra"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musí byť uvedený aspoň jeden sed skript"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Použitie: %s [VOĽBA] FILTER [VOĽBA-FILTRA]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplikovať filter na všetky preklady prekladového katalógu.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1745,18 +1644,18 @@
 "vstupu\n"
 "a zapisuje upravené preklady na štandardný výstup.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Užitočné VOĽBY-FILTRA keď je použitý FILTER 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SKRIPT     pridať SKRIPT k vykonávaným príkazom\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1767,14 +1666,14 @@
 "výkonávaným\n"
 "                                príkazom\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       potlačiť automatickú tlač priestoru vzorov\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1782,12 +1681,12 @@
 "      --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1795,71 +1694,50 @@
 "      --keep-header           zachovať položku hlavičky nezmenenú,\n"
 "                              neodfiltrovať ju\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-d adresár\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-l národné prostredie\""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s vyžaduje špecifikáciu \"--template šablóna\""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s vyžaduje špecifikáciu \"-o súbor\""
-
-#: src/msgfmt.c:551
-#, 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:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je platné len s %s alebo %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je platné len s %s, %s alebo %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1867,7 +1745,7 @@
 msgstr[1] "%d preložená správa"
 msgstr[2] "%d preložené správy"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1875,7 +1753,7 @@
 msgstr[1] ", %d nepresný preklad"
 msgstr[2] ", %d nepresné preklady"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1883,17 +1761,17 @@
 msgstr[1] ", %d nepreložená správa"
 msgstr[2] ", %d nepreložené správy"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Použitie: %s [VOĽBA] menosúboru.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1902,26 +1780,26 @@
 "Povinné parametre dlhých volieb sú povinné aj pre krátke voľby.\n"
 "Podobne aj pre voliteľné parametre.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  menosúboru.po ...           vstupné súbory\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mód činnosti:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  režim Java: generovať triedu Java "
+"  -j, --java                  mód Java: generovať triedu Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1931,13 +1809,12 @@
 "alebo\n"
 "                              vyššie)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-"      --csharp                režim C#: generovať .dll súbor pre .NET\n"
+msgstr "      --csharp                mód C#: generovať .dll súbor pre .NET\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1946,48 +1823,40 @@
 "      --csharp-resources      režim zdrojov C#: generovať .resources súbor "
 "pre .NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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"
+"      --tcl                   mód Tcl: generovať súbor .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               režim položiek pracovnej plochy: generovať "
-"súbor .desktop\n"
+msgstr "      --qt                    mód Qt: generovať Qt súbor .qm\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                povoliť presne dodržaný režim Uniforum\n"
+msgstr "      --strict                povoliť presne dodržaný mód Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "Umiestnenie výstupného súboru v režime Java:\n"
+msgstr "Umiestnenie výstupného súboru v móde Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZDROJ        názov zdroja\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1996,22 +1865,14 @@
 "  -l, --locale=N_PROSTREDIE   názov národného prostredia, buď jazyk alebo\n"
 "                              jazyk_KRAJINA\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                vytvorí súbor .java, namiesto súboru .class\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2023,12 +1884,12 @@
 "oddelené znakom \"_\". Voľba -d je povinná. Trieda je zapísaná do zadaného\n"
 "adresára.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, 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:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2037,7 +1898,7 @@
 "  -d ADRESÁR                  základný adresár pre lokálne závislé .dll "
 "súbory\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2047,17 +1908,17 @@
 "adresára,\n"
 "ktorého názov závisí od národného prostredia.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Umiestnenie výstupného súboru v režime Tcl:\n"
+msgstr "Umiestnenie výstupného súboru v móde Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2065,46 +1926,12 @@
 msgstr ""
 "Voľby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Voľby pre položky pracovnej plochy:\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, 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:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretácia vstupného súboru:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2115,14 +1942,14 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2130,7 +1957,7 @@
 msgstr ""
 "      --check-header          overiť prítomnosť a obsah položky hlavičky\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2140,7 +1967,7 @@
 "domény\n"
 "                                a voľbou --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2149,7 +1976,7 @@
 "  -C, --check-compatibility   kontrolovať, či sa GNU msgfmt správa tak ako\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2160,12 +1987,12 @@
 "skratiek\n"
 "                                pre položky menu\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2173,20 +2000,7 @@
 "  -a, --alignment=POČET       zarovnať reťazce na POČET bajtov (štandardne: "
 "%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=PORADIEBAJTOV zapísať 32-bitové čísla v zadanom poradí "
-"bajtov\n"
-"                                 (big alebo little, predvolené závisí na "
-"platforme)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2194,90 +2008,79 @@
 "      --no-hash               binárny súbor nebude obsahovať hašovaciu "
 "tabuľku\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            zobraziť štatistiky prekladov\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               zvýšiť úroveň táravosti\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "upozornenie: konverzia znakovej sady nebude fungovať\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "upozornenie: hlavička súboru PO je nepresná\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, 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:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "direktíva 'domain %s' bola ignorovaná"
+msgid "`domain %s' directive ignored"
+msgstr "direktíva `domain %s' bola ignorovaná"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "prázdna položka 'msgstr' bola ignorovaná"
+msgid "empty `msgstr' entry ignored"
+msgstr "prázdna položka `msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "nepresná položka 'msgstr' bola ignorovaná"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "nepresná položka `msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s neexistuje"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s existuje, ale nedá sa čítať"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri čítaní súboru \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2286,7 +2089,7 @@
 "voľba '%c' nemôže byť použitá pred špecifikovaným 'J' alebo 'K' alebo 'T' "
 "alebo 'C' alebo 'X'"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2295,7 +2098,7 @@
 "Vyberie všetky správy z prekladového katalógu, ktoré vyhovujú zadanému\n"
 "vzoru alebo sú v zadaných zdrojových súboroch.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2372,7 +2175,7 @@
 "  -v, --invert-match          vytlačiť len tie správy, ktoré nevyhovujú žiadnemu\n"
 "                              výberovému kritériu\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2381,18 +2184,18 @@
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generovať utriedený výstup\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2403,7 +2206,7 @@
 "ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestovať\n"
 "vaše preklady.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2414,12 +2217,12 @@
 "Zadajte, prosím, národné prostredie pomocou voľby --locale alebo\n"
 "výstupný .po súbor pomocou voľby --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Vytvorený %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2428,12 +2231,12 @@
 "Vytvorí nový PO súbor, inicializuje meta informácie podľa hodnôt z prostredia\n"
 "používateľa.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný POT súbor\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2444,12 +2247,12 @@
 "adresári.\n"
 "Ak je -, načítaný je štandardný vstup.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=SÚBOR     zapísať výstup do zadaného PO súboru\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2459,12 +2262,12 @@
 "nastavenia národného prostredia používateľa. Ak je -, výstup je zapísaný na\n"
 "štandardný výstup.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          nastaviť cieľové národné prostredie\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2472,7 +2275,7 @@
 "      --no-translator         označiť, že PO súbor je generovaný "
 "automaticky\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2480,12 +2283,12 @@
 "Nájdených viac ako jeden .pot súbor.\n"
 "Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "chyba pri čítaní adresára"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2493,14 +2296,14 @@
 "V aktuálnom adresári nebol nájdený žiaden .pot súbor.\n"
 "Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zlyhal s ukončovacím kódom %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2517,7 +2320,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenské preklady pre balík %s"
@@ -2535,16 +2338,16 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "vstupný súbor '%s' nemá v hlavičke uvedenú znakovú sadu"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "vstupný súbor \"%s\" nemá v hlavičke uvedenú znakovú sadu"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"doména \"%s\" vo vstupnom súbore '%s' nemá v hlavičke uvedenú znakovú sadu"
+"doména \"%s\" vo vstupnom súbore \"%s\" nemá v hlavičke uvedenú znakovú sadu"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
@@ -2552,8 +2355,8 @@
 msgstr "cieľová znaková sada \"%s\" nie je prenositeľné meno kódovania."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "upozornenie: "
@@ -2680,32 +2483,32 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Skúste použiť nasledujúce, platné pre %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalóg správ má preklady s množnými číslami"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 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:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ale v hlavičke chýba príznak \"nplurals=ČÍSLO\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "neplatná hodnota nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "neplatný výraz pre množné číslo"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2713,7 +2516,7 @@
 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:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2721,7 +2524,7 @@
 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2729,55 +2532,65 @@
 "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:611
-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:602
+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:619
+#: src/msgl-check.c:610
 #, 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'"
+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:634
-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:625
+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:652
-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:643
+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:660
+#: src/msgl-check.c:651
 #, 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'"
+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:675
-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:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "spracovanie množných čísel je rozšírením GNU"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, 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:740
+#: src/msgl-check.c:730
 #, 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:814
+#: src/msgl-check.c:776
 #, 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"
+msgid "header field `%s' missing in header\n"
+msgstr "položka hlavičky `%s' v hlavičke chýba\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "položka hlavičky `%s' má začínať na začiatku riadka\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+"niektoré položky hlavičky ešte obsahujú počiatočné štandardné hodnoty\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "položka hlavičky '%s' v hlavičke chýba\n"
+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-iconv.c:65
 #, c-format
@@ -2793,8 +2606,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2812,8 +2625,8 @@
 "Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgid sa "
 "stanú rovnakými."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2822,16 +2635,16 @@
 "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia "
 "bola preložená bez iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je platné len s %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "typ zálohy"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2855,18 +2668,18 @@
 "pri ktorých nemožno nájsť presnú zhodu, bude použitý fuzzy algoritmus,\n"
 "ktorý dosahuje lepšie výsledky.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      preklady podľa starých zdrojových súborov\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odkazy na nové zdrojové súbory\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2875,7 +2688,7 @@
 "  -C, --compendium=SÚBOR      prídavná knižnica prekladov správ, môže byť\n"
 "                              zadaná viac ako raz\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2884,27 +2697,27 @@
 "  -U, --update                aktualizovať def.po,\n"
 "                              nerobiť nič, ak def.po je aktuálny\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "Umiestnenie výstupného súboru v režime aktualizácie:\n"
+msgstr "Umiestnenie výstupného súboru v móde aktualizácie:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Výsledok je zapísaný späť do def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        vytvoriť zálohu súboru def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=PRÍPONA        prekryť obvyklú príponu zálohy\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2922,17 +2735,17 @@
 "  existing, nil   numbered, ak existuje číslovaná záloha, inak simple\n"
 "  simple, never   vždy vytvoriť jednoduchú zálohu\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Prípona zálohy je '~', pokiaľ nie je zadaná voľba --suffix alebo nastavená\n"
 "premenná prostredia SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2940,22 +2753,22 @@
 "      --previous              zachovať predchádzajúce msgid preložených "
 "správ\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       potlačiť indikátory postupu\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "táto správa by mala definovať tvary množného čísla"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "táto správa by nemala definovať tvary množného čísla"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2964,7 +2777,7 @@
 "%sNačítané %ld starých + %ld odkazov, %ld zlučených, %ld nepresných, %ld "
 "chýbajucich, %ld zrušených.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2991,8 +2804,7 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  režim Java: vstup je trieda Java "
-"ResourceBundle\n"
+"  -j, --java                  mód Java: vstup je trieda Java ResourceBundle\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -3013,7 +2825,7 @@
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   režim Tcl: vstup je súbor .msg tcl/msgcat\n"
+"      --tcl                   mód Tcl: vstup je súbor .msg tcl/msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
@@ -3023,7 +2835,7 @@
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "Umiestnenie vstupného súboru v režime Java:\n"
+msgstr "Umiestnenie vstupného súboru v móde Java:\n"
 
 #: src/msgunfmt.c:462
 #, c-format
@@ -3052,7 +2864,7 @@
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Umiestnenie vstupného súboru v režime Tcl:\n"
+msgstr "Umiestnenie vstupného súboru v móde Tcl:\n"
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3075,7 +2887,7 @@
 "      --strict                zapísať súbor s presne dodržaným štýlom "
 "uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3096,12 +2908,12 @@
 "z prvého prekladu. Pozície v súboroch budú zlúčené. Pri použití voľby\n"
 "--unique budú duplikáty potlačené.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              zobraziť len duplikáty\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3124,7 +2936,7 @@
 "Znaková sada \"%s\" nie je prenositeľné meno kódovania.\n"
 "Konverzia hlásení do znakovej sady používateľa nemusí fungovať.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3133,7 +2945,7 @@
 "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv()\n"
 "a iconv() nepodporuje \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3141,15 +2953,15 @@
 "Inštalácia GNU balíka libiconv a následná preinštalácia\n"
 "balíka GNU gettext by mala tento problém odstrániť.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Pokračovanie aj napriek tomu. Možno sa vyskytnú chyby pri analýze."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Pokračovanie aj napriek tomu."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3158,7 +2970,7 @@
 "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv().\n"
 "Táto verzia bola preložená bez iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3171,27 +2983,27 @@
 msgid "inconsistent use of #~"
 msgstr "nekonzistentné použitie #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "chýba sekcia 'msgstr[]'"
+msgid "missing `msgstr[]' section"
+msgstr "chýba sekcia `msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "chýba sekcia 'msgid_plural'"
+msgid "missing `msgid_plural' section"
+msgstr "chýba sekcia `msgid_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "chýba sekcia 'msgstr'"
+msgid "missing `msgstr' section"
+msgstr "chýba sekcia `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "prvé množné číslo má nenulový index"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "množné číslo má nesprávny index"
@@ -3201,7 +3013,7 @@
 msgid "too many errors, aborting"
 msgstr "vyskytlo sa príliš veľa chýb, ukončuje sa program"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatná viacznaková sekvencia"
@@ -3245,16 +3057,16 @@
 msgid "context separator <EOT> within string"
 msgstr "oddeľovač kontextu <EOT> v reťazci"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento súbor nesmie obsahovať direktívy pre doménu"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplicitná definícia správy"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "toto je miesto prvého definovania"
 
@@ -3329,12 +3141,12 @@
 "Vstupný text je čítaný zo štandardného vstupu. Konvertovaný text je vytlačený\n"
 "na štandardný výstup.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "vstup nie je platný v kódovaná \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pri konverzii kódovania z \"%s\" do \"%s\""
@@ -3358,21 +3170,11 @@
 "Stiahne a zobrazí obsah z URL. Ak URL nie je dostupné, použije sa SÚBOR\n"
 "z lokálneho disku.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "chyba pri čítaní \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "chyba pri zápise na štandardný výstup"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "chyba po čítaní \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3454,18 +3256,18 @@
 msgid "compilation of C# class failed"
 msgstr "kompilácia triedy C# zlyhala"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nie je platným názvom triedy Java: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, 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"
@@ -3475,18 +3277,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "neplatná viacznaková sekvencia"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu '\\%c'"
+"internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu `\\%c'"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3499,7 +3296,7 @@
 "ako vy. Zvážte namiesto toho použitie msgctxt len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3509,7 +3306,7 @@
 msgstr ""
 "Nasledujúci msgid obsahuje znaky mimo ASCII.\n"
 "Toto spôsobí problémy prekladateľom, ktorí používajú iné kódovanie znakov\n"
-"ako vy. Zvážte namiesto toho použitie msgid len s ASCII znakmi.\n"
+"ako vy. Zvážte namiesto toiho použitie msgid len s ASCII znakmi.\n"
 "%s\n"
 
 #: src/write-qt.c:667
@@ -3578,7 +3375,7 @@
 "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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukončený reťazec"
@@ -3588,22 +3385,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornenie: neukončený regulárny výraz"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "upozornenie: neplatný znak Unicode"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornenie: neukončená znaková konštanta"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Prosím, zadajte kódovanie zdroja pomocou --from-code."
 
@@ -3643,7 +3435,7 @@
 "%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv zlyhal"
@@ -3657,7 +3449,7 @@
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornenie: neplatný znak Unicode"
@@ -3677,22 +3469,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: upozornenie: nájdené '}' tam, kde bolo očakávané ')'"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Chýba kontext pre reťazec extrahovaný z element '%s'"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Koreňový element <%s> nie je dovolený v platnom súbore Glade"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3706,70 +3488,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: upozornenie: osamotený náhradník U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Prosím, zadajte kódovanie zdroja pomocou --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Neplatná viacbajtová postupnosť.\n"
-"Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Nekompletná dlhá viacbajtová postupnosť.\n"
-"Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Nekompletná viacbajtová postupnosť na konci súboru.\n"
-"Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Nekompletná viacbajtová postupnosť na konci riadka.\n"
-"Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Neplatná viacbajtová postupnosť.\n"
-"Prosím, zadajte kódovanie zdroja pomocou --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: upozornenie: reťazec RegExp je ukončený príliš skoro"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: upozornenie: %s nie je dovolené"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: upozornenie: neukončená značka XML"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3805,7 +3523,7 @@
 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:278
+#: src/x-python.c:236
 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"
@@ -3813,7 +3531,7 @@
 "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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3824,7 +3542,7 @@
 "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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3835,7 +3553,7 @@
 "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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3846,7 +3564,7 @@
 "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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3857,7 +3575,7 @@
 "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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3868,7 +3586,7 @@
 "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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznáme kódovanie \"%s\". Pokračujem namiesto neho s ASCII."
@@ -3897,39 +3615,28 @@
 "%s:%lu: upozornenie: syntax $\"...\" je neodporúčaná z bezpečnostných "
 "dôvodov; použite namiesto toho eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-"%s:%d: upozornenie: reťazec regulárneho výrazu je ukončený príliš skoro"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
+#: src/xgettext.c:769
 #, 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"
+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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3938,12 +3645,12 @@
 "  -d, --default-domain=NÁZOV  použiť NÁZOV.po pre výstup (namiesto messages."
 "po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3951,12 +3658,12 @@
 "  -p, --output-dir=ADRESÁR    výstupné súbory budú umiestnené v adresári "
 "ADRESÁR\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Voľba jazyka vstupného súboru:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3965,8 +3672,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NÁZOV        použiť zadaný jazyk\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3974,22 +3680,21 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3998,24 +3703,24 @@
 "      --from-code=NÁZOV       kódovanie vstupných súborov\n"
 "                                (s výnimkou pre Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4032,47 +3737,39 @@
 "                                predchádzajú riadky s kľúčovými slovami,\n"
 "                                do výstupného súboru\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Voľby špecifické pre jednotlivé jazyky:\n"
+msgstr "Špecifické voľby jazyk:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahovať všetky reťazce\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (len jazyky C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (len jazyky C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kSLOVO, --keyword=SLOVO    hľadať SLOVO ako ďalšie kľúčové slovo\n"
+"  -k, --keyword               nepoužiť predvolené kľúčové slová)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4083,52 +3780,50 @@
 "číslo\n"
 "                              ARG kľúčového slova SLOVO\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (len jazyky C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (len jazyky C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (len jazyk C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozoznať formát reťazcov KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4137,19 +3832,19 @@
 "formátovacích\n"
 "                              reťazcov\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4157,17 +3852,17 @@
 "      --foreign-user          vynechať informáciu o autorských právach FSF\n"
 "                              pre cudzieho používateľa\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4176,7 +3871,7 @@
 "chýb\n"
 "                                   v msgid\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4187,7 +3882,7 @@
 "predponu\n"
 "                                pre hodnoty msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4198,7 +3893,7 @@
 "príponu pre\n"
 "                                hodnoty msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4206,31 +3901,31 @@
 msgstr ""
 "Parameter pre --flag nemá tvar <kľúčové_slovo>:<č_param>:[pass-]<príznak>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "štandardný vstup"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Nie ASCII znak na %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Nie ASCII komentár na alebo pred %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Nie ASCII reťazec na %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: upozornenie: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4239,7 +3934,7 @@
 "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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4248,7 +3943,7 @@
 "Aj keď je to tak deklarované, %s nie je platný formátovací reťazec %s. "
 "Dôvod: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4262,7 +3957,7 @@
 "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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4272,44 +3967,45 @@
 "gettext(\"\") vráti hlavičku s meta informáciami\n"
 "a nie prázdny reťazec.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "nejednoznačne zadaný parameter pre kľúčové slovo '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "nezhoda kontextu medzi jednotným a množným číslom"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "Voľba --msgid-bugs-address nebola zadané.\n"
-"Ak používate súbor 'Makevars', prosím nastavte v ňom premennú\n"
+" Ak používate\n"
+"súbor `Makevars', prosím nastavte v ňom premennú\n"
 "MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
 "riadka --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "jazyk '%s' je neznámy"
+msgid "language `%s' unknown"
+msgstr "jazyk `%s' je neznámy"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/sl.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/sl.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/sl.po gettext-0.18.1.1/gettext-tools/po/sl.po
--- gettext-0.19.3/gettext-tools/po/sl.po	2014-10-16 06:04:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/sl.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,16 @@
 # -*- mode:po; coding:utf-8; -*- Slovenian messages for GNU gettext package
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2011, 2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2003, 2006, 2007, 2011, 2013.
+# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999-2003, 2006, 2007.
 #
-# $Id: gettext-tools-0.18.3.sl.po,v 1.2 2013/12/11 22:24:44 peterlin Exp $
+# $Id: gettext-tools-0.16.2-pre5.sl.po,v 1.3 2007/10/19 11:59:32 peterlin Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.3\n"
+"Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-12-11 23:24+0100\n"
-"Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-10-19 14:00+0200\n"
+"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
@@ -31,25 +30,26 @@
 msgstr "dvoumen argument %s za %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Veljavni argumenti so:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "začasnega imenika ni mogoče najti, poskusite nastaviti $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ni mogoče ustvariti začasnega imenika z vzorcem \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "začasne datoteke %s ni mogoče odstraniti"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "začasnega imenika %s ni mogoče odstraniti"
@@ -58,38 +58,37 @@
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "ohranjamo dovoljenja za %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "datoteke %s ni moč odpreti za branje"
+msgid "error while opening \"%s\" for reading"
+msgstr "datoteke \"%s\" ni moč odpreti za branje"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "varnostne kopije %s ni mogoče odpreti za pisanje"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "varnostnega izvoda \"%s\" ni mogoče odpreti za pisanje"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "napaka pri branju %s"
+msgid "error reading \"%s\""
+msgstr "napaka pri branju »%s«"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "napaka pri pisanju na %s"
+msgid "error writing \"%s\""
+msgstr "napaka pri pisanju na »%s«"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "napaka po branju %s"
+msgid "error after reading \"%s\""
+msgstr "napaka po branju »%s«"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -106,98 +105,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtualnega stroja za C# ni najti; poskusite namestit pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces neuspešen"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: izbira »%s« ni enopomenska; možnosti:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: izbira »%s« ni enoznačna\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: izbira »--%s« zahteva argument\n"
+msgstr "%s: izbira »%s« zahteva argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neprepoznana izbira »--%s«\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neprepoznana izbira »%c%s«\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neveljavna izbira -- '%c'\n"
+msgstr "%s: neveljavna izbira -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: izbira zahteva argument -- '%c'\n"
+msgstr "%s: izbira zahteva argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: izbira »-W %s« ni enopomenska\n"
+msgstr "%s: izbira »-W %s« je dvoumna\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: izbira »-W %s« zahteva argument\n"
+msgstr "%s: izbira »%s« zahteva argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "neveljaven argument source_version za compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje »%s« neuspešno"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko »%s«"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
@@ -208,100 +207,62 @@
 msgstr ""
 "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/I napaka v podprocesu %s"
 
 #  Morda ,,Zmanjkalo pomnilnika''?
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "branje izhoda podprocesa %s neuspešno"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "povezava s podprocesom %s neuspešna"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "podproces %s zaključil z izhodno kodo %d"
+msgid "cannot create pipe"
+msgstr "cevovoda ni mogoče ustvariti"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "cevovoda ni mogoče ustvariti"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Klic _open_osfhandle neuspešen"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "ni mogoče povrniti fd %d: klic dup2 ni uspel"
+msgstr "izhodne datoteke \"%s\" ni mogoče ustvariti"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -314,51 +275,42 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s prejel kritični signal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "datoteke \"%s\" ni moč odpreti za branje"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "»%s« ni veljaven formatni niz %s, za razliko od »%s« . Razlog: %s"
+msgstr "»%s« za razliko od »msgid« ni veljaven formatni niz %s. Razlog: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, 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"
+msgstr "formatno določilo za argument %u, kot v »%s«, v »msgid« ne obstaja"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "formatni določili v »%s« in »%s« za argument %u nista enaki"
+msgstr "formatni določili v »msgid« in »%s« za argument %u nista enaki"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktiva številka %u se začenja z »|«, vendar se ne zaključuje z »|«."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -367,23 +319,21 @@
 "V direktivi številka %u element za »<« ni ime makroukaza, ki določa obliko. "
 "Veljavna imena makroukazov so navedena v ISO C 99, razdelek 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "V direktivi številka %u elementu za »<« ne sledi »>«. "
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Niz se sklicuje na argument številka %u, vendar ne upošteva argumenta št. %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, 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"
+msgstr "števili formatnih določil v »msgid« in »%s« se ne ujemata"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -462,24 +412,14 @@
 msgstr "V direktivi številka %u modifikatorji niso dovoljeni pred »%c«."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "»%s« uporablja %%m, »%s« pa ne"
+msgstr "»msgid« uporablja %%m, »%s« pa ne"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "»%s« ne uporablja %%m, »%s« pa uporablja %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "»%s« uporablja %%C, »%s« pa ne"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "»%s« ne uporablja %%C, »%s« pa uporablja %%C"
+msgstr "»msgid« ne uporablja %%m, »%s« pa uporablja %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -579,10 +519,10 @@
 "»%s«."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "formatno določilo za argument {%u}, ki je v »%s« ni, v »%s« ne obstaja"
+msgstr "v »msgid« ni formatnega določila za argument {%u}, kot v »%s«"
 
 #: src/format-java.c:756
 #, c-format
@@ -590,10 +530,10 @@
 msgstr "v »%2$s« ni formatnega določila za argument {%1$u}"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "formatni določili v »%s« in »%s« za argument {%u} nista enaki"
+msgstr "formatni določili v »msgid« in »%s« za argument {%u} nista enaki"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -669,14 +609,14 @@
 msgstr "Niz se sklicuje na nek argument na nezdružljive načine."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "formatni določili v »%s« in »%s« nista enakovredni"
+msgstr "formatni določili v »msgid« in »%s« nista enakovredni"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 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«"
+msgstr "formatna določila v »%s« niso podmnožica tistih v »msgid«"
 
 #: src/format-perl.c:433
 #, c-format
@@ -687,9 +627,7 @@
 "V direktivi številka %u je določilo velikosti nezdružljivo s pretvornim "
 "faktorjem »%c«."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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«"
@@ -708,68 +646,40 @@
 msgstr "Niz se sklicuje na argument »%s« na nezdružljive načine."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"formatno določilo v »%s« zahteva preslikavo, tisto v »%s« pa pričakuje n-"
+"formatno določilo v »msgid« zahteva preslikavo, tisto v »%s« pa pričakuje n-"
 "terček"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"formatno določilo v »%s« zahteva n-terček, tisto v »%s« pa pričakuje "
+"formatno določilo v »msgid« zahteva n-terček, tisto v »%s« pa pričakuje "
 "preslikavo"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, 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"
+msgstr "v »msgid« ni formatnega določila za argument »%s«, kot v »%s«"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "formatni določili v »%s« in »%s« za argument »%s« nista enaki"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"V direktivi številka %u ni dovoljeno nadaljnje gnezdenje formatnega "
-"določilnika."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "V direktivi številka %u je nezaključena formatna direktiva."
+msgstr "formatni določili v »msgid« in »%s« za argument »%s« nista enaki"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"»%s« je enostaven formatni niz, »%s« pa ne: vsebuje zastavico »L« ali "
+"»msgid« je enostaven formatni niz, »%s« pa ne: vsebuje zastavico »L« ali "
 "dvoštevilčno število argumenta"
 
 #: src/format-sh.c:79
@@ -813,11 +723,11 @@
 "1 and 9."
 msgstr "Znak, ki zaključuje direktivo številka %u, ni števka med 1 in 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -830,58 +740,58 @@
 "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor(ica) %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "preveč argumentov"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Izpis gostiteljskega imena računalnika.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Oblika izpisa:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           kratka oblika gostiteljskega imena\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -892,34 +802,34 @@
 "polnim\n"
 "                          internetim imenom in vzdevki\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ta navodila\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               različica programa\n"
@@ -928,41 +838,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 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/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "gostiteljskega imena ni moč ugotoviti"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dovoljena je največ ena vhodna datoteka"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s in %s se med seboj izključujeta"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -971,10 +883,10 @@
 "Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
 "in rokovanje z njimi.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -982,23 +894,23 @@
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Izbira vhodne datoteke:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1006,31 +918,31 @@
 "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
 "IMENIKU\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Izbira izhodne datoteke:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1040,12 +952,12 @@
 "standardni\n"
 "izhod.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Izbira sporočil:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1053,7 +965,7 @@
 "      --translated            obdržimo prevedena sporočila, zavržemo "
 "neprevedena\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1061,66 +973,57 @@
 "      --untranslated          obdržimo neprevedena sporočila, zavržemo "
 "prevedena\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            zgolj ohlapna samodejno prevedena sporočila\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Rokovanje z določili:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             vsa sporočila označimo kot ohlapno pprevedena\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           izbrišemo vse oznake o ohlapnosti prevodov\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          vsa sporočila označimo kot zastarela\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        izbrišemo vse oznake o zastarelosti prevodov\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              obdržimo prejšnja polja msgid prevedenih "
-"sporočil\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1129,21 +1032,14 @@
 "      --clear-previous        izbrišemo oznake \"previous msgid\" iz vseh "
 "sporočil\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=DATOTEKA.po  obdelamo le vnose, navedene v DATOTEKI.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1151,28 +1047,28 @@
 "      --ignore-file=DATOTEKA.po  obdelamo vnose razen navedenih v DATOTEKI."
 "po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 isto kot --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Skladnja vhodne datoteke:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1180,8 +1076,8 @@
 "  -P, --properties-input      skladnja vhodne datoteke je javanska ."
 "properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1190,17 +1086,17 @@
 "      --stringtable-input     skladnja vhodne datoteke je NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti izpisa:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1216,16 +1112,16 @@
 "»auto«\n"
 "                              ali »html«\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1233,9 +1129,9 @@
 "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
 "(privzeto)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1243,28 +1139,28 @@
 "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 "                             razširjenega nabora znakov\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1272,8 +1168,8 @@
 "  -n, --add-location       z vrsticami »#: datoteka:vrstica« v izpisu "
 "(privzeto)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1281,32 +1177,32 @@
 "      --strict             izpis v strogi obliki Uniforum, brez razširitev "
 "GNU\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1314,32 +1210,32 @@
 msgstr ""
 "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "določeni kriteriji izbire niso mogoči (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1348,39 +1244,39 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Združimo dane datoteke PO.\n"
 "Poiščemo sporočila, ki so skupna dvema ali več podanima datotekama PO. Z\n"
 "izbiro --more-than pred izpisom zahtevamo več skupnih lastnosti. Obratno\n"
 "z izbiro --less-than izberemo manj skupnih lastnosti (npr. --less-than=2\n"
-"izpiše samo unikatna sporočila). Vsi prevodi, komentarji prevajalcev,\n"
-"komentarji pri izvlačenju in informacije o položaju nizov v datoteki se\n"
-"ohranijo, razen če z izbiro --use-first ne zahtevamo, da se ohranijo samo\n"
-"tisti iz prve datoteke PO, ki jih definira.\n"
+"izpiše samo unikatna sporočila). Prevodi, komentarji prevajalcev in komentarji\n"
+"pri izvlačenju iz vseh datotek se ohranijo, razen če z izbiro --use-first ne\n"
+"zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. Mesta\n"
+"v datotekah iz vseh datotek PO se ohranijo.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih datotek)\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1390,7 +1286,7 @@
 "definicij\n"
 "                                 (privzeta vrednost je neskončno)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1400,7 +1296,7 @@
 "definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1409,8 +1305,8 @@
 "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
 "                                 enolično definirana sporočila\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1418,8 +1314,8 @@
 "  -P, --properties-input      skladnja vhodnih datotek je javanska ."
 "properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1428,12 +1324,12 @@
 "      --stringtable-input     skladnja vhodnih datotek je NeXTstep/GNUstep \n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1442,28 +1338,28 @@
 "      --use-first          uporabimo prvi prevod sporočila, na katerega\n"
 "                             naletimo; ne združujemo več prevodov\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=KATALOG          nastavi polje 'Language' v zaglavju\n"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "vhodni datoteki nista podani"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebni sta natančno dve vhodni datoteki"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n"
@@ -1495,12 +1391,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikatorji delovanja:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1508,7 +1404,7 @@
 msgstr ""
 "  -m, --multi-domain          ref.po uporabimo na vseh domenah iz def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ne uporabljamo ohlapnega ujemanja\n"
@@ -1534,17 +1430,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "to sporočilo mora pregledati prevajalec"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "to sporočilo je uporabljeno, a ne definirano..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...a ta definicija je podobna"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
@@ -1554,7 +1450,7 @@
 msgid "warning: this message is not used"
 msgstr "opozorilo: to sporočilo ni uporabljeno"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1563,12 +1459,12 @@
 msgstr[2] "%d kritični napaki"
 msgstr[3] "%d kritične napake"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "podani morata biti vsaj dve datoteki"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1576,18 +1472,18 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Poiščemo sporočila, ki so skupna dvema ali več podanima datotekama PO.\n"
-"Z izbiro --more-than pred izpisom zahtevamo več skupnih lastnosti. Obratno\n"
+"Poišče sporočila, ki so skupna dvema ali več podanima datotekama PO. Z\n"
+"izbiro --more-than pred izpisom zahtevamo več skupnih lastnosti. Obratno\n"
 "z izbiro --less-than izberemo manj skupnih lastnosti (npr. --less-than=2\n"
 "izpiše samo unikatna sporočila). Prevodi, komentarji prevajalcev in komentarji\n"
-"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"
+"pri izvlačenju se ohranijo samo iz prve podane datoteke PO. Mesta v datotekah \n"
+"se ohranijo iz vseh datotek PO.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1597,72 +1493,72 @@
 "definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           brez glave z vnosom »msgid \"\"«\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Pretvarjanje kataloga sporočil v drug kodni nabor.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cilj pretvorbe:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                izpis datoteke PO z zamiki\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           brez vrstic »#: datoteka:vrstica« v izpisu\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          z vrsticami »#: datoteka:vrstica« v izpisu "
 "(privzeto)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                izpis v strogi obliki Uniforum brez "
 "razširitev\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "vhodna datoteka ni podana"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "zahtevana je natančno ena vhodna datoteka"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1675,7 +1571,7 @@
 "ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
 "msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
@@ -1713,7 +1609,7 @@
 "Poseben vgrajen ukaz »0« izpiše prevod in izpis zaključi z znakom s kodo nič.\n"
 "Izhod ukaza \"msgexec 0\" je primeren kot vhod za ukaz \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
@@ -1723,27 +1619,32 @@
 msgid "write to stdout failed"
 msgstr "izpis na standardni izhod neuspešen"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "posredovanje podatkov podprocesu %s neuspešno"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "manjka ime filtra"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "podan mora biti vsaj en skript v sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1752,18 +1653,18 @@
 "FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n"
 "vhoda in izpiše spremnjen prevod na standardni izhod.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SKRIPT     dodaj SKRIPT med ukaze, ki se izvedejo\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1773,14 +1674,14 @@
 "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
 "                                ki se izvedejo\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1788,84 +1689,62 @@
 "      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
 "(privzeto)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header        ohrani glavo nespremenjeno, ne filtriraj je\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-"Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s zahteva določitev \"-d directory\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s zahteva določitev \"-l locale\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s zahteva določitev \"-l locale\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s zahteva določitev \"-l locale\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s in %s se med seboj izključujeta"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je veljavno edino z %s ali %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je veljavno edino z %s, %s ali %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1874,7 +1753,7 @@
 msgstr[2] "%d prevedeni sporočili"
 msgstr[3] "%d prevedena sporočila"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1883,7 +1762,7 @@
 msgstr[2] ", %d ohlapna prevoda"
 msgstr[3] ", %d ohlapni prevodi"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1892,17 +1771,17 @@
 msgstr[2] ", %d neprevedeni sporočili"
 msgstr[3] ", %d neprevedena sporočila"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1911,17 +1790,17 @@
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko. Enako za neobvezne argumente.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  datoteka.po ...             vhodne datoteke\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Način delovanja:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1930,7 +1809,7 @@
 "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 "                                ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1939,12 +1818,12 @@
 "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali "
 "več)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1952,49 +1831,43 @@
 msgstr ""
 "      --csharp-resources      način C#: ustvarimo .NET-datoteko z viri\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    način Qt: ustvarimo datoteko .qm za Qt\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                izpis v strogi obliki Uniforum brez razširitev "
 "GNU\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=SREDSTVO     ime sredstva\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2002,21 +1875,13 @@
 msgstr ""
 "  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   način tcl: vhod je datoteka tcl/msgcat .msg\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2030,12 +1895,12 @@
 "podani\n"
 "imenik.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Položaj izhodne datoteke v načinu C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2044,7 +1909,7 @@
 "  -d IMENIK                   korenski imenik za krajevno odvisne datoteke ."
 "dll\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2053,17 +1918,17 @@
 "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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Izbira izhodne datoteke v načinu tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2071,44 +1936,12 @@
 msgstr ""
 "Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacija vhodne datoteke:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2119,20 +1952,20 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          preverimo od jezika odvisne formatne nize\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, 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:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2141,7 +1974,7 @@
 "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
 "                                domene in izbiro --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2150,7 +1983,7 @@
 "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2160,13 +1993,13 @@
 "      --check-accelerators[=ZNAK]  preverimo, ali obstajajo bližnjice za\n"
 "                                menujske izbire\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2174,21 +2007,7 @@
 "  -a, --alignment=ŠTEVILO     poravnava nizov na dano ŠTEVILO bajtov "
 "(privzeto %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=VRSTNI_RED zapiši 32-bitna števila v podanem vrstnem "
-"redu\n"
-"                                bajtov (big ali little, odvisno od "
-"strojnega\n"
-"                                okolja)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2196,89 +2015,78 @@
 "      --no-hash               binarni katalog sporočil bo brez razpršene "
 "tabele\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            s statistiko glede prevodov\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               z dodatnimi sporočili med izvajanjem\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "direktiva »domain %s« ni bila upoštevana"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "prazno polje »msgstr« ni bilo upoštevano"
+msgid "empty `msgstr' entry ignored"
+msgstr "prazno polje »msgstr« zavrženo"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "ohlapni vnos za polje »msgstr« ni bil upoštevan"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "ohlapni vnos za polje »msgstr« zavržen"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2286,7 +2094,7 @@
 msgstr ""
 "izbire »%c« ni moč uporabiti, preden je izbrano »J«, »K«, »T«, »C« ali »X«"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2295,7 +2103,7 @@
 "Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
 "pripadajo dani izvorni datoteki.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2376,7 +2184,7 @@
 "  -v, --invert-match          izpiši le sporočila, ki ne ustrezajo nobenemu\n"
 "                              od podanih kriterijev\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2384,18 +2192,18 @@
 "      --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 "                             razširjenega nabora znakov\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output        izhod abecedno urejen po sporočilih\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2405,7 +2213,7 @@
 "spremenljivko LANG, kot je opisano v datoteki ABOUT-NLS.\n"
 "Brez tega ne morete preizkusiti vaših prevodov.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2416,12 +2224,12 @@
 "Prosim, izberite jezikovno okolje z izbiro --locale, ali pa\n"
 "določite izhodno datoteko PO z izbiro --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Ustvarjena datoteka %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2430,12 +2238,12 @@
 "Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n"
 "uporabnikovega jezikovnega okolja.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2446,12 +2254,12 @@
 "imeniku.\n"
 "Če je enaka -, se bere standardni vhod.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2461,12 +2269,12 @@
 "nastavitev uporabnikovega jezikovnega okolja. Če je kot izhodna datoteka \n"
 "podan -, se rezultat izpiše na standardni izhod.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=JJ_DD          določitev ciljnega jezikovnega okolja\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2474,7 +2282,7 @@
 "      --no-translator         privzamemo, da je datoteka PO samodejno "
 "ustvarjena\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2482,12 +2290,12 @@
 "Našli smo več kot eno datoteko .pot.\n"
 "Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "napaka pri branju trenutnega imenika"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2495,14 +2303,14 @@
 "V trenutnem imeniku ni najti nobene datoteke .pot.\n"
 "Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s neuspešen z izhodno kodo %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2517,7 +2325,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenski prevodi paketa %s"
@@ -2535,13 +2343,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "vhodna datoteka »%s« ne vsebuje glave z določitvijo nabora znakov"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "domena \"%s\" v vhodni datoteki »%s« ne vsebuje glave z določitvijo nabora "
@@ -2553,8 +2361,8 @@
 msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "opozorilo: "
@@ -2681,27 +2489,27 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Poskusite uporabiti naslednje, veljavno za %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalog sporočil vsebuje množinske oblike prevodov,"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "v glavi pa manjka določilo \"plural=IZRAZ\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "v glavi pa manjka določilo \"nplurals=ŠTEVILO\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "neveljavna vrednost nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "neveljaven izraz za množinske oblike"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
@@ -2711,7 +2519,7 @@
 # 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:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2725,7 +2533,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:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2734,7 +2542,7 @@
 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2742,55 +2550,64 @@
 "katalog sporočil vsebuje množinske oblike, manjka pa glava z določili\n"
 "\"Plural-Forms: nplurals=ŠTEVILO; plural=IZRAZ;\""
 
-#: src/msgl-check.c:611
-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:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr manjka oznaka bližnjice »%c«"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preveč oznak bližnjic »%c«"
 
-#: src/msgl-check.c:814
-#, 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:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "v glavi manjka polje »%s«\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "v glavi manjka polje »%s«\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "polje »%s« v glavi se mora začeti na začetku vrstice\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2806,8 +2623,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2825,8 +2642,8 @@
 "Pretvorba iz »%s« v »%s« privede do podvojevanje: nekateri različni ključi "
 "msgid postanejo enaki."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2835,16 +2652,16 @@
 "Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), vendar ta izvod "
 "programa ni preveden za uporabo iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je veljavno edino z %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "vrsta varnostne kopije"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2867,17 +2684,17 @@
 "pa bodo strojno ustvarjeni komentarji in podatki o številki vrstice. Kjer\n"
 "natančnega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      prevodi\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2887,7 +2704,7 @@
 "navedemo\n"
 "                                lahko več kot eno\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2896,29 +2713,29 @@
 "  -U, --update                posodobi def.po,\n"
 "                                če je def.po že posodobljen, ne stori nič\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Mesto izhodne datoteke v posodobitvenem načinu:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultat se zapiše nazaj v datoteko def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 "      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2937,17 +2754,17 @@
 "                  sicer enostavne\n"
 "  simple, never   vedno enostavne varnostne kopije\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Varnostna kopija ima pripono »~«, razen če ni z izbiro --suffix ali\n"
 "spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugače. \n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2955,22 +2772,22 @@
 "      --previous              obdržimo prejšnja polja msgid prevedenih "
 "sporočil\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       brez kazalnika poteka\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pri tem sporočilu bi morale biti določene množinske oblike"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2979,7 +2796,7 @@
 "%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, "
 "manjkajočih %ld, opuščenih %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3090,7 +2907,7 @@
 msgstr ""
 "      --strict             izpis v strogi obliki Uniforum, brez razširitev\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3111,12 +2928,12 @@
 "ohranijo le komentarji prvega prevoda. Ohranijo se vsi podatki o mestu\n"
 "sporočila v izvorni datoteki. Z izbiro --unique se podvojena sporočila zavržejo.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 izpišemo le podvojena sporočila\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3139,7 +2956,7 @@
 "Nabor \"%s\" ni prenosljivo ime kodnega nabora.\n"
 "Pretvorba sporočil v uporabnikov kodni nabor morda ne bo delovala.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3148,7 +2965,7 @@
 "Nabor \"%s\" ni podprt. %s se naslanja na iconv(),\n"
 "in iconv() ne podpira \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3156,15 +2973,15 @@
 "Namestitev knjižnice GNU libiconv in ponovno prevajanje paketa\n"
 "GNU Gettext bi moralo odpraviti to težavo.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Težavam navzlic nadaljujemo, pričakujte napake pri razčlembi."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Težavam navzlic nadaljujemo."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3173,7 +2990,7 @@
 "Nabor \"%s\" ni podprt. %s se naslanja na iconv().\n"
 "Ta izdaja je bila prevedena brez iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3186,27 +3003,27 @@
 msgid "inconsistent use of #~"
 msgstr "neskladna raba #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "manjkajoč razdelek »msgstr[]«"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "manjkajoč razdelek »msgid_plural«"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "manjkajoč razdelek »msgstr«"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "prva množinska oblika ima indeks različen od nič"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "množinska oblika ima napačen indeks"
@@ -3216,7 +3033,7 @@
 msgid "too many errors, aborting"
 msgstr "preveč napak, nadaljevanje ni možno"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neveljavno večzložno zaporedje"
@@ -3260,16 +3077,16 @@
 msgid "context separator <EOT> within string"
 msgstr "razmejilnik konteksta <EOT> znotraj niza"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ta datoteka morda ne vsebuje direktiv domene"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "podvojena definicija sporočila"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "to je kraj prve definicije"
 
@@ -3344,12 +3161,12 @@
 "Vhodno besedilo se bere s standardnega vhoda. Pretvorjeno besedilo se zapisuje\n"
 "na standardni izhod.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "vhod ni veljaven v naboru znakov »%s«"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "napaka pri pretvorbi iz nabora znakov \"%s\" v nabor \"%s\""
@@ -3373,35 +3190,25 @@
 "Prinese in izpiše vsebino podanega URL. Če URL ni dosegljiv, se uporabni\n"
 "krajevno dostopna DATOTEKA.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "napaka pri branju »%s«"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "napaka pri pisanju na standardni izhod"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "napaka po branju »%s«"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Pridobivamo %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " pretečeno.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " ni uspelo.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3469,19 +3276,19 @@
 msgid "compilation of C# class failed"
 msgstr "prevajanje razreda C# neuspešno"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ni veljavno javansko ime razreda: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
@@ -3491,19 +3298,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri odpiranju \"%s\" za pisanje"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "neveljavno večzložno zaporedje"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internacionalizirana sporočila ne smejo vsebovati ubežne sekvence »\\%c«"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3517,7 +3319,7 @@
 "vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3599,7 +3401,7 @@
 "katalog sporočil vsebuje množinske oblike, vendar katalog sporočil TCL\n"
 "ne podpira množinskih oblik\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: opozorilo: nezaključen niz"
@@ -3609,24 +3411,22 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: opozorilo: nezaključen regularni izraz"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: opozorilo: nezaključena znakovna konstanta"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code."
+msgstr ""
+"Ne-ASCII niz na %s%s.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3664,7 +3464,7 @@
 "%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: napaka v iconv"
@@ -3678,7 +3478,7 @@
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
@@ -3700,22 +3500,12 @@
 msgstr ""
 "%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Manjkajoči kontekst za niz, izvlečen iz elementa »%s«"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Krovni element <%s> ni dovoljen v veljavni datoteki glade"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3729,70 +3519,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: opozorilo: osamljen surogat U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Neveljavno večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Nepopolno dolgo večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Nezaključeno večbajtno zaporedje na koncu datoteke.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-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-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Neveljavno večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: opozorilo: RegExp literal prekinjen predčasno"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: opozorilo: nezaključen niz"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3828,16 +3554,18 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\U\") osembitnega znaka \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
+"Ne-ASCII niz na %s%s.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3849,7 +3577,7 @@
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3861,7 +3589,7 @@
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3873,7 +3601,7 @@
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3885,7 +3613,7 @@
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3897,7 +3625,7 @@
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznani nabor znakov »%s«. Nadaljujemo z ASCII."
@@ -3926,38 +3654,28 @@
 "%s:%lu: opozorilo: skladnja $\"...\" je odsvetovana iz varnostnih razlogov, "
 "uporabite raje eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: opozorilo: regularni izraz prekinjen predčasno"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3965,26 +3683,26 @@
 msgstr ""
 "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Izbira vhodnega jezika:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3992,8 +3710,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=JEZIK           obravnavaj vhodno datoteko v danem JEZIKU\n"
 "                                   (C, C++, predmetni C, PO, ukazna lupina,\n"
@@ -4003,21 +3720,21 @@
 "awk,\n"
 "                                   YCP, TCL, perl, PHP, GCC-vir, "
 "NXStringTable,\n"
-"                                   RST, glade, lua, javascript, vala)\n"
+"                                   RST, glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      okrajšava za --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4026,25 +3743,25 @@
 "      --from-code=NABOR          nabor znakov vhodnih datotek\n"
 "                                   (razen za Python, Tcl in Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4052,57 +3769,46 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cZNAČKA, --add-comments=ZNAČKA  postavi v izhodno datoteko bloke\n"
-"                                komentarjev, ki se začnejo z ZNAČKO in\n"
-"                                predhodijo vrstice s ključnimi besedami\n"
-"  -c, --add-comments          postavi vse komentarje pred vrsticami s \n"
-"                                ključnimi besedami v izhodno datoteko\n"
+"  -c, --add-comments[=ZNAČKA]    v vhodno datoteko dodamo komentar z "
+"navedeno\n"
+"                                  ZNAČKO\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Izbire, specifične za jezik:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              iz datotek potegnemo vse nize\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (samo jeziki C, C++, predmetni C, ukazna "
 "lupina,\n"
 "                                python, lisp, emacs lisp, librep, scheme, "
 "java,\n"
-"                                C#, awk, TCL, perl, PHP, GCC-vir, glade, "
-"lua,\n"
-"                                javascript, vala)\n"
+"                                C#, awk, TCL, perl, PHP, GCC-vir, glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (samo jeziki C, C++, predmetni C, ukazna "
-"lupina,\n"
-"                                python, lisp, emacs lisp, librep, scheme, "
-"java,\n"
-"                                C#, awk, TCL, perl, PHP, GCC-vir, glade, "
-"lua,\n"
-"                                javascript, vala)\n"
+"  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah "
+"(prazen\n"
+"                                   niz BESEDA pomeni brez uporabe privzetih\n"
+"                                   ključnih besed)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4112,53 +3818,51 @@
 "      --flag=BESEDA:ARG:STIKALO  dodatno stikalo za nize znotraj argumenta\n"
 "                                 številka ARG ključne besede BESEDA\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (samo jeziki C, C++, predmetni C, ukazna "
 "lupina,\n"
 "                                python, lisp, emacs lisp, librep, scheme, "
 "java,\n"
-"                                C#, awk, YCP, TCL, perl, PHP, GCC-vir, lua,\n"
-"                                javascript, vala)\n"
+"                                C#, awk, YCP, TCL, perl, PHP, GCC-vir)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (samo jeziki C, C++ in predmetni C)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    prepoznaj oblikovne nize Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (samo jezik C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   prepoznaj oblikovne nize KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4166,19 +3870,19 @@
 "      --debug                    bolj razčlenjen rezultat razpoznave\n"
 "                                   oblikovnega niza\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4186,18 +3890,18 @@
 "      --foreign-user          brez copyrighta FSF v izpisu za tuje "
 "uporabnike\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4205,26 +3909,23 @@
 "      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporočila o napakah "
 "msgid\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
-msgstr ""
-"  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za "
-"msgstr\n"
+msgstr "  -m, --msgstr-prefix[=NIZ]     NIZ ali \"\" kot predpona za msgstr\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
-msgstr ""
-"  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
+msgstr "  -M, --msgstr-suffix[=NIZ]     NIZ ali \"\" kot pripona za msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4232,31 +3933,31 @@
 msgstr ""
 "Argument --flag nima skladnje <ključna-beseda>:<št-arg>:[pass-]<stikalo>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardni vhod"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Ne-ASCII znak pri %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Ne-ASCII komentar pri ali okoli %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Ne-ASCII niz pri %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: opozorilo: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4265,7 +3966,7 @@
 "Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz "
 "%s. Razlog: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4274,7 +3975,7 @@
 "Čeprav je deklariran kot tak, %s ni veljaven oblikovni niz za %s. Razlog: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4287,7 +3988,7 @@
 "Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
 "ter preslikave namesto n-terčka argumentov.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4297,31 +3998,31 @@
 "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
 "praznega niza.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "dvoumno določen argument za ključno besede »%.*s«"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4330,21 +4031,15 @@
 "spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
 "z izbiro --msgid-bugs-address v ukazni vrstici.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "jezik »%s« ni poznan"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<nepoimenovano>"
 
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "polje »%s« v glavi se mora začeti na začetku vrstice\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: nedovoljena izbira -- %c\n"
 
@@ -4354,6 +4049,18 @@
 #~ msgid "Not yet implemented."
 #~ msgstr "Funkcija še ni izvedena."
 
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "s podprocesom %s ni mogoče vzpostaviti nebločne V/I povezave"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "povezava s podprocesom %s neuspešna"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "branje izhoda podprocesa %s neuspešno"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "podproces %s zaključil z izhodno kodo %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "polje »%s« ima še vedno začetno privzeto vrednost\n"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/sr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/sr.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/sr.po gettext-0.18.1.1/gettext-tools/po/sr.po
--- gettext-0.19.3/gettext-tools/po/sr.po	2014-10-16 06:04:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/sr.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,521 +1,464 @@
-# Serbian translation of gettext-tools, 2003—2014.
+# Serbian translation of gettext-tools
 # Copyright (C) 2003, 2004 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—2014.
+# Danilo Segan <dsegan@gmx.net>, 2003, 2004.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools-0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-12 21:59+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2004-02-16 16:00+0100\n"
+"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
+"Language-Team: Serbian <gnu@prevod.org>\n"
 "Language: sr\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"
+"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
+#, fuzzy, c-format
 msgid "invalid argument %s for %s"
-msgstr "неисправан аргумент „%s“ за „%s“"
+msgstr "неисправан аргумент „%s“ за  %s"
 
 #: gnulib-lib/argmatch.c:134
-#, c-format
+#, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "нејасан аргумент „%s“ за „%s“"
+msgstr "неједнозначан аргумент „%s“ за  %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Исправни аргументи су:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"не могу да пронађем привремени директоријум, покушавам да подесим „$TMPDIR“"
+msgstr "не могу да нађем привремени директоријум, поставите $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "не могу да направим привремени директоријум користећи шаблон „%s“"
+msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
 
-#: gnulib-lib/clean-temp.c:435
-#, c-format
+#: gnulib-lib/clean-temp.c:445
+#, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "не могу да уклоним привремену датотеку „%s“"
+msgstr "не могу да направим излазну датотеку „%s“"
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "не могу да уклоним привремени директоријум „%s“"
+msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "грешка писања"
+msgstr "грешка уписа"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr "причувавам овлашћења за %s"
-
-#: gnulib-lib/copy-file.c:189
-#, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "не могу да отворим датотеку резерве „%s“ за упис"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "не могу да отворим резервну датотеку „%s“ ради уписа"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "грешка читања „%s“"
+msgid "error reading \"%s\""
+msgstr "грешка при читању „%s“"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "грешка писања „%s“"
+msgid "error writing \"%s\""
+msgstr "грешка при упису „%s“"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "грешка након читања „%s“"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
-msgstr "није успела функција „fdopen()“"
+msgstr "неуспешан fdopen()"
 
 #: gnulib-lib/csharpcomp.c:571
-#, c-format
+#, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "нисам нашао Ц# преводиоца, покушајте да инсталирате пнет"
+msgstr ""
+"Нисам нашао Јава преводилац, покушајте да инсталирате gcj или поставите "
+"$JAVAC"
 
 #: gnulib-lib/csharpexec.c:343
-#, c-format
+#, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "нисам нашао Ц# виртуелну машину, покушајте да инсталирате пнет"
+msgstr ""
+"Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
+"поставите $JAVA"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
-msgstr "Непозната грешка система"
+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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "%s потпроцес није успео"
+msgstr "%s: неуспешан подпроцес"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опција „%s“ је нејасна; могућности:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: опција „%s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+msgstr "%s: опција „--%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
+msgstr "%s: опција „%c%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: опција „--%s“ захтева аргумент\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: непозната опција „--%s“\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: непозната опција „%c%s“\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: неисправна опција -- „%c“\n"
+msgstr "%s: неисправна опција -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: опција захтева аргумент -- „%c“\n"
+msgstr "%s: опција захтева аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ је нејасна\n"
+msgstr "%s: опција „-W %s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опција „-W %s“ захтева аргумент\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "неисправан аргумент издања_извора за преведи_јава_разред"
+msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "неисправан аргумент издања_мете за преведи_јава_разред"
+msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "нисам успео да направим „%s“"
+msgstr "не могу да направим „%s“"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "грешка приликом писања датотеке „%s“"
+msgstr "грешка при писању датотеке „%s“"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"Нисам нашао Јава преводиоца, покушајте да инсталирате гцј или поставите "
-"„$JAVAC“"
+"Нисам нашао Јава преводилац, покушајте да инсталирате gcj или поставите "
+"$JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"Нисам нашао виртуелну машину Јаве, покушајте да инсталирате гиј или да "
-"поставите „$JAVA“"
+"Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
+"поставите $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "У/И грешка %s потпроцеса"
+msgstr "У/И грешка подпроцеса %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr "меморија је потрошена"
-
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr "стварање нити није успело"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "писање у %s потпроцес није успело"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "читање из %s потпроцеса није успело"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "не могу да поставим неблокирајући У/И за потпроцес %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "комуницирање са %s потпроцесом није успело"
+msgstr "меморија исцрпљена"
 
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s потпроцес је окончан са излазном шифром %d"
+msgid "cannot create pipe"
+msgstr "не могу да направим цевку"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "„"
+msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "“"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "не могу да направим спојку"
+msgstr ""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "„_open_osfhandle“ није успело"
+msgstr "неуспешан _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "не могу да повратим фд %d: „dup2“ није успело"
+msgstr "не могу да направим излазну датотеку „%s“"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "%s потпроцес"
+msgstr "подпроцес од %s"
 
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "%s потпроцес је добио кобни сигнал %d"
+msgstr "подпроцес од %s је примио кобни сигнал %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "грешка приликом отварања „%s“ за читање"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "„%s“ није исправна ниска записа %s, није исто као „%s“. Разлог: %s"
+msgstr "„%s“ није исправна ниска формата %s, за разлику од „msgid“. Разлог: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "особеност записа за %u. аргумент, као у „%s“, не постоји у „%s“"
+msgstr ""
+"спецификација формата за %u. аргумент, као у „%s“, не постоји у „msgid“"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "особеност записа за %u. аргумент не постоји у „%s“"
+msgstr "спецификација формата за %u. аргумент не постоји у „%s“"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "спецификације записа у „%s“ и „%s“ за %u. аргумент нису исте"
+msgstr "спецификације формата у „msgid“ и „%s“ за %u. аргумент нису исте"
 
 #: src/format-boost.c:449
-#, c-format
+#, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Број одреднице %u почиње са | али се не завршава са |."
+msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"У смерници број %u, члан након „<“ не представља назив макроа спецификације "
-"записа. Исправни називи макроа су пописани у ИСО Це 99, одељак 7.8.1."
+"У %u. директиви, члан након „<“ не представља име макроа спецификације "
+"формата. Исправна имена макроа су пописана у ИСО Це 99, одељак 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "У смерници број %u, члан након „<“ није праћен „>“."
+msgstr "У %u. директиви, члан након „<“ није праћен „>“."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Ниска упућује на %u. аргумент, али занемарује %u. аргумент."
+msgstr "Ниска позива %u. аргумент, али занемарује %u. аргумент."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "не подудара се број особености записа у „%s“ и „%s“"
+msgstr "не поклапа се број спецификација формата у „msgid“ и „%s“"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "У смерници број %u, иза { не следи број аргумента."
+msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
 
 #: src/format-csharp.c:109
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "У смерници број %u, иза , не следи број аргумента."
+msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Ниска се завршава у сред смернице: нађох { без одговарајуће }."
+msgstr "Ниска се завршава усред директиве: нађох „{“ без одговарајућег „}“."
 
 #: src/format-csharp.c:139
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Смерница број %u се завршава неисправним знаком „%c“ уместо }."
+msgstr "У %u. директиви, знак „%c“ не представља цифру између 1 и 9."
 
 #: src/format-csharp.c:140
-#, c-format
+#, fuzzy, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Смерница број %u се завршава неисправним знаком уместо }."
+msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
-msgstr "Ниска почиње у сред смернице: нађох } без одговарајуће {."
+msgstr "Ниска почиње усред директиве: нађох „}“ без одговарајућег „{“."
 
 #: src/format-csharp.c:162
-#, c-format
+#, fuzzy, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Ниска садржи усамљену } након смернице број %u."
+msgstr "Ниска се завршава усред директиве."
 
 #: src/format-gcc-internal.c:255
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "У смерници број %u, комбинација обележја није исправна."
+msgstr "У %u. директиви, %d. аргумент је негативан."
 
 #: src/format-gcc-internal.c:292
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "У смерници број %u, тачност није дозвољена пре „%c“."
+msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
 #: src/format-gcc-internal.c:334
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
-msgstr "У смерници број %u, број аргумента за тачност мора бити једнак %u."
+msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
 
 #: src/format-gcc-internal.c:398
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
-msgstr "У смерници број %u, особеност тачности није дозвољена пре „%c“."
+msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
 #: src/format-gcc-internal.c:406
-#, c-format
+#, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "У смерници број %u, особеност тачности није исправна."
+msgstr "У %u. директиви, %d. аргумент је негативан."
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "У смерници број %u, обележја нису дозвољена пре „%c“."
+msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "„%s“ користи %%m али „%s“ не"
+msgstr ""
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "„%s“ не користи %%m али „%s“ користи %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "„%s“ користи %%C али „%s“ не"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "„%s“ не користи %%C али „%s“ користи %%C"
+msgstr ""
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "Ниска се завршава у сред смернице."
+msgstr "Ниска се завршава усред директиве."
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"Ниска упућује на аргументе и помоћу апсолутног броја аргумента и помоћу "
-"обичних особености аргумената."
+"Ниска се позива на аргументе и помоћу апсолутног броја аргумента и помоћу "
+"обичних спецификација аргумената."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "У смерници број %u, аргумент са бројем 0 није позитиван цео број."
+msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
 
 #: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
-msgstr "У смерници број %u, број 0 аргумента ширине није позитиван цео број."
+msgstr "У %u. директиви, ширина нултог аргумента није позитиван цео број."
 
 #: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
-msgstr "У смерници број %u, број 0 аргумента тачности није позитиван цео број."
+msgstr "У %u. директиви, прецизност нултог аргумента није позитиван цео број."
 
 #: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
-msgstr "У смерници број %u, знак „%c“ није исправан одредник претварања."
+msgstr ""
+"У %u. директиви, знак „%c“ не представља исправну ознаку за претварање."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -523,12 +466,12 @@
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
-"Знак којим се завршава смерница број %u није исправан одредник претварања."
+"Знак који завршава %u. директиву не представља исправну ознаку за претварање."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Ниска упућује на аргумент бр. %u на несагласне начине."
+msgstr "Ниска се позива на %u. аргумент на несагласне начине."
 
 #: src/format-java.c:240
 #, c-format
@@ -536,19 +479,18 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"У смерници број %u, подниска „%s“ не представља исправан стил датума и "
-"времена."
+"У %u. директиви, подниска „%s“ не представља исправан стил датума и времена."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "У смерници број %u, након „%s“ не следи запета."
+msgstr "У %u. директиви, „%s“ није праћено запетом."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "У смерници број %u, подниска „%s“ не представља исправан стил бројева."
+msgstr "У %u. директиви, подниска „%s“ не представља исправан стил бројева."
 
 #: src/format-java.c:323
 #, c-format
@@ -556,38 +498,38 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"У смерници број %u, након броја аргумента не следи запета и неки од „%s“, "
-"„%s“, „%s“, „%s“."
+"У %u. директиви, број аргумента није праћен запетом и неким од „%s“, „%s“, "
+"„%s“, „%s“."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "У смерници број %u, избор не садржи број."
+msgstr "У %u. директиви, избор не садржи број."
 
 #: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
-msgstr ""
-"У смерници број %u, избор садржи број након кога не следи „<“, „#“ или „%s“."
+msgstr "У %u. директиви, избор садржи број који није праћен „<“, „#“ или „%s“."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "особеност записа за аргумент {%u}, као у „%s“, не постоји у „%s“"
+msgstr ""
+"спецификација формата за аргумент {%u}, као у „%s“, не постоји у „msgid“"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "особеност записа за аргумент {%u} не постоји у „%s“"
+msgstr "спецификација формата за аргумент {%u} не постоји у „%s“"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "спецификације записа у „%s“ и „%s“ за аргумент {%u} нису исте"
+msgstr "нису једнаке спецификације формата у „msgid“ и „%s“ за аргумент {%u}"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -596,8 +538,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"У смерници број %u, параметар %u је врсте „%s“ али је очекиван параметар "
-"врсте „%s“."
+"У %u. директиви, %u. параметар је типа „%s“ а очекиван је параметар типа "
+"„%s“."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -608,66 +550,64 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"У смерници број %u, дато је превише параметара; очекивах највише %u "
-"параметар."
+"У %u. директиви, дато је превише параметара; очекивах највише %u параметар."
 msgstr[1] ""
-"У смерници број %u, дато је превише параметара; очекивах највише %u "
-"параметра."
+"У %u. директиви, дато је превише параметара; очекивах највише %u параметра."
 msgstr[2] ""
-"У смерници број %u, дато је превише параметара; очекивах највише %u "
-"параметара."
+"У %u. директиви, дато је превише параметара; очекивах највише %u параметара."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "У смерници број %u, након „%c“ не следи цифра."
+msgstr "У %u. директиви, „%c“ није праћено цифром."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "У смерници број %u, %d. аргумент је негативан."
+msgstr "У %u. директиви, %d. аргумент је негативан."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "Ниска се завршава у сред смернице ~/.../."
+msgstr "Ниска се завршава усред директиве ~/.../."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Нађох „~%c“ без поклапања „~%c“."
+msgstr "Нађох „~%c“ без одговарајућег „~%c“."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "У смерници број %u, дата су оба измењивача „@“ и „:“."
+msgstr "У %u. директиви, дата су оба измењивача „@“ и „:“."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
-msgstr "У смерници број %u, након „~:[“ не следе две наредбе, раздвојене „~;“."
+msgstr ""
+"У %u. директиви, „~:[“ није праћено са две наредбе, раздвојене помоћу „~;“."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "У смерници број %u, „~;“ се користи на неисправном положају."
+msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Ниска упућује на неке аргументе на несагласан начин."
+msgstr "Ниска се позива на неке аргументе на несагласан начин."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "спецификације записа у „%s“ и „%s“ нису еквивалентне"
+msgstr "спецификације формата у „msgid“ и „%s“ нису еквивалентне"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "спецификакције записа у „%s“ не представљају подскуп оних из „%s“"
+msgstr "спецификакције формата у „%s“ не представљају подскуп оних из „msgid“"
 
 #: src/format-perl.c:433
 #, c-format
@@ -675,79 +615,54 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"У смерници број %u, одредник величине је несагласан са одредником претварања "
-"„%c“."
+"У %u. директиви, ознака величине је несагласна са ознаком претварања „%c“."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "особеност записа за аргумент „%s“ не постоји у „%s“"
+msgstr "спецификација формата за аргумент „%s“ не постоји у „%s“"
 
 #: 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:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Ниска упућује на аргумент назива „%s“ на несагласне начине."
+msgstr "Ниска позива аргумент са именом „%s“ на несагласне начине."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "особеност записа у „%s“ очекује мапирање, а они у „%s“ очекују н-торку"
+msgstr ""
+"спецификација формата у „msgid“ очекује мапирање, а они у „%s“ очекују н-"
+"торку"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "особеност записа у „%s“ очекује н-торку, а они у „%s“ очекују мапирање"
+msgstr ""
+"спецификација формата у „msgid“ очекује н-торку, а они у „%s“ очекују "
+"мапирање"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "особеност записа за аргумент „%s“, као у „%s“, не постоји у „%s“"
+msgstr ""
+"спецификација формата за аргумент „%s“, као у „%s“, не постоји у „msgid“"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "спецификације записа у „%s“ и „%s“ за аргумент „%s“ нису исте"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "У смерници број %u, „%c“ не не може да започне назив поља."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "У смерници број %u, „%c“ не не може да започне аргумент „getattr“."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "У смерници број %u, „%c“ не не може да започне аргумент „getitem“."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"У смерници број %u, није дозвољено више угнежђавања у одреднику записа."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "У смерници број %u, постоји неокончана смерница записа."
+msgstr "нису исте спецификације формата у „msgid“ и „%s“ за аргумент „%s“"
 
 #: src/format-qt.c:152
 #, c-format
@@ -755,19 +670,17 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"„%s“ је ниска обичног записа, али „%s“ није: садржи „L“ обележје или "
-"двоцифрени број аргумента"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Ниска упућује на променљиву љуске помоћу не-АСКРИ назива."
+msgstr "Ниска позива променљиву љуске помоћу не-АСКРИ имена."
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Ниска упућује на променљиву љуске помоћу сложене синтаксе заграда љуске. Ова "
+"Ниска позива променљиву љуске помоћу сложене синтаксе заграда љуске. Ова "
 "синтакса овде није подржана из безбедносних разлога."
 
 #: src/format-sh.c:83
@@ -775,32 +688,32 @@
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"Ниска упућује на променљиву љуске чија вредност може бити другачија у "
-"функцијама љуске."
+"Ниска позива променљиву љуске чија вредност може бити другачија у функцијама "
+"љуске."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Ниска упућује на променљиву љуске празног назива."
+msgstr "Ниска позива променљиву љуске празног имена."
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "У смерници број %u, знак „%c“ не представља цифру између 1 и 9."
+msgstr "У %u. директиви, знак „%c“ не представља цифру између 1 и 9."
 
 #: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
-msgstr "Знак којим се завршава смерница број %u није цифра између 1 и 9."
+msgstr "Знак који завршава %u. директиву није цифра између 1 и 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -808,209 +721,207 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Ауторска права (C) %s Задужбина слободног софтвера, Инк.\n"
-"Лиценца ОЈЛв3+: ГНУ ОЈЛ издање 3 или касније <http://gnu.org/licenses/gpl.html>.\n"
-"Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
-"Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Написао је %s.\n"
+msgstr "Написа %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "Бруно Хејбл"
+msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "Испишите назив рачунара.\n"
+msgstr "Испиши име машине.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "Запис излаза:\n"
+msgstr "Излазни облик:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 кратак назив рачунара\n"
+msgstr "  -s, --short                 кратко име рачунара\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          дуги назив рачунара, садржи пуни назив домена\n"
-"                              и надимке\n"
+"  -f, --fqdn, --long          дуго име рачунара, садржи пуно име домена и \n"
+"                                надимке\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            адресе за назив рачунара\n"
+msgstr "  -i, --ip-address            адресе за име рачунара\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Обавештајни излаз:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  приказује ову помоћ и излази\n"
+msgstr "  -h, --help                  прикажи ову помоћ и заврши\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               исписује податке о издању и излази\n"
+msgstr "  -V, --version               испиши податке о издању и заврши\n"
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Пријавите грешке на <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "не могу да добавим назив рачунара"
+msgstr "не могу да сазнам име домаћина"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
-msgstr "дозвољена је само једна улазна датотека"
+msgstr "дозвољена највише једна улазна датотека"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s и %s се међусобно искључују"
+msgstr "%s и %s су међусобно искључиви"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗНАДАТОТЕКА]\n"
+msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"Издвајајте поруке каталога превода према њиховим особинама, и управљајте\n"
+"Филтрира поруке каталога превода према њиховим особинама, и барата\n"
 "тим особинама.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr ""
-"Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
+msgstr "Обавезни аргументи дугих опција су обавезни и за кратке опције.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
-msgstr "Место улазне датотеке:\n"
+msgstr "Путања до улазне датотеке:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  УЛАЗНАДАТОТЕКА              улазна по датотека\n"
+msgstr "  УЛАЗНА-ДАТОТЕКА             улазна PO датотека\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=ДИР         додаје ДИР у списак за тражење улазних "
+"  -D, --directory=ДИР         додај ДИР у списак за тражење улазних "
 "датотека\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Ако није дата улазна датотека или ако је „-“, чита стандардни улаз.\n"
+msgstr ""
+"Уколико није дата улазна датотека или је „-“, чита се стандардни улаз.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Место излазне датотеке:\n"
+msgstr "Путања излазне датотеке:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=ДАТОТЕКА  исписује излаз у наведену датотеку\n"
+msgstr "  -o, --output-file=ДАТОТЕКА  испиши излаз у наведену датотеку\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1018,173 +929,145 @@
 msgstr ""
 "Резултати се пишу на стандардни излаз ако није наведена излазна датотека "
 "или\n"
-"ако је „-“.\n"
+"ако је она „-“.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор поруке:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated               задржава преведене, уклања непреведене "
-"поруке\n"
+"      --translated            задржи преведене, уклони непреведене поруке\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated             задржава непреведене, уклања преведене "
-"поруке\n"
+"      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr ""
-"      --no-fuzzy                 уклања поруке означене као „нејасне“\n"
+msgstr "      --no-fuzzy              уклони поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr ""
-"      --only-fuzzy               задржава поруке означене као „нејасне“\n"
+msgstr "      --only-fuzzy            задржи поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete              уклања застареле поруке #~\n"
+msgstr "      --no-obsolete           уклони застареле поруке #~\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete            задржава застареле поруке #~\n"
+msgstr "      --only-obsolete         задржи застареле поруке #~\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "Управљање особинама:\n"
+msgstr "Баратање особинама:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy                означава све поруке као „нејасне“\n"
+msgstr "      --set-fuzzy             означи све поруке као „нејасне“\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr ""
-"      --clear-fuzzy              означава све поруке као не-„нејасне“\n"
+msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete             означава све поруке као застареле\n"
+msgstr "      --set-obsolete          означи све поруке као застареле\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr ""
-"      --clear-obsolete           означава све поруке као не-застареле\n"
+msgstr "      --clear-obsolete        означи све поруке као не-застареле\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous                 када означава „нејасне“, задржава претходни "
-"„msgids“\n"
-"                                 преведених порука.\n"
-
-#: src/msgattrib.c:478
-#, c-format
+#: src/msgattrib.c:461
+#, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
-msgstr ""
-"      --clear-previous           уклања претходни „msgid“ сасвих порука\n"
+msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 када уклања „нејасне“, такође подешава "
-"„msgstr“ празним\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=ДАТОТЕКА.po    управља једино пољима уписаним у ДАТОТЕЦИ."
-"po\n"
+"      --only-file=ДАТОТЕКА.po  баратај једино пољима уписаним у ДАТОТЕКА.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=ДАТОТЕКА.po  управља једино пољима која нису у ДАТОТЕЦИ."
+"      --ignore-file=ДАТОТЕКА.po  баратај једино пољима која нису у ДАТОТЕКА."
 "po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr ""
-"      --fuzzy                    исто што и --only-fuzzy --clear-fuzzy\n"
+msgstr "      --fuzzy                 исто што и --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete                 исто што и --only-obsolete --clear-"
-"obsolete\n"
+"      --obsolete              исто што и --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Склоп улазне датотеке:\n"
+msgstr "Синтакса улазне датотеке:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input         улазна датотека је у склопу „Јава ."
-"properties“\n"
+"  -P, --properties-input      улазна датотека је у синтакси Јава ."
+"properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input        улазна датотека је у склопу „NeXTstep/"
+"      --stringtable-input     улазна датотека је у синтакси NeXTstep/"
 "GNUstep\n"
-"                                 .strings“\n"
+"                              .strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
-msgstr "Појединости излаза:\n"
+msgstr "Детаљи излаза:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1192,145 +1075,132 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                    увек користи боје и остале особине текста\n"
-"      --color=КАДА               користи боје и остале особине текста ако је "
-"КАДА.\n"
-"                                 КАДА може бити „always“ (увек), "
-"„never“ (никада),\n"
-"                                 „auto“ (самостално), или „html“.\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
-"      --style=ИЗГЛЕДДАТОТЕКЕ     наводи датотеку правила ЦСС изгледа за --"
-"color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape                не користи Ц знаке промене реда у излазу "
-"(задато)\n"
+"  -e, --no-escape             не користи C истицање у излазу "
+"(подразумевано)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                   користи Ц знаке промене реда у излазу, без "
-"проширених знакова\n"
+"  -E, --escape                користи C истицање у излазу, без проширених \n"
+"                              знакова\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr ""
-"      --force-po                 записује по датотеку чак и ако је празна\n"
+msgstr "      --force-po              испиши ПО датотеку чак и ако је празна\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
-"  -i, --indent                   записује .по датотеку користећи увучени "
-"изглед\n"
+"  -i, --indent                испиши ПО датотеку користећи стил увлачења\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location              не исписује редове „#: датотека:ред“\n"
+msgstr "      --no-location           не исписуј редове „#: датотека:ред“\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location             образује редове „#: датотека:"
+"  -n, --add-location          образуј редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                   исписује .по датотеку изричито складну са "
+"      --strict                испиши ПО датотеку строго сагласну са "
 "Унифорумом\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr ""
-"  -p, --properties-output        исписује датотеку „Јава .properties“\n"
+msgstr "  -p, --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-output       исписује датотеку „NeXTstep/GNUstep ."
-"strings“\n"
+"      --stringtable-output    испиши NeXTstep/GNUstep .strings датотеку\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=БРОЈ               поставља ширину излазне странице\n"
+msgstr "  -w, --width=БРОЈ            постави ширину излазне странице\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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"
-"                                 излазне странице, на неколико редова\n"
-
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+"      --no-wrap               не преламај дуге редове порука, дуже од "
+"ширине \n"
+"                              излазне странице, у више редова\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output              ствара уређени излаз\n"
+msgstr "  -s, --sort-output           образуј поређани излаз\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file             ређа излаз према месту датотеке\n"
+msgstr "  -F, --sort-by-file          поређај излаз по положају у датотеци\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "наведен је немогућ услов избора (%d < n < %d)"
+msgstr "дат је немогућ критеријум избора (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗНАДАТОТЕКА]...\n"
+msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1339,123 +1209,122 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"Прилепите и стопите наведене ПО датотеке.\n"
-"Пронађите поруке које су заједничке за две или више ПО датотека.\n"
-"Употребом опције „--more-than“, можете тражити већу учесталост пре исписа\n"
-"порука.  Насупрот томе, опцију „--less-than“ можете користити за тражење\n"
-"мање учесталости пре исписа порука (нпр. „--less-than=2“ ће исписати само \n"
-"јединствене поруке).  Преводи, примедбе, извучене примедбе и положаји\n"
-"датотека ће се збрајати, осим ако не користите „--use-first“, тада се\n"
-"узимају из прве ПО датотеке која их одређује.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
+"Прилепљује и спаја наведене ПО датотеке.\n"
+"Проналати поруке које су заједничке за две или више ПО датотеке.\n"
+"Употребом опције --more-than, може се тражити већа учесталост пре исписа\n"
+"порука.  Насупрот томе, опција --less-than се може користити за тражење\n"
+"мање учесталости пре исписа порука (нпр. --less-than=2 ће исписати само \n"
+"јединствене поруке).  Преводи, примедбе и извучене примедбе се гомилају,\n"
+"осим ако се користи --use-first, када се узимају из прве ПО датотеке \n"
+"која их дефинише. Положаји у датотекама из свих ПО датотека се гомилају.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  УЛАЗНАДАТОТЕКА ...          улазне датотеке\n"
+msgstr "  УЛАЗНА-ДАТОТЕКА ...         улазне датотеке\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
-"  -f, --files-from=ДАТОТЕКА   добавља списак улазних датотека из ДАТОТЕКЕ\n"
+"  -f, --files-from=ДАТОТЕКА   преузми списак улазних датотека из ДАТОТЕКА\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
-msgstr "Ако је улазна датотека „-“, чита се стандардни улаз.\n"
+msgstr "Уколико је улазна датотека „-“, чита се стандардни улаз.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"  -<, --less-than=БРОЈ        исписује поруке са мање од оволико одредница,\n"
-"                              подразумева се бесконачно ако није постављено\n"
+"  -<, --less-than=БРОЈ        испиши поруке са мање од оволико дефиниција,\n"
+"                              уобичајено је бесконачно ако није постављено\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  -<, --more-than=БРОЈ        исписује поруке са више од оволико одредница,\n"
-"                              подразумева се 0 ако није постављено\n"
+"  -<, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
+"                              уобичајено је 0 ако није постављено\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                скраћеница за „--less-than=2“, захтева\n"
-"                              штампање само јединствених порука\n"
+"  -u, --unique                скраћено за --less-than=2, захтева да\n"
+"                              се испишу једино јединствене поруке\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      улазне датотеке су у синтакси „Јава ."
-"properties“\n"
+"  -P, --properties-input      улазне датотеке користе синтаксу за Јава ."
+"properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     улазне датотеке су у синтакси „NeXTstep/"
+"      --stringtable-input     улазне датотеке користе синтаксу за NeXTstep/"
 "GNUstep \n"
-"                              .strings“\n"
+"                              .strings датотеке\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=НАЗИВ         кодирање за излаз\n"
+msgstr "  -t, --to-code=ИМЕ           кодирање за излаз\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 "      --use-first             користи први доступни превод за сваку поруку,\n"
-"                              не спаја више превода\n"
+"                              не спајај више превода\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
-msgstr "Питер Милер"
+msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
-msgstr "нема улазних датотека"
+msgstr "нису дате улазне датотеке"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "потребне су тачно 2 улазне датотеке"
+msgstr "неопходне су тачно две улазне датотеке"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Употреба: %s [МОГУЋНОСТ] деф.po реф.pot\n"
+msgstr "Употреба: %s [ОПЦИЈА] подр.po реф.pot\n"
 
 #: src/msgcmp.c:218
 #, c-format, no-wrap
@@ -1467,82 +1336,83 @@
 "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 ""
-"Поредите две ПО датотеке Унифорум стила да проверите да ли обе садрже\n"
-"исти скуп оригиналних ниски.  Датотека деф.po је постојећа ПО датотека\n"
-"са преводима.  Датотека реф.pot је последња направљена ПО датотека или\n"
-"ПО шаблон (обично направљен „xgettext“-ом).  Ово је корисно да проверите\n"
-"да ли сте превели сваку поруку вашег програма.  Када неко тачно поклапање\n"
-"не може бити пронађено, користи се нејасно поклапање ради боље дијагностике.\n"
+"Пореди две ПО датотеке Унифорум стила ради провере да ли оба садрже исти\n"
+"скуп оригиналних ниски.  Датотека подр.po је постојећа ПО датотека са \n"
+"преводима.  Датотека реф.pot је последње направљена ПО датотека или ПО шаблон\n"
+"(обично направљен помоћу xgettext-а).  Ово је корисно за проверу да ли сте \n"
+"превели баш сваку поруку вашег програма.  Када не може да нађе тачно \n"
+"поклапање, користи се нејасно поклапање ради боље дијагностике.\n"
 
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      преводи\n"
+msgstr "  подр.po                     преводи\n"
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     упуте на изворе\n"
+msgstr "  реф.pot                     референце на изворне поруке\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Измењивачи рада:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
-"  -m, --multi-domain          примењује реф.pot на сваки домен у деф.po\n"
+"  -m, --multi-domain          примени реф.pot на сваки домен у подр.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     не користи нејасно поклапање\n"
 
 #: src/msgcmp.c:245
-#, c-format
+#, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             узима у обзир нејасне ставке\n"
+msgstr "  -f, --use-fuzzy             користи нејасне преводе у излазу\n"
 
 #: src/msgcmp.c:247
-#, c-format
+#, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      узима у обзир непреведене ставке\n"
+msgstr ""
+"      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
 #: src/msgcmp.c:324
-#, c-format
+#, fuzzy, c-format
 msgid "this message is untranslated"
-msgstr "ова порука није преведена"
+msgstr "упозорење: ова порука се не користи"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "ову поруку би преводилац требао да прегледа"
+msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "ова порука се користи али није одређена..."
+msgstr "ова порука се користи али није дефинисана..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...али ова одредница је слична"
+msgstr "...али ова дефиниција је слична"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "ова порука се користи али није одређена у „%s“"
+msgstr "ова порука се користи али није дефинисана у %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1550,12 +1420,12 @@
 msgstr[1] "нађох %d кобне грешке"
 msgstr[2] "нађох %d кобних грешака"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
-msgstr "најмање две датотеке морају бити наведене"
+msgstr "обавезно је навести бар две датотеке"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1563,90 +1433,90 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Пронађите поруке које су заједничке за две или више ПО датотека.\n"
-"Употребом опције „--more-than“, можете тражити већу учесталост пре\n"
-"исписа порука.  Насупрот томе, опцију „--less-than“ можете користити\n"
-"за тражење мање учесталости пре исписа порука (нпр. „--less-than=2“\n"
-"ће исписати само јединствене поруке).  Преводи, примедбе и извучене\n"
-"примедбе ће бити сачуване, али само из прве ПО датотеке која их\n"
-"одређује.  Положаји датотека из свих ПО датотека ће се збрајати.\n"
+"Налази поруке заједничке за две или више ПО датотека. Употребом опције\n"
+"--more-than, захтева се већа учесталост пре исписа порука. Насупрот томе,\n"
+"опција --less-than се користи за мању учесталост пре исписа порука (нпр.\n"
+"--less-than=2 ће исписати само јединствене поруке).  Преводи, примедбе и\n"
+"извучене примедбе ће се очувати, али само из прве ПО датотеке која их \n"
+"дефинише.  Положаји у датотекама из свих ПО датотека ће се гомилати.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=БРОЈ        исписује поруке са више од оволико одредница,\n"
-"                              подразумева се 1 ако није постављено\n"
+"  ->, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
+"                              уобичајено је 1 ако није постављено\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           изоставља заглавље са пољем „msgid \"\"“\n"
+"      --omit-header           изостави заглавље са пољем „msgid \"\"“\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Претворите текст превода из једног кодирања у друго.\n"
+msgstr "Претвара каталог превода у друго кодирање знакова.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
-msgstr "Мета претварања:\n"
+msgstr "Одредиште претварања:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Задато кодирање је кодирање текућег локалитета.\n"
+msgstr "Подразумевано кодирање је кодирање текућег локалитета.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                увучени изглед излаза\n"
+msgstr "  -i, --indent                стил излаза са увлачењем\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           избацује редове „#: датотека:ред“\n"
+msgstr "      --no-location           избаци редове „#: датотека:ред“\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          чува редове „#: датотека:ред“ (основно)\n"
+"      --add-location          сачувај редове „#: датотека:"
+"ред“ (подразумевано)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                изричито Униорумски стил излаза\n"
+msgstr "      --strict                строги Унифорум стил исписа\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
-msgstr "није дата улазна датотека"
+msgstr "није наведена улазна датотека"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
-msgstr "потребна је тачно једна улазна датотека"
+msgstr "неопходна је тачно једна улазна датотека"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Употреба: %s [ОПЦИЈА]... УЛАЗНАДАТОТЕКА\n"
+msgstr "Употреба: %s [ОПЦИЈА] УЛАЗНА-ДАТОТЕКА\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1654,20 +1524,20 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Направите каталог енглеског превода.  Улазна датотека је последња\n"
-"направљена енглеска ПО датотека, или датотека ПО шаблона (обично\n"
-"направљена „xgettext“-ом). Непреведеним пољима се додељује превод\n"
-"идентичан са „msgid“.\n"
+"Образује каталог енглеског превода. Улазна датотека је последње \n"
+"направљена енглеска ПО датотека, или датотека са ПО шаблоном (обично\n"
+"направљена помоћу xgettext-а). Непреведена поља добијају превод \n"
+"идентичан са msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  УЛАЗНАДАТОТЕКА              улазна по или пот датотека\n"
+msgstr "  УЛАЗНА-ДАТОТЕКА             улазна PO или POT датотека\n"
 
 #: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr "недостаје назив наредбе"
+msgstr "недостаје име наредбе"
 
 #: src/msgexec.c:257
 #, c-format
@@ -1683,10 +1553,10 @@
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"Примените наредбу на све преводе у каталогу превода. НАРЕДБА може бити\n"
+"Примењује наредбу на све преводе у каталогу превода. НАРЕДБА може бити\n"
 "било који програм који чита превод са стандардног улаза. Покреће се по\n"
-"једном за сваки превод.  Његов излаз постаје улаз „msgexec“-а. Повратни\n"
-"код „msgexec“-а је највећи повратни код кроз све позиве програма.\n"
+"једном за сваки превод.  Његов излаз постаје улаз msgexec-а.  Повратни\n"
+"код msgexec-а је највећи повратни код кроз све позиве програма.\n"
 
 #: src/msgexec.c:271
 #, c-format, no-wrap
@@ -1697,159 +1567,142 @@
 "Нарочита уграђена наредба звана „0“ исписује превод, праћен нула-бајтом.\n"
 "Излаз „msgexec 0“ је погодан као улаз за „xargs -0“.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА улазна ПО датотека\n"
+msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА  улазна ПО датотека\n"
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "није успело писање на стандардни излаз"
+msgstr "неуспешан упис на стандардни излаз"
+
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "неуспешан упис у подпроцес %s"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
-msgstr "недостаје назив пропусника"
+msgstr "недостаје име филтера"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "најмање један седов спис мора бити наведен"
+msgstr "обавезно је навести бар један sed спис"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Употреба: %s [ОПЦИЈА] ПРОПУСНИК [ОПЦИЈА-ПРОПУСНИКА]\n"
+msgstr "Употреба: %s [ОПЦИЈА] ФИЛТЕР [ОПЦИЈЕ-ФИЛТЕРА]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Примените пропусник на све преводе из каталога превода.\n"
+msgstr "Примењује филтер на све преводе из каталога превода.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"ПРОПУСНИК може бити било који програм који чита превод са стандардног\n"
-"улаза и пише измењени превод на стандардни излаз.\n"
+"ФИЛТЕР може бити било који програм који чита превод са стандардног улаза\n"
+"и уписује измењени превод на стандардни излаз.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Корисне ОПЦИЈЕ-ПРОПУСНИКА када је сед ПРОПУСНИК:\n"
+msgstr "Корисне ОПЦИЈЕ-ФИЛТЕРа када је ФИЛТЕР „sed“:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-"  -e, --expression=СПИС       додаје СПИС наредбама да би биле извршене\n"
+msgstr "  -e, --expression=СПИС       додај СПИС међу наредбе за извршавање\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=ДАТОТЕКАСПИСА    додаје садржај ДАТОТЕКЕСПИСА наредбама\n"
-"                              да би биле извршене\n"
+"  -f, --file=ДАТОТЕКА-СПИСА   додај садржај ДАТОТЕКА-СПИСА међу наредбе\n"
+"                              које се извршавају\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       обуставља аутоматски испис простора образаца\n"
+"  -n, --quiet, --silent       избаци аутоматски испис простора шаблона\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             не користи Ц знаке промене реда у излазу "
-"(задато)\n"
+"      --no-escape             не користи C истицање у излазу "
+"(подразумевано)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                увучени изглед излаза\n"
+msgstr "      --indent                стил излаза са увлачењем\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           не мењај поље са заглављем, не филтрирај га\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "аргумент за „%s“ треба да буде знак једне тачке"
+msgstr "аргумент за %s треба да буде један интерпункцијски знак"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "неисправан поредак од мањег: %s"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
-msgstr "Улрих Дрепер"
-
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "не треба бити дата ниједна улазна датотека ако су наведени „%s“ и „%s“"
+msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "„%s“ захтева одредницу „-d директоријум“"
+msgstr "за %s је обавезно навести „-d директоријум“"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "„%s“ захтева одредницу „-l језик“"
+msgstr "за %s је обавезно навести „-l локалитет“"
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "„%s“ захтева одредницу „--template шаблон“"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "„%s“ захтева одредницу „-o датотека“"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "„%s“ и „%s“ се међусобно искључују у „%s“"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s је исправно само са %s или %s"
+msgstr "%s је једино исправно уз %s или %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s је исправно само са %s, %s или %s"
+msgstr "%s је једино исправно уз %s, %s или %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1857,15 +1710,15 @@
 msgstr[1] "%d преведене поруке"
 msgstr[2] "%d преведених порука"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d нејсан превод"
-msgstr[1] ", %d нејасна превода"
-msgstr[2] ", %d нејсаних превода"
+msgstr[0] ", %d нејасна порука"
+msgstr[1] ", %d нејасне поруке"
+msgstr[2] ", %d нејасних порука"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1873,136 +1726,116 @@
 msgstr[1] ", %d непреведене поруке"
 msgstr[2] ", %d непреведених порука"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЈА] датотека.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Створите бинарни каталог порука из текстуалног описа превода.\n"
+msgstr "Образуј бинарни каталог порука из текстуалног описа превода.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
-"Слично и за аргументе избора.\n"
+"Обавезни аргументи за дуге опције су обавезни и за кратке опције.\n"
+"Слично за необавезне аргументе.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  датотека.po ...             улазне датотеке\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
-msgstr "Начин рада:\n"
+msgstr "Режим рада:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  режим Јаве: ствара Јавин разред „Група "
-"изворишта“\n"
+"  -j, --java                  Јава режим: образуј Јава класу ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 као --java, и претпоставља Јаву2 (ЈДК 1.2 или "
+"      --java2                 налик --java, и претпостави Јава2 (JDK 1.2 или "
 "новији)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-"      --csharp                Ц# режим: ствара .НЕТ-ову „.dll“ датотеку\n"
+msgstr "      --csharp                C# режим: образуј .NET .dll датотеку\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      Режим Ц# изворишта: ствара .НЕТ-ову „."
-"resources“ датотеку\n"
+"      --csharp-resources      Режим са C# ресурсима: образује .NET ."
+"resources датотеку\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Тцл режим: ствара тцл/мсгкат-ову „.msg“ "
-"датотеку\n"
+"      --tcl                   Tcl режим: образуј tcl/msgcat .msg датотеку\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
-"      --qt                    Кут режим: ствара Кутову „.qm“ датотеку\n"
+msgstr "      --qt                    Qt режим: образуј Qt .qm датотеку\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               Режим Десктоп уноса: ствара „.desktop“ "
-"датотеку\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                укључује изричити режим Унифорума\n"
+msgstr "      --strict                омогући строг Унифорум режим\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Ако је излазна датотека -, излаз се записује на стандардни излаз.\n"
+msgstr "Уколико је излазна датотека „-“, испис се врши на стандардни излаз.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Путања излазне датотеке у Јава режиму:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=ИЗВОРИШТЕ    назив изворишта\n"
+msgstr "  -r, --resource=РЕСУРС       име ресурса\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=ЛОКАЛИТЕТ      назив локалитета, било језик или језик_ДРЖАВА\n"
+"  -l, --locale=ЛОКАЛИТЕТ      име локалитета, или језик или језик_ДРЖАВА\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                ствара датотеку „.java“ уместо „.class“\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум за хијерархију \n"
-"                              директоријума разреда\n"
+"                              директоријума класе\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2010,46 +1843,44 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Назив разреда се одређује придодавањем назива локалитета на назив "
-"изворишта,\n"
-"раздвојено подвлаком.  Опција -d је обавезна.  Разред се уписује под\n"
+"Име класе се одређујем надодавањем имена локалитета на име ресурса,\n"
+"раздвојено подвлаком.  Опција -d је обавезна.  Класа се уписује под\n"
 "наведеним директоријумом.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "Путања излазне датотеке у Ц# режиму:\n"
+msgstr "Путања излазне датотеке у C# режиму:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
-"  -d ДИРЕКТОРИЈУМ             основни директоријум за .dll датотеке од "
-"локалитета зависне\n"
+"  -d ДИРЕКТОРИЈУМ             основни директоријум за .dll за локалитет\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"Опције -l и -d су обавезне.  Датотека .dll се уписује у поддиректоријум\n"
-"датог директоријума чији назив зависи од локалитета.\n"
+"Опције -l и -d су обавезне.  Датотека .dll се уписује у поддиректоријум \n"
+"датог директоријума чије име зависи од локалитета.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Путања излазне датотеке у Тцл режиму:\n"
+msgstr "Путања излазне датотеке у Tcl режиму:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
-"  -d ДИРЕКТОРИЈУМ             основни директоријум каталога .msg порука\n"
+"  -d ДИРЕКТОРИЈУМ             основни директоријум .msg каталога порука\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2057,230 +1888,163 @@
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .msg се уписује у дати директоријум.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Могућности режима Десктоп уноса:\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-"  --template=ШАБЛОН                 „.desktop“ датотека која се користи као "
-"шаблон\n"
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d ДИРЕКТОРИЈУМ                   основни директоријум „.po“ датотека\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kРЕЧ, --keyword=РЕЧ              тражи РЕЧ као додатну кључну реч\n"
-"  -k, --keyword                     не користи задате кључне речи\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Опције „-l“, „-o“ и „--template“ су обавезне.  Ако је наведено „-D“, улазне\n"
-"датотеке се читају из директоријума уместо из аргумената линије наредби.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Тумачење улазне датотеке:\n"
+msgstr "Обрада улазне датотеке:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
 "domain\n"
 msgstr ""
-"  -c, --check                      извршава све провере које подразумевају\n"
-"                                   --check-format, --check-header, --check-"
+"  -c, --check                 изврши све провере које подразумевају\n"
+"                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
-"      --check-format               проверава ниске записа у зависности од "
-"језика\n"
+"      --check-format          провери ниске формата у зависности од језика\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
-msgstr ""
-"      --check-header               проверава присуство и садржај заглавља\n"
+msgstr "      --check-header          провери присуство и садржај заглавља\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain               проверава сукобе међу смерницама домена "
-"и\n"
-"                                   опције „--output-file“\n"
+"      --check-domain          провери сударе међу директивама домена и\n"
+"                                опције --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility        проверава да ли се Гнуов мсгфмт понаша "
-"као \n"
-"                                   Икс/Опен мсгфмт\n"
+"  -C, --check-compatibility   провери да ли се ГНУ msgfmt понаша као \n"
+"                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=ЗНАК]  проверава присуство пречица тастатуре "
-"у                                  ставкама изборника\n"
+"      --check-accelerators[=ЗНАК]  провери присуство пречица са тастатуре "
+"у \n"
+"                                ставкама менија\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy                  користи нејасне уносе на излазу\n"
+msgstr "  -f, --use-fuzzy             користи нејасне преводе у излазу\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=БРОЈ             поравнава ниске на БРОЈ бајтова (обично: "
-"%d)\n"
+"  -a, --alignment=БРОЈ        поравнај ниске на БРОЈ бајтова (обично: %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=ПОРЕДАКБАЈТОВА  пише 32-битне бројеве по датом редоследу "
-"бајтова\n"
-"                                   (велики или мали, у зависности од "
-"платформе)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
-"      --no-hash                    бинарна датотека неће садржати хеш "
-"табелу\n"
+"      --no-hash               бинарна датотека неће садржати хеш табелу\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics                 исписује статистику о преводима\n"
+msgstr "      --statistics            испиши статистичке податке о преводима\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose                    повећава ниво опширности\n"
+msgstr "  -v, --verbose               опширнији испис\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr "упозорење: заглавље по датотеке недостаје или је неисправно\n"
+msgstr "упозорење: недостаје или је неисправно заглавље PO датотеке\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "упозорење: претварање скупа знакова неће радити\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr "упозорење: заглавље по датотеке је нејасно\n"
+msgstr "упозорење: заглавље PO датотеке је нејасно\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "упозорење: старија издања мсгфмт-а ће овде наићи на грешку\n"
+msgstr "упозорење: старија издања msgfmt-а ће овде наићи на грешку\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "назив домена „%s“ није прикладан за назив датотеке"
+msgstr "име домена „%s“ није прикладно за име датотеке"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "назив домена „%s“ није прикладан за назив датотеке: користићу префикс"
+msgstr "име домена „%s“ није прикладно за име датотеке: користићу префикс"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "смерница „domain %s“ је занемарена"
+msgid "`domain %s' directive ignored"
+msgstr "занемарена директива „domain %s“"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "празан „msgstr“ унос је занемарен"
+msgid "empty `msgstr' entry ignored"
+msgstr "занемарен унос са празним „msgstr“"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "нејасан „msgstr“ унос је занемарен"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "занемарен нејасан „msgstr“ унос"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: упозорење: изворна датотека садржи нејасан превод"
-
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "Не постоји „%s“"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "„%s“ постоји али је не могу прочитати"
+msgstr "%s: упозорење: изворна датотека садржи нејасне преводе"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: src/msggrep.c:501
-#, c-format
+#: src/msggrep.c:496
+#, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"опција „%c“ се не може користити пре него што се наведе „J“ или „K“ или „T“ "
-"или „C“ или „X“"
+"опција „%c“ се не може користити пре него што се наведе „K“, „Т“ или „C“"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2289,8 +2053,8 @@
 "Извлачи све поруке из каталога превода које одговарају датом шаблону\n"
 "или припадају одређеним изворним датотекама.\n"
 
-#: src/msggrep.c:547
-#, c-format, no-wrap
+#: src/msggrep.c:542
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -2329,70 +2093,63 @@
 "                              selection criterion\n"
 msgstr ""
 "Избор поруке:\n"
-"  [-N ИЗВОРНАДАТОТЕКА]... [-M НАЗИВДОМЕНА]...\n"
-"  [-J МСГЦТХТ-ШАБЛОН] [-K МСГИД-ШАБЛОН] [-T МСГСТР-ШАБЛОН]\n"
-"  [-C ШАБЛОН-НАПОМЕНЕ] [-X ШАБЛОН-ИЗВУЧЕНЕ-НАПОМЕНЕ]\n"
-"Порука је изабрана ако долази из једне од наведених изворних датотека,\n"
-"или ако долази из из једног од наведених домена,\n"
-"или ако је дато -J и његов контекст (msgctxt) одговара МСГЦТХТ-ШАБЛОНУ,\n"
-"или ако је дато -K и његов кључ (msgid или msgid_plural) одговара МСГИД-ШАБЛОНУ,\n"
-"или ако је дато -T и његов превод (msgstr) одговара МСГСТР-ШАБЛОНУ,\n"
-"или ако је дато -C и напомена преводиоца одговара ШАБЛОНУ-НАПОМЕНЕ,\n"
-"или ако је дато -X и извучена напомена одговараШАБЛОНУ-ИЗВУЧЕНЕ-НАПОМЕНЕ.\n"
+"  [-N ИЗВОР]... [-M ИМЕ-ДОМЕНА]...\n"
+"  [-K MSGID-ШАБЛОН] [-T MSGSTR-ШАБЛОН] [-C ШАБЛОН-ПРИМЕДБЕ]\n"
+"Порука се бира уколико долази из неке од изабраних изворних датотека, или\n"
+"ако долази из неког од наведених домена, или\n"
+"ако је дато -K и њен кључ (msgid или msgid_plural) одговара MSGID-ШАБЛОН, или\n"
+"ако је дато -T и њен превод (msgstr) одговара MSGSTR-ШАБЛОН, или\n"
+"ако је дато -C и примедба за преводиоце одговара ШАБЛОН-ПРИМЕДБЕ.\n"
 "\n"
-"Када је наведено више од једног услова избора, скуп изабраних порука\n"
-"је унија изабраних порука сваког услова.\n"
+"Када је наведено више од једног критеријума избора, скуп изабраних порука\n"
+"чини унију изабраних порука помоћу сваког критеријума.\n"
 "\n"
-"синтакса МСГЦТХТ-ШАБЛОНА или МСГИД-ШАБЛОНА или МСГСТР-ШАБЛОНА или ШАБЛОНА-НАПОМЕНЕ\n"
-"или ШАБЛОНА-ИЗВУЧЕНЕ-НАПОМЕНЕ:\n"
+"Синтакса за MSGID-ШАБЛОН или MSGSTR-ШАБЛОН:\n"
 "  [-E | -F] [-e ШАБЛОН | -f ДАТОТЕКА]...\n"
-"ШАБЛОНИ су подразумевано основни регуларни изрази, или проширени регуларни изрази\n"
-"ако је дато -E, или сталне ниске ако је дато -F.\n"
+"ШАБЛОНи су обично основни регуларни изрази, или проширени регуларни изрази\n"
+"када је дато -E, или дословне ниске када је дато -F.\n"
 "\n"
-"  -N, --location=ИЗВОРНАДАТОТЕКА   бира поруке извучене из ИЗВОРНЕДАТОТЕКЕ\n"
-"  -M, --domain=НАЗИВДОМЕНА         бира поруке које припадају домену НАЗИВДОМЕНА\n"
-"  -J, --msgctxt                    почетак шаблона за мсгцтхт\n"
-"  -K, --msgid                      почетак шаблона за мсгид\n"
-"  -T, --msgstr                     почетак шаблона за мсгстр\n"
-"  -C, --comment                    почетак шаблона за напомене преводиоца\n"
-"  -X, --extracted-comment          почетак шаблона за извучену напомену\n"
-"  -E, --extended-regexp            ШАБЛОН је проширени регуларни израз\n"
-"  -F, --fixed-strings              ШАБЛОН је скуп ниски раздвојених новим редом\n"
-"  -e, --regexp=ШАБЛОН              користи ШАБЛОН као регуларан израз\n"
-"  -f, --file=ДАТОТЕКА              доноси ШАБЛОН из ДАТОТЕКЕ\n"
-"  -i, --ignore-case                занемарује разликовање величине слова\n"
-"  -v, --invert-match               исписује само поруке које не одговарају\n"
-"                                   ни једном услову избора\n"
+"  -N, --location=ИЗВОР        изабери поруке извучене из ИЗВОРа\n"
+"  -M, --domain=ИМЕ-ДОМЕНА     изабери поруке које припадају домену ИМЕ-ДОМЕНА\n"
+"  -K, --msgid                 почетак шаблона за msgid\n"
+"  -T, --msgstr                почетак шаблона за msgstr\n"
+"  -C, --comment               почетак шаблона за примедбе преводиоцима\n"
+"  -E, --extended-regexp       ШАБЛОН је проширени регуларни израз\n"
+"  -F, --fixed-strings         ШАБЛОН је скуп ниски у посебним редовима\n"
+"  -e, --regexp=ШАБЛОН         користи ШАБЛОН као регуларни израз\n"
+"  -f, --file=ДАТОТЕКА         преузми ШАБЛОН из ДАТОТЕКА\n"
+"  -i, --ignore-case           занемари разлике величине слова\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                користи Ц знаке промене реда у излазу, без "
-"проширених знакова\n"
+"      --escape                користи C истицање у излазу, без проширених \n"
+"                              знакова\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           ствара уређени излаз\n"
+msgstr "      --sort-output           образуј поређан излаз\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          ређа излаз према месту датотеке\n"
+msgstr ""
+"      --sort-by-file          поређај излаз према положају у датотеци\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"Ви користите окружење независно од језика. Поставите променљиву \n"
-"окружења „LANG“, како је описано у датотеци „ABOUT-NLS“. Ово је\n"
+"Користите окружење независно од језика. Поставите променљиву \n"
+"окружења LANG, како је описано у датотеци ABOUT-NLS. Ово је\n"
 "неопходно ради испробавања ваших превода.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2403,91 +2160,91 @@
 "Наведите локалитет помоћу опције --locale или \n"
 "излазну ПО датотеку помоћу опције --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
-msgstr "Направио је %s.\n"
+msgstr "Направих %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
-"Стварам нову ПО датотеку, постављајући мета податке помоћу вредности из\n"
-"корисничког окружења.\n"
+"Образујем нову ПО датотеку, постављајући мета податке помоћу вредности из \n"
+"окружења корисника.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=УЛАЗНАДАТОТЕКА  улазна ПОТ датотека\n"
+msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА  улазна ПОТ датотека\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Уколико улазна датотека није дата, текући директоријум се претражује за\n"
-"ПОТ датотеком. Уколико је „-“, чита се стандардни улаз.\n"
+"Уколико није дата улазна датотека, тражићу ПОТ датотеку у текућем \n"
+"директоријуму. Уколико је „-“, читам стандардни улаз.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=ДАТОТЕКА  исписује излаз у наведену ПО датотеку\n"
+msgstr "  -o, --output-file=ДАТОТЕКА  испиши излаз у наведену ПО датотеку\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"Уколико излазна датотека није дата, зависи од опције „--locale“ или од\n"
-"подешавања корисничког локалитета. Ако је „-“, резултат се исписује на\n"
+"Уколико није дата излазна датотека, она зависи од опције --locale или од \n"
+"подешавања корисниковог локалитета. Ако је „-“, резултат исписујем на\n"
 "стандардни излаз.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=ЈЈ_ДД          поставља одредишни локалитет\n"
+msgstr "  -l, --locale=ЈЈ_ДД          постави одредишни локалитет\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         претпоставља да је ПО датотека самоизграђена\n"
+"      --no-translator         претпостави да је ПО датотека самоизграђена\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Нађох више од једне .пот датотеке.\n"
-"Наведите улазну .пот датотеку помоћу опције „--input“.\n"
+"Нађох више од једне .pot датотеке.\n"
+"Наведите улазну .pot датотеку помоћу опције --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
-msgstr "грешка читања текућег директоријума"
+msgstr "грешка при читању текућег директоријума"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"Не нађох .пот датотеку у текућем директоријуму.\n"
-"Наведите улазну .пот датотеку помоћу опције „--input“.\n"
+"Не нађох .pot датотеку у текућем директоријуму.\n"
+"Наведите улазну .pot датотеку помоћу опције --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "%s: потпроцес није успео са излазном шифром %d"
+msgstr "неуспешан подпроцес %s са повратним кодом %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2495,24 +2252,23 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Нови каталог порука треба да садржи адресу ваше ел. поште, како би "
-"корисници\n"
-"могли да вам дају примедбе на превод, и како би одржаваоци могли да вам се "
-"обрате\n"
-"у случају непредвиђених техничких проблема.\n"
+"Нови каталог порука треба да садржи вашу е-адресу, како би корисници могли "
+"да\n"
+"вам дају примедбе на превод, и како би одржаваоци могли да ступе са вама у \n"
+"везу у случају непредвиђених техничких проблема.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "Преводи на српски језик за пакет „%s“"
+msgstr "енглески преводи за пакет %s"
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "присутни скуп знакова „%s“ није назив преносивог кодирања"
+msgstr "присутни скуп знакова „%s“ не чини име преносивог кодирања"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
@@ -2522,13 +2278,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека „%s“ не садржи поље заглавља са ознаком скупа знакова"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "домен „%s“ у улазној датотеци „%s“ не садржи поље заглавља са ознаком скупа "
@@ -2537,11 +2293,11 @@
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "одредишни скуп знакова „%s“ није назив преносивог кодирања."
+msgstr "одредишни скуп знакова „%s“ није преносиво име за кодирање."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "упозорење: "
@@ -2552,8 +2308,7 @@
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Улазне датотеке садрже поруке у разним кодирањима, између осталих и у "
-"УТФ-8.\n"
+"Улазне датотеке садрже поруке у разним кодирањима, између осталих и УТФ-8.\n"
 "Претварам излаз у УТФ-8.\n"
 
 #: src/msgl-cat.c:449
@@ -2564,10 +2319,10 @@
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Улазне датотеке садрже поруке у разним кодирањима, између осталих и у %s и "
+"Улазне датотеке садрже поруке у разним кодирањима, између осталих у %s и "
 "%s.\n"
 "Претварам излаз у УТФ-8.\n"
-"Да изаберете другачије кодирање излаза, користите опцију „--to-code“.\n"
+"Да изаберете другачије кодирање излаза, користите опцију --to-code.\n"
 
 #: src/msgl-cat.c:488
 #, c-format
@@ -2577,10 +2332,6 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"Претварање датотеке „%s“ из %s кодирања у %s кодирање мења\n"
-"неке мсгид или мсгцтхт поруке.\n"
-"Или промените све мсгид и мсгцтхт поруке у чисти АСКРИ, или осигурајте\n"
-"да су од самог почетка кодиране у УТФ-8, тј. већ вашим изворним датотекама.\n"
 
 #: src/msgl-charset.c:93
 #, c-format
@@ -2592,13 +2343,13 @@
 msgstr ""
 "Скуп знакова „%s“ локалитета се разликује од \n"
 "улазног скупа знакова „%s“.\n"
-"Излаз за „%s“ може бити нетачан.\n"
+"Излаз „%s“-а може бити нетачан.\n"
 "Могућа решења су:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "— Поставите „LC_ALL“ на локалитет са кодирањем %s.\n"
+msgstr "- Поставите LC_ALL на локалитет са кодирањем %s.\n"
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2619,7 +2370,7 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"— Поставите „LC_ALL“ на локалитет са кодирањем %s,\n"
+"— Поставите LC_ALL на локалитет са кодирањем %s,\n"
 "  претворите каталог превода у %s помоћу „msgconv“,\n"
 "  затим примените „%s“,\n"
 "  и онда претворите назад у %s помоћу „msgconv“.\n"
@@ -2631,9 +2382,9 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Скуп знакова локалитета „%s“ не чини преносни назив кодирања.\n"
-"Излаз за „%s“ може бити нетачан.\n"
-"Могуће решење је да поставите „LC_ALL=C“.\n"
+"Скуп знакова локалитета „%s“ не чини преносно име кодирања.\n"
+"Излаз из „%s“-а може бити нетачан.\n"
+"Могуће решење је да поставите LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
@@ -2642,15 +2393,15 @@
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "„nplurals = %lu“ али израз за множине може дати чак и вредности %lu"
+msgstr "nplurals = %lu али израз за множине може дати чак и вредности %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
-msgstr "израз за множине може дати дељење нулом"
+msgstr "израз за множине може проузроковати дељење нулом"
 
 #: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
-msgstr "израз за множине може проузроковати прекорачење целих бројева"
+msgstr "израз за множине може проузроковати прекорачење опсега целих бројева"
 
 #: src/msgl-check.c:197
 msgid ""
@@ -2660,52 +2411,55 @@
 "израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
 
 #: src/msgl-check.c:266
-#, c-format
+#, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "Покушајте да користите следеће, исправно за %s:"
+msgstr "Покушајте да користите следеће, исправно за %s:\n"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
+#, fuzzy
 msgid "message catalog has plural form translations"
-msgstr "каталог порука садржи преводе облика за множину"
+msgstr "каталог порука садржи преводе облика за множину..."
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
+#, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "али у заглављу недостаје поље „plural=ИЗРАЗ“"
+msgstr "...али у заглављу недостаје поље „plural=ИЗРАЗ“"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
+#, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "али у заглављу недостаје поље „nplurals=БРОЈ“"
+msgstr "...али у заглављу недостаје поље „nplurals=БРОЈ“"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
-msgstr "неисправна вредност за број множина"
+msgstr "недозвољена вредност за nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
-msgstr "неисправан израз множине"
+msgstr "недозвољен израз за plural"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
+#: src/msgl-check.c:466 src/msgl-check.c:482
+#, fuzzy, c-format
 msgid "nplurals = %lu"
-msgstr "nplurals = %lu"
+msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:474
-#, c-format
+#: src/msgl-check.c:468
+#, 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 облик за множину"
+msgstr[0] "али неке поруке имају само један облик за множину"
 msgstr[1] "али неке поруке имају само %lu облика за множину"
 msgstr[2] "али неке поруке имају само %lu облика за множину"
 
-#: src/msgl-check.c:490
-#, c-format
+#: src/msgl-check.c:484
+#, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "али неке поруке имају %lu облик за множину"
+msgstr[0] "али неке поруке имају један облик за множину"
 msgstr[1] "али неке поруке имају %lu облика за множину"
 msgstr[2] "али неке поруке имају %lu облика за множину"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2713,78 +2467,87 @@
 "каталог порука садржи преводе облика множине, али нема поља заглавља „Plural-"
 "Forms: nplurals=БРОЈ; plural=ИЗРАЗ;“"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "„msgid“ и „msgid_plural“ не почињу оба са „\\n“"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "не почиње и „msgid“ и „msgid_plural“ са „\\n“"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "„msgid“ и „msgstr[%u]“ не почињу оба са „\\n“"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "не почиње и „msgid“ и „msgstr[%u]“ са „\\n“"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "„msgid“ и „msgstr“ не почињу оба са „\\n“"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "не почиње и „msgid“ и „msgstr“ са „\\n“"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "„msgid“ и „msgid_plural“ не завршавају се оба са „\\n“"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "не завршава се и „msgid“ и „msgid_plural“ са „\\n“"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "„msgid“ и „msgstr[%u]“ не завршавају се оба са „\\n“"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "не завршава се и „msgid“ и „msgstr[%u]“ са „\\n“"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "„msgid“ и „msgstr“ не завршавају се оба са „\\n“"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "не завршава се и „msgid“ и „msgstr“ са „\\n“"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr "баратање множинама је проширење Гнуовог геттекста"
+msgstr "баратање множинама је Гнуово проширење gettext-а"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "У мсгстр недостаје ознака пречице тастатуре „%c“"
+msgstr "У msgstr недостаје ознака пречице са тастатуре „%c“"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "У мсгстр има превише ознака пречица тастатуре „%c“"
-
-#: src/msgl-check.c:814
-#, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "поље заглавља „%s“ и даље садржи почетну задату вредност\n"
+msgstr "У msgstr има превише ознака пречица са тастатуре „%c“"
 
-#: src/msgl-check.c:831
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "у заглављу недостаје поље заглавља „%s“\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "недостаје поље „%s“ у заглављу\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "поље „%s“ у заглављу треба да почне на почетку реда\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: улаз није исправан у „%s“ кодирању"
+msgstr ""
 
 #: src/msgl-iconv.c:69
-#, c-format
+#, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
+msgstr "грешка приликом отварања „%s“ за читање"
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(), а иконв() не "
+"Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(), а iconv() не "
 "подржава ово претварање."
 
 #: src/msgl-iconv.c:335
@@ -2793,29 +2556,29 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Претварање из „%s“ у „%s“ уводи понављања: неке различите мсгид поруке "
-"постају једнаке."
+"Претварање из „%s“ у „%s“ уводи понављања: неки различити msgid-ови постају "
+"једнаки."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(). Ово издање је "
-"изграђено без иконв()-еа."
+"Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(). Ово издање је "
+"изграђено без iconv()-а."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s је исправно само са %s"
+msgstr "%s је једино исправно уз %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "врста резерве"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2828,65 +2591,66 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Спајајте две .по датотеке у Унифорум стилу. Датотека деф.по је постојећа\n"
-"ПО датотека са преводима који ће бити пренети у новостворену датотеку\n"
-"док год се они поклапају; примедбе ће бити очуване, али извучене примедбе\n"
-"и положаји у датотеци ће бити занемарени. Датотека реф.пот је последња\n"
-"ПО датотека са освеженим изворним референцама али старим преводима, или\n"
-"шаблон ПО датотеке (обично направљен помоћу xgettext-а); сви преводи или\n"
-"примедбе из ове датотеке ће бити занемарени, али ће се сачувати извучене\n"
-"примедбе и положаји у датотекама. Када нема тачног поклапања, користи се\n"
-"нејасно поклапање ради добијања бољих резултата.\n"
+"Спаја две .po датотеке у Унифорум стилу. Датотека подр.po је постојећа ПО\n"
+"датотека са преводима који ће бити пренети у новостворену датотеку док год\n"
+"се они поклапају; примедбе ће бити очуване, али извучене примедбе и \n"
+"положаји у датотеци ће бити занемарени. Датотека реф.pot је последња ПО \n"
+"датотека са освеженим изворним референцама али старим преводима, или шаблон\n"
+"ПО датотеке (обично направљен помоћу xgettext-а); сви преводи или примедбе \n"
+"из ове датотеке ће бити занемарени, али ће се сачувати извучене примедбе и \n"
+"положаји у датотекама. Када нема тачног поклапања, користи се нејасно \n"
+"поклапање ради добијања бољих резултата.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      преводи који упућују на старе изворе\n"
+msgstr ""
+"  подр.po                     преводи који одговарају старом изворном коду\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     упуте на нове изворе\n"
+msgstr "  реф.pot                     позива нове изворне поруке\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 "  -C, --compendium=ДАТОТЕКА   додатна библиотека превода порука, може се\n"
-"                              навести више пута\n"
+"                              навести више него једном\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                освежава деф.по,\n"
-"                              не ради ништа ако је деф.по већ освежена\n"
+"  -U, --update                освежи подр.po,\n"
+"                              не ради ништа ако је већ усклађен подр.po\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Путања излазне датотеке у режиму освежавања:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "Резултат се уписује назад у деф.по.\n"
+msgstr "Резултат се уписује назад у подр.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=УПРАВЉАЊЕ      прави резерву за деф.по\n"
+msgstr "      --backup=УПРАВЉАЊЕ      сачини резерву за подр.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=СУФИКС         мења уобичајени суфикс за резерве\n"
+msgstr "      --suffix=СУФИКС         измени уобичајени суфикс за резерве\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2897,57 +2661,56 @@
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Начин управљања издањима се може изабрати помоћу опције „--backup“ или "
-"кроз \n"
-"променљиву окружења „VERSION_CONTROL“. Овде су дозвољене вредности:\n"
-"  none, off       не прави резерве (чак и ако је наведено „--backup“)\n"
+"Начин управљања издањима се може изабрати помоћу опције --backup или кроз \n"
+"променљиву окружења VERSION_CONTROL. Овде су дозвољене вредности:\n"
+"  none, off       не прави резерве (чак и ако је наведено --backup)\n"
 "  numbered, t     прави побројане резерве\n"
 "  existing, nil   побројане ако већ постоје побројане резерве, иначе обичне\n"
 "  simple, never   увек прави обичне резерве\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Суфикс за резерве је „~“, осим ако је постављен помоћу „--suffix“ или "
-"променљивом\n"
-"окружења „SIMPLE_BACKUP_SUFFIX“.\n"
+"Суфикс за резерве је „~“, осим ако је постављен помоћу --suffix или "
+"променљиве \n"
+"окружења SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
-#, c-format
+#: src/msgmerge.c:552
+#, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              задржава претходне мсгид-се преведених порука\n"
+"      --translated            задржи преведене, уклони непреведене поруке\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       потискује указиваче напредовања\n"
+msgstr "  -q, --quiet, --silent       искључи обавештавање о напретку\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
-msgstr "ова порука треба да одреди облике множине"
+msgstr "ова порука треба да дефинише облике множине"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
-msgstr "ова порука не треба да одреди облике множине"
+msgstr "ова порука не треба да дефинише облике множине"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sПрочитах %ld старих + %ld упутних, спојених %ld, нејасних %ld, "
-"недостајућих %ld, превазиђених %ld.\n"
+"%sПрочитах %ld старих + %ld референтних, спојих %ld, нејасних %ld, недостаје "
+"%ld, превазиђених %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2956,7 +2719,7 @@
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s и изричити називи датотека се међусобно искључују"
+msgstr "%s и изричито име датотеке су међу собом искључиви"
 
 #: src/msgunfmt.c:427
 #, c-format
@@ -2966,7 +2729,7 @@
 #: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Претворите бинарни каталог порука у .по датотеку Унифорум стила.\n"
+msgstr "Претвори бинарни каталог порука у .po датотеку Унифорум стила.\n"
 
 #: src/msgunfmt.c:440
 #, c-format
@@ -2974,14 +2737,12 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  Јава режим: улаз је Јавин разред „Група "
-"изворишта“\n"
+"  -j, --java                  Јава режим: улаз је Јава класа ResourceBundle\n"
 
 #: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr ""
-"      --csharp                Ц# режим: улаз је .НЕТ-ова „.dll“ датотека\n"
+msgstr "      --csharp                C# режим: улаз је .NET .dll датотека\n"
 
 #: src/msgunfmt.c:444
 #, c-format
@@ -2989,21 +2750,20 @@
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      Режим Ц# изворишта: улаз је .НЕТ-ова „."
-"resources“ датотека\n"
+"      --csharp-resources      Режим за C# ресурсе: улаз је .NET .resources "
+"датотека\n"
 
 #: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Тцл режим: улаз је тцл/мсгкат-ова „.msg“ "
-"датотека\n"
+"      --tcl                   Tcl режим: улаз је tcl/msgcat .msg датотека\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  ДАТОТЕКА ...                улазне .мо датотеке\n"
+msgstr "  ДАТОТЕКА ...                улазне .mo датотеке\n"
 
 #: src/msgunfmt.c:456
 #, c-format
@@ -3017,13 +2777,13 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Назив разреда се одређује надодавањем назива локалитета на назив изворишта,\n"
-"раздвојених подвлаком. Разред се проналази помоћу „CLASSPATH“.\n"
+"Име класе се одређујем надодавањем имена локалитета на име ресурса, \n"
+"раздвојено подвлаком. Класа се проналази помоћу CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Путања улазне датотеке у Ц# режиму:\n"
+msgstr "Путања улазне датотеке у C# режиму:\n"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3032,12 +2792,12 @@
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се налази у поддиректоријуму \n"
-"датог директоријума чији назив зависи од локалитета.\n"
+"датог директоријума чије име зависи од локалитета.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Путања улазне датотеке у Тцл режиму:\n"
+msgstr "Путања улазне датотеке у Tcl режиму:\n"
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3045,20 +2805,19 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Опције -l и -d су обавезне.  Датотека „.msg“ се налази у датом "
-"директоријуму.\n"
+"Опције -l и -d су обавезне.  Датотека .msg се налази у датом директоријуму.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                записује увучени изглед излаза\n"
+msgstr "  -i, --indent                стил исписа са увлачењем\n"
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                пише изричитим стилом унифорума\n"
+msgstr "      --strict                испис у строгом стилу унифорума\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3070,34 +2829,33 @@
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"Обједините поновљене преводе у каталогу превода.  Пронађите двоструке\n"
-"преводе са истим ИБ-ом поруке. Такви дупликати су неисправан улаз за\n"
-"остале програме као што је „msgfmt“, „msgmerge“ или „msgcat“. У основи,\n"
-"поновљени преводи се спајају.  Када се користи опција „--repeated“,\n"
-"исписују се само поновљене, а остале поруке се занемарују. Примедбе и\n"
-"извучене примедбе ће се збрајати, осим ако је наведено „--use-first“,\n"
-"када ће се користити оне из првог превода. Положаји у датотеци ће се\n"
-"такође збрајати. Када се користи опција „--unique“, поновљени преводи\n"
-"се занемарују.\n"
+"Сједињује поновљене преводе у каталогу превода.  Проналази двоструке преводе\n"
+"са истим ИД-ом поруке. Такви дупликати су неисправан улаз за остале програме\n"
+"као што је msgfmt, msgmerge или msgcat.  Уобичајено се поновљени преводи \n"
+"спајају.  Када се користи опција --repeated, исписују се само поновљени, а \n"
+"остале поруке се занемарују. Примедбе и извучене примедбе ће се гомилати, \n"
+"осим ако је наведено --use-first, када ће се користити оне из првог превода.\n"
+"Положаји у датотеци ће се такође гомилати. Када се користи опција --unique,\n"
+"поновљени преводи се занемарују.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              исписује само дупликате\n"
+msgstr "  -d, --repeated              испиши само поновљене\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                исписује само јединствене поруке, одбацујући "
-"дупликате\n"
+"  -u, --unique                испиши само јединствене поруке, занемари "
+"поновљене\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
-msgstr "<стдулаз>"
+msgstr "<стдул>"
 
 #: src/po-charset.c:489
 #, c-format
@@ -3105,77 +2863,77 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Скуп знакова „%s“ не чини преносив назив кодирања.\n"
-"Претварање порука у корисников скуп знакова можда неће радити.\n"
+"Скуп знакова „%s“ не чини преносно име кодирања.\n"
+"Претварање порука у скуп знакова корисника можда неће радити.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Скуп знакова „%s“ није подржан. %s се ослања на „iconv()“,\n"
-"а „iconv()“ не подржава „%s“.\n"
+"Скуп знакова „%s“ није подржан. %s се ослања на iconv(),\n"
+"а iconv() не подржава „%s“.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Инсталирање Гнуовог „libiconv“-а и затим поновно инсталирање Гнуовог\n"
-"„gettext“-а ће средити овај проблем.\n"
+"Инсталирање Гнуовог libiconv-а и затим поновно инсталирање Гнуовог\n"
+"gettext-а ће средити овај проблем.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "Ипак настављам, очекујте грешке обраде."
+msgstr "Ипак настављам, очекујте грешке при рашчлањивању."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Ипак настављам."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Скуп знакова „%s“ није подржан. %s се ослања на „iconv()“.\n"
-"Ово издање је изграђено без „iconv()“-а.\n"
+"Скуп знакова „%s“ није подржан. %s се ослања на iconv().\n"
+"Ово издање је изграђено без iconv()-а.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Недостаје скуп знакова у заглављу.\n"
-"Претварање порука у корисников скуп знакова неће радити.\n"
+"Претварање порука у скуп знакова корисника неће радити.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
-msgstr "недоследно стање за #~"
+msgstr "недоследна употреба #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "недостаје одељак „msgstr[]“"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "недостаје одељак „msgid_plural“"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "недостаје одељак „msgstr“"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "први облик множине користи не-нула индекс"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "облик множине има погрешан индекс"
@@ -3183,113 +2941,122 @@
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
-msgstr "превише грешака, прекидам"
+msgstr "превише грешака, одустајем"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "неисправан низ мултибајтова"
+msgstr "неисправан вишебајтни низ"
 
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "непотпун низ мултибајтова на крају датотеке"
+msgstr "недовршен вишебајтни низ на крају датотеке"
 
 #: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "непотпун низ мултибајтова на крају реда"
+msgstr "недовршен вишебајтни низ на крају реда"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "неуспех иконв-а"
+msgstr "неуспех iconv-а"
 
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "кључна реч „%s“ је непозната"
+msgstr "непозната кључна реч „%s“"
 
 #: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
-msgstr "неисправан низ управљања"
+msgstr "неисправан контролни низ"
 
 #: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
-msgstr "знак за крај датотеке унутар ниске"
+msgstr "крај датотеке унутар ниске"
 
 #: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr "знак за крај реда унутар ниске"
+msgstr "крај реда унутар ниске"
 
 #: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "садржајни раздвајач <ЕОТ> унутар ниске"
+msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "ова датотека не може да садржи смернице домена"
+msgstr "ова датотека не сме садржати директиве за домен"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "одредница удвостручене поруке"
+msgstr "двострука дефиниција поруке"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
+#, fuzzy
 msgid "this is the location of the first definition"
-msgstr "ово је место прве одреднице"
+msgstr "...ово је положај прве дефиниције"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "датотека „%s“ је скраћена"
+msgstr "датотека „%s“ је одсечена"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом"
+msgstr "датотека „%s“ садржи ниску која се не завршава NUL-ом"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "датотека „%s“ није у Гнуовом .mo запису"
+msgstr "датотека „%s“ није у Гнуовом .mo облику"
 
 #: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом, на %s"
+msgstr "датотека „%s“ садржи ниску која се не завршава NUL-ом, на %s"
 
 #: src/read-properties.c:227
+#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "упозорење: неисправна синтакса „\\uxxxx“ за Уникод знак"
+msgstr "%s:%lu: упозорење: неисправна синтакса \\uxxxx за Уникод знак"
 
+# bug: there are similar messages with "%s:%lu: warning:"
 #: src/read-stringtable.c:802
+#, fuzzy
 msgid "warning: unterminated string"
-msgstr "упозорење: неокончана ниска"
+msgstr "%s:%d: упозорење: неокончана ниска"
 
 #: src/read-stringtable.c:810
+#, fuzzy
 msgid "warning: syntax error"
-msgstr "упозорење: грешка синтаксе"
+msgstr "%s:%lu: упозорење: грешка у синтакси"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "упозорење: неокончан пар кључ/вредност"
+msgstr "%s:%lu: упозорење: неокончан пар кључ/вредност"
 
 #: src/read-stringtable.c:939
+#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr "упозорење: грешка синтаксе, очекивах ; након ниске"
+msgstr "%s:%lu: упозорење: грешка у синтакси, очекивао сам „;“ након ниске"
 
 #: src/read-stringtable.c:948
+#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "упозорење: грешка синтаксе, очекивах = или ; након ниске"
+msgstr ""
+"%s:%lu: упозорење: грешка у синтакси, очекивао сам „=“ или „;“ након ниске"
 
 #: src/recode-sr-latin.c:116
-#, c-format
+#, fuzzy, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Написали су %s и %s.\n"
+msgstr "Написа %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3297,12 +3064,12 @@
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Данило Шеган"
+msgstr ""
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Пребаците српски текст са ћириличног на латинично писмо.\n"
+msgstr ""
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3310,18 +3077,16 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"Улазни текст се чита са стандардног улаза.  Претворени текст је излаз\n"
-"стандардног излаза.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "улаз није исправан у „%s“ кодирању"
+msgstr ""
 
-#: src/recode-sr-latin.c:367
-#, c-format
+#: src/recode-sr-latin.c:366
+#, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
+msgstr "грешка приликом отварања „%s“ за читање"
 
 #: src/urlget.c:159
 #, c-format
@@ -3339,61 +3104,54 @@
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
-"Преузима и исписује садржај адресе. Уколико не може да приступи адреси,\n"
-"користи се месно доступна ДАТОТЕКА уместо ње.\n"
-
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "грешка читања „%s“"
+"Преузимам и исписујем садржај адресе. Уколико не могу да приступим адреси,\n"
+"користи се локално доступна ДАТОТЕКА уместо ње.\n"
 
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
-msgstr "грешка записивања стандардног излаза"
-
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "грешка након читања „%s“"
+msgstr "грешка при писању на стандардни излаз"
 
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Довлачим „%s“..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " истекло је време.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " нисам успео.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
+#, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
-"излаза. Покушајте да користите синтаксу ПО датотеке уместо тога."
+"Не могу да испишем више домена превода у једну датотеку према синтакси Јава ."
+"properties датотека. Користите PO синтаксу уместо тога."
 
 #: src/write-catalog.c:129
+#, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
-"излаза."
+"Не могу да испишем више домена превода у једну датотеку према синтакси "
+"NeXTstep/GNUstep .strings датотека."
 
 #: src/write-catalog.c:162
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"каталог порука садржи преводе зависне од садржаја, али запис излаза их не "
+"каталог порука садржи преводе са облицима множине, али излазни облик их не "
 "подржава."
 
 #: src/write-catalog.c:197
@@ -3402,90 +3160,86 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"каталог порука садржи преводе са облицима множине, али запис излаза их не "
-"подржава. Покушајте да створите разред Јаве користећи „msgfmt --java“ уместо "
-"датотеке особина."
+"каталог порука садржи преводе са облицима множине, али излазни облик их не "
+"подржава. Покушајте да образујете Јава класу помоћу „msgfmt --java“ уместо "
+"датотеке са особинама (.properties)."
 
 #: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"каталог порука садржи преводе са облицима множине, али запис излаза их не "
+"каталог порука садржи преводе са облицима множине, али излазни облик их не "
 "подржава."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "не могу да створим излазну датотеку „%s“"
+msgstr "не могу да направим излазну датотеку „%s“"
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "стандардни излаз"
 
 #: src/write-csharp.c:703
-#, c-format
+#, fuzzy, c-format
 msgid "failed to create directory \"%s\""
-msgstr "нисам успео да направим директоријум „%s“"
+msgstr "не могу да направим „%s“"
 
 #: src/write-csharp.c:766
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "изграђивање Ц# разреда није успело, пробајте „--verbose“"
+msgstr ""
+"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
 #: src/write-csharp.c:768
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "изграђивање Ц# разреда није успело"
+msgstr ""
+"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "неисправан назив разреда Јаве: %s"
+msgstr "није исправно име Јава класе: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
-"изграђивање разреда Јаве није успело, пробајте „--verbose“ или поставите "
-"„$JAVAC“"
+"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-java.c:1213
-#, c-format
+#: src/write-java.c:1168
+#, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "изграђивање разреда Јаве није успело, пробајте да поставите „$JAVAC“"
+msgstr ""
+"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "грешка приликом отварања „%s“ за писање"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "неисправан низ мултибајтова"
+msgstr "грешка при отварању датотеке „%s“ ради уписа"
 
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr ""
-"интернационализоване поруке не треба да садрже „\\%c“ низове за крај реда"
+"internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "интернационализоване поруке не треба да садрже „\\%c“ низове истицања"
 
-#: src/write-po.c:1335 src/write-po.c:1459
-#, c-format
+#: src/write-po.c:1253 src/write-po.c:1382
+#, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
 "This will cause problems to translators who use a character encoding\n"
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"Следећи мсгцтхт садржи не-АСКРИ знакове.\n"
+"Следећи msgid садржи не-АСКРИ знакове.\n"
 "Ово ће изазвати проблеме преводиоцима који користе кодирање\n"
-"другачије од вашег. Пробајте да користите чисти АСКРИ мсгцтхт.\n"
+"другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3493,9 +3247,9 @@
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"Следећи мсгид садржи не-АСКРИ знакове.\n"
+"Следећи msgid садржи не-АСКРИ знакове.\n"
 "Ово ће изазвати проблеме преводиоцима који користе кодирање\n"
-"другачије од вашег. Пробајте да користите чисти АСКРИ мсгид.\n"
+"другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
 "%s\n"
 
 #: src/write-qt.c:667
@@ -3504,18 +3258,19 @@
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 "каталог порука садржи преводе облика множине\n"
-"али запис каталога порука Кут-а не подржава руковање множинама\n"
+"али облик Qt каталога порука не подржава баратање множинама\n"
 
 #: src/write-qt.c:693
+#, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside "
 "ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"каталог порука садржи мсгцтхт ниске са знаковима ван ISO-8859-1\n"
-"скупа али запис каталога порука Кут-а подржава Уникод једино у\n"
-"преведним нискама, не у садржајним нискама\n"
+"каталог порука садржи msgid ниске са знаковима изван ISO-8859-1 скупа\n"
+"а облик Qt каталога порука подржава Уникод једино у преведним нискама,\n"
+"не у непреведним нискама\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3523,38 +3278,41 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"каталог порука садржи мсгид ниске са знаковима ван ISO-8859-1\n"
-"скупа али запис каталога порука Кут-а подржава Уникод једино у\n"
-"преведним нискама, не у непреведним нискама\n"
+"каталог порука садржи msgid ниске са знаковима изван ISO-8859-1 скупа\n"
+"а облик Qt каталога порука подржава Уникод једино у преведним нискама,\n"
+"не у непреведним нискама\n"
 
 #: src/write-resources.c:94
-#, c-format
+#, fuzzy, c-format
 msgid "error while writing to %s subprocess"
-msgstr "грешка приликом уписа у подпроцес „%s“"
+msgstr "грешка при писању датотеке „%s“"
 
 #: src/write-resources.c:131
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"каталог порука садржи преводе зависне од садржаја,\n"
-"али запис Ц# „.resources“ не подржава садржаје\n"
+"каталог порука садржи преводе облика множине\n"
+"али облик Qt каталога порука не подржава баратање множинама\n"
 
 #: src/write-resources.c:150
+#, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 "каталог порука садржи преводе облика множине\n"
-"али запис Ц# „.resources“ не подржава руковање множинама\n"
+"али облик Qt каталога порука не подржава баратање множинама\n"
 
 #: src/write-tcl.c:157
+#, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"каталог порука садржи преводе зависне од садржаја,\n"
-"али запис каталога порука Тцл-а не подржава садржаје\n"
+"каталог порука садржи преводе облика множине\n"
+"али облик Tcl каталога порука не подржава баратање множинама\n"
 
 #: src/write-tcl.c:176
 msgid ""
@@ -3562,9 +3320,10 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 "каталог порука садржи преводе облика множине\n"
-"али запис каталога порука Тцл-а не подржава руковање множинама\n"
+"али облик Tcl каталога порука не подржава баратање множинама\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+# bug: there are similar messages with "%s:%lu: warning:"
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: упозорење: неокончана ниска"
@@ -3572,189 +3331,114 @@
 #: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: упозорење: неокончани регуларни израз"
+msgstr "%s:%d: упозорење: неокончан регуларни израз"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "упозорење: неисправан знак Уникода "
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: упозорење: константа знака није окончана"
+msgstr "%s:%d: упозорење: неокончана знаковна константа"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: упозорење: литерал ниске није окончан"
+msgstr "%s:%d: упозорење: неокончана дословна ниска"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Наведите кодирање извора помоћу „--from-code“."
+msgstr ""
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
 #: src/x-csharp.c:269
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неисправан низ мултибајтова.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
 #: src/x-csharp.c:285
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Дуги недовршени низ мултибајтова.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
 #: src/x-csharp.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
 #: src/x-csharp.c:306
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Недовршени низ мултибајтова на крају реда.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
-#, c-format
+#: src/x-csharp.c:315 src/x-python.c:332
+#, fuzzy, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: неуспех иконв-а"
+msgstr "неуспех iconv-а"
 
 #: src/x-csharp.c:338
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Неисправан низ мултибајтова.\n"
-"Наведите кодирање извора помоћу „--from-code“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: упозорење: неисправан знак Уникода"
+msgstr "%s:%d: упозорење: неисправан Уникод знак"
 
+# bug: there are similar messages with "%s:%lu: warning:"
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: упозорење: константа ниске није окончана"
+msgstr "%s:%d: упозорење: неокончана константна ниска"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: упозорење: нађох ) где очекивах }"
+msgstr "%s:%d: упозорење: нађох „)“ где очекивах „}“"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: упозорење: нађох } где очекивах )"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Недостаје садржај за ниску извучену из елемента „%s“"
+msgstr "%s:%d: упозорење: нађох „}“ где очекивах „)“"
 
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Корени елемент <%s> није дозвољен у исправној датотеци Глејда"
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
+#: src/x-glade.c:623 src/x-glade.c:630
+#, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 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"
+"Језик „glade“ није подржан. %s се ослања на expat-у.\n"
+"Ово издање је изграђено без expat-а.\n"
 
 # bug: there are similar messages with "%s:%lu: warning:"
 #: src/x-java.c:494
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: упозорење: усамљена замена „U+%04X“"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Наведите кодирање извора помоћу „--from-code“\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неисправан низ мултибајтова.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Дуги недовршени низ мултибајтова.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Недовршени низ мултибајтова на крају реда.\n"
-"Наведите исправно кодирање извора помоћу „--from-code“\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неисправан низ мулти бајтова.\n"
-"Наведите кодирање извора помоћу „--from-code“\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: упозорење: литерал Регизраза је окончан прерано"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: упозорење: „%s“ није дозвољено"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
 #: src/x-perl.c:308
@@ -3766,105 +3450,101 @@
 #: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: недостаје десна заграда у „\\x{ХЕКСАДЕКАДНИ-БРОЈ}“"
+msgstr "%s:%d: недостаје десна заграда у \\x{ХЕКСАДЕКАДНИ-БРОЈ}"
 
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправно уметање („\\l“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправна интерполација („\\l“) 8-битног знака „%c“"
 
 #: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправно уметање („\\u“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправна интерполација („\\u“) 8-битног знака „%c“"
 
 #: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: неисправно уметање променљиве на „%c“"
+msgstr "%s:%d: неисправно вредновање променљивих на „%c“"
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправно уметање („\\L“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправна интерполација („\\L“) 8-битног знака „%c“"
 
 #: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправно уметање („\\U“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправна интерполација („\\U“) 8-битног знака „%c“"
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
-"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
-"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:282
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Неисправан низ мултибајтова.\n"
-"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
-"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:299
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: Дуги недовршени низ мултибајтова.\n"
-"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
-"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:312
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
-"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
-"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:322
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: Недовршени низ мултибајтова на крају реда.\n"
-"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
-"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: Неисправан низ мултибајтова.\n"
-"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
-"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Непознато кодирање „%s“. Настављам са АСКРИ-јем."
+msgstr ""
 
 #: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: неисправна одредница датотеке"
+msgstr "%s:%d: неисправна дефиниција ниске"
 
 #: src/x-rst.c:172
 #, c-format
@@ -3874,7 +3554,7 @@
 #: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: неисправан израз ниске"
+msgstr "%s:%d: неисправна ниска са изразом"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3883,70 +3563,58 @@
 "use eval_gettext instead"
 msgstr ""
 "%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; "
-"уместо тога користите „eval_gettext“"
+"уместо тога користите eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: упозорење: литерал регуларног израза је окончан прерано"
-
-#: src/xgettext.c:545
-#, 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:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
-"„--join-existing“ се не може користити када се излаз исписује на стандардни "
+"--join-existing се не може користити када се излаз исписује на стандардни "
 "излаз"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr "„xgettext“ не може да ради без кључних речи које тражи"
+msgstr "xgettext не може да ради без кључних речи које тражи"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "упозорење: проширење „%2$s“ датотеке „%1$s“ није познато; пробаћу Ц"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "упозорење: екстензија „%2$s“ датотеке „%1$s“ је непозната; пробаћу C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "Извуците преводиве ниске из датих улазних датотека.\n"
+msgstr "Извуци преводиве ниске из датих улазних датотека.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, 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"
+"  -d, --default-domain=ИМЕ    користи ИМЕ.po за излаз (уместо messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-"  -o, --output=ДАТОТЕКА             исписује излаз у наведену датотеку\n"
+msgstr "  -o, --output=ДАТОТЕКА       испиши излаз у наведену датотеку\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"  -p, --output-dir=ДИР              излазне датотеке се смештају у "
-"директоријум ДИР\n"
+"  -p, --output-dir=ДИР        излазне датотеке се смештају у директоријум "
+"ДИР\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избор језика улазне датотеке:\n"
 
-#: src/xgettext.c:893
-#, c-format
+#: src/xgettext.c:854
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3954,58 +3622,54 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=НАЗИВ              препознаје наведени језик\n"
-"                                    (Ц, Ц++, ОбјектниЦ, ПО, Љуска, Питон,\n"
-"                                    Лисп, ЕмаксЛисп, либреп, Шема, Смолток,\n"
-"                                    Јава, ЈаваОсобине, Ц#, авк, УЦП, Тцл,\n"
-"                                    Перл, ПХП, ГЦЦ-извор, НИксНискеТабела,\n"
-"                                    РСТ, Глејд, Луа, ЈаваСпис, Вала, "
-"Десктоп)\n"
+"  -L, --language=ИМЕ          препознавање наведеног језика\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Питон, "
+"Лисп,\n"
+"                                ЕмаксЛисп, librep, Smalltalk, Јава,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Перл, "
+"PHP,\n"
+"                                GCC-извор, NXStringTable, RST, Глејд)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                         скраћеница за „--language=Ц++“\n"
+msgstr "  -C, --c++                   пречица за --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
-msgstr ""
-"Подразумева се погађање језика на основу проширења назива улазне датотеке.\n"
+msgstr "Подразумева се погађање језика на основу проширења имена датотеке.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=НАЗИВ             кодирање улазних датотека\n"
-"                                    (осим за Питона, Тцл-а, Глејд-а)\n"
+"      --from-code=ИМЕ         кодирање улазних датотека\n"
+"                                (осим за Питон, Tcl, Глејд)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Подразумева се да су улазне датотеке у АСКРИ запису.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-"  -j, --join-existing               спаја поруке са постојећом датотеком\n"
+msgstr "  -j, --join-existing         споји поруке са постојећом датотеком\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-"  -x, --exclude-file=ДАТОТЕКА.po    поља из ДАТОТЕКЕ.po се не извлаче\n"
+msgstr "  -x, --exclude-file=ДАТОТЕКА.po поља из ДАТОТЕКА.po се не извлаче\n"
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4013,228 +3677,212 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cОЗНАКА, --add-comments=ОЗНАКА   поставља блокове напомене почевши са "
-"ОЗНАКОМ и\n"
-"                                    претходи редове кључних речи у излазној "
-"датотеци\n"
-"  -c, --add-comments                поставља све блокове напомена пре "
-"редова\n"
-"                                    кључних речи у излазној датотеци\n"
+"  -c, --add-comments[=ОЗНАКА] постави блок примедбу помоћу ОЗНАКА (или оне \n"
+"                              које претходе редовима кључне речи) у "
+"излазној \n"
+"                              датотеци\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Посебне наредбе језика:\n"
+msgstr "Посебне опције за језик:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all                 извлачи све ниске\n"
+msgstr "  -a, --extract-all           извуци све ниске\n"
 
-#: src/xgettext.c:929
-#, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                    (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
-"                                    Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
-"                                    Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-"
-"извор,\n"
-"                                    Луа, ЈаваСпис, Вала)\n"
+"                                (само језици C, C++, ObjectiveC, Shell,\n"
+"                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
+"                                awk, Tcl, Перл, PHP, GCC-извор, Глејд)\n"
 
-#: src/xgettext.c:937
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                    (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
-"                                    Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
-"                                    Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-"
-"извор,\n"
-"                                    Луа, ЈаваСпис, Вала, Десктоп)\n"
+"  -k, --keyword[=РЕЧ]         додатне кључне речи које да тражим "
+"(изостављање\n"
+"                              РЕЧ означава употребу подразумеваних кључних \n"
+"                              речи)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=РЕЧ:АРГ:ОБЕЛЕЖЈЕ       додатно обележје за ниске унутар броја\n"
-"                                    аргумента АРГ кључне речи РЕЧ\n"
+"      --flag=РЕЧ:АРГ:ОЗНАКА   додатне ознаке за ниске као аргумент са "
+"бројем \n"
+"                              АРГ кључне речи РЕЧ\n"
 
-#: src/xgettext.c:945
-#, c-format
+#: src/xgettext.c:903
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                    (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
-"                                    Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
-"                                    Јава, Ц#, авк, ЈЦП, Тцл, Перл, ПХП,\n"
-"                                    ГЦЦ-извор, Луа, ЈаваСпис, Вала)\n"
+"                                (само језици C, C++, ObjectiveC, Shell,\n"
+"                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
+"                                awk, YCP, Tcl, Перл, PHP, GCC-извор)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs                   разуме АНСИ Ц триграфе за улаз\n"
+msgstr "  -T, --trigraphs             разумевање АНСИ C триграфа за улаз\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                    (само језици Ц, Ц++, ОбјектниЦ)\n"
+msgstr "                                (једино језици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                          препознаје ниске записа Кут-а\n"
+msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                    (само језик Ц++)\n"
+msgstr "                                (једино језик C++)\n"
 
-#: src/xgettext.c:958
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                          препознаје ниске записа КДЕ-а 4\n"
+msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:962
-#, c-format
+#: src/xgettext.c:919
+#, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                       препознаје ниске записа Буст-а\n"
+msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                       опширнији резултат препознавања записа "
-"ниске\n"
+"      --debug                 детаљнији резултат препознавања ниске формата\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-"      --properties-output           исписује датотеку Јава „.properties“\n"
+msgstr "      --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
-"      --copyright-holder=НИСКА      поставља носиоца ауторских права у "
-"излазу\n"
+"      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user                избацује ауторска права ФСФ у излазу за "
-"стране кориснике\n"
+"      --foreign-user          избаци FSF ауторска права у излазу за стране \n"
+"                              кориснике\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=ПАКЕТ          поставља назив пакета на излазу\n"
+msgstr ""
 
-#: src/xgettext.c:1012
-#, c-format
+#: src/xgettext.c:969
+#, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=ИЗДАЊЕ      поставља издање пакета на излазу\n"
+msgstr ""
+"      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=АДРЕСА@ЕЛ.ПОШТЕ  поставља адресу за "
-"пријављивање \n"
-"                                           грешака у мсгид-овима\n"
+"      --msgid-bugs-address=АДРЕСА@Е-ПОШТЕ  постави адресу за пријављивање \n"
+"                                           грешака у msgid-има\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[НИСКА], --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс поља "
-"мсгстр-а\n"
+"  -m, --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс msgstr поља\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[НИСКА], --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс поља "
-"мсгстр-а\n"
+"  -M, --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс msgstr поља\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Аргумент „--flag“ не користи синтаксу <кључна-реч>:<бр.арг>:"
-"[пролаз-]<обележје>: %s"
+"A --flag аргумент не користи синтаксу <кључна-реч>:<брарг>:[пролаз-]"
+"<ознака>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандардни улаз"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Не-АСКРИ знак на %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Не-АСКРИ напомена на или пре %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Не-АСКРИ ниска на %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: упозорење: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
-"Иако се користи на месту ниске записа, %s не представља исправну ниску "
-"записа %s. Разлог: %s\n"
+"Иако се користи на месту ниске формата, %s не представља исправну ниску "
+"формата %s. Разлог: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
-"Иако је објављена као таква, %s не представља исправну ниску записа %s. "
+"Иако је објављена као таква, %s не представља исправну ниску формата %s. "
 "Разлог: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4242,79 +3890,155 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"„%s“ запис ниске са неименованим аргументима не може бити исправно "
-"локализован:\n"
-"Преводилац не може да промени поредак аргумената.\n"
-"Размотрите употребу ниску заоиса са именованим аргументима,\n"
-"и са мапирањем уместо н-торке за аргументе.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 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 ""
-"Празан мсгид.  Ово је задржано за потребе Гнуовог геттекста-а:\n"
-"„gettext(\"\")“ исписује поље заглавља са мета-подацима, а не\n"
+"Празан msgid.  Ово је задржано за потребе ГНУ gettext-а:\n"
+"gettext(\"\") враћа поље заглавља са мета-подацима, а не \n"
 "празну ниску.\n"
 
-#: src/xgettext.c:2979
-#, c-format
+#: src/xgettext.c:2834
+#, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "нејасана особеност аргумента за кључну реч „%.*s“"
+msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:3006
-#, c-format
+#: src/xgettext.c:2861
+#, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "упозорење: недостаје контекст за кључниу реч „%.*s“"
+msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:3031
-#, c-format
+#: src/xgettext.c:2886
+#, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "упозорење: недостаје контекст за аргумент множине кључне речи „%.*s“"
+msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "контекст се разликује између облика за једнину и множину"
+msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"Није наведена опција „--msgid-bugs-address“.\n"
-"Уколико користите датотеку „Makevars“, тамо наведите\n"
-"променљиву „MSGID_BUGS_ADDRESS“; у супротном наведите\n"
-"опцију „--msgid-bugs-address“ у наредби.\n"
+"Није наведена опција --msgid-bugs-address.\n"
+"Уколико користите датотеку „Makevars“, наведите тамо\n"
+"променљиву MSGID_BUGS_ADDRESS; иначе, наведите опцију\n"
+"--msgid-bugs-address у наредби.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "језик „%s“ је непознат"
+msgid "language `%s' unknown"
+msgstr "језик „%s“ није познат"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
-msgstr "<неименован>"
+msgstr ""
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неисправна опција %c\n"
 
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "Руковање дупликатима није успело са грешком 0x%08x"
+#~ msgstr "Неуспешан DuplicateHandle са грешком 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Још увек није направљено."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "не могу да поставим неблокирајући У/И за подпроцес %s"
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "поље „%s“ у заглављу треба да почне на почетку реда\n"
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "неуспешно споразумевање са подпроцесом %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "неуспешно читање из подпроцеса %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "подпроцес %s је прекинут уз повратни код %d"
 
 #~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поља „%s“ и даље садржи почетну задату вредност\n"
+#~ msgstr "поља „%s“ и даље садржи почетну подразумевану вредност\n"
 
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: кобно: порука множине је испред поруке једнине\n"
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Вишеструко позивање %%%c."
 
 #~ msgid ""
-#~ "Invalid email address: need a fully qualified host name or domain name."
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
-#~ "Неисправна адреса ел. поште: потребно је пуно име домаћина или домен."
+#~ "Сва права задржана © %s Free Software Foundation, Inc.\n"
+#~ "Ово је слободан софтвер; погледајте изворни код за услове умножавања. "
+#~ "НЕМА\n"
+#~ "гаранције; чак ни за употребљивост или одређену намену.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "каталог порука садржи преводе облика множине\n"
+#~ "али облик Qt каталога порука не подржава баратање множинама\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "каталог порука садржи преводе облика множине\n"
+#~ "али облик Qt каталога порука не подржава баратање множинама\n"
+
+#~ msgid "Which is your email address?"
+#~ msgstr "Која је ваша е-адреса?"
+
+#~ msgid "Please choose the number, or enter your email address."
+#~ msgstr "Унесите број или вашу е-адресу."
+
+#~ msgid "Invalid email address: invalid character."
+#~ msgstr "Неисправна е-адреса: недозвољен знак."
+
+#~ msgid ""
+#~ "Invalid email address: need a fully qualified host name or domain name."
+#~ msgstr "Неисправна е-адреса: неопходно је пуно име домаћина или домен."
+
+#~ msgid "Invalid email address: missing @"
+#~ msgstr "Неисправна е-адреса: недостаје @"
+
+#~ msgid "Is the following your email address?"
+#~ msgstr "Да ли је ово ваша е-адреса?"
 
 #~ msgid "Please confirm by pressing Return, or enter your email address."
-#~ msgstr "Потврдите притиском на Унеси, или унесите вашу адресу ел. поште."
+#~ msgstr "Потврдите притиском на Ентер, или унесите вашу е-адресу."
+
+#~ msgid "Couldn't find out about your email address."
+#~ msgstr "Не могу да сазнам ништа о вашој е-адреси."
+
+#~ msgid "Please enter your email address."
+#~ msgstr "Унесите вашу е-адресу."
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: упозорење: "
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: упозорење: неокончана ниска"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: кобно: порука у множини је испред поруке у једнини\n"
+
+#~ msgid "conversion failure"
+#~ msgstr "неуспешно претварање"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "неуспешан упис у подпроцес grep"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/sv.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/sv.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/sv.po gettext-0.18.1.1/gettext-tools/po/sv.po
--- gettext-0.19.3/gettext-tools/po/sv.po	2014-10-16 06:04:24.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/sv.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,14 +1,15 @@
 # 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 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
+# Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010
+# Revision: 1.28
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-17 09:18+0200\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-15 12:24+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -28,25 +29,26 @@
 msgstr "tvetydigt argument %s för %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Giltiga argument är:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan inte hitta en temporärkatalog, försök sätta $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan inte skapa temporärkatalog med mall \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan inte ta bort temporärfil %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan inte ta bort temporärkatalog %s"
@@ -55,38 +57,37 @@
 msgid "write error"
 msgstr "skrivfel"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "bevarar rättigheter för %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "fel uppstod när %s öppnades för läsning"
+msgid "error while opening \"%s\" for reading"
+msgstr "fel uppstod när \"%s\" öppnades för läsning"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "kan inte öppna säkerhetskopiefil %s för skrivning"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "kan inte öppna säkerhetskopiefil \"%s\" för skrivning"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "fel uppstod då %s lästes"
+msgid "error reading \"%s\""
+msgstr "fel uppstod då \"%s\" lästes"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "fel vid skrivning till %s"
+msgid "error writing \"%s\""
+msgstr "fel vid skrivning till \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "fel efter %s lästes"
+msgid "error after reading \"%s\""
+msgstr "fel efter \"%s\" lästes"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -103,98 +104,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuell maskin för C# hittades inte, försök installera pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-barnprocess misslyckades"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan \"%s\" är tvetydig, alternativ:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: flaggan \"%s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flaggan \"%s\" kräver ett argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ogiltigt värde på argumentet source_version till compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "ogiltigt värde på argumentet target_version till compile_java_class"
+msgstr "ogiltigt värde på argumentet target_version till compile_java_clas"
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "misslyckades med att skapa \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fel vid skrivning till filen \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC"
@@ -205,96 +206,58 @@
 msgstr ""
 "Virtuell Javamaskin hittades inte, försök installera gij eller sätt $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fel i %s-barnprocess"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "läsning från %s-barnprocess misslyckades"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "kommunikation med %s-barnprocess misslyckades"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s-barnprocess terminerade med slutstatus %d"
+msgid "cannot create pipe"
+msgstr "kan inte skapa rör"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 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
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan inte skapa rör"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle misslyckades"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan inte återställa filnummer %d: dup2 misslyckades"
@@ -310,14 +273,7 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s-barnprocess fick ödesdiger signal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "fel uppstod när \"%s\" öppnades för läsning"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
@@ -325,7 +281,7 @@
 "Orsak: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
@@ -335,19 +291,17 @@
 "formateringsdirektiv för argument %u, som i \"%s\", finns inte i \"%s\""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -358,7 +312,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktiv nummer %u börjar med | men avslutas inte med |."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -368,20 +322,18 @@
 "formateringsmakro. Giltiga makronamn är definierade i ISO C 99, kapitel "
 "7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "I direktiv nummer %u följs symbolen efter \"<\" inte av \">\"."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Strängen refererar till argument nummer %u men ignorerar argument nummer %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antalet formateringsdirektiv i \"%s\" och \"%s\" är olika"
@@ -474,16 +426,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "\"%s\" använder inte %%m men \"%s\" använder %%m"
 
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "\"%s\" använder %%C men \"%s\" gör inte det"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "\"%s\" använder inte %%C men \"%s\" använder %%C"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Strängen avslutas mitt i ett direktiv."
@@ -564,7 +506,7 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"I direktiv nummer %u följs inte argumentnumret av ett komma och en av \"%s"
+"I direktiv nummer %u följs inte argumentnummret av ett komma och en av \"%s"
 "\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
@@ -687,9 +629,7 @@
 "I direktiv nummer %u är storleksbestämningen inkompatibel med konverteringen "
 "\"%c\"."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument \"%s\" finns inte i \"%s\""
@@ -735,34 +675,6 @@
 msgstr ""
 "formateringsdirektiv i \"%s\" och \"%s\" för argument \"%s\" är inte likadana"
 
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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 "
-"formatspecifikation."
-
-#: src/format-python-brace.c:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -811,11 +723,11 @@
 msgstr ""
 "Tecknet som avslutar direktiv nummer %u är inte en siffra mellan 1 och 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -828,58 +740,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Användning: %s [FLAGGA]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Visa maskinens värdnamn.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Resultatformat:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 kort värdnamn\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -889,34 +801,34 @@
 "  -f, --fqdn, --long          långt värdnamn, innehåller hela domännamnet\n"
 "                                och alias\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser för värdnamnet\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utskrift:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               visa versionsinformation och avsluta\n"
@@ -925,44 +837,46 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
 "Rapportera fel och synpunkter på översättningen till <tp-sv@listor.tp-sv."
 "se>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "kunde inte hämta värdnamn"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "högst en infil tillåten"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s och %s är ömsesidigt uteslutande"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -971,62 +885,62 @@
 "Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n"
 "manipulerar attributen.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Plats för infiler:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-infil\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=KATALOG     sök infiler även i KATALOG\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, 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"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Plats för utfil:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1034,12 +948,12 @@
 msgstr ""
 "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelandeval:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1047,7 +961,7 @@
 "      --translated            behåll översatta, ta bort oöversatta "
 "meddelanden\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1055,68 +969,59 @@
 "      --untranslated          behåll oöversatta, ta bort översatta "
 "meddelanden\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ta bort meddelanden markerade som \"fuzzy\"\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            behåll meddelanden markerade som \"fuzzy\"\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ta bort föråldrade #~ meddelanden\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         behåll föråldrade #~ meddelanden\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attributmanipulation:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             markera alla meddelanden som \"fuzzy\"\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           ta bort \"fuzzy\"-markering från alla "
 "meddelanden\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          markera alla meddelanden som föråldrade\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        ta bort föråldradmarkering från alla "
 "meddelanden\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              när \"fuzzy\" är satt, behåll föregående\n"
-"                              \"msgid\" för översatta meddelanden\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1125,57 +1030,49 @@
 "      --clear-previous        ta bort \"previous msgid\" från alla "
 "meddelanden\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 när \"fuzzy\" tas bort, sätt msgstr till tom "
-"sträng\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FIL.po      bearbeta bara poster som finns i FIL.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FIL.po    bearbeta bara poster som inte finns i FIL.po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 samma som --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              samma som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax på infil:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      infil har \"Java .properties\"-syntax\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1184,17 +1081,17 @@
 "      --stringtable-input     infil har NeXTstep/GNUstep \".strings\"-"
 "syntax\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1209,16 +1106,16 @@
 "\"auto\"\n"
 "                              eller \"html\".\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STILMALL        ange CSS stillmallsfil för --color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1226,38 +1123,38 @@
 "  -e, --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, 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"
+"                              inte \\v aller \\a\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1265,39 +1162,39 @@
 "  -n, --add-location          skriv rader med \"#: filnamn:rad"
 "\" (normalläge)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, 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:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1306,31 +1203,31 @@
 "      --no-wrap               dela inte meddelanden som är längre än\n"
 "                              resultatets kolumnantal i flera rader\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortera resultatet\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "omöjligt urvalskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1339,37 +1236,37 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Slår ihop de angivna PO-filerna.\n"
 "Hitta meddelanden som förekommer i två eller flera angivna PO-filer.\n"
-"Genom att använda --more-than kan begäras att meddelanden\n"
+"Genom att använda --more-than kan begärs att meddelanden\n"
 "förekommer i flera filer innan de skrivs ut. På motsvarande sätt\n"
 "används --less-than till att ange meddelanden som förekommer i\n"
 "färre filer (--less-than=2 skriver endast de meddelanden som är unika).\n"
-"Översättningar, kommentarer, extraheringskommentarer och filpositioner samlas\n"
-"ihop,  utom om --use-first ges.  Då tas de endast från den första PO-filen som\n"
-"definierar dem.\n"
+"Översättningar, kommentarer och extraheringskommentarer samlas ihop,\n"
+"utom om --use-first ges.  Då tas de endast från den första PO-filen som\n"
+"definierar dem.  Filpositioner från alla filer bevaras.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   infiler\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Om infil är - läses standard in.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1378,7 +1275,7 @@
 "  -<, --less-than=ANTAL       skriv meddelanden med färre än ANTAL\n"
 "                              definitioner. Standardvärde: oändligt\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1387,7 +1284,7 @@
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1396,16 +1293,16 @@
 "  -u, --unique                samma som --less-than=2, begär att\n"
 "                              endast unika meddelanden skrivs\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      infiler har \"Java .properties\"-syntax\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1414,12 +1311,12 @@
 "      --stringtable-input     infiler har NeXTstep/GNUstep \".strings\"-"
 "syntax\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMN          kodning för resultatet\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1428,28 +1325,28 @@
 "      --use-first             använd först hittade översättning för varje\n"
 "                              meddelande, slå inte ihop översättningar\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "inga infiler givna"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exakt 2 infiler krävs"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Användning: %s [FLAGGA] def.po ref.pot\n"
@@ -1482,12 +1379,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referenser till källkod\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Bearbetningsvarianter:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1495,7 +1392,7 @@
 msgstr ""
 "  -m, --multi-domain          tillämpa ref.pot till alla domäner i def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     använd inte luddig jämförelse\n"
@@ -1520,17 +1417,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "detta meddelande behöver granskas av översättaren"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "detta meddelande används men är inte definierat..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denna definition är likartad"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "detta meddelande används men är inte definierat i %s"
@@ -1540,19 +1437,19 @@
 msgid "warning: this message is not used"
 msgstr "varning: detta meddelande används inte"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst två filer måste anges"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1560,7 +1457,7 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1569,11 +1466,11 @@
 "förekommer i flera filer innan de skrivs ut. På motsvarande sätt\n"
 "används --less-than till att ange meddelanden som förekommer i\n"
 "färre filer (--less-than=2 skriver endast de meddelanden som är unika).\n"
-"Översättningar, kommentarer och extraherade kommentarer bevaras, men\n"
+"Översättningar, kommentarer och extraheringskommentarer bevaras, men\n"
 "endast från den första PO-filen som definierar dem. Filpositioner från\n"
 "alla filer bevaras.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1582,70 +1479,70 @@
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           skriv inte ut huvudet med `msgid \"\"'\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgstr "      --omit-header           skriv inte ut huvudet med 'msgid \"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterar en meddelandekatalog till en annan teckenkodning.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Konverteringsmål:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Standardvärde är nuvarande lokals kodning.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          bevara rader med \"#: filnamn:rad"
+"      --add-location          skriv rader med \"#: filnamn:rad"
 "\" (normalläge)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "inga infiler givna"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "exakt en infil krävs"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Användning: %s [FLAGGA] INFIL\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1657,7 +1554,7 @@
 "engelska PO-filen eller en PO-mönsterfil (ofta skapad med xgettext).\n"
 "Oöversatta poster ges en översättning som är identisk med msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INFIL                       PO- eller POT-infil\n"
@@ -1697,7 +1594,7 @@
 "av ett nolltecken.  Utdata för \"msgexec 0\" är lämpligt som indata för\n"
 "\"xargs -O\"\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INFIL           PO-infil\n"
@@ -1707,27 +1604,32 @@
 msgid "write to stdout failed"
 msgstr "skrivning till standard ut misslyckades"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "skrivning till %s-barnprocess misslyckades"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "filternamn saknas"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "minst ett sed-skript måste anges"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Användning: %s [FLAGGA] FILTER [FILTERFLAGGOR]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Tillämpar ett filter på alla översättningar i en meddelandekatalog.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1736,19 +1638,19 @@
 "FILTER kan vara vilket program som helst som läser en översättning från\n"
 "standard in och skriver den modifierade översättningen till standard ut.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Användbara FILTERFLAGGOR när FILTER är \"sed\":\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SKRIPT     lägg till SKRIPT till kommandon att exekvera\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1759,7 +1661,7 @@
 "kommandon\n"
 "                                att exekvera\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1767,7 +1669,7 @@
 "  -n, --quiet, --silent       undertryck automatisk utskrift av "
 "mönsterutrymmet\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1775,12 +1677,12 @@
 "      --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indentera resultatet\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1788,103 +1690,82 @@
 "      --keep-header           bevara huvudrader oförändrade, filtrera dem "
 "inte\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ogiltig byteordning: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kräver att \"-d katalog\" anges"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kräver att \"-l lokal\" anges"
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s kräver att \"--template mall\" anges"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s kräver att \"-o fil\" anges"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s och %s är ömsesidigt uteslutande i %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s är endast giltig med %s eller %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s är endast giltig med %s, %s eller %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d översatt meddelande"
 msgstr[1] "%d översatta meddelanden"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, 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:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1893,17 +1774,17 @@
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 "Motsvarande gäller för frivilliga argument.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnamn.po ...              infiler\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Körläge:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1912,7 +1793,7 @@
 "  -j, --java                  Javaläge: generera en Java ResourceBundle-"
 "klass\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1921,12 +1802,12 @@
 "      --java2                 som --java, och anta Java2 (JDK 1.2 eller "
 "högre)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1935,7 +1816,7 @@
 "      --csharp-resources      C#-resursläge: generera en .NET .resources-"
 "fil\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1943,41 +1824,33 @@
 "      --tcl                   Tcl-läge: generera en .msg-fil av tcl/msgcat-"
 "typ\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               \"Desktop Entry\"-läge: generera en .desktop-"
-"fil\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Om UTFIL är - skrivs resultatet till standard ut.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Plats för utfil i Javaläge:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURS       resursnamn\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1985,22 +1858,13 @@
 msgstr ""
 "  -l, --locale=LOKAL          lokalnamn, antingen språk eller språk_LAND\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                generera en .java-fil istället för en .class-"
-"fil\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2012,12 +1876,12 @@
 "avskiljt med ett understreck.  Flaggan -d är obligatorisk.  Klassen skrivs\n"
 "till den givna katalogen.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Plats för utfil i C#-läge:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2025,7 +1889,7 @@
 msgstr ""
 "  -d KATALOG                  startkatalog för lokalberoende .dll-filer\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2035,18 +1899,18 @@
 "underkatalog\n"
 "till den givna katalogen.  Underkatalogens namn beror på lokalen.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Plats för utfil i Tcl-läge:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d KATALOG                  startkatalog för .msg-meddelandekataloger\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2055,46 +1919,12 @@
 "Flaggorna -l och -d är obligatoriska.  .msg-filen skrivs till den givna\n"
 "katalogen.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Flaggor för \"Desktop Entry\"-läge\n"
-
-#: src/msgfmt.c:867
-#, 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:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d KATALOG                  baskatalog för .po-filer\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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"
-"  -k, --keyword               använd inte standardnyckelord\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning av infil:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2105,13 +1935,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrollera språkberoende formatsträngar\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2119,7 +1949,7 @@
 msgstr ""
 "      --check-header          verifiera närvaro och innehåll av huvudrader\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2128,7 +1958,7 @@
 "      --check-domain          kontrollera konflikter mellan domändirektiv\n"
 "                                och flaggan --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2137,7 +1967,7 @@
 "  -C, --check-compatibility   kontrollera att GNU msgfmt uppför sig som\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2148,121 +1978,98 @@
 "tangentkortkommandon\n"
 "                                för menyer\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, 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:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDN   skriv 32-bitarstal i given byteordning\n"
-"                                (big eller little, standard beror på "
-"plattform)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            skriv ut statistik om översättningarna\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               öka mängden information i meddelanden\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, 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:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "varning: PO-filens huvudrader är luddiga\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr "direktivet \"domain %s\" ignoreras"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "tom \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "luddig \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s finns inte"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s finns men kan inte läsas"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2271,7 +2078,7 @@
 "flagga \"%c\" kan inte användas förrän \"J\", \"K\", \"T\" \"C\" eller \"X\" "
 "angivits"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2280,7 +2087,7 @@
 "Extraherar alla meddelanden i en meddelandekatalog som matchar ett visst\n"
 "mönster eller hör till någon given källkodsfil.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2332,7 +2139,7 @@
 "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"
-"av utvalda meddelanden för varje enskilt kriterium.\n"
+"av utvalda meddelanden för varje enskilt kriteria.\n"
 "\n"
 "Syntax för MSGCTXT-MÖNSTER, MSGID-MÖNSTER, MSGSTR-MÖNSTER, KOMMENTARSMÖNSTER\n"
 "eller EXTRAHERAD-KOMMENTARSMÖNSTER:\n"
@@ -2356,7 +2163,7 @@
 "  -v, --invert-match          skriv ut endast de meddelanden som inte matchar\n"
 "                              något urvalskriteria.\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2364,17 +2171,17 @@
 "      --escape                använd C-kontrollsekvenser i resultatet, men\n"
 "                                inte \\v eller \\a\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sortera resultatet\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sortera resultatet efter filposition\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2384,7 +2191,7 @@
 "LANG såsom beskrivs i filen ABOUT-NLS.  Detta är nödvändigt för att\n"
 "du ska kunna testa dina översättningar.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2395,12 +2202,12 @@
 "Ange lokal med flaggan --locale eller\n"
 ".po-utfilen med flaggan --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Skapade %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2409,12 +2216,12 @@
 "Skapar en ny PO-fil och initierar metainformation med värden från\n"
 "användarens miljövariabler.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INFIL           POT-infil\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2424,13 +2231,13 @@
 "Om ingen infil ges söks POT-filen i aktuell katalog.\n"
 "Om den är - läses standard in.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FIL       skriv resultatet till den givna PO-filen\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2439,18 +2246,18 @@
 "Om ingen utfil ges beror den på flaggan --locale eller användarens\n"
 "lokalinställning.  Om den är - skrivs resultatet till standard ut.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          sätt mållokal\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         antag att PO-filen är automatgenererad\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2458,12 +2265,12 @@
 "Hittade fler än en .pot-fil.\n"
 "Ange .pot-infil med flaggan --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "fel vid läsning av aktuell katalog"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2471,14 +2278,14 @@
 "Hittade ingen .pot-fil i aktuell katalog.\n"
 "Ange .pot-infil med flaggan --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-barnprocess terminerade med slutstatus %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2486,14 +2293,14 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Den nya meddelandekatalogen bör innehålla din e-postadress så att\n"
+"Den nya meddelandekatalogen bör innehålla din e-postaddress så att\n"
 "användare kan komma med åsikter om översättningarna och underhållare kan\n"
 "kontakta dig ifall det blir oväntade tekniska problem.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Svenska översättningar för paket %s"
@@ -2511,13 +2318,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "infilen \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
@@ -2528,8 +2335,8 @@
 msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "varning: "
@@ -2650,46 +2457,46 @@
 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:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "meddelandekatalog har översättningar med pluralform"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "men huvudrader saknar attribut av typ \"plurals=UTTRYCK\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "men huvudrader saknar ett attribut av typ \"nplurals=HELTAL\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ogiltigt värde för nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ogiltigt pluraluttryck"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2697,55 +2504,64 @@
 "meddelandekatalog har översättningar med pluralformer, men saknar huvudrad "
 "med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+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:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+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:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "hantering av plural är en utökning i GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, 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:814
+#: src/msgl-check.c:776
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
+msgid "header field `%s' missing in header\n"
+msgstr "huvudrad \"%s\" saknas i huvudet\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "huvudrad \"%s\" saknas i huvudet\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "huvudrad \"%s\" bör ligga i början på raden\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "vissa huvudrader har kvar initiala standardvärden\n"
+
+#: src/msgl-check.c:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2763,8 +2579,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2782,8 +2598,8 @@
 "Konvertering från \"%s\" till \"%s\" ger duplikat: några msgid som skiljer "
 "sig blir lika."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2792,16 +2608,16 @@
 "Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n"
 "Denna version byggdes utan iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s är endast giltig med %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "säkerhetskopieringstyp"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2818,25 +2634,25 @@
 "existerande PO-fil som innehåller de gamla översättningarna som kommer att\n"
 "flyttas över till den nya filen om de är lika. Kommentarer bevaras men\n"
 "extraheringskommentarer och filpositioner kastas bort.\n"
-"Filen ref.pot är den senast skapade PO-filen med aktuella källkodsreferenser\n"
+"Filen ref.pot är den senast skapade PO-filen med aktuella källkodreferenser\n"
 "men gamla översättningar, eller en PO-mönsterfil (i allmänhet skapad med\n"
 "xgettext).  Alla översättningar och kommentarer i filen kastas bort,\n"
 "dock bevaras punktkommentarer och filpositioner.  Om en exakt likhet\n"
 "inte kan hittas används luddig jämförelse för att ge bättre resultat.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      översättningar som refererar till gamla "
 "källkoden\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referenser till den nya källkoden\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2845,36 +2661,36 @@
 "  -C, --compendium=FIL        ytterligare kataloger med översättningar,\n"
 "                              kan anges flera gånger\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                uppdatera def.po,\n"
+"  -U, --update                updatera def.po,\n"
 "                              gör ingenting om def.po redan är aktuell\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Plats för utfil i uppdateringsläge:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Resultatet skrivs tillbaka till def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROLL       gör en säkerhetskopia av def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         använd ett annat suffix än det vanliga\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2893,17 +2709,17 @@
 "annars\n"
 "  simple, never   gör alltid enkla säkerhetskopior\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Suffix för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n"
 "miljövariabeln SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2911,22 +2727,22 @@
 "      --previous              behåll föregående \"msgid\" för översatta "
 "meddelanden\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       visa inte förloppsindikatorer\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "detta meddelande ska definiera pluralformer"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "detta meddelande ska inte definiera pluralformer"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2935,7 +2751,7 @@
 "%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld "
 "saknade, %ld föråldrade.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3047,7 +2863,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3069,12 +2885,12 @@
 "översättningen.  Filpositioner samlas ihop.\n"
 "När flaggan --unique anges kastas duplikat bort.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              skriv bara duplicerade meddelanden\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3096,7 +2912,7 @@
 "Teckenuppsättning \"%s\" är inte namn på en portabel kodning.\n"
 "Meddelandekonvertering till användarens teckenuppsättning kan misslyckas.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3105,7 +2921,7 @@
 "Teckenuppsättning \"%s\" stöds ej. %s beror på iconv(),\n"
 "och iconv() stöder inte \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3113,15 +2929,15 @@
 "Installation av GNU libiconv med efterföljande ominstallation av\n"
 "GNU gettext skulle lösa detta problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsätter ändå, tolkningsfel kan förväntas."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Fortsätter ändå."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3130,7 +2946,7 @@
 "Teckenuppsättning \"%s\" stöds ej. %s beror på iconv().\n"
 "Denna version byggdes utan iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3144,27 +2960,27 @@
 msgid "inconsistent use of #~"
 msgstr "inkonsekvent användning av #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "\"msgstr[]\"-delen saknas"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "\"msgid_plural\"-delen saknas"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "\"msgstr\"-delen saknas"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "första pluralformen har index som inte är noll"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "pluralform har fel index"
@@ -3174,7 +2990,7 @@
 msgid "too many errors, aborting"
 msgstr "för många fel, avbryter körningen"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ogiltig flerbytesekvens"
@@ -3218,16 +3034,16 @@
 msgid "context separator <EOT> within string"
 msgstr "kontextseparator <EOT> inne i sträng"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denna fil kan inte innehålla domändirektiv"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "meddelandedefinitionen är dubblerad"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "detta är platsen för den första definitionen"
 
@@ -3303,12 +3119,12 @@
 "Indatatexten läses från standard in. Den konverterade texten skrivs till\n"
 "standard ut.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "indata är inte giltig i teckenkodningen \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
@@ -3334,21 +3150,11 @@
 "Hämtar och skriver ut innehållet på URL.  Om URL inte kan hämtas används\n"
 "den lokala filen FIL istället.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "fel uppstod då \"%s\" lästes"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fel vid skrivning till standard ut"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "fel efter \"%s\" lästes"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3386,7 +3192,7 @@
 "does not support them."
 msgstr ""
 "meddelandekatalog har kontextberoende översättningar, men resultatformatet "
-"stöder inte dem."
+"stödjer inte dem."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3395,7 +3201,7 @@
 "of a properties file."
 msgstr ""
 "meddelandekatalog har översättningar med pluralformer, men resultatformatet\n"
-"stöder inte dem. Försök generera en Java-klass med \"msgfmt --java\"\n"
+"stödjer inte dem. Försök generera en Java-klass med \"msgfmt --java\"\n"
 "istället för en \"properties\"-fil."
 
 #: src/write-catalog.c:202
@@ -3430,18 +3236,18 @@
 msgid "compilation of C# class failed"
 msgstr "kompilering av C#-klass misslyckades"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "inte ett giltigt Javaklassnamn: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
@@ -3451,19 +3257,14 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "ogiltig flerbytesekvens"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3476,7 +3277,7 @@
 "teckenuppsättning än du.  Försök använda en ren ASCII-msgctxt istället.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3521,7 +3322,7 @@
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "fel vid skrivning till barnprocess %s"
+msgstr "fel vid skrivning till subprocess %s"
 
 #: src/write-resources.c:131
 msgid ""
@@ -3529,7 +3330,7 @@
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 "meddelandekatalog har kontextberoende översättningar men formatet för\n"
-"C# .resources stöder inte kontexter\n"
+"C# .resources stödjer inte kontexter\n"
 
 #: src/write-resources.c:150
 msgid ""
@@ -3545,7 +3346,7 @@
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 "meddelandekatalog har kontextberoende översättningar men formatet för\n"
-"Tcl-meddelandekataloger stöder inte kontexter\n"
+"Tcl-meddelandekataloger stödjer inte kontexter\n"
 
 #: src/write-tcl.c:176
 msgid ""
@@ -3555,7 +3356,7 @@
 "meddelandekatalog har översättningar med pluralformer men formatet för\n"
 "Tcl-meddelandekataloger stöder inte pluralhantering\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varning: oavslutad sträng"
@@ -3565,22 +3366,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varning: oavslutat reguljärt uttryck"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "varning: ogiltigt Unicodetecken"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: varning: oavslutad teckenkonstant"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Ange källkodning med --from-code."
 
@@ -3599,7 +3395,7 @@
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Lång ofullständig multibytesekvens.\n"
+"%s:%d: Lång ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
 "\n"
 
@@ -3622,7 +3418,7 @@
 "%s:%d: Ofullständig multibytesekvens vid radslut.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv misslyckades"
@@ -3637,7 +3433,7 @@
 "Ange korrekt källkodning med --from-code.\n"
 "\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: varning: ogiltigt Unicodetecken"
@@ -3657,22 +3453,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varning: \"}\" hittades där \")\" förväntades"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Kontext saknas för strängen extraherad från element \"%s\""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Rotelementet <%s> är inte tillåten i en giltig Glade-fil"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3686,70 +3472,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: varning: ensamt surrogat U+%04X"
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Ange källkodning med --from-code\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ogiltig multibytesekvens.\n"
-"Ange korrekt källkodning med --from-code\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Lång ofullständig multibytesekvens.\n"
-"Ange korrekt källkodning med --from-code\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ofullständig multibytesekvens vid filslut.\n"
-"Ange korrekt källkodning med --from-code\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ofullständig multibytesekvens vid radslut.\n"
-"Ange korrekt källkodning med --from-code\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ogiltig multibytesekvens.\n"
-"Ange korrekt källkodning med --from-code\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: varning: RegExp-uttryck avslutas för tidigt"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: varning: %s tillåts inte"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: varning: oavslutad XML-tagg."
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3785,7 +3507,7 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ogiltig sekvens (\"\\U\") för åttabitarstecknet \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
 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"
@@ -3793,7 +3515,7 @@
 "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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3804,7 +3526,7 @@
 "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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3815,7 +3537,7 @@
 "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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3826,7 +3548,7 @@
 "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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3837,7 +3559,7 @@
 "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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3848,7 +3570,7 @@
 "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:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Okänd kodning \"%s\". Fortsätter med ASCII istället."
@@ -3877,39 +3599,28 @@
 "%s:%lu: varning: syntaxen $\"...\" kommer att tas bort av säkerhetsskäl; "
 "använd eval_gettext istället"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: varning: reguljärt uttryck avslutas för tidigt"
-
-#: src/xgettext.c:545
-#, 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
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, 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:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+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:859
+#: src/xgettext.c:820
 #, 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:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3918,23 +3629,23 @@
 "  -d, --default-domain=NAMN  använd NAMN.po som utfil (i st.f. messages."
 "po) \n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet till FIL\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Språkval i infiler:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3943,8 +3654,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NAMN         känn igen angivet språk\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3952,22 +3662,21 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   samma som --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3976,23 +3685,23 @@
 "      --from-code=NAMN        kodning av infiler\n"
 "                                (utom för Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4008,47 +3717,39 @@
 "nyckelordsrader\n"
 "                                 till resultatet\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Språkspecifika val:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahera alla strängar\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (bara språken C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (bara språken C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kORD, --keyword[=ORD]      sök efter ORD som ett extra nyckelord\n"
+"  -k, --keyword               använd inte standardnyckelord\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4058,88 +3759,86 @@
 "      --flag=ORD:NR:FLAGGA    extra FLAGGA för strängar inne i argument\n"
 "                              nummer NR för nyckelord ORD\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (bara språken C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (bara språken C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    känn igen Qt-formatsträngar\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (bara språket C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   känn igen KDE 4 formatsträngar\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 känn igen Boost-formatsträngar\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 mer detaljerad igenkänning av formatsträngar\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en \"Java .properties\"-fil\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, 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:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4147,7 +3846,7 @@
 "      --msgid-bugs-address=EPOST@ADRESS   sätt mottagare för msgid-"
 "felrapporter\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4157,7 +3856,7 @@
 "  -m[STRÄNG], --msgstr-prefix[=STRÄNG]  inled översatta strängar med STRÄNG "
 "eller \"\"\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4167,7 +3866,7 @@
 "  -M[STRÄNG], --msgstr-suffix[=STRÄNG]  avsluta översatta strängar med "
 "STRÄNG eller \"\"\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4175,31 +3874,31 @@
 msgstr ""
 "Ett \"--flag\"-argument har inte <ord>:<nummer>:[pass-]<flagga> syntax: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard in"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Icke-ASCII-tecken vid %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Icke-ASCII-kommentar vid eller före %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Icke-ASCII-sträng vid %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varning: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4208,7 +3907,7 @@
 "%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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4217,7 +3916,7 @@
 "%s är inte en giltig formatsträng för %s trots att den är deklarerad som en. "
 "Orsak: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4231,7 +3930,7 @@
 "Ö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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4241,30 +3940,30 @@
 "gettext(\"\") returnerar huvudet med metainformation,\n"
 "inte den tomma strängen.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "tvetydig argumentspecifikation för nyckelord \"%.*s\""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "varning: kontext saknas för nyckelordet \"%.*s\""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontext misstämmer mellan singular- och pluralformen"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4273,9 +3972,9 @@
 "på variabeln MSGID_BUGS_ADDRESS där, annars ange\n"
 "flaggan --msgid-bugs-address på kommandoraden.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "språket \"%s\" okänt"
 
 #: libgettextpo/gettext-po.c:84
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/tr.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/tr.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/tr.po gettext-0.18.1.1/gettext-tools/po/tr.po
--- gettext-0.19.3/gettext-tools/po/tr.po	2014-10-16 06:10:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/tr.po	2010-06-06 12:49:58.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\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"
@@ -28,25 +28,26 @@
 msgstr "argüman %s, %s için belirsiz"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "geçici dizin bulunamadı, $TMPDIR ortam değişkeniyle belirtmeyi deneyin"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "\"%s\" şablonu kullanılarak bir geçici dizin oluşturulamaz"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "geçici dosya %s silinemiyor"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "geçici dizin %s silinemiyor"
@@ -55,38 +56,37 @@
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:189
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:193
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "\"%s\" yedek dosyası yazılmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:197
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: gnulib-lib/copy-file.c:201
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
 msgstr "\"%s\" yazılırken hata"
 
-#: gnulib-lib/copy-file.c:205
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "\"%s\" okunduktan sonra hata"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -103,98 +103,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# sanal makinası bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s alt süreci başarısız"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class'ın source_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -207,96 +207,58 @@
 "Java sanal makinası bulunamadı,\n"
 "ya gij kurun ya da $JAVA değişkenini belirleyin"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s alt süreci G/Ç hatası"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, 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:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s alt sürecinden okunamadı"
-
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s alt süreci ile haberleşilemedi"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
+msgid "cannot create pipe"
+msgstr "veriyolu oluşturulamıyor"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "veriyolu oluşturulamıyor"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle başarısız oldu"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
@@ -312,20 +274,13 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s alt süreci ölümcül sinyal %d aldı"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "\"%s\" okunmak için açılırken hata"
-
-#: src/format.c:151
+#: src/format.c:148
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil. Sebebi: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
@@ -335,19 +290,17 @@
 "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
@@ -357,7 +310,7 @@
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "%u numaralı yönerge | ile başlıyor ama | ile bitmiyor."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -367,22 +320,20 @@
 "makronun ismi ile aynı değil. Geçerli makro isimleri ISO C 99 bölüm 7.8.1'de "
 "listelenmiştir."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "%u numaralı yönergede, '<' işaretinden sonraki dizgecikten sonra '>' "
 "gelmiyor."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Dizge %u numaralı argümana karşılık değil, %u numaralı argüman yok sayılıyor."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -472,16 +423,6 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Dizge yönergenin ortasında bitiyor."
@@ -691,9 +632,7 @@
 "%u numaralı yönergede, boyut belirteci '%c' dönüşüm belirtimi ile uyumlu "
 "değil."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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"
@@ -739,33 +678,6 @@
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, 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:165
-#, 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:185
-#, 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:270
-#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -813,11 +725,11 @@
 msgstr ""
 "%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -826,58 +738,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Makina ismini gösterir.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Çıktı biçemi:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 kısa konak ismi\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -887,34 +799,34 @@
 "  -f, --fqdn, --long          uzun konak ismi; alan ismini ve rümuzları da\n"
 "                              içerir\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            konak adresleri\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, 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/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
@@ -923,43 +835,45 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 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/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "makina ismi alınamadı"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "en fazla bir girdi dosyasına izin var"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -968,33 +882,33 @@
 "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 "ve özellikleri uygular.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  GİRDİDOSYASI                girdi olan PO dosyası\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1002,30 +916,30 @@
 "  -D, --directory=DİZİN       girdi dosyasının arandığı listeye DİZİNi "
 "ekler\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1033,12 +947,12 @@
 msgstr ""
 "Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "İleti seçimi:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1046,7 +960,7 @@
 "      --translated            çevrilmiş iletileri tutar çevrilmemişleri "
 "siler\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1054,62 +968,54 @@
 "      --untranslated          çevrilmemiş iletileri tutar çevrilmişleri "
 "siler\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' imli iletileri tutar\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           kullanımdışı olan #~ iletilerini siler\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         kullanımdışı olan #~ iletilerini tutar\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Nitelik değiştirme:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             tüm iletileri 'fuzzy' olarak imler\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           tüm 'fuzzy' imlerini kaldırır\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          tüm iletileri kullanımdışı yapar\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        kullanımdışı iletilerin tümünü kullanıma "
 "sokar\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1117,20 +1023,14 @@
 msgstr ""
 "      --clear-previous        tüm iletilerden eski msgid'ler kaldırılır\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=DOSYA.po    sadece DOSYA.po içindeki girdileri değiştirir\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1138,29 +1038,29 @@
 "      --ignore-file=DOSYA.po  sadece DOSYA.po içinde bulunmayan girdileri\n"
 "                              değiştirir\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 --only-fuzzy --clear-fuzzy ile eşanlamlı\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete             --only-obsolete --clear-obsolete ile eşanlamlı\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Girdi dosyası sözdizimi:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1168,8 +1068,8 @@
 "  -P, --properties-input      girdi dosyası Java .properties "
 "sözdizimindedir\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1178,17 +1078,17 @@
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi "
 "dosyası\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1197,16 +1097,16 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1214,9 +1114,9 @@
 "  -e, --no-escape             çıktıda C öncelemeleri kullanılmaz "
 "(öntanımlı)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1225,28 +1125,28 @@
 "karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1254,25 +1154,25 @@
 "  -n, --add-location          '#: dosyaismi:satır' satırları üretilir\n"
 "                              (öntanımlı\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, 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:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1280,16 +1180,16 @@
 "      --stringtable-output    çıktıyı bir NeXTstep/GNUstep .strings\n"
 "                              dosyasına yazar\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1298,32 +1198,32 @@
 "      --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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1331,9 +1231,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Belirtilen PO dosyalarını birleştirir ve katıştırır.\n"
 "Belirtilen PO dosyalarının iki veya daha fazlasında ortak olan iletileri\n"
@@ -1346,24 +1246,24 @@
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1372,7 +1272,7 @@
 "  -<, --less-than=SAYI        bu SAYIdan daha fazla olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı sonsuzdur.\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1381,7 +1281,7 @@
 "  ->, --more-than=NUMBER      bu SAYIdan daha az olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı 0 dır.\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1390,8 +1290,8 @@
 "  -u, --unique                --less-than=2 için kısaltmadır, sadece\n"
 "                              eşi olmayan iletiler basılır\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1399,8 +1299,8 @@
 "  -P, --properties-input      girdi dosyaları Java .properties "
 "sözdizimlidir\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1409,12 +1309,12 @@
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi\n"
 "                              dosyaları\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, 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:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1423,28 +1323,28 @@
 "      --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:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "hiçbir girdi dosyası verilmemiş"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tam olarak 2 girdi dosyası gerekli"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Kullanımı: %s [SEÇENEK] def.po ref.pot\n"
@@ -1475,12 +1375,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     kaynaklara bağlantılar\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "İşlem değiştiriciler:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1488,7 +1388,7 @@
 msgstr ""
 "  -m, --multi-domain          ref.pot'u tüm def.po dosyalarına uygular\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     fuzzy eşleşmeler kullanılmaz\n"
@@ -1514,17 +1414,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "bu iletiyi çevirmenin gözden geçirmesi lazım"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "bu ileti kullanıldı ama tanımlı değil..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ama bu tanımlama benzer"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
@@ -1534,27 +1434,27 @@
 msgid "warning: this message is not used"
 msgstr "uyarı: bu ileti kullanılmamış"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "en az iki dosya belirtilmelidir"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1568,7 +1468,7 @@
 "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
 "korunmuş olacaktır.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1577,71 +1477,71 @@
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           başlıktaki `msgid \"\"' girdisini yazmaz\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Bir çeviri kataloğunu başka bir karakter kodlamasına dönüştürür.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Dönüşüm hedefi:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          '#: dosyaismi:satır' satırları korunur\n"
 "                              (öntanımlı)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tam olarak 1 girdi dosyası gerekli"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] GİRDİDOSYASI\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1654,7 +1554,7 @@
 "PO Şablon dosyasıdır. Çevirisiz girdilere msgid ile uyuşan bir çeviri\n"
 "yerleştirilir ve fuzzy olarak imlenir.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  GİRDİDOSYASI                PO ya da POT dosyası\n"
@@ -1693,7 +1593,7 @@
 "'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n"
 "çıktılar.  \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak elverişlidir.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    PO dosyası\n"
@@ -1703,27 +1603,32 @@
 msgid "write to stdout failed"
 msgstr "standart çıktıya yazılamadı"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s alt sürecine yazılamadı"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "süzgeç ismi eksik"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "en az bir sed betiği belirtilmelidir"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK] SÜZGEÇ [SÜZGEÇ-SEÇENEĞİ]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Bir çeviri kataloğunun tüm çevirilerine bir süzgeç uygular.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1732,18 +1637,18 @@
 "SÜZGEÇ çeviriyi standart girdiden okuyabilen ve değiştirilmiş çeviriyi\n"
 "standart çıktıya yazabilen herhangi bir programdır.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "SÜZGEÇ 'sed' iken kullanılan SÜZGEÇ-SEÇENEKleri:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=BETİK      BETİK çalıştırılacak komutlara eklenir\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1753,14 +1658,14 @@
 "  -f, --file=BETİK            BETİK dosyasının içeriğini çalıştırılacak\n"
 "                              komutlara ekler\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       kalıp alanının otomatik basılmasını engeller\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1768,113 +1673,92 @@
 "      --no-escape             çıktıda C öncelemeleri kullanılmaz "
 "(öntanımlı)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                girintili çıktı tarzı\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           başlık değiştirilmeden korunur\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s ile %s bağdaşmıyor"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sadece %s ya da %s ile geçerlidir"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s sadece %s, %s ya da %s ile geçerlidir"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d çevrilmiş ileti"
 msgstr[1] "%d çevrilmiş ileti"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d belirsiz çeviri"
 msgstr[1] ", %d belirsiz çeviri"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d çevrilmemiş ileti"
 msgstr[1] ", %d çevrilmemiş ileti"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1883,17 +1767,17 @@
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n"
 "Benzer durum seçimlik argümanlar içinde geçerlidir.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1902,7 +1786,7 @@
 "  -j, --java                  Java kipi: bir Java ResourceBundle sınıfı "
 "üretir\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1912,13 +1796,13 @@
 "yüksek)\n"
 "                              kabul edilir\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1927,67 +1811,53 @@
 "      --csharp-resources      C# özkaynak kipi: bir .NET .resources dosyası\n"
 "                              üretilir\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, 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:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleştirilir\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ÖZKAYNAK     özkaynak ismi\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl               Tcl kipi: girdi bir tcl/msgcat .msg dosyasıdır\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1998,12 +1868,12 @@
 "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:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2011,7 +1881,7 @@
 msgstr ""
 "  -d DİZİN                    yerele bağımlı .dll dosyaları için kök dizin\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2021,17 +1891,17 @@
 "belirlenen\n"
 "dizinin bir altdizinine yazılır.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl kipte çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2039,45 +1909,12 @@
 msgstr ""
 "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, 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:871 src/xgettext.c:934
-#, fuzzy, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -k, --keyword[=SÖZCÜK]      aranan ek anahtar sözcük (SÖZCÜK için "
-"öntanımlı\n"
-"                              anahtar sözcükler kullanılmamalıdır)\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2088,13 +1925,13 @@
 "domain\n"
 "                              için kısaltma\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2103,7 +1940,7 @@
 "      --check-header          başlık girdilerilerinin varlığı ve içeriği\n"
 "                              kontrol edilir\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2112,7 +1949,7 @@
 "      --check-domain          --output-file seçeneği ile paket yönergeleri\n"
 "                              arasındaki çelişkiler kontrol edilir\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2120,7 +1957,7 @@
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt, X/Open msgfmt gibi mi davranıyor\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2130,118 +1967,98 @@
 "      --check-accelerators[=KRKT]  menü öğeleri için tuş belirticiler\n"
 "                                   kontrol edilir\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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:908
+#: src/msgfmt.c:763
 #, 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:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            çeviriler hakkındaki istatistikleri basar\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               daha ayrıntılı çıktı verilir\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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:1040
+#: src/msgfmt.c:893
 #, 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:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uyarı: PO dosya başlığı fuzzy\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2250,7 +2067,7 @@
 "'%c' seçeneği 'J', 'K', 'T', 'C' veya 'X' harflerinden biri belirtilmeden "
 "önce kullanılamaz"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2259,7 +2076,7 @@
 "Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n"
 "bir çeviri kataloğunun tüm iletilerini çıkarır.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2337,7 +2154,7 @@
 "  -v, --invert-match        sadece bir seçim kriteri ile eşleşmeyen iletiler\n"
 "                            çıktılanır\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2346,17 +2163,17 @@
 "karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sıralı çıktı üretir\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sıralama dosyanın yerine göre yapılır\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2366,7 +2183,7 @@
 "değişkenini ABOUT-NLS dosyasında açıklandığı gibi belirtin.\n"
 "Bu çevirinizi test edebilmeniz için gereklidir.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2377,24 +2194,24 @@
 "Lütfen --locale seçeneğinden bir yerel ya da\n"
 "--output-file seçeneğinden .po çıktı dosyası belirtin.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s oluşturuldu.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "Kullanıcının ortam değişkenlerindeki bilgilerle bir yeni PO dosyası oluşturur.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    POT dosyası\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2404,12 +2221,12 @@
 "Girdi dosyası verilmemişse, POT dosyası içinde bulunulan dizinde aranır,\n"
 "- verilmişse standart girdi okunur.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=DOSYA     çıktı belirtilen PO dosyasına yazılır\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2418,19 +2235,19 @@
 "Çıktı dosyası verilmemişse, --locale seçeneği ya da kullanıcının yerel\n"
 "ayarları kullanılır, - verilmişse sonuçlar standart çıktıya yazılır.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=tr_TR          hedef yerel belirtilir\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         PO dosyasının otomatik üretildiği varsayılır\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2439,12 +2256,12 @@
 "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
 "belirtin.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "dizin okunurken hata"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2453,14 +2270,14 @@
 "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
 "belirtin.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s alt süreci çıkış kodu %d ile başarısız"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2475,7 +2292,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
@@ -2491,15 +2308,15 @@
 msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyası `%s' başlığında bir karakter kümesi belirtilmemiş."
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
@@ -2511,8 +2328,8 @@
 msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
@@ -2634,46 +2451,46 @@
 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:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2681,60 +2498,65 @@
 "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:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "başlıkta `%s' başlık alanı yok\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "`%s' başlık alanı satırın başında olmalıydı\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
 msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "başlıkta `%s' başlık alanı yok\n"
+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-iconv.c:65
 #, c-format
@@ -2750,8 +2572,8 @@
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2769,8 +2591,8 @@
 " \"%s\" den \"%s\" e dönüşüm tekrarlar oluşturuyor: bazı msgid'ler aynı "
 "oluyor."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2779,16 +2601,16 @@
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı.\n"
 "Bu sürüm iconv() olmaksızın kurgulanmış."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sadece %s ile geçerlidir"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "yedekleme türü"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2811,17 +2633,17 @@
 "Daha iyi sonuçlar elde edebilmek için zorunlu eşleşmeler bulunamadığında\n"
 "belirsiz eşleşmeler kullanılmıştır.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      eski kaynaklara bağlı çeviriler\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     yeni kaynaklara bağlar\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2830,7 +2652,7 @@
 "  -C, --compendium=DOSYA      ileti çevirileri için ek veritabanı, birden\n"
 "                              fazla belirtilebilir\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2839,27 +2661,27 @@
 "  -U, --update                def.po dosyasını günceller,\n"
 "                              def.po zaten güncelse bir şey yapmaz\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Güncelleme kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Sonuç gerisin geri def.po'ya yazılır.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po'nun yedeklemesini yapar\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SONEK          yedekleme sonek kullanarak yapılır\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2878,39 +2700,39 @@
 "                              yedekleme yapılır\n"
 "  simple, never               daima basit yedekleme yapılır\n"
 
-#: src/msgmerge.c:559
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n"
 "belrtilmedikçe yedeklenen dosyanın soneki `~' dir.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       işlemin ilerleyişi gösterilmez\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr ".bu ileti çoğul biçem olmalıydı"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "bu ileti çoğul biçem olmamalıydı"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2919,7 +2741,7 @@
 "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık "
 "kullanılmayan ileti okundu.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3029,7 +2851,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                bilinen biçemde yazılır\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3050,12 +2872,12 @@
 "onlar ilk çeviriden alınır. Dosya konumları korunur. --unique seçeneği\n"
 "kullanıldığında tekrarlananlar iptal edilir.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              sadece yinelenenler yazılır\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3078,7 +2900,7 @@
 "\"%s\" karakter kümesi kabul görmüş bir isim değil.\n"
 "Kullanıcının karakter kümesine dönüşüm yapılamıyabilir.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3087,7 +2909,7 @@
 "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n"
 "ve iconv() \"%s\" desteği vermiyor.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3095,15 +2917,15 @@
 "GNU libiconv paketini kurduktan sonra GNU gettext paketini\n"
 "yeniden kurarak bu sorunun üstesinden gelmelisiniz.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Çözümleme hatalarına rağmen devam ediliyor."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Yine de devam ediliyor."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3112,7 +2934,7 @@
 "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n"
 "Bu sürüm iconv() olmaksızın kurgulanmış.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3125,27 +2947,27 @@
 msgid "inconsistent use of #~"
 msgstr "#~ kullanımı aykırı"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' bölümü yok"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "`msgid_plural' bölümü yok"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "`msgstr' bölümü yok"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ilk çoğul biçemin indeksi sıfır değil"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "çoğul biçemin indeksi hatalı"
@@ -3155,7 +2977,7 @@
 msgid "too many errors, aborting"
 msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "çoklu bayt dizisi geçersiz"
@@ -3199,16 +3021,16 @@
 msgid "context separator <EOT> within string"
 msgstr "dizge içinde <EOT> bağlam ayracı"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "ileti iki defa tanımlanmış"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "bu ilk tanımlamanın konumu"
 
@@ -3284,12 +3106,12 @@
 "Girdi metni standart girdiden okunur.  Dönüştürülmüş metin\n"
 "standart çıktıya çıktılanır.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "girdi \"%s\" kodlama için geçersiz"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" kodlamasından \"%s\" kodlamasına dönüşümde hata"
@@ -3313,21 +3135,11 @@
 "Bir URL'nin içeriğini alır ve çıktılar.  URL erişilebilir değilse,\n"
 "yerel DOSYA dosya kullanılır.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "\"%s\" okunurken hata"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "standart çıktıya yazılırken hata"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "\"%s\" okunduktan sonra hata"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3408,19 +3220,19 @@
 msgid "compilation of C# class failed"
 msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, 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:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3432,18 +3244,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" yazılmak için açılırken hata"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "çoklu bayt dizisi geçersiz"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3456,7 +3263,7 @@
 "olabilir. Salt ASCII msgctxt kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3537,7 +3344,7 @@
 "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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
@@ -3547,22 +3354,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uyarı: sonlandırılmamış düzenli ifade"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3605,7 +3407,7 @@
 "%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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
@@ -3619,7 +3421,7 @@
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
@@ -3639,22 +3441,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3668,73 +3460,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s%s içinde ASCII olmayan dizge.\n"
-"Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Çokbaytlı dizilim geçersiz.\n"
-"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Çokbaytlı dizilim eksik kalmış.\n"
-"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Dosyanın sonunda çokbaytlı dizilim eksik kalmış.\n"
-"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-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-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Çokbaytlı dizilim geçersiz.\n"
-"Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3771,7 +3496,7 @@
 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:278
+#: src/x-python.c:236
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3782,7 +3507,7 @@
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3794,7 +3519,7 @@
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3806,7 +3531,7 @@
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3818,7 +3543,7 @@
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3830,7 +3555,7 @@
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3842,7 +3567,7 @@
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodlaması bilinmiyor. Onun yerine ASCII ile işlem yapılacak."
@@ -3871,37 +3596,27 @@
 "%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık "
 "kullanılmayacak; yerine eval_gettext kullanın"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, 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:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, 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:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3909,24 +3624,24 @@
 msgstr ""
 "  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3934,8 +3649,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=İSİM         belirtilen dil tanınır:\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3945,19 +3659,19 @@
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3966,24 +3680,24 @@
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, 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:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3994,45 +3708,40 @@
 msgstr ""
 "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                              (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
 "                              Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                              (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -k, --keyword[=SÖZCÜK]      aranan ek anahtar sözcük (SÖZCÜK için "
+"öntanımlı\n"
+"                              anahtar sözcükler kullanılmamalıdır)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4042,14 +3751,13 @@
 "      --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:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                               (sadece bu diller: C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4057,56 +3765,56 @@
 "Java,\n"
 "                               C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sadece bu diller: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, 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:991
+#: src/xgettext.c:948
 #, 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:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4114,17 +3822,17 @@
 "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 "                              çıktıda atlanır\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4132,7 +3840,7 @@
 "      --msgid-bugs-address=EPOSTA@ADRESİ\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4142,7 +3850,7 @@
 "  -m, --msgstr-prefix[=DİZGE]  msgstr girdilerinde önek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4152,7 +3860,7 @@
 "  -M, --msgstr-suffix[=DİZGE]  msgstr girdilerinde sonek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4160,31 +3868,31 @@
 msgstr ""
 "Bir --flag argümanı <sözcük>:<argnum>:[pass-]<im> sözdiziminde olmaz: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uyarı: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4193,7 +3901,7 @@
 "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:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4202,7 +3910,7 @@
 "Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4215,7 +3923,7 @@
 "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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4225,31 +3933,30 @@
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, 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:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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:3052
+#: src/xgettext.c:2907
 #, 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:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4258,9 +3965,9 @@
 "MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
 "bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "dil `%s' bilinmiyor"
 
 #: libgettextpo/gettext-po.c:84
@@ -4273,6 +3980,24 @@
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
 
+#~ msgid "Not yet implemented."
+#~ msgstr "Henüz çalışmıyor."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s alt süreci ile haberleşilemedi"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s alt sürecinden okunamadı"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "%%%c için çoklu başvuru."
 
@@ -4289,15 +4014,6 @@
 #~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
 #~ "UYGUNLUĞU için bile garanti verilmez.\n"
 
-#~ msgid "Not yet implemented."
-#~ msgstr "Henüz çalışmıyor."
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "`%s' başlık alanı satırın başında olmalıydı\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
-
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the C# .dll format doesn't support contexts\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/uk.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/uk.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/uk.po gettext-0.18.1.1/gettext-tools/po/uk.po
--- gettext-0.19.3/gettext-tools/po/uk.po	2014-10-16 06:04:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/uk.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,15 @@
 # Ukrainian translation to gettext-tools
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
-#
+# This file is distributed under the same license as the gettext-tools package.
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-10 17:41+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2007-07-04 12:19+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +17,6 @@
 "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.5\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -31,65 +29,66 @@
 msgstr "неоднозначний аргумент %s для %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Допустимі аргументи:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "не вдається знайти тимчасовий каталог, встановіть змінну $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "не вдається створити тимчасовий каталог при використанні шаблону «%s»"
+msgstr ""
+"не вдається створити тимчасовий каталог при використанні шаблону \"%s\""
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
-msgstr "не вдається видалити тимчасовий файл «%s»"
+msgstr "не вдається видалити тимчасовий файл \"%s\""
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "не вдається видалити тимчасовий каталог «%s»"
+msgstr "не вдається видалити тимчасовий каталог \"%s\""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "збереження прав доступу для %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "помилка при відкриванні «%s» для читання"
+msgid "error while opening \"%s\" for reading"
+msgstr "помилка при відкриванні \"%s\" для читання"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "не вдається відкрити резервний файл «%s» для запису"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "не вдається відкрити резервний файл \"%s\" для запису"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "помилка читання «%s»"
+msgid "error reading \"%s\""
+msgstr "помилка читання \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "помилка запису «%s»"
+msgid "error writing \"%s\""
+msgstr "помилка запису \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "помилка після читання «%s»"
+msgid "error after reading \"%s\""
+msgstr "помилка після читання \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -106,98 +105,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Не знайдено віртуальну машину pnet, спробуйте встановити pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "аварійне завершення створеного процесу %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: параметр «%s» не є однозначним. Можливі варіанти:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: неоднозначний параметр `%s'\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n"
+msgstr "%s: параметр `--%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «%c%s» не передбачено\n"
+msgstr "%s: параметр `%c%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: до параметра «--%s» слід додати аргумент\n"
+msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: невідомий параметр «--%s»\n"
+msgstr "%s: невідомий параметр `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: невідомий параметр «%c%s»\n"
+msgstr "%s: невідомий параметр `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: некоректний параметр — «%c»\n"
+msgstr "%s: неправильний параметр -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: до параметра слід додати аргумент — «%c»\n"
+msgstr "%s: параметр %c має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: параметр «-W %s» не є однозначним\n"
+msgstr "%s: неоднозначний параметр `-W %s'\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n"
+msgstr "%s: параметр `-W %s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
+msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "некоректний аргумент source_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "не вдається створити «%s»"
+msgstr "не вдається створити \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "помилка запису файлу «%s»"
+msgstr "помилка запису файлу \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -210,100 +209,61 @@
 "Не знайдено віртуальну машину Java, встановіть gij або встановіть змінну "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "помилка вводу-виводу у дочірньому процесі %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'ять вичерпано"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr "спроба створення потоків обробки зазнала невдачі"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "не вдається записати у дочірній процес %s"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "помилка читання з дочірнього процесу %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "помилка зв'язку з дочірнім процесом %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "дочірній процес %s завершився з кодом %d"
+msgid "cannot create pipe"
+msgstr "не вдається створити канал"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "не вдається створити канал"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "аварійне завершення _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "не вдалося відновити fd %d: помилка dup2"
+msgstr "не вдається створити файл виводу \"%s\""
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -316,45 +276,36 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "дочірній процес %s отримав фатальний сигнал %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "помилка при відкриванні «%s» для читання"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"«%s» не є правильним рядком формату %s, на відміну від «%s». Причина: %s"
+"'%s' не є правильним рядком формату %s, на відміну від 'msgid'. Причина: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "специфікації для аргументу %u, як у «%s», немає у «%s»"
+msgstr "в 'msgid' відсутня специфікація формату для аргументу %u, як у '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "немає специфікації формату для аргументу %u у «%s»"
+msgstr "відсутня специфікація формату для аргументу %u у '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "специфікації форматів у «%s» і «%s» для аргументу %u не збігаються"
+msgstr "в 'msgid' та '%s' не збігаються специфікації формату для %u"
 
 #: src/format-boost.c:449
 #, c-format
@@ -363,7 +314,7 @@
 "Директива з номером %u починається з символу |, але не закінчується символом "
 "|."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -373,30 +324,28 @@
 "формату. Допустимі назви макросів перелічені у розділі 7.8.1 стандарту ISO C "
 "99."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "У директиві з номером %u, лексема після '<' не завершується дужкою '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Рядок посилається на аргумент з номером %u, але ігнорується аргумент з "
 "номером %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "кількості специфікацій формату у «%s» і «%s» не збігаються"
+msgstr "не відповідає кількість специфікацій формату у 'msgid' та '%s'"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "У директиві з номером %u, дужка «{» не завершується номером аргументу."
+msgstr "У директиві з номером %u, дужка '{' не завершується номером аргументу."
 
 #: src/format-csharp.c:109
 #, c-format
@@ -407,33 +356,33 @@
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"Рядок закінчується у середині директиви: знайдено «{» без відповідної дужки "
-"«}»."
+"Рядок закінчується у середині директиви: знайдено '{' без відповідної дужки "
+"'}'."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Директива з номером %u закінчується неправильним символом «%c» замість «}»."
+"Директива з номером %u закінчується неправильним символом '%c' замість '}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Директива з номером %u закінчується неправильним символом замість «}»."
+msgstr "Директива з номером %u закінчується неправильним символом замість '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"Рядок починається в середині директиви: знайдено «}» без відповідної дужки "
-"«{»."
+"Рядок починається в середині директиви: знайдено '}' без відповідної дужки "
+"'{'."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Рядок містить одну дужку «}» після директиви %u."
+msgstr "Рядок містить одну дужку '}' після директиви %u."
 
 #: src/format-gcc-internal.c:255
 #, c-format
@@ -444,7 +393,7 @@
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
-"У директиві з номером %u, не допускається визначник точності перед «%c»."
+"У директиві з номером %u, не допускається визначник точності перед '%c'."
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -456,12 +405,12 @@
 "дорівнювати %u."
 
 #: src/format-gcc-internal.c:398
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"У директиві з номером %u не допускається специфікація точності перед «%c»."
+"У директиві з номером %u, не допускається визначник точності перед '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -471,27 +420,17 @@
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "У директиві з номером %u, ключі не дозволяються перед «%c»."
+msgstr "У директиві з номером %u, ключі не дозволяються перед '%c'."
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "«%s» використовує %%m, а «%s» не використовує"
+msgstr "'msgid' використовує %%m, а '%s' не використовує"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "«%s» не використовує %%m, а «%s» використовує %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "«%s» використовує %%C, а «%s» не використовує"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "«%s» не використовує %%C, а «%s» використовує %%C"
+msgstr "'msgid' не використовує %%m а '%s' використовує %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -531,7 +470,7 @@
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
-"У директиві з номером %u, символ «%c» не є допустимою специфікацією "
+"У директиві з номером %u, символ '%c' не є допустимою специфікацією "
 "перетворення."
 
 #: src/format-invalid.h:37
@@ -554,18 +493,18 @@
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"У директиві з номером %u, рядок «%s»  у неприпустимому стилі дати/часу."
+"У директиві з номером %u, рядок \"%s\"  у неприпустимому стилі дати/часу."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "У директиві з номером %u, «%s» не завершується комою."
+msgstr "У директиві з номером %u, \"%s\" не завершується комою."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "У директиві з номером %u, рядок «%s» у неприпустимому форматі числа."
+msgstr "У директиві з номером %u, рядок \"%s\" у неприпустимому форматі числа."
 
 #: src/format-java.c:323
 #, c-format
@@ -573,8 +512,8 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"У директиві з номером %u, номер аргументу не завершується комою та одним "
-"з«%s», «%s», «%s», «%s»."
+"У директиві з номером %u, номер аргументу не завершується комою та одним з"
+"\"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
@@ -588,24 +527,25 @@
 "by '<', '#' or '%s'."
 msgstr ""
 "У директиві з номером %u, вибір містить число, яке не завершується '<', '#' "
-"чи «%s»."
+"чи '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "специфікація формату аргументу {%u}, тобто «%s», не існує у «%s»"
+msgstr "специфікація формату аргументу {%u}, тобто '%s', не існує у 'msgid'"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "специфікація формату аргументу {%u} не існує у «%s»"
+msgstr "специфікація формату аргументу {%u} не існує у '%s'"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "специфікації форматів у «%s» і «%s» для аргументу {%u} не збігаються"
+msgstr ""
+"специфікації формату у 'msgid' та '%s' для аргументу {%u} не збігаються"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -614,8 +554,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"У директиві з номером %u, параметр %u має тип «%s», але очікувався параметр "
-"типу «%s»."
+"У директиві з номером %u, параметр %u має тип '%s', але очікувався параметр "
+"типу '%s'."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -638,7 +578,7 @@
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "У директиві з номером %u, «%c» не завершується цифрою."
+msgstr "У директиві з номером %u, '%c' не завершується цифрою."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
@@ -654,7 +594,7 @@
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Знайдено «~%c» без відповідного «~%c»."
+msgstr "Знайдено '~%c' без відповідного '~%c'."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
@@ -681,14 +621,14 @@
 msgstr "Рядок посилається на деякий аргумент несумісним способом."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "специфікації формату у «%s» та «%s» не є еквівалентними"
+msgstr "специфікації формату у 'msgid' та '%s' не еквівалентні"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "специфікації формату у «%s» не є підмножиною специфікацій у «%s»"
+msgstr "специфікації формату у '%s' не є підмножиною специфікацій з 'msgid'"
 
 #: src/format-perl.c:433
 #, c-format
@@ -697,14 +637,12 @@
 "conversion specifier '%c'."
 msgstr ""
 "У директиві з номером %u, специфікація розміру несумісна з специфікацією "
-"перетворення «%c»."
+"перетворення '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "специфікація формату для аргументу «%s» не існує у «%s»"
+msgstr "специфікація формату для аргументу '%s' не існує у '%s'"
 
 #: src/format-python.c:115
 msgid ""
@@ -716,64 +654,37 @@
 #: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Рядок посилається на аргумент з назвою «%s» несумісним способом."
+msgstr "Рядок посилається на аргумент з назвою '%s' несумісним способом."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"специфікації формату у «%s» очікують відображення, а специфікації у «%s» "
+"специфікації формату у 'msgid' очікують відображення, а специфікації у '%s' "
 "вимагають кортеж"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"специфікації формату у «%s» очікують кортеж, а специфікації у «%s» очікують "
-"відображення"
+"специфікації формату у 'msgid' очікують кортеж, а специфікації у '%s' "
+"очікують відображення"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "специфікація формату аргументу «%s», тобто «%s», не існує у «%s»"
+msgstr ""
+"у 'msgid' відсутні специфікації формату для аргументу '%s', як і у '%s'"
 
 #: src/format-python.c:494
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "специфікації форматів у «%s» і «%s» для аргументу «%s» не збігаються"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "У директиві з номером %u «%c» не може розпочинати назву поля."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "У директиві з номером %u «%c» не може розпочинати аргумент getattr."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "У директиві з номером %u «%c» не може розпочинати аргумент getitem."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
-"У директиві з номером %u у визначенні форматування не можна використовувати "
-"більший рівень вкладеності."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr ""
-"У директиві з номером %u вказано незавершену інструкцію щодо форматування."
+"у 'msgid' та '%s' не збігаються специфікації формату для аргументу '%s'"
 
 #: src/format-qt.c:152
 #, c-format
@@ -781,8 +692,6 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"«%s» — простий рядок форматування, але «%s» не є таким рядком: цей рядок "
-"містить прапорець «L» або двоцифровий номер аргументу"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -813,7 +722,7 @@
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "У директиві з номером %u символ «%c» не є цифрою від 1 до 9."
+msgstr "У директиві з номером %u, символ '%c' не є цифрою від 1 до 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -822,11 +731,11 @@
 "1 and 9."
 msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -834,63 +743,59 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Авторські права належать Free Software Foundation, Inc., %s\n"
-"Умови ліцензування викладено у GPLv3+: GNU GPL версії 3 або новішій, <http://gnuorg/licenses/gpl.html>\n"
-"Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати його.\n"
-"Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автор програми %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "надто багато аргументів"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Віддайте команду «%s --help», щоб дізнатися більше.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Спробуйте `%s --help', щоб переглянути докладнішу інформацію.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Вивести назву системи.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Формат виводу:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 коротка назва вузла\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -901,34 +806,34 @@
 "назву\n"
 "                              та псевдоніми\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреси системи\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Інформативний вивід:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  вивести цю довідку та вийти\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               вивести інформацію про версію та вийти\n"
@@ -937,41 +842,43 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "не вдається отримати назву системи"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "допускається максимум один вхідний файл"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s та %s є взаємовиключними"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -980,33 +887,33 @@
 "Фільтрує повідомлення каталогу перекладів у відповідності до їх атрибутів,\n"
 "та маніпулює цими атрибутами.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Розташування вхідного файлу:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний файл PO\n"
+msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний PO файл\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1014,32 +921,32 @@
 "  -D, --directory=КАТАЛОГ     додати КАТАЛОГ до списку вхідних файлів "
 "пошуку\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Якщо вхідний файл не вказаний, або якщо вказано -, використовується "
 "стандартний ввід.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Розташування файлу виводу:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записати вивід у вказаний файл\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1049,85 +956,75 @@
 "записується\n"
 " у стандартний вивід.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Вибір повідомлень:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            зберегти перекладені, видалити неперекладені\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          зберегти неперекладені, видалити перекладені\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            зберегти повідомлення, позначені як 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           видалити застарілі #~ повідомлення\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         зберегти застарілі #~ повідомлення\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Керування атрибутами:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             позначити всі повідомлення як 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           позначити всі повідомлення як не 'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          позначити всі повідомлення застарілими\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        позначити всі повідомлення не застарілими\n"
 
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              якщо встановлено «fuzzy», зберегти попередні "
-"msgid\n"
-"                              перекладених повідомлень\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1136,21 +1033,14 @@
 "      --clear-previous        видалити \"previous msgid\" з усіх "
 "повідомлень\n"
 
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                 під час вилучення «fuzzy» спрожняти msgstr\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ФАЙЛ.po     обробляти лише елементи перелічені у ФАЙЛ.po\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1158,36 +1048,36 @@
 "      --ignore-file=ФАЙЛ.po   обробляти лише елементи не перелічені у ФАЙЛ."
 "po\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 синонім для --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              синонім для --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис вхідного файлу:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      вхідний файл має синтаксис Java .properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1196,17 +1086,17 @@
 "      --stringtable-input     вхідний файл має синтаксис NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробиці виводу:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1214,24 +1104,17 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 використовувати кольори та інші атрибути "
-"тексту завжди\n"
-"      --color=УМОВА           використовувати кольори та інші атрибути "
-"тексту за УМОВИ.\n"
-"                              УМОВА може мати значення «always», «never», "
-"«auto» або «html».\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
-"      --style=ФАЙЛ_СТИЛЮ      вказати файл правил стилю CSS для --color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1240,9 +1123,9 @@
 "екранування\n"
 "                              мови C (типово)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1250,30 +1133,29 @@
 "  -E, --escape                використовувати у виводі символи екранування\n"
 "                              мови C, без розширених символів\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              записувати файл PO, навіть порожній\n"
+msgstr "      --force-po              записувати PO файл, навіть порожній\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
-"  -i, --indent                записати файл .po, вживаючи стиль з "
-"відступами\n"
+"  -i, --indent                записати .po файл вживаючи стиль з відступами\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           не записувати рядки '#: назва_файлу:рядок'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1281,41 +1163,41 @@
 "  -n, --add-location          створювати рядки '#: назва_файлу:"
 "рядок' (типово)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                записувати файл .po, точно відповідний "
+"      --strict                записувати .po файл точно відповідний "
 "Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записати файл Java .properties\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    записати файл NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          встановити ширину сторінки виводу\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1324,32 +1206,32 @@
 "      --no-wrap               не розривати на декілька рядків довгі рядки\n"
 "                              повідомлень, що довші за ширину сторінки\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           сортувати вивід\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          сортувати вивід за розташуванням файлів\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "вказано неможливий критерій відбору (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1358,37 +1240,37 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
-"Зціплює та об'єднує вказані файли PO.\n"
-"Знаходить спільні повідомлення у двох або кількох вказаних файлах PO.\n"
+"Зціплює та об'єднує вказані PO файли.\n"
+"Знаходить спільні повідомлення у двох або кількох вказаних PO файлах.\n"
 "При використанні параметру --more-than, можна запитати вивід повідомлень,\n"
 "що зустрічаються частіше інших. Та навпаки, параметр --less-than\n"
 "використовується для отримання повідомлень, що рідше зустрічаються (тобто,\n"
-"--less-than=2 виведе лише унікальні повідомлення). Переклади, коментарі,\n"
-"видобуті коментарі та дані щодо розташування у файлі зберігаються, але якщо\n"
-"вказано --use-first, коментарі беруться з першого файла PO, у якому їх було\n"
-"визначено.\n"
+"--less-than=2 виведе лише унікальні повідомлення). Переклади, коментарі\n"
+"та витягнуті коментарі зберігаються, але якщо вказано --use-first, коментарі\n"
+"беруться з першого PO файлу, у якому вони були визначені. Коментарі з назвою\n"
+"файлу та номером рядка зберігаються для усіх PO файлів.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ ...            вхідні файли\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=ФАЙЛ       отримати перелік вхідних файлів з ФАЙЛ\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Якщо назвою вхідного файлу є -, використовується стандартний ввід.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1399,7 +1281,7 @@
 "                              кількість разів, якщо значення не вказано,\n"
 "                              типове значення - нескінченість\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1410,7 +1292,7 @@
 "                              кількість разів, якщо не вказано, типове\n"
 "                              значення дорівнює 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1419,16 +1301,16 @@
 "  -u, --unique                скорочення для --less-than=2, вказує\n"
 "                              виводити лише унікальні повідомлення\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      вхідні файли мають синтаксис Java .properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1437,12 +1319,12 @@
 "      --stringtable-input     вхідні файли мають синтаксис NeXTstep/GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=НАЗВА         кодування виводу\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1452,30 +1334,28 @@
 "                              кожного повідомлення, не об'єднувати декілька\n"
 "                              перекладів\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "не вказані вхідні файли"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "потрібно рівно 2 вхідні файли"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Використання: %s [ПАРАМЕТР] def.po ref.pot\n"
@@ -1490,9 +1370,9 @@
 "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 ""
-"Порівнює 2 файли .po у Uniforum-форматі, щоб дізнатись чи містять вони\n"
+"Порівнює 2 .po файли у Uniforum форматі, щоб дізнатись чи містять вони\n"
 "однаковий набір msgid рядків. Файл def.po - це існуючий файл з перекладом.\n"
-"Файл ref.pot - нещодавно створений файл PO або файл POT (зазвичай створюється\n"
+"Файл ref.pot - нещодавно створений PO файл, або POT файл (зазвичай створюється\n"
 "програмою xgettext). Це корисно для перевірки, що перекладені усі повідомлення\n"
 "у програмі. Якщо точну відповідність знайти не вдається, для покращення\n"
 "діагностики використовується приблизне порівняння.\n"
@@ -1507,12 +1387,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     посилання на джерело\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Модифікатори режиму роботи:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1521,7 +1401,7 @@
 "  -m, --multi-domain          застосувати ref.pot до кожного домену з def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1547,17 +1427,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "це повідомлення повинен перевірити перекладач"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "це повідомлення використовується програмою, але не було визначено..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...проте це визначення є подібним"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "це повідомлення використовується, але не було визначене у %s"
@@ -1567,7 +1447,7 @@
 msgid "warning: this message is not used"
 msgstr "попередження: це повідомлення не використовується"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1575,12 +1455,12 @@
 msgstr[1] "знайдено %d критичні помилки"
 msgstr[2] "знайдено %d критичних помилок"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "необхідно вказати принаймні два файли"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1588,20 +1468,20 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Знаходить спільні повідомлення у двох або кількох вказаних файлах PO.\n"
+"Знаходить спільні повідомлення у двох або кількох вказаних PO файлах.\n"
 "При використанні параметру --more-than, можна запитана вивід повідомлень,\n"
 "що зустрічаються частіше інших. Та навпаки, параметр --less-than\n"
 "використовується для отримання повідомлень, що рідше зустрічаються (тобто,\n"
 "--less-than=2 виведе лише унікальні повідомлення). Переклади, коментарі\n"
 "та витягнуті коментарі зберігаються, але якщо вказано --use-first, коментарі\n"
-"беруться з першого файла PO, у якому вони були визначені. Коментарі з назвою\n"
-"файлу та номером рядка зберігаються для усіх файлів PO.\n"
+"беруться з першого PO файлу, у якому вони були визначені. Коментарі з назвою\n"
+"файлу та номером рядка зберігаються для усіх PO файлів.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1611,70 +1491,70 @@
 "                              кількістю визначень, якщо число не вказано,\n"
 "                              типове значення дорівнює 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header           не записувати заголовок у записі «msgid \"\"»\n"
+"      --omit-header           не записувати заголовок у `msgid \"\"' "
+"елементі\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Перетворює каталог перекладів у інше кодування.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Результат перетворення:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Типовим кодуванням є кодування поточної локалі.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                стиль виводу з відступами\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           не виводити '#: filename:line' рядки\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          зберігати рядки «#: назва файла:рядок» (типова "
-"поведінка)\n"
+"      --add-location          зберігати '#: filename:line' рядки (типово)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                стиль виводу Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "не вказано вхідний файл"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "потрібен лише один вхідний файл"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Використання:  %s [ПАРАМЕТР] ВХІДНИЙ_ФАЙЛ\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1683,10 +1563,10 @@
 "identical to the msgid.\n"
 msgstr ""
 "Створює каталог перекладу Англійською. Вхідний файл - нещодавно створений\n"
-"файл PO або файл POT (зазвичай створений xgettext). Неперекладеним елементам\n"
+"PO файл, або POT файл (зазвичай створений xgettext). Не перекладеним елементам\n"
 "призначається переклад, ідентичний до вмісту msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний PO або POT файл\n"
@@ -1725,37 +1605,42 @@
 "Спеціальна вбудована команда з назвою '0' виводить переклад, який завершується\n"
 "нульовим байтом. Вивід команди \"msgexec 0\" підходить як ввід команди \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний файл PO\n"
+msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний PO файл\n"
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "не вдається записати в стандартний вивід"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "не вдається записати у дочірній процес %s"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "не вказана назва фільтру"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "необхідно вказати принаймні один сценарій для sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР] ФІЛЬТР [ПАРАМЕТРИ-ФІЛЬТРУ]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Застосовує фільтр до всіх перекладів у каталозі.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1765,18 +1650,18 @@
 "вводу\n"
 "та записує змінений переклад у стандартний вивід.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Корисні ПАРАМЕТРИ-ФІЛЬТРУ якщо ФІЛЬТР є 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=СЦЕНАРІЙ   додати СЦЕНАРІЙ до виконуваних команд\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1786,13 +1671,13 @@
 "  -f, --file=ФАЙЛ_СЦЕНАРІЮ    додати вміст ФАЙЛУ_СЦЕНАРІЮ до виконуваних "
 "команд\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       не виводити автоматично шаблони\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1800,12 +1685,12 @@
 "      --no-escape             вимкнути у виводі екранування у стилі C "
 "(типово)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                стиль виводу з відступами\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1813,71 +1698,50 @@
 "      --keep-header           залишити заголовок незмінним, не фільтрувати "
 "його\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент %s повинен бути поодиноким знаком пунктуації"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправильно вказано порядок байтів: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "якщо вказано %s та %s, файл вхідних даних вказувати не слід"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s вимагає вказати параметр \"-d каталог\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s вимагає вказати параметр \"-l локаль\""
 
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "для %s слід вказати специфікацію «--template шаблон»"
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "для %s слід вказати специфікацію «-o файл»"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "не можна одночасно використовувати %s та %s у %s"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s допускається лише з %s або %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s допускається лише з %s, %s або %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1885,7 +1749,7 @@
 msgstr[1] "%d перекладених повідомлення"
 msgstr[2] "%d перекладених повідомлень"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1893,7 +1757,7 @@
 msgstr[1] ", %d неточних переклади"
 msgstr[2] ", %d неточних перекладів"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1901,17 +1765,17 @@
 msgstr[1] ", %d неперекладених повідомлення"
 msgstr[2] ", %d неперекладених повідомлень"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Використання: %s [ПАРАМЕТР] назва_файлу.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Створює двійковий каталог повідомлень з текстового опису.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1920,17 +1784,17 @@
 "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 "Те ж саме й для необов'язкових аргументів.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  назва_файлу.po ...          вхідні файли\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим роботи:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1938,7 +1802,7 @@
 msgstr ""
 "  -j, --java                  режим Java: створює Java ResourceBundle клас\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1947,12 +1811,12 @@
 "      --java2                 як і --java, вважається Java2 (JDK 1.2 чи "
 "вище)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                режим C#: створює файли .NET .dll\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1961,71 +1825,56 @@
 "      --csharp-resources      режим C# ресурсів: створює файл .NET ."
 "resources\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   режим Tcl: створює файл tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    режим Qt: створює файл Qt .qm\n"
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               режим запису до desktop: створити файл ."
-"desktop\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                перейти у режим відповідності до Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Розташування вхідного файлу у режимі Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       назва ресурсу\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=ЛОКАЛЬ         назва локалі, або мова або мова_КРАЇНА\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr "      --source                створити файл .java, а не файл .class\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d КАТАЛОГ                  базовий каталог ієрархії каталогів класів\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2037,12 +1886,12 @@
 "після знаку підкреслення.  Параметр -d є обов'язковим.  Клас записується\n"
 "у вказаний каталог.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Розташування вхідного файлу у режимі C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2051,7 +1900,7 @@
 "  -d КАТАЛОГ                  базовий каталог залежних від локалі .dll "
 "файлів\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2060,18 +1909,18 @@
 "Параметри -l та -d є обов'язковими.  Файл .dll записується у підкаталог\n"
 "вказаного каталогу, назва якого залежить від локалі.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Розташування вхідного файлу у режимі Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d КАТАЛОГ                  базовий каталог каталогів .msg повідомлень\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2080,49 +1929,12 @@
 "Параметри -l та -d є обов'язковими.  Файл .msg записується у вказаний "
 "каталог.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr "Параметри режиму запису desktop:\n"
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-"  --template=ШАБЛОН           файл .desktop, який слід використати як "
-"шаблон\n"
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d КАТАЛОГ                  базовий каталог для файлів .po\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kСЛОВО, --keyword=СЛОВО    шукати СЛОВО як додаткове ключове слово\n"
-"  -k, --keyword               не використовувати типових ключових слів\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Параметри -l, -o та --template є обов’язковими. Якщо вказано параметр -D\n"
-"файли вхідних даних буде прочитано з каталогу, а не з аргументів командного\n"
-"рядка.\n"
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Інтерпретація вхідного файлу:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2133,13 +1945,13 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          перевірити залежний від мови формат рядків\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2148,7 +1960,7 @@
 "      --check-header          перевірити наявність та вміст елементу "
 "заголовка\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2158,7 +1970,7 @@
 "та\n"
 "                                параметром --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2167,7 +1979,7 @@
 "  -C, --check-compatibility   перевірити, що GNU msgfmt поводиться як X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2178,12 +1990,12 @@
 "у\n"
 "                                пунктах меню\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             виводити елементи неточного перекладу\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2191,120 +2003,96 @@
 "  -a, --alignment=ЧИСЛО       форматувати рядки по ЧИСЛО байт у рядку "
 "(типово: %d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=ПОРЯДОК    записувати 32-бітові числа з вказаним порядком "
-"байтів\n"
-"                                (зворотний (big) або прямий (little),\n"
-"                                 типовий залежить від платформи)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               двійковий файл не буде включати хеш-таблицю\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            вивести статистику про переклад\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               збільшити рівень докладності виводу\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr "попередження: заголовок файла PO відсутній або некоректний\n"
+msgstr "попередження: заголовок PO файлу відсутній або некоректний\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "попередження: перетворення кодувань символів не працюватиме\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr "попередження: заголовок файла PO позначений як нечіткий переклад\n"
+msgstr "попередження: заголовок PO файлу позначений як нечіткий переклад\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "попередження: старі версії msgfmt сприйматимуть це як помилку\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "назва домену «%s» не може використовуватись як назва файлу"
+msgstr "назва домену \"%s\" не може використовуватись як назва файлу"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
-"назва домену «%s» не може використовуватись як назва файлу: буде використано "
-"префікс"
+"назва домену \"%s\" не може використовуватись як назва файлу: буде "
+"використано префікс"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "директиву «domain %s» проігноровано"
+msgid "`domain %s' directive ignored"
+msgstr "директиву `domain %s' проігноровано"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "порожній елемент «msgstr» проігноровано"
+msgid "empty `msgstr' entry ignored"
+msgstr "порожній елемент `msgstr' проігноровано"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "елемент з нечітким перекладом «msgstr» проігноровано"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "елемент з нечітким перекладом `msgstr' проігноровано"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: попередження: вихідний файл містить нечіткий переклад"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s не існує"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "%s існує, але непридатний до читання"
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "помилка при читанні «%s»"
+msgstr "помилка при читанні \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"параметр «%c» не може використовуватись перед символами 'J', 'K', 'T', 'C' "
+"параметр '%c' не може використовуватись перед символами 'J', 'K', 'T', 'C' "
 "чи 'X'"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2313,7 +2101,7 @@
 "Отримати усі повідомлення з каталогу перекладу, які відповідають вказаному\n"
 "шаблону або належать до певних вказаних вхідних файлів.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2388,7 +2176,7 @@
 "  -v, --invert-match          виводити лише повідомлення, які не відповідають\n"
 "                              жодному критерію відбору\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2396,27 +2184,27 @@
 "      --escape                використовувати у виводі екранування у стилі "
 "C, без розширених символів\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           сортувати інформацію, що виводиться\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          сортувати за розташуванням у файлах\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 "Ваше середовище індиферентне до мови. Будь ласка встановіть\n"
-"змінну середовища LANG, як описано у файлі ABOUT-NLS. Це необхідно,\n"
+"змінну оточення LANG, як описано у файлі ABOUT-NLS. Це необхідно,\n"
 "щоб ви мали змогу перевірити ваш переклад.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2424,27 +2212,27 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 "Файл виводу %s вже існує.\n"
-"Вкажіть локаль у параметрі --locale, або вкажіть файл .po\n"
+"Вкажіть локаль у параметрі --locale, або вкажіть .po файл\n"
 "виводу у параметрі --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створено %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
-msgstr "Створює новий файл PO, метаінформація ініціалізується з середовища користувача.\n"
+msgstr "Створює новий PO файл, мета-інформація ініціалізується з оточення користувача.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний POT файл\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2454,12 +2242,12 @@
 "Якщо не вказано вхідний файл, POT файл шукається у поточному каталозі.\n"
 "Якщо вказано -, файл читається зі стандартного вводу.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записати вивід у вказаний файл PO\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2469,19 +2257,19 @@
 "локалі\n"
 "користувача. Якщо вказано знак -, результат виводиться у стандартний вивід.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          встановити цільову локаль\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         вважати, що файл PO створений автоматично\n"
+"      --no-translator         вважати, що PO файл створений автоматично\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2489,12 +2277,12 @@
 "Знайдено більш ніж один .pot файл.\n"
 "Вкажіть вхідний .pot файл у параметрі --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "помилка при читанні поточного каталогу"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2502,14 +2290,14 @@
 "Не знайдено .pot файл у поточному каталозі.\n"
 "Вкажіть вхідний .pot файл у параметрі --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "процес-нащадок %s завершився аварійно з кодом %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2526,7 +2314,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Переклад українською для пакету %s"
@@ -2534,36 +2322,36 @@
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "вказане кодування «%s» не є переносною назвою кодування"
+msgstr "вказане кодування \"%s\" не є переносною назвою кодування"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "у вхідному файлі два різні кодування «%s» та «%s»"
+msgstr "у вхідному файлі два різні кодування \"%s\" та \"%s\""
 
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "вхідний файл «%s» не містить елемент заголовка, який вказує кодування"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "вхідний файл `%s' не містить елемент заголовка, який вказує кодування"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"домен «%s» у вхідному файлі «%s» не містить елемент заголовку, який вказує "
+"домен \"%s\" у вхідному файлі `%s' не містить елемент заголовку, який вказує "
 "кодування"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "цільове кодування «%s» не є переносною назвою кодування."
+msgstr "цільове кодування \"%s\" не є переносною назвою кодування."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
@@ -2611,9 +2399,9 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Кодування локалі «%s» відрізняється від\n"
-"кодування вхідного файлу «%s».\n"
-"Вивід «%s» може бути некоректним.\n"
+"Кодування локалі \"%s\" відрізняється від\n"
+"кодування вхідного файлу \"%s\".\n"
+"Вивід '%s' може бути некоректним.\n"
 "Можливі обхідні шляхи:\n"
 
 #: src/msgl-charset.c:100
@@ -2629,7 +2417,7 @@
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 "- Перетворити каталог перекладу у %s використовуючи 'msgconv',\n"
-"  потім застосувати «%s»,\n"
+"  потім застосувати '%s',\n"
 "  потім перетворити назад на %s використовуючи 'msgconv'.\n"
 
 #: src/msgl-charset.c:114
@@ -2642,7 +2430,7 @@
 msgstr ""
 "- Встановити LC_ALL у локаль з кодуванням %s,\n"
 "  перетворити каталог перекладу у %s використовуючи 'msgconv',\n"
-"  потім застосувати «%s»,\n"
+"  потім застосувати '%s',\n"
 "  потім перетворити назад у %s використовуючи 'msgconv'.\n"
 
 #: src/msgl-charset.c:128
@@ -2652,8 +2440,8 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Кодування локалі «%s» не є є переносною назвою кодування.\n"
-"Вивід «%s» може бути некоректним.\n"
+"Кодування локалі \"%s\" не є є переносною назвою кодування.\n"
+"Вивід '%s' може бути некоректним.\n"
 "Можливим обхідним шляхом є встановлення LC_ALL=C.\n"
 
 #: src/msgl-check.c:130
@@ -2689,32 +2477,32 @@
 msgid "Try using the following, valid for %s:"
 msgstr "Спробуйте використати наступне, що є правильним для %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "каталог повідомлень має переклади з множинними формами"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "але заголовок не містить атрибут \"plural=ВИРАЗ\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "але заголовок не містить атрибут \"nplurals=ЦІЛЕ_ЧИСЛО\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "неправильне значення nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "неправильне значення plural"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2722,7 +2510,7 @@
 msgstr[1] "але деякі повідомлення мають лише %lu множинні форми"
 msgstr[2] "але деякі повідомлення мають лише %lu множинних форм"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2730,7 +2518,7 @@
 msgstr[1] "але деякі повідомлення мають %lu множинні форми"
 msgstr[2] "але деякі повідомлення мають %lu множинних форм"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2738,81 +2526,90 @@
 "каталог повідомлень має переклад з множинними формами, але заголовок не "
 "містить \"Plural-Forms: nplurals=ЦІЛЕ; plural=ВИРАЗ;\""
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
-"обидва елементи «msgid» та «msgid_plural» не починаються одночасно з «\\n»"
+"обидва елементи `msgid' та `msgid_plural' не починаються одночасно з '\\n'"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
-"обидва елементи «msgid» та «msgstr[%u]» не починаються одночасно з «\\n»"
+"обидва елементи `msgid' та `msgstr[%u]' не починаються одночасно з '\\n'"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "елементи «msgid» та «msgstr» не починаються одночасно з «\\n»"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "елементи `msgid' та `msgstr' не починаються одночасно з '\\n'"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "елементи «msgid» та «msgid_plural» не закінчуються одночасно на «\\n»"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "елементи `msgid' та `msgid_plural' не закінчуються одночасно на '\\n'"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "елементи «msgid» та «msgstr[%u]» не закінчуються одночасно на «\\n»"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "елементи `msgid' та `msgstr[%u]' не закінчуються одночасно на '\\n'"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "елементи «msgid» та «msgstr» не закінчуються одночасно на «\\n»"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "елементи `msgid' та `msgstr' не закінчуються одночасно на '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "обробка множинних форм є розширенням GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "у msgstr відсутній символ клавішного акселератора «%c»"
+msgstr "у msgstr відсутній символ клавішного акселератора '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr містить надто багато символів клавішних акселераторів «%c»"
+msgstr "msgstr містить надто багато символів клавішних акселераторів '%c'"
 
-#: src/msgl-check.c:814
-#, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "поле заголовка «%s» все ще містить початкове типове значення\n"
-
-#: src/msgl-check.c:831
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "у заголовку немає поля «%s»\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "у заголовку відсутнє поле `%s'\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "поле заголовку `%s' повинно починатись с початку рядка\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "деякі поля заголовків досі мають початкові типові значення\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "деякі поля заголовків досі мають початкові типові значення\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: вхідний потік не є коректним для кодування «%s»"
+msgstr "%s: вхідний потік не є коректним для кодування \"%s\""
 
 #: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: помилка при перетворенні кодування з «%s» на «%s»"
+msgstr "%s: помилка при перетворенні кодування з \"%s\" на \"%s\""
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "вхідний файл не містить заголовок, що вказує кодування"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, 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() "
-"не підтримує це перетворення."
+"Не вдається перетворити з \"%s\" на \"%s\". %s використовує iconv(), а iconv"
+"() не підтримує це перетворення."
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2820,29 +2617,29 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Перетворення з «%s» у «%s» призводить до появи дублікатів: деякі msgid ключі "
-"стануть однаковими."
+"Перетворення з \"%s\" у \"%s\" призводить до появи дублікатів: деякі msgid "
+"ключі стануть однаковими."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Не вдається перетворити з «%s» у «%s». %s використовує iconv(). Ця версія "
-"скомпільована без iconv()."
+"Не вдається перетворити з \"%s\" у \"%s\". %s використовує iconv(). Ця "
+"версія скомпільована без iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s є допустимим лише разом з %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "тип резервної копії"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2855,8 +2652,8 @@
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Об'єднує два файли .po у Uniforum-стилі.  Файл def.po є наявним\n"
-"файлом PO з перекладами, які будуть взяті у створюваний файл якщо вони\n"
+"Об'єднує два .po файли у Uniforum стилі разом.  Файл def.po є існуючим\n"
+"PO файлом з перекладами, які будуть взяті у створюваний файл якщо вони\n"
 "є відповідними; коментарі зберігаються, але витягнуті коментарі та\n"
 "позиції у файлі будуть відкинуті.  Файл ref.pot є нещодавно створеним PO\n"
 "файлом з оновленими вхідними посиланнями, але старим перекладом, або\n"
@@ -2865,17 +2662,17 @@
 "у файл будуть збережені.  Якщо неможливо знайти точну відповідність,\n"
 "для отримання кращого результату використовується неточна відповідність.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      переклади з посиланнями на старий код\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     посилання на новий код\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2884,7 +2681,7 @@
 "  -C, --compendium=ФАЙЛ       додаткова бібліотека перекладів повідомлень,\n"
 "                              може бути вказано більш ніж один раз\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2893,29 +2690,29 @@
 "  -U, --update                оновити def.po,\n"
 "                              нічого не робить, якщо def.po вже оновлений\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Розташування файлу виводу у режимі оновлення:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Результат записується назад у def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=КОНТРОЛЬ       зробити резервну копію def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=СУФІКС         перевизначити звичайний суфікс резервної "
 "копії\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2927,25 +2724,25 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 "Метод контролю версії можна вказати параметром --backup або у змінній\n"
-"середовища VERSION_CONTROL.  Ось можливі значення:\n"
+"оточення VERSION_CONTROL.  Ось можливі значення:\n"
 "  none, off       не робити резервних копій (навіть якщо вказано --backup)\n"
 "  numbered, t     робити резервні копії з номерами\n"
 "  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - "
 "прості\n"
 "  simple, never   завжди використовувати прості резервні копії\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Суфіксом резервної копії є «~», якщо він не перевизначений параметром --"
+"Суфіксом резервної копії є `~', якщо він не перевизначений параметром --"
 "suffix\n"
-"або змінною середовища SIMPLE_BACKUP_SUFFIX.\n"
+"або змінною значення SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2953,22 +2750,22 @@
 "      --previous              зберегти попередні msgid перекладених "
 "повідомлень\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       не виводити індикатор поступу\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "це повідомлення повинно визначати множинні форми"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "це повідомлення не повинно визначати множинні форми"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2977,7 +2774,7 @@
 "%sПрочитано %ld старих + %ld посилань, об'єднано %ld, неточних %ld, "
 "відсутніх %ld, застарілих %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2996,7 +2793,7 @@
 #: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Перетворює двійковий каталог повідомлень у файл .po Uniforum-стилю.\n"
+msgstr "Перетворює двійковий каталог повідомлень у .po файл Uniforum стилю.\n"
 
 #: src/msgunfmt.c:440
 #, c-format
@@ -3090,7 +2887,7 @@
 msgstr ""
 "      --strict                виводити у точній відповідності до uniforum\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3111,12 +2908,12 @@
 "параметр --use-first, вони беруться від першого перекладу.  Позиції у файлах\n"
 "будуть зібрані до купи.  При використанні --unique, дублікати відкидаються.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              виводити лише дублікати\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3136,19 +2933,19 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Кодування «%s» не є переносною назвою кодування.\n"
+"Кодування \"%s\" не є переносною назвою кодування.\n"
 "Перетворення повідомлення у кодування користувача може не працювати.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Кодування «%s» не підтримується. %s використовує iconv(),\n"
-"а iconv() не підтримує «%s».\n"
+"Кодування \"%s\" не підтримується. %s використовує iconv(),\n"
+"а iconv() не підтримує \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3156,24 +2953,24 @@
 "Встановлення GNU libiconv та повторне встановлення GNU gettext\n"
 "виправить цю проблему.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Виконання продовжується у будь-якому разі, очікуються помилки аналізу."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Виконання продовжується у будь-якому разі."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Кодування «%s» не підтримується. %s використовує iconv().\n"
+"Кодування \"%s\" не підтримується. %s використовує iconv().\n"
 "Ця версія скомпільована без підтримки iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3187,27 +2984,27 @@
 msgid "inconsistent use of #~"
 msgstr "несумісне використання #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "пропущено розділ «msgstr[]»"
+msgid "missing `msgstr[]' section"
+msgstr "пропущено розділ `msgstr[]'"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "пропущено розділ «msgid_plural»"
+msgid "missing `msgid_plural' section"
+msgstr "пропущено розділ `msgid_plural'"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "пропущено розділ «msgstr»"
+msgid "missing `msgstr' section"
+msgstr "пропущено розділ `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "перша множинна форма має ненульовий індекс"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "множинна форма має неправильний індекс"
@@ -3217,7 +3014,7 @@
 msgid "too many errors, aborting"
 msgstr "надто багато помилок, виконання перервано"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неправильна мультибайтна послідовність"
@@ -3239,7 +3036,7 @@
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "невідоме ключове слово «%s»"
+msgstr "невідоме ключове слово \"%s\""
 
 #: src/po-lex.c:854
 #, c-format
@@ -3261,38 +3058,38 @@
 msgid "context separator <EOT> within string"
 msgstr "розділювач контексту <EOT> посеред рядка"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "цей файл не може містити доменних директив"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "дублікат визначення повідомлення"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "це місце першого визначення"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "файл «%s» обрізаний"
+msgstr "файл \"%s\" обрізаний"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "файл «%s» містить рядок з не-NUL завершенням"
+msgstr "файл \"%s\" містить рядок з не-NUL завершенням"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "файл «%s» не у GNU .mo форматі"
+msgstr "файл \"%s\" не у GNU .mo форматі"
 
 #: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "файл «%s» містить рядок з не-NUL завершенням, у %s"
+msgstr "файл \"%s\" містить рядок з не-NUL завершенням, у %s"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3345,15 +3142,15 @@
 "Вхідний текст читається зі стандартного потоку вводу.  Перетворений текст\n"
 "виводиться у стандартний потік виводу.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "вхідний потік не є коректним для кодування «%s»"
+msgstr "вхідний потік не є коректним для кодування \"%s\""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "помилка при перетворення з кодування «%s» на «%s»"
+msgstr "помилка при перетворення з кодування \"%s\" на \"%s\""
 
 #: src/urlget.c:159
 #, c-format
@@ -3374,35 +3171,25 @@
 "Витягує та виводить вміст URL.  Якщо URL недоступний,\n"
 "натомість використовується локально доступний ФАЙЛ.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "помилка читання «%s»"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "помилка при записі у стандартний вивід"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "помилка після читання «%s»"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "Отримання %s…"
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr " перевищено час очікування.\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " невдало.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3449,7 +3236,7 @@
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "не вдається створити файл виводу «%s»"
+msgstr "не вдається створити файл виводу \"%s\""
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
@@ -3458,7 +3245,7 @@
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "не вдається створити каталог «%s»"
+msgstr "не вдається створити каталог \"%s\""
 
 #: src/write-csharp.c:766
 #, c-format
@@ -3466,46 +3253,41 @@
 msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
 #: src/write-csharp.c:768
-#, c-format
+#, fuzzy, c-format
 msgid "compilation of C# class failed"
-msgstr "помилка при компіляції класу C#"
+msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "не є правильною назвою класу Java: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
 
-#: src/write-java.c:1213
-#, c-format
+#: src/write-java.c:1168
+#, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
-"помилка при компіляції класу Java, спробуйте встановити значення $JAVAC"
+"помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "помилка при відкриванні «%s» для запису"
+msgstr "помилка при відкриванні \"%s\" для запису"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "неправильна мультибайтна послідовність"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"інтернаціоналізовані повідомлення не повинні містити керівну послідовність "
-"«\\%c»"
+"інтернаціоналізовані повідомлення не повинні містити `\\%c' escape-"
+"послідовність"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3518,7 +3300,7 @@
 "вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3566,7 +3348,7 @@
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "помилка при записі у «%s» дочірній процес"
+msgstr "помилка при записі у \"%s\" дочірній процес"
 
 #: src/write-resources.c:131
 msgid ""
@@ -3600,7 +3382,7 @@
 "каталог повідомлень містить переклад з множинними формами\n"
 "але формат каталогу повідомлень Tcl не підтримує множинні форми\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: попередження: незавершений рядок"
@@ -3610,24 +3392,22 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: попередження: незавершений регулярний вираз"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "попередження: некоректний символ Unicode"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: попередження: незавершений символьний літерал"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "Вкажіть вхідне кодування у параметрі --from-code."
+msgstr ""
+"Не-ASCII рядок у %s%s.\n"
+"Вкажіть вхідне кодування у параметрі --from-code.\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3665,7 +3445,7 @@
 "%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: помилка iconv"
@@ -3679,7 +3459,7 @@
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: попередження: неправильний символ Юнікоду"
@@ -3692,30 +3472,19 @@
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: попередження: знайдено ')' там де очікувалась «}»"
+msgstr "%s:%d: попередження: знайдено ')' там де очікувалась '}'"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: попередження: знайдено «}» там де очікувалась ')'"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Для рядка, видобутого з елемента «%s», не вказано контексту"
+msgstr "%s:%d: попередження: знайдено '}' там де очікувалась ')'"
 
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-"У коректному файлі Glade не можна використовувати кореневий елемент <%s>"
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3725,78 +3494,14 @@
 "Ця версія скомпільована без підтримки expat.\n"
 
 #: src/x-java.c:494
-#, c-format
+#, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: попередження: одиничний замінник U+%04X"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Вкажіть вхідне кодування у параметрі --from-code.\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неправильна мультибайтова послідовність.\n"
-"Вкажіть вхідне кодування у параметрі --from-code.\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Довга незавершена мультибайтова послідовність.\n"
-"Вкажіть вхідне кодування у параметрі --from-code.\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Незавершена мультибайтова послідовність наприкінці файлу.\n"
-"Вкажіть вхідне кодування у параметрі --from-code.\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
-"Вкажіть вхідне кодування у параметрі --from-code.\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Неправильна мультибайтова послідовність.\n"
-"Вкажіть вхідне кодування у параметрі --from-code.\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: попередження: літерал формального виразу завершено передчасно"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: попередження: не можна використовувати %s"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: попередження: незавершена розмітка XML"
+msgstr "%s:%d: попередження: незавершений рядок"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: не вдається знайти символ завершення рядка «%s» до EOF"
+msgstr "%s:%d: не вдається знайти символ завершення рядка \"%s\" до EOF"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -3828,15 +3533,17 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\U\") 8-бітного символу \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 рядок у %s%s.\n"
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3847,7 +3554,7 @@
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3858,7 +3565,7 @@
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3869,7 +3576,7 @@
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3880,7 +3587,7 @@
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3891,10 +3598,10 @@
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Невідоме кодування «%s». Вважається кодування ASCII."
+msgstr "Невідоме кодування \"%s\". Вважається кодування ASCII."
 
 #: src/x-rst.c:108
 #, c-format
@@ -3920,42 +3627,30 @@
 "%s:%lu: попередження: синтаксис $\"...\" є забороненим з міркувань безпеки; "
 "натомість використовуйте eval_gettext"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: попередження: літерал формального виразу завершено передчасно"
-
-#: src/xgettext.c:545
-#, 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:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing не може використовуватись, якщо вивід направляється у "
 "стандартний вивід"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може працювати без вказаних ключових слів для пошуку"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
-"попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
+"попередження: у файлі `%s' невідоме розширення `%s'; спроба використати C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Витягує рядки для перекладу з вказаних вхідних файлів.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3964,12 +3659,12 @@
 "  -d, --default-domain=НАЗВА  виводити у файл НАЗВА.po (замість messages."
 "po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ФАЙЛ           записувати вивід у вказаний файл\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3977,12 +3672,12 @@
 "  -p, --output-dir=КАТАЛОГ    файли виводу будуть створені у каталозі "
 "КАТАЛОГ\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Вибір мови вхідного файлу:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3991,8 +3686,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=НАЗВА         розпізнавати вказану мову\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4000,22 +3694,21 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   скорочення для --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Типово, мова визначається за розширенням назви вхідного файлу.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4024,25 +3717,25 @@
 "      --from-code=НАЗВА       кодування для вхідних файлів\n"
 "                                (за винятком Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Типово, вважається, що вхідні файли у кодуванні ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         об'єднати повідомлення з існуючим файлом\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -4050,55 +3743,45 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cТЕҐ, --add-comments[=ТЕҐ] вставляє блок коментарів з ТЕҐ-ом і "
-"попередніми\n"
-"                               рядками ключових слів у файлі виведених "
-"даних\n"
-"  -c, --add-comments          вставляє всі блоки коментарів, яким передують "
-"рядки\n"
-"                               ключових слів у файлі виведених даних\n"
+"  -c, --add-comments[=ТЕГ]    вставляє блок коментарів з ТЕГ (або тих, що\n"
+"                              передують рядкам ключового слова) у файл "
+"виводу\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Параметри особливі для мови:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           витягнути усі рядки\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (лише мови C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (лише мови C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-код, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -k, --keyword[=СЛОВО]       додаткове ключове слово, яке буде "
+"відшукуватись\n"
+"                              (вживання СЛОВО не означає невикористання\n"
+"                               типових ключових слів)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4108,70 +3791,68 @@
 "      --flag=СЛОВО:АРГ:ОЗНАКА додаткова ознака для рядків посеред номера\n"
 "                              аргументу АРГ ключового слова СЛОВО\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (лише мови C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             розпізнавати ANSI C trigraph-и на вході\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (лише мови C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (лише мова C++)\n"
 
-#: src/xgettext.c:958
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   розпізнати рядки у форматуванні KDE 4\n"
+msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 розпізнавати рядки у форматі Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 докладніший результат пошуку рядків формату\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     виводити у файл Java .properties\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4179,20 +3860,17 @@
 "      --foreign-user          пропускати у виводі FSF copyright для "
 "сторонніх користувачів\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
-"      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
 
-#: src/xgettext.c:1012
-#, c-format
+#: src/xgettext.c:969
+#, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-"      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених "
-"даних\n"
+msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4200,62 +3878,60 @@
 "      --msgid-bugs-address=EMAIL@АДРЕСА   адреса звітування про помилки у "
 "msgid\n"
 
-#: src/xgettext.c:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[РЯДОК], --msgstr-prefix[=РЯДОК]    вживати РЯДОК або \"\" як префікс "
-"елементів\n"
-"                                msgstr\n"
+"  -m, --msgstr-prefix[=РЯДОК]   вживати РЯДОК або \"\" як префікс елементів "
+"msgstr\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[РЯДОК], --msgstr-suffix[=РЯДОК]    вживати РЯДОК або \"\" як суфікс "
-"елементів\n"
-"                                msgstr\n"
+"  -M, --msgstr-suffix[=РЯДОК]   вживати РЯДОК або \"\" як суфікс елементів "
+"msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:"
-"[pass-]<flag>: %s"
+"Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:[pass-]"
+"<flag>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандартний ввід"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "Символ, що не належить до ASCII, у %s%s."
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "Коментар не у форматі ASCII на позиції або перед %s%s."
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "Рядок не у форматі ASCII на позиції %s%s."
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: попередження: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4264,7 +3940,7 @@
 "Хоча й використовується у позиції рядку формату, %s не є правильним %s "
 "рядком формату. Причина: %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4273,7 +3949,7 @@
 "Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: "
 "%s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4281,12 +3957,12 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"Рядок формату «%s» з аргументами без назв неможливо локалізувати:\n"
+"Рядок формату '%s' з аргументами без назв неможливо локалізувати:\n"
 "Перекладач не зможе змінити порядок аргументів.\n"
 "Замість кортежу аргументів, використовуйте рядок формату з аргументами,\n"
 "що мають назву та їх підстановку.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4296,61 +3972,75 @@
 "gettext(\"\") повертає елемент заголовку\n"
 "метаінформації, а не порожній рядок.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неоднозначно вказане ключове слово '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "попередження: відсутній контекст для ключового слова '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "попередження: відсутній контекст для множинного аргументу ключового слова "
 "'%.*s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "невідповідність контексту між формою однини та множини"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "Не вказано параметр --msgid-bugs-address.\n"
-"Якщо ви використовуєте файл «Makevars», вкажіть\n"
+"Якщо ви використовуєте файл `Makevars', вкажіть\n"
 "тут змінну MSGID_BUGS_ADDRESS; у іншому випадку\n"
 "вкажіть --msgid-bugs-address аргумент командного рядка.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "невідома мова «%s»"
+msgid "language `%s' unknown"
+msgstr "невідома мова `%s'"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<без назви>"
 
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "поле заголовку «%s» повинно починатись з початку рядка\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "деякі поля заголовків досі мають початкові типові значення\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: неправильний параметр -- %c\n"
 
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "аварійне завершення DuplicateHandle з кодом помилки 0x%08x"
 
+#~ msgid "Not yet implemented."
+#~ msgstr "Ще не реалізовано."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr ""
+#~ "не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу "
+#~ "%s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "помилка зв'язку з дочірнім процесом %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "помилка читання з дочірнього процесу %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "дочірній процес %s завершився з кодом %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' досі має початкове типове значення\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Множинні посилання на %%%c."
 
@@ -4368,12 +4058,6 @@
 #~ "ПРИДАТНОСТІ\n"
 #~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
 
-#~ msgid "Not yet implemented."
-#~ msgstr "Ще не реалізовано."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поле `%s' досі має початкове типове значення\n"
-
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the C# .dll format doesn't support contexts\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/vi.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/vi.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/vi.po gettext-0.18.1.1/gettext-tools/po/vi.po
--- gettext-0.19.3/gettext-tools/po/vi.po	2014-10-16 06:04:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/vi.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,102 +1,98 @@
 # Vietnamese Translation for gettext-tools.
-# Bản dịch tiếng Việt dành cho gettext-tools.
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2010 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-05-11 07:45+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2010-05-13 17:33+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "đối số “%s” cho “%s” không hợp lệ"
+msgstr "sai lập đối số « %s » cho « %s »"
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "đối số “%s” cho “%s” chưa rõ ràng"
+msgstr "đối số còn mơ hồ « %s » cho « %s »"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "Các đối số hợp lệ là:"
+msgstr "Đối số hợp lệ:"
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "không tìm thấy thư mục tạm thời, hãy thử đặt biến $TMPDIR"
+msgstr "không tìm thấy thư mục tạm thời, hãy thử lập biến $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "không thể tạo thư mục tạm thời bằng cách dùng mẫu “%s”"
+msgstr "không thể tạo thư mục tạm thời bằng biểu mẫu « %s »"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
-msgstr "không thể xóa bỏ tập tin tạm thời %s"
+msgstr "không thể gỡ bỏ tập tin tạm thời %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "không thể xóa bỏ thư mục tạm thời %s"
+msgstr "không thể gỡ bỏ thư mục tạm thời %s"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "đang bảo tồn quyền hạn cho %s"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "gặp lỗi khi mở %s để đọc"
+msgid "error while opening \"%s\" for reading"
+msgstr "gặp lỗi khi mở « %s » để đọc"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "không thể mở tập tin sao lưu %s để ghi"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "không thể mở tập tin sao lưu « %s » để ghi"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "lỗi đọc %s"
+msgid "error reading \"%s\""
+msgstr "gặp lỗi khi đọc « %s »"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "lỗi ghi %s"
+msgid "error writing \"%s\""
+msgstr "gặp lỗi khi ghi « %s »"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "gặp lỗi sau khi đọc %s"
+msgid "error after reading \"%s\""
+msgstr "gặp lỗi sau khi đọc « %s »"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
-msgstr "fdopen() gặp lỗi"
+msgstr "fdopen() bị lỗi"
 
 #: gnulib-lib/csharpcomp.c:571
 #, c-format
@@ -108,102 +104,102 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Không tìm thấy cơ chế ảo C#, hãy thử cài đặt pnet."
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "Tiến trình con “%s” gặp lỗi"
+msgstr "Tiến trình con « %s » bị lỗi"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: tùy chọn « %s » còn mơ hồ\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “--%s” không cho phép đối số\n"
+msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “%c%s” không cho phép đối số\n"
+msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tùy chọn “%s” yêu cầu một đối số\n"
+msgstr "%s: tùy chọn « %s » yêu cầu một đối số\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: không nhận ra tùy chọn “--%s”\n"
+msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
+msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: tùy chọn không hợp lệ -- “%c”\n"
+msgstr "%s: tùy chọn không hợp lệ -- « %c »\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: tùy chọn cần một đối số -- “%c”\n"
+msgstr "%s: tùy chọn yêu cầu một đối số -- « %c »\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n"
+msgstr "%s: tùy chọn « -W %s » còn mơ hồ\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “-W %s” không cho phép đối số\n"
+msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
+msgstr "%s: tùy chọn « -W %s » yêu cầu một đối số\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
-"đối số “source_version” (phiên bản nguồn) không hợp lệ đối với "
-"“compile_java_class” (biên dịch lớp Java)"
+"đối số « source_version » (phiên bản nguồn) không hợp lệ đối với « "
+"compile_java_class » (biên dịch hạng Java)"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 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)"
+"đối số « target_version » (phiên bản đích) không hợp lệ đối với « "
+"compile_java_class » (biên dịch hạng Java)"
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "gặp lỗi khi tạo “%s”"
+msgstr "lỗi tạo « %s »"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "gặp lỗi khi ghi tập tin “%s”"
+msgstr "gặp lỗi khi ghi tập tin « %s »"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -214,99 +210,61 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Không tìm thấy cơ chế ảo Java, hãy thử cài đặt gcj hoặc đặt $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "%s lỗi V/R tiến trình con"
+msgstr "%s lỗi VR tiến trình con"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "cạn bộ nhớ"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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:374
-#: src/msgexec.c:405
-#, 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:417
-#, 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
-#, 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:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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:449
-#, 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"
+msgid "cannot create pipe"
+msgstr "không thể tạo ống dẫn"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr "“"
+msgstr "« "
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr "”"
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr "đang thiết lập quyền hạn cho %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
-#, c-format
-msgid "cannot create pipe"
-msgstr "không thể tạo ống dẫn"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle gặp lỗi"
+msgstr "_open_osfhandle bị lỗi"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, 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"
+msgstr "không phục hồi được bộ mô tả tập tin %d: dup2 bị lỗi"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -319,123 +277,114 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s tiến trình con nhận được tín hiệu nghiêm trọng %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "gặp lỗi khi mở “%s” để đọc"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"“%s” không phải là một chuỗi định dạng %s đúng, không giống với “%s”. Lý do: "
-"%s"
+"« %s » không phải là một chuỗi định dạng %s đúng, khác với « %s ». Lý do : %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"một đặc tả định dạng cho đối số %u, như trong “%s”, không tồn tại trong “%s”"
+"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:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, 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”"
+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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"đặc tả định dạng trong “%s” và “%s” cho đối số %u không phải trùng nhau"
+"đặc tả định dạng trong « %s » và « %s » cho đối số %u không phải trùng nhau"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
-"Chỉ thị số %u bắt đầu với ký hiệu ống dẫn “|” nhưng không kết thúc với “|”."
+"Chỉ thị số %u bắt đầu với ký hiệu ống dẫn « | » nhưng không kết thúc với « | "
+"»."
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"Trong chỉ thị số %u, thẻ bài nằm sau “<” không phải là tên của vĩ lệnh đặc "
-"tả định dạng. Những tên vĩ lệnh hợp lệ được liệt kê trong ISO C 99 chương "
-"7.8.1."
+"Trong chỉ thị số %u, hiệu bài nằm sau « < » không phải là tên của vĩ lệnh "
+"đặc tả định dạng. Những tên vĩ lệnh hợp lệ được liệt kê trong ISO C 99 tiết "
+"đoạn 7.8.1."
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” không có “>” đi theo. "
+msgstr "Trong chỉ thị số %u, hiệu bài nằm sau « < » không có « > » đi theo. "
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
+msgstr "« %s » và « %s » không có cùng một số các đặc tả định dạng"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Trong chỉ thị số %u, dấu ngoặc móc mở “{” không có số đối số đi theo."
+msgstr ""
+"Trong chỉ thị số %u, dấu ngoặc móc mở « { » không có số đối số đi theo."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "Trong chỉ thị số %u, dấu phẩy “,” không có một con số đi theo."
+msgstr "Trong chỉ thị số %u, dấu phẩy « , » không có một con số đi theo."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Chuỗi này kết thúc ở giữa chỉ thị: “{” mà không có “}” tương ứng."
+msgstr "Chuỗi này kết thúc ở giữa chỉ thị: tìm « { » không có « } » tương ứng."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Chỉ thị số %u kết thúc với ký tự không hợp lệ “%c” thay vì dấu ngoặc móc "
-"đóng “}”."
+"Chỉ thị số %u kết thúc với ký tự không hợp lệ « %c » thay vì dấu ngoặc móc "
+"đóng « } »."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 "Chỉ thị số %u kết thúc với một ký tự không hợp lệ, thay vì dấu ngoặc móc "
-"đóng “}”."
+"đóng « } »."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
-msgstr "Chuỗi bắt đầu ở giữa chỉ thị: “}” mà không có “{” tương ứng."
+msgstr "Chuỗi bắt đầu ở giữa chỉ thị: tìm « } » không có « { » tương ứng."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Chuỗi chứa một “}” lẻ đôi nằm sau chỉ thị số %u."
+msgstr "Chuỗi chứa một « } » riêng lẻ nằm sau chỉ thị số %u."
 
 #: src/format-gcc-internal.c:255
 #, c-format
@@ -445,7 +394,7 @@
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "Trong chỉ thị số %u, không cho phép độ chính xác nằm trước “%c”."
+msgstr "Trong chỉ thị số %u, không cho phép độ chính xác nằm trước « %c »."
 
 #: src/format-gcc-internal.c:334
 #, c-format
@@ -460,7 +409,7 @@
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
-"Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước “%c”."
+"Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước « %c »."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -470,27 +419,17 @@
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "Trong chỉ thị số %u, không cho phép cờ nằm trước “%c”."
+msgstr "Trong chỉ thị số %u, không cho phép cờ nằm trước « %c »."
 
 #: src/format-gcc-internal.c:677
 #, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "“%s” dùng %%m nhưng “%s” thì không"
+msgstr "« %s » dùng %%m còn « %s » không phải"
 
 #: src/format-gcc-internal.c:680
 #, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "“%s” không dùng %%m nhưng “%s” dùng %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "“%s” dùng %%C còn “%s” không thế"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "“%s” không dùng %%C nhưng “%s” dùng %%C"
+msgstr "« %s » không dùng %%m còn « %s » có phải dùng %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -508,7 +447,7 @@
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "Trong chỉ thị số %u, đối số số 0 không phải số nguyên dương."
+msgstr "Chỉ thị số %u chứa đối số (số 0) không phải số nguyên dương."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -516,7 +455,7 @@
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
-"Trong chỉ thị số %u, đối số (số 0) của độ rộng không phải số nguyên dương."
+"Chỉ thị số %u chứa đối số (số 0) của độ rộng không phải số nguyên dương."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -531,7 +470,7 @@
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
-msgstr "Chỉ thị số %u chứa ký tự “%c” không phải đặc tả chuyển đổi hợp lệ."
+msgstr "Chỉ thị số %u chứa ký tự « %c » không phải đặc tả chuyển đổi hợp lệ."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -544,7 +483,7 @@
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
-"Chuỗi tham chiếu đến đối số có số %u bằng nhiều cách không tương thích với "
+"Chuỗi tham chiệu đến đối số có số %u bằng nhiều cách không tương thích với "
 "nhau."
 
 #: src/format-java.c:240
@@ -552,18 +491,20 @@
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
-msgstr "Trong chỉ thị số %u, chuỗi phụ “%s” không thuộc kiểu ngày/giờ hợp lệ."
+msgstr ""
+"Chỉ thị số %u chứa chuỗi phụ « %s » không phải kiểu dáng ngày/giờ hợp lệ."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "Trong chỉ thị số %u, “%s” không cho phép dấu phẩy đi theo."
+msgstr "Chỉ thị số %u chứa « %s » không có dấu phẩy đi theo."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Trong chỉ thị số %u, chuỗi phụ “%s” không thuộc kiểu con số hợp lệ."
+msgstr ""
+"Chỉ thị số %u chứa chuỗi phụ « %s » không phải kiểu dáng con số hợp lệ."
 
 #: src/format-java.c:323
 #, c-format
@@ -571,13 +512,13 @@
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"Trong chỉ thị số %u, số hiệu đối số không cho phép dấu phẩy và một trong số "
-"của “%s”, “%s”, “%s”, “%s” theo sau."
+"Chỉ thị số %u chứa số hiệu đối số không có dấu phẩy và một của « %s »,  « %s "
+"»,  « %s »,  « %s » theo sau."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "trong chỉ thị số %u, có một lựa chọn không chứa con số."
+msgstr "Chỉ thị số %u có một lựa chọn không chứa con số."
 
 #: src/format-java.c:583
 #, c-format
@@ -585,27 +526,28 @@
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"Trong chỉ thị số %u, có một lựa chọn chứa con số mà nó không theo sau bởi "
-"dấu “<”, “#” hay “%s” theo sau."
+"Chỉ thị số %u có một lựa chọn chứa con số không có dấu « < », « # » hay « %s "
+"» theo sau."
 
 #: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"đặc tả định dạng cho đối số {%u}, như trong “%s”, không tồn tại trong “%s”"
+"đặc tả định dạng cho đối số {%u}, như trong « %s », không tồn tại trong « %s "
+"»"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "đặc tả định dạng cho đối số {%u} không tồn tại trong “%s”"
+msgstr "đặc tả định dạng cho đối số {%u} không tồn tại trong « %s »"
 
 #: src/format-java.c:776
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"đặc tả định dạng trong “%s” và “%s” cho đối số {%u} không phải cùng một thứ"
+"đặc tả định dạng trong « %s » và « %s » cho đối số {%u} không phải trùng nhau"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -614,7 +556,8 @@
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"Trong chỉ thị số %u, tham số %u có kiểu “%s” nhưng lẽ ra phải có kiểu “%s”."
+"Chỉ thị số %u chứa tham số %u có kiểu « %s » nhưng lẽ ra phải có tham số "
+"kiểu « %s »."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
@@ -625,34 +568,33 @@
 "In the directive number %u, too many parameters are given; expected at most "
 "%u parameters."
 msgstr[0] ""
-"Trong chỉ thị số %u có quá nhiều tham số được đưa ra; cần nhiều nhất là %u "
-"tham số."
+"Chỉ thị số %u có quá nhiều tham số, còn mong đợi nhiều nhất %u tham số."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "Trong chỉ thị số %u, “%c” không có chữ số đi theo."
+msgstr "Chỉ thị số %u chứa « %c » không có chữ số đi theo."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "Trong chỉ thị số %u, đối số “%d” là âm."
+msgstr "Chỉ thị số %u chứa đối số « %d » âm."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "Chuỗi kết thúc ở giữa chỉ thị kiểu “~/.../”."
+msgstr "Chuỗi kết thúc ở giữa chỉ thị kiểu « ~/.../ »."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "Có “~%c” mà không có “~%c” tương ứng."
+msgstr "Tìm « ~%c » không có « ~%c » tương ứng."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "Trong chỉ thị số %u, cả hai dấu sửa đổi “@” và “:” được đưa ra."
+msgstr "Chỉ thị số %u chứa cả hai dấu sửa đổi « @ » và « : »."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -660,12 +602,13 @@
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"Trong chỉ thị số %u, “~:[” không có hai mệnh đề đi theo, định giớí bằng “~;”."
+"Chỉ thị số %u chứa « ~:[ » không có hai mệnh đề đi theo, định giớí bằng « ~; "
+"»."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "Trong chỉ thị số %u, “~;” được dùng ở vị trí không hợp lệ."
+msgstr "Chỉ thị số %u chứa « ~; » được dùng ở vị trí không hợp lệ."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
@@ -676,13 +619,13 @@
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "đặc tả định dạng trong “%s” và “%s” không phải tương đương"
+msgstr "đặc tả định dạng trong « %s » và « %s » không phải tương đương"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 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”"
+"đặ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.c:433
 #, c-format
@@ -690,15 +633,13 @@
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"Trong chỉ thị số %u, đặc tả kích cỡ không tương thích với đặc tả chuyển đổi "
-"“%c”."
+"Chỉ thị số %u chứa đặc tả kích cỡ không tương thích với đặc tả chuyển đổi « "
+"%c »."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, 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”"
+msgstr "đặc tả định dạng cho đối số « %s » không tồn tại trong « %s »"
 
 #: src/format-python.c:115
 msgid ""
@@ -712,7 +653,7 @@
 #, 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 "
+"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:430
@@ -720,60 +661,32 @@
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 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)"
+"đặc tả định dạng trong « %s » mong đợi sự ánh xạ, còn đặc tả trong « %s » "
+"mong đợi đồ nhiều thành phần"
 
 #: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 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ạ"
+"đặc tả định dạng trong « %s » mong đợi đồ nhiều thành phần, còn đặc tả trong "
+"« %s » mong đợi sự ánh xạ"
 
 #: src/format-python.c:460 src/format-sh.c:297
 #, 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”"
+"đặc tả định dạng cho đối số « %s », như trong « %s », không tồn tại trong « "
+"%s »"
 
 #: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"đặc tả định dạng trong “%s” và “%s” cho đối số “%s” không phải trùng nhau"
-
-#: src/format-python-brace.c:137
-#, c-format
-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:150
-#, 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:165
-#, 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:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-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:270
-#, 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."
+"đặc tả định dạng trong « %s » và « %s » cho đối số « %s » không phải trùng "
+"nhau"
 
 #: src/format-qt.c:152
 #, c-format
@@ -781,38 +694,39 @@
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"“%s” là một chuỗi định dạng đơn giản, nhưng “%s” không phải: nó chứa một cờ "
-"“L” hay một số kiểu đối số chữ-số-kép"
+"« %s » là một chuỗi định dạng đơn giản, nhưng « %s » không phải: nó chứa một "
+"cờ « L » hay một số kiểu đối số đôi chữ số"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Chuỗi tham chiếu đến một biến hệ vỏ có tên khác ASCII."
+msgstr "Chuỗi tham chiếu đến một biến trình bao có tên khác ASCII."
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Chuỗi tham chiếu đến một biến hệ vỏ có cú pháp dấu ngoặc hệ vỏ phức tạp. Ở "
-"đây không hỗ trợ cú pháp đó bởi vì lý do bảo mật."
+"Chuỗi tham chiếu đến một biến trình bao có cú pháp dấu ngoặc trình bao phức "
+"tạp. Ở đây không hỗ trợ cú pháp đó, vì lý do bảo mật."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
-"Chuỗi tham chiếu đến biến hệ vỏ có giá trị có thể khác trong hàm trình bao."
+"Chuỗi tham chiếu đến biến trình bao có giá trị có thể khác trong hàm trình "
+"bao."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Chuỗi tham chiếu đến biến hệ vỏ có tên rỗng."
+msgstr "Chuỗi tham chiếu đến biến trình bao có tên rỗng."
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "Trong chỉ thị số %u, ký tự “%c” không phải chữ số nằm giữa 1 và 9."
+msgstr "Chỉ thị số %u chứa ky tự « %c » không phải chữ số nằm giữa 1 và 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -821,11 +735,11 @@
 "1 and 9."
 msgstr "Ký tự kết thúc chỉ thị số %u không phải chữ số nằm giữa 1 và 9."
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -835,383 +749,366 @@
 msgstr ""
 "Tác quyền © %s Tổ chức Phần mềm Tự do.\n"
 "Giấy Phép Công Cộng GNU (GPL), phiên bản 3 hay sau <http://gnu.org/licenses/gpl.html>\n"
-"Đây là phần mềm tự do: bạn có quyền thay đổi và phát hành lại nó.\n"
+"Đâ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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Viết bởi %s.\n"
+msgstr "Tác giả: %s.\n"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "quá nhiều đối số"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Hãy thử lệnh “%s --help” (trợ giúp) để xem thông tin thêm.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Hãy thử lệnh « %s --help » để xem thông tin thêm.\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "Cách dùng: %s [TÙY CHỌN]\n"
+msgstr "Cách sử dụng: %s [TÙY CHỌN]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "In ra tên máy của máy tính này.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "Định dạng xuất ra:\n"
+msgstr "Định dạng xuất:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 tên máy ngắn\n"
+msgstr "  -s, --short                 tên máy _ngắn_\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          tên máy dài, gồm tên miền đầy đủ,\n"
-"                                và biệt hiệu\n"
+"  -f, --fqdn, --long\n"
+"\ttên máy _dài_, gồm _tên miền có khả năng đầy đủ_, và biệt hiệu\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            các địa chỉ cho tên máy đó\n"
+msgstr "  -i, --ip-address            các _địa chỉ_ cho tên máy đó\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Kết xuất thông tin:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, 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"
+msgstr "  -h, --help                  hiện _trợ giúp_ này rồi thoát\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, 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"
+msgstr "  -V, --version               xuất thông tin _phiên bản_ rồi thoát\n"
 
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 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"
-"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi."
-"html>.\n"
+msgstr "Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "không thể lấy tên máy"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
-msgstr "cho phép nhiều nhất một tập tin đầu vào"
+msgstr "cho phép nhiều nhất một tập tin nhập"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s và %s loại từ lẫn nhau"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, 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"
+msgstr "Cách sử dụng: %s [TÙY_CHỌN] [TẬP_TIN_NHẬP]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 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"
+"Lọc các thông điệp 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:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 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"
+"Tất cả đối số bắt buộc phải sử dụng 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:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
-msgstr "Vị trí tập tin đầu vào:\n"
+msgstr "Vị trí tập tin nhập:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  TẬP_TIN_ĐẦU_VÀO             tập tin PO đầu vào\n"
+msgstr "  TẬP_TIN_NHẬP              tập tin PO nhập vào\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=THƯ_MỤC     thêm THƯ MỤC này vào danh sách để tìm kiếm\n"
-"                              tập tin đầu vào\n"
+"  -D, --directory=THƯ_MỤC\n"
+"\tthêm thư mục này vào danh sách để tìm kiếm tập tin nhập\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 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"
+"Không đưa ra tập tin nhập, hay nó là « - » thì đọc đầu vào tiêu chuẩn.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
-msgstr "Vị trí tập tin đầu ra:\n"
+msgstr "Vị trí tấp tin xuất:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, 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"
+msgstr "  -o, --output-file=TẬP_TIN     ghi kết xuất vào tập tin này\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 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"
+"Kết quả được ghi ra đầu ra tiêu chuẩn nếu không có tập tin xuất được đưa "
+"ra,\n"
+"hoặc nếu nó là « - ».\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
-msgstr "Chọn chuỗi:\n"
+msgstr "Lựa chọn thông điệp:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            giữ các chuỗi đã dịch, bỏ các chuỗi chưa dịch\n"
+"      --translated      giữ các thông điệp đã dịch, bỏ các thông điệp chưa "
+"dịch\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          giữ các chuỗi chưa dịch,\n"
-"                              bỏ các chuỗi đã dịch\n"
+"      --untranslated    giữ các thông điệp chưa dịch, bỏ các thông điệp đã "
+"dịch\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr ""
-"      --no-fuzzy              loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
-"                               (tạm dịch), các chuỗi này trở thành đã dịch\n"
+msgstr "      --no-fuzzy       bỏ các thông điệp có nhãn « fuzzy » (dịch mờ)\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            giữ các chuỗi được đánh dấu là “fuzzy”\n"
+msgstr ""
+"      --only-fuzzy            giữ các thông điệp có nhãn « fuzzy » (dịch "
+"mờ)\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           loại bỏ các chuỗi đã cũ (có dấu #~)\n"
+msgstr "      --no-obsolete           bỏ các thông điệp quá cũ (có dấu #~)\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         giữ các chuỗi đã cũ (có dấu #~)\n"
+msgstr "      --only-obsolete         giữ các thông điệp quá cũ (có dấu #~)\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Thao tác thuộc tính:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             đặt mọi chuỗi là “fuzzy” (tạm dịch)\n"
+msgstr ""
+"      --set-fuzzy             lập mọi thông điệp là « fuzzy » (dịch mờ)\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
-"      --clear-fuzzy           đặt mọi chuỗi là không-“fuzzy” (tạm dịch)\n"
+"      --clear-fuzzy          lập mọi thông điệp là khác « fuzzy » (dịch mờ)\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          đặt mọi chuỗi là cũ không dùng nữa\n"
+msgstr "      --set-obsolete          lập mọi thông điệp là quá cũ\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        đặt mọi chuỗi là chưa quá cũ\n"
-
-#: src/msgattrib.c:475
-#, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              khi đặt “fuzzy” thì giữ lại các chuỗi gốc "
-"msgid\n"
-"                              của chuỗi đã dịch\n"
+msgstr "      --clear-obsolete        lập mọi thông điệp là chưa quá cũ\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
-msgstr ""
-"      --clear-previous        lại bỏ “previous msgid” ra khỏi mọi chuỗi\n"
-
-#: src/msgattrib.c:480
-#, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --empty                khi loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
-"                               (tạm dịch), xóa trống chuỗi này\n"
+msgstr "      --clear-previous        bỏ « msgid trước » ra mọi thông điệp\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=TẬP_TIN.po  thao tác chỉ những mục được liệt kê trong\n"
-"                               tập tin này\n"
+"      --only-file=TẬP_TIN.po    thao tác chỉ những mục được liệt kê trong "
+"tập tin này\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=T_TIN.po  thao tác chỉ những mục không được liệt kê\n"
-"                               trong tập tin này\n"
+"      --ignore-file=TẬP_TIN.po\n"
+"\tthao tác chỉ những mục không được liệt kê trong tập tin này\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
-"      --fuzzy                 tương đương với “--only-fuzzy --clear-fuzzy”\n"
+"      --fuzzy                 bằng « --only-fuzzy » hay « --clear-fuzzy »\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              tương đương với “--only-obsolete --clear-"
-"obsolete”\n"
+"      --obsolete              bằng « --only-obsolete » hay « --clear-"
+"obsolete »\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "Cú pháp tập tin đầu vào:\n"
+msgstr "Cú pháp tập tin nhập:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      tập tin đầu vào có cú pháp .properties\n"
-"                              (thuộc tính) của Java\n"
+"  -P, --properties-input\n"
+"\ttập tin nhập có cú pháp .properties (thuộc tính) của Java\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input     tập tin đầu vào có cú pháp .strings kiểu\n"
-"                              NeXTstep/GNUstep\n"
+"      --stringtable-input\n"
+"\ttập tin nhập có cú phãp .strings kiểu NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Chi tiết kết xuất:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1219,149 +1116,140 @@
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
-"      --color                 luôn luôn đặt màu sắc và các thuộc tính văn\n"
-"                              bản khác\n"
-"      --color=KHI             dùng màu sắc và các thuộc tính khác cho văn "
-"bản\n"
-"                              KHI nào:\n"
-"                                 • always     luôn luôn\n"
-"                                 • never      không bao giờ\n"
-"                                 • auto       tự động\n"
-"                                 • html       HTML.\n"
-
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+"      --color\t\t\tluôn luôn đặt màu sắc và các thuộc tính văn bản khác\n"
+"      --color=KHI\t\tđặt màu sắc và các thuộc tính văn bản khác KHI nào :\n"
+"\t• always\t\tluôn luôn\n"
+"\t• never\t\tkhông bao giờ\n"
+"\t• auto\t\ttự động\n"
+"\t• html\t\tHTML.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, 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"
+"      --style=TẬP_TIN       ghi rõ tập tin quy tắc kiểu dáng CSS cho --color "
+"(màu)\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             không dùng ký tự thoát C trong kết xuất (mặc "
-"định)\n"
+"  -e, --no-escape    không dùng ký tự thoát C trong kết xuất (mặc định)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 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"
+"  -E, --escape\n"
+"\tdùng ký tự thoát C trong kết xuất, không có ký tự đã mở rộng\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, 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"
+msgstr "      --force-po     ghi ra tập tin PO thậm chí nếu nó còn trống\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, 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"
+msgstr ""
+"  -i, --indent                ghi ra tập tin PO bằng kiểu dáng thụt lề\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, 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"
+"      --no-location    không ghi dòng kiểu « #: tên_tập_tin:số_hiệu_dòng »\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          tạo ra dòng kiểu “#: tên_tập_tin:"
-"số_hiệu_dòng”\n"
-"                              (mặc định)\n"
+"  -n, --add-location\n"
+"\ttạo ra dòng kiểu « #: tên_tập_tin:số_hiệu_dòng » (mặc định)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, 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"
+msgstr "      --strict         xuất tập tin PO tùy theo Uniforum chính xác\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
-"  -p, --properties-output     xuất tập tin .properties (thuộc tính) kiểu "
+"  -p, --properties-output    xuất tập tin .properties (thuộc tính) kiểu "
 "Java\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-output    ghi ra tập tin .strings (chuỗi)\n"
-"                              kiểu NeXTstep/GNUstep\n"
+"      --stringtable-output\n"
+"\txuất tập tin .strings (chuỗi) kiểu NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, 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"
+msgstr "  -w, --width=SỐ          lập chiều rộng của trang kết xuất\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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               không ngắt ra nhiều dòng cho những dòng dài "
-"hơn\n"
-"                              chiều rộng trang kết xuất\n"
-
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+"      --no-wrap    không chia ra nhiều dòng những dòng dài hơn chiều rộng "
+"trang kết xuất\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, 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:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, 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"
+msgstr "Sử dụng: %s [TÙY_CHỌN] [TẬP_TIN_NHẬP]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1370,130 +1258,130 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
-msgstr ""
-"Ghép nối và trộn những tập tin PO được chỉ ra.\n"
-"Tìm chuỗi mà nó ở chung với hai hay hơn tập tin PO đã cho.\n"
-"Bằng cách dùng tùy chọn “--more-than” (nhiều hơn),\n"
-"độ chung lớn hơn có thể được yêu cầu trước khi chuỗi được in.\n"
-"Ngược lại, tùy chọn “--less-than” (ít hơn) có thể được dùng\n"
-"để xác định độ chung ít hơn trước khi chuỗi được in\n"
-"(vd: “--less-than=2” sẽ chỉ in những chuỗi duy nhất).\n"
-"Chuỗi dịch, chú thích và chú thích trích sẽ được tích lũy,\n"
-"ngoại trừ tùy chọn “--use-first” (dùng cái đầu tiên khớp) được chỉ ra,\n"
-"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"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
+msgstr ""
+"Ghép nối và trộn những tập tin PO được xác định.\n"
+"Tìm thông điệp chung với ít nhất hai tập tin PO được xác định.\n"
+"Bằng cách dùng tùy chọn « --more-than » (nhiều hơn),\n"
+"độ chung lớn hơn có thể được yêu cầu trước khi thông điệp được in.\n"
+"Hoặc tùy chọn « --less-than » (ít hơn) có thể được dùng\n"
+"để xác định độ chung ít hơn trước khi thông điệp được in\n"
+"(i.e. « --less-than=2 » sẽ in chỉ những thông điệp duy nhất).\n"
+"Chuỗi dịch, chú thích và chú thích trích sẽ được lũy tích,\n"
+"trừ nếu tùy chọn « --use-first » (dùng trước) được xác định,\n"
+"chúng sẽ được lấy từ tập tin PO thứ nhất có định nghĩa chúng.\n"
+"Vị trí tập tin từ mọi tập tin PO sẽ được lũy tích.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  TẬP_TIN_ĐẦU_VÀO ...         những tập tin đầu vào\n"
+msgstr "  TẬP_TIN_NHẬP ...           những tập tin nhập\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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 "
+"  -f, --files-from=TẬP_TIN    lấy từ tập tin này danh sách các tập tin nhập "
 "vào\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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"
+msgstr "Tập tin nhập là « - » thì đọc đầu vào tiêu chuẩn.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 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"
+"  -<, --less-than=SỐ\n"
+"\tin ra các thông điệp có ít hơn SỐ các lời định nghĩa;\n"
+"\tkhông bật thì mặc định là vô hạn\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 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"
+"  ->, --more-than=SỐ\n"
+"\tin ra các thông điệp có nhiều hơn SỐ các lời định nghĩa;\n"
+"\tkhông bật thì mặc định là 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                dạng viết tắt cho tùy chọn “--less-than=2” (ít "
-"hơn 2),\n"
-"                              yêu cầu in ra chỉ những chuỗi duy nhất\n"
+"  -u, --unique  \ttốc ký cho tùy chọn « --less-than=2 » (ít hơn 2),\n"
+"\tyêu cầu in ra chỉ những thông điệp duy nhất\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 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"
+"  -P, --properties-input\n"
+"\ttập tin nhập có cú pháp kiểu .properties (thuộc tính) của Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     tập tin đầu vào có cú pháp .strings (chuỗi)\n"
-"                              kiểu NeXTstep/GNUstep\n"
+"      --stringtable-input\n"
+"\ttập tin nhập có cú pháp .strings (chuỗi) kiểu NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, 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"
+msgstr "  -t, --to-code=MÃ          \tbộ ký tự cho kết xuất\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 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"
+"      --use-first\tdùng bản dịch sẵn sàng thứ nhất cho mỗi thông điệp,\n"
+"\tkhông trộn nhiều bản dịch\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --lang=TÊN_PHÂN_LOẠI    đặt trường “Language” (Ngôn ngữ) trong phần "
-"đầu\n"
+"      --lang=TÊN_PHÂN_LOẠI      lập trường « Language » (Ngôn ngữ) trong "
+"phần đầu\n"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
-msgstr "chưa đưa ra tập tin đầu vào"
+msgstr "chưa đưa ra tập tin nhập"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "cần chính xác 2 tập tin đầu vào"
+msgstr "cần thiết chính xác 2 tập tin nhập"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
+msgstr "Cách sử dụng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
 
 #: src/msgcmp.c:218
 #, c-format, no-wrap
@@ -1507,95 +1395,93 @@
 msgstr ""
 "So sánh hai tập tin dạng .po kiểu Uniforum, để kiểm tra xem cả hai tập tin\n"
 "chứa cùng bộ chuỗi msgid. Tập tin cũ.po là một tập tin .po tồn tại\n"
-"chứa những chuỗi đã dịch. Tập tin mới.por là tập tin .po đã sửa đổi PO\n"
-"cuối cùng, hoặc một tập tin mẫu .po (dạng .pot, thường do trình xgettext tạo).\n"
-"Lệnh này hữu ích khi kiểm tra xem bạn đã dịch mọi chuỗi trong chương trình\n"
-"của bạn. Vị trí nào không khớp với nhau, còn chưa xong để cung cấp sự chẩn đoán\n"
-"tốt hơn.\n"
+"chứa những chuỗi đã dịch. Tập tin mới.po là tập tin .po đã tạo cuối cùng,\n"
+"hoặc một tập tin mẫu .po (dạng .pot, thường do trình xgettext tạo).\n"
+"Có ích để kiểm tra xem bạn đã dịch mọi thông điệp trong chương trình\n"
+"của bạn. Không tìm được sự khớp chính xác thì khả năng khớp mờ\n"
+"được dùng để cung cấp sự chẩn đoán tốt hơn.\n"
 
 #: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  cũ.po                       bản dịch cũ\n"
+msgstr "  cũ.po                      chuỗi đã dịch\n"
 
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr ""
-"  mới.pot                     mẫu dùng để tham chiếu (được tạo bởi "
-"xgettext)\n"
+msgstr "  mới.pot                   tham chiếu đến nguồn\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Sửa đổi thao tác:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
-"  -m, --multi-domain          áp dụng tập tin mới.pot vào mỗi miền nằm trong "
-"tập tin cũ.po\n"
+"  -m, --multi-domain\n"
+"\táp dụng tập tin mới.pot vào mỗi miền nằm trong tập tin cũ.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     không dùng khả năng khớp mờ (fuzzy)\n"
+msgstr "  -N, --no-fuzzy-matching     không dùng khả năng khớp mờ\n"
 
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             dùng các mục tạm dịch\n"
+msgstr "      --use-fuzzy             gồm có mục nhập mờ\n"
 
 #: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      dùng các mục chưa dịch\n"
+msgstr "      --use-untranslated      gồm có mục nhập chưa dịch\n"
 
 #: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
-msgstr "chuỗi này chưa được dịch"
+msgstr "thông điệp này chưa được dịch"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "chuỗi này cần phải được xem xét lại bởi dịch giả"
+msgstr "thông điệp này cần phải được xem lại bởi dịch giả"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "chuỗi này được dùng nhưng còn chưa được định nghĩa..."
+msgstr "thông điệp này được dùng còn chưa được xác định..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...nhưng mà định nghĩa này vẫn tương tự"
+msgstr "...nhưng mà lời xác định này vẫn tương tự"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "chuỗi này được dùng còn chưa được định nghĩa trong %s"
+msgstr "thông điệp này được dùng còn chưa được xác định trong %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "cảnh báo: chuỗi này không được dùng"
+msgstr "cảnh báo : thông điệp này không được dùng"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
-msgstr "phải chỉ ra ít nhất hai tập tin"
+msgstr "phải xác định ít nhất hai tập tin"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1603,93 +1489,93 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Tìm chuỗi chung giữa hai tập tin PO hay hơn đã cho.\n"
-"Bằng cách dùng tùy chọn “--more-than” (nhiều hơn), độ chung\n"
-"lớn hơn có thể được yêu cầu trước khi được in. Ngược lại tùy chọn\n"
-"“--less-than”(ít hơn) có thể được dùng để xác định độ chung ít hơn trước khi\n"
-"thông điiệp được in (tức là tùy chọn “--less-than=2” sẽ in ra\n"
-"chỉ những chuỗi duy nhất). Chuỗi dịch, chú thích và chú thích đã được\n"
-"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"
+"Tìm thông điệp chung giữa ít nhất hai tập tin PO đã xác định.\n"
+"Bằng cách dùng tùy chọn « --more-than » (nhiều hơn),\n"
+"độ chung lớn hơn có thể được yêu cầu. Hoặc tùy chọn « --less-than »\n"
+"(ít hơn) có thể được dùng để xác định độ chung ít hơn trước khi\n"
+"thông điiệp được in (tức là tùy chọn « --less-than=2 » sẽ in ra\n"
+"chỉ những thông điệp duy nhất). Chuỗi dịch, chú thích và chú thích\n"
+"trích sẽ được bảo tồn, nhưng chỉ từ tập tin PO thứ nhất đã xác định chúng.\n"
+"Vị trí tập tin từ mọi tập tin PO sẽ được tích lũy.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 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"
+"  ->, --more-than=SỐ      in các thông điệp chứa nhiều lời xác định hơn SỐ "
+"này;\n"
+"\tkhông bật thì mặc định là 1t\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr ""
-"      --omit-header           không ghi dòng đầu có mục tin “msgid \"\"” \n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgstr "      --omit-header          không ghi dòng đầu có mục `msgid \"\"' \n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Chuyển đổi phân loại thông dịch sang một bảng mã ký tự khác.\n"
+msgstr "Chuyển đổi phân loại thông dịch sang một mã ký tự khác.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Đích chuyển đổi:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Mã ký tự mặc định theo bảng mã ký tự của miền địa phương hiện có.\n"
+msgstr "Mã ký tự mặc định theo mã ký tự của miền địa phương hiện có.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                thụt lề cho kết xuất\n"
+msgstr "  -i, --indent                kiểu dáng kết xuất đã thụt lề\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           thu hồi dòng kiểu “#: tên_tập_tin:số_dòng”\n"
+"      --no-location      thu hồi dòng kiểu « #: tên_tập_tin:số_dòng »\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          giữ lại dòng “#: tên_tập_tin:số_dòng” (mặc "
+"      --add-location    bảo quản dòng kiểu « #: tên_tập_tin:số_dòng » (mặc "
 "định)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 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:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
-msgstr "chưa đưa ra tập tin đầu vào"
+msgstr "chưa đưa ra tập tin nhập vào"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
-msgstr "cần chính xác một tập tin đầu vào"
+msgstr "yêu cầu chính xác một tập tin nhập vào"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, 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"
+msgstr "Sử dụng: %s [TÙY_CHỌN] TẬP_TIN_NHẬP\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1697,15 +1583,15 @@
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"Tạo một catalog bản dịch tiếng Anh. Tập tin đầu vào là tập tin PO\n"
-"tiếng Anh đã được tạo cuối cùng, hay một tập tin mẫu PO\n"
-"(POT: thường do xgettext tạo). Mục chưa dịch sẽ được gán\n"
-"bằng chuỗi gốc (msgid).\n"
+"Tạo một phân loại thông dịch tiếng Anh. Tập tin nhập là tập tin PO\n"
+"tiếng Anh đã được tạo cuối cùng, hay một tập tin biểu mẫu PO\n"
+"(POT: thường do xgettext tạo). Mục nhập chưa dịch được gán\n"
+"bản dịch trùng với chuỗi gốc (msgid).\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  TẬP_TIN_ĐẦU_VÀO             tập tin dạng .po hay .pot đầu vào\n"
+msgstr "  TẬP_TIN_NHẬP               tập tin dạng .po hay .pot nhập vào\n"
 
 #: src/msgexec.c:196
 #, c-format
@@ -1715,7 +1601,7 @@
 #: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN] LỆNH [TÙY_CHỌN_LỆNH]\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN] LỆNH [TÙY_CHỌN_LÊNH]\n"
 
 #: src/msgexec.c:262
 #, c-format, no-wrap
@@ -1726,7 +1612,7 @@
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"Áp dụng lệnh vào mọi chuỗi dịch của catalog bản dịch.\n"
+"Áp dụng lệnh vào mọi chuỗi dịch của phân loại thông dịch.\n"
 "LỆNH có thể là bất cứ chương trình nào đọc bản dịch\n"
 "từ đầu vào tiêu chuẩn. Nó được gọi một lần cho mỗi chuỗi dịch.\n"
 "Kết xuất của nó trở thành kết xuất của tiến trình msgexec.\n"
@@ -1738,56 +1624,61 @@
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Lệnh được xây dựng sẵn đặc biệt là “0” xuất chuỗi dịch,\n"
-"với một byte null theo sau. Kết xuất của tiến trình “msgexec 0”\n"
-"thích hợp là đầu vào cho lệnh “xargs -0”.\n"
+"Lệnh có sẵn đặc biết được gọi là '0' xuất chuỗi dịch,\n"
+"với một byte vô giá trị theo sau. Kết xuất của tiến trình msgexec\n"
+"là thích hợp là kết nhập vào « xargs -0 ».\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin .po đầu vào\n"
+msgstr "  -i, --input=TẬP_TIN_NHẬP       tập tin dạng .po nhập vào\n"
 
 #: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "gặp lỗi khi ghi vào đầu ra tiêu chuẩn"
+msgstr "lỗi ghi vào đầu ra tiêu chuẩn"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "lỗi ghi vào tiến trình phụ %s"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "thiếu tên bộ lọc"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "phải đưa ra ít nhất một văn lệnh sed"
+msgstr "phải xác định ít nhất một văn lệnh sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN] BỘ_LỌC [TÙY_CHỌN_LỌC]\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN] BỘ_LỌC [TÙY_CHỌN_LỌC]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Áp dụng một bộ lọc cho mọi chuỗi dịch của một catalog bản dịch.\n"
+msgstr ""
+"Áp dụng một bộ lọc cho mọi chuỗi dịch của một phân loại thông dịch nào đó.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"BỘ LỌC có thể là bất cứ chương trình nào đọc chuỗi dịch từ đầu vào tiêu "
-"chuẩn\n"
+"BỘ LỌC là bất cứ chương trình nào đọc chuỗi dịch từ đầu vào tiêu chuẩn\n"
 "và ghi chuỗi dịch đã sửa đổi vào đầu ra tiêu chuẩn.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "TÙY CHỌN LỌC hữu ích khi BỘ LỌC là “sed”:\n"
+msgstr "Tùy chọn lọc hữu ích khi BỘ LỌC là « sed »:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1795,7 +1686,7 @@
 "  -e, --expression=VĂN_LỆNH    thêm văn lệnh này vào những lệnh cần thực "
 "hiện\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1803,251 +1694,210 @@
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=TẬP_TIN_VĂN_LỆNH\n"
-"                              thêm nội dung của TẬP TIN VĂN LỆNH này\n"
-"                              vào những lệnh cần thực hiện\n"
+"\tthêm nội dung của tập tin văn lệnh này vào những lệnh cần thực hiện\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       thu hồi khả năng tự động in miền mẫu\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             không dùng ký tự thoát C trong kết xuất\n"
-"                              (mặc định)\n"
+"      --no-escape      không dùng ký tự thoát C trong kết xuất (mặc định)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                kiểu dáng kết xuất đã thụt lề\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           giữ lại phần đầu không bị sửa đổi, không lọc "
-"nó\n"
+"      --keep-header       giữ lại phần đầu không bị sửa đổi, không lọc nó\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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ẻ"
+msgstr "đối số tới %s nên là một ký tự chấm câu riêng lẻ"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, 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"
+msgstr "tình trạng cuối 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "%s cần một đặc tả “-d directory” (thư mục)"
+msgstr "%s cần thiết một đặc tả « -d directory » (thư mục)"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, 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:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s cần một đặc tả “--template template”"
+msgstr "%s cần thiết một đặc tả « -l locale » (miền địa phương)"
 
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s cần một đặc tả “-o tập-tin”"
-
-#: src/msgfmt.c:551
-#, 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:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, 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:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s chỉ hợp lệ với %s, %s hay %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
-msgstr[0] "%d chuỗi đã dịch"
+msgstr[0] "%d thông điệp đã dịch"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d chuỗi tạm dịch"
+msgstr[0] ", %d bản dịch mờ"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d chuỗi chưa dịch"
+msgstr[0] ", %d thông điệp chưa dịch"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, 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"
+msgstr "Sử dụng: %s [TÙY_CHỌN] tên_tập_tin.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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"
+msgstr ""
+"Tạo ra phân loại thông điệp nhị phân từ mô tả thông dịch kiểu văn bản.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 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"
+"Tất cả đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn ngắn.\n"
 "Cũng vậy với đối số kiểu tùy chọn.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  tên_tập_tin.po ...          những tập tin đầu vào\n"
+msgstr "  tên_tập_tin.po ...         những tập tin nhập vào\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Chế độ thao tác:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  chế độ Java: tạo ra lớp ResourceBundle\n"
-"                               (bó tài nguyên) kiểu Java\n"
+"  -j, --java           chế độ Java: tạo ra hạng ResourceBundle (bó tài "
+"nguyên) kiểu Java\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 giống như --java, và coi là Java2\n"
-"                               (JDK 1.2 hay sau)\n"
+"      --java2           giống như --java, cũng giả sử Java2 (JDK 1.2 hay "
+"sau)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      chế độ tài nguyên C#: tạo ra một tập tin ."
-"resources\n"
-"                              (tài nguyên) kiểu .NET\n"
+"      --csharp-resources\n"
+"\tchế độ tài sản C#: tạo ra một tập tin .resources (tài nguyên) kiểu .NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/"
-"msgcat\n"
+"      --tcl             chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/msgcat\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, 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:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --desktop               chế độ Desktop Entry: tạo một tập tin ."
-"desktop\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
-"      --strict                bật chế độ Uniforum chính xác (chặt chẽ)\n"
+"      --strict                bật chế độ Uniforum chính xác (_chặt chẽ_)\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, 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"
+msgstr "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:823
+#: src/msgfmt.c:697
 #, 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:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, 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"
+msgstr "  -r, --resource=TÀI_NGUYÊN     tên của tài nguyên\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 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"
+"  -l, --locale=MIỀN_ĐỊA_PHƯƠNG\n"
+"\ttên miền địa phương, hoặc ngôn ngữ hoặc ngôn ngữ_quốc gia\n"
+"\t(v.d. hoặc « vi » hay « vi_VN »)\n"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --source                sản sinh tập tin .java, thay cho tập tin ."
-"class\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, 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"
+msgstr "  -d THƯ_MỤC                thư mục cơ sở của phân cấp thư mục hạng\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2055,285 +1905,226 @@
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Tên lớp được quyết định bằng cách treo thêm tên miền địa phương\n"
-"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"
+"Tên hạng được quyết định bằng cách phụ thêm tên miền địa phương\n"
+"vào tên tài sả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. Hạng được ghi dưới thư mục đã xác định.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, 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:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 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"
+"  -d THƯ_MỤC\t\tthư mục cơ sở cho tập tin dạng .dll\n"
+"\tphụ thuộc vào miền địa phương\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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 ""
-"Hai tùy chọn “-l” và “-d” bắt buộc phải sử dụng.\n"
-"Tập tin .dll được ghi trong thư mục con của thư mục đã đưa ra\n"
+"Hai tùy chọn « -l » và « -d » bắt buộc phải sử dụng.\n"
+"Tập tin .dll được ghi trong thư mục con của thư mục đã xác định\n"
 "có tên phụ thuộc vào miền địa phương.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, 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:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, 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"
+"  -d THƯ_MỤC\n"
+"\t thư mục cơ sở của phân loại thông điệp dạng .msg\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 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:861
-#, 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:867
-#, 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:869
-#, 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:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kTỪ, --keyword=TỪ          quét tìm TỪ này như là một từ khoá bổ sung\n"
-"  -k, --keyword               không dùng từ khoá mặc định\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-"Các tùy chọn -l, -o, và --template là bắt buộc.  Nếu chỉ ra tùy chọn -D, tập "
-"tin\n"
-"đầu vào sẽ đọc từ thư mục thay cho đối số dòng lệnh.\n"
+"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 đã xác định.\n"
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "Giải thích tập tin đầu vào:\n"
+msgstr "Giải thích tập tin nhập vào:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
 "domain\n"
 msgstr ""
-"  -c, --check                 thực hiện mọi kiểm tra kiểu:\n"
-"                                   --check-format (kiểm tra định dạng)\n"
-"                                   --check-header (kiểm tra phần đầu)\n"
-"                                   --check-domain (kiểm tra miền)\n"
+"  -c, --check                 chạy mọi việc kiểm tra kiểu :\n"
+"\t--check-format (kiểm tra định dang),\n"
+"\t--check-header (kiểm tra phần đầu),\n"
+"\t--check-domain (kiểm tra miền).\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, 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"
+"      --check-format\n"
+"\tkiểm tra các chuỗi có định dạng phụ thuộc vào ngôn ngữ\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
-msgstr ""
-"      --check-header          kiểm tra xem mục tin phần đầu có đúng không\n"
+msgstr "      --check-header          kiểm tra có mục nhập phần đầu đúng\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 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"
+"      --check-domain\tkiểm tra nếu có sự xung đột giữa chỉ thị miền\n"
+"\tvà tùy chọn « --output-file » (tập tin xuất)\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   kiểm tra msgfmt của GNU ứng xử\n"
-"                              giống như msgfmt của X/Open\n"
+"  -C, --check-compatibility    kiểm tra msgfmt của GNU ứng xử\n"
+"\tgiống như msgfmt của X/Open\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 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"
+"      --check-accelerators[=KÝ_TỤ]\n"
+"\tkiểm tra có ký tự tâng tốc bàn phím cho mục trình đơn\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, 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"
+msgstr "  -f, --use-fuzzy             dùng mục nhập dịch mờ trong kết xuất\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=SỐ          căn chỉnh các chuỗi theo số byte này (mặc "
-"định: %d)\n"
+"  -a, --alignment=SỐ     chỉnh canh các chuỗi theo số byte này (mặc định: "
+"%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=THỨ_TỰ_BYTE ghi ra số 32-bit theo thứ tự đã cho\n"
-"                                (big hay little, mặc định phụ thuộc vào máy "
-"tính đang dùng)\n"
-"                                (byte đứng trước là lớn hay nhỏ. Intel "
-"thường là little)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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"
+"      --no-hash               tập tin nhị phân sẽ không chứa bảng chuỗi duy "
+"nhất\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, 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:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               gia tăng mức chi tiết\n"
+msgstr "  -v, --verbose               tăng cấp chi tiết\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, 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"
+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:1040
+#: src/msgfmt.c:893
 #, 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"
+msgstr "cảnh báo : việc chuyển đổi bộ ký tự sẽ không hoạt động được\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, 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"
+msgstr "cảnh báo : phần đầu tập tin PO còn mờ\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, 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"
+"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:1076
+#: src/msgfmt.c:929
 #, 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"
+msgstr "tên miền « %s » không thích hợp làm tên tập tin"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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ố"
+msgstr "tên miền « %s » không thích hợp làm tên tập tin nên dùng tiền tố"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr "chỉ thị “domain %s” bị bỏ qua"
+msgid "`domain %s' directive ignored"
+msgstr "chỉ thị « domain %s » bị bỏ qua"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
-msgstr "mục tin “msgstr” rỗng bị bỏ qua"
+msgid "empty `msgstr' entry ignored"
+msgstr "mục nhập « msgstr » rỗng bị bỏ qua"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
-msgstr "chuỗi “msgstr” tạm dịch bị bỏ qua"
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "mục nhập « msgstr » dịch mờ bị bỏ qua"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, 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:1323
-#, c-format
-msgid "%s does not exist"
-msgstr "%s không tồn tại"
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr "có %s nhưng không thể đọc nó"
+msgstr "%s: cảnh báo : tập tin nguồn chứa chuỗi dịch mờ"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "gặp lỗi khi đọc “%s”"
+msgstr "gặp lỗi khi đọc « %s »"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"tùy chọn “%c” không thể được dùng trước chỉ ra “J” hay “K” hay “T” hay “C” "
-"hay “X”"
+"tùy chọn « %c » không thể được dùng trước khi xác định « J » hay « K » hay « "
+"T » hay « C » hay « X »"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
-"Trích ra mọi chuỗi trong catalog bản dịch tương ứng với mẫu đã cho\n"
+"Trích ra mọi thông điệp trong phân loại thông dịch tương ứng với mẫu đã cho\n"
 "hay thuộc về một số tập tin nguồn đã cho.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2372,81 +2163,80 @@
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 msgstr ""
-"Lựa chọn chuỗi:\n"
+"Lựa chọn thông điệp:\n"
 "  [-N TẬP_TIN_NGUỒN]... [-M TÊN_MIỀN]...\n"
 "  [-J MẪU-MSGCTXT] [-K MẪU-MSGID] [-T MẪU-MSGSTR]\n"
 "\n"
 "  [-C MẪU-CHÚ-THÍCH] [-X MẪU-CHÚ-THÍCH-ĐÃ-TRÍCH]\n"
 "\n"
-"chuỗi được chọn nếu nó đến từ một của những tập tin nguồn\n"
+"Thông điệp được chọn nếu nó đến từ một của những tập tin nguồn\n"
 "đã xác định,\n"
 "hoặc nếu nó đến từ một của những miền đã xác định,\n"
-"hoặc nếu “-J” được đưa ra và ngữ cảnh (msgctxt) của nó khớp với\n"
+"hoặc nếu « -J » được đưa ra và ngữ cảnh (msgctxt) của nó khớp với\n"
 "MẪU-MSGCTXT\n"
-"hoặc nếu “-K” được đưa ra và khoá (msgid hay msgid_plural) của nó\n"
+"hoặc nếu « -K » được đưa ra và khoá (msgid hay msgid_plural) của nó\n"
 "khớp với MẪU-MSGID\n"
-"hoặc nếu “-T” được đưa ra và chuỗi dịch (msgstr) của nó khớp với\n"
+"hoặc nếu « -T » được đưa ra và chuỗi dịch (msgstr) của nó khớp với\n"
 "MẪU-MSGSTR\n"
-"hoặc nếu “-C” được đưa ra và chú thích của dịch giả khớp với\n"
+"hoặc nếu « -C » được đưa ra và chú thích của dịch giả khớp với\n"
 "MẪU-CHÚ-THÍCH\n"
-"hoặc nếu “-X” được đưa ra và chú thích đã trích ra khớp với\n"
+"hoặc nếu « -X » được đưa ra và chú thích đã trích ra khớp với\n"
 "MẪU-CHÚ-THÍCH-ĐÃ-TRÍCH\n"
 "\n"
-"Xác định nhiều tiêu chuẩn lựa chọn thì tập hợp chuỗi được chọn\n"
-"là hợp của những chuỗi đã chọn của mỗi tiêu chuẩn.\n"
+"Xác định nhiều tiêu chuẩn lựa chọn thì tập hợp thông điệp được chọn\n"
+"là hợp của những thông điệp đã chọn của mỗi tiêu chuẩn.\n"
 "\n"
-"Cú pháp cần dùng với mỗi bất cứ MẪU nào bên trên:  [-E | -F] [-e MẪU | -f TẬP_TIN]...\n"
+"Cú pháp cần dùng với mỗi bất cứ MẪU nào bên trên :  [-E | -F] [-e MẪU | -f TẬP_TIN]...\n"
 "MẪU là biểu thức chính quy cơ bản theo mặc định,\n"
-"hoặc là biểu thức chính quy đã mở rộng nếu tùy chọn “-E” được đưa ra,\n"
-"hoặc là chuỗi cố định nếu tùy chọn “-F” được đưa ra.\n"
+"hoặc là biểu thức chính quy đã mở rộng nếu tùy chọn « -E » được đưa ra,\n"
+"hoặc là chuỗi cố định nếu tùy chọn « -F » được đưa ra.\n"
 "\n"
 "  -N, --location=TẬP_TIN_NGUỒN\n"
-"\tchọn chuỗi được trích ra tập tin nguồn này\n"
-"  -M, --domain=TÊN_MIỀN       chọn chuỗi thuộc về miền này\n"
-"  -J, --msgctxt               bắt đầu mẫu kiểu msgctxt\n"
-"  -K, --msgid                 bắt đầu mẫu kiểu msgid\n"
-"  -T, --msgstr                bắt đầu mẫu kiểu msgstr\n"
-"  -C, --comment               bắt đầu mẫu kiểu chú thích của dịch giả\n"
-"  -X, --extracted-comment     bắt đầu mẫu kiểu chú thích đã trích ra\n"
+"\tchọn thông điệp được trích ra tập tin nguồn này\n"
+"  -M, --domain=TÊN_MIỀN     \tchọn thông điệp thuộc về miền này\n"
+"  -J, --msgctxt               \t\tbắt đầu mẫu kiểu msgctxt\n"
+"  -K, --msgid                 \t\tbắt đầu mẫu kiểu msgid\n"
+"  -T, --msgstr                \t\tbắt đầu mẫu kiểu msgstr\n"
+"  -C, --comment            \t\tbắt đầu mẫu kiểu chú thích của dịch giả\n"
+"  -X, --extracted-comment     \tbắt đầu mẫu kiểu chú thích đã trích ra\n"
 "  -E, --extended-regexp       MẪU cũng là biểu thức chính quy đã mở rộng\n"
-"  -F, --fixed-strings         MẪU là tập hợp chuỗi định giới bằng dòng mới\n"
-"  -e, --regexp=MẪU            dùng MẪU như là biểu thức chính quy\n"
-"  -f, --file=TẬP_TIN          lấy MẪU từ tập tin này\n"
-"  -i, --ignore-case           không phân biệt chữ HOA/thường\n"
+"  -F, --fixed-strings         \tMẪU là tập hợp chuỗi định giới bằng dòng mới\n"
+"  -e, --regexp=MẪU        \tdùng MẪU như là biểu thức chính quy\n"
+"  -f, --file=TẬP_TIN             \tlấy MẪU từ tập tin này\n"
+"  -i, --ignore-case           \tkhông phân biệt chữ hoa/thường\n"
 "  -v, --invert-match\n"
-"\txuất chỉ những chuỗi không khớp với tiêu chuẩn lựa chọn nào\n"
+"\txuất chỉ những thông điệp không khớp với tiêu chuẩn lựa chọn nào\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                dùng ký tự thoát dạng C trong kết xuất,\n"
-"                              không có ký tự đã mở rộng\n"
+"      --escape\n"
+"\tdùng ký tự thoát dạng C trong kết xuất, không có ký tự đã mở rộng\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           tạo ra kết xuất được sắp xếp\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file          sắp xếp kết xuất theo vị trí của tập tin\n"
+msgstr "      --sort-by-file\tsắp xếp kết xuất theo vị trí của tập tin\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"Hiện thời biến ngôn ngữ của môi trường chưa xác định.\n"
-"Hãy đặt biến môi trường LANG (ngôn ngữ), như được diễn tả trong tập tin\n"
+"Hiện thời chạy môi trường phiếm định về ngôn ngữ.\n"
+"Hãy lập biến môi trường LANG (ngôn ngữ), như được diễn tả trong tập tin\n"
 "ABOUT-NLS (giới thiệu về NLS). Việc đặt ngôn ngữ chính\n"
 "cần thiết để thử ra bản dịch.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2454,15 +2244,15 @@
 "the output .po file through the --output-file option.\n"
 msgstr ""
 "Tập tin xuất %s đã có.\n"
-"Hãy đưa ra miền địa phương bằng tùy chọn “--locale”\n"
-"hoặc đưa ra tập tin PO xuất bằng tùy chọn “--output-file”\n"
+"Hãy xác định miền địa phương bằng tùy chọn « --locale »\n"
+"hoặc xác định tập tin PO xuất bằng tùy chọn « --output-file »\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
-msgstr "Đã tạo %s.\n"
+msgstr "%s đã được tạo.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2471,77 +2261,78 @@
 "Tạo một tập tin PO mới, cũng khởi động siêu thông tin bằng giá trị từ\n"
 "môi trường riêng của người dùng.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin dạng POT đầu vào\n"
+msgstr "  -i, --input=TẬP_TIN_NHẬP    tập tin dạng POT nhập vào\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Không đưa ra tập tin đầu vào thì thư mục hiện thời được quét tìm tập tin "
+"Không đưa ra tập tin nhập vào thì thư mục hiện thời được quét tìm tập tin "
 "POT.\n"
-"Tập tin đầu vào là “-” thì đọc đầu vào tiêu chuẩn.\n"
+"Tập tin nhập vào là « - » thì đọc đầu vào tiêu chuẩn.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=TẬP_TIN   ghi kết xuất vào tập tin PO này\n"
+msgstr "  -o, --output-file=TẬP_TIN      ghi kết xuất vào tập tin PO này\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"Không đưa ra tập tin xuất thì nó phụ thuộc vào tùy chọn “--locale”\n"
+"Không đưa ra tập tin xuất thì nó phụ thuộc vào tùy chọn « --locale »\n"
 "(miền địa phương) hoặc vào thiết lập miền địa phương của người dùng.\n"
-"Nếu tập tin xuất là “-” thì kết quả được ghi vào đầu ra tiêu chuẩn.\n"
+"Nếu tập tin xuất là « - » thì kết quả được ghi vào đầu ra tiêu chuẩn.\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=NN_QQ          đặt miền địa phương đích (v.d. vi_VN)\n"
+msgstr "  -l, --locale=NN_QQ        lập miền địa phương đích (v.d. vi_VN)\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         coi là tập tin PO được tự động tạo ra\n"
+msgstr ""
+"      --no-translator         \tgiả sử tập tin PO được tự động tạo ra\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Tìm thấy nhiều tập tin dạng .pot.\n"
-"Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input” (đầu vào)\n"
+"Hãy xác định tập tin .pot nhập vào, bằng tùy chọn « --input » (nhập vào)\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "gặp lỗi khi đọc thư mục hiện thời"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Không tìm thấy tập tin dạng .pot trong thư mục hiện thời.\n"
-"Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input”\n"
+"Hãy xác định tập tin .pot nhập vào, bằng tùy chọn « --input » (nhập vào)\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "tiến trình con %s bị lỗi với mã thoát %d"
+msgstr "tiến trình phụ %s bị lỗi với mã thoát %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2549,54 +2340,54 @@
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Catalog bản dịch mới nên chứa địa chỉ thư điện tử của bạn,\n"
+"Phân loại thông điệp mới nên chứa địa chỉ thư điện tử của bạn,\n"
 "để người dùng gửi cho bạn thông tin phản hồi về bản dịch,\n"
-"cũng giúp cho nhà duy trì liên lạc trong trường hợp gặp lỗi kỹ thuật bất "
-"thường.\n"
+"cũng cho nhà duy trì liên lạc trong trường hợp gặp lối kỹ thuật bất thường.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "Bản dịch Tiếng Việt dành cho gói %s"
+msgstr "Bản dịch tiếng Việt cho gói %s"
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 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"
+msgstr "bộ ký tự hiện có « %s » không phải tên bộ ký tự di động"
 
 #: src/msgl-cat.c:188 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”"
+msgstr "tập tin nhập vào chứa hai bộ ký tự khác nhau « %s » và « %s »"
 
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "tập tin đầu vào “%s” không chứa mục tin phần đầu xác định bộ ký tự"
+"input file `%s' doesn't contain a header entry with a charset specification"
+msgstr "tập tin nhập vào « %s » không chứa mục nhập phần đầu xác định bộ ký tư"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"miền “%s” trong tập tin đầu vào “%s” không chứa trường xác định bộ ký tự"
+"miền « %s » trong tập tin nhập vào « %s » không chứa mục nhập phần đầu xác "
+"định bộ ký tư"
 
 #: src/msgl-cat.c:391 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."
+msgstr "bộ ký tự đích « %s » không phải tên bảng mã di động."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
-msgstr "cảnh báo: "
+msgstr "cảnh báo : "
 
 #: src/msgl-cat.c:443
 #, c-format
@@ -2604,7 +2395,7 @@
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Những tập tin đầu vào chứa chuỗi ở các bảng mã ký tự khác nhau, gồm UTF-8,\n"
+"Những tập tin nhập chứa thông điệp bằng mã ký tự khác nhau, gồm UTF-8,\n"
 "nên chuyển đổi kết xuất sang UTF-8.\n"
 
 #: src/msgl-cat.c:449
@@ -2615,11 +2406,10 @@
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Những tập tin đầu vào chứa chuỗi ở các bảng mã ký tự khác nhau, gồm %s và "
+"Những tập tin nhập vào chứa thông điệp bằng mã ký tự khác nhau, gồm %s và "
 "%s,\n"
 "nên chuyển đổi kết xuất sang UTF-8.\n"
-"Chọn bảng mã ký tự để xuất ra khác, hãy dùng tùy chọn “--to-code” (sang "
-"mã).\n"
+"Để chọn mã ký tự xuất khác, hãy dùng tùy chọn « --to-code » (sang mã).\n"
 
 #: src/msgl-cat.c:488
 #, c-format
@@ -2629,10 +2419,10 @@
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"Việc chuyển đổi tập tin %s từ bảng mã ký tự %s sang bảng mã ký tự %s\n"
+"Việc chuyển đổi tập tin %s từ mã ký tự %s sang mã ký tự %s\n"
 "thì thay đổi một số chuỗi gốc msgid hay chuỗi ngữ cảnh msgctxt.\n"
 "Hãy hoặc chuyển đổi mọi chuỗi msgid và ngữ cảnh msgctxt hoàn toàn\n"
-"sang bảng mã ký tự ASCII, hoặc đảm bảo chúng được mã hóa bằng UTF-8 từ đầu,\n"
+"sang mã ký tự ASCII, hoặc đảm bảo chúng được mã hoá bằng UTF-8 từ đầu,\n"
 "tức là trong các tập tin mã nguồn.\n"
 
 #: src/msgl-charset.c:93
@@ -2643,15 +2433,15 @@
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Bộ ký tự của miền địa phương “%s” là khác với\n"
-"bộ ký tự nhập vào “%s”.\n"
-"Kết xuất của “%s” có thể không đúng.\n"
+"Bộ ký tự của miền địa phương « %s » là khác với\n"
+"bộ ký tự nhập vào « %s ».\n"
+"Kết xuất của « %s » có thể không đúng.\n"
 "Chỉnh sửa có thể:\n"
 
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s.\n"
+msgstr "• Đặt LC_ALL thành miền địa phương có mã ký tự %s.\n"
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2660,9 +2450,9 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Chuyển đổi phân loại thông dịch sang %s bằng “msgconv”,\n"
-"  rồi áp dụng “%s”,\n"
-"  rồi chuyển đổi lại về %s bằng “msgconv”.\n"
+"• Chuyển đổi phân loại thông dịch sang %s bằng « msgconv »,\n"
+"  rồi áp dụng « %s »,\n"
+"  rồi chuyển đổi lại về %s bằng « msgconv ».\n"
 
 #: src/msgl-charset.c:114
 #, c-format
@@ -2672,10 +2462,10 @@
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s,\n"
-"  chuyển đổi phân loại thông dịch sang %s bằng “msgconv”,\n"
-"  rồi áp dụng “%s”,\n"
-"  rồi chuyển đổi lại về %s bằng “msgconv”.\n"
+"• Đặt LC_ALL thành miền địa phương có mã ký tự %s,\n"
+"  chuyển đổi phân loại thông dịch sang %s bằng « msgconv »,\n"
+"  rồi áp dụng « %s »,\n"
+"  rồi chuyển đổi lại về %s bằng « msgconv ».\n"
 
 #: src/msgl-charset.c:128
 #, c-format
@@ -2684,33 +2474,33 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Bộ ký tự của miền địa phương “%s” không phải tên bảng mã khả chuyển.\n"
-"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"
+"Bộ ký tự của miền địa phương « %s » không phải tên bảng mã di động.\n"
+"Kết xuất của « %s » có thể không đúng.\n"
+"Chỉnh sửa có thể là lập « LC_ALL=C »\n"
 
 #: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
-msgstr "dạng thức số nhiều có thể cung cấp giá trị âm"
+msgstr "biểu thức số nhiều có thể cung cấp giá trị âm"
 
 #: src/msgl-check.c:141
 #, 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"
+msgstr "« nplurals = %lu » nhưng biểu thức số nhiều có thể tạo giá trị đến %lu"
 
 #: src/msgl-check.c:187
 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"
+msgstr "biểu thức số nhiều có thể gây ra trường hợp chia cho số không"
 
 #: src/msgl-check.c:192
 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"
+msgstr "biểu thức số nhiều có thể gây ra trường hợp tràn số nguyên"
 
 #: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 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 "
+"biểu 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:266
@@ -2718,135 +2508,149 @@
 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:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr "catalog bản dịch chứa bản dịch dạng số nhiều"
+msgstr "phân loại thông điệp chứa bản dịch dạng số nhiều"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 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”"
+"nhưng mà mục nhập 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:384
+#: src/msgl-check.c:378
 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”"
+"nhưng mà mục nhập 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:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
-msgstr "giá trị nplurals (số dạng số nhiều) không hợp lệ"
+msgstr "giá trị nplurals (số cách ở số nhiều) không hợp lệ"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
-msgstr "dạng thức số nhiều không hợp lệ"
+msgstr "biểu thức số nhiều không hợp lệ"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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"
+msgstr[0] "nhưng một số thông điệp có chỉ %lu hình thái ở số nhiều"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, 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"
+msgstr[0] "nhưng một số thông điệp có %lu hình thái ở số nhiều"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"catalog bản dịch chứa chuỗi dịch ở số nhiều, nhưng còn thiếu mục tin phần "
-"đầu chứa dòng\n"
-"\"Plural-Forms: nplurals=SỐ_NGUYÊN; plural=BIỂU_THỨC\"\n"
-"Với tiếng Việt, bạn có thể dùng:\n"
+"phân loại thông điệp chứa chuỗi dịch ở số nhiều, nhưng còn thiếu mục nhập "
+"phần đầu chứa dòng\n"
+"« Plural-Forms: nplurals=SỐ_NGUYÊN; plural=BIỂU_THỨC »\n"
+"Dòng ở số nhiều đúng cho tiếng Việt:\n"
 "\"Plural-Forms: nplurals=1; plural=0;\""
 
-#: src/msgl-check.c:611
-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:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr ""
+"cả hai mục nhập « msgid » và « msgid_plural » đều không bắt đầu với « \\n »"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, 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”"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr ""
+"cả hai mục nhập « msgid » và « msgstr[%u] » đều không bắt đầu với « \\n »"
 
-#: src/msgl-check.c:634
-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:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "cả hai mục nhập « msgid » và « msgstr » đều không bắt đầu với « \\n »"
 
-#: src/msgl-check.c:652
-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:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+"cả hai mục nhập « msgid » và « msgid_plural » đều không kết thúc với « \\n »"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, 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”"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr ""
+"cả hai mục nhập « msgid » và « msgstr[%u] » đều không kết thúc với « \\n »"
 
-#: src/msgl-check.c:675
-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:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "cả hai mục nhập « msgid » và « msgstr » đều không kết thúc với « \\n »"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 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 "
+"khả năng thao tác cách ở 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:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "chuỗi dịch msgstr còn thiếu ký tự phím tắt “%c”"
+msgstr "chuỗi dịch msgstr còn thiếu ký tự phím tắt « %c »"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "chuỗi dịch msgstr có quá nhiều ký tự phím tắt “%c”"
+msgstr "chuỗi dịch msgstr có quá nhiều ký tự phím tắt « %c »"
+
+#: src/msgl-check.c:776
+#, 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:814
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "trường “%s” ở phần vẫn có giá trị khởi tạo mặc định (sửa đi)\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "trường phần đầu « %s » nên bắt đầu tại đầu dòng\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr ""
+"một số trường phần đầu vẫn còn chứa giá tri mặc định ban đầu (sửa đi)\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "trường “%s” còn thiếu trong phần đầu\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"trường phần đầu « %s » vẫn còn chứa giá tri mặc định ban đầu (sửa đi)\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: đầu vào không đúng trong bảng mã ký tự “%s”"
+msgstr "%s: đầu vào không đúng trong mã ký tự « %s »"
 
 #: 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”"
+msgstr "%s: gặp lỗi khi chuyển đổi từ mã ký tự « %s » sang mã ký tự « %s »"
 
 #: 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ự"
+msgstr "tập tin nhập vào không chứa mục nhập phần đầu xác định bộ ký tự"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 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."
+"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:335
 #, c-format
@@ -2854,29 +2658,29 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 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."
+"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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Không thể chuyển đổi từ “%s” sang “%s”. %s phụ thuộc vào iconv() nhưng phiên "
-"bản này đã được xây dựng không có iconv()."
+"Không thể chuyển đổi từ « %s » sang « %s ». %s phụ thuộc vào iconv() nhưng "
+"phiên bản này đã được xây dựng không có iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s chỉ hợp lệ với %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "kiểu sao lưu"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2900,57 +2704,58 @@
 "Khi không tìm thấy chuỗi dịch khớp chính xác, khả năng khớp mờ được dùng\n"
 "để cung cấp kết quả hữu ích hơn.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  cũ.po                       chuỗi dịch tham chiếu đến nguồn cũ\n"
+msgstr "  cũ.po                      chuỗi dịch tham chiếu đến nguồn cũ\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  mới.pot                     tham chiếu đến nguồn mới\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=TẬP_TIN    tập hợp chuỗi dịch thêm, cũng có thể được xác "
-"định\n"
-"                             nhiều lần (bản trích yếu)\n"
+"  -C, --compendium=TẬP_TIN\n"
+"\ttập hợp chuỗi dịch thêm, cũng có thể được xác định nhiều lần\n"
+"\t(_bản trích yếu_)\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                cập nhật tập tin cũ.po ; không làm gì\n"
-"                              nếu nó đã cập nhật rồi\n"
+"  -U, --update\tcập nhật tập tin cũ.po ; không làm gì\n"
+"\tnếu nó là hiện thời (_cập nhật_)\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ cập nhật:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Kết quả được ghi về tập tin cũ.po\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=ĐIỀU_KHIỂN     sao lưu tập tin cũ.po (_sao lưu_)\n"
+msgstr "      --backup=ĐIỀU_KHIỂN        sao lưu tập tin cũ.po (_sao lưu_)\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
-"      --suffix=HẬU_TỐ         có quyền cao hơn hậu tố sao lưu bình thường\n"
+"      --suffix=HẬU_TỐ\n"
+"\tcó quyền cao hơn hậu tố sao lưu bình thường (_hậu tố_)\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2962,65 +2767,65 @@
 "  simple, never   always make simple backups\n"
 msgstr ""
 "Phương pháp điều khiển phiên bản có thể được chọn\n"
-"bằng tùy chọn “--backup” (sao lưu) hoặc\n"
-"bằng cách đặt biến môi trường VERSION_CONTROL (điều khiển phiên bản).\n"
+"bằng tùy chọn « --backup » (sao lưu) hoặc\n"
+"bằng cách lập biến môi trường VERSION_CONTROL (điều khiển phiên bản).\n"
 "Giá trị có thể:\n"
-"  none, off      không bao giờ sao lưu (thậm chí nếu “--backup”\n"
-" (không có, tắt)                                   được đưa ra)\n"
-"  numbered, t    tạo bản sao lưu đánh số\n"
-" (đánh số)\n"
-"  existing, nil  tạo bản sao lưu đánh số nếu đã có bản sao lưu đánh số,\n"
-" (tồn tại, không gì)                           không thì kiểu đơn giản\n"
-"  simple, never  luôn luôn tạo bản sao lưu đơn giản\n"
-"(đơn giản, không bao giờ)\n"
+"  none, off\t\tkhông bao giờ sao lưu (thậm chí nếu « --backup »\n"
+"\tđược đưa ra) (_không có, tắt_)\n"
+"  numbered, t\t\ttạo bản sao lưu đánh số (_đánh số_)\n"
+"  existing, nil\t\ttạo bản sao lưu đánh số nếu đã có bản sao lưu đánh số,\n"
+"\tkhông thì kiểu đơn giản (_tồn tại, không gì_)\n"
+"  simple, never\tluôn luôn tạo bản sao lưu đơn giản\n"
+"\t(_đơn giản, không bao giờ_)\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Hậu tố sao lưu là “~” trừ khi được đặt bằng tùy chọn “--suffix” (hậu tố)\n"
-"hoặc bằng biến môi trường “SIMPLE_BACKUP_SUFFIX” (hậu tố sao lưu đơn giản).\n"
+"Hậu tố sao lưu là « ~ » trừ khi được lập bằng tùy chọn « --suffix » (hậu "
+"tố)\n"
+"hoặc bằng biến môi trường « SIMPLE_BACKUP_SUFFIX » (hậu tố sao lưu đơn "
+"giản).\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              giữ lại các chuỗi gốc msgid cũ của chuỗi đã "
-"dịch\n"
+"      --previous\tgiữ lại các chuỗi gốc msgid cũ của chuỗi đã dịch "
+"(_trước_)\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       không hiển thị tiến trình\n"
+msgstr "  -q, --quiet, --silent       thu hồi cái chỉ tiến hành (_im_)\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
-msgstr "chuỗi này nên dùng ở dạng thức số nhiều"
+msgstr "thông điệp này nên xác định cách ở số nhiều"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
-msgstr "chuỗi này không nên dùng ở dạng thức số nhiều"
+msgstr "thông điệp này không nên xác định cách ở số nhiều"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, tạm dịch %ld, thiếu %ld, không dùng "
-"nữa %ld.\n"
+"%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, làm mờ %ld, thiếu %ld, cũ %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
-msgstr " xong.\n"
+msgstr " hoàn tất.\n"
 
 #: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
@@ -3030,13 +2835,14 @@
 #: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]...\n"
+msgstr "Cách sử dụng: %s [TÙY_CHỌN] [TẬP_TIN]...\n"
 
 #: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
-"Chuyển đổi catalog bản dịch nhị phân sang tập tin dạng .po kiểu Uniforum.\n"
+"Chuyển đổi phân loại thông điệp nhị phân sang tập tin dạng .po kiểu "
+"Uniforum.\n"
 
 #: src/msgunfmt.c:440
 #, c-format
@@ -3044,15 +2850,14 @@
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  chế độ Java: đầu vào là lớp ResourceBundle\n"
-"                              kiểu Java\n"
+"  -j, --java\n"
+"\tchế độ Java: kết nhập vào là hạng ResourceBundle kiểu Java\n"
 
 #: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
-"      --csharp                chế độ C#: đầu vào là tập tin .dll\n"
-"                              kiểu .NET\n"
+"      --csharp         chế độ C#: kết  nhập vào là tập tin .dll kiểu .NET\n"
 
 #: src/msgunfmt.c:444
 #, c-format
@@ -3060,26 +2865,25 @@
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      chế độ tài nguyên C#: đầu vào là tập tin\n"
-"                             .resources kiểu .NET\n"
+"      --csharp-resources\n"
+"\tchế độ tài sản C#: kết nhập vào là tập tin .resources kiểu .NET\n"
 
 #: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   chế độ Tcl: đầu vào là tập tin\n"
-"                              .msg kiểu tcl/msgcat\n"
+"      --tcl        chế độ Tcl: kết nhập vào là tập tin .msg kiểu tcl/msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  TẬP_TIN ...                 đầu vào  là những tập tin .mo\n"
+msgstr "  TẬP_TIN ...             nhập vào những tập tin dạng .mo\n"
 
 #: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "vị trí của tập tin đầu vào trong chế độ Java:\n"
+msgstr "vị trí của tập tin nhập vào trong chế độ Java:\n"
 
 #: src/msgunfmt.c:462
 #, c-format
@@ -3088,14 +2892,14 @@
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Tên lớp được quyết định bằng cách phụ thêm tên miền địa phương\n"
-"vào tên tài nguyên, định giới bằng dấu gạch dưới. Hạng được định vị\n"
-"bằng CLASSPATH (đường dẫn lớp).\n"
+"Tên hạng được quyết định bằng cách phụ thêm tên miền địa phương\n"
+"vào tên tài sản, định giới bằng dấu gạch dưới. Hạng được định vị\n"
+"bằng CLASSPATH (đường dẫn hạng).\n"
 
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "Vị trí của tập tin đầu vào trong chế độ C#:\n"
+msgstr "Vị trí của tập tin nhập vào trong chế độ C#:\n"
 
 #: src/msgunfmt.c:475
 #, c-format
@@ -3103,14 +2907,14 @@
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Hai tùy chọn “-l” và “-d” bắt buộc phải sử dụng.\n"
+"Hai tùy chọn « -l » và « -d » bắt buộc phải sử dụng.\n"
 "Tập tin .dll nằm trong thư mục con của thư mục đã xác định\n"
 "có tên phụ thuộc vào miền địa phương.\n"
 
 #: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Vị trí của tập tin đầu vào trong chế độ Tcl:\n"
+msgstr "Vị trí của tập tin nhập vào trong chế độ Tcl:\n"
 
 #: src/msgunfmt.c:485
 #, c-format
@@ -3118,7 +2922,7 @@
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"Hai tùy chọn “-l” và “-d” bắt buộc phải sử dụng.\n"
+"Hai tùy chọn « -l » và « -d » bắt buộc phải sử dụng.\n"
 "Tập tin .msg nằm trong thư mục đã xác định.\n"
 
 #: src/msgunfmt.c:511
@@ -3132,7 +2936,7 @@
 msgstr ""
 "      --strict                ghi kiểu Uniforum chính xác (_chặt chẽ_)\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3145,33 +2949,33 @@
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 "Hợp nhất các bản dịch trùng trong phân loại thông dịch.\n"
-"Tìm các bản dịch trùng có cùng một mã nhận diện chuỗi.\n"
-"Bản sao như vậy là đầu vào không hợp lệ cho chương trình khác,\n"
+"Tìm các bản dịch trùng có cùng một mã nhận diện thông điệp.\n"
+"Bản sao như vậy là kết nhập vào không hợp lệ cho chương trình khác,\n"
 "như msgfmt, msgmerge hay msgcat. Mặc định là các bản sao được trộn\n"
-"với nhau. Khi dùng tùy chọn  “--repeated” (được làm lại) chỉ xuất bản sao,\n"
-"các chuỗi khác bị hủy. Chú thích và chú thích đã trích ra sẽ được tích lũy,\n"
-"trừ khi đưa ra “--use-first” (dùng thứ nhất), trong trường hợp đó\n"
+"với nhau. Khi dùng tùy chọn  «--repeated» (được làm lại) chỉ xuất bản sao,\n"
+"các thông điệp khác bị hủy. Chú thích và chú thích đã trích ra sẽ được tích lũy,\n"
+"trừ khi đưa ra « --use-first » (dùng thứ nhất), trong trường hợp đó\n"
 "chúng được lấy từ bản dịch thứ nhất. Vị trí tập tin sẽ được tích lũy.\n"
-"Dùng tùy chọn “--unique” (duy nhất) thì các bản sao bị hủy.\n"
+"Dùng tùy chọn « --unique » (duy nhất) thì các bản sao bị hủy.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              in ra chỉ bản sao (trùng nhau)\n"
+msgstr "  -d, --repeated              in ra chỉ bản sao (_được làm lại_)\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                chỉ in ra chuỗi duy nhất, hủy các bản sao\n"
-"                              (trùng nhau)\n"
+"  -u, --unique\n"
+"\tin ra chỉ thông điệp duy nhất, hủy các bản sao (_duy nhất_)\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
-msgstr "<đầu_vào_tiêu_chuẩn>"
+msgstr "<thiết_bị_nhập_chuẩn>"
 
 #: src/po-charset.c:489
 #, c-format
@@ -3179,20 +2983,20 @@
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Bộ ký tự “%s” không phải tên bảng mã khả chuyển.\n"
-"Việc chuyển đổi chuỗi sang bộ ký tự của người dùng\n"
+"Bộ ký tự « %s » không phải tên bảng mã di động.\n"
+"Việc chuyển đổi thông điệp sang bộ ký tự của người dùng\n"
 "có thể không hoạt động được.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Không hỗ trợ bộ ký tự “%s”. %s phụ thuộc vào iconv()\n"
-"mà không hỗ trợ “%s”.\n"
+"Không hỗ trợ bộ ký tự « %s ». %s phụ thuộc vào iconv()\n"
+"mà không hỗ trợ « %s ».\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3200,30 +3004,30 @@
 "Cài đặt trình libiconv của GNU rồi cài đặt lại trình gettext\n"
 "của GNU sẽ sửa chữa vấn đề này.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Vẫn còn tiếp tục: rất có thể gặp lỗi phân tách."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Vẫn còn tiếp tục."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Không hỗ trợ bộ ký tự “%s”. %s phụ thuộc vào iconv()\n"
+"Không hỗ trợ bộ ký tự « %s ». %s phụ thuộc vào iconv()\n"
 "và phiên bản này được xây dựng không có iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Bộ ký tự còn thiếu trong phần đầu tập tin.\n"
-"Vì thế việc chuyển đổi chuỗi sang bộ ký tự của người dùng\n"
+"Vì thế việc chuyển đổi thông điệp sang bộ ký tự của người dùng\n"
 "sẽ không hoạt động được.\n"
 
 #: src/po-gram-gen.y:93
@@ -3231,59 +3035,59 @@
 msgid "inconsistent use of #~"
 msgstr "dấu #~ được dùng không thống nhất"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "thiếu phần “msgstr[]”"
+msgid "missing `msgstr[]' section"
+msgstr "thiếu phần « msgstr[] »"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "thiếu phần “msgid_plural”"
+msgid "missing `msgid_plural' section"
+msgstr "thiếu phần « msgid_plural »"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
-msgstr "thiếu phần “msgstr”"
+msgid "missing `msgstr' section"
+msgstr "thiếu phần « msgstr »"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "dạng thức số nhiều đầu tiên có chỉ số là khác không"
+msgstr "cách ở số nhiều thứ nhất có số mũ khác số không"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "dạng thức số nhiều có chỉ số không đúng"
+msgstr "cách ở số nhiều có số mũ không đúng"
 
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "quá nhiều lỗi nên hủy bỏ"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "chuỗi nối tiếp đa byte không hợp lệ"
+msgstr "dây đa byte không hợp lệ"
 
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "chuỗi nối tiếp đa byte chưa hoàn thành tại kết thúc tập tin"
+msgstr "dây đa byte chưa hoàn thành tại kết thúc tập tin"
 
 #: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "chuỗi nối tiếp đa byte chưa hoàn thành tại kết thúc dòng"
+msgstr "dây đa byte chưa hoàn thành tại kết thúc dòng"
 
 #: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "iconv gặp lỗi"
+msgstr "lỗi iconv"
 
 #: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "không biết từ khóa “%s”"
+msgstr "không biết từ khóa « %s »"
 
 #: src/po-lex.c:854
 #, c-format
@@ -3305,68 +3109,69 @@
 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:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, 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"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "chuỗi gốc bị trùng lặp"
+msgstr "lời xác định thông điệp trùng"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
-msgstr "đây là vị trí của chuỗi nơi nó lần đầu được định nghĩa"
+msgstr "đây là vị trí của lời xác định thứ nhất"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "tập tin “%s” bị cắt ngắn"
+msgstr "tập tin « %s » bị cắt ngắn"
 
 #: src/read-mo.c:129
 #, 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"
+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:165 src/read-mo.c:274
 #, 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"
+msgstr "tập tin « %s » không phải có định dạng .mo của GNU"
 
 #: src/read-mo.c:178
 #, 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"
+msgstr "tập tin « %s » chứa một chuỗi không được kết thúc bằng NUL, tại %s"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "cảnh báo: cú pháp “\\uxxxx” không hợp lệ với ký tự Unicode"
+msgstr "cành báo : cú pháp « \\uxxxx » không hợp lệ với ký tự Unicode"
 
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
-msgstr "cảnh báo: chuỗi chưa được kết thúc"
+msgstr "cảnh báo : chuỗi chưa được kết thúc"
 
 #: src/read-stringtable.c:810
 msgid "warning: syntax error"
-msgstr "cảnh báo: lỗi cú pháp"
+msgstr "cảnh báo : lỗi cú pháp"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
-msgstr "cảnh báo: cặp khóa/giá trị chưa được kết thưc"
+msgstr "cảnh báo : cặp khóa/giá trị chưa được kết thưc"
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "cảnh báo: lỗi cú pháp; cần dấu chấm phẩy “;” nằm sau chuỗi"
+msgstr "cảnh báo : lỗi cú pháp; mong đợi dấu chấm phẩy « ; » nằm sau chuỗi"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
-"cảnh báo: lỗi cú pháp; cần dấu bằng “=” hay dấu chấm phẩy “;” nằm sau chuỗi"
+"cảnh báo : lỗi cú pháp; mong đợi dấu bằng « = » hay dấu chấm phẩy « ; » nằm "
+"sau chuỗi"
 
 #: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Viết bởi %s và %s.\n"
+msgstr "Tác giả: %s và %s.\n"
 
 # Name: don't translate / Tên: đừng dịch
 #. TRANSLATORS: This is a proper name. The last name is
@@ -3380,7 +3185,7 @@
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Mã hóa lại văn bản tiếng Xéc-bi từ chữ viết Ki-rin sang chữ viết La-tinh.\n"
+msgstr "Mã hoá lại văn bản tiếng Xéc-bi từ chữ viết Ki-rin sang chữ viết La-tinh.\n"
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
@@ -3388,28 +3193,28 @@
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
-"Văn bản đầu vào được đọc từ đầu vào tiêu chuẩn. Văn bản đã chuyển đổi\n"
+"Văn bản nhập vào được đọc từ đầu vào tiêu chuẩn. Văn bản đã chuyển đổi\n"
 "được xuất vào đầu ra tiêu chuẩn.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "đầu vào không hợp lệ theo bảng mã ký tự “%s”"
+msgstr "kết nhập vào không hợp lệ theo mã ký tự « %s »"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "gặp lỗi khi chuyển đổi từ bảng mã ký tự “%s” sang bảng mã ký tự “%s”"
+msgstr "gặp lỗi khi chuyển đổi từ mã ký tự « %s » sang mã ký tự « %s »"
 
 #: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
-msgstr "cần hai đối số"
+msgstr "mong đợi hai đối số"
 
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN] URL TẬP_TIN\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN] URL TẬP_TIN\n"
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3420,21 +3225,11 @@
 "Lấy và xuất nội dung của địa chỉ Mạng (URL).\n"
 "URL không thể tới được thì TẬP_TIN được dùng thay thế.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "gặp lỗi khi đọc “%s”"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "gặp lỗi khi ghi vào đầu ra tiêu chuẩn"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "gặp lỗi sau khi đọc “%s”"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3448,7 +3243,7 @@
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr " gặp lỗi.\n"
+msgstr " bị lỗi.\n"
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3471,7 +3266,7 @@
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"catalog bản dịch chứa bản dịch phụ thuộc vào ngữ cảnh, mà định dạng xuất "
+"phân loại thông điệp chứa bản dịch phụ thuộc vào ngữ cảnh, mà định dạng xuất "
 "không hỗ trợ."
 
 #: src/write-catalog.c:197
@@ -3480,22 +3275,22 @@
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"catalog bản dịch chứa chuỗi ở dạng thức số nhiều, mà định dạng xuất không hỗ "
-"trợ. Hãy thử tạo ra lớp Java bằng lệnh “msgfmt --java”, thay cho tập tin tài "
-"nguyên."
+"phân loại thông điệp chứa bản dịch cách ở số nhiều, mà định dạng xuất không "
+"hỗ trợ. Hãy thử tạo ra hạng Java bằng lệnh « msgfmt --java », thay cho tập "
+"tin tài sản."
 
 #: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"catalog bản dịch chứa chuỗi ở dạng thức số nhiều, mà định dạng xuất không hỗ "
-"trợ."
+"phân loại thông điệp chứa bản dịch cách ở số nhiều, mà định dạng xuất không "
+"hỗ trợ."
 
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "không thể tạo tập tin kết xuất “%s”"
+msgstr "không thể tạo tập tin kết xuất « %s »"
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
@@ -3504,52 +3299,47 @@
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "lỗi tạo thư mục “%s”"
+msgstr "lỗi tạo thư mục « %s »"
 
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "lỗi biên dịch lớp C#, hãy thử tùy chọn “--verbose” (xuất chi tiết)"
+msgstr "lỗi biên dịch hạng C#, hãy thử tùy chọn « --verbose » (xuất chi tiết)"
 
 #: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
-msgstr "lỗi biên dịch lớp C#"
+msgstr "lỗi biên dịch hạng C#"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "không phải tên lớp Java hợp lệ: %s"
+msgstr "không phải tên hạng Java hợp lệ: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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 "
+"lỗi biên dịch hạng Java, hãy thử tùy chọn « --verbose » (xuất chi tiết) hoặc "
 "đặt biến $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, 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"
+msgstr "lỗi biên dịch hạng Java, hãy thử đặt biến $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "gặp lỗi khi mở “%s” để ghi"
-
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "chuỗi nối tiếp đa byte không hợp lệ"
+msgstr "gặp lỗi khi mở « %s » để ghi"
 
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "chuỗi đã quốc tế hóa không nên chứa dãy thoát “\\%c”"
+"internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "thông điệp đã quốc tế hóa không nên chứa dây thoát « \\%c »"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3562,7 +3352,7 @@
 "Đề nghị bạn nhập chuỗi ngữ cảnh msgctxt hoàn toàn ASCII thay thế.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3580,9 +3370,9 @@
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"catalog bản dịch chứa chuỗi ở dạng thức số nhiều,\n"
-"còn định dạng catalog bản dịch kiểu Qt không hỗ trợ\n"
-"khả năng xử lý dạng số nhiều.\n"
+"phân loại thông điệp chứa bản dịch cách ở số nhiều,\n"
+"còn định dạng phân loại thông điệp kiểu Qt không hỗ trợ\n"
+"khả năng thao tác cách ở số nhiều.\n"
 
 #: src/write-qt.c:693
 msgid ""
@@ -3591,8 +3381,8 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"catalog bản dịch chứa bản ngữ cảnh msgctxt chứa ký tự nằm ở ngoại\n"
-"bộ ký tự ISO-8859-1 (Latin-1) còn định dạng catalog bản dịch kiểu Qt\n"
+"phân loại thông điệp chứa bản ngữ cảnh msgctxt chứa ký tự nằm ở ngoại\n"
+"bộ ký tự ISO-8859-1 (Latin-1) còn định dạng phân loại thông điệp kiểu Qt\n"
 "hỗ trợ ký tự UTF-8 (Unicode) chỉ trong chuỗi dịch, không phải trong\n"
 "chuỗi ngữ cảnh.\n"
 
@@ -3602,8 +3392,8 @@
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"catalog bản dịch chứa chuỗi gốc msgid chứa ký tự nằm ở ngoại\n"
-"bộ ký tự ISO-8859-1 (Latin-1) còn định dạng catalog bản dịch kiểu Qt\n"
+"phân loại thông điệp chứa chuỗi gốc msgid chứa ký tự nằm ở ngoại\n"
+"bộ ký tự ISO-8859-1 (Latin-1) còn định dạng phân loại thông điệp kiểu Qt\n"
 "hỗ trợ ký tự UTF-8 (Unicode) chỉ trong chuỗi dịch, không phải trong\n"
 "chuỗi gốc.\n"
 
@@ -3617,7 +3407,7 @@
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"catalog bản dịch chứa bản dịch phụ thuộc\n"
+"phân loại thông điệp chứa bản dịch phụ thuộc\n"
 "vào ngữ cảnh, còn định dạng .resources (tài nguyên)\n"
 "kiểu C# không hỗ trợ khả năng ngữ cảnh.\n"
 
@@ -3626,16 +3416,16 @@
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"catalog bản dịch chứa chuỗi ở dạng thức số nhiều,\n"
+"phân loại thông điệp chứa bản dịch cách ở số nhiều,\n"
 "còn định dạng .resources (tài nguyên) kiểu C# không\n"
-"hỗ trợ khả năng xử lý dạng số nhiều.\n"
+"hỗ trợ khả năng thao tác cách ở số nhiều.\n"
 
 #: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"catalog bản dịch chứa bản dịch phụ thuộc\n"
+"phân loại thông điệp chứa bản dịch phụ thuộc\n"
 "vào ngữ cảnh, còn định dạng kiểu Tcl không hỗ trợ\n"
 "khả năng ngữ cảnh.\n"
 
@@ -3644,38 +3434,33 @@
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"catalog bản dịch chứa chuỗi ở dạng thức số nhiều,\n"
+"phân loại thông điệp chứa bản dịch cách ở số nhiều,\n"
 "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"
+"cách ở số nhiều.\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: cảnh báo: chuỗi chưa được kết thúc"
+msgstr "%s:%d: cảnh báo : chuỗi chưa được kết thúc"
 
 #: 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"
+msgstr "%s:%d: cảnh báo : biểu thức chính quy chưa được kết thúc"
 
-#: src/x-c.c:1052
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr "cảnh báo: ký tự Unicode không hợp lệ"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: cảnh báo: hằng ký tự chưa được kết thúc"
+msgstr "%s:%d: cảnh báo : hằng ký tự chưa được kết thúc"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 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"
+msgstr "%s:%d: cảnh báo : bộ nghĩa chữ kiểu chuỗi chưa được kết thúc"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 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ã)."
+msgstr "Hãy xác định mã ký tự nguồn bằng tùy chọn « --from-code » (từ mã)."
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3683,8 +3468,8 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: chuỗi đa byte không hợp lệ.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
+"%s:%d: dây đa byte không hợp lệ.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
 #: src/x-csharp.c:285
 #, c-format
@@ -3692,8 +3477,8 @@
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: chuỗi đa byte dài chưa hoàn thành.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
+"%s:%d: dây đa byte dài chưa hoàn thành.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
 #: src/x-csharp.c:297
 #, c-format
@@ -3701,8 +3486,8 @@
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc tập tin.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
+"%s:%d: dây đa byte chưa hoàn thành ở kết thúc tập tin.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
 #: src/x-csharp.c:306
 #, c-format
@@ -3710,10 +3495,10 @@
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 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"
+"%s:%d: dây đa byte chưa hoàn thành ở kết thúc dòng.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: lỗi iconv"
@@ -3724,133 +3509,58 @@
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 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"
+"%s:%d: dây đa byte không hợp lệ.\n"
+"Hãy xác định mã ký tự nguồn dùng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: cảnh báo: ký tự Unicode không hợp lệ"
+msgstr "%s:%d: cảnh báo : ký tự Unicode không hợp lệ"
 
 #: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: cảnh báo: hằng chuỗi chưa được kết thúc"
+msgstr "%s:%d: cảnh báo : hằng chuỗi chưa được kết thúc"
 
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
-"%s:%d: cảnh báo: gặp dấu ngoặc đóng “)” ở nơi cần dấu ngoặc móc đóng “}”"
+"%s:%d: cảnh báo : gặp dấu ngoặc đóng « ) » ở nơi mong đợi dấu ngoặc móc đóng "
+"« } »"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 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/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Thiếu nội dung cho chuỗi được rút trích từ phần tử “%s”"
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Phần tử gốc <%s> là không được phép trong một tập tin Glade hợp lệ"
+"%s:%d: cảnh báo : gặp dấu ngoặc móc đóng « } » ở nơi mong đợi dấu ngoặc đóng "
+"« ) »"
 
 # Variable: do not translate/ biến: đừng dịch
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"Ngôn ngữ “glade” không được hỗ trợ. %s phụ thuộc vào expat.\n"
+"Ngôn ngữ « glade » không được hỗ trợ. %s phụ thuộc vào expat.\n"
 "Phiên bản này đã được xây dựng không có expat.\n"
 
 #: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: cảnh báo: chỉ một đồ thay thế U+%04X"
-
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Hãychỉ định bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã)\n"
-
-#: src/x-javascript.c:275
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: chuỗi đa byte không hợp lệ. Hãy chỉ định bảng mã\n"
-"ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã).\n"
-
-#: src/x-javascript.c:291
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Chuỗi đa byte dài chưa hoàn thành.\n"
-"Hãy chỉ định bảng mã ký tự nguồn đúng bằng tùy chọn\n"
-"“--from-code” (từ mã).\n"
-
-#: src/x-javascript.c:303
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Chuỗi đa byte chưa hoàn thành ở kết thúc tập tin.\n"
-"Hãy chỉ định bảng mã ký tự nguồn đúng bằng cách dùng tùy chọn\n"
-"“--from-code” (từ mã).\n"
-
-#: src/x-javascript.c:312
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Chuỗi đa byte chưa hoàn thành ở kết thúc dòng.\n"
-"Hãy chỉ định bảng mã ký tự nguồn đúng thông qua tùy chọn\n"
-"“--from-code” (từ mã).\n"
-
-#: src/x-javascript.c:344
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Chuỗi đa byte không hợp lệ. Hãy chỉ định\n"
-"bảng mã ký tự nguồn dùng tùy chọn “--from-code” (từ mã).\n"
-
-#: src/x-javascript.c:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: cảnh báo: Gặp kết thúc BTCQ quá sớm"
-
-#: src/x-javascript.c:1055
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: cảnh báo: không cho phép %s"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: cảnh báo: đánh dấu XML chưa được hoàn tất"
+msgstr "%s:%d: cảnh báo : chỉ một đồ thay thế U+%04X"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
-"%s:%d: không tìm thấy ký tự kết thúc chuỗi “%s” ở bất cứ nơi nào trước kết "
+"%s:%d: không tìm thấy ký tự kết thúc chuỗi « %s » ở bất cứ nơi nào trước kết "
 "thúc tập tin"
 
 # HEXNUMBER is a variable: do not translate/ HEXNUMBER là một biến: đừng dịch
@@ -3862,106 +3572,106 @@
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: phép nội suy không hợp lệ (\"\\l\") của ký tự 8-bit “%c”"
+msgstr "%s:%d: phép nội suy không hợp lệ (\"\\l\") của ký tự 8-bit « %c »"
 
 #: src/x-perl.c:1183
 #, c-format
 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”"
+msgstr "%s:%d: phép nội suy không hợp lệ (\"\\u\") của ký tự 8-bit « %c »"
 
 #: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: phép nội suy biến không hợp lệ ở “%c”"
+msgstr "%s:%d: phép nội suy biến không hợp lệ ở « %c »"
 
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: phép nội suy không hợp lệ (\"\\L\") của ký tự 8-bit “%c”"
+msgstr "%s:%d: phép nội suy không hợp lệ (\"\\L\") của ký tự 8-bit « %c »"
 
 #: src/x-perl.c:1247
 #, c-format
 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”"
+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:278
+#: src/x-python.c:236
 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 ""
-"Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (mã từ),\n"
-"hoặc bằng ghi chú như được ghi rõ trong tài liệu:\n"
+"Hãy xác định mã ký tự nguồn bằng tùy chọn « --from-code » (mã từ),\n"
+"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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: chuỗi đa byte không hợp lệ.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (mã từ),\n"
-"hoặc bằng ghi chú như được chỉ ra trong tài liệu:\n"
+"%s:%d: dây đa byte không hợp lệ.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng tùy chọn « --from-code » (mã từ),\n"
+"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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
 msgstr ""
-"%s:%d: chuỗi đa byte dài chưa hoàn thành.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (mã từ),\n"
-"hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
+"%s:%d: dây đa byte dài chưa hoàn thành.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng tùy chọn « --from-code » (mã từ),\n"
+"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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
 msgstr ""
-"%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc tập tin.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (mã từ),\n"
-"hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
+"%s:%d: dây đa byte chưa hoàn thành ở kết thúc tập tin.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng tùy chọn « --from-code » (mã từ),\n"
+"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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
 msgstr ""
-"%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc của dòng.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
-"hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
+"%s:%d: dây đa byte chưa hoàn thành ở kết thúc của dòng.\n"
+"Hãy xác định mã ký tự nguồn đúng bằng tùy chọn « --from-code » (mã từ),\n"
+"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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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 ""
-"%s:%d: chuỗi đa byte không hợp lệ.\n"
-"Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã),\n"
-"hoặc thông qua ghi chú như được định nghĩa trong tài liệu\n"
+"%s:%d: dây đa byte không hợp lệ.\n"
+"Hãy xác định mã ký tự nguồn bằng tùy chọn « --from-code » (mã từ),\n"
+"hoặc bằng ghi chú như được xác định trong tài liệu\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, 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ế."
+msgstr "Không nhận ra mã ký tự « %s » nên tiếp tục với ASCII để thay thế."
 
 #: 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ệ"
+msgstr "%s:%d: sai xác định chuỗi"
 
 #: src/x-rst.c:172
 #, c-format
@@ -3971,7 +3681,7 @@
 #: 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ệ"
+msgstr "%s:%d: biểu thức chuỗi không hợp lệ"
 
 #: src/x-sh.c:1074
 #, c-format
@@ -3979,68 +3689,58 @@
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
-"%s:%lu: cảnh báo: cú pháp $\"...\" bị phản đối vì lý do bảo mật; hãy dùng "
+"%s:%lu: cảnh báo : cú pháp $\"...\" bị phản đối vì lý do bảo mật; hãy dùng "
 "eval_gettext thay thế."
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: cảnh báo: gặp kết thúc biểu thức chính quy quá sớm"
-
-#: src/xgettext.c:545
-#, 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:621
 #, 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 "
+"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:653
+#: src/xgettext.c:626
 #, 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:808
+#: src/xgettext.c:769
 #, 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"
+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:859
+#: src/xgettext.c:820
 #, 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"
+msgstr "Trích các chuỗi có thể dịch ra những tập tin nhập vào đã cho.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=TÊN    dùng tập tin TÊN này như là kết xuất\n"
-"                              (thay cho messages.po)\n"
+"  -d, --default-domain=TÊN\n"
+"\tdùng tập tin TÊN này như là kết xuất (thay cho messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, 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"
+msgstr "  -o, --output=TẬP_TIN      ghi kết xuất vào tập tin này\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
-msgstr "Chọn ngôn ngữ của tập tin đầu vào:\n"
+msgstr "Chọn ngôn ngữ của tập tin nhập vào:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4049,60 +3749,58 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=TÊN          chỉ định ngôn ngữ. Các giá trị có thể là:\n"
+"  -L, --language=TÊN         nhận diện ngôn ngữ đã xác định\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
 "Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-"  -C, --c++                   dạng viết tắt cho tùy chọn “--language=C++”\n"
+msgstr "  -C, --c++                  tốc ký cho tùy chọn « --language=C++ »\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 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"
+"Mặc định là ngôn ngữ được đoán phụ thuộc vào phần mở rộng của tên tập tin "
+"nhập vào.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=MÃ         bảng mã ký tự của tập tin đầu vào\n"
+"      --from-code=MÃ        mã ký tự của tập tin nhập vào\n"
 "                                (trừ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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"
+msgstr "Mặc định là giả sử tập tin nhập vào có bộ ký tự ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, 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"
+msgstr ""
+"  -j, --join-existing         nối lại các thông điệp với tập tin đã có\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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"
+"  -x, --exclude-file=TẬP_TIN.po    mục nhập từ tập tin này sẽ không được "
+"trích ra\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4112,226 +3810,214 @@
 "                                in output file\n"
 msgstr ""
 "  -cTHẺ, --add-comments=THẺ   để vào tập tin kết xuất các khối ghi chú\n"
-"                              bắt đầu với thẻ này và nằm trước dòng từ khoá\n"
-"  -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ừ khoá\n"
+"\t\tbắt đầu với thẻ này và nằm trước dòng từ khoá\n"
+"  -c, --add-comments    để vào tập tin kết xuất các khối ghi chú nằm trước "
+"dòng từ khoá\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Tùy chọn đặc trưng cho ngôn ngữ:\n"
+msgstr "Tùy chọn đặc trưng cho ngôn ngữ :\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, 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:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kTỪ, --keyword=TỪ      quét tìm từ này như là một từ khoá bổ sung\n"
+"  -k, --keyword               đừng dùng từ khoá mặc định\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 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ừ khoá TỪ\n"
+"      --flag=TỪ:ĐỐI_SỐ:CỜ\tcờ thêm cho chuỗi nằm bên trong đối số\n"
+"\tcó số ĐỐI SỐ của từ khoá TỪ\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, 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"
+msgstr ""
+"  -T, --trigraphs      hiểu chữ ba C kiểu ANSI để nhập vào (_chữ ba_)\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (chỉ những ngôn ngữ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    chấp nhận chuỗi định dạng Qt\n"
+msgstr "      --qt                    nhận diện chuỗi định dạng Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (chỉ ngôn ngữ C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   chấp nhận chuỗi định dạng KDE4\n"
+msgstr "      --kde                   nhận ra chuỗi định dạng KDE4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 chấp nhận chuỗi định dạng Boost\n"
+msgstr "      --boost                 nhận diện chuỗi định dạng Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-"      --debug                 kết quả chi tiết hơn về nhận diện định dạng "
-"chuỗi\n"
+msgstr "      --debug      kết quả chi tiết hơn về nhận diện định dạng chuỗi\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, 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"
+"      --properties-output      ghi ra tập tin .properties (thuộc tính) kiểu "
+"Java\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, 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"
+"      --copyright-holder=CHUỖI    lập người giữ tác quyền trong kết xuất\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          thiếu 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"
+"      --foreign-user\t\tbỏ sót bản quyền Tổ Chức Phần Mềm Tự Do\n"
+"\ttrong kết xuất cho người dùng nước ngoại\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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"
+msgstr "      --package-name=GÓI  \tlập tên gói trong kết xuất\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, 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"
+"      --package-version=PHIÊN_BẢN  lập phiên bản của gói trong kết xuất\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=ĐỊA_CHỈ_THƯ\n"
-"                              đặt địa chỉ thông báo lỗi trong chuỗi gốc "
-"msgid\n"
+"\tlập địa chỉ thông báo lỗi trong chuỗi gốc msgid\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 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"
+"  -m[CHUỖI], --msgstr-prefix[=CHUỖI]    dùng chuỗi này hay \"\" làm tiền tố "
+"cho giá trị msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 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"
+"  -M[CHUỖI], --msgstr-suffix[=CHUỖI]    dùng chuỗi này hay \"\" làm hậu tố "
+"cho giá trị msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
-"Đối số “--flag” (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
+"Đối số « --flag » (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "đầu vào tiêu chuẩn"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Gặp một ký tự khác ASCII tại %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Gặp một ghi chú khác ASCII nằm tại hay trước %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Gặp một chuỗi khác ASCII tại %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
-msgstr "%s%s: cảnh báo: "
+msgstr "%s%s: cảnh báo : "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 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"
+"chuỗi định dạng %s đúng. Lý do : %s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 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"
+"Dù nó được tuyên bố 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:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4339,13 +4025,13 @@
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"Chuỗi định dạng “%s” có đối số không tên\n"
-"không thể được bản địa hóa cho đúng:\n"
+"Chuỗi định dạng « %s » có đối số không tên\n"
+"không thể được địa phương hoá cho đúng:\n"
 "dịch giả không thể sắp xếp lại những đối số.\n"
 "Đề 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"
+"và sự ánh xạ thay cho đồ nhiều thành phần cho những đối số.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4353,53 +4039,46 @@
 msgstr ""
 "Chuỗi gốc msgid trống.\n"
 "Nó được dành riêng bởi phần mềm gettext của GNU:\n"
-"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"
+"gettext(\"\") trả lại mục nhập phần đầu có siêu thông tin,\n"
+"không phải chuỗi rỗng.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "đặc tả đối chưa rõ ràng cho từ khoá “%.*s”"
+msgstr "đặc tả đối số mơ hồ cho từ khoá « %.*s »"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "cảnh báo: thiếu ngữ cảnh cho từ khoá “%.*s”"
+msgstr "cảnh báo : thiếu ngữ cảnh cho từ khoá « %.*s »"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, 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ố ở số nhiều của từ khoá “%.*s”"
+msgstr "cảnh báo : thiếu ngữ cảnh cho đối số ở số nhiều của từ khoá « %.*s »"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, 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"
+msgstr "ngữ cảnh xung đột giữa cách ở số ít và số nhiều"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"Chưa đưa ra tùy chọn “--msgid-bugs-address” (địa chỉ lỗi msgid).\n"
-"Nếu bạn đang dùng tập tin kiểu “Makevars”,\n"
-"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"
+"Chưa xác định tùy chọn « --msgid-bugs-address » (địa chỉ lỗi msgid).\n"
+"Nếu bạn đang dùng tập tin kiểu « Makevars »,\n"
+"hãy xác định biến MSGID_BUGS_ADDRESS trong đó;\n"
+"không thì xác định tùy chọn dòng lệnh « --msgid-bugs-address ».\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
-msgstr "không nhận ra ngôn ngữ “%s”"
+msgid "language `%s' unknown"
+msgstr "không nhận ra ngôn ngữ « %s »"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<không_tên>"
-
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "trường phần đầu “%s” nên bắt đầu tại đầu dòng\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "một số trường phần đầu vẫn còn chứa giá tri mặc định ban đầu (sửa đi)\n"
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/zh_CN.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/zh_CN.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/zh_CN.po gettext-0.18.1.1/gettext-tools/po/zh_CN.po
--- gettext-0.19.3/gettext-tools/po/zh_CN.po	2014-10-16 06:04:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/zh_CN.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,17 @@
 # gettext-tools 软件包的简体中文翻译
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Funda Wang <fundawang@linux.net.cn>, 2004.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2009, 2010, 2011, 2012, 2013
+# Ji ZhengYu <zhengyuji@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.18.2\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-03-05 16:18+0800\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2009-03-20 20:06中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -25,28 +26,29 @@
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "%2$s 的参数 %1$s 有歧义"
+msgstr "%2$s 的参数 %1$s 含糊"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "有效的参数为: "
+msgstr "有效的参数为："
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "无法找到临时目录，请尝试设置 $TMPDIR 变量"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "无法用“%s”模板创建临时目录"
 
-#: gnulib-lib/clean-temp.c:435
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "无法删除临时文件 %s"
 
-#: gnulib-lib/clean-temp.c:450
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "无法删除临时目录 %s"
@@ -55,38 +57,37 @@
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-msgstr "保存 %s 的权限"
-
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "读取 %s 时出错"
+msgid "error while opening \"%s\" for reading"
+msgstr "打开“%s”读取时出错"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "无法写入备份文件 %s"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "无法打开备份文件“%s”写入"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "读取 %s 出错"
+msgid "error reading \"%s\""
+msgstr "读取“%s”出错"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "写入 %s 出错"
+msgid "error writing \"%s\""
+msgstr "写入“%s”出错"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "读取 %s 后出错"
+msgid "error after reading \"%s\""
+msgstr "读取“%s”后出错"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -103,98 +104,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "未找到 C# 虚拟机，试着安装 pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 子进程失败"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: 选项“%s”有歧义;可能是:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s：选项“%s”含糊\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: 选项“--%s”不允许有参数\n"
+msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: 选项“%c%s”不允许有参数\n"
+msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: 选项“--%s”需要参数\n"
+msgstr "%s：选项“%s”需要参数\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 无法识别的选项“--%s”\n"
+msgstr "%s：无法识别的选项“--%s”\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 无法识别的选项“%c%s”\n"
+msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, c-format
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: 无效选项 -- '%c'\n"
+msgstr "%s：无效选项 -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, c-format
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: 选项需要参数 -- '%c'\n"
+msgstr "%s：选项需要参数 -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: 选项“-W %s”歧义\n"
+msgstr "%s：选项“-W %s”含糊\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: 选项“-W %s”不允许参数\n"
+msgstr "%s：选项“-W %s”不允许参数\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: 选项“-W %s”需要参数\n"
+msgstr "%s：选项“%s”需要参数\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 source_version 参数"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 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:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "创建“%s”失败"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "写入“%s”出错"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "未找到 Java 编译器，试着安装 gcj 或设置 $JAVAC"
@@ -204,99 +205,61 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "未找到 Java 虚拟机，试着安装 gij 或设置 $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 子进程 I/O 错误"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "creation of threads failed"
-msgstr "线程创建失败"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "写入 %s 子进程失败"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "由 %s 子进程读入数据时出现错误"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "无法为 %s 子进程创建非专用的 I/O"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "和 %s 子进程通讯时出现错误"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 子进程已终止，错误码为 %d"
+msgid "cannot create pipe"
+msgstr "无法创建管道"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "“"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "无法创建管道"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失败"
 
-#: gnulib-lib/w32spawn.h:84
-#, c-format
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "无法还原文件描述符 %d: dup2 错误"
+msgstr "无法创建输出文件“%s”"
 
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
@@ -309,51 +272,42 @@
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 子进程收到致命信号 %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "打开“%s”读取时出错"
-
-#: src/format.c:151
-#, c-format
+#: src/format.c:148
+#, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "不像“%3$s”，“%1$s”不是有效的 %2$s 格式字符串。原因: %4$s"
+msgstr "不像“msgid”，“%s”不是有效的 %s 格式字符串。原因：%s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "参数\"%u\"(如同\"%s\")的格式指定在\"%s\"中不存在"
+msgstr "“%2$s”中的参数 %1$u 的格式指定符在“msgid”中不存在"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "参数 %u 的格式指定符在“%s”中不存在"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, c-format
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "参数 %3$u 的指定格式在“%1$s”和“%2$s”中不同"
+msgstr "参数 %2$u 的“msgid”和“%1$s”中的格式指定符并不相同"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "第 %u 条指令以“|”开始但并不以“|”。"
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -362,22 +316,20 @@
 "第 %u 条指令中，“<”后的记号并不是格式指定符宏的名称。有效的宏名列在 ISO C 99 "
 "章节 7.8.1 中。"
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "第 %u 条指令中，没有与“<”匹配的“>”。"
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字符串引用了第 %u 个参数但是却忽略了第 %u 个参数。"
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, c-format
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "“%s”和“%s”中的指定格式数量不匹配"
+msgstr "“msgid”和“%s”中的格式指定符数量不匹配"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -451,24 +403,14 @@
 msgstr "第 %u 条指令中，“%c”前不允许有标志。"
 
 #: src/format-gcc-internal.c:677
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "“%s”使用了 %%m，但“%s”没有使用"
+msgstr "“msgid”使用了 %%m，但“%s”没有使用"
 
 #: src/format-gcc-internal.c:680
-#, c-format
+#, fuzzy, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "“%s”没有使用 %%m，但“%s”要用 %%m"
-
-#: src/format-gfc-internal.c:383
-#, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "“%s”要用 %%C，但“%s”没有"
-
-#: src/format-gfc-internal.c:386
-#, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "“%s”没有使用 %%C，但“%s”要用 %%C"
+msgstr "“msgid”没有使用 %%m，但“%s”使用了 %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
@@ -557,10 +499,10 @@
 msgstr "第 %u 条指令中，选择包含的数字后面没有“<”、“#”或“%s”。"
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "参数{%u}(如同\"%s\")的格式指定在\"%s\"中不存在"
+msgstr "“%2$s”参数 {%1$u} 的格式指定符未在“msgid”中找到"
 
 #: src/format-java.c:756
 #, c-format
@@ -568,10 +510,10 @@
 msgstr "参数 {%u} 中未在“%s”中找到"
 
 #: src/format-java.c:776
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "参数 {%3$u} 在“%1$s”和“%2$s”中的格式指定不相同"
+msgstr "参数 {%2$u} 在“msgid”和“%1$s”中的格式指定不相同"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -634,14 +576,14 @@
 msgstr "字符串引用某些参数的方式不兼容。"
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "“%s”和“%s”中的格式指定符不同"
+msgstr "“msgid”和“%s”中的格式指定符不同"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
+#, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "“%s”中的格式指定符不是“%s”格式指定符的子集"
+msgstr "“%s”中的格式指定符不是“msgid”格式指定符的子集"
 
 #: src/format-perl.c:433
 #, c-format
@@ -650,9 +592,7 @@
 "conversion specifier '%c'."
 msgstr "第 %u 条指令中，大小指定符与转换指定符“%c”不兼容。"
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "参数“%s”的格式指定符未在“%s”中找到"
@@ -669,62 +609,37 @@
 msgstr "字符串对名为“%s”的参数引用方式不兼容。"
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "“%s”中的格式指定符需要映射，而“%s”中的格式指定符需要元组"
+msgstr "“msgid”中的格式指定符需要映射，而“%s”中的格式指定符需要元组"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "“%s”中的格式指定符需要元组，而“%s”中的格式指定符需要映射"
+msgstr "“msgid”中的格式指定符需要元组，而“%s”中的格式指定符需要映射"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "参数\"%s\"(如同\"%s\")的格式指定在\"%s\"中不存在"
+msgstr "“%2$s”中对参数“%1$s”的格式指定符未在“msgid”中找到"
 
 #: src/format-python.c:494
-#, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "“%s”和“%s”中对参数“%s”的格式指定不同"
-
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "第 %u 条指令中，“%c”后面没有数字。"
-
-#: src/format-python-brace.c:150
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "第 %u 条指令中，“{”后没有参数编号。"
-
-#: src/format-python-brace.c:165
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "第 %u 条指令中，“%c”后面没有数字。"
-
-#: src/format-python-brace.c:185
 #, fuzzy, c-format
 msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "第 %u 条指令中，“%c”前不允许有精度。"
-
-#: src/format-python-brace.c:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "第 %u 条指令中，参数 %d 为负数。"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr "“msgid”和“%s”中对参数“%s”的指定符不同"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
 "a double-digit argument number"
 msgstr ""
-"'%s' 仅仅是个格式字符串，但‘%s’不是：它包含一个‘L’标记或是一个两位数的参数值"
+"'msgid' 仅仅是个格式字符串，但‘%s’不是：它包含一个‘L’标记或是一个两位数的参数"
+"值"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -761,11 +676,11 @@
 "1 and 9."
 msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -778,58 +693,58 @@
 "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/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "参数太多"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr "试试“%s --help”查看帮助信息。\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [选项]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "打印机器的主机名。\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "输出格式：\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 短主机名\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -837,34 +752,34 @@
 "                                name, and aliases\n"
 msgstr "  -f, --fqdn, --long          长主机名，包括全称域名和别名\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机名地址\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信息并退出\n"
@@ -873,230 +788,219 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "无法获得主机名"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "允许最多一个输入文件"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 互相排斥"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [选项] [输入文件]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根据消息的属性过滤一个翻译库里的消息，并处理消息的属性。\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    做为输入的 PO 文件\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目录        在<目录>中查找输入文件\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件位置：\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果没有指定输出文件或输出文件是 -，则将结果写入至标准输出。\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "消息选择：\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            保留已翻译的，去掉未翻译的消息\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          保留未翻译的，去掉已翻译的消息\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              删除标为模糊的消息\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            保留标为模糊的消息\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           移除过时 #~ 的消息\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         保留过时 #~ 的消息\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "属性操纵：\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             全部消息设为“模糊”\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          全部消息设为过时\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        全部消息清除过时属性\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr "      --previous              保留已翻译条目的 msgids\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-previous        从所有条目中删除“previous msgid”\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              删除标为模糊的消息\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=文件.po     只处理列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=文件.po   只处理未列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等于 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1104,17 +1008,17 @@
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1127,119 +1031,119 @@
 "                              WHEN 可以"
 "是‘always’，‘never’，‘auto’或‘html’。\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STYLEFILE       为 --color 参数指定 CSS 样式文件\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             不在输出中使用 C 转码序列(默认)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr "  -E, --escape                在输出中使用 C 转码序列，没有扩展字符\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算为空也写入 PO 文件\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                使用缩进风格写入 .po 文件\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不写入“#: 文件名:行号”位置行\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          生成“#: 文件名:行号”位置行(默认)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    写出 NeXTstep/GNUstep .strings 文件\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=数字            设置输出页面宽度\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           输出前排序\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出现的选择条件 (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1248,37 +1152,35 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "连接并合并指定的 PO 文件。\n"
-"在两个或多个指定的 PO 文件中找出共同的翻译消息。\n"
-"利用 --more-than 选项，可以令消息在不同文件中\n"
-"出现的次数较多时才打印。\n"
-"相反地，--less-than 选项则会令消息在不同文件中\n"
-"出现的次数较少时才打印\n"
-"(例如 --less-than=2 表示打印只出现一次的消息)。\n"
-"翻译内容、自行加上的批注和源程序代码批注，以及文件中的位置等都会累积，\n"
-"除非使用了 --use-first选项，那样则会由第一个包含该翻译条目的文件获取数据。\n"
+"在两个或多个指定的 PO 文件中找出共同的翻译消息。利用 --more-than 选项，可以\n"
+"令消息在不同文件出现的次数较多时才打印。相反地，--less-than 选项则会令消息在\n"
+"不同文件出现的次数较少时才打印(例如 --less-than=2 表示打印只出现一次的消息)。\n"
+"翻译内容、自行加上的批注和源程序代码的批注都会累积，除非使用了 --use-first\n"
+"选项，那样则会由第一个包含该翻译条目的文件获取数据。所有 PO 文件中的翻译条目\n"
+"的文件位置都会累积下来。\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读取标准输入。\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1287,7 +1189,7 @@
 "  -<, --less-than=数字        只打印出现次数少于指定次数的消息，若没有\n"
 "                              指定次数则默认值为无穷大\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1296,7 +1198,7 @@
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1305,15 +1207,15 @@
 "  -u, --unique                --less-than=2 的缩写，要求只列出出现一次\n"
 "                              的消息\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1321,12 +1223,12 @@
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名称          输出的编码\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1335,28 +1237,28 @@
 "      --use-first             对每条消息均使用第一个可用的翻译，不合并若干\n"
 "                              种翻译\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=CATALOGNAME      在文件头中设定 'Language'\n"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "没有给出输入文件"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要两个输入文件"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [选项] def.po ref.pot\n"
@@ -1387,19 +1289,19 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     对源文件的引用\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "操作修饰：\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr "  -m, --multi-domain          将 ref.pot 应用到 def.po 的每个域上\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     不使用模糊匹配\n"
@@ -1424,17 +1326,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr "此条目需要由翻译者复审"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "此消息使用了但却未定义..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但此定义十分类似"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "此消息已使用，但未定义于 %s 中"
@@ -1444,18 +1346,18 @@
 msgid "warning: this message is not used"
 msgstr "警告：此消息未使用"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "发现 %d 处致命错误"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "需要至少指定两个文件"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1463,19 +1365,17 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"在两个或多个指定的 PO 文件 中找出共同的翻译消息。\n"
-"利用 --more-than 选项，可以令消息在不同文件出现的次数较多时才会打印。\n"
-"相反地，--less-than 选项则会令消息在不同文件出现的次数较少时才打印\n"
-"（例如 --less-than=2 表示打印只出现一次的消息）。\n"
-"翻译内容、自行加上的注释和源程序注释的批注都会保留，\n"
-"但只会保留最先定义这些信息的 PO 文件中的内容。\n"
-"所有 PO 文件中的翻译条目的文件位置都会累积下来。\n"
+"在两个或多个指定的 PO 文件 中找出共同的翻译消息。利用 --more-than 选项，可以\n"
+"令消息在不同文件出现的次数较多时才会打印。相反地，--less-than 选项则会令消息\n"
+"在不同文件出现的次数较少时才打印（例如 --less-than=2 表示打印只出现一次的消\n"
+"息）。翻译内容、自行加上的注释和源程序注释的批注都会保留，但只会保留最先定义\n"
+"这些信息的 PO 文件中的内容。所有 PO 文件中的翻译条目的文件位置都会累积下来。\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1484,67 +1384,67 @@
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           不写入带有“msgid \"\"”项的文件头项\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "将一个翻译库的编码转换为另一种文字编码。\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "转换目标：\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "默认编码为当前区域设置的编码。\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                缩进的输出风格\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           排除“#: filename:line”行\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留“#: filename:line”行(默认)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要一个输入文件"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [选项] 输入文件\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1556,7 +1456,7 @@
 "(通常由 xgettext 创建)。未翻译的条目会填上和 msgid 一样的字符串，\n"
 "并标记为模糊。\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  输入文件                    输入 PO 或 POT 文件\n"
@@ -1595,7 +1495,7 @@
 "有一个称为“0”的特殊内置命令，它会输出翻译条目，并随后加上一个 null\n"
 "字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
@@ -1605,27 +1505,32 @@
 msgid "write to stdout failed"
 msgstr "写入 stdout 失败"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "写入 %s 子进程失败"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "缺少过滤器名称"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必须指定至少一个 sed 脚本"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [选项] 过滤器 [过滤器选项]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1634,18 +1539,18 @@
 "<过滤器>可以是任何由标准输入读入翻译条目\n"
 "并将修改后的翻译写进标准输出的程序。\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "当过滤器是“sed”时可用的过滤选项：\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=脚本       将<脚本>添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1653,122 +1558,101 @@
 "                                to be executed\n"
 msgstr "  -f, --file=脚本文件         将<脚本文件>的内容添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       禁用对模式空白的自动打印\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr "      --no-escape             在输出中不使用 C 转义字符(默认)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保持文件头项不变，不过滤它\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的参数应该是一个标点符号"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定“-d 目录”选项"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定“-l locale”选项"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s 需要指定“-l locale”选项"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s 需要指定“-l locale”选项"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s 和 %s 互相排斥"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
-msgstr "%s: "
+msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d 条已翻译消息"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，%d 条模糊消息"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，%d 条未翻译消息"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [选项] 文件名.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1777,24 +1661,24 @@
 "长选项必须用的参数在使用短选项时也是必须的。\n"
 "可选参数也是如此。\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr "  -j, --java                  Java 模式：生成 Java 资源包类\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1803,57 +1687,51 @@
 "      --java2                 类似 --java，但假设是 Java2 (JDK 1.2 或较新\n"
 "                              的版本)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：生成 .NET .dll 文件\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr "      --csharp-resources      C# 资源模式：生成 .NET .resources 文件\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：生成 tcl/msgcat .msg 文件\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 
-#: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "以 Java 模式输出文件位置：\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=资源         资源名称\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1861,20 +1739,13 @@
 msgstr ""
 "  -l, --locale=语系           语系名称，必须是“语言”或“语言_国家”的格式\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr "      --tcl                   Tcl 模式：输入为 tcl/msgcat .msg 文件\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目录                     类目录层次的基本目录\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1885,19 +1756,19 @@
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "-d 选项是必须的。class 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模式输出文件位置：\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr "  -d 目录                     依赖语系的 .dll 文件的的基本目录\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1906,61 +1777,29 @@
 "-l 和 -d 选项是必要的。.dll 文件会写入指定目录的子目录，而子目录的名称取决于"
 "语系。\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模式输出文件位置：\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  --d 目录                    .msg 消息库的基本目录\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  --d 目录                    .msg 消息库的基本目录\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kWORD, --keyword=WORD      查找 WORD 作为一个额外的关键字\n"
-"  -k, --keyword               不使用默认关键字\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的解释：\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1970,19 +1809,19 @@
 "  -c, --check                 同时进行 --check-format、--check-header 和\n"
 "                                --check-domain 三种检查\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          检查和语言有关的格式字符串\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          检查文件头项是否存在及检查其内容\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1991,7 +1830,7 @@
 "      --check-domain          检查 domain 指令和 --output-file 选项之间\n"
 "                                是否冲突\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1999,7 +1838,7 @@
 msgstr ""
 "  -C, --check-compatibility   让 GNU msgfmt 以 X/Open msgfmt 的方式检查文件\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2008,132 +1847,110 @@
 msgstr ""
 "      --check-accelerators[=CHAR]  检查菜单项目中的快捷键标记是否存在\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=数字        以<数字>个字节为单位对齐字符串(默认：%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-"      --endianness=BYTEORDER  以指定字节序输出 32位数\n"
-"                                (big 还是 little 是系统平台默认的)\n"
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               二进制文件将不包含哈希表\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打印关于翻译的统计\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：PO 文件头丢失或无效\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字符集转换无法工作\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 文件头模糊\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：旧版本的 msgfmt 将在此时给出错误\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "域名“%s”无法用于文件名"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "域名“%s”无法用于文件名：将使用前缀"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
-msgstr ""
+msgid "`domain %s' directive ignored"
+msgstr "域名“%s”不适合作为文件名"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1008
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr "忽略了空的“msgstr”项"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1009
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "忽略了模糊的“msgstr”项"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：源文件包含模糊的翻译条目"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "未指定“J”、“K”、“T”、“C”或“X”前不能使用选项“%c”"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "提取翻译库中的消息，这些消息符合某个给出的模式或属于某个给出的源文件。\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2207,23 +2024,23 @@
 "  -i, --ignore-case           忽略大小写区别\n"
 "  -v, --invert-match          仅输出不符合任何条件的消息\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr "      --escape                在输出中使用 C 转义字符，没有扩展字符\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           生成排序输出\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根据文件位置排序输出\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2232,7 +2049,7 @@
 "系统环境没有任何和语言有关的设置。请根据 ABOUT-NLS 文件所述，\n"
 "设置 LANG 环境变量。这是测试翻译前的必要步骤。\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2243,24 +2060,24 @@
 "请通过 --locale 选项指定语系或\n"
 "--output-file 选项指定输出的 .po 文件。\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "已创建 %s。\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "创建新的 PO 文件，即根据用户环境取值初始化文件头。\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=输入文件        输入的 POT 文件\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2270,12 +2087,12 @@
 "如果没有给出输入文件，将会搜索当前目录中的 POT 文件。\n"
 "如果为 - 的话，将会读取标准输入。\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=文件      将输出写入至指定的 PO 文件\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2285,18 +2102,18 @@
 "定。\n"
 "如果输出文件是“-”，则会将结果写入至标准输出。\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          设置目标语系\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假定 PO 文件是自动生成的\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2304,12 +2121,12 @@
 "找到多于一个的 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "读取当前的目录时发生错误"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2317,14 +2134,14 @@
 "在当前目录中找不到任何 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 子进程失败，错误码为 %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2338,7 +2155,7 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 软件包的简体中文翻译"
@@ -2356,13 +2173,13 @@
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "输入文件“%s”不包含指定字符集的文件头项"
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "输入文件“%2$s”的域“%1$s”不包含指定字符集的文件头项"
 
@@ -2372,8 +2189,8 @@
 msgstr "目标字符集编码“%s”不是通用的编码名称。"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2489,44 +2306,44 @@
 msgid "Try using the following, valid for %s:"
 msgstr "请尝试使用下面的，对 %s 是有效的："
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "消息库有复数形式的翻译"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "但是文件头项中缺少“plural=表达式”属性"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "但是文件头项中缺少“nplural=整数”属性"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nplurals 值无效"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "plural 表达式无效"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2534,55 +2351,64 @@
 "翻译库包含复数形式的翻译，但缺少以下的文件头项：\n"
 "“Plural-Forms: nplurals=<整数>; plural=<表达式>;”"
 
-#: src/msgl-check.c:611
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "“msgid”和“msgid_plural”项并非都以“\\n”开始"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "“msgid”和“msgid_plural”项并非同时以“\\n”开始"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:610
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "“msgid”和“msgstr[%u]”项并非都以“\\n”开始"
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "“msgid”和“msgstr[%u]”项并非同时以“\\n”开始"
 
-#: src/msgl-check.c:634
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "“msgid”和“msgstr”项并非都以“\\n”开始"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "“msgid”和“msgstr”项并非同时以“\\n”开始"
 
-#: src/msgl-check.c:652
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "“msgid”和“msgid_plural”项并非都以“\\n”结束"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "“msgid”和“msgid_plural”项并非同时以“\\n”结束"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:651
 #, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "“msgid”和“msgstr[%u]”项并非都以“\\n”结束"
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "“msgid”和“msgstr[%u]”项并非同时以“\\n”结束"
 
-#: src/msgl-check.c:675
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "“msgid”和“msgstr”项并非都以“\\n”结束"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "“msgid”和“msgstr”项并非同时以“\\n”结束"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "复数处理是 GNU gettext 的扩展功能"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少快捷键标记“%c”"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 包含过多的快捷键标记“%c”"
 
-#: src/msgl-check.c:814
-#, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "文件头\"%s\"仍然是默认值未改变\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "头部缺少文件头项“%s”\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:784
 #, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "头部缺少文件头\"%s\"\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "文件头项“%s”应该位于行首\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "某些文件头项仍然是默认值\n"
+
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "某些文件头项仍然是默认值\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2598,8 +2424,8 @@
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "输入文件不包含指定字符集的文件头项"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2613,24 +2439,24 @@
 "msgids become equal."
 msgstr "从“%s”转换为“%s”出现了重复项：某些原本不同的 msgid 变成了相同项。"
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr "无法从“%s”转换为“%s”。%s 需要 iconv()。此版本创建时未包含 iconv()。"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "备份类型"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2651,24 +2477,24 @@
 "在程序执行的过程中找不到完全匹配的文字，则会使用模糊的匹配以求达到较好的\n"
 "效果。\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      根据旧源文件进行的翻译成果\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     对新源文件的引用\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr "  -C, --compendium=文件       消息翻译的额外库，可指定多个\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2677,27 +2503,27 @@
 "  -U, --update                更新 def.po,\n"
 "                              如果 def.po 已经是最新则不作任何事\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "以更新模式输出文件位置：\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "结果将写回 def.po 中。\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=备份方法       备份 def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=后缀           覆盖默认备份后缀\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2715,37 +2541,37 @@
 "  existing, nil   如果编号备份存在则继续编号，否则执行简单备份\n"
 "  simple, never   总是制作简单的备份\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"除非以 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置, 备份文件后缀总是\"~\"\n"
+"备份后缀是“~”，您可以用 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置。\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr "      --previous              保留已翻译条目的 msgids\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隐藏进度指示\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此消息应定义复数形式"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此消息不应定义复数形式"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2754,7 +2580,7 @@
 "%s读取了 %ld 条旧的 + %ld 条引用，合并了 %ld 条，模糊的 %ld 条，缺少 %ld 条，"
 "过时的 %ld 条。\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2857,7 +2683,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                写出严格的 Uniforum 风格\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2876,12 +2702,12 @@
 "累积起来，但如果指定了 --use-first 选项，则会从第一个翻译中取得注释。文件位置\n"
 "将会累积。如果使用了 --unique 选项，重复项将会被忽略。\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只打印重复项\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2902,7 +2728,7 @@
 "字符集“%s”不是可移植的编码名称。\n"
 "将消息转换为用户字符集可能不工作。\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2911,21 +2737,21 @@
 "不支持“%s”字符集。%s 依赖 iconv()，而 iconv() 不支持\n"
 "“%s”。\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr "安装 GNU libiconv，然后重新安装 GNU gettext 将修复此问题。\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "仍然继续，遇到处理错误。"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "仍然继续。"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2934,7 +2760,7 @@
 "不支持“%s”字符集。%s 依赖 iconv()。\n"
 "此版本创建时未包含 iconv()。\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2947,27 +2773,27 @@
 msgid "inconsistent use of #~"
 msgstr "#~ 使用不一致"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "缺少“msgstr[]”区"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "缺少“msgid_plural”区"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
-msgid "missing 'msgstr' section"
+msgid "missing `msgstr' section"
 msgstr "缺少“msgstr”区"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "复数格式的第一项索引非零"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "复数形式的索引出错"
@@ -2977,7 +2803,7 @@
 msgid "too many errors, aborting"
 msgstr "错误太多，中止"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "无效的多字节序列"
@@ -3021,16 +2847,16 @@
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "重复的消息定义"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "这是第一次定义的位置"
 
@@ -3104,12 +2930,12 @@
 "standard output.\n"
 msgstr "输入文本从标准输入读取。转换后的文本输出到标准输出。\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "输入无法用“%s”编码表示"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "从“%s”转换为“%s”编码时出错"
@@ -3131,35 +2957,25 @@
 "the locally accessible FILE is used instead.\n"
 msgstr "获取 URL 并输出其内容。如果无法访问 URL，则换用指定的本地文件。\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "读取“%s”出错"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "写入 stdout 出错"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "读取“%s”后出错"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
-msgstr "取回 %s..."
+msgstr ""
 
 #: src/urlget.c:308
 #, c-format
 msgid " timed out.\n"
-msgstr "超时。\n"
+msgstr ""
 
 #: src/urlget.c:445
 #, c-format
 msgid " failed.\n"
-msgstr "失败。\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -3219,17 +3035,17 @@
 msgid "compilation of C# class failed"
 msgstr "编译 C# 类失败"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "不是有效的 Java 类名：%s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC 变量"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "编译 Java 类失败，请尝试设置 $JAVAC 变量"
@@ -3239,18 +3055,13 @@
 msgid "error while opening \"%s\" for writing"
 msgstr "打开“%s”写入出错"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "无效的多字节序列"
-
-#: src/write-po.c:884
+#: src/write-po.c:802
 #, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "国际化的消息不应包含“\\%c”转码序列"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3263,7 +3074,7 @@
 "用纯 ASCII 的 msgctxt。\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3341,7 +3152,7 @@
 "消息库有复数翻译\n"
 "但是 Tcl 消息库不支持复数处理\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d：警告：未结束的字符串"
@@ -3351,24 +3162,22 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结束的正规表达式"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d：警告：无效的 Unicode 字符"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d：警告：未结束的字符常量"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d：警告：未结束的字符串字面"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
 msgid "Please specify the source encoding through --from-code."
-msgstr "请用 --from-code 指定源编码"
+msgstr ""
+"在 %s%s 出现了非 ASCII 字符串。\n"
+"请通过 --from-code 指定源文件的编码。\n"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3406,7 +3215,7 @@
 "%s:%d：文件结尾处出现了不完整的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d：iconv 失败"
@@ -3420,7 +3229,7 @@
 "%s:%d：无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d：警告：无效的 Unicode 字符"
@@ -3440,22 +3249,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d：警告：期待“)”却发现了“}”"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu：%s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3465,74 +3264,9 @@
 "此版本创建时未包含 expat。\n"
 
 #: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: 警告:未结束的字符串 U+%04X"
-
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "请用 --from-code 指定源编码"
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d：出现了无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码。\n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d：较长的不完整多字节序列。\n"
-"请通过 --from-code 指定源文件的编码。\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码。\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码。\n"
-
-#: src/x-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d：无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码。\n"
-
-#: src/x-javascript.c:954
 #, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d：警告：未结束的字符串字面"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d：警告：无效的 Unicode 字符"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d：警告：未结束的字符串"
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d：警告：未结束的字符串 U+%04X"
 
 #: src/x-perl.c:308
 #, c-format
@@ -3569,15 +3303,17 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\U”)"
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
-"请通过 --from-code 或是注释指定源文件的编码，\n"
-"如 http://www.python.org/peps/pep-0263.html 中所指定的那样。\n"
+"在 %s%s 出现了非 ASCII 字符串。\n"
+"请通过 --from-code 指定源文件的编码，详见\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3588,7 +3324,7 @@
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3599,7 +3335,7 @@
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3610,7 +3346,7 @@
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3621,7 +3357,7 @@
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3632,7 +3368,7 @@
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "未知编码“%s”。先按照 ASCII 处理。"
@@ -3659,61 +3395,51 @@
 "use eval_gettext instead"
 msgstr "%s:%lu：警告：为安全起见，语法 $“...”不被推荐；请换用 eval_gettext"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d：警告：未结束的字符串字面"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "警告：文件“%s”扩展名“%s”未知; 将试试 C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "警告：文件“%s”扩展名“%s”未知；看作 C 语言"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, 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:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3721,8 +3447,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=名称         识别指定语言\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3732,19 +3457,19 @@
 "PHP,\n"
 "                                GCC-源, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "默认情况下，所使用的语言是根据输入文件的扩展名猜测的。\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3753,23 +3478,23 @@
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 "                                preceding keyword lines in output file\n"
@@ -3777,29 +3502,26 @@
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   以 TAG 开始放置注释块\n"
-"                              并在输出文件中以关键词开启一行\n"
-"  -c, --add-comments          在输出文件中以关键词开启一行，\n"
-"                              并放置所有注释块\n"
+"  -c, --add-comments[=标记]   在输出文件中放置用<标记>(或类似的关键字\n"
+"                              行)标明的注释块\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项：\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (仅 C, C++, ObjectiveC, Shell, Python, "
 "Lisp,\n"
@@ -3807,22 +3529,16 @@
 "Tcl,\n"
 "                                Perl, PHP, GCC-源, Glade 语言)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (仅 C, C++, ObjectiveC, Shell, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java, C#, awk, "
-"Tcl,\n"
-"                                Perl, PHP, GCC-源, Glade 语言)\n"
+"  -k, --keyword[=单词]        要查找的额外关键字(不指定<单词>表明不使用\n"
+"                              默认关键字)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3833,14 +3549,13 @@
 "标\n"
 "                              志\n"
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (仅 C, C++, ObjectiveC, Shell, Python, "
 "Lisp,\n"
@@ -3848,126 +3563,124 @@
 "Tcl,\n"
 "                                Perl, PHP, GCC-源语言)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格式字符串\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格式字符串识别结果\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          为外语用户省略 FSF 版权\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包名字\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, 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:1016
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRING], --msgstr-prefix[=STRING]  使用 STRING 或 \"\" 作为\n"
-"                                         msgstr 内容的前缀\n"
+"  -m, --msgstr-prefix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的前缀\n"
 
-#: src/xgettext.c:1019
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRING], --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后"
-"缀\n"
+"  -M, --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后缀\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
-msgstr "%s%s 处有非 ASCII 码字符。"
+msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
-msgstr "%s%s 处或之前位置有非 ASCII 码注释。"
+msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
-msgstr "%s%s 处有非 ASCII 字符串。"
+msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3975,14 +3688,14 @@
 msgstr ""
 "尽管在格式字符串的位置使用，但 %s 仍不是有效的 %s 格式字符串。原因：%s\n"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, 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:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3994,7 +3707,7 @@
 "翻译者无法重新编排参数的顺序。\n"
 "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4004,53 +3717,46 @@
 "gettext(\"\") 将返回文件头项，而不\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s”的参数指定含糊"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少上下文"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少复数参数上下文"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "单数和复数的上下文不匹配"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"未指定选项 --msgid-bugs-address。\n"
-"如果您正在使用“Makevars”文件，请指定\n"
-" MSGID_BUGS_ADDRESS 变量；\n"
+"未指定选项 --msgid-bugs-address。如果您正在使用\n"
+"“Makevars”文件，请指定 MSGID_BUGS_ADDRESS 变量；\n"
 "否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3226
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "语言“%s”未知"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<未命名>"
 
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "文件头项“%s”应该位于行首\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "某些文件头项仍然是默认值\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s：非法选项 -- %c\n"
 
@@ -4060,6 +3766,18 @@
 #~ msgid "Not yet implemented."
 #~ msgstr "尚未实现。"
 
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "无法为 %s 子进程创建非专用的 I/O"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "和 %s 子进程通讯时出现错误"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "由 %s 子进程读入数据时出现错误"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s 子进程已终止，错误码为 %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "文件头项“%s”仍然是默认值\n"
 
Binary files /tmp/EhP9IWvfof/gettext-0.19.3/gettext-tools/po/zh_TW.gmo and /tmp/JBpa9EOf_q/gettext-0.18.1.1/gettext-tools/po/zh_TW.gmo differ
diff -Nru gettext-0.19.3/gettext-tools/po/zh_TW.po gettext-0.18.1.1/gettext-tools/po/zh_TW.po
--- gettext-0.19.3/gettext-tools/po/zh_TW.po	2014-10-16 06:04:25.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/po/zh_TW.po	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,16 @@
-# Traditional Chinese translation for gettext.
+# traditional Chinese translation for gettext.
 # Copyright (C) 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext package.
 # Pofeng Lee <pofeng@linux.org.tw>, 2001-2002.
 # Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>, 1998.
 # Abel Cheung <abelcheung@gmail.com>, 2002, 2005.
-# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"PO-Revision-Date: 2005-12-06 08:31+0800\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -23,74 +21,74 @@
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "%2$s 的引數 %1$s 無效"
+msgstr "%2$s 的參數 %1$s 無效"
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "%2$s 的引數 %1$s 不明確"
+msgstr "%2$s 的參數 %1$s 不明確"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
-msgstr "有效的引數為："
+msgstr "有效的參數為："
 
-#: gnulib-lib/clean-temp.c:325
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "找不到暫存檔目錄，正嘗試設定 $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:339
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "無法根據目錄名稱樣式 %s 建立暫存檔目錄"
+msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
 
-#: gnulib-lib/clean-temp.c:435
-#, c-format
+#: gnulib-lib/clean-temp.c:445
+#, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "無法刪除暫存檔 %s"
+msgstr "無法產生輸出檔 “%s”"
 
-#: gnulib-lib/clean-temp.c:450
-#, c-format
+#: gnulib-lib/clean-temp.c:460
+#, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "無法刪除暫存目錄 %s"
+msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
-#, c-format
-msgid "preserving permissions for %s"
-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
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "error while opening %s for reading"
-msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
+msgid "error while opening \"%s\" for reading"
+msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:74
 #, c-format
-msgid "cannot open backup file %s for writing"
-msgstr "無法開啟備份檔 %s 來寫入內容"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "無法開啟備份檔 “%s” 來寫入內容"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
-msgid "error reading %s"
-msgstr "讀取 %s 時發生錯誤"
+msgid "error reading \"%s\""
+msgstr "讀取 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
-msgid "error writing %s"
-msgstr "寫入 %s 時發生錯誤"
+msgid "error writing \"%s\""
+msgstr "寫入 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
-msgid "error after reading %s"
-msgstr "完成讀取 %s 後發生錯誤"
+msgid "error after reading \"%s\""
+msgstr "完成讀取 “%s” 後發生錯誤"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -107,98 +105,98 @@
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "找不到 C# virtual machine，請安裝 pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:181
 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/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "%s 副行程發生錯誤"
+msgstr "%s 副進程發生錯誤"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s：選項 ‘%s’ 不明確；可能選項包括："
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s：選項 ‘%s’ 不明確\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s：選項 --%s 不可配合引數使用\n"
+msgstr "%s：選項 ‘--%s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s：選項 ‘%c%s’ 不可配合引數使用\n"
+msgstr "%s：選項 ‘%c%s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s：選項 ‘%s’ 需要引數\n"
+msgstr "%s：選項 ‘%s’ 需要參數\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：無法辨識 ‘--%s’ 選項\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：無法辨識 ‘%c%s’ 選項\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s：選項需要引數 -- %c\n"
+msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：選項 ‘-W %s’ 不明確\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s：選項 ‘-W %s’ 不可配合引數使用\n"
+msgstr "%s：選項 ‘-W %s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項 ‘%s’ 需要引數\n"
+msgstr "%s：選項 ‘%s’ 需要參數\n"
 
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: 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
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "無法建立 “%s”"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "當寫入檔案 %s 時發生錯誤"
+msgstr "當寫入檔案 “%s” 時發生錯誤"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "找不到 Java 編譯器，請安裝 gcj 或是設定 $JAVAC 環境變數"
@@ -208,96 +206,58 @@
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "找不到 Java virtual machine，請安裝 gij 或是設定 $JAVA 環境變數"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "%s 副行程輸出/輸入錯誤"
+msgstr "%s 副進程輸出/輸入錯誤"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, c-format
-msgid "creation of threads failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "寫入至 %s 副行程時發生錯誤"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "由 %s 副行程讀入資料時出現錯誤"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "無法和 %s 副行程建立非專用的 I/O"
-
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "和 %s 副行程溝通時出現錯誤"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 副行程已終止，錯誤碼為 %d"
+msgid "cannot create pipe"
+msgstr "無法建立管線"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-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
-#, c-format
-msgid "cannot create pipe"
-msgstr "無法建立管線"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失敗"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "無法產生輸出檔 “%s”"
@@ -306,83 +266,71 @@
 #: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "%s 副行程"
+msgstr "%s 副進程"
 
 #: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "%s 副行程出現代表嚴重錯誤的訊號 %d"
+msgstr "%s 副進程出現代表嚴重錯誤的訊號 %d"
 
-# 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:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
-
-#: src/format.c:151
+#: src/format.c:148
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "和 ‘msgid’ 不同，‘%s’ 的 %s 格式字串無效。原因：%s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中第 %1$u 個引數的規格在 ‘msgid’ 中並不存在"
+msgstr "‘%2$s’ 中第 %1$u 個參數的規格在 ‘msgid’ 中並不存在"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "第 %u 個引數的規格在‘%s’中並不存在"
+msgstr "第 %u 個參數的規格在‘%s’中並不存在"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
-#: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "‘msgid’和‘%s’的第 %u 個引數的規格並不相同"
+msgstr "‘msgid’和‘%s’的第 %u 個參數的規格並不相同"
 
 #: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "第 %u 個指令結束的不是 ‘}’，而是不合法的字元。"
+msgstr "第 %u 個參數結束的不是 ‘}’，而是不合法的字元。"
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"在第 %u 個指令，‘<’ 之後的關鍵字不是正確的變數規格。如果想獲知正確的變數規格"
+"在第 %u 個參數，‘<’ 之後的關鍵字不是正確的變數規格。如果想獲知正確的變數規格"
 "名稱，請參考 ISO C 99 規格第 7.8.1 節。"
 
-#: src/format-c.c:39
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "在第 %u 個指令，‘<’ 之後的關鍵字後面缺少了 ‘>’。"
+msgstr "在第 %u 個參數，‘<’ 之後的關鍵字後面缺少了 ‘>’。"
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "字串中有提及第 %u 個引數，但忽略了第 %u 個。"
+msgstr "字串中有提及第 %u 個參數，但忽略了第 %u 個。"
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "‘msgid’ 和 ‘%s’ 的格式規格數目不符"
+msgstr "‘msgid’ 和 ‘%s’ 的參數數目不符"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -392,7 +340,7 @@
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
+msgstr "在第 %u 個參數，‘,’ 後面的不是數字。"
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
@@ -403,12 +351,12 @@
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "第 %u 個指令結束的字元是 ‘%c’ 而不是 ‘}’。"
+msgstr "第 %u 個參數結束的字元是 ‘%c’ 而不是 ‘}’。"
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "第 %u 個指令結束的不是 ‘}’，而是不合法的字元。"
+msgstr "第 %u 個參數結束的不是 ‘}’，而是不合法的字元。"
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
@@ -419,36 +367,36 @@
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "第 %u 個指令後出現單獨的 ‘}’。"
+msgstr "第 %u 個參數後出現單獨的 ‘}’。"
 
 #: src/format-gcc-internal.c:255
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
+msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
 #: src/format-gcc-internal.c:292
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
+msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
 #: src/format-gcc-internal.c:334
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
-msgstr "第 %u 個指令中的數字 0 不是正整數。"
+msgstr "第 %u 個參數中的數字 0 不是正整數。"
 
 #: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
-msgstr "在第 %u 個指令，‘<’ 之後的關鍵字後面缺少了 ‘>’。"
+msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
 #: src/format-gcc-internal.c:406
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
+msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
 #: src/format-gcc-internal.c:463
 #, c-format
@@ -465,31 +413,21 @@
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "‘msgid’ 使用了 %%m 但 ‘%s’ 沒有。"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
-
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "在指令中間，字串突然結束"
+msgstr "在參數中間，字串突然結束"
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
-msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的引數"
+msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的參數"
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "第 %u 個指令中的數字 0 不是正整數。"
+msgstr "第 %u 個參數中的數字 0 不是正整數。"
 
 #: src/format-invalid.h:30
 #, c-format
@@ -510,37 +448,37 @@
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
-msgstr "第 %u 個指令的 ‘%c’ 字元屬於無效的列印格式。"
+msgstr "第 %u 個參數的 ‘%c’ 字元屬於無效的列印格式。"
 
 #: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
-msgstr "用來結束第 %u 個指令的字元屬於無效的列印格式。"
+msgstr "用來結束第 %u 個參數的字元屬於無效的列印格式。"
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "字串採用了不相容的方法來表示第 %u 個引數。"
+msgstr "字串採用了不相容的方法來表示第 %u 個參數。"
 
 #: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
-msgstr "第 %u 個指令的子字串 %s 是無效的日期/時間格式。"
+msgstr "第 %u 個參數的子字串 “%s” 是無效的日期/時間格式。"
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
+msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
+msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
 #: src/format-java.c:323
 #, c-format
@@ -565,18 +503,18 @@
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中的引數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
+msgstr "‘%2$s’ 中的參數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "引數 {%u} 的規格在 ‘%s’ 中並不存在"
+msgstr "參數 {%u} 的規格在 ‘%s’ 中並不存在"
 
 #: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "‘msgid’ 和 ‘%s’ 的引數 {%u} 規格並不相同"
+msgstr "‘msgid’ 和 ‘%s’ 的參數 {%u} 規格並不相同"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -642,12 +580,12 @@
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "‘msgid’ 和 ‘%s’ 的格式規格並非同等"
+msgstr "‘msgid’ 和 ‘%s’ 的參數規格並非同等"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "‘%s’ 的格式規格並非 ‘msgid’ 的格式規格的一部份"
+msgstr "‘%s’ 的參數規格並非 ‘msgid’ 的參數規格的一部份"
 
 #: src/format-perl.c:433
 #, c-format
@@ -656,12 +594,10 @@
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "格式 ‘%s’ 的規格在 ‘%s’ 中並不存在"
+msgstr "參數 ‘%s’ 的規格在 ‘%s’ 中並不存在"
 
 #: src/format-python.c:115
 msgid ""
@@ -692,39 +628,13 @@
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中的引數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
+msgstr "‘%2$s’ 中的參數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
 
 #: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "‘msgid’和‘%s’的引數‘%s’的格式並不相同"
-
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:150
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:165
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:185
-#, 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:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "第 %u 個指令中的數字 0 不是正整數。"
+msgstr "‘msgid’和‘%s’的參數‘%s’的格式並不相同"
 
 #: src/format-qt.c:152
 #, c-format
@@ -759,20 +669,20 @@
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "第 %u 個指令的字元‘%c’不是 1 至 9 之間的整數。"
+msgstr "第 %u 個參數的字元‘%c’不是 1 至 9 之間的整數。"
 
 #: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
-msgstr "第 %u 個指令最後一個字元不是 1 至 9 之間的整數。"
+msgstr "第 %u 個參數最後一個字元不是 1 至 9 之間的整數。"
 
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -781,58 +691,58 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
-msgstr "引數過多"
+msgstr "參數過多"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "請執行 ‘%s --help’ 顯示額外資訊。\n"
 
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [選項]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "列印主機的名稱。\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "輸出格式：\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 短的主機名稱\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -841,34 +751,34 @@
 msgstr ""
 "  -f, --fqdn, --long          長的主機名稱，包括正式的網域名稱(FQDN)及別名\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地址\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊：\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示本訊息，然後結束\n"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊，然後結束\n"
@@ -877,232 +787,219 @@
 #. 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/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "無法取得主機名稱"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "最多只接受一個輸入檔"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 兩者是互不相容的"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [選項] [輸入檔]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根據訊息的屬性過濾翻譯檔裡的條目，並處理這些屬性。\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "長選項必須用的引數在使用短選項時也是必須的。\n"
+msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔位置：\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   用作輸入的 PO 檔\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目錄        搜尋輸入檔時加入指定<目錄>\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀取內容。\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "輸出檔位置：\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=檔案      將輸出的內容寫入指定<檔案>\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’，則會在標準輸出顯示結果。\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "篩選訊息：\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            只保留加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           刪除過時的條目 (#~)\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         只保留過時的條目 (#~) \n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "處理屬性：\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             將所有條目標記為 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          將所有條目標記為過時\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        清除所有條目的過時標記\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"  -u, --unique                等於 --less-than=2，表示只顯示\n"
-"                              只有一種翻譯的字句\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     只處理 FILE.po 裡已經有的條目\n"
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=FILE.po   只處理 FILE.po 裡沒有的條目\n"
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等於 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "輸入檔格式：\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      以 Java .properties 格式處理輸入檔\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1110,17 +1007,17 @@
 msgstr ""
 "      --stringtable-input     以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "輸出內容細節：\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1129,16 +1026,16 @@
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1146,9 +1043,9 @@
 "  -e, --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1157,66 +1054,66 @@
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算沒有內容仍產生 PO 檔\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                寫入的 .po 檔內容會進行縮排\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不加入類似 '#: 檔案:行號' 的源代碼位置\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          會加入 '#: 檔案:行號' 格式的源代碼位置 (預設)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                產生的 .po 檔內容跟隨嚴格的 Uniforum 格式\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output    產生 Java .properties 檔案\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    產生 NeXTstep/GNUstep .strings 檔案\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          指定輸出檔每行寬度\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1224,32 +1121,32 @@
 msgstr ""
 "      --no-wrap               即使輸出的訊息超出頁寬，也不將輸出的訊息斷行\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           將輸出結果排序\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出現的選擇條件 (%d < n <%d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [選項] [輸入檔]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1257,9 +1154,9 @@
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments, extracted comments, and file positions will be cumulated, except\n"
-"that if --use-first is specified, they will be taken from the first PO file\n"
-"to define them.\n"
+"comments and extract comments will be cumulated, except that if --use-first\n"
+"is specified, they will be taken from the first PO file to define them.\n"
+"File positions from all PO files will be cumulated.\n"
 msgstr ""
 "合併指定的 PO 檔。\n"
 "在兩個或多個指定的 PO 檔中找出共同的翻譯訊息。利用 --more-than 選項，可以\n"
@@ -1269,23 +1166,23 @@
 "--use-first 選項，那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
 "所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               輸入檔\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果輸入檔是 - 的話，會由標準輸入讀取資料。\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1294,7 +1191,7 @@
 "  -<, --less-than=NUMBER      當一項條目的不同翻譯少於多少種就會顯示，\n"
 "                              預設為無限 (即顯示所有條目)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1303,7 +1200,7 @@
 "  ->, --more-than=NUMBER      當一項條目的不同翻譯多於多少種才會顯示，\n"
 "                              預設為 0 種 (即顯示所有條目)\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1312,15 +1209,15 @@
 "  -u, --unique                等於 --less-than=2，表示只顯示\n"
 "                              只有一種翻譯的字句\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      輸入檔格式為 Java .properties 格式\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1328,12 +1225,12 @@
 msgstr ""
 "      --stringtable-input     輸入檔格式為 NeXTstep/GNUstep .strings 格式\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名稱          輸出的編碼\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1342,28 +1239,28 @@
 "      --use-first             每句只使用第一個出現的翻譯，而不會將所有\n"
 "                              翻譯合併起來\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "未指定輸入檔"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要恰好指定兩個輸入檔"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [選項] def.po ref.pot\n"
@@ -1394,12 +1291,12 @@
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     未翻譯檔案\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "運作模式有關選項：\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1407,7 +1304,7 @@
 msgstr ""
 "  -m, --multi-domain          將 ref.pot 套用於 def.po 中的每一個領域\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     不進行模糊字串配對\n"
@@ -1432,17 +1329,17 @@
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "這個訊息有使用過但沒有定義..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但這個定義很相似"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "這個訊息有使用過但在 %s 中沒有定義"
@@ -1452,26 +1349,26 @@
 msgid "warning: this message is not used"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "找到 %d 個嚴重錯誤"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "必須指定至少兩個檔案"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extracted comments will be preserved, but only from the first\n"
+"comments and extract comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1481,7 +1378,7 @@
 "訊息）。翻譯內容、自行加上的註解和原程式碼的註解都會保留，但只會由第一個\n"
 "含有該翻譯條目的檔案取得。所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1489,67 +1386,67 @@
 msgstr ""
 "  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           不顯示標頭 (即 ‘msgid \"\"’ 項目)\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "將一個翻譯檔的編碼轉換為另一種文字編碼。\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "轉換目標：\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "預設的編碼為目前語言的編碼。\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           不輸出源代碼位置\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
-#, fuzzy, c-format
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
+#, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留源代碼位置 (預設)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格遵從 Uniforum 格式\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要恰好指定一個輸入檔"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [選項] 輸入檔\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1560,7 +1457,7 @@
 "產生英文翻譯檔。輸入檔可以是 PO 檔或 POT 檔 (通常由 xgettext 產生)。\n"
 "未翻譯的條目會填上和 msgid 一樣的字串。\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  輸入檔                      作為輸入的 PO 或 POT 檔\n"
@@ -1599,7 +1496,7 @@
 "有一個稱為 '0' 的特殊內置指令，它會輸出所有翻譯條目，並隨後加上 null 位元。\n"
 "“msgexec 0” 的輸出適用於作為 “xargs -0” 的輸入。\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       作為輸入的 PO 檔\n"
@@ -1609,27 +1506,32 @@
 msgid "write to stdout failed"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "寫入至 %s 副進程時發生錯誤"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "未指定過濾器"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必須指定至少一個 sed script"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [選項] 過濾器 [過濾器選項]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "對於翻譯檔中的所有翻譯條目進行過濾。\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1638,18 +1540,18 @@
 "<過濾器>可以是任何由標準輸入讀入翻譯條目\n"
 "並將修改後的翻譯寫進標準輸出的程式。\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "當<過濾器>是 ‘sed’ 時一些比較有用的選項：\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1657,13 +1559,13 @@
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       不會自動顯示過濾後的結果\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1671,127 +1573,106 @@
 "      --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                將輸出結果進行縮排\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保護標頭內容，過濾內容時不會被更改\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "%s 的引數應該是一個標點符號"
+msgstr "%s 的參數應該是一個標點符號"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀取內容。\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定 “-d 目錄” 選項"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定 “-l locale” 選項"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s 需要指定 “-l locale” 選項"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s 需要指定 “-l locale” 選項"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s 和 %s 兩者是互不相容的"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %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:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "已翻譯 %d 個條目"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，有 %d 個條目標記為模糊翻譯"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，還有 %d 個條目未翻譯"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [選項] filename.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
-msgstr "長選項必要的引數在使用短選項時也是必要的。對於選擇性的引數也一樣。\n"
+msgstr "長選項必要的參數在使用短選項時也是必要的。對於選擇性的參數也一樣。\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             輸入檔\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1799,7 +1680,7 @@
 msgstr ""
 "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1808,12 +1689,12 @@
 "      --java2                 類似 --java，假設格式為 Java2 (JDK 1.2 或以"
 "上)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式，會產生 .NET .dll 檔\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1822,45 +1703,39 @@
 "      --csharp-resources      C# resources 模式，會產生 .NET .resources 檔"
 "案\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：產生 tcl/msgcat .msg 檔\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格式翻譯檔\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示結果。\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource 名稱\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1869,21 +1744,13 @@
 "  -l, --locale=LOCALE         指定語言，可以用語言名稱或者 xy_XY 格式的\n"
 "                              語言代號\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Tcl 模式：輸入資料是 tcl/msgcat .msg 檔\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1894,80 +1761,48 @@
 "class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
 "-d 選項是必須的。class 檔會存放在指定的目錄。\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:719
 #, 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, fuzzy, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -k, --keyword[=WORD]        要留意的額外關鍵字 (如果沒有指定，\n"
-"                              表示不使用預設的關鍵字)\n"
-
-#: src/msgfmt.c:874
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處理：\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1978,19 +1813,19 @@
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          檢查各種程式語言的格式字串\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          確保標頭欄位存在和內容正確\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1999,7 +1834,7 @@
 "      --check-domain          檢查 domain 關鍵字和 --output-file 選項之間\n"
 "                                有沒有衝突\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2008,7 +1843,7 @@
 "  -C, --check-compatibility   確保 GNU msgfmt 運作的方式和 X/Open msgfmt 兼"
 "容\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2016,131 +1851,111 @@
 "                                menu items\n"
 msgstr "      --check-accelerators[=CHAR]  檢查選單項目中代表捷徑鍵的字元\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=數字        以<數字>個位元組為單位配置字串位置(預設：%d)\n"
 
-#: src/msgfmt.c:910
-#, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               二元碼檔不會包含雜湊表 (hash table) 在內\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            顯示有關翻譯訊息的統計\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               顯示詳細資訊\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：缺少了 PO 檔的標頭或是格式無效\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字元集轉換的功能不會生效\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 檔的標頭仍然是模糊狀態\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：較舊版本的 msgfmt 遇到此檔案時會印出錯誤訊息\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "領域名稱 %s 不適合作為檔案名稱"
+msgstr "領域名稱 “%s” 不適合作為檔案名稱"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "領域名稱 %s 不適合作為檔案名稱：將使用字首"
+msgstr "領域名稱 “%s” 不適合作為檔案名稱：將使用字首"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "忽略‘domain %s’指令"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "忽略空的‘msgstr’欄位"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "忽略模糊的‘msgstr’欄位"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：原始檔包含模糊翻譯條目"
 
-#: src/msgfmt.c:1323
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1334
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: 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:91 src/x-tcl.c:150 src/x-vala.c:176
-#: src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "讀取 %s 時出現錯誤"
+msgstr "讀取 “%s” 時出現錯誤"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "未指定 ‘K’、‘T’ 或 ‘C’ 選項前不能使用選項 ‘%c’"
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "抽取翻譯檔中的訊息，而這些訊息符合某種樣式或屬於某個指定的來源檔。\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2209,7 +2024,7 @@
 "  -f, --file=FILE             PATTERN 採用 FILE 的內容 \n"
 "  -i, --ignore-case           不區分大小寫\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2218,17 +2033,17 @@
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           將訊息排序\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根據檔案位置排序\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2237,7 +2052,7 @@
 "系統環境沒有任何和語言有關的設定。請根據 ABOUT-NLS 檔案所述，\n"
 "設定 LANG 環境變數。這是測試翻譯時的必要步驟。\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2248,24 +2063,24 @@
 "請透過 --locale 選項指定語系或\n"
 "--output-file 選項指定輸出的 .po 檔。\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "已建立 %s。\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "建立新的 PO 檔，並由使用者環境取得初始化所需的檔頭資料。\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=輸入檔          輸入的 POT 檔\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2275,12 +2090,12 @@
 "如果沒有指定輸入檔，會在目前的目錄搜尋 POT 檔。\n"
 "如果輸入檔是 -，則讀取標準輸入的內容。\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      將輸出的內容寫入指定的 PO 檔\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2289,18 +2104,18 @@
 "如果沒有指定輸出檔，檔名將會由 --locale 選項或使用者的語系決定。\n"
 "如果輸出檔是 -，則會將結果寫至標準輸出。\n"
 
-#: src/msginit.c:401
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          指定地區設定\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假設 PO 檔是自動產生的\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2308,12 +2123,12 @@
 "找到多於一個的 .pot 檔。\n"
 "請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "讀取目前的目錄時發生錯誤"
 
-#: src/msginit.c:490
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2321,14 +2136,14 @@
 "在目前目錄中找不到任何 .pot 檔。\n"
 "請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "%s 副行程失敗，錯誤碼為 %d"
+msgstr "%s 副進程失敗，錯誤碼為 %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2342,42 +2157,42 @@
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
-msgstr "%s 套件的傳統字漢語翻譯"
+msgstr "Traditional Chinese translation for %s"
 
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "目前的字元集編碼 %s 不是通用的編碼名稱"
+msgstr "目前的字元集編碼 “%s” 不是通用的編碼名稱"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "輸入檔有兩種不同的字元集編碼 %s 和 “%s”"
+msgstr "輸入檔有兩種不同的字元集編碼 “%s” 和 “%s”"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+"input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "輸入檔‘%s’的標頭欄位中沒有指定字元集"
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "輸入檔 ‘%2$s’ 的 domain “%1$s” 的標頭欄位中沒有指定字元集"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "目標的字元集編碼 %s 不是通用的編碼名稱。"
+msgstr "目標的字元集編碼 “%s” 不是通用的編碼名稱。"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2458,7 +2273,7 @@
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"語言的字元集編碼 %s 不是通用的編碼名稱。\n"
+"語言的字元集編碼 “%s” 不是通用的編碼名稱。\n"
 "‘%s’ 的輸出可能有誤。\n"
 "設定 LC_ALL=C 是一個可行的解決方法。\n"
 
@@ -2490,47 +2305,47 @@
 msgid "Try using the following, valid for %s:"
 msgstr "嘗試使用下列 %s 中屬於合法的型態:\n"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "翻譯檔含有複數型態的翻譯..."
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...但檔頭缺少了像 “plural=表示式” 的項目"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...但檔頭缺少了像 “nplurals=整數” 的項目"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "無效的 nplurals 值"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "無效的複數表示式"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, 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:490
+#: src/msgl-check.c:484
 #, 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:514
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2538,59 +2353,64 @@
 "翻譯檔含有複數型態的翻譯，但缺少了以下的標頭欄位：\n"
 "“Plural-Forms: nplurals=<整數>; plural=<表示式>;”"
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' 和 `msgid_plural' 欄位並非同時以 '\\n' 開始"
 
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’開始"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’開始"
 
-#: src/msgl-check.c:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgid_plural’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "複數處理是 GNU gettext 的擴展功能"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' missing in header\n"
+msgstr "缺少了標頭欄位‘%s’\n"
+
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "標頭欄位‘%s’應該位於行首\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
 msgstr "某些標頭欄位仍然是預設值\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "缺少了標頭欄位‘%s’\n"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "某些標頭欄位仍然是預設值\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2601,21 +2421,21 @@
 #: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
+msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "輸入檔沒有指定字元集的標頭欄位"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, 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() 不支援此種轉換方"
-"式。"
+"不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv()，但 iconv() 不支援此種轉換"
+"方式。"
 
 #: src/msgl-iconv.c:335
 #, c-format
@@ -2623,28 +2443,28 @@
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"由 %s 轉換至 %s 會產生重複訊息：有些本來不同的 msgid 轉換後會變成相同。"
+"由 “%s” 轉換至 “%s” 會產生重複訊息：有些本來不同的 msgid 轉換後會變成相同。"
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"不支援將字元集由 %s 轉換至 “%s”。%s 需要 iconv()，但編譯此程式時沒有 iconv() "
-"支援。"
+"不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv()，但編譯此程式時沒有 iconv"
+"() 支援。"
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "備份方式"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2664,51 +2484,51 @@
 "的註解都會被捨棄，但特殊旗標註解和檔案位置都會被保留。比較時如果有不完全\n"
 "配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      舊版本的翻譯檔\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     新版本程式的翻譯檔\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr "  -C, --compendium=FILE       額外的翻譯記憶庫，選項可以使用多次\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr "  -U, --update                更新 def.po (僅當 def.po 未更新時)\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "更新模式的檔案輸出位置：\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "輸出結果會寫入至 def.po。\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        將 def.po 備份\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         自行指定備份檔名末端的字串\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2726,38 +2546,38 @@
 "  existing, nil   若有數字的備份檔已經存在則使用數字，否則使用一般名稱\n"
 "  simple, never   永遠使用普通方式備份\n"
 
-#: src/msgmerge.c:559
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
+"The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "備份檔的後置字元為‘~’，除非以 --suffix 選項或是 SIMPLE_BACKUP_SUFFIX\n"
 "環境變數指定。\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隱藏進度指示\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此訊息應該有複數型態"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此訊息不應有複數型態"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2767,7 +2587,7 @@
 "讀入 %ld 舊翻譯 + %ld 參考條目。合併：%ld，模糊：%ld，未譯：%ld，過時："
 "%ld。\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2871,7 +2691,7 @@
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                輸出結果嚴格遵從 Uniforum 格式\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2891,12 +2711,12 @@
 "則會由第一個翻譯條目中讀取這些資料。檔案位置是會累積下來的。\n"
 "當使用 --unique 選項時，則會捨棄任何重複的翻譯條目。\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只顯示重複條目\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2918,7 +2738,7 @@
 "字元集“%s”不是通用的編碼名稱。\n"
 "轉換訊息至使用者字元集的功能將不會運作。\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2927,21 +2747,21 @@
 "不支援字元集 “%s”。%s 需要 iconv()，\n"
 "但 iconv() 不支援 “%s”。\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr "先安裝 GNU libiconv，然後再安裝 GNU gettext，將會修正此問題。\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "仍會繼續執行，但預計解析內容時會出現錯誤。"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "仍會繼續執行。"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2950,7 +2770,7 @@
 "不支援字元集 “%s”。%s 需要 iconv()，\n"
 "但編譯此程式時沒有 iconv() 支援。\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2963,27 +2783,27 @@
 msgid "inconsistent use of #~"
 msgstr "不一致地使用 #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "缺少了 ‘msgstr[]’ 段落"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "缺少了 ‘msgid_plural’ 段落"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "缺少了 ‘msgstr’ 段落"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "第一個複數格式的索引數字不是 0"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "複數格式含有錯誤的索引數字"
@@ -2993,7 +2813,7 @@
 msgid "too many errors, aborting"
 msgstr "錯誤太多，必須中斷作業"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "無效的位元組序列"
@@ -3037,16 +2857,16 @@
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案不能含有 domain 指令"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "訊息被重複定義"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...這是第一次定義的位置"
@@ -3054,22 +2874,22 @@
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "檔案 %s 被截斷了"
+msgstr "檔案 “%s” 被截斷了"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "檔案 %s 包含並非以 NUL 為結尾的字串"
+msgstr "檔案 “%s” 包含並非以 NUL 為結尾的字串"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "檔案 %s 並非 GNU .mo 格式檔案"
+msgstr "檔案 “%s” 並非 GNU .mo 格式檔案"
 
 #: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "檔案 %s 在 %s 包含並非以 NUL 為結尾的字串"
+msgstr "檔案 “%s” 在 %s 包含並非以 NUL 為結尾的字串"
 
 #: src/read-properties.c:227
 #, fuzzy
@@ -3126,21 +2946,21 @@
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "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/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
+msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
 #: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
-msgstr "需要恰好兩個引數"
+msgstr "需要恰好兩個參數"
 
 #: src/urlget.c:176
 #, c-format
@@ -3154,21 +2974,11 @@
 "the locally accessible FILE is used instead.\n"
 msgstr "擷取並輸出某網址的內容。如果無法存取該網址，則改用指定的本機檔案代替。\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "讀取 %s 時發生錯誤"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "完成讀取 %s 後發生錯誤"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
@@ -3235,7 +3045,7 @@
 #: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "無法建立 %s 目錄"
+msgstr "無法建立 “%s” 目錄"
 
 #: src/write-csharp.c:766
 #, c-format
@@ -3247,18 +3057,18 @@
 msgid "compilation of C# class failed"
 msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "並非有效的 Java class 名稱：%s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3267,20 +3077,15 @@
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "當開啟檔案 %s 來寫入內容時發生錯誤"
+msgstr "當開啟檔案 “%s” 來寫入內容時發生錯誤"
 
-#: src/write-po.c:821
-#, fuzzy
-msgid "incomplete multibyte sequence"
-msgstr "無效的位元組序列"
-
-#: src/write-po.c:884
-#, fuzzy, c-format
+#: src/write-po.c:802
+#, c-format
 msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "國際化的訊息不應含有 ‘\\%c’ 這個轉義控制序列 (escape sequence)"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3293,7 +3098,7 @@
 "請考慮使用只有 ASCII 字元的 msgid。\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3335,7 +3140,7 @@
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "將內容寫入至 %s 副行程時發生錯誤"
+msgstr "將內容寫入至 %s 副進程時發生錯誤"
 
 #: src/write-resources.c:131
 #, fuzzy
@@ -3363,7 +3168,7 @@
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 警告：字串未完結"
@@ -3373,22 +3178,17 @@
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: 警告：Unicode 字元無效"
-
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: 警告：字元常數未完結"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3431,7 +3231,7 @@
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 失敗"
@@ -3445,7 +3245,7 @@
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 警告：Unicode 字元無效"
@@ -3465,22 +3265,12 @@
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3494,73 +3284,6 @@
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s%s 出現不屬於 ASCII 字元的字串。\n"
-"請使用 --from-code 選項指定源代碼的文字編碼。\n"
-
-#: src/x-javascript.c:275
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-
-#: src/x-javascript.c:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 出現無效而且十分長的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-
-#: src/x-javascript.c:303
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 檔案末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-
-#: src/x-javascript.c:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 該行末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-
-#: src/x-javascript.c:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: 警告：字串未完結"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: 警告：Unicode 字元無效"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: 警告：字串未完結"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3596,13 +3319,16 @@
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\U”) 無效"
 
-#: src/x-python.c:278
+#: src/x-python.c:236
+#, 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 ""
+"%s%s 出現不屬於 ASCII 字元的字串。\n"
+"請使用 --from-code 選項指定源代碼的文字編碼。\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3612,7 +3338,7 @@
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3622,7 +3348,7 @@
 "%s:%d: 出現無效而且十分長的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3632,7 +3358,7 @@
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3642,7 +3368,7 @@
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3652,7 +3378,7 @@
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3680,37 +3406,27 @@
 msgstr ""
 "%s:%lu: 警告：$\"...\" 這種格式因為安全理由已經過時；請改用 eval_gettext"
 
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: 警告：字串未完結"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "當結果被導向至標準輸出時，不可以用 --join-existing 選項"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "若無關鍵字，xgettext 將無法運作"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:769
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "警告：無法辨認檔案 ‘%s’ 的副檔名 ‘%s’；會假設是 C 格式來處理"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3718,24 +3434,24 @@
 msgstr ""
 "  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而不是 messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "輸入檔的語言選擇：\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3743,8 +3459,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=語言         辨認指定的程式語言\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3754,19 +3469,19 @@
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "預設的語言是由輸入檔的延伸檔名決定的。\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3775,22 +3490,22 @@
 "      --from-code=NAME        輸入檔的文字編碼\n"
 "                                (Python, Tcl, Glade 例外)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, 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:919
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3800,45 +3515,39 @@
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "個別語言特殊選項：\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           抽取所有字串\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (只適用於 C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (只適用於 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -k, --keyword[=WORD]        要留意的額外關鍵字 (如果沒有指定，\n"
+"                              表示不使用預設的關鍵字)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3846,67 +3555,66 @@
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (只適用於 C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             支援讀取輸入內容中的 ANSI C trigraph\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (只適用於 C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 顯示較詳細的格式字串辨認結果\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     輸出檔格式為 Java .properties 檔\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3914,24 +3622,24 @@
 "      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的"
 "專案\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3939,7 +3647,7 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3947,52 +3655,52 @@
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "標準輸入"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 警告："
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, 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:2190
+#: src/xgettext.c:2104
 #, 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:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4001,7 +3709,7 @@
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4011,31 +3719,30 @@
 "gettext(\"\") 會回傳檔案開始部份的資訊，\n"
 "並非空白字串。\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "%2$s 的引數 %1$s 不明確"
+msgstr "%2$s 的參數 %1$s 不明確"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
@@ -4044,9 +3751,9 @@
 "MSGID_BUGS_ADDRESS 變數；否則請在指令中\n"
 "使用 --msgid-bugs-address 選項。\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "不明的語言 ‘%s’"
 
 #: libgettextpo/gettext-po.c:84
@@ -4059,8 +3766,23 @@
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle 失敗，錯誤碼為 0x%08x"
 
-#~ msgid "The %%J directive is only allowed at the beginning of the string."
-#~ msgstr "%%J 只允許在字串最開始出現。"
+#~ msgid "Not yet implemented."
+#~ msgstr "功能尚未編寫。"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "無法和 %s 副進程建立非專用的 I/O"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "和 %s 副進程溝通時出現錯誤"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "由 %s 副進程讀入資料時出現錯誤"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s 副進程已終止，錯誤碼為 %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "標頭欄位‘%s’仍然是預設值\n"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -4073,29 +3795,20 @@
 #~ "這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n"
 #~ "可售性或適用於任何特定目的的保證。\n"
 
-#~ msgid "Not yet implemented."
-#~ msgstr "功能尚未編寫。"
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "標頭欄位‘%s’應該位於行首\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "標頭欄位‘%s’仍然是預設值\n"
-
-#~ msgid "conversion failure"
-#~ msgstr "轉換錯誤"
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s：警告："
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
 
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: 警告：字串未結束"
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
 
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: 嚴重錯誤：複數式出現在單數式之前\n"
+#~ msgid "The %%J directive is only allowed at the beginning of the string."
+#~ msgstr "%%J 只允許在字串最開始出現。"
 
 #~ msgid "Which is your email address?"
 #~ msgstr "請問您的電子郵件地址？"
@@ -4124,3 +3837,18 @@
 
 #~ msgid "Please enter your email address."
 #~ msgstr "請自行輸入電子郵件地址。"
+
+#~ msgid "conversion failure"
+#~ msgstr "轉換錯誤"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s：警告："
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: 警告：字串未結束"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: 嚴重錯誤：複數式出現在單數式之前\n"
diff -Nru gettext-0.19.3/gettext-tools/projects/ChangeLog gettext-0.18.1.1/gettext-tools/projects/ChangeLog
--- gettext-0.19.3/gettext-tools/projects/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/projects/ChangeLog	2010-06-06 12:49:58.000000000 +0000
@@ -1,37 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2010-11-13  Bruno Haible  <bruno@clisp.org>
-
-	Update after the GNOME localization site has moved.
-	* GNOME/teams.url: Put in new URL.
-	* GNOME/teams.html: Re-fetched.
-	* GNOME/team-address: Update HTML parsing code.
-	Reported by Ihar Hrachyshka <ihar.hrachyshka@gmail.com>.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/projects/GNOME/team-address gettext-0.18.1.1/gettext-tools/projects/GNOME/team-address
--- gettext-0.19.3/gettext-tools/projects/GNOME/team-address	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/projects/GNOME/team-address	2010-06-06 12:49:58.000000000 +0000
@@ -8,20 +8,143 @@
 
 url=`cat "$projectsdir/GNOME/teams.url"`
 html=`"$progdir/urlget" "$url" "$projectsdir/GNOME/teams.html"`
-sed_addnl='s,</li>,</li>\
-,g'
-sed_extract_address='s,^.*"/teams/'"$catalog"'">[^<>]*</a>.*<a href=[^<>]*>\(.*\)</a>.*<a href=[^<>]*>.*</a>.*,\1,p'
-address=`echo "$html" | tr '\012' '|' | sed -e "$sed_addnl" | sed -n -e "$sed_extract_address"`
-if test -n "$address"; then
+# The HTML page doesn't contain the languages with ISO 639 codes.
+# So we have to translate ourselves...
+case "$catalog" in
+  af) english=Afrikaans;;
+  sq) english=Albanian;;
+  am) english=Amharic;;
+  ar) english=Arabic;;
+  hy) english=Armenian;;
+  as) english=Assamese;;
+  en_AU) english="Australian English";;
+  az) english="Azerbaijani";;
+  eu) english=Basque;;
+  be) english=Belarusian;;
+  bn) english=Bengali;;
+  bs) english=Bosnian;;
+  pt_BR) english="Brazilian Portug";; # someday they'll fix the mistake
+  br) english=Breton;;
+  bg) english=Bulgarian;;
+  my) english=Burmese;;
+  en_GB) english="British English";;
+  en_CA) english="Canadian English";;
+  ca) english=Catalan;;
+  zh_CN) english="Chinese (simplified)";;
+  zh_TW) english="Chinese (traditional)";;
+  hr) english=Croatian;;
+  cs) english=Czech;;
+  da) english=Danish;;
+  nl) english=Dutch;;
+  dz) english=Dzongkha;;
+  eo) english=Esperanto;;
+  et) english=Estonian;;
+  fj) english=Fijian;;
+  fi) english=Finnish;;
+  fr) english=French;;
+  gl) english=Galician;;
+  ka) english=Georgian;;
+  de) english=German;;
+  el) english=Greek;;
+  gu) english=Gujarati;;
+  ha) english=Hausa;;
+  he) english=Hebrew;;
+  hi) english=Hindi;;
+  hu) english=Hungarian;;
+  jab) english=Hyam;;
+  is) english=Icelandic;;
+  ig) english=Igbo;;
+  id) english=Indonesian;;
+  az_IR) english="Iranian Azerbaijani";;
+  ga) english=Irish;;
+  it) english=Italian;;
+  ja) english=Japanese;;
+  kaj) english=Jju;;
+  kdm) english=Kagoma;;
+  kn) english=Kannada;;
+  kk) english=Kazakh;;
+  km) english=Khmer;;
+  rw) english=Kinyarwanda;;
+  ky) english=Kirghiz;;
+  ko) english=Korean;;
+  ku) english=Kurdish;;
+  lo) english=Lao;;
+  la) english=Latin;;
+  lv) english=Latvian;;
+  li) english=Limburgish;;
+  lt) english=Lithuanian;;
+  nds) english="Low Saxon";;
+  mk) english=Macedonian;;
+  mai) english=Maithili;;
+  ms) english=Malay;;
+  ml) english=Malayalam;;
+  mt) english=Maltese;;
+  mi) english=Maori;;
+  mr) english=Marathi;;
+  myn) english=Mayan;;
+  mn) english=Mongolian;;
+  nah) english=Nahuatl;;
+  ne) english=Nepali;;
+  nso) english="Northern Sotho";;
+  no) english=Norwegian;;
+  oc) english=Occitan;;
+  ang) english="Old English";;
+  or) english=Oriya;;
+  pbb) english="Páez";;
+  fa) english=Persian;;
+  pl) english=Polish;;
+  pt) english=Portuguese;;
+  pa) english=Punjabi;;
+  ps) english=Pushto;;
+  qu) english=Quechua;;
+  ro) english=Romanian;;
+  ru) english=Russian;;
+  sa) english=Sanskrit;;
+  sr) english=Serbian;;
+  si) english=Sinhala;;
+  sk) english=Slovak;;
+  sl) english=Slovenian;;
+  es) english=Spanish;;
+  sw) english=Swahili;;
+  sv) english=Swedish;;
+  tl) english=Tagalog;;
+  ta) english=Tamil;;
+  te) english=Telugu;;
+  tet) english=Tetum;;
+  th) english=Thai;;
+  bo) english=Tibetan;;
+  ti) english=Tigrinya;;
+  tr) english=Turkish;;
+  tk) english=Turkmen;;
+  kcg) english=Tyap;;
+  ug) english=Uighur;;
+  uk) english=Ukrainian;;
+  ur) english=Urdu;;
+  uz) english=Uzbek;;
+  vi) english=Vietnamese;;
+  fr_BE) english=Walloon;;
+  cy) english=Welsh;;
+  xh) english=Xhosa;;
+  yi) english=Yiddish;;
+  yo) english=Yoruba;;
+  zap) english=Zapotec;;
+  zu) english=Zulu;;
+  *) english=;;
+esac
+if test -n "$english"; then
   (echo "Please consider joining your translation team, and visit"
-   echo "  $address"
-   echo "  http://l10n.gnome.org/"
+   echo "  $url"
+   echo "  http://developer.gnome.org/projects/gtp/"
   ) 1>&2
+  sed_addnl='s,</tr>,</tr>\
+,g'
+  address=`echo "$html" | tr '\012' '|' | sed -e "$sed_addnl" | sed -n -e "s,^.*<td.*$english.*</td>.*<td.*</td>.*<td.*<a href=\"\\([^\"]*\\)\">.*</td>.*\$,\\1,p"`
+  # address can be empty or contain 1 or more space separated URLs.
 else
   (echo "A translation team for your "`if test "$catalog" = "$language"; then echo "language ($language)"; else echo "local dialect ($catalog)"; fi`
    echo "may not exist yet.  Please visit"
    echo "  $url"
-   echo "  http://l10n.gnome.org/"
+   echo "  http://developer.gnome.org/projects/gtp/"
    echo "and decide whether you want to create a new translation team."
   ) 1>&2
   address=
diff -Nru gettext-0.19.3/gettext-tools/projects/GNOME/teams.html gettext-0.18.1.1/gettext-tools/projects/GNOME/teams.html
--- gettext-0.19.3/gettext-tools/projects/GNOME/teams.html	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/projects/GNOME/teams.html	2010-06-06 12:49:58.000000000 +0000
@@ -1,1849 +1,3104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
+  <head>
+    <title>The GNOME Translation Project - Teams</title>
+    <link rel="icon" type="image/png" href="/images/gnome-16.png" />
+    <link rel="stylesheet" type="text/css" href="/default.css" />
+    <link rel="stylesheet" type="text/css" href="/developer.css" />
+    <style type="text/css">
+      #hdr {
+        background: url("/images/header-bg-mountains01.png") no-repeat;
+        background-color: #d6e7ff;
+      }
+    </style>
+  </head>
+
+  <body>
+
+    <div id="body">
+      <!--#set var="last_modified" value="$Date: 2005/07/26 22:13:21 $" -->
+
+    <h2>Teams:</h2>
+    
+    <p>
+      Translation teams already exist for many languages.
+      To join a team, contact the team leader.<br></br>
+      If a team does not exist for your language, consider <a href="#starting">starting one</a>.
+    </p>
+
+    <table border="0" cellspacing="2" cellpadding="2" width="100%">
+      <tr>
+
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <b>Language</b>
+	    </font>
+	  </div>
+	</td>
+	
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <b>Coordinator</b>
+	    </font>
+	  </div>
+	</td>
+	
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <b>Web Page</b>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Afrikaans -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Afrikaans
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:rkwjpj at puk dot ac dot za">Petri Jooste</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="https://savannah.gnu.org/projects/gnomeaf/">https://savannah.gnu.org/projects/gnomeaf/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Albanian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Albanian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:laurenti at users dot sourceforge dot net">Laurent Dhima</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome-albanian.sourceforge.net/">http://gnome-albanian.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Amharic -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Amharic
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:locales at geez dot org">Daniel Yacob</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome.geez.org/Amharic/">http://gnome.geez.org/Amharic/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Arabic -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Arabic
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:lumina at silverpen dot de">Arafat Medini</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.arabeyes.org/">http://www.arabeyes.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Armenian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Armenian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:asprayama at yahoo dot com">Norayr Chilingaryan</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Assamese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Assamese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:lkpatir at yahoo dot co dot in">Sunaram Patir</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Australian English -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Australian English
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:gnome-i18n at six-by-nine dot com dot au">Peter Lawler</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Azerbaijani -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Azerbaijani
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:amiroff at gmail dot com">Metin Amiroff</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.linux.gen.az/">http://www.linux.gen.az/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Basque -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Basque
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:dooteo at euskalgnu dot org">I&ntilde;aki Larra&ntilde;aga Murgoitio</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Belarusian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Belarusian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nab at mail dot by">Ales Nyakhaychyk</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.i18n.linux.by/">http://www.i18n.linux.by/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Bengali -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Bengali
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:taneem at eyetap dot org">Taneem Ahmed</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.bengalinux.org/projects/gnome/">http://www.bengalinux.org/projects/gnome/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Bosnian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Bosnian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:bono at lugbih dot org">Amila Akagi&#263;</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://projekti.linux.org.ba/">http://projekti.linux.org.ba/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Brazilian Portugese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Brazilian Portugese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:gustavo at sagui dot org">Gustavo Maciel Dias Vieira</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome-br.sourceforge.net/">http://gnome-br.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Breton -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Breton
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:francis.tyers at hp dot com">Francis Tyers</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Bulgarian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Bulgarian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:ash at contact dot bg">Alexander Shopov</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome.cult.bg/">http://gnome.cult.bg/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Burmese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Burmese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:zwassdt at yahoo dot com">Zaw Win Aung</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- British English -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      British English
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:hadess at hadess dot net">Bastien Nocera</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://live.gnome.org/BritishEnglish">http://live.gnome.org/BritishEnglish</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Canadian English -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Canadian English
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:adamw at gnome dot org">Adam Weinberger</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.vectors.cx/en_ca.html">http://www.vectors.cx/en_ca.html</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Catalan -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Catalan
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:jmas at softcatala dot org">Jordi Mas</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.softcatala.org/">http://www.softcatala.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Chinese (simplified) -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Chinese (simplified)
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:lark at linux dot net dot cn">Wang Jian</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              <a href="http://i18n.linux.net.cn/">Chinese Linux i18n</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Chinese (traditional) -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Chinese (traditional)
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:abelcheung at gmail dot com">Abel Cheung</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://linuxhall.org/cgi-bin/mailman/listinfo/community">Temporary GNOME trad. Chinese translation mailing list</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Croatian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Croatian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:robert.sedak at sk dot htnet dot hr">Robert Sedak</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://lokalizacija.linux.hr/">http://lokalizacija.linux.hr/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Czech -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Czech
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:utx at penguin dot cz">Stanislav Brabec</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Danish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Danish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:olau at hardworking dot dk">Ole Laursen</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.cs.auc.dk/~olau/gnome-translation/">Overs&aelig;ttelse af Gnome</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Dutch -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Dutch
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:adrighem at gnome dot org">Vincent van Adrighem</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://nl.gnome.org/">GNOME Nederlands</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Dzongkha -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Dzongkha
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:pema_geyleg at rediffmail dot com">Pema Geyleg</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://savannah.nongnu.org/projects/dzongkha-gnome/">http://savannah.nongnu.org/projects/dzongkha-gnome/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Esperanto -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Esperanto
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:tfwo at mail dot ru">Artem Popov</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Estonian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Estonian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:amd at tt dot ee">Priit Laes</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://et-gnome.sourceforge.net/">http://et-gnome.sourceforge.net/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Fijian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Fijian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:jim at sopac dot org">Timoci Tora</a></font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Finnish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Finnish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+		<a href="mailto:hileat iki dot fi">Ilkka Tuohela</a></font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome-fi.org/">http://www.gnome-fi.org/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- French -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      French
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:redfox at redfoxcenter dot org">Christophe Merlet (RedFox)</a></font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnomefr.traduc.org/">http://gnomefr.traduc.org/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Galician -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Galician
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nacho dot resa at gmail dot com">Ignacio Casal Quinteiro</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://trisquel.uvigo.es/traduccion/">http://trisquel.uvigo.es/traduccion/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Georgian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Georgian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:aiet at qartuli dot net">Aiet Kolkhi</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://aiet.qartuli.net/projects/gnome_en.php">http://aiet.qartuli.net/projects/gnome_en.php</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- German -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      German
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:hendrik at gnome-de dot org">Hendrik Richter</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.de/">http://www.gnome.de/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Greek -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Greek
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:simos74 at gmx dot net">Simos Xenitellis</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	    <a href="http://www.ellak.gr/modules.php?op=modload&name=phpWiki&file=index&pagename=GNOME">Hellenic GNOME Localisation Project</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+
+      <!-- Gujarati -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Gujarati
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nirav at magnet-i dot com">Nirav Mehta</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	    <a href="http://www.utkarsh.org/">http://www.utkarsh.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+
+      <!-- Hausa -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Hausa
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:bodumah at yahoo dot com">Bamiyo Odumah</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	    &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+
+      <!-- Hebrew -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	       Hebrew
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:yairhr at 013 dot net">Yair Hershkovitz</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome-il.sourceforge.net/">http://gnome-il.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Hindi -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Hindi
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:karunakar at freedomink dot org">Guntupalli Karunakar</a>
+	    </font>  
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.indlinux.org/hindi/gnome/">http://www.indlinux.org/hindi/gnome/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Hungarian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Hungarian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:kelemeng at gnome dot hu">G&aacute;bor Kelemen</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.hu/">A GNOME Projekt</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Hyam -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Hyam
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nnemanwu at yahoo dot com">Uchenna Agbim</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://zitt.sourceforge.net/">http://zitt.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Icelandic -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Icelandic
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:sammi at techattack dot nu">Sam&uacute;el J&oacute;n Gunnarsson</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.techattack.nu/~gnome/">http://www.techattack.nu/~gnome/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Igbo -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Igbo
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:abunwanne at yahoo dot com">Nwabunwanne</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://igbo.sourceforge.net/">http://igbo.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Indonesian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Indonesian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:mohammad dot damt at gmail dot com">Mohammad Damt</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome.linux.or.id/">http://gnome.linux.or.id/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Iranian Azerbaijani -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Iranian Azerbaijani
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:amir at bamdad dot org">Amir Hedayaty</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.farsiweb.info/wiki/Main/GNOME">http://www.farsiweb.info/wiki/Main/GNOME</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Irish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Irish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:dubhthach at zion dot nuigalway dot ie">Paul Duffy</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	     &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Italian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Italian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:algol at firenze dot linux dot it">Alessio Frusciante</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.it.gnome.org/">Progetto di traduzione italiana</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Japanese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Japanese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:aihana at gnome dot gr dot jp">Takeshi Aihana</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.gr.jp/">Japan GNOME Users Group</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Jju -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Jju
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nnemanwu at yahoo dot com">Uchenna Agbim</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://zitt.sourceforge.net/">http://zitt.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Kagoma -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Kagoma
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nnemanwu at yahoo dot com">Uchenna Agbim</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://zitt.sourceforge.net/">http://zitt.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Kannada -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Kannada
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:pramodleo at yahoo dot co dot uk">Pramod R</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://kannada.sourceforge.net/">http://kannada.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Kazakh -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Kazakh
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:musa at sfek dot kz>">Amrenov Kanat</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://linuxoid.spl.kz/gnome/">http://linuxoid.spl.kz/gnome/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Khmer -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Khmer
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:fjsola at aui dot es">Javier Sola</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Kinyarwanda -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Kinyarwanda
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:murf at e-tools dot com">Steve Murphy</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Kirghiz -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Kirghiz
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:ky-li at mail dot ru">Timur Jamakeev</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Korean -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Korean
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:cwryu at debian dot org">Changwoo Ryu</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Kurdish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Kurdish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:ulas at sdf dot lonestar dot org">Abdullah Ulas</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnome-kurdi.sourceforge.net/">http://gnome-kurdi.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+    <!-- Lao -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Lao
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:anousak at muanglao dot com">Anousak Souphavanh</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://opensource.muanglao.com/">http://opensource.muanglao.com/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+    <!-- Latin -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Latin
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:MPoloN7 at netscape dot net">Mark Polo</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+    <!-- Latvian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Latvian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:hornet at navigator dot lv">Artis Trops</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://ll10nt.laka.lv/">http://ll10nt.laka.lv/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+    <!-- Limburgish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Limburgish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:kenneth at gnu dot org">Kenneth Rohde Christiansen</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Lithuanian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Lithuanian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:uid0 at akl dot lt">&#x017d;ygimantas Beru&#x010d;ka</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.lietuvybe.org/gnome/">http://www.lietuvybe.org/gnome/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+    <!-- Low Saxon -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Low Saxon
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:jlueters at intranet-engineering dot de">J&uuml;rgen L&uuml;ters</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Macedonian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Macedonian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:ufo at linux dot net dot mk">Arangel Angov</a></font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnomk.sourceforge.net/">http://gnomk.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Maithili -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Maithili
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:rajeshkajha at yahoo dot com">Rajesh Ranjan</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Malay -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Malay
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:sebol at ikhlas dot com">Hasbullah bin Pit</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gabai.sourceforge.net/">http://gabai.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Malayalam -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Malayalam
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:sajith_vk at linuxmail dot org">Sajith V.K</a></font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.keralaindustry.org/malayalam/">http://www.keralaindustry.org/malayalam/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Maltese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Maltese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:ramon.casha at linux dot org dot mt">Ramon Casha</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://linux.org.mt/lingwa/">http://linux.org.mt/lingwa/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Maori -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Maori
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:jbowtie at amathaine dot com">John C Barstow</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              <a href="http://www.nzlinux.org.nz/l10n/">http://www.nzlinux.org.nz/l10n/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Marathi -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Marathi
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:jitendras at vsnl dot com">Jitendra Shah</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.indictrans.org/">http://www.indictrans.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Mayan -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Mayan
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:esodan at yahoo dot com dot mx">Daniel Espinosa</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.lenmex.org/">http://www.lenmex.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Mongolian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Mongolian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:badral at chinggis dot com">Sanlig Badral</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Nahuatl -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Nahuatl
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:esodan at yahoo dot com dot mx">Daniel Espinosa</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.lenmex.org/">http://www.lenmex.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Nepali -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Nepali
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:pawan at nplinux dot org">Pawan Chitrakar</a></font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Northern Sotho -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Northern Sotho
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:dwayne at translate dot org dot za">Dwayne Bailey</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://translate.org.za/">http://translate.org.za/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Norwegian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Norwegian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:kmaraas at broadpark dot no">Kjartan Maraas</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Occitan -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Occitan
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:joanluc dot laborda at free dot fr">Joan 
+Luc Lab&ograve;rda</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3"> 
+              &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Old English -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Old English
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:modean52 at comcast dot net">James R. Johnson</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3"> 
+              <a href="http://home.comcast.net/~modean52/oeme_gnome.htm">http://home.comcast.net/~modean52/oeme_gnome.htm</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Oriya -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Oriya
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:gora_mohanty at yahoo dot co dot in">Gora Mohanty</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              <a href="http://oriya.sarovar.org/">http://oriya.sarovar.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Paez / Nasa Yuwe -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      P&aacute;ez
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:santiago at unicauca dot edu dot co">Santiago Jos&eacute; Ruano Rinc&oacute;n</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Persian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Persian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:roozbeh at sharif dot edu">Roozbeh Pournader</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.farsiweb.info/wiki/Main/GNOME">http://www.farsiweb.info/wiki/Main/GNOME</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Polish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Polish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:aflinta at at dot kernel dot pl">Artur Flinta</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.pl/">http://www.gnome.pl/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Portuguese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Portuguese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:happyguy_pt at hotmail dot com">Duarte Loreto</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3"> 
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Punjabi -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Punjabi
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:amanlinux at netscape dot net">Amanpreet Singh Alam</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3"> 
+              <a href="http://punlinux.sourceforge.net/">http://punlinux.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Pushto -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Pushto
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:ismailmaskani at yahoo dot com">Ismail Maskani</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3"> 
+              &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Quechua -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Quechua
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:javier dot chulve at gmail dot com">Angel Javier Chulve</a>
+	    </font> 
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3"> 
+              &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Romanian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Romanian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:mugurelu at go dot ro">Mugurel Tudor</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnomero.sourceforge.net/">Proiectul de traducere GNOME in romana</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Russian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Russian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	     <a href="mailto:dmitry at taurussoft dot org">Dmitry G. Mastrukov</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.org.ru/">http://www.gnome.org.ru/</a>
+	    </font>  
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Sanskrit -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Sanskrit
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	     <a href="mailto:morphius at symonds dot net">Mukesh G</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>  
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Serbian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Serbian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	     <a href="mailto:dsegan at gmx dot net">Daneelo Shegun</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.prevod.org/">http://www.prevod.org/</a>
+	    </font>  
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Sinhala -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Sinhala
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:anuradha at linux dot lk">Anuradha Ratnaweera</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://sinhala.linux.lk/">http://sinhala.linux.lk/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Slovak -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Slovak
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	     <a href="mailto:marcel at telka dot sk">Marcel Telka</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://telka.sk/linux/sk-l10n/">Preklad Linuxu do slovenèiny</a>
+	    </font>  
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Slovenian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Slovenian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	     <a href="mailto:andraz.tori1 at guest dot arnes dot si">Andraz Tori</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+  	      <a href="http://www.lugos.si/delo/slo/GNOME-sl/">http://www.lugos.si/delo/slo/GNOME-sl/</a>
+	    </font>  
+	  </div>
+	</td>
+      </tr>    
+      
+      <!-- Spanish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Spanish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:serrador at tecknolabs dot com">Francisco Javier F. Serrador</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.es.gnome.org/documentacion/traductores/">GNOME Hispano</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Swahili -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Swahili
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:eliasmturi76 at yahoo dot com">Mturi Elias</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Swedish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Swedish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:menthos at gnome dot org">Christian Rose</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.se/sv/">http://www.gnome.se/sv/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Tagalog -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Tagalog
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:xenos at upm dot edu dot ph">Eric Pareja</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Tamil -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Tamil
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:n_dinesh at yahoo dot com">Dinesh Nadarajah</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://tamilgnome.sourceforge.net/">http://tamilgnome.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Telugu -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Telugu
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:sunil at atc dot tcs dot co dot in">Sunil Mohan</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.indlinux.org/telugu/">http://www.indlinux.org/telugu/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Tetum -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Tetum
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:gossner at arcom dot com dot au">Peter Gossner</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnu.org/software/tetum/">http://www.gnu.org/software/tetum/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Thai -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Thai
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nong_oos at hotmail dot com">Krich Nasingkun</a>
+              and
+              <a href="mailto:paisa at users dot sf dot net">Paisa Seeluangsawat</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              <a href="http://gnome-th.sourceforge.net/">http://gnome-th.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Tibetan -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Tibetan
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:cfynn at gmx dot net">Christopher Fynn</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              <a href="http://iris.lib.virginia.edu/tibet/tools/linux/gui/gnome/">http://iris.lib.virginia.edu/tibet/tools/linux/gui/gnome/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Tigrinya -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Tigrinya
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:simesoft at yahoo dot com">Simon Mebrahtu</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+              <a href="http://tinux.sourceforge.net/">http://tinux.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Turkish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Turkish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:kabalak at gtranslator dot org">Fatih Demir</a>,
+	      <a href="mailto:gorkem at gorkemcetin dot com">G&ouml;rkem &Ccedil;etin</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.gnome.org.tr/">http://www.gnome.org.tr/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Turkmen -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Turkmen
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:gmtavakkoli at yahoo dot com">Ghorban M. Tavakoly</a>
+	    </font>    
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://kakilik.sourceforge.net/">http://kakilik.sourceforge.net/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Tyap -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Tyap
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:nnemanwu at yahoo dot com">Uchenna Agbim</a>
+	    </font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://zitt.sourceforge.net/">http://zitt.sourceforge.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Uighur -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Uighur
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:abduxukur dot abdurixit at t-systems dot ch">Abdurixit Abduxukur</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://groups.yahoo.com/group/gnome-uighur/">http://groups.yahoo.com/group/gnome-uighur/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Ukrainian -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Ukrainian
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:mvd at mylinux dot com dot ua">Maxim V. Dziumanenko</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Urdu -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Urdu
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:shaz at linux dot net dot pk">Shahzad Chohan</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Uzbek -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Uzbek
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:kmashrab at sat dot physik dot uni-bremen dot de">Mashrab Kuvatov</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://freax.homelinux.net/">http://freax.homelinux.net/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Vietnamese -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Vietnamese
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:pclouds at users dot sourceforge dot net">Nguyen Thai Ngoc Duy</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://gnomevi.sourceforge.net/">http://gnomevi.sourceforge.net/</a>
+	    </font> 
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Walloon -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Walloon
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:pablo at walon dot org">Pablo Saratxaga</a>
+	    </font>     
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+      <!-- Welsh -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Welsh
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:daf at muse dot 19inch dot net">Dafydd Harries</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://muse.19inch.net/~daf/gnome-cy/">http://muse.19inch.net/~daf/gnome-cy/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Xhosa -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Xhosa
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:adi at canonical dot com">Adi Attar</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Yiddish -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Yiddish
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:raphael at cs dot uky dot edu">Raphael Finkel</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      &nbsp;
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Yoruba -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Yoruba
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:bonibz at hotmail dot com">Abayomi Mobolaji Onibudo</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.wazobiasoft.org/gnome/yoruba.htm">http://www.wazobiasoft.org/gnome/yoruba.htm</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Zapotec -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Zapotec
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:esodan at yahoo dot com dot mx">Daniel Espinosa</a></font>   
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://www.lenmex.org/">http://www.lenmex.org/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+
+      <!-- Zulu -->
+      <tr>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      Zulu
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="mailto:dwayne at translate dot org dot za">Dwayne Bailey</a>
+	    </font>
+	  </div>
+	</td>
+	<td bgcolor="#EEEEE0">
+	  <div align="left">
+	    <font class="text" size="3">
+	      <a href="http://translate.org.za/">http://translate.org.za/</a>
+	    </font>
+	  </div>
+	</td>
+      </tr>
+      
+    </table>
+
+    <a name="starting"></a>
+    <h3>Starting a new team</h3>
+    <p>
+      If no team for your language is listed here and you want to start a new one,
+      please send an email to announce the new team 
+      to the <a href="contact.html#mailinglist">mailing list</a>.<br></br>
+      It should have a subject like &quot;New team for [your language name] ([your language code])&quot; 
+      and contain the name and the email of the person who is the new coordinator for that language 
+      (And if one exists, the URL of the Team's page).<br></br>
+      (The <a href="contact.html#webmaster">webmaster</a> will add this team to this page shortly after)
+    </p>
+
+    <a name="projectwebpages"></a>
+    <h3>Project Web Pages and Mailing Lists</h3>
+    <p>
+      We would like to encourage translation teams to have web pages,
+      even if they are simple ones, and mailing lists.  For many teams,
+      the easiest and best way to do this is to use 
+      <a href="http://savannah.gnu.org/">Savannah</a>.  Savannah
+      will allow you to create a project for your team, providing you
+      use it to advance open source development, which you are doing.
+      It will give you a place to set up web pages, have a mailing list,
+      and place files for people to download.  You can even set up CVS
+      if you find that helpful.  It also allows you to give access to
+      multiple team members so you can each update the web pages, 
+      downloadable files, etc.
+    </p>
+
+    <a name="errors"></a>
+    <h3>Errors</h3>
+    <p>
+      If there are any errors in the contact/web address of a team
+      please write to <a href="contact.html#mailinglist">the mailing list</a>.
+    </p>
 
+    </div>
 
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-  <title>GNOME Translation Teams</title>
-  <link rel="icon" type="image/png" href="/media/img/foot-16.png"/>
-  <link rel="stylesheet" href="/media/css/main.css"/>
-  <link rel="stylesheet" href="/media/css/layout.css"/>
-  <link rel="stylesheet" href="/media/css/style.css"/>
-
-  <script type="text/javascript" src="/media/js/main.js"></script>
-  <script type="text/javascript" src="/media/js/jquery.min.js"></script>
-  
-  
-</head>
-
-<body>
-  <div id="page">
-    <ul id="general">
-      <li id="siteaction-gnome_home" class="home"><a href="http://www.gnome.org/">Home</a></li>
-      <li id="siteaction-gnome_news"><a href="http://news.gnome.org">News</a></li>
-      <li id="siteaction-gnome_projects"><a href="http://www.gnome.org/projects/">Projects</a></li>
-      <li id="siteaction-gnome_art"><a href="http://art.gnome.org">Art</a></li>
-      <li id="siteaction-gnome_support"><a href="http://www.gnome.org/support/">Support</a></li>
-      <li id="siteaction-gnome_development"><a href="http://developer.gnome.org">Development</a></li>
-      <li id="siteaction-gnome_community"><a href="http://www.gnome.org/community/">Community</a></li>
-    </ul>
-    <div id="header">
-      <h1>Damned Lies</h1>
-      <div id="tabs">
-        <ul id="portal-globalnav">
-          <li
-
-            ><a href="/" title="Back to Damned Lies home page"><span>Home</span></a>
-          </li>
-      <li
-
-      class="selected"
-
-       ><a href="/teams/"><span>Teams</span></a></li>
-      <li
-
-       ><a href="/languages/"><span>Languages</span></a></li>
-      <li
-
-       ><a href="/releases/"><span>Release sets</span></a></li>
-      <li
-
-       ><a href="/module/"><span>Modules</span></a></li>
-        </ul>
-      </div> <!-- end of #tabs -->
-    </div> <!-- end of #header -->
-  </div>
-  <!-- end site header -->
-  <div id="authenticated">
-    
-    <a href="/login/">Log in</a>
-    
-  </div>
-
-  <div class="body">
-    <div id="content">
-    
+    <div id="sidebar">
+      <p class="section">Navigation</p>
+      
+<ul>
+<li><a href="/">Home</a></li>
+<li><a href="/news/">News</a></li>
+<li><a href="/helping/">Getting Involved</a></li>
+<li><a href="/dotplan/">Release Planning</a></li>
+<li><a href="/arch/">Architecture</a></li>
+<li><a href="/projects/">Projects</a>
+<ul>
+<li><a href="/projects/gap/">Accessibility</a></li>
+<li><a href="/projects/bugsquad/">Bugsquad</a></li>
+<li><a href="/projects/gdp/">Documentation</a></li>
+<li><a href="/projects/gpp/">Packaging</a></li>
+<li><a href="/projects/gtp/">Translation</a>
+<ul>
+<li><a href="/projects/gtp/tasks.html">Tasks</a></li>
+<li><a href="/projects/gtp/status/">Status</a></li>
+<li><a href="/projects/gtp/resources.html">Resources</a></li>
+<li>Teams</li>
+<li><a href="/projects/gtp/join.html">Joining</a></li>
+<li><a href="/projects/gtp/contact.html">Contacting</a></li>
+<li><a href="/projects/gtp/friends.html">Related Projects</a></li>
+</ul>
+</li>
+<li><a href="/projects/gup/">Usability</a></li>
+<li><a href="/projects/gwh/">Webhackers</a></li>
+</ul>
+</li>
+<li><a href="/doc/">Documentation</a></li>
+<li><a href="/feature/">Feature Articles</a></li>
+<li><a href="/tools/">Development Tools</a></li>
+<li><a href="/links/">External Resources</a></li>
+</ul>
 
+    </div>
     
-<div class="mainpage">
-
-<h1>GNOME Translation Teams</h1>
-
-
-<p>Select a team below to see more information about it:</p>
+    <div id="hdr">
+      <a href="http://developer.gnome.org/"><img id="logo" src="/images/gnome-64.png" alt="Home" title="Back to the Gnome Developer's home page" /></a>
+      <p class="none"></p>
+      <div id="hdrNav">
+        <a href="http://www.gnome.org/">Users</a> &#x00b7;
+        <a href="/"><b>Developers</b></a> &#x00b7;
+        <a href="http://cvs.gnome.org/bonsai/">Bonsai</a> &#x00b7;
+        <a href="http://cvs.gnome.org/viewcvs/">ViewCVS</a> &#x00b7;
+        <a href="http://ftp.gnome.org/pub/GNOME/MIRRORS.html">FTP</a> &#x00b7;
+        <a href="http://bugzilla.gnome.org/">Bugzilla</a> &#x00b7;
+        <a href="http://www.gnome.org/softwaremap/">Software Map</a> &#x00b7;
+        <a href="http://www.gnome.org/contact/">Contact</a>
+      </div>
+    </div>
 
-    <ul class="foot">
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/af">Afrikaans</a>
-      
-        &mdash; <a href="http://translate.org.za/">http://translate.org.za/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/friedel@translate.org.za/">Friedel Wolff</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/sq">Albanian</a>
-      
-        &mdash; <a href="http://gnome-albanian.sourceforge.net/">http://gnome-albanian.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/laurenti/">Laurent Dhima</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/am">Amharic</a>
-      
-        &mdash; <a href="http://gnome.geez.org/Amharic/">http://gnome.geez.org/Amharic/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/yacob/">Daniel Yacob</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ar">Arabic</a>
-      
-        &mdash; <a href="http://www.arabeyes.org/">http://www.arabeyes.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/khaled/">خالد حسني</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/an">Aragonese</a>
-      
-        &mdash; <a href="http://wiki.softaragones.org/">http://wiki.softaragones.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jesmar/">Daniel Martinez Cucalon</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/hy">Armenian</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/noch/">Norayr Chilingaryan</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/as">Assamese</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/amitakhya/">Amitakhya Phukan</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ast">Asturian</a>
-      
-        &mdash; <a href="http://softastur.org/">http://softastur.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/xandruarmesto/">Xandru Armesto</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/en_AU">Australian English</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/gnome-i18n@six-by-nine.com.au/">Peter Lawler</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/az">Azerbaijani</a>
-      
-        &mdash; <a href="http://www.linux.gen.az/">http://www.linux.gen.az/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/rundll32/">Metin Amiroff</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/bal">Balochi</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/mostafa@daneshvar.org.uk/">Mostafa Daneshvar</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/eu">Basque</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/dooteo/">Iñaki Larrañaga Murgoitio</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/be">Belarusian</a>
-      
-        &mdash; <a href="http://mounik.org/">http://mounik.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/iharh/">Ihar Hrachyshka</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/bem">Bemba</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/goof/">Anthony Musaluke</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/bn">Bengali</a>
-      
-        &mdash; <a href="http://www.ankur.org.bd/">http://www.ankur.org.bd/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jahmed/">Jamil Ahmed</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/bn_IN">Bengali (India)</a>
-      
-        &mdash; <a href="http://www.bengalinux.org/projects/gnome/">http://www.bengalinux.org/projects/gnome/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/sayamindu/">Sayamindu Dasgupta</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/bs">Bosnian</a>
-      
-        &mdash; <a href="http://projekti.linux.org.ba/">http://projekti.linux.org.ba/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/aakagic/">Amila Akagić</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/pt_BR">Brazilian Portuguese</a>
-      
-        &mdash; <a href="http://br.gnome.org/">http://br.gnome.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/dnoway/">Djavan Fagundes</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/br">Breton</a>
-      
-        &mdash; <a href="http://www.stationlinux.org/gnomebr/">http://www.stationlinux.org/gnomebr/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jeremylf/">Jérémy Ar Floc&#39;h</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/en_GB">British English</a>
-      
-        &mdash; <a href="http://live.gnome.org/BritishEnglish">http://live.gnome.org/BritishEnglish</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/hadess/">Bastien Nocera</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/bg">Bulgarian</a>
-      
-        &mdash; <a href="http://fsa-bg.org/project/gtp">http://fsa-bg.org/project/gtp</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/al_shopov/">Alexander Shopov</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/my">Burmese</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/russellkyaw/">Russell Kyaw</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/en_CA">Canadian English</a>
-      
-        &mdash; <a href="http://www.vectors.cx/en_ca.html">http://www.vectors.cx/en_ca.html</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/adamw/">Adam Weinberger</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ca">Catalan</a>
-      
-        &mdash; <a href="http://www.softcatala.org/wiki/GNOME">http://www.softcatala.org/wiki/GNOME</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/gforcada/">Gil Forcada</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/zh_CN">Chinese (China)</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/fwang/">Funda Wang</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/zh_trad">Chinese Traditional</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/pesder/">Chao-Hsiung Liao</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/crh">Crimean Tatar</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/rsabiq/">Reşat Sabıq</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/hr">Croatian</a>
-      
-        &mdash; <a href="http://lokalizacija.linux.hr/">http://lokalizacija.linux.hr/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/rsedak/">Robert Sedak</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/cs">Czech</a>
-      
-        &mdash; <a href="http://live.gnome.org/Czech">http://live.gnome.org/Czech</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/pmkovar/">Petr Kovář</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/da">Danish</a>
-      
-        &mdash; <a href="http://www.dansk-gruppen.dk/index.php?ID=18&amp;lang=da">http://www.dansk-gruppen.dk/index.php?ID=18&amp;lang=da</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/kennethn/">Kenneth Nielsen</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/dv">Divehi</a>
-      
-        &mdash; <a href="http://www.moss.org.mv/">http://www.moss.org.mv/</a>
-      
-      
-      
+    <div id="copyright">
+      &#x00a9; 2003-2004 by <a href="http://www.gnome.org/">The GNOME Project</a>
       <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/inash/">Inash Zubair</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/nl">Dutch</a>
-      
-        &mdash; <a href="http://nl.gnome.org/">http://nl.gnome.org/</a>
-      
-      
-      
+      Last modified 2005/07/26 22:13:21 UTC.
       <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/wbolster/">Wouter Bolsterlee</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/dz">Dzongkha</a>
-      
-        &mdash; <a href="http://savannah.nongnu.org/projects/dzongkha-gnome/">http://savannah.nongnu.org/projects/dzongkha-gnome/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/pgeyleg/">Pema Geyleg</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/eo">Esperanto</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jn0101/">Jacob Nordfalk</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/et">Estonian</a>
-      
-        &mdash; <a href="http://gnome.linux.ee/">http://gnome.linux.ee/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/plaes/">Priit Laes</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/fi">Finnish</a>
-      
-        &mdash; <a href="http://www.gnome.fi/">http://www.gnome.fi/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ituohela/">Ilkka Tuohela</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/fr">French</a>
-      
-        &mdash; <a href="http://gnomefr.traduc.org/">http://gnomefr.traduc.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/annoa/">Bruno Brouard</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/fy">Frisian</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/sehofstede/">Sense Hofstede</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/fur">Friulian</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/massimo.furlani@libero.it/">Massimo Furlani</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ff">Fula</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ibrahima.sarr@pulaagu.com/">Ibrahima Sarr</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/gl">Galician</a>
-      
-        &mdash; <a href="http://l10n.gnome.org/teams/gl">http://l10n.gnome.org/teams/gl</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/frandieguez/">Fran Diéguez</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ka">Georgian</a>
-      
-        &mdash; <a href="http://gnome.inet.ge/">http://gnome.inet.ge/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/vsichi/">Vladimer Sichinava</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/de">German</a>
-      
-        &mdash; <a href="http://live.gnome.org/de/Uebersetzung">http://live.gnome.org/de/Uebersetzung</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/hendrikr/">Hendrik Richter</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/el">Greek</a>
-      
-        &mdash; <a href="http://www.gnome.gr/">http://www.gnome.gr/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/simos/">Simos Xenitellis</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/gn">Guarani</a>
-      
-        &mdash; <a href="http://www.gnome.org/">http://www.gnome.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/colorido@riseup.net/">Moreno Saraiva Martins</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/gu">Gujarati</a>
-      
-        &mdash; <a href="http://www.utkarsh.org/">http://www.utkarsh.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ankitp/">Ankit Patel</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ha">Hausa</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/nuimam@fossnigeria.org/">Nasir Usman Imam</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/he">Hebrew</a>
-      
-        &mdash; <a href="http://gnome-il.sourceforge.net/">http://gnome-il.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/yairhr/">יאיר הרשקוביץ</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/hi">Hindi</a>
-      
-        &mdash; <a href="http://www.indlinux.org/hindi/">http://www.indlinux.org/hindi/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/karunakar/">Guntupalli Karunakar</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/hu">Hungarian</a>
-      
-        &mdash; <a href="http://www.gnome.hu/">http://www.gnome.hu/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/kelemeng/">Gábor Kelemen</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/is">Icelandic</a>
-      
-        &mdash; <a href="http://www.rglug.org/wiki/index.php/Þýðingarlisti_RGLUG">http://www.rglug.org/wiki/index.php/Þýðingarlisti_RGLUG</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/annaj@hi.is/">Anna Jonna Armannsdottir</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/io">Ido</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/mterry/">Michael Terry</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/id">Indonesian</a>
-      
-        &mdash; <a href="http://i15n.org/GNOME">http://i15n.org/GNOME</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/andika/">Andika Triwidada</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/az_IR">Iranian Azerbaijani</a>
-      
-        &mdash; <a href="http://www.farsiweb.info/wiki/Main/GNOME">http://www.farsiweb.info/wiki/Main/GNOME</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/amir@bamdad.org/">Amir Hedayaty</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ga">Irish</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/sdeburca/">Seán de Búrca</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/it">Italian</a>
-      
-        &mdash; <a href="http://www.it.gnome.org/">http://www.it.gnome.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/elle.uca/">Luca Ferretti</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ja">Japanese</a>
-      
-        &mdash; <a href="http://www.gnome.gr.jp/">http://www.gnome.gr.jp/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/kusano/">Takayuki KUSANO</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/kn">Kannada</a>
-      
-        &mdash; <a href="http://kannada.sourceforge.net/">http://kannada.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/sprasad/">Shankar Prasad</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ks">Kashmiri</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/rakesh.pandit@gmail.com/">Rakesh Pandit</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/kk">Kazakh</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/cray/">Baurzhan Muftakhidinov</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/km">Khmer</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/khem/">Khoem Sokhem</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/kg">Kikongo</a>
-      
-        &mdash; <a href="http://lundombe.zaya-dio.com">http://lundombe.zaya-dio.com</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/lukongo/">Kibavuidi NSIANGANI</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/rw">Kinyarwanda</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/smurphy/">Steve Murphy</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ky">Kirghiz</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/timurj/">Timur Jamakeev</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ko">Korean</a>
-      
-        &mdash; <a href="http://groups.google.com/group/gnome-kr">http://groups.google.com/group/gnome-kr</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/cwryu/">Changwoo Ryu</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ku">Kurdish</a>
-      
-        &mdash; <a href="http://gnome-kurdi.sourceforge.net/">http://gnome-kurdi.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/eronahi/">Erdal Ronahi</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/lo">Lao</a>
-      
-        &mdash; <a href="http://laofoss.sourceforge.net/">http://laofoss.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/laonux/">Anousak Souphavanh</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/la">Latin</a>
-      
-        &mdash; <a href="http://live.gnome.org/Latin">http://live.gnome.org/Latin</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/paul@paulnorton.org/">Paul Norton</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/lv">Latvian</a>
-      
-        &mdash; <a href="http://ll10nt.laka.lv/">http://ll10nt.laka.lv/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/peterisk/">Peteris Krisjanis</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/li">Limburgian</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/kenneth/">Kenneth Rohde Christiansen</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/lt">Lithuanian</a>
-      
-        &mdash; <a href="http://akl.lt/lietuvybe.org">http://akl.lt/lietuvybe.org</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/gintas/">Gintautas Miliauskas</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/nds">Low German</a>
-      
-        &mdash; <a href="http://nds.sourceforge.net/">http://nds.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ncfiedler/">Nils-Christoph Fiedler</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/lg">Luganda</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/kizito/">kizito</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/mk">Macedonian</a>
-      
-        &mdash; <a href="http://gnome.linux.net.mk/">http://gnome.linux.net.mk/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jovanna/">Jovan Naumovski</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/mai">Maithili</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/rajeshkajha@yahoo.com/">Rajesh Ranjan</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/mg">Malagasy</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/thierryr/">Thierry Randrianiriana</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ms">Malay</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/umarzuki/">Umarzuki Bin Mochlis Moktar</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ml">Malayalam</a>
-      
-        &mdash; <a href="http://wiki.smc.org.in/GNOME">http://wiki.smc.org.in/GNOME</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/anipeter/">Peter Ani</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/gv">Manx</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ReubenPotts/">ReubenPotts</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/mi">Maori</a>
-      
-        &mdash; <a href="http://www.nzlinux.org.nz/l10n/">http://www.nzlinux.org.nz/l10n/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jbarstow/">John C Barstow</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/mr">Marathi</a>
-      
-        &mdash; <a href="http://www.indictrans.org/">http://www.indictrans.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/sandeeps/">Sandeep Shedmake</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/mn">Mongolian</a>
-      
-        &mdash; <a href="http://gnome.openmn.org/">http://gnome.openmn.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/badaa/">Sanlig Badral</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/nap">Neapolitan</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/s.cretella@gmail.com/">Sabine Emmy Eller</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ne">Nepali</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/pachimho/">Pawan Chitrakar</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/nso">Northern Sotho</a>
-      
-        &mdash; <a href="http://translate.org.za/">http://translate.org.za/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/dbailey/">Dwayne Bailey</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/no">Norwegian (Bokmål and Nynorsk)</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/kmaraas/">Kjartan Maraas</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/oc">Occitan</a>
-      
-        &mdash; <a href="http://www.totenoc.org/">http://www.totenoc.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ymarcheg/">Yannig Marchegay</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ang">Old English</a>
-      
-        &mdash; <a href="http://home.comcast.net/~modean52/oeme_gnome.htm">http://home.comcast.net/~modean52/oeme_gnome.htm</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/modean52@comcast.net/">James R. Johnson</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/or">Oriya</a>
-      
-        &mdash; <a href="http://oriya.sarovar.org/">http://oriya.sarovar.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/gmohanty/">Gora Mohanty</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ps">Pashto</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/khalid/">Khalid Amiri</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/fa">Persian</a>
-      
-        &mdash; <a href="http://ifsug.org/wiki/index.php?title=Gnome_translation">http://ifsug.org/wiki/index.php?title=Gnome_translation</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/moonfriend/">Mahyar Moghimi</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/pl">Polish</a>
-      
-        &mdash; <a href="http://wiki.aviary.pl/GNOME">http://wiki.aviary.pl/GNOME</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/tomaszd/">Tomasz Dominikowski</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/pt">Portuguese</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/dnloreto/">Duarte Loreto</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/pa">Punjabi</a>
-      
-        &mdash; <a href="http://satluj.com">http://satluj.com</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/aman/">A S Alam</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ro">Romanian</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/adiroiban/">Adi Roiban</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ru">Russian</a>
-      
-        &mdash; <a href="http://www.gnome.org.ru/">http://www.gnome.org.ru/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/lkanter/">Leonid Kanter</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/sr">Serbian</a>
-      
-        &mdash; <a href="http://prevod.org/">http://prevod.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/mpopovic/">Милош Поповић</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/en@shaw">Shavian</a>
-      
-        &mdash; <a href="http://ubuntu.shavian.org.uk/">http://ubuntu.shavian.org.uk/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/tthurman@gnome.org/">Thomas Thurman</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/si">Sinhala</a>
-      
-        &mdash; <a href="http://sinhala.linux.lk/">http://sinhala.linux.lk/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/snavin/">Danishka Navin</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/sk">Slovak</a>
-      
-        &mdash; <a href="http://live.gnome.org/SlovakTranslation">http://live.gnome.org/SlovakTranslation</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/palos/">Pavol Šimo</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/sl">Slovenian</a>
-      
-        &mdash; <a href="https://wiki.lugos.si/slovenjenje:gnome:gnome">https://wiki.lugos.si/slovenjenje:gnome:gnome</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/mateju/">Matej Urbančič</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/es">Spanish</a>
-      
-        &mdash; <a href="http://es.gnome.org/Documentacion/Traductores">http://es.gnome.org/Documentacion/Traductores</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/jorgegonz/">Jorge González González</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/sv">Swedish</a>
-      
-        &mdash; <a href="http://live.gnome.org/Swedish">http://live.gnome.org/Swedish</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/menthos/">Christian Rose</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/tl">Tagalog</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/epareja/">Eric Pareja</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/tg">Tajik</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/rkovacs@khujand.org/">Roger Kovacs</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ta">Tamil</a>
-      
-        &mdash; <a href="http://tamilgnome.sourceforge.net/">http://tamilgnome.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/njaya/">Jayaradha N.</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/tt">Tatar</a>
-      
-        &mdash; <a href="http://soft.beznen.net/">http://soft.beznen.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/tatarish.l10n@gmail.com/">Albert Fazlí</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/te">Telugu</a>
-      
-        &mdash; <a href="http://www.indlinux.org/telugu/">http://www.indlinux.org/telugu/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/smohan/">Sunil Mohan</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/th">Thai</a>
-      
-        &mdash; <a href="http://gnome-th.sourceforge.net/">http://gnome-th.sourceforge.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/tkaroonb/">Theppitak Karoonboonyanan</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/tr">Turkish</a>
-      
-        &mdash; <a href="http://www.gnome.org.tr/">http://www.gnome.org.tr/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/bcicek/">Barış Çiçek</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/tk">Turkmen</a>
-      
-        &mdash; <a href="http://kakilik.sf.net/">http://kakilik.sf.net/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/ghomota/">Ghorban M. Tavakoly</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ug">Uighur</a>
-      
-        &mdash; <a href="http://groups.yahoo.com/group/gnome-uighur/">http://groups.yahoo.com/group/gnome-uighur/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/aabdurix/">Abdurixit Abduxukur</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/uk">Ukrainian</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/mdziumanenko/">Maxim V. Dziumanenko</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/ur">Urdu</a>
-      
-        &mdash; <a href="http://www.urduweb.org/">http://www.urduweb.org/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/mwalam_uk@yahoo.co.uk/">Muhammad Waqas Alam</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/uz">Uzbek</a>
-      
-        &mdash; <a href="http://groups.google.com/group/floss-uz-l10n">http://groups.google.com/group/floss-uz-l10n</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/anurali/">Nurali Abdurahmonov</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/vi">Vietnamese</a>
-      
-        &mdash; <a href="http://live.gnome.org/GnomeVi">http://live.gnome.org/GnomeVi</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/pclouds/">Nguyễn Thái Ngọc Duy</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/wa">Walloon</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/pablo/">Pablo Saratxaga</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/cy">Welsh</a>
-      
-        &mdash; <a href="http://muse.19inch.net/~daf/gnome-cy/">http://muse.19inch.net/~daf/gnome-cy/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/daf/">Dafydd Harries</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/xh">Xhosa</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/aattar/">Adi Attar</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/yi">Yiddish</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/RaphaelFinkel/">Raphael Finkel</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/yo">Yoruba</a>
-      
-        &mdash; <a href="http://www.wazobiasoft.org/gnome/yoruba.htm">http://www.wazobiasoft.org/gnome/yoruba.htm</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/bonibz@hotmail.com/">Abayomi Mobolaji Onibudo</a>
-      </span>
-      
-      
-    </li>
-    
-    <li style="font-size: 120%;">
-      <a href="/teams/zu">Zulu</a>
-      
-        &mdash; <a href="http://translate.org.za/">http://translate.org.za/</a>
-      
-      
-      
-      <br />
-      <span style="font-size: 80%;">
-        Coordinated by <a href="/users/dbailey/">Dwayne Bailey</a>
-      </span>
-      
-      
-    </li>
-    
-    </ul>
-
-    <p class="comment">If anything should be changed on this page, please <a href="http://bugzilla.gnome.org/enter_bug.cgi?product=damned-lies&amp;component=l10n.gnome.org">submit a bug report</a>.</p>
-
-
-
-</div>
-
+      <a href="http://validator.w3.org/check/referer"
+        lang="en-AU" xml:lang="en-AU">Optimised</a>
+      for <a href="http://www.w3.org/">standards</a>.
+      Hosted by <a href="http://www.redhat.com/">Red Hat</a>.
     </div>
 
-  <div id="footer">
-    Copyright &copy; 2006-2009 <a href="http://www.gnome.org/">The GNOME Project</a>.
-    <br />
-Maintained in the <a href='http://git.gnome.org/browse/damned-lies/'>damned-lies</a> module on <a href='http://git.gnome.org/'>git.gnome.org</a>
- <br />
-    Hosted by <a href='http://www.canonical.com/'>Canonical</a>.
-  </div>
-
-</div> <!-- end of div.body -->
-</body>
+ </body>
 </html>
diff -Nru gettext-0.19.3/gettext-tools/projects/GNOME/teams.url gettext-0.18.1.1/gettext-tools/projects/GNOME/teams.url
--- gettext-0.19.3/gettext-tools/projects/GNOME/teams.url	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/projects/GNOME/teams.url	2010-06-06 12:49:58.000000000 +0000
@@ -1 +1 @@
-http://l10n.gnome.org/teams/
+http://developer.gnome.org/projects/gtp/teams.html
diff -Nru gettext-0.19.3/gettext-tools/projects/Makefile.am gettext-0.18.1.1/gettext-tools/projects/Makefile.am
--- gettext-0.19.3/gettext-tools/projects/Makefile.am	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/projects/Makefile.am	2010-06-06 12:49:58.000000000 +0000
@@ -36,10 +36,10 @@
 EXTRA_DIST += $(SCRIPTFILES) $(DATAFILES)
 
 install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(projectsdir)
+	$(mkdir_p) $(DESTDIR)$(projectsdir)
 	@for p in $(PROJECTS); do \
-	  echo "$(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p"; \
-	  $(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p; \
+	  echo "$(mkdir_p) $(DESTDIR)$(projectsdir)/$$p"; \
+	  $(mkdir_p) $(DESTDIR)$(projectsdir)/$$p; \
 	done
 	@for f in $(SCRIPTFILES); do \
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f"; \
@@ -51,10 +51,10 @@
 	done
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(projectsdir)
+	$(mkdir_p) $(DESTDIR)$(projectsdir)
 	@for p in $(PROJECTS); do \
-	  echo "$(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p"; \
-	  $(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p; \
+	  echo "$(mkdir_p) $(DESTDIR)$(projectsdir)/$$p"; \
+	  $(mkdir_p) $(DESTDIR)$(projectsdir)/$$p; \
 	done
 
 uninstall-local:
diff -Nru gettext-0.19.3/gettext-tools/projects/Makefile.in gettext-0.18.1.1/gettext-tools/projects/Makefile.in
--- gettext-0.19.3/gettext-tools/projects/Makefile.in	2014-10-16 06:01:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/projects/Makefile.in	2010-06-06 20:12:32.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,53 +15,9 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -76,69 +33,58 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = projects
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -146,12 +92,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -168,7 +111,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -180,7 +122,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -189,26 +130,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -217,17 +152,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -253,7 +184,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -262,7 +192,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -271,26 +200,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -326,29 +253,16 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/gettext
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -357,7 +271,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -395,7 +308,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -432,18 +344,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -455,26 +366,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -482,8 +383,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -495,23 +394,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -534,7 +428,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -552,18 +445,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -588,47 +476,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -636,7 +516,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -646,21 +525,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -672,103 +547,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -779,11 +601,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -793,6 +610,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -805,7 +623,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -826,16 +643,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -858,48 +675,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -922,6 +724,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -931,13 +734,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -946,47 +752,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1001,8 +776,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1042,7 +815,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1064,8 +836,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1073,13 +845,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1092,21 +862,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1119,9 +887,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1145,9 +913,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1161,12 +927,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1174,8 +937,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1187,41 +948,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1235,27 +984,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1263,34 +999,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1306,9 +1033,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1328,8 +1053,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1338,8 +1061,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1354,7 +1075,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1405,6 +1125,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1412,7 +1133,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1476,11 +1196,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1527,15 +1247,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1616,24 +1331,23 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-local maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-local
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-local maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-local
 
 
 install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(projectsdir)
+	$(mkdir_p) $(DESTDIR)$(projectsdir)
 	@for p in $(PROJECTS); do \
-	  echo "$(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p"; \
-	  $(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p; \
+	  echo "$(mkdir_p) $(DESTDIR)$(projectsdir)/$$p"; \
+	  $(mkdir_p) $(DESTDIR)$(projectsdir)/$$p; \
 	done
 	@for f in $(SCRIPTFILES); do \
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f"; \
@@ -1645,10 +1359,10 @@
 	done
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(projectsdir)
+	$(mkdir_p) $(DESTDIR)$(projectsdir)
 	@for p in $(PROJECTS); do \
-	  echo "$(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p"; \
-	  $(MKDIR_P) $(DESTDIR)$(projectsdir)/$$p; \
+	  echo "$(mkdir_p) $(DESTDIR)$(projectsdir)/$$p"; \
+	  $(mkdir_p) $(DESTDIR)$(projectsdir)/$$p; \
 	done
 
 uninstall-local:
diff -Nru gettext-0.19.3/gettext-tools/src/ChangeLog gettext-0.18.1.1/gettext-tools/src/ChangeLog
--- gettext-0.19.3/gettext-tools/src/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/ChangeLog	2010-06-06 12:49:58.000000000 +0000
@@ -1,1001 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-08  Daiki Ueno  <ueno@gnu.org>
-
-	* write-po.c (wrap): Report error on incomplete multibyte sequence
-	at the end of input bytes.
-	Reported by Jakub Wilk at:
-	<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763820>.
-
-2014-09-30  Daiki Ueno  <ueno@gnu.org>
-
-	* x-c.c (literalstring_parse): Fix octal character escape handling.
-	Reported by Kjartan Maraas at:
-	<https://bugzilla.redhat.com/show_bug.cgi?id=1147535>.
-
-2014-09-24  Daiki Ueno  <ueno@gnu.org>
-
-	* x-python.c (x_python_lex): Move 'token3' variable declaration
-	out of the internal block.
-
-2014-09-24  Daiki Ueno  <ueno@gnu.org>
-
-	* filter-quote.c (BOLD_START, BOLD_END): Don't use non-portable
-	character escape "\e".
-
-2014-08-28  Jonas 'Sortie' Termansen <sortie@maxsi.org>  (tiny change)
-
-	* msginit.c: Include <stdint.h>.
-	(get_user_pwd): Cast uid_t value into uintmax_t and print it with
-	'%ju' format directive.
-
-2014-08-27  Jonas 'Sortie' Termansen <sortie@maxsi.org>  (tiny change)
-
-	* msgfilter.c (process_message): Use proper format directive for
-	printing size_t.
-	* msgexec.c (process_message): Likewise.
-
-2014-08-27  Jonas 'Sortie' Termansen <sortie@maxsi.org>  (tiny change)
-
-	* hostname.c: Add guard around #include <sys/param.h>.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	vala: Fix empty string literal handling
-	Similar to the commit 7b2d8d61 on July 11.
-	* x-vala.c (phase3_get): Add missing memory allocation for empty
-	string literal.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	build: Fix race in post-install removal of *.a
-	There was an implicit dependency between the prerequisites of
-	install-exec-local, which may have caused error with make -jN.
-	Use install-exec-hook to remove the dependency.
-	Reported by Christian Weisgerber in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-07/msg00008.html>.
-	* Makefile.am (install-exec-local): Remove.
-	(install-exec-hook): New rule, depend on install-exec-clean.
-
-2014-07-11  Daiki Ueno  <ueno@gnu.org>
-
-	c: Fix empty string literal handling
-	Problem reported by Bernhard Voelker in:
-	<http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00059.html>.
-	* x-c.c (phase5_get): Add missing memory allocation for empty
-	string literal.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-09  Daiki Ueno  <ueno@gnu.org>
-
-	msgmerge: Disable --color option in --update mode
-	Suggested by 林Ｖ字龍 at:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00017.html>.
-	* msgmerge.c (main): Error out when --color and --update are
-	specified at the same time.
-
-2014-06-07  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Fix misrecognition of character literals in C and Vala
-	Problem reported by Paul Eggert at
-	<http://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00015.html>.
-	* x-c.c (phase5_get): Make sure to skip contents of character constant.
-	* x-vala.c (phase3_get): Likewise.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	desktop: Use logical filename as msgid location
-	* read-desktop.c (desktop_parse): Pass logical filename instead of
-	real filename to desktop_reader_handle_pair.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	desktop: Read LINGUAS file even if LINGUAS envvar is set
-	* msgfmt.c (get_languages): If the LINGUAS envvar is set, use it
-	to restrict the languages list read from the LINGUAS file, not to
-	extend the list.
-	(add_languages): Take an optional DESIRED_LANGUAGES argument.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	vala: Don't elide comments while parsing string literal
-	* x-vala.c (phase3_get): Use phase1_getc to read characters inside
-	a string literal.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	msgl-check: Treat missing header errors as warnings
-	Problem reported by Richard Hughes at
-	<https://lists.fedoraproject.org/pipermail/devel/2014-June/199539.html>.
-	After <https://savannah.gnu.org/bugs/?40262>, "msgfmt -c" reports
-	error on missing PO headers.  However, it turned out to be too strict
-	for the projects using Launchpad Translations.  Let's relax the check
-	for the moment and wait for one or two release cycles.
-	* msgl-check.c (check_header_entry): Report missing
-	required headers as warning, instead of error.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-31  Daiki Ueno  <ueno@gnu.org>
-
-	msgexec: Pass previous msgid to the child process
-	Suggested by Pavel Kharitonov in:
-	<http://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00022.html>.
-	* msgexec.c (process_string): Set MSGEXEC_PREV_* envvar.
-
-2014-05-31  Daiki Ueno  <ueno@gnu.org>
-
-	msgfilter: Pass previous msgid to the child process
-	Suggested by Pavel Kharitonov in:
-	<http://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00022.html>.
-	* msgfilter.c (process_message): Set MSGFILTER_PREV_* envvar.
-
-2014-05-19  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (po-gram-gen2.h): Adjust the directory to which
-	po-gram-gen.h, for VPATH build.
-
-2014-05-15  Stanislav Brabec  <sbrabec@suse.cz>  (tiny change)
-
-	msgfilter: Implement plural support
-	* msgfilter.c (process_message): Set or unset
-	MSGFILTER_MSGID_PLURAL and MSGFILTER_PLURAL_FORM.
-
-2014-05-15  Stanislav Brabec  <sbrabec@suse.cz>  (tiny change)
-
-	msgexec: Implement plural support
-	* msgexec.c (process_string): Set or unset MSGEXEC_MSGID_PLURAL.
-	(process_message): Set or unset MSGEXEC_PLURAL_FORM.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	msgfmt: Report error on accelerator mismatch
-	* msgl-check.c (check_pair): Increment error count on missing
-	accelerator character or too many accelerators.
-
-2014-05-13  Daiki Ueno  <ueno@gnu.org>
-
-	msgfmt: Accumulate errors when parsing the PO header
-	Problem reported by Peter Eisentraut at
-	<https://savannah.gnu.org/bugs/?40262>.
-	* msgl-check.c (check_header_entry): Return the number of errors.
-	(check_message): Check the return value of check_header_entry.
-
-2014-05-13  Felipe Sateler <fsateler@debian.org>  (tiny change)
-
-	project-id: Add missing quotes around `pwd` for basename
-	Problem reported at <http://bugs.debian.org/654779>.
-	* project-id: Quote argument of the basename command.
-
-2014-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	msgfilter: Fix quote handling of doubled grave charaters
-	* filter-quote.c (convert_ascii_quote_to_unicode): Fix handling of
-	doubled grave characters.
-
-2014-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt.c (add_languages): New function split from get_languages.
-	(get_languages): Use add_languages instead of manually parsing
-	LINGUAS envvar with strtok_r.
-
-	* x-c.h (literalstring_c): Remove unnecessary DLL_VARIABLE.
-	* xgettext.c (arglist_parser_alloc): Use LET_NONE instead of 0.
-	(arglist_parser_remember): Likewise.
-	* xgettext.h (enum literalstring_escape_type): New enum value
-	LET_NONE.
-
-2014-05-10  Guido Flohr  <guido@imperia.net>
-
-	msgattrib: Add --empty option to clear msgstr
-	* msgattrib.c (REMOVE_TRANSLATION): New enum value.
-	(long_options): Add --empty.
-	(main): Set REMOVE_TRANSLATION flag when --empty is given.
-	(usage): Show help of --empty.
-	(process_message_list): Handle REMOVE_TRANSLATION flag.
-
-2014-05-09  Daiki Ueno  <ueno@gnu.org>
-
-	vala: Interpret string literals lazily
-	* x-vala.c (P7_EOF, P7_STRING_END, P7_QUOTES, P7_QUOTE, P7_NEWLINE)
-	(UNICODE, IS_UNICODE, UNICODE_VALUE): Remove.
-	(phase7_getc): Remove.
-	(phase7_ungetc): Remove.
-	(phase3_get): Use 'phase2_get' directly to extract string
-	literals; use 'arglist_parser_remember_literal' instead of
-	'arglist_parser_remember'.
-	(literalstring_c): Declare external variable.
-	(extract_balanced): Remove the
-	'xgettext_current_source_encoding' setting to prevent encoding
-	conversion around 'arglist_parser_done'.
-	(token_ty): New field 'escape'.
-	* x-vala.h (SCANNERS_VALA): Register 'literalstring_c' as a
-	literalstring_parser.
-
-2014-05-09  Daiki Ueno  <ueno@gnu.org>
-
-	c: Interpret string literals lazily
-	* x-c.c (P7_EOF, P7_STRING_END, P7_QUOTES, P7_QUOTE, P7_NEWLINE)
-	(UNICODE, IS_UNICODE, UNICODE_VALUE): Remove.
-	(phase7_get): Remove.
-	(phase7_ungetc): Remove.
-	(phase5_get): Use 'phase3_get' directly to extract string
-	literals; use 'arglist_parser_remember_literal' instead of
-	'arglist_parser_remember'.
-	(literalstring_parse): New function.
-	(literalstring_c): New variable.
-	(extract_parenthesized): Remove the
-	'xgettext_current_source_encoding' setting to prevent encoding
-	conversion around 'arglist_parser_done'.
-	* x-c.h (SCANNERS_C): Register 'literalstring_c' as a
-	literalstring_parser.
-	(literalstring_c): New variable declaration.
-
-2014-05-09  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Provide a way to interpret string literals lazily
-	* xgettext.c (extract_ty): New field 'literalstring_parser'.
-	(current_literalstring_parser): New variable.
-	(extract_from_file): Set 'current_literalstring_parser'.
-	(savable_comment_convert_encoding): New function.
-	(arglist_parser_remember_literal): New function.
-	(arglist_parser_remember): Call 'arglist_parser_remember_literal'.
-	(arglist_parser_done): Call literalstring_parser on msgctxt,
-	msgid, and msgid_plural before calling 'remember_a_message';
-	convert encoding of msgid_comment.
-	* x-*.h: Register 'literalstring_parser' through SCANNER_*.
-	* xgettext.h (enum literalstring_escape_type): New enum.
-	(struct literalstring_parser): New struct.
-	(struct partial_call): New fields 'msgctxt_escape',
-	'msgid_escape', and 'msgid_plural_escape'.
-	(arglist_parser_remember_literal): New function declaration.
-	(savable_comment_convert_encoding): New function declaration.
-
-2014-05-03  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Recognize prefixed comment tag
-	Reported by Jiang Xin in
-	<http://article.gmane.org/gmane.comp.version-control.git/246462>.
-	* xgettext.c (remember_a_message): Discard a string prefixed to
-	the comment tag from all remaining comment lines.
-
-2014-05-03  Daiki Ueno  <ueno@gnu.org>
-
-	c: Support C99-style Unicode character escapes
-	* x-c.c: Include assert.h and po-charset.h.
-	(P7_QUOTES, P7_QUOTE, P7_NEWLINE): Redefine as a negative integer.
-	(P7_EOF, P7_STRING_END): New definitions.
-	(UNICODE): New macro.
-	(IS_UNICODE): New macro.
-	(UNICODE_VALUE): New macro.
-	(phase7_getc): Recognize "\unnnn" and "\Unnnnnnnn".
-	(phase5_get): Use mixed_string_buffer for parse string literal.
-
-2014-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	vala: Support C99-style Unicode character escapes
-	* x-vala.c: Include assert.h and po-charset.h.
-	(P7_QUOTES, P7_QUOTE, P7_NEWLINE): Redefine as a negative integer.
-	(P7_EOF, P7_STRING_END): New definitions.
-	(UNICODE): New macro.
-	(IS_UNICODE): New macro.
-	(UNICODE_VALUE): New macro.
-	(phase7_getc): Recognize "\unnnn" and "\Unnnnnnnn".
-	(phase3_get): Use mixed_string_buffer for parse string literal.
-
-2014-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Factor out commonly used mixed_string_buffer
-	* x-python.c (init_mixed_string_buffer)
-	(mixed_string_buffer_append_byte)
-	(mixed_string_buffer_append_unicode_grow)
-	(mixed_string_buffer_append_unicode)
-	(mixed_string_buffer_flush_utf16_surr)
-	(mixed_string_buffer_flush_curr_buffer)
-	(mixed_string_buffer_append, mixed_string_buffer_result)
-	(free_mixed_string_buffer): Move to...
-	* xgettext.c: ...here.
-	(mixed_string_buffer_alloc): Rename from init_mixed_string_buffer.
-	(mixed_string_buffer_append_to_curr_buffer): Rename from
-	mixed_string_buffer_append_byte.
-	(mixed_string_buffer_append_to_utf8_buffer): Rename from
-	mixed_string_buffer_append_unicode.
-	(mixed_string_buffer_grow_utf8_buffer): Rename from
-	mixed_string_buffer_append_unicode_grow.
-	(mixed_string_buffer_append_char): Split from
-	mixed_string_buffer_append.
-	(mixed_string_buffer_append_unicode): Split from
-	mixed_string_buffer_append.
-	(mixed_string_buffer_done): New function merging
-	mixed_string_buffer_result and free_mixed_string_buffer.
-	* xgettext.h (mixed_string_buffer): New struct moved from
-	x-python.c; add logical_file_name and line_number fields.
-	(mixed_string_buffer_alloc): New function declaration.
-	(mixed_string_buffer_append_char): New function declaration.
-	(mixed_string_buffer_append_unicode): New function declaration.
-	(mixed_string_buffer_done): New function declaration.
-	* x-javascript.c (init_mixed_string_buffer)
-	(mixed_string_buffer_append_byte)
-	(mixed_string_buffer_append_unicode_grow)
-	(mixed_string_buffer_append_unicode)
-	(mixed_string_buffer_flush_utf16_surr)
-	(mixed_string_buffer_flush_curr_buffer)
-	(mixed_string_buffer_append, mixed_string_buffer_result)
-	(free_mixed_string_buffer): Remove.
-
-2014-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	scheme: Recognize GIMP script-fu extension _"abc"
-	* x-scheme.c (read_object): Recognize _"abc".
-
-2014-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	format-python-brace: Limit acceptable format specifiers
-	Problem reported by Kovid Goyal at:
-	<https://savannah.gnu.org/bugs/?41668>.
-	* format-python-brace.c (parse_directive): Only recognize a single
-	nested format directive or the standard format specifiers as
-	format specifiers.
-
-2014-04-22  Roumen Petrov  <bugtrack@roumenpetrov.info>  (tiny change)
-
-	build: Use Automake 'subdir-objects' option
-	* Makefile.am (AUTOMAKE_OPTIONS): Add 'subdir-objects'.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	msgfilter: Fix single quote handling in the quot filter
-	* filter-quote.c (convert_ascii_quote_to_unicode): Fix single
-	quote handling to accept multiple quotations in a string.
-
-2014-04-17  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Strip multiple ".in" suffixes from the file name.
-	* xgettext.c (main): Strip multiple ".in" suffixes.
-
-2014-04-16  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt.c (get_languages): Allow any whitespace character as a
-	list separator in LINGUAS.
-
-2014-04-15  Daiki Ueno  <ueno@gnu.org>
-
-	msgfilter: Add 'quot' and 'boldquot' built-in filters
-	* filter-quote.c: New file.
-	* filters.h (ascii_quote_to_unicode, ascii_quote_to_unicode_bold):
-	New function declaration.
-	* msgfilter.c (main): Handle 'quot' and 'boldquot' filters.
-	* Makefile.am (msgfilter_SOURCES): Add filter-quote.c.
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext.c (main): Warn user if invalid encoding name is
-	specified with the --from-code option.
-	Reported by jaroslav.fojtik@evolvsys.cz in
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-03/msg00034.html>.
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	msgfmt: Add support for Desktop Entry files
-	* write-desktop.h: New file.
-	* write-desktop.c: New file.
-	* msgfmt.c (desktop_mode, desktop_locale_name)
-	(desktop_template_name, desktop_base_directory, desktop_keywords)
-	(desktop_default_keywords): New variables.
-	(long_options): Add --desktop and --template options for Desktop
-	Entry mode.
-	(get_languages): New function.
-	(msgfmt_desktop_bulk): New function which implements bulk
-	operation mode for Desktop Entry mode.
-	(main): Handle Desktop Entry mode options; call
-	'msgfmt_desktop_bulk' if -d option is seen.
-	* Makefile.am (noinst_HEADERS): Add write-desktop.h.
-	(msgfmt_SOURCES): Add write-desktop.c
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Add support for Desktop Entry files
-	* read-desktop.h: New file.
-	* read-desktop.c: New file.
-	* x-desktop.h: New file.
-	* x-desktop.h: New file.
-	* xgettext.c (main): Regiser keywords for Desktop Entry mode.
-	(usage): Mention Desktop Entry source language.
-	(language_to_extractor): Add Desktop Entry rule.
-	(extension_to_language): Add Desktop Entry rule.
-	* Makefile.am (noinst_HEADERS): Add read-desktop.h and x-desktop.h.
-	(xgettext_SOURCES): Add x-desktop.c.
-
-2014-03-26  Aurélien Gâteau <mail@agateau.com>  (tiny change)
-
-	msgfmt: Add --source option to generate .java file instead of .class
-	* msgfmt.c (java_output_source): New variable.
-	(long_options, main, usage): Add --source option.
-	* write-java.h (msgdomain_write_java): Add OUTPUT_SOURCE argument.
-	* write-java.c (msgdomain_write_java): Generate .java file instead
-	of .class if OUTPUT_SOURCE argument is given.
-	Reported at <https://savannah.gnu.org/bugs/?41766>.
-
-2014-03-25  Daiki Ueno  <ueno@gnu.org>
-
-	Extend --add-location option to suppress line number output
-	The --add-location option of msgattrib, msgcat, msgcomm, msgconv,
-	msgen, msgfilter, msggrep, msgmerge, msguniq, and xgettext
-	commands now got new semantics.  It takes an optional argument
-	'never', 'full', or 'file', to control the format of "#: ..."
-	comments.
-	The default catalog reader changed to always remember file
-	positions so the line number part can be suppressed in output
-	phase rather than input phase.
-	Feature requested in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-08/msg00039.html>.
-	* read-catalog.h (line_comment): Abolish.
-	(DEFAULT_CATALOG_READER_TY): Remove handle_filepos_comments field.
-	* read-catalog.c (line_comment): Abolish.
-	(default_destructor, default_copy_comment_state)
-	(default_reset_comment_state, default_comment_filepos): Always
-	remember filepos.
-	(default_parse_brief, read_catalog_stream): Adjust to the change.
-	* write-po.h (enum filepos_comment_type): New enum.
-	(message_print_style_filepos): New function declaration.
-	(handle_filepos_comment_option): New function declaration.
-	* write-po.c (message_print_style_filepos): New function
-	(handle_filepos_comment_option): New function.
-	(message_print_comment_filepos): Uniquify mp->filepos elements
-	ignoring line number if filepos_comment_type is
-	filepos_comment_file.
-	* msgfmt.c: Adjust to the change.
-	* msgattrib.c (long_options, main): Allow --add-location option to
-	take an optional format specifier.
-	* msgcat.c (long_options, main): Likewise.
-	* msgcomm.c (long_options, main): Likewise.
-	* msguniq.c (long_options, main): Likewise.
-	* xgettext.c (long_options, main): Likewise.
-	* msgconv.c (long_options, main): Likewise; add a new option -n as
-	an alias of --add-location.
-	* msgen.c (long_options, main): Likewise.
-	* msgfilter.c (long_options, main): Likewise.
-	* msggrep.c (long_options, main): Likewise.
-	* msgmerge.c (long_options, main): Likewise.
-
-2014-03-12  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Fix infloop on loading Glade files with non-DL expat
-	* libexpat-compat.c: Keep the references to
-	XML_GetCurrent{Line,Column}Number symbols before including
-	libexpat-compat.h, since they are redefined.
-
-2014-03-10  Daiki Ueno  <ueno@gnu.org>
-
-	php: Recognize single and double quotes around heredoc label
-	Problem reported by Byrial Jensen in:
-	<https://lists.gnu.org/archive/html/bug-gettext/2012-04/msg00001.html>.
-	Based on the patch by Andreas Stricker posted as:
-	<https://lists.gnu.org/archive/html/bug-gettext/2012-04/msg00002.html>.
-	* x-php.c (phase4_get): Strip quotes around heredoc label.
-
-2013-11-20  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Add E4X support to JavaScript scanner
-	Reported by Piotr Drąg at: <https://savannah.gnu.org/bugs/?40125>.
-	* xgettext.h (enum lexical_context_ty): New enumeration items
-	lc_xml_open_tag, lc_xml_close_tag, lc_xml_content.
-	* x-javascript.c (phase5_scan_xml_markup): New function.
-	(phase5_get): Handle '<', '>', '/', '=', '{', and '}' specially
-	to support E4X.
-	(enum token_type_ty): New enumeration item token_type_equal.
-	(xml_element_depth): New variable.
-	(inside_embedded_in_xml): New variable.
-	(extract_javascript): Initialize those variables.
-
-2013-11-14  Daiki Ueno  <ueno@gnu.org>
-
-	* x-javascript.c (phase3_getc): Make sure to call comment_line_end
-	after parsing C++ style comment line.
-	Reported by Illimar Tambek at: <http://savannah.gnu.org/bugs/?40572>.
-
-2013-11-14  Daiki Ueno  <ueno@gnu.org>
-
-	* x-javascript.c (comment_line_end): Add missing chars_to_remove
-	argument; all callers changed.
-	Reported by Illimar Tambek at: <http://savannah.gnu.org/bugs/?40573>.
-
-2013-11-11  Daiki Ueno  <ueno@gnu.org>
-
-	* x-c.c (phase5_get): Fix misuse of a logical operator.
-	* x-perl.c (extract_quotelike_pass3): Likewise.
-	* x-vala.c (phase3_get): Likewise.
-	Reported by David Binderman at: <https://savannah.gnu.org/bugs/?40528>.
-
-2013-10-23  Daiki Ueno  <ueno@gnu.org>
-
-	* read-catalog-abstract.c (catalog_reader_parse): Clear
-	error_message_count before parsing, rather than after.  The
-	variable may be > 0 before calling the PO parser, when xgettext
-	handles mutiple files.
-	Problem reported by Emil Wojak in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-10/msg00005.html>.
-
-2013-10-15  Peter Eisentraut  <peter_e@gmx.net>  (tiny change)
-
-	* msgl-check.c (check_header_entry): Adjust the default value of
-	PO-Revision-Date to xgettext output.  Reported at
-	<https://savannah.gnu.org/bugs/?40261>.
-
-2013-08-29  Daiki Ueno  <ueno@gnu.org>
-
-	* po-gram-gen.y (message): Free memory allocated for
-	msgid_pluralform.
-	(string_list): Free memory allocated for STRING.
-	(prev_string_list): Free memory allocated for PREV_STRING.
-	Reported by Alexander Potashev in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-08/msg00043.html>.
-
-2013-08-13  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
-
-	* x-glade.c (start_element_glade1): Use extract_all variable.
-	(start_element_glade2): Ignore --extract-all option.
-	(start_element_gtkbuilder): Likewise.
-	(start_element_handler): Initialize p->extract_string to false.
-
-2013-08-12  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext.c (remember_a_message): Handle multi-line extracted
-	comments.
-	Reported by Gabor Kelemen in
-	<http://lists.gnu.org/archive/html/bug-gettext/2013-08/msg00026.html>.
-
-2013-08-09  Daiki Ueno  <ueno@gnu.org>
-
-	* x-gsettings.c (extract_gsettings): Add guard when expat is not
-	available at compile time.
-
-2013-08-08  Miguel Angel Arruga Vivas  <rosen644835@gmail.com> (tiny change)
-
-	Fix copyright year in xgettext version string.
-	* xgettext.c (main): Update copyright year.
-
-2013-08-06  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: add support for GSettings schema file
-	* x-gsettings.h: New file.
-	* x-gsettings.c: New file.
-	* xgettext.c: Include x-gsettings.h.
-	(flag_table_vala): New variable.
-	(usage): Mention GSettings source language.
-	(language_to_extractor): Add GSettings rule.
-	(extension_to_language): Add GSettings rule.
-	* Makefile.am (noinst_HEADERS): Add x-gsettings.h.
-	(xgettext_SOURCES): Add x-gsettings.c.
-	* FILES: Update.
-
-2013-08-05  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext.c (main): Allow exntension with multiple
-	dots. e.g. .gschema.xml.
-
-2013-03-02  Miguel Angel Arruga Vivas  <rosen644385@gmail.com>
-
-	Extract libexpat compatibility layer.
-	* libexpat-compat.h, libexpat-compat.c: Extracted from x-glade.c
-	* x-glade.c: Use libexpat-compat.h
-
-2013-07-11  Daiki Ueno  <ueno@gnu.org>
-
-	Fix crash when parsing '..' with non-string argument.
-	Reported by Koen Dergent at <http://savannah.gnu.org/bugs/?39458>.
-	* x-lua.c (extract_balanced): Skip stray '..'.
-
-2013-06-27  Daiki Ueno  <ueno@gnu.org>
-
-	* x-python.c (phase5_pushback): Increment size to 2.
-
-2013-06-25  Daiki Ueno  <ueno@gnu.org>
-
-	Fix handling of \u escape sequences in Tcl.
-	* x-tcl.c (do_getc_escaped): Fix handling of \u.
-	Reported by Guido Berhoerster in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-06/msg00022.html>.
-
-2013-06-17  Daiki Ueno  <ueno@gnu.org>
-
-	* x-python.c (init_flag_table_python): Enable python-brace-format
-	by default.
-
-2013-06-17  Daiki Ueno  <ueno@gnu.org>
-
-	* x-glade.c (start_element_null): New function.
-	(end_element_null): New function.
-	(element_parser_null): New variable.
-	(start_element_handler): Use element_parser_null if the top-level
-	element does not indicate a valid Glade file.
-	(do_extract_glade): Initialize element_parser to
-	element_parser_null rather than NULL.
-
-2013-06-13  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
-            Daiki Ueno  <ueno@gnu.org>
-
-	Support for GtkBuilder file format in the Glade scanner.
-	* x-glade.h (EXTENSIONS_GLADE): Recognize .ui.
-	* x-glade.c (element_parser): New struct.
-	(start_element_glade1): New function split from start_element_handler.
-	(end_element_glade1): New function split from end_element_handler.
-	(start_element_glade2): New function split from start_element_handler.
-	(end_element_glade2): New function split from end_element_handler.
-	(start_element_gtkbuilder): New function.
-	(end_element_gtkbuilder): New function.
-	(element_parser_glade1): New variable.
-	(element_parser_glade2): New variable.
-	(element_parser_gtkbuilder): New variable.
-	(start_element_handler): Delegate the actual parsing logic to
-	specific element_parser.
-	(end_element_handler): Likewise.
-	Thanks to Miguel Ángel Arruga Vivas for the initial implementation
-	and the discussion in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-03/msg00074.html>
-	footnote 2.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2013-06-04  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Vala.
-	* x-vala.h: New file.
-	* x-vala.c: New file.
-	* xgettext.c: Include x-vala.h.
-	(flag_table_vala): New variable.
-	(main): Invoke init_flag_table_vala, x_vala_extract_all,
-	x_vala_keyword.
-	(usage): Mention Vala source language.
-	(language_to_extractor): Add Vala rule.
-	(extension_to_language): Add Vala rule.
-	* Makefile.am (noinst_HEADERS): Add x-vala.h.
-	(xgettext_SOURCES): Add x-vala.c.
-	* FILES: Update.
-
-2013-05-21  Daiki Ueno  <ueno@gnu.org>
-
-	* x-javascript.c (phase7_getuc): Treat non-legitimate character
-	escape sequences more strictly.
-
-2013-05-20  Pavel Kharitonov  <ineiev@gnu.org>  (tiny change)
-
-	Add --previous option to msgattrib.
-	* msgattrib.c (long_options, main, process_message_list):
-	(usage): Add --previous option.
-
-2013-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	Fix end-of-string handling in JavaScript scanner.
-	* x-javascript.c (phase7_getuc): Remove unused BACKSLASH_COUNTER
-	argument; all callers changed.
-	Reported by Andreas Stricker in
-	<http://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00051.html>.
-
-2013-05-03  Daiki Ueno  <ueno@gnu.org>
-
-	* user-email.sh.in (lowercase_sed): Don't use non-portable
-	character escape in sed 's' command.
-	Reported by Ben Fox-Moore in
-	<http://lists.gnu.org/archive/html/bug-gettext/2013-05/msg00003.html>
-	and thanks to Ineiev for the suggestion.
-
-2013-04-26  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Python brace format.
-	* message.h (format_type): New enum value 'format_python_brace.
-	(NFORMATS): Increment.
-	* message.c (format_language): Add format_python_brace entry.
-	(format_language_pretty): Likewise.
-	* format.h (formatstring_python_brace): New declaration.
-	* format-python-brace.c: New file.
-	* format.c (formatstring_parsers): Add formatstring_python_brace.
-	* x-python.h (SCANNERS_PYTHON): Refar to formatstring_python_brace.
-	* xgettext.c (xgettext_record_flag): Handle format_python_brace.
-	* FILES: Update.
-
-2013-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	Make msgfmt --check-header more reliable.
-	* msgl-check.c (check_header_entry): Don't use c_strstr to parse
-	message header.
-
-2013-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	Support CR/LF line terminators in Python sources even on Unix.
-	* x-python.c (phase0_getc, phase0_ungetc): New functions.
-	(phase1_getc): Use them instead of calling getc/ungetc directly.
-
-2013-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	Support explicit string concatenation in Python.
-	* x-python.c (enum token_type_ty): New enumeration item
-	token_type_plus.
-	(free_token): New function.
-	(phase5_get): Recognize token_type_plus.
-	(x_python_lex): Handle string concatenation with '+'.
-	(extract_balanced): Handle token_type_plus.
-
-2013-04-18  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext.c (usage): Wrap long lines in --help output.
-
-2013-04-17  Andreas Stricker  <astricker@futurelab.ch>
-
-	Support for JavaScript.
-	* message.h (format_type): New enum value 'format_javascript'.
-	(NFORMATS): Increment.
-	* message.c (format_language): Add format_javascript entry.
-	(format_language_pretty): Likewise.
-	* format.h (formatstring_javascript): New declaration.
-	* format-javascript.c: New file.
-	* format.c (formatstring_parsers): Add formatstring_javascript.
-	* x-javascript.h: New file.
-	* x-javascript.c: New file.
-	* xgettext.c: Include x-javascript.h.
-	(flag_table_javascript): New variable.
-	(main): Invoke init_flag_table_javascript, x_javascript_extract_all,
-	x_javascript_keyword.
-	(usage): Mention JavaScript source language.
-	(xgettext_record_flag): Handle format_javascript.
-	(language_to_extractor): Add JavaScript rule.
-	(extension_to_language): Add JavaScript rule.
-	* Makefile.am (noinst_HEADERS): Add x-javascript.h.
-	(FORMAT_SOURCE): Add format-javascript.c.
-	(xgettext_SOURCES): Add x-javascript.c.
-	* FILES: Update.
-
-2013-04-16  Ľubomír Remák  <lubomirr@lubomirr.eu>
-
-	Support for escape sequences added in Lua 5.2.
-	* x-lua.c (phase3_get): Add \x and \z escape sequences.
-
-2013-04-11  Ľubomír Remák  <lubomirr@lubomirr.eu>
-
-	Support for Lua.
-	* message.h (format_type): New enum value 'format_lua'.
-	(NFORMATS): Increment.
-	* message.c (format_language): Add format_lua entry.
-	(format_language_pretty): Likewise.
-	* format.h (formatstring_lua): New declaration.
-	* format-lua.c: New file.
-	* format.c (formatstring_parsers): Add formatstring_lua.
-	* x-lua.h: New file.
-	* x-lua.c: New file.
-	* xgettext.c: Include x-lua.h.
-	(flag_table_lua): New variable.
-	(main): Invoke init_flag_table_lua, x_lua_extract_all,
-	x_lua_keyword.
-	(usage): Mention Lua source language.
-	(xgettext_record_flag): Handle format_lua.
-	(language_to_extractor): Add Lua rule.
-	(extension_to_language): Add Lua rule.
-	* Makefile.am (noinst_HEADERS): Add x-lua.h.
-	(FORMAT_SOURCE): Add format-lua.c.
-	(xgettext_SOURCES): Add x-lua.c.
-	* FILES: Update.
-
-2013-03-15  Miguel Ángel Arruga Vivas  <rosen644835@gmail.com>
-            Daiki Ueno  <ueno@gnu.org>
-
-	Extract msgctxt from Glade input files.
-	Reported at <https://savannah.gnu.org/bugs/?34506>
-	* x-glade.c (struct element_state): Add field 'extract_context'.
-	(start_element_handler): Check "context" attribute if the string
-	contains msgctxt.
-	(end_element_handler): Extract msgctxt if extract_context is set.
-
-2013-02-25  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (libgettextsrc_la_CPPFLAGS): Define to specify Woe32
-	DLL export flags.
-
-2013-01-09  Andreas Stricker  <astricker@futurelab.ch>  (tiny change)
-
-	* po-xerror.c: Include error.h for error_message_count.
-	* read-catalog-abstract.c: Likewise.
-
-2013-01-06  Daiki Ueno  <ueno@gnu.org>
-
-	* msgl-fsearch.c (message_fuzzy_index_ty): Don't use float-derived
-	integer SHORT_MSG_MAX to define array.
-	(message_fuzzy_index_alloc): Allocate memory for 'short_messages'
-	field dynamically.
-	(message_fuzzy_index_free): Free it.
-
-2013-01-03  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext.c (construct_header): Fix memory leak.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-06-03  Jim Meyering  <jim@meyering.net>
-
-	* msginit.c: Spelling fixes.
-	* write-catalog.c: Likewise.
-
-2012-05-03  Bruno Haible  <bruno@clisp.org>
-
-	Document msgfmt option --endianness.
-	* msgfmt.c (usage): Document the option --endianness.
-	Reported by Paul Martin <pm@debian.org> via
-	Santiago Vila <sanvila@unex.es>.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* hostname.c (usage): Quote 'like this', not `like this', as per the
-	recent change to the GNU coding standards.
-	* msgattrib.c (usage): Likewise.
-	* msgcat.c (usage): Likewise.
-	* msgcmp.c (usage): Likewise.
-	* msgcomm.c (usage): Likewise.
-	* msgconv.c (usage): Likewise.
-	* msgen.c (usage): Likewise.
-	* msgexec.c (usage): Likewise.
-	* msgfilter.c (usage): Likewise.
-	* msgfmt.c (usage, msgfmt_set_domain, msgfmt_frob_new_message):
-	Likewise.
-	* msggrep.c (usage): Likewise.
-	* msginit.c (usage): Likewise.
-	* msgl-cat.c (catenate_msgdomain_list): Likewise.
-	* msgl-check.c (check_pair, check_header_entry): Likewise.
-	* msgmerge.c (usage): Likewise.
-	* msgunfmt.c (usage): Likewise.
-	* msguniq.c (usage): Likewise.
-	* recode-sr-latin.c (usage): Likewise.
-	* urlget.c (usage): Likewise.
-	* write-po.c (wrap): Likewise.
-	* xgettext.c (main, usage, remember_a_message, construct_header,
-	language_to_extractor): Likewise.
-	* po-gram-gen.y: Likewise.
-	* po-error.h: Likewise.
-	* po-lex.h: Likewise.
-	* read-catalog-abstract.h: Likewise.
-	* x-c.c: Likewise.
-
-2011-10-04  Bruno Haible  <bruno@clisp.org>
-
-	xgettext for Scheme: Understand guile 2.0 comment syntax, part 2.
-	* x-scheme.c (read_object): Extract and don't ignore block comments.
-	Understand the #|...|# syntax of SRFI-30. (Code copied from x-lisp.c.)
-
-2011-10-04  Bruno Haible  <bruno@clisp.org>
-
-	xgettext for Scheme: Understand guile 2.0 comment syntax, part 1.
-	* x-scheme.c (read_object): Understand !# as a block comment terminator
-	even when not surrounded by newlines.
-	Reported by David Pirotte <david@altosw.be>
-	via Santiago Vila <sanvila@unex.es>.
-
-2011-07-29  Bruno Haible  <bruno@clisp.org>
-
-	Fix xgettext crash when extracting a message with plural that is
-	excluded.
-	* xgettext.h (remember_a_message): Document the return value.
-	* xgettext.c (arglist_parser_done): Handle the case where
-	remember_a_message returned NULL.
-	* x-smalltalk.c (extract_smalltalk): Likewise.
-	* x-ycp.c (extract_parenthesized): Likewise.
-	Reported by Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr> via
-	Santiago Vila <sanvila@unex.es>.
-
-2011-06-13  Bruno Haible  <bruno@clisp.org>
-
-	Avoid compilation error on Solaris 7 with cc.
-	* msgl-fsearch.c (SHORT_MSG_MAX): Define more directly with SunPRO C.
-
-2011-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Avoid link error when linking statically on AIX 7.
-	* Makefile.am (xgettext_LDADD): Add LTLIBICONV.
-
-2011-04-13  Bruno Haible  <bruno@clisp.org>
-
-	* msgcat.c (usage): Fix description of --use-first.
-	* msgcomm.c (usage): Fix typo.
-	Reported by Matthijs Kooijman.
-
-2011-06-04  Bruno Haible  <bruno@clisp.org>
-
-	Update after __attibute__ is no longer defined by gnulib.
-	* msgl-check.c (formatstring_error_logger): Use __attribute__ only with
-	compiler versions that support it.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	Use u8_mbtoucr instead of u8_mbtouc in some places.
-	* po-lex.c (mbfile_getc): Call u8_mbtoucr instead of u8_mbtouc.
-	* x-csharp.c (phase2_getc): Likewise.
-	* x-python.c (phase2_getc): Likewise.
-	Needed after libunistring changed on 2010-11-13.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* msgexec.c: Include spawn-pipe.h instead of pipe.h.
-	* msginit.c: Likewise.
-	* read-csharp.c: Likewise.
-	* read-java.c: Likewise.
-	* read-resources.c: Likewise.
-	* read-tcl.c: Likewise.
-	* write-resources.c: Likewise.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* write-po.c (wrap): Treat uClibc like a non-glibc platform.
-	* format-c-parse.h (HANDLE_I_FLAG): Likewise.
-	* po-charset.c (po_lex_charset_set): Likewise.
-	* recode-sr-latin.c (process): Likewise.
-	* x-python.c (set_current_file_source_encoding): Likewise.
-	* xgettext.c (main): Likewise.
-
-2010-11-13  Ihar Hrachyshka  <ihar.hrachyshka@gmail.com>  (tiny change)
-
-	* plural-table.c (plural_table): Added Belarusian, copied from Russian
-	and Ukrainian.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	format-c.c: Share code with libintlext.
-	* format-c-parse.h: New file, extracted from format-c.c.
-	* format-c.c: Include it.
-	(format_parse_entrails): Remove function.
-	* Makefile.am (FORMAT_SOURCE): Add format-c-parse.h.
-	* FILES: Update.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	format-c.c: Prepare for sharing code with libintlext.
-	* format-c.c: Move INVALID_* macros.
-	(IF_OOM): New macro.
-	(SYSDEP_SEGMENTS_PROCESSED): New macro.
-	(FAT_BASIC_MASK): New enumeration value.
-	(HANDLE_I_FLAG): New macro.
-	(format_parse_entrails): New function, extracted from format_parse.
-	Use the IF_OOM, SYSDEP_SEGMENTS_PROCESSED, HANDLE_I_FLAG macros. Handle
-	I64 as a size specifier on native Win32.
-	(format_parse): Rewritten to call format_parse_entrails.
-
-2010-11-07  Bruno Haible  <bruno@clisp.org>
-
-	format-c.c: Prepare for sharing code with libintlext.
-	* format-c.c (INVALID_ANGLE_BRACKET, INVALID_IGNORED_ARGUMENT): New
-	macros.
-	(format_parse): Use them.
-
-2011-06-07  Bruno Haible  <bruno@clisp.org>
-
-	Rely more on libtool.
-	* Makefile.am (libgettextsrc_la_LDFLAGS): Use -no-undefined always.
-	Don't use @LTNOUNDEF@.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	Bug fixes in libgettextpo.
-	* msgl-check.h (check_message_list): Add ignore_untranslated_messages,
-	ignore_fuzzy_messages arguments.
-	* msgl-check.c (check_plural, check_message_list): Likewise.
-	* msgfmt.c (main): Update.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/src/ChangeLog.0 gettext-0.18.1.1/gettext-tools/src/ChangeLog.0
--- gettext-0.19.3/gettext-tools/src/ChangeLog.0	2013-04-15 06:45:13.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/ChangeLog.0	2010-06-06 12:49:58.000000000 +0000
@@ -3779,7 +3779,7 @@
 
 	* message.c: Use unsigned char for various local variables.
 	* xgettext.c (comment_tag): Define as unsigned char *.
-	For losing Solaris systems.  Patches by Jim Meyering.
+	For loosing Solaris systems.  Patches by Jim Meyering.
 
 	* msgfmt.c: Use extra braces in if to shut up gcc.
 	* po-lex.h: Don't declare function po_gram_error and
diff -Nru gettext-0.19.3/gettext-tools/src/FILES gettext-0.18.1.1/gettext-tools/src/FILES
--- gettext-0.19.3/gettext-tools/src/FILES	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/FILES	2010-06-06 12:49:58.000000000 +0000
@@ -59,9 +59,6 @@
 | write-stringtable.c
 |               Output of a list-of-messages to a NeXTstep/GNUstep .strings
 |               file.
-| write-desktop.h
-| write-desktop.c
-|               Output of a list-of-messages to a .desktop file.
 +-------------- Writing PO files
 
 +-------------- Reading PO files
@@ -110,9 +107,6 @@
 | read-catalog.c
 |               Reading of a PO file, returning a list-of-messages.
 |
-| read-desktop.h
-| read-desktop.c
-|               Reading of a .desktop file, returning a list-of-messages.
 +-------------- Reading PO files
 
 msgl-iconv.h
@@ -217,10 +211,8 @@
 format.h        Declarations of the language dependent format string handlers.
 format-invalid.h  Declarations of some error messages for invalid strings.
 format-c.c             Format string handling for C.
-format-c-parse.h         Format string handling for C, parsing routine.
 format-sh.c            Format string handling for Shell.
 format-python.c        Format string handling for Python.
-format-python-brace.c  Format string handling for Python, braced syntax.
 format-lisp.c          Format string handling for Common Lisp.
 format-elisp.c         Format string handling for Emacs Lisp.
 format-librep.c        Format string handling for librep.
@@ -240,8 +232,6 @@
 format-qt-plural.c     Format string handling for Qt plural forms.
 format-kde.c           Format string handling for KDE.
 format-boost.c         Format string handling for Boost.
-format-lua.c           Format string handling for Lua.
-format-javascript.c    Format string handling for JavaScript.
 format.c        Table of the language dependent format string handlers.
 
 plural-exp.c
@@ -342,21 +332,6 @@
 | x-glade.h
 | x-glade.c
 |               String extractor from .glade files, GNOME GUI descriptions.
-| x-lua.h
-| x-lua.c
-|               String extractor for Lua.
-| x-javascript.h
-| x-javascript.c
-|               String extractor for JavaScript.
-| x-vala.h
-| x-vala.c
-|               String extractor for Vala.
-| x-gsettings.h
-| x-gsettings.c
-|               String extractor for GSettings schema file.
-| x-desktop.h
-| x-desktop.c
-|               String extractor from Desktop Entry file.
 | xgettext.c
 |               Main source for the 'xgettext' program.
 |
diff -Nru gettext-0.19.3/gettext-tools/src/filter-quote.c gettext-0.18.1.1/gettext-tools/src/filter-quote.c
--- gettext-0.19.3/gettext-tools/src/filter-quote.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/filter-quote.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-/* Convert ASCII quotations to Unicode quotations.
-   Copyright (C) 2014 Free Software Foundation, Inc.
-   Written by Daiki Ueno <ueno@gnu.org>, 2014.
-
-   This 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 "filters.h"
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include "xalloc.h"
-
-#define BOLD_START "\x1b[1m"
-#define BOLD_END "\x1b[0m"
-
-/* This is a direct translation of po/quot.sed and po/boldquot.sed.  */
-static void
-convert_ascii_quote_to_unicode (const char *input, size_t input_len,
-                                char **output_p, size_t *output_len_p,
-                                bool bold)
-{
-  const char *start, *end, *p;
-  char *output, *r;
-  bool state;
-  size_t quote_count;
-
-  start = input;
-  end = &input[input_len - 1];
-
-  /* True if we have seen a character which could be an opening
-     quotation mark.  Note that we can't determine if it is really an
-     opening quotation mark until we see a closing quotation mark.  */
-  state = false;
-
-  /* Count the number of quotation characters.  */
-  quote_count = 0;
-  for (p = start; p <= end; p++)
-    {
-      size_t len;
-
-      p = strpbrk (p, "`'\"");
-      if (!p)
-        break;
-
-      len = strspn (p, "`'\"");
-      quote_count += len;
-      p += len;
-    }
-
-  /* Large enough.  */
-  r = output = XNMALLOC (input_len - quote_count
-                         + (bold ? 7 : 3) * quote_count + 1,
-                         char);
-
-#undef COPY_SEEN
-#define COPY_SEEN                             \
-  do                                            \
-    {                                           \
-      memcpy (r, start, p - start);             \
-      r += p - start;                           \
-      start = p;                                \
-    }                                           \
-  while (0)
-
-  for (p = start; p <= end; p++)
-    {
-      switch (*p)
-        {
-        case '"':
-          if (state)
-            {
-              if (*start == '"')
-                {
-                  if (p > start + 1)
-                    {
-                      /* U+201C: LEFT DOUBLE QUOTATION MARK */
-                      memcpy (r, "\xe2\x80\x9c", 3);
-                      r += 3;
-                      if (bold)
-                        {
-                          memcpy (r, BOLD_START, 4);
-                          r += 4;
-                        }
-                      memcpy (r, start + 1, p - start - 1);
-                      r += p - start - 1;
-                      if (bold)
-                        {
-                          memcpy (r, BOLD_END, 4);
-                          r += 4;
-                        }
-                      /* U+201D: RIGHT DOUBLE QUOTATION MARK */
-                      memcpy (r, "\xe2\x80\x9d", 3);
-                      r += 3;
-                    }
-                  else
-                    {
-                      /* Consider "" as "".  */
-                      memcpy (r, "\"\"", 2);
-                      r += 2;
-                    }
-                  start = p + 1;
-                  state = false;
-                }
-            }
-          else
-            {
-              COPY_SEEN;
-              state = true;
-            }
-          break;
-
-        case '`':
-          if (state)
-            {
-              if (*start == '`')
-                COPY_SEEN;
-            }
-          else
-            {
-              COPY_SEEN;
-              state = true;
-            }
-          break;
-
-        case '\'':
-          if (state)
-            {
-              if (/* `...' */
-                  *start == '`'
-                  /* '...', where:
-                     - The left quote is preceded by a space, and the
-                       right quote is followed by a space.
-                     - The left quote is preceded by a space, and the
-                       right quote is at the end of line.
-                     - The left quote is at the beginning of the line, and
-                       the right quote is followed by a space.
-                   */
-                  || (*start == '\''
-                      && (((start > input && *(start - 1) == ' ')
-                           && (p == end || *(p + 1) == '\n' || *(p + 1) == ' '))
-                          || ((start == input || *(start - 1) == '\n')
-                              && p < end && *(p + 1) == ' '))))
-                {
-                  /* U+2018: LEFT SINGLE QUOTATION MARK */
-                  memcpy (r, "\xe2\x80\x98", 3);
-                  r += 3;
-                  if (bold)
-                    {
-                      memcpy (r, BOLD_START, 4);
-                      r += 4;
-                    }
-                  memcpy (r, start + 1, p - start - 1);
-                  r += p - start - 1;
-                  if (bold)
-                    {
-                      memcpy (r, BOLD_END, 4);
-                      r += 4;
-                    }
-                  /* U+2019: RIGHT SINGLE QUOTATION MARK */
-                  memcpy (r, "\xe2\x80\x99", 3);
-                  r += 3;
-                  start = p + 1;
-                }
-              else
-                COPY_SEEN;
-              state = false;
-            }
-          else if (p == input || *(p - 1) == '\n' || *(p - 1) == ' ')
-            {
-              COPY_SEEN;
-              state = true;
-            }
-          break;
-        }
-    }
-
-#undef COPY_SEEN
-
-  /* Copy the rest to R.  */
-  if (p > start)
-    {
-      memcpy (r, start, p - start);
-      r += p - start;
-    }
-  *r = '\0';
-
-  *output_p = output;
-  *output_len_p = r - output;
-}
-
-void
-ascii_quote_to_unicode (const char *input, size_t input_len,
-                        char **output_p, size_t *output_len_p)
-{
-  convert_ascii_quote_to_unicode (input, input_len,
-                                  output_p, output_len_p,
-                                  false);
-}
-
-void
-ascii_quote_to_unicode_bold (const char *input, size_t input_len,
-                             char **output_p, size_t *output_len_p)
-{
-  convert_ascii_quote_to_unicode (input, input_len,
-                                  output_p, output_len_p,
-                                  true);
-}
diff -Nru gettext-0.19.3/gettext-tools/src/filters.h gettext-0.18.1.1/gettext-tools/src/filters.h
--- gettext-0.19.3/gettext-tools/src/filters.h	2014-04-15 08:10:02.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/filters.h	2010-06-06 12:49:58.000000000 +0000
@@ -29,22 +29,6 @@
 extern void serbian_to_latin (const char *input, size_t input_len,
                               char **output_p, size_t *output_len_p);
 
-/* Convert a string INPUT of INPUT_LEN bytes, converting ASCII
-   quotations to Unicode quotations.
-   Store the freshly allocated result in *OUTPUT_P and its length (in bytes)
-   in *OUTPUT_LEN_P.
-   Input and output are in UTF-8 encoding.  */
-extern void ascii_quote_to_unicode (const char *input, size_t input_len,
-                                    char **output_p, size_t *output_len_p);
-
-/* Convert a string INPUT of INPUT_LEN bytes, converting ASCII
-   quotations to Unicode quotations, adding bold escape sequence.
-   Store the freshly allocated result in *OUTPUT_P and its length (in bytes)
-   in *OUTPUT_LEN_P.
-   Input and output are in UTF-8 encoding.  */
-extern void ascii_quote_to_unicode_bold (const char *input, size_t input_len,
-                                         char **output_p, size_t *output_len_p);
-
 #ifdef __cplusplus
 }
 #endif
diff -Nru gettext-0.19.3/gettext-tools/src/format.c gettext-0.18.1.1/gettext-tools/src/format.c
--- gettext-0.19.3/gettext-tools/src/format.c	2013-05-20 02:09:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format.c	2010-06-06 12:49:58.000000000 +0000
@@ -38,7 +38,6 @@
   /* format_objc */             &formatstring_objc,
   /* format_sh */               &formatstring_sh,
   /* format_python */           &formatstring_python,
-  /* format_python_brace */     &formatstring_python_brace,
   /* format_lisp */             &formatstring_lisp,
   /* format_elisp */            &formatstring_elisp,
   /* format_librep */           &formatstring_librep,
@@ -58,9 +57,7 @@
   /* format_qt */               &formatstring_qt,
   /* format_qt_plural */        &formatstring_qt_plural,
   /* format_kde */              &formatstring_kde,
-  /* format_boost */            &formatstring_boost,
-  /* format_lua */              &formatstring_lua,
-  /* format_javascript */       &formatstring_javascript
+  /* format_boost */            &formatstring_boost
 };
 
 /* Check whether both formats strings contain compatible format
diff -Nru gettext-0.19.3/gettext-tools/src/format-c.c gettext-0.18.1.1/gettext-tools/src/format-c.c
--- gettext-0.19.3/gettext-tools/src/format-c.c	2013-04-15 06:45:13.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format-c.c	2010-06-06 12:49:58.000000000 +0000
@@ -26,54 +26,818 @@
 #include "c-ctype.h"
 #include "xalloc.h"
 #include "xvasprintf.h"
+#include "format-invalid.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
 
-#include "format-invalid.h"
+/* C format strings are described in POSIX (IEEE P1003.1 2001), section
+   XSH 3 fprintf().  See also Linux fprintf(3) manual page.
+   A directive
+   - starts with '%' or '%m$' where m is a positive integer,
+   - is optionally followed by any of the characters '#', '0', '-', ' ', '+',
+     "'", or - only in msgstr strings - the string "I", each of which acts as
+     a flag,
+   - is optionally followed by a width specification: '*' (reads an argument)
+     or '*m$' or a nonempty digit sequence,
+   - is optionally followed by '.' and a precision specification: '*' (reads
+     an argument) or '*m$' or a nonempty digit sequence,
+   - is either continued like this:
+       - is optionally followed by a size specifier, one of 'hh' 'h' 'l' 'll'
+         'L' 'q' 'j' 'z' 't',
+       - is finished by a specifier
+           - '%', that needs no argument,
+           - 'c', 'C', that need a character argument,
+           - 's', 'S', that need a string argument,
+           - 'i', 'd', that need a signed integer argument,
+           - 'o', 'u', 'x', 'X', that need an unsigned integer argument,
+           - 'e', 'E', 'f', 'F', 'g', 'G', 'a', 'A', that need a floating-point
+             argument,
+           - 'p', that needs a 'void *' argument,
+           - 'n', that needs a pointer to integer.
+     or is finished by a specifier '<' inttypes-macro '>' where inttypes-macro
+     is an ISO C 99 section 7.8.1 format directive.
+   Numbered ('%m$' or '*m$') and unnumbered argument specifications cannot
+   be used in the same string.  When numbered argument specifications are
+   used, specifying the Nth argument requires that all the leading arguments,
+   from the first to the (N-1)th, are specified in the format string.
+ */
 
-#define INVALID_C99_MACRO(directive_number) \
-  xasprintf (_("In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."), directive_number)
+enum format_arg_type
+{
+  FAT_NONE              = 0,
+  /* Basic types */
+  FAT_INTEGER           = 1,
+  FAT_DOUBLE            = 2,
+  FAT_CHAR              = 3,
+  FAT_STRING            = 4,
+  FAT_OBJC_OBJECT       = 5,
+  FAT_POINTER           = 6,
+  FAT_COUNT_POINTER     = 7,
+  /* Flags */
+  FAT_UNSIGNED          = 1 << 3,
+  FAT_SIZE_SHORT        = 1 << 4,
+  FAT_SIZE_CHAR         = 2 << 4,
+  FAT_SIZE_LONG         = 1 << 6,
+  FAT_SIZE_LONGLONG     = 2 << 6,
+  FAT_SIZE_8_T          = 1 << 8,
+  FAT_SIZE_16_T         = 1 << 9,
+  FAT_SIZE_32_T         = 1 << 10,
+  FAT_SIZE_64_T         = 1 << 11,
+  FAT_SIZE_LEAST8_T     = 1 << 12,
+  FAT_SIZE_LEAST16_T    = 1 << 13,
+  FAT_SIZE_LEAST32_T    = 1 << 14,
+  FAT_SIZE_LEAST64_T    = 1 << 15,
+  FAT_SIZE_FAST8_T      = 1 << 16,
+  FAT_SIZE_FAST16_T     = 1 << 17,
+  FAT_SIZE_FAST32_T     = 1 << 18,
+  FAT_SIZE_FAST64_T     = 1 << 19,
+  FAT_SIZE_INTMAX_T     = 1 << 20,
+  FAT_SIZE_INTPTR_T     = 1 << 21,
+  FAT_SIZE_SIZE_T       = 1 << 22,
+  FAT_SIZE_PTRDIFF_T    = 1 << 23,
+  FAT_WIDE              = FAT_SIZE_LONG,
+  /* Meaningful combinations of basic types and flags:
+  'signed char'                 = FAT_INTEGER | FAT_SIZE_CHAR,
+  'unsigned char'               = FAT_INTEGER | FAT_SIZE_CHAR | FAT_UNSIGNED,
+  'short'                       = FAT_INTEGER | FAT_SIZE_SHORT,
+  'unsigned short'              = FAT_INTEGER | FAT_SIZE_SHORT | FAT_UNSIGNED,
+  'int'                         = FAT_INTEGER,
+  'unsigned int'                = FAT_INTEGER | FAT_UNSIGNED,
+  'long int'                    = FAT_INTEGER | FAT_SIZE_LONG,
+  'unsigned long int'           = FAT_INTEGER | FAT_SIZE_LONG | FAT_UNSIGNED,
+  'long long int'               = FAT_INTEGER | FAT_SIZE_LONGLONG,
+  'unsigned long long int'      = FAT_INTEGER | FAT_SIZE_LONGLONG | FAT_UNSIGNED,
+  'double'                      = FAT_DOUBLE,
+  'long double'                 = FAT_DOUBLE | FAT_SIZE_LONGLONG,
+  'char'/'int'                  = FAT_CHAR,
+  'wchar_t'/'wint_t'            = FAT_CHAR | FAT_SIZE_LONG,
+  'const char *'                = FAT_STRING,
+  'const wchar_t *'             = FAT_STRING | FAT_SIZE_LONG,
+  'void *'                      = FAT_POINTER,
+  FAT_COUNT_SCHAR_POINTER       = FAT_COUNT_POINTER | FAT_SIZE_CHAR,
+  FAT_COUNT_SHORT_POINTER       = FAT_COUNT_POINTER | FAT_SIZE_SHORT,
+  FAT_COUNT_INT_POINTER         = FAT_COUNT_POINTER,
+  FAT_COUNT_LONGINT_POINTER     = FAT_COUNT_POINTER | FAT_SIZE_LONG,
+  FAT_COUNT_LONGLONGINT_POINTER = FAT_COUNT_POINTER | FAT_SIZE_LONGLONG,
+  */
+  /* Bitmasks */
+  FAT_SIZE_MASK         = (FAT_SIZE_SHORT | FAT_SIZE_CHAR
+                           | FAT_SIZE_LONG | FAT_SIZE_LONGLONG
+                           | FAT_SIZE_8_T | FAT_SIZE_16_T
+                           | FAT_SIZE_32_T | FAT_SIZE_64_T
+                           | FAT_SIZE_LEAST8_T | FAT_SIZE_LEAST16_T
+                           | FAT_SIZE_LEAST32_T | FAT_SIZE_LEAST64_T
+                           | FAT_SIZE_FAST8_T | FAT_SIZE_FAST16_T
+                           | FAT_SIZE_FAST32_T | FAT_SIZE_FAST64_T
+                           | FAT_SIZE_INTMAX_T | FAT_SIZE_INTPTR_T
+                           | FAT_SIZE_SIZE_T | FAT_SIZE_PTRDIFF_T)
+};
+#ifdef __cplusplus
+typedef int format_arg_type_t;
+#else
+typedef enum format_arg_type format_arg_type_t;
+#endif
+
+struct numbered_arg
+{
+  unsigned int number;
+  format_arg_type_t type;
+};
+
+struct unnumbered_arg
+{
+  format_arg_type_t type;
+};
 
-#define INVALID_ANGLE_BRACKET(directive_number) \
-  xasprintf (_("In the directive number %u, the token after '<' is not followed by '>'."), directive_number)
+struct spec
+{
+  unsigned int directives;
+  unsigned int unnumbered_arg_count;
+  unsigned int allocated;
+  struct unnumbered_arg *unnumbered;
+  bool unlikely_intentional;
+  unsigned int sysdep_directives_count;
+  const char **sysdep_directives;
+};
+
+/* Locale independent test for a decimal digit.
+   Argument can be  'char' or 'unsigned char'.  (Whereas the argument of
+   <ctype.h> isdigit must be an 'unsigned char'.)  */
+#undef isdigit
+#define isdigit(c) ((unsigned int) ((c) - '0') < 10)
 
-#define INVALID_IGNORED_ARGUMENT(referenced_arg, ignored_arg) \
-  xasprintf (_("The string refers to argument number %u but ignores argument number %u."), referenced_arg, ignored_arg)
 
-/* Execute statement if memory allocation function returned NULL.  */
-#define IF_OOM(allocated_ptr, statement)  /* nothing, since we use xalloc.h */
+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;
 
-/* Specifies whether the system dependent segments in msgid and msgstr have
-   been processed.  This means:
-     - If false, ISO C 99 <inttypes.h> directives are denoted with angle
-       brackets.  If true, they have already been expanded, leading in
-       particular to %I64d directives on native Windows platforms.
-     - If false, the 'I' flag may be present in msgstr (also on platforms
-       other than glibc).  If true, the 'I' directive may be present in msgstr
-       only on glibc >= 2.2 platforms.  */
-#define SYSDEP_SEGMENTS_PROCESSED false
+  return (n1 > n2 ? 1 : n1 < n2 ? -1 : 0);
+}
 
-/* Include the bulk of the C format string parsing code.  */
-#include "format-c-parse.h"
+#define INVALID_C99_MACRO(directive_number) \
+  xasprintf (_("In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."), directive_number)
 
 static void *
 format_parse (const char *format, bool translated, bool objc_extensions,
               char *fdi, char **invalid_reason)
 {
-  struct spec result_buf;
+  const char *const format_start = format;
+  struct spec spec;
+  unsigned int numbered_arg_count;
+  struct numbered_arg *numbered;
   struct spec *result;
 
-  result = format_parse_entrails (format, translated, objc_extensions, fdi, invalid_reason, &result_buf);
+  spec.directives = 0;
+  numbered_arg_count = 0;
+  spec.unnumbered_arg_count = 0;
+  spec.allocated = 0;
+  numbered = NULL;
+  spec.unnumbered = NULL;
+  spec.unlikely_intentional = false;
+  spec.sysdep_directives_count = 0;
+  spec.sysdep_directives = NULL;
+
+  for (; *format != '\0';)
+    if (*format++ == '%')
+      {
+        /* A directive.  */
+        unsigned int number = 0;
+        format_arg_type_t type;
+        format_arg_type_t size;
+
+        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.  */
+        for (;;)
+          {
+            if (*format == ' ' || *format == '+' || *format == '-'
+                || *format == '#' || *format == '0' || *format == '\'')
+              format++;
+            else if (translated && *format == 'I')
+              {
+                spec.sysdep_directives =
+                  (const char **)
+                  xrealloc (spec.sysdep_directives,
+                            2 * (spec.sysdep_directives_count + 1)
+                            * sizeof (const char *));
+                spec.sysdep_directives[2 * spec.sysdep_directives_count] = format;
+                spec.sysdep_directives[2 * spec.sysdep_directives_count + 1] = format + 1;
+                spec.sysdep_directives_count++;
+                format++;
+              }
+            else
+              break;
+          }
+
+        /* Parse width.  */
+        if (*format == '*')
+          {
+            unsigned int width_number = 0;
+
+            format++;
+
+            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_WIDTH_ARGNO_0 (spec.directives);
+                        FDI_SET (f, FMTDIR_ERROR);
+                        goto bad_format;
+                      }
+                    width_number = m;
+                    format = ++f;
+                  }
+              }
+
+            if (width_number)
+              {
+                /* Numbered argument.  */
+
+                /* Numbered and unnumbered specifications are exclusive.  */
+                if (spec.unnumbered_arg_count > 0)
+                  {
+                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                    FDI_SET (format - 1, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+
+                if (spec.allocated == numbered_arg_count)
+                  {
+                    spec.allocated = 2 * spec.allocated + 1;
+                    numbered = (struct numbered_arg *) xrealloc (numbered, spec.allocated * sizeof (struct numbered_arg));
+                  }
+                numbered[numbered_arg_count].number = width_number;
+                numbered[numbered_arg_count].type = FAT_INTEGER;
+                numbered_arg_count++;
+              }
+            else
+              {
+                /* Unnumbered argument.  */
+
+                /* Numbered and unnumbered specifications are exclusive.  */
+                if (numbered_arg_count > 0)
+                  {
+                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                    FDI_SET (format - 1, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+
+                if (spec.allocated == spec.unnumbered_arg_count)
+                  {
+                    spec.allocated = 2 * spec.allocated + 1;
+                    spec.unnumbered = (struct unnumbered_arg *) xrealloc (spec.unnumbered, spec.allocated * sizeof (struct unnumbered_arg));
+                  }
+                spec.unnumbered[spec.unnumbered_arg_count].type = FAT_INTEGER;
+                spec.unnumbered_arg_count++;
+              }
+          }
+        else if (isdigit (*format))
+          {
+            do format++; while (isdigit (*format));
+          }
+
+        /* Parse precision.  */
+        if (*format == '.')
+          {
+            format++;
+
+            if (*format == '*')
+              {
+                unsigned int precision_number = 0;
+
+                format++;
+
+                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_PRECISION_ARGNO_0 (spec.directives);
+                            FDI_SET (f, FMTDIR_ERROR);
+                            goto bad_format;
+                          }
+                        precision_number = m;
+                        format = ++f;
+                      }
+                  }
+
+                if (precision_number)
+                  {
+                    /* Numbered argument.  */
+
+                    /* Numbered and unnumbered specifications are exclusive.  */
+                    if (spec.unnumbered_arg_count > 0)
+                      {
+                        *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                        FDI_SET (format - 1, FMTDIR_ERROR);
+                        goto bad_format;
+                      }
+
+                    if (spec.allocated == numbered_arg_count)
+                      {
+                        spec.allocated = 2 * spec.allocated + 1;
+                        numbered = (struct numbered_arg *) xrealloc (numbered, spec.allocated * sizeof (struct numbered_arg));
+                      }
+                    numbered[numbered_arg_count].number = precision_number;
+                    numbered[numbered_arg_count].type = FAT_INTEGER;
+                    numbered_arg_count++;
+                  }
+                else
+                  {
+                    /* Unnumbered argument.  */
+
+                    /* Numbered and unnumbered specifications are exclusive.  */
+                    if (numbered_arg_count > 0)
+                      {
+                        *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                        FDI_SET (format - 1, FMTDIR_ERROR);
+                        goto bad_format;
+                      }
+
+                    if (spec.allocated == spec.unnumbered_arg_count)
+                      {
+                        spec.allocated = 2 * spec.allocated + 1;
+                        spec.unnumbered = (struct unnumbered_arg *) xrealloc (spec.unnumbered, spec.allocated * sizeof (struct unnumbered_arg));
+                      }
+                    spec.unnumbered[spec.unnumbered_arg_count].type = FAT_INTEGER;
+                    spec.unnumbered_arg_count++;
+                  }
+              }
+            else if (isdigit (*format))
+              {
+                do format++; while (isdigit (*format));
+              }
+          }
+
+        if (*format == '<')
+          {
+            spec.sysdep_directives =
+              (const char **)
+              xrealloc (spec.sysdep_directives,
+                        2 * (spec.sysdep_directives_count + 1)
+                        * sizeof (const char *));
+            spec.sysdep_directives[2 * spec.sysdep_directives_count] = format;
+
+            format++;
+            /* Parse ISO C 99 section 7.8.1 format string directive.
+               Syntax:
+               P R I { d | i | o | u | x | X }
+               { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR }  */
+            if (*format != 'P')
+              {
+                *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
+                goto bad_format;
+              }
+            format++;
+            if (*format != 'R')
+              {
+                *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
+                goto bad_format;
+              }
+            format++;
+            if (*format != 'I')
+              {
+                *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
+                goto bad_format;
+              }
+            format++;
+
+            switch (*format)
+              {
+              case 'i': case 'd':
+                type = FAT_INTEGER;
+                break;
+              case 'u': case 'o': case 'x': case 'X':
+                type = FAT_INTEGER | FAT_UNSIGNED;
+                break;
+              default:
+                *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
+                goto bad_format;
+              }
+            format++;
+
+            if (format[0] == 'M' && format[1] == 'A' && format[2] == 'X')
+              {
+                type |= FAT_SIZE_INTMAX_T;
+                format += 3;
+              }
+            else if (format[0] == 'P' && format[1] == 'T' && format[2] == 'R')
+              {
+                type |= FAT_SIZE_INTPTR_T;
+                format += 3;
+              }
+            else
+              {
+                if (format[0] == 'L' && format[1] == 'E' && format[2] == 'A'
+                    && format[3] == 'S' && format[4] == 'T')
+                  {
+                    format += 5;
+                    if (format[0] == '8')
+                      {
+                        type |= FAT_SIZE_LEAST8_T;
+                        format++;
+                      }
+                    else if (format[0] == '1' && format[1] == '6')
+                      {
+                        type |= FAT_SIZE_LEAST16_T;
+                        format += 2;
+                      }
+                    else if (format[0] == '3' && format[1] == '2')
+                      {
+                        type |= FAT_SIZE_LEAST32_T;
+                        format += 2;
+                      }
+                    else if (format[0] == '6' && format[1] == '4')
+                      {
+                        type |= FAT_SIZE_LEAST64_T;
+                        format += 2;
+                      }
+                    else
+                      {
+                        *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                        FDI_SET (*format == '\0' ? format - 1 : format,
+                                 FMTDIR_ERROR);
+                        goto bad_format;
+                      }
+                  }
+                else if (format[0] == 'F' && format[1] == 'A'
+                         && format[2] == 'S' && format[3] == 'T')
+                  {
+                    format += 4;
+                    if (format[0] == '8')
+                      {
+                        type |= FAT_SIZE_FAST8_T;
+                        format++;
+                      }
+                    else if (format[0] == '1' && format[1] == '6')
+                      {
+                        type |= FAT_SIZE_FAST16_T;
+                        format += 2;
+                      }
+                    else if (format[0] == '3' && format[1] == '2')
+                      {
+                        type |= FAT_SIZE_FAST32_T;
+                        format += 2;
+                      }
+                    else if (format[0] == '6' && format[1] == '4')
+                      {
+                        type |= FAT_SIZE_FAST64_T;
+                        format += 2;
+                      }
+                    else
+                      {
+                        *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                        FDI_SET (*format == '\0' ? format - 1 : format,
+                                 FMTDIR_ERROR);
+                        goto bad_format;
+                      }
+                  }
+                else
+                  {
+                    if (format[0] == '8')
+                      {
+                        type |= FAT_SIZE_8_T;
+                        format++;
+                      }
+                    else if (format[0] == '1' && format[1] == '6')
+                      {
+                        type |= FAT_SIZE_16_T;
+                        format += 2;
+                      }
+                    else if (format[0] == '3' && format[1] == '2')
+                      {
+                        type |= FAT_SIZE_32_T;
+                        format += 2;
+                      }
+                    else if (format[0] == '6' && format[1] == '4')
+                      {
+                        type |= FAT_SIZE_64_T;
+                        format += 2;
+                      }
+                    else
+                      {
+                        *invalid_reason = INVALID_C99_MACRO (spec.directives);
+                        FDI_SET (*format == '\0' ? format - 1 : format,
+                                 FMTDIR_ERROR);
+                        goto bad_format;
+                      }
+                  }
+              }
+
+            if (*format != '>')
+              {
+                *invalid_reason =
+                  xasprintf (_("In the directive number %u, the token after '<' is not followed by '>'."), spec.directives);
+                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
+                goto bad_format;
+              }
+
+            spec.sysdep_directives[2 * spec.sysdep_directives_count + 1] = format + 1;
+            spec.sysdep_directives_count++;
+          }
+        else
+          {
+            /* Parse size.  */
+            size = 0;
+            for (;; format++)
+              {
+                if (*format == 'h')
+                  {
+                    if (size & (FAT_SIZE_SHORT | FAT_SIZE_CHAR))
+                      size = FAT_SIZE_CHAR;
+                    else
+                      size = FAT_SIZE_SHORT;
+                  }
+                else if (*format == 'l')
+                  {
+                    if (size & (FAT_SIZE_LONG | FAT_SIZE_LONGLONG))
+                      size = FAT_SIZE_LONGLONG;
+                    else
+                      size = FAT_SIZE_LONG;
+                  }
+                else if (*format == 'L')
+                  size = FAT_SIZE_LONGLONG;
+                else if (*format == 'q')
+                  /* Old BSD 4.4 convention.  */
+                  size = FAT_SIZE_LONGLONG;
+                else if (*format == 'j')
+                  size = FAT_SIZE_INTMAX_T;
+                else if (*format == 'z' || *format == 'Z')
+                  /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
+                     because the warning facility in gcc-2.95.2 understands
+                     only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
+                  size = FAT_SIZE_SIZE_T;
+                else if (*format == 't')
+                  size = FAT_SIZE_PTRDIFF_T;
+                else
+                  break;
+              }
+
+            switch (*format)
+              {
+              case '%':
+                /* Programmers writing _("%2%") most often will not want to
+                   use this string as a c-format string, but rather as a
+                   literal or as a different kind of format string.  */
+                if (format[-1] != '%')
+                  spec.unlikely_intentional = true;
+                type = FAT_NONE;
+                break;
+              case 'm': /* glibc extension */
+                type = FAT_NONE;
+                break;
+              case 'c':
+                type = FAT_CHAR;
+                type |= (size & (FAT_SIZE_LONG | FAT_SIZE_LONGLONG)
+                         ? FAT_WIDE : 0);
+                break;
+              case 'C': /* obsolete */
+                type = FAT_CHAR | FAT_WIDE;
+                break;
+              case 's':
+                type = FAT_STRING;
+                type |= (size & (FAT_SIZE_LONG | FAT_SIZE_LONGLONG)
+                         ? FAT_WIDE : 0);
+                break;
+              case 'S': /* obsolete */
+                type = FAT_STRING | FAT_WIDE;
+                break;
+              case 'i': case 'd':
+                type = FAT_INTEGER;
+                type |= (size & FAT_SIZE_MASK);
+                break;
+              case 'u': case 'o': case 'x': case 'X':
+                type = FAT_INTEGER | FAT_UNSIGNED;
+                type |= (size & FAT_SIZE_MASK);
+                break;
+              case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
+              case 'a': case 'A':
+                type = FAT_DOUBLE;
+                type |= (size & FAT_SIZE_LONGLONG);
+                break;
+              case '@':
+                if (objc_extensions)
+                  {
+                    type = FAT_OBJC_OBJECT;
+                    break;
+                  }
+                goto other;
+              case 'p':
+                type = FAT_POINTER;
+                break;
+              case 'n':
+                type = FAT_COUNT_POINTER;
+                type |= (size & FAT_SIZE_MASK);
+                break;
+              other:
+              default:
+                if (*format == '\0')
+                  {
+                    *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
+                    FDI_SET (format - 1, FMTDIR_ERROR);
+                  }
+                else
+                  {
+                    *invalid_reason =
+                      INVALID_CONVERSION_SPECIFIER (spec.directives, *format);
+                    FDI_SET (format, FMTDIR_ERROR);
+                  }
+                goto bad_format;
+              }
+          }
+
+        if (type != FAT_NONE)
+          {
+            if (number)
+              {
+                /* Numbered argument.  */
+
+                /* Numbered and unnumbered specifications are exclusive.  */
+                if (spec.unnumbered_arg_count > 0)
+                  {
+                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                    FDI_SET (format, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+
+                if (spec.allocated == numbered_arg_count)
+                  {
+                    spec.allocated = 2 * spec.allocated + 1;
+                    numbered = (struct numbered_arg *) xrealloc (numbered, spec.allocated * sizeof (struct numbered_arg));
+                  }
+                numbered[numbered_arg_count].number = number;
+                numbered[numbered_arg_count].type = type;
+                numbered_arg_count++;
+              }
+            else
+              {
+                /* Unnumbered argument.  */
+
+                /* Numbered and unnumbered specifications are exclusive.  */
+                if (numbered_arg_count > 0)
+                  {
+                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                    FDI_SET (format, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+
+                if (spec.allocated == spec.unnumbered_arg_count)
+                  {
+                    spec.allocated = 2 * spec.allocated + 1;
+                    spec.unnumbered = (struct unnumbered_arg *) xrealloc (spec.unnumbered, spec.allocated * sizeof (struct unnumbered_arg));
+                  }
+                spec.unnumbered[spec.unnumbered_arg_count].type = type;
+                spec.unnumbered_arg_count++;
+              }
+          }
+
+        FDI_SET (format, FMTDIR_END);
+
+        format++;
+      }
+
+  /* Sort the numbered argument array, and eliminate duplicates.  */
+  if (numbered_arg_count > 1)
+    {
+      unsigned int i, j;
+      bool err;
+
+      qsort (numbered, 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 < numbered_arg_count; i++)
+        if (j > 0 && numbered[i].number == numbered[j-1].number)
+          {
+            format_arg_type_t type1 = numbered[i].type;
+            format_arg_type_t type2 = numbered[j-1].type;
+            format_arg_type_t type_both;
+
+            if (type1 == type2)
+              type_both = type1;
+            else
+              {
+                /* Incompatible types.  */
+                type_both = FAT_NONE;
+                if (!err)
+                  *invalid_reason =
+                    INVALID_INCOMPATIBLE_ARG_TYPES (numbered[i].number);
+                err = true;
+              }
+
+            numbered[j-1].type = type_both;
+          }
+        else
+          {
+            if (j < i)
+              {
+                numbered[j].number = numbered[i].number;
+                numbered[j].type = numbered[i].type;
+              }
+            j++;
+          }
+      numbered_arg_count = j;
+      if (err)
+        /* *invalid_reason has already been set above.  */
+        goto bad_format;
+    }
 
-  if (result != NULL)
+  /* Verify that the format strings uses all arguments up to the highest
+     numbered one.  */
+  if (numbered_arg_count > 0)
     {
-      /* Copy the result to a heap-allocated object.  */
-      struct spec *safe_result = XMALLOC (struct spec);
-      *safe_result = *result;
-      result = safe_result;
+      unsigned int i;
+
+      for (i = 0; i < numbered_arg_count; i++)
+        if (numbered[i].number != i + 1)
+          {
+            *invalid_reason =
+              xasprintf (_("The string refers to argument number %u but ignores argument number %u."), numbered[i].number, i + 1);
+            goto bad_format;
+          }
+
+      /* So now the numbered arguments array is equivalent to a sequence
+         of unnumbered arguments.  */
+      spec.unnumbered_arg_count = numbered_arg_count;
+      spec.allocated = spec.unnumbered_arg_count;
+      spec.unnumbered = XNMALLOC (spec.allocated, struct unnumbered_arg);
+      for (i = 0; i < spec.unnumbered_arg_count; i++)
+        spec.unnumbered[i].type = numbered[i].type;
+      free (numbered);
+      numbered_arg_count = 0;
     }
+
+  result = XMALLOC (struct spec);
+  *result = spec;
   return result;
+
+ bad_format:
+  if (numbered != NULL)
+    free (numbered);
+  if (spec.unnumbered != NULL)
+    free (spec.unnumbered);
+  if (spec.sysdep_directives != NULL)
+    free (spec.sysdep_directives);
+  return NULL;
 }
 
 static void *
diff -Nru gettext-0.19.3/gettext-tools/src/format-c-parse.h gettext-0.18.1.1/gettext-tools/src/format-c-parse.h
--- gettext-0.19.3/gettext-tools/src/format-c-parse.h	2013-04-15 06:45:13.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format-c-parse.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,854 +0,0 @@
-/* Parsing C format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2010 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
-   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/>.  */
-
-
-/* C format strings are described in POSIX (IEEE P1003.1 2001), section
-   XSH 3 fprintf().  See also Linux fprintf(3) manual page.
-   A directive
-   - starts with '%' or '%m$' where m is a positive integer,
-   - is optionally followed by any of the characters '#', '0', '-', ' ', '+',
-     "'", or - only in msgstr strings - the string "I", each of which acts as
-     a flag,
-   - is optionally followed by a width specification: '*' (reads an argument)
-     or '*m$' or a nonempty digit sequence,
-   - is optionally followed by '.' and a precision specification: '*' (reads
-     an argument) or '*m$' or a nonempty digit sequence,
-   - is either continued like this:
-       - is optionally followed by a size specifier, one of 'hh' 'h' 'l' 'll'
-         'L' 'q' 'j' 'z' 't',
-       - is finished by a specifier
-           - '%', that needs no argument,
-           - 'c', 'C', that need a character argument,
-           - 's', 'S', that need a string argument,
-           - 'i', 'd', that need a signed integer argument,
-           - 'o', 'u', 'x', 'X', that need an unsigned integer argument,
-           - 'e', 'E', 'f', 'F', 'g', 'G', 'a', 'A', that need a floating-point
-             argument,
-           - 'p', that needs a 'void *' argument,
-           - 'n', that needs a pointer to integer.
-     or is finished by a specifier '<' inttypes-macro '>' where inttypes-macro
-     is an ISO C 99 section 7.8.1 format directive.
-   Numbered ('%m$' or '*m$') and unnumbered argument specifications cannot
-   be used in the same string.  When numbered argument specifications are
-   used, specifying the Nth argument requires that all the leading arguments,
-   from the first to the (N-1)th, are specified in the format string.
- */
-
-enum format_arg_type
-{
-  FAT_NONE              = 0,
-  /* Basic types */
-  FAT_INTEGER           = 1,
-  FAT_DOUBLE            = 2,
-  FAT_CHAR              = 3,
-  FAT_STRING            = 4,
-  FAT_OBJC_OBJECT       = 5,
-  FAT_POINTER           = 6,
-  FAT_COUNT_POINTER     = 7,
-  /* Flags */
-  FAT_UNSIGNED          = 1 << 3,
-  FAT_SIZE_SHORT        = 1 << 4,
-  FAT_SIZE_CHAR         = 2 << 4,
-  FAT_SIZE_LONG         = 1 << 6,
-  FAT_SIZE_LONGLONG     = 2 << 6,
-  FAT_SIZE_8_T          = 1 << 8,
-  FAT_SIZE_16_T         = 1 << 9,
-  FAT_SIZE_32_T         = 1 << 10,
-  FAT_SIZE_64_T         = 1 << 11,
-  FAT_SIZE_LEAST8_T     = 1 << 12,
-  FAT_SIZE_LEAST16_T    = 1 << 13,
-  FAT_SIZE_LEAST32_T    = 1 << 14,
-  FAT_SIZE_LEAST64_T    = 1 << 15,
-  FAT_SIZE_FAST8_T      = 1 << 16,
-  FAT_SIZE_FAST16_T     = 1 << 17,
-  FAT_SIZE_FAST32_T     = 1 << 18,
-  FAT_SIZE_FAST64_T     = 1 << 19,
-  FAT_SIZE_INTMAX_T     = 1 << 20,
-  FAT_SIZE_INTPTR_T     = 1 << 21,
-  FAT_SIZE_SIZE_T       = 1 << 22,
-  FAT_SIZE_PTRDIFF_T    = 1 << 23,
-  FAT_WIDE              = FAT_SIZE_LONG,
-  /* Meaningful combinations of basic types and flags:
-  'signed char'                 = FAT_INTEGER | FAT_SIZE_CHAR,
-  'unsigned char'               = FAT_INTEGER | FAT_SIZE_CHAR | FAT_UNSIGNED,
-  'short'                       = FAT_INTEGER | FAT_SIZE_SHORT,
-  'unsigned short'              = FAT_INTEGER | FAT_SIZE_SHORT | FAT_UNSIGNED,
-  'int'                         = FAT_INTEGER,
-  'unsigned int'                = FAT_INTEGER | FAT_UNSIGNED,
-  'long int'                    = FAT_INTEGER | FAT_SIZE_LONG,
-  'unsigned long int'           = FAT_INTEGER | FAT_SIZE_LONG | FAT_UNSIGNED,
-  'long long int'               = FAT_INTEGER | FAT_SIZE_LONGLONG,
-  'unsigned long long int'      = FAT_INTEGER | FAT_SIZE_LONGLONG | FAT_UNSIGNED,
-  'double'                      = FAT_DOUBLE,
-  'long double'                 = FAT_DOUBLE | FAT_SIZE_LONGLONG,
-  'char'/'int'                  = FAT_CHAR,
-  'wchar_t'/'wint_t'            = FAT_CHAR | FAT_SIZE_LONG,
-  'const char *'                = FAT_STRING,
-  'const wchar_t *'             = FAT_STRING | FAT_SIZE_LONG,
-  'void *'                      = FAT_POINTER,
-  FAT_COUNT_SCHAR_POINTER       = FAT_COUNT_POINTER | FAT_SIZE_CHAR,
-  FAT_COUNT_SHORT_POINTER       = FAT_COUNT_POINTER | FAT_SIZE_SHORT,
-  FAT_COUNT_INT_POINTER         = FAT_COUNT_POINTER,
-  FAT_COUNT_LONGINT_POINTER     = FAT_COUNT_POINTER | FAT_SIZE_LONG,
-  FAT_COUNT_LONGLONGINT_POINTER = FAT_COUNT_POINTER | FAT_SIZE_LONGLONG,
-  */
-  /* Bitmasks */
-  FAT_BASIC_MASK        = (FAT_INTEGER | FAT_DOUBLE | FAT_CHAR | FAT_STRING
-                           | FAT_OBJC_OBJECT | FAT_POINTER | FAT_COUNT_POINTER),
-  FAT_SIZE_MASK         = (FAT_SIZE_SHORT | FAT_SIZE_CHAR
-                           | FAT_SIZE_LONG | FAT_SIZE_LONGLONG
-                           | FAT_SIZE_8_T | FAT_SIZE_16_T
-                           | FAT_SIZE_32_T | FAT_SIZE_64_T
-                           | FAT_SIZE_LEAST8_T | FAT_SIZE_LEAST16_T
-                           | FAT_SIZE_LEAST32_T | FAT_SIZE_LEAST64_T
-                           | FAT_SIZE_FAST8_T | FAT_SIZE_FAST16_T
-                           | FAT_SIZE_FAST32_T | FAT_SIZE_FAST64_T
-                           | FAT_SIZE_INTMAX_T | FAT_SIZE_INTPTR_T
-                           | FAT_SIZE_SIZE_T | FAT_SIZE_PTRDIFF_T)
-};
-#ifdef __cplusplus
-typedef int format_arg_type_t;
-#else
-typedef enum format_arg_type format_arg_type_t;
-#endif
-
-struct numbered_arg
-{
-  unsigned int number;
-  format_arg_type_t type;
-};
-
-struct unnumbered_arg
-{
-  format_arg_type_t type;
-};
-
-struct spec
-{
-  unsigned int directives;
-  unsigned int unnumbered_arg_count;
-  unsigned int allocated;
-  struct unnumbered_arg *unnumbered;
-  bool unlikely_intentional;
-  unsigned int sysdep_directives_count;
-  const char **sysdep_directives;
-};
-
-/* Locale independent test for a decimal digit.
-   Argument can be  'char' or 'unsigned char'.  (Whereas the argument of
-   <ctype.h> isdigit must be an 'unsigned char'.)  */
-#undef isdigit
-#define isdigit(c) ((unsigned int) ((c) - '0') < 10)
-
-/* Whether to recognize the 'I' flag.  */
-#if SYSDEP_SEGMENTS_PROCESSED
-/* The 'I' flag can only occur in glibc >= 2.2.  On other platforms, gettext()
-   filters it away even if it is present in the msgstr in the .mo file.  */
-# define HANDLE_I_FLAG \
-   ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) \
-    && !defined __UCLIBC__)
-#else
-# define HANDLE_I_FLAG 1
-#endif
-
-
-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 struct spec *
-format_parse_entrails (const char *format, bool translated,
-                       bool objc_extensions, char *fdi, char **invalid_reason,
-                       struct spec *result)
-{
-  const char *const format_start = format;
-  struct spec spec;
-  unsigned int numbered_arg_count;
-  struct numbered_arg *numbered;
-
-  spec.directives = 0;
-  numbered_arg_count = 0;
-  spec.unnumbered_arg_count = 0;
-  spec.allocated = 0;
-  numbered = NULL;
-  spec.unnumbered = NULL;
-  spec.unlikely_intentional = false;
-  spec.sysdep_directives_count = 0;
-  spec.sysdep_directives = NULL;
-
-  for (; *format != '\0';)
-    if (*format++ == '%')
-      {
-        /* A directive.  */
-        unsigned int number = 0;
-        format_arg_type_t type;
-        format_arg_type_t size;
-
-        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.  */
-        for (;;)
-          {
-            if (*format == ' ' || *format == '+' || *format == '-'
-                || *format == '#' || *format == '0' || *format == '\'')
-              format++;
-#if HANDLE_I_FLAG
-            else if (translated && *format == 'I')
-              {
-                spec.sysdep_directives =
-                  (const char **)
-                  xrealloc (spec.sysdep_directives,
-                            2 * (spec.sysdep_directives_count + 1)
-                            * sizeof (const char *));
-                IF_OOM (spec.sysdep_directives, goto bad_format;)
-                spec.sysdep_directives[2 * spec.sysdep_directives_count] = format;
-                spec.sysdep_directives[2 * spec.sysdep_directives_count + 1] = format + 1;
-                spec.sysdep_directives_count++;
-                format++;
-              }
-#endif
-            else
-              break;
-          }
-
-        /* Parse width.  */
-        if (*format == '*')
-          {
-            unsigned int width_number = 0;
-
-            format++;
-
-            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_WIDTH_ARGNO_0 (spec.directives);
-                        FDI_SET (f, FMTDIR_ERROR);
-                        goto bad_format;
-                      }
-                    width_number = m;
-                    format = ++f;
-                  }
-              }
-
-            if (width_number)
-              {
-                /* Numbered argument.  */
-
-                /* Numbered and unnumbered specifications are exclusive.  */
-                if (spec.unnumbered_arg_count > 0)
-                  {
-                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
-                    FDI_SET (format - 1, FMTDIR_ERROR);
-                    goto bad_format;
-                  }
-
-                if (spec.allocated == numbered_arg_count)
-                  {
-                    spec.allocated = 2 * spec.allocated + 1;
-                    numbered = (struct numbered_arg *) xrealloc (numbered, spec.allocated * sizeof (struct numbered_arg));
-                    IF_OOM (numbered, goto bad_format;)
-                  }
-                numbered[numbered_arg_count].number = width_number;
-                numbered[numbered_arg_count].type = FAT_INTEGER;
-                numbered_arg_count++;
-              }
-            else
-              {
-                /* Unnumbered argument.  */
-
-                /* Numbered and unnumbered specifications are exclusive.  */
-                if (numbered_arg_count > 0)
-                  {
-                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
-                    FDI_SET (format - 1, FMTDIR_ERROR);
-                    goto bad_format;
-                  }
-
-                if (spec.allocated == spec.unnumbered_arg_count)
-                  {
-                    spec.allocated = 2 * spec.allocated + 1;
-                    spec.unnumbered = (struct unnumbered_arg *) xrealloc (spec.unnumbered, spec.allocated * sizeof (struct unnumbered_arg));
-                    IF_OOM (spec.unnumbered, goto bad_format;)
-                  }
-                spec.unnumbered[spec.unnumbered_arg_count].type = FAT_INTEGER;
-                spec.unnumbered_arg_count++;
-              }
-          }
-        else if (isdigit (*format))
-          {
-            do format++; while (isdigit (*format));
-          }
-
-        /* Parse precision.  */
-        if (*format == '.')
-          {
-            format++;
-
-            if (*format == '*')
-              {
-                unsigned int precision_number = 0;
-
-                format++;
-
-                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_PRECISION_ARGNO_0 (spec.directives);
-                            FDI_SET (f, FMTDIR_ERROR);
-                            goto bad_format;
-                          }
-                        precision_number = m;
-                        format = ++f;
-                      }
-                  }
-
-                if (precision_number)
-                  {
-                    /* Numbered argument.  */
-
-                    /* Numbered and unnumbered specifications are exclusive.  */
-                    if (spec.unnumbered_arg_count > 0)
-                      {
-                        *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
-                        FDI_SET (format - 1, FMTDIR_ERROR);
-                        goto bad_format;
-                      }
-
-                    if (spec.allocated == numbered_arg_count)
-                      {
-                        spec.allocated = 2 * spec.allocated + 1;
-                        numbered = (struct numbered_arg *) xrealloc (numbered, spec.allocated * sizeof (struct numbered_arg));
-                        IF_OOM (numbered, goto bad_format;)
-                      }
-                    numbered[numbered_arg_count].number = precision_number;
-                    numbered[numbered_arg_count].type = FAT_INTEGER;
-                    numbered_arg_count++;
-                  }
-                else
-                  {
-                    /* Unnumbered argument.  */
-
-                    /* Numbered and unnumbered specifications are exclusive.  */
-                    if (numbered_arg_count > 0)
-                      {
-                        *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
-                        FDI_SET (format - 1, FMTDIR_ERROR);
-                        goto bad_format;
-                      }
-
-                    if (spec.allocated == spec.unnumbered_arg_count)
-                      {
-                        spec.allocated = 2 * spec.allocated + 1;
-                        spec.unnumbered = (struct unnumbered_arg *) xrealloc (spec.unnumbered, spec.allocated * sizeof (struct unnumbered_arg));
-                        IF_OOM (spec.unnumbered, goto bad_format;)
-                      }
-                    spec.unnumbered[spec.unnumbered_arg_count].type = FAT_INTEGER;
-                    spec.unnumbered_arg_count++;
-                  }
-              }
-            else if (isdigit (*format))
-              {
-                do format++; while (isdigit (*format));
-              }
-          }
-
-        if (!SYSDEP_SEGMENTS_PROCESSED && *format == '<')
-          {
-            spec.sysdep_directives =
-              (const char **)
-              xrealloc (spec.sysdep_directives,
-                        2 * (spec.sysdep_directives_count + 1)
-                        * sizeof (const char *));
-            IF_OOM (spec.sysdep_directives, goto bad_format;)
-            spec.sysdep_directives[2 * spec.sysdep_directives_count] = format;
-
-            format++;
-            /* Parse ISO C 99 section 7.8.1 format string directive.
-               Syntax:
-               P R I { d | i | o | u | x | X }
-               { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR }  */
-            if (*format != 'P')
-              {
-                *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
-                goto bad_format;
-              }
-            format++;
-            if (*format != 'R')
-              {
-                *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
-                goto bad_format;
-              }
-            format++;
-            if (*format != 'I')
-              {
-                *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
-                goto bad_format;
-              }
-            format++;
-
-            switch (*format)
-              {
-              case 'i': case 'd':
-                type = FAT_INTEGER;
-                break;
-              case 'u': case 'o': case 'x': case 'X':
-                type = FAT_INTEGER | FAT_UNSIGNED;
-                break;
-              default:
-                *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
-                goto bad_format;
-              }
-            format++;
-
-            if (format[0] == 'M' && format[1] == 'A' && format[2] == 'X')
-              {
-                type |= FAT_SIZE_INTMAX_T;
-                format += 3;
-              }
-            else if (format[0] == 'P' && format[1] == 'T' && format[2] == 'R')
-              {
-                type |= FAT_SIZE_INTPTR_T;
-                format += 3;
-              }
-            else
-              {
-                if (format[0] == 'L' && format[1] == 'E' && format[2] == 'A'
-                    && format[3] == 'S' && format[4] == 'T')
-                  {
-                    format += 5;
-                    if (format[0] == '8')
-                      {
-                        type |= FAT_SIZE_LEAST8_T;
-                        format++;
-                      }
-                    else if (format[0] == '1' && format[1] == '6')
-                      {
-                        type |= FAT_SIZE_LEAST16_T;
-                        format += 2;
-                      }
-                    else if (format[0] == '3' && format[1] == '2')
-                      {
-                        type |= FAT_SIZE_LEAST32_T;
-                        format += 2;
-                      }
-                    else if (format[0] == '6' && format[1] == '4')
-                      {
-                        type |= FAT_SIZE_LEAST64_T;
-                        format += 2;
-                      }
-                    else
-                      {
-                        *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                        FDI_SET (*format == '\0' ? format - 1 : format,
-                                 FMTDIR_ERROR);
-                        goto bad_format;
-                      }
-                  }
-                else if (format[0] == 'F' && format[1] == 'A'
-                         && format[2] == 'S' && format[3] == 'T')
-                  {
-                    format += 4;
-                    if (format[0] == '8')
-                      {
-                        type |= FAT_SIZE_FAST8_T;
-                        format++;
-                      }
-                    else if (format[0] == '1' && format[1] == '6')
-                      {
-                        type |= FAT_SIZE_FAST16_T;
-                        format += 2;
-                      }
-                    else if (format[0] == '3' && format[1] == '2')
-                      {
-                        type |= FAT_SIZE_FAST32_T;
-                        format += 2;
-                      }
-                    else if (format[0] == '6' && format[1] == '4')
-                      {
-                        type |= FAT_SIZE_FAST64_T;
-                        format += 2;
-                      }
-                    else
-                      {
-                        *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                        FDI_SET (*format == '\0' ? format - 1 : format,
-                                 FMTDIR_ERROR);
-                        goto bad_format;
-                      }
-                  }
-                else
-                  {
-                    if (format[0] == '8')
-                      {
-                        type |= FAT_SIZE_8_T;
-                        format++;
-                      }
-                    else if (format[0] == '1' && format[1] == '6')
-                      {
-                        type |= FAT_SIZE_16_T;
-                        format += 2;
-                      }
-                    else if (format[0] == '3' && format[1] == '2')
-                      {
-                        type |= FAT_SIZE_32_T;
-                        format += 2;
-                      }
-                    else if (format[0] == '6' && format[1] == '4')
-                      {
-                        type |= FAT_SIZE_64_T;
-                        format += 2;
-                      }
-                    else
-                      {
-                        *invalid_reason = INVALID_C99_MACRO (spec.directives);
-                        FDI_SET (*format == '\0' ? format - 1 : format,
-                                 FMTDIR_ERROR);
-                        goto bad_format;
-                      }
-                  }
-              }
-
-            if (*format != '>')
-              {
-                *invalid_reason = INVALID_ANGLE_BRACKET (spec.directives);
-                FDI_SET (*format == '\0' ? format - 1 : format, FMTDIR_ERROR);
-                goto bad_format;
-              }
-
-            spec.sysdep_directives[2 * spec.sysdep_directives_count + 1] = format + 1;
-            spec.sysdep_directives_count++;
-          }
-        else
-          {
-            /* Parse size.  */
-            size = 0;
-            for (;; format++)
-              {
-                if (*format == 'h')
-                  {
-                    if (size & (FAT_SIZE_SHORT | FAT_SIZE_CHAR))
-                      size = FAT_SIZE_CHAR;
-                    else
-                      size = FAT_SIZE_SHORT;
-                  }
-                else if (*format == 'l')
-                  {
-                    if (size & (FAT_SIZE_LONG | FAT_SIZE_LONGLONG))
-                      size = FAT_SIZE_LONGLONG;
-                    else
-                      size = FAT_SIZE_LONG;
-                  }
-                else if (*format == 'L')
-                  size = FAT_SIZE_LONGLONG;
-                else if (*format == 'q')
-                  /* Old BSD 4.4 convention.  */
-                  size = FAT_SIZE_LONGLONG;
-                else if (*format == 'j')
-                  size = FAT_SIZE_INTMAX_T;
-                else if (*format == 'z' || *format == 'Z')
-                  /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
-                     because the warning facility in gcc-2.95.2 understands
-                     only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
-                  size = FAT_SIZE_SIZE_T;
-                else if (*format == 't')
-                  size = FAT_SIZE_PTRDIFF_T;
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-                else if (SYSDEP_SEGMENTS_PROCESSED
-                         && *format == 'I'
-                         && format[1] == '6'
-                         && format[2] == '4')
-                  {
-                    size = FAT_SIZE_64_T;
-                    format += 2;
-                  }
-#endif
-                else
-                  break;
-              }
-
-            switch (*format)
-              {
-              case '%':
-                /* Programmers writing _("%2%") most often will not want to
-                   use this string as a c-format string, but rather as a
-                   literal or as a different kind of format string.  */
-                if (format[-1] != '%')
-                  spec.unlikely_intentional = true;
-                type = FAT_NONE;
-                break;
-              case 'm': /* glibc extension */
-                type = FAT_NONE;
-                break;
-              case 'c':
-                type = FAT_CHAR;
-                type |= (size & (FAT_SIZE_LONG | FAT_SIZE_LONGLONG)
-                         ? FAT_WIDE : 0);
-                break;
-              case 'C': /* obsolete */
-                type = FAT_CHAR | FAT_WIDE;
-                break;
-              case 's':
-                type = FAT_STRING;
-                type |= (size & (FAT_SIZE_LONG | FAT_SIZE_LONGLONG)
-                         ? FAT_WIDE : 0);
-                break;
-              case 'S': /* obsolete */
-                type = FAT_STRING | FAT_WIDE;
-                break;
-              case 'i': case 'd':
-                type = FAT_INTEGER;
-                type |= (size & FAT_SIZE_MASK);
-                break;
-              case 'u': case 'o': case 'x': case 'X':
-                type = FAT_INTEGER | FAT_UNSIGNED;
-                type |= (size & FAT_SIZE_MASK);
-                break;
-              case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
-              case 'a': case 'A':
-                type = FAT_DOUBLE;
-                type |= (size & FAT_SIZE_LONGLONG);
-                break;
-              case '@':
-                if (objc_extensions)
-                  {
-                    type = FAT_OBJC_OBJECT;
-                    break;
-                  }
-                goto other;
-              case 'p':
-                type = FAT_POINTER;
-                break;
-              case 'n':
-                type = FAT_COUNT_POINTER;
-                type |= (size & FAT_SIZE_MASK);
-                break;
-              other:
-              default:
-                if (*format == '\0')
-                  {
-                    *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
-                    FDI_SET (format - 1, FMTDIR_ERROR);
-                  }
-                else
-                  {
-                    *invalid_reason =
-                      INVALID_CONVERSION_SPECIFIER (spec.directives, *format);
-                    FDI_SET (format, FMTDIR_ERROR);
-                  }
-                goto bad_format;
-              }
-          }
-
-        if (type != FAT_NONE)
-          {
-            if (number)
-              {
-                /* Numbered argument.  */
-
-                /* Numbered and unnumbered specifications are exclusive.  */
-                if (spec.unnumbered_arg_count > 0)
-                  {
-                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
-                    FDI_SET (format, FMTDIR_ERROR);
-                    goto bad_format;
-                  }
-
-                if (spec.allocated == numbered_arg_count)
-                  {
-                    spec.allocated = 2 * spec.allocated + 1;
-                    numbered = (struct numbered_arg *) xrealloc (numbered, spec.allocated * sizeof (struct numbered_arg));
-                    IF_OOM (numbered, goto bad_format;)
-                  }
-                numbered[numbered_arg_count].number = number;
-                numbered[numbered_arg_count].type = type;
-                numbered_arg_count++;
-              }
-            else
-              {
-                /* Unnumbered argument.  */
-
-                /* Numbered and unnumbered specifications are exclusive.  */
-                if (numbered_arg_count > 0)
-                  {
-                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
-                    FDI_SET (format, FMTDIR_ERROR);
-                    goto bad_format;
-                  }
-
-                if (spec.allocated == spec.unnumbered_arg_count)
-                  {
-                    spec.allocated = 2 * spec.allocated + 1;
-                    spec.unnumbered = (struct unnumbered_arg *) xrealloc (spec.unnumbered, spec.allocated * sizeof (struct unnumbered_arg));
-                    IF_OOM (spec.unnumbered, goto bad_format;)
-                  }
-                spec.unnumbered[spec.unnumbered_arg_count].type = type;
-                spec.unnumbered_arg_count++;
-              }
-          }
-
-        FDI_SET (format, FMTDIR_END);
-
-        format++;
-      }
-
-  /* Sort the numbered argument array, and eliminate duplicates.  */
-  if (numbered_arg_count > 1)
-    {
-      unsigned int i, j;
-      bool err;
-
-      qsort (numbered, 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 < numbered_arg_count; i++)
-        if (j > 0 && numbered[i].number == numbered[j-1].number)
-          {
-            format_arg_type_t type1 = numbered[i].type;
-            format_arg_type_t type2 = numbered[j-1].type;
-            format_arg_type_t type_both;
-
-            if (type1 == type2)
-              type_both = type1;
-            else
-              {
-                /* Incompatible types.  */
-                type_both = FAT_NONE;
-                if (!err)
-                  *invalid_reason =
-                    INVALID_INCOMPATIBLE_ARG_TYPES (numbered[i].number);
-                err = true;
-              }
-
-            numbered[j-1].type = type_both;
-          }
-        else
-          {
-            if (j < i)
-              {
-                numbered[j].number = numbered[i].number;
-                numbered[j].type = numbered[i].type;
-              }
-            j++;
-          }
-      numbered_arg_count = j;
-      if (err)
-        /* *invalid_reason has already been set above.  */
-        goto bad_format;
-    }
-
-  /* Verify that the format strings uses all arguments up to the highest
-     numbered one.  */
-  if (numbered_arg_count > 0)
-    {
-      unsigned int i;
-
-      for (i = 0; i < numbered_arg_count; i++)
-        if (numbered[i].number != i + 1)
-          {
-            *invalid_reason = INVALID_IGNORED_ARGUMENT (numbered[i].number, i + 1);
-            goto bad_format;
-          }
-
-      /* So now the numbered arguments array is equivalent to a sequence
-         of unnumbered arguments.  */
-      spec.unnumbered_arg_count = numbered_arg_count;
-      spec.allocated = spec.unnumbered_arg_count;
-      spec.unnumbered = XNMALLOC (spec.allocated, struct unnumbered_arg);
-      IF_OOM (spec.unnumbered, goto bad_format;)
-      for (i = 0; i < spec.unnumbered_arg_count; i++)
-        spec.unnumbered[i].type = numbered[i].type;
-      free (numbered);
-      numbered_arg_count = 0;
-    }
-
-  *result = spec;
-  return result;
-
- bad_format:
-  if (numbered != NULL)
-    free (numbered);
-  if (spec.unnumbered != NULL)
-    free (spec.unnumbered);
-  if (spec.sysdep_directives != NULL)
-    free (spec.sysdep_directives);
-  return NULL;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/format.h gettext-0.18.1.1/gettext-tools/src/format.h
--- gettext-0.19.3/gettext-tools/src/format.h	2014-06-16 07:27:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format.h	2010-06-06 12:49:58.000000000 +0000
@@ -99,7 +99,6 @@
 extern DLL_VARIABLE struct formatstring_parser formatstring_objc;
 extern DLL_VARIABLE struct formatstring_parser formatstring_sh;
 extern DLL_VARIABLE struct formatstring_parser formatstring_python;
-extern DLL_VARIABLE struct formatstring_parser formatstring_python_brace;
 extern DLL_VARIABLE struct formatstring_parser formatstring_lisp;
 extern DLL_VARIABLE struct formatstring_parser formatstring_elisp;
 extern DLL_VARIABLE struct formatstring_parser formatstring_librep;
@@ -120,8 +119,6 @@
 extern DLL_VARIABLE struct formatstring_parser formatstring_qt_plural;
 extern DLL_VARIABLE struct formatstring_parser formatstring_kde;
 extern DLL_VARIABLE struct formatstring_parser formatstring_boost;
-extern DLL_VARIABLE struct formatstring_parser formatstring_lua;
-extern DLL_VARIABLE struct formatstring_parser formatstring_javascript;
 
 /* Table of all format string parsers.  */
 extern DLL_VARIABLE struct formatstring_parser *formatstring_parsers[NFORMATS];
diff -Nru gettext-0.19.3/gettext-tools/src/format-javascript.c gettext-0.18.1.1/gettext-tools/src/format-javascript.c
--- gettext-0.19.3/gettext-tools/src/format-javascript.c	2013-04-22 03:00:56.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format-javascript.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,333 +0,0 @@
-/* JavaScript format strings.
-   Copyright (C) 2001-2004, 2006-2009, 2013 Free Software Foundation, Inc.
-   Written by Andreas Stricker <andy@knitter.ch>, 2010.
-   It's based on python format module from Bruno Haible.
-
-   This 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 <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "format.h"
-#include "c-ctype.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
-#include "format-invalid.h"
-#include "gettext.h"
-
-#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:
-
-   A directive
-   - starts with '%',
-   - is optionally followed by any of the characters '0', '-', ' ',
-     or, 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
-     digit sequence,
-   - is finished by a specifier
-       - 's', that needs a string argument,
-       - 'b', 'd', 'u', 'o', 'x', 'X', that need an integer argument,
-       - 'f', that need a floating-point argument,
-       - 'c', that needs a character argument.
-       - 'j', that needs an argument of any type.
-   Additionally there is the directive '%%', which takes no argument.  */
-
-enum format_arg_type
-{
-  FAT_NONE,
-  FAT_ANY,
-  FAT_CHARACTER,
-  FAT_STRING,
-  FAT_INTEGER,
-  FAT_FLOAT
-};
-
-struct spec
-{
-  unsigned int directives;
-  unsigned int format_args_count;
-  unsigned int allocated;
-  enum format_arg_type *format_args;
-};
-
-/* Locale independent test for a decimal digit.
-   Argument can be  'char' or 'unsigned char'.  (Whereas the argument of
-   <ctype.h> isdigit must be an 'unsigned char'.)  */
-#undef isdigit
-#define isdigit(c) ((unsigned int) ((c) - '0') < 10)
-
-
-static void *
-format_parse (const char *format, bool translated, char *fdi,
-              char **invalid_reason)
-{
-  const char *const format_start = format;
-  struct spec spec;
-  struct spec *result;
-
-  spec.directives = 0;
-  spec.format_args_count = 0;
-  spec.allocated = 0;
-  spec.format_args = NULL;
-
-  for (; *format != '\0';)
-    if (*format++ == '%')
-      {
-        /* A directive.  */
-        enum format_arg_type type;
-
-        FDI_SET (format - 1, FMTDIR_START);
-        spec.directives++;
-
-        while (*format == '-' || *format == '+' || *format == ' '
-               || *format == '0' || *format == 'I')
-          format++;
-
-        while (isdigit (*format))
-          format++;
-
-        if (*format == '.')
-          {
-            format++;
-
-            while (isdigit (*format))
-              format++;
-          }
-
-        switch (*format)
-          {
-          case '%':
-            type = FAT_NONE;
-            break;
-          case 'c':
-            type = FAT_CHARACTER;
-            break;
-          case 's':
-            type = FAT_STRING;
-            break;
-          case 'b': case 'd': case 'o': case 'x': case 'X':
-            type = FAT_INTEGER;
-            break;
-          case 'f':
-            type = FAT_FLOAT;
-            break;
-          case 'j':
-            type = FAT_ANY;
-            break;
-          default:
-            if (*format == '\0')
-              {
-                *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
-                FDI_SET (format - 1, FMTDIR_ERROR);
-              }
-            else
-              {
-                *invalid_reason =
-                  INVALID_CONVERSION_SPECIFIER (spec.directives, *format);
-                FDI_SET (format, FMTDIR_ERROR);
-              }
-            goto bad_format;
-          }
-
-        if (*format != '%')
-          {
-            if (spec.allocated == spec.format_args_count)
-              {
-                spec.allocated = 2 * spec.allocated + 1;
-                spec.format_args = (enum format_arg_type *) xrealloc (spec.format_args, spec.allocated * sizeof (enum format_arg_type));
-              }
-            spec.format_args[spec.format_args_count] = type;
-            spec.format_args_count++;
-          }
-
-        FDI_SET (format, FMTDIR_END);
-
-        format++;
-      }
-
-  result = XMALLOC (struct spec);
-  *result = spec;
-  return result;
-
- bad_format:
-  if (spec.format_args != NULL)
-    free (spec.format_args);
-  return NULL;
-}
-
-static void
-format_free (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-
-  if (spec->format_args != NULL)
-    free (spec->format_args);
-  free (spec);
-}
-
-static int
-format_get_number_of_directives (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-
-  return spec->directives;
-}
-
-static bool
-format_check (void *msgid_descr, void *msgstr_descr, bool equality,
-              formatstring_error_logger_t error_logger,
-              const char *pretty_msgid, const char *pretty_msgstr)
-{
-  struct spec *spec1 = (struct spec *) msgid_descr;
-  struct spec *spec2 = (struct spec *) msgstr_descr;
-  bool err = false;
-
-  if (spec1->format_args_count + spec2->format_args_count > 0)
-    {
-      unsigned int i;
-
-      /* Check the argument types are the same.  */
-      if (spec1->format_args_count != spec2->format_args_count)
-        {
-          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))))
-            {
-              if (error_logger)
-                error_logger (_("format specifications in '%s' and '%s' for argument %u are not the same"),
-                              pretty_msgid, pretty_msgstr, i + 1);
-              err = true;
-            }
-    }
-
-  return err;
-}
-
-
-struct formatstring_parser formatstring_javascript =
-{
-  format_parse,
-  format_free,
-  format_get_number_of_directives,
-  NULL,
-  format_check
-};
-
-
-#ifdef TEST
-
-/* Test program: Print the argument list specification returned by
-   format_parse for strings read from standard input.  */
-
-#include <stdio.h>
-
-static void
-format_print (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-  unsigned int i;
-
-  if (spec == NULL)
-    {
-      printf ("INVALID");
-      return;
-    }
-
-      printf ("(");
-      for (i = 0; i < spec->format_args_count; i++)
-        {
-          if (i > 0)
-            printf (" ");
-          switch (spec->format_args[i])
-            {
-            case FAT_ANY:
-              printf ("*");
-              break;
-            case FAT_CHARACTER:
-              printf ("c");
-              break;
-            case FAT_STRING:
-              printf ("s");
-              break;
-            case FAT_INTEGER:
-              printf ("i");
-              break;
-            case FAT_FLOAT:
-              printf ("f");
-              break;
-            default:
-              abort ();
-            }
-        }
-      printf (")");
-}
-
-int
-main ()
-{
-  for (;;)
-    {
-      char *line = NULL;
-      size_t line_size = 0;
-      int line_len;
-      char *invalid_reason;
-      void *descr;
-
-      line_len = getline (&line, &line_size, stdin);
-      if (line_len < 0)
-        break;
-      if (line_len > 0 && line[line_len - 1] == '\n')
-        line[--line_len] = '\0';
-
-      invalid_reason = NULL;
-      descr = format_parse (line, false, NULL, &invalid_reason);
-
-      format_print (descr);
-      printf ("\n");
-      if (descr == NULL)
-        printf ("%s\n", invalid_reason);
-
-      free (invalid_reason);
-      free (line);
-    }
-
-  return 0;
-}
-
-/*
- * For Emacs M-x compile
- * Local Variables:
- * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../intl -DHAVE_CONFIG_H -DTEST format-javascript.c ../gnulib-lib/libgettextlib.la"
- * End:
- */
-#endif /* TEST */
diff -Nru gettext-0.19.3/gettext-tools/src/format-lua.c gettext-0.18.1.1/gettext-tools/src/format-lua.c
--- gettext-0.19.3/gettext-tools/src/format-lua.c	2013-04-18 02:17:32.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format-lua.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,348 +0,0 @@
-/* Lua format strings.
-   Copyright (C) 2012 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
-   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 <stdbool.h>
-#include <stdlib.h>
-
-#include "format.h"
-#include "gettext.h"
-#include "xalloc.h"
-#include "format-invalid.h"
-#include "c-ctype.h"
-#include "xvasprintf.h"
-
-#define _(str) gettext (str)
-
-/* The Lua format strings are described in the Lua manual,
-   which can be found at:
-   http://www.lua.org/manual/5.2/manual.html
-
-   A directive
-   - starts with '%'
-   - is optionally followed by any of the characters '0', '-', ' ', or
-     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
-     digit sequence,
-   - is finished by a specifier
-       - 's', 'q', that needs a string argument,
-       - 'd', 'i', 'o', 'u', 'X', 'x', that need an integer argument,
-       - 'A', 'a', 'E', 'e', 'f', 'G', 'g', that need a floating-point argument,
-       - 'c', that needs a character argument.
-   Additionally there is the directive '%%', which takes no argument.
-
-   Note: Lua does not distinguish between integer, floating-point
-   and character arguments, since it has a number data type only.
-   However, we should not allow users to use %d instead of %c.
-   The same applies to %s and %q - we should not allow intermixing them.
- */
-
-enum format_arg_type
-{
-  FAT_INTEGER,
-  FAT_CHARACTER,
-  FAT_FLOAT,
-  FAT_STRING,
-  FAT_ESCAPED_STRING
-};
-
-struct spec
-{
-  unsigned int directives;
-  unsigned int format_args_count;
-  unsigned int allocated;
-  enum format_arg_type *format_args;
-};
-
-/* Locale independent test for a decimal digit.
-   Argument can be  'char' or 'unsigned char'.  (Whereas the argument of
-   <ctype.h> isdigit must be an 'unsigned char'.)  */
-#undef isdigit
-#define isdigit(c) ((unsigned int) ((c) - '0') < 10)
-
-static void format_free (void *descr);
-
-static void *
-format_parse (const char *format, bool translated, char *fdi,
-              char **invalid_reason)
-{
-
-  const char *format_start = format;
-  const char *fatstr = format;
-  struct spec *result = NULL;
-  result = XMALLOC (struct spec);
-  result->directives = 0;
-  result->allocated = 0;
-  result->format_args_count = 0;
-  result->format_args = NULL;
-
-
-  for (; *fatstr != '\0';)
-    {
-      if (*fatstr++ == '%')
-        {
-          FDI_SET (fatstr - 1, FMTDIR_START);
-          result->directives++;
-
-          if (*fatstr != '%')
-            {
-              enum format_arg_type type;
-
-              /* Remove width. */
-              while (isdigit (*fatstr))
-                fatstr++;
-
-              if (*fatstr == '.')
-                {
-                  fatstr++;
-
-                  /* Remove precision. */
-                  while (isdigit (*fatstr))
-                    fatstr++;
-                }
-
-              switch (*fatstr)
-                {
-                case 'c':
-                  type = FAT_CHARACTER;
-                  break;
-                case 'd':
-                case 'i':
-                case 'o':
-                case 'u':
-                case 'X':
-                case 'x':
-                  type = FAT_INTEGER;
-                  break;
-                case 'a':
-                case 'A':
-                case 'E':
-                case 'e':
-                case 'f':
-                case 'g':
-                case 'G':
-                  type = FAT_FLOAT;
-                  break;
-                case 's':
-                  type = FAT_STRING;
-                  break;
-                case 'q':
-                  type = FAT_ESCAPED_STRING;
-                  break;
-                default:
-                  if (*fatstr == '\0')
-                    {
-                      *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
-                      FDI_SET (fatstr - 1, FMTDIR_ERROR);
-                    }
-                  else
-                    {
-                      *invalid_reason =
-                        INVALID_CONVERSION_SPECIFIER (result->
-                                                      format_args_count + 1,
-                                                      *fatstr);
-                      FDI_SET (fatstr, FMTDIR_ERROR);
-                    }
-                  goto fmt_error;
-                }
-
-              if (result->format_args_count == result->allocated)
-                {
-                  result->allocated = 2 * result->allocated + 10;
-                  result->format_args =
-                    xrealloc (result->format_args,
-                              result->allocated *
-                              sizeof (enum format_arg_type));
-                }
-              result->format_args[result->format_args_count++] = type;
-            }
-          FDI_SET (fatstr, FMTDIR_END);
-          fatstr++;
-        }
-    }
-
-  return result;
-
-fmt_error:
-  format_free (result);
-  return NULL;
-}
-
-static void
-format_free (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-
-  if (spec->format_args != NULL)
-    free (spec->format_args);
-  free (spec);
-}
-
-static int
-format_get_number_of_directives (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-
-  return spec->directives;
-}
-
-static bool
-format_check (void *msgid_descr, void *msgstr_descr, bool equality,
-              formatstring_error_logger_t error_logger,
-              const char *pretty_msgid, const char *pretty_msgstr)
-{
-  struct spec *spec1 = (struct spec *) msgid_descr;
-  struct spec *spec2 = (struct spec *) msgstr_descr;
-
-  if (spec1->format_args_count + spec2->format_args_count > 0)
-    {
-      unsigned int i, n1, n2;
-
-      n1 = spec1->format_args_count;
-      n2 = spec2->format_args_count;
-
-      for (i = 0; i < n1 || i < n2; i++)
-        {
-          if (i >= n1)
-            {
-              if (error_logger)
-                error_logger (_("a format specification for argument %u, as in '%s', doesn't exist in '%s'"),
-                              i + 1, pretty_msgstr, pretty_msgid);
-              return true;
-            }
-          else if (i >= n2)
-            {
-              if (error_logger)
-                error_logger (_("a format specification for argument %u doesn't exist in '%s'"),
-                              i + 1, pretty_msgstr);
-              return true;
-            }
-          else if (spec1->format_args[i] != spec2->format_args[i])
-            {
-              if (error_logger)
-                error_logger (_("format specifications in '%s' and '%s' for argument %u are not the same"),
-                              pretty_msgid, pretty_msgstr, i + 1);
-              return true;
-            }
-        }
-    }
-
-  return false;
-}
-
-struct formatstring_parser formatstring_lua =
-{
-  format_parse,
-  format_free,
-  format_get_number_of_directives,
-  NULL,
-  format_check
-};
-
-#ifdef TEST
-
-/* Test program: Print the argument list specification returned by
-   format_parse for strings read from standard input.  */
-
-#include <stdio.h>
-
-static void
-format_print (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-  unsigned int i;
-
-  if (spec == NULL)
-    {
-      printf ("INVALID");
-      return;
-    }
-
-  printf ("(");
-  for (i = 0; i < spec->format_args_count; i++)
-    {
-      if (i > 0)
-        printf (" ");
-      switch (spec->format_args[i])
-        {
-        case FAT_INTEGER:
-          printf ("i");
-          break;
-        case FAT_FLOAT:
-          printf ("f");
-          break;
-        case FAT_CHARACTER:
-          printf ("c");
-          break;
-        case FAT_STRING:
-          printf ("s");
-          break;
-        case FAT_ESCAPED_STRING:
-          printf ("q");
-          break;
-        default:
-          abort ();
-        }
-    }
-  printf (")");
-}
-
-int
-main ()
-{
-  for (;;)
-    {
-      char *line = NULL;
-      size_t line_size = 0;
-      int line_len;
-      char *invalid_reason;
-      void *descr;
-
-      line_len = getline (&line, &line_size, stdin);
-      if (line_len < 0)
-        break;
-      if (line_len > 0 && line[line_len - 1] == '\n')
-        line[--line_len] = '\0';
-
-      invalid_reason = NULL;
-      descr = format_parse (line, false, NULL, &invalid_reason);
-
-      format_print (descr);
-      printf ("\n");
-      if (descr == NULL)
-        printf ("%s\n", invalid_reason);
-
-      free (invalid_reason);
-      free (line);
-    }
-
-  return 0;
-}
-
-/*
- * For Emacs M-x compile
- * Local Variables:
- * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../intl -DHAVE_CONFIG_H -DTEST format-lua.c ../gnulib-lib/libgettextlib.la"
- * End:
- */
-
-#endif /* TEST */
diff -Nru gettext-0.19.3/gettext-tools/src/format-python-brace.c gettext-0.18.1.1/gettext-tools/src/format-python-brace.c
--- gettext-0.19.3/gettext-tools/src/format-python-brace.c	2014-05-02 09:03:03.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/format-python-brace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,542 +0,0 @@
-/* Python brace format strings.
-   Copyright (C) 2004, 2006-2007, 2013 Free Software Foundation, Inc.
-   Written by Daiki Ueno <ueno@gnu.org>, 2013.
-
-   This 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 <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "format.h"
-#include "c-ctype.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
-#include "format-invalid.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-/* Python brace format strings are defined by PEP3101 together with
-   'format' method of string class.
-   A format string directive here consists of
-     - an opening brace '{',
-     - an identifier [_A-Za-z][_0-9A-Za-z]*|[0-9]+,
-     - an optional getattr ('.') or getitem ('['..']') operator with
-       an identifier as argument,
-     - an optional format specifier starting with ':', with a
-       (unnested) format string as argument,
-     - a closing brace '}'.
-   Brace characters '{' and '}' can be escaped by doubles '{{' and '}}'.
-*/
-
-struct named_arg
-{
-  char *name;
-};
-
-struct spec
-{
-  unsigned int directives;
-  unsigned int named_arg_count;
-  unsigned int allocated;
-  struct named_arg *named;
-};
-
-
-static bool parse_upto (struct spec *spec, const char **formatp,
-                        bool is_toplevel, char terminator,
-                        bool translated, char *fdi, char **invalid_reason);
-static void free_named_args (struct spec *spec);
-
-
-/* All the parse_* functions (except parse_upto) follow the same
-   calling convention.  FORMATP shall point to the beginning of a token.
-   If parsing succeeds, FORMATP will point to the next character after
-   the token, and true is returned.  Otherwise, FORMATP will be
-   unchanged and false is returned.  */
-
-static bool
-parse_named_field (struct spec *spec,
-                   const char **formatp, bool translated, char *fdi,
-                   char **invalid_reason)
-{
-  const char *format = *formatp;
-  char c;
-
-  c = *format;
-  if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_')
-    {
-      do
-        c = *++format;
-      while ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_'
-             || (c >= '0' && c <= '9'));
-      *formatp = format;
-      return true;
-    }
-  return false;
-}
-
-static bool
-parse_numeric_field (struct spec *spec,
-                     const char **formatp, bool translated, char *fdi,
-                     char **invalid_reason)
-{
-  const char *format = *formatp;
-  char c;
-
-  c = *format;
-  if (c >= '0' && c <= '9')
-    {
-      do
-        c = *++format;
-      while (c >= '0' && c <= '9');
-      *formatp = format;
-      return true;
-    }
-  return false;
-}
-
-static bool
-parse_directive (struct spec *spec,
-                 const char **formatp, bool is_toplevel,
-                 bool translated, char *fdi, char **invalid_reason)
-{
-  const char *format = *formatp;
-  const char *const format_start = format;
-  const char *name_start;
-  char c;
-
-  c = *++format;
-  if (c == '{')
-    {
-      *formatp = ++format;
-      return true;
-    }
-
-  name_start = 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 field name."), spec->directives, *format);
-      FDI_SET (format, FMTDIR_ERROR);
-      return false;
-    }
-
-  c = *format;
-  if (c == '.')
-    {
-      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))
-        {
-          *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;
-    }
-
-  if (c == ':')
-    {
-      if (!is_toplevel)
-        {
-          *invalid_reason =
-            xasprintf (_("In the directive number %u, no more nesting is allowed in a format specifier."), spec->directives);
-          FDI_SET (format, FMTDIR_ERROR);
-          return false;
-        }
-
-      /* Format specifiers.  Although a format specifier can be any
-         string in theory, we can only recognize two types of format
-         specifiers below, because otherwise we would need to evaluate
-         Python expressions by ourselves:
-
-           - A nested format directive expanding to the whole string
-           - The Standard Format Specifiers, as described in PEP3101,
-             not including a nested format directive  */
-      format++;
-      if (*format == '{')
-        {
-          /* Nested format directive.  */
-          if (!parse_directive (spec, &format, false, translated, fdi,
-                                invalid_reason))
-            {
-              /* FDI and INVALID_REASON will be set by a recursive call of
-                 parse_directive.  */
-              return false;
-            }
-
-          if (*format != '}')
-            {
-              *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
-              FDI_SET (format, FMTDIR_ERROR);
-              return false;
-            }
-        }
-      else
-        {
-          /* Standard format specifiers is in the form:
-             [[fill]align][sign][#][0][minimumwidth][.precision][type]  */
-
-          /* Look ahead two characters to skip [[fill]align].  */
-          int c1, c2;
-
-          c1 = format[0];
-          c2 = format[1];
-
-          if (c2 == '<' || c2 == '>' || c2 == '=' || c2 == '^')
-            format += 2;
-          else if (c1 == '<' || c1 == '>' || c1 == '=' || c1 == '^')
-            format++;
-          if (*format == '+' || *format == '-' || *format == ' ')
-            format++;
-          if (*format == '#')
-            format++;
-          if (*format == '0')
-            format++;
-          while (c_isdigit (*format))
-            format++;
-          if (*format == '.')
-            {
-              format++;
-              while (c_isdigit (*format))
-                format++;
-            }
-          switch (*format)
-            {
-            case 'b': case 'c': case 'd': case 'o': case 'x': case 'X':
-            case 'n':
-            case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
-            case '%':
-              format++;
-              break;
-            default:
-              break;
-            }
-          if (*format != '}')
-            {
-              *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
-              FDI_SET (format, FMTDIR_ERROR);
-              return false;
-            }
-        }
-      c = *format;
-    }
-
-  if (c != '}')
-    {
-      *invalid_reason =
-        xasprintf (_("In the directive number %u, there is an unterminated format directive."), spec->directives);
-      FDI_SET (format, FMTDIR_ERROR);
-      return false;
-    }
-
-  if (is_toplevel)
-    {
-      char *name;
-      size_t n = format - name_start;
-
-      FDI_SET (name_start - 1, FMTDIR_START);
-
-      name = XNMALLOC (n + 1, char);
-      memcpy (name, name_start, n);
-      name[n] = '\0';
-
-      spec->directives++;
-
-      if (spec->allocated == spec->named_arg_count)
-        {
-          spec->allocated = 2 * spec->allocated + 1;
-          spec->named = (struct named_arg *) xrealloc (spec->named, spec->allocated * sizeof (struct named_arg));
-        }
-      spec->named[spec->named_arg_count].name = name;
-      spec->named_arg_count++;
-
-      FDI_SET (format, FMTDIR_END);
-    }
-
-  *formatp = ++format;
-  return true;
-}
-
-static bool
-parse_upto (struct spec *spec,
-            const char **formatp, bool is_toplevel, char terminator,
-            bool translated, char *fdi, char **invalid_reason)
-{
-  const char *format = *formatp;
-
-  for (; *format != terminator && *format != '\0';)
-    {
-      if (*format == '{')
-        {
-          if (!parse_directive (spec, &format, is_toplevel, translated, fdi,
-                                invalid_reason))
-            return false;
-        }
-      else
-        format++;
-    }
-
-  *formatp = format;
-  return true;
-}
-
-static int
-named_arg_compare (const void *p1, const void *p2)
-{
-  return strcmp (((const struct named_arg *) p1)->name,
-                 ((const struct named_arg *) p2)->name);
-}
-
-static void *
-format_parse (const char *format, bool translated, char *fdi,
-              char **invalid_reason)
-{
-  struct spec spec;
-  struct spec *result;
-
-  spec.directives = 0;
-  spec.named_arg_count = 0;
-  spec.allocated = 0;
-  spec.named = NULL;
-
-  if (!parse_upto (&spec, &format, true, '\0', translated, fdi, invalid_reason))
-    {
-      free_named_args (&spec);
-      return NULL;
-    }
-
-  /* Sort the named argument array, and eliminate duplicates.  */
-  if (spec.named_arg_count > 1)
-    {
-      unsigned int i, j;
-
-      qsort (spec.named, spec.named_arg_count, sizeof (struct named_arg),
-             named_arg_compare);
-
-      /* Remove duplicates: Copy from i to j, keeping 0 <= j <= i.  */
-      for (i = j = 0; i < spec.named_arg_count; i++)
-        if (j > 0 && strcmp (spec.named[i].name, spec.named[j-1].name) == 0)
-          free (spec.named[i].name);
-        else
-          {
-            if (j < i)
-              spec.named[j].name = spec.named[i].name;
-            j++;
-          }
-      spec.named_arg_count = j;
-    }
-
-  result = XMALLOC (struct spec);
-  *result = spec;
-  return result;
-}
-
-static void
-free_named_args (struct spec *spec)
-{
-  if (spec->named != NULL)
-    {
-      unsigned int i;
-      for (i = 0; i < spec->named_arg_count; i++)
-        free (spec->named[i].name);
-      free (spec->named);
-    }
-}
-
-static void
-format_free (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-
-  free_named_args (spec);
-  free (spec);
-}
-
-static int
-format_get_number_of_directives (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-
-  return spec->directives;
-}
-
-static bool
-format_check (void *msgid_descr, void *msgstr_descr, bool equality,
-              formatstring_error_logger_t error_logger,
-              const char *pretty_msgid, const char *pretty_msgstr)
-{
-  struct spec *spec1 = (struct spec *) msgid_descr;
-  struct spec *spec2 = (struct spec *) msgstr_descr;
-  bool err = false;
-
-  if (spec1->named_arg_count + spec2->named_arg_count > 0)
-    {
-      unsigned int i, j;
-      unsigned int n1 = spec1->named_arg_count;
-      unsigned int n2 = spec2->named_arg_count;
-
-      /* Check the argument names in spec1 are contained in those of spec2.
-         Both arrays are sorted.  We search for the differences.  */
-      for (i = 0, j = 0; i < n1 || j < n2; )
-        {
-          int cmp = (i >= n1 ? 1 :
-                     j >= n2 ? -1 :
-                     strcmp (spec1->named[i].name, spec2->named[j].name));
-
-          if (cmp > 0)
-            {
-              if (equality)
-                {
-                  if (error_logger)
-                    error_logger (_("a format specification for argument '%s' doesn't exist in '%s'"),
-                                  spec2->named[i].name, pretty_msgid);
-                  err = true;
-                  break;
-                }
-              else
-                j++;
-            }
-          else if (cmp < 0)
-            {
-              if (equality)
-                {
-                  if (error_logger)
-                    error_logger (_("a format specification for argument '%s' doesn't exist in '%s'"),
-                                  spec1->named[i].name, pretty_msgstr);
-                  err = true;
-                  break;
-                }
-              else
-                i++;
-            }
-          else
-            j++, i++;
-        }
-    }
-
-  return err;
-}
-
-
-struct formatstring_parser formatstring_python_brace =
-{
-  format_parse,
-  format_free,
-  format_get_number_of_directives,
-  NULL,
-  format_check
-};
-
-
-#ifdef TEST
-
-/* Test program: Print the argument list specification returned by
-   format_parse for strings read from standard input.  */
-
-#include <stdio.h>
-
-static void
-format_print (void *descr)
-{
-  struct spec *spec = (struct spec *) descr;
-  unsigned int i;
-
-  if (spec == NULL)
-    {
-      printf ("INVALID");
-      return;
-    }
-
-  printf ("{");
-  for (i = 0; i < spec->named_arg_count; i++)
-    {
-      if (i > 0)
-        printf (", ");
-      printf ("'%s'", spec->named[i].name);
-    }
-  printf ("}");
-}
-
-int
-main ()
-{
-  for (;;)
-    {
-      char *line = NULL;
-      size_t line_size = 0;
-      int line_len;
-      char *invalid_reason;
-      void *descr;
-
-      line_len = getline (&line, &line_size, stdin);
-      if (line_len < 0)
-        break;
-      if (line_len > 0 && line[line_len - 1] == '\n')
-        line[--line_len] = '\0';
-
-      invalid_reason = NULL;
-      descr = format_parse (line, false, NULL, &invalid_reason);
-
-      format_print (descr);
-      printf ("\n");
-      if (descr == NULL)
-        printf ("%s\n", invalid_reason);
-
-      free (invalid_reason);
-      free (line);
-    }
-
-  return 0;
-}
-
-/*
- * For Emacs M-x compile
- * Local Variables:
- * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../intl -DHAVE_CONFIG_H -DTEST format-python-brace.c ../gnulib-lib/libgettextlib.la"
- * End:
- */
-
-#endif /* TEST */
diff -Nru gettext-0.19.3/gettext-tools/src/hostname.c gettext-0.18.1.1/gettext-tools/src/hostname.c
--- gettext-0.19.3/gettext-tools/src/hostname.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/hostname.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Display hostname in various forms.
-   Copyright (C) 2001-2003, 2006-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2007 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
@@ -46,9 +46,7 @@
 #endif
 
 /* Get MAXHOSTNAMELEN.  */
-#if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
+#include <sys/param.h>
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
 #endif
@@ -206,7 +204,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-tools/src/libexpat-compat.c gettext-0.18.1.1/gettext-tools/src/libexpat-compat.c
--- gettext-0.19.3/gettext-tools/src/libexpat-compat.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/libexpat-compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,326 +0,0 @@
-/* xgettext libexpat compatibility.
-   Copyright (C) 2002-2003, 2005-2009, 2013 Free Software Foundation, Inc.
-
-   This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
-
-   This 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 <stdlib.h>
-#include <string.h>
-
-#if DYNLOAD_LIBEXPAT
-# include <dlfcn.h>
-#else
-# if HAVE_LIBEXPAT
-#  include <expat.h>
-# endif
-#endif
-
-/* Keep the references to XML_GetCurrent{Line,Column}Number symbols
-   before loading libexpat-compat.h, since they are redefined to
-   rpl_XML_GetCurrent{Line,Column}Number .  */
-#if !DYNLOAD_LIBEXPAT && XML_MAJOR_VERSION >= 2
-static void *p_XML_GetCurrentLineNumber = (void *) &XML_GetCurrentLineNumber;
-static void *p_XML_GetCurrentColumnNumber = (void *) &XML_GetCurrentColumnNumber;
-#endif
-
-#include "libexpat-compat.h"
-
-/* ======================= Different libexpat ABIs.  ======================= */
-
-/* There are three different ABIs of libexpat, regarding the functions
-   XML_GetCurrentLineNumber and XML_GetCurrentColumnNumber.
-   In expat < 2.0, they return an 'int'.
-   In expat >= 2.0, they return
-     - a 'long' if expat was compiled with the default flags, or
-     - a 'long long' if expat was compiled with -DXML_LARGE_SIZE.
-   But the <expat.h> include file does not contain the information whether
-   expat was compiled with -DXML_LARGE_SIZE; so the include file is lying!
-   For this information, we need to call XML_GetFeatureList(), for
-   expat >= 2.0.1; for expat = 2.0.0, we have to assume the default flags.  */
-
-#if !DYNLOAD_LIBEXPAT && XML_MAJOR_VERSION >= 2
-
-/* expat >= 2.0 -> Return type is 'int64_t' worst-case.  */
-
-/* Return true if libexpat was compiled with -DXML_LARGE_SIZE.  */
-static bool
-is_XML_LARGE_SIZE_ABI (void)
-{
-  static bool tested;
-  static bool is_large;
-
-  if (!tested)
-    {
-      const XML_Feature *features;
-
-      is_large = false;
-      for (features = XML_GetFeatureList (); features->name != NULL; features++)
-        if (strcmp (features->name, "XML_LARGE_SIZE") == 0)
-          {
-            is_large = true;
-            break;
-          }
-
-      tested = true;
-    }
-  return is_large;
-}
-
-int64_t
-rpl_XML_GetCurrentLineNumber (XML_Parser parser)
-{
-  if (is_XML_LARGE_SIZE_ABI ())
-    return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
-  else
-    return ((long (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
-}
-
-int64_t
-rpl_XML_GetCurrentColumnNumber (XML_Parser parser)
-{
-  if (is_XML_LARGE_SIZE_ABI ())
-    return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
-  else
-    return ((long (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
-}
-#endif
-
-
-/* ===================== Dynamic loading of libexpat.  ===================== */
-
-#if DYNLOAD_LIBEXPAT
-
-static XML_Expat_Version (*p_XML_ExpatVersionInfo) (void);
-
-XML_Expat_Version
-XML_ExpatVersionInfo (void)
-{
-  return (*p_XML_ExpatVersionInfo) ();
-}
-
-static const XML_Feature * (*p_XML_GetFeatureList) (void);
-
-const XML_Feature *
-XML_GetFeatureList (void)
-{
-  return (*p_XML_GetFeatureList) ();
-}
-
-enum XML_Size_ABI
-get_XML_Size_ABI (void)
-{
-  static bool tested;
-  static enum XML_Size_ABI abi;
-
-  if (!tested)
-    {
-      if (XML_ExpatVersionInfo () .major >= 2)
-        /* expat >= 2.0 -> XML_Size is 'int64_t' or 'long'.  */
-        {
-          const XML_Feature *features;
-
-          abi = is_long;
-          for (features = XML_GetFeatureList ();
-               features->name != NULL;
-               features++)
-            if (strcmp (features->name, "XML_LARGE_SIZE") == 0)
-              {
-                abi = is_int64_t;
-                break;
-              }
-        }
-      else
-        /* expat < 2.0 -> XML_Size is 'int'.  */
-        abi = is_int;
-      tested = true;
-    }
-  return abi;
-}
-
-static XML_Parser (*p_XML_ParserCreate) (const XML_Char *encoding);
-
-XML_Parser
-XML_ParserCreate (const XML_Char *encoding)
-{
-  return (*p_XML_ParserCreate) (encoding);
-}
-
-static void (*p_XML_SetElementHandler) (XML_Parser parser,
-                                        XML_StartElementHandler start,
-                                        XML_EndElementHandler end);
-
-void
-XML_SetElementHandler (XML_Parser parser,
-                       XML_StartElementHandler start,
-                       XML_EndElementHandler end)
-{
-  (*p_XML_SetElementHandler) (parser, start, end);
-}
-
-
-static void (*p_XML_SetCharacterDataHandler) (XML_Parser parser,
-                                              XML_CharacterDataHandler handler);
-
-void
-XML_SetCharacterDataHandler (XML_Parser parser,
-                             XML_CharacterDataHandler handler)
-{
-  (*p_XML_SetCharacterDataHandler) (parser, handler);
-}
-
-
-static void (*p_XML_SetCommentHandler) (XML_Parser parser,
-                                        XML_CommentHandler handler);
-
-void
-XML_SetCommentHandler (XML_Parser parser, XML_CommentHandler handler)
-{
-  (*p_XML_SetCommentHandler) (parser, handler);
-}
-
-
-static int (*p_XML_Parse) (XML_Parser parser, const char *s,
-                           int len, int isFinal);
-
-int
-XML_Parse (XML_Parser parser, const char *s, int len, int isFinal)
-{
-  return (*p_XML_Parse) (parser, s, len, isFinal);
-}
-
-
-static enum XML_Error (*p_XML_GetErrorCode) (XML_Parser parser);
-
-enum XML_Error
-XML_GetErrorCode (XML_Parser parser)
-{
-  return (*p_XML_GetErrorCode) (parser);
-}
-
-
-static void *p_XML_GetCurrentLineNumber;
-
-int64_t
-XML_GetCurrentLineNumber (XML_Parser parser)
-{
-  switch (get_XML_Size_ABI ())
-    {
-    case is_int:
-      return ((int (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
-    case is_long:
-      return ((long (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
-    case is_int64_t:
-      return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
-    default:
-      abort ();
-    }
-}
-
-static void *p_XML_GetCurrentColumnNumber;
-
-int64_t
-XML_GetCurrentColumnNumber (XML_Parser parser)
-{
-  switch (get_XML_Size_ABI ())
-    {
-    case is_int:
-      return ((int (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
-    case is_long:
-      return ((long (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
-    case is_int64_t:
-      return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
-    default:
-      abort ();
-    }
-}
-
-
-static const XML_LChar * (*p_XML_ErrorString) (int code);
-
-const XML_LChar *
-XML_ErrorString (int code)
-{
-  return (*p_XML_ErrorString) (code);
-}
-
-static void (*p_XML_ParserFree) (XML_Parser parser);
-
-void
-XML_ParserFree (XML_Parser parser)
-{
-  return (*p_XML_ParserFree) (parser);
-}
-
-static int libexpat_loaded = 0;
-
-bool
-load_libexpat ()
-{
-  if (libexpat_loaded == 0)
-    {
-      void *handle;
-
-      /* Try to load libexpat-2.x.  */
-      handle = dlopen ("libexpat.so.1", RTLD_LAZY);
-      if (handle == NULL)
-        /* Try to load libexpat-1.x.  */
-        handle = dlopen ("libexpat.so.0", RTLD_LAZY);
-      if (handle != NULL
-          && (p_XML_ExpatVersionInfo =
-                (XML_Expat_Version (*) (void))
-                dlsym (handle, "XML_ExpatVersionInfo")) != NULL
-          && (p_XML_GetFeatureList =
-                (const XML_Feature * (*) (void))
-                dlsym (handle, "XML_GetFeatureList")) != NULL
-          && (p_XML_ParserCreate =
-                (XML_Parser (*) (const XML_Char *))
-                dlsym (handle, "XML_ParserCreate")) != NULL
-          && (p_XML_SetElementHandler =
-                (void (*) (XML_Parser, XML_StartElementHandler, XML_EndElementHandler))
-                dlsym (handle, "XML_SetElementHandler")) != NULL
-          && (p_XML_SetCharacterDataHandler =
-                (void (*) (XML_Parser, XML_CharacterDataHandler))
-                dlsym (handle, "XML_SetCharacterDataHandler")) != NULL
-          && (p_XML_SetCommentHandler =
-                (void (*) (XML_Parser, XML_CommentHandler))
-                dlsym (handle, "XML_SetCommentHandler")) != NULL
-          && (p_XML_Parse =
-                (int (*) (XML_Parser, const char *, int, int))
-                dlsym (handle, "XML_Parse")) != NULL
-          && (p_XML_GetErrorCode =
-                (enum XML_Error (*) (XML_Parser))
-                dlsym (handle, "XML_GetErrorCode")) != NULL
-          && (p_XML_GetCurrentLineNumber =
-                dlsym (handle, "XML_GetCurrentLineNumber")) != NULL
-          && (p_XML_GetCurrentColumnNumber =
-                dlsym (handle, "XML_GetCurrentColumnNumber")) != NULL
-          && (p_XML_ParserFree =
-                (void (*) (XML_Parser))
-                dlsym (handle, "XML_ParserFree")) != NULL
-          && (p_XML_ErrorString =
-                (const XML_LChar * (*) (int))
-                dlsym (handle, "XML_ErrorString")) != NULL)
-        libexpat_loaded = 1;
-      else
-        libexpat_loaded = -1;
-    }
-  return libexpat_loaded >= 0;
-}
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/libexpat-compat.h gettext-0.18.1.1/gettext-tools/src/libexpat-compat.h
--- gettext-0.19.3/gettext-tools/src/libexpat-compat.h	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/libexpat-compat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/* xgettext libexpat compatibility.
-   Copyright (C) 2002-2003, 2005-2009, 2013 Free Software Foundation, Inc.
-
-   This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
-
-   This 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 <stdbool.h>
-#include <stdint.h>
-#if DYNLOAD_LIBEXPAT
-# include <dlfcn.h>
-#else
-# if HAVE_LIBEXPAT
-#  include <expat.h>
-# endif
-#endif
-
-#if !DYNLOAD_LIBEXPAT && XML_MAJOR_VERSION >= 2
-int64_t rpl_XML_GetCurrentLineNumber (XML_Parser parser);
-# undef XML_GetCurrentLineNumber
-# define XML_GetCurrentLineNumber rpl_XML_GetCurrentLineNumber
-
-int64_t rpl_XML_GetCurrentColumnNumber (XML_Parser parser);
-# undef XML_GetCurrentColumnNumber
-# define XML_GetCurrentColumnNumber rpl_XML_GetCurrentColumnNumber
-#endif
-
-/* ===================== Dynamic loading of libexpat.  ===================== */
-
-#if DYNLOAD_LIBEXPAT
-typedef struct
-  {
-    int major;
-    int minor;
-    int micro;
-  }
-  XML_Expat_Version;
-enum XML_FeatureEnum { XML_FEATURE_END = 0 };
-typedef struct
-  {
-    enum XML_FeatureEnum feature;
-    const char *name;
-    long int value;
-  }
-  XML_Feature;
-typedef void *XML_Parser;
-typedef char XML_Char;
-typedef char XML_LChar;
-enum XML_Error { XML_ERROR_NONE };
-typedef void (*XML_StartElementHandler) (void *userData, const XML_Char *name, const XML_Char **atts);
-typedef void (*XML_EndElementHandler) (void *userData, const XML_Char *name);
-typedef void (*XML_CharacterDataHandler) (void *userData, const XML_Char *s, int len);
-typedef void (*XML_CommentHandler) (void *userData, const XML_Char *data);
-
-XML_Expat_Version XML_ExpatVersionInfo (void);
-const XML_Feature * XML_GetFeatureList (void);
-
-enum XML_Size_ABI { is_int, is_long, is_int64_t };
-enum XML_Size_ABI get_XML_Size_ABI (void);
-
-XML_Parser XML_ParserCreate (const XML_Char *encoding);
-void XML_SetElementHandler (XML_Parser parser,
-                            XML_StartElementHandler start,
-                            XML_EndElementHandler end);
-void XML_SetCharacterDataHandler (XML_Parser parser,
-                                  XML_CharacterDataHandler handler);
-void XML_SetCommentHandler (XML_Parser parser, XML_CommentHandler handler);
-int XML_Parse (XML_Parser parser, const char *s, int len, int isFinal);
-enum XML_Error XML_GetErrorCode (XML_Parser parser);
-int64_t XML_GetCurrentLineNumber (XML_Parser parser);
-int64_t XML_GetCurrentColumnNumber (XML_Parser parser);
-const XML_LChar * XML_ErrorString (int code);
-void XML_ParserFree (XML_Parser parser);
-
-bool load_libexpat ();
-
-#define LIBEXPAT_AVAILABLE() (load_libexpat ())
-
-#elif HAVE_LIBEXPAT
-
-#define LIBEXPAT_AVAILABLE() true
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/Makefile.am gettext-0.18.1.1/gettext-tools/src/Makefile.am
--- gettext-0.19.3/gettext-tools/src/Makefile.am	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/Makefile.am	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/src subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 EXTRA_DIST =
 MOSTLYCLEANFILES = core *.stackdump
 CLEANFILES =
@@ -48,12 +48,10 @@
 read-resources.h write-resources.h \
 read-tcl.h write-tcl.h \
 write-qt.h \
-read-desktop.h write-desktop.h \
 po-time.h plural-table.h lang-table.h format.h filters.h \
 xgettext.h x-c.h x-po.h x-sh.h x-python.h x-lisp.h x-elisp.h x-librep.h \
 x-scheme.h x-smalltalk.h x-java.h x-properties.h x-csharp.h x-awk.h x-ycp.h \
-x-tcl.h x-perl.h x-php.h x-stringtable.h x-rst.h x-glade.h x-lua.h \
-x-javascript.h x-vala.h x-gsettings.h x-desktop.h libexpat-compat.h
+x-tcl.h x-perl.h x-php.h x-stringtable.h x-rst.h x-glade.h
 
 EXTRA_DIST += FILES project-id ChangeLog.0
 
@@ -114,33 +112,12 @@
 else
 FORMAT_SOURCE = ../woe32dll/c++format.cc
 endif
-FORMAT_SOURCE += \
-  format-invalid.h \
-  format-c.c format-c-parse.h \
-  format-sh.c \
-  format-python.c \
-  format-python-brace.c \
-  format-lisp.c \
-  format-elisp.c \
-  format-librep.c \
-  format-scheme.c \
-  format-java.c \
-  format-csharp.c \
-  format-awk.c \
-  format-pascal.c \
-  format-ycp.c \
-  format-tcl.c \
-  format-perl.c \
-  format-perl-brace.c \
-  format-php.c \
-  format-gcc-internal.c \
-  format-gfc-internal.c \
-  format-qt.c \
-  format-qt-plural.c \
-  format-kde.c \
-  format-boost.c \
-  format-lua.c \
-  format-javascript.c
+FORMAT_SOURCE += format-invalid.h \
+format-c.c format-sh.c format-python.c format-lisp.c format-elisp.c \
+format-librep.c format-scheme.c format-java.c format-csharp.c format-awk.c \
+format-pascal.c format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \
+format-php.c format-gcc-internal.c format-gfc-internal.c \
+format-qt.c format-qt-plural.c format-kde.c format-boost.c
 
 # libgettextsrc contains all code that is needed by at least two programs.
 libgettextsrc_la_SOURCES = \
@@ -149,8 +126,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 \
-$(FORMAT_SOURCE) \
-read-desktop.c
+$(FORMAT_SOURCE)
 
 # msggrep needs pattern matching.
 LIBGREP = ../libgrep/libgrep.a
@@ -161,7 +137,7 @@
 msgfmt_SOURCES = msgfmt.c
 msgfmt_SOURCES += \
   write-mo.c write-java.c write-csharp.c write-resources.c write-tcl.c \
-  write-qt.c write-desktop.c ../../gettext-runtime/intl/hash-string.c
+  write-qt.c ../../gettext-runtime/intl/hash-string.c
 if !WOE32DLL
 msgmerge_SOURCES = msgmerge.c
 else
@@ -179,9 +155,7 @@
 xgettext_SOURCES += \
   x-c.c x-po.c x-sh.c x-python.c x-lisp.c x-elisp.c x-librep.c x-scheme.c \
   x-smalltalk.c x-java.c x-csharp.c x-awk.c x-ycp.c x-tcl.c x-perl.c x-php.c \
-  x-rst.c x-glade.c x-lua.c x-javascript.c x-vala.c x-gsettings.c \
-  libexpat-compat.c \
-  x-desktop.c
+  x-rst.c x-glade.c
 if !WOE32DLL
 msgattrib_SOURCES = msgattrib.c
 else
@@ -214,7 +188,6 @@
 msgfilter_SOURCES = ../woe32dll/c++msgfilter.cc
 endif
 msgfilter_SOURCES += filter-sr-latin.c
-msgfilter_SOURCES += filter-quote.c
 if !WOE32DLL
 msggrep_SOURCES = msggrep.c
 else
@@ -247,19 +220,16 @@
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
-  ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
-
-libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS)
+  ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL
 libgettextsrc_la_SOURCES += ../woe32dll/gettextsrc-exports.c
 libgettextsrc_la_LDFLAGS += -Wl,--export-all-symbols
-libgettextsrc_la_CPPFLAGS += $(GETTEXTLIB_EXPORTS_FLAGS)
 endif
 
 # No need to install libgettextsrc.a, except on AIX.
-install-exec-hook: install-exec-clean
+install-exec-local: install-libLTLIBRARIES install-exec-clean
 install-exec-clean:
 	case "@host_os@" in \
 	  aix*) ;; \
@@ -278,7 +248,7 @@
 msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
 msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
+xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ $(WOE32_LDADD)
 msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
@@ -450,24 +420,21 @@
 
 po-lex.o po-lex.lo: po-gram-gen2.h
 po-gram-gen2.h: po-gram-gen.h
-	srcdir=''; \
-	test -f ./po-gram-gen.h || srcdir=$(srcdir)/; \
-	$(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' \
-	  $${srcdir}po-gram-gen.h > $@-tmp && \
+	$(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' $(srcdir)/po-gram-gen.h > $@-tmp
 	mv $@-tmp $@
 
 
 # Special rules for installation of auxiliary programs.
 
 install-exec-local:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
 	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email
 	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 
 uninstall-local:
 	$(RM) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
@@ -518,7 +485,7 @@
 
 install-exec-local: install-exec-java-@BUILDJAVAEXE@
 install-exec-java-yes: all-java-yes
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gnu.gettext.DumpResource$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.DumpResource$(EXEEXT)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gnu.gettext.GetURL$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.GetURL$(EXEEXT)
 install-exec-java-no:
@@ -532,10 +499,10 @@
 
 installdirs-local: installdirs-java-@BUILDJAVAEXE@
 installdirs-java-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 installdirs-java-no: installdirs-java-no-@BUILDJAVA@
 installdirs-java-no-yes:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 installdirs-java-no-no:
 
 uninstall-local: uninstall-java-@BUILDJAVAEXE@
@@ -568,15 +535,15 @@
 
 install-exec-local: install-exec-csharp-@BUILDCSHARP@
 install-exec-csharp-yes: all-csharp-yes
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_DATA) msgfmt.net.exe $(DESTDIR)$(pkglibdir)/msgfmt.net.exe
 	$(INSTALL_DATA) msgunfmt.net.exe $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe
 install-exec-csharp-no:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 
 installdirs-local: install-csharp
 installdirs-csharp:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 
 uninstall-local: uninstall-csharp-@BUILDCSHARP@
 uninstall-csharp-yes: all-csharp-yes
@@ -591,12 +558,12 @@
 
 install-data-local: install-tcl
 install-tcl:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl
 
 installdirs-local: installdirs-tcl
 installdirs-tcl:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local: uninstall-tcl
 uninstall-tcl:
diff -Nru gettext-0.19.3/gettext-tools/src/Makefile.in gettext-0.18.1.1/gettext-tools/src/Makefile.in
--- gettext-0.19.3/gettext-tools/src/Makefile.in	2014-10-16 06:01:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/Makefile.in	2010-06-06 20:12:32.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -17,52 +18,8 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -88,74 +45,62 @@
 # 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
+@WOE32_TRUE@am__append_3 = gettext.res
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs \
-	$(srcdir)/user-email.sh.in po-gram-gen.c \
-	$(top_srcdir)/../build-aux/ylwrap $(noinst_HEADERS) ChangeLog
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/user-email.sh.in ChangeLog \
+	po-gram-gen.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -163,12 +108,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -185,7 +127,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -197,7 +138,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -206,26 +146,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -234,17 +168,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -270,7 +200,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -279,7 +208,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -288,26 +216,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -364,12 +290,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgettextsrc_la_LIBADD =
@@ -381,93 +301,46 @@
 	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 format.c \
-	format-invalid.h format-c.c format-c-parse.h format-sh.c \
-	format-python.c format-python-brace.c format-lisp.c \
-	format-elisp.c format-librep.c format-scheme.c format-java.c \
-	format-csharp.c format-awk.c format-pascal.c format-ycp.c \
-	format-tcl.c format-perl.c format-perl-brace.c format-php.c \
-	format-gcc-internal.c format-gfc-internal.c format-qt.c \
-	format-qt-plural.c format-kde.c format-boost.c format-lua.c \
-	format-javascript.c ../woe32dll/c++format.cc read-desktop.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 \
-	libgettextsrc_la-po-lex.lo libgettextsrc_la-po-gram-gen.lo \
-	libgettextsrc_la-po-charset.lo libgettextsrc_la-read-po.lo \
-	libgettextsrc_la-read-properties.lo \
-	libgettextsrc_la-read-stringtable.lo \
-	libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \
-	libgettextsrc_la-str-list.lo
-am__dirstamp = $(am__leading_dot)dirstamp
-@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-format.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-c.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-sh.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-python.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-python-brace.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-lisp.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-elisp.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-librep.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-scheme.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-java.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-csharp.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-awk.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-pascal.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-ycp.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-tcl.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-perl.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-perl-brace.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-php.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-gcc-internal.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-gfc-internal.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-qt.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-qt-plural.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-kde.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-boost.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-lua.lo \
-@WOE32DLL_FALSE@	libgettextsrc_la-format-javascript.lo
-@WOE32DLL_TRUE@am__objects_2 =  \
-@WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++format.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-c.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-sh.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-python.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-python-brace.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-lisp.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-elisp.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-librep.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-scheme.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-java.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-csharp.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-awk.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-pascal.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-ycp.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-tcl.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-perl.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-perl-brace.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-php.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-gcc-internal.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-gfc-internal.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-qt.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-qt-plural.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-kde.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-boost.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-lua.lo \
-@WOE32DLL_TRUE@	libgettextsrc_la-format-javascript.lo
-@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo
-am_libgettextsrc_la_OBJECTS = $(am__objects_1) \
-	libgettextsrc_la-read-catalog.lo libgettextsrc_la-color.lo \
-	libgettextsrc_la-write-catalog.lo \
-	libgettextsrc_la-write-properties.lo \
-	libgettextsrc_la-write-stringtable.lo \
-	libgettextsrc_la-write-po.lo libgettextsrc_la-msgl-ascii.lo \
-	libgettextsrc_la-msgl-iconv.lo libgettextsrc_la-msgl-equal.lo \
-	libgettextsrc_la-msgl-cat.lo libgettextsrc_la-msgl-header.lo \
-	libgettextsrc_la-msgl-english.lo \
-	libgettextsrc_la-msgl-check.lo libgettextsrc_la-file-list.lo \
-	libgettextsrc_la-msgl-charset.lo libgettextsrc_la-po-time.lo \
-	libgettextsrc_la-plural-exp.lo libgettextsrc_la-plural-eval.lo \
-	libgettextsrc_la-plural-table.lo $(am__objects_2) \
-	libgettextsrc_la-read-desktop.lo $(am__objects_3)
+	format-invalid.h format-c.c format-sh.c format-python.c \
+	format-lisp.c format-elisp.c format-librep.c format-scheme.c \
+	format-java.c format-csharp.c format-awk.c format-pascal.c \
+	format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \
+	format-php.c format-gcc-internal.c format-gfc-internal.c \
+	format-qt.c format-qt-plural.c format-kde.c format-boost.c \
+	../woe32dll/c++format.cc ../woe32dll/gettextsrc-exports.c
+am__objects_1 = message.lo po-error.lo po-xerror.lo \
+	read-catalog-abstract.lo po-lex.lo po-gram-gen.lo \
+	po-charset.lo read-po.lo read-properties.lo \
+	read-stringtable.lo open-catalog.lo dir-list.lo str-list.lo
+@WOE32DLL_FALSE@am__objects_2 = format.lo format-c.lo format-sh.lo \
+@WOE32DLL_FALSE@	format-python.lo format-lisp.lo \
+@WOE32DLL_FALSE@	format-elisp.lo format-librep.lo \
+@WOE32DLL_FALSE@	format-scheme.lo format-java.lo \
+@WOE32DLL_FALSE@	format-csharp.lo format-awk.lo \
+@WOE32DLL_FALSE@	format-pascal.lo format-ycp.lo format-tcl.lo \
+@WOE32DLL_FALSE@	format-perl.lo format-perl-brace.lo \
+@WOE32DLL_FALSE@	format-php.lo format-gcc-internal.lo \
+@WOE32DLL_FALSE@	format-gfc-internal.lo format-qt.lo \
+@WOE32DLL_FALSE@	format-qt-plural.lo format-kde.lo \
+@WOE32DLL_FALSE@	format-boost.lo
+@WOE32DLL_TRUE@am__objects_2 = c++format.lo format-c.lo format-sh.lo \
+@WOE32DLL_TRUE@	format-python.lo format-lisp.lo format-elisp.lo \
+@WOE32DLL_TRUE@	format-librep.lo format-scheme.lo \
+@WOE32DLL_TRUE@	format-java.lo format-csharp.lo format-awk.lo \
+@WOE32DLL_TRUE@	format-pascal.lo format-ycp.lo format-tcl.lo \
+@WOE32DLL_TRUE@	format-perl.lo format-perl-brace.lo \
+@WOE32DLL_TRUE@	format-php.lo format-gcc-internal.lo \
+@WOE32DLL_TRUE@	format-gfc-internal.lo format-qt.lo \
+@WOE32DLL_TRUE@	format-qt-plural.lo format-kde.lo \
+@WOE32DLL_TRUE@	format-boost.lo
+@WOE32DLL_TRUE@am__objects_3 = gettextsrc-exports.lo
+am_libgettextsrc_la_OBJECTS = $(am__objects_1) read-catalog.lo \
+	color.lo write-catalog.lo write-properties.lo \
+	write-stringtable.lo write-po.lo msgl-ascii.lo msgl-iconv.lo \
+	msgl-equal.lo msgl-cat.lo msgl-header.lo msgl-english.lo \
+	msgl-check.lo file-list.lo msgl-charset.lo po-time.lo \
+	plural-exp.lo plural-eval.lo plural-table.lo $(am__objects_2) \
+	$(am__objects_3)
 libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_hostname_OBJECTS = hostname-hostname.$(OBJEXT)
@@ -475,22 +348,20 @@
 hostname_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 @WOE32_TRUE@am__DEPENDENCIES_2 = gettext.res
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 hostname_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(hostname_LDFLAGS) $(LDFLAGS) -o $@
 am__msgattrib_SOURCES_DIST = msgattrib.c ../woe32dll/c++msgattrib.cc
 @WOE32DLL_FALSE@am_msgattrib_OBJECTS = msgattrib-msgattrib.$(OBJEXT)
 @WOE32DLL_TRUE@am_msgattrib_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgattrib-c++msgattrib.$(OBJEXT)
+@WOE32DLL_TRUE@	msgattrib-c++msgattrib.$(OBJEXT)
 msgattrib_OBJECTS = $(am_msgattrib_OBJECTS)
 am__msgcat_SOURCES_DIST = msgcat.c ../woe32dll/c++msgcat.cc
 @WOE32DLL_FALSE@am_msgcat_OBJECTS = msgcat-msgcat.$(OBJEXT)
-@WOE32DLL_TRUE@am_msgcat_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgcat-c++msgcat.$(OBJEXT)
+@WOE32DLL_TRUE@am_msgcat_OBJECTS = msgcat-c++msgcat.$(OBJEXT)
 msgcat_OBJECTS = $(am_msgcat_OBJECTS)
 am_msgcmp_OBJECTS = msgcmp-msgcmp.$(OBJEXT) \
 	msgcmp-msgl-fsearch.$(OBJEXT)
@@ -500,18 +371,15 @@
 	$(msgcmp_LDFLAGS) $(LDFLAGS) -o $@
 am__msgcomm_SOURCES_DIST = msgcomm.c ../woe32dll/c++msgcomm.cc
 @WOE32DLL_FALSE@am_msgcomm_OBJECTS = msgcomm-msgcomm.$(OBJEXT)
-@WOE32DLL_TRUE@am_msgcomm_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgcomm-c++msgcomm.$(OBJEXT)
+@WOE32DLL_TRUE@am_msgcomm_OBJECTS = msgcomm-c++msgcomm.$(OBJEXT)
 msgcomm_OBJECTS = $(am_msgcomm_OBJECTS)
 am__msgconv_SOURCES_DIST = msgconv.c ../woe32dll/c++msgconv.cc
 @WOE32DLL_FALSE@am_msgconv_OBJECTS = msgconv-msgconv.$(OBJEXT)
-@WOE32DLL_TRUE@am_msgconv_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgconv-c++msgconv.$(OBJEXT)
+@WOE32DLL_TRUE@am_msgconv_OBJECTS = msgconv-c++msgconv.$(OBJEXT)
 msgconv_OBJECTS = $(am_msgconv_OBJECTS)
 am__msgen_SOURCES_DIST = msgen.c ../woe32dll/c++msgen.cc
 @WOE32DLL_FALSE@am_msgen_OBJECTS = msgen-msgen.$(OBJEXT)
-@WOE32DLL_TRUE@am_msgen_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgen-c++msgen.$(OBJEXT)
+@WOE32DLL_TRUE@am_msgen_OBJECTS = msgen-c++msgen.$(OBJEXT)
 msgen_OBJECTS = $(am_msgen_OBJECTS)
 am_msgexec_OBJECTS = msgexec-msgexec.$(OBJEXT)
 msgexec_OBJECTS = $(am_msgexec_OBJECTS)
@@ -519,33 +387,28 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(msgexec_LDFLAGS) $(LDFLAGS) -o $@
 am__msgfilter_SOURCES_DIST = msgfilter.c filter-sr-latin.c \
-	filter-quote.c ../woe32dll/c++msgfilter.cc
+	../woe32dll/c++msgfilter.cc
 @WOE32DLL_FALSE@am_msgfilter_OBJECTS = msgfilter-msgfilter.$(OBJEXT) \
-@WOE32DLL_FALSE@	msgfilter-filter-sr-latin.$(OBJEXT) \
-@WOE32DLL_FALSE@	msgfilter-filter-quote.$(OBJEXT)
+@WOE32DLL_FALSE@	msgfilter-filter-sr-latin.$(OBJEXT)
 @WOE32DLL_TRUE@am_msgfilter_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgfilter-c++msgfilter.$(OBJEXT) \
-@WOE32DLL_TRUE@	msgfilter-filter-sr-latin.$(OBJEXT) \
-@WOE32DLL_TRUE@	msgfilter-filter-quote.$(OBJEXT)
+@WOE32DLL_TRUE@	msgfilter-c++msgfilter.$(OBJEXT) \
+@WOE32DLL_TRUE@	msgfilter-filter-sr-latin.$(OBJEXT)
 msgfilter_OBJECTS = $(am_msgfilter_OBJECTS)
 am_msgfmt_OBJECTS = msgfmt-msgfmt.$(OBJEXT) msgfmt-write-mo.$(OBJEXT) \
 	msgfmt-write-java.$(OBJEXT) msgfmt-write-csharp.$(OBJEXT) \
 	msgfmt-write-resources.$(OBJEXT) msgfmt-write-tcl.$(OBJEXT) \
-	msgfmt-write-qt.$(OBJEXT) msgfmt-write-desktop.$(OBJEXT) \
-	../../gettext-runtime/intl/msgfmt-hash-string.$(OBJEXT)
+	msgfmt-write-qt.$(OBJEXT) msgfmt-hash-string.$(OBJEXT)
 msgfmt_OBJECTS = $(am_msgfmt_OBJECTS)
 msgfmt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(msgfmt_LDFLAGS) $(LDFLAGS) -o $@
 am__msggrep_SOURCES_DIST = msggrep.c ../woe32dll/c++msggrep.cc
 @WOE32DLL_FALSE@am_msggrep_OBJECTS = msggrep-msggrep.$(OBJEXT)
-@WOE32DLL_TRUE@am_msggrep_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msggrep-c++msggrep.$(OBJEXT)
+@WOE32DLL_TRUE@am_msggrep_OBJECTS = msggrep-c++msggrep.$(OBJEXT)
 msggrep_OBJECTS = $(am_msggrep_OBJECTS)
 am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
 	msginit-lang-table.$(OBJEXT) msginit-plural-count.$(OBJEXT) \
-	../../gettext-runtime/intl/msginit-localealias.$(OBJEXT) \
-	../../gettext-runtime/intl/msginit-lock.$(OBJEXT)
+	msginit-localealias.$(OBJEXT) msginit-lock.$(OBJEXT)
 msginit_OBJECTS = $(am_msginit_OBJECTS)
 msginit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -556,8 +419,7 @@
 @WOE32DLL_FALSE@	msgmerge-msgl-fsearch.$(OBJEXT) \
 @WOE32DLL_FALSE@	msgmerge-lang-table.$(OBJEXT) \
 @WOE32DLL_FALSE@	msgmerge-plural-count.$(OBJEXT)
-@WOE32DLL_TRUE@am_msgmerge_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msgmerge-c++msgmerge.$(OBJEXT) \
+@WOE32DLL_TRUE@am_msgmerge_OBJECTS = msgmerge-c++msgmerge.$(OBJEXT) \
 @WOE32DLL_TRUE@	msgmerge-msgl-fsearch.$(OBJEXT) \
 @WOE32DLL_TRUE@	msgmerge-lang-table.$(OBJEXT) \
 @WOE32DLL_TRUE@	msgmerge-plural-count.$(OBJEXT)
@@ -572,8 +434,7 @@
 	$(msgunfmt_LDFLAGS) $(LDFLAGS) -o $@
 am__msguniq_SOURCES_DIST = msguniq.c ../woe32dll/c++msguniq.cc
 @WOE32DLL_FALSE@am_msguniq_OBJECTS = msguniq-msguniq.$(OBJEXT)
-@WOE32DLL_TRUE@am_msguniq_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/msguniq-c++msguniq.$(OBJEXT)
+@WOE32DLL_TRUE@am_msguniq_OBJECTS = msguniq-c++msguniq.$(OBJEXT)
 msguniq_OBJECTS = $(am_msguniq_OBJECTS)
 am_recode_sr_latin_OBJECTS =  \
 	recode_sr_latin-recode-sr-latin.$(OBJEXT) \
@@ -593,9 +454,7 @@
 am__xgettext_SOURCES_DIST = xgettext.c x-c.c x-po.c x-sh.c x-python.c \
 	x-lisp.c x-elisp.c x-librep.c x-scheme.c x-smalltalk.c \
 	x-java.c x-csharp.c x-awk.c x-ycp.c x-tcl.c x-perl.c x-php.c \
-	x-rst.c x-glade.c x-lua.c x-javascript.c x-vala.c \
-	x-gsettings.c libexpat-compat.c x-desktop.c \
-	../woe32dll/c++xgettext.cc
+	x-rst.c x-glade.c ../woe32dll/c++xgettext.cc
 @WOE32DLL_FALSE@am_xgettext_OBJECTS = xgettext-xgettext.$(OBJEXT) \
 @WOE32DLL_FALSE@	xgettext-x-c.$(OBJEXT) xgettext-x-po.$(OBJEXT) \
 @WOE32DLL_FALSE@	xgettext-x-sh.$(OBJEXT) \
@@ -613,15 +472,8 @@
 @WOE32DLL_FALSE@	xgettext-x-perl.$(OBJEXT) \
 @WOE32DLL_FALSE@	xgettext-x-php.$(OBJEXT) \
 @WOE32DLL_FALSE@	xgettext-x-rst.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-x-glade.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-x-lua.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-x-javascript.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-x-vala.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-x-gsettings.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-libexpat-compat.$(OBJEXT) \
-@WOE32DLL_FALSE@	xgettext-x-desktop.$(OBJEXT)
-@WOE32DLL_TRUE@am_xgettext_OBJECTS =  \
-@WOE32DLL_TRUE@	../woe32dll/xgettext-c++xgettext.$(OBJEXT) \
+@WOE32DLL_FALSE@	xgettext-x-glade.$(OBJEXT)
+@WOE32DLL_TRUE@am_xgettext_OBJECTS = xgettext-c++xgettext.$(OBJEXT) \
 @WOE32DLL_TRUE@	xgettext-x-c.$(OBJEXT) xgettext-x-po.$(OBJEXT) \
 @WOE32DLL_TRUE@	xgettext-x-sh.$(OBJEXT) \
 @WOE32DLL_TRUE@	xgettext-x-python.$(OBJEXT) \
@@ -638,26 +490,8 @@
 @WOE32DLL_TRUE@	xgettext-x-perl.$(OBJEXT) \
 @WOE32DLL_TRUE@	xgettext-x-php.$(OBJEXT) \
 @WOE32DLL_TRUE@	xgettext-x-rst.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-x-glade.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-x-lua.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-x-javascript.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-x-vala.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-x-gsettings.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-libexpat-compat.$(OBJEXT) \
-@WOE32DLL_TRUE@	xgettext-x-desktop.$(OBJEXT)
+@WOE32DLL_TRUE@	xgettext-x-glade.$(OBJEXT)
 xgettext_OBJECTS = $(am_xgettext_OBJECTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -667,46 +501,45 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
-		   -e s/c++$$/h++/ -e s/c$$/h/
-YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
 LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
-AM_V_YACC = $(am__v_YACC_@AM_V@)
-am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
-am__v_YACC_0 = @echo "  YACC    " $@;
-am__v_YACC_1 = 
+	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+AM_V_YACC = $(am__v_YACC_$(V))
+am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
+am__v_YACC_0 = @echo "  YACC  " $@;
 YLWRAP = $(top_srcdir)/../build-aux/ylwrap
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgettextsrc_la_SOURCES) $(hostname_SOURCES) \
 	$(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) \
 	$(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) \
@@ -725,35 +558,12 @@
 	$(am__msgmerge_SOURCES_DIST) $(msgunfmt_SOURCES) \
 	$(am__msguniq_SOURCES_DIST) $(recode_sr_latin_SOURCES) \
 	$(urlget_SOURCES) $(am__xgettext_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 HEADERS = $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/gettext
 pkglibdir = $(libdir)/gettext
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -762,7 +572,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -800,7 +609,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = \
@@ -847,18 +655,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -870,26 +677,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -897,8 +694,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -910,23 +705,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -949,7 +739,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -967,18 +756,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -1003,47 +787,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -1051,7 +827,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -1061,21 +836,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -1087,103 +858,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -1194,11 +912,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -1208,6 +921,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -1220,7 +934,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1241,16 +954,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -1273,48 +986,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -1337,6 +1035,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1346,13 +1045,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1361,47 +1063,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1416,8 +1087,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1457,7 +1126,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1479,8 +1147,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1488,13 +1156,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1507,21 +1173,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1534,9 +1198,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1560,9 +1224,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1578,12 +1240,9 @@
 RELOCATABLE_SRC_DIR = $(top_srcdir)/gnulib-lib
 RELOCATABLE_STRIP = :
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1591,8 +1250,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1604,41 +1261,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1652,27 +1297,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1680,34 +1312,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1723,9 +1346,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1745,8 +1366,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1755,8 +1374,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1771,7 +1388,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1822,6 +1438,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1829,7 +1446,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1839,7 +1455,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
 # Special rules for C# auxiliary programs.
 
@@ -1847,7 +1463,7 @@
 EXTRA_DIST = FILES project-id ChangeLog.0 \
 	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_3)
 CLEANFILES = gnu.gettext.DumpResource$(EXEEXT) \
 	gnu.gettext.GetURL$(EXEEXT) gettext.jar gnu/gettext/*.class \
 	msgfmt.net.exe msgfmt.net.exe.mdb msgunfmt.net.exe \
@@ -1870,12 +1486,10 @@
 read-resources.h write-resources.h \
 read-tcl.h write-tcl.h \
 write-qt.h \
-read-desktop.h write-desktop.h \
 po-time.h plural-table.h lang-table.h format.h filters.h \
 xgettext.h x-c.h x-po.h x-sh.h x-python.h x-lisp.h x-elisp.h x-librep.h \
 x-scheme.h x-smalltalk.h x-java.h x-properties.h x-csharp.h x-awk.h x-ycp.h \
-x-tcl.h x-perl.h x-php.h x-stringtable.h x-rst.h x-glade.h x-lua.h \
-x-javascript.h x-vala.h x-gsettings.h x-desktop.h libexpat-compat.h
+x-tcl.h x-perl.h x-php.h x-stringtable.h x-rst.h x-glade.h
 
 aliaspath = $(localedir)
 jardir = $(datadir)/gettext
@@ -1910,27 +1524,24 @@
 
 # xgettext and msgfmt deal with format strings.
 @WOE32DLL_FALSE@FORMAT_SOURCE = format.c format-invalid.h format-c.c \
-@WOE32DLL_FALSE@	format-c-parse.h format-sh.c format-python.c \
-@WOE32DLL_FALSE@	format-python-brace.c format-lisp.c \
+@WOE32DLL_FALSE@	format-sh.c format-python.c format-lisp.c \
 @WOE32DLL_FALSE@	format-elisp.c format-librep.c format-scheme.c \
 @WOE32DLL_FALSE@	format-java.c format-csharp.c format-awk.c \
 @WOE32DLL_FALSE@	format-pascal.c format-ycp.c format-tcl.c \
 @WOE32DLL_FALSE@	format-perl.c format-perl-brace.c format-php.c \
 @WOE32DLL_FALSE@	format-gcc-internal.c format-gfc-internal.c \
 @WOE32DLL_FALSE@	format-qt.c format-qt-plural.c format-kde.c \
-@WOE32DLL_FALSE@	format-boost.c format-lua.c \
-@WOE32DLL_FALSE@	format-javascript.c
+@WOE32DLL_FALSE@	format-boost.c
 @WOE32DLL_TRUE@FORMAT_SOURCE = ../woe32dll/c++format.cc \
-@WOE32DLL_TRUE@	format-invalid.h format-c.c format-c-parse.h \
-@WOE32DLL_TRUE@	format-sh.c format-python.c \
-@WOE32DLL_TRUE@	format-python-brace.c format-lisp.c \
-@WOE32DLL_TRUE@	format-elisp.c format-librep.c format-scheme.c \
-@WOE32DLL_TRUE@	format-java.c format-csharp.c format-awk.c \
-@WOE32DLL_TRUE@	format-pascal.c format-ycp.c format-tcl.c \
-@WOE32DLL_TRUE@	format-perl.c format-perl-brace.c format-php.c \
+@WOE32DLL_TRUE@	format-invalid.h format-c.c format-sh.c \
+@WOE32DLL_TRUE@	format-python.c format-lisp.c format-elisp.c \
+@WOE32DLL_TRUE@	format-librep.c format-scheme.c format-java.c \
+@WOE32DLL_TRUE@	format-csharp.c format-awk.c format-pascal.c \
+@WOE32DLL_TRUE@	format-ycp.c format-tcl.c format-perl.c \
+@WOE32DLL_TRUE@	format-perl-brace.c format-php.c \
 @WOE32DLL_TRUE@	format-gcc-internal.c format-gfc-internal.c \
 @WOE32DLL_TRUE@	format-qt.c format-qt-plural.c format-kde.c \
-@WOE32DLL_TRUE@	format-boost.c format-lua.c format-javascript.c
+@WOE32DLL_TRUE@	format-boost.c
 
 # libgettextsrc contains all code that is needed by at least two programs.
 libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \
@@ -1938,7 +1549,7 @@
 	write-po.c 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 $(FORMAT_SOURCE) read-desktop.c $(am__append_1)
+	plural-table.c $(FORMAT_SOURCE) $(am__append_1)
 
 # msggrep needs pattern matching.
 LIBGREP = ../libgrep/libgrep.a
@@ -1946,7 +1557,7 @@
 # Source dependencies.
 msgcmp_SOURCES = msgcmp.c msgl-fsearch.c
 msgfmt_SOURCES = msgfmt.c write-mo.c write-java.c write-csharp.c \
-	write-resources.c write-tcl.c write-qt.c write-desktop.c \
+	write-resources.c write-tcl.c write-qt.c \
 	../../gettext-runtime/intl/hash-string.c
 @WOE32DLL_FALSE@msgmerge_SOURCES = msgmerge.c msgl-fsearch.c \
 @WOE32DLL_FALSE@	lang-table.c plural-count.c
@@ -1958,16 +1569,12 @@
 @WOE32DLL_FALSE@	x-python.c x-lisp.c x-elisp.c x-librep.c \
 @WOE32DLL_FALSE@	x-scheme.c x-smalltalk.c x-java.c x-csharp.c \
 @WOE32DLL_FALSE@	x-awk.c x-ycp.c x-tcl.c x-perl.c x-php.c \
-@WOE32DLL_FALSE@	x-rst.c x-glade.c x-lua.c x-javascript.c \
-@WOE32DLL_FALSE@	x-vala.c x-gsettings.c libexpat-compat.c \
-@WOE32DLL_FALSE@	x-desktop.c
+@WOE32DLL_FALSE@	x-rst.c x-glade.c
 @WOE32DLL_TRUE@xgettext_SOURCES = ../woe32dll/c++xgettext.cc x-c.c \
 @WOE32DLL_TRUE@	x-po.c x-sh.c x-python.c x-lisp.c x-elisp.c \
 @WOE32DLL_TRUE@	x-librep.c x-scheme.c x-smalltalk.c x-java.c \
 @WOE32DLL_TRUE@	x-csharp.c x-awk.c x-ycp.c x-tcl.c x-perl.c \
-@WOE32DLL_TRUE@	x-php.c x-rst.c x-glade.c x-lua.c \
-@WOE32DLL_TRUE@	x-javascript.c x-vala.c x-gsettings.c \
-@WOE32DLL_TRUE@	libexpat-compat.c x-desktop.c
+@WOE32DLL_TRUE@	x-php.c x-rst.c x-glade.c
 @WOE32DLL_FALSE@msgattrib_SOURCES = msgattrib.c
 @WOE32DLL_TRUE@msgattrib_SOURCES = ../woe32dll/c++msgattrib.cc
 @WOE32DLL_FALSE@msgcat_SOURCES = msgcat.c
@@ -1979,10 +1586,9 @@
 @WOE32DLL_FALSE@msgen_SOURCES = msgen.c
 @WOE32DLL_TRUE@msgen_SOURCES = ../woe32dll/c++msgen.cc
 msgexec_SOURCES = msgexec.c
-@WOE32DLL_FALSE@msgfilter_SOURCES = msgfilter.c filter-sr-latin.c \
-@WOE32DLL_FALSE@	filter-quote.c
+@WOE32DLL_FALSE@msgfilter_SOURCES = msgfilter.c filter-sr-latin.c
 @WOE32DLL_TRUE@msgfilter_SOURCES = ../woe32dll/c++msgfilter.cc \
-@WOE32DLL_TRUE@	filter-sr-latin.c filter-quote.c
+@WOE32DLL_TRUE@	filter-sr-latin.c
 @WOE32DLL_FALSE@msggrep_SOURCES = msggrep.c
 @WOE32DLL_TRUE@msggrep_SOURCES = ../woe32dll/c++msggrep.cc
 # This is needed because on Solaris, localealias.c requires the symbol
@@ -2008,8 +1614,7 @@
 # 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) $(am__append_3)
+	@LTLIBICONV@ -lc @LTNOUNDEF@ $(am__append_2)
 
 # Compile-time flags for particular source files.
 msgmerge_CFLAGS = $(AM_CFLAGS) $(OPENMP_CFLAGS)
@@ -2023,7 +1628,7 @@
 msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
 msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
+xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ $(WOE32_LDADD)
 msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
@@ -2260,9 +1865,9 @@
 $(am__aclocal_m4_deps):
 user-email: $(top_builddir)/config.status $(srcdir)/user-email.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -2270,8 +1875,6 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -2287,39 +1890,24 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-../woe32dll/$(am__dirstamp):
-	@$(MKDIR_P) ../woe32dll
-	@: > ../woe32dll/$(am__dirstamp)
-../woe32dll/libgettextsrc_la-c++format.lo:  \
-	../woe32dll/$(am__dirstamp)
-../woe32dll/libgettextsrc_la-gettextsrc-exports.lo:  \
-	../woe32dll/$(am__dirstamp)
-
-libgettextsrc.la: $(libgettextsrc_la_OBJECTS) $(libgettextsrc_la_DEPENDENCIES) $(EXTRA_libgettextsrc_la_DEPENDENCIES) 
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libgettextsrc.la: $(libgettextsrc_la_OBJECTS) $(libgettextsrc_la_DEPENDENCIES) 
 	$(AM_V_GEN)$(libgettextsrc_la_LINK) -rpath $(libdir) $(libgettextsrc_la_OBJECTS) $(libgettextsrc_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -2340,8 +1928,7 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
+	      -e 's/$$/$(EXEEXT)/' `; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -2379,787 +1966,672 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-
-hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES) $(EXTRA_hostname_DEPENDENCIES) 
+hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES) 
 	@rm -f hostname$(EXEEXT)
 	$(AM_V_CCLD)$(hostname_LINK) $(hostname_OBJECTS) $(hostname_LDADD) $(LIBS)
-../woe32dll/msgattrib-c++msgattrib.$(OBJEXT):  \
-	../woe32dll/$(am__dirstamp)
-
-msgattrib$(EXEEXT): $(msgattrib_OBJECTS) $(msgattrib_DEPENDENCIES) $(EXTRA_msgattrib_DEPENDENCIES) 
+msgattrib$(EXEEXT): $(msgattrib_OBJECTS) $(msgattrib_DEPENDENCIES) 
 	@rm -f msgattrib$(EXEEXT)
 	$(AM_V_GEN)$(msgattrib_LINK) $(msgattrib_OBJECTS) $(msgattrib_LDADD) $(LIBS)
-../woe32dll/msgcat-c++msgcat.$(OBJEXT): ../woe32dll/$(am__dirstamp)
-
-msgcat$(EXEEXT): $(msgcat_OBJECTS) $(msgcat_DEPENDENCIES) $(EXTRA_msgcat_DEPENDENCIES) 
+msgcat$(EXEEXT): $(msgcat_OBJECTS) $(msgcat_DEPENDENCIES) 
 	@rm -f msgcat$(EXEEXT)
 	$(AM_V_GEN)$(msgcat_LINK) $(msgcat_OBJECTS) $(msgcat_LDADD) $(LIBS)
-
-msgcmp$(EXEEXT): $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES) $(EXTRA_msgcmp_DEPENDENCIES) 
+msgcmp$(EXEEXT): $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES) 
 	@rm -f msgcmp$(EXEEXT)
 	$(AM_V_CCLD)$(msgcmp_LINK) $(msgcmp_OBJECTS) $(msgcmp_LDADD) $(LIBS)
-../woe32dll/msgcomm-c++msgcomm.$(OBJEXT): ../woe32dll/$(am__dirstamp)
-
-msgcomm$(EXEEXT): $(msgcomm_OBJECTS) $(msgcomm_DEPENDENCIES) $(EXTRA_msgcomm_DEPENDENCIES) 
+msgcomm$(EXEEXT): $(msgcomm_OBJECTS) $(msgcomm_DEPENDENCIES) 
 	@rm -f msgcomm$(EXEEXT)
 	$(AM_V_GEN)$(msgcomm_LINK) $(msgcomm_OBJECTS) $(msgcomm_LDADD) $(LIBS)
-../woe32dll/msgconv-c++msgconv.$(OBJEXT): ../woe32dll/$(am__dirstamp)
-
-msgconv$(EXEEXT): $(msgconv_OBJECTS) $(msgconv_DEPENDENCIES) $(EXTRA_msgconv_DEPENDENCIES) 
+msgconv$(EXEEXT): $(msgconv_OBJECTS) $(msgconv_DEPENDENCIES) 
 	@rm -f msgconv$(EXEEXT)
 	$(AM_V_GEN)$(msgconv_LINK) $(msgconv_OBJECTS) $(msgconv_LDADD) $(LIBS)
-../woe32dll/msgen-c++msgen.$(OBJEXT): ../woe32dll/$(am__dirstamp)
-
-msgen$(EXEEXT): $(msgen_OBJECTS) $(msgen_DEPENDENCIES) $(EXTRA_msgen_DEPENDENCIES) 
+msgen$(EXEEXT): $(msgen_OBJECTS) $(msgen_DEPENDENCIES) 
 	@rm -f msgen$(EXEEXT)
 	$(AM_V_GEN)$(msgen_LINK) $(msgen_OBJECTS) $(msgen_LDADD) $(LIBS)
-
-msgexec$(EXEEXT): $(msgexec_OBJECTS) $(msgexec_DEPENDENCIES) $(EXTRA_msgexec_DEPENDENCIES) 
+msgexec$(EXEEXT): $(msgexec_OBJECTS) $(msgexec_DEPENDENCIES) 
 	@rm -f msgexec$(EXEEXT)
 	$(AM_V_CCLD)$(msgexec_LINK) $(msgexec_OBJECTS) $(msgexec_LDADD) $(LIBS)
-../woe32dll/msgfilter-c++msgfilter.$(OBJEXT):  \
-	../woe32dll/$(am__dirstamp)
-
-msgfilter$(EXEEXT): $(msgfilter_OBJECTS) $(msgfilter_DEPENDENCIES) $(EXTRA_msgfilter_DEPENDENCIES) 
+msgfilter$(EXEEXT): $(msgfilter_OBJECTS) $(msgfilter_DEPENDENCIES) 
 	@rm -f msgfilter$(EXEEXT)
 	$(AM_V_GEN)$(msgfilter_LINK) $(msgfilter_OBJECTS) $(msgfilter_LDADD) $(LIBS)
-../../gettext-runtime/intl/$(am__dirstamp):
-	@$(MKDIR_P) ../../gettext-runtime/intl
-	@: > ../../gettext-runtime/intl/$(am__dirstamp)
-../../gettext-runtime/intl/msgfmt-hash-string.$(OBJEXT):  \
-	../../gettext-runtime/intl/$(am__dirstamp)
-
-msgfmt$(EXEEXT): $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES) $(EXTRA_msgfmt_DEPENDENCIES) 
+msgfmt$(EXEEXT): $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES) 
 	@rm -f msgfmt$(EXEEXT)
 	$(AM_V_CCLD)$(msgfmt_LINK) $(msgfmt_OBJECTS) $(msgfmt_LDADD) $(LIBS)
-../woe32dll/msggrep-c++msggrep.$(OBJEXT): ../woe32dll/$(am__dirstamp)
-
-msggrep$(EXEEXT): $(msggrep_OBJECTS) $(msggrep_DEPENDENCIES) $(EXTRA_msggrep_DEPENDENCIES) 
+msggrep$(EXEEXT): $(msggrep_OBJECTS) $(msggrep_DEPENDENCIES) 
 	@rm -f msggrep$(EXEEXT)
 	$(AM_V_GEN)$(msggrep_LINK) $(msggrep_OBJECTS) $(msggrep_LDADD) $(LIBS)
-../../gettext-runtime/intl/msginit-localealias.$(OBJEXT):  \
-	../../gettext-runtime/intl/$(am__dirstamp)
-../../gettext-runtime/intl/msginit-lock.$(OBJEXT):  \
-	../../gettext-runtime/intl/$(am__dirstamp)
-
-msginit$(EXEEXT): $(msginit_OBJECTS) $(msginit_DEPENDENCIES) $(EXTRA_msginit_DEPENDENCIES) 
+msginit$(EXEEXT): $(msginit_OBJECTS) $(msginit_DEPENDENCIES) 
 	@rm -f msginit$(EXEEXT)
 	$(AM_V_CCLD)$(msginit_LINK) $(msginit_OBJECTS) $(msginit_LDADD) $(LIBS)
-../woe32dll/msgmerge-c++msgmerge.$(OBJEXT):  \
-	../woe32dll/$(am__dirstamp)
-
-msgmerge$(EXEEXT): $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES) $(EXTRA_msgmerge_DEPENDENCIES) 
+msgmerge$(EXEEXT): $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES) 
 	@rm -f msgmerge$(EXEEXT)
 	$(AM_V_GEN)$(msgmerge_LINK) $(msgmerge_OBJECTS) $(msgmerge_LDADD) $(LIBS)
-
-msgunfmt$(EXEEXT): $(msgunfmt_OBJECTS) $(msgunfmt_DEPENDENCIES) $(EXTRA_msgunfmt_DEPENDENCIES) 
+msgunfmt$(EXEEXT): $(msgunfmt_OBJECTS) $(msgunfmt_DEPENDENCIES) 
 	@rm -f msgunfmt$(EXEEXT)
 	$(AM_V_CCLD)$(msgunfmt_LINK) $(msgunfmt_OBJECTS) $(msgunfmt_LDADD) $(LIBS)
-../woe32dll/msguniq-c++msguniq.$(OBJEXT): ../woe32dll/$(am__dirstamp)
-
-msguniq$(EXEEXT): $(msguniq_OBJECTS) $(msguniq_DEPENDENCIES) $(EXTRA_msguniq_DEPENDENCIES) 
+msguniq$(EXEEXT): $(msguniq_OBJECTS) $(msguniq_DEPENDENCIES) 
 	@rm -f msguniq$(EXEEXT)
 	$(AM_V_GEN)$(msguniq_LINK) $(msguniq_OBJECTS) $(msguniq_LDADD) $(LIBS)
-
-recode-sr-latin$(EXEEXT): $(recode_sr_latin_OBJECTS) $(recode_sr_latin_DEPENDENCIES) $(EXTRA_recode_sr_latin_DEPENDENCIES) 
+recode-sr-latin$(EXEEXT): $(recode_sr_latin_OBJECTS) $(recode_sr_latin_DEPENDENCIES) 
 	@rm -f recode-sr-latin$(EXEEXT)
 	$(AM_V_CCLD)$(recode_sr_latin_LINK) $(recode_sr_latin_OBJECTS) $(recode_sr_latin_LDADD) $(LIBS)
-
-urlget$(EXEEXT): $(urlget_OBJECTS) $(urlget_DEPENDENCIES) $(EXTRA_urlget_DEPENDENCIES) 
+urlget$(EXEEXT): $(urlget_OBJECTS) $(urlget_DEPENDENCIES) 
 	@rm -f urlget$(EXEEXT)
 	$(AM_V_CCLD)$(urlget_LINK) $(urlget_OBJECTS) $(urlget_LDADD) $(LIBS)
-../woe32dll/xgettext-c++xgettext.$(OBJEXT):  \
-	../woe32dll/$(am__dirstamp)
-
-xgettext$(EXEEXT): $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES) $(EXTRA_xgettext_DEPENDENCIES) 
+xgettext$(EXEEXT): $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES) 
 	@rm -f xgettext$(EXEEXT)
 	$(AM_V_GEN)$(xgettext_LINK) $(xgettext_OBJECTS) $(xgettext_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../../gettext-runtime/intl/*.$(OBJEXT)
-	-rm -f ../woe32dll/*.$(OBJEXT)
-	-rm -f ../woe32dll/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-
-libgettextsrc_la-message.lo: message.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-message.lo `test -f 'message.c' || echo '$(srcdir)/'`message.c
-
-libgettextsrc_la-po-error.lo: po-error.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-po-error.lo `test -f 'po-error.c' || echo '$(srcdir)/'`po-error.c
-
-libgettextsrc_la-po-xerror.lo: po-xerror.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-po-xerror.lo `test -f 'po-xerror.c' || echo '$(srcdir)/'`po-xerror.c
-
-libgettextsrc_la-read-catalog-abstract.lo: read-catalog-abstract.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-read-catalog-abstract.lo `test -f 'read-catalog-abstract.c' || echo '$(srcdir)/'`read-catalog-abstract.c
-
-libgettextsrc_la-po-lex.lo: po-lex.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-po-lex.lo `test -f 'po-lex.c' || echo '$(srcdir)/'`po-lex.c
-
-libgettextsrc_la-po-gram-gen.lo: po-gram-gen.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-po-gram-gen.lo `test -f 'po-gram-gen.c' || echo '$(srcdir)/'`po-gram-gen.c
-
-libgettextsrc_la-po-charset.lo: po-charset.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-po-charset.lo `test -f 'po-charset.c' || echo '$(srcdir)/'`po-charset.c
-
-libgettextsrc_la-read-po.lo: read-po.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-read-po.lo `test -f 'read-po.c' || echo '$(srcdir)/'`read-po.c
-
-libgettextsrc_la-read-properties.lo: read-properties.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-read-properties.lo `test -f 'read-properties.c' || echo '$(srcdir)/'`read-properties.c
-
-libgettextsrc_la-read-stringtable.lo: read-stringtable.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-read-stringtable.lo `test -f 'read-stringtable.c' || echo '$(srcdir)/'`read-stringtable.c
-
-libgettextsrc_la-open-catalog.lo: open-catalog.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-open-catalog.lo `test -f 'open-catalog.c' || echo '$(srcdir)/'`open-catalog.c
-
-libgettextsrc_la-dir-list.lo: dir-list.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-dir-list.lo `test -f 'dir-list.c' || echo '$(srcdir)/'`dir-list.c
-
-libgettextsrc_la-str-list.lo: str-list.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-str-list.lo `test -f 'str-list.c' || echo '$(srcdir)/'`str-list.c
-
-libgettextsrc_la-read-catalog.lo: read-catalog.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-read-catalog.lo `test -f 'read-catalog.c' || echo '$(srcdir)/'`read-catalog.c
-
-libgettextsrc_la-color.lo: color.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-color.lo `test -f 'color.c' || echo '$(srcdir)/'`color.c
-
-libgettextsrc_la-write-catalog.lo: write-catalog.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-write-catalog.lo `test -f 'write-catalog.c' || echo '$(srcdir)/'`write-catalog.c
-
-libgettextsrc_la-write-properties.lo: write-properties.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-write-properties.lo `test -f 'write-properties.c' || echo '$(srcdir)/'`write-properties.c
-
-libgettextsrc_la-write-stringtable.lo: write-stringtable.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-write-stringtable.lo `test -f 'write-stringtable.c' || echo '$(srcdir)/'`write-stringtable.c
-
-libgettextsrc_la-write-po.lo: write-po.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-write-po.lo `test -f 'write-po.c' || echo '$(srcdir)/'`write-po.c
-
-libgettextsrc_la-msgl-ascii.lo: msgl-ascii.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-msgl-ascii.lo `test -f 'msgl-ascii.c' || echo '$(srcdir)/'`msgl-ascii.c
-
-libgettextsrc_la-msgl-iconv.lo: msgl-iconv.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-msgl-iconv.lo `test -f 'msgl-iconv.c' || echo '$(srcdir)/'`msgl-iconv.c
-
-libgettextsrc_la-msgl-equal.lo: msgl-equal.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-msgl-equal.lo `test -f 'msgl-equal.c' || echo '$(srcdir)/'`msgl-equal.c
-
-libgettextsrc_la-msgl-cat.lo: msgl-cat.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-msgl-cat.lo `test -f 'msgl-cat.c' || echo '$(srcdir)/'`msgl-cat.c
-
-libgettextsrc_la-msgl-header.lo: msgl-header.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-msgl-header.lo `test -f 'msgl-header.c' || echo '$(srcdir)/'`msgl-header.c
-
-libgettextsrc_la-msgl-english.lo: msgl-english.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-msgl-english.lo `test -f 'msgl-english.c' || echo '$(srcdir)/'`msgl-english.c
-
-libgettextsrc_la-msgl-check.lo: msgl-check.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-msgl-check.lo `test -f 'msgl-check.c' || echo '$(srcdir)/'`msgl-check.c
-
-libgettextsrc_la-file-list.lo: file-list.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-file-list.lo `test -f 'file-list.c' || echo '$(srcdir)/'`file-list.c
-
-libgettextsrc_la-msgl-charset.lo: msgl-charset.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-msgl-charset.lo `test -f 'msgl-charset.c' || echo '$(srcdir)/'`msgl-charset.c
-
-libgettextsrc_la-po-time.lo: po-time.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-po-time.lo `test -f 'po-time.c' || echo '$(srcdir)/'`po-time.c
-
-libgettextsrc_la-plural-exp.lo: plural-exp.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-plural-exp.lo `test -f 'plural-exp.c' || echo '$(srcdir)/'`plural-exp.c
-
-libgettextsrc_la-plural-eval.lo: plural-eval.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-plural-eval.lo `test -f 'plural-eval.c' || echo '$(srcdir)/'`plural-eval.c
-
-libgettextsrc_la-plural-table.lo: plural-table.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-plural-table.lo `test -f 'plural-table.c' || echo '$(srcdir)/'`plural-table.c
-
-libgettextsrc_la-format.lo: format.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-format.lo `test -f 'format.c' || echo '$(srcdir)/'`format.c
-
-libgettextsrc_la-format-c.lo: format-c.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-format-c.lo `test -f 'format-c.c' || echo '$(srcdir)/'`format-c.c
-
-libgettextsrc_la-format-sh.lo: format-sh.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-format-sh.lo `test -f 'format-sh.c' || echo '$(srcdir)/'`format-sh.c
-
-libgettextsrc_la-format-python.lo: format-python.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-format-python.lo `test -f 'format-python.c' || echo '$(srcdir)/'`format-python.c
-
-libgettextsrc_la-format-python-brace.lo: format-python-brace.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-format-python-brace.lo `test -f 'format-python-brace.c' || echo '$(srcdir)/'`format-python-brace.c
-
-libgettextsrc_la-format-lisp.lo: format-lisp.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-format-lisp.lo `test -f 'format-lisp.c' || echo '$(srcdir)/'`format-lisp.c
-
-libgettextsrc_la-format-elisp.lo: format-elisp.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-format-elisp.lo `test -f 'format-elisp.c' || echo '$(srcdir)/'`format-elisp.c
-
-libgettextsrc_la-format-librep.lo: format-librep.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-format-librep.lo `test -f 'format-librep.c' || echo '$(srcdir)/'`format-librep.c
-
-libgettextsrc_la-format-scheme.lo: format-scheme.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-format-scheme.lo `test -f 'format-scheme.c' || echo '$(srcdir)/'`format-scheme.c
-
-libgettextsrc_la-format-java.lo: format-java.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-format-java.lo `test -f 'format-java.c' || echo '$(srcdir)/'`format-java.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
-libgettextsrc_la-format-csharp.lo: format-csharp.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-format-csharp.lo `test -f 'format-csharp.c' || echo '$(srcdir)/'`format-csharp.c
-
-libgettextsrc_la-format-awk.lo: format-awk.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-format-awk.lo `test -f 'format-awk.c' || echo '$(srcdir)/'`format-awk.c
-
-libgettextsrc_la-format-pascal.lo: format-pascal.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-format-pascal.lo `test -f 'format-pascal.c' || echo '$(srcdir)/'`format-pascal.c
-
-libgettextsrc_la-format-ycp.lo: format-ycp.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-format-ycp.lo `test -f 'format-ycp.c' || echo '$(srcdir)/'`format-ycp.c
-
-libgettextsrc_la-format-tcl.lo: format-tcl.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-format-tcl.lo `test -f 'format-tcl.c' || echo '$(srcdir)/'`format-tcl.c
-
-libgettextsrc_la-format-perl.lo: format-perl.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-format-perl.lo `test -f 'format-perl.c' || echo '$(srcdir)/'`format-perl.c
-
-libgettextsrc_la-format-perl-brace.lo: format-perl-brace.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-format-perl-brace.lo `test -f 'format-perl-brace.c' || echo '$(srcdir)/'`format-perl-brace.c
-
-libgettextsrc_la-format-php.lo: format-php.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-format-php.lo `test -f 'format-php.c' || echo '$(srcdir)/'`format-php.c
-
-libgettextsrc_la-format-gcc-internal.lo: format-gcc-internal.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-format-gcc-internal.lo `test -f 'format-gcc-internal.c' || echo '$(srcdir)/'`format-gcc-internal.c
-
-libgettextsrc_la-format-gfc-internal.lo: format-gfc-internal.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-format-gfc-internal.lo `test -f 'format-gfc-internal.c' || echo '$(srcdir)/'`format-gfc-internal.c
-
-libgettextsrc_la-format-qt.lo: format-qt.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-format-qt.lo `test -f 'format-qt.c' || echo '$(srcdir)/'`format-qt.c
-
-libgettextsrc_la-format-qt-plural.lo: format-qt-plural.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-format-qt-plural.lo `test -f 'format-qt-plural.c' || echo '$(srcdir)/'`format-qt-plural.c
-
-libgettextsrc_la-format-kde.lo: format-kde.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-format-kde.lo `test -f 'format-kde.c' || echo '$(srcdir)/'`format-kde.c
-
-libgettextsrc_la-format-boost.lo: format-boost.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-format-boost.lo `test -f 'format-boost.c' || echo '$(srcdir)/'`format-boost.c
-
-libgettextsrc_la-format-lua.lo: format-lua.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-format-lua.lo `test -f 'format-lua.c' || echo '$(srcdir)/'`format-lua.c
-
-libgettextsrc_la-format-javascript.lo: format-javascript.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-format-javascript.lo `test -f 'format-javascript.c' || echo '$(srcdir)/'`format-javascript.c
-
-libgettextsrc_la-read-desktop.lo: read-desktop.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-read-desktop.lo `test -f 'read-desktop.c' || echo '$(srcdir)/'`read-desktop.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
+gettextsrc-exports.lo: ../woe32dll/gettextsrc-exports.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gettextsrc-exports.lo `test -f '../woe32dll/gettextsrc-exports.c' || echo '$(srcdir)/'`../woe32dll/gettextsrc-exports.c
 
 hostname-hostname.o: hostname.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hostname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hostname-hostname.o `test -f 'hostname.c' || echo '$(srcdir)/'`hostname.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hostname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hostname-hostname.o `test -f 'hostname.c' || echo '$(srcdir)/'`hostname.c
 
 hostname-hostname.obj: hostname.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hostname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hostname-hostname.obj `if test -f 'hostname.c'; then $(CYGPATH_W) 'hostname.c'; else $(CYGPATH_W) '$(srcdir)/hostname.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hostname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hostname-hostname.obj `if test -f 'hostname.c'; then $(CYGPATH_W) 'hostname.c'; else $(CYGPATH_W) '$(srcdir)/hostname.c'; fi`
 
 msgattrib-msgattrib.o: msgattrib.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgattrib-msgattrib.o `test -f 'msgattrib.c' || echo '$(srcdir)/'`msgattrib.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgattrib-msgattrib.o `test -f 'msgattrib.c' || echo '$(srcdir)/'`msgattrib.c
 
 msgattrib-msgattrib.obj: msgattrib.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgattrib-msgattrib.obj `if test -f 'msgattrib.c'; then $(CYGPATH_W) 'msgattrib.c'; else $(CYGPATH_W) '$(srcdir)/msgattrib.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgattrib-msgattrib.obj `if test -f 'msgattrib.c'; then $(CYGPATH_W) 'msgattrib.c'; else $(CYGPATH_W) '$(srcdir)/msgattrib.c'; fi`
 
 msgcat-msgcat.o: msgcat.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat-msgcat.o `test -f 'msgcat.c' || echo '$(srcdir)/'`msgcat.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat-msgcat.o `test -f 'msgcat.c' || echo '$(srcdir)/'`msgcat.c
 
 msgcat-msgcat.obj: msgcat.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat-msgcat.obj `if test -f 'msgcat.c'; then $(CYGPATH_W) 'msgcat.c'; else $(CYGPATH_W) '$(srcdir)/msgcat.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat-msgcat.obj `if test -f 'msgcat.c'; then $(CYGPATH_W) 'msgcat.c'; else $(CYGPATH_W) '$(srcdir)/msgcat.c'; fi`
 
 msgcmp-msgcmp.o: msgcmp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgcmp.o `test -f 'msgcmp.c' || echo '$(srcdir)/'`msgcmp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgcmp.o `test -f 'msgcmp.c' || echo '$(srcdir)/'`msgcmp.c
 
 msgcmp-msgcmp.obj: msgcmp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgcmp.obj `if test -f 'msgcmp.c'; then $(CYGPATH_W) 'msgcmp.c'; else $(CYGPATH_W) '$(srcdir)/msgcmp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgcmp.obj `if test -f 'msgcmp.c'; then $(CYGPATH_W) 'msgcmp.c'; else $(CYGPATH_W) '$(srcdir)/msgcmp.c'; fi`
 
 msgcmp-msgl-fsearch.o: msgl-fsearch.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgl-fsearch.o `test -f 'msgl-fsearch.c' || echo '$(srcdir)/'`msgl-fsearch.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgl-fsearch.o `test -f 'msgl-fsearch.c' || echo '$(srcdir)/'`msgl-fsearch.c
 
 msgcmp-msgl-fsearch.obj: msgl-fsearch.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgl-fsearch.obj `if test -f 'msgl-fsearch.c'; then $(CYGPATH_W) 'msgl-fsearch.c'; else $(CYGPATH_W) '$(srcdir)/msgl-fsearch.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcmp-msgl-fsearch.obj `if test -f 'msgl-fsearch.c'; then $(CYGPATH_W) 'msgl-fsearch.c'; else $(CYGPATH_W) '$(srcdir)/msgl-fsearch.c'; fi`
 
 msgcomm-msgcomm.o: msgcomm.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcomm-msgcomm.o `test -f 'msgcomm.c' || echo '$(srcdir)/'`msgcomm.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcomm-msgcomm.o `test -f 'msgcomm.c' || echo '$(srcdir)/'`msgcomm.c
 
 msgcomm-msgcomm.obj: msgcomm.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcomm-msgcomm.obj `if test -f 'msgcomm.c'; then $(CYGPATH_W) 'msgcomm.c'; else $(CYGPATH_W) '$(srcdir)/msgcomm.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcomm-msgcomm.obj `if test -f 'msgcomm.c'; then $(CYGPATH_W) 'msgcomm.c'; else $(CYGPATH_W) '$(srcdir)/msgcomm.c'; fi`
 
 msgconv-msgconv.o: msgconv.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgconv-msgconv.o `test -f 'msgconv.c' || echo '$(srcdir)/'`msgconv.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgconv-msgconv.o `test -f 'msgconv.c' || echo '$(srcdir)/'`msgconv.c
 
 msgconv-msgconv.obj: msgconv.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgconv-msgconv.obj `if test -f 'msgconv.c'; then $(CYGPATH_W) 'msgconv.c'; else $(CYGPATH_W) '$(srcdir)/msgconv.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgconv-msgconv.obj `if test -f 'msgconv.c'; then $(CYGPATH_W) 'msgconv.c'; else $(CYGPATH_W) '$(srcdir)/msgconv.c'; fi`
 
 msgen-msgen.o: msgen.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgen-msgen.o `test -f 'msgen.c' || echo '$(srcdir)/'`msgen.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgen-msgen.o `test -f 'msgen.c' || echo '$(srcdir)/'`msgen.c
 
 msgen-msgen.obj: msgen.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgen-msgen.obj `if test -f 'msgen.c'; then $(CYGPATH_W) 'msgen.c'; else $(CYGPATH_W) '$(srcdir)/msgen.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgen-msgen.obj `if test -f 'msgen.c'; then $(CYGPATH_W) 'msgen.c'; else $(CYGPATH_W) '$(srcdir)/msgen.c'; fi`
 
 msgexec-msgexec.o: msgexec.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgexec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgexec-msgexec.o `test -f 'msgexec.c' || echo '$(srcdir)/'`msgexec.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgexec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgexec-msgexec.o `test -f 'msgexec.c' || echo '$(srcdir)/'`msgexec.c
 
 msgexec-msgexec.obj: msgexec.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgexec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgexec-msgexec.obj `if test -f 'msgexec.c'; then $(CYGPATH_W) 'msgexec.c'; else $(CYGPATH_W) '$(srcdir)/msgexec.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgexec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgexec-msgexec.obj `if test -f 'msgexec.c'; then $(CYGPATH_W) 'msgexec.c'; else $(CYGPATH_W) '$(srcdir)/msgexec.c'; fi`
 
 msgfilter-msgfilter.o: msgfilter.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-msgfilter.o `test -f 'msgfilter.c' || echo '$(srcdir)/'`msgfilter.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-msgfilter.o `test -f 'msgfilter.c' || echo '$(srcdir)/'`msgfilter.c
 
 msgfilter-msgfilter.obj: msgfilter.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-msgfilter.obj `if test -f 'msgfilter.c'; then $(CYGPATH_W) 'msgfilter.c'; else $(CYGPATH_W) '$(srcdir)/msgfilter.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-msgfilter.obj `if test -f 'msgfilter.c'; then $(CYGPATH_W) 'msgfilter.c'; else $(CYGPATH_W) '$(srcdir)/msgfilter.c'; fi`
 
 msgfilter-filter-sr-latin.o: filter-sr-latin.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-filter-sr-latin.o `test -f 'filter-sr-latin.c' || echo '$(srcdir)/'`filter-sr-latin.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-filter-sr-latin.o `test -f 'filter-sr-latin.c' || echo '$(srcdir)/'`filter-sr-latin.c
 
 msgfilter-filter-sr-latin.obj: filter-sr-latin.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-filter-sr-latin.obj `if test -f 'filter-sr-latin.c'; then $(CYGPATH_W) 'filter-sr-latin.c'; else $(CYGPATH_W) '$(srcdir)/filter-sr-latin.c'; fi`
-
-msgfilter-filter-quote.o: filter-quote.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-filter-quote.o `test -f 'filter-quote.c' || echo '$(srcdir)/'`filter-quote.c
-
-msgfilter-filter-quote.obj: filter-quote.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-filter-quote.obj `if test -f 'filter-quote.c'; then $(CYGPATH_W) 'filter-quote.c'; else $(CYGPATH_W) '$(srcdir)/filter-quote.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfilter-filter-sr-latin.obj `if test -f 'filter-sr-latin.c'; then $(CYGPATH_W) 'filter-sr-latin.c'; else $(CYGPATH_W) '$(srcdir)/filter-sr-latin.c'; fi`
 
 msgfmt-msgfmt.o: msgfmt.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-msgfmt.o `test -f 'msgfmt.c' || echo '$(srcdir)/'`msgfmt.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-msgfmt.o `test -f 'msgfmt.c' || echo '$(srcdir)/'`msgfmt.c
 
 msgfmt-msgfmt.obj: msgfmt.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-msgfmt.obj `if test -f 'msgfmt.c'; then $(CYGPATH_W) 'msgfmt.c'; else $(CYGPATH_W) '$(srcdir)/msgfmt.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-msgfmt.obj `if test -f 'msgfmt.c'; then $(CYGPATH_W) 'msgfmt.c'; else $(CYGPATH_W) '$(srcdir)/msgfmt.c'; fi`
 
 msgfmt-write-mo.o: write-mo.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-mo.o `test -f 'write-mo.c' || echo '$(srcdir)/'`write-mo.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-mo.o `test -f 'write-mo.c' || echo '$(srcdir)/'`write-mo.c
 
 msgfmt-write-mo.obj: write-mo.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-mo.obj `if test -f 'write-mo.c'; then $(CYGPATH_W) 'write-mo.c'; else $(CYGPATH_W) '$(srcdir)/write-mo.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-mo.obj `if test -f 'write-mo.c'; then $(CYGPATH_W) 'write-mo.c'; else $(CYGPATH_W) '$(srcdir)/write-mo.c'; fi`
 
 msgfmt-write-java.o: write-java.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-java.o `test -f 'write-java.c' || echo '$(srcdir)/'`write-java.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-java.o `test -f 'write-java.c' || echo '$(srcdir)/'`write-java.c
 
 msgfmt-write-java.obj: write-java.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-java.obj `if test -f 'write-java.c'; then $(CYGPATH_W) 'write-java.c'; else $(CYGPATH_W) '$(srcdir)/write-java.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-java.obj `if test -f 'write-java.c'; then $(CYGPATH_W) 'write-java.c'; else $(CYGPATH_W) '$(srcdir)/write-java.c'; fi`
 
 msgfmt-write-csharp.o: write-csharp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-csharp.o `test -f 'write-csharp.c' || echo '$(srcdir)/'`write-csharp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-csharp.o `test -f 'write-csharp.c' || echo '$(srcdir)/'`write-csharp.c
 
 msgfmt-write-csharp.obj: write-csharp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-csharp.obj `if test -f 'write-csharp.c'; then $(CYGPATH_W) 'write-csharp.c'; else $(CYGPATH_W) '$(srcdir)/write-csharp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-csharp.obj `if test -f 'write-csharp.c'; then $(CYGPATH_W) 'write-csharp.c'; else $(CYGPATH_W) '$(srcdir)/write-csharp.c'; fi`
 
 msgfmt-write-resources.o: write-resources.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-resources.o `test -f 'write-resources.c' || echo '$(srcdir)/'`write-resources.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-resources.o `test -f 'write-resources.c' || echo '$(srcdir)/'`write-resources.c
 
 msgfmt-write-resources.obj: write-resources.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-resources.obj `if test -f 'write-resources.c'; then $(CYGPATH_W) 'write-resources.c'; else $(CYGPATH_W) '$(srcdir)/write-resources.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-resources.obj `if test -f 'write-resources.c'; then $(CYGPATH_W) 'write-resources.c'; else $(CYGPATH_W) '$(srcdir)/write-resources.c'; fi`
 
 msgfmt-write-tcl.o: write-tcl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-tcl.o `test -f 'write-tcl.c' || echo '$(srcdir)/'`write-tcl.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-tcl.o `test -f 'write-tcl.c' || echo '$(srcdir)/'`write-tcl.c
 
 msgfmt-write-tcl.obj: write-tcl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-tcl.obj `if test -f 'write-tcl.c'; then $(CYGPATH_W) 'write-tcl.c'; else $(CYGPATH_W) '$(srcdir)/write-tcl.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-tcl.obj `if test -f 'write-tcl.c'; then $(CYGPATH_W) 'write-tcl.c'; else $(CYGPATH_W) '$(srcdir)/write-tcl.c'; fi`
 
 msgfmt-write-qt.o: write-qt.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-qt.o `test -f 'write-qt.c' || echo '$(srcdir)/'`write-qt.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-qt.o `test -f 'write-qt.c' || echo '$(srcdir)/'`write-qt.c
 
 msgfmt-write-qt.obj: write-qt.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-qt.obj `if test -f 'write-qt.c'; then $(CYGPATH_W) 'write-qt.c'; else $(CYGPATH_W) '$(srcdir)/write-qt.c'; fi`
-
-msgfmt-write-desktop.o: write-desktop.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-desktop.o `test -f 'write-desktop.c' || echo '$(srcdir)/'`write-desktop.c
-
-msgfmt-write-desktop.obj: write-desktop.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-desktop.obj `if test -f 'write-desktop.c'; then $(CYGPATH_W) 'write-desktop.c'; else $(CYGPATH_W) '$(srcdir)/write-desktop.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-write-qt.obj `if test -f 'write-qt.c'; then $(CYGPATH_W) 'write-qt.c'; else $(CYGPATH_W) '$(srcdir)/write-qt.c'; fi`
 
-../../gettext-runtime/intl/msgfmt-hash-string.o: ../../gettext-runtime/intl/hash-string.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../gettext-runtime/intl/msgfmt-hash-string.o `test -f '../../gettext-runtime/intl/hash-string.c' || echo '$(srcdir)/'`../../gettext-runtime/intl/hash-string.c
-
-../../gettext-runtime/intl/msgfmt-hash-string.obj: ../../gettext-runtime/intl/hash-string.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../gettext-runtime/intl/msgfmt-hash-string.obj `if test -f '../../gettext-runtime/intl/hash-string.c'; then $(CYGPATH_W) '../../gettext-runtime/intl/hash-string.c'; else $(CYGPATH_W) '$(srcdir)/../../gettext-runtime/intl/hash-string.c'; fi`
+msgfmt-hash-string.o: ../../gettext-runtime/intl/hash-string.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-hash-string.o `test -f '../../gettext-runtime/intl/hash-string.c' || echo '$(srcdir)/'`../../gettext-runtime/intl/hash-string.c
+
+msgfmt-hash-string.obj: ../../gettext-runtime/intl/hash-string.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgfmt-hash-string.obj `if test -f '../../gettext-runtime/intl/hash-string.c'; then $(CYGPATH_W) '../../gettext-runtime/intl/hash-string.c'; else $(CYGPATH_W) '$(srcdir)/../../gettext-runtime/intl/hash-string.c'; fi`
 
 msggrep-msggrep.o: msggrep.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msggrep-msggrep.o `test -f 'msggrep.c' || echo '$(srcdir)/'`msggrep.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msggrep-msggrep.o `test -f 'msggrep.c' || echo '$(srcdir)/'`msggrep.c
 
 msggrep-msggrep.obj: msggrep.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msggrep-msggrep.obj `if test -f 'msggrep.c'; then $(CYGPATH_W) 'msggrep.c'; else $(CYGPATH_W) '$(srcdir)/msggrep.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msggrep-msggrep.obj `if test -f 'msggrep.c'; then $(CYGPATH_W) 'msggrep.c'; else $(CYGPATH_W) '$(srcdir)/msggrep.c'; fi`
 
 msginit-msginit.o: msginit.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-msginit.o `test -f 'msginit.c' || echo '$(srcdir)/'`msginit.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-msginit.o `test -f 'msginit.c' || echo '$(srcdir)/'`msginit.c
 
 msginit-msginit.obj: msginit.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-msginit.obj `if test -f 'msginit.c'; then $(CYGPATH_W) 'msginit.c'; else $(CYGPATH_W) '$(srcdir)/msginit.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-msginit.obj `if test -f 'msginit.c'; then $(CYGPATH_W) 'msginit.c'; else $(CYGPATH_W) '$(srcdir)/msginit.c'; fi`
 
 msginit-lang-table.o: lang-table.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-lang-table.o `test -f 'lang-table.c' || echo '$(srcdir)/'`lang-table.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-lang-table.o `test -f 'lang-table.c' || echo '$(srcdir)/'`lang-table.c
 
 msginit-lang-table.obj: lang-table.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-lang-table.obj `if test -f 'lang-table.c'; then $(CYGPATH_W) 'lang-table.c'; else $(CYGPATH_W) '$(srcdir)/lang-table.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-lang-table.obj `if test -f 'lang-table.c'; then $(CYGPATH_W) 'lang-table.c'; else $(CYGPATH_W) '$(srcdir)/lang-table.c'; fi`
 
 msginit-plural-count.o: plural-count.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-plural-count.o `test -f 'plural-count.c' || echo '$(srcdir)/'`plural-count.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-plural-count.o `test -f 'plural-count.c' || echo '$(srcdir)/'`plural-count.c
 
 msginit-plural-count.obj: plural-count.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-plural-count.obj `if test -f 'plural-count.c'; then $(CYGPATH_W) 'plural-count.c'; else $(CYGPATH_W) '$(srcdir)/plural-count.c'; fi`
-
-../../gettext-runtime/intl/msginit-localealias.o: ../../gettext-runtime/intl/localealias.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../gettext-runtime/intl/msginit-localealias.o `test -f '../../gettext-runtime/intl/localealias.c' || echo '$(srcdir)/'`../../gettext-runtime/intl/localealias.c
-
-../../gettext-runtime/intl/msginit-localealias.obj: ../../gettext-runtime/intl/localealias.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../gettext-runtime/intl/msginit-localealias.obj `if test -f '../../gettext-runtime/intl/localealias.c'; then $(CYGPATH_W) '../../gettext-runtime/intl/localealias.c'; else $(CYGPATH_W) '$(srcdir)/../../gettext-runtime/intl/localealias.c'; fi`
-
-../../gettext-runtime/intl/msginit-lock.o: ../../gettext-runtime/intl/lock.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../gettext-runtime/intl/msginit-lock.o `test -f '../../gettext-runtime/intl/lock.c' || echo '$(srcdir)/'`../../gettext-runtime/intl/lock.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-plural-count.obj `if test -f 'plural-count.c'; then $(CYGPATH_W) 'plural-count.c'; else $(CYGPATH_W) '$(srcdir)/plural-count.c'; fi`
 
-../../gettext-runtime/intl/msginit-lock.obj: ../../gettext-runtime/intl/lock.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../gettext-runtime/intl/msginit-lock.obj `if test -f '../../gettext-runtime/intl/lock.c'; then $(CYGPATH_W) '../../gettext-runtime/intl/lock.c'; else $(CYGPATH_W) '$(srcdir)/../../gettext-runtime/intl/lock.c'; fi`
+msginit-localealias.o: ../../gettext-runtime/intl/localealias.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-localealias.o `test -f '../../gettext-runtime/intl/localealias.c' || echo '$(srcdir)/'`../../gettext-runtime/intl/localealias.c
+
+msginit-localealias.obj: ../../gettext-runtime/intl/localealias.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-localealias.obj `if test -f '../../gettext-runtime/intl/localealias.c'; then $(CYGPATH_W) '../../gettext-runtime/intl/localealias.c'; else $(CYGPATH_W) '$(srcdir)/../../gettext-runtime/intl/localealias.c'; fi`
+
+msginit-lock.o: ../../gettext-runtime/intl/lock.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-lock.o `test -f '../../gettext-runtime/intl/lock.c' || echo '$(srcdir)/'`../../gettext-runtime/intl/lock.c
+
+msginit-lock.obj: ../../gettext-runtime/intl/lock.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msginit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msginit-lock.obj `if test -f '../../gettext-runtime/intl/lock.c'; then $(CYGPATH_W) '../../gettext-runtime/intl/lock.c'; else $(CYGPATH_W) '$(srcdir)/../../gettext-runtime/intl/lock.c'; fi`
 
 msgmerge-msgmerge.o: msgmerge.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgmerge.o `test -f 'msgmerge.c' || echo '$(srcdir)/'`msgmerge.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgmerge.o `test -f 'msgmerge.c' || echo '$(srcdir)/'`msgmerge.c
 
 msgmerge-msgmerge.obj: msgmerge.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgmerge.obj `if test -f 'msgmerge.c'; then $(CYGPATH_W) 'msgmerge.c'; else $(CYGPATH_W) '$(srcdir)/msgmerge.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgmerge.obj `if test -f 'msgmerge.c'; then $(CYGPATH_W) 'msgmerge.c'; else $(CYGPATH_W) '$(srcdir)/msgmerge.c'; fi`
 
 msgmerge-msgl-fsearch.o: msgl-fsearch.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgl-fsearch.o `test -f 'msgl-fsearch.c' || echo '$(srcdir)/'`msgl-fsearch.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgl-fsearch.o `test -f 'msgl-fsearch.c' || echo '$(srcdir)/'`msgl-fsearch.c
 
 msgmerge-msgl-fsearch.obj: msgl-fsearch.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgl-fsearch.obj `if test -f 'msgl-fsearch.c'; then $(CYGPATH_W) 'msgl-fsearch.c'; else $(CYGPATH_W) '$(srcdir)/msgl-fsearch.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-msgl-fsearch.obj `if test -f 'msgl-fsearch.c'; then $(CYGPATH_W) 'msgl-fsearch.c'; else $(CYGPATH_W) '$(srcdir)/msgl-fsearch.c'; fi`
 
 msgmerge-lang-table.o: lang-table.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-lang-table.o `test -f 'lang-table.c' || echo '$(srcdir)/'`lang-table.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-lang-table.o `test -f 'lang-table.c' || echo '$(srcdir)/'`lang-table.c
 
 msgmerge-lang-table.obj: lang-table.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-lang-table.obj `if test -f 'lang-table.c'; then $(CYGPATH_W) 'lang-table.c'; else $(CYGPATH_W) '$(srcdir)/lang-table.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-lang-table.obj `if test -f 'lang-table.c'; then $(CYGPATH_W) 'lang-table.c'; else $(CYGPATH_W) '$(srcdir)/lang-table.c'; fi`
 
 msgmerge-plural-count.o: plural-count.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-plural-count.o `test -f 'plural-count.c' || echo '$(srcdir)/'`plural-count.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-plural-count.o `test -f 'plural-count.c' || echo '$(srcdir)/'`plural-count.c
 
 msgmerge-plural-count.obj: plural-count.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-plural-count.obj `if test -f 'plural-count.c'; then $(CYGPATH_W) 'plural-count.c'; else $(CYGPATH_W) '$(srcdir)/plural-count.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CFLAGS) $(CFLAGS) -c -o msgmerge-plural-count.obj `if test -f 'plural-count.c'; then $(CYGPATH_W) 'plural-count.c'; else $(CYGPATH_W) '$(srcdir)/plural-count.c'; fi`
 
 msgunfmt-msgunfmt.o: msgunfmt.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-msgunfmt.o `test -f 'msgunfmt.c' || echo '$(srcdir)/'`msgunfmt.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-msgunfmt.o `test -f 'msgunfmt.c' || echo '$(srcdir)/'`msgunfmt.c
 
 msgunfmt-msgunfmt.obj: msgunfmt.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-msgunfmt.obj `if test -f 'msgunfmt.c'; then $(CYGPATH_W) 'msgunfmt.c'; else $(CYGPATH_W) '$(srcdir)/msgunfmt.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-msgunfmt.obj `if test -f 'msgunfmt.c'; then $(CYGPATH_W) 'msgunfmt.c'; else $(CYGPATH_W) '$(srcdir)/msgunfmt.c'; fi`
 
 msgunfmt-read-mo.o: read-mo.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-mo.o `test -f 'read-mo.c' || echo '$(srcdir)/'`read-mo.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-mo.o `test -f 'read-mo.c' || echo '$(srcdir)/'`read-mo.c
 
 msgunfmt-read-mo.obj: read-mo.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-mo.obj `if test -f 'read-mo.c'; then $(CYGPATH_W) 'read-mo.c'; else $(CYGPATH_W) '$(srcdir)/read-mo.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-mo.obj `if test -f 'read-mo.c'; then $(CYGPATH_W) 'read-mo.c'; else $(CYGPATH_W) '$(srcdir)/read-mo.c'; fi`
 
 msgunfmt-read-java.o: read-java.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-java.o `test -f 'read-java.c' || echo '$(srcdir)/'`read-java.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-java.o `test -f 'read-java.c' || echo '$(srcdir)/'`read-java.c
 
 msgunfmt-read-java.obj: read-java.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-java.obj `if test -f 'read-java.c'; then $(CYGPATH_W) 'read-java.c'; else $(CYGPATH_W) '$(srcdir)/read-java.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-java.obj `if test -f 'read-java.c'; then $(CYGPATH_W) 'read-java.c'; else $(CYGPATH_W) '$(srcdir)/read-java.c'; fi`
 
 msgunfmt-read-csharp.o: read-csharp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-csharp.o `test -f 'read-csharp.c' || echo '$(srcdir)/'`read-csharp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-csharp.o `test -f 'read-csharp.c' || echo '$(srcdir)/'`read-csharp.c
 
 msgunfmt-read-csharp.obj: read-csharp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-csharp.obj `if test -f 'read-csharp.c'; then $(CYGPATH_W) 'read-csharp.c'; else $(CYGPATH_W) '$(srcdir)/read-csharp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-csharp.obj `if test -f 'read-csharp.c'; then $(CYGPATH_W) 'read-csharp.c'; else $(CYGPATH_W) '$(srcdir)/read-csharp.c'; fi`
 
 msgunfmt-read-resources.o: read-resources.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-resources.o `test -f 'read-resources.c' || echo '$(srcdir)/'`read-resources.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-resources.o `test -f 'read-resources.c' || echo '$(srcdir)/'`read-resources.c
 
 msgunfmt-read-resources.obj: read-resources.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-resources.obj `if test -f 'read-resources.c'; then $(CYGPATH_W) 'read-resources.c'; else $(CYGPATH_W) '$(srcdir)/read-resources.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-resources.obj `if test -f 'read-resources.c'; then $(CYGPATH_W) 'read-resources.c'; else $(CYGPATH_W) '$(srcdir)/read-resources.c'; fi`
 
 msgunfmt-read-tcl.o: read-tcl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-tcl.o `test -f 'read-tcl.c' || echo '$(srcdir)/'`read-tcl.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-tcl.o `test -f 'read-tcl.c' || echo '$(srcdir)/'`read-tcl.c
 
 msgunfmt-read-tcl.obj: read-tcl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-tcl.obj `if test -f 'read-tcl.c'; then $(CYGPATH_W) 'read-tcl.c'; else $(CYGPATH_W) '$(srcdir)/read-tcl.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgunfmt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgunfmt-read-tcl.obj `if test -f 'read-tcl.c'; then $(CYGPATH_W) 'read-tcl.c'; else $(CYGPATH_W) '$(srcdir)/read-tcl.c'; fi`
 
 msguniq-msguniq.o: msguniq.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msguniq-msguniq.o `test -f 'msguniq.c' || echo '$(srcdir)/'`msguniq.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msguniq-msguniq.o `test -f 'msguniq.c' || echo '$(srcdir)/'`msguniq.c
 
 msguniq-msguniq.obj: msguniq.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msguniq-msguniq.obj `if test -f 'msguniq.c'; then $(CYGPATH_W) 'msguniq.c'; else $(CYGPATH_W) '$(srcdir)/msguniq.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msguniq-msguniq.obj `if test -f 'msguniq.c'; then $(CYGPATH_W) 'msguniq.c'; else $(CYGPATH_W) '$(srcdir)/msguniq.c'; fi`
 
 recode_sr_latin-recode-sr-latin.o: recode-sr-latin.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-recode-sr-latin.o `test -f 'recode-sr-latin.c' || echo '$(srcdir)/'`recode-sr-latin.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-recode-sr-latin.o `test -f 'recode-sr-latin.c' || echo '$(srcdir)/'`recode-sr-latin.c
 
 recode_sr_latin-recode-sr-latin.obj: recode-sr-latin.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-recode-sr-latin.obj `if test -f 'recode-sr-latin.c'; then $(CYGPATH_W) 'recode-sr-latin.c'; else $(CYGPATH_W) '$(srcdir)/recode-sr-latin.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-recode-sr-latin.obj `if test -f 'recode-sr-latin.c'; then $(CYGPATH_W) 'recode-sr-latin.c'; else $(CYGPATH_W) '$(srcdir)/recode-sr-latin.c'; fi`
 
 recode_sr_latin-filter-sr-latin.o: filter-sr-latin.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-filter-sr-latin.o `test -f 'filter-sr-latin.c' || echo '$(srcdir)/'`filter-sr-latin.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-filter-sr-latin.o `test -f 'filter-sr-latin.c' || echo '$(srcdir)/'`filter-sr-latin.c
 
 recode_sr_latin-filter-sr-latin.obj: filter-sr-latin.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-filter-sr-latin.obj `if test -f 'filter-sr-latin.c'; then $(CYGPATH_W) 'filter-sr-latin.c'; else $(CYGPATH_W) '$(srcdir)/filter-sr-latin.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(recode_sr_latin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recode_sr_latin-filter-sr-latin.obj `if test -f 'filter-sr-latin.c'; then $(CYGPATH_W) 'filter-sr-latin.c'; else $(CYGPATH_W) '$(srcdir)/filter-sr-latin.c'; fi`
 
 urlget-urlget.o: urlget.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(urlget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o urlget-urlget.o `test -f 'urlget.c' || echo '$(srcdir)/'`urlget.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(urlget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o urlget-urlget.o `test -f 'urlget.c' || echo '$(srcdir)/'`urlget.c
 
 urlget-urlget.obj: urlget.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(urlget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o urlget-urlget.obj `if test -f 'urlget.c'; then $(CYGPATH_W) 'urlget.c'; else $(CYGPATH_W) '$(srcdir)/urlget.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(urlget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o urlget-urlget.obj `if test -f 'urlget.c'; then $(CYGPATH_W) 'urlget.c'; else $(CYGPATH_W) '$(srcdir)/urlget.c'; fi`
 
 xgettext-xgettext.o: xgettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-xgettext.o `test -f 'xgettext.c' || echo '$(srcdir)/'`xgettext.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-xgettext.o `test -f 'xgettext.c' || echo '$(srcdir)/'`xgettext.c
 
 xgettext-xgettext.obj: xgettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-xgettext.obj `if test -f 'xgettext.c'; then $(CYGPATH_W) 'xgettext.c'; else $(CYGPATH_W) '$(srcdir)/xgettext.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-xgettext.obj `if test -f 'xgettext.c'; then $(CYGPATH_W) 'xgettext.c'; else $(CYGPATH_W) '$(srcdir)/xgettext.c'; fi`
 
 xgettext-x-c.o: x-c.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-c.o `test -f 'x-c.c' || echo '$(srcdir)/'`x-c.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-c.o `test -f 'x-c.c' || echo '$(srcdir)/'`x-c.c
 
 xgettext-x-c.obj: x-c.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-c.obj `if test -f 'x-c.c'; then $(CYGPATH_W) 'x-c.c'; else $(CYGPATH_W) '$(srcdir)/x-c.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-c.obj `if test -f 'x-c.c'; then $(CYGPATH_W) 'x-c.c'; else $(CYGPATH_W) '$(srcdir)/x-c.c'; fi`
 
 xgettext-x-po.o: x-po.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-po.o `test -f 'x-po.c' || echo '$(srcdir)/'`x-po.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-po.o `test -f 'x-po.c' || echo '$(srcdir)/'`x-po.c
 
 xgettext-x-po.obj: x-po.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-po.obj `if test -f 'x-po.c'; then $(CYGPATH_W) 'x-po.c'; else $(CYGPATH_W) '$(srcdir)/x-po.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-po.obj `if test -f 'x-po.c'; then $(CYGPATH_W) 'x-po.c'; else $(CYGPATH_W) '$(srcdir)/x-po.c'; fi`
 
 xgettext-x-sh.o: x-sh.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-sh.o `test -f 'x-sh.c' || echo '$(srcdir)/'`x-sh.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-sh.o `test -f 'x-sh.c' || echo '$(srcdir)/'`x-sh.c
 
 xgettext-x-sh.obj: x-sh.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-sh.obj `if test -f 'x-sh.c'; then $(CYGPATH_W) 'x-sh.c'; else $(CYGPATH_W) '$(srcdir)/x-sh.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-sh.obj `if test -f 'x-sh.c'; then $(CYGPATH_W) 'x-sh.c'; else $(CYGPATH_W) '$(srcdir)/x-sh.c'; fi`
 
 xgettext-x-python.o: x-python.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-python.o `test -f 'x-python.c' || echo '$(srcdir)/'`x-python.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-python.o `test -f 'x-python.c' || echo '$(srcdir)/'`x-python.c
 
 xgettext-x-python.obj: x-python.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-python.obj `if test -f 'x-python.c'; then $(CYGPATH_W) 'x-python.c'; else $(CYGPATH_W) '$(srcdir)/x-python.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-python.obj `if test -f 'x-python.c'; then $(CYGPATH_W) 'x-python.c'; else $(CYGPATH_W) '$(srcdir)/x-python.c'; fi`
 
 xgettext-x-lisp.o: x-lisp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-lisp.o `test -f 'x-lisp.c' || echo '$(srcdir)/'`x-lisp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-lisp.o `test -f 'x-lisp.c' || echo '$(srcdir)/'`x-lisp.c
 
 xgettext-x-lisp.obj: x-lisp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-lisp.obj `if test -f 'x-lisp.c'; then $(CYGPATH_W) 'x-lisp.c'; else $(CYGPATH_W) '$(srcdir)/x-lisp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-lisp.obj `if test -f 'x-lisp.c'; then $(CYGPATH_W) 'x-lisp.c'; else $(CYGPATH_W) '$(srcdir)/x-lisp.c'; fi`
 
 xgettext-x-elisp.o: x-elisp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-elisp.o `test -f 'x-elisp.c' || echo '$(srcdir)/'`x-elisp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-elisp.o `test -f 'x-elisp.c' || echo '$(srcdir)/'`x-elisp.c
 
 xgettext-x-elisp.obj: x-elisp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-elisp.obj `if test -f 'x-elisp.c'; then $(CYGPATH_W) 'x-elisp.c'; else $(CYGPATH_W) '$(srcdir)/x-elisp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-elisp.obj `if test -f 'x-elisp.c'; then $(CYGPATH_W) 'x-elisp.c'; else $(CYGPATH_W) '$(srcdir)/x-elisp.c'; fi`
 
 xgettext-x-librep.o: x-librep.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-librep.o `test -f 'x-librep.c' || echo '$(srcdir)/'`x-librep.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-librep.o `test -f 'x-librep.c' || echo '$(srcdir)/'`x-librep.c
 
 xgettext-x-librep.obj: x-librep.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-librep.obj `if test -f 'x-librep.c'; then $(CYGPATH_W) 'x-librep.c'; else $(CYGPATH_W) '$(srcdir)/x-librep.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-librep.obj `if test -f 'x-librep.c'; then $(CYGPATH_W) 'x-librep.c'; else $(CYGPATH_W) '$(srcdir)/x-librep.c'; fi`
 
 xgettext-x-scheme.o: x-scheme.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-scheme.o `test -f 'x-scheme.c' || echo '$(srcdir)/'`x-scheme.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-scheme.o `test -f 'x-scheme.c' || echo '$(srcdir)/'`x-scheme.c
 
 xgettext-x-scheme.obj: x-scheme.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-scheme.obj `if test -f 'x-scheme.c'; then $(CYGPATH_W) 'x-scheme.c'; else $(CYGPATH_W) '$(srcdir)/x-scheme.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-scheme.obj `if test -f 'x-scheme.c'; then $(CYGPATH_W) 'x-scheme.c'; else $(CYGPATH_W) '$(srcdir)/x-scheme.c'; fi`
 
 xgettext-x-smalltalk.o: x-smalltalk.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-smalltalk.o `test -f 'x-smalltalk.c' || echo '$(srcdir)/'`x-smalltalk.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-smalltalk.o `test -f 'x-smalltalk.c' || echo '$(srcdir)/'`x-smalltalk.c
 
 xgettext-x-smalltalk.obj: x-smalltalk.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-smalltalk.obj `if test -f 'x-smalltalk.c'; then $(CYGPATH_W) 'x-smalltalk.c'; else $(CYGPATH_W) '$(srcdir)/x-smalltalk.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-smalltalk.obj `if test -f 'x-smalltalk.c'; then $(CYGPATH_W) 'x-smalltalk.c'; else $(CYGPATH_W) '$(srcdir)/x-smalltalk.c'; fi`
 
 xgettext-x-java.o: x-java.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-java.o `test -f 'x-java.c' || echo '$(srcdir)/'`x-java.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-java.o `test -f 'x-java.c' || echo '$(srcdir)/'`x-java.c
 
 xgettext-x-java.obj: x-java.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-java.obj `if test -f 'x-java.c'; then $(CYGPATH_W) 'x-java.c'; else $(CYGPATH_W) '$(srcdir)/x-java.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-java.obj `if test -f 'x-java.c'; then $(CYGPATH_W) 'x-java.c'; else $(CYGPATH_W) '$(srcdir)/x-java.c'; fi`
 
 xgettext-x-csharp.o: x-csharp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-csharp.o `test -f 'x-csharp.c' || echo '$(srcdir)/'`x-csharp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-csharp.o `test -f 'x-csharp.c' || echo '$(srcdir)/'`x-csharp.c
 
 xgettext-x-csharp.obj: x-csharp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-csharp.obj `if test -f 'x-csharp.c'; then $(CYGPATH_W) 'x-csharp.c'; else $(CYGPATH_W) '$(srcdir)/x-csharp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-csharp.obj `if test -f 'x-csharp.c'; then $(CYGPATH_W) 'x-csharp.c'; else $(CYGPATH_W) '$(srcdir)/x-csharp.c'; fi`
 
 xgettext-x-awk.o: x-awk.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-awk.o `test -f 'x-awk.c' || echo '$(srcdir)/'`x-awk.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-awk.o `test -f 'x-awk.c' || echo '$(srcdir)/'`x-awk.c
 
 xgettext-x-awk.obj: x-awk.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-awk.obj `if test -f 'x-awk.c'; then $(CYGPATH_W) 'x-awk.c'; else $(CYGPATH_W) '$(srcdir)/x-awk.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-awk.obj `if test -f 'x-awk.c'; then $(CYGPATH_W) 'x-awk.c'; else $(CYGPATH_W) '$(srcdir)/x-awk.c'; fi`
 
 xgettext-x-ycp.o: x-ycp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-ycp.o `test -f 'x-ycp.c' || echo '$(srcdir)/'`x-ycp.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-ycp.o `test -f 'x-ycp.c' || echo '$(srcdir)/'`x-ycp.c
 
 xgettext-x-ycp.obj: x-ycp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-ycp.obj `if test -f 'x-ycp.c'; then $(CYGPATH_W) 'x-ycp.c'; else $(CYGPATH_W) '$(srcdir)/x-ycp.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-ycp.obj `if test -f 'x-ycp.c'; then $(CYGPATH_W) 'x-ycp.c'; else $(CYGPATH_W) '$(srcdir)/x-ycp.c'; fi`
 
 xgettext-x-tcl.o: x-tcl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-tcl.o `test -f 'x-tcl.c' || echo '$(srcdir)/'`x-tcl.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-tcl.o `test -f 'x-tcl.c' || echo '$(srcdir)/'`x-tcl.c
 
 xgettext-x-tcl.obj: x-tcl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-tcl.obj `if test -f 'x-tcl.c'; then $(CYGPATH_W) 'x-tcl.c'; else $(CYGPATH_W) '$(srcdir)/x-tcl.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-tcl.obj `if test -f 'x-tcl.c'; then $(CYGPATH_W) 'x-tcl.c'; else $(CYGPATH_W) '$(srcdir)/x-tcl.c'; fi`
 
 xgettext-x-perl.o: x-perl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-perl.o `test -f 'x-perl.c' || echo '$(srcdir)/'`x-perl.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-perl.o `test -f 'x-perl.c' || echo '$(srcdir)/'`x-perl.c
 
 xgettext-x-perl.obj: x-perl.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-perl.obj `if test -f 'x-perl.c'; then $(CYGPATH_W) 'x-perl.c'; else $(CYGPATH_W) '$(srcdir)/x-perl.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-perl.obj `if test -f 'x-perl.c'; then $(CYGPATH_W) 'x-perl.c'; else $(CYGPATH_W) '$(srcdir)/x-perl.c'; fi`
 
 xgettext-x-php.o: x-php.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-php.o `test -f 'x-php.c' || echo '$(srcdir)/'`x-php.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-php.o `test -f 'x-php.c' || echo '$(srcdir)/'`x-php.c
 
 xgettext-x-php.obj: x-php.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-php.obj `if test -f 'x-php.c'; then $(CYGPATH_W) 'x-php.c'; else $(CYGPATH_W) '$(srcdir)/x-php.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-php.obj `if test -f 'x-php.c'; then $(CYGPATH_W) 'x-php.c'; else $(CYGPATH_W) '$(srcdir)/x-php.c'; fi`
 
 xgettext-x-rst.o: x-rst.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-rst.o `test -f 'x-rst.c' || echo '$(srcdir)/'`x-rst.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-rst.o `test -f 'x-rst.c' || echo '$(srcdir)/'`x-rst.c
 
 xgettext-x-rst.obj: x-rst.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-rst.obj `if test -f 'x-rst.c'; then $(CYGPATH_W) 'x-rst.c'; else $(CYGPATH_W) '$(srcdir)/x-rst.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-rst.obj `if test -f 'x-rst.c'; then $(CYGPATH_W) 'x-rst.c'; else $(CYGPATH_W) '$(srcdir)/x-rst.c'; fi`
 
 xgettext-x-glade.o: x-glade.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-glade.o `test -f 'x-glade.c' || echo '$(srcdir)/'`x-glade.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-glade.o `test -f 'x-glade.c' || echo '$(srcdir)/'`x-glade.c
 
 xgettext-x-glade.obj: x-glade.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-glade.obj `if test -f 'x-glade.c'; then $(CYGPATH_W) 'x-glade.c'; else $(CYGPATH_W) '$(srcdir)/x-glade.c'; fi`
-
-xgettext-x-lua.o: x-lua.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-lua.o `test -f 'x-lua.c' || echo '$(srcdir)/'`x-lua.c
-
-xgettext-x-lua.obj: x-lua.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-lua.obj `if test -f 'x-lua.c'; then $(CYGPATH_W) 'x-lua.c'; else $(CYGPATH_W) '$(srcdir)/x-lua.c'; fi`
-
-xgettext-x-javascript.o: x-javascript.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-javascript.o `test -f 'x-javascript.c' || echo '$(srcdir)/'`x-javascript.c
-
-xgettext-x-javascript.obj: x-javascript.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-javascript.obj `if test -f 'x-javascript.c'; then $(CYGPATH_W) 'x-javascript.c'; else $(CYGPATH_W) '$(srcdir)/x-javascript.c'; fi`
-
-xgettext-x-vala.o: x-vala.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-vala.o `test -f 'x-vala.c' || echo '$(srcdir)/'`x-vala.c
-
-xgettext-x-vala.obj: x-vala.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-vala.obj `if test -f 'x-vala.c'; then $(CYGPATH_W) 'x-vala.c'; else $(CYGPATH_W) '$(srcdir)/x-vala.c'; fi`
-
-xgettext-x-gsettings.o: x-gsettings.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-gsettings.o `test -f 'x-gsettings.c' || echo '$(srcdir)/'`x-gsettings.c
-
-xgettext-x-gsettings.obj: x-gsettings.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-gsettings.obj `if test -f 'x-gsettings.c'; then $(CYGPATH_W) 'x-gsettings.c'; else $(CYGPATH_W) '$(srcdir)/x-gsettings.c'; fi`
-
-xgettext-libexpat-compat.o: libexpat-compat.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-libexpat-compat.o `test -f 'libexpat-compat.c' || echo '$(srcdir)/'`libexpat-compat.c
-
-xgettext-libexpat-compat.obj: libexpat-compat.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-libexpat-compat.obj `if test -f 'libexpat-compat.c'; then $(CYGPATH_W) 'libexpat-compat.c'; else $(CYGPATH_W) '$(srcdir)/libexpat-compat.c'; fi`
-
-xgettext-x-desktop.o: x-desktop.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-desktop.o `test -f 'x-desktop.c' || echo '$(srcdir)/'`x-desktop.c
-
-xgettext-x-desktop.obj: x-desktop.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-desktop.obj `if test -f 'x-desktop.c'; then $(CYGPATH_W) 'x-desktop.c'; else $(CYGPATH_W) '$(srcdir)/x-desktop.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-glade.obj `if test -f 'x-glade.c'; then $(CYGPATH_W) 'x-glade.c'; else $(CYGPATH_W) '$(srcdir)/x-glade.c'; fi`
 
 .cc.o:
-	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
-
-../woe32dll/libgettextsrc_la-c++format.lo: ../woe32dll/c++format.cc
-	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc
-
-../woe32dll/msgattrib-c++msgattrib.o: ../woe32dll/c++msgattrib.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgattrib-c++msgattrib.o `test -f '../woe32dll/c++msgattrib.cc' || echo '$(srcdir)/'`../woe32dll/c++msgattrib.cc
-
-../woe32dll/msgattrib-c++msgattrib.obj: ../woe32dll/c++msgattrib.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgattrib-c++msgattrib.obj `if test -f '../woe32dll/c++msgattrib.cc'; then $(CYGPATH_W) '../woe32dll/c++msgattrib.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgattrib.cc'; fi`
-
-../woe32dll/msgcat-c++msgcat.o: ../woe32dll/c++msgcat.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgcat-c++msgcat.o `test -f '../woe32dll/c++msgcat.cc' || echo '$(srcdir)/'`../woe32dll/c++msgcat.cc
-
-../woe32dll/msgcat-c++msgcat.obj: ../woe32dll/c++msgcat.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgcat-c++msgcat.obj `if test -f '../woe32dll/c++msgcat.cc'; then $(CYGPATH_W) '../woe32dll/c++msgcat.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgcat.cc'; fi`
-
-../woe32dll/msgcomm-c++msgcomm.o: ../woe32dll/c++msgcomm.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgcomm-c++msgcomm.o `test -f '../woe32dll/c++msgcomm.cc' || echo '$(srcdir)/'`../woe32dll/c++msgcomm.cc
-
-../woe32dll/msgcomm-c++msgcomm.obj: ../woe32dll/c++msgcomm.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgcomm-c++msgcomm.obj `if test -f '../woe32dll/c++msgcomm.cc'; then $(CYGPATH_W) '../woe32dll/c++msgcomm.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgcomm.cc'; fi`
-
-../woe32dll/msgconv-c++msgconv.o: ../woe32dll/c++msgconv.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgconv-c++msgconv.o `test -f '../woe32dll/c++msgconv.cc' || echo '$(srcdir)/'`../woe32dll/c++msgconv.cc
-
-../woe32dll/msgconv-c++msgconv.obj: ../woe32dll/c++msgconv.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgconv-c++msgconv.obj `if test -f '../woe32dll/c++msgconv.cc'; then $(CYGPATH_W) '../woe32dll/c++msgconv.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgconv.cc'; fi`
-
-../woe32dll/msgen-c++msgen.o: ../woe32dll/c++msgen.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgen-c++msgen.o `test -f '../woe32dll/c++msgen.cc' || echo '$(srcdir)/'`../woe32dll/c++msgen.cc
-
-../woe32dll/msgen-c++msgen.obj: ../woe32dll/c++msgen.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgen-c++msgen.obj `if test -f '../woe32dll/c++msgen.cc'; then $(CYGPATH_W) '../woe32dll/c++msgen.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgen.cc'; fi`
-
-../woe32dll/msgfilter-c++msgfilter.o: ../woe32dll/c++msgfilter.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgfilter-c++msgfilter.o `test -f '../woe32dll/c++msgfilter.cc' || echo '$(srcdir)/'`../woe32dll/c++msgfilter.cc
-
-../woe32dll/msgfilter-c++msgfilter.obj: ../woe32dll/c++msgfilter.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgfilter-c++msgfilter.obj `if test -f '../woe32dll/c++msgfilter.cc'; then $(CYGPATH_W) '../woe32dll/c++msgfilter.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgfilter.cc'; fi`
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(LTCXXCOMPILE) -c -o $@ $<
 
-../woe32dll/msggrep-c++msggrep.o: ../woe32dll/c++msggrep.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msggrep-c++msggrep.o `test -f '../woe32dll/c++msggrep.cc' || echo '$(srcdir)/'`../woe32dll/c++msggrep.cc
-
-../woe32dll/msggrep-c++msggrep.obj: ../woe32dll/c++msggrep.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msggrep-c++msggrep.obj `if test -f '../woe32dll/c++msggrep.cc'; then $(CYGPATH_W) '../woe32dll/c++msggrep.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msggrep.cc'; fi`
-
-../woe32dll/msgmerge-c++msgmerge.o: ../woe32dll/c++msgmerge.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgmerge-c++msgmerge.o `test -f '../woe32dll/c++msgmerge.cc' || echo '$(srcdir)/'`../woe32dll/c++msgmerge.cc
-
-../woe32dll/msgmerge-c++msgmerge.obj: ../woe32dll/c++msgmerge.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msgmerge-c++msgmerge.obj `if test -f '../woe32dll/c++msgmerge.cc'; then $(CYGPATH_W) '../woe32dll/c++msgmerge.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgmerge.cc'; fi`
-
-../woe32dll/msguniq-c++msguniq.o: ../woe32dll/c++msguniq.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msguniq-c++msguniq.o `test -f '../woe32dll/c++msguniq.cc' || echo '$(srcdir)/'`../woe32dll/c++msguniq.cc
-
-../woe32dll/msguniq-c++msguniq.obj: ../woe32dll/c++msguniq.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/msguniq-c++msguniq.obj `if test -f '../woe32dll/c++msguniq.cc'; then $(CYGPATH_W) '../woe32dll/c++msguniq.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msguniq.cc'; fi`
-
-../woe32dll/xgettext-c++xgettext.o: ../woe32dll/c++xgettext.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/xgettext-c++xgettext.o `test -f '../woe32dll/c++xgettext.cc' || echo '$(srcdir)/'`../woe32dll/c++xgettext.cc
-
-../woe32dll/xgettext-c++xgettext.obj: ../woe32dll/c++xgettext.cc
-	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/xgettext-c++xgettext.obj `if test -f '../woe32dll/c++xgettext.cc'; then $(CYGPATH_W) '../woe32dll/c++xgettext.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++xgettext.cc'; fi`
+c++format.lo: ../woe32dll/c++format.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc
+
+msgattrib-c++msgattrib.o: ../woe32dll/c++msgattrib.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgattrib-c++msgattrib.o `test -f '../woe32dll/c++msgattrib.cc' || echo '$(srcdir)/'`../woe32dll/c++msgattrib.cc
+
+msgattrib-c++msgattrib.obj: ../woe32dll/c++msgattrib.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgattrib_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgattrib-c++msgattrib.obj `if test -f '../woe32dll/c++msgattrib.cc'; then $(CYGPATH_W) '../woe32dll/c++msgattrib.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgattrib.cc'; fi`
+
+msgcat-c++msgcat.o: ../woe32dll/c++msgcat.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgcat-c++msgcat.o `test -f '../woe32dll/c++msgcat.cc' || echo '$(srcdir)/'`../woe32dll/c++msgcat.cc
+
+msgcat-c++msgcat.obj: ../woe32dll/c++msgcat.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgcat-c++msgcat.obj `if test -f '../woe32dll/c++msgcat.cc'; then $(CYGPATH_W) '../woe32dll/c++msgcat.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgcat.cc'; fi`
+
+msgcomm-c++msgcomm.o: ../woe32dll/c++msgcomm.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgcomm-c++msgcomm.o `test -f '../woe32dll/c++msgcomm.cc' || echo '$(srcdir)/'`../woe32dll/c++msgcomm.cc
+
+msgcomm-c++msgcomm.obj: ../woe32dll/c++msgcomm.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgcomm_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgcomm-c++msgcomm.obj `if test -f '../woe32dll/c++msgcomm.cc'; then $(CYGPATH_W) '../woe32dll/c++msgcomm.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgcomm.cc'; fi`
+
+msgconv-c++msgconv.o: ../woe32dll/c++msgconv.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgconv-c++msgconv.o `test -f '../woe32dll/c++msgconv.cc' || echo '$(srcdir)/'`../woe32dll/c++msgconv.cc
+
+msgconv-c++msgconv.obj: ../woe32dll/c++msgconv.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgconv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgconv-c++msgconv.obj `if test -f '../woe32dll/c++msgconv.cc'; then $(CYGPATH_W) '../woe32dll/c++msgconv.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgconv.cc'; fi`
+
+msgen-c++msgen.o: ../woe32dll/c++msgen.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgen-c++msgen.o `test -f '../woe32dll/c++msgen.cc' || echo '$(srcdir)/'`../woe32dll/c++msgen.cc
+
+msgen-c++msgen.obj: ../woe32dll/c++msgen.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgen_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgen-c++msgen.obj `if test -f '../woe32dll/c++msgen.cc'; then $(CYGPATH_W) '../woe32dll/c++msgen.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgen.cc'; fi`
+
+msgfilter-c++msgfilter.o: ../woe32dll/c++msgfilter.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgfilter-c++msgfilter.o `test -f '../woe32dll/c++msgfilter.cc' || echo '$(srcdir)/'`../woe32dll/c++msgfilter.cc
+
+msgfilter-c++msgfilter.obj: ../woe32dll/c++msgfilter.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgfilter_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msgfilter-c++msgfilter.obj `if test -f '../woe32dll/c++msgfilter.cc'; then $(CYGPATH_W) '../woe32dll/c++msgfilter.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgfilter.cc'; fi`
+
+msggrep-c++msggrep.o: ../woe32dll/c++msggrep.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msggrep-c++msggrep.o `test -f '../woe32dll/c++msggrep.cc' || echo '$(srcdir)/'`../woe32dll/c++msggrep.cc
+
+msggrep-c++msggrep.obj: ../woe32dll/c++msggrep.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msggrep_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msggrep-c++msggrep.obj `if test -f '../woe32dll/c++msggrep.cc'; then $(CYGPATH_W) '../woe32dll/c++msggrep.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msggrep.cc'; fi`
+
+msgmerge-c++msgmerge.o: ../woe32dll/c++msgmerge.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CXXFLAGS) $(CXXFLAGS) -c -o msgmerge-c++msgmerge.o `test -f '../woe32dll/c++msgmerge.cc' || echo '$(srcdir)/'`../woe32dll/c++msgmerge.cc
+
+msgmerge-c++msgmerge.obj: ../woe32dll/c++msgmerge.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msgmerge_CPPFLAGS) $(CPPFLAGS) $(msgmerge_CXXFLAGS) $(CXXFLAGS) -c -o msgmerge-c++msgmerge.obj `if test -f '../woe32dll/c++msgmerge.cc'; then $(CYGPATH_W) '../woe32dll/c++msgmerge.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msgmerge.cc'; fi`
+
+msguniq-c++msguniq.o: ../woe32dll/c++msguniq.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msguniq-c++msguniq.o `test -f '../woe32dll/c++msguniq.cc' || echo '$(srcdir)/'`../woe32dll/c++msguniq.cc
+
+msguniq-c++msguniq.obj: ../woe32dll/c++msguniq.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(msguniq_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msguniq-c++msguniq.obj `if test -f '../woe32dll/c++msguniq.cc'; then $(CYGPATH_W) '../woe32dll/c++msguniq.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++msguniq.cc'; fi`
+
+xgettext-c++xgettext.o: ../woe32dll/c++xgettext.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xgettext-c++xgettext.o `test -f '../woe32dll/c++xgettext.cc' || echo '$(srcdir)/'`../woe32dll/c++xgettext.cc
+
+xgettext-c++xgettext.obj: ../woe32dll/c++xgettext.cc
+	$(AM_V_CXX) @AM_BACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xgettext-c++xgettext.obj `if test -f '../woe32dll/c++xgettext.cc'; then $(CYGPATH_W) '../woe32dll/c++xgettext.cc'; else $(CYGPATH_W) '$(srcdir)/../woe32dll/c++xgettext.cc'; fi`
 
 .y.c:
-	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-	-rm -rf ../woe32dll/.libs ../woe32dll/_libs
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -3171,11 +2643,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -3184,21 +2660,6 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -3254,15 +2715,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -3272,8 +2728,6 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../../gettext-runtime/intl/$(am__dirstamp)
-	-rm -f ../woe32dll/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -3311,8 +2765,7 @@
 
 install-exec-am: install-binPROGRAMS install-exec-local \
 	install-libLTLIBRARIES
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
 install-html: install-html-am
 
 install-html-am:
@@ -3353,29 +2806,29 @@
 uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
 	uninstall-local
 
-.MAKE: all check install install-am install-exec-am install-strip
+.MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-hook \
-	install-exec-local install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-binPROGRAMS \
-	installdirs installdirs-local maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-libLTLIBRARIES uninstall-local
+	clean-libtool clean-noinstPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installcheck-binPROGRAMS installdirs \
+	installdirs-local maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 # No need to install libgettextsrc.a, except on AIX.
-install-exec-hook: install-exec-clean
+install-exec-local: install-libLTLIBRARIES install-exec-clean
 install-exec-clean:
 	case "@host_os@" in \
 	  aix*) ;; \
@@ -3384,23 +2837,20 @@
 
 po-lex.o po-lex.lo: po-gram-gen2.h
 po-gram-gen2.h: po-gram-gen.h
-	srcdir=''; \
-	test -f ./po-gram-gen.h || srcdir=$(srcdir)/; \
-	$(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' \
-	  $${srcdir}po-gram-gen.h > $@-tmp && \
+	$(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' $(srcdir)/po-gram-gen.h > $@-tmp
 	mv $@-tmp $@
 
 # Special rules for installation of auxiliary programs.
 
 install-exec-local:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
 	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email
 	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id
 
 installdirs-local:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 
 uninstall-local:
 	$(RM) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
@@ -3431,7 +2881,7 @@
 
 install-exec-local: install-exec-java-@BUILDJAVAEXE@
 install-exec-java-yes: all-java-yes
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gnu.gettext.DumpResource$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.DumpResource$(EXEEXT)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gnu.gettext.GetURL$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.GetURL$(EXEEXT)
 install-exec-java-no:
@@ -3445,10 +2895,10 @@
 
 installdirs-local: installdirs-java-@BUILDJAVAEXE@
 installdirs-java-yes:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 installdirs-java-no: installdirs-java-no-@BUILDJAVA@
 installdirs-java-no-yes:
-	$(MKDIR_P) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 installdirs-java-no-no:
 
 uninstall-local: uninstall-java-@BUILDJAVAEXE@
@@ -3472,15 +2922,15 @@
 
 install-exec-local: install-exec-csharp-@BUILDCSHARP@
 install-exec-csharp-yes: all-csharp-yes
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_DATA) msgfmt.net.exe $(DESTDIR)$(pkglibdir)/msgfmt.net.exe
 	$(INSTALL_DATA) msgunfmt.net.exe $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe
 install-exec-csharp-no:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 
 installdirs-local: install-csharp
 installdirs-csharp:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 
 uninstall-local: uninstall-csharp-@BUILDCSHARP@
 uninstall-csharp-yes: all-csharp-yes
@@ -3490,12 +2940,12 @@
 
 install-data-local: install-tcl
 install-tcl:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl
 
 installdirs-local: installdirs-tcl
 installdirs-tcl:
-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local: uninstall-tcl
 uninstall-tcl:
diff -Nru gettext-0.19.3/gettext-tools/src/message.c gettext-0.18.1.1/gettext-tools/src/message.c
--- gettext-0.19.3/gettext-tools/src/message.c	2013-09-24 03:32:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/message.c	2010-06-06 12:49:58.000000000 +0000
@@ -38,7 +38,6 @@
   /* format_objc */             "objc",
   /* format_sh */               "sh",
   /* format_python */           "python",
-  /* format_python_brace */     "python-brace",
   /* format_lisp */             "lisp",
   /* format_elisp */            "elisp",
   /* format_librep */           "librep",
@@ -58,9 +57,7 @@
   /* format_qt */               "qt",
   /* format_qt_plursl */        "qt-plural",
   /* format_kde */              "kde",
-  /* format_boost */            "boost",
-  /* format_lua */              "lua",
-  /* format_javascript */       "javascript"
+  /* format_boost */            "boost"
 };
 
 const char *const format_language_pretty[NFORMATS] =
@@ -69,7 +66,6 @@
   /* format_objc */             "Objective C",
   /* format_sh */               "Shell",
   /* format_python */           "Python",
-  /* format_python_brace */     "Python brace",
   /* format_lisp */             "Lisp",
   /* format_elisp */            "Emacs Lisp",
   /* format_librep */           "librep",
@@ -89,9 +85,7 @@
   /* format_qt */               "Qt",
   /* format_qt_plural */        "Qt plural",
   /* format_kde */              "KDE",
-  /* format_boost */            "Boost",
-  /* format_lua */              "Lua",
-  /* format_javascript */       "JavaScript"
+  /* format_boost */            "Boost"
 };
 
 
diff -Nru gettext-0.19.3/gettext-tools/src/message.h gettext-0.18.1.1/gettext-tools/src/message.h
--- gettext-0.19.3/gettext-tools/src/message.h	2013-09-24 03:32:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/message.h	2010-06-06 12:49:58.000000000 +0000
@@ -47,7 +47,6 @@
   format_objc,
   format_sh,
   format_python,
-  format_python_brace,
   format_lisp,
   format_elisp,
   format_librep,
@@ -67,11 +66,9 @@
   format_qt,
   format_qt_plural,
   format_kde,
-  format_boost,
-  format_lua,
-  format_javascript
+  format_boost
 };
-#define NFORMATS 27     /* Number of format_type enum values.  */
+#define NFORMATS 24     /* Number of format_type enum values.  */
 extern DLL_VARIABLE const char *const format_language[NFORMATS];
 extern DLL_VARIABLE const char *const format_language_pretty[NFORMATS];
 
diff -Nru gettext-0.19.3/gettext-tools/src/msgattrib.c gettext-0.18.1.1/gettext-tools/src/msgattrib.c
--- gettext-0.19.3/gettext-tools/src/msgattrib.c	2014-05-13 06:27:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgattrib.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Manipulates attributes of messages in translation catalogs.
-   Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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
@@ -44,7 +44,6 @@
 #include "write-stringtable.h"
 #include "color.h"
 #include "propername.h"
-#include "xalloc.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -72,20 +71,17 @@
   RESET_FUZZY           = 1 << 1,
   SET_OBSOLETE          = 1 << 2,
   RESET_OBSOLETE        = 1 << 3,
-  REMOVE_PREV           = 1 << 4,
-  ADD_PREV              = 1 << 5,
-  REMOVE_TRANSLATION    = 1 << 6
+  REMOVE_PREV           = 1 << 4
 };
 static int to_change;
 
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "clear-fuzzy", no_argument, NULL, CHAR_MAX + 8 },
   { "clear-obsolete", no_argument, NULL, CHAR_MAX + 10 },
   { "clear-previous", no_argument, NULL, CHAR_MAX + 18 },
-  { "empty", no_argument, NULL, CHAR_MAX + 23 },
   { "color", optional_argument, NULL, CHAR_MAX + 19 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -96,7 +92,7 @@
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-fuzzy", no_argument, NULL, CHAR_MAX + 3 },
-  { "no-location", no_argument, NULL, CHAR_MAX + 22 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-obsolete", no_argument, NULL, CHAR_MAX + 5 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 13 },
   { "obsolete", no_argument, NULL, CHAR_MAX + 12 },
@@ -104,7 +100,6 @@
   { "only-fuzzy", no_argument, NULL, CHAR_MAX + 4 },
   { "only-obsolete", no_argument, NULL, CHAR_MAX + 6 },
   { "output-file", required_argument, NULL, 'o' },
-  { "previous", no_argument, NULL, CHAR_MAX + 21 },
   { "properties-input", no_argument, NULL, 'P' },
   { "properties-output", no_argument, NULL, 'p' },
   { "set-fuzzy", no_argument, NULL, CHAR_MAX + 7 },
@@ -209,8 +204,7 @@
         break;
 
       case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
+        line_comment = 1;
         break;
 
       case 'o':
@@ -330,18 +324,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 21: /* --previous */
-        to_change |= ADD_PREV;
-        break;
-
-      case CHAR_MAX + 22: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
-      case CHAR_MAX + 23: /* --empty */
-        to_change |= REMOVE_TRANSLATION;
-        break;
-
       default:
         usage (EXIT_FAILURE);
         /* NOTREACHED */
@@ -378,6 +360,10 @@
     }
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -414,7 +400,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -473,13 +459,8 @@
       printf (_("\
       --clear-obsolete        set all messages non-obsolete\n"));
       printf (_("\
-      --previous              when setting 'fuzzy', keep previous msgids\n\
-                              of translated messages.\n"));
-      printf (_("\
       --clear-previous        remove the \"previous msgid\" from all messages\n"));
       printf (_("\
-      --empty                 when removing 'fuzzy', also set msgstr empty\n"));
-      printf (_("\
       --only-file=FILE.po     manipulate only entries listed in FILE.po\n"));
       printf (_("\
       --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"));
@@ -606,42 +587,9 @@
                   : true))
             {
               if (to_change & SET_FUZZY)
-                {
-                  if ((to_change & ADD_PREV) && !is_header (mp)
-                      && !mp->is_fuzzy && mp->msgstr[0] != '\0')
-                    {
-                      mp->prev_msgctxt =
-                        (mp->msgctxt != NULL ? xstrdup (mp->msgctxt) : NULL);
-                      mp->prev_msgid =
-                        (mp->msgid != NULL ? xstrdup (mp->msgid) : NULL);
-                      mp->prev_msgid_plural =
-                        (mp->msgid_plural != NULL
-                         ? xstrdup (mp->msgid_plural)
-                         : NULL);
-                    }
-                  mp->is_fuzzy = true;
-                }
-
+                mp->is_fuzzy = true;
               if (to_change & RESET_FUZZY)
-                {
-                  if ((to_change & REMOVE_TRANSLATION)
-                      && mp->is_fuzzy && !mp->obsolete)
-                    {
-                      unsigned long int nplurals = 0;
-                      char *msgstr;
-                      size_t pos;
-
-                      for (pos = 0; pos < mp->msgstr_len; ++pos)
-                        if (!mp->msgstr[pos])
-                          ++nplurals;
-                      free ((char *) mp->msgstr);
-                      msgstr = XNMALLOC (nplurals, char);
-                      memset (msgstr, '\0', nplurals);
-                      mp->msgstr = msgstr;
-                      mp->msgstr_len = nplurals;
-                    }
-                  mp->is_fuzzy = false;
-                }
+                mp->is_fuzzy = false;
               /* Always keep the header entry non-obsolete.  */
               if ((to_change & SET_OBSOLETE) && !is_header (mp))
                 mp->obsolete = true;
diff -Nru gettext-0.19.3/gettext-tools/src/msgcat.c gettext-0.18.1.1/gettext-tools/src/msgcat.c
--- gettext-0.19.3/gettext-tools/src/msgcat.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgcat.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Concatenates several translation catalogs.
-   Copyright (C) 2001-2007, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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
@@ -62,7 +62,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 5 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -72,7 +72,7 @@
   { "indent", no_argument, NULL, 'i' },
   { "lang", required_argument, NULL, CHAR_MAX + 7 },
   { "no-escape", no_argument, NULL, 'e' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 8 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
@@ -202,8 +202,7 @@
         break;
 
       case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
+        line_comment = 1;
         break;
 
       case 'o':
@@ -277,10 +276,6 @@
         catalogname = optarg;
         break;
 
-      case CHAR_MAX + 8: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         /* NOTREACHED */
@@ -312,6 +307,10 @@
     }
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -360,7 +359,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -376,9 +375,9 @@
 before messages are printed.  Conversely, the --less-than option may be\n\
 used to specify less commonality before messages are printed (i.e.\n\
 --less-than=2 will only print the unique messages).  Translations,\n\
-comments, extracted comments, and file positions will be cumulated, except\n\
-that if --use-first is specified, they will be taken from the first PO file\n\
-to define them.\n\
+comments and extract comments will be cumulated, except that if --use-first\n\
+is specified, they will be taken from the first PO file to define them.\n\
+File positions from all PO files will be cumulated.\n\
 "));
       printf ("\n");
       printf (_("\
diff -Nru gettext-0.19.3/gettext-tools/src/msgcmp.c gettext-0.18.1.1/gettext-tools/src/msgcmp.c
--- gettext-0.19.3/gettext-tools/src/msgcmp.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgcmp.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software: you can redistribute it and/or modify
@@ -206,7 +206,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-tools/src/msgcomm.c gettext-0.18.1.1/gettext-tools/src/msgcomm.c
--- gettext-0.19.3/gettext-tools/src/msgcomm.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgcomm.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1997-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -63,7 +63,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 5 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -72,7 +72,7 @@
   { "help", no_argument, NULL, 'h' },
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 7 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "omit-header", no_argument, NULL, CHAR_MAX + 1 },
   { "output", required_argument, NULL, 'o' }, /* for backward compatibility */
@@ -197,8 +197,7 @@
         break;
 
       case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
+        line_comment = 1;
         break;
 
       case 'o':
@@ -268,10 +267,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 7: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         /* NOTREACHED */
@@ -297,6 +292,10 @@
     usage (EXIT_SUCCESS);
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -352,7 +351,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -367,7 +366,7 @@
 before messages are printed.  Conversely, the --less-than option may be\n\
 used to specify less commonality before messages are printed (i.e.\n\
 --less-than=2 will only print the unique messages).  Translations,\n\
-comments and extracted comments will be preserved, but only from the first\n\
+comments and extract comments will be preserved, but only from the first\n\
 PO file to define them.  File positions from all PO files will be\n\
 cumulated.\n\
 "));
@@ -450,7 +449,7 @@
       printf (_("\
   -F, --sort-by-file          sort output by file location\n"));
       printf (_("\
-      --omit-header           don't write header with 'msgid \"\"' entry\n"));
+      --omit-header           don't write header with `msgid \"\"' entry\n"));
       printf ("\n");
       printf (_("\
 Informative output:\n"));
diff -Nru gettext-0.19.3/gettext-tools/src/msgconv.c gettext-0.18.1.1/gettext-tools/src/msgconv.c
--- gettext-0.19.3/gettext-tools/src/msgconv.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgconv.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Converts a translation catalog to a different character encoding.
-   Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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
@@ -60,7 +60,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 4 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -68,7 +68,7 @@
   { "help", no_argument, NULL, 'h' },
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 6 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 1 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
@@ -131,7 +131,7 @@
   output_file = NULL;
   input_file = NULL;
 
-  while ((opt = getopt_long (argc, argv, "D:eEFhin:o:pPst:Vw:", long_options,
+  while ((opt = getopt_long (argc, argv, "D:eEFhio:pPst:Vw:", long_options,
                              NULL))
          != EOF)
     switch (opt)
@@ -163,11 +163,6 @@
         message_print_style_indent ();
         break;
 
-      case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
-        break;
-
       case 'o':
         output_file = optarg;
         break;
@@ -227,10 +222,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 6: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         break;
@@ -267,6 +258,10 @@
     }
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -300,7 +295,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -365,7 +360,7 @@
       printf (_("\
       --no-location           suppress '#: filename:line' lines\n"));
       printf (_("\
-  -n, --add-location          preserve '#: filename:line' lines (default)\n"));
+      --add-location          preserve '#: filename:line' lines (default)\n"));
       printf (_("\
       --strict                strict Uniforum output style\n"));
       printf (_("\
diff -Nru gettext-0.19.3/gettext-tools/src/msgen.c gettext-0.18.1.1/gettext-tools/src/msgen.c
--- gettext-0.19.3/gettext-tools/src/msgen.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgen.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Creates an English translation catalog.
-   Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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
@@ -57,7 +57,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 5 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -66,7 +66,7 @@
   { "indent", no_argument, NULL, 'i' },
   { "lang", required_argument, NULL, CHAR_MAX + 4 },
   { "no-escape", no_argument, NULL, 'e' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 7 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 1 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
@@ -128,9 +128,8 @@
   do_version = false;
   output_file = NULL;
 
-  while ((opt = getopt_long (argc, argv,
-                             "D:eEFhin:o:pPsVw:",
-                             long_options, NULL)) != EOF)
+  while ((opt = getopt_long (argc, argv, "D:eEFhio:pPsVw:", long_options, NULL))
+         != EOF)
     switch (opt)
       {
       case '\0':                /* Long option.  */
@@ -160,11 +159,6 @@
         message_print_style_indent ();
         break;
 
-      case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
-        break;
-
       case 'o':
         output_file = optarg;
         break;
@@ -224,10 +218,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 7: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         break;
@@ -265,6 +255,10 @@
     }
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -297,7 +291,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -361,7 +355,7 @@
       printf (_("\
       --no-location           suppress '#: filename:line' lines\n"));
       printf (_("\
-  -n, --add-location          preserve '#: filename:line' lines (default)\n"));
+      --add-location          preserve '#: filename:line' lines (default)\n"));
       printf (_("\
       --strict                strict Uniforum output style\n"));
       printf (_("\
diff -Nru gettext-0.19.3/gettext-tools/src/msgexec.c gettext-0.18.1.1/gettext-tools/src/msgexec.c
--- gettext-0.19.3/gettext-tools/src/msgexec.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgexec.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Pass translations to a subprocess.
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2010 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
@@ -48,7 +48,7 @@
 #include "xalloc.h"
 #include "full-write.h"
 #include "findprog.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "xsetenv.h"
 #include "propername.h"
@@ -250,7 +250,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -355,7 +355,7 @@
 
       /* Set environment variables for the subprocess.
          Note: These environment variables, especially MSGEXEC_MSGCTXT and
-         MSGEXEC_MSGID, may contain non-ASCII characters.  The subprocess
+         MSGEXEC_MSGCTXT, may contain non-ASCII characters.  The subprocess
          may not interpret these values correctly if the locale encoding is
          different from the PO file's encoding.  We want about this situation,
          above.
@@ -370,26 +370,10 @@
       else
         unsetenv ("MSGEXEC_MSGCTXT");
       xsetenv ("MSGEXEC_MSGID", mp->msgid, 1);
-      if (mp->msgid_plural != NULL)
-        xsetenv ("MSGEXEC_MSGID_PLURAL", mp->msgid_plural, 1);
-      else
-        unsetenv ("MSGEXEC_MSGID_PLURAL");
       location = xasprintf ("%s:%ld", mp->pos.file_name,
                             (long) mp->pos.line_number);
       xsetenv ("MSGEXEC_LOCATION", location, 1);
       free (location);
-      if (mp->prev_msgctxt != NULL)
-        xsetenv ("MSGEXEC_PREV_MSGCTXT", mp->prev_msgctxt, 1);
-      else
-        unsetenv ("MSGEXEC_PREV_MSGCTXT");
-      if (mp->prev_msgid != NULL)
-        xsetenv ("MSGEXEC_PREV_MSGID", mp->prev_msgid, 1);
-      else
-        unsetenv ("MSGEXEC_PREV_MSGID");
-      if (mp->prev_msgid_plural != NULL)
-        xsetenv ("MSGEXEC_PREV_MSGID_PLURAL", mp->prev_msgid_plural, 1);
-      else
-        unsetenv ("MSGEXEC_PREV_MSGID_PLURAL");
 
       /* Open a pipe to a subprocess.  */
       child = create_pipe_out (sub_name, sub_path, sub_argv, NULL, false, true,
@@ -425,22 +409,12 @@
   const char *msgstr = mp->msgstr;
   size_t msgstr_len = mp->msgstr_len;
   const char *p;
-  size_t k;
 
   /* Process each NUL delimited substring separately.  */
-  for (p = msgstr, k = 0; p < msgstr + msgstr_len; k++)
+  for (p = msgstr; p < msgstr + msgstr_len; )
     {
       size_t length = strlen (p);
 
-      if (mp->msgid_plural != NULL)
-        {
-          char *plural_form_string = xasprintf ("%zu", k);
-
-          xsetenv ("MSGEXEC_PLURAL_FORM", plural_form_string, 1);
-          free (plural_form_string);
-        }
-      else
-        unsetenv ("MSGEXEC_PLURAL_FORM");
       process_string (mp, p, length);
 
       p += length + 1;
diff -Nru gettext-0.19.3/gettext-tools/src/msgfilter.c gettext-0.18.1.1/gettext-tools/src/msgfilter.c
--- gettext-0.19.3/gettext-tools/src/msgfilter.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgfilter.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Edit translations using a subprocess.
-   Copyright (C) 2001-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2010 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
@@ -87,7 +87,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 6 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -97,7 +97,7 @@
   { "input", required_argument, NULL, 'i' },
   { "keep-header", no_argument, &keep_header, 1 },
   { "no-escape", no_argument, NULL, CHAR_MAX + 2 },
-  { "no-location", no_argument, NULL, CHAR_MAX + 8 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 3 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
@@ -164,7 +164,7 @@
 
   /* The '+' in the options string causes option parsing to terminate when
      the first non-option, i.e. the subprogram name, is encountered.  */
-  while ((opt = getopt_long (argc, argv, "+D:EFhi:n:o:pPsVw:", long_options,
+  while ((opt = getopt_long (argc, argv, "+D:EFhi:o:pPsVw:", long_options,
                              NULL))
          != EOF)
     switch (opt)
@@ -197,11 +197,6 @@
         input_file = optarg;
         break;
 
-      case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
-        break;
-
       case 'o':
         output_file = optarg;
         break;
@@ -265,10 +260,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 8: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         break;
@@ -299,6 +290,10 @@
   sub_name = argv[optind];
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -349,20 +344,6 @@
       /* Convert the input to UTF-8 first.  */
       result = iconv_msgdomain_list (result, po_charset_utf8, true, input_file);
     }
-  else if (strcmp (sub_name, "quot") == 0 && sub_argc == 1)
-    {
-      filter = ascii_quote_to_unicode;
-
-      /* Convert the input to UTF-8 first.  */
-      result = iconv_msgdomain_list (result, po_charset_utf8, true, input_file);
-    }
-  else if (strcmp (sub_name, "boldquot") == 0 && sub_argc == 1)
-    {
-      filter = ascii_quote_to_unicode_bold;
-
-      /* Convert the input to UTF-8 first.  */
-      result = iconv_msgdomain_list (result, po_charset_utf8, true, input_file);
-    }
   else
     {
       filter = generic_filter;
@@ -400,7 +381,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -475,7 +456,7 @@
       printf (_("\
       --no-location           suppress '#: filename:line' lines\n"));
       printf (_("\
-  -n, --add-location          preserve '#: filename:line' lines (default)\n"));
+      --add-location          preserve '#: filename:line' lines (default)\n"));
       printf (_("\
       --strict                strict Uniforum output style\n"));
       printf (_("\
@@ -647,8 +628,8 @@
     return;
 
   /* Set environment variables for the subprocess.
-     Note: These environment variables, especially MSGFILTER_MSGCTXT and
-     MSGFILTER_MSGID, may contain non-ASCII characters.  The subprocess
+     Note: These environment variables, especially MSGEXEC_MSGCTXT and
+     MSGEXEC_MSGCTXT, may contain non-ASCII characters.  The subprocess
      may not interpret these values correctly if the locale encoding is
      different from the PO file's encoding.  We want about this situation,
      above.
@@ -663,26 +644,10 @@
   else
     unsetenv ("MSGFILTER_MSGCTXT");
   xsetenv ("MSGFILTER_MSGID", mp->msgid, 1);
-  if (mp->msgid_plural != NULL)
-    xsetenv ("MSGFILTER_MSGID_PLURAL", mp->msgid_plural, 1);
-  else
-    unsetenv ("MSGFILTER_MSGID_PLURAL");
   location = xasprintf ("%s:%ld", mp->pos.file_name,
                         (long) mp->pos.line_number);
   xsetenv ("MSGFILTER_LOCATION", location, 1);
   free (location);
-  if (mp->prev_msgctxt != NULL)
-    xsetenv ("MSGFILTER_PREV_MSGCTXT", mp->prev_msgctxt, 1);
-  else
-    unsetenv ("MSGFILTER_PREV_MSGCTXT");
-  if (mp->prev_msgid != NULL)
-    xsetenv ("MSGFILTER_PREV_MSGID", mp->prev_msgid, 1);
-  else
-    unsetenv ("MSGFILTER_PREV_MSGID");
-  if (mp->prev_msgid_plural != NULL)
-    xsetenv ("MSGFILTER_PREV_MSGID_PLURAL", mp->prev_msgid_plural, 1);
-  else
-    unsetenv ("MSGFILTER_PREV_MSGID_PLURAL");
 
   /* Count NUL delimited substrings.  */
   for (p = msgstr, nsubstrings = 0;
@@ -696,15 +661,6 @@
       char *result;
       size_t length;
 
-      if (mp->msgid_plural != NULL)
-        {
-          char *plural_form_string = xasprintf ("%zu", k);
-
-          xsetenv ("MSGFILTER_PLURAL_FORM", plural_form_string, 1);
-          free (plural_form_string);
-        }
-      else
-        unsetenv ("MSGFILTER_PLURAL_FORM");
       process_string (p, strlen (p), &result, &length);
       result = (char *) xrealloc (result, length + 1);
       result[length] = '\0';
diff -Nru gettext-0.19.3/gettext-tools/src/msgfmt.c gettext-0.18.1.1/gettext-tools/src/msgfmt.c
--- gettext-0.19.3/gettext-tools/src/msgfmt.c	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgfmt.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Converts Uniforum style .po files to binary .mo files
-   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2007, 2009-2010 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
@@ -26,9 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <assert.h>
 
 #include "closeout.h"
 #include "str-list.h"
@@ -48,7 +45,6 @@
 #include "write-resources.h"
 #include "write-tcl.h"
 #include "write-qt.h"
-#include "write-desktop.h"
 #include "propername.h"
 #include "message.h"
 #include "open-catalog.h"
@@ -56,11 +52,8 @@
 #include "read-po.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
-#include "read-desktop.h"
 #include "po-charset.h"
 #include "msgl-check.h"
-#include "msgl-iconv.h"
-#include "concat-filename.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -83,7 +76,6 @@
 static const char *java_resource_name;
 static const char *java_locale_name;
 static const char *java_class_directory;
-static bool java_output_source;
 
 /* C# mode output file specification.  */
 static bool csharp_mode;
@@ -102,14 +94,6 @@
 /* Qt mode output file specification.  */
 static bool qt_mode;
 
-/* Desktop Entry mode output file specification.  */
-static bool desktop_mode;
-static const char *desktop_locale_name;
-static const char *desktop_template_name;
-static const char *desktop_base_directory;
-static hash_table desktop_keywords;
-static bool desktop_default_keywords = true;
-
 /* We may have more than one input file.  Domains with same names in
    different files have to merged.  So we need a list of tables for
    each output file.  */
@@ -173,25 +157,21 @@
   { "check-header", no_argument, NULL, CHAR_MAX + 4 },
   { "csharp", no_argument, NULL, CHAR_MAX + 10 },
   { "csharp-resources", no_argument, NULL, CHAR_MAX + 11 },
-  { "desktop", no_argument, NULL, CHAR_MAX + 15 },
   { "directory", required_argument, NULL, 'D' },
   { "endianness", required_argument, NULL, CHAR_MAX + 13 },
   { "help", no_argument, NULL, 'h' },
   { "java", no_argument, NULL, 'j' },
   { "java2", no_argument, NULL, CHAR_MAX + 5 },
-  { "keyword", required_argument, NULL, 'k' },
   { "locale", required_argument, NULL, 'l' },
   { "no-hash", no_argument, NULL, CHAR_MAX + 6 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
   { "qt", no_argument, NULL, CHAR_MAX + 9 },
   { "resource", required_argument, NULL, 'r' },
-  { "source", no_argument, NULL, CHAR_MAX + 14 },
   { "statistics", no_argument, &do_statistics, 1 },
   { "strict", no_argument, NULL, 'S' },
   { "stringtable-input", no_argument, NULL, CHAR_MAX + 8 },
   { "tcl", no_argument, NULL, CHAR_MAX + 7 },
-  { "template", required_argument, NULL, CHAR_MAX + 16 },
   { "use-fuzzy", no_argument, NULL, 'f' },
   { "use-untranslated", no_argument, NULL, CHAR_MAX + 12 },
   { "verbose", no_argument, NULL, 'v' },
@@ -211,11 +191,6 @@
 static bool is_nonobsolete (const message_ty *mp);
 static void read_catalog_file_msgfmt (char *filename,
                                       catalog_input_format_ty input_syntax);
-static string_list_ty *get_languages (const char *directory);
-static int msgfmt_desktop_bulk (const char *directory,
-                                const char *template_file_name,
-                                hash_table *keywords,
-                                const char *file_name);
 
 
 int
@@ -280,7 +255,6 @@
         java_class_directory = optarg;
         csharp_base_directory = optarg;
         tcl_base_directory = optarg;
-        desktop_base_directory = optarg;
         break;
       case 'D':
         dir_list_append (optarg);
@@ -294,25 +268,10 @@
       case 'j':
         java_mode = true;
         break;
-      case 'k':
-        if (optarg == NULL)
-          desktop_default_keywords = false;
-        else
-          {
-            if (desktop_keywords.table == NULL)
-              {
-                hash_init (&desktop_keywords, 100);
-                desktop_default_keywords = false;
-              }
-
-            desktop_add_keyword (&desktop_keywords, optarg, false);
-          }
-        break;
       case 'l':
         java_locale_name = optarg;
         csharp_locale_name = optarg;
         tcl_locale_name = optarg;
-        desktop_locale_name = optarg;
         break;
       case 'o':
         output_file_name = optarg;
@@ -394,15 +353,6 @@
           byteswap = endianness ^ ENDIANNESS;
         }
         break;
-      case CHAR_MAX + 14: /* --source */
-        java_output_source = true;
-        break;
-      case CHAR_MAX + 15: /* --desktop */
-        desktop_mode = true;
-        break;
-      case CHAR_MAX + 16: /* --template=TEMPLATE */
-        desktop_template_name = optarg;
-        break;
       default:
         usage (EXIT_FAILURE);
         break;
@@ -428,18 +378,11 @@
     usage (EXIT_SUCCESS);
 
   /* Test whether we have a .po file name as argument.  */
-  if (optind >= argc && !(desktop_mode && desktop_base_directory))
+  if (optind >= argc)
     {
       error (EXIT_SUCCESS, 0, _("no input file given"));
       usage (EXIT_FAILURE);
     }
-  if (optind < argc && desktop_mode && desktop_base_directory)
-    {
-      error (EXIT_SUCCESS, 0,
-             _("no input file should be given if %s and %s are specified"),
-             "--desktop", "-d");
-      usage (EXIT_FAILURE);
-    }
 
   /* Check for contradicting options.  */
   {
@@ -448,11 +391,9 @@
       | (csharp_mode ? 2 : 0)
       | (csharp_resources_mode ? 4 : 0)
       | (tcl_mode ? 8 : 0)
-      | (qt_mode ? 16 : 0)
-      | (desktop_mode ? 32 : 0);
+      | (qt_mode ? 16 : 0);
     static const char *mode_options[] =
-      { "--java", "--csharp", "--csharp-resources", "--tcl", "--qt",
-        "--desktop" };
+      { "--java", "--csharp", "--csharp-resources", "--tcl", "--qt" };
     /* More than one bit set?  */
     if (modes & (modes - 1))
       {
@@ -530,34 +471,6 @@
           usage (EXIT_FAILURE);
         }
     }
-  else if (desktop_mode)
-    {
-      if (desktop_template_name == NULL)
-        {
-          error (EXIT_SUCCESS, 0,
-                 _("%s requires a \"--template template\" specification"),
-                 "--desktop");
-          usage (EXIT_FAILURE);
-        }
-      if (output_file_name == NULL)
-        {
-          error (EXIT_SUCCESS, 0,
-                 _("%s requires a \"-o file\" specification"),
-                 "--desktop");
-          usage (EXIT_FAILURE);
-        }
-      if (desktop_base_directory != NULL && desktop_locale_name != NULL)
-        error (EXIT_FAILURE, 0,
-               _("%s and %s are mutually exclusive in %s"),
-               "-d", "-l", "--desktop");
-      if (desktop_base_directory == NULL && desktop_locale_name == NULL)
-        {
-          error (EXIT_SUCCESS, 0,
-                 _("%s requires a \"-l locale\" specification"),
-                 "--desktop");
-          usage (EXIT_FAILURE);
-        }
-    }
   else
     {
       if (java_resource_name != NULL)
@@ -580,26 +493,6 @@
         }
     }
 
-  if (desktop_mode && desktop_default_keywords)
-    {
-      if (desktop_keywords.table == NULL)
-        hash_init (&desktop_keywords, 100);
-      desktop_add_default_keywords (&desktop_keywords);
-    }
-
-  /* Bulk processing mode for .desktop files.
-     Process all .po files in desktop_base_directory.  */
-  if (desktop_mode && desktop_base_directory)
-    {
-      exit_status = msgfmt_desktop_bulk (desktop_base_directory,
-                                         desktop_template_name,
-                                         &desktop_keywords,
-                                         output_file_name);
-      if (desktop_keywords.table != NULL)
-        hash_destroy (&desktop_keywords);
-      exit (exit_status);
-    }
-
   /* The -o option determines the name of the domain and therefore
      the output file.  */
   if (output_file_name != NULL)
@@ -637,10 +530,6 @@
     for (domain = domain_list; domain != NULL; domain = domain->next)
       nerrors +=
         check_message_list (domain->mlp,
-                            /* Untranslated and fuzzy messages have already
-                               been dealt with during parsing, see below in
-                               msgfmt_frob_new_message.  */
-                            0, 0,
                             1, check_format_strings, check_header,
                             check_compatibility,
                             check_accelerators, accelerator_char);
@@ -663,8 +552,7 @@
         {
           if (msgdomain_write_java (domain->mlp, canon_encoding,
                                     java_resource_name, java_locale_name,
-                                    java_class_directory, assume_java2,
-                                    java_output_source))
+                                    java_class_directory, assume_java2))
             exit_status = EXIT_FAILURE;
         }
       else if (csharp_mode)
@@ -693,18 +581,6 @@
                                   domain->domain_name, domain->file_name))
             exit_status = EXIT_FAILURE;
         }
-      else if (desktop_mode)
-        {
-          if (msgdomain_write_desktop (domain->mlp, canon_encoding,
-                                       desktop_locale_name,
-                                       desktop_template_name,
-                                       &desktop_keywords,
-                                       domain->file_name))
-            exit_status = EXIT_FAILURE;
-
-          if (desktop_keywords.table != NULL)
-            hash_destroy (&desktop_keywords);
-        }
       else
         {
           if (msgdomain_write_mo (domain->mlp, domain->domain_name,
@@ -767,7 +643,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -808,8 +684,6 @@
       --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"));
       printf (_("\
       --qt                    Qt mode: generate a Qt .qm file\n"));
-      printf (_("\
-      --desktop               Desktop Entry mode: generate a .desktop file\n"));
       printf ("\n");
       printf (_("\
 Output file location:\n"));
@@ -827,8 +701,6 @@
       printf (_("\
   -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"));
       printf (_("\
-      --source                produce a .java file, instead of a .class file\n"));
-      printf (_("\
   -d DIRECTORY                base directory of classes directory hierarchy\n"));
       printf (_("\
 The class name is determined by appending the locale name to the resource name,\n\
@@ -859,23 +731,6 @@
 specified directory.\n"));
       printf ("\n");
       printf (_("\
-Desktop Entry mode options:\n"));
-      printf (_("\
-  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"));
-      printf (_("\
-  -o, --output-file=FILE      write output to specified file\n"));
-      printf (_("\
-  --template=TEMPLATE         a .desktop file used as a template\n"));
-      printf (_("\
-  -d DIRECTORY                base directory of .po files\n"));
-      printf (_("\
-  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n\
-  -k, --keyword               do not to use default keywords\n"));
-      printf (_("\
-The -l, -o, and --template options are mandatory.  If -D is specified, input\n\
-files are read from the directory instead of the command line arguments.\n"));
-      printf ("\n");
-      printf (_("\
 Input file syntax:\n"));
       printf (_("\
   -P, --properties-input      input files are in Java .properties syntax\n"));
@@ -908,9 +763,6 @@
       printf (_("\
   -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"), DEFAULT_OUTPUT_ALIGNMENT);
       printf (_("\
-      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n\
-                                (big or little, default depends on platform)\n"));
-      printf (_("\
       --no-hash               binary file will not include the hash table\n"));
       printf ("\n");
       printf (_("\
@@ -987,7 +839,8 @@
    default_catalog_reader_ty.  Its particularities are:
    - The header entry check is performed on-the-fly.
    - Comments are not stored, they are discarded right away.
-     (This is achieved by setting handle_comments = false.)
+     (This is achieved by setting handle_comments = false and
+     handle_filepos_comments = false.)
    - The multi-domain handling is adapted to our domain_list.
  */
 
@@ -1060,10 +913,10 @@
 static void
 msgfmt_set_domain (default_catalog_reader_ty *this, char *name)
 {
-  /* If no output file was given, we change it with each 'domain'
+  /* If no output file was given, we change it with each `domain'
      directive.  */
   if (!java_mode && !csharp_mode && !csharp_resources_mode && !tcl_mode
-      && !qt_mode && !desktop_mode && output_file_name == NULL)
+      && !qt_mode && output_file_name == NULL)
     {
       size_t correct;
 
@@ -1092,7 +945,7 @@
     {
       if (check_domain)
         po_gram_error_at_line (&gram_pos,
-                               _("'domain %s' directive ignored"), name);
+                               _("`domain %s' directive ignored"), name);
 
       /* NAME was allocated in po-gram-gen.y but is not used anywhere.  */
       free (name);
@@ -1152,8 +1005,8 @@
               error_with_progname = false;
               error_at_line (0, 0, mp->pos.file_name, mp->pos.line_number,
                              (mp->msgstr[0] == '\0'
-                              ? _("empty 'msgstr' entry ignored")
-                              : _("fuzzy 'msgstr' entry ignored")));
+                              ? _("empty `msgstr' entry ignored")
+                              : _("fuzzy `msgstr' entry ignored")));
               error_with_progname = true;
             }
 
@@ -1186,7 +1039,7 @@
 }
 
 
-/* Test for '#, fuzzy' comments and warn.  */
+/* Test for `#, fuzzy' comments and warn.  */
 static void
 msgfmt_comment_special (abstract_catalog_reader_ty *that, const char *s)
 {
@@ -1247,6 +1100,7 @@
 
   pop = default_catalog_reader_alloc (&msgfmt_methods);
   pop->handle_comments = false;
+  pop->handle_filepos_comments = false;
   pop->allow_domain_directives = true;
   pop->allow_duplicates = false;
   pop->allow_duplicates_if_same_msgstr = false;
@@ -1267,210 +1121,3 @@
   if (fp != stdin)
     fclose (fp);
 }
-
-static void
-add_languages (string_list_ty *languages, string_list_ty *desired_languages,
-               const char *line, size_t length)
-{
-  char *start;
-
-  /* Split the line by whitespace and build the languages list.  */
-  for (start = (char *) line; start - line < length; )
-    {
-      char *p;
-
-      /* Skip whitespace before the string.  */
-      while (*start == ' ' || *start == '\t')
-        start++;
-
-      p = start;
-      while (*p != '\0' && *p != ' ' && *p != '\t')
-        p++;
-
-      *p = '\0';
-      if (desired_languages == NULL
-          || string_list_member (desired_languages, start))
-        string_list_append_unique (languages, start);
-      start = p + 1;
-    }
-}
-
-/* Compute the languages list by reading the "LINGUAS" envvar or the
-   LINGUAS file under DIRECTORY.  */
-static string_list_ty *
-get_languages (const char *directory)
-{
-  char *envval;
-  string_list_ty *languages;
-  string_list_ty *desired_languages = NULL;
-  char *linguas_file_name;
-  struct stat statbuf;
-  FILE *fp;
-  size_t line_len = 0;
-  char *line_buf = NULL;
-
-  languages = string_list_alloc ();
-  envval = getenv ("LINGUAS");
-  if (envval)
-    {
-      desired_languages = string_list_alloc ();
-      add_languages (desired_languages, NULL, envval, strlen (envval));
-    }
-
-  linguas_file_name = xconcatenated_filename (directory, "LINGUAS", NULL);
-  if (stat (linguas_file_name, &statbuf) < 0)
-    {
-      error (EXIT_SUCCESS, 0, _("%s does not exist"), linguas_file_name);
-      string_list_free (languages);
-      if (desired_languages != NULL)
-        string_list_free (desired_languages);
-      free (linguas_file_name);
-      return NULL;
-    }
-
-  fp = fopen (linguas_file_name, "r");
-  if (fp == NULL)
-    {
-      error (EXIT_SUCCESS, 0, _("%s exists but cannot read"),
-             linguas_file_name);
-      string_list_free (languages);
-      if (desired_languages != NULL)
-        string_list_free (desired_languages);
-      free (linguas_file_name);
-      return NULL;
-    }
-
-  while (!feof (fp))
-    {
-      /* Read next line from file.  */
-      int len = getline (&line_buf, &line_len, fp);
-
-      /* In case of an error leave loop.  */
-      if (len < 0)
-        break;
-
-      /* Remove trailing '\n' and trailing whitespace.  */
-      if (len > 0 && line_buf[len - 1] == '\n')
-        line_buf[--len] = '\0';
-      while (len > 0
-             && (line_buf[len - 1] == ' '
-                 || line_buf[len - 1] == '\t'
-                 || line_buf[len - 1] == '\r'))
-        line_buf[--len] = '\0';
-
-      /* Test if we have to ignore the line.  */
-      if (*line_buf == '\0' || *line_buf == '#')
-        continue;
-
-      add_languages (languages, desired_languages, line_buf, len);
-    }
-
-  free (line_buf);
-  fclose (fp);
-  if (desired_languages != NULL)
-    string_list_free (desired_languages);
-  free (linguas_file_name);
-
-  return languages;
-}
-
-/* Helper function to support 'bulk' operation mode of --desktop.
-   This reads all .po files in DIRECTORY and merges them into a
-   .desktop file FILE_NAME.  Currently it does not support some
-   options available in 'iterative' mode, such as --statistics.  */
-static int
-msgfmt_desktop_bulk (const char *directory,
-                     const char *template_file_name,
-                     hash_table *keywords,
-                     const char *file_name)
-{
-  string_list_ty *languages = NULL;
-  message_list_ty **messages = NULL;
-  void *saved_dir_list;
-  int retval = 0;
-  size_t i;
-
-  languages = get_languages (directory);
-  if (!languages)
-    {
-      retval = EXIT_FAILURE;
-      goto out;
-    }
-
-  /* Reset the directory search list so only .po files under DIRECTORY
-     will be read.  */
-  saved_dir_list = dir_list_save_reset ();
-  dir_list_append (directory);
-
-  /* Read all .po files.  */
-  messages = XNMALLOC (languages->nitems, message_list_ty *);
-  for (i = 0; i < languages->nitems; i++)
-    {
-      const char *language = languages->item[i];
-      char *input_file_name;
-      int nerrors;
-
-      current_domain = new_domain (file_name, file_name);
-
-      input_file_name = xconcatenated_filename ("", language, ".po");
-      read_catalog_file_msgfmt (input_file_name, &input_format_po);
-      free (input_file_name);
-
-      /* The domain directive is not supported by --desktop mode.
-         Thus, domain_list should always contain a single domain.  */
-      assert (current_domain == domain_list && domain_list->next == NULL);
-      messages[i] = current_domain->mlp;
-      free (current_domain);
-      current_domain = domain_list = NULL;
-
-      /* Remove obsolete messages.  They were only needed for duplicate
-         checking.  */
-      message_list_remove_if_not (messages[i], is_nonobsolete);
-
-      /* Perform all kinds of checks: plural expressions, format
-         strings, ...  */
-      nerrors =
-        check_message_list (messages[i],
-                            /* Untranslated and fuzzy messages have already
-                               been dealt with during parsing, see below in
-                               msgfmt_frob_new_message.  */
-                            0, 0,
-                            1, check_format_strings, check_header,
-                            check_compatibility,
-                            check_accelerators, accelerator_char);
-
-      /* Exit with status 1 on any error.  */
-      if (nerrors > 0)
-        {
-          error (0, 0,
-                 ngettext ("found %d fatal error", "found %d fatal errors",
-                           nerrors),
-                 nerrors);
-          retval = EXIT_FAILURE;
-          goto out;
-        }
-
-      /* Convert the messages to Unicode.  */
-      iconv_message_list (messages[i], NULL, po_charset_utf8, NULL);
-    }
-
-  /* Write the messages into .desktop file.  */
-  if (msgdomain_write_desktop_bulk (languages,
-                                    messages,
-                                    template_file_name,
-                                    keywords,
-                                    file_name))
-    {
-      retval = EXIT_FAILURE;
-      goto out;
-    }
-
- out:
-  dir_list_restore (saved_dir_list);
-  for (i = 0; i < languages->nitems; i++)
-    message_list_free (messages[i], 0);
-  free (messages);
-  string_list_free (languages);
-
-  return retval;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/msggrep.c gettext-0.18.1.1/gettext-tools/src/msggrep.c
--- gettext-0.19.3/gettext-tools/src/msggrep.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msggrep.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Extract some translations of a translation catalog.
-   Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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
@@ -91,7 +91,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 9 },
   { "comment", no_argument, NULL, 'C' },
   { "directory", required_argument, NULL, 'D' },
@@ -111,7 +111,7 @@
   { "msgid", no_argument, NULL, 'K' },
   { "msgstr", no_argument, NULL, 'T' },
   { "no-escape", no_argument, NULL, CHAR_MAX + 3 },
-  { "no-location", no_argument, NULL, CHAR_MAX + 11 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 6 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
@@ -196,7 +196,7 @@
       gt->case_insensitive = false;
     }
 
-  while ((opt = getopt_long (argc, argv, "CD:e:Ef:FhiJKM:n:N:o:pPTvVw:X",
+  while ((opt = getopt_long (argc, argv, "CD:e:Ef:FhiJKM:N:o:pPTvVw:X",
                              long_options, NULL))
          != EOF)
     switch (opt)
@@ -310,11 +310,6 @@
         string_list_append (domain_names, optarg);
         break;
 
-      case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
-        break;
-
       case 'N':
         string_list_append (location_files, optarg);
         break;
@@ -402,10 +397,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 11: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         break;
@@ -442,6 +433,10 @@
     }
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -509,7 +504,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -608,7 +603,7 @@
       printf (_("\
       --no-location           suppress '#: filename:line' lines\n"));
       printf (_("\
-  -n, --add-location          preserve '#: filename:line' lines (default)\n"));
+      --add-location          preserve '#: filename:line' lines (default)\n"));
       printf (_("\
       --strict                strict Uniforum output style\n"));
       printf (_("\
diff -Nru gettext-0.19.3/gettext-tools/src/msginit.c gettext-0.18.1.1/gettext-tools/src/msginit.c
--- gettext-0.19.3/gettext-tools/src/msginit.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msginit.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Initializes a new PO file.
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2010 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
@@ -26,7 +26,6 @@
 #include <getopt.h>
 #include <limits.h>
 #include <locale.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -80,7 +79,7 @@
 #include "xvasprintf.h"
 #include "msgl-english.h"
 #include "plural-count.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "xsetenv.h"
 #include "str-list.h"
@@ -356,7 +355,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -1060,7 +1059,7 @@
   if (userpasswd != NULL)
     return userpasswd;
   if (errno != 0)
-    error (EXIT_FAILURE, errno, "getpwuid(%ju)", (uintmax_t) getuid ());
+    error (EXIT_FAILURE, errno, "getpwuid(\"%d\")", getuid ());
 #endif
 
   return NULL;
@@ -1081,7 +1080,7 @@
       const char *fullname_end;
       char *result;
 
-      /* Return the pw_gecos field, up to the first comma (if any).  */
+      /* Return the pw_gecos field, upto the first comma (if any).  */
       fullname = pwd->pw_gecos;
       fullname_end = strchr (fullname, ',');
       if (fullname_end == NULL)
diff -Nru gettext-0.19.3/gettext-tools/src/msgl-cat.c gettext-0.18.1.1/gettext-tools/src/msgl-cat.c
--- gettext-0.19.3/gettext-tools/src/msgl-cat.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgl-cat.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2003, 2005-2008, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 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
@@ -201,11 +201,11 @@
                     {
                       if (k == 0)
                         error (EXIT_FAILURE, 0, _("\
-input file '%s' doesn't contain a header entry with a charset specification"),
+input file `%s' doesn't contain a header entry with a charset specification"),
                                files[n]);
                       else
                         error (EXIT_FAILURE, 0, _("\
-domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"),
+domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"),
                                mdlp->item[k]->domain, files[n]);
                     }
                 }
diff -Nru gettext-0.19.3/gettext-tools/src/msgl-check.c gettext-0.18.1.1/gettext-tools/src/msgl-check.c
--- gettext-0.19.3/gettext-tools/src/msgl-check.c	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgl-check.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Checking of messages in PO files.
-   Copyright (C) 1995-1998, 2000-2008, 2010-2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2008 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
@@ -280,10 +280,7 @@
    If no errors, returns in *DISTRIBUTION information about the plural_eval
    values distribution.  */
 static int
-check_plural (message_list_ty *mlp,
-              int ignore_untranslated_messages,
-              int ignore_fuzzy_messages,
-              struct plural_distribution *distributionp)
+check_plural (message_list_ty *mlp, struct plural_distribution *distributionp)
 {
   int seen_errors = 0;
   const message_ty *has_plural;
@@ -309,10 +306,7 @@
     {
       message_ty *mp = mlp->item[j];
 
-      if (!mp->obsolete
-          && !(ignore_untranslated_messages && mp->msgstr[0] == '\0')
-          && !(ignore_fuzzy_messages && (mp->is_fuzzy && !is_header (mp)))
-          && mp->msgid_plural != NULL)
+      if (!mp->obsolete && mp->msgid_plural != NULL)
         {
           const char *p;
           const char *p_end;
@@ -544,10 +538,7 @@
 static lex_pos_ty curr_msgid_pos;
 static void
 formatstring_error_logger (const char *format, ...)
-#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || __GNUC__ > 2)
-     __attribute__ ((__format__ (__printf__, 1, 2)))
-#endif
-;
+     __attribute__ ((__format__ (__printf__, 1, 2)));
 static void
 formatstring_error_logger (const char *format, ...)
 {
@@ -609,7 +600,7 @@
               po_xerror (PO_SEVERITY_ERROR,
                          mp, msgid_pos->file_name, msgid_pos->line_number,
                          (size_t)(-1), false, _("\
-'msgid' and 'msgid_plural' entries do not both begin with '\\n'"));
+`msgid' and `msgid_plural' entries do not both begin with '\\n'"));
               seen_errors++;
             }
           for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++)
@@ -617,7 +608,7 @@
               {
                 char *msg =
                   xasprintf (_("\
-'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"), j);
+`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"), j);
                 po_xerror (PO_SEVERITY_ERROR,
                            mp, msgid_pos->file_name, msgid_pos->line_number,
                            (size_t)(-1), false, msg);
@@ -632,7 +623,7 @@
               po_xerror (PO_SEVERITY_ERROR,
                          mp, msgid_pos->file_name, msgid_pos->line_number,
                          (size_t)(-1), false, _("\
-'msgid' and 'msgstr' entries do not both begin with '\\n'"));
+`msgid' and `msgstr' entries do not both begin with '\\n'"));
               seen_errors++;
             }
         }
@@ -650,7 +641,7 @@
               po_xerror (PO_SEVERITY_ERROR,
                          mp, msgid_pos->file_name, msgid_pos->line_number,
                          (size_t)(-1), false, _("\
-'msgid' and 'msgid_plural' entries do not both end with '\\n'"));
+`msgid' and `msgid_plural' entries do not both end with '\\n'"));
               seen_errors++;
             }
           for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++)
@@ -658,7 +649,7 @@
               {
                 char *msg =
                   xasprintf (_("\
-'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"), j);
+`msgid' and `msgstr[%u]' entries do not both end with '\\n'"), j);
                 po_xerror (PO_SEVERITY_ERROR,
                            mp, msgid_pos->file_name, msgid_pos->line_number,
                            (size_t)(-1), false, msg);
@@ -673,7 +664,7 @@
               po_xerror (PO_SEVERITY_ERROR,
                          mp, msgid_pos->file_name, msgid_pos->line_number,
                          (size_t)(-1), false, _("\
-'msgid' and 'msgstr' entries do not both end with '\\n'"));
+`msgid' and `msgstr' entries do not both end with '\\n'"));
               seen_errors++;
             }
         }
@@ -732,7 +723,6 @@
                          mp, msgid_pos->file_name, msgid_pos->line_number,
                          (size_t)(-1), false, msg);
               free (msg);
-              seen_errors++;
             }
           else if (count > 1)
             {
@@ -743,7 +733,6 @@
                          mp, msgid_pos->file_name, msgid_pos->line_number,
                          (size_t)(-1), false, msg);
               free (msg);
-              seen_errors++;
             }
         }
     }
@@ -753,7 +742,7 @@
 
 
 /* Perform miscellaneous checks on a header entry.  */
-static int
+static void
 check_header_entry (const message_ty *mp, const char *msgstr_string)
 {
   static const char *required_fields[] =
@@ -766,77 +755,79 @@
   };
   static const char *default_values[] =
   {
-    "PACKAGE VERSION", "YEAR-MO-DA HO:MI+ZONE", "FULL NAME <EMAIL@ADDRESS>", "LANGUAGE <LL@li.org>", NULL,
+    "PACKAGE VERSION", "YEAR-MO-DA", "FULL NAME", "LANGUAGE", NULL,
     "text/plain; charset=CHARSET", "ENCODING",
     ""
   };
   const size_t nfields = SIZEOF (required_fields);
   const size_t nrequiredfields = nfields - 1;
-  int seen_errors = 0;
+  int initial = -1;
   int cnt;
 
   for (cnt = 0; cnt < nfields; ++cnt)
     {
-      /* 0.19 change: It would better report error if a required
-         header field is missing.  However, traditionally we didn't
-         treat it as error.  Let's wait for one or two cycles until we
-         can assume the required header fields are always
-         available in practical PO files.  */
-#if 0
       int severity =
         (cnt < nrequiredfields ? PO_SEVERITY_ERROR : PO_SEVERITY_WARNING);
-#else
-      int severity =
-        PO_SEVERITY_WARNING;
-#endif
-      const char *field = required_fields[cnt];
-      size_t len = strlen (field);
-      const char *line;
-
-      for (line = msgstr_string; *line != '\0'; )
-        {
-          if (strncmp (line, field, len) == 0 && line[len] == ':')
-            {
-              const char *p = line + len + 1;
-
-              /* Test whether the field's value, starting at p, is the default
-                 value.  */
-              if (*p == ' ')
-                p++;
-              if (default_values[cnt] != NULL
-                  && strncmp (p, default_values[cnt],
-                              strlen (default_values[cnt])) == 0)
-                {
-                  p += strlen (default_values[cnt]);
-                  if (*p == '\0' || *p == '\n')
-                    {
-                      char *msg =
-                        xasprintf (_("header field '%s' still has the initial default value\n"),
-                                   field);
-                      po_xerror (severity, mp, NULL, 0, 0, true, msg);
-                      free (msg);
-                      if (severity == PO_SEVERITY_ERROR)
-                        seen_errors++;
-                    }
-                }
-              break;
-            }
-          line = strchrnul (line, '\n');
-          if (*line == '\n')
-            line++;
+      const char *endp = c_strstr (msgstr_string, required_fields[cnt]);
+
+      if (endp == NULL)
+        {
+          char *msg =
+            xasprintf (_("header field `%s' missing in header\n"),
+                       required_fields[cnt]);
+          po_xerror (severity, mp, NULL, 0, 0, true, msg);
+          free (msg);
         }
-      if (*line == '\0')
+      else if (endp != msgstr_string && endp[-1] != '\n')
         {
           char *msg =
-            xasprintf (_("header field '%s' missing in header\n"),
-                       field);
+            xasprintf (_("\
+header field `%s' should start at beginning of line\n"),
+                       required_fields[cnt]);
           po_xerror (severity, mp, NULL, 0, 0, true, msg);
           free (msg);
-          if (severity == PO_SEVERITY_ERROR)
-            seen_errors++;
+        }
+      else
+        {
+          const char *p = endp + strlen (required_fields[cnt]);
+          /* Test whether the field's value, starting at p, is the default
+             value.  */
+          if (*p == ':')
+            p++;
+          if (*p == ' ')
+            p++;
+          if (default_values[cnt] != NULL
+              && strncmp (p, default_values[cnt],
+                          strlen (default_values[cnt])) == 0)
+            {
+              p += strlen (default_values[cnt]);
+              if (*p == '\0' || *p == '\n')
+                {
+                  if (initial != -1)
+                    {
+                      po_xerror (severity,
+                                 mp, NULL, 0, 0, true, _("\
+some header fields still have the initial default value\n"));
+                      initial = -1;
+                      break;
+                    }
+                  else
+                    initial = cnt;
+                }
+            }
         }
     }
-  return seen_errors;
+
+  if (initial != -1)
+    {
+      int severity =
+        (initial < nrequiredfields ? PO_SEVERITY_ERROR : PO_SEVERITY_WARNING);
+      char *msg =
+        xasprintf (_("header field `%s' still has the initial default value\n"),
+                   required_fields[initial]);
+      po_xerror (severity, mp, NULL, 0, 0, true, msg);
+      free (msg);
+    }
 }
 
 
@@ -852,21 +843,18 @@
                int check_compatibility,
                int check_accelerators, char accelerator_char)
 {
-  int seen_errors = 0;
-
   if (check_header && is_header (mp))
-    seen_errors += check_header_entry (mp, mp->msgstr);
+    check_header_entry (mp, mp->msgstr);
 
-  seen_errors += check_pair (mp,
-                             mp->msgid, msgid_pos, mp->msgid_plural,
-                             mp->msgstr, mp->msgstr_len,
-                             mp->is_format,
-                             check_newlines,
-                             check_format_strings,
-                             distribution,
-                             check_compatibility,
-                             check_accelerators, accelerator_char);
-  return seen_errors;
+  return check_pair (mp,
+                     mp->msgid, msgid_pos, mp->msgid_plural,
+                     mp->msgstr, mp->msgstr_len,
+                     mp->is_format,
+                     check_newlines,
+                     check_format_strings,
+                     distribution,
+                     check_compatibility,
+                     check_accelerators, accelerator_char);
 }
 
 
@@ -874,8 +862,6 @@
    Return the number of errors that were seen.  */
 int
 check_message_list (message_list_ty *mlp,
-                    int ignore_untranslated_messages,
-                    int ignore_fuzzy_messages,
                     int check_newlines,
                     int check_format_strings,
                     int check_header,
@@ -892,16 +878,13 @@
   distribution.histogram = NULL;
 
   if (check_header)
-    seen_errors += check_plural (mlp, ignore_untranslated_messages,
-                                 ignore_fuzzy_messages, &distribution);
+    seen_errors += check_plural (mlp, &distribution);
 
   for (j = 0; j < mlp->nitems; j++)
     {
       message_ty *mp = mlp->item[j];
 
-      if (!mp->obsolete
-          && !(ignore_untranslated_messages && mp->msgstr[0] == '\0')
-          && !(ignore_fuzzy_messages && (mp->is_fuzzy && !is_header (mp))))
+      if (!mp->obsolete)
         seen_errors += check_message (mp, &mp->pos,
                                       check_newlines,
                                       check_format_strings,
diff -Nru gettext-0.19.3/gettext-tools/src/msgl-check.h gettext-0.18.1.1/gettext-tools/src/msgl-check.h
--- gettext-0.19.3/gettext-tools/src/msgl-check.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgl-check.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Checking of messages in PO files.
-   Copyright (C) 2005, 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
@@ -52,8 +52,6 @@
 /* Perform all checks on a message list.
    Return the number of errors that were seen.  */
 extern int check_message_list (message_list_ty *mlp,
-                               int ignore_untranslated_messages,
-                               int ignore_fuzzy_messages,
                                int check_newlines,
                                int check_format_strings,
                                int check_header,
diff -Nru gettext-0.19.3/gettext-tools/src/msgl-fsearch.c gettext-0.18.1.1/gettext-tools/src/msgl-fsearch.c
--- gettext-0.19.3/gettext-tools/src/msgl-fsearch.c	2013-03-05 09:57:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgl-fsearch.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Fast fuzzy searching among messages.
-   Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -182,12 +182,7 @@
    limit the search to lengths l' in the range
      l / (2 / FUZZY_THRESHOLD - 1) <= l' <= l * (2 / FUZZY_THRESHOLD - 1)
    Thus we need the list of the short strings up to length:  */
-#if !defined __SUNPRO_C
-# define SHORT_MSG_MAX (int) (SHORT_STRING_MAX_BYTES * (2 / FUZZY_THRESHOLD - 1))
-#else
-/* Sun C on Solaris 8 cannot compute this constant expression.  */
-# define SHORT_MSG_MAX 28
-#endif
+#define SHORT_MSG_MAX (int) (SHORT_STRING_MAX_BYTES * (2 / FUZZY_THRESHOLD - 1))
 
 /* A fuzzy index contains a hash table mapping all n-grams to their
    occurrences list.  */
@@ -197,7 +192,7 @@
   character_iterator_t iterator;
   hash_table gram4;
   size_t firstfew;
-  message_list_ty **short_messages;
+  message_list_ty *short_messages[SHORT_MSG_MAX + 1];
 };
 
 /* Allocate a fuzzy index corresponding to a given list of messages.
@@ -304,7 +299,6 @@
     findex->firstfew = 10;
 
   /* Setup lists of short messages.  */
-  findex->short_messages = XNMALLOC (SHORT_MSG_MAX + 1, message_list_ty *);
   for (l = 0; l <= SHORT_MSG_MAX; l++)
     findex->short_messages[l] = message_list_alloc (false);
   for (j = 0; j < count; j++)
@@ -655,7 +649,6 @@
   /* Free the short lists.  */
   for (l = 0; l <= SHORT_MSG_MAX; l++)
     message_list_free (findex->short_messages[l], 1);
-  free (findex->short_messages);
 
   /* Free the index lists occurring as values in the hash tables.  */
   iter = NULL;
diff -Nru gettext-0.19.3/gettext-tools/src/msgmerge.c gettext-0.18.1.1/gettext-tools/src/msgmerge.c
--- gettext-0.19.3/gettext-tools/src/msgmerge.c	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgmerge.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software: you can redistribute it and/or modify
@@ -107,7 +107,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "backup", required_argument, NULL, CHAR_MAX + 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 9 },
   { "compendium", required_argument, NULL, 'C', },
@@ -120,7 +120,7 @@
   { "multi-domain", no_argument, NULL, 'm' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-fuzzy-matching", no_argument, NULL, 'N' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 11 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
   { "output-file", required_argument, NULL, 'o' },
   { "previous", no_argument, NULL, CHAR_MAX + 7 },
@@ -172,7 +172,6 @@
   bool do_help;
   bool do_version;
   char *output_file;
-  char *color;
   msgdomain_list_ty *def;
   msgdomain_list_ty *result;
   catalog_input_format_ty input_syntax = &input_format_po;
@@ -204,9 +203,8 @@
   do_help = false;
   do_version = false;
   output_file = NULL;
-  color = NULL;
 
-  while ((opt = getopt_long (argc, argv, "C:D:eEFhimn:No:pPqsUvVw:",
+  while ((opt = getopt_long (argc, argv, "C:D:eEFhimNo:pPqsUvVw:",
                              long_options, NULL))
          != EOF)
     switch (opt)
@@ -246,11 +244,6 @@
         multi_domain_mode = true;
         break;
 
-      case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
-        break;
-
       case 'N':
         use_fuzzy_matching = false;
         break;
@@ -332,17 +325,12 @@
       case CHAR_MAX + 9: /* --color */
         if (handle_color_option (optarg) || color_test_mode)
           usage (EXIT_FAILURE);
-        color = optarg;
         break;
 
       case CHAR_MAX + 10: /* --style */
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 11: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         break;
@@ -387,16 +375,6 @@
           error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
                  "--update", "--output-file");
         }
-      if (color != NULL)
-        {
-          error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
-                 "--update", "--color");
-        }
-      if (style_file_name != NULL)
-        {
-          error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
-                 "--update", "--style");
-        }
     }
   else
     {
@@ -414,6 +392,10 @@
         }
     }
 
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -491,7 +473,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -557,7 +539,7 @@
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n"));
       printf (_("\
-The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n\
+The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n\
 environment variable.\n\
 "));
       printf ("\n");
@@ -599,7 +581,7 @@
       printf (_("\
       --no-location           suppress '#: filename:line' lines\n"));
       printf (_("\
-  -n, --add-location          preserve '#: filename:line' lines (default)\n"));
+      --add-location          preserve '#: filename:line' lines (default)\n"));
       printf (_("\
       --strict                strict Uniforum output style\n"));
       printf (_("\
diff -Nru gettext-0.19.3/gettext-tools/src/msgunfmt.c gettext-0.18.1.1/gettext-tools/src/msgunfmt.c
--- gettext-0.19.3/gettext-tools/src/msgunfmt.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msgunfmt.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* msgunfmt - converts binary .mo files to Uniforum style .po files
-   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2007, 2009-2010 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
@@ -420,7 +420,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-tools/src/msguniq.c gettext-0.18.1.1/gettext-tools/src/msguniq.c
--- gettext-0.19.3/gettext-tools/src/msguniq.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/msguniq.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Remove, select or merge duplicate translations.
-   Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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
@@ -60,7 +60,7 @@
 /* Long options.  */
 static const struct option long_options[] =
 {
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 5 },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
@@ -68,7 +68,7 @@
   { "help", no_argument, NULL, 'h' },
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 7 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "output-file", required_argument, NULL, 'o' },
   { "properties-input", no_argument, NULL, 'P' },
@@ -175,8 +175,7 @@
         break;
 
       case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
+        line_comment = 1;
         break;
 
       case 'o':
@@ -247,10 +246,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 7: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         /* NOTREACHED */
@@ -287,6 +282,10 @@
     }
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -319,7 +318,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-tools/src/plural-table.c gettext-0.18.1.1/gettext-tools/src/plural-table.c
--- gettext-0.19.3/gettext-tools/src/plural-table.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/plural-table.c	2010-06-06 12:49:58.000000000 +0000
@@ -56,7 +56,6 @@
     { "lt", "Lithuanian",        "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "ru", "Russian",           "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "uk", "Ukrainian",         "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
-    { "be", "Belarusian",        "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "sr", "Serbian",           "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "hr", "Croatian",          "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "cs", "Czech",             "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" },
diff -Nru gettext-0.19.3/gettext-tools/src/po-charset.c gettext-0.18.1.1/gettext-tools/src/po-charset.c
--- gettext-0.19.3/gettext-tools/src/po-charset.c	2014-04-04 09:20:18.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-charset.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Charset handling while reading PO files.
-   Copyright (C) 2001-2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007 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
@@ -527,8 +527,7 @@
               /* Use iconv() to parse multibyte characters.  */
 #if HAVE_ICONV
               /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
               if (strcmp (po_lex_charset, "EUC-KR") == 0)
                 po_lex_iconv = (iconv_t)(-1);
               else
diff -Nru gettext-0.19.3/gettext-tools/src/po-error.h gettext-0.18.1.1/gettext-tools/src/po-error.h
--- gettext-0.19.3/gettext-tools/src/po-error.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-error.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2004, 2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
-/* The __-protected variants of 'format' and 'printf' attributes
+/* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format
diff -Nru gettext-0.19.3/gettext-tools/src/po-gram-gen2.h gettext-0.18.1.1/gettext-tools/src/po-gram-gen2.h
--- gettext-0.19.3/gettext-tools/src/po-gram-gen2.h	2014-10-16 06:02:57.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-gram-gen2.h	2010-03-28 18:41:53.000000000 +0000
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This 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,15 +32,6 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_PO_GRAM_GEN_H_INCLUDED
-# define YY_YY_PO_GRAM_GEN_H_INCLUDED
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern DLL_VARIABLE int po_gram_debug;
-#endif
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -80,10 +73,12 @@
 
 
 
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2058 of yacc.c  */
+
+/* Line 1676 of yacc.c  */
 #line 143 "po-gram-gen.y"
 
   struct { char *string; lex_pos_ty pos; bool obsolete; } string;
@@ -95,8 +90,9 @@
   struct { struct msgstr_def rhs; lex_pos_ty pos; bool obsolete; } rhs;
 
 
-/* Line 2058 of yacc.c  */
-#line 100 "po-gram-gen.h"
+
+/* Line 1676 of yacc.c  */
+#line 96 "po-gram-gen.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define po_gram_stype YYSTYPE /* obsolescent; will be withdrawn */
@@ -105,18 +101,4 @@
 
 extern DLL_VARIABLE YYSTYPE po_gram_lval;
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int po_gram_parse (void *YYPARSE_PARAM);
-#else
-int po_gram_parse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int po_gram_parse (void);
-#else
-int po_gram_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_YY_PO_GRAM_GEN_H_INCLUDED  */
diff -Nru gettext-0.19.3/gettext-tools/src/po-gram-gen.c gettext-0.18.1.1/gettext-tools/src/po-gram-gen.c
--- gettext-0.19.3/gettext-tools/src/po-gram-gen.c	2014-10-16 06:02:57.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-gram-gen.c	2010-06-06 18:37:31.000000000 +0000
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Bison implementation for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -58,11 +60,14 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 
 
 /* Copy the first part of user declarations.  */
-/* Line 371 of yacc.c  */
+
+/* Line 189 of yacc.c  */
 #line 19 "po-gram-gen.y"
 
 #ifdef HAVE_CONFIG_H
@@ -170,16 +175,14 @@
     free ((value).ctxt);
 
 
-/* Line 371 of yacc.c  */
-#line 175 "po-gram-gen.c"
 
-# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif
+/* Line 189 of yacc.c  */
+#line 181 "po-gram-gen.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -189,18 +192,12 @@
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "y.tab.h".  */
-#ifndef YY_YY_PO_GRAM_GEN_H_INCLUDED
-# define YY_YY_PO_GRAM_GEN_H_INCLUDED
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -241,10 +238,12 @@
 
 
 
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 387 of yacc.c  */
+
+/* Line 214 of yacc.c  */
 #line 143 "po-gram-gen.y"
 
   struct { char *string; lex_pos_ty pos; bool obsolete; } string;
@@ -256,7 +255,8 @@
   struct { struct msgstr_def rhs; lex_pos_ty pos; bool obsolete; } rhs;
 
 
-/* Line 387 of yacc.c  */
+
+/* Line 214 of yacc.c  */
 #line 261 "po-gram-gen.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -264,28 +264,12 @@
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
-extern YYSTYPE yylval;
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-#endif /* !YY_YY_PO_GRAM_GEN_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 390 of yacc.c  */
-#line 289 "po-gram-gen.c"
+
+/* Line 264 of yacc.c  */
+#line 273 "po-gram-gen.c"
 
 #ifdef short
 # undef short
@@ -335,27 +319,27 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(Msgid) Msgid
+#  define YY_(msgid) msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+# define YYUSE(e) ((void) (e))
 #else
-# define YYUSE(E) /* empty */
+# define YYUSE(e) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(N) (N)
+# define YYID(n) (n)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
@@ -388,12 +372,11 @@
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -416,24 +399,24 @@
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -462,7 +445,23 @@
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -482,26 +481,6 @@
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
@@ -586,13 +565,13 @@
 static const yytype_uint16 yyrline[] =
 {
        0,   168,   168,   170,   171,   172,   173,   178,   186,   194,
-     215,   239,   248,   257,   268,   277,   291,   300,   314,   320,
-     331,   337,   349,   360,   371,   375,   390,   413,   421,   433,
-     441
+     215,   236,   245,   254,   265,   274,   288,   297,   311,   317,
+     328,   334,   346,   357,   368,   372,   387,   410,   417,   428,
+     435
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -603,7 +582,7 @@
   "NUMBER", "STRING", "$accept", "po_file", "comment", "domain", "message",
   "message_intro", "prev", "msg_intro", "prev_msg_intro",
   "msgid_pluralform", "prev_msgid_pluralform", "pluralform_list",
-  "pluralform", "string_list", "prev_string_list", YY_NULL
+  "pluralform", "string_list", "prev_string_list", 0
 };
 #endif
 
@@ -635,8 +614,8 @@
        2
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -675,7 +654,8 @@
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -686,12 +666,6 @@
       40
 };
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-26)))
-
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-
 static const yytype_int8 yycheck[] =
 {
       13,    16,     0,     1,    11,     3,     4,    32,     6,     7,
@@ -724,50 +698,78 @@
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
 
-/* Error token number */
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* This macro is provided for backward compatibility. */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (YYLEX_PARAM)
 #else
@@ -817,8 +819,6 @@
     YYSTYPE const * const yyvaluep;
 #endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
@@ -830,7 +830,7 @@
   switch (yytype)
     {
       default:
-        break;
+	break;
     }
 }
 
@@ -956,6 +956,7 @@
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1058,145 +1059,115 @@
 }
 # endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
+  int yyn = yypact[yystate];
 
-  switch (yycount)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
 
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
 
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
 #endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1225,35 +1196,40 @@
     {
 
       default:
-        break;
+	break;
     }
 }
 
-
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
 
 /* The lookahead symbol.  */
 int yychar;
 
-
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
+YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1277,6 +1253,8 @@
 #endif
 #endif
 {
+
+
     int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
@@ -1285,7 +1263,7 @@
        `yyss': related to states.
        `yyvs': related to semantic values.
 
-       Refer to the stacks through separate pointers, to allow yyoverflow
+       Refer to the stacks thru separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1303,7 +1281,7 @@
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1321,8 +1299,9 @@
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1331,6 +1310,14 @@
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1422,7 +1409,7 @@
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1453,8 +1440,8 @@
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1471,9 +1458,7 @@
   yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1510,7 +1495,8 @@
   switch (yyn)
     {
         case 7:
-/* Line 1792 of yacc.c  */
+
+/* Line 1455 of yacc.c  */
 #line 179 "po-gram-gen.y"
     {
                   po_callback_comment_dispatcher ((yyvsp[(1) - (1)].string).string);
@@ -1518,7 +1504,8 @@
     break;
 
   case 8:
-/* Line 1792 of yacc.c  */
+
+/* Line 1455 of yacc.c  */
 #line 187 "po-gram-gen.y"
     {
                    po_callback_domain ((yyvsp[(2) - (2)].string).string);
@@ -1526,7 +1513,8 @@
     break;
 
   case 9:
-/* Line 1792 of yacc.c  */
+
+/* Line 1455 of yacc.c  */
 #line 195 "po-gram-gen.y"
     {
                   char *string2 = string_list_concat_destroy (&(yyvsp[(2) - (4)].stringlist).stringlist);
@@ -1551,7 +1539,8 @@
     break;
 
   case 10:
-/* Line 1792 of yacc.c  */
+
+/* Line 1455 of yacc.c  */
 #line 216 "po-gram-gen.y"
     {
                   char *string2 = string_list_concat_destroy (&(yyvsp[(2) - (4)].stringlist).stringlist);
@@ -1560,14 +1549,11 @@
                   check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(3) - (4)].string));
                   check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(4) - (4)].rhs));
                   if (!(yyvsp[(1) - (4)].message_intro).obsolete || pass_obsolete_entries)
-                    {
-                      do_callback_message ((yyvsp[(1) - (4)].message_intro).ctxt, string2, &(yyvsp[(1) - (4)].message_intro).pos, (yyvsp[(3) - (4)].string).string,
-                                           (yyvsp[(4) - (4)].rhs).rhs.msgstr, (yyvsp[(4) - (4)].rhs).rhs.msgstr_len, &(yyvsp[(4) - (4)].rhs).pos,
-                                           (yyvsp[(1) - (4)].message_intro).prev_ctxt,
-                                           (yyvsp[(1) - (4)].message_intro).prev_id, (yyvsp[(1) - (4)].message_intro).prev_id_plural,
-                                           (yyvsp[(1) - (4)].message_intro).obsolete);
-                      free ((yyvsp[(3) - (4)].string).string);
-                    }
+                    do_callback_message ((yyvsp[(1) - (4)].message_intro).ctxt, string2, &(yyvsp[(1) - (4)].message_intro).pos, (yyvsp[(3) - (4)].string).string,
+                                         (yyvsp[(4) - (4)].rhs).rhs.msgstr, (yyvsp[(4) - (4)].rhs).rhs.msgstr_len, &(yyvsp[(4) - (4)].rhs).pos,
+                                         (yyvsp[(1) - (4)].message_intro).prev_ctxt,
+                                         (yyvsp[(1) - (4)].message_intro).prev_id, (yyvsp[(1) - (4)].message_intro).prev_id_plural,
+                                         (yyvsp[(1) - (4)].message_intro).obsolete);
                   else
                     {
                       free_message_intro ((yyvsp[(1) - (4)].message_intro));
@@ -1579,12 +1565,13 @@
     break;
 
   case 11:
-/* Line 1792 of yacc.c  */
-#line 240 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 237 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(2) - (3)].stringlist));
                   check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(3) - (3)].string));
-                  po_gram_error_at_line (&(yyvsp[(1) - (3)].message_intro).pos, _("missing 'msgstr[]' section"));
+                  po_gram_error_at_line (&(yyvsp[(1) - (3)].message_intro).pos, _("missing `msgstr[]' section"));
                   free_message_intro ((yyvsp[(1) - (3)].message_intro));
                   string_list_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
                   free ((yyvsp[(3) - (3)].string).string);
@@ -1592,12 +1579,13 @@
     break;
 
   case 12:
-/* Line 1792 of yacc.c  */
-#line 249 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 246 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(2) - (3)].stringlist));
                   check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(3) - (3)].rhs));
-                  po_gram_error_at_line (&(yyvsp[(1) - (3)].message_intro).pos, _("missing 'msgid_plural' section"));
+                  po_gram_error_at_line (&(yyvsp[(1) - (3)].message_intro).pos, _("missing `msgid_plural' section"));
                   free_message_intro ((yyvsp[(1) - (3)].message_intro));
                   string_list_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
                   free ((yyvsp[(3) - (3)].rhs).rhs.msgstr);
@@ -1605,19 +1593,21 @@
     break;
 
   case 13:
-/* Line 1792 of yacc.c  */
-#line 258 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 255 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].message_intro), (yyvsp[(2) - (2)].stringlist));
-                  po_gram_error_at_line (&(yyvsp[(1) - (2)].message_intro).pos, _("missing 'msgstr' section"));
+                  po_gram_error_at_line (&(yyvsp[(1) - (2)].message_intro).pos, _("missing `msgstr' section"));
                   free_message_intro ((yyvsp[(1) - (2)].message_intro));
                   string_list_destroy (&(yyvsp[(2) - (2)].stringlist).stringlist);
                 }
     break;
 
   case 14:
-/* Line 1792 of yacc.c  */
-#line 269 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 266 "po-gram-gen.y"
     {
                   (yyval.message_intro).prev_ctxt = NULL;
                   (yyval.message_intro).prev_id = NULL;
@@ -1629,8 +1619,9 @@
     break;
 
   case 15:
-/* Line 1792 of yacc.c  */
-#line 278 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 275 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].prev), (yyvsp[(2) - (2)].string));
                   (yyval.message_intro).prev_ctxt = (yyvsp[(1) - (2)].prev).ctxt;
@@ -1643,8 +1634,9 @@
     break;
 
   case 16:
-/* Line 1792 of yacc.c  */
-#line 292 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 289 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].stringlist));
                   (yyval.prev).ctxt = (yyvsp[(1) - (2)].string).string;
@@ -1656,8 +1648,9 @@
     break;
 
   case 17:
-/* Line 1792 of yacc.c  */
-#line 301 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 298 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (3)].string), (yyvsp[(2) - (3)].stringlist));
                   check_obsolete ((yyvsp[(1) - (3)].string), (yyvsp[(3) - (3)].string));
@@ -1670,8 +1663,9 @@
     break;
 
   case 18:
-/* Line 1792 of yacc.c  */
-#line 315 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 312 "po-gram-gen.y"
     {
                   (yyval.string).string = NULL;
                   (yyval.string).pos = (yyvsp[(1) - (1)].pos).pos;
@@ -1680,8 +1674,9 @@
     break;
 
   case 19:
-/* Line 1792 of yacc.c  */
-#line 321 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 318 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(2) - (3)].stringlist));
                   check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(3) - (3)].pos));
@@ -1692,8 +1687,9 @@
     break;
 
   case 20:
-/* Line 1792 of yacc.c  */
-#line 332 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 329 "po-gram-gen.y"
     {
                   (yyval.string).string = NULL;
                   (yyval.string).pos = (yyvsp[(1) - (1)].pos).pos;
@@ -1702,8 +1698,9 @@
     break;
 
   case 21:
-/* Line 1792 of yacc.c  */
-#line 338 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 335 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(2) - (3)].stringlist));
                   check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(3) - (3)].pos));
@@ -1714,8 +1711,9 @@
     break;
 
   case 22:
-/* Line 1792 of yacc.c  */
-#line 350 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 347 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].pos), (yyvsp[(2) - (2)].stringlist));
                   plural_counter = 0;
@@ -1726,8 +1724,9 @@
     break;
 
   case 23:
-/* Line 1792 of yacc.c  */
-#line 361 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 358 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].pos), (yyvsp[(2) - (2)].stringlist));
                   (yyval.string).string = string_list_concat_destroy (&(yyvsp[(2) - (2)].stringlist).stringlist);
@@ -1737,16 +1736,18 @@
     break;
 
   case 24:
-/* Line 1792 of yacc.c  */
-#line 372 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 369 "po-gram-gen.y"
     {
                   (yyval.rhs) = (yyvsp[(1) - (1)].rhs);
                 }
     break;
 
   case 25:
-/* Line 1792 of yacc.c  */
-#line 376 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 373 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].rhs), (yyvsp[(2) - (2)].rhs));
                   (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[(1) - (2)].rhs).rhs.msgstr_len + (yyvsp[(2) - (2)].rhs).rhs.msgstr_len, char);
@@ -1761,8 +1762,9 @@
     break;
 
   case 26:
-/* Line 1792 of yacc.c  */
-#line 391 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 388 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (5)].pos), (yyvsp[(2) - (5)].pos));
                   check_obsolete ((yyvsp[(1) - (5)].pos), (yyvsp[(3) - (5)].number));
@@ -1784,71 +1786,61 @@
     break;
 
   case 27:
-/* Line 1792 of yacc.c  */
-#line 414 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 411 "po-gram-gen.y"
     {
                   string_list_init (&(yyval.stringlist).stringlist);
                   string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(1) - (1)].string).string);
-                  free ((yyvsp[(1) - (1)].string).string);
                   (yyval.stringlist).pos = (yyvsp[(1) - (1)].string).pos;
                   (yyval.stringlist).obsolete = (yyvsp[(1) - (1)].string).obsolete;
                 }
     break;
 
   case 28:
-/* Line 1792 of yacc.c  */
-#line 422 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 418 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].stringlist), (yyvsp[(2) - (2)].string));
                   (yyval.stringlist).stringlist = (yyvsp[(1) - (2)].stringlist).stringlist;
                   string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(2) - (2)].string).string);
-                  free ((yyvsp[(2) - (2)].string).string);
                   (yyval.stringlist).pos = (yyvsp[(1) - (2)].stringlist).pos;
                   (yyval.stringlist).obsolete = (yyvsp[(1) - (2)].stringlist).obsolete;
                 }
     break;
 
   case 29:
-/* Line 1792 of yacc.c  */
-#line 434 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 429 "po-gram-gen.y"
     {
                   string_list_init (&(yyval.stringlist).stringlist);
                   string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(1) - (1)].string).string);
-                  free ((yyvsp[(1) - (1)].string).string);
                   (yyval.stringlist).pos = (yyvsp[(1) - (1)].string).pos;
                   (yyval.stringlist).obsolete = (yyvsp[(1) - (1)].string).obsolete;
                 }
     break;
 
   case 30:
-/* Line 1792 of yacc.c  */
-#line 442 "po-gram-gen.y"
+
+/* Line 1455 of yacc.c  */
+#line 436 "po-gram-gen.y"
     {
                   check_obsolete ((yyvsp[(1) - (2)].stringlist), (yyvsp[(2) - (2)].string));
                   (yyval.stringlist).stringlist = (yyvsp[(1) - (2)].stringlist).stringlist;
                   string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(2) - (2)].string).string);
-                  free ((yyvsp[(2) - (2)].string).string);
                   (yyval.stringlist).pos = (yyvsp[(1) - (2)].stringlist).pos;
                   (yyval.stringlist).obsolete = (yyvsp[(1) - (2)].stringlist).obsolete;
                 }
     break;
 
 
-/* Line 1792 of yacc.c  */
-#line 1839 "po-gram-gen.c"
+
+/* Line 1455 of yacc.c  */
+#line 1842 "po-gram-gen.c"
       default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -1876,10 +1868,6 @@
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -1887,36 +1875,37 @@
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1975,7 +1964,7 @@
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -1998,9 +1987,7 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -2024,7 +2011,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -2036,13 +2023,8 @@
 
 yyreturn:
   if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -2066,3 +2048,4 @@
 }
 
 
+
diff -Nru gettext-0.19.3/gettext-tools/src/po-gram-gen.h gettext-0.18.1.1/gettext-tools/src/po-gram-gen.h
--- gettext-0.19.3/gettext-tools/src/po-gram-gen.h	2014-10-16 06:02:57.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-gram-gen.h	2010-03-28 18:41:53.000000000 +0000
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This 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,15 +32,6 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_PO_GRAM_GEN_H_INCLUDED
-# define YY_YY_PO_GRAM_GEN_H_INCLUDED
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -80,10 +73,12 @@
 
 
 
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2058 of yacc.c  */
+
+/* Line 1676 of yacc.c  */
 #line 143 "po-gram-gen.y"
 
   struct { char *string; lex_pos_ty pos; bool obsolete; } string;
@@ -95,8 +90,9 @@
   struct { struct msgstr_def rhs; lex_pos_ty pos; bool obsolete; } rhs;
 
 
-/* Line 2058 of yacc.c  */
-#line 100 "po-gram-gen.h"
+
+/* Line 1676 of yacc.c  */
+#line 96 "po-gram-gen.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -105,18 +101,4 @@
 
 extern YYSTYPE yylval;
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_YY_PO_GRAM_GEN_H_INCLUDED  */
diff -Nru gettext-0.19.3/gettext-tools/src/po-gram-gen.y gettext-0.18.1.1/gettext-tools/src/po-gram-gen.y
--- gettext-0.19.3/gettext-tools/src/po-gram-gen.y	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-gram-gen.y	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
 
@@ -220,14 +220,11 @@
                   check_obsolete ($1, $3);
                   check_obsolete ($1, $4);
                   if (!$1.obsolete || pass_obsolete_entries)
-                    {
-                      do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
-                                           $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
-                                           $1.prev_ctxt,
-                                           $1.prev_id, $1.prev_id_plural,
-                                           $1.obsolete);
-                      free ($3.string);
-                    }
+                    do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
+                                         $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
+                                         $1.prev_ctxt,
+                                         $1.prev_id, $1.prev_id_plural,
+                                         $1.obsolete);
                   else
                     {
                       free_message_intro ($1);
@@ -240,7 +237,7 @@
                 {
                   check_obsolete ($1, $2);
                   check_obsolete ($1, $3);
-                  po_gram_error_at_line (&$1.pos, _("missing 'msgstr[]' section"));
+                  po_gram_error_at_line (&$1.pos, _("missing `msgstr[]' section"));
                   free_message_intro ($1);
                   string_list_destroy (&$2.stringlist);
                   free ($3.string);
@@ -249,7 +246,7 @@
                 {
                   check_obsolete ($1, $2);
                   check_obsolete ($1, $3);
-                  po_gram_error_at_line (&$1.pos, _("missing 'msgid_plural' section"));
+                  po_gram_error_at_line (&$1.pos, _("missing `msgid_plural' section"));
                   free_message_intro ($1);
                   string_list_destroy (&$2.stringlist);
                   free ($3.rhs.msgstr);
@@ -257,7 +254,7 @@
         | message_intro string_list
                 {
                   check_obsolete ($1, $2);
-                  po_gram_error_at_line (&$1.pos, _("missing 'msgstr' section"));
+                  po_gram_error_at_line (&$1.pos, _("missing `msgstr' section"));
                   free_message_intro ($1);
                   string_list_destroy (&$2.stringlist);
                 }
@@ -414,7 +411,6 @@
                 {
                   string_list_init (&$$.stringlist);
                   string_list_append (&$$.stringlist, $1.string);
-                  free ($1.string);
                   $$.pos = $1.pos;
                   $$.obsolete = $1.obsolete;
                 }
@@ -423,7 +419,6 @@
                   check_obsolete ($1, $2);
                   $$.stringlist = $1.stringlist;
                   string_list_append (&$$.stringlist, $2.string);
-                  free ($2.string);
                   $$.pos = $1.pos;
                   $$.obsolete = $1.obsolete;
                 }
@@ -434,7 +429,6 @@
                 {
                   string_list_init (&$$.stringlist);
                   string_list_append (&$$.stringlist, $1.string);
-                  free ($1.string);
                   $$.pos = $1.pos;
                   $$.obsolete = $1.obsolete;
                 }
@@ -443,7 +437,6 @@
                   check_obsolete ($1, $2);
                   $$.stringlist = $1.stringlist;
                   string_list_append (&$$.stringlist, $2.string);
-                  free ($2.string);
                   $$.pos = $1.pos;
                   $$.obsolete = $1.obsolete;
                 }
diff -Nru gettext-0.19.3/gettext-tools/src/po-lex.c gettext-0.18.1.1/gettext-tools/src/po-lex.c
--- gettext-0.19.3/gettext-tools/src/po-lex.c	2013-09-02 05:49:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-lex.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1999, 2000-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2009 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>.
@@ -499,7 +499,7 @@
               if (outbytes == 0)
                 abort ();
               /* Convert it from UTF-8 to UCS-4.  */
-              if (u8_mbtoucr (&mbc->uc, scratchbuf, outbytes) < (int) outbytes)
+              if (u8_mbtouc (&mbc->uc, scratchbuf, outbytes) < outbytes)
                 {
                   /* scratchbuf contains an out-of-range Unicode character
                      (> 0x10ffff).  */
diff -Nru gettext-0.19.3/gettext-tools/src/po-lex.h gettext-0.18.1.1/gettext-tools/src/po-lex.h
--- gettext-0.19.3/gettext-tools/src/po-lex.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-lex.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -32,7 +32,7 @@
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
-/* The __-protected variants of 'format' and 'printf' attributes
+/* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format
diff -Nru gettext-0.19.3/gettext-tools/src/po-xerror.c gettext-0.18.1.1/gettext-tools/src/po-xerror.c
--- gettext-0.19.3/gettext-tools/src/po-xerror.c	2013-03-05 06:17:05.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/po-xerror.c	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,6 @@
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xerror.h"
-#include "error.h"
 #include "xvasprintf.h"
 #include "po-error.h"
 #include "gettext.h"
diff -Nru gettext-0.19.3/gettext-tools/src/project-id gettext-0.18.1.1/gettext-tools/src/project-id
--- gettext-0.19.3/gettext-tools/src/project-id	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/project-id	2010-06-06 12:49:58.000000000 +0000
@@ -54,7 +54,7 @@
       exit 0
     fi
   fi
-  dir=`basename "\`pwd\`"`
+  dir=`basename \`pwd\``
   case "$dir" in
     i18n)
       # This directory name, used in GNU make, is not the top level directory.
diff -Nru gettext-0.19.3/gettext-tools/src/read-catalog-abstract.c gettext-0.18.1.1/gettext-tools/src/read-catalog-abstract.c
--- gettext-0.19.3/gettext-tools/src/read-catalog-abstract.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-catalog-abstract.c	2010-06-06 12:49:58.000000000 +0000
@@ -31,7 +31,6 @@
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "po-xerror.h"
-#include "error.h"
 #include "gettext.h"
 
 /* Local variables.  */
@@ -171,8 +170,6 @@
                       const char *real_filename, const char *logical_filename,
                       catalog_input_format_ty input_syntax)
 {
-  error_message_count = 0;
-
   /* Parse the stream's content.  */
   parse_start (pop);
   input_syntax->parse (pop, fp, real_filename, logical_filename);
@@ -185,6 +182,7 @@
                                     "found %d fatal errors",
                                     error_message_count),
                           error_message_count));
+  error_message_count = 0;
 }
 
 
diff -Nru gettext-0.19.3/gettext-tools/src/read-catalog-abstract.h gettext-0.18.1.1/gettext-tools/src/read-catalog-abstract.h
--- gettext-0.19.3/gettext-tools/src/read-catalog-abstract.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-catalog-abstract.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Reading PO files, abstract class.
-   Copyright (C) 1995-1996, 1998, 2000-2003, 2005-2006, 2008-2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998, 2000-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -112,7 +112,7 @@
 
 /* This next structure defines the base class passed to the methods.
    Derived methods will often need to cast their first argument before
-   using it (this corresponds to the implicit 'this' argument in C++).
+   using it (this corresponds to the implicit ``this'' argument in C++).
 
    When declaring derived classes, use the ABSTRACT_CATALOG_READER_TY define
    at the start of the structure, to declare inherited instance variables,
diff -Nru gettext-0.19.3/gettext-tools/src/read-catalog.c gettext-0.18.1.1/gettext-tools/src/read-catalog.c
--- gettext-0.19.3/gettext-tools/src/read-catalog.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-catalog.c	2010-06-06 12:49:58.000000000 +0000
@@ -112,7 +112,6 @@
 default_destructor (abstract_catalog_reader_ty *that)
 {
   default_catalog_reader_ty *this = (default_catalog_reader_ty *) that;
-  size_t j;
 
   /* Do not free this->mdlp and this->mlp.  */
   if (this->handle_comments)
@@ -122,19 +121,24 @@
       if (this->comment_dot != NULL)
         string_list_free (this->comment_dot);
     }
+  if (this->handle_filepos_comments)
+    {
+      size_t j;
 
-  for (j = 0; j < this->filepos_count; ++j)
-    free (this->filepos[j].file_name);
-  if (this->filepos != NULL)
-    free (this->filepos);
+      for (j = 0; j < this->filepos_count; ++j)
+        free (this->filepos[j].file_name);
+      if (this->filepos != NULL)
+        free (this->filepos);
+    }
 }
 
 
 void
 default_parse_brief (abstract_catalog_reader_ty *that)
 {
-  /* We need to parse comments, because even if this->handle_comments
-     is false, we need to know which messages are fuzzy.  */
+  /* We need to parse comments, because even if this->handle_comments and
+     this->handle_filepos_comments are false, we need to know which messages
+     are fuzzy.  */
   po_lex_pass_comments (true);
 }
 
@@ -160,12 +164,15 @@
         for (j = 0; j < this->comment_dot->nitems; ++j)
           message_comment_dot_append (mp, this->comment_dot->item[j]);
     }
-  for (j = 0; j < this->filepos_count; ++j)
+  if (this->handle_filepos_comments)
     {
-      lex_pos_ty *pp;
+      for (j = 0; j < this->filepos_count; ++j)
+        {
+          lex_pos_ty *pp;
 
-      pp = &this->filepos[j];
-      message_comment_filepos (mp, pp->file_name, pp->line_number);
+          pp = &this->filepos[j];
+          message_comment_filepos (mp, pp->file_name, pp->line_number);
+        }
     }
   mp->is_fuzzy = this->is_fuzzy;
   for (i = 0; i < NFORMATS; i++)
@@ -193,12 +200,15 @@
           this->comment_dot = NULL;
         }
     }
-  for (j = 0; j < this->filepos_count; ++j)
-    free (this->filepos[j].file_name);
-  if (this->filepos != NULL)
-    free (this->filepos);
-  this->filepos_count = 0;
-  this->filepos = NULL;
+  if (this->handle_filepos_comments)
+    {
+      for (j = 0; j < this->filepos_count; ++j)
+        free (this->filepos[j].file_name);
+      if (this->filepos != NULL)
+        free (this->filepos);
+      this->filepos_count = 0;
+      this->filepos = NULL;
+    }
   this->is_fuzzy = false;
   for (i = 0; i < NFORMATS; i++)
     this->is_format[i] = undecided;
@@ -281,14 +291,18 @@
                          const char *name, size_t line)
 {
   default_catalog_reader_ty *this = (default_catalog_reader_ty *) that;
-  size_t nbytes;
-  lex_pos_ty *pp;
 
-  nbytes = (this->filepos_count + 1) * sizeof (this->filepos[0]);
-  this->filepos = xrealloc (this->filepos, nbytes);
-  pp = &this->filepos[this->filepos_count++];
-  pp->file_name = xstrdup (name);
-  pp->line_number = line;
+  if (this->handle_filepos_comments)
+    {
+      size_t nbytes;
+      lex_pos_ty *pp;
+
+      nbytes = (this->filepos_count + 1) * sizeof (this->filepos[0]);
+      this->filepos = xrealloc (this->filepos, nbytes);
+      pp = &this->filepos[this->filepos_count++];
+      pp->file_name = xstrdup (name);
+      pp->line_number = line;
+    }
 }
 
 
@@ -444,6 +458,10 @@
 /* Exported functions.  */
 
 
+/* If nonzero, remember comments for file name and line number for each
+   msgid, if present in the reference input.  Defaults to true.  */
+int line_comment = 1;
+
 /* If false, duplicate msgids in the same domain and file generate an error.
    If true, such msgids are allowed; the caller should treat them
    appropriately.  Defaults to false.  */
@@ -460,6 +478,7 @@
 
   pop = default_catalog_reader_alloc (&default_methods);
   pop->handle_comments = true;
+  pop->handle_filepos_comments = (line_comment != 0);
   pop->allow_domain_directives = true;
   pop->allow_duplicates = allow_duplicates;
   pop->allow_duplicates_if_same_msgstr = false;
diff -Nru gettext-0.19.3/gettext-tools/src/read-catalog.h gettext-0.18.1.1/gettext-tools/src/read-catalog.h
--- gettext-0.19.3/gettext-tools/src/read-catalog.h	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-catalog.h	2010-06-06 12:49:58.000000000 +0000
@@ -77,6 +77,10 @@
   /* If true, pay attention to comments and filepos comments.  */       \
   bool handle_comments;                                                 \
                                                                         \
+  /* If true, remember comments for file name and line number for each  \
+     msgid, if present in the reference input.  */                      \
+  bool handle_filepos_comments;                                         \
+                                                                        \
   /* If false, domain directives lead to an error messsage.  */         \
   bool allow_domain_directives;                                         \
                                                                         \
@@ -163,6 +167,10 @@
        default_catalog_reader_alloc (default_catalog_reader_class_ty *method_table);
 
 
+/* If nonzero, remember comments for file name and line number for each
+   msgid, if present in the reference input.  Defaults to true.  */
+extern DLL_VARIABLE int line_comment;
+
 /* If false, duplicate msgids in the same domain and file generate an error.
    If true, such msgids are allowed; the caller should treat them
    appropriately.  Defaults to false.  */
diff -Nru gettext-0.19.3/gettext-tools/src/read-csharp.c gettext-0.18.1.1/gettext-tools/src/read-csharp.c
--- gettext-0.19.3/gettext-tools/src/read-csharp.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-csharp.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Reading C# satellite assemblies.
-   Copyright (C) 2003-2004, 2006-2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "csharpexec.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "read-catalog.h"
 #include "read-po.h"
diff -Nru gettext-0.19.3/gettext-tools/src/read-desktop.c gettext-0.18.1.1/gettext-tools/src/read-desktop.c
--- gettext-0.19.3/gettext-tools/src/read-desktop.c	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-desktop.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,528 +0,0 @@
-/* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014 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
-   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 "read-desktop.h"
-
-#include "xalloc.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "error.h"
-#include "error-progname.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
-#include "c-ctype.h"
-#include "po-lex.h"
-#include "po-xerror.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-/* The syntax of a Desktop Entry file is defined at
-   http://standards.freedesktop.org/desktop-entry-spec/latest/index.html.  */
-
-desktop_reader_ty *
-desktop_reader_alloc (desktop_reader_class_ty *method_table)
-{
-  desktop_reader_ty *reader;
-
-  reader = (desktop_reader_ty *) xmalloc (method_table->size);
-  reader->methods = method_table;
-  if (method_table->constructor)
-    method_table->constructor (reader);
-  return reader;
-}
-
-void
-desktop_reader_free (desktop_reader_ty *reader)
-{
-  if (reader->methods->destructor)
-    reader->methods->destructor (reader);
-  free (reader);
-}
-
-void
-desktop_reader_handle_group (desktop_reader_ty *reader, const char *group)
-{
-  if (reader->methods->handle_group)
-    reader->methods->handle_group (reader, group);
-}
-
-void
-desktop_reader_handle_pair (desktop_reader_ty *reader,
-                            lex_pos_ty *key_pos,
-                            const char *key,
-                            const char *locale,
-                            const char *value)
-{
-  if (reader->methods->handle_pair)
-    reader->methods->handle_pair (reader, key_pos, key, locale, value);
-}
-
-void
-desktop_reader_handle_comment (desktop_reader_ty *reader, const char *s)
-{
-  if (reader->methods->handle_comment)
-    reader->methods->handle_comment (reader, s);
-}
-
-void
-desktop_reader_handle_text (desktop_reader_ty *reader, const char *s)
-{
-  if (reader->methods->handle_text)
-    reader->methods->handle_text (reader, s);
-}
-
-/* Real filename, used in error messages about the input file.  */
-static const char *real_file_name;
-
-/* File name and line number.  */
-extern lex_pos_ty gram_pos;
-
-/* The input file stream.  */
-static FILE *fp;
-
-
-static int
-phase1_getc ()
-{
-  int c;
-
-  c = getc (fp);
-
-  if (c == EOF)
-    {
-      if (ferror (fp))
-        {
-          const char *errno_description = strerror (errno);
-          po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false,
-                     xasprintf ("%s: %s",
-                                xasprintf (_("error while reading \"%s\""),
-                                           real_file_name),
-                                errno_description));
-        }
-      return EOF;
-    }
-
-  return c;
-}
-
-static inline void
-phase1_ungetc (int c)
-{
-  if (c != EOF)
-    ungetc (c, fp);
-}
-
-
-static unsigned char phase2_pushback[2];
-static int phase2_pushback_length;
-
-static int
-phase2_getc ()
-{
-  int c;
-
-  if (phase2_pushback_length)
-    c = phase2_pushback[--phase2_pushback_length];
-  else
-    {
-      c = phase1_getc ();
-
-      if (c == '\r')
-        {
-          int c2 = phase1_getc ();
-          if (c2 == '\n')
-            c = c2;
-          else
-            phase1_ungetc (c2);
-        }
-    }
-
-  if (c == '\n')
-    gram_pos.line_number++;
-
-  return c;
-}
-
-static void
-phase2_ungetc (int c)
-{
-  if (c == '\n')
-    --gram_pos.line_number;
-  if (c != EOF)
-    phase2_pushback[phase2_pushback_length++] = c;
-}
-
-static char *
-read_until_newline (void)
-{
-  char *buffer = NULL;
-  size_t bufmax = 0;
-  size_t buflen;
-
-  buflen = 0;
-  for (;;)
-    {
-      int c;
-
-      c = phase2_getc ();
-
-      if (buflen >= bufmax)
-        {
-          bufmax += 100;
-          buffer = xrealloc (buffer, bufmax);
-        }
-
-      if (c == EOF || c == '\n')
-        break;
-
-      buffer[buflen++] = c;
-    }
-  buffer[buflen] = '\0';
-  return buffer;
-}
-
-static char *
-read_group_name (void)
-{
-  char *buffer = NULL;
-  size_t bufmax = 0;
-  size_t buflen;
-
-  buflen = 0;
-  for (;;)
-    {
-      int c;
-
-      c = phase2_getc ();
-
-      if (buflen >= bufmax)
-        {
-          bufmax += 100;
-          buffer = xrealloc (buffer, bufmax);
-        }
-
-      if (c == EOF || c == '\n' || c == ']')
-        break;
-
-      buffer[buflen++] = c;
-    }
-  buffer[buflen] = '\0';
-  return buffer;
-}
-
-static char *
-read_key_name (const char **locale)
-{
-  char *buffer = NULL;
-  size_t bufmax = 0;
-  size_t buflen;
-  const char *locale_start = NULL;
-
-  buflen = 0;
-  for (;;)
-    {
-      int c;
-
-      c = phase2_getc ();
-
-      if (buflen >= bufmax)
-        {
-          bufmax += 100;
-          buffer = xrealloc (buffer, bufmax);
-        }
-
-      if (c == EOF || c == '\n')
-        break;
-
-      if (!locale_start)
-        {
-          if (c == '[')
-            {
-              buffer[buflen++] = '\0';
-              locale_start = &buffer[buflen];
-              continue;
-            }
-          else if (!c_isalnum (c) && c != '-')
-            {
-              phase2_ungetc (c);
-              break;
-            }
-        }
-      else
-        {
-          if (c == ']')
-            {
-              buffer[buflen++] = '\0';
-              break;
-            }
-          else if (!c_isascii (c))
-            {
-              phase2_ungetc (c);
-              break;
-            }
-        }
-
-      buffer[buflen++] = c;
-    }
-  buffer[buflen] = '\0';
-
-  if (locale_start)
-    *locale = locale_start;
-
-  return buffer;
-}
-
-void
-desktop_parse (desktop_reader_ty *reader, FILE *file,
-               const char *real_filename, const char *logical_filename)
-{
-  fp = file;
-  real_file_name = real_filename;
-  gram_pos.file_name = xstrdup (logical_filename);
-  gram_pos.line_number = 1;
-
-  for (;;)
-    {
-      int c;
-
-      c = phase2_getc ();
-
-      if (c == EOF)
-        break;
-
-      if (c == '[')
-        {
-          /* A group header.  */
-          char *group_name;
-
-          group_name = read_group_name ();
-
-          do
-            c = phase2_getc ();
-          while (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f');
-
-          if (c == EOF)
-            break;
-
-          phase2_ungetc (c);
-
-          desktop_reader_handle_group (reader, group_name);
-          free (group_name);
-        }
-      else if (c == '#')
-        {
-          /* A comment line.  */
-          char *comment;
-
-          comment = read_until_newline ();
-          desktop_reader_handle_comment (reader, comment);
-          free (comment);
-        }
-      else if (c_isalnum (c) || c == '-')
-        {
-          /* A key/value pair.  */
-          char *key_name;
-          const char *locale;
-
-          phase2_ungetc (c);
-
-          locale = NULL;
-          key_name = read_key_name (&locale);
-          do
-            c = phase2_getc ();
-          while (c == ' ' || c == '\t' || c == '\r' || c == '\f');
-
-          if (c == EOF)
-            break;
-
-          if (c != '=')
-            {
-              po_xerror (PO_SEVERITY_FATAL_ERROR, NULL,
-                         real_filename, gram_pos.line_number, 0, false,
-                         xasprintf (_("missing '=' after \"%s\""), key_name));
-            }
-          else
-            {
-              char *value;
-
-              do
-                c = phase2_getc ();
-              while (c == ' ' || c == '\t' || c == '\r' || c == '\f');
-
-              if (c == EOF)
-                break;
-
-              phase2_ungetc (c);
-
-              value = read_until_newline ();
-              desktop_reader_handle_pair (reader, &gram_pos,
-                                          key_name, locale, value);
-              free (value);
-            }
-          free (key_name);
-        }
-      else
-        {
-          char *text;
-
-          phase2_ungetc (c);
-
-          text = read_until_newline ();
-          desktop_reader_handle_text (reader, text);
-          free (text);
-        }
-    }
-
-  fp = NULL;
-  real_file_name = NULL;
-  gram_pos.line_number = 0;
-}
-
-char *
-desktop_escape_string (const char *s, bool is_list)
-{
-  char *buffer, *p;
-
-  p = buffer = XNMALLOC (strlen (s) * 2 + 1, char);
-
-  /* The first character must not be a whitespace.  */
-  if (*s == ' ')
-    {
-      p = stpcpy (p, "\\s");
-      s++;
-    }
-  else if (*s == '\t')
-    {
-      p = stpcpy (p, "\\t");
-      s++;
-    }
-
-  for (;; s++)
-    {
-      if (*s == '\0')
-        {
-          *p = '\0';
-          break;
-        }
-
-      switch (*s)
-        {
-        case '\n':
-          p = stpcpy (p, "\\n");
-          break;
-        case '\r':
-          p = stpcpy (p, "\\r");
-          break;
-        case '\\':
-          if (is_list && *(s + 1) == ';')
-            {
-              p = stpcpy (p, "\\;");
-              s++;
-            }
-          else
-            p = stpcpy (p, "\\\\");
-          break;
-        default:
-          *p++ = *s;
-          break;
-        }
-    }
-
-  return buffer;
-}
-
-char *
-desktop_unescape_string (const char *s, bool is_list)
-{
-  char *buffer, *p;
-
-  p = buffer = XNMALLOC (strlen (s) + 1, char);
-  for (;; s++)
-    {
-      if (*s == '\0')
-        {
-          *p = '\0';
-          break;
-        }
-
-      if (*s == '\\')
-        {
-          s++;
-
-          if (*s == '\0')
-            {
-              *p = '\0';
-              break;
-            }
-
-          switch (*s)
-            {
-            case 's':
-              *p++ = ' ';
-              break;
-            case 'n':
-              *p++ = '\n';
-              break;
-            case 't':
-              *p++ = '\t';
-              break;
-            case 'r':
-              *p++ = '\r';
-              break;
-            case ';':
-              p = stpcpy (p, "\\;");
-              break;
-            default:
-              *p++ = *s;
-              break;
-            }
-        }
-      else
-        *p++ = *s;
-    }
-  return buffer;
-}
-
-void
-desktop_add_keyword (hash_table *keywords, const char *name, bool is_list)
-{
-  hash_insert_entry (keywords, name, strlen (name), (void *) is_list);
-}
-
-void
-desktop_add_default_keywords (hash_table *keywords)
-{
-  /* When adding new keywords here, also update the documentation in
-     xgettext.texi!  */
-  desktop_add_keyword (keywords, "Name", false);
-  desktop_add_keyword (keywords, "GenericName", false);
-  desktop_add_keyword (keywords, "Comment", false);
-  desktop_add_keyword (keywords, "Icon", false);
-  desktop_add_keyword (keywords, "Keywords", true);
-}
diff -Nru gettext-0.19.3/gettext-tools/src/read-desktop.h gettext-0.18.1.1/gettext-tools/src/read-desktop.h
--- gettext-0.19.3/gettext-tools/src/read-desktop.h	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-desktop.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014 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
-   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 _READ_DESKTOP_H
-#define _READ_DESKTOP_H
-
-#include <sys/types.h>
-#include <stdio.h>
-#include "hash.h"
-#include "po-lex.h"
-#include "str-list.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Forward declaration.  */
-struct desktop_reader_ty;
-
-
-/* This first structure, playing the role of the "Class" in OO sense,
-   contains pointers to functions.  Each function is a method for the
-   class (base or derived).  Use a NULL pointer where no action is
-   required.  */
-
-typedef struct desktop_reader_class_ty desktop_reader_class_ty;
-struct desktop_reader_class_ty
-{
-  /* how many bytes to malloc for an instance of this class */
-  size_t size;
-
-  /* what to do immediately after the instance is malloc()ed */
-  void (*constructor) (struct desktop_reader_ty *pop);
-
-  /* what to do immediately before the instance is free()ed */
-  void (*destructor) (struct desktop_reader_ty *pop);
-
-  /* what to do with a group header */
-  void (*handle_group) (struct desktop_reader_ty *pop,
-                        const char *group);
-
-  /* what to do with a key/value pair */
-  void (*handle_pair) (struct desktop_reader_ty *pop,
-                       lex_pos_ty *key_pos,
-                       const char *key,
-                       const char *locale,
-                       const char *value);
-
-  /* what to do with a comment */
-  void (*handle_comment) (struct desktop_reader_ty *pop, const char *s);
-
-  /* what to do with other lines */
-  void (*handle_text) (struct desktop_reader_ty *pop, const char *s);
-};
-
-/* This next structure defines the base class passed to the methods.
-   Derived methods will often need to cast their first argument before
-   using it (this corresponds to the implicit 'this' argument in C++).
-
-   When declaring derived classes, use the DESKTOP_READER_TY define
-   at the start of the structure, to declare inherited instance variables,
-   etc.  */
-
-#define DESKTOP_READER_TY              \
-  desktop_reader_class_ty *methods;
-
-typedef struct desktop_reader_ty desktop_reader_ty;
-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);
-
-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,
-                                 const char *key,
-                                 const char *locale,
-                                 const char *value);
-
-void desktop_reader_handle_comment (desktop_reader_ty *reader,
-                                    const char *s);
-
-void desktop_reader_handle_text (desktop_reader_ty *reader,
-                                 const char *s);
-
-
-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);
-
-void desktop_add_keyword (hash_table *keywords, const char *name, bool is_list);
-void desktop_add_default_keywords (hash_table *keywords);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _READ_DESKTOP_H */
diff -Nru gettext-0.19.3/gettext-tools/src/read-java.c gettext-0.18.1.1/gettext-tools/src/read-java.c
--- gettext-0.19.3/gettext-tools/src/read-java.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-java.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Reading Java ResourceBundles.
-   Copyright (C) 2001-2003, 2006-2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2008 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
@@ -30,7 +30,7 @@
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "javaexec.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "read-catalog.h"
 #include "read-po.h"
diff -Nru gettext-0.19.3/gettext-tools/src/read-resources.c gettext-0.18.1.1/gettext-tools/src/read-resources.c
--- gettext-0.19.3/gettext-tools/src/read-resources.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-resources.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Reading C# .resources files.
-   Copyright (C) 2003, 2006-2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "csharpexec.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "read-catalog.h"
 #include "read-po.h"
diff -Nru gettext-0.19.3/gettext-tools/src/read-tcl.c gettext-0.18.1.1/gettext-tools/src/read-tcl.c
--- gettext-0.19.3/gettext-tools/src/read-tcl.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/read-tcl.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Reading tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005-2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include "relocatable.h"
 #include "concat-filename.h"
 #include "sh-quote.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "read-catalog.h"
 #include "read-po.h"
diff -Nru gettext-0.19.3/gettext-tools/src/recode-sr-latin.c gettext-0.18.1.1/gettext-tools/src/recode-sr-latin.c
--- gettext-0.19.3/gettext-tools/src/recode-sr-latin.c	2013-04-22 08:02:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/recode-sr-latin.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Recode Serbian text from Cyrillic to Latin script.
-   Copyright (C) 2006-2007, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -140,7 +140,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -275,8 +275,7 @@
     {
 #if HAVE_ICONV
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (strcmp (locale_code, "EUC-KR") != 0)
 # endif
         {
diff -Nru gettext-0.19.3/gettext-tools/src/urlget.c gettext-0.18.1.1/gettext-tools/src/urlget.c
--- gettext-0.19.3/gettext-tools/src/urlget.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/urlget.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Get the contents of an URL.
-   Copyright (C) 2001-2003, 2005-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010 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
@@ -169,7 +169,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-tools/src/user-email.sh.in gettext-0.18.1.1/gettext-tools/src/user-email.sh.in
--- gettext-0.19.3/gettext-tools/src/user-email.sh.in	2013-05-20 02:09:59.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/user-email.sh.in	2010-06-06 12:49:58.000000000 +0000
@@ -324,7 +324,8 @@
 x
 s/^\([^@]*\)@.*/\1@/
 G
-s/\n//
+s/\
+//
 p
 }'
 naddresses=""
diff -Nru gettext-0.19.3/gettext-tools/src/write-catalog.c gettext-0.18.1.1/gettext-tools/src/write-catalog.c
--- gettext-0.19.3/gettext-tools/src/write-catalog.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-catalog.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2008, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@
         return;
     }
 
-  /* Check whether the output format can accommodate all messages.  */
+  /* Check whether the output format can accomodate all messages.  */
   if (!output_syntax->supports_multiple_domains && mdlp->nitems > 1)
     {
       if (output_syntax->alternative_is_po)
diff -Nru gettext-0.19.3/gettext-tools/src/write-desktop.c gettext-0.18.1.1/gettext-tools/src/write-desktop.c
--- gettext-0.19.3/gettext-tools/src/write-desktop.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-desktop.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-/* Writing Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014 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
-   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 "write-desktop.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "error.h"
-#include "msgl-iconv.h"
-#include "po-charset.h"
-#include "read-catalog.h"
-#include "read-po.h"
-#include "read-desktop.h"
-#include "fwriteerror.h"
-#include "xalloc.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-typedef struct msgfmt_desktop_reader_ty msgfmt_desktop_reader_ty;
-struct msgfmt_desktop_reader_ty
-{
-  DESKTOP_READER_TY
-  string_list_ty *languages;
-  message_list_ty **messages;
-  hash_table *keywords;
-  FILE *output_file;
-};
-
-static void
-msgfmt_desktop_handle_group (struct desktop_reader_ty *reader,
-                             const char *group)
-{
-  msgfmt_desktop_reader_ty *msgfmt_reader = (msgfmt_desktop_reader_ty *) reader;
-
-  fprintf (msgfmt_reader->output_file, "[%s]\n", group);
-}
-
-static void
-msgfmt_desktop_handle_pair (desktop_reader_ty *reader,
-                            lex_pos_ty *key_pos,
-                            const char *key,
-                            const char *locale,
-                            const char *value)
-{
-  msgfmt_desktop_reader_ty *msgfmt_reader = (msgfmt_desktop_reader_ty *) reader;
-  void *keyword_value;
-
-  if (!locale)
-    {
-      /* Write translated pair, if any.  */
-      if (hash_find_entry (msgfmt_reader->keywords, key, strlen (key),
-                           &keyword_value) == 0)
-        {
-          bool is_list = (bool) keyword_value;
-          char *unescaped = desktop_unescape_string (value, is_list);
-          size_t i;
-
-          for (i = 0; i < msgfmt_reader->languages->nitems; i++)
-            {
-              const char *language = msgfmt_reader->languages->item[i];
-              message_list_ty *mlp = msgfmt_reader->messages[i];
-              message_ty *mp;
-
-              mp = message_list_search (mlp, NULL, unescaped);
-              if (mp && *mp->msgstr != '\0')
-                {
-                  char *escaped;
-
-                  escaped = desktop_escape_string (mp->msgstr, is_list);
-                  fprintf (msgfmt_reader->output_file,
-                           "%s[%s]=%s\n",
-                           key, language, escaped);
-                  free (escaped);
-                }
-            }
-          free (unescaped);
-        }
-
-      /* Write untranslated pair.  */
-      fprintf (msgfmt_reader->output_file, "%s=%s\n", key, value);
-    }
-  else
-    /* Preserve already translated pair.  */
-    fprintf (msgfmt_reader->output_file, "%s[%s]=%s\n", key, locale, value);
-}
-
-static void
-msgfmt_desktop_handle_comment (struct desktop_reader_ty *reader, const char *s)
-{
-  msgfmt_desktop_reader_ty *msgfmt_reader = (msgfmt_desktop_reader_ty *) reader;
-
-  fputc ('#', msgfmt_reader->output_file);
-  fputs (s, msgfmt_reader->output_file);
-  fputc ('\n', msgfmt_reader->output_file);
-}
-
-static void
-msgfmt_desktop_handle_text (struct desktop_reader_ty *reader, const char *s)
-{
-  msgfmt_desktop_reader_ty *msgfmt_reader = (msgfmt_desktop_reader_ty *) reader;
-
-  fputs (s, msgfmt_reader->output_file);
-  fputc ('\n', msgfmt_reader->output_file);
-}
-
-desktop_reader_class_ty msgfmt_methods =
-  {
-    sizeof (msgfmt_desktop_reader_ty),
-    NULL,
-    NULL,
-    msgfmt_desktop_handle_group,
-    msgfmt_desktop_handle_pair,
-    msgfmt_desktop_handle_comment,
-    msgfmt_desktop_handle_text
-  };
-
-int
-msgdomain_write_desktop_bulk (string_list_ty *languages,
-                              message_list_ty **messages,
-                              const char *template_file_name,
-                              hash_table *keywords,
-                              const char *file_name)
-{
-  desktop_reader_ty *reader;
-  msgfmt_desktop_reader_ty *msgfmt_reader;
-  FILE *template_file;
-
-  reader = desktop_reader_alloc (&msgfmt_methods);
-  msgfmt_reader = (msgfmt_desktop_reader_ty *) reader;
-
-  msgfmt_reader->languages = languages;
-  msgfmt_reader->messages = messages;
-  msgfmt_reader->keywords = keywords;
-
-  if (strcmp (file_name, "-") == 0)
-    msgfmt_reader->output_file = stdout;
-  else
-    {
-      msgfmt_reader->output_file = fopen (file_name, "w");
-      if (msgfmt_reader->output_file == NULL)
-        {
-          desktop_reader_free (reader);
-          error (EXIT_SUCCESS,
-                 errno, _("error while opening \"%s\" for writing"),
-                 file_name);
-          return 1;
-        }
-    }
-
-  template_file = fopen (template_file_name, "r");
-  if (template_file == NULL)
-    {
-      desktop_reader_free (reader);
-      error (EXIT_SUCCESS,
-             errno, _("error while opening \"%s\" for reading"),
-             template_file_name);
-      return 1;
-    }
-
-  desktop_parse (reader, template_file, template_file_name, template_file_name);
-
-  /* Make sure nothing went wrong.  */
-  if (fwriteerror (msgfmt_reader->output_file))
-    error (EXIT_FAILURE, errno, _("error while writing \"%s\" file"),
-           file_name);
-
-  desktop_reader_free (reader);
-
-  return 0;
-}
-
-int
-msgdomain_write_desktop (message_list_ty *mlp,
-                         const char *canon_encoding,
-                         const char *locale_name,
-                         const char *template_file_name,
-                         hash_table *keywords,
-                         const char *file_name)
-{
-  string_list_ty *languages;
-  message_list_ty **messages;
-  int retval;
-
-  /* Convert the messages to Unicode.  */
-  iconv_message_list (mlp, canon_encoding, po_charset_utf8, NULL);
-
-  languages = string_list_alloc ();
-  string_list_append (languages, locale_name);
-
-  messages = XNMALLOC (1, message_list_ty *);
-  messages[0] = mlp;
-
-  retval = msgdomain_write_desktop_bulk (languages,
-                                         messages,
-                                         template_file_name,
-                                         keywords,
-                                         file_name);
-
-  string_list_free (languages);
-  free (messages);
-
-  return retval;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/write-desktop.h gettext-0.18.1.1/gettext-tools/src/write-desktop.h
--- gettext-0.19.3/gettext-tools/src/write-desktop.h	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-desktop.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014 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
-   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 _WRITE_DESKTOP_H
-#define _WRITE_DESKTOP_H
-
-#include "message.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Write a Desktop Entry file.  mlp is a list containing the messages
-   to be output.  locale_name is the locale name.  template_file_name
-   is the template file.  file_name is the output file.  Return 0 if
-   ok, nonzero on error.  */
-extern int
-       msgdomain_write_desktop (message_list_ty *mlp,
-                                const char *canon_encoding,
-                                const char *locale_name,
-                                const char *template_file_name,
-                                hash_table *keywords,
-                                const char *file_name);
-
-extern int
-       msgdomain_write_desktop_bulk (string_list_ty *languages,
-                                     message_list_ty **messages,
-                                     const char *template_file_name,
-                                     hash_table *keywords,
-                                     const char *file_name);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _WRITE_DESKTOP_H */
diff -Nru gettext-0.19.3/gettext-tools/src/write-java.c gettext-0.18.1.1/gettext-tools/src/write-java.c
--- gettext-0.19.3/gettext-tools/src/write-java.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-java.c	2010-06-06 12:49:58.000000000 +0000
@@ -1044,8 +1044,7 @@
 msgdomain_write_java (message_list_ty *mlp, const char *canon_encoding,
                       const char *resource_name, const char *locale_name,
                       const char *directory,
-                      bool assume_java2,
-                      bool output_source)
+                      bool assume_java2)
 {
   int retval;
   struct temp_dir *tmpdir;
@@ -1055,7 +1054,6 @@
   char *java_file_name;
   FILE *java_file;
   const char *java_sources[1];
-  const char *source_dir_name;
 
   /* If no entry for this resource/domain, don't even create the file.  */
   if (mlp->nitems == 0)
@@ -1066,19 +1064,10 @@
   /* Convert the messages to Unicode.  */
   iconv_message_list (mlp, canon_encoding, po_charset_utf8, NULL);
 
-  if (output_source)
-    {
-      tmpdir = NULL;
-      source_dir_name = directory;
-    }
-  else
-    {
-      /* Create a temporary directory where we can put the Java file.  */
-      tmpdir = create_temp_dir ("msg", NULL, false);
-      if (tmpdir == NULL)
-        goto quit1;
-      source_dir_name = tmpdir->dir_name;
-    }
+  /* Create a temporary directory where we can put the Java file.  */
+  tmpdir = create_temp_dir ("msg", NULL, false);
+  if (tmpdir == NULL)
+    goto quit1;
 
   /* Assign a default value to the resource name.  */
   if (resource_name == NULL)
@@ -1103,7 +1092,7 @@
     const char *last_dir;
     int i;
 
-    last_dir = source_dir_name;
+    last_dir = tmpdir->dir_name;
     p = resource_name;
     for (i = 0; i < ndots; i++)
       {
@@ -1128,40 +1117,6 @@
       java_file_name = xconcatenated_filename (last_dir, p, ".java");
   }
 
-  /* If OUTPUT_SOURCE, write the Java file in DIRECTORY and return.  */
-  if (output_source)
-    {
-      int i;
-
-      for (i = 0; i < ndots; i++)
-        {
-          if (mkdir (subdirs[i], S_IRUSR | S_IWUSR | S_IXUSR) < 0)
-            {
-              error (0, errno, _("failed to create \"%s\""), subdirs[i]);
-              goto quit3;
-            }
-        }
-
-      java_file = fopen (java_file_name, "w");
-      if (java_file == NULL)
-        {
-          error (0, errno, _("failed to create \"%s\""), java_file_name);
-          goto quit3;
-        }
-
-      write_java_code (java_file, class_name, mlp, assume_java2);
-
-      if (fwriteerror (java_file))
-        {
-          error (0, errno, _("error while writing \"%s\" file"),
-                 java_file_name);
-          goto quit3;
-        }
-
-      retval = 0;
-      goto quit3;
-    }
-
   /* Create the subdirectories.  This is needed because some older Java
      compilers verify that the source of class A.B.C really sits in a
      directory whose name ends in /A/B.  */
@@ -1227,8 +1182,7 @@
   freea (subdirs);
   free (class_name);
  quit2:
-  if (tmpdir != NULL)
-    cleanup_temp_dir (tmpdir);
+  cleanup_temp_dir (tmpdir);
  quit1:
   return retval;
 }
diff -Nru gettext-0.19.3/gettext-tools/src/write-java.h gettext-0.18.1.1/gettext-tools/src/write-java.h
--- gettext-0.19.3/gettext-tools/src/write-java.h	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-java.h	2010-06-06 12:49:58.000000000 +0000
@@ -33,7 +33,6 @@
                              const char *resource_name,
                              const char *locale_name,
                              const char *directory,
-                             bool assume_java2,
-                             bool output_source);
+                             bool assume_java2);
 
 #endif /* _WRITE_JAVA_H */
diff -Nru gettext-0.19.3/gettext-tools/src/write-po.c gettext-0.18.1.1/gettext-tools/src/write-po.c
--- gettext-0.19.3/gettext-tools/src/write-po.c	2014-10-08 07:17:50.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-po.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2009 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -306,57 +306,21 @@
 
 /* Output mp->filepos as a set of comment lines.  */
 
-static enum filepos_comment_type filepos_comment_type = filepos_comment_full;
-
 void
 message_print_comment_filepos (const message_ty *mp, ostream_t stream,
                                bool uniforum, size_t page_width)
 {
-  if (filepos_comment_type != filepos_comment_none
-      && mp->filepos_count != 0)
+  if (mp->filepos_count != 0)
     {
-      size_t filepos_count;
-      lex_pos_ty *filepos;
-
       begin_css_class (stream, class_reference_comment);
 
-      if (filepos_comment_type == filepos_comment_file)
-        {
-          size_t i;
-
-          filepos_count = 0;
-          filepos = XNMALLOC (mp->filepos_count, lex_pos_ty);
-
-          for (i = 0; i < mp->filepos_count; ++i)
-            {
-              lex_pos_ty *pp = &mp->filepos[i];
-              size_t j;
-
-              for (j = 0; j < filepos_count; j++)
-                if (strcmp (filepos[j].file_name, pp->file_name) == 0)
-                  break;
-
-              if (j == filepos_count)
-                {
-                  filepos[filepos_count].file_name = pp->file_name;
-                  filepos[filepos_count].line_number = (size_t)-1;
-                  filepos_count++;
-                }
-            }
-        }
-      else
-        {
-          filepos = mp->filepos;
-          filepos_count = mp->filepos_count;
-        }
-
       if (uniforum)
         {
           size_t j;
 
-          for (j = 0; j < filepos_count; ++j)
+          for (j = 0; j < mp->filepos_count; ++j)
             {
-              lex_pos_ty *pp = &filepos[j];
+              lex_pos_ty *pp = &mp->filepos[j];
               const char *cp = pp->file_name;
               char *str;
 
@@ -381,21 +345,19 @@
 
           ostream_write_str (stream, "#:");
           column = 2;
-          for (j = 0; j < filepos_count; ++j)
+          for (j = 0; j < mp->filepos_count; ++j)
             {
               lex_pos_ty *pp;
               char buffer[21];
               const char *cp;
               size_t len;
 
-              pp = &filepos[j];
+              pp = &mp->filepos[j];
               cp = pp->file_name;
               while (cp[0] == '.' && cp[1] == '/')
                 cp += 2;
-              if (filepos_comment_type == filepos_comment_file
-                  /* Some xgettext input formats, like RST, lack line
-                     numbers.  */
-                  || pp->line_number == (size_t)(-1))
+              /* Some xgettext input formats, like RST, lack line numbers.  */
+              if (pp->line_number == (size_t)(-1))
                 buffer[0] = '\0';
               else
                 sprintf (buffer, ":%ld", (long) pp->line_number);
@@ -415,9 +377,6 @@
           ostream_write_str (stream, "\n");
         }
 
-      if (filepos != mp->filepos)
-        free (filepos);
-
       end_css_class (stream, class_reference_comment);
     }
 }
@@ -546,37 +505,6 @@
   escape = flag;
 }
 
-void
-message_print_style_filepos (enum filepos_comment_type type)
-{
-  filepos_comment_type = type;
-}
-
-
-/* --add-location argument handling.  Return an error indicator.  */
-bool
-handle_filepos_comment_option (const char *option)
-{
-  if (option != NULL)
-    {
-      if (strcmp (option, "never") == 0 || strcmp (option, "no") == 0)
-        message_print_style_filepos (filepos_comment_none);
-      else if (strcmp (option, "full") == 0 || strcmp (option, "yes") == 0)
-        message_print_style_filepos (filepos_comment_full);
-      else if (strcmp (option, "file") == 0)
-        message_print_style_filepos (filepos_comment_file);
-      else
-        {
-          fprintf (stderr, "invalid --add-location argument: %s\n", option);
-          return true;
-        }
-    }
-  else
-    /* --add-location is equivalent to --add-location=full.  */
-    message_print_style_filepos (filepos_comment_full);
-  return false;
-}
-
 
 /* =============== msgdomain_list_print_po() and subroutines. =============== */
 
@@ -649,8 +577,7 @@
       conv = (iconv_t)(-1);
     else
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (strcmp (canon_charset, "EUC-KR") == 0)
         conv = (iconv_t)(-1);
       else
@@ -812,15 +739,6 @@
                                      _("invalid multibyte sequence"));
                           continue;
                         }
-                      else if (errno == EINVAL)
-                        {
-                          /* This could happen if an incomplete
-                             multibyte sequence at the end of input
-                             bytes.  */
-                          po_xerror (PO_SEVERITY_ERROR, mp, NULL, 0, 0, false,
-                                     _("incomplete multibyte sequence"));
-                          continue;
-                        }
                       else
                         abort ();
                     }
@@ -882,7 +800,7 @@
                 {
                   char *error_message =
                     xasprintf (_("\
-internationalized messages should not contain the '\\%c' escape sequence"),
+internationalized messages should not contain the `\\%c' escape sequence"),
                                c);
                   po_xerror (PO_SEVERITY_WARNING, mp, NULL, 0, 0, false,
                              error_message);
@@ -1422,10 +1340,15 @@
   /* Print flag information in special comment.  */
   if (mp->is_fuzzy)
     {
+      bool first = true;
+
       ostream_write_str (stream, "#,");
 
       if (mp->is_fuzzy)
-        ostream_write_str (stream, " fuzzy");
+        {
+          ostream_write_str (stream, " fuzzy");
+          first = false;
+        }
 
       ostream_write_str (stream, "\n");
     }
diff -Nru gettext-0.19.3/gettext-tools/src/write-po.h gettext-0.18.1.1/gettext-tools/src/write-po.h
--- gettext-0.19.3/gettext-tools/src/write-po.h	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-po.h	2010-06-06 12:49:58.000000000 +0000
@@ -30,13 +30,6 @@
 #endif
 
 
-enum filepos_comment_type
-  {
-    filepos_comment_none,
-    filepos_comment_full,
-    filepos_comment_file
-  };
-
 /* These functions are used to output a #, flags line.  */
 extern const char *
        make_format_description_string (enum is_format is_format,
@@ -68,12 +61,6 @@
        message_print_style_uniforum (void);
 extern void
        message_print_style_escape (bool flag);
-extern void
-       message_print_style_filepos (enum filepos_comment_type type);
-
-/* --add-location argument handling.  Return an error indicator.  */
-extern bool handle_filepos_comment_option (const char *option);
-
 
 /* Describes a PO file in .po syntax.  */
 extern DLL_VARIABLE const struct catalog_output_format output_format_po;
diff -Nru gettext-0.19.3/gettext-tools/src/write-resources.c gettext-0.18.1.1/gettext-tools/src/write-resources.c
--- gettext-0.19.3/gettext-tools/src/write-resources.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/write-resources.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Writing C# .resources files.
-   Copyright (C) 2003, 2005, 2007-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2007-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 #include "xerror.h"
 #include "relocatable.h"
 #include "csharpexec.h"
-#include "spawn-pipe.h"
+#include "pipe.h"
 #include "wait-process.h"
 #include "message.h"
 #include "msgfmt.h"
diff -Nru gettext-0.19.3/gettext-tools/src/x-awk.h gettext-0.18.1.1/gettext-tools/src/x-awk.h
--- gettext-0.19.3/gettext-tools/src/x-awk.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-awk.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_AWK \
   { "awk",              extract_awk,                                    \
-                        &flag_table_awk, &formatstring_awk, NULL, NULL }, \
+                        &flag_table_awk, &formatstring_awk, NULL },     \
 
 /* Scan an awk file and add its translatable strings to mdlp.  */
 extern void extract_awk (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-c.c gettext-0.18.1.1/gettext-tools/src/x-c.c
--- gettext-0.19.3/gettext-tools/src/x-c.c	2014-10-03 07:07:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-c.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext C/C++/ObjectiveC backend.
-   Copyright (C) 1995-1998, 2000-2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2009 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -23,7 +23,6 @@
 /* Specification.  */
 #include "x-c.h"
 
-#include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -37,7 +36,6 @@
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "hash.h"
-#include "po-charset.h"
 #include "gettext.h"
 
 #define _(s) gettext(s)
@@ -860,226 +858,167 @@
 };
 
 
-/* Free the memory pointed to by a 'struct token_ty'.  */
-static inline void
-free_token (token_ty *tp)
-{
-  if (tp->type == token_type_name || tp->type == token_type_string_literal)
-    free (tp->string);
-  if (tp->type == token_type_string_literal
-      || tp->type == token_type_objc_special)
-    drop_reference (tp->comment);
-}
-
+/* 7. Replace escape sequences within character strings with their
+   single character equivalents.  This is called from phase 5, because
+   we don't have to worry about the #include argument.  There are
+   pathological cases which could bite us (like the DOS directory
+   separator), but just pretend it can't happen.  */
+
+#define P7_QUOTES (1000 + '"')
+#define P7_QUOTE (1000 + '\'')
+#define P7_NEWLINE (1000 + '\n')
 
-static char *
-literalstring_parse (const char *string, lex_pos_ty *pos,
-                     enum literalstring_escape_type type)
+static int
+phase7_getc ()
 {
-  struct mixed_string_buffer *bp;
-  const char *p;
+  int c, n, j;
 
-  /* Start accumulating the string.  */
-  bp = mixed_string_buffer_alloc (lc_string,
-                                  logical_file_name,
-                                  line_number);
+  /* Use phase 3, because phase 4 elides comments.  */
+  c = phase3_getc ();
 
-  for (p = string; *p != '\0'; p++)
+  /* Return a magic newline indicator, so that we can distinguish
+     between the user requesting a newline in the string (e.g. using
+     "\n" or "\012") from the user failing to terminate the string or
+     character constant.  The ANSI C standard says: 3.1.3.4 Character
+     Constants contain ``any character except single quote, backslash or
+     newline; or an escape sequence'' and 3.1.4 String Literals contain
+     ``any character except double quote, backslash or newline; or an
+     escape sequence''.
+
+     Most compilers give a fatal error in this case, however gcc is
+     stupidly silent, even though this is a very common typo.  OK, so
+     gcc --pedantic will tell me, but that gripes about too much other
+     stuff.  Could I have a ``gcc -Wnewline-in-string'' option, or
+     better yet a ``gcc -fno-newline-in-string'' option, please?  Gcc is
+     also inconsistent between string literals and character constants:
+     you may not embed newlines in character constants; try it, you get
+     a useful diagnostic.  --PMiller  */
+  if (c == '\n')
+    return P7_NEWLINE;
+
+  if (c == '"')
+    return P7_QUOTES;
+  if (c == '\'')
+    return P7_QUOTE;
+  if (c != '\\')
+    return c;
+  c = phase3_getc ();
+  switch (c)
     {
-      int c;
-
-      if (*p != '\\')
-        {
-          mixed_string_buffer_append_char (bp, *p);
-          continue;
-        }
-
-      if (!(type & LET_ANSI_C) && !(type & LET_UNICODE))
-        {
-          mixed_string_buffer_append_char (bp, '\\');
-          continue;
-        }
-
-      c = *++p;
+    default:
+      /* Unknown escape sequences really should be an error, but just
+         ignore them, and let the real compiler complain.  */
+      phase3_ungetc (c);
+      return '\\';
 
-      if (type & LET_ANSI_C)
-        switch (c)
-          {
-          case '"':
-          case '\'':
-          case '?':
-          case '\\':
-            mixed_string_buffer_append_char (bp, c);
-            continue;
-
-          case 'a':
-            mixed_string_buffer_append_char (bp, '\a');
-            continue;
-          case 'b':
-            mixed_string_buffer_append_char (bp, '\b');
-            continue;
-
-            /* The \e escape is preculiar to gcc, and assumes an ASCII
-               character set (or superset).  We don't provide support for it
-               here.  */
-
-          case 'f':
-            mixed_string_buffer_append_char (bp, '\f');
-            continue;
-          case 'n':
-            mixed_string_buffer_append_char (bp, '\n');
-            continue;
-          case 'r':
-            mixed_string_buffer_append_char (bp, '\r');
-            continue;
-          case 't':
-            mixed_string_buffer_append_char (bp, '\t');
-            continue;
-          case 'v':
-            mixed_string_buffer_append_char (bp, '\v');
-            continue;
-
-          case 'x':
-            c = *++p;
-            switch (c)
-              {
-              default:
-                mixed_string_buffer_append_char (bp, '\\');
-                mixed_string_buffer_append_char (bp, 'x');
-                mixed_string_buffer_append_char (bp, c);
-                break;
-
-              case '0': case '1': case '2': case '3': case '4':
-              case '5': case '6': case '7': case '8': case '9':
-              case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-              case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-                {
-                  int n;
+    case '"':
+    case '\'':
+    case '?':
+    case '\\':
+      return c;
 
-                  for (n = 0; ; ++p)
-                    {
-                      switch (*p)
-                        {
-                        default:
-                          break;
-
-                        case '0': case '1': case '2': case '3': case '4':
-                        case '5': case '6': case '7': case '8': case '9':
-                          n = n * 16 + *p - '0';
-                          continue;
-
-                        case 'A': case 'B': case 'C': case 'D': case 'E':
-                        case 'F':
-                          n = n * 16 + 10 + *p - 'A';
-                          continue;
-
-                        case 'a': case 'b': case 'c': case 'd': case 'e':
-                        case 'f':
-                          n = n * 16 + 10 + *p - 'a';
-                          continue;
-                        }
-                      break;
-                    }
+    case 'a':
+      return '\a';
+    case 'b':
+      return '\b';
+
+      /* The \e escape is preculiar to gcc, and assumes an ASCII
+         character set (or superset).  We don't provide support for it
+         here.  */
+
+    case 'f':
+      return '\f';
+    case 'n':
+      return '\n';
+    case 'r':
+      return '\r';
+    case 't':
+      return '\t';
+    case 'v':
+      return '\v';
 
-                  mixed_string_buffer_append_char (bp, n);
-                  --p;
-                }
-                break;
-              }
-            continue;
+    case 'x':
+      c = phase3_getc ();
+      switch (c)
+        {
+        default:
+          phase3_ungetc (c);
+          phase3_ungetc ('x');
+          return '\\';
 
-          case '0': case '1': case '2': case '3':
-          case '4': case '5': case '6': case '7':
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+          break;
+        }
+      n = 0;
+      for (;;)
+        {
+          switch (c)
             {
-              int n, j;
+            default:
+              phase3_ungetc (c);
+              return n;
 
-              for (n = 0, j = 0; j < 3; ++j)
-                {
-                  n = n * 8 + c - '0';
-                  c = *++p;
-                  switch (c)
-                    {
-                    default:
-                      break;
-
-                    case '0': case '1': case '2': case '3':
-                    case '4': case '5': case '6': case '7':
-                      continue;
-                    }
-                  break;
-                }
+            case '0': case '1': case '2': case '3': case '4':
+            case '5': case '6': case '7': case '8': case '9':
+              n = n * 16 + c - '0';
+              break;
+
+            case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+              n = n * 16 + 10 + c - 'A';
+              break;
 
-              mixed_string_buffer_append_char (bp, n);
-              --p;
+            case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+              n = n * 16 + 10 + c - 'a';
+              break;
             }
-            continue;
-          }
+          c = phase3_getc ();
+        }
+      return n;
 
-      if (type & LET_UNICODE)
-        switch (c)
-          {
-          case 'U': case 'u':
+    case '0': case '1': case '2': case '3':
+    case '4': case '5': case '6': case '7':
+      n = 0;
+      for (j = 0; j < 3; ++j)
+        {
+          n = n * 8 + c - '0';
+          c = phase3_getc ();
+          switch (c)
             {
-              unsigned char buf[8];
-              int length = c == 'u' ? 4 : 8;
-              int n, j;
-
-              for (n = 0, j = 0; j < length; j++)
-                {
-                  int c1 = *++p;
-
-                  if (c1 >= '0' && c1 <= '9')
-                    n = (n << 4) + (c1 - '0');
-                  else if (c1 >= 'A' && c1 <= 'F')
-                    n = (n << 4) + (c1 - 'A' + 10);
-                  else if (c1 >= 'a' && c1 <= 'f')
-                    n = (n << 4) + (c1 - 'a' + 10);
-                  else
-                    break;
-
-                  buf[j] = c1;
-                }
-
-              if (j == length)
-                {
-                  if (n < 0x110000)
-                    mixed_string_buffer_append_unicode (bp, n);
-                  else
-                    {
-                      error_with_progname = false;
-                      error_at_line (0, 0,
-                                     pos->file_name, pos->line_number,
-                                     _("\
-warning: invalid Unicode character"));
-                      error_with_progname = true;
-                    }
-                }
-              else
-                {
-                  int i;
-
-                  mixed_string_buffer_append_char (bp, '\\');
-                  mixed_string_buffer_append_char (bp, c);
-
-                  for (i = 0; i < j; i++)
-                    mixed_string_buffer_append_char (bp, buf[i]);
+            default:
+              break;
 
-                  --p;
-                }
+            case '0': case '1': case '2': case '3':
+            case '4': case '5': case '6': case '7':
+              continue;
             }
-            continue;
-          }
-
-      mixed_string_buffer_append_char (bp, c);
+          break;
+        }
+      phase3_ungetc (c);
+      return n;
     }
+}
+
 
-  return mixed_string_buffer_done (bp);
+static void
+phase7_ungetc (int c)
+{
+  phase3_ungetc (c);
 }
 
-struct literalstring_parser literalstring_c =
-  {
-    literalstring_parse
-  };
+
+/* Free the memory pointed to by a 'struct token_ty'.  */
+static inline void
+free_token (token_ty *tp)
+{
+  if (tp->type == token_type_name || tp->type == token_type_string_literal)
+    free (tp->string);
+  if (tp->type == token_type_string_literal
+      || tp->type == token_type_objc_special)
+    drop_reference (tp->comment);
+}
 
 
 /* 5. Parse each resulting logical line as preprocessing tokens and
@@ -1096,7 +1035,6 @@
   static int bufmax;
   int bufpos;
   int c;
-  int last_was_backslash;
 
   if (phase5_pushback_length)
     {
@@ -1233,7 +1171,7 @@
                 }
               buffer[bufpos++] = c;
               c = phase4_getc ();
-              if (c != '+' && c != '-')
+              if (c != '+' || c != '-')
                 {
                   phase4_ungetc (c);
                   break;
@@ -1276,96 +1214,63 @@
          but ignoring it has no effect unless one of the keywords is
          "L".  Just pretend it won't happen.  Also, we don't need to
          remember the character constant.  */
-      last_was_backslash = false;
       for (;;)
         {
-          c = phase3_getc ();
-          if (last_was_backslash)
+          c = phase7_getc ();
+          if (c == P7_NEWLINE)
             {
-              last_was_backslash = false;
-              continue;
-            }
-          switch (c)
-            {
-            case '\\':
-              last_was_backslash = true;
-              /* FALLTHROUGH */
-            default:
-              continue;
-            case '\n':
               error_with_progname = false;
               error (0, 0, _("%s:%d: warning: unterminated character constant"),
                      logical_file_name, line_number - 1);
               error_with_progname = true;
-              phase3_ungetc ('\n');
-              break;
-            case EOF: case '\'':
+              phase7_ungetc ('\n');
               break;
             }
-          break;
+          if (c == EOF || c == P7_QUOTE)
+            break;
         }
       tp->type = token_type_character_constant;
       return;
 
     case '"':
-      {
-        /* We could worry about the 'L' before wide string constants,
-           but since gettext's argument is not a wide character string,
-           let the compiler complain about the argument not matching the
-           prototype.  Just pretend it won't happen.  */
-        last_was_backslash = false;
-        bufpos = 0;
-        for (;;)
-          {
-            c = phase3_getc ();
-            if (last_was_backslash)
-              {
-                last_was_backslash = false;
-                if (bufpos >= bufmax)
-                  {
-                    bufmax = 2 * bufmax + 10;
-                    buffer = xrealloc (buffer, bufmax);
-                  }
-                buffer[bufpos++] = c;
-                continue;
-              }
-            switch (c)
-              {
-              case '\\':
-                last_was_backslash = true;
-                /* FALLTHROUGH */
-              default:
-                if (bufpos >= bufmax)
-                  {
-                    bufmax = 2 * bufmax + 10;
-                    buffer = xrealloc (buffer, bufmax);
-                  }
-                buffer[bufpos++] = c;
-                continue;
-
-              case '\n':
-                error_with_progname = false;
-                error (0, 0, _("%s:%d: warning: unterminated string literal"),
-                       logical_file_name, line_number - 1);
-                error_with_progname = true;
-                phase3_ungetc ('\n');
-                break;
-              case EOF: case '"':
-                break;
-              }
+      /* We could worry about the 'L' before wide string constants,
+         but since gettext's argument is not a wide character string,
+         let the compiler complain about the argument not matching the
+         prototype.  Just pretend it won't happen.  */
+      bufpos = 0;
+      for (;;)
+        {
+          c = phase7_getc ();
+          if (c == P7_NEWLINE)
+            {
+              error_with_progname = false;
+              error (0, 0, _("%s:%d: warning: unterminated string literal"),
+                     logical_file_name, line_number - 1);
+              error_with_progname = true;
+              phase7_ungetc ('\n');
+              break;
+            }
+          if (c == EOF || c == P7_QUOTES)
             break;
-          }
-        if (bufpos >= bufmax)
-          {
-            bufmax = 2 * bufmax + 10;
-            buffer = xrealloc (buffer, bufmax);
-          }
-        buffer[bufpos] = 0;
-        tp->type = token_type_string_literal;
-        tp->string = xstrdup (buffer);
-        tp->comment = add_reference (savable_comment);
-        return;
-      }
+          if (c == P7_QUOTE)
+            c = '\'';
+          if (bufpos >= bufmax)
+            {
+              bufmax = 2 * bufmax + 10;
+              buffer = xrealloc (buffer, bufmax);
+            }
+          buffer[bufpos++] = c;
+        }
+      if (bufpos >= bufmax)
+        {
+          bufmax = 2 * bufmax + 10;
+          buffer = xrealloc (buffer, bufmax);
+        }
+      buffer[bufpos] = 0;
+      tp->type = token_type_string_literal;
+      tp->string = xstrdup (buffer);
+      tp->comment = add_reference (savable_comment);
+      return;
 
     case '(':
       tp->type = token_type_lparen;
@@ -1398,8 +1303,8 @@
 
     default:
       /* We could carefully recognize each of the 2 and 3 character
-         operators, but it is not necessary, as we only need to recognize
-         gettext invocations.  Don't bother.  */
+        operators, but it is not necessary, as we only need to recognize
+        gettext invocations.  Don't bother.  */
       tp->type = token_type_symbol;
       return;
     }
@@ -1982,40 +1887,13 @@
 
         case xgettext_token_type_string_literal:
           if (extract_all)
-            {
-              char *string;
-              refcounted_string_list_ty *comment;
-              const char *encoding;
-
-              string = literalstring_parse (token.string, &token.pos,
-                                            LET_ANSI_C | LET_UNICODE);
-              free (token.string);
-              token.string = string;
-
-              if (token.comment != NULL)
-                {
-                  comment = savable_comment_convert_encoding (token.comment,
-                                                              &token.pos);
-                  drop_reference (token.comment);
-                  token.comment = comment;
-                }
-
-              /* token.string and token.comment are already converted
-                 to UTF-8.  Prevent further conversion in
-                 remember_a_message.  */
-              encoding = xgettext_current_source_encoding;
-              xgettext_current_source_encoding = po_charset_utf8;
-              remember_a_message (mlp, NULL, token.string, inner_context,
-                                  &token.pos, NULL, token.comment);
-              xgettext_current_source_encoding = encoding;
-            }
+            remember_a_message (mlp, NULL, token.string, inner_context,
+                                &token.pos, NULL, token.comment);
           else
-            arglist_parser_remember_literal (argparser, arg, token.string,
-                                             inner_context,
-                                             token.pos.file_name,
-                                             token.pos.line_number,
-                                             token.comment,
-                                             LET_ANSI_C | LET_UNICODE);
+            arglist_parser_remember (argparser, arg, token.string,
+                                     inner_context,
+                                     token.pos.file_name, token.pos.line_number,
+                                     token.comment);
           drop_reference (token.comment);
           next_context_iter = null_context_list_iterator;
           selectorcall_context_iter = null_context_list_iterator;
diff -Nru gettext-0.19.3/gettext-tools/src/x-c.h gettext-0.18.1.1/gettext-tools/src/x-c.h
--- gettext-0.19.3/gettext-tools/src/x-c.h	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-c.h	2010-06-06 12:49:58.000000000 +0000
@@ -43,20 +43,16 @@
 #define SCANNERS_C \
   { "C",                extract_c,                                      \
                         &flag_table_c,                                  \
-                        &formatstring_c, NULL,                          \
-                        &literalstring_c },                             \
+                        &formatstring_c, NULL },                        \
   { "C++",              extract_c,                                      \
                         &flag_table_c,                                  \
-                        &formatstring_c, NULL,                          \
-                        &literalstring_c },                             \
+                        &formatstring_c, NULL },                        \
   { "ObjectiveC",       extract_objc,                                   \
                         &flag_table_objc,                               \
-                        &formatstring_c, &formatstring_objc,            \
-                        &literalstring_c },                             \
+                        &formatstring_c, &formatstring_objc },          \
   { "GCC-source",       extract_c,                                      \
                         &flag_table_gcc_internal,                       \
-                        &formatstring_gcc_internal, &formatstring_gfc_internal, \
-                        &literalstring_c },                             \
+                        &formatstring_gcc_internal, &formatstring_gfc_internal }, \
 
 /* Scan a C/C++ file and add its translatable strings to mdlp.  */
 extern void extract_c (FILE *fp, const char *real_filename,
@@ -84,9 +80,6 @@
 extern void init_flag_table_gcc_internal (void);
 
 
-extern struct literalstring_parser literalstring_c;
-
-
 #ifdef __cplusplus
 }
 #endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-csharp.c gettext-0.18.1.1/gettext-tools/src/x-csharp.c
--- gettext-0.19.3/gettext-tools/src/x-csharp.c	2014-05-08 04:25:58.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-csharp.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext C# backend.
-   Copyright (C) 2003, 2005-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -330,7 +330,7 @@
               while (insize > 0)
                 phase1_ungetc (buf[--insize]);
               /* Convert the character from UTF-8 to UCS-4.  */
-              if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes)
+              if (u8_mbtouc (&uc, scratchbuf, outbytes) < outbytes)
                 {
                   /* scratchbuf contains an out-of-range Unicode character
                      (> 0x10ffff).  */
diff -Nru gettext-0.19.3/gettext-tools/src/x-csharp.h gettext-0.18.1.1/gettext-tools/src/x-csharp.h
--- gettext-0.19.3/gettext-tools/src/x-csharp.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-csharp.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_CSHARP \
   { "C#",               extract_csharp,                                   \
-                        &flag_table_csharp, &formatstring_csharp, NULL, NULL }, \
+                        &flag_table_csharp, &formatstring_csharp, NULL }, \
 
 extern void extract_csharp (FILE *fp, const char *real_filename,
                             const char *logical_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-desktop.c gettext-0.18.1.1/gettext-tools/src/x-desktop.c
--- gettext-0.19.3/gettext-tools/src/x-desktop.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-desktop.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-/* xgettext Desktop Entry backend.
-   Copyright (C) 2014 Free Software Foundation, Inc.
-
-   This file was written by Daiki Ueno <ueno@gnu.org>, 2014.
-
-   This 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 "x-desktop.h"
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "message.h"
-#include "xgettext.h"
-#include "error.h"
-#include "error-progname.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
-#include "hash.h"
-#include "gettext.h"
-#include "read-desktop.h"
-#include "po-charset.h"
-
-#define _(s) gettext(s)
-
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-
-/* ====================== Keyword set customization.  ====================== */
-
-/* The syntax of a Desktop Entry file is defined at
-   http://standards.freedesktop.org/desktop-entry-spec/latest/index.html
-
-   Basically, values with 'localestring' type can be translated.
-
-   The type of a value is determined by looking at the key associated
-   with it.  The list of available keys are listed on:
-   http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html  */
-
-static hash_table keywords;
-static bool default_keywords = true;
-
-static void
-add_keyword (const char *name, hash_table *keywords, bool is_list)
-{
-  if (name == NULL)
-    default_keywords = false;
-  else
-    {
-      if (keywords->table == NULL)
-        hash_init (keywords, 100);
-
-      desktop_add_keyword (keywords, name, is_list);
-    }
-}
-
-void
-x_desktop_keyword (const char *name)
-{
-  add_keyword (name, &keywords, false);
-}
-
-static void
-init_keywords (void)
-{
-  if (default_keywords)
-    {
-      if (keywords.table == NULL)
-        hash_init (&keywords, 100);
-
-      desktop_add_default_keywords (&keywords);
-      default_keywords = false;
-    }
-}
-
-typedef struct extract_desktop_reader_ty extract_desktop_reader_ty;
-struct extract_desktop_reader_ty
-{
-  DESKTOP_READER_TY
-
-  message_list_ty *mlp;
-};
-
-static void
-extract_desktop_handle_group (struct desktop_reader_ty *reader,
-                              const char *group)
-{
-  savable_comment_reset ();
-}
-
-static void
-extract_desktop_handle_pair (struct desktop_reader_ty *reader,
-                             lex_pos_ty *key_pos,
-                             const char *key,
-                             const char *locale,
-                             const char *value)
-{
-  extract_desktop_reader_ty *extract_reader =
-    (extract_desktop_reader_ty *) reader;
-  void *keyword_value;
-
-  if (!locale                   /* Skip already translated entry.  */
-      && hash_find_entry (&keywords, key, strlen (key), &keyword_value) == 0)
-    {
-      bool is_list = (bool) keyword_value;
-
-      remember_a_message (extract_reader->mlp, NULL,
-                          desktop_unescape_string (value, is_list),
-                          null_context, key_pos,
-                          NULL, savable_comment);
-    }
-  savable_comment_reset ();
-}
-
-static void
-extract_desktop_handle_comment (struct desktop_reader_ty *reader,
-                                const char *s)
-{
-  savable_comment_add (s);
-}
-
-static void
-extract_desktop_handle_text (struct desktop_reader_ty *reader,
-                             const char *s)
-{
-  savable_comment_reset ();
-}
-
-desktop_reader_class_ty extract_methods =
-  {
-    sizeof (extract_desktop_reader_ty),
-    NULL,
-    NULL,
-    extract_desktop_handle_group,
-    extract_desktop_handle_pair,
-    extract_desktop_handle_comment,
-    extract_desktop_handle_text
-  };
-
-void
-extract_desktop (FILE *f,
-                 const char *real_filename, const char *logical_filename,
-                 flag_context_list_table_ty *flag_table,
-                 msgdomain_list_ty *mdlp)
-{
-  desktop_reader_ty *reader = desktop_reader_alloc (&extract_methods);
-  extract_desktop_reader_ty *extract_reader =
-    (extract_desktop_reader_ty *) reader;
-
-  init_keywords ();
-  xgettext_current_source_encoding = po_charset_utf8;
-
-  extract_reader->mlp = mdlp->item[0]->messages;
-
-  desktop_parse (reader, f, real_filename, logical_filename);
-  desktop_reader_free (reader);
-
-  reader = NULL;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/x-desktop.h gettext-0.18.1.1/gettext-tools/src/x-desktop.h
--- gettext-0.19.3/gettext-tools/src/x-desktop.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-desktop.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* xgettext Desktop Entry backend.
-   Copyright (C) 2014 Free Software Foundation, Inc.
-   Written by Daiki Ueno <ueno@gnu.org>, 2014.
-
-   This 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 <stdio.h>
-
-#include "message.h"
-#include "xgettext.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define EXTENSIONS_DESKTOP \
-  { "desktop", "Desktop" }, \
-
-#define SCANNERS_DESKTOP \
-  { "Desktop", extract_desktop, NULL, NULL, NULL, NULL }, \
-
-/* Scan a Desktop Entry file and add its translatable strings to mdlp.  */
-extern void extract_desktop (FILE *fp, const char *real_filename,
-                             const char *logical_filename,
-                             flag_context_list_table_ty *flag_table,
-                             msgdomain_list_ty *mdlp);
-
-extern void x_desktop_keyword (const char *keyword);
-
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-elisp.h gettext-0.18.1.1/gettext-tools/src/x-elisp.h
--- gettext-0.19.3/gettext-tools/src/x-elisp.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-elisp.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_ELISP \
   { "EmacsLisp",        extract_elisp,                                  \
-                        &flag_table_elisp, &formatstring_elisp, NULL, NULL }, \
+                        &flag_table_elisp, &formatstring_elisp, NULL }, \
 
 /* Scan an Emacs Lisp file and add its translatable strings to mdlp.  */
 extern void extract_elisp (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/xgettext.c gettext-0.18.1.1/gettext-tools/src/xgettext.c
--- gettext-0.19.3/gettext-tools/src/xgettext.c	2014-06-06 07:12:49.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/xgettext.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Extracts strings from C source file to Uniforum style .po file.
-   Copyright (C) 1995-1998, 2000-2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2010 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
@@ -66,7 +66,6 @@
 #include "color.h"
 #include "format.h"
 #include "propername.h"
-#include "unistr.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */
@@ -93,11 +92,6 @@
 #include "x-stringtable.h"
 #include "x-rst.h"
 #include "x-glade.h"
-#include "x-lua.h"
-#include "x-javascript.h"
-#include "x-vala.h"
-#include "x-gsettings.h"
-#include "x-desktop.h"
 
 
 /* If nonzero add all comments immediately preceding one of the keywords. */
@@ -166,9 +160,6 @@
 static flag_context_list_table_ty flag_table_tcl;
 static flag_context_list_table_ty flag_table_perl;
 static flag_context_list_table_ty flag_table_php;
-static flag_context_list_table_ty flag_table_lua;
-static flag_context_list_table_ty flag_table_javascript;
-static flag_context_list_table_ty flag_table_vala;
 
 /* If true, recognize Qt format strings.  */
 static bool recognize_format_qt;
@@ -201,7 +192,7 @@
 static const struct option long_options[] =
 {
   { "add-comments", optional_argument, NULL, 'c' },
-  { "add-location", optional_argument, NULL, 'n' },
+  { "add-location", no_argument, &line_comment, 1 },
   { "boost", no_argument, NULL, CHAR_MAX + 11 },
   { "c++", no_argument, NULL, 'C' },
   { "color", optional_argument, NULL, CHAR_MAX + 14 },
@@ -227,7 +218,7 @@
   { "msgstr-prefix", optional_argument, NULL, 'm' },
   { "msgstr-suffix", optional_argument, NULL, 'M' },
   { "no-escape", no_argument, NULL, 'e' },
-  { "no-location", no_argument, NULL, CHAR_MAX + 16 },
+  { "no-location", no_argument, &line_comment, 0 },
   { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
   { "omit-header", no_argument, &xgettext_omit_header, 1 },
   { "output", required_argument, NULL, 'o' },
@@ -265,7 +256,6 @@
   struct formatstring_parser *formatstring_parser1;
   struct formatstring_parser *formatstring_parser2;
   struct formatstring_parser *formatstring_parser3;
-  struct literalstring_parser *literalstring_parser;
 };
 
 
@@ -341,9 +331,6 @@
   init_flag_table_tcl ();
   init_flag_table_perl ();
   init_flag_table_php ();
-  init_flag_table_lua ();
-  init_flag_table_javascript ();
-  init_flag_table_vala ();
 
   while ((optchar = getopt_long (argc, argv,
                                  "ac::Cd:D:eEf:Fhijk::l:L:m::M::no:p:sTVw:x:",
@@ -368,9 +355,6 @@
         x_perl_extract_all ();
         x_php_extract_all ();
         x_glade_extract_all ();
-        x_lua_extract_all ();
-        x_javascript_extract_all ();
-        x_vala_extract_all ();
         break;
 
       case 'c':
@@ -448,10 +432,6 @@
         x_perl_keyword (optarg);
         x_php_keyword (optarg);
         x_glade_keyword (optarg);
-        x_lua_keyword (optarg);
-        x_javascript_keyword (optarg);
-        x_vala_keyword (optarg);
-        x_desktop_keyword (optarg);
         if (optarg == NULL)
           no_default_keywords = true;
         else
@@ -477,8 +457,7 @@
         break;
 
       case 'n':
-        if (handle_filepos_comment_option (optarg))
-          usage (EXIT_FAILURE);
+        line_comment = 1;
         break;
 
       case 'o':
@@ -540,13 +519,7 @@
       case CHAR_MAX + 3:        /* --from-code */
         xgettext_global_source_encoding = po_charset_canonicalize (optarg);
         if (xgettext_global_source_encoding == NULL)
-          {
-            multiline_warning (xasprintf (_("warning: ")),
-                               xasprintf (_("\
-'%s' is not a valid encoding name.  Using ASCII as fallback.\n"),
-                                          optarg));
-            xgettext_global_source_encoding = po_charset_ascii;
-          }
+          xgettext_global_source_encoding = po_charset_ascii;
         break;
 
       case CHAR_MAX + 4:        /* --no-wrap */
@@ -598,10 +571,6 @@
         handle_style_option (optarg);
         break;
 
-      case CHAR_MAX + 16: /* --no-location */
-        message_print_style_filepos (filepos_comment_none);
-        break;
-
       default:
         usage (EXIT_FAILURE);
         /* NOTREACHED */
@@ -617,7 +586,7 @@
 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-2010");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
@@ -627,6 +596,10 @@
     usage (EXIT_SUCCESS);
 
   /* Verify selected options.  */
+  if (!line_comment && sort_by_filepos)
+    error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
+           "--no-location", "--sort-by-file");
+
   if (sort_by_msgid && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--sort-output", "--sort-by-file");
@@ -709,8 +682,7 @@
       iconv_t cd;
 
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (strcmp (xgettext_global_source_encoding, "EUC-KR") == 0)
         cd = (iconv_t)(-1);
       else
@@ -771,7 +743,6 @@
           char *reduced;
           const char *extension;
           const char *language;
-          const char *p;
 
           base = strrchr (filename, '/');
           if (!base)
@@ -779,34 +750,24 @@
 
           reduced = xstrdup (base);
           /* Remove a trailing ".in" - it's a generic suffix.  */
-          while (strlen (reduced) >= 3
-                 && memcmp (reduced + strlen (reduced) - 3, ".in", 3) == 0)
+          if (strlen (reduced) >= 3
+              && memcmp (reduced + strlen (reduced) - 3, ".in", 3) == 0)
             reduced[strlen (reduced) - 3] = '\0';
 
           /* Work out what the file extension is.  */
-          language = NULL;
-          p = reduced + strlen (reduced);
-          for (; p > reduced && language == NULL; p--)
-            {
-              if (*p == '.')
-                {
-                  extension = p + 1;
-
-                  /* Derive the language from the extension, and the extractor
-                     function from the language.  */
-                  language = extension_to_language (extension);
-                }
-            }
+          extension = strrchr (reduced, '.');
+          if (extension)
+            ++extension;
+          else
+            extension = "";
 
+          /* Derive the language from the extension, and the extractor
+             function from the language.  */
+          language = extension_to_language (extension);
           if (language == NULL)
             {
-              extension = strrchr (reduced, '.');
-              if (extension == NULL)
-                extension = "";
-              else
-                extension++;
               error (0, 0, _("\
-warning: file '%s' extension '%s' is unknown; will try C"), filename, extension);
+warning: file `%s' extension `%s' is unknown; will try C"), filename, extension);
               language = "C";
             }
           this_file_extractor = language_to_extractor (language);
@@ -848,7 +809,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -895,8 +856,7 @@
                                 (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n\
                                 EmacsLisp, librep, Scheme, Smalltalk, Java,\n\
                                 JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n\
-                                GCC-source, NXStringTable, RST, Glade, Lua,\n\
-                                JavaScript, Vala, Desktop)\n"));
+                                GCC-source, NXStringTable, RST, Glade)\n"));
       printf (_("\
   -C, --c++                   shorthand for --language=C++\n"));
       printf (_("\
@@ -929,24 +889,21 @@
       printf (_("\
                                 (only languages C, C++, ObjectiveC, Shell,\n\
                                 Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\
-                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n\
-                                Lua, JavaScript, Vala)\n"));
+                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"));
       printf (_("\
   -kWORD, --keyword=WORD      look for WORD as an additional keyword\n\
   -k, --keyword               do not to use default keywords\n"));
       printf (_("\
                                 (only languages C, C++, ObjectiveC, Shell,\n\
                                 Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\
-                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n\
-                                Lua, JavaScript, Vala, Desktop)\n"));
+                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"));
       printf (_("\
       --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n\
                               number ARG of keyword WORD\n"));
       printf (_("\
                                 (only languages C, C++, ObjectiveC, Shell,\n\
                                 Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\
-                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n\
-                                Lua, JavaScript, Vala)\n"));
+                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"));
       printf (_("\
   -T, --trigraphs             understand ANSI C trigraphs for input\n"));
       printf (_("\
@@ -1002,7 +959,7 @@
       printf (_("\
   -F, --sort-by-file          sort output by file location\n"));
       printf (_("\
-      --omit-header           don't write header with 'msgid \"\"' entry\n"));
+      --omit-header           don't write header with `msgid \"\"' entry\n"));
       printf (_("\
       --copyright-holder=STRING  set copyright holder in output\n"));
       printf (_("\
@@ -1716,11 +1673,6 @@
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_python_brace:
-                    flag_context_list_table_insert (&flag_table_python, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
                   case format_lisp:
                     flag_context_list_table_insert (&flag_table_lisp, 0,
                                                     name_start, name_end,
@@ -1815,16 +1767,6 @@
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_lua:
-                    flag_context_list_table_insert (&flag_table_lua, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
-                  case format_javascript:
-                    flag_context_list_table_insert (&flag_table_javascript, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
                   default:
                     abort ();
                   }
@@ -1924,32 +1866,6 @@
     }
 }
 
-refcounted_string_list_ty *
-savable_comment_convert_encoding (refcounted_string_list_ty *comment,
-                                  lex_pos_ty *pos)
-{
-  refcounted_string_list_ty *result;
-  size_t i;
-
-  result = XMALLOC (refcounted_string_list_ty);
-  result->refcount = 1;
-  string_list_init (&result->contents);
-
-  for (i = 0; i < comment->contents.nitems; i++)
-    {
-      const char *old_string = comment->contents.item[i];
-      char *string = from_current_source_encoding (old_string,
-                                                   lc_comment,
-                                                   pos->file_name,
-                                                   pos->line_number);
-      string_list_append (&result->contents, string);
-      if (string != old_string)
-        free (string);
-    }
-
-  return result;
-}
-
 
 
 static FILE *
@@ -2019,7 +1935,6 @@
 static struct formatstring_parser *current_formatstring_parser2;
 static struct formatstring_parser *current_formatstring_parser3;
 
-static struct literalstring_parser *current_literalstring_parser;
 
 static void
 extract_from_file (const char *file_name, extractor_ty extractor,
@@ -2039,7 +1954,6 @@
   current_formatstring_parser1 = extractor.formatstring_parser1;
   current_formatstring_parser2 = extractor.formatstring_parser2;
   current_formatstring_parser3 = extractor.formatstring_parser3;
-  current_literalstring_parser = extractor.literalstring_parser;
   extractor.func (fp, real_file_name, logical_file_name, extractor.flag_table,
                   mdlp);
 
@@ -2324,38 +2238,11 @@
     size_t nitems_after;
     int j;
     bool add_all_remaining_comments;
-    /* The string before the comment tag.  For example, If "** TRANSLATORS:"
-       is seen and the comment tag is "TRANSLATORS:",
-       then comment_tag_prefix is set to "** ".  */
-    const char *comment_tag_prefix = NULL;
-    size_t comment_tag_prefix_length = 0;
 
     nitems_before = (mp->comment_dot != NULL ? mp->comment_dot->nitems : 0);
 
     if (extracted_comment != NULL)
-      {
-        char *copy = xstrdup (extracted_comment);
-        char *rest;
-
-        rest = copy;
-        while (*rest != '\0')
-          {
-            char *newline = strchr (rest, '\n');
-
-            if (newline != NULL)
-              {
-                *newline = '\0';
-                message_comment_dot_append (mp, rest);
-                rest = newline + 1;
-              }
-            else
-              {
-                message_comment_dot_append (mp, rest);
-                break;
-              }
-          }
-        free (copy);
-      }
+      message_comment_dot_append (mp, extracted_comment);
 
     add_all_remaining_comments = add_all_comments;
     for (j = 0; ; ++j)
@@ -2368,7 +2255,7 @@
         CONVERT_STRING (s, lc_comment);
 
         /* To reduce the possibility of unwanted matches we do a two
-           step match: the line must contain 'xgettext:' and one of
+           step match: the line must contain `xgettext:' and one of
            the possible format description strings.  */
         if ((t = c_strstr (s, "xgettext:")) != NULL)
           {
@@ -2407,25 +2294,13 @@
             if (interesting)
               continue;
           }
-
-        if (!add_all_remaining_comments && comment_tag != NULL)
-          {
-            /* When the comment tag is seen, it drags in not only the line
-               which it starts, but all remaining comment lines.  */
-            if ((t = c_strstr (s, comment_tag)) != NULL)
-              {
-                add_all_remaining_comments = true;
-                comment_tag_prefix = s;
-                comment_tag_prefix_length = t - s;
-              }
-          }
-
-        if (add_all_remaining_comments)
-          {
-            if (strncmp (s, comment_tag_prefix, comment_tag_prefix_length) == 0)
-              s += comment_tag_prefix_length;
-            message_comment_dot_append (mp, s);
-          }
+        /* When the comment tag is seen, it drags in not only the line
+           which it starts, but all remaining comment lines.  */
+        if (add_all_remaining_comments
+            || (add_all_remaining_comments =
+                  (comment_tag != NULL
+                   && strncmp (s, comment_tag, strlen (comment_tag)) == 0)))
+          message_comment_dot_append (mp, s);
       }
 
     nitems_after = (mp->comment_dot != NULL ? mp->comment_dot->nitems : 0);
@@ -2530,7 +2405,8 @@
   warn_format_string (is_format, mp->msgid, pos, "msgid");
 
   /* Remember where we saw this msgid.  */
-  message_comment_filepos (mp, pos->file_name, pos->line_number);
+  if (line_comment)
+    message_comment_filepos (mp, pos->file_name, pos->line_number);
 
   /* Tell the lexer to reset its comment buffer, so that the next
      message gets the correct comments.  */
@@ -2684,17 +2560,14 @@
           ap->alternative[i].argtotal = shapes->shapes[i].argtotal;
           ap->alternative[i].xcomments = shapes->shapes[i].xcomments;
           ap->alternative[i].msgctxt = NULL;
-          ap->alternative[i].msgctxt_escape = LET_NONE;
           ap->alternative[i].msgctxt_pos.file_name = NULL;
           ap->alternative[i].msgctxt_pos.line_number = (size_t)(-1);
           ap->alternative[i].msgid = NULL;
-          ap->alternative[i].msgid_escape = LET_NONE;
           ap->alternative[i].msgid_context = null_context;
           ap->alternative[i].msgid_pos.file_name = NULL;
           ap->alternative[i].msgid_pos.line_number = (size_t)(-1);
           ap->alternative[i].msgid_comment = NULL;
           ap->alternative[i].msgid_plural = NULL;
-          ap->alternative[i].msgid_plural_escape = LET_NONE;
           ap->alternative[i].msgid_plural_context = null_context;
           ap->alternative[i].msgid_plural_pos.file_name = NULL;
           ap->alternative[i].msgid_plural_pos.line_number = (size_t)(-1);
@@ -2731,16 +2604,13 @@
       ccp->argtotal = cp->argtotal;
       ccp->xcomments = cp->xcomments;
       ccp->msgctxt = (cp->msgctxt != NULL ? xstrdup (cp->msgctxt) : NULL);
-      ccp->msgctxt_escape = cp->msgctxt_escape;
       ccp->msgctxt_pos = cp->msgctxt_pos;
       ccp->msgid = (cp->msgid != NULL ? xstrdup (cp->msgid) : NULL);
-      ccp->msgid_escape = cp->msgid_escape;
       ccp->msgid_context = cp->msgid_context;
       ccp->msgid_pos = cp->msgctxt_pos;
       ccp->msgid_comment = add_reference (cp->msgid_comment);
       ccp->msgid_plural =
         (cp->msgid_plural != NULL ? xstrdup (cp->msgid_plural) : NULL);
-      ccp->msgid_plural_escape = cp->msgid_plural_escape;
       ccp->msgid_plural_context = cp->msgid_plural_context;
       ccp->msgid_plural_pos = cp->msgid_plural_pos;
     }
@@ -2750,12 +2620,11 @@
 
 
 void
-arglist_parser_remember_literal (struct arglist_parser *ap,
-                                 int argnum, char *string,
-                                 flag_context_ty context,
-                                 char *file_name, size_t line_number,
-                                 refcounted_string_list_ty *comment,
-                                 enum literalstring_escape_type type)
+arglist_parser_remember (struct arglist_parser *ap,
+                         int argnum, char *string,
+                         flag_context_ty context,
+                         char *file_name, size_t line_number,
+                         refcounted_string_list_ty *comment)
 {
   bool stored_string = false;
   size_t nalternatives = ap->nalternatives;
@@ -2770,7 +2639,6 @@
       if (argnum == cp->argnumc)
         {
           cp->msgctxt = string;
-          cp->msgctxt_escape = type;
           cp->msgctxt_pos.file_name = file_name;
           cp->msgctxt_pos.line_number = line_number;
           stored_string = true;
@@ -2782,7 +2650,6 @@
           if (argnum == cp->argnum1)
             {
               cp->msgid = string;
-              cp->msgid_escape = type;
               cp->msgid_context = context;
               cp->msgid_pos.file_name = file_name;
               cp->msgid_pos.line_number = line_number;
@@ -2794,7 +2661,6 @@
           if (argnum == cp->argnum2)
             {
               cp->msgid_plural = string;
-              cp->msgid_plural_escape = type;
               cp->msgid_plural_context = context;
               cp->msgid_plural_pos.file_name = file_name;
               cp->msgid_plural_pos.line_number = line_number;
@@ -2810,17 +2676,6 @@
     free (string);
 }
 
-void
-arglist_parser_remember (struct arglist_parser *ap,
-                         int argnum, char *string,
-                         flag_context_ty context,
-                         char *file_name, size_t line_number,
-                         refcounted_string_list_ty *comment)
-{
-  arglist_parser_remember_literal (ap, argnum, string, context,
-                                   file_name, line_number,
-                                   comment, LET_NONE);
-}
 
 bool
 arglist_parser_decidedp (struct arglist_parser *ap, int argnum)
@@ -3061,8 +2916,6 @@
           {
             flag_context_ty msgid_context = best_cp->msgid_context;
             flag_context_ty msgid_plural_context = best_cp->msgid_plural_context;
-            struct literalstring_parser *parser = current_literalstring_parser;
-            const char *encoding;
 
             /* Special support for the 3-argument tr operator in Qt:
                When --qt and --keyword=tr:1,1,2c,3t are specified, add to the
@@ -3076,90 +2929,15 @@
                 msgid_plural_context.is_format3 = yes_according_to_context;
               }
 
-            if (best_cp->msgctxt != NULL)
-              {
-                if (parser != NULL && best_cp->msgctxt_escape != 0)
-                  {
-                    char *msgctxt =
-                      parser->parse (best_cp->msgctxt,
-                                     &best_cp->msgctxt_pos,
-                                     best_cp->msgctxt_escape);
-                    free (best_cp->msgctxt);
-                    best_cp->msgctxt = msgctxt;
-                  }
-                else
-                  {
-                    lex_pos_ty *pos = &best_cp->msgctxt_pos;
-                    CONVERT_STRING (best_cp->msgctxt, lc_string);
-                  }
-              }
-
-            if (parser != NULL && best_cp->msgid_escape != 0)
-              {
-                char *msgid = parser->parse (best_cp->msgid,
-                                             &best_cp->msgid_pos,
-                                             best_cp->msgid_escape);
-                free (best_cp->msgid);
-                if (best_cp->msgid_plural == best_cp->msgid)
-                  best_cp->msgid_plural = msgid;
-                best_cp->msgid = msgid;
-              }
-            else
-              {
-                lex_pos_ty *pos = &best_cp->msgid_pos;
-                CONVERT_STRING (best_cp->msgid, lc_string);
-              }
-
-            if (best_cp->msgid_comment != NULL)
-              {
-                refcounted_string_list_ty *msgid_comment =
-                  savable_comment_convert_encoding (best_cp->msgid_comment,
-                                                    &best_cp->msgid_pos);
-                drop_reference (best_cp->msgid_comment);
-                best_cp->msgid_comment = msgid_comment;
-              }
-
-            /* best_cp->msgctxt and best_cp->msgid are already in
-               UTF-8.  Prevent further conversion in remember_a_message.  */
-            encoding = xgettext_current_source_encoding;
-            xgettext_current_source_encoding = po_charset_utf8;
             mp = remember_a_message (ap->mlp, best_cp->msgctxt, best_cp->msgid,
                                      msgid_context,
                                      &best_cp->msgid_pos,
                                      NULL, best_cp->msgid_comment);
-            xgettext_current_source_encoding = encoding;
-
-            if (mp != NULL && best_cp->msgid_plural != NULL)
-              {
-                /* best_cp->msgid_plural may point to best_cp->msgid.
-                   In that case, it is already interpreted and converted.  */
-                if (best_cp->msgid_plural != best_cp->msgid)
-                  {
-                    if (parser != NULL
-                        && best_cp->msgid_plural_escape != 0)
-                      {
-                        char *msgid_plural =
-                          parser->parse (best_cp->msgid_plural,
+            if (best_cp->msgid_plural != NULL)
+              remember_a_message_plural (mp, best_cp->msgid_plural,
+                                         msgid_plural_context,
                                          &best_cp->msgid_plural_pos,
-                                         best_cp->msgid_plural_escape);
-                        free (best_cp->msgid_plural);
-                        best_cp->msgid_plural = msgid_plural;
-                      }
-                    else
-                      {
-                        lex_pos_ty *pos = &best_cp->msgid_plural_pos;
-                        CONVERT_STRING (best_cp->msgid_plural, lc_string);
-                      }
-                  }
-
-                encoding = xgettext_current_source_encoding;
-                xgettext_current_source_encoding = po_charset_utf8;
-                remember_a_message_plural (mp, best_cp->msgid_plural,
-                                           msgid_plural_context,
-                                           &best_cp->msgid_plural_pos,
-                                           NULL);
-                xgettext_current_source_encoding = encoding;
-              }
+                                         NULL);
           }
 
           if (best_cp->xcomments.nitems > 0)
@@ -3213,186 +2991,6 @@
 }
 
 
-struct mixed_string_buffer *
-mixed_string_buffer_alloc (lexical_context_ty lcontext,
-                           const char *logical_file_name,
-                           int line_number)
-{
-  struct mixed_string_buffer *bp = XMALLOC (struct mixed_string_buffer);
-  bp->utf8_buffer = NULL;
-  bp->utf8_buflen = 0;
-  bp->utf8_allocated = 0;
-  bp->utf16_surr = 0;
-  bp->curr_buffer = NULL;
-  bp->curr_buflen = 0;
-  bp->curr_allocated = 0;
-  bp->lcontext = lcontext;
-  bp->logical_file_name = logical_file_name;
-  bp->line_number = line_number;
-  return bp;
-}
-
-/* Auxiliary function: Append a byte to bp->curr.  */
-static inline void
-mixed_string_buffer_append_to_curr_buffer (struct mixed_string_buffer *bp,
-                                           unsigned char c)
-{
-  if (bp->curr_buflen == bp->curr_allocated)
-    {
-      bp->curr_allocated = 2 * bp->curr_allocated + 10;
-      bp->curr_buffer = xrealloc (bp->curr_buffer, bp->curr_allocated);
-    }
-  bp->curr_buffer[bp->curr_buflen++] = c;
-}
-
-/* Auxiliary function: Ensure count more bytes are available in bp->utf8.  */
-static inline void
-mixed_string_buffer_grow_utf8_buffer (struct mixed_string_buffer *bp,
-                                         size_t count)
-{
-  if (bp->utf8_buflen + count > bp->utf8_allocated)
-    {
-      size_t new_allocated = 2 * bp->utf8_allocated + 10;
-      if (new_allocated < bp->utf8_buflen + count)
-        new_allocated = bp->utf8_buflen + count;
-      bp->utf8_allocated = new_allocated;
-      bp->utf8_buffer = xrealloc (bp->utf8_buffer, new_allocated);
-    }
-}
-
-/* Auxiliary function: Append a Unicode character to bp->utf8.
-   uc must be < 0x110000.  */
-static inline void
-mixed_string_buffer_append_to_utf8_buffer (struct mixed_string_buffer *bp,
-                                           ucs4_t uc)
-{
-  unsigned char utf8buf[6];
-  int count = u8_uctomb (utf8buf, uc, 6);
-
-  if (count < 0)
-    /* The caller should have ensured that uc is not out-of-range.  */
-    abort ();
-
-  mixed_string_buffer_grow_utf8_buffer (bp, count);
-  memcpy (bp->utf8_buffer + bp->utf8_buflen, utf8buf, count);
-  bp->utf8_buflen += count;
-}
-
-/* Auxiliary function: Flush bp->utf16_surr into bp->utf8_buffer.  */
-static inline void
-mixed_string_buffer_flush_utf16_surr (struct mixed_string_buffer *bp)
-{
-  if (bp->utf16_surr != 0)
-    {
-      /* A half surrogate is invalid, therefore use U+FFFD instead.  */
-      mixed_string_buffer_append_to_utf8_buffer (bp, 0xfffd);
-      bp->utf16_surr = 0;
-    }
-}
-
-/* Auxiliary function: Flush bp->curr_buffer into bp->utf8_buffer.  */
-static inline void
-mixed_string_buffer_flush_curr_buffer (struct mixed_string_buffer *bp,
-                                       int line_number)
-{
-  if (bp->curr_buflen > 0)
-    {
-      char *curr;
-      size_t count;
-
-      mixed_string_buffer_append_to_curr_buffer (bp, '\0');
-
-      /* Convert from the source encoding to UTF-8.  */
-      curr = from_current_source_encoding (bp->curr_buffer, bp->lcontext,
-                                           bp->logical_file_name,
-                                           line_number);
-
-      /* Append it to bp->utf8_buffer.  */
-      count = strlen (curr);
-      mixed_string_buffer_grow_utf8_buffer (bp, count);
-      memcpy (bp->utf8_buffer + bp->utf8_buflen, curr, count);
-      bp->utf8_buflen += count;
-
-      if (curr != bp->curr_buffer)
-        free (curr);
-      bp->curr_buflen = 0;
-    }
-}
-
-void
-mixed_string_buffer_append_char (struct mixed_string_buffer *bp, int c)
-{
-  /* Switch from Unicode character mode to multibyte character mode.  */
-  mixed_string_buffer_flush_utf16_surr (bp);
-
-  /* When a newline is seen, convert the accumulated multibyte sequence.
-     This ensures a correct line number in the error message in case of
-     a conversion error.  The "- 1" is to account for the newline.  */
-  if (c == '\n')
-    mixed_string_buffer_flush_curr_buffer (bp, bp->line_number - 1);
-
-  mixed_string_buffer_append_to_curr_buffer (bp, (unsigned char) c);
-}
-
-void
-mixed_string_buffer_append_unicode (struct mixed_string_buffer *bp, int c)
-{
-  /* Switch from multibyte character mode to Unicode character mode.  */
-  mixed_string_buffer_flush_curr_buffer (bp, bp->line_number);
-
-  /* Test whether this character and the previous one form a Unicode
-     surrogate character pair.  */
-  if (bp->utf16_surr != 0 && (c >= 0xdc00 && c < 0xe000))
-    {
-      unsigned short utf16buf[2];
-      ucs4_t uc;
-
-      utf16buf[0] = bp->utf16_surr;
-      utf16buf[1] = c;
-      if (u16_mbtouc (&uc, utf16buf, 2) != 2)
-        abort ();
-
-      mixed_string_buffer_append_to_utf8_buffer (bp, uc);
-      bp->utf16_surr = 0;
-    }
-  else
-    {
-      mixed_string_buffer_flush_utf16_surr (bp);
-
-      if (c >= 0xd800 && c < 0xdc00)
-        bp->utf16_surr = c;
-      else if (c >= 0xdc00 && c < 0xe000)
-        {
-          /* A half surrogate is invalid, therefore use U+FFFD instead.  */
-          mixed_string_buffer_append_to_utf8_buffer (bp, 0xfffd);
-        }
-      else
-        mixed_string_buffer_append_to_utf8_buffer (bp, c);
-    }
-}
-
-char *
-mixed_string_buffer_done (struct mixed_string_buffer *bp)
-{
-  char *utf8_buffer;
-
-  /* Flush all into bp->utf8_buffer.  */
-  mixed_string_buffer_flush_utf16_surr (bp);
-  mixed_string_buffer_flush_curr_buffer (bp, bp->line_number);
-  /* NUL-terminate it.  */
-  mixed_string_buffer_grow_utf8_buffer (bp, 1);
-  bp->utf8_buffer[bp->utf8_buflen] = '\0';
-
-  /* Free curr_buffer and bp itself.  */
-  utf8_buffer = bp->utf8_buffer;
-  free (bp->curr_buffer);
-  free (bp);
-
-  /* Return it.  */
-  return utf8_buffer;
-}
-
-
 static message_ty *
 construct_header ()
 {
@@ -3401,7 +2999,6 @@
   char *timestring;
   message_ty *mp;
   char *msgstr;
-  char *comment;
   static lex_pos_ty pos = { __FILE__, __LINE__ };
 
   if (package_name != NULL)
@@ -3418,7 +3015,7 @@
     multiline_warning (xasprintf (_("warning: ")),
                        xstrdup (_("\
 The option --msgid-bugs-address was not specified.\n\
-If you are using a 'Makevars' file, please specify\n\
+If you are using a `Makevars' file, please specify\n\
 the MSGID_BUGS_ADDRESS variable there; otherwise please\n\
 specify an --msgid-bugs-address command line option.\n\
 ")));
@@ -3445,20 +3042,18 @@
 
   mp = message_alloc (NULL, "", NULL, msgstr, strlen (msgstr) + 1, &pos);
 
-  if (copyright_holder[0] != '\0')
-    comment = xasprintf ("\
+  message_comment_append (mp,
+                          copyright_holder[0] != '\0'
+                          ? xasprintf ("\
 SOME DESCRIPTIVE TITLE.\n\
 Copyright (C) YEAR %s\n\
 This file is distributed under the same license as the PACKAGE package.\n\
 FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n",
-                         copyright_holder);
-  else
-    comment = xstrdup ("\
+                                       copyright_holder)
+                          : "\
 SOME DESCRIPTIVE TITLE.\n\
 This file is put in the public domain.\n\
 FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n");
-  message_comment_append (mp, comment);
-  free (comment);
 
   mp->is_fuzzy = true;
 
@@ -3561,7 +3156,6 @@
     flag_context_list_table_ty *flag_table;
     struct formatstring_parser *formatstring_parser1;
     struct formatstring_parser *formatstring_parser2;
-    struct literalstring_parser *literalstring_parser;
   };
   typedef struct table_ty table_ty;
 
@@ -3587,11 +3181,6 @@
     SCANNERS_STRINGTABLE
     SCANNERS_RST
     SCANNERS_GLADE
-    SCANNERS_LUA
-    SCANNERS_JAVASCRIPT
-    SCANNERS_VALA
-    SCANNERS_GSETTINGS
-    SCANNERS_DESKTOP
     /* Here may follow more languages and their scanners: pike, etc...
        Make sure new scanners honor the --exclude-file option.  */
   };
@@ -3608,7 +3197,6 @@
         result.formatstring_parser1 = tp->formatstring_parser1;
         result.formatstring_parser2 = tp->formatstring_parser2;
         result.formatstring_parser3 = NULL;
-        result.literalstring_parser = tp->literalstring_parser;
 
         /* Handle --qt.  It's preferrable to handle this facility here rather
            than through an option --language=C++/Qt because the latter would
@@ -3635,7 +3223,7 @@
         return result;
       }
 
-  error (EXIT_FAILURE, 0, _("language '%s' unknown"), name);
+  error (EXIT_FAILURE, 0, _("language `%s' unknown"), name);
   /* NOTREACHED */
   {
     extractor_ty result = { NULL, NULL, NULL, NULL };
@@ -3676,11 +3264,6 @@
     EXTENSIONS_STRINGTABLE
     EXTENSIONS_RST
     EXTENSIONS_GLADE
-    EXTENSIONS_LUA
-    EXTENSIONS_JAVASCRIPT
-    EXTENSIONS_VALA
-    EXTENSIONS_GSETTINGS
-    EXTENSIONS_DESKTOP
     /* Here may follow more file extensions... */
   };
 
diff -Nru gettext-0.19.3/gettext-tools/src/xgettext.h gettext-0.18.1.1/gettext-tools/src/xgettext.h
--- gettext-0.19.3/gettext-tools/src/xgettext.h	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/xgettext.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext common functions.
-   Copyright (C) 2001-2003, 2005-2006, 2008-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
    Written by Peter Miller <millerp@canb.auug.org.au>
    and Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -144,12 +144,7 @@
   {
     lc_outside, /* Initial context: outside of comments and strings.  */
     lc_comment, /* Inside a comment.  */
-    lc_string,  /* Inside a string literal.  */
-
-    /* For embedded XML in programming code, like E4X in JavaScript.  */
-    lc_xml_open_tag,   /* Inside an opening tag of an XML element.  */
-    lc_xml_close_tag,  /* Inside a closing tag of an XML element.  */
-    lc_xml_content     /* Inside an XML text node.  */
+    lc_string   /* Inside a string literal.  */
   }
   lexical_context_ty;
 
@@ -242,25 +237,6 @@
 extern void savable_comment_add (const char *str);
 extern void savable_comment_reset (void);
 
-/* Convert character encoding of COMMENT according to the current
-   source encoding.  Returns a new refcounted_string_list_ty.  */
-extern refcounted_string_list_ty *
-       savable_comment_convert_encoding (refcounted_string_list_ty *comment,
-                                         lex_pos_ty *pos);
-
-
-enum literalstring_escape_type
-{
-  LET_NONE = 0,
-  LET_ANSI_C = 1 << 0,
-  LET_UNICODE = 1 << 1
-};
-
-struct literalstring_parser
-{
-  char * (*parse) (const char *string, lex_pos_ty *pos,
-                   enum literalstring_escape_type type);
-};
 
 /* Add a message to the list of extracted messages.
    msgctxt must be either NULL or a malloc()ed string; its ownership is passed
@@ -271,8 +247,7 @@
    or NULL.
    COMMENT may be savable_comment, or it may be a saved copy of savable_comment
    (then add_reference must be used when saving it, and drop_reference while
-   dropping it).  Clear savable_comment.
-   Return the new or found message, or NULL if the message is excluded.  */
+   dropping it).  Clear savable_comment.  */
 extern message_ty *remember_a_message (message_list_ty *mlp,
                                        char *msgctxt,
                                        char *msgid,
@@ -294,6 +269,7 @@
                                        lex_pos_ty *pos,
                                        refcounted_string_list_ty *comment);
 
+
 /* Represents the progressive parsing of an argument list w.r.t. a single
    'struct callshape'.  */
 struct partial_call
@@ -306,15 +282,12 @@
   int argtotal;                 /* total number of arguments, 0 if unspecified */
   string_list_ty xcomments;     /* auto-extracted comments */
   char *msgctxt;                /* context - owned string, or NULL */
-  enum literalstring_escape_type msgctxt_escape;
   lex_pos_ty msgctxt_pos;
   char *msgid;                  /* msgid - owned string, or NULL */
-  enum literalstring_escape_type msgid_escape;
   flag_context_ty msgid_context;
   lex_pos_ty msgid_pos;
   refcounted_string_list_ty *msgid_comment;
   char *msgid_plural;           /* msgid_plural - owned string, or NULL */
-  enum literalstring_escape_type msgid_plural_escape;
   flag_context_ty msgid_plural_context;
   lex_pos_ty msgid_plural_pos;
 };
@@ -347,19 +320,6 @@
                                      flag_context_ty context,
                                      char *file_name, size_t line_number,
                                      refcounted_string_list_ty *comment);
-/* Adds an uninterpreted string argument to an arglist_parser.  ARGNUM
-   must be > 0.
-   STRING is must be malloc()ed string; its ownership is passed to the callee.
-   FILE_NAME must be allocated with indefinite extent.
-   COMMENT may be savable_comment, or it may be a saved copy of savable_comment
-   (then add_reference must be used when saving it, and drop_reference while
-   dropping it).  Clear savable_comment.  */
-extern void arglist_parser_remember_literal (struct arglist_parser *ap,
-                                             int argnum, char *string,
-                                             flag_context_ty context,
-                                             char *file_name, size_t line_number,
-                                             refcounted_string_list_ty *comment,
-                                             enum literalstring_escape_type type);
 /* Tests whether an arglist_parser has is not waiting for more arguments after
    argument ARGNUM.  */
 extern bool arglist_parser_decidedp (struct arglist_parser *ap, int argnum);
@@ -368,46 +328,6 @@
 extern void arglist_parser_done (struct arglist_parser *ap, int argnum);
 
 
-/* A string buffer type that allows appending bytes (in the
-   xgettext_current_source_encoding) or Unicode characters.
-   Returns the entire string in UTF-8 encoding.  */
-
-struct mixed_string_buffer
-{
-  /* The part of the string that has already been converted to UTF-8.  */
-  char *utf8_buffer;
-  size_t utf8_buflen;
-  size_t utf8_allocated;
-  /* The first half of an UTF-16 surrogate character.  */
-  unsigned short utf16_surr;
-  /* The part of the string that is still in the source encoding.  */
-  char *curr_buffer;
-  size_t curr_buflen;
-  size_t curr_allocated;
-  /* The lexical context.  Used only for error message purposes.  */
-  lexical_context_ty lcontext;
-  const char *logical_file_name;
-  int line_number;
-};
-
-/* Creates a fresh mixed_string_buffer.  */
-extern struct mixed_string_buffer *
-       mixed_string_buffer_alloc (lexical_context_ty lcontext,
-                                  const char *logical_file_name,
-                                  int line_number);
-
-/* Appends a character to a mixed_string_buffer.  */
-extern void mixed_string_buffer_append_char (struct mixed_string_buffer *bp,
-                                             int c);
-
-/* Appends a Unicode character to a mixed_string_buffer.  */
-extern void mixed_string_buffer_append_unicode (struct mixed_string_buffer *bp,
-                                                int c);
-
-/* Frees mixed_string_buffer and returns the accumulated string in UTF-8.  */
-extern char * mixed_string_buffer_done (struct mixed_string_buffer *bp);
-
-
 #ifdef __cplusplus
 }
 #endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-glade.c gettext-0.18.1.1/gettext-tools/src/x-glade.c
--- gettext-0.19.3/gettext-tools/src/x-glade.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-glade.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext glade backend.
-   Copyright (C) 2002-2003, 2005-2009, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2009 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -29,6 +29,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if DYNLOAD_LIBEXPAT
+# include <dlfcn.h>
+#else
+# if HAVE_LIBEXPAT
+#  include <expat.h>
+# endif
+#endif
 
 #include "message.h"
 #include "xgettext.h"
@@ -41,22 +48,12 @@
 #include "hash.h"
 #include "po-charset.h"
 #include "gettext.h"
-#include "libexpat-compat.h"
 
 #define _(s) gettext(s)
 
 
-/* Glade is an XML based format with three variants.  The syntax for
-   each format is defined as follows.
-
-   - Glade 1
-     Some example files are contained in libglade-0.16.
-
-   - Glade 2
-     See http://library.gnome.org/devel/libglade/unstable/libglade-dtd.html
-
-   - GtkBuilder
-     See https://developer.gnome.org/gtk3/stable/GtkBuilder.html#BUILDER-UI  */
+/* glade is an XML based format.  Some example files are contained in
+   libglade-0.16.  */
 
 
 /* ====================== Keyword set customization.  ====================== */
@@ -64,9 +61,6 @@
 /* If true extract all strings.  */
 static bool extract_all = false;
 
-/* The keywords correspond to the translatable elements in Glade 1.
-   For Glade 2 and GtkBuilder, translatable content is determined by
-   the translatable="..." attribute, thus those keywords are not used.  */
 static hash_table keywords;
 static bool default_keywords = true;
 
@@ -114,6 +108,266 @@
 }
 
 
+/* ======================= Different libexpat ABIs.  ======================= */
+
+/* There are three different ABIs of libexpat, regarding the functions
+   XML_GetCurrentLineNumber and XML_GetCurrentColumnNumber.
+   In expat < 2.0, they return an 'int'.
+   In expat >= 2.0, they return
+     - a 'long' if expat was compiled with the default flags, or
+     - a 'long long' if expat was compiled with -DXML_LARGE_SIZE.
+   But the <expat.h> include file does not contain the information whether
+   expat was compiled with -DXML_LARGE_SIZE; so the include file is lying!
+   For this information, we need to call XML_GetFeatureList(), for
+   expat >= 2.0.1; for expat = 2.0.0, we have to assume the default flags.  */
+
+#if !DYNLOAD_LIBEXPAT
+
+# if XML_MAJOR_VERSION >= 2
+
+/* expat >= 2.0 -> Return type is 'int64_t' worst-case.  */
+
+/* Put the function pointers into variables, because some GCC 4 versions
+   generate an abort when we convert symbol address to different function
+   pointer types.  */
+static void *p_XML_GetCurrentLineNumber = (void *) &XML_GetCurrentLineNumber;
+static void *p_XML_GetCurrentColumnNumber = (void *) &XML_GetCurrentColumnNumber;
+
+/* Return true if libexpat was compiled with -DXML_LARGE_SIZE.  */
+static bool
+is_XML_LARGE_SIZE_ABI (void)
+{
+  static bool tested;
+  static bool is_large;
+
+  if (!tested)
+    {
+      const XML_Feature *features;
+
+      is_large = false;
+      for (features = XML_GetFeatureList (); features->name != NULL; features++)
+        if (strcmp (features->name, "XML_LARGE_SIZE") == 0)
+          {
+            is_large = true;
+            break;
+          }
+
+      tested = true;
+    }
+  return is_large;
+}
+
+static int64_t
+GetCurrentLineNumber (XML_Parser parser)
+{
+  if (is_XML_LARGE_SIZE_ABI ())
+    return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
+  else
+    return ((long (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
+}
+#  define XML_GetCurrentLineNumber GetCurrentLineNumber
+
+static int64_t
+GetCurrentColumnNumber (XML_Parser parser)
+{
+  if (is_XML_LARGE_SIZE_ABI ())
+    return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
+  else
+    return ((long (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
+}
+#  define XML_GetCurrentColumnNumber GetCurrentColumnNumber
+
+# else
+
+/* expat < 2.0 -> Return type is 'int'.  */
+
+# endif
+
+#endif
+
+
+/* ===================== Dynamic loading of libexpat.  ===================== */
+
+#if DYNLOAD_LIBEXPAT
+
+typedef struct
+  {
+    int major;
+    int minor;
+    int micro;
+  }
+  XML_Expat_Version;
+enum XML_FeatureEnum { XML_FEATURE_END = 0 };
+typedef struct
+  {
+    enum XML_FeatureEnum feature;
+    const char *name;
+    long int value;
+  }
+  XML_Feature;
+typedef void *XML_Parser;
+typedef char XML_Char;
+typedef char XML_LChar;
+enum XML_Error { XML_ERROR_NONE };
+typedef void (*XML_StartElementHandler) (void *userData, const XML_Char *name, const XML_Char **atts);
+typedef void (*XML_EndElementHandler) (void *userData, const XML_Char *name);
+typedef void (*XML_CharacterDataHandler) (void *userData, const XML_Char *s, int len);
+typedef void (*XML_CommentHandler) (void *userData, const XML_Char *data);
+
+static XML_Expat_Version (*p_XML_ExpatVersionInfo) (void);
+static const XML_Feature * (*p_XML_GetFeatureList) (void);
+static XML_Parser (*p_XML_ParserCreate) (const XML_Char *encoding);
+static void (*p_XML_SetElementHandler) (XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end);
+static void (*p_XML_SetCharacterDataHandler) (XML_Parser parser, XML_CharacterDataHandler handler);
+static void (*p_XML_SetCommentHandler) (XML_Parser parser, XML_CommentHandler handler);
+static int (*p_XML_Parse) (XML_Parser parser, const char *s, int len, int isFinal);
+static enum XML_Error (*p_XML_GetErrorCode) (XML_Parser parser);
+static void *p_XML_GetCurrentLineNumber;
+static void *p_XML_GetCurrentColumnNumber;
+static void (*p_XML_ParserFree) (XML_Parser parser);
+static const XML_LChar * (*p_XML_ErrorString) (int code);
+
+#define XML_ExpatVersionInfo (*p_XML_ExpatVersionInfo)
+#define XML_GetFeatureList (*p_XML_GetFeatureList)
+
+enum XML_Size_ABI { is_int, is_long, is_int64_t };
+
+static enum XML_Size_ABI
+get_XML_Size_ABI (void)
+{
+  static bool tested;
+  static enum XML_Size_ABI abi;
+
+  if (!tested)
+    {
+      if (XML_ExpatVersionInfo () .major >= 2)
+        /* expat >= 2.0 -> XML_Size is 'int64_t' or 'long'.  */
+        {
+          const XML_Feature *features;
+
+          abi = is_long;
+          for (features = XML_GetFeatureList ();
+               features->name != NULL;
+               features++)
+            if (strcmp (features->name, "XML_LARGE_SIZE") == 0)
+              {
+                abi = is_int64_t;
+                break;
+              }
+        }
+      else
+        /* expat < 2.0 -> XML_Size is 'int'.  */
+        abi = is_int;
+      tested = true;
+    }
+  return abi;
+}
+
+#define XML_ParserCreate (*p_XML_ParserCreate)
+#define XML_SetElementHandler (*p_XML_SetElementHandler)
+#define XML_SetCharacterDataHandler (*p_XML_SetCharacterDataHandler)
+#define XML_SetCommentHandler (*p_XML_SetCommentHandler)
+#define XML_Parse (*p_XML_Parse)
+#define XML_GetErrorCode (*p_XML_GetErrorCode)
+
+static int64_t
+XML_GetCurrentLineNumber (XML_Parser parser)
+{
+  switch (get_XML_Size_ABI ())
+    {
+    case is_int:
+      return ((int (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
+    case is_long:
+      return ((long (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
+    case is_int64_t:
+      return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentLineNumber) (parser);
+    default:
+      abort ();
+    }
+}
+
+static int64_t
+XML_GetCurrentColumnNumber (XML_Parser parser)
+{
+  switch (get_XML_Size_ABI ())
+    {
+    case is_int:
+      return ((int (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
+    case is_long:
+      return ((long (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
+    case is_int64_t:
+      return ((int64_t (*) (XML_Parser)) p_XML_GetCurrentColumnNumber) (parser);
+    default:
+      abort ();
+    }
+}
+
+#define XML_ParserFree (*p_XML_ParserFree)
+#define XML_ErrorString (*p_XML_ErrorString)
+
+static int libexpat_loaded = 0;
+
+static bool
+load_libexpat ()
+{
+  if (libexpat_loaded == 0)
+    {
+      void *handle;
+
+      /* Try to load libexpat-2.x.  */
+      handle = dlopen ("libexpat.so.1", RTLD_LAZY);
+      if (handle == NULL)
+        /* Try to load libexpat-1.x.  */
+        handle = dlopen ("libexpat.so.0", RTLD_LAZY);
+      if (handle != NULL
+          && (p_XML_ExpatVersionInfo =
+                (XML_Expat_Version (*) (void))
+                dlsym (handle, "XML_ExpatVersionInfo")) != NULL
+          && (p_XML_GetFeatureList =
+                (const XML_Feature * (*) (void))
+                dlsym (handle, "XML_GetFeatureList")) != NULL
+          && (p_XML_ParserCreate =
+                (XML_Parser (*) (const XML_Char *))
+                dlsym (handle, "XML_ParserCreate")) != NULL
+          && (p_XML_SetElementHandler =
+                (void (*) (XML_Parser, XML_StartElementHandler, XML_EndElementHandler))
+                dlsym (handle, "XML_SetElementHandler")) != NULL
+          && (p_XML_SetCharacterDataHandler =
+                (void (*) (XML_Parser, XML_CharacterDataHandler))
+                dlsym (handle, "XML_SetCharacterDataHandler")) != NULL
+          && (p_XML_SetCommentHandler =
+                (void (*) (XML_Parser, XML_CommentHandler))
+                dlsym (handle, "XML_SetCommentHandler")) != NULL
+          && (p_XML_Parse =
+                (int (*) (XML_Parser, const char *, int, int))
+                dlsym (handle, "XML_Parse")) != NULL
+          && (p_XML_GetErrorCode =
+                (enum XML_Error (*) (XML_Parser))
+                dlsym (handle, "XML_GetErrorCode")) != NULL
+          && (p_XML_GetCurrentLineNumber =
+                dlsym (handle, "XML_GetCurrentLineNumber")) != NULL
+          && (p_XML_GetCurrentColumnNumber =
+                dlsym (handle, "XML_GetCurrentColumnNumber")) != NULL
+          && (p_XML_ParserFree =
+                (void (*) (XML_Parser))
+                dlsym (handle, "XML_ParserFree")) != NULL
+          && (p_XML_ErrorString =
+                (const XML_LChar * (*) (int))
+                dlsym (handle, "XML_ErrorString")) != NULL)
+        libexpat_loaded = 1;
+      else
+        libexpat_loaded = -1;
+    }
+  return libexpat_loaded >= 0;
+}
+
+#define LIBEXPAT_AVAILABLE() (load_libexpat ())
+
+#elif HAVE_LIBEXPAT
+
+#define LIBEXPAT_AVAILABLE() true
+
+#endif
 
 /* ============================= XML parsing.  ============================= */
 
@@ -131,9 +385,7 @@
 struct element_state
 {
   bool extract_string;
-  bool extract_context;         /* used by Glade 2 */
-  char *extracted_comment;      /* used by Glade 2 or GtkBuilder */
-  char *extracted_context;      /* used by GtkBuilder */
+  char *extracted_comment;
   int lineno;
   char *buffer;
   size_t bufmax;
@@ -159,72 +411,38 @@
 
 static size_t stack_depth;
 
-/* Parser logic for each Glade compatible file format.  */
-struct element_parser
-{
-  void (*start_element) (struct element_state *p, const char *name,
-                         const char **attributes);
-  void (*end_element) (struct element_state *p, const char *name);
-};
-static struct element_parser *element_parser;
-
+/* Callback called when <element> is seen.  */
 static void
-start_element_null (struct element_state *p, const char *name,
-                    const char **attributes)
+start_element_handler (void *userData, const char *name,
+                       const char **attributes)
 {
-}
+  struct element_state *p;
+  void *hash_result;
 
-static void
-end_element_null (struct element_state *p, const char *name)
-{
-}
+  /* Increase stack depth.  */
+  stack_depth++;
+  ensure_stack_size (stack_depth + 1);
 
-static void
-start_element_glade1 (struct element_state *p, const char *name,
-                      const char **attributes)
-{
-  void *hash_result;
+  /* Don't extract a string for the containing element.  */
+  stack[stack_depth - 1].extract_string = false;
 
-  /* In Glade 1, a few specific elements are translatable without
-     --extract-all option.  */
+  p = &stack[stack_depth];
   p->extract_string = extract_all;
+  p->extracted_comment = NULL;
+  /* In Glade 1, a few specific elements are translatable.  */
   if (!p->extract_string)
     p->extract_string =
       (hash_find_entry (&keywords, name, strlen (name), &hash_result) == 0);
-}
-
-static void
-end_element_glade1 (struct element_state *p, const char *name)
-{
-  lex_pos_ty pos;
-
-  pos.file_name = logical_file_name;
-  pos.line_number = p->lineno;
-
-  if (p->buffer != NULL)
-    {
-      remember_a_message (mlp, NULL, p->buffer,
-                          null_context, &pos,
-                          p->extracted_comment, savable_comment);
-      p->buffer = NULL;
-    }
-}
-
-static void
-start_element_glade2 (struct element_state *p, const char *name,
-                      const char **attributes)
-{
   /* In Glade 2, all <property> and <atkproperty> elements are translatable
      that have the attribute translatable="yes".
      See <http://library.gnome.org/devel/libglade/unstable/libglade-dtd.html>.
      The translator comment is found in the attribute comments="...".
      See <http://live.gnome.org/TranslationProject/DevGuidelines/Use comments>.
-     If the element has the attribute context="yes", the content of
-     the element is in the form "msgctxt|msgid".  */
-  if (strcmp (name, "property") == 0 || strcmp (name, "atkproperty") == 0)
+   */
+  if (!p->extract_string
+      && (strcmp (name, "property") == 0 || strcmp (name, "atkproperty") == 0))
     {
       bool has_translatable = false;
-      bool has_context = false;
       const char *extracted_comment = NULL;
       const char **attp = attributes;
       while (*attp != NULL)
@@ -233,21 +451,16 @@
             has_translatable = (strcmp (attp[1], "yes") == 0);
           else if (strcmp (attp[0], "comments") == 0)
             extracted_comment = attp[1];
-          else if (strcmp (attp[0], "context") == 0)
-            has_context = (strcmp (attp[1], "yes") == 0);
           attp += 2;
         }
       p->extract_string = has_translatable;
-      p->extract_context = has_context;
       p->extracted_comment =
         (has_translatable && extracted_comment != NULL
          ? xstrdup (extracted_comment)
          : NULL);
     }
-
-  /* In Glade 2, the attribute description="..." of <atkaction>
-     element is also translatable.  */
-  if (strcmp (name, "atkaction") == 0)
+  if (!p->extract_string
+      && strcmp (name, "atkaction") == 0)
     {
       const char **attp = attributes;
       while (*attp != NULL)
@@ -270,172 +483,6 @@
           attp += 2;
         }
     }
-}
-
-static void
-end_element_glade2 (struct element_state *p, const char *name)
-{
-  lex_pos_ty pos;
-  char *msgid = NULL;
-  char *msgctxt = NULL;
-
-  pos.file_name = logical_file_name;
-  pos.line_number = p->lineno;
-
-  if (p->extract_context)
-    {
-      char *separator = strchr (p->buffer, '|');
-
-      if (separator == NULL)
-        {
-          error_with_progname = false;
-          error_at_line (0, 0,
-                         pos.file_name,
-                         pos.line_number,
-                         _("\
-Missing context for the string extracted from '%s' element"),
-                         name);
-          error_with_progname = true;
-        }
-      else
-        {
-          *separator = '\0';
-          msgid = xstrdup (separator + 1);
-          msgctxt = xstrdup (p->buffer);
-        }
-    }
-  else
-    {
-      msgid = p->buffer;
-      p->buffer = NULL;
-    }
-
-  if (msgid != NULL)
-    remember_a_message (mlp, msgctxt, msgid,
-                        null_context, &pos,
-                        p->extracted_comment, savable_comment);
-}
-
-static void
-start_element_gtkbuilder (struct element_state *p, const char *name,
-                          const char **attributes)
-{
-  /* In GtkBuilder (used by Glade 3), all elements are translatable
-     that have the attribute translatable="yes".
-     See <https://developer.gnome.org/gtk3/stable/GtkBuilder.html#BUILDER-UI>.
-     The translator comment is found in the attribute comments="..."
-     and context is found in the attribute context="...".  */
-  bool has_translatable = false;
-  const char *extracted_comment = NULL;
-  const char *extracted_context = NULL;
-  const char **attp = attributes;
-  while (*attp != NULL)
-    {
-      if (strcmp (attp[0], "translatable") == 0)
-        has_translatable = (strcmp (attp[1], "yes") == 0);
-      else if (strcmp (attp[0], "comments") == 0)
-        extracted_comment = attp[1];
-      else if (strcmp (attp[0], "context") == 0)
-        extracted_context = attp[1];
-      attp += 2;
-    }
-  p->extract_string = has_translatable;
-  p->extracted_comment =
-    (has_translatable && extracted_comment != NULL
-     ? xstrdup (extracted_comment)
-     : NULL);
-  p->extracted_context =
-    (has_translatable && extracted_context != NULL
-     ? xstrdup (extracted_context)
-     : NULL);
-}
-
-static void
-end_element_gtkbuilder (struct element_state *p, const char *name)
-{
-  lex_pos_ty pos;
-
-  pos.file_name = logical_file_name;
-  pos.line_number = p->lineno;
-
-  if (p->buffer != NULL)
-    {
-      remember_a_message (mlp, p->extracted_context, p->buffer,
-                          null_context, &pos,
-                          p->extracted_comment, savable_comment);
-      p->buffer = NULL;
-      p->extracted_context = NULL;
-    }
-}
-
-static struct element_parser element_parser_null =
-{
-  start_element_null,
-  end_element_null
-};
-
-static struct element_parser element_parser_glade1 =
-{
-  start_element_glade1,
-  end_element_glade1
-};
-
-static struct element_parser element_parser_glade2 =
-{
-  start_element_glade2,
-  end_element_glade2
-};
-
-static struct element_parser element_parser_gtkbuilder =
-{
-  start_element_gtkbuilder,
-  end_element_gtkbuilder
-};
-
-/* Callback called when <element> is seen.  */
-static void
-start_element_handler (void *userData, const char *name,
-                       const char **attributes)
-{
-  struct element_state *p;
-
-  if (!stack_depth)
-    {
-      if (strcmp (name, "GTK-Interface") == 0)
-        element_parser = &element_parser_glade1;
-      else if (strcmp (name, "glade-interface") == 0)
-        element_parser = &element_parser_glade2;
-      else if (strcmp (name, "interface") == 0)
-        element_parser = &element_parser_gtkbuilder;
-      else
-        {
-          element_parser = &element_parser_null;
-          error_with_progname = false;
-          error_at_line (0, 0,
-                         logical_file_name,
-                         XML_GetCurrentLineNumber (parser),
-                         _("\
-The root element <%s> is not allowed in a valid Glade file"),
-                         name);
-          error_with_progname = true;
-        }
-    }
-
-  /* Increase stack depth.  */
-  stack_depth++;
-  ensure_stack_size (stack_depth + 1);
-
-  /* Don't extract a string for the containing element.  */
-  stack[stack_depth - 1].extract_string = false;
-
-  p = &stack[stack_depth];
-  p->extract_string = false;
-  p->extract_context = false;
-  p->extracted_comment = NULL;
-  p->extracted_context = NULL;
-
-  element_parser->start_element (p, name, attributes);
-
   p->lineno = XML_GetCurrentLineNumber (parser);
   p->buffer = NULL;
   p->bufmax = 0;
@@ -456,19 +503,24 @@
       /* Don't extract the empty string.  */
       if (p->buflen > 0)
         {
+          lex_pos_ty pos;
+
           if (p->buflen == p->bufmax)
             p->buffer = (char *) xrealloc (p->buffer, p->buflen + 1);
           p->buffer[p->buflen] = '\0';
 
-          element_parser->end_element (p, name);
+          pos.file_name = logical_file_name;
+          pos.line_number = p->lineno;
+
+          remember_a_message (mlp, NULL, p->buffer, null_context, &pos,
+                              p->extracted_comment, savable_comment);
+          p->buffer = NULL;
         }
     }
 
   /* Free memory for this stack level.  */
   if (p->extracted_comment != NULL)
     free (p->extracted_comment);
-  if (p->extracted_context != NULL)
-    free (p->extracted_context);
   if (p->buffer != NULL)
     free (p->buffer);
 
@@ -552,7 +604,6 @@
   XML_SetCommentHandler (parser, comment_handler);
 
   stack_depth = 0;
-  element_parser = &element_parser_null;
 
   while (!feof (fp))
     {
diff -Nru gettext-0.19.3/gettext-tools/src/x-glade.h gettext-0.18.1.1/gettext-tools/src/x-glade.h
--- gettext-0.19.3/gettext-tools/src/x-glade.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-glade.h	2010-06-06 12:49:58.000000000 +0000
@@ -30,10 +30,9 @@
 #define EXTENSIONS_GLADE \
   { "glade",     "glade"    },                                          \
   { "glade2",    "glade"    },                                          \
-  { "ui",        "glade"    },                                          \
 
 #define SCANNERS_GLADE \
-  { "glade",            extract_glade, NULL, NULL, NULL, NULL },              \
+  { "glade",            extract_glade, NULL, NULL, NULL },              \
 
 /* Scan a glade XML file and add its translatable strings to mdlp.  */
 extern void extract_glade (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-gsettings.c gettext-0.18.1.1/gettext-tools/src/x-gsettings.c
--- gettext-0.19.3/gettext-tools/src/x-gsettings.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-gsettings.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,386 +0,0 @@
-/* xgettext GSettings schema file backend.
-   Copyright (C) 2002-2003, 2005-2009, 2013 Free Software Foundation, Inc.
-
-   This file was written by Daiki Ueno <ueno@gnu.org>, 2013.
-
-   This 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 "x-gsettings.h"
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "message.h"
-#include "xgettext.h"
-#include "error.h"
-#include "xerror.h"
-#include "xvasprintf.h"
-#include "basename.h"
-#include "progname.h"
-#include "xalloc.h"
-#include "hash.h"
-#include "po-charset.h"
-#include "gettext.h"
-#include "libexpat-compat.h"
-
-#define _(s) gettext(s)
-
-
-/* GSettings schema file is an XML based format.
-   The syntax is defined in glib/gio/gschema.dtd and:
-   https://developer.gnome.org/gio/unstable/GSettings.html  */
-
-
-/* ====================== Keyword set customization.  ====================== */
-
-/* If true extract all strings.  */
-static bool extract_all = false;
-
-
-/* ============================= XML parsing.  ============================= */
-
-#if DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT
-
-/* Accumulator for the extracted messages.  */
-static message_list_ty *mlp;
-
-/* Logical filename, used to label the extracted messages.  */
-static char *logical_file_name;
-
-/* XML parser.  */
-static XML_Parser parser;
-
-enum whitespace_type_ty
-{
-  none,
-  normalize,
-  strip
-};
-typedef enum whitespace_type_ty whitespace_type_ty;
-
-struct element_state
-{
-  bool extract_string;
-  whitespace_type_ty whitespace;
-  char *extracted_context;
-  int lineno;
-  char *buffer;
-  size_t bufmax;
-  size_t buflen;
-};
-static struct element_state *stack;
-static size_t stack_size;
-
-static char *
-normalize_whitespace (const char *text, whitespace_type_ty whitespace)
-{
-  if (whitespace == none)
-    return xstrdup (text);
-  else
-    {
-      char *result, *p;
-
-      /* Strip whitespaces at the beginning/end of the text.  */
-      result = xstrdup (text + strspn (text, " \t\n"));
-      for (p = result + strlen (result);
-           p > result && (*p == '\0' || *p == ' ' || *p == '\t' || *p == '\n');
-           p--)
-        ;
-      if (p > result)
-        *++p = '\0';
-
-      /* Normalize whitespaces within the text.  */
-      if (whitespace == normalize)
-        {
-          char *end = result + strlen (result);
-          for (p = result; *p != '\0';)
-            {
-              size_t len = strspn (p, " \t\n");
-              if (len > 0)
-                {
-                  *p = ' ';
-                  memmove (p + 1, p + len, end - (p + len));
-                  end -= len - 1;
-                  *end = '\0';
-                  p++;
-                }
-              p += strcspn (p, " \t\n");
-            }
-        }
-      return result;
-    }
-}
-
-/* Ensures stack_size >= size.  */
-static void
-ensure_stack_size (size_t size)
-{
-  if (size > stack_size)
-    {
-      stack_size = 2 * stack_size;
-      if (stack_size < size)
-        stack_size = size;
-      stack =
-        (struct element_state *)
-        xrealloc (stack, stack_size * sizeof (struct element_state));
-    }
-}
-
-static size_t stack_depth;
-
-/* Callback called when <element> is seen.  */
-static void
-start_element_handler (void *userData, const char *name,
-                       const char **attributes)
-{
-  struct element_state *p;
-
-  /* Increase stack depth.  */
-  stack_depth++;
-  ensure_stack_size (stack_depth + 1);
-
-  /* Don't extract a string for the containing element.  */
-  stack[stack_depth - 1].extract_string = false;
-
-  p = &stack[stack_depth];
-  p->extract_string = extract_all;
-  p->extracted_context = NULL;
-
-  if (!p->extract_string)
-    {
-      bool has_translatable = false;
-      whitespace_type_ty whitespace = none;
-      const char *extracted_context = NULL;
-      if (strcmp (name, "summary") == 0 || strcmp (name, "description") == 0)
-        {
-          has_translatable = true;
-          whitespace = normalize;
-        }
-      else if (strcmp (name, "default") == 0)
-        {
-          const char *extracted_l10n = NULL;
-          const char **attp = attributes;
-          while (*attp != NULL)
-            {
-              if (strcmp (attp[0], "context") == 0)
-                extracted_context = attp[1];
-              else if (strcmp (attp[0], "l10n") == 0)
-                extracted_l10n = attp[1];
-              attp += 2;
-            }
-          if (extracted_l10n != NULL)
-            {
-              has_translatable = true;
-              whitespace = strip;
-            }
-        }
-      p->extract_string = has_translatable;
-      p->whitespace = whitespace;
-      p->extracted_context =
-        (has_translatable && extracted_context != NULL
-         ? xstrdup (extracted_context)
-         : NULL); 
-   }
-
-  p->lineno = XML_GetCurrentLineNumber (parser);
-  p->buffer = NULL;
-  p->bufmax = 0;
-  p->buflen = 0;
-  if (!p->extract_string)
-    savable_comment_reset ();
-}
-
-/* Callback called when </element> is seen.  */
-static void
-end_element_handler (void *userData, const char *name)
-{
-  struct element_state *p = &stack[stack_depth];
-
-  /* Actually extract string.  */
-  if (p->extract_string)
-    {
-      /* Don't extract the empty string.  */
-      if (p->buflen > 0)
-        {
-          lex_pos_ty pos;
-
-          if (p->buflen == p->bufmax)
-            p->buffer = (char *) xrealloc (p->buffer, p->buflen + 1);
-          p->buffer[p->buflen] = '\0';
-
-          pos.file_name = logical_file_name;
-          pos.line_number = p->lineno;
-
-          if (p->buffer != NULL)
-            {
-              remember_a_message (mlp, p->extracted_context,
-                                  normalize_whitespace (p->buffer,
-                                                        p->whitespace),
-                                  null_context, &pos,
-                                  NULL, savable_comment);
-              p->extracted_context = NULL;
-            }
-        }
-    }
-
-  /* Free memory for this stack level.  */
-  if (p->extracted_context != NULL)
-    free (p->extracted_context);
-  if (p->buffer != NULL)
-    free (p->buffer);
-
-  /* Decrease stack depth.  */
-  stack_depth--;
-
-  savable_comment_reset ();
-}
-
-/* Callback called when some text is seen.  */
-static void
-character_data_handler (void *userData, const char *s, int len)
-{
-  struct element_state *p = &stack[stack_depth];
-
-  /* Accumulate character data.  */
-  if (len > 0)
-    {
-      if (p->buflen + len > p->bufmax)
-        {
-          p->bufmax = 2 * p->bufmax;
-          if (p->bufmax < p->buflen + len)
-            p->bufmax = p->buflen + len;
-          p->buffer = (char *) xrealloc (p->buffer, p->bufmax);
-        }
-      memcpy (p->buffer + p->buflen, s, len);
-      p->buflen += len;
-    }
-}
-
-/* Callback called when some comment text is seen.  */
-static void
-comment_handler (void *userData, const char *data)
-{
-  /* Split multiline comment into lines, and remove leading and trailing
-     whitespace.  */
-  char *copy = xstrdup (data);
-  char *p;
-  char *q;
-
-  for (p = copy; (q = strchr (p, '\n')) != NULL; p = q + 1)
-    {
-      while (p[0] == ' ' || p[0] == '\t')
-        p++;
-      while (q > p && (q[-1] == ' ' || q[-1] == '\t'))
-        q--;
-      *q = '\0';
-      savable_comment_add (p);
-    }
-  q = p + strlen (p);
-  while (p[0] == ' ' || p[0] == '\t')
-    p++;
-  while (q > p && (q[-1] == ' ' || q[-1] == '\t'))
-    q--;
-  *q = '\0';
-  savable_comment_add (p);
-  free (copy);
-}
-
-
-static void
-do_extract_gsettings (FILE *fp,
-                      const char *real_filename, const char *logical_filename,
-                      msgdomain_list_ty *mdlp)
-{
-  mlp = mdlp->item[0]->messages;
-
-  /* expat feeds us strings in UTF-8 encoding.  */
-  xgettext_current_source_encoding = po_charset_utf8;
-
-  logical_file_name = xstrdup (logical_filename);
-
-  parser = XML_ParserCreate (NULL);
-  if (parser == NULL)
-    error (EXIT_FAILURE, 0, _("memory exhausted"));
-
-  XML_SetElementHandler (parser, start_element_handler, end_element_handler);
-  XML_SetCharacterDataHandler (parser, character_data_handler);
-  XML_SetCommentHandler (parser, comment_handler);
-
-  stack_depth = 0;
-
-  while (!feof (fp))
-    {
-      char buf[4096];
-      int count = fread (buf, 1, sizeof buf, fp);
-
-      if (count == 0)
-        {
-          if (ferror (fp))
-            error (EXIT_FAILURE, errno, _("\
-error while reading \"%s\""), real_filename);
-          /* EOF reached.  */
-          break;
-        }
-
-      if (XML_Parse (parser, buf, count, 0) == 0)
-        error (EXIT_FAILURE, 0, _("%s:%lu:%lu: %s"), logical_filename,
-               (unsigned long) XML_GetCurrentLineNumber (parser),
-               (unsigned long) XML_GetCurrentColumnNumber (parser) + 1,
-               XML_ErrorString (XML_GetErrorCode (parser)));
-    }
-
-  if (XML_Parse (parser, NULL, 0, 1) == 0)
-    error (EXIT_FAILURE, 0, _("%s:%lu:%lu: %s"), logical_filename,
-           (unsigned long) XML_GetCurrentLineNumber (parser),
-           (unsigned long) XML_GetCurrentColumnNumber (parser) + 1,
-           XML_ErrorString (XML_GetErrorCode (parser)));
-
-  XML_ParserFree (parser);
-
-  /* Close scanner.  */
-  logical_file_name = NULL;
-  parser = NULL;
-}
-
-#endif
-
-void
-extract_gsettings (FILE *fp,
-                   const char *real_filename, const char *logical_filename,
-                   flag_context_list_table_ty *flag_table,
-                   msgdomain_list_ty *mdlp)
-{
-#if DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT
-  if (LIBEXPAT_AVAILABLE ())
-    do_extract_gsettings (fp, real_filename, logical_filename, mdlp);
-  else
-#endif
-    {
-      multiline_error (xstrdup (""),
-                       xasprintf (_("\
-Language \"gsettings\" is not supported. %s relies on expat.\n\
-This version was built without expat.\n"),
-                                  basename (program_name)));
-      exit (EXIT_FAILURE);
-    }
-}
diff -Nru gettext-0.19.3/gettext-tools/src/x-gsettings.h gettext-0.18.1.1/gettext-tools/src/x-gsettings.h
--- gettext-0.19.3/gettext-tools/src/x-gsettings.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-gsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* xgettext GSettings schema file backend.
-   Copyright (C) 2002-2003, 2006, 2013 Free Software Foundation, Inc.
-   Written by Daiki Ueno <ueno@gnu.org>, 2013.
-
-   This 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 <stdio.h>
-
-#include "message.h"
-#include "xgettext.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define EXTENSIONS_GSETTINGS \
-  { "gschema.xml", "gsettings" }, \
-
-#define SCANNERS_GSETTINGS \
-  { "gsettings", extract_gsettings, NULL, NULL, NULL, NULL }, \
-
-/* Scan a gsettings XML file and add its translatable strings to mdlp.  */
-extern void extract_gsettings (FILE *fp, const char *real_filename,
-                               const char *logical_filename,
-                               flag_context_list_table_ty *flag_table,
-                               msgdomain_list_ty *mdlp);
-
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-java.h gettext-0.18.1.1/gettext-tools/src/x-java.h
--- gettext-0.19.3/gettext-tools/src/x-java.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-java.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_JAVA \
   { "Java",             extract_java,                                   \
-                        &flag_table_java, &formatstring_java, NULL, NULL },   \
+                        &flag_table_java, &formatstring_java, NULL },   \
 
 extern void extract_java (FILE *fp, const char *real_filename,
                           const char *logical_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-javascript.c gettext-0.18.1.1/gettext-tools/src/x-javascript.c
--- gettext-0.19.3/gettext-tools/src/x-javascript.c	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-javascript.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1673 +0,0 @@
-/* xgettext JavaScript backend.
-   Copyright (C) 2002-2003, 2005-2009, 2013 Free Software Foundation, Inc.
-
-   This file was written by Andreas Stricker <andy@knitter.ch>, 2010
-   It's based on x-python from Bruno Haible.
-
-   This 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 "x-javascript.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "message.h"
-#include "xgettext.h"
-#include "error.h"
-#include "error-progname.h"
-#include "progname.h"
-#include "basename.h"
-#include "xerror.h"
-#include "xvasprintf.h"
-#include "xalloc.h"
-#include "c-strstr.h"
-#include "c-ctype.h"
-#include "po-charset.h"
-#include "uniname.h"
-#include "unistr.h"
-#include "gettext.h"
-
-#define _(s) gettext(s)
-
-#define max(a,b) ((a) > (b) ? (a) : (b))
-
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-
-/* The JavaScript aka ECMA-Script syntax is defined in ECMA-262
-   specification:
-   http://www.ecma-international.org/publications/standards/Ecma-262.htm */
-
-/* ====================== Keyword set customization.  ====================== */
-
-/* If true extract all strings.  */
-static bool extract_all = false;
-
-static hash_table keywords;
-static bool default_keywords = true;
-
-
-void
-x_javascript_extract_all ()
-{
-  extract_all = true;
-}
-
-
-void
-x_javascript_keyword (const char *name)
-{
-  if (name == NULL)
-    default_keywords = false;
-  else
-    {
-      const char *end;
-      struct callshape shape;
-      const char *colon;
-
-      if (keywords.table == NULL)
-        hash_init (&keywords, 100);
-
-      split_keywordspec (name, &end, &shape);
-
-      /* The characters between name and end should form a valid C identifier.
-         A colon means an invalid parse in split_keywordspec().  */
-      colon = strchr (name, ':');
-      if (colon == NULL || colon >= end)
-        insert_keyword_callshape (&keywords, name, end - name, &shape);
-    }
-}
-
-/* Finish initializing the keywords hash table.
-   Called after argument processing, before each file is processed.  */
-static void
-init_keywords ()
-{
-  if (default_keywords)
-    {
-      /* When adding new keywords here, also update the documentation in
-         xgettext.texi!  */
-      x_javascript_keyword ("gettext");
-      x_javascript_keyword ("dgettext:2");
-      x_javascript_keyword ("dcgettext:2");
-      x_javascript_keyword ("ngettext:1,2");
-      x_javascript_keyword ("dngettext:2,3");
-      x_javascript_keyword ("pgettext:1c,2");
-      x_javascript_keyword ("dpgettext:2c,3");
-      x_javascript_keyword ("_");
-      default_keywords = false;
-    }
-}
-
-void
-init_flag_table_javascript ()
-{
-  xgettext_record_flag ("gettext:1:pass-javascript-format");
-  xgettext_record_flag ("dgettext:2:pass-javascript-format");
-  xgettext_record_flag ("dcgettext:2:pass-javascript-format");
-  xgettext_record_flag ("ngettext:1:pass-javascript-format");
-  xgettext_record_flag ("ngettext:2:pass-javascript-format");
-  xgettext_record_flag ("dngettext:2:pass-javascript-format");
-  xgettext_record_flag ("dngettext:3:pass-javascript-format");
-  xgettext_record_flag ("pgettext:2:pass-javascript-format");
-  xgettext_record_flag ("dpgettext:3:pass-javascript-format");
-  xgettext_record_flag ("_:1:pass-javascript-format");
-}
-
-
-/* ======================== Reading of characters.  ======================== */
-
-/* Real filename, used in error messages about the input file.  */
-static const char *real_file_name;
-
-/* Logical filename and line number, used to label the extracted messages.  */
-static char *logical_file_name;
-static int line_number;
-
-/* The input file stream.  */
-static FILE *fp;
-
-
-/* 1. line_number handling.  */
-
-/* Maximum used, roughly a safer MB_LEN_MAX.  */
-#define MAX_PHASE1_PUSHBACK 16
-static unsigned char phase1_pushback[MAX_PHASE1_PUSHBACK];
-static int phase1_pushback_length;
-
-/* Read the next single byte from the input file.  */
-static int
-phase1_getc ()
-{
-  int c;
-
-  if (phase1_pushback_length)
-    c = phase1_pushback[--phase1_pushback_length];
-  else
-    {
-      c = getc (fp);
-
-      if (c == EOF)
-        {
-          if (ferror (fp))
-            error (EXIT_FAILURE, errno, _("error while reading \"%s\""),
-                   real_file_name);
-          return EOF;
-        }
-    }
-
-  if (c == '\n')
-    ++line_number;
-
-  return c;
-}
-
-/* Supports MAX_PHASE1_PUSHBACK characters of pushback.  */
-static void
-phase1_ungetc (int c)
-{
-  if (c != EOF)
-    {
-      if (c == '\n')
-        --line_number;
-
-      if (phase1_pushback_length == SIZEOF (phase1_pushback))
-        abort ();
-      phase1_pushback[phase1_pushback_length++] = c;
-    }
-}
-
-
-/* Phase 2: Conversion to Unicode.
-   For now, we expect JavaScript files to be encoded as UTF-8.  */
-
-/* End-of-file indicator for functions returning an UCS-4 character.  */
-#define UEOF -1
-
-static lexical_context_ty lexical_context;
-
-static int phase2_pushback[max (9, UNINAME_MAX + 3)];
-static int phase2_pushback_length;
-
-/* Read the next Unicode UCS-4 character from the input file.  */
-static int
-phase2_getc ()
-{
-  if (phase2_pushback_length)
-    return phase2_pushback[--phase2_pushback_length];
-
-  if (xgettext_current_source_encoding == po_charset_ascii)
-    {
-      int c = phase1_getc ();
-      if (c == EOF)
-        return UEOF;
-      if (!c_isascii (c))
-        {
-          multiline_error (xstrdup (""),
-                           xasprintf ("%s\n%s\n",
-                                      non_ascii_error_message (lexical_context,
-                                                               real_file_name,
-                                                               line_number),
-                                      _("\
-Please specify the source encoding through --from-code\n")));
-          exit (EXIT_FAILURE);
-        }
-      return c;
-    }
-  else if (xgettext_current_source_encoding != po_charset_utf8)
-    {
-#if HAVE_ICONV
-      /* Use iconv on an increasing number of bytes.  Read only as many bytes
-         through phase1_getc as needed.  This is needed to give reasonable
-         interactive behaviour when fp is connected to an interactive tty.  */
-      unsigned char buf[MAX_PHASE1_PUSHBACK];
-      size_t bufcount;
-      int c = phase1_getc ();
-      if (c == EOF)
-        return UEOF;
-      buf[0] = (unsigned char) c;
-      bufcount = 1;
-
-      for (;;)
-        {
-          unsigned char scratchbuf[6];
-          const char *inptr = (const char *) &buf[0];
-          size_t insize = bufcount;
-          char *outptr = (char *) &scratchbuf[0];
-          size_t outsize = sizeof (scratchbuf);
-
-          size_t res = iconv (xgettext_current_source_iconv,
-                              (ICONV_CONST char **) &inptr, &insize,
-                              &outptr, &outsize);
-          /* We expect that a character has been produced if and only if
-             some input bytes have been consumed.  */
-          if ((insize < bufcount) != (outsize < sizeof (scratchbuf)))
-            abort ();
-          if (outsize == sizeof (scratchbuf))
-            {
-              /* No character has been produced.  Must be an error.  */
-              if (res != (size_t)(-1))
-                abort ();
-
-              if (errno == EILSEQ)
-                {
-                  /* An invalid multibyte sequence was encountered.  */
-                  multiline_error (xstrdup (""),
-                                   xasprintf (_("\
-%s:%d: Invalid multibyte sequence.\n\
-Please specify the correct source encoding through --from-code\n"),
-                                   real_file_name, line_number));
-                  exit (EXIT_FAILURE);
-                }
-              else if (errno == EINVAL)
-                {
-                  /* An incomplete multibyte character.  */
-                  int c;
-
-                  if (bufcount == MAX_PHASE1_PUSHBACK)
-                    {
-                      /* An overlong incomplete multibyte sequence was
-                         encountered.  */
-                      multiline_error (xstrdup (""),
-                                       xasprintf (_("\
-%s:%d: Long incomplete multibyte sequence.\n\
-Please specify the correct source encoding through --from-code\n"),
-                                       real_file_name, line_number));
-                      exit (EXIT_FAILURE);
-                    }
-
-                  /* Read one more byte and retry iconv.  */
-                  c = phase1_getc ();
-                  if (c == EOF)
-                    {
-                      multiline_error (xstrdup (""),
-                                       xasprintf (_("\
-%s:%d: Incomplete multibyte sequence at end of file.\n\
-Please specify the correct source encoding through --from-code\n"),
-                                       real_file_name, line_number));
-                      exit (EXIT_FAILURE);
-                    }
-                  if (c == '\n')
-                    {
-                      multiline_error (xstrdup (""),
-                                       xasprintf (_("\
-%s:%d: Incomplete multibyte sequence at end of line.\n\
-Please specify the correct source encoding through --from-code\n"),
-                                       real_file_name, line_number - 1));
-                      exit (EXIT_FAILURE);
-                    }
-                  buf[bufcount++] = (unsigned char) c;
-                }
-              else
-                error (EXIT_FAILURE, errno, _("%s:%d: iconv failure"),
-                       real_file_name, line_number);
-            }
-          else
-            {
-              size_t outbytes = sizeof (scratchbuf) - outsize;
-              size_t bytes = bufcount - insize;
-              ucs4_t uc;
-
-              /* We expect that one character has been produced.  */
-              if (bytes == 0)
-                abort ();
-              if (outbytes == 0)
-                abort ();
-              /* Push back the unused bytes.  */
-              while (insize > 0)
-                phase1_ungetc (buf[--insize]);
-              /* Convert the character from UTF-8 to UCS-4.  */
-              if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes)
-                {
-                  /* scratchbuf contains an out-of-range Unicode character
-                     (> 0x10ffff).  */
-                  multiline_error (xstrdup (""),
-                                   xasprintf (_("\
-%s:%d: Invalid multibyte sequence.\n\
-Please specify the source encoding through --from-code\n"),
-                                   real_file_name, line_number));
-                  exit (EXIT_FAILURE);
-                }
-              return uc;
-            }
-        }
-#else
-      /* If we don't have iconv(), the only supported values for
-         xgettext_global_source_encoding and thus also for
-         xgettext_current_source_encoding are ASCII and UTF-8.  */
-      abort ();
-#endif
-    }
-  else
-    {
-      /* Read an UTF-8 encoded character.  */
-      unsigned char buf[6];
-      unsigned int count;
-      int c;
-      ucs4_t uc;
-
-      c = phase1_getc ();
-      if (c == EOF)
-        return UEOF;
-      buf[0] = c;
-      count = 1;
-
-      if (buf[0] >= 0xc0)
-        {
-          c = phase1_getc ();
-          if (c == EOF)
-            return UEOF;
-          buf[1] = c;
-          count = 2;
-        }
-
-      if (buf[0] >= 0xe0
-          && ((buf[1] ^ 0x80) < 0x40))
-        {
-          c = phase1_getc ();
-          if (c == EOF)
-            return UEOF;
-          buf[2] = c;
-          count = 3;
-        }
-
-      if (buf[0] >= 0xf0
-          && ((buf[1] ^ 0x80) < 0x40)
-          && ((buf[2] ^ 0x80) < 0x40))
-        {
-          c = phase1_getc ();
-          if (c == EOF)
-            return UEOF;
-          buf[3] = c;
-          count = 4;
-        }
-
-      if (buf[0] >= 0xf8
-          && ((buf[1] ^ 0x80) < 0x40)
-          && ((buf[2] ^ 0x80) < 0x40)
-          && ((buf[3] ^ 0x80) < 0x40))
-        {
-          c = phase1_getc ();
-          if (c == EOF)
-            return UEOF;
-          buf[4] = c;
-          count = 5;
-        }
-
-      if (buf[0] >= 0xfc
-          && ((buf[1] ^ 0x80) < 0x40)
-          && ((buf[2] ^ 0x80) < 0x40)
-          && ((buf[3] ^ 0x80) < 0x40)
-          && ((buf[4] ^ 0x80) < 0x40))
-        {
-          c = phase1_getc ();
-          if (c == EOF)
-            return UEOF;
-          buf[5] = c;
-          count = 6;
-        }
-
-      u8_mbtouc (&uc, buf, count);
-      return uc;
-    }
-}
-
-/* Supports max (9, UNINAME_MAX + 3) pushback characters.  */
-static void
-phase2_ungetc (int c)
-{
-  if (c != UEOF)
-    {
-      if (phase2_pushback_length == SIZEOF (phase2_pushback))
-        abort ();
-      phase2_pushback[phase2_pushback_length++] = c;
-    }
-}
-
-
-/* ========================= Accumulating strings.  ======================== */
-
-/* A string buffer type that allows appending Unicode characters.
-   Returns the entire string in UTF-8 encoding.  */
-
-struct unicode_string_buffer
-{
-  /* The part of the string that has already been converted to UTF-8.  */
-  char *utf8_buffer;
-  size_t utf8_buflen;
-  size_t utf8_allocated;
-};
-
-/* Initialize a 'struct unicode_string_buffer' to empty.  */
-static inline void
-init_unicode_string_buffer (struct unicode_string_buffer *bp)
-{
-  bp->utf8_buffer = NULL;
-  bp->utf8_buflen = 0;
-  bp->utf8_allocated = 0;
-}
-
-/* Auxiliary function: Ensure count more bytes are available in bp->utf8.  */
-static inline void
-unicode_string_buffer_append_unicode_grow (struct unicode_string_buffer *bp,
-                                           size_t count)
-{
-  if (bp->utf8_buflen + count > bp->utf8_allocated)
-    {
-      size_t new_allocated = 2 * bp->utf8_allocated + 10;
-      if (new_allocated < bp->utf8_buflen + count)
-        new_allocated = bp->utf8_buflen + count;
-      bp->utf8_allocated = new_allocated;
-      bp->utf8_buffer = xrealloc (bp->utf8_buffer, new_allocated);
-    }
-}
-
-/* Auxiliary function: Append a Unicode character to bp->utf8.
-   uc must be < 0x110000.  */
-static inline void
-unicode_string_buffer_append_unicode (struct unicode_string_buffer *bp,
-                                      unsigned int uc)
-{
-  unsigned char utf8buf[6];
-  int count = u8_uctomb (utf8buf, uc, 6);
-
-  if (count < 0)
-    /* The caller should have ensured that uc is not out-of-range.  */
-    abort ();
-
-  unicode_string_buffer_append_unicode_grow (bp, count);
-  memcpy (bp->utf8_buffer + bp->utf8_buflen, utf8buf, count);
-  bp->utf8_buflen += count;
-}
-
-/* Return the string buffer's contents.  */
-static char *
-unicode_string_buffer_result (struct unicode_string_buffer *bp)
-{
-  /* NUL-terminate it.  */
-  unicode_string_buffer_append_unicode_grow (bp, 1);
-  bp->utf8_buffer[bp->utf8_buflen] = '\0';
-  /* Return it.  */
-  return bp->utf8_buffer;
-}
-
-/* Free the memory pointed to by a 'struct unicode_string_buffer'.  */
-static inline void
-free_unicode_string_buffer (struct unicode_string_buffer *bp)
-{
-  free (bp->utf8_buffer);
-}
-
-
-/* ======================== Accumulating comments.  ======================== */
-
-
-/* Accumulating a single comment line.  */
-
-static struct unicode_string_buffer comment_buffer;
-
-static inline void
-comment_start ()
-{
-  lexical_context = lc_comment;
-  comment_buffer.utf8_buflen = 0;
-}
-
-static inline bool
-comment_at_start ()
-{
-  return (comment_buffer.utf8_buflen == 0);
-}
-
-static inline void
-comment_add (int c)
-{
-  unicode_string_buffer_append_unicode (&comment_buffer, c);
-}
-
-static inline const char *
-comment_line_end (size_t chars_to_remove)
-{
-  char *buffer = unicode_string_buffer_result (&comment_buffer);
-  size_t buflen = strlen (buffer) - chars_to_remove;
-
-  while (buflen >= 1
-         && (buffer[buflen - 1] == ' ' || buffer[buflen - 1] == '\t'))
-    --buflen;
-  buffer[buflen] = '\0';
-  savable_comment_add (buffer);
-  lexical_context = lc_outside;
-  return buffer;
-}
-
-
-/* These are for tracking whether comments count as immediately before
-   keyword.  */
-static int last_comment_line;
-static int last_non_comment_line;
-
-
-/* ======================== Recognizing comments.  ======================== */
-
-
-/* Canonicalized encoding name for the current input file.  */
-static const char *xgettext_current_file_source_encoding;
-
-#if HAVE_ICONV
-/* Converter from xgettext_current_file_source_encoding to UTF-8 (except from
-   ASCII or UTF-8, when this conversion is a no-op).  */
-static iconv_t xgettext_current_file_source_iconv;
-#endif
-
-/* Tracking whether the current line is a continuation line or contains a
-   non-blank character.  */
-static bool continuation_or_nonblank_line = false;
-
-
-/* Phase 3: Outside strings, replace backslash-newline with nothing and a
-   comment with nothing.  */
-
-static int
-phase3_getc ()
-{
-  int c;
-
-  for (;;)
-    {
-      c = phase2_getc ();
-      if (c == '\\')
-        {
-          c = phase2_getc ();
-          if (c != '\n')
-            {
-              phase2_ungetc (c);
-              /* This shouldn't happen usually, because "A backslash is
-                 illegal elsewhere on a line outside a string literal."  */
-              return '\\';
-            }
-          /* Eat backslash-newline.  */
-          continuation_or_nonblank_line = true;
-        }
-      else if (c == '/')
-        {
-          c = phase2_getc ();
-          if (c == '/')
-            {
-              /* C++ style comment.  */
-              last_comment_line = line_number;
-              comment_start ();
-              for (;;)
-                {
-                  c = phase2_getc ();
-                  if (c == UEOF || c == '\n')
-                    {
-                      comment_line_end (0);
-                      break;
-                    }
-                  /* We skip all leading white space, but not EOLs.  */
-                  if (!(comment_at_start () && (c == ' ' || c == '\t')))
-                    comment_add (c);
-                }
-              continuation_or_nonblank_line = false;
-              return c;
-            }
-          else if (c == '*')
-            {
-              /* C style comment.  */
-              bool last_was_star = false;
-              last_comment_line = line_number;
-              comment_start ();
-              for (;;)
-                {
-                  c = phase2_getc ();
-                  if (c == UEOF)
-                    break;
-                  /* We skip all leading white space, but not EOLs.  */
-                  if (!(comment_at_start () && (c == ' ' || c == '\t')))
-                    comment_add (c);
-                  switch (c)
-                    {
-                    case '\n':
-                      comment_line_end (1);
-                      comment_start ();
-                      last_was_star = false;
-                      continue;
-
-                    case '*':
-                      last_was_star = true;
-                      continue;
-                    case '/':
-                      if (last_was_star)
-                        {
-                          comment_line_end (2);
-                          break;
-                        }
-                      /* FALLTHROUGH */
-
-                    default:
-                      last_was_star = false;
-                      continue;
-                    }
-                  break;
-                }
-              continuation_or_nonblank_line = false;
-            }
-          else
-            {
-              phase2_ungetc (c);
-              return '/';
-            }
-        }
-      else
-        {
-          if (c == '\n')
-            continuation_or_nonblank_line = false;
-          else if (!(c == ' ' || c == '\t' || c == '\f'))
-            continuation_or_nonblank_line = true;
-          return c;
-        }
-    }
-}
-
-/* Supports only one pushback character.  */
-static void
-phase3_ungetc (int c)
-{
-  phase2_ungetc (c);
-}
-
-
-/* ========================= Accumulating strings.  ======================== */
-
-/* Return value of phase7_getuc when EOF is reached.  */
-#define P7_EOF (-1)
-#define P7_STRING_END (-2)
-
-/* Convert an UTF-16 or UTF-32 code point to a return value that can be
-   distinguished from a single-byte return value.  */
-#define UNICODE(code) (0x100 + (code))
-
-/* Test a return value of phase7_getuc whether it designates an UTF-16 or
-   UTF-32 code point.  */
-#define IS_UNICODE(p7_result) ((p7_result) >= 0x100)
-
-/* Extract the UTF-16 or UTF-32 code of a return value that satisfies
-   IS_UNICODE.  */
-#define UNICODE_VALUE(p7_result) ((p7_result) - 0x100)
-
-
-/* ========================== Reading of tokens.  ========================== */
-
-
-enum token_type_ty
-{
-  token_type_eof,
-  token_type_lparen,            /* ( */
-  token_type_rparen,            /* ) */
-  token_type_comma,             /* , */
-  token_type_lbracket,          /* [ */
-  token_type_rbracket,          /* ] */
-  token_type_plus,              /* + */
-  token_type_regexp,            /* /.../ */
-  token_type_operator,          /* - * / % . < > = ~ ! | & ? : ^ */
-  token_type_equal,             /* = */
-  token_type_string,            /* "abc", 'abc' */
-  token_type_keyword,           /* return, else */
-  token_type_symbol,            /* symbol, number */
-  token_type_other              /* misc. operator */
-};
-typedef enum token_type_ty token_type_ty;
-
-typedef struct token_ty token_ty;
-struct token_ty
-{
-  token_type_ty type;
-  char *string;         /* for token_type_string, token_type_symbol,
-                           token_type_keyword */
-  refcounted_string_list_ty *comment;   /* for token_type_string */
-  int line_number;
-};
-
-
-/* Free the memory pointed to by a 'struct token_ty'.  */
-static inline void
-free_token (token_ty *tp)
-{
-  if (tp->type == token_type_string || tp->type == token_type_symbol)
-    free (tp->string);
-  if (tp->type == token_type_string)
-    drop_reference (tp->comment);
-}
-
-
-/* JavaScript provides strings with either double or single quotes:
-     "abc" or 'abc'
-   Both may contain special sequences after a backslash:
-     \', \", \\, \b, \f, \n, \r, \t, \v
-   Special characters can be entered using hexadecimal escape
-   sequences or deprecated octal escape sequences:
-     \xXX, \OOO
-   Any unicode point can be entered using Unicode escape sequences:
-     \uNNNN
-   If a sequence after a backslash is not a legitimate character
-   escape sequence, the character value is the sequence itself without
-   a backslash.  For example, \xxx is treated as xxx.  */
-
-static int
-phase7_getuc (int quote_char)
-{
-  int c;
-
-  for (;;)
-    {
-      /* Use phase 2, because phase 3 elides comments.  */
-      c = phase2_getc ();
-
-      if (c == UEOF)
-        return P7_EOF;
-
-      if (c == quote_char)
-        return P7_STRING_END;
-
-      if (c == '\n')
-        {
-          phase2_ungetc (c);
-          error_with_progname = false;
-          error (0, 0, _("%s:%d: warning: unterminated string"),
-                 logical_file_name, line_number);
-          error_with_progname = true;
-          return P7_STRING_END;
-        }
-
-      if (c != '\\')
-        return UNICODE (c);
-
-      /* Dispatch according to the character following the backslash.  */
-      c = phase2_getc ();
-      if (c == UEOF)
-        return P7_EOF;
-
-      switch (c)
-        {
-        case '\n':
-          continue;
-        case 'b':
-          return UNICODE ('\b');
-        case 'f':
-          return UNICODE ('\f');
-        case 'n':
-          return UNICODE ('\n');
-        case 'r':
-          return UNICODE ('\r');
-        case 't':
-          return UNICODE ('\t');
-        case 'v':
-          return UNICODE ('\v');
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7':
-          {
-            int n = c - '0';
-
-            c = phase2_getc ();
-            if (c != UEOF)
-              {
-                if (c >= '0' && c <= '7')
-                  {
-                    n = (n << 3) + (c - '0');
-                    c = phase2_getc ();
-                    if (c != UEOF)
-                      {
-                        if (c >= '0' && c <= '7')
-                          n = (n << 3) + (c - '0');
-                        else
-                          phase2_ungetc (c);
-                      }
-                  }
-                else
-                  phase2_ungetc (c);
-              }
-            return UNICODE (n);
-          }
-        case 'x':
-          {
-            int c1 = phase2_getc ();
-            int n1;
-
-            if (c1 >= '0' && c1 <= '9')
-              n1 = c1 - '0';
-            else if (c1 >= 'A' && c1 <= 'F')
-              n1 = c1 - 'A' + 10;
-            else if (c1 >= 'a' && c1 <= 'f')
-              n1 = c1 - 'a' + 10;
-            else
-              n1 = -1;
-
-            if (n1 >= 0)
-              {
-                int c2 = phase2_getc ();
-                int n2;
-
-                if (c2 >= '0' && c2 <= '9')
-                  n2 = c2 - '0';
-                else if (c2 >= 'A' && c2 <= 'F')
-                  n2 = c2 - 'A' + 10;
-                else if (c2 >= 'a' && c2 <= 'f')
-                  n2 = c2 - 'a' + 10;
-                else
-                  n2 = -1;
-
-                if (n2 >= 0)
-                  {
-                    int n = (n1 << 4) + n2;
-                    return UNICODE (n);
-                  }
-
-                phase2_ungetc (c2);
-              }
-            phase2_ungetc (c1);
-            return UNICODE (c);
-          }
-        case 'u':
-          {
-            unsigned char buf[4];
-            unsigned int n = 0;
-            int i;
-
-            for (i = 0; i < 4; i++)
-              {
-                int c1 = phase2_getc ();
-
-                if (c1 >= '0' && c1 <= '9')
-                  n = (n << 4) + (c1 - '0');
-                else if (c1 >= 'A' && c1 <= 'F')
-                  n = (n << 4) + (c1 - 'A' + 10);
-                else if (c1 >= 'a' && c1 <= 'f')
-                  n = (n << 4) + (c1 - 'a' + 10);
-                else
-                  {
-                    phase2_ungetc (c1);
-                    while (--i >= 0)
-                      phase2_ungetc (buf[i]);
-                    return UNICODE (c);
-                  }
-
-                buf[i] = c1;
-              }
-            return UNICODE (n);
-          }
-        default:
-          return UNICODE (c);
-        }
-    }
-}
-
-
-/* Combine characters into tokens.  Discard whitespace except newlines at
-   the end of logical lines.  */
-
-static token_ty phase5_pushback[2];
-static int phase5_pushback_length;
-
-static token_type_ty last_token_type = token_type_other;
-
-static void
-phase5_scan_regexp ()
-{
-    int c;
-
-    /* Scan for end of RegExp literal ('/').  */
-    for (;;)
-      {
-        /* Must use phase2 as there can't be comments.  */
-        c = phase2_getc ();
-        if (c == '/')
-          break;
-        if (c == '\\')
-          {
-            c = phase2_getc ();
-            if (c != UEOF)
-              continue;
-          }
-        if (c == UEOF)
-          {
-            error_with_progname = false;
-            error (0, 0,
-                   _("%s:%d: warning: RegExp literal terminated too early"),
-                   logical_file_name, line_number);
-            error_with_progname = true;
-            return;
-          }
-      }
-
-    /* Scan for modifier flags (ECMA-262 5th section 15.10.4.1).  */
-    c = phase2_getc ();
-    if (!(c == 'g' || c == 'i' || c == 'm'))
-      phase2_ungetc (c);
-}
-
-static int xml_element_depth = 0;
-static bool inside_embedded_js_in_xml = false;
-
-static bool
-phase5_scan_xml_markup (token_ty *tp)
-{
-  struct
-  {
-    const char *start;
-    const char *end;
-  } markers[] =
-      {
-        { "!--", "--" },
-        { "![CDATA[", "]]" },
-        { "?", "?" }
-      };
-  int i;
-
-  for (i = 0; i < SIZEOF (markers); i++)
-    {
-      const char *start = markers[i].start;
-      const char *end = markers[i].end;
-      int j;
-
-      /* Look for a start marker.  */
-      for (j = 0; start[j] != '\0'; j++)
-        {
-          int c;
-
-          assert (phase2_pushback_length + j < SIZEOF (phase2_pushback));
-          c = phase2_getc ();
-          if (c == UEOF)
-            goto eof;
-          if (c != start[j])
-            {
-              int k = j;
-
-              phase2_ungetc (c);
-              k--;
-
-              for (; k >= 0; k--)
-                phase2_ungetc (start[k]);
-              break;
-            }
-        }
-
-      if (start[j] != '\0')
-        continue;
-
-      /* Skip until the end marker.  */
-      for (;;)
-        {
-          int c;
-
-          for (j = 0; end[j] != '\0'; j++)
-            {
-              assert (phase2_pushback_length + 1 < SIZEOF (phase2_pushback));
-              c = phase2_getc ();
-              if (c == UEOF)
-                goto eof;
-              if (c != end[j])
-                {
-                  /* Don't push the first character back so the next
-                     iteration start from the second character.  */
-                  if (j > 0)
-                    {
-                      int k = j;
-
-                      phase2_ungetc (c);
-                      k--;
-
-                      for (; k > 0; k--)
-                        phase2_ungetc (end[k]);
-                    }
-                  break;
-                }
-            }
-
-          if (end[j] != '\0')
-            continue;
-
-          c = phase2_getc ();
-          if (c == UEOF)
-            goto eof;
-          if (c != '>')
-            {
-              error_with_progname = false;
-              error (0, 0,
-                     _("%s:%d: warning: %s is not allowed"),
-                     logical_file_name, line_number,
-                     end);
-              error_with_progname = true;
-              return false;
-            }
-          return true;
-        }
-    }
-  return false;
-
- eof:
-  error_with_progname = false;
-  error (0, 0,
-         _("%s:%d: warning: unterminated XML markup"),
-         logical_file_name, line_number);
-  error_with_progname = true;
-  return false;
-}
-
-static void
-phase5_get (token_ty *tp)
-{
-  int c;
-
-  if (phase5_pushback_length)
-    {
-      *tp = phase5_pushback[--phase5_pushback_length];
-      last_token_type = tp->type;
-      return;
-    }
-
-  for (;;)
-    {
-      tp->line_number = line_number;
-      c = phase3_getc ();
-
-      switch (c)
-        {
-        case UEOF:
-          tp->type = last_token_type = token_type_eof;
-          return;
-
-        case '\n':
-          if (last_non_comment_line > last_comment_line)
-            savable_comment_reset ();
-          /* FALLTHROUGH */
-        case ' ':
-        case '\t':
-        case '\f':
-          /* Ignore whitespace and comments.  */
-          continue;
-        }
-
-      last_non_comment_line = tp->line_number;
-
-      switch (c)
-        {
-        case '.':
-          {
-            int c1 = phase3_getc ();
-            phase3_ungetc (c1);
-            if (!(c1 >= '0' && c1 <= '9'))
-              {
-
-                tp->type = last_token_type = token_type_other;
-                return;
-              }
-          }
-          /* FALLTHROUGH */
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-        case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
-        case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-        case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
-        case 'Y': case 'Z':
-        case '_':
-        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-        case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
-        case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
-        case 's': case 't': case 'u': case 'v': case 'w': case 'x':
-        case 'y': case 'z':
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-          /* Symbol, or part of a number.  */
-          {
-            static char *buffer;
-            static int bufmax;
-            int bufpos;
-
-            bufpos = 0;
-            for (;;)
-              {
-                if (bufpos >= bufmax)
-                  {
-                    bufmax = 2 * bufmax + 10;
-                    buffer = xrealloc (buffer, bufmax);
-                  }
-                buffer[bufpos++] = c;
-                c = phase3_getc ();
-                switch (c)
-                  {
-                  case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-                  case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
-                  case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-                  case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
-                  case 'Y': case 'Z':
-                  case '_':
-                  case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-                  case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
-                  case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
-                  case 's': case 't': case 'u': case 'v': case 'w': case 'x':
-                  case 'y': case 'z':
-                  case '0': case '1': case '2': case '3': case '4':
-                  case '5': case '6': case '7': case '8': case '9':
-                    continue;
-                  default:
-                    phase3_ungetc (c);
-                    break;
-                  }
-                break;
-              }
-            if (bufpos >= bufmax)
-              {
-                bufmax = 2 * bufmax + 10;
-                buffer = xrealloc (buffer, bufmax);
-              }
-            buffer[bufpos] = '\0';
-            tp->string = xstrdup (buffer);
-            if (strcmp (buffer, "return") == 0
-                || strcmp (buffer, "else") == 0)
-              tp->type = last_token_type = token_type_keyword;
-            else
-              tp->type = last_token_type = token_type_symbol;
-            return;
-          }
-
-        /* Strings.  */
-          {
-            struct mixed_string_buffer *bp;
-            int quote_char;
-
-            case '"': case '\'':
-              quote_char = c;
-              lexical_context = lc_string;
-              /* Start accumulating the string.  */
-              bp = mixed_string_buffer_alloc (lexical_context,
-                                              logical_file_name,
-                                              line_number);
-              for (;;)
-                {
-                  int uc = phase7_getuc (quote_char);
-
-                  /* Keep line_number in sync.  */
-                  bp->line_number = line_number;
-
-                  if (uc == P7_EOF || uc == P7_STRING_END)
-                    break;
-
-                  if (IS_UNICODE (uc))
-                    {
-                      assert (UNICODE_VALUE (uc) >= 0
-                              && UNICODE_VALUE (uc) < 0x110000);
-                      mixed_string_buffer_append_unicode (bp,
-                                                          UNICODE_VALUE (uc));
-                    }
-                  else
-                    mixed_string_buffer_append_char (bp, uc);
-                }
-              tp->string = mixed_string_buffer_done (bp);
-              tp->comment = add_reference (savable_comment);
-              lexical_context = lc_outside;
-              tp->type = last_token_type = token_type_string;
-              return;
-          }
-
-        case '+':
-          tp->type = last_token_type = token_type_plus;
-          return;
-
-        /* Identify operators. The multiple character ones are simply ignored
-         * as they are recognized here and are otherwise not relevant. */
-        case '-': case '*': /* '+' and '/' are not listed here! */
-        case '%':
-        case '~': case '!': case '|': case '&': case '^':
-        case '?': case ':':
-          tp->type = last_token_type = token_type_operator;
-          return;
-
-        case '=':
-          tp->type = last_token_type = token_type_equal;
-          return;
-
-        case '<':
-          {
-            /* We assume:
-               - XMLMarkup and XMLElement are only allowed after '=' or '('
-               - embedded JavaScript expressions in XML do not recurse
-             */
-            if (xml_element_depth > 0
-                || (!inside_embedded_js_in_xml
-                    && (last_token_type == token_type_equal
-                        || last_token_type == token_type_lparen)))
-              {
-                /* Comments, PI, or CDATA.  */
-                if (phase5_scan_xml_markup (tp))
-                  return;
-                c = phase2_getc ();
-
-                /* Closing tag.  */
-                if (c == '/')
-                  lexical_context = lc_xml_close_tag;
-
-                /* Opening element.  */
-                else
-                  {
-                    phase2_ungetc (c);
-                    lexical_context = lc_xml_open_tag;
-                    xml_element_depth++;
-                  }
-
-                tp->type = last_token_type = token_type_other;
-              }
-            else
-              tp->type = last_token_type = token_type_operator;
-          }
-          return;
-
-        case '>':
-          if (xml_element_depth > 0 && !inside_embedded_js_in_xml)
-            {
-              switch (lexical_context)
-                {
-                case lc_xml_open_tag:
-                  lexical_context = lc_xml_content;
-                  break;
-
-                case lc_xml_close_tag:
-                  if (xml_element_depth-- > 0)
-                    lexical_context = lc_xml_content;
-                  else
-                    lexical_context = lc_outside;
-                  break;
-
-                default:
-                  break;
-                }
-              tp->type = last_token_type = token_type_other;
-            }
-          else
-            tp->type = last_token_type = token_type_operator;
-          return;
-
-        case '/':
-          if (xml_element_depth > 0 && !inside_embedded_js_in_xml)
-            {
-              /* If it appears in an opening tag of an XML element, it's
-                 part of '/>'.  */
-              if (lexical_context == lc_xml_open_tag)
-                {
-                  c = phase2_getc ();
-                  if (c == '>')
-                    lexical_context = lc_outside;
-                  else
-                    phase2_ungetc (c);
-                }
-              tp->type = last_token_type = token_type_other;
-              return;
-            }
-
-          /* Either a division operator or the start of a regular
-             expression literal.  If the '/' token is spotted after a
-             symbol it's a division, otherwise it's a regular
-             expression.  */
-          if (last_token_type == token_type_symbol
-              || last_token_type == token_type_rparen
-              || last_token_type == token_type_rbracket)
-            tp->type = last_token_type = token_type_operator;
-          else
-            {
-              phase5_scan_regexp (tp);
-              tp->type = last_token_type = token_type_regexp;
-            }
-          return;
-
-        case '{':
-          if (xml_element_depth > 0 && !inside_embedded_js_in_xml)
-            inside_embedded_js_in_xml = true;
-          tp->type = last_token_type = token_type_other;
-          return;
-
-        case '}':
-          if (xml_element_depth > 0 && inside_embedded_js_in_xml)
-            inside_embedded_js_in_xml = false;
-          tp->type = last_token_type = token_type_other;
-          return;
-
-        case '(':
-          tp->type = last_token_type = token_type_lparen;
-          return;
-
-        case ')':
-          tp->type = last_token_type = token_type_rparen;
-          return;
-
-        case ',':
-          tp->type = last_token_type = token_type_comma;
-          return;
-
-        case '[':
-          tp->type = last_token_type = token_type_lbracket;
-          return;
-
-        case ']':
-          tp->type = last_token_type = token_type_rbracket;
-          return;
-
-        default:
-          /* We could carefully recognize each of the 2 and 3 character
-             operators, but it is not necessary, as we only need to recognize
-             gettext invocations.  Don't bother.  */
-          tp->type = last_token_type = token_type_other;
-          return;
-        }
-    }
-}
-
-/* Supports only one pushback token.  */
-static void
-phase5_unget (token_ty *tp)
-{
-  if (tp->type != token_type_eof)
-    {
-      if (phase5_pushback_length == SIZEOF (phase5_pushback))
-        abort ();
-      phase5_pushback[phase5_pushback_length++] = *tp;
-    }
-}
-
-
-/* String concatenation with '+'.  */
-
-static void
-x_javascript_lex (token_ty *tp)
-{
-  phase5_get (tp);
-  if (tp->type == token_type_string)
-    {
-      char *sum = tp->string;
-      size_t sum_len = strlen (sum);
-
-      for (;;)
-        {
-          token_ty token2;
-
-          phase5_get (&token2);
-          if (token2.type == token_type_plus)
-            {
-              token_ty token3;
-
-              phase5_get (&token3);
-              if (token3.type == token_type_string)
-                {
-                  char *addend = token3.string;
-                  size_t addend_len = strlen (addend);
-
-                  sum = (char *) xrealloc (sum, sum_len + addend_len + 1);
-                  memcpy (sum + sum_len, addend, addend_len + 1);
-                  sum_len += addend_len;
-
-                  free_token (&token3);
-                  free_token (&token2);
-                  continue;
-                }
-              phase5_unget (&token3);
-            }
-          phase5_unget (&token2);
-          break;
-        }
-      tp->string = sum;
-    }
-}
-
-
-/* ========================= Extracting strings.  ========================== */
-
-
-/* Context lookup table.  */
-static flag_context_list_table_ty *flag_context_list_table;
-
-
-/* The file is broken into tokens.  Scan the token stream, looking for
-   a keyword, followed by a left paren, followed by a string.  When we
-   see this sequence, we have something to remember.  We assume we are
-   looking at a valid JavaScript program, and leave the complaints about
-   the grammar to the compiler.
-
-     Normal handling: Look for
-       keyword ( ... msgid ... )
-     Plural handling: Look for
-       keyword ( ... msgid ... msgid_plural ... )
-
-   We use recursion because the arguments before msgid or between msgid
-   and msgid_plural can contain subexpressions of the same form.  */
-
-
-/* Extract messages until the next balanced closing parenthesis or bracket.
-   Extracted messages are added to MLP.
-   DELIM can be either token_type_rparen or token_type_rbracket, or
-   token_type_eof to accept both.
-   Return true upon eof, false upon closing parenthesis or bracket.  */
-static bool
-extract_balanced (message_list_ty *mlp,
-                  token_type_ty delim,
-                  flag_context_ty outer_context,
-                  flag_context_list_iterator_ty context_iter,
-                  struct arglist_parser *argparser)
-{
-  /* Current argument number.  */
-  int arg = 1;
-  /* 0 when no keyword has been seen.  1 right after a keyword is seen.  */
-  int state;
-  /* Parameters of the keyword just seen.  Defined only in state 1.  */
-  const struct callshapes *next_shapes = NULL;
-  /* Context iterator that will be used if the next token is a '('.  */
-  flag_context_list_iterator_ty next_context_iter =
-    passthrough_context_list_iterator;
-  /* Current context.  */
-  flag_context_ty inner_context =
-    inherited_context (outer_context,
-                       flag_context_list_iterator_advance (&context_iter));
-
-  /* Start state is 0.  */
-  state = 0;
-
-  for (;;)
-    {
-      token_ty token;
-
-      x_javascript_lex (&token);
-      switch (token.type)
-        {
-        case token_type_symbol:
-          {
-            void *keyword_value;
-
-            if (hash_find_entry (&keywords, token.string, strlen (token.string),
-                                 &keyword_value)
-                == 0)
-              {
-                next_shapes = (const struct callshapes *) keyword_value;
-                state = 1;
-              }
-            else
-              state = 0;
-          }
-          next_context_iter =
-            flag_context_list_iterator (
-              flag_context_list_table_lookup (
-                flag_context_list_table,
-                token.string, strlen (token.string)));
-          free (token.string);
-          continue;
-
-        case token_type_lparen:
-          if (extract_balanced (mlp, token_type_rparen,
-                                inner_context, next_context_iter,
-                                arglist_parser_alloc (mlp,
-                                                      state ? next_shapes : NULL)))
-            {
-              xgettext_current_source_encoding = po_charset_utf8;
-              arglist_parser_done (argparser, arg);
-              xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-              return true;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_rparen:
-          if (delim == token_type_rparen || delim == token_type_eof)
-            {
-              xgettext_current_source_encoding = po_charset_utf8;
-              arglist_parser_done (argparser, arg);
-              xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-              return false;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_comma:
-          arg++;
-          inner_context =
-            inherited_context (outer_context,
-                               flag_context_list_iterator_advance (
-                                 &context_iter));
-          next_context_iter = passthrough_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_lbracket:
-          if (extract_balanced (mlp, token_type_rbracket,
-                                null_context, null_context_list_iterator,
-                                arglist_parser_alloc (mlp, NULL)))
-            {
-              xgettext_current_source_encoding = po_charset_utf8;
-              arglist_parser_done (argparser, arg);
-              xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-              return true;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_rbracket:
-          if (delim == token_type_rbracket || delim == token_type_eof)
-            {
-              xgettext_current_source_encoding = po_charset_utf8;
-              arglist_parser_done (argparser, arg);
-              xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-              return false;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_string:
-          {
-            lex_pos_ty pos;
-            pos.file_name = logical_file_name;
-            pos.line_number = token.line_number;
-
-            xgettext_current_source_encoding = po_charset_utf8;
-            if (extract_all)
-              remember_a_message (mlp, NULL, token.string, inner_context,
-                                  &pos, NULL, token.comment);
-            else
-              arglist_parser_remember (argparser, arg, token.string,
-                                       inner_context,
-                                       pos.file_name, pos.line_number,
-                                       token.comment);
-            xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-          }
-          drop_reference (token.comment);
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_eof:
-          xgettext_current_source_encoding = po_charset_utf8;
-          arglist_parser_done (argparser, arg);
-          xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-          return true;
-
-        case token_type_keyword:
-        case token_type_plus:
-        case token_type_regexp:
-        case token_type_operator:
-        case token_type_equal:
-        case token_type_other:
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        default:
-          abort ();
-        }
-    }
-}
-
-
-void
-extract_javascript (FILE *f,
-                const char *real_filename, const char *logical_filename,
-                flag_context_list_table_ty *flag_table,
-                msgdomain_list_ty *mdlp)
-{
-  message_list_ty *mlp = mdlp->item[0]->messages;
-
-  fp = f;
-  real_file_name = real_filename;
-  logical_file_name = xstrdup (logical_filename);
-  line_number = 1;
-
-  lexical_context = lc_outside;
-
-  last_comment_line = -1;
-  last_non_comment_line = -1;
-
-  xml_element_depth = 0;
-
-  xgettext_current_file_source_encoding = xgettext_global_source_encoding;
-#if HAVE_ICONV
-  xgettext_current_file_source_iconv = xgettext_global_source_iconv;
-#endif
-
-  xgettext_current_source_encoding = xgettext_current_file_source_encoding;
-#if HAVE_ICONV
-  xgettext_current_source_iconv = xgettext_current_file_source_iconv;
-#endif
-
-  continuation_or_nonblank_line = false;
-
-  flag_context_list_table = flag_table;
-
-  init_keywords ();
-
-  /* Eat tokens until eof is seen.  When extract_balanced returns
-     due to an unbalanced closing parenthesis, just restart it.  */
-  while (!extract_balanced (mlp, token_type_eof,
-                            null_context, null_context_list_iterator,
-                            arglist_parser_alloc (mlp, NULL)))
-    ;
-
-  fp = NULL;
-  real_file_name = NULL;
-  logical_file_name = NULL;
-  line_number = 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/x-javascript.h gettext-0.18.1.1/gettext-tools/src/x-javascript.h
--- gettext-0.19.3/gettext-tools/src/x-javascript.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-javascript.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/* xgettext JavaScript backend.
-   Copyright (C) 2002-2003, 2006, 2013 Free Software Foundation, Inc.
-   This file was written by Andreas Stricker <andy@knitter.ch>, 2010.
-   It's based on x-python from Bruno Haible.
-
-   This 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 <stdio.h>
-
-#include "message.h"
-#include "xgettext.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define EXTENSIONS_JAVASCRIPT \
-  { "js",        "JavaScript"   },                                        \
-
-#define SCANNERS_JAVASCRIPT \
-  { "JavaScript",       extract_javascript,                               \
-                        &flag_table_javascript, &formatstring_javascript, NULL, NULL }, \
-
-/* Scan a Python file and add its translatable strings to mdlp.  */
-extern void extract_javascript (FILE *fp, const char *real_filename,
-                            const char *logical_filename,
-                            flag_context_list_table_ty *flag_table,
-                            msgdomain_list_ty *mdlp);
-
-extern void x_javascript_keyword (const char *keyword);
-extern void x_javascript_extract_all (void);
-
-extern void init_flag_table_javascript (void);
-
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-librep.h gettext-0.18.1.1/gettext-tools/src/x-librep.h
--- gettext-0.19.3/gettext-tools/src/x-librep.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-librep.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_LIBREP \
   { "librep",           extract_librep,                                   \
-                        &flag_table_librep, &formatstring_librep, NULL, NULL }, \
+                        &flag_table_librep, &formatstring_librep, NULL }, \
 
 /* Scan a librep file and add its translatable strings to mdlp.  */
 extern void extract_librep (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-lisp.h gettext-0.18.1.1/gettext-tools/src/x-lisp.h
--- gettext-0.19.3/gettext-tools/src/x-lisp.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-lisp.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_LISP \
   { "Lisp",             extract_lisp,                                   \
-                        &flag_table_lisp, &formatstring_lisp, NULL, NULL },   \
+                        &flag_table_lisp, &formatstring_lisp, NULL },   \
 
 /* Scan a Lisp file and add its translatable strings to mdlp.  */
 extern void extract_lisp (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-lua.c gettext-0.18.1.1/gettext-tools/src/x-lua.c
--- gettext-0.19.3/gettext-tools/src/x-lua.c	2014-05-08 04:25:58.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-lua.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1215 +0,0 @@
-/* xgettext Lua backend.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-   This file was written by Ľubomír Remák <lubomirr@lubomirr.eu>, 2012.
-
-   This 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 "x-lua.h"
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "message.h"
-#include "xgettext.h"
-#include "error.h"
-#include "xalloc.h"
-#include "gettext.h"
-#include "po-charset.h"
-
-#define _(s) gettext(s)
-
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-
-/* The Lua syntax is defined in the Lua manual section 9,
-   which can be found at
-   http://www.lua.org/manual/5.2/manual.html#9  */
-
-/* If true extract all strings.  */
-static bool extract_all = false;
-
-/* A hash table for keywords.  */
-static hash_table keywords;
-static bool default_keywords = true;
-
-/* Set extract_all flag (gettext will extract all strings).  */
-void
-x_lua_extract_all ()
-{
-  extract_all = true;
-}
-
-/* Adds a keyword.  Copied from other lexers.  */
-void
-x_lua_keyword (const char *name)
-{
-  if (name == NULL)
-    default_keywords = false;
-  else
-    {
-      const char *end;
-      struct callshape shape;
-      const char *colon;
-
-      if (keywords.table == NULL)
-        hash_init (&keywords, 100);
-
-      split_keywordspec (name, &end, &shape);
-
-      /* The characters between name and end should form a valid C identifier.
-         A colon means an invalid parse in split_keywordspec().  */
-      colon = strchr (name, ':');
-      if (colon == NULL || colon >= end)
-        insert_keyword_callshape (&keywords, name, end - name, &shape);
-    }
-}
-
-/* Finish initializing the keywords hash table.
-   Called after argument processing, before each file is processed.  */
-static void
-init_keywords ()
-{
-  if (default_keywords)
-    {
-      /* When adding new keywords here, also update the documentation in
-         xgettext.texi!  */
-      x_lua_keyword ("_");
-      x_lua_keyword ("gettext.gettext");
-      x_lua_keyword ("gettext.dgettext:2");
-      x_lua_keyword ("gettext.dcgettext:2");
-      x_lua_keyword ("gettext.ngettext:1,2");
-      x_lua_keyword ("gettext.dngettext:2,3");
-      x_lua_keyword ("gettext.dcngettext:2,3");
-      default_keywords = false;
-    }
-}
-
-void
-init_flag_table_lua ()
-{
-  xgettext_record_flag ("_:1:pass-lua-format");
-  xgettext_record_flag ("gettext.gettext:1:pass-lua-format");
-  xgettext_record_flag ("gettext.dgettext:2:pass-lua-format");
-  xgettext_record_flag ("gettext.dcgettext:2:pass-lua-format");
-  xgettext_record_flag ("gettext.ngettext:1:pass-lua-format");
-  xgettext_record_flag ("gettext.ngettext:2:pass-lua-format");
-  xgettext_record_flag ("gettext.dngettext:2:pass-lua-format");
-  xgettext_record_flag ("gettext.dngettext:3:pass-lua-format");
-  xgettext_record_flag ("gettext.dcngettext:2:pass-lua-format");
-  xgettext_record_flag ("gettext.dcngettext:3:pass-lua-format");
-  xgettext_record_flag ("string.format:1:lua-format");
-}
-
-/* ======================== Reading of characters.  ======================== */
-
-
-/* Real filename, used in error messages about the input file.  */
-static const char *real_file_name;
-
-/* Logical filename and line number, used to label the extracted messages.  */
-static char *logical_file_name;
-static int line_number;
-
-/* The input file stream.  */
-static FILE *fp;
-
-
-/* 1. line_number handling.  */
-
-static unsigned char phase1_pushback[2];
-static int phase1_pushback_length;
-
-static int first_character = 1;
-
-static int
-phase1_getc ()
-{
-  int c;
-
-  if (phase1_pushback_length)
-    c = phase1_pushback[--phase1_pushback_length];
-  else
-    {
-      c = getc (fp);
-
-      if (first_character)
-        {
-          first_character = 0;
-
-          /* Ignore shebang line.  No pushback required in this case.  */
-          if (c == '#')
-            {
-              while (c != '\n' && c != EOF)
-                c = getc (fp);
-              if (c == '\n')
-                {
-                  line_number++;
-                  c = getc (fp);
-                }
-            }
-        }
-
-      if (c == EOF)
-        {
-          if (ferror (fp))
-            error (EXIT_FAILURE, errno, _("error while reading \"%s\""),
-                   real_file_name);
-          return EOF;
-        }
-    }
-
-  if (c == '\n')
-    line_number++;
-
-  return c;
-}
-
-/* Supports 2 characters of pushback.  */
-
-static void
-phase1_ungetc (int c)
-{
-  if (c != EOF)
-    {
-      if (c == '\n')
-        --line_number;
-
-      if (phase1_pushback_length == SIZEOF (phase1_pushback))
-        abort ();
-      phase1_pushback[phase1_pushback_length++] = c;
-    }
-}
-
-
-/* These are for tracking whether comments count as immediately before
-   keyword.  */
-static int last_comment_line;
-static int last_non_comment_line;
-
-/* Accumulating comments.  */
-
-static char *buffer;
-static size_t bufmax;
-static size_t buflen;
-
-static inline void
-comment_start ()
-{
-  buflen = 0;
-}
-
-static inline void
-comment_add (int c)
-{
-  if (buflen >= bufmax)
-    {
-      bufmax = 2 * bufmax + 10;
-      buffer = xrealloc (buffer, bufmax);
-    }
-  buffer[buflen++] = c;
-}
-
-static inline void
-comment_line_end (size_t chars_to_remove)
-{
-  buflen -= chars_to_remove;
-  while (buflen >= 1
-         && (buffer[buflen - 1] == ' ' || buffer[buflen - 1] == '\t'))
-    --buflen;
-  if (chars_to_remove == 0 && buflen >= bufmax)
-    {
-      bufmax = 2 * bufmax + 10;
-      buffer = xrealloc (buffer, bufmax);
-    }
-  buffer[buflen] = '\0';
-  savable_comment_add (buffer);
-}
-
-/* Eats characters until '\n' and adds them to the comment.  */
-static void
-eat_comment_line ()
-{
-  for (;;)
-    {
-      int c = phase1_getc ();
-      if (c == '\n' || c == EOF)
-        {
-          comment_line_end (0);
-          break;
-        }
-
-      if (!(buflen == 0 && (c == ' ' || c == '\t')))
-        comment_add (c);
-    }
-}
-
-static int
-phase2_getc ()
-{
-  int c;
-  int lineno;
-
-  c = phase1_getc ();
-
-  if (c == '-')
-    {
-      c = phase1_getc ();
-
-      if (c == '-')
-        {
-          /* It starts with '--', so it must be either a short or a long
-             comment.  */
-          c = phase1_getc ();
-
-          if (c == '[')
-            {
-              c = phase1_getc ();
-
-              int esigns = 0;
-              while (c == '=')
-                {
-                  esigns++;
-                  c = phase1_getc ();
-                }
-
-              if (c == '[')
-                {
-                  /* Long comment.  */
-                  bool right_bracket = false;
-                  bool end = false;
-                  int esigns2 = 0;
-
-                  lineno = line_number;
-                  comment_start ();
-                  while (!end)
-                    {
-                      c = phase1_getc ();
-
-                      if (c == EOF)
-                        break;
-
-                      /* Ignore leading spaces and tabs.  */
-                      if (buflen == 0 && (c == ' ' || c == '\t'))
-                        continue;
-
-                      comment_add (c);
-
-                      switch (c)
-                        {
-                        case ']':
-                          if (!right_bracket)
-                            {
-                              right_bracket = true;
-                              esigns2 = 0;
-                            }
-                          else
-                            {
-                              if (esigns2 == esigns)
-                                {
-                                  comment_line_end (2 + esigns);
-                                  end = true;
-                                }
-                            }
-                          break;
-
-                        case '=':
-                          if (right_bracket)
-                            esigns2++;
-                          break;
-
-                        case '\n':
-                          comment_line_end (1);
-                          comment_start ();
-                          lineno = line_number;
-                          /* Intentionally not breaking.  */
-
-                        default:
-                          right_bracket = false;
-                        }
-                    }
-                  last_comment_line = lineno;
-                  return ' ';
-                }
-              else
-                {
-                  /* One line (short) comment, starting with '--[=...='.  */
-                  lineno = last_comment_line;
-                  comment_start ();
-                  comment_add ('[');
-                  while (esigns--)
-                    comment_add ('=');
-                  phase1_ungetc (c);
-                  eat_comment_line ();
-                  last_comment_line = lineno;
-                  return '\n';
-                }
-            }
-          else
-            {
-              /* One line (short) comment.  */
-              lineno = line_number;
-              comment_start ();
-              phase1_ungetc (c);
-              eat_comment_line ();
-              last_comment_line = lineno;
-              return '\n';
-            }
-        }
-      else
-        {
-          /* Minus sign.  */
-          phase1_ungetc (c);
-          return '-';
-        }
-    }
-  else
-    return c;
-}
-
-/* ========================== Reading of tokens.  ========================== */
-
-enum token_type_ty
-{
-  token_type_eof,
-  token_type_lparen,            /* ( */
-  token_type_rparen,            /* ) */
-  token_type_lbracket,          /* [ */
-  token_type_rbracket,          /* ] */
-  token_type_comma,             /* , */
-  token_type_dot,               /* . */
-  token_type_doubledot,         /* .. */
-  token_type_operator1,         /* + - * / % not # - ^ */
-  token_type_operator2,         /* < > <= >= ~= == and or */
-  token_type_string,
-  token_type_number,
-  token_type_symbol,
-  token_type_other
-};
-
-typedef enum token_type_ty token_type_ty;
-
-typedef struct token_ty token_ty;
-struct token_ty
-{
-  token_type_ty type;
-  char *string; /* for token_type_string_literal, token_type_symbol */
-  refcounted_string_list_ty *comment;  /* for token_type_string_literal */
-  int line_number;
-};
-
-/* Free the memory pointed to by a 'struct token_ty'.  */
-static inline void
-free_token (token_ty *tp)
-{
-  if (tp->type == token_type_string || tp->type == token_type_symbol)
-    free (tp->string);
-  if (tp->type == token_type_string)
-    drop_reference (tp->comment);
-}
-
-/* Our current string.  */
-static int string_buf_length;
-static int string_buf_alloc;
-static char *string_buf;
-
-static void
-string_start ()
-{
-  string_buf_length = 0;
-}
-
-static void
-string_add (int c)
-{
-  if (string_buf_length >= string_buf_alloc)
-    {
-      string_buf_alloc = 2 * string_buf_alloc + 10;
-      string_buf = xrealloc (string_buf, string_buf_alloc);
-    }
-
-  string_buf[string_buf_length++] = c;
-}
-
-static void
-string_end ()
-{
-  string_buf[string_buf_length] = '\0';
-}
-
-
-/* We need 3 pushback tokens for string optimization.  */
-static int phase3_pushback_length;
-static token_ty phase3_pushback[3];
-
-
-static void
-phase3_unget (token_ty *tp)
-{
-  if (tp->type != token_type_eof)
-    {
-      if (phase3_pushback_length == SIZEOF (phase3_pushback))
-        abort ();
-      phase3_pushback[phase3_pushback_length++] = *tp;
-    }
-}
-
-static void
-phase3_get (token_ty *tp)
-{
-  int c;
-  int c2;
-  int c_start;
-
-  if (phase3_pushback_length)
-    {
-      *tp = phase3_pushback[--phase3_pushback_length];
-      return;
-    }
-
-  tp->string = NULL;
-
-  for (;;)
-    {
-      tp->line_number = line_number;
-      c = phase2_getc ();
-
-      switch (c)
-        {
-        case EOF:
-          tp->type = token_type_eof;
-          return;
-
-        case '\n':
-          if (last_non_comment_line > last_comment_line)
-            savable_comment_reset ();
-          /* Intentionally not breaking.  */
-        case ' ':
-        case '\t':
-        case '\f':
-          continue;
-
-        case '+':
-        case '-':
-        case '*':
-        case '/':
-        case '^':
-        case '%':
-        case '#':
-          tp->type = token_type_operator1;
-          return;
-        case '<':
-        case '>':
-        case '=':
-          c2 = phase1_getc ();
-          if (c2 != '=')
-            phase1_ungetc (c2);
-          tp->type = token_type_operator2;
-          return;
-        case '~':
-          c2 = phase1_getc ();
-          if (c2 == '=')
-            {
-              tp->type = token_type_operator2;
-              return;
-            }
-          else
-            phase1_ungetc (c2);
-          continue;
-        case '(':
-          tp->type = token_type_lparen;
-          return;
-        case ')':
-          tp->type = token_type_rparen;
-          return;
-        case ',':
-          tp->type = token_type_comma;
-          return;
-
-        case ';':
-          tp->type = token_type_other;
-          return;
-
-          /* There are three operators beginning with a dot.  '.',
-             '..' and '...'.  The most useful for us is the string
-             concatenation operator ('..').  */
-        case '.':
-          c = phase1_getc ();
-          if (c == '.')
-            {
-              c = phase1_getc ();
-              if (c == '.')
-                {
-                  tp->type = token_type_other;
-                  return;
-                }
-              else
-                {
-                  phase1_ungetc (c);
-                  tp->type = token_type_doubledot;
-                  return;
-                }
-            }
-          else if (c >= '0' && c <= '9')
-            {
-              /* It's a number.  We aren't interested in the actual
-                 numeric value, so ignore the dot and let next
-                 iteration eat the number.  */
-              phase1_ungetc (c);
-              continue;
-            }
-          else
-            {
-              phase1_ungetc (c);
-              tp->type = token_type_dot;
-              return;
-            }
-
-        case '"':
-        case '\'':
-          c_start = c;
-          string_start ();
-
-          for (;;)
-            {
-              /* We need unprocessed characters from phase 1.  */
-              c = phase1_getc ();
-
-              /* We got '\', this is probably an escape sequence.  */
-              if (c == '\\')
-                {
-                  c = phase1_getc ();
-                  switch (c)
-                    {
-                    case 'a':
-                      string_add ('\a');
-                      break;
-                    case 'b':
-                      string_add ('\b');
-                      break;
-                    case 'f':
-                      string_add ('\f');
-                      break;
-                    case 'n':
-                      string_add ('\n');
-                      break;
-                    case 'r':
-                      string_add ('\r');
-                      break;
-                    case 't':
-                      string_add ('\t');
-                      break;
-                    case 'v':
-                      string_add ('\v');
-                      break;
-                    case 'x':
-                      {
-                        int num = 0;
-                        int i = 0;
-
-                        for (i = 0; i < 2; i++)
-                          {
-                            c = phase1_getc ();
-                            if (c >= '0' && c <= '9')
-                              num += c - '0';
-                            else if (c >= 'a' && c <= 'f')
-                              num += c - 'a' + 10;
-                            else if (c >= 'A' && c <= 'F')
-                              num += c - 'A' + 10;
-                            else
-                              {
-                                phase1_ungetc (c);
-                                break;
-                              }
-
-                            if (i == 0)
-                              num *= 16;
-                          }
-
-                        if (i == 2)
-                          string_add (num);
-                      }
-
-                      break;
-                    case 'z':
-                      /* Ignore the following whitespace.  */
-                      do
-                        {
-                          c = phase1_getc ();
-                        }
-                      while (c == ' ' || c == '\n' || c == '\t' || c == '\r'
-                             || c == '\f' || c == '\v');
-
-                      phase1_ungetc (c);
-
-                      break;
-                    default:
-                      /* Check if it's a '\ddd' sequence.  */
-                      if (c >= '0' && c <= '9')
-                        {
-                          int num = 0;
-                          int i = 0;
-
-                          while (c >= '0' && c <= '9' && i < 3)
-                            {
-                              num *= 10;
-                              num += (c - '0');
-                              c = phase1_getc ();
-                              i++;
-                            }
-
-                          /* The last read character is either a
-                             non-number or another number after our
-                             '\ddd' sequence.  We need to ungetc it.  */
-                          phase1_ungetc (c);
-
-                          /* The sequence number is too big, this
-                             causes a lexical error.  Ignore it.  */
-                          if (num < 256)
-                            string_add (num);
-                        }
-                      else
-                        string_add (c);
-                    }
-                }
-              else if (c == c_start || c == EOF || c == '\n')
-                {
-                  /* End of string.  */
-                  string_end ();
-                  tp->string = xstrdup (string_buf);
-                  tp->comment = add_reference (savable_comment);
-                  tp->type = token_type_string;
-                  return;
-                }
-              else
-                string_add (c);
-            }
-          break;
-
-        case '[':
-          c = phase1_getc ();
-
-          /* Count the number of equal signs.  */
-          int esigns = 0;
-          while (c == '=')
-            {
-              esigns++;
-              c = phase1_getc ();
-            }
-
-          if (c != '[')
-            {
-              /* We did not find what we were looking for, ungetc it.  */
-              phase1_ungetc (c);
-              if (esigns == 0)
-                {
-                  /* Our current character isn't '[' and we got 0 equal
-                     signs, so the first '[' must have been a left
-                     bracket.  */
-                  tp->type = token_type_lbracket;
-                  return;
-                }
-              else
-                /* Lexical error, ignore it.  */
-                continue;
-            }
-
-          string_start ();
-
-          for (;;)
-            {
-              c = phase1_getc ();
-
-              if (c == ']')
-                {
-                  c = phase1_getc ();
-
-                  /* Count the number of equal signs.  */
-                  int esigns2 = 0;
-                  while (c == '=')
-                    {
-                      esigns2++;
-                      c = phase1_getc ();
-                    }
-
-                  if (c == ']' && esigns == esigns2)
-                    {
-                      /* We got ']==...==]', where the number of equal
-                         signs matches the number of equal signs in
-                         the opening bracket.  */
-                      string_end ();
-                      tp->string = xstrdup (string_buf);
-                      tp->comment = add_reference (savable_comment);
-                      tp->type = token_type_string;
-                      return;
-                    }
-                  else
-                    {
-                      /* Otherwise we got either ']==' garbage or
-                         ']==...==]' with a different number of equal
-                         signs.
-
-                         Add ']' and equal signs to the string, and
-                         ungetc the current character, because the
-                         second ']' might be a part of another closing
-                         long bracket, e.g. '==]===]'.  */
-                      phase1_ungetc (c);
-
-                      string_add (']');
-                      while (esigns2--)
-                        string_add ('=');
-                    }
-                }
-              else
-                {
-                  if (c == EOF)
-                    {
-                      string_end ();
-                      tp->string = xstrdup (string_buf);
-                      tp->comment = add_reference (savable_comment);
-                      tp->type = token_type_string;
-                      return;
-                    }
-                  else
-                    string_add (c);
-                }
-            }
-          break;
-
-        case ']':
-          tp->type = token_type_rbracket;
-          return;
-
-        default:
-          if (c >= '0' && c <= '9')
-            {
-              while (c >= '0' && c <= '9')
-                c = phase1_getc ();
-
-              if (c == '.')
-                {
-                  c = phase1_getc ();
-                  while (c >= '0' && c <= '9')
-                    c = phase1_getc ();
-                }
-
-              if (c == 'e' || c == 'E')
-                {
-                  if (c == '+' || c == '-')
-                    c = phase1_getc ();
-                  while (c >= '0' && c <= '9')
-                    c = phase1_getc ();
-                }
-
-              phase1_ungetc (c);
-
-              tp->type = token_type_number;
-              return;
-            }
-          else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-                   || c == '_')
-            {
-              string_start ();
-              while ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-                     || c == '_' || (c >= '0' && c <= '9'))
-                {
-                  string_add (c);
-                  c = phase1_getc ();
-                }
-              string_end ();
-              phase1_ungetc (c);
-
-              if (strcmp (string_buf, "not") == 0)
-                tp->type = token_type_operator1;
-              else if (strcmp (string_buf, "and") == 0)
-                tp->type = token_type_operator2;
-              else if (strcmp (string_buf, "or") == 0)
-                tp->type = token_type_operator2;
-              else
-                {
-                  tp->string = xstrdup (string_buf);
-                  tp->type = token_type_symbol;
-                }
-              return;
-            }
-          else
-            tp->type = token_type_other;
-        }
-    }
-}
-
-/* String and symbol concatenation.  */
-
-static token_type_ty phase4_last;
-
-/* We need 3 pushback tokens for string and symbol concatenation.  */
-static int phase4_pushback_length;
-static token_ty phase4_pushback[3];
-
-static void
-phase4_unget (token_ty *tp)
-{
-  if (tp->type != token_type_eof)
-    {
-      if (phase4_pushback_length == SIZEOF (phase4_pushback))
-        abort ();
-      phase4_pushback[phase4_pushback_length++] = *tp;
-    }
-}
-
-static void
-phase4_get (token_ty *tp)
-{
-  if (phase4_pushback_length)
-    {
-      *tp = phase4_pushback[--phase4_pushback_length];
-      phase4_last = tp->type;
-      return;
-    }
-
-  phase3_get (tp);
-  if (tp->type == token_type_string
-      && !(phase4_last == token_type_operator1
-           || phase4_last == token_type_dot
-           || phase4_last == token_type_symbol
-           || phase4_last == token_type_doubledot
-           || phase4_last == token_type_rparen))
-    {
-      char *sum = tp->string;
-      size_t sum_len = strlen (sum);
-
-      for (;;)
-        {
-          token_ty token2;
-
-          phase3_get (&token2);
-          if (token2.type == token_type_doubledot)
-            {
-              token_ty token3;
-
-              phase3_get (&token3);
-              if (token3.type == token_type_string)
-                {
-                  token_ty token_after;
-
-                  phase3_get (&token_after);
-                  if (token_after.type != token_type_operator1)
-                    {
-                      char *addend = token3.string;
-                      size_t addend_len = strlen (addend);
-
-                      sum = (char *) xrealloc (sum, sum_len + addend_len + 1);
-                      memcpy (sum + sum_len, addend, addend_len + 1);
-                      sum_len += addend_len;
-
-                      phase3_unget (&token_after);
-                      free_token (&token3);
-                      free_token (&token2);
-                      continue;
-                    }
-                  phase3_unget (&token_after);
-                }
-              phase3_unget (&token3);
-            }
-          phase3_unget (&token2);
-          break;
-        }
-      tp->string = sum;
-    }
-  phase4_last = tp->type;
-}
-
-static void
-phase5_get (token_ty *tp)
-{
-  phase4_get (tp);
-
-  /* Combine symbol1 . ... . symbolN to a single strings, so that
-     we can recognize function calls like
-     gettext.gettext.  The information present for
-     symbolI.....symbolN has precedence over the information for
-     symbolJ.....symbolN with J > I.  */
-  if (tp->type == token_type_symbol)
-    {
-      char *sum = tp->string;
-      size_t sum_len = strlen (sum);
-
-      for (;;)
-        {
-          token_ty token2;
-
-          phase4_get (&token2);
-          if (token2.type == token_type_dot)
-            {
-              token_ty token3;
-
-              phase4_get (&token3);
-              if (token3.type == token_type_symbol)
-                {
-                  char *addend = token3.string;
-                  size_t addend_len = strlen (addend);
-
-                  sum = (char *) xrealloc (sum, sum_len + 1 + addend_len + 1);
-                  sum[sum_len] = '.';
-                  memcpy (sum + sum_len + 1, addend, addend_len + 1);
-                  sum_len += 1 + addend_len;
-
-                  free_token (&token2);
-                  free_token (&token3);
-                  continue;
-                }
-              phase4_unget (&token3);
-            }
-          phase4_unget (&token2);
-          break;
-        }
-      tp->string = sum;
-    }
-}
-
-static void
-x_lua_lex (token_ty *tok)
-{
-  phase5_get (tok);
-}
-
-
-/* ========================= Extracting strings.  ========================== */
-
-
-/* Context lookup table.  */
-static flag_context_list_table_ty *flag_context_list_table;
-
-
-/* The file is broken into tokens.  Scan the token stream, looking for
-   a keyword, followed by a left paren, followed by a string.  When we
-   see this sequence, we have something to remember.  We assume we are
-   looking at a valid Lua program, and leave the complaints about the
-   grammar to the compiler.
-
-     Normal handling: Look for
-       keyword ( ... msgid ... )
-       keyword msgid
-     Plural handling: Look for
-       keyword ( ... msgid ... msgid_plural ... )
-
-   We use recursion because the arguments before msgid or between msgid
-   and msgid_plural can contain subexpressions of the same form.  */
-
-/* Extract messages until the next balanced closing parenthesis or bracket.
-   Extracted messages are added to MLP.
-   DELIM can be either token_type_rparen or token_type_rbracket, or
-   token_type_eof to accept both.
-   Return true upon eof, false upon closing parenthesis or bracket.  */
-static bool
-extract_balanced (message_list_ty *mlp, token_type_ty delim,
-                  flag_context_ty outer_context,
-                  flag_context_list_iterator_ty context_iter,
-                  struct arglist_parser *argparser)
-{
-  /* Current argument number.  */
-  int arg = 1;
-  /* 0 when no keyword has been seen.  1 right after a keyword is seen.  */
-  int state;
-  /* Parameters of the keyword just seen.  Defined only in state 1.  */
-  const struct callshapes *next_shapes = NULL;
-  /* Context iterator that will be used if the next token is a '('.  */
-  flag_context_list_iterator_ty next_context_iter =
-    passthrough_context_list_iterator;
-  /* Current context.  */
-  flag_context_ty inner_context =
-    inherited_context (outer_context,
-                       flag_context_list_iterator_advance (&context_iter));
-
-  /* Start state is 0.  */
-  state = 0;
-
-  for (;;)
-    {
-      token_ty token;
-
-      x_lua_lex (&token);
-
-      switch (token.type)
-        {
-        case token_type_symbol:
-          {
-            void *keyword_value;
-
-            if (hash_find_entry (&keywords, token.string, strlen (token.string),
-                                 &keyword_value)
-                == 0)
-              {
-                next_shapes = (const struct callshapes *) keyword_value;
-                state = 1;
-              }
-            else
-              state = 0;
-          }
-          next_context_iter =
-            flag_context_list_iterator (
-              flag_context_list_table_lookup (
-                flag_context_list_table,
-                token.string, strlen (token.string)));
-          free (token.string);
-          continue;
-
-        case token_type_lparen:
-          if (extract_balanced (mlp, token_type_rparen,
-                                inner_context, next_context_iter,
-                                arglist_parser_alloc (mlp,
-                                                      state ? next_shapes : NULL)))
-            {
-              arglist_parser_done (argparser, arg);
-              return true;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          break;
-
-        case token_type_rparen:
-          if (delim == token_type_rparen || delim == token_type_eof)
-            {
-              arglist_parser_done (argparser, arg);
-              return false;
-            }
-
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_lbracket:
-          if (extract_balanced (mlp, token_type_rbracket,
-                                null_context, null_context_list_iterator,
-                                arglist_parser_alloc (mlp, NULL)))
-            {
-              arglist_parser_done (argparser, arg);
-              return true;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          break;
-
-        case token_type_rbracket:
-          if (delim == token_type_rbracket || delim == token_type_eof)
-            {
-              arglist_parser_done (argparser, arg);
-              return false;
-            }
-
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_comma:
-          arg++;
-          inner_context =
-            inherited_context (outer_context,
-                               flag_context_list_iterator_advance (
-                                 &context_iter));
-          next_context_iter = passthrough_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_eof:
-          arglist_parser_done (argparser, arg);
-          return true;
-
-        case token_type_string:
-          {
-            lex_pos_ty pos;
-            pos.file_name = logical_file_name;
-            pos.line_number = token.line_number;
-
-            if (extract_all)
-              remember_a_message (mlp, NULL, token.string, inner_context,
-                                  &pos, NULL, token.comment);
-            else
-              {
-                /* A string immediately after a symbol means a function call.  */
-                if (state)
-                  {
-                    struct arglist_parser *tmp_argparser;
-                    tmp_argparser = arglist_parser_alloc (mlp, next_shapes);
-
-                    arglist_parser_remember (tmp_argparser, 1, token.string,
-                                             inner_context, pos.file_name,
-                                             pos.line_number, token.comment);
-                    arglist_parser_done (tmp_argparser, 1);
-                  }
-                else
-                  arglist_parser_remember (argparser, arg, token.string,
-                                           inner_context, pos.file_name,
-                                           pos.line_number, token.comment);
-              }
-          }
-          drop_reference (token.comment);
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_dot:
-        case token_type_doubledot:
-        case token_type_operator1:
-        case token_type_operator2:
-        case token_type_number:
-        case token_type_other:
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        default:
-          abort ();
-        }
-    }
-}
-
-void
-extract_lua (FILE *f,
-             const char *real_filename, const char *logical_filename,
-             flag_context_list_table_ty *flag_table,
-             msgdomain_list_ty *mdlp)
-{
-  message_list_ty *mlp = mdlp->item[0]->messages;
-
-  fp = f;
-  real_file_name = real_filename;
-  logical_file_name = xstrdup (logical_filename);
-  line_number = 1;
-
-  last_comment_line = -1;
-  last_non_comment_line = -1;
-
-  flag_context_list_table = flag_table;
-
-  init_keywords ();
-
-  /* Eat tokens until eof is seen.  When extract_parenthesized returns
-     due to an unbalanced closing parenthesis, just restart it.  */
-  while (!extract_balanced (mlp, token_type_eof,
-                            null_context, null_context_list_iterator,
-                            arglist_parser_alloc (mlp, NULL)))
-    ;
-
-  fp = NULL;
-  real_file_name = NULL;
-  logical_file_name = NULL;
-  line_number = 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/x-lua.h gettext-0.18.1.1/gettext-tools/src/x-lua.h
--- gettext-0.19.3/gettext-tools/src/x-lua.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-lua.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* xgettext Lua backend.
-   Copyright (C) 2011 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
-   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 <stdio.h>
-
-#include "message.h"
-#include "xgettext.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define EXTENSIONS_LUA \
-  { "lua",    "Lua"   },                                                \
-
-#define SCANNERS_LUA \
-  { "Lua",             extract_lua,                                     \
-                       &flag_table_lua, &formatstring_lua, NULL, NULL },      \
-
-  /* Scan a Lua file and add its translatable strings to mdlp.  */
-  extern void extract_lua (FILE * fp, const char *real_filename,
-                           const char *logical_filename,
-                           flag_context_list_table_ty * flag_table,
-                           msgdomain_list_ty * mdlp);
-
-  extern void x_lua_keyword (const char *keyword);
-  extern void x_lua_extract_all (void);
-
-  extern void init_flag_table_lua (void);
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-perl.c gettext-0.18.1.1/gettext-tools/src/x-perl.c
--- gettext-0.19.3/gettext-tools/src/x-perl.c	2014-05-08 04:25:58.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-perl.c	2010-06-06 12:49:58.000000000 +0000
@@ -1085,7 +1085,7 @@
               if (*crs)
                 {
                   int the_char = (unsigned char) *crs;
-                  if (the_char >= 'a' && the_char <= 'z')
+                  if (the_char >= 'a' || the_char <= 'z')
                     the_char = the_char - 'a' + 'A';
                   buffer[bufpos++] = the_char ^ 0x40;
                 }
diff -Nru gettext-0.19.3/gettext-tools/src/x-perl.h gettext-0.18.1.1/gettext-tools/src/x-perl.h
--- gettext-0.19.3/gettext-tools/src/x-perl.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-perl.h	2010-06-06 12:49:58.000000000 +0000
@@ -36,7 +36,7 @@
 
 #define SCANNERS_PERL \
   { "perl",             extract_perl,                                   \
-            &flag_table_perl, &formatstring_perl, &formatstring_perl_brace, NULL }, \
+            &flag_table_perl, &formatstring_perl, &formatstring_perl_brace }, \
 
 /* Scan a Perl file and add its translatable strings to mdlp.  */
 extern void extract_perl (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-php.c gettext-0.18.1.1/gettext-tools/src/x-php.c
--- gettext-0.19.3/gettext-tools/src/x-php.c	2014-05-08 04:25:58.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-php.c	2010-06-06 12:49:58.000000000 +0000
@@ -1161,9 +1161,7 @@
                 int c3 = phase1_getc ();
                 if (c3 == '<')
                   {
-                    int label_start = 0;
-
-                    /* Start of here and now document.
+                    /* Start of here document.
                        Parse whitespace, then label, then newline.  */
                     do
                       c = phase3_getc ();
@@ -1181,14 +1179,7 @@
                         c = phase3_getc ();
                       }
                     while (c != EOF && c != '\n' && c != '\r');
-                    /* buffer[0..bufpos-1] now contains the label
-                       (including single or double quotes).  */
-
-                    if (*buffer == '\'' || *buffer == '"')
-                      {
-                        label_start++;
-                        bufpos--;
-                      }
+                    /* buffer[0..bufpos-1] now contains the label.  */
 
                     /* Now skip the here document.  */
                     for (;;)
@@ -1198,7 +1189,7 @@
                           break;
                         if (c == '\n' || c == '\r')
                           {
-                            int bufidx = label_start;
+                            int bufidx = 0;
 
                             while (bufidx < bufpos)
                               {
diff -Nru gettext-0.19.3/gettext-tools/src/x-php.h gettext-0.18.1.1/gettext-tools/src/x-php.h
--- gettext-0.19.3/gettext-tools/src/x-php.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-php.h	2010-06-06 12:49:58.000000000 +0000
@@ -34,7 +34,7 @@
 
 #define SCANNERS_PHP \
   { "PHP",              extract_php,                                    \
-                        &flag_table_php, &formatstring_php, NULL, NULL },     \
+                        &flag_table_php, &formatstring_php, NULL },     \
 
 /* Scan a PHP file and add its translatable strings to mdlp.  */
 extern void extract_php (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-po.c gettext-0.18.1.1/gettext-tools/src/x-po.c
--- gettext-0.19.3/gettext-tools/src/x-po.c	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-po.c	2010-06-06 12:49:58.000000000 +0000
@@ -155,6 +155,7 @@
 
   pop = default_catalog_reader_alloc (&extract_methods);
   pop->handle_comments = true;
+  pop->handle_filepos_comments = (line_comment != 0);
   pop->allow_domain_directives = false;
   pop->allow_duplicates = false;
   pop->allow_duplicates_if_same_msgstr = true;
diff -Nru gettext-0.19.3/gettext-tools/src/x-po.h gettext-0.18.1.1/gettext-tools/src/x-po.h
--- gettext-0.19.3/gettext-tools/src/x-po.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-po.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
   { "pot",    "PO"    },                                                \
 
 #define SCANNERS_PO \
-  { "PO",               extract_po, NULL, NULL, NULL, NULL },                 \
+  { "PO",               extract_po, NULL, NULL, NULL },                 \
 
 /* Scan a PO file and add its translatable strings to mdlp.  */
 extern void extract_po (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-properties.h gettext-0.18.1.1/gettext-tools/src/x-properties.h
--- gettext-0.19.3/gettext-tools/src/x-properties.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-properties.h	2010-06-06 12:49:58.000000000 +0000
@@ -31,7 +31,7 @@
   { "properties", "JavaProperties" },                                   \
 
 #define SCANNERS_PROPERTIES \
-  { "JavaProperties",   extract_properties, NULL, NULL, NULL, NULL },         \
+  { "JavaProperties",   extract_properties, NULL, NULL, NULL },         \
 
 /* Scan a JavaProperties file and add its translatable strings to mdlp.  */
 extern void extract_properties (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-python.c gettext-0.18.1.1/gettext-tools/src/x-python.c
--- gettext-0.19.3/gettext-tools/src/x-python.c	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-python.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext Python backend.
-   Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2009 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -133,18 +133,6 @@
   xgettext_record_flag ("dngettext:3:pass-python-format");
   xgettext_record_flag ("_:1:pass-python-format");
   /* xgettext_record_flag ("%:1:python-format"); // % is an infix operator! */
-
-  xgettext_record_flag ("gettext:1:pass-python-brace-format");
-  xgettext_record_flag ("ugettext:1:pass-python-brace-format");
-  xgettext_record_flag ("dgettext:2:pass-python-brace-format");
-  xgettext_record_flag ("ngettext:1:pass-python-brace-format");
-  xgettext_record_flag ("ngettext:2:pass-python-brace-format");
-  xgettext_record_flag ("ungettext:1:pass-python-brace-format");
-  xgettext_record_flag ("ungettext:2:pass-python-brace-format");
-  xgettext_record_flag ("dngettext:2:pass-python-brace-format");
-  xgettext_record_flag ("dngettext:3:pass-python-brace-format");
-  xgettext_record_flag ("_:1:pass-python-brace-format");
-  /* xgettext_record_flag ("format:1:python-brace-format"); */
 }
 
 
@@ -161,46 +149,6 @@
 static FILE *fp;
 
 
-/* 0. Terminate line by \n, regardless whether the external
-   representation of a line terminator is CR (Mac), and CR/LF
-   (DOS/Windows), as Python treats them equally.  */
-static int
-phase0_getc ()
-{
-  int c;
-
-  c = getc (fp);
-  if (c == EOF)
-    {
-      if (ferror (fp))
-        error (EXIT_FAILURE, errno, _("error while reading \"%s\""),
-               real_file_name);
-      return EOF;
-    }
-
-  if (c == '\r')
-    {
-      int c1 = getc (fp);
-
-      if (c1 != EOF && c1 != '\n')
-        ungetc (c1, fp);
-
-      /* Seen line terminator CR or CR/LF.  */
-      return '\n';
-    }
-
-  return c;
-}
-
-/* Supports only one pushback character, and not '\n'.  */
-static inline void
-phase0_ungetc (int c)
-{
-  if (c != EOF)
-    ungetc (c, fp);
-}
-
-
 /* 1. line_number handling.  */
 
 /* Maximum used, roughly a safer MB_LEN_MAX.  */
@@ -217,7 +165,17 @@
   if (phase1_pushback_length)
     c = phase1_pushback[--phase1_pushback_length];
   else
-    c = phase0_getc ();
+    {
+      c = getc (fp);
+
+      if (c == EOF)
+        {
+          if (ferror (fp))
+            error (EXIT_FAILURE, errno, _("error while reading \"%s\""),
+                   real_file_name);
+          return EOF;
+        }
+    }
 
   if (c == '\n')
     ++line_number;
@@ -389,7 +347,7 @@
               while (insize > 0)
                 phase1_ungetc (buf[--insize]);
               /* Convert the character from UTF-8 to UCS-4.  */
-              if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes)
+              if (u8_mbtouc (&uc, scratchbuf, outbytes) < outbytes)
                 {
                   /* scratchbuf contains an out-of-range Unicode character
                      (> 0x10ffff).  */
@@ -654,8 +612,7 @@
       iconv_t cd;
 
       /* Avoid glibc-2.1 bug with EUC-KR.  */
-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
-     && !defined _LIBICONV_VERSION
+# if (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
       if (strcmp (xgettext_current_file_source_encoding, "EUC-KR") == 0)
         cd = (iconv_t)(-1);
       else
@@ -825,6 +782,203 @@
    IS_UNICODE.  */
 #define UNICODE_VALUE(p7_result) ((p7_result) - 0x100)
 
+/* A string buffer type that allows appending bytes (in the
+   xgettext_current_source_encoding) or Unicode characters.
+   Returns the entire string in UTF-8 encoding.  */
+
+struct mixed_string_buffer
+{
+  /* The part of the string that has already been converted to UTF-8.  */
+  char *utf8_buffer;
+  size_t utf8_buflen;
+  size_t utf8_allocated;
+  /* The first half of an UTF-16 surrogate character.  */
+  unsigned short utf16_surr;
+  /* The part of the string that is still in the source encoding.  */
+  char *curr_buffer;
+  size_t curr_buflen;
+  size_t curr_allocated;
+  /* The lexical context.  Used only for error message purposes.  */
+  lexical_context_ty lcontext;
+};
+
+/* Initialize a 'struct mixed_string_buffer' to empty.  */
+static inline void
+init_mixed_string_buffer (struct mixed_string_buffer *bp, lexical_context_ty lcontext)
+{
+  bp->utf8_buffer = NULL;
+  bp->utf8_buflen = 0;
+  bp->utf8_allocated = 0;
+  bp->utf16_surr = 0;
+  bp->curr_buffer = NULL;
+  bp->curr_buflen = 0;
+  bp->curr_allocated = 0;
+  bp->lcontext = lcontext;
+}
+
+/* Auxiliary function: Append a byte to bp->curr.  */
+static inline void
+mixed_string_buffer_append_byte (struct mixed_string_buffer *bp, unsigned char c)
+{
+  if (bp->curr_buflen == bp->curr_allocated)
+    {
+      bp->curr_allocated = 2 * bp->curr_allocated + 10;
+      bp->curr_buffer = xrealloc (bp->curr_buffer, bp->curr_allocated);
+    }
+  bp->curr_buffer[bp->curr_buflen++] = c;
+}
+
+/* Auxiliary function: Ensure count more bytes are available in bp->utf8.  */
+static inline void
+mixed_string_buffer_append_unicode_grow (struct mixed_string_buffer *bp, size_t count)
+{
+  if (bp->utf8_buflen + count > bp->utf8_allocated)
+    {
+      size_t new_allocated = 2 * bp->utf8_allocated + 10;
+      if (new_allocated < bp->utf8_buflen + count)
+        new_allocated = bp->utf8_buflen + count;
+      bp->utf8_allocated = new_allocated;
+      bp->utf8_buffer = xrealloc (bp->utf8_buffer, new_allocated);
+    }
+}
+
+/* Auxiliary function: Append a Unicode character to bp->utf8.
+   uc must be < 0x110000.  */
+static inline void
+mixed_string_buffer_append_unicode (struct mixed_string_buffer *bp, ucs4_t uc)
+{
+  unsigned char utf8buf[6];
+  int count = u8_uctomb (utf8buf, uc, 6);
+
+  if (count < 0)
+    /* The caller should have ensured that uc is not out-of-range.  */
+    abort ();
+
+  mixed_string_buffer_append_unicode_grow (bp, count);
+  memcpy (bp->utf8_buffer + bp->utf8_buflen, utf8buf, count);
+  bp->utf8_buflen += count;
+}
+
+/* Auxiliary function: Flush bp->utf16_surr into bp->utf8_buffer.  */
+static inline void
+mixed_string_buffer_flush_utf16_surr (struct mixed_string_buffer *bp)
+{
+  if (bp->utf16_surr != 0)
+    {
+      /* A half surrogate is invalid, therefore use U+FFFD instead.  */
+      mixed_string_buffer_append_unicode (bp, 0xfffd);
+      bp->utf16_surr = 0;
+    }
+}
+
+/* Auxiliary function: Flush bp->curr_buffer into bp->utf8_buffer.  */
+static inline void
+mixed_string_buffer_flush_curr_buffer (struct mixed_string_buffer *bp, int lineno)
+{
+  if (bp->curr_buflen > 0)
+    {
+      char *curr;
+      size_t count;
+
+      mixed_string_buffer_append_byte (bp, '\0');
+
+      /* Convert from the source encoding to UTF-8.  */
+      curr = from_current_source_encoding (bp->curr_buffer, bp->lcontext,
+                                           logical_file_name, lineno);
+
+      /* Append it to bp->utf8_buffer.  */
+      count = strlen (curr);
+      mixed_string_buffer_append_unicode_grow (bp, count);
+      memcpy (bp->utf8_buffer + bp->utf8_buflen, curr, count);
+      bp->utf8_buflen += count;
+
+      if (curr != bp->curr_buffer)
+        free (curr);
+      bp->curr_buflen = 0;
+    }
+}
+
+/* Append a character or Unicode character to a 'struct mixed_string_buffer'.  */
+static void
+mixed_string_buffer_append (struct mixed_string_buffer *bp, int c)
+{
+  if (IS_UNICODE (c))
+    {
+      /* Append a Unicode character.  */
+
+      /* Switch from multibyte character mode to Unicode character mode.  */
+      mixed_string_buffer_flush_curr_buffer (bp, line_number);
+
+      /* Test whether this character and the previous one form a Unicode
+         surrogate character pair.  */
+      if (bp->utf16_surr != 0
+          && (c >= UNICODE (0xdc00) && c < UNICODE (0xe000)))
+        {
+          unsigned short utf16buf[2];
+          ucs4_t uc;
+
+          utf16buf[0] = bp->utf16_surr;
+          utf16buf[1] = UNICODE_VALUE (c);
+          if (u16_mbtouc (&uc, utf16buf, 2) != 2)
+            abort ();
+
+          mixed_string_buffer_append_unicode (bp, uc);
+          bp->utf16_surr = 0;
+        }
+      else
+        {
+          mixed_string_buffer_flush_utf16_surr (bp);
+
+          if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00))
+            bp->utf16_surr = UNICODE_VALUE (c);
+          else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000))
+            {
+              /* A half surrogate is invalid, therefore use U+FFFD instead.  */
+              mixed_string_buffer_append_unicode (bp, 0xfffd);
+            }
+          else
+            mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c));
+        }
+    }
+  else
+    {
+      /* Append a single byte.  */
+
+      /* Switch from Unicode character mode to multibyte character mode.  */
+      mixed_string_buffer_flush_utf16_surr (bp);
+
+      /* When a newline is seen, convert the accumulated multibyte sequence.
+         This ensures a correct line number in the error message in case of
+         a conversion error.  The "- 1" is to account for the newline.  */
+      if (c == '\n')
+        mixed_string_buffer_flush_curr_buffer (bp, line_number - 1);
+
+      mixed_string_buffer_append_byte (bp, (unsigned char) c);
+    }
+}
+
+/* Return the string buffer's contents.  */
+static char *
+mixed_string_buffer_result (struct mixed_string_buffer *bp)
+{
+  /* Flush all into bp->utf8_buffer.  */
+  mixed_string_buffer_flush_utf16_surr (bp);
+  mixed_string_buffer_flush_curr_buffer (bp, line_number);
+  /* NUL-terminate it.  */
+  mixed_string_buffer_append_unicode_grow (bp, 1);
+  bp->utf8_buffer[bp->utf8_buflen] = '\0';
+  /* Return it.  */
+  return bp->utf8_buffer;
+}
+
+/* Free the memory pointed to by a 'struct mixed_string_buffer'.  */
+static inline void
+free_mixed_string_buffer (struct mixed_string_buffer *bp)
+{
+  free (bp->utf8_buffer);
+  free (bp->curr_buffer);
+}
+
 
 /* ========================== Reading of tokens.  ========================== */
 
@@ -839,7 +993,6 @@
   token_type_rbracket,          /* ] */
   token_type_string,            /* "abc", 'abc', """abc""", '''abc''' */
   token_type_symbol,            /* symbol, number */
-  token_type_plus,              /* + */
   token_type_other              /* misc. operator */
 };
 typedef enum token_type_ty token_type_ty;
@@ -853,16 +1006,6 @@
   int line_number;
 };
 
-/* Free the memory pointed to by a 'struct token_ty'.  */
-static inline void
-free_token (token_ty *tp)
-{
-  if (tp->type == token_type_string || tp->type == token_type_symbol)
-    free (tp->string);
-  if (tp->type == token_type_string)
-    drop_reference (tp->comment);
-}
-
 
 /* There are two different input syntaxes for strings, "abc" and r"abc",
    and two different input syntaxes for Unicode strings, u"abc" and ur"abc".
@@ -1206,7 +1349,7 @@
 /* Number of pending open parentheses/braces/brackets.  */
 static int open_pbb;
 
-static token_ty phase5_pushback[2];
+static token_ty phase5_pushback[1];
 static int phase5_pushback_length;
 
 static void
@@ -1329,7 +1472,7 @@
 
         /* Strings.  */
           {
-            struct mixed_string_buffer *bp;
+            struct mixed_string_buffer literal;
             int quote_char;
             bool interpret_ansic;
             bool interpret_unicode;
@@ -1401,31 +1544,23 @@
               }
               backslash_counter = 0;
               /* Start accumulating the string.  */
-              bp = mixed_string_buffer_alloc (lexical_context,
-                                              logical_file_name,
-                                              line_number);
+              init_mixed_string_buffer (&literal, lc_string);
               for (;;)
                 {
                   int uc = phase7_getuc (quote_char, triple, interpret_ansic,
                                          interpret_unicode, &backslash_counter);
 
-                  /* Keep line_number in sync.  */
-                  bp->line_number = line_number;
-
                   if (uc == P7_EOF || uc == P7_STRING_END)
                     break;
 
                   if (IS_UNICODE (uc))
-                    {
-                      assert (UNICODE_VALUE (uc) >= 0
-                              && UNICODE_VALUE (uc) < 0x110000);
-                      mixed_string_buffer_append_unicode (bp,
-                                                          UNICODE_VALUE (uc));
-                    }
-                  else
-                    mixed_string_buffer_append_char (bp, uc);
+                    assert (UNICODE_VALUE (uc) >= 0
+                            && UNICODE_VALUE (uc) < 0x110000);
+
+                  mixed_string_buffer_append (&literal, uc);
                 }
-              tp->string = mixed_string_buffer_done (bp);
+              tp->string = xstrdup (mixed_string_buffer_result (&literal));
+              free_mixed_string_buffer (&literal);
               tp->comment = add_reference (savable_comment);
               lexical_context = lc_outside;
               tp->type = token_type_string;
@@ -1458,10 +1593,6 @@
           tp->type = (c == ']' ? token_type_rbracket : token_type_other);
           return;
 
-        case '+':
-          tp->type = token_type_plus;
-          return;
-
         default:
           /* We could carefully recognize each of the 2 and 3 character
              operators, but it is not necessary, as we only need to recognize
@@ -1493,54 +1624,23 @@
 x_python_lex (token_ty *tp)
 {
   phase5_get (tp);
-  if (tp->type == token_type_string)
+  if (tp->type != token_type_string)
+    return;
+  for (;;)
     {
-      char *sum = tp->string;
-      size_t sum_len = strlen (sum);
+      token_ty tmp;
+      size_t len;
 
-      for (;;)
+      phase5_get (&tmp);
+      if (tmp.type != token_type_string)
         {
-          token_ty token2, *tp2 = NULL;
-          token_ty token3;
-
-          phase5_get (&token2);
-          switch (token2.type)
-            {
-            case token_type_plus:
-              {
-                phase5_get (&token3);
-                if (token3.type == token_type_string)
-                  {
-                    free_token (&token2);
-                    tp2 = &token3;
-                  }
-                else
-                  phase5_unget (&token3);
-              }
-              break;
-            case token_type_string:
-              tp2 = &token2;
-              break;
-            default:
-              break;
-            }
-
-          if (tp2)
-            {
-              char *addend = tp2->string;
-              size_t addend_len = strlen (addend);
-
-              sum = (char *) xrealloc (sum, sum_len + addend_len + 1);
-              memcpy (sum + sum_len, addend, addend_len + 1);
-              sum_len += addend_len;
-
-              free_token (tp2);
-              continue;
-            }
-          phase5_unget (&token2);
-          break;
+          phase5_unget (&tmp);
+          return;
         }
-      tp->string = sum;
+      len = strlen (tp->string);
+      tp->string = xrealloc (tp->string, len + strlen (tmp.string) + 1);
+      strcpy (tp->string + len, tmp.string);
+      free (tmp.string);
     }
 }
 
@@ -1716,7 +1816,6 @@
           xgettext_current_source_encoding = xgettext_current_file_source_encoding;
           return true;
 
-        case token_type_plus:
         case token_type_other:
           next_context_iter = null_context_list_iterator;
           state = 0;
diff -Nru gettext-0.19.3/gettext-tools/src/x-python.h gettext-0.18.1.1/gettext-tools/src/x-python.h
--- gettext-0.19.3/gettext-tools/src/x-python.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-python.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_PYTHON \
   { "Python",           extract_python,                                   \
-                        &flag_table_python, &formatstring_python, &formatstring_python_brace, NULL }, \
+                        &flag_table_python, &formatstring_python, NULL }, \
 
 /* Scan a Python file and add its translatable strings to mdlp.  */
 extern void extract_python (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-rst.h gettext-0.18.1.1/gettext-tools/src/x-rst.h
--- gettext-0.19.3/gettext-tools/src/x-rst.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-rst.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_RST \
   { "RST",              extract_rst,                                    \
-                        NULL, &formatstring_pascal, NULL, NULL },             \
+                        NULL, &formatstring_pascal, NULL },             \
 
 /* Scan an RST file and add its translatable strings to mdlp.  */
 extern void extract_rst (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-scheme.c gettext-0.18.1.1/gettext-tools/src/x-scheme.c
--- gettext-0.19.3/gettext-tools/src/x-scheme.c	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-scheme.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext Scheme backend.
-   Copyright (C) 2004-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2004-2009 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2004-2005.
 
@@ -40,7 +40,7 @@
 
 
 /* The Scheme syntax is described in R5RS.  It is implemented in
-   guile-2.0.0/libguile/read.c.
+   guile-1.6.4/libguile/read.c.
    Since we are interested only in strings and in forms similar to
         (gettext msgid ...)
    or   (ngettext msgid msgid_plural ...)
@@ -60,7 +60,7 @@
    - The syntax code assigned to each character, and how tokens are built
      up from characters (single escape, multiple escape etc.).
 
-   - Comment syntax: ';' and '#! ... !#' and '#| ... |#' (may be nested).
+   - Comment syntax: ';' and '#! ... \n!#\n'.
 
    - String syntax: "..." with single escapes.
 
@@ -498,6 +498,7 @@
 {
   const char *str = tp->chars;
   int len = tp->charcount;
+  int radix = 10;
   enum { unknown, exact, inexact } exactness = unknown;
   bool seen_radix_prefix = false;
   bool seen_exactness_prefix = false;
@@ -512,21 +513,25 @@
         case 'B': case 'b':
           if (seen_radix_prefix)
             return false;
+          radix = 2;
           seen_radix_prefix = true;
           break;
         case 'O': case 'o':
           if (seen_radix_prefix)
             return false;
+          radix = 8;
           seen_radix_prefix = true;
           break;
         case 'D': case 'd':
           if (seen_radix_prefix)
             return false;
+          radix = 10;
           seen_radix_prefix = true;
           break;
         case 'X': case 'x':
           if (seen_radix_prefix)
             return false;
+          radix = 16;
           seen_radix_prefix = true;
           break;
         case 'E': case 'e':
@@ -677,7 +682,6 @@
   for (;;)
     {
       int c = do_getc ();
-      bool seen_underscore_prefix = false;
 
       switch (c)
         {
@@ -931,120 +935,26 @@
                 }
 
               case '!':
-                /* Block comment '#! ... !#'.  See
-                   <http://www.gnu.org/software/guile/manual/html_node/Block-Comments.html>.  */
+                /* Block comment '#! ... \n!#\n'.  We don't extract it
+                   because it's only used to introduce scripts on Unix.  */
                 {
-                  int c;
+                  int last1 = 0;
+                  int last2 = 0;
+                  int last3 = 0;
 
-                  comment_start ();
-                  c = do_getc ();
                   for (;;)
                     {
+                      c = do_getc ();
                       if (c == EOF)
+                        /* EOF is not allowed here.  But be tolerant.  */
                         break;
-                      if (c == '!')
-                        {
-                          c = do_getc ();
-                          if (c == EOF)
-                            break;
-                          if (c == '#')
-                            {
-                              comment_line_end (0);
-                              break;
-                            }
-                          else
-                            comment_add ('!');
-                        }
-                      else
-                        {
-                          /* We skip all leading white space.  */
-                          if (!(buflen == 0 && (c == ' ' || c == '\t')))
-                            comment_add (c);
-                          if (c == '\n')
-                            {
-                              comment_line_end (1);
-                              comment_start ();
-                            }
-                          c = do_getc ();
-                        }
-                    }
-                  if (c == EOF)
-                    {
-                      /* EOF not allowed here.  But be tolerant.  */
-                      op->type = t_eof;
-                      return;
-                    }
-                  last_comment_line = line_number;
-                  continue;
-                }
-
-              case '|':
-                /* Block comment '#| ... |#'.  See
-                   <http://www.gnu.org/software/guile/manual/html_node/Block-Comments.html>
-                   and <http://srfi.schemers.org/srfi-30/srfi-30.html>.  */
-                {
-                  int depth = 0;
-                  int c;
-
-                  comment_start ();
-                  c = do_getc ();
-                  for (;;)
-                    {
-                      if (c == EOF)
+                      if (last3 == '\n' && last2 == '!' && last1 == '#'
+                          && c == '\n')
                         break;
-                      if (c == '|')
-                        {
-                          c = do_getc ();
-                          if (c == EOF)
-                            break;
-                          if (c == '#')
-                            {
-                              if (depth == 0)
-                                {
-                                  comment_line_end (0);
-                                  break;
-                                }
-                              depth--;
-                              comment_add ('|');
-                              comment_add ('#');
-                              c = do_getc ();
-                            }
-                          else
-                            comment_add ('|');
-                        }
-                      else if (c == '#')
-                        {
-                          c = do_getc ();
-                          if (c == EOF)
-                            break;
-                          comment_add ('#');
-                          if (c == '|')
-                            {
-                              depth++;
-                              comment_add ('|');
-                              c = do_getc ();
-                            }
-                        }
-                      else
-                        {
-                          /* We skip all leading white space.  */
-                          if (!(buflen == 0 && (c == ' ' || c == '\t')))
-                            comment_add (c);
-                          if (c == '\n')
-                            {
-                              comment_line_end (1);
-                              comment_start ();
-                            }
-                          c = do_getc ();
-                        }
+                      last3 = last2;
+                      last2 = last1;
+                      last1 = c;
                     }
-                  if (c == EOF)
-                    {
-                      /* EOF not allowed here.  But be tolerant.  */
-                      op->type = t_eof;
-                      return;
-                    }
-                  last_comment_line = line_number;
                   continue;
                 }
 
@@ -1163,33 +1073,6 @@
             abort ();
           }
 
-        case '_':
-          /* GIMP script-fu extension: '_' before a string literal is
-             considered a gettext call on the string.  */
-          {
-            int c = do_getc ();
-            if (c == EOF)
-              /* Invalid input.  Be tolerant, no error message.  */
-              {
-                op->type = t_other;
-                return;
-              }
-            if (c != '"')
-              {
-                do_ungetc (c);
-
-                /* If '_' is not followed by a string literal,
-                   consider it a part of symbol.  */
-                op->token = XMALLOC (struct token);
-                read_token (op->token, '_');
-                op->type = t_symbol;
-                last_non_comment_line = line_number;
-                return;
-              }
-            seen_underscore_prefix = true;
-          }
-          /*FALLTHROUGH*/
-
         case '"':
           {
             op->token = XMALLOC (struct token);
@@ -1243,7 +1126,7 @@
               }
             op->type = t_string;
 
-            if (seen_underscore_prefix || extract_all)
+            if (extract_all)
               {
                 lex_pos_ty pos;
 
diff -Nru gettext-0.19.3/gettext-tools/src/x-scheme.h gettext-0.18.1.1/gettext-tools/src/x-scheme.h
--- gettext-0.19.3/gettext-tools/src/x-scheme.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-scheme.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_SCHEME \
   { "Scheme",           extract_scheme,                                   \
-                        &flag_table_scheme, &formatstring_scheme, NULL, NULL }, \
+                        &flag_table_scheme, &formatstring_scheme, NULL }, \
 
 /* Scan a Scheme file and add its translatable strings to mdlp.  */
 extern void extract_scheme (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-sh.h gettext-0.18.1.1/gettext-tools/src/x-sh.h
--- gettext-0.19.3/gettext-tools/src/x-sh.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-sh.h	2010-06-06 12:49:58.000000000 +0000
@@ -33,7 +33,7 @@
 
 #define SCANNERS_SH \
   { "Shell",            extract_sh,                                     \
-                        &flag_table_sh, &formatstring_sh, NULL, NULL },       \
+                        &flag_table_sh, &formatstring_sh, NULL },       \
 
 /* Scan a shell script file and add its translatable strings to mdlp.  */
 extern void extract_sh (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-smalltalk.c gettext-0.18.1.1/gettext-tools/src/x-smalltalk.c
--- gettext-0.19.3/gettext-tools/src/x-smalltalk.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-smalltalk.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext Smalltalk backend.
-   Copyright (C) 2002-2003, 2005-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2009 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -562,10 +562,9 @@
                 lex_pos_ty pos;
                 pos.file_name = logical_file_name;
                 pos.line_number = token.line_number;
-                if (plural_mp != NULL)
-                  remember_a_message_plural (plural_mp, token.string,
-                                             null_context, &pos,
-                                             savable_comment);
+                remember_a_message_plural (plural_mp, token.string,
+                                           null_context, &pos,
+                                           savable_comment);
                 state = 0;
                 break;
               }
diff -Nru gettext-0.19.3/gettext-tools/src/x-smalltalk.h gettext-0.18.1.1/gettext-tools/src/x-smalltalk.h
--- gettext-0.19.3/gettext-tools/src/x-smalltalk.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-smalltalk.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_SMALLTALK \
   { "Smalltalk",        extract_smalltalk,                              \
-                        NULL, &formatstring_smalltalk, NULL, NULL },          \
+                        NULL, &formatstring_smalltalk, NULL },          \
 
 /* Scan a Smalltalk file and add its translatable strings to mdlp.  */
 extern void extract_smalltalk (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-stringtable.h gettext-0.18.1.1/gettext-tools/src/x-stringtable.h
--- gettext-0.19.3/gettext-tools/src/x-stringtable.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-stringtable.h	2010-06-06 12:49:58.000000000 +0000
@@ -31,7 +31,7 @@
   { "strings", "NXStringTable" },                                       \
 
 #define SCANNERS_STRINGTABLE \
-  { "NXStringTable",    extract_stringtable, NULL, NULL, NULL, NULL },        \
+  { "NXStringTable",    extract_stringtable, NULL, NULL, NULL },        \
 
 /* Scan a JavaProperties file and add its translatable strings to mdlp.  */
 extern void extract_stringtable (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-tcl.c gettext-0.18.1.1/gettext-tools/src/x-tcl.c
--- gettext-0.19.3/gettext-tools/src/x-tcl.c	2014-05-08 04:25:58.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-tcl.c	2010-06-06 12:49:58.000000000 +0000
@@ -517,10 +517,7 @@
           {
             c = phase1_getc ();
             if (c == EOF || !c_isxdigit ((unsigned char) c))
-              {
-                phase1_ungetc (c);
-                break;
-              }
+              break;
 
             if (c >= '0' && c <= '9')
               n = (n << 4) + (c - '0');
@@ -529,6 +526,7 @@
             else if (c >= 'a' && c <= 'f')
               n = (n << 4) + (c - 'a' + 10);
           }
+        phase1_ungetc (c);
         return (i > 0 ? n : 'u');
       }
     case '0': case '1': case '2': case '3': case '4':
diff -Nru gettext-0.19.3/gettext-tools/src/x-tcl.h gettext-0.18.1.1/gettext-tools/src/x-tcl.h
--- gettext-0.19.3/gettext-tools/src/x-tcl.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-tcl.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_TCL \
   { "Tcl",              extract_tcl,                                    \
-                        &flag_table_tcl, &formatstring_tcl, NULL, NULL },     \
+                        &flag_table_tcl, &formatstring_tcl, NULL },     \
 
 /* Scan a Tcl file and add its translatable strings to mdlp.  */
 extern void extract_tcl (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/src/x-vala.c gettext-0.18.1.1/gettext-tools/src/x-vala.c
--- gettext-0.19.3/gettext-tools/src/x-vala.c	2014-07-14 02:59:12.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-vala.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1251 +0,0 @@
-/* xgettext Vala backend.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-
-   This file was written by Daiki Ueno <ueno@gnu.org>, 2013.
-
-   This 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 "x-vala.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "message.h"
-#include "xgettext.h"
-#include "error.h"
-#include "error-progname.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
-#include "hash.h"
-#include "po-charset.h"
-#include "gettext.h"
-
-#define _(s) gettext(s)
-
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-
-/* The Vala syntax is defined in the Vala Reference Manual
-   http://www.vala-project.org/doc/vala/.
-   See also vala/valascanner.vala.  */
-
-/* ====================== Keyword set customization.  ====================== */
-
-/* If true extract all strings.  */
-static bool extract_all = false;
-
-static hash_table keywords;
-static bool default_keywords = true;
-
-
-void
-x_vala_extract_all ()
-{
-  extract_all = true;
-}
-
-
-static void
-add_keyword (const char *name, hash_table *keywords)
-{
-  if (name == NULL)
-    default_keywords = false;
-  else
-    {
-      const char *end;
-      struct callshape shape;
-      const char *colon;
-
-      if (keywords->table == NULL)
-        hash_init (keywords, 100);
-
-      split_keywordspec (name, &end, &shape);
-
-      /* The characters between name and end should form a valid C identifier.
-         A colon means an invalid parse in split_keywordspec().  */
-      colon = strchr (name, ':');
-      if (colon == NULL || colon >= end)
-        insert_keyword_callshape (keywords, name, end - name, &shape);
-    }
-}
-
-void
-x_vala_keyword (const char *name)
-{
-  add_keyword (name, &keywords);
-}
-
-static void
-init_keywords ()
-{
-  if (default_keywords)
-    {
-      /* When adding new keywords here, also update the documentation in
-         xgettext.texi!  */
-      x_vala_keyword ("dgettext:2");
-      x_vala_keyword ("dcgettext:2");
-      x_vala_keyword ("ngettext:1,2");
-      x_vala_keyword ("dngettext:2,3");
-      x_vala_keyword ("dpgettext:2g");
-      x_vala_keyword ("dpgettext2:2c,3");
-      x_vala_keyword ("_");
-      x_vala_keyword ("Q_");
-      x_vala_keyword ("N_");
-      x_vala_keyword ("NC_:1c,2");
-
-      default_keywords = false;
-    }
-}
-
-void
-init_flag_table_vala ()
-{
-  xgettext_record_flag ("dgettext:2:pass-c-format");
-  xgettext_record_flag ("dcgettext:2:pass-c-format");
-  xgettext_record_flag ("ngettext:1:pass-c-format");
-  xgettext_record_flag ("ngettext:2:pass-c-format");
-  xgettext_record_flag ("dngettext:2:pass-c-format");
-  xgettext_record_flag ("dngettext:3:pass-c-format");
-  xgettext_record_flag ("dpgettext:2:pass-c-format");
-  xgettext_record_flag ("dpgettext2:3:pass-c-format");
-  xgettext_record_flag ("_:1:pass-c-format");
-  xgettext_record_flag ("Q_:1:pass-c-format");
-  xgettext_record_flag ("N_:1:pass-c-format");
-  xgettext_record_flag ("NC_:2:pass-c-format");
-
-  /* Vala leaves string formatting to Glib functions and thus the
-     format string is exactly same as C.  See also
-     vapi/glib-2.0.vapi.  */
-  xgettext_record_flag ("printf:1:c-format");
-  xgettext_record_flag ("vprintf:1:c-format");
-}
-
-
-/* ======================== Reading of characters.  ======================== */
-
-/* Real filename, used in error messages about the input file.  */
-static const char *real_file_name;
-
-/* Logical filename and line number, used to label the extracted messages.  */
-static char *logical_file_name;
-static int line_number;
-
-/* The input file stream.  */
-static FILE *fp;
-
-
-/* 1. line_number handling.  */
-
-#define MAX_PHASE1_PUSHBACK 16
-static unsigned char phase1_pushback[MAX_PHASE1_PUSHBACK];
-static int phase1_pushback_length;
-
-
-static int
-phase1_getc ()
-{
-  int c;
-
-  if (phase1_pushback_length)
-    c = phase1_pushback[--phase1_pushback_length];
-  else
-    {
-      c = getc (fp);
-      if (c == EOF)
-        {
-          if (ferror (fp))
-            error (EXIT_FAILURE, errno, _("error while reading \"%s\""),
-                   real_file_name);
-          return EOF;
-        }
-    }
-
-  if (c == '\n')
-    ++line_number;
-  return c;
-}
-
-
-/* Supports 2 characters of pushback.  */
-static void
-phase1_ungetc (int c)
-{
-  if (c != EOF)
-    {
-      if (c == '\n')
-        --line_number;
-
-      if (phase1_pushback_length == SIZEOF (phase1_pushback))
-        abort ();
-      phase1_pushback[phase1_pushback_length++] = c;
-    }
-}
-
-
-/* These are for tracking whether comments count as immediately before
-   keyword.  */
-static int last_comment_line;
-static int last_non_comment_line;
-
-/* Accumulating comments.  */
-
-static char *buffer;
-static size_t bufmax;
-static size_t buflen;
-
-static inline void
-comment_start ()
-{
-  buflen = 0;
-}
-
-static inline void
-comment_add (int c)
-{
-  if (buflen >= bufmax)
-    {
-      bufmax = 2 * bufmax + 10;
-      buffer = xrealloc (buffer, bufmax);
-    }
-  buffer[buflen++] = c;
-}
-
-static inline void
-comment_line_end (size_t chars_to_remove)
-{
-  buflen -= chars_to_remove;
-  while (buflen >= 1
-         && (buffer[buflen - 1] == ' ' || buffer[buflen - 1] == '\t'))
-    --buflen;
-  if (chars_to_remove == 0 && buflen >= bufmax)
-    {
-      bufmax = 2 * bufmax + 10;
-      buffer = xrealloc (buffer, bufmax);
-    }
-  buffer[buflen] = '\0';
-  savable_comment_add (buffer);
-}
-
-
-/* 2. Replace each comment that is not inside a character constant or
-   string literal with a space character.  */
-
-static int
-phase2_getc ()
-{
-  int c;
-  bool last_was_star;
-
-  c = phase1_getc ();
-  if (c != '/')
-    return c;
-  c = phase1_getc ();
-  switch (c)
-    {
-    default:
-      phase1_ungetc (c);
-      return '/';
-
-    case '*':
-      /* C comment.  */
-      comment_start ();
-      last_was_star = false;
-      for (;;)
-        {
-          c = phase1_getc ();
-          if (c == EOF)
-            break;
-          /* We skip all leading white space, but not EOLs.  */
-          if (!(buflen == 0 && (c == ' ' || c == '\t')))
-            comment_add (c);
-          switch (c)
-            {
-            case '\n':
-              comment_line_end (1);
-              comment_start ();
-              last_was_star = false;
-              continue;
-
-            case '*':
-              last_was_star = true;
-              continue;
-
-            case '/':
-              if (last_was_star)
-                {
-                  comment_line_end (2);
-                  break;
-                }
-              /* FALLTHROUGH */
-
-            default:
-              last_was_star = false;
-              continue;
-            }
-          break;
-        }
-      last_comment_line = line_number;
-      return ' ';
-
-    case '/':
-      /* C++ or ISO C 99 comment.  */
-      comment_start ();
-      for (;;)
-        {
-          c = phase1_getc ();
-          if (c == '\n' || c == EOF)
-            break;
-          /* We skip all leading white space, but not EOLs.  */
-          if (!(buflen == 0 && (c == ' ' || c == '\t')))
-            comment_add (c);
-        }
-      comment_line_end (0);
-      last_comment_line = line_number;
-      return '\n';
-    }
-}
-
-
-static void
-phase2_ungetc (int c)
-{
-  phase1_ungetc (c);
-}
-
-
-/* ========================== Reading of tokens.  ========================== */
-
-enum token_type_ty
-{
-  token_type_character_constant,        /* 'x' */
-  token_type_eof,
-  token_type_lparen,                    /* ( */
-  token_type_rparen,                    /* ) */
-  token_type_lbrace,                    /* { */
-  token_type_rbrace,                    /* } */
-  token_type_assign,                    /* = */
-  token_type_return,                    /* return */
-  token_type_plus,                      /* + */
-  token_type_minus,                     /* - */
-  token_type_equality_test_operator,    /* == < > >= <= != */
-  token_type_logic_operator,            /* ! && || */
-  token_type_comma,                     /* , */
-  token_type_colon,                     /* : */
-  token_type_number,                    /* 2.7 */
-  token_type_string_literal,            /* "abc" */
-  token_type_string_template,           /* @"abc" */
-  token_type_regex_literal,             /* /.../ */
-  token_type_symbol,                    /* if else etc. */
-  token_type_other
-};
-typedef enum token_type_ty token_type_ty;
-
-typedef struct token_ty token_ty;
-struct token_ty
-{
-  token_type_ty type;
-  char *string;         /* for token_type_symbol, token_type_string_literal */
-  refcounted_string_list_ty *comment;   /* for token_type_string_literal */
-  enum literalstring_escape_type escape;
-  int line_number;
-};
-
-/* Free the memory pointed to by a 'struct token_ty'.  */
-static inline void
-free_token (token_ty *tp)
-{
-  if (tp->type == token_type_string_literal || tp->type == token_type_symbol)
-    free (tp->string);
-  if (tp->type == token_type_string_literal)
-    drop_reference (tp->comment);
-}
-
-
-/* 3. Parse each resulting logical line as preprocessing tokens and
-   white space.  Preprocessing tokens and Vala tokens don't always
-   match.  */
-
-static token_ty phase3_pushback[2];
-static int phase3_pushback_length;
-
-
-static token_type_ty last_token_type = token_type_other;
-
-static void
-phase3_scan_regex ()
-{
-    int c;
-
-    for (;;)
-      {
-        c = phase1_getc ();
-        if (c == '/')
-          break;
-        if (c == '\\')
-          {
-            c = phase1_getc ();
-            if (c != EOF)
-              continue;
-          }
-        if (c == EOF)
-          {
-            error_with_progname = false;
-            error (0, 0,
-                   _("%s:%d: warning: regular expression literal terminated too early"),
-                   logical_file_name, line_number);
-            error_with_progname = true;
-            return;
-          }
-      }
-
-    c = phase2_getc ();
-    if (!(c == 'i' || c == 's' || c == 'm' || c == 'x'))
-      phase2_ungetc (c);
-}
-
-static void
-phase3_get (token_ty *tp)
-{
-  static char *buffer;
-  static int bufmax;
-  int bufpos;
-  int last_was_backslash;
-
-  if (phase3_pushback_length)
-    {
-      *tp = phase3_pushback[--phase3_pushback_length];
-      last_token_type = tp->type;
-      return;
-    }
-
-  for (;;)
-    {
-      bool template;
-      bool verbatim;
-      int c;
-
-      tp->line_number = line_number;
-      c = phase2_getc ();
-
-      switch (c)
-        {
-        case EOF:
-          tp->type = last_token_type = token_type_eof;
-          return;
-
-        case '\n':
-          if (last_non_comment_line > last_comment_line)
-            savable_comment_reset ();
-          /* FALLTHROUGH */
-        case ' ':
-        case '\f':
-        case '\t':
-          /* Ignore whitespace and comments.  */
-          continue;
-        default:
-          break;
-        }
-
-      last_non_comment_line = tp->line_number;
-      template = false;
-      verbatim = false;
-
-      switch (c)
-        {
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
-        case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
-        case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
-        case 'V': case 'W': case 'X': case 'Y': case 'Z':
-        case '_':
-        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
-        case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
-        case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
-        case 'v': case 'w': case 'x': case 'y': case 'z':
-          bufpos = 0;
-          for (;;)
-            {
-              if (bufpos >= bufmax)
-                {
-                  bufmax = 2 * bufmax + 10;
-                  buffer = xrealloc (buffer, bufmax);
-                }
-              buffer[bufpos++] = c;
-              c = phase2_getc ();
-              switch (c)
-                {
-                case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-                case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
-                case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-                case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
-                case 'Y': case 'Z':
-                case '_':
-                case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-                case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
-                case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
-                case 's': case 't': case 'u': case 'v': case 'w': case 'x':
-                case 'y': case 'z':
-                case '0': case '1': case '2': case '3': case '4':
-                case '5': case '6': case '7': case '8': case '9':
-                  continue;
-
-                default:
-                  phase2_ungetc (c);
-                  break;
-                }
-              break;
-            }
-          if (bufpos >= bufmax)
-            {
-              bufmax = 2 * bufmax + 10;
-              buffer = xrealloc (buffer, bufmax);
-            }
-          buffer[bufpos] = 0;
-          if (strcmp (buffer, "return") == 0)
-            tp->type = last_token_type = token_type_return;
-          else
-            {
-              tp->string = xstrdup (buffer);
-              tp->type = last_token_type = token_type_symbol;
-            }
-          return;
-
-        case '.':
-          c = phase2_getc ();
-          phase2_ungetc (c);
-          switch (c)
-            {
-            default:
-              tp->string = xstrdup (".");
-              tp->type = last_token_type = token_type_symbol;
-              return;
-
-            case '0': case '1': case '2': case '3': case '4':
-            case '5': case '6': case '7': case '8': case '9':
-              c = '.';
-              break;
-            }
-          /* FALLTHROUGH */
-
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-          /* The preprocessing number token is more "generous" than the C
-             number tokens.  This is mostly due to token pasting (another
-             thing we can ignore here).  */
-          bufpos = 0;
-          for (;;)
-            {
-              if (bufpos >= bufmax)
-                {
-                  bufmax = 2 * bufmax + 10;
-                  buffer = xrealloc (buffer, bufmax);
-                }
-              buffer[bufpos++] = c;
-              c = phase2_getc ();
-              switch (c)
-                {
-                case 'e':
-                case 'E':
-                  if (bufpos >= bufmax)
-                    {
-                      bufmax = 2 * bufmax + 10;
-                      buffer = xrealloc (buffer, bufmax);
-                    }
-                  buffer[bufpos++] = c;
-                  c = phase2_getc ();
-                  if (c != '+' && c != '-')
-                    {
-                      phase2_ungetc (c);
-                      break;
-                    }
-                  continue;
-
-                case 'A': case 'B': case 'C': case 'D':           case 'F':
-                case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
-                case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-                case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
-                case 'Y': case 'Z':
-                case 'a': case 'b': case 'c': case 'd':           case 'f':
-                case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
-                case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
-                case 's': case 't': case 'u': case 'v': case 'w': case 'x':
-                case 'y': case 'z':
-                case '0': case '1': case '2': case '3': case '4':
-                case '5': case '6': case '7': case '8': case '9':
-                case '.':
-                  continue;
-
-                default:
-                  phase2_ungetc (c);
-                  break;
-                }
-              break;
-            }
-          if (bufpos >= bufmax)
-            {
-              bufmax = 2 * bufmax + 10;
-              buffer = xrealloc (buffer, bufmax);
-            }
-          buffer[bufpos] = 0;
-          tp->type = last_token_type = token_type_number;
-          return;
-
-        case '\'':
-          last_was_backslash = false;
-          for (;;)
-            {
-              c = phase2_getc ();
-              if (last_was_backslash)
-                {
-                  last_was_backslash = false;
-                  continue;
-                }
-              switch (c)
-                {
-                case '\\':
-                  last_was_backslash = true;
-                  /* FALLTHROUGH */
-                default:
-                  continue;
-                case '\n':
-                  error_with_progname = false;
-                  error (0, 0, _("%s:%d: warning: unterminated character constant"),
-                         logical_file_name, line_number - 1);
-                  error_with_progname = true;
-                  phase2_ungetc ('\n');
-                  break;
-                case EOF: case '\'':
-                  break;
-                }
-              break;
-            }
-          tp->type = last_token_type = token_type_character_constant;
-          return;
-
-          /* Vala provides strings in three different formats.
-
-             Usual string literals:
-               "..."
-             Verbatim string literals:
-               """...""" (where ... can include newlines and double quotes)
-             String templates.
-               @"...", @"""..."""
-          
-             Note that, with the current implementation string
-             templates are not subject to translation, because they are
-             inspected at compile time.  For example, the following code
-
-               string bar = "bar";
-               string foo = _(@"foo $bar");
-
-             will be translated into the C code, like:
-
-               _(g_strconcat ("foo ", "bar", NULL));  */
-        case '@':
-          c = phase2_getc ();
-          if (c != '"')
-            {
-              phase2_ungetc (c);
-              tp->type = last_token_type = token_type_other;
-              return;
-            }
-          template = true;
-          /* FALLTHROUGH */
-        case '"':
-          {
-            int c2 = phase2_getc ();
-
-            if (c2 == '"')
-              {
-                int c3 = phase2_getc ();
-                if (c3 == '"')
-                  verbatim = true;
-                else
-                  {
-                    phase2_ungetc (c3);
-                    phase2_ungetc (c2);
-                  }
-              }
-            else
-              phase2_ungetc (c2);
-
-            if (verbatim)
-              {
-                bufpos = 0;
-                for (;;)
-                  {
-                    /* Use phase 1, because phase 2 elides comments.  */
-                    c = phase1_getc ();
-                    if (c == EOF)
-                      break;
-
-                    if (c == '"')
-                      {
-                        int c2 = phase1_getc ();
-                        if (c2 == '"')
-                          {
-                            int c3 = phase1_getc ();
-                            if (c3 == '"')
-                              break;
-                            phase1_ungetc (c3);
-                          }
-                        phase1_ungetc (c2);
-                      }
-                    if (bufpos >= bufmax)
-                      {
-                        bufmax = 2 * bufmax + 10;
-                        buffer = xrealloc (buffer, bufmax);
-                      }
-                    buffer[bufpos++] = c;
-                  }
-              }
-            else
-              {
-                last_was_backslash = false;
-                bufpos = 0;
-                for (;;)
-                  {
-                    c = phase1_getc ();
-                    if (last_was_backslash)
-                      {
-                        last_was_backslash = false;
-                        if (bufpos >= bufmax)
-                          {
-                            bufmax = 2 * bufmax + 10;
-                            buffer = xrealloc (buffer, bufmax);
-                          }
-                        buffer[bufpos++] = c;
-                        continue;
-                      }
-
-                    switch (c)
-                      {
-                      case '\\':
-                        last_was_backslash = true;
-                        /* FALLTHROUGH */
-                      default:
-                        if (bufpos >= bufmax)
-                          {
-                            bufmax = 2 * bufmax + 10;
-                            buffer = xrealloc (buffer, bufmax);
-                          }
-                        buffer[bufpos++] = c;
-                        continue;
-
-                      case '\n':
-                        error_with_progname = false;
-                        error (0, 0, _("\
-%s:%d: warning: unterminated string literal"),
-                               logical_file_name, line_number - 1);
-                        error_with_progname = true;
-                        phase1_ungetc ('\n');
-                        break;
-                      case EOF: case '"':
-                        break;
-                      }
-                    break;
-                  }
-              }
-            if (bufpos >= bufmax)
-              {
-                bufmax = 2 * bufmax + 10;
-                buffer = xrealloc (buffer, bufmax);
-              }
-            buffer[bufpos] = 0;
-            tp->type = last_token_type = template
-              ? token_type_string_template : token_type_string_literal;
-            tp->string = xstrdup (buffer);
-            tp->comment = add_reference (savable_comment);
-            tp->escape = verbatim ? 0 : LET_ANSI_C | LET_UNICODE;
-            return;
-          }
-
-        case '/':
-          switch (last_token_type)
-            {
-            case token_type_lparen:
-            case token_type_lbrace:
-            case token_type_assign:
-            case token_type_return:
-            case token_type_plus:
-            case token_type_minus:
-            case token_type_equality_test_operator:
-            case token_type_logic_operator:
-            case token_type_comma:
-              phase3_scan_regex ();
-              tp->type = last_token_type = token_type_regex_literal;
-              break;
-            default:
-              {
-                int c2 = phase2_getc ();
-                if (c2 == '=')
-                  {
-                    /* /= */
-                    phase2_ungetc (c2);
-                  }
-                tp->type = last_token_type = token_type_other;
-                break;
-              }
-            }
-          return;
-
-        case '(':
-          tp->type = last_token_type = token_type_lparen;
-          return;
-
-        case ')':
-          tp->type = last_token_type = token_type_rparen;
-          return;
-
-        case '{':
-          tp->type = last_token_type = token_type_lbrace;
-          return;
-
-        case '}':
-          tp->type = last_token_type = token_type_rbrace;
-          return;
-
-        case '+':
-          {
-            int c2 = phase2_getc ();
-            switch (c2)
-              {
-              case '=': case '+':
-                tp->type = last_token_type = token_type_other;
-                break;
-              default:
-                phase2_ungetc (c2);
-                tp->type = last_token_type = token_type_plus;
-                break;
-              }
-            return;
-          }
-
-        case '-':
-          {
-            int c2 = phase2_getc ();
-            switch (c2)
-              {
-              case '=': case '-':
-                tp->type = last_token_type = token_type_other;
-                break;
-              default:
-                phase2_ungetc (c2);
-                tp->type = last_token_type = token_type_minus;
-                break;
-              }
-            return;
-          }
-
-        case '=':
-          {
-            int c2 = phase2_getc ();
-            switch (c2)
-              {
-              case '=':
-                tp->type = last_token_type = token_type_equality_test_operator;
-                break;
-              case '>':
-                tp->type = last_token_type = token_type_other;
-                break;
-              default:
-                phase2_ungetc (c2);
-                tp->type = last_token_type = token_type_assign;
-                break;
-              }
-            return;
-          }
-
-        case '!':
-          {
-            int c2 = phase2_getc ();
-            if (c2 == '=')
-              {
-                tp->type = last_token_type = token_type_equality_test_operator;
-                return;
-              }
-            phase2_ungetc (c2);
-            tp->type = last_token_type = token_type_logic_operator;
-            return;
-          }
-          
-        case '>':
-        case '<':
-          {
-            int c2 = phase2_getc ();
-            if (c2 == '=')
-	      tp->type = last_token_type = token_type_equality_test_operator;
-            else if (c2 == c)
-              {
-                int c3 = phase2_getc ();
-                if (c3 != '=')
-                  phase2_ungetc (c3);
-                tp->type = last_token_type = token_type_other;
-              }
-            else
-              {
-                phase2_ungetc (c2);
-                tp->type = last_token_type = token_type_equality_test_operator;
-              }
-          }
-          return;
-          
-        case ',':
-          tp->type = last_token_type = token_type_comma;
-          return;
-
-        case ':':
-          tp->type = last_token_type = token_type_colon;
-          return;
-
-        case '&':
-        case '|':
-          {
-            int c2 = phase2_getc ();
-            if (c2 == c)
-	      tp->type = last_token_type = token_type_logic_operator;
-            else if (c2 == '=')
-	      tp->type = last_token_type = token_type_other;
-            else
-              {
-                phase2_ungetc (c2);
-                tp->type = last_token_type = token_type_other;
-              }
-          }
-          return;
-
-        case '?':
-          {
-            int c2 = phase2_getc ();
-            if (c2 == '?')
-              {
-                tp->type = last_token_type = token_type_logic_operator;
-                return;
-              }
-            phase2_ungetc (c2);
-            tp->type = last_token_type = token_type_other;
-            return;
-          }
-
-        default:
-          tp->type = last_token_type = token_type_other;
-          return;
-        }
-    }
-}
-
-static void
-phase3_unget (token_ty *tp)
-{
-  if (tp->type != token_type_eof)
-    {
-      if (phase3_pushback_length == SIZEOF (phase3_pushback))
-        abort ();
-      phase3_pushback[phase3_pushback_length++] = *tp;
-    }
-}
-
-
-/* String concatenation with '+'.  */
-
-static void
-x_vala_lex (token_ty *tp)
-{
-  phase3_get (tp);
-  if (tp->type == token_type_string_literal)
-    {
-      char *sum = tp->string;
-      size_t sum_len = strlen (sum);
-
-      for (;;)
-        {
-          token_ty token2;
-
-          phase3_get (&token2);
-          if (token2.type == token_type_plus)
-            {
-              token_ty token3;
-
-              phase3_get (&token3);
-              if (token3.type == token_type_string_literal)
-                {
-                  char *addend = token3.string;
-                  size_t addend_len = strlen (addend);
-
-                  sum = (char *) xrealloc (sum, sum_len + addend_len + 1);
-                  memcpy (sum + sum_len, addend, addend_len + 1);
-                  sum_len += addend_len;
-
-                  free_token (&token3);
-                  free_token (&token2);
-                  continue;
-                }
-              phase3_unget (&token3);
-            }
-          phase3_unget (&token2);
-          break;
-        }
-      tp->string = sum;
-    }
-}
-
-
-/* ========================= Extracting strings.  ========================== */
-
-
-/* Context lookup table.  */
-static flag_context_list_table_ty *flag_context_list_table;
-
-/* Use the same literalstring_parser provided by the C scanner.  */
-extern struct literalstring_parser literalstring_c;
-
-/* The file is broken into tokens.  Scan the token stream, looking for
-   a keyword, followed by a left paren, followed by a string.  When we
-   see this sequence, we have something to remember.  We assume we are
-   looking at a valid Vala program, and leave the complaints about the
-   grammar to the compiler.
-
-     Normal handling: Look for
-       keyword ( ... msgid ... )
-       keyword msgid
-     Plural handling: Look for
-       keyword ( ... msgid ... msgid_plural ... )
-
-   We use recursion because the arguments before msgid or between msgid
-   and msgid_plural can contain subexpressions of the same form.  */
-
-/* Extract messages until the next balanced closing parenthesis or bracket.
-   Extracted messages are added to MLP.
-   DELIM can be either token_type_rparen or token_type_rbracket, or
-   token_type_eof to accept both.
-   Return true upon eof, false upon closing parenthesis or bracket.  */
-static bool
-extract_balanced (message_list_ty *mlp, token_type_ty delim,
-                  flag_context_ty outer_context,
-                  flag_context_list_iterator_ty context_iter,
-                  struct arglist_parser *argparser)
-{
-  /* Current argument number.  */
-  int arg = 1;
-  /* 0 when no keyword has been seen.  1 right after a keyword is seen.  */
-  int state;
-  /* Parameters of the keyword just seen.  Defined only in state 1.  */
-  const struct callshapes *next_shapes = NULL;
-  /* Context iterator that will be used if the next token is a '('.  */
-  flag_context_list_iterator_ty next_context_iter =
-    passthrough_context_list_iterator;
-  /* Current context.  */
-  flag_context_ty inner_context =
-    inherited_context (outer_context,
-                       flag_context_list_iterator_advance (&context_iter));
-
-  /* Start state is 0.  */
-  state = 0;
-
-  for (;;)
-    {
-      token_ty token;
-
-      x_vala_lex (&token);
-
-      switch (token.type)
-        {
-        case token_type_symbol:
-          {
-            void *keyword_value;
-
-            if (hash_find_entry (&keywords, token.string, strlen (token.string),
-                                 &keyword_value)
-                == 0)
-              {
-                next_shapes = (const struct callshapes *) keyword_value;
-                state = 1;
-              }
-            else
-              state = 0;
-          }
-          next_context_iter =
-            flag_context_list_iterator (
-              flag_context_list_table_lookup (
-                flag_context_list_table,
-                token.string, strlen (token.string)));
-          free (token.string);
-          continue;
-
-        case token_type_lparen:
-          if (extract_balanced (mlp, token_type_rparen,
-                                inner_context, next_context_iter,
-                                arglist_parser_alloc (mlp,
-                                                      state ? next_shapes : NULL)))
-            {
-              arglist_parser_done (argparser, arg);
-              return true;
-            }
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          break;
-
-        case token_type_rparen:
-          if (delim == token_type_rparen || delim == token_type_eof)
-            {
-              arglist_parser_done (argparser, arg);
-              return false;
-            }
-
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_comma:
-          arg++;
-          inner_context =
-            inherited_context (outer_context,
-                               flag_context_list_iterator_advance (
-                                 &context_iter));
-          next_context_iter = passthrough_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_eof:
-          arglist_parser_done (argparser, arg);
-          return true;
-
-        case token_type_string_literal:
-          {
-            lex_pos_ty pos;
-            pos.file_name = logical_file_name;
-            pos.line_number = token.line_number;
-
-            if (extract_all)
-              {
-                char *string;
-                refcounted_string_list_ty *comment;
-                const char *encoding;
-
-                string = literalstring_c.parse (token.string, &pos,
-                                                token.escape);
-                free (token.string);
-                token.string = string;
-
-                if (token.comment != NULL)
-                  {
-                    comment = savable_comment_convert_encoding (token.comment,
-                                                                &pos);
-                    drop_reference (token.comment);
-                    token.comment = comment;
-                  }
-
-                /* token.string and token.comment are already converted
-                   to UTF-8.  Prevent further conversion in
-                   remember_a_message.  */
-                encoding = xgettext_current_source_encoding;
-                xgettext_current_source_encoding = po_charset_utf8;
-                remember_a_message (mlp, NULL, token.string, inner_context,
-                                    &pos, NULL, token.comment);
-                xgettext_current_source_encoding = encoding;
-              }
-            else
-              {
-                /* A string immediately after a symbol means a
-                   function call.  */
-                if (state)
-                  {
-                    struct arglist_parser *tmp_argparser;
-                    tmp_argparser = arglist_parser_alloc (mlp, next_shapes);
-
-                    arglist_parser_remember_literal (tmp_argparser, 1,
-                                                     token.string,
-                                                     inner_context,
-                                                     pos.file_name,
-                                                     pos.line_number,
-                                                     token.comment,
-                                                     token.escape);
-                    arglist_parser_done (tmp_argparser, 1);
-                  }
-                else
-                  arglist_parser_remember_literal (argparser, arg, token.string,
-                                                   inner_context, pos.file_name,
-                                                   pos.line_number,
-                                                   token.comment,
-                                                   token.escape);
-              }
-          }
-          drop_reference (token.comment);
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        case token_type_character_constant:
-        case token_type_lbrace:
-        case token_type_rbrace:
-        case token_type_assign:
-        case token_type_return:
-        case token_type_plus:
-        case token_type_minus:
-        case token_type_equality_test_operator:
-        case token_type_logic_operator:
-        case token_type_colon:
-        case token_type_number:
-        case token_type_string_template:
-        case token_type_regex_literal:
-        case token_type_other:
-          next_context_iter = null_context_list_iterator;
-          state = 0;
-          continue;
-
-        default:
-          abort ();
-        }
-    }
-}
-
-void
-extract_vala (FILE *f,
-              const char *real_filename, const char *logical_filename,
-              flag_context_list_table_ty *flag_table,
-              msgdomain_list_ty *mdlp)
-{
-  message_list_ty *mlp = mdlp->item[0]->messages;
-
-  fp = f;
-  real_file_name = real_filename;
-  logical_file_name = xstrdup (logical_filename);
-  line_number = 1;
-
-  last_comment_line = -1;
-  last_non_comment_line = -1;
-
-  flag_context_list_table = flag_table;
-
-  init_keywords ();
-
-  /* Eat tokens until eof is seen.  When extract_parenthesized returns
-     due to an unbalanced closing parenthesis, just restart it.  */
-  while (!extract_balanced (mlp, token_type_eof,
-                            null_context, null_context_list_iterator,
-                            arglist_parser_alloc (mlp, NULL)))
-    ;
-
-  fp = NULL;
-  real_file_name = NULL;
-  logical_file_name = NULL;
-  line_number = 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/src/x-vala.h gettext-0.18.1.1/gettext-tools/src/x-vala.h
--- gettext-0.19.3/gettext-tools/src/x-vala.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-vala.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* xgettext Vala backend.
-   Copyright (C) 2002-2003, 2006, 2013 Free Software Foundation, Inc.
-
-   This 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 <stdio.h>
-
-#include "message.h"
-#include "xgettext.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define EXTENSIONS_VALA \
-  { "vala",        "Vala"   },                                        \
-
-#define SCANNERS_VALA \
-  { "Vala",       extract_vala,                               \
-                  &flag_table_vala, &formatstring_c, NULL, &literalstring_c }, \
-
-/* Scan a Vala file and add its translatable strings to mdlp.  */
-extern void extract_vala (FILE *fp, const char *real_filename,
-                          const char *logical_filename,
-                          flag_context_list_table_ty *flag_table,
-                          msgdomain_list_ty *mdlp);
-
-extern void x_vala_keyword (const char *keyword);
-extern void x_vala_extract_all (void);
-
-extern void init_flag_table_vala (void);
-
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru gettext-0.19.3/gettext-tools/src/x-ycp.c gettext-0.18.1.1/gettext-tools/src/x-ycp.c
--- gettext-0.19.3/gettext-tools/src/x-ycp.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-ycp.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgettext YCP backend.
-   Copyright (C) 2001-2003, 2005-2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2009 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -640,7 +640,6 @@
                        bool in_i18n)
 {
   int state; /* 1 or 2 inside _( ... ), otherwise 0 */
-  int plural_state = 0; /* defined only when in states 1 and 2 */
   message_ty *plural_mp = NULL; /* defined only when in states 1 and 2 */
   /* Context iterator that will be used if the next token is a '('.  */
   flag_context_list_iterator_ty next_context_iter =
@@ -679,22 +678,20 @@
               pos.file_name = logical_file_name;
               pos.line_number = token.line_number;
 
-              if (plural_state == 0)
+              if (plural_mp == NULL)
                 {
                   /* Seen an msgid.  */
                   plural_mp = remember_a_message (mlp, NULL, token.string,
                                                   inner_context, &pos,
                                                   NULL, token.comment);
-                  plural_state = 1;
                   state = 2;
                 }
               else
                 {
                   /* Seen an msgid_plural.  */
-                  if (plural_mp != NULL)
-                    remember_a_message_plural (plural_mp, token.string,
-                                               inner_context, &pos,
-                                               token.comment);
+                  remember_a_message_plural (plural_mp, token.string,
+                                             inner_context, &pos,
+                                             token.comment);
                   state = 0;
                 }
               drop_reference (token.comment);
diff -Nru gettext-0.19.3/gettext-tools/src/x-ycp.h gettext-0.18.1.1/gettext-tools/src/x-ycp.h
--- gettext-0.19.3/gettext-tools/src/x-ycp.h	2014-05-09 09:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/src/x-ycp.h	2010-06-06 12:49:58.000000000 +0000
@@ -32,7 +32,7 @@
 
 #define SCANNERS_YCP \
   { "YCP",              extract_ycp,                                    \
-                        &flag_table_ycp, &formatstring_ycp, NULL, NULL },     \
+                        &flag_table_ycp, &formatstring_ycp, NULL },     \
 
 /* Scan an YCP file and add its translatable strings to mdlp.  */
 extern void extract_ycp (FILE *fp, const char *real_filename,
diff -Nru gettext-0.19.3/gettext-tools/styles/ChangeLog gettext-0.18.1.1/gettext-tools/styles/ChangeLog
--- gettext-0.19.3/gettext-tools/styles/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/styles/ChangeLog	2010-06-06 12:49:58.000000000 +0000
@@ -1,23 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/styles/Makefile.in gettext-0.18.1.1/gettext-tools/styles/Makefile.in
--- gettext-0.19.3/gettext-tools/styles/Makefile.in	2014-10-16 06:01:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/styles/Makefile.in	2010-06-06 20:12:33.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,53 +16,9 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -77,69 +34,58 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = styles
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -147,12 +93,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -169,7 +112,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -181,7 +123,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -190,26 +131,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -218,17 +153,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -254,7 +185,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -263,7 +193,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -272,26 +201,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -327,25 +254,14 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -367,18 +283,10 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(stylesdir)"
 DATA = $(styles_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/gettext
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -387,7 +295,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -425,7 +332,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -462,18 +368,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -485,26 +390,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -512,8 +407,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -525,23 +418,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -564,7 +452,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -582,18 +469,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -618,47 +500,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -666,7 +540,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -676,21 +549,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -702,103 +571,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -809,11 +625,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -823,6 +634,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -835,7 +647,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -856,16 +667,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -888,48 +699,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -952,6 +748,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -961,13 +758,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -976,47 +776,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1031,8 +800,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1072,7 +839,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1094,8 +860,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1103,13 +869,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1122,21 +886,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1149,9 +911,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1175,9 +937,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1191,12 +951,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1204,8 +961,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1217,41 +972,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1265,27 +1008,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1293,34 +1023,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1336,9 +1057,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1358,8 +1077,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1368,8 +1085,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1384,7 +1099,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1435,6 +1149,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1442,7 +1157,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1501,11 +1215,8 @@
 	-rm -rf .libs _libs
 install-stylesDATA: $(styles_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(stylesdir)" || $(MKDIR_P) "$(DESTDIR)$(stylesdir)"
 	@list='$(styles_DATA)'; test -n "$(stylesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(stylesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(stylesdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1519,12 +1230,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(styles_DATA)'; test -n "$(stylesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(stylesdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(stylesdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(stylesdir)" && rm -f $$files
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -1574,15 +1287,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -1663,16 +1371,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-stylesDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-am uninstall-stylesDATA
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-stylesDATA installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-stylesDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru gettext-0.19.3/gettext-tools/tests/autopoint-1 gettext-0.18.1.1/gettext-tools/tests/autopoint-1
--- gettext-0.19.3/gettext-tools/tests/autopoint-1	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/autopoint-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test for sanity checks.
-
-: ${AUTOCONF=autoconf}
-${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { 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; }
-
-rm -f configure.ac
-
-gettext_datadir=$top_builddir/misc
-export gettext_datadir
-
-# Check if sanity checks are actually working.
-
-# no configure.ac
-$gettext_datadir/autopoint 2>&1 | grep 'Missing configure.in or configure.ac' 2>&1 >/dev/null \
-    || 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
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-AC_PROG_CC
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
-
-$gettext_datadir/autopoint 2>&1 | grep 'Missing version' 2>&1 >/dev/null \
-    || 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
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-AC_PROG_CC
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
-
-test -d intl || mkdir intl
-echo bogus-version > intl/VERSION
-
-$gettext_datadir/autopoint 2>&1 | grep 'Missing version' 2>&1 >/dev/null \
-    || exit 1
-
-test ! -d m4 || exit 1
-test ! -d po || exit 1
-
-# VERSION specified through intl/VERSION file
-cat <<\EOF >configure.ac
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-AC_PROG_CC
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
-
-test -d intl || mkdir intl
-
-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
-
-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
-
-rm -fr intl
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/autopoint-2 gettext-0.18.1.1/gettext-tools/tests/autopoint-2
--- gettext-0.19.3/gettext-tools/tests/autopoint-2	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/autopoint-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test the autopoint program, without Automake.
-
-required_gettext_version=0.19.3
-
-: ${AUTOCONF=autoconf}
-${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { 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; }
-
-rm -f configure.ac
-
-gettext_datadir=$top_builddir/misc
-export gettext_datadir
-
-# Check for not copying libintl source.
-cat <<EOF >configure.ac
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-AC_CONFIG_AUX_DIR([build-aux])
-
-AC_PROG_CC
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
-EOF
-
-$gettext_datadir/autopoint >/dev/null 2>autopoint.err
-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 -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
-
-# Check for copying libintl source.
-cat <<EOF >configure.ac
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-AC_PROG_CC
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
-EOF
-
-$gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; 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
-
-rm -fr intl m4 po
-
-# Check for custom macro directory.
-cat <<EOF >configure.ac
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-AC_PROG_CC
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
-
-# first macro directory, in which po.m4, etc. belong
-AC_CONFIG_MACRO_DIR([gettext-m4])
-
-# second macro directory
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
-EOF
-
-$gettext_datadir/autopoint >/dev/null 2>autopoint.err
-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 -f gettext-m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
-
-rm -fr gettext-m4 po
-
-# Check for multiple arguments to AM_GNU_GETTEXT
-# <https://savannah.gnu.org/bugs/?40082>
-cat <<EOF >configure.ac
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-AC_PROG_CC
-AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
-EOF
-
-$gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; 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
-
-rm -fr m4 po
-
-# Check for certain built-in macros are not in effect when tracing:
-# <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580>
-cat <<EOF >configure.ac
-AC_INIT
-AC_CONFIG_SRCDIR(hello.c)
-
-dnl m4_shiftn internally calls m4_assert, which is disabled by autopoint
-m4_define([_gt_recurse],
-[m4_ifblank([\$1], , [_gt_recurse(m4_shiftn(1, \$@))])])
-_gt_recurse([a], [b], , [c])
-
-AC_PROG_CC
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
-EOF
-
-$gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; 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
-
-rm -fr m4 po
diff -Nru gettext-0.19.3/gettext-tools/tests/autopoint-3 gettext-0.18.1.1/gettext-tools/tests/autopoint-3
--- gettext-0.19.3/gettext-tools/tests/autopoint-3	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/autopoint-3	1970-01-01 00:00:00.000000000 +0000
@@ -1,153 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test the autopoint program, with Automake.
-
-required_gettext_version=0.19.3
-
-: ${AUTOCONF=autoconf}
-${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { 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; }
-
-rm -f configure.ac
-
-: ${AUTOMAKE=automake}
-${AUTOMAKE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: automake not found"; exit 77; }
-
-cat <<\EOF >configure.ac
-AC_PREREQ([2.60])
-AC_INIT([foo], [0.0], [bug-gnu-gettext@gnu.org])
-AM_INIT_AUTOMAKE([1.11 foreign])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
-
-: ${ACLOCAL=aclocal}
-${ACLOCAL} >/dev/null 2>autopoint.err
-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; }
-
-rm -f configure.ac Makefile.am
-
-: ${LIBTOOLIZE=libtoolize}
-${LIBTOOLIZE} --version >/dev/null 2>/dev/null \
-  || { 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; }
-
-gettext_datadir=$top_builddir/misc
-export gettext_datadir
-
-cat <<EOF >configure.ac
-AC_INIT([hello], [0.0.0], [bug-gnu-gettext@gnu.org])
-AM_INIT_AUTOMAKE([foreign])
-LT_INIT
-
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_PROG_CC
-AM_GNU_GETTEXT([use-libtool])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([intl/Makefile])
-AC_CONFIG_FILES([po/Makefile.in])
-AC_OUTPUT
-EOF
-
-cat <<\EOF >Makefile.am
-# Example for use of GNU gettext.
-# This file is in the public domain.
-#
-# Makefile configuration - processed by automake.
-
-# The list of subdirectories containing Makefiles.
-SUBDIRS = intl po
-
-# The list of programs that are built.
-bin_PROGRAMS = hello
-
-# The source files of the 'hello' program.
-hello_SOURCES = hello.c gettext.h
-
-# Define a C macro LOCALEDIR indicating where catalogs will be installed.
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-# Make sure the gettext.h include file is found.
-AM_CPPFLAGS = -I. -I$(srcdir)
-
-# Link time dependencies.
-LDADD = @LTLIBINTL@
-EOF
-
-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 -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
-
-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; }
-
-${ACLOCAL} -I m4 >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
-
-: ${AUTOHEADER=autoheader}
-${AUTOHEADER} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
-
-${AUTOCONF} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
-
-${AUTOMAKE} -a -c >/dev/null 2>autopoint.err
-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; }
-
-# Workaround for 0.18.3 or earlier: Processing intl/plural.y with
-# Bison 3.0.1 or later generates a wrong code.  Use pre-generated
-# intl/plural.c in that case.
-test -f intl/plural.c && touch intl/plural.c
-
-# Workaround for a bug in 0.19 and 0.19.1: ChangeLog is missing in the archive.
-case "$required_gettext_version" in
-  0.19 | 0.19.1)
-    test -f intl/ChangeLog || : > intl/ChangeLog
-    ;;
-esac
-
-${MAKE} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
-
-${MAKE} dist >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/ChangeLog gettext-0.18.1.1/gettext-tools/tests/ChangeLog
--- gettext-0.19.3/gettext-tools/tests/ChangeLog	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/ChangeLog	2010-06-06 12:49:58.000000000 +0000
@@ -1,1115 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-2 (required_gettext_version): Update to 0.19.3.
-	* autopoint-3 (required_gettext_version): Likewise.
-
-2014-10-12  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Avoid sed error on Mac OS X when dealing with binary input
-	Reported by Ramsey Dow in:
-	<http://lists.gnu.org/archive/html/bug-gettext/2014-07/msg00002.html>.
-	* msgmerge-compendium-6: Run sed with LC_ALL=C, to avoid 'illegal
-	byte sequence' error on Mac OS X.
-	* format-sh-1: Likewise.
-
-2014-10-10  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add test for Debian bug#764580
-	* autopoint-2: Check if m4_assert is properly redefined while
-	tracing.
-
-2014-10-08  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Improve test coverage of C and Vala scanners
-	* xgettext-c-4: Check more trigraphs.
-	* xgettext-c-2: Check floating point literal.
-	* xgettext-c-19: Check out-of-range Unicode character, "\U"
-	character escape, incomplete "\u" escape, and surrogates.
-	* xgettext-vala-1: Check unterminated regexp literal, floating
-	point literal, string template, "/=" operator, multi-line
-	comments, and backslash-escaped character inside regexp literal.
-
-2014-10-03  Daiki Ueno  <ueno@gnu.org>
-
-	* lang-c++: Check if CXX is "no", not ":".  See commit e854d2c7
-	for the rationale.
-
-2014-10-02  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-3: Invoke AC_CONFIG_MACRO_DIR after AC_INIT, not
-	before.
-
-2014-10-01  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Adjust textdomain directory for Solaris 11
-	* init.cfg (prepare_locale_): New function.
-	* lang-bash: Call prepare_locale_ before running locale-dependant
-	tests.
-	* lang-c: Likewise.
-	* lang-c++: Likewise.
-	* lang-clisp: Likewise.
-	* lang-csharp: Likewise.
-	* lang-gawk: Likewise.
-	* lang-guile: Likewise.
-	* lang-java: Likewise.
-	* lang-javascript: Likewise.
-	* lang-librep: Likewise.
-	* lang-lua: Likewise.
-	* lang-objc: Likewise.
-	* lang-pascal: Likewise.
-	* lang-perl-1: Likewise.
-	* lang-perl-2: Likewise.
-	* lang-php: Likewise.
-	* lang-python-1: Likewise.
-	* lang-python-2: Likewise.
-	* lang-sh: Likewise.
-	* lang-smalltalk: Likewise.
-	* lang-tcl: Likewise.
-	* lang-vala: Likewise.
-
-2014-10-01  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Stop redundant textdomain directory creation
-	This was introduced by commit 3533f6cc when we didn't use separate
-	test directory for each test.  Now that we switched to init.sh, we
-	don't need to worry about filename conflicts.
-	* lang-c: Stop redundant textdomain directory creation.
-	* lang-c++: Likewise.
-	* lang-objc: Likewise.
-	* lang-sh: Likewise.
-	* lang-bash: Likewise.
-	* lang-python-1: Likewise.
-	* lang-python-2: Likewise.
-	* lang-clisp: Likewise.
-	* lang-elisp: Likewise.
-	* lang-librep: Likewise.
-	* lang-guile: Likewise.
-	* lang-smalltalk: Likewise.
-	* lang-java: Likewise.
-	* lang-csharp: Likewise.
-	* lang-gawk: Likewise.
-	* lang-pascal: Likewise.
-	* lang-ycp: Likewise.
-	* lang-tcl: Likewise.
-	* lang-perl-1: Likewise.
-	* lang-perl-2: Likewise.
-	* lang-php: Likewise.
-	* lang-po: Likewise.
-	* lang-rst: Likewise.
-	* lang-lua: Likewise.
-	* lang-javascript: Likewise.
-	* lang-vala: Likewise.
-
-2014-09-30  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-1: Don't rely on non-portable "grep -q".
-	* msginit-3: Likewise.
-	* msgen-1: Likewise.
-
-2014-09-30  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-c-19: Test octal string escape.
-
-2014-09-24  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-c-19: Use iconv -f/-t instead of non-portable
-	--from/--to.
-
-2014-09-05  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-3: Use libtool when compiling included libintl.
-
-2014-09-05  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-2, autopoint-3: Collect error output.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Test empty literals in Vala test
-	* xgettext-vala-1: Test empty literals that do not affect the
-	following lines.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Test for AC_CONFIG_AUX_DIR usage in autopoint test
-	* autopoint-2: Check if build-aux/config.rpath is created if
-	AC_CONFIG_AUX_DIR([build-aux]) is called.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Test empty literals in C test
-	* xgettext-c-2: Test empty literals that do not affect the
-	following lines.
-
-2014-06-16  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Test "make dist" in autopoint test
-	* autopoint-3: Run "make dist" after "make"; add a workaround for
-	a bug in 0.19 and 0.19.1, where intl/ChangeLog is required but
-	missing in the archive.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt-desktop-2: Test the effect of the LINGUAS envvar.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Ignore the LINGUAS envvar in msgfmt-desktop-2
-	Reported by Lars Wendler at:
-	<http://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00002.html>.
-	* msgfmt-desktop-2: Unset the LINGUAS envvar.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-vala-1: Test comment-like string inside a string literal.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt-10: Update after error checking behaviro change.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-05-31  Daiki Ueno  <ueno@gnu.org>
-
-	* msgexec-5: Test MSGEXEC_PREV_MSGID and MSGEXEC_PREV_MSGID_PLURAL.
-
-2014-05-31  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfilter-6: Test MSGFILTER_PREV_MSGID and
-	MSGFILTER_PREV_MSGID_PLURAL.
-
-2014-05-15  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add test for msgfilter plural handling
-	* msgfilter-6: New test.
-	* Makefile.am (TESTS): Add new test.
-
-2014-05-15  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add test for msgexec plural handling
-	* msgexec-5: New test.
-	* Makefile.am (TESTS): Add new test.
-
-2014-05-15  Daiki Ueno  <ueno@gnu.org>
-
-	* msginit-3: Fix charset value after msginit invocation.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Fix errors when CFLAGS contains --coverage
-	* lang-c: Supply $CFLAGS to the libtool link command.
-	* lang-objc: Likewise.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	msgfmt: Report error on accelerator mismatch
-	* msgfmt-18: New test.
-	* Makefile.am (TESTS): Add new test.
-
-2014-05-13  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfmt-10: Increment expected error count.
-
-2014-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	* msgfilter-quote-1: Test doubled grave characters.
-
-2014-05-10  Guido Flohr  <guido@imperia.net>
-
-	msgattrib: Add --empty option to clear msgstr
-	* msgattrib-19: New test.
-	* Makefile.am (TESTS): Add new test.
-
-2014-05-09  Daiki Ueno  <ueno@gnu.org>
-
-	vala: Interpret string literals lazily
-	* xgettext-vala-1: Test escape sequence in verbatim string.
-
-2014-05-09  Daiki Ueno  <ueno@gnu.org>
-
-	c: Interpret string literals lazily
-	* xgettext-c-19: New file.
-	* Makefile.am (TESTS): Add new test.
-
-2014-05-03  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add test for prefixed comment tag
-	* xgettext-11: New file.
-	* Makefile.am (TESTS): Add new test.
-
-2014-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-vala-1: Test Unicode character escapes.
-
-2014-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-scheme-4: New file.
-	* Makefile.am (TESTS): Add new test.
-
-2014-04-30  Daiki Ueno  <ueno@gnu.org>
-
-	format-python-brace: Limit acceptable format specifiers
-	* format-python-brace-1: Add tests for standard format specifiers.
-
-2014-04-29  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Don't run a test only successful after "make dist" by default
-	* Makefile.am (TESTS): Move xgettext-1 to...
-	(EXTRA_DIST): ...here.
-
-2014-04-29  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-3 (gettext_datadir): Don't regenerate intl/plural.c.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Don't run system dependent test by default
-	* Makefile.am (TESTS): Move xgettext-c-1 to...
-	(EXTRA_DIST): ...here.
-
-2014-04-21  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-1 (gettext_datadir): Rename from gettext_dir.
-	* autopoint-2 (gettext_datadir): Likewise.
-	* autopoint-3 (gettext_datadir): Likewise.
-
-2014-04-15  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add tests for 'msgfilter quot' and 'msgfilter boldquot'
-	* msgfilter-quote-1: New file.
-	* Makefile.am (TESTS): Add new tests.
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add tests for msgfmt --desktop
-	* msgfmt-desktop-1: New file.
-	* msgfmt-desktop-2: New file.
-	* Makefile.am (TESTS): Add new tests.
-
-2014-04-04  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add tests for xgettext Desktop Entry support
-	* xgettext-desktop-1: New file.
-	* Makefile.am (TESTS): Add new tests.
-
-2014-03-27  Daiki Ueno  <ueno@gnu.org>
-
-	* autopoint-2: Check for the case when multiple arguments are
-	supplied to AM_GNU_GETTEXT.
-
-2014-03-26  Daiki Ueno  <ueno@gnu.org>
-
-	tests: Add tests for autopoint
-	* autopoint-1: New file.
-	* autopoint-2: New file.
-	* autopoint-3: New file.
-	* Makefile.am (TESTS): Add new tests.
-
-2014-03-25  Daiki Ueno  <ueno@gnu.org>
-
-	Add tests for --add-location=file option.
-	* msgattrib-18: New file.
-	* msgcat-19: New file.
-	* msgcomm-28: New file.
-	* msgconv-7: New file.
-	* msgen-4: New file.
-	* msgfilter-5: New file.
-	* msggrep-11: New file.
-	* msgmerge-25: New file.
-	* msguniq-7: New file.
-	* xgettext-10: New file.
-	* Makefile.am (TESTS): Add new tests
-
-2014-03-11  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): Add init.cfg, which is no longer
-	auto-generated by configure.
-
-2014-03-11  Daiki Ueno  <ueno@gnu.org>
-
-	* init-env.in (top_builddir): Don't set $LIBTOOL.
-	* lang-c: Explicitly call $top_builddir/libtool script with
-	$CONFIG_SHELL; also separate compilation/link into two phase as
-	lang-c++.
-	* lang-c++: Likewise.
-	* lang-objc: Likewise.
-
-2014-03-10  Daiki Ueno  <ueno@gnu.org>
-
-	php: Recognize single and double quotes around heredoc label
-	* xgettext-php-2: Add test cases to check quoted heredoc labels.
-
-2014-03-10  Daiki Ueno  <ueno@gnu.org>
-
-	Remove unnecessary temporary file cleanup code.
-	Cleanup code like "rm -fr $tmpfiles" are no longer needed, since
-	'init.sh' takes care of that.
-	* format-awk-1: Remove unnecessary temporary file cleanup code.
-	* format-awk-2: Likewise
-	* format-boost-1: Likewise
-	* format-boost-2: Likewise
-	* format-c-1: Likewise
-	* format-c-2: Likewise
-	* format-c-3: Likewise
-	* format-c-4: Likewise
-	* format-c-5: Likewise
-	* format-csharp-1: Likewise
-	* format-csharp-2: Likewise
-	* format-elisp-1: Likewise
-	* format-elisp-2: Likewise
-	* format-gcc-internal-1: Likewise
-	* format-gcc-internal-2: Likewise
-	* format-gfc-internal-1: Likewise
-	* format-gfc-internal-2: Likewise
-	* format-java-1: Likewise
-	* format-java-2: Likewise
-	* format-javascript-1: Likewise
-	* format-javascript-2: Likewise
-	* format-kde-1: Likewise
-	* format-kde-2: Likewise
-	* format-librep-1: Likewise
-	* format-librep-2: Likewise
-	* format-lisp-1: Likewise
-	* format-lisp-2: Likewise
-	* format-lua-1: Likewise
-	* format-lua-2: Likewise
-	* format-pascal-1: Likewise
-	* format-pascal-2: Likewise
-	* format-perl-1: Likewise
-	* format-perl-2: Likewise
-	* format-perl-brace-1: Likewise
-	* format-perl-brace-2: Likewise
-	* format-perl-mixed-1: Likewise
-	* format-perl-mixed-2: Likewise
-	* format-php-1: Likewise
-	* format-php-2: Likewise
-	* format-python-1: Likewise
-	* format-python-2: Likewise
-	* format-python-brace-1: Likewise
-	* format-python-brace-2: Likewise
-	* format-qt-1: Likewise
-	* format-qt-2: Likewise
-	* format-qt-plural-1: Likewise
-	* format-qt-plural-2: Likewise
-	* format-scheme-1: Likewise
-	* format-scheme-2: Likewise
-	* format-sh-1: Likewise
-	* format-sh-2: Likewise
-	* format-tcl-1: Likewise
-	* format-tcl-2: Likewise
-	* format-ycp-1: Likewise
-	* format-ycp-2: Likewise
-	* gettext-1: Likewise
-	* gettext-2: Likewise
-	* gettext-3: Likewise
-	* gettext-4: Likewise
-	* gettext-5: Likewise
-	* gettext-6: Likewise
-	* gettext-7: Likewise
-	* gettextpo-1: Likewise
-	* lang-bash: Likewise
-	* lang-c: Likewise
-	* lang-c++: Likewise
-	* lang-clisp: Likewise
-	* lang-csharp: Likewise
-	* lang-elisp: Likewise
-	* lang-gawk: Likewise
-	* lang-guile: Likewise
-	* lang-java: Likewise
-	* lang-javascript: Likewise
-	* lang-librep: Likewise
-	* lang-lua: Likewise
-	* lang-objc: Likewise
-	* lang-pascal: Likewise
-	* lang-perl-1: Likewise
-	* lang-perl-2: Likewise
-	* lang-php: Likewise
-	* lang-po: Likewise
-	* lang-python-1: Likewise
-	* lang-python-2: Likewise
-	* lang-rst: Likewise
-	* lang-sh: Likewise
-	* lang-smalltalk: Likewise
-	* lang-tcl: Likewise
-	* lang-vala: Likewise
-	* lang-ycp: Likewise
-	* msgattrib-1: Likewise
-	* msgattrib-10: Likewise
-	* msgattrib-11: Likewise
-	* msgattrib-12: Likewise
-	* msgattrib-13: Likewise
-	* msgattrib-14: Likewise
-	* msgattrib-15: Likewise
-	* msgattrib-16: Likewise
-	* msgattrib-17: Likewise
-	* msgattrib-2: Likewise
-	* msgattrib-3: Likewise
-	* msgattrib-4: Likewise
-	* msgattrib-5: Likewise
-	* msgattrib-6: Likewise
-	* msgattrib-7: Likewise
-	* msgattrib-8: Likewise
-	* msgattrib-9: Likewise
-	* msgattrib-properties-1: Likewise
-	* msgcat-1: Likewise
-	* msgcat-10: Likewise
-	* msgcat-11: Likewise
-	* msgcat-12: Likewise
-	* msgcat-13: Likewise
-	* msgcat-14: Likewise
-	* msgcat-15: Likewise
-	* msgcat-16: Likewise
-	* msgcat-17: Likewise
-	* msgcat-18: Likewise
-	* msgcat-2: Likewise
-	* msgcat-3: Likewise
-	* msgcat-4: Likewise
-	* msgcat-5: Likewise
-	* msgcat-6: Likewise
-	* msgcat-7: Likewise
-	* msgcat-8: Likewise
-	* msgcat-9: Likewise
-	* msgcat-properties-1: Likewise
-	* msgcat-properties-2: Likewise
-	* msgcat-stringtable-1: Likewise
-	* msgcmp-1: Likewise
-	* msgcmp-2: Likewise
-	* msgcmp-3: Likewise
-	* msgcmp-4: Likewise
-	* msgcomm-1: Likewise
-	* msgcomm-10: Likewise
-	* msgcomm-11: Likewise
-	* msgcomm-12: Likewise
-	* msgcomm-13: Likewise
-	* msgcomm-14: Likewise
-	* msgcomm-15: Likewise
-	* msgcomm-16: Likewise
-	* msgcomm-17: Likewise
-	* msgcomm-18: Likewise
-	* msgcomm-19: Likewise
-	* msgcomm-2: Likewise
-	* msgcomm-20: Likewise
-	* msgcomm-21: Likewise
-	* msgcomm-22: Likewise
-	* msgcomm-23: Likewise
-	* msgcomm-24: Likewise
-	* msgcomm-25: Likewise
-	* msgcomm-26: Likewise
-	* msgcomm-27: Likewise
-	* msgcomm-3: Likewise
-	* msgcomm-4: Likewise
-	* msgcomm-5: Likewise
-	* msgcomm-6: Likewise
-	* msgcomm-7: Likewise
-	* msgcomm-8: Likewise
-	* msgcomm-9: Likewise
-	* msgconv-1: Likewise
-	* msgconv-2: Likewise
-	* msgconv-3: Likewise
-	* msgconv-4: Likewise
-	* msgconv-5: Likewise
-	* msgconv-6: Likewise
-	* msgen-1: Likewise
-	* msgen-2: Likewise
-	* msgen-3: Likewise
-	* msgexec-1: Likewise
-	* msgexec-2: Likewise
-	* msgexec-3: Likewise
-	* msgexec-4: Likewise
-	* msgfilter-1: Likewise
-	* msgfilter-2: Likewise
-	* msgfilter-3: Likewise
-	* msgfilter-4: Likewise
-	* msgfilter-sr-latin-1: Likewise
-	* msgfmt-1: Likewise
-	* msgfmt-10: Likewise
-	* msgfmt-11: Likewise
-	* msgfmt-12: Likewise
-	* msgfmt-13: Likewise
-	* msgfmt-14: Likewise
-	* msgfmt-15: Likewise
-	* msgfmt-16: Likewise
-	* msgfmt-17: Likewise
-	* msgfmt-2: Likewise
-	* msgfmt-3: Likewise
-	* msgfmt-4: Likewise
-	* msgfmt-5: Likewise
-	* msgfmt-6: Likewise
-	* msgfmt-7: Likewise
-	* msgfmt-8: Likewise
-	* msgfmt-9: Likewise
-	* msgfmt-properties-1: Likewise
-	* msgfmt-qt-1: Likewise
-	* msgfmt-qt-2: Likewise
-	* msggrep-1: Likewise
-	* msggrep-10: Likewise
-	* msggrep-2: Likewise
-	* msggrep-3: Likewise
-	* msggrep-4: Likewise
-	* msggrep-5: Likewise
-	* msggrep-6: Likewise
-	* msggrep-7: Likewise
-	* msggrep-8: Likewise
-	* msggrep-9: Likewise
-	* msginit-1: Likewise
-	* msginit-2: Likewise
-	* msgmerge-1: Likewise
-	* msgmerge-10: Likewise
-	* msgmerge-11: Likewise
-	* msgmerge-12: Likewise
-	* msgmerge-13: Likewise
-	* msgmerge-14: Likewise
-	* msgmerge-15: Likewise
-	* msgmerge-16: Likewise
-	* msgmerge-17: Likewise
-	* msgmerge-18: Likewise
-	* msgmerge-19: Likewise
-	* msgmerge-2: Likewise
-	* msgmerge-20: Likewise
-	* msgmerge-21: Likewise
-	* msgmerge-22: Likewise
-	* msgmerge-23: Likewise
-	* msgmerge-24: Likewise
-	* msgmerge-3: Likewise
-	* msgmerge-4: Likewise
-	* msgmerge-5: Likewise
-	* msgmerge-6: Likewise
-	* msgmerge-7: Likewise
-	* msgmerge-8: Likewise
-	* msgmerge-9: Likewise
-	* msgmerge-compendium-1: Likewise
-	* msgmerge-compendium-2: Likewise
-	* msgmerge-compendium-3: Likewise
-	* msgmerge-compendium-4: Likewise
-	* msgmerge-compendium-5: Likewise
-	* msgmerge-compendium-6: Likewise
-	* msgmerge-properties-1: Likewise
-	* msgmerge-properties-2: Likewise
-	* msgmerge-update-1: Likewise
-	* msgmerge-update-2: Likewise
-	* msgmerge-update-3: Likewise
-	* msgmerge-update-4: Likewise
-	* msgunfmt-1: Likewise
-	* msgunfmt-2: Likewise
-	* msgunfmt-csharp-1: Likewise
-	* msgunfmt-java-1: Likewise
-	* msgunfmt-properties-1: Likewise
-	* msgunfmt-tcl-1: Likewise
-	* msguniq-1: Likewise
-	* msguniq-2: Likewise
-	* msguniq-3: Likewise
-	* msguniq-4: Likewise
-	* msguniq-5: Likewise
-	* msguniq-6: Likewise
-	* plural-1: Likewise
-	* plural-2: Likewise
-	* recode-sr-latin-1: Likewise
-	* recode-sr-latin-2: Likewise
-	* xgettext-1: Likewise
-	* xgettext-2: Likewise
-	* xgettext-3: Likewise
-	* xgettext-4: Likewise
-	* xgettext-5: Likewise
-	* xgettext-6: Likewise
-	* xgettext-7: Likewise
-	* xgettext-8: Likewise
-	* xgettext-9: Likewise
-	* xgettext-awk-1: Likewise
-	* xgettext-awk-2: Likewise
-	* xgettext-c-1: Likewise
-	* xgettext-c-10: Likewise
-	* xgettext-c-11: Likewise
-	* xgettext-c-12: Likewise
-	* xgettext-c-13: Likewise
-	* xgettext-c-14: Likewise
-	* xgettext-c-15: Likewise
-	* xgettext-c-16: Likewise
-	* xgettext-c-17: Likewise
-	* xgettext-c-18: Likewise
-	* xgettext-c-2: Likewise
-	* xgettext-c-3: Likewise
-	* xgettext-c-4: Likewise
-	* xgettext-c-5: Likewise
-	* xgettext-c-6: Likewise
-	* xgettext-c-7: Likewise
-	* xgettext-c-8: Likewise
-	* xgettext-c-9: Likewise
-	* xgettext-csharp-1: Likewise
-	* xgettext-csharp-2: Likewise
-	* xgettext-csharp-3: Likewise
-	* xgettext-csharp-4: Likewise
-	* xgettext-csharp-5: Likewise
-	* xgettext-csharp-6: Likewise
-	* xgettext-csharp-7: Likewise
-	* xgettext-elisp-1: Likewise
-	* xgettext-elisp-2: Likewise
-	* xgettext-glade-1: Likewise
-	* xgettext-glade-2: Likewise
-	* xgettext-glade-3: Likewise
-	* xgettext-glade-4: Likewise
-	* xgettext-glade-5: Likewise
-	* xgettext-glade-6: Likewise
-	* xgettext-glade-7: Likewise
-	* xgettext-gsettings-1: Likewise
-	* xgettext-java-1: Likewise
-	* xgettext-java-2: Likewise
-	* xgettext-java-3: Likewise
-	* xgettext-java-4: Likewise
-	* xgettext-java-5: Likewise
-	* xgettext-java-6: Likewise
-	* xgettext-java-7: Likewise
-	* xgettext-javascript-1: Likewise
-	* xgettext-javascript-2: Likewise
-	* xgettext-javascript-3: Likewise
-	* xgettext-javascript-4: Likewise
-	* xgettext-javascript-5: Likewise
-	* xgettext-javascript-6: Likewise
-	* xgettext-librep-1: Likewise
-	* xgettext-librep-2: Likewise
-	* xgettext-lisp-1: Likewise
-	* xgettext-lisp-2: Likewise
-	* xgettext-lua-1: Likewise
-	* xgettext-lua-2: Likewise
-	* xgettext-objc-1: Likewise
-	* xgettext-objc-2: Likewise
-	* xgettext-perl-1: Likewise
-	* xgettext-perl-2: Likewise
-	* xgettext-perl-3: Likewise
-	* xgettext-perl-4: Likewise
-	* xgettext-perl-5: Likewise
-	* xgettext-perl-6: Likewise
-	* xgettext-perl-7: Likewise
-	* xgettext-perl-8: Likewise
-	* xgettext-php-1: Likewise
-	* xgettext-php-2: Likewise
-	* xgettext-php-3: Likewise
-	* xgettext-php-4: Likewise
-	* xgettext-po-1: Likewise
-	* xgettext-properties-1: Likewise
-	* xgettext-python-1: Likewise
-	* xgettext-python-2: Likewise
-	* xgettext-python-3: Likewise
-	* xgettext-python-4: Likewise
-	* xgettext-scheme-1: Likewise
-	* xgettext-scheme-2: Likewise
-	* xgettext-scheme-3: Likewise
-	* xgettext-sh-1: Likewise
-	* xgettext-sh-2: Likewise
-	* xgettext-sh-3: Likewise
-	* xgettext-sh-4: Likewise
-	* xgettext-sh-5: Likewise
-	* xgettext-sh-6: Likewise
-	* xgettext-smalltalk-1: Likewise
-	* xgettext-smalltalk-2: Likewise
-	* xgettext-stringtable-1: Likewise
-	* xgettext-tcl-1: Likewise
-	* xgettext-tcl-2: Likewise
-	* xgettext-tcl-3: Likewise
-	* xgettext-tcl-4: Likewise
-	* xgettext-vala-1: Likewise
-	* xgettext-ycp-1: Likewise
-	* xgettext-ycp-2: Likewise
-	* xgettext-ycp-3: Likewise
-	* xgettext-ycp-4: Likewise
-
-2014-02-03  Roumen Petrov <bugtrack@roumenpetrov.info>  (tiny change)
-
-	tests: pass required --tag=XX to libtool
-	Reported at:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-02/msg00001.html>.
-	* lang-c: Pass --tag=CC to libtool.
-	* lang-objc: Likewise.
-	* lang-c++: Pass --tag=CXX to libtool.
-
-2014-01-28  Roumen Petrov <bugtrack@roumenpetrov.info>  (tiny change)
-
-	tests: fix "make check" under VPATH builds
-	Reported at:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-01/msg00012.html>.
-	* init-env: New file renamed from init.cfg.in.
-	* init.cfg.in: Remove.
-	* init.cfg: Read $builddir/init-env.
-
-2014-01-28  Roumen Petrov <bugtrack@roumenpetrov.info>  (tiny change)
-
-	Support configuration with absolute path.
-	Reported at:
-	<https://lists.gnu.org/archive/html/bug-gettext/2014-01/msg00011.html>.
-	* Makefile.am (TESTS_ENVIRONMENT): Define abs_srcdir and
-	abs_top_srcdir.
-	* format-c-3: Replace ../${top_,}srcdir with $abs_{top_,}srcdir.
-	* format-c-4: Likewise.
-	* format-c-5: Likewise.
-	* gettext-1: Likewise.
-	* gettext-2: Likewise.
-	* gettext-3: Likewise.
-	* gettext-4: Likewise.
-	* gettext-5: Likewise.
-	* gettext-6: Likewise.
-	* gettext-7: Likewise.
-	* gettextpo-1: Likewise.
-	* lang-c: Likewise.
-	* lang-c++: Likewise.
-	* lang-objc: Likewise.
-	* msgcomm-23: Likewise.
-	* msgexec-2: Likewise.
-	* msgfmt-qt-1: Likewise.
-	* msgfmt-qt-2: Likewise.
-	* msgmerge-compendium-5: Likewise.
-	* msgmerge-compendium-6: Likewise.
-	* msgunfmt-tcl-1: Likewise.
-	* msguniq-1: Likewise.
-	* msguniq-2: Likewise.
-	* msguniq-3: Likewise.
-	* msguniq-4: Likewise.
-	* plural-1: Likewise.
-	* xgettext-1: Likewise.
-	* xgettext-c-1: Likewise.
-
-2013-12-04  Andreas Stricker  <andy@knitter.ch>
-
-	* xgettext-javascript-6: Add more tests for E4X.
-
-2013-11-20  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: Add E4X support to JavaScript scanner
-	* Makefile.am (TESTS): Add xgettext-javascript-6.
-	* xgettext-javascript-6: New file.
-
-2013-11-14  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-javascript-1: Add a test to extract translator comments.
-
-2013-08-30  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (gettextpo_1_prg_CPPFLAGS): Don't add 'gnulib-lib'
-	to the include path.
-	Reported by Perry Smith in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-08/msg00053.html>.
-
-2013-08-13  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
-
-	* xgettext-glade-5: Add a test for --extract-all option behavior.
-	* xgettext-glade-6: Likewise.
-
-2013-08-12  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-glade-7: Add a test for multi-line extracted comments.
-
-2013-08-06  Daiki Ueno  <ueno@gnu.org>
-
-	xgettext: add support for GSettings schema file
-	* Makefile.am (TESTS): Add xgettext-gsettings-1.
-	* xgettext-gsettings-1: New file.
-
-2013-07-25  Daiki Ueno  <ueno@gnu.org>
-
-	tests: allow each test to run individually without 'make'
-	* Makefile.am (TESTS_ENVIRONMENT): Move required envvar to...
-	* init.cfg.in: ...here, so each test can run individually.
-	* lang-c: Guard if top_srcdir is not set.
-	* lang-c++: Likewise.
-	* lang-objc: Likewise.
-	* msgunfmt-tcl-1: Likewise.
-	* xgettext-1: Likewise.
-	* xgettext-c-1: Likewise.
-
-2013-07-25  Daiki Ueno  <ueno@gnu.org>
-
-	tests: fix path adjustment for LTLIBINTL
-	* lang-bash: Add gettext-runtime/src to PATH for gettext.sh.
-	* lang-sh: Likewise.
-	* lang-c: Don't set top_builddir here.
-	* lang-c++: Likewise.
-	* lang-objc: Likewise.
-	* Makefile.am (TESTS_ENVIRONMENT): Don't set PATH here.
-	* init.cfg.in: New file to adjust relative path needed by
-	LTLIBINTL.
-
-2013-07-21  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): Add init.sh.
-
-2013-07-11  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-lua-1: Add test case for string concatenation.
-
-2013-07-10  Daiki Ueno  <ueno@gnu.org>
-
-	gettext-tools: convert tests to use init.sh from Gnulib
-	* Makefile.am (TESTS_ENVIRONMENT): Don't define LIBTOOL envvar
-	since it contains a relative path which cannot easily modified by
-	init.sh-using tests.  Set it in the tests instead.
-	* *: convert to use init.sh.
-
-2013-07-07  Daiki Ueno  <ueno@gnu.org>
-
-	* lang-javascript: Fix gjs module checks.
-
-2013-06-27  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-python-1: Test non-literal string concatenation with
-	'+' to the test script.
-
-2013-06-25  Daiki Ueno  <ueno@gnu.org>
-
-	Fix handling of \u escape sequences in Tcl.
-	* Makefile.am (TESTS): Add xgettext-tcl-4.
-	* xgettext-tcl-4: New test for escape sequences.
-
-2013-06-17  Daiki Ueno  <ueno@gnu.org>
-
-	* format-python-brace-1: No need to pass
-	--flag=gettext:1:pass-python-brace-format to xgettext.
-
-2013-06-17  Daiki Ueno  <ueno@gnu.org>
-
-	* Makefile.am: Rename xgettext-gtkbuilder-* to
-	xgettext-glade-* as the current GtkBuilder support is implemented
-	as a variant of Glade.
-	(TESTS): Remove xgettext-gtkbuilder-[12] and add
-	xgettext-glade-[67].
-	(EXTRA_DIST): Remove xgettext-gtkbuilder-empty.ui.
-	* xgettext-glade-6: Rename from xgettext-gtkbuilder-1.
-	* xgettext-glade-7: Rename from xgettext-gtkbuilder-2.
-
-2013-06-13  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
-
-	Tests for GtkBuilder support.
-	* Makefile.am (TESTS): New tests xgettext-gtkbuilder{1,2}.
-	(EXTRA_DIST): Added file 'xgettext-gtkbuilder-empty.ui'.
-	* xgettext-gtkbuilder-empty.ui: New file for testing.
-	* xgettext-gtkbuilder-1: New test.
-	* xgettext-gtkbuilder-2: Likewise.
-
-2013-06-06  Daiki Ueno  <ueno@gnu.org>
-
-	* lang-javascript: Check if gjs gettext and format modules are
-	available.
-
-2013-06-04  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Vala.
-	* xgettext-vala-1: New file.
-	* lang-vala: New file.
-	* Makefile.am (TESTS): Add them.
-
-2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
-
-	* Makefile.am (TESTS_ENVIRONMENT): Remove $(SHELL).
-	(LOG_COMPILER): Define to $(SHELL).
-
-2013-05-29  Daiki Ueno  <ueno@gnu.org>
-
-	Avoid temp file name collisions in test scripts.
-	* format-c-3: Use distinct temporary file names.
-	* format-c-4: Likewise.
-	* lang-c: Likewise.
-	* lang-c++: Likewise.
-	* gettext-1: Likewise.
-	* gettext-2: Likewise.
-	* gettext-3: Likewise.
-	* gettext-4: Likewise.
-	* gettext-5: Likewise.
-	* gettext-6: Likewise.
-	* gettext-7: Likewise.
-	* lang-bash: Likewise.
-	* lang-c: Likewise.
-	* lang-c++: Likewise.
-	* lang-clisp: Likewise.
-	* lang-csharp: Likewise.
-	* lang-elisp: Likewise.
-	* lang-gawk: Likewise.
-	* lang-guile: Likewise.
-	* lang-java: Likewise.
-	* lang-javascript: Likewise.
-	* lang-librep: Likewise.
-	* lang-lua: Likewise.
-	* lang-objc: Likewise.
-	* lang-pascal: Likewise.
-	* lang-perl-1: Likewise.
-	* lang-perl-2: Likewise.
-	* lang-php: Likewise.
-	* lang-po: Likewise.
-	* lang-python-1: Likewise.
-	* lang-python-2: Likewise.
-	* lang-rst: Likewise.
-	* lang-sh: Likewise.
-	* lang-smalltalk: Likewise.
-	* lang-tcl: Likewise.
-	* lang-ycp: Likewise.
-	* msgfmt-1: Likewise.
-	* msgfmt-17: Likewise.
-	* msgfmt-2: Likewise.
-	* msgfmt-properties-1: Likewise.
-	* msgunfmt-csharp-1: Likewise.
-	* msgunfmt-java-1: Likewise.
-	* msgunfmt-tcl-1: Likewise.
-	* plural-1: Likewise.
-	* plural-2: Likewise.
-	* xgettext-glade-1: Likewise.
-	* xgettext-glade-2: Likewise.
-	* xgettext-glade-3: Likewise.
-	* xgettext-glade-4: Likewise.
-	* xgettext-glade-5: Likewise.
-	* xgettext-python-4: Likewise.
-	* xgettext-stringtable-1: Likewise.
-	* format-c-3-prg.c: Use distinct message catalog directory.
-	* format-c-4-prg.c: Likewise.
-	* gettext-3-prg.c: Likewise.
-	* gettext-4-prg.c: Likewise.
-	* gettext-5-prg.c: Likewise.
-	* gettext-6-prg.c: Likewise.
-	* gettext-7-prg.c: Likewise.
-	* plural-1-prg.c: Likewise.
-
-2013-05-12  Daiki Ueno  <ueno@gnu.org>
-
-	* xgettext-javascript-4: Add a test for normal escape sequences.
-
-2013-05-12  Andreas Stricker <astricker@futurelab.ch>
-
-	Improve JavaScript scanner tests.
-	* xgettext-javascript-2: Add tests for backslash escapes and
-	_(...) call in regular expressions.
-	* xgettext-javascript-3: Use distinct temporary file names.
-	* xgettext-javascript-4: Likewise.
-	* xgettext-javascript-5: Add tests for unbalanced double-quotes in
-	regular expressions and strings.
-	* Makefile.am (TESTS): Add xgettext-javascript-5.
-
-2013-05-02  Daiki Ueno  <ueno@gnu.org>
-
-	* format-python-brace-2: Fix test for added argument.
-
-2013-04-26  Daiki Ueno  <ueno@gnu.org>
-
-	Support for Python brace format.
-	* format-python-brace-1: New file.
-	* format-python-brace-2: New file.
-	* Makefile.am (TESTS): Add them.
-
-2013-04-22  Daiki Ueno  <ueno@gnu.org>
-
-	Support explicit string concatenation in Python.
-	* xgettext-python-1: Add test for explicit string concatenation.
-
-2013-04-17  Andreas Stricker  <astricker@futurelab.ch>
-
-	Support for JavaScript.
-	* format-javascript-1: New file.
-	* format-javascript-2: New file.
-	* xgettext-javascript-1: New file.
-	* xgettext-javascript-2: New file.
-	* xgettext-javascript-3: New file.
-	* xgettext-javascript-4: New file.
-	* lang-javascript: New file.
-	* Makefile.am (TESTS): Add them.
-
-2013-04-16  Ľubomír Remák  <lubomirr@lubomirr.eu>
-
-	Support for escape sequences added in Lua 5.2.
-	* xgettext-lua-1: New test cases for \x and \z escape sequences.
-
-2013-04-11  Ľubomír Remák  <lubomirr@lubomirr.eu>
-
-	Support for Lua.
-	* format-lua-1: New file.
-	* format-lua-2: New file.
-	* xgettext-lua-1: New file.
-	* xgettext-lua-2: New file.
-	* lang-lua: New file.
-	* Makefile.am (TESTS): Add them.
-
-2013-03-03  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
-
-	Add a test case for atkproperty tag in Glade2 files.
-	* xgettext-glade-4: New test case for atkproperty.
-
-2013-03-14  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
-
-	Test msgctxt extraction on glade files.
-	* Makefile.am (TESTS): Add xgettext-glade-5.
-	* xgettext-glade-5: New test for msgctxt Glade2 extraction.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-06-03  Jim Meyering  <jim@meyering.net>
-
-	* msgcomm-17: Spelling fixes.
-
-2012-02-19  Bruno Haible  <bruno@clisp.org>
-
-	Avoid spurious test output with guile 2.0.x.
-	* lang-guile: Filter out ";;;" lines from standard error.
-
-2012-02-18  Bruno Haible  <bruno@clisp.org>
-
-	Avoid test failure with fpc version 2.6.0.
-	* lang-rst: Allow a test result with line wrapping.
-
-2012-02-18  Bruno Haible  <bruno@clisp.org>
-
-	Make the lang-pascal test work on x86_64 platforms.
-	* lang-pascal: Try also the ppcx64 program.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* tstgettext.c (usage): Quote 'like this', not `like this', as per the
-	recent change to the GNU coding standards.
-	* tstngettext.c (usage): Likewise.
-
-2012-01-15  Bruno Haible  <bruno@clisp.org>
-
-	Avoid test failure on Solaris 11.
-	* msgfilter-sr-latin-1: Skip the test if the PO file is incorrect.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	* xgettext-python-1: Update expected result after linebreaking in
-	libunistring changed on 2011-01-09.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* gettext-6-prg.c: Treat uClibc like a non-glibc platform.
-	* gettext-7-prg.c: Likewise.
-	* format-c-5-prg.c: Likewise.
-
-2010-08-31  Bruno Haible  <bruno@clisp.org>
-
-	Avoid test leftovers on MacOS X 10.5.
-	* lang-objc: Add hello.dSYM to tmpfiles.
-
-2010-06-06  Bruno Haible  <bruno@clisp.org>
-
-	Test the libgettextpo library and its functions.
-	* gettextpo-1: New file.
-	* gettextpo-1-prg.c: New file.
-	* gettextpo-1.de.po: New file.
-	* Makefile.am (TESTS): Add gettextpo-1.
-	(EXTRA_DIST): Add gettextpo-1.de.po.
-	(noinst_PROGRAMS): Add gettextpo-1-prg.
-	(gettextpo_1_prg_SOURCES, gettextpo_1_prg_CPPFLAGS,
-	gettextpo_1_prg_LDADD): New variables.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gettext-tools/tests/format-awk-1 gettext-0.18.1.1/gettext-tools/tests/format-awk-1
--- gettext-0.19.3/gettext-tools/tests/format-awk-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-awk-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of awk format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-a-1.data"
 cat <<\EOF > f-a-1.data
 # Valid: no argument
 "abc%%"
@@ -103,6 +106,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-a-1-$n.in f-a-1-$n.po"
   cat <<EOF > f-a-1-$n.in
 dcgettext(${string});
 EOF
@@ -132,4 +136,6 @@
   rm -f f-a-1-$n.in f-a-1-$n.po
 done < f-a-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-awk-2 gettext-0.18.1.1/gettext-tools/tests/format-awk-2
--- gettext-0.19.3/gettext-tools/tests/format-awk-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-awk-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of awk format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-a-2.data"
 cat <<\EOF > f-a-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -108,6 +111,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-a-2-$n.po f-a-2-$n.mo"
   cat <<EOF > f-a-2-$n.po
 #, awk-format
 ${msgid_line}
@@ -136,4 +140,6 @@
   rm -f f-a-2-$n.po f-a-2-$n.mo
 done < f-a-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-boost-1 gettext-0.18.1.1/gettext-tools/tests/format-boost-1
--- gettext-0.19.3/gettext-tools/tests/format-boost-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-boost-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Boost format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-bo-1.data"
 cat <<\EOF > f-bo-1.data
 # Valid: no argument
 "abc%%"
@@ -277,6 +280,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-bo-1-$n.in f-bo-1-$n.po"
   cat <<EOF > f-bo-1-$n.in
 gettext(${string});
 EOF
@@ -306,4 +310,6 @@
   rm -f f-bo-1-$n.in f-bo-1-$n.po
 done < f-bo-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-boost-2 gettext-0.18.1.1/gettext-tools/tests/format-boost-2
--- gettext-0.19.3/gettext-tools/tests/format-boost-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-boost-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Boost format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-bo-2.data"
 cat <<\EOF > f-bo-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -174,6 +177,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-bo-2-$n.po f-bo-2-$n.mo"
   cat <<EOF > f-bo-2-$n.po
 #, boost-format
 ${msgid_line}
@@ -202,4 +206,6 @@
   rm -f f-bo-2-$n.po f-bo-2-$n.mo
 done < f-bo-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-1 gettext-0.18.1.1/gettext-tools/tests/format-c-1
--- gettext-0.19.3/gettext-tools/tests/format-c-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of C format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-c-1.data"
 cat <<\EOF > f-c-1.data
 # Valid: no argument
 "abc%%"
@@ -127,6 +130,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-c-1-$n.in f-c-1-$n.po"
   cat <<EOF > f-c-1-$n.in
 gettext(${string});
 EOF
@@ -156,4 +160,6 @@
   rm -f f-c-1-$n.in f-c-1-$n.po
 done < f-c-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-2 gettext-0.18.1.1/gettext-tools/tests/format-c-2
--- gettext-0.19.3/gettext-tools/tests/format-c-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of C format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-c-2.data"
 cat <<\EOF > f-c-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -276,6 +279,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-c-2-$n.po f-c-2-$n.mo"
   cat <<EOF > f-c-2-$n.po
 #, c-format
 ${msgid_line}
@@ -304,4 +308,6 @@
   rm -f f-c-2-$n.po f-c-2-$n.mo
 done < f-c-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-3 gettext-0.18.1.1/gettext-tools/tests/format-c-3
--- gettext-0.19.3/gettext-tools/tests/format-c-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,18 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles fc3.tmp fc3.pot"
 : ${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 ${top_srcdir}/tests/format-c-3-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles fc3.ok"
 cat <<EOF > fc3.ok
 #, c-format
 msgid "father of %<PRId8> children"
@@ -16,27 +22,33 @@
 : ${DIFF=diff}
 ${DIFF} fc3.ok fc3.pot || exit 1
 
-cat <<EOF > fc3-de.po
+tmpfiles="$tmpfiles de.po"
+cat <<EOF > de.po
 #, c-format
 msgid "father of %<PRId8> children"
 msgstr "Vater von %<PRId8> Kindern"
 EOF
 
-test -d fc3-dir || mkdir fc3-dir
-test -d fc3-dir/de || mkdir fc3-dir/de
-test -d fc3-dir/de/LC_MESSAGES || mkdir fc3-dir/de/LC_MESSAGES
+tmpfiles="$tmpfiles de"
+test -d de || mkdir de
+test -d de/LC_MESSAGES || mkdir de/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o fc3-dir/de/LC_MESSAGES/fc3.mo fc3-de.po
+${MSGFMT} -o de/LC_MESSAGES/fc3.mo de.po
 
+tmpfiles="$tmpfiles de.po.tmp de.po.un"
 : ${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 de.po.tmp de/LC_MESSAGES/fc3.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < de.po.tmp > de.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} fc3-de.po fc3-de.po.un || exit 1
+${DIFF} de.po de.po.un || exit 1
 
-LANGUAGE= ../fc3 de_DE
+LANGUAGE= ./fc3 de_DE
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c gettext-0.18.1.1/gettext-tools/tests/format-c-3-prg.c
--- gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-3-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -61,7 +61,7 @@
     }
 
   textdomain ("fc3");
-  bindtextdomain ("fc3", "fc3-dir");
+  bindtextdomain ("fc3", ".");
 
   s = gettext ("father of %"PRId8" children");
   c1 = "Vater von %"; c2 = " Kindern";
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-4 gettext-0.18.1.1/gettext-tools/tests/format-c-4
--- gettext-0.19.3/gettext-tools/tests/format-c-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,18 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives with plural forms.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles fc4.tmp fc4.pot"
 : ${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 ${top_srcdir}/tests/format-c-4-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles fc4.ok"
 cat <<EOF > fc4.ok
 #, c-format
 msgid "father of %<PRId8> child"
@@ -18,7 +24,8 @@
 : ${DIFF=diff}
 ${DIFF} fc4.ok fc4.pot || exit 1
 
-cat <<EOF > fc4-de.po
+tmpfiles="$tmpfiles de.po"
+cat <<EOF > de.po
 #, c-format
 msgid "father of %<PRId8> child"
 msgid_plural "father of %<PRId8> children"
@@ -26,21 +33,26 @@
 msgstr[1] "Vater von %<PRId8> Kindern"
 EOF
 
-test -d fc4-dir || mkdir fc4-dir
-test -d fc4-dir/de || mkdir fc4-dir/de
-test -d fc4-dir/de/LC_MESSAGES || mkdir fc4-dir/de/LC_MESSAGES
+tmpfiles="$tmpfiles de"
+test -d de || mkdir de
+test -d de/LC_MESSAGES || mkdir de/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o fc4-dir/de/LC_MESSAGES/fc4.mo fc4-de.po
+${MSGFMT} -o de/LC_MESSAGES/fc4.mo de.po
 
+tmpfiles="$tmpfiles de.po.tmp de.po.un"
 : ${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 de.po.tmp de/LC_MESSAGES/fc4.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < de.po.tmp > de.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} fc4-de.po fc4-de.po.un || exit 1
+${DIFF} de.po de.po.un || exit 1
 
-LANGUAGE= ../fc4 de_DE
+LANGUAGE= ./fc4 de_DE
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c gettext-0.18.1.1/gettext-tools/tests/format-c-4-prg.c
--- gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-4-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -61,7 +61,7 @@
     }
 
   textdomain ("fc4");
-  bindtextdomain ("fc4", "fc4-dir");
+  bindtextdomain ("fc4", ".");
 
   s = ngettext ("father of %"PRId8" child", "father of %"PRId8" children", n);
   c1 = "Vater von %"; c2 = " Kindern";
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-5 gettext-0.18.1.1/gettext-tools/tests/format-c-5
--- gettext-0.19.3/gettext-tools/tests/format-c-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,18 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test 'I' format directive flag.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles fc5.tmp fc5.pot"
 : ${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 ${top_srcdir}/tests/format-c-5-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles fc5.ok"
 cat <<EOF > fc5.ok
 #, c-format
 msgid "father of %d children"
@@ -16,6 +22,7 @@
 : ${DIFF=diff}
 ${DIFF} fc5.ok fc5.pot || exit 1
 
+tmpfiles="$tmpfiles fa.po"
 # This should better be Farsi, not German. Can some translator help me?
 cat <<EOF > fa.po
 #, c-format
@@ -23,20 +30,24 @@
 msgstr "Vater von %Id Kindern"
 EOF
 
+tmpfiles="$tmpfiles fa"
 test -d fa || mkdir fa
 test -d fa/LC_MESSAGES || mkdir fa/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fa/LC_MESSAGES/fc5.mo fa.po
 
+tmpfiles="$tmpfiles fa.po.tmp fa.po.un"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fa.po fa.po.un || exit 1
 
-LANGUAGE= ../fc5 fa_IR
+LANGUAGE= ./fc5 fa_IR
 case $? in
   0) ;;
   77)
@@ -45,8 +56,10 @@
     else
       echo "Skipping test: locale fa_IR not supported"
     fi
-    exit 77;;
+    rm -fr $tmpfiles; exit 77;;
   *) exit 1;;
 esac
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-c-5-prg.c gettext-0.18.1.1/gettext-tools/tests/format-c-5-prg.c
--- gettext-0.19.3/gettext-tools/tests/format-c-5-prg.c	2013-04-15 06:45:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-c-5-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-5 test.
-   Copyright (C) 2004, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include "xsetenv.h"
 
 /* For %Id to work, we need the real setlocale(), not the fake one. */
-#if !(__GLIBC__ >= 2 && !defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 # include "setlocale.c"
 #endif
 
@@ -55,7 +55,7 @@
 
   s = gettext ("father of %d children");
   en = "father of %d children";
-#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && !defined __UCLIBC__
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
   expected_translation = "Vater von %Id Kindern";
   expected_result = "Vater von \xdb\xb5 Kindern";
 #else
diff -Nru gettext-0.19.3/gettext-tools/tests/format-csharp-1 gettext-0.18.1.1/gettext-tools/tests/format-csharp-1
--- gettext-0.19.3/gettext-tools/tests/format-csharp-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-csharp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of C# format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-cs-1.data"
 cat <<\EOF > f-cs-1.data
 # Valid: one argument
 "abc{0}def"
@@ -51,6 +54,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-cs-1-$n.in f-cs-1-$n.po"
   cat <<EOF > f-cs-1-$n.in
 GetString(${string});
 EOF
@@ -80,4 +84,6 @@
   rm -f f-cs-1-$n.in f-cs-1-$n.po
 done < f-cs-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-csharp-2 gettext-0.18.1.1/gettext-tools/tests/format-csharp-2
--- gettext-0.19.3/gettext-tools/tests/format-csharp-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-csharp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Java format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-cs-2.data"
 cat <<\EOF > f-cs-2.data
 # Invalid: invalid msgstr
 msgid  "abc{0}def"
@@ -42,6 +45,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-cs-2-$n.po f-cs-2-$n.mo"
   cat <<EOF > f-cs-2-$n.po
 #, csharp-format
 ${msgid_line}
@@ -70,4 +74,6 @@
   rm -f f-cs-2-$n.po f-cs-2-$n.mo
 done < f-cs-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-elisp-1 gettext-0.18.1.1/gettext-tools/tests/format-elisp-1
--- gettext-0.19.3/gettext-tools/tests/format-elisp-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-elisp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Emacs Lisp format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-el-1.data"
 cat <<\EOF > f-el-1.data
 # Valid: no argument
 "abc%%"
@@ -99,6 +102,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-el-1-$n.in f-el-1-$n.po"
   cat <<EOF > f-el-1-$n.in
 (_ ${string});
 EOF
@@ -128,4 +132,6 @@
   rm -f f-el-1-$n.in f-el-1-$n.po
 done < f-el-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-elisp-2 gettext-0.18.1.1/gettext-tools/tests/format-elisp-2
--- gettext-0.19.3/gettext-tools/tests/format-elisp-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-elisp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Emacs Lisp format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-el-2.data"
 cat <<\EOF > f-el-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -258,6 +261,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-el-2-$n.po f-el-2-$n.mo"
   cat <<EOF > f-el-2-$n.po
 #, elisp-format
 ${msgid_line}
@@ -286,4 +290,6 @@
   rm -f f-el-2-$n.po f-el-2-$n.mo
 done < f-el-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-gcc-internal-1 gettext-0.18.1.1/gettext-tools/tests/format-gcc-internal-1
--- gettext-0.19.3/gettext-tools/tests/format-gcc-internal-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-gcc-internal-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of GCC internal format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-gi-1.data"
 cat <<\EOF > f-gi-1.data
 # Valid: no argument
 "abc%%"
@@ -131,6 +134,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-gi-1-$n.in f-gi-1-$n.po"
   cat <<EOF > f-gi-1-$n.in
 gettext(${string});
 EOF
@@ -160,4 +164,6 @@
   rm -f f-gi-1-$n.in f-gi-1-$n.po
 done < f-gi-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-gcc-internal-2 gettext-0.18.1.1/gettext-tools/tests/format-gcc-internal-2
--- gettext-0.19.3/gettext-tools/tests/format-gcc-internal-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-gcc-internal-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of GCC internal format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-gi-2.data"
 cat <<\EOF > f-gi-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -507,6 +510,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-gi-2-$n.po f-gi-2-$n.mo"
   cat <<EOF > f-gi-2-$n.po
 #, gcc-internal-format
 ${msgid_line}
@@ -535,4 +539,6 @@
   rm -f f-gi-2-$n.po f-gi-2-$n.mo
 done < f-gi-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-gfc-internal-1 gettext-0.18.1.1/gettext-tools/tests/format-gfc-internal-1
--- gettext-0.19.3/gettext-tools/tests/format-gfc-internal-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-gfc-internal-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of GFC internal format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-gf-1.data"
 cat <<\EOF > f-gf-1.data
 # Valid: no argument
 "abc%%"
@@ -71,6 +74,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-gf-1-$n.in f-gf-1-$n.po"
   cat <<EOF > f-gf-1-$n.in
 gettext(${string});
 EOF
@@ -100,4 +104,6 @@
   rm -f f-gf-1-$n.in f-gf-1-$n.po
 done < f-gf-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-gfc-internal-2 gettext-0.18.1.1/gettext-tools/tests/format-gfc-internal-2
--- gettext-0.19.3/gettext-tools/tests/format-gfc-internal-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-gfc-internal-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of GFC internal format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-gf-2.data"
 cat <<\EOF > f-gf-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -147,6 +150,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-gf-2-$n.po f-gf-2-$n.mo"
   cat <<EOF > f-gf-2-$n.po
 #, gfc-internal-format
 ${msgid_line}
@@ -175,4 +179,6 @@
   rm -f f-gf-2-$n.po f-gf-2-$n.mo
 done < f-gf-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-java-1 gettext-0.18.1.1/gettext-tools/tests/format-java-1
--- gettext-0.19.3/gettext-tools/tests/format-java-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-java-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Java format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-j-1.data"
 cat <<\EOF > f-j-1.data
 # Valid: one argument
 "abc{0}def"
@@ -121,6 +124,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-j-1-$n.in f-j-1-$n.po"
   cat <<EOF > f-j-1-$n.in
 gettext(${string});
 EOF
@@ -150,4 +154,6 @@
   rm -f f-j-1-$n.in f-j-1-$n.po
 done < f-j-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-java-2 gettext-0.18.1.1/gettext-tools/tests/format-java-2
--- gettext-0.19.3/gettext-tools/tests/format-java-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-java-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Java format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-j-2.data"
 cat <<\EOF > f-j-2.data
 # Invalid: invalid msgstr
 msgid  "abc{0}def"
@@ -111,6 +114,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-j-2-$n.po f-j-2-$n.mo"
   cat <<EOF > f-j-2-$n.po
 #, java-format
 ${msgid_line}
@@ -139,4 +143,6 @@
   rm -f f-j-2-$n.po f-j-2-$n.mo
 done < f-j-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-javascript-1 gettext-0.18.1.1/gettext-tools/tests/format-javascript-1
--- gettext-0.19.3/gettext-tools/tests/format-javascript-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-javascript-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test recognition of JavaScript format strings.
-
-cat <<\EOF > f-js-1.data
-# Valid: no argument
-"abc%%"
-# Valid: one character argument
-"abc%c"
-# Valid: one string argument
-"abc%s"
-# Valid: one integer argument
-"abc%b"
-# Valid: one integer argument
-"abc%d"
-# Valid: one integer argument
-"abc%o"
-# Valid: one integer argument
-"abc%x"
-# Valid: one integer argument
-"abc%X"
-# Valid: one floating-point argument
-"abc%f"
-# Valid: one object argument
-"abc%j"
-# Valid: one argument with flags
-"abc%Id"
-# Valid: one argument with width
-"abc%2d"
-# Valid: one argument with precision
-"abc%.4f"
-# Valid: one argument with width and precision
-"abc%14.4f"
-# Invalid: unterminated
-"abc%"
-# Invalid: unknown format specifier
-"abc%y"
-# Invalid: flags after width
-"abc%1Ig"
-# Invalid: twice precision
-"abc%.4.2f"
-# Valid: three arguments
-"abc%d%j%j"
-EOF
-
-: ${XGETTEXT=xgettext}
-n=0
-while read comment; do
-  read string
-  n=`expr $n + 1`
-  cat <<EOF > f-js-1-$n.in
-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
-  fail=
-  if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if grep javascript-format f-js-1-$n.po > /dev/null; then
-      :
-    else
-      fail=yes
-    fi
-  else
-    if grep javascript-format f-js-1-$n.po > /dev/null; then
-      fail=yes
-    else
-      :
-    fi
-  fi
-  if test -n "$fail"; then
-    echo "Format string recognition error:" 1>&2
-    cat f-js-1-$n.in 1>&2
-    echo "Got:" 1>&2
-    cat f-js-1-$n.po 1>&2
-    exit 1
-  fi
-  rm -f f-js-1-$n.in f-js-1-$n.po
-done < f-js-1.data
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-javascript-2 gettext-0.18.1.1/gettext-tools/tests/format-javascript-2
--- gettext-0.19.3/gettext-tools/tests/format-javascript-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-javascript-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test checking of JavaScript format strings.
-
-cat <<\EOF > f-js-2.data
-# Valid: %% doesn't count
-msgid  "abc%%def"
-msgstr "xyz"
-# Invalid: invalid msgstr
-msgid  "abc%%def"
-msgstr "xyz%"
-# Valid: same arguments, with different widths
-msgid  "abc%2sdef"
-msgstr "xyz%3s"
-# Invalid: too few arguments
-msgid  "abc%sdef%u"
-msgstr "xyz%s"
-# Invalid: too many arguments
-msgid  "abc%udef"
-msgstr "xyz%uvw%c"
-# Valid: type compatibility
-msgid  "abc%o"
-msgstr "xyz%d"
-# Valid: type compatibility
-msgid  "abc%o"
-msgstr "xyz%x"
-# Valid: type compatibility
-msgid  "abc%o"
-msgstr "xyz%X"
-# Valid: type compatibility
-msgid  "abc%d"
-msgstr "xyz%x"
-# Valid: type compatibility
-msgid  "abc%d"
-msgstr "xyz%X"
-# Invalid: type incompatibility
-msgid  "abc%c"
-msgstr "xyz%s"
-# Invalid: type incompatibility
-msgid  "abc%c"
-msgstr "xyz%d"
-# Invalid: type incompatibility
-msgid  "abc%s"
-msgstr "xyz%d"
-EOF
-
-: ${MSGFMT=msgfmt}
-n=0
-while read comment; do
-  read msgid_line
-  read msgstr_line
-  n=`expr $n + 1`
-  cat <<EOF > f-js-2-$n.po
-#, python-format
-${msgid_line}
-${msgstr_line}
-EOF
-  fail=
-  if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if ${MSGFMT} --check-format -o f-js-2-$n.mo f-js-2-$n.po; then
-      :
-    else
-      fail=yes
-    fi
-  else
-    ${MSGFMT} --check-format -o f-js-2-$n.mo f-js-2-$n.po 2> /dev/null
-    if test $? = 1; then
-      :
-    else
-      fail=yes
-    fi
-  fi
-  if test -n "$fail"; then
-    echo "Format string checking error:" 1>&2
-    cat f-js-2-$n.po 1>&2
-    exit 1
-  fi
-  rm -f f-js-2-$n.po f-js-2-$n.mo
-done < f-js-2.data
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-kde-1 gettext-0.18.1.1/gettext-tools/tests/format-kde-1
--- gettext-0.19.3/gettext-tools/tests/format-kde-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-kde-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of KDE format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-kd-1.data"
 cat <<\EOF > f-kd-1.data
 # Unrecognized: no argument
 "abc%%def"
@@ -45,6 +48,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-kd-1-$n.in f-kd-1-$n.po"
   cat <<EOF > f-kd-1-$n.in
 _(${string});
 EOF
@@ -74,4 +78,6 @@
   rm -f f-kd-1-$n.in f-kd-1-$n.po
 done < f-kd-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-kde-2 gettext-0.18.1.1/gettext-tools/tests/format-kde-2
--- gettext-0.19.3/gettext-tools/tests/format-kde-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-kde-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of KDE format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-kd-2.data"
 cat <<\EOF > f-kd-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -72,6 +75,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-kd-2-$n.po f-kd-2-$n.mo"
   cat <<EOF > f-kd-2-$n.po
 #, kde-format
 ${msgid_line}
@@ -100,4 +104,6 @@
   rm -f f-kd-2-$n.po f-kd-2-$n.mo
 done < f-kd-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-librep-1 gettext-0.18.1.1/gettext-tools/tests/format-librep-1
--- gettext-0.19.3/gettext-tools/tests/format-librep-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-librep-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of librep format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-lr-1.data"
 cat <<\EOF > f-lr-1.data
 # Valid: no argument
 "abc%%"
@@ -73,6 +76,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-lr-1-$n.in f-lr-1-$n.po"
   cat <<EOF > f-lr-1-$n.in
 (_ ${string});
 EOF
@@ -102,4 +106,6 @@
   rm -f f-lr-1-$n.in f-lr-1-$n.po
 done < f-lr-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-librep-2 gettext-0.18.1.1/gettext-tools/tests/format-librep-2
--- gettext-0.19.3/gettext-tools/tests/format-librep-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-librep-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of librep format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-lr-2.data"
 cat <<\EOF > f-lr-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -114,6 +117,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-lr-2-$n.po f-lr-2-$n.mo"
   cat <<EOF > f-lr-2-$n.po
 #, librep-format
 ${msgid_line}
@@ -142,4 +146,6 @@
   rm -f f-lr-2-$n.po f-lr-2-$n.mo
 done < f-lr-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-lisp-1 gettext-0.18.1.1/gettext-tools/tests/format-lisp-1
--- gettext-0.19.3/gettext-tools/tests/format-lisp-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-lisp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Lisp format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-l-1.data"
 cat <<\EOF > f-l-1.data
 # Valid: no argument, ( | . *)
 "abc~~def"
@@ -255,6 +258,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-l-1-$n.in f-l-1-$n.po"
   cat <<EOF > f-l-1-$n.in
 (gettext ${string})
 EOF
@@ -284,4 +288,6 @@
   rm -f f-l-1-$n.in f-l-1-$n.po
 done < f-l-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-lisp-2 gettext-0.18.1.1/gettext-tools/tests/format-lisp-2
--- gettext-0.19.3/gettext-tools/tests/format-lisp-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-lisp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Lisp format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-l-2.data"
 cat <<\EOF > f-l-2.data
 # Valid: ~~ doesn't count
 msgid  "abc~~def"
@@ -171,6 +174,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-l-2-$n.po f-l-2-$n.mo"
   cat <<EOF > f-l-2-$n.po
 #, lisp-format
 ${msgid_line}
@@ -199,4 +203,6 @@
   rm -f f-l-2-$n.po f-l-2-$n.mo
 done < f-l-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-lua-1 gettext-0.18.1.1/gettext-tools/tests/format-lua-1
--- gettext-0.19.3/gettext-tools/tests/format-lua-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-lua-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test recognition of Lua format strings.
-
-cat <<\EOF > f-lu-1.data
-# Valid: no argument
-"abc%%"
-# Valid: one string argument
-"abc%s"
-# Valid: one string argument
-"abc%q"
-# Valid: one character argument
-"abc%c"
-# Valid: one integer argument
-"abc%i"
-# Valid: one integer argument
-"abc%d"
-# Valid: one integer argument
-"abc%o"
-# Valid: one integer argument
-"abc%u"
-# Valid: one integer argument
-"abc%X"
-# Valid: one integer argument
-"abc%x"
-# Valid: one float argument
-"abc%e"
-# Valid: one float argument
-"abc%E"
-# Valid: one float argument
-"abc%f"
-# Valid: one float argument
-"abc%g"
-# Valid: one float argument
-"abc%G"
-# Valid: one float argument with width
-"abc%4f"
-# Valid: one float argument with precision
-"abc%.8f"
-# Valid: one float argument with width and precision
-"abc%12.4f"
-# Valid: three arguments
-"abc%c%d%e"
-# Valid: three arguments with width and/or precision
-"abc%4.3s%.3f%0e"
-# Invalid: unterminated
-"abc%"
-# Invalid: unknown format specifier
-"abc%T"
-# Invalid: unknown modifier
-"abc%lf"
-# Invalid: extra precision
-"abc%1.1.1f"
-# Invalid: unterminated
-"abc%3"
-EOF
-: ${XGETTEXT=xgettext}
-n=0
-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
-  fail=
-  if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if grep lua-format f-lu-1-$n.po > /dev/null; then
-      :
-    else
-      fail=yes
-    fi
-  else
-    if grep lua-format f-lu-1-$n.po > /dev/null; then
-      fail=yes
-    else
-      :
-    fi
-  fi
-  if test -n "$fail"; then
-    echo "Format string recognition error:" 1>&2
-    cat f-lu-1-$n.in 1>&2
-    echo "Got:" 1>&2
-    cat f-lu-1-$n.po 1>&2
-    exit 1
-  fi
-  rm -f f-lu-1-$n.in f-lu-1-$n.po
-done < f-lu-1.data
-
-exit 0
-
diff -Nru gettext-0.19.3/gettext-tools/tests/format-lua-2 gettext-0.18.1.1/gettext-tools/tests/format-lua-2
--- gettext-0.19.3/gettext-tools/tests/format-lua-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-lua-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test checking of Python format strings.
-
-cat <<\EOF > f-lu-2.data
-# Valid: %% doesn't count
-msgid  "abc%%def"
-msgstr "xyz"
-# Invalid: invalid msgstr
-msgid  "abc%%def"
-msgstr "xyz%"
-# Valid: same arguments, with different widths
-msgid  "abc%2sdef"
-msgstr "xyz%3s"
-# Invalid: too few arguments
-msgid  "abc%sdef%u"
-msgstr "xyz%s"
-# Invalid: too many arguments
-msgid  "abc%udef"
-msgstr "xyz%uvw%c"
-# Valid: type compatibility
-msgid  "abc%i"
-msgstr "xyz%d"
-# Valid: type compatibility
-msgid  "abc%i"
-msgstr "xyz%u"
-# Valid: type compatibility
-msgid  "abc%i"
-msgstr "xyz%o"
-# Valid: type compatibility
-msgid  "abc%i"
-msgstr "xyz%x"
-# Valid: type compatibility
-msgid  "abc%i"
-msgstr "xyz%X"
-# Valid: type compatibility
-msgid  "abc%e"
-msgstr "xyz%E"
-# Valid: type compatibility
-msgid  "abc%e"
-msgstr "xyz%f"
-# Valid: type compatibility
-msgid  "abc%e"
-msgstr "xyz%g"
-# Valid: type compatibility
-msgid  "abc%e"
-msgstr "xyz%G"
-# Invalid: type incompatibility
-msgid  "abc%c"
-msgstr "xyz%s"
-# Invalid: type incompatibility
-msgid  "abc%c"
-msgstr "xyz%.0s"
-# Invalid: type incompatibility
-msgid  "abc%c"
-msgstr "xyz%i"
-# Invalid: type incompatibility
-msgid  "abc%c"
-msgstr "xyz%e"
-# Invalid: type incompatibility
-msgid  "abc%s"
-msgstr "xyz%i"
-# Invalid: type incompatibility
-msgid  "abc%.0s"
-msgstr "xyz%i"
-# Invalid: type incompatibility
-msgid  "abc%s"
-msgstr "xyz%e"
-# Invalid: type incompatibility
-msgid  "abc%.0s"
-msgstr "xyz%e"
-# Invalid: type incompatibility
-msgid  "abc%i"
-msgstr "xyz%e"
-# Invalid: type incompatibility
-msgid  "abc%s"
-msgstr "xyz%q"
-# Invalid: type incompatibility
-msgid  "abc%q"
-msgstr "xyz%s"
-EOF
-
-: ${MSGFMT=msgfmt}
-n=0
-while read comment; do
-  read msgid_line
-  read msgstr_line
-  n=`expr $n + 1`
-  cat <<EOF > f-lu-2-$n.po
-#, lua-format
-${msgid_line}
-${msgstr_line}
-EOF
-  fail=
-  if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if ${MSGFMT} --check-format -o f-lu-2-$n.mo f-lu-2-$n.po; then
-      :
-    else
-      fail=yes
-    fi
-  else
-    ${MSGFMT} --check-format -o f-lu-2-$n.mo f-lu-2-$n.po 2> /dev/null
-    if test $? = 1; then
-      :
-    else
-      fail=yes
-    fi
-  fi
-  if test -n "$fail"; then
-    echo "Format string checking error:" 1>&2
-    cat f-lu-2-$n.po 1>&2
-    exit 1
-  fi
-  rm -f f-lu-2-$n.po f-lu-2-$n.mo
-done < f-lu-2.data
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-pascal-1 gettext-0.18.1.1/gettext-tools/tests/format-pascal-1
--- gettext-0.19.3/gettext-tools/tests/format-pascal-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-pascal-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Object Pascal format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-op-1.data"
 cat <<\EOF > f-op-1.data
 # Valid: no argument
 "abc%%"
@@ -93,6 +96,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-op-1-$n.in f-op-1-$n.po"
   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
@@ -120,4 +124,6 @@
   rm -f f-op-1-$n.in f-op-1-$n.po
 done < f-op-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-pascal-2 gettext-0.18.1.1/gettext-tools/tests/format-pascal-2
--- gettext-0.19.3/gettext-tools/tests/format-pascal-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-pascal-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Object Pascal format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-op-2.data"
 cat <<\EOF > f-op-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -99,6 +102,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-op-2-$n.po f-op-2-$n.mo"
   cat <<EOF > f-op-2-$n.po
 #, object-pascal-format
 ${msgid_line}
@@ -127,4 +131,6 @@
   rm -f f-op-2-$n.po f-op-2-$n.mo
 done < f-op-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-perl-1 gettext-0.18.1.1/gettext-tools/tests/format-perl-1
--- gettext-0.19.3/gettext-tools/tests/format-perl-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-perl-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-pl-1.data"
 cat <<\EOF > f-pl-1.data
 # Valid: no argument
 "abc%%"
@@ -133,6 +136,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-pl-1-$n.in f-pl-1-$n.po"
   sed -e 's,\$,\\$,g' <<EOF > f-pl-1-$n.in
 gettext(${string});
 EOF
@@ -162,4 +166,6 @@
   rm -f f-pl-1-$n.in f-pl-1-$n.po
 done < f-pl-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-perl-2 gettext-0.18.1.1/gettext-tools/tests/format-perl-2
--- gettext-0.19.3/gettext-tools/tests/format-perl-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-perl-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-pl-2.data"
 cat <<\EOF > f-pl-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -210,6 +213,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-pl-2-$n.po f-pl-2-$n.mo"
   cat <<EOF > f-pl-2-$n.po
 #, perl-format
 ${msgid_line}
@@ -238,4 +242,6 @@
   rm -f f-pl-2-$n.po f-pl-2-$n.mo
 done < f-pl-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-perl-brace-1 gettext-0.18.1.1/gettext-tools/tests/format-perl-brace-1
--- gettext-0.19.3/gettext-tools/tests/format-perl-brace-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-perl-brace-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl brace format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-pb-1.data"
 cat <<\EOF > f-pb-1.data
 # Invalid: no argument
 "abc"
@@ -33,6 +36,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-pb-1-$n.in f-pb-1-$n.po"
   cat <<EOF > f-pb-1-$n.in
 gettext(${string});
 EOF
@@ -62,4 +66,6 @@
   rm -f f-pb-1-$n.in f-pb-1-$n.po
 done < f-pb-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-perl-brace-2 gettext-0.18.1.1/gettext-tools/tests/format-perl-brace-2
--- gettext-0.19.3/gettext-tools/tests/format-perl-brace-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-perl-brace-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl brace format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-pb-2.data"
 cat <<\EOF > f-pb-2.data
 # Valid: same named arguments
 msgid  "abc{date}{time}"
@@ -33,6 +36,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-pb-2-$n.po f-pb-2-$n.mo"
   cat <<EOF > f-pb-2-$n.po
 #, perl-brace-format
 ${msgid_line}
@@ -61,4 +65,6 @@
   rm -f f-pb-2-$n.po f-pb-2-$n.mo
 done < f-pb-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-perl-mixed-1 gettext-0.18.1.1/gettext-tools/tests/format-perl-mixed-1
--- gettext-0.19.3/gettext-tools/tests/format-perl-mixed-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-perl-mixed-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl format strings of both kinds (printf and brace).
 # This test is for the combination of both kinds.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-pm-1.data"
 
 cat <<\EOF > f-pm-1.data
 # Both formats.
@@ -32,6 +35,7 @@
   read formats
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-pm-1-$n.in f-pm-1-$n.po"
   cat <<EOF > f-pm-1-$n.in
 gettext(${string});
 EOF
@@ -62,4 +66,6 @@
   fi
 done < f-pm-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-perl-mixed-2 gettext-0.18.1.1/gettext-tools/tests/format-perl-mixed-2
--- gettext-0.19.3/gettext-tools/tests/format-perl-mixed-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-perl-mixed-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl format strings.
 # This test is for the combination of printf and brace format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-pm-2.data"
 cat <<\EOF > f-pm-2.data
 # Valid: normal case.
 #, perl-format, perl-brace-format
@@ -42,6 +45,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-pm-2-$n.po f-pm-2-$n.mo"
   cat <<EOF > f-pm-2-$n.po
 ${formats}
 ${msgid_line}
@@ -69,4 +73,6 @@
   fi
 done < f-pm-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-php-1 gettext-0.18.1.1/gettext-tools/tests/format-php-1
--- gettext-0.19.3/gettext-tools/tests/format-php-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-php-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of PHP format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-ph-1.data"
 cat <<\EOF > f-ph-1.data
 # Valid: no argument
 "abc%%"
@@ -81,6 +84,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-ph-1-$n.in f-ph-1-$n.po"
   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
@@ -108,4 +112,6 @@
   rm -f f-ph-1-$n.in f-ph-1-$n.po
 done < f-ph-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-php-2 gettext-0.18.1.1/gettext-tools/tests/format-php-2
--- gettext-0.19.3/gettext-tools/tests/format-php-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-php-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of PHP format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-ph-2.data"
 cat <<\EOF > f-ph-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -87,6 +90,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-ph-2-$n.po f-ph-2-$n.mo"
   cat <<EOF > f-ph-2-$n.po
 #, php-format
 ${msgid_line}
@@ -115,4 +119,6 @@
   rm -f f-ph-2-$n.po f-ph-2-$n.mo
 done < f-ph-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-python-1 gettext-0.18.1.1/gettext-tools/tests/format-python-1
--- gettext-0.19.3/gettext-tools/tests/format-python-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-python-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Python format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-p-1.data"
 cat <<\EOF > f-p-1.data
 # Valid: no argument
 "abc%%"
@@ -94,11 +97,13 @@
 "abc%(addr).*x"
 EOF
 
+tmpfiles="$tmpfiles f-p-1.err"
 : ${XGETTEXT=xgettext}
 n=0
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-p-1-$n.in f-p-1-$n.po"
   cat <<EOF > f-p-1-$n.in
 gettext(${string});
 EOF
@@ -130,4 +135,6 @@
   rm -f f-p-1-$n.in f-p-1-$n.po
 done < f-p-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-python-2 gettext-0.18.1.1/gettext-tools/tests/format-python-2
--- gettext-0.19.3/gettext-tools/tests/format-python-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-python-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-p-2.data"
 cat <<\EOF > f-p-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -114,6 +117,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-p-2-$n.po f-p-2-$n.mo"
   cat <<EOF > f-p-2-$n.po
 #, python-format
 ${msgid_line}
@@ -142,4 +146,6 @@
   rm -f f-p-2-$n.po f-p-2-$n.mo
 done < f-p-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-python-brace-1 gettext-0.18.1.1/gettext-tools/tests/format-python-brace-1
--- gettext-0.19.3/gettext-tools/tests/format-python-brace-1	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-python-brace-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test recognition of Python brace format strings.
-
-cat <<\EOF > f-pyb-1.data
-# Invalid: no argument
-"abc"
-# Invalid: escaped braces
-"abc{{}}"
-# Valid: a numeric argument
-"abc{0}"
-# Valid: a named argument
-"abc{value}"
-# Invalid: an empty name
-"abc{}"
-# Invalid: unterminated name
-"abc{value"
-# Valid: three arguments, two with equal names
-"abc{addr},{char},{addr}"
-# Valid: getattr operator
-"abc{value.name}"
-# Invalid: getattr operator with numeric field name
-"abc{value.0}"
-# Valid: getitem operator
-"abc{value[name]}"
-# Invalid: unterminated getitem operator
-"abc{value[name}"
-# Invalid: unterminated getitem operator
-"abc{value[0}"
-# Invalid: unknown character in getitem operator
-"abc{value[!]}"
-# Valid: format specifier
-"abc{value:0}"
-# Valid: standard format specifier
-"abc{value:<<-#012.34e}"
-# Invalid: non-standard format specifier
-"abc{value:<c>}"
-# Valid: nested format specifier
-"abc{value:{foo}}"
-# Invalid: too many nesting of format specifier
-"abc{value:{foo:0}}"
-# Invalid: nested format specifier, in the middle of other format specifiers
-"abc{value:0{foo}0}"
-EOF
-
-: ${XGETTEXT=xgettext}
-n=0
-while read comment; do
-  read string
-  n=`expr $n + 1`
-  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
-  fail=
-  if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if grep python-brace-format f-pyb-1-$n.po > /dev/null; then
-      :
-    else
-      fail=yes
-    fi
-  else
-    if grep python-brace-format f-pyb-1-$n.po > /dev/null; then
-      fail=yes
-    else
-      :
-    fi
-  fi
-  if test -n "$fail"; then
-    echo "Format string recognition error:" 1>&2
-    cat f-pyb-1-$n.in 1>&2
-    echo "Got:" 1>&2
-    cat f-pyb-1-$n.po 1>&2
-    exit 1
-  fi
-  rm -f f-pyb-1-$n.in f-pyb-1-$n.po
-done < f-pyb-1.data
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-python-brace-2 gettext-0.18.1.1/gettext-tools/tests/format-python-brace-2
--- gettext-0.19.3/gettext-tools/tests/format-python-brace-2	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-python-brace-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test checking of Python brace format strings.
-
-cat <<\EOF > f-pyb-2.data
-# Valid: same named arguments
-msgid  "abc{date}{time}"
-msgstr "xyz{date}{time}"
-# Valid: permutation
-msgid  "abc{x3}{x1}{x2}def"
-msgstr "xyz{x2}{x1}{x3}"
-# Invalid: missing argument
-msgid  "abc{x2}def{x1}"
-msgstr "xyz{x1}"
-# Invalid: missing argument
-msgid  "abc{x1}def{x2}"
-msgstr "xyz{x2}"
-# Invalid: added argument
-msgid  "abc{foo}def"
-msgstr "xyz{foo}uvw{zoo}"
-# Valid: multiple reuse of same argument
-msgid  "{foo} {bar} {baz}"
-msgstr "{baz} {bar} {foo} {bar}"
-# Valid: single reuse of same argument
-msgid  "{baz} {bar} {foo} {bar}"
-msgstr "{foo} {bar} {baz}"
-# Valid: "{{" is an escape of "{"
-msgid  "abc{{{x1}{x2}"
-msgstr "{x2}abc{x1}"
-EOF
-
-: ${MSGFMT=msgfmt}
-n=0
-while read comment; do
-  read msgid_line
-  read msgstr_line
-  n=`expr $n + 1`
-  cat <<EOF > f-pyb-2-$n.po
-#, python-brace-format
-${msgid_line}
-${msgstr_line}
-EOF
-  fail=
-  if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if ${MSGFMT} --check-format -o f-pyb-2-$n.mo f-pyb-2-$n.po; then
-      :
-    else
-      fail=yes
-    fi
-  else
-    ${MSGFMT} --check-format -o f-pyb-2-$n.mo f-pyb-2-$n.po 2> /dev/null
-    if test $? = 1; then
-      :
-    else
-      fail=yes
-    fi
-  fi
-  if test -n "$fail"; then
-    echo "Format string checking error:" 1>&2
-    cat f-pyb-2-$n.po 1>&2
-    exit 1
-  fi
-  rm -f f-pyb-2-$n.po f-pyb-2-$n.mo
-done < f-pyb-2.data
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-qt-1 gettext-0.18.1.1/gettext-tools/tests/format-qt-1
--- gettext-0.19.3/gettext-tools/tests/format-qt-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-qt-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Qt format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-qt-1.data"
 cat <<\EOF > f-qt-1.data
 # Unrecognized: no argument
 "abc%%def"
@@ -39,6 +42,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-qt-1-$n.in f-qt-1-$n.po"
   cat <<EOF > f-qt-1-$n.in
 _(${string});
 EOF
@@ -68,4 +72,6 @@
   rm -f f-qt-1-$n.in f-qt-1-$n.po
 done < f-qt-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-qt-2 gettext-0.18.1.1/gettext-tools/tests/format-qt-2
--- gettext-0.19.3/gettext-tools/tests/format-qt-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-qt-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Qt format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-qt-2.data"
 cat <<\EOF > f-qt-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -51,6 +54,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-qt-2-$n.po f-qt-2-$n.mo"
   cat <<EOF > f-qt-2-$n.po
 #, qt-format
 ${msgid_line}
@@ -79,4 +83,6 @@
   rm -f f-qt-2-$n.po f-qt-2-$n.mo
 done < f-qt-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-qt-plural-1 gettext-0.18.1.1/gettext-tools/tests/format-qt-plural-1
--- gettext-0.19.3/gettext-tools/tests/format-qt-plural-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-qt-plural-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Qt plural format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-qtp-1.data"
 cat <<\EOF > f-qtp-1.data
 # Unrecognized: no argument
 "abcdef"
@@ -27,6 +30,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-qtp-1-$n.in f-qtp-1-$n.po"
   cat <<EOF > f-qtp-1-$n.in
 _(${string});
 EOF
@@ -56,4 +60,6 @@
   rm -f f-qtp-1-$n.in f-qtp-1-$n.po
 done < f-qtp-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-qt-plural-2 gettext-0.18.1.1/gettext-tools/tests/format-qt-plural-2
--- gettext-0.19.3/gettext-tools/tests/format-qt-plural-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-qt-plural-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Qt plural format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-qtp-2.data"
 cat <<\EOF > f-qtp-2.data
 # Valid: %1 doesn't count
 msgid  "abc%1def"
@@ -36,6 +39,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-qtp-2-$n.po f-qtp-2-$n.mo"
   cat <<EOF > f-qtp-2-$n.po
 #, qt-plural-format
 ${msgid_line}
@@ -64,4 +68,6 @@
   rm -f f-qtp-2-$n.po f-qtp-2-$n.mo
 done < f-qtp-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-scheme-1 gettext-0.18.1.1/gettext-tools/tests/format-scheme-1
--- gettext-0.19.3/gettext-tools/tests/format-scheme-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-scheme-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Scheme format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-sc-1.data"
 cat <<\EOF > f-sc-1.data
 # Valid: no argument, ( | . *)
 "abc~~def"
@@ -257,6 +260,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-sc-1-$n.in f-sc-1-$n.po"
   cat <<EOF > f-sc-1-$n.in
 (gettext ${string})
 EOF
@@ -286,4 +290,6 @@
   rm -f f-sc-1-$n.in f-sc-1-$n.po
 done < f-sc-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-scheme-2 gettext-0.18.1.1/gettext-tools/tests/format-scheme-2
--- gettext-0.19.3/gettext-tools/tests/format-scheme-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-scheme-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Lisp format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-sc-2.data"
 cat <<\EOF > f-sc-2.data
 # Valid: ~~ doesn't count
 msgid  "abc~~def"
@@ -186,6 +189,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-sc-2-$n.po f-sc-2-$n.mo"
   cat <<EOF > f-sc-2-$n.po
 #, scheme-format
 ${msgid_line}
@@ -214,4 +218,6 @@
   rm -f f-sc-2-$n.po f-sc-2-$n.mo
 done < f-sc-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-sh-1 gettext-0.18.1.1/gettext-tools/tests/format-sh-1
--- gettext-0.19.3/gettext-tools/tests/format-sh-1	2014-10-14 07:53:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-sh-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Shell format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-sh-1.data"
 cat <<\EOF > f-sh-1.data
 # Invalid: no argument
 "abc"
@@ -37,7 +40,8 @@
 while read comment; do
   read string
   n=`expr $n + 1`
-  LC_ALL=C sed -e 's,\$,\\$,g' <<EOF > f-sh-1-$n.in
+  tmpfiles="$tmpfiles f-sh-1-$n.in f-sh-1-$n.po"
+  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
@@ -66,4 +70,6 @@
   rm -f f-sh-1-$n.in f-sh-1-$n.po
 done < f-sh-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-sh-2 gettext-0.18.1.1/gettext-tools/tests/format-sh-2
--- gettext-0.19.3/gettext-tools/tests/format-sh-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-sh-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Shell format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-sh-2.data"
 cat <<\EOF > f-sh-2.data
 # Invalid: invalid msgstr
 msgid  "abc$file"
@@ -30,6 +33,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-sh-2-$n.po f-sh-2-$n.mo"
   cat <<EOF > f-sh-2-$n.po
 #, sh-format
 ${msgid_line}
@@ -58,4 +62,6 @@
   rm -f f-sh-2-$n.po f-sh-2-$n.mo
 done < f-sh-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-tcl-1 gettext-0.18.1.1/gettext-tools/tests/format-tcl-1
--- gettext-0.19.3/gettext-tools/tests/format-tcl-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-tcl-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Tcl format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-t-1.data"
 cat <<\EOF > f-t-1.data
 # Valid: no argument
 "abc%%"
@@ -103,6 +106,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-t-1-$n.in f-t-1-$n.po"
   escape_dollars='s/\$/\\\$/g'
   string=`echo "$string" | sed -e "$escape_dollars"`
   cat <<EOF > f-t-1-$n.in
@@ -134,4 +138,6 @@
   rm -f f-t-1-$n.in f-t-1-$n.po
 done < f-t-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-tcl-2 gettext-0.18.1.1/gettext-tools/tests/format-tcl-2
--- gettext-0.19.3/gettext-tools/tests/format-tcl-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-tcl-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Tcl format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-t-2.data"
 cat <<\EOF > f-t-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -108,6 +111,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-t-2-$n.po f-t-2-$n.mo"
   cat <<EOF > f-t-2-$n.po
 #, tcl-format
 ${msgid_line}
@@ -136,4 +140,6 @@
   rm -f f-t-2-$n.po f-t-2-$n.mo
 done < f-t-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-ycp-1 gettext-0.18.1.1/gettext-tools/tests/format-ycp-1
--- gettext-0.19.3/gettext-tools/tests/format-ycp-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-ycp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of YCP format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-y-1.data"
 cat <<\EOF > f-y-1.data
 # Valid: no argument
 "abc%%def"
@@ -27,6 +30,7 @@
 while read comment; do
   read string
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-y-1-$n.in f-y-1-$n.po"
   cat <<EOF > f-y-1-$n.in
 _(${string});
 EOF
@@ -56,4 +60,6 @@
   rm -f f-y-1-$n.in f-y-1-$n.po
 done < f-y-1.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/format-ycp-2 gettext-0.18.1.1/gettext-tools/tests/format-ycp-2
--- gettext-0.19.3/gettext-tools/tests/format-ycp-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/format-ycp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of YCP format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles f-y-2.data"
 cat <<\EOF > f-y-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
@@ -36,6 +39,7 @@
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
+  tmpfiles="$tmpfiles f-y-2-$n.po f-y-2-$n.mo"
   cat <<EOF > f-y-2-$n.po
 #, ycp-format
 ${msgid_line}
@@ -64,4 +68,6 @@
   rm -f f-y-2-$n.po f-y-2-$n.mo
 done < f-y-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-1 gettext-0.18.1.1/gettext-tools/tests/gettext-1
--- gettext-0.19.3/gettext-tools/tests/gettext-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,22 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the gettext program with -e option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Create binary test file in correct position.
-test -d gt-1 || mkdir gt-1
-test -d gt-1/LC_MESSAGES || mkdir gt-1/LC_MESSAGES
-cp "$abs_srcdir"/test.mo gt-1/LC_MESSAGES
+tmpfiles="$tmpfiles LC_MESSAGES"
+test -d LC_MESSAGES || mkdir LC_MESSAGES
+cp $top_srcdir/tests/test.mo LC_MESSAGES
 
+tmpfiles="$tmpfiles gt-test1.out"
 : ${GETTEXT=gettext}
-TEXTDOMAINDIR=. LANGUAGE=gt-1 \
+TEXTDOMAINDIR=.. LANGUAGE=tests \
 ${GETTEXT} --env LC_ALL=en -e test 'SYS_(C)\n' | LC_ALL=C tr -d '\r' > gt-test1.out
 
 # Create correct file.
+tmpfile="$tmpfiles gtmf-test1.ok"
 cat <<EOF > gtmf-test1.ok
 MSGFMT(1) portable message object file compiler
 Copyright (C) 1995 Free Software Foundation
@@ -23,4 +27,6 @@
 ${DIFF} gtmf-test1.ok gt-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-2 gettext-0.18.1.1/gettext-tools/tests/gettext-2
--- gettext-0.19.3/gettext-tools/tests/gettext-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the gettext program without -e option.
 
@@ -15,20 +14,27 @@
   ac_n= ac_c='\c' ac_t=
 fi
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Create binary test file in correct position.
-test -d gt-2 || mkdir gt-2
-test -d gt-2/LC_MESSAGES || mkdir gt-2/LC_MESSAGES
-cp "$abs_srcdir"/test.mo gt-2/LC_MESSAGES
+tmpfiles="$tmpfiles LC_MESSAGES"
+test -d LC_MESSAGES || mkdir LC_MESSAGES
+cp $top_srcdir/tests/test.mo LC_MESSAGES
 
+tmpfiles="$tmpfiles gt-test2.out"
 : ${GETTEXT=gettext}
-TEXTDOMAINDIR=. LANGUAGE=gt-2 \
+TEXTDOMAINDIR=.. LANGUAGE=tests \
 ${GETTEXT} --env LC_ALL=en test 'error 3' > gt-test2.out
 
 # Create correct file.
+tmpfile="$tmpfiles gtmf-test2.ok"
 echo $ac_n "error 3 translation$ac_c" > gtmf-test2.ok
 
 : ${DIFF=diff}
 ${DIFF} gtmf-test2.ok gt-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-3 gettext-0.18.1.1/gettext-tools/tests/gettext-3
--- gettext-0.19.3/gettext-tools/tests/gettext-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() works right even with intermediate
 # setlocale() calls.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # This test works only on glibc systems.
 : ${GLIBC2=no}
 test "$GLIBC2" = yes || {
@@ -12,7 +14,7 @@
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
-LC_ALL=de_DE ../testlocale || {
+LC_ALL=de_DE ./testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE not installed"
   else
@@ -20,7 +22,7 @@
   fi
   exit 77
 }
-LC_ALL=fr_FR ../testlocale || {
+LC_ALL=fr_FR ./testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale fr_FR not installed"
   else
@@ -29,16 +31,17 @@
   exit 77
 }
 
-test -d gt-3 || mkdir gt-3
-test -d gt-3/de_DE || mkdir gt-3/de_DE
-test -d gt-3/de_DE/LC_MESSAGES || mkdir gt-3/de_DE/LC_MESSAGES
-test -d gt-3/fr_FR || mkdir gt-3/fr_FR
-test -d gt-3/fr_FR/LC_MESSAGES || mkdir gt-3/fr_FR/LC_MESSAGES
+tmpfiles="$tmpfiles de_DE fr_FR"
+test -d de_DE || mkdir de_DE
+test -d de_DE/LC_MESSAGES || mkdir de_DE/LC_MESSAGES
+test -d fr_FR || mkdir fr_FR
+test -d fr_FR/LC_MESSAGES || mkdir fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-1.po
-${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-2.po
+${MSGFMT} -o de_DE/LC_MESSAGES/tstlang.mo ${top_srcdir}/tests/gettext-3-1.po
+${MSGFMT} -o fr_FR/LC_MESSAGES/tstlang.mo ${top_srcdir}/tests/gettext-3-2.po
 
+tmpfiles="$tmpfiles gt-3.ok"
 cat <<EOF > gt-3.ok
 String1 - Lang1: 1st string
 String2 - Lang1: 2nd string
@@ -48,9 +51,12 @@
 String2 - Another string for testing.
 EOF
 
-../gettext-3-prg > gt-3.out || exit 1
+tmpfiles="$tmpfiles gt-3.out"
+./gettext-3-prg > gt-3.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} gt-3.ok gt-3.out || exit 1
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-3-prg.c gettext-0.18.1.1/gettext-tools/tests/gettext-3-prg.c
--- gettext-0.19.3/gettext-tools/tests/gettext-3-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-3-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -69,7 +69,7 @@
       if (setlocale (LC_ALL, lang[i]) == NULL)
         setlocale (LC_ALL, "C");
 
-      bindtextdomain ("tstlang", "gt-3");
+      bindtextdomain ("tstlang", ".");
 
       for (j = 0; j < data_cnt; ++j)
         printf ("%s - %s\n", strings[j].selection,
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-4 gettext-0.18.1.1/gettext-tools/tests/gettext-4
--- gettext-0.19.3/gettext-tools/tests/gettext-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that bind_textdomain_codeset() works.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # This test works only on systems that have a traditional french locale
 # installed.
 # gettext-4.po is actually a German PO file, but only the encoding of the
@@ -10,7 +12,7 @@
 # a traditional french locale is installed; no need to check also for a
 # traditional german locale.
 : ${LOCALE_FR=fr_FR}
-{ test $LOCALE_FR != none && LC_ALL=$LOCALE_FR ../testlocale; } || {
+{ test $LOCALE_FR != none && LC_ALL=$LOCALE_FR ./testlocale; } || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: no traditional french locale is installed"
   else
@@ -19,13 +21,15 @@
   exit 77
 }
 
-test -d gt-4 || mkdir gt-4
-test -d gt-4/fr || mkdir gt-4/fr
-test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES
+tmpfiles="$tmpfiles fr"
+test -d fr || mkdir fr
+test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-4.po
+${MSGFMT} -o fr/LC_MESSAGES/codeset.mo ${top_srcdir}/tests/gettext-4.po
+
+./gettext-4-prg $LOCALE_FR || exit 1
 
-../gettext-4-prg $LOCALE_FR || exit 1
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-4-prg.c gettext-0.18.1.1/gettext-tools/tests/gettext-4-prg.c
--- gettext-0.19.3/gettext-tools/tests/gettext-4-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-4-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -48,7 +48,7 @@
   xsetenv ("LC_ALL", argv[1], 1);
   setlocale (LC_ALL, "");
   textdomain ("codeset");
-  bindtextdomain ("codeset", "gt-4");
+  bindtextdomain ("codeset", ".");
 
   /* Here we expect output in ISO-8859-1.
      Except on Darwin 7 or newer and on BeOS, for which locale_charset ()
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-5 gettext-0.18.1.1/gettext-tools/tests/gettext-5
--- gettext-0.19.3/gettext-tools/tests/gettext-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, the gettext() results come out in the correct
 # encoding for locales that differ only in their encoding.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # This test works only on glibc systems.
 : ${GLIBC2=no}
 test "$GLIBC2" = yes || {
@@ -13,7 +15,7 @@
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
 # de_DE.UTF-8 locale installed.
-LC_ALL=de_DE.ISO-8859-1 ../testlocale || {
+LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE.ISO-8859-1 not installed"
   else
@@ -21,7 +23,7 @@
   fi
   exit 77
 }
-LC_ALL=de_DE.UTF-8 ../testlocale || {
+LC_ALL=de_DE.UTF-8 ./testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE.UTF-8 not installed"
   else
@@ -30,13 +32,15 @@
   exit 77
 }
 
-test -d gt-5 || mkdir gt-5
-test -d gt-5/de_DE || mkdir gt-5/de_DE
-test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES
+tmpfiles="$tmpfiles de_DE"
+test -d de_DE || mkdir de_DE
+test -d de_DE/LC_MESSAGES || mkdir de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-5.po
+${MSGFMT} -o de_DE/LC_MESSAGES/codeset.mo ${top_srcdir}/tests/gettext-5.po
+
+./gettext-5-prg || exit 1
 
-../gettext-5-prg || exit 1
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-5-prg.c gettext-0.18.1.1/gettext-tools/tests/gettext-5-prg.c
--- gettext-0.19.3/gettext-tools/tests/gettext-5-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-5-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -38,7 +38,7 @@
   unsetenv ("LANGUAGE");
   unsetenv ("OUTPUT_CHARSET");
   textdomain ("codeset");
-  bindtextdomain ("codeset", "gt-5");
+  bindtextdomain ("codeset", ".");
 
   setlocale (LC_ALL, "de_DE.ISO-8859-1");
 
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-6 gettext-0.18.1.1/gettext-tools/tests/gettext-6
--- gettext-0.19.3/gettext-tools/tests/gettext-6	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() in multithreaded applications works
 # correctly if different threads operate in different locales with the same
 # encoding.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # This test works only on glibc and MacOS X systems.
 : ${host_os=unknown}
 : ${GLIBC2=no}
@@ -19,7 +21,7 @@
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
-missing_locale=`../gettext-6-prg 1`
+missing_locale=`./gettext-6-prg 1`
 if test -n "$missing_locale"; then
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale ${missing_locale} not installed"
@@ -29,16 +31,17 @@
   exit 77
 fi
 
-test -d gt-6 || mkdir gt-6
-test -d gt-6/de_DE || mkdir gt-6/de_DE
-test -d gt-6/de_DE/LC_MESSAGES || mkdir gt-6/de_DE/LC_MESSAGES
-test -d gt-6/fr_FR || mkdir gt-6/fr_FR
-test -d gt-6/fr_FR/LC_MESSAGES || mkdir gt-6/fr_FR/LC_MESSAGES
+tmpfiles="$tmpfiles de_DE fr_FR"
+test -d de_DE || mkdir de_DE
+test -d de_DE/LC_MESSAGES || mkdir de_DE/LC_MESSAGES
+test -d fr_FR || mkdir fr_FR
+test -d fr_FR/LC_MESSAGES || mkdir fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-6-1.po
-${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-6-2.po
+${MSGFMT} -o de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-6-1.po
+${MSGFMT} -o fr_FR/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-6-2.po
 
+tmpfiles="$tmpfiles gt-6.ok"
 cat <<EOF > gt-6.ok
 Sch�nheit
 beaut�
@@ -46,16 +49,19 @@
 beaut�
 EOF
 
-../gettext-6-prg > gt-6.out
+tmpfiles="$tmpfiles gt-6.out"
+./gettext-6-prg > gt-6.out
 case $? in
   0) ;;
   77)
     echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system"
-    exit 77
+    rm -fr $tmpfiles; exit 77
     ;;
 esac
 
 : ${DIFF=diff}
 ${DIFF} gt-6.ok gt-6.out || exit 1
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-6-prg.c gettext-0.18.1.1/gettext-tools/tests/gettext-6-prg.c
--- gettext-0.19.3/gettext-tools/tests/gettext-6-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-6-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-6 test.
-   Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if USE_POSIX_THREADS && ((__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __APPLE__ && defined __MACH__)) && HAVE_USELOCALE
+#if USE_POSIX_THREADS && (__GLIBC__ >= 2 || (defined __APPLE__ && defined __MACH__)) && HAVE_USELOCALE
 
 #include <pthread.h>
 
@@ -175,7 +175,7 @@
   unsetenv ("LANGUAGE");
   unsetenv ("OUTPUT_CHARSET");
   textdomain ("tstthread");
-  bindtextdomain ("tstthread", "gt-6");
+  bindtextdomain ("tstthread", ".");
   result = 0;
 
   flipflop = 1;
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-7 gettext-0.18.1.1/gettext-tools/tests/gettext-7
--- gettext-0.19.3/gettext-tools/tests/gettext-7	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() in multithreaded applications works
 # correctly if different threads operate in different locales referring to
 # the same catalog file but with different encodings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # This test works only on glibc and MacOS X systems.
 : ${host_os=unknown}
 : ${GLIBC2=no}
@@ -20,7 +22,7 @@
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
 # de_DE.UTF-8 locale installed.
-missing_locale=`../gettext-7-prg 1`
+missing_locale=`./gettext-7-prg 1`
 if test -n "$missing_locale"; then
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale ${missing_locale} not installed"
@@ -30,23 +32,26 @@
   exit 77
 fi
 
-test -d gt-7 || mkdir gt-7
-test -d gt-7/de_DE || mkdir gt-7/de_DE
-test -d gt-7/de_DE/LC_MESSAGES || mkdir gt-7/de_DE/LC_MESSAGES
+tmpfiles="$tmpfiles de_DE"
+test -d de_DE || mkdir de_DE
+test -d de_DE/LC_MESSAGES || mkdir de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-7.po
+${MSGFMT} -o de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-7.po
 
-../gettext-7-prg > gt-7.out
+tmpfiles="$tmpfiles gt-7.out"
+./gettext-7-prg > gt-7.out
 case $? in
   0) ;;
   77)
     echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system"
-    exit 77
+    rm -fr $tmpfiles; exit 77
     ;;
   *)
     exit 1
     ;;
 esac
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-7-prg.c gettext-0.18.1.1/gettext-tools/tests/gettext-7-prg.c
--- gettext-0.19.3/gettext-tools/tests/gettext-7-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-7-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-7 test.
-   Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if USE_POSIX_THREADS && ((__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __APPLE__ && defined __MACH__)) && HAVE_USELOCALE
+#if USE_POSIX_THREADS && (__GLIBC__ >= 2 || (defined __APPLE__ && defined __MACH__)) && HAVE_USELOCALE
 
 #include <pthread.h>
 
@@ -179,7 +179,7 @@
   unsetenv ("LANGUAGE");
   unsetenv ("OUTPUT_CHARSET");
   textdomain ("tstthread");
-  bindtextdomain ("tstthread", "gt-7");
+  bindtextdomain ("tstthread", ".");
   result = 0;
 
   flipflop = 1;
diff -Nru gettext-0.19.3/gettext-tools/tests/gettext-8 gettext-0.18.1.1/gettext-tools/tests/gettext-8
--- gettext-0.19.3/gettext-tools/tests/gettext-8	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettext-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,6 +1,5 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that gettext() does not crash by stack overflow when msgid is very long.
 
-../gettext-8-prg
+./gettext-8-prg
diff -Nru gettext-0.19.3/gettext-tools/tests/gettextpo-1 gettext-0.18.1.1/gettext-tools/tests/gettextpo-1
--- gettext-0.19.3/gettext-tools/tests/gettextpo-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettextpo-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test the libgettextpo library.
-../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
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/gettextpo-1.de.po gettext-0.18.1.1/gettext-tools/tests/gettextpo-1.de.po
--- gettext-0.19.3/gettext-tools/tests/gettextpo-1.de.po	2013-04-15 06:45:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettextpo-1.de.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# Test case for the libgettextpo library.
-msgid ""
-msgstr ""
-"Project-Id-Version: libgettextpo 0.18.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2010-06-04 01:57+0200\n"
-"PO-Revision-Date: 2010-06-05 14:39+0200\n"
-"Last-Translator: Bruno Haible <bruno@clisp.org>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnulib-lib/w32spawn.h:81
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "Subprozeß %s"
-
-# Adjektiv, kein ganzer Satz!
-#. Denote a lock's state
-msgctxt "Lock state"
-msgid "Open"
-msgstr "Geöffnet"
-
-# Französische Weine sind die besten der Welt.
-#, java-format
-msgid "a bottle of wine"
-msgid_plural "{0,number} bottles of wine"
-msgstr[0] "eine Flasche Wein"
-msgstr[1] "{0,number} Weinflaschen"
-
-#. Denote a lock's state
-#~ msgctxt "Lock state"
-#~ msgid "Closed"
-#~ msgstr "Geschlossen"
diff -Nru gettext-0.19.3/gettext-tools/tests/gettextpo-1-prg.c gettext-0.18.1.1/gettext-tools/tests/gettextpo-1-prg.c
--- gettext-0.19.3/gettext-tools/tests/gettextpo-1-prg.c	2013-07-25 08:13:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/gettextpo-1-prg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1027 +0,0 @@
-/* Test of public API for GNU gettext PO files.
-   Copyright (C) 2010 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2010.
-
-   This 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 "gettext-po.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef fflush
-#undef fprintf
-#undef printf
-#undef strdup
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n",                      \
-                   __FILE__, __LINE__);                                      \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
-static char *
-xstrdup (const char *s)
-{
-  char *result = strdup (s);
-  if (result == NULL)
-    {
-      fprintf (stderr, "memory exhausted\n");
-      fflush (stderr);
-      exit (1);
-    }
-  return result;
-}
-
-static int num_errors;
-
-static void
-my_xerror (int severity,
-           po_message_t message,
-           const char *filename, size_t lineno, size_t column,
-           int multiline_p, const char *message_text)
-{
-  printf ("xerror called:\n  %s\n", message_text);
-  if (severity == PO_SEVERITY_FATAL_ERROR)
-    abort ();
-  num_errors++;
-}
-
-  /* Signal a problem that refers to two messages.
-     Similar to two calls to xerror.
-     If possible, a "..." can be appended to MESSAGE_TEXT1 and prepended to
-     MESSAGE_TEXT2.  */
-static void
-my_xerror2 (int severity,
-            po_message_t message1,
-            const char *filename1, size_t lineno1, size_t column1,
-            int multiline_p1, const char *message_text1,
-            po_message_t message2,
-            const char *filename2, size_t lineno2, size_t column2,
-            int multiline_p2, const char *message_text2)
-{
-  printf ("xerror2 called:\n  %s\n  %s\n", message_text1, message_text2);
-  if (severity == PO_SEVERITY_FATAL_ERROR)
-    abort ();
-  num_errors++;
-}
-
-static const struct po_xerror_handler my_xerror_handler =
-  {
-    my_xerror,
-    my_xerror2
-  };
-
-int
-main (int argc, char *argv[])
-{
-  const char *input_filename;
-
-  ASSERT (argc == 2);
-  input_filename = argv[1];
-
-  /* Test LIBGETTEXTPO_VERSION.  */
-  {
-    enum { version = LIBGETTEXTPO_VERSION };
-  }
-
-  /* Test libgettextpo_version.  */
-  ASSERT (libgettextpo_version == LIBGETTEXTPO_VERSION);
-
-  /* Test po_file_read.  */
-  {
-    po_file_t file = po_file_read ("/nonexist/ent", &my_xerror_handler);
-    ASSERT (file == NULL);
-  }
-
-  {
-    po_file_t file = po_file_read (input_filename, &my_xerror_handler);
-    ASSERT (file != NULL);
-
-    /* Test po_file_domains.  */
-    {
-      const char * const * domains = po_file_domains (file);
-      ASSERT (domains[0] != NULL);
-      ASSERT (strcmp (domains[0], "messages") == 0);
-      ASSERT (domains[1] == NULL);
-    }
-
-    /* Test po_file_write.  */
-    ASSERT (po_file_write (file, "gtpo-1-copied.po", &my_xerror_handler)
-            == file);
-
-    /* Test po_file_domain_header.  */
-    {
-      static const char expected[] =
-        "Project-Id-Version: libgettextpo 0.18.1\n"
-        "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-        "POT-Creation-Date: 2010-06-04 01:57+0200\n"
-        "PO-Revision-Date: 2010-06-05 14:39+0200\n"
-        "Last-Translator: Bruno Haible <bruno@clisp.org>\n"
-        "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-        "Language: de\n"
-        "MIME-Version: 1.0\n"
-        "Content-Type: text/plain; charset=UTF-8\n"
-        "Content-Transfer-Encoding: 8bit\n"
-        "Plural-Forms: nplurals=2; plural=(n != 1);\n";
-      const char *header;
-
-      header = po_file_domain_header (file, NULL);
-      ASSERT (header != NULL);
-      ASSERT (strcmp (header, expected) == 0);
-
-      header = po_file_domain_header (file, "messages");
-      ASSERT (header != NULL);
-      ASSERT (strcmp (header, expected) == 0);
-
-      header = po_file_domain_header (file, "anything");
-      ASSERT (header == NULL);
-
-      /* Test po_header_field.  */
-      {
-        char *value;
-
-        header = po_file_domain_header (file, NULL);
-
-        value = po_header_field (header, "Report-Msgid-Bugs-To");
-        ASSERT (value != NULL);
-        ASSERT (strcmp (value, "bug-gnu-gettext@gnu.org") == 0);
-
-        value = po_header_field (header, "X-Generator");
-        ASSERT (value == NULL);
-      }
-
-      /* Test po_header_set_field.  */
-      {
-        char *augmented_header;
-        const char *augmented_expected;
-
-        header = po_file_domain_header (file, NULL);
-        augmented_header =
-          po_header_set_field (header, "Last-Translator",
-                               "Karl Eichwalder <ke@suse.de>");
-        augmented_expected =
-          "Project-Id-Version: libgettextpo 0.18.1\n"
-          "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-          "POT-Creation-Date: 2010-06-04 01:57+0200\n"
-          "PO-Revision-Date: 2010-06-05 14:39+0200\n"
-          "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-          "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-          "Language: de\n"
-          "MIME-Version: 1.0\n"
-          "Content-Type: text/plain; charset=UTF-8\n"
-          "Content-Transfer-Encoding: 8bit\n"
-          "Plural-Forms: nplurals=2; plural=(n != 1);\n";
-        ASSERT (strcmp (augmented_header, augmented_expected) == 0);
-        free (augmented_header);
-
-        /* Verify that there was no side effect.  */
-        ASSERT (strcmp (header, expected) == 0);
-        ASSERT (strcmp (po_file_domain_header (file, NULL), expected) == 0);
-
-        header = po_file_domain_header (file, NULL);
-        augmented_header =
-          po_header_set_field (header, "X-Generator", "KBabel 1.11.4");
-        augmented_expected =
-          "Project-Id-Version: libgettextpo 0.18.1\n"
-          "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-          "POT-Creation-Date: 2010-06-04 01:57+0200\n"
-          "PO-Revision-Date: 2010-06-05 14:39+0200\n"
-          "Last-Translator: Bruno Haible <bruno@clisp.org>\n"
-          "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-          "Language: de\n"
-          "MIME-Version: 1.0\n"
-          "Content-Type: text/plain; charset=UTF-8\n"
-          "Content-Transfer-Encoding: 8bit\n"
-          "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-          "X-Generator: KBabel 1.11.4\n";
-        ASSERT (strcmp (augmented_header, augmented_expected) == 0);
-        free (augmented_header);
-
-        /* Verify that there was no side effect.  */
-        ASSERT (strcmp (header, expected) == 0);
-        ASSERT (strcmp (po_file_domain_header (file, NULL), expected) == 0);
-      }
-    }
-
-    /* Test po_message_iterator.  */
-    {
-      po_message_iterator_t iter = po_message_iterator (file, NULL);
-      int min;
-      int max;
-
-      /* Test po_next_message and the po_message_* accessors.  */
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (po_message_msgctxt (msg) == NULL);
-        ASSERT (strcmp (po_message_msgid (msg), "") == 0);
-        ASSERT (po_message_msgid_plural (msg) == NULL);
-        ASSERT (strcmp (po_message_msgstr (msg),
-                        po_file_domain_header (file, NULL)) == 0);
-        ASSERT (po_message_msgstr_plural (msg, 0) == NULL);
-        ASSERT (strcmp (po_message_comments (msg),
-                        "Test case for the libgettextpo library.\n") == 0);
-        ASSERT (strcmp (po_message_extracted_comments (msg), "") == 0);
-        ASSERT (po_message_filepos (msg, 0) == NULL);
-        ASSERT (po_message_prev_msgctxt (msg) == NULL);
-        ASSERT (po_message_prev_msgid (msg) == NULL);
-        ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-        ASSERT (!po_message_is_obsolete (msg));
-        ASSERT (!po_message_is_fuzzy (msg));
-        ASSERT (!po_message_is_format (msg, "c-format"));
-        ASSERT (!po_message_is_format (msg, "java-format"));
-        ASSERT (!po_message_is_range (msg, &min, &max));
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (po_message_msgctxt (msg) == NULL);
-        ASSERT (strcmp (po_message_msgid (msg),
-                        "cannot restore fd %d: dup2 failed") == 0);
-        ASSERT (po_message_msgid_plural (msg) == NULL);
-        ASSERT (strcmp (po_message_msgstr (msg),
-                        "Ausgabedatei \302\273%s\302\253 kann nicht erstellt werden")
-                == 0);
-        ASSERT (po_message_msgstr_plural (msg, 0) == NULL);
-        ASSERT (strcmp (po_message_comments (msg), "") == 0);
-        ASSERT (strcmp (po_message_extracted_comments (msg), "") == 0);
-        {
-          po_filepos_t pos = po_message_filepos (msg, 0);
-          ASSERT (pos != NULL);
-          ASSERT (strcmp (po_filepos_file (pos), "gnulib-lib/w32spawn.h") == 0);
-          ASSERT (po_filepos_start_line (pos) == 81);
-        }
-        ASSERT (po_message_filepos (msg, 1) == NULL);
-        ASSERT (po_message_prev_msgctxt (msg) == NULL);
-        ASSERT (po_message_prev_msgid (msg) == NULL);
-        ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-        ASSERT (!po_message_is_obsolete (msg));
-        ASSERT (po_message_is_fuzzy (msg));
-        ASSERT (po_message_is_format (msg, "c-format"));
-        ASSERT (!po_message_is_format (msg, "java-format"));
-        ASSERT (!po_message_is_range (msg, &min, &max));
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (po_message_msgctxt (msg) == NULL);
-        ASSERT (strcmp (po_message_msgid (msg), "%s subprocess") == 0);
-        ASSERT (po_message_msgid_plural (msg) == NULL);
-        ASSERT (strcmp (po_message_msgstr (msg), "Subproze\303\237 %s") == 0);
-        ASSERT (po_message_msgstr_plural (msg, 0) == NULL);
-        ASSERT (strcmp (po_message_comments (msg), "") == 0);
-        ASSERT (strcmp (po_message_extracted_comments (msg), "") == 0);
-        {
-          po_filepos_t pos = po_message_filepos (msg, 0);
-          ASSERT (pos != NULL);
-          ASSERT (strcmp (po_filepos_file (pos), "gnulib-lib/wait-process.c")
-                  == 0);
-          ASSERT (po_filepos_start_line (pos) == 223);
-        }
-        {
-          po_filepos_t pos = po_message_filepos (msg, 1);
-          ASSERT (pos != NULL);
-          ASSERT (strcmp (po_filepos_file (pos), "gnulib-lib/wait-process.c")
-                  == 0);
-          ASSERT (po_filepos_start_line (pos) == 255);
-        }
-        {
-          po_filepos_t pos = po_message_filepos (msg, 2);
-          ASSERT (pos != NULL);
-          ASSERT (strcmp (po_filepos_file (pos), "gnulib-lib/wait-process.c")
-                  == 0);
-          ASSERT (po_filepos_start_line (pos) == 317);
-        }
-        ASSERT (po_message_filepos (msg, 3) == NULL);
-        ASSERT (po_message_prev_msgctxt (msg) == NULL);
-        ASSERT (po_message_prev_msgid (msg) == NULL);
-        ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-        ASSERT (!po_message_is_obsolete (msg));
-        ASSERT (!po_message_is_fuzzy (msg));
-        ASSERT (po_message_is_format (msg, "c-format"));
-        ASSERT (!po_message_is_format (msg, "java-format"));
-        ASSERT (!po_message_is_range (msg, &min, &max));
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (strcmp (po_message_msgctxt (msg), "Lock state") == 0);
-        ASSERT (strcmp (po_message_msgid (msg), "Open") == 0);
-        ASSERT (po_message_msgid_plural (msg) == NULL);
-        ASSERT (strcmp (po_message_msgstr (msg), "Ge\303\266ffnet") == 0);
-        ASSERT (po_message_msgstr_plural (msg, 0) == NULL);
-        ASSERT (strcmp (po_message_comments (msg),
-                        "Adjektiv, kein ganzer Satz!\n") == 0);
-        ASSERT (strcmp (po_message_extracted_comments (msg),
-                        "Denote a lock's state\n") == 0);
-        ASSERT (po_message_filepos (msg, 0) == NULL);
-        ASSERT (po_message_prev_msgctxt (msg) == NULL);
-        ASSERT (po_message_prev_msgid (msg) == NULL);
-        ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-        ASSERT (!po_message_is_obsolete (msg));
-        ASSERT (!po_message_is_fuzzy (msg));
-        ASSERT (!po_message_is_format (msg, "c-format"));
-        ASSERT (!po_message_is_format (msg, "java-format"));
-        ASSERT (!po_message_is_range (msg, &min, &max));
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (po_message_msgctxt (msg) == NULL);
-        ASSERT (strcmp (po_message_msgid (msg), "a bottle of wine") == 0);
-        ASSERT (strcmp (po_message_msgid_plural (msg),
-                        "{0,number} bottles of wine") == 0);
-        ASSERT (strcmp (po_message_msgstr (msg), "eine Flasche Wein") == 0);
-        ASSERT (strcmp (po_message_msgstr_plural (msg, 0),
-                        "eine Flasche Wein") == 0);
-        ASSERT (strcmp (po_message_msgstr_plural (msg, 1),
-                        "{0,number} Weinflaschen") == 0);
-        ASSERT (po_message_msgstr_plural (msg, 2) == NULL);
-        ASSERT (po_message_msgstr_plural (msg, 100000000) == NULL);
-        ASSERT (po_message_msgstr_plural (msg, -1) == NULL);
-        ASSERT (strcmp (po_message_comments (msg),
-                        "Franz\303\266sische Weine sind die besten der Welt.\n")
-                == 0);
-        ASSERT (strcmp (po_message_extracted_comments (msg), "") == 0);
-        ASSERT (po_message_filepos (msg, 0) == NULL);
-        ASSERT (po_message_prev_msgctxt (msg) == NULL);
-        ASSERT (po_message_prev_msgid (msg) == NULL);
-        ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-        ASSERT (!po_message_is_obsolete (msg));
-        ASSERT (!po_message_is_fuzzy (msg));
-        ASSERT (!po_message_is_format (msg, "c-format"));
-        ASSERT (po_message_is_format (msg, "java-format"));
-        ASSERT (!po_message_is_range (msg, &min, &max));
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (strcmp (po_message_msgctxt (msg), "Lock state") == 0);
-        ASSERT (strcmp (po_message_msgid (msg), "Closed") == 0);
-        ASSERT (po_message_msgid_plural (msg) == NULL);
-        ASSERT (strcmp (po_message_msgstr (msg), "Geschlossen") == 0);
-        ASSERT (po_message_msgstr_plural (msg, 0) == NULL);
-        ASSERT (strcmp (po_message_comments (msg), "") == 0);
-        ASSERT (strcmp (po_message_extracted_comments (msg),
-                        "Denote a lock's state\n") == 0);
-        ASSERT (po_message_filepos (msg, 0) == NULL);
-        ASSERT (po_message_prev_msgctxt (msg) == NULL);
-        ASSERT (po_message_prev_msgid (msg) == NULL);
-        ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-        ASSERT (po_message_is_obsolete (msg));
-        ASSERT (!po_message_is_fuzzy (msg));
-        ASSERT (!po_message_is_format (msg, "c-format"));
-        ASSERT (!po_message_is_format (msg, "java-format"));
-        ASSERT (!po_message_is_range (msg, &min, &max));
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg == NULL);
-      }
-
-      /* Test po_message_iterator_free.  */
-      po_message_iterator_free (iter);
-    }
-
-    /* Test po_file_check_all.  */
-    num_errors = 0;
-    po_file_check_all (file, &my_xerror_handler);
-    ASSERT (num_errors == 0);
-
-    /* Test po_file_free.  */
-    po_file_free (file);
-  }
-
-  /* Test po_file_create.  */
-  {
-    po_file_t file = po_file_create ();
-
-    {
-      po_message_iterator_t iter = po_message_iterator (file, NULL);
-
-      /* Test po_message_insert, po_message_create, and the po_message_set_*
-         setters.  Check that the string arguments are copied.  */
-      {
-        po_message_t msg = po_message_create ();
-        {
-          char *arg = xstrdup ("");
-          po_message_set_msgid (msg, arg);
-          free (arg);
-        }
-        {
-          static const char header[] =
-            "Project-Id-Version: libgettextpo 0.18.1\n"
-            "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-            "POT-Creation-Date: 2010-06-04 01:57+0200\n"
-            "PO-Revision-Date: 2010-06-05 14:39+0200\n"
-            "Last-Translator: Bruno Haible <bruno@clisp.org>\n"
-            "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-            "Language: de\n"
-            "MIME-Version: 1.0\n"
-            "Content-Type: text/plain; charset=UTF-8\n"
-            "Content-Transfer-Encoding: 8bit\n"
-            "Plural-Forms: nplurals=2; plural=(n != 1);\n";
-          char *arg = xstrdup (header);
-          po_message_set_msgstr (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Test case for the libgettextpo library.\n");
-          po_message_set_comments (msg, arg);
-          free (arg);
-        }
-        po_message_insert (iter, msg);
-      }
-      {
-        po_message_t msg = po_message_create ();
-        {
-          char *arg = xstrdup ("cannot restore fd %d: dup2 failed");
-          po_message_set_msgid (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg =
-            xstrdup ("Ausgabedatei \302\273%s\302\253 kann nicht erstellt werden");
-          po_message_set_msgstr (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("gnulib-lib/w32spawn.h");
-          po_message_add_filepos (msg, arg, 81);
-          free (arg);
-        }
-        po_message_set_fuzzy (msg, 1);
-        po_message_set_format (msg, "c-format", 1);
-        po_message_insert (iter, msg);
-      }
-      {
-        po_message_t msg = po_message_create ();
-        {
-          char *arg = xstrdup ("%s subprocess");
-          po_message_set_msgid (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Subproze\303\237 %s");
-          po_message_set_msgstr (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("gnulib-lib/wait-process.c");
-          po_message_add_filepos (msg, arg, 223);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("gnulib-lib/wait-process.c");
-          po_message_add_filepos (msg, arg, 255);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("gnulib-lib/wait-process.c");
-          po_message_add_filepos (msg, arg, 317);
-          free (arg);
-        }
-        po_message_set_format (msg, "c-format", 1);
-        po_message_insert (iter, msg);
-      }
-      {
-        po_message_t msg = po_message_create ();
-        {
-          char *arg = xstrdup ("Lock state");
-          po_message_set_msgctxt (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Open");
-          po_message_set_msgid (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Ge\303\266ffnet");
-          po_message_set_msgstr (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Adjektiv, kein ganzer Satz!\n");
-          po_message_set_comments (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Denote a lock's state\n");
-          po_message_set_extracted_comments (msg, arg);
-          free (arg);
-        }
-        po_message_insert (iter, msg);
-      }
-      {
-        po_message_t msg = po_message_create ();
-        {
-          char *arg = xstrdup ("a bottle of wine");
-          po_message_set_msgid (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("{0,number} bottles of wine");
-          po_message_set_msgid_plural (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("eine Flasche Wein");
-          po_message_set_msgstr_plural (msg, 0, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("{0,number} Weinflaschen");
-          po_message_set_msgstr_plural (msg, 1, arg);
-          free (arg);
-        }
-        {
-          char *arg =
-            xstrdup ("Franz\303\266sische Weine sind die besten der Welt.\n");
-          po_message_set_comments (msg, arg);
-          free (arg);
-        }
-        po_message_set_format (msg, "java-format", 1);
-        po_message_insert (iter, msg);
-      }
-      {
-        po_message_t msg = po_message_create ();
-        {
-          char *arg = xstrdup ("Lock state");
-          po_message_set_msgctxt (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Closed");
-          po_message_set_msgid (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Geschlossen");
-          po_message_set_msgstr (msg, arg);
-          free (arg);
-        }
-        {
-          char *arg = xstrdup ("Denote a lock's state\n");
-          po_message_set_extracted_comments (msg, arg);
-          free (arg);
-        }
-        po_message_set_obsolete (msg, 1);
-        po_message_insert (iter, msg);
-      }
-
-      po_message_iterator_free (iter);
-    }
-
-    /* Test po_file_write.  */
-    ASSERT (po_file_write (file, "gtpo-1-created.po", &my_xerror_handler)
-            == file);
-  }
-
-  /* Test po_next_message after po_message_insert.  */
-  {
-    po_file_t file = po_file_create ();
-    {
-      po_message_iterator_t iter = po_message_iterator (file, NULL);
-      {
-        po_message_t msg = po_message_create ();
-        po_message_set_msgid (msg, "");
-        po_message_insert (iter, msg);
-      }
-      {
-        po_message_t msg = po_message_create ();
-        po_message_set_msgid (msg, "Closed");
-        po_message_insert (iter, msg);
-      }
-      po_message_iterator_free (iter);
-    }
-    {
-      po_message_iterator_t iter = po_message_iterator (file, NULL);
-      po_next_message (iter);
-      {
-        po_message_t msg = po_message_create ();
-        po_message_set_msgid (msg, "Open");
-        po_message_insert (iter, msg);
-      }
-      po_message_iterator_free (iter);
-    }
-    {
-      po_message_iterator_t iter = po_message_iterator (file, NULL);
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (strcmp (po_message_msgid (msg), "") == 0);
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (strcmp (po_message_msgid (msg), "Open") == 0);
-      }
-      {
-        po_message_t msg = po_next_message (iter);
-        ASSERT (msg != NULL);
-        ASSERT (strcmp (po_message_msgid (msg), "Closed") == 0);
-      }
-      ASSERT (po_next_message (iter) == NULL);
-      po_message_iterator_free (iter);
-    }
-    po_file_free (file);
-  }
-
-  /* Test po_message_set_msgctxt.  */
-  {
-    po_message_t msg = po_message_create ();
-    po_message_set_msgctxt (msg, "Menu");
-    ASSERT (strcmp (po_message_msgctxt (msg), "Menu") == 0);
-    po_message_set_msgctxt (msg, "Demo");
-    ASSERT (strcmp (po_message_msgctxt (msg), "Demo") == 0);
-    po_message_set_msgctxt (msg, NULL);
-    ASSERT (po_message_msgctxt (msg) == NULL);
-  }
-
-  /* Test po_message_set_msgid.  */
-  {
-    po_message_t msg = po_message_create ();
-    po_message_set_msgid (msg, "operation failed");
-    ASSERT (strcmp (po_message_msgid (msg), "operation failed") == 0);
-    po_message_set_msgid (msg, "operation succeeded");
-    ASSERT (strcmp (po_message_msgid (msg), "operation succeeded") == 0);
-  }
-
-  /* Test po_message_set_msgid_plural.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (po_message_msgid_plural (msg) == NULL);
-    po_message_set_msgid (msg, "an error");
-    ASSERT (strcmp (po_message_msgid (msg), "an error") == 0);
-    ASSERT (po_message_msgid_plural (msg) == NULL);
-    po_message_set_msgid_plural (msg, "%u errors");
-    ASSERT (strcmp (po_message_msgid (msg), "an error") == 0);
-    ASSERT (strcmp (po_message_msgid_plural (msg), "%u errors") == 0);
-    po_message_set_msgid_plural (msg, NULL);
-    ASSERT (strcmp (po_message_msgid (msg), "an error") == 0);
-    ASSERT (po_message_msgid_plural (msg) == NULL);
-  }
-
-  /* Test po_message_set_msgstr.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (strcmp (po_message_msgstr (msg), "") == 0);
-    po_message_set_msgid (msg, "an error");
-    ASSERT (strcmp (po_message_msgstr (msg), "") == 0);
-    po_message_set_msgstr (msg, "une erreur");
-    ASSERT (strcmp (po_message_msgstr (msg), "une erreur") == 0);
-    po_message_set_msgstr (msg, "catastrophe");
-    ASSERT (strcmp (po_message_msgstr (msg), "catastrophe") == 0);
-  }
-
-  /* Test po_message_set_msgstr_plural.  */
-  {
-    po_message_t msg = po_message_create ();
-    po_message_set_msgid (msg, "an error");
-    po_message_set_msgid_plural (msg, "%u errors");
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 0), "") == 0);
-    ASSERT (po_message_msgstr_plural (msg, 1) == NULL);
-    po_message_set_msgstr_plural (msg, 1, "%u erreurs");
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 0), "") == 0);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 1), "%u erreurs") == 0);
-    ASSERT (po_message_msgstr_plural (msg, 2) == NULL);
-    po_message_set_msgstr_plural (msg, 0, "une erreur");
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 0), "une erreur") == 0);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 1), "%u erreurs") == 0);
-    ASSERT (po_message_msgstr_plural (msg, 2) == NULL);
-    po_message_set_msgstr_plural (msg, 1, "des erreurs");
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 0), "une erreur") == 0);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 1), "des erreurs") == 0);
-    ASSERT (po_message_msgstr_plural (msg, 2) == NULL);
-    po_message_set_msgstr_plural (msg, 2, "beaucoup d'erreurs");
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 0), "une erreur") == 0);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 1), "des erreurs") == 0);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 2), "beaucoup d'erreurs")
-            == 0);
-    ASSERT (po_message_msgstr_plural (msg, 3) == NULL);
-    po_message_set_msgstr_plural (msg, 2, NULL);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 0), "une erreur") == 0);
-    ASSERT (strcmp (po_message_msgstr_plural (msg, 1), "des erreurs") == 0);
-    ASSERT (po_message_msgstr_plural (msg, 2) == NULL);
-    ASSERT (po_message_msgstr_plural (msg, 3) == NULL);
-  }
-
-  /* Test po_message_set_comments.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (strcmp (po_message_comments (msg), "") == 0);
-    po_message_set_comments (msg, "Not clear.");
-    ASSERT (strcmp (po_message_comments (msg), "Not clear.\n") == 0);
-    po_message_set_comments (msg, "To be reviewed.\n");
-    ASSERT (strcmp (po_message_comments (msg), "To be reviewed.\n") == 0);
-  }
-
-  /* Test po_message_set_extracted_comments.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (strcmp (po_message_extracted_comments (msg), "") == 0);
-    po_message_set_extracted_comments (msg, "Translate carefully.");
-    ASSERT (strcmp (po_message_extracted_comments (msg),
-                    "Translate carefully.\n") == 0);
-    po_message_set_extracted_comments (msg, "Translate very\ncarefully!\n");
-    ASSERT (strcmp (po_message_extracted_comments (msg),
-                    "Translate very\ncarefully!\n") == 0);
-  }
-
-  /* Test po_message_add_filepos, po_message_remove_filepos.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (po_message_filepos (msg, 0) == NULL);
-    po_message_remove_filepos (msg, 2);
-    ASSERT (po_message_filepos (msg, 0) == NULL);
-    {
-      char *arg = xstrdup ("hello.c");
-      po_message_add_filepos (msg, arg, 81);
-      free (arg);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 0);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 81);
-    }
-    ASSERT (po_message_filepos (msg, 1) == NULL);
-    /* Adding the same filepos once again has no effect.  */
-    {
-      char *arg = xstrdup ("hello.c");
-      po_message_add_filepos (msg, arg, 81);
-      free (arg);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 0);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 81);
-    }
-    ASSERT (po_message_filepos (msg, 1) == NULL);
-    {
-      char *arg = xstrdup ("hello.c");
-      po_message_add_filepos (msg, arg, 1024);
-      free (arg);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 0);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 81);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 1);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 1024);
-    }
-    ASSERT (po_message_filepos (msg, 2) == NULL);
-    {
-      char *arg = xstrdup ("../src/bar.c");
-      po_message_add_filepos (msg, arg, 17);
-      free (arg);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 0);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 81);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 1);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 1024);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 2);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "../src/bar.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 17);
-    }
-    ASSERT (po_message_filepos (msg, 3) == NULL);
-    po_message_remove_filepos (msg, 1);
-    {
-      po_filepos_t pos = po_message_filepos (msg, 0);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "hello.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 81);
-    }
-    {
-      po_filepos_t pos = po_message_filepos (msg, 1);
-      ASSERT (pos != NULL);
-      ASSERT (strcmp (po_filepos_file (pos), "../src/bar.c") == 0);
-      ASSERT (po_filepos_start_line (pos) == 17);
-    }
-    ASSERT (po_message_filepos (msg, 2) == NULL);
-    ASSERT (po_message_filepos (msg, 3) == NULL);
-  }
-
-  /* Test po_message_set_prev_msgctxt.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (po_message_prev_msgctxt (msg) == NULL);
-    po_message_set_prev_msgctxt (msg, "Menu");
-    ASSERT (strcmp (po_message_prev_msgctxt (msg), "Menu") == 0);
-    po_message_set_prev_msgctxt (msg, "Demo");
-    ASSERT (strcmp (po_message_prev_msgctxt (msg), "Demo") == 0);
-    po_message_set_prev_msgctxt (msg, NULL);
-    ASSERT (po_message_prev_msgctxt (msg) == NULL);
-  }
-
-  /* Test po_message_set_prev_msgid.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (po_message_prev_msgid (msg) == NULL);
-    po_message_set_prev_msgid (msg, "operation failed");
-    ASSERT (strcmp (po_message_prev_msgid (msg), "operation failed") == 0);
-    po_message_set_prev_msgid (msg, "operation succeeded");
-    ASSERT (strcmp (po_message_prev_msgid (msg), "operation succeeded") == 0);
-  }
-
-  /* Test po_message_set_prev_msgid_plural.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-    po_message_set_prev_msgid (msg, "an error");
-    ASSERT (strcmp (po_message_prev_msgid (msg), "an error") == 0);
-    ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-    po_message_set_prev_msgid_plural (msg, "%u errors");
-    ASSERT (strcmp (po_message_prev_msgid (msg), "an error") == 0);
-    ASSERT (strcmp (po_message_prev_msgid_plural (msg), "%u errors") == 0);
-    po_message_set_prev_msgid_plural (msg, NULL);
-    ASSERT (strcmp (po_message_prev_msgid (msg), "an error") == 0);
-    ASSERT (po_message_prev_msgid_plural (msg) == NULL);
-  }
-
-  /* Test po_message_set_obsolete.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (!po_message_is_obsolete (msg));
-    po_message_set_obsolete (msg, 1);
-    ASSERT (po_message_is_obsolete (msg));
-    po_message_set_obsolete (msg, 1);
-    ASSERT (po_message_is_obsolete (msg));
-    po_message_set_obsolete (msg, 0);
-    ASSERT (!po_message_is_obsolete (msg));
-  }
-
-  /* Test po_message_set_fuzzy.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (!po_message_is_fuzzy (msg));
-    po_message_set_fuzzy (msg, 1);
-    ASSERT (po_message_is_fuzzy (msg));
-    po_message_set_fuzzy (msg, 1);
-    ASSERT (po_message_is_fuzzy (msg));
-    po_message_set_fuzzy (msg, 0);
-    ASSERT (!po_message_is_fuzzy (msg));
-  }
-
-  /* Test po_message_set_format.  */
-  {
-    po_message_t msg = po_message_create ();
-    ASSERT (!po_message_is_format (msg, "c-format"));
-    ASSERT (!po_message_is_format (msg, "java-format"));
-    ASSERT (!po_message_is_format (msg, "xyzzy-format"));
-    po_message_set_format (msg, "c-format", 1);
-    ASSERT (po_message_is_format (msg, "c-format"));
-    ASSERT (!po_message_is_format (msg, "java-format"));
-    ASSERT (!po_message_is_format (msg, "xyzzy-format"));
-    po_message_set_format (msg, "c-format", 1);
-    ASSERT (po_message_is_format (msg, "c-format"));
-    ASSERT (!po_message_is_format (msg, "java-format"));
-    ASSERT (!po_message_is_format (msg, "xyzzy-format"));
-    po_message_set_format (msg, "java-format", 1);
-    ASSERT (po_message_is_format (msg, "c-format"));
-    ASSERT (po_message_is_format (msg, "java-format"));
-    ASSERT (!po_message_is_format (msg, "xyzzy-format"));
-    po_message_set_format (msg, "c-format", 0);
-    ASSERT (!po_message_is_format (msg, "c-format"));
-    ASSERT (po_message_is_format (msg, "java-format"));
-    ASSERT (!po_message_is_format (msg, "xyzzy-format"));
-    po_message_set_format (msg, "xyzzy-format", 1);
-    ASSERT (!po_message_is_format (msg, "c-format"));
-    ASSERT (po_message_is_format (msg, "java-format"));
-    ASSERT (!po_message_is_format (msg, "xyzzy-format"));
-  }
-
-  /* Test po_message_set_range.  */
-  {
-    po_message_t msg = po_message_create ();
-    int min;
-    int max;
-    ASSERT (!po_message_is_range (msg, &min, &max));
-    po_message_set_range (msg, 1, 100);
-    ASSERT (po_message_is_range (msg, &min, &max));
-    ASSERT (min == 1);
-    ASSERT (max == 100);
-    po_message_set_range (msg, 5, 1000);
-    ASSERT (po_message_is_range (msg, &min, &max));
-    ASSERT (min == 5);
-    ASSERT (max == 1000);
-    po_message_set_range (msg, -1, -1);
-    ASSERT (!po_message_is_range (msg, &min, &max));
-  }
-
-  /* Test po_message_check_all.  */
-  {
-    po_file_t file = po_file_create ();
-    po_message_iterator_t iter = po_message_iterator (file, NULL);
-    {
-      po_message_t msg = po_message_create ();
-      po_message_set_msgid (msg, "cannot write %s");
-      num_errors = 0;
-      po_message_check_all (msg, iter, &my_xerror_handler);
-      ASSERT (num_errors == 0);
-    }
-    {
-      po_message_t msg = po_message_create ();
-      po_message_set_msgid (msg, "an error");
-      po_message_set_msgid_plural (msg, "%u errors\n");
-      num_errors = 0;
-      po_message_check_all (msg, iter, &my_xerror_handler);
-      ASSERT (num_errors == 0);
-      po_message_set_msgstr (msg, "Fehler");
-      num_errors = 0;
-      po_message_check_all (msg, iter, &my_xerror_handler);
-      ASSERT (num_errors == 2);
-    }
-    {
-      po_message_t msg = po_message_create ();
-      po_message_set_msgid (msg, "");
-      po_message_set_msgstr (msg,
-        "Content-Type: text/plain; charset=CHARSET\n"
-        "Content-Transfer-Encoding: 8bit\n");
-      num_errors = 0;
-      po_message_check_all (msg, iter, &my_xerror_handler);
-      ASSERT (num_errors == 7);
-    }
-    {
-      po_message_t msg = po_message_create ();
-      po_message_set_msgid (msg, "encountered %d errors");
-      po_message_set_format (msg, "c-format", 1);
-      po_message_set_msgstr (msg, "rencontr\303\251 %ld erreurs");
-      num_errors = 0;
-      po_message_check_all (msg, iter, &my_xerror_handler);
-      ASSERT (num_errors == 1);
-    }
-    po_message_iterator_free (iter);
-    po_file_free (file);
-  }
-
-  /* Test po_message_check_format.  */
-  {
-    po_message_t msg = po_message_create ();
-    po_message_set_msgid (msg, "encountered %d errors");
-    po_message_set_format (msg, "c-format", 1);
-    po_message_set_msgstr (msg, "rencontr\303\251 %ld erreurs");
-    num_errors = 0;
-    po_message_check_format (msg, &my_xerror_handler);
-    ASSERT (num_errors == 1);
-  }
-
-  /* Test po_format_list.  */
-  {
-    const char * const *format_types = po_format_list ();
-
-    ASSERT (strcmp (format_types[0], "c-format") == 0);
-
-    while (*format_types != NULL)
-      format_types++;
-  }
-
-  /* Test po_format_pretty_name.  */
-  ASSERT (strcmp (po_format_pretty_name ("c-format"), "C") == 0);
-  ASSERT (strcmp (po_format_pretty_name ("csharp-format"), "C#") == 0);
-  ASSERT (po_format_pretty_name ("xyzzy-format") == NULL);
-
-  return 0;
-}
diff -Nru gettext-0.19.3/gettext-tools/tests/init.cfg gettext-0.18.1.1/gettext-tools/tests/init.cfg
--- gettext-0.19.3/gettext-tools/tests/init.cfg	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/init.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-test -f "./init-env" \
-  && . "./init-env"
-
-prepare_locale_ ()
-{
-  # Solaris 11 doesn't strip the CODESET part from the locale name,
-  # when looking for a message catalog.  Create a directory link with
-  # CODESET, to work around this.
-  if test "$1" != "$2" && test "$GLIBC2" = no; then
-    case "$host_os" in
-      solaris2.11)
-        cp -R "$1" "$2"
-        ;;
-    esac
-  fi
-}
diff -Nru gettext-0.19.3/gettext-tools/tests/init-env.in gettext-0.18.1.1/gettext-tools/tests/init-env.in
--- gettext-0.19.3/gettext-tools/tests/init-env.in	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/init-env.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# Variable needed by LTLIBINTL.
-top_builddir=../..
-
-OBJEXT="@OBJEXT@"
-EXEEXT="@EXEEXT@"
-CC="@CC@"
-CFLAGS="@CFLAGS@"
-CXX="@CXX@"
-CXXFLAGS="@CXXFLAGS@"
-CPPFLAGS="@CPPFLAGS@"
-LDFLAGS="@LDFLAGS@"
-LTLIBINTL="@LTLIBINTL@"
-JAVA_CHOICE="@JAVA_CHOICE@"
-BUILDJAVA="@BUILDJAVA@"
-TESTJAVA="@TESTJAVA@"
-CSHARP_CHOICE="@CSHARP_CHOICE@"
-BUILDCSHARP="@BUILDCSHARP@"
-TESTCSHARP="@TESTCSHARP@"
-TESTLIBASPRINTF="@TESTLIBASPRINTF@"
-GLIBC2="@GLIBC2@"
-LOCALE_FR="@LOCALE_FR@"
-LOCALE_FR_UTF8="@LOCALE_FR_UTF8@"
-LOCALE_JA="@LOCALE_JA@"
-host_os="@host_os@"
-
-: ${GETTEXT=tstgettext}
-: ${NGETTEXT=tstngettext}
-: ${XGETTEXT=xgettext}
-: ${MSGATTRIB=msgattrib}
-: ${MSGCAT=msgcat}
-: ${MSGCMP=msgcmp}
-: ${MSGCOMM=msgcomm}
-: ${MSGCONV=msgconv}
-: ${MSGEN=msgen}
-: ${MSGEXEC=msgexec}
-: ${MSGFILTER=msgfilter}
-: ${MSGFMT=msgfmt}
-: ${MSGGREP=msggrep}
-: ${MSGINIT=msginit}
-: ${MSGMERGE=msgmerge}
-: ${MSGUNFMT=msgunfmt}
-: ${MSGUNIQ=msguniq}
-: ${RECODE=recode}
diff -Nru gettext-0.19.3/gettext-tools/tests/init.sh gettext-0.18.1.1/gettext-tools/tests/init.sh
--- gettext-0.19.3/gettext-tools/tests/init.sh	2014-10-16 06:01:13.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/init.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,591 +0,0 @@
-# source this file; set up for tests
-
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-# This 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/>.
-
-# Using this file in a test
-# =========================
-#
-# The typical skeleton of a test looks like this:
-#
-#   #!/bin/sh
-#   . "${srcdir=.}/init.sh"; path_prepend_ .
-#   Execute some commands.
-#   Note that these commands are executed in a subdirectory, therefore you
-#   need to prepend "../" to relative filenames in the build directory.
-#   Note that the "path_prepend_ ." is useful only if the body of your
-#   test invokes programs residing in the initial directory.
-#   For example, if the programs you want to test are in src/, and this test
-#   script is named tests/test-1, then you would use "path_prepend_ ../src",
-#   or perhaps export PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH"
-#   to all tests via automake's TESTS_ENVIRONMENT.
-#   Set the exit code 0 for success, 77 for skipped, or 1 or other for failure.
-#   Use the skip_ and fail_ functions to print a diagnostic and then exit
-#   with the corresponding exit code.
-#   Exit $?
-
-# Executing a test that uses this file
-# ====================================
-#
-# Running a single test:
-#   $ make check TESTS=test-foo.sh
-#
-# Running a single test, with verbose output:
-#   $ make check TESTS=test-foo.sh VERBOSE=yes
-#
-# Running a single test, with single-stepping:
-#   1. Go into a sub-shell:
-#   $ bash
-#   2. Set relevant environment variables from TESTS_ENVIRONMENT in the
-#      Makefile:
-#   $ export srcdir=../../tests # this is an example
-#   3. Execute the commands from the test, copy&pasting them one by one:
-#   $ . "$srcdir/init.sh"; path_prepend_ .
-#   ...
-#   4. Finally
-#   $ exit
-
-ME_=`expr "./$0" : '.*/\(.*\)$'`
-
-# We use a trap below for cleanup.  This requires us to go through
-# hoops to get the right exit status transported through the handler.
-# So use 'Exit STATUS' instead of 'exit STATUS' inside of the tests.
-# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
-# sh inside this function.
-Exit () { set +e; (exit $1); exit $1; }
-
-# Print warnings (e.g., about skipped and failed tests) to this file number.
-# Override by defining to say, 9, in init.cfg, and putting say,
-#   export ...ENVVAR_SETTINGS...; $(SHELL) 9>&2
-# in the definition of TESTS_ENVIRONMENT in your tests/Makefile.am file.
-# This is useful when using automake's parallel tests mode, to print
-# the reason for skip/failure to console, rather than to the .log files.
-: ${stderr_fileno_=2}
-
-# Note that correct expansion of "$*" depends on IFS starting with ' '.
-# Always write the full diagnostic to stderr.
-# When stderr_fileno_ is not 2, also emit the first line of the
-# diagnostic to that file descriptor.
-warn_ ()
-{
-  # If IFS does not start with ' ', set it and emit the warning in a subshell.
-  case $IFS in
-    ' '*) printf '%s\n' "$*" >&2
-          test $stderr_fileno_ = 2 \
-            || { printf '%s\n' "$*" | sed 1q >&$stderr_fileno_ ; } ;;
-    *) (IFS=' '; warn_ "$@");;
-  esac
-}
-fail_ () { warn_ "$ME_: failed test: $@"; Exit 1; }
-skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; }
-fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; }
-framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; }
-
-# Sanitize this shell to POSIX mode, if possible.
-DUALCASE=1; export DUALCASE
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-    *posix*) set -o posix ;;
-  esac
-fi
-
-# We require $(...) support unconditionally.
-# We require a few additional shell features only when $EXEEXT is nonempty,
-# in order to support automatic $EXEEXT emulation:
-# - hyphen-containing alias names
-# - we prefer to use ${var#...} substitution, rather than having
-#   to work around lack of support for that feature.
-# The following code attempts to find a shell with support for these features.
-# If the current shell passes the test, we're done.  Otherwise, test other
-# shells until we find one that passes.  If one is found, re-exec it.
-# If no acceptable shell is found, skip the current test.
-#
-# The "...set -x; P=1 true 2>err..." test is to disqualify any shell that
-# emits "P=1" into err, as /bin/sh from SunOS 5.11 and OpenBSD 4.7 do.
-#
-# Use "9" to indicate success (rather than 0), in case some shell acts
-# like Solaris 10's /bin/sh but exits successfully instead of with status 2.
-
-# Eval this code in a subshell to determine a shell's suitability.
-# 10 - passes all tests; ok to use
-#  9 - ok, but enabling "set -x" corrupts app stderr; prefer higher score
-#  ? - not ok
-gl_shell_test_script_='
-test $(echo y) = y || exit 1
-score_=10
-if test "$VERBOSE" = yes; then
-  test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9
-fi
-test -z "$EXEEXT" && exit $score_
-shopt -s expand_aliases
-alias a-b="echo zoo"
-v=abx
-     test ${v%x} = ab \
-  && test ${v#a} = bx \
-  && test $(a-b) = zoo \
-  && exit $score_
-'
-
-if test "x$1" = "x--no-reexec"; then
-  shift
-else
-  # Assume a working shell.  Export to subshells (setup_ needs this).
-  gl_set_x_corrupts_stderr_=false
-  export gl_set_x_corrupts_stderr_
-
-  # Record the first marginally acceptable shell.
-  marginal_=
-
-  # Search for a shell that meets our requirements.
-  for re_shell_ in __current__ "${CONFIG_SHELL:-no_shell}" \
-      /bin/sh bash dash zsh pdksh fail
-  do
-    test "$re_shell_" = no_shell && continue
-
-    # If we've made it all the way to the sentinel, "fail" without
-    # finding even a marginal shell, skip this test.
-    if test "$re_shell_" = fail; then
-      test -z "$marginal_" && skip_ failed to find an adequate shell
-      re_shell_=$marginal_
-      break
-    fi
-
-    # When testing the current shell, simply "eval" the test code.
-    # Otherwise, run it via $re_shell_ -c ...
-    if test "$re_shell_" = __current__; then
-      # 'eval'ing this code makes Solaris 10's /bin/sh exit with
-      # $? set to 2.  It does not evaluate any of the code after the
-      # "unexpected" first '('.  Thus, we must run it in a subshell.
-      ( eval "$gl_shell_test_script_" ) > /dev/null 2>&1
-    else
-      "$re_shell_" -c "$gl_shell_test_script_" 2>/dev/null
-    fi
-
-    st_=$?
-
-    # $re_shell_ works just fine.  Use it.
-    if test $st_ = 10; then
-      gl_set_x_corrupts_stderr_=false
-      break
-    fi
-
-    # If this is our first marginally acceptable shell, remember it.
-    if test "$st_:$marginal_" = 9: ; then
-      marginal_="$re_shell_"
-      gl_set_x_corrupts_stderr_=true
-    fi
-  done
-
-  if test "$re_shell_" != __current__; then
-    # Found a usable shell.  Preserve -v and -x.
-    case $- in
-      *v*x* | *x*v*) opts_=-vx ;;
-      *v*) opts_=-v ;;
-      *x*) opts_=-x ;;
-      *) opts_= ;;
-    esac
-    re_shell=$re_shell_
-    export re_shell
-    exec "$re_shell_" $opts_ "$0" --no-reexec "$@"
-    echo "$ME_: exec failed" 1>&2
-    exit 127
-  fi
-fi
-
-# If this is bash, turn off all aliases.
-test -n "$BASH_VERSION" && unalias -a
-
-# Note that when supporting $EXEEXT (transparently mapping from PROG_NAME to
-# PROG_NAME.exe), we want to support hyphen-containing names like test-acos.
-# That is part of the shell-selection test above.  Why use aliases rather
-# than functions?  Because support for hyphen-containing aliases is more
-# widespread than that for hyphen-containing function names.
-test -n "$EXEEXT" && shopt -s expand_aliases
-
-# Enable glibc's malloc-perturbing option.
-# This is useful for exposing code that depends on the fact that
-# malloc-related functions often return memory that is mostly zeroed.
-# If you have the time and cycles, use valgrind to do an even better job.
-: ${MALLOC_PERTURB_=87}
-export MALLOC_PERTURB_
-
-# This is a stub function that is run upon trap (upon regular exit and
-# interrupt).  Override it with a per-test function, e.g., to unmount
-# a partition, or to undo any other global state changes.
-cleanup_ () { :; }
-
-# Emit a header similar to that from diff -u;  Print the simulated "diff"
-# command so that the order of arguments is clear.  Don't bother with @@ lines.
-emit_diff_u_header_ ()
-{
-  printf '%s\n' "diff -u $*" \
-    "--- $1	1970-01-01" \
-    "+++ $2	1970-01-01"
-}
-
-# Arrange not to let diff or cmp operate on /dev/null,
-# since on some systems (at least OSF/1 5.1), that doesn't work.
-# When there are not two arguments, or no argument is /dev/null, return 2.
-# When one argument is /dev/null and the other is not empty,
-# cat the nonempty file to stderr and return 1.
-# Otherwise, return 0.
-compare_dev_null_ ()
-{
-  test $# = 2 || return 2
-
-  if test "x$1" = x/dev/null; then
-    test -s "$2" || return 0
-    emit_diff_u_header_ "$@"; sed 's/^/+/' "$2"
-    return 1
-  fi
-
-  if test "x$2" = x/dev/null; then
-    test -s "$1" || return 0
-    emit_diff_u_header_ "$@"; sed 's/^/-/' "$1"
-    return 1
-  fi
-
-  return 2
-}
-
-if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
-   && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then
-  # diff accepts the -u option and does not (like AIX 7 'diff') produce an
-  # extra space on column 1 of every content line.
-  if test -z "$diff_out_"; then
-    compare_ () { diff -u "$@"; }
-  else
-    compare_ ()
-    {
-      if diff -u "$@" > diff.out; then
-        # No differences were found, but Solaris 'diff' produces output
-        # "No differences encountered". Hide this output.
-        rm -f diff.out
-        true
-      else
-        cat diff.out
-        rm -f diff.out
-        false
-      fi
-    }
-  fi
-elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
-  if test -z "$diff_out_"; then
-    compare_ () { diff -c "$@"; }
-  else
-    compare_ ()
-    {
-      if diff -c "$@" > 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.
-        rm -f diff.out
-        true
-      else
-        cat diff.out
-        rm -f diff.out
-        false
-      fi
-    }
-  fi
-elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
-  compare_ () { cmp -s "$@"; }
-else
-  compare_ () { cmp "$@"; }
-fi
-
-# Usage: compare EXPECTED ACTUAL
-#
-# Given compare_dev_null_'s preprocessing, defer to compare_ if 2 or more.
-# Otherwise, propagate $? to caller: any diffs have already been printed.
-compare ()
-{
-  # This looks like it can be factored to use a simple "case $?"
-  # after unchecked compare_dev_null_ invocation, but that would
-  # fail in a "set -e" environment.
-  if compare_dev_null_ "$@"; then
-    return 0
-  else
-    case $? in
-      1) return 1;;
-      *) compare_ "$@";;
-    esac
-  fi
-}
-
-# An arbitrary prefix to help distinguish test directories.
-testdir_prefix_ () { printf gt; }
-
-# Run the user-overridable cleanup_ function, remove the temporary
-# directory and exit with the incoming value of $?.
-remove_tmp_ ()
-{
-  __st=$?
-  cleanup_
-  # cd out of the directory we're about to remove
-  cd "$initial_cwd_" || cd / || cd /tmp
-  chmod -R u+rwx "$test_dir_"
-  # If removal fails and exit status was to be 0, then change it to 1.
-  rm -rf "$test_dir_" || { test $__st = 0 && __st=1; }
-  exit $__st
-}
-
-# Given a directory name, DIR, if every entry in it that matches *.exe
-# contains only the specified bytes (see the case stmt below), then print
-# a space-separated list of those names and return 0.  Otherwise, don't
-# print anything and return 1.  Naming constraints apply also to DIR.
-find_exe_basenames_ ()
-{
-  feb_dir_=$1
-  feb_fail_=0
-  feb_result_=
-  feb_sp_=
-  for feb_file_ in $feb_dir_/*.exe; do
-    # If there was no *.exe file, or there existed a file named "*.exe" that
-    # was deleted between the above glob expansion and the existence test
-    # below, just skip it.
-    test "x$feb_file_" = "x$feb_dir_/*.exe" && test ! -f "$feb_file_" \
-      && continue
-    # Exempt [.exe, since we can't create a function by that name, yet
-    # we can't invoke [ by PATH search anyways due to shell builtins.
-    test "x$feb_file_" = "x$feb_dir_/[.exe" && continue
-    case $feb_file_ in
-      *[!-a-zA-Z/0-9_.+]*) feb_fail_=1; break;;
-      *) # Remove leading file name components as well as the .exe suffix.
-         feb_file_=${feb_file_##*/}
-         feb_file_=${feb_file_%.exe}
-         feb_result_="$feb_result_$feb_sp_$feb_file_";;
-    esac
-    feb_sp_=' '
-  done
-  test $feb_fail_ = 0 && printf %s "$feb_result_"
-  return $feb_fail_
-}
-
-# Consider the files in directory, $1.
-# For each file name of the form PROG.exe, create an alias named
-# PROG that simply invokes PROG.exe, then return 0.  If any selected
-# file name or the directory name, $1, contains an unexpected character,
-# define no alias and return 1.
-create_exe_shims_ ()
-{
-  case $EXEEXT in
-    '') return 0 ;;
-    .exe) ;;
-    *) echo "$0: unexpected \$EXEEXT value: $EXEEXT" 1>&2; return 1 ;;
-  esac
-
-  base_names_=`find_exe_basenames_ $1` \
-    || { echo "$0 (exe_shim): skipping directory: $1" 1>&2; return 0; }
-
-  if test -n "$base_names_"; then
-    for base_ in $base_names_; do
-      alias "$base_"="$base_$EXEEXT"
-    done
-  fi
-
-  return 0
-}
-
-# Use this function to prepend to PATH an absolute name for each
-# specified, possibly-$initial_cwd_-relative, directory.
-path_prepend_ ()
-{
-  while test $# != 0; do
-    path_dir_=$1
-    case $path_dir_ in
-      '') fail_ "invalid path dir: '$1'";;
-      /*) abs_path_dir_=$path_dir_;;
-      *) abs_path_dir_=$initial_cwd_/$path_dir_;;
-    esac
-    case $abs_path_dir_ in
-      *:*) fail_ "invalid path dir: '$abs_path_dir_'";;
-    esac
-    PATH="$abs_path_dir_:$PATH"
-
-    # Create an alias, FOO, for each FOO.exe in this directory.
-    create_exe_shims_ "$abs_path_dir_" \
-      || fail_ "something failed (above): $abs_path_dir_"
-    shift
-  done
-  export PATH
-}
-
-setup_ ()
-{
-  if test "$VERBOSE" = yes; then
-    # Test whether set -x may cause the selected shell to corrupt an
-    # application's stderr.  Many do, including zsh-4.3.10 and the /bin/sh
-    # from SunOS 5.11, OpenBSD 4.7 and Irix 5.x and 6.5.
-    # If enabling verbose output this way would cause trouble, simply
-    # issue a warning and refrain.
-    if $gl_set_x_corrupts_stderr_; then
-      warn_ "using SHELL=$SHELL with 'set -x' corrupts stderr"
-    else
-      set -x
-    fi
-  fi
-
-  initial_cwd_=$PWD
-  fail=0
-
-  pfx_=`testdir_prefix_`
-  test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
-    || fail_ "failed to create temporary directory in $initial_cwd_"
-  cd "$test_dir_" || fail_ "failed to cd to temporary directory"
-
-  # As autoconf-generated configure scripts do, ensure that IFS
-  # is defined initially, so that saving and restoring $IFS works.
-  gl_init_sh_nl_='
-'
-  IFS=" ""	$gl_init_sh_nl_"
-
-  # This trap statement, along with a trap on 0 below, ensure that the
-  # temporary directory, $test_dir_, is removed upon exit as well as
-  # upon receipt of any of the listed signals.
-  for sig_ in 1 2 3 13 15; do
-    eval "trap 'Exit $(expr $sig_ + 128)' $sig_"
-  done
-}
-
-# Create a temporary directory, much like mktemp -d does.
-# Written by Jim Meyering.
-#
-# Usage: mktempd_ /tmp phoey.XXXXXXXXXX
-#
-# First, try to use the mktemp program.
-# Failing that, we'll roll our own mktemp-like function:
-#  - try to get random bytes from /dev/urandom
-#  - failing that, generate output from a combination of quickly-varying
-#      sources and gzip.  Ignore non-varying gzip header, and extract
-#      "random" bits from there.
-#  - given those bits, map to file-name bytes using tr, and try to create
-#      the desired directory.
-#  - make only $MAX_TRIES_ attempts
-
-# Helper function.  Print $N pseudo-random bytes from a-zA-Z0-9.
-rand_bytes_ ()
-{
-  n_=$1
-
-  # Maybe try openssl rand -base64 $n_prime_|tr '+/=\012' abcd first?
-  # But if they have openssl, they probably have mktemp, too.
-
-  chars_=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
-  dev_rand_=/dev/urandom
-  if test -r "$dev_rand_"; then
-    # Note: 256-length($chars_) == 194; 3 copies of $chars_ is 186 + 8 = 194.
-    dd ibs=$n_ count=1 if=$dev_rand_ 2>/dev/null \
-      | LC_ALL=C tr -c $chars_ 01234567$chars_$chars_$chars_
-    return
-  fi
-
-  n_plus_50_=`expr $n_ + 50`
-  cmds_='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n'
-  data_=` (eval "$cmds_") 2>&1 | gzip `
-
-  # Ensure that $data_ has length at least 50+$n_
-  while :; do
-    len_=`echo "$data_"|wc -c`
-    test $n_plus_50_ -le $len_ && break;
-    data_=` (echo "$data_"; eval "$cmds_") 2>&1 | gzip `
-  done
-
-  echo "$data_" \
-    | dd bs=1 skip=50 count=$n_ 2>/dev/null \
-    | LC_ALL=C tr -c $chars_ 01234567$chars_$chars_$chars_
-}
-
-mktempd_ ()
-{
-  case $# in
-  2);;
-  *) fail_ "Usage: mktempd_ DIR TEMPLATE";;
-  esac
-
-  destdir_=$1
-  template_=$2
-
-  MAX_TRIES_=4
-
-  # Disallow any trailing slash on specified destdir:
-  # it would subvert the post-mktemp "case"-based destdir test.
-  case $destdir_ in
-  /) ;;
-  */) fail_ "invalid destination dir: remove trailing slash(es)";;
-  esac
-
-  case $template_ in
-  *XXXX) ;;
-  *) fail_ \
-       "invalid template: $template_ (must have a suffix of at least 4 X's)";;
-  esac
-
-  # First, try to use mktemp.
-  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \
-    || fail=1
-
-  # The resulting name must be in the specified directory.
-  case $d in "$destdir_"*);; *) fail=1;; esac
-
-  # It must have created the directory.
-  test -d "$d" || fail=1
-
-  # 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 && {
-    echo "$d"
-    return
-  }
-
-  # If we reach this point, we'll have to create a directory manually.
-
-  # Get a copy of the template without its suffix of X's.
-  base_template_=`echo "$template_"|sed 's/XX*$//'`
-
-  # Calculate how many X's we've just removed.
-  template_length_=`echo "$template_" | wc -c`
-  nx_=`echo "$base_template_" | wc -c`
-  nx_=`expr $template_length_ - $nx_`
-
-  err_=
-  i_=1
-  while :; do
-    X_=`rand_bytes_ $nx_`
-    candidate_dir_="$destdir_/$base_template_$X_"
-    err_=`mkdir -m 0700 "$candidate_dir_" 2>&1` \
-      && { echo "$candidate_dir_"; return; }
-    test $MAX_TRIES_ -le $i_ && break;
-    i_=`expr $i_ + 1`
-  done
-  fail_ "$err_"
-}
-
-# If you want to override the testdir_prefix_ function,
-# or to add more utility functions, use this file.
-test -f "$srcdir/init.cfg" \
-  && . "$srcdir/init.cfg"
-
-setup_ "$@"
-# This trap is here, rather than in the setup_ function, because some
-# shells run the exit trap at shell function exit, rather than script exit.
-trap remove_tmp_ 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-bash gettext-0.18.1.1/gettext-tools/tests/lang-bash
--- gettext-0.19.3/gettext-tools/tests/lang-bash	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-bash	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src ${top_srcdir=..}/../gettext-runtime/src
 
 # Test of gettext facilities in the bash language.
 # Assumes an fr_FR locale is installed.
@@ -10,7 +9,11 @@
 # output when accessing any .mo file not generated from a .po file in UTF-8
 # encoding.
 
-cat <<\EOF > prog.bash
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.sh"
+cat <<\EOF > prog.sh
 #! /bin/bash
 
 n=$1
@@ -27,15 +30,18 @@
 $echo "`eval_ngettext "a piece of cake" "\\$n pieces of cake" $n`"
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot prog.err"
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.bash \
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh \
   >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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -50,6 +56,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -67,13 +74,17 @@
 msgstr[1] "$n morceaux de gateau"
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -82,17 +93,17 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -100,7 +111,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -113,9 +124,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.nok prog.ok prog.oku prog.out"
 # Expected result when bash is built without i18n support.
 cat <<\EOF > prog.nok
 'Your command, please?', asked the waiter.
@@ -134,24 +146,24 @@
 : ${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 bash ./prog.bash 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.sh 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
+    rm -fr $tmpfiles; exit 77
   }
   ${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.sh 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
+    rm -fr $tmpfiles; exit 77
   }
   ${DIFF} prog.oku prog.out || exit 1
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-c gettext-0.18.1.1/gettext-tools/tests/lang-c
--- gettext-0.19.3/gettext-tools/tests/lang-c	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-c	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: gcc.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.c"
 cat <<\EOF > prog.c
 #include "config.h"
 #include <libintl.h>
@@ -39,22 +42,24 @@
 }
 EOF
 
+# Variable needed by LTLIBINTL.
+top_builddir=..
+
+tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}"
 # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # 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
-
-: ${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
+${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.c ${LTLIBINTL} \
+  || exit 1
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 #, c-format
 msgid "'Your command, please?', asked the waiter."
@@ -74,6 +79,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -97,19 +103,24 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -125,7 +136,6 @@
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 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;;
@@ -134,7 +144,6 @@
   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;;
@@ -148,7 +157,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-c++ gettext-0.18.1.1/gettext-tools/tests/lang-c++
--- gettext-0.19.3/gettext-tools/tests/lang-c++	2014-10-08 02:16:30.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-c++	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C++ language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: gcc g++.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether a C++ compiler is found and libasprintf is built.
-test "${CXX}" != "no" || {
+test "${CXX}" != ":" || {
   echo "Skipping test: no C++ compiler found"
   exit 77
 }
@@ -15,6 +17,7 @@
   exit 77
 }
 
+tmpfiles="$tmpfiles prog.cc"
 cat <<\EOF > prog.cc
 #include "config.h"
 
@@ -56,27 +59,31 @@
 }
 EOF
 
+# Variable needed by LTLIBINTL.
+top_builddir=..
+
+tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}"
 # Compile in two steps from .cc to .o and from .o to 'prog'. This way,
 # relinking is faster because doesn't need to redo the first step.
 # Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # 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 \
+${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \
   || 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'.
-: ${CONFIG_SHELL=${SHELL-/bin/sh}}
-${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
+${LIBTOOL} --quiet --mode=link --tag=CXX ${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
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -95,6 +102,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -117,19 +125,24 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -145,7 +158,6 @@
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 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;;
@@ -154,7 +166,6 @@
   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;;
@@ -168,7 +179,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-clisp gettext-0.18.1.1/gettext-tools/tests/lang-clisp
--- gettext-0.19.3/gettext-tools/tests/lang-clisp	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-clisp	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the CLISP language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: clisp.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.lisp"
 cat <<\EOF > prog.lisp
 (setf (textdomain) "prog")
 (setf (textdomaindir "prog") "./")
@@ -18,10 +21,14 @@
 (format t "~A~%" (format nil (gettext "~A is replaced by ~A.") "FF" "EUR"))
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -40,6 +47,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -62,13 +70,17 @@
 msgstr "~1@*~A remplace ~0@*~A."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -79,24 +91,24 @@
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; 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
+       rm -fr $tmpfiles; exit 77
      }
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -104,7 +116,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -117,9 +129,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -135,16 +148,16 @@
 : ${LOCALE_FR=fr_FR}
 : ${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
 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
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-csharp gettext-0.18.1.1/gettext-tools/tests/lang-csharp
--- gettext-0.19.3/gettext-tools/tests/lang-csharp	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-csharp	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C# language.
 # Assumes an fr_FR locale is installed.
@@ -9,6 +8,9 @@
 # are wrong for locales containing a language and a territory. This is fixed
 # in mono-0.29.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether we can build and test C# programs.
 test "${CSHARP_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-csharp"
@@ -23,6 +25,7 @@
   exit 77
 }
 
+tmpfiles="$tmpfiles program.cs"
 cat <<\EOF > program.cs
 using System;
 using GNU.Gettext;
@@ -46,13 +49,18 @@
 }
 EOF
 
-: ${CSHARPCOMP="/bin/sh ../../csharpcomp.sh"}
-${CSHARPCOMP} -o program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
+tmpfiles="$tmpfiles program.exe"
+: ${CSHARPCOMP="/bin/sh ../csharpcomp.sh"}
+${CSHARPCOMP} -o program.exe -L ../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -83,6 +91,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -119,22 +128,26 @@
 msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr/prog.dll"
 : ${MSGFMT=msgfmt}
-GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
 ${MSGFMT} --csharp -d . -r prog -l fr fr.po || exit 1
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -142,7 +155,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -155,9 +168,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -176,16 +190,16 @@
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${CSHARPEXEC="/bin/sh ../../csharpexec.sh"}
+: ${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
+  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
+  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
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-elisp gettext-0.18.1.1/gettext-tools/tests/lang-elisp
--- gettext-0.19.3/gettext-tools/tests/lang-elisp	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-elisp	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Emacs Lisp language.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.el"
 cat <<\EOF > prog.el
 (textdomain "prog")
 (bindtextdomain "prog" ".")
@@ -13,10 +16,14 @@
         (format nil (_ "%s is replaced by %s.") "FF" "EUR"))
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -29,6 +36,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -44,17 +52,23 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-gawk gettext-0.18.1.1/gettext-tools/tests/lang-gawk
--- gettext-0.19.3/gettext-tools/tests/lang-gawk	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-gawk	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the GNU awk language.
 # Assumes an fr_FR locale is installed.
@@ -9,6 +8,10 @@
 # but not in the fr_FR.UTF-8 locale. Probably because in the fr_FR locale,
 # nl_langinfo(CODESET) returns "".
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.awk"
 cat <<\EOF > prog.awk
 BEGIN {
   TEXTDOMAIN = "prog"
@@ -22,10 +25,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -44,6 +51,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -66,13 +74,17 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -81,17 +93,17 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -99,7 +111,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -112,7 +124,7 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
 # Test that gawk wasn't built with --disable-nls.
@@ -122,17 +134,18 @@
   LANGUAGE= LC_ALL=$LOCALE_FR gawk --version | grep logiciel > /dev/null
   test $? = 0 || {
     echo "Skipping test: gawk was built without i18n support"
-    exit 77
+    rm -fr $tmpfiles; 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
+    rm -fr $tmpfiles; exit 77
   }
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -148,14 +161,14 @@
 : ${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 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
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-guile gettext-0.18.1.1/gettext-tools/tests/lang-guile
--- gettext-0.19.3/gettext-tools/tests/lang-guile	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-guile	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the guile implementation of Scheme.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: guile.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.scm"
 cat <<\EOF > prog.scm
 (use-modules (ice-9 format))
 
@@ -21,10 +24,14 @@
 (format #t "~A~%" (format #f (gettext "~A is replaced by ~A.") "FF" "EUR"))
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -43,6 +50,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -65,13 +73,17 @@
 msgstr "~1@*~A remplace ~0@*~A."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -80,17 +92,17 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -98,7 +110,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -111,9 +123,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -129,16 +142,14 @@
 : ${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 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
-  grep -v '^;;;' prog.err 1>&2
+  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 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 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
-  grep -v '^;;;' prog.err 1>&2
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out || exit 1
   ${DIFF} prog.oku prog.out || exit 1
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-java gettext-0.18.1.1/gettext-tools/tests/lang-java
--- gettext-0.19.3/gettext-tools/tests/lang-java	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-java	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Java language.
 # Assumes an fr_FR locale is installed.
@@ -8,6 +7,9 @@
 # Note: This test fails when using gcj from GCC 3.1 and GCC 3.2, due to a bug
 # (libgcj/6576). It is fixed in GCC 3.3.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether we can build and test Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
@@ -22,6 +24,7 @@
   exit 77
 }
 
+tmpfiles="$tmpfiles Program.java"
 cat <<\EOF > Program.java
 import java.util.*;
 import java.io.*;
@@ -59,14 +62,19 @@
 }
 EOF
 
-: ${JAVACOMP="/bin/sh ../../javacomp.sh"}
-CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Program.java 2>prog.err \
+tmpfiles="$tmpfiles Program.class prog.err"
+: ${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; }
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -97,6 +105,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -133,13 +142,17 @@
 msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles prog_fr.class"
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -j -d . -r prog -l fr fr.po || exit 1
 
@@ -147,7 +160,7 @@
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -155,7 +168,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -168,9 +181,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -189,16 +203,16 @@
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
+: ${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
+  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
+  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
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-javascript gettext-0.18.1.1/gettext-tools/tests/lang-javascript
--- gettext-0.19.3/gettext-tools/tests/lang-javascript	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-javascript	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of gettext facilities in the JavaScript language.
-# Assumes an fr_FR locale is installed.
-# Assumes the following packages are installed: gjs.
-
-cat <<\EOF > prog.js
-const Format = imports.format;
-const Gettext = imports.gettext;
-
-String.prototype.format = Format.format;
-const _ = Gettext.gettext;
-
-Gettext.textdomain ("prog");
-Gettext.bindtextdomain ("prog", ".");
-print(_("'Your command, please?', asked the waiter."));
-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
-
-cat <<EOF > prog.ok
-msgid "'Your command, please?', asked the waiter."
-msgstr ""
-
-#, javascript-format
-msgid "%s is replaced by %s."
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
-
-cat <<\EOF > fr.po
-msgid ""
-msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
-
-msgid "'Your command, please?', asked the waiter."
-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."
-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
-
-: ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
-
-test -d fr || mkdir fr
-test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
-
-: ${MSGFMT=msgfmt}
-${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; }
-(gjs -c imports.gettext) >/dev/null 2>/dev/null \
-  || { 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; }
-
-# Test which of the fr_FR locales are installed.
-: ${LOCALE_FR=fr_FR}
-: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
-  case $? in
-    0) ;;
-    77) LOCALE_FR=none;;
-    *) exit 1;;
-  esac
-fi
-if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
-  case $? in
-    0) ;;
-    77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
-  esac
-fi
-if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no french locale is installed"
-  else
-    echo "Skipping test: no french locale is supported"
-  fi
-  exit 77
-fi
-
-: ${DIFF=diff}
-cat <<\EOF > prog.ok
-�Votre commande, s'il vous plait�, dit le gar�on.
-FF remplace EUR.
-EOF
-cat <<\EOF > prog.oku
-«Votre commande, s'il vous plait», dit le garçon.
-FF remplace EUR.
-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
-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
-fi
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-librep gettext-0.18.1.1/gettext-tools/tests/lang-librep
--- gettext-0.19.3/gettext-tools/tests/lang-librep	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-librep	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the librep language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: librep.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.jl"
 cat <<\EOF > prog.jl
 (require 'rep.i18n.gettext)
 
@@ -17,10 +20,14 @@
         (format nil (_ "%s is replaced by %s.") "FF" "EUR"))
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -33,6 +40,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -48,13 +56,17 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -63,17 +75,17 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -81,7 +93,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -94,9 +106,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -110,14 +123,14 @@
 : ${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 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
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-lua gettext-0.18.1.1/gettext-tools/tests/lang-lua
--- gettext-0.19.3/gettext-tools/tests/lang-lua	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-lua	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of gettext facilities in the Lua language.
-# Assumes an fr_FR locale is installed.
-# Assumes the following packages are installed: lua, lua-gettext.
-
-cat <<\EOF > prog.lua
-require("gettext")
-gettext.bindtextdomain("prog", ".")
-gettext.textdomain("prog")
-_ = gettext.gettext
-n = 42
-
-print(gettext.gettext("'Your command, please?', asked the waiter."))
-print(string.format(gettext.ngettext('a piece of cake', [[%d pieces of cake]], n), n))
-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
-
-cat <<\EOF > prog.ok
-msgid "'Your command, please?', asked the waiter."
-msgstr ""
-
-#, lua-format
-msgid "a piece of cake"
-msgid_plural "%d pieces of cake"
-msgstr[0] ""
-msgstr[1] ""
-
-#, lua-format
-msgid "%s is replaced by %s."
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
-
-cat <<\EOF > fr.po
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-msgid "'Your command, please?', asked the waiter."
-msgstr "�Votre commande, s'il vous plait�, dit le gar�on."
-
-#, lua-format
-msgid "a piece of cake"
-msgid_plural "%d pieces of cake"
-msgstr[0] "un morceau de gateau"
-msgstr[1] "%d morceaux de gateau"
-
-#, lua-format
-msgid "%s is replaced by %s."
-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
-
-: ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
-
-test -d fr || mkdir fr
-test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
-
-: ${MSGFMT=msgfmt}
-${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; }
-case `lua -v 2>&1 | sed -e 's/^[^0-9]*//'` in
-  [5-9].*) ;;
-  *) 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
-     }
-
-# Test which of the fr_FR locales are installed.
-: ${LOCALE_FR=fr_FR}
-: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
-  case $? in
-    0) ;;
-    77) LOCALE_FR=none;;
-    *) exit 1;;
-  esac
-fi
-if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
-  case $? in
-    0) ;;
-    77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
-  esac
-fi
-if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no french locale is installed"
-  else
-    echo "Skipping test: no french locale is supported"
-  fi
-  exit 77
-fi
-
-: ${DIFF=diff}
-cat <<\EOF > prog.ok
-�Votre commande, s'il vous plait�, dit le gar�on.
-42 morceaux de gateau
-FF remplace EUR.
-EOF
-cat <<\EOF > prog.oku
-«Votre commande, s'il vous plait», dit le garçon.
-42 morceaux de gateau
-FF remplace EUR.
-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 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
-fi
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-objc gettext-0.18.1.1/gettext-tools/tests/lang-objc
--- gettext-0.19.3/gettext-tools/tests/lang-objc	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-objc	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Objective C language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: gcc.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether an ObjectiveC compiler is found.
+tmpfiles="$tmpfiles hello.m hello.${OBJEXT} hello${EXEEXT}"
 cat <<\EOF > hello.m
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,9 +20,10 @@
 EOF
 ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o hello hello.m 2>/dev/null \
   || { echo "Skipping test: Objective C compiler not found"
-       exit 77
+       rm -fr $tmpfiles; exit 77
      }
 
+tmpfiles="$tmpfiles prog.m"
 cat <<\EOF > prog.m
 #include "config.h"
 #include <libintl.h>
@@ -54,22 +58,24 @@
 }
 EOF
 
+# Variable needed by LTLIBINTL.
+top_builddir=..
+
+tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}"
 # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # 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
-
-: ${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
+${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.m ${LTLIBINTL} \
+  || exit 1
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 #, c-format
 msgid "'Your command, please?', asked the waiter."
@@ -89,6 +95,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -112,19 +119,24 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -140,7 +152,6 @@
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 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;;
@@ -149,7 +160,6 @@
   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;;
@@ -163,7 +173,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-pascal gettext-0.18.1.1/gettext-tools/tests/lang-pascal
--- gettext-0.19.3/gettext-tools/tests/lang-pascal	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-pascal	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Object Pascal language.
 # Assumes the following packages are installed: fpk.
@@ -9,8 +8,12 @@
 # This here is a quick workaround:
 UTF8_LOCALE_UNSUPPORTED=yes
 
-cat <<\EOF > pascalprog.pp
-program pascalprog;
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.pp"
+cat <<\EOF > prog.pp
+program prog;
 {$mode delphi}
 
 uses gettext, sysutils;
@@ -20,71 +23,80 @@
   currencies = '%s is replaced by %s.';
 
 begin
-  translateresourcestrings('%s/LC_MESSAGES/pascalprog.mo');
+  translateresourcestrings('%s/LC_MESSAGES/prog.mo');
   writeln(question);
   writeln(format(currencies, ['FF', 'EUR']));
 end.
 EOF
 
-(ppc386 pascalprog.pp) >/dev/null 2>&1 ||
-(ppcx64 pascalprog.pp) >/dev/null 2>&1 ||
-{
-  echo "Skipping test: Pascal compiler ppc386 or ppcx64 not found"
-  exit 77
+tmpfiles="$tmpfiles prog.o prog.rst prog"
+(ppc386 prog.pp) >/dev/null 2>&1 || {
+  echo "Skipping test: ppc386 compiler not found"
+  rm -fr $tmpfiles; exit 77
 }
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
-
-cat <<EOF > pascalprog.ok
-#: pascalprog.question
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+tmpfiles="$tmpfiles prog.ok"
+cat <<EOF > prog.ok
+#: prog.question
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
 
-#: pascalprog.currencies
+#: prog.currencies
 #, object-pascal-format
 msgid "%s is replaced by %s."
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} pascalprog.ok pascalprog.pot || exit 1
+${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
 
-#: pascalprog.question
+#: prog.question
 msgid "'Your command, please?', asked the waiter."
 msgstr "�Votre commande, s'il vous plait�, dit le gar�on."
 
 # Reverse the arguments.
-#: pascalprog.currencies
+#: prog.currencies
 #, object-pascal-format
 msgid "%s is replaced by %s."
 msgstr "%1:s remplace %0:s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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 prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o fr/LC_MESSAGES/pascalprog.mo fr.po
+${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
-cat <<\EOF > pascalprog.ok
+cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
 EUR remplace FF.
 EOF
-cat <<\EOF > pascalprog.oku
+cat <<\EOF > prog.oku
 «Votre commande, s'il vous plait», dit le garçon.
 EUR remplace FF.
 EOF
@@ -92,17 +104,15 @@
 : ${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= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || exit 1
+  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./prog > prog.out || exit 1
   : ${DIFF=diff}
-  ${DIFF} pascalprog.ok pascalprog.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= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || exit 1
+    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./prog > prog.out || exit 1
     : ${DIFF=diff}
-    ${DIFF} pascalprog.oku pascalprog.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
@@ -110,7 +120,7 @@
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    rm -fr $tmpfiles; exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -119,8 +129,10 @@
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    rm -fr $tmpfiles; exit 77
   fi
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-perl-1 gettext-0.18.1.1/gettext-tools/tests/lang-perl-1
--- gettext-0.19.3/gettext-tools/tests/lang-perl-1	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-perl-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,15 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Perl language,
 # using printf format strings.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: perl.
 
-cat <<\EOF > program1.pl
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles program.pl"
+cat <<\EOF > program.pl
 use strict;
 
 use Locale::Messages qw (textdomain bindtextdomain gettext ngettext);
@@ -21,12 +24,16 @@
 print "\n";
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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 program.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -45,6 +52,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -67,19 +75,24 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -95,19 +108,17 @@
 # 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
+       rm -fr $tmpfiles; 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
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program.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
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program.pl > prog.out || exit 1
   ${DIFF} prog.oku prog.out || exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -116,7 +127,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-perl-2 gettext-0.18.1.1/gettext-tools/tests/lang-perl-2
--- gettext-0.19.3/gettext-tools/tests/lang-perl-2	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-perl-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,15 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Perl language,
 # using brace format strings.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: perl, libintl-perl.
 
-cat <<\EOF > program2.pl
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles program.pl"
+cat <<\EOF > program.pl
 use Locale::TextDomain (prog => './');
 my $n = 2;
 print __"'Your command, please?', asked the waiter.";
@@ -17,15 +20,19 @@
 print "\n";
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} \
   -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \
   -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 program.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -44,6 +51,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -66,20 +74,24 @@
 msgstr "{new} remplace {old}."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
-test -d l-perl-2 || mkdir l-perl-2
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -95,19 +107,17 @@
 # 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
+       rm -fr $tmpfiles; 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
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program.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
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program.pl > prog.out || exit 1
   ${DIFF} prog.oku prog.out || exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -116,7 +126,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-php gettext-0.18.1.1/gettext-tools/tests/lang-php
--- gettext-0.19.3/gettext-tools/tests/lang-php	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-php	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the PHP language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: mod_php4-core.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.php"
 cat <<\EOF > prog.php
 <?php
   setlocale (LC_ALL, "");
@@ -17,10 +20,14 @@
 ?>
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -33,6 +40,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -46,13 +54,17 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -62,21 +74,21 @@
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 { php -m | grep '^gettext$' >/dev/null; } \
   || { echo "Skipping test: php was built without gettext support"
-       exit 77
+       rm -fr $tmpfiles; exit 77
      }
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -84,7 +96,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -97,9 +109,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -113,14 +126,14 @@
 : ${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 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
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-po gettext-0.18.1.1/gettext-tools/tests/lang-po
--- gettext-0.19.3/gettext-tools/tests/lang-po	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-po	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the PO/POT format.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test with POT format.
 
+tmpfiles="$tmpfiles prog-in.pot"
 cat <<\EOF > prog-in.pot
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -20,15 +23,19 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} prog-in.pot prog.pot || exit 1
 
 # Test with PO format.
 
+tmpfiles="$tmpfiles prog-in.po"
 cat <<\EOF > prog-in.po
 msgid ""
 msgstr ""
@@ -51,11 +58,16 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles prog.tmp.po prog.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp.po > prog.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} prog-in.po prog.po || exit 1
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-python-1 gettext-0.18.1.1/gettext-tools/tests/lang-python-1
--- gettext-0.19.3/gettext-tools/tests/lang-python-1	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-python-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Python language.
 
@@ -7,7 +6,11 @@
 # It looks like a bug in Python's gettext.py. This here is a quick workaround:
 UTF8_LOCALE_UNSUPPORTED=yes
 
-cat <<\EOF > prog1.py
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.py"
+cat <<\EOF > prog.py
 import gettext
 
 gettext.textdomain('prog')
@@ -18,10 +21,14 @@
       % { 'oldCurrency': "FF", 'newCurrency' : "EUR" }
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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 prog.py
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -34,6 +41,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -49,13 +57,17 @@
 msgstr "%(newCurrency)s remplace %(oldCurrency)s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -64,12 +76,13 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -83,14 +96,12 @@
 : ${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 python prog1.py > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR python prog.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
+    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog.py > prog.out || exit 1
     ${DIFF} prog.oku prog.out || exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -99,7 +110,7 @@
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    rm -fr $tmpfiles; exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -108,8 +119,10 @@
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    rm -fr $tmpfiles; exit 77
   fi
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-python-2 gettext-0.18.1.1/gettext-tools/tests/lang-python-2
--- gettext-0.19.3/gettext-tools/tests/lang-python-2	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-python-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities (including plural handling) in the Python
 # language.
@@ -8,7 +7,11 @@
 # It looks like a bug in Python's gettext.py. This here is a quick workaround:
 UTF8_LOCALE_UNSUPPORTED=yes
 
-cat <<\EOF > prog2.py
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.py"
+cat <<\EOF > prog.py
 import sys
 import gettext
 
@@ -24,10 +27,14 @@
       % { 'oldCurrency': "FF", 'newCurrency' : "EUR" }
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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 prog.py
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -46,6 +53,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -68,13 +76,17 @@
 msgstr "%(newCurrency)s remplace %(oldCurrency)s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -83,12 +95,13 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -104,14 +117,12 @@
 : ${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 python prog2.py 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR python prog.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
+    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog.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
@@ -120,7 +131,7 @@
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    rm -fr $tmpfiles; exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -129,8 +140,10 @@
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    rm -fr $tmpfiles; exit 77
   fi
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-rst gettext-0.18.1.1/gettext-tools/tests/lang-rst
--- gettext-0.19.3/gettext-tools/tests/lang-rst	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-rst	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the RST format.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.rst"
 cat <<\EOF > prog.rst
 # From the rstconv program itself.
 rstconv.help='rstconv [-h|--help]    Displays this help'#10+
@@ -19,10 +22,14 @@
 rstconv.InvalidOutputFormat='Invalid output format -'
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 #: rstconv.help
 msgid ""
@@ -58,13 +65,15 @@
 
 # The output of rstconv is slightly different:
 # - ModuleName:ConstName instead of ModuleName.ConstName
-# - no line wrapping in fpc versions < 2.6.0
+# - no line wrapping
 # - extra newline at the end
 
+tmpfiles="$tmpfiles prog.pot"
 : ${RSTCONV=rstconv}
 if (${RSTCONV} -o prog.pot -i prog.rst) >/dev/null 2>&1; then
 
-cat <<EOF > prog.ok1
+tmpfiles="$tmpfiles prog.ok"
+cat <<EOF > prog.ok
 #: rstconv:help
 msgid "rstconv [-h|--help]    Displays this help\nrstconv options        Convert rst file\n\nOptions are:\n  -i file    Use specified file instead of stdin as input .rst (OPTIONAL)\n  -o file    Write output to specified file (REQUIRED)\n  -f format  Specifies the output format:\n             po    GNU gettext .po (portable) format (DEFAULT)\n"
 msgstr ""
@@ -87,40 +96,11 @@
 
 EOF
 
-cat <<EOF > prog.ok2
-#: rstconv:help
-msgid ""
-"rstconv [-h|--help]    Displays this help\n"
-"rstconv options        Convert rst file\n"
-"\n"
-"Options are:\n"
-"  -i file    Use specified file instead of stdin as input .rst (OPTIONAL)\n"
-"  -o file    Write output to specified file (REQUIRED)\n"
-"  -f format  Specifies the output format:\n"
-"             po    GNU gettext .po (portable) format (DEFAULT)\n"
-msgstr ""
-
-#: rstconv:InvalidOption
-msgid "Invalid option - "
-msgstr ""
-
-#: rstconv:OptionAlreadySpecified
-msgid "Option has already been specified - "
-msgstr ""
-
-#: rstconv:NoOutFilename
-msgid "No output filename specified"
-msgstr ""
-
-#: rstconv:InvalidOutputFormat
-msgid "Invalid output format -"
-msgstr ""
-
-EOF
-
 : ${DIFF=diff}
-${DIFF} prog.ok1 prog.pot >/dev/null || ${DIFF} prog.ok2 prog.pot || exit 1
+${DIFF} prog.ok prog.pot || exit 1
 
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-sh gettext-0.18.1.1/gettext-tools/tests/lang-sh
--- gettext-0.19.3/gettext-tools/tests/lang-sh	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-sh	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src ${top_srcdir=..}/../gettext-runtime/src
 
 # Test of gettext facilities in the sh language.
 # Assumes an fr_FR locale is installed.
@@ -8,6 +7,10 @@
 # Note: This test fails on BeOS because there all locales use the UTF-8
 # encoding, even the locale fr_FR, thus the output comes out in UTF-8.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.sh"
 cat <<\EOF > prog.sh
 #! /bin/sh
 
@@ -25,10 +28,14 @@
 $echo "`eval_ngettext \"a piece of cake\" \"\\$n pieces of cake\" $n`"
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -43,6 +50,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -60,13 +68,17 @@
 msgstr[1] "$n morceaux de gateau"
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -77,7 +89,7 @@
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ../testlocale
+  LC_ALL=$LOCALE_FR ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -85,7 +97,7 @@
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -98,9 +110,10 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -114,14 +127,14 @@
 : ${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 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
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-smalltalk gettext-0.18.1.1/gettext-tools/tests/lang-smalltalk
--- gettext-0.19.3/gettext-tools/tests/lang-smalltalk	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-smalltalk	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the GNU smalltalk language.
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: smalltalk.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.st"
 cat <<\EOF > prog.st
 PackageLoader fileInPackage: 'I18N' !
 
@@ -30,10 +33,14 @@
 Main new run!
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -52,6 +59,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -74,13 +82,17 @@
 msgstr "%2 remplace %1."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles fr"
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
@@ -89,12 +101,13 @@
 
 # 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"; rm -fr $tmpfiles; 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"; rm -fr $tmpfiles; exit 77;;
 esac
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.ok2 prog.oku2 prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -117,7 +130,6 @@
 : ${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 gst -Q prog.st > prog.out || exit 1
   ${DIFF} prog.ok prog.out > /dev/null ||
     ${DIFF} prog.ok2 prog.out > /dev/null ||
@@ -125,7 +137,6 @@
         { ${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
   ${DIFF} prog.oku prog.out > /dev/null ||
     ${DIFF} prog.oku2 prog.out > /dev/null ||
@@ -138,7 +149,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-tcl gettext-0.18.1.1/gettext-tools/tests/lang-tcl
--- gettext-0.19.3/gettext-tools/tests/lang-tcl	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-tcl	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Tcl language.
 # Assumes an fr_FR locale is installed.
@@ -12,19 +11,27 @@
 # Note: This test fails on Cygwin 1.7.2 in the fr_FR.UTF-8 locale but not
 # in the fr_FR.ISO-8859-1 locale.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles program.tcl"
 cat <<\EOF > program.tcl
 #!/usr/bin/env tclsh
 package require msgcat
-::msgcat::mcload [file join [file dirname [info script]] . msgs]
+::msgcat::mcload [file join [file dirname [info script]] msgs]
 proc _ {s} {return [::msgcat::mc $s]}
 puts [_ "'Your command, please?', asked the waiter."]
 puts [format [::msgcat::mc "%s is replaced by %s."] "FF" "EUR"]
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 #: program.tcl:5
 msgid "'Your command, please?', asked the waiter."
@@ -39,6 +46,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -54,28 +62,34 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+tmpfiles="$tmpfiles msgs"
 test -d msgs || mkdir msgs
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --tcl -d msgs -l fr fr.po || exit 1
 
 # Test for presence of tclsh with msgcat extension.
+tmpfiles="$tmpfiles version.tcl"
 cat <<\EOF > version.tcl
 package require msgcat
 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
+       rm -fr $tmpfiles; exit 77
      }
 
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 �Votre commande, s'il vous plait�, dit le gar�on.
@@ -89,13 +103,11 @@
 : ${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= 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
@@ -106,7 +118,9 @@
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-vala gettext-0.18.1.1/gettext-tools/tests/lang-vala
--- gettext-0.19.3/gettext-tools/tests/lang-vala	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-vala	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of gettext facilities in the Vala language.
-# Assumes an fr_FR locale is installed.
-# Assumes the following packages are installed: vala.
-
-cat <<\EOF > prog.vala
-int main (string[] args) {
-    Intl.setlocale (LocaleCategory.ALL, "");
-    Intl.textdomain ("prog");
-    Intl.bindtextdomain ("prog", ".");
-    stdout.printf ("%s\n", _("'Your command, please?', asked the waiter."));
-    stdout.printf ("%s\n", _("%s is replaced by %s.").printf ("FF", "EUR"));
-    return 0;
-}
-EOF
-
-# Test for presence of valac.
-(valac --version) >/dev/null 2>/dev/null
-test $? -le 1 \
-  || { 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; }
-
-: ${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
-
-cat <<EOF > prog.ok
-msgid "'Your command, please?', asked the waiter."
-msgstr ""
-
-#, c-format
-msgid "%s is replaced by %s."
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
-
-cat <<\EOF > fr.po
-msgid ""
-msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
-
-msgid "'Your command, please?', asked the waiter."
-msgstr "�Votre commande, s'il vous plait�, dit le gar�on."
-
-# Reverse the arguments.
-#, c-format
-msgid "%s is replaced by %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
-
-: ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
-
-test -d fr || mkdir fr
-test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
-
-: ${MSGFMT=msgfmt}
-${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
-
-: ${DIFF=diff}
-cat <<\EOF > prog.ok
-�Votre commande, s'il vous plait�, dit le gar�on.
-EUR remplace FF.
-EOF
-cat <<\EOF > prog.oku
-«Votre commande, s'il vous plait», dit le garçon.
-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 ./prog > prog.out
-  case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
-    77) LOCALE_FR=none;;
-    *) 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;;
-    77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
-  esac
-fi
-if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no french locale is installed"
-  else
-    echo "Skipping test: no french locale is supported"
-  fi
-  exit 77
-fi
-
-exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/lang-ycp gettext-0.18.1.1/gettext-tools/tests/lang-ycp
--- gettext-0.19.3/gettext-tools/tests/lang-ycp	2014-10-01 07:29:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/lang-ycp	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the YCP language.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles prog.ycp"
 cat <<\EOF > prog.ycp
 {
   textdomain "prog";
@@ -13,10 +16,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles prog.tmp prog.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles prog.ok"
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -35,6 +42,7 @@
 : ${DIFF=diff}
 ${DIFF} prog.ok prog.pot || exit 1
 
+tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
 msgid ""
 msgstr ""
@@ -57,11 +65,16 @@
 msgstr "%2 remplace %1."
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} fr.po fr.po.new || exit 1
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/Makefile.am gettext-0.18.1.1/gettext-tools/tests/Makefile.am
--- gettext-0.19.3/gettext-tools/tests/Makefile.am	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/Makefile.am	2010-06-06 12:49:58.000000000 +0000
@@ -25,11 +25,11 @@
 	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-16 msgattrib-17 \
 	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-15 msgcat-16 msgcat-17 msgcat-18 \
 	msgcat-properties-1 msgcat-properties-2 \
 	msgcat-stringtable-1 \
 	msgcmp-1 msgcmp-2 msgcmp-3 msgcmp-4 \
@@ -37,27 +37,25 @@
 	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 \
-	msgfilter-1 msgfilter-2 msgfilter-3 msgfilter-4 msgfilter-5 \
-	msgfilter-6 \
-	msgfilter-sr-latin-1 msgfilter-quote-1 \
+	msgcomm-26 msgcomm-27 \
+	msgconv-1 msgconv-2 msgconv-3 msgconv-4 msgconv-5 msgconv-6 \
+	msgen-1 msgen-2 msgen-3 \
+	msgexec-1 msgexec-2 msgexec-3 msgexec-4 \
+	msgfilter-1 msgfilter-2 msgfilter-3 msgfilter-4 \
+	msgfilter-sr-latin-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-15 msgfmt-16 msgfmt-17 \
 	msgfmt-properties-1 \
 	msgfmt-qt-1 msgfmt-qt-2 \
-	msgfmt-desktop-1 msgfmt-desktop-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 \
+	msggrep-8 msggrep-9 msggrep-10 \
+	msginit-1 msginit-2 \
 	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-23 msgmerge-24 \
 	msgmerge-compendium-1 msgmerge-compendium-2 msgmerge-compendium-3 \
 	msgmerge-compendium-4 msgmerge-compendium-5 msgmerge-compendium-6 \
 	msgmerge-properties-1 msgmerge-properties-2 \
@@ -68,21 +66,20 @@
 	msgunfmt-java-1 \
 	msgunfmt-properties-1 \
 	msgunfmt-tcl-1 \
-	msguniq-1 msguniq-2 msguniq-3 msguniq-4 msguniq-5 msguniq-6 msguniq-7 \
+	msguniq-1 msguniq-2 msguniq-3 msguniq-4 msguniq-5 msguniq-6 \
 	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-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \
+	xgettext-7 xgettext-8 xgettext-9 \
 	xgettext-awk-1 xgettext-awk-2 \
-	xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \
+	xgettext-c-1 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-16 xgettext-c-17 xgettext-c-18 \
 	xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
 	xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
 	xgettext-csharp-7 \
 	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 \
@@ -96,19 +93,12 @@
 	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-tcl-1 xgettext-tcl-2 xgettext-tcl-3 \
 	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 \
 	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 \
@@ -122,7 +112,6 @@
 	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 \
@@ -133,18 +122,13 @@
 	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 \
 	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
+	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
 
-EXTRA_DIST += init.sh init.cfg $(TESTS) \
+EXTRA_DIST += $(TESTS) \
 	test.mo xg-c-1.ok.po mex-test2.ok \
 	mm-ko.ascii.pot mm-ko.euc-kr.po mm-ko-comp.euc-kr.po \
 	mm-viet.comp.po mm-viet.pot mm-viet.out \
@@ -153,10 +137,7 @@
 	qttest2_de.po qttest2_de.qm qttest2_de.ts \
 	ChangeLog.0 \
 	gettext-3-1.po gettext-3-2.po gettext-4.po gettext-5.po \
-	gettext-6-1.po gettext-6-2.po gettext-7.po \
-	gettextpo-1.de.po \
-	xgettext-1 \
-	xgettext-c-1
+	gettext-6-1.po gettext-6-2.po gettext-7.po
 
 XGETTEXT = ../src/xgettext
 
@@ -167,8 +148,7 @@
 #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) \
-		    abs_top_srcdir=$(abs_top_srcdir) \
+		    PATH=.:../src:../../gettext-runtime/src:$(top_srcdir)/../gettext-runtime/src:$$PATH \
 		    GETTEXT="$(CHECKER) tstgettext" \
 		    NGETTEXT="$(CHECKER) tstngettext" \
 		    XGETTEXT="$(CHECKER) xgettext" \
@@ -187,9 +167,26 @@
 		    MSGUNFMT="$(CHECKER) msgunfmt" \
 		    MSGUNIQ="$(CHECKER) msguniq" \
 		    RECODE="$(CHECKER) recode" \
-		    CONFIG_SHELL='$(SHELL)'
-
-LOG_COMPILER = $(SHELL)
+		    OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
+		    LIBTOOL='@LIBTOOL@' \
+		    CC='@CC@' CFLAGS='@CFLAGS@' \
+		    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
+		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
+		    LTLIBINTL='@LTLIBINTL@' \
+		    JAVA_CHOICE='@JAVA_CHOICE@' \
+		    BUILDJAVA='@BUILDJAVA@' \
+		    TESTJAVA='@TESTJAVA@' \
+		    CSHARP_CHOICE='@CSHARP_CHOICE@' \
+		    BUILDCSHARP='@BUILDCSHARP@' \
+		    TESTCSHARP='@TESTCSHARP@' \
+		    TESTLIBASPRINTF='@TESTLIBASPRINTF@' \
+		    GLIBC2='@GLIBC2@' \
+		    LOCALE_FR='@LOCALE_FR@' \
+		    LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+		    LOCALE_JA='@LOCALE_JA@' \
+		    host_os='@host_os@' \
+		    CONFIG_SHELL='$(SHELL)' \
+		    $(SHELL)
 
 # Update the expected test results.
 update-expected: xg-c-1.ok.po
@@ -209,7 +206,7 @@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
 LDADD_yes = ../intl/libintl.la @LTLIBTHREAD@
 LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
-noinst_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
+noinst_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
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_CFLAGS = -DINSTALLDIR=\".\"
 tstgettext_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
@@ -243,16 +240,6 @@
 fc4_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 fc5_SOURCES = format-c-5-prg.c
 fc5_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
-gettextpo_1_prg_SOURCES = gettextpo-1-prg.c
-# Don't add 'gnulib-lib' to the include path here.  Some header files
-# there may interfere with the ones in 'libgettextpo'.
-gettextpo_1_prg_CPPFLAGS = \
-  -I.. \
-  -I../libgettextpo -I$(top_srcdir)/libgettextpo \
-  -I../intl
-# Don't add more libraries here. This test must check whether libgettextpo is
-# self contained.
-gettextpo_1_prg_LDADD = ../libgettextpo/libgettextpo.la $(LDADD)
 
 # Clean up after Solaris cc.
 clean-local:
diff -Nru gettext-0.19.3/gettext-tools/tests/Makefile.in gettext-0.18.1.1/gettext-tools/tests/Makefile.in
--- gettext-0.19.3/gettext-tools/tests/Makefile.in	2014-10-16 06:01:40.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/Makefile.in	2010-06-06 20:12:33.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,54 +16,10 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -82,72 +39,60 @@
 	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)
+	fc5$(EXEEXT)
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs $(srcdir)/init-env.in \
-	$(top_srcdir)/../build-aux/test-driver ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/regex.m4 \
+	$(top_srcdir)/libgrep/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/acl.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
-	$(top_srcdir)/gnulib-m4/ansi-c++.m4 \
+	$(top_srcdir)/gnulib-m4/argmatch.m4 \
 	$(top_srcdir)/gnulib-m4/asm-underscore.m4 \
 	$(top_srcdir)/gnulib-m4/atexit.m4 \
 	$(top_srcdir)/gnulib-m4/backupfile.m4 \
 	$(top_srcdir)/gnulib-m4/bison-i18n.m4 \
-	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
-	$(top_srcdir)/gnulib-m4/close.m4 \
-	$(top_srcdir)/gnulib-m4/closedir.m4 \
-	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/cloexec.m4 \
 	$(top_srcdir)/gnulib-m4/copy-file.m4 \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
-	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dos.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/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
-	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
-	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/findprog.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fnmatch.m4 \
 	$(top_srcdir)/gnulib-m4/fopen.m4 \
-	$(top_srcdir)/gnulib-m4/fpieee.m4 \
-	$(top_srcdir)/gnulib-m4/fseeko.m4 \
-	$(top_srcdir)/gnulib-m4/fstat.m4 \
-	$(top_srcdir)/gnulib-m4/ftell.m4 \
-	$(top_srcdir)/gnulib-m4/ftello.m4 \
 	$(top_srcdir)/gnulib-m4/gcj.m4 \
-	$(top_srcdir)/gnulib-m4/getcwd.m4 \
 	$(top_srcdir)/gnulib-m4/getdelim.m4 \
 	$(top_srcdir)/gnulib-m4/getdtablesize.m4 \
 	$(top_srcdir)/gnulib-m4/getline.m4 \
 	$(top_srcdir)/gnulib-m4/getopt.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib-m4/gl_list.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
@@ -155,12 +100,9 @@
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
-	$(top_srcdir)/gnulib-m4/inttypes.m4 \
-	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
-	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
@@ -177,7 +119,6 @@
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
-	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -189,7 +130,6 @@
 	$(top_srcdir)/gnulib-m4/mbsrtowcs.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
 	$(top_srcdir)/gnulib-m4/mbswidth.m4 \
-	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/memmove.m4 \
 	$(top_srcdir)/gnulib-m4/memset.m4 \
@@ -198,26 +138,20 @@
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
 	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/moo.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
-	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/no-c++.m4 \
-	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/off_t.m4 \
+	$(top_srcdir)/gnulib-m4/onceonly.m4 \
 	$(top_srcdir)/gnulib-m4/open.m4 \
-	$(top_srcdir)/gnulib-m4/opendir.m4 \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
+	$(top_srcdir)/gnulib-m4/pipe.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
 	$(top_srcdir)/gnulib-m4/quotearg.m4 \
-	$(top_srcdir)/gnulib-m4/raise.m4 \
 	$(top_srcdir)/gnulib-m4/rawmemchr.m4 \
 	$(top_srcdir)/gnulib-m4/read-file.m4 \
-	$(top_srcdir)/gnulib-m4/read.m4 \
-	$(top_srcdir)/gnulib-m4/readdir.m4 \
 	$(top_srcdir)/gnulib-m4/readlink.m4 \
 	$(top_srcdir)/gnulib-m4/realloc.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
@@ -226,17 +160,13 @@
 	$(top_srcdir)/gnulib-m4/safe-read.m4 \
 	$(top_srcdir)/gnulib-m4/safe-write.m4 \
 	$(top_srcdir)/gnulib-m4/sched_h.m4 \
-	$(top_srcdir)/gnulib-m4/secure_getenv.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
-	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/sig_atomic_t.m4 \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
-	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
-	$(top_srcdir)/gnulib-m4/spawn-pipe.m4 \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
@@ -262,7 +192,6 @@
 	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_stat_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_time_h.m4 \
-	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/sys_wait_h.m4 \
 	$(top_srcdir)/gnulib-m4/tempname.m4 \
 	$(top_srcdir)/gnulib-m4/term-ostream.m4 \
@@ -271,7 +200,6 @@
 	$(top_srcdir)/gnulib-m4/time_h.m4 \
 	$(top_srcdir)/gnulib-m4/tls.m4 \
 	$(top_srcdir)/gnulib-m4/tmpdir.m4 \
-	$(top_srcdir)/gnulib-m4/ungetc.m4 \
 	$(top_srcdir)/gnulib-m4/unionwait.m4 \
 	$(top_srcdir)/gnulib-m4/unistd-safer.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -280,26 +208,24 @@
 	$(top_srcdir)/gnulib-m4/vasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/vsnprintf.m4 \
 	$(top_srcdir)/gnulib-m4/wait-process.m4 \
-	$(top_srcdir)/gnulib-m4/waitpid.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
-	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/write.m4 \
 	$(top_srcdir)/gnulib-m4/xvasprintf.m4 \
 	$(top_srcdir)/gnulib-m4/yield.m4 \
 	$(top_srcdir)/../m4/fixautomake.m4 \
+	$(top_srcdir)/../m4/init-package-version.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
 	$(top_srcdir)/../m4/ltoptions.m4 \
 	$(top_srcdir)/../m4/ltsugar.m4 \
 	$(top_srcdir)/../m4/ltversion.m4 \
 	$(top_srcdir)/../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../m4/woe32-dll.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
-	$(top_srcdir)/../gettext-runtime/m4/extern-inline.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
@@ -333,7 +259,7 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = init-env
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_cake_OBJECTS = plural-1-prg.$(OBJEXT) setlocale.$(OBJEXT)
@@ -341,10 +267,9 @@
 am__DEPENDENCIES_1 =
 cake_DEPENDENCIES = ../gnulib-lib/libgettextlib.la \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 am_fc3_OBJECTS = format-c-3-prg.$(OBJEXT) setlocale.$(OBJEXT)
 fc3_OBJECTS = $(am_fc3_OBJECTS)
 fc3_DEPENDENCIES = ../gnulib-lib/libgettextlib.la \
@@ -387,11 +312,6 @@
 gettext_8_prg_OBJECTS = $(am_gettext_8_prg_OBJECTS)
 gettext_8_prg_DEPENDENCIES = ../gnulib-lib/libgettextlib.la \
 	$(am__DEPENDENCIES_1)
-am_gettextpo_1_prg_OBJECTS =  \
-	gettextpo_1_prg-gettextpo-1-prg.$(OBJEXT)
-gettextpo_1_prg_OBJECTS = $(am_gettextpo_1_prg_OBJECTS)
-gettextpo_1_prg_DEPENDENCIES = ../libgettextpo/libgettextpo.la \
-	$(am__DEPENDENCIES_1)
 am_testlocale_OBJECTS = testlocale.$(OBJEXT)
 testlocale_OBJECTS = $(am_testlocale_OBJECTS)
 testlocale_LDADD = $(LDADD)
@@ -412,18 +332,6 @@
 tstngettext_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(tstngettext_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -433,261 +341,52 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 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) $(testlocale_SOURCES) \
-	$(tstgettext_SOURCES) $(tstngettext_SOURCES)
+	$(testlocale_SOURCES) $(tstgettext_SOURCES) \
+	$(tstngettext_SOURCES)
 DIST_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) \
-	$(testlocale_SOURCES) $(tstgettext_SOURCES) \
-	$(tstngettext_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+	$(gettext_8_prg_SOURCES) $(testlocale_SOURCES) \
+	$(tstgettext_SOURCES) $(tstngettext_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
+# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
+# then this fails; a conservative approach.  Of course do not redirect
+# stdout here, just stderr.
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=; \
+test "X$(AM_COLOR_TESTS)" != Xno \
+&& test "X$$TERM" != Xdumb \
+&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
+&& { \
+  red=''; \
+  grn=''; \
+  lgn=''; \
+  blu=''; \
+  std=''; \
 }
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../build-aux/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -696,7 +395,6 @@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
-ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 AUTOCONF = @AUTOCONF@
@@ -734,7 +432,6 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXX_CHOICE = @CXX_CHOICE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -771,18 +468,17 @@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
-GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
-GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
-GNULIB_DIRFD = @GNULIB_DIRFD@
+GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
-GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
@@ -794,26 +490,16 @@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FCNTL = @GNULIB_FCNTL@
-GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
-GNULIB_FDOPEN = @GNULIB_FDOPEN@
-GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
-GNULIB_FFSL = @GNULIB_FFSL@
-GNULIB_FFSLL = @GNULIB_FFSLL@
-GNULIB_FGETC = @GNULIB_FGETC@
-GNULIB_FGETS = @GNULIB_FGETS@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
-GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
-GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
-GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -821,8 +507,6 @@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
-GNULIB_GETC = @GNULIB_GETC@
-GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
@@ -834,23 +518,18 @@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
+GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
+GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
-GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
-GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
-GNULIB_ICONV = @GNULIB_ICONV@
-GNULIB_IMAXABS = @GNULIB_IMAXABS@
-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
-GNULIB_ISATTY = @GNULIB_ISATTY@
-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
-GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -873,7 +552,6 @@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
-GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -891,18 +569,13 @@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
-GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_OPENAT = @GNULIB_OPENAT@
-GNULIB_OPENDIR = @GNULIB_OPENDIR@
-GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
-GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
-GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
 GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
 GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
 GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
@@ -927,47 +600,39 @@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
-GNULIB_PSELECT = @GNULIB_PSELECT@
-GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
-GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
-GNULIB_QSORT_R = @GNULIB_QSORT_R@
-GNULIB_RAISE = @GNULIB_RAISE@
-GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_READ = @GNULIB_READ@
-GNULIB_READDIR = @GNULIB_READDIR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RECV = @GNULIB_RECV@
+GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
-GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SCANDIR = @GNULIB_SCANDIR@
-GNULIB_SCANF = @GNULIB_SCANF@
-GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
+GNULIB_SEND = @GNULIB_SEND@
+GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
-GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
+GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
-GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
@@ -975,7 +640,6 @@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
-GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -985,21 +649,17 @@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
-GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
@@ -1011,103 +671,50 @@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
-GNULIB_VFSCANF = @GNULIB_VFSCANF@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
-GNULIB_VSCANF = @GNULIB_VSCANF@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
-GNULIB_WAITPID = @GNULIB_WAITPID@
-GNULIB_WCPCPY = @GNULIB_WCPCPY@
-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
-GNULIB_WCSCAT = @GNULIB_WCSCAT@
-GNULIB_WCSCHR = @GNULIB_WCSCHR@
-GNULIB_WCSCMP = @GNULIB_WCSCMP@
-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
-GNULIB_WCSCPY = @GNULIB_WCSCPY@
-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
-GNULIB_WCSDUP = @GNULIB_WCSDUP@
-GNULIB_WCSLEN = @GNULIB_WCSLEN@
-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-GNULIB_WCSSPN = @GNULIB_WCSSPN@
-GNULIB_WCSSTR = @GNULIB_WCSSTR@
-GNULIB_WCSTOK = @GNULIB_WCSTOK@
-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
-GNULIB_WCTOMB = @GNULIB_WCTOMB@
-GNULIB_WCTRANS = @GNULIB_WCTRANS@
-GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
-GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
-GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
-HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
-HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
-HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
-HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
-HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
-HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
-HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
-HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
-HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
-HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
-HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
-HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
-HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
-HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-HAVE_DIRENT_H = @HAVE_DIRENT_H@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
@@ -1118,11 +725,6 @@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FCNTL = @HAVE_FCNTL@
-HAVE_FDATASYNC = @HAVE_FDATASYNC@
-HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
-HAVE_FEATURES_H = @HAVE_FEATURES_H@
-HAVE_FFSL = @HAVE_FFSL@
-HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -1132,6 +734,7 @@
 HAVE_GCJ = @HAVE_GCJ@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -1144,7 +747,6 @@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
-HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1165,16 +767,16 @@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
-HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
-HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -1197,48 +799,33 @@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
-HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
-HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
-HAVE_PCLOSE = @HAVE_PCLOSE@
-HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
-HAVE_POPEN = @HAVE_POPEN@
-HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_PREAD = @HAVE_PREAD@
-HAVE_PSELECT = @HAVE_PSELECT@
-HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
-HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
-HAVE_RAISE = @HAVE_RAISE@
-HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
-HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
-HAVE_REWINDDIR = @HAVE_REWINDDIR@
 HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SCANDIR = @HAVE_SCANDIR@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCHED_H = @HAVE_SCHED_H@
-HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
-HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
-HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
 HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@@ -1261,6 +848,7 @@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@
 HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
@@ -1270,13 +858,16 @@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
+HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
@@ -1285,47 +876,16 @@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-HAVE_WCPCPY = @HAVE_WCPCPY@
-HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
-HAVE_WCSCAT = @HAVE_WCSCAT@
-HAVE_WCSCHR = @HAVE_WCSCHR@
-HAVE_WCSCMP = @HAVE_WCSCMP@
-HAVE_WCSCOLL = @HAVE_WCSCOLL@
-HAVE_WCSCPY = @HAVE_WCSCPY@
-HAVE_WCSCSPN = @HAVE_WCSCSPN@
-HAVE_WCSDUP = @HAVE_WCSDUP@
-HAVE_WCSLEN = @HAVE_WCSLEN@
-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
-HAVE_WCSNCAT = @HAVE_WCSNCAT@
-HAVE_WCSNCMP = @HAVE_WCSNCMP@
-HAVE_WCSNCPY = @HAVE_WCSNCPY@
-HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-HAVE_WCSPBRK = @HAVE_WCSPBRK@
-HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-HAVE_WCSSPN = @HAVE_WCSSPN@
-HAVE_WCSSTR = @HAVE_WCSSTR@
-HAVE_WCSTOK = @HAVE_WCSTOK@
-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
-HAVE_WCSXFRM = @HAVE_WCSXFRM@
-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
-HAVE_WMEMCHR = @HAVE_WMEMCHR@
-HAVE_WMEMCMP = @HAVE_WMEMCMP@
-HAVE_WMEMCPY = @HAVE_WMEMCPY@
-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
-HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
-HAVE__EXIT = @HAVE__EXIT@
-ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCCROCO = @INCCROCO@
 INCGLIB = @INCGLIB@
@@ -1340,8 +900,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -1381,7 +939,6 @@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
-LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -1403,8 +960,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LTNOUNDEF = @LTNOUNDEF@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_PATH = @MONO_PATH@
 MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
@@ -1412,13 +969,11 @@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
-NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
@@ -1431,21 +986,19 @@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
-NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
@@ -1458,9 +1011,9 @@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
+NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
-NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
@@ -1484,9 +1037,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -1500,12 +1051,9 @@
 RELOCATABLE_SRC_DIR = @RELOCATABLE_SRC_DIR@
 RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
-REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
-REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
-REPLACE_DIRFD = @REPLACE_DIRFD@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -1513,8 +1061,6 @@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
-REPLACE_FDOPEN = @REPLACE_FDOPEN@
-REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -1526,41 +1072,29 @@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
-REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
-REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
-REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
-REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
-REPLACE_ISATTY = @REPLACE_ISATTY@
-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
-REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
-REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
-REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
@@ -1574,27 +1108,14 @@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
-REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
-REPLACE_PSELECT = @REPLACE_PSELECT@
-REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
-REPLACE_PTSNAME = @REPLACE_PTSNAME@
-REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
-REPLACE_QSORT_R = @REPLACE_QSORT_R@
-REPLACE_RAISE = @REPLACE_RAISE@
-REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
-REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
-REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
@@ -1602,34 +1123,25 @@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
-REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
-REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
-REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
-REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
-REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
-REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1645,9 +1157,7 @@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
-REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
@@ -1667,8 +1177,6 @@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@@ -1677,8 +1185,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
-WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 WOE32 = @WOE32@
@@ -1693,7 +1199,6 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1744,6 +1249,7 @@
 lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1751,7 +1257,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1762,25 +1267,24 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests
-EXTRA_DIST = init.sh init.cfg $(TESTS) test.mo xg-c-1.ok.po \
-	mex-test2.ok mm-ko.ascii.pot mm-ko.euc-kr.po \
-	mm-ko-comp.euc-kr.po mm-viet.comp.po mm-viet.pot mm-viet.out \
-	msguniq-a.in msguniq-a.inp msguniq-a.out qttest_pl.po \
-	qttest_pl.qm qttest2_de.po qttest2_de.qm qttest2_de.ts \
-	ChangeLog.0 gettext-3-1.po gettext-3-2.po gettext-4.po \
-	gettext-5.po gettext-6-1.po gettext-6-2.po gettext-7.po \
-	gettextpo-1.de.po xgettext-1 xgettext-c-1
+EXTRA_DIST = $(TESTS) test.mo xg-c-1.ok.po mex-test2.ok \
+	mm-ko.ascii.pot mm-ko.euc-kr.po mm-ko-comp.euc-kr.po \
+	mm-viet.comp.po mm-viet.pot mm-viet.out msguniq-a.in \
+	msguniq-a.inp msguniq-a.out qttest_pl.po qttest_pl.qm \
+	qttest2_de.po qttest2_de.qm qttest2_de.ts ChangeLog.0 \
+	gettext-3-1.po gettext-3-2.po gettext-4.po gettext-5.po \
+	gettext-6-1.po gettext-6-2.po gettext-7.po
 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-16 msgattrib-17 \
 	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-15 msgcat-16 msgcat-17 msgcat-18 \
 	msgcat-properties-1 msgcat-properties-2 \
 	msgcat-stringtable-1 \
 	msgcmp-1 msgcmp-2 msgcmp-3 msgcmp-4 \
@@ -1788,27 +1292,25 @@
 	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 \
-	msgfilter-1 msgfilter-2 msgfilter-3 msgfilter-4 msgfilter-5 \
-	msgfilter-6 \
-	msgfilter-sr-latin-1 msgfilter-quote-1 \
+	msgcomm-26 msgcomm-27 \
+	msgconv-1 msgconv-2 msgconv-3 msgconv-4 msgconv-5 msgconv-6 \
+	msgen-1 msgen-2 msgen-3 \
+	msgexec-1 msgexec-2 msgexec-3 msgexec-4 \
+	msgfilter-1 msgfilter-2 msgfilter-3 msgfilter-4 \
+	msgfilter-sr-latin-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-15 msgfmt-16 msgfmt-17 \
 	msgfmt-properties-1 \
 	msgfmt-qt-1 msgfmt-qt-2 \
-	msgfmt-desktop-1 msgfmt-desktop-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 \
+	msggrep-8 msggrep-9 msggrep-10 \
+	msginit-1 msginit-2 \
 	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-23 msgmerge-24 \
 	msgmerge-compendium-1 msgmerge-compendium-2 msgmerge-compendium-3 \
 	msgmerge-compendium-4 msgmerge-compendium-5 msgmerge-compendium-6 \
 	msgmerge-properties-1 msgmerge-properties-2 \
@@ -1819,21 +1321,20 @@
 	msgunfmt-java-1 \
 	msgunfmt-properties-1 \
 	msgunfmt-tcl-1 \
-	msguniq-1 msguniq-2 msguniq-3 msguniq-4 msguniq-5 msguniq-6 msguniq-7 \
+	msguniq-1 msguniq-2 msguniq-3 msguniq-4 msguniq-5 msguniq-6 \
 	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-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \
+	xgettext-7 xgettext-8 xgettext-9 \
 	xgettext-awk-1 xgettext-awk-2 \
-	xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \
+	xgettext-c-1 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-16 xgettext-c-17 xgettext-c-18 \
 	xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
 	xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
 	xgettext-csharp-7 \
 	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 \
@@ -1847,19 +1348,12 @@
 	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-tcl-1 xgettext-tcl-2 xgettext-tcl-3 \
 	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 \
 	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 \
@@ -1873,7 +1367,6 @@
 	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 \
@@ -1884,16 +1377,11 @@
 	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 \
 	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
+	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
 
 
 # For debugging memory leaks and memory allocation bugs.
@@ -1902,8 +1390,7 @@
 #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=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
-		    abs_srcdir=$(abs_srcdir) \
-		    abs_top_srcdir=$(abs_top_srcdir) \
+		    PATH=.:../src:../../gettext-runtime/src:$(top_srcdir)/../gettext-runtime/src:$$PATH \
 		    GETTEXT="$(CHECKER) tstgettext" \
 		    NGETTEXT="$(CHECKER) tstngettext" \
 		    XGETTEXT="$(CHECKER) xgettext" \
@@ -1922,9 +1409,27 @@
 		    MSGUNFMT="$(CHECKER) msgunfmt" \
 		    MSGUNIQ="$(CHECKER) msguniq" \
 		    RECODE="$(CHECKER) recode" \
-		    CONFIG_SHELL='$(SHELL)'
+		    OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
+		    LIBTOOL='@LIBTOOL@' \
+		    CC='@CC@' CFLAGS='@CFLAGS@' \
+		    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
+		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
+		    LTLIBINTL='@LTLIBINTL@' \
+		    JAVA_CHOICE='@JAVA_CHOICE@' \
+		    BUILDJAVA='@BUILDJAVA@' \
+		    TESTJAVA='@TESTJAVA@' \
+		    CSHARP_CHOICE='@CSHARP_CHOICE@' \
+		    BUILDCSHARP='@BUILDCSHARP@' \
+		    TESTCSHARP='@TESTCSHARP@' \
+		    TESTLIBASPRINTF='@TESTLIBASPRINTF@' \
+		    GLIBC2='@GLIBC2@' \
+		    LOCALE_FR='@LOCALE_FR@' \
+		    LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+		    LOCALE_JA='@LOCALE_JA@' \
+		    host_os='@host_os@' \
+		    CONFIG_SHELL='$(SHELL)' \
+		    $(SHELL)
 
-LOG_COMPILER = $(SHELL)
 
 # Three auxiliary programs used by the tests.
 AM_CPPFLAGS = \
@@ -1970,21 +1475,10 @@
 fc4_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 fc5_SOURCES = format-c-5-prg.c
 fc5_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
-gettextpo_1_prg_SOURCES = gettextpo-1-prg.c
-# Don't add 'gnulib-lib' to the include path here.  Some header files
-# there may interfere with the ones in 'libgettextpo'.
-gettextpo_1_prg_CPPFLAGS = \
-  -I.. \
-  -I../libgettextpo -I$(top_srcdir)/libgettextpo \
-  -I../intl
-
-# Don't add more libraries here. This test must check whether libgettextpo is
-# self contained.
-gettextpo_1_prg_LDADD = ../libgettextpo/libgettextpo.la $(LDADD)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -2015,8 +1509,6 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-init-env: $(top_builddir)/config.status $(srcdir)/init-env.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -2026,60 +1518,43 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-
-cake$(EXEEXT): $(cake_OBJECTS) $(cake_DEPENDENCIES) $(EXTRA_cake_DEPENDENCIES) 
+cake$(EXEEXT): $(cake_OBJECTS) $(cake_DEPENDENCIES) 
 	@rm -f cake$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(cake_OBJECTS) $(cake_LDADD) $(LIBS)
-
-fc3$(EXEEXT): $(fc3_OBJECTS) $(fc3_DEPENDENCIES) $(EXTRA_fc3_DEPENDENCIES) 
+fc3$(EXEEXT): $(fc3_OBJECTS) $(fc3_DEPENDENCIES) 
 	@rm -f fc3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(fc3_OBJECTS) $(fc3_LDADD) $(LIBS)
-
-fc4$(EXEEXT): $(fc4_OBJECTS) $(fc4_DEPENDENCIES) $(EXTRA_fc4_DEPENDENCIES) 
+fc4$(EXEEXT): $(fc4_OBJECTS) $(fc4_DEPENDENCIES) 
 	@rm -f fc4$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(fc4_OBJECTS) $(fc4_LDADD) $(LIBS)
-
-fc5$(EXEEXT): $(fc5_OBJECTS) $(fc5_DEPENDENCIES) $(EXTRA_fc5_DEPENDENCIES) 
+fc5$(EXEEXT): $(fc5_OBJECTS) $(fc5_DEPENDENCIES) 
 	@rm -f fc5$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(fc5_OBJECTS) $(fc5_LDADD) $(LIBS)
-
-gettext-3-prg$(EXEEXT): $(gettext_3_prg_OBJECTS) $(gettext_3_prg_DEPENDENCIES) $(EXTRA_gettext_3_prg_DEPENDENCIES) 
+gettext-3-prg$(EXEEXT): $(gettext_3_prg_OBJECTS) $(gettext_3_prg_DEPENDENCIES) 
 	@rm -f gettext-3-prg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gettext_3_prg_OBJECTS) $(gettext_3_prg_LDADD) $(LIBS)
-
-gettext-4-prg$(EXEEXT): $(gettext_4_prg_OBJECTS) $(gettext_4_prg_DEPENDENCIES) $(EXTRA_gettext_4_prg_DEPENDENCIES) 
+gettext-4-prg$(EXEEXT): $(gettext_4_prg_OBJECTS) $(gettext_4_prg_DEPENDENCIES) 
 	@rm -f gettext-4-prg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gettext_4_prg_OBJECTS) $(gettext_4_prg_LDADD) $(LIBS)
-
-gettext-5-prg$(EXEEXT): $(gettext_5_prg_OBJECTS) $(gettext_5_prg_DEPENDENCIES) $(EXTRA_gettext_5_prg_DEPENDENCIES) 
+gettext-5-prg$(EXEEXT): $(gettext_5_prg_OBJECTS) $(gettext_5_prg_DEPENDENCIES) 
 	@rm -f gettext-5-prg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gettext_5_prg_OBJECTS) $(gettext_5_prg_LDADD) $(LIBS)
-
-gettext-6-prg$(EXEEXT): $(gettext_6_prg_OBJECTS) $(gettext_6_prg_DEPENDENCIES) $(EXTRA_gettext_6_prg_DEPENDENCIES) 
+gettext-6-prg$(EXEEXT): $(gettext_6_prg_OBJECTS) $(gettext_6_prg_DEPENDENCIES) 
 	@rm -f gettext-6-prg$(EXEEXT)
 	$(AM_V_CCLD)$(gettext_6_prg_LINK) $(gettext_6_prg_OBJECTS) $(gettext_6_prg_LDADD) $(LIBS)
-
-gettext-7-prg$(EXEEXT): $(gettext_7_prg_OBJECTS) $(gettext_7_prg_DEPENDENCIES) $(EXTRA_gettext_7_prg_DEPENDENCIES) 
+gettext-7-prg$(EXEEXT): $(gettext_7_prg_OBJECTS) $(gettext_7_prg_DEPENDENCIES) 
 	@rm -f gettext-7-prg$(EXEEXT)
 	$(AM_V_CCLD)$(gettext_7_prg_LINK) $(gettext_7_prg_OBJECTS) $(gettext_7_prg_LDADD) $(LIBS)
-
-gettext-8-prg$(EXEEXT): $(gettext_8_prg_OBJECTS) $(gettext_8_prg_DEPENDENCIES) $(EXTRA_gettext_8_prg_DEPENDENCIES) 
+gettext-8-prg$(EXEEXT): $(gettext_8_prg_OBJECTS) $(gettext_8_prg_DEPENDENCIES) 
 	@rm -f gettext-8-prg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gettext_8_prg_OBJECTS) $(gettext_8_prg_LDADD) $(LIBS)
-
-gettextpo-1-prg$(EXEEXT): $(gettextpo_1_prg_OBJECTS) $(gettextpo_1_prg_DEPENDENCIES) $(EXTRA_gettextpo_1_prg_DEPENDENCIES) 
-	@rm -f gettextpo-1-prg$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gettextpo_1_prg_OBJECTS) $(gettextpo_1_prg_LDADD) $(LIBS)
-
-testlocale$(EXEEXT): $(testlocale_OBJECTS) $(testlocale_DEPENDENCIES) $(EXTRA_testlocale_DEPENDENCIES) 
+testlocale$(EXEEXT): $(testlocale_OBJECTS) $(testlocale_DEPENDENCIES) 
 	@rm -f testlocale$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(testlocale_OBJECTS) $(testlocale_LDADD) $(LIBS)
-
-tstgettext$(EXEEXT): $(tstgettext_OBJECTS) $(tstgettext_DEPENDENCIES) $(EXTRA_tstgettext_DEPENDENCIES) 
+tstgettext$(EXEEXT): $(tstgettext_OBJECTS) $(tstgettext_DEPENDENCIES) 
 	@rm -f tstgettext$(EXEEXT)
 	$(AM_V_CCLD)$(tstgettext_LINK) $(tstgettext_OBJECTS) $(tstgettext_LDADD) $(LIBS)
-
-tstngettext$(EXEEXT): $(tstngettext_OBJECTS) $(tstngettext_DEPENDENCIES) $(EXTRA_tstngettext_DEPENDENCIES) 
+tstngettext$(EXEEXT): $(tstngettext_OBJECTS) $(tstngettext_DEPENDENCIES) 
 	@rm -f tstngettext$(EXEEXT)
 	$(AM_V_CCLD)$(tstngettext_LINK) $(tstngettext_OBJECTS) $(tstngettext_LDADD) $(LIBS)
 
@@ -2090,55 +1565,64 @@
 	-rm -f *.tab.c
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(LTCOMPILE) -c -o $@ $<
 
 gettext_6_prg-gettext-6-prg.o: gettext-6-prg.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_6_prg_CFLAGS) $(CFLAGS) -c -o gettext_6_prg-gettext-6-prg.o `test -f 'gettext-6-prg.c' || echo '$(srcdir)/'`gettext-6-prg.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_6_prg_CFLAGS) $(CFLAGS) -c -o gettext_6_prg-gettext-6-prg.o `test -f 'gettext-6-prg.c' || echo '$(srcdir)/'`gettext-6-prg.c
 
 gettext_6_prg-gettext-6-prg.obj: gettext-6-prg.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_6_prg_CFLAGS) $(CFLAGS) -c -o gettext_6_prg-gettext-6-prg.obj `if test -f 'gettext-6-prg.c'; then $(CYGPATH_W) 'gettext-6-prg.c'; else $(CYGPATH_W) '$(srcdir)/gettext-6-prg.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_6_prg_CFLAGS) $(CFLAGS) -c -o gettext_6_prg-gettext-6-prg.obj `if test -f 'gettext-6-prg.c'; then $(CYGPATH_W) 'gettext-6-prg.c'; else $(CYGPATH_W) '$(srcdir)/gettext-6-prg.c'; fi`
 
 gettext_7_prg-gettext-7-prg.o: gettext-7-prg.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_7_prg_CFLAGS) $(CFLAGS) -c -o gettext_7_prg-gettext-7-prg.o `test -f 'gettext-7-prg.c' || echo '$(srcdir)/'`gettext-7-prg.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_7_prg_CFLAGS) $(CFLAGS) -c -o gettext_7_prg-gettext-7-prg.o `test -f 'gettext-7-prg.c' || echo '$(srcdir)/'`gettext-7-prg.c
 
 gettext_7_prg-gettext-7-prg.obj: gettext-7-prg.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_7_prg_CFLAGS) $(CFLAGS) -c -o gettext_7_prg-gettext-7-prg.obj `if test -f 'gettext-7-prg.c'; then $(CYGPATH_W) 'gettext-7-prg.c'; else $(CYGPATH_W) '$(srcdir)/gettext-7-prg.c'; fi`
-
-gettextpo_1_prg-gettextpo-1-prg.o: 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.o `test -f 'gettextpo-1-prg.c' || echo '$(srcdir)/'`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`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gettext_7_prg_CFLAGS) $(CFLAGS) -c -o gettext_7_prg-gettext-7-prg.obj `if test -f 'gettext-7-prg.c'; then $(CYGPATH_W) 'gettext-7-prg.c'; else $(CYGPATH_W) '$(srcdir)/gettext-7-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
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-tstgettext.o `test -f 'tstgettext.c' || echo '$(srcdir)/'`tstgettext.c
 
 tstgettext-tstgettext.obj: tstgettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-tstgettext.obj `if test -f 'tstgettext.c'; then $(CYGPATH_W) 'tstgettext.c'; else $(CYGPATH_W) '$(srcdir)/tstgettext.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-tstgettext.obj `if test -f 'tstgettext.c'; then $(CYGPATH_W) 'tstgettext.c'; else $(CYGPATH_W) '$(srcdir)/tstgettext.c'; fi`
 
 tstgettext-setlocale.o: setlocale.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-setlocale.o `test -f 'setlocale.c' || echo '$(srcdir)/'`setlocale.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-setlocale.o `test -f 'setlocale.c' || echo '$(srcdir)/'`setlocale.c
 
 tstgettext-setlocale.obj: setlocale.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-setlocale.obj `if test -f 'setlocale.c'; then $(CYGPATH_W) 'setlocale.c'; else $(CYGPATH_W) '$(srcdir)/setlocale.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-setlocale.obj `if test -f 'setlocale.c'; then $(CYGPATH_W) 'setlocale.c'; else $(CYGPATH_W) '$(srcdir)/setlocale.c'; fi`
 
 tstngettext-tstngettext.o: tstngettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-tstngettext.o `test -f 'tstngettext.c' || echo '$(srcdir)/'`tstngettext.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-tstngettext.o `test -f 'tstngettext.c' || echo '$(srcdir)/'`tstngettext.c
 
 tstngettext-tstngettext.obj: tstngettext.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-tstngettext.obj `if test -f 'tstngettext.c'; then $(CYGPATH_W) 'tstngettext.c'; else $(CYGPATH_W) '$(srcdir)/tstngettext.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-tstngettext.obj `if test -f 'tstngettext.c'; then $(CYGPATH_W) 'tstngettext.c'; else $(CYGPATH_W) '$(srcdir)/tstngettext.c'; fi`
 
 tstngettext-setlocale.o: setlocale.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-setlocale.o `test -f 'setlocale.c' || echo '$(srcdir)/'`setlocale.c
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-setlocale.o `test -f 'setlocale.c' || echo '$(srcdir)/'`setlocale.c
 
 tstngettext-setlocale.obj: setlocale.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-setlocale.obj `if test -f 'setlocale.c'; then $(CYGPATH_W) 'setlocale.c'; else $(CYGPATH_W) '$(srcdir)/setlocale.c'; fi`
+	$(AM_V_CC) @AM_BACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstngettext_CFLAGS) $(CFLAGS) -c -o tstngettext-setlocale.obj `if test -f 'setlocale.c'; then $(CYGPATH_W) 'setlocale.c'; else $(CYGPATH_W) '$(srcdir)/setlocale.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -2146,15 +1630,26 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -2166,11 +1661,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -2179,2917 +1678,101 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
 	    else \
-	      color_start= color_end=; \
+	      skipped="($$skip tests were not run)"; \
 	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS:
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-gettext-1.log: gettext-1
-	@p='gettext-1'; \
-	b='gettext-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-gettext-2.log: gettext-2
-	@p='gettext-2'; \
-	b='gettext-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)
-gettext-3.log: gettext-3
-	@p='gettext-3'; \
-	b='gettext-3'; \
-	$(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)
-gettext-4.log: gettext-4
-	@p='gettext-4'; \
-	b='gettext-4'; \
-	$(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)
-gettext-5.log: gettext-5
-	@p='gettext-5'; \
-	b='gettext-5'; \
-	$(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)
-gettext-6.log: gettext-6
-	@p='gettext-6'; \
-	b='gettext-6'; \
-	$(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)
-gettext-7.log: gettext-7
-	@p='gettext-7'; \
-	b='gettext-7'; \
-	$(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)
-gettext-8.log: gettext-8
-	@p='gettext-8'; \
-	b='gettext-8'; \
-	$(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)
-msgattrib-1.log: msgattrib-1
-	@p='msgattrib-1'; \
-	b='msgattrib-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgattrib-2.log: msgattrib-2
-	@p='msgattrib-2'; \
-	b='msgattrib-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)
-msgattrib-3.log: msgattrib-3
-	@p='msgattrib-3'; \
-	b='msgattrib-3'; \
-	$(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)
-msgattrib-4.log: msgattrib-4
-	@p='msgattrib-4'; \
-	b='msgattrib-4'; \
-	$(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)
-msgattrib-5.log: msgattrib-5
-	@p='msgattrib-5'; \
-	b='msgattrib-5'; \
-	$(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)
-msgattrib-6.log: msgattrib-6
-	@p='msgattrib-6'; \
-	b='msgattrib-6'; \
-	$(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)
-msgattrib-7.log: msgattrib-7
-	@p='msgattrib-7'; \
-	b='msgattrib-7'; \
-	$(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)
-msgattrib-8.log: msgattrib-8
-	@p='msgattrib-8'; \
-	b='msgattrib-8'; \
-	$(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)
-msgattrib-9.log: msgattrib-9
-	@p='msgattrib-9'; \
-	b='msgattrib-9'; \
-	$(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)
-msgattrib-10.log: msgattrib-10
-	@p='msgattrib-10'; \
-	b='msgattrib-10'; \
-	$(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)
-msgattrib-11.log: msgattrib-11
-	@p='msgattrib-11'; \
-	b='msgattrib-11'; \
-	$(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)
-msgattrib-12.log: msgattrib-12
-	@p='msgattrib-12'; \
-	b='msgattrib-12'; \
-	$(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)
-msgattrib-13.log: msgattrib-13
-	@p='msgattrib-13'; \
-	b='msgattrib-13'; \
-	$(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)
-msgattrib-14.log: msgattrib-14
-	@p='msgattrib-14'; \
-	b='msgattrib-14'; \
-	$(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)
-msgattrib-15.log: msgattrib-15
-	@p='msgattrib-15'; \
-	b='msgattrib-15'; \
-	$(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)
-msgattrib-16.log: msgattrib-16
-	@p='msgattrib-16'; \
-	b='msgattrib-16'; \
-	$(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)
-msgattrib-17.log: msgattrib-17
-	@p='msgattrib-17'; \
-	b='msgattrib-17'; \
-	$(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)
-msgattrib-18.log: msgattrib-18
-	@p='msgattrib-18'; \
-	b='msgattrib-18'; \
-	$(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)
-msgattrib-19.log: msgattrib-19
-	@p='msgattrib-19'; \
-	b='msgattrib-19'; \
-	$(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)
-msgattrib-properties-1.log: msgattrib-properties-1
-	@p='msgattrib-properties-1'; \
-	b='msgattrib-properties-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgcat-1.log: msgcat-1
-	@p='msgcat-1'; \
-	b='msgcat-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgcat-2.log: msgcat-2
-	@p='msgcat-2'; \
-	b='msgcat-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)
-msgcat-3.log: msgcat-3
-	@p='msgcat-3'; \
-	b='msgcat-3'; \
-	$(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)
-msgcat-4.log: msgcat-4
-	@p='msgcat-4'; \
-	b='msgcat-4'; \
-	$(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)
-msgcat-5.log: msgcat-5
-	@p='msgcat-5'; \
-	b='msgcat-5'; \
-	$(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)
-msgcat-6.log: msgcat-6
-	@p='msgcat-6'; \
-	b='msgcat-6'; \
-	$(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)
-msgcat-7.log: msgcat-7
-	@p='msgcat-7'; \
-	b='msgcat-7'; \
-	$(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)
-msgcat-8.log: msgcat-8
-	@p='msgcat-8'; \
-	b='msgcat-8'; \
-	$(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)
-msgcat-9.log: msgcat-9
-	@p='msgcat-9'; \
-	b='msgcat-9'; \
-	$(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)
-msgcat-10.log: msgcat-10
-	@p='msgcat-10'; \
-	b='msgcat-10'; \
-	$(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)
-msgcat-11.log: msgcat-11
-	@p='msgcat-11'; \
-	b='msgcat-11'; \
-	$(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)
-msgcat-12.log: msgcat-12
-	@p='msgcat-12'; \
-	b='msgcat-12'; \
-	$(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)
-msgcat-13.log: msgcat-13
-	@p='msgcat-13'; \
-	b='msgcat-13'; \
-	$(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)
-msgcat-14.log: msgcat-14
-	@p='msgcat-14'; \
-	b='msgcat-14'; \
-	$(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)
-msgcat-15.log: msgcat-15
-	@p='msgcat-15'; \
-	b='msgcat-15'; \
-	$(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)
-msgcat-16.log: msgcat-16
-	@p='msgcat-16'; \
-	b='msgcat-16'; \
-	$(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)
-msgcat-17.log: msgcat-17
-	@p='msgcat-17'; \
-	b='msgcat-17'; \
-	$(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)
-msgcat-18.log: msgcat-18
-	@p='msgcat-18'; \
-	b='msgcat-18'; \
-	$(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)
-msgcat-19.log: msgcat-19
-	@p='msgcat-19'; \
-	b='msgcat-19'; \
-	$(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)
-msgcat-properties-1.log: msgcat-properties-1
-	@p='msgcat-properties-1'; \
-	b='msgcat-properties-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgcat-properties-2.log: msgcat-properties-2
-	@p='msgcat-properties-2'; \
-	b='msgcat-properties-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)
-msgcat-stringtable-1.log: msgcat-stringtable-1
-	@p='msgcat-stringtable-1'; \
-	b='msgcat-stringtable-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgcmp-1.log: msgcmp-1
-	@p='msgcmp-1'; \
-	b='msgcmp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgcmp-2.log: msgcmp-2
-	@p='msgcmp-2'; \
-	b='msgcmp-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)
-msgcmp-3.log: msgcmp-3
-	@p='msgcmp-3'; \
-	b='msgcmp-3'; \
-	$(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)
-msgcmp-4.log: msgcmp-4
-	@p='msgcmp-4'; \
-	b='msgcmp-4'; \
-	$(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)
-msgcomm-1.log: msgcomm-1
-	@p='msgcomm-1'; \
-	b='msgcomm-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgcomm-2.log: msgcomm-2
-	@p='msgcomm-2'; \
-	b='msgcomm-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)
-msgcomm-3.log: msgcomm-3
-	@p='msgcomm-3'; \
-	b='msgcomm-3'; \
-	$(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)
-msgcomm-4.log: msgcomm-4
-	@p='msgcomm-4'; \
-	b='msgcomm-4'; \
-	$(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)
-msgcomm-5.log: msgcomm-5
-	@p='msgcomm-5'; \
-	b='msgcomm-5'; \
-	$(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)
-msgcomm-6.log: msgcomm-6
-	@p='msgcomm-6'; \
-	b='msgcomm-6'; \
-	$(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)
-msgcomm-7.log: msgcomm-7
-	@p='msgcomm-7'; \
-	b='msgcomm-7'; \
-	$(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)
-msgcomm-8.log: msgcomm-8
-	@p='msgcomm-8'; \
-	b='msgcomm-8'; \
-	$(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)
-msgcomm-9.log: msgcomm-9
-	@p='msgcomm-9'; \
-	b='msgcomm-9'; \
-	$(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)
-msgcomm-10.log: msgcomm-10
-	@p='msgcomm-10'; \
-	b='msgcomm-10'; \
-	$(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)
-msgcomm-11.log: msgcomm-11
-	@p='msgcomm-11'; \
-	b='msgcomm-11'; \
-	$(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)
-msgcomm-12.log: msgcomm-12
-	@p='msgcomm-12'; \
-	b='msgcomm-12'; \
-	$(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)
-msgcomm-13.log: msgcomm-13
-	@p='msgcomm-13'; \
-	b='msgcomm-13'; \
-	$(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)
-msgcomm-14.log: msgcomm-14
-	@p='msgcomm-14'; \
-	b='msgcomm-14'; \
-	$(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)
-msgcomm-15.log: msgcomm-15
-	@p='msgcomm-15'; \
-	b='msgcomm-15'; \
-	$(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)
-msgcomm-16.log: msgcomm-16
-	@p='msgcomm-16'; \
-	b='msgcomm-16'; \
-	$(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)
-msgcomm-17.log: msgcomm-17
-	@p='msgcomm-17'; \
-	b='msgcomm-17'; \
-	$(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)
-msgcomm-18.log: msgcomm-18
-	@p='msgcomm-18'; \
-	b='msgcomm-18'; \
-	$(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)
-msgcomm-19.log: msgcomm-19
-	@p='msgcomm-19'; \
-	b='msgcomm-19'; \
-	$(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)
-msgcomm-20.log: msgcomm-20
-	@p='msgcomm-20'; \
-	b='msgcomm-20'; \
-	$(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)
-msgcomm-21.log: msgcomm-21
-	@p='msgcomm-21'; \
-	b='msgcomm-21'; \
-	$(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)
-msgcomm-22.log: msgcomm-22
-	@p='msgcomm-22'; \
-	b='msgcomm-22'; \
-	$(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)
-msgcomm-23.log: msgcomm-23
-	@p='msgcomm-23'; \
-	b='msgcomm-23'; \
-	$(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)
-msgcomm-24.log: msgcomm-24
-	@p='msgcomm-24'; \
-	b='msgcomm-24'; \
-	$(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)
-msgcomm-25.log: msgcomm-25
-	@p='msgcomm-25'; \
-	b='msgcomm-25'; \
-	$(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)
-msgcomm-26.log: msgcomm-26
-	@p='msgcomm-26'; \
-	b='msgcomm-26'; \
-	$(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)
-msgcomm-27.log: msgcomm-27
-	@p='msgcomm-27'; \
-	b='msgcomm-27'; \
-	$(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)
-msgcomm-28.log: msgcomm-28
-	@p='msgcomm-28'; \
-	b='msgcomm-28'; \
-	$(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)
-msgconv-1.log: msgconv-1
-	@p='msgconv-1'; \
-	b='msgconv-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgconv-2.log: msgconv-2
-	@p='msgconv-2'; \
-	b='msgconv-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)
-msgconv-3.log: msgconv-3
-	@p='msgconv-3'; \
-	b='msgconv-3'; \
-	$(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)
-msgconv-4.log: msgconv-4
-	@p='msgconv-4'; \
-	b='msgconv-4'; \
-	$(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)
-msgconv-5.log: msgconv-5
-	@p='msgconv-5'; \
-	b='msgconv-5'; \
-	$(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)
-msgconv-6.log: msgconv-6
-	@p='msgconv-6'; \
-	b='msgconv-6'; \
-	$(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)
-msgconv-7.log: msgconv-7
-	@p='msgconv-7'; \
-	b='msgconv-7'; \
-	$(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)
-msgen-1.log: msgen-1
-	@p='msgen-1'; \
-	b='msgen-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgen-2.log: msgen-2
-	@p='msgen-2'; \
-	b='msgen-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)
-msgen-3.log: msgen-3
-	@p='msgen-3'; \
-	b='msgen-3'; \
-	$(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)
-msgen-4.log: msgen-4
-	@p='msgen-4'; \
-	b='msgen-4'; \
-	$(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)
-msgexec-1.log: msgexec-1
-	@p='msgexec-1'; \
-	b='msgexec-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgexec-2.log: msgexec-2
-	@p='msgexec-2'; \
-	b='msgexec-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)
-msgexec-3.log: msgexec-3
-	@p='msgexec-3'; \
-	b='msgexec-3'; \
-	$(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)
-msgexec-4.log: msgexec-4
-	@p='msgexec-4'; \
-	b='msgexec-4'; \
-	$(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)
-msgexec-5.log: msgexec-5
-	@p='msgexec-5'; \
-	b='msgexec-5'; \
-	$(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)
-msgfilter-1.log: msgfilter-1
-	@p='msgfilter-1'; \
-	b='msgfilter-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfilter-2.log: msgfilter-2
-	@p='msgfilter-2'; \
-	b='msgfilter-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)
-msgfilter-3.log: msgfilter-3
-	@p='msgfilter-3'; \
-	b='msgfilter-3'; \
-	$(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)
-msgfilter-4.log: msgfilter-4
-	@p='msgfilter-4'; \
-	b='msgfilter-4'; \
-	$(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)
-msgfilter-5.log: msgfilter-5
-	@p='msgfilter-5'; \
-	b='msgfilter-5'; \
-	$(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)
-msgfilter-6.log: msgfilter-6
-	@p='msgfilter-6'; \
-	b='msgfilter-6'; \
-	$(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)
-msgfilter-sr-latin-1.log: msgfilter-sr-latin-1
-	@p='msgfilter-sr-latin-1'; \
-	b='msgfilter-sr-latin-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfilter-quote-1.log: msgfilter-quote-1
-	@p='msgfilter-quote-1'; \
-	b='msgfilter-quote-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfmt-1.log: msgfmt-1
-	@p='msgfmt-1'; \
-	b='msgfmt-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfmt-2.log: msgfmt-2
-	@p='msgfmt-2'; \
-	b='msgfmt-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)
-msgfmt-3.log: msgfmt-3
-	@p='msgfmt-3'; \
-	b='msgfmt-3'; \
-	$(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)
-msgfmt-4.log: msgfmt-4
-	@p='msgfmt-4'; \
-	b='msgfmt-4'; \
-	$(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)
-msgfmt-5.log: msgfmt-5
-	@p='msgfmt-5'; \
-	b='msgfmt-5'; \
-	$(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)
-msgfmt-6.log: msgfmt-6
-	@p='msgfmt-6'; \
-	b='msgfmt-6'; \
-	$(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)
-msgfmt-7.log: msgfmt-7
-	@p='msgfmt-7'; \
-	b='msgfmt-7'; \
-	$(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)
-msgfmt-8.log: msgfmt-8
-	@p='msgfmt-8'; \
-	b='msgfmt-8'; \
-	$(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)
-msgfmt-9.log: msgfmt-9
-	@p='msgfmt-9'; \
-	b='msgfmt-9'; \
-	$(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)
-msgfmt-10.log: msgfmt-10
-	@p='msgfmt-10'; \
-	b='msgfmt-10'; \
-	$(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)
-msgfmt-11.log: msgfmt-11
-	@p='msgfmt-11'; \
-	b='msgfmt-11'; \
-	$(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)
-msgfmt-12.log: msgfmt-12
-	@p='msgfmt-12'; \
-	b='msgfmt-12'; \
-	$(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)
-msgfmt-13.log: msgfmt-13
-	@p='msgfmt-13'; \
-	b='msgfmt-13'; \
-	$(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)
-msgfmt-14.log: msgfmt-14
-	@p='msgfmt-14'; \
-	b='msgfmt-14'; \
-	$(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)
-msgfmt-15.log: msgfmt-15
-	@p='msgfmt-15'; \
-	b='msgfmt-15'; \
-	$(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)
-msgfmt-16.log: msgfmt-16
-	@p='msgfmt-16'; \
-	b='msgfmt-16'; \
-	$(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)
-msgfmt-17.log: msgfmt-17
-	@p='msgfmt-17'; \
-	b='msgfmt-17'; \
-	$(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)
-msgfmt-18.log: msgfmt-18
-	@p='msgfmt-18'; \
-	b='msgfmt-18'; \
-	$(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)
-msgfmt-properties-1.log: msgfmt-properties-1
-	@p='msgfmt-properties-1'; \
-	b='msgfmt-properties-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfmt-qt-1.log: msgfmt-qt-1
-	@p='msgfmt-qt-1'; \
-	b='msgfmt-qt-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfmt-qt-2.log: msgfmt-qt-2
-	@p='msgfmt-qt-2'; \
-	b='msgfmt-qt-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)
-msgfmt-desktop-1.log: msgfmt-desktop-1
-	@p='msgfmt-desktop-1'; \
-	b='msgfmt-desktop-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgfmt-desktop-2.log: msgfmt-desktop-2
-	@p='msgfmt-desktop-2'; \
-	b='msgfmt-desktop-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)
-msggrep-1.log: msggrep-1
-	@p='msggrep-1'; \
-	b='msggrep-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msggrep-2.log: msggrep-2
-	@p='msggrep-2'; \
-	b='msggrep-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)
-msggrep-3.log: msggrep-3
-	@p='msggrep-3'; \
-	b='msggrep-3'; \
-	$(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)
-msggrep-4.log: msggrep-4
-	@p='msggrep-4'; \
-	b='msggrep-4'; \
-	$(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)
-msggrep-5.log: msggrep-5
-	@p='msggrep-5'; \
-	b='msggrep-5'; \
-	$(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)
-msggrep-6.log: msggrep-6
-	@p='msggrep-6'; \
-	b='msggrep-6'; \
-	$(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)
-msggrep-7.log: msggrep-7
-	@p='msggrep-7'; \
-	b='msggrep-7'; \
-	$(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)
-msggrep-8.log: msggrep-8
-	@p='msggrep-8'; \
-	b='msggrep-8'; \
-	$(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)
-msggrep-9.log: msggrep-9
-	@p='msggrep-9'; \
-	b='msggrep-9'; \
-	$(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)
-msggrep-10.log: msggrep-10
-	@p='msggrep-10'; \
-	b='msggrep-10'; \
-	$(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)
-msggrep-11.log: msggrep-11
-	@p='msggrep-11'; \
-	b='msggrep-11'; \
-	$(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)
-msginit-1.log: msginit-1
-	@p='msginit-1'; \
-	b='msginit-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msginit-2.log: msginit-2
-	@p='msginit-2'; \
-	b='msginit-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)
-msginit-3.log: msginit-3
-	@p='msginit-3'; \
-	b='msginit-3'; \
-	$(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)
-msgmerge-1.log: msgmerge-1
-	@p='msgmerge-1'; \
-	b='msgmerge-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgmerge-2.log: msgmerge-2
-	@p='msgmerge-2'; \
-	b='msgmerge-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)
-msgmerge-3.log: msgmerge-3
-	@p='msgmerge-3'; \
-	b='msgmerge-3'; \
-	$(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)
-msgmerge-4.log: msgmerge-4
-	@p='msgmerge-4'; \
-	b='msgmerge-4'; \
-	$(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)
-msgmerge-5.log: msgmerge-5
-	@p='msgmerge-5'; \
-	b='msgmerge-5'; \
-	$(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)
-msgmerge-6.log: msgmerge-6
-	@p='msgmerge-6'; \
-	b='msgmerge-6'; \
-	$(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)
-msgmerge-7.log: msgmerge-7
-	@p='msgmerge-7'; \
-	b='msgmerge-7'; \
-	$(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)
-msgmerge-8.log: msgmerge-8
-	@p='msgmerge-8'; \
-	b='msgmerge-8'; \
-	$(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)
-msgmerge-9.log: msgmerge-9
-	@p='msgmerge-9'; \
-	b='msgmerge-9'; \
-	$(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)
-msgmerge-10.log: msgmerge-10
-	@p='msgmerge-10'; \
-	b='msgmerge-10'; \
-	$(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)
-msgmerge-11.log: msgmerge-11
-	@p='msgmerge-11'; \
-	b='msgmerge-11'; \
-	$(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)
-msgmerge-12.log: msgmerge-12
-	@p='msgmerge-12'; \
-	b='msgmerge-12'; \
-	$(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)
-msgmerge-13.log: msgmerge-13
-	@p='msgmerge-13'; \
-	b='msgmerge-13'; \
-	$(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)
-msgmerge-14.log: msgmerge-14
-	@p='msgmerge-14'; \
-	b='msgmerge-14'; \
-	$(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)
-msgmerge-15.log: msgmerge-15
-	@p='msgmerge-15'; \
-	b='msgmerge-15'; \
-	$(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)
-msgmerge-16.log: msgmerge-16
-	@p='msgmerge-16'; \
-	b='msgmerge-16'; \
-	$(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)
-msgmerge-17.log: msgmerge-17
-	@p='msgmerge-17'; \
-	b='msgmerge-17'; \
-	$(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)
-msgmerge-18.log: msgmerge-18
-	@p='msgmerge-18'; \
-	b='msgmerge-18'; \
-	$(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)
-msgmerge-19.log: msgmerge-19
-	@p='msgmerge-19'; \
-	b='msgmerge-19'; \
-	$(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)
-msgmerge-20.log: msgmerge-20
-	@p='msgmerge-20'; \
-	b='msgmerge-20'; \
-	$(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)
-msgmerge-21.log: msgmerge-21
-	@p='msgmerge-21'; \
-	b='msgmerge-21'; \
-	$(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)
-msgmerge-22.log: msgmerge-22
-	@p='msgmerge-22'; \
-	b='msgmerge-22'; \
-	$(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)
-msgmerge-23.log: msgmerge-23
-	@p='msgmerge-23'; \
-	b='msgmerge-23'; \
-	$(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)
-msgmerge-24.log: msgmerge-24
-	@p='msgmerge-24'; \
-	b='msgmerge-24'; \
-	$(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)
-msgmerge-25.log: msgmerge-25
-	@p='msgmerge-25'; \
-	b='msgmerge-25'; \
-	$(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)
-msgmerge-compendium-1.log: msgmerge-compendium-1
-	@p='msgmerge-compendium-1'; \
-	b='msgmerge-compendium-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgmerge-compendium-2.log: msgmerge-compendium-2
-	@p='msgmerge-compendium-2'; \
-	b='msgmerge-compendium-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)
-msgmerge-compendium-3.log: msgmerge-compendium-3
-	@p='msgmerge-compendium-3'; \
-	b='msgmerge-compendium-3'; \
-	$(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)
-msgmerge-compendium-4.log: msgmerge-compendium-4
-	@p='msgmerge-compendium-4'; \
-	b='msgmerge-compendium-4'; \
-	$(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)
-msgmerge-compendium-5.log: msgmerge-compendium-5
-	@p='msgmerge-compendium-5'; \
-	b='msgmerge-compendium-5'; \
-	$(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)
-msgmerge-compendium-6.log: msgmerge-compendium-6
-	@p='msgmerge-compendium-6'; \
-	b='msgmerge-compendium-6'; \
-	$(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)
-msgmerge-properties-1.log: msgmerge-properties-1
-	@p='msgmerge-properties-1'; \
-	b='msgmerge-properties-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgmerge-properties-2.log: msgmerge-properties-2
-	@p='msgmerge-properties-2'; \
-	b='msgmerge-properties-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)
-msgmerge-update-1.log: msgmerge-update-1
-	@p='msgmerge-update-1'; \
-	b='msgmerge-update-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgmerge-update-2.log: msgmerge-update-2
-	@p='msgmerge-update-2'; \
-	b='msgmerge-update-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)
-msgmerge-update-3.log: msgmerge-update-3
-	@p='msgmerge-update-3'; \
-	b='msgmerge-update-3'; \
-	$(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)
-msgmerge-update-4.log: msgmerge-update-4
-	@p='msgmerge-update-4'; \
-	b='msgmerge-update-4'; \
-	$(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)
-msgunfmt-1.log: msgunfmt-1
-	@p='msgunfmt-1'; \
-	b='msgunfmt-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgunfmt-2.log: msgunfmt-2
-	@p='msgunfmt-2'; \
-	b='msgunfmt-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)
-msgunfmt-csharp-1.log: msgunfmt-csharp-1
-	@p='msgunfmt-csharp-1'; \
-	b='msgunfmt-csharp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgunfmt-java-1.log: msgunfmt-java-1
-	@p='msgunfmt-java-1'; \
-	b='msgunfmt-java-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgunfmt-properties-1.log: msgunfmt-properties-1
-	@p='msgunfmt-properties-1'; \
-	b='msgunfmt-properties-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msgunfmt-tcl-1.log: msgunfmt-tcl-1
-	@p='msgunfmt-tcl-1'; \
-	b='msgunfmt-tcl-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msguniq-1.log: msguniq-1
-	@p='msguniq-1'; \
-	b='msguniq-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-msguniq-2.log: msguniq-2
-	@p='msguniq-2'; \
-	b='msguniq-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)
-msguniq-3.log: msguniq-3
-	@p='msguniq-3'; \
-	b='msguniq-3'; \
-	$(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)
-msguniq-4.log: msguniq-4
-	@p='msguniq-4'; \
-	b='msguniq-4'; \
-	$(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)
-msguniq-5.log: msguniq-5
-	@p='msguniq-5'; \
-	b='msguniq-5'; \
-	$(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)
-msguniq-6.log: msguniq-6
-	@p='msguniq-6'; \
-	b='msguniq-6'; \
-	$(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)
-msguniq-7.log: msguniq-7
-	@p='msguniq-7'; \
-	b='msguniq-7'; \
-	$(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)
-recode-sr-latin-1.log: recode-sr-latin-1
-	@p='recode-sr-latin-1'; \
-	b='recode-sr-latin-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-recode-sr-latin-2.log: recode-sr-latin-2
-	@p='recode-sr-latin-2'; \
-	b='recode-sr-latin-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)
-xgettext-2.log: xgettext-2
-	@p='xgettext-2'; \
-	b='xgettext-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)
-xgettext-3.log: xgettext-3
-	@p='xgettext-3'; \
-	b='xgettext-3'; \
-	$(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)
-xgettext-4.log: xgettext-4
-	@p='xgettext-4'; \
-	b='xgettext-4'; \
-	$(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)
-xgettext-5.log: xgettext-5
-	@p='xgettext-5'; \
-	b='xgettext-5'; \
-	$(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)
-xgettext-6.log: xgettext-6
-	@p='xgettext-6'; \
-	b='xgettext-6'; \
-	$(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)
-xgettext-7.log: xgettext-7
-	@p='xgettext-7'; \
-	b='xgettext-7'; \
-	$(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)
-xgettext-8.log: xgettext-8
-	@p='xgettext-8'; \
-	b='xgettext-8'; \
-	$(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)
-xgettext-9.log: xgettext-9
-	@p='xgettext-9'; \
-	b='xgettext-9'; \
-	$(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)
-xgettext-10.log: xgettext-10
-	@p='xgettext-10'; \
-	b='xgettext-10'; \
-	$(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)
-xgettext-11.log: xgettext-11
-	@p='xgettext-11'; \
-	b='xgettext-11'; \
-	$(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)
-xgettext-awk-1.log: xgettext-awk-1
-	@p='xgettext-awk-1'; \
-	b='xgettext-awk-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-awk-2.log: xgettext-awk-2
-	@p='xgettext-awk-2'; \
-	b='xgettext-awk-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)
-xgettext-c-2.log: xgettext-c-2
-	@p='xgettext-c-2'; \
-	b='xgettext-c-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)
-xgettext-c-3.log: xgettext-c-3
-	@p='xgettext-c-3'; \
-	b='xgettext-c-3'; \
-	$(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)
-xgettext-c-4.log: xgettext-c-4
-	@p='xgettext-c-4'; \
-	b='xgettext-c-4'; \
-	$(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)
-xgettext-c-5.log: xgettext-c-5
-	@p='xgettext-c-5'; \
-	b='xgettext-c-5'; \
-	$(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)
-xgettext-c-6.log: xgettext-c-6
-	@p='xgettext-c-6'; \
-	b='xgettext-c-6'; \
-	$(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)
-xgettext-c-7.log: xgettext-c-7
-	@p='xgettext-c-7'; \
-	b='xgettext-c-7'; \
-	$(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)
-xgettext-c-8.log: xgettext-c-8
-	@p='xgettext-c-8'; \
-	b='xgettext-c-8'; \
-	$(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)
-xgettext-c-9.log: xgettext-c-9
-	@p='xgettext-c-9'; \
-	b='xgettext-c-9'; \
-	$(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)
-xgettext-c-10.log: xgettext-c-10
-	@p='xgettext-c-10'; \
-	b='xgettext-c-10'; \
-	$(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)
-xgettext-c-11.log: xgettext-c-11
-	@p='xgettext-c-11'; \
-	b='xgettext-c-11'; \
-	$(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)
-xgettext-c-12.log: xgettext-c-12
-	@p='xgettext-c-12'; \
-	b='xgettext-c-12'; \
-	$(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)
-xgettext-c-13.log: xgettext-c-13
-	@p='xgettext-c-13'; \
-	b='xgettext-c-13'; \
-	$(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)
-xgettext-c-14.log: xgettext-c-14
-	@p='xgettext-c-14'; \
-	b='xgettext-c-14'; \
-	$(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)
-xgettext-c-15.log: xgettext-c-15
-	@p='xgettext-c-15'; \
-	b='xgettext-c-15'; \
-	$(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)
-xgettext-c-16.log: xgettext-c-16
-	@p='xgettext-c-16'; \
-	b='xgettext-c-16'; \
-	$(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)
-xgettext-c-17.log: xgettext-c-17
-	@p='xgettext-c-17'; \
-	b='xgettext-c-17'; \
-	$(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)
-xgettext-c-18.log: xgettext-c-18
-	@p='xgettext-c-18'; \
-	b='xgettext-c-18'; \
-	$(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)
-xgettext-c-19.log: xgettext-c-19
-	@p='xgettext-c-19'; \
-	b='xgettext-c-19'; \
-	$(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)
-xgettext-csharp-1.log: xgettext-csharp-1
-	@p='xgettext-csharp-1'; \
-	b='xgettext-csharp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-csharp-2.log: xgettext-csharp-2
-	@p='xgettext-csharp-2'; \
-	b='xgettext-csharp-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)
-xgettext-csharp-3.log: xgettext-csharp-3
-	@p='xgettext-csharp-3'; \
-	b='xgettext-csharp-3'; \
-	$(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)
-xgettext-csharp-4.log: xgettext-csharp-4
-	@p='xgettext-csharp-4'; \
-	b='xgettext-csharp-4'; \
-	$(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)
-xgettext-csharp-5.log: xgettext-csharp-5
-	@p='xgettext-csharp-5'; \
-	b='xgettext-csharp-5'; \
-	$(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)
-xgettext-csharp-6.log: xgettext-csharp-6
-	@p='xgettext-csharp-6'; \
-	b='xgettext-csharp-6'; \
-	$(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)
-xgettext-csharp-7.log: xgettext-csharp-7
-	@p='xgettext-csharp-7'; \
-	b='xgettext-csharp-7'; \
-	$(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)
-xgettext-elisp-1.log: xgettext-elisp-1
-	@p='xgettext-elisp-1'; \
-	b='xgettext-elisp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-elisp-2.log: xgettext-elisp-2
-	@p='xgettext-elisp-2'; \
-	b='xgettext-elisp-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)
-xgettext-glade-1.log: xgettext-glade-1
-	@p='xgettext-glade-1'; \
-	b='xgettext-glade-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-glade-2.log: xgettext-glade-2
-	@p='xgettext-glade-2'; \
-	b='xgettext-glade-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)
-xgettext-glade-3.log: xgettext-glade-3
-	@p='xgettext-glade-3'; \
-	b='xgettext-glade-3'; \
-	$(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)
-xgettext-glade-4.log: xgettext-glade-4
-	@p='xgettext-glade-4'; \
-	b='xgettext-glade-4'; \
-	$(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)
-xgettext-glade-5.log: xgettext-glade-5
-	@p='xgettext-glade-5'; \
-	b='xgettext-glade-5'; \
-	$(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)
-xgettext-glade-6.log: xgettext-glade-6
-	@p='xgettext-glade-6'; \
-	b='xgettext-glade-6'; \
-	$(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)
-xgettext-glade-7.log: xgettext-glade-7
-	@p='xgettext-glade-7'; \
-	b='xgettext-glade-7'; \
-	$(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)
-xgettext-java-1.log: xgettext-java-1
-	@p='xgettext-java-1'; \
-	b='xgettext-java-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-java-2.log: xgettext-java-2
-	@p='xgettext-java-2'; \
-	b='xgettext-java-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)
-xgettext-java-3.log: xgettext-java-3
-	@p='xgettext-java-3'; \
-	b='xgettext-java-3'; \
-	$(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)
-xgettext-java-4.log: xgettext-java-4
-	@p='xgettext-java-4'; \
-	b='xgettext-java-4'; \
-	$(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)
-xgettext-java-5.log: xgettext-java-5
-	@p='xgettext-java-5'; \
-	b='xgettext-java-5'; \
-	$(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)
-xgettext-java-6.log: xgettext-java-6
-	@p='xgettext-java-6'; \
-	b='xgettext-java-6'; \
-	$(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)
-xgettext-java-7.log: xgettext-java-7
-	@p='xgettext-java-7'; \
-	b='xgettext-java-7'; \
-	$(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)
-xgettext-librep-1.log: xgettext-librep-1
-	@p='xgettext-librep-1'; \
-	b='xgettext-librep-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-librep-2.log: xgettext-librep-2
-	@p='xgettext-librep-2'; \
-	b='xgettext-librep-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)
-xgettext-lisp-1.log: xgettext-lisp-1
-	@p='xgettext-lisp-1'; \
-	b='xgettext-lisp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-lisp-2.log: xgettext-lisp-2
-	@p='xgettext-lisp-2'; \
-	b='xgettext-lisp-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)
-xgettext-objc-1.log: xgettext-objc-1
-	@p='xgettext-objc-1'; \
-	b='xgettext-objc-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-objc-2.log: xgettext-objc-2
-	@p='xgettext-objc-2'; \
-	b='xgettext-objc-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)
-xgettext-perl-1.log: xgettext-perl-1
-	@p='xgettext-perl-1'; \
-	b='xgettext-perl-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-perl-2.log: xgettext-perl-2
-	@p='xgettext-perl-2'; \
-	b='xgettext-perl-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)
-xgettext-perl-3.log: xgettext-perl-3
-	@p='xgettext-perl-3'; \
-	b='xgettext-perl-3'; \
-	$(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)
-xgettext-perl-4.log: xgettext-perl-4
-	@p='xgettext-perl-4'; \
-	b='xgettext-perl-4'; \
-	$(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)
-xgettext-perl-5.log: xgettext-perl-5
-	@p='xgettext-perl-5'; \
-	b='xgettext-perl-5'; \
-	$(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)
-xgettext-perl-6.log: xgettext-perl-6
-	@p='xgettext-perl-6'; \
-	b='xgettext-perl-6'; \
-	$(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)
-xgettext-perl-7.log: xgettext-perl-7
-	@p='xgettext-perl-7'; \
-	b='xgettext-perl-7'; \
-	$(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)
-xgettext-perl-8.log: xgettext-perl-8
-	@p='xgettext-perl-8'; \
-	b='xgettext-perl-8'; \
-	$(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)
-xgettext-php-1.log: xgettext-php-1
-	@p='xgettext-php-1'; \
-	b='xgettext-php-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-php-2.log: xgettext-php-2
-	@p='xgettext-php-2'; \
-	b='xgettext-php-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)
-xgettext-php-3.log: xgettext-php-3
-	@p='xgettext-php-3'; \
-	b='xgettext-php-3'; \
-	$(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)
-xgettext-php-4.log: xgettext-php-4
-	@p='xgettext-php-4'; \
-	b='xgettext-php-4'; \
-	$(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)
-xgettext-po-1.log: xgettext-po-1
-	@p='xgettext-po-1'; \
-	b='xgettext-po-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-properties-1.log: xgettext-properties-1
-	@p='xgettext-properties-1'; \
-	b='xgettext-properties-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-python-1.log: xgettext-python-1
-	@p='xgettext-python-1'; \
-	b='xgettext-python-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-python-2.log: xgettext-python-2
-	@p='xgettext-python-2'; \
-	b='xgettext-python-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)
-xgettext-python-3.log: xgettext-python-3
-	@p='xgettext-python-3'; \
-	b='xgettext-python-3'; \
-	$(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)
-xgettext-python-4.log: xgettext-python-4
-	@p='xgettext-python-4'; \
-	b='xgettext-python-4'; \
-	$(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)
-xgettext-scheme-1.log: xgettext-scheme-1
-	@p='xgettext-scheme-1'; \
-	b='xgettext-scheme-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-scheme-2.log: xgettext-scheme-2
-	@p='xgettext-scheme-2'; \
-	b='xgettext-scheme-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)
-xgettext-scheme-3.log: xgettext-scheme-3
-	@p='xgettext-scheme-3'; \
-	b='xgettext-scheme-3'; \
-	$(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)
-xgettext-scheme-4.log: xgettext-scheme-4
-	@p='xgettext-scheme-4'; \
-	b='xgettext-scheme-4'; \
-	$(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)
-xgettext-sh-1.log: xgettext-sh-1
-	@p='xgettext-sh-1'; \
-	b='xgettext-sh-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-sh-2.log: xgettext-sh-2
-	@p='xgettext-sh-2'; \
-	b='xgettext-sh-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)
-xgettext-sh-3.log: xgettext-sh-3
-	@p='xgettext-sh-3'; \
-	b='xgettext-sh-3'; \
-	$(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)
-xgettext-sh-4.log: xgettext-sh-4
-	@p='xgettext-sh-4'; \
-	b='xgettext-sh-4'; \
-	$(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)
-xgettext-sh-5.log: xgettext-sh-5
-	@p='xgettext-sh-5'; \
-	b='xgettext-sh-5'; \
-	$(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)
-xgettext-sh-6.log: xgettext-sh-6
-	@p='xgettext-sh-6'; \
-	b='xgettext-sh-6'; \
-	$(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)
-xgettext-smalltalk-1.log: xgettext-smalltalk-1
-	@p='xgettext-smalltalk-1'; \
-	b='xgettext-smalltalk-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-smalltalk-2.log: xgettext-smalltalk-2
-	@p='xgettext-smalltalk-2'; \
-	b='xgettext-smalltalk-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)
-xgettext-stringtable-1.log: xgettext-stringtable-1
-	@p='xgettext-stringtable-1'; \
-	b='xgettext-stringtable-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-tcl-1.log: xgettext-tcl-1
-	@p='xgettext-tcl-1'; \
-	b='xgettext-tcl-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-tcl-2.log: xgettext-tcl-2
-	@p='xgettext-tcl-2'; \
-	b='xgettext-tcl-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)
-xgettext-tcl-3.log: xgettext-tcl-3
-	@p='xgettext-tcl-3'; \
-	b='xgettext-tcl-3'; \
-	$(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)
-xgettext-tcl-4.log: xgettext-tcl-4
-	@p='xgettext-tcl-4'; \
-	b='xgettext-tcl-4'; \
-	$(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)
-xgettext-ycp-1.log: xgettext-ycp-1
-	@p='xgettext-ycp-1'; \
-	b='xgettext-ycp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-ycp-2.log: xgettext-ycp-2
-	@p='xgettext-ycp-2'; \
-	b='xgettext-ycp-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)
-xgettext-ycp-3.log: xgettext-ycp-3
-	@p='xgettext-ycp-3'; \
-	b='xgettext-ycp-3'; \
-	$(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)
-xgettext-ycp-4.log: xgettext-ycp-4
-	@p='xgettext-ycp-4'; \
-	b='xgettext-ycp-4'; \
-	$(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)
-xgettext-lua-1.log: xgettext-lua-1
-	@p='xgettext-lua-1'; \
-	b='xgettext-lua-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-lua-2.log: xgettext-lua-2
-	@p='xgettext-lua-2'; \
-	b='xgettext-lua-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)
-xgettext-javascript-1.log: xgettext-javascript-1
-	@p='xgettext-javascript-1'; \
-	b='xgettext-javascript-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-javascript-2.log: xgettext-javascript-2
-	@p='xgettext-javascript-2'; \
-	b='xgettext-javascript-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)
-xgettext-javascript-3.log: xgettext-javascript-3
-	@p='xgettext-javascript-3'; \
-	b='xgettext-javascript-3'; \
-	$(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)
-xgettext-javascript-4.log: xgettext-javascript-4
-	@p='xgettext-javascript-4'; \
-	b='xgettext-javascript-4'; \
-	$(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)
-xgettext-javascript-5.log: xgettext-javascript-5
-	@p='xgettext-javascript-5'; \
-	b='xgettext-javascript-5'; \
-	$(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)
-xgettext-javascript-6.log: xgettext-javascript-6
-	@p='xgettext-javascript-6'; \
-	b='xgettext-javascript-6'; \
-	$(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)
-xgettext-vala-1.log: xgettext-vala-1
-	@p='xgettext-vala-1'; \
-	b='xgettext-vala-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-gsettings-1.log: xgettext-gsettings-1
-	@p='xgettext-gsettings-1'; \
-	b='xgettext-gsettings-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-xgettext-desktop-1.log: xgettext-desktop-1
-	@p='xgettext-desktop-1'; \
-	b='xgettext-desktop-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-awk-1.log: format-awk-1
-	@p='format-awk-1'; \
-	b='format-awk-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-awk-2.log: format-awk-2
-	@p='format-awk-2'; \
-	b='format-awk-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-boost-1.log: format-boost-1
-	@p='format-boost-1'; \
-	b='format-boost-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-boost-2.log: format-boost-2
-	@p='format-boost-2'; \
-	b='format-boost-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-c-1.log: format-c-1
-	@p='format-c-1'; \
-	b='format-c-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-c-2.log: format-c-2
-	@p='format-c-2'; \
-	b='format-c-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-c-3.log: format-c-3
-	@p='format-c-3'; \
-	b='format-c-3'; \
-	$(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-c-4.log: format-c-4
-	@p='format-c-4'; \
-	b='format-c-4'; \
-	$(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-c-5.log: format-c-5
-	@p='format-c-5'; \
-	b='format-c-5'; \
-	$(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-csharp-1.log: format-csharp-1
-	@p='format-csharp-1'; \
-	b='format-csharp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-csharp-2.log: format-csharp-2
-	@p='format-csharp-2'; \
-	b='format-csharp-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-elisp-1.log: format-elisp-1
-	@p='format-elisp-1'; \
-	b='format-elisp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-elisp-2.log: format-elisp-2
-	@p='format-elisp-2'; \
-	b='format-elisp-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-gcc-internal-1.log: format-gcc-internal-1
-	@p='format-gcc-internal-1'; \
-	b='format-gcc-internal-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-gcc-internal-2.log: format-gcc-internal-2
-	@p='format-gcc-internal-2'; \
-	b='format-gcc-internal-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-gfc-internal-1.log: format-gfc-internal-1
-	@p='format-gfc-internal-1'; \
-	b='format-gfc-internal-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-gfc-internal-2.log: format-gfc-internal-2
-	@p='format-gfc-internal-2'; \
-	b='format-gfc-internal-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-java-1.log: format-java-1
-	@p='format-java-1'; \
-	b='format-java-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-java-2.log: format-java-2
-	@p='format-java-2'; \
-	b='format-java-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-kde-1.log: format-kde-1
-	@p='format-kde-1'; \
-	b='format-kde-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-kde-2.log: format-kde-2
-	@p='format-kde-2'; \
-	b='format-kde-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-librep-1.log: format-librep-1
-	@p='format-librep-1'; \
-	b='format-librep-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-librep-2.log: format-librep-2
-	@p='format-librep-2'; \
-	b='format-librep-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-lisp-1.log: format-lisp-1
-	@p='format-lisp-1'; \
-	b='format-lisp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-lisp-2.log: format-lisp-2
-	@p='format-lisp-2'; \
-	b='format-lisp-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-php-1.log: format-php-1
-	@p='format-php-1'; \
-	b='format-php-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-php-2.log: format-php-2
-	@p='format-php-2'; \
-	b='format-php-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-python-1.log: format-python-1
-	@p='format-python-1'; \
-	b='format-python-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-python-2.log: format-python-2
-	@p='format-python-2'; \
-	b='format-python-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-python-brace-1.log: format-python-brace-1
-	@p='format-python-brace-1'; \
-	b='format-python-brace-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-python-brace-2.log: format-python-brace-2
-	@p='format-python-brace-2'; \
-	b='format-python-brace-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-pascal-1.log: format-pascal-1
-	@p='format-pascal-1'; \
-	b='format-pascal-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-pascal-2.log: format-pascal-2
-	@p='format-pascal-2'; \
-	b='format-pascal-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-perl-1.log: format-perl-1
-	@p='format-perl-1'; \
-	b='format-perl-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-perl-2.log: format-perl-2
-	@p='format-perl-2'; \
-	b='format-perl-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-perl-brace-1.log: format-perl-brace-1
-	@p='format-perl-brace-1'; \
-	b='format-perl-brace-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-perl-brace-2.log: format-perl-brace-2
-	@p='format-perl-brace-2'; \
-	b='format-perl-brace-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-perl-mixed-1.log: format-perl-mixed-1
-	@p='format-perl-mixed-1'; \
-	b='format-perl-mixed-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-perl-mixed-2.log: format-perl-mixed-2
-	@p='format-perl-mixed-2'; \
-	b='format-perl-mixed-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-qt-1.log: format-qt-1
-	@p='format-qt-1'; \
-	b='format-qt-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-qt-2.log: format-qt-2
-	@p='format-qt-2'; \
-	b='format-qt-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-qt-plural-1.log: format-qt-plural-1
-	@p='format-qt-plural-1'; \
-	b='format-qt-plural-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-qt-plural-2.log: format-qt-plural-2
-	@p='format-qt-plural-2'; \
-	b='format-qt-plural-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-scheme-1.log: format-scheme-1
-	@p='format-scheme-1'; \
-	b='format-scheme-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-scheme-2.log: format-scheme-2
-	@p='format-scheme-2'; \
-	b='format-scheme-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-sh-1.log: format-sh-1
-	@p='format-sh-1'; \
-	b='format-sh-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-sh-2.log: format-sh-2
-	@p='format-sh-2'; \
-	b='format-sh-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-tcl-1.log: format-tcl-1
-	@p='format-tcl-1'; \
-	b='format-tcl-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-tcl-2.log: format-tcl-2
-	@p='format-tcl-2'; \
-	b='format-tcl-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-ycp-1.log: format-ycp-1
-	@p='format-ycp-1'; \
-	b='format-ycp-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-ycp-2.log: format-ycp-2
-	@p='format-ycp-2'; \
-	b='format-ycp-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-lua-1.log: format-lua-1
-	@p='format-lua-1'; \
-	b='format-lua-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-lua-2.log: format-lua-2
-	@p='format-lua-2'; \
-	b='format-lua-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-javascript-1.log: format-javascript-1
-	@p='format-javascript-1'; \
-	b='format-javascript-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-format-javascript-2.log: format-javascript-2
-	@p='format-javascript-2'; \
-	b='format-javascript-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)
-plural-1.log: plural-1
-	@p='plural-1'; \
-	b='plural-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-plural-2.log: plural-2
-	@p='plural-2'; \
-	b='plural-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)
-gettextpo-1.log: gettextpo-1
-	@p='gettextpo-1'; \
-	b='gettextpo-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-lang-c.log: lang-c
-	@p='lang-c'; \
-	b='lang-c'; \
-	$(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)
-lang-c++.log: lang-c++
-	@p='lang-c++'; \
-	b='lang-c++'; \
-	$(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)
-lang-objc.log: lang-objc
-	@p='lang-objc'; \
-	b='lang-objc'; \
-	$(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)
-lang-sh.log: lang-sh
-	@p='lang-sh'; \
-	b='lang-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)
-lang-bash.log: lang-bash
-	@p='lang-bash'; \
-	b='lang-bash'; \
-	$(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)
-lang-python-1.log: lang-python-1
-	@p='lang-python-1'; \
-	b='lang-python-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-lang-python-2.log: lang-python-2
-	@p='lang-python-2'; \
-	b='lang-python-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)
-lang-clisp.log: lang-clisp
-	@p='lang-clisp'; \
-	b='lang-clisp'; \
-	$(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)
-lang-elisp.log: lang-elisp
-	@p='lang-elisp'; \
-	b='lang-elisp'; \
-	$(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)
-lang-librep.log: lang-librep
-	@p='lang-librep'; \
-	b='lang-librep'; \
-	$(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)
-lang-guile.log: lang-guile
-	@p='lang-guile'; \
-	b='lang-guile'; \
-	$(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)
-lang-smalltalk.log: lang-smalltalk
-	@p='lang-smalltalk'; \
-	b='lang-smalltalk'; \
-	$(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)
-lang-java.log: lang-java
-	@p='lang-java'; \
-	b='lang-java'; \
-	$(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)
-lang-csharp.log: lang-csharp
-	@p='lang-csharp'; \
-	b='lang-csharp'; \
-	$(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)
-lang-gawk.log: lang-gawk
-	@p='lang-gawk'; \
-	b='lang-gawk'; \
-	$(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)
-lang-pascal.log: lang-pascal
-	@p='lang-pascal'; \
-	b='lang-pascal'; \
-	$(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)
-lang-ycp.log: lang-ycp
-	@p='lang-ycp'; \
-	b='lang-ycp'; \
-	$(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)
-lang-tcl.log: lang-tcl
-	@p='lang-tcl'; \
-	b='lang-tcl'; \
-	$(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)
-lang-perl-1.log: lang-perl-1
-	@p='lang-perl-1'; \
-	b='lang-perl-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-lang-perl-2.log: lang-perl-2
-	@p='lang-perl-2'; \
-	b='lang-perl-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)
-lang-php.log: lang-php
-	@p='lang-php'; \
-	b='lang-php'; \
-	$(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)
-lang-po.log: lang-po
-	@p='lang-po'; \
-	b='lang-po'; \
-	$(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)
-lang-rst.log: lang-rst
-	@p='lang-rst'; \
-	b='lang-rst'; \
-	$(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)
-lang-lua.log: lang-lua
-	@p='lang-lua'; \
-	b='lang-lua'; \
-	$(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)
-lang-javascript.log: lang-javascript
-	@p='lang-javascript'; \
-	b='lang-javascript'; \
-	$(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)
-lang-vala.log: lang-vala
-	@p='lang-vala'; \
-	b='lang-vala'; \
-	$(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)
-autopoint-1.log: autopoint-1
-	@p='autopoint-1'; \
-	b='autopoint-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) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-autopoint-2.log: autopoint-2
-	@p='autopoint-2'; \
-	b='autopoint-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)
-autopoint-3.log: autopoint-3
-	@p='autopoint-3'; \
-	b='autopoint-3'; \
-	$(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.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -5136,20 +1819,12 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -5231,19 +1906,19 @@
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	recheck tags tags-am uninstall uninstall-am
+	tags uninstall uninstall-am
 
 
 # Update the expected test results.
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-1 gettext-0.18.1.1/gettext-tools/tests/msgattrib-1
--- gettext-0.19.3/gettext-tools/tests/msgattrib-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --translated option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test1.po"
 cat <<\EOF > ma-test1.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test1.tmp ma-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test1.ok"
 cat <<\EOF > ma-test1.ok
 # HEADER.
 #
@@ -94,4 +101,6 @@
 ${DIFF} ma-test1.ok ma-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-10 gettext-0.18.1.1/gettext-tools/tests/msgattrib-10
--- gettext-0.19.3/gettext-tools/tests/msgattrib-10	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --set-obsolete option. Note that the output routines drop untranslated
 # obsolete messages.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test10.po"
 cat <<\EOF > ma-test10.po
 # HEADER.
 #
@@ -54,10 +57,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test10.tmp ma-test10.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test10.ok"
 cat <<\EOF > ma-test10.ok
 # HEADER.
 #
@@ -95,4 +102,6 @@
 ${DIFF} ma-test10.ok ma-test10.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-11 gettext-0.18.1.1/gettext-tools/tests/msgattrib-11
--- gettext-0.19.3/gettext-tools/tests/msgattrib-11	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-11	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --clear-obsolete option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test11.po"
 cat <<\EOF > ma-test11.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test11.tmp ma-test11.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test11.ok"
 cat <<\EOF > ma-test11.ok
 # HEADER.
 #
@@ -111,4 +118,6 @@
 ${DIFF} ma-test11.ok ma-test11.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-12 gettext-0.18.1.1/gettext-tools/tests/msgattrib-12
--- gettext-0.19.3/gettext-tools/tests/msgattrib-12	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-12	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --fuzzy option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test12.po"
 cat <<\EOF > ma-test12.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test12.tmp ma-test12.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test12.ok"
 cat <<\EOF > ma-test12.ok
 # HEADER.
 #
@@ -78,4 +85,6 @@
 ${DIFF} ma-test12.ok ma-test12.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-13 gettext-0.18.1.1/gettext-tools/tests/msgattrib-13
--- gettext-0.19.3/gettext-tools/tests/msgattrib-13	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-13	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --obsolete option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test13.po"
 cat <<\EOF > ma-test13.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test13.tmp ma-test13.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test13.ok"
 cat <<\EOF > ma-test13.ok
 # HEADER.
 #
@@ -85,4 +92,6 @@
 ${DIFF} ma-test13.ok ma-test13.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-14 gettext-0.18.1.1/gettext-tools/tests/msgattrib-14
--- gettext-0.19.3/gettext-tools/tests/msgattrib-14	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-14	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test combination of selection and manipulation option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test14.po"
 cat <<\EOF > ma-test14.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test14.tmp ma-test14.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test14.ok"
 cat <<\EOF > ma-test14.ok
 # HEADER.
 #
@@ -81,4 +88,6 @@
 ${DIFF} ma-test14.ok ma-test14.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-15 gettext-0.18.1.1/gettext-tools/tests/msgattrib-15
--- gettext-0.19.3/gettext-tools/tests/msgattrib-15	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-15	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test15.po"
 cat <<\EOF > ma-test15.po
 msgid ""
 msgstr ""
@@ -48,12 +51,17 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles ma-test15.tmp ma-test15.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} ma-test15.po ma-test15.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-16 gettext-0.18.1.1/gettext-tools/tests/msgattrib-16
--- gettext-0.19.3/gettext-tools/tests/msgattrib-16	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-16	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib on a PO file with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test16.po"
 cat <<\EOF > ma-test16.po
 msgid ""
 msgstr ""
@@ -41,10 +44,14 @@
 #~ msgstr "%s: ungültige Option -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles ma-test16.tmp ma-test16.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test16.ok"
 cat <<\EOF > ma-test16.ok
 msgid ""
 msgstr ""
@@ -75,4 +82,6 @@
 ${DIFF} ma-test16.ok ma-test16.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-17 gettext-0.18.1.1/gettext-tools/tests/msgattrib-17
--- gettext-0.19.3/gettext-tools/tests/msgattrib-17	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-17	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib option --clear-previous.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test17.po"
 cat <<\EOF > ma-test17.po
 msgid ""
 msgstr ""
@@ -41,10 +44,14 @@
 #~ msgstr "%s: ungültige Option -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles ma-test17.tmp ma-test17.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test17.ok"
 cat <<\EOF > ma-test17.ok
 msgid ""
 msgstr ""
@@ -83,4 +90,6 @@
 ${DIFF} ma-test17.ok ma-test17.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-18 gettext-0.18.1.1/gettext-tools/tests/msgattrib-18
--- gettext-0.19.3/gettext-tools/tests/msgattrib-18	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-18	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<\EOF > ma-test18.po
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Bonnie Tyler\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: married-men:4
-#, fuzzy
-msgid "The world is full of married men"
-msgstr "So viele verheiratete M�nner"
-
-#: married-men:5
-msgid "with wives who never understand"
-msgstr "und ihre Frauen verstehen sie nicht"
-
-#: married-men:6
-msgid "They're looking for someone to share"
-msgstr ""
-
-# schwer zu �bersetzen...
-#: married-men:7
-msgid "the excitement of a love affair"
-msgstr ""
-
-#: married-men:8
-msgid "Just as soon as they find you"
-msgstr ""
-
-#: married-men:9
-msgid "They warn you and darn you"
-msgstr ""
-
-#~ msgid "You fly on the wings of romance"
-#~ msgstr "Die Fl�gel der frischen Liebe heben dich zum Himmel"
-
-#, fuzzy
-#~ msgid "In the eyes of the world"
-#~ msgstr "F�r die anderen"
-
-# Etwas freie �bersetzung.
-#~ msgid "You're just another crazy girl"
-#~ msgstr "bist du blo� ein verr�cktes dummes Ding"
-
-#~ msgid "Who loves a married man"
-#~ msgstr "das einen verheirateten Mann liebt"
-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
-
-cat <<\EOF > ma-test18.ok
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Bonnie Tyler\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: married-men
-#, fuzzy
-msgid "The world is full of married men"
-msgstr "So viele verheiratete M�nner"
-
-#: married-men
-msgid "with wives who never understand"
-msgstr "und ihre Frauen verstehen sie nicht"
-
-#~ msgid "You fly on the wings of romance"
-#~ msgstr "Die Fl�gel der frischen Liebe heben dich zum Himmel"
-
-#, fuzzy
-#~ msgid "In the eyes of the world"
-#~ msgstr "F�r die anderen"
-
-# Etwas freie �bersetzung.
-#~ msgid "You're just another crazy girl"
-#~ msgstr "bist du blo� ein verr�cktes dummes Ding"
-
-#~ msgid "Who loves a married man"
-#~ msgstr "das einen verheirateten Mann liebt"
-EOF
-
-: ${DIFF=diff}
-${DIFF} ma-test18.ok ma-test18.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-19 gettext-0.18.1.1/gettext-tools/tests/msgattrib-19
--- gettext-0.19.3/gettext-tools/tests/msgattrib-19	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-19	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --empty option.
-
-cat <<\EOF > ma-test19.po
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Bonnie Tyler\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: married-men:4
-#, fuzzy
-msgid "The world is full of married men"
-msgstr "So viele verheiratete M�nner"
-
-#: married-men:5
-msgid "with wives who never understand"
-msgstr "und ihre Frauen verstehen sie nicht"
-
-#: married-men:6
-msgid "They're looking for someone to share"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "One file deleted."
-msgid_plural "%u files deleted."
-msgstr[0] "Ein Fehler."
-msgstr[1] "%u Fehler."
-
-#~ msgid "You fly on the wings of romance"
-#~ msgstr "Die Fl�gel der frischen Liebe heben dich zum Himmel"
-
-#, fuzzy
-#~ msgid "In the eyes of the world"
-#~ msgstr "F�r die anderen"
-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
-
-cat <<\EOF > ma-test19.ok
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Bonnie Tyler\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: married-men:4
-msgid "The world is full of married men"
-msgstr ""
-
-#: married-men:5
-msgid "with wives who never understand"
-msgstr "und ihre Frauen verstehen sie nicht"
-
-#: married-men:6
-msgid "They're looking for someone to share"
-msgstr ""
-
-#, c-format
-msgid "One file deleted."
-msgid_plural "%u files deleted."
-msgstr[0] ""
-msgstr[1] ""
-
-#~ msgid "You fly on the wings of romance"
-#~ msgstr "Die Fl�gel der frischen Liebe heben dich zum Himmel"
-
-#~ msgid "In the eyes of the world"
-#~ msgstr "F�r die anderen"
-EOF
-
-: ${DIFF=diff}
-${DIFF} ma-test19.ok ma-test19.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-2 gettext-0.18.1.1/gettext-tools/tests/msgattrib-2
--- gettext-0.19.3/gettext-tools/tests/msgattrib-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --untranslated option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test2.po"
 cat <<\EOF > ma-test2.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test2.tmp ma-test2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test2.ok"
 cat <<\EOF > ma-test2.ok
 # HEADER.
 #
@@ -88,4 +95,6 @@
 ${DIFF} ma-test2.ok ma-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-3 gettext-0.18.1.1/gettext-tools/tests/msgattrib-3
--- gettext-0.19.3/gettext-tools/tests/msgattrib-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-fuzzy option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test3.po"
 cat <<\EOF > ma-test3.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test3.tmp ma-test3.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test3.ok"
 cat <<\EOF > ma-test3.ok
 # HEADER.
 #
@@ -102,4 +109,6 @@
 ${DIFF} ma-test3.ok ma-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-4 gettext-0.18.1.1/gettext-tools/tests/msgattrib-4
--- gettext-0.19.3/gettext-tools/tests/msgattrib-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --only-fuzzy option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test4.po"
 cat <<\EOF > ma-test4.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test4.tmp ma-test4.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test4.ok"
 cat <<\EOF > ma-test4.ok
 # HEADER.
 #
@@ -80,4 +87,6 @@
 ${DIFF} ma-test4.ok ma-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-5 gettext-0.18.1.1/gettext-tools/tests/msgattrib-5
--- gettext-0.19.3/gettext-tools/tests/msgattrib-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-obsolete option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test5.po"
 cat <<\EOF > ma-test5.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test5.tmp ma-test5.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test5.ok"
 cat <<\EOF > ma-test5.ok
 # HEADER.
 #
@@ -97,4 +104,6 @@
 ${DIFF} ma-test5.ok ma-test5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-6 gettext-0.18.1.1/gettext-tools/tests/msgattrib-6
--- gettext-0.19.3/gettext-tools/tests/msgattrib-6	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --only-obsolete option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test6.po"
 cat <<\EOF > ma-test6.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test6.tmp ma-test6.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test6.ok"
 cat <<\EOF > ma-test6.ok
 # HEADER.
 #
@@ -85,4 +92,6 @@
 ${DIFF} ma-test6.ok ma-test6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-7 gettext-0.18.1.1/gettext-tools/tests/msgattrib-7
--- gettext-0.19.3/gettext-tools/tests/msgattrib-7	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test combination of two selection options.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test7.po"
 cat <<\EOF > ma-test7.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test7.tmp ma-test7.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test7.ok"
 cat <<\EOF > ma-test7.ok
 # HEADER.
 #
@@ -85,4 +92,6 @@
 ${DIFF} ma-test7.ok ma-test7.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-8 gettext-0.18.1.1/gettext-tools/tests/msgattrib-8
--- gettext-0.19.3/gettext-tools/tests/msgattrib-8	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --set-fuzzy option. Note that the output routines ignore the fuzzy
 # attribute for untranslated messages.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test8.po"
 cat <<\EOF > ma-test8.po
 # HEADER.
 #
@@ -54,10 +57,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test8.tmp ma-test8.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test8.ok"
 cat <<\EOF > ma-test8.ok
 # HEADER.
 #
@@ -117,4 +124,6 @@
 ${DIFF} ma-test8.ok ma-test8.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-9 gettext-0.18.1.1/gettext-tools/tests/msgattrib-9
--- gettext-0.19.3/gettext-tools/tests/msgattrib-9	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --clear-fuzzy option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-test9.po"
 cat <<\EOF > ma-test9.po
 # HEADER.
 #
@@ -53,10 +56,14 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles ma-test9.tmp ma-test9.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-test9.ok"
 cat <<\EOF > ma-test9.ok
 # HEADER.
 #
@@ -109,4 +116,6 @@
 ${DIFF} ma-test9.ok ma-test9.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgattrib-properties-1 gettext-0.18.1.1/gettext-tools/tests/msgattrib-properties-1
--- gettext-0.19.3/gettext-tools/tests/msgattrib-properties-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgattrib-properties-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --translated option with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ma-s-1.properties"
 cat <<\EOF > ma-s-1.properties
 # HEADER.
 #
@@ -29,10 +32,14 @@
 !They\ warn\ you\ and\ darn\ you=
 EOF
 
+tmpfiles="$tmpfiles ma-s-1.tmp ma-s-1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles ma-s-1.ok"
 cat <<\EOF > ma-s-1.ok
 # HEADER.
 #
@@ -50,4 +57,6 @@
 ${DIFF} ma-s-1.ok ma-s-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-1 gettext-0.18.1.1/gettext-tools/tests/msgcat-1
--- gettext-0.19.3/gettext-tools/tests/msgcat-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat doesn't introduce alternative syntax if all translations
 # have the same msgstr.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test1.in1 mcat-test1.in2"
 cat <<EOF > mcat-test1.in1
 msgid ""
 msgstr ""
@@ -38,10 +41,14 @@
 msgstr "eins"
 EOF
 
+tmpfiles="$tmpfiles mcat-test1.tmp mcat-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test1.ok"
 cat << EOF > mcat-test1.ok
 msgid ""
 msgstr ""
@@ -63,4 +70,6 @@
 ${DIFF} mcat-test1.ok mcat-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-10 gettext-0.18.1.1/gettext-tools/tests/msgcat-10
--- gettext-0.19.3/gettext-tools/tests/msgcat-10	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have different comments
 # but the same contents. The resulting header entry is not marked fuzzy,
@@ -7,6 +6,10 @@
 # translator attention; in other words, an msgstr which is valid in both input
 # files is also valid in the result.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test10.in1 mcat-test10.in2"
 cat <<\EOF > mcat-test10.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -56,13 +59,17 @@
 "Gl�ckwunsch!"
 EOF
 
+tmpfiles="$tmpfiles mcat-test10.tmp mcat-test10.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test10.ok"
 cat <<\EOF > mcat-test10.ok
 # #-#-#-#-#  mcat-test10.in1 (xyz)  #-#-#-#-#
 # German message file for xyz.
@@ -96,4 +103,6 @@
 ${DIFF} mcat-test10.ok mcat-test10.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-11 gettext-0.18.1.1/gettext-tools/tests/msgcat-11
--- gettext-0.19.3/gettext-tools/tests/msgcat-11	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-11	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat leaves #: lines in place even if they have a bizarre
 # syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test11.in"
 cat <<\EOF > mcat-test11.in
 #: basctl/source\basicide\basidesh.src#RID_STR_NOMODULE.text
 msgid "Simple"
@@ -30,12 +33,17 @@
 msgstr "immer"
 EOF
 
+tmpfiles="$tmpfiles mcat-test11.tmp mcat-test11.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mcat-test11.in mcat-test11.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-12 gettext-0.18.1.1/gettext-tools/tests/msgcat-12
--- gettext-0.19.3/gettext-tools/tests/msgcat-12	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-12	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat complains when it would need to change msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test12.in1 mcat-test12.in2"
 cat <<\EOF > mcat-test12.in1
 msgid ""
 msgstr ""
@@ -41,9 +44,12 @@
 msgstr "photocopieur Oc�"
 EOF
 
+tmpfiles="$tmpfiles mcat-test12.out"
 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 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-13 gettext-0.18.1.1/gettext-tools/tests/msgcat-13
--- gettext-0.19.3/gettext-tools/tests/msgcat-13	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-13	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on PO files with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test13.in1 mcat-test13.in2"
 cat <<\EOF > mcat-test13.in1
 msgid ""
 msgstr ""
@@ -65,11 +68,15 @@
 #~ msgstr "Enregistrer l'as"
 EOF
 
+tmpfiles="$tmpfiles mcat-test13.tmp mcat-test13.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test13.ok"
 cat <<\EOF > mcat-test13.ok
 msgid ""
 msgstr ""
@@ -129,4 +136,6 @@
 ${DIFF} mcat-test13.ok mcat-test13.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-14 gettext-0.18.1.1/gettext-tools/tests/msgcat-14
--- gettext-0.19.3/gettext-tools/tests/msgcat-14	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-14	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat complains when it would need to change msgctxts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test14.in1 mcat-test14.in2"
 cat <<\EOF > mcat-test14.in1
 msgid ""
 msgstr ""
@@ -65,9 +68,12 @@
 #~ msgstr "Enregistrer l'as"
 EOF
 
+tmpfiles="$tmpfiles mcat-test14.out"
 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 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-15 gettext-0.18.1.1/gettext-tools/tests/msgcat-15
--- gettext-0.19.3/gettext-tools/tests/msgcat-15	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-15	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on a PO file with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test15.in"
 cat <<\EOF > mcat-test15.in
 msgid ""
 msgstr ""
@@ -41,20 +44,27 @@
 #~ msgstr "%s: ungültige Option -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles mcat-test15.tmp1 mcat-test15.out1"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mcat-test15.in mcat-test15.out1
 result=$?
 
+tmpfiles="$tmpfiles mcat-test15.tmp2 mcat-test15.out2"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test15.ok"
 cat <<\EOF > mcat-test15.ok
 msgid   ""
 msgstr  "Report-Msgid-Bugs-To: \n"
@@ -96,4 +106,6 @@
 ${DIFF} mcat-test15.ok mcat-test15.out2
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-16 gettext-0.18.1.1/gettext-tools/tests/msgcat-16
--- gettext-0.19.3/gettext-tools/tests/msgcat-16	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-16	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on a PO files with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test16.in1"
 cat <<\EOF > mcat-test16.in1
 msgid ""
 msgstr ""
@@ -26,6 +29,7 @@
 msgstr "Argumente fehlen."
 EOF
 
+tmpfiles="$tmpfiles mcat-test16.in2"
 cat <<\EOF > mcat-test16.in2
 msgid ""
 msgstr ""
@@ -41,11 +45,15 @@
 msgstr "zu wenige Argumente"
 EOF
 
+tmpfiles="$tmpfiles mcat-test16.tmp mcat-test16.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test16.ok"
 cat <<\EOF > mcat-test16.ok
 msgid ""
 msgstr ""
@@ -76,4 +84,6 @@
 ${DIFF} mcat-test16.ok mcat-test16.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-17 gettext-0.18.1.1/gettext-tools/tests/msgcat-17
--- gettext-0.19.3/gettext-tools/tests/msgcat-17	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-17	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat with --width option. Check that format strings are not broken.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test17.in"
 cat <<\EOF > mcat-test17.in
 msgid ""
 msgstr ""
@@ -18,11 +21,15 @@
 msgstr "Fehler beim Schreiben eines großen Ergebnisses auf eine zu kleine Platte% s% smit der jederzeitigen Möglichkeit eines Fehlers in jedem Moment und an jeder Stelle"
 EOF
 
+tmpfiles="$tmpfiles mcat-test17.tmp mcat-test17.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test17.ok"
 cat <<\EOF > mcat-test17.ok
 msgid ""
 msgstr ""
@@ -48,4 +55,6 @@
 ${DIFF} mcat-test17.ok mcat-test17.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-18 gettext-0.18.1.1/gettext-tools/tests/msgcat-18
--- gettext-0.19.3/gettext-tools/tests/msgcat-18	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-18	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat: handling of 'range:' flags.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test18.in1 mcat-test18.in2"
 cat <<\EOF > mcat-test18.in1
 msgid "one day"
 msgid_plural "%d days"
@@ -53,11 +56,15 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mcat-test18.tmp mcat-test18.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test18.ok"
 cat <<\EOF > mcat-test18.ok
 #, c-format
 msgid "one day"
@@ -88,4 +95,6 @@
 ${DIFF} mcat-test18.ok mcat-test18.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-19 gettext-0.18.1.1/gettext-tools/tests/msgcat-19
--- gettext-0.19.3/gettext-tools/tests/msgcat-19	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-19	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<EOF > mcat-test19.in1
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU one 1.2.3\n"
-"POT-Creation-Date: 2000-12-11 20:49+0100\n"
-"PO-Revision-Date: 2000-03-18 15:25+01:00\n"
-"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: first.c:123
-msgid "1"
-msgstr "eins"
-EOF
-
-cat <<EOF > mcat-test19.in2
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU one 1.2.3\n"
-"POT-Creation-Date: 2000-12-11 20:49+0100\n"
-"PO-Revision-Date: 2000-03-18 15:25+01:00\n"
-"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: hunt.c:759
-msgid "1"
-msgstr "eins"
-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
-
-cat << EOF > mcat-test19.ok
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU one 1.2.3\n"
-"POT-Creation-Date: 2000-12-11 20:49+0100\n"
-"PO-Revision-Date: 2000-03-18 15:25+01:00\n"
-"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: first.c hunt.c
-msgid "1"
-msgstr "eins"
-EOF
-
-: ${DIFF=diff}
-${DIFF} mcat-test19.ok mcat-test19.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-2 gettext-0.18.1.1/gettext-tools/tests/msgcat-2
--- gettext-0.19.3/gettext-tools/tests/msgcat-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test2.in1 mcat-test2.in2"
 cat <<\EOF > mcat-test2.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -50,6 +53,7 @@
 msgstr "Sie können sich als \"%1\" einloggen."
 EOF
 
+tmpfiles="$tmpfiles mcat-test2.tmp mcat-test2.err mcat-test2.out"
 rm -f mcat-test2.tmp
 
 : ${MSGCAT=msgcat}
@@ -58,9 +62,11 @@
     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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test2.ok"
 cat << \EOF > mcat-test2.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -93,4 +99,6 @@
 ${DIFF} mcat-test2.ok mcat-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-3 gettext-0.18.1.1/gettext-tools/tests/msgcat-3
--- gettext-0.19.3/gettext-tools/tests/msgcat-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 # 1. ISO-8859-1, 2. UTF-8; plus --use-first
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test3.in1 mcat-test3.in2"
 cat <<\EOF > mcat-test3.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -51,6 +54,7 @@
 msgstr "Sie können sich als \"%1\" einloggen."
 EOF
 
+tmpfiles="$tmpfiles mcat-test3.tmp mcat-test3.err mcat-test3.out"
 rm -f mcat-test3.tmp
 
 : ${MSGCAT=msgcat}
@@ -59,9 +63,11 @@
     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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test3.ok"
 cat << \EOF > mcat-test3.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -94,4 +100,6 @@
 ${DIFF} mcat-test3.ok mcat-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-4 gettext-0.18.1.1/gettext-tools/tests/msgcat-4
--- gettext-0.19.3/gettext-tools/tests/msgcat-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets:
 # 1. UTF-8, 2. ISO-8859-1; plus --use-first
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test4.in1 mcat-test4.in2"
 cat <<\EOF > mcat-test4.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -51,6 +54,7 @@
 "Gl�ckwunsch!"
 EOF
 
+tmpfiles="$tmpfiles mcat-test4.tmp mcat-test4.err mcat-test4.out"
 rm -f mcat-test4.tmp
 
 : ${MSGCAT=msgcat}
@@ -59,9 +63,11 @@
     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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test4.ok"
 cat << \EOF > mcat-test4.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -94,4 +100,6 @@
 ${DIFF} mcat-test4.ok mcat-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-5 gettext-0.18.1.1/gettext-tools/tests/msgcat-5
--- gettext-0.19.3/gettext-tools/tests/msgcat-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different translations:
 # try --use-first
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test5.in1 mcat-test5.in2"
 cat <<\EOF > mcat-test5.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -52,13 +55,17 @@
 "Herzlichen Gl�ckwunsch!"
 EOF
 
+tmpfiles="$tmpfiles mcat-test5.tmp mcat-test5.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test5.ok"
 cat << \EOF > mcat-test5.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -85,4 +92,6 @@
 ${DIFF} mcat-test5.ok mcat-test5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-6 gettext-0.18.1.1/gettext-tools/tests/msgcat-6
--- gettext-0.19.3/gettext-tools/tests/msgcat-6	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different translations:
 # preserve all variants, add markers
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test6.in1 mcat-test6.in2"
 cat <<\EOF > mcat-test6.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -52,13 +55,17 @@
 "Herzlichen Gl�ckwunsch!"
 EOF
 
+tmpfiles="$tmpfiles mcat-test6.tmp mcat-test6.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test6.ok"
 cat << \EOF > mcat-test6.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -90,4 +97,6 @@
 ${DIFF} mcat-test6.ok mcat-test6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-7 gettext-0.18.1.1/gettext-tools/tests/msgcat-7
--- gettext-0.19.3/gettext-tools/tests/msgcat-7	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify 'msgcat --sort-output'
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test7.in1"
 cat <<EOF > mcat-test7.in1
 #: clients/inst_language.ycp:119
 msgid "two"
@@ -15,11 +18,15 @@
 "1"
 EOF
 
+tmpfiles="$tmpfiles mcat-test7.tmp mcat-test7.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test7.ok"
 cat << EOF > mcat-test7.ok
 #: clients/inst_language.ycp:108
 msgid "one"
@@ -34,4 +41,6 @@
 ${DIFF} mcat-test7.ok mcat-test7.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-8 gettext-0.18.1.1/gettext-tools/tests/msgcat-8
--- gettext-0.19.3/gettext-tools/tests/msgcat-8	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have different comments
 # and different contents. The resulting header entry must be marked fuzzy.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test8.in1 mcat-test8.in2"
 cat <<\EOF > mcat-test8.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -53,13 +56,17 @@
 "Gl�ckwunsch!"
 EOF
 
+tmpfiles="$tmpfiles mcat-test8.tmp mcat-test8.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test8.ok"
 cat <<\EOF > mcat-test8.ok
 # #-#-#-#-#  mcat-test8.in1 (xyz)  #-#-#-#-#
 # German message file for xyz.
@@ -104,4 +111,6 @@
 ${DIFF} mcat-test8.ok mcat-test8.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-9 gettext-0.18.1.1/gettext-tools/tests/msgcat-9
--- gettext-0.19.3/gettext-tools/tests/msgcat-9	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have the same comments
 # but different contents. The resulting header entry must be marked fuzzy.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-test9.in1 mcat-test9.in2"
 cat <<\EOF > mcat-test9.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -52,13 +55,17 @@
 "Gl�ckwunsch!"
 EOF
 
+tmpfiles="$tmpfiles mcat-test9.tmp mcat-test9.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-test9.ok"
 cat <<\EOF > mcat-test9.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -96,4 +103,6 @@
 ${DIFF} mcat-test9.ok mcat-test9.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-properties-1 gettext-0.18.1.1/gettext-tools/tests/msgcat-properties-1
--- gettext-0.19.3/gettext-tools/tests/msgcat-properties-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-properties-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --use-first option with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-p-1.in1 mcat-p-1.in2"
 cat <<\EOF > mcat-p-1.in1
 #. Help text (HTML-like) START
 #: clients/inst_ask_config.ycp:119
@@ -15,13 +18,17 @@
 Congratulations\!=Herzlichen Gl\u00fcckwunsch\!
 EOF
 
+tmpfiles="$tmpfiles mcat-p-1.tmp mcat-p-1.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-p-1.ok"
 cat << \EOF > mcat-p-1.ok
 #. Help text (HTML-like) START
 #: clients/inst_ask_config.ycp:119
@@ -32,4 +39,6 @@
 ${DIFF} mcat-p-1.ok mcat-p-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-properties-2 gettext-0.18.1.1/gettext-tools/tests/msgcat-properties-2
--- gettext-0.19.3/gettext-tools/tests/msgcat-properties-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-properties-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,20 +1,27 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax.
 # Test that encoding names are case insensitive.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-p-2.properties"
 cat <<\EOF > mcat-p-2.properties
 #: src/msgcmp.c:155 src/msgmerge.c:273
 exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6307\u5b9a\u5169\u500b\u8f38\u5165\u6a94
 EOF
 
+tmpfiles="$tmpfiles mcat-p-2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
 ${DIFF} mcat-p-2.properties mcat-p-2.out >/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcat-stringtable-1 gettext-0.18.1.1/gettext-tools/tests/msgcat-stringtable-1
--- gettext-0.19.3/gettext-tools/tests/msgcat-stringtable-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcat-stringtable-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test reading in NeXTstep/GNUstep .strings syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcat-s-1.in"
 cat <<\EOF > mcat-s-1.in
 /* This is an example of a string table file. Everything inside a comment
 is completely ignored, even if in "quotes", or \escape characters, etc.
@@ -24,15 +27,18 @@
 "hoe322070.element";
 EOF
 
+tmpfiles="$tmpfiles mcat-s-1.tmp mcat-s-1.err mcat-s-1.out"
 rm -f mcat-s-1.tmp
 : ${MSGCAT=msgcat}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcat-s-1.ok"
 cat << \EOF > mcat-s-1.ok
 # This is an example of a string table file. Everything inside a comment
 # is completely ignored, even if in "quotes", or \escape characters, etc.
@@ -63,4 +69,6 @@
 ${DIFF} mcat-s-1.ok mcat-s-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcmp-1 gettext-0.18.1.1/gettext-tools/tests/msgcmp-1
--- gettext-0.19.3/gettext-tools/tests/msgcmp-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcmp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a succeeding comparison.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mc-test1.in1 mc-test1.in2"
 cat <<EOF > mc-test1.in1
 msgid "one" msgstr "first"
 msgid "two" msgstr "second"
@@ -19,4 +22,6 @@
 ${MSGCMP} mc-test1.in1 mc-test1.in2 > /dev/null 2>&1
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcmp-2 gettext-0.18.1.1/gettext-tools/tests/msgcmp-2
--- gettext-0.19.3/gettext-tools/tests/msgcmp-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcmp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a failing comparison.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mc-test2.in1 mc-test2.in2"
 cat <<EOF > mc-test2.in1
 msgid "one" msgstr "first"
 msgid "two" msgstr "second"
@@ -16,10 +19,12 @@
 msgid "two" msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mc-test2.out"
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test2.out
 
+tmpfiles="$tmpfiles mc-test2.ok"
 cat <<EOF > mc-test2.ok
 mc-test2.in2:1: this message is used but not defined...
 mc-test2.in1:3: ...but this definition is similar
@@ -31,4 +36,6 @@
 ${DIFF} mc-test2.ok mc-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcmp-3 gettext-0.18.1.1/gettext-tools/tests/msgcmp-3
--- gettext-0.19.3/gettext-tools/tests/msgcmp-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcmp-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a failing comparison with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mc-test3.in1 mc-test3.in2"
 cat <<EOF > mc-test3.in1
 one=first
 two=second
@@ -16,10 +19,12 @@
 !two=
 EOF
 
+tmpfiles="$tmpfiles mc-test3.out"
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test3.out
 
+tmpfiles="$tmpfiles mc-test3.ok"
 cat <<EOF > mc-test3.ok
 mc-test3.in2:1: this message is used but not defined...
 mc-test3.in1:3: ...but this definition is similar
@@ -31,4 +36,6 @@
 ${DIFF} mc-test3.ok mc-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcmp-4 gettext-0.18.1.1/gettext-tools/tests/msgcmp-4
--- gettext-0.19.3/gettext-tools/tests/msgcmp-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcmp-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test comparison with PO files with previous msgids.
 # Test --use-fuzzy option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mc-test4.pot"
 cat <<\EOF > mc-test4.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -42,6 +45,7 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mc-test4.po1"
 cat <<\EOF > mc-test4.po1
 msgid ""
 msgstr ""
@@ -84,20 +88,25 @@
 EOF
 
 # Verify that with fuzzies, all msgids of the POT file are covered.
+tmpfiles="$tmpfiles mc-test4.out11"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 if grep -v 'warning:' mc-test4.out11 > /dev/null; then
-  exit 1;
+  rm -fr $tmpfiles; exit 1;
 fi
 
 # Verify that without fuzzies, not all msgids of the POT file are covered.
+tmpfiles="$tmpfiles mc-test4.out12"
 : ${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 || { rm -fr $tmpfiles; exit 1; }
+grep -v 'warning:' mc-test4.out12 > /dev/null
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mc-test4.po2"
 cat <<\EOF > mc-test4.po2
 msgid ""
 msgstr ""
@@ -142,11 +151,15 @@
 # Verify that without fuzzies, all msgids of the POT file are covered.
 # Verify that previous msgids are ignored even when specified on non-fuzzy
 # messages.
+tmpfiles="$tmpfiles mc-test4.out2"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 if grep -v 'warning:' mc-test4.out2 > /dev/null; then
-  exit 1;
+  rm -fr $tmpfiles; exit 1;
 fi
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-1 gettext-0.18.1.1/gettext-tools/tests/msgcomm-1
--- gettext-0.19.3/gettext-tools/tests/msgcomm-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0 option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test1.in1 mcomm-test1.in2"
 cat <<EOF > mcomm-test1.in1
 #: first.c:123
 msgid "1"
@@ -15,10 +18,14 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test1.tmp mcomm-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test1.ok"
 cat << EOF > mcomm-test1.ok
 #: first.c:123
 msgid "1"
@@ -33,4 +40,6 @@
 ${DIFF} mcomm-test1.ok mcomm-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-10 gettext-0.18.1.1/gettext-tools/tests/msgcomm-10
--- gettext-0.19.3/gettext-tools/tests/msgcomm-10	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1 and --omit-header.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test10.in1 mcomm-test10.in2"
 cat <<EOF > mcomm-test10.in1
 msgid ""
 msgstr ""
@@ -37,11 +40,15 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test10.tmp mcomm-test10.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test10.ok"
 cat << EOF > mcomm-test10.ok
 msgid "1"
 msgstr "1x"
@@ -51,4 +58,6 @@
 ${DIFF} mcomm-test10.ok mcomm-test10.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-11 gettext-0.18.1.1/gettext-tools/tests/msgcomm-11
--- gettext-0.19.3/gettext-tools/tests/msgcomm-11	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-11	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --more-than=1 drops entries which occur only once.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test11.in1 mcomm-test11.in2"
 cat <<EOF > mcomm-test11.in1
 msgid ""
 msgstr ""
@@ -41,11 +44,15 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test11.tmp mcomm-test11.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test11.ok"
 cat << EOF > mcomm-test11.ok
 msgid "1"
 msgstr "1x"
@@ -55,4 +62,6 @@
 ${DIFF} mcomm-test11.ok mcomm-test11.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-12 gettext-0.18.1.1/gettext-tools/tests/msgcomm-12
--- gettext-0.19.3/gettext-tools/tests/msgcomm-12	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-12	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --less-than=2 removes entries which occur twice and keeps entries
 # which occur only once.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # unique msg in in3
 
+tmpfiles="$tmpfiles mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3"
 cat <<EOF > mcomm-test12.in1
 msgid ""
 msgstr ""
@@ -60,14 +63,18 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test12.tmp mcomm-test12.out"
 : ${MSGCOMM=msgcomm}
 
 # --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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test12.ok"
 cat << EOF > mcomm-test12.ok
 msgid ""
 msgstr ""
@@ -89,4 +96,6 @@
 ${DIFF} mcomm-test12.ok mcomm-test12.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-13 gettext-0.18.1.1/gettext-tools/tests/msgcomm-13
--- gettext-0.19.3/gettext-tools/tests/msgcomm-13	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-13	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --less-than=2 removes entries which occur more than twice.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # one msg occurs 3 times (has to go away).
 # An unique msg in in3 has to stay.
 
+tmpfiles="$tmpfiles mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3"
 cat <<EOF > mcomm-test13.in1
 msgid ""
 msgstr ""
@@ -63,14 +66,18 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test13.tmp mcomm-test13.out"
 : ${MSGCOMM=msgcomm}
 
 # --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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test13.ok"
 cat << EOF > mcomm-test13.ok
 msgid ""
 msgstr ""
@@ -92,4 +99,6 @@
 ${DIFF} mcomm-test13.ok mcomm-test13.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-14 gettext-0.18.1.1/gettext-tools/tests/msgcomm-14
--- gettext-0.19.3/gettext-tools/tests/msgcomm-14	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-14	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --force-po option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # no unique msg in input files.
 # without --force-po don't create any PO file; cf. msgcomm-15
 
+tmpfiles="$tmpfiles mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3"
 cat <<EOF > mcomm-test14.in1
 msgid ""
 msgstr ""
@@ -58,14 +61,18 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test14.tmp mcomm-test14.out"
 : ${MSGCOMM=msgcomm}
 
 # --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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test14.ok"
 cat << EOF > mcomm-test14.ok
 msgid ""
 msgstr ""
@@ -83,4 +90,6 @@
 ${DIFF} mcomm-test14.ok mcomm-test14.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-15 gettext-0.18.1.1/gettext-tools/tests/msgcomm-15
--- gettext-0.19.3/gettext-tools/tests/msgcomm-15	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-15	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,15 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that without --force-po option, a PO file without translations is
 # not created.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # no unique msg in input files.
 # with --force-po create an empty PO file; cf. msgcomm-14
 
+tmpfiles="$tmpfiles mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3"
 cat <<EOF > mcomm-test15.in1
 msgid ""
 msgstr ""
@@ -59,6 +62,7 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test15.out"
 rm -f mcomm-test15.out
 
 : ${MSGCOMM=msgcomm}
@@ -66,7 +70,8 @@
 # --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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 # we've no unique msg; thus no PO should be created.
 if test -f mcomm-test15.out; then
@@ -76,4 +81,6 @@
   result=0
 fi
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-16 gettext-0.18.1.1/gettext-tools/tests/msgcomm-16
--- gettext-0.19.3/gettext-tools/tests/msgcomm-16	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-16	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test16.in1 mcomm-test16.in2"
 cat <<\EOF > mcomm-test16.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -50,6 +53,7 @@
 msgstr "Sie können sich als \"%1\" einloggen."
 EOF
 
+tmpfiles="$tmpfiles mcomm-test16.tmp mcomm-test16.err mcomm-test16.out"
 rm -f mcomm-test16.tmp
 
 : ${MSGCOMM=msgcomm}
@@ -58,9 +62,11 @@
     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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test16.ok"
 cat << \EOF > mcomm-test16.ok
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.
@@ -93,4 +99,6 @@
 ${DIFF} mcomm-test16.ok mcomm-test16.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-17 gettext-0.18.1.1/gettext-tools/tests/msgcomm-17
--- gettext-0.19.3/gettext-tools/tests/msgcomm-17	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-17	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # -u, --unique (equivalent to --less-than=2): we are interested in unique
-# entries only (entries occurring less than 2 times).  But don't drop the
+# entries only (entries occuring less than 2 times).  But don't drop the
 # header entry; otherwise msgcomm will fail for multibyte strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3"
 cat <<EOF > mcomm-test17.in1
 msgid ""
 msgstr ""
@@ -62,13 +65,17 @@
 msgstr "f�nf"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test17.tmp mcomm-test17.out"
 : ${MSGCOMM=msgcomm}
 
 ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test17.ok"
 cat << \EOF > mcomm-test17.ok
 msgid ""
 msgstr ""
@@ -91,4 +98,6 @@
 ${DIFF} mcomm-test17.ok mcomm-test17.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-18 gettext-0.18.1.1/gettext-tools/tests/msgcomm-18
--- gettext-0.19.3/gettext-tools/tests/msgcomm-18	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-18	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test18.in1 mcomm-test18.in2"
 cat <<EOF > mcomm-test18.in1
 # Sure.
 #: first.c:123
@@ -17,10 +20,14 @@
 msgstr "1x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test18.tmp mcomm-test18.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test18.ok"
 cat << EOF > mcomm-test18.ok
 # Sure.
 #: first.c:123 hunt.c:759
@@ -32,4 +39,6 @@
 ${DIFF} mcomm-test18.ok mcomm-test18.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-19 gettext-0.18.1.1/gettext-tools/tests/msgcomm-19
--- gettext-0.19.3/gettext-tools/tests/msgcomm-19	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-19	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If the first occurrence is fuzzy, keep the fuzzy mark.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test19.in1 mcomm-test19.in2"
 cat <<EOF > mcomm-test19.in1
 # Not sure.
 #: first.c:123
@@ -19,10 +22,14 @@
 msgstr "1x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test19.tmp mcomm-test19.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test19.ok"
 cat << EOF > mcomm-test19.ok
 # Not sure.
 #: first.c:123 hunt.c:759
@@ -35,4 +42,6 @@
 ${DIFF} mcomm-test19.ok mcomm-test19.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-2 gettext-0.18.1.1/gettext-tools/tests/msgcomm-2
--- gettext-0.19.3/gettext-tools/tests/msgcomm-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test2.in1 mcomm-test2.in2"
 cat <<EOF > mcomm-test2.in1
 #: first.c:123
 msgid "1"
@@ -15,11 +18,15 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test2.tmp mcomm-test2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test2.ok"
 cat << EOF > mcomm-test2.ok
 msgid "1"
 msgstr "1x"
@@ -32,4 +39,6 @@
 ${DIFF} mcomm-test2.ok mcomm-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-20 gettext-0.18.1.1/gettext-tools/tests/msgcomm-20
--- gettext-0.19.3/gettext-tools/tests/msgcomm-20	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-20	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If the first occurrence is not fuzzy, don't make the result fuzzy.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test20.in1 mcomm-test20.in2"
 cat <<EOF > mcomm-test20.in1
 # Sure.
 #: first.c:123
@@ -19,11 +22,15 @@
 msgstr "1x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test20.tmp mcomm-test20.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test20.ok"
 cat << EOF > mcomm-test20.ok
 # Sure.
 #: first.c:123 hunt.c:759
@@ -35,4 +42,6 @@
 ${DIFF} mcomm-test20.ok mcomm-test20.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-21 gettext-0.18.1.1/gettext-tools/tests/msgcomm-21
--- gettext-0.19.3/gettext-tools/tests/msgcomm-21	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-21	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If both occurrences are fuzzy, keep the fuzzy mark.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test21.in1 mcomm-test21.in2"
 cat <<EOF > mcomm-test21.in1
 # Not sure.
 #: first.c:123
@@ -20,10 +23,14 @@
 msgstr "1x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test21.tmp mcomm-test21.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test21.ok"
 cat << EOF > mcomm-test21.ok
 # Not sure.
 #: first.c:123 hunt.c:759
@@ -36,4 +43,6 @@
 ${DIFF} mcomm-test21.ok mcomm-test21.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-22 gettext-0.18.1.1/gettext-tools/tests/msgcomm-22
--- gettext-0.19.3/gettext-tools/tests/msgcomm-22	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-22	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that the header entry is kept, otherwise the encoding is unknown.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test22.in1 mcomm-test22.in2"
 cat <<\EOF > mcomm-test22.in1
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -59,14 +62,18 @@
 msgstr "virtueller Speicher ersch�pft"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test22.tmp mcomm-test22.out"
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test22.ok"
 cat << \EOF > mcomm-test22.ok
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -108,4 +115,6 @@
 ${DIFF} mcomm-test22.ok mcomm-test22.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-23 gettext-0.18.1.1/gettext-tools/tests/msgcomm-23
--- gettext-0.19.3/gettext-tools/tests/msgcomm-23	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-23	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,25 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # "msgcomm INPUT INPUT" is equivalent to "msguniq INPUT"
 
-cp "$abs_srcdir"/msguniq-a.in mcomm-23.in1
-cp "$abs_srcdir"/msguniq-a.in mcomm-23.in2
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
 
+tmpfiles="$tmpfiles mcomm-23.in1 mcomm-23.in2"
+cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in1
+cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
+
+tmpfiles="$tmpfiles mcomm-23.tmp mcomm-23.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} "$abs_srcdir"/msguniq-a.out mcomm-23.out
+${DIFF} ${top_srcdir}/tests/msguniq-a.out mcomm-23.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-24 gettext-0.18.1.1/gettext-tools/tests/msgcomm-24
--- gettext-0.19.3/gettext-tools/tests/msgcomm-24	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-24	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0 option with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test24.in1 mcomm-test24.in2"
 cat <<EOF > mcomm-test24.in1
 #: first.c:123
 1=1x
@@ -13,10 +16,14 @@
 2=2x
 EOF
 
+tmpfiles="$tmpfiles mcomm-test24.tmp mcomm-test24.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test24.ok"
 cat << EOF > mcomm-test24.ok
 #: first.c:123
 1=1x
@@ -29,4 +36,6 @@
 ${DIFF} mcomm-test24.ok mcomm-test24.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-25 gettext-0.18.1.1/gettext-tools/tests/msgcomm-25
--- gettext-0.19.3/gettext-tools/tests/msgcomm-25	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-25	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcomm on PO files with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test25.in1 mcomm-test25.in2"
 cat <<\EOF > mcomm-test25.in1
 msgid ""
 msgstr ""
@@ -65,10 +68,14 @@
 #~ msgstr "Enregistrer l'as"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test25.tmp mcomm-test25.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test25.ok"
 cat <<\EOF > mcomm-test25.ok
 msgid ""
 msgstr ""
@@ -118,4 +125,6 @@
 ${DIFF} mcomm-test25.ok mcomm-test25.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-26 gettext-0.18.1.1/gettext-tools/tests/msgcomm-26
--- gettext-0.19.3/gettext-tools/tests/msgcomm-26	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-26	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcomm on PO files with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test26.in1"
 cat <<\EOF > mcomm-test26.in1
 msgid ""
 msgstr ""
@@ -41,6 +44,7 @@
 msgstr "%s: ungültige Option -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test26.in2"
 cat <<\EOF > mcomm-test26.in2
 msgid ""
 msgstr ""
@@ -67,10 +71,14 @@
 msgstr "%s: ungültige Optionen -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test26.tmp mcomm-test26.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test26.ok"
 cat <<\EOF > mcomm-test26.ok
 msgid ""
 msgstr ""
@@ -101,4 +109,6 @@
 ${DIFF} mcomm-test26.ok mcomm-test26.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-27 gettext-0.18.1.1/gettext-tools/tests/msgcomm-27
--- gettext-0.19.3/gettext-tools/tests/msgcomm-27	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-27	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of format and 'range:' flag.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test27.in1 mcomm-test27.in2"
 cat <<EOF > mcomm-test27.in1
 msgid "one day"
 msgid_plural "%d days"
@@ -53,10 +56,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test27.tmp mcomm-test27.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test27.ok"
 cat << EOF > mcomm-test27.ok
 #, c-format
 msgid "one day"
@@ -87,4 +94,6 @@
 ${DIFF} mcomm-test27.ok mcomm-test27.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-28 gettext-0.18.1.1/gettext-tools/tests/msgcomm-28
--- gettext-0.19.3/gettext-tools/tests/msgcomm-28	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-28	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<EOF > mcomm-test28.in1
-#: first.c:123
-msgid "1"
-msgstr "1x"
-EOF
-
-cat <<EOF > mcomm-test28.in2
-#: hunt.c:759
-msgid "2"
-msgstr "2x"
-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
-
-cat << EOF > mcomm-test28.ok
-#: first.c
-msgid "1"
-msgstr "1x"
-
-#: hunt.c
-msgid "2"
-msgstr "2x"
-EOF
-
-: ${DIFF=diff}
-${DIFF} mcomm-test28.ok mcomm-test28.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-3 gettext-0.18.1.1/gettext-tools/tests/msgcomm-3
--- gettext-0.19.3/gettext-tools/tests/msgcomm-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --omit-header option when there is no header.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test3.in1 mcomm-test3.in2"
 cat <<EOF > mcomm-test3.in1
 #: first.c:123
 msgid "1"
@@ -15,11 +18,15 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test3.tmp mcomm-test3.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test3.ok"
 cat << EOF > mcomm-test3.ok
 #: first.c:123
 msgid "1"
@@ -34,4 +41,6 @@
 ${DIFF} mcomm-test3.ok mcomm-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-4 gettext-0.18.1.1/gettext-tools/tests/msgcomm-4
--- gettext-0.19.3/gettext-tools/tests/msgcomm-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test what happens with the header entry.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test4.in1 mcomm-test4.in2"
 cat <<EOF > mcomm-test4.in1
 msgid ""
 msgstr ""
@@ -26,11 +29,15 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test4.tmp mcomm-test4.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test4.ok"
 cat << EOF > mcomm-test4.ok
 msgid ""
 msgstr ""
@@ -56,4 +63,6 @@
 ${DIFF} mcomm-test4.ok mcomm-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-5 gettext-0.18.1.1/gettext-tools/tests/msgcomm-5
--- gettext-0.19.3/gettext-tools/tests/msgcomm-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --omit-header option when there is a header.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test5.in1 mcomm-test5.in2"
 cat <<EOF > mcomm-test5.in1
 msgid ""
 msgstr ""
@@ -26,11 +29,15 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test5.tmp mcomm-test5.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test5.ok"
 cat << EOF > mcomm-test5.ok
 #: first.c:123
 msgid "1"
@@ -45,4 +52,6 @@
 ${DIFF} mcomm-test5.ok mcomm-test5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-6 gettext-0.18.1.1/gettext-tools/tests/msgcomm-6
--- gettext-0.19.3/gettext-tools/tests/msgcomm-6	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location option when there is a header.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test6.in1 mcomm-test6.in2"
 cat <<EOF > mcomm-test6.in1
 msgid ""
 msgstr ""
@@ -26,11 +29,15 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test6.tmp mcomm-test6.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test6.ok"
 cat << EOF > mcomm-test6.ok
 msgid ""
 msgstr ""
@@ -54,4 +61,6 @@
 ${DIFF} mcomm-test6.ok mcomm-test6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-7 gettext-0.18.1.1/gettext-tools/tests/msgcomm-7
--- gettext-0.19.3/gettext-tools/tests/msgcomm-7	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location and --omit-header options together.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test7.in1 mcomm-test7.in2"
 cat <<EOF > mcomm-test7.in1
 msgid ""
 msgstr ""
@@ -26,11 +29,15 @@
 msgstr "2x"
 EOF
 
+tmpfiles="$tmpfiles mcomm-test7.tmp mcomm-test7.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test7.ok"
 cat << EOF > mcomm-test7.ok
 msgid "1"
 msgstr "1x"
@@ -43,4 +50,6 @@
 ${DIFF} mcomm-test7.ok mcomm-test7.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-8 gettext-0.18.1.1/gettext-tools/tests/msgcomm-8
--- gettext-0.19.3/gettext-tools/tests/msgcomm-8	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test8.in1 mcomm-test8.in2"
 cat <<EOF > mcomm-test8.in1
 msgid ""
 msgstr ""
@@ -37,11 +40,15 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test8.tmp mcomm-test8.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test8.ok"
 cat << EOF > mcomm-test8.ok
 msgid ""
 msgstr ""
@@ -63,4 +70,6 @@
 ${DIFF} mcomm-test8.ok mcomm-test8.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgcomm-9 gettext-0.18.1.1/gettext-tools/tests/msgcomm-9
--- gettext-0.19.3/gettext-tools/tests/msgcomm-9	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgcomm-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1 and --no-location.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mcomm-test9.in1 mcomm-test9.in2"
 cat <<EOF > mcomm-test9.in1
 msgid ""
 msgstr ""
@@ -37,11 +40,15 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mcomm-test9.tmp mcomm-test9.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mcomm-test9.ok"
 cat << EOF > mcomm-test9.ok
 msgid ""
 msgstr ""
@@ -62,4 +69,6 @@
 ${DIFF} mcomm-test9.ok mcomm-test9.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-1 gettext-0.18.1.1/gettext-tools/tests/msgconv-1
--- gettext-0.19.3/gettext-tools/tests/msgconv-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from BIG5 to UTF-8.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mco-test1.po"
 cat <<\EOF > mco-test1.po
 # Chinese translation for GNU gettext messages.
 #
@@ -17,9 +20,12 @@
 msgstr "���\��ݭn��n���w��ӿ�J��"
 EOF
 
+tmpfiles="$tmpfiles mco-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mco-test1.ok"
 cat <<\EOF > mco-test1.ok
 # Chinese translation for GNU gettext messages.
 #
@@ -39,4 +45,6 @@
 ${DIFF} mco-test1.ok mco-test1.out >/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-2 gettext-0.18.1.1/gettext-tools/tests/msgconv-2
--- gettext-0.19.3/gettext-tools/tests/msgconv-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5.
 # Test that encoding names are case insensitive.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mco-test2.po"
 cat <<\EOF > mco-test2.po
 # Chinese translation for GNU gettext messages.
 #
@@ -18,9 +21,12 @@
 msgstr "此功能需要恰好指定兩個輸入檔"
 EOF
 
+tmpfiles="$tmpfiles mco-test2.out"
 : ${MSGCONV=msgconv}
-${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po || exit 1
+${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mco-test2.ok"
 cat <<\EOF > mco-test2.ok
 # Chinese translation for GNU gettext messages.
 #
@@ -40,4 +46,6 @@
 ${DIFF} mco-test2.ok mco-test2.out >/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-3 gettext-0.18.1.1/gettext-tools/tests/msgconv-3
--- gettext-0.19.3/gettext-tools/tests/msgconv-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test failing conversion from ISO-8859-15 to ISO-8859-1.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mco-test3.po"
 cat <<\EOF > mco-test3.po
 msgid ""
 msgstr ""
@@ -20,9 +23,12 @@
 msgstr "�uvre"
 EOF
 
+tmpfiles="$tmpfiles mco-test3.out"
 : ${MSGCONV=msgconv}
 ${MSGCONV} -t ISO-8859-1 mco-test3.po -o mco-test3.out 2>/dev/null
 test $? = 1
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-4 gettext-0.18.1.1/gettext-tools/tests/msgconv-4
--- gettext-0.19.3/gettext-tools/tests/msgconv-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,20 +1,27 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax.
 # Test that encoding names are case insensitive.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mco-test4.properties"
 cat <<\EOF > mco-test4.properties
 #: src/msgcmp.c:155 src/msgmerge.c:273
 exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6307\u5b9a\u5169\u500b\u8f38\u5165\u6a94
 EOF
 
+tmpfiles="$tmpfiles mco-test4.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
 ${DIFF} mco-test4.properties mco-test4.out >/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-5 gettext-0.18.1.1/gettext-tools/tests/msgconv-5
--- gettext-0.19.3/gettext-tools/tests/msgconv-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgconv on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mco-test5.po"
 cat <<\EOF > mco-test5.po
 msgid ""
 msgstr ""
@@ -48,10 +51,14 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles mco-test5.tmp mco-test5.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mco-test5.ok"
 cat <<\EOF > mco-test5.ok
 msgid ""
 msgstr ""
@@ -101,4 +108,6 @@
 ${DIFF} mco-test5.ok mco-test5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-6 gettext-0.18.1.1/gettext-tools/tests/msgconv-6
--- gettext-0.19.3/gettext-tools/tests/msgconv-6	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgconv on a PO file with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mco-test6.po"
 cat <<\EOF > mco-test6.po
 msgid ""
 msgstr ""
@@ -21,10 +24,14 @@
 msgstr "Volle 360 Grad"
 EOF
 
+tmpfiles="$tmpfiles mco-test6.tmp mco-test6.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mco-test6.ok"
 cat <<\EOF > mco-test6.ok
 msgid ""
 msgstr ""
@@ -47,4 +54,6 @@
 ${DIFF} mco-test6.ok mco-test6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgconv-7 gettext-0.18.1.1/gettext-tools/tests/msgconv-7
--- gettext-0.19.3/gettext-tools/tests/msgconv-7	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgconv-7	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<\EOF > mco-test7.po
-# Chinese translation for GNU gettext messages.
-#
-msgid ""
-msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=big5\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/msgcmp.c:155 src/msgmerge.c:273
-msgid "exactly 2 input files required"
-msgstr "���\��ݭn��n���w��ӿ�J��"
-EOF
-
-: ${MSGCONV=msgconv}
-${MSGCONV} --add-location=file --to-code=UTF-8 \
-           -o mco-test7.out mco-test7.po || exit 1
-
-cat <<\EOF > mco-test7.ok
-# Chinese translation for GNU gettext messages.
-#
-msgid ""
-msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/msgcmp.c src/msgmerge.c
-msgid "exactly 2 input files required"
-msgstr "此功能需要恰好指定兩個輸入檔"
-EOF
-
-: ${DIFF=diff}
-# Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
-${DIFF} mco-test7.ok mco-test7.out >/dev/null
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgen-1 gettext-0.18.1.1/gettext-tools/tests/msgen-1
--- gettext-0.19.3/gettext-tools/tests/msgen-1	2014-10-01 02:35:20.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgen-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles men-test1.po"
 cat <<EOF > men-test1.po
 # HEADER.
 #
@@ -26,10 +29,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles men-test1.tmp men-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles men-test1.ok"
 cat <<EOF > men-test1.ok
 # HEADER.
 #
@@ -56,13 +63,7 @@
 : ${DIFF=diff}
 ${DIFF} men-test1.ok men-test1.out
 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
+rm -fr $tmpfiles
 
-${DIFF} men-test1.ok men-test1.out
-result=$?
-test $result = 0 || exit $result
+exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgen-2 gettext-0.18.1.1/gettext-tools/tests/msgen-2
--- gettext-0.19.3/gettext-tools/tests/msgen-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgen-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles men-test2.properties"
 cat <<\EOF > men-test2.properties
 !height\ must\ be\ positive=
 
@@ -11,10 +14,14 @@
 width\ must\ be\ positive=
 EOF
 
+tmpfiles="$tmpfiles men-test2.tmp men-test2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles men-test2.ok"
 cat <<\EOF > men-test2.ok
 height\ must\ be\ positive=height must be positive
 
@@ -27,4 +34,6 @@
 ${DIFF} men-test2.ok men-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgen-3 gettext-0.18.1.1/gettext-tools/tests/msgen-3
--- gettext-0.19.3/gettext-tools/tests/msgen-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgen-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgen on a POT file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles men-test3.pot"
 cat <<\EOF > men-test3.pot
 msgid ""
 msgstr ""
@@ -40,10 +43,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles men-test3.tmp men-test3.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles men-test3.ok"
 cat <<\EOF > men-test3.ok
 msgid ""
 msgstr ""
@@ -85,4 +92,6 @@
 ${DIFF} men-test3.ok men-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgen-4 gettext-0.18.1.1/gettext-tools/tests/msgen-4
--- gettext-0.19.3/gettext-tools/tests/msgen-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgen-4	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<EOF > men-test1.po
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: foo:1
-msgid "height must be positive"
-msgstr ""
-
-#: foo:2
-msgid "color cannot be transparent"
-msgstr "colour cannot be transparent"
-
-#: bar:3
-msgid "width must be positive"
-msgstr ""
-
-#: baz:4
-msgid "%d error"
-msgid_plural "%d errors"
-msgstr[0] ""
-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
-
-cat <<EOF > men-test1.ok
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: foo
-msgid "height must be positive"
-msgstr "height must be positive"
-
-#: foo
-msgid "color cannot be transparent"
-msgstr "colour cannot be transparent"
-
-#: bar
-msgid "width must be positive"
-msgstr "width must be positive"
-
-#: baz
-msgid "%d error"
-msgid_plural "%d errors"
-msgstr[0] "%d error"
-msgstr[1] "%d errors"
-EOF
-
-: ${DIFF=diff}
-${DIFF} men-test1.ok men-test1.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgexec-1 gettext-0.18.1.1/gettext-tools/tests/msgexec-1
--- gettext-0.19.3/gettext-tools/tests/msgexec-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgexec-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of an external command.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mex-test1.po"
 cat <<\EOF > mex-test1.po
 # HEADER.
 #
@@ -54,6 +57,7 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles mex-test1.sh"
 cat <<\EOF > mex-test1.sh
 #! /bin/sh
 echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
@@ -67,13 +71,15 @@
 EOF
 chmod a+x mex-test1.sh
 
+tmpfiles="$tmpfiles mex-test1.out mex-test1.err"
 : ${MSGEXEC=msgexec}
 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 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mex-test1.ok"
 cat <<\EOF > mex-test1.ok
 ========================= mex-test1.po:4 =========================
 
@@ -129,4 +135,6 @@
 ${DIFF} mex-test1.ok mex-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgexec-2 gettext-0.18.1.1/gettext-tools/tests/msgexec-2
--- gettext-0.19.3/gettext-tools/tests/msgexec-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgexec-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the builtin command "0".
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Find a 'tr' program that supports NUL bytes in the input.
 # Solaris /usr/bin/tr does not.
 if test -f /usr/xpg6/bin/tr; then
@@ -15,6 +17,7 @@
   fi
 fi
 
+tmpfiles="$tmpfiles mex-test2.po"
 cat <<\EOF > mex-test2.po
 # HEADER.
 #
@@ -66,16 +69,20 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles mex-test2.tmp mex-test2.out mex-test2.err"
 : ${MSGEXEC=msgexec}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} "$abs_srcdir"/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
+${CMP} ${top_srcdir}/tests/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgexec-3 gettext-0.18.1.1/gettext-tools/tests/msgexec-3
--- gettext-0.19.3/gettext-tools/tests/msgexec-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgexec-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of an external command with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mex-test3.properties"
 cat <<\EOF > mex-test3.properties
 # HEADER.
 #
@@ -29,6 +32,7 @@
 !They\ warn\ you\ and\ darn\ you=
 EOF
 
+tmpfiles="$tmpfiles mex-test3.sh"
 cat <<\EOF > mex-test3.sh
 #! /bin/sh
 echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
@@ -42,9 +46,12 @@
 EOF
 chmod a+x mex-test3.sh
 
+tmpfiles="$tmpfiles mex-test3.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mex-test3.ok"
 cat <<\EOF > mex-test3.ok
 ========================= mex-test3.properties:3 =========================
 
@@ -81,4 +88,6 @@
 ${DIFF} mex-test3.ok mex-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgexec-4 gettext-0.18.1.1/gettext-tools/tests/msgexec-4
--- gettext-0.19.3/gettext-tools/tests/msgexec-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgexec-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgexec on a PO file with contexts.
 
@@ -16,6 +15,10 @@
 #    in the GetACP() encoding). This has been reported at
 #    <http://cygwin.com/ml/cygwin/2009-08/msg00430.html>.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mex-test4.po"
 cat <<\EOF > mex-test4.po
 msgid ""
 msgstr ""
@@ -61,6 +64,7 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles mex-test4.sh"
 cat <<\EOF > mex-test4.sh
 #! /bin/sh
 echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
@@ -77,13 +81,15 @@
 EOF
 chmod a+x mex-test4.sh
 
+tmpfiles="$tmpfiles mex-test4.out mex-test4.err"
 : ${MSGEXEC=msgexec}
 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 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mex-test4.ok"
 cat <<\EOF > mex-test4.ok
 ========================= mex-test4.po:2 =========================
 
@@ -136,4 +142,6 @@
 ${DIFF} mex-test4.ok mex-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgexec-5 gettext-0.18.1.1/gettext-tools/tests/msgexec-5
--- gettext-0.19.3/gettext-tools/tests/msgexec-5	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgexec-5	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test msgexec on a PO file with plurals.
-
-cat <<\EOF > mex-test5.po
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#, c-format
-msgid "'Your command, please?', asked the waiter."
-msgstr "'Votre commande, s'il vous plait', dit le garcon."
-
-# Les gateaux allemands sont les meilleurs du monde.
-#, c-format
-#| msgid "a piece of bread"
-#| msgid_plural "%d pieces of bread"
-msgid "a piece of cake"
-msgid_plural "%d pieces of cake"
-msgstr[0] "un morceau de gateau"
-msgstr[1] "%d morceaux de gateau"
-
-# Reverse the arguments.
-#, c-format
-msgid "%s is replaced by %s."
-msgstr "%2$s remplace %1$s."
-EOF
-
-cat <<\EOF > mex-test5.sh
-#! /bin/sh
-echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
-if test -n "${MSGEXEC_MSGCTXT+set}"; then
-  echo "context: $MSGEXEC_MSGCTXT" | LC_ALL=C tr -d '\r'
-fi
-cat <<MEOF
-$MSGEXEC_MSGID
-$MSGEXEC_MSGID_PLURAL
-$MSGEXEC_PLURAL_FORM
-$MSGEXEC_PREV_MSGID
-$MSGEXEC_PREV_MSGID_PLURAL
----
-MEOF
-cat
-echo | LC_ALL=C tr -d '\r'
-exit 0
-EOF
-chmod a+x mex-test5.sh
-
-: ${MSGEXEC=msgexec}
-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; }
-
-cat <<\EOF > mex-test5.ok
-========================= mex-test5.po:2 =========================
-
-
-
-
-
----
-Content-Type: text/plain; charset=ASCII
-Plural-Forms: nplurals=2; plural=(n > 1);
-
-========================= mex-test5.po:8 =========================
-'Your command, please?', asked the waiter.
-
-
-
-
----
-'Votre commande, s'il vous plait', dit le garcon.
-========================= mex-test5.po:16 =========================
-a piece of cake
-%d pieces of cake
-0
-a piece of bread
-%d pieces of bread
----
-un morceau de gateau
-========================= mex-test5.po:16 =========================
-a piece of cake
-%d pieces of cake
-1
-a piece of bread
-%d pieces of bread
----
-%d morceaux de gateau
-========================= mex-test5.po:22 =========================
-%s is replaced by %s.
-
-
-
-
----
-%2$s remplace %1$s.
-EOF
-
-: ${DIFF=diff}
-${DIFF} mex-test5.ok mex-test5.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-1 gettext-0.18.1.1/gettext-tools/tests/msgfilter-1
--- gettext-0.19.3/gettext-tools/tests/msgfilter-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general filter execution.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -19,13 +21,13 @@
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  rm -fr $tmpfiles; 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
+  rm -fr $tmpfiles; exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,9 +36,10 @@
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
+tmpfiles="$tmpfiles mfi-test1.po"
 cat <<\EOF > mfi-test1.po
 # HEADER.
 #
@@ -87,13 +90,15 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles mfi-test1.out mfi-test1.err"
 : ${MSGFILTER=msgfilter}
 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 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mfi-test1.ok"
 cat <<\EOF > mfi-test1.ok
 # HEADER.
 #
@@ -166,4 +171,6 @@
 ${DIFF} mfi-test1.ok mfi-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-2 gettext-0.18.1.1/gettext-tools/tests/msgfilter-2
--- gettext-0.19.3/gettext-tools/tests/msgfilter-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test sed execution.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -20,7 +22,7 @@
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
 test -n "$sedoutput" || {
   echo "Skipping test: sed program is broken"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
@@ -29,9 +31,10 @@
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
 test "$sedoutputcount" = 3 || {
   echo "Skipping test: sed program inserts extra newline"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
+tmpfiles="$tmpfiles mfi-test2.po"
 cat <<\EOF > mfi-test2.po
 # HEADER.
 #
@@ -82,6 +85,7 @@
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
+tmpfiles="$tmpfiles mfi-test2.out mfi-test2.err"
 : ${MSGFILTER=msgfilter}
 sedexpr1='1{
 s/^/\[\[/
@@ -93,8 +97,9 @@
 ${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 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mfi-test2.ok"
 cat <<\EOF > mfi-test2.ok
 # HEADER.
 #
@@ -149,4 +154,6 @@
 ${DIFF} mfi-test2.ok mfi-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-3 gettext-0.18.1.1/gettext-tools/tests/msgfilter-3
--- gettext-0.19.3/gettext-tools/tests/msgfilter-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general filter execution with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -19,13 +21,13 @@
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  rm -fr $tmpfiles; 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
+  rm -fr $tmpfiles; exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,9 +36,10 @@
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
+tmpfiles="$tmpfiles mfi-test3.properties"
 cat <<\EOF > mfi-test3.properties
 # HEADER.
 #
@@ -63,12 +66,14 @@
 !They\ warn\ you\ and\ darn\ you=
 EOF
 
+tmpfiles="$tmpfiles mfi-test3.out"
 : ${MSGFILTER=msgfilter}
 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 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mfi-test3.ok"
 cat <<\EOF > mfi-test3.ok
 # HEADER.
 #
@@ -99,4 +104,6 @@
 ${DIFF} mfi-test3.ok mfi-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-4 gettext-0.18.1.1/gettext-tools/tests/msgfilter-4
--- gettext-0.19.3/gettext-tools/tests/msgfilter-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfilter on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -20,7 +22,7 @@
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
 test -n "$sedoutput" || {
   echo "Skipping test: sed program is broken"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
@@ -29,9 +31,10 @@
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
 test "$sedoutputcount" = 3 || {
   echo "Skipping test: sed program inserts extra newline"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
+tmpfiles="$tmpfiles mfi-test4.po"
 cat <<\EOF > mfi-test4.po
 msgid ""
 msgstr ""
@@ -77,6 +80,7 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles mfi-test4.out mfi-test4.err"
 : ${MSGFILTER=msgfilter}
 sedexpr1='1{
 s/^/\[\[/
@@ -88,8 +92,9 @@
 ${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 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mfi-test4.ok"
 cat <<\EOF > mfi-test4.ok
 msgid ""
 msgstr ""
@@ -139,4 +144,6 @@
 ${DIFF} mfi-test4.ok mfi-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-5 gettext-0.18.1.1/gettext-tools/tests/msgfilter-5
--- gettext-0.19.3/gettext-tools/tests/msgfilter-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-5	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='        '
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-# Some fold programs (like SunOS4 and FreeBSD) don't have an option to wrap at
-# spaces.
-echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
-  echo "Skipping test: fold program not POSIX compliant"
-  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
-}
-
-# Some fold programs (like HP-UX) insert a newline at the end, if the last
-# line was not terminated with a newline and the -s option was given.
-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
-}
-
-cat <<\EOF > mfi-test5.po
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Bonnie Tyler\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: married-men:4
-#, fuzzy
-msgid "The world is full of married men"
-msgstr "So viele verheiratete M�nner"
-
-#: married-men:5
-msgid "with wives who never understand"
-msgstr "und ihre Frauen verstehen sie nicht"
-
-#: married-men:6
-msgid "They're looking for someone to share"
-msgstr ""
-
-# schwer zu �bersetzen...
-#: married-men:7
-msgid "the excitement of a love affair"
-msgstr ""
-
-#: married-men:8
-msgid "Just as soon as they find you"
-msgstr ""
-
-#: married-men:9
-msgid "They warn you and darn you"
-msgstr ""
-
-#~ msgid "You fly on the wings of romance"
-#~ msgstr "Die Fl�gel der frischen Liebe heben dich zum Himmel"
-
-#, fuzzy
-#~ msgid "In the eyes of the world"
-#~ msgstr "F�r die anderen"
-
-# Etwas freie �bersetzung.
-#~ msgid "You're just another crazy girl"
-#~ msgstr "bist du blo� ein verr�cktes dummes Ding"
-
-#~ msgid "Who loves a married man"
-#~ msgstr "das einen verheirateten Mann liebt"
-EOF
-
-: ${MSGFILTER=msgfilter}
-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; }
-
-cat <<\EOF > mfi-test5.ok
-# HEADER.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Bonnie Tyler\n"
-"Content-Type: \n"
-"text/plain; \n"
-"charset=ISO-8859-1\n"
-"Content-Transfer-Enc\n"
-"oding: 8bit\n"
-
-#: married-men
-#, fuzzy
-msgid "The world is full of married men"
-msgstr ""
-"So viele \n"
-"verheiratete M�nner"
-
-#: married-men
-msgid "with wives who never understand"
-msgstr ""
-"und ihre Frauen \n"
-"verstehen sie nicht"
-
-#: married-men
-msgid "They're looking for someone to share"
-msgstr ""
-
-# schwer zu �bersetzen...
-#: married-men
-msgid "the excitement of a love affair"
-msgstr ""
-
-#: married-men
-msgid "Just as soon as they find you"
-msgstr ""
-
-#: married-men
-msgid "They warn you and darn you"
-msgstr ""
-
-#~ msgid "You fly on the wings of romance"
-#~ msgstr ""
-#~ "Die Fl�gel der \n"
-#~ "frischen Liebe \n"
-#~ "heben dich zum \n"
-#~ "Himmel"
-
-#, fuzzy
-#~ msgid "In the eyes of the world"
-#~ msgstr "F�r die anderen"
-
-# Etwas freie �bersetzung.
-#~ msgid "You're just another crazy girl"
-#~ msgstr ""
-#~ "bist du blo� ein \n"
-#~ "verr�cktes dummes \n"
-#~ "Ding"
-
-#~ msgid "Who loves a married man"
-#~ msgstr ""
-#~ "das einen \n"
-#~ "verheirateten Mann \n"
-#~ "liebt"
-EOF
-
-: ${DIFF=diff}
-${DIFF} mfi-test5.ok mfi-test5.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-6 gettext-0.18.1.1/gettext-tools/tests/msgfilter-6
--- gettext-0.19.3/gettext-tools/tests/msgfilter-6	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-6	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test msgfilter on a PO file with plurals.
-
-cat <<\EOF > mf-test6.po
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#, c-format
-msgid "'Your command, please?', asked the waiter."
-msgstr "'Votre commande, s'il vous plait', dit le garcon."
-
-# Les gateaux allemands sont les meilleurs du monde.
-#, c-format
-#| msgid "a piece of bread"
-#| msgid_plural "%d pieces of bread"
-msgid "a piece of cake"
-msgid_plural "%d pieces of cake"
-msgstr[0] "un morceau de gateau"
-msgstr[1] "%d morceaux de gateau"
-
-# Reverse the arguments.
-#, c-format
-msgid "%s is replaced by %s."
-msgstr "%2$s remplace %1$s."
-EOF
-
-: > mf-test6.tmp
-
-cat <<\EOF > mf-test6.sh
-#! /bin/sh
-echo "========================= $MSGFILTER_LOCATION =========================" >> mf-test6.tmp
-if test -n "${MSGFILTER_MSGCTXT+set}"; then
-  echo "context: $MSGFILTER_MSGCTXT" >> mf-test6.tmp
-fi
-cat >> mf-test6.tmp <<MEOF
-$MSGFILTER_MSGID
-$MSGFILTER_MSGID_PLURAL
-$MSGFILTER_PLURAL_FORM
-$MSGFILTER_PREV_MSGID
-$MSGFILTER_PREV_MSGID_PLURAL
-MEOF
-cat
-EOF
-chmod a+x mf-test6.sh
-
-: ${MSGFILTER=msgfilter}
-LC_ALL=C \
-${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; }
-
-LC_ALL=C tr -d '\r' < mf-test6.tmp > mf-test6.out
-
-cat <<\EOF > mf-test6.ok
-========================= mf-test6.po:2 =========================
-
-
-
-
-
-========================= mf-test6.po:8 =========================
-'Your command, please?', asked the waiter.
-
-
-
-
-========================= mf-test6.po:16 =========================
-a piece of cake
-%d pieces of cake
-0
-a piece of bread
-%d pieces of bread
-========================= mf-test6.po:16 =========================
-a piece of cake
-%d pieces of cake
-1
-a piece of bread
-%d pieces of bread
-========================= mf-test6.po:22 =========================
-%s is replaced by %s.
-
-
-
-
-EOF
-
-: ${DIFF=diff}
-${DIFF} mf-test6.ok mf-test6.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-quote-1 gettext-0.18.1.1/gettext-tools/tests/msgfilter-quote-1
--- gettext-0.19.3/gettext-tools/tests/msgfilter-quote-1	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-quote-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,230 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test 'quot' and 'boldquot' filter.
-
-cat <<\EOF > mfi.po
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-04-10 16:40+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=US-ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "\"double quoted\""
-msgstr "\"double quoted\""
-
-msgid "\"\"double quoted\""
-msgstr "\"\"double quoted\""
-
-msgid "\"foo\" \"bar\" \"baz\""
-msgstr "\"foo\" \"bar\" \"baz\""
-
-msgid "double quoted but empty \"\""
-msgstr "double quoted but empty \"\""
-
-msgid "'single quoted'"
-msgstr "'single quoted'"
-
-msgid "'foo' 'bar' 'baz'"
-msgstr "'foo' 'bar' 'baz'"
-
-msgid "prefix'single quoted without surrounding spaces'suffix"
-msgstr "prefix'single quoted without surrounding spaces'suffix"
-
-msgid "prefix 'single quoted with surrounding spaces' suffix"
-msgstr "prefix 'single quoted with surrounding spaces' suffix"
-
-msgid "single quoted with apostrophe, empty '' "
-msgstr "single quoted with apostrophe, empty '' "
-
-msgid "'single quoted at the beginning of string' "
-msgstr "'single quoted at the beginning of string' "
-
-msgid " 'single quoted at the end of string'"
-msgstr " 'single quoted at the end of string'"
-
-msgid ""
-"line 1\n"
-"'single quoted at the beginning of line' \n"
-"line 3"
-msgstr ""
-"line 1\n"
-"'single quoted at the beginning of line' \n"
-"line 3"
-
-msgid ""
-"line 1\n"
-" 'single quoted at the end of line'\n"
-"line 3"
-msgstr ""
-"line 1\n"
-" 'single quoted at the end of line'\n"
-"line 3"
-
-msgid "`single quoted with grave'"
-msgstr "`single quoted with grave'"
-
-msgid "single quoted with grave, empty `'"
-msgstr "single quoted with grave, empty `'"
-
-msgid "``double grave'"
-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
-
-cat <<\EOF > mfi-quot.ok
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-04-10 16:40+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "\"double quoted\""
-msgstr "“double quoted”"
-
-msgid "\"\"double quoted\""
-msgstr "\"\"double quoted\""
-
-msgid "\"foo\" \"bar\" \"baz\""
-msgstr "“foo” “bar” “baz”"
-
-msgid "double quoted but empty \"\""
-msgstr "double quoted but empty \"\""
-
-msgid "'single quoted'"
-msgstr "'single quoted'"
-
-msgid "'foo' 'bar' 'baz'"
-msgstr "‘foo’ ‘bar’ ‘baz’"
-
-msgid "prefix'single quoted without surrounding spaces'suffix"
-msgstr "prefix'single quoted without surrounding spaces'suffix"
-
-msgid "prefix 'single quoted with surrounding spaces' suffix"
-msgstr "prefix ‘single quoted with surrounding spaces’ suffix"
-
-msgid "single quoted with apostrophe, empty '' "
-msgstr "single quoted with apostrophe, empty ‘’ "
-
-msgid "'single quoted at the beginning of string' "
-msgstr "‘single quoted at the beginning of string’ "
-
-msgid " 'single quoted at the end of string'"
-msgstr " ‘single quoted at the end of string’"
-
-msgid ""
-"line 1\n"
-"'single quoted at the beginning of line' \n"
-"line 3"
-msgstr ""
-"line 1\n"
-"‘single quoted at the beginning of line’ \n"
-"line 3"
-
-msgid ""
-"line 1\n"
-" 'single quoted at the end of line'\n"
-"line 3"
-msgstr ""
-"line 1\n"
-" ‘single quoted at the end of line’\n"
-"line 3"
-
-msgid "`single quoted with grave'"
-msgstr "‘single quoted with grave’"
-
-msgid "single quoted with grave, empty `'"
-msgstr "single quoted with grave, empty ‘’"
-
-msgid "``double grave'"
-msgstr "`‘double grave’"
-EOF
-
-: ${DIFF=diff}
-${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
-
-cat <<\EOF > mfi-boldquot.ok
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-04-10 16:40+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "\"double quoted\""
-msgstr "“double quoted”"
-
-msgid "\"\"double quoted\""
-msgstr "\"\"double quoted\""
-
-msgid "\"foo\" \"bar\" \"baz\""
-msgstr "“foo” “bar” “baz”"
-
-msgid "double quoted but empty \"\""
-msgstr "double quoted but empty \"\""
-
-msgid "'single quoted'"
-msgstr "'single quoted'"
-
-msgid "'foo' 'bar' 'baz'"
-msgstr "‘foo’ ‘bar’ ‘baz’"
-
-msgid "prefix'single quoted without surrounding spaces'suffix"
-msgstr "prefix'single quoted without surrounding spaces'suffix"
-
-msgid "prefix 'single quoted with surrounding spaces' suffix"
-msgstr "prefix ‘single quoted with surrounding spaces’ suffix"
-
-msgid "single quoted with apostrophe, empty '' "
-msgstr "single quoted with apostrophe, empty ‘’ "
-
-msgid "'single quoted at the beginning of string' "
-msgstr "‘single quoted at the beginning of string’ "
-
-msgid " 'single quoted at the end of string'"
-msgstr " ‘single quoted at the end of string’"
-
-msgid ""
-"line 1\n"
-"'single quoted at the beginning of line' \n"
-"line 3"
-msgstr ""
-"line 1\n"
-"‘single quoted at the beginning of line’ \n"
-"line 3"
-
-msgid ""
-"line 1\n"
-" 'single quoted at the end of line'\n"
-"line 3"
-msgstr ""
-"line 1\n"
-" ‘single quoted at the end of line’\n"
-"line 3"
-
-msgid "`single quoted with grave'"
-msgstr "‘single quoted with grave’"
-
-msgid "single quoted with grave, empty `'"
-msgstr "single quoted with grave, empty ‘’"
-
-msgid "``double grave'"
-msgstr "`‘double grave’"
-EOF
-
-${DIFF} mfi-boldquot.ok mfi-boldquot.out || exit 1
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfilter-sr-latin-1 gettext-0.18.1.1/gettext-tools/tests/msgfilter-sr-latin-1
--- gettext-0.19.3/gettext-tools/tests/msgfilter-sr-latin-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfilter-sr-latin-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfilter with command recode-sr-latin1.
 # Verify that it converts to UTF-8.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mfi-srl-1.po"
 cat <<\EOF > mfi-srl-1.po
 # Serbian translation of gettext-runtime
 # Copyright (C) 2003 Free Software Foundation, Inc.
@@ -305,17 +308,14 @@
 "��������� ����������� �� ������: %s\n"
 EOF
 
-# On Solaris 11, the mfi-srl-1.po has a wrong contents. Apparently the handling
-# 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
-}
-
+tmpfiles="$tmpfiles mfi-srl-1.tmp mfi-srl-1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mfi-srl-1.ok"
 cat <<\EOF > mfi-srl-1.ok
 # Serbian translation of gettext-runtime
 # Copyright (C) 2003 Free Software Foundation, Inc.
@@ -621,4 +621,6 @@
 ${DIFF} mfi-srl-1.ok mfi-srl-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-1 gettext-0.18.1.1/gettext-tools/tests/msgfmt-1
--- gettext-0.19.3/gettext-tools/tests/msgfmt-1	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,15 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functionality, duplicate detection, multiple domains.
 
-test -d mf-1 || mkdir mf-1
-test -d mf-1/LC_MESSAGES || mkdir mf-1/LC_MESSAGES
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
 
-cat <<EOF > mf-1-module1.po
+tmpfiles="$tmpfiles LC_MESSAGES"
+test -d LC_MESSAGES || mkdir LC_MESSAGES
+
+tmpfiles="$tmpfiles module1.po module2.po"
+cat <<EOF > module1.po
 #default domain "messages.mo"
 msgid	"SYS_(C)\n"
 msgstr "MSGFMT(3) portable message object file compiler\n"
@@ -24,7 +27,7 @@
 msgstr	"error 3 translation"
 EOF
 
-cat <<EOF > mf-1-module2.po
+cat <<EOF > module2.po
 # ---
 #default domain "messages.mo"
 msgid	"mesg 4"
@@ -43,20 +46,26 @@
 
 # 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
+if ${MSGFMT} -o LC_MESSAGES/gen.mo module1.po module2.po 2> /dev/null; then
+  rm -fr $tmpfiles
   exit 1
 fi
 
 # With msgcat, it should work.
+tmpfiles="$tmpfiles modules.po"
 : ${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 modules.po module1.po module2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGFMT} -o LC_MESSAGES/gen.mo modules.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-test1.out"
 : ${GETTEXT=gettext}
-TEXTDOMAINDIR=. LANGUAGE=mf-1 \
+TEXTDOMAINDIR=.. LANGUAGE=tests \
 ${GETTEXT} --env LC_ALL=en gen 'SYS_(C)
 ' | LC_ALL=C tr -d '\r' > mf-test1.out
 
+tmpfiles="$tmpfiles gtmf-test1.ok"
 cat <<EOF > gtmf-test1.ok
 MSGFMT(3) portable message object file compiler
 Copyright (C) 1995 Free Software Foundation
@@ -67,4 +76,6 @@
 ${DIFF} gtmf-test1.ok mf-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-10 gettext-0.18.1.1/gettext-tools/tests/msgfmt-10
--- gettext-0.19.3/gettext-tools/tests/msgfmt-10	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test format string checking in plural entries.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test10.po1"
 cat <<\EOF > mf-test10.po1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -14,7 +17,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,8 +38,10 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-test10.po1 || exit 1
+${MSGFMT} --check -o /dev/null mf-test10.po1
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-test10.po2"
 cat <<\EOF > mf-test10.po2
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -48,6 +52,7 @@
 "Project-Id-Version: GNU bison\n"
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
+"Language-Team: test <test@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,15 +66,15 @@
 msgstr[1] "%d yarars�z kural%s"
 EOF
 
+tmpfiles="$tmpfiles mf-test10.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --check -o /dev/null mf-test10.po2 \
     2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test10.err
 
+tmpfiles="$tmpfiles mf-test10.ok"
 cat << EOF > mf-test10.ok
-mf-test10.po2:6: warning: header field 'Language-Team' missing in header
-mf-test10.po2:6: warning: header field 'Language' missing in header
-mf-test10.po2:19: number of format specifications in 'msgid_plural' and 'msgstr[1]' does not match
+mf-test10.po2:20: number of format specifications in 'msgid_plural' and 'msgstr[1]' does not match
 msgfmt: found 1 fatal error
 EOF
 
@@ -77,4 +82,6 @@
 ${DIFF} mf-test10.ok mf-test10.err
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-11 gettext-0.18.1.1/gettext-tools/tests/msgfmt-11
--- gettext-0.19.3/gettext-tools/tests/msgfmt-11	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-11	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of invalid multibyte sequences.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-11.po"
 cat <<\EOF > mf-11.po
 msgid ""
 msgstr ""
@@ -19,6 +22,7 @@
 msgstr "_�צ������ ���æ���Φ ��������Ԧ ���צ�����"
 EOF
 
+tmpfiles="$tmpfiles mf-11.mo core *.core"
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o mf-11.mo mf-11.po 2>/dev/null
 # Exit code must be 1.
@@ -27,4 +31,6 @@
 test $? = 1
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-12 gettext-0.18.1.1/gettext-tools/tests/msgfmt-12
--- gettext-0.19.3/gettext-tools/tests/msgfmt-12	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-12	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-12.po"
 cat <<\EOF > mf-12.po
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -19,13 +22,19 @@
 msgstr "<PRIXFAST16> Fehler"
 EOF
 
+tmpfiles="$tmpfiles mf-12.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-12.mo mf-12.po || exit 1
+${MSGFMT} -o mf-12.mo mf-12.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-12.tmp mf-12.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-12.ok"
 cat <<\EOF > mf-12.ok
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -46,4 +55,6 @@
 ${DIFF} mf-12.ok mf-12.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-13 gettext-0.18.1.1/gettext-tools/tests/msgfmt-13
--- gettext-0.19.3/gettext-tools/tests/msgfmt-13	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-13	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that an out-of-range Unicode character doesn't lead to a crash.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test13.po"
 cat <<\EOF >mf-test13.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -25,6 +28,7 @@
 
 EOF
 
+tmpfiles="$tmpfiles mf-test13.mo"
 : ${MSGFMT=msgfmt}
 ${MSGFMT} mf-test13.po -o mf-test13.mo 2>/dev/null
 # Exit code must be 1.
@@ -33,4 +37,6 @@
 test $? = 1
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-14 gettext-0.18.1.1/gettext-tools/tests/msgfmt-14
--- gettext-0.19.3/gettext-tools/tests/msgfmt-14	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-14	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt and msgunfmt on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-14.po"
 cat <<\EOF > mf-14.po
 msgid ""
 msgstr ""
@@ -48,13 +51,19 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles mf-14.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-14.mo mf-14.po || exit 1
+${MSGFMT} -o mf-14.mo mf-14.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-14.tmp mf-14.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-14.ok"
 cat <<\EOF > mf-14.ok
 msgid ""
 msgstr ""
@@ -90,4 +99,6 @@
 ${DIFF} mf-14.ok mf-14.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-15 gettext-0.18.1.1/gettext-tools/tests/msgfmt-15
--- gettext-0.19.3/gettext-tools/tests/msgfmt-15	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-15	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test plural formula dependent checking of format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Take as example a plural formula which takes the values 0 and 2 infinitely
 # often, and value 1 only a few times.
 # Test: 1 - have %d everywhere - OK
@@ -10,6 +12,7 @@
 #       3 - lack %d for value 1 - OK
 #       4 - lack %d for value 2 - error
 
+tmpfiles="$tmpfiles mf-15.po1"
 cat <<\EOF > mf-15.po1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -21,7 +24,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,8 +39,10 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-15.po1 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po1
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-15.po2"
 cat <<\EOF > mf-15.po2
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -50,7 +54,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,8 +70,9 @@
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-15.po2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-15.po3"
 cat <<\EOF > mf-15.po3
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -80,7 +84,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,8 +99,10 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-15.po3 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po3
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-15.po4"
 cat <<\EOF > mf-15.po4
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -109,7 +114,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -126,6 +130,8 @@
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-15.po4 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-16 gettext-0.18.1.1/gettext-tools/tests/msgfmt-16
--- gettext-0.19.3/gettext-tools/tests/msgfmt-16	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-16	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt on a PO file with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-16.po"
 cat <<\EOF > mf-16.po
 msgid ""
 msgstr ""
@@ -41,13 +44,19 @@
 #~ msgstr "%s: ungültige Option -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles mf-16.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-16.mo mf-16.po || exit 1
+${MSGFMT} -o mf-16.mo mf-16.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-16.tmp mf-16.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-16.ok"
 cat <<\EOF > mf-16.ok
 msgid ""
 msgstr ""
@@ -63,4 +72,6 @@
 ${DIFF} mf-16.ok mf-16.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-17 gettext-0.18.1.1/gettext-tools/tests/msgfmt-17
--- gettext-0.19.3/gettext-tools/tests/msgfmt-17	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-17	2010-06-06 12:49:58.000000000 +0000
@@ -1,15 +1,18 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test range dependent checking of format strings with plural forms.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Take as example a plural formula which takes all values infinitely often.
 # Test: 1 - lack %d for value 0 - error
 #       2 - lack %d for value 0 but limited range such that only one n - ok
 #       3 - lack %d for value 1 - error
 #       4 - lack %d for value 1 but limited range such that multiple n - error
 
-cat <<\EOF > mf-17.po1
+tmpfiles="$tmpfiles mf-15.po1"
+cat <<\EOF > mf-15.po1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -20,7 +23,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,10 +38,11 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-17.po1 2>/dev/null
-test $? = 1 || { exit 1; }
+${MSGFMT} --check -o /dev/null mf-15.po1 2>/dev/null
+test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
-cat <<\EOF > mf-17.po2
+tmpfiles="$tmpfiles mf-15.po2"
+cat <<\EOF > mf-15.po2
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -50,7 +53,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,9 +68,11 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-17.po2 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-cat <<\EOF > mf-17.po3
+tmpfiles="$tmpfiles mf-15.po3"
+cat <<\EOF > mf-15.po3
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -79,7 +83,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,10 +98,11 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-17.po3 2>/dev/null
-test $? = 1 || { exit 1; }
+${MSGFMT} --check -o /dev/null mf-15.po3 2>/dev/null
+test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
-cat <<\EOF > mf-17.po4
+tmpfiles="$tmpfiles mf-15.po4"
+cat <<\EOF > mf-15.po4
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -109,7 +113,6 @@
 "PO-Revision-Date: 2001-04-05 19:47+0200\n"
 "Last-Translator: ABC DEF <abc@gnu.uucp>\n"
 "Language-Team: test <test@li.org>\n"
-"Language: test\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -125,7 +128,9 @@
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-17.po4 2>/dev/null
-test $? = 1 || { exit 1; }
+${MSGFMT} --check -o /dev/null mf-15.po4 2>/dev/null
+test $? = 1 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-18 gettext-0.18.1.1/gettext-tools/tests/msgfmt-18
--- gettext-0.19.3/gettext-tools/tests/msgfmt-18	2014-06-02 06:56:47.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-18	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test accelerators.
-
-cat <<\EOF > mf-18.po
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU bison\n"
-"PO-Revision-Date: 2001-04-05 19:47+0200\n"
-"Last-Translator: ABC DEF <abc@gnu.uucp>\n"
-"Language-Team: test <test@li.org>\n"
-"Language: test\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Open &File"
-msgstr "Open File"
-
-msgid "Show _Help"
-msgstr "Show Help"
-EOF
-
-: ${MSGFMT=msgfmt}
-${MSGFMT} --check-accelerators -o /dev/null mf-18.po 2>/dev/null
-test $? = 1 || { exit 1; }
-
-: ${MSGFMT=msgfmt}
-${MSGFMT} --check-accelerators='_' -o /dev/null mf-18.po 2>/dev/null
-test $? = 1 || { exit 1; }
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-2 gettext-0.18.1.1/gettext-tools/tests/msgfmt-2
--- gettext-0.19.3/gettext-tools/tests/msgfmt-2	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functionality, duplicate detection, multiple domains.
 
@@ -15,10 +14,14 @@
   ac_n= ac_c='\c' ac_t=
 fi
 
-test -d mf-2 || mkdir mf-2
-test -d mf-2/LC_MESSAGES || mkdir mf-2/LC_MESSAGES
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
 
-cat <<EOF > mf-2-module1.po
+tmpfiles="$tmpfiles LC_MESSAGES"
+test -d LC_MESSAGES || mkdir LC_MESSAGES
+
+tmpfiles="$tmpfiles module1.po module2.po"
+cat <<EOF > module1.po
 #default domain "messages.mo"
 msgid	"SYS_(C)\n"
 msgstr "MSGFMT(3) portable message object file compiler\n"
@@ -36,7 +39,7 @@
 msgstr	"error 3 translation"
 EOF
 
-cat <<EOF > mf-2-module2.po
+cat <<EOF > module2.po
 # ---
 #default domain "messages.mo"
 msgid	"mesg 4"
@@ -55,23 +58,31 @@
 
 # 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
+if ${MSGFMT} -o LC_MESSAGES/gen.mo module1.po module2.po 2> /dev/null; then
+  rm -fr $tmpfiles
   exit 1
 fi
 
 # With msgcat, it should work.
+tmpfiles="$tmpfiles modules.po"
 : ${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 modules.po module1.po module2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGFMT} -o LC_MESSAGES/gen.mo modules.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-test2.out"
 : ${GETTEXT=gettext}
-TEXTDOMAINDIR=. LANGUAGE=mf-2 \
+TEXTDOMAINDIR=.. LANGUAGE=tests \
 ${GETTEXT} --env LC_ALL=en gen 'error 3' > mf-test2.out
 
+tmpfiles="$tmpfiles gtmf-test2.ok"
 echo $ac_n "error 3 translation$ac_c" > gtmf-test2.ok
 
 : ${DIFF=diff}
 ${DIFF} gtmf-test2.ok mf-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-3 gettext-0.18.1.1/gettext-tools/tests/msgfmt-3
--- gettext-0.19.3/gettext-tools/tests/msgfmt-3	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that an empty header entry is OK.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test3.po"
 cat <<EOF >mf-test3.po
 #
 #       xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -17,14 +20,17 @@
 msgstr  ""
 EOF
 
+tmpfiles="$tmpfiles mftest3.mo mftest3.err"
 : ${MSGFMT=msgfmt}
 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 || { rm -fr $tmpfiles; exit 1; }
 
 test ! -f mftest3.mo
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-4 gettext-0.18.1.1/gettext-tools/tests/msgfmt-4
--- gettext-0.19.3/gettext-tools/tests/msgfmt-4	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test c-format handling.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test4.po"
 cat <<EOF >mf-test4.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -36,4 +39,6 @@
 ${MSGFMT} -o /dev/null mf-test4.po 2> /dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-5 gettext-0.18.1.1/gettext-tools/tests/msgfmt-5
--- gettext-0.19.3/gettext-tools/tests/msgfmt-5	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles foo.po"
 cat <<\EOF > foo.po
 domain "foo-de"
 msgid ""
@@ -29,15 +32,23 @@
 msgstr "A bient�t"
 EOF
 
+tmpfiles="$tmpfiles foo-de.mo foo-fr.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} foo.po || exit 1
+${MSGFMT} foo.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles foo-de.tmp foo-de.out foo-fr.tmp foo-fr.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGUNFMT} -o foo-fr.tmp foo-fr.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles foo-de.ok"
 cat <<\EOF > foo-de.ok
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -49,6 +60,7 @@
 msgstr "Hallo"
 EOF
 
+tmpfiles="$tmpfiles foo-fr.ok"
 cat <<\EOF > foo-fr.ok
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -64,4 +76,6 @@
 ${DIFF} foo-de.ok foo-de.out && ${DIFF} foo-fr.ok foo-fr.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-6 gettext-0.18.1.1/gettext-tools/tests/msgfmt-6
--- gettext-0.19.3/gettext-tools/tests/msgfmt-6	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test catching of division by zero in plural expression.
 
 # Note: On AIX 3 with xlc, this test fails. To make it work, add "-qcheck"
 # to the CFLAGS, or use gcc.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-6.po"
 cat <<EOF > mf-6.po
 msgid ""
 msgstr ""
@@ -19,6 +22,7 @@
 "Plural-Forms: nplurals=3; plural=(1 + (1 / (n - 257)));\n"
 EOF
 
+tmpfiles="$tmpfiles mf-6.mo core *.core"
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o mf-6.mo mf-6.po 2>/dev/null
 # Exit code must be 1.
@@ -27,4 +31,6 @@
 test $? = 1
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-7 gettext-0.18.1.1/gettext-tools/tests/msgfmt-7
--- gettext-0.19.3/gettext-tools/tests/msgfmt-7	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Check for duplicates with identical translations
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test7.in1"
 cat <<EOF > mf-test7.in1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -23,11 +26,13 @@
 msgid "3" msgstr "3"
 EOF
 
+tmpfiles="$tmpfiles mf-test7.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test7.in1 -o /dev/null \
     2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test7.err
 
+tmpfiles="$tmpfiles mf-test7.ok"
 cat << EOF > mf-test7.ok
 mf-test7.in1:17: duplicate message definition...
 mf-test7.in1:16: ...this is the location of the first definition
@@ -38,4 +43,6 @@
 ${DIFF} mf-test7.ok mf-test7.err
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-8 gettext-0.18.1.1/gettext-tools/tests/msgfmt-8
--- gettext-0.19.3/gettext-tools/tests/msgfmt-8	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Check for duplicates with different translations
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test8.in1"
 cat <<EOF > mf-test8.in1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -23,11 +26,13 @@
 msgid "3" msgstr "three ha ha"
 EOF
 
+tmpfiles="$tmpfiles mf-test8.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test8.in1 -o /dev/null \
     2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test8.err
 
+tmpfiles="$tmpfiles mf-test8.ok"
 cat << EOF > mf-test8.ok
 mf-test8.in1:17: duplicate message definition...
 mf-test8.in1:16: ...this is the location of the first definition
@@ -38,4 +43,6 @@
 ${DIFF} mf-test8.ok mf-test8.err
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-9 gettext-0.18.1.1/gettext-tools/tests/msgfmt-9
--- gettext-0.19.3/gettext-tools/tests/msgfmt-9	2014-04-15 01:52:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Duplicates are also fatal in obsolete marked entries.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-test9.in1"
 cat <<EOF > mf-test9.in1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -26,11 +29,13 @@
 #~ "ha ha"
 EOF
 
+tmpfiles="$tmpfiles mf-test9.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test9.in1 -o /dev/null \
     2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test9.err
 
+tmpfiles="$tmpfiles mf-test9.ok"
 cat << EOF > mf-test9.ok
 mf-test9.in1:17: duplicate message definition...
 mf-test9.in1:15: ...this is the location of the first definition
@@ -41,4 +46,6 @@
 ${DIFF} mf-test9.ok mf-test9.err
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-desktop-1 gettext-0.18.1.1/gettext-tools/tests/msgfmt-desktop-1
--- gettext-0.19.3/gettext-tools/tests/msgfmt-desktop-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-desktop-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test iterative mode of msgfmt --desktop.
-
-cat <<\EOF > mf.desktop
-[Desktop Entry]
-Type=Application
-Name =Foo
-Comment[foo]=Already translated comment
-Comment= \sThis is a \nmultiline comment; for testing
-Keywords=Keyword1;Keyword2;Key\;word3;
-EOF
-
-cat <<\EOF > fr.po
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-17 07:36+0900\n"
-"PO-Revision-Date: 2014-03-17 08:40+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg.desktop:4
-msgid "Foo"
-msgstr ""
-"French\n"
-"foo"
-
-#: xg.desktop:5
-msgid ""
-" This is a \n"
-"multiline comment; for testing"
-msgstr ""
-"French \n"
-"comment"
-
-#: xg.desktop:7
-msgid "Keyword1;Keyword2;Key\\;word3;"
-msgstr "one;two;thr\\;ee;"
-EOF
-
-cat <<\EOF > mf.desktop.ok
-[Desktop Entry]
-Type=Application
-Name[fr]=French\nfoo
-Name=Foo
-Comment[foo]=Already translated comment
-Comment[fr]=French \ncomment
-Comment=\sThis is a \nmultiline comment; for testing
-Keywords[fr]=one;two;thr\;ee;
-Keywords=Keyword1;Keyword2;Key\;word3;
-EOF
-
-# Sanity checks for contradicting options.
-
-${MSGFMT} --desktop --template=mf.desktop -l fr fr.po \
-          >/dev/null 2>/dev/null \
-  && exit 1
-
-${MSGFMG} --desktop --template=mf.desktop fr.po -o mf.desktop.out \
-          >/dev/null 2>/dev/null \
-  && exit 1
-
-# Proceed to the .desktop file generation.
-
-${MSGFMT} --desktop --template=mf.desktop -l fr fr.po -o mf.desktop.out \
-  || exit 1
-
-: ${DIFF=diff}
-${DIFF} mf.desktop.ok mf.desktop.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-desktop-2 gettext-0.18.1.1/gettext-tools/tests/msgfmt-desktop-2
--- gettext-0.19.3/gettext-tools/tests/msgfmt-desktop-2	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-desktop-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test 'bulk' mode of Desktop Entry support.
-
-cat <<\EOF > mf.desktop
-[Desktop Entry]
-Type=Application
-Name =Foo
-
-Comment[foo]=Already translated comment
-Comment= \sThis is a \nmultiline comment; for testing
-# This is a comment and must be preserved
-Keywords=Keyword1;Keyword2;Key\;word3;
-EOF
-
-test -d po || mkdir po
-
-cat <<\EOF > po/fr.po
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-17 07:36+0900\n"
-"PO-Revision-Date: 2014-03-17 08:40+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg.desktop:4
-msgid "Foo"
-msgstr ""
-"French\n"
-"foo"
-
-#: xg.desktop:5
-msgid ""
-" This is a \n"
-"multiline comment; for testing"
-msgstr ""
-"French \n"
-"comment"
-
-#: xg.desktop:7
-msgid "Keyword1;Keyword2;Key\\;word3;"
-msgstr "one;two;thr\\;ee;"
-EOF
-
-cat <<\EOF > po/de.po
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-17 07:36+0900\n"
-"PO-Revision-Date: 2014-03-17 08:40+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg.desktop:4
-msgid "Foo"
-msgstr ""
-"German\n"
-"foo"
-
-#: xg.desktop:5
-msgid ""
-" This is a \n"
-"multiline comment; for testing"
-msgstr ""
-"German \n"
-"comment"
-
-#: xg.desktop:7
-msgid "Keyword1;Keyword2;Key\\;word3;"
-msgstr "one;two;thr\\;ee;"
-EOF
-
-cat <<\EOF > mf.desktop.ok
-[Desktop Entry]
-Type=Application
-Name[de]=German\nfoo
-Name[fr]=French\nfoo
-Name=Foo
-
-Comment[foo]=Already translated comment
-Comment[de]=German \ncomment
-Comment[fr]=French \ncomment
-Comment=\sThis is a \nmultiline comment; for testing
-# This is a comment and must be preserved
-Keywords[de]=one;two;thr\;ee;
-Keywords[fr]=one;two;thr\;ee;
-Keywords=Keyword1;Keyword2;Key\;word3;
-EOF
-
-cat <<\EOF > mf.desktop.desired.ok
-[Desktop Entry]
-Type=Application
-Name[fr]=French\nfoo
-Name=Foo
-
-Comment[foo]=Already translated comment
-Comment[fr]=French \ncomment
-Comment=\sThis is a \nmultiline comment; for testing
-# This is a comment and must be preserved
-Keywords[fr]=one;two;thr\;ee;
-Keywords=Keyword1;Keyword2;Key\;word3;
-EOF
-
-unset LINGUAS
-
-# Sanity checks for contradicting options.
-
-${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \
-          >/dev/null 2>/dev/null \
-  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
-
-rm -fr po/LINGUAS
-
-cat <<\EOF > po/LINGUAS
-de
-fr
-EOF
-
-${MSGFMT} --desktop --template=mf.desktop -d po \
-          >/dev/null 2>/dev/null \
-  && exit 1
-
-${MSGFMG} --desktop --template=mf.desktop -d po -o mf.desktop.out -l fr \
-          >/dev/null 2>/dev/null \
-  && exit 1
-
-${MSGFMG} --desktop --template=mf.desktop -d po -o mf.desktop.out po/fr.po \
-          >/dev/null 2>/dev/null \
-  && exit 1
-
-# Proceed to the .desktop file generation.
-
-${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
-
-# 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
-
-: ${DIFF=diff}
-${DIFF} mf.desktop.desired.ok mf.desktop.desired.out
-test $? = 0 || exit 1
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-properties-1 gettext-0.18.1.1/gettext-tools/tests/msgfmt-properties-1
--- gettext-0.19.3/gettext-tools/tests/msgfmt-properties-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-properties-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functioning with Java .properties syntax.
 
-test -d mf-p-1 || mkdir mf-p-1
-test -d mf-p-1/LC_MESSAGES || mkdir mf-p-1/LC_MESSAGES
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
 
+tmpfiles="$tmpfiles LC_MESSAGES"
+test -d LC_MESSAGES || mkdir LC_MESSAGES
+
+tmpfiles="$tmpfiles mf-p-1-1.properties mf-p-1-2.properties"
 cat <<\EOF > mf-p-1-1.properties
 SYS_(C)\n=MSGFMT(3) portable message object file compiler\nCopyright (C) 1995 Free Software Foundation\nReport bugs to <bug-gnu-utils@gnu.org>\n
 msg\ 1=msg 1 translation
@@ -23,28 +26,36 @@
 
 # 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
+if ${MSGFMT} --properties-input -o LC_MESSAGES/gen.mo mf-p-1-1.properties mf-p-1-2.properties 2> /dev/null; then
+  rm -fr $tmpfiles
   exit 1
 fi
 
 # With msgcat, it should work.
+tmpfiles="$tmpfiles mf-p-1-s.properties"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGFMT} --properties-input -o LC_MESSAGES/gen.mo mf-p-1-s.properties
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mf-test1.out"
 : ${GETTEXT=gettext}
-TEXTDOMAINDIR=. LANGUAGE=mf-p-1 \
+TEXTDOMAINDIR=.. LANGUAGE=tests \
 ${GETTEXT} --env LC_ALL=en gen 'SYS_(C)
-' | LC_ALL=C tr -d '\r' > mf-p-test1.out
+' | LC_ALL=C tr -d '\r' > mf-test1.out
 
-cat <<EOF > gtmf-p-test1.ok
+tmpfiles="$tmpfiles gtmf-test1.ok"
+cat <<EOF > gtmf-test1.ok
 MSGFMT(3) portable message object file compiler
 Copyright (C) 1995 Free Software Foundation
 Report bugs to <bug-gnu-utils@gnu.org>
 EOF
 
 : ${DIFF=diff}
-${DIFF} gtmf-p-test1.ok mf-p-test1.out
+${DIFF} gtmf-test1.ok mf-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-qt-1 gettext-0.18.1.1/gettext-tools/tests/msgfmt-qt-1
--- gettext-0.19.3/gettext-tools/tests/msgfmt-qt-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-qt-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,13 +1,19 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test output in Qt .qm format.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-qt-1.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || exit 1
+${MSGFMT} --qt -o mf-qt-1.qm ${top_srcdir}/tests/qttest_pl.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} "$abs_srcdir"/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
+${CMP} ${top_srcdir}/tests/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgfmt-qt-2 gettext-0.18.1.1/gettext-tools/tests/msgfmt-qt-2
--- gettext-0.19.3/gettext-tools/tests/msgfmt-qt-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgfmt-qt-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,13 +1,19 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt --qt on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mf-qt-2.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || exit 1
+${MSGFMT} --qt ${top_srcdir}/tests/qttest2_de.po -o mf-qt-2.qm
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} "$abs_srcdir"/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
+${CMP} ${top_srcdir}/tests/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-1 gettext-0.18.1.1/gettext-tools/tests/msggrep-1
--- gettext-0.19.3/gettext-tools/tests/msggrep-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --location option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test1.po"
 cat <<\EOF > mg-test1.po
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -152,10 +155,14 @@
 msgstr "Subprozess %s hat ein fatales Signal erhalten"
 EOF
 
+tmpfiles="$tmpfiles mg-test1.tmp mg-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test1.ok"
 cat <<\EOF > mg-test1.ok
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -186,4 +193,6 @@
 ${DIFF} mg-test1.ok mg-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-10 gettext-0.18.1.1/gettext-tools/tests/msggrep-10
--- gettext-0.19.3/gettext-tools/tests/msggrep-10	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,16 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that $ as end-of-line anchor does not cause a crash.
 # <https://bugzilla.redhat.com/show_bug.cgi?id=483181>
 # <https://savannah.gnu.org/bugs/?25437>
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-11 gettext-0.18.1.1/gettext-tools/tests/msggrep-11
--- gettext-0.19.3/gettext-tools/tests/msggrep-11	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-11	1970-01-01 00:00:00.000000000 +0000
@@ -1,189 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<\EOF > mg-test11.po
-# German translations for GNU gettext package.
-# Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU gettext 0.11-pre1\n"
-"POT-Creation-Date: 2001-12-08 20:33+0100\n"
-"PO-Revision-Date: 2001-11-04 12:25+0100\n"
-"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: argmatch.c:141
-#, c-format
-msgid "invalid argument `%s' for `%s'"
-msgstr "ung�ltiges Argument �%s� f�r �%s�"
-
-#: argmatch.c:142
-#, c-format
-msgid "ambiguous argument `%s' for `%s'"
-msgstr "mehrdeutiges Argument �%s� f�r �%s�"
-
-#: argmatch.c:162
-msgid "Valid arguments are:"
-msgstr "G�ltige Argumente sind:"
-
-#: copy-file.c:60
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "�ffnen der Datei �%s� zum Lesen fehlgeschlagen"
-
-#: copy-file.c:67
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
-msgstr "�ffnen der Sicherungsdatei �%s� zum Schreiben fehlgeschlagen"
-
-#: copy-file.c:80
-#, c-format
-msgid "error reading \"%s\""
-msgstr "Fehler beim Lesen von �%s�"
-
-#: copy-file.c:86 copy-file.c:90
-#, c-format
-msgid "error writing \"%s\""
-msgstr "Fehler beim Schreiben von �%s�"
-
-#: copy-file.c:92
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "Fehler nach dem Lesen von �%s�"
-
-#: error.c:115
-msgid "Unknown system error"
-msgstr "Unbekannter Systemfehler"
-
-#: execute.c:170 execute.c:205 pipe-bidi.c:156 pipe-bidi.c:191 pipe-in.c:169
-#: pipe-in.c:205 pipe-out.c:169 pipe-out.c:205 wait-process.c:136
-#, c-format
-msgid "%s subprocess failed"
-msgstr "Subprozess %s fehlgeschlagen"
-
-#: getopt.c:691
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option �%s� ist mehrdeutig\n"
-
-#: getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Option �--%s� erwartet kein Argument\n"
-
-#: getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Option �%c%s� erwartet kein Argument\n"
-
-#: getopt.c:739 getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option �%s� erwartet ein Argument\n"
-
-#: getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unbekannte Option �--%s�\n"
-
-#: getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unbekannte Option �%c%s�\n"
-
-#: getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unzul�ssige Option -- %c\n"
-
-#: getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ung�ltige Option -- %c\n"
-
-#: getopt.c:831 getopt.c:961
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option erwartet ein Argument -- %c\n"
-
-#: getopt.c:878
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option �-W %s� ist mehrdeutig\n"
-
-#: getopt.c:896
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option �-W %s� erwartet kein Argument\n"
-
-#: javacomp.c:465
-msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr ""
-"Java-Compiler nicht gefunden; bitte �gcj� installieren oder $JAVAC setzen"
-
-#: javaexec.c:404
-msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr ""
-"Virtuelle Java-Maschine nicht gefunden; bitte �gcj� installieren oder\n"
-"$JAVA setzen"
-
-#: obstack.c:474 xerror.c:75 xmalloc.c:56
-msgid "memory exhausted"
-msgstr "virtueller Speicher ersch�pft"
-
-#: pipe-bidi.c:119 pipe-bidi.c:121 pipe-in.c:136 pipe-out.c:136
-msgid "cannot create pipe"
-msgstr "Es ist nicht m�glich, eine Pipe zu erzeugen"
-
-#: wait-process.c:117
-#, c-format
-msgid "%s subprocess"
-msgstr "Subprozess %s"
-
-#: wait-process.c:129
-#, c-format
-msgid "%s subprocess got fatal signal"
-msgstr "Subprozess %s hat ein fatales Signal erhalten"
-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
-
-cat <<\EOF > mg-test11.ok
-# German translations for GNU gettext package.
-# Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU gettext 0.11-pre1\n"
-"POT-Creation-Date: 2001-12-08 20:33+0100\n"
-"PO-Revision-Date: 2001-11-04 12:25+0100\n"
-"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: execute.c pipe-bidi.c pipe-in.c pipe-out.c wait-process.c
-#, c-format
-msgid "%s subprocess failed"
-msgstr "Subprozess %s fehlgeschlagen"
-
-#: pipe-bidi.c pipe-in.c pipe-out.c
-msgid "cannot create pipe"
-msgstr "Es ist nicht m�glich, eine Pipe zu erzeugen"
-EOF
-
-: ${DIFF=diff}
-${DIFF} mg-test11.ok mg-test11.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-2 gettext-0.18.1.1/gettext-tools/tests/msggrep-2
--- gettext-0.19.3/gettext-tools/tests/msggrep-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --domain option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test2.po"
 cat <<\EOF > mg-test2.po
 domain "de"
 
@@ -149,10 +152,14 @@
 msgstr "%s: l'option � -W %s � ne tol�re pas d'argument\n"
 EOF
 
+tmpfiles="$tmpfiles mg-test2.tmp mg-test2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test2.ok"
 cat <<\EOF > mg-test2.ok
 domain "de"
 
@@ -248,4 +255,6 @@
 ${DIFF} mg-test2.ok mg-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-3 gettext-0.18.1.1/gettext-tools/tests/msggrep-3
--- gettext-0.19.3/gettext-tools/tests/msggrep-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --msgid and --msgstr options.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test3.po"
 cat <<\EOF > mg-test3.po
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -156,14 +159,17 @@
 msgstr "Antiterror-Einheit"
 EOF
 
+tmpfiles="$tmpfiles mg-test3.tmp mg-test3.err mg-test3.out"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test3.ok"
 cat <<\EOF > mg-test3.ok
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -212,4 +218,6 @@
 ${DIFF} mg-test3.ok mg-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-4 gettext-0.18.1.1/gettext-tools/tests/msggrep-4
--- gettext-0.19.3/gettext-tools/tests/msggrep-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multiple -e and multiple -f options.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test4.po"
 cat <<\EOF > mg-test4.po
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -152,18 +155,23 @@
 msgstr "Subprozess %s hat ein fatales Signal erhalten"
 EOF
 
+tmpfiles="$tmpfiles mg-test4.in1"
 echo 'invalid' > mg-test4.in1
 
+tmpfiles="$tmpfiles mg-test4.in2"
 echo 'illegal' > mg-test4.in2
 
+tmpfiles="$tmpfiles mg-test4.tmp mg-test4.err mg-test4.out"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test4.ok"
 cat <<\EOF > mg-test4.ok
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -232,4 +240,6 @@
 ${DIFF} mg-test4.ok mg-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-5 gettext-0.18.1.1/gettext-tools/tests/msggrep-5
--- gettext-0.19.3/gettext-tools/tests/msggrep-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --comment option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test5.po"
 cat <<\EOF > mg-test5.po
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -164,14 +167,17 @@
 msgstr "Antiterror-Einheit"
 EOF
 
+tmpfiles="$tmpfiles mg-test5.tmp mg-test5.err mg-test5.out"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test5.ok"
 cat <<\EOF > mg-test5.ok
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -225,4 +231,6 @@
 ${DIFF} mg-test5.ok mg-test5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-6 gettext-0.18.1.1/gettext-tools/tests/msggrep-6
--- gettext-0.19.3/gettext-tools/tests/msggrep-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --msgid and --msgstr options with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test6.properties"
 cat <<\EOF > mg-test6.properties
 #: argmatch.c:141
 #, c-format
@@ -111,13 +114,16 @@
 GSG-9=Antiterror-Einheit
 EOF
 
+tmpfiles="$tmpfiles mg-test6.tmp mg-test6.out"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test6.ok"
 cat <<\EOF > mg-test6.ok
 #: copy-file.c:60
 #, c-format
@@ -146,4 +152,6 @@
 ${DIFF} mg-test6.ok mg-test6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-7 gettext-0.18.1.1/gettext-tools/tests/msggrep-7
--- gettext-0.19.3/gettext-tools/tests/msggrep-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msggrep on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test7.po"
 cat <<\EOF > mg-test7.po
 msgid ""
 msgstr ""
@@ -48,14 +51,17 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles mg-test7.tmp mg-test7.out mg-test7.err"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test7.ok"
 cat <<\EOF > mg-test7.ok
 msgid ""
 msgstr ""
@@ -82,4 +88,6 @@
 ${DIFF} mg-test7.ok mg-test7.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-8 gettext-0.18.1.1/gettext-tools/tests/msggrep-8
--- gettext-0.19.3/gettext-tools/tests/msggrep-8	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --extracted-comment option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test8.po"
 cat <<\EOF > mg-test8.po
 msgid ""
 msgstr ""
@@ -32,14 +35,17 @@
 msgstr "%d mal wiederholen"
 EOF
 
+tmpfiles="$tmpfiles mg-test8.tmp mg-test8.err mg-test8.out"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test8.ok"
 cat <<\EOF > mg-test8.ok
 msgid ""
 msgstr ""
@@ -63,4 +69,6 @@
 ${DIFF} mg-test8.ok mg-test8.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msggrep-9 gettext-0.18.1.1/gettext-tools/tests/msggrep-9
--- gettext-0.19.3/gettext-tools/tests/msggrep-9	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msggrep-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test interpretation of $ as end-of-line anchor.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mg-test9.po"
 cat <<\EOF > mg-test9.po
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -154,14 +157,17 @@
 msgstr "Subprozess %s hat ein fatales Signal erhalten"
 EOF
 
+tmpfiles="$tmpfiles mg-test9.tmp mg-test9.err mg-test9.out"
 : ${MSGGREP=msggrep}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mg-test9.ok"
 cat <<\EOF > mg-test9.ok
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
@@ -219,4 +225,6 @@
 ${DIFF} mg-test9.ok mg-test9.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msginit-1 gettext-0.18.1.1/gettext-tools/tests/msginit-1
--- gettext-0.19.3/gettext-tools/tests/msginit-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msginit-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test plural count for locales with nplurals != 2.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mi-test1.pot"
 cat <<\EOF > mi-test1.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -37,13 +40,16 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mi-test1.tmp mi-test1.out mi-test1.err"
 : ${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; rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mi-test1.ok"
 cat <<\EOF > mi-test1.ok
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -73,4 +79,6 @@
 ${DIFF} mi-test1.ok mi-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msginit-2 gettext-0.18.1.1/gettext-tools/tests/msginit-2
--- gettext-0.19.3/gettext-tools/tests/msginit-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msginit-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msginit on a POT file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mi-test2.pot"
 cat <<\EOF > mi-test2.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -61,11 +64,14 @@
 #~ msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mi-test2.tmp mi-test2.out mi-test2.err"
 : ${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; rm -fr $tmpfiles; exit 1; }
+sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mi-test2.ok"
 cat <<\EOF > mi-test2.ok
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -110,4 +116,6 @@
 ${DIFF} mi-test2.ok mi-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msginit-3 gettext-0.18.1.1/gettext-tools/tests/msginit-3
--- gettext-0.19.3/gettext-tools/tests/msginit-3	2014-10-01 02:35:21.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msginit-3	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test various msginit options.
-cat <<\EOF > mi-test3.pot
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#, c-format
-msgid "'Your command, please?', asked the waiter."
-msgstr ""
-
-#, c-format
-msgid "a piece of cake"
-msgid_plural "%d pieces of cake"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "%s is replaced by %s."
-msgstr ""
-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; }
-
-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
-cat <<\EOF > mi-test3.ok
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ga\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-
-#, c-format
-msgid "'Your command, please?', asked the waiter."
-msgstr ""
-
-#, c-format
-msgid "a piece of cake"
-msgid_plural "%d pieces of cake"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#, c-format
-msgid "%s is replaced by %s."
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} mi-test3.ok mi-test3.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-1 gettext-0.18.1.1/gettext-tools/tests/msgmerge-1
--- gettext-0.19.3/gettext-tools/tests/msgmerge-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation and line wrapping.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test1.in1 mm-test1.in2"
 cat <<EOF > mm-test1.in1
 # first
 #. this should be discarded
@@ -35,10 +38,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test1.tmp mm-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test1.ok"
 cat << EOF > mm-test1.ok
 # first
 #. this is the first
@@ -65,4 +72,6 @@
 ${DIFF} mm-test1.ok mm-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-10 gettext-0.18.1.1/gettext-tools/tests/msgmerge-10
--- gettext-0.19.3/gettext-tools/tests/msgmerge-10	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in ref.pot but not
 # in def.po.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test10.po"
 cat <<EOF > mm-test10.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -26,6 +29,7 @@
 msgstr "%d erreur"
 EOF
 
+tmpfiles="$tmpfiles mm-test10.pot"
 cat <<EOF > mm-test10.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -50,10 +54,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mm-test10.tmp mm-test10.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test10.ok"
 cat <<EOF > mm-test10.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -83,4 +91,6 @@
 ${DIFF} mm-test10.ok mm-test10.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-11 gettext-0.18.1.1/gettext-tools/tests/msgmerge-11
--- gettext-0.19.3/gettext-tools/tests/msgmerge-11	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-11	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in ref.pot but not
 # in def.po.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test11.po"
 cat <<EOF > mm-test11.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -28,6 +31,7 @@
 msgstr "%d erreur"
 EOF
 
+tmpfiles="$tmpfiles mm-test11.pot"
 cat <<EOF > mm-test11.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -52,10 +56,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mm-test11.tmp mm-test11.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test11.ok"
 cat <<EOF > mm-test11.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -89,4 +97,6 @@
 ${DIFF} mm-test11.ok mm-test11.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-12 gettext-0.18.1.1/gettext-tools/tests/msgmerge-12
--- gettext-0.19.3/gettext-tools/tests/msgmerge-12	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-12	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in def.po but not
 # in ref.pot.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test12.po"
 cat <<EOF > mm-test12.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -28,6 +31,7 @@
 msgstr[1] "%d erreurs"
 EOF
 
+tmpfiles="$tmpfiles mm-test12.pot"
 cat <<EOF > mm-test12.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -50,10 +54,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test12.tmp mm-test12.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test12.ok"
 cat <<EOF > mm-test12.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -81,4 +89,6 @@
 ${DIFF} mm-test12.ok mm-test12.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-13 gettext-0.18.1.1/gettext-tools/tests/msgmerge-13
--- gettext-0.19.3/gettext-tools/tests/msgmerge-13	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-13	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has c-format specified in ref.pot but not
 # in def.po.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test13.po"
 cat <<EOF > mm-test13.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -43,6 +46,7 @@
 msgstr "%-Satz"
 EOF
 
+tmpfiles="$tmpfiles mm-test13.pot"
 cat <<EOF > mm-test13.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -83,10 +87,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test13.tmp mm-test13.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test13.ok"
 cat <<EOF > mm-test13.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -132,4 +140,6 @@
 ${DIFF} mm-test13.ok mm-test13.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-14 gettext-0.18.1.1/gettext-tools/tests/msgmerge-14
--- gettext-0.19.3/gettext-tools/tests/msgmerge-14	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-14	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a ref.pot in UTF-8 encoding against a def.po in legacy
 # encoding (that was produced from an older version of ref.pot, in ASCII
 # encoding).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test14-ru.po"
 cat <<\EOF > mm-test14-ru.po
 # Russian messages for CLISP
 # Copyright (C) 1998 Free Software Foundation, Inc.
@@ -27,6 +30,7 @@
 msgstr "������� �� ����"
 EOF
 
+tmpfiles="$tmpfiles mm-test14.pot"
 cat <<\EOF > mm-test14.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -54,10 +58,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test14.tmp mm-test14.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test14.ok"
 cat <<\EOF > mm-test14.ok
 # Russian messages for CLISP
 # Copyright (C) 1998 Free Software Foundation, Inc.
@@ -89,4 +97,6 @@
 ${DIFF} mm-test14.ok mm-test14.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-15 gettext-0.18.1.1/gettext-tools/tests/msgmerge-15
--- gettext-0.19.3/gettext-tools/tests/msgmerge-15	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-15	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test pseudo-comments containing filenames that start with a digit.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test15.pot mm-test15.po"
 cat <<\EOF > mm-test15.pot
 msgid ""
 msgstr ""
@@ -26,10 +29,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test15.tmp mm-test15.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test15.ok"
 cat <<\EOF > mm-test15.ok
 msgid ""
 msgstr ""
@@ -50,4 +57,6 @@
 ${DIFF} mm-test15.ok mm-test15.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-16 gettext-0.18.1.1/gettext-tools/tests/msgmerge-16
--- gettext-0.19.3/gettext-tools/tests/msgmerge-16	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-16	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test non-ASCII msgids when the PO file and the POT file are in different
 # encodings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test16.po"
 cat <<\EOF > mm-test16.po
 msgid ""
 msgstr ""
@@ -28,6 +31,7 @@
 msgstr "b��d %1."
 EOF
 
+tmpfiles="$tmpfiles mm-test16.pot"
 cat <<EOF > mm-test16.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Yoyodyne, Inc.
@@ -56,10 +60,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test16.tmp.po mm-test16.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test16.ok"
 cat <<\EOF > mm-test16.ok
 msgid ""
 msgstr ""
@@ -89,4 +97,6 @@
 ${DIFF} mm-test16.ok mm-test16.new.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-17 gettext-0.18.1.1/gettext-tools/tests/msgmerge-17
--- gettext-0.19.3/gettext-tools/tests/msgmerge-17	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-17	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that untranslated messages that are brought over from the .pot file
 # get the right number of msgstrs.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test17.po"
 cat <<\EOF > mm-test17.po
 # Irish translations.
 msgid ""
@@ -17,6 +20,7 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test17.pot"
 cat <<\EOF > mm-test17.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -50,10 +54,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test17.tmp.po mm-test17.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test17.ok"
 cat <<\EOF > mm-test17.ok
 # Irish translations.
 msgid ""
@@ -83,4 +91,6 @@
 ${DIFF} mm-test17.ok mm-test17.new.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-18 gettext-0.18.1.1/gettext-tools/tests/msgmerge-18
--- gettext-0.19.3/gettext-tools/tests/msgmerge-18	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-18	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge and msgcmp on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test18.po"
 cat <<\EOF > mm-test18.po
 msgid ""
 msgstr ""
@@ -48,6 +51,7 @@
 msgstr "photocopieur"
 EOF
 
+tmpfiles="$tmpfiles mm-test18.pot"
 cat <<\EOF > mm-test18.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -114,12 +118,16 @@
 
 : ${MSGCMP=msgcmp}
 ${MSGCMP} --use-fuzzy --use-untranslated mm-test18.po mm-test18.pot 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test18.tmp.po mm-test18.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test18.ok"
 # Note that the fuzzy guess for "Open" in context "Door state" could be either
 # "Ouvrir" (from context "File|") or "Ouvert" (from context "Lock state").
 cat <<\EOF > mm-test18.ok
@@ -186,9 +194,13 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test18.ok mm-test18.new.po || exit 1
+${DIFF} mm-test18.ok mm-test18.new.po
+test $? = 0 || { rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-19 gettext-0.18.1.1/gettext-tools/tests/msgmerge-19
--- gettext-0.19.3/gettext-tools/tests/msgmerge-19	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-19	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge --previous option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test19.po"
 cat <<\EOF > mm-test19.po
 msgid ""
 msgstr ""
@@ -28,6 +31,7 @@
 msgstr "%s: ungültige Option -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles mm-test19.pot"
 cat <<\EOF > mm-test19.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -76,10 +80,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test19.tmp.po mm-test19.new1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test19.ok1"
 cat <<\EOF > mm-test19.ok1
 msgid ""
 msgstr ""
@@ -120,8 +128,10 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok1 mm-test19.new1.po || exit 1
+${DIFF} mm-test19.ok1 mm-test19.new1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test19.pot"
 cat <<\EOF > mm-test19.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -160,10 +170,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test19.tmp.po mm-test19.new2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test19.ok2"
 cat <<\EOF > mm-test19.ok2
 msgid ""
 msgstr ""
@@ -203,6 +217,9 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok2 mm-test19.new2.po || exit 1
+${DIFF} mm-test19.ok2 mm-test19.new2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-2 gettext-0.18.1.1/gettext-tools/tests/msgmerge-2
--- gettext-0.19.3/gettext-tools/tests/msgmerge-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of duplicates.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test2.in1 mm-test2.in2"
 cat <<EOF > mm-test2.in1
 msgid "2" msgstr "2"
 msgid "3" msgstr "3"
@@ -15,11 +18,13 @@
 msgid "3" msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test2.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o /dev/stdout mm-test2.in1 mm-test2.in2 \
   2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test2.out
 
+tmpfiles="$tmpfiles mm-test2.ok"
 cat << EOF > mm-test2.ok
 mm-test2.in1:3: duplicate message definition...
 mm-test2.in1:1: ...this is the location of the first definition
@@ -30,4 +35,6 @@
 ${DIFF} mm-test2.ok mm-test2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-20 gettext-0.18.1.1/gettext-tools/tests/msgmerge-20
--- gettext-0.19.3/gettext-tools/tests/msgmerge-20	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-20	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when the second argument is a PO file with obsolete messages
 # (e.g. the result of an earlier msgmerge operation).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test20.po"
 cat <<\EOF > mm-test20.po
 msgid ""
 msgstr ""
@@ -32,6 +35,7 @@
 msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
 EOF
 
+tmpfiles="$tmpfiles mm-test20.pot"
 cat <<\EOF > mm-test20.pot
 #, fuzzy
 msgid ""
@@ -71,10 +75,14 @@
 #~ msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
 EOF
 
+tmpfiles="$tmpfiles mm-test20.tmp.po mm-test20.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test20.ok"
 cat <<\EOF > mm-test20.ok
 msgid ""
 msgstr ""
@@ -109,6 +117,9 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test20.ok mm-test20.new.po || exit 1
+${DIFF} mm-test20.ok mm-test20.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-21 gettext-0.18.1.1/gettext-tools/tests/msgmerge-21
--- gettext-0.19.3/gettext-tools/tests/msgmerge-21	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-21	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a message's flags have been changed from c-format to
 # kde-format. Reported by Chusslove Illich (Часлав Илић).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test21.po"
 cat <<\EOF > mm-test21.po
 msgid ""
 msgstr ""
@@ -25,6 +28,7 @@
 msgstr[1] "Engadir %n recursos dende o libro de enderezos"
 EOF
 
+tmpfiles="$tmpfiles mm-test21.pot"
 cat <<\EOF > mm-test21.pot
 msgid ""
 msgstr ""
@@ -45,10 +49,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mm-test21.tmp.po mm-test21.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test21.ok"
 cat <<\EOF > mm-test21.ok
 msgid ""
 msgstr ""
@@ -72,9 +80,14 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test21.ok mm-test21.new.po || exit 1
+${DIFF} mm-test21.ok mm-test21.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test21.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test21.mo mm-test21.new.po || exit 1
+${MSGFMT} --check -o mm-test21.mo mm-test21.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-22 gettext-0.18.1.1/gettext-tools/tests/msgmerge-22
--- gettext-0.19.3/gettext-tools/tests/msgmerge-22	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-22	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a msgid_plural changed but msgid remained the same.
 # Reported by Chusslove Illich (Часлав Илић).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test22.po"
 cat <<\EOF > mm-test22.po
 msgid ""
 msgstr ""
@@ -24,6 +27,7 @@
 msgstr[1] "Engadir %n recursos dende o libro de enderezos"
 EOF
 
+tmpfiles="$tmpfiles mm-test22.pot"
 cat <<\EOF > mm-test22.pot
 msgid ""
 msgstr ""
@@ -43,10 +47,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mm-test22.tmp.po mm-test22.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test22.ok"
 cat <<\EOF > mm-test22.ok
 msgid ""
 msgstr ""
@@ -70,9 +78,14 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test22.ok mm-test22.new.po || exit 1
+${DIFF} mm-test22.ok mm-test22.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test22.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test22.mo mm-test22.new.po || exit 1
+${MSGFMT} --check -o mm-test22.mo mm-test22.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-23 gettext-0.18.1.1/gettext-tools/tests/msgmerge-23
--- gettext-0.19.3/gettext-tools/tests/msgmerge-23	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-23	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a msgid_plural changed but msgid remained the same,
 # and --previous was specified.
 # Reported by Chusslove Illich (Часлав Илић).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test23.po"
 cat <<\EOF > mm-test23.po
 msgid ""
 msgstr ""
@@ -41,6 +44,7 @@
 msgstr[1] "%n Bände"
 EOF
 
+tmpfiles="$tmpfiles mm-test23.pot"
 cat <<\EOF > mm-test23.pot
 msgid ""
 msgstr ""
@@ -76,10 +80,14 @@
 msgstr[1] ""
 EOF
 
+tmpfiles="$tmpfiles mm-test23.tmp.po mm-test23.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test23.ok"
 cat <<\EOF > mm-test23.ok
 msgid ""
 msgstr ""
@@ -120,9 +128,14 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test23.ok mm-test23.new.po || exit 1
+${DIFF} mm-test23.ok mm-test23.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test23.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test23.mo mm-test23.new.po || exit 1
+${MSGFMT} --check -o mm-test23.mo mm-test23.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-24 gettext-0.18.1.1/gettext-tools/tests/msgmerge-24
--- gettext-0.19.3/gettext-tools/tests/msgmerge-24	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-24	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge and msgcmp: handling of 'range:' flags.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test24.po"
 cat <<\EOF > mm-test24.po
 msgid ""
 msgstr ""
@@ -46,6 +49,7 @@
 msgstr[1] "cinq semaines et %d jours"
 EOF
 
+tmpfiles="$tmpfiles mm-test24.pot"
 cat <<\EOF > mm-test24.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -102,12 +106,17 @@
 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test24.tmp.po mm-test24.new.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test24.ok"
 cat <<\EOF > mm-test24.ok
 msgid ""
 msgstr ""
@@ -153,9 +162,13 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test24.ok mm-test24.new.po || exit 1
+${DIFF} mm-test24.ok mm-test24.new.po
+test $? = 0 || { rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-25 gettext-0.18.1.1/gettext-tools/tests/msgmerge-25
--- gettext-0.19.3/gettext-tools/tests/msgmerge-25	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-25	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<EOF > mm-test25.in1
-# first
-#. this should be discarded
-msgid "1"
-msgstr "1x"
-# second
-#: bogus:1
-msgid "2"
-msgstr	"this is a really long msgstr "
-	"used to test the wrapping to "
-	"make sure it works after all "
-	"what is a test for if not to test things?"
-# third
-msgid "3"
-msgstr "3z"
-EOF
-
-cat <<EOF > mm-test25.in2
-#. this is the first
-#: snark.c:345
-msgid "1"
-msgstr ""
-#. this is the second
-#: hunt.c:759
-msgid "2"
-msgstr ""
-#. this is the third
-#: boojum.c:300
-msgid "3"
-msgstr ""
-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
-
-cat << EOF > mm-test25.ok
-# first
-#. this is the first
-#: snark.c
-msgid "1"
-msgstr "1x"
-
-# second
-#. this is the second
-#: hunt.c
-msgid "2"
-msgstr ""
-"this is a really long msgstr used to test the wrapping to make sure it works "
-"after all what is a test for if not to test things?"
-
-# third
-#. this is the third
-#: boojum.c
-msgid "3"
-msgstr "3z"
-EOF
-
-: ${DIFF=diff}
-${DIFF} mm-test25.ok mm-test25.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-3 gettext-0.18.1.1/gettext-tools/tests/msgmerge-3
--- gettext-0.19.3/gettext-tools/tests/msgmerge-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of obsolete/untranslated messages.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test3.in1 mm-test3.in2"
 cat <<EOF > mm-test3.in1
 #
 # def.po
@@ -49,10 +52,14 @@
 # trailing comments should be removed, even here
 EOF
 
+tmpfiles="$tmpfiles mm-test3.tmp mm-test3.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test3.ok"
 cat << EOF > mm-test3.ok
 #: file3:102
 msgid "still existing"
@@ -76,4 +83,6 @@
 ${DIFF} mm-test3.ok mm-test3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-4 gettext-0.18.1.1/gettext-tools/tests/msgmerge-4
--- gettext-0.19.3/gettext-tools/tests/msgmerge-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of comments.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test4.in1.po mm-test4.in2.po"
 cat <<EOF > mm-test4.in1.po
 msgid "one"
 msgstr "eins"
@@ -24,10 +27,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test4.tmp mm-test4.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test4.ok"
 cat <<EOF > mm-test4.ok
 msgid "one"
 msgstr "eins"
@@ -49,4 +56,6 @@
 ${DIFF} mm-test4.ok mm-test4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-5 gettext-0.18.1.1/gettext-tools/tests/msgmerge-5
--- gettext-0.19.3/gettext-tools/tests/msgmerge-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of header entry.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test5.in1.po mm-test5.in2.po"
 cat <<EOF > mm-test5.in1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -36,14 +39,17 @@
 "blah blah blah blah blah blah blah blah blah blah blah blah blah bla bla bla\n"
 EOF
 
+tmpfiles="$tmpfiles mm-test5.tmp mm-test5.out mm-test5.err"
 : ${MSGMERGE=msgmerge}
 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 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test5.ok"
 cat <<EOF > mm-test5.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -72,4 +78,6 @@
 ${DIFF} mm-test5.ok mm-test5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-6 gettext-0.18.1.1/gettext-tools/tests/msgmerge-6
--- gettext-0.19.3/gettext-tools/tests/msgmerge-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test non-ASCII character at the end of msgstr. (Triggered a glibc-2.1 bug.)
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test6.in1.po mm-test6.in2.po"
 cat <<\EOF > mm-test6.in1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -53,11 +56,15 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test6.tmp mm-test6.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test6.ok"
 cat <<\EOF > mm-test6.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -92,4 +99,6 @@
 ${DIFF} mm-test6.ok mm-test6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-7 gettext-0.18.1.1/gettext-tools/tests/msgmerge-7
--- gettext-0.19.3/gettext-tools/tests/msgmerge-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test7.po"
 cat <<\EOF > mm-test7.po
 domain "foo-de"
 msgid ""
@@ -29,6 +32,7 @@
 msgstr "A bient�t"
 EOF
 
+tmpfiles="$tmpfiles mm-test7.pot"
 cat <<EOF > mm-test7.pot
 domain "foo-de"
 msgid "Hello"
@@ -38,10 +42,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test7.tmp mm-test7.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test7.ok"
 cat <<\EOF > mm-test7.ok
 domain "foo-de"
 
@@ -76,4 +84,6 @@
 ${DIFF} mm-test7.ok mm-test7.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-8 gettext-0.18.1.1/gettext-tools/tests/msgmerge-8
--- gettext-0.19.3/gettext-tools/tests/msgmerge-8	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test8.po"
 cat <<\EOF > mm-test8.po
 domain "foo-de"
 msgid ""
@@ -29,15 +32,20 @@
 msgstr "A bient�t"
 EOF
 
+tmpfiles="$tmpfiles mm-test8.pot"
 cat <<EOF > mm-test8.pot
 msgid "Hello"
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test8.tmp mm-test8.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-test8.ok"
 cat <<\EOF > mm-test8.ok
 domain "foo-de"
 
@@ -72,4 +80,6 @@
 ${DIFF} mm-test8.ok mm-test8.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-9 gettext-0.18.1.1/gettext-tools/tests/msgmerge-9
--- gettext-0.19.3/gettext-tools/tests/msgmerge-9	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Duplicates are also fatal in obsolete marked entries (cf. msgmerge-3).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test9.in1 mm-test9.in2"
 cat <<EOF > mm-test9.in1
 msgid "2" msgstr "2"
 msgid "3" msgstr "3"
@@ -18,11 +21,13 @@
 msgid "3" msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-test9.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o /dev/null mm-test9.in1 mm-test9.in2 \
     2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test9.err
 
+tmpfiles="$tmpfiles mm-test9.ok"
 cat << EOF > mm-test9.ok
 mm-test9.in1:3: duplicate message definition...
 mm-test9.in1:1: ...this is the location of the first definition
@@ -33,4 +38,6 @@
 ${DIFF} mm-test9.ok mm-test9.err
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-1 gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-1
--- gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-c-1.in1 mm-c-1.com mm-c-1.pot"
 cat <<EOF > mm-c-1.in1
 #: file.c:123
 msgid "1"
@@ -25,10 +28,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-c-1.tmp mm-c-1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-1.ok"
 cat << EOF > mm-c-1.ok
 #: file.c:123
 msgid "1"
@@ -43,4 +50,6 @@
 ${DIFF} mm-c-1.ok mm-c-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-2 gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-2
--- gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with fuzziness.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-c-2.in1 mm-c-2.com mm-c-2.pot"
 cat <<EOF > mm-c-2.in1
 #: file.c:123
 msgid "1"
@@ -25,10 +28,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-c-2.tmp mm-c-2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-2.ok"
 cat << EOF > mm-c-2.ok
 #: file.c:123
 msgid "1"
@@ -44,4 +51,6 @@
 ${DIFF} mm-c-2.ok mm-c-2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-3 gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-3
--- gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.
 
@@ -7,6 +6,10 @@
 # the old translation file (mm-c-3.in1) contains the same msgid
 # Why not make use of the translation from the compendium?
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-c-3.in1 mm-c-3.com mm-c-3.pot"
 cat <<EOF > mm-c-3.in1
 #: file.c:123
 msgid "1"
@@ -33,10 +36,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-c-3.tmp mm-c-3.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-3.ok"
 cat << EOF > mm-c-3.ok
 #: file.c:123
 msgid "1"
@@ -51,4 +58,6 @@
 ${DIFF} mm-c-3.ok mm-c-3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-4 gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-4
--- gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.  Use it there was no "old" PO file at all
 # (merely use /dev/null).
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-c-4.com mm-c-4.pot"
 
 cat <<\EOF > mm-c-4.com
 msgid ""
@@ -26,10 +29,14 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-c-4.tmp mm-c-4.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-4.ok"
 cat << \EOF > mm-c-4.ok
 msgid ""
 msgstr ""
@@ -49,4 +56,6 @@
 ${DIFF} mm-c-4.ok mm-c-4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-5 gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-5
--- gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,23 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with a large compendium.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-c-5.tmp mm-c-5.out"
 : ${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
+  --compendium ${top_srcdir}/tests/mm-viet.comp.po \
+  /dev/null ${top_srcdir}/tests/mm-viet.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} "$abs_srcdir"/mm-viet.out mm-c-5.out
+${DIFF} ${top_srcdir}/tests/mm-viet.out mm-c-5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-6 gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-6
--- gettext-0.19.3/gettext-tools/tests/msgmerge-compendium-6	2014-10-14 07:53:08.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-compendium-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with mixed encodings.
 # 8 combinations total:
@@ -7,75 +6,108 @@
 #       mm-ko.ascii.pot   mm-ko.euc-kr.po   mm-ko-comp.euc-kr.po
 #       mm-ko.utf-8.pot   mm-ko.utf-8.po    mm-ko-comp.utf-8.po
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-ko.utf-8.pot"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$abs_srcdir"/mm-ko.ascii.pot
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot ${top_srcdir}/tests/mm-ko.ascii.pot
 
+tmpfiles="$tmpfiles mm-ko.utf-8.po"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po "$abs_srcdir"/mm-ko.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.euc-kr.po
 
+tmpfiles="$tmpfiles mm-ko-comp.utf-8.po"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$abs_srcdir"/mm-ko-comp.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ${top_srcdir}/tests/mm-ko-comp.euc-kr.po
 
+tmpfiles="$tmpfiles mm-c-6-AEE.tmp mm-c-6-AEE.out"
 : ${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
+  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
+  ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out"
 : ${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
+  ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out"
 : ${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
+  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
+  mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out"
 : ${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 ${top_srcdir}/tests/mm-ko.ascii.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out"
 : ${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
+  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
+  ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out"
 : ${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
+  ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out"
 : ${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
+  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
+  mm-ko.utf-8.po mm-ko.utf-8.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-UUU.tmp mm-c-6-UUU.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-c-6-U.ok mm-c-6-E.ok"
 : ${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
+${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | 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 || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-E.ok mm-c-6-AEU.out || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { rm -fr $tmpfiles; exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-properties-1 gettext-0.18.1.1/gettext-tools/tests/msgmerge-properties-1
--- gettext-0.19.3/gettext-tools/tests/msgmerge-properties-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-properties-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of obsolete/untranslated messages with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-p-1.in1 mm-p-1.in2"
 cat <<EOF > mm-p-1.in1
 #
 # def.po
@@ -34,10 +37,14 @@
 # trailing comments should be removed, even here
 EOF
 
+tmpfiles="$tmpfiles mm-p-1.tmp mm-p-1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-p-1.ok"
 cat << EOF > mm-p-1.ok
 #: file3:102
 still\ existing=translation
@@ -50,4 +57,6 @@
 ${DIFF} mm-p-1.ok mm-p-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-properties-2 gettext-0.18.1.1/gettext-tools/tests/msgmerge-properties-2
--- gettext-0.19.3/gettext-tools/tests/msgmerge-properties-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-properties-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,25 +1,33 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: location changed, and xgettext comment added. Both changes
 # must be reflected in the resulting PO file. With Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-p-2.po"
 cat <<\EOF > mm-p-2.po
 #: cogarithmetic.cc:12
 white=wei\u00df
 EOF
 
+tmpfiles="$tmpfiles mm-p-2.pot"
 cat <<EOF > mm-p-2.pot
 #. location changed
 #: cogarithmetic.cc:33
 !white=
 EOF
 
+tmpfiles="$tmpfiles mm-p-2.po~ mm-p-2.tmp"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+mv mm-p-2.po mm-p-2.tmp || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-p-2.ok"
 cat <<\EOF > mm-p-2.ok
 #. location changed
 #: cogarithmetic.cc:33
@@ -30,4 +38,6 @@
 ${DIFF} mm-p-2.ok mm-p-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-update-1 gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-1
--- gettext-0.19.3/gettext-tools/tests/msgmerge-update-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: nothing changed; don't normalize second message
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-u-1.po"
 cat <<\EOF > mm-u-1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -31,6 +34,7 @@
 "schwarz"
 EOF
 
+tmpfiles="$tmpfiles mm-u-1.pot"
 cat <<EOF > mm-u-1.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -56,13 +60,18 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-u-1.bak"
 cp mm-u-1.po mm-u-1.bak
 
+tmpfiles="$tmpfiles mm-u-1.po~"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mm-u-1.bak mm-u-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-update-2 gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-2
--- gettext-0.19.3/gettext-tools/tests/msgmerge-update-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: location changed, and xgettext comment added. Both changes
 # must be reflected in the resulting PO file.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-u-2.po"
 cat <<\EOF > mm-u-2.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -26,6 +29,7 @@
 msgstr "wei�"
 EOF
 
+tmpfiles="$tmpfiles mm-u-2.pot"
 cat <<EOF > mm-u-2.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -48,11 +52,15 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-u-2.po~ mm-u-2.tmp"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+mv mm-u-2.po mm-u-2.tmp || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-u-2.ok"
 cat <<\EOF > mm-u-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -80,4 +88,6 @@
 ${DIFF} mm-u-2.ok mm-u-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-update-3 gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-3
--- gettext-0.19.3/gettext-tools/tests/msgmerge-update-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: POT-Creation-Date changed. This change must not be reflected
 # in the resulting PO file; this is needed for projects which don't put the
 # .pot file under CVS.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-u-3.po"
 cat <<\EOF > mm-u-3.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -27,6 +30,7 @@
 msgstr "wei�"
 EOF
 
+tmpfiles="$tmpfiles mm-u-3.pot"
 cat <<EOF > mm-u-3.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -48,9 +52,12 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-u-3.po~"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-u-3.ok"
 cat <<\EOF > mm-u-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -77,4 +84,6 @@
 ${DIFF} mm-u-3.ok mm-u-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgmerge-update-4 gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-4
--- gettext-0.19.3/gettext-tools/tests/msgmerge-update-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgmerge-update-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,10 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update with --sort-output: POT-Creation-Date changed. This change
 # must not be reflected in the resulting PO file; this is needed for projects
 # which don't put the .pot file under CVS.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-u-4.po"
 cat <<\EOF > mm-u-4.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -30,6 +33,7 @@
 #~ msgstr "gr�n"
 EOF
 
+tmpfiles="$tmpfiles mm-u-4.pot"
 cat <<EOF > mm-u-4.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -51,9 +55,12 @@
 msgstr ""
 EOF
 
+tmpfiles="$tmpfiles mm-u-4.po~"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mm-u-4.ok"
 cat <<\EOF > mm-u-4.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -83,4 +90,6 @@
 ${DIFF} mm-u-4.ok mm-u-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgunfmt-1 gettext-0.18.1.1/gettext-tools/tests/msgunfmt-1
--- gettext-0.19.3/gettext-tools/tests/msgunfmt-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgunfmt-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of general operation.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mu-test1.in"
 cat <<EOF > mu-test1.in
 msgid "eight"
 msgstr "eighth"
@@ -29,15 +32,22 @@
 msgstr "second"
 EOF
 
+tmpfiles="$tmpfiles mu-test1.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mu-test1.mo mu-test1.in || exit 1
+${MSGFMT} -o mu-test1.mo mu-test1.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mu-test1.tmp mu-test1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mu-test1.in mu-test1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgunfmt-2 gettext-0.18.1.1/gettext-tools/tests/msgunfmt-2
--- gettext-0.19.3/gettext-tools/tests/msgunfmt-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgunfmt-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,26 +1,36 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 # Verify that msgunfmt, applied to a .mo file of major revision 1 (with
 # system-dependent strings), yields a PO file with c-format annotation, so that
 # msgfmt applied to it will again produce a .mo file of major revision 1.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mu-2.in"
 cat <<EOF > mu-2.in
 #, c-format
 msgid "truncating at %<PRIuMAX> bytes in output file %s"
 msgstr "schneide bei %<PRIuMAX> Bytes in Ausgabedatei %s ab"
 EOF
 
+tmpfiles="$tmpfiles mu-2.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mu-2.mo mu-2.in || exit 1
+${MSGFMT} -o mu-2.mo mu-2.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mu-2.tmp mu-2.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mu-2.in mu-2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgunfmt-csharp-1 gettext-0.18.1.1/gettext-tools/tests/msgunfmt-csharp-1
--- gettext-0.19.3/gettext-tools/tests/msgunfmt-csharp-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgunfmt-csharp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --csharp option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether we can compile and execute C# programs.
 test "${CSHARP_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-csharp"
@@ -17,9 +19,8 @@
   exit 77
 }
 
-test -d mu-cs-1 || mkdir mu-cs-1
-
-cat <<\EOF > mu-cs-1/fr.po
+tmpfiles="$tmpfiles fr.po"
+cat <<\EOF > fr.po
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -50,19 +51,23 @@
 msgstr "Fermer"
 EOF
 
+tmpfiles="$tmpfiles fr/prog.resources.dll"
 : ${MSGFMT=msgfmt}
-GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || exit 1
+GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+${MSGFMT} --csharp -d . -r prog -l fr fr.po || exit 1
 
+tmpfiles="$tmpfiles prog.out"
 : ${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
+GETTEXTCSHARPEXEDIR=../src \
+GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+${MSGUNFMT} --csharp -d . -r prog -l fr -o prog.out || exit 1
 
+tmpfiles="$tmpfiles prog.sort"
 : ${MSGCAT=msgcat}
-${MSGCAT} -s -o mu-cs-1/prog.sort mu-cs-1/prog.out || exit 1
+${MSGCAT} -s -o prog.sort prog.out || exit 1
 
-cat <<\EOF > mu-cs-1/prog.ok
+tmpfiles="$tmpfiles prog.ok"
+cat <<\EOF > prog.ok
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,6 +92,8 @@
 msgstr "{1} remplace {0}."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-cs-1/prog.ok mu-cs-1/prog.sort || exit 1
+${DIFF} prog.ok prog.sort || exit 1
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgunfmt-java-1 gettext-0.18.1.1/gettext-tools/tests/msgunfmt-java-1
--- gettext-0.19.3/gettext-tools/tests/msgunfmt-java-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgunfmt-java-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,13 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --java option.
 
 # Note: This test fails when using gcj from GCC 3.1 and GCC 3.2, due to a bug
 # (libgcj/6576). It is fixed in GCC 3.3.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether we can compile and execute Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
@@ -20,9 +22,8 @@
   exit 77
 }
 
-test -d mu-java-1 || mkdir mu-java-1
-
-cat <<\EOF > mu-java-1/fr.po
+tmpfiles="$tmpfiles fr.po"
+cat <<\EOF > fr.po
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -53,18 +54,22 @@
 msgstr "Fermer"
 EOF
 
+tmpfiles="$tmpfiles prog_fr.class"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || exit 1
+${MSGFMT} -j -d . -r prog -l fr fr.po || exit 1
 
+tmpfiles="$tmpfiles prog.out"
 : ${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
+CLASSPATH=.${CLASSPATH:+:$CLASSPATH} \
+GETTEXTJEXEDIR=../src GETTEXTJAR=../src/gettext.jar \
+${MSGUNFMT} --java -d . -r prog -l fr -o prog.out || exit 1
 
+tmpfiles="$tmpfiles prog.sort"
 : ${MSGCAT=msgcat}
-${MSGCAT} -s -o mu-java-1/prog.sort mu-java-1/prog.out || exit 1
+${MSGCAT} -s -o prog.sort prog.out || exit 1
 
-cat <<\EOF > mu-java-1/prog.ok
+tmpfiles="$tmpfiles prog.ok"
+cat <<\EOF > prog.ok
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,6 +94,8 @@
 msgstr "{1} remplace {0}."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-java-1/prog.ok mu-java-1/prog.sort || exit 1
+${DIFF} prog.ok prog.sort || exit 1
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msgunfmt-properties-1 gettext-0.18.1.1/gettext-tools/tests/msgunfmt-properties-1
--- gettext-0.19.3/gettext-tools/tests/msgunfmt-properties-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgunfmt-properties-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of general operation with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mu-p-1.in"
 cat <<EOF > mu-p-1.in
 eight=eighth
 
@@ -21,15 +24,22 @@
 two=second
 EOF
 
+tmpfiles="$tmpfiles mu-p-1.mo"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles mu-p-1.tmp mu-p-1.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mu-p-1.in mu-p-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msgunfmt-tcl-1 gettext-0.18.1.1/gettext-tools/tests/msgunfmt-tcl-1
--- gettext-0.19.3/gettext-tools/tests/msgunfmt-tcl-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msgunfmt-tcl-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --tcl option.
 
@@ -10,18 +9,23 @@
 # reads empty output, and refrains from creating a PO file because
 # --force-po was not specified.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether we can execute Tcl programs and Tcl's fconfigure command
 # understands the -encoding option (it does since approximately Tcl 8.1).
-cat <<\EOF > mu-tcl-1-version.tcl
+tmpfiles="$tmpfiles version.tcl"
+cat <<\EOF > version.tcl
 fconfigure stdout -encoding utf-8
 puts $tcl_version
 EOF
-(tclsh mu-tcl-1-version.tcl) >/dev/null 2>/dev/null \
+(tclsh version.tcl) >/dev/null 2>/dev/null \
   || { echo "Skipping test: tclsh not found or Tcl too old"
-       exit 77
+       rm -fr $tmpfiles; exit 77
      }
 
-cat <<\EOF > mu-tcl-1-fr.po
+tmpfiles="$tmpfiles fr.po"
+cat <<\EOF > fr.po
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
 
@@ -36,16 +40,19 @@
 msgstr "%2$s remplace %1$s."
 EOF
 
-test -d mu-tcl-1-msgs || mkdir mu-tcl-1-msgs
+tmpfiles="$tmpfiles msgs"
+test -d msgs || mkdir msgs
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || exit 1
+${MSGFMT} --tcl -d msgs -l fr fr.po || exit 1
 
+tmpfiles="$tmpfiles prog.out"
 : ${MSGUNFMT=msgunfmt}
-GETTEXTDATADIR="$abs_top_srcdir"/src \
-${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || exit 1
+GETTEXTDATADIR=${top_srcdir}/src \
+${MSGUNFMT} --tcl -d msgs -l fr -o prog.out || exit 1
 
-cat <<\EOF > mu-tcl-1-prog.ok
+tmpfiles="$tmpfiles prog.ok"
+cat <<\EOF > prog.ok
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -56,6 +63,8 @@
 msgstr "%2$s remplace %1$s."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-tcl-1-prog.ok mu-tcl-1-prog.out || exit 1
+${DIFF} prog.ok prog.out || exit 1
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-1 gettext-0.18.1.1/gettext-tools/tests/msguniq-1
--- gettext-0.19.3/gettext-tools/tests/msguniq-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,14 +1,21 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out"
 : ${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 ${top_srcdir}/tests/msguniq-a.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} "$abs_srcdir"/msguniq-a.out msguniq-1.out
+${DIFF} ${top_srcdir}/tests/msguniq-a.out msguniq-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-2 gettext-0.18.1.1/gettext-tools/tests/msguniq-2
--- gettext-0.19.3/gettext-tools/tests/msguniq-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,18 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --unique option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out"
 : ${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 ${top_srcdir}/tests/msguniq-a.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles msguniq-2.ok"
 cat <<\EOF > msguniq-2.ok
 # Template messages for CLISP
 # Copyright (C) 1992-2001 Bruno Haible, Michael Stoll, Marcus Daniels
@@ -5410,4 +5416,6 @@
 ${DIFF} msguniq-2.ok msguniq-2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-3 gettext-0.18.1.1/gettext-tools/tests/msguniq-3
--- gettext-0.19.3/gettext-tools/tests/msguniq-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,18 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --repeated option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out"
 : ${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 ${top_srcdir}/tests/msguniq-a.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles msguniq-3.ok"
 cat <<\EOF > msguniq-3.ok
 # Template messages for CLISP
 # Copyright (C) 1992-2001 Bruno Haible, Michael Stoll, Marcus Daniels
@@ -490,4 +496,6 @@
 ${DIFF} msguniq-3.ok msguniq-3.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-4 gettext-0.18.1.1/gettext-tools/tests/msguniq-4
--- gettext-0.19.3/gettext-tools/tests/msguniq-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,24 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles msguniq-4.out"
 : ${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 ${top_srcdir}/tests/msguniq-a.inp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles msguniq-4.ok"
 : ${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 ${top_srcdir}/tests/msguniq-a.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} msguniq-4.ok msguniq-4.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-5 gettext-0.18.1.1/gettext-tools/tests/msguniq-5
--- gettext-0.19.3/gettext-tools/tests/msguniq-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msguniq on a PO file with contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles msguniq-5.po"
 cat <<\EOF > msguniq-5.po
 msgid ""
 msgstr ""
@@ -53,10 +56,14 @@
 #~ msgstr "Enregistrer sous"
 EOF
 
+tmpfiles="$tmpfiles msguniq-5.tmp msguniq-5.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles msguniq-5.ok"
 cat <<\EOF > msguniq-5.ok
 msgid ""
 msgstr ""
@@ -106,4 +113,6 @@
 ${DIFF} msguniq-5.ok msguniq-5.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-6 gettext-0.18.1.1/gettext-tools/tests/msguniq-6
--- gettext-0.19.3/gettext-tools/tests/msguniq-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msguniq on PO file with previous msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles msguniq-6.in"
 cat <<\EOF > msguniq-6.in
 msgid ""
 msgstr ""
@@ -66,10 +69,14 @@
 msgstr "%s: Option erwartet ein Argument -- %c\n"
 EOF
 
+tmpfiles="$tmpfiles msguniq-6.tmp msguniq-6.out"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles msguniq-6.ok"
 cat <<\EOF > msguniq-6.ok
 msgid ""
 msgstr ""
@@ -120,4 +127,6 @@
 ${DIFF} msguniq-6.ok msguniq-6.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/msguniq-7 gettext-0.18.1.1/gettext-tools/tests/msguniq-7
--- gettext-0.19.3/gettext-tools/tests/msguniq-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/msguniq-7	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<\EOF > msguniq-7.in
-#: foo:1
-msgid "foo"
-msgstr ""
-
-#: bar:1
-msgid "foo"
-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
-
-cat <<\EOF > msguniq-7.ok
-#: foo bar
-msgid "foo"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} msguniq-7.ok msguniq-7.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/plural-1 gettext-0.18.1.1/gettext-tools/tests/plural-1
--- gettext-0.19.3/gettext-tools/tests/plural-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/plural-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,17 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles cake.tmp cake.pot"
 : ${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 cake.tmp --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < cake.tmp > cake.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-cat <<EOF > plural-1-cake.ok
+tmpfiles="$tmpfiles cake.ok"
+cat <<EOF > cake.ok
 #, c-format
 msgid "a piece of cake"
 msgid_plural "%d pieces of cake"
@@ -14,9 +20,10 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} plural-1-cake.ok plural-1-cake.pot || exit 1
+${DIFF} cake.ok cake.pot || exit 1
 
-cat <<EOF > plural-1-fr.po
+tmpfiles="$tmpfiles fr.po"
+cat <<EOF > fr.po
 # Les gateaux allemands sont les meilleurs du monde.
 #, c-format
 msgid "a piece of cake"
@@ -25,41 +32,51 @@
 msgstr[1] "%d morceaux de gateau"
 EOF
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
 : ${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 fr.po.tmp fr.po cake.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} plural-1-fr.po plural-1-fr.po.new || exit 1
+${DIFF} fr.po 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
-test -d plural-1-dir/fr/LC_MESSAGES || mkdir plural-1-dir/fr/LC_MESSAGES
+tmpfiles="$tmpfiles fr"
+test -d fr || mkdir fr
+test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o plural-1-dir/fr/LC_MESSAGES/cake.mo plural-1-fr.po
+${MSGFMT} -o fr/LC_MESSAGES/cake.mo fr.po
 
+tmpfiles="$tmpfiles fr.po.tmp fr.po.un"
 : ${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 fr.po.tmp fr/LC_MESSAGES/cake.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-sed 1,2d < plural-1-fr.po > plural-1-fr.po.strip
+tmpfiles="$tmpfiles fr.po.strip"
+sed 1,2d < fr.po > fr.po.strip
 
 : ${DIFF=diff}
-${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || exit 1
+${DIFF} fr.po.strip fr.po.un || exit 1
 
+tmpfiles="$tmpfiles cake.ok cake.tmp cake.out"
 : ${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
-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
-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
+echo 'un morceau de gateau' > cake.ok
+LANGUAGE= ./cake fr 1 > cake.tmp || exit 1
+LC_ALL=C tr -d '\r' < cake.tmp > cake.out || exit 1
+${DIFF} cake.ok cake.out || exit 1
+echo '2 morceaux de gateau' > cake.ok
+LANGUAGE= ./cake fr 2 > cake.tmp || exit 1
+LC_ALL=C tr -d '\r' < cake.tmp > cake.out || exit 1
+${DIFF} cake.ok cake.out || exit 1
+echo '10 morceaux de gateau' > cake.ok
+LANGUAGE= ./cake fr 10 > cake.tmp || exit 1
+LC_ALL=C tr -d '\r' < cake.tmp > cake.out || exit 1
+${DIFF} cake.ok cake.out || exit 1
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/plural-1-prg.c gettext-0.18.1.1/gettext-tools/tests/plural-1-prg.c
--- gettext-0.19.3/gettext-tools/tests/plural-1-prg.c	2013-05-31 05:01:54.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/plural-1-prg.c	2010-06-06 12:49:58.000000000 +0000
@@ -42,7 +42,7 @@
     return 1;
 
   textdomain ("cake");
-  bindtextdomain ("cake", "plural-1-dir");
+  bindtextdomain ("cake", ".");
   printf (ngettext ("a piece of cake", "%d pieces of cake", n), n);
   printf ("\n");
   return 0;
diff -Nru gettext-0.19.3/gettext-tools/tests/plural-2 gettext-0.18.1.1/gettext-tools/tests/plural-2
--- gettext-0.19.3/gettext-tools/tests/plural-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/plural-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles ll ll.po dataout"
 : ${MSGFMT=msgfmt}
-test -d plural-2-dir || mkdir plural-2-dir
-test -d plural-2-dir/ll || mkdir plural-2-dir/ll
-test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
+test -d ll || mkdir ll
+test -d ll/LC_MESSAGES || mkdir ll/LC_MESSAGES
 
+tmpfiles="$tmpfiles plural-2.data"
 cat <<EOF > plural-2.data
 ja
 0
@@ -44,7 +47,7 @@
 while read lang; do
   read formula
   read dataok
-  cat > plural-2-ll.po <<EOF
+  cat > ll.po <<EOF
 msgid ""
 msgstr ""
 "MIME-Version: 1.0\n"
@@ -65,9 +68,9 @@
 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 ll/LC_MESSAGES/plural.mo 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 \
+     LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=. \
        $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
    done) > dataout
   test "$dataok" = `cat dataout` || {
@@ -75,8 +78,11 @@
     echo "plural=${formula}" 1>&2
     echo "Expected: $dataok" 1>&2
     echo "Got:      "`cat dataout` 1>&2
+    rm -fr $tmpfiles
     exit 1
   }
 done < plural-2.data
 
+rm -fr $tmpfiles
+
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/recode-sr-latin-1 gettext-0.18.1.1/gettext-tools/tests/recode-sr-latin-1
--- gettext-0.19.3/gettext-tools/tests/recode-sr-latin-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/recode-sr-latin-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,12 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recode-sr-latin on some input in UTF-8 encoding.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether a specific UTF-8 locale is installed.
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ../testlocale 2>/dev/null
+  LC_ALL=$LOCALE_FR_UTF8 ./testlocale 2>/dev/null
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -19,9 +21,10 @@
   else
     echo "Skipping test: no french UTF-8 locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles rec-srl-1.in"
 cat <<\EOF > rec-srl-1.in
 Исправни аргументи су
 неједнозначан аргумент
@@ -31,11 +34,13 @@
 ѐѝӣӯ ЍЀӢӮ ЉӮ ӮЉ
 EOF
 
+tmpfiles="$tmpfiles rec-srl-1.out"
 : ${RECODE=recode}
 LC_ALL=$LOCALE_FR_UTF8 \
 ${RECODE}-sr-latin < rec-srl-1.in > rec-srl-1.out \
-  || { exit 1; }
+  || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles rec-srl-1.ok"
 cat <<\EOF > rec-srl-1.ok
 Ispravni argumenti su
 nejednoznačan argument
@@ -49,4 +54,6 @@
 ${DIFF} rec-srl-1.ok rec-srl-1.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/recode-sr-latin-2 gettext-0.18.1.1/gettext-tools/tests/recode-sr-latin-2
--- gettext-0.19.3/gettext-tools/tests/recode-sr-latin-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/recode-sr-latin-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,4 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recode-sr-latin on some input in EUC-JP encoding.
 # (Apart from UTF-8 and GB18030, EUC-JP is the only common encoding that is
@@ -8,6 +7,9 @@
 # Note: This test fails on AIX 4 with libiconv < 1.12, due to an interaction
 # between libiconv and the setlocale() function. It is fixed in libiconv-1.12.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 # Test whether a specific EUC-JP locale is installed.
 : ${LOCALE_JA=ja_JP}
 if test $LOCALE_JA = none; then
@@ -16,19 +18,22 @@
   else
     echo "Skipping test: no japanese EUC-JP locale is supported"
   fi
-  exit 77
+  rm -fr $tmpfiles; exit 77
 fi
 
+tmpfiles="$tmpfiles rec-srl-2.in"
 cat <<\EOF > rec-srl-2.in
 ������ѧӧߧ� �ѧ�ԧ�ާ֧ߧ�� ���
 �ߧ֏���֧էߧ�٧ߧѧ�ѧ� �ѧ�ԧ�ާ֧ߧ�
 EOF
 
+tmpfiles="$tmpfiles rec-srl-2.out"
 : ${RECODE=recode}
 LC_ALL=$LOCALE_JA \
 ${RECODE}-sr-latin < rec-srl-2.in > rec-srl-2.out \
-  || { exit 1; }
+  || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles rec-srl-2.ok"
 cat <<\EOF > rec-srl-2.ok
 Ispravni argumenti su
 nejednozna���an argument
@@ -38,4 +43,6 @@
 ${DIFF} rec-srl-2.ok rec-srl-2.out
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/tstgettext.c gettext-0.18.1.1/gettext-tools/tests/tstgettext.c
--- gettext-0.19.3/gettext-tools/tests/tstgettext.c	2013-04-15 06:45:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/tstgettext.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@
 #define _(str) gettext (str)
 
 /* If true, add newline after last string.  This makes only sense in
-   the 'echo' emulation mode.  */
+   the `echo' emulation mode.  */
 static bool add_newline;
 
 /* If true, expand escape sequences in strings before looking in the
@@ -171,7 +171,7 @@
     usage (EXIT_SUCCESS);
 
   /* We have two major modes: use following Uniforum spec and as
-     internationalized 'echo' program.  */
+     internationalized `echo' program.  */
   if (!do_shell)
     {
       /* We have to write a single strings translation to stdout.  */
@@ -227,7 +227,7 @@
             if (domaindir != NULL && domaindir[0] != '\0')
               bindtextdomain (domain, domaindir);
 
-          /* We have to simulate 'echo'.  All arguments are strings.  */
+          /* We have to simulate `echo'.  All arguments are strings.  */
           do
             {
               msgid = argv[optind++];
@@ -261,7 +261,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
@@ -292,7 +292,7 @@
 environment variable TEXTDOMAIN.  If the message catalog is not found in the\n\
 regular directory, another location can be specified with the environment\n\
 variable TEXTDOMAINDIR.\n\
-When used with the -s option the program behaves like the 'echo' command.\n\
+When used with the -s option the program behaves like the `echo' command.\n\
 But it does not simply copy its arguments to stdout.  Instead those messages\n\
 found in the selected catalog are translated.\n\
 Standard search directory: %s\n"),
diff -Nru gettext-0.19.3/gettext-tools/tests/tstngettext.c gettext-0.18.1.1/gettext-tools/tests/tstngettext.c
--- gettext-0.19.3/gettext-tools/tests/tstngettext.c	2013-04-15 06:45:10.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/tstngettext.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form strings from message catalog and print them.
-   Copyright (C) 1995-1997, 2000-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -200,7 +200,7 @@
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try '%s --help' for more information.\n"),
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
              program_name);
   else
     {
diff -Nru gettext-0.19.3/gettext-tools/tests/xg-c-1.ok.po gettext-0.18.1.1/gettext-tools/tests/xg-c-1.ok.po
--- gettext-0.19.3/gettext-tools/tests/xg-c-1.ok.po	2014-10-16 06:04:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xg-c-1.ok.po	2010-06-06 18:44:58.000000000 +0000
@@ -1,10 +1,3 @@
-msgid "warning: "
-msgstr ""
-
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -43,11 +36,11 @@
 msgstr ""
 
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #, c-format
@@ -120,8 +113,7 @@
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
 #, c-format
@@ -182,8 +174,7 @@
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
 #, c-format
@@ -194,15 +185,6 @@
 
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
-msgstr ""
-
-#, c-format
-msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
@@ -213,8 +195,7 @@
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
 #, c-format
@@ -323,7 +304,7 @@
 
 #, c-format
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+"      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
 #, c-format
@@ -453,15 +434,18 @@
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
+msgid "warning: "
+msgstr ""
+
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
+"If you are using a `Makevars' file, please specify\n"
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr ""
 
 #, c-format
@@ -473,10 +457,6 @@
 msgstr ""
 
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-
-#, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
@@ -485,18 +465,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr ""
-
-#, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
@@ -576,11 +544,6 @@
 msgstr ""
 
 #, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
@@ -604,12 +567,6 @@
 
 #, c-format
 msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#, c-format
-msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
@@ -652,25 +609,6 @@
 msgstr ""
 
 #, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, "
-"input\n"
-"files are read from the directory instead of the command line arguments.\n"
-msgstr ""
-
-#, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
@@ -732,14 +670,6 @@
 
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
-msgstr ""
-
-#, c-format
-msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
@@ -772,23 +702,15 @@
 msgstr ""
 
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr ""
 
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
-
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,20 +1,25 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # This test often fails during development. It works after "make dist".
 
 # Test -x option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles zero-domain.po xg-test1.err"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -k_ -d zero-domain -x "$abs_top_srcdir"/po/gettext-tools.pot \
-  "$abs_top_srcdir"/src/xgettext.c >xg-test1.err 2>&1
+${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext-tools.pot \
+  $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 || { rm -fr $tmpfiles; exit 1; }
 
 test ! -f zero-domain.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-10 gettext-0.18.1.1/gettext-tools/tests/xgettext-10
--- gettext-0.19.3/gettext-tools/tests/xgettext-10	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-10	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --add-location=file option.
-
-cat <<\EOF > xg-test10a.c
-gettext ("foo");
-EOF
-
-cat <<\EOF > xg-test10b.c
-gettext ("foo");
-gettext ("bar");
-EOF
-
-: ${XGETTEXT=xgettext}
-${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; }
-
-cat <<\EOF > xg-test10.ok
-#: xg-test10a.c xg-test10b.c
-msgid "foo"
-msgstr ""
-
-#: xg-test10b.c
-msgid "bar"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-test10.ok xg-test10.out
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-11 gettext-0.18.1.1/gettext-tools/tests/xgettext-11
--- gettext-0.19.3/gettext-tools/tests/xgettext-11	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-11	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of multi-line comment extraction.
-
-cat <<\EOF > xg-test11.c
-/* TRANSLATORS: this
- is the first msgid
- */
-gettext ("abc");
-
-/*
- * TRANSLATORS: this
- * is the second msgid
- */
-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
-
-cat <<\EOF > xg-test11.ok
-#. TRANSLATORS: this
-#. is the first msgid
-#.
-msgid "abc"
-msgstr ""
-
-#. TRANSLATORS: this
-#. is the second msgid
-#.
-msgid "def"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-test11.ok xg-test11.po
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Even an empty string is extracted, if not overridden by xgettext's
 # default-constructed header entry.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test2.in.c"
 cat <<EOF > xg-test2.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */
@@ -21,10 +24,14 @@
 _("")
 EOF
 
+tmpfiles="$tmpfiles xg-test2.tmp.po xg-test2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-test2.ok"
 cat <<EOF > xg-test2.ok
 #, no-c-format
 msgid "extract me"
@@ -44,4 +51,6 @@
 ${DIFF} xg-test2.ok xg-test2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # When a header entry is provided by xgettext, it overrides any msgid ""
 # present in the input.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test3.in.c"
 cat <<EOF > xg-test3.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */
@@ -21,11 +24,13 @@
 _("")
 EOF
 
+tmpfiles="$tmpfiles xg-test3.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --no-location -k_ xg-test3.in.c 2>/dev/null \
   | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-test3.po
 
+tmpfiles="$tmpfiles xg-test3.ok"
 cat <<EOF > xg-test3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -60,4 +65,6 @@
 ${DIFF} xg-test3.ok xg-test3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,22 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --foreign-user
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test4.in.c"
 cat <<EOF > xg-test4.in.c
 _("extract me")
 EOF
 
+tmpfiles="$tmpfiles xg-test4.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --foreign-user --no-location -k_ xg-test4.in.c \
   | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-test4.po
 
+tmpfiles="$tmpfiles xg-test4.ok"
 cat <<EOF > xg-test4.ok
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
@@ -38,4 +43,6 @@
 ${DIFF} xg-test4.ok xg-test4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test extraction of non-ASCII msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test5.c"
 cat <<EOF > xg-test5.c
 void foo (int option)
 {
@@ -11,14 +14,19 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-test5.tmp xg-test5.po"
 : ${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 || { rm -fr $tmpfiles; exit 1; }
+${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-test5.pot"
 sed -e '/POT-Creation-Date/d' < xg-test5.po > xg-test5.pot
 
+tmpfiles="$tmpfiles xg-test5.ok"
 cat <<EOF > xg-test5.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -51,4 +59,6 @@
 ${DIFF} xg-test5.ok xg-test5.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,45 +1,55 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of position dependent recognition of format strings.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test6.c"
 cat <<\EOF > xg-test6.c
 fprintf (fp, gettext ("c-format positive1"), gettext ("c-format negative1"));
 printk (gettext ("c-format negative2"));
 EOF
 
+tmpfiles="$tmpfiles xg-test6.sh"
 cat <<\EOF > xg-test6.sh
 eval_gettext "sh-format positive1" "`gettext \"sh-format negative1\"`"
 echo "`gettext \"sh-format negative2\"`"
 EOF
 
+tmpfiles="$tmpfiles xg-test6.py"
 cat <<\EOF > xg-test6.py
 my_printf (gettext ("python-format positive1"),
            gettext ("python-format negative1"));
 printk (gettext ("python-format negative2"));
 EOF
 
+tmpfiles="$tmpfiles xg-test6.lisp"
 cat <<\EOF > xg-test6.lisp
 (format t (gettext "lisp-format positive1") (gettext "lisp-format negative1"))
 (prin1 (gettext "lisp-format negative2"))
 EOF
 
+tmpfiles="$tmpfiles xg-test6.el"
 cat <<\EOF > xg-test6.el
 (format (_ "elisp-format positive1") (_ "elisp-format negative1"))
 (printk (_ "elisp-format negative2"))
 EOF
 
+tmpfiles="$tmpfiles xg-test6.jl"
 cat <<\EOF > xg-test6.jl
 (format stream (_ "librep-format positive1") (_ "librep-format negative1"))
 (printk (_ "librep-format negative2"))
 EOF
 
+tmpfiles="$tmpfiles xg-test6.java"
 cat <<\EOF > xg-test6.java
 MessageFormat.format(gettext("java-format positive1"),
                      gettext("java-format negative1"));
 System.err.println(gettext("java-format negative2"));
 EOF
 
+tmpfiles="$tmpfiles xg-test6.awk"
 cat <<\EOF > xg-test6.awk
 printf dcgettext ("awk-format positive1"), dcgettext ("awk-format negative1");
 printf (dcgettext ("awk-format positive2"), dcgettext ("awk-format negative2"));
@@ -47,17 +57,20 @@
 printk dcgettext ("awk-format negative4");
 EOF
 
+tmpfiles="$tmpfiles xg-test6.ycp"
 cat <<\EOF > xg-test6.ycp
 sformat (_("ycp-format positive1"), _("ycp-format negative1"));
 printk (_("ycp-format negative2"));
 EOF
 
+tmpfiles="$tmpfiles xg-test6.tcl"
 cat <<\EOF > xg-test6.tcl
 [format [::msgcat::mc "tcl-format positive1"]
         [::msgcat::mc "tcl-format negative1"]]
 [print [::msgcat::mc "tcl-format negative2"]]
 EOF
 
+tmpfiles="$tmpfiles xg-test6.pl"
 cat <<\EOF > xg-test6.pl
 printf gettext "perl-format positive1", gettext ("perl-format negative1");
 gettext ("perl-format negative2");
@@ -67,20 +80,25 @@
 print kprintf gettext "perl-format negative5";
 EOF
 
+tmpfiles="$tmpfiles xg-test6.php"
 cat <<\EOF > xg-test6.php
 <? php
 printf (_ ("php-format positive1"), _ ("php-format negative1"));
 printk (_ ("php-format negative2"));
 EOF
 
+tmpfiles="$tmpfiles xg-test6.tmp.po xg-test6.po"
 : ${XGETTEXT=xgettext}
 ${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 
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-test6.ok"
 cat <<\EOF > xg-test6.ok
 #, c-format
 msgid "c-format positive1"
@@ -238,4 +256,6 @@
 ${DIFF} xg-test6.ok xg-test6.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-7 gettext-0.18.1.1/gettext-tools/tests/xgettext-7
--- gettext-0.19.3/gettext-tools/tests/xgettext-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of comment extraction in the case of duplicated msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test7.c"
 cat <<\EOF > xg-test7.c
 /* first comment */
 /* xgettext: c-format */
@@ -17,10 +20,14 @@
 gettext ("abc");
 EOF
 
+tmpfiles="$tmpfiles xg-test7.tmp.po xg-test7.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-test7.ok"
 cat <<\EOF > xg-test7.ok
 #. first comment
 #. second comment
@@ -34,4 +41,6 @@
 ${DIFF} xg-test7.ok xg-test7.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-8 gettext-0.18.1.1/gettext-tools/tests/xgettext-8
--- gettext-0.19.3/gettext-tools/tests/xgettext-8	2014-05-09 07:31:48.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test -j option with charset conversion from ISO-8859-1 to UTF-8.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test8.po"
 cat <<\EOF > xg-test8.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -27,15 +30,19 @@
 msgstr "�"
 EOF
 
+tmpfiles="$tmpfiles xg-test8.in.c"
 cat <<EOF > xg-test8.in.c
 _("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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-test8.pot"
 sed -e '/POT-Creation-Date/d' < xg-test8.po | LC_ALL=C tr -d '\r' > xg-test8.pot
 
+tmpfiles="$tmpfiles xg-test8.ok"
 cat <<\EOF > xg-test8.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -68,4 +75,6 @@
 ${DIFF} xg-test8.ok xg-test8.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-9 gettext-0.18.1.1/gettext-tools/tests/xgettext-9
--- gettext-0.19.3/gettext-tools/tests/xgettext-9	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of extracted comments specified per keyword, including the case of
 # duplicated msgids.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test9.c"
 cat <<\EOF > xg-test9.c
 /* xgettext: max-width 25 */
 label ("eagle");
@@ -19,13 +22,17 @@
 label ("pigeon");
 EOF
 
+tmpfiles="$tmpfiles xg-test9.tmp.po xg-test9.po"
 : ${XGETTEXT=xgettext}
 ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-test9.ok"
 cat <<\EOF > xg-test9.ok
 #. xhtml-format
 #. xml-format
@@ -56,4 +63,6 @@
 ${DIFF} xg-test9.ok xg-test9.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-awk-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-awk-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-awk-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-awk-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test awk support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-a-1.awk"
 cat <<EOF > xg-a-1.awk
 # This comment will not be extracted.
 print _"help"
@@ -15,11 +18,15 @@
 print _"The Fabulous Four"
 EOF
 
+tmpfiles="$tmpfiles xg-a-1.tmp.po xg-a-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-a-1.ok"
 cat <<EOF > xg-a-1.ok
 msgid "help"
 msgstr ""
@@ -41,4 +48,6 @@
 ${DIFF} xg-a-1.ok xg-a-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-awk-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-awk-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-awk-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-awk-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test awk support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-a-2.awk"
 cat <<\EOF > xg-a-2.awk
 # a
 string = # b
@@ -12,11 +15,15 @@
 ;
 EOF
 
+tmpfiles="$tmpfiles xg-a-2.tmp.po xg-a-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-a-2.ok"
 cat <<EOF > xg-a-2.ok
 #. a
 #. b
@@ -29,4 +36,6 @@
 ${DIFF} xg-a-2.ok xg-a-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,24 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # This test often fails during development. It works after "make dist".
 
 # Test C support.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-1.tmp.po xg-c-1.po"
 : ${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
+ $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} "$abs_srcdir"/xg-c-1.ok.po xg-c-1.po
+${DIFF} $top_srcdir/tests/xg-c-1.ok.po xg-c-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-10 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-10
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-10	2014-05-07 10:16:09.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-10	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-10.c"
 cat <<\EOF > xg-c-10.c
 // (KDE) The 1-argument i18n macro is a simple gettext without context.
 print (i18n ("help"));
@@ -13,12 +16,16 @@
 print (tr ("open", "File"));
 EOF
 
+tmpfiles="$tmpfiles xg-c-10.tmp.po xg-c-10.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-10.ok"
 cat <<EOF > xg-c-10.ok
 msgid "help"
 msgstr ""
@@ -39,4 +46,6 @@
 ${DIFF} xg-c-10.ok xg-c-10.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-11 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-11
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-11	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-11	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts, disambiguating according to the
 # argument count.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-11.c"
 cat <<\EOF > xg-c-11.c
 // (KDE) The 1-argument i18n macro is a simple gettext without context.
 print (i18n ("help"));
@@ -13,12 +16,16 @@
 print (i18n ("error", "errors", 7));
 EOF
 
+tmpfiles="$tmpfiles xg-c-11.tmp.po xg-c-11.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-11.ok"
 cat <<EOF > xg-c-11.ok
 msgid "help"
 msgstr ""
@@ -37,4 +44,6 @@
 ${DIFF} xg-c-11.ok xg-c-11.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-12 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-12
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-12	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-12	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,24 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: valid but unlikely C format strings are _not_ marked as
 # c-format by default.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-12.c"
 cat <<\EOF > xg-c-12.c
 gettext ("%1% on, %2% off");
 EOF
 
+tmpfiles="$tmpfiles xg-c-12.tmp.po xg-c-12.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-12.ok"
 cat <<EOF > xg-c-12.ok
 msgid "%1% on, %2% off"
 msgstr ""
@@ -21,4 +28,6 @@
 ${DIFF} xg-c-12.ok xg-c-12.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-13 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-13
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-13	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-13	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test --flag that introduces qt-format.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-13.cc"
 cat <<\EOF > xg-c-13.cc
 foo (gettext ("on"));
 tr ("stopped");
@@ -10,14 +13,18 @@
 tr ("deleted %n files", "", numdel);
 EOF
 
+tmpfiles="$tmpfiles xg-c-13.tmp.po xg-c-13.po"
 : ${XGETTEXT=xgettext}
 ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-13.ok"
 cat <<EOF > xg-c-13.ok
 #, qt-format
 msgid "on"
@@ -42,4 +49,6 @@
 ${DIFF} xg-c-13.ok xg-c-13.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-14 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-14
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-14	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-14	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test boost-format.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-14.cc"
 cat <<\EOF > xg-c-14.cc
 // These are recognized as boost-format because of the keyword 'format'.
 format(gettext("%s on, %s off"));
@@ -16,14 +19,18 @@
 gettext("heuristic %1% on, %2% off");
 EOF
 
+tmpfiles="$tmpfiles xg-c-14.tmp.po xg-c-14.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po
+test $? = 0 || { rm -fr $tmpfiles; 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
 # among them are valid c-format strings. The last one is a valid but unlikely
 # c-format string, therefore the heuristic doesn't mark it.
+tmpfiles="$tmpfiles xg-c-14.ok"
 cat <<\EOF > xg-c-14.ok
 #, boost-format
 msgid "%s on, %s off"
@@ -62,4 +69,6 @@
 ${DIFF} xg-c-14.ok xg-c-14.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-15 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-15
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-15	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-15	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts specified in GNOME glib syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-15.c"
 cat <<\EOF > xg-c-15.c
 /* (glib) The 1-argument Q_ macro is a gettext with context. */
 print (Q_ ("Printer|Open"));
@@ -10,12 +13,16 @@
 print (Q_ ("Menu|Recent File", "Menu|Recent Files"));
 EOF
 
+tmpfiles="$tmpfiles xg-c-15.tmp.po xg-c-15.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-15.ok"
 cat <<EOF > xg-c-15.ok
 msgctxt "Printer"
 msgid "Open"
@@ -32,4 +39,6 @@
 ${DIFF} xg-c-15.ok xg-c-15.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-16 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-16
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-16	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-16	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-16.c"
 cat <<\EOF > xg-c-16.c
 /* a */
 /* b */ char *string = /* c */
@@ -10,11 +13,15 @@
 /* e */ _( /* f */ "hello " /* g */ "world" /* h */ );
 EOF
 
+tmpfiles="$tmpfiles xg-c-16.tmp.po xg-c-16.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-16.ok"
 cat <<EOF > xg-c-16.ok
 #. a
 #. b
@@ -30,4 +37,6 @@
 ${DIFF} xg-c-16.ok xg-c-16.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-17 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-17
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-17	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-17	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test kde-format and format recognition heuristics.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-17.cc"
 cat <<\EOF > xg-c-17.cc
 /* When xgettext has no info, it flags both c-format and kde-format, based
    on the heuristics.  */
@@ -14,11 +17,15 @@
 gettext ("remaining time: %1m %2s");
 EOF
 
+tmpfiles="$tmpfiles xg-c-17.tmp.po xg-c-17.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-17.ok"
 cat <<EOF > xg-c-17.ok
 #, c-format, kde-format
 msgid "used time: %1m %2s"
@@ -33,4 +40,6 @@
 ${DIFF} xg-c-17.ok xg-c-17.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-18 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-18
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-18	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-18	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of 'range:' flags.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-18.c"
 cat <<\EOF > xg-c-18.c
 if (days > 7 && days < 14)
   /* xgettext: range: 1..6 */
@@ -11,10 +14,14 @@
           days - 7);
 EOF
 
+tmpfiles="$tmpfiles xg-c-18.tmp.po xg-c-18.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-18.ok"
 cat <<EOF > xg-c-18.ok
 #, c-format, range: 1..6
 msgid "one week and one day"
@@ -27,4 +34,6 @@
 ${DIFF} xg-c-18.ok xg-c-18.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-19 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-19
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-19	2014-10-08 03:01:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-19	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test C support: mixing ANSI escapes, Unicode escapes, and bare
-# multibyte characters.
-
-: ${XGETTEXT=xgettext}
-
-cat <<\EOF > err1.c
-/* Out of range */
-gettext ("\U00110000");
-EOF
-
-(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
-/* 最初のコメント */
-"最初の文字列";
-
-/* 二番目のコメント */
-gettext ("二番目の文字列");
-
-/* 三番目のコメント */
-pgettext ("\u30B3\u30F3\u30C6\u30af\u30B9\u30C8\U0001F600\ud835\udc9ea", "\xBB\xB0\xC8\xD6\xCC\xDC\xA4\xCE\xCA\xB8\xBB\xFA\xCe\363");
-
-gettext ("\"\'\?\\\a\b\f\n\r\t\v\xG\0000");
-gettext ("\u30A");
-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; }
-
-${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 \
-	    || { cp core* ..; 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.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. 二番目のコメント
-msgid "二番目の文字列"
-msgstr ""
-
-#. 三番目のコメント
-msgctxt "コンテクスト😀𝒞a"
-msgid "三番目の文字列"
-msgstr ""
-
-msgid ""
-"\"'?\\\a\b\f\n"
-"\r\t\v\\xG"
-msgstr ""
-
-msgid "\\u30A"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-c-19.ok xg-c-19.po
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-2	2014-10-08 03:01:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
-# Test C support: comments meant for xgettext, whitespace, and literals.
+# Test C support: comments meant for xgettext, and whitespace.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-2.in.c"
 cat <<EOF > xg-c-2.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */
@@ -15,18 +18,16 @@
 (
 "hello"
 )
-static int c = '';
-_("after character")
-static char *s = "";
-_("after string")
-static double d = 10e-1;
-_("after double")
 EOF
 
+tmpfiles="$tmpfiles xg-c-2.tmp.po xg-c-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-2.ok"
 cat <<EOF > xg-c-2.ok
 #, no-c-format
 msgid "extract me"
@@ -37,19 +38,12 @@
 
 msgid "hello"
 msgstr ""
-
-msgid "after character"
-msgstr ""
-
-msgid "after string"
-msgstr ""
-
-msgid "after double"
-msgstr ""
 EOF
 
 : ${DIFF=diff}
 ${DIFF} xg-c-2.ok xg-c-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: recognition of #line.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-3.in.c"
 cat <<EOF > xg-c-3.in.c
 #line 42 "bozo"
 main(){printf(gettext("Hello, World!\n"));}
@@ -10,10 +13,14 @@
 gettext("nothing");
 EOF
 
+tmpfiles="$tmpfiles xg-c-3.tmp.po xg-c-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-3.ok"
 cat <<EOF > xg-c-3.ok
 #: bozo:42
 #, c-format
@@ -29,4 +36,6 @@
 ${DIFF} xg-c-3.ok xg-c-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-4	2014-10-08 03:01:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,23 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --trigraphs option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-4.in.c"
 cat <<EOF > xg-c-4.in.c
-main()??<printf(gettext("Hello, " "World!" "??/n"));return 0 ? a??(0??'1??) : 1??!??-a[0]??#1;????>
+main()??<printf(gettext("Hello, " "World!" "??/n")); ??>
 EOF
 
+tmpfiles="$tmpfiles xg-c-4.tmp.po xg-c-4.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-4.ok"
 cat <<EOF > xg-c-4.ok
 #, c-format
 msgid "Hello, World!\n"
@@ -21,4 +28,6 @@
 ${DIFF} xg-c-4.ok xg-c-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-5	2014-06-03 03:40:39.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,23 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-5.in.cc"
 cat <<EOF > xg-c-5.in.cc
 main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); }
 EOF
 
+tmpfiles="$tmpfiles xg-c-5.tmp.po xg-c-5.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-5.ok"
 cat <<EOF > xg-c-5.ok
 #. puke
 #. barf
@@ -23,4 +30,6 @@
 ${DIFF} xg-c-5.ok xg-c-5.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-6.in.C"
 cat <<EOF > xg-c-6.in.C
 /* This comment will not be extracted.  */
 gettext ("help");
@@ -17,11 +20,15 @@
 dgettext ("bar", "!");
 EOF
 
+tmpfiles="$tmpfiles xg-c-6.tmp.po xg-c-6.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-6.ok"
 cat <<EOF > xg-c-6.ok
 msgid "help"
 msgstr ""
@@ -42,4 +49,6 @@
 ${DIFF} xg-c-6.ok xg-c-6.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-7 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-7
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-7.c"
 cat <<EOF > xg-c-7.c
 int
 main()
@@ -37,10 +40,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-c-7.tmp.po xg-c-7.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-7.ok"
 cat <<EOF > xg-c-7.ok
 #. This is a comment which immediately before a keyword.
 msgid "1"
@@ -77,6 +84,8 @@
 ${DIFF} xg-c-7.ok xg-c-7.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
 
 Local Variables:
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-8 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-8
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-8	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of ISO C 99 <inttypes.h> format string directives.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-8.c"
 cat <<EOF > xg-c-8.c
 void foo ()
 {
@@ -13,10 +16,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-c-8.tmp xg-c-8.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-8.ok"
 cat <<EOF > xg-c-8.ok
 #, c-format
 msgid "File size is: %<PRId64>"
@@ -39,4 +46,6 @@
 ${DIFF} xg-c-8.ok xg-c-8.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-c-9 gettext-0.18.1.1/gettext-tools/tests/xgettext-c-9
--- gettext-0.19.3/gettext-tools/tests/xgettext-c-9	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-c-9	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-c-9.c"
 cat <<EOF > xg-c-9.c
 // This comment will not be extracted.
 print (gettext ("help"));
@@ -20,11 +23,15 @@
 "verbose string"));
 EOF
 
+tmpfiles="$tmpfiles xg-c-9.tmp.po xg-c-9.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-c-9.ok"
 cat <<EOF > xg-c-9.ok
 msgid "help"
 msgstr ""
@@ -53,4 +60,6 @@
 ${DIFF} xg-c-9.ok xg-c-9.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Some tests for C# support
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-1.cs"
 cat <<EOF > xg-cs-1.cs
 using GNU.Gettext;
 class TestCase {
@@ -26,10 +29,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-cs-1.tmp.po xg-cs-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-1.ok"
 cat <<EOF > xg-cs-1.ok
 #. standard usage
 msgid "Test String 1"
@@ -56,4 +63,6 @@
 ${DIFF} xg-cs-1.ok xg-cs-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # More tests for C# support: UTF-8 encoded source files
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-2.cs"
 cat <<\EOF > xg-cs-2.cs
 class TestCase {
   public static void Main (String[] args) {
@@ -22,11 +25,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-cs-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-2.ok"
 cat <<\EOF > xg-cs-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -76,4 +82,6 @@
 ${DIFF} xg-cs-2.ok xg-cs-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # More tests for C# support: string syntax
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-3.cs"
 LC_ALL=C tr '%' '\015' <<\EOF > xg-cs-3.cs
 class TestCase {
   public static void Main (String[] args) {
@@ -48,11 +51,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-cs-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-3.ok"
 cat <<\EOF > xg-cs-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -168,4 +174,6 @@
 ${DIFF} xg-cs-3.ok xg-cs-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Tests for C# plural keyword support
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-4.cs"
 cat <<EOF > xg-cs-4.cs
 class TestCase {
   public static void Main (String[] args) {
@@ -12,11 +15,15 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-cs-4.tmp.po xg-cs-4.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-4.ok"
 cat <<EOF > xg-cs-4.ok
 msgid "test 1"
 msgid_plural "plural test"
@@ -33,4 +40,6 @@
 ${DIFF} xg-cs-4.ok xg-cs-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-5.cs"
 cat <<EOF > xg-cs-5.cs
 // This comment will not be extracted.
 Console.WriteLine(GetString("help"));
@@ -20,11 +23,15 @@
 + "verbose string"));
 EOF
 
+tmpfiles="$tmpfiles xg-cs-5.tmp.po xg-cs-5.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-5.ok"
 cat <<EOF > xg-cs-5.ok
 msgid "help"
 msgstr ""
@@ -53,4 +60,6 @@
 ${DIFF} xg-cs-5.ok xg-cs-5.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-6.cs"
 cat <<\EOF > xg-cs-6.cs
 /* a */
 /* b */ string s = /* c */
@@ -10,11 +13,15 @@
 /* e */ _( /* f */ "hello " /* g */ + /* h */ "world" /* i */ );
 EOF
 
+tmpfiles="$tmpfiles xg-cs-6.tmp.po xg-cs-6.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-6.ok"
 cat <<EOF > xg-cs-6.ok
 #. a
 #. b
@@ -30,4 +37,6 @@
 ${DIFF} xg-cs-6.ok xg-cs-6.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-csharp-7 gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-7
--- gettext-0.19.3/gettext-tools/tests/xgettext-csharp-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-csharp-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,24 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: extraction of contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-cs-7.cs"
 cat <<\EOF > xg-cs-7.cs
 Console.WriteLine(rm.GetString("help"));
 Console.WriteLine(rm.GetParticularString("Help", "about"));
 EOF
 
+tmpfiles="$tmpfiles xg-cs-7.tmp.po xg-cs-7.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-cs-7.ok"
 cat <<EOF > xg-cs-7.ok
 msgid "help"
 msgstr ""
@@ -25,4 +32,6 @@
 ${DIFF} xg-cs-7.ok xg-cs-7.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-desktop-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-desktop-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-desktop-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-desktop-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of Desktop Entry support.
-
-cat <<EOF > xg.desktop
-[Desktop Entry]
-Type=Application
-Name =Foo
-Comment= \sThis is a \nmultiline\t comment; for testing
-Comment[foo]=Already translated comment
-Keywords=Keyword1;Keyword2;Key\;word3;
-EOF
-
-: ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg.desktop | grep -v 'POT-Creation-Date' > xg-desktop.pot || exit 1
-
-cat <<\EOF > xg-desktop.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg.desktop:4
-msgid "Foo"
-msgstr ""
-
-#: xg.desktop:5
-msgid ""
-" This is a \n"
-"multiline\t comment; for testing"
-msgstr ""
-
-#: xg.desktop:7
-msgid "Keyword1;Keyword2;Key\\;word3;"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-desktop.ok xg-desktop.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-elisp-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-elisp-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-elisp-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-elisp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test EmacsLisp support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-el-1.el"
 cat <<EOF > xg-el-1.el
 ; This comment will not be extracted.
 (princ (_ "help"))
@@ -15,11 +18,15 @@
 (princ (_ "The Fabulous Four"))
 EOF
 
+tmpfiles="$tmpfiles xg-el-1.tmp.po xg-el-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-el-1.ok"
 cat <<EOF > xg-el-1.ok
 msgid "help"
 msgstr ""
@@ -41,4 +48,6 @@
 ${DIFF} xg-el-1.ok xg-el-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-elisp-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-elisp-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-elisp-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-elisp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test EmacsLisp support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-el-2.el"
 cat <<\EOF > xg-el-2.el
 ; a
 (setq string ; b
@@ -13,11 +16,15 @@
 ))
 EOF
 
+tmpfiles="$tmpfiles xg-el-2.tmp.po xg-el-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-el-2.ok"
 cat <<EOF > xg-el-2.ok
 #. a
 #. b
@@ -31,4 +38,6 @@
 ${DIFF} xg-el-2.ok xg-el-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,21 +1,26 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support.
 
-cat <<EOF > xg-gl-1-empty.glade
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles empty.glade"
+cat <<EOF > empty.glade
 <?xml version="1.0"?>
 <GTK-Interface/>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-1.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-1.pot xg-gl-1-empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-1.pot empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
-cat <<EOF > xg-gl-1-widgets.glade
+tmpfiles="$tmpfiles widgets.glade"
+cat <<EOF > widgets.glade
 <?xml version="1.0"?>
 <GTK-Interface>
 
@@ -1329,9 +1334,12 @@
 </GTK-Interface>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-1.pot"
 : ${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 - widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-gl-1.ok"
 cat <<EOF > xg-gl-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -1351,208 +1359,208 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xg-gl-1-widgets.glade:33
+#: widgets.glade:33
 msgid "Libglade-GNOME Test"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:103
+#: widgets.glade:103
 msgid "Show _Tests"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:116
+#: widgets.glade:116
 msgid "Druid Test"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:295
+#: widgets.glade:295
 msgid "New"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:303
+#: widgets.glade:303
 msgid "Open"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:311
+#: widgets.glade:311
 msgid "Save"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:325
+#: widgets.glade:325
 msgid "Cut"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:342
+#: widgets.glade:342
 msgid "Copy"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:356
+#: widgets.glade:356
 msgid "Paste"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:370
+#: widgets.glade:370
 msgid "Clear"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:378
+#: widgets.glade:378
 msgid "Tog"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:395
+#: widgets.glade:395
 msgid "The cut copy paste and clear buttons should work correctly."
 msgstr ""
 
-#: xg-gl-1-widgets.glade:423
+#: widgets.glade:423
 msgid "Copyright (C) 1999"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:426
+#: widgets.glade:426
 msgid ""
 "A simple program demonstrating what is possible with GNOME and\n"
 "libglade.  This interface has been coded entirely with GLADE, and\n"
 "no C code specific to this interface has been written."
 msgstr ""
 
-#: xg-gl-1-widgets.glade:508
+#: widgets.glade:508
 msgid "X"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:529
+#: widgets.glade:529
 msgid "Widget Tests"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:556 xg-gl-1-widgets.glade:557
+#: widgets.glade:556 widgets.glade:557
 msgid "Pick a colour"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:564
+#: widgets.glade:564
 msgid "Colour Picker"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:578
+#: widgets.glade:578
 msgid "Pick a Font"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:579
+#: widgets.glade:579
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:590
+#: widgets.glade:590
 msgid "Font Picker"
 msgstr ""
 
 #. The welcome greeting
-#: xg-gl-1-widgets.glade:603
+#: widgets.glade:603
 msgid "Hello"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:612
+#: widgets.glade:612
 msgid "Icon Sel"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:627
+#: widgets.glade:627
 msgid "My Gnome Site"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:634
+#: widgets.glade:634
 msgid "HRef"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:665
+#: widgets.glade:665
 msgid "Entry"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:699
+#: widgets.glade:699
 msgid "File Entry"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:725
+#: widgets.glade:725
 msgid "Dial"
 msgstr ""
 
 #. This is a comment for the translators.
 #. This should be an strftime format,
 #. as described in the strftime(3) manual page.
-#: xg-gl-1-widgets.glade:742
+#: widgets.glade:742
 msgid "%H:%M"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:751
+#: widgets.glade:751
 msgid "Clock"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:774
+#: widgets.glade:774
 msgid "Animator"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:792
+#: widgets.glade:792
 msgid "Calculator"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:811
+#: widgets.glade:811
 msgid "Less"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:830
+#: widgets.glade:830
 msgid "PaperSel"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:848
+#: widgets.glade:848
 msgid "GnomeSpell"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:874
+#: widgets.glade:874
 msgid "Select File"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:901
+#: widgets.glade:901
 msgid "OK"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:917
+#: widgets.glade:917
 msgid "Cancel"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:949
+#: widgets.glade:949
 msgid ""
 "If this was a real application, clicking on the\n"
 "OK button would probably have done something\n"
 "useful, rather than just displaying this dialog."
 msgstr ""
 
-#: xg-gl-1-widgets.glade:995
+#: widgets.glade:995
 msgid "Nothing"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1159
+#: widgets.glade:1159
 msgid "_Entry"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1193
+#: widgets.glade:1193
 msgid "_Dial"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1218
+#: widgets.glade:1218
 msgid "GnomeDruid"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1239
+#: widgets.glade:1239
 msgid "Test GnomeDruid"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1240
+#: widgets.glade:1240
 msgid ""
 "This is a simple test of the GnomeDruid\n"
 "code in gnome-libs and the wrapper\n"
 "for said code in libglade."
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1253
+#: widgets.glade:1253
 msgid "A dial in a druid"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1300
+#: widgets.glade:1300
 msgid "Last Page"
 msgstr ""
 
-#: xg-gl-1-widgets.glade:1301
+#: widgets.glade:1301
 msgid "This is the end of the druid example"
 msgstr ""
 EOF
@@ -1561,4 +1569,6 @@
 ${DIFF} xg-gl-1.ok xg-gl-1.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,22 +1,27 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support, in particular ISO-8859-1 to UTF-8 conversion
 # and ASCII entities (&lt; &gt; &quot;).
 
-cat <<EOF > xg-gl-2-empty.glade
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles empty.glade"
+cat <<EOF > empty.glade
 <?xml version="1.0"?>
 <GTK-Interface/>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-2.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-2.pot xg-gl-2-empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-2.pot empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
-cat <<\EOF > xg-gl-2-simple.glade
+tmpfiles="$tmpfiles simple.glade"
+cat <<\EOF > simple.glade
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <GTK-Interface>
 
@@ -54,12 +59,15 @@
 </GTK-Interface>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-2.tmp xg-gl-2.pot"
 : ${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 simple.glade 
+test $? = 0 || { rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-gl-2.ok"
 cat <<\EOF > xg-gl-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -79,16 +87,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xg-gl-2-simple.glade:13
+#: simple.glade:13
 msgid "Hello"
 msgstr ""
 
 #. Der übliche Programm-Gruß
-#: xg-gl-2-simple.glade:30
+#: simple.glade:30
 msgid "Hello World"
 msgstr ""
 
-#: xg-gl-2-simple.glade:31
+#: simple.glade:31
 msgid "This <button> displays \"Hello World\"."
 msgstr ""
 EOF
@@ -97,4 +105,6 @@
 ${DIFF} xg-gl-2.ok xg-gl-2.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,21 +1,26 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support.
 
-cat <<EOF > xg-gl-3-empty.glade
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles empty.glade"
+cat <<EOF > empty.glade
 <?xml version="1.0"?>
 <GTK-Interface/>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-3.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-3.pot xg-gl-3-empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-3.pot empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
-cat <<EOF > xg-gl-3-asciitable.glade2
+tmpfiles="$tmpfiles asciitable.glade2"
+cat <<EOF > asciitable.glade2
 <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd" >
 
@@ -161,12 +166,15 @@
 </glade-interface>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-3.tmp xg-gl-3.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2  || exit 1
+${XGETTEXT} -o xg-gl-3.tmp asciitable.glade2 
+test $? = 0 || { rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-gl-3.ok"
 cat <<\EOF > xg-gl-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -186,15 +194,15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xg-gl-3-asciitable.glade2:7
+#: asciitable.glade2:7
 msgid "gedit: ASCII table"
 msgstr ""
 
-#: xg-gl-3-asciitable.glade2:30
+#: asciitable.glade2:30
 msgid "Insert char"
 msgstr ""
 
-#: xg-gl-3-asciitable.glade2:74
+#: asciitable.glade2:74
 msgid ""
 "If you wish to insert any of the characters in to the active \n"
 "document, select the character and click the \"Insert Char\" \n"
@@ -206,4 +214,6 @@
 ${DIFF} xg-gl-3.ok xg-gl-3.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,20 +1,25 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support.
 
-cat <<EOF > xg-gl-4-empty.glade
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles empty.glade"
+cat <<EOF > empty.glade
 <?xml version="1.0"?>
 <GTK-Interface/>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-4.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4.pot xg-gl-4-empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-4.pot empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  rm -fr $tmpfiles; exit 77
 }
 
+tmpfiles="$tmpfiles xg-gl-4.glade"
 cat <<EOF > xg-gl-4.glade
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
@@ -34,12 +39,15 @@
 </glade-interface>
 EOF
 
+tmpfiles="$tmpfiles xg-gl-4.tmp xg-gl-4.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade || exit 1
+${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade
+test $? = 0 || { rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-gl-4.ok"
 cat <<\EOF > xg-gl-4.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -69,58 +77,6 @@
 ${DIFF} xg-gl-4.ok xg-gl-4.pot
 result=$?
 
-test $result = 0 || {
-    rm -fr $tempfiles; exit $result
-}
-
-cat <<EOF > xg-gl-4a.glade
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="mainWindow">
-    <accessibility>
-      <atkproperty name="AtkObject::accessible-name" translatable="yes" comments="Also has comments">This window</atkproperty>
-    </accessibility>
-    <child>
-      <placeholder/>
-    </child>
-  </widget>
-</glade-interface>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-
-cat <<\EOF > xg-gl-4a.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Also has comments
-#: xg-gl-4a.glade:7
-msgid "This window"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-gl-4a.ok xg-gl-4a.pot
-result=$?
+rm -fr $tmpfiles
 
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-5	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of Glade 2 support for msgctxt.
-
-cat <<EOF > xg-gl-5-empty.glade
-<?xml version="1.0"?>
-<GTK-Interface/>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-}
-
-cat <<EOF > xg-gl-5.glade
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.8 -->
-  <!-- interface-naming-policy project-wide -->
-  <widget class="GtkWindow" id="window1">
-    <child>
-      <widget class="GtkVBox" id="vbox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <widget class="GtkButton" id="with_context">
-            <property name="label" translatable="yes" context="yes">Shape|Form</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-          </widget>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkButton" id="without_context">
-            <property name="label" translatable="yes">Shape|Form</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-
-cat <<\EOF > xg-gl-5.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg-gl-5.glade:12
-msgctxt "Shape"
-msgid "Form"
-msgstr ""
-
-#: xg-gl-5.glade:23
-msgid "Shape|Form"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-gl-5.ok xg-gl-5.pot
-result=$?
-
-test $result = 0 || {
-  exit $result
-}
-
-# Check with --extract-all option
-rm xg-gl-5.tmp
-${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
-
-${DIFF} xg-gl-5.ok xg-gl-5.pot
-result=$?
-
-test $result = 0 || {
-  exit $result
-}
-
-cat <<EOF > xg-gl-5b.glade
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.8 -->
-  <!-- interface-naming-policy project-wide -->
-  <widget class="GtkWindow" id="window1">
-    <child>
-      <widget class="GtkVBox" id="vbox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <widget class="GtkButton" id="with_context">
-            <property name="label" translatable="yes" context="yes">ShapeForm</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-          </widget>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkButton" id="without_context">
-            <property name="label" translatable="yes">Shape|Form</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-
-cat <<\EOF > xg-gl-5b.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg-gl-5b.glade:23
-msgid "Shape|Form"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-gl-5b.ok xg-gl-5b.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-6	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of GtkBuilder support.
-# Checks that the extracted pot contains the right translatable
-# content, comments and context.
-
-cat <<EOF > xg-gl-6-empty.glade
-<?xml version="1.0"?>
-<GTK-Interface/>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-}
-
-cat <<EOF > xg-gl-6.ui
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes" context="This is the context for this text" comments="This is a comment for empty window">This is an empty window</property>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-</interface>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. This is a comment for empty window
-#: xg-gl-6.ui:6
-msgctxt "This is the context for this text"
-msgid "This is an empty window"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-gl-6.ok xg-gl-6.pot
-result=$?
-
-test $result = 0 || {
-  exit $result
-}
-
-# Check with --extract-all option.
-${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
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-glade-7 gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-7
--- gettext-0.19.3/gettext-tools/tests/xgettext-glade-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-glade-7	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of GtkBuilder support.
-# Checks the extraction of a medium size GtkBuilder file, with
-# comments, context and translatable and not translatable content.
-
-cat <<EOF > xg-gl-7-empty.glade
-<?xml version="1.0"?>
-<GTK-Interface/>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-}
-
-cat <<EOF > xg-gl-7.ui
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-about</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-help</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-connect</property>
-  </object>
-  <object class="GtkListStore" id="liststore">
-    <columns>
-      <!-- column-name first column -->
-      <column type="gchararray"/>
-      <!-- column-name second column -->
-      <column type="gchararray"/>
-      <!-- column-name not extracted column -->
-      <column type="guint64"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="First row">Hi</col>
-        <col id="1" translatable="yes" comments="A comment.">Comment</col>
-        <col id="2">999</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="First row">Hello</col>
-        <col id="1" translatable="yes" comments="This is no translatable.">Translatable comment.</col>
-        <col id="2">88</col>
-      </row>
-      <row>
-        <col id="0" translatable="no" context="First row" comments="Yeah">Oi</col>
-        <col id="1" translatable="yes" context="This is not translatable">Please...</col>
-        <col id="2">86855555</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="First row">Hi</col>
-        <col id="1" translatable="yes" comments="A multiline&#10;comment.">Comment</col>
-        <col id="2">999</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkMenuBar" id="menubar">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuItem" id="menuitem1">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="Menu" comments="This thing is the menu label">One thing</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem1">
-                        <property name="label" translatable="yes" context="One thing" comments="This thing is the label in the inner menu.">One thing</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="image">image1</property>
-                        <property name="use_stock">False</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem2">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="Menu" comments="This is easy.">H_elp</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem2">
-                        <property name="label" translatable="yes" context="Second menu" comments="This one thing is for the second menu.">One thing</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="image">image2</property>
-                        <property name="use_stock">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem3">
-                        <property name="label" translatable="yes" context="Second menu" comments="To you too.">Greetings</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="image">image3</property>
-                        <property name="use_stock">False</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkTreeView" id="treeview2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="model">liststore</property>
-            <signal name="columns-changed" handler="myfunction_treeview_columns_changed" object="treeview-selection2" swapped="no"/>
-            <child internal-child="selection">
-              <object class="GtkTreeSelection" id="treeview-selection2"/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button">
-            <property name="label" translatable="yes" context="Button" comments="This one thing is the button.">One thing</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg-gl-7.ui:30 xg-gl-7.ui:45
-msgctxt "First row"
-msgid "Hi"
-msgstr ""
-
-#. A comment.
-#. A multiline
-#. comment.
-#: xg-gl-7.ui:31 xg-gl-7.ui:46
-msgid "Comment"
-msgstr ""
-
-#: xg-gl-7.ui:35
-msgctxt "First row"
-msgid "Hello"
-msgstr ""
-
-#. This is no translatable.
-#: xg-gl-7.ui:36
-msgid "Translatable comment."
-msgstr ""
-
-#: xg-gl-7.ui:41
-msgctxt "This is not translatable"
-msgid "Please..."
-msgstr ""
-
-#. This thing is the menu label
-#: xg-gl-7.ui:67
-msgctxt "Menu"
-msgid "One thing"
-msgstr ""
-
-#. This thing is the label in the inner menu.
-#: xg-gl-7.ui:75
-msgctxt "One thing"
-msgid "One thing"
-msgstr ""
-
-#. This is easy.
-#: xg-gl-7.ui:92
-msgctxt "Menu"
-msgid "H_elp"
-msgstr ""
-
-#. This one thing is for the second menu.
-#: xg-gl-7.ui:100
-msgctxt "Second menu"
-msgid "One thing"
-msgstr ""
-
-#. To you too.
-#: xg-gl-7.ui:110
-msgctxt "Second menu"
-msgid "Greetings"
-msgstr ""
-
-#. This one thing is the button.
-#: xg-gl-7.ui:147
-msgctxt "Button"
-msgid "One thing"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-gl-7.ok xg-gl-7.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-gsettings-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-gsettings-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-gsettings-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-gsettings-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of GSettings support.
-
-cat <<EOF > xg-gs-1-empty.gschema.xml
-<?xml version="1.0"?>
-<schemalist/>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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
-}
-
-cat <<EOF > xg-gs-1.gschema.xml
-<?xml version="1.0"?>
-<schemalist>
-  <schema id="org.gnome.example" path="/org/gnome/example/">
-    <key name="foo" type="i">
-      <default>0</default>
-      <summary context="Foo">Example Integer Key</summary>
-      <description>
-        The example integer key to test that the default value is not
-        translated.
-      </description>
-    </key>
-    <key name="bar" type="s">
-      <default l10n="messages">
-        ' foo   bar   baz'
-      </default>
-    </key>
-    <key name="baz" type="s">
-      <summary context="Baz"></summary>
-    </key>
-  </schema>
-</schemalist>
-EOF
-
-: ${XGETTEXT=xgettext}
-${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.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xg-gs-1.gschema.xml:6
-msgid "Example Integer Key"
-msgstr ""
-
-#: xg-gs-1.gschema.xml:7
-msgid ""
-"The example integer key to test that the default value is not translated."
-msgstr ""
-
-#: xg-gs-1.gschema.xml:13
-msgid "' foo   bar   baz'"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-gs-1.ok xg-gs-1.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java support
 #
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-1.java"
 cat <<EOF > xg-j-1.java
 class TestCase {
     public TestCase() {
@@ -28,10 +31,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-j-1.tmp.po xg-j-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-j-1.ok"
 cat <<EOF > xg-j-1.ok
 #. standard usage
 msgid "Test String 1"
@@ -58,4 +65,6 @@
 ${DIFF} xg-j-1.ok xg-j-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # More tests for java support
 #
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-2.java"
 cat <<\EOF > xg-j-2.java
 class TestCase {
   public static void main (String[] args) {
@@ -55,12 +58,15 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-j-2.tmp xg-j-2.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-j-2.ok"
 cat <<\EOF > xg-j-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -169,4 +175,6 @@
 ${DIFF} xg-j-2.ok xg-j-2.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-3.java"
 cat <<EOF > xg-j-3.java
 class TestCase {
     public TestCase() {
@@ -13,10 +16,14 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-j-3.tmp.po xg-j-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-j-3.ok"
 cat <<EOF > xg-j-3.ok
 msgid "test 1"
 msgid_plural "plural test"
@@ -28,4 +35,6 @@
 ${DIFF} xg-j-3.ok xg-j-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-4.java"
 cat <<EOF > xg-j-4.java
 class TestCase {
     public TestCase() {
@@ -13,11 +16,15 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-j-4.tmp.po xg-j-4.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-j-4.ok"
 cat <<EOF > xg-j-4.ok
 msgid "test 1"
 msgid_plural "plural test"
@@ -29,4 +36,6 @@
 ${DIFF} xg-j-4.ok xg-j-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-5.java"
 cat <<EOF > xg-j-5.java
 // This comment will not be extracted.
 System.out.println(gettext("help"));
@@ -20,11 +23,15 @@
 + "verbose string"));
 EOF
 
+tmpfiles="$tmpfiles xg-j-5.tmp.po xg-j-5.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-j-5.ok"
 cat <<EOF > xg-j-5.ok
 msgid "help"
 msgstr ""
@@ -53,4 +60,6 @@
 ${DIFF} xg-j-5.ok xg-j-5.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-6.java"
 cat <<\EOF > xg-j-6.java
 /* a */
 /* b */ String string = /* c */
@@ -10,11 +13,15 @@
 /* e */ _( /* f */ "hello " /* g */ + /* h */ "world" /* i */ );
 EOF
 
+tmpfiles="$tmpfiles xg-j-6.tmp.po xg-j-6.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-j-6.ok"
 cat <<EOF > xg-j-6.ok
 #. a
 #. b
@@ -30,4 +37,6 @@
 ${DIFF} xg-j-6.ok xg-j-6.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-java-7 gettext-0.18.1.1/gettext-tools/tests/xgettext-java-7
--- gettext-0.19.3/gettext-tools/tests/xgettext-java-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-java-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,25 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: extraction of contexts.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-j-7.java"
 cat <<\EOF > xg-j-7.java
 import gnu.gettext.GettextResourceBundle;
 System.out.println(GettextResourceBundle.gettext("help"));
 System.out.println(GettextResourceBundle.pgettext("Help", "about"));
 EOF
 
+tmpfiles="$tmpfiles xg-j-7.tmp.po xg-j-7.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-j-7.ok"
 cat <<EOF > xg-j-7.ok
 msgid "help"
 msgstr ""
@@ -26,4 +33,6 @@
 ${DIFF} xg-j-7.ok xg-j-7.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-javascript-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-javascript-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of JavaScript support.
-
-cat <<\EOF > xg-js-1.js
-var s1 = "Simple string, no gettext needed",
-    s2 = _("Extract this first string");
-function foo(a) {
-    var s3 = "Prefix _(" + _("Extract this second string") + ") Postfix";
-}
-if (document.getElementsById("foo")[0].innerHTML == _("Extract this third string")) {
-    /* _("This is a comment and must not be extracted!") */
-}
-/* TRANSLATORS: This is a translator comment.  */
-gettext('Extract this fourth string');
-// TRANSLATORS: This is another translator comment.
-gettext('Extract this fifth string');
-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; }
-# 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
-
-cat <<\EOF > xg-js-1.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Extract this first string"
-msgstr ""
-
-msgid "Extract this second string"
-msgstr ""
-
-msgid "Extract this third string"
-msgstr ""
-
-#. TRANSLATORS: This is a translator comment.
-msgid "Extract this fourth string"
-msgstr ""
-
-#. TRANSLATORS: This is another translator comment.
-msgid "Extract this fifth string"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-js-1.ok xg-js-1.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-javascript-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-javascript-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of JavaScript support.
-# Playing with regex and division operator
-
-cat <<\EOF > xg-js-2.js
-// RegExp literals containing string quotes must not desync the parser
-var d = 1 / 2 / 4;
-var s = " x " + /^\d/.match("0815").replace(/[a-z]/g, '@');
-var s1 = /"/.match(_("RegExp test string #1"));
-var s2 = /'/.match(_("RegExp test string #2"));
-var s3 = /['a-b]/.match(_('RegExp test string #3'));
-var s4 = /["a-b]/.match(_('RegExp test string #4'));
-var s5 = /[a-b']/.match(_('RegExp test string #5'));
-var s6 = /[a-b"]/.match(_('RegExp test string #6'));
-var c = 35 / 2 / 8 + _("RegExp test string #7").length / 32.0;
-var sizestr = Math.round(size/1024*factor)/factor+_("RegExp test string #8");
-var cssClassType = attr.type.replace(/^.*\//, _('RegExp test string #9')).replace(/\./g, '-');
-var lookup = lookuptable[idx]/factor+_("RegExp test string #10");
-function doit() {
-  return /\./.match(_("RegExp test string #11"));
-}
-if (false)
-  /foo/.match(_("RegExp test string #12"));
-else
-  /foo/.match(_("RegExp test string #13"));
-var s7 = /a\/\f\r\n\t\v\0\b\s\S\w\W\d\D\b\Bb/.test(_("RegExp test string #14"));
-var s8 = /(?=(a+))a*b\1/.exec(_("RegExp test string #15"));
-var s9 = /_("a+")/.exec(_("RegExp test string #16"));
-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; }
-# 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
-
-cat <<\EOF > xg-js-2.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "RegExp test string #1"
-msgstr ""
-
-msgid "RegExp test string #2"
-msgstr ""
-
-msgid "RegExp test string #3"
-msgstr ""
-
-msgid "RegExp test string #4"
-msgstr ""
-
-msgid "RegExp test string #5"
-msgstr ""
-
-msgid "RegExp test string #6"
-msgstr ""
-
-msgid "RegExp test string #7"
-msgstr ""
-
-msgid "RegExp test string #8"
-msgstr ""
-
-msgid "RegExp test string #9"
-msgstr ""
-
-msgid "RegExp test string #10"
-msgstr ""
-
-msgid "RegExp test string #11"
-msgstr ""
-
-msgid "RegExp test string #12"
-msgstr ""
-
-msgid "RegExp test string #13"
-msgstr ""
-
-msgid "RegExp test string #14"
-msgstr ""
-
-msgid "RegExp test string #15"
-msgstr ""
-
-msgid "RegExp test string #16"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-js-2.ok xg-js-2.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-javascript-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-javascript-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-3	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of JavaScript support.
-# Playing with concatenation of string literals within the gettext function
-
-cat <<\EOF > xg-js-3.js
-// The usual way to concatenate strings is the plus '+' sign
-var s1 = _("Concatenation #1 " + "- String part added");
-var s2 = _('Concatenation #2 ' + '- String part added');
-var s3 = _("This" + " whole "
-          + "string" +
-         ' should' + " be " + 'extracted');
-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; }
-# 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
-
-cat <<\EOF > xg-js-3.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Concatenation #1 - String part added"
-msgstr ""
-
-msgid "Concatenation #2 - String part added"
-msgstr ""
-
-msgid "This whole string should be extracted"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-js-3.ok xg-js-3.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-javascript-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-javascript-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-4	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of JavaScript escape sequences in string literals.
-
-cat <<\EOF > xg-js-4.js
-var s1 = _("Unicode escape \u3042");
-var s2 = _("Surrogate pair \uD835\uDC9C");
-var s3 = _("Escape sequence \1411 \x622 \xxx \y");
-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; }
-# 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
-
-cat <<\EOF > xg-js-4.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Unicode escape あ"
-msgstr ""
-
-msgid "Surrogate pair 𝒜"
-msgstr ""
-
-msgid "Escape sequence a1 b2 xxx y"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-js-4.ok xg-js-4.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-javascript-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-javascript-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-5	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of JavaScript Unicode support.
-
-cat <<\EOF > xg-js-5.js
-// the following except is stolen from json2.js
-var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-    escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-    gap,
-    txt1 = _("Expected translation string #1"),
-    indent,
-    meta = {    // table of character substitutions
-        '\b': '\\b',
-        '\t': '\\t',
-        '\n': '\\n',
-        '\f': '\\f',
-        '\r': '\\r',
-        '"' : '\\"',
-        '\\': '\\\\' + _("Expected translation string #2")
-    },
-    txt2 = _("Expected translation string #3"),
-    rep;
-var matched = curnodepath.match('^\\'+path+'\\/([\\w\\s]+)') \
-    + _("Expected translation string #4");
-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; }
-# 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
-
-cat <<\EOF > xg-js-5.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Expected translation string #1"
-msgstr ""
-
-msgid "Expected translation string #2"
-msgstr ""
-
-msgid "Expected translation string #3"
-msgstr ""
-
-msgid "Expected translation string #4"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-js-5.ok xg-js-5.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-javascript-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-javascript-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-javascript-6	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of JavaScript E4X support.
-
-cat <<\EOF > xg-js-6.js
-var x1 = <x1></x1>;
-var s1 = _("Expected translation string #1");
-var s2 = "foo";
-var x2 = <{s2}>foo {s2} bar</{s2}>;
-var x3 = <x3 a1="/"><x4>{_("Expected translation string #2")}</x4></x3>;
-var x4 = <x5 a2='/'><x{_("Expected translation string #3")}>
-</x{_("Expected translation string #3")}></x5>;
-var x4 = <![CDATA[
-  _("Unexpected translation string #1")
-]]>;
-var x5 = <!-- - _("Unexpected translation string #2") - -->;
-var s6 = _("Expected translation string #4");
-var x6 = <? _("Unexpected translation string #3") ?>;
-var x7 = <!--- this is a comment --> <foo>
-var s7 = "<{x6}>_("Unexpected translation string #4")</{x6}>" +
-         "<!-- _("Unexpected translation string #5") --!>" +
-         _("Expected translation string #5");
-var s8 = _("<x7>Expected translation string #6</x7>");
-var x8 = <x8><x9>{_("<x8>{Expected translation string #7}</x8>")}</x9></x8>
-var x9 = <x10 attr='{_("Unexpected translation string #6")}'><x11>data</x11></x10>;
-var s9 = _("Expected translation string #8");
-</foo>;
-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; }
-# 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
-
-cat <<\EOF > xg-js-6.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Expected translation string #1"
-msgstr ""
-
-msgid "Expected translation string #2"
-msgstr ""
-
-msgid "Expected translation string #3"
-msgstr ""
-
-msgid "Expected translation string #4"
-msgstr ""
-
-msgid "Expected translation string #5"
-msgstr ""
-
-msgid "<x7>Expected translation string #6</x7>"
-msgstr ""
-
-msgid "<x8>{Expected translation string #7}</x8>"
-msgstr ""
-
-msgid "Expected translation string #8"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-js-6.ok xg-js-6.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-librep-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-librep-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-librep-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-librep-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test librep support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-lr-1.jl"
 cat <<EOF > xg-lr-1.jl
 ; This comment will not be extracted.
 (princ (_ "help"))
@@ -16,11 +19,15 @@
 (princ (_ "The Fabulous Four"))
 EOF
 
+tmpfiles="$tmpfiles xg-lr-1.tmp.po xg-lr-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-lr-1.ok"
 cat <<EOF > xg-lr-1.ok
 msgid "help"
 msgstr ""
@@ -43,4 +50,6 @@
 ${DIFF} xg-lr-1.ok xg-lr-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-librep-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-librep-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-librep-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-librep-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test librep support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-lr-2.jl"
 cat <<\EOF > xg-lr-2.jl
 #| a |#
 #| b |# (setq string #| c |#
@@ -10,11 +13,15 @@
 #| e |# (_ #| f |# "hello world" #| g |# ))
 EOF
 
+tmpfiles="$tmpfiles xg-lr-2.tmp.po xg-lr-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-lr-2.ok"
 cat <<EOF > xg-lr-2.ok
 #. a
 #. b
@@ -30,4 +37,6 @@
 ${DIFF} xg-lr-2.ok xg-lr-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-lisp-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-lisp-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-lisp-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-lisp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lisp support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ls-1.lisp"
 cat <<EOF > xg-ls-1.lisp
 ; This comment will not be extracted.
 (write-line (gettext "help"))
@@ -16,11 +19,15 @@
 (write-line (gettext "The Fabulous Four"))
 EOF
 
+tmpfiles="$tmpfiles xg-ls-1.tmp.po xg-ls-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ls-1.ok"
 cat <<EOF > xg-ls-1.ok
 msgid "help"
 msgstr ""
@@ -43,4 +50,6 @@
 ${DIFF} xg-ls-1.ok xg-ls-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-lisp-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-lisp-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-lisp-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-lisp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lisp support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ls-2.lisp"
 cat <<\EOF > xg-ls-2.lisp
 #| a |#
 #| b |# (setq string #| c |#
@@ -10,11 +13,15 @@
 #| e |# (_ #| f |# "hello world" #| g |# ))
 EOF
 
+tmpfiles="$tmpfiles xg-ls-2.tmp.po xg-ls-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ls-2.ok"
 cat <<EOF > xg-ls-2.ok
 #. a
 #. b
@@ -30,4 +37,6 @@
 ${DIFF} xg-ls-2.ok xg-ls-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-lua-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-lua-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-lua-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-lua-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test Lua support
-
-cat <<\EOF > xg-lu-1.lua
-print(_("This is a test string."))
-print(_('And another one.'))
-print(_("Don't be afraid to extract this one."))
-print(_('I don\'t bite!'))
-print(_("I said: \"This is a test.\""))
-print(_('He said: "You\'re right!"'))
-print(_([[I like brackets.]]))
-print(_([===[Brackets are awesome!]===]))
-print(_(hmm["nope"]))
-print({_"yep"})
-print(_["nope"])
-print(_("\097"))
-print(_("\x3F\z  	
-\x2a"))
-print(_("abc" .. "def"))
-print(speed / 1000 .. 'Mbps')
-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
-
-cat <<EOF > xg-lu-1.ok
-msgid "This is a test string."
-msgstr ""
-
-msgid "And another one."
-msgstr ""
-
-msgid "Don't be afraid to extract this one."
-msgstr ""
-
-msgid "I don't bite!"
-msgstr ""
-
-msgid "I said: \"This is a test.\""
-msgstr ""
-
-msgid "He said: \"You're right!\""
-msgstr ""
-
-msgid "I like brackets."
-msgstr ""
-
-msgid "Brackets are awesome!"
-msgstr ""
-
-msgid "yep"
-msgstr ""
-
-msgid "a"
-msgstr ""
-
-msgid "?*"
-msgstr ""
-
-msgid "abcdef"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-lu-1.ok xg-lu-1.po
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-lua-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-lua-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-lua-2	2014-05-13 09:27:15.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-lua-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test Lua support
-
-cat <<\EOF > xg-lu-2.lua
--- This comment won't be extracted.
-print(_"Hmm.")
--- Neither this one.
-print(_"Test.")
---   TRANSLATORS: Hello translators, how are you today?
-print(_"We're fine, thanks.")
---[[ Do not extract this, please ]]
-
---[[  TRANSLATORS:
-Attention!
-]]
-print(--[=[	TRANSLATORS: This is a comment for you!]=] _(--[[TRANSLATORS: Nobody else is supposed to read this!]]
-"flowers" --[===[ TRANSLATORS: Nobody will see this.]===] .. --[[ TRANSLATORS: How sad.]] " and " .. --[[Secret text!]]
-"biscuits" --[=[TRANSLATORS: Hey you!]=]))
-
---[==[TRANSLATORS: :-]]==]
-print(_"A string.")
-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
-
-cat <<EOF > xg-lu-2.ok
-msgid "Hmm."
-msgstr ""
-
-msgid "Test."
-msgstr ""
-
-#. TRANSLATORS: Hello translators, how are you today?
-msgid "We're fine, thanks."
-msgstr ""
-
-#. TRANSLATORS:
-#. Attention!
-#.
-#. TRANSLATORS: This is a comment for you!
-#. TRANSLATORS: Nobody else is supposed to read this!
-msgid "flowers and biscuits"
-msgstr ""
-
-#. TRANSLATORS: :-]
-msgid "A string."
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-lu-2.ok xg-lu-2.po
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-objc-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-objc-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-objc-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-objc-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ObjectiveC extractor.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ob-1.m"
 cat <<\EOF > xg-ob-1.m
 id str = _(@
 "conca" /* comment */
@@ -25,10 +28,14 @@
 NSLocalizedString(@"Information", @"")
 EOF
 
+tmpfiles="$tmpfiles xg-ob-1.tmp.po xg-ob-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ob-1.ok"
 cat <<\EOF > xg-ob-1.ok
 #: xg-ob-1.m:2
 msgid "concatenated"
@@ -55,4 +62,6 @@
 ${DIFF} xg-ob-1.ok xg-ob-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-objc-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-objc-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-objc-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-objc-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ObjectiveC support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ob-2.m"
 cat <<EOF > xg-ob-2.m
 // This comment will not be extracted.
 print (NSLocalizedString (@
@@ -24,11 +27,15 @@
 @ "verbose string"));
 EOF
 
+tmpfiles="$tmpfiles xg-ob-2.tmp.po xg-ob-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ob-2.ok"
 cat <<EOF > xg-ob-2.ok
 msgid "help"
 msgstr ""
@@ -57,4 +64,6 @@
 ${DIFF} xg-ob-2.ok xg-ob-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-1.pl"
 cat <<\EOF > xg-pl-1.pl
 use Locale::Messages qw (textdomain bindtextdomain gettext ngettext dngettext);
 
@@ -149,14 +152,18 @@
 gettext "Discarded!";
 EOF
 
+tmpfiles="$tmpfiles xg-pl-1.tmp.po xg-pl-1.po"
 : ${XGETTEXT=xgettext}
 ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-1.ok"
 cat <<\EOF > xg-pl-1.ok
 #: xg-pl-1.pl:9
 msgid "'Your command, please?', asked the waiter."
@@ -330,4 +337,6 @@
 ${DIFF} xg-pl-1.ok xg-pl-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support with ISO-8859-1 encoded input.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-2.pl"
 cat <<\EOF > xg-pl-2.pl
 use charnames ':full';
 printf "%s\n", gettext "B�se B�bchen - wo sind sie blo\N{LATIN SMALL LETTER SHARP S}?";
@@ -11,11 +14,14 @@
 STR
 EOF
 
+tmpfiles="$tmpfiles xg-pl-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-2.ok"
 cat <<\EOF > xg-pl-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -48,4 +54,6 @@
 ${DIFF} xg-pl-2.ok xg-pl-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support with UTF-8 encoded input.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-3.pl"
 cat <<\EOF > xg-pl-3.pl
 use charnames ':full';
 printf "%s\n", gettext "Böse Bübchen - wo sind sie blo\N{LATIN SMALL LETTER SHARP S}?";
@@ -11,11 +14,14 @@
 STR
 EOF
 
+tmpfiles="$tmpfiles xg-pl-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-3.ok"
 cat <<\EOF > xg-pl-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -48,4 +54,6 @@
 ${DIFF} xg-pl-3.ok xg-pl-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Tests for the general string extraction facilities of the Perl backend
 # (with option --extract-all).
                                                                                 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-4.pl"
 cat <<\EOPERL > xg-pl-4.pl
 use strict;
 
@@ -54,11 +57,15 @@
 #      "\x{430}\x{447}\x{43a}\x{430}\n";
 EOPERL
 
+tmpfiles="$tmpfiles xg-pl-4.tmp.pot xg-pl-4.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-4.ok"
 cat <<\EOF > xg-pl-4.ok
 msgid "'Your command, please?', asked the waiter.\n"
 msgstr ""
@@ -108,4 +115,6 @@
 ${DIFF} xg-pl-4.ok xg-pl-4.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Perl support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-5.pl"
 cat <<EOF > xg-pl-5.pl
 # This comment will not be extracted.
 print gettext "help";
@@ -15,11 +18,15 @@
 print gettext "The Fabulous Four";
 EOF
 
+tmpfiles="$tmpfiles xg-pl-5.tmp.po xg-pl-5.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-5.ok"
 cat <<EOF > xg-pl-5.ok
 msgid "help"
 msgstr ""
@@ -41,4 +48,6 @@
 ${DIFF} xg-pl-5.ok xg-pl-5.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test whether the right number of arguments are extracted.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-6.pl"
 cat <<\EOPERL > xg-pl-6.pl
 use strict;
 
@@ -63,11 +66,15 @@
 print dgettext foo 17, "extracted16";
 EOPERL
 
+tmpfiles="$tmpfiles xg-pl-6.tmp xg-pl-6.pot"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-6.ok"
 cat <<\EOF > xg-pl-6.ok
 msgid "extracted1"
 msgstr ""
@@ -122,4 +129,6 @@
 ${DIFF} xg-pl-6.ok xg-pl-6.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-7 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-7
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-7	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-7	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Perl support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-7.pl"
 cat <<\EOF > xg-pl-7.pl
 # a
 string = # b
@@ -14,11 +17,15 @@
 );
 EOF
 
+tmpfiles="$tmpfiles xg-pl-7.tmp.po xg-pl-7.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-7.ok"
 cat <<EOF > xg-pl-7.ok
 #. a
 #. b
@@ -32,4 +39,6 @@
 ${DIFF} xg-pl-7.ok xg-pl-7.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-perl-8 gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-8
--- gettext-0.19.3/gettext-tools/tests/xgettext-perl-8	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-perl-8	2010-06-06 12:49:58.000000000 +0000
@@ -1,11 +1,14 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # The slash (/) and the question mark (?) serve a double-purpose in Perl.
 # Depending on the context they can either be an operator (division
 # or ternary respectively) or they are regex delimiters for pattern
 # matches.  This test case checks the proper recognition.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pl-8.pl"
 cat <<\EOF > xg-pl-8.pl
 info(__("using %s."), ($a->b() eq "auto" ? "" : ""));
 
@@ -60,12 +63,16 @@
 print __"Synching works.";
 EOF
 
+tmpfiles="$tmpfiles xg-pl-8.tmp.po xg-pl-8.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pl-8.ok"
 cat <<\EOF > xg-pl-8.ok
 #: xg-pl-8.pl:1
 #, perl-format
@@ -121,4 +128,6 @@
 ${DIFF} xg-pl-8.ok xg-pl-8.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-php-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-php-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-php-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-php-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ph-1.php"
 cat <<EOF > xg-ph-1.php
 <?
 // This comment will not be extracted.
@@ -22,11 +25,15 @@
 ?>
 EOF
 
+tmpfiles="$tmpfiles xg-ph-1.tmp.po xg-ph-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ph-1.ok"
 cat <<EOF > xg-ph-1.ok
 msgid "help"
 msgstr ""
@@ -53,4 +60,6 @@
 ${DIFF} xg-ph-1.ok xg-ph-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-php-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-php-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-php-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-php-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: here documents.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ph-2.php"
 cat <<EOF > xg-ph-2.php
 <?
 echo _("Egyptians");
@@ -39,24 +42,14 @@
 ?>
 EOF
 
+tmpfiles="$tmpfiles xg-ph-2.tmp.po xg-ph-2.po"
 : ${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
-
-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-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-2.tmp xg-ph-2.php
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ph-2.ok"
 cat <<EOF > xg-ph-2.ok
 msgid "Egyptians"
 msgstr ""
@@ -75,17 +68,9 @@
 EOF
 
 : ${DIFF=diff}
-
 ${DIFF} xg-ph-2.ok xg-ph-2.po
 result=$?
-test $result = 0 || exit $result
 
-${DIFF} xg-ph-2.ok xg-ph-2d.po
-result=$?
-test $result = 0 || exit $result
-
-${DIFF} xg-ph-2.ok xg-ph-2s.po
-result=$?
-test $result = 0 || exit $result
+rm -fr $tmpfiles
 
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-php-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-php-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-php-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-php-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ph-3.php"
 cat <<\EOF > xg-ph-3.php
 <?
 /* a */
@@ -12,11 +15,15 @@
 ?>
 EOF
 
+tmpfiles="$tmpfiles xg-ph-3.tmp.po xg-ph-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ph-3.ok"
 cat <<EOF > xg-ph-3.ok
 #. a
 #. b
@@ -32,4 +39,6 @@
 ${DIFF} xg-ph-3.ok xg-ph-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-php-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-php-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-php-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-php-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: string concatenation.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-ph-4.php"
 cat <<EOF > xg-ph-4.php
 <?
 echo _("foo"."bar");
@@ -14,11 +17,15 @@
 ?>
 EOF
 
+tmpfiles="$tmpfiles xg-ph-4.tmp.po xg-ph-4.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-ph-4.ok"
 cat <<EOF > xg-ph-4.ok
 msgid "foobar"
 msgstr ""
@@ -49,4 +56,6 @@
 ${DIFF} xg-ph-4.ok xg-ph-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-po-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-po-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-po-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-po-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C, C++, PO extractors.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-po-1.in.po xg-po-1.c xg-po-1.cc"
 cat <<EOF > xg-po-1.in.po
 #: file1.c:199
 #, fuzzy
@@ -42,11 +45,15 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-po-1.tmp.po xg-po-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-po-1.ok"
 cat <<EOF > xg-po-1.ok
 #: file1.c:199
 #, fuzzy
@@ -76,4 +83,6 @@
 ${DIFF} xg-po-1.ok xg-po-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-properties-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-properties-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-properties-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-properties-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C, C++, JavaProperties extractors.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc"
 cat <<EOF > xg-pr-1.in.properties
 #: file1.c:199
 #, fuzzy
@@ -39,11 +42,15 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-pr-1.tmp.po xg-pr-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-pr-1.ok"
 cat <<EOF > xg-pr-1.ok
 #: file1.c:199
 #, fuzzy
@@ -73,4 +80,6 @@
 ${DIFF} xg-pr-1.ok xg-pr-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-python-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-python-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-python-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-python-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Python support.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-py-1.py"
 cat <<\EOF > xg-py-1.py
 # interpret_ansic = true, interpret_unicode = false
 _("abc\
@@ -22,19 +25,17 @@
 
 # This will not be extracted.
 _(CATEGORIES["default"]["name"]);
-
-# string concatenation
-_("abc" "def" + "ghi"
-"jkl" + mno)
 EOF
 
+tmpfiles="$tmpfiles xg-py-1.err xg-py-1.tmp xg-py-1.pot"
 : ${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; rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-py-1.ok"
 cat <<\EOF > xg-py-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -63,8 +64,8 @@
 #. interpret_ansic = false, interpret_unicode = false
 msgid ""
 "abc\\\n"
-"\\\\def\\'ghi\\\"jkl\\a\\b\\f\\n\\r\\t\\v x\\040x\\x7ey"
-"\\u0142\\U00010123\\N{LATIN SMALL LETTER Z}"
+"\\\\def\\'ghi\\\"jkl\\a\\b\\f\\n\\r\\t\\v x\\040x\\x7ey\\u0142\\U00010123\\N"
+"{LATIN SMALL LETTER Z}"
 msgstr ""
 
 #. interpret_ansic = true, interpret_unicode = true
@@ -79,14 +80,12 @@
 "\\\\def\\'ghi\\\"jkl\\a\\b\\f\\n\\r\\t\\v x\\040x\\x7eył\\U00010123\\N{LATIN "
 "SMALL LETTER Z}"
 msgstr ""
-
-#. string concatenation
-msgid "abcdefghijkl"
-msgstr ""
 EOF
 
 : ${DIFF=diff}
 ${DIFF} xg-py-1.ok xg-py-1.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-python-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-python-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-python-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-python-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-py-2.py"
 cat <<EOF > xg-py-2.py
 # This comment will not be extracted.
 print gettext.gettext("help")
@@ -19,11 +22,15 @@
 "verbose string")
 EOF
 
+tmpfiles="$tmpfiles xg-py-2.tmp.po xg-py-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-py-2.ok"
 cat <<EOF > xg-py-2.ok
 msgid "help"
 msgstr ""
@@ -51,4 +58,6 @@
 ${DIFF} xg-py-2.ok xg-py-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-python-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-python-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-python-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-python-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,14 +1,18 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --from-code option and encoding recognition.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-py-3a.py"
 cat <<\EOF > xg-py-3a.py
 #!/usr/bin/env python
 # TRANSLATORS: Fran���ois Pinard is a hero.
 print gettext.gettext("���ܸ�");
 EOF
 
+tmpfiles="$tmpfiles xg-py-3b.py"
 cat <<\EOF > xg-py-3b.py
 #!/usr/bin/env python
                        # Hey Emacs! -*- coding: euc-jp -*-
@@ -16,6 +20,7 @@
 print gettext.gettext("���ܸ�");
 EOF
 
+tmpfiles="$tmpfiles xg-py-3.ok"
 cat <<\EOF > xg-py-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -42,43 +47,53 @@
 
 # Verify that if the source file has no magic coding comment, xgettext fails
 # if no --from-code option is given but succeeds if it is given.
+tmpfiles="$tmpfiles xg-py-3a.tmp xg-py-3a.pot"
 : ${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 || { rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 # Verify that if the source file has a magic coding comment, xgettext succeeds.
 
+tmpfiles="$tmpfiles xg-py-3b.tmp xg-py-3b.pot"
 ${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
+test $? = 0 || { rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; 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.
 
+tmpfiles="$tmpfiles xg-py-3c.tmp xg-py-3c.pot"
 ${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
+test $? = 0 || { rm -fr $tmpfiles; 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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 # Verify that backslashes in and second bytes with value 0x5C are correctly
 # distinguished in weird encodings like BIG5.
 
+tmpfiles="$tmpfiles xg-py-3d.py"
 cat <<\EOF > xg-py-3d.py
 #!/usr/bin/env python
                        # Hey Emacs! -*- coding: big5 -*-
@@ -86,12 +101,15 @@
 print gettext.gettext(u"�\\u0021");
 EOF
 
+tmpfiles="$tmpfiles xg-py-3d.tmp xg-py-3d.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: \
-  -o xg-py-3d.tmp xg-py-3d.py || exit 1
+  -o xg-py-3d.tmp xg-py-3d.py
+test $? = 0 || { rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-py-3d.ok"
 cat <<\EOF > xg-py-3d.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -120,6 +138,9 @@
 msgstr ""
 EOF
 
-${DIFF} xg-py-3d.ok xg-py-3d.pot || exit 1
+${DIFF} xg-py-3d.ok xg-py-3d.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+
+rm -fr $tmpfiles
 
 exit 0
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-python-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-python-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-python-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-python-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --add-comments option.
 
-cat <<\EOF > xg-py-4.py
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-py-3.py"
+cat <<\EOF > xg-py-3.py
 # a
 string = # b
 # c
@@ -12,12 +15,16 @@
 );
 EOF
 
+tmpfiles="$tmpfiles xg-py-3.tmp.po xg-py-3.po"
 : ${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-3.tmp xg-py-3.py
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-py-3.tmp.po > xg-py-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-cat <<EOF > xg-py-4.ok
+tmpfiles="$tmpfiles xg-py-3.ok"
+cat <<EOF > xg-py-3.ok
 #. a
 #. b
 #. c
@@ -27,7 +34,9 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-py-4.ok xg-py-4.po
+${DIFF} xg-py-3.ok xg-py-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-scheme-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-scheme-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sc-1.scm"
 cat <<EOF > xg-sc-1.scm
 ; This comment will not be extracted.
 (display (_ "help"))
@@ -13,11 +16,15 @@
 (display (_ "The Fabulous Four"))
 EOF
 
+tmpfiles="$tmpfiles xg-sc-1.tmp.po xg-sc-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sc-1.ok"
 cat <<EOF > xg-sc-1.ok
 msgid "help"
 msgstr ""
@@ -34,4 +41,6 @@
 ${DIFF} xg-sc-1.ok xg-sc-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-scheme-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-scheme-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,15 +1,21 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: strings outside any function call.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sc-2.scm"
 cat <<EOF > xg-sc-2.scm
 (define foo '("bar" "quux"))
 EOF
 
+tmpfiles="$tmpfiles xg-sc-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sc-2.ok"
 cat <<EOF > xg-sc-2.ok
 EOF
 
@@ -17,4 +23,6 @@
 ${DIFF} xg-sc-2.ok xg-sc-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-scheme-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-scheme-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sc-3.scm"
 cat <<\EOF > xg-sc-3.scm
 ; a
 (setq string ; b
@@ -13,11 +16,15 @@
 ))
 EOF
 
+tmpfiles="$tmpfiles xg-sc-3.tmp.po xg-sc-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sc-3.ok"
 cat <<EOF > xg-sc-3.ok
 #. a
 #. b
@@ -31,4 +38,6 @@
 ${DIFF} xg-sc-3.ok xg-sc-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-scheme-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-scheme-4	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-scheme-4	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test Scheme support: GIMP script-fu extension _"..."
-
-cat <<EOF > xg-sc-4.scm
-(script-fu-register "script-fu-paste-as-brush"
-  _"New _Brush..."
-  _"Paste the clipboard contents into a new brush"
-  "Michael Natterer <mitch@gimp.org>"
-  "Michael Natterer"
-  "2005-09-25"
-  ""
-  SF-STRING     _"Brush name" "My Brush"
-  SF-STRING     _"File name"  "mybrush"
-  SF-ADJUSTMENT _"Spacing"    '(25 0 1000 1 1 1 0)
-)
-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
-
-cat <<EOF > xg-sc-4.ok
-msgid "New _Brush..."
-msgstr ""
-
-msgid "Paste the clipboard contents into a new brush"
-msgstr ""
-
-msgid "Brush name"
-msgstr ""
-
-msgid "File name"
-msgstr ""
-
-msgid "Spacing"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-sc-4.ok xg-sc-4.po
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-sh-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-sh-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sh-1.sh"
 cat <<\EOF > xg-sh-1.sh
 # Test backslash before normal alphabetic character.
 
@@ -461,12 +464,16 @@
 echo "`echo "\`ngettext 'depth_2_11_squote_8_semi \\\\\\\\;'\`"`"
 EOF
 
+tmpfiles="$tmpfiles xg-sh-1.tmp.po xg-sh-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sh-1.ok"
 cat <<\EOF > xg-sh-1.ok
 msgid "depth_0_none_0_x"
 msgstr ""
@@ -1803,4 +1810,6 @@
 ${DIFF} xg-sh-1.ok xg-sh-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-sh-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-sh-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sh-2.sh"
 cat <<EOF > xg-sh-2.sh
 # This comment will not be extracted.
 gettext "help"
@@ -15,11 +18,15 @@
 gettext "The Fabulous Four"
 EOF
 
+tmpfiles="$tmpfiles xg-sh-2.tmp.po xg-sh-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sh-2.ok"
 cat <<EOF > xg-sh-2.ok
 msgid "help"
 msgstr ""
@@ -41,4 +48,6 @@
 ${DIFF} xg-sh-2.ok xg-sh-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-sh-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-sh-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,16 +1,23 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: backslashed double-quotes inside single-quotes.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sh-3.sh"
 cat <<\EOF > xg-sh-3.sh
 echo `gettext 'abc\"def'`
 EOF
 
+tmpfiles="$tmpfiles xg-sh-3.tmp.po xg-sh-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sh-3.ok"
 cat <<\EOF > xg-sh-3.ok
 msgid "abc\\\"def"
 msgstr ""
@@ -20,4 +27,6 @@
 ${DIFF} xg-sh-3.ok xg-sh-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-sh-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-sh-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support: obsolete bash $"..." syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sh-4.sh"
 cat <<\EOF > xg-sh-4.sh
 # Test backslash before normal alphabetic character.
 
@@ -113,11 +116,14 @@
 echo "`echo "\`echo $"depth_2_11_bashquote_8_\\\\\\\\$var"\`"`"
 EOF
 
+tmpfiles="$tmpfiles xg-sh-4.err xg-sh-4.tmp.po xg-sh-4.po"
 : ${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; rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sh-4.ok"
 cat <<\EOF > xg-sh-4.ok
 msgid "depth_0_bashquote_0_x"
 msgstr ""
@@ -467,4 +473,6 @@
 ${DIFF} xg-sh-4.ok xg-sh-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-sh-5 gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-5
--- gettext-0.19.3/gettext-tools/tests/xgettext-sh-5	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-5	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support: bash $(...) syntax.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sh-5.sh"
 cat <<\EOF > xg-sh-5.sh
 echo $(gettext 'Simple string')
 echo "$(gettext 'Simple string inside double-quotes')"
@@ -14,10 +17,14 @@
 echo "$(gettext "Simple decorated dstring: \"x\" \\\"y\\\" inside double-quotes")"
 EOF
 
+tmpfiles="$tmpfiles xg-sh-5.tmp.po xg-sh-5.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sh-5.ok"
 cat <<\EOF > xg-sh-5.ok
 msgid "Simple string"
 msgstr ""
@@ -48,4 +55,6 @@
 ${DIFF} xg-sh-5.ok xg-sh-5.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-sh-6 gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-6
--- gettext-0.19.3/gettext-tools/tests/xgettext-sh-6	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-sh-6	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,25 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-sh-6.sh"
 cat <<\EOF > xg-sh-6.sh
 # a
 _ "hello world" # b
 EOF
 
+tmpfiles="$tmpfiles xg-sh-6.tmp.po xg-sh-6.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-sh-6.ok"
 cat <<EOF > xg-sh-6.ok
 #. a
 msgid "hello world"
@@ -23,4 +30,6 @@
 ${DIFF} xg-sh-6.ok xg-sh-6.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-smalltalk-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-smalltalk-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-smalltalk-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-smalltalk-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Smalltalk support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-st-1.st"
 cat <<EOF > xg-st-1.st
 "This comment will not be extracted."
 Transcript showCr: (NLS ? 'help').
@@ -16,11 +19,15 @@
 Transcript showCr: (NLS ? 'The Fabulous Four').
 EOF
 
+tmpfiles="$tmpfiles xg-st-1.tmp.po xg-st-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-st-1.ok"
 cat <<EOF > xg-st-1.ok
 msgid "help"
 msgstr ""
@@ -43,4 +50,6 @@
 ${DIFF} xg-st-1.ok xg-st-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-smalltalk-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-smalltalk-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-smalltalk-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-smalltalk-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Smalltalk support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-st-2.st"
 cat <<\EOF > xg-st-2.st
 "a"
 "b" Transcript showCr:
@@ -12,11 +15,15 @@
 "f" 'hello world' "h" ).
 EOF
 
+tmpfiles="$tmpfiles xg-st-2.tmp.po xg-st-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-st-2.ok"
 cat <<EOF > xg-st-2.ok
 #. a
 #. b
@@ -32,4 +39,6 @@
 ${DIFF} xg-st-2.ok xg-st-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-stringtable-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-stringtable-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-stringtable-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-stringtable-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,9 +1,12 @@
 #! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test extractor of NeXTstep/GNUstep .strings files.
 
-cat <<\EOF > xg-stbl-1.strings
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-st-1.strings"
+cat <<\EOF > xg-st-1.strings
 /***
 German.lproj/Localizable.strings
 updated by make_strings 2003-10-12 15:31:50 +0200
@@ -20,13 +23,16 @@
 = "Dieses Programm l�uft mit der Prozess-Nummer %d.";
 EOF
 
+tmpfiles="$tmpfiles xg-st-1.tmp xg-st-1.po"
 : ${XGETTEXT=xgettext}
-${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
+${XGETTEXT} -o xg-st-1.tmp xg-st-1.strings
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+# Don't simplify this to "grep ... < xg-st-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
+cat xg-st-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-st-1.po
 
-cat <<\EOF > xg-stbl-1.ok
+tmpfiles="$tmpfiles xg-st-1.ok"
+cat <<\EOF > xg-st-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -61,7 +67,9 @@
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-stbl-1.ok xg-stbl-1.po
+${DIFF} xg-st-1.ok xg-st-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-tcl-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-tcl-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Tcl support.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-t-1.tcl"
 cat <<\EOF > xg-t-1.tcl
 #!/usr/bin/tclsh
 
@@ -21,13 +24,15 @@
 }
 EOF
 
+tmpfiles="$tmpfiles xg-t-1.err xg-t-1.tmp xg-t-1.pot"
 : ${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; rm -fr $tmpfiles; 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
 
+tmpfiles="$tmpfiles xg-t-1.ok"
 cat <<\EOF > xg-t-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -62,4 +67,6 @@
 ${DIFF} xg-t-1.ok xg-t-1.pot
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-tcl-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-tcl-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Tcl support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-t-2.tcl"
 cat <<EOF > xg-t-2.tcl
 # This comment will not be extracted.
 puts [_ "help"]
@@ -15,11 +18,15 @@
 puts [_ "The Fabulous Four"]
 EOF
 
+tmpfiles="$tmpfiles xg-t-2.tmp.po xg-t-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-t-2.ok"
 cat <<EOF > xg-t-2.ok
 msgid "help"
 msgstr ""
@@ -41,4 +48,6 @@
 ${DIFF} xg-t-2.ok xg-t-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-tcl-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-tcl-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,19 +1,26 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Tcl support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-t-3.tcl"
 cat <<\EOF > xg-t-3.tcl
 # a
 set string [_ "hello world" # b
 ] # c
 EOF
 
+tmpfiles="$tmpfiles xg-t-3.tmp.po xg-t-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-t-3.ok"
 cat <<EOF > xg-t-3.ok
 #. a
 msgid "hello world"
@@ -24,4 +31,6 @@
 ${DIFF} xg-t-3.ok xg-t-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-tcl-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-tcl-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-tcl-4	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of Tcl support: escape sequences.
-
-cat <<\EOF > xg-t-4.tcl
-puts [_ "Hello\u200e\u201cWorld\u201d"]
-puts [_ "x\u20y\x20z"]
-puts [_ "\xFF20"]
-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; }
-# 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
-
-cat <<\EOF > xg-t-4.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Hello‎“World”"
-msgstr ""
-
-msgid "x y z"
-msgstr ""
-
-msgid " "
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-t-4.ok xg-t-4.pot
-result=$?
-
-exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-vala-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-vala-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-vala-1	2014-10-08 03:01:35.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-vala-1	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-#!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test of Vala support.
-
-: ${XGETTEXT=xgettext}
-
-cat <<\EOF > xg-vala-1.err.vala
-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
-
-cat <<\EOF > xg-vala-1.vala
-int main (string[] args) {
-    var s1 = "Simple string, " + " no gettext needed";
-    var c1 = '\'';
-    var empty = "";
-    // This is a C++ style comment
-    var s2 = _("Extract this first string");
-    var s3 = "Prefix _(" + _("Extract this second string") + ") Postfix";
-
-    var empty_verbatim = """""";
-    if (args[0] == _("Extract this thirth string")) {
-      /* _("This is a comment and must not be extracted!") */
-    }
-
-    var s4 = _("""Extract this
-    ""\a
-    fourth string""");
-
-    var s5 = _("Extract this \u2464th string");
-
-    var s6 = /_("This is a regex literal and must not be extracted!")\|/i;
-
-    var d1 = 10e-1;
-    var d2 = 10E-1;
-
-    /* This is a
-       multiline C style comment */
-    var s7 = _("Extract this //sixth string");
-
-    var s8 = _(@"This is a template string, which cannot be extracted!");
-
-    /* /= shouldn't start a regex literal */
-    var i1 = 1000;
-    i1 /= 10;
-
-    return 0;
-}
-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; }
-# 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
-
-cat <<\EOF > xg-vala-1.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. This is a C++ style comment
-msgid "Extract this first string"
-msgstr ""
-
-msgid "Extract this second string"
-msgstr ""
-
-msgid "Extract this thirth string"
-msgstr ""
-
-msgid ""
-"Extract this\n"
-"    \"\"\\a\n"
-"    fourth string"
-msgstr ""
-
-msgid "Extract this ⑤th string"
-msgstr ""
-
-#. This is a
-#. multiline C style comment
-msgid "Extract this //sixth string"
-msgstr ""
-EOF
-
-: ${DIFF=diff}
-${DIFF} xg-vala-1.ok xg-vala-1.pot
-result=$?
-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; }
-# 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
-
-cat <<\EOF > xg-vala-1.all.ok
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Simple string,  no gettext needed"
-msgstr ""
-
-#. This is a C++ style comment
-msgid "Extract this first string"
-msgstr ""
-
-msgid "Prefix _("
-msgstr ""
-
-msgid "Extract this second string"
-msgstr ""
-
-msgid ") Postfix"
-msgstr ""
-
-msgid "Extract this thirth string"
-msgstr ""
-
-msgid ""
-"Extract this\n"
-"    \"\"\\a\n"
-"    fourth string"
-msgstr ""
-
-msgid "Extract this ⑤th string"
-msgstr ""
-
-#. This is a
-#. multiline C style comment
-msgid "Extract this //sixth string"
-msgstr ""
-EOF
-
-${DIFF} xg-vala-1.all.ok xg-vala-1.pot
-result=$?
-test $result = 0 || exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-ycp-1 gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-1
--- gettext-0.19.3/gettext-tools/tests/xgettext-ycp-1	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-1	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,24 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Plural test for YCP
 #
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-y-1.ycp"
 cat <<EOF > xg-y-1.ycp
 title = sformat (_("%1 package", "%1 packages", num), num);
 EOF
 
+tmpfiles="$tmpfiles xg-y-1.tmp.po xg-y-1.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-y-1.ok"
 cat <<EOF > xg-y-1.ok
 #, ycp-format
 msgid "%1 package"
@@ -24,4 +31,6 @@
 ${DIFF} xg-y-1.ok xg-y-1.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-ycp-2 gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-2
--- gettext-0.19.3/gettext-tools/tests/xgettext-ycp-2	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-2	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-y-2.ycp"
 cat <<EOF > xg-y-2.ycp
 // This comment will not be extracted.
 print (_("help"));
@@ -18,11 +21,15 @@
 print (_("The Fabulous Four"));
 EOF
 
+tmpfiles="$tmpfiles xg-y-2.tmp.po xg-y-2.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-y-2.ok"
 cat <<EOF > xg-y-2.ok
 msgid "help"
 msgstr ""
@@ -49,4 +56,6 @@
 ${DIFF} xg-y-2.ok xg-y-2.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-ycp-3 gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-3
--- gettext-0.19.3/gettext-tools/tests/xgettext-ycp-3	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-3	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: string literal concatenation.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-y-3.ycp"
 cat <<\EOF > xg-y-3.ycp
 print (_("John\n"
 "Paul\n"
@@ -10,10 +13,14 @@
 "Ringo"));
 EOF
 
+tmpfiles="$tmpfiles xg-y-3.tmp.po xg-y-3.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-y-3.ok"
 cat <<\EOF > xg-y-3.ok
 msgid ""
 "John\n"
@@ -26,4 +33,6 @@
 ${DIFF} xg-y-3.ok xg-y-3.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/tests/xgettext-ycp-4 gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-4
--- gettext-0.19.3/gettext-tools/tests/xgettext-ycp-4	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/tests/xgettext-ycp-4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: --add-comments option.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-y-4.ycp"
 cat <<\EOF > xg-y-4.ycp
 /* a */
 /* b */ string = /* c */
@@ -10,11 +13,15 @@
 /* e */ _( /* f */ "hello " /* g */ "world" /* h */ );
 EOF
 
+tmpfiles="$tmpfiles xg-y-4.tmp.po xg-y-4.po"
 : ${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
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
+tmpfiles="$tmpfiles xg-y-4.ok"
 cat <<EOF > xg-y-4.ok
 #. a
 #. b
@@ -30,4 +37,6 @@
 ${DIFF} xg-y-4.ok xg-y-4.po
 result=$?
 
+rm -fr $tmpfiles
+
 exit $result
diff -Nru gettext-0.19.3/gettext-tools/woe32dll/export.h gettext-0.18.1.1/gettext-tools/woe32dll/export.h
--- gettext-0.19.3/gettext-tools/woe32dll/export.h	2013-04-15 02:00:38.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/woe32dll/export.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Exporting symbols from Cygwin shared libraries.
-   Copyright (C) 2006, 2011-2012 Free Software Foundation, Inc.
+   Copyright (C) 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -87,22 +87,14 @@
    Note: --export-all-symbols is the default when no other symbol is explicitly
    exported.  This means, the use of an explicit export on the variables has
    the effect of no longer exporting the functions! - until the option
-   --export-all-symbols is used.
-
-   See <http://www.haible.de/bruno/woe32dll.html> for more details.  */
-
-#if defined __GNUC__ /* GCC compiler, GNU toolchain */
+   --export-all-symbols is used.  */
 
  /* IMP(x) is a symbol that contains the address of x.  */
-#if USER_LABEL_PREFIX_UNDERSCORE
-# define IMP(x) _imp__##x
-#else
-# define IMP(x) __imp_##x
-#endif
+#define IMP(x) _imp__##x
 
  /* Ensure that the variable x is exported from the library, and that a
     pseudo-variable IMP(x) is available.  */
-# define VARIABLE(x) \
+#define VARIABLE(x) \
  /* Export x without redefining x.  This code was found by compiling a  \
     snippet:                                                            \
       extern __declspec(dllexport) int x; int x = 42;  */               \
@@ -112,9 +104,3 @@
  /* Allocate a pseudo-variable IMP(x).  */                              \
  extern int x;                                                          \
  void * IMP(x) = &x;
-
-#else /* non-GNU compiler, non-GNU toolchain */
-
-# define VARIABLE(x) /* nothing */
-
-#endif
diff -Nru gettext-0.19.3/gettext-tools/woe32dll/gettextlib-exports.c gettext-0.18.1.1/gettext-tools/woe32dll/gettextlib-exports.c
--- gettext-0.19.3/gettext-tools/woe32dll/gettextlib-exports.c	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/woe32dll/gettextlib-exports.c	2010-06-06 12:49:58.000000000 +0000
@@ -18,11 +18,9 @@
 #include "woe32dll/export.h"
 
 VARIABLE(argmatch_die)
-#if GNULIB_DEFINED_ERROR
-VARIABLE(rpl_error_message_count)
-VARIABLE(rpl_error_one_per_line)
-VARIABLE(rpl_error_print_progname)
-#endif
+VARIABLE(error_message_count)
+VARIABLE(error_one_per_line)
+VARIABLE(error_print_progname)
 VARIABLE(error_with_progname)
 VARIABLE(exit_failure)
 VARIABLE(gl_array_list_implementation)
diff -Nru gettext-0.19.3/gettext-tools/woe32dll/gettextsrc-exports.c gettext-0.18.1.1/gettext-tools/woe32dll/gettextsrc-exports.c
--- gettext-0.19.3/gettext-tools/woe32dll/gettextsrc-exports.c	2014-05-13 06:27:26.000000000 +0000
+++ gettext-0.18.1.1/gettext-tools/woe32dll/gettextsrc-exports.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* List of exported symbols of libgettextsrc on Cygwin.
-   Copyright (C) 2006-2007, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -15,15 +15,10 @@
    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 "woe32dll/export.h"
 
 VARIABLE(allow_duplicates)
 VARIABLE(color_mode)
-VARIABLE(color_test_mode)
 VARIABLE(format_language)
 VARIABLE(format_language_pretty)
 VARIABLE(formatstring_awk)
@@ -34,11 +29,9 @@
 VARIABLE(formatstring_gcc_internal)
 VARIABLE(formatstring_gfc_internal)
 VARIABLE(formatstring_java)
-VARIABLE(formatstring_javascript)
 VARIABLE(formatstring_kde)
 VARIABLE(formatstring_librep)
 VARIABLE(formatstring_lisp)
-VARIABLE(formatstring_lua)
 VARIABLE(formatstring_objc)
 VARIABLE(formatstring_parsers)
 VARIABLE(formatstring_pascal)
@@ -46,7 +39,6 @@
 VARIABLE(formatstring_perl_brace)
 VARIABLE(formatstring_php)
 VARIABLE(formatstring_python)
-VARIABLE(formatstring_python_brace)
 VARIABLE(formatstring_qt)
 VARIABLE(formatstring_qt_plural)
 VARIABLE(formatstring_scheme)
@@ -60,6 +52,7 @@
 VARIABLE(input_format_properties)
 VARIABLE(input_format_stringtable)
 VARIABLE(less_than)
+VARIABLE(line_comment)
 VARIABLE(more_than)
 VARIABLE(msgcomm_mode)
 VARIABLE(omit_header)
@@ -75,9 +68,7 @@
 VARIABLE(po_error_at_line)
 VARIABLE(po_gram_lval)
 VARIABLE(po_lex_charset)
-#if HAVE_ICONV
 VARIABLE(po_lex_iconv)
-#endif
 VARIABLE(po_lex_weird_cjk)
 VARIABLE(po_multiline_error)
 VARIABLE(po_multiline_warning)
diff -Nru gettext-0.19.3/gnulib-local/ChangeLog gettext-0.18.1.1/gnulib-local/ChangeLog
--- gettext-0.19.3/gnulib-local/ChangeLog	2014-10-16 01:37:36.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/ChangeLog	2010-06-06 12:49:58.000000000 +0000
@@ -1,261 +1,3 @@
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.3 released.
-
-2014-10-15  Daiki Ueno  <ueno@gnu.org>
-
-	* tests/test-term-ostream-xterm-basic-italic.out: New file.
-	* tests/test-term-ostream-xterm: Use it as possible test result.
-	* modules/term-ostream-tests (Files): Add new file.
-	* Makefile.am (EXTRA_DIST): Add new file.
-	Needed for ncurses >= 5.9-20140906 that defines sitm/ritm in the
-	xterm-basic terminfo definition.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.2 released.
-
-2014-07-14  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* lib/execute.c.diff: Update.
-	* lib/spawn-pipe.c.diff: Update.
-
-2014-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19.1 released.
-
-2014-06-03  Daiki Ueno  <ueno@gnu.org>
-
-	build: Handle 'environ' global variable differently on cygwin x86_64
-	Amendment to commit c97dafde.
-	* tests/test-environ.c.diff: New file.
-	* Makefile.am (EXTRA_DIST): Add new patch.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext 0.19 released.
-
-2014-06-02  Daiki Ueno  <ueno@gnu.org>
-
-	build: Handle 'environ' global variable differently on cygwin x86_64
-	Problem reported by Vasyl Khalak in:
-	<https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.
-	* lib/execute.c.diff: New file.
-	* lib/spawn-pipe.c.diff: Likewise.
-	* Makefile.am (EXTRA_DIST): Add new patches.
-
-2014-05-14  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* modules/regex.diff: Remove.  modules/regex no longer depends on
-	malloc-gnu thus this patch is not needed anymore.
-
-2014-04-07  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* lib/obstack.h.diff: Update.
-
-2013-08-07  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* modules/regex.diff: Update.
-
-2013-07-21  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* lib/localcharset.c.diff: Remove file.
-
-2013-06-25  Daiki Ueno  <ueno@gnu.org>
-
-	Work around localcharset issue under OS X multi-threaded scenario.
-	* lib/localcharset.c.diff: New patch originally posted to Gnulib
-	<https://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00091.html>.
-
-2013-06-16  Andreas Schwab  <schwab@linux-m68k.org>  (tiny change)
-
-	* m4/libxml.m4 (gl_LIBXML): Remove extra quotes.
-
-2013-06-10  Daiki Ueno  <ueno@gnu.org>
-
-	* modules/libxml: Use $(MKDIR_P) instead of $(mkdir_p).
-	* modules/libglib: Likewise.
-	Suggested by Stefano Lattarini in
-	<https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00044.html>.
-
-2013-02-25  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* lib/unistd.in.h.diff: Update.
-
-2013-02-25  Daiki Ueno  <ueno@gnu.org>
-
-	* modules/gettext-runtime-misc (AM_CPPFLAGS): Augment by
-	INTL_EXPORTS_FLAGS.
-
-2013-01-03  Daiki Ueno  <ueno@gnu.org>
-
-	Update after gnulib changed.
-	* modules/regex.diff: Update.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	* gettext-0.18.2 released.
-
-2012-12-25  Daiki Ueno  <ueno@gnu.org>
-
-	Work around error_* symbol conflict with Cygwin 1.7 DLL.
-	* lib/error.h.diff: Rename the error_* symbol if
-	GNULIB_REPLACE_ERROR is defined.
-
-2012-12-12  Daiki Ueno  <ueno@unixuser.org>
-
-	Add notice about included external libraries.
-	As per "External Libraries" in the (maintain) manual.
-	* lib/glib/README: New file.
-	* lib/libcroco/README: New file.
-	* lib/libxml/README: New file.
-	* Makefile.am (EXTRA_DIST): Add them.
-
-2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Do not assume '#define ... defined ...' behavior.
-	* lib/gettext.h (_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS):
-	Do not use '#define FOO ... defined BAR ...', as the C standard says
-	it's not portable to expect that this works after macro expansion.
-	Problem reported for gzip by Steven M. Schweda in
-	<http://lists.gnu.org/archive/html/bug-gzip/2012-07/msg00000.html>.
-
-2012-06-03  Jim Meyering  <jim@meyering.net>
-
-	* lib/tparm.c: Spelling fixes.
-
-2012-02-17  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* lib/exitfail.h.diff: Update.
-
-2012-01-26  Bruno Haible  <bruno@clisp.org>
-
-	Modernize quoting.
-	* lib/backupfile.c: Quote 'like this', not `like this', as per the
-	recent change to the GNU coding standards.
-	* lib/basename.c: Likewise.
-	* lib/closeout.c: Likewise.
-	* lib/xmalloc.c: Likewise.
-
-2012-01-06  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* lib/argmatch.h.diff: Update.
-	* lib/error.h.diff: Update.
-	* lib/fnmatch_loop.c.diff: Update.
-	* lib/getopt.in.h.diff: Update.
-	* lib/obstack.h.diff: Update.
-
-2011-10-18  Daniel Richard G.  <skunk@iskunk.org>  (tiny change)
-
-	Support for old NeXTstep 3.3 gcc.
-	* lib/gettext.h (_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS): Write
-	'defined __STRICT_ANSI__', not '__STRICT_ANSI__'.
-
-2011-09-12  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* modules/backupfile (Depends-on): Add opendir, readdir,
-	closedir.
-
-2011-08-12  Bruno Haible  <bruno@clisp.org>
-
-	Comment.
-	* m4/libxml.m4 (gl_LIBXML): Add comment about Cygwin 1.7.
-
-2011-08-04  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* lib/xgetcwd.c (PATH_MAX): Provide a fallback value.
-
-2011-07-12  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* modules/fnmatch.diff: Update.
-
-2011-06-16  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* m4/quote.m4.diff: Remove file.
-	* m4/quotearg.m4.diff: Remove file.
-	* modules/quote.diff: Remove file.
-	* modules/quotearg.diff: Remove file.
-	* Makefile.am (EXTRA_DIST): Remove them.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	libxml: Detect installed libxml2 versions which don't define xmlFree().
-	* m4/libxml.m4 (gl_LIBXML): Also try linking an xmlFree() invocation.
-
-2011-06-03  Bruno Haible  <bruno@clisp.org>
-
-	Copyright: Use LGPL 2.1 instead of LGPL 2.0.
-	* lib/gettext.h: Update copyright header.
-	* lib/hash.h: Likewise.
-	* lib/moo.h: Likewise.
-	* lib/tparm.c: Likewise.
-	* lib/tputs.c: Likewise.
-
-2011-06-02  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* modules/fnmatch.diff: Update.
-	* modules/regex.diff: Likewise.
-	* m4/alloca.m4 (gl_FUNC_ALLOCA): Likewise.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Prefer gnulib's setlocale override over libintl's override.
-	* lib/gettext.h (setlocale): Redefine to rpl_setlocale if
-	GNULIB_defined_setlocale is set.
-
-2011-02-12  Bruno Haible  <bruno@clisp.org>
-
-	Update after gnulib changed.
-	* modules/fnmatch.diff: Update.
-
-2010-03-25  Bruno Haible  <bruno@clisp.org>
-
-	Minor formatting changes.
-	* lib/gettext.h: Insert space before function argument list.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* lib/basename.h: Treat uClibc like glibc.
-	* lib/basename.c: Likewise.
-	* lib/iconv-ostream.oo.c (iconv_ostream::write_mem,
-	iconv_ostream::free, iconv_ostream_create): Likewise.
-
-2010-11-20  Bruno Haible  <bruno@clisp.org>
-
-	Port to uClibc.
-	* lib/gettext.h: Treat uClibc like a non-glibc platform.
-	Reported by Mike Frysinger <vapier@gentoo.org>.
-
-2010-10-10  Bruno Haible  <bruno@clisp.org>
-
-	Rely more on libtool.
-	* modules/gettext-tools-misc (Makefile.am): Remove @LTLIBC@ flag from
-	libgettextlib_la_LDFLAGS, relying more on libtool. Remove @LTNOUNDEF@
-	flag from libgettextlib_la_LDFLAGS, now generated by gnulib-tool.
-
-2010-10-10  Bruno Haible  <bruno@clisp.org>
-
-	* modules/gettext-tools-misc (Makefile.am): Remove flags from
-	libgettextlib_la_LDFLAGS that are now generated by gnulib-tool.
-
-2010-08-29  Bruno Haible  <bruno@clisp.org>
-
-	* modules/regex.diff: Update after gnulib changed.
-
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff -Nru gettext-0.19.3/gnulib-local/lib/argmatch.h.diff gettext-0.18.1.1/gnulib-local/lib/argmatch.h.diff
--- gettext-0.19.3/gnulib-local/lib/argmatch.h.diff	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/argmatch.h.diff	2010-06-06 12:49:58.000000000 +0000
@@ -3,7 +3,7 @@
 ***************
 *** 50,56 ****
      return.  By default, this is a function that calls ARGMATCH_DIE which
-     in turn defaults to 'exit (exit_failure)'.  */
+     in turn defaults to `exit (exit_failure)'.  */
   typedef void (*argmatch_exit_fn) (void);
 ! extern argmatch_exit_fn argmatch_die;
   
@@ -11,7 +11,7 @@
   
 --- 50,56 ----
      return.  By default, this is a function that calls ARGMATCH_DIE which
-     in turn defaults to 'exit (exit_failure)'.  */
+     in turn defaults to `exit (exit_failure)'.  */
   typedef void (*argmatch_exit_fn) (void);
 ! extern DLL_VARIABLE argmatch_exit_fn argmatch_die;
   
diff -Nru gettext-0.19.3/gnulib-local/lib/backupfile.c gettext-0.18.1.1/gnulib-local/lib/backupfile.c
--- gettext-0.19.3/gnulib-local/lib/backupfile.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/backupfile.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-1999, 2000-2003, 2005-2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
    - It's typically faster.
    Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
    only '0' through '9' are digits.  Prefer ISDIGIT to isdigit unless
-   it's important to use the locale's definition of 'digit' even when the
+   it's important to use the locale's definition of `digit' even when the
    host does not conform to Posix.  */
 #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
 
@@ -90,7 +90,7 @@
   char *s;
   const char *suffix = simple_backup_suffix;
 
-  /* Allow room for simple or '.~N~' backups.  */
+  /* Allow room for simple or `.~N~' backups.  */
   backup_suffix_size_max = strlen (simple_backup_suffix) + 1;
   if (HAVE_DIR && backup_suffix_size_max < numbered_suffix_size_max)
     backup_suffix_size_max = numbered_suffix_size_max;
diff -Nru gettext-0.19.3/gnulib-local/lib/basename.c gettext-0.18.1.1/gnulib-local/lib/basename.c
--- gettext-0.19.3/gnulib-local/lib/basename.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/basename.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000-2002, 2004, 2006, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002, 2004, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -22,7 +22,7 @@
 /* Specification.  */
 #include "basename.h"
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 
 #include <stdio.h>
 #include <assert.h>
@@ -45,16 +45,16 @@
 #endif
 
 #ifndef _LIBC
-/* We cannot generally use the name 'basename' since XPG defines an unusable
+/* We cannot generally use the name `basename' since XPG defines an unusable
    variant of the function but we cannot use it.  */
 # undef basename
 # define basename gnu_basename
 #endif
 
-/* In general, we can't use the builtin 'basename' function if available,
+/* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
-   In some environments the builtin 'basename' modifies its argument.
-   If NAME is all slashes, be sure to return '/'.  */
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
 basename (char const *name)
@@ -71,7 +71,7 @@
         all_slashes = 0;
     }
 
-  /* If NAME is all slashes, arrange to return '/'.  */
+  /* If NAME is all slashes, arrange to return `/'.  */
   if (*base == '\0' && ISSLASH (*name) && all_slashes)
     --base;
 
diff -Nru gettext-0.19.3/gnulib-local/lib/basename.h gettext-0.18.1.1/gnulib-local/lib/basename.h
--- gettext-0.19.3/gnulib-local/lib/basename.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/basename.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -27,7 +27,7 @@
 #endif
 
 
-#if !(__GLIBC__ >= 2 || defined __UCLIBC__)
+#if !(__GLIBC__ >= 2)
 /* When not using the GNU libc we use the basename implementation we
    provide here.  */
 extern char *gnu_basename (const char *);
diff -Nru gettext-0.19.3/gnulib-local/lib/ChangeLog.0 gettext-0.18.1.1/gnulib-local/lib/ChangeLog.0
--- gettext-0.19.3/gnulib-local/lib/ChangeLog.0	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/ChangeLog.0	2010-06-06 12:49:58.000000000 +0000
@@ -1328,7 +1328,7 @@
 1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
 
 	* printf-parse.h: Use unsigned char for parameters to read_int and
-	parse_one_spec (for losing Solaris systems).
+	parse_one_spec (for loosing Solaris systems).
 	Patch by Jim Meyering.
 
 1998-04-28 11:42  Ulrich Drepper  <drepper@cygnus.com>
@@ -1703,7 +1703,7 @@
 
 Sat Jul 15 23:59:26 1995  Ulrich Drepper  <drepper@myware>
 
-	* obstack.h: Add accidentally removed #endif.
+	* obstack.h: Add accidently removed #endif.
 
 Sat Jul 15 23:31:45 1995  Ulrich Drepper  <drepper@myware>
 
diff -Nru gettext-0.19.3/gnulib-local/lib/closeout.c gettext-0.18.1.1/gnulib-local/lib/closeout.c
--- gettext-0.19.3/gnulib-local/lib/closeout.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/closeout.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
    Likewise for standard error.
 
    It's important to detect such failures and exit nonzero because many
-   tools (most notably 'make' and other build-management systems) depend
+   tools (most notably `make' and other build-management systems) depend
    on being able to detect failure in other tools via their exit status.  */
 
 /* Close standard output and standard error, exiting with status EXIT_FAILURE
diff -Nru gettext-0.19.3/gnulib-local/lib/error.h.diff gettext-0.18.1.1/gnulib-local/lib/error.h.diff
--- gettext-0.19.3/gnulib-local/lib/error.h.diff	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/error.h.diff	2010-06-06 12:49:58.000000000 +0000
@@ -1,31 +1,13 @@
-*** gnulib/lib/error.h	2012-12-24 20:10:43.000000000 +0900
---- srclib/error.h	2012-12-24 20:08:16.000000000 +0900
+*** gnulib/lib/error.h	2005-05-14 08:03:58.000000000 +0200
+--- srclib/error.h	2005-05-20 23:06:02.000000000 +0200
 ***************
-*** 31,36 ****
---- 31,45 ----
-  # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
-  #endif
-  
-+ #if GNULIB_REPLACE_ERROR
-+ # undef error_print_progname
-+ # undef error_message_count
-+ # undef error_one_per_line
-+ # define error_print_progname rpl_error_print_progname
-+ # define error_message_count rpl_error_message_count
-+ # define error_one_per_line rpl_error_one_per_line
-+ #endif
-+ 
-  #ifdef __cplusplus
-  extern "C" {
-  #endif
-***************
-*** 49,62 ****
+*** 50,63 ****
   /* If NULL, error will flush stdout, then print on stderr the program
      name, a colon and a space.  Otherwise, error will call this
      function without parameters instead.  */
 ! extern void (*error_print_progname) (void);
   
-  /* This variable is incremented each time 'error' is called.  */
+  /* This variable is incremented each time `error' is called.  */
 ! extern unsigned int error_message_count;
   
   /* Sometimes we want to have at most one error per line.  This
@@ -34,13 +16,13 @@
   
   #ifdef	__cplusplus
   }
---- 58,71 ----
+--- 50,63 ----
   /* If NULL, error will flush stdout, then print on stderr the program
      name, a colon and a space.  Otherwise, error will call this
      function without parameters instead.  */
 ! extern DLL_VARIABLE void (*error_print_progname) (void);
   
-  /* This variable is incremented each time 'error' is called.  */
+  /* This variable is incremented each time `error' is called.  */
 ! extern DLL_VARIABLE unsigned int error_message_count;
   
   /* Sometimes we want to have at most one error per line.  This
diff -Nru gettext-0.19.3/gnulib-local/lib/execute.c.diff gettext-0.18.1.1/gnulib-local/lib/execute.c.diff
--- gettext-0.19.3/gnulib-local/lib/execute.c.diff	2014-07-14 09:30:03.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/execute.c.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-diff --git a/execute.c b/execute.c
-index 15a487b..489abf5 100644
---- a/execute.c
-+++ b/execute.c
-@@ -48,6 +48,13 @@
- 
- #endif
- 
-+/* environ is the exported symbol referencing the internal
-+   __cygwin_environ variable on cygwin64:
-+   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-+#if defined __CYGWIN__ && defined __x86_64__
-+extern DLL_VARIABLE char **environ;
-+#endif
-+
- 
- #if defined EINTR && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
- 
diff -Nru gettext-0.19.3/gnulib-local/lib/exitfail.h.diff gettext-0.18.1.1/gnulib-local/lib/exitfail.h.diff
--- gettext-0.19.3/gnulib-local/lib/exitfail.h.diff	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/exitfail.h.diff	2010-06-06 12:49:58.000000000 +0000
@@ -1,13 +1,13 @@
 *** gnulib/lib/exitfail.h	2005-05-14 08:03:58.000000000 +0200
 --- gettext-tools/lib/exitfail.h	2006-07-22 16:35:58.000000000 +0200
 ***************
-*** 15,18 ****
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+*** 17,20 ****
+     If not, write to the Free Software Foundation,
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
   
 ! extern int volatile exit_failure;
---- 15,18 ----
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+--- 17,20 ----
+     If not, write to the Free Software Foundation,
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
   
 ! extern DLL_VARIABLE int volatile exit_failure;
diff -Nru gettext-0.19.3/gnulib-local/lib/fnmatch_loop.c.diff gettext-0.18.1.1/gnulib-local/lib/fnmatch_loop.c.diff
--- gettext-0.19.3/gnulib-local/lib/fnmatch_loop.c.diff	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/fnmatch_loop.c.diff	2010-06-06 12:49:58.000000000 +0000
@@ -153,7 +153,7 @@
   
       case L_('@'):
         do
-!         /* I cannot believe it but 'strcat' is actually acceptable
+!         /* I cannot believe it but `strcat' is actually acceptable
 !            here.  Match the entire string with the prefix from the
 !            pattern list and the rest of the pattern following the
 !            pattern list.  */
@@ -199,7 +199,7 @@
 !         {
 !           struct patternlist *next;
 ! 
-!           /* I cannot believe it but 'strcat' is actually acceptable
+!           /* I cannot believe it but `strcat' is actually acceptable
 !              here.  Match the entire string with the prefix from the
 !              pattern list and the rest of the pattern following the
 !              pattern list.  */
diff -Nru gettext-0.19.3/gnulib-local/lib/getopt.in.h.diff gettext-0.18.1.1/gnulib-local/lib/getopt.in.h.diff
--- gettext-0.19.3/gnulib-local/lib/getopt.in.h.diff	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/getopt.in.h.diff	2010-06-06 12:49:58.000000000 +0000
@@ -19,7 +19,7 @@
      defined in this header.  When this happens, include the
 ***************
 *** 111,117 ****
-     Also, when 'ordering' is RETURN_IN_ORDER,
+     Also, when `ordering' is RETURN_IN_ORDER,
      each non-option ARGV-element is returned here.  */
   
 ! extern char *optarg;
@@ -27,7 +27,7 @@
   /* Index in ARGV of the next element to be scanned.
      This is used for communication to and from the caller
 --- 119,125 ----
-     Also, when 'ordering' is RETURN_IN_ORDER,
+     Also, when `ordering' is RETURN_IN_ORDER,
      each non-option ARGV-element is returned here.  */
   
 ! extern DLL_VARIABLE char *optarg;
@@ -36,12 +36,12 @@
      This is used for communication to and from the caller
 ***************
 *** 125,140 ****
-     Otherwise, 'optind' communicates from one call to the next
+     Otherwise, `optind' communicates from one call to the next
      how much of ARGV has been scanned so far.  */
   
 ! extern int optind;
   
-  /* Callers store zero here to inhibit the error message 'getopt' prints
+  /* Callers store zero here to inhibit the error message `getopt' prints
      for unrecognized options.  */
   
 ! extern int opterr;
@@ -53,12 +53,12 @@
   #ifndef __need_getopt
   /* Describe the long-named options requested by the application.
 --- 133,148 ----
-     Otherwise, 'optind' communicates from one call to the next
+     Otherwise, `optind' communicates from one call to the next
      how much of ARGV has been scanned so far.  */
   
 ! extern DLL_VARIABLE int optind;
   
-  /* Callers store zero here to inhibit the error message 'getopt' prints
+  /* Callers store zero here to inhibit the error message `getopt' prints
      for unrecognized options.  */
   
 ! extern DLL_VARIABLE int opterr;
diff -Nru gettext-0.19.3/gnulib-local/lib/gettext.h gettext-0.18.1.1/gnulib-local/lib/gettext.h
--- gettext-0.19.3/gnulib-local/lib/gettext.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/gettext.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -52,7 +54,7 @@
    it now, to make later inclusions of <libintl.h> a NOP.  */
 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
 # include <cstdlib>
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
 #  include <libintl.h>
 # endif
 #endif
@@ -79,7 +81,7 @@
     ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
 # undef dcngettext
 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N))
+    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
 # undef textdomain
 # define textdomain(Domainname) ((const char *) (Domainname))
 # undef bindtextdomain
@@ -91,12 +93,6 @@
 
 #endif
 
-/* Prefer gnulib's setlocale override over libintl's setlocale override.  */
-#ifdef GNULIB_defined_setlocale
-# undef setlocale
-# define setlocale rpl_setlocale
-#endif
-
 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
    translation is done at a different place in the code.
@@ -182,12 +178,9 @@
 
 #include <string.h>
 
-#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
-     /* || __STDC_VERSION__ >= 199901L */ )
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
-#else
-# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
-#endif
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+  (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
+   /* || __STDC_VERSION__ >= 199901L */ )
 
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
 #include <stdlib.h>
diff -Nru gettext-0.19.3/gnulib-local/lib/glib/README gettext-0.18.1.1/gnulib-local/lib/glib/README
--- gettext-0.19.3/gnulib-local/lib/glib/README	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/glib/README	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-This is not part of the GNU gettext program, but is used with GNU gettext.
diff -Nru gettext-0.19.3/gnulib-local/lib/hash.h gettext-0.18.1.1/gnulib-local/lib/hash.h
--- gettext-0.19.3/gnulib-local/lib/hash.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/hash.h	2010-06-06 12:49:58.000000000 +0000
@@ -1,17 +1,19 @@
 /* Copyright (C) 1995, 2000-2003, 2005-2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+   Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _HASH_H
 #define _HASH_H
diff -Nru gettext-0.19.3/gnulib-local/lib/iconv-ostream.oo.c gettext-0.18.1.1/gnulib-local/lib/iconv-ostream.oo.c
--- gettext-0.19.3/gnulib-local/lib/iconv-ostream.oo.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/iconv-ostream.oo.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* Output stream that converts the output to another encoding.
-   Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -98,8 +98,7 @@
             size_t res = iconv (stream->cd,
                                 (ICONV_CONST char **) &inptr, &insize,
                                 &outptr, &outsize);
-            #if !defined _LIBICONV_VERSION \
-                && !(defined __GLIBC__ && !defined __UCLIBC__)
+            #if !defined _LIBICONV_VERSION && !defined __GLIBC__
             /* Irix iconv() inserts a NUL byte if it cannot convert.
                NetBSD iconv() inserts a question mark if it cannot convert.
                Only GNU libiconv and GNU libc are known to prefer to fail rather
@@ -153,9 +152,7 @@
 
   /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
   #if defined _LIBICONV_VERSION \
-      || !(((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) \
-            && !defined __UCLIBC__) \
-           || defined __sun)
+      || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   {
     char outbuffer[2048];
     char *outptr = outbuffer;
@@ -191,9 +188,7 @@
   stream->to_encoding = xstrdup (to_encoding);
 
   /* Avoid glibc-2.1 bug with EUC-KR.  */
-  #if ((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) \
-       && !defined __UCLIBC__) \
-      && !defined _LIBICONV_VERSION
+  #if  (__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) && !defined _LIBICONV_VERSION
   if (c_strcasecmp (from_encoding, "EUC-KR") == 0
       || c_strcasecmp (to_encoding, "EUC-KR") == 0)
     stream->cd = (iconv_t)(-1):
diff -Nru gettext-0.19.3/gnulib-local/lib/libcroco/README gettext-0.18.1.1/gnulib-local/lib/libcroco/README
--- gettext-0.19.3/gnulib-local/lib/libcroco/README	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/libcroco/README	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-This is not part of the GNU gettext program, but is used with GNU gettext.
diff -Nru gettext-0.19.3/gnulib-local/lib/libxml/README gettext-0.18.1.1/gnulib-local/lib/libxml/README
--- gettext-0.19.3/gnulib-local/lib/libxml/README	2013-02-25 09:14:23.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/libxml/README	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-This is not part of the GNU gettext program, but is used with GNU gettext.
diff -Nru gettext-0.19.3/gnulib-local/lib/moo.h gettext-0.18.1.1/gnulib-local/lib/moo.h
--- gettext-0.19.3/gnulib-local/lib/moo.h	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/moo.h	2010-06-06 12:49:58.000000000 +0000
@@ -2,18 +2,20 @@
    Copyright (C) 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* This file defines minimal facilities for object-oriented programming
    style in ANSI C.
diff -Nru gettext-0.19.3/gnulib-local/lib/obstack.h.diff gettext-0.18.1.1/gnulib-local/lib/obstack.h.diff
--- gettext-0.19.3/gnulib-local/lib/obstack.h.diff	2014-04-15 01:52:11.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/obstack.h.diff	2010-06-06 12:49:58.000000000 +0000
@@ -1,25 +1,25 @@
-*** obstack.h.orig	2014-04-07 15:57:16.908837962 +0900
---- obstack.h	2014-04-07 15:58:22.208411479 +0900
+*** obstack.h	2005-10-15 01:23:50.000000000 +0200
+--- obstack.h	2006-07-22 17:48:51.000000000 +0200
 ***************
-*** 201,210 ****
+*** 193,202 ****
      more memory.  This can be set to a user defined function which
      should either abort gracefully or use longjump - but shouldn't
      return.  The default action is to print a message and abort.  */
 ! extern void (*obstack_alloc_failed_handler) (void);
   
-  /* Exit value used when 'print_and_abort' is used.  */
+  /* Exit value used when `print_and_abort' is used.  */
 ! extern int obstack_exit_failure;
-  
+  
   /* Pointer to beginning of object being allocated or to be allocated next.
      Note that this might not be the final address of the object
---- 201,210 ----
+--- 192,201 ----
      more memory.  This can be set to a user defined function which
      should either abort gracefully or use longjump - but shouldn't
      return.  The default action is to print a message and abort.  */
 ! extern DLL_VARIABLE void (*obstack_alloc_failed_handler) (void);
   
-  /* Exit value used when 'print_and_abort' is used.  */
+  /* Exit value used when `print_and_abort' is used.  */
 ! extern DLL_VARIABLE int obstack_exit_failure;
-  
+  
   /* Pointer to beginning of object being allocated or to be allocated next.
      Note that this might not be the final address of the object
diff -Nru gettext-0.19.3/gnulib-local/lib/spawn-pipe.c.diff gettext-0.18.1.1/gnulib-local/lib/spawn-pipe.c.diff
--- gettext-0.19.3/gnulib-local/lib/spawn-pipe.c.diff	2014-07-14 09:30:03.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/spawn-pipe.c.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-diff --git a/spawn-pipe.c b/spawn-pipe.c
-index 656980d..b7fa95b 100644
---- a/spawn-pipe.c
-+++ b/spawn-pipe.c
-@@ -48,6 +48,13 @@
- 
- #endif
- 
-+/* environ is the exported symbol referencing the internal
-+   __cygwin_environ variable on cygwin64:
-+   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-+#if defined __CYGWIN__ && defined __x86_64__
-+extern DLL_VARIABLE char **environ;
-+#endif
-+
- 
- #ifdef EINTR
- 
diff -Nru gettext-0.19.3/gnulib-local/lib/tparm.c gettext-0.18.1.1/gnulib-local/lib/tparm.c
--- gettext-0.19.3/gnulib-local/lib/tparm.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/tparm.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,20 @@
 /* Substitution of parameters in strings from terminal descriptions.
-   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 /* Originally by Ross Ridge, Public Domain, 92/02/01 07:30:36 */
 
@@ -243,7 +245,7 @@
 (GNU)   %b      backup to previous parameter
 (GNU)   %f      skip this parameter
 
-  Note the two definitions of %a, the GNU definition is used if the characters
+  Note the two definitions of %a, the GNU defintion is used if the characters
   after the 'a' are valid, otherwise the UW definition is used.
 
   (GNU) used by GNU Emacs termcap libraries
diff -Nru gettext-0.19.3/gnulib-local/lib/tputs.c gettext-0.18.1.1/gnulib-local/lib/tputs.c
--- gettext-0.19.3/gnulib-local/lib/tputs.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/tputs.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,18 +1,20 @@
 /* Output of string from terminal descriptions.
    Copyright (C) 2006 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
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
 #include <config.h>
 
diff -Nru gettext-0.19.3/gnulib-local/lib/unistd.in.h.diff gettext-0.18.1.1/gnulib-local/lib/unistd.in.h.diff
--- gettext-0.19.3/gnulib-local/lib/unistd.in.h.diff	2013-04-15 02:00:38.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/unistd.in.h.diff	2010-06-06 12:49:58.000000000 +0000
@@ -1,6 +1,6 @@
---- unistd.in.h.orig	2013-02-25 18:40:16.000000000 +0900
-+++ unistd.in.h	2013-02-25 18:49:26.754601400 +0900
-@@ -109,7 +109,11 @@
+--- unistd.in.h.orig	2010-05-09 02:37:27.000000000 +0200
++++ unistd.in.h	2010-05-09 10:51:25.000000000 +0200
+@@ -93,7 +93,11 @@
  
  /* Get getopt(), optarg, optind, opterr, optopt.
     But avoid namespace pollution on glibc systems.  */
@@ -10,6 +10,6 @@
 +   gettext-tools/libgettextpo/, but there is only a single
 +   GNULIB_UNISTD_H_GETOPT variable for both.  */
 +#if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
- # define __need_getopt
  # include <getopt.h>
  #endif
+ 
diff -Nru gettext-0.19.3/gnulib-local/lib/xgetcwd.c gettext-0.18.1.1/gnulib-local/lib/xgetcwd.c
--- gettext-0.19.3/gnulib-local/lib/xgetcwd.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/xgetcwd.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996, 2000, 2003, 2005-2006, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,11 +26,6 @@
 
 #include "pathmax.h"
 
-/* In this file, PATH_MAX is the size of an initial memory allocation.  */
-#ifndef PATH_MAX
-# define PATH_MAX 8192
-#endif
-
 #if HAVE_GETCWD
 # ifdef VMS
    /* We want the directory in Unix syntax, not in VMS syntax.  */
diff -Nru gettext-0.19.3/gnulib-local/lib/xmalloc.c gettext-0.18.1.1/gnulib-local/lib/xmalloc.c
--- gettext-0.19.3/gnulib-local/lib/xmalloc.c	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/lib/xmalloc.c	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007 Free Software Foundation, Inc.
 
    This program 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 @@
 xalloc_die ()
 {
   error (xmalloc_exit_failure, 0, _("memory exhausted"));
-  /* _Noreturn cannot be given to error, since it may return if
+  /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the
      xalloc_die does terminate, call exit. */
   exit (EXIT_FAILURE);
diff -Nru gettext-0.19.3/gnulib-local/m4/alloca.m4 gettext-0.18.1.1/gnulib-local/m4/alloca.m4
--- gettext-0.19.3/gnulib-local/m4/alloca.m4	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/m4/alloca.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
-# alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011 Free Software Foundation, Inc.
+# alloca.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,7 +25,6 @@
     ALLOCA_H=alloca.h,
     ALLOCA_H=)
   AC_SUBST([ALLOCA_H])
-  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
 ])
 
 # Prerequisites of lib/alloca.c.
diff -Nru gettext-0.19.3/gnulib-local/m4/libxml.m4 gettext-0.18.1.1/gnulib-local/m4/libxml.m4
--- gettext-0.19.3/gnulib-local/m4/libxml.m4	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/m4/libxml.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,4 +1,4 @@
-# libxml.m4 serial 6 (gettext-0.18.2)
+# libxml.m4 serial 5 (gettext-0.18)
 dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,16 +36,10 @@
       dnl Don't use xml2-config nor pkg-config, since it doesn't work when
       dnl cross-compiling or when the C compiler in use is different from the
       dnl one that built the library.
-      dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x,
-      dnl libxml2 is built in such a way that uses of xmlFree work fine with
-      dnl -Wl,--enable-auto-import but lead to a link error with
-      dnl -Wl,--disable-auto-import.
       AC_LIB_LINKFLAGS_BODY([xml2])
       LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
-      AC_TRY_LINK([#include <libxml/xmlversion.h>
-                   #include <libxml/xmlmemory.h>
-                  ],
-        [xmlCheckVersion (0); xmlFree ((void *) 0);],
+      AC_TRY_LINK([#include <libxml/xmlversion.h>],
+        [xmlCheckVersion (0);],
         [gl_cv_libxml=yes
          gl_cv_LIBXML="$LIBXML2 $LIBICONV"
          gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -53,10 +47,8 @@
       if test "$gl_cv_libxml" != yes; then
         gl_save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $INCXML2"
-        AC_TRY_LINK([#include <libxml/xmlversion.h>
-                     #include <libxml/xmlmemory.h>
-                    ],
-          [xmlCheckVersion (0); xmlFree ((void *) 0);],
+        AC_TRY_LINK([#include <libxml/xmlversion.h>],
+          [xmlCheckVersion (0);],
           [gl_cv_libxml=yes
            gl_cv_LIBXML="$LIBXML2 $LIBICONV"
            gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -80,10 +72,8 @@
           fi
           if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
-            AC_TRY_LINK([#include <libxml/xmlversion.h>
-                         #include <libxml/xmlmemory.h>
-                        ],
-              [xmlCheckVersion (0); xmlFree ((void *) 0);],
+            AC_TRY_LINK([#include <libxml/xmlversion.h>],
+              [xmlCheckVersion (0);],
               [gl_cv_libxml=yes
                gl_cv_LIBXML="$LIBXML2 $LIBICONV"
                gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
diff -Nru gettext-0.19.3/gnulib-local/m4/quotearg.m4.diff gettext-0.18.1.1/gnulib-local/m4/quotearg.m4.diff
--- gettext-0.19.3/gnulib-local/m4/quotearg.m4.diff	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/m4/quotearg.m4.diff	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,10 @@
+*** gnulib/m4/quotearg.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/quotearg.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 6,10 ****
+  
+  AC_DEFUN([gl_QUOTEARG],
+  [
+-   AC_LIBOBJ([quotearg])
+  ])
+--- 6,9 ----
diff -Nru gettext-0.19.3/gnulib-local/m4/quote.m4.diff gettext-0.18.1.1/gnulib-local/m4/quote.m4.diff
--- gettext-0.19.3/gnulib-local/m4/quote.m4.diff	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/m4/quote.m4.diff	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,13 @@
+*** gnulib/m4/quote.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/quote.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 6,13 ****
+  
+  AC_DEFUN([gl_QUOTE],
+  [
+-   AC_LIBOBJ([quote])
+- 
+    dnl Prerequisites of lib/quote.c.
+    dnl (none)
+  ])
+--- 6,11 ----
diff -Nru gettext-0.19.3/gnulib-local/Makefile.am gettext-0.18.1.1/gnulib-local/Makefile.am
--- gettext-0.19.3/gnulib-local/Makefile.am	2014-10-15 03:43:03.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/Makefile.am	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006-2008, 2010-2011 Free Software Foundation, Inc.
+## Copyright (C) 2006-2008, 2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
 lib/error-progname.c \
 lib/error-progname.h \
 lib/exitfail.h.diff \
-lib/execute.c.diff \
 lib/fd-ostream.oo.c \
 lib/fd-ostream.oo.h \
 lib/file-ostream.oo.c \
@@ -49,7 +48,6 @@
 lib/gl_linkedhash_list.h.diff \
 lib/glib.in.h \
 lib/glibconfig.in.h \
-lib/glib/README \
 lib/glib/ghash.c \
 lib/glib/ghash.in.h \
 lib/glib/glist.c \
@@ -70,7 +68,6 @@
 lib/html-styled-ostream.oo.h \
 lib/iconv-ostream.oo.c \
 lib/iconv-ostream.oo.h \
-lib/libcroco/README \
 lib/libcroco/cr-additional-sel.c \
 lib/libcroco/cr-additional-sel.h \
 lib/libcroco/cr-attr-sel.c \
@@ -132,7 +129,6 @@
 lib/libxml/HTMLparser.in.h \
 lib/libxml/HTMLtree.c \
 lib/libxml/HTMLtree.in.h \
-lib/libxml/README \
 lib/libxml/SAX.c \
 lib/libxml/SAX2.c \
 lib/libxml/SAX2.in.h \
@@ -228,7 +224,6 @@
 lib/progname.h.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
-lib/spawn-pipe.c.diff \
 lib/styled-ostream.oo.c \
 lib/styled-ostream.oo.h \
 lib/term-ostream.oo.c \
@@ -259,6 +254,8 @@
 m4/libxml.m4 \
 m4/java.m4 \
 m4/moo.m4 \
+m4/quotearg.m4.diff \
+m4/quote.m4.diff \
 m4/termcap.m4 \
 m4/terminfo.m4 \
 m4/term-ostream.m4 \
@@ -285,6 +282,9 @@
 modules/moo \
 modules/moo-tests \
 modules/ostream \
+modules/quotearg.diff \
+modules/quote.diff \
+modules/regex.diff \
 modules/styled-ostream \
 modules/termcap \
 modules/termcap-h \
@@ -298,7 +298,6 @@
 modules/xalloc-die \
 modules/xerror \
 modules/xgetcwd \
-tests/test-environ.c.diff \
 tests/test-moo-aroot.oo.c \
 tests/test-moo-aroot.oo.h \
 tests/test-moo-assign.c \
@@ -315,7 +314,6 @@
 tests/test-term-ostream-xterm-r6.out \
 tests/test-term-ostream-xterm-xf86-v32.out \
 tests/test-term-ostream-xterm-basic.out \
-tests/test-term-ostream-xterm-basic-italic.out \
 tests/test-term-ostream-xterm-8bit.out \
 tests/test-term-ostream-xterm-linux-debian.out \
 tests/test-term-ostream-xterm-linux-mandriva.out \
@@ -328,5 +326,3 @@
 tests/test-term-ostream-xterm-16color.out \
 tests/test-term-ostream-xterm-88color.out \
 tests/test-term-ostream-xterm-256color.out
-
-maintainer-update-po:
diff -Nru gettext-0.19.3/gnulib-local/Makefile.in gettext-0.18.1.1/gnulib-local/Makefile.in
--- gettext-0.19.3/gnulib-local/Makefile.in	2014-10-16 06:01:45.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/Makefile.in	2010-06-06 20:12:52.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,51 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -78,36 +34,23 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = gnulib-local
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/mkinstalldirs ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/init-package-version.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__extra_recursive_targets = maintainer-update-po-recursive
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -226,7 +169,6 @@
 lib/error-progname.c \
 lib/error-progname.h \
 lib/exitfail.h.diff \
-lib/execute.c.diff \
 lib/fd-ostream.oo.c \
 lib/fd-ostream.oo.h \
 lib/file-ostream.oo.c \
@@ -239,7 +181,6 @@
 lib/gl_linkedhash_list.h.diff \
 lib/glib.in.h \
 lib/glibconfig.in.h \
-lib/glib/README \
 lib/glib/ghash.c \
 lib/glib/ghash.in.h \
 lib/glib/glist.c \
@@ -260,7 +201,6 @@
 lib/html-styled-ostream.oo.h \
 lib/iconv-ostream.oo.c \
 lib/iconv-ostream.oo.h \
-lib/libcroco/README \
 lib/libcroco/cr-additional-sel.c \
 lib/libcroco/cr-additional-sel.h \
 lib/libcroco/cr-attr-sel.c \
@@ -322,7 +262,6 @@
 lib/libxml/HTMLparser.in.h \
 lib/libxml/HTMLtree.c \
 lib/libxml/HTMLtree.in.h \
-lib/libxml/README \
 lib/libxml/SAX.c \
 lib/libxml/SAX2.c \
 lib/libxml/SAX2.in.h \
@@ -418,7 +357,6 @@
 lib/progname.h.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
-lib/spawn-pipe.c.diff \
 lib/styled-ostream.oo.c \
 lib/styled-ostream.oo.h \
 lib/term-ostream.oo.c \
@@ -449,6 +387,8 @@
 m4/libxml.m4 \
 m4/java.m4 \
 m4/moo.m4 \
+m4/quotearg.m4.diff \
+m4/quote.m4.diff \
 m4/termcap.m4 \
 m4/terminfo.m4 \
 m4/term-ostream.m4 \
@@ -475,6 +415,9 @@
 modules/moo \
 modules/moo-tests \
 modules/ostream \
+modules/quotearg.diff \
+modules/quote.diff \
+modules/regex.diff \
 modules/styled-ostream \
 modules/termcap \
 modules/termcap-h \
@@ -488,7 +431,6 @@
 modules/xalloc-die \
 modules/xerror \
 modules/xgetcwd \
-tests/test-environ.c.diff \
 tests/test-moo-aroot.oo.c \
 tests/test-moo-aroot.oo.h \
 tests/test-moo-assign.c \
@@ -505,7 +447,6 @@
 tests/test-term-ostream-xterm-r6.out \
 tests/test-term-ostream-xterm-xf86-v32.out \
 tests/test-term-ostream-xterm-basic.out \
-tests/test-term-ostream-xterm-basic-italic.out \
 tests/test-term-ostream-xterm-8bit.out \
 tests/test-term-ostream-xterm-linux-debian.out \
 tests/test-term-ostream-xterm-linux-mandriva.out \
@@ -552,12 +493,11 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-maintainer-update-po-local: 
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -604,15 +544,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -676,8 +611,6 @@
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-maintainer-update-po-am: maintainer-update-po-local
-
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
@@ -694,21 +627,16 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-update-po \
-	maintainer-update-po-am maintainer-update-po-local mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am
-
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
-maintainer-update-po:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru gettext-0.19.3/gnulib-local/modules/backupfile gettext-0.18.1.1/gnulib-local/modules/backupfile
--- gettext-0.19.3/gnulib-local/modules/backupfile	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/backupfile	2010-06-06 12:49:58.000000000 +0000
@@ -10,9 +10,6 @@
 Depends-on:
 argmatch
 basename
-closedir
-opendir
-readdir
 unistd
 
 configure.ac:
diff -Nru gettext-0.19.3/gnulib-local/modules/fnmatch.diff gettext-0.18.1.1/gnulib-local/modules/fnmatch.diff
--- gettext-0.19.3/gnulib-local/modules/fnmatch.diff	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/fnmatch.diff	2010-06-06 12:49:58.000000000 +0000
@@ -1,19 +1,19 @@
-*** modules/fnmatch.orig	2011-06-02 22:42:23.000000000 +0200
---- modules/fnmatch	2011-06-02 22:42:43.000000000 +0200
+*** modules/fnmatch.orig	2007-09-30 05:30:42.000000000 +0200
+--- modules/fnmatch	2007-09-30 05:30:52.000000000 +0200
 ***************
-*** 11,17 ****
+*** 10,16 ****
+  
   Depends-on:
   extensions
-  snippet/arg-nonnull
-! alloca          [test -n "$FNMATCH_H"]
-  stdbool         [test -n "$FNMATCH_H"]
-  wchar           [test -n "$FNMATCH_H"]
-  wctype-h        [test -n "$FNMATCH_H"]
---- 11,17 ----
+! alloca
+  stdbool
+  wchar
+  wctype
+--- 10,16 ----
+  
   Depends-on:
   extensions
-  snippet/arg-nonnull
-! alloca-opt      [test -n "$FNMATCH_H"]
-  stdbool         [test -n "$FNMATCH_H"]
-  wchar           [test -n "$FNMATCH_H"]
-  wctype-h        [test -n "$FNMATCH_H"]
+! alloca-opt
+  stdbool
+  wchar
+  wctype
diff -Nru gettext-0.19.3/gnulib-local/modules/gettext-runtime-misc gettext-0.18.1.1/gnulib-local/modules/gettext-runtime-misc
--- gettext-0.19.3/gnulib-local/modules/gettext-runtime-misc	2013-04-15 02:00:38.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/gettext-runtime-misc	2010-06-06 12:49:58.000000000 +0000
@@ -15,11 +15,6 @@
 # Parametrization of the 'relocatable' module.
 AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 
-# Tell the mingw or Cygwin linker which symbols to export.
-if WOE32DLL
-AM_CPPFLAGS += @INTL_EXPORTS_FLAGS@
-endif
-
 Include:
 
 License:
diff -Nru gettext-0.19.3/gnulib-local/modules/gettext-tools-misc gettext-0.18.1.1/gnulib-local/modules/gettext-tools-misc
--- gettext-0.19.3/gnulib-local/modules/gettext-tools-misc	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/gettext-tools-misc	2010-06-06 12:49:58.000000000 +0000
@@ -19,10 +19,10 @@
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
 # Need @LIB_ACL@ because copy-file.c uses acl.h.
-# As of 2010-10-04, these are all added by gnulib-tool automatically.
-#lib_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
-
-lib_LDFLAGS += -release @VERSION@
+# Need @LTLIBC@ for -no-undefined to work on many platforms.
+lib_LDFLAGS += \
+  -release @VERSION@ \
+  $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL
diff -Nru gettext-0.19.3/gnulib-local/modules/libglib gettext-0.18.1.1/gnulib-local/modules/libglib
--- gettext-0.19.3/gnulib-local/modules/libglib	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/libglib	2010-06-06 12:49:58.000000000 +0000
@@ -59,42 +59,42 @@
 	mv -f $@-t $@
 
 glib/ghash.h: glib/ghash.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/ghash.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/glist.h: glib/glist.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/glist.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gprimes.h: glib/gprimes.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gprimes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gstrfuncs.h: glib/gstrfuncs.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gstrfuncs.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gstring.h: glib/gstring.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gstring.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 glib/gtypes.h: glib/gtypes.in.h
-	test -d glib || $(MKDIR_P) glib
+	test -d glib || $(mkdir_p) glib
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/glib/gtypes.in.h; \
 	} > $@-t
diff -Nru gettext-0.19.3/gnulib-local/modules/libxml gettext-0.18.1.1/gnulib-local/modules/libxml
--- gettext-0.19.3/gnulib-local/modules/libxml	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/libxml	2010-06-06 12:49:58.000000000 +0000
@@ -164,329 +164,329 @@
 BUILT_SOURCES += $(LIBXML_H)
 
 libxml/DOCBparser.h: libxml/DOCBparser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/DOCBparser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/HTMLparser.h: libxml/HTMLparser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/HTMLparser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/HTMLtree.h: libxml/HTMLtree.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/HTMLtree.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/SAX.h: libxml/SAX.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/SAX.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/SAX2.h: libxml/SAX2.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/SAX2.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/c14n.h: libxml/c14n.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/c14n.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/catalog.h: libxml/catalog.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/catalog.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/chvalid.h: libxml/chvalid.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/chvalid.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/debugXML.h: libxml/debugXML.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/debugXML.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/dict.h: libxml/dict.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/dict.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/encoding.h: libxml/encoding.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/encoding.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/entities.h: libxml/entities.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/entities.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/globals.h: libxml/globals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/globals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/hash.h: libxml/hash.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/hash.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/list.h: libxml/list.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/list.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/nanoftp.h: libxml/nanoftp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/nanoftp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/nanohttp.h: libxml/nanohttp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/nanohttp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/parser.h: libxml/parser.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/parser.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/parserInternals.h: libxml/parserInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/parserInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/pattern.h: libxml/pattern.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/pattern.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/relaxng.h: libxml/relaxng.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/relaxng.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/schemasInternals.h: libxml/schemasInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/schemasInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/schematron.h: libxml/schematron.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/schematron.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/threads.h: libxml/threads.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/threads.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/tree.h: libxml/tree.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/tree.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/uri.h: libxml/uri.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/uri.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/valid.h: libxml/valid.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/valid.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xinclude.h: libxml/xinclude.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xinclude.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xlink.h: libxml/xlink.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xlink.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlIO.h: libxml/xmlIO.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlIO.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlautomata.h: libxml/xmlautomata.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlautomata.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlerror.h: libxml/xmlerror.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlerror.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlexports.h: libxml/xmlexports.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlexports.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlmemory.h: libxml/xmlmemory.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlmemory.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlmodule.h: libxml/xmlmodule.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlmodule.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlreader.h: libxml/xmlreader.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlreader.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlregexp.h: libxml/xmlregexp.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlregexp.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlsave.h: libxml/xmlsave.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlsave.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlschemas.h: libxml/xmlschemas.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlschemas.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlschemastypes.h: libxml/xmlschemastypes.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlschemastypes.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlstring.h: libxml/xmlstring.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlstring.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlunicode.h: libxml/xmlunicode.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlunicode.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlversion.h: libxml/xmlversion.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlversion.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xmlwriter.h: libxml/xmlwriter.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xmlwriter.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpath.h: libxml/xpath.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpath.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpathInternals.h: libxml/xpathInternals.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpathInternals.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 libxml/xpointer.h: libxml/xpointer.in.h
-	test -d libxml || $(MKDIR_P) libxml
+	test -d libxml || $(mkdir_p) libxml
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  cat $(srcdir)/libxml/xpointer.in.h; \
 	} > $@-t
diff -Nru gettext-0.19.3/gnulib-local/modules/quotearg.diff gettext-0.18.1.1/gnulib-local/modules/quotearg.diff
--- gettext-0.19.3/gnulib-local/modules/quotearg.diff	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/quotearg.diff	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,18 @@
+*** quotearg.bak	2006-10-12 19:55:21.000000000 +0200
+--- quotearg	2006-10-12 21:55:37.000000000 +0200
+***************
+*** 17,22 ****
+  gl_QUOTEARG
+  
+  Makefile.am:
+  
+  Include:
+  "quotearg.h"
+--- 17,23 ----
+  gl_QUOTEARG
+  
+  Makefile.am:
++ lib_SOURCES += quotearg.h quotearg.c
+  
+  Include:
+  "quotearg.h"
diff -Nru gettext-0.19.3/gnulib-local/modules/quote.diff gettext-0.18.1.1/gnulib-local/modules/quote.diff
--- gettext-0.19.3/gnulib-local/modules/quote.diff	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/quote.diff	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,18 @@
+*** quote.bak	2006-10-12 19:55:25.000000000 +0200
+--- quote	2006-10-12 21:55:51.000000000 +0200
+***************
+*** 13,18 ****
+  gl_QUOTE
+  
+  Makefile.am:
+  
+  Include:
+  "quote.h"
+--- 13,19 ----
+  gl_QUOTE
+  
+  Makefile.am:
++ lib_SOURCES += quote.h quote.c
+  
+  Include:
+  "quote.h"
diff -Nru gettext-0.19.3/gnulib-local/modules/regex.diff gettext-0.18.1.1/gnulib-local/modules/regex.diff
--- gettext-0.19.3/gnulib-local/modules/regex.diff	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/regex.diff	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,19 @@
+*** modules/regex.orig	Mon May 24 12:36:55 2010
+--- modules/regex	Mon May 24 12:36:42 2010
+***************
+*** 17,23 ****
+  extensions
+  gettext-h
+  localcharset
+! malloc
+  memcmp
+  memmove
+  mbrtowc
+--- 17,23 ----
+  extensions
+  gettext-h
+  localcharset
+! malloc-posix
+  memcmp
+  memmove
+  mbrtowc
diff -Nru gettext-0.19.3/gnulib-local/modules/term-ostream-tests gettext-0.18.1.1/gnulib-local/modules/term-ostream-tests
--- gettext-0.19.3/gnulib-local/modules/term-ostream-tests	2014-10-16 01:37:36.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/modules/term-ostream-tests	2010-06-06 12:49:58.000000000 +0000
@@ -4,7 +4,6 @@
 tests/test-term-ostream-xterm-r6.out
 tests/test-term-ostream-xterm-xf86-v32.out
 tests/test-term-ostream-xterm-basic.out
-tests/test-term-ostream-xterm-basic-italic.out
 tests/test-term-ostream-xterm-8bit.out
 tests/test-term-ostream-xterm-linux-debian.out
 tests/test-term-ostream-xterm-linux-mandriva.out
diff -Nru gettext-0.19.3/gnulib-local/tests/test-environ.c.diff gettext-0.18.1.1/gnulib-local/tests/test-environ.c.diff
--- gettext-0.19.3/gnulib-local/tests/test-environ.c.diff	2014-06-10 06:30:01.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/tests/test-environ.c.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-diff --git a/test-environ.c b/test-environ.c
-index 46a2eab..8afecb7 100644
---- a/test-environ.c
-+++ b/test-environ.c
-@@ -22,6 +22,13 @@
- 
- #include <string.h>
- 
-+/* environ is the exported symbol referencing the internal
-+   __cygwin_environ variable on cygwin64:
-+   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-+#if defined __CYGWIN__ && defined __x86_64__
-+extern DLL_VARIABLE char **environ;
-+#endif
-+
- int
- main ()
- {
diff -Nru gettext-0.19.3/gnulib-local/tests/test-term-ostream-xterm gettext-0.18.1.1/gnulib-local/tests/test-term-ostream-xterm
--- gettext-0.19.3/gnulib-local/tests/test-term-ostream-xterm	2014-10-15 03:43:03.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/tests/test-term-ostream-xterm	2010-06-06 12:49:58.000000000 +0000
@@ -22,7 +22,6 @@
    ${DIFF} ${srcdir}/test-term-ostream-xterm-r6.out             out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-xf86-v32.out       out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-basic.out          out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-basic-italic.out   out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-8bit.out           out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-debian.out   out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-mandriva.out out > /dev/null \
diff -Nru gettext-0.19.3/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out gettext-0.18.1.1/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out
--- gettext-0.19.3/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out	2014-10-15 03:43:03.000000000 +0000
+++ gettext-0.18.1.1/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-Colors (foreground/background):
-       |black  |blue   |green  |cyan   |red    |magenta|yellow |white  |default
-black  | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-blue   | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-green  | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-cyan   | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-red    | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-magenta| Words | Words | Words | Words | Words | Words | Words | Words | Words 
-yellow | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-white  | Words | Words | Words | Words | Words | Words | Words | Words | Words 
-default| Words | Words | Words | Words | Words | Words | Words | Words | Words 
-
-Colors (hue/saturation):
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-                                                                 
-
-Weights:
-normal, bold, (Bdefault 
-
-Postures:
-normal, italic, default 
-
-Text decorations:
-normal, underlined, default 
-
diff -Nru gettext-0.19.3/INSTALL gettext-0.18.1.1/INSTALL
--- gettext-0.19.3/INSTALL	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/INSTALL	2010-06-06 12:49:57.000000000 +0000
@@ -4,56 +4,56 @@
 =============
 
    This package depends on a few other packages.  They are listed in
-the file ‘DEPENDENCIES’.  It is recommended to install the listed
+the file `DEPENDENCIES'.  It is recommended to install the listed
 packages before installing this package.
 
 Basic Installation
 ==================
 
-   The ‘configure’ shell script attempts to guess correct values for
+   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a ‘Makefile’ in each directory of the package.
-It may also create one or more ‘.h’ files containing system-dependent
-definitions.  Finally, it creates a shell script ‘config.status’ that
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, a file
-‘config.cache’ that saves the results of its tests to speed up
-reconfiguring, and a file ‘config.log’ containing compiler output
-(useful mainly for debugging ‘configure’).
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
 
    If you need to do unusual things to compile the package, please try
-to figure out how ‘configure’ could check whether to do them, and mail
-diffs or instructions to the address given in the ‘README’ so they can
-be considered for the next release.  If at some point ‘config.cache’
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file ‘configure.ac’ is used to create ‘configure’ by a program
-called ‘autoconf’.  You only need ‘configure.ac’ if you want to change
-it or regenerate ‘configure’ using a newer version of ‘autoconf’.
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
-  1. ‘cd’ to the directory containing the package's source code and type
-     ‘./configure’ to configure the package for your system.  If you're
-     using ‘csh’ on an old version of System V, you might need to type
-     ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-     ‘configure’ itself.
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
 
-     Running ‘configure’ takes awhile.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
-  2. Type ‘make’ to compile the package.
+  2. Type `make' to compile the package.
 
-  3. Optionally, type ‘make check’ to run any self-tests that come with
+  3. Optionally, type `make check' to run any self-tests that come with
      the package.
 
-  4. Type ‘make install’ to install the programs and any data files and
+  4. Type `make install' to install the programs and any data files and
      documentation.
 
   5. You can remove the program binaries and object files from the
-     source code directory by typing ‘make clean’.  To also remove the
-     files that ‘configure’ created (so you can compile the package for
-     a different kind of computer), type ‘make distclean’.  There is
-     also a ‘make maintainer-clean’ target, but that is intended mainly
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
@@ -62,7 +62,7 @@
 =====================
 
    Some systems require unusual options for compilation or linking that
-the ‘configure’ script does not know about.  You can give ‘configure’
+the `configure' script does not know about.  You can give `configure'
 initial values for variables as arguments.  You can do it like this:
      ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
@@ -71,16 +71,16 @@
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of ‘make’ that
-supports the ‘VPATH’ variable, such as GNU ‘make’.  ‘cd’ to the
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
-the ‘configure’ script.  ‘configure’ automatically checks for the
-source code in the directory that ‘configure’ is in and in ‘..’.
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a ‘make’ that does not supports the ‘VPATH’
+   If you have to use a `make' that does not supports the `VPATH'
 variable, you have to compile the package for one architecture at a time
 in the source code directory.  After you have installed the package for
-one architecture, use ‘make distclean’ before reconfiguring for another
+one architecture, use `make distclean' before reconfiguring for another
 architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
@@ -100,25 +100,25 @@
 Installation Names
 ==================
 
-   By default, ‘make install’ will install the package's files in
-‘/usr/local/bin’, ‘/usr/local/man’, etc.  You can specify an
-installation prefix other than ‘/usr/local’ by giving ‘configure’ the
-option ‘--prefix=PATH’.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
+give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like ‘--bindir=PATH’ to specify different values for particular
-kinds of files.  Run ‘configure --help’ for a list of the directories
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving ‘configure’ the
-option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
 Enabling Relocatability
 =======================
@@ -127,12 +127,12 @@
 that packages are not relocatable.  It means a user cannot copy a
 program, installed by another user on the same machine, to his home
 directory, and have it work correctly (including i18n).  So many users
-need to go through ‘configure; make; make install’ with all its
+need to go through `configure; make; make install' with all its
 dependencies, options, and hurdles.
 
    Red Hat, Debian, and similar package systems solve the "ease of
-installation" problem, but they hardwire path names, usually to ‘/usr’
-or ‘/usr/local’.  This means that users need root privileges to install
+installation" problem, but they hardwire path names, usually to `/usr'
+or `/usr/local'.  This means that users need root privileges to install
 a binary package, and prevents installing two different versions of the
 same binary package.
 
@@ -142,24 +142,24 @@
 to do the same thing with a hard link _only_ if the hard link file is
 in the same directory as the real program.
 
-   To configure a program to be relocatable, add ‘--enable-relocatable’
-to the ‘configure’ command line.
+   To configure a program to be relocatable, add `--enable-relocatable'
+to the `configure' command line.
 
    On some OSes the executables remember the location of shared
 libraries and prefer them over any other search path.  Therefore, such
 an executable will look for its shared libraries first in the original
 installation directory and only then in the current installation
-directory.  Thus, for reliability, it is best to also give a ‘--prefix’
+directory.  Thus, for reliability, it is best to also give a `--prefix'
 option pointing to a directory that does not exist now and which never
-will be created, e.g.  ‘--prefix=/nonexistent’.  You may use
-‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
+will be created, e.g.  `--prefix=/nonexistent'.  You may use
+`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into
 that directory.
 
    We do not recommend using a prefix writable by unprivileged users
-(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
+(e.g. `/tmp/inst$$') because such a directory can be recreated by an
 unprivileged user after the original directory has been removed.  We
 also do not recommend prefixes that might be behind an automounter
-(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
+(e.g. `$HOME/inst$$') because of the performance impact of directory
 searching.
 
    Here's a sample installation run that takes into account all these
@@ -169,10 +169,10 @@
      make
      make install DESTDIR=/tmp/inst$$
 
-   Installation with ‘--enable-relocatable’ will not work for setuid or
+   Installation with `--enable-relocatable' will not work for setuid or
 setgid executables, because such executables search only system library
 paths for security reasons.  Also, installation with
-‘--enable-relocatable’ might not work on OpenBSD, when the package
+`--enable-relocatable' might not work on OpenBSD, when the package
 contains shared libraries and libtool versions 1.5.xx are used.
 
    The runtime penalty and size penalty are negligible on GNU/Linux
@@ -183,25 +183,25 @@
 Optional Features
 =================
 
-   Some packages pay attention to ‘--enable-FEATURE’ options to
-‘configure’, where FEATURE indicates an optional part of the package.
-They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
-is something like ‘gnu-as’ or ‘x’ (for the X Window System).  The
-‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, ‘configure’ can usually
+   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the ‘configure’ options ‘--x-includes=DIR’ and
-‘--x-libraries=DIR’ to specify their locations.
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
 
    For packages that use the GNU libiconv library, you can use the
-‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
+`configure' option `--with-libiconv-prefix' to specify the prefix you
 used while installing GNU libiconv.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
    For packages that use the GNU libintl library, you can use the
-‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
+`configure' option `--with-libintl-prefix' to specify the prefix you
 used while installing GNU gettext-runtime.  This option is not necessary if
 that other prefix is the same as the one now specified through --prefix.
 
@@ -217,7 +217,7 @@
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its ‘<wchar.h>’ header file.  The option ‘-nodtk’ can be used as
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
 to try
 
@@ -246,62 +246,62 @@
 Specifying the System Type
 ==========================
 
-   There may be some features ‘configure’ can not figure out
+   There may be some features `configure' can not figure out
 automatically, but needs to determine by the type of host the package
-will run on.  Usually ‘configure’ can figure that out, but if it prints
+will run on.  Usually `configure' can figure that out, but if it prints
 a message saying it can not guess the host type, give it the
-‘--host=TYPE’ option.  TYPE can either be a short name for the system
-type, such as ‘sun4’, or a canonical name with three fields:
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
      CPU-COMPANY-SYSTEM
 
-See the file ‘config.sub’ for the possible values of each field.  If
-‘config.sub’ isn't included in this package, then this package doesn't
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
 need to know the host type.
 
    If you are building compiler tools for cross-compiling, you can also
-use the ‘--target=TYPE’ option to select the type of system they will
-produce code for and the ‘--build=TYPE’ option to select the type of
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
 system on which you are compiling the package.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for ‘configure’ scripts to share,
-you can create a site shell script called ‘config.site’ that gives
-default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
-‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
-‘PREFIX/etc/config.site’ if it exists.  Or, you can set the
-‘CONFIG_SITE’ environment variable to the location of the site script.
-A warning: not all ‘configure’ scripts look for a site script.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
 
 Operation Controls
 ==================
 
-   ‘configure’ recognizes the following options to control how it
+   `configure' recognizes the following options to control how it
 operates.
 
-‘--cache-file=FILE’
+`--cache-file=FILE'
      Use and save the results of the tests in FILE instead of
-     ‘./config.cache’.  Set FILE to ‘/dev/null’ to disable caching, for
-     debugging ‘configure’.
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
 
-‘--help’
-     Print a summary of the options to ‘configure’, and exit.
+`--help'
+     Print a summary of the options to `configure', and exit.
 
-‘--quiet’
-‘--silent’
-‘-q’
+`--quiet'
+`--silent'
+`-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to ‘/dev/null’ (any error
+     suppress all normal output, redirect it to `/dev/null' (any error
      messages will still be shown).
 
-‘--srcdir=DIR’
+`--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     ‘configure’ can determine that directory automatically.
+     `configure' can determine that directory automatically.
 
-‘--version’
-     Print the version of Autoconf used to generate the ‘configure’
+`--version'
+     Print the version of Autoconf used to generate the `configure'
      script, and exit.
 
-‘configure’ also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.
 
diff -Nru gettext-0.19.3/m4/init-package-version.m4 gettext-0.18.1.1/m4/init-package-version.m4
--- gettext-0.19.3/m4/init-package-version.m4	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/m4/init-package-version.m4	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,99 @@
+# init-package-version.m4 serial 2 (gettext-0.18)
+dnl Copyright (C) 1992-2009 Free Software Foundation, 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
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# Make it possible to pass version numbers extracted from a file in
+# $(srcdir) to autoconf.
+#
+# Autoconf insists on passing the package name and version number to
+# every generated .h file and every Makefile. This was a reasonable
+# design at times when a version number was changed only once a month.
+# Nowadays, people often assign a new version number once a week, or
+# even change it each time a 'git' commit is made. Regenerating all
+# the files that depend on configure.ac (aclocal.m4, configure,
+# config.status, config.h, all Makefiles) may take 15 minutes. These
+# delays can severely hamper development.
+#
+# An alternative is to store the version number in a file in $(srcdir)
+# that is separate from configure.ac. It can be a data file, a shell
+# script, a .m4 file, or other. The essential point is that the maintainer
+# is responsible for creating Makefile dependencies to this version file
+# for every file that needs to be rebuilt when the version changes. This
+# typically includes
+#   - distributable documentation files that carry the version number,
+# but does not include
+#   - aclocal.m4, configure, config.status, config.h, all Makefiles,
+#   - executables.
+#
+# autoconf and automake make it hard to follow this approach:
+#
+# - If AC_INIT is used with arguments, there is a chicken-and-egg problem:
+#   The arguments need to be read from a file in $(srcdir). The location
+#   of $(srcdir) is only determined by AC_CONFIG_SRCDIR. AC_CONFIG_SRCDIR
+#   can only appear after AC_INIT (otherwise aclocal gives an error:
+#   "error: m4_defn: undefined macro: _m4_divert_diversion").
+#   Furthermore, the arguments passed to AC_INIT must be literals; for
+#   example, the assignment to PACKAGE_VERSION looks like this:
+#     [PACKAGE_VERSION=']AC_PACKAGE_VERSION[']
+#
+# - If AC_INIT is used without arguments:
+#   Automake provides its own variables, PACKAGE and VERSION, and uses them
+#   instead of PACKAGE_NAME and PACKAGE_VERSION that come from Autoconf.
+#   - If AM_INIT_AUTOMAKE is used with two arguments, automake options
+#     like 'silent-rules' cannot be specified.
+#   - If AM_INIT_AUTOMAKE is used in its one-argument form or without
+#     arguments at all, it triggers an error
+#     "error: AC_INIT should be called with package and version arguments".
+#   - If AM_INIT_AUTOMAKE is used in its one-argument form or without
+#     arguments at all, and _AC_INIT_PACKAGE is used before it, with
+#     the package and version number from the file as arguments, we get
+#     a warning: "warning: AC_INIT: not a literal: $VERSION_NUMBER".
+#     The arguments passed to _AC_INIT_PACKAGE must be literals.
+#
+# With the macro defined in this file, the approach can be coded like this:
+#
+#   AC_INIT
+#   AC_CONFIG_SRCDIR(WITNESS)
+#   . $srcdir/../version.sh
+#   gl_INIT_PACKAGE(PACKAGE, $VERSION_NUMBER)
+#   AM_INIT_AUTOMAKE([OPTIONS])
+
+# gl_INIT_PACKAGE(PACKAGE-NAME, VERSION)
+# --------------------------------------
+# followed by an AM_INIT_AUTOMAKE invocation,
+# is like calling AM_INIT_AUTOMAKE(PACKAGE-NAME, VERSION)
+# except that it can use computed non-literal arguments.
+AC_DEFUN([gl_INIT_PACKAGE],
+[
+  AC_BEFORE([$0], [AM_INIT_AUTOMAKE])
+  dnl Define AC_PACKAGE_NAME, because macros such as gnulib/m4/acl.m4 need it.
+  m4_ifndef([AC_PACKAGE_NAME], [m4_define([AC_PACKAGE_NAME], [$1])])
+  dnl Redefine AM_INIT_AUTOMAKE.
+  m4_define([gl_AM_INIT_AUTOMAKE],
+    m4_bpatsubst(m4_dquote(
+        m4_bpatsubst(m4_dquote(
+            m4_bpatsubst(m4_dquote(
+                m4_defn([AM_INIT_AUTOMAKE])),
+              [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
+          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
+      [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
+    [AC_SUBST([PACKAGE], [$1])
+     AC_SUBST([VERSION], [$2])
+    ])
+  m4_define([AM_INIT_AUTOMAKE],
+    m4_defn([gl_RPL_INIT_AUTOMAKE]))
+])
+m4_define([gl_INIT_DUMMY], [])
+AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
+  m4_ifval([$2],
+    [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
+  gl_AM_INIT_AUTOMAKE([$1 no-define])
+  m4_if(m4_index([ $1 ], [ no-define ]), [-1],
+    [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+     AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
+    ])
+])
diff -Nru gettext-0.19.3/m4/libtool.m4 gettext-0.18.1.1/m4/libtool.m4
--- gettext-0.19.3/m4/libtool.m4	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/m4/libtool.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,8 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +10,7 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -39,7 +37,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 57 LT_INIT
+# serial 56 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -68,7 +66,6 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -85,8 +82,6 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -123,7 +118,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 ])
 
 
@@ -143,11 +138,6 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -170,13 +160,10 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -192,6 +179,7 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -205,6 +193,23 @@
   ;;
 esac
 
+# 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'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -245,28 +250,6 @@
 ])# _LT_SETUP
 
 
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -425,7 +408,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -435,7 +418,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -534,20 +517,12 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -558,9 +533,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -568,38 +543,16 @@
     esac
 done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -609,11 +562,20 @@
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
 
-cat >>"$CONFIG_LT" <<\_LTEOF
 lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -639,7 +601,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -684,13 +646,15 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
 ])# LT_OUTPUT
 
 
@@ -753,12 +717,15 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
 
-  _LT_PROG_REPLACE_SHELLFNS
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
 
-   mv -f "$cfgfile" "$ofile" ||
+  mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -803,7 +770,6 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -825,31 +791,6 @@
 ])# _LT_LANG
 
 
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -880,10 +821,6 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -894,13 +831,11 @@
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -986,13 +921,7 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1000,7 +929,6 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
-
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1012,34 +940,6 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1067,7 +967,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test "$DSYMUTIL" != ":"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -1077,8 +977,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1087,13 +987,7 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -1101,7 +995,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1117,141 +1011,202 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
 else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
 fi
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
 
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
+# 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
 
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
 
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
 
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
 
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "[$]0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
 
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
 
 # _LT_ENABLE_LOCK
 # ---------------
@@ -1281,7 +1236,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -1374,27 +1329,14 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-*-*solaris*)
+sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1412,47 +1354,14 @@
 ])# _LT_ENABLE_LOCK
 
 
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1471,27 +1380,18 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1516,15 +1416,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -1564,7 +1464,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1627,11 +1527,6 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -1657,11 +1552,6 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1701,8 +1591,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -1753,7 +1643,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
+[#line __oline__ "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1794,13 +1684,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1809,11 +1693,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -1989,16 +1869,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2157,7 +2037,6 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2166,23 +2045,16 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -2195,7 +2067,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2215,13 +2087,7 @@
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2247,7 +2113,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2256,7 +2122,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2309,7 +2175,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -2321,7 +2187,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2340,9 +2206,8 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2363,83 +2228,36 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
       if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
     ;;
   esac
+  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2460,7 +2278,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2468,6 +2286,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2475,7 +2297,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
+    freebsd[[123]]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2493,7 +2315,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2513,26 +2335,12 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -2585,7 +2393,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2601,7 +2409,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -2638,9 +2446,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2648,21 +2456,16 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -2671,7 +2474,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2703,7 +2506,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2772,7 +2575,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2797,7 +2600,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2821,7 +2624,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2852,7 +2655,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2862,7 +2665,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3018,7 +2821,6 @@
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
@@ -3140,11 +2942,6 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -3153,8 +2950,8 @@
     fi
     ;;
 esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
@@ -3206,18 +3003,16 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc*)
+cegcc)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3247,10 +3042,6 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -3259,11 +3050,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3284,8 +3075,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3363,21 +3154,6 @@
   ;;
 esac
 ])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3385,11 +3161,7 @@
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+    [Command to use when deplibs_check_method == "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3404,7 +3176,10 @@
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+  if test -n "$ac_tool_prefix" \
+     && { test "$build" = "$host" \
+          || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
+        }; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -3421,13 +3196,13 @@
 	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 	*/dev/null* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
+	  break
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
+	    break
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3471,13 +3246,13 @@
 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   [lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3492,67 +3267,6 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
 
 # LT_LIB_M
 # --------
@@ -3561,7 +3275,7 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3589,12 +3303,7 @@
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3611,7 +3320,6 @@
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -3679,8 +3387,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3704,7 +3412,6 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -3717,7 +3424,6 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3739,7 +3445,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -3751,18 +3457,6 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3774,7 +3468,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
+const struct {
   const char *name;
   void       *address;
 }
@@ -3800,15 +3494,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3841,13 +3535,6 @@
   AC_MSG_RESULT(ok)
 fi
 
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3858,8 +3545,6 @@
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3871,6 +3556,7 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
+AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -3921,11 +3607,6 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -3975,12 +3656,6 @@
 	  ;;
 	esac
 	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -4037,7 +3712,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4070,8 +3745,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4133,7 +3808,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC* | sunCC*)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4237,12 +3912,6 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -4285,15 +3954,6 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -4336,7 +3996,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4357,13 +4017,7 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+      pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4375,40 +4029,25 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
 	esac
 	;;
@@ -4440,7 +4079,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+      f77* | f90* | f95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4497,11 +4136,9 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4520,8 +4157,6 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4542,7 +4177,6 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4551,37 +4185,27 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
+  ;;
   cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
+  ;;
   esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4596,6 +4220,7 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4643,33 +4268,7 @@
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -4687,7 +4286,6 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4703,12 +4301,11 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
 _LT_EOF
       fi
@@ -4744,12 +4341,10 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4767,11 +4362,6 @@
       fi
       ;;
 
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4787,7 +4377,7 @@
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -4797,16 +4387,15 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=' $pic_flag'
+	tmp_addflag=
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4817,17 +4406,13 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -4843,16 +4428,17 @@
         fi
 
 	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
+	xlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4866,8 +4452,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4885,8 +4471,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4932,8 +4518,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4973,10 +4559,8 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -5063,9 +4647,9 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_SYS_MODULE_PATH_AIX
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5074,19 +4658,14 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_SYS_MODULE_PATH_AIX
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5118,64 +4697,20 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
@@ -5188,6 +4723,10 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5200,7 +4739,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5209,7 +4748,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5217,7 +4756,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -5232,13 +4771,14 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5250,16 +4790,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -5271,14 +4811,7 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
@@ -5306,34 +4839,19 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5395,17 +4913,17 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5415,13 +4933,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5434,9 +4952,9 @@
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -5612,38 +5130,36 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
       ;;
     esac
   fi
@@ -5680,6 +5196,9 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5705,6 +5224,8 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5715,8 +5236,6 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5810,15 +5329,14 @@
 ])# _LT_LANG_C_CONFIG
 
 
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
@@ -5826,6 +5344,22 @@
 else
   _lt_caught_CXX_error=yes
 fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5837,6 +5371,7 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5846,8 +5381,6 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5879,7 +5412,6 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5897,7 +5429,6 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5919,8 +5450,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5952,7 +5483,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
     else
       GXX=no
@@ -6061,10 +5592,10 @@
           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_SYS_MODULE_PATH_AIX
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6073,19 +5604,14 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_SYS_MODULE_PATH_AIX
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -6115,75 +5641,28 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -6206,7 +5685,7 @@
         esac
         ;;
 
-      freebsd2.*)
+      freebsd[[12]]*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6225,11 +5704,6 @@
       gnu*)
         ;;
 
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
       hpux9*)
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6254,11 +5728,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
             ;;
           *)
             if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6319,7 +5793,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -6329,10 +5803,10 @@
 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -6362,7 +5836,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -6373,9 +5847,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6386,7 +5860,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6404,7 +5878,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6441,26 +5915,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
 		$RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 and above use weak symbols
+	    *) # Version 6 will use weak symbols
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -6468,7 +5942,7 @@
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -6487,9 +5961,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
-	  xl* | mpixl* | bgxl*)
+	  xl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6509,13 +5983,13 @@
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
+	      output_verbose_link_cmd='echo'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6584,7 +6058,7 @@
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=func_echo_all
+	  output_verbose_link_cmd=echo
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6619,15 +6093,15 @@
 	    case $host in
 	      osf3*)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
@@ -6643,17 +6117,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6663,7 +6137,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6699,7 +6173,7 @@
 
       solaris*)
         case $cc_basename in
-          CC* | sunCC*)
+          CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6720,7 +6194,7 @@
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='func_echo_all'
+	    output_verbose_link_cmd='echo'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6740,14 +6214,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -6758,7 +6232,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6812,10 +6286,6 @@
           CC*)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6871,7 +6341,6 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6886,29 +6355,6 @@
 ])# _LT_LANG_CXX_CONFIG
 
 
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6917,7 +6363,6 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6967,20 +6412,7 @@
   }
 };
 _LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
 ])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6992,7 +6424,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
+    case $p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -7001,22 +6433,13 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
+       else
+	 prev=
        fi
 
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
+	 case $p in
+	 -L* | -R*)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -7036,10 +6459,8 @@
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
-       prev=
        ;;
 
-    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -7075,7 +6496,6 @@
 fi
 
 $RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -7112,7 +6532,7 @@
 
 solaris*)
   case $cc_basename in
-  CC* | sunCC*)
+  CC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -7156,16 +6576,32 @@
 ])# _LT_SYS_HIDDEN_LIBDEPS
 
 
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7175,6 +6611,7 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7183,8 +6620,6 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7224,9 +6659,7 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -7280,24 +6713,38 @@
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
 fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
 
 
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7307,6 +6754,7 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7315,8 +6763,6 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7356,9 +6802,7 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -7414,8 +6858,7 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
+  CC="$lt_save_CC"
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -7452,12 +6895,10 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
+lt_save_CC="$CC"
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -7467,8 +6908,6 @@
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -7488,82 +6927,10 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
 ])# _LT_LANG_GCJ_CONFIG
 
 
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7595,11 +6962,9 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
-CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -7612,8 +6977,7 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -7633,13 +6997,6 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -7679,15 +7036,6 @@
 AC_SUBST([OBJDUMP])
 ])
 
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
 
 # _LT_DECL_SED
 # ------------
@@ -7781,8 +7129,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7821,162 +7169,208 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
 
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
 
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
 
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
 
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
 
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
 
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
 
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
 
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
 esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
     ;;
-esac
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
 ])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff -Nru gettext-0.19.3/m4/lt~obsolete.m4 gettext-0.18.1.1/m4/lt~obsolete.m4
--- gettext-0.19.3/m4/lt~obsolete.m4	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/m4/lt~obsolete.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # 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.
 
-# serial 5 lt~obsolete.m4
+# serial 4 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,6 +77,7 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -89,10 +90,3 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff -Nru gettext-0.19.3/m4/ltoptions.m4 gettext-0.18.1.1/m4/ltoptions.m4
--- gettext-0.19.3/m4/ltoptions.m4	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/m4/ltoptions.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,14 +1,13 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # 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.
 
-# serial 7 ltoptions.m4
+# serial 6 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -126,7 +125,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -134,13 +133,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -326,24 +325,9 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+    [AS_HELP_STRING([--with-pic],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
+    [pic_mode="$withval"],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru gettext-0.19.3/m4/ltversion.m4 gettext-0.18.1.1/m4/ltversion.m4
--- gettext-0.19.3/m4/ltversion.m4	2014-08-27 02:44:02.000000000 +0000
+++ gettext-0.18.1.1/m4/ltversion.m4	2010-06-06 12:49:58.000000000 +0000
@@ -7,17 +7,17 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# @configure_input@
+# Generated from ltversion.in.
 
-# serial 3337 ltversion.m4
+# serial 3012 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.2.6'
+macro_revision='1.3012'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru gettext-0.19.3/m4/woe32-dll.m4 gettext-0.18.1.1/m4/woe32-dll.m4
--- gettext-0.19.3/m4/woe32-dll.m4	2013-01-09 04:01:27.000000000 +0000
+++ gettext-0.18.1.1/m4/woe32-dll.m4	2010-06-06 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
-# woe32-dll.m4 serial 3
-dnl Copyright (C) 2005-2006, 2011 Free Software Foundation, Inc.
+# woe32-dll.m4 serial 2
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,7 +25,6 @@
 #     exported struct variable, or to a particular element of an exported
 #     array variable), requiring code modifications.  One platform
 #     dictates code modifications on all platforms.
-# See <http://www.haible.de/bruno/woe32dll.html> for more details.
 AC_DEFUN([gl_WOE32_DLL],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
diff -Nru gettext-0.19.3/Makefile.am gettext-0.18.1.1/Makefile.am
--- gettext-0.19.3/Makefile.am	2014-09-29 01:43:54.000000000 +0000
+++ gettext-0.18.1.1/Makefile.am	2010-06-06 12:49:57.000000000 +0000
@@ -1,5 +1,5 @@
 ## Makefile for the toplevel directory of GNU gettext
-## Copyright (C) 1995-1999, 2000-2012 Free Software Foundation, Inc.
+## Copyright (C) 1995-1999, 2000-2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,13 +17,14 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ACLOCAL = build-aux/fixaclocal @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = gnulib-local gettext-runtime gettext-tools
 
 EXTRA_DIST = \
-  DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
-  build-aux/ac-help.sed build-aux/moopp \
+  version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
+  build-aux/ac-help.sed build-aux/fixaclocal build-aux/moopp \
   m4/fixautomake.m4 m4/woe32-dll.m4 \
   m4/libtool.m4
 
@@ -42,7 +43,6 @@
 	cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin
 	cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/examples/po/remove-potcdate.sin
 	cmp -s gettext-runtime/m4/codeset.m4 gettext-tools/gnulib-m4/codeset.m4
-	cmp -s gettext-runtime/m4/extern-inline.m4 gettext-tools/gnulib-m4/extern-inline.m4
 	cmp -s gettext-runtime/m4/fcntl-o.m4 gettext-tools/gnulib-m4/fcntl-o.m4
 	cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4
 	cmp -s gettext-runtime/m4/glibc2.m4 gettext-tools/gnulib-m4/glibc2.m4
@@ -60,7 +60,6 @@
 	cmp -s gettext-runtime/m4/longlong.m4 gettext-tools/gnulib-m4/longlong.m4
 	cmp -s gettext-runtime/m4/nls.m4 gettext-tools/gnulib-m4/nls.m4
 	cmp -s gettext-runtime/m4/po.m4 gettext-tools/gnulib-m4/po.m4
-	cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4
 	cmp -s gettext-runtime/m4/printf-posix.m4 gettext-tools/gnulib-m4/printf-posix.m4
 	cmp -s gettext-runtime/m4/progtest.m4 gettext-tools/gnulib-m4/progtest.m4
 	cmp -s gettext-runtime/m4/size_max.m4 gettext-tools/gnulib-m4/size_max.m4
@@ -71,28 +70,25 @@
 	cmp -s gettext-runtime/m4/wchar_t.m4 gettext-tools/gnulib-m4/wchar_t.m4
 	cmp -s gettext-runtime/m4/wint_t.m4 gettext-tools/gnulib-m4/wint_t.m4
 	cmp -s gettext-runtime/m4/xsize.m4 gettext-tools/gnulib-m4/xsize.m4
-	cmp -s gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 gettext-tools/gnulib-m4/intmax_t.m4
-	test "`sed 1,17d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/config.charset | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.h | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.c | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localename.c | md5sum`"
-	test "`sed 1,15d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,15d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`"
-	test "`sed 1,15d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,15d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/verify.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/verify.h | md5sum`"
+	test "`sed 1,19d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/config.charset | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localcharset.h | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localcharset.c | md5sum`"
+	test "`sed 1,17d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localename.c | md5sum`"
+	test "`sed 1,17d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`"
+	test "`sed 1,17d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,16d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`"
 	cmp -s gettext-runtime/intl/printf-args.h gettext-runtime/libasprintf/printf-args.h
 	cmp -s gettext-runtime/intl/printf-args.c gettext-runtime/libasprintf/printf-args.c
 	cmp -s gettext-runtime/intl/printf-parse.h gettext-runtime/libasprintf/printf-parse.h
 	cmp -s gettext-runtime/intl/printf-parse.c gettext-runtime/libasprintf/printf-parse.c
-	cmp -s gettext-runtime/intl/verify.h gettext-runtime/libasprintf/verify.h
-	test "`sed 1,16d gettext-runtime/intl/ref-add.sin | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/ref-add.sin | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/ref-del.sin | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/ref-del.sin | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/ref-add.sin | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/ref-add.sin | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/ref-del.sin | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/ref-del.sin | md5sum`"
 	test "`sed 1,18d gettext-runtime/intl/relocatable.h | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.h | md5sum`"
 	test "`sed 1,18d gettext-runtime/intl/relocatable.c | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.c | md5sum`"
 	cmp -s gettext-runtime/intl/vasnprintf.h gettext-runtime/libasprintf/vasnprintf.h
-	test "`sed 1,16d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`"
 	cmp -s gettext-runtime/intl/vasnprintf.c gettext-runtime/libasprintf/vasnprintf.c
 	cmp -s gettext-runtime/intl/xsize.h gettext-runtime/libasprintf/xsize.h
-	test "`sed 1,16d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/xsize.h | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/xsize.h | md5sum`"
 	cmp -s gettext-runtime/man/help2man gettext-tools/man/help2man
 	cmp -s gettext-runtime/man/x-to-1.in gettext-tools/man/x-to-1.in
 	cmp -s gettext-runtime/libasprintf/texi2html gettext-tools/doc/texi2html
@@ -118,16 +114,3 @@
 # Woe32 support.
 
 EXTRA_DIST += README.woe32 windows/windres-options windows/gettext.rc
-
-# Versioning based on Git release tags.
-
-EXTRA_DIST += $(top_srcdir)/.version
-BUILT_SOURCES = $(top_srcdir)/.version
-$(top_srcdir)/.version:
-	echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
-	echo $(VERSION) > $(distdir)/.tarball-version
-
-# PO files update.
-
-maintainer-update-po-local: $(top_builddir)/config.status
diff -Nru gettext-0.19.3/Makefile.in gettext-0.18.1.1/Makefile.in
--- gettext-0.19.3/Makefile.in	2014-10-16 06:01:45.000000000 +0000
+++ gettext-0.18.1.1/Makefile.in	2010-06-06 20:12:52.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -14,51 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -78,20 +34,17 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/build-aux/mkinstalldirs COPYING THANKS \
-	build-aux/compile build-aux/config.guess \
-	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
-	build-aux/install-sh build-aux/mdate-sh build-aux/missing \
-	build-aux/mkinstalldirs build-aux/texinfo.tex build-aux/ylwrap \
-	build-aux/ltmain.sh $(top_srcdir)/build-aux/config.guess \
-	$(top_srcdir)/build-aux/config.sub \
-	$(top_srcdir)/build-aux/install-sh \
-	$(top_srcdir)/build-aux/missing
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
+	ChangeLog INSTALL NEWS THANKS build-aux/compile \
+	build-aux/config.guess build-aux/config.rpath \
+	build-aux/config.sub build-aux/depcomp build-aux/elisp-comp \
+	build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
+	build-aux/missing build-aux/mkinstalldirs \
+	build-aux/texinfo.tex build-aux/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/init-package-version.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -99,75 +52,38 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 depcomp =
 am__depfiles_maybe =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__extra_recursive_targets = maintainer-update-po-recursive
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -193,14 +109,11 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
+DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
+ACLOCAL = build-aux/fixaclocal @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
@@ -305,25 +218,21 @@
 # OS/2 port.
 
 # Woe32 support.
-
-# Versioning based on Git release tags.
-EXTRA_DIST = DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
-	build-aux/ac-help.sed build-aux/moopp m4/fixautomake.m4 \
-	m4/woe32-dll.m4 m4/libtool.m4 djgpp/COPYING.DJ \
-	djgpp/Makefile.maint djgpp/README.DJ djgpp/README.in \
-	djgpp/README djgpp/config.bat djgpp/config.in djgpp/config.sed \
-	djgpp/config.site djgpp/djpwd.h djgpp/edtests.bat \
-	djgpp/fnchange.in djgpp/fnchange.lst djgpp/getpwnam.c \
-	djgpp/msginit.sed djgpp/tscript.sed djgpp/unsetenv.c \
-	os2/README.OS2 os2/Makefile os2/backward.def os2/configure.awk \
-	README.woe32 windows/windres-options windows/gettext.rc \
-	$(top_srcdir)/.version
-BUILT_SOURCES = $(top_srcdir)/.version
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+EXTRA_DIST = version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 \
+	autogen.sh build-aux/ac-help.sed build-aux/fixaclocal \
+	build-aux/moopp m4/fixautomake.m4 m4/woe32-dll.m4 \
+	m4/libtool.m4 djgpp/COPYING.DJ djgpp/Makefile.maint \
+	djgpp/README.DJ djgpp/README.in djgpp/README djgpp/config.bat \
+	djgpp/config.in djgpp/config.sed djgpp/config.site \
+	djgpp/djpwd.h djgpp/edtests.bat djgpp/fnchange.in \
+	djgpp/fnchange.lst djgpp/getpwnam.c djgpp/msginit.sed \
+	djgpp/tscript.sed djgpp/unsetenv.c os2/README.OS2 os2/Makefile \
+	os2/backward.def os2/configure.awk README.woe32 \
+	windows/windres-options windows/gettext.rc
+all: all-recursive
 
 .SUFFIXES:
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -359,25 +268,22 @@
 $(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -391,14 +297,58 @@
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-maintainer-update-po-local: 
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -414,7 +364,12 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -426,11 +381,15 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -439,31 +398,9 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -499,10 +436,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -522,9 +462,6 @@
 	      || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -534,41 +471,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -579,8 +511,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -590,9 +522,9 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -600,10 +532,8 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -626,21 +556,13 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -657,13 +579,11 @@
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+check: check-recursive
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
@@ -673,15 +593,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -693,7 +608,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
@@ -749,10 +663,6 @@
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-maintainer-update-po: maintainer-update-po-recursive
-
-maintainer-update-po-am: maintainer-update-po-local
-
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
@@ -767,24 +677,23 @@
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) all check install install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-update-po-am \
-	maintainer-update-po-local mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-generic distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Additional dependencies for configure, due to the use of autoconf --trace.
@@ -802,7 +711,6 @@
 	cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin
 	cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/examples/po/remove-potcdate.sin
 	cmp -s gettext-runtime/m4/codeset.m4 gettext-tools/gnulib-m4/codeset.m4
-	cmp -s gettext-runtime/m4/extern-inline.m4 gettext-tools/gnulib-m4/extern-inline.m4
 	cmp -s gettext-runtime/m4/fcntl-o.m4 gettext-tools/gnulib-m4/fcntl-o.m4
 	cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4
 	cmp -s gettext-runtime/m4/glibc2.m4 gettext-tools/gnulib-m4/glibc2.m4
@@ -820,7 +728,6 @@
 	cmp -s gettext-runtime/m4/longlong.m4 gettext-tools/gnulib-m4/longlong.m4
 	cmp -s gettext-runtime/m4/nls.m4 gettext-tools/gnulib-m4/nls.m4
 	cmp -s gettext-runtime/m4/po.m4 gettext-tools/gnulib-m4/po.m4
-	cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4
 	cmp -s gettext-runtime/m4/printf-posix.m4 gettext-tools/gnulib-m4/printf-posix.m4
 	cmp -s gettext-runtime/m4/progtest.m4 gettext-tools/gnulib-m4/progtest.m4
 	cmp -s gettext-runtime/m4/size_max.m4 gettext-tools/gnulib-m4/size_max.m4
@@ -831,42 +738,31 @@
 	cmp -s gettext-runtime/m4/wchar_t.m4 gettext-tools/gnulib-m4/wchar_t.m4
 	cmp -s gettext-runtime/m4/wint_t.m4 gettext-tools/gnulib-m4/wint_t.m4
 	cmp -s gettext-runtime/m4/xsize.m4 gettext-tools/gnulib-m4/xsize.m4
-	cmp -s gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 gettext-tools/gnulib-m4/intmax_t.m4
-	test "`sed 1,17d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/config.charset | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.h | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.c | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localename.c | md5sum`"
-	test "`sed 1,15d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,15d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`"
-	test "`sed 1,15d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,15d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/verify.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/verify.h | md5sum`"
+	test "`sed 1,19d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/config.charset | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localcharset.h | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localcharset.c | md5sum`"
+	test "`sed 1,17d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localename.c | md5sum`"
+	test "`sed 1,17d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`"
+	test "`sed 1,17d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,16d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`"
 	cmp -s gettext-runtime/intl/printf-args.h gettext-runtime/libasprintf/printf-args.h
 	cmp -s gettext-runtime/intl/printf-args.c gettext-runtime/libasprintf/printf-args.c
 	cmp -s gettext-runtime/intl/printf-parse.h gettext-runtime/libasprintf/printf-parse.h
 	cmp -s gettext-runtime/intl/printf-parse.c gettext-runtime/libasprintf/printf-parse.c
-	cmp -s gettext-runtime/intl/verify.h gettext-runtime/libasprintf/verify.h
-	test "`sed 1,16d gettext-runtime/intl/ref-add.sin | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/ref-add.sin | md5sum`"
-	test "`sed 1,16d gettext-runtime/intl/ref-del.sin | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/ref-del.sin | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/ref-add.sin | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/ref-add.sin | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/ref-del.sin | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/ref-del.sin | md5sum`"
 	test "`sed 1,18d gettext-runtime/intl/relocatable.h | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.h | md5sum`"
 	test "`sed 1,18d gettext-runtime/intl/relocatable.c | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.c | md5sum`"
 	cmp -s gettext-runtime/intl/vasnprintf.h gettext-runtime/libasprintf/vasnprintf.h
-	test "`sed 1,16d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`"
 	cmp -s gettext-runtime/intl/vasnprintf.c gettext-runtime/libasprintf/vasnprintf.c
 	cmp -s gettext-runtime/intl/xsize.h gettext-runtime/libasprintf/xsize.h
-	test "`sed 1,16d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/xsize.h | md5sum`"
+	test "`sed 1,18d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/xsize.h | md5sum`"
 	cmp -s gettext-runtime/man/help2man gettext-tools/man/help2man
 	cmp -s gettext-runtime/man/x-to-1.in gettext-tools/man/x-to-1.in
 	cmp -s gettext-runtime/libasprintf/texi2html gettext-tools/doc/texi2html
 	cmp -s gettext-tools/examples/hello-java-awt/m4/TestAWT.java gettext-tools/examples/hello-java-swing/m4/TestAWT.java
 	cmp -s gettext-tools/examples/hello-java-awt/m4/TestAWT.class gettext-tools/examples/hello-java-swing/m4/TestAWT.class
 	test "`sed 1,15d gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d gettext-runtime/libasprintf/alloca.in.h | md5sum`"
-$(top_srcdir)/.version:
-	echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
-	echo $(VERSION) > $(distdir)/.tarball-version
-
-# PO files update.
-
-maintainer-update-po-local: $(top_builddir)/config.status
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru gettext-0.19.3/NEWS gettext-0.18.1.1/NEWS
--- gettext-0.19.3/NEWS	2014-10-15 09:37:28.000000000 +0000
+++ gettext-0.18.1.1/NEWS	2010-06-06 12:49:57.000000000 +0000
@@ -1,208 +1,3 @@
-Version 0.19.3 - October 2014
-
-* Bug fixes:
-  - Fix xgettext mishandling of octal character escapes in C.
-  - Fix autopoint infinite recursion with certain configure.ac.
-
-* The po/Makevars file has a new field MSGINIT_OPTIONS, that can be
-  used to adjust msginit's operation.  This is particularly useful for
-  controlling line wrapping behavior together with MSGMERGE_OPTIONS
-  and XGETTEXT_OPTIONS.
-
-* Portability:
-  - Building on Solaris 10 and 11 with Solaris Studio compiler is now
-    fixed.
-
-Version 0.19.2 - July 2014
-
-* Bug fixes:
-  - Fix xgettext crash in parsing empty string literals in C and Vala.
-  - ChangeLog file is added back to the gettext infrastructure.  It was
-    mistakenly removed in 0.19.
-  - Autoconf macro trace in autopoint now works again with Autoconf 2.68
-    or earlier.  It was a regression in 0.19.
-
-Version 0.19.1 - June 2014
-
-* Programming languages support:
-
-  - Desktop Entry:
-    msgfmt now always reads the po/LINGUAS file, regardless of whether
-    the LINGUAS environment variable is set.  The variable can now be
-    used to restrict the languages list read from the po/LINGUAS file.
-
-  - Vala:
-    Bug fix in xgettext handling of "//" in string literals.  This was
-    a regression after the C-99 Unicode escape support.
-
-* The po/Makevars.template file now contains the newly added variables.
-
-* msgfmt now treats errors in the PO file header as non-fatal.  Since
-  0.19 msgfmt started to abort on the fatal errors, but some
-  translation systems are still not ready to supply valid headers.
-
-* Future backward-incompatibilities:
-  - In future Gettext versions, msgfmt will treat header errors as
-    fatal and terminate the command execution.
-
-Version 0.19 - June 2014
-
-* Programming languages support:
-
-  - Desktop Entry:
-    xgettext and msgfmt now support .desktop files, used by desktop
-    applications, as input and output.
-
-  - GSettings:
-    xgettext now supports GSettings schema file format used by GNOME
-    applications.
-
-  - JavaScript:
-    xgettext now recognizes E4X (ECMA-357) constructs.
-
-  - PHP:
-    Single and double quotes around heredoc markers are now recognized.
-
-  - Python:
-    The acceptable format specifiers in the braced-syntax format
-    strings are now limited to the Standard Format Specifiers, to
-    reasonably avoid false-positives.
-
-  - Scheme:
-    The gettext shorthand form _"abc", used by GIMP script-fu, is now
-    recognized by xgettext.
-
-  - C and Vala:
-    xgettext now recognizes C99-style Unicode character escapes.
-
-* The --add-location option of msgattrib, msgcat, msgcomm, msgconv,
-  msgen, msgfilter, msggrep, msgmerge, msguniq, and xgettext commands
-  now takes an optional argument 'never', 'full', or 'file', to
-  control the format of "#: ..." comments.
-
-* msgfmt now has --source option to keep generated .java file when
-  running in Java mode.
-
-* msgattrib now has --empty option that sets msgstr to empty when
-  clearing fuzzy flag.
-
-* msgexec and msgfilter pass the plural information to subprocess
-  through the environment variable MSG{EXEC,FILTER}_MSGID_PLURAL and
-  MSG{EXEC,FILTER}_PLURAL_FORM.
-
-* New built-in filters 'quot' and 'boldquot' have been added to
-  msgfilter.  These filters convert Latin quotation marks ('...',
-  "...") into Unicode quotation marks (for example, U+2018) if
-  possible, similar to the sed commands used in po/Rules-quot and
-  po/Rules-boldquot.
-
-* The po/Makevars file has a couple of new options PO_DEPENDS_ON_POT
-  and DIST_DEPENDS_ON_UPDATE_PO, that can be used to adjust the
-  behavior of updating PO files on demand.
-
-* xgettext now strips prefixed string before the comment tag.  This is
-  useful to support C-style comment like this:
-
-  /*
-   * TRANSLATORS: first line
-   * second line
-   */
-
-  In this example, the extracted comment does not contain "* " at the
-  beginning of each line.
-
-* libgettextpo library:
-  - Memory leak fixes in the PO file parser.
-
-* Documentation:
-  - A complete example showing the use of GNU gettext in a GNOME 3
-    application has been added.
-
-
-Version 0.18.3 - July 2013
-
-* Runtime behaviour:
-  On Mac OS X systems, the setlocale() function now properly
-  invalidates loaded message catalogs when a locale has been set.
-
-* Programming languages support:
-
-  - C++:
-    The gnu::autosprintf class now provides an assignment operator.
-
-  - Glade:
-    xgettext now supports GtkBuider file format used by Glade 3.
-    xgettext now also extracts contexts (msgctxt) from Glade 2 and
-    GtkBuider files.
-
-  - JavaScript:
-    xgettext now partially supports JavaScript.  Since the current
-    JavaScript specification (ECMA-262) does not define the standard
-    set of formatting methods nor translation functions, the
-    implementation supports only a limited set of formatting methods
-    and translation functions commonly used in Gjs and other popular
-    JavaScript implemenations and libraries.
-
-  - Lua:
-    xgettext now supports Lua, using Ľubomír Remák's lua-gettext.
-
-  - Python:
-    xgettext and msgfmt's format string checking now recognize Python
-    format string in braced syntax (PEP 3101).  xgettext now also
-    supports explicit string concatenation with '+' and handles
-    platform dependent line terminators (LF/CR/CRLF) transparently.
-
-  - Tcl:
-    Bug fix in xgettext Unicode escape handling.
-
-  - Vala:
-    xgettext now supports Vala.
-
-* msgattrib now has --previous option to keep previous msgid when
-  making messages fuzzy, similar to msgmerge --previous.
-
-* msgfmt now checks PO file headers more strictly with less
-  false-positives.
-
-* 'gettextize' now checks macro directories specified with
-  AC_CONFIG_MACRO_DIRS in configure.ac.
-
-* Portability:
-  - msginit now does not require GNU sed.
-  - The Makefile rule for generating en@quot and en@boldquot now uses
-    @SED@ variable instead of hard-coded 'sed' command to allow users
-    to supply GNU sed.
-
-* Future backward-incompatibilities:
-  - In future Gettext versions, the files installed by 'gettextize'
-    will require Automake 1.10 or later.  This will improve the
-    compatibility of user projects with newer Automake versions.
-
-Version 0.18.2 - December 2012
-
-* xgettext now understands the block comment syntax of Guile 2.0.
-
-* libgettextpo library:
-  - The initial msgstr of a new message is now "", not NULL.
-  - Bug fixes in the functions po_message_is_range, po_file_check_all,
-    po_message_check_all.
-
-* Installation options:
-  The configure options --with-xz and --with-bzip2 can be used to specify
-  alternate compression methods for the archive used by the 'autopoint'
-  program. These options, together with --with-git, allow to trade
-  dependencies against installed package size. --with-xz has the highest
-  compression rate, followed by --with-git, followed by --with-bzip2.
-
-* Autoconf macros:
-  - The autoconf macros installed by 'gettextize' now work with the
-    forthcoming Automake 1.14 and require Autoconf version 2.60 or
-    newer.
-
-* Portability:
-  - Building on MacOS X 10.7, Cygwin 1.7.10, and newer 64-bit mingw is
-    now supported.
-
 Version 0.18.1 - June 2010
 
 * msggrep: A '$' anchor in a regular expression now also matches the end of
@@ -957,7 +752,7 @@
 * better C format string implementation.  The xgettext will classify
   strings as being a format string, or not, in the .po file.  The
   programmer can override the decision explicitly for each string
-  by specifying 'xgettext:c-format' and 'xgettext:no-c-format'
+  by specifying `xgettext:c-format' and `xgettext:no-c-format'
   respectively in a C comment preceding the string.
 
 * msgmerge program now always produces output.  Fuzzy or non-existing
@@ -967,11 +762,11 @@
 
 * Norwegian translation by Karl Anders �gard
 
-* Configure command line option '--with-gnu-gettext' is renamed to
-  '--with-included-gettext'
+* Configure command line option `--with-gnu-gettext' is renamed to
+  `--with-included-gettext'
 
 * gettextize now can determine whether the aclocal.m4 of the project
-  is sufficient
+  is sufficent
 
 * use automake for Makefile.in generation
 
@@ -1017,7 +812,7 @@
 
 * msgcmp program to find matches in two .po files
 
-* programs now have exit status != 0 if errors occurred
+* programs now have exit status != 0 if errors occured
 
 * libintl.a is now selfcontained and can be used without context in
   other projects (even on systems missing alloca)
diff -Nru gettext-0.19.3/.tarball-version gettext-0.18.1.1/.tarball-version
--- gettext-0.19.3/.tarball-version	2014-10-16 06:10:33.000000000 +0000
+++ gettext-0.18.1.1/.tarball-version	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-0.19.3
diff -Nru gettext-0.19.3/.version gettext-0.18.1.1/.version
--- gettext-0.19.3/.version	2014-10-16 06:02:37.000000000 +0000
+++ gettext-0.18.1.1/.version	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-0.19.3
diff -Nru gettext-0.19.3/version.sh gettext-0.18.1.1/version.sh
--- gettext-0.19.3/version.sh	1970-01-01 00:00:00.000000000 +0000
+++ gettext-0.18.1.1/version.sh	2010-06-06 12:49:58.000000000 +0000
@@ -0,0 +1,3 @@
+# Version number and release date.
+VERSION_NUMBER=0.18.1
+RELEASE_DATE=2010-06-04      # in "date +%Y-%m-%d" format
diff -Nru gettext-0.19.3/windows/gettext.rc gettext-0.18.1.1/windows/gettext.rc
--- gettext-0.19.3/windows/gettext.rc	2014-01-28 09:04:40.000000000 +0000
+++ gettext-0.18.1.1/windows/gettext.rc	2010-06-06 12:49:58.000000000 +0000
@@ -24,7 +24,7 @@
             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-2010\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "*.exe\0"
             VALUE "ProductName", "gettext utilities\0"